diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..63eef4d68ff2e0e1b002d8415c21316d7698c67d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,24 @@
+# Default behavior. Converts all text files to use LF in repository.
+* text=auto
+
+# List all known generic text files
+*.c text
+*.csv text
+*.h text
+*.json text
+*.m text
+*.md text
+*.prm text
+*.py text
+*.txt text
+
+# Set Windows specific text files to always use CRLF in working tree.
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
+
+# Set Unix specific text files to always use LF (also covers Windows subsystem for Linux) in working tree
+*.sh text eol=lf
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7660dbd25249a175226bd5f39074846e32997236..9f37f50f2a152980d8f250feeabae7e18a9ddb8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,53 +1,14 @@
 variables:
-  TESTV_DIR: "/usr/local/testv"
-  LTV_DIR: "/usr/local/ltv"
-  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
-  REFERENCE_BRANCH: "ivas-float-update"
-  BUILD_OUTPUT: "build_output.txt"
-  SCRIPTS_DIR: "/usr/local/scripts"
-  EXIT_CODE_NON_BE: 123
-  EXIT_CODE_FAIL: 1
-  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
-  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
-  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
-  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
-  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
-  TEST_SUITE: ""
-  DUT_ENCODER_PATH: "./IVAS_cod"
-  DUT_DECODER_PATH: "./IVAS_dec"
-  REF_ENCODER_PATH: "./IVAS_cod_ref"
-  REF_DECODER_PATH: "./IVAS_dec_ref"
-  LEVEL_SCALING: "1.0"
-  IVAS_PIPELINE_NAME: ''
-  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
-  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
-  TESTCASE_TIMEOUT_STV: 900
-  TESTCASE_TIMEOUT_LTV: 2400
-  TESTCASE_TIMEOUT_LTV_SANITIZERS: 6000
-  CI_REGRESSION_THRESH_MLD: "0.1"
-  CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
-  CI_REGRESSION_THRESH_SSNR: "-1"
-  CI_REGRESSION_THRESH_ODG: "-0.05"
-  GIT_CLEAN_FLAGS: -ffdxq
-  INSTR_DIR: "scripts/c-code_instrument"
-  BUILD_WITH_DEBUG_MODE_INFO: ""
-  ENCODER_TEST: ""
-  MANUAL_PIPELINE_TYPE:
-    description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
-    value: 'default'
-    options:
-      - 'default'
-      - 'pytest-compare'
-      - 'pytest-compare-long'
-      - 'pytest-compare-to-input'
-      - 'pytest-saturation-smoke-test'
-      - 'evs-26444'
-      - 'sanitizer'
-      - 'pytest-renderer'
-      - 'complexity'
-      - 'coverage'
-      - 'voip-be-test'
+  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this
+  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information
+  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc
 
+include:
+  - local: .gitlab-ci/variables.yml
+  - local: .gitlab-ci/rules-basis.yml
+  - project: ivas-codec-pc/ivas-codec-ci
+    ref: *IVAS_CODEC_CI_REF
+    file: main.yml
 
 default:
   interruptible: true # Make all jobs by default interruptible
@@ -71,6 +32,9 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare'
       variables:
         IVAS_PIPELINE_NAME: 'Run comparison tools against float ref: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run encoder dmx comparison against float ref: $CI_COMMIT_BRANCH'
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-long'
       variables:
         IVAS_PIPELINE_NAME: 'Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH'
@@ -95,18 +59,13 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test'
       variables:
         IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'
+      variables:
+        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'
     - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch
       variables:
         IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'        
 
-
-stages:
-  - .pre
-  - prevalidate
-  - build
-  - test
-  - deploy
-
 # ---------------------------------------------------------------
 # Generic script anchors
 # ---------------------------------------------------------------
@@ -114,94 +73,34 @@ stages:
 # These can be used later on to do common tasks
 
 # Prints useful information for every job and should be used at the beginning of each job
-.print-common-info: &print-common-info
+.print-common-info-windows: &print-common-info-windows
   - |
     echo "Printing common information for build job."
     echo "Current job is run on commit $CI_COMMIT_SHA"
     echo "Commit time was $CI_COMMIT_TIMESTAMP"
-    date | xargs echo "System time is"
-
-.activate-debug-mode-info-if-set: &activate-debug-mode-info-if-set
-  - if [ "$BUILD_WITH_DEBUG_MODE_INFO" = "true" ]; then
-  -   sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUGGING\ *\)\*\//\1/g" lib_com/options.h
-  -   sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUG_MODE_INFO\ *\)\*\//\1/g" lib_com/options.h
-  - fi
-
-.build-reference-binaries: &build-reference-binaries
-  - current_commit_sha=$(git rev-parse HEAD)
-  ### build reference binaries
-  - git checkout $REFERENCE_BRANCH
-  - git pull
-  - *activate-debug-mode-info-if-set
-  - make clean
-  - make -j
-  - mv ./IVAS_cod ./$REF_ENCODER_PATH
-  - mv ./IVAS_dec ./$REF_DECODER_PATH
-  - mv ./IVAS_rend ./IVAS_rend_ref
-  ### Return to current branch
-  - git restore .
-  - git checkout $current_commit_sha
-
-
-.build-reference-and-dut-binaries: &build-reference-and-dut-binaries
-### build reference binaries
-  - *build-reference-binaries
-### build dut binaries
-  - *activate-debug-mode-info-if-set
-  - make clean
-  - make -j
-
-.build-and-create-reference-outputs: &build-and-create-reference-outputs
-  - *build-reference-and-dut-binaries
-
-  ### prepare pytest
-  # create short test vectors
-  - python3 tests/create_short_testvectors.py
-  # create references
-  - exit_code=0
-  - enc_stats_arg=""
-  - if [ "$ENCODER_TEST" = "true" ]; then enc_stats_arg="--enc_stats"; fi
-  - python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?
-
-.update-scripts-repo: &update-scripts-repo
-  - cd $SCRIPTS_DIR
-  - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links
-  - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch
-  - git fetch
-  - git restore . # Just as a precaution
-  - git checkout $BASOP_CI_BRANCH_PC_REPO
-  - git pull
-  - cd -
-  - cp -r $SCRIPTS_DIR/ci .
-  - cp -r $SCRIPTS_DIR/scripts .
-  - cp -r $SCRIPTS_DIR/tests .
-  - cp $SCRIPTS_DIR/pytest.ini .
-
-.apply-testv-scaling: &apply-testv-scaling
-  - echo "Applying level scaling in scripts/testv using scale=$LEVEL_SCALING"
-  - tests/scale_pcm.py ./scripts/testv/ $LEVEL_SCALING
-
-.update-ltv-repo: &update-ltv-repo
-  - cd $LTV_DIR
-  - git pull
-  - cd -
-  
-.copy-ltv-files-to-testv-dir: &copy-ltv-files-to-testv-dir
-    - cp "$LTV_DIR"/*.wav scripts/testv/
-    - cp "$LTV_DIR"/*.met scripts/testv/
-    - cp "$LTV_DIR"/*.csv scripts/testv/
+    ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression
 
 .activate-Werror-linux: &activate-Werror-linux
   - sed -i.bak "s/^# \(CFLAGS += -Werror\)/\1/" Makefile
 
+.activate-WX-windows: &activate-WX-windows
+  - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt"
+  - Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" | ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path $_.FullName }
+
+.rules-merge-request:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
+    - when: never
+
 .rules-pytest-to-ref-short:
   rules:
+    - if: $PYTEST_MLD_SHORT # Set by scheduled pipeline
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
-    - if: $CI_PIPELINE_SOURCE == 'schedule'
-      when: never
 
 .rules-pytest-to-input-short:
   rules:
@@ -211,12 +110,9 @@ stages:
     - if: $CI_PIPELINE_SOURCE == 'schedule'
       when: never
 
-# TODO: only temporary as long the MR encoder tests should not compare to main
-.rules-pytest-to-ref-enc-short-temp:
+.rules-pytest-to-ref-enc-sort-dmx:
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
-    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare-enc-dmx"
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
     - if: $CI_PIPELINE_SOURCE == 'schedule'
@@ -259,23 +155,29 @@ stages:
 # Job templates
 # ---------------------------------------------------------------
 
-# templates to define stages and platforms
-.test-job-linux:
+# override for centrally defined job to make use of the basop runners
+.job-linux:
   tags:
     - ivas-basop-linux
 
-.build-job-linux:
-  stage: build
-  timeout: "2 minutes"
-  needs: []
-  tags:
-    - ivas-basop-linux
+# custom variant of this template, we need to update the scripts repo before every build
+.test-job-linux:
+  extends:
+    - .job-linux
+  before_script:
+    - !reference [.job-linux, before_script]
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+
+.print-results-banner: &print-results-banner
+  -   set +x
+  -   echo ""
+  -   echo -e "==================================================================================================================\n================================================== TEST RESULTS ==================================================\n==================================================================================================================\n"
 
 # template for test jobs on linux that need the TESTV_DIR
 .test-job-linux-needs-testv-dir:
   extends: .test-job-linux
   before_script:
-    - *update-scripts-repo
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
     - cp -r scripts/testv/* $TESTV_DIR/
 
@@ -286,31 +188,52 @@ stages:
   variables:
     # keep "mld" in artifact name for backwards compatibility reasons
     CSV_ARTIFACT_NAME: "mld--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
+    CSV_ARTIFACT_SPLIT: "mld--split--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
     MERGED_CSV_ARTIFACT_NAME: "$CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv"
     PAGES_HTML_ARTIFACT_NAME: "$CI_JOB_NAME-index.html"
     SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
+    SUMMARY_HTML_ARTIFACT_SPLIT: "summary_split_$CI_JOB_NAME.html"
     IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
+    IMAGES_ARTIFACT_SPLIT: "images_split_$CI_JOB_NAME"
   script:
-    - *print-common-info
-    - *update-scripts-repo
+    - !reference [ .job-linux, before_script ]
+
+    - set -euxo pipefail
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - if [ $USE_LTV -eq 1 ]; then
-    -    *update-ltv-repo
-    -    *copy-ltv-files-to-testv-dir
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
     -    testcase_timeout=$TESTCASE_TIMEOUT_LTV
     - else
     -    testcase_timeout=$TESTCASE_TIMEOUT_STV
     - fi
 
     - python3 ci/remove_unsupported_testcases.py $PRM_FILES
-    - if [ $LEVEL_SCALING != "1.0" ];then
-    -   *apply-testv-scaling
+    - if [ $LEVEL_SCALING != "1.0" ]; then
+    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
     - fi
 
-    - if [ "$ENCODER_TEST" = "true" ]; then BUILD_WITH_DEBUG_MODE_INFO="true"; fi
-    - *build-and-create-reference-outputs
+    - if [ "$COMPARE_DMX" = "true" ] || [ "$ENCODER_TEST" = "true" ]; then
+    -   BUILD_WITH_DEBUG_MODE_INFO="true"
+    - fi
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-and-create-float-ref-outputs.sh
 
-    - comp_args="--mld --ssnr --odg"
+    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
+    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"
+    - summary_args="MLD DIFF SSNR ODG"
+    - REPORT_ARG=""
     - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi
+    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; MEASURES_FOR_REPORT="$MEASURES_FOR_REPORT DELTA_ODG"; fi
+    - if [ "$SPLIT_COMPARISON" = "true" ]; then comp_args="${comp_args} --split-comparison"; fi
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-and-create-float-ref-outputs.sh
+
+    # DMX comparison only in manual job with no other metrics
+    - if [ "$COMPARE_DMX" = "true" ]; then
+    -   comp_args="--compare_enc_dmx"
+    - fi
+
     - echo "$comp_args"
 
     ### run pytest
@@ -318,10 +241,24 @@ stages:
     - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
-    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME
-    - mkdir $IMAGES_ARTIFACT_NAME
-    - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done
-    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
+    ### create histograms
+    - if [ "$SPLIT_COMPARISON" = "true" ]; then
+    -   python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME --split-csv-file $CSV_ARTIFACT_SPLIT
+    - else
+    -   python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME
+    - fi
+
+    # first for "whole" files comparison
+    - python3 scripts/create_histograms.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT --write-out-histograms
+    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT
+
+    - if [ "$SPLIT_COMPARISON" = "true" ]; then
+    -   python3 scripts/create_histograms.py $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT --measures $MEASURES_FOR_REPORT --write-out-histograms
+    -   python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_SPLIT $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_SPLIT --measures $MEASURES_FOR_REPORT
+    - else
+    # touch files to suppress warning for missing artifacts
+    -   touch $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT
+    - fi
 
     - if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
     -    id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH $CI_JOB_NAME $CI_PROJECT_ID)
@@ -361,18 +298,154 @@ stages:
       - report.html
       - $PAGES_HTML_ARTIFACT_NAME
       - $CSV_ARTIFACT_NAME
+      - $CSV_ARTIFACT_SPLIT
       - $MERGED_CSV_ARTIFACT_NAME
       - $SUMMARY_HTML_ARTIFACT_NAME
+      - $SUMMARY_HTML_ARTIFACT_SPLIT
       - $IMAGES_ARTIFACT_NAME
+      - $IMAGES_ARTIFACT_SPLIT
     expose_as: "pytest compare results"
     reports:
       junit:
         - report-junit.xml
 
-.ivas-pytest-on-merge-request-anchor: &ivas-pytest-on-merge-request-anchor
-  stage: test
+.check-up-to-date-in-comparison-jobs: &check-up-to-date-in-comparison-jobs
+    - |
+      commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)"
+      if [ $commits_behind_count -ne 0 ]; then
+        set +x
+        echo -e "Your branch is $commits_behind_count commits behind the target branch, possibly main changed during your pipeline run. Checking bitexactness or testing for regressions now can result in meaningless results. Run\n\t git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."
+        exit 1
+      fi
+
+.check-be-job:
+  extends:
+    - .test-job-linux
+    - .rules-pytest-to-main-short
+  before_script:
+    - !reference [ .test-job-linux, before_script ]
+    - rm -rf tests/dut tests/ref
+  variables:
+    USE_LTV: 0
+
+.check-be-to-target-job:
+  extends:
+    - .check-be-job
+  stage: check-be
   needs: ["build-codec-linux-make"]
   timeout: "300 minutes"
+  variables:
+    XML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
+    HTML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.html"
+    PYTEST_LOG_TARGET_BRANCH: "pytest-log-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME.txt"
+  script:
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+
+    - set -euxo pipefail
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+    - python3 tests/create_short_testvectors.py
+
+    - if [ $USE_LTV -eq 1 ]; then
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
+    -    testcase_timeout=$TESTCASE_TIMEOUT_LTV
+    - else
+    -    testcase_timeout=$TESTCASE_TIMEOUT_STV
+    - fi
+
+    - python3 ci/remove_unsupported_testcases.py $PRM_FILES
+    - python3 scripts/prepare_combined_format_inputs.py
+
+    - if [ $LEVEL_SCALING != "1.0" ];then
+    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
+    - fi
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh merge-target
+    - make clean
+    - make -j >> /dev/null
+    - *check-up-to-date-in-comparison-jobs
+
+    - exit_code_target=0
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
+
+    - exit_code=0
+    - rm -rf .pytest_cache || true
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt || exit_code=$?
+
+    - if [ $exit_code -ne 0 ]; then
+    -   exit_code=$EXIT_CODE_NON_BE
+    -   zip -r $PYTEST_CACHE_ARTIFACT .pytest_cache
+
+    -   grep "^FAILED" pytest_log.txt | sed "s/^FAILED /'/" | sed "s/] - .*/]'/" | tr "\n" " " > $FAILED_TESTCASES_LIST || true
+    -   grep "^FAILED" pytest_log.txt | sed "s/^FAILED //" | sed "s/] - .*/]/" > failed_testcases_for_printing.txt || true
+    -   num_failures=$(wc -l < failed_testcases_for_printing.txt)
+
+    -   grep "^ERROR" pytest_log.txt | sed "s/^ERROR /'/" | sed "s/] - .*/]'/" | tr "\n" " " > $ERRORS_TESTCASES_LIST || true
+    -   grep "^ERROR" pytest_log.txt | sed "s/^ERROR //" | sed "s/] - .*/]/" > errors_testcases_for_printing.txt || true
+    -   num_errors=$(wc -l < errors_testcases_for_printing.txt)
+
+    -   *print-results-banner
+    -   echo "Found these $num_failures non-bitexact testcases:"
+    -   cat failed_testcases_for_printing.txt
+
+    -   echo "Reproduce locally with:"
+    -   echo -e "1. Create references with target branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:\n\t- git checkout $(cat $FLOAT_REF_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- mv IVAS_cod IVAS_cod_ref\n\t- mv IVAS_dec IVAS_dec_ref\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --update_ref 1 --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH"
+    -   echo -e "2. Run test with source branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:\n\t- git checkout $(cat $CUT_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH"
+    -   echo "The individual command lines can be found in the html report in the job artifacts."
+    -   if [ $num_errors -ne 0 ]; then
+    -     exit_code=1
+    -     echo "There were errors present in the following testcases:"
+    -     cat errors_testcases_for_printing.txt
+    -   fi
+
+    -   exit $exit_code
+    - else
+    # create empty files to not have errors at artifact stage
+    -   touch $FAILED_TESTCASES_LIST
+    -   touch $ERRORS_TESTCASES_LIST
+    -   touch $PYTEST_CACHE_ARTIFACT
+    -   *print-results-banner
+    -   echo "All testcases are bitexact."
+    - fi
+    - exit $exit_code
+
+  allow_failure:
+    exit_codes:
+      - 123
+  artifacts:
+    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
+    expire_in: 1 week
+    when: always
+    paths:
+      - $XML_REPORT
+      - $HTML_REPORT
+      - $FAILED_TESTCASES_LIST
+      - $ERRORS_TESTCASES_LIST
+      - pytest_log.txt
+      - $PYTEST_CACHE_ARTIFACT
+      - $FLOAT_REF_COMMIT_FILE
+      - $CUT_COMMIT_FILE
+      - $MERGE_TARGET_COMMIT_FILE
+      - $PYTEST_LOG_TARGET_BRANCH
+    expose_as: "pytest compare results"
+    reports:
+      junit:
+        - $XML_REPORT
+        - $XML_REPORT
+
+.overwrite-pytest-cache-with-artifact: &overwrite-pytest-cache-with-artifact
+  - if [ -f $PYTEST_CACHE_ARTIFACT ]; then
+  -   rm -rf .pytest_cache || true
+  -   unzip $PYTEST_CACHE_ARTIFACT
+  - fi
+
+.check-regressions-pytest-job:
+  extends:
+    - .check-be-job
+  stage: test
+  timeout: "300 minutes"
   variables:
     XML_REPORT_BRANCH: "report-junit-branch-$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
     XML_REPORT_MAIN: "report-junit-main-$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
@@ -383,11 +456,29 @@ stages:
     IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
     SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
   script:
-    - *print-common-info
-    - *update-scripts-repo
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+
+    # create empty files for all artifacts to suppress warnings in case of no regressions found or all is BE
+    - touch $XML_REPORT_BRANCH $XML_REPORT_MAIN $HTML_REPORT_BRANCH $HTML_REPORT_MAIN $CSV_BRANCH $CSV_MAIN $SUMMARY_HTML_ARTIFACT_NAME $FLOAT_REF_COMMIT_FILE $CUT_COMMIT_FILE $MERGE_TARGET_COMMIT_FILE regressions_crashes.csv regressions_MLD.csv regressions_MAX_ABS_DIFF.csv regressions_MIN_SSNR.csv regressions_MIN_ODG.csv improvements_crashes.csv improvements_MLD.csv improvements_MAX_ABS_DIFF.csv improvements_MIN_SSNR.csv improvements_MIN_ODG.csv
+    - mkdir $IMAGES_ARTIFACT_NAME
+
+    - set -euxo pipefail
+
+    - if [ -s $FAILED_TESTCASES_LIST ]; then
+    -   *overwrite-pytest-cache-with-artifact
+    -   export PYTEST_ADDOPTS=--last-failed
+    - else
+    # turn off echoing back of commands for result printout
+    -   *print-results-banner
+    -   echo -e "All tested cases were bit-exact between $CI_MERGE_REQUEST_TARGET_BRANCH_NAME and $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME.\nNo need to check for regressions. All is fine."
+    -   exit 0
+    - fi
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+
     - if [ $USE_LTV -eq 1 ]; then
-    -    *update-ltv-repo
-    -    *copy-ltv-files-to-testv-dir
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
     -    testcase_timeout=$TESTCASE_TIMEOUT_LTV
     - else
     -    testcase_timeout=$TESTCASE_TIMEOUT_STV
@@ -395,69 +486,69 @@ stages:
 
     - python3 ci/remove_unsupported_testcases.py $PRM_FILES
     - if [ $LEVEL_SCALING != "1.0" ];then
-    -   *apply-testv-scaling
+    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
     - fi
 
     # check MR title for flag that allows regressions to be mergable
     - echo $CI_MERGE_REQUEST_TITLE > tmp.txt
     - allow_regressions_flag=$(grep -c --ignore-case "\[allow[ -]*regression\]" tmp.txt) || true
 
+    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
+    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"
+
     ### run branch first
     # this per default builds the branch and the reference and creates the reference outputs
-    - *build-and-create-reference-outputs
-    - exit_code=0
-    - python3 -m pytest --tb=no $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$?
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-and-create-float-ref-outputs.sh
+    - *check-up-to-date-in-comparison-jobs
+    # need to restore cache again
+    - *overwrite-pytest-cache-with-artifact
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
     - zero_errors_branch=$(cat $XML_REPORT_BRANCH | grep -c 'errors="0"') || true
     - python3 scripts/parse_xml_report.py $XML_REPORT_BRANCH $CSV_BRANCH
 
     # Store branch outputs for comparison
     - mv tests/dut tests/dut_branch
 
-    # create the summary based on the branch
-    - mkdir $IMAGES_ARTIFACT_NAME
-    - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done
-    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
+    # create the summary based on the branch only
+    - python3 scripts/create_histograms.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT
+    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT
 
     ### run main now
     - git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-    - git pull
+    - git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     - make clean
-    - make -j
-    - python3 -m pytest --tb=no $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
+    - make -j >> /dev/null
+    # need to restore cache again
+    - *overwrite-pytest-cache-with-artifact
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
     - python3 scripts/parse_xml_report.py $XML_REPORT_MAIN $CSV_MAIN
 
-    # If outputs of main and branch are equal, have equal reports and no run errors were encountered, the job will pass.
-    - diff_sba=0
-    - diff_param=0
-    - diff_report=0
-    - python3 scripts/batch_comp_audio.py --tool pyaudio3dtools -sd tests/dut/sba_bs/raw tests/dut_branch/sba_bs/raw || diff_sba=$?
-    - python3 scripts/batch_comp_audio.py --tool pyaudio3dtools -sd tests/dut/param_file/dec tests/dut_branch/param_file/dec || diff_param=$?
-    - diff $CSV_BRANCH $CSV_MAIN || diff_report=$?
-    - if [ $diff_param -eq 0 ] && [ $diff_sba -eq 0 ] && [ $diff_report -eq 0 ] && [ $zero_errors_branch -eq 1 ]; then
-    -    echo "Output BE to main, identical report and no run errors encountered."
-         # Add dummy files to avoid warning on missing artifacts
-    -    touch changes_crashes.csv
-    -    touch changes_MLD.csv
-    -    touch changes_MAXIMUM_ABS_DIFF.csv
-    -    touch changes_MIN_SSNR.csv
-    -    touch changes_MIN_ODG.csv
-    -    exit 0;
-    - fi
-
     ### compare the two csv files for regressions
     - regressions_found=0
-    - python3 scripts/basop_check_for_changes_in_testcases.py $CSV_BRANCH $CSV_MAIN || regressions_found=$?
+    - python3 scripts/basop_check_for_changes_in_testcases.py --show_improvements --xml_report $XML_REPORT_BRANCH $CSV_BRANCH $CSV_MAIN > regression_log.txt || regressions_found=$?
 
-    - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit_code=$EXIT_CODE_NON_BE; fi
-    - if [ $zero_errors_branch != 1 ]; then echo "Run errors encountered!"; exit_code=$EXIT_CODE_NON_BE; fi
-    - if [ $regressions_found != 0 ]; then
+    - exit_code=0
+    - *print-results-banner
+    - if [ $zero_errors_branch != 1 ]; then
+    -   echo "Run errors encountered!"
+    -   exit_code=$EXIT_CODE_FAIL
+    -   echo "Reproduce locally with:"
+    -   echo -e "1. Create references with target branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:\n\t- git checkout $(cat $FLOAT_REF_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- mv IVAS_cod IVAS_cod_ref\n\t- mv IVAS_dec IVAS_dec_ref\n\t- python3 -m pytest $(cat $ERRORS_TESTCASES_LIST) --update_ref 1 --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH"
+    -   echo -e "2. Run test with source branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:\n\t- git checkout $(cat $CUT_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- python3 -m pytest $(cat $ERRORS_TESTCASES_LIST) --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH"
+    -   echo "The individual command lines can be found in the regressions_crashes.csv files in the job artifacts."
+    - elif [ $regressions_found != 0 ] && [ "$SKIP_REGRESSION_CHECK" != "true" ]; then
+    -    cat regression_log.txt
     -    if [ $allow_regressions_flag == 0 ]; then
-    -        echo "Detected regression wrt to main, [allow regression] not set!"
+    -        echo "Detected regression wrt to $CI_MERGE_REQUEST_TARGET_BRANCH_NAME, [allow regression] not set!"
     -        exit_code=$EXIT_CODE_FAIL;
     -    else
-    -        echo "Detected regression wrt to main, [allow regression] set."
+    -        echo "Detected regression wrt to $CI_MERGE_REQUEST_TARGET_BRANCH_NAME, [allow regression] set."
     -        exit_code=$EXIT_CODE_NON_BE;
     -    fi
+    -   echo "Reproduce locally with:"
+    -   echo -e "1. Create references with target branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:\n\t- git checkout $(cat $FLOAT_REF_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- mv IVAS_cod IVAS_cod_ref\n\t- mv IVAS_dec IVAS_dec_ref\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --update_ref 1 --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH"
+    -   echo -e "2. Run test with source branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:\n\t- git checkout $(cat $CUT_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH"
+    -   echo "The individual command lines can be found in the regressions_*.csv files in the job artifacts."
     - fi
 
     - exit $exit_code
@@ -479,11 +570,19 @@ stages:
       - $CSV_MAIN
       - $SUMMARY_HTML_ARTIFACT_NAME
       - $IMAGES_ARTIFACT_NAME
-      - changes_crashes.csv
-      - changes_MLD.csv
-      - changes_MAXIMUM_ABS_DIFF.csv
-      - changes_MIN_SSNR.csv
-      - changes_MIN_ODG.csv
+      - $FLOAT_REF_COMMIT_FILE
+      - $CUT_COMMIT_FILE
+      - $MERGE_TARGET_COMMIT_FILE
+      - regressions_crashes.csv
+      - regressions_MLD.csv
+      - regressions_MAX_ABS_DIFF.csv
+      - regressions_MIN_SSNR.csv
+      - regressions_MIN_ODG.csv
+      - improvements_crashes.csv
+      - improvements_MLD.csv
+      - improvements_MAX_ABS_DIFF.csv
+      - improvements_MIN_SSNR.csv
+      - improvements_MIN_ODG.csv
     expose_as: "pytest compare results"
     reports:
       junit:
@@ -492,9 +591,11 @@ stages:
 
 
 .ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor
+  extends:
+    - .job-linux
   stage: test
   needs: ["build-codec-linux-make"]
-  timeout: "300 minutes"
+  timeout: "600 minutes"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
@@ -503,16 +604,29 @@ stages:
     - if: $CI_PIPELINE_SOURCE == 'schedule' && $IVAS_PYTEST_MSAN
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer"
   script:
-    - *print-common-info
-    - *update-scripts-repo
-    - *copy-ltv-files-to-testv-dir
+    - !reference [ .job-linux, before_script ]
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
     - python3 ci/remove_unsupported_testcases.py $PRM_FILES
-    - *build-reference-and-dut-binaries
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref
+    - set -euxo pipefail
+    - make_args="CLANG=$CLANG_NUM"
+    - if [[ $CLANG_NUM == 3 ]]; then
+    -   export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1,print_stacktrace=1"
+    -   python3 scripts/basop_create_ignorelist_for_ubsan.py
+    -   make_args="$make_args IGNORELIST=1"
+    - fi
     - make clean
-    - make -j CLANG=$CLANG_NUM
-    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
-    - testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS
-    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
+    - make -j $make_args >> /dev/null
+    - testcase_timeout_arg="--testcase_timeout $TESTCASE_TIMEOUT_LTV_SANITIZERS"
+    # disable per-testcase timeout for msan to evaluate what is going on that it takes so long
+    - if [[ $CLANG_NUM = 1 ]]; then
+    -   testcase_timeout_arg=""
+    - fi
+    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml $testcase_timeout_arg --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
   artifacts:
     name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
     when: always
@@ -532,11 +646,13 @@ stages:
     SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
     IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
   script:
-    - *print-common-info
-    - *update-scripts-repo
+    - !reference [ .job-linux, before_script ]
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - if [ $USE_LTV -eq 1 ]; then
-    -    *update-ltv-repo
-    -    *copy-ltv-files-to-testv-dir
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
     -    testcase_timeout=$TESTCASE_TIMEOUT_LTV
     - else
     -    testcase_timeout=$TESTCASE_TIMEOUT_STV
@@ -544,14 +660,17 @@ stages:
 
     - python3 ci/remove_unsupported_testcases.py $PRM_FILES
     - if [ $LEVEL_SCALING != "1.0" ];then
-    -   *apply-testv-scaling
+    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
     - fi
-    - *build-reference-and-dut-binaries
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh
+
+    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
+    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"
 
     ### run pytest
     - exit_code=0
-    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH  --compare_to_input || exit_code=$?
-    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH  --compare_to_input || exit_code=$?
+    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH  --compare_to_input || exit_code=$?
+    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH  --compare_to_input || exit_code=$?
     - zero_errors_ref=$(cat report-junit-ref.xml | grep -c 'errors="0"') || true
     - zero_errors_dut=$(cat report-junit-dut.xml | grep -c 'errors="0"') || true
     - python3 scripts/parse_xml_report.py report-junit-ref.xml report-ref.csv
@@ -560,8 +679,8 @@ stages:
 
     # create summary
     - mkdir $IMAGES_ARTIFACT_NAME
-    - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py report-diff.csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE --diff; done
-    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
+    - python3 scripts/create_histograms.py report-diff.csv $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT --write-out-histograms --no-bins
+    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT
 
     - exit 0
 
@@ -614,6 +733,37 @@ uninterruptible:
 # verification jobs
 # ---------------------------------------------------------------
 
+branch-is-up-to-date-with-target-pre:
+  extends:
+    - .job-linux
+    - .rules-merge-request
+  stage: prevalidate
+  needs: []
+  tags:
+    - ivas-basop-linux
+  script:
+    - |
+      commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)"
+      if [ $commits_behind_count -ne 0 ]; then
+        echo -e "Your branch is $commits_behind_count commits behind the target branch, run\n\tgit pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."
+        exit 1
+      fi
+
+branch-is-up-to-date-with-target-post:
+  extends:
+    - .job-linux
+    - .rules-merge-request
+  stage: postvalidate
+  tags:
+    - ivas-basop-linux
+  script:
+    - |
+      commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)"
+      if [ $commits_behind_count -ne 0 ]; then
+        echo -e "Your branch is $commits_behind_count commits behind the target branch, possibly main changed during your pipeline run, run\n\tgit pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."
+        exit 1
+      fi
+
 clang-format-check:
   extends:
     - .test-job-linux
@@ -629,7 +779,7 @@ clang-format-check:
   needs: []
   timeout: "5 minutes"
   script:
-    - *update-scripts-repo
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     # Set up variables. This can't be done in the "variables" section because variables are not expanded properly there
     - PATCH_FILE_NAME="$ARTIFACT_BASE_NAME".patch
     - >
@@ -681,8 +831,9 @@ build-codec-linux-make:
       when: never
   extends:
     - .build-job-linux
+  timeout: "100 minutes"
   script:
-    - *print-common-info
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - *activate-Werror-linux
     - make -j
 
@@ -697,11 +848,11 @@ build-codec-linux-instrumented-make:
       when: never
   extends:
     - .build-job-linux
-  timeout: "7 minutes"
+  timeout: "100 minutes"
   script:
-    - *print-common-info
-    - *update-scripts-repo
-    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p BASOP
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY
     - make -j -C $INSTR_DIR
 
 build-codec-linux-debugging-make:
@@ -714,129 +865,264 @@ build-codec-linux-debugging-make:
       when: never
   extends:
     - .build-job-linux
-  timeout: "7 minutes"
+  timeout: "100 minutes"
   variables:
     BUILD_WITH_DEBUG_MODE_INFO: "true"
   script:
-    - *print-common-info
-    - *activate-debug-mode-info-if-set
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/activate-debug-mode-info-if-set.sh
     - make -j
 
+build-codec-windows-msbuild:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web'
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # trigger build job for all MRs
+    - if: $CI_PIPELINE_SOURCE == 'schedule'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
+  extends:
+    - .build-job-windows
+  timeout: "10 minutes"
+  tags:
+    - ivas-windows
+  script:
+    - *print-common-info-windows
+    - *activate-WX-windows
+    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug
+
 # ---------------------------------------------------------------
 # Short test jobs that run in merge request pipelines
 # ---------------------------------------------------------------
 
-### jobs that test fx encoder -> flt decoder
-# TODO: reenable once encoder tests shall compare to main
-# ivas-pytest-compare_to_main-short-enc:
-#   extends:
-#     - .rules-pytest-to-main-short
-#     - .test-job-linux
-#   before_script:
-#     - USE_LTV=0
-#     - DUT_DECODER_PATH=./IVAS_dec_ref
-#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
-#     - LEVEL_SCALING=1.0
-#   <<: *ivas-pytest-on-merge-request-anchor
-
-# ivas-pytest-compare_to_main-short-enc-lev-10:
-#   extends:
-#     - .rules-pytest-to-main-short
-#     - .test-job-linux
-#   before_script:
-#     - USE_LTV=0
-#     - DUT_DECODER_PATH=./IVAS_dec_ref
-#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
-#     - LEVEL_SCALING=0.3162
-#   <<: *ivas-pytest-on-merge-request-anchor
-
-# ivas-pytest-compare_to_main-short-enc-lev+10:
-#   extends:
-#     - .rules-pytest-to-main-short
-#     - .test-job-linux
-#   before_script:
-#     - USE_LTV=0
-#     - DUT_DECODER_PATH=./IVAS_dec_ref
-#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
-#     - LEVEL_SCALING=3.162
-#   <<: *ivas-pytest-on-merge-request-anchor
+### jobs that check for bitexactness of fx encoder and decoder
+check-be-to-target-short-enc-0db:
+  extends:
+    - .check-be-to-target-job
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"
+    # -/-0dB
+    LEVEL_SCALING: "1.0"
+    # overwrite decoder with float reference one
+    DUT_DECODER_PATH: "$REF_DECODER_PATH"
+    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
+
+check-be-to-target-short-enc-+10db:
+  extends:
+    - .check-be-to-target-job
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"
+    # +10dB
+    LEVEL_SCALING: "3.162"
+    # overwrite decoder with float reference one
+    DUT_DECODER_PATH: "$REF_DECODER_PATH"
+    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
+
+check-be-to-target-short-enc--10db:
+  extends:
+    - .check-be-to-target-job
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"
+    # -10dB
+    LEVEL_SCALING: "0.3162"
+    # overwrite decoder with float reference one
+    DUT_DECODER_PATH: "$REF_DECODER_PATH"
+    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
+
+check-be-to-target-short-dec-0db:
+  extends:
+    - .check-be-to-target-job
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE"
+    # +/-0dB
+    LEVEL_SCALING: "1.0"
+    # overwrite encoder with float reference one
+    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
+    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
+
+check-be-to-target-short-dec-+10db:
+  extends:
+    - .check-be-to-target-job
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE"
+    # +10dB
+    LEVEL_SCALING: "3.162"
+    # overwrite encoder with float reference one
+    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
+    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
+
+check-be-to-target-short-dec--10db:
+  extends:
+    - .check-be-to-target-job
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE"
+    # -10dB
+    LEVEL_SCALING: "0.3162"
+    # overwrite encoder with float reference one
+    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
+    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
+
+### jobs that check for regressions on non-BE testcases
+check-regressions-short-enc-0db:
+  extends:
+    - .check-regressions-pytest-job
+  needs:
+    - job: "check-be-to-target-short-enc-0db"
+      artifacts: true
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"
+    # +/-0dB
+    LEVEL_SCALING: "1.0"
+    # overwrite decoder with float reference one
+    DUT_DECODER_PATH: "$REF_DECODER_PATH"
+    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
+
+check-regressions-short-enc-+10db:
+  extends:
+    - .check-regressions-pytest-job
+  needs:
+    - job: "check-be-to-target-short-enc-+10db"
+      artifacts: true
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"
+    # +10dB
+    LEVEL_SCALING: "3.162"
+    # overwrite decoder with float reference one
+    DUT_DECODER_PATH: "$REF_DECODER_PATH"
+    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
+
+check-regressions-short-enc--10db:
+  extends:
+    - .check-regressions-pytest-job
+  needs:
+    - job: "check-be-to-target-short-enc--10db"
+      artifacts: true
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"
+    # -10dB
+    LEVEL_SCALING: "0.3162"
+    # overwrite decoder with float reference one
+    DUT_DECODER_PATH: "$REF_DECODER_PATH"
+    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
+
+check-regressions-short-dec-0db:
+  extends:
+    - .check-regressions-pytest-job
+  needs:
+    - job: "check-be-to-target-short-dec-0db"
+      artifacts: true
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE"
+    # +/-0dB
+    LEVEL_SCALING: "1"
+    # overwrite encoder with float reference one
+    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
+    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
+
+check-regressions-short-dec-+10db:
+  extends:
+    - .check-regressions-pytest-job
+  needs:
+    - job: "check-be-to-target-short-dec-+10db"
+      artifacts: true
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE"
+    # +10dB
+    LEVEL_SCALING: "3.162"
+    # overwrite encoder with float reference one
+    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
+    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
+
+check-regressions-short-dec--10db:
+  extends:
+    - .check-regressions-pytest-job
+  needs:
+    - job: "check-be-to-target-short-dec--10db"
+      artifacts: true
+  variables:
+    TEST_SUITE: "$SHORT_TEST_SUITE"
+    # -10dB
+    LEVEL_SCALING: "0.3162"
+    # overwrite encoder with float reference one
+    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
+    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
 
-### jobs that test flt encoder -> fx decoder
-ivas-pytest-compare_to_main-short-dec:
+# ---------------------------------------------------------------
+# Short test jobs for running from web interface or schedule
+# ---------------------------------------------------------------
+
+### jobs that test fx encoder -> flt decoder
+ivas-pytest-compare_to_ref-short-enc:
   extends:
-    - .rules-pytest-to-main-short
+    - .rules-pytest-to-ref-short
     - .test-job-linux
   before_script:
     - USE_LTV=0
-    - DUT_ENCODER_PATH=./IVAS_cod_ref
-    - TEST_SUITE="$SHORT_TEST_SUITE"
+    - ENCODER_TEST="true"
+    - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=1.0
-    - rm -rf tests/dut tests/ref
-  <<: *ivas-pytest-on-merge-request-anchor
+  <<: *ivas-pytest-anchor
 
-ivas-pytest-compare_to_main-short-dec-lev-10:
+ivas-pytest-compare_to_ref-short-enc-lev-10:
   extends:
-    - .rules-pytest-to-main-short
+    - .rules-pytest-to-ref-short
     - .test-job-linux
   before_script:
     - USE_LTV=0
-    - DUT_ENCODER_PATH=./IVAS_cod_ref
-    - TEST_SUITE="$SHORT_TEST_SUITE"
+    - ENCODER_TEST="true"
+    - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=0.3162
-    - rm -rf tests/dut tests/ref
-  <<: *ivas-pytest-on-merge-request-anchor
+  <<: *ivas-pytest-anchor
 
-ivas-pytest-compare_to_main-short-dec-lev+10:
+ivas-pytest-compare_to_ref-short-enc-lev+10:
   extends:
-    - .rules-pytest-to-main-short
+    - .rules-pytest-to-ref-short
     - .test-job-linux
   before_script:
     - USE_LTV=0
-    - DUT_ENCODER_PATH=./IVAS_cod_ref
-    - TEST_SUITE="$SHORT_TEST_SUITE"
+    - ENCODER_TEST="true"
+    - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=3.162
-    - rm -rf tests/dut tests/ref
-  <<: *ivas-pytest-on-merge-request-anchor
-
-# ---------------------------------------------------------------
-# Short test jobs for running from web interface or schedule
-# ---------------------------------------------------------------
+  <<: *ivas-pytest-anchor
 
-### jobs that test fx encoder -> flt decoder
-ivas-pytest-compare_to_ref-short-enc:
+# encoder dmx comparison jobs
+ivas-pytest-compare_to_ref-dmx-short-enc:
   extends:
-    #- .rules-pytest-to-ref-short
-    - .rules-pytest-to-ref-enc-short-temp
+    - .rules-pytest-to-ref-enc-sort-dmx
     - .test-job-linux
   before_script:
     - USE_LTV=0
     - ENCODER_TEST="true"
+    - COMPARE_DMX="true"
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=1.0
   <<: *ivas-pytest-anchor
 
-ivas-pytest-compare_to_ref-short-enc-lev-10:
+ivas-pytest-compare_to_ref-dmx-short-enc-lev-10:
   extends:
-    #- .rules-pytest-to-ref-short
-    - .rules-pytest-to-ref-enc-short-temp
-    - .test-job-linux    
+    - .rules-pytest-to-ref-enc-sort-dmx
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - ENCODER_TEST="true"
+    - COMPARE_DMX="true"
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=0.3162
   <<: *ivas-pytest-anchor
 
-ivas-pytest-compare_to_ref-short-enc-lev+10:
+ivas-pytest-compare_to_ref-dmx-short-enc-lev+10:
   extends:
-    #- .rules-pytest-to-ref-short
-    - .rules-pytest-to-ref-enc-short-temp
-    - .test-job-linux    
+    - .rules-pytest-to-ref-enc-sort-dmx
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - ENCODER_TEST="true"
+    - COMPARE_DMX="true"
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=3.162
@@ -845,6 +1131,8 @@ ivas-pytest-compare_to_ref-short-enc-lev+10:
 ivas-pytest-enc-msan:
   extends:
     - .test-job-linux
+  tags:
+    - ivas-basop-linux-fast
   before_script:
     - CLANG_NUM=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -854,6 +1142,8 @@ ivas-pytest-enc-msan:
 ivas-pytest-enc-asan:
   extends:
     - .test-job-linux
+  tags:
+    - ivas-basop-linux-fast
   before_script:
     - CLANG_NUM=2
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -863,10 +1153,12 @@ ivas-pytest-enc-asan:
 ivas-pytest-enc-usan:
   extends:
     - .test-job-linux
+  tags:
+    - ivas-basop-linux-fast
   before_script:
     - CLANG_NUM=3
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
-    - TEST_SUITE=$SHORT_TEST_SUITE_ENCODER
+    - TEST_SUITE=$LONG_TEST_SUITE_ENCODER
   <<: *ivas-pytest-sanitizers-anchor
   
 ### jobs that test flt encoder -> fx decoder
@@ -929,6 +1221,8 @@ ivas-pytest-compare-to-input-short-enc:
 ivas-pytest-dec-msan:
   extends:
     - .test-job-linux
+  tags:
+    - ivas-basop-linux-fast
   before_script:
     - CLANG_NUM=1
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -938,6 +1232,8 @@ ivas-pytest-dec-msan:
 ivas-pytest-dec-asan:
   extends:
     - .test-job-linux
+  tags:
+    - ivas-basop-linux-fast
   before_script:
     - CLANG_NUM=2
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -947,10 +1243,12 @@ ivas-pytest-dec-asan:
 ivas-pytest-dec-usan:
   extends:
     - .test-job-linux
+  tags:
+    - ivas-basop-linux-fast
   before_script:
     - CLANG_NUM=3
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
-    - TEST_SUITE=$SHORT_TEST_SUITE
+    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
   <<: *ivas-pytest-sanitizers-anchor
 
 # ---------------------------------------------------------------
@@ -966,39 +1264,49 @@ ivas-pytest-compare_ref-long-enc:
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
     - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=1.0
+    - SPLIT_COMPARISON="true"
   <<: *ivas-pytest-anchor
   
 ivas-pytest-compare_ref-long-dec:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
+  tags:
+    - ivas-basop-linux
+    - high-memory-capacity
   before_script:
     - USE_LTV=1  
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
     - TEST_SUITE="$LONG_TEST_SUITE"
     - LEVEL_SCALING=1.0
+    - SPLIT_COMPARISON="true"
   <<: *ivas-pytest-anchor
   
 ivas-pytest-compare_ref-long-enc-lev-10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
     - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=0.3162
+    - SPLIT_COMPARISON="true"
   <<: *ivas-pytest-anchor
   
 ivas-pytest-compare_ref-long-dec-lev-10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
+  tags:
+    - ivas-basop-linux
+    - high-memory-capacity
   before_script:
     - USE_LTV=1
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
     - TEST_SUITE="$LONG_TEST_SUITE"
     - LEVEL_SCALING=0.3162
+    - SPLIT_COMPARISON="true"
   <<: *ivas-pytest-anchor
 
 ivas-pytest-compare_ref-long-enc-lev+10:
@@ -1010,17 +1318,22 @@ ivas-pytest-compare_ref-long-enc-lev+10:
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
     - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=3.162
+    - SPLIT_COMPARISON="true"
   <<: *ivas-pytest-anchor
   
 ivas-pytest-compare_ref-long-dec-lev+10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
+  tags:
+    - ivas-basop-linux
+    - high-memory-capacity        
   before_script:
     - USE_LTV=1  
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
     - TEST_SUITE="$LONG_TEST_SUITE"
     - LEVEL_SCALING=3.162
+    - SPLIT_COMPARISON="true"
   <<: *ivas-pytest-anchor
 
 ivas-smoke-test-saturation:
@@ -1031,14 +1344,14 @@ ivas-smoke-test-saturation:
     - USE_LTV=1
     - LEVEL_SCALING=32768
 
-    - *print-common-info
-    - *update-scripts-repo
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - if [ $USE_LTV -eq 1 ]; then
-    -    *update-ltv-repo
-    -    *copy-ltv-files-to-testv-dir
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    -    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
     - fi
     - if [ $LEVEL_SCALING != "1.0" ];then
-    -   *apply-testv-scaling
+    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
     - fi
     - cp -r scripts/testv/* $TESTV_DIR/
 
@@ -1074,13 +1387,13 @@ coverage-test-on-main-scheduled:
   stage: test
   timeout: 3 hours
   script:
-    - *print-common-info
-    - *update-scripts-repo    
-    - *update-ltv-repo
-    - *copy-ltv-files-to-testv-dir
-    - *build-reference-binaries
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref
     # Build DuT binaries with GCOV
-    - make clean
+    - make clean >> /dev/null
     - make GCOV=1 -j
     - cp IVAS_rend IVAS_rend_ref # Copy to ensure instrumented renderer is run in the first pytest call
 
@@ -1135,10 +1448,10 @@ be-2-evs-26444:
   stage: test
   timeout: "120 minutes" # To be revisited
   script:
-    - *print-common-info
-    - *update-scripts-repo
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - sed -i".bak" "s/\(#define EVS_FLOAT\)/\/\/\1/" lib_com/options.h
-    - make -j
+    - make -j  >> /dev/null
 
     # copy over to never change the testvector dir
     - cp -r $EVS_BE_TEST_DIR_BASOP ./evs_be_test
@@ -1172,6 +1485,18 @@ ivas-pytest-renderer:
     - LEVEL_SCALING=1.0
   <<: *ivas-pytest-anchor
 
+peaq-enc-passthrough:
+  extends:
+    - .test-job-linux
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "peaq-enc-passthrough"
+  before_script:
+    - USE_LTV=0
+    - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE="tests/test_enc_passthrough.py"
+    - DELTA_ODG="true"
+    - LEVEL_SCALING=1.0
+  <<: *ivas-pytest-anchor
 
 # ---------------------------------------------------------------
 # Various other tests
@@ -1188,9 +1513,9 @@ voip-be-on-merge-request:
   needs: ["build-codec-linux-make"]
   timeout: "10 minutes"
   script:
-    - *print-common-info
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - make clean
-    - make -j
+    - make -j >> /dev/null
     - python3 -m pytest tests/test_be_for_jbm_neutral_dly_profile.py
 
 
@@ -1208,21 +1533,38 @@ voip-be-on-merge-request:
   # this is a testing/maintenance mechanism to force getting the log history from a specific job id
   # see below in the concrete complexity jobs
   - if [ "$JOB_ID_INJECT" != "" ]; then job_id=$JOB_ID_INJECT; fi
-  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
-  - unzip artifacts.zip || true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
-  - ls
+  - curl --silent --show-error --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
+  - unzip -qq artifacts.zip || true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
   - public_dir="$CI_JOB_NAME-public"
+
   # if is needed to catch case when no artifact is there (first run), similarly as above
-  - if [[ -d $public_dir ]]; then mv $public_dir/* wmops/;  fi
-  - ls wmops
+  # 1. check for public_dir being there as this might not be the case when artifact download failed
+  # 2. check for public dir not being empty - handle job failures in prev job that happen after the dir is created. In that case, the empty dir is in the artifacts
+  - if [ -d $public_dir ] && [ ! -z "$( ls -A $public_dir )" ]; then
+  -   mv $public_dir/* wmops/
+  # check here if we have the split-by-levels files present - if not, fake them up with the existing global one
+  # this is needed for the first run with split graphs on a branch where the global version did run previously
+  # NOTE: checking only for level_1 file here as this should already be sufficient
+  # NOTE2: also not chechking for RAM for same reason
+  -   wmops_all_global="wmops/log_wmops_all.txt"
+  -   ram_all_global="wmops/log_ram_all.txt"
+  -   if [ -f "${wmops_all_global}" ] && [ ! -f "wmops/log_wmops_all_level_1.txt" ]; then
+  -     declare -a suffixes=("level_1" "level_2" "level_3" "rate_sw")
+  -     for suffix in "${suffixes[@]}"; do
+  -       cp ${wmops_all_global} wmops/log_wmops_all_${suffix}.txt
+  -       cp ${ram_all_global} wmops/log_ram_all_${suffix}.txt
+  -     done
+  -   fi
+  - fi
+
   - rm artifacts.zip
   - rm -rf $public_dir
 
   ### 1.5.part: get the corresponding measurement from ivas-float-update
   - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update $CI_JOB_NAME $CI_PROJECT_ID)
   - echo $job_id
-  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip
-  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv" || true
+  - curl --silent --show-error --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip
+  - unzip -qq -j artifacts_ref.zip "*latest_WMOPS.csv" || true
   # add file to arguments only if the artifact could be retrieved to prevent error later.
   - if [ -f latest_WMOPS.csv ]; then GET_WMOPS_ARGS="$GET_WMOPS_ARGS latest_WMOPS.csv"; fi
 
@@ -1230,13 +1572,11 @@ voip-be-on-merge-request:
   &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
   - public_dir="$CI_JOB_NAME-public"
   - mkdir $public_dir
-  - mv -f wmops/log_*_all.txt ./*.js ${public_dir}/
+  - mv -f wmops/log_*_all*.txt ./*.js ${public_dir}/
   # move logfiles for links
   - mkdir $public_dir/logs
   # first move logs
   - log_files=$(cat $public_dir/graphs*.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")
-  - echo $log_files
-  - ls wmops/logs
   - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done
   # copy index page blueprint
   - cp ci/complexity_measurements/index_complexity.html ${public_dir}/index.html
@@ -1244,7 +1584,16 @@ voip-be-on-merge-request:
   - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html
   # do separately here to avoid overwrite complaints by mv
   - mv -f ci/complexity_measurements/style.css ${public_dir}/
-  - ls $public_dir
+
+.complexity-measurements-report-summary: &complexity-measurements-report-summary
+  - *print-results-banner
+  - if [ $ret_val -eq 0 ]; then
+  -   echo -e "No crashes occured.\nNo changes in complexity or memory usage (>1%) detected."
+  - elif [ $ret_val -eq 123 ]; then
+  -   echo -e "Changes in complexity or memory usage (>1%) detected!!!\nNo crashes occured."
+  - else
+  -   echo -e "Something went wrong in running the codec. Likely some modes were crashing."
+  - fi
 
 .complexity-template:
   extends:
@@ -1252,21 +1601,27 @@ voip-be-on-merge-request:
   stage: test
   variables:
     ret_val: 0
-    GET_WMOPS_ARGS: "mem_only basop"
+    GET_WMOPS_ARGS: "mem_only"
   timeout: 3 hours 30 minutes
   before_script:
-    - *print-common-info
-    - *update-scripts-repo
-    - *update-ltv-repo
-    - *build-reference-and-dut-binaries
+    - !reference [ .test-job-linux, before_script ]
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh
     - *complexity-measurements-setup
-    - which coan
+    # delete previous jobs logfiles if present (-f flag ensures return calue of 0 even in first run where this folder is not present)
+    - rm -rf COMPLEXITY/logs
+  allow_failure:
+    exit_codes:
+      - 123
   artifacts:
     name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
     when: always
     expire_in: 2 week
     paths:
       - $CI_JOB_NAME-public
+      - COMPLEXITY/logs
 
 complexity-stereo-in-stereo-out:
   extends:
@@ -1280,6 +1635,7 @@ complexity-stereo-in-stereo-out:
     - out_format=stereo
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-ism-in-binaural-out:
@@ -1297,6 +1653,7 @@ complexity-ism-in-binaural-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-ism-in-binaural_room_ir-out:
@@ -1314,6 +1671,7 @@ complexity-ism-in-binaural_room_ir-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-ism-in-ext-out:
@@ -1331,6 +1689,7 @@ complexity-ism-in-ext-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-sba-hoa3-in-hoa3-out:
@@ -1348,6 +1707,7 @@ complexity-sba-hoa3-in-hoa3-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-sba-hoa3-in-binaural-out:
@@ -1365,6 +1725,7 @@ complexity-sba-hoa3-in-binaural-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-sba-hoa3-in-binaural_room_ir-out:
@@ -1382,6 +1743,7 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-mc-in-7_1_4-out:
@@ -1399,6 +1761,7 @@ complexity-mc-in-7_1_4-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-mc-in-binaural-out:
@@ -1416,6 +1779,7 @@ complexity-mc-in-binaural-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-mc-in-binaural_room_ir-out:
@@ -1433,6 +1797,7 @@ complexity-mc-in-binaural_room_ir-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-masa-in-ext-out:
@@ -1450,6 +1815,7 @@ complexity-masa-in-ext-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-masa-in-binaural-out:
@@ -1467,6 +1833,7 @@ complexity-masa-in-binaural-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-masa-in-hoa3-out:
@@ -1484,6 +1851,7 @@ complexity-masa-in-hoa3-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 # complexity-omasa-in-ext-out:
@@ -1501,6 +1869,7 @@ complexity-masa-in-hoa3-out:
 #     - ret_val=0
 #     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
 #     - *complexity-measurements-prepare-artifacts
+#     - *complexity-measurements-report-summary
 #     - exit $ret_val
 
 complexity-omasa-in-binaural-out:
@@ -1518,6 +1887,7 @@ complexity-omasa-in-binaural-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-omasa-in-hoa3-out:
@@ -1535,6 +1905,7 @@ complexity-omasa-in-hoa3-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-StereoDmxEVS-stereo-in-mono-out:
@@ -1552,6 +1923,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 # complexity-osba-in-ext-out:
@@ -1567,6 +1939,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
 #     - ret_val=0
 #     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
 #     - *complexity-measurements-prepare-artifacts
+#     - *complexity-measurements-report-summary
 #     - exit $ret_val
 
 complexity-osba-in-binaural-out:
@@ -1584,6 +1957,7 @@ complexity-osba-in-binaural-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 complexity-osba-in-binaural_room_ir-out:
@@ -1601,6 +1975,7 @@ complexity-osba-in-binaural_room_ir-out:
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - *complexity-measurements-report-summary
     - exit $ret_val
 
 # job that sets up gitlab pages website
@@ -1611,8 +1986,10 @@ pages:
   rules:
     - if: $UPDATE_PAGES
   script:
-    - *print-common-info
-    - *update-scripts-repo
+    - !reference [ .job-linux, before_script ]
+
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
+    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - python3 ci/setup_pages.py
     - ls
     - ls -lh public
diff --git a/.gitlab-ci/rules-basis.yml b/.gitlab-ci/rules-basis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c650f574a59d41dc67aaa32f7250fcf73f906848
--- /dev/null
+++ b/.gitlab-ci/rules-basis.yml
@@ -0,0 +1,53 @@
+# overwrites the default rules in the IVAS CI repository
+# should be refactored and unified
+.rules-basis:
+  rules:
+    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      variables:
+        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
+    ### disabled for now because pipeline cd is redundant with MR pipeline with current workflow
+    # - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main
+    #   variables:
+    #     IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing
+      variables:
+        IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run encoder dmx comparison against float ref: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-long'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-to-input'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run comparison tools against input (pass-through only): $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-saturation-smoke-test'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run saturation smoke-test: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'
+      variables:
+        IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer'
+      variables:
+        IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'
+      variables:
+        IVAS_PIPELINE_NAME: 'Renderer test: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'complexity'
+      variables:
+        IVAS_PIPELINE_NAME: 'Complexity Measurement on $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test'
+      variables:
+        IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'
+      variables:
+        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch
+      variables:
+        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'
diff --git a/.gitlab-ci/variables.yml b/.gitlab-ci/variables.yml
new file mode 100644
index 0000000000000000000000000000000000000000..94bb71fb347b5349d9933564dbd35964e9daa0b7
--- /dev/null
+++ b/.gitlab-ci/variables.yml
@@ -0,0 +1,65 @@
+variables:
+  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
+  FLOAT_REF_BRANCH: "ivas-float-update"
+  SCRIPTS_DIR: "/usr/local/scripts"
+  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
+  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
+  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
+  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
+  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
+  TEST_SUITE: ""
+  # These path variables are used by the pytest calls.
+  # They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain
+  DUT_ENCODER_PATH: "./IVAS_cod"
+  DUT_DECODER_PATH: "./IVAS_dec"
+  REF_ENCODER_PATH: "./IVAS_cod_ref"
+  REF_DECODER_PATH: "./IVAS_dec_ref"
+  MERGE_TARGET_ENCODER_PATH: "./IVAS_cod_merge_target"
+  MERGE_TARGET_DECODER_PATH: "./IVAS_dec_merge_target"
+  # These path variables are used for building the binaries
+  # They should never be overwritten!
+  REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_ref"
+  REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_ref"
+  MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_target"
+  MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"
+  LEVEL_SCALING: "1.0"
+  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
+  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
+  TESTCASE_TIMEOUT_STV: 900
+  TESTCASE_TIMEOUT_LTV: 2400
+  TESTCASE_TIMEOUT_LTV_SANITIZERS: 10800
+  CI_REGRESSION_THRESH_MLD: "0.1"
+  CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
+  CI_REGRESSION_THRESH_SSNR: "-1"
+  CI_REGRESSION_THRESH_ODG: "-0.05"
+  INSTR_DIR: "scripts/c-code_instrument"
+  BUILD_WITH_DEBUG_MODE_INFO: ""
+  ENCODER_TEST: ""
+  DELTA_ODG: ""
+  COMPARE_DMX: ""
+  SPLIT_COMPARISON: ""
+  SKIP_REGRESSION_CHECK: ""
+  FAILED_TESTCASES_LIST: "failed-testcases.txt"
+  ERRORS_TESTCASES_LIST: "errors-testcases.txt"
+  PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
+  MEASURES_FOR_REPORT: "MLD MAX_ABS_DIFF MIN_SSNR MIN_ODG"
+  FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
+  CUT_COMMIT_FILE: "CuT-git-sha.txt"
+  MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
+  MANUAL_PIPELINE_TYPE:
+    description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
+    value: 'default'
+    options:
+      - 'default'
+      - 'pytest-compare'
+      - 'pytest-compare-enc-dmx'
+      - 'pytest-compare-long'
+      - 'pytest-compare-to-input'
+      - 'pytest-saturation-smoke-test'
+      - 'evs-26444'
+      - 'sanitizer'
+      - 'pytest-renderer'
+      - 'complexity'
+      - 'coverage'
+      - 'voip-be-test'
+      - 'peaq-enc-passthrough'
diff --git a/.gitlab/issue_templates/float-update-porting.md b/.gitlab/issue_templates/float-update-porting.md
new file mode 100644
index 0000000000000000000000000000000000000000..19bbf7ba8c6def64e62370be7af899305207a50d
--- /dev/null
+++ b/.gitlab/issue_templates/float-update-porting.md
@@ -0,0 +1,6 @@
+# Basic Info
+
+<!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->
+- Original merge request in float repo:
+
+/label ~Type:FloatUpdatePorting ~Status::ToDo
diff --git a/.gitlab/merge_request_templates/float-update-porting.md b/.gitlab/merge_request_templates/float-update-porting.md
new file mode 100644
index 0000000000000000000000000000000000000000..5b6d90dad72b5e2e145b118dd1fff2d5efb196f2
--- /dev/null
+++ b/.gitlab/merge_request_templates/float-update-porting.md
@@ -0,0 +1,6 @@
+
+- Link to issue in BASOP repo:
+- Link to original MR in float repo:
+- Requested reviewers:
+
+/label Type:FloatUpdatePorting
diff --git a/LICENSE.md b/LICENSE.md
index 1c60a85b1afa1ba77ced378f75bed35f3ab214e6..ca74eaf483b6772614a49c5025aa865a357e063e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/Makefile b/Makefile
index 4e92bc951388c8564bc2f2319e1a646aef1e01b1..9d18cbde3d47ff872b918dc70675543fc18cfba9 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,15 @@ ifeq "$(CLANG)" "3"
 CC       = $(CCCLANG) 
 # NOTE: keep in sync with list in CMakeLists.txt
 usan_checks = undefined,float-divide-by-zero,implicit-conversion,local-bounds
-CFLAGS  += -fsanitize=$(usan_checks) 
+CFLAGS  += -fsanitize=$(usan_checks)
 CFLAGS  += -fsanitize-recover=$(usan_checks) 
 LDFLAGS += -fsanitize=$(usan_checks)
 LDFLAGS += -fsanitize-recover=$(usan_checks)
+
+ifeq "$(IGNORELIST)" "1"
+CFLAGS  += -fsanitize-ignorelist=ubsan_ignorelist.txt
+LDFLAGS += -fsanitize-ignorelist=ubsan_ignorelist.txt
+endif
 endif
 
 ifeq "$(RELEASE)" "1"
diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj
index 9182dd36282cc0652cc43986fb561b0be255385e..7a2aa8a7f66bcdd6ec2164f382b709a8b43cc925 100644
--- a/Workspace_msvc/lib_com.vcxproj
+++ b/Workspace_msvc/lib_com.vcxproj
@@ -138,7 +138,6 @@
     <ClCompile Include="..\lib_com\cb_shape_fx.c" />
     <ClCompile Include="..\lib_com\cldfb.c" />
     <ClCompile Include="..\lib_com\cldfb_evs.c" />
-    <ClCompile Include="..\lib_com\cng_exc.c" />
     <ClCompile Include="..\lib_com\cng_exc_fx.c" />
     <ClCompile Include="..\lib_com\codec_tcx_common.c" />
     <ClCompile Include="..\lib_com\complex_basop.c" />
@@ -200,45 +199,44 @@
     <ClCompile Include="..\lib_com\int_lsp.c" />
     <ClCompile Include="..\lib_com\isf_dec_amr_wb_fx.c" />
     <ClCompile Include="..\lib_com\ivas_agc_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_arith.c" />
-    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c" />
-    <ClCompile Include="..\lib_com\ivas_cov_smooth.c" />
-    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />
-    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />
-    <ClCompile Include="..\lib_com\ivas_filters.c" />
-    <ClCompile Include="..\lib_com\ivas_ism_com.c" />
-    <ClCompile Include="..\lib_com\ivas_lfe_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />
-    <ClCompile Include="..\lib_com\ivas_masa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mct_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mc_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mc_param_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />
+    <ClCompile Include="..\lib_com\ivas_arith_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_filters_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c" />
+    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c" />
-    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_pca_tools.c" />
-    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c" />
-    <ClCompile Include="..\lib_com\ivas_qspherical_com.c" />
+    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_rom_com.c" />
     <ClCompile Include="..\lib_com\ivas_rom_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_sba_config.c" />
+    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c" />
     <ClCompile Include="..\lib_com\ivas_sns_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_spar_com.c" />
-    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c" />
+    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />
-    <ClCompile Include="..\lib_com\ivas_tools.c" />
-    <ClCompile Include="..\lib_com\ivas_transient_det.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_tools_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c" />
     <ClCompile Include="..\lib_com\lag_wind.c" />
     <ClCompile Include="..\lib_com\lerp.c" />
-    <ClCompile Include="..\lib_com\limit_t0.c" />
     <ClCompile Include="..\lib_com\limit_t0_fx.c" />
     <ClCompile Include="..\lib_com\log2.c" />
     <ClCompile Include="..\lib_com\logqnorm_fx.c" />
@@ -279,7 +277,6 @@
     <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />
     <ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c" />
     <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c" />
-    <ClCompile Include="..\lib_com\swb_tbe_com.c" />
     <ClCompile Include="..\lib_com\swb_tbe_com_fx.c" />
     <ClCompile Include="..\lib_com\syn_12k8_fx.c" />
     <ClCompile Include="..\lib_com\syn_filt_fx.c" />
@@ -318,12 +315,11 @@
     <ClInclude Include="..\lib_com\ivas_cnst.h" />
     <ClInclude Include="..\lib_com\ivas_error.h" />
     <ClInclude Include="..\lib_com\ivas_error_utils.h" />
-    <ClInclude Include="..\lib_com\ivas_prot.h" />
+    <ClInclude Include="..\lib_com\ivas_prot_fx.h" />
     <ClInclude Include="..\lib_com\ivas_rom_com.h" />
     <ClInclude Include="..\lib_com\ivas_stat_com.h" />
     <ClInclude Include="..\lib_com\move.h" />
     <ClInclude Include="..\lib_com\options.h" />
-    <ClInclude Include="..\lib_com\prot.h" />
     <ClInclude Include="..\lib_com\prot_fx.h" />
     <ClInclude Include="..\lib_com\rom_basop_util.h" />
     <ClInclude Include="..\lib_com\rom_com.h" />
diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters
index 93a2b1c00c5b944283f3f7778ccbe44a5f1548ff..89b47a3fcf9b04744c7ba3e9fd1cfec159c27ca9 100644
--- a/Workspace_msvc/lib_com.vcxproj.filters
+++ b/Workspace_msvc/lib_com.vcxproj.filters
@@ -1,88 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_qspherical_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_sba_config.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mc_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mc_param_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_filters.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_cov_smooth.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_fb_mixer.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_arith.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_transient_det.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_pca_tools.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_spar_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_ism_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_omasa_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_lfe_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_com\enh64.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_com\tools_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\oper_32b.c" />
     <ClCompile Include="..\lib_com\swb_bwe_com_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
@@ -161,7 +85,6 @@
     <ClCompile Include="..\lib_com\log2.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\rom_basic_math.c" />
     <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
@@ -216,7 +139,6 @@
     <ClCompile Include="..\lib_com\cng_exc_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\complex_basop.c" />
     <ClCompile Include="..\lib_com\dlpc_bfi_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
@@ -361,65 +283,258 @@
     <ClCompile Include="..\lib_com\gain_inov_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\float_to_fix_ops.c" />
-    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c" />
-    <ClCompile Include="..\lib_com\basop32.c" />
-    <ClCompile Include="..\lib_com\basop_com_lpc.c" />
-    <ClCompile Include="..\lib_com\basop_lsf_tools.c" />
-    <ClCompile Include="..\lib_com\basop_tcx_utils.c" />
-    <ClCompile Include="..\lib_com\basop_util.c" />
-    <ClCompile Include="..\lib_com\bitstream.c" />
-    <ClCompile Include="..\lib_com\cldfb.c" />
-    <ClCompile Include="..\lib_com\cng_exc.c" />
-    <ClCompile Include="..\lib_com\core_com_config.c" />
-    <ClCompile Include="..\lib_com\deemph.c" />
-    <ClCompile Include="..\lib_com\delay_comp.c" />
-    <ClCompile Include="..\lib_com\disclaimer.c" />
-    <ClCompile Include="..\lib_com\enh1632.c" />
-    <ClCompile Include="..\lib_com\enh40.c" />
-    <ClCompile Include="..\lib_com\enr_1_az.c" />
-    <ClCompile Include="..\lib_com\env_adj.c" />
-    <ClCompile Include="..\lib_com\env_stab.c" />
-    <ClCompile Include="..\lib_com\fft.c" />
-    <ClCompile Include="..\lib_com\fft_rel.c" />
-    <ClCompile Include="..\lib_com\fill_spectrum.c" />
-    <ClCompile Include="..\lib_com\findpulse.c" />
-    <ClCompile Include="..\lib_com\gs_gains.c" />
-    <ClCompile Include="..\lib_com\hq2_core_com.c" />
-    <ClCompile Include="..\lib_com\hq_conf.c" />
-    <ClCompile Include="..\lib_com\ifft_rel.c" />
-    <ClCompile Include="..\lib_com\interleave_spectrum.c" />
-    <ClCompile Include="..\lib_com\interpol.c" />
-    <ClCompile Include="..\lib_com\int_lsp.c" />
-    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />
-    <ClCompile Include="..\lib_com\ivas_masa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mct_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />
-    <ClCompile Include="..\lib_com\ivas_rom_com.c" />
-    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_tools.c" />
-    <ClCompile Include="..\lib_com\lag_wind.c" />
-    <ClCompile Include="..\lib_com\lerp.c" />
-    <ClCompile Include="..\lib_com\limit_t0.c" />
-    <ClCompile Include="..\lib_com\longarith.c" />
-    <ClCompile Include="..\lib_com\modif_fs.c" />
-    <ClCompile Include="..\lib_com\mslvq_com.c" />
-    <ClCompile Include="..\lib_com\preemph.c" />
-    <ClCompile Include="..\lib_com\rom_com.c" />
-    <ClCompile Include="..\lib_com\swb_tbe_com.c" />
-    <ClCompile Include="..\lib_com\tcx_mdct_window.c" />
-    <ClCompile Include="..\lib_com\tec_com.c" />
-    <ClCompile Include="..\lib_com\tools.c" />
-    <ClCompile Include="..\lib_com\wtda.c" />
-    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />
-    <ClCompile Include="..\lib_com\frame_ener_fx.c" />
-    <ClCompile Include="..\lib_com\get_gain_fx.c" />
-    <ClCompile Include="..\lib_com\gs_preech_fx.c" />
-    <ClCompile Include="..\lib_com\hp50_fx.c" />
-    <ClCompile Include="..\lib_com\env_stab_trans.c" />
+    <ClCompile Include="..\lib_com\basop_com_lpc.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\basop_lsf_tools.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\basop_tcx_utils.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\basop_util.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\basop32.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\bitstream.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\cldfb.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\complex_basop.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\core_com_config.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\deemph.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\delay_comp.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\disclaimer.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\enh40.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\enh1632.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\enr_1_az.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\env_adj.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\env_stab.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\env_stab_trans.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\fft.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\fft_rel.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\fill_spectrum.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\findpulse.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\float_to_fix_ops.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\frame_ener_fx.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\get_gain_fx.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\gs_gains.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\gs_preech_fx.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\hp50_fx.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\hq_conf.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\hq2_core_com.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ifft_rel.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\int_lsp.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\interleave_spectrum.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\interpol.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_rom_com.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\lag_wind.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\lerp.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\longarith.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\modif_fs.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\mslvq_com.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\oper_32b.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\preemph.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\rom_basic_math.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\rom_com.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\tcx_mdct_window.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\tec_com.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\tools.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\wtda.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">
+      <Filter>common_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_arith_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_filters_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_tools_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -455,18 +570,12 @@
     <ClInclude Include="..\lib_com\ivas_error_utils.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\ivas_prot.h">
-      <Filter>common_h</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib_com\ivas_rom_com.h">
       <Filter>common_h</Filter>
     </ClInclude>
     <ClInclude Include="..\lib_com\move.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\prot.h">
-      <Filter>common_h</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib_com\rom_com.h">
       <Filter>common_h</Filter>
     </ClInclude>
@@ -493,7 +602,6 @@
     <ClInclude Include="..\lib_com\rom_com_fx.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\prot_fx.h" />
     <ClInclude Include="..\lib_com\count.h">
       <Filter>common_h</Filter>
     </ClInclude>
@@ -501,6 +609,12 @@
       <Filter>common_h</Filter>
     </ClInclude>
     <ClInclude Include="..\lib_com\options_warnings.h" />
+    <ClInclude Include="..\lib_com\ivas_prot_fx.h">
+      <Filter>common_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_com\prot_fx.h">
+      <Filter>common_h</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common_evs_c">
diff --git a/Workspace_msvc/lib_dec.vcxproj b/Workspace_msvc/lib_dec.vcxproj
index d6e4a7c672d91bb76b7e3e30fdca199c56285df7..12f77b3461b2cd30cd3cf9645c8e423c797c86d4 100644
--- a/Workspace_msvc/lib_dec.vcxproj
+++ b/Workspace_msvc/lib_dec.vcxproj
@@ -136,297 +136,181 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\lib_dec\ACcontextMapping_dec.c" />
     <ClCompile Include="..\lib_dec\ACcontextMapping_dec_fx.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\acelp_core_dec.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_dec_fx.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\acelp_core_dec_ivas_fx.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_switch_dec.c" />
+    <ClCompile Include="..\lib_dec\acelp_core_dec_fx.c" />
     <ClCompile Include="..\lib_dec\acelp_core_switch_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\amr_wb_dec.c" />
     <ClCompile Include="..\lib_dec\amr_wb_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\arith_coder_dec.c" />
     <ClCompile Include="..\lib_dec\arith_coder_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ari_dec.c" />
     <ClCompile Include="..\lib_dec\ari_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ari_hm_dec.c" />
-    <ClCompile Include="..\lib_dec\avq_dec.c" />
     <ClCompile Include="..\lib_dec\avq_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\bass_psfilter.c" />
     <ClCompile Include="..\lib_dec\bass_psfilter_fx.c" />
-    <ClCompile Include="..\lib_dec\cng_dec.c" />
     <ClCompile Include="..\lib_dec\cng_dec_fx.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\core_dec_init.c" />
     <ClCompile Include="..\lib_dec\core_dec_init_fx.c" />
-    <ClCompile Include="..\lib_dec\core_dec_reconf.c" />
     <ClCompile Include="..\lib_dec\core_dec_reconf_fx.c" />
-    <ClCompile Include="..\lib_dec\core_dec_switch.c" />
     <ClCompile Include="..\lib_dec\core_dec_switch_fx.c" />
-    <ClCompile Include="..\lib_dec\core_switching_dec.c" />
     <ClCompile Include="..\lib_dec\core_switching_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\dec2t32.c" />
     <ClCompile Include="..\lib_dec\dec2t32_fx.c" />
-    <ClCompile Include="..\lib_dec\dec4t64.c" />
     <ClCompile Include="..\lib_dec\dec4t64_fx.c" />
-    <ClCompile Include="..\lib_dec\decision_matrix_dec.c" />
     <ClCompile Include="..\lib_dec\decision_matrix_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_ace.c" />
-    <ClCompile Include="..\lib_dec\dec_acelp.c" />
     <ClCompile Include="..\lib_dec\dec_acelp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_acelp_tcx_main.c" />
     <ClCompile Include="..\lib_dec\dec_acelp_tcx_main_fx.c" />
     <ClCompile Include="..\lib_dec\dec_ace_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_amr_wb.c" />
     <ClCompile Include="..\lib_dec\dec_amr_wb_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_gen_voic.c" />
     <ClCompile Include="..\lib_dec\dec_gen_voic_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_higher_acelp.c" />
     <ClCompile Include="..\lib_dec\dec_higher_acelp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_LPD.c" />
     <ClCompile Include="..\lib_dec\dec_LPD_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_nelp.c" />
     <ClCompile Include="..\lib_dec\dec_nelp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_pit_exc.c" />
     <ClCompile Include="..\lib_dec\dec_pit_exc_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_post.c" />
     <ClCompile Include="..\lib_dec\dec_post_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_ppp.c" />
     <ClCompile Include="..\lib_dec\dec_ppp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_prm.c" />
     <ClCompile Include="..\lib_dec\dec_prm_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_tcx.c" />
     <ClCompile Include="..\lib_dec\dec_tcx_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_tran.c" />
     <ClCompile Include="..\lib_dec\dec_tran_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_uv.c" />
     <ClCompile Include="..\lib_dec\dec_uv_fx.c" />
-    <ClCompile Include="..\lib_dec\dlpc_avq.c" />
     <ClCompile Include="..\lib_dec\dlpc_avq_fx.c" />
-    <ClCompile Include="..\lib_dec\dlpc_stoch.c" />
     <ClCompile Include="..\lib_dec\dlpc_stoch_fx.c" />
-    <ClCompile Include="..\lib_dec\d_gain2p.c" />
     <ClCompile Include="..\lib_dec\d_gain2p_fx.c" />
-    <ClCompile Include="..\lib_dec\er_dec_acelp.c" />
     <ClCompile Include="..\lib_dec\er_dec_acelp_fx.c" />
-    <ClCompile Include="..\lib_dec\er_dec_tcx.c" />
     <ClCompile Include="..\lib_dec\er_dec_tcx_fx.c" />
-    <ClCompile Include="..\lib_dec\er_scale_syn.c" />
     <ClCompile Include="..\lib_dec\er_scale_syn_fx.c" />
-    <ClCompile Include="..\lib_dec\er_sync_exc.c" />
     <ClCompile Include="..\lib_dec\er_sync_exc_fx.c" />
-    <ClCompile Include="..\lib_dec\er_util.c" />
     <ClCompile Include="..\lib_dec\er_util_fx.c" />
-    <ClCompile Include="..\lib_dec\evs_dec.c" />
     <ClCompile Include="..\lib_dec\evs_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\fd_cng_dec.c" />
     <ClCompile Include="..\lib_dec\fd_cng_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC.c" />
-    <ClCompile Include="..\lib_dec\FEC_adapt_codebook.c" />
     <ClCompile Include="..\lib_dec\FEC_adapt_codebook_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_clas_estim.c" />
     <ClCompile Include="..\lib_dec\FEC_clas_estim_fx.c" />
     <ClCompile Include="..\lib_dec\FEC_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_HQ_core.c" />
     <ClCompile Include="..\lib_dec\FEC_HQ_core_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_HQ_phase_ecu.c" />
     <ClCompile Include="..\lib_dec\FEC_HQ_phase_ecu_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_lsf_estim.c" />
     <ClCompile Include="..\lib_dec\FEC_lsf_estim_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_pitch_estim.c" />
     <ClCompile Include="..\lib_dec\FEC_pitch_estim_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_scale_syn.c" />
     <ClCompile Include="..\lib_dec\FEC_scale_syn_fx.c" />
-    <ClCompile Include="..\lib_dec\gain_dec.c" />
     <ClCompile Include="..\lib_dec\gain_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\gaus_dec.c" />
     <ClCompile Include="..\lib_dec\gaus_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\gs_dec.c" />
-    <ClCompile Include="..\lib_dec\gs_dec_amr_wb.c" />
     <ClCompile Include="..\lib_dec\gs_dec_amr_wb_fx.c" />
     <ClCompile Include="..\lib_dec\gs_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hdecnrm.c" />
     <ClCompile Include="..\lib_dec\hdecnrm_fx.c" />
-    <ClCompile Include="..\lib_dec\hf_synth.c" />
     <ClCompile Include="..\lib_dec\hf_synth_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_classifier_dec.c" />
     <ClCompile Include="..\lib_dec\hq_classifier_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_conf_fec.c" />
     <ClCompile Include="..\lib_dec\hq_conf_fec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_core_dec.c" />
     <ClCompile Include="..\lib_dec\hq_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_env_dec.c" />
     <ClCompile Include="..\lib_dec\hq_env_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_hr_dec.c" />
     <ClCompile Include="..\lib_dec\hq_hr_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_lr_dec.c" />
     <ClCompile Include="..\lib_dec\hq_lr_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\igf_dec.c" />
     <ClCompile Include="..\lib_dec\igf_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\igf_scf_dec.c" />
     <ClCompile Include="..\lib_dec\igf_scf_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\init_dec.c" />
     <ClCompile Include="..\lib_dec\init_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\inov_dec.c" />
     <ClCompile Include="..\lib_dec\inov_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_agc_dec.c" />
     <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />
-    <ClCompile Include="..\lib_dec\ivas_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />
-    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
+    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_dirac_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_init_dec.c" />
     <ClCompile Include="..\lib_dec\ivas_init_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />
-    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_param_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />
     <ClCompile Include="..\lib_dec\ivas_lfe_plc_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_masa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_masa_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mct_core_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />
-    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_osba_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_output_config.c" />
-    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion.c" />
-    <ClCompile Include="..\lib_dec\ivas_pca_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_osba_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_omasa_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_output_config_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_pca_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_post_proc.c" />
-    <ClCompile Include="..\lib_dec\ivas_range_uni_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_qspherical_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_post_proc_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_range_uni_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_qspherical_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_rom_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_sba_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_sce_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_sce_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_sns_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_spar_decoder.c" />
-    <ClCompile Include="..\lib_dec\ivas_spar_md_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_spar_decoder_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_spar_md_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_cng_dec.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_svd_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec_fx.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4sb.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4_jmf.c" />
     <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c" />
-    <ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c" />
     <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c" />
     <ClCompile Include="..\lib_dec\jbm_pcmdsp_window.c" />
-    <ClCompile Include="..\lib_dec\LD_music_post_filter.c" />
     <ClCompile Include="..\lib_dec\LD_music_post_filter_fx.c" />
-    <ClCompile Include="..\lib_dec\lead_deindexing.c" />
     <ClCompile Include="..\lib_dec\lead_deindexing_fx.c" />
-    <ClCompile Include="..\lib_dec\lib_dec.c" />
     <ClCompile Include="..\lib_dec\lib_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\lp_exc_d.c" />
     <ClCompile Include="..\lib_dec\lp_exc_d_fx.c" />
-    <ClCompile Include="..\lib_dec\lsf_dec.c" />
     <ClCompile Include="..\lib_dec\lsf_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\lsf_msvq_ma_dec.c" />
     <ClCompile Include="..\lib_dec\lsf_msvq_ma_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\nelp_dec.c" />
     <ClCompile Include="..\lib_dec\nelp_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\peak_vq_dec.c" />
     <ClCompile Include="..\lib_dec\peak_vq_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\pitch_extr.c" />
     <ClCompile Include="..\lib_dec\pitch_extr_fx.c" />
-    <ClCompile Include="..\lib_dec\pit_dec.c" />
     <ClCompile Include="..\lib_dec\pit_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\post_dec.c" />
     <ClCompile Include="..\lib_dec\post_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ppp_dec.c" />
     <ClCompile Include="..\lib_dec\ppp_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\pvq_core_dec.c" />
     <ClCompile Include="..\lib_dec\pvq_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\pvq_decode.c" />
     <ClCompile Include="..\lib_dec\pvq_decode_fx.c" />
-    <ClCompile Include="..\lib_dec\range_dec.c" />
     <ClCompile Include="..\lib_dec\range_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\re8_dec.c" />
     <ClCompile Include="..\lib_dec\re8_dec_fx.c" />
     <ClCompile Include="..\lib_dec\rom_dec.c" />
-    <ClCompile Include="..\lib_dec\rst_dec.c" />
     <ClCompile Include="..\lib_dec\rst_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\stat_noise_uv_dec.c" />
     <ClCompile Include="..\lib_dec\stat_noise_uv_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec.c" />
     <ClCompile Include="..\lib_dec\swb_bwe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_hr.c" />
     <ClCompile Include="..\lib_dec\swb_bwe_dec_hr_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_lr.c" />
     <ClCompile Include="..\lib_dec\swb_bwe_dec_lr_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_tbe_dec.c" />
     <ClCompile Include="..\lib_dec\swb_tbe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\syn_outp.c" />
     <ClCompile Include="..\lib_dec\syn_outp_fx.c" />
-    <ClCompile Include="..\lib_dec\tcq_core_dec.c" />
     <ClCompile Include="..\lib_dec\tcq_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\tcx_utils_dec.c" />
     <ClCompile Include="..\lib_dec\tcx_utils_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\tns_base_dec.c" />
     <ClCompile Include="..\lib_dec\tns_base_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\TonalComponentDetection.c" />
     <ClCompile Include="..\lib_dec\TonalComponentDetection_fx.c" />
-    <ClCompile Include="..\lib_dec\tonalMDCTconcealment.c" />
     <ClCompile Include="..\lib_dec\tonalMDCTconcealment_fx.c" />
-    <ClCompile Include="..\lib_dec\transition_dec.c" />
     <ClCompile Include="..\lib_dec\transition_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\updt_dec.c" />
     <ClCompile Include="..\lib_dec\updt_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\vlpc_1st_dec.c" />
     <ClCompile Include="..\lib_dec\vlpc_1st_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\vlpc_2st_dec.c" />
     <ClCompile Include="..\lib_dec\vlpc_2st_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\voiced_dec.c" />
     <ClCompile Include="..\lib_dec\voiced_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\waveadjust_fec_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sns_dec.c" />
     <ClCompile Include="..\lib_dec\waveadjust_fec_dec_fx.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Workspace_msvc/lib_dec.vcxproj.filters b/Workspace_msvc/lib_dec.vcxproj.filters
index b9dbd7fd5a6304a0d47586693a0d781946e88a35..25079058ca86d0ba17ed45fb351d4ddfa144612a 100644
--- a/Workspace_msvc/lib_dec.vcxproj.filters
+++ b/Workspace_msvc/lib_dec.vcxproj.filters
@@ -1,305 +1,572 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\lib_dec\ACcontextMapping_dec.c" />
-    <ClCompile Include="..\lib_dec\ACcontextMapping_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_dec.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_switch_dec.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_switch_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\amr_wb_dec.c" />
-    <ClCompile Include="..\lib_dec\amr_wb_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\arith_coder_dec.c" />
-    <ClCompile Include="..\lib_dec\arith_coder_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ari_dec.c" />
-    <ClCompile Include="..\lib_dec\ari_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ari_hm_dec.c" />
-    <ClCompile Include="..\lib_dec\avq_dec.c" />
-    <ClCompile Include="..\lib_dec\avq_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\bass_psfilter.c" />
-    <ClCompile Include="..\lib_dec\bass_psfilter_fx.c" />
-    <ClCompile Include="..\lib_dec\cng_dec.c" />
-    <ClCompile Include="..\lib_dec\cng_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\core_dec_init.c" />
-    <ClCompile Include="..\lib_dec\core_dec_init_fx.c" />
-    <ClCompile Include="..\lib_dec\core_dec_reconf.c" />
-    <ClCompile Include="..\lib_dec\core_dec_reconf_fx.c" />
-    <ClCompile Include="..\lib_dec\core_dec_switch.c" />
-    <ClCompile Include="..\lib_dec\core_dec_switch_fx.c" />
-    <ClCompile Include="..\lib_dec\core_switching_dec.c" />
-    <ClCompile Include="..\lib_dec\core_switching_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\dec2t32.c" />
-    <ClCompile Include="..\lib_dec\dec2t32_fx.c" />
-    <ClCompile Include="..\lib_dec\dec4t64.c" />
-    <ClCompile Include="..\lib_dec\dec4t64_fx.c" />
-    <ClCompile Include="..\lib_dec\decision_matrix_dec.c" />
-    <ClCompile Include="..\lib_dec\decision_matrix_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_ace.c" />
-    <ClCompile Include="..\lib_dec\dec_acelp.c" />
-    <ClCompile Include="..\lib_dec\dec_acelp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_acelp_tcx_main.c" />
-    <ClCompile Include="..\lib_dec\dec_acelp_tcx_main_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_ace_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_amr_wb.c" />
-    <ClCompile Include="..\lib_dec\dec_amr_wb_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_gen_voic.c" />
-    <ClCompile Include="..\lib_dec\dec_gen_voic_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_higher_acelp.c" />
-    <ClCompile Include="..\lib_dec\dec_higher_acelp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_LPD.c" />
-    <ClCompile Include="..\lib_dec\dec_LPD_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_nelp.c" />
-    <ClCompile Include="..\lib_dec\dec_nelp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_pit_exc.c" />
-    <ClCompile Include="..\lib_dec\dec_pit_exc_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_post.c" />
-    <ClCompile Include="..\lib_dec\dec_post_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_ppp.c" />
-    <ClCompile Include="..\lib_dec\dec_ppp_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_prm.c" />
-    <ClCompile Include="..\lib_dec\dec_prm_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_tcx.c" />
-    <ClCompile Include="..\lib_dec\dec_tcx_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_tran.c" />
-    <ClCompile Include="..\lib_dec\dec_tran_fx.c" />
-    <ClCompile Include="..\lib_dec\dec_uv.c" />
-    <ClCompile Include="..\lib_dec\dec_uv_fx.c" />
-    <ClCompile Include="..\lib_dec\dlpc_avq.c" />
-    <ClCompile Include="..\lib_dec\dlpc_avq_fx.c" />
-    <ClCompile Include="..\lib_dec\dlpc_stoch.c" />
-    <ClCompile Include="..\lib_dec\dlpc_stoch_fx.c" />
-    <ClCompile Include="..\lib_dec\d_gain2p.c" />
-    <ClCompile Include="..\lib_dec\d_gain2p_fx.c" />
-    <ClCompile Include="..\lib_dec\er_dec_acelp.c" />
-    <ClCompile Include="..\lib_dec\er_dec_acelp_fx.c" />
-    <ClCompile Include="..\lib_dec\er_dec_tcx.c" />
-    <ClCompile Include="..\lib_dec\er_dec_tcx_fx.c" />
-    <ClCompile Include="..\lib_dec\er_scale_syn.c" />
-    <ClCompile Include="..\lib_dec\er_scale_syn_fx.c" />
-    <ClCompile Include="..\lib_dec\er_sync_exc.c" />
-    <ClCompile Include="..\lib_dec\er_sync_exc_fx.c" />
-    <ClCompile Include="..\lib_dec\er_util.c" />
-    <ClCompile Include="..\lib_dec\er_util_fx.c" />
-    <ClCompile Include="..\lib_dec\evs_dec.c" />
-    <ClCompile Include="..\lib_dec\evs_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\fd_cng_dec.c" />
-    <ClCompile Include="..\lib_dec\fd_cng_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC.c" />
-    <ClCompile Include="..\lib_dec\FEC_adapt_codebook.c" />
-    <ClCompile Include="..\lib_dec\FEC_adapt_codebook_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_clas_estim.c" />
-    <ClCompile Include="..\lib_dec\FEC_clas_estim_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_HQ_core.c" />
-    <ClCompile Include="..\lib_dec\FEC_HQ_core_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_HQ_phase_ecu.c" />
-    <ClCompile Include="..\lib_dec\FEC_HQ_phase_ecu_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_lsf_estim.c" />
-    <ClCompile Include="..\lib_dec\FEC_lsf_estim_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_pitch_estim.c" />
-    <ClCompile Include="..\lib_dec\FEC_pitch_estim_fx.c" />
-    <ClCompile Include="..\lib_dec\FEC_scale_syn.c" />
-    <ClCompile Include="..\lib_dec\FEC_scale_syn_fx.c" />
-    <ClCompile Include="..\lib_dec\gain_dec.c" />
-    <ClCompile Include="..\lib_dec\gain_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\gaus_dec.c" />
-    <ClCompile Include="..\lib_dec\gaus_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\gs_dec.c" />
-    <ClCompile Include="..\lib_dec\gs_dec_amr_wb.c" />
-    <ClCompile Include="..\lib_dec\gs_dec_amr_wb_fx.c" />
-    <ClCompile Include="..\lib_dec\gs_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hdecnrm.c" />
-    <ClCompile Include="..\lib_dec\hdecnrm_fx.c" />
-    <ClCompile Include="..\lib_dec\hf_synth.c" />
-    <ClCompile Include="..\lib_dec\hf_synth_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_classifier_dec.c" />
-    <ClCompile Include="..\lib_dec\hq_classifier_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_conf_fec.c" />
-    <ClCompile Include="..\lib_dec\hq_conf_fec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_core_dec.c" />
-    <ClCompile Include="..\lib_dec\hq_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_env_dec.c" />
-    <ClCompile Include="..\lib_dec\hq_env_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_hr_dec.c" />
-    <ClCompile Include="..\lib_dec\hq_hr_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\hq_lr_dec.c" />
-    <ClCompile Include="..\lib_dec\hq_lr_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\igf_dec.c" />
-    <ClCompile Include="..\lib_dec\igf_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\igf_scf_dec.c" />
-    <ClCompile Include="..\lib_dec\igf_scf_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\init_dec.c" />
-    <ClCompile Include="..\lib_dec\init_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\inov_dec.c" />
-    <ClCompile Include="..\lib_dec\inov_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_agc_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />
-    <ClCompile Include="..\lib_dec\ivas_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />
-    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
-    <ClCompile Include="..\lib_dec\ivas_init_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_init_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />
-    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />
-    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_masa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />
-    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_osba_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_output_config.c" />
-    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion.c" />
-    <ClCompile Include="..\lib_dec\ivas_pca_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_post_proc.c" />
-    <ClCompile Include="..\lib_dec\ivas_range_uni_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_qspherical_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_rom_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_sce_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sce_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_sns_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_spar_decoder.c" />
-    <ClCompile Include="..\lib_dec\ivas_spar_md_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_cng_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />
-    <ClCompile Include="..\lib_dec\jbm_jb4sb.c" />
-    <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />
-    <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />
-    <ClCompile Include="..\lib_dec\jbm_jb4_jmf.c" />
-    <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c" />
-    <ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c" />
-    <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c" />
-    <ClCompile Include="..\lib_dec\jbm_pcmdsp_window.c" />
-    <ClCompile Include="..\lib_dec\LD_music_post_filter.c" />
-    <ClCompile Include="..\lib_dec\LD_music_post_filter_fx.c" />
-    <ClCompile Include="..\lib_dec\lead_deindexing.c" />
-    <ClCompile Include="..\lib_dec\lead_deindexing_fx.c" />
-    <ClCompile Include="..\lib_dec\lib_dec.c" />
     <ClCompile Include="..\lib_dec\lib_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\lp_exc_d.c" />
-    <ClCompile Include="..\lib_dec\lp_exc_d_fx.c" />
-    <ClCompile Include="..\lib_dec\lsf_dec.c" />
-    <ClCompile Include="..\lib_dec\lsf_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\lsf_msvq_ma_dec.c" />
-    <ClCompile Include="..\lib_dec\lsf_msvq_ma_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\nelp_dec.c" />
-    <ClCompile Include="..\lib_dec\nelp_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\peak_vq_dec.c" />
-    <ClCompile Include="..\lib_dec\peak_vq_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\pitch_extr.c" />
-    <ClCompile Include="..\lib_dec\pitch_extr_fx.c" />
-    <ClCompile Include="..\lib_dec\pit_dec.c" />
-    <ClCompile Include="..\lib_dec\pit_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\post_dec.c" />
-    <ClCompile Include="..\lib_dec\post_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ppp_dec.c" />
-    <ClCompile Include="..\lib_dec\ppp_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\pvq_core_dec.c" />
-    <ClCompile Include="..\lib_dec\pvq_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\pvq_decode.c" />
-    <ClCompile Include="..\lib_dec\pvq_decode_fx.c" />
-    <ClCompile Include="..\lib_dec\range_dec.c" />
-    <ClCompile Include="..\lib_dec\range_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\re8_dec.c" />
-    <ClCompile Include="..\lib_dec\re8_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\rom_dec.c" />
-    <ClCompile Include="..\lib_dec\rst_dec.c" />
-    <ClCompile Include="..\lib_dec\rst_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\stat_noise_uv_dec.c" />
-    <ClCompile Include="..\lib_dec\stat_noise_uv_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_hr.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_hr_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_lr.c" />
-    <ClCompile Include="..\lib_dec\swb_bwe_dec_lr_fx.c" />
-    <ClCompile Include="..\lib_dec\swb_tbe_dec.c" />
-    <ClCompile Include="..\lib_dec\swb_tbe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\syn_outp.c" />
-    <ClCompile Include="..\lib_dec\syn_outp_fx.c" />
-    <ClCompile Include="..\lib_dec\tcq_core_dec.c" />
-    <ClCompile Include="..\lib_dec\tcq_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\tcx_utils_dec.c" />
-    <ClCompile Include="..\lib_dec\tcx_utils_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\tns_base_dec.c" />
-    <ClCompile Include="..\lib_dec\tns_base_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\TonalComponentDetection.c" />
-    <ClCompile Include="..\lib_dec\TonalComponentDetection_fx.c" />
-    <ClCompile Include="..\lib_dec\tonalMDCTconcealment.c" />
-    <ClCompile Include="..\lib_dec\tonalMDCTconcealment_fx.c" />
-    <ClCompile Include="..\lib_dec\transition_dec.c" />
-    <ClCompile Include="..\lib_dec\transition_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\updt_dec.c" />
-    <ClCompile Include="..\lib_dec\updt_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\vlpc_1st_dec.c" />
-    <ClCompile Include="..\lib_dec\vlpc_1st_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\vlpc_2st_dec.c" />
-    <ClCompile Include="..\lib_dec\vlpc_2st_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\voiced_dec.c" />
-    <ClCompile Include="..\lib_dec\voiced_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\waveadjust_fec_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sns_dec.c" />
-    <ClCompile Include="..\lib_dec\waveadjust_fec_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\acelp_core_dec_ivas_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_pca_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\acelp_core_switch_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\amr_wb_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\core_dec_init_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\core_dec_reconf_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\core_dec_switch_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_ace_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\d_gain2p_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_acelp_tcx_main_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_amr_wb_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_LPD_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_nelp_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_post_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_ppp_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\decision_matrix_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\evs_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\gs_dec_amr_wb_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ppp_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\nelp_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\post_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\swb_bwe_dec_hr_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\swb_bwe_dec_lr_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\voiced_dec_fx.c">
+      <Filter>decoder_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_init_dec.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_init_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_lfe_plc_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_pca_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_rom_dec.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sce_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sns_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_cng_dec.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ACcontextMapping_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ari_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ari_hm_dec.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\arith_coder_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\avq_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\bass_psfilter_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\cng_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\core_switching_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_acelp_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_gen_voic_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_higher_acelp_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_pit_exc_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_prm_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_tcx_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_tran_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec_uv_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec2t32_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dec4t64_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dlpc_avq_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\dlpc_stoch_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\er_dec_acelp_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\er_dec_tcx_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\er_scale_syn_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\er_sync_exc_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\er_util_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\fd_cng_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_adapt_codebook_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_clas_estim_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_HQ_core_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_HQ_phase_ecu_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_lsf_estim_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_pitch_estim_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\FEC_scale_syn_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\gain_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\gaus_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\gs_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hdecnrm_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hf_synth_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hq_classifier_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hq_conf_fec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hq_core_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hq_env_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hq_hr_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\hq_lr_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\igf_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\igf_scf_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\init_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\inov_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_jb4_jmf.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_jb4sb.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\jbm_pcmdsp_window.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\LD_music_post_filter_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\lead_deindexing_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\waveadjust_fec_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\lp_exc_d_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\lsf_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\lsf_msvq_ma_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\peak_vq_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\pit_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\pitch_extr_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\pvq_core_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\pvq_decode_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\range_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\re8_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\rom_dec.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\rst_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\stat_noise_uv_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\swb_bwe_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\swb_tbe_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\syn_outp_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\tcq_core_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\tcx_utils_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\tns_base_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\TonalComponentDetection_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\tonalMDCTconcealment_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\transition_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\updt_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\vlpc_1st_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\vlpc_2st_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_dirac_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_param_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_masa_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mct_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_omasa_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_osba_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_output_config_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_post_proc_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_qspherical_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_range_uni_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sba_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_spar_decoder_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_spar_md_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_svd_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\acelp_core_dec_fx.c">
+      <Filter>decoder_all_c</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lib_dec\ivas_rom_dec.h" />
-    <ClInclude Include="..\lib_dec\ivas_stat_dec.h" />
-    <ClInclude Include="..\lib_dec\jbm_jb4sb.h" />
-    <ClInclude Include="..\lib_dec\jbm_jb4_circularbuffer.h" />
-    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />
-    <ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />
-    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />
-    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />
-    <ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />
-    <ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />
     <ClInclude Include="..\lib_dec\lib_dec.h" />
-    <ClInclude Include="..\lib_dec\rom_dec.h" />
-    <ClInclude Include="..\lib_dec\stat_dec.h" />
+    <ClInclude Include="..\lib_dec\ivas_stat_dec.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\ivas_rom_dec.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_jb4sb.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\rom_dec.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\stat_dec.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_jb4_circularbuffer.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_dec\jbm_jb4_jmf.h">
+      <Filter>decoder_h</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="decoder_all_c">
+      <UniqueIdentifier>{6d564218-e0e5-4a7b-80b3-6b10661ad36c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decoder_evs_c">
+      <UniqueIdentifier>{33d78f8d-2d43-40f5-a9b1-711097bd6746}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decoder_h">
+      <UniqueIdentifier>{044baa49-b157-45ed-8bec-29b6d7172e82}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decoder_ivas_c">
+      <UniqueIdentifier>{adc81a29-2517-49f0-819f-e8cea3d49ae3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Workspace_msvc/lib_enc.vcxproj b/Workspace_msvc/lib_enc.vcxproj
index 43e7af2af14af672f137859d9dd72b04aace709b..86dcef90541be79286704dffc2160960a9846d2c 100644
--- a/Workspace_msvc/lib_enc.vcxproj
+++ b/Workspace_msvc/lib_enc.vcxproj
@@ -215,127 +215,71 @@
     <ClCompile Include="..\lib_enc\init_enc_fx.c" />
     <ClCompile Include="..\lib_enc\inov_enc_fx.c" />
     <ClCompile Include="..\lib_enc\isf_enc_amr_wb_fx.c" />
-    <ClCompile Include="..\lib_enc\ivas_agc_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c" />
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc.c" />
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c" />
-    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c" />
-    <ClCompile Include="..\lib_enc\ivas_entropy_coder.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_osba_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_pca_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c" />
+    <ClCompile Include="..\lib_enc\ivas_agc_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_entropy_coder_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_lfe_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mc_param_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_osba_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_omasa_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_pca_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_range_uni_enc_fx.c" />
     <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\ivas_spar_encoder.c" />
-    <ClCompile Include="..\lib_enc\ivas_spar_md_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_classifier.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs.c" />
-    <ClCompile Include="..\lib_enc\arith_coder_enc.c" />
-    <ClCompile Include="..\lib_enc\ari_enc.c" />
-    <ClCompile Include="..\lib_enc\ari_hm_enc.c" />
-    <ClCompile Include="..\lib_enc\avq_cod.c" />
-    <ClCompile Include="..\lib_enc\bass_psfilter_enc.c" />
-    <ClCompile Include="..\lib_enc\bw_detect.c" />
-    <ClCompile Include="..\lib_enc\cng_enc.c" />
-    <ClCompile Include="..\lib_enc\cod2t32.c" />
-    <ClCompile Include="..\lib_enc\cod4t64.c" />
+    <ClCompile Include="..\lib_enc\ivas_spar_encoder_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_spar_md_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_classifier_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c" />
     <ClCompile Include="..\lib_enc\cod4t64_fast.c" />
-    <ClCompile Include="..\lib_enc\cod_ace.c" />
-    <ClCompile Include="..\lib_enc\cod_tcx.c" />
-    <ClCompile Include="..\lib_enc\cod_uv.c" />
-    <ClCompile Include="..\lib_enc\comvad_decision.c" />
-    <ClCompile Include="..\lib_enc\core_enc_2div.c" />
-    <ClCompile Include="..\lib_enc\core_enc_init.c" />
-    <ClCompile Include="..\lib_enc\core_enc_ol.c" />
-    <ClCompile Include="..\lib_enc\core_enc_reconf.c" />
-    <ClCompile Include="..\lib_enc\core_enc_switch.c" />
-    <ClCompile Include="..\lib_enc\core_enc_updt.c" />
-    <ClCompile Include="..\lib_enc\core_switching_enc.c" />
-    <ClCompile Include="..\lib_enc\corr_xh.c" />
-    <ClCompile Include="..\lib_enc\cor_shif.c" />
-    <ClCompile Include="..\lib_enc\decision_matrix_enc.c" />
-    <ClCompile Include="..\lib_enc\detect_transient.c" />
-    <ClCompile Include="..\lib_enc\diffcod.c" />
-    <ClCompile Include="..\lib_enc\dtx.c" />
-    <ClCompile Include="..\lib_enc\enc_acelp.c" />
-    <ClCompile Include="..\lib_enc\enc_acelpx.c" />
-    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main.c" />
-    <ClCompile Include="..\lib_enc\enc_amr_wb.c" />
-    <ClCompile Include="..\lib_enc\enc_gain.c" />
-    <ClCompile Include="..\lib_enc\enc_gen_voic.c" />
-    <ClCompile Include="..\lib_enc\enc_prm.c" />
-    <ClCompile Include="..\lib_enc\fd_cng_enc.c" />
-    <ClCompile Include="..\lib_enc\find_tilt.c" />
-    <ClCompile Include="..\lib_enc\find_uv.c" />
-    <ClCompile Include="..\lib_enc\find_wsp.c" />
-    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate.c" />
-    <ClCompile Include="..\lib_enc\gain_enc.c" />
-    <ClCompile Include="..\lib_enc\gs_enc.c" />
-    <ClCompile Include="..\lib_enc\guided_plc_enc.c" />
-    <ClCompile Include="..\lib_enc\hf_cod_amrwb.c" />
-    <ClCompile Include="..\lib_enc\hq_classifier_enc.c" />
-    <ClCompile Include="..\lib_enc\hq_core_enc.c" />
-    <ClCompile Include="..\lib_enc\hq_env_enc.c" />
-    <ClCompile Include="..\lib_enc\hq_hr_enc.c" />
-    <ClCompile Include="..\lib_enc\hq_lr_enc.c" />
-    <ClCompile Include="..\lib_enc\hvq_enc.c" />
     <ClCompile Include="..\lib_enc\igf_enc.c" />
     <ClCompile Include="..\lib_enc\igf_scf_enc.c" />
-    <ClCompile Include="..\lib_enc\init_enc.c" />
-    <ClCompile Include="..\lib_enc\inov_enc.c" />
-    <ClCompile Include="..\lib_enc\isf_enc_amr_wb.c" />
-    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_cpe_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_dirac_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_init_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_param_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_masa_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mct_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mct_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct.c" />
-    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_qspherical_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_sba_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_sce_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_front_vad.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c" />
-    <ClCompile Include="..\lib_enc\lead_indexing.c" />
+    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_cpe_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_dirac_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_init_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_param_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_masa_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mct_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_qspherical_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_sba_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_sce_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_front_vad_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc_fx.c" />
     <ClCompile Include="..\lib_enc\lead_indexing_fx.c" />
     <ClCompile Include="..\lib_enc\lib_enc.c" />
-    <ClCompile Include="..\lib_enc\long_enr.c" />
     <ClCompile Include="..\lib_enc\long_enr_fx.c" />
-    <ClCompile Include="..\lib_enc\lp_exc_e.c" />
     <ClCompile Include="..\lib_enc\lp_exc_e_fx.c" />
-    <ClCompile Include="..\lib_enc\lsf_enc.c" />
     <ClCompile Include="..\lib_enc\lsf_enc_fx.c" />
     <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc.c" />
     <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\ltd_stable.c" />
     <ClCompile Include="..\lib_enc\ltd_stable_fx.c" />
     <ClCompile Include="..\lib_enc\mdct_classifier_fx.c" />
     <ClCompile Include="..\lib_enc\mdct_selector_fx.c" />
@@ -373,77 +317,29 @@
     <ClCompile Include="..\lib_enc\swb_bwe_enc_fx.c" />
     <ClCompile Include="..\lib_enc\swb_bwe_enc_hr_fx.c" />
     <ClCompile Include="..\lib_enc\swb_bwe_enc_lr_fx.c" />
-    <ClCompile Include="..\lib_enc\mdct_classifier.c" />
-    <ClCompile Include="..\lib_enc\mdct_selector.c" />
-    <ClCompile Include="..\lib_enc\mslvq_enc.c" />
-    <ClCompile Include="..\lib_enc\multi_harm.c" />
-    <ClCompile Include="..\lib_enc\nelp_enc.c" />
     <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\noise_adjust.c" />
-    <ClCompile Include="..\lib_enc\nois_est.c" />
-    <ClCompile Include="..\lib_enc\normalizecoefs.c" />
-    <ClCompile Include="..\lib_enc\peak_vq_enc.c" />
-    <ClCompile Include="..\lib_enc\pitch_ol.c" />
-    <ClCompile Include="..\lib_enc\pitch_ol2.c" />
-    <ClCompile Include="..\lib_enc\pit_enc.c" />
-    <ClCompile Include="..\lib_enc\plc_enc_ext.c" />
-    <ClCompile Include="..\lib_enc\ppp_enc.c" />
-    <ClCompile Include="..\lib_enc\pre_proc.c" />
-    <ClCompile Include="..\lib_enc\pvq_core_enc.c" />
-    <ClCompile Include="..\lib_enc\pvq_encode.c" />
-    <ClCompile Include="..\lib_enc\qlpc_avq.c" />
-    <ClCompile Include="..\lib_enc\q_gain2p.c" />
     <ClCompile Include="..\lib_enc\rom_enc.c" />
-    <ClCompile Include="..\lib_enc\setmodeindex.c" />
-    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />
-    <ClCompile Include="..\lib_enc\spec_center.c" />
-    <ClCompile Include="..\lib_enc\spec_flatness.c" />
-    <ClCompile Include="..\lib_enc\speech_music_classif.c" />
-    <ClCompile Include="..\lib_enc\stat_noise_uv_enc.c" />
-    <ClCompile Include="..\lib_enc\subband_fft.c" />
-    <ClCompile Include="..\lib_enc\swb_bwe_enc.c" />
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr.c" />
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr.c" />
-    <ClCompile Include="..\lib_enc\swb_pre_proc.c" />
+    <ClCompile Include="..\lib_enc\ivas_sns_enc_fx.c" />
     <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />
-    <ClCompile Include="..\lib_enc\swb_tbe_enc.c" />
     <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\tcq_core_enc.c" />
     <ClCompile Include="..\lib_enc\tcq_core_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\tcx_ltp_enc.c" />
     <ClCompile Include="..\lib_enc\tcx_ltp_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\tcx_utils_enc.c" />
     <ClCompile Include="..\lib_enc\tcx_utils_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\tfa_enc.c" />
     <ClCompile Include="..\lib_enc\tfa_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\tns_base_enc.c" />
     <ClCompile Include="..\lib_enc\tns_base_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\transient_detection.c" />
     <ClCompile Include="..\lib_enc\transient_detection_fx.c" />
-    <ClCompile Include="..\lib_enc\transition_enc.c" />
     <ClCompile Include="..\lib_enc\transition_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\update_decision.c" />
     <ClCompile Include="..\lib_enc\update_decision_fx.c" />
-    <ClCompile Include="..\lib_enc\updt_enc.c" />
     <ClCompile Include="..\lib_enc\updt_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\updt_tar.c" />
     <ClCompile Include="..\lib_enc\updt_tar_fx.c" />
-    <ClCompile Include="..\lib_enc\vad.c" />
     <ClCompile Include="..\lib_enc\vad_basop_fx.c" />
     <ClCompile Include="..\lib_enc\vad_fx.c" />
-    <ClCompile Include="..\lib_enc\vad_param_updt.c" />
     <ClCompile Include="..\lib_enc\vad_param_updt_fx.c" />
-    <ClCompile Include="..\lib_enc\vad_proc.c" />
     <ClCompile Include="..\lib_enc\vad_proc_fx.c" />
-    <ClCompile Include="..\lib_enc\vbr_average_rate.c" />
     <ClCompile Include="..\lib_enc\vbr_average_rate_fx.c" />
-    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c" />
     <ClCompile Include="..\lib_enc\vlpc_1st_cod_fx.c" />
-    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c" />
     <ClCompile Include="..\lib_enc\vlpc_2st_cod_fx.c" />
-    <ClCompile Include="..\lib_enc\voiced_enc.c" />
     <ClCompile Include="..\lib_enc\voiced_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c" />
     <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Workspace_msvc/lib_enc.vcxproj.filters b/Workspace_msvc/lib_enc.vcxproj.filters
index abc2ccec7162cae15eb0dd94fbadef0a8deabae2..8990971637ef90b8f3a11fbd672278a29d3f89da 100644
--- a/Workspace_msvc/lib_enc.vcxproj.filters
+++ b/Workspace_msvc/lib_enc.vcxproj.filters
@@ -1,968 +1,641 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\lib_enc\ivas_core_enc.c">
-      <Filter>enc_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_cpe_enc.c">
-      <Filter>enc_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc.c">
-      <Filter>enc_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_dirac_enc.c">
-      <Filter>enc_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_enc.c">
-      <Filter>enc_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_sce_enc.c">
-      <Filter>enc_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cod_ace.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cod_uv.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_2div.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_init.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_ol.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_reconf.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_updt.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_switch.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\decision_matrix_enc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_amr_wb.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_prm.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hf_cod_amrwb.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\isf_enc_amr_wb.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_lr_enc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\nelp_enc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ppp_enc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\plc_enc_ext.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pre_proc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\vbr_average_rate.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\voiced_enc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\q_gain2p.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ltd_stable.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\vad_proc.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ari_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ari_hm_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\arith_coder_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\avq_cod.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\bass_psfilter_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\bw_detect.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cng_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cod_tcx.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cod2t32.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cod4t64.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cod4t64_fast.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\cor_shif.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\core_switching_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\corr_xh.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\detect_transient.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\diffcod.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\dtx.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_acelp.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_acelpx.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_gain.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_gen_voic.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_uv.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\energy.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\eval_pit_contr.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\fd_cng_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\find_tilt.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\find_uv.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\find_wsp.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\gain_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\gs_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\guided_plc_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_classifier_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_core_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_env_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_hr_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hvq_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\igf_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\igf_scf_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\init_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\inov_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\lead_indexing.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\long_enr.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\lp_exc_e.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\lsf_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\mdct_classifier.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\mdct_selector.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\mslvq_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\multi_harm.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\nois_est.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\noise_adjust.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\normalizecoefs.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\peak_vq_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pit_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pitch_ol.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pitch_ol2.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pvq_core_enc.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pvq_encode.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\qlpc_avq.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\rom_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\lib_enc.c" />
+    <ClCompile Include="..\lib_enc\acelp_core_switch_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\setmodeindex.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\amr_wb_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\spec_center.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\cod_uv_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\spec_flatness.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\cod_ace_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\speech_music_classif.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\comvad_decision_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\stat_noise_uv_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\core_enc_2div_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\subband_fft.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\core_enc_init_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_bwe_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\core_enc_ol_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_pre_proc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\core_enc_reconf_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_tbe_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\core_enc_switch_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tcq_core_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\core_enc_updt_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tcx_ltp_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\decision_matrix_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tcx_utils_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tfa_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_amr_wb_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tns_base_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_gen_voic_rf_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\transient_detection.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_gen_voic_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\transition_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_nelp_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\update_decision.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_ppp_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\updt_enc.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\updt_tar.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\evs_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vad.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\hf_cod_amrwb_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vad_param_updt.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\hq_lr_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\isf_enc_amr_wb_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ltd_stable_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\nelp_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\comvad_decision.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\ppp_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\plc_enc_ext_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_masa_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\pre_proc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mct_core_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\q_gain2p_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mct_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\SNR_calc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_prm.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\vad_proc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\vbr_average_rate_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\voiced_enc_fx.c">
+      <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_init_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\ACcontextMapping_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\acelp_core_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_sba_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\acelp_enc_util_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_sns_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\analy_lp_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_qspherical_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\analy_sp_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\ari_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_param_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\ari_hm_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\arith_coder_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\avq_cod_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\bass_psfilter_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\bw_detect_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\cng_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_classifier.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\cod_tcx_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\cod2t32_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\cod4t64_fast.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\cod4t64_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\cor_shif_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\core_switching_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\corr_xh_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\detect_transient_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\diffcod_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\dtx_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_acelp_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_acelpx_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_gain_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_higher_acelp_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_pit_exc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\lib_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_front_vad.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_prm_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_pca_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_tran_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_entropy_coder.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\enc_uv_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\energy_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_agc_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\eval_pit_contr_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\ext_sig_ana_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_spar_encoder.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\fd_cng_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_spar_md_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\FEC_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\find_tar_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\find_tilt_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\find_uv_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\find_wsp_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\gain_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_osba_enc.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\gaus_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_enc\gp_clip_fx.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\isf_enc_amr_wb_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\nelp_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\detect_transient_fx.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\evs_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\SNR_calc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\voiced_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\vbr_average_rate_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\vad_proc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\q_gain2p_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\pre_proc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ppp_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\plc_enc_ext_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ltd_stable_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_lr_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\hf_cod_amrwb_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\gs_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\guided_plc_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_ppp_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\hq_classifier_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_nelp_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\hq_core_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_gen_voic_rf_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\hq_env_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_amr_wb_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\hq_hr_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\hvq_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\decision_matrix_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\igf_enc.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_updt_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\igf_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_switch_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\igf_scf_enc.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_reconf_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\igf_scf_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_ol_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\init_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_init_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\inov_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_enc_2div_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\lead_indexing_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\comvad_decision_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\long_enr_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cod_uv_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\lp_exc_e_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cod_ace_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\lsf_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\amr_wb_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\acelp_core_switch_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\updt_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\mdct_classifier_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\speech_music_classif_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\mdct_selector_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\mslvq_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vlpc_2st_cod_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\multi_harm_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vlpc_1st_cod_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\nois_est_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vad_param_updt_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\noise_adjust_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vad_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\normalizecoefs_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\updt_tar_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\peak_vq_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\update_decision_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\pit_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\transition_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\pitch_ol_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\transient_detection_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\pitch_ol2_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tns_base_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\pvq_core_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tfa_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\pvq_encode_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tcx_utils_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\qlpc_avq_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tcx_ltp_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\qlpc_stoch_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\tcq_core_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\range_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\re8_cod_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\reordernorm_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\swb_bwe_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\rom_enc.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\subband_fft_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\rst_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\stat_noise_uv_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\scale_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\spec_flatness_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\set_impulse_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\spec_center_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\setmodeindex_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_enc\sig_clas_fx.c">
-      <Filter>enc_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\setmodeindex_fx.c">
-      <Filter>enc_all_c</Filter>
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\set_impulse_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\spec_center_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\rst_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\spec_flatness_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\reordernorm_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\speech_music_classif_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\re8_cod_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\stat_noise_uv_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\range_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\subband_fft_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\qlpc_stoch_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\swb_bwe_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\qlpc_avq_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\pvq_encode_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\pvq_core_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\tcq_core_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\pitch_ol2_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\tcx_ltp_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\pitch_ol_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\tcx_utils_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\pit_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\tfa_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\peak_vq_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\tns_base_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\normalizecoefs_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\transient_detection_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\noise_adjust_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\transition_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\nois_est_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\update_decision_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\multi_harm_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\updt_enc_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\mslvq_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\updt_tar_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\mdct_selector_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\vad_basop_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\mdct_classifier_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\vad_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\vad_param_updt_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\lsf_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\vlpc_1st_cod_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\lp_exc_e_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\vlpc_2st_cod_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\long_enr_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c">
+      <Filter>encoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\lead_indexing_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_agc_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\inov_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\init_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\igf_scf_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\igf_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\hvq_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_cpe_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_hr_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_env_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_dirac_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_core_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\hq_classifier_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\guided_plc_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_entropy_coder_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\gs_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_front_vad_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\gaus_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_init_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\gain_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\find_wsp_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_ism_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\find_uv_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\find_tilt_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_ism_param_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\find_tar_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_lfe_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\fd_cng_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_masa_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ext_sig_ana_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mc_param_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\eval_pit_contr_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\energy_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_uv_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mct_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_tran_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_prm_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_pit_exc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_higher_acelp_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_omasa_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_gen_voic_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_osba_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_gain_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_pca_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_acelpx_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\enc_acelp_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_qspherical_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\dtx_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_range_uni_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\diffcod_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_sba_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\corr_xh_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_sce_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\core_switching_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_sns_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cor_shif_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_spar_encoder_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cod_tcx_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_spar_md_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cod4t64_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cod2t32_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_classifier_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\cng_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\bw_detect_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\bass_psfilter_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\avq_cod_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\arith_coder_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ari_hm_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ari_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\analy_sp_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\analy_lp_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\acelp_enc_util_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\acelp_core_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\FEC_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ACcontextMapping_enc_fx.c">
-      <Filter>enc_all_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\vad_basop_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\scale_enc_fx.c">
-      <Filter>enc_evs_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c">
-      <Filter>enc_ivas_c</Filter>
+    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\lib_enc\lib_enc.h" />
     <ClInclude Include="..\lib_enc\ivas_stat_enc.h">
-      <Filter>enc_h</Filter>
+      <Filter>encoder_h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib_enc\prot_fx_enc.h">
+      <Filter>encoder_h</Filter>
     </ClInclude>
     <ClInclude Include="..\lib_enc\rom_enc.h">
-      <Filter>enc_h</Filter>
+      <Filter>encoder_h</Filter>
     </ClInclude>
     <ClInclude Include="..\lib_enc\stat_enc.h">
-      <Filter>enc_h</Filter>
+      <Filter>encoder_h</Filter>
     </ClInclude>
     <ClInclude Include="..\lib_enc\ivas_rom_enc.h">
-      <Filter>enc_h</Filter>
+      <Filter>encoder_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_enc\lib_enc.h" />
     <ClInclude Include="..\lib_enc\vad_basop.h">
-      <Filter>enc_h</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib_enc\prot_fx_enc.h">
-      <Filter>enc_h</Filter>
+      <Filter>encoder_all_c</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="enc_all_c">
-      <UniqueIdentifier>{b7ee0526-8b79-4554-a3ec-04e51d38475f}</UniqueIdentifier>
+    <Filter Include="encoder_all_c">
+      <UniqueIdentifier>{34137975-e4fd-40f0-938f-02fd46da5e22}</UniqueIdentifier>
     </Filter>
-    <Filter Include="enc_evs_c">
-      <UniqueIdentifier>{dabed049-70a2-48f2-9da6-3b81a3664033}</UniqueIdentifier>
+    <Filter Include="encoder_evs_c">
+      <UniqueIdentifier>{c24a3dcd-cde3-411b-aecf-747c29d87668}</UniqueIdentifier>
     </Filter>
-    <Filter Include="enc_ivas_c">
-      <UniqueIdentifier>{5717f1cb-c593-400b-b23a-45c422fd95c8}</UniqueIdentifier>
+    <Filter Include="encoder_h">
+      <UniqueIdentifier>{e78e5d72-8d6d-4b00-a6e0-64a62c9cf8f2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="enc_h">
-      <UniqueIdentifier>{6cccabbe-510f-43d3-90e1-8ed5ea3837d7}</UniqueIdentifier>
+    <Filter Include="encoder_ivas_c">
+      <UniqueIdentifier>{597ebb71-22ba-41e8-b4bf-e8691bda2e5b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Workspace_msvc/lib_rend.vcxproj b/Workspace_msvc/lib_rend.vcxproj
index fa11b23beb756bdfe1bbad4a3cf989ea5ed750bb..e47858ae380f169b2bf53e720d1c3abf23c29224 100644
--- a/Workspace_msvc/lib_rend.vcxproj
+++ b/Workspace_msvc/lib_rend.vcxproj
@@ -136,50 +136,50 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c" />
-    <ClCompile Include="..\lib_rend\ivas_hrtf.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_rend_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_hrtf_fx.c" />
     <ClCompile Include="..\lib_rend\ivas_output_init_fx.c" />
-    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />
-    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_crend.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />
-    <ClCompile Include="..\lib_rend\ivas_efap.c" />
-    <ClCompile Include="..\lib_rend\ivas_limiter.c" />
-    <ClCompile Include="..\lib_rend\ivas_masa_merge.c" />
-    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c" />
-    <ClCompile Include="..\lib_rend\ivas_omasa_ana.c" />
-    <ClCompile Include="..\lib_rend\ivas_orient_trk.c" />
+    <ClCompile Include="..\lib_rend\ivas_sba_rendering_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_allrad_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_crend_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_ana_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_efap_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_limiter_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_masa_merge_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_omasa_ana_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_orient_trk_fx.c" />
     <ClCompile Include="..\lib_rend\ivas_output_init.c" />
-    <ClCompile Include="..\lib_rend\ivas_reflections.c" />
-    <ClCompile Include="..\lib_rend\ivas_render_config.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_utils.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c" />
-    <ClCompile Include="..\lib_rend\ivas_rotation.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_rend.c" />
-    <ClCompile Include="..\lib_rend\ivas_shoebox.c" />
-    <ClCompile Include="..\lib_rend\ivas_td_decorr.c" />
-    <ClCompile Include="..\lib_rend\ivas_vbap.c" />
+    <ClCompile Include="..\lib_rend\ivas_reflections_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_render_config_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_utils_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rotation_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_rend_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_shoebox_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c" />
     <ClCompile Include="..\lib_rend\lib_rend.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lib_rend\ivas_prot_rend.h" />
+    <ClInclude Include="..\lib_rend\ivas_prot_rend_fx.h" />
     <ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />
     <ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />
     <ClInclude Include="..\lib_rend\ivas_rom_rend.h" />
diff --git a/Workspace_msvc/lib_rend.vcxproj.filters b/Workspace_msvc/lib_rend.vcxproj.filters
index 01f3dfb74b19aaa5bbfbce01fa14d68eaf0e5af8..5c4a4901111136b5ce1c1406701ffe10e156b86b 100644
--- a/Workspace_msvc/lib_rend.vcxproj.filters
+++ b/Workspace_msvc/lib_rend.vcxproj.filters
@@ -2,132 +2,129 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\lib_rend\lib_rend.c" />
-    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_output_init.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_crend.c">
+    <ClCompile Include="..\lib_rend\ivas_output_init_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c">
+    <ClCompile Include="..\lib_rend\ivas_allrad_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c">
+    <ClCompile Include="..\lib_rend\ivas_crend_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_ana_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_efap.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_hrtf.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_rend_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_limiter.c">
+    <ClCompile Include="..\lib_rend\ivas_efap_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_masa_merge.c">
+    <ClCompile Include="..\lib_rend\ivas_hrtf_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c">
+    <ClCompile Include="..\lib_rend\ivas_limiter_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer.c">
+    <ClCompile Include="..\lib_rend\ivas_masa_merge_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c">
+    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_omasa_ana.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_orient_trk.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_output_init.c">
+    <ClCompile Include="..\lib_rend\ivas_omasa_ana_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_render_config.c">
+    <ClCompile Include="..\lib_rend\ivas_orient_trk_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb.c">
+    <ClCompile Include="..\lib_rend\ivas_reflections_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line.c">
+    <ClCompile Include="..\lib_rend\ivas_render_config_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_utils.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_utils_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_rend.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rotation.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_rend_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_shoebox.c">
+    <ClCompile Include="..\lib_rend\ivas_rotation_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reflections.c">
+    <ClCompile Include="..\lib_rend\ivas_sba_rendering_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_vbap.c">
+    <ClCompile Include="..\lib_rend\ivas_shoebox_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_td_decorr.c">
+    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_output_init_fx.c">
+    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_rend\lib_rend.h" />
-    <ClInclude Include="..\lib_rend\ivas_prot_rend.h">
-      <Filter>rend_h</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib_rend\ivas_rom_rend.h">
       <Filter>rend_h</Filter>
     </ClInclude>
@@ -143,7 +140,7 @@
     <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">
       <Filter>rend_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h">
+    <ClInclude Include="..\lib_rend\ivas_prot_rend_fx.h">
       <Filter>rend_h</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Workspace_msvc/renderer.vcxproj b/Workspace_msvc/renderer.vcxproj
index 1f95040e1f2189e4fed248f58eddd0e27e8da7a0..70a130e3141e9e71ae9166e941d99f839a9bc7dd 100644
--- a/Workspace_msvc/renderer.vcxproj
+++ b/Workspace_msvc/renderer.vcxproj
@@ -65,7 +65,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling />
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/apps/decoder.c b/apps/decoder.c
index 05872256985800658c623b48072312c7e015b132..1c59a02e743cd3716e2299e9c39fed891a0441d0 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/apps/encoder.c b/apps/encoder.c
index a1b7f0d10118e6e9388a5313036ac7c37a8ceeb0..af9554589d813007f8b04ec2df6f4f6a0369fe4c 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -45,6 +45,19 @@
 #include "masa_file_reader.h"
 #include "wmc_auto.h"
 
+#ifdef DEBUG_FORCE_DIR
+/* Windows does not define the S_ISREG and S_ISDIR macros in stat.h, so we do.
+   We have to define _CRT_INTERNAL_NONSTDC_NAMES 1 before #including sys/stat.h
+   in order for Microsoft's stat.h to define names like S_IFMT, S_IFREG, and S_IFDIR,
+   rather than just defining  _S_IFMT, _S_IFREG, and _S_IFDIR as it normally does. */
+#include <sys/stat.h>
+#if !defined( S_ISREG ) && defined( S_IFMT ) && defined( S_IFREG )
+#define S_ISREG( m ) ( ( (m) &S_IFMT ) == S_IFREG )
+#endif
+#if !defined( S_ISDIR ) && defined( S_IFMT ) && defined( S_IFDIR )
+#define S_ISDIR( m ) ( ( (m) &S_IFMT ) == S_IFDIR )
+#endif
+#endif
 
 #define WMC_TOOL_SKIP
 
@@ -136,6 +149,9 @@ typedef struct
 #ifdef DEBUGGING
     IVAS_ENC_FORCED_MODE forcedMode;
     const char *forcedModeFile;
+#ifdef DEBUG_FORCE_DIR
+    const char *forcedModeDir;
+#endif
 #endif
     bool pca;
     bool ism_extended_metadata;
@@ -353,6 +369,15 @@ int main(
         goto cleanup;
     }
 
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+#ifdef DEBUGGING
+    if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )
+    {
+        fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );
+    }
+#endif
+#endif
+
     /*------------------------------------------------------------------------------------------*
      * Configure and initialize (allocate memory for static variables) the encoder
      *------------------------------------------------------------------------------------------*/
@@ -680,7 +705,12 @@ int main(
         /* Force mode not set when configuring, set in first frame even if not reading from file */
         if ( f_forcedModeProfile || frame == 0 )
         {
-            if ( ( error = IVAS_ENC_SetForcedMode( hIvasEnc, forcedMode ) ) != IVAS_ERR_OK )
+            if ( ( error = IVAS_ENC_SetForcedMode( hIvasEnc, forcedMode
+#ifdef DEBUG_FORCE_DIR
+                                                   ,
+                                                   arg.forcedModeDir
+#endif
+                                                   ) ) != IVAS_ERR_OK )
             {
                 fprintf( stderr, "\nIVAS_ENC_SetForcedMode failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
                 goto cleanup;
@@ -851,6 +881,9 @@ static void initArgStruct( EncArguments *arg )
 #ifdef DEBUGGING
     arg->forcedMode = IVAS_ENC_FORCE_UNFORCED;
     arg->forcedModeFile = NULL;
+#ifdef DEBUG_FORCE_DIR
+    arg->forcedModeDir = NULL;
+#endif
 #endif
     arg->pca = false;
 
@@ -991,6 +1024,28 @@ static bool parseCmdlIVAS_enc(
 
             arg->forcedMode = parseForcedMode( stmp );
 
+#ifdef DEBUG_FORCE_DIR
+            if ( arg->forcedMode < IVAS_ENC_FORCE_FILE )
+            {
+                fprintf( stdout, "Forcing codec to:       %s\n", argv[i + 1] );
+            }
+            else if ( arg->forcedMode == IVAS_ENC_FORCE_FILE )
+            {
+                arg->forcedModeFile = argv[i + 1];
+                fprintf( stdout, "Force switching file:   %s\n", argv[i + 1] );
+            }
+            else if ( arg->forcedMode == IVAS_ENC_FORCE_DIR )
+            {
+                arg->forcedModeDir = argv[i + 1];
+                fprintf( stdout, "Forcing switching directory:       %s\n", argv[i + 1] );
+            }
+            else
+            {
+                fprintf( stderr, "\nError: The force switching profile file/dir %s does not exist or could not be opened!\n\n", argv[i + 1] );
+                usage_enc();
+                return false;
+            }
+#else
             if ( arg->forcedMode == IVAS_ENC_FORCE_UNDEFINED )
             {
                 arg->forcedModeFile = argv[i + 1];
@@ -998,8 +1053,26 @@ static bool parseCmdlIVAS_enc(
             }
             else
             {
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+                if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )
+                {
+                    strcpy( stmp, "TCX10" );
+                }
+                else if ( arg->forcedMode == IVAS_ENC_FORCE_TCX20 )
+                {
+                    strcpy( stmp, "TCX20" );
+                }
+                else
+                {
+                    strncpy( stmp, argv[i + 1], sizeof( stmp ) );
+                }
+
+                fprintf( stdout, "Forcing codec to:       %s\n", stmp );
+#else
                 fprintf( stdout, "Forcing codec to:       %s\n", argv[i + 1] );
+#endif
             }
+#endif
 
             i += 2;
         }
@@ -1791,6 +1864,9 @@ static void usage_enc( void )
 #ifdef DEBUGGING
     fprintf( stdout, "-force T            : Force specific mode, T = (speech, music, ACELP, GSC, TCX, HQ),\n" );
     fprintf( stdout, "                      alternatively, T can be a text file where each line contains \"nb_frames T\"\n" );
+#ifdef DEBUG_FORCE_DIR
+    fprintf( stdout, "                      or T can be a directory containing external binary files for modes/parameters enforcement\n" );
+#endif
 #endif
 #ifdef DEBUG_MODE_INFO
 #ifdef DEBUG_MODE_INFO_TWEAK
@@ -1900,8 +1976,72 @@ static bool readBitrate(
 static IVAS_ENC_FORCED_MODE parseForcedMode(
     char *forcedModeChar )
 {
+#ifdef DEBUG_FORCE_DIR
+    struct stat path_stat;
+#endif
+
     to_upper( forcedModeChar );
 
+#ifdef DEBUG_FORCE_DIR
+    if ( ( strcmp( forcedModeChar, "SPEECH" ) == 0 ) || ( strcmp( forcedModeChar, "'SPEECH'" ) == 0 ) ||
+         ( strcmp( forcedModeChar, "0" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_SPEECH;
+    }
+    else if ( ( strcmp( forcedModeChar, "MUSIC" ) == 0 ) || ( strcmp( forcedModeChar, "'MUSIC'" ) == 0 ) || ( strcmp( forcedModeChar, "AUDIO" ) == 0 ) || ( strcmp( forcedModeChar, "'AUDIO'" ) == 0 ) || ( strcmp( forcedModeChar, "1" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_MUSIC;
+    }
+    else if ( ( strcmp( forcedModeChar, "ACELP" ) == 0 ) || ( strcmp( forcedModeChar, "'ACELP'" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_ACELP;
+    }
+    else if ( ( strcmp( forcedModeChar, "GSC" ) == 0 ) || ( strcmp( forcedModeChar, "'GSC'" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_GSC;
+    }
+    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 )
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+         || ( strcmp( forcedModeChar, "TCX20" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )
+#endif
+    )
+    {
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        return IVAS_ENC_FORCE_TCX20;
+#else
+        return IVAS_ENC_FORCE_TCX;
+#endif
+    }
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+    if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_TCX10;
+    }
+#endif
+    else if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) || ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_HQ;
+    }
+    else
+    {
+        if ( stat( forcedModeChar, &path_stat ) != 0 )
+        {
+            return IVAS_ENC_FORCE_UNDEFINED;
+        }
+
+        /* check if the argument represents an existing file or directory */
+        if ( S_ISDIR( path_stat.st_mode ) )
+        {
+            /* it's a directory */
+            return IVAS_ENC_FORCE_DIR;
+        }
+        else
+        {
+            /* it's a file */
+            return IVAS_ENC_FORCE_FILE;
+        }
+    }
+#else
     if ( ( strcmp( forcedModeChar, "SPEECH" ) == 0 ) || ( strcmp( forcedModeChar, "'SPEECH'" ) == 0 ) ||
          ( strcmp( forcedModeChar, "0" ) == 0 ) )
     {
@@ -1919,16 +2059,31 @@ static IVAS_ENC_FORCED_MODE parseForcedMode(
     {
         return IVAS_ENC_FORCE_GSC;
     }
-    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) )
+    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 )
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+         || ( strcmp( forcedModeChar, "TCX20" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )
+#endif
+    )
     {
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        return IVAS_ENC_FORCE_TCX20;
+#else
         return IVAS_ENC_FORCE_TCX;
+#endif
+    }
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+    if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_TCX10;
     }
+#endif
     if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) || ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )
     {
         return IVAS_ENC_FORCE_HQ;
     }
 
     return IVAS_ENC_FORCE_UNDEFINED;
+#endif
 }
 
 
diff --git a/apps/renderer.c b/apps/renderer.c
index 44ed320adee991ab4ce37f040724affb9ffab334..47548d438f9d3ae4e8e409c60d14051f256e24b0 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -48,7 +48,6 @@
 #include "vector3_pair_file_reader.h"
 #include "wmc_auto.h"
 
-#include "prot_fx.h"
 
 #define WMC_TOOL_SKIP
 
@@ -56,11 +55,15 @@
  * Local constants
  *------------------------------------------------------------------------------------------*/
 
+#define Q15        15
+#define Q22        22
+#define Q31        31
+#define ONE_IN_Q31 0x7fffffff
+
 #define RENDERER_MAX_CLI_ARG_LENGTH       ( FILENAME_MAX )
 #define RENDERER_MAX_METADATA_LENGTH      8192
 #define RENDERER_MAX_METADATA_LINE_LENGTH 1024
 
-
 #define IVAS_MAX16B_FLT 32767.0f
 #define IVAS_MIN16B_FLT ( -32768.0f )
 #define IVAS_MAX16B_FX  32767
@@ -428,6 +431,47 @@ static Word16 find_guard_bits( Word32 n )
                     : n <= 1024 ? 10
                                 : 11;
 }
+
+static Word32 floatToFixed( float f, Word16 Q )
+{
+    Word64 result_32;
+
+    if ( f == 1.0f && Q == Q15 )
+        return IVAS_MAX16B_FX;
+    if ( f == 1.0f && Q == Q31 )
+        return MAXVAL_WORD32;
+    if ( Q < 0 )
+        result_32 = (Word64) ( (float) ( f ) / (double) ( (unsigned Word64) 1 << ( -Q ) ) + ( f >= 0 ? 0.5 : -0.5 ) );
+    else
+        result_32 = (Word64) ( f * (double) ( (unsigned Word64) 1 << Q ) + ( f >= 0 ? 0.5 : -0.5 ) );
+    if ( result_32 > MAX_32 )
+        return MAX_32;
+    if ( result_32 < MIN_32 )
+        return MIN_32;
+
+    return (Word32) result_32;
+}
+
+/* note: This function is defined inside the library too with different name but same functionality */
+static void floatToFixed_arrL_app( float *f, Word32 *i, Word16 Q, Word16 l )
+{
+    for ( int j = 0; j < l; j++ )
+    {
+        Word64 i64_val = floatToFixed( f[j], Q );
+        IF( i64_val > MAX_32 )
+        {
+            i64_val = MAX_32;
+        }
+        ELSE IF( i64_val < MIN_32 )
+        {
+            i64_val = MIN_32;
+        }
+        i[j] = (Word32) i64_val;
+    }
+
+    return;
+}
+
 static IVAS_REND_ReadOnlyAudioBuffer getReadOnlySubBuffer(
     IVAS_REND_AudioBuffer buffer,
     const Word16 chBeginIdx,
@@ -655,6 +699,8 @@ int main(
         lfeRoutingConfigs[i] = NULL;
     }
 
+    IVAS_REND_PrintDisclaimer();
+
     CmdlnArgs args = parseCmdlnArgs( argc, argv );
 
     if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) ||
@@ -816,6 +862,48 @@ int main(
         exit( -1 );
     }
 
+    fprintf( stdout, "Input audio file:       %s\n", args.inputFilePath );
+    fprintf( stdout, "Output audio file:      %s\n\n", args.outputFilePath );
+
+    if ( args.inConfig.numAudioObjects > 0 )
+    {
+        if ( args.inConfig.numAudioObjects == 1 )
+        {
+            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM1 );
+        }
+        else if ( args.inConfig.numAudioObjects == 2 )
+        {
+            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM2 );
+        }
+        else if ( args.inConfig.numAudioObjects == 3 )
+        {
+            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM3 );
+        }
+        else if ( args.inConfig.numAudioObjects == 4 )
+        {
+            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM4 );
+        }
+    }
+    for ( i = 0; i < args.inConfig.numMultiChannelBuses; i++ )
+    {
+        IVAS_REND_PrintInputConfig( args.inConfig.multiChannelBuses[i].audioConfig );
+    }
+    for ( i = 0; i < args.inConfig.numMasaBuses; i++ )
+    {
+        IVAS_REND_PrintInputConfig( args.inConfig.masaBuses[i].audioConfig );
+    }
+    for ( i = 0; i < args.inConfig.numAmbisonicsBuses; i++ )
+    {
+        IVAS_REND_PrintInputConfig( args.inConfig.ambisonicsBuses[i].audioConfig );
+    }
+
+    if ( ( error = IVAS_REND_PrintConfig( hIvasRend ) ) != IVAS_ERR_OK )
+    {
+        fprintf( stderr, "\n IVAS_REND_PrintConfig failed: %s\n\n", ivas_error_to_string( error ) );
+        // goto cleanup;
+        exit( -1 );
+    }
+
     /* === Configure === */
     if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
     {
@@ -882,8 +970,8 @@ int main(
     /* Set up output custom layout configuration */
     if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
     {
-        floatToFixed_arrL( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
-        floatToFixed_arrL( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
+        floatToFixed_arrL_app( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
+        floatToFixed_arrL_app( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
         if ( ( error = IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( hIvasRend, args.outConfig.outSetupCustom ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "Error in IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
@@ -970,8 +1058,8 @@ int main(
 
         if ( args.inConfig.multiChannelBuses[i].audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
         {
-            floatToFixed_arrL( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
-            floatToFixed_arrL( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
+            floatToFixed_arrL_app( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
+            floatToFixed_arrL_app( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
             if ( ( error = IVAS_REND_ConfigureCustomInputLoudspeakerLayout( hIvasRend, mcIds[i], args.inConfig.inSetupCustom ) ) != IVAS_ERR_OK )
             {
                 fprintf( stderr, "Error in IVAS_REND_ConfigureCustomInputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
diff --git a/lib_com/ari_hm_fx.c b/lib_com/ari_hm_fx.c
index 076bc8d9263d1f59c12906bb796fcbd5f245f591..46f8ecea1e78f01164d1acc083f29d3c26b145b6 100644
--- a/lib_com/ari_hm_fx.c
+++ b/lib_com/ari_hm_fx.c
@@ -10,7 +10,6 @@
 #include "basop_util.h"
 #include "rom_com.h"
 #include "prot_fx.h"
-#include "prot.h"
 
 #define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )
 void UnmapIndex(
diff --git a/lib_com/arith_coder_fx.c b/lib_com/arith_coder_fx.c
index 12a4fa6702649fe221fa2124e28407fea64f51d4..846b4dceab0befaa6257563eda540e785fb7c1d9 100644
--- a/lib_com/arith_coder_fx.c
+++ b/lib_com/arith_coder_fx.c
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include "options.h"
 #include "prot_fx.h"
-#include "prot.h"
 #include "basop_util.h"
 #include "basop_proto_func.h"
 #include "cnst.h"
@@ -224,12 +223,8 @@ void tcx_arith_scale_envelope(
 
         tmp = norm_l( env[k] );
         tmp2 = sub( 15, tmp );
-#ifdef BASOP_NOGLOB
         tmp = Inv16( round_fx_o( L_shl_o( env[k], tmp, &Overflow ), &Overflow ), &tmp2 ); /* exp(tmp2) */
-#else
-        tmp = Inv16( round_fx( L_shl( env[k], tmp ) ), &tmp2 );
-#endif
-        ienv[k] = L_shl( L_deposit_h( tmp ), sub( tmp2, 15 ) ); /* Q16 */
+        ienv[k] = L_shl( L_deposit_h( tmp ), sub( tmp2, 15 ) );                           /* Q16 */
         move32();
         mean = L_add( mean, ienv[k] ); /* Q16 */
     }
@@ -276,11 +271,7 @@ void tcx_arith_scale_envelope(
 
     tmp2 = BASOP_Util_Add_MantExp( negate( b ), b_e, tmp, tmp2, &scale ); /* exp(scale) */
     scale = BASOP_Util_Divide1616_Scale( scale, round_fx( a ), &tmp );
-#ifdef BASOP_NOGLOB
     scale = shl_o( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ), &Overflow ); /* Q15 */
-#else
-    scale = shl( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ) ); /* Q15 */
-#endif
 
     /* iscale = 1.0f / scale; */
     iscale_e = 0;
@@ -329,11 +320,7 @@ void tcx_arith_scale_envelope(
                 L_tmp = L_add( L_tmp, L_shl( Mpy_32_16_1( env[k], mult_r( 1147 /*0.035f Q15*/, iscale ) ), iscale_e ) ); /* Q16 */
 
                 tmp = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
                 statesi = mult_r( statesi, round_fx_o( L_shl_o( L_tmp, tmp, &Overflow ), &Overflow ) );
-#else
-                statesi = mult_r( statesi, round_fx( L_shl( L_tmp, tmp ) ) );
-#endif
                 bits = add( bits, sub( 15, tmp ) );
 
                 tmp = norm_s( statesi );
@@ -420,11 +407,7 @@ void tcx_arith_scale_envelope(
     *s_env_e = sub( add( 15, iscale_e ), tmp );
     move16();
     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
     a = L_shl_o( 1265000, sub( 15, *s_env_e ), &Overflow );
-#else /* BASOP_NOGLOB */
-    a = L_shl( 1265000, sub( 15, *s_env_e ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS;
 
     FOR( k = 0; k < L_frame; k++ )
diff --git a/lib_com/basop32.c b/lib_com/basop32.c
index 732e33b2a5ef05c6b47458c63f0c854a73cf7b4d..fbe08a11f74d5a2afd466d351a5652b35d13f275 100644
--- a/lib_com/basop32.c
+++ b/lib_com/basop32.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -162,9 +162,7 @@ HISTORY:
 #include "options.h"
 #include "stl.h"
 
-#ifdef BASOP_NOGLOB
 #include <assert.h>
-#endif /* BASOP_NOGLOB */
 
 #define WMC_TOOL_SKIP
 
@@ -178,9 +176,7 @@ HISTORY:
  |   Local Functions                                                         |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 static Word16 saturate_o( Word32 L_var1, Flag *Overflow );
-#endif /* BASOP_NOGLOB */
 static Word16 saturate( Word32 L_var1 );
 
 
@@ -189,7 +185,6 @@ static Word16 saturate( Word32 L_var1 );
  |   Constants and Globals                                                   |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 
 #ifdef BASOP_PRINT_ON_WARNING
 #include <stdio.h>
@@ -416,10 +411,6 @@ Flag get_carry( const Flag *carry )
 #undef B_HELPER_SET_GLOBAL
 #undef B_HELPER_GET_GLOBAL
 
-#else  /* BASOP_NOGLOB */
-Flag Overflow = 0;
-Flag Carry = 0;
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -456,30 +447,18 @@ Flag Carry = 0;
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-static Word16 saturate( Word32 L_var1 )
-#else  /* BASOP_NOGLOB */
 static Word16 saturate_o( Word32 L_var1, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word16 var_out;
 
     if ( L_var1 > 0X00007fffL )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
-#endif /* BASOP_NOGLOB */
         var_out = MAX_16;
     }
     else if ( L_var1 < (Word32) 0xffff8000L )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
-#endif /* BASOP_NOGLOB */
         var_out = MIN_16;
     }
     else
@@ -495,7 +474,6 @@ static Word16 saturate_o( Word32 L_var1, Flag *Overflow )
     return ( var_out );
 }
 
-#ifdef BASOP_NOGLOB
 static Word16 saturate( Word32 L_var1 )
 {
     Word16 var_out;
@@ -522,7 +500,6 @@ static Word16 saturate( Word32 L_var1 )
 
     return ( var_out );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -557,7 +534,6 @@ static Word16 saturate( Word32 L_var1 )
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 add_o( Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word16 var_out;
@@ -572,7 +548,6 @@ Word16 add_o( Word16 var1, Word16 var2, Flag *Overflow )
     return ( var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word16 add( Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -586,13 +561,11 @@ Word16 add( Word16 var1, Word16 var2 )
 #endif
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 add_sat( Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return add_o( var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : sub                                                     |
@@ -626,7 +599,6 @@ Word16 add_sat( Word16 var1, Word16 var2 )
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 sub_o( Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word16 var_out;
@@ -641,7 +613,6 @@ Word16 sub_o( Word16 var1, Word16 var2, Flag *Overflow )
     return ( var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word16 sub( Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -655,13 +626,11 @@ Word16 sub( Word16 var1, Word16 var2 )
 #endif
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 sub_sat( Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return sub_o( var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : abs_s                                                   |
@@ -753,11 +722,7 @@ Word16 abs_s( Word16 var1 )
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word16 shl( Word16 var1, Word16 var2 )
-#else  /* BASOP_NOGLOB */
 Word16 shl_o( Word16 var1, Word16 var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word16 var_out;
     Word32 result;
@@ -779,11 +744,7 @@ Word16 shl_o( Word16 var1, Word16 var2, Flag *Overflow )
 
         if ( ( var2 > 15 && var1 != 0 ) || ( result != (Word32) ( (Word16) result ) ) )
         {
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-#else  /* BASOP_NOGLOB */
             *Overflow = 1;
-#endif /* BASOP_NOGLOB */
             var_out = ( var1 > 0 ) ? MAX_16 : MIN_16;
         }
         else
@@ -806,7 +767,6 @@ Word16 shl_o( Word16 var1, Word16 var2, Flag *Overflow )
     return ( var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word16 shl( Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -856,7 +816,6 @@ Word16 shl_sat( Word16 var1, Word16 var2 )
     Flag Overflow;
     return shl_o( var1, var2, &Overflow );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -892,11 +851,7 @@ Word16 shl_sat( Word16 var1, Word16 var2 )
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 shr_o( Word16 var1, Word16 var2, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word16 shr( Word16 var1, Word16 var2 )
-#endif /* BASOP_NOGLOB */
 {
     Word16 var_out;
 
@@ -905,11 +860,7 @@ Word16 shr( Word16 var1, Word16 var2 )
         if ( var2 < -16 )
             var2 = -16;
         var2 = -var2;
-#ifdef BASOP_NOGLOB
         var_out = shl_o( var1, var2, Overflow );
-#else  /* BASOP_NOGLOB */
-        var_out = shl( var1, var2 );
-#endif /* BASOP_NOGLOB */
 
 #ifdef WMOPS
         multiCounter[currCounter].shl--;
@@ -943,7 +894,6 @@ Word16 shr( Word16 var1, Word16 var2 )
     return ( var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word16 shr( Word16 var1, Word16 var2 )
 {
     return shr_o( var1, var2, NULL );
@@ -953,7 +903,6 @@ Word16 shr_sat( Word16 var1, Word16 var2 )
     Flag Overflow;
     return shr_o( var1, var2, &Overflow );
 }
-#endif /* BASOP_NOGLOB */
 
 
 /*___________________________________________________________________________
@@ -990,11 +939,7 @@ Word16 shr_sat( Word16 var1, Word16 var2 )
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 mult_o( Word16 var1, Word16 var2, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word16 mult( Word16 var1, Word16 var2 )
-#endif /* BASOP_NOGLOB */
 {
     Word16 var_out;
     Word32 L_product;
@@ -1006,11 +951,7 @@ Word16 mult( Word16 var1, Word16 var2 )
     if ( L_product & (Word32) 0x00010000L )
         L_product = L_product | (Word32) 0xffff0000L;
 
-#ifdef BASOP_NOGLOB
     var_out = saturate_o( L_product, Overflow );
-#else  /* BASOP_NOGLOB */
-    var_out = saturate( L_product );
-#endif /* BASOP_NOGLOB */
 
 #ifdef WMOPS
     multiCounter[currCounter].mult++;
@@ -1019,7 +960,6 @@ Word16 mult( Word16 var1, Word16 var2 )
     BASOP_CHECK();
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 mult( Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -1046,7 +986,6 @@ Word16 mult_sat( Word16 var1, Word16 var2 )
     return mult_o( var1, var2, &Overflow );
 }
 
-#endif
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -1082,11 +1021,7 @@ Word16 mult_sat( Word16 var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_mult( Word16 var1, Word16 var2 )
-#else  /* BASOP_NOGLOB */
 Word32 L_mult_o( Word16 var1, Word16 var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
@@ -1098,11 +1033,7 @@ Word32 L_mult_o( Word16 var1, Word16 var2, Flag *Overflow )
     }
     else
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
-#endif /* BASOP_NOGLOB */
         L_var_out = MAX_32;
     }
 
@@ -1115,7 +1046,6 @@ Word32 L_mult_o( Word16 var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 L_mult( Word16 var1, Word16 var2 )
 {
     Word32 L_var_out;
@@ -1146,7 +1076,6 @@ Word32 L_mult_sat( Word16 var1, Word16 var2 )
     Flag Overflow;
     return L_mult_o( var1, var2, &Overflow );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -1312,7 +1241,6 @@ Word16 extract_l( Word32 L_var1 )
  |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 round_fx_o( Word32 L_var1, Flag *Overflow )
 {
     Word16 var_out;
@@ -1334,7 +1262,6 @@ Word16 round_fx_o( Word32 L_var1, Flag *Overflow )
     return ( var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word16 round_fx( Word32 L_var1 )
 {
     Word16 var_out;
@@ -1354,13 +1281,11 @@ Word16 round_fx( Word32 L_var1 )
 
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 round_fx_sat( Word32 L_var1 )
 {
     Flag Overflow;
     return round_fx_o( L_var1, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_mac                                                   |
@@ -1397,7 +1322,6 @@ Word16 round_fx_sat( Word32 L_var1 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word32 L_mac_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -1415,7 +1339,6 @@ Word32 L_mac_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word32 L_mac( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Word32 L_var_out;
@@ -1433,13 +1356,11 @@ Word32 L_mac( Word32 L_var3, Word16 var1, Word16 var2 )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_mac_sat( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return L_mac_o( L_var3, var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_msu                                                   |
@@ -1476,7 +1397,6 @@ Word32 L_mac_sat( Word32 L_var3, Word16 var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word32 L_msu_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -1494,7 +1414,6 @@ Word32 L_msu_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word32 L_msu( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Word32 L_var_out;
@@ -1512,13 +1431,11 @@ Word32 L_msu( Word32 L_var3, Word16 var1, Word16 var2 )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_msu_sat( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return L_msu_o( L_var3, var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_macNs                                                 |
@@ -1557,21 +1474,16 @@ Word32 L_msu_sat( Word32 L_var3, Word16 var1, Word16 var2 )
  |                                                                           |
  |   Caution :                                                               |
  |                                                                           |
-#ifndef BASOP_NOGLOB
- |    In some cases the Carry flag has to be cleared or set before using     |
-#else
  |    In some cases the BASOP_Carry flag has to be cleared or set before using     |
-#endif
  |    operators which take into account its value.                           |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word32 DEPR_L_macNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry )
 {
     Word32 L_var_out;
 
     L_var_out = L_mult( var1, var2 );
-    L_var_out = DEPR_L_add_c( L_var3, L_var_out, Carry );
+    L_var_out = L_add_c( L_var3, L_var_out, Carry );
 
 #ifdef WMOPS
     multiCounter[currCounter].L_mult--;
@@ -1582,25 +1494,14 @@ Word32 DEPR_L_macNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry )
     /* BASOP_CHECK(); Do not check for overflow here, function produces the carry bit instead */
     return ( L_var_out );
 }
-#endif
-#ifdef BASOP_NOGLOB
 Word32 L_macNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
-#ifdef BASOP_NOGLOB
     L_var_out = L_mult_o( var1, var2, Overflow );
     L_var_out = L_add_co( L_var3, L_var_out, Carry, Overflow );
-#else  /* BASOP_NOGLOB */
-    L_var_out = L_mult( var1, var2 );
-    L_var_out = L_add_c( L_var3, L_var_out );
-#endif /* BASOP_NOGLOB */
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     return L_macNs_co( L_var3, var1, var2, NULL, NULL );
@@ -1610,7 +1511,6 @@ Word32 L_macNs_sat( Word32 L_var3, Word16 var1, Word16 var2 )
     Flag Carry, Overflow;
     return L_macNs_co( L_var3, var1, var2, &Carry, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_msuNs                                                 |
@@ -1649,28 +1549,16 @@ Word32 L_macNs_sat( Word32 L_var3, Word16 var1, Word16 var2 )
  |                                                                           |
  |   Caution :                                                               |
  |                                                                           |
-#ifndef BASOP_NOGLOB
- |    In some cases the Carry flag has to be cleared or set before using     |
-#else
  |    In some cases the BASOP_Carry flag has to be cleared or set before using     |
-#endif
  |    operators which take into account its value.                           |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_msuNs( Word32 L_var3, Word16 var1, Word16 var2 )
-#else  /* BASOP_NOGLOB */
 Word32 DEPR_L_msuNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
     L_var_out = L_mult( var1, var2 );
-#ifndef BASOP_NOGLOB
-    L_var_out = L_sub_c( L_var3, L_var_out );
-#else  /* BASOP_NOGLOB */
     L_var_out = DEPR_L_sub_c( L_var3, L_var_out, Carry );
-#endif /* BASOP_NOGLOB */
 
 #ifdef WMOPS
     multiCounter[currCounter].L_mult--;
@@ -1683,12 +1571,11 @@ Word32 DEPR_L_msuNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry )
     return ( L_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 L_msuNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry, Flag *Overflow )
 {
     Word32 L_var_out;
 
-    L_var_out = L_mult( var1, var2 );
+    L_var_out = L_mult_o( var1, var2, Overflow );
     L_var_out = L_sub_co( L_var3, L_var_out, Carry, Overflow );
 
     return ( L_var_out );
@@ -1704,7 +1591,6 @@ Word32 L_msuNs_sat( Word32 L_var3, Word16 var1, Word16 var2 )
     Flag Carry, Overflow;
     return L_msuNs_co( L_var3, var1, var2, &Carry, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_add                                                   |
@@ -1736,11 +1622,7 @@ Word32 L_msuNs_sat( Word32 L_var3, Word16 var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_add( Word32 L_var1, Word32 L_var2 )
-#else  /* BASOP_NOGLOB */
 Word32 L_add_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
@@ -1751,11 +1633,7 @@ Word32 L_add_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
         if ( ( L_var_out ^ L_var1 ) & MIN_32 )
         {
             L_var_out = ( L_var1 < 0 ) ? MIN_32 : MAX_32;
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-#else  /* BASOP_NOGLOB */
             *Overflow = 1;
-#endif /* BASOP_NOGLOB */
         }
     }
 
@@ -1769,7 +1647,6 @@ Word32 L_add_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 L_add( Word32 L_var1, Word32 L_var2 )
 {
     Word32 L_var_out;
@@ -1795,7 +1672,6 @@ Word32 L_add_sat( Word32 L_var1, Word32 L_var2 )
     Flag Overflow;
     return L_add_o( L_var1, L_var2, &Overflow );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -1828,11 +1704,7 @@ Word32 L_add_sat( Word32 L_var1, Word32 L_var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_sub( Word32 L_var1, Word32 L_var2 )
-#else  /* BASOP_NOGLOB */
 Word32 L_sub_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
@@ -1843,11 +1715,7 @@ Word32 L_sub_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
         if ( ( L_var_out ^ L_var1 ) & MIN_32 )
         {
             L_var_out = ( L_var1 < 0L ) ? MIN_32 : MAX_32;
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-#else  /* BASOP_NOGLOB */
             *Overflow = 1;
-#endif /* BASOP_NOGLOB */
         }
     }
 
@@ -1860,7 +1728,6 @@ Word32 L_sub_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 L_sub( Word32 L_var1, Word32 L_var2 )
 {
     Word32 L_var_out;
@@ -1888,7 +1755,6 @@ Word32 L_sub_sat( Word32 L_var1, Word32 L_var2 )
     Flag Overflow;
     return L_sub_o( L_var1, L_var2, &Overflow );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -1897,11 +1763,7 @@ Word32 L_sub_sat( Word32 L_var1, Word32 L_var2 )
  |   Purpose :                                                               |
  |                                                                           |
  |   Performs 32 bits addition of the two 32 bits variables (L_var1+L_var2+C)|
-#ifndef BASOP_NOGLOB
- |   with carry. No saturation. Generate carry and Overflow values. The car- |
-#else
  |   with carry. No saturation. Generate carry and BASOP_Overflow values. The car- |
-#endif
  |   ry and overflow values are binary variables which can be tested and as- |
  |   signed values.                                                          |
  |                                                                           |
@@ -1927,37 +1789,22 @@ Word32 L_sub_sat( Word32 L_var1, Word32 L_var2 )
  |                                                                           |
  |   Caution :                                                               |
  |                                                                           |
-#ifndef BASOP_NOGLOB
- |    In some cases the Carry flag has to be cleared or set before using     |
-#else
  |    In some cases the BASOP_Carry flag has to be cleared or set before using     |
-#endif
  |    operators which take into account its value.                           |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_add_c( Word32 L_var1, Word32 L_var2 )
-#else  /* BASOP_NOGLOB */
-Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
-#endif /* BASOP_NOGLOB */
+Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
 {
     Word32 L_var_out;
     Word32 L_test;
     Flag carry_int = 0;
 
-#ifndef BASOP_NOGLOB
-    L_var_out = L_var1 + L_var2 + Carry;
-#else  /* BASOP_NOGLOB */
     L_var_out = L_var1 + L_var2 + *Carry;
-#endif /* BASOP_NOGLOB */
 
     L_test = L_var1 + L_var2;
 
     if ( ( L_var1 > 0 ) && ( L_var2 > 0 ) && ( L_test < 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-#endif /* ! BASOP_NOGLOB */
         carry_int = 0;
     }
     else
@@ -1966,16 +1813,10 @@ Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
         {
             if ( L_test >= 0 )
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 1;
-#endif /* ! BASOP_NOGLOB */
                 carry_int = 1;
             }
             else
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 0;
-#endif /* ! BASOP_NOGLOB */
                 carry_int = 1;
             }
         }
@@ -1983,63 +1824,36 @@ Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
         {
             if ( ( ( L_var1 ^ L_var2 ) < 0 ) && ( L_test >= 0 ) )
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 0;
-#endif /* ! BASOP_NOGLOB */
                 carry_int = 1;
             }
             else
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 0;
-#endif /* ! BASOP_NOGLOB */
                 carry_int = 0;
             }
         }
     }
 
-#ifndef BASOP_NOGLOB
-    if ( Carry )
-#else  /* BASOP_NOGLOB */
     if ( *Carry )
-#endif /* BASOP_NOGLOB */
     {
         if ( L_test == MAX_32 )
         {
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-            Carry = carry_int;
-#else  /* BASOP_NOGLOB */
             *Carry = carry_int;
-#endif /* BASOP_NOGLOB */
         }
         else
         {
             if ( L_test == (Word32) 0xFFFFFFFFL )
             {
-#ifndef BASOP_NOGLOB
-                Carry = 1;
-#else  /* BASOP_NOGLOB */
                 *Carry = 1;
-#endif /* BASOP_NOGLOB */
             }
             else
             {
-#ifndef BASOP_NOGLOB
-                Carry = carry_int;
-#else  /* BASOP_NOGLOB */
                 *Carry = carry_int;
-#endif /* BASOP_NOGLOB */
             }
         }
     }
     else
     {
-#ifndef BASOP_NOGLOB
-        Carry = carry_int;
-#else  /* BASOP_NOGLOB */
         *Carry = carry_int;
-#endif /* BASOP_NOGLOB */
     }
 
 #ifdef WMOPS
@@ -2051,7 +1865,6 @@ Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -2121,13 +1934,12 @@ Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow )
         carry_int ? set_carry( Carry ) : unset_carry( Carry );
     }
 
+#ifdef WMOPS
+    multiCounter[currCounter].L_add_c++;
+#endif
     return ( L_var_out );
 }
-Word32 L_add_c( Word32 L_var1, Word32 L_var2 )
-{
-    return L_add_co( L_var1, L_var2, NULL, NULL );
-}
-#endif
+
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_sub_c                                                 |
@@ -2135,11 +1947,7 @@ Word32 L_add_c( Word32 L_var1, Word32 L_var2 )
  |   Purpose :                                                               |
  |                                                                           |
  |   Performs 32 bits subtraction of the two 32 bits variables with carry    |
-#ifndef BASOP_NOGLOB
- |   (borrow) : L_var1-L_var2-C. No saturation. Generate carry and Overflow  |
-#else
  |   (borrow) : L_var1-L_var2-C. No saturation. Generate carry and BASOP_Overflow  |
-#endif
  |   values. The carry and overflow values are binary variables which can    |
  |   be tested and assigned values.                                          |
  |                                                                           |
@@ -2165,42 +1973,22 @@ Word32 L_add_c( Word32 L_var1, Word32 L_var2 )
  |                                                                           |
  |   Caution :                                                               |
  |                                                                           |
-#ifndef BASOP_NOGLOB
- |    In some cases the Carry flag has to be cleared or set before using     |
-#else
  |    In some cases the BASOP_Carry flag has to be cleared or set before using     |
-#endif
  |    operators which take into account its value.                           |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_sub_c( Word32 L_var1, Word32 L_var2 )
-#else  /* BASOP_NOGLOB */
 Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
     Word32 L_test;
     Flag carry_int = 0;
 
-#ifndef BASOP_NOGLOB
-    if ( Carry )
-#else  /* BASOP_NOGLOB */
     if ( *Carry )
-#endif /* BASOP_NOGLOB */
     {
-#ifndef BASOP_NOGLOB
-        Carry = 0;
-#else  /* BASOP_NOGLOB */
         *Carry = 0;
-#endif /* BASOP_NOGLOB */
         if ( L_var2 != MIN_32 )
         {
-#ifndef BASOP_NOGLOB
-            L_var_out = L_add_c( L_var1, -L_var2 );
-#else  /* BASOP_NOGLOB */
-            L_var_out = DEPR_L_add_c( L_var1, -L_var2, Carry );
-#endif /* BASOP_NOGLOB */
+            L_var_out = L_add_c( L_var1, -L_var2, Carry );
 #ifdef WMOPS
             multiCounter[currCounter].L_add_c--;
 #endif
@@ -2210,12 +1998,7 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
             L_var_out = L_var1 - L_var2;
             if ( L_var1 > 0L )
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 1;
-                Carry = 0;
-#else  /* BASOP_NOGLOB */
                 *Carry = 0;
-#endif /* BASOP_NOGLOB */
             }
         }
     }
@@ -2226,41 +2009,23 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
 
         if ( ( L_test < 0 ) && ( L_var1 > 0 ) && ( L_var2 < 0 ) )
         {
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-#endif /* ! BASOP_NOGLOB */
             carry_int = 0;
         }
         else if ( ( L_test > 0 ) && ( L_var1 < 0 ) && ( L_var2 > 0 ) )
         {
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-#endif /* ! BASOP_NOGLOB */
             carry_int = 1;
         }
         else if ( ( L_test > 0 ) && ( ( L_var1 ^ L_var2 ) > 0 ) )
         {
-#ifndef BASOP_NOGLOB
-            Overflow = 0;
-#endif /* ! BASOP_NOGLOB */
             carry_int = 1;
         }
         if ( L_test == MIN_32 )
         {
-#ifndef BASOP_NOGLOB
-            Overflow = 1;
-            Carry = carry_int;
-#else  /* BASOP_NOGLOB */
             *Carry = carry_int;
-#endif /* BASOP_NOGLOB */
         }
         else
         {
-#ifndef BASOP_NOGLOB
-            Carry = carry_int;
-#else  /* BASOP_NOGLOB */
             *Carry = carry_int;
-#endif /* BASOP_NOGLOB */
         }
     }
 
@@ -2273,7 +2038,7 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
+
 Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -2292,6 +2057,7 @@ Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow )
             L_var_out = L_var1 - L_var2;
             if ( L_var1 > 0L )
             {
+                set_overflow( Overflow );
                 unset_carry( Carry );
             }
         }
@@ -2303,18 +2069,22 @@ Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow )
 
         if ( ( L_test < 0 ) && ( L_var1 > 0 ) && ( L_var2 < 0 ) )
         {
+            set_overflow( Overflow );
             carry_int = 0;
         }
         else if ( ( L_test > 0 ) && ( L_var1 < 0 ) && ( L_var2 > 0 ) )
         {
+            set_overflow( Overflow );
             carry_int = 1;
         }
         else if ( ( L_test > 0 ) && ( ( L_var1 ^ L_var2 ) > 0 ) )
         {
+            unset_overflow( Overflow );
             carry_int = 1;
         }
         if ( L_test == MIN_32 )
         {
+            set_overflow( Overflow );
             carry_int ? set_carry( Carry ) : unset_carry( Carry );
         }
         else
@@ -2329,7 +2099,6 @@ Word32 L_sub_c( Word32 L_var1, Word32 L_var2 )
 {
     return L_sub_co( L_var1, L_var2, NULL, NULL );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_negate                                                |
@@ -2407,7 +2176,6 @@ Word32 L_negate( Word32 L_var1 )
  |             range : 0x8000 <= var_out <= 0x7fff.                          |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 mult_ro( Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word16 var_out;
@@ -2431,7 +2199,6 @@ Word16 mult_ro( Word16 var1, Word16 var2, Flag *Overflow )
     return ( var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word16 mult_r( Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -2454,13 +2221,11 @@ Word16 mult_r( Word16 var1, Word16 var2 )
     return ( var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word16 mult_r_sat( Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return mult_ro( var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_shl                                                   |
@@ -2494,11 +2259,7 @@ Word16 mult_r_sat( Word16 var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_shl( Word32 L_var1, Word16 var2 )
-#else  /* BASOP_NOGLOB */
 Word32 L_shl_o( Word32 L_var1, Word16 var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
 
     Word32 L_var_out = 0L;
@@ -2519,11 +2280,7 @@ Word32 L_shl_o( Word32 L_var1, Word16 var2, Flag *Overflow )
         {
             if ( L_var1 > (Word32) 0X3fffffffL )
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 1;
-#else  /* BASOP_NOGLOB */
                 *Overflow = 1;
-#endif /* BASOP_NOGLOB */
                 L_var_out = MAX_32;
                 break;
             }
@@ -2531,11 +2288,7 @@ Word32 L_shl_o( Word32 L_var1, Word16 var2, Flag *Overflow )
             {
                 if ( L_var1 < (Word32) 0xc0000000L )
                 {
-#ifndef BASOP_NOGLOB
-                    Overflow = 1;
-#else  /* BASOP_NOGLOB */
                     *Overflow = 1;
-#endif /* BASOP_NOGLOB */
                     L_var_out = MIN_32;
                     break;
                 }
@@ -2555,7 +2308,6 @@ Word32 L_shl_o( Word32 L_var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 L_shl( Word32 L_var1, Word16 var2 )
 {
 
@@ -2610,7 +2362,6 @@ Word32 L_shl_sat( Word32 L_var1, Word16 var2 )
     return L_shl_o( L_var1, var2, &Overflow );
 }
 
-#endif /* BASOP_NOGLOB */
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_shr                                                   |
@@ -2644,7 +2395,6 @@ Word32 L_shl_sat( Word32 L_var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.              |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word32 L_shr_o( Word32 L_var1, Word16 var2, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -2688,7 +2438,6 @@ Word32 L_shr_o( Word32 L_var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word32 L_shr( Word32 L_var1, Word16 var2 )
 {
     Word32 L_var_out;
@@ -2730,13 +2479,11 @@ Word32 L_shr( Word32 L_var1, Word16 var2 )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_shr_sat( Word32 L_var1, Word16 var2 )
 {
     Flag Overflow;
     return L_shr_o( L_var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : shr_r                                                   |
@@ -2810,7 +2557,6 @@ Word16 shr_r( Word16 var1, Word16 var2 )
 
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word16 var_out;
@@ -2823,10 +2569,8 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow )
     {
         var_out = shr_o( var1, var2, Overflow );
 
-#ifdef FIX_1049_SHR_RO_COMPLEXITY
 #ifdef WMOPS
         multiCounter[currCounter].shr--;
-#endif
 #endif
         if ( var2 > 0 )
         {
@@ -2837,13 +2581,11 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow )
         }
     }
 
-#ifdef FIX_1049_SHR_RO_COMPLEXITY
 #ifdef WMOPS
     multiCounter[currCounter].shr_r++;
 #endif
 
     BASOP_CHECK();
-#endif
 
     return ( var_out );
 }
@@ -2852,7 +2594,6 @@ Word16 shr_r_sat( Word16 var1, Word16 var2 )
     Flag Overflow;
     return shr_ro( var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : mac_r                                                   |
@@ -2891,7 +2632,6 @@ Word16 shr_r_sat( Word16 var1, Word16 var2 )
  |             range : 0x0000 8000 <= L_var_out <= 0x0000 7fff.              |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 mac_ro( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word16 var_out;
@@ -2913,7 +2653,6 @@ Word16 mac_ro( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
     return ( var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word16 mac_r( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -2934,13 +2673,11 @@ Word16 mac_r( Word32 L_var3, Word16 var1, Word16 var2 )
 
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 mac_r_sat( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return mac_ro( L_var3, var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : msu_r                                                   |
@@ -2979,7 +2716,6 @@ Word16 mac_r_sat( Word32 L_var3, Word16 var1, Word16 var2 )
  |             range : 0x0000 8000 <= L_var_out <= 0x0000 7fff.              |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 msu_ro( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word16 var_out;
@@ -2999,7 +2735,6 @@ Word16 msu_ro( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
     return ( var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word16 msu_r( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Word16 var_out;
@@ -3018,13 +2753,11 @@ Word16 msu_r( Word32 L_var3, Word16 var1, Word16 var2 )
 
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 msu_r_sat( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return msu_ro( L_var3, var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_deposit_h                                             |
@@ -3189,7 +2922,6 @@ Word32 L_shr_r( Word32 L_var1, Word16 var2 )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_shr_ro( Word32 L_var1, Word16 var2, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -3217,7 +2949,6 @@ Word32 L_shr_r_sat( Word32 L_var1, Word16 var2 )
     Flag Overflow = 0;
     return L_shr_ro( L_var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : L_abs                                                   |
@@ -3307,11 +3038,7 @@ Word32 L_abs( Word32 L_var1 )
  |             range : 0x8000 0000 <= var_out <= 0x7fff ffff.                |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word32 L_sat( Word32 L_var1 )
-#else  /* BASOP_NOGLOB */
 Word32 DEPR_L_sat_co( Word32 L_var1, Flag Overflow, Flag Carry )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
@@ -3328,11 +3055,6 @@ Word32 DEPR_L_sat_co( Word32 L_var1, Flag Overflow, Flag Carry )
         {
             L_var_out = MAX_32;
         }
-#ifndef BASOP_NOGLOB
-
-        Carry = 0;
-        Overflow = 0;
-#endif /* ! BASOP_NOGLOB */
     }
 
 #ifdef WMOPS
@@ -3344,7 +3066,6 @@ Word32 DEPR_L_sat_co( Word32 L_var1, Flag Overflow, Flag Carry )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_sat_co( Word32 L_var1, Flag Carry, Flag Overflow )
 {
     Word32 L_var_out;
@@ -3371,7 +3092,6 @@ Word32 L_sat( Word32 L_var1 )
     assert( 0 ); /* Overflow and Carry are no longer global, must be passed as parameters */
     return L_sat_co( L_var1, 0, 0 );
 }
-#endif
 /*___________________________________________________________________________
  |                                                                           |
  |   Function Name : norm_s                                                  |
@@ -3661,7 +3381,6 @@ Word16 norm_l( Word32 L_var1 )
  |                                                                           |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word32 L_mls_o( Word32 Lv, Word16 v, Flag *Overflow )
 {
     Word32 Temp;
@@ -3683,7 +3402,6 @@ Word32 L_mls_o( Word32 Lv, Word16 v, Flag *Overflow )
     return Temp;
 }
 
-#endif /* BASOP_NOGLOB */
 Word32 L_mls( Word32 Lv, Word16 v )
 {
     Word32 Temp;
@@ -3704,13 +3422,11 @@ Word32 L_mls( Word32 Lv, Word16 v )
 
     return Temp;
 }
-#ifdef BASOP_NOGLOB
 Word32 L_mls_sat( Word32 Lv, Word16 v )
 {
     Flag Overflow;
     return L_mls_o( Lv, v, &Overflow );
 }
-#endif
 
 /*__________________________________________________________________________
 |                                                                           |
@@ -3848,11 +3564,7 @@ Word16 div_l( Word32 L_num, Word16 den )
 |             are performed if ORIGINAL_G7231 is defined.                   |
 |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-Word16 i_mult( Word16 a, Word16 b )
-#else  /* BASOP_NOGLOB */
 Word16 DEPR_i_mult( Word16 a, Word16 b )
-#endif /* BASOP_NOGLOB */
 {
 #ifdef ORIGINAL_G7231
     return a * b;
@@ -3865,7 +3577,6 @@ Word16 DEPR_i_mult( Word16 a, Word16 b )
 #endif
 }
 
-#ifdef BASOP_NOGLOB
 Word16 i_mult_o( Word16 a, Word16 b, Flag *Overflow )
 {
 #ifdef ORIGINAL_G7231
@@ -3884,7 +3595,6 @@ Word16 i_mult_sat( Word16 a, Word16 b )
     Flag Overflow;
     return i_mult_o( a, b, &Overflow );
 }
-#endif
 /*
  ******************************************************************************
  * The following three operators are not part of the original
@@ -3964,7 +3674,6 @@ Word32 L_mult0( Word16 var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.
  |___________________________________________________________________________
 */
-#ifdef BASOP_NOGLOB
 Word32 L_mac0_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -3984,7 +3693,6 @@ Word32 L_mac0_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word32 L_mac0( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Word32 L_var_out;
@@ -4004,13 +3712,11 @@ Word32 L_mac0( Word32 L_var3, Word16 var1, Word16 var2 )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_mac0_sat( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return L_mac0_o( L_var3, var1, var2, &Overflow );
 }
-#endif
 /*___________________________________________________________________________
  |
  |   Function Name : L_msu0
@@ -4041,7 +3747,6 @@ Word32 L_mac0_sat( Word32 L_var3, Word16 var1, Word16 var2 )
  |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.
  |___________________________________________________________________________
 */
-#ifdef BASOP_NOGLOB
 Word32 L_msu0_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
 {
     Word32 L_var_out;
@@ -4061,7 +3766,6 @@ Word32 L_msu0_o( Word32 L_var3, Word16 var1, Word16 var2, Flag *Overflow )
     return ( L_var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word32 L_msu0( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Word32 L_var_out;
@@ -4081,12 +3785,10 @@ Word32 L_msu0( Word32 L_var3, Word16 var1, Word16 var2 )
 
     return ( L_var_out );
 }
-#ifdef BASOP_NOGLOB
 Word32 L_msu0_sat( Word32 L_var3, Word16 var1, Word16 var2 )
 {
     Flag Overflow;
     return L_msu0_o( L_var3, var1, var2, &Overflow );
 }
 
-#endif
 #undef WMC_TOOL_SKIP
diff --git a/lib_com/basop32.h b/lib_com/basop32.h
index 785a4bf5629ea7cd01cc505904a6b30d47a40ce5..9bbf24f1c52e1c5159ad4ff22fa6720f3bfcd60a 100644
--- a/lib_com/basop32.h
+++ b/lib_com/basop32.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -86,17 +86,11 @@
  |   Constants and Globals                                                   |
  |___________________________________________________________________________|
 */
-#ifndef BASOP_NOGLOB
-extern Flag Overflow, Overflow2;
-extern Flag Carry;
-
-#else  /* BASOP_NOGLOB */
 /* DISABLED TO AVOID GLOBAL VARIABLES */
 /*
 extern Flag BASOP_Overflow, BASOP_Overflow2;
 extern Flag BASOP_Carry;
 */
-#endif /* BASOP_NOGLOB */
 #define BASOP_SATURATE_WARNING_ON_EVS
 #define BASOP_SATURATE_WARNING_OFF_EVS
 #define BASOP_SATURATE_ERROR_ON_EVS
@@ -114,36 +108,17 @@ extern Flag BASOP_Carry;
 
 #define MAX_16 (Word16) 0x7fff
 #define MIN_16 (Word16) 0x8000
-#ifdef BASOP_NOGLOB
 void set_overflow( Flag *overflow );
 void unset_overflow( Flag *overflow );
 void set_carry( Flag *carry );
 void unset_carry( Flag *carry );
 Flag get_carry( const Flag *carry );
-#endif /* BASOP_NOGLOB */
 /*___________________________________________________________________________
  |                                                                           |
  |   Prototypes for basic arithmetic operators                               |
  |___________________________________________________________________________|
 */
 
-#ifndef BASOP_NOGLOB
-Word16 add( Word16 var1, Word16 var2 );                    /* Short add,           1   */
-Word16 sub( Word16 var1, Word16 var2 );                    /* Short sub,           1   */
-Word16 abs_s( Word16 var1 );                               /* Short abs,           1   */
-Word16 shl( Word16 var1, Word16 var2 );                    /* Short shift left,    1   */
-Word16 shr( Word16 var1, Word16 var2 );                    /* Short shift right,   1   */
-Word16 mult( Word16 var1, Word16 var2 );                   /* Short mult,          1   */
-Word32 L_mult( Word16 var1, Word16 var2 );                 /* Long mult,           1   */
-Word16 negate( Word16 var1 );                              /* Short negate,        1   */
-Word16 extract_h( Word32 L_var1 );                         /* Extract high,        1   */
-Word16 extract_l( Word32 L_var1 );                         /* Extract low,         1   */
-Word16 round_fx( Word32 L_var1 );                          /* Round,               1   */
-Word32 L_mac( Word32 L_var3, Word16 var1, Word16 var2 );   /* Mac,  1  */
-Word32 L_msu( Word32 L_var3, Word16 var1, Word16 var2 );   /* Msu,  1  */
-Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 ); /* Mac without
-                                                             sat, 1   */
-#else                                                      /* BASOP_NOGLOB */
 Word16 add( Word16 var1, Word16 var2 );                                      /* Short add,           1   */
 Word16 sub( Word16 var1, Word16 var2 );                                      /* Short sub,           1   */
 Word16 abs_s( Word16 var1 );                                                 /* Short abs,           1   */
@@ -163,33 +138,14 @@ Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 );                   /*
 Word32 L_msuNs( Word32 L_var3, Word16 var1, Word16 var2 );                   /* Msu without sat, 1 */
 Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow );
 Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow );
-Word32 L_add_c( Word32 L_var1, Word32 L_var2 );                              /* Long add with c, 2 */
-Word32 L_sub_c( Word32 L_var1, Word32 L_var2 );                              /* Long sub with c, 2 */
+Word32 L_sub_c( Word32 L_var1, Word32 L_var2 ); /* Long sub with c, 2 */
 
-#endif /* BASOP_NOGLOB */
 
-#ifndef BASOP_NOGLOB
-Word32 L_msuNs( Word32 L_var3, Word16 var1, Word16 var2 ); /* Msu without
-                                                              sat, 1   */
-#else                                                      /* BASOP_NOGLOB */
 Word32 DEPR_L_msuNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry ); /* Msu without
                                                               sat, 1   */
-#endif                                                     /* BASOP_NOGLOB */
-#ifndef BASOP_NOGLOB
-Word32 L_add( Word32 L_var1, Word32 L_var2 );   /* Long add,        1 */
-Word32 L_sub( Word32 L_var1, Word32 L_var2 );   /* Long sub,        1 */
-Word32 L_add_c( Word32 L_var1, Word32 L_var2 ); /* Long add with c, 2 */
-Word32 L_sub_c( Word32 L_var1, Word32 L_var2 ); /* Long sub with c, 2 */
-Word32 L_negate( Word32 L_var1 );               /* Long negate,     1 */
-Word16 mult_r( Word16 var1, Word16 var2 );      /* Mult with round, 1 */
-Word32 L_shl( Word32 L_var1, Word16 var2 );     /* Long shift left, 1 */
-Word32 L_shr( Word32 L_var1, Word16 var2 );     /* Long shift right, 1 */
-Word16 shr_r( Word16 var1, Word16 var2 );       /* Shift right with
-                                                   round, 2           */
-#else                                           /* BASOP_NOGLOB */
 Word32 L_add( Word32 L_var1, Word32 L_var2 );                                /* Long add,        1 */
 Word32 L_sub( Word32 L_var1, Word32 L_var2 );                                /* Long sub,        1 */
-Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry );            /* Long add with c, 2 */
+Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry );                 /* Long add with c, 2 */
 Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry );            /* Long sub with c, 2 */
 Word32 L_negate( Word32 L_var1 );                                            /* Long negate,     1 */
 Word16 mult_r( Word16 var1, Word16 var2 );                                   /* Mult with round, 1 */
@@ -197,67 +153,32 @@ Word32 L_shl( Word32 L_var1, Word16 var2 );                                  /*
 Word32 L_shr( Word32 L_var1, Word16 var2 );                                  /* Long shift right, 1 */
 Word16 shr_r( Word16 var1, Word16 var2 );                                    /* Shift right with
                                                    round, 2           */
-#endif                                          /* BASOP_NOGLOB */
 
-#ifndef BASOP_NOGLOB
 Word16 mac_r( Word32 L_var3, Word16 var1, Word16 var2 ); /* Mac with
-                                                           rounding, 1 */
-#else                                                    /* BASOP_NOGLOB */
-Word16 mac_r( Word32 L_var3, Word16 var1, Word16 var2 );                     /* Mac with
-                                                                             rounding, 1 */
-#endif                                                   /* BASOP_NOGLOB */
-#ifndef BASOP_NOGLOB
+                                                         rounding, 1 */
 Word16 msu_r( Word32 L_var3, Word16 var1, Word16 var2 ); /* Msu with
-                                                           rounding, 1 */
-#else                                                    /* BASOP_NOGLOB */
-Word16 msu_r( Word32 L_var3, Word16 var1, Word16 var2 );                     /* Msu with
-                                                           rounding, 1 */
-#endif                                                   /* BASOP_NOGLOB */
-#ifndef BASOP_NOGLOB
-Word32 L_deposit_h( Word16 var1 ); /* 16 bit var1 -> MSB,     1 */
-Word32 L_deposit_l( Word16 var1 ); /* 16 bit var1 -> LSB,     1 */
-#else                              /* BASOP_NOGLOB */
-Word32 L_deposit_h( Word16 var1 );                                           /* 16 bit var1 -> MSB,     1 */
-Word32 L_deposit_l( Word16 var1 );                                           /* 16 bit var1 -> LSB,     1 */
-#endif                             /* BASOP_NOGLOB */
-
-#ifndef BASOP_NOGLOB
-Word32 L_shr_r( Word32 L_var1, Word16 var2 ); /* Long shift right with
-                                                round,             3  */
-#else                                         /* BASOP_NOGLOB */
-Word32 L_shr_r( Word32 L_var1, Word16 var2 );                                /* Long shift right with
-                                                round,             3  */
-#endif                                        /* BASOP_NOGLOB */
-#ifndef BASOP_NOGLOB
-Word32 L_abs( Word32 L_var1 );            /* Long abs,              1  */
-Word32 L_sat( Word32 L_var1 );            /* Long saturation,       4  */
-Word16 norm_s( Word16 var1 );             /* Short norm,            1  */
-Word16 div_s( Word16 var1, Word16 var2 ); /* Short division,       18  */
-Word16 norm_l( Word32 L_var1 );           /* Long norm,             1  */
-#else                                     /* BASOP_NOGLOB */
-Word32 L_abs( Word32 L_var1 );                                               /* Long abs,              1  */
-Word32 DEPR_L_sat_co( Word32 L_var1, Flag Overflow, Flag Carry );            /* Long saturation,       4  */
-Word16 norm_s( Word16 var1 );                                                /* Short norm,            1  */
-Word16 div_s( Word16 var1, Word16 var2 );                                    /* Short division,       18  */
+                                       rounding, 1 */
+Word32 L_deposit_h( Word16 var1 );                       /* 16 bit var1 -> MSB,     1 */
+Word32 L_deposit_l( Word16 var1 );                       /* 16 bit var1 -> LSB,     1 */
+
+Word32 L_shr_r( Word32 L_var1, Word16 var2 );                     /* Long shift right with
+                                     round,             3  */
+Word32 L_abs( Word32 L_var1 );                                    /* Long abs,              1  */
+Word32 DEPR_L_sat_co( Word32 L_var1, Flag Overflow, Flag Carry ); /* Long saturation,       4  */
+Word16 norm_s( Word16 var1 );                                     /* Short norm,            1  */
+Word16 div_s( Word16 var1, Word16 var2 );                         /* Short division,       18  */
 Word32 div_w( Word32 L_num, Word32 L_den );
-Word16 norm_l( Word32 L_var1 );           /* Long norm,             1  */
-Word32 L_sat( Word32 L_var1 );            /* Long saturation,       4  */
-#endif                                    /* BASOP_NOGLOB */
+Word16 norm_l( Word32 L_var1 ); /* Long norm,             1  */
+Word32 L_sat( Word32 L_var1 );  /* Long saturation,       4  */
 
 
 /*
  * Additional G.723.1 operators
  */
-#ifndef BASOP_NOGLOB
-Word32 L_mls( Word32, Word16 );      /* Weight FFS; currently assigned 5 */
-Word16 div_l( Word32, Word16 );      /* Weight FFS; currently assigned 32 */
-Word16 i_mult( Word16 a, Word16 b ); /* Weight FFS; currently assigned 3 */
-#else                                /* BASOP_NOGLOB */
 Word32 L_mls( Word32, Word16 );           /* Weight FFS; currently assigned 5 */
 Word16 div_l( Word32, Word16 );           /* Weight FFS; currently assigned 32 */
 Word16 i_mult( Word16 a, Word16 b );      /* Weight FFS; currently assigned 3 */
 Word16 DEPR_i_mult( Word16 a, Word16 b ); /* Weight FFS; currently assigned 3 */
-#endif                               /* BASOP_NOGLOB */
 
 /*
  *  New shiftless operators, not used in G.729/G.723.1
@@ -265,7 +186,6 @@ Word16 DEPR_i_mult( Word16 a, Word16 b ); /* Weight FFS; currently assigned 3 */
 Word32 L_mult0( Word16 v1, Word16 v2 );             /* 32-bit Multiply w/o shift         1 */
 Word32 L_mac0( Word32 L_v3, Word16 v1, Word16 v2 ); /* 32-bit Mac w/o shift  1 */
 Word32 L_msu0( Word32 L_v3, Word16 v1, Word16 v2 ); /* 32-bit Msu w/o shift  1 */
-#ifdef BASOP_NOGLOB
 
 /*
  * Overflowing operators
@@ -296,7 +216,6 @@ Word32 L_shr_ro( Word32 L_var1, Word16 var2, Flag *Overflow );
 Word32 L_macNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry, Flag *Overflow );
 Word32 L_msuNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry, Flag *Overflow );
 
-#endif /* BASOP_NOGLOB */
 
 /*
  * Saturating operators
diff --git a/lib_com/basop_com_lpc.c b/lib_com/basop_com_lpc.c
index 5de4fa5d38de1aedc2e7f87f90696e4141b1f29b..5cfb3bed0e55fdee2e46202c92dab4b503f14ad9 100644
--- a/lib_com/basop_com_lpc.c
+++ b/lib_com/basop_com_lpc.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/basop_lsf_tools.c b/lib_com/basop_lsf_tools.c
index aac96ae5fc98a6ed855b0d907ae0a3cf8220e037..2c49ad4cf4d22a50ff63d8cc6e85330fe54aba98 100644
--- a/lib_com/basop_lsf_tools.c
+++ b/lib_com/basop_lsf_tools.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -245,9 +245,7 @@ static Word16 E_LPC_f_lsp_pol_get(
     Word16 Ovf = 0;
     Word16 Q_out;
     Word16 m2;
-#ifdef BASOP_NOGLOB
     Flag Overflow;
-#endif        /* BASOP_NOGLOB */
     move16(); // move for Ovf = 0
 
     Q_out = 31 - 23;
@@ -302,9 +300,7 @@ static Word16 E_LPC_f_lsp_pol_get(
     test();
     IF( Overflow > 0 && isMODE1 )
     {
-#ifdef BASOP_NOGLOB
         assert( 0 );
-#endif /* BASOP_NOGLOB */
         /* If an overflow is detected, redo the computation with 1 bit less */
         Ovf = add( Ovf, 1 );
         Ovf = E_LPC_f_lsp_pol_get( lsp, f, n, Ovf, isMODE1 ); /* Q0 */
diff --git a/lib_com/basop_proto_func.h b/lib_com/basop_proto_func.h
index be8b46782642e231a8464766cff0896a35950be8..29db9c9c19e27f3b121780349c4b254cbee18307 100644
--- a/lib_com/basop_proto_func.h
+++ b/lib_com/basop_proto_func.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/basop_settings.h b/lib_com/basop_settings.h
index a2ef70417c13dad0b28e0f899b4fddc100b5b0cb..9a344afc4b4ac449e9585a0f8a935a6d829ec5f2 100644
--- a/lib_com/basop_settings.h
+++ b/lib_com/basop_settings.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/basop_tcx_utils.c b/lib_com/basop_tcx_utils.c
index 17f0e23babba3f832ebc632be5861669b2896442..8038c4f91e44fa3d4f3be746e03c2e3f1a7816ce 100644
--- a/lib_com/basop_tcx_utils.c
+++ b/lib_com/basop_tcx_utils.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -40,7 +40,7 @@
 #include "cnst.h"
 #include "basop_proto_func.h"
 #include "stl.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 
 #define WMC_TOOL_SKIP
diff --git a/lib_com/basop_util.c b/lib_com/basop_util.c
index c4f40c6df6080faab71efb203dacdb31e808d86b..e52f404f6f83b00535931530c021d8e381dd072f 100644
--- a/lib_com/basop_util.c
+++ b/lib_com/basop_util.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -45,9 +45,6 @@
 #include "basop_settings.h"
 #include "cnst.h"
 
-
-#define WMC_TOOL_SKIP
-
 extern const Word32 SqrtTable[32];     // Q31
 extern const Word16 SqrtDiffTable[32]; /* Q15 */
 
@@ -306,11 +303,7 @@ void BASOP_Util_Divide_MantExp( Word16 a_m,          /*!< Mantissa of dividend a
 
     /* normalize result */
     postShift = norm_l( m32 );
-#ifdef BASOP_NOGLOB
     m = round_fx_o( L_shl( m32, postShift ), &Overflow );
-#else
-    m = round_fx( L_shl( m32, postShift ) );
-#endif
 
     /* exponent */
     *ptrResult_e = sub( add( add( a_e, sub( 1, b_e ) ), preShift ), postShift );
@@ -326,9 +319,7 @@ static Word16 Sqrt16_common( Word16 m,
                              Word16 e )
 {
     Word16 index, frac;
-#ifdef BASOP_NOGLOB
     Flag Overflow;
-#endif
 
 
     assert( ( m >= 0x4000 ) || ( m == 0 ) );
@@ -344,11 +335,7 @@ static Word16 Sqrt16_common( Word16 m,
     if ( m != 0 )
     {
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         m = mac_ro( SqrtTable[index], SqrtDiffTable[index], frac, &Overflow );
-#else
-        m = mac_r( SqrtTable[index], SqrtDiffTable[index], frac );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
 
@@ -371,11 +358,7 @@ static Word32 Sqrt32_common( Word32 m,
 
     assert( ( m >= 0x40000000 ) || ( m == 0 ) );
 
-#ifdef BASOP_NOGLOB
     m16 = round_fx_o( m, &Overflow );
-#else  /* BASOP_NOGLOB */
-    m16 = round_fx( m );
-#endif /* BASOP_NOGLOB */
 
     /* get table index (upper 6 bits minus 32) */
     /* index = (m16 >> 9) - 32; */
@@ -388,11 +371,7 @@ static Word32 Sqrt32_common( Word32 m,
     if ( m != 0 )
     {
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         m = L_mac_sat( SqrtTable[index], SqrtDiffTable[index], frac );
-#else
-        m = L_mac( SqrtTable[index], SqrtDiffTable[index], frac );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
 
@@ -423,7 +402,9 @@ static Word16 ISqrt16_common( Word16 m,
 
     /* handle even exponents */
     if ( s_and( e, 1 ) == 0 )
+    {
         m = mult_r( m, 0x5a82 );
+    }
 
     return m;
 }
@@ -438,8 +419,7 @@ static Word32 ISqrt32_common( Word32 m,
 #endif
 
     assert( m >= 0x40000000 );
-
-#ifdef BASOP_NOGLOB
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
     m16 = round_fx_o( m, &Overflow );
 #else
     m16 = round_fx( m );
@@ -457,7 +437,9 @@ static Word32 ISqrt32_common( Word32 m,
 
     /* handle even exponents */
     if ( s_and( e, 1 ) == 0 )
+    {
         m = Mpy_32_16_1( m, 0x5a82 );
+    }
 
     return m;
 }
@@ -676,13 +658,8 @@ void BASOP_Util_Sqrt_InvSqrt_MantExp( Word16 mantissa,    /*!< mantissa */
 
     /* interpolate */
     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
     m = mac_r_sat( SqrtTable[index], SqrtDiffTable[index], frac );
     mi = msu_r_sat( ISqrtTable[index], ISqrtDiffTable[index], frac );
-#else
-    m = mac_r( SqrtTable[index], SqrtDiffTable[index], frac );
-    mi = msu_r( ISqrtTable[index], ISqrtDiffTable[index], frac );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS;
 
     /* handle even/odd exponents */
@@ -929,11 +906,7 @@ Word16 divide3232( Word32 L_num, Word32 L_denom )
     L_denom = L_shl( L_denom, z );
 
     /* round_fx instead of extract_h improves spectral distortion in E_UTIL_lev_dur (schur version). */
-#ifdef BASOP_NOGLOB
     z = div_l( L_num, round_fx_o( L_denom, &Overflow ) );
-#else
-    z = div_l( L_num, round_fx( L_denom ) );
-#endif
     if ( 0 != sign )
     {
         z = negate( z );
@@ -1089,6 +1062,404 @@ Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x, Word32 y, Word16 *s )
     return z;
 }
 
+#ifdef DIV32_OPT_NEWTON
+Word32 div_w_newton( Word32 num, Word32 den );
+/*
+Table of 256 precalculated estimates to be used by the "div_w_newton"
+function using the Newton/Raphson method.
+Note: The first table value (for denominator near 0x40000000) is not fully
+accurate and should not be used.
+*/
+Word32 div_w_newton_lookup[256] = {
+    /* Precalculated rounded results for 0x40000000 / b with b in [0x40000000 ... 0x7FFFFFFF] */
+    0x7FFFFFFF, //  1.000000000000000  i=0  0.5 / 0.5+0/512 (b=0x40000000)
+    0x7F807F80, //  0.996108949416342  i=1  0.5 / 0.5+1/512 (b=0x40400000)
+    0x7F01FC07, //  0.992248062015504  i=2  0.5 / 0.5+2/512 (b=0x40800000)
+    0x7E8472A8, //  0.988416988416988  i=3  0.5 / 0.5+3/512 (b=0x40C00000)
+    0x7E07E07E, //  0.984615384615385  i=4  0.5 / 0.5+4/512 (b=0x41000000)
+    0x7D8C42B2, //  0.980842911877395  i=5  0.5 / 0.5+5/512 (b=0x41400000)
+    0x7D119679, //  0.977099236641221  i=6  0.5 / 0.5+6/512 (b=0x41800000)
+    0x7C97D910, //  0.973384030418251  i=7  0.5 / 0.5+7/512 (b=0x41C00000)
+    0x7C1F07C1, //  0.969696969696970  i=8  0.5 / 0.5+8/512 (b=0x42000000)
+    0x7BA71FE1, //  0.966037735849057  i=9  0.5 / 0.5+9/512 (b=0x42400000)
+    0x7B301ECC, //  0.962406015037594  i=10  0.5 / 0.5+10/512 (b=0x42800000)
+    0x7ABA01EA, //  0.958801498127341  i=11  0.5 / 0.5+11/512 (b=0x42C00000)
+    0x7A44C6AF, //  0.955223880597015  i=12  0.5 / 0.5+12/512 (b=0x43000000)
+    0x79D06A96, //  0.951672862453532  i=13  0.5 / 0.5+13/512 (b=0x43400000)
+    0x795CEB24, //  0.948148148148148  i=14  0.5 / 0.5+14/512 (b=0x43800000)
+    0x78EA45E7, //  0.944649446494465  i=15  0.5 / 0.5+15/512 (b=0x43C00000)
+    0x78787878, //  0.941176470588235  i=16  0.5 / 0.5+16/512 (b=0x44000000)
+    0x78078078, //  0.937728937728938  i=17  0.5 / 0.5+17/512 (b=0x44400000)
+    0x77975B8F, //  0.934306569343066  i=18  0.5 / 0.5+18/512 (b=0x44800000)
+    0x77280772, //  0.930909090909091  i=19  0.5 / 0.5+19/512 (b=0x44C00000)
+    0x76B981DA, //  0.927536231884058  i=20  0.5 / 0.5+20/512 (b=0x45000000)
+    0x764BC88C, //  0.924187725631769  i=21  0.5 / 0.5+21/512 (b=0x45400000)
+    0x75DED952, //  0.920863309352518  i=22  0.5 / 0.5+22/512 (b=0x45800000)
+    0x7572B201, //  0.917562724014337  i=23  0.5 / 0.5+23/512 (b=0x45C00000)
+    0x75075075, //  0.914285714285714  i=24  0.5 / 0.5+24/512 (b=0x46000000)
+    0x749CB28F, //  0.911032028469751  i=25  0.5 / 0.5+25/512 (b=0x46400000)
+    0x7432D63D, //  0.907801418439716  i=26  0.5 / 0.5+26/512 (b=0x46800000)
+    0x73C9B971, //  0.904593639575972  i=27  0.5 / 0.5+27/512 (b=0x46C00000)
+    0x73615A24, //  0.901408450704225  i=28  0.5 / 0.5+28/512 (b=0x47000000)
+    0x72F9B658, //  0.898245614035088  i=29  0.5 / 0.5+29/512 (b=0x47400000)
+    0x7292CC15, //  0.895104895104895  i=30  0.5 / 0.5+30/512 (b=0x47800000)
+    0x722C996B, //  0.891986062717770  i=31  0.5 / 0.5+31/512 (b=0x47C00000)
+    0x71C71C71, //  0.888888888888889  i=32  0.5 / 0.5+32/512 (b=0x48000000)
+    0x71625344, //  0.885813148788927  i=33  0.5 / 0.5+33/512 (b=0x48400000)
+    0x70FE3C07, //  0.882758620689655  i=34  0.5 / 0.5+34/512 (b=0x48800000)
+    0x709AD4E4, //  0.879725085910653  i=35  0.5 / 0.5+35/512 (b=0x48C00000)
+    0x70381C0E, //  0.876712328767123  i=36  0.5 / 0.5+36/512 (b=0x49000000)
+    0x6FD60FBA, //  0.873720136518771  i=37  0.5 / 0.5+37/512 (b=0x49400000)
+    0x6F74AE26, //  0.870748299319728  i=38  0.5 / 0.5+38/512 (b=0x49800000)
+    0x6F13F596, //  0.867796610169492  i=39  0.5 / 0.5+39/512 (b=0x49C00000)
+    0x6EB3E453, //  0.864864864864865  i=40  0.5 / 0.5+40/512 (b=0x4A000000)
+    0x6E5478AC, //  0.861952861952862  i=41  0.5 / 0.5+41/512 (b=0x4A400000)
+    0x6DF5B0F7, //  0.859060402684564  i=42  0.5 / 0.5+42/512 (b=0x4A800000)
+    0x6D978B8E, //  0.856187290969900  i=43  0.5 / 0.5+43/512 (b=0x4AC00000)
+    0x6D3A06D3, //  0.853333333333333  i=44  0.5 / 0.5+44/512 (b=0x4B000000)
+    0x6CDD212B, //  0.850498338870432  i=45  0.5 / 0.5+45/512 (b=0x4B400000)
+    0x6C80D901, //  0.847682119205298  i=46  0.5 / 0.5+46/512 (b=0x4B800000)
+    0x6C252CC7, //  0.844884488448845  i=47  0.5 / 0.5+47/512 (b=0x4BC00000)
+    0x6BCA1AF2, //  0.842105263157895  i=48  0.5 / 0.5+48/512 (b=0x4C000000)
+    0x6B6FA1FE, //  0.839344262295082  i=49  0.5 / 0.5+49/512 (b=0x4C400000)
+    0x6B15C06B, //  0.836601307189543  i=50  0.5 / 0.5+50/512 (b=0x4C800000)
+    0x6ABC74BE, //  0.833876221498371  i=51  0.5 / 0.5+51/512 (b=0x4CC00000)
+    0x6A63BD81, //  0.831168831168831  i=52  0.5 / 0.5+52/512 (b=0x4D000000)
+    0x6A0B9944, //  0.828478964401295  i=53  0.5 / 0.5+53/512 (b=0x4D400000)
+    0x69B4069B, //  0.825806451612903  i=54  0.5 / 0.5+54/512 (b=0x4D800000)
+    0x695D041D, //  0.823151125401929  i=55  0.5 / 0.5+55/512 (b=0x4DC00000)
+    0x69069069, //  0.820512820512820  i=56  0.5 / 0.5+56/512 (b=0x4E000000)
+    0x68B0AA1F, //  0.817891373801917  i=57  0.5 / 0.5+57/512 (b=0x4E400000)
+    0x685B4FE5, //  0.815286624203822  i=58  0.5 / 0.5+58/512 (b=0x4E800000)
+    0x68068068, //  0.812698412698413  i=59  0.5 / 0.5+59/512 (b=0x4EC00000)
+    0x67B23A54, //  0.810126582278481  i=60  0.5 / 0.5+60/512 (b=0x4F000000)
+    0x675E7C5D, //  0.807570977917981  i=61  0.5 / 0.5+61/512 (b=0x4F400000)
+    0x670B453B, //  0.805031446540881  i=62  0.5 / 0.5+62/512 (b=0x4F800000)
+    0x66B893A9, //  0.802507836990596  i=63  0.5 / 0.5+63/512 (b=0x4FC00000)
+    0x66666666, //  0.800000000000000  i=64  0.5 / 0.5+64/512 (b=0x50000000)
+    0x6614BC36, //  0.797507788161994  i=65  0.5 / 0.5+65/512 (b=0x50400000)
+    0x65C393E0, //  0.795031055900621  i=66  0.5 / 0.5+66/512 (b=0x50800000)
+    0x6572EC2F, //  0.792569659442725  i=67  0.5 / 0.5+67/512 (b=0x50C00000)
+    0x6522C3F3, //  0.790123456790123  i=68  0.5 / 0.5+68/512 (b=0x51000000)
+    0x64D319FE, //  0.787692307692308  i=69  0.5 / 0.5+69/512 (b=0x51400000)
+    0x6483ED27, //  0.785276073619632  i=70  0.5 / 0.5+70/512 (b=0x51800000)
+    0x64353C48, //  0.782874617737003  i=71  0.5 / 0.5+71/512 (b=0x51C00000)
+    0x63E7063E, //  0.780487804878049  i=72  0.5 / 0.5+72/512 (b=0x52000000)
+    0x639949EB, //  0.778115501519757  i=73  0.5 / 0.5+73/512 (b=0x52400000)
+    0x634C0634, //  0.775757575757576  i=74  0.5 / 0.5+74/512 (b=0x52800000)
+    0x62FF3A01, //  0.773413897280967  i=75  0.5 / 0.5+75/512 (b=0x52C00000)
+    0x62B2E43D, //  0.771084337349398  i=76  0.5 / 0.5+76/512 (b=0x53000000)
+    0x626703D8, //  0.768768768768769  i=77  0.5 / 0.5+77/512 (b=0x53400000)
+    0x621B97C2, //  0.766467065868264  i=78  0.5 / 0.5+78/512 (b=0x53800000)
+    0x61D09EF3, //  0.764179104477612  i=79  0.5 / 0.5+79/512 (b=0x53C00000)
+    0x61861861, //  0.761904761904762  i=80  0.5 / 0.5+80/512 (b=0x54000000)
+    0x613C0309, //  0.759643916913947  i=81  0.5 / 0.5+81/512 (b=0x54400000)
+    0x60F25DEA, //  0.757396449704142  i=82  0.5 / 0.5+82/512 (b=0x54800000)
+    0x60A92806, //  0.755162241887906  i=83  0.5 / 0.5+83/512 (b=0x54C00000)
+    0x60606060, //  0.752941176470588  i=84  0.5 / 0.5+84/512 (b=0x55000000)
+    0x60180601, //  0.750733137829912  i=85  0.5 / 0.5+85/512 (b=0x55400000)
+    0x5FD017F4, //  0.748538011695906  i=86  0.5 / 0.5+86/512 (b=0x55800000)
+    0x5F889545, //  0.746355685131195  i=87  0.5 / 0.5+87/512 (b=0x55C00000)
+    0x5F417D05, //  0.744186046511628  i=88  0.5 / 0.5+88/512 (b=0x56000000)
+    0x5EFACE48, //  0.742028985507246  i=89  0.5 / 0.5+89/512 (b=0x56400000)
+    0x5EB48823, //  0.739884393063584  i=90  0.5 / 0.5+90/512 (b=0x56800000)
+    0x5E6EA9AE, //  0.737752161383285  i=91  0.5 / 0.5+91/512 (b=0x56C00000)
+    0x5E293205, //  0.735632183908046  i=92  0.5 / 0.5+92/512 (b=0x57000000)
+    0x5DE42046, //  0.733524355300860  i=93  0.5 / 0.5+93/512 (b=0x57400000)
+    0x5D9F7390, //  0.731428571428571  i=94  0.5 / 0.5+94/512 (b=0x57800000)
+    0x5D5B2B08, //  0.729344729344729  i=95  0.5 / 0.5+95/512 (b=0x57C00000)
+    0x5D1745D1, //  0.727272727272727  i=96  0.5 / 0.5+96/512 (b=0x58000000)
+    0x5CD3C315, //  0.725212464589235  i=97  0.5 / 0.5+97/512 (b=0x58400000)
+    0x5C90A1FD, //  0.723163841807910  i=98  0.5 / 0.5+98/512 (b=0x58800000)
+    0x5C4DE1B6, //  0.721126760563380  i=99  0.5 / 0.5+99/512 (b=0x58C00000)
+    0x5C0B8170, //  0.719101123595506  i=100  0.5 / 0.5+100/512 (b=0x59000000)
+    0x5BC9805B, //  0.717086834733894  i=101  0.5 / 0.5+101/512 (b=0x59400000)
+    0x5B87DDAD, //  0.715083798882682  i=102  0.5 / 0.5+102/512 (b=0x59800000)
+    0x5B46989A, //  0.713091922005571  i=103  0.5 / 0.5+103/512 (b=0x59C00000)
+    0x5B05B05B, //  0.711111111111111  i=104  0.5 / 0.5+104/512 (b=0x5A000000)
+    0x5AC5242A, //  0.709141274238227  i=105  0.5 / 0.5+105/512 (b=0x5A400000)
+    0x5A84F345, //  0.707182320441989  i=106  0.5 / 0.5+106/512 (b=0x5A800000)
+    0x5A451CEA, //  0.705234159779614  i=107  0.5 / 0.5+107/512 (b=0x5AC00000)
+    0x5A05A05A, //  0.703296703296703  i=108  0.5 / 0.5+108/512 (b=0x5B000000)
+    0x59C67CD8, //  0.701369863013699  i=109  0.5 / 0.5+109/512 (b=0x5B400000)
+    0x5987B1A9, //  0.699453551912568  i=110  0.5 / 0.5+110/512 (b=0x5B800000)
+    0x59493E14, //  0.697547683923706  i=111  0.5 / 0.5+111/512 (b=0x5BC00000)
+    0x590B2164, //  0.695652173913043  i=112  0.5 / 0.5+112/512 (b=0x5C000000)
+    0x58CD5AE2, //  0.693766937669377  i=113  0.5 / 0.5+113/512 (b=0x5C400000)
+    0x588FE9DC, //  0.691891891891892  i=114  0.5 / 0.5+114/512 (b=0x5C800000)
+    0x5852CDA0, //  0.690026954177898  i=115  0.5 / 0.5+115/512 (b=0x5CC00000)
+    0x58160581, //  0.688172043010753  i=116  0.5 / 0.5+116/512 (b=0x5D000000)
+    0x57D990D0, //  0.686327077747989  i=117  0.5 / 0.5+117/512 (b=0x5D400000)
+    0x579D6EE3, //  0.684491978609626  i=118  0.5 / 0.5+118/512 (b=0x5D800000)
+    0x57619F0F, //  0.682666666666667  i=119  0.5 / 0.5+119/512 (b=0x5DC00000)
+    0x572620AE, //  0.680851063829787  i=120  0.5 / 0.5+120/512 (b=0x5E000000)
+    0x56EAF319, //  0.679045092838196  i=121  0.5 / 0.5+121/512 (b=0x5E400000)
+    0x56B015AC, //  0.677248677248677  i=122  0.5 / 0.5+122/512 (b=0x5E800000)
+    0x567587C4, //  0.675461741424802  i=123  0.5 / 0.5+123/512 (b=0x5EC00000)
+    0x563B48C2, //  0.673684210526316  i=124  0.5 / 0.5+124/512 (b=0x5F000000)
+    0x56015805, //  0.671916010498688  i=125  0.5 / 0.5+125/512 (b=0x5F400000)
+    0x55C7B4F1, //  0.670157068062827  i=126  0.5 / 0.5+126/512 (b=0x5F800000)
+    0x558E5EE9, //  0.668407310704961  i=127  0.5 / 0.5+127/512 (b=0x5FC00000)
+    0x55555555, //  0.666666666666667  i=128  0.5 / 0.5+128/512 (b=0x60000000)
+    0x551C979A, //  0.664935064935065  i=129  0.5 / 0.5+129/512 (b=0x60400000)
+    0x54E42523, //  0.663212435233161  i=130  0.5 / 0.5+130/512 (b=0x60800000)
+    0x54ABFD5A, //  0.661498708010336  i=131  0.5 / 0.5+131/512 (b=0x60C00000)
+    0x54741FAB, //  0.659793814432990  i=132  0.5 / 0.5+132/512 (b=0x61000000)
+    0x543C8B84, //  0.658097686375321  i=133  0.5 / 0.5+133/512 (b=0x61400000)
+    0x54054054, //  0.656410256410256  i=134  0.5 / 0.5+134/512 (b=0x61800000)
+    0x53CE3D8B, //  0.654731457800512  i=135  0.5 / 0.5+135/512 (b=0x61C00000)
+    0x5397829C, //  0.653061224489796  i=136  0.5 / 0.5+136/512 (b=0x62000000)
+    0x53610EFB, //  0.651399491094148  i=137  0.5 / 0.5+137/512 (b=0x62400000)
+    0x532AE21C, //  0.649746192893401  i=138  0.5 / 0.5+138/512 (b=0x62800000)
+    0x52F4FB76, //  0.648101265822785  i=139  0.5 / 0.5+139/512 (b=0x62C00000)
+    0x52BF5A81, //  0.646464646464647  i=140  0.5 / 0.5+140/512 (b=0x63000000)
+    0x5289FEB5, //  0.644836272040302  i=141  0.5 / 0.5+141/512 (b=0x63400000)
+    0x5254E78E, //  0.643216080402010  i=142  0.5 / 0.5+142/512 (b=0x63800000)
+    0x52201488, //  0.641604010025063  i=143  0.5 / 0.5+143/512 (b=0x63C00000)
+    0x51EB851E, //  0.640000000000000  i=144  0.5 / 0.5+144/512 (b=0x64000000)
+    0x51B738D1, //  0.638403990024938  i=145  0.5 / 0.5+145/512 (b=0x64400000)
+    0x51832F1F, //  0.636815920398010  i=146  0.5 / 0.5+146/512 (b=0x64800000)
+    0x514F678B, //  0.635235732009926  i=147  0.5 / 0.5+147/512 (b=0x64C00000)
+    0x511BE195, //  0.633663366336634  i=148  0.5 / 0.5+148/512 (b=0x65000000)
+    0x50E89CC2, //  0.632098765432099  i=149  0.5 / 0.5+149/512 (b=0x65400000)
+    0x50B59897, //  0.630541871921182  i=150  0.5 / 0.5+150/512 (b=0x65800000)
+    0x5082D499, //  0.628992628992629  i=151  0.5 / 0.5+151/512 (b=0x65C00000)
+    0x50505050, //  0.627450980392157  i=152  0.5 / 0.5+152/512 (b=0x66000000)
+    0x501E0B44, //  0.625916870415648  i=153  0.5 / 0.5+153/512 (b=0x66400000)
+    0x4FEC04FE, //  0.624390243902439  i=154  0.5 / 0.5+154/512 (b=0x66800000)
+    0x4FBA3D0A, //  0.622871046228710  i=155  0.5 / 0.5+155/512 (b=0x66C00000)
+    0x4F88B2F3, //  0.621359223300971  i=156  0.5 / 0.5+156/512 (b=0x67000000)
+    0x4F576646, //  0.619854721549637  i=157  0.5 / 0.5+157/512 (b=0x67400000)
+    0x4F265691, //  0.618357487922705  i=158  0.5 / 0.5+158/512 (b=0x67800000)
+    0x4EF58364, //  0.616867469879518  i=159  0.5 / 0.5+159/512 (b=0x67C00000)
+    0x4EC4EC4E, //  0.615384615384615  i=160  0.5 / 0.5+160/512 (b=0x68000000)
+    0x4E9490E1, //  0.613908872901679  i=161  0.5 / 0.5+161/512 (b=0x68400000)
+    0x4E6470B0, //  0.612440191387560  i=162  0.5 / 0.5+162/512 (b=0x68800000)
+    0x4E348B4D, //  0.610978520286396  i=163  0.5 / 0.5+163/512 (b=0x68C00000)
+    0x4E04E04E, //  0.609523809523810  i=164  0.5 / 0.5+164/512 (b=0x69000000)
+    0x4DD56F47, //  0.608076009501188  i=165  0.5 / 0.5+165/512 (b=0x69400000)
+    0x4DA637CF, //  0.606635071090047  i=166  0.5 / 0.5+166/512 (b=0x69800000)
+    0x4D77397E, //  0.605200945626478  i=167  0.5 / 0.5+167/512 (b=0x69C00000)
+    0x4D4873EC, //  0.603773584905660  i=168  0.5 / 0.5+168/512 (b=0x6A000000)
+    0x4D19E6B3, //  0.602352941176471  i=169  0.5 / 0.5+169/512 (b=0x6A400000)
+    0x4CEB916D, //  0.600938967136150  i=170  0.5 / 0.5+170/512 (b=0x6A800000)
+    0x4CBD73B5, //  0.599531615925059  i=171  0.5 / 0.5+171/512 (b=0x6AC00000)
+    0x4C8F8D28, //  0.598130841121495  i=172  0.5 / 0.5+172/512 (b=0x6B000000)
+    0x4C61DD63, //  0.596736596736597  i=173  0.5 / 0.5+173/512 (b=0x6B400000)
+    0x4C346404, //  0.595348837209302  i=174  0.5 / 0.5+174/512 (b=0x6B800000)
+    0x4C0720AB, //  0.593967517401392  i=175  0.5 / 0.5+175/512 (b=0x6BC00000)
+    0x4BDA12F6, //  0.592592592592593  i=176  0.5 / 0.5+176/512 (b=0x6C000000)
+    0x4BAD3A87, //  0.591224018475751  i=177  0.5 / 0.5+177/512 (b=0x6C400000)
+    0x4B809701, //  0.589861751152074  i=178  0.5 / 0.5+178/512 (b=0x6C800000)
+    0x4B542804, //  0.588505747126437  i=179  0.5 / 0.5+179/512 (b=0x6CC00000)
+    0x4B27ED36, //  0.587155963302752  i=180  0.5 / 0.5+180/512 (b=0x6D000000)
+    0x4AFBE639, //  0.585812356979405  i=181  0.5 / 0.5+181/512 (b=0x6D400000)
+    0x4AD012B4, //  0.584474885844749  i=182  0.5 / 0.5+182/512 (b=0x6D800000)
+    0x4AA4724B, //  0.583143507972665  i=183  0.5 / 0.5+183/512 (b=0x6DC00000)
+    0x4A7904A7, //  0.581818181818182  i=184  0.5 / 0.5+184/512 (b=0x6E000000)
+    0x4A4DC96E, //  0.580498866213152  i=185  0.5 / 0.5+185/512 (b=0x6E400000)
+    0x4A22C04A, //  0.579185520361991  i=186  0.5 / 0.5+186/512 (b=0x6E800000)
+    0x49F7E8E2, //  0.577878103837472  i=187  0.5 / 0.5+187/512 (b=0x6EC00000)
+    0x49CD42E2, //  0.576576576576577  i=188  0.5 / 0.5+188/512 (b=0x6F000000)
+    0x49A2CDF3, //  0.575280898876405  i=189  0.5 / 0.5+189/512 (b=0x6F400000)
+    0x497889C2, //  0.573991031390135  i=190  0.5 / 0.5+190/512 (b=0x6F800000)
+    0x494E75FA, //  0.572706935123042  i=191  0.5 / 0.5+191/512 (b=0x6FC00000)
+    0x49249249, //  0.571428571428571  i=192  0.5 / 0.5+192/512 (b=0x70000000)
+    0x48FADE5C, //  0.570155902004454  i=193  0.5 / 0.5+193/512 (b=0x70400000)
+    0x48D159E2, //  0.568888888888889  i=194  0.5 / 0.5+194/512 (b=0x70800000)
+    0x48A8048A, //  0.567627494456763  i=195  0.5 / 0.5+195/512 (b=0x70C00000)
+    0x487EDE04, //  0.566371681415929  i=196  0.5 / 0.5+196/512 (b=0x71000000)
+    0x4855E601, //  0.565121412803532  i=197  0.5 / 0.5+197/512 (b=0x71400000)
+    0x482D1C31, //  0.563876651982379  i=198  0.5 / 0.5+198/512 (b=0x71800000)
+    0x48048048, //  0.562637362637363  i=199  0.5 / 0.5+199/512 (b=0x71C00000)
+    0x47DC11F7, //  0.561403508771930  i=200  0.5 / 0.5+200/512 (b=0x72000000)
+    0x47B3D0F1, //  0.560175054704595  i=201  0.5 / 0.5+201/512 (b=0x72400000)
+    0x478BBCEC, //  0.558951965065502  i=202  0.5 / 0.5+202/512 (b=0x72800000)
+    0x4763D59C, //  0.557734204793028  i=203  0.5 / 0.5+203/512 (b=0x72C00000)
+    0x473C1AB6, //  0.556521739130435  i=204  0.5 / 0.5+204/512 (b=0x73000000)
+    0x47148BF0, //  0.555314533622560  i=205  0.5 / 0.5+205/512 (b=0x73400000)
+    0x46ED2901, //  0.554112554112554  i=206  0.5 / 0.5+206/512 (b=0x73800000)
+    0x46C5F19F, //  0.552915766738661  i=207  0.5 / 0.5+207/512 (b=0x73C00000)
+    0x469EE584, //  0.551724137931034  i=208  0.5 / 0.5+208/512 (b=0x74000000)
+    0x46780467, //  0.550537634408602  i=209  0.5 / 0.5+209/512 (b=0x74400000)
+    0x46514E02, //  0.549356223175966  i=210  0.5 / 0.5+210/512 (b=0x74800000)
+    0x462AC20E, //  0.548179871520343  i=211  0.5 / 0.5+211/512 (b=0x74C00000)
+    0x46046046, //  0.547008547008547  i=212  0.5 / 0.5+212/512 (b=0x75000000)
+    0x45DE2864, //  0.545842217484009  i=213  0.5 / 0.5+213/512 (b=0x75400000)
+    0x45B81A25, //  0.544680851063830  i=214  0.5 / 0.5+214/512 (b=0x75800000)
+    0x45923543, //  0.543524416135881  i=215  0.5 / 0.5+215/512 (b=0x75C00000)
+    0x456C797D, //  0.542372881355932  i=216  0.5 / 0.5+216/512 (b=0x76000000)
+    0x4546E68F, //  0.541226215644820  i=217  0.5 / 0.5+217/512 (b=0x76400000)
+    0x45217C38, //  0.540084388185654  i=218  0.5 / 0.5+218/512 (b=0x76800000)
+    0x44FC3A34, //  0.538947368421053  i=219  0.5 / 0.5+219/512 (b=0x76C00000)
+    0x44D72044, //  0.537815126050420  i=220  0.5 / 0.5+220/512 (b=0x77000000)
+    0x44B22E27, //  0.536687631027254  i=221  0.5 / 0.5+221/512 (b=0x77400000)
+    0x448D639D, //  0.535564853556485  i=222  0.5 / 0.5+222/512 (b=0x77800000)
+    0x4468C066, //  0.534446764091858  i=223  0.5 / 0.5+223/512 (b=0x77C00000)
+    0x44444444, //  0.533333333333333  i=224  0.5 / 0.5+224/512 (b=0x78000000)
+    0x441FEEF8, //  0.532224532224532  i=225  0.5 / 0.5+225/512 (b=0x78400000)
+    0x43FBC043, //  0.531120331950207  i=226  0.5 / 0.5+226/512 (b=0x78800000)
+    0x43D7B7EA, //  0.530020703933747  i=227  0.5 / 0.5+227/512 (b=0x78C00000)
+    0x43B3D5AF, //  0.528925619834711  i=228  0.5 / 0.5+228/512 (b=0x79000000)
+    0x43901956, //  0.527835051546392  i=229  0.5 / 0.5+229/512 (b=0x79400000)
+    0x436C82A2, //  0.526748971193416  i=230  0.5 / 0.5+230/512 (b=0x79800000)
+    0x43491158, //  0.525667351129363  i=231  0.5 / 0.5+231/512 (b=0x79C00000)
+    0x4325C53E, //  0.524590163934426  i=232  0.5 / 0.5+232/512 (b=0x7A000000)
+    0x43029E1A, //  0.523517382413088  i=233  0.5 / 0.5+233/512 (b=0x7A400000)
+    0x42DF9BB0, //  0.522448979591837  i=234  0.5 / 0.5+234/512 (b=0x7A800000)
+    0x42BCBDC8, //  0.521384928716904  i=235  0.5 / 0.5+235/512 (b=0x7AC00000)
+    0x429A0429, //  0.520325203252033  i=236  0.5 / 0.5+236/512 (b=0x7B000000)
+    0x42776E9A, //  0.519269776876268  i=237  0.5 / 0.5+237/512 (b=0x7B400000)
+    0x4254FCE4, //  0.518218623481781  i=238  0.5 / 0.5+238/512 (b=0x7B800000)
+    0x4232AECD, //  0.517171717171717  i=239  0.5 / 0.5+239/512 (b=0x7BC00000)
+    0x42108421, //  0.516129032258065  i=240  0.5 / 0.5+240/512 (b=0x7C000000)
+    0x41EE7CA6, //  0.515090543259557  i=241  0.5 / 0.5+241/512 (b=0x7C400000)
+    0x41CC9829, //  0.514056224899598  i=242  0.5 / 0.5+242/512 (b=0x7C800000)
+    0x41AAD671, //  0.513026052104208  i=243  0.5 / 0.5+243/512 (b=0x7CC00000)
+    0x4189374B, //  0.512000000000000  i=244  0.5 / 0.5+244/512 (b=0x7D000000)
+    0x4167BA81, //  0.510978043912176  i=245  0.5 / 0.5+245/512 (b=0x7D400000)
+    0x41465FDF, //  0.509960159362550  i=246  0.5 / 0.5+246/512 (b=0x7D800000)
+    0x41252730, //  0.508946322067594  i=247  0.5 / 0.5+247/512 (b=0x7DC00000)
+    0x41041041, //  0.507936507936508  i=248  0.5 / 0.5+248/512 (b=0x7E000000)
+    0x40E31ADE, //  0.506930693069307  i=249  0.5 / 0.5+249/512 (b=0x7E400000)
+    0x40C246D4, //  0.505928853754941  i=250  0.5 / 0.5+250/512 (b=0x7E800000)
+    0x40A193F1, //  0.504930966469428  i=251  0.5 / 0.5+251/512 (b=0x7EC00000)
+    0x40810204, //  0.503937007874016  i=252  0.5 / 0.5+252/512 (b=0x7F000000)
+    0x406090D9, //  0.502946954813359  i=253  0.5 / 0.5+253/512 (b=0x7F400000)
+    0x40404040, //  0.501960784313725  i=254  0.5 / 0.5+254/512 (b=0x7F800000)
+    0x40201008  //  0.500978473581213  i=255  0.5 / 0.5+255/512 (b=0x7FC00000)
+};
+
+
+/*
+ * Fractional multiplication of signed a and b, both in Q31. The result is doubled.
+ * Note: in this test, saturation is not needed.
+ * BASOP weights: 3
+ */
+
+static Word32 L_dmult( Word32 L_var1, Word32 L_var2 )
+{
+    Word64 L64_var1 = W_mult0_32_32( L_var1, L_var2 );
+    L64_var1 = W_shr( L64_var1, 30 );
+    return W_extract_l( L64_var1 );
+}
+
+/*
+ * 32 by 32 bit division, following the Newton / Raphson method.
+ * Usage of this low-level procedure by the caller:
+ * 1. Numerator <num> can use the full range of signed 32-bit datatypes: 0x80000000...0x7FFFFFFF
+ *    Note: Since <num> is not normalized here, but it is multplied to the reciprocal of the
+ *    denominator, the caller should use a normalized <num> and handle any exponent outside.
+ * 2. Denominator <den> must be normalized into range 0x40000001 to 0x7FFFFFFF (all positive)
+ *    Note: In case of den=0x40000000, the caller is not allowed to call the division routine,
+      since the result is known.
+ *    Note: num / 0x40000000 equals to num with exp += 1.
+ * 3. The result is in range 0x40000000 to 0x7FFFFFFF, finally multiplied by <num>.
+ * BASOP weights: 24 (incl. L_dmult)
+ */
+
+Word32 div_w_newton( Word32 num, Word32 den )
+{
+    Word32 x0, x1, x2, x3, diff, result;
+
+    x0 = div_w_newton_lookup[sub( extract_l( L_shr( den, 22 ) ), 256 )];
+    move32();
+
+    diff = L_sub( 0x40000000, Mpy_32_32( den, x0 ) );
+
+    x1 = L_add( x0, L_dmult( x0, diff ) );
+    diff = L_sub( 0x40000000, Mpy_32_32( den, x1 ) );
+
+    x2 = L_add( x1, L_dmult( x1, diff ) );
+    diff = L_sub( 0x40000000, Mpy_32_32( den, x2 ) );
+
+    x3 = L_add( x2, L_dmult( x2, diff ) );
+
+    result = Mpy_32_32( num, x3 );
+
+    return result;
+}
+
+/*
+ * 32 / 32 division
+ * Usage of this global procedure by the caller:
+ * 1. Numerator <num> can use the full range of signed 32-bit datatypes: 0x80000000...0x7FFFFFFF
+ *    Note: Since <num> is not normalized here, but it is multplied to the reciprocal of the
+ *    denominator, the caller should use a normalized <num> and handle any exponent outside.
+ * 2. Denominator can use the full range of signed 32-bit datatypes: 0x80000000...0x7FFFFFFF
+ *    except den=0x00000000. In case of 0x80000000, it becomes internally negated to 0x7FFFFFFF.
+ * 3. The result is 0x00000000 (*s=0)for <num> equals 0x00000000.
+ *    The result is rather left aligned, with up to 1 bit headroom.
+ * 4. The result exponent is stored in s[0]
+ * BASOP weights: 41 (incl. div_w_newton)
+ */
+
+Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s )
+{
+    Word32 z;
+    Word16 sx;
+    Word16 sy;
+    Word32 sign;
+
+    assert( y != (Word32) 0 );
+
+    /* Early exit, if numerator is zero */
+    IF( x == (Word32) 0 )
+    {
+        *s = 0;
+        return ( (Word32) 0 );
+    }
+    IF( EQ_32( y, 0x80000000 ) )
+    {
+        /* Division by -1.0: same as negation of numerator */
+        /* Return normalized negated numerator */
+        sx = norm_l( x );
+        x = L_shl( x, sx );
+        *s = negate( sx );
+        return L_negate( x );
+    }
+    sign = y;
+    move32();
+    if ( y < 0 )
+    {
+        y = L_negate( y );
+    }
+
+    /* Normalize numerator */
+    sx = norm_l( x );
+    x = L_shl( x, sx );
+
+    /* Normalize denominator */
+    sy = norm_l( y );
+    y = L_shl( y, sy );
+
+    /* Store exponent: + 1 for div_w_newton computing 0.5*num/den */
+    *s = sub( add( sy, 1 ), sx );
+    move16();
+
+    /* Special treatment for den=0x40000000 */
+    /* Result is known: z=2*num  */
+    IF( EQ_32( y, 0x40000000 ) )
+    {
+        if ( sign < 0 )
+        {
+            x = L_negate( x );
+        }
+        return x;
+    }
+
+    /* Invoke division applying Newton/Raphson-Algorithm */
+    z = div_w_newton( x, y );
+
+    if ( sign < 0 )
+    {
+        z = L_negate( z );
+    }
+
+    return z;
+}
+#endif /* DIV32_OPT_NEWTON */
+
 Word16 BASOP_Util_Divide3232_Scale( Word32 x, Word32 y, Word16 *s )
 {
     Word16 z;
@@ -1436,11 +1807,7 @@ Word16 getCosWord16R2(
     BASOP_SATURATE_WARNING_OFF
     sine = negate( sine );
     /* Saturation has been included based on the recommendation from the PC group */
-#ifdef BASOP_NOGLOB
     result = msu_r_sat( L_mult( sine, residual ), cosine, -32768 );
-#else
-    result = msu_r( L_mult( sine, residual ), cosine, -32768 );
-#endif
     BASOP_SATURATE_WARNING_ON
 
     return result;
@@ -1483,11 +1850,7 @@ Word16 getSqrtWord32( Word32 val )
     exp = sub( 31 - 32, exp2 );
     L_temp = Isqrt_lc( L_temp2, &exp ); /* 12 clks */
 
-#ifdef BASOP_NOGLOB
     temp = round_fx_sat( L_temp );
-#else
-    temp = round_fx( L_temp );
-#endif
     L_temp = Mpy_32_16_1( L_temp2, temp ); /* 2 clks */
 
     L_temp = L_shl( L_temp, sub( exp, exp2 ) );
@@ -1675,13 +2038,8 @@ Word32 norm_llQ31(               /* o : normalized result              Q31 */
 
     /* Move MSBit of L_sum into L_c */
     Carry = 0;
-#ifdef BASOP_NOGLOB
     L_tmp = L_add_co( L_sum, L_sum, &Carry, &Overflow ); /* L_tmp = L_sum << 1         */
     L_c = L_add_co( L_c, L_c, &Carry, &Overflow );
-#else /* BASOP_NOGLOB */
-    L_tmp = L_add_c( L_sum, L_sum ); /* L_tmp = L_sum << 1         */
-    L_c = L_add_c( L_c, L_c );
-#endif
     L_add( 0, 0 );
     test();
     IF( ( L_c != (Word32) 0L ) && ( L_c != (Word32) 0xFFFFFFFFL ) )
@@ -1777,13 +2135,8 @@ Word32 Norm32Norm( const Word32 *x, const Word16 headroom, const Word16 length,
         if ( L_tmp2 >= 0 )
             L_tmp = L_shr( L_tmp, 2 );
 
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( x[i], shift ) );
         L_tmp = L_mac0_sat( L_tmp, tmp, tmp ); /* exponent = (1-shift*2) , Q(30+shift*2) */
-#else
-        tmp = round_fx( L_shl( x[i], shift ) );
-        L_tmp = L_mac0( L_tmp, tmp, tmp ); /* exponent = (1-shift*2) , Q(30+shift*2) */
-#endif
     }
 
     move16();
@@ -2217,11 +2570,7 @@ Word16 BASOP_Util_Cmp_Mant32Exp /*!< o: flag: result of comparison */
     }
 
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     diff_m = L_sub_sat( a_m, b_m );
-#else
-    diff_m = L_sub( a_m, b_m );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     diff_e = sub( a_e, b_e );
 
@@ -2291,10 +2640,16 @@ Word32 BASOP_Util_Add_Mant32Exp /* o  : normalized result mantissa */
     */
 
     if ( !a_m )
-        a_e = add( b_e, 0 );
+    {
+        a_e = b_e;
+        move16();
+    }
 
     if ( !b_m )
-        b_e = add( a_e, 0 );
+    {
+        b_e = a_e;
+        move16();
+    }
 
     shift = sub( a_e, b_e );
     shift = s_max( -31, shift );
@@ -2315,7 +2670,10 @@ Word32 BASOP_Util_Add_Mant32Exp /* o  : normalized result mantissa */
     if ( shift )
         L_tmp = L_shl( L_tmp, shift );
     if ( L_tmp == 0 )
-        a_e = add( 0, 0 );
+    {
+        a_e = 0;
+        move16();
+    }
     if ( L_tmp != 0 )
         a_e = sub( a_e, shift );
     *ptr_e = a_e;
@@ -2392,11 +2750,7 @@ void bufferCopyFx(
     {
         FOR( i = 0; i < length; i++ )
         {
-#ifdef BASOP_NOGLOB
             *( dest + i ) = shr_sat( *( src + i ), tmp_16 );
-#else
-            *( dest + i ) = shr( *( src + i ), tmp_16 );
-#endif
             move16();
         }
     }
@@ -2710,6 +3064,3 @@ cmplx CL_mult_32x16( cmplx input, cmplx_s coeff )
 #endif
     return result;
 }
-
-
-#undef WMC_TOOL_SKIP
diff --git a/lib_com/basop_util.h b/lib_com/basop_util.h
index 92994542e564c3d6856f667be8e387e797c4071b..b1d4b5fc18da6e9657c30667fb42609b8b1980e3 100644
--- a/lib_com/basop_util.h
+++ b/lib_com/basop_util.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -333,6 +333,13 @@ Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x,    /*!< i  : Numerator*/
                                             Word16 *s ); /*!< o  : Additional scalefactor difference*/
 
 
+#ifdef DIV32_OPT_NEWTON
+Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x,    /*!< i  : Numerator*/
+                                           Word32 y,    /*!< i  : Denominator*/
+                                           Word16 *s ); /*!< o  : Additional scalefactor difference*/
+#endif
+
+
 /************************************************************************/
 /*!
   \brief     Binary logarithm with 7 iterations
diff --git a/lib_com/bitalloc_fx.c b/lib_com/bitalloc_fx.c
index 3400b533d9ca4beb7db245b4e4df2ae4d639b7a0..30ae2d47b028021152ead282c240af1a18c6f46b 100644
--- a/lib_com/bitalloc_fx.c
+++ b/lib_com/bitalloc_fx.c
@@ -7,7 +7,6 @@
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
 #include "prot_fx.h" /* Function prototypes                    */
-#include "prot.h"    /* Function prototypes                    */
 
 void bitalloc_fx(
     Word16 *y,              /* i  : reordered norm of sub-vectors              Q0 */
@@ -55,11 +54,7 @@ void bitalloc_fx(
         move16();
         FOR( m = 1; m < im; m++ )
         {
-#ifdef BASOP_NOGLOB
             v = sub_o( temp, y[m], &Overflow ); /* Q0 */
-#else                                           /* BASOP_NOGLOB */
-            v = sub( temp, y[m] );
-#endif
             temp = s_max( temp, y[m] );
             if ( v < 0 )
             {
@@ -380,11 +375,7 @@ Word16 BitAllocF_fx(
         exp1 = sub( norm_l( L_tmp1 ), 1 );
         exp2 = norm_s( n );
         tmp = div_s( extract_h( L_shl( L_tmp1, exp1 ) ), shl( n, exp2 ) ); /*15 + 15 + exp1 - 16 - exp2*/
-#ifdef BASOP_NOGLOB
-        m_fx = shl_sat( tmp, sub( exp2, exp1 ) ); /*Q14*/
-#else
-        m_fx = shl( tmp, sub( exp2, exp1 ) );     /*Q14*/
-#endif
+        m_fx = shl_sat( tmp, sub( exp2, exp1 ) );                          /*Q14*/
         t_fx = L_deposit_l( 0 );
         n = 0;
         move16();
@@ -451,11 +442,7 @@ Word16 BitAllocF_fx(
             exp1 = sub( norm_l( L_tmp2 ), 1 );
             exp2 = norm_s( n );
             tmp = div_s( extract_h( L_shl( L_tmp2, exp1 ) ), shl( n, exp2 ) ); /*15 + 15 + exp1 - 16 - exp2*/
-#ifdef BASOP_NOGLOB
-            m_fx = shl_o( tmp, sub( exp2, exp1 ), &Overflow ); /*Q14*/
-#else
-            m_fx = shl( tmp, sub( exp2, exp1 ) ); /*Q14*/
-#endif
+            m_fx = shl_o( tmp, sub( exp2, exp1 ), &Overflow );                 /*Q14*/
             if ( L_tmp1 < 0 )
             {
                 m_fx = negate( m_fx );
diff --git a/lib_com/bits_alloc_fx.c b/lib_com/bits_alloc_fx.c
index 83a98a85f8b00d2bfa36490cd4df6db4f98682d1..3bfcd0c20a7a8696fbc479e6363951de2f377807 100644
--- a/lib_com/bits_alloc_fx.c
+++ b/lib_com/bits_alloc_fx.c
@@ -408,7 +408,7 @@ static Word16 BITS_ALLOC_adjust_acelp_fixed_cdk(
     return bitsused;
 }
 
-/*#ifdef IVAS_CODE Below basop operators are missing */
+
 /*-------------------------------------------------------------------*
  * fcb_table()
  *
@@ -434,173 +434,12 @@ static Word16 fcb_table(
 }
 
 /*-------------------------------------------------------------------*
- * acelp_FCB_allocator()
+ * acelp_FCB_allocator_fx()
  *
  * Routine to allocate fixed innovation codebook bit-budget
  *--------------------------------------------------------------------*/
 
-static ivas_error acelp_FCB_allocator(
-    Word16 *nBits,            /* i/o: available bit-budget    */
-    Word16 fixed_cdk_index[], /* o  : codebook index       Q0 */
-    Word16 nb_subfr,          /* i  : number of subframes     */
-    const Word16 L_subfr,     /* i  : subframe length         */
-    const Word16 coder_type,  /* i  : coder type              */
-    const Word16 tc_subfr,    /* i  : TC subframe index       */
-    const Word16 fix_first    /* i  : flag to indicate whether the first subframe bit-budget was fixed */
-)
-{
-    Word16 cdbk, sfr, step;
-    Word16 nBits_tmp;
-    Word16 *p_fixed_cdk_index;
-    Word16 max_n;
-    ivas_error error;
-    // PMT("Not floating point computation, but fixed point operator are still missing ")
-
-    error = IVAS_ERR_OK;
-    move32();
-
-    cdbk = coder_type; /* just to avoid warning when DEBUGGING is deactivated */
-    move16();
-
-    p_fixed_cdk_index = fixed_cdk_index;
-
-    /* TRANSITION coding: first subframe bit-budget was already fixed, glottal pulse not in the first subframe */
-    test();
-    IF( GE_16( tc_subfr, L_SUBFR ) && fix_first )
-    {
-        Word16 i;
-
-        FOR( i = 0; i < nb_subfr; i++ )
-        {
-            *nBits = sub( *nBits, ACELP_FIXED_CDK_BITS( fixed_cdk_index[i] ) );
-            move16();
-        }
-        return error;
-    }
-
-    /* TRANSITION coding: first subframe bit-budget was already fixed, glottal pulse in the first subframe */
-    sfr = 0;
-    move16();
-    IF( fix_first )
-    {
-        *nBits = sub( *nBits, ACELP_FIXED_CDK_BITS( fixed_cdk_index[0] ) );
-        move16();
-        sfr = 1;
-        move16();
-        p_fixed_cdk_index++;
-        nb_subfr = 3;
-        move16();
-    }
-
-    /* distribute the bit-budget equally between subframes */
-    IF( GT_16( L_subfr, L_SUBFR ) ) /* access fast_FCB_bits_2sfr */
-    {
-        max_n = 6;
-        move16();
-    }
-    ELSE
-    {
-        max_n = ACELP_FIXED_CDK_NB;
-        move16();
-    }
-    FOR( cdbk = 0; cdbk < max_n; cdbk++ )
-    {
-        IF( GT_32( L_mult0( fcb_table( cdbk, L_subfr ), nb_subfr ), L_deposit_l( *nBits ) ) )
-        {
-            BREAK;
-        }
-    }
-    cdbk = sub( cdbk, 1 );
-
-#ifdef DEBUGGING
-    if ( cdbk < 0 && coder_type != TRANSITION )
-    {
-        return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Too low bit-budget for fixed innovation codebook (frame = %d). Exiting! \n" );
-    }
-    if ( ( L_subfr == L_SUBFR && cdbk >= ACELP_FIXED_CDK_NB ) || ( L_subfr == 2 * L_SUBFR && fcb_table( cdbk, L_subfr ) == 128 /*stop value*/ ) )
-    {
-        return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Too high bit-budget for fixed innovation codebook (frame = %d). Exiting! \n" );
-    }
-#endif
-
-    set16_fx( p_fixed_cdk_index, cdbk, nb_subfr );
-    nBits_tmp = 0;
-    move16();
-    IF( cdbk >= 0 )
-    {
-        nBits_tmp = fcb_table( cdbk, L_subfr );
-    }
-    ELSE
-    {
-        nBits_tmp = 0;
-        move16();
-    }
-    *nBits = sub( *nBits, i_mult( nBits_tmp, nb_subfr ) );
-    move16();
-
-    /* try to increase the FCB bit-budget of the first subframe(s) */
-    IF( LT_16( cdbk, ACELP_FIXED_CDK_NB - 1 ) )
-    {
-        step = sub( fcb_table( add( cdbk, 1 ), L_subfr ), nBits_tmp );
-        WHILE( *nBits >= step )
-        {
-            ( *p_fixed_cdk_index )++;
-            *nBits = sub( *nBits, step );
-            move16();
-            p_fixed_cdk_index++;
-        }
-
-        /* try to increase the FCB of the first subframe in cases when the next step is lower than the current step */
-        step = sub( fcb_table( add( fixed_cdk_index[sfr], 1 ), L_subfr ), fcb_table( fixed_cdk_index[sfr], L_subfr ) );
-        test();
-        IF( GE_16( *nBits, step ) && cdbk >= 0 )
-        {
-            fixed_cdk_index[sfr] = add( fixed_cdk_index[sfr], 1 );
-            move16();
-            *nBits = sub( *nBits, step );
-            move16();
-            test();
-            IF( GE_16( *nBits, step ) && EQ_16( fixed_cdk_index[sfr + 1], sub( fixed_cdk_index[sfr], 1 ) ) )
-            {
-                sfr = add( sfr, 1 );
-                fixed_cdk_index[sfr] = add( fixed_cdk_index[sfr], 1 );
-                move16();
-                *nBits = sub( *nBits, step );
-                move16();
-            }
-        }
-    }
-    /* TRANSITION coding: allocate highest FCBQ bit-budget to the subframe with the glottal-shape codebook */
-    IF( GE_16( tc_subfr, L_SUBFR ) )
-    {
-        Word16 tempr;
-
-        SWAP( fixed_cdk_index[0], fixed_cdk_index[tc_subfr / L_SUBFR] );
-
-        /* TRANSITION coding: allocate second highest FCBQ bit-budget to the last subframe */
-        IF( idiv1616( tc_subfr, L_SUBFR ) < sub( nb_subfr, 1 ) )
-        {
-            SWAP( fixed_cdk_index[( tc_subfr - L_SUBFR ) / L_SUBFR], fixed_cdk_index[nb_subfr - 1] );
-        }
-    }
-
-    /* when subframe length > L_SUBFR, number of bits instead of codebook index is signalled */
-    IF( GT_16( L_subfr, L_SUBFR ) )
-    {
-        Word16 i, j;
-        FOR( i = 0; i < nb_subfr; i++ )
-        {
-            j = fixed_cdk_index[i];
-            move16();
-            fixed_cdk_index[i] = fast_FCB_bits_2sfr[j];
-            move16();
-        }
-    }
-
-    return error;
-}
-
-static ivas_error acelp_FCB_allocator_ivas(
+static ivas_error acelp_FCB_allocator_fx(
     Word16 *nBits,            /* i/o: available bit-budget    */
     Word16 fixed_cdk_index[], /* o  : codebook index       Q0 */
     Word16 nb_subfr,          /* i  : number of subframes     */
@@ -753,1154 +592,41 @@ static ivas_error acelp_FCB_allocator_ivas(
     return error;
 }
 
-/*-------------------------------------------------------------------*
- * config_acelp1()
- *
- * Configure ACELP bit allocation
- *   - should be in range of <6700; 24350> for ACELP@12.8kHz
- *   - per channel bitrate minimum is 13250 kbps for ACELP@16kHz
- *--------------------------------------------------------------------*/
-
-ivas_error config_acelp1(
-    const Word16 enc_dec,              /* i  : encoder/decoder flag            */
-    const Word32 total_brate,          /* i  : total bitrate                   */
-    const Word32 core_brate_inp,       /* i  : core bitrate                    */
-    const Word16 core,                 /* i  : core                            */
-    const Word16 extl,                 /* i  : extension layer                 */
-    const Word32 extl_brate,           /* i  : extension layer bitrate         */
-    const Word16 L_frame,              /* i  : frame length at internal Fs     */
-    const Word16 GSC_noisy_speech,     /* i  : GSC on SWB noisy speech flag    */
-    ACELP_config *acelp_cfg,           /* i  : ACELP bit-allocation            */
-    const Word16 signalling_bits,      /* i  : number of signalling bits       */
-    const Word16 coder_type,           /* i  : coder type                      */
-    const Word16 tc_subfr,             /* i  : TC subfr ID                     */
-    const Word16 tc_call,              /* i  : TC call number (0,1,2,3,5(DEC)) */
-    Word16 *nBits_es_Pred,             /* o  : number of bits for Es_pred Q    */
-    Word16 *unbits,                    /* o  : number of unused bits           */
-    const Word16 element_mode,         /* i  : element mode                    */
-    Word16 *uc_two_stage_flag,         /* o  : flag undicating two-stage UC    */
-    const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag (can be 1 only with secondary channel */
-    const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag */
-    const Word16 idchan,               /* i  : stereo channel ID               */
-    const Word16 active_cnt,           /* i  : Active frame counter            */
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/
-    const Word16 tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */
-    const Word16 GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
-)
-{
-    Word16 i, bits, nb_subfr;
-    Word16 flag_hardcoded, coder_type_sw, fix_first;
-    Word32 core_brate;
-#ifdef DEBUGGING
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
-    (void) active_cnt;
-#endif
-#endif
-    ivas_error error;
-
-    error = IVAS_ERR_OK;
-    move32();
-    // PMT("Not floating point computation, but fixed point operator are still missing ")
-    /*-----------------------------------------------------------------*
-     * Set the flag indicating two-stage Unvoiced (UC) frame
-     *-----------------------------------------------------------------*/
-
-    *uc_two_stage_flag = 0;
-    move16();
-    IF( EQ_16( coder_type, UNVOICED ) )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        if ( GE_32( total_brate, MIN_UNVOICED_TWO_STAGE_BRATE ) && element_mode > EVS_MONO && ( idchan == 0 || ( ( GE_32( total_brate, 8500 ) || extl_brate == 0 ) && EQ_16( tdm_LRTD_flag, 1 ) ) ) )
-        {
-            *uc_two_stage_flag = 1;
-            move16();
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Set the number of subframes
-     *-----------------------------------------------------------------*/
-
-    IF( EQ_16( L_frame, L_FRAME ) )
-    {
-        nb_subfr = NB_SUBFR;
-        move16();
-
-#ifdef DEBUGGING
-        if ( ( ( core_brate_inp < 5900 && coder_type > UNVOICED ) && !( core_brate_inp < MIN_TC_BRATE && coder_type == TRANSITION ) ) && !( idchan > 0 && element_mode == IVAS_CPE_TD ) && !( element_mode == IVAS_SCE && tdm_low_rate_mode ) )
-        {
-            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Too low bitrate (%d bps) for ACELP@12k8 in frame %d. Exiting!\n", core_brate_inp );
-        }
-
-        if ( core_brate_inp > ACELP_12k8_HIGH_LIMIT && core == ACELP_CORE )
-        {
-            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Too high bitrate (%d bps) for ACELP@12k8 in frame %d. Exiting!\n", core_brate_inp );
-        }
-#endif
-    }
-    ELSE /* L_frame == L_FRAME16k */
-    {
-        nb_subfr = NB_SUBFR16k;
-        move16();
-
-#ifdef DEBUGGING
-        if ( core_brate_inp < ACELP_16k_LOW_LIMIT && core == ACELP_CORE )
-        {
-            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Too low bitrate (%d bps) for ACELP@16k in frame %d. Exiting!\n", core_brate_inp );
-        }
-#endif
-    }
-
-    coder_type_sw = coder_type;
-    move16();
-    IF( core != ACELP_CORE )
-    {
-        /* used in acelp_core_switch_enc() */
-        nb_subfr = 1;
-        move16();
-        if ( EQ_16( L_frame, L_FRAME ) )
-        {
-            coder_type_sw = TRANSITION;
-            move16();
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Check if the core_brate is hard coded (to keep BE for mono core) or not
-     *-----------------------------------------------------------------*/
-
-    flag_hardcoded = 0;
-    move16();
-    i = 0;
-    move16();
-
-    WHILE( i < SIZE_BRATE_INTERMED_TBL )
-    {
-        IF( EQ_32( core_brate_inp, brate_intermed_tbl[i] ) )
-        {
-            flag_hardcoded = 1;
-            move16();
-            BREAK;
-        }
-
-        IF( LT_32( core_brate_inp, brate_intermed_tbl[i] ) )
-        {
-            flag_hardcoded = 0;
-            move16();
-            BREAK;
-        }
-
-        i = add( i, 1 );
-    }
-
-    test();
-    test();
-    test();
-    IF( EQ_16( element_mode, IVAS_CPE_TD ) && EQ_16( coder_type, AUDIO ) &&
-        LE_32( core_brate_inp, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation should be mapped to 8 kb/s instead of 9.6 kb/s in this case */
-    {
-        i = sub( i, 1 );
-    }
-
-    core_brate = brate_intermed_tbl[i];
-    move32();
-
-    if ( element_mode > EVS_MONO )
-    {
-        flag_hardcoded = 0; /* use automatic and flexible ACELP bit-budget allocation */
-        move16();
-    }
-
-    test();
-    if ( ( core != ACELP_CORE ) && ( element_mode == EVS_MONO ) ) /* needed for mode1 core switching in EVS mono */
-    {
-        flag_hardcoded = 1;
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * ACELP bit allocation
-     *-----------------------------------------------------------------*/
-    test();
-    test();
-    IF( !( EQ_16( coder_type, TRANSITION ) && NE_16( tc_subfr, -1 ) ) || EQ_16( enc_dec, DEC ) )
-    {
-        /* Set the bit-budget */
-        bits = extract_l( Mpy_32_32( core_brate_inp, ONE_BY_FRAMES_PER_SEC_Q31 ) ); // Q0
-
-        test();
-        test();
-        IF( EQ_16( coder_type, TRANSITION ) && EQ_16( enc_dec, DEC ) && EQ_16( tc_call, 1 ) )
-        {
-            bits = add( bits, *nBits_es_Pred ); /* equalize for 4th signaling bit estimated at the encoder in TC_0_192 */
-        }
-
-        /* Subtract signalling bits */
-        test();
-        test();
-        IF( EQ_16( enc_dec, DEC ) && EQ_16( idchan, 1 ) && element_mode > EVS_MONO )
-        {
-            bits = sub( bits, TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS );
-
-            IF( EQ_16( tdm_LRTD_flag, 1 ) )
-            {
-                bits = add( bits, STEREO_BITS_TCA );
-            }
-
-            /* subtract TBE/BWE flag */
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( extl_brate > 0 && ( EQ_16( extl, WB_TBE ) || EQ_16( extl, SWB_TBE ) || EQ_16( extl, FB_TBE ) || EQ_16( extl, WB_BWE ) || EQ_16( extl, SWB_BWE ) || EQ_16( extl, FB_BWE ) ) )
-            {
-                bits = sub( bits, 1 );
-            }
-        }
-        ELSE
-        {
-            /* Subtract signalling bits */
-            bits = sub( bits, signalling_bits );
-        }
-
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( extl_brate > 0 && ( EQ_16( extl, WB_TBE ) || EQ_16( extl, SWB_TBE ) || EQ_16( extl, FB_TBE ) || EQ_16( extl, WB_BWE ) || EQ_16( extl, SWB_BWE ) || EQ_16( extl, FB_BWE ) ) )
-        {
-            /* extension layer signalling bit is counted in the extension layer bitbudget */
-            bits = add( bits, 1 );
-        }
-
-        /*-----------------------------------------------------------------*
-         * LSF Q bit-budget
-         *-----------------------------------------------------------------*/
-        test();
-        test();
-        test();
-        IF( !tdm_lp_reuse_flag || idchan == 0 )
-        {
-            /* LSF Q bit-budget */
-            acelp_cfg->lsf_bits = LSF_bits_tbl[LSF_BIT_ALLOC_IDX_fx( core_brate, coder_type )];
-            move16();
-
-            IF( !flag_hardcoded )
-            {
-                IF( EQ_16( L_frame, L_FRAME ) )
-                {
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    IF( EQ_16( element_mode, IVAS_SCE ) && tdm_low_rate_mode )
-                    {
-                        acelp_cfg->lsf_bits = LSF_bits_tbl[LSF_BIT_ALLOC_IDX_fx( core_brate, coder_type )];
-                        move16();
-                    }
-                    ELSE IF( ( LT_32( total_brate, 7200 ) || coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( idchan, 1 ) )
-                    {
-                        /* TD stereo, secondary channel: do nothing */
-                        acelp_cfg->lsf_bits = LSF_bits_tbl[LSF_BIT_ALLOC_IDX_fx( core_brate, coder_type )];
-                        move16();
-                    }
-                    ELSE IF( element_mode > EVS_MONO && EQ_16( coder_type, AUDIO ) && LT_32( brate_intermed_tbl[i], ACELP_9k60 ) )
-                    {
-                        /* primary channel: do nothing */
-                    }
-                    ELSE IF( element_mode > EVS_MONO && EQ_16( coder_type, AUDIO ) /*&& brate_intermed_tbl[i] >= ACELP_9k60*/ )
-                    {
-                        acelp_cfg->lsf_bits = 42;
-                        move16();
-                    }
-                    ELSE IF( LE_32( total_brate, 9600 ) || EQ_16( coder_type, UNVOICED ) )
-                    {
-                        acelp_cfg->lsf_bits = 31;
-                        move16();
-                    }
-                    ELSE IF( LE_32( total_brate, 20000 ) )
-                    {
-                        acelp_cfg->lsf_bits = 36;
-                        move16();
-                    }
-                    ELSE
-                    {
-                        acelp_cfg->lsf_bits = 41;
-                        move16();
-                    }
-                }
-                ELSE /* L_frame == L_FRAME16k */
-                {
-                    acelp_cfg->lsf_bits = 41;
-                    move16();
-                }
-            }
-
-            bits = sub( bits, acelp_cfg->lsf_bits );
-
-            /* mid-LSF Q bit-budget */
-            acelp_cfg->mid_lsf_bits = mid_LSF_bits_tbl[LSF_BIT_ALLOC_IDX_fx( core_brate, coder_type )];
-            move16();
-
-            test();
-            if ( element_mode > EVS_MONO && EQ_16( coder_type, AUDIO ) /*&& brate_intermed_tbl[i] < ACELP_9k60*/ )
-            {
-                acelp_cfg->mid_lsf_bits = 5;
-                move16();
-                /* primary channel: do nothing */
-            }
-
-            bits = sub( bits, acelp_cfg->mid_lsf_bits );
-        }
-        ELSE IF( EQ_16( tdm_lp_reuse_flag, 1 ) && EQ_16( idchan, 1 ) && NE_16( active_cnt, 1 ) )
-        {
-            bits = sub( bits, TDM_IC_LSF_PRED_BITS );
-        }
-        /* gain Q bit-budget - part 1 */
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && coder_type != INACTIVE && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) || ( coder_type == INACTIVE && GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )
-        {
-            *nBits_es_Pred = Es_pred_bits_tbl[BIT_ALLOC_IDX_fx( core_brate, coder_type, -1, -1 )];
-            move16();
-            bits = sub( bits, *nBits_es_Pred );
-        }
-        ELSE IF( *uc_two_stage_flag )
-        {
-            *nBits_es_Pred = 4;
-            move16();
-            bits = sub( bits, *nBits_es_Pred );
-        }
-    }
-    ELSE
-    {
-        bits = *unbits;
-        move16();
-    }
-
-    test();
-    IF( EQ_16( coder_type, TRANSITION ) && tc_call == 0 )
-    {
-        *unbits = bits;
-        return error;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Low-rate mode - bits are allocated in tdm_low_rate_enc()
-     *-----------------------------------------------------------------*/
-    test();
-    IF( EQ_16( element_mode, IVAS_SCE ) && tdm_low_rate_mode )
-    {
-        acelp_cfg->FEC_mode = 0;
-        acelp_cfg->ltf_mode = FULL_BAND;
-        *nBits_es_Pred = 0;
-        *unbits = 0;
-        acelp_cfg->ubits = 0;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-
-        return error;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Supplementary information for FEC
-     *-----------------------------------------------------------------*/
-
-    acelp_cfg->FEC_mode = 0;
-    move16();
-    test();
-    test();
-    IF( GE_32( core_brate, ACELP_11k60 ) && ( idchan == 0 || element_mode == EVS_MONO ) )
-    {
-        acelp_cfg->FEC_mode = 1;
-        move16();
-
-        test();
-        test();
-        IF( GT_16( coder_type, UNVOICED ) && LT_16( coder_type, AUDIO ) && NE_16( coder_type, VOICED ) )
-        {
-            bits = sub( bits, FEC_BITS_CLS );
-        }
-
-        IF( NE_16( coder_type, TRANSITION ) )
-        {
-            IF( GE_32( total_brate, ACELP_16k40 ) )
-            {
-                acelp_cfg->FEC_mode = 2;
-                move16();
-                test();
-                IF( GT_16( coder_type, UNVOICED ) && LT_16( coder_type, AUDIO ) )
-                {
-                    bits = sub( bits, FEC_BITS_ENR );
-                }
-            }
-
-            IF( GE_32( total_brate, ACELP_32k ) )
-            {
-                acelp_cfg->FEC_mode = 3;
-                move16();
-
-                test();
-                IF( GT_16( coder_type, UNVOICED ) && LT_16( coder_type, AUDIO ) )
-                {
-                    bits = sub( bits, FEC_BITS_POS );
-                }
-            }
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * LP filtering of the adaptive excitation
-     *-----------------------------------------------------------------*/
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( idchan > 0 && element_mode > EVS_MONO )
-    {
-        acelp_cfg->ltf_mode = FULL_BAND;
-        move16();
-    }
-    ELSE IF( EQ_16( coder_type, UNVOICED ) )
-    {
-        acelp_cfg->ltf_mode = FULL_BAND;
-        move16();
-    }
-    ELSE IF( ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) ) && LT_32( core_brate, ACELP_11k60 ) )
-    {
-        acelp_cfg->ltf_mode = LOW_PASS;
-        move16();
-    }
-    ELSE IF( GE_32( core_brate, ACELP_11k60 ) && ( NE_16( coder_type, AUDIO ) && !( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME ) ) ) )
-    {
-        test();
-        test();
-        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) /* GSC Inactive @16kHz */
-        {
-            acelp_cfg->ltf_mode = FULL_BAND;
-            move16();
-        }
-        ELSE
-        {
-            acelp_cfg->ltf_mode = NORMAL_OPERATION;
-            move16();
-            IF( coder_type != TRANSITION )
-            {
-                bits = sub( bits, nb_subfr );
-            }
-        }
-    }
-    ELSE
-    {
-        acelp_cfg->ltf_mode = FULL_BAND;
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * UC bit-budget
-     *-----------------------------------------------------------------*/
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( EQ_16( coder_type, UNVOICED ) && !( *uc_two_stage_flag ) ) || ( coder_type == INACTIVE && LE_32( core_brate, ACELP_9k60 ) ) ) && ( idchan == 0 || element_mode == EVS_MONO ) )
-    {
-        bits = sub( bits, NBITS_NOISENESS ); /* noiseness */
-    }
-    IF( EQ_16( coder_type, UNVOICED ) && !( *uc_two_stage_flag ) )
-    {
-        bits = sub( bits, 3 * NB_SUBFR ); /* tilt factor */
-    }
-
-    /*-----------------------------------------------------------------*
-     * TC bit-budget
-     *-----------------------------------------------------------------*/
-
-    fix_first = 0;
-    move16();
-    IF( EQ_16( coder_type, TRANSITION ) )
-    {
-        if ( EQ_16( tc_call, 2 ) )
-        {
-            fix_first = 1;
-            move16();
-        }
-
-        /* TC signalling */
-        IF( EQ_16( L_frame, L_FRAME ) )
-        {
-            IF( EQ_16( tc_subfr, TC_0_0 ) )
-            {
-                IF( enc_dec == ENC )
-                {
-                    bits = sub( bits, 1 ); /* TC signalling */
-                }
-
-                IF( EQ_16( acelp_cfg->ltf_mode, NORMAL_OPERATION ) )
-                {
-                    bits = sub( bits, 3 ); /* LP filtering flag */
-                }
-            }
-            ELSE IF( EQ_16( tc_subfr, TC_0_64 ) )
-            {
-                IF( enc_dec == ENC )
-                {
-                    bits = sub( bits, 4 ); /* TC signalling */
-                }
-
-                IF( EQ_16( acelp_cfg->ltf_mode, NORMAL_OPERATION ) )
-                {
-                    bits = sub( bits, 3 ); /* LP filtering flag */
-                }
-            }
-            ELSE IF( EQ_16( tc_subfr, TC_0_128 ) )
-            {
-                IF( enc_dec == ENC )
-                {
-                    bits = sub( bits, 4 ); /* TC signalling */
-                }
-
-                IF( EQ_16( acelp_cfg->ltf_mode, NORMAL_OPERATION ) )
-                {
-                    bits = sub( bits, 2 ); /* LP filtering flag */
-                }
-            }
-            ELSE IF( EQ_16( tc_subfr, TC_0_192 ) )
-            {
-                IF( enc_dec == ENC )
-                {
-                    bits = sub( bits, 3 ); /* TC signalling */
-                }
-
-                IF( EQ_16( acelp_cfg->ltf_mode, NORMAL_OPERATION ) )
-                {
-                    bits = sub( bits, 1 ); /* LP filtering flag */
-                }
-            }
-            ELSE IF( EQ_16( tc_subfr, L_SUBFR ) )
-            {
-                IF( enc_dec == ENC )
-                {
-                    bits = sub( bits, 3 ); /* TC signalling */
-                }
-
-                IF( EQ_16( acelp_cfg->ltf_mode, NORMAL_OPERATION ) )
-                {
-                    bits = sub( bits, idiv1616( sub( L_FRAME - L_SUBFR, tc_subfr ), L_SUBFR ) ); /* LP filtering flag */
-                }
-            }
-            ELSE
-            {
-                IF( enc_dec == ENC )
-                {
-                    bits = sub( bits, 4 ); /* TC signalling */
-                }
-
-                IF( EQ_16( acelp_cfg->ltf_mode, NORMAL_OPERATION ) )
-                {
-                    bits = sub( bits, idiv1616_1( sub( L_FRAME - L_SUBFR, tc_subfr ), L_SUBFR ) ); /* LP filtering flag */
-                }
-            }
-        }
-        ELSE /* L_frame == L_FRAME16k */
-        {
-            IF( enc_dec == ENC )
-            {
-                IF( LE_16( tc_subfr, 2 * L_SUBFR ) )
-                {
-                    bits = sub( bits, 2 ); /* TC signalling */
-                }
-                ELSE
-                {
-                    bits = sub( bits, 3 ); /* TC signalling */
-                }
-            }
-
-            // bits -= ( L_FRAME16k - tc_subfr - L_SUBFR ) / L_SUBFR; /* LP filtering flag */
-            bits = sub( bits, idiv1616_1( sub( L_FRAME16k - L_SUBFR, tc_subfr ), L_SUBFR ) ); /* LP filtering flag */
-        }
-
-        /* glottal-shape codebook bits */
-        bits = sub( bits, 3 + 6 + 1 + 3 );
-    }
-
-    /*-----------------------------------------------------------------*
-     * pitch, innovation, gains bit-budget
-     *-----------------------------------------------------------------*/
-
-    acelp_cfg->fcb_mode = 0;
-    move16();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( element_mode, IVAS_CPE_TD ) && EQ_16( tdm_low_rate_mode, 1 ) && ( coder_type != INACTIVE ) && NE_16( coder_type, UNVOICED ) ) /* GENERIC low rate mode for secondary channel */
-    {
-        set16_fx( acelp_cfg->pitch_bits, 0, NB_SUBFR16k );
-        set16_fx( acelp_cfg->gains_mode, 0, NB_SUBFR16k );
-
-        FOR( i = 0; i < 2; i++ )
-        {
-            acelp_cfg->pitch_bits[i] = 0;
-            move16();
-            IF( tdm_Pitch_reuse_flag == 0 )
-            {
-                acelp_cfg->pitch_bits[i] = ACB_bits_tbl[BIT_ALLOC_IDX_fx( ACELP_7k20, GENERIC, i_mult( 2 * L_SUBFR, i ), TC_SUBFR2IDX_fx( tc_subfr ) )];
-                move16();
-                bits = sub( bits, acelp_cfg->pitch_bits[i] );
-            }
-            acelp_cfg->gains_mode[i] = gain_bits_tbl[BIT_ALLOC_IDX_fx( ACELP_7k20, GENERIC, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_fx( tc_subfr ) )];
-            move16();
-            bits = sub( bits, acelp_cfg->gains_mode[i] );
-        }
-        acelp_cfg->fcb_mode = 1;
-        move16();
-
-#ifdef DEBUGGING
-        if ( bits >= 55 )
-        {
-            printf( "too much bits -> %d, LPC = %d and pitch = %d\n", bits, tdm_lp_reuse_flag, tdm_Pitch_reuse_flag );
-            acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
-        }
-        else
-#endif
-            IF( GE_16( bits, 16 ) )
-            {
-                acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
-            }
-        ELSE
-        {
-            acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
-            acelp_cfg->fixed_cdk_index[1] = -1;
-            move16();
-        }
-        acelp_cfg->fixed_cdk_index[2] = -1;
-        move16();
-        acelp_cfg->fixed_cdk_index[3] = -1;
-        move16();
-    }
-    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) || coder_type != INACTIVE ) ) || EQ_16( core, HQ_CORE ) )
-    {
-        /* pitch Q & gain Q bit-budget - part 2*/
-        FOR( i = 0; i < nb_subfr; i++ )
-        {
-            IF( EQ_16( L_frame, L_FRAME ) )
-            {
-                test();
-                IF( EQ_16( tdm_Pitch_reuse_flag, 1 ) && EQ_16( idchan, 1 ) )
-                {
-                    acelp_cfg->pitch_bits[i] = 0;
-                    move16();
-                }
-                ELSE
-                {
-                    acelp_cfg->pitch_bits[i] = ACB_bits_tbl[BIT_ALLOC_IDX_fx( core_brate, coder_type, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_fx( tc_subfr ) )];
-                    move16();
-                }
-                acelp_cfg->gains_mode[i] = gain_bits_tbl[BIT_ALLOC_IDX_fx( core_brate, coder_type_sw, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_fx( tc_subfr ) )];
-                move16();
-            }
-            ELSE /* L_frame == L_FRAME16k */
-            {
-                test();
-                IF( EQ_16( tdm_Pitch_reuse_flag, 1 ) && EQ_16( idchan, 1 ) )
-                {
-                    acelp_cfg->pitch_bits[i] = 0;
-                    move16();
-                }
-                ELSE
-                {
-                    acelp_cfg->pitch_bits[i] = ACB_bits_16kHz_tbl[BIT_ALLOC_IDX_16KHZ_fx( core_brate, coder_type, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_16KHZ_fx( tc_subfr ) )];
-                    move16();
-                }
-                acelp_cfg->gains_mode[i] = gain_bits_16kHz_tbl[BIT_ALLOC_IDX_16KHZ_fx( core_brate, coder_type_sw, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_16KHZ_fx( tc_subfr ) )];
-                move16();
-            }
-
-            bits = sub( bits, acelp_cfg->pitch_bits[i] );
-
-            test();
-            IF( coder_type == INACTIVE && EQ_16( acelp_cfg->gains_mode[i], 6 ) /* VQ vs. SQ threshold @32 kbps */ )
-            {
-                bits = sub( bits, 5 );
-            }
-            ELSE
-            {
-                if ( EQ_16( *uc_two_stage_flag, 1 ) )
-                {
-                    acelp_cfg->gains_mode[i] = 7;
-                    move16();
-                }
-
-                bits = sub( bits, acelp_cfg->gains_mode[i] );
-            }
-        }
-
-        /* algebraic codebook bit-budget */
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( flag_hardcoded || ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )
-        {
-            FOR( i = 0; i < nb_subfr; i++ )
-            {
-                IF( EQ_16( L_frame, L_FRAME ) )
-                {
-                    acelp_cfg->fixed_cdk_index[i] = FCB_bits_tbl[BIT_ALLOC_IDX_fx( core_brate, coder_type, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_fx( tc_subfr ) )];
-                    move16();
-                }
-                ELSE /* L_frame == L_FRAME16k */
-                {
-                    acelp_cfg->fixed_cdk_index[i] = FCB_bits_16kHz_tbl[BIT_ALLOC_IDX_16KHZ_fx( core_brate, coder_type, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_16KHZ_fx( tc_subfr ) )];
-                    move16();
-                }
-                bits = sub( bits, acelp_cfg->fixed_cdk_index[i] );
-            }
-        }
-        ELSE IF( !( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) )
-        {
-            test();
-            IF( EQ_16( coder_type, UNVOICED ) && !( *uc_two_stage_flag ) )
-            {
-                i = idiv1616( bits, NB_SUBFR );
-                IF( s_and( i, 1 ) == 0 )
-                {
-                    i = sub( i, 1 ); /* must be odd */
-                }
-                i = s_min( i, 13 );
-#ifdef DEBUG_MODE_TD
-                if ( i < 0 )
-                    IVAS_ERROR( IVAS_ERR_INTERNAL, "ERROR::: UC negative index should not happen at frame %d\n" );
-#endif
-                i = s_max( i, 0 ); /* If i == 0-> random noise generator will be used as FCB */
-                set16_fx( acelp_cfg->fixed_cdk_index, i, NB_SUBFR );
-                bits = sub( bits, i_mult( i, NB_SUBFR ) );
-            }
-            ELSE
-            {
-
-                acelp_cfg->fcb_mode = 1;
-                move16();
-                test();
-                test();
-                IF( EQ_16( element_mode, IVAS_CPE_TD ) )
-                {
-                    IF( GE_16( bits, i_mult( ACELP_FIXED_CDK_BITS( 0 ), ( nb_subfr ) ) ) ) /* enough bits for all fcb */
-                    {
-                        acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
-                    }
-                    ELSE IF( GE_16( bits, i_mult( ACELP_FIXED_CDK_BITS( 0 ), sub( nb_subfr, 1 ) ) ) )
-                    {
-                        acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, nb_subfr - 1, L_SUBFR, coder_type, tc_subfr, fix_first );
-                        acelp_cfg->fixed_cdk_index[3] = -1;
-                        move16();
-                    }
-                    ELSE IF( GE_16( bits, i_mult( ACELP_FIXED_CDK_BITS( 0 ), sub( nb_subfr, 2 ) ) ) )
-                    {
-                        acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, sub( nb_subfr, 2 ), L_SUBFR, coder_type, tc_subfr, fix_first );
-                        acelp_cfg->fixed_cdk_index[2] = acelp_cfg->fixed_cdk_index[1];
-                        move16();
-                        acelp_cfg->fixed_cdk_index[1] = -1;
-                        move16();
-                        acelp_cfg->fixed_cdk_index[3] = -1;
-                        move16();
-                    }
-                    ELSE IF( GE_16( bits, ACELP_FIXED_CDK_BITS( 0 ) ) )
-                    {
-                        acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, 1, L_SUBFR, coder_type, tc_subfr, fix_first );
-                        acelp_cfg->fixed_cdk_index[1] = acelp_cfg->fixed_cdk_index[0];
-                        move16();
-                        acelp_cfg->fixed_cdk_index[0] = -1;
-                        move16();
-                        acelp_cfg->fixed_cdk_index[2] = -1;
-                        move16();
-                        acelp_cfg->fixed_cdk_index[3] = -1;
-                        move16();
-                    }
-                    ELSE /* No FCB */
-                    {
-#ifdef DEBUGGING
-                        IVAS_ERROR( IVAS_ERR_INTERNAL, "WARNING!!!, No bit allocated to FCB, check frame %d\n" );
-#endif
-                        acelp_cfg->fixed_cdk_index[0] = -1;
-                        move16();
-                        acelp_cfg->fixed_cdk_index[1] = -1;
-                        move16();
-                        acelp_cfg->fixed_cdk_index[2] = -1;
-                        move16();
-                        acelp_cfg->fixed_cdk_index[3] = -1;
-                        move16();
-                    }
-                }
-                ELSE IF( NE_16( element_mode, IVAS_CPE_TD ) && GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) )
-                {
-                    bits = 100; /* 9 kbps for fcb */
-                    move16();
-                    acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
-                }
-                ELSE
-                {
-                    acelp_FCB_allocator( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
-                }
-            }
-        }
-
-        /* AVQ codebook */
-        test();
-        test();
-        test();
-        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )
-        {
-            FOR( i = 0; i < nb_subfr; i++ )
-            {
-                IF( flag_hardcoded )
-                {
-                    acelp_cfg->AVQ_cdk_bits[i] = AVQ_bits_16kHz_tbl[BIT_ALLOC_IDX_16KHZ_fx( core_brate, coder_type, i_mult( i, L_SUBFR ), TC_SUBFR2IDX_16KHZ_fx( tc_subfr ) )];
-                    move16();
-                    {
-                        bits = sub( bits, acelp_cfg->AVQ_cdk_bits[i] );
-                    }
-                }
-
-                bits = sub( bits, G_AVQ_BITS );
-            }
-
-            test();
-            test();
-            IF( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && LE_32( core_brate_inp, MAX_BRATE_AVQ_EXC_TD ) && EQ_16( coder_type, GENERIC ) )
-            {
-                /* harm. flag ACELP AVQ */
-                bits = sub( bits, 1 );
-            }
-
-            IF( !flag_hardcoded )
-            {
-                Word16 bit_tmp;
-
-                bit_tmp = idiv1616( bits, nb_subfr );
-                set16_fx( acelp_cfg->AVQ_cdk_bits, bit_tmp, nb_subfr );
-                bits = sub( bits, i_mult( bit_tmp, nb_subfr ) );
-
-                bit_tmp = bits % nb_subfr;
-                move16();
-                acelp_cfg->AVQ_cdk_bits[0] = add( acelp_cfg->AVQ_cdk_bits[0], bit_tmp );
-                move16();
-                bits = sub( bits, bit_tmp );
-            }
-        }
-    }
-    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) || ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) || ( coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )
-    {
-        Word32 Local_BR, Pitch_BR;
-        Word16 Pitch_CT;
-
-        /* as defined at the beginning of [enc,dec]_pit_exc() */
-        test();
-        test();
-        IF( GSC_IVAS_mode > 0 && ( GSC_noisy_speech || GT_32( core_brate, GSC_H_RATE_STG ) ) )
-        {
-            Local_BR = ACELP_8k00;
-            move32();
-            Pitch_CT = GENERIC;
-            move16();
-            Pitch_BR = ACELP_8k00;
-            move32();
-            IF( EQ_16( L_frame, L_FRAME16k ) )
-            {
-                Local_BR = ACELP_14k80;
-                move32();
-                test();
-                if ( GSC_IVAS_mode > 0 && LT_32( core_brate, IVAS_24k4 ) )
-                {
-                    Local_BR = ACELP_9k60;
-                    move32();
-                }
-                Pitch_BR = core_brate;
-                move32();
-            }
-        }
-        ELSE IF( GSC_noisy_speech )
-        {
-            Local_BR = ACELP_7k20;
-            move32();
-            Pitch_CT = GENERIC;
-            move16();
-            Pitch_BR = ACELP_7k20;
-            move32();
-            if ( EQ_16( L_frame, L_FRAME16k ) )
-            {
-                Pitch_BR = core_brate;
-                move32();
-            }
-        }
-        ELSE
-        {
-            Local_BR = ACELP_7k20;
-            move32();
-            Pitch_CT = AUDIO;
-            move16();
-            Pitch_BR = core_brate;
-            move32();
-
-            IF( EQ_16( L_frame, L_FRAME16k ) )
-            {
-                Local_BR = ACELP_13k20;
-                move32();
-                Pitch_CT = GENERIC;
-                move16();
-            }
-        }
-
-        FOR( i = 0; i < nb_subfr; i++ )
-        {
-            IF( EQ_16( L_frame, L_FRAME16k ) )
-            {
-                acelp_cfg->pitch_bits[i] = ACB_bits_16kHz_tbl[BIT_ALLOC_IDX_16KHZ_fx( Pitch_BR, Pitch_CT, i_mult( i, L_SUBFR ), 0 )];
-                move16();
-                acelp_cfg->fixed_cdk_index[i] = FCB_bits_tbl[BIT_ALLOC_IDX_fx( Local_BR, LOCAL_CT, i_mult( i, L_SUBFR ), 0 )];
-                move16();
-            }
-            ELSE
-            {
-                acelp_cfg->pitch_bits[i] = ACB_bits_tbl[BIT_ALLOC_IDX_fx( Pitch_BR, Pitch_CT, i_mult( i, L_SUBFR ), 0 )];
-                move16();
-                acelp_cfg->fixed_cdk_index[i] = FCB_bits_tbl[BIT_ALLOC_IDX_fx( Local_BR, LOCAL_CT, i_mult( i, L_SUBFR ), 0 )];
-                move16();
-                acelp_cfg->gains_mode[i] = gain_bits_tbl[BIT_ALLOC_IDX_fx( ACELP_7k20, LOCAL_CT, i_mult( i, L_SUBFR ), 0 )];
-                move16();
-            }
-        }
-    }
-
-    test();
-    test();
-    test();
-    IF( EQ_16( coder_type, TRANSITION ) && ( EQ_16( tc_call, 1 ) && tc_subfr == 0 && EQ_16( L_frame, L_FRAME ) ) )
-    {
-        return error;
-    }
-
-    /*-----------------------------------------------------------------*
-     * unused bits handling
-     *-----------------------------------------------------------------*/
-
-    acelp_cfg->ubits = 0; /* these bits could be reused for something else */
-    move16();
-
-    test();
-    IF( flag_hardcoded && NE_32( core_brate, PPP_NELP_2k80 ) )
-    {
-        test();
-        test();
-        /* unused bits */
-        IF( EQ_16( coder_type, AUDIO ) || ( coder_type == INACTIVE && LE_32( core_brate, ACELP_24k40 ) ) )
-        {
-            acelp_cfg->ubits = 0;
-            move16();
-        }
-        ELSE IF( EQ_16( L_frame, L_FRAME ) )
-        {
-            acelp_cfg->ubits = reserved_bits_tbl[BIT_ALLOC_IDX_fx( core_brate, coder_type, -1, TC_SUBFR2IDX_fx( tc_subfr ) )];
-            move16();
-        }
-        ELSE
-        {
-            acelp_cfg->ubits = 0;
-            move16();
-        }
-
-        bits = sub( bits, acelp_cfg->ubits );
-    }
-
-    /* sanity check */
-    test();
-    test();
-    test();
-    IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) || EQ_16( nb_subfr, NB_SUBFR16k ) )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) || ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* GSC Inactive @16kHz */
-        {
-            acelp_cfg->ubits = 0;
-            move16();
-        }
-        ELSE IF( flag_hardcoded && core == ACELP_CORE && bits != 0 )
-        {
-#ifdef DEBUGGING
-            IVAS_ERROR( IVAS_ERR_INTERNAL, "ERROR: bit-budget incorrect (%d bits) in frame %d.\n", (Word32) bits );
-#endif
-        }
-        ELSE IF( bits > 0 && !( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            IF( idchan > 0 && EQ_16( element_mode, IVAS_CPE_TD ) )
-            {
-                IF( !tdm_lp_reuse_flag )
-                {
-                    acelp_cfg->lsf_bits = add( acelp_cfg->lsf_bits, bits ); /* increase LSF Q bits */
-                    move16();
-                    bits = 0;
-                    move16();
-                }
-                ELSE
-                {
-                    Word16 nb_prm = 4;
-                    move16();
-                    if ( EQ_16( tdm_low_rate_mode, 1 ) )
-                    {
-                        nb_prm = 2;
-                        move16();
-                    }
-                    /* First add remaining bits on gains */
-                    bits = sub( bits, allocate_unused( core_brate, coder_type, bits, nb_prm, 0, GAINSPRM, acelp_cfg->gains_mode ) );
-
-                    /* Then, Increase pitch bit budget */
-                    test();
-                    IF( tdm_Pitch_reuse_flag == 0 && bits > 0 )
-                    {
-                        bits = sub( bits, allocate_unused( core_brate, coder_type, bits, nb_prm, 0, PITCHPRM, acelp_cfg->pitch_bits ) );
-                    }
-
-                    /* Increase mid-lsf bit budget */
-                    test();
-                    IF( tdm_lp_reuse_flag == 0 && bits > 0 )
-                    {
-                        bits = sub( bits, allocate_unused( core_brate, coder_type, bits, 1, 0, MID_LSFSPRM, &acelp_cfg->mid_lsf_bits ) );
-                        bits = sub( bits, allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits ) );
-                    }
-                }
-
-#ifdef DEBUGGING
-                if ( idchan > 0 && bits > 0 && ( coder_type > UNVOICED || tdm_low_rate_mode == 0 ) )
-                {
-                    IVAS_ERROR( IVAS_ERR_INTERNAL, "WARNING !! Unused bits in secondary channel at frame %d\n" );
-                }
-#endif
-            }
-
-            ELSE IF( core == ACELP_CORE && GE_16( coder_type, UNVOICED ) && LE_16( coder_type, GENERIC ) && EQ_16( L_frame, L_FRAME ) )
-            {
-                acelp_cfg->lsf_bits = add( acelp_cfg->lsf_bits, bits ); /* increase LSF Q bits */
-                move16();
-
-                test();
-                IF( GT_16( acelp_cfg->lsf_bits, 46 ) )
-                {
-                    acelp_cfg->ubits = sub( acelp_cfg->lsf_bits, 46 );
-                    move16();
-                    acelp_cfg->lsf_bits = 46;
-                    move16();
-                }
-                ELSE IF( GT_16( acelp_cfg->lsf_bits, 42 ) && EQ_16( L_frame, L_FRAME ) )
-                {
-                    acelp_cfg->ubits = sub( acelp_cfg->lsf_bits, 42 );
-                    move16();
-                    acelp_cfg->lsf_bits = 42;
-                    move16();
-                }
-            }
-            ELSE
-            {
-                acelp_cfg->ubits = bits;
-                move16();
-            }
-        }
-        ELSE IF( bits < 0 && !( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) )
-        {
-#ifdef DEBUGGING
-            IVAS_ERROR( IVAS_ERR_INTERNAL, "ERROR: bit-budget incorrect (%d bits) in frame %d.\n", (Word32) bits );
-#endif
-        }
-    }
-
-    return error;
-}
 
 /*-------------------------------------------------------------------*
- * config_acelp1_IVAS()
+ * config_acelp1_fx()
  *
  * Configure ACELP bit allocation
  *   - should be in range of <6700; 24350> for ACELP@12.8kHz
  *   - per channel bitrate minimum is 13250 kbps for ACELP@16kHz
  *--------------------------------------------------------------------*/
 
-ivas_error config_acelp1_IVAS(
-    const Word16 enc_dec,              /* i  : encoder/decoder flag            */
-    const Word32 total_brate,          /* i  : total bitrate                   */
-    const Word32 core_brate_inp,       /* i  : core bitrate                    */
-    const Word16 core,                 /* i  : core                            */
-    const Word16 extl,                 /* i  : extension layer                 */
-    const Word32 extl_brate,           /* i  : extension layer bitrate         */
-    const Word16 L_frame,              /* i  : frame length at internal Fs     */
-    const Word16 GSC_noisy_speech,     /* i  : GSC on SWB noisy speech flag    */
-    ACELP_config *acelp_cfg,           /* i  : ACELP bit-allocation            */
-    const Word16 signaling_bits,       /* i  : number of signaling bits        */
-    const Word16 coder_type,           /* i  : coder type                      */
-    const Word16 tc_subfr,             /* i  : TC subfr ID                     */
-    const Word16 tc_call,              /* i  : TC call number (0,1,2,3,5(DEC)) */
-    Word16 *nBits_es_Pred,             /* o  : number of bits for Es_pred Q    */
-    Word16 *unbits,                    /* o  : number of unused bits           */
-    const Word16 element_mode,         /* i  : element mode                    */
-    Word16 *uc_two_stage_flag,         /* o  : flag undicating two-stage UC    */
-    const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag (can be 1 only with secondary channel */
-    const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag */
-    const Word16 idchan,               /* i  : stereo channel ID               */
-    const Word16 active_cnt,           /* i  : Active frame counter            */
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/
-    const Word16 tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */
-    const Word16 GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
+ivas_error config_acelp1_fx(
+    const Word16 enc_dec,                  /* i  : encoder/decoder flag            */
+    const Word32 total_brate,              /* i  : total bitrate                   */
+    const Word32 core_brate_inp,           /* i  : core bitrate                    */
+    const Word16 core,                     /* i  : core                            */
+    const Word16 extl,                     /* i  : extension layer                 */
+    const Word32 extl_brate,               /* i  : extension layer bitrate         */
+    const Word16 L_frame,                  /* i  : frame length at internal Fs     */
+    const Word16 GSC_noisy_speech,         /* i  : GSC on SWB noisy speech flag    */
+    ACELP_config *acelp_cfg,               /* i  : ACELP bit-allocation            */
+    const Word16 signaling_bits,           /* i  : number of signaling bits        */
+    const Word16 coder_type,               /* i  : coder type                      */
+    const Word16 inactive_coder_type_flag, /* i  : AVQ (0) or GSC (1) IC flag      */
+    const Word16 tc_subfr,                 /* i  : TC subfr ID                     */
+    const Word16 tc_call,                  /* i  : TC call number (0,1,2,3,5(DEC)) */
+    Word16 *nBits_es_Pred,                 /* o  : number of bits for Es_pred Q    */
+    Word16 *unbits,                        /* o  : number of unused bits           */
+    const Word16 element_mode,             /* i  : element mode                    */
+    Word16 *uc_two_stage_flag,             /* o  : flag undicating two-stage UC    */
+    const Word16 tdm_lp_reuse_flag,        /* i  : LPC reuse flag (can be 1 only with secondary channel */
+    const Word16 tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag */
+    const Word16 idchan,                   /* i  : stereo channel ID               */
+    const Word16 active_cnt,               /* i  : Active frame counter            */
+    const Word16 tdm_Pitch_reuse_flag,     /* i  : primary channel pitch reuse flag*/
+    const Word16 tdm_LRTD_flag,            /* i  : LRTD stereo mode flag           */
+    const Word16 GSC_IVAS_mode             /* i  : GSC IVAS mode                   */
 )
 {
     Word16 i, bits, nb_subfr;
@@ -2168,8 +894,9 @@ ivas_error config_acelp1_IVAS(
         test();
         test();
         test();
-        /* gain Q bit-budget - part 1 */
-        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && ( coder_type != INACTIVE ) && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) || ( ( coder_type == INACTIVE ) && GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )
+        /* gain Q bit-budget - part 1: 'Es_pred' of memory-less gain Q */
+        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && coder_type != INACTIVE && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) /* mid bitrates in GC and VC, low+mid bitrates in TC */ ||
+            ( coder_type == INACTIVE && !inactive_coder_type_flag ) /* AVQ inactive */ )
         {
             *nBits_es_Pred = Es_pred_bits_tbl[BIT_ALLOC_IDX( core_brate, coder_type, -1, -1 )];
             move16();
@@ -2294,7 +1021,7 @@ ivas_error config_acelp1_IVAS(
     {
         test();
         test();
-        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) /* GSC Inactive @16kHz */
+        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && inactive_coder_type_flag ) /* GSC Inactive @16kHz */
         {
             acelp_cfg->ltf_mode = FULL_BAND;
             move16();
@@ -2497,11 +1224,11 @@ ivas_error config_acelp1_IVAS(
 
         IF( GE_16( bits, 16 ) )
         {
-            acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
+            acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
         }
         ELSE
         {
-            acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
+            acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, 2, 2 * L_SUBFR, GENERIC, -1, 0 );
             acelp_cfg->fixed_cdk_index[1] = -1;
             move16();
         }
@@ -2510,7 +1237,9 @@ ivas_error config_acelp1_IVAS(
         acelp_cfg->fixed_cdk_index[3] = -1;
         move16();
     }
-    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) || coder_type != INACTIVE ) ) || EQ_16( core, HQ_CORE ) )
+    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) /* @12.8kHz core except of GSC */ ||
+             ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( !inactive_coder_type_flag || coder_type != INACTIVE ) ) /* @16kHz core GC, TC, AVQ inactive */ ||
+             EQ_16( core, HQ_CORE ) /* ACELP -> HQ switching in EVS */ )
     {
         /* pitch Q & gain Q bit-budget - part 2*/
         FOR( i = 0; i < nb_subfr; i++ )
@@ -2574,7 +1303,9 @@ ivas_error config_acelp1_IVAS(
         test();
         test();
         /* algebraic codebook bit-budget */
-        IF( flag_hardcoded || ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )
+        IF( flag_hardcoded /* EVS */ ||
+            ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) /* high-birate ACELP except IC */ ||
+            ( !inactive_coder_type_flag && coder_type == INACTIVE ) /* AVQ inactive */ )
         {
             FOR( i = 0; i < nb_subfr; i++ )
             {
@@ -2616,17 +1347,17 @@ ivas_error config_acelp1_IVAS(
                 {
                     IF( GE_16( bits, imult1616( ACELP_FIXED_CDK_BITS( 0 ), nb_subfr ) ) ) /* enough bits for all fcb */
                     {
-                        acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
+                        acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
                     }
                     ELSE IF( GE_16( bits, imult1616( ACELP_FIXED_CDK_BITS( 0 ), sub( nb_subfr, 1 ) ) ) )
                     {
-                        acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, sub( nb_subfr, 1 ), L_SUBFR, coder_type, tc_subfr, fix_first );
+                        acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, sub( nb_subfr, 1 ), L_SUBFR, coder_type, tc_subfr, fix_first );
                         acelp_cfg->fixed_cdk_index[3] = -1;
                         move16();
                     }
                     ELSE IF( GE_32( bits, imult1616( ACELP_FIXED_CDK_BITS( 0 ), sub( nb_subfr, 2 ) ) ) )
                     {
-                        acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, sub( nb_subfr, 2 ), L_SUBFR, coder_type, tc_subfr, fix_first );
+                        acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, sub( nb_subfr, 2 ), L_SUBFR, coder_type, tc_subfr, fix_first );
                         acelp_cfg->fixed_cdk_index[2] = acelp_cfg->fixed_cdk_index[1];
                         move16();
                         acelp_cfg->fixed_cdk_index[1] = -1;
@@ -2636,7 +1367,7 @@ ivas_error config_acelp1_IVAS(
                     }
                     ELSE IF( GE_32( bits, ACELP_FIXED_CDK_BITS( 0 ) ) )
                     {
-                        acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, 1, L_SUBFR, coder_type, tc_subfr, fix_first );
+                        acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, 1, L_SUBFR, coder_type, tc_subfr, fix_first );
                         acelp_cfg->fixed_cdk_index[1] = acelp_cfg->fixed_cdk_index[0];
                         move16();
                         acelp_cfg->fixed_cdk_index[0] = -1;
@@ -2662,11 +1393,11 @@ ivas_error config_acelp1_IVAS(
                 {
                     bits = 100; /* 9 kbps for fcb */
                     move16();
-                    acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
+                    acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
                 }
                 ELSE
                 {
-                    acelp_FCB_allocator_ivas( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
+                    acelp_FCB_allocator_fx( &bits, acelp_cfg->fixed_cdk_index, nb_subfr, L_SUBFR, coder_type, tc_subfr, fix_first );
                 }
             }
         }
@@ -2675,7 +1406,8 @@ ivas_error config_acelp1_IVAS(
         test();
         test();
         /* AVQ codebook */
-        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )
+        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) /* high-birate ACELP except IC */ ||
+            ( !inactive_coder_type_flag && coder_type == INACTIVE ) /* AVQ inactive */ )
         {
             FOR( i = 0; i < nb_subfr; i++ )
             {
@@ -2713,7 +1445,9 @@ ivas_error config_acelp1_IVAS(
             }
         }
     }
-    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) || ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) || ( coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )
+    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) /* LBR secondary channel in TD stereo */ ||
+             ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) /* GSC @12.8kHz */ ||
+             ( coder_type == INACTIVE && inactive_coder_type_flag ) /* AVQ inactive */ )
     {
         Word32 Local_BR, Pitch_BR;
         Word16 Pitch_CT;
@@ -2854,7 +1588,8 @@ ivas_error config_acelp1_IVAS(
         test();
         test();
         test();
-        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) || ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* GSC Inactive @16kHz */
+        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && inactive_coder_type_flag ) /* GSC Inactive @16kHz */ ||
+            ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* IVAS GSC @16kHz */
         {
             acelp_cfg->ubits = 0;
             move16();
@@ -3189,4 +1924,3 @@ Word16 set_ACELP_flag_IVAS(
         return 0;
     }
 }
-/*#endif IVAS_CODE*/
diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index 9e61c257137e4a830833d5ba88388992917bc5c1..3850001396096f7b9ae5a1b1b56cbcf32186fad6 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,13 +38,11 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "stat_enc.h"
 #include "stat_dec.h"
 #include "rom_com.h"
 #include "mime.h"
-#include "ivas_prot.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
@@ -102,7 +100,7 @@ static Word16 rate2AMRWB_IOmode(
  *-------------------------------------------------------------------*/
 Word16 rate2EVSmode_float(
     const Word32 brate, /* i  : bitrate                                               */
-    int16_t *is_amr_wb  /* o  : (flag) does the bitrate belong to AMR-WB? Can be NULL */
+    Word16 *is_amr_wb   /* o  : (flag) does the bitrate belong to AMR-WB? Can be NULL */
 )
 {
     if ( is_amr_wb != NULL )
@@ -577,8 +575,8 @@ Word16 get_ivas_max_num_indices_fx(
  *-----------------------------------------------------------------------*/
 
 /*! r: maximum number of indices */
-int16_t get_BWE_max_num_indices(
-    const int32_t extl_brate /* i  : extensiona layer bitrate  */
+Word16 get_BWE_max_num_indices(
+    const Word32 extl_brate /* i  : extensiona layer bitrate  */
 )
 {
     /* set the maximum number of indices in the BWE */
@@ -789,10 +787,10 @@ Word16 get_ivas_max_num_indices_metadata_fx(
 void move_indices(
     INDICE_HANDLE old_ind_list, /* i/o: old location of indices */
     INDICE_HANDLE new_ind_list, /* i/o: new location of indices */
-    const int16_t nb_indices    /* i  : number of moved indices */
+    const Word16 nb_indices     /* i  : number of moved indices */
 )
 {
-    int16_t i;
+    Word16 i;
 
     if ( new_ind_list < old_ind_list )
     {
@@ -1094,14 +1092,14 @@ ivas_error push_next_bits(
  *-------------------------------------------------------------------*/
 
 /*! r: result: index of the indice in the list, -1 if not found */
-int16_t find_indice(
+Word16 find_indice(
     BSTR_ENC_HANDLE hBstr, /* i  : encoder bitstream handle                    */
-    const int16_t id,      /* i  : ID of the indice                            */
-    uint16_t *value,       /* o  : value of the quantized indice               */
-    int16_t *nb_bits       /* o  : number of bits used to quantize the indice  */
+    const Word16 id,       /* i  : ID of the indice                            */
+    UWord16 *value,        /* o  : value of the quantized indice               */
+    Word16 *nb_bits        /* o  : number of bits used to quantize the indice  */
 )
 {
-    int16_t i;
+    Word16 i;
 
     for ( i = 0; i < hBstr->nb_ind_tot; i++ )
     {
@@ -1124,12 +1122,12 @@ int16_t find_indice(
  *-------------------------------------------------------------------*/
 
 /*! r: number of deleted indices */
-uint16_t delete_indice(
+UWord16 delete_indice(
     BSTR_ENC_HANDLE hBstr, /* i  : encoder bitstream handle                    */
-    const int16_t id       /* i  : ID of the indice                            */
+    const Word16 id        /* i  : ID of the indice                            */
 )
 {
-    int16_t i, j;
+    Word16 i, j;
 
     j = 0;
     for ( i = 0; i < hBstr->nb_ind_tot; i++ )
@@ -1170,14 +1168,14 @@ uint16_t delete_indice(
  *-------------------------------------------------------------------*/
 
 /*! r: value of the indice */
-uint16_t get_next_indice(
+UWord16 get_next_indice(
     Decoder_State *st, /* i/o: decoder state structure                               */
-    int16_t nb_bits    /* i  : number of bits that were used to quantize the indice  */
+    Word16 nb_bits     /* i  : number of bits that were used to quantize the indice  */
 )
 {
-    uint16_t value;
-    int16_t i;
-    int32_t nbits_total;
+    UWord16 value;
+    Word16 i;
+    Word32 nbits_total;
 
     assert( nb_bits <= 16 );
 
@@ -1209,11 +1207,11 @@ uint16_t get_next_indice(
  *-------------------------------------------------------------------*/
 
 /*! r: value of the indice */
-uint16_t get_next_indice_1(
+UWord16 get_next_indice_1(
     Decoder_State *st /* i/o: decoder state structure   */
 )
 {
-    int32_t nbits_total;
+    Word32 nbits_total;
     nbits_total = st->total_brate / FRAMES_PER_SEC;
     /* detect corrupted bitstream */
     if ( ( st->next_bit_pos + 1 > nbits_total && st->codec_mode == MODE1 ) ||
@@ -1235,7 +1233,7 @@ uint16_t get_next_indice_1(
 
 void get_next_indice_tmp(
     Decoder_State *st, /* o  : decoder state structure                              */
-    int16_t nb_bits    /* i  : number of bits that were used to quantize the indice */
+    Word16 nb_bits     /* i  : number of bits that were used to quantize the indice */
 )
 {
     /* update the position in the bitstream */
@@ -1251,15 +1249,15 @@ void get_next_indice_tmp(
  *-------------------------------------------------------------------*/
 
 /*! r: value of the indice */
-uint16_t get_indice(
+UWord16 get_indice(
     Decoder_State *st, /* i/o: decoder state structure                                    */
-    int16_t pos,       /* i  : absolute position in the bitstream (update after the read) */
-    int16_t nb_bits    /* i  : number of bits that were used to quantize the indice       */
+    Word16 pos,        /* i  : absolute position in the bitstream (update after the read) */
+    Word16 nb_bits     /* i  : number of bits that were used to quantize the indice       */
 )
 {
-    uint16_t value;
-    int16_t i;
-    int32_t nbits_total;
+    UWord16 value;
+    Word16 i;
+    Word32 nbits_total;
 
     assert( nb_bits <= 16 );
 
@@ -1320,33 +1318,6 @@ UWord16 get_indice_st(
 }
 #define WMC_TOOL_SKIP
 
-/*-------------------------------------------------------------------*
- * reset_indices_enc()
- *
- * Reset the buffer of encoder indices
- *-------------------------------------------------------------------*/
-
-void reset_indices_enc(
-    BSTR_ENC_HANDLE hBstr,       /* i/o: encoder bitstream handle    */
-    const Word16 max_num_indices /* i  : max number of indices       */
-)
-{
-    Word16 i;
-
-    hBstr->nb_bits_tot = 0;
-    move16();
-    hBstr->nb_ind_tot = 0;
-    move16();
-
-    FOR( i = 0; i < max_num_indices; i++ )
-    {
-        hBstr->ind_list[i].nb_bits = -1;
-        move16();
-    }
-
-    return;
-}
-
 /*-------------------------------------------------------------------*
  * reset_indices_dec()
  *
@@ -1535,21 +1506,21 @@ static ivas_error write_indices_element_fx(
     {
         IF( st_ivas->hSCE[element_id]->hMetaData != NULL )
         {
-            reset_indices_enc( st_ivas->hSCE[element_id]->hMetaData, st_ivas->hSCE[element_id]->hMetaData->nb_ind_tot );
+            reset_indices_enc_fx( st_ivas->hSCE[element_id]->hMetaData, st_ivas->hSCE[element_id]->hMetaData->nb_ind_tot );
         }
 
-        reset_indices_enc( sts[0]->hBstr, sts[0]->hBstr->nb_ind_tot );
+        reset_indices_enc_fx( sts[0]->hBstr, sts[0]->hBstr->nb_ind_tot );
     }
     ELSE
     {
         IF( st_ivas->hCPE[element_id]->hMetaData != NULL )
         {
-            reset_indices_enc( st_ivas->hCPE[element_id]->hMetaData, st_ivas->hCPE[element_id]->hMetaData->nb_ind_tot );
+            reset_indices_enc_fx( st_ivas->hCPE[element_id]->hMetaData, st_ivas->hCPE[element_id]->hMetaData->nb_ind_tot );
         }
 
         FOR( n = 0; n < n_channels; n++ )
         {
-            reset_indices_enc( sts[n]->hBstr, sts[n]->hBstr->nb_ind_tot );
+            reset_indices_enc_fx( sts[n]->hBstr, sts[n]->hBstr->nb_ind_tot );
         }
     }
 
@@ -1613,9 +1584,9 @@ ivas_error write_indices_ivas_fx(
  *-------------------------------------------------------------------*/
 
 static void decoder_selectCodec(
-    Decoder_State *st,         /* i/o: decoder state structure                */
-    const int32_t total_brate, /* i  : total bitrate                          */
-    const int16_t bit0         /* i  : first bit                              */
+    Decoder_State *st,        /* i/o: decoder state structure                */
+    const Word32 total_brate, /* i  : total bitrate                          */
+    const Word16 bit0         /* i  : first bit                              */
 )
 {
     /* set the AMR-WB IO flag */
@@ -1689,281 +1660,6 @@ static void decoder_selectCodec(
     return;
 }
 
-/*-------------------------------------------------------------------*
- * dec_prm_core()
- *
- *
- *-------------------------------------------------------------------*/
-
-static void dec_prm_core(
-    Decoder_State *st )
-{
-    int16_t n, frame_size_index = -1;
-
-    st->core = -1;
-
-    if ( st->total_brate == FRAME_NO_DATA )
-    {
-        st->m_frame_type = ZERO_FRAME;
-    }
-    else if ( st->total_brate == SID_2k40 )
-    {
-        st->m_frame_type = SID_FRAME;
-    }
-    else
-    {
-        st->m_frame_type = ACTIVE_FRAME;
-        for ( n = 0; n < FRAME_SIZE_NB; ++n )
-        {
-            if ( FrameSizeConfig[n].frame_bits == st->total_brate / FRAMES_PER_SEC )
-            {
-                frame_size_index = n;
-                break;
-            }
-        }
-
-        /* Get audio bandwidth info */
-        st->bwidth = get_next_indice( st, FrameSizeConfig[frame_size_index].bandwidth_bits );
-        st->bwidth += FrameSizeConfig[frame_size_index].bandwidth_min;
-        if ( st->bwidth > FB )
-        {
-            st->bwidth = FB;
-            st->BER_detect = 1;
-        }
-
-        if ( st->bwidth > SWB && st->total_brate < ACELP_16k40 )
-        {
-            st->bwidth = SWB;
-            st->BER_detect = 1;
-        }
-        /* Skip reserved bit */
-        get_next_indice_tmp( st, FrameSizeConfig[frame_size_index].reserved_bits );
-
-        if ( get_next_indice_1( st ) ) /* TCX */
-        {
-            if ( get_next_indice_1( st ) )
-            {
-                st->core = HQ_CORE;
-            }
-            else
-            {
-                st->core = TCX_20_CORE;
-            }
-        }
-        else /* ACELP */
-        {
-            st->core = ACELP_CORE;
-        }
-    }
-
-    return;
-}
-
-/*-----------------------------------------------------------------*
- * decision_matrix_core_dec()
- *
- * Read core signaling bits from the bitstream
- * Set st->core, and st->bwidth if signalled together with the core.
- *-----------------------------------------------------------------*/
-
-static void decision_matrix_core_dec(
-    Decoder_State *st /* i/o: decoder state structure                   */
-)
-{
-    int16_t start_idx;
-    int32_t ind;
-    int16_t nBits;
-
-    assert( st->bfi != 1 );
-
-    st->core = -1;
-    st->bwidth = -1;
-
-    if ( st->total_brate == FRAME_NO_DATA || st->total_brate == SID_2k40 )
-    {
-        st->core = ACELP_CORE;
-    }
-    /* SC-VBR */
-    else if ( st->total_brate == PPP_NELP_2k80 )
-    {
-        st->core = ACELP_CORE;
-        return;
-    }
-
-    /*---------------------------------------------------------------------*
-     * ACELP/HQ core selection
-     *---------------------------------------------------------------------*/
-
-    if ( st->total_brate < ACELP_24k40 )
-    {
-        st->core = ACELP_CORE;
-    }
-    else if ( st->total_brate >= ACELP_24k40 && st->total_brate <= ACELP_64k )
-    {
-        /* read the ACELP/HQ core selection bit */
-        st->core = get_next_indice( st, 1 ) * HQ_CORE;
-    }
-    else
-    {
-        st->core = HQ_CORE;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Read ACELP signaling bits from the bitstream
-     *-----------------------------------------------------------------*/
-
-    if ( st->core == ACELP_CORE )
-    {
-        /* find the section in the ACELP signaling table corresponding to bitrate */
-        start_idx = 0;
-        while ( acelp_sig_tbl[start_idx] != st->total_brate )
-        {
-            start_idx++;
-        }
-
-        /* skip the bitrate */
-        start_idx += 1;
-
-        /* retrieve the number of bits */
-        nBits = (int16_t) acelp_sig_tbl[start_idx++];
-
-        /* retrieve the signaling indice */
-        ind = acelp_sig_tbl[start_idx + get_next_indice( st, nBits )];
-        st->bwidth = ( ind >> 3 ) & 0x7;
-
-        /* convert signaling indice into signaling information */
-        if ( ( ind & 0x7 ) == LR_MDCT )
-        {
-            st->core = HQ_CORE;
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Read HQ signaling bits from the bitstream
-     * Set HQ core type
-     *-----------------------------------------------------------------*/
-
-    if ( st->core == HQ_CORE )
-    {
-        /* read the HQ/TCX core switching flag */
-        if ( get_next_indice( st, 1 ) )
-        {
-            st->core = TCX_20_CORE;
-        }
-
-        /* For TCX: read/set band-width (needed for different I/O sampling rate support) */
-        if ( st->core == TCX_20_CORE && st->total_brate > ACELP_16k40 )
-        {
-            ind = get_next_indice( st, 2 );
-
-            if ( ind == 0 )
-            {
-                st->bwidth = NB;
-            }
-            else if ( ind == 1 )
-            {
-                st->bwidth = WB;
-            }
-            else if ( ind == 2 )
-            {
-                st->bwidth = SWB;
-            }
-            else
-            {
-                st->bwidth = FB;
-            }
-        }
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * mdct_switching_dec()
- *
- * Set up MDCT core switching if indicated in the bitstream
- *-------------------------------------------------------------------*/
-
-void mdct_switching_dec(
-    Decoder_State *st /* i/o: decoder state structure     */
-)
-{
-    if ( !st->bfi )
-    {
-
-        if ( st->Opt_AMR_WB )
-        {
-            return;
-        }
-
-
-        if ( st->total_brate == ACELP_13k20 || st->total_brate == ACELP_32k )
-        {
-            st->mdct_sw_enable = MODE1;
-        }
-        else if ( ACELP_16k40 <= st->total_brate && st->total_brate <= ACELP_24k40 )
-        {
-            st->mdct_sw_enable = MODE2;
-        }
-
-        if ( st->codec_mode == MODE1 && st->mdct_sw_enable == MODE1 )
-        {
-            /* Read ahead core signaling */
-            int16_t next_bit_pos_save = st->next_bit_pos;
-            int16_t core_save = st->core;
-            int16_t bwidth_save = st->bwidth;
-
-            decision_matrix_core_dec( st ); /* sets st->core */
-
-            if ( st->core == TCX_20_CORE )
-            {
-                /* Trigger TCX */
-                st->codec_mode = MODE2;
-                st->mdct_sw = MODE1;
-            }
-            else
-            {
-                /* Rewind bitstream */
-                st->next_bit_pos = next_bit_pos_save;
-                if ( st->bfi )
-                {
-                    st->core = core_save;
-                    st->bwidth = bwidth_save;
-                }
-            }
-        }
-        else if ( st->codec_mode == MODE2 && st->mdct_sw_enable == MODE2 )
-        {
-            /* Read ahead core signaling */
-            int16_t next_bit_pos_save = st->next_bit_pos;
-            int16_t core_save = st->core;
-            int16_t bwidth_save = st->bwidth;
-
-            dec_prm_core( st ); /* sets st->core */
-
-            if ( st->core == HQ_CORE )
-            {
-                /* Trigger HQ_CORE */
-                st->codec_mode = MODE1;
-                st->mdct_sw = MODE2;
-            }
-            else
-            {
-                /* Rewind bitstream */
-                st->next_bit_pos = next_bit_pos_save;
-                if ( st->bfi )
-                {
-                    st->core = core_save;
-                }
-                /* always reset bwidth, to not interfere with BER logic */
-                st->bwidth = bwidth_save;
-            }
-        }
-    }
-
-    return;
-}
-
 
 /*-------------------------------------------------------------------*
  * reset_elements()
@@ -2028,7 +1724,7 @@ void ivas_set_bitstream_pointers(
     Decoder_Struct *st_ivas /* i/o: IVAS decoder structure    */
 )
 {
-    int16_t k, num_bits;
+    Word16 k, num_bits;
     Decoder_State **sts;
 
     num_bits = 0;
@@ -2038,7 +1734,7 @@ void ivas_set_bitstream_pointers(
     {
         sts = st_ivas->hSCE[k]->hCoreCoder;
         sts[0]->bit_stream = st_ivas->bit_stream + num_bits;
-        num_bits += (int16_t) ( st_ivas->hSCE[k]->element_brate / FRAMES_PER_SEC );
+        num_bits += (Word16) ( st_ivas->hSCE[k]->element_brate / FRAMES_PER_SEC );
     }
 
     /* set bitstream pointers for CPEs */
@@ -2046,7 +1742,7 @@ void ivas_set_bitstream_pointers(
     {
         sts = st_ivas->hCPE[k]->hCoreCoder;
         sts[0]->bit_stream = st_ivas->bit_stream + num_bits;
-        num_bits += (int16_t) ( st_ivas->hCPE[k]->element_brate / FRAMES_PER_SEC );
+        num_bits += (Word16) ( st_ivas->hCPE[k]->element_brate / FRAMES_PER_SEC );
     }
 
     return;
@@ -2061,67 +1757,84 @@ void ivas_set_bitstream_pointers(
  *-------------------------------------------------------------------*/
 
 /*! r: 1 = reading OK, 0 = problem */
-ivas_error read_indices(
+ivas_error read_indices_fx(
     Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure         */
-    uint16_t bit_stream[],   /* i  : bitstream buffer               */
+    UWord16 bit_stream[],    /* i  : bitstream buffer               */
     UWord16 num_bits,        /* i  : number of bits in bitstream    */
-    int16_t *prev_ft_speech,
-    int16_t *CNG,
-    int16_t bfi /* i  : bad frame indicator            */
+    Word16 *prev_ft_speech,
+    Word16 *CNG,
+    Word16 bfi /* i  : bad frame indicator            */
 )
 {
-    int16_t k;
+    Word16 k;
     Decoder_State **sts;
-    int32_t total_brate = 0;
-    int16_t curr_ft_good_sp, curr_ft_bad_sp;
-    int16_t g192_sid_first, sid_upd_bad, sid_update;
-    int16_t speech_bad, speech_lost;
-    int16_t n;
+    Word32 total_brate = 0;
+    move32();
+    Word16 curr_ft_good_sp, curr_ft_bad_sp;
+    Word16 g192_sid_first, sid_upd_bad, sid_update;
+    Word16 speech_bad, speech_lost;
+    Word16 n;
     ivas_error error;
 
     error = IVAS_ERR_OK;
+    move32();
 
     st_ivas->BER_detect = 0;
+    move16();
     st_ivas->num_bits = num_bits;
+    move16();
     sts = reset_elements( st_ivas );
 
     st_ivas->bfi = bfi;
+    move16();
 
     /* convert the frame length to total bitrate */
-    total_brate = (int32_t) ( num_bits * FRAMES_PER_SEC );
+    total_brate = imult3216( num_bits, FRAMES_PER_SEC );
+    move32();
 
     /*  verify that a  valid  num bits value  is present in the G.192 file */
     /*  only AMRWB, EVS or IVAS bitrates or 0(NO DATA) are  allowed  in G.192 file frame reading  */
-    if ( st_ivas->ivas_format != MONO_FORMAT )
+    IF( NE_32( st_ivas->ivas_format, MONO_FORMAT ) )
     {
         k = 0;
-        while ( k < SIZE_IVAS_BRATE_TBL && total_brate != ivas_brate_tbl[k] )
+        move16();
+
+        test();
+        WHILE( LT_16( k, SIZE_IVAS_BRATE_TBL ) && NE_32( total_brate, ivas_brate_tbl[k] ) )
         {
-            k++;
+            k = add( k, 1 );
         }
 
-        if ( st_ivas->ivas_format == ISM_FORMAT && ( k < SIZE_IVAS_BRATE_TBL || total_brate <= SID_2k40 ) )
+        test();
+        test();
+        test();
+        test();
+        IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) && ( LT_16( k, SIZE_IVAS_BRATE_TBL ) || LE_32( total_brate, SID_2k40 ) ) )
         {
             st_ivas->element_mode_init = IVAS_SCE;
+            move16();
         }
-        else if ( ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) && ( total_brate <= SID_2k40 ) )
+        ELSE IF( ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_FORMAT ) ) && LE_32( total_brate, SID_2k40 ) )
         {
             st_ivas->element_mode_init = IVAS_SCE;
+            move16();
         }
-        else if ( k == SIZE_IVAS_BRATE_TBL )
+        ELSE IF( EQ_16( k, SIZE_IVAS_BRATE_TBL ) )
         {
             return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) in the  G.192 frame ! Exiting ! \n", total_brate );
         }
-        else
+        ELSE
         {
             st_ivas->element_mode_init = -1;
+            move16();
         }
     }
-    else /* AMRWB or EVS */
+    ELSE /* AMRWB or EVS */
     {
         st_ivas->element_mode_init = EVS_MONO;
+        move16();
 
-        if ( rate2EVSmode_float( total_brate, NULL ) < 0 ) /* negative value means that a valid rate was not found */
+        IF( rate2EVSmode_float( total_brate, NULL ) < 0 ) /* negative value means that a valid rate was not found */
         {
             return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) in  the  G.192 frame ! Exiting ! \n", total_brate );
         }
@@ -2131,47 +1844,58 @@ ivas_error read_indices(
     /* handle SID_FIRST, SID_BAD, SPEECH_LOST,  NO_DATA as properly  as possible for the ITU-T  G.192 format  */
     /* (total_brate, bfi , st_CNG)   =  rx_handler(received frame type, [previous frame type],  past CNG state, past core) */
     curr_ft_good_sp = 0;
+    move16();
     curr_ft_bad_sp = 0;
+    move16();
 
-    if ( is_DTXrate( total_brate ) == 0 )
+    IF( is_DTXrate( total_brate ) == 0 )
     {
-        if ( st_ivas->bfi == 0 )
+        IF( st_ivas->bfi == 0 )
         {
             curr_ft_good_sp = 1;
+            move16();
         }
-        else
+        ELSE
         {
             curr_ft_bad_sp = 1;
+            move16();
         }
     }
 
     sid_update = 0;
+    move16();
     sid_upd_bad = 0;
-    if ( is_SIDrate( total_brate ) == 1 )
+    move16();
+    IF( EQ_16( is_SIDrate( total_brate ), 1 ) )
     {
-        if ( st_ivas->bfi == 0 )
+        IF( st_ivas->bfi == 0 )
         {
             sid_update = 1;
+            move16();
         }
-        else
+        ELSE
         {
             sid_upd_bad = 1; /* this frame type may happen in ETSI/3GPP CS cases, a corrupt SID frames  */
+            move16();
         }
     }
 
     /* all zero indices/bits iSP AMRWB SID_update results in a valid LP filter with extremely high LP-filter-gain  */
     /* all zero indices/bits  may be a result of CS bit errors  and/or  erroneously injected by gateways or by a bad dejitter handlers */
-    if ( total_brate == SID_1k75 && sid_update == 1 )
+    test();
+    IF( EQ_32( total_brate, SID_1k75 ) && EQ_16( sid_update, 1 ) )
     {
         /* valid sid_update received, check for very risky but formally valid content  */
-        int16_t sum = 0;
-        for ( k = 0; k < num_bits; ++k )
+        Word16 sum = 0;
+        move16();
+        FOR( k = 0; k < num_bits; ++k )
         {
-            sum += ( bit_stream[k] == 1 ); /*   check of 35 zeroes   */
+            sum = add( sum, extract_l( EQ_32( bit_stream[k], 1 ) ) ); /*   check of 35 zeroes   */
         }
         if ( sum == 0 )
         {                    /* all zeros  */
             sid_upd_bad = 1; /* initial signal as corrupt (BER likely)  */
+            move16();
         }
     }
 
@@ -2182,14 +1906,22 @@ ivas_error read_indices(
 
                       Here we inhibit use of the SID-length info, even though it is available in the G.192 file format after STL/EID-XOR .
                    */
-    if ( sid_upd_bad )
+    IF( sid_upd_bad )
     {
         sid_upd_bad = 0;
+        move16();
         total_brate = FRAME_NO_DATA; /* treat SID_BAD  as a  stolen signaling frame --> SPEECH LOST */
+        move32();
     }
 
     g192_sid_first = 0;
-    if ( st_ivas->ivas_format == MONO_FORMAT && sts[0]->core == AMR_WB_CORE && *prev_ft_speech && total_brate == FRAME_NO_DATA && st_ivas->bfi == 0 )
+    move16();
+
+    test();
+    test();
+    test();
+    test();
+    if ( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) && EQ_16( sts[0]->core, AMR_WB_CORE ) && *prev_ft_speech && total_brate == FRAME_NO_DATA && st_ivas->bfi == 0 )
     {
         g192_sid_first = 1; /*  SID_FIRST detected for previous AMRWB/AMRWBIO  active frames only  */
                             /* It is not possible to perfectly simulate rate switching conditions EVS->AMRWBIO  where:
@@ -2197,104 +1929,135 @@ ivas_error read_indices(
                                            and  a  good length 0  "SID_FIRST"(NO_DATA)   frame is sent in AMRWBIO,
                                            due to the one frame state memory in the AMRWB legacy  G.192 SID_FIRST encoding
                                          */
+        move16();
     }
 
     speech_bad = 0;
+    move16();
+
+    test();
     if ( st_ivas->bfi != 0 && ( is_DTXrate( total_brate ) == 0 ) )
     {
         speech_bad = 1; /* initial ft assumption, CNG_state decides what to do */
+        move16();
     }
 
     speech_lost = 0;
+    move16();
+
+    test();
     if ( total_brate == FRAME_NO_DATA && st_ivas->bfi != 0 ) /*  unsent  NO_DATA or stolen NO_DATA/signaling  frame  */
     {
         speech_lost = 1; /* initial ft assumption, CNG_state decides what to do */
+        move16();
     }
 
     /* Do not allow decoder to enter CNG-synthesis for  any instantly  received  GOOD+LENGTH==0  frame
                    as this frame was never transmitted, one  can not know it is good and has a a length of zero ) */
-    if ( *CNG != 0 )
+    IF( *CNG != 0 )
     {
         /* We were in CNG synthesis  */
         if ( curr_ft_good_sp != 0 )
         {
             /* only a good speech frame makes you leave CNG synthesis */
             *CNG = 0;
+            move16();
         }
     }
-    else
+    ELSE
     {
         /* We were in SPEECH synthesis  */
         /* only a received/detected SID frame can make the decoder enter into CNG synthsis  */
+        test();
+        test();
         if ( g192_sid_first || sid_update || sid_upd_bad )
         {
             *CNG = 1;
+            move16();
         }
     }
 
     /* set bfi, total_brate pair  for proper decoding  */
     /*  handle the  G.192   _simulated_ untransmitted NO_DATA frame,  setting  for decoder  SPEECH synthesis  */
+    test();
+    test();
     if ( *CNG == 0 && total_brate == FRAME_NO_DATA && st_ivas->bfi == 0 )
     {
         st_ivas->bfi = 1; /*  SPEECH PLC code will now become active as in a real system */
                           /* total_brate= 0  */
+        move16();
     }
 
     /* handle bad/lost speech frame(and CS bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
-    if ( (
-             bfi != FRAMEMODE_FUTURE &&
-             ( *CNG != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */
-         ( sid_upd_bad != 0 ) )                                                    /* SID_UPD_BAD              --> start CNG */
+    test();
+    test();
+    test();
+    test();
+    IF( (
+            NE_16( bfi, FRAMEMODE_FUTURE ) &&
+            ( *CNG != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */
+        ( sid_upd_bad != 0 ) )                                                    /* SID_UPD_BAD              --> start CNG */
     {
         st_ivas->bfi = 0; /* bfi=0 needed to activate CNG code */
+        move16();
         total_brate = FRAME_NO_DATA;
+        move32();
     }
 
     /* update for next frame's G.192 file format's  odd SID_FIRST detection (primarily for AMRWBIO)  */
+    test();
     *prev_ft_speech = ( ( curr_ft_good_sp != 0 ) || ( curr_ft_bad_sp != 0 ) );
+    move16();
 
     /*   st->total brate= total_brate;   updated in a good frame below */
 
-    for ( k = 0; k < st_ivas->nCPE; k++ )
+    FOR( k = 0; k < st_ivas->nCPE; k++ )
     {
         sts = st_ivas->hCPE[k]->hCoreCoder;
-        for ( n = 0; n < CPE_CHANNELS; n++ )
+        FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
             sts[n]->bfi = st_ivas->bfi;
+            move16();
         }
     }
 
-    for ( k = 0; k < st_ivas->nSCE; k++ )
+    FOR( k = 0; k < st_ivas->nSCE; k++ )
     {
         sts = st_ivas->hSCE[k]->hCoreCoder;
         sts[0]->bfi = st_ivas->bfi;
+        move16();
     }
 
-    if ( st_ivas->bfi == 0 )
+    IF( st_ivas->bfi == 0 )
     {
         /* select Mode 1 or Mode 2 */
-        if ( st_ivas->ivas_format == MONO_FORMAT ) /* EVS mono */
+        IF( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) ) /* EVS mono */
         {
             decoder_selectCodec( sts[0], total_brate, bit_stream[0] );
             st_ivas->hDecoderConfig->Opt_AMR_WB = sts[0]->Opt_AMR_WB;
+            move16();
         }
-        else /* IVAS */
+        ELSE /* IVAS */
         {
             st_ivas->codec_mode = MODE1;
+            move16();
             st_ivas->hDecoderConfig->Opt_AMR_WB = 0;
+            move16();
         }
     }
 
     /* GOOD frame */
-    if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE )
+    test();
+    if ( st_ivas->bfi == 0 || EQ_16( st_ivas->bfi, FRAMEMODE_FUTURE ) )
     {
         /* GOOD frame - convert ITU-T G.192 words to short values */
         st_ivas->hDecoderConfig->ivas_total_brate = total_brate;
+        move32();
     }
 
     st_ivas->bit_stream = bit_stream;
 
-    if ( st_ivas->ivas_format == MONO_FORMAT )
+    IF( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) )
     {
         ivas_set_bitstream_pointers( st_ivas );
     }
diff --git a/lib_com/bitstream_fx.c b/lib_com/bitstream_fx.c
index 1acf69c2ab60437244c65c92cde2df396f7fa7ef..2b66f92cd7ba3352cf0979ffa6b6a23896ac9199 100644
--- a/lib_com/bitstream_fx.c
+++ b/lib_com/bitstream_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -52,8 +52,7 @@
 
 int16_t FEC_seed = 12558; /* Seed for random FEC generator */
 FILE *FEC_pattern = NULL; /* FEC pattern file (for simulation of FEC) */
-#ifndef IVAS_CODE
-float FEC_random = 0; /* FEC rate in percent (for simulation of FEC) */
+float FEC_random = 0;     /* FEC rate in percent (for simulation of FEC) */
 /*-------------------------------------------------------------------*
  * file_read_FECpattern()
  *
@@ -109,7 +108,6 @@ static int16_t file_read_FECpattern( void )
     return bfi;
 }
 #endif
-#endif
 /*-------------------------------------------------------------------*
  * pack_bit()
  *
@@ -143,29 +141,6 @@ void pack_bit(
     return;
 }
 
-/*-------------------------------------------------------------------*
- * unpack_bit()
- *
- * unpack a bit from packed octet
- *-------------------------------------------------------------------*/
-static Word16 unpack_bit(
-    UWord8 **pt, /* i/o: pointer to octet array from which bit will be read */
-    UWord8 *mask /* i/o: mask to indicate the bit in the octet */
-)
-{
-    Word16 bit;
-
-    bit = s_and( **pt, *mask ) != 0;
-    *mask = (UWord8) shr( *mask, 1 );
-    move16();
-    IF( *mask == 0 )
-    {
-        *mask = 0x80;
-        move16();
-        ( *pt )++;
-    }
-    return bit;
-}
 
 /*-------------------------------------------------------------------*
  * rate2AMRWB_IOmode()
@@ -263,11 +238,11 @@ Word16 rate2EVSmode(
 }
 
 /*-------------------------------------------------------------------*
- * push_indice_fx( )
+ * push_indice( )
  *
  * Push a new indice into the buffer
  *-------------------------------------------------------------------*/
-
+#ifndef HARM_PUSH_BIT
 void push_indice_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
     Word16 id,             /* i  : ID of the indice */
@@ -311,9 +286,8 @@ void push_indice_fx(
 
     return;
 }
-
 /*-------------------------------------------------------------------*
- * push_next_indice_fx()            *
+ * push_next_indice()            *
  * Push a new indice into the buffer at the next position
  *-------------------------------------------------------------------*/
 
@@ -341,7 +315,7 @@ void push_next_indice_fx(
 
 
 /*-------------------------------------------------------------------*
- * push_next_bits_fx()
+ * push_next_bits()
  * Push a bit buffer into the buffer at the next position
  *-------------------------------------------------------------------*/
 
@@ -391,6 +365,7 @@ void push_next_bits_fx(
     hBstr->nb_bits_tot = add( hBstr->nb_bits_tot, nb_bits );
     move16();
 }
+#endif
 
 /*-------------------------------------------------------------------*
  * get_next_indice_fx( )
@@ -543,23 +518,23 @@ UWord16 get_indice_1_fx(                       /* o  : value of the indice */
  *-------------------------------------------------------------------*/
 
 void reset_indices_enc_fx(
-    BSTR_ENC_HANDLE hBstr /* i/o: encoder state structure */
+    BSTR_ENC_HANDLE hBstr,       /* i/o: encoder state structure */
+    const Word16 max_num_indices /* i  : max number of indices       */
 )
 {
     Word16 i;
 
-#ifdef MSAN_FIX
     hBstr->nb_ind_tot = 0;
     move16();
-#endif
     hBstr->nb_bits_tot = 0;
     move16();
+#ifndef HARM_PUSH_BIT
     hBstr->next_ind_fx = 0;
     move16();
     hBstr->last_ind_fx = -1;
     move16();
-
-    FOR( i = 0; i < MAX_NUM_INDICES; i++ )
+#endif
+    FOR( i = 0; i < max_num_indices; i++ )
     {
         hBstr->ind_list[i].nb_bits = -1;
         move16();
@@ -589,7 +564,7 @@ void reset_indices_dec_fx(
  *
  * Write the buffer of indices to a file
  *-------------------------------------------------------------------*/
-
+#ifndef HARM_PUSH_BIT
 void write_indices_fx(
     Encoder_State *st_fx,  /* i/o: encoder state structure */
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
@@ -687,12 +662,13 @@ void write_indices_fx(
 
     return;
 }
+#endif
 /*-------------------------------------------------------------------*
  * write_indices_buf_fx()
  *
  * Write the buffer of indices to a file
  *-------------------------------------------------------------------*/
-
+#ifndef HARM_PUSH_BIT
 void write_indices_buf_fx(
     Encoder_State *st_fx,  /* i/o: encoder state structure */
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
@@ -796,6 +772,7 @@ void write_indices_buf_fx(
 
     return;
 }
+#endif
 /*-------------------------------------------------------------------*
  * indices_to_serial()
  *
@@ -944,154 +921,6 @@ return;
 }
 
 
-static void decoder_selectCodec(
-    Decoder_State *st,        /* i/o: decoder state structure                */
-    const Word32 total_brate, /* i  : total bitrate                          */
-    const Word16 bit0 )
-{
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    /* check if we are in AMR-WB IO mode */
-    IF( EQ_32( total_brate, SID_1k75 ) ||
-        EQ_32( total_brate, ACELP_6k60 ) || EQ_32( total_brate, ACELP_8k85 ) || EQ_32( total_brate, ACELP_12k65 ) ||
-        EQ_32( total_brate, ACELP_14k25 ) || EQ_32( total_brate, ACELP_15k85 ) || EQ_32( total_brate, ACELP_18k25 ) ||
-        EQ_32( total_brate, ACELP_19k85 ) || EQ_32( total_brate, ACELP_23k05 ) || EQ_32( total_brate, ACELP_23k85 ) )
-    {
-        st->Opt_AMR_WB = 1;
-        move16();
-    }
-    ELSE IF( total_brate != FRAME_NO_DATA )
-    {
-        st->Opt_AMR_WB = 0;
-        move16();
-    }
-
-    /* select MODE1 or MODE2 */
-    IF( st->Opt_AMR_WB )
-    {
-        st->codec_mode = MODE1;
-        move16(); /**/
-    }
-    ELSE
-    {
-        SWITCH( total_brate )
-        {
-            case 0:
-                st->codec_mode = st->last_codec_mode;
-                move16();
-                BREAK;
-            case 2400:
-                st->codec_mode = st->last_codec_mode;
-                move16();
-                BREAK;
-            case 2800:
-                st->codec_mode = MODE1;
-                move16();
-                BREAK;
-            case 7200:
-                st->codec_mode = MODE1;
-                move16();
-                BREAK;
-            case 8000:
-                st->codec_mode = MODE1;
-                move16();
-                BREAK;
-            case 9600:
-                st->codec_mode = MODE2;
-                move16();
-                BREAK;
-            case 13200:
-                st->codec_mode = MODE1;
-                move16();
-                BREAK;
-            case 16400:
-                st->codec_mode = MODE2;
-                move16();
-                BREAK;
-            case 24400:
-                st->codec_mode = MODE2;
-                move16();
-                BREAK;
-            case 32000:
-                st->codec_mode = MODE1;
-                move16();
-                BREAK;
-            case 48000:
-                st->codec_mode = MODE2;
-                move16();
-                BREAK;
-            case 64000:
-                st->codec_mode = MODE1;
-                move16();
-                BREAK;
-            case 96000:
-                st->codec_mode = MODE2;
-                move16();
-                BREAK;
-            case 128000:
-                st->codec_mode = MODE2;
-                move16();
-                BREAK;
-            default:
-                /* validate that total_brate (derived from RTP packet or a file header) is one of the defined bit rates  */
-                st->codec_mode = st->last_codec_mode;
-                st->bfi = 1;
-                move16();
-                move16();
-                BREAK;
-        }
-    }
-
-    IF( st->ini_frame == 0 )
-    {
-        if ( EQ_16( st->codec_mode, -1 ) )
-        {
-            st->codec_mode = MODE1;
-            move16();
-        }
-        st->last_codec_mode = st->codec_mode;
-        move16();
-    }
-
-    /* set SID/CNG type */
-    IF( EQ_32( total_brate, SID_2k40 ) )
-    {
-        IF( EQ_16( bit0, G192_BIN0 ) )
-        {
-            st->cng_type = LP_CNG;
-            move16();
-
-            /* force MODE1 when selecting LP_CNG */
-            st->codec_mode = MODE1;
-            move16();
-        }
-        ELSE
-        {
-            st->cng_type = FD_CNG;
-            move16();
-            test();
-            if ( EQ_16( st->last_codec_mode, MODE2 ) && EQ_32( st->last_total_brate, 13200 ) )
-            {
-                st->codec_mode = MODE1;
-                move16();
-            }
-        }
-        st->hTdCngDec->last_cng_type_fx = st->cng_type; /* CNG type switching at the first correctly received SID frame */
-        move16();
-    }
-
-
-    return;
-}
-
-
 static void dec_prm_core( Decoder_State *st )
 {
     Word16 n, frame_size_index, num_bits;
@@ -1319,109 +1148,115 @@ static void decision_matrix_core_dec(
  * Set up MDCT core switching if indicated in the bit stream
  *-------------------------------------------------------------------*/
 
-static void mdct_switching_dec(
+void mdct_switching_dec_fx(
     Decoder_State *st /* i/o: decoder state structure                */
 )
 {
-    IF( st->Opt_AMR_WB != 0 )
-    {
-        return;
-    }
-
-    test();
-    test();
-    IF( EQ_32( st->total_brate, ACELP_13k20 ) || EQ_32( st->total_brate, ACELP_32k ) )
-    {
-        st->mdct_sw_enable = MODE1;
-        move16();
-    }
-    ELSE IF( LE_32( ACELP_16k40, st->total_brate ) && LE_32( st->total_brate, ACELP_24k40 ) )
-    {
-        st->mdct_sw_enable = MODE2;
-        move16();
-    }
-
-    test();
-    test();
-    IF( EQ_16( st->codec_mode, MODE1 ) && EQ_16( st->mdct_sw_enable, MODE1 ) )
+    if ( !st->bfi )
     {
-        /* Read ahead core mode signaling */
-        Word16 next_bit_pos_save;
-        Word16 core_save;
-        Word16 bwidth_save;
-
-        next_bit_pos_save = st->next_bit_pos;
-        move16();
-        core_save = st->core;
-        move16();
-        bwidth_save = st->bwidth;
-        move16();
-
-        decision_matrix_core_dec( st ); /* sets st->core */
+        IF( st->Opt_AMR_WB != 0 )
+        {
+            return;
+        }
 
-        IF( EQ_16( st->core, TCX_20_CORE ) )
+        test();
+        test();
+        IF( EQ_32( st->total_brate, ACELP_13k20 ) || EQ_32( st->total_brate, ACELP_32k ) )
         {
-            /* Trigger TCX */
-            st->codec_mode = MODE2;
+            st->mdct_sw_enable = MODE1;
             move16();
-            st->mdct_sw = MODE1;
+        }
+        ELSE IF( LE_32( ACELP_16k40, st->total_brate ) && LE_32( st->total_brate, ACELP_24k40 ) )
+        {
+            st->mdct_sw_enable = MODE2;
             move16();
         }
-        ELSE
+
+        test();
+        test();
+        IF( EQ_16( st->codec_mode, MODE1 ) && EQ_16( st->mdct_sw_enable, MODE1 ) )
         {
-            /* Rewind bitstream */
-            st->next_bit_pos = next_bit_pos_save;
+            /* Read ahead core mode signaling */
+            Word16 next_bit_pos_save;
+            Word16 core_save;
+            Word16 bwidth_save;
+
+            next_bit_pos_save = st->next_bit_pos;
+            move16();
+            core_save = st->core;
+            move16();
+            bwidth_save = st->bwidth;
             move16();
-            IF( st->bfi != 0 )
+
+            decision_matrix_core_dec( st ); /* sets st->core */
+
+            IF( EQ_16( st->core, TCX_20_CORE ) )
             {
-                st->core = core_save;
+                /* Trigger TCX */
+                st->codec_mode = MODE2;
                 move16();
-                st->bwidth = bwidth_save;
+                st->mdct_sw = MODE1;
                 move16();
             }
+            ELSE
+            {
+                /* Rewind bitstream */
+                st->next_bit_pos = next_bit_pos_save;
+                move16();
+                IF( st->bfi != 0 )
+                {
+                    st->core = core_save;
+                    move16();
+                    st->bwidth = bwidth_save;
+                    move16();
+                }
+            }
         }
-    }
-    ELSE IF( EQ_16( st->codec_mode, MODE2 ) && EQ_16( st->mdct_sw_enable, MODE2 ) )
-    {
-        /* Read ahead core mode signaling */
-        Word16 next_bit_pos_save;
-        Word16 core_save;
-        Word16 bwidth_save;
-
-        next_bit_pos_save = st->next_bit_pos;
-        move16();
-        core_save = st->core;
-        move16();
-        bwidth_save = st->bwidth;
-        move16();
-
-        dec_prm_core( st ); /* sets st->core */
-
-        IF( EQ_16( st->core, HQ_CORE ) )
+        ELSE IF( EQ_16( st->codec_mode, MODE2 ) && EQ_16( st->mdct_sw_enable, MODE2 ) )
         {
-            /* Trigger HQ_CORE */
-            st->codec_mode = MODE1;
+            /* Read ahead core mode signaling */
+            Word16 next_bit_pos_save;
+            Word16 core_save;
+            Word16 bwidth_save;
+
+            next_bit_pos_save = st->next_bit_pos;
             move16();
-            st->mdct_sw = MODE2;
+            core_save = st->core;
             move16();
-        }
-        ELSE
-        {
-            /* Rewind bitstream */
-            st->next_bit_pos = next_bit_pos_save;
+            bwidth_save = st->bwidth;
             move16();
-            if ( st->bfi != 0 )
+
+            dec_prm_core( st ); /* sets st->core */
+
+            IF( EQ_16( st->core, HQ_CORE ) )
             {
-                st->core = core_save;
+                /* Trigger HQ_CORE */
+                st->codec_mode = MODE1;
+                move16();
+                st->mdct_sw = MODE2;
+                move16();
+            }
+            ELSE
+            {
+                /* Rewind bitstream */
+                st->next_bit_pos = next_bit_pos_save;
+                move16();
+                if ( st->bfi != 0 )
+                {
+                    st->core = core_save;
+                    move16();
+                }
+                /* always reset bwidth, to not interfere with BER logic */
+                st->bwidth = bwidth_save;
                 move16();
             }
-            /* always reset bwidth, to not interfere with BER logic */
-            st->bwidth = bwidth_save;
-            move16();
         }
     }
+
+    return;
 }
 
+
 /*-------------------------------------------------------------------*
  * BRATE2IDX_fx()
  *
@@ -1549,894 +1384,32 @@ Word32 BIT_ALLOC_IDX_16KHZ_fx( Word32 brate, Word16 ctype, Word16 sfrm, Word16 t
 
 
 /*-------------------------------------------------------------------*
- * read_indices_fx()
+ * berCheck()
  *
- * Read indices from an ITU-T G.192 bitstream to the buffer
- * Simulate packet losses by inserting frame erasures
+ * Check for bit errors in channel aware signalling.
  *-------------------------------------------------------------------*/
 
-Word16 read_indices_fx(                    /* o  : 1 = reading OK, 0 = problem            */
-                        Decoder_State *st, /* i/o: decoder state structure                */
-                        FILE *file,        /* i  : bitstream file                         */
-                        Word16 rew_flag    /* i  : rewind flag (rewind file after reading)*/
+static void berCheck(
+    Decoder_State *st, /* i/o: decoder state structure     */
+    Word16 *coder_type /* i/o: coder type                  */
 )
 {
-    Word16 k;
-    UWord16 utmp, stream[2 + MAX_BITS_PER_FRAME], *pt_stream, *bit_stream_ptr;
-    Word16 num_bits;
-    Word32 total_brate;
-    Word32 L_tmp;
-    Word16 curr_ft_good_sp, curr_ft_bad_sp;
-    Word16 g192_sid_first, sid_upd_bad, sid_update;
-    Word16 speech_bad, speech_lost;
-    Word16 num_bits_read;
-
-    st->bfi = 0;
-    move16();
-    st->BER_detect = 0;
-    move16();
-    st->mdct_sw_enable = 0;
-    move16();
-    st->mdct_sw = 0;
-    move16();
-    reset_indices_dec_fx( st );
-
-    /* read the Sync Header field from the bitstream */
-    /* in case rew_flag is set, read until first good frame is encountered */
+    /* In case of RF flag = 1, and valid RF packet with primary and partial copy */
     test();
     test();
-    DO
+    IF( ( EQ_16( st->bwidth, NB ) || EQ_16( st->bwidth, FB ) ) || ( GE_16( *coder_type, TRANSITION ) ) )
     {
-        /* read the Sync header */
-        IF( NE_32( fread( &utmp, sizeof( unsigned short ), 1, file ), 1 ) )
-        {
-            IF( ferror( file ) )
-            {
-                /* error during reading */
-                fprintf( stderr, "\nError reading the bitstream !" );
-                exit( -1 );
-            }
-            ELSE
-            {
-                /* end of file reached */
-                return 0;
-            }
-        }
-
-        /* set the BFI indicator according the value of Sync Header */
-        IF( EQ_16( utmp, SYNC_BAD_FRAME ) )
-        {
-            st->bfi = 1;
-            move16();
-        }
-        ELSE
+        if ( EQ_16( st->use_partial_copy, 1 ) )
         {
-            st->bfi = 0;
+            st->use_partial_copy = 0;
             move16();
         }
 
-        /* read the Frame Length field from the bitstream */
-        IF( NE_32( fread( &num_bits, sizeof( unsigned short ), 1, file ), 1 ) )
-        {
-            IF( ferror( file ) )
-            {
-                /* error during reading */
-                fprintf( stderr, "\nError reading the bitstream !" );
-                exit( -1 );
-            }
-            ELSE
-            {
-                /* end of file reached */
-                return 0;
-            }
-        }
-        /* convert the frame length to total bitrate */
-        total_brate = L_mult0( num_bits, 50 );
-
-        /* read ITU-T G.192 serial stream of indices from file to the local buffer */
-        /* Validate that the G.192 length is within the defined  bit rate range
-        to not allow writing past the end of the "stream" buffer  */
-        IF( GT_16( num_bits, MAX_BITS_PER_FRAME ) )
-        {
-            fprintf( stderr, "\nError, too large G.192 frame (size(%d))! Exiting ! \n", num_bits );
-            exit( -1 );
-        }
-
-        /*  verify that a  valid  num bits value  is present in the G.192 file */
-        /*  only AMRWB or EVS bit rates  or 0(NO DATA)  are  allowed  in G.192 file frame reading  */
-        IF( rate2EVSmode( total_brate, NULL ) < 0 ) /* negative value means that a valid rate was not found */
-        {
-            fprintf( stderr, "\nError, illegal bit rate (%d) in  the  G.192 frame ! Exiting ! \n", total_brate );
-            exit( -1 );
-        }
-        pt_stream = stream;
-
-        num_bits_read = (Word16) fread( pt_stream, sizeof( unsigned short ), num_bits, file );
+        st->bfi = 1;
         move16();
-
-        IF( NE_16( num_bits_read, num_bits ) )
-        {
-            fprintf( stderr, "\nError, invalid number of bits read ! Exiting ! \n" );
-            exit( -1 );
-        }
-    }
-    WHILE( rew_flag && ( st->bfi || ( total_brate < 2800 ) ) );
-
-    /* G.192 RX DTX handler*/
-    IF( !rew_flag )
-    {
-        /* handle SID_FIRST, SID_BAD, SPEECH_LOST,  NO_DATA as properly  as possible for the ITU-T  G.192 format  */
-
-        /* (total_brate, bfi , st_CNG)   =  rx_handler(received frame type, [previous frame type],  past CNG state, past core) */
-        curr_ft_good_sp = 0;
+        st->bwidth = st->last_bwidth;
         move16();
-        curr_ft_bad_sp = 0;
-        move16();
-
-        IF( GT_32( total_brate, SID_2k40 ) )
-        {
-            IF( st->bfi == 0 )
-            {
-                curr_ft_good_sp = 1;
-                move16();
-            }
-            ELSE
-            {
-                curr_ft_bad_sp = 1;
-                move16();
-            }
-        }
-        sid_update = 0;
-        move16();
-        sid_upd_bad = 0;
-        move16();
-
-        test();
-        IF( total_brate == SID_1k75 || total_brate == SID_2k40 )
-        {
-            IF( st->bfi == 0 )
-            {
-                sid_update = 1;
-                move16();
-            }
-            ELSE
-            {
-                sid_upd_bad = 1; /* may happen in CS , corrupt but detected sid frame  */
-                move16();
-            }
-        }
-
-        /* all zero indeces/bits  iSP AMRWB SID_update results in a valid LP filter with extremely high LP-filter-gain  */
-        /* all zero indeces/bits  may be a result of CS bit errors  and/or  erroneously injected by gateways or by a bad dejitter handlers */
-        test();
-        IF( EQ_32( total_brate, SID_1k75 ) && EQ_16( sid_update, 1 ) )
-        {
-            /* valid sid_update received, check for very risky but formally valid content  */
-            Word16 sum = 0;
-            move16();
-            FOR( k = 0; k < num_bits; ++k )
-            {
-                sum = add( sum, extract_l( EQ_16( pt_stream[k], G192_BIN1 ) ) ); /*   check of 35 zeroes, 35 ones   */
-            }
-            if ( sum == 0 )
-            {                    /* all zeros  */
-                sid_upd_bad = 1; /* initial signal as corrupt (BER likley)  */
-                move16();
-            }
-        }
-
-        /* AMRWB  26.173 G.192  file reader (read_serial) does not declare/use SID_BAD ft,
-           it declares every bad synch marked frame initially as a lost_speech frame,
-           and then the RXDTX handler CNG state decides the decoding mode CNG/SPEECH.
-           While In the AMRWB ETSI/3GPP format eid a CRC error in a detected SID_UPDATE frame triggers SID_UPD_BAD.
-
-           Here we inhibit use of the SID-length info, even though it is available in the G.192 file format after STL/EID-XOR .
-         */
-        IF( sid_upd_bad )
-        {
-            sid_upd_bad = 0;
-            move16();
-            total_brate = FRAME_NO_DATA; /* treat SID_BAD  as a  stolen signaling frame --> SPEECH LOST */
-            move32();
-        }
-
-        g192_sid_first = 0;
-        move16();
-
-        test();
-        test();
-        test();
-        if ( EQ_16( st->core, AMR_WB_CORE ) && st->prev_ft_speech_fx && total_brate == FRAME_NO_DATA && st->bfi == 0 )
-        {
-            g192_sid_first = 1; /*  SID_FIRST detected for previous AMRWB/AMRWBIO  active frames only  */
-                                /*
-                                It is not possible to perfectly simulate rate switching conditions EVS->AMRWBIO  where:
-                                the very first SID_FIRST detection is based on a past EVS active frame
-                                and  a  good length 0  "SID_FIRST"(NO_DATA)   frame is sent in AMRWBIO,
-                                , due to the one frame state memory in the AMRWB legacy  G.192 SID_FIRST encoding
-                                */
-            move16();
-        }
-
-        speech_bad = 0;
-        move16();
-
-        test();
-        if ( GT_32( total_brate, SID_2k40 ) && st->bfi != 0 ) /*   CS-type of CRC failure   frame */
-        {
-            speech_bad = 1; /* initial assumption, CNG_state decides what to do */
-            move16();
-        }
-
-        speech_lost = 0;
-        move16();
-
-        test();
-        if ( total_brate == 0 && st->bfi != 0 ) /*  unsent  NO_DATA or stolen NO_DATA/signaling  frame  */
-        {
-            speech_lost = 1; /* initial assumption, CNG_state decides what to do */
-            move16();
-        }
-
-        /* Do not allow decoder to enter CNG-synthesis for  any instantly  received  GOOD+LENGTH==0  frame
-           as this frame was never transmitted, one  can not know it is good and has a a length of zero ) */
-
-        IF( st->CNG_fx != 0 )
-        {
-            /* We were in CNG synthesis  */
-            if ( curr_ft_good_sp != 0 )
-            {
-                /* only a good speech frame makes you leave CNG synthesis */
-                st->CNG_fx = 0;
-                move16();
-            }
-        }
-        ELSE
-        {
-            /* We were in SPEECH synthesis  */
-            /* only a received SID frame can make the decoder enter into CNG synthsis  */
-            test();
-            test();
-            if ( g192_sid_first || sid_update || sid_upd_bad )
-            {
-                st->CNG_fx = 1;
-                move16();
-            }
-        }
-
-        /*  handle the  g.192  _simulated_ untransmitted frame,  setting  for decoder  SPEECH synthesis  */
-        test();
-        test();
-        if ( ( st->CNG_fx == 0 ) && ( total_brate == 0 && st->bfi == 0 ) )
-        {
-            st->bfi = 1;
-            move16(); /*  SPEECH PLC code will now become active as in a real system */
-                      /* total_brate= 0  */
-        }
-
-        /* handle bad speech frame(and bad sid frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
-        test();
-        test();
-        test();
-        IF( ( ( st->CNG_fx != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */
-            ( sid_upd_bad != 0 ) )                                                        /* SID_UPD_BAD              --> start CNG */
-        {
-            st->bfi = 0;
-            move16();
-            total_brate = 0;
-            move32();
-        }
-        /* update for next frame's G.192 file format's  SID_FIRST detection (primarily for AMRWBIO)  */
-        test();
-        st->prev_ft_speech_fx = ( ( curr_ft_good_sp != 0 ) || ( curr_ft_bad_sp != 0 ) );
-        move16();
-
-        /*   st->total brate= total_brate ;   updated in a good frame below */
-    } /* rew_flag */
-
-    /* get total bit-rate */
-#ifdef DEBUGGING
-    st->bfi |= file_read_FECpattern();
-#endif
-    test();
-    IF( st->bfi == 0 && !rew_flag )
-    {
-        /* select MODE1 or MODE2 */
-        decoder_selectCodec( st, total_brate, *pt_stream );
-    }
-
-    Mpy_32_16_ss( total_brate, 5243, &L_tmp, &utmp );    /* 5243 is 1/50 in Q18. (0+18-15=3) */
-    st->total_num_bits = extract_l( L_shr( L_tmp, 3 ) ); /* Q0 */
-    move16();
-
-    /* in case rew_flag is set, rewind the file and return */
-    /* (used in io_enc() to print out info about technologies and to initialize the codec) */
-    IF( rew_flag )
-    {
-        rewind( file );
-        st->total_brate = total_brate;
-        move32();
-        return 1;
-    }
-
-    /* GOOD frame */
-    IF( st->bfi == 0 )
-    {
-        /* GOOD frame - convert ITU-T G.192 words to short values */
-        bit_stream_ptr = st->bit_stream;
-
-        FOR( k = 0; k < num_bits; ++k )
-        {
-            *bit_stream_ptr++ = (UWord16) EQ_32( *pt_stream++, G192_BIN1 );
-            move16();
-        }
-
-        /*add two zero bytes for arithmetic coder flush*/
-        FOR( k = 0; k < 2 * 8; ++k )
-        {
-            *bit_stream_ptr++ = 0;
-            move16();
-        }
-        /*a change of the total bitrate should not be
-        known to the decoder, if the received frame was lost*/
-        st->total_brate = total_brate;
-        move32();
-
-        mdct_switching_dec( st );
-    }
-#ifdef DEBUGGING
-    else
-    {
-        bit_stream_ptr = st->bit_stream;
-
-        for ( k = 0; k < num_bits + 2 * 8; ++k )
-        {
-            *bit_stream_ptr++ = 0;
-        }
-    }
-#endif
-    return 1;
-}
-
-
-/*-------------------------------------------------------------------*
- * read_indices_mime_handle_dtx()
- *
- * Handle DTX for MIME and RTP_DUMP decoding.
- * Returns the actual total_brate.
- *-------------------------------------------------------------------*/
-
-static Word32 read_indices_mime_handle_dtx(
-    Decoder_State *st,
-    Word16 isAMRWB_IOmode,
-    Word16 core_mode,
-    Word32 total_brate,
-    Word16 sti,
-    Word16 speech_lost,
-    Word16 no_data )
-{
-    Word16 curr_ft_good_sp = 0;
-    Word16 speech_bad = 0;
-    Word16 sid_upd_bad = 0, sid_update = 0;
-    Word16 amrwb_sid_first = 0; /* derived from sti  SID_FIRST indicator in AMRWB payload */
-    move16();
-    move16();
-    move16();
-    move16();
-    move16();
-
-    /* keep st->CNG , st_bfi and total_brate  updated  for proper synthesis in DTX and FER  */
-    IF( GT_32( total_brate, SID_2k40 ) )
-    {
-        if ( NE_16( st->bfi, 1 ) ) /* so  far derived from q bit in AMRWB/AMRWBIO cases   */
-        {
-            curr_ft_good_sp = 1;
-            move16();
-        }
-    }
-
-    /* handle q_bit and  lost_sp  clash ,  assume worst case  */
-    IF( speech_lost != 0 ) /*  overrides  a good q_bit */
-    {
-        curr_ft_good_sp = 0;
-        move16();
-        st->bfi = 1; /* override  qbit */
-        move16();
-    }
-
-    /* now_bfi_fx has been set based on q_bit and ToC fields */
-
-
-    /* SID_UPDATE check */
-    test();
-    IF( EQ_32( total_brate, SID_1k75 ) || EQ_32( total_brate, SID_2k40 ) )
-    {
-        IF( st->bfi == 0 )
-        {
-            /* typically from q bit  */
-            sid_update = 1;
-            move16();
-        }
-        ELSE
-        {
-            sid_upd_bad = 1; /* may happen in saving from e.g. a CS-connection */
-            move16();
-        }
-    }
-
-    test();
-    test();
-    IF( isAMRWB_IOmode && total_brate == 0 && sti == 0 )
-    {
-        IF( st->bfi )
-        {
-            sid_upd_bad = 1; /*  corrupt sid_first, signaled as bad sid  */
-            move16();
-        }
-        ELSE
-        {
-            amrwb_sid_first = 1; /* 1-sti  */
-            move16();
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    IF( sid_upd_bad != 0 && ( ( isAMRWB_IOmode != 0 && st->Opt_AMR_WB == 0 ) ||            /* switch to    AMRWBIO */
-                              ( NE_16( isAMRWB_IOmode, 1 ) && EQ_16( st->Opt_AMR_WB, 1 ) ) /* switch from  AMRWBIO */
-                              ) )
-    {
-        /* do not allow a normal start of  CNG synthesis if this SID(with BER or FER) is a switch to/from AMRWBIO  */
-        sid_upd_bad = 0; /* revert this detection due to AMRWBIO/EVS mode switch */
-        move16();
-        total_brate = 0;
-        move32();
-        no_data = 1;
-        move16();
-        assert( st->bfi == 1 ); /* bfi stays 1 */
-    }
-
-    test();
-    if ( GT_32( total_brate, SID_2k40 ) && EQ_16( st->bfi, 1 ) ) /* typically from q bit  */
-    {
-        speech_bad = 1; /* initial assumption,   CNG synt state decides what to actually do */
-        move16();
-    }
-    /* all frame types decoded */
-
-    /*    update CNG synthesis state */
-    /*    Decoder can only  enter CNG-synthesis  for  CNG frame types (sid_upd,  sid_bad, sid_first) */
-    IF( st->CNG_fx != 0 )
-    {
-        /* We were in CNG synthesis  */
-        if ( curr_ft_good_sp != 0 )
-        {
-            /* only a good speech frame makes decoder leave CNG synthesis */
-            st->CNG_fx = 0;
-            move16();
-        }
-    }
-    ELSE
-    {
-        /*   We were in SPEECH synthesis  */
-        /*   only a received SID frame can make the decoder enter into CNG synthesis  */
-        test();
-        test();
-        if ( amrwb_sid_first || sid_update || sid_upd_bad )
-        {
-            st->CNG_fx = 1;
-            move16();
-        }
-    }
-
-    /* Now modify bfi flag for the  decoder's  SPEECH/CNG synthesis logic  */
-    /*   in SPEECH synthesis, make sure to activate speech plc for a received no_data frame,
-             no_data frames may be injected by the network or by the dejitter buffer   */
-    /*   modify bfi_flag to stay/move into the correct decoder PLC section  */
-    test();
-    if ( ( st->CNG_fx == 0 ) && ( no_data != 0 ) )
-    {
-        /*  treat no_data received in speech synthesis as  SP_LOST frames, SPEECH PLC code will now become active */
-        st->bfi = 1;
-        move16();
-        /* total_brate= 0;    always zero for no_data */
-    }
-
-    /* in CNG  */
-    /* handle bad speech frame(and bad sid frame) in the decoders CNG synthesis settings pair (total_brate, bfi)  */
-    test();
-    test();
-    test();
-    test();
-    IF( ( st->CNG_fx != 0 && ( speech_bad || speech_lost || no_data ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */
-        sid_upd_bad )                                                      /* SID_UPD_BAD               --> start/stay  CNG   */
-    {
-        st->bfi = 0; /* mark as good to not start speech PLC */
-        move16();
-        total_brate = 0; /* this zeroing needed  for  speech_bad, sid_bad frames */
-        move32();
-    }
-
-
-    /*  now  bfi, total_brate are set by RX-DTX handler::
-    bfi==0, total_brate!=0    cng or speech pending  bitrate
-    bfi==0, total_brate==0    cng will continue or start(sid_first, sid_bad)
-    bfi==1, total_brate!=0    speech plc
-    bfi==1, total_brate==0 ,  speech plc
-    */
-
-
-    /*  handle available AMRWB/AMRWBIO MIME header ToC rate-info at startup   */
-    test();
-    test();
-    test();
-    test();
-    IF( ( EQ_16( st->bfi, 1 ) && st->ini_frame == 0 ) &&
-        ( ( st->amrwb_rfc4867_flag != 0 ) || ( st->amrwb_rfc4867_flag == 0 && isAMRWB_IOmode != 0 ) ) ) /*AMRWB ToC */
-    {
-        Word32 init_rate;
-
-        init_rate = total_brate; /* default , may have been modified from original ToC value */
-        move32();
-
-        test();
-        IF( speech_lost != 0 || no_data != 0 )
-        {
-            init_rate = ACELP_12k65; /* make sure the decoder starts up in a selected AMRWB mode */
-            move32();
-        }
-        ELSE IF( speech_bad != 0 )
-        {
-            init_rate = AMRWB_IOmode2rate[core_mode]; /* read from from ToC */
-            move32();
-        }
-        st->total_brate = init_rate; /* not updated on bfi as  decoderSelectCodec is not called below */
-        move32();
-        st->core_brate = init_rate;
-        move32();
-    }
-
-    return total_brate;
-}
-
-
-/*-------------------------------------------------------------------*
- * read_indices_mime_handle_sti_and_all_zero_bits()
- *
- * Handle STI and frames with all zero bits for MIME and RTP_DUMP decoding.
- *-------------------------------------------------------------------*/
-
-static void read_indices_mime_handle_sti_and_all_zero_bits(
-    Decoder_State *st,
-    Word32 *total_brate,
-    Word16 sti )
-{
-    Word16 k;
-
-    IF( sti == 0 )
-    {
-        *total_brate = 0; /* signal received SID_FIRST as a good frame with no bits */
-        move32();
-        FOR( k = 0; k < 35; k++ )
-        {
-            st->bfi = s_or( st->bfi, st->bit_stream[k] ); /* partity check of 35 zeroes,  any single 1 gives BFI */
-            move16();
-        }
-    }
-    /* all zero bit SID_update results in a valid LP filter with extremely high LP-filter-gain  */
-    /* all zero bits signal may be a result of CS bit errors  or erronesouly injected by gateways or bad dejitter handlers */
-    IF( EQ_16( sti, 1 ) )
-    { /*sid_update received */
-        Word16 sum = 0;
-        move16();
-        FOR( k = 0; k < 35; k++ )
-        {
-            sum = add( sum, st->bit_stream[k] ); /* check of 35 zeroes */
-        }
-
-        if ( sum == 0 )
-        {
-            st->bfi = 1; /* eventually becomes SID_UPD_BAD */
-            move16();
-        }
-    }
-}
-
-
-/*------------------------------------------------------------------------------------------*
- * read_indices_mime()
- *
- * Read indices from MIME formatted bitstream to the buffer
- *   The magic word and number of channnels should be consumed before calling this function
- *-------------------------------------------------------------------------------------------*/
-
-Word16 read_indices_mime(                    /* o  : 1 = reading OK, 0 = problem            */
-                          Decoder_State *st, /* i/o: decoder state structure                */
-                          FILE *file,        /* i  : bitstream file                         */
-                          Word16 rew_flag    /* i  : rewind flag (rewind file after reading) */
-)
-{
-    Word16 k, isAMRWB_IOmode, cmi, core_mode = -1, qbit, sti;
-    UWord8 header;
-    UWord8 pFrame[( MAX_BITS_PER_FRAME + 7 ) >> 3];
-    UWord8 mask = 0x80, *pt_pFrame = pFrame;
-    UWord16 *bit_stream_ptr;
-    Word16 num_bits;
-    Word32 total_brate;
-    UWord16 utmp;
-    Word32 L_tmp;
-    Word16 speech_lost = 0, no_data = 0;
-    Word16 num_bytes_read;
-
-    move16();
-    move16();
-    move16();
-    move16();
-
-    st->BER_detect = 0;
-    move16();
-    st->bfi = 0;
-    move16();
-    st->mdct_sw_enable = 0;
-    move16();
-    st->mdct_sw = 0;
-    move16();
-    reset_indices_dec_fx( st );
-
-    /* read the FT Header field from the bitstream */
-    IF( NE_32( fread( &header, sizeof( UWord8 ), 1, file ), 1 ) )
-    {
-        IF( ferror( file ) )
-        {
-            /* error during reading */
-            fprintf( stderr, "\nError reading the bitstream !" );
-            exit( -1 );
-        }
-        ELSE
-        {
-            /* end of file reached */
-            return 0;
-        }
-    }
-
-    /* init local RXDTX flags */
-    sti = -1;
-    move16();
-
-    IF( st->amrwb_rfc4867_flag != 0 )
-    {
-        /*   RFC 4867
-        5.3 ....
-        Each stored speech frame starts with a one-octet frame header with
-        the following format:
-        0 1 2 3 4 5 6 7
-        +-+-+-+-+-+-+-+-+
-        |P| FT    |Q|P|P|
-        +-+-+-+-+-+-+-+-+
-        The FT field and the Q bit are defined in the same way as in
-        Section 4.3.2. The P bits are padding and MUST be set to 0, and MUST be ignored. */
-
-        isAMRWB_IOmode = 1;
-        move16();
-        qbit = s_and( shr( header, 2 ), 0x01 ); /* b2 bit       (b7 is the F bit ) */
-        st->bfi = !qbit;
-        move16();
-        core_mode = s_and( shr( header, 3 ), 0x0F ); /*  b6..b3      */
-        total_brate = AMRWB_IOmode2rate[core_mode];  /* get the frame length from the header */
-        move32();
-    }
-    ELSE
-    {
-        /*0 1 2 3 4 5 6 7   MS-bit ---> LS-bit
-         +-+-+-+-+-+-+-+-+
-         |H|F|E|x| brate |
-         +-+-+-+-+-+-+-+-+
-          where :
-                "E|x|  brate "  is the 6 bit "FT" -field
-                 x is unused    if E=0, (should be 0 )
-                 x is the q-bit if E=1, q==1(good), Q==0(bad, maybe bit errors in payload )
-                 H,F  always   0 in RTP format.
-        */
-        isAMRWB_IOmode = extract_l( GT_16( s_and( header, 0x20 ), 0 ) ); /* get EVS mode-from header */ /*    b2   */
-        core_mode = s_and( header, 0x0F );                                                              /* b4,b5,b6,b7 */
-
-        IF( isAMRWB_IOmode )
-        {
-            qbit = extract_l( GT_16( s_and( header, 0x10 ), 0 ) ); /* get Q bit,    valid for IO rates */ /* b3 */
-            total_brate = AMRWB_IOmode2rate[core_mode];
-            move32();
-        }
-        ELSE
-        {
-            qbit = 1; /* assume good q_bit for the unused EVS-mode bit,    complete ToC validity checked later */
-            move16();
-            total_brate = PRIMARYmode2rate[core_mode];
-            move32();
-        }
-        st->bfi = !qbit;
-        move16();
-    }
-
-
-    /* set up RX-DTX-handler input */
-    if ( EQ_16( core_mode, 14 ) )
-    {
-        /* SP_LOST */
-        speech_lost = 1;
-        move16();
-    }
-    if ( EQ_16( core_mode, 15 ) )
-    {
-        /*  NO_DATA unsent CNG frame OR  any frame marked or injected  as no_data  by e.g a signaling layer or dejitter buffer */
-        no_data = 1;
-        move16();
-    }
-
-    Mpy_32_16_ss( total_brate, 5243, &L_tmp, &utmp ); /* 5243 is 1/50 in Q18. (0+18-15=3) */
-    num_bits = extract_l( L_shr( L_tmp, 3 ) );        /* Q0 */
-    st->total_num_bits = num_bits;
-    move16();
-
-    IF( total_brate < 0 )
-    {
-        /* validate that total_brate (derived from RTP packet or a file header) is one of the defined bit rates  */
-        fprintf( stderr, "\n  Error.  Illegal total bit rate (= %d) in MIME ToC header \n", total_brate );
-        /* num_bits = -1;   not needed as BASOP multiplication preserves sign */
-    }
-
-    /* Check correctness of ToC headers  */
-    IF( st->amrwb_rfc4867_flag == 0 )
-    {
-        /* EVS ToC header (FT field(b2-b7), H bit (b0),    F bit (b1)  ,  (EVS-modebit(b2)=0  unused(Qbit)(b3)==0)   */
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( isAMRWB_IOmode == 0 ) && ( ( num_bits < 0 ) || ( s_and( header, 0x80 ) > 0 ) || ( s_and( header, 0x40 ) > 0 ) || s_and( header, 0x30 ) != 0x00 ) )
-        {
-            /* incorrect FT header */
-            fprintf( stderr, "\nError in EVS  FT ToC header(%02x) ! ", header );
-            exit( -1 );
-        }
-        ELSE IF( ( isAMRWB_IOmode != 0 ) && ( ( num_bits < 0 ) || ( s_and( header, 0x80 ) > 0 ) || ( s_and( header, 0x40 ) > 0 ) ) ) /* AMRWBIO */
-        {
-            /* incorrect IO FT header */
-            fprintf( stderr, "\nError in EVS(AMRWBIO)  FT ToC header(%02x) ! ", header );
-            exit( -1 );
-        }
-    }
-    ELSE
-    {
-        /* legacy AMRWB ToC,   is only using  Padding bits which MUST be ignored */
-        IF( num_bits < 0 )
-        {
-            /* incorrect FT header */
-            fprintf( stderr, "\nError in AMRWB RFC4867  Toc(FT)  header(%02x) !", header );
-            exit( -1 );
-        }
-    }
-
-    /* read serial stream of indices from file to the local buffer */
-    num_bytes_read = extract_l( fread( pFrame, sizeof( UWord8 ), shr( add( num_bits, 7 ), 3 ), file ) );
-    IF( NE_16( num_bytes_read, shr( add( num_bits, 7 ), 3 ) ) )
-    {
-        fprintf( stderr, "\nError, invalid number of bytes read ! Exiting ! \n" );
-        exit( -1 );
-    }
-
-    /* in case rew_flag is set, rewind the file and return */
-    /* (used in io_dec() to attempt print out info about technologies and to initialize the codec ) */
-    IF( rew_flag )
-    {
-        st->total_brate = total_brate; /* used for the codec banner output */
-        move32();
-        test();
-        test();
-        IF( st->bfi == 0 && speech_lost == 0 && no_data == 0 )
-        {
-            decoder_selectCodec( st, total_brate, unpack_bit( &pt_pFrame, &mask ) ? G192_BIN1 : G192_BIN0 );
-        }
-        return 1;
-    }
-
-
-    /* unpack speech data */
-    bit_stream_ptr = st->bit_stream;
-    FOR( k = 0; k < num_bits; k++ )
-    {
-        IF( isAMRWB_IOmode )
-        {
-            st->bit_stream[sort_ptr[core_mode][k]] = unpack_bit( &pt_pFrame, &mask );
-            move16();
-            bit_stream_ptr++;
-        }
-        ELSE
-        {
-            *bit_stream_ptr++ = unpack_bit( &pt_pFrame, &mask );
-            move16();
-        }
-    }
-
-    /* unpack auxiliary bits */
-    /* Note: the cmi bits are unpacked for  demo  purposes;  */
-    test();
-    IF( isAMRWB_IOmode && EQ_32( total_brate, SID_1k75 ) )
-    {
-        sti = unpack_bit( &pt_pFrame, &mask );
-        cmi = shl( unpack_bit( &pt_pFrame, &mask ), 3 );
-        cmi = s_or( cmi, shl( unpack_bit( &pt_pFrame, &mask ), 2 ) );
-        cmi = s_or( cmi, shl( unpack_bit( &pt_pFrame, &mask ), 1 ) );
-        cmi = s_or( cmi, unpack_bit( &pt_pFrame, &mask ) );
-
-        read_indices_mime_handle_sti_and_all_zero_bits( st, &total_brate, sti );
-    }
-
-    /*add two zero bytes for arithmetic coder flush*/
-    FOR( k = 0; k < 2 * 8; ++k )
-    {
-        *bit_stream_ptr++ = 0;
-        move16();
-    }
-
-    /* MIME RX_DTX handler */
-    IF( !rew_flag )
-    {
-        total_brate = read_indices_mime_handle_dtx( st, isAMRWB_IOmode, core_mode, total_brate, sti, speech_lost, no_data );
-    }
-
-    IF( st->bfi == 0 )
-    {
-        /* select MODE1 or MODE2 in  MIME */
-        IF( *st->bit_stream )
-        {
-            decoder_selectCodec( st, total_brate, G192_BIN1 );
-        }
-        ELSE
-        {
-            decoder_selectCodec( st, total_brate, G192_BIN0 );
-        }
-        /* a change of the total bitrate should not be known to the decoder, if the received frame was truly lost */
-        st->total_brate = total_brate;
-        move32();
-        mdct_switching_dec( st );
-    }
-    /* else{ bfi stay in past synthesis mode(SP,CNG) } */
-
-    return 1;
-}
-
-/*-------------------------------------------------------------------*
- * berCheck()
- *
- * Check for bit errors in channel aware signalling.
- *-------------------------------------------------------------------*/
-
-static void berCheck(
-    Decoder_State *st, /* i/o: decoder state structure     */
-    Word16 *coder_type /* i/o: coder type                  */
-)
-{
-    /* In case of RF flag = 1, and valid RF packet with primary and partial copy */
-    test();
-    test();
-    IF( ( EQ_16( st->bwidth, NB ) || EQ_16( st->bwidth, FB ) ) || ( GE_16( *coder_type, TRANSITION ) ) )
-    {
-        if ( EQ_16( st->use_partial_copy, 1 ) )
-        {
-            st->use_partial_copy = 0;
-            move16();
-        }
-
-        st->bfi = 1;
-        move16();
-        st->bwidth = st->last_bwidth;
-        move16();
-        st->BER_detect = 1;
+        st->BER_detect = 1;
         move16();
         *coder_type = GENERIC;
         move16();
@@ -2769,148 +1742,6 @@ void get_NextCoderType_fx(
     move16();
 }
 
-/*-------------------------------------------------------------------*
- * read_indices_from_djb_fx()
- *
- * Read indices from the de-jitter buffer payload (works also for AMR-WB IO mode)
- *-------------------------------------------------------------------*/
-
-void read_indices_from_djb_fx(
-    Decoder_State *st, /* i/o: decoder state structure       */
-    UWord8 *pt_stream, /* i  : bitstream file                */
-    Word16 num_bits,   /* i  : input frame length in bits    */
-    Word16 isAMRWB_IOmode,
-    Word16 core_mode,
-    Word16 qbit,
-    Word16 partialframe,   /* i  : partial frame information     */
-    Word16 next_coder_type /* i  : next coder type information   */
-)
-{
-    Word16 k;
-    UWord8 mask = 0x80;
-    Word16 no_data = 0;
-    Word16 sti = -1;
-    UWord16 *bit_stream_ptr;
-    Word32 total_brate;
-    Word16 speech_lost = 0;
-
-    move16();
-    move16();
-    move16();
-    move16();
-
-    st->bfi = 0;
-    move16();
-    st->BER_detect = 0;
-    move16();
-    st->mdct_sw_enable = 0;
-    move16();
-    st->mdct_sw = 0;
-    move16();
-    reset_indices_dec_fx( st );
-
-    st->bfi = !qbit;
-    move16();
-    total_brate = L_mult0( num_bits, 50 );
-    st->total_num_bits = num_bits;
-    move16();
-
-    IF( num_bits == 0 ) /* guess type of missing frame for SP_LOST and NO_DATA */
-    {
-        speech_lost = st->CNG_fx == 0;
-        move16();
-        move16();
-        no_data = st->CNG_fx != 0;
-        move16();
-    }
-
-    test();
-    IF( partialframe || st->prev_use_partial_copy )
-    {
-        st->next_coder_type = next_coder_type;
-        move16();
-    }
-    ELSE
-    {
-        st->next_coder_type = INACTIVE;
-        move16();
-    }
-
-    if ( EQ_16( partialframe, 1 ) )
-    {
-        st->bfi = 2;
-        move16();
-    }
-
-    /* unpack speech data */
-    bit_stream_ptr = st->bit_stream;
-    /* convert bitstream from compact bytes to short values and store it in decoder state */
-    FOR( k = 0; k < num_bits; k++ )
-    {
-        test();
-        IF( EQ_16( st->bitstreamformat, VOIP_RTPDUMP ) && isAMRWB_IOmode )
-        {
-            st->bit_stream[sort_ptr[core_mode][k]] = unpack_bit( &pt_stream, &mask );
-            move16();
-            bit_stream_ptr++;
-        }
-        ELSE
-        {
-            *bit_stream_ptr++ = unpack_bit( &pt_stream, &mask );
-            move16();
-        }
-    }
-
-    /* unpack auxiliary bits */
-    test();
-    IF( isAMRWB_IOmode && EQ_32( total_brate, SID_1k75 ) )
-    {
-        IF( EQ_16( st->bitstreamformat, VOIP_RTPDUMP ) )
-        {
-            /* A.2.2.1.3: AMR-WB SID_1k75 frame is followed by STI bit and CMI bits */
-            sti = unpack_bit( &pt_stream, &mask );
-        }
-        ELSE
-        {
-            /* VOIP_G192_RTP does not contain STI and CMI */
-            sti = 1;
-            move16();
-        }
-        read_indices_mime_handle_sti_and_all_zero_bits( st, &total_brate, sti );
-    }
-
-    /* add two zero bytes for arithmetic coder flush */
-    FOR( k = 0; k < 8 * 2; ++k )
-    {
-        *bit_stream_ptr++ = 0;
-        move16();
-    }
-
-    total_brate = read_indices_mime_handle_dtx( st, isAMRWB_IOmode, core_mode, total_brate, sti, speech_lost, no_data );
-    /* st->CNG_fx set inside */
-
-    IF( NE_16( st->bfi, 1 ) )
-    {
-        /* select Mode 1 or Mode 2 */
-        IF( *st->bit_stream )
-        {
-            decoder_selectCodec( st, total_brate, G192_BIN1 );
-        }
-        ELSE
-        {
-            decoder_selectCodec( st, total_brate, G192_BIN0 );
-        }
-
-
-        /* a change of the total bitrate should not be known to the decoder, if the received frame was truly lost */
-        st->total_brate = total_brate;
-        move32();
-
-        mdct_switching_dec( st );
-    }
-}
-
-
 /*-------------------------------------------------------------------*
  * get_indice_preview()
  *
diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c
index 5a3d2e1a27b1fd60aba746579f8bc5cee346fe1e..bf832b6406227404a4b3ef4da5e6595bea4ae48e 100644
--- a/lib_com/cldfb.c
+++ b/lib_com/cldfb.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,6 @@
 #include "options.h"
 #include <math.h>
 #include "stat_dec.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "rom_com.h"
 #include "rom_com_fx.h"
@@ -61,6 +60,19 @@ static void cldfb_init_proto_and_twiddles( HANDLE_CLDFB_FILTER_BANK hs );
 
 static void cldfb_init_proto_and_twiddles_enc_fx( HANDLE_CLDFB_FILTER_BANK hs );
 
+static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead,     /*!< o: Q(*sf_energyLookahead) |   pointer to the result in the core look-ahead slot */
+                                    Word16 *sf_energyLookahead,  /*!< o:         pointer to the scalefactor of the result in the core look-ahead slot  */
+                                    const Word16 numLookahead,   /*!< i: Q0      the number of look-ahead time-slots */
+                                    Word16 **realValues,         /*!< i: Q(sf_Values) |   the real part of the CLDFB subsamples */
+                                    Word16 **imagValues,         /*!< i: Q(sf_Values) |   the imaginary part of the CLDFB subsamples */
+                                    Word16 sf_Values,            /*!< i:         scalefactor of the CLDFB subcamples - apply as a negated Exponent */
+                                    Word16 numberBands,          /*!< i: Q0  |   number of CLDFB bands */
+                                    Word16 numberCols,           /*!< i: Q0  |   number of CLDFB subsamples */
+                                    Word32 *energyHF,            /*!< o: Q31 |   pointer to HF energy */
+                                    Word16 *energyHF_Exp,        /*!< o:         pointer to exponent of HF energy */
+                                    Word32 *energyValuesSum,     /*!< o: Q(2*sf_Values-4) |   pointer to sum array of energy values, not initialized*/
+                                    Word16 *energyValuesSum_Exp, /*!< o:         pointer to exponents of energyValuesSum, not initialized */
+                                    TEC_ENC_HANDLE hTecEnc );
 
 /*-------------------------------------------------------------------*
  * cplxMult()
@@ -400,18 +412,28 @@ void cldfbAnalysis_ts_fx(
             /* folding + pre modulation of DST IV */
             rr12_fx = L_sub( r1_fx, r2_fx );             // q -1
             ri12_fx = L_negate( L_add( i1_fx, i2_fx ) ); // q - 1
-            /*cplxMult(&rBuffer[2*k],&rBuffer[2*k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);*/
-            rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) );     // q - 3
-            rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) ); // q - 3
+                                                         /*cplxMult(&rBuffer[2*k],&rBuffer[2*k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);*/
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            rBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), ri12_fx, rot_vctr_im_fx[k] );     // q - 3
+            rBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), ri12_fx, rot_vctr_re_fx[k] ); // q - 3
+#else                                                                                                                  /* OPT_AVOID_STATE_BUF_RESCALE */
+            rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) );                                                 // q - 3
+            rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) );                                             // q - 3
+#endif                                                                                                                 /* OPT_AVOID_STATE_BUF_RESCALE */
             move32();
             move32();
 
             ///* folding + pre modulation of DCT IV */
             ir12_fx = L_add( r1_fx, r2_fx ); // q - 1
             ii12_fx = L_sub( i1_fx, i2_fx ); // q - 1
-            /*cplxMult(&iBuffer[2*k],&iBuffer[2*k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);*/
-            iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) );     // q - 3
-            iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) ); // q - 3
+                                             /*cplxMult(&iBuffer[2*k],&iBuffer[2*k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);*/
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            iBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), ii12_fx, rot_vctr_im_fx[k] );     // q - 3
+            iBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), ii12_fx, rot_vctr_re_fx[k] ); // q - 3
+#else                                                                                                                  /* OPT_AVOID_STATE_BUF_RESCALE */
+            iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) );                                                 // q - 3
+            iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) );                                             // q - 3
+#endif                                                                                                                 /* OPT_AVOID_STATE_BUF_RESCALE */
             move32();
             move32();
         }
@@ -451,18 +473,28 @@ void cldfbAnalysis_ts_fx(
             /* folding + pre modulation of DST IV */
             rr12_fx = L_add( r1_fx, r2_fx ); // q - 1
             ri12_fx = L_sub( i1_fx, i2_fx ); // q - 1
-            /*cplxMult(&rBuffer[2*k],&rBuffer[2*k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);*/
-            rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) );     // q - 3
-            rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) ); // q - 3
+                                             /*cplxMult(&rBuffer[2*k],&rBuffer[2*k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);*/
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            rBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), ri12_fx, rot_vctr_im_fx[k] );     // q - 3
+            rBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), ri12_fx, rot_vctr_re_fx[k] ); // q - 3
+#else                                                                                                                  /* OPT_AVOID_STATE_BUF_RESCALE */
+            rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) );                                                 // q - 3
+            rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) );                                             // q - 3
+#endif                                                                                                                 /* OPT_AVOID_STATE_BUF_RESCALE */
             move32();
             move32();
 
             /* folding + pre modulation of DCT IV */
             ir12_fx = L_sub( r1_fx, r2_fx ); // q - 1
             ii12_fx = L_add( i1_fx, i2_fx ); // q - 1
-            /*cplxMult(&iBuffer[2*k],&iBuffer[2*k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);*/
-            iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) );     // q - 3
-            iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) ); // q - 3
+                                             /*cplxMult(&iBuffer[2*k],&iBuffer[2*k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);*/
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            iBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), ii12_fx, rot_vctr_im_fx[k] );     // q - 3
+            iBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), ii12_fx, rot_vctr_re_fx[k] ); // q - 3
+#else                                                                                                                  /* OPT_AVOID_STATE_BUF_RESCALE */
+            iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) );                                                 // q - 3
+            iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) );                                             // q - 3
+#endif                                                                                                                 /* OPT_AVOID_STATE_BUF_RESCALE */
             move32();
             move32();
         }
@@ -491,8 +523,13 @@ void cldfbAnalysis_ts_fx(
         FOR( k = 0; k < M2; k++ )
         {
             /*cplxMult(&realBuffer[M1-1-(2*k)],&realBuffer[2*k],rBuffer[2*k],rBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = Msub_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ); // q - 5
+            realBuffer_fx[2 * k] = Madd_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] );                      // q - 5
+#else                                                                                                                                                              /* OPT_AVOID_STATE_BUF_RESCALE */
             realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = L_sub( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) ); // q - 5
             realBuffer_fx[2 * k] = L_add( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) );                      // q - 5
+#endif                                                                                                                                                             /* OPT_AVOID_STATE_BUF_RESCALE */
             move32();
             move32();
         }
@@ -521,8 +558,13 @@ void cldfbAnalysis_ts_fx(
         {
             /* do it inplace */
             /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
-            imagBuffer_fx[2 * k] = L_sub( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) );                  // q - 5
-            imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_add( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) ); // q - 5
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] );                  // q - 5
+            imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
+#else                                                                                                                                                          /* OPT_AVOID_STATE_BUF_RESCALE */
+            imagBuffer_fx[2 * k] = L_sub( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) );                      // q - 5
+            imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_add( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) );     // q - 5
+#endif                                                                                                                                                         /* OPT_AVOID_STATE_BUF_RESCALE */
             move32();
             move32();
         }
@@ -543,8 +585,13 @@ void cldfbAnalysis_ts_fx(
                     /*cplxMult(&realBuffer[k], &imagBuffer[k], realBuffer[k], imagBuffer[k], rot_vctr_delay_re[k], rot_vctr_delay_im[k]);*/
                     /*realBuffer[k] = rBuffer[k];
                     imagBuffer[k] = iBuffer[k];*/
-                    cplx_aux_fx = L_sub( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_im_fx[k] ) );      // q - 5
-                    imagBuffer_fx[k] = L_add( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ) ); // q - 5
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                    cplx_aux_fx = Msub_32_32( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), imagBuffer_fx[k], rot_vctr_delay_im_fx[k] );      // q - 5
+                    imagBuffer_fx[k] = Madd_32_32( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ); // q - 5
+#else                                                                                                                                                   /* OPT_AVOID_STATE_BUF_RESCALE */
+                    cplx_aux_fx = L_sub( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_im_fx[k] ) );                 // q - 5
+                    imagBuffer_fx[k] = L_add( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ) );            // q - 5
+#endif                                                                                                                                                  /* OPT_AVOID_STATE_BUF_RESCALE */
                     realBuffer_fx[k] = cplx_aux_fx;
                     move32();
                     move32();
@@ -867,7 +914,7 @@ void cldfbAnalysis_ts_fx_fixed_q(
     const Word16 *ptr_pf_fx;
     Word16 ptr_pf_sf;
     Word32 *timeBuffer_fx, buffer_fx[( CLDFB_NO_CHANNELS_MAX * CLDFB_NO_COL_MAX ) + ( 9 * CLDFB_NO_CHANNELS_MAX )];
-    Word16 offset, frameSize;
+    Word16 offset, frameSize, gb, hr, shift;
 
     offset = sub( h_cldfb->p_filter_length, h_cldfb->no_channels );
     frameSize = i_mult( h_cldfb->no_channels, h_cldfb->no_col );
@@ -1037,18 +1084,42 @@ void cldfbAnalysis_ts_fx_fixed_q(
         *q_cldfb = sub( *q_cldfb, 2 );
         move16();
 
+        gb = find_guarded_bits_fx( M1 );
+        hr = L_norm_arr( iBuffer_fx, M1 );
+
+        IF( LT_16( hr, gb ) )
+        {
+            scale_sig32( iBuffer_fx, M1, sub( hr, gb ) );
+        }
+
         /* FFT of DCT IV */
         fft_cldfb_fx( iBuffer_fx, M2 );
 
         /* post modulation of DCT IV */
-        FOR( k = 0; k < M2; k++ )
+        IF( LT_16( hr, gb ) )
         {
-            /* do it inplace */
-            /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
-            imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] );                  // q - 5
-            imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
-            move32();
-            move32();
+            shift = sub( gb, hr );
+            FOR( k = 0; k < M2; k++ )
+            {
+                /* do it inplace */
+                /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
+                imagBuffer_fx[2 * k] = L_shl( Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ), shift );                  // q - 5
+                imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_shl( Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ), shift ); // q - 5
+                move32();
+                move32();
+            }
+        }
+        ELSE
+        {
+            FOR( k = 0; k < M2; k++ )
+            {
+                /* do it inplace */
+                /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
+                imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] );                  // q - 5
+                imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
+                move32();
+                move32();
+            }
         }
 
         IF( EQ_32( h_cldfb->prototype, CLDFB_PROTOTYPE_5_00MS ) )
@@ -1092,16 +1163,21 @@ void cldfbAnalysis_ts_fx_fixed_q(
 
     return;
 }
+
 /*-------------------------------------------------------------------*
  * cldfbSynthesis_ivas()
  *
  * Conduct inverse multple overlap cmplex low delay MDCT
  *--------------------------------------------------------------------*/
 void cldfbSynthesis_ivas_fx(
-    Word32 **realBuffer_fx,          /* i  : real values                 Qx*/
-    Word32 **imagBuffer_fx,          /* i  : imag values                 Qx*/
-    Word32 *timeOut_fx,              /* o  : output time domain samples  Qx - 1*/
-    const Word16 samplesToProcess,   /* i  : number of processed samples */
+    Word32 **realBuffer_fx,        /* i  : real values                 Qx*/
+    Word32 **imagBuffer_fx,        /* i  : imag values                 Qx*/
+    Word32 *timeOut_fx,            /* o  : output time domain samples  Qx - 1*/
+    const Word16 samplesToProcess, /* i  : number of processed samples */
+    const Word16 shift,            /* i  : scale for state buffer */
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+    const Word16 out_shift,          /* i  : scale for output buffer */
+#endif                               /* OPT_AVOID_STATE_BUF_RESCALE */
     HANDLE_CLDFB_FILTER_BANK h_cldfb /* i  : filter bank state           */
 )
 {
@@ -1213,7 +1289,7 @@ void cldfbSynthesis_ivas_fx(
             /*cplxMult(&iBuffer[2*i], &iBuffer[2*i+1],-imagBuffer[k][2*i], imagBuffer[k][M1-1-2*i], rot_vctr_re[i], rot_vctr_im[i]);*/
             iBuffer_fx[2 * i] = Msub_32_32( Mpy_32_32( ( L_negate( imagBuffer_fx[k][2 * i] ) ), rot_vctr_re_fx[i] ), imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_im_fx[i] ); // Qx
             move32();
-            iBuffer_fx[2 * i + 1] = Madd_32_32( Mpy_32_32( ( L_negate( imagBuffer_fx[k][2 * i] ) ), rot_vctr_im_fx[i] ), imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_re_fx[i] ); // Qx
+            iBuffer_fx[2 * i + 1] = Msub_32_32( Mpy_32_32( imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_re_fx[i] ), imagBuffer_fx[k][2 * i], rot_vctr_im_fx[i] ); // Qx
             move32();
         }
 
@@ -1267,31 +1343,73 @@ void cldfbSynthesis_ivas_fx(
         }
 
         /* synthesis prototype filter */
-        FOR( i = 0; i < L2; i++ )
+        IF( 0 == shift )
+        {
+            FOR( i = 0; i < L2; i++ )
+            {
+                accu0 = Madd_32_16( synthesisBuffer_fx[i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[i] ), p_filter_sf );                       // Qx - 1
+                accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 1 * L2 + i )] ), p_filter_sf ); // Qx - 1
+                accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 2 * L2 + i )] ), p_filter_sf ); // Qx - 1
+                accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 3 * L2 + i )] ), p_filter_sf ); // Qx - 1
+                accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 4 * L2 + i )] ), p_filter_sf ); // Qx - 1
+
+                synthesisBuffer_fx[i] = accu0;
+                move32();
+                synthesisBuffer_fx[1 * L2 + i] = accu1;
+                move32();
+                synthesisBuffer_fx[2 * L2 + i] = accu2;
+                move32();
+                synthesisBuffer_fx[3 * L2 + i] = accu3;
+                move32();
+                synthesisBuffer_fx[4 * L2 + i] = accu4;
+                move32();
+            }
+        }
+        ELSE
         {
-            accu0 = Madd_32_16( synthesisBuffer_fx[i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[i] ), p_filter_sf );                       // Qx - 1
-            accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 1 * L2 + i )] ), p_filter_sf ); // Qx - 1
-            accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 2 * L2 + i )] ), p_filter_sf ); // Qx - 1
-            accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 3 * L2 + i )] ), p_filter_sf ); // Qx - 1
-            accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter[( 4 * L2 + i )] ), p_filter_sf ); // Qx - 1
 
-            synthesisBuffer_fx[i] = accu0;
-            move32();
-            synthesisBuffer_fx[1 * L2 + i] = accu1;
-            move32();
-            synthesisBuffer_fx[2 * L2 + i] = accu2;
-            move32();
-            synthesisBuffer_fx[3 * L2 + i] = accu3;
-            move32();
-            synthesisBuffer_fx[4 * L2 + i] = accu4;
-            move32();
+            FOR( i = 0; i < L2; i++ )
+            {
+                Word32 prod = L_shl_sat( Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter_sf ), shift );
+                accu0 = Madd_32_16( synthesisBuffer_fx[i], prod, p_filter[i] );                       // Qx -1 + shift
+                accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], prod, p_filter[( 1 * L2 + i )] ); // Qx -1 + shift
+                accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], prod, p_filter[( 2 * L2 + i )] ); // Qx -1 + shift
+                accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], prod, p_filter[( 3 * L2 + i )] ); // Qx -1 + shift
+                accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], prod, p_filter[( 4 * L2 + i )] ); // Qx -1 + shift
+
+                synthesisBuffer_fx[i] = accu0;
+                move32();
+                synthesisBuffer_fx[1 * L2 + i] = accu1;
+                move32();
+                synthesisBuffer_fx[2 * L2 + i] = accu2;
+                move32();
+                synthesisBuffer_fx[3 * L2 + i] = accu3;
+                move32();
+                synthesisBuffer_fx[4 * L2 + i] = accu4;
+                move32();
+            }
         }
 
-        FOR( i = 0; i < M1; i++ )
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+        IF( 0 == out_shift )
         {
-            ptr_time_out_fx[( M1 - 1 ) - i] = synthesisBuffer_fx[4 * L2 + M1 + i];
-            move32();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+            FOR( i = 0; i < M1; i++ )
+            {
+                ptr_time_out_fx[( M1 - 1 ) - i] = synthesisBuffer_fx[4 * L2 + M1 + i];
+                move32();
+            }
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+        }
+        ELSE
+        {
+            FOR( i = 0; i < M1; i++ )
+            {
+                ptr_time_out_fx[( M1 - 1 ) - i] = L_shl_sat( synthesisBuffer_fx[4 * L2 + M1 + i], out_shift );
+                move32();
+            }
         }
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
 
         ptr_time_out_fx += M1;
 
@@ -1306,7 +1424,6 @@ void cldfbSynthesis_ivas_fx(
     return;
 }
 
-
 void configureCldfb_ivas_enc_fx(
     HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle        */
     const Word32 sampling_rate        /* i  : sampling rate             */
@@ -1365,8 +1482,8 @@ ivas_error openCldfb_ivas_fx(
     HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle                */
     CLDFB_TYPE type,                   /* i  : analysis or synthesis             */
     const Word32 sampling_rate,        /* i  : sampling rate                     */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay)  */
-)
+    CLDFB_PROTOTYPE prototype,         /* i  : CLDFB version (1.25ms/5ms delay)  */
+    const Word16 enc_dec )             /* i  : encoder/decoder flag            */
 {
     HANDLE_CLDFB_FILTER_BANK hs;
     Word16 buf_len;
@@ -1380,95 +1497,45 @@ ivas_error openCldfb_ivas_fx(
     move32();
     hs->prototype = prototype;
     move32();
-    configureCldfb_ivas_fx( hs, sampling_rate );
-    hs->memory32 = NULL;
-    hs->FilterStates = NULL;
-    hs->memory_length = 0;
-    move16();
-
-    IF( EQ_32( type, CLDFB_ANALYSIS ) )
+    IF( enc_dec == ENC )
     {
-        buf_len = sub( hs->p_filter_length, hs->no_channels );
+        configureCldfb_ivas_enc_fx( hs, sampling_rate );
+        hs->Q_cldfb_state = 0;
     }
     ELSE
     {
-        buf_len = hs->p_filter_length;
-        move16();
-    }
-
-    IF( ( hs->cldfb_state_fx = (Word32 *) malloc( buf_len * sizeof( Word32 ) ) ) == NULL )
-    {
-        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
+        configureCldfb_ivas_fx( hs, sampling_rate );
+        hs->Q_cldfb_state = Q11;
     }
-
-    hs->cldfb_state_length = buf_len; // Temporarily added to store the length of buffer
-    move16();
-    hs->cldfb_size = buf_len; /*for having original size at intermediatery conversion, will be removed on removing conversion*/
-    move16();
-    set32_fx( hs->cldfb_state_fx, 0, buf_len );
-    hs->Q_cldfb_state = Q11;
-    move16();
-    *h_cldfb = hs;
     move16();
-
-    return IVAS_ERR_OK;
-}
-
-ivas_error openCldfb_ivas_enc(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle                */
-    CLDFB_TYPE type,                   /* i  : analysis or synthesis             */
-    const Word32 sampling_rate,        /* i  : sampling rate                     */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay)  */
-)
-{
-    HANDLE_CLDFB_FILTER_BANK hs;
-    Word16 buf_len;
-
-    IF( ( hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) ) ) == NULL )
-    {
-        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
-    }
-
-    hs->type = type;
-    move32();
-    hs->prototype = prototype;
-    move32();
-
-    configureCldfb_ivas_enc_fx( hs, sampling_rate );
+    hs->memory32 = NULL;
+    hs->FilterStates = NULL;
     hs->memory_length = 0;
-    move32();
+    move16();
 
-    IF( type == CLDFB_ANALYSIS )
+    IF( EQ_32( type, CLDFB_ANALYSIS ) )
     {
         buf_len = sub( hs->p_filter_length, hs->no_channels );
-        hs->FilterStates = (Word16 *) malloc( ( 9 + 16 ) * CLDFB_getNumChannels( sampling_rate ) * sizeof( Word16 ) );
-        hs->FilterStates_eg = 0;
-        move16();
     }
     ELSE
     {
         buf_len = hs->p_filter_length;
         move16();
-        hs->FilterStates = (Word16 *) malloc( 2 * ( 9 + 16 ) * CLDFB_getNumChannels( sampling_rate ) * sizeof( Word16 ) );
-        hs->FilterStates_eg = 0;
-        move16();
     }
 
-    if ( ( hs->cldfb_state_fx = (Word32 *) malloc( buf_len * sizeof( Word32 ) ) ) == NULL )
+    IF( ( hs->cldfb_state_fx = (Word32 *) malloc( buf_len * sizeof( Word32 ) ) ) == NULL )
     {
         return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
     }
+
     hs->cldfb_state_length = buf_len; // Temporarily added to store the length of buffer
     move16();
     hs->cldfb_size = buf_len; /*for having original size at intermediatery conversion, will be removed on removing conversion*/
     move16();
     set32_fx( hs->cldfb_state_fx, 0, buf_len );
-    hs->Q_cldfb_state = 0;
-    move16();
-    set16_fx( hs->FilterStates, 0, i_mult( 9 + 16, hs->no_channels ) );
-    set16_fx( hs->FilterStates_e, 0, sizeof( hs->FilterStates_e ) / sizeof( hs->FilterStates_e[0] ) );
 
     *h_cldfb = hs;
+    move16();
 
     return IVAS_ERR_OK;
 }
@@ -1498,6 +1565,168 @@ void resampleCldfb_ivas_fx(
     return;
 }
 
+static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead,     /*!< o: Q(*sf_energyLookahead) |   pointer to the result in the core look-ahead slot */
+                                    Word16 *sf_energyLookahead,  /*!< o:         pointer to the scalefactor of the result in the core look-ahead slot  */
+                                    const Word16 numLookahead,   /*!< i: Q0      the number of look-ahead time-slots */
+                                    Word16 **realValues,         /*!< i: Q(sf_Values) |   the real part of the CLDFB subsamples */
+                                    Word16 **imagValues,         /*!< i: Q(sf_Values) |   the imaginary part of the CLDFB subsamples */
+                                    Word16 sf_Values,            /*!< i:         scalefactor of the CLDFB subcamples - apply as a negated Exponent */
+                                    Word16 numberBands,          /*!< i: Q0  |   number of CLDFB bands */
+                                    Word16 numberCols,           /*!< i: Q0  |   number of CLDFB subsamples */
+                                    Word32 *energyHF,            /*!< o: Q31 |   pointer to HF energy */
+                                    Word16 *energyHF_Exp,        /*!< o:         pointer to exponent of HF energy */
+                                    Word32 *energyValuesSum,     /*!< o: Q(2*sf_Values-4) |   pointer to sum array of energy values, not initialized*/
+                                    Word16 *energyValuesSum_Exp, /*!< o:         pointer to exponents of energyValuesSum, not initialized */
+                                    TEC_ENC_HANDLE hTecEnc )
+{
+    Word16 j;
+    Word16 k;
+    Word16 s;
+    Word16 sm;
+    Word32 nrg;
+    Word16 numberColsL;
+    Word16 numberBandsM;
+    Word16 numberBandsM20;
+    Word32 energyValues[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
+    Word16 energyValuesSumE[CLDFB_NO_CHANNELS_MAX];
+    // Word16 freqTable[2] = {20, 40};
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
+#endif
+
+    FOR( k = 0; k < numberCols; k++ )
+    {
+        FOR( j = 0; j < numberBands; j++ )
+        {
+            nrg = L_mult0( realValues[k][j], realValues[k][j] );     // Q(2*sf_Values)
+            nrg = L_mac0( nrg, imagValues[k][j], imagValues[k][j] ); // Q(2*sf_Values)
+
+            energyValues[k][j] = nrg;
+            move32();
+        }
+    }
+
+    IF( GE_16( numberBands, freqTable[1] ) && hTecEnc != NULL )
+    {
+        Word32 *tempEnergyValuesArry[CLDFB_NO_COL_MAX];
+        Word16 ScaleX2;
+        assert( numberCols == CLDFB_NO_COL_MAX );
+        FOR( j = 0; j < numberCols; j++ )
+        {
+            tempEnergyValuesArry[j] = &energyValues[j][0];
+        }
+
+        ScaleX2 = shl( sf_Values, 1 );
+        calcHiEnvLoBuff_Fix(
+            numberCols,
+            freqTable,
+            1,
+            tempEnergyValuesArry,
+            hTecEnc->loBuffer,
+            hTecEnc->hiTempEnv,
+            ScaleX2 );
+    }
+
+    FOR( j = 0; j < numberBands; j++ )
+    {
+        energyValuesSum[j] = 0;
+        move32();
+        energyValuesSumE[j] = 31;
+        move16();
+        FOR( k = 0; k < CLDFB_NO_COL_MAX; k++ )
+        {
+            nrg = L_shr_r( energyValues[k][j], sub( energyValuesSumE[j], 31 ) ); // Q(2*sf_Values - (energyValuesSumE[j]-31))
+            IF( LT_32( L_sub( maxWord32, nrg ), energyValuesSum[j] ) )
+            {
+                energyValuesSumE[j] = add( energyValuesSumE[j], 1 );
+                move16();
+                energyValuesSum[j] = L_shr_r( energyValuesSum[j], 1 );
+                move32();
+                nrg = L_shr_r( nrg, 1 );
+            }
+            energyValuesSum[j] = L_add( energyValuesSum[j], nrg );
+            move32();
+        }
+        test();
+        if ( j == 0 || GT_16( energyValuesSumE[j], *energyValuesSum_Exp ) )
+        {
+            *energyValuesSum_Exp = energyValuesSumE[j];
+            move16();
+        }
+    }
+    FOR( j = 0; j < numberBands; j++ )
+    {
+        energyValuesSum[j] = L_shr_r( energyValuesSum[j], sub( *energyValuesSum_Exp, energyValuesSumE[j] ) ); // Q(energyValuesSum_Exp - (2*sf_Values))
+        move32();
+    }
+    *energyValuesSum_Exp = sub( *energyValuesSum_Exp, shl( sf_Values, 1 ) );
+    move16();
+
+    IF( GT_16( numberBands, 20 ) )
+    {
+        numberBandsM = s_min( numberBands, 40 );
+        numberBandsM20 = sub( numberBandsM, 20 );
+
+        numberColsL = sub( numberCols, numLookahead );
+
+        /* sum up CLDFB energy above 8 kHz */
+        s = BASOP_util_norm_s_bands2shift( i_mult( numberColsL, numberBandsM20 ) );
+        s = sub( s, 4 );
+        nrg = 0;
+        move32();
+        FOR( k = 0; k < numberColsL; k++ )
+        {
+            FOR( j = 20; j < numberBandsM; j++ )
+            {
+                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
+            }
+        }
+
+        s = sub( sub( shl( sf_Values, 1 ), 1 ), s );
+        sm = sub( s_min( s, *sf_energyLookahead ), 1 );
+
+        *energyHF = L_add( L_shr( nrg, limitScale32( sub( s, sm ) ) ),
+                           L_shr( *energyLookahead, sub( *sf_energyLookahead, sm ) ) ); // Q(31-(-nm))
+        move32();
+
+        *energyHF_Exp = negate( sm );
+        move16();
+
+        /* process look-ahead region */
+        s = BASOP_util_norm_s_bands2shift( i_mult( numLookahead, numberBandsM20 ) );
+        s = sub( s, 2 );
+        nrg = 0;
+        move32();
+        FOR( k = numberColsL; k < numberCols; k++ )
+        {
+            FOR( j = 20; j < numberBandsM; j++ )
+            {
+                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
+            }
+        }
+
+        s = sub( shl( sf_Values, 1 ), s );
+        sm = sub( s_min( s, 44 ), 1 );
+        BASOP_SATURATE_WARNING_OFF_EVS
+        /* nrg + 6.1e-5f => value 0x40000000, scale 44 */
+        *energyLookahead = L_add_sat( L_shr_sat( nrg, sub( s, sm ) ),
+                                      L_shr_sat( 0x40000000, s_max( -31, s_min( 31, sub( 44, sm ) ) ) ) );
+        move32();
+        BASOP_SATURATE_WARNING_ON_EVS
+        *sf_energyLookahead = sm;
+        move16();
+
+        return;
+    }
+
+
+    *energyHF = 0x40000000;
+    move32();
+    *energyHF_Exp = 17;
+    move16();
+}
+
 
 void analysisCldfbEncoder_ivas_fx(
     Encoder_State *st, /* i/o: encoder state structure   */
@@ -1559,42 +1788,7 @@ void analysisCldfbEncoder_ivas_fx(
 
     AnalysisPostSpectrumScaling_Fx( st->cldfbAnaEnc, ppBuf_Real, ppBuf_Imag, ppBuf_Real16, ppBuf_Imag16, &enerScale.lb_scale16 );
 
-    GetEnergyCldfb( &st->energyCoreLookahead_Fx, &st->sf_energyCoreLookahead_Fx, 1, ppBuf_Real16, ppBuf_Imag16, enerScale.lb_scale16, st->cldfbAnaEnc->no_channels, st->cldfbAnaEnc->no_col, &st->currEnergyHF_fx, &st->currEnergyHF_e_fx, ppBuf_Ener, enerBuffSum_exp, st->hTECEnc );
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * GetEnergyCldfb_ivas()
- *
- * Remove handle
- *--------------------------------------------------------------------*/
-
-void deleteCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle  */
-)
-{
-    HANDLE_CLDFB_FILTER_BANK hs = *h_cldfb;
-
-    test();
-    IF( h_cldfb == NULL || *h_cldfb == NULL )
-    {
-        return;
-    }
-
-    IF( hs->cldfb_state_fx )
-    {
-        free( hs->cldfb_state_fx );
-    }
-
-    IF( hs->FilterStates )
-    {
-        free( hs->FilterStates );
-    }
-
-    free( hs );
-    *h_cldfb = NULL;
+    GetEnergyCldfb_ivas_fx( &st->energyCoreLookahead_Fx, &st->sf_energyCoreLookahead_Fx, 1, ppBuf_Real16, ppBuf_Imag16, enerScale.lb_scale16, st->cldfbAnaEnc->no_channels, st->cldfbAnaEnc->no_col, &st->currEnergyHF_fx, &st->currEnergyHF_e_fx, ppBuf_Ener, enerBuffSum_exp, st->hTECEnc );
 
     return;
 }
diff --git a/lib_com/cldfb_evs.c b/lib_com/cldfb_evs.c
index 923d2b8873b3f15ed2a49e3371ce98da27b4d4f2..51c9ee6f9568dbc05a9f19927fa53fa7bfcca3f2 100644
--- a/lib_com/cldfb_evs.c
+++ b/lib_com/cldfb_evs.c
@@ -72,7 +72,6 @@ cldfb_init_proto_and_twiddles( HANDLE_CLDFB_FILTER_BANK hs );
     iyr = CL_Extract_real( CL_iy );                                                                   \
     iyi = CL_Extract_imag( CL_iy );                                                                   \
     rxr += sx, rxi += sx, ixr += sx, ixi += sx, cr += sr, ci += sr
-#ifdef BASOP_NOGLOB
 
 #define add1( y1, y2, y3, y4, rr12, ri12, ir12, ii12, s )                      \
     *y1 = round_fx_sat( L_shl_sat( L_negate( L_add_sat( rr12, ii12 ) ), s ) ); \
@@ -88,21 +87,6 @@ cldfb_init_proto_and_twiddles( HANDLE_CLDFB_FILTER_BANK hs );
     *y4 = round_fx_sat( L_shl_sat( L_sub_sat( rr12, ii12 ), s ) ); \
     y1 += 2, y2 -= 2, y3 -= 2, y4 += 2
 
-#else
-#define add1( y1, y2, y3, y4, rr12, ri12, ir12, ii12, s )          \
-    *y1 = round_fx( L_shl( L_negate( L_add( rr12, ii12 ) ), s ) ); \
-    *y2 = round_fx( L_shl( L_negate( L_add( ri12, ir12 ) ), s ) ); \
-    *y3 = round_fx( L_shl( L_sub( rr12, ii12 ), s ) );             \
-    *y4 = round_fx( L_shl( L_sub( ir12, ri12 ), s ) );             \
-    y1 += 2, y2 -= 2, y3 -= 2, y4 += 2
-
-#define add2( y1, y2, y3, y4, rr12, ri12, ir12, ii12, s ) \
-    *y1 = round_fx( L_shl( L_add( ri12, ir12 ), s ) );    \
-    *y2 = round_fx( L_shl( L_add( rr12, ii12 ), s ) );    \
-    *y3 = round_fx( L_shl( L_sub( ir12, ri12 ), s ) );    \
-    *y4 = round_fx( L_shl( L_sub( rr12, ii12 ), s ) );    \
-    y1 += 2, y2 -= 2, y3 -= 2, y4 += 2
-#endif
 
 #define ptrUpdate16( y11, y12, y13, y14, r11, x11, x12, x13, x14, r12, y21, y22, y23, y24, r21, x21, x22, x23, x24, r22 ) \
     y11 += 2 * N8, y12 -= 2 * N8, y13 -= 2 * N8, y14 += 2 * N8, r11 -= 1 * N8;                                            \
@@ -354,7 +338,7 @@ static void calcModulationAndFolding( Word16 *rY,
 }
 
 
-/* cldfbAnalysisFiltering
+/* cldfbAnalysis_fx
 
    Parameters:
      cldfbBank          I/O: handle to analysis CLDFB filter struct
@@ -372,14 +356,15 @@ static void calcModulationAndFolding( Word16 *rY,
    Returns:
       void
 */
-void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
-                             Word32 **rAnalysis,
-                             Word32 **iAnalysis,
-                             CLDFB_SCALE_FACTOR *scaleFactor,
-                             const Word16 *timeIn, // Q(15-timeIn_e)
-                             const Word16 timeIn_e,
-                             const Word16 nTimeSlots,
-                             Word32 *pWorkBuffer // Qx
+void cldfbAnalysis_fx(
+    HANDLE_CLDFB_FILTER_BANK cldfbBank,
+    Word32 **rAnalysis,
+    Word32 **iAnalysis,
+    CLDFB_SCALE_FACTOR *scaleFactor,
+    const Word16 *timeIn, // Q(15-timeIn_e)
+    const Word16 timeIn_e,
+    const Word16 nTimeSlots,
+    Word32 *pWorkBuffer // Qx
 )
 
 {
@@ -497,11 +482,7 @@ void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
     /* move and scale filter states */
     FOR( i = 0; i < offset; i++ )
     {
-#ifdef BASOP_NOGLOB
         pStates[i] = shl_sat( pStates[i + nSamplesUpd], scale ); // Q(15-(timeIn_e-FilterStates_eg))
-#else
-        pStates[i] = shl( pStates[i + nSamplesUpd], scale );
-#endif
         move16();
     }
 
@@ -509,11 +490,7 @@ void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
     scale = sub( timeIn_e, cldfbBank->FilterStates_eg );
     FOR( i = 0; i < nSamples; i++ )
     {
-#ifdef BASOP_NOGLOB
         pStates[offset + i] = shl_sat( *timeIn, scale ); // Q(15-scale)
-#else
-        pStates[offset + i] = shl( *timeIn, scale );
-#endif
         move16();
         timeIn = timeIn + stride;
     }
@@ -634,7 +611,7 @@ void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
 }
 
 
-/* cldfbSynthesisFiltering
+/* cldfbSynthesis_fx
 
    Parameters:
      cldfbBank          I/O: handle to analysis CLDFB filter struct
@@ -653,14 +630,15 @@ void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
    Returns:
       void
 */
-void cldfbSynthesisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
-                              Word32 **rAnalysis,
-                              Word32 **iAnalysis,
-                              const CLDFB_SCALE_FACTOR *scaleFactor,
-                              Word16 *timeOut, // Q(15-timeOut_e)
-                              const Word16 timeOut_e,
-                              const Word16 nTimeSlots,
-                              Word32 *pWorkBuffer // Qx
+void cldfbSynthesis_fx(
+    HANDLE_CLDFB_FILTER_BANK cldfbBank,
+    Word32 **rAnalysis,
+    Word32 **iAnalysis,
+    const CLDFB_SCALE_FACTOR *scaleFactor,
+    Word16 *timeOut, // Q(15-timeOut_e)
+    const Word16 timeOut_e,
+    const Word16 nTimeSlots,
+    Word32 *pWorkBuffer // Qx
 )
 {
     Word16 i;
@@ -880,11 +858,7 @@ void cldfbSynthesisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
             acc = L_mac( acc, nBuffer[sub( channels1, i )], *pFilterM++ );
 
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             timeOut[( offset1 - i ) * stride] = round_fx_sat( L_shl_sat( acc, outScale ) );
-#else
-            timeOut[( offset1 - i ) * stride] = round_fx( L_shl( acc, outScale ) );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             move16();
         }
@@ -916,11 +890,7 @@ void cldfbSynthesisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,
             pFilterM++;
 
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             timeOut[( offset2 - i ) * stride] = round_fx_sat( L_shl_sat( acc, outScale ) );
-#else
-            timeOut[( offset2 - i ) * stride] = round_fx( L_shl( acc, outScale ) );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             move16();
         }
@@ -1011,10 +981,6 @@ ivas_error openCldfb(
     const Word16 type,                 /*!< analysis or synthesis */
     const Word16 maxCldfbBands,        /*!< number of cldfb bands */
     const Word16 frameSize             /*!< FrameSize */
-#ifdef ADD_IVAS_CLDFB
-    ,
-    CLDFB_PROTOTYPE prototype /* i  : CLDFB version (1.25ms/5ms delay)  */
-#endif
 )
 {
     HANDLE_CLDFB_FILTER_BANK hs;
@@ -1026,9 +992,6 @@ ivas_error openCldfb(
     }
 
     hs->type = type;
-#ifdef ADD_IVAS_CLDFB
-    hs->prototype = prototype;
-#endif
     move16();
 
     IF( type == CLDFB_ANALYSIS )
@@ -1167,13 +1130,8 @@ AnalysisPostSpectrumScaling_Fx( HANDLE_CLDFB_FILTER_BANK cldfbBank, /*!< Handle
     {
         FOR( j = 0; j < cldfbBank->no_channels; j++ )
         {
-#ifdef BASOP_NOGLOB
             rSubband16[i][j] = round_fx_sat( L_shl_sat( rSubband32[i][j], headRoom ) ); // Q(cldfbSacle_headRoom)
             iSubband16[i][j] = round_fx_sat( L_shl_sat( iSubband32[i][j], headRoom ) ); // Q(cldfbSacle+headRoom)
-#else
-            rSubband16[i][j] = round_fx( L_shl( rSubband32[i][j], headRoom ) );
-            iSubband16[i][j] = round_fx( L_shl( iSubband32[i][j], headRoom ) );
-#endif
             move16();
             move16();
         }
@@ -1223,20 +1181,13 @@ void analysisCldfbEncoder_fx(
     }
 
     /* perform analysis */
-    cldfbAnalysisFiltering(
-        st_fx->cldfbAnaEnc,
-        ppBuf_Real,
-        ppBuf_Imag,
-        scale,
-        timeIn,
-        0,
-        CLDFB_NO_COL_MAX,
-        workBuffer );
+    cldfbAnalysis_fx( st_fx->cldfbAnaEnc, ppBuf_Real, ppBuf_Imag, scale, timeIn, 0, CLDFB_NO_COL_MAX, workBuffer );
 
     enerScale.lb_scale = negate( scale->lb_scale );
     enerScale.lb_scale16 = negate( scale->lb_scale );
     move16();
     move16();
+
     /* get 16bit respresentation */
     AnalysisPostSpectrumScaling_Fx(
         st_fx->cldfbAnaEnc,
@@ -1378,11 +1329,7 @@ void GetEnergyCldfb( Word32 *energyLookahead,     /*!< o: Q(*sf_energyLookahead)
         {
             FOR( j = 20; j < numberBandsM; j++ )
             {
-#ifdef BASOP_NOGLOB
                 nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
-#else
-                nrg = L_add( nrg, L_shr( energyValues[k][j], s ) );
-#endif
             }
         }
 
@@ -1405,11 +1352,7 @@ void GetEnergyCldfb( Word32 *energyLookahead,     /*!< o: Q(*sf_energyLookahead)
         {
             FOR( j = 20; j < numberBandsM; j++ )
             {
-#ifdef BASOP_NOGLOB
                 nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
-#else
-                nrg = L_add( nrg, L_shr( energyValues[k][j], s ) );
-#endif
             }
         }
 
@@ -1417,13 +1360,8 @@ void GetEnergyCldfb( Word32 *energyLookahead,     /*!< o: Q(*sf_energyLookahead)
         sm = sub( s_min( s, 44 ), 1 );
         BASOP_SATURATE_WARNING_OFF_EVS
         /* nrg + 6.1e-5f => value 0x40000000, scale 44 */
-#ifdef BASOP_NOGLOB
         *energyLookahead = L_add_sat( L_shr_sat( nrg, sub( s, sm ) ),
                                       L_shr_sat( 0x40000000, s_max( -31, s_min( 31, sub( 44, sm ) ) ) ) );
-#else
-        *energyLookahead = L_add( L_shr( nrg, sub( s, sm ) ),
-                                  L_shr( 0x40000000, s_max( -31, s_min( 31, sub( 44, sm ) ) ) ) );
-#endif
         move32();
         BASOP_SATURATE_WARNING_ON_EVS
         *sf_energyLookahead = sm;
diff --git a/lib_com/cng_exc.c b/lib_com/cng_exc.c
deleted file mode 100644
index 794b6de29ea09726ab410057f32ec3951a359579..0000000000000000000000000000000000000000
--- a/lib_com/cng_exc.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Local constants
- *---------------------------------------------------------------------*/
-
-#define A2       0.2f
-#define GAIN_VAR 0.000011f
-
-
-/*-------------------------------------------------------*
- * cng_params_upd()
- *
- * update CNG parameters
- *-------------------------------------------------------*/
diff --git a/lib_com/cng_exc_fx.c b/lib_com/cng_exc_fx.c
index 6ca0d4c3a4dd00bfea52492faa4dcc4ce3de12a7..e335e943511d142b8a5a164981d00825edc9bb01 100644
--- a/lib_com/cng_exc_fx.c
+++ b/lib_com/cng_exc_fx.c
@@ -47,7 +47,7 @@ void CNG_exc_fx(
     Word16 *cng_ener_seed1,
     Word16 exc3[], /*Q_exc*/
     Word16 Opt_AMR_WB,
-    const int16_t element_mode /* i  : IVAS Element mode                     */
+    const Word16 element_mode /* i  : IVAS Element mode                     */
 )
 {
     Word16 i, tmp, tmp2, exp, exp2, Q_ener;
@@ -194,11 +194,7 @@ FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_SUBFR )
      *------------------------------------------------------------*/
     L_tmp = Mult_32_16( *lp_ener, Random( cng_ener_seed ) ); // Q6
     L_tmp = Mult_32_16( L_tmp, GAIN_VAR );                   // Q6
-#ifdef BASOP_NOGLOB
     L_tmp = L_add_sat( L_tmp, *lp_ener );
-#else
-    L_tmp = L_add( L_tmp, *lp_ener );
-#endif
     L_tmp = L_max( L_tmp, 1 );
 
     /* enr = dot_product( exc2, exc2, L_SUBFR ) + 0.01f */
@@ -234,11 +230,7 @@ FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_SUBFR )
     {
         /* exc2[i] *= enr */
         L_tmp = L_mult( exc2[i_subfr + i], tmp ); /* Q-4 * Q_exc+19 -> Q_exc +16 */
-#ifdef BASOP_NOGLOB
         exc2[i_subfr + i] = round_fx_sat( L_shl_sat( L_tmp, exp ) );
-#else
-        exc2[i_subfr + i] = round_fx( L_shl( L_tmp, exp ) );
-#endif
         move16();
     }
 }
@@ -250,11 +242,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
     exp = norm_l( *Enew );
     L_tmp = L_shl( *Enew, exp );                    /* Q(exp+6) */
     L_tmp = Mult_32_16( L_tmp, shl( L_frame, 5 ) ); /* Q(exp+6+5-15=exp-4) */
-#ifdef BASOP_NOGLOB
-    L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) ); /* Q6 */
-#else
-    L_tmp = L_shr( L_tmp, sub( exp, 10 ) );  /* Q6 */
-#endif
+    L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) );     /* Q6 */
     exp = norm_l( L_tmp );
     fra = Log2_norm_lc( L_shl( L_tmp, exp ) );
     exp = sub( sub( 30, exp ), 6 );
@@ -307,10 +295,9 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
     /* calculate the spectrum of random excitation signal */
     Copy( exc2, fft_io, L_frame );
 
-    Word16 Q_new_inp, mem_decim_size; // TO be removed
     IF( EQ_16( L_frame, L_FRAME16k ) )
     {
-        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0, &Q_new_inp, &mem_decim_size );
+        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0 );
     }
 
     /* fft_rel(fft_io, L_FFT, LOG2_L_FFT); */
@@ -320,19 +307,11 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
     FOR( i = 0; i < NUM_ENV_CNG; i++ )
     {
         /* env[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-        L_tmp = L_mult0( *ptR, *ptR ); /* 2*Q_exc */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult0( *ptR, *ptR );           /* 2*Q_exc */
         L_tmp = L_mac0_sat( L_tmp, *ptI, *ptI ); /* 2*Q_exc */
-#else
-        L_tmp = L_mac0( L_tmp, *ptI, *ptI ); /* 2*Q_exc */
-#endif
-        L_tmp = L_shr( L_tmp, 1 ); /* 2*Q_exc+6 */
+        L_tmp = L_shr( L_tmp, 1 );               /* 2*Q_exc+6 */
         tmp = add( Q_exc, Q_exc );
-#ifdef BASOP_NOGLOB
         env[i] = L_shr_sat( L_tmp, tmp );
-#else
-        env[i] = L_shr( L_tmp, tmp );
-#endif
         move32(); /* Q6 */
         ptR++;
         ptI--;
@@ -341,13 +320,8 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
     FOR( i = 0; i < NUM_ENV_CNG; i++ )
     {
         /* denv[i] = lp_env[i] + 2*(*lp_ener) - env[i]; */
-#ifdef BASOP_NOGLOB
         L_tmp = L_add_sat( *lp_ener, *lp_ener );
         denv[i] = L_sub_sat( L_add_sat( lp_env[i], L_tmp ), env[i] );
-#else
-        L_tmp = L_add( *lp_ener, *lp_ener );
-        denv[i] = L_sub( L_add( lp_env[i], L_tmp ), env[i] );
-#endif
         move32(); /* Q6 */
 
         if ( denv[i] < 0 )
@@ -384,13 +358,8 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
         /* itmp[i] += own_random( cng_ener_seed1 )*denv[i]*0.000011f + denv[i]; */
         L_tmp = Mult_32_16( denv[i], Random( cng_ener_seed1 ) ); // Q6
         L_tmp = Mult_32_16( L_tmp, GAIN_VAR );                   // Q6
-#ifdef BASOP_NOGLOB
         L_tmp = L_add_sat( L_tmp, denv[i] );
         itmp[i] = L_add_sat( L_tmp, itmp[i] );
-#else
-        L_tmp = L_add( L_tmp, denv[i] );
-        itmp[i] = L_add( L_tmp, itmp[i] );
-#endif
         move32(); /* Q6 */
 
         if ( itmp[i] < 0 )
@@ -427,19 +396,11 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
         L_tmp = L_deposit_h( tmp );
         L_tmp = Isqrt_lc( L_tmp, &exp ); /*Q(31-exp)*/
 
-        L_tmp2 = Mult_32_16( L_tmp, *ptR ); /*Q(16-exp)*/
-#ifdef BASOP_NOGLOB
+        L_tmp2 = Mult_32_16( L_tmp, *ptR );                         /*Q(16-exp)*/
         *ptR = extract_h( L_shl_sat( L_tmp2, add( exp, Q_exc ) ) ); /*Q_exc*/
-#else
-        *ptR = extract_h( L_shl( L_tmp2, add( exp, Q_exc ) ) ); /*Q_exc*/
-#endif
         move16();
-        L_tmp2 = Mult_32_16( L_tmp, *ptI ); /*Q(16-exp)*/
-#ifdef BASOP_NOGLOB
+        L_tmp2 = Mult_32_16( L_tmp, *ptI );                         /*Q(16-exp)*/
         *ptI = extract_h( L_shl_sat( L_tmp2, add( exp, Q_exc ) ) ); /*Q_exc*/
-#else
-        *ptI = extract_h( L_shl( L_tmp2, add( exp, Q_exc ) ) ); /*Q_exc*/
-#endif
         move16();
         ptR++;
         ptI--;
@@ -449,7 +410,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
 
     IF( EQ_16( L_frame, L_FRAME16k ) )
     {
-        modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0, &Q_new_inp, &mem_decim_size );
+        modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0 );
     }
 
     /* enr1 = dotp( fft_io, fft_io, L_frame ) / L_frame; */
@@ -518,11 +479,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
         test();
         IF( NE_32( last_core_brate, SID_2k40 ) && NE_32( last_core_brate, SID_1k75 ) && ( last_core_brate != FRAME_NO_DATA ) && EQ_32( core_brate, SID_2k40 ) )
         {
-#ifdef BASOP_NOGLOB
             IF( GT_32( L_tmp, L_shl_sat( 1, sub( 31, exp ) ) ) )
-#else
-            IF( GT_32( L_tmp, L_shl( 1, sub( 31, exp ) ) ) )
-#endif
             {
                 L_tmp = L_shl( 1, sub( 31, exp ) );
             }
@@ -542,11 +499,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
     {
         /* fft_io[i] = 0.75f*fft_io[i] + exc2[i];*/
         tmp = mult( fft_io[i], 24576 /*.75f in Q15*/ );
-#ifdef BASOP_NOGLOB
         fft_io[i] = add_sat( tmp, exc2[i] );
-#else
-        fft_io[i] = add( tmp, exc2[i] );
-#endif
         move16(); /*Q_exc*/
     }
 
@@ -561,15 +514,9 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
         {
             L_tmp = L_mult0( *pt_fft_io, *pt_fft_io );
             pt_fft_io++;
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_sat( L_tmp, *pt_fft_io, *pt_fft_io ); /* 2*(Q_exc) */
             pt_fft_io++;
             L_tmp2 = L_add_sat( L_tmp2, L_shr( L_tmp, 7 ) ); /* 2*(Q_exc)+1, divide by L_frame done here */
-#else
-            L_tmp = L_mac0( L_tmp, *pt_fft_io, *pt_fft_io ); /* 2*(Q_exc) */
-            pt_fft_io++;
-            L_tmp2 = L_add( L_tmp2, L_shr( L_tmp, 7 ) );     /* 2*(Q_exc)+1, divide by L_frame done here */
-#endif
         }
     }
     ELSE /* L_FRAME16k */
@@ -578,11 +525,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
         {
             L_tmp = L_mult0( *pt_fft_io, *pt_fft_io );
             pt_fft_io++;
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_sat( L_tmp, *pt_fft_io, *pt_fft_io ); /* 2*(Q_exc) */
-#else
-            L_tmp = L_mac0( L_tmp, *pt_fft_io, *pt_fft_io ); /* 2*(Q_exc) */
-#endif
             pt_fft_io++;
             L_tmp2 = L_add( L_tmp2, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* 2*(Q_exc)+15+1-16+1, divide by L_frame done here */
         }
@@ -614,11 +557,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
     L_tmp = L_deposit_h( tmp );
     L_tmp = Isqrt_lc( L_tmp, &exp ); /*Q(31-exp)*/
 
-#ifdef BASOP_NOGLOB
     ftmp = extract_h( L_shl_sat( L_tmp, exp ) ); /* Q15 */
-#else                                            /* BASOP_NOGLOB */
-    ftmp = extract_h( L_shl( L_tmp, exp ) );                 /* Q15 */
-#endif                                           /* BASOP_NOGLOB */
     FOR( i = 0; i < L_frame; i++ )
     {
         /* fft_io[i] *= ftmp;*/
@@ -659,11 +598,6 @@ void cng_params_postupd_fx(
     const Word16 *const cng_Qexc_buf,  /* i  : Q_exc buffer                                       Q0    */
     const Word32 *const cng_brate_buf, /* i  : bit rate buffer                                    Q0    */
     Word32 ho_env_circ[]               /* i/o: Envelope buffer                                    Q6    */
-#ifdef IVAS_CODE_CNG_COM
-    ,
-    const Word16 element_mode, /* i  : Element mode                        */
-    const Word16 bwidth        /* i  : Audio bandwidth                     */
-#endif
 )
 {
     Word16 i, j;
@@ -710,15 +644,9 @@ void cng_params_postupd_fx(
         FOR( i = 0; i < NUM_ENV_CNG; i++ )
         {
             /* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_o( *ptR, *ptR, &Overflow );                              /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_tmp, &Overflow );                             /* 2*Q_exc+1 */
-#else                                                                               /* BASOP_NOGLOB */
-            L_tmp = L_mult( *ptR, *ptR );                    /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_mult( *ptI, *ptI ) );    /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_tmp );                   /* 2*Q_exc+1 */
-#endif                                                                              /* BASOP_NOGLOB */
             L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_exc+1 */
             tmp = add( add( Q_exc, Q_exc ), 1 );
             sp[i] = L_shr( L_tmp, sub( tmp, 6 ) );
@@ -729,15 +657,6 @@ void cng_params_postupd_fx(
         }
 
         Copy32( sp, env, NUM_ENV_CNG );
-#ifdef IVAS_CODE_CNG_COM
-        if ( element_mode == IVAS_SCE || element_mode == IVAS_CPE_DFT )
-        {
-            att = 0.0f;
-            apply_scale( &att, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-            att = powf( 10, att / 10.0f );
-        }
-        else
-#endif
         {
 
             CNG_mode = get_cng_mode( last_active_brate );
@@ -835,15 +754,9 @@ void cng_params_postupd_ivas_fx(
         FOR( i = 0; i < NUM_ENV_CNG; i++ )
         {
             /* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_o( *ptR, *ptR, &Overflow );                              /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_tmp, &Overflow );                             /* 2*Q_exc+1 */
-#else                                                                               /* BASOP_NOGLOB */
-            L_tmp = L_mult( *ptR, *ptR );                    /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_mult( *ptI, *ptI ) );    /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_tmp );                   /* 2*Q_exc+1 */
-#endif                                                                              /* BASOP_NOGLOB */
             L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_exc+1 */
             tmp = add( add( Q_exc, Q_exc ), 1 );
             // To do : Saturation to be re-validated.
@@ -933,11 +846,6 @@ void cng_params_upd_fx(
     Word16 cng_Qexc_buf[],         /* i/o: Q_exc buffer                                       Q0    */
     Word32 cng_brate_buf[],        /* i/o: last_active_brate buffer                           Q0    */
     const Word32 last_active_brate /* i  : Last active bit rate                               Q0    */
-#ifdef IVAS_CODE_CNG_COM
-    ,
-    const Word16 element_mode, /* i  : Element mode                        */
-    const Word16 bwidth        /* i  : Audio bandwidth                     */
-#endif
 )
 {
     Word32 L_ener, L_tmp;
@@ -994,17 +902,9 @@ void cng_params_upd_fx(
             L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
             pt_exc2++;
             tmpv = shl( *pt_exc2, scale );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
-#else
-            L_tmp = L_mac0( L_tmp, tmpv, tmpv );
-#endif
             pt_exc2++;
-#ifdef BASOP_NOGLOB
             L_ener = L_add_o( L_ener, L_shr_o( L_tmp, 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#else
-            L_ener = L_add( L_ener, L_shr( L_tmp, 7 ) ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#endif
         }
     }
     ELSE /* L_FRAME16k */
@@ -1015,24 +915,12 @@ void cng_params_upd_fx(
             L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
             pt_exc2++;
             tmpv = shl( *pt_exc2, scale );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
-#else
-            L_tmp = L_mac0( L_tmp, tmpv, tmpv );
-#endif
             pt_exc2++;
-#ifdef BASOP_NOGLOB
             L_ener = L_add_o( L_ener, L_shr_o( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#else
-            L_ener = L_add( L_ener, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#endif
         }
     }
-#ifdef BASOP_NOGLOB
     L_ener = L_shr_o( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ), &Overflow ); /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#else                                                                               /* BASOP_NOGLOB */
-    L_ener = L_shr( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ) );                           /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#endif
 
     /* update the circular buffer of old energies */
     ho_ener_circ[*ho_circ_ptr] = L_ener;
@@ -1066,16 +954,10 @@ void cng_params_upd_fx(
         FOR( i = 0; i < NUM_ENV_CNG; i++ )
         {
             /* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_o( *ptR, *ptR, &Overflow );                              /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_tmp, &Overflow );                             /* 2*Q_exc+1 */
-#else
-            L_tmp = L_mult( *ptR, *ptR );                                                        /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_mult( *ptI, *ptI ) );                                        /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_tmp );                                                       /* 2*Q_exc+1 */
-#endif
-            L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
+            L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_exc+1 */
             tmp = add( add( Q_exc, Q_exc ), 1 );
             sp[i] = L_shr( L_tmp, sub( tmp, 6 ) );
             move32(); /* Q6 */
@@ -1085,15 +967,6 @@ void cng_params_upd_fx(
         }
 
         Copy32( sp, env, NUM_ENV_CNG );
-#ifdef IVAS_CODE_CNG_COM
-        if ( element_mode == IVAS_SCE || element_mode == IVAS_CPE_DFT )
-        {
-            att = 0.0f;
-            apply_scale( &att, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-            att = powf( 10, att / 10.0f );
-        }
-        else
-#endif
         {
             CNG_mode = get_cng_mode( last_active_brate );
             /* att = 1/pow(2,ENR_ATT_fx[CNG_mode]); */
@@ -1207,17 +1080,9 @@ void cng_params_upd_ivas_fx(
             L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
             pt_exc2++;
             tmpv = shl( *pt_exc2, scale );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
-#else
-            L_tmp = L_mac0( L_tmp, tmpv, tmpv );
-#endif
             pt_exc2++;
-#ifdef BASOP_NOGLOB
             L_ener = L_add_o( L_ener, L_shr_o( L_tmp, 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#else
-            L_ener = L_add( L_ener, L_shr( L_tmp, 7 ) ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#endif
         }
     }
     ELSE /* L_FRAME16k */
@@ -1228,24 +1093,12 @@ void cng_params_upd_ivas_fx(
             L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
             pt_exc2++;
             tmpv = shl( *pt_exc2, scale );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
-#else
-            L_tmp = L_mac0( L_tmp, tmpv, tmpv );
-#endif
             pt_exc2++;
-#ifdef BASOP_NOGLOB
             L_ener = L_add_o( L_ener, L_shr_o( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#else
-            L_ener = L_add( L_ener, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#endif
         }
     }
-#ifdef BASOP_NOGLOB
     L_ener = L_shr_o( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ), &Overflow ); /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#else                                                                               /* BASOP_NOGLOB */
-    L_ener = L_shr( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ) );                           /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#endif
 
     /* update the circular buffer of old energies */
     ho_ener_circ[*ho_circ_ptr] = L_ener;
@@ -1279,18 +1132,12 @@ void cng_params_upd_ivas_fx(
         FOR( i = 0; i < NUM_ENV_CNG; i++ )
         {
             /* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_o( *ptR, *ptR, &Overflow );                              /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
             L_tmp = L_add_o( L_tmp, L_tmp, &Overflow );                             /* 2*Q_exc+1 */
-#else
-            L_tmp = L_mult( *ptR, *ptR );                                                        /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_mult( *ptI, *ptI ) );                                        /* 2*Q_exc+1 */
-            L_tmp = L_add( L_tmp, L_tmp );                                                       /* 2*Q_exc+1 */
-#endif
-            L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
+            L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_exc+1 */
             tmp = add( add( Q_exc, Q_exc ), 1 );
-            sp[i] = L_shr( L_tmp, sub( tmp, 6 ) );
+            sp[i] = L_shr_o( L_tmp, sub( tmp, 6 ), &Overflow );
             move32(); /* Q6 */
             ptR++;
             ptI--;
diff --git a/lib_com/cnst.h b/lib_com/cnst.h
index fe16db670a45815e431324c572e699d454512c4a..ae84dbd2c9285d5219b4e7d6b48ed787bb1d3be3 100644
--- a/lib_com/cnst.h
+++ b/lib_com/cnst.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -137,6 +137,7 @@
 #define FOUR_IN_Q28                     1073741824
 
 #define MAX_WORD16                      32767
+#define ONE_IN_Q45                      (Word64)0x200000000000
 #define ONE_IN_Q62                      (Word64)0x4000000000000000
 /*----------------------------------------------------------------------------------*
  * General constants
@@ -190,8 +191,14 @@
 #define FORCE_MUSIC                     101             /* debugging - force music on the command line */
 #define FORCE_ACELP                     102             /* debugging - force ACELP core on the command line */
 #define FORCE_GSC                       103             /* debugging - force GSC core on the command line */
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+#define FORCE_TCX10                     104             /* debugging - force TCX10 core on the command line */
+#define FORCE_TCX20                     105             /* debugging - force TCX20 core on the command line */
+#define FORCE_HQ                        106             /* debugging - force HQ core on the command line */
+#else
 #define FORCE_TCX                       104             /* debugging - force TCX core on the command line */
 #define FORCE_HQ                        105             /* debugging - force HQ core on the command line */
+#endif
 #define FORCE_TD_RENDERER               201
 #define FORCE_CLDFB_RENDERER            202
 #endif
@@ -232,7 +239,7 @@ enum{
 #define L_FRAME48k_EXT                  1200            /* Extended MDCT frame size in samples at 48kHz */
 
 /* Conversion of ns to samples for a given sampling frequency */
-#define NS2SA( fs, x )                  ( int16_t )( ( ( ( int32_t )( fs ) / 100L ) * ( ( x ) / 100L ) ) / 100000L )
+#define NS2SA( fs, x )                  ( Word16 )( ( ( ( Word32 )( fs ) / 100L ) * ( ( x ) / 100L ) ) / 100000L )
 #define NRG_CHANGE_E 8
 #define AVG_FLAT_E 8
 #define ACTIVE_FRAME                    0xFF
@@ -525,12 +532,16 @@ enum
     IND_STEREO_ICBWE_MSFLAG,
     IND_SHB_ENER_SF,
     IND_SHB_RES_GS,
+#ifndef FIX_1486_IND_SHB_RES
     IND_SHB_RES_GS1,
     IND_SHB_RES_GS2,
     IND_SHB_RES_GS3,
     IND_SHB_RES_GS4,
     IND_SHB_RES_GS5,
     IND_SHB_VF,
+#else
+    IND_SHB_VF = IND_SHB_RES_GS + 5,
+#endif
     IND_SHB_LSF,
     IND_SHB_MIRROR = IND_SHB_LSF + 5,
     IND_SHB_GRID,
@@ -754,6 +765,8 @@ enum
 #define FORMANT_SHARPENING_NOISE_THRESHOLD  21.0f                  /* lp_noise level above which formant sharpening is deactivated */
 #define E_MIN_FX                              1       /* QSCALE (Q7)*/
 #define E_MIN_IVAS_FX                         1835       /* (Q19) (E12) */
+#define E_MIN_IVAS_FX_Q31                     7516193       /* (Q31) (0.0035f) */
+
 #define STEP_DELTA_FX                         11
 #define FORMANT_SHARPENING_NOISE_THRESHOLD_FX   5376     /* 21 (!8)lp_noise level above which formant sharpening is deactivated - at this level most of 20 dB SNR office noisy speech still uses sharpening */
 
@@ -776,6 +789,9 @@ enum
 #define L_HP20_MEM                          4                      /* HP20 filter memory length */
 
 #define CLDFB_NO_CHANNELS_MAX               60                     /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+#define CLDFB_NO_CHANNELS_HALF              30                     /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */
+#endif
 #define CLDFB_NO_CHANNELS_MAX_FX            30720                  /*Q9*/ 
 #define CLDFB_NO_COL_MAX                    16                     /* CLDFB resampling - max number of CLDFB col., == IVAS_CLDFB_NO_COL_MAX */
 #define CLDFB_NO_COL_MAX_SWITCH             6                      /* CLDFB resampling - max number of CLDFB col. for switching */
@@ -923,6 +939,8 @@ typedef enum
 #define GAIN_PRED_ORDER                     4                       /* Gain quantization - prediction order for gain quantizer (only for AMR-WB IO mode) */
 #define MEAN_ENER                           30                      /* Gain quantization - average innovation energy */
 
+#define DTX_THR                             5                       /* DTX - lp_noise threshold for DTX at higher bitrates */
+
 #define DTX_HIST_SIZE                       8                       /* CNG & DTX - number of last signal frames used for CNG averaging */
 #define CNG_ISF_FACT                        0.9f                    /* CNG & DTX - CNG spectral envelope smoothing factor */
 #define STEP_AMR_WB_SID                     2.625f                  /* CNG & DTX - CNG energy quantization step */
@@ -1159,7 +1177,6 @@ enum
 #define NBITS_NOISE_FILL_LEVEL              3                       /* Number of bits used for coding noise filling level for each range */
 #define NF_GAIN_BITS                        ( NBITS_TCX_GAIN + NOISE_FILL_RANGES * NBITS_NOISE_FILL_LEVEL )
 #define MIN_NOISE_FILLING_HOLE              8
-#define HOLE_SIZE_FROM_LTP_FLT( gain )      ( 4 + ( int16_t )( 2.0f * gain * ( 4.0f / 0.625f ) ) )
 #define HOLE_SIZE_FROM_LTP( gain )          (add(4, extract_h(L_shr(L_mult0(gain, 0x6666), 10)))) /* gain (Q15), 0x6666 = 2.0*(4.0/0.625) (4Q11) */
 #define HOLE_SIZE_FROM_LTP32( gain )        (add(4, extract_h(L_shr(Mpy_32_32(gain, 0x66666667), 11))))  /* gain (Q31), 0x66666667 = 2.0*(4.0/0.625) (4Q27) */
 
@@ -1224,6 +1241,7 @@ enum
 #define SPC                                 0.0234952f
 #define SPC_plus                            SPC * 1.001f
 #define ALPHA_SQ                            ( ( 0.5f / PI2 ) * ( 0.5f / PI2 ) )
+#define ALPHA_SQ_Q30                        (6799549) /* ( ( 0.5f / PI2 ) * ( 0.5f / PI2 ) ) in Q30 */
 
 #define NC                                  M / 2
 #define LSF_GAP                             50.0f
@@ -1455,7 +1473,7 @@ enum
 #define cbitsnew                            16
 #define stat_bitsnew                        14
 
-#define ari_q4new                           ( ( (int32_t) 1 << cbitsnew ) - 1 )
+#define ari_q4new                           ( ( (Word32) 1 << cbitsnew ) - 1 )
 #define ari_q1new                           ( ari_q4new / 4 + 1 )
 #define ari_q2new                           ( 2 * ari_q1new )
 #define ari_q3new                           ( 3 * ari_q1new )
@@ -1526,6 +1544,7 @@ enum
 #define SHB_OVERLAP_LEN                     ( L_FRAME16k - L_SHB_LAHEAD ) / ( NUM_SHB_SUBFR - 1 )
 #define QUANT_DIST_INIT                     ( 10000000000.0f )      /* Quantiser search distance initialisation */
 #define HIBND_ACB_L_FAC                     5 / 2                   /* SHB Interpolation Factor */
+#define HIBND_ACB_L_FAC_Q1                  ( 5 )                   /* SHB Interpolation Factor Q1 */
 #define NUM_HILBERTS                        2
 #define HILBERT_ORDER1                      5
 #define HILBERT_ORDER2                      4
@@ -1936,7 +1955,6 @@ typedef enum _DCTTYPE
 #define N_SMC_MIXTURES                      6                       /* number of mixtures */
 #define N_PCA_COEF                          12                      /* number of PCA components */
 #define HALF_N_PCA_COEF_LOG_P12_Q18         2890731                 //Q18 of (0.5f * N_PCA_COEF *logf( PI2 ))
-#define SMC_ST_MEAN_FACT                    0.5                     /* forgetting factor of short-term IIR mean filter */
 #define SMC_ST_MEAN_RSHIFT_FACT_FX            1                     /* SMC_ST_MEAN_FACT equivalent right shift factor */
 
 #define M_LSP_SPMUS                         6                       /* number of LSPs used in speech/music classifier */
diff --git a/lib_com/codec_tcx_common.c b/lib_com/codec_tcx_common.c
index 85e353d597392ef3eee1c7bdb521b4dc803b53ab..52c7d0614ec4d935e71187ad9967a14eea1b6017 100644
--- a/lib_com/codec_tcx_common.c
+++ b/lib_com/codec_tcx_common.c
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include <math.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "basop_util.h"
 #include "rom_basop_util.h"
@@ -40,11 +39,7 @@ Word16 tcxGetNoiseFillingTilt(
         Copy_Scale_sig( A, As, add( lpcorder, 1 ), sub( norm_s( A[0] ), 2 ) ); // Q(12)
         tmp = get_gain( As + 1, As, lpcorder );
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         *noiseTiltFactor = add_sat( round_fx_sat( L_shl_sat( tmp, 15 ) ), 3072 /*0.09375f Q15*/ );
-#else
-        *noiseTiltFactor = add( round_fx( L_shl( tmp, 15 ) ), 3072 /*0.09375f Q15*/ );
-#endif
         move16();
         BASOP_SATURATE_WARNING_ON_EVS;
     }
@@ -144,11 +139,7 @@ void tcxFormantEnhancement(
             {
                 fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
                 BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
                 xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
-#else
-                xn_buf[l + j] = s_min( xn_one, shl( mult( xn_buf[l + j], fac ), fac_e ) );
-#endif
                 move16();
                 BASOP_SATURATE_WARNING_ON_EVS;
             }
@@ -193,11 +184,7 @@ void tcxFormantEnhancement(
     {
         fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );
-#else
-        xn_buf[l + j] = s_min( xn_one, shl( mult( xn_buf[l + j], fac ), fac_e ) );
-#endif
         move16();
         BASOP_SATURATE_WARNING_ON_EVS;
     }
@@ -322,11 +309,7 @@ void tcxFormantEnhancement_with_shift(
             {
                 fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
                 BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
                 xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
-#else
-                xn_buf[l + j] = s_min( xn_one, shl( mult( xn_buf[l + j], fac ), fac_e ) );
-#endif
                 move16();
                 BASOP_SATURATE_WARNING_ON_EVS;
             }
@@ -371,11 +354,7 @@ void tcxFormantEnhancement_with_shift(
     {
         fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
-#else
-        xn_buf[l + j] = s_min( xn_one, shl( mult( xn_buf[l + j], fac ), fac_e ) );
-#endif
         move16();
         BASOP_SATURATE_WARNING_ON_EVS;
     }
@@ -490,140 +469,6 @@ void tcxInvertWindowGrouping(
     }
 }
 
-#ifdef IVAS_CODE_TCX_COM
-
-/*-------------------------------------------------------------------*
- * tcx5SpectrumInterleaving()
- *
- *
- *-------------------------------------------------------------------*/
-
-void tcx5SpectrumInterleaving(
-    const int16_t tcx5Size,
-    float *spectrum )
-{
-    int16_t i;
-    float interleaveBuf[N_TCX10_MAX];
-
-    set_f( interleaveBuf, 0.0f, N_TCX10_MAX );
-
-    /* group sub-windows: interleave bins according to their frequencies */
-    for ( i = 0; i < tcx5Size; i++ )
-    {
-        interleaveBuf[2 * i] = spectrum[i];
-        interleaveBuf[2 * i + 1] = spectrum[tcx5Size + i];
-    }
-
-    mvr2r( interleaveBuf, spectrum, 2 * tcx5Size );
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * tcx5SpectrumDeinterleaving()
- *
- *
- *-------------------------------------------------------------------*/
-
-void tcx5SpectrumDeinterleaving(
-    const int16_t tcx5Size,
-    float *spectrum )
-{
-    int16_t i;
-    float interleaveBuf[N_TCX10_MAX];
-
-    set_f( interleaveBuf, 0.0f, N_TCX10_MAX );
-
-    /* ungroup sub-windows: interleave bins according to their frequencies */
-    for ( i = 0; i < tcx5Size; i++ )
-    {
-        interleaveBuf[i] = spectrum[2 * i];
-        interleaveBuf[tcx5Size + i] = spectrum[2 * i + 1];
-    }
-
-    mvr2r( interleaveBuf, spectrum, 2 * tcx5Size );
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * tcx5TnsGrouping()
- *
- *
- *-------------------------------------------------------------------*/
-
-void tcx5TnsGrouping(
-    const int16_t L_frame, /* i  : frame length (TCX5)                                 */
-    const int16_t L_spec,  /* i  : coded spec length (TCX5, derived from filter borders*/
-    float *spectrum )
-{
-    /* rearrange LF sub-window lines prior to TNS synthesis filtering */
-    if ( L_spec < L_frame )
-    {
-        mvr2r( spectrum + 8, spectrum + 16, L_spec - 8 );
-        mvr2r( spectrum + L_frame, spectrum + 8, 8 );
-        mvr2r( spectrum + L_frame + 8, spectrum + L_spec + 8, L_spec - 8 );
-    }
-    else
-    {
-        float buff[8]; /* Buffer for the rearrangement of LF TCX5 */
-        mvr2r( spectrum + L_spec, buff, 8 );
-        mvr2r( spectrum + 8, spectrum + 16, L_spec - 8 );
-        mvr2r( buff, spectrum + 8, 8 );
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * tcx5TnsUngrouping()
- *
- *
- *-------------------------------------------------------------------*/
-
-void tcx5TnsUngrouping(
-    const int16_t L_frame, /* i  : frame length (TCX5)                                 */
-    const int16_t L_spec,  /* i  : coded spec length (TCX5, derived from filter borders*/
-    float *spectrum,
-    const int16_t enc_dec /* i  : 0: encoder, else decoder                            */
-)
-{
-    /* undo rearrangement of LF sub-window lines prior to TNS analysis */
-    if ( L_spec < L_frame )
-    {
-        mvr2r( spectrum + L_spec + 8, spectrum + L_frame + 8, L_spec - 8 );
-        mvr2r( spectrum + 8, spectrum + L_frame, 8 );
-        mvr2r( spectrum + 16, spectrum + 8, L_spec - 8 );
-        set_zero( spectrum + L_spec, L_frame - L_spec );
-        set_zero( spectrum + L_frame + L_spec, L_frame - L_spec );
-    }
-    else
-    {
-        float buff[8]; /* Buffer for the rearrangement of LF TCX5 */
-
-        mvr2r( spectrum + 8, buff, 8 );
-
-        if ( enc_dec == ENC )
-        {
-            mvr2r( spectrum + 16, spectrum + 8, L_frame - 8 );
-            mvr2r( buff, spectrum + L_frame, 8 );
-        }
-        else
-        {
-            mvr2r( spectrum + 16, spectrum + 8, L_spec - 8 );
-            mvr2r( buff, spectrum + L_spec, 8 );
-        }
-    }
-
-    return;
-}
-
-#endif
-
-
 /*-------------------------------------------------------------------*
  * tcx5SpectrumInterleaving()
  *
diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h
index b98f2e7d177c5b2965d400febaaa63732e89341a..bc6fd4f1af6f28146c62d4a3d163a421a83fb1e4 100644
--- a/lib_com/common_api_types.h
+++ b/lib_com/common_api_types.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -108,9 +108,9 @@ typedef enum _IVAS_ENC_FEC_INDICATOR
 
 typedef struct _IVAS_ENC_CHANNEL_AWARE_CONFIG
 {
-    int16_t channelAwareModeEnabled;
+    Word16 channelAwareModeEnabled;
     IVAS_ENC_FEC_INDICATOR fec_indicator;
-    int16_t fec_offset;
+    Word16 fec_offset;
 
 } IVAS_ENC_CHANNEL_AWARE_CONFIG;
 
@@ -130,7 +130,7 @@ typedef struct _IVAS_ISM_METADATA
     float gainFactor;
     float yaw;
     float pitch;
-    int16_t non_diegetic_flag;
+    Word16 non_diegetic_flag;
 
 } IVAS_ISM_METADATA;
 
@@ -183,29 +183,29 @@ typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;
 
 typedef struct _IVAS_LS_CUSTOM_LAYOUT
 {
-    int16_t num_spk;
+    Word16 num_spk;
     float azimuth[IVAS_MAX_OUTPUT_CHANNELS];
     float elevation[IVAS_MAX_OUTPUT_CHANNELS];
     Word32 azimuth_fx[IVAS_MAX_OUTPUT_CHANNELS];   // Q22
     Word32 elevation_fx[IVAS_MAX_OUTPUT_CHANNELS]; // Q22
-    int16_t num_lfe;
-    int16_t lfe_idx[IVAS_MAX_OUTPUT_CHANNELS];
+    Word16 num_lfe;
+    Word16 lfe_idx[IVAS_MAX_OUTPUT_CHANNELS];
 
 } IVAS_CUSTOM_LS_DATA;
 
 typedef struct _IVAS_JBM_TRACE_DATA
 {
-    uint32_t systemTimestamp_ms;
-    uint16_t extBufferedSamples;
-    uint16_t lastDecodedWasActive;
-    int32_t output_Fs;
-    int16_t dataUnit_flag;
-    uint16_t sequenceNumber;
-    uint32_t timeStamp;
-    uint32_t rcvTime;
-
-    int16_t partial_frame;
-    int16_t partialCopyOffset;
+    UWord32 systemTimestamp_ms;
+    UWord16 extBufferedSamples;
+    UWord16 lastDecodedWasActive;
+    Word32 output_Fs;
+    Word16 dataUnit_flag;
+    UWord16 sequenceNumber;
+    UWord32 timeStamp;
+    UWord32 rcvTime;
+
+    Word16 partial_frame;
+    Word16 partialCopyOffset;
 
 } IVAS_JBM_TRACE_DATA;
 
@@ -217,8 +217,8 @@ typedef struct _IVAS_JBM_TRACE_DATA
 
 typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
 {
-    int16_t override;
-    int16_t nBands;                                                                                                                      /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */
+    Word16 override;
+    Word16 nBands;                                                                                                                       /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */
     float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX];                                                                                         /* Center frequencies for which following values are provided:                                        */
     float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX];                                                                                    /*  - The room's T60 per center frequency                                                             */
     float pAcoustic_dsr[IVAS_CLDFB_NO_CHANNELS_MAX];                                                                                     /*  - The room's Diffuse to Source Ratio per center frequency                                         */
@@ -231,12 +231,12 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
     Word32 inputPreDelay_fx; /* Offset in seconds from where DSR is computed in the RIR (0 = at source), float, range [0.001..10]  */    /* Assumed Q-27*/
 
     /* early reflections */
-    int16_t use_er;                           /* ER activation flag      */
-    int32_t lowComplexity;                    /* Low complexity ER flag  */
-    IVAS_VECTOR3 dimensions;                  /* Room dimensions [m]     */
-    float AbsCoeff[IVAS_ROOM_ABS_COEFF];      /* Absorption coeffs       */
-    IVAS_VECTOR3 ListenerOrigin;              /* Listener origin         */
-    int32_t AbsCoeff_fx[IVAS_ROOM_ABS_COEFF]; /* Absorption coeffs       */
+    Word16 use_er;                           /* ER activation flag      */
+    Word32 lowComplexity;                    /* Low complexity ER flag  */
+    IVAS_VECTOR3 dimensions;                 /* Room dimensions [m]     */
+    float AbsCoeff[IVAS_ROOM_ABS_COEFF];     /* Absorption coeffs       */
+    IVAS_VECTOR3 ListenerOrigin;             /* Listener origin         */
+    Word32 AbsCoeff_fx[IVAS_ROOM_ABS_COEFF]; /* Absorption coeffs       */
 
 } IVAS_ROOM_ACOUSTICS_CONFIG_DATA;
 
diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c
index e002617ab708ee75c42c0b8925cc424d9ff8ada5..152870be74c567dab70a0d331ddc6401f123d394 100644
--- a/lib_com/core_com_config.c
+++ b/lib_com/core_com_config.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,10 +38,8 @@
 #include <stdint.h>
 #include "options.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 #define FSCALE_DENOM_BY_12800_Q15 1311
@@ -248,67 +246,18 @@ Word16 getTcxonly_ivas_fx(
 }
 
 Word16 getTcxonly(
-#ifdef IVAS_CODE_SWITCHING
-    const Word16 element_mode, /* i  : IVAS element mode                   */
-#endif
     const Word32 total_brate /* i  : total bitrate                       */
-#ifdef IVAS_CODE_SWITCHING
-    ,
-    const Word16 MCT_flag,      /* i  : hMCT handle allocated (1) or not (0)*/
-    const int16_t is_ism_format /* i  : flag indicating ISM format          */
-#endif
 )
 {
 
     Word16 tcxonly;
     tcxonly = 0;
     move16();
-#ifdef IVAS_CODE_SWITCHING
-    SWITCH( element_mode )
+    if ( GT_32( total_brate, 32000 ) )
     {
-        case EVS_MONO:
-#endif
-            if ( GT_32( total_brate, 32000 ) )
-            {
-                tcxonly = 1;
-                move16();
-            }
-#ifdef IVAS_CODE_SWITCHING
-            break;
-        case IVAS_SCE:
-            if ( is_ism_format )
-            {
-                if ( total_brate > MAX_ACELP_BRATE_ISM )
-                {
-                    tcxonly = 1;
-                }
-            }
-            else
-            {
-                if ( total_brate > MAX_ACELP_BRATE )
-                {
-                    tcxonly = 1;
-                }
-            }
-            break;
-
-        case IVAS_CPE_DFT:
-        case IVAS_CPE_TD:
-            if ( total_brate > MAX_ACELP_BRATE )
-            {
-                tcxonly = 1;
-            }
-            break;
-        case IVAS_CPE_MDCT:
-            if ( total_brate >= ( MCT_flag ? IVAS_32k : IVAS_48k ) )
-            {
-                tcxonly = 1;
-            }
-            break;
-#endif
-#ifdef IVAS_CODE_SWITCHING
+        tcxonly = 1;
+        move16();
     }
-#endif
     return tcxonly; /*Q0*/
 }
 
@@ -543,69 +492,12 @@ Word16 sr2fscale_fx(
     return extract_l( Mpy_32_16_1( sr_core, FSCALE_DENOM_BY_12800_Q15 ) ); /*Q0*/
 }
 
-int16_t sr2fscale(
-    const int32_t sr_core /* i  : internal sampling rate    */
-)
-{
-
-    return (int16_t) ( ( FSCALE_DENOM * sr_core ) / 12800 );
-}
-
-/*-------------------------------------------------------------------*
- * getCoreSamplerateMode2_flt()
- *
- *
- *-------------------------------------------------------------------*/
-
-int32_t getCoreSamplerateMode2_flt(
-    const int16_t element_mode,     /* i  : IVAS element mode              */
-    const int32_t total_brate,      /* i  : total bitrate                  */
-    const int16_t bwidth,           /* i  : audio bandwidth                */
-    const int16_t flag_ACELP16k,    /* i  : ACELP@16kHz flag               */
-    const int16_t rf_mode,          /* i  : flag to signal the RF mode     */
-    const IVAS_FORMAT is_ism_format /* i  : flag indicating ISM format     */
+Word16 sr2fscale(
+    const Word32 sr_core /* i  : internal sampling rate    */
 )
 {
-    int32_t sr_core = 0;
-
-    if ( bwidth == NB )
-    {
-        sr_core = INT_FS_12k8;
-    }
-    else if ( element_mode == EVS_MONO && ( ( bwidth == WB && total_brate < ACELP_13k20 ) || ( bwidth == SWB && total_brate <= ACELP_13k20 ) || ( rf_mode == 1 ) ) )
-    {
-        sr_core = INT_FS_12k8;
-    }
-    else if ( element_mode > EVS_MONO && flag_ACELP16k == 0 )
-    {
-        sr_core = INT_FS_12k8;
-    }
-    else if ( bwidth == WB || ( bwidth == SWB && total_brate <= ACELP_32k ) || ( bwidth == FB && total_brate <= ACELP_32k ) )
-    {
-        sr_core = INT_FS_16k;
-    }
-    else if ( ( bwidth == SWB || bwidth == FB ) && total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && !is_ism_format )
-    {
-        sr_core = INT_FS_16k;
-    }
-    else if ( ( bwidth == SWB || bwidth == FB ) && total_brate <= MAX_ACELP_BRATE_ISM && element_mode == IVAS_SCE && is_ism_format )
-    {
-        sr_core = INT_FS_16k;
-    }
-    else if ( ( bwidth == SWB || bwidth == FB ) && total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && is_ism_format )
-    {
-        sr_core = 25600;
-    }
-    else if ( ( ( bwidth == SWB || bwidth == FB ) && element_mode == EVS_MONO && total_brate <= HQ_64k ) || ( element_mode > IVAS_SCE && ( ( bwidth == SWB && total_brate <= IVAS_96k ) || ( bwidth == FB && total_brate <= IVAS_96k ) ) ) )
-    {
-        sr_core = 25600;
-    }
-    else if ( bwidth == SWB || bwidth == FB )
-    {
-        sr_core = 32000;
-    }
 
-    return sr_core;
+    return (Word16) ( ( FSCALE_DENOM * sr_core ) / 12800 );
 }
 
 Word32 getCoreSamplerateMode2(
@@ -1235,8 +1127,8 @@ void init_tcx_window_cfg_fx(
     }
     /*Mid-OLA*/
     /*compute minimum length for "half" window: lookahead - 5ms. It must be also multiple of 2*/
-    hTcxCfg->tcx_mdct_window_half_length = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA_FX2( 12800, 5000000L ), sr2fscale( sr_core ) ), LD_FSCALE_DENOM ) );    /*Q0*/
-    hTcxCfg->tcx_mdct_window_half_lengthFB = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA_FX2( 12800, 5000000L ), sr2fscale( input_Fs ) ), LD_FSCALE_DENOM ) ); /*Q0*/
+    hTcxCfg->tcx_mdct_window_half_length = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA( 12800, 5000000L ), sr2fscale( sr_core ) ), LD_FSCALE_DENOM ) );    /*Q0*/
+    hTcxCfg->tcx_mdct_window_half_lengthFB = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA( 12800, 5000000L ), sr2fscale( input_Fs ) ), LD_FSCALE_DENOM ) ); /*Q0*/
     move16();
     move16();
     assert( GT_16( hTcxCfg->tcx_mdct_window_half_length, 16 ) && "Half window can not be large enough!" );
diff --git a/lib_com/deemph.c b/lib_com/deemph.c
index 3f60bf44c1128c4812b7e266914009f5f2d05ee0..9bc20cb6f6892b86fe023ff163fa8272ec9cc7bb 100644
--- a/lib_com/deemph.c
+++ b/lib_com/deemph.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,32 +36,28 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 
 void deemph_fx_32(
-    Word16 shift,    /*scaled output*/
     Word32 *signal,  /* i/o: signal            Qx*/
     const Word16 mu, /* i  : deemphasis factor Q15*/
     const Word16 L,  /* i  : vector size         */
-    Word32 *mem      /* i/o: memory (y[-1])    Qx+shift*/
+    Word32 *mem      /* i/o: memory (y[-1])    Qx*/
 )
 {
     Word16 i;
 
-    signal[0] = L_add( signal[0], Mpy_32_16_1( ( *mem ), mu ) ); /*Qx*/
+    signal[0] = Madd_32_16( signal[0], *mem, mu ); // Qx
     move32();
     FOR( i = 1; i < L; i++ )
     {
-        signal[i] = L_add( signal[i], Mpy_32_16_1( signal[i - 1], mu ) ); /*Qx*/
-        signal[i] = L_shl( signal[i], shift );                            /*Qx+shift*/
-        move32();
+        signal[i] = Madd_32_16( signal[i], signal[i - 1], mu ); // Qx
         move32();
     }
 
-    *mem = signal[L - 1]; /*Qx+shift*/
+    *mem = signal[L - 1]; // Qx
     move32();
 
     return;
@@ -103,26 +99,16 @@ void deemph_fx(
     move32();
 #endif
 
-    L_tmp = L_deposit_h( signal[0] ); /*Qx+16*/
-#ifdef BASOP_NOGLOB
+    L_tmp = L_deposit_h( signal[0] );              /*Qx+16*/
     L_tmp = L_mac_o( L_tmp, *mem, mu, &Overflow ); /*Qx+16*/
     signal[0] = round_fx_o( L_tmp, &Overflow );    /*Qx*/
-#else
-    L_tmp = L_mac( L_tmp, *mem, mu );
-    signal[0] = round_fx( L_tmp );
-#endif
     move16();
 
     FOR( i = 1; i < L; i++ )
     {
-        L_tmp = L_deposit_h( signal[i] ); /*Qx+16*/
-#ifdef BASOP_NOGLOB
+        L_tmp = L_deposit_h( signal[i] );                       /*Qx+16*/
         L_tmp = L_mac_o( L_tmp, signal[i - 1], mu, &Overflow ); /*Qx+16*/
         signal[i] = round_fx_o( L_tmp, &Overflow );             /*Qx*/
-#else                                                           /* BASOP_NOGLOB */
-        L_tmp = L_mac( L_tmp, signal[i - 1], mu );
-        signal[i] = round_fx( L_tmp );
-#endif                                                          /* BASOP_NOGLOB */
         move16();
     }
 
@@ -158,12 +144,8 @@ void Deemph2(
 
     FOR( i = 1; i < L; i++ )
     {
-        L_tmp = L_mult( x[i], 16384 /*0.5f in Q15*/ ); /*Qx+16*/
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( x[i], 16384 /*0.5f in Q15*/ );   /*Qx+16*/
         x[i] = mac_ro( L_tmp, x[i - 1], mu, &Overflow ); /*Qx-1*/
-#else
-        x[i] = mac_r( L_tmp, x[i - 1], mu );
-#endif
         move16();
     }
 
@@ -206,13 +188,8 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W
         shift = shr( -32768, shift ); /*Q15 - shift*/
         FOR( i = 0; i < L; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), x[i], shift, &Overflow ); /*Qx-shift+16*/
             x[i] = round_fx_o( L_tmp, &Overflow );                               /*Qx-shift*/
-#else
-            L_tmp = L_msu( Mpy_32_16_1( L_tmp, mu ), x[i], shift );
-            x[i] = round_fx( L_tmp );
-#endif
             move16();
         }
     }
@@ -220,13 +197,8 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W
     {
         FOR( i = 0; i < L; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), shr_o( x[i], shift, &Overflow ), -32768 /*1.0f in Q15*/, &Overflow ); /*Qx-shift+16*/
             x[i] = round_fx_o( L_tmp, &Overflow );                                                                           /*Qx-shift*/
-#else                                                                                                                        /* BASOP_NOGLOB */
-            L_tmp = L_msu( Mpy_32_16_1( L_tmp, mu ), shr( x[i], shift ), -32768 );
-            x[i] = round_fx( L_tmp );
-#endif
             move16();
         }
     }
diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c
index 38a077f9ea1365b8ede42afc988c7f4f99728d1a..edccca07400e2758d17230e2030c91929269027f 100644
--- a/lib_com/delay_comp.c
+++ b/lib_com/delay_comp.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /*--------------------------------------------------------------------------
  *  get_delay()
diff --git a/lib_com/disclaimer.c b/lib_com/disclaimer.c
index 58452de2447869a116d61e533e9e34f78194e82a..3b16773657ca881ea1c5bf7c555638788ae9fca8 100644
--- a/lib_com/disclaimer.c
+++ b/lib_com/disclaimer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,7 +36,7 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 
 #define WMC_TOOL_SKIP
 
@@ -44,7 +44,7 @@ int16_t print_disclaimer( FILE *fPtr )
 {
 
     fprintf( fPtr, "\n==================================================================================================\n" );
-    fprintf( fPtr, " IVAS Codec Baseline\n" );
+    fprintf( fPtr, " IVAS Codec BASOP Baseline\n" );
     fprintf( fPtr, " \n" );
     fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" );
     fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" );
diff --git a/lib_com/edct_fx.c b/lib_com/edct_fx.c
index 301b666660a15d1530083c6acffda04ee43247dd..1b303d2856fda4a014caf1cee1775de7064e2294 100644
--- a/lib_com/edct_fx.c
+++ b/lib_com/edct_fx.c
@@ -395,9 +395,7 @@ void edct_16fx(
     Word16 Len2, i2;
     const Word16 *px, *pt;
     Word16 *py;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) element_mode;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow;
     Overflow = 0;
@@ -457,23 +455,13 @@ void edct_16fx(
     {
         i2 = shl( i, 1 );
 
-        L_tmp = L_mult( x[i2], edct_table[i] ); /*Q(Qx+16) */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( x[i2], edct_table[i] );                               /*Q(Qx+16) */
         Lacc = L_mac_o( L_tmp, *px, *pt, &Overflow );                         /*Q(Qx+16) */
         re2[i] = round_fx_o( L_shl_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx+Q_edct) */
-#else
-        Lacc = L_mac( L_tmp, *px, *pt );            /*Q(Qx+16) */
-        re2[i] = round_fx( L_shl( Lacc, Q_edct ) ); /* Q(Qx+Q_edct) */
-#endif
         move16();
-        L_tmp = L_mult( *px, edct_table[i] ); /*Q(Qx+16) */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( *px, edct_table[i] );                                 /*Q(Qx+16) */
         Lacc = L_msu_o( L_tmp, x[i2], *pt, &Overflow );                       /*Q(Qx+16) */
         im2[i] = round_fx_o( L_shl_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx+Q_edct) */
-#else
-        Lacc = L_msu( L_tmp, x[i2], *pt );          /*Q(Qx+16) */
-        im2[i] = round_fx( L_shl( Lacc, Q_edct ) ); /* Q(Qx+Q_edct) */
-#endif
         move16();
         px -= 2;
         pt--;
@@ -498,23 +486,13 @@ void edct_16fx(
     fact = round_fx( L_shl( L_tmp, 2 ) ); /*Q15 */
     FOR( i = 0; i < shr( length, 1 ); i++ )
     {
-        tmp = mult_r( im2[i], fact ); /*Q(Qx+Q_edct) */
-#ifdef BASOP_NOGLOB
+        tmp = mult_r( im2[i], fact );            /*Q(Qx+Q_edct) */
         re[i] = sub_o( re2[i], tmp, &Overflow ); /*Q(Qx+Q_edct) */
         move16();
-#else
-        re[i] = sub( re2[i], tmp );                 /*Q(Qx+Q_edct) */
-        move16();
-#endif
 
-        tmp = mult_r( re2[i], fact ); /*Q(Qx+Q_edct) */
-#ifdef BASOP_NOGLOB
+        tmp = mult_r( re2[i], fact );            /*Q(Qx+Q_edct) */
         im[i] = add_o( im2[i], tmp, &Overflow ); /*Q(Qx+Q_edct) */
         move16();
-#else
-        im[i] = add( im2[i], tmp ); /*Q(Qx+Q_edct) */
-        move16();
-#endif
     }
 
     /* Post-rotate and obtain the output data */
@@ -524,23 +502,14 @@ void edct_16fx(
     {
         i2 = shl( i, 1 );
 
-        L_tmp = L_mult( re[i], edct_table[i] ); /*Q(Qx+Q_edct+16) */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( re[i], edct_table[i] );                              /*Q(Qx+Q_edct+16) */
         Lacc = L_mac_o( L_tmp, im[i], *pt, &Overflow );                      /*Q(Qx+Q_edct+16) */
         y[i2] = round_fx_o( L_shr_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx) */
-#else                                                                        /* BASOP_NOGLOB */
-        Lacc = L_mac( L_tmp, im[i], *pt );         /*Q(Qx+Q_edct+16) */
-        y[i2] = round_fx( L_shr( Lacc, Q_edct ) ); /* Q(Qx) */
-#endif                                                                       /* BASOP_NOGLOB */
         move16();
 
         L_tmp = L_mult( re[i], edct_table[sub( shr( length, 1 ), add( 1, i ) )] ); /*Q(Qx+Q_edct+16) */
         Lacc = L_msu( L_tmp, im[i], edct_table[i] );                               /*Q(Qx+Q_edct+16) */
-#ifdef BASOP_NOGLOB
-        *py = round_fx_o( L_shr_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx) */
-#else                                                                      /* BASOP_NOGLOB */
-        *py = round_fx( L_shr( Lacc, Q_edct ) );   /* Q(Qx) */
-#endif
+        *py = round_fx_o( L_shr_o( Lacc, Q_edct, &Overflow ), &Overflow );         /* Q(Qx) */
         move16();
 
         py -= 2;
@@ -621,11 +590,12 @@ void edxt_fx(
     const UWord16 synthesis   /* i  : nonzero for inverse Q0*/
 )
 {
-    Word16 k, m, fac;
+    Word16 k, m, fac, hdrm, tmp = 0;
     const Word16 *cosPtr, *sinPtr;
     Word16 n;
     n = 0;
     move16();
+    move16();
     cosPtr = NULL;
     sinPtr = NULL;
     IF( EQ_16( length, 512 ) )
@@ -764,7 +734,23 @@ void edxt_fx(
 
             IF( EQ_16( length, 512 ) )
             {
+                /* Scaling down re and im buffers to avoid overflow in DoRTFTn_fx if the minimum headroom is less than 4 bits */
+                hdrm = s_min( L_norm_arr( re, 512 ), L_norm_arr( im, 512 ) );
+                IF( LT_16( hdrm, 4 ) )
+                {
+                    tmp = sub( hdrm, 4 );
+                    scale_sig32( re, 512, tmp );
+                    scale_sig32( im, 512, tmp );
+                }
+
                 DoRTFTn_fx( re, im, 512 );
+
+                IF( LT_16( hdrm, 4 ) )
+                {
+                    tmp = negate( tmp );
+                    scale_sig32( re, 512, tmp );
+                    scale_sig32( im, 512, tmp );
+                }
             }
             ELSE /* fft() doesn't support 512 */
             {
@@ -860,7 +846,23 @@ void edxt_fx(
 
             IF( EQ_16( length, 512 ) )
             {
+                /* Scaling down re and im buffers to avoid overflow in DoRTFTn_fx if the minimum headroom is less than 4 bits */
+                hdrm = s_min( L_norm_arr( re, 512 ), L_norm_arr( im, 512 ) );
+                IF( LT_16( hdrm, 4 ) )
+                {
+                    tmp = sub( hdrm, 4 );
+                    scale_sig32( re, 512, tmp );
+                    scale_sig32( im, 512, tmp );
+                }
+
                 DoRTFTn_fx( re, im, 512 );
+
+                IF( LT_16( hdrm, 4 ) )
+                {
+                    tmp = negate( tmp );
+                    scale_sig32( re, 512, tmp );
+                    scale_sig32( im, 512, tmp );
+                }
             }
             ELSE /* fft() doesn't support 512 */
             {
diff --git a/lib_com/enh1632.c b/lib_com/enh1632.c
index 04c22ae97c40afa265e386e9fc2f3e268ef10795..bac18231eed2314f224537ba36dbb19baf08f159 100644
--- a/lib_com/enh1632.c
+++ b/lib_com/enh1632.c
@@ -376,21 +376,13 @@ Word32 L_lshr( Word32 L_var1, Word16 var2 )
  *                the range : 0xffff 8000 <= var_out <= 0x0000 7fff.
  *
  *****************************************************************************/
-#ifdef BASOP_NOGLOB
 Word16 shl_ro( Word16 var1, Word16 var2, Flag *Overflow )
-#else
-Word16 shl_r( Word16 var1, Word16 var2 )
-#endif
 {
     Word16 var_out;
 
     if ( var2 >= 0 )
     {
-#ifdef BASOP_NOGLOB
         var_out = shl_o( var1, var2, Overflow );
-#else
-        var_out = shl( var1, var2 );
-#endif
 #ifdef WMOPS
         multiCounter[currCounter].shl--;
 #endif /* ifdef WMOPS */
@@ -398,11 +390,7 @@ Word16 shl_r( Word16 var1, Word16 var2 )
     else
     {
         var2 = -var2;
-#ifdef BASOP_NOGLOB
         var_out = shr_ro( var1, var2, Overflow );
-#else
-        var_out = shr_r( var1, var2 );
-#endif
 #ifdef WMOPS
         multiCounter[currCounter].shr_r--;
 #endif /* ifdef WMOPS */
@@ -414,12 +402,10 @@ Word16 shl_r( Word16 var1, Word16 var2 )
 
     return ( var_out );
 }
-#ifdef BASOP_NOGLOB
 Word16 shl_r( Word16 var1, Word16 var2 )
 {
     return shl_ro( var1, var2, NULL );
 }
-#endif
 /*****************************************************************************
  *
  *  Function Name : L_shl_r
diff --git a/lib_com/enh1632.h b/lib_com/enh1632.h
index eed55ccad44963372710d7919bbb3e9f13eed012..10c10866ae65e278c1b159c4be3273bcb76fbdf3 100644
--- a/lib_com/enh1632.h
+++ b/lib_com/enh1632.h
@@ -40,9 +40,7 @@
  *  Prototypes for enhanced 16/32 bit arithmetic operators
  *
  *****************************************************************************/
-#ifdef BASOP_NOGLOB
 Word16 shl_ro( Word16 var1, Word16 var2, Flag *Overflow );
-#endif
 Word16 shl_r( Word16 var1, Word16 var2 );
 Word32 L_shl_r( Word32 L_var1, Word16 var2 );
 
diff --git a/lib_com/enh32.c b/lib_com/enh32.c
index 64afe89869987ec7073e0cdef0dfe2965f57926f..cf40bbec972f96c6858e957dfe8509f9907b4e40 100644
--- a/lib_com/enh32.c
+++ b/lib_com/enh32.c
@@ -76,11 +76,7 @@ Word32 Mpy_32_32( Word32 L_var1, Word32 L_var2 )
 #endif
 
     L64_var1 = ( (Word64) L_var1 * L_var2 );
-#ifdef BASOP_NOGLOB
     L64_var1 = W_shl_o( L64_var1, 1, &Overflow );
-#else  /* BASOP_NOGLOB */
-    L64_var1 = W_shl( L64_var1, 1 );
-#endif /* BASOP_NOGLOB */
     L_var_out = W_extract_h( L64_var1 );
 #ifdef WMOPS
     multiCounter[currCounter].Mpy_32_32++;
@@ -114,11 +110,7 @@ Word32 Madd_32_16( Word32 L_var3, Word32 L_var1, Word16 var2 )
 #endif
 
     L_var_out = Mpy_32_16_1( L_var1, var2 );
-#ifdef BASOP_NOGLOB
     L_var_out = L_add_o( L_var3, L_var_out, &Overflow );
-#else  /* BASOP_NOGLOB */
-    L_var_out = L_add( L_var3, L_var_out );
-#endif /* BASOP_NOGLOB */
 
 #ifdef WMOPS
     multiCounter[currCounter].Mpy_32_16_1--;
@@ -151,11 +143,7 @@ Word32 Msub_32_16( Word32 L_var3, Word32 L_var1, Word16 var2 )
 #endif
 
     L_var_out = Mpy_32_16_1( L_var1, var2 );
-#ifdef BASOP_NOGLOB
     L_var_out = L_sub_o( L_var3, L_var_out, &Overflow );
-#else /* BASOP_NOGLOB */
-    L_var_out = L_sub( L_var3, L_var_out );
-#endif
 
 #ifdef WMOPS
     multiCounter[currCounter].Mpy_32_16_1--;
diff --git a/lib_com/enh40.c b/lib_com/enh40.c
index 929e3a950652d6fd12162aadbaa2e7a3c2ffdb57..570f4b211ab675c8fd924a2b0d4786ddec25c679 100644
--- a/lib_com/enh40.c
+++ b/lib_com/enh40.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -96,9 +96,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "stl.h"
-#ifdef BASOP_NOGLOB
 #include <assert.h>
-#endif /* BASOP_NOGLOB */
 
 #define WMC_TOOL_SKIP
 
@@ -160,11 +158,7 @@
  *                the range : MIN_40 <= L40_var_out <= MAX_40.
  *
  *****************************************************************************/
-#ifndef BASOP_NOGLOB
-Word40 L40_shl( Word40 L40_var1, Word16 var2 )
-#else  /* BASOP_NOGLOB */
 Word40 L40_shl_o( Word40 L40_var1, Word16 var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
 
     Word40 L40_var_out;
@@ -194,27 +188,15 @@ Word40 L40_shl_o( Word40 L40_var1, Word16 var2, Flag *Overflow )
             if ( L40_var_out > 0x003fffffffffLL )
 #endif
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 1;
-                exit( 1 );
-                /*            L40_var_out = L40_OVERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
                 *Overflow = 1;
                 L40_var_out = MAX_40;
-#endif /* BASOP_NOGLOB */
                 break;
             }
 
             else if ( L40_var_out < L40_constant )
             {
-#ifndef BASOP_NOGLOB
-                Overflow = 1;
-                exit( 2 );
-                /*            L40_var_out = L40_UNDERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
                 *Overflow = 1;
                 L40_var_out = MIN_40;
-#endif /* BASOP_NOGLOB */
                 break;
             }
 
@@ -234,7 +216,6 @@ Word40 L40_shl_o( Word40 L40_var1, Word16 var2, Flag *Overflow )
     return ( L40_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word40 L40_shl( Word40 L40_var1, Word16 var2 )
 {
 
@@ -293,7 +274,6 @@ Word40 L40_shl( Word40 L40_var1, Word16 var2 )
 
     return ( L40_var_out );
 }
-#endif /* BASOP_NOGLOB */
 
 /*****************************************************************************
  *
@@ -422,7 +402,6 @@ Word40 L40_negate( Word40 L40_var1 )
  *                the range : MIN_40 <= L40_var_out <= MAX_40.
  *
  *****************************************************************************/
-#ifdef BASOP_NOGLOB
 
 Word40 L40_add_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow )
 {
@@ -465,7 +444,6 @@ Word40 L40_add_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow )
     return ( L40_var_out );
 }
 
-#endif /* BASOP_NOGLOB */
 Word40 L40_add( Word40 L40_var1, Word40 L40_var2 )
 {
     Word40 L40_var_out;
@@ -475,48 +453,24 @@ Word40 L40_add( Word40 L40_var1, Word40 L40_var2 )
 #if defined( _MSC_VER ) && ( _MSC_VER <= 1200 )
     if ( ( ( ( L40_var1 & 0x8000000000 ) >> 39 ) != 0 ) && ( ( ( L40_var2 & 0x8000000000 ) >> 39 ) != 0 ) && ( ( ( L40_var_out & 0x8000000000 ) >> 39 ) == 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 2 );
-        /*      L40_var_out = L40_UNDERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         assert( 0 );
         L40_var_out = MIN_40;
-#endif /* BASOP_NOGLOB */
     }
     else if ( ( ( ( L40_var1 & 0x8000000000 ) >> 39 ) == 0 ) && ( ( ( L40_var2 & 0x8000000000 ) >> 39 ) == 0 ) && ( ( ( L40_var_out & 0x8000000000 ) >> 39 ) != 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 1 );
-        /*      L40_var_out = L40_OVERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         assert( 0 );
         L40_var_out = MAX_40;
-#endif /* BASOP_NOGLOB */
     }
 #else
     if ( ( ( ( L40_var1 & 0x8000000000LL ) >> 39 ) != 0 ) && ( ( ( L40_var2 & 0x8000000000LL ) >> 39 ) != 0 ) && ( ( ( L40_var_out & 0x8000000000LL ) >> 39 ) == 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 2 );
-        /*      L40_var_out = L40_UNDERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         assert( 0 );
         L40_var_out = MIN_40;
-#endif /* BASOP_NOGLOB */
     }
     else if ( ( ( ( L40_var1 & 0x8000000000LL ) >> 39 ) == 0 ) && ( ( ( L40_var2 & 0x8000000000LL ) >> 39 ) == 0 ) && ( ( ( L40_var_out & 0x8000000000LL ) >> 39 ) != 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 1 );
-        /*      L40_var_out = L40_OVERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         assert( 0 );
         L40_var_out = MAX_40;
-#endif /* BASOP_NOGLOB */
     }
 #endif
 
@@ -561,11 +515,7 @@ Word40 L40_add( Word40 L40_var1, Word40 L40_var2 )
  *                the range : MIN_40 <= L40_var_out <= MAX_40.
  *
  *****************************************************************************/
-#ifndef BASOP_NOGLOB
-Word40 L40_sub( Word40 L40_var1, Word40 L40_var2 )
-#else  /* BASOP_NOGLOB */
 Word40 L40_sub_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word40 L40_var_out;
 
@@ -574,48 +524,24 @@ Word40 L40_sub_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow )
 #if defined( _MSC_VER ) && ( _MSC_VER <= 1200 )
     if ( ( ( ( L40_var1 & 0x8000000000 ) >> 39 ) != 0 ) && ( ( ( L40_var2 & 0x8000000000 ) >> 39 ) == 0 ) && ( ( ( L40_var_out & 0x8000000000 ) >> 39 ) == 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 2 );
-        /*      L40_var_out = L40_UNDERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
         L40_var_out = MIN_40;
-#endif /* BASOP_NOGLOB */
     }
     else if ( ( ( ( L40_var1 & 0x8000000000 ) >> 39 ) == 0 ) && ( ( ( L40_var2 & 0x8000000000 ) >> 39 ) != 0 ) && ( ( ( L40_var_out & 0x8000000000 ) >> 39 ) != 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 1 );
-        /*      L40_var_out = L40_OVERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
         L40_var_out = MAX_40;
-#endif /* BASOP_NOGLOB */
     }
 #else
     if ( ( ( ( L40_var1 & 0x8000000000LL ) >> 39 ) != 0 ) && ( ( ( L40_var2 & 0x8000000000LL ) >> 39 ) == 0 ) && ( ( ( L40_var_out & 0x8000000000LL ) >> 39 ) == 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 2 );
-        /*      L40_var_out = L40_UNDERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
         L40_var_out = MIN_40;
-#endif /* BASOP_NOGLOB */
     }
     else if ( ( ( ( L40_var1 & 0x8000000000LL ) >> 39 ) == 0 ) && ( ( ( L40_var2 & 0x8000000000LL ) >> 39 ) != 0 ) && ( ( ( L40_var_out & 0x8000000000LL ) >> 39 ) != 0 ) )
     {
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-        exit( 1 );
-        /*      L40_var_out = L40_OVERFLOW_OCCURED( L40_var_out); */
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
         L40_var_out = MAX_40;
-#endif /* BASOP_NOGLOB */
     }
 #endif
 
@@ -629,7 +555,6 @@ Word40 L40_sub_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow )
     return ( L40_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word40 L40_sub( Word40 L40_var1, Word40 L40_var2 )
 {
     Word40 L40_var_out;
@@ -669,7 +594,6 @@ Word40 L40_sub( Word40 L40_var1, Word40 L40_var2 )
 
     return ( L40_var_out );
 }
-#endif /* BASOP_NOGLOB */
 
 /*****************************************************************************
  *
@@ -838,12 +762,8 @@ Word40 L40_min( Word40 L40_var1, Word40 L40_var2 )
  *                the range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.
  *
  *****************************************************************************/
-#ifndef BASOP_NOGLOB
-Word32 L_saturate40( Word40 L40_var1 )
-#else  /* BASOP_NOGLOB */
 
 Word32 L_saturate40_o( Word40 L40_var1, Flag *Overflow )
-#endif /* BASOP_NOGLOB */
 {
     Word32 L_var_out;
 
@@ -853,21 +773,13 @@ Word32 L_saturate40_o( Word40 L40_var1, Flag *Overflow )
     if ( L40_var1 < UNDER_L40_var2 )
     {
         L40_var1 = UNDER_L40_var2;
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
-#endif /* BASOP_NOGLOB */
     }
 
     if ( L40_var1 > OVER_L40_var2 )
     {
         L40_var1 = OVER_L40_var2;
-#ifndef BASOP_NOGLOB
-        Overflow = 1;
-#else  /* BASOP_NOGLOB */
         *Overflow = 1;
-#endif /* BASOP_NOGLOB */
     }
 
     L_var_out = L_Extract40( L40_var1 );
@@ -882,7 +794,6 @@ Word32 L_saturate40_o( Word40 L40_var1, Flag *Overflow )
     return ( L_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 L_saturate40( Word40 L40_var1 )
 {
     Word32 L_var_out;
@@ -913,7 +824,6 @@ Word32 L_saturate40( Word40 L40_var1 )
 
     return ( L_var_out );
 }
-#endif /* BASOP_NOGLOB */
 
 /*****************************************************************************
  *
diff --git a/lib_com/enh40.h b/lib_com/enh40.h
index ca78cb33e757efa0b842cccef662c45d1d96fa50..9c3742f3ef23b24bced88e87e71b85a8ac83baca 100644
--- a/lib_com/enh40.h
+++ b/lib_com/enh40.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -56,10 +56,8 @@
 
 #include "stl.h"
 
-#if defined( BASOP_NOGLOB ) || defined( _MSC_VER )
 #define MAX_40 ( 0x0000007fffffffff )
 #define MIN_40 ( 0xffffff8000000000 )
-#endif
 
 #define L40_OVERFLOW_OCCURED( L40_var1 )  ( Overflow = 1, exit( 1 ), L40_var1 )
 #define L40_UNDERFLOW_OCCURED( L40_var1 ) ( Overflow = 1, exit( 2 ), L40_var1 )
@@ -111,7 +109,6 @@ Word40 L40_max( Word40 L40_var1, Word40 L40_var2 );
 Word40 L40_min( Word40 L40_var1, Word40 L40_var2 );
 Word32 L_saturate40( Word40 L40_var1 );
 Word16 norm_L40( Word40 L40_var1 );
-#ifdef BASOP_NOGLOB
 /*
  * Overflowing operators
  */
@@ -119,7 +116,6 @@ Word40 L40_shl_o( Word40 L40_var1, Word16 var2, Flag *Overflow );
 Word40 L40_add_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow );
 Word40 L40_sub_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow );
 Word32 L_saturate40_o( Word40 L40_var1, Flag *Overflow );
-#endif /* BASOP_NOGLOB */
 /*#ifdef _MSC_VER*/
 static __inline Word40 L40_set( Word40 L40_var1 )
 {
diff --git a/lib_com/enh64.c b/lib_com/enh64.c
index 9eb58c4d399848547a585ff714a0f212adecad7d..8bffb620cc8dfb0b2164e718b83fa365fb048430 100644
--- a/lib_com/enh64.c
+++ b/lib_com/enh64.c
@@ -161,11 +161,7 @@ Word64 W_sub_nosat( Word64 L64_var1, Word64 L64_var2 )
 |       range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL. |
 |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word64 W_shl_o( Word64 L64_var1, Word16 var2, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word64 W_shl( Word64 L64_var1, Word16 var2 )
-#endif /* BASOP_NOGLOB */
 {
 
     Word64 L64_var_out = 0LL;
@@ -183,11 +179,7 @@ Word64 W_shl( Word64 L64_var1, Word16 var2 )
         {
             if ( L64_var1 > (Word64) 0X3fffffffffffffffLL )
             {
-#ifdef BASOP_NOGLOB
                 set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-                Overflow = 1;
-#endif /* BASOP_NOGLOB */
                 L64_var_out = (Word64) 0X7fffffffffffffffLL;
                 break;
             }
@@ -195,11 +187,7 @@ Word64 W_shl( Word64 L64_var1, Word16 var2 )
             {
                 if ( L64_var1 < (Word64) 0xc000000000000000LL )
                 {
-#ifdef BASOP_NOGLOB
                     set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-                    Overflow = 1;
-#endif /* BASOP_NOGLOB */
                     L64_var_out = (Word64) 0x8000000000000000LL;
                     break;
                 }
@@ -217,12 +205,10 @@ Word64 W_shl( Word64 L64_var1, Word16 var2 )
     return ( L64_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word64 W_shl( Word64 L64_var1, Word16 var2 )
 {
     return W_shl_o( L64_var1, var2, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 
 /*___________________________________________________________________________
@@ -1185,11 +1171,7 @@ Word32 W_shl_sat_l( Word64 L64_var, Word16 n )
 |             range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.                     |
 |__________________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word32 W_round48_L_o( Word64 L64_var1, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word32 W_round48_L( Word64 L64_var1 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
     Word32 L_result;
@@ -1207,11 +1189,7 @@ Word32 W_round48_L( Word64 L64_var1 )
         if ( ( L64_var_out ^ L64_var1 ) & L64_MIN )
         {
             L64_var_out = ( L64_var1 < 0 ) ? L64_MIN : L64_MAX;
-#ifdef BASOP_NOGLOB
             set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-            Overflow = 1;
-#endif /* BASOP_NOGLOB */
         }
     }
     L_result = W_extract_h( L64_var_out );
@@ -1224,12 +1202,10 @@ Word32 W_round48_L( Word64 L64_var1 )
     return ( L_result );
 }
 
-#ifdef BASOP_NOGLOB
 Word32 W_round48_L( Word64 L64_var1 )
 {
     return W_round48_L_o( L64_var1, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 /*__________________________________________________________________________________
 |                                                                                  |
@@ -1258,11 +1234,7 @@ Word32 W_round48_L( Word64 L64_var1 )
 |             range : 0xffff 8000 <= var_out <= 0x0000 7fff.                       |
 |__________________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word16 W_round32_s_o( Word64 L64_var1, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word16 W_round32_s( Word64 L64_var1 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
     Word32 L_var;
@@ -1281,11 +1253,7 @@ Word16 W_round32_s( Word64 L64_var1 )
         if ( ( L64_var_out ^ L64_var1 ) & L64_MIN )
         {
             L64_var_out = ( L64_var1 < 0 ) ? L64_MIN : L64_MAX;
-#ifdef BASOP_NOGLOB
             set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-            Overflow = 1;
-#endif /* BASOP_NOGLOB */
         }
     }
     L_var = W_extract_h( L64_var_out );
@@ -1300,12 +1268,10 @@ Word16 W_round32_s( Word64 L64_var1 )
     return ( var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word16 W_round32_s( Word64 L64_var1 )
 {
     return W_round32_s_o( L64_var1, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
 |                                                                           |
@@ -1398,11 +1364,7 @@ Word16 W_norm( Word64 L64_var1 )
 |       range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL.     |
 |_______________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word64 W_add_o( Word64 L64_var1, Word64 L64_var2, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
 
@@ -1413,11 +1375,7 @@ Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
         if ( ( L64_var_out ^ L64_var1 ) & MIN_64 )
         {
             L64_var_out = ( L64_var1 < 0 ) ? MIN_64 : MAX_64;
-#ifdef BASOP_NOGLOB
             set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-            Overflow = 1;
-#endif /* BASOP_NOGLOB */
         }
     }
 
@@ -1427,12 +1385,10 @@ Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
     return L64_var_out;
 }
 
-#ifdef BASOP_NOGLOB
 Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
 {
     return W_add_o( L64_var1, L64_var2, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 /*______________________________________________________________________________
 |                                                                               |
@@ -1465,11 +1421,7 @@ Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
 |       range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL.     |
 |_______________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word64 W_sub_o( Word64 L64_var1, Word64 L64_var2, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
 
@@ -1480,11 +1432,7 @@ Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
         if ( ( L64_var_out ^ L64_var1 ) & MIN_64 )
         {
             L64_var_out = ( L64_var1 < 0 ) ? MIN_64 : MAX_64;
-#ifdef BASOP_NOGLOB
             set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-            Overflow = 1;
-#endif /* BASOP_NOGLOB */
         }
     }
 
@@ -1494,12 +1442,10 @@ Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
     return L64_var_out;
 }
 
-#ifdef BASOP_NOGLOB
 Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
 {
     return W_sub_o( L64_var1, L64_var2, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 
 /*______________________________________________________________________________
@@ -1529,22 +1475,14 @@ Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
 |       range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL.     |
 |_______________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word64 W_neg_o( Word64 L64_var1, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word64 W_neg( Word64 L64_var1 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
 
     if ( L64_var1 == MIN_64 )
     {
         L64_var_out = MAX_64;
-#ifdef BASOP_NOGLOB
         set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-        Overflow = 1;
-#endif /* BASOP_NOGLOB */
     }
     else
     {
@@ -1558,12 +1496,10 @@ Word64 W_neg( Word64 L64_var1 )
     return ( L64_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word64 W_neg( Word64 L64_var1 )
 {
     return W_neg_o( L64_var1, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 
 /*___________________________________________________________________________
@@ -1593,22 +1529,14 @@ Word64 W_neg( Word64 L64_var1 )
  |       range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL. |
  |___________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word64 W_abs_o( Word64 L64_var1, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word64 W_abs( Word64 L64_var1 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
 
     if ( L64_var1 == MIN_64 )
     {
         L64_var_out = MAX_64;
-#ifdef BASOP_NOGLOB
         set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-        Overflow = 1;
-#endif /* BASOP_NOGLOB */
     }
     else
     {
@@ -1629,12 +1557,10 @@ Word64 W_abs( Word64 L64_var1 )
     return ( L64_var_out );
 }
 
-#ifdef BASOP_NOGLOB
 Word64 W_abs( Word64 L64_var1 )
 {
     return W_abs_o( L64_var1, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 /*_________________________________________________________________________________________________
 |                                                                                                 |
@@ -1668,22 +1594,14 @@ Word64 W_abs( Word64 L64_var1 )
 |             range : 0x80000000 00000000LL <= L64_var_out <= 0x7fffffff ffffffffLL.              |
 |_________________________________________________________________________________________________|
 */
-#ifdef BASOP_NOGLOB
 Word64 W_mult_32_32_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
-#else  /* BASOP_NOGLOB */
-Word64 W_mult_32_32( Word32 L_var1, Word32 L_var2 )
-#endif /* BASOP_NOGLOB */
 {
     Word64 L64_var_out;
 
     if ( ( L_var1 == MIN_32 ) && ( L_var2 == MIN_32 ) )
     {
         L64_var_out = MAX_64;
-#ifdef BASOP_NOGLOB
         set_overflow( Overflow );
-#else  /* BASOP_NOGLOB */
-        Overflow = 1;
-#endif /* BASOP_NOGLOB */
     }
     else
     {
@@ -1696,12 +1614,10 @@ Word64 W_mult_32_32( Word32 L_var1, Word32 L_var2 )
     return L64_var_out;
 }
 
-#ifdef BASOP_NOGLOB
 Word64 W_mult_32_32( Word32 L_var1, Word32 L_var2 )
 {
     return W_mult_32_32_o( L_var1, L_var2, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 /*_________________________________________________________________________________________________
 |                                                                                                 |
diff --git a/lib_com/enh64.h b/lib_com/enh64.h
index 8aed870a67e0688ab7e3398caa7f7aa040f186b0..c3896bb0d257aa053df48da5c84948b8255e0401 100644
--- a/lib_com/enh64.h
+++ b/lib_com/enh64.h
@@ -65,7 +65,6 @@ UWord64 W_lshl( UWord64 L64_var1, Word16 var2 );
 UWord64 W_lshr( UWord64 L64_var1, Word16 var2 );
 Word32 W_round64_L( Word64 L64_var1 );
 
-#ifdef BASOP_NOGLOB
 /*
  * Overflowing operators
  */
@@ -77,7 +76,6 @@ Word64 W_sub_o( Word64 L64_var1, Word64 L64_var2, Flag *Overflow );
 Word64 W_neg_o( Word64 L64_var1, Flag *Overflow );
 Word64 W_abs_o( Word64 L64_var1, Flag *Overflow );
 Word64 W_mult_32_32_o( Word32 L_var1, Word32 L_var2, Flag *Overflow );
-#endif /* BASOP_NOGLOB */
 
 #endif /* #ifdef ENH_64_BIT_OPERATOR */
 
diff --git a/lib_com/enhancer_fx.c b/lib_com/enhancer_fx.c
index 88bc7049710728f6e8e47966219719ddc606e6e0..7df474a5d6ab88a9f6ca0ae8f706f590ae0affe7 100644
--- a/lib_com/enhancer_fx.c
+++ b/lib_com/enhancer_fx.c
@@ -137,11 +137,7 @@ void enhancer_fx(
      *-----------------------------------------------------------*/
 
     /* tmp = 0.5f * (1.0f - voice_fac) */
-#ifdef BASOP_NOGLOB
     tmp = msu_r_sat( 0x40000000 /*0.5.Q31*/, voice_fac, 16384 /*0.5.Q15*/ ); /*Q15 */ /* 1=unvoiced, 0=voiced */
-#else
-    tmp = msu_r( 0x40000000, voice_fac, 16384 ); /*Q15 */ /* 1=unvoiced, 0=voiced */
-#endif
     /* fac = stab_fac * tmp */
     fac = mult( stab_fac, tmp ); /*Q15*/
 
@@ -193,11 +189,7 @@ void enhancer_fx(
         test();
         IF( Opt_AMR_WB && ( EQ_32( core_brate, ACELP_8k85 ) || EQ_32( core_brate, ACELP_6k60 ) ) )
         {
-#ifdef BASOP_NOGLOB
             pit_sharp = shl_sat( gain_pit, 1 ); /* saturation can occur here Q14 -> Q15 */
-#else
-            pit_sharp = shl( gain_pit, 1 );               /* saturation can occur here Q14 -> Q15 */
-#endif
             /* saturation takes care of "if (pit_sharp > 1.0) { pit_sharp=1.0; }" */
             IF( GT_16( pit_sharp, 16384 /*0.5.Q15*/ ) )
             {
@@ -232,45 +224,27 @@ void enhancer_fx(
         /* pt_exc2[0] += code[0] - tmp * code[1] */
         L_tmp = L_deposit_h( code[0] );       /* if Enc :Q9 * Q15 -> Q25 */
         L_tmp = L_msu( L_tmp, code[1], tmp ); /* Q12 * Q15 -> Q28 */
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_mult( gain_code_hi, extract_h( L_tmp ) ), sc );
         pt_exc2[0] = msu_r_sat( L_tmp, -32768, pt_exc2[0] );
         move16();
-#else
-        L_tmp = L_shl( L_mult( gain_code_hi, extract_h( L_tmp ) ), sc );
-        pt_exc2[0] = msu_r( L_tmp, -32768, pt_exc2[0] );
-        move16();
-#endif
 
         FOR( i = 1; i < L_SUBFR - 1; i++ )
         {
             /* pt_exc2[i] += code[i] - tmp * code[i-1] - tmp * code[i+1] */
             L_tmp = L_msu( -32768, code[i], -32768 );
             L_tmp = L_msu( L_tmp, code[i + 1], tmp );
-#ifdef BASOP_NOGLOB
             tmp16 = msu_r_sat( L_tmp, code[i - 1], tmp );
             L_tmp = L_shl_sat( L_mult( gain_code_hi, tmp16 ), sc );
             pt_exc2[i] = msu_r_sat( L_tmp, -32768, pt_exc2[i] );
             move16();
-#else
-            tmp16 = msu_r( L_tmp, code[i - 1], tmp );
-            L_tmp = L_shl( L_mult( gain_code_hi, tmp16 ), sc );
-            pt_exc2[i] = msu_r( L_tmp, -32768, pt_exc2[i] );
-            move16(); /* in Q_exc */
-#endif
         }
 
         /* pt_exc2[L_SUBFR-1] += code[L_SUBFR-1] - tmp * code[L_SUBFR-2] */
         L_tmp = L_deposit_h( code[L_SUBFR - 1] );       /*Q28 */
         L_tmp = L_msu( L_tmp, code[L_SUBFR - 2], tmp ); /*Q28 */
         L_tmp = L_shl( L_mult( gain_code_hi, extract_h( L_tmp ) ), sc );
-#ifdef BASOP_NOGLOB
         pt_exc2[L_SUBFR - 1] = msu_r_sat( L_tmp, -32768, pt_exc2[L_SUBFR - 1] );
         move16();
-#else
-        pt_exc2[L_SUBFR - 1] = msu_r( L_tmp, -32768, pt_exc2[L_SUBFR - 1] );
-        move16();
-#endif
         test();
         test();
         IF( Opt_AMR_WB && ( EQ_32( core_brate, ACELP_8k85 ) || EQ_32( core_brate, ACELP_6k60 ) ) )
@@ -280,11 +254,7 @@ void enhancer_fx(
                 FOR( i = 0; i < L_SUBFR; i++ )
                 {
                     /* excp[i] += pt_exc2[i] */
-#ifdef BASOP_NOGLOB
                     excp[i] = add_sat( excp[i], pt_exc2[i] );
-#else
-                    excp[i] = add( excp[i], pt_exc2[i] );
-#endif
                     move16();
                 }
                 agc2_fx( pt_exc2, excp, L_SUBFR );
@@ -440,11 +410,7 @@ void enhancer_ivas_fx(
      *-----------------------------------------------------------*/
 
     /* tmp = 0.5f * (1.0f - voice_fac) */
-#ifdef BASOP_NOGLOB
     tmp = msu_r_sat( 0x40000000 /*0.5.Q31*/, voice_fac, 16384 /*0.5.Q14*/ ); /*Q15 */ /* 1=unvoiced, 0=voiced */
-#else
-    tmp = msu_r( 0x40000000, voice_fac, 16384 ); /*Q15 */ /* 1=unvoiced, 0=voiced */
-#endif
     /* fac = stab_fac * tmp */
     fac = mult( stab_fac, tmp ); /*Q15*/
 
@@ -496,11 +462,7 @@ void enhancer_ivas_fx(
         test();
         IF( Opt_AMR_WB && ( EQ_32( core_brate, ACELP_8k85 ) || EQ_32( core_brate, ACELP_6k60 ) ) )
         {
-#ifdef BASOP_NOGLOB
             pit_sharp = shl_sat( gain_pit, 1 ); /* saturation can occur here Q14 -> Q15 */
-#else
-            pit_sharp = shl( gain_pit, 1 );               /* saturation can occur here Q14 -> Q15 */
-#endif
             /* saturation takes care of "if (pit_sharp > 1.0) { pit_sharp=1.0; }" */
             IF( GT_16( pit_sharp, 16384 /*0.5.Q15*/ ) )
             {
@@ -546,11 +508,7 @@ void enhancer_ivas_fx(
             L_tmp = L_msu( L_tmp, code[i + 1], tmp );
             tmp16 = msu_r( L_tmp, code[i - 1], tmp );
             L_tmp = L_shl( L_mult( gain_code_hi, tmp16 ), sc );
-#ifdef BASOP_NOGLOB
             pt_exc2[i] = msu_r_sat( L_tmp, -32768, pt_exc2[i] );
-#else
-            pt_exc2[i] = msu_r( L_tmp, -32768, pt_exc2[i] );
-#endif
             move16(); /* in Q_exc */
         }
 
@@ -661,11 +619,7 @@ void enhancer_ivas_fx2(
      *-----------------------------------------------------------*/
 
     /* tmp = 0.5f * (1.0f - voice_fac) */
-#ifdef BASOP_NOGLOB
     tmp = msu_r_sat( 0x40000000 /*0.5.Q31*/, voice_fac, 16384 /*0.5.Q15*/ ); /*Q15 */ /* 1=unvoiced, 0=voiced */
-#else
-    tmp = msu_r( 0x40000000, voice_fac, 16384 ); /*Q15 */ /* 1=unvoiced, 0=voiced */
-#endif
     /* fac = stab_fac * tmp */
     fac = mult( stab_fac, tmp ); /*Q15*/
 
@@ -717,11 +671,7 @@ void enhancer_ivas_fx2(
         test();
         IF( Opt_AMR_WB && ( EQ_32( core_brate, ACELP_8k85 ) || EQ_32( core_brate, ACELP_6k60 ) ) )
         {
-#ifdef BASOP_NOGLOB
             pit_sharp = shl_sat( gain_pit, 1 ); /* saturation can occur here Q14 -> Q15 */
-#else
-            pit_sharp = shl( gain_pit, 1 );               /* saturation can occur here Q14 -> Q15 */
-#endif
             /* saturation takes care of "if (pit_sharp > 1.0) { pit_sharp=1.0; }" */
             IF( GT_16( pit_sharp, 16384 /*0.5.Q15*/ ) )
             {
@@ -788,11 +738,7 @@ void enhancer_ivas_fx2(
                 FOR( i = 0; i < L_SUBFR; i++ )
                 {
                     /* excp[i] += pt_exc2[i] */
-#ifdef BASOP_NOGLOB
                     excp[i] = add_sat( excp[i], pt_exc2[i] );
-#else
-                    excp[i] = add( excp[i], pt_exc2[i] );
-#endif
                     move16();
                 }
                 agc2_fx( pt_exc2, excp, L_SUBFR );
@@ -877,11 +823,7 @@ Word16 E_UTIL_enhancer(
 
     /* if gain_code is computed function of energy, noise enhancer is by-passed.*/
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     tmp = msu_r_sat( 1073741824l /*0.5f Q31*/, 16384 /*0.5f Q15*/, voice_fac ); /* 1=unvoiced, 0=voiced */
-#else                                                                           /* BASOP_NOGLOB */
-    tmp = msu_r( 1073741824l /*0.5f Q31*/, 16384 /*0.5f Q15*/, voice_fac ); /* 1=unvoiced, 0=voiced */
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     fac = mult_r( stab_fac, tmp ); /* fac in Q15 */
 
@@ -912,13 +854,8 @@ Word16 E_UTIL_enhancer(
     /* exponent of code: 31-16 + 15-11 - tmp + code_exp */
     code_exp = sub( add( 31 - 16 + 15 - 11, code_exp ), tmp );
 
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_sat( L_tmp, tmp );
     gain = round_fx_sat( L_tmp );
-#else
-    L_tmp = L_shl( L_tmp, tmp );
-    gain = round_fx( L_tmp );
-#endif
 
     FOR( i = 0; i < L_subfr; i++ )
     {
@@ -948,24 +885,15 @@ Word16 E_UTIL_enhancer(
     L_tmp = L_msu0( L_tmp, tmp, code[1] );
     IF( gain )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_tmp, gain );
-#else
-        L_tmp = L_shl( L_tmp, gain );
-#endif
     }
-#ifdef BASOP_NOGLOB
     exc2[0] = msu_r_sat( L_tmp, -32768, exc2[0] );
-#else
-    exc2[0] = msu_r( L_tmp, -32768, exc2[0] );
-#endif
     move16();
 
     FOR( i = 1; i < L_subfr - 1; i++ )
     {
         /* exc2[i]         = exc2[i]         + code[i]         - tmp*(code[i+1]+code[i-1]); */
         L_tmp = L_mult( code[i], 16384 );
-#ifdef BASOP_NOGLOB
         L_tmp = L_msu0_sat( L_tmp, tmp, code[i - 1] );
         L_tmp = L_msu0_sat( L_tmp, tmp, code[i + 1] );
         IF( gain )
@@ -973,34 +901,16 @@ Word16 E_UTIL_enhancer(
             L_tmp = L_shl_sat( L_tmp, gain );
         }
         exc2[i] = msu_r_sat( L_tmp, -32768, exc2[i] );
-#else
-        L_tmp = L_msu0( L_tmp, tmp, code[i - 1] );
-        L_tmp = L_msu0( L_tmp, tmp, code[i + 1] );
-        if ( gain )
-        {
-            L_tmp = L_shl( L_tmp, gain );
-        }
-        exc2[i] = msu_r( L_tmp, -32768, exc2[i] );
-#endif
         move16();
     }
     /* exc2[L_subfr-1] = exc2[L_subfr-1] + code[L_subfr-1] - tmp*code[L_subfr-2]; */
     L_tmp = L_mult( code[i], 16384 );
-#ifdef BASOP_NOGLOB
     L_tmp = L_msu0_sat( L_tmp, tmp, code[i - 1] );
     IF( gain )
     {
         L_tmp = L_shl_sat( L_tmp, gain );
     }
     exc2[i] = msu_r_sat( L_tmp, -32768, exc2[i] );
-#else
-    L_tmp = L_msu0( L_tmp, tmp, code[i - 1] );
-    if ( gain )
-    {
-        L_tmp = L_shl( L_tmp, gain );
-    }
-    exc2[i] = msu_r( L_tmp, -32768, exc2[i] );
-#endif
     move16();
 
     return code_exp;
@@ -1079,11 +989,7 @@ static void phase_dispersion_fx(
     prev_gain_pit[0] = gain_pit;
     move16();
 
-#ifdef BASOP_NOGLOB
     IF( GT_32( L_sub_sat( gain_code, *prev_gain_code ), L_shl_sat( *prev_gain_code, 1 ) ) )
-#else
-    IF( GT_32( L_sub( gain_code, *prev_gain_code ), L_shl( *prev_gain_code, 1 ) ) )
-#endif
     {
         state = s_min( add( state, 1 ), 2 );
     }
@@ -1208,11 +1114,7 @@ static void agc2_fx(
     FOR( i = 1; i < l_trm; i++ )
     {
         temp = shr( sig_out[i], 2 );
-#ifdef BASOP_NOGLOB
         s = L_mac0_sat( s, temp, temp );
-#else
-        s = L_mac0( s, temp, temp );
-#endif
     }
     IF( s != 0 )
     {
@@ -1225,11 +1127,7 @@ static void agc2_fx(
         FOR( i = 1; i < l_trm; i++ )
         {
             temp = shr( sig_in[i], 2 );
-#ifdef BASOP_NOGLOB
             s = L_mac0_sat( s, temp, temp );
-#else
-            s = L_mac0( s, temp, temp );
-#endif
         }
 
         g0 = 0;
@@ -1237,11 +1135,7 @@ static void agc2_fx(
         IF( s != 0 )
         {
             i = norm_l( s );
-#ifdef BASOP_NOGLOB
             gain_in = round_fx_sat( L_shl_sat( s, i ) );
-#else
-            gain_in = round_fx( L_shl( s, i ) );
-#endif
             exp = sub( exp, i );
 
             /*---------------------------------------------------*
@@ -1251,21 +1145,13 @@ static void agc2_fx(
             s = L_shr( s, exp );                            /* add exponent */
 
             s = Isqrt( s );
-#ifdef BASOP_NOGLOB
             g0 = round_fx_sat( L_shl_sat( s, 9 ) );
-#else
-            g0 = round_fx( L_shl( s, 9 ) );
-#endif
         }
 
         /* sig_out(n) = gain(n) sig_out(n) */
         FOR( i = 0; i < l_trm; i++ )
         {
-#ifdef BASOP_NOGLOB
             sig_out[i] = round_fx_sat( L_shl_sat( L_mac( -8192, sig_out[i], g0 ), 2 ) );
-#else
-            sig_out[i] = round_fx( L_shl( L_mac( -8192, sig_out[i], g0 ), 2 ) );
-#endif
             move16();
         }
     }
diff --git a/lib_com/enr_1_az.c b/lib_com/enr_1_az.c
index 8bc24ddbedd500b2b50d451125cf677c19801305..5c99cdfa5e27692d9373f9e5bec6e1b046f8b380 100644
--- a/lib_com/enr_1_az.c
+++ b/lib_com/enr_1_az.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,23 +37,15 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 
-#ifdef BASOP_NOGLOB
 Word16 Enr_1_Az_fx_o(                    /* o  : impulse response energy      Q3  */
                       const Word16 Aq[], /* i  : LP filter coefs              Qx based on the fact that Aq[0] == 1.0 */
                       const Word16 len,  /* i  : impulse response length      Q0  */
                       Flag *Overflow_out /* o :  propagating the Overflow flag to upper level */
 )
-#else
-Word16 Enr_1_Az_fx(                    /* o  : impulse response energy      Q3  */
-                    const Word16 Aq[], /* i  : LP filter coefs              Qx based on the fact that Aq[0] == 1.0 */
-                    const Word16 len   /* i  : impulse response length      Q0  */
-)
-#endif
 {
     Word16 h1[2 * L_SUBFR];
     Word16 *y;
@@ -94,23 +86,13 @@ Word16 Enr_1_Az_fx(                    /* o  : impulse response energy      Q3
         L_tmp = L_msu( 0, Aq[1], y[-1] );
         FOR( j = 2; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( L_tmp, Aq[j], y[-j], &Overflow );
-#else
-            L_tmp = L_msu( L_tmp, Aq[j], y[-j] );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( L_tmp, q, &Overflow );
         *y = round_fx_o( L_tmp, &Overflow );
         move16();
         L_tmp2 = L_mac_o( L_tmp2, *y, *y, &Overflow );
-#else
-        L_tmp = L_shl( L_tmp, q );
-        *y = round_fx( L_tmp );
-        L_tmp2 = L_mac( L_tmp2, *y, *y );
-#endif
         y++;
     }
     /* Normal Filtering */
@@ -119,34 +101,19 @@ Word16 Enr_1_Az_fx(                    /* o  : impulse response energy      Q3
         L_tmp = L_msu( 0, Aq[1], y[-1] );
         FOR( j = 2; j <= M; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( L_tmp, Aq[j], y[-j], &Overflow );
-#else
-            L_tmp = L_msu( L_tmp, Aq[j], y[-j] );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( L_tmp, q, &Overflow );
         *y = round_fx_o( L_tmp, &Overflow );
         move16();
         L_tmp2 = L_mac_o( L_tmp2, *y, *y, &Overflow );
-#else
-        L_tmp = L_shl( L_tmp, q );
-        *y = round_fx( L_tmp );
-        L_tmp2 = L_mac( L_tmp2, *y, *y );
-#endif
         y++;
     }
-#ifdef BASOP_NOGLOB
     *Overflow_out = Overflow;
     move32();
     return round_fx_o( L_tmp2, Overflow_out ); /* Q19 to Q3 */
-#else
-    return round_fx( L_tmp2 ); /* Q19 to Q3 */
-#endif
 }
-#ifdef BASOP_NOGLOB
 Word16 Enr_1_Az_fx(                    /* o  : impulse response energy      Q3  */
                     const Word16 Aq[], /* i  : LP filter coefs              Qx based on the fact that Aq[0] == 1.0 */
                     const Word16 len   /* i  : impulse response length      Q0  */
@@ -156,4 +123,3 @@ Word16 Enr_1_Az_fx(                    /* o  : impulse response energy      Q3
     move32();
     return Enr_1_Az_fx_o( Aq, len, &Overflow );
 }
-#endif
diff --git a/lib_com/env_adj.c b/lib_com/env_adj.c
index d0e3877ded0f17a6edf0d832cd140b69df105e8e..5a83dbe5fa8af935aa151a8fdb7d87738100c789 100644
--- a/lib_com/env_adj.c
+++ b/lib_com/env_adj.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,9 +38,8 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 /*--------------------------------------------------------------------------*
  * env_adj()
@@ -145,12 +144,8 @@ void env_adj_fx(
                 IF( EQ_16( att_state, 1 ) ) /* End of attenuation region found */
                 {
                     /* tmp = min(1, max(0, len-ENV_ADJ_START)*(1.0f/ENV_ADJ_INCL)); */
-#ifdef BASOP_NOGLOB
                     tmp = round_fx_sat( L_shl_sat( L_mult0( s_max( 0, sub( len, ENV_ADJ_START_FX ) ), ENV_ADJ_INV_INCL_FX ), 16 ) ); /* Q15 (15+16-16) */
-#else
-                    tmp = round_fx( L_shl( L_mult0( s_max( 0, sub( len, ENV_ADJ_START_FX ) ), ENV_ADJ_INV_INCL_FX ), 16 ) ); /* Q15 (15+16-16) */
-#endif
-                    tmp_diff = sub( MAX_16, tmp ); /* Q15 */
+                    tmp_diff = sub( MAX_16, tmp );                                                                                   /* Q15 */
                     FOR( j = start; j < i; j++ )
                     {
                         /* adj[j] = max(tmp + (1-tmp)*adj[j],env_stab); */
@@ -192,12 +187,8 @@ void env_adj_fx(
     IF( EQ_16( att_state, 1 ) )
     {
         /* tmp = min(1, max(0, len-ENV_ADJ_START)*(1.0f/ENV_ADJ_INCL)); */
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( L_mult0( s_max( 0, sub( len, ENV_ADJ_START_FX ) ), ENV_ADJ_INV_INCL_FX ), 16 ) ); /* Q15 (15+16-16) */
-#else
-        tmp = round_fx( L_shl( L_mult0( s_max( 0, sub( len, ENV_ADJ_START_FX ) ), ENV_ADJ_INV_INCL_FX ), 16 ) );             /* Q15 (15+16-16) */
-#endif
-        tmp_diff = sub( MAX_16, tmp ); /* Q15 */
+        tmp_diff = sub( MAX_16, tmp );                                                                                   /* Q15 */
         move16();
         FOR( j = start; j < i; j++ )
         {
diff --git a/lib_com/env_stab.c b/lib_com/env_stab.c
index 0a04508b6c22a7d255e3a1c8bfdf6309efe4db5a..a3140b4e498beb79ffa011af6baa60bbeb0a2bad 100644
--- a/lib_com/env_stab.c
+++ b/lib_com/env_stab.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,11 +39,10 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
 #include "stl.h"
-#include "prot_fx.h"
 /*--------------------------------------------------------------------------*
  * Local constants
  *--------------------------------------------------------------------------*/
@@ -88,11 +87,7 @@ Word16 env_stability_fx(                                  /* in Q15 */
         }
         Overflow = 0;
         move16();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         env_delta = shl_o( *mem_env_delta, 1, &Overflow );
-#else
-        env_delta = shl( *mem_env_delta, 1 );
-#endif
     }
     ELSE
     {
@@ -125,29 +120,15 @@ Word16 env_stability_fx(                                  /* in Q15 */
         }
         exp = shr( exp, 1 );
 
-#ifdef BASOP_NOGLOB                                                     /* Critical Overflow */
         env_delta = round_fx_sat( L_shl_sat( L_tmp, sub( 26, exp ) ) ); /* Q10 */
-#else
-        env_delta = round_fx( L_shl( L_tmp, sub( 26, exp ) ) ); /* Q10 */
-#endif
 
         L_tmp = L_mult0( 26214, env_delta );               /* 26214 is 0.1 in Q18. Q28 */
-#ifdef BASOP_NOGLOB                                        /* Critical Overflow */
         L_tmp = L_mac_sat( L_tmp, 29491, *mem_env_delta ); /* 29491 is 0.9 in Q15. Q28 */
 
         *mem_env_delta = round_fx_sat( L_tmp ); /* Q12 */
-#else
-        L_tmp = L_mac( L_tmp, 29491, *mem_env_delta );          /* 29491 is 0.9 in Q15. Q28 */
-
-        *mem_env_delta = round_fx( L_tmp );                                                           /* Q12 */
-#endif
         Overflow = 0;
         move16();
-#ifdef BASOP_NOGLOB                                                          /* Critical Overflow */
         env_delta = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /* Q13 */
-#else
-        env_delta = round_fx( L_shl( L_tmp, 1 ) );                                                    /* Q13 */
-#endif
     }
     IF( Overflow != 0 ) /* Saturated due to the above up-shifting operation. */
     {
@@ -245,13 +226,8 @@ Word16 env_stab_smo_fx(                           /* Q0 */
     /*tmp = shl(tmp, add(exp, 1));*/       /* Q15 */
     FOR( i = 0; i < NUM_ENV_STAB_PLC_STATES; i++ )
     {
-#ifdef BASOP_NOGLOB
         env_stab_state_p[i] = round_fx_o( L_shl_o( L_mult_o( env_stab_state_p[i], tmp, &Overflow ), add( exp, 1 ), &Overflow ), &Overflow ); /* Q15 */
         move16();
-#else
-        env_stab_state_p[i] = round_fx( L_shl( L_mult( env_stab_state_p[i], tmp ), add( exp, 1 ) ) ); /* Q15 */
-        move16();
-#endif
     }
 
     /* find maximum index as return value */
diff --git a/lib_com/env_stab_trans.c b/lib_com/env_stab_trans.c
index e3f98d881d68c12d48a9e99503ce650feea844c5..829bef5f40f99a7245b65102c1f3aad4f685aa7d 100644
--- a/lib_com/env_stab_trans.c
+++ b/lib_com/env_stab_trans.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,10 +38,9 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 /*--------------------------------------------------------------------------*
  * env_stab_transient_detect()
  *
diff --git a/lib_com/est_tilt_fx.c b/lib_com/est_tilt_fx.c
index d47a47191a7adeed24e8fd12b3f4e64528cd0aa8..4ff9c6c1129555fe39b5ea34e4200f9afe451741 100644
--- a/lib_com/est_tilt_fx.c
+++ b/lib_com/est_tilt_fx.c
@@ -40,18 +40,12 @@ Word16 est_tilt_fx(                         /* o  : tilt of the code
                     const Word32 gain_code, /* i  : algebraic code gain             Q16 */
                     Word16 *voice_fac,      /* o  : voicing factor                  Q15 */
                     const Word16 Q_exc      /* i  : Scaling factor of excitation    Q0  */
-#ifdef ADD_LRTD
-                    ,
-                    const Word16 L_subfr /* i  : Sub frame length                    */
-#endif
 )
 {
     Word16 i, tmp, exp, ener1, exp1, ener2, exp2;
     Word32 L_tmp;
     Word16 tilt_code;
-#ifdef ADD_LRTD
-    PMT( "FIX POINT NEED to be adapted for 16 kHz frame length " )
-#endif
+
     ener1 = extract_h( Dot_product12( exc, exc, L_SUBFR, &exp1 ) );
     exp1 = sub( exp1, add( Q_exc, Q_exc ) );
     L_tmp = L_mult( gain_pit, gain_pit ); /* energy of pitch excitation */
@@ -70,13 +64,8 @@ Word16 est_tilt_fx(                         /* o  : tilt of the code
 
     i = sub( exp1, exp2 );
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     ener1 = shr_sat( ener1, sub( 1, s_min( i, 0 ) ) );
     ener2 = shr_sat( ener2, add( s_max( 0, i ), 1 ) );
-#else
-    ener1 = shr( ener1, sub( 1, s_min( i, 0 ) ) );
-    ener2 = shr( ener2, add( s_max( 0, i ), 1 ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     tmp = sub( ener1, ener2 );
     ener1 = add( add( ener1, ener2 ), 1 );
@@ -122,26 +111,23 @@ Word16 est_tilt_fx(                         /* o  : tilt of the code
 /* RETURN ARGUMENTS :                                                    */
 /* _ (Word16) tolt_code :  tilt of the code           Q15                */
 /*=======================================================================*/
-Word16 est_tilt_ivas_fx(                         /* o  : tilt of the code              Q15      */
-                         const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */
-                         const Word16 gain_pit,  /* i  : adaptive gain                   Q14 */
-                         const Word16 *code,     /* i  : algebraic excitation vector    Q9  */
-                         const Word32 gain_code, /* i  : algebraic code gain             Q16 */
-                         Word16 *voice_fac,      /* o  : voicing factor                  Q15 */
-                         const Word16 Q_exc      /* i  : Scaling factor of excitation    Q0  */
-#if 1                                            // def ADD_LRTD
-                         ,
-                         const Word16 L_subfr,  /* i  : Sub frame length                    */
-                         const Word16 flag_tilt /* i  : flag for special tilt        */
-#endif
+
+/* o  : tilt of the code Q15 */
+Word16 est_tilt_ivas_fx(
+    const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */
+    const Word16 gain_pit,  /* i  : adaptive gain                   Q14 */
+    const Word16 *code,     /* i  : algebraic excitation vector    Q9  */
+    const Word32 gain_code, /* i  : algebraic code gain             Q16 */
+    Word16 *voice_fac,      /* o  : voicing factor                  Q15 */
+    const Word16 Q_exc,     /* i  : Scaling factor of excitation    Q0  */
+    const Word16 L_subfr,   /* i  : Sub frame length                    */
+    const Word16 flag_tilt  /* i  : flag for special tilt        */
 )
 {
     Word16 i, tmp, exp, ener1, exp1, ener2, exp2;
     Word32 L_tmp;
     Word16 tilt_code;
-#ifdef ADD_LRTD
-    PMT( "FIX POINT NEED to be adapted for 16 kHz frame length " )
-#endif
+
     ener1 = extract_h( Dot_product12( exc, exc, L_subfr, &exp1 ) );
     exp1 = sub( exp1, add( Q_exc, Q_exc ) );
     L_tmp = L_mult( gain_pit, gain_pit ); /* energy of pitch excitation */
@@ -160,13 +146,8 @@ Word16 est_tilt_ivas_fx(                         /* o  : tilt of the code
 
     i = sub( exp1, exp2 );
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     ener1 = shr_sat( ener1, sub( 1, s_min( i, 0 ) ) );
     ener2 = shr_sat( ener2, add( s_max( 0, i ), 1 ) );
-#else
-    ener1 = shr( ener1, sub( 1, s_min( i, 0 ) ) );
-    ener2 = shr( ener2, add( s_max( 0, i ), 1 ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     tmp = sub( ener1, ener2 );
     ener1 = add( add( ener1, ener2 ), 1 );
@@ -341,21 +322,13 @@ void E_UTIL_voice_factor( Word16 *exc,       /* i  : pointer to the excitation f
     IF( i >= 0 )
     {
         ener = L_shr( ener, 1 );
-#ifdef BASOP_NOGLOB
         tmp = L_shr_sat( tmp, add( 1, i ) );
-#else
-        tmp = L_shr( tmp, add( 1, i ) );
-#endif
     }
     ELSE
     {
         tmp = L_shr( tmp, 1 );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         ener = L_shr_sat( ener, sub( 1, i ) );
-#else
-        ener = L_shr( ener, sub( 1, i ) );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
     }
 
diff --git a/lib_com/fd_cng_com_fx.c b/lib_com/fd_cng_com_fx.c
index 86e27427ece5aabcaea4b905c56f1dcf588fe6ea..872c180b56e4807da3521a9b68f021b01e256dc6 100644
--- a/lib_com/fd_cng_com_fx.c
+++ b/lib_com/fd_cng_com_fx.c
@@ -12,7 +12,6 @@
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
 
 #define FFT_SCALING_512 1073741824 // Q22
 #define FFT_SCALING_640 1342177280 // Q22
@@ -566,11 +565,6 @@ void minimum_statistics(
     Word16 *msPeriodogBuf,         /* i/o: Buffer of periodograms (energies)                         */
     Word16 *msPeriodogBufPtr,      /* i/o: Counter                                                   */
     HANDLE_FD_CNG_COM hFdCngCom    /* i/o: FD_CNG structure containing all buffers and variables */
-#ifdef IVAS_CODE_CNG
-    ,
-    const Word16 enc_dec,     /* i  : encoder/decoder indicator */
-    const Word16 element_mode /* i  : IVAS element mode type    */
-#endif
 )
 {
     Word16 i, j, k, s, s1, s2, s3;
@@ -692,11 +686,7 @@ void minimum_statistics(
             {
                 /* calculate scalar with normalized msPeriodogSum[cnt], exponent -2*s1 */
                 s1 = norm_l( msPeriodogSum[cnt] );
-#ifdef BASOP_NOGLOB
                 msPeriodogSum16 = round_fx_sat( L_shl_sat( msPeriodogSum[cnt], s1 ) );
-#else
-                msPeriodogSum16 = round_fx( L_shl( msPeriodogSum[cnt], s1 ) );
-#endif
                 scalar = L_mult( msPeriodogSum16, msPeriodogSum16 );
 
                 /* calculate difference, both elements in 16Q15 format, use absolute value
@@ -710,11 +700,7 @@ void minimum_statistics(
                     /* use absolute value to avoid -1.0 x -1.0 multiplications */
                     s2 = norm_l( scalar2 );
                 }
-#ifdef BASOP_NOGLOB
                 scalar216 = round_fx_o( L_shl_o( scalar2, s2, &Overflow ), &Overflow );
-#else
-                scalar216 = round_fx( L_shl( scalar2, s2 ) );
-#endif
                 scalar2 = L_mult( scalar216, scalar216 );
 
                 /* find common exponent */
@@ -864,11 +850,7 @@ void minimum_statistics(
                 s2 = s_min( s2, WORD32_BITS - 1 );
 
                 /* beta: scaled by s2 */
-#ifdef BASOP_NOGLOB
                 tmp16 = round_fx_o( L_shl_o( tmp, s1, &Overflow ), &Overflow );
-#else
-                tmp16 = round_fx( L_shl( tmp, s1 ) );
-#endif
                 beta = mult_r( tmp16, tmp16 );
 
                 /* scalar3: scaled by s3 */
@@ -956,11 +938,7 @@ void minimum_statistics(
                     move32();
                     /* exponent msCurrentMinSubWindow[j]: CNG_S */
                     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
                     msCurrentMinSubWindow[j] = L_shl_o( Mpy_32_32( scalar, msBminSubWin[j] ), 5, &Overflow );
-#else  /* BASOP_NOGLOB */
-                    msCurrentMinSubWindow[j] = L_shl( Mpy_32_32( scalar, msBminSubWin[j] ), 5 );
-#endif /* BASOP_NOGLOB */
                     move32();
                     BASOP_SATURATE_WARNING_ON_EVS;
                 }
@@ -1131,12 +1109,6 @@ void minimum_statistics(
             move16();
         }
     }
-#ifdef IVAS_CODE_CNG_COM
-    if ( enc_dec == DEC && element_mode == IVAS_CPE_TD )
-    {
-        v_multc( msNoiseEst, 1.4125f, msNoiseEst, NPART_SHAPING );
-    }
-#endif
     /* Collect buffers */
     Copy( msPeriodog, msPeriodogBuf + len * ( *msPeriodogBufPtr ), len );
 
@@ -1327,11 +1299,7 @@ void minimum_statistics_fx(
                     /* use absolute value to avoid -1.0 x -1.0 multiplications */
                     s2 = norm_l( scalar2 );
                 }
-#ifdef BASOP_NOGLOB
                 scalar216 = round_fx_o( L_shl_o( scalar2, s2, &Overflow ), &Overflow );
-#else
-                scalar216 = round_fx( L_shl( scalar2, s2 ) );
-#endif
                 scalar2 = L_mult( scalar216, scalar216 );
 
                 /* find common exponent */
@@ -1479,11 +1447,7 @@ void minimum_statistics_fx(
                 s2 = s_min( s2, WORD32_BITS - 1 );
 
                 /* beta: scaled by s2 */
-#ifdef BASOP_NOGLOB
                 tmp16 = round_fx_o( L_shl_o( tmp, s1, &Overflow ), &Overflow );
-#else
-                tmp16 = round_fx( L_shl( tmp, s1 ) );
-#endif
                 beta = mult_r( tmp16, tmp16 );
 
                 /* scalar3: scaled by s3 */
@@ -1571,11 +1535,7 @@ void minimum_statistics_fx(
                     move32();
                     /* exponent msCurrentMinSubWindow[j]: CNG_S */
                     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
                     msCurrentMinSubWindow[j] = L_shl_o( Mpy_32_32( scalar, msBminSubWin[j] ), 5, &Overflow );
-#else  /* BASOP_NOGLOB */
-                    msCurrentMinSubWindow[j] = L_shl( Mpy_32_32( scalar, msBminSubWin[j] ), 5 );
-#endif /* BASOP_NOGLOB */
                     move32();
                     BASOP_SATURATE_WARNING_ON_EVS;
                 }
@@ -2044,11 +2004,7 @@ void scalebands(
                     s = norm_l( tmp );
                     s1 = sub( delta_s, s );
 
-#ifdef BASOP_NOGLOB
                     delta = round_fx_sat( L_shl_sat( tmp, s ) ); // Q(14+s)
-#else
-                    delta = round_fx( L_shl( tmp, s ) );
-#endif
                     /* Choose scale such that the interpolation start and end point both are representable and add 1 additional bit hr. */
                     delta_s = sub( s_min( norm_l( partpow[j - 1] ), norm_l( partpow[j] ) ), 1 );
                     val = L_shl( partpow[j - 1], delta_s );
@@ -2192,11 +2148,7 @@ void scalebands_fx(
                     s = norm_l( tmp );
                     s1 = sub( delta_s, s );
 
-#ifdef BASOP_NOGLOB
                     delta = round_fx_sat( L_shl_sat( tmp, s ) ); // Q(14+s)
-#else
-                    delta = round_fx( L_shl( tmp, s ) );
-#endif
                     /* Choose scale such that the interpolation start and end point both are representable and add 1 additional bit hr. */
                     delta_s = sub( s_min( norm_l( partpow[j - 1] ), norm_l( partpow[j] ) ), 1 );
                     val = L_shl( partpow[j - 1], delta_s );
@@ -2306,11 +2258,7 @@ static void getmidbands(
     move16();
     FOR( j = 0; j < npart; j++ )
     {
-#ifdef BASOP_NOGLOB
         psize_norm[j] = shl_o( psize[j], shift, &Overflow ); // Q(15 - psize_norm_exp)
-#else                                                        /* BASOP_NOGLOB */
-        psize_norm[j] = shl( psize[j], shift );
-#endif
         move16();
     }
     /* minimum_statistics needs fixed exponent of 6 */
@@ -2364,13 +2312,8 @@ void AnalysisSTFT(
     {
         move32();
         move32();
-#ifdef BASOP_NOGLOB
         fftBuffer[i + len] = L_mult( shr_sat( timeDomainInput[i], Q ), mult_r( olapWin[i].v.re, 23170 /*1.4142135623730950488016887242097 Q14*/ ) );
         fftBuffer[i + len + len2] = L_mult( shr_sat( timeDomainInput[i + len2], Q ), mult_r( olapWin[len2 - 1 - i].v.im, 23170 /*1.4142135623730950488016887242097 Q14*/ ) );
-#else
-        fftBuffer[i + len] = L_mult( shr( timeDomainInput[i], Q ), mult_r( olapWin[i].v.re, 23170 /*1.4142135623730950488016887242097 Q14*/ ) );
-        fftBuffer[i + len + len2] = L_mult( shr( timeDomainInput[i + len2], Q ), mult_r( olapWin[len2 - 1 - i].v.im, 23170 /*1.4142135623730950488016887242097 Q14*/ ) );
-#endif
     }
 
     /* Perform FFT */
@@ -2378,11 +2321,7 @@ void AnalysisSTFT(
 
     FOR( i = 0; i < len; i++ )
     {
-#ifdef BASOP_NOGLOB
         olapBuffer[i] = shr_sat( timeDomainInput[sub( hFdCngCom->frameSize, len ) + i], Q );
-#else
-        olapBuffer[i] = shr( timeDomainInput[sub( hFdCngCom->frameSize, len ) + i], Q );
-#endif
         move16();
     }
 }
@@ -2679,18 +2618,6 @@ void SynthesisSTFT(
         move16();
     }
     /* Generate excitation */
-#ifdef IVAS_CODE_CNG_COM
-    PME()
-    if ( ( element_mode == IVAS_CPE_TD || element_mode == IVAS_CPE_DFT ) && nchan_out == 2 )
-    {
-        for ( i = 0; i < hFdCngCom->frameSize / 2; i++ )
-        {
-            buf[i + ( M + 1 )] += olapBuffer[i + hFdCngCom->frameSize / 4];
-        }
-        v_multc( buf, (float) ( hFdCngCom->fftlen / 2 ), buf, M + 1 + hFdCngCom->frameSize );
-    }
-    else
-#endif
     {
         FOR( i = 0; i < M + 1 + hFdCngCom->frameSize; i++ )
         {
@@ -2804,18 +2731,6 @@ void SynthesisSTFT_ivas_fx(
         move16();
     }
     /* Generate excitation */
-#ifdef IVAS_CODE_CNG_COM
-    PME()
-    if ( ( element_mode == IVAS_CPE_TD || element_mode == IVAS_CPE_DFT ) && nchan_out == 2 )
-    {
-        for ( i = 0; i < hFdCngCom->frameSize / 2; i++ )
-        {
-            buf[i + ( M + 1 )] += olapBuffer[i + hFdCngCom->frameSize / 4];
-        }
-        v_multc( buf, (float) ( hFdCngCom->fftlen / 2 ), buf, M + 1 + hFdCngCom->frameSize );
-    }
-    else
-#endif
     {
         FOR( i = 0; i < M + 1 + hFdCngCom->frameSize; i++ )
         {
@@ -2843,74 +2758,6 @@ void SynthesisSTFT_ivas_fx(
     }
 }
 
-#ifdef IVAS_CODE_CNG_COM
-/*-------------------------------------------------------------------
- * SynthesisSTFT_dirac()
- *
- * STFT synthesis filterbank
- *-------------------------------------------------------------------*/
-
-void SynthesisSTFT_dirac(
-    float *fftBuffer, /* i  : FFT bins */
-    float *timeDomainOutput,
-    float *olapBuffer,
-    const float *olapWin,
-    const int16_t samples_out,
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
-)
-{
-    int16_t i;
-    float buf[M + 1 + 320], tmp;
-
-    /* Perform IFFT */
-    RFFTN( fftBuffer, hFdCngCom->fftSineTab, hFdCngCom->fftlen, 1 );
-
-    /* Handle overlap in P/S domain for stereo */
-    mvr2r( olapBuffer + hFdCngCom->frameSize, olapBuffer, hFdCngCom->frameSize );
-    set_f( olapBuffer + hFdCngCom->frameSize, 0.0f, hFdCngCom->frameSize ); /*olapBuffer, fftBuffer, olapWin*/
-
-    for ( i = hFdCngCom->frameSize / 4; i < 3 * hFdCngCom->frameSize / 4; i++ )
-    {
-        olapBuffer[i] += fftBuffer[i] * olapWin[i - hFdCngCom->frameSize / 4];
-    }
-    for ( ; i < 5 * hFdCngCom->frameSize / 4; i++ )
-    {
-        olapBuffer[i] = fftBuffer[i];
-    }
-
-    for ( ; i < 7 * hFdCngCom->frameSize / 4; i++ )
-    {
-        olapBuffer[i] = fftBuffer[i];
-    }
-
-    for ( ; i < hFdCngCom->fftlen; i++ )
-    {
-        olapBuffer[i] = 0;
-    }
-
-    /* Get time-domain signal */
-    v_multc( olapBuffer + hFdCngCom->frameSize / 4, (float) ( hFdCngCom->fftlen / 2 ), timeDomainOutput, samples_out );
-
-    /* Get excitation */
-    v_multc( olapBuffer + hFdCngCom->frameSize / 4 - ( M + 1 ), (float) ( hFdCngCom->fftlen / 2 ), buf, M + 1 + hFdCngCom->frameSize );
-    tmp = buf[0];
-    preemph( buf + 1, PREEMPH_FAC, M + hFdCngCom->frameSize, &tmp );
-    residu( hFdCngCom->A_cng, M, buf + 1 + M, hFdCngCom->exc_cng, hFdCngCom->frameSize );
-
-    /* update and window olapBuf if we have a output frame that is shorter than the default frame size...*/
-    if ( samples_out < hFdCngCom->frameSize )
-    {
-        mvr2r( olapBuffer + samples_out, olapBuffer + hFdCngCom->frameSize, 3 * hFdCngCom->frameSize / 4 );
-    }
-    for ( i = 5 * hFdCngCom->frameSize / 4; i < 7 * hFdCngCom->frameSize / 4; i++ )
-    {
-        olapBuffer[i] *= olapWin[i - 3 * hFdCngCom->frameSize / 4];
-    }
-
-    return;
-}
-#endif
-
 /**************************************************************************************
  * Compute some values used in the bias correction of the minimum statistics algorithm *
  **************************************************************************************/
@@ -3064,11 +2911,7 @@ void lpc_from_spectrum(
         maxVal = L_max( maxVal, L_abs( powspec[i] ) );
     }
     s1 = norm_l( maxVal );
-#ifdef BASOP_NOGLOB
     nf = L_shr_r_sat( 1099511680l /*1e-3f Q40*/, add( sub( powspec_exp, s1 ), 9 ) );
-#else
-    nf = L_shr_r( 1099511680l /*1e-3f Q40*/, add( sub( powspec_exp, s1 ), 9 ) );
-#endif
     ptr = fftBuffer;
     pti = fftBuffer + 1;
 
diff --git a/lib_com/fft.c b/lib_com/fft.c
index be42d29cbf7914d72d4dc9def11afe41019a9359..e262f3909f179ea67b91c160866b1f62cd2b411a 100644
--- a/lib_com/fft.c
+++ b/lib_com/fft.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,7 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
 
diff --git a/lib_com/fft_cldfb_fx.c b/lib_com/fft_cldfb_fx.c
index 80e643362413412f0b5560b715917cd7a6eccb00..b26b1bc9f43782686e744fef2c90db2d70157cc9 100644
--- a/lib_com/fft_cldfb_fx.c
+++ b/lib_com/fft_cldfb_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/fft_evs.c b/lib_com/fft_evs.c
index e53404f0b7f4a8d0cdc9ed405d74f91f119a51c2..94c2dea8ff0a7df4fc62fb898eb379e5d2d31a79 100644
--- a/lib_com/fft_evs.c
+++ b/lib_com/fft_evs.c
@@ -505,7 +505,7 @@ static void fft15_with_cmplx_data( cmplx *inp_data /*Qx*/ )
  */
 void fft16( Word32 *re, Word32 *im, Word16 s, Word16 bScale )
 {
-    int i;
+    Word16 i;
     if ( s == 2 )
     {
         fft16_with_cmplx_data( (cmplx *) re, bScale );
diff --git a/lib_com/fft_fx.c b/lib_com/fft_fx.c
index ba895d83c85f9b0f71100e94f7616a59e0d6fa94..5ee5098797c3b57caf6c91e826bcc76dd1fdf850 100644
--- a/lib_com/fft_fx.c
+++ b/lib_com/fft_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -44,7 +44,7 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-// #include "prot.h"
+// #include "prot_fx.h"
 #include "prot_fx.h"
 //#include "cnst_fx.h"
 #include "rom_com.h"
@@ -4727,6 +4727,16 @@ static void fft_len16(
     cmplx t[4];
     cmplx y[16];
 
+#ifdef OPT_STEREO_32KBPS_V1
+    s[0] = x[0]; // Qx
+    move64();
+    s[1] = x[4]; // Qx
+    move64();
+    s[2] = x[8]; // Qx
+    move64();
+    s[3] = x[12]; // Qx
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     s[0] = CL_shr( x[0], SCALEFACTOR16 ); // Qx
     move64();
     s[1] = CL_shr( x[4], SCALEFACTOR16 ); // Qx
@@ -4735,6 +4745,7 @@ static void fft_len16(
     move64();
     s[3] = CL_shr( x[12], SCALEFACTOR16 ); // Qx
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     t[0] = CL_add( s[0], s[2] );
     move64();
@@ -4754,6 +4765,16 @@ static void fft_len16(
     y[3] = CL_add( t[1], t[3] );
     move64();
 
+#ifdef OPT_STEREO_32KBPS_V1
+    s[0] = x[1]; // Qx
+    move64();
+    s[1] = x[5]; // Qx
+    move64();
+    s[2] = x[9]; // Qx
+    move64();
+    s[3] = x[13]; // Qx
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     s[0] = CL_shr( x[1], SCALEFACTOR16 ); // Qx
     move64();
     s[1] = CL_shr( x[5], SCALEFACTOR16 ); // Qx
@@ -4762,6 +4783,7 @@ static void fft_len16(
     move64();
     s[3] = CL_shr( x[13], SCALEFACTOR16 ); // Qx
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     t[0] = CL_add( s[0], s[2] );
     move64();
@@ -4781,6 +4803,16 @@ static void fft_len16(
     y[7] = CL_add( t[1], t[3] );
     move64();
 
+#ifdef OPT_STEREO_32KBPS_V1
+    s[0] = x[2]; // Qx
+    move64();
+    s[1] = x[6]; // Qx
+    move64();
+    s[2] = x[10]; // Qx
+    move64();
+    s[3] = x[14]; // Qx
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     s[0] = CL_shr( x[2], SCALEFACTOR16 ); // Qx
     move64();
     s[1] = CL_shr( x[6], SCALEFACTOR16 ); // Qx
@@ -4789,6 +4821,7 @@ static void fft_len16(
     move64();
     s[3] = CL_shr( x[14], SCALEFACTOR16 ); // Qx
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     t[0] = CL_add( s[0], s[2] );
     move64();
@@ -4810,6 +4843,16 @@ static void fft_len16(
     y[11] = CL_add( t[1], t[3] );
     move64();
 
+#ifdef OPT_STEREO_32KBPS_V1
+    s[0] = x[3]; // Qx
+    move64();
+    s[1] = x[7]; // Qx
+    move64();
+    s[2] = x[11]; // Qx
+    move64();
+    s[3] = x[15]; // Qx
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     s[0] = CL_shr( x[3], SCALEFACTOR16 ); // Qx
     move64();
     s[1] = CL_shr( x[7], SCALEFACTOR16 ); // Qx
@@ -4818,6 +4861,7 @@ static void fft_len16(
     move64();
     s[3] = CL_shr( x[15], SCALEFACTOR16 ); // Qx
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     t[0] = CL_add( s[0], s[2] );
     move64();
@@ -4978,6 +5022,18 @@ static void fft_len20_fx(
     cmplx tt[4];
     cmplx y[20];
 
+#ifdef OPT_STEREO_32KBPS_V1
+    xx[0] = x[0]; // Qx
+    move64();
+    xx[1] = x[16]; // Qx
+    move64();
+    xx[2] = x[12]; // Qx
+    move64();
+    xx[3] = x[8]; // Qx
+    move64();
+    xx[4] = x[4]; // Qx
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     xx[0] = CL_shr( x[0], SCALEFACTOR20 ); // Qx
     move64();
     xx[1] = CL_shr( x[16], SCALEFACTOR20 ); // Qx
@@ -4988,6 +5044,7 @@ static void fft_len20_fx(
     move64();
     xx[4] = CL_shr( x[4], SCALEFACTOR20 ); // Qx
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     s[0] = CL_add( xx[1], xx[4] );
     move64();
@@ -5023,6 +5080,18 @@ static void fft_len20_fx(
     y[12] = CL_msu_j( s[2], s[3] );
     move64();
 
+#ifdef OPT_STEREO_32KBPS_V1
+    xx[0] = x[5];
+    move64();
+    xx[1] = x[1];
+    move64();
+    xx[2] = x[17];
+    move64();
+    xx[3] = x[13];
+    move64();
+    xx[4] = x[9];
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     xx[0] = CL_shr( x[5], SCALEFACTOR20 );
     move64();
     xx[1] = CL_shr( x[1], SCALEFACTOR20 );
@@ -5033,6 +5102,7 @@ static void fft_len20_fx(
     move64();
     xx[4] = CL_shr( x[9], SCALEFACTOR20 );
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     s[0] = CL_add( xx[1], xx[4] );
     move64();
@@ -5068,6 +5138,18 @@ static void fft_len20_fx(
     y[13] = CL_msu_j( s[2], s[3] );
     move64();
 
+#ifdef OPT_STEREO_32KBPS_V1
+    xx[0] = x[10];
+    move64();
+    xx[1] = x[6];
+    move64();
+    xx[2] = x[2];
+    move64();
+    xx[3] = x[18];
+    move64();
+    xx[4] = x[14];
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     xx[0] = CL_shr( x[10], SCALEFACTOR20 );
     move64();
     xx[1] = CL_shr( x[6], SCALEFACTOR20 );
@@ -5078,6 +5160,7 @@ static void fft_len20_fx(
     move64();
     xx[4] = CL_shr( x[14], SCALEFACTOR20 );
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     s[0] = CL_add( xx[1], xx[4] );
     move64();
@@ -5113,6 +5196,18 @@ static void fft_len20_fx(
     y[14] = CL_msu_j( s[2], s[3] );
     move64();
 
+#ifdef OPT_STEREO_32KBPS_V1
+    xx[0] = x[15];
+    move64();
+    xx[1] = x[11];
+    move64();
+    xx[2] = x[7];
+    move64();
+    xx[3] = x[3];
+    move64();
+    xx[4] = x[19];
+    move64();
+#else  /* OPT_STEREO_32KBPS_V1 */
     xx[0] = CL_shr( x[15], SCALEFACTOR20 );
     move64();
     xx[1] = CL_shr( x[11], SCALEFACTOR20 );
@@ -5123,6 +5218,7 @@ static void fft_len20_fx(
     move64();
     xx[4] = CL_shr( x[19], SCALEFACTOR20 );
     move64();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     s[0] = CL_add( xx[1], xx[4] );
     move64();
@@ -6501,6 +6597,239 @@ static void fft_lenN(
             cmplx s[8];
             cmplx y[8];
 
+#ifdef OPT_STEREO_32KBPS_V1
+            y[1] = xx[1 * dim1];
+            move64();
+            y[2] = xx[2 * dim1];
+            move64();
+            y[3] = xx[3 * dim1];
+            move64();
+            y[4] = xx[4 * dim1];
+            move64();
+            y[5] = xx[5 * dim1];
+            move64();
+            y[6] = xx[6 * dim1];
+            move64();
+            y[7] = xx[7 * dim1];
+            move64();
+
+            test();
+            test();
+            IF( EQ_16( dim1, 8 ) || EQ_16( dim1, 16 ) || EQ_16( dim1, 32 ) )
+            {
+                FOR( i = 0; i < dim1; i++ )
+                {
+                    {
+                        y[0] = xx[i];
+                        move64();
+                    };
+                    IF( i > 0 )
+                    {
+                        {
+                            y[1] = CL_mac_j( CL_scale( xx[( i + ( 1 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 1 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 1 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 1 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[2] = CL_mac_j( CL_scale( xx[( i + ( 2 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 2 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 2 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 2 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[3] = CL_mac_j( CL_scale( xx[( i + ( 3 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 3 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 3 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 3 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[4] = CL_mac_j( CL_scale( xx[( i + ( 4 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 4 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 4 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 4 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[5] = CL_mac_j( CL_scale( xx[( i + ( 5 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 5 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 5 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 5 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[6] = CL_mac_j( CL_scale( xx[( i + ( 6 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 6 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 6 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 6 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[7] = CL_mac_j( CL_scale( xx[( i + ( 7 * dim1 ) )], W[( ( ( sc * i ) + ( ( sc * 7 ) * dim1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 7 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( sc * 7 ) * dim1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                    }
+
+                    t[0] = CL_add( y[0], y[4] );
+                    move64();
+                    t[1] = CL_sub( y[0], y[4] );
+                    move64();
+                    t[2] = CL_add( y[1], y[5] );
+                    move64();
+                    t[3] = CL_sub( y[1], y[5] );
+                    move64();
+                    t[4] = CL_add( y[2], y[6] );
+                    move64();
+                    t[5] = CL_sub( y[2], y[6] );
+                    move64();
+                    t[6] = CL_add( y[3], y[7] );
+                    move64();
+                    t[7] = CL_sub( y[3], y[7] );
+                    move64();
+
+                    s[0] = CL_add( t[0], t[4] );
+                    move64();
+                    s[2] = CL_sub( t[0], t[4] );
+                    move64();
+                    s[4] = CL_mac_j( t[1], t[5] );
+                    move64();
+                    s[5] = CL_msu_j( t[1], t[5] );
+                    move64();
+                    s[1] = CL_add( t[2], t[6] );
+                    move64();
+                    s[3] = CL_swap_real_imag( CL_sub( CL_conjugate( t[2] ), CL_conjugate( t[6] ) ) );
+                    move64();
+
+                    t[0] = CL_swap_real_imag( CL_add( t[3], t[7] ) );
+                    move64();
+                    t[1] = CL_sub( t[3], t[7] );
+                    move64();
+
+                    s[6] = CL_scale( CL_add( CL_conjugate( t[0] ), t[1] ), FFT_C81 ); // Qx
+                    move64();
+                    s[7] = CL_scale( CL_sub( t[0], CL_conjugate( t[1] ) ), FFT_C81 ); // Qx
+                    move64();
+                    s[7] = CL_conjugate( s[7] );
+                    move64();
+
+                    x[i] = CL_add( s[0], s[1] );
+                    move64();
+                    x[( i + ( 1 * dim1 ) )] = CL_add( s[5], s[6] );
+                    move64();
+                    x[( i + ( 2 * dim1 ) )] = CL_sub( s[2], s[3] );
+                    move64();
+                    x[( i + ( 3 * dim1 ) )] = CL_add( s[4], s[7] );
+                    move64();
+                    x[( i + ( 4 * dim1 ) )] = CL_sub( s[0], s[1] );
+                    move64();
+                    x[( i + ( 5 * dim1 ) )] = CL_sub( s[5], s[6] );
+                    move64();
+                    x[( i + ( 6 * dim1 ) )] = CL_add( s[2], s[3] );
+                    move64();
+                    x[( i + ( 7 * dim1 ) )] = CL_sub( s[4], s[7] );
+                    move64();
+                }
+            }
+            ELSE
+            {
+                FOR( i = 0; i < dim1; i++ )
+                {
+                    {
+                        y[0] = xx[i];
+                        move64();
+                    };
+                    IF( i > 0 )
+                    {
+                        {
+                            y[1] = CL_mac_j( CL_scale( xx[( i + ( 1 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 1 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 1 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 1 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[2] = CL_mac_j( CL_scale( xx[( i + ( 2 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 2 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 2 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 2 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[3] = CL_mac_j( CL_scale( xx[( i + ( 3 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 3 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 3 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 3 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[4] = CL_mac_j( CL_scale( xx[( i + ( 4 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 4 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 4 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 4 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[5] = CL_mac_j( CL_scale( xx[( i + ( 5 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 5 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 5 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 5 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[6] = CL_mac_j( CL_scale( xx[( i + ( 6 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 6 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 6 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 6 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                        {
+                            y[7] = CL_mac_j( CL_scale( xx[( i + ( 7 * dim1 ) )], W[( ( ( sc * i ) + ( ( ( sc * 7 ) * dim1 ) << 1 ) ) - Woff )] ),
+                                             CL_scale( xx[( i + ( 7 * dim1 ) )], W[( ( ( ( sc * i ) + ( ( ( sc * 7 ) * dim1 ) << 1 ) ) + 1 ) - Woff )] ) ); // Qx
+                            move64();
+                        };
+                    }
+
+                    t[0] = CL_add( y[0], y[4] );
+                    move64();
+                    t[1] = CL_sub( y[0], y[4] );
+                    move64();
+                    t[2] = CL_add( y[1], y[5] );
+                    move64();
+                    t[3] = CL_sub( y[1], y[5] );
+                    move64();
+                    t[4] = CL_add( y[2], y[6] );
+                    move64();
+                    t[5] = CL_sub( y[2], y[6] );
+                    move64();
+                    t[6] = CL_add( y[3], y[7] );
+                    move64();
+                    t[7] = CL_sub( y[3], y[7] );
+                    move64();
+
+                    s[0] = CL_add( t[0], t[4] );
+                    move64();
+                    s[2] = CL_sub( t[0], t[4] );
+                    move64();
+                    s[4] = CL_mac_j( t[1], t[5] );
+                    move64();
+                    s[5] = CL_msu_j( t[1], t[5] );
+                    move64();
+                    s[1] = CL_add( t[2], t[6] );
+                    move64();
+                    s[3] = CL_swap_real_imag( CL_sub( CL_conjugate( t[2] ), CL_conjugate( t[6] ) ) );
+                    move64();
+
+                    t[0] = CL_swap_real_imag( CL_add( t[3], t[7] ) );
+                    move64();
+                    t[1] = CL_sub( t[3], t[7] );
+                    move64();
+
+                    s[6] = CL_scale( CL_add( CL_conjugate( t[0] ), t[1] ), FFT_C81 ); // Qx
+                    move64();
+                    s[7] = CL_scale( CL_sub( t[0], CL_conjugate( t[1] ) ), FFT_C81 ); // Qx
+                    move64();
+                    s[7] = CL_conjugate( s[7] );
+                    move64();
+
+                    x[i] = CL_add( s[0], s[1] );
+                    move64();
+                    x[( i + ( 1 * dim1 ) )] = CL_add( s[5], s[6] );
+                    move64();
+                    x[( i + ( 2 * dim1 ) )] = CL_sub( s[2], s[3] );
+                    move64();
+                    x[( i + ( 3 * dim1 ) )] = CL_add( s[4], s[7] );
+                    move64();
+                    x[( i + ( 4 * dim1 ) )] = CL_sub( s[0], s[1] );
+                    move64();
+                    x[( i + ( 5 * dim1 ) )] = CL_sub( s[5], s[6] );
+                    move64();
+                    x[( i + ( 6 * dim1 ) )] = CL_add( s[2], s[3] );
+                    move64();
+                    x[( i + ( 7 * dim1 ) )] = CL_sub( s[4], s[7] );
+                    move64();
+                }
+            }
+#else  /* OPT_STEREO_32KBPS_V1 */
             test();
             test();
             test();
@@ -6781,6 +7110,7 @@ static void fft_lenN(
                     move64();
                 }
             }
+#endif /* OPT_STEREO_32KBPS_V1 */
             BREAK;
         }
 
@@ -7173,7 +7503,11 @@ void rfft_fx(
                 move32();
                 x[( length - ( i << 1 ) )] = Mpy_32_16_1( L_add( t1, t3 ), 16384 /*0.5.Q15*/ );
                 move32();
+#ifdef OPT_STEREO_32KBPS_V1
+                x[( ( length - ( i << 1 ) ) + 1 )] = Mpy_32_16_1( L_add( t2, t4 ), -16384 /*0.5.Q15*/ );
+#else  /* OPT_STEREO_32KBPS_V1 */
                 x[( ( length - ( i << 1 ) ) + 1 )] = Mpy_32_16_1( L_negate( L_add( t2, t4 ) ), 16384 /*0.5.Q15*/ );
+#endif /* OPT_STEREO_32KBPS_V1 */
                 move32();
             }
 
@@ -7221,152 +7555,3 @@ void rfft_fx(
 
     return;
 }
-
-Word16 find_guarded_bits_fx( Word32 n )
-{
-    // return n <= 1 ? 0 : n <= 2 ? 1
-    //   : n <= 4 ? 2
-    //   : n <= 8 ? 3
-    //   : n <= 16 ? 4
-    //   : n <= 32 ? 5
-    //   : n <= 64 ? 6
-    //   : n <= 128 ? 7
-    //   : n <= 256 ? 8
-    //   : n <= 512 ? 9
-    //   : n <= 1024 ? 10
-    //   : n <= 2048 ? 11
-    //   : n <= 4096 ? 12
-    //   : n <= 8192 ? 13
-    //   : n <= 16384 ? 14
-    //   : 15;
-    /*Word16 val = 0;
-    move32();
-    test();
-    WHILE( GT_32( n, L_shl( 1, val ) ) && LT_32( val, 16 ) )
-    {
-        val = add( val, 1 );
-    }*/
-    IF( LE_32( n, 1 ) )
-    {
-        return 0;
-    }
-    ELSE
-    {
-
-        return sub( 31, norm_l( L_sub( n, 1 ) ) );
-    }
-}
-
-Word16 L_norm_arr( const Word32 *arr, Word16 size )
-{
-    Word16 q = 31;
-    move16();
-    FOR( Word16 i = 0; i < size; i++ )
-#ifndef FIX_1103_OPT_L_NORM_ARR
-    IF( arr[i] != 0 )
-    {
-        q = s_min( q, norm_l( arr[i] ) );
-    }
-#else
-    {
-        Word16 q_tst;
-
-        q_tst = norm_l( arr[i] );
-        if ( arr[i] != 0 )
-        {
-            q = s_min( q, q_tst );
-        }
-    }
-
-#endif
-    return q;
-}
-
-Word16 norm_arr( Word16 *arr, Word16 size )
-{
-    Word16 q = 15;
-    Word16 exp = 0;
-    move16();
-    move16();
-    FOR( Word16 i = 0; i < size; i++ )
-    {
-        if ( arr[i] != 0 )
-        {
-            exp = norm_s( arr[i] );
-        }
-        if ( arr[i] != 0 )
-        {
-            q = s_min( q, exp );
-        }
-    }
-    return q;
-}
-
-Word16 get_min_scalefactor( Word32 x, Word32 y )
-{
-#ifndef FIX_1104_OPT_GETMINSCALEFAC
-    Word16 scf = Q31;
-    move16();
-    test();
-    IF( x == 0 && y == 0 )
-    {
-        return 0;
-    }
-    IF( x != 0 )
-    {
-        scf = s_min( scf, norm_l( x ) );
-    }
-    IF( y != 0 )
-    {
-        scf = s_min( scf, norm_l( y ) );
-    }
-    return scf;
-#else
-    Word16 scf_y;
-    Word16 scf = Q31;
-    move16();
-
-    test();
-    if ( x == 0 && y == 0 )
-    {
-        scf = 0;
-        move16();
-    }
-
-    if ( x != 0 )
-    {
-        scf = norm_l( x );
-    }
-
-    scf_y = norm_l( y );
-    if ( y != 0 )
-    {
-        scf = s_min( scf_y, scf );
-    }
-
-    return scf;
-#endif
-}
-
-
-Flag is_zero_arr( Word32 *arr, Word16 size )
-{
-    FOR( Word16 i = 0; i < size; i++ )
-    IF( arr[i] != 0 )
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-Flag is_zero_arr16( Word16 *arr, Word16 size )
-{
-    FOR( Word16 i = 0; i < size; i++ )
-    IF( arr[i] != 0 )
-    {
-        return 0;
-    }
-
-    return 1;
-}
diff --git a/lib_com/fft_fx_evs.c b/lib_com/fft_fx_evs.c
index e2fce166cce3c92ef431fcb91aba2f248974075e..b6f2bb2acee04e556e60e2a0cd36c85d7c81763d 100644
--- a/lib_com/fft_fx_evs.c
+++ b/lib_com/fft_fx_evs.c
@@ -1096,34 +1096,18 @@ static void fft5_shift4_16fx(
     move16();
     T3 = zRe[i4];
     move16();
-#ifdef BASOP_NOGLOB
     T4 = add_sat( T2, T3 );
-#else
-    T4 = add( T2, T3 );
-#endif
     T5 = zRe[i2];
     move16();
     T6 = zRe[i3];
     move16();
-#ifdef BASOP_NOGLOB
     T7 = add_sat( T5, T6 );
     T8 = add_sat( T4, T7 );
     Tt = sub_sat( T5, T6 );
-#else
-    T7 = add( T5, T6 );
-    T8 = add( T4, T7 );
-    Tt = sub( T5, T6 );
-#endif
     /*    T9 = KP559016994 * (T4 - T7); */
-#ifdef BASOP_NOGLOB
     L_tmp = Mult_32_16( KP559016994_16FX, sub_sat( T4, T7 ) ); // Q(16 +x)
     T9 = round_fx_sat( L_tmp );                                // Qx
     Ts = sub_sat( T2, T3 );
-#else
-    L_tmp = Mult_32_16( KP559016994_16FX, sub( T4, T7 ) );
-    T9 = round_fx( L_tmp );
-    Ts = sub( T2, T3 );
-#endif
 
     T2 = zIm[i1];
     move16();
@@ -1134,52 +1118,27 @@ static void fft5_shift4_16fx(
     move16();
     T6 = zIm[i3];
     move16();
-#ifdef BASOP_NOGLOB
     T7 = add_sat( T5, T6 );
     Te = sub_sat( T2, T3 );
     Tp = add_sat( T4, T7 );
     Th = sub_sat( T5, T6 );
-#else
-    T7 = add( T5, T6 );
-    Te = sub( T2, T3 );
-    Tp = add( T4, T7 );
-    Th = sub( T5, T6 );
-#endif
 
-#ifdef BASOP_NOGLOB
     /*       Tn = KP559016994 * (T4 - T7); */
     L_tmp = Mult_32_16( KP559016994_16FX, sub_sat( T4, T7 ) ); // Q(16 +x)
     Tn = round_fx_sat( L_tmp );                                // Qx
     zRe[i0] = add_sat( T1, T8 );
     move16();
     zIm[i0] = add_sat( To, Tp );
-#else
-    /*       Tn = KP559016994 * (T4 - T7); */
-    L_tmp = Mult_32_16( KP559016994_16FX, sub( T4, T7 ) );
-    Tn = round_fx( L_tmp );
-    zRe[i0] = add( T1, T8 );
-    move16();
-    zIm[i0] = add( To, Tp );
-#endif
     move16();
 
     /*        T2 = KP951056516*Te + KP587785252*Th; */
     L_tmp = Mult_32_16( KP951056516_16FX, Te );        // Q(16 +x)
     L_tmp = Madd_32_16( L_tmp, KP587785252_16FX, Th ); // Q(16 +x)
-#ifdef BASOP_NOGLOB
-    T2 = round_fx_sat( L_tmp ); // Qx
-#else
-    T2 = round_fx( L_tmp );
-#endif
+    T2 = round_fx_sat( L_tmp );                        // Qx
     /*T3 = KP951056516*Th - KP587785252*Te; */
     L_tmp = Mult_32_16( KP951056516_16FX, Th );        // Q(16 +x)
     L_tmp = Msub_32_16( L_tmp, KP587785252_16FX, Te ); // Q(16 +x)
-#ifdef BASOP_NOGLOB
-    T3 = round_fx_sat( L_tmp ); // Qx
-#else
-    T3 = round_fx( L_tmp );
-#endif
-#ifdef BASOP_NOGLOB
+    T3 = round_fx_sat( L_tmp );                        // Qx
     T6 = sub_sat( T1, shr_sat( T8, 2 ) );
     T4 = add_sat( T9, T6 );
     T5 = sub_sat( T6, T9 );
@@ -1191,38 +1150,16 @@ static void fft5_shift4_16fx(
     move16();
     zRe[i3] = sub_sat( T5, T3 );
     move16();
-#else
-    T6 = sub( T1, shr( T8, 2 ) );
-    T4 = add( T9, T6 );
-    T5 = sub( T6, T9 );
-    zRe[i1] = sub( T4, T2 );
-    move16();
-    zRe[i2] = add( T5, T3 );
-    move16();
-    zRe[i4] = add( T4, T2 );
-    move16();
-    zRe[i3] = sub( T5, T3 );
-    move16();
-#endif
 
     /*    T2 = KP951056516 * Ts + KP587785252 * Tt; */
     L_tmp = Mult_32_16( KP951056516_16FX, Ts );        // Q(16 +x)
     L_tmp = Madd_32_16( L_tmp, KP587785252_16FX, Tt ); // Q(16 +x)
-#ifdef BASOP_NOGLOB
-    T2 = round_fx_sat( L_tmp ); // Qx
-#else
-    T2 = round_fx( L_tmp );
-#endif
+    T2 = round_fx_sat( L_tmp );                        // Qx
     /*                T3 = KP951056516 * Tt - KP587785252 * Ts; */
     L_tmp = Mult_32_16( KP951056516_16FX, Tt );        // Q(16 +x)
     L_tmp = Msub_32_16( L_tmp, KP587785252_16FX, Ts ); // Q(16 +x)
-#ifdef BASOP_NOGLOB
-    T3 = round_fx_sat( L_tmp ); // Qx
-#else
-    T3 = round_fx( L_tmp );
-#endif
-#ifdef BASOP_NOGLOB
-    T6 = sub_sat( To, shr( Tp, 2 ) ); // To - (Tp / 4)
+    T3 = round_fx_sat( L_tmp );                        // Qx
+    T6 = sub_sat( To, shr( Tp, 2 ) );                  // To - (Tp / 4)
     T4 = add_sat( Tn, T6 );
     T5 = sub_sat( T6, Tn );
     zIm[i4] = sub_sat( T4, T2 );
@@ -1233,19 +1170,6 @@ static void fft5_shift4_16fx(
     move16();
     zIm[i3] = add_sat( T3, T5 );
     move16();
-#else
-    T6 = sub( To, shr( Tp, 2 ) );
-    T4 = add( Tn, T6 );
-    T5 = sub( T6, Tn );
-    zIm[i4] = sub( T4, T2 );
-    move16();
-    zIm[i2] = sub( T5, T3 );
-    move16();
-    zIm[i1] = add( T2, T4 );
-    move16();
-    zIm[i3] = add( T3, T5 );
-    move16();
-#endif
     return;
 }
 
@@ -1287,7 +1211,6 @@ static void fft5_32_16fx(
     T3 = zRe[i4]; // Qx
     move16();
 
-#ifdef BASOP_NOGLOB
     T4 = add_sat( T2, T3 );
     T5 = zRe[i2];
     move16();
@@ -1296,17 +1219,6 @@ static void fft5_32_16fx(
     T7 = add_o( T5, T6, &Overflow );
     T8 = add_o( T4, T7, &Overflow );
     Tt = sub_o( T5, T6, &Overflow );
-#else
-    T4 = add( T2, T3 );
-    T5 = zRe[i2];
-    move16();
-    T6 = zRe[i3];
-    move16();
-    T7 = add( T5, T6 );
-    T8 = add( T4, T7 );
-    Tt = sub( T5, T6 );
-#endif
-#ifdef BASOP_NOGLOB
     /* T9 = KP559016994 * (T4 - T7); */
     L_tmp = Mult_32_16( KP559016994_16FX, sub_sat( T4, T7 ) ); // Q(16 +x)
     T9 = round_fx_sat( L_tmp );                                // Qx
@@ -1327,43 +1239,13 @@ static void fft5_32_16fx(
     Th = sub_sat( T5, T6 );
     L_tmp = Mult_32_16( KP559016994_16FX, sub_sat( T4, T7 ) ); // Q(16 +x)
     Tn = round_fx_sat( L_tmp );                                // Qx
-#else
-    /* T9 = KP559016994 * (T4 - T7); */
-    L_tmp = Mult_32_16( KP559016994_16FX, sub( T4, T7 ) );
-    T9 = round_fx( L_tmp );
-    Ts = sub( T2, T3 );
-
-    T2 = zIm[i1];
-    move16();
-    T3 = zIm[i4];
-    move16();
-    T4 = add( T2, T3 );
-    T5 = zIm[i2];
-    move16();
-    T6 = zIm[i3];
-    move16();
-    T7 = add( T5, T6 );
-    Te = sub( T2, T3 );
-    Tp = add( T4, T7 );
-    Th = sub( T5, T6 );
-    L_tmp = Mult_32_16( KP559016994_16FX, sub( T4, T7 ) );
-    Tn = round_fx( L_tmp );
-#endif
 
 
-#ifdef BASOP_NOGLOB
     zRe[i0] = add_o( T1, T8, &Overflow );
     move16();
     zIm[i0] = add_o( To, Tp, &Overflow );
     move32();
-#else
-    zRe[i0] = add( T1, T8 );
-    move16();
-    zIm[i0] = add( To, Tp );
-    move32();
-#endif
 
-#ifdef BASOP_NOGLOB
     /*T2 = KP951056516*Te + KP587785252*Th; */
     L_tmp = Mult_32_16( KP951056516_16FX, Te );        // Q(16 +x)
     L_tmp = Madd_32_16( L_tmp, KP587785252_16FX, Th ); // Q(16 +x)
@@ -1387,31 +1269,6 @@ static void fft5_32_16fx(
     move32();
     zRe[i4] = sub_o( T5, T3, &Overflow );
     move32();
-#else
-    /*T2 = KP951056516*Te + KP587785252*Th; */
-    L_tmp = Mult_32_16( KP951056516_16FX, Te );
-    L_tmp = Madd_32_16( L_tmp, KP587785252_16FX, Th );
-    T2 = round_fx( L_tmp );
-
-    /*T3 = KP951056516*Th - KP587785252*Te; */
-    L_tmp = Mult_32_16( KP951056516_16FX, Th );
-    L_tmp = Msub_32_16( L_tmp, KP587785252_16FX, Te );
-    T3 = round_fx( L_tmp );
-
-
-    T6 = sub( T1, shr( T8, 2 ) );
-    T4 = add( T9, T6 );
-    T5 = sub( T6, T9 );
-
-    zRe[i3] = sub( T4, T2 );
-    move32();
-    zRe[i1] = add( T5, T3 );
-    move32();
-    zRe[i2] = add( T4, T2 );
-    move32();
-    zRe[i4] = sub( T5, T3 );
-    move32();
-#endif
 
     /*    T2 = KP951056516 * Ts + KP587785252 * Tt; */
     L_tmp = Mult_32_16( KP951056516_16FX, Ts );        // Q(16 +x)
@@ -1422,7 +1279,6 @@ static void fft5_32_16fx(
     L_tmp = Mult_32_16( KP951056516_16FX, Tt );        // Q(16 +x)
     L_tmp = Msub_32_16( L_tmp, KP587785252_16FX, Ts ); // Q(16 +x)
 
-#ifdef BASOP_NOGLOB
     T3 = round_fx_sat( L_tmp ); // Qx
 
     T6 = sub_sat( To, shr( Tp, 2 ) );
@@ -1436,21 +1292,6 @@ static void fft5_32_16fx(
     move16();
     zIm[i4] = add_sat( T3, T5 );
     move16();
-#else
-    T3 = round_fx( L_tmp );
-
-    T6 = sub( To, shr( Tp, 2 ) );
-    T4 = add( Tn, T6 );
-    T5 = sub( T6, Tn );
-    zIm[i2] = sub( T4, T2 );
-    move16();
-    zIm[i1] = sub( T5, T3 );
-    move16();
-    zIm[i3] = add( T2, T4 );
-    move16();
-    zIm[i4] = add( T3, T5 );
-    move16();
-#endif
 
     return;
 }
@@ -1890,7 +1731,6 @@ static void cftfsub_16fx(
     {
         FOR( j = 0; j < l; j += 2 )
         {
-#ifdef BASOP_NOGLOB
             j1 = add_o( j, l, &Overflow );
             x0r = sub_o( a[j], a[j1], &Overflow );
             x0i = sub_o( a[j + 1], a[j1 + 1], &Overflow );
@@ -1902,19 +1742,6 @@ static void cftfsub_16fx(
             move16();
             a[j1 + 1] = x0i;
             move16();
-#else
-            j1 = add( j, l );
-            x0r = sub( a[j], a[j1] );
-            x0i = sub( a[j + 1], a[j1 + 1] );
-            a[j] = add( a[j], a[j1] );
-            move16();
-            a[j + 1] = add( a[j + 1], a[j1 + 1] );
-            move16();
-            a[j1] = x0r;
-            move16();
-            a[j1 + 1] = x0i;
-            move16();
-#endif
         }
     }
     return;
@@ -1940,7 +1767,6 @@ static void cft1st_16fx(
     move32();
 #endif
 
-#ifdef BASOP_NOGLOB
     x0r = add_o( a[0], a[2], &Overflow );
     x0i = add_o( a[1], a[3], &Overflow );
     x1r = sub_o( a[0], a[2], &Overflow );
@@ -1964,36 +1790,9 @@ static void cft1st_16fx(
     a[6] = add_o( x1r, x3i, &Overflow );
     move16();
     a[7] = sub_o( x1i, x3r, &Overflow );
-#else
-    x0r = add( a[0], a[2] );
-    x0i = add( a[1], a[3] );
-    x1r = sub( a[0], a[2] );
-    x1i = sub( a[1], a[3] );
-    x2r = add( a[4], a[6] );
-    x2i = add( a[5], a[7] );
-    x3r = sub( a[4], a[6] );
-    x3i = sub( a[5], a[7] );
-    a[0] = add( x0r, x2r );
-    move16();
-    a[1] = add( x0i, x2i );
-    move16();
-    a[4] = sub( x0r, x2r );
-    move16();
-    a[5] = sub( x0i, x2i );
-    move16();
-    a[2] = sub( x1r, x3i );
-    move16();
-    a[3] = add( x1i, x3r );
-    move16();
-    a[6] = add( x1r, x3i );
-    move16();
-    a[7] = sub( x1i, x3r );
-    move16();
-#endif
     wk1r = w[2];
     move32();
 
-#ifdef BASOP_NOGLOB
     x0r = add_o( a[8], a[10], &Overflow );
     x0i = add_o( a[9], a[11], &Overflow );
     x1r = sub_o( a[8], a[10], &Overflow );
@@ -2014,31 +1813,8 @@ static void cft1st_16fx(
     x0r = sub_o( x1r, x3i, &Overflow );
     x0i = add_o( x1i, x3r, &Overflow );
     tmp = sub_o( x0r, x0i, &Overflow );
-#else
-    x0r = add( a[8], a[10] );
-    x0i = add( a[9], a[11] );
-    x1r = sub( a[8], a[10] );
-    x1i = sub( a[9], a[11] );
-    x2r = add( a[12], a[14] );
-    x2i = add( a[13], a[15] );
-    x3r = sub( a[12], a[14] );
-    x3i = sub( a[13], a[15] );
-    a[8] = add( x0r, x2r );
-    move16();
-    a[9] = add( x0i, x2i );
-    move16();
-    a[12] = sub( x2i, x0i );
-    move16();
-    a[13] = sub( x0r, x2r );
-    move16();
-
-    x0r = sub( x1r, x3i );
-    x0i = add( x1i, x3r );
-    tmp = sub( x0r, x0i );
-#endif
     L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
 
-#ifdef BASOP_NOGLOB
     a[10] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
     move16();
 
@@ -2058,23 +1834,6 @@ static void cft1st_16fx(
     L_tmp = Mult_32_16( wk1r, tmp );                                 /*Q(15+Qx+Q_edct) */
     a[15] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
     move16();
-#else
-    a[10] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-    tmp = add( x0r, x0i );
-    L_tmp = Mult_32_16( wk1r, tmp );       /*Q(15+Qx+Q_edct) */
-    a[11] = round_fx( L_shl( L_tmp, 1 ) ); /* Q(Qx+Q_edct) */
-
-    x0r = add( x3i, x1r );
-    x0i = sub( x3r, x1i );
-    tmp = sub( x0i, x0r );
-    L_tmp = Mult_32_16( wk1r, tmp );       /*Q(15+Qx+Q_edct) */
-    a[14] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-    tmp = add( x0i, x0r );
-    L_tmp = Mult_32_16( wk1r, tmp );       /*Q(15+Qx+Q_edct) */
-    a[15] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-#endif
     k1 = 0;
     move16();
 
@@ -2097,7 +1856,6 @@ static void cft1st_16fx(
 
         L_tmp = L_shl( Mult_32_32( wk2i, wk1r ), 1 ); /*Q29 */
         wk3i = L_sub( L_shl( L_tmp, 1 ), wk1i );      /*Q30 */
-#ifdef BASOP_NOGLOB
         x0r = add_o( a[j], a[j + 2], &Overflow );
         x0i = add_o( a[j + 1], a[j + 3], &Overflow );
         x1r = sub_o( a[j], a[j + 2], &Overflow );
@@ -2208,106 +1966,6 @@ static void cft1st_16fx(
         L_tmp = Madd_32_16( L_tmp, wk3i, x0r );                              /*Q(15+Qx+Q_edct) */
         a[j + 15] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
         move16();
-#else
-        x0r = add( a[j], a[j + 2] );
-        x0i = add( a[j + 1], a[j + 3] );
-        x1r = sub( a[j], a[j + 2] );
-        x1i = sub( a[j + 1], a[j + 3] );
-        x2r = add( a[j + 4], a[j + 6] );
-        x2i = add( a[j + 5], a[j + 7] );
-        x3r = sub( a[j + 4], a[j + 6] );
-        x3i = sub( a[j + 5], a[j + 7] );
-        a[j] = add( x0r, x2r );
-        move16();
-        a[j + 1] = add( x0i, x2i );
-        move16();
-
-        x0r = sub( x0r, x2r );
-        x0i = sub( x0i, x2i );
-        L_tmp = Mult_32_16( wk2r, x0r );          /*Q(15+Qx+Q_edct) */
-        L_tmp = Msub_32_16( L_tmp, wk2i, x0i );   /*Q(15+Qx+Q_edct) */
-        a[j + 4] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        L_tmp = Mult_32_16( wk2r, x0i );          /*Q(15+Qx+Q_edct) */
-        L_tmp = Madd_32_16( L_tmp, wk2i, x0r );   /*Q(15+Qx+Q_edct) */
-        a[j + 5] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        x0r = sub( x1r, x3i );
-        x0i = add( x1i, x3r );
-        L_tmp = Mult_32_16( wk1r, x0r );          /*Q(15+Qx+Q_edct) */
-        L_tmp = Msub_32_16( L_tmp, wk1i, x0i );   /*Q(15+Qx+Q_edct) */
-        a[j + 2] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        L_tmp = Mult_32_16( wk1r, x0i );          /*Q(15+Qx+Q_edct) */
-        L_tmp = Madd_32_16( L_tmp, wk1i, x0r );   /*Q(15+Qx+Q_edct) */
-        a[j + 3] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        x0r = add( x1r, x3i );
-        x0i = sub( x1i, x3r );
-        L_tmp = Mult_32_16( wk3r, x0r );          /*Q(15+Qx+Q_edct) */
-        L_tmp = Msub_32_16( L_tmp, wk3i, x0i );   /*Q(15+Qx+Q_edct) */
-        a[j + 6] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        L_tmp = Mult_32_16( wk3r, x0i );          /*Q(15+Qx+Q_edct) */
-        L_tmp = Madd_32_16( L_tmp, wk3i, x0r );   /*Q(15+Qx+Q_edct) */
-        a[j + 7] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        wk1r = w[k2 + 2];
-        move32();
-        wk1i = w[k2 + 3];
-        move32();
-        L_tmp = L_shl( Mult_32_32( wk2r, wk1i ), 1 ); /*Q29 */
-        wk3r = L_sub( wk1r, L_shl( L_tmp, 1 ) );      /*Q30  */
-
-        L_tmp = L_shl( Mult_32_32( wk2r, wk1r ), 1 ); /*Q29 */
-        wk3i = L_sub( L_shl( L_tmp, 1 ), wk1i );      /*Q30 */
-
-        x0r = add( a[j + 8], a[j + 10] );
-        x0i = add( a[j + 9], a[j + 11] );
-        x1r = sub( a[j + 8], a[j + 10] );
-        x1i = sub( a[j + 9], a[j + 11] );
-        x2r = add( a[j + 12], a[j + 14] );
-        x2i = add( a[j + 13], a[j + 15] );
-        x3r = sub( a[j + 12], a[j + 14] );
-        x3i = sub( a[j + 13], a[j + 15] );
-        a[j + 8] = add( x0r, x2r );
-        move16();
-        a[j + 9] = add( x0i, x2i );
-        move16();
-
-        x0r = sub( x0r, x2r );
-        x0i = sub( x0i, x2i );
-        tmp = negate( x0r );
-        L_tmp = Mult_32_16( wk2i, tmp );           /*Q(15+Qx+Q_edct) */
-        L_tmp = Msub_32_16( L_tmp, wk2r, x0i );    /*Q(15+Qx+Q_edct) */
-        a[j + 12] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        tmp = negate( x0i );
-        L_tmp = Mult_32_16( wk2i, tmp );           /*Q(15+Qx+Q_edct) */
-        L_tmp = Madd_32_16( L_tmp, wk2r, x0r );    /*Q(15+Qx+Q_edct) */
-        a[j + 13] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        x0r = sub( x1r, x3i );
-        x0i = add( x1i, x3r );
-        L_tmp = Mult_32_16( wk1r, x0r );           /*Q(15+Qx+Q_edct) */
-        L_tmp = Msub_32_16( L_tmp, wk1i, x0i );    /*Q(15+Qx+Q_edct) */
-        a[j + 10] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        L_tmp = Mult_32_16( wk1r, x0i );           /*Q(15+Qx+Q_edct) */
-        L_tmp = Madd_32_16( L_tmp, wk1i, x0r );    /*Q(15+Qx+Q_edct) */
-        a[j + 11] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        x0r = add( x1r, x3i );
-        x0i = sub( x1i, x3r );
-
-        L_tmp = Mult_32_16( wk3r, x0r );           /*Q(15+Qx+Q_edct) */
-        L_tmp = Msub_32_16( L_tmp, wk3i, x0i );    /*Q(15+Qx+Q_edct) */
-        a[j + 14] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        L_tmp = Mult_32_16( wk3r, x0i );           /*Q(15+Qx+Q_edct) */
-        L_tmp = Madd_32_16( L_tmp, wk3i, x0r );    /*Q(15+Qx+Q_edct) */
-        a[j + 15] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-#endif
     }
 
     return;
@@ -2337,7 +1995,6 @@ static void cftmdl_16fx(
     m = shl( l, 2 );
     FOR( j = 0; j < l; j += 2 )
     {
-#ifdef BASOP_NOGLOB
         j1 = add_o( j, l, &Overflow );
         j2 = add_o( j1, l, &Overflow );
         j3 = add_o( j2, l, &Overflow );
@@ -2365,35 +2022,6 @@ static void cftmdl_16fx(
         move16();
         a[j3 + 1] = sub_o( x1i, x3r, &Overflow );
         move16();
-#else
-        j1 = add( j, l );
-        j2 = add( j1, l );
-        j3 = add( j2, l );
-        x0r = add( a[j], a[j1] );
-        x0i = add( a[j + 1], a[j1 + 1] );
-        x1r = sub( a[j], a[j1] );
-        x1i = sub( a[j + 1], a[j1 + 1] );
-        x2r = add( a[j2], a[j3] );
-        x2i = add( a[j2 + 1], a[j3 + 1] );
-        x3r = sub( a[j2], a[j3] );
-        x3i = sub( a[j2 + 1], a[j3 + 1] );
-        a[j] = add( x0r, x2r );
-        move16();
-        a[j + 1] = add( x0i, x2i );
-        move16();
-        a[j2] = sub( x0r, x2r );
-        move16();
-        a[j2 + 1] = sub( x0i, x2i );
-        move16();
-        a[j1] = sub( x1r, x3i );
-        move16();
-        a[j1 + 1] = add( x1i, x3r );
-        move16();
-        a[j3] = add( x1r, x3i );
-        move16();
-        a[j3 + 1] = sub( x1i, x3r );
-        move16();
-#endif
     }
 
     wk1r = w[2];
@@ -2401,7 +2029,6 @@ static void cftmdl_16fx(
     tmp2 = add( l, m );
     FOR( j = m; j < tmp2; j += 2 )
     {
-#ifdef BASOP_NOGLOB
         j1 = add_o( j, l, &Overflow );
         j2 = add_o( j1, l, &Overflow );
         j3 = add_o( j2, l, &Overflow );
@@ -2445,47 +2072,6 @@ static void cftmdl_16fx(
         L_tmp = Mult_32_16( wk1r, tmp );                                     /*Q(15+Qx+Q_edct) */
         a[j3 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
         move16();
-#else
-        j1 = add( j, l );
-        j2 = add( j1, l );
-        j3 = add( j2, l );
-        x0r = add( a[j], a[j1] );
-        x0i = add( a[j + 1], a[j1 + 1] );
-        x1r = sub( a[j], a[j1] );
-        x1i = sub( a[j + 1], a[j1 + 1] );
-        x2r = add( a[j2], a[j3] );
-        x2i = add( a[j2 + 1], a[j3 + 1] );
-        x3r = sub( a[j2], a[j3] );
-        x3i = sub( a[j2 + 1], a[j3 + 1] );
-        a[j] = add( x0r, x2r );
-        move16();
-        a[j + 1] = add( x0i, x2i );
-        move16();
-        a[j2] = sub( x2i, x0i );
-        move16();
-        a[j2 + 1] = sub( x0r, x2r );
-        move16();
-
-        x0r = sub( x1r, x3i );
-        x0i = add( x1i, x3r );
-        tmp = sub( x0r, x0i );
-        L_tmp = Mult_32_16( wk1r, tmp );       /*Q(15+Qx+Q_edct) */
-        a[j1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        tmp = add( x0r, x0i );
-        L_tmp = Mult_32_16( wk1r, tmp );           /*Q(15+Qx+Q_edct) */
-        a[j1 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        x0r = add( x3i, x1r );
-        x0i = sub( x3r, x1i );
-        tmp = sub( x0i, x0r );
-        L_tmp = Mult_32_16( wk1r, tmp );       /*Q(15+Qx+Q_edct) */
-        a[j3] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-        tmp = add( x0i, x0r );
-        L_tmp = Mult_32_16( wk1r, tmp );           /*Q(15+Qx+Q_edct) */
-        a[j3 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-#endif
     }
 
     k1 = 0;
@@ -2512,7 +2098,6 @@ static void cftmdl_16fx(
         tmp2 = add( l, k );
         FOR( j = k; j < tmp2; j += 2 )
         {
-#ifdef BASOP_NOGLOB
             j1 = add_o( j, l, &Overflow );
             j2 = add_o( j1, l, &Overflow );
             j3 = add_o( j2, l, &Overflow );
@@ -2568,80 +2153,20 @@ static void cftmdl_16fx(
             L_tmp = Madd_32_16( L_tmp, wk3i, x0r );                              /*Q(15+Qx+Q_edct) */
             a[j3 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
             move16();
-#else
-            j1 = add( j, l );
-            j2 = add( j1, l );
-            j3 = add( j2, l );
-            x0r = add( a[j], a[j1] );
-            x0i = add( a[j + 1], a[j1 + 1] );
-            x1r = sub( a[j], a[j1] );
-            x1i = sub( a[j + 1], a[j1 + 1] );
-            x2r = add( a[j2], a[j3] );
-            x2i = add( a[j2 + 1], a[j3 + 1] );
-            x3r = sub( a[j2], a[j3] );
-            x3i = sub( a[j2 + 1], a[j3 + 1] );
-            a[j] = add( x0r, x2r );
-            move16();
-            a[j + 1] = add( x0i, x2i );
-            move16();
-
-            x0r = sub( x0r, x2r );
-            x0i = sub( x0i, x2i );
-
-            L_tmp = Mult_32_16( wk2r, x0r );        /*Q(15+Qx+Q_edct) */
-            L_tmp = Msub_32_16( L_tmp, wk2i, x0i ); /*Q(15+Qx+Q_edct) */
-            a[j2] = round_fx( L_shl( L_tmp, 1 ) );  /*Q(Qx+Q_edct) */
-
-            L_tmp = Mult_32_16( wk2r, x0i );           /*Q(15+Qx+Q_edct) */
-            L_tmp = Madd_32_16( L_tmp, wk2i, x0r );    /*Q(15+Qx+Q_edct) */
-            a[j2 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-            x0r = sub( x1r, x3i );
-            x0i = add( x1i, x3r );
-
-            L_tmp = Mult_32_16( wk1r, x0r );        /*Q(15+Qx+Q_edct) */
-            L_tmp = Msub_32_16( L_tmp, wk1i, x0i ); /*Q(15+Qx+Q_edct) */
-            a[j1] = round_fx( L_shl( L_tmp, 1 ) );  /*Q(Qx+Q_edct) */
-
-            L_tmp = Mult_32_16( wk1r, x0i );           /*Q(15+Qx+Q_edct) */
-            L_tmp = Madd_32_16( L_tmp, wk1i, x0r );    /*Q(15+Qx+Q_edct) */
-            a[j1 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-            L_x0r = L_add( (Word32) x1r, (Word32) x3i );
-            L_x0i = L_sub( (Word32) x1i, (Word32) x3r );
-            x0r = extract_l( L_x0r );
-            x0i = extract_l( L_x0i );
-            L_tmp = Mult_32_16( wk3r, x0r );        /*Q(15+Qx+Q_edct) */
-            L_tmp = Msub_32_16( L_tmp, wk3i, x0i ); /*Q(15+Qx+Q_edct) */
-            a[j3] = round_fx( L_shl( L_tmp, 1 ) );  /*Q(Qx+Q_edct) */
-
-            L_tmp = Mult_32_16( wk3r, x0i );           /*Q(15+Qx+Q_edct) */
-            L_tmp = Madd_32_16( L_tmp, wk3i, x0r );    /*Q(15+Qx+Q_edct) */
-            a[j3 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-#endif
         }
 
         wk1r = w[k2 + 2];
         move32();
         wk1i = w[k2 + 3];
         move32();
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( Mult_32_32( wk2r, wk1i ), 1, &Overflow );         /*Q29 */
         wk3r = L_sub_o( wk1r, L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q30  */
 
         L_tmp = L_shl_o( Mult_32_32( wk2r, wk1r ), 1, &Overflow );         /*Q29 */
         wk3i = L_sub_o( L_shl_o( L_tmp, 1, &Overflow ), wk1i, &Overflow ); /*Q30 */
-#else
-        L_tmp = L_shl( Mult_32_32( wk2r, wk1i ), 1 );  /*Q29 */
-        wk3r = L_sub( wk1r, L_shl( L_tmp, 1 ) );       /*Q30  */
-
-        L_tmp = L_shl( Mult_32_32( wk2r, wk1r ), 1 ); /*Q29 */
-        wk3i = L_sub( L_shl( L_tmp, 1 ), wk1i );      /*Q30 */
-#endif
         tmp2 = add( l, add( k, m ) );
         FOR( j = add( k, m ); j < tmp2; j += 2 )
         {
-#ifdef BASOP_NOGLOB
             j1 = add_o( j, l, &Overflow );
             j2 = add_o( j1, l, &Overflow );
             j3 = add_o( j2, l, &Overflow );
@@ -2698,58 +2223,6 @@ static void cftmdl_16fx(
             L_tmp = Madd_32_16( L_tmp, wk3i, x0r );                              /*Q(15+Qx+Q_edct) */
             a[j3 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
             move16();
-#else
-            j1 = add( j, l );
-            j2 = add( j1, l );
-            j3 = add( j2, l );
-            x0r = add( a[j], a[j1] );
-            x0i = add( a[j + 1], a[j1 + 1] );
-            x1r = sub( a[j], a[j1] );
-            x1i = sub( a[j + 1], a[j1 + 1] );
-            x2r = add( a[j2], a[j3] );
-            x2i = add( a[j2 + 1], a[j3 + 1] );
-            x3r = sub( a[j2], a[j3] );
-            x3i = sub( a[j2 + 1], a[j3 + 1] );
-            a[j] = add( x0r, x2r );
-            move16();
-            a[j + 1] = add( x0i, x2i );
-            move16();
-
-            x0r = sub( x0r, x2r );
-            x0i = sub( x0i, x2i );
-
-            tmp = negate( x0r );
-            L_tmp = Mult_32_16( wk2i, tmp );        /*Q(15+Qx+Q_edct) */
-            L_tmp = Msub_32_16( L_tmp, wk2r, x0i ); /*Q(15+Qx+Q_edct) */
-            a[j2] = round_fx( L_shl( L_tmp, 1 ) );  /*Q(Qx+Q_edct) */
-
-            tmp = negate( x0i );
-            L_tmp = Mult_32_16( wk2i, tmp );           /*Q(15+Qx+Q_edct) */
-            L_tmp = Madd_32_16( L_tmp, wk2r, x0r );    /*Q(15+Qx+Q_edct) */
-            a[j2 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-            x0r = sub( x1r, x3i );
-            x0i = add( x1i, x3r );
-
-            L_tmp = Mult_32_16( wk1r, x0r );        /*Q(15+Qx+Q_edct) */
-            L_tmp = Msub_32_16( L_tmp, wk1i, x0i ); /*Q(15+Qx+Q_edct) */
-            a[j1] = round_fx( L_shl( L_tmp, 1 ) );  /*Q(Qx+Q_edct) */
-
-            L_tmp = Mult_32_16( wk1r, x0i );           /*Q(15+Qx+Q_edct) */
-            L_tmp = Madd_32_16( L_tmp, wk1i, x0r );    /*Q(15+Qx+Q_edct) */
-            a[j1 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-
-            x0r = add( x1r, x3i );
-            x0i = sub( x1i, x3r );
-
-            L_tmp = Mult_32_16( wk3r, x0r );        /*Q(15+Qx+Q_edct) */
-            L_tmp = Msub_32_16( L_tmp, wk3i, x0i ); /*Q(15+Qx+Q_edct) */
-            a[j3] = round_fx( L_shl( L_tmp, 1 ) );  /*Q(Qx+Q_edct) */
-
-            L_tmp = Mult_32_16( wk3r, x0i );           /*Q(15+Qx+Q_edct) */
-            L_tmp = Madd_32_16( L_tmp, wk3i, x0r );    /*Q(15+Qx+Q_edct) */
-            a[j3 + 1] = round_fx( L_shl( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
-#endif
         }
     }
 
@@ -2854,13 +2327,9 @@ void fft3_fx( const Word16 X[] /*Qx*/, Word16 Y[] /*Qx*/, const Word16 n )
     move16();
 
     /* special case: i = 0 */
-    acc = L_mult( *RZ0++, 0x4000 /*1.Q14*/ );     // Q15 + Qx
-    acc = L_mac( acc, *RZ1++, 0x4000 /*1.Q14*/ ); // Q15 + Qx
-#ifdef BASOP_NOGLOB
+    acc = L_mult( *RZ0++, 0x4000 /*1.Q14*/ );           // Q15 + Qx
+    acc = L_mac( acc, *RZ1++, 0x4000 /*1.Q14*/ );       // Q15 + Qx
     *RY++ = mac_r_sat( acc, *RZ2++, 0x4000 /*1.Q14*/ ); // Qx
-#else
-    *RY++ = mac_r( acc, *RZ2++, 0x4000 );
-#endif
     move16();
 
     /* first 3/12-- from 1 to (3*m/8)-1 */
@@ -3456,21 +2925,12 @@ void ifft3_fx( const Word16 Z[] /*Qx*/, Word16 X[] /*Qx*/, const Word16 n )
     pX = X;
     FOR( i = 0; i < m; i++ )
     {
-#ifdef BASOP_NOGLOB
         *pX++ = shl_sat( mult_r( *y0++, FFT3_ONE_THIRD ), 1 ); // Qx
         move16();
         *pX++ = shl_sat( mult_r( *y1++, FFT3_ONE_THIRD ), 1 ); // Qx
         move16();
         *pX++ = shl_sat( mult_r( *y2++, FFT3_ONE_THIRD ), 1 ); // Qx
         move16();
-#else
-        *pX++ = shl( mult_r( *y0++, FFT3_ONE_THIRD ), 1 );
-        move16();
-        *pX++ = shl( mult_r( *y1++, FFT3_ONE_THIRD ), 1 );
-        move16();
-        *pX++ = shl( mult_r( *y2++, FFT3_ONE_THIRD ), 1 );
-        move16();
-#endif
     }
 
     return;
diff --git a/lib_com/fft_rel.c b/lib_com/fft_rel.c
index 88f80e798703ed2b34902db2703d30753c1b7698..1d020cabdd7d013f554eeb3d0a697e73682881d9 100644
--- a/lib_com/fft_rel.c
+++ b/lib_com/fft_rel.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /*---------------------------------------------------------------------*
  * Local constants
@@ -301,6 +300,168 @@ void fft_rel(
     return;
 }
 
+void fft_rel_16_32fx(
+    Word16 x[],  /* i/o: input/output vector Qx   */
+    Word16 *q_x, /* extra scaling added on speech buffer*/
+    Word16 i_subfr,
+    const Word16 n, /* i  : vector length          */
+    const Word16 m  /* i  : log2 of vector length  */
+)
+{
+    Word16 i, j, k, n1, n2, n4;
+    Word16 step;
+    Word32 xt, t1, t2;
+    Word32 *x0, *x1, *x2;
+    const Word16 *s, *c;
+    Word32 *xi2, *xi3, *xi4, *xi1;
+
+    Word32 fft_bff32[L_FFT];
+    Copy_Scale_sig_16_32_no_sat( x, fft_bff32, L_FFT, 0 ); // copying x to fft_bff32 without scaling
+
+    /*-----------------------------------------------------------------*
+     * Digit reverse counter
+     *-----------------------------------------------------------------*/
+
+    j = 0;
+    move16();
+    x0 = &fft_bff32[0]; // Qx
+    FOR( i = 0; i < n - 1; i++ )
+    {
+        IF( LT_16( i, j ) )
+        {
+            xt = fft_bff32[j]; // Qx
+            move32();
+            fft_bff32[j] = *x0; // Qx
+            move32();
+            *x0 = xt; // Qx
+            move32();
+        }
+        x0++;
+        k = shr( n, 1 );
+        WHILE( ( k <= j ) )
+        {
+            j = sub( j, k );
+            k = shr( k, 1 );
+        }
+        j = add( j, k );
+    }
+
+    /*-----------------------------------------------------------------*
+     * Length two butterflies
+     *-----------------------------------------------------------------*/
+
+    x0 = &fft_bff32[0];
+    x1 = &fft_bff32[1];
+    FOR( i = 0; i < ( n >> 1 ); i++ )
+    {
+        xt = *x0;
+        move32();
+        *x0 = L_add( xt, *x1 );
+        move32();
+        *x1 = L_sub( xt, *x1 );
+        move32();
+        x0++;
+        x0++;
+        x1++;
+        x1++;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Other butterflies
+     *
+     * The implementation described in [1] has been changed by using
+     * table lookup for evaluating sine and cosine functions.  The
+     * variable ind and its increment step are needed to access table
+     * entries.  Note that this implementation assumes n4 to be so
+     * small that ind will never exceed the table.  Thus the input
+     * argument n and the constant N_MAX_SAS must be set properly.
+     *-----------------------------------------------------------------*/
+
+    n2 = 1;
+    move16();
+    /* step = N_MAX_SAS/4; */
+    FOR( k = 2; k <= m; k++ )
+    {
+        n4 = n2;
+        move16();
+        n2 = shl( n4, 1 );
+        n1 = shl( n2, 1 );
+
+        step = idiv1616( N_MAX_SAS, n1 );
+
+        x0 = fft_bff32;
+        x1 = fft_bff32 + n2;
+        x2 = fft_bff32 + add( n2, n4 );
+        FOR( i = 0; i < n; i += n1 )
+        {
+            xt = *x0;
+            move32(); /* xt = x[i];   */
+            *x0 = L_add( xt, *x1 );
+            move32(); /* x[i] = xt + x[i+n2];    */
+            *x1 = L_sub( xt, *x1 );
+            move32(); /* x[i+n2] = xt - x[i+n2];      */
+            *x2 = L_negate( *x2 );
+            move32(); /* x[i+n2+n4] = -x[i+n2+n4];     */
+
+
+            s = sincos_t_fx + step; // Q15
+            c = s + 64;             // Q15
+            xi1 = fft_bff32 + add( i, 1 );
+            xi3 = xi1 + n2;
+            xi2 = xi3 - 2;
+            xi4 = xi1 + sub( n1, 2 );
+
+            FOR( j = 1; j < n4; j++ )
+            {
+                t1 = L_add( Mpy_32_16_1( *xi3, *c ), Mpy_32_16_1( *xi4, *s ) ); /* t1 = *xi3**(pt_c+ind) + *xi4**(pt_s+ind); Qx  */
+                t2 = L_sub( Mpy_32_16_1( *xi3, *s ), Mpy_32_16_1( *xi4, *c ) ); /* t2 = *xi3**(pt_s+ind) - *xi4**(pt_c+ind); Qx    */
+                *xi4 = L_sub( *xi2, t2 );
+                move32();
+                *xi3 = L_negate( L_add( *xi2, t2 ) );
+                move32();
+                *xi2 = L_sub( *xi1, t1 );
+                move32();
+                *xi1 = L_add( *xi1, t1 );
+                move32();
+
+                xi4--;
+                xi2--;
+                xi3++;
+                xi1++;
+                c += step;
+                s += step; /* autoincrement by ar0 */
+            }
+
+            x0 += n1;
+            x1 += n1;
+            x2 += n1;
+        }
+        /* step = shr(step, 1); */
+    }
+    Word16 norm = L_norm_arr( fft_bff32, L_FFT );
+    IF( i_subfr == 0 )
+    {
+        Copy_Scale_sig32_16( fft_bff32, x, L_FFT, norm );
+        *q_x = sub( norm, 16 );
+        move16();
+    }
+    ELSE
+    {
+        IF( LT_16( sub( norm, 16 ), *q_x ) )
+        {
+            scale_sig( x - L_FFT, L_FFT, sub( sub( norm, 16 ), *q_x ) );
+            Copy_Scale_sig32_16( fft_bff32, x, L_FFT, norm );
+            *q_x = sub( norm, 16 );
+            move16();
+        }
+        ELSE
+        {
+            Copy_Scale_sig32_16( fft_bff32, x, L_FFT, add( 16, *q_x ) );
+        }
+    }
+
+    return;
+}
 
 void fft_rel_fx(
     Word16 x[],     /* i/o: input/output vector Qx   */
@@ -361,17 +522,9 @@ void fft_rel_fx(
     {
         xt = *x0;
         move16();
-#ifdef BASOP_NOGLOB
         *x0 = add_o( xt, *x1, &Overflow );
-#else
-        *x0 = add( xt, *x1 );
-#endif
         move16();
-#ifdef BASOP_NOGLOB
         *x1 = sub_o( xt, *x1, &Overflow );
-#else
-        *x1 = sub( xt, *x1 );
-#endif
         move16();
         x0++;
         x0++;
@@ -409,17 +562,9 @@ void fft_rel_fx(
         {
             xt = *x0;
             move16(); /* xt = x[i];   */
-#ifdef BASOP_NOGLOB
             *x0 = add_o( xt, *x1, &Overflow );
-#else                 /* BASOP_NOGLOB */
-            *x0 = add( xt, *x1 );
-#endif                /* BASOP_NOGLOB */
             move16(); /* x[i] = xt + x[i+n2];    */
-#ifdef BASOP_NOGLOB
             *x1 = sub_o( xt, *x1, &Overflow );
-#else                 /* BASOP_NOGLOB */
-            *x1 = sub( xt, *x1 );
-#endif                /* BASOP_NOGLOB */
             move16(); /* x[i+n2] = xt - x[i+n2];      */
             *x2 = negate( *x2 );
             move16(); /* x[i+n2+n4] = -x[i+n2+n4];     */
@@ -434,33 +579,15 @@ void fft_rel_fx(
 
             FOR( j = 1; j < n4; j++ )
             {
-#ifdef BASOP_NOGLOB
                 t1 = add_o( mult_r( *xi3, *c ), mult_r( *xi4, *s ), &Overflow ); /* t1 = *xi3**(pt_c+ind) + *xi4**(pt_s+ind); Qx  */
                 t2 = sub_o( mult_r( *xi3, *s ), mult_r( *xi4, *c ), &Overflow ); /* t2 = *xi3**(pt_s+ind) - *xi4**(pt_c+ind); Qx    */
                 *xi4 = sub_o( *xi2, t2, &Overflow );
-#else  /* BASOP_NOGLOB */
-                t1 = add( mult_r( *xi3, *c ), mult_r( *xi4, *s ) ); /* t1 = *xi3**(pt_c+ind) + *xi4**(pt_s+ind);   */
-                t2 = sub( mult_r( *xi3, *s ), mult_r( *xi4, *c ) ); /* t2 = *xi3**(pt_s+ind) - *xi4**(pt_c+ind);     */
-                *xi4 = sub( *xi2, t2 );
-#endif /* BASOP_NOGLOB */
                 move16();
-#ifdef BASOP_NOGLOB
                 *xi3 = negate( add_o( *xi2, t2, &Overflow ) );
-#else  /* BASOP_NOGLOB */
-                *xi3 = negate( add( *xi2, t2 ) );
-#endif /* BASOP_NOGLOB */
                 move16();
-#ifdef BASOP_NOGLOB
                 *xi2 = sub_o( *xi1, t1, &Overflow );
-#else  /* BASOP_NOGLOB */
-                *xi2 = sub( *xi1, t1 );
-#endif /* BASOP_NOGLOB */
                 move16();
-#ifdef BASOP_NOGLOB
                 *xi1 = add_o( *xi1, t1, &Overflow );
-#else  /* BASOP_NOGLOB */
-                *xi1 = add( *xi1, t1 );
-#endif /* BASOP_NOGLOB */
                 move16();
 
                 xi4--;
diff --git a/lib_com/fft_rel_fx.c b/lib_com/fft_rel_fx.c
index 1285049bcb6afd76f90b084ac1a759671f2dbfec..5461ce55baae37f1bfdd25c36fac6607fd69e0c1 100644
--- a/lib_com/fft_rel_fx.c
+++ b/lib_com/fft_rel_fx.c
@@ -136,26 +136,15 @@ static void c_fft_fx(
 
             input_ptr1 = in_ptr + ( const Word16 )( (uintptr_t) ( *table_ptr++ ) >> (uintptr_t) shift );
 
-#ifdef BASOP_NOGLOB
             tmp1 = msu_r_sat( L_tmp1, *input_ptr1, 16384 );
             tmp3 = mac_r_sat( L_tmp1, *input_ptr1++, 16384 );
-#else
-            tmp1 = msu_r( L_tmp1, *input_ptr1, 16384 );
-            tmp3 = mac_r( L_tmp1, *input_ptr1++, 16384 );
-#endif
             input_ptr2 = in_ptr + ( const Word16 )( (uintptr_t) ( *table_ptr++ ) >> (uintptr_t) shift );
             input_ptr3 = in_ptr + ( const Word16 )( (uintptr_t) ( *table_ptr++ ) >> (uintptr_t) shift );
 
             L_tmp1 = L_mult( *input_ptr2++, 16384 );
-#ifdef BASOP_NOGLOB
             tmp2 = mac_r_sat( L_tmp1, *input_ptr3, 16384 );
             tmp4 = msu_r_sat( L_tmp1, *input_ptr3++, 16384 );
-#else
-            tmp2 = mac_r( L_tmp1, *input_ptr3, 16384 );
-            tmp4 = msu_r( L_tmp1, *input_ptr3++, 16384 );
-#endif
             L_tmp1 = L_mult( tmp3, 16384 );
-#ifdef BASOP_NOGLOB
             out_ptr[k] = mac_r_sat( L_tmp1, tmp2, 16384 );
             move16();
             out_ptr[k + 4] = msu_r_sat( L_tmp1, tmp2, 16384 );
@@ -163,57 +152,25 @@ static void c_fft_fx(
 
             tmp2 = mac_r_sat( L_tmp2, *input_ptr1, 16384 );
             tmp3 = msu_r_sat( L_tmp2, *input_ptr1, 16384 );
-#else
-            out_ptr[k] = mac_r( L_tmp1, tmp2, 16384 );
-            move16();
-            out_ptr[k + 4] = msu_r( L_tmp1, tmp2, 16384 );
-            move16();
-
-            tmp2 = mac_r( L_tmp2, *input_ptr1, 16384 );
-            tmp3 = msu_r( L_tmp2, *input_ptr1, 16384 );
-#endif
             L_tmp2 = L_mult( *input_ptr2, 16384 );
 
             L_tmp1 = L_mult( tmp1, 16384 );
-#ifdef BASOP_NOGLOB
             tmp1 = msu_r_sat( L_tmp2, *input_ptr3, 16384 );
             out_ptr[k + 2] = mac_r_sat( L_tmp1, tmp1, 16384 );
             move16();
             out_ptr[k + 6] = msu_r_sat( L_tmp1, tmp1, 16384 );
             move16();
-#else
-            tmp1 = msu_r( L_tmp2, *input_ptr3, 16384 );
-            out_ptr[k + 2] = mac_r( L_tmp1, tmp1, 16384 );
-            move16();
-            out_ptr[k + 6] = msu_r( L_tmp1, tmp1, 16384 );
-            move16();
-#endif
             L_tmp1 = L_mult( tmp2, 16384 );
-#ifdef BASOP_NOGLOB
             tmp2 = mac_r_sat( L_tmp2, *input_ptr3, 16384 );
             out_ptr[k + 1] = mac_r_sat( L_tmp1, tmp2, 16384 );
             move16();
             out_ptr[k + 5] = msu_r_sat( L_tmp1, tmp2, 16384 );
             move16();
-#else
-            tmp2 = mac_r( L_tmp2, *input_ptr3, 16384 );
-            out_ptr[k + 1] = mac_r( L_tmp1, tmp2, 16384 );
-            move16();
-            out_ptr[k + 5] = msu_r( L_tmp1, tmp2, 16384 );
-            move16();
-#endif
             L_tmp1 = L_mult( tmp3, 16384 );
-#ifdef BASOP_NOGLOB
             out_ptr[k + 3] = msu_r_sat( L_tmp1, tmp4, 16384 );
             move16();
             out_ptr[k + 7] = mac_r_sat( L_tmp1, tmp4, 16384 );
             move16();
-#else
-            out_ptr[k + 3] = msu_r( L_tmp1, tmp4, 16384 );
-            move16();
-            out_ptr[k + 7] = mac_r( L_tmp1, tmp4, 16384 );
-            move16();
-#endif
         }
 
         /* Remaining Stages */
@@ -333,7 +290,6 @@ static void c_fft_fx(
                     kj = add( k, jj ); /* kj is butterfly bottom */
 
                     /* Butterfly computations */
-#ifdef BASOP_NOGLOB
                     tmp1 = mac_r_sat( L_mult_sat( out_ptr[kj], table_ptr[ji] ), out_ptr[kj + 1], table_ptr[ji + 1] );
 
                     tmp2 = msu_r_sat( L_mult_sat( out_ptr[kj + 1], table_ptr[ji] ), out_ptr[kj], table_ptr[ji + 1] );
@@ -346,22 +302,6 @@ static void c_fft_fx(
                     move16();
                     out_ptr[k + 1] = add_sat( out_ptr[k + 1], tmp2 );
                     move16();
-#else
-                    tmp1 = mac_r( L_mult( out_ptr[kj], table_ptr[ji] ),
-                                  out_ptr[kj + 1], table_ptr[ji + 1] );
-
-                    tmp2 = msu_r( L_mult( out_ptr[kj + 1], table_ptr[ji] ),
-                                  out_ptr[kj], table_ptr[ji + 1] );
-
-                    out_ptr[kj] = sub( out_ptr[k], tmp1 );
-                    move16();
-                    out_ptr[kj + 1] = sub( out_ptr[k + 1], tmp2 );
-                    move16();
-                    out_ptr[k] = add( out_ptr[k], tmp1 );
-                    move16();
-                    out_ptr[k + 1] = add( out_ptr[k + 1], tmp2 );
-                    move16();
-#endif
                 }
                 ji = add( ji, ii );
             }
@@ -420,7 +360,6 @@ void r_fft_fx_lc(
         FOR( i = 2; i <= SIZE2; i += 2 )
         {
             Ltmp1_imag = L_mult( temp[i + 1], 16384 );
-#ifdef BASOP_NOGLOB
             Ltmp1_imag = L_msu_sat( Ltmp1_imag, *ptrDn, 16384 );
             tmp2_real = add_sat( temp[i + 1], *ptrDn-- );
 
@@ -439,26 +378,6 @@ void r_fft_fx_lc(
             move16();
             *ptRealDn-- = mac_r_sat( Ltmp1_real, tmp2_real, *phstbl_ptrDn-- );
             move16();
-#else
-            Ltmp1_imag = L_msu( Ltmp1_imag, *ptrDn, 16384 );
-            tmp2_real = add( temp[i + 1], *ptrDn-- );
-
-            Ltmp1_real = L_mult( temp[i], 16384 );
-            Ltmp1_real = L_mac( Ltmp1_real, *ptrDn, 16384 );
-            tmp2_imag = sub( *ptrDn--, temp[i] );
-
-
-            *ptRealUp++ = msu_r( L_mac( Ltmp1_real, tmp2_real, phs_tbl[i] ), tmp2_imag, phs_tbl[i + 1] );
-            move16();
-            *ptImaDn-- = mac_r( L_mac( Ltmp1_imag, tmp2_imag, phs_tbl[i] ), tmp2_real, phs_tbl[i + 1] );
-            move16();
-            Ltmp1 = L_mac( L_negate( Ltmp1_imag ), tmp2_real, *phstbl_ptrDn );
-            Ltmp1_real = L_mac( Ltmp1_real, tmp2_imag, *phstbl_ptrDn-- );
-            *ptImaUp++ = msu_r( Ltmp1, tmp2_imag, *phstbl_ptrDn );
-            move16();
-            *ptRealDn-- = mac_r( Ltmp1_real, tmp2_real, *phstbl_ptrDn-- );
-            move16();
-#endif
         }
     }
     ELSE /* The ifFT part */
@@ -486,7 +405,6 @@ void r_fft_fx_lc(
         /* Now, handle the remaining positive frequencies */
         FOR( i = 2; i <= SIZE2; i += 2 )
         {
-#ifdef BASOP_NOGLOB
             Ltmp1_imag = L_mult( *ptImaDn, 16384 );
             Ltmp1_imag = L_msu_sat( Ltmp1_imag, *ptImaUp, 16384 );
             tmp2_real = add_sat( *ptImaDn--, *ptImaUp++ );
@@ -503,26 +421,6 @@ void r_fft_fx_lc(
             move16();
             *ptrDn-- = msu_r_sat( Ltmp1_real, tmp2_real, *phstbl_ptrDn-- );
             move16();
-#else
-            Ltmp1_imag = L_mult( *ptImaDn, 16384 );
-            Ltmp1_imag = L_msu( Ltmp1_imag, *ptImaUp, 16384 );
-            tmp2_real = add( *ptImaDn--, *ptImaUp++ );
-            Ltmp1_real = L_mult( *ptRealUp, 16384 );
-            Ltmp1_real = L_mac( Ltmp1_real, *ptRealDn, 16384 );
-            tmp2_imag = sub( *ptRealUp++, *ptRealDn-- );
-
-
-            temp[i] = mac_r( L_msu( Ltmp1_real, tmp2_real, phs_tbl[i] ), tmp2_imag, phs_tbl[i + 1] );
-            move16();
-            temp[i + 1] = mac_r( L_mac( Ltmp1_imag, tmp2_imag, phs_tbl[i] ), tmp2_real, phs_tbl[i + 1] );
-            move16();
-            Ltmp1 = L_mac( L_negate( Ltmp1_imag ), tmp2_real, *phstbl_ptrDn );
-            Ltmp1_real = L_msu( Ltmp1_real, tmp2_imag, *phstbl_ptrDn-- );
-            *ptrDn-- = msu_r( Ltmp1, tmp2_imag, *phstbl_ptrDn );
-            move16();
-            *ptrDn-- = msu_r( Ltmp1_real, tmp2_real, *phstbl_ptrDn-- );
-            move16();
-#endif
         }
 
         /* Perform the complex ifFT */
diff --git a/lib_com/fill_spectrum.c b/lib_com/fill_spectrum.c
index 111ac6d2fdd84f8e6d115a17a6e3aea35c131f6a..bd9080a7bd41747ba25f9a5cecce507c5ac55e63 100644
--- a/lib_com/fill_spectrum.c
+++ b/lib_com/fill_spectrum.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,9 +38,8 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 
@@ -263,7 +262,7 @@ void ivas_fill_spectrum_fx(
     }
     ELSE IF( EQ_16( HQ_mode, HQ_GEN_SWB ) || EQ_16( HQ_mode, HQ_GEN_FB ) )
     {
-        hq_bwe_fx( HQ_mode, L_coeff_out1, hq_generic_fenv, L_coeff_out, hq_generic_offset, prev_L_swb_norm, hq_generic_exc_clas, sfm_end, num_sfm, num_env_bands, R );
+        hq_bwe_ivas_fx( HQ_mode, L_coeff_out1, hq_generic_fenv, L_coeff_out, hq_generic_offset, prev_L_swb_norm, hq_generic_exc_clas, sfm_end, num_sfm, num_env_bands, R );
     }
 
     /*----------------------------------------------------------------*
diff --git a/lib_com/findpulse.c b/lib_com/findpulse.c
index cc7d2bf3b5c1684696e24500ce7446af497f49f0..68853e06142c91523103ce2ae595215b69bbe61c 100644
--- a/lib_com/findpulse.c
+++ b/lib_com/findpulse.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,10 +37,9 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /*----------------------------------------------------------------------------------*
  *  findpulse()
diff --git a/lib_com/float_to_fix_ops.c b/lib_com/float_to_fix_ops.c
index 41d90359f4a2643524d1abd16276b9c1e374512e..8b69e05e8811edbc273a3cd78e735d1bc0f99375 100644
--- a/lib_com/float_to_fix_ops.c
+++ b/lib_com/float_to_fix_ops.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #define WMC_TOOL_SKIP
 
@@ -184,14 +183,14 @@ Word16 Q_factor( float x )
 {
     Word16 Q = 15;
     if ( x >= 1 || x <= -1 )
-        Q = norm_s( (Word16) abs( (Word32) x ) );
+        Q = norm_s( (Word16) L_abs( (Word32) x ) );
     return Q;
 }
 Word16 Q_factor_L( float x )
 {
     Word16 Q = 31;
     if ( x >= 1 || x <= -1 )
-        Q = norm_l( abs( (Word32) x ) );
+        Q = norm_l( L_abs( (Word32) x ) );
     return Q;
 }
 Word16 Q_factor_L_32( Word32 x )
@@ -207,7 +206,7 @@ Word16 Q_factor_arr( float *x, Word16 l )
     for ( int i = 0; i < l; i++ )
     {
         if ( x[i] >= 1 || x[i] <= -1 )
-            Q = s_min( Q, norm_s( (Word16) abs( (Word32) x[i] ) ) );
+            Q = s_min( Q, norm_s( (Word16) L_abs( (Word32) x[i] ) ) );
     }
     return Q;
 }
@@ -217,7 +216,7 @@ Word16 Q_factor_arrL( float *x, Word16 l )
     for ( int i = 0; i < l; i++ )
     {
         if ( x[i] >= 1 || x[i] <= -1 )
-            Q = s_min( Q, norm_l( (Word32) abs( (Word32) x[i] ) ) );
+            Q = s_min( Q, norm_l( (Word32) L_abs( (Word32) x[i] ) ) );
     }
     return Q;
 }
diff --git a/lib_com/frame_ener.c b/lib_com/frame_ener.c
deleted file mode 100644
index 03e31126aa4322d8e3a86564b535ab5a14f196cd..0000000000000000000000000000000000000000
--- a/lib_com/frame_ener.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-/*----------------------------------------------------------------------------------*
- * fer_energy()
- *
- * Estimation of pitch-synchronous (voiced sounds) or half-frame energy
- *----------------------------------------------------------------------------------*/
-
-#ifndef IVAS_FLOAT_FIXED
-void fer_energy(
-    const int16_t L_frame, /* i  : frame length                           */
-    const int16_t clas,    /* i  : frame classification                   */
-    const float *synth,    /* i  : synthesized speech at Fs = 12k8 Hz     */
-    const float pitch,     /* i  : pitch period                           */
-    float *enr,            /* o  : pitch-synchronous or half_frame energy */
-    const int16_t offset   /* i  : speech pointer offset (0 or L_frame)   */
-)
-{
-    int16_t len;
-    const float *pt_synth;
-
-    if ( clas == VOICED_CLAS || clas == ONSET || clas == SIN_ONSET ) /* Voiced or Onset current frame */
-    {
-        len = (int16_t) ( pitch + 0.5f ); /* pitch value */
-
-        pt_synth = synth;
-        if ( offset != 0 )
-        {
-            pt_synth = synth + L_frame - len;
-        }
-
-        emaximum( pt_synth, len, enr ); /* pitch synchronous E */
-    }
-    else
-    {
-        pt_synth = synth;
-        if ( offset != 0 )
-        {
-            pt_synth = synth + L_frame / 2;
-        }
-
-        *enr = dotp( pt_synth, pt_synth, L_frame / 2 );
-        *enr /= (float) ( L_frame / 2 );
-    }
-    return;
-}
-#endif
-
-void fer_energy_fx(
-    const Word16 L_frame, /* i  : frame length                                      */
-    const Word16 clas,    /* i  : frame classification                              */
-    const Word32 *synth,  /* i  : synthesized speech at Fs = 12k8 Hz     Q(q_synth) */
-    const Word16 q_synth, /* i  : synthesized speech at Fs = 12k8 Hz                */
-    const Word16 pitch,   /* i  : pitch period                           Q0         */
-    Word32 *enr,          /* o  : pitch-synchronous or half_frame energy Q0         */
-    const Word16 offset   /* i  : speech pointer offset (0 or L_frame)              */
-)
-{
-    Word16 len, shift, exp;
-    const Word32 *pt_synth;
-    Word16 enr_tmp, i;
-    Word64 W_tmp;
-
-    test();
-    test();
-    IF( EQ_16( clas, VOICED_CLAS ) || EQ_16( clas, ONSET ) || EQ_16( clas, SIN_ONSET ) ) /* Voiced or Onset current frame */
-    {
-        len = ( pitch ); /* pitch value */
-        move16();
-
-        pt_synth = synth;
-        IF( offset != 0 )
-        {
-            pt_synth = synth + sub( L_frame, len );
-        }
-
-        emaximum_32fx( q_synth, pt_synth, len, enr ); /* pitch synchronous E */
-    }
-    ELSE
-    {
-        pt_synth = synth;
-        IF( offset != 0 )
-        {
-            pt_synth = synth + shr( L_frame, 1 );
-        }
-
-        W_tmp = 0;
-        move64();
-        FOR( i = 0; i < L_frame / 2; i++ )
-        {
-            W_tmp = W_add( W_tmp, W_mult0_32_32( pt_synth[i], pt_synth[i] ) ); // Q = q_synth * 2
-        }
-        shift = W_norm( W_tmp );
-        W_tmp = W_shl( W_tmp, shift ); // Q = q_synth * 2 + shift
-        *enr = W_extract_h( W_tmp );   // Q = q_synth * 2 + shift - 32
-        move32();
-
-        enr_tmp = BASOP_Util_Divide3216_Scale( *enr, shr( L_frame, 1 ) /*Q0*/, &exp );
-        *enr = L_shr( L_deposit_l( enr_tmp ), sub( sub( sub( shift, 32 ), exp ), 1 ) ); /*Q0*/
-        move32();
-    }
-    return;
-}
-
-
-/*----------------------------------------------------------------------------------*
- * frame_ener()
- *
- * Estimation of pitch-synchronous (voiced) or mean half-frame (unvoiced) energy
- *----------------------------------------------------------------------------------*/
-Word16 frame_ener_fx(
-    const Word16 L_frame, /* i  : length of the frame                            */
-    const Word16 clas,    /* i  : frame classification                           */
-    const Word16 *synth,  /* i  : synthesized speech at Fs = 12k8 Hz       Q_new */
-    const Word16 pitch,   /* i  : pitch period                             Q0    */
-    Word32 *enr_q,        /* o  : pitch-synchronous or half_frame energy   Q0    */
-    const Word16 offset,  /* i  : speech pointer offset (0 or L_FRAME)           */
-    const Word16 Q_new,   /* i  : Scaling factor                                 */
-    Word16 shift,         /* i  : Shift need to obtain 12 bits vectors           */
-    const Word16 enc      /* i  : Encoder/decoder                                */
-)
-{
-    Word16 len, exp_enrq, exp_tmp, pos;
-    Word16 i;
-    const Word16 *pt_synth;
-    Word32 Ltmp;
-
-    exp_enrq = 0;
-    move16();
-    test();
-    test();
-    IF( ( EQ_16( clas, VOICED_CLAS ) ) || ( EQ_16( clas, ONSET ) ) || ( EQ_16( clas, SIN_ONSET ) ) ) /* current frame is voiced */
-    {
-        /* current frame is voiced */
-        len = pitch;
-        move16(); /* pitch value at the end of frame */
-        pt_synth = synth;
-        if ( offset != 0 )
-        {
-            pt_synth = synth + sub( L_frame, len );
-        }
-        emaximum_fx( Q_new, pt_synth, len, enr_q );
-        IF( enc != 0 )
-        {
-            exp_enrq = norm_l( *enr_q );
-            *enr_q = L_shl( *enr_q, exp_enrq );
-            move32();
-            exp_enrq = sub( exp_enrq, 2 );
-        }
-    }
-    ELSE
-    {
-        /* current frame is unvoiced */
-        Word16 L_frame2, exp2, enr_q_tmp;
-
-        L_frame2 = shr( L_frame, 1 );
-        pos = 0;
-        move16();
-
-        if ( offset != 0 )
-        {
-            pos = sub( L_frame, L_frame2 );
-        }
-#ifdef BASOP_NOGLOB
-        Ltmp = L_mult_sat( synth[pos], synth[pos] ); /*2 * Qnew + 1*/
-#else
-        Ltmp = L_mult( synth[pos], synth[pos] );
-#endif
-        FOR( i = 1; i < L_frame2; i++ )
-        {
-#ifdef BASOP_NOGLOB
-            Ltmp = L_mac_sat( Ltmp, synth[pos + i], synth[pos + i] ); /*2 * Qnew + 1*/
-#else                                                                 /* BASOP_NOGLOB */
-            Ltmp = L_mac( Ltmp, synth[pos + i], synth[pos + i] );
-#endif
-        }
-        test();
-        IF( EQ_32( Ltmp, MAX_32 ) || enc != 0 )
-        {
-            /* scale down when overflow occurs */
-            *enr_q = Energy_scale( synth + pos, L_frame2, shift, &exp_enrq );
-            move32();
-        }
-        ELSE
-        {
-            shift = 0;
-            move16();
-            /* Normalize acc in Q31 (energy already calculated) */
-            pos = norm_l( Ltmp );
-            Ltmp = L_shl( Ltmp, pos );
-            exp_enrq = sub( 30, pos ); /* exponent = 0..30 */
-            *enr_q = Ltmp;
-            move32();
-        }
-
-        /* enr2 = 1.0f/L_FRAME2 * dot_product(synth, synth, L_FRAME2) */
-        exp_enrq = sub( exp_enrq, shl( shift, 1 ) );
-
-        IF( enc != 0 )
-        {
-            assert( L_frame == 256 || L_frame == 320 );
-
-            exp_tmp = add( shl( Q_new, 1 ), -2 + 7 ); /*  L_subfr == L_SUBFR */
-            exp_enrq = sub( exp_enrq, exp_tmp );
-            exp_enrq = sub( 31, exp_enrq );
-
-            IF( EQ_16( L_frame, 320 ) )
-            {
-                *enr_q = Mult_32_16( *enr_q, 26214 ); /*x 0.8 to get /160*/
-                move32();
-                i = norm_l( *enr_q );
-                *enr_q = L_shl( *enr_q, i );
-                move32();
-                exp_enrq = add( i, exp_enrq );
-            }
-        }
-        ELSE
-        {
-            exp_enrq = sub( exp_enrq, add( Q_new, Q_new ) );
-            enr_q_tmp /*Q30 exp2+exp_enrq*/ = BASOP_Util_Divide3216_Scale( *enr_q /*Q31*/, L_frame2 /*Q0*/, &exp2 );
-            *enr_q = L_shr( L_deposit_l( enr_q_tmp ), sub( 30, add( exp2, exp_enrq ) ) ); /*Q0*/
-            move32();
-            *enr_q = L_add( *enr_q, 1 );
-            move32();
-            exp_enrq = 0;
-            move16();
-        }
-    }
-
-    return exp_enrq;
-}
-
-/*------------------------------------------------------------------------*
- * frame_energy()
- *
- * Compute pitch-synchronous energy at the frame end
- *------------------------------------------------------------------------*/
-Word16 frame_energy_fx( /* o  : Frame energy in                               Q8 */
-                        Word16 L_frame,
-                        const Word16 *pitch,    /* i  : pitch values for each subframe                Q6 */
-                        const Word16 *speech,   /* i  : pointer to speech signal for E computation  Q_syn*/
-                        const Word16 lp_speech, /* i  : long term active speech energy average      Q8   */
-                        Word16 *frame_ener,     /* o  : pitch-synchronous energy at frame end       Q8   */
-                        const Word16 Q_syn      /* i  : Synthesis scaling                                */
-)
-{
-    Word32 Ltmp;
-    const Word16 *pt1;
-    Word16 tmp16, exp1, exp2, tmp1, tmp2;
-    Word16 len, enern;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-
-    /* len = (0.5f * (pitch[2]/64.0 + pitch[3]/64.0) + 0.5f) */
-#ifdef BASOP_NOGLOB
-    len = mult_r( add_o( pitch[2], pitch[3], &Overflow ), 256 );
-#else
-    len = mult_r( add( pitch[2], pitch[3] ), 256 );
-#endif
-
-    if ( LT_16( len, L_SUBFR ) )
-    {
-        len = shl( len, 1 );
-    }
-    pt1 = speech + sub( L_frame, len );
-
-    /* *frame_ener = 10.0f * log10(dot_product(pt1, pt1, len) / (float)len) */
-
-    tmp1 = norm_s( len );
-    tmp2 = shl( len, tmp1 );
-    tmp1 = sub( 15, tmp1 );
-
-    Ltmp = Dot_productSq16HQ( 0, pt1, len, &exp1 );
-    exp1 = sub( exp1, shl( Q_syn, 1 ) );
-    exp1 = sub( exp1, 1 ); /* compensation of leftshift caused by mac operation in dot_productSq16HQ */
-    tmp16 = BASOP_Util_Divide3216_Scale( Ltmp, len, &exp2 );
-
-    exp1 = add( exp1, exp2 );
-    exp1 = add( exp1, 1 ); /* compensate result of division Q-1 */
-
-
-    tmp2 = norm_s( tmp16 );
-    Ltmp = L_shl( L_deposit_h( tmp16 ), tmp2 ); /*Q16, (exp1-tmp2)  =  Q31, exp1-tmp2+15*/
-
-    Ltmp = BASOP_Util_Log2( Ltmp ); /*Q(31-6) = Q25*/
-    exp1 = sub( 15 + exp1, tmp2 );
-
-    /*add ld(2^exp1)=exp1 but check format, first*/
-    tmp16 = sub( sub( 15, norm_s( exp1 ) ), 5 ); /*factor to shift Ltmp and exp1 with (shr) to avoid overflows when adding*/
-#ifdef BASOP_NOGLOB
-    Ltmp = L_shr_o( Ltmp, tmp16, &Overflow ); /*Q25, tmp16*/
-#else
-    Ltmp = L_shr( Ltmp, tmp16 );                               /*Q25, tmp16*/
-#endif
-    exp2 = shr( exp1, tmp16 ); /*Q0 , tmp16*/
-#ifdef BASOP_NOGLOB
-    Ltmp = L_add_o( Ltmp, L_shl( L_deposit_l( exp2 ), 25 ), &Overflow ); /*Q25, tmp16, normalized*/
-#else
-    Ltmp = L_add( Ltmp, L_shl( L_deposit_l( exp2 ), 25 ) );    /*Q25, tmp16, normalized*/
-#endif
-
-    /*make 10*log10 out of log2*/
-    Ltmp = Mpy_32_16_1( Ltmp, LG10 ); /*Q25,tmp16 * Q13 = Q23, tmp16*/
-#ifdef BASOP_NOGLOB
-    *frame_ener = extract_h( L_shl_o( Ltmp, add( tmp16, 1 ), &Overflow ) ); /*Q8*/
-    move16();
-    enern = sub_o( *frame_ener, lp_speech, &Overflow ); /*Q8*/
-#else
-    *frame_ener = extract_h( L_shl( Ltmp, add( tmp16, 1 ) ) ); /*Q8*/
-    move16();
-    enern = sub( *frame_ener, lp_speech ); /*Q8*/
-#endif
-
-    return enern;
-}
diff --git a/lib_com/frame_ener_fx.c b/lib_com/frame_ener_fx.c
index e9075a02497f53a2a1858bf29e13a3a85b1b99ef..68fdf33c3a2db5ba8703f436ddc1e1043d17eef4 100644
--- a/lib_com/frame_ener_fx.c
+++ b/lib_com/frame_ener_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,9 +38,8 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 /*----------------------------------------------------------------------------------*
  * fer_energy()
  *
@@ -161,18 +160,10 @@ Word16 frame_ener_fx(
         {
             pos = sub( L_frame, L_frame2 );
         }
-#ifdef BASOP_NOGLOB
         Ltmp = L_mult_sat( synth[pos], synth[pos] ); /*2 * Qnew + 1*/
-#else
-        Ltmp = L_mult( synth[pos], synth[pos] );
-#endif
         FOR( i = 1; i < L_frame2; i++ )
         {
-#ifdef BASOP_NOGLOB
             Ltmp = L_mac_sat( Ltmp, synth[pos + i], synth[pos + i] ); /*2 * Qnew + 1*/
-#else                                                                 /* BASOP_NOGLOB */
-            Ltmp = L_mac( Ltmp, synth[pos + i], synth[pos + i] );
-#endif
         }
         test();
         IF( EQ_32( Ltmp, MAX_32 ) || enc != 0 )
@@ -255,11 +246,7 @@ Word16 frame_energy_fx( /* o  : Frame energy in                               Q8
 
 
     /* len = (0.5f * (pitch[2]/64.0 + pitch[3]/64.0) + 0.5f) */
-#ifdef BASOP_NOGLOB
     len = mult_r( add_o( pitch[2], pitch[3], &Overflow ), 256 );
-#else
-    len = mult_r( add( pitch[2], pitch[3] ), 256 );
-#endif
 
     if ( LT_16( len, L_SUBFR ) )
     {
@@ -289,30 +276,16 @@ Word16 frame_energy_fx( /* o  : Frame energy in                               Q8
     exp1 = sub( 15 + exp1, tmp2 );
 
     /*add ld(2^exp1)=exp1 but check format, first*/
-    tmp16 = sub( sub( 15, norm_s( exp1 ) ), 5 ); /*factor to shift Ltmp and exp1 with (shr) to avoid overflows when adding*/
-#ifdef BASOP_NOGLOB
-    Ltmp = L_shr_o( Ltmp, tmp16, &Overflow ); /*Q25, tmp16*/
-#else
-    Ltmp = L_shr( Ltmp, tmp16 );                               /*Q25, tmp16*/
-#endif
-    exp2 = shr( exp1, tmp16 ); /*Q0 , tmp16*/
-#ifdef BASOP_NOGLOB
+    tmp16 = sub( sub( 15, norm_s( exp1 ) ), 5 );                         /*factor to shift Ltmp and exp1 with (shr) to avoid overflows when adding*/
+    Ltmp = L_shr_o( Ltmp, tmp16, &Overflow );                            /*Q25, tmp16*/
+    exp2 = shr( exp1, tmp16 );                                           /*Q0 , tmp16*/
     Ltmp = L_add_o( Ltmp, L_shl( L_deposit_l( exp2 ), 25 ), &Overflow ); /*Q25, tmp16, normalized*/
-#else
-    Ltmp = L_add( Ltmp, L_shl( L_deposit_l( exp2 ), 25 ) );    /*Q25, tmp16, normalized*/
-#endif
 
     /*make 10*log10 out of log2*/
-    Ltmp = Mpy_32_16_1( Ltmp, LG10 ); /*Q25,tmp16 * Q13 = Q23, tmp16*/
-#ifdef BASOP_NOGLOB
+    Ltmp = Mpy_32_16_1( Ltmp, LG10 );                                       /*Q25,tmp16 * Q13 = Q23, tmp16*/
     *frame_ener = extract_h( L_shl_o( Ltmp, add( tmp16, 1 ), &Overflow ) ); /*Q8*/
     move16();
     enern = sub_o( *frame_ener, lp_speech, &Overflow ); /*Q8*/
-#else
-    *frame_ener = extract_h( L_shl( Ltmp, add( tmp16, 1 ) ) ); /*Q8*/
-    move16();
-    enern = sub( *frame_ener, lp_speech ); /*Q8*/
-#endif
 
     return enern;
 }
diff --git a/lib_com/get_gain.c b/lib_com/get_gain.c
deleted file mode 100644
index d222bd68d9f64dab5fc2c943f2220092ae65774a..0000000000000000000000000000000000000000
--- a/lib_com/get_gain.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*----------------------------------------------------------------------------------*
- *  get_gain()
- *
- *
- *----------------------------------------------------------------------------------*/
-
-#ifndef IVAS_FLOAT_FIXED
-/*! r: codebook gain (adaptive or fixed) */
-float get_gain_flt(
-    const float x[], /* i  : target signal                        */
-    const float y[], /* i  : filtered codebook excitation         */
-    const int16_t n, /* i  : segment length                       */
-    float *en_y      /* o  : energy of y (sum of y[]^2, optional) */
-)
-{
-    float corr = 0.0f, ener = 1e-6f;
-    int16_t i;
-
-    for ( i = 0; i < n; i++ )
-    {
-        corr += x[i] * y[i];
-        ener += y[i] * y[i];
-    }
-
-    if ( en_y )
-    {
-        *en_y = ener;
-    }
-
-    return ( corr / ener );
-}
-#endif
-
-Word32 get_gain(                   /* output: codebook gain (adaptive or fixed)   Q16 */
-                 const Word16 x[], /* input : target signal                       Qx  */
-                 const Word16 y[], /* input : filtered codebook excitation        Qx  */
-                 const Word16 n    /* input : segment length                          */
-)
-{
-    Word32 tcorr, tener, Lgain;
-    Word16 exp_c, exp_e, exp, tmp;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-
-    tcorr = L_deposit_l( 0 );
-    tener = L_deposit_l( 0 );
-
-
-    /*----------------------------------------------------------------*
-     * Find gain based on inter-correlation product
-     *----------------------------------------------------------------*/
-
-    tcorr = Dot_product16HQ( 0, x, y, n, &exp_c );
-    tener = Dot_productSq16HQ( 0, y, n, &exp_e );
-
-#ifdef BASOP_NOGLOB
-    BASOP_Util_Divide_MantExp( round_fx_o( tcorr, &Overflow ), exp_c, s_max( round_fx_o( tener, &Overflow ), 1 ), exp_e, &tmp, &exp );
-    Lgain = L_shl_o( L_deposit_l( tmp ) /*Q15*/, add( 1, exp ), &Overflow ) /*Q16*/;
-#else
-    BASOP_Util_Divide_MantExp( round_fx( tcorr ), exp_c, s_max( round_fx( tener ), 1 ), exp_e, &tmp, &exp );
-    Lgain = L_shl( L_deposit_l( tmp ) /*Q15*/, add( 1, exp ) ) /*Q16*/;
-#endif
-
-    return Lgain;
-}
-
-Word32 get_gain2(                   /* output: codebook gain (adaptive or fixed)   Q16 */
-                  const Word16 x[], /* input : target signal                        */
-                  const Word16 y[], /* input : filtered codebook excitation         */
-                  const Word16 n    /* input : segment length                       */
-)
-{
-    Word32 tcorr, tener, Lgain;
-    Word16 m_corr, m_ener, negative, Q_corr, Q_ener;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-    negative = 0;
-    move16();
-
-    /*----------------------------------------------------------------*
-     * Find gain based on inter-correlation product
-     *----------------------------------------------------------------*/
-    tcorr = Dot_product16HQ( 0, x, y, n, &Q_corr );
-    tener = Dot_productSq16HQ( 0, y, n, &Q_ener );
-
-    tener = L_max( tener, 1 );
-
-    if ( tcorr <= 0 )
-    {
-        negative = 1;
-        move16();
-    }
-    BASOP_SATURATE_WARNING_OFF_EVS /*tcorr max be negative maxvall -  not critical*/
-        tcorr = L_abs( tcorr );
-    BASOP_SATURATE_WARNING_ON_EVS
-
-    m_corr = extract_h( tcorr );
-
-    m_ener = extract_h( tener );
-
-    IF( GT_16( m_corr, m_ener ) )
-    {
-        m_corr = shr( m_corr, 1 );
-        Q_corr = add( Q_corr, 1 );
-    }
-    if ( m_ener == 0 )
-    {
-        move16();
-        m_corr = 0x7FFF;
-    }
-    IF( m_ener != 0 )
-    {
-        m_corr = div_s( m_corr, m_ener );
-    }
-
-    Q_corr = sub( Q_corr, Q_ener );
-
-#ifdef BASOP_NOGLOB
-    Lgain = L_shl_o( L_deposit_l( m_corr ), add( Q_corr, 1 ), &Overflow ); /* Lgain in Q16 */
-#else
-    Lgain = L_shl( L_deposit_l( m_corr ), add( Q_corr, 1 ) ); /* Lgain in Q16 */
-#endif
-
-    if ( negative != 0 )
-    {
-        Lgain = L_negate( Lgain ); /* Lgain in Q16 */
-    }
-
-
-    return Lgain;
-}
diff --git a/lib_com/get_gain_fx.c b/lib_com/get_gain_fx.c
index be4d063e75f103c5905a7d52f8cd3cde6d4eaa9d..8ec4f5a40314afa27263cb7a4a77d8a31dd8d53c 100644
--- a/lib_com/get_gain_fx.c
+++ b/lib_com/get_gain_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,9 +36,8 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 /*----------------------------------------------------------------------------------*
  *  get_gain()
@@ -71,13 +70,8 @@ Word32 get_gain(                   /* output: codebook gain (adaptive or fixed)
     tcorr = Dot_product16HQ( 0, x, y, n, &exp_c );
     tener = Dot_productSq16HQ( 0, y, n, &exp_e );
 
-#ifdef BASOP_NOGLOB
     BASOP_Util_Divide_MantExp( round_fx_o( tcorr, &Overflow ), exp_c, s_max( round_fx_o( tener, &Overflow ), 1 ), exp_e, &tmp, &exp );
     Lgain = L_shl_o( L_deposit_l( tmp ) /*Q15*/, add( 1, exp ), &Overflow ) /*Q16*/;
-#else
-    BASOP_Util_Divide_MantExp( round_fx( tcorr ), exp_c, s_max( round_fx( tener ), 1 ), exp_e, &tmp, &exp );
-    Lgain = L_shl( L_deposit_l( tmp ) /*Q15*/, add( 1, exp ) ) /*Q16*/;
-#endif
 
     return Lgain;
 }
@@ -136,11 +130,7 @@ Word32 get_gain2(                   /* output: codebook gain (adaptive or fixed)
 
     Q_corr = sub( Q_corr, Q_ener );
 
-#ifdef BASOP_NOGLOB
     Lgain = L_shl_o( L_deposit_l( m_corr ), add( Q_corr, 1 ), &Overflow ); /* Lgain in Q16 */
-#else
-    Lgain = L_shl( L_deposit_l( m_corr ), add( Q_corr, 1 ) ); /* Lgain in Q16 */
-#endif
 
     if ( negative != 0 )
     {
diff --git a/lib_com/gs_bitallocation_fx.c b/lib_com/gs_bitallocation_fx.c
index 5bd82fdab724b3e4a871d45e85d42b7ef077c81e..0ce59482f1f0a3de6ed59c06bf4b5065ccda3166 100644
--- a/lib_com/gs_bitallocation_fx.c
+++ b/lib_com/gs_bitallocation_fx.c
@@ -75,10 +75,8 @@ void bands_and_bit_alloc_fx(
     Word16 SWB_bit_budget;
     Word32 bits_per_bands[MBANDS_GN_BITALLOC16k];
     Word16 w_sum_bit;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) GSC_IVAS_mode;
     (void) element_mode;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
 #endif
@@ -95,12 +93,8 @@ void bands_and_bit_alloc_fx(
     set16_fx( out_bits_per_bands, 0, MBANDS_GN_BITALLOC16k );
 
     /* To adapt current energy band to PVQ freq band for sorting*/
-#ifdef BASOP_NOGLOB
     ener_vec[0] = add_o( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1], &Overflow ); /*Q12 */
-#else                                                                       /* BASOP_NOGLOB */
-    ener_vec[0] = add( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1] ); /*Q12 */
-#endif
-    Copy( Ener_per_bd_iQ_tmp + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */
+    Copy( Ener_per_bd_iQ_tmp + 1, ener_vec, MBANDS_GN - 1 );                /*Q12 */
     ener_vec[MBANDS_GN - 1] = ener_vec[MBANDS_GN - 2];
     move16();
     IF( EQ_16( L_frame, L_FRAME16k ) )
@@ -124,40 +118,7 @@ void bands_and_bit_alloc_fx(
     move16();
     bit_new_bands = 5;
     move16();
-#ifdef ADD_LRTD
-    if ( GT_32( core_brate, ACELP_16k40 ) && EQ_16( L_frame, L_FRAME16k ) )
-    {
-        bit_new_bands = 7;
-        move16();
-    }
-
-    i = 0;
-    move16();
-    WHILE( LT_16( i, SIZE_BRATE_INTERMED_TBL ) )
-    {
-        IF( LE_32( core_brate, brate_intermed_tbl[i] ) )
-        {
-            BREAK;
-        }
-
-        IF( EQ_32( brate_intermed_tbl[i], ACELP_24k40 ) )
-        {
-            BREAK;
-        }
-
-        i = add( i, 1 );
-    }
-
-    if ( GT_16( element_mode, EVS_MONO ) && EQ_16( coder_type, AUDIO ) &&
-         LE_32( core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation should be mapped to 8 kb/s instead of 9.6 kb/s in this case */
-    {
-        i = sub( i, 1 );
-    }
-
-    bit_index = i_mult2( BRATE2IDX_fx( brate_intermed_tbl[i] ), 17 );
-#else
     bit_index = i_mult2( BRATE2IDX_fx( core_brate ), 17 );
-#endif
     bit_index_mem = bit_index;
     move16();
 
@@ -193,668 +154,330 @@ void bands_and_bit_alloc_fx(
         move16();
     }
 
-#ifdef ADD_LRTD
-    if ( L_frame == L_FRAME16k )
+    IF( EQ_16( GSC_noisy_speech, 1 ) )
     {
-        *bit -= 8;
-    }
+        SWB_bit_budget = *bit;
+        move16();
+        nb_bands = 5;
+        move16();
 
-    if ( coder_type == INACTIVE && core_brate <= GSC_LRES_GAINQ_LIMIT ) /* can happen only for 2nd channel inactive */
-    {
-        *bit += GSC_LRES_NB_NITS;
-    }
+        st_band = nb_bands;
+        move16();
 
-    if ( *bit > 0 )
-    {
-        if ( GSC_IVAS_mode > 0 )
-        {
-            SWB_bit_budget = *bit;
-            st_band = 5;
+        set32_fx( bits_per_bands, 0, MBANDS_GN );
+        /*bit_fracf = (1.0f/nb_bands)*(SWB_bit_budget); */
+        bit_fracf = L_mult( div_s( 1, nb_bands ), shl( SWB_bit_budget, 2 ) ); /* Q18  */
 
-            set_f( bits_per_bands, 0, MBANDS_GN_BITALLOC16k );
+        nb_tot_bands = sub( nb_bands_max, 6 );
+        nb_tot_bands = s_min( nb_tot_bands, 16 );
 
-            /* 2- Decide the pourcentage of bits allocated to LF (between 50-75%) depending of the temporal contribution in GSC */
-            bit_fracf = ( -0.125f * Diff_len + 76.0f ) / 100;
-            bit_fracf = check_bounds( bit_fracf, 0.50f, 0.75f );
+        FOR( j = 0; j < 2; j++ )
+        {
+            i = j;
+            move16();
+            max_ener_band[j] = i;
+            move16();
+            ener_vec[i] = 0;
+            move16();
+        }
 
-            /* Adjusment of the bitrate between LF and HF base on the content type */
-            /* 1 = new GSC bit alloc
-               2 = GSC bit alloc for tc frame
-               3 = more music like (should not happen often given music is coded with dft) */
+        FOR( ; j < nb_bands; j++ )
+        {
+            i = maximum_fx( ener_vec, nb_tot_bands, &etmp );
+            max_ener_band[j] = i;
+            move16();
+            ener_vec[i] = 0;
+            move16();
+        }
 
-            if ( GSC_IVAS_mode <= 3 )
-            {
-                nb_bands_max -= 6;
-            }
+        set32_fx( bits_per_bands, bit_fracf, nb_bands );
+    }
+    ELSE
+    {
+        bit_index++;
+        bit_tmp = sub( *bit, GSC_freq_bits[bit_index] );
+        bit_index++;
+        nb_bands_max = add( nb_bands_max, GSC_freq_bits[bit_index] );
+        bit_index++;
 
-            if ( GSC_IVAS_mode == 2 )
-            {
-                bit_fracf += 0.1f;
-                nb_bands_max--;
-            }
+        *pvq_len = 112;
+        move16();
+        st_band = 7;
+        move16();
 
-            if ( GSC_IVAS_mode == 3 )
-            {
-                bit_fracf -= 0.1f;
-                nb_bands_max += 3;
-            }
+        IF( LE_32( core_brate, ACELP_9k60 ) )
+        {
+            *pvq_len = 80;
+            move16();
+            st_band = 5;
+            move16();
 
-            /* First find how much we want to share between LF and HF, at low bitrate, a miminum of bits is needed in LF by limitating the number of bands*/
-            /* Adjust the number of band based on the content type and bitrate */
-            nb_bands_adj = 1.0f;
-            if ( GSC_IVAS_mode == 1 && core_brate < GSC_L_RATE_STG )
-            {
-                nb_bands_adj = 0.0125f * SWB_bit_budget - 0.75f;
-            }
-            else if ( GSC_IVAS_mode != 2 && core_brate > GSC_H_RATE_STG )
+            IF( Diff_len == 0 )
             {
-                nb_bands_adj = 0.02f * SWB_bit_budget - 1.2f;
+                nb_bands_max = add( nb_bands_max, 2 );
+                bit_tmp = sub( bit_tmp, 13 );
             }
-            nb_bands_max = (int16_t) ( nb_bands_max * nb_bands_adj + 0.5f );
-            nb_bands_max = check_bounds_s( nb_bands_max, 5, nb_tot_bands );
+        }
 
-            bit_fracf *= SWB_bit_budget;
+        ELSE IF( Diff_len == 0 )
+        {
+            nb_bands_max = add( nb_bands_max, 2 );
+            bit_tmp = sub( bit_tmp, 17 );
+        }
 
-            /* Estimation of the number of bit used in HF */
-            /* with only the first weigthing The number of bits in max_ener_band[st_band-1] = 17% of bit_fracf */
-            mb = .17f * bit_fracf;
-            mp = ( 2.0f * DSR_NB_PULSE );
-            if ( core_brate < GSC_L_RATE_STG && GSC_IVAS_mode == 3 )
-            {
-                mp = 1.5f * DSR_NB_PULSE;
-            }
-            else if ( core_brate < GSC_L_RATE_STG )
+        nb_bands = shr( *pvq_len, 4 );
+
+        /*------------------------------------------------------------------------
+         * Ajustement of the maximum number of bands in function of the
+         * dynamics of the spectrum (more or less speech like)
+         *-----------------------------------------------------------------------*/
+        test();
+        test();
+        test();
+        test();
+        IF( EQ_16( coder_type, INACTIVE ) || GE_16( noise_lev, NOISE_LEVEL_SP3 ) )
+        {
+            /* Probably classification error -> concentrate bits on LF */
+            if ( GE_32( core_brate, ACELP_8k00 ) )
             {
-                mp = DSR_NB_PULSE;
+                nb_bands_max = add( nb_bands, 1 );
             }
-
-            /* We want  max_ener_band[st_band] <=  max_ener_band[st_band-1] and  max_ener_band[nb_bands_max-1] <=  max_ener_band[st_band]*/
-            /* We will estimate the number of bits to allocate of HF and put the remaining bits, if any, back on LF */
-            /* compute the total possible number of band to be coded */
-            nb_tot_bands = (int16_t) ( ( SWB_bit_budget - bit_fracf ) / ( mp + ( mb - mp ) / 2.0f ) );
-            mp = min( mp, mb );
-            if ( nb_tot_bands + st_band > nb_bands_max )
+            else
             {
-                bit_adj = ( ( mb + mp ) / 2 ) * ( nb_tot_bands + st_band - nb_bands_max );
-                bit_adj = max( 0, bit_adj );
-                nb_tot_bands = nb_bands_max - st_band;
-                bit_fracf += bit_adj;
+                nb_bands_max = nb_bands;
+                move16();
             }
-            nb_tot_bands += st_band;
+        }
+        ELSE IF( GE_16( noise_lev, NOISE_LEVEL_SP2 ) ||
+                 ( LE_32( core_brate, ACELP_13k20 ) && GE_32( core_brate, ACELP_9k60 ) && cor_strong_limit == 0 ) ) /* Very low dynamic, tend to speech, do not try to code HF at all */
+        {
+            nb_bands_max = sub( nb_bands_max, 2 );
+        }
+        ELSE IF( GE_16( noise_lev, NOISE_LEVEL_SP1 ) ) /* Very low dynamic, tend to speech, code less HF */
+        {
+            nb_bands_max = sub( nb_bands_max, 1 );
+        }
 
-            /* Allocate bits to LF */
-            etmp = 0.23f;
-            for ( j = 0; j < st_band; j++ )
-            {
-                i = j;
-                max_ener_band[j] = i;
-                ener_vec[i] = MIN16B;
-                bits_per_bands[j] = etmp * bit_fracf;
-                etmp -= 0.015f;
-            }
+        test();
+        if ( ( EQ_16( bwidth, NB ) ) && GT_16( nb_bands_max, 10 ) )
+        {
+            nb_bands_max = 10;
+            move16();
+        }
 
-            SWB_bit_budget -= bit_fracf;
+        /*------------------------------------------------------------------------
+         * Find extra number of band to code according to bit rate availables
+         *-----------------------------------------------------------------------*/
+        test();
+        WHILE( GE_16( bit_tmp, bit_new_bands ) && LE_16( nb_bands, sub( nb_bands_max, 1 ) ) )
+        {
+            test();
+            bit_tmp = sub( bit_tmp, bit_new_bands );
+            nb_bands = add( nb_bands, 1 );
+        }
 
-            /* Find low energy band in HF */
-            set_s( nb_pulse_per_band, 2, MBANDS_GN_BITALLOC16k );
-            for ( i = st_band + 2; i < nb_tot_bands - 1; i++ )
-            {
-                if ( ener_vec[i] < ener_vec[i - 1] && ener_vec[i] < ener_vec[i + 1] )
-                {
-                    nb_pulse_per_band[i] = 1;
-                }
-            }
-            for ( j = st_band; j < nb_tot_bands; j++ )
-            {
-                if ( j > 6 )
-                {
-                    i = maximum( ener_vec, nb_tot_bands, &etmp );
-                }
-                else
-                {
-                    i = j;
-                }
+        /*------------------------------------------------------------------------
+         * Fractional bits to distribute on the first x bands
+         *-----------------------------------------------------------------------*/
 
-                max_ener_band[j] = i;
-                ener_vec[i] = MIN16B;
-            }
+        {
+            bit_fracf = L_mult( div_s( 1, st_band ), shl( bit_tmp, 2 ) ); /* Q18  */
+        }
+        /*------------------------------------------------------------------------
+         * Complete the bit allocation per frequency band
+         *-----------------------------------------------------------------------*/
+        imax = 5;
+        move16();
 
-            /* Recompute the final bit distribution for HF */
-            if ( nb_tot_bands > st_band )
-            {
-                bit_fracf = DSR_NB_PULSE;
-                mb = ( SWB_bit_budget * 2 / ( nb_tot_bands - st_band ) ) - mp;
-                bit_fracf = ( mb - mp ) / ( nb_tot_bands - st_band );
-                mb -= bit_fracf;
-                /* Do the distribution */
-                for ( j = st_band; j < nb_tot_bands; j++ )
-                {
-                    if ( nb_pulse_per_band[max_ener_band[j]] > 1 )
-                    {
-                        bits_per_bands[max_ener_band[j]] = mb;
-                    }
-                    else
-                    {
-                        bits_per_bands[max_ener_band[j]] = 4.5f;
-                    }
-                    mb -= bit_fracf;
-                    SWB_bit_budget -= bits_per_bands[max_ener_band[j]];
-                }
-            }
+        if ( GT_32( core_brate, ACELP_9k60 ) )
+        {
+            imax = 7;
+            move16();
+        }
+        FOR( i = 0; i < imax; i++ )
+        {
+            bits_per_bands[i] = L_add( GSC_freq_bits_fx[bit_index], bit_fracf );
+            move32(); /* Q18 */
+            bit_index = add( bit_index, 1 );
+        }
 
-            /* Series of verification in case bit allocated != the budget */
-            if ( SWB_bit_budget > 0 )
+        IF( Diff_len == 0 )
+        {
+            bit_index = add( bit_index_mem, 10 );
+            FOR( i = 0; i < 7; i++ )
             {
-                i = st_band - 1;
-                while ( SWB_bit_budget > 0 )
-                {
-                    bits_per_bands[i]++;
-                    SWB_bit_budget--;
-                    i--;
-                    if ( i == -1 )
-                    {
-                        i = st_band - 1;
-                    }
-                }
+                bits_per_bands[i] = L_add( bits_per_bands[i], GSC_freq_bits_fx[bit_index] );
+                move32(); /*chk Q18 */
+                bit_index = add( bit_index, 1 );
             }
+        }
 
-            nb_bands = nb_tot_bands;
-
-            sum_bit = 0;
-            j = 0;
-            for ( i = 0; i < nb_bands; i++ )
-            {
-                if ( bits_per_bands[i] > 112 )
-                {
-                    sum_bit += bits_per_bands[i] - 112;
-                    bits_per_bands[i] = 112;
-                    j = i + 1;
-                }
-
-                /* safety check for overage bit reallocation */
-                else if ( bits_per_bands[i] + sum_bit / 3 > 112 )
-                {
-                    j = i + 1;
-                }
-            }
+        /*--------------------------------------------------------------------------
+         * Complete the bit allocation per frequency band for 16kHz high brate mode
+         *--------------------------------------------------------------------------*/
 
-            if ( sum_bit != 0 )
+        {
+            FOR( j = st_band; j < nb_bands; j++ )
             {
-                sum_bit /= ( nb_bands - j );
-                for ( i = j; i < nb_bands; i++ )
-                {
-                    bits_per_bands[i] += sum_bit;
-                }
+                bits_per_bands[j] = L_shl( bit_new_bands, 18 );
+                move32(); /*chk Q18 */
             }
         }
-        else
-#endif
-            IF( EQ_16( GSC_noisy_speech, 1 ) )
-            {
-                SWB_bit_budget = *bit;
-                move16();
-                nb_bands = 5;
-                move16();
-
-#ifdef ADD_LRTD
 
-                fzero_val = 0.0f;
-                if ( element_mode > EVS_MONO )
-                {
-                    fzero_val = MIN16B_FLT;
-                }
-
-                if ( coder_type == UNVOICED && element_mode > EVS_MONO )
-                {
-                    nb_bands = 3;
-                    if ( SWB_bit_budget > 20 )
-                    {
-                        nb_bands = 5;
-                    }
-                }
-                else if ( bwidth < SWB )
-                {
-                    nb_bands = 7;
-                }
-
-#endif
+        /*--------------------------------------------------------------------------
+         * Compute a maximum band (band offset) for the search on maximal energy
+         * This is function of the spectral dynamic and the bitrate
+         *--------------------------------------------------------------------------*/
 
-                st_band = nb_bands;
-                move16();
+        bandoffset = sub( nb_tot_bands, add( nb_bands, 2 ) );
 
-                set32_fx( bits_per_bands, 0, MBANDS_GN );
-                /*bit_fracf = (1.0f/nb_bands)*(SWB_bit_budget); */
-                bit_fracf = L_mult( div_s( 1, nb_bands ), shl( SWB_bit_budget, 2 ) ); /* Q18  */
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( LE_16( noise_lev, NOISE_LEVEL_SP1a ) )
+        {
+            bandoffset = sub( bandoffset, 1 );
+        }
+        ELSE IF( ( LE_32( core_brate, ACELP_13k20 ) && ( EQ_16( coder_type, INACTIVE ) || GE_16( noise_lev, NOISE_LEVEL_SP3 ) ) ) ||
+                 ( LE_32( core_brate, ACELP_13k20 ) && GE_32( core_brate, ACELP_9k60 ) && cor_strong_limit == 0 ) )
+        {
+            bandoffset = add( bandoffset, 1 );
+        }
 
-                nb_tot_bands = sub( nb_bands_max, 6 );
-                nb_tot_bands = s_min( nb_tot_bands, 16 );
+        bandoffset = s_max( bandoffset, 0 );
 
-                FOR( j = 0; j < 2; j++ )
-                {
-                    i = j;
-                    move16();
-                    max_ener_band[j] = i;
-                    move16();
-                    ener_vec[i] = 0;
-                    move16();
-                }
-#ifdef ADD_LRTD
-                if ( bwidth < SWB )
-                {
-                    if ( coder_type == UNVOICED && element_mode > EVS_MONO )
-                    {
-                        nb_tot_bands = 5;
-                    }
-#endif
-                    FOR( ; j < nb_bands; j++ )
-                    {
-                        i = maximum_fx( ener_vec, nb_tot_bands, &etmp );
-                        max_ener_band[j] = i;
-                        move16();
-                        ener_vec[i] = 0;
-                        move16();
-                    }
-#ifdef ADD_LRTD
-                }
-                else
-                {
-                    for ( ; j < nb_bands; j++ )
-                    {
-                        i = maximum( ener_vec, nb_tot_bands, &etmp );
-                        max_ener_band[j] = i;
-                        ener_vec[i] = fzero_val;
-                    }
-                }
-#endif
-                set32_fx( bits_per_bands, bit_fracf, nb_bands );
-            }
-        ELSE
+        /*--------------------------------------------------------------------------
+         * Initiazed sorted vector
+         * For the first x bands to be included in th final sorted vector
+         * Sort the remaining bands in decrease energy order
+         *--------------------------------------------------------------------------*/
+        FOR( j = 0; j < nb_tot_bands; j++ )
         {
-            bit_index++;
-            bit_tmp = sub( *bit, GSC_freq_bits[bit_index] );
-            bit_index++;
-            nb_bands_max = add( nb_bands_max, GSC_freq_bits[bit_index] );
-            bit_index++;
-
-            *pvq_len = 112;
+            max_ener_band[j] = -10;
             move16();
-            st_band = 7;
+        }
+        FOR( j = 0; j < st_band; j++ )
+        {
+            max_ener_band[j] = j;
             move16();
-#ifdef ADD_LRTD
-            if ( L_frame == L_FRAME16k && core_brate > ACELP_16k40 )
-            {
-                *pvq_len = 160;
-                st_band = 10;
-                nb_bands = *pvq_len / 16;
-                bit_tmp -= 35;
-                bit_new_bands = 5;
-            }
-#endif
-            IF( LE_32( core_brate, ACELP_9k60 ) )
-            {
-                *pvq_len = 80;
-                move16();
-                st_band = 5;
-                move16();
-
-                IF( Diff_len == 0 )
-                {
-                    nb_bands_max = add( nb_bands_max, 2 );
-                    bit_tmp = sub( bit_tmp, 13 );
-                }
-            }
-
-            ELSE IF( Diff_len == 0 )
-            {
-                nb_bands_max = add( nb_bands_max, 2 );
-                bit_tmp = sub( bit_tmp, 17 );
-            }
-
-            nb_bands = shr( *pvq_len, 4 );
-#ifdef ADD_LRTD
-            nb_bands_max = min( nb_bands_max, MBANDS_GN_BITALLOC16k );
-#endif
-            /*------------------------------------------------------------------------
-             * Ajustement of the maximum number of bands in function of the
-             * dynamics of the spectrum (more or less speech like)
-             *-----------------------------------------------------------------------*/
-            test();
-            test();
-            test();
-            test();
-            IF( EQ_16( coder_type, INACTIVE ) || GE_16( noise_lev, NOISE_LEVEL_SP3 ) )
-            {
-                /* Probably classification error -> concentrate bits on LF */
-#ifdef ADD_LRTD
-                if ( L_frame == L_FRAME16k && core_brate >= ACELP_24k40 )
-                {
-                    nb_bands_max = nb_tot_bands - 2;
-                }
-                else if ( core_brate >= ACELP_16k40 )
-                {
-                    nb_bands_max = nb_bands + 2;
-                }
-                else
-#endif
-                    if ( GE_32( core_brate, ACELP_8k00 ) )
-                {
-                    nb_bands_max = add( nb_bands, 1 );
-                }
-                else
-                {
-                    nb_bands_max = nb_bands;
-                    move16();
-                }
-            }
-            ELSE IF( GE_16( noise_lev, NOISE_LEVEL_SP2 ) ||
-                     ( LE_32( core_brate, ACELP_13k20 ) && GE_32( core_brate, ACELP_9k60 ) && cor_strong_limit == 0 ) ) /* Very low dynamic, tend to speech, do not try to code HF at all */
-            {
-                nb_bands_max = sub( nb_bands_max, 2 );
-            }
-            ELSE IF( GE_16( noise_lev, NOISE_LEVEL_SP1 ) ) /* Very low dynamic, tend to speech, code less HF */
-            {
-                nb_bands_max = sub( nb_bands_max, 1 );
-            }
-#ifdef ADD_LRTD
-            if ( L_frame == L_FRAME16k )
-            {
-                if ( core_brate < ACELP_24k40 )
-                {
-                    nb_bands_max -= 4;
-                }
-                else if ( core_brate < ACELP_32k )
-                {
-                    if ( Diff_len > 0 || noise_lev >= NOISE_LEVEL_SP2 )
-                    {
-                        nb_bands_max -= 2;
-                        bit_new_bands *= 2;
-                    }
-                }
-                else if ( core_brate >= ACELP_32k )
-                {
-                    bit_new_bands *= 2;
-                }
-            }
-
-#endif
-            test();
-            if ( ( EQ_16( bwidth, NB ) ) && GT_16( nb_bands_max, 10 ) )
-            {
-                nb_bands_max = 10;
-                move16();
-            }
-
-            /*------------------------------------------------------------------------
-             * Find extra number of band to code according to bit rate availables
-             *-----------------------------------------------------------------------*/
-            test();
-            WHILE( GE_16( bit_tmp, bit_new_bands ) && LE_16( nb_bands, sub( nb_bands_max, 1 ) ) )
-            {
-                test();
-                bit_tmp = sub( bit_tmp, bit_new_bands );
-                nb_bands = add( nb_bands, 1 );
-            }
-
-            /*------------------------------------------------------------------------
-             * Fractional bits to distribute on the first x bands
-             *-----------------------------------------------------------------------*/
-#ifdef ADD_LRTD
-            if ( L_frame == L_FRAME16k && core_brate > ACELP_32k )
-            {
-                bit_fracf = 0;
-            }
-            else
-#endif
-            {
-                bit_fracf = L_mult( div_s( 1, st_band ), shl( bit_tmp, 2 ) ); /* Q18  */
-            }
-            /*------------------------------------------------------------------------
-             * Complete the bit allocation per frequency band
-             *-----------------------------------------------------------------------*/
-            imax = 5;
+            ener_vec[j] = -10;
             move16();
+        }
+        pos = st_band;
+        move16();
+        FOR( ; j < nb_bands; j++ )
+        {
+            i = maximum_fx( ener_vec, sub( nb_tot_bands, bandoffset ), &etmp );
+            pos = s_max( pos, i );
+            max_ener_band[j] = i;
+            move16();
+            ener_vec[i] = -10;
+            move16();
+        }
 
-            if ( GT_32( core_brate, ACELP_9k60 ) )
+        /* re-allocate bits to the frames such that the highest band with allocated bits is higher than the threshold */
+        test();
+        test();
+        test();
+        IF( GT_16( sub( nb_tot_bands, bandoffset ), nb_bands ) && ( GT_16( pos, 7 ) && EQ_32( core_brate, ACELP_8k00 ) ) && EQ_16( bwidth, WB ) )
+        {
+            band = sub( nb_tot_bands, add( bandoffset, nb_bands ) );
+            FOR( j = 0; j < band; j++ )
             {
-                imax = 7;
+                i = maximum_fx( ener_vec, sub( nb_tot_bands, bandoffset ), &etmp );
+                max_ener_band[add( nb_bands, j )] = i;
                 move16();
+                ener_vec[i] = -10;
+                move16();
+                bits_per_bands[add( nb_bands, j )] = 1310720;
+                move32(); /*Q18 */
             }
-            FOR( i = 0; i < imax; i++ )
-            {
-                bits_per_bands[i] = L_add( GSC_freq_bits_fx[bit_index], bit_fracf );
-                move32(); /* Q18 */
-                bit_index = add( bit_index, 1 );
-            }
-#ifdef ADD_LRTD
-            if ( L_frame == L_FRAME16k && core_brate > ACELP_16k40 )
-            {
-                bit_index = 0;
-                i = imax - 1;
-                bits_per_bands[i] += Compl_GSC_freq_bits[bit_index];
-                i++;
-                bit_index++;
+            nb_bands = add( nb_bands, band );
 
-                for ( ; i < 10; i++ )
-                {
-                    bits_per_bands[i] += Compl_GSC_freq_bits[bit_index] + bit_fracf;
-                    bit_index++;
-                }
-            }
-#endif
-            IF( Diff_len == 0 )
-            {
-                bit_index = add( bit_index_mem, 10 );
-                FOR( i = 0; i < 7; i++ )
-                {
-                    bits_per_bands[i] = L_add( bits_per_bands[i], GSC_freq_bits_fx[bit_index] );
-                    move32(); /*chk Q18 */
-                    bit_index = add( bit_index, 1 );
-                }
-            }
-#ifdef ADD_LRTD
-            if ( bit_fracf < 0 )
-            {
-                for ( j = 0; j < nb_tot_bands; j++ )
-                {
-                    bits_per_bands[j] = max( bits_per_bands[j], 0 );
-                }
-            }
+            bit_tmp = i_mult2( band, 5 );
 
-#endif
-            /*--------------------------------------------------------------------------
-             * Complete the bit allocation per frequency band for 16kHz high brate mode
-             *--------------------------------------------------------------------------*/
-#ifdef ADD_LRTD
-            if ( L_frame == L_FRAME16k && core_brate > ACELP_32k )
+            IF( LE_16( band, 2 ) )
             {
-                for ( j = st_band; j < nb_bands; j++ )
+                FOR( j = sub( st_band, 1 ); j < nb_bands; j++ )
                 {
-                    bits_per_bands[j] = bit_new_bands;
+                    bits_per_bands[j] = L_add( bits_per_bands[j], 262144 ); /*Q18 */
+                    move32();
                 }
-
-                bit_fracf = ( 1.0f / nb_bands ) * ( bit_tmp );
-
-                etmp = 2.0f * bit_fracf / ( nb_bands + 1 );
-                bit_fracf = etmp;
-                for ( j = nb_bands - 1; j >= 0; j-- )
-                {
-                    bits_per_bands[j] += etmp;
-                    etmp += bit_fracf;
-                }
-            }
-            else
-#endif
-            {
-                FOR( j = st_band; j < nb_bands; j++ )
-                {
-                    bits_per_bands[j] = L_shl( bit_new_bands, 18 );
-                    move32(); /*chk Q18 */
-                }
-            }
-
-            /*--------------------------------------------------------------------------
-             * Compute a maximum band (band offset) for the search on maximal energy
-             * This is function of the spectral dynamic and the bitrate
-             *--------------------------------------------------------------------------*/
-
-            bandoffset = sub( nb_tot_bands, add( nb_bands, 2 ) );
-
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( LE_16( noise_lev, NOISE_LEVEL_SP1a ) )
-            {
-                bandoffset = sub( bandoffset, 1 );
-            }
-            ELSE IF( ( LE_32( core_brate, ACELP_13k20 ) && ( EQ_16( coder_type, INACTIVE ) || GE_16( noise_lev, NOISE_LEVEL_SP3 ) ) ) ||
-                     ( LE_32( core_brate, ACELP_13k20 ) && GE_32( core_brate, ACELP_9k60 ) && cor_strong_limit == 0 ) )
-            {
-                bandoffset = add( bandoffset, 1 );
+                bit_tmp = add( bit_tmp, add( sub( nb_bands, st_band ), 1 ) );
             }
 
-            bandoffset = s_max( bandoffset, 0 );
-
-            /*--------------------------------------------------------------------------
-             * Initiazed sorted vector
-             * For the first x bands to be included in th final sorted vector
-             * Sort the remaining bands in decrease energy order
-             *--------------------------------------------------------------------------*/
-            FOR( j = 0; j < nb_tot_bands; j++ )
-            {
-                max_ener_band[j] = -10;
-                move16();
-            }
-            FOR( j = 0; j < st_band; j++ )
-            {
-                max_ener_band[j] = j;
-                move16();
-                ener_vec[j] = -10;
-                move16();
-            }
-            pos = st_band;
+            i = 0;
             move16();
-            FOR( ; j < nb_bands; j++ )
-            {
-                i = maximum_fx( ener_vec, sub( nb_tot_bands, bandoffset ), &etmp );
-                pos = s_max( pos, i );
-                max_ener_band[j] = i;
-                move16();
-                ener_vec[i] = -10;
-                move16();
-            }
-
-            /* re-allocate bits to the frames such that the highest band with allocated bits is higher than the threshold */
-            test();
-            test();
-            test();
-            IF( GT_16( sub( nb_tot_bands, bandoffset ), nb_bands ) && ( GT_16( pos, 7 ) && EQ_32( core_brate, ACELP_8k00 ) ) && EQ_16( bwidth, WB ) )
+            j = 0;
+            move16();
+            FOR( ; bit_tmp > 0; bit_tmp-- )
             {
-                band = sub( nb_tot_bands, add( bandoffset, nb_bands ) );
-                FOR( j = 0; j < band; j++ )
+                bits_per_bands[j] = L_sub( bits_per_bands[j], 262144 ); /*Q18 */
+                j = add( j, 1 );
+                if ( EQ_16( j, sub( st_band, i ) ) )
                 {
-                    i = maximum_fx( ener_vec, sub( nb_tot_bands, bandoffset ), &etmp );
-                    max_ener_band[add( nb_bands, j )] = i;
+                    j = 0;
                     move16();
-                    ener_vec[i] = -10;
-                    move16();
-                    bits_per_bands[add( nb_bands, j )] = 1310720;
-                    move32(); /*Q18 */
-                }
-                nb_bands = add( nb_bands, band );
-
-                bit_tmp = i_mult2( band, 5 );
-
-                IF( LE_16( band, 2 ) )
-                {
-                    FOR( j = sub( st_band, 1 ); j < nb_bands; j++ )
-                    {
-                        bits_per_bands[j] = L_add( bits_per_bands[j], 262144 ); /*Q18 */
-                        move32();
-                    }
-                    bit_tmp = add( bit_tmp, add( sub( nb_bands, st_band ), 1 ) );
                 }
-
-                i = 0;
-                move16();
-                j = 0;
-                move16();
-                FOR( ; bit_tmp > 0; bit_tmp-- )
+                test();
+                if ( j == 0 && LT_16( i, sub( st_band, 1 ) ) )
                 {
-                    bits_per_bands[j] = L_sub( bits_per_bands[j], 262144 ); /*Q18 */
-                    j = add( j, 1 );
-                    if ( EQ_16( j, sub( st_band, i ) ) )
-                    {
-                        j = 0;
-                        move16();
-                    }
-                    test();
-                    if ( j == 0 && LT_16( i, sub( st_band, 1 ) ) )
-                    {
-                        i = add( i, 1 );
-                    }
+                    i = add( i, 1 );
                 }
             }
         }
-        /*--------------------------------------------------------------------------
-         * Bit sum verification for GSC inactive at very high rate
-         * The maximum number of bits per band of length 16 is 112
-         * Redistribute the overage bits if needed
-         *--------------------------------------------------------------------------*/
-        sum_bit = 0;
-        move16();
-        j = 0;
-        move16();
-        FOR( i = 0; i < nb_bands; i++ )
-        {
-            L_tmp = Mult_32_16( sum_bit, 10923 );
-
-            IF( GT_32( bits_per_bands[i], 29360128 ) ) /* 112 in Q18 */
-            {
-                sum_bit = L_add( sum_bit, L_sub( bits_per_bands[i], 29360128 ) ); /* Q18 */
-                bits_per_bands[i] = 29360128;
-                move32();
-                j = add( i, 1 );
-            }
-            ELSE IF( GT_32( L_add( bits_per_bands[i], L_tmp ), 29360128 ) ) /* Q18 */
-            {
-                j = add( i, 1 );
-            }
-        }
+    }
+    /*--------------------------------------------------------------------------
+     * Bit sum verification for GSC inactive at very high rate
+     * The maximum number of bits per band of length 16 is 112
+     * Redistribute the overage bits if needed
+     *--------------------------------------------------------------------------*/
+    sum_bit = 0;
+    move16();
+    j = 0;
+    move16();
+    FOR( i = 0; i < nb_bands; i++ )
+    {
+        L_tmp = Mult_32_16( sum_bit, 10923 );
 
-        IF( sum_bit != 0 )
-        {
-            tmp = sub( nb_bands, j );
-            sum_bit = Mult_32_16( sum_bit, div_s( 1, tmp ) ); /* Q18 */
-            FOR( i = j; i < nb_bands; i++ )
-            {
-                bits_per_bands[i] = L_add( bits_per_bands[i], sum_bit );
-                move32(); /* Q18 */
-            }
-        }
-        /*--------------------------------------------------------------------------
-         * second step of bit sum verification, normally sum_bit == *bit
-         *--------------------------------------------------------------------------*/
-        w_sum_bit = 0;
-        move16();
-        FOR( i = 0; i < nb_bands; i++ )
+        IF( GT_32( bits_per_bands[i], 29360128 ) ) /* 112 in Q18 */
         {
-            out_bits_per_bands[i] = shl( extract_l( L_shr( bits_per_bands[i], 18 ) ), 3 );
-            move16();
-            w_sum_bit = add( w_sum_bit, out_bits_per_bands[i] ); /* Q3 */
+            sum_bit = L_add( sum_bit, L_sub( bits_per_bands[i], 29360128 ) ); /* Q18 */
+            bits_per_bands[i] = 29360128;
+            move32();
+            j = add( i, 1 );
         }
-        tmp = shl( *bit, 3 );
-#ifdef ADD_LRTD
-        if ( GSC_IVAS_mode != 0 && sum_bit < *bit ) /* If we need to add bits, we are doing it on the LF */
+        ELSE IF( GT_32( L_add( bits_per_bands[i], L_tmp ), 29360128 ) ) /* Q18 */
         {
-            reajust_bits( bits_per_bands, 0, nb_bands, (int16_t) sum_bit, *bit );
+            j = add( i, 1 );
         }
-        else
+    }
+
+    IF( sum_bit != 0 )
+    {
+        tmp = sub( nb_bands, j );
+        sum_bit = Mult_32_16( sum_bit, div_s( 1, tmp ) ); /* Q18 */
+        FOR( i = j; i < nb_bands; i++ )
         {
-            reajust_bits( bits_per_bands, nb_bands - 1, 0, (int16_t) sum_bit, *bit );
+            bits_per_bands[i] = L_add( bits_per_bands[i], sum_bit );
+            move32(); /* Q18 */
         }
-#else
+    }
+    /*--------------------------------------------------------------------------
+     * second step of bit sum verification, normally sum_bit == *bit
+     *--------------------------------------------------------------------------*/
+    w_sum_bit = 0;
+    move16();
+    FOR( i = 0; i < nb_bands; i++ )
+    {
+        out_bits_per_bands[i] = shl( extract_l( L_shr( bits_per_bands[i], 18 ) ), 3 );
+        move16();
+        w_sum_bit = add( w_sum_bit, out_bits_per_bands[i] ); /* Q3 */
+    }
+    tmp = shl( *bit, 3 );
+
     IF( GT_16( tmp, w_sum_bit ) )
     {
         i = sub( nb_bands, 1 );
@@ -870,88 +493,24 @@ void bands_and_bit_alloc_fx(
             }
         }
     }
-#endif
-        /*--------------------------------------------------------------------------
-         * Recompute the real number/length of frequency bands to encode
-         *--------------------------------------------------------------------------*/
-        *nb_subbands = nb_bands;
-        move16();
-        *pvq_len = shl( *nb_subbands, 4 );
 
-        /*--------------------------------------------------------------------------
-         * Concatenate bands (encoder only)
-         *--------------------------------------------------------------------------*/
-        IF( exc_diff != NULL )
-        {
-            FOR( j = 0; j < nb_bands; j++ )
-            {
-                Copy( exc_diff + shl( max_ener_band[j], 4 ), concat_in + shl( j, 4 ), 16 );
-            }
-        }
-#ifdef ADD_LRTD
-    }
-    else /* *bit == 0 */
-    {
-        set_s( bits_per_bands_s, 0, nb_tot_bands );
-        *nb_subbands = 0;
-        *pvq_len = 0;
-    }
-#endif
-    return;
-}
-#ifdef ADD_LRTD
-/*-------------------------------------------------------------------*
- * reajust_bits()
- *
- *
- *-------------------------------------------------------------------*/
-
-static void reajust_bits(
-    float *bits_per_bands,
-    const int16_t st_band,
-    const int16_t end_band,
-    const int16_t sum_bit_in,
-    const int16_t bit_bdgt_in )
-{
-    int16_t i, amount_to_add, incr;
-    int16_t bit_bdgt, sum_bit;
-
-    incr = 1;
-    if ( end_band < st_band )
-    {
-        incr = -1;
-    }
-
-    if ( bit_bdgt_in < sum_bit_in )
-    {
-        amount_to_add = -1;
-        bit_bdgt = sum_bit_in;
-        sum_bit = bit_bdgt_in;
-    }
-    else
-    {
-        bit_bdgt = bit_bdgt_in;
-        sum_bit = sum_bit_in;
-        amount_to_add = 1;
-    }
+    /*--------------------------------------------------------------------------
+     * Recompute the real number/length of frequency bands to encode
+     *--------------------------------------------------------------------------*/
+    *nb_subbands = nb_bands;
+    move16();
+    *pvq_len = shl( *nb_subbands, 4 );
 
-    i = st_band;
-    while ( bit_bdgt > sum_bit )
+    /*--------------------------------------------------------------------------
+     * Concatenate bands (encoder only)
+     *--------------------------------------------------------------------------*/
+    IF( exc_diff != NULL )
     {
-        if ( amount_to_add > 0 || ( amount_to_add < 0 && bits_per_bands[i] > 1 ) )
+        FOR( j = 0; j < nb_bands; j++ )
         {
-            bits_per_bands[i] += amount_to_add;
-            sum_bit += (int16_t) abs( amount_to_add );
-        }
-
-        i += incr;
-        if ( i == end_band )
-        {
-            i = st_band;
+            Copy( exc_diff + shl( max_ener_band[j], 4 ), concat_in + shl( j, 4 ), 16 );
         }
     }
 
     return;
 }
-
-#endif
diff --git a/lib_com/gs_bitallocation_ivas_fx.c b/lib_com/gs_bitallocation_ivas_fx.c
index 787d562c74404faf382b0a45929405c3fe75ceed..9243f640e890348f577688a0dc77aff03e10a148 100644
--- a/lib_com/gs_bitallocation_ivas_fx.c
+++ b/lib_com/gs_bitallocation_ivas_fx.c
@@ -2,13 +2,11 @@
     EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
   ====================================================================================*/
 #include <stdint.h>
-#include "options.h"   /* Compilation switches                   */
-#include "cnst.h"      /* Common constants                       */
-#include "rom_com.h"   /* Static table prototypes                */
-#include "prot.h"      /* Function prototypes                    */
-#include "prot_fx.h"   /* Function prototypes                    */
-#include "ivas_prot.h" /* Function prototypes                    */
-#include "assert.h"    /* Debug prototypes                       */
+#include "options.h" /* Compilation switches                   */
+#include "cnst.h"    /* Common constants                       */
+#include "rom_com.h" /* Static table prototypes                */
+#include "prot_fx.h" /* Function prototypes                    */
+#include "assert.h"  /* Debug prototypes                       */
 #include "stl.h"
 #include "ivas_prot_fx.h"
 
@@ -103,8 +101,8 @@ void bands_and_bit_alloc_ivas_fx(
     Word16 etmp;
     Word16 tmp;
     Word16 pos, band;
-    Word32 SWB_bit_budget;                        // Q0 -> Q18
-    Word32 bits_per_bands[MBANDS_GN_BITALLOC16k]; // Q18
+    Word32 SWB_bit_budget;                        /* Q0 -> Q18 */
+    Word32 bits_per_bands[MBANDS_GN_BITALLOC16k]; /* Q18 */
     Word16 w_sum_bit;
     Word16 fzero_val;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
@@ -122,11 +120,7 @@ void bands_and_bit_alloc_ivas_fx(
     set16_fx( out_bits_per_bands, 0, MBANDS_GN_BITALLOC16k );
 
     /* To adapt current energy band to PVQ freq band for sorting*/
-#ifdef BASOP_NOGLOB
     ener_vec[0] = add_o( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1], &Overflow ); /*Q12 */
-#else                                                                       /* BASOP_NOGLOB */
-    ener_vec[0] = add( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1] ); /*Q12 */
-#endif
     move16();
     Copy( Ener_per_bd_iQ + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */
     ener_vec[MBANDS_GN - 1] = ener_vec[MBANDS_GN - 2];
@@ -152,7 +146,7 @@ void bands_and_bit_alloc_ivas_fx(
     move16();
     bit_new_bands = 5;
     move16();
-#if 1 // def ADD_LRTD
+
     test();
     if ( GT_32( core_brate, ACELP_16k40 ) && EQ_16( L_frame, L_FRAME16k ) )
     {
@@ -187,9 +181,6 @@ void bands_and_bit_alloc_ivas_fx(
     }
 
     bit_index = i_mult2( BRATE2IDX_fx( brate_intermed_tbl[i] ), 17 );
-#else
-    bit_index = i_mult2( BRATE2IDX_fx( core_brate ), 17 );
-#endif
     bit_index_mem = bit_index;
     move16();
 
@@ -225,7 +216,6 @@ void bands_and_bit_alloc_ivas_fx(
         move16();
     }
 
-#if 1 // def ADD_LRTD
     IF( EQ_16( L_frame, L_FRAME16k ) )
     {
         *bit = sub( *bit, 8 );
@@ -246,18 +236,12 @@ void bands_and_bit_alloc_ivas_fx(
             nb_tot_bands = Find_bit_alloc_IVAS_fx( core_brate, GSC_IVAS_mode, Diff_len, nb_tot_bands, bit, max_ener_band, ener_vec, bits_per_bands );
             nb_bands = nb_tot_bands;
         }
-        ELSE
-#endif
-        IF( EQ_16( GSC_noisy_speech, 1 ) )
+        ELSE IF( EQ_16( GSC_noisy_speech, 1 ) )
         {
             SWB_bit_budget = *bit; /*Q0*/
             move32();
             nb_bands = 5;
             move16();
-
-#if 1 // def ADD_LRTD
-
-            // fzero_val = 0.0f;
             fzero_val = 0;
             move16();
 
@@ -285,8 +269,6 @@ void bands_and_bit_alloc_ivas_fx(
                 move16();
             }
 
-#endif
-
             st_band = nb_bands;
             move16();
 
@@ -302,11 +284,10 @@ void bands_and_bit_alloc_ivas_fx(
                 move16();
                 max_ener_band[j] = i;
                 move16();
-                // ener_vec[i] = 0;
                 ener_vec[i] = fzero_val;
                 move16();
             }
-#if 1 // def ADD_LRTD
+
             IF( LT_16( bwidth, SWB ) )
             {
                 test();
@@ -315,17 +296,15 @@ void bands_and_bit_alloc_ivas_fx(
                     nb_tot_bands = 5;
                     move16();
                 }
-#endif
+
                 FOR( ; j < nb_bands; j++ )
                 {
                     i = maximum_fx( ener_vec, nb_tot_bands, &etmp );
                     max_ener_band[j] = i;
                     move16();
-                    // ener_vec[i] = 0;
                     ener_vec[i] = fzero_val;
                     move16();
                 }
-#if 1 // def ADD_LRTD
             }
             ELSE
             {
@@ -338,7 +317,7 @@ void bands_and_bit_alloc_ivas_fx(
                     move16();
                 }
             }
-#endif
+
             set32_fx( bits_per_bands, bit_fracf, nb_bands );
         }
         ELSE
@@ -353,7 +332,7 @@ void bands_and_bit_alloc_ivas_fx(
             move16();
             st_band = 7;
             move16();
-#if 1 // def ADD_LRTD
+
             test();
             IF( EQ_16( L_frame, L_FRAME16k ) && GT_32( core_brate, ACELP_16k40 ) )
             {
@@ -366,7 +345,7 @@ void bands_and_bit_alloc_ivas_fx(
                 bit_new_bands = 5;
                 move16();
             }
-#endif
+
             IF( LE_32( core_brate, ACELP_9k60 ) )
             {
                 *pvq_len = 80;
@@ -388,9 +367,8 @@ void bands_and_bit_alloc_ivas_fx(
             }
 
             nb_bands = shr( *pvq_len, 4 );
-#if 1 // def ADD_LRTD
             nb_bands_max = s_min( nb_bands_max, MBANDS_GN_BITALLOC16k );
-#endif
+
             /*------------------------------------------------------------------------
              * Ajustement of the maximum number of bands in function of the
              * dynamics of the spectrum (more or less speech like)
@@ -402,7 +380,6 @@ void bands_and_bit_alloc_ivas_fx(
             IF( coder_type == INACTIVE || GE_16( noise_lev, NOISE_LEVEL_SP3 ) )
             {
                 /* Probably classification error -> concentrate bits on LF */
-#if 1 // def ADD_LRTD
                 IF( EQ_16( L_frame, L_FRAME16k ) && GE_32( core_brate, ACELP_24k40 ) )
                 {
                     nb_bands_max = sub( nb_tot_bands, 2 );
@@ -411,9 +388,7 @@ void bands_and_bit_alloc_ivas_fx(
                 {
                     nb_bands_max = add( nb_bands, 2 );
                 }
-                ELSE
-#endif
-                IF( GE_32( core_brate, ACELP_8k00 ) )
+                ELSE IF( GE_32( core_brate, ACELP_8k00 ) )
                 {
                     nb_bands_max = add( nb_bands, 1 );
                 }
@@ -432,7 +407,7 @@ void bands_and_bit_alloc_ivas_fx(
             {
                 nb_bands_max = sub( nb_bands_max, 1 );
             }
-#if 1 // def ADD_LRTD
+
             IF( EQ_16( L_frame, L_FRAME16k ) )
             {
                 IF( LT_32( core_brate, ACELP_24k40 ) )
@@ -454,7 +429,6 @@ void bands_and_bit_alloc_ivas_fx(
                 }
             }
 
-#endif
             test();
             if ( ( bwidth == NB ) && GT_16( nb_bands_max, 10 ) )
             {
@@ -476,7 +450,7 @@ void bands_and_bit_alloc_ivas_fx(
             /*------------------------------------------------------------------------
              * Fractional bits to distribute on the first x bands
              *-----------------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
+
             test();
             IF( EQ_16( L_frame, L_FRAME16k ) && GT_32( core_brate, ACELP_32k ) )
             {
@@ -484,10 +458,10 @@ void bands_and_bit_alloc_ivas_fx(
                 move32();
             }
             ELSE
-#endif
             {
                 bit_fracf = Find_bit_frac_fx( st_band, bit_tmp ); /*Q18*/
             }
+
             /*------------------------------------------------------------------------
              * Complete the bit allocation per frequency band
              *-----------------------------------------------------------------------*/
@@ -505,13 +479,12 @@ void bands_and_bit_alloc_ivas_fx(
                 move32();                                                                /* Q18 */
                 bit_index = add( bit_index, 1 );
             }
-#if 1 // def ADD_LRTD
+
             IF( EQ_16( L_frame, L_FRAME16k ) && GT_32( core_brate, ACELP_16k40 ) )
             {
                 bit_index = 0;
                 move16();
                 i = sub( imax, 1 );
-                // bits_per_bands[i] += Compl_GSC_freq_bits[bit_index];
                 bits_per_bands[i] = L_add( bits_per_bands[i], L_shl( Compl_GSC_freq_bits[bit_index], Q18 ) ); /*Q18*/
                 move32();
                 i = add( i, 1 );
@@ -519,13 +492,12 @@ void bands_and_bit_alloc_ivas_fx(
 
                 FOR( ; i < 10; i++ )
                 {
-                    // bits_per_bands[i] += Compl_GSC_freq_bits[bit_index] + bit_fracf;
                     bits_per_bands[i] = L_add( bits_per_bands[i], L_add( L_shl( Compl_GSC_freq_bits[bit_index], Q18 ), bit_fracf ) ); /*Q18*/
                     move32();
                     bit_index = add( bit_index, 1 );
                 }
             }
-#endif
+
             IF( Diff_len == 0 )
             {
                 bit_index = add( bit_index_mem, 10 );
@@ -536,7 +508,7 @@ void bands_and_bit_alloc_ivas_fx(
                     bit_index = add( bit_index, 1 );
                 }
             }
-#if 1 // def ADD_LRTD
+
             IF( bit_fracf < 0 )
             {
                 FOR( j = 0; j < nb_tot_bands; j++ )
@@ -546,39 +518,33 @@ void bands_and_bit_alloc_ivas_fx(
                 }
             }
 
-#endif
             /*--------------------------------------------------------------------------
              * Complete the bit allocation per frequency band for 16kHz high brate mode
              *--------------------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
+
             test();
             IF( EQ_16( L_frame, L_FRAME16k ) && GT_32( core_brate, ACELP_32k ) )
             {
                 FOR( j = st_band; j < nb_bands; j++ )
                 {
-                    // bits_per_bands[j] = bit_new_bands;
                     bits_per_bands[j] = L_shl( bit_new_bands, Q18 );
                     move32();
                 }
 
-                // bit_fracf = (1.0f / nb_bands) * (bit_tmp);
                 bit_fracf = L_shl( L_mult0( idiv1616( 16384, nb_bands ), bit_tmp ), 4 ); /*Q18*/
 
-                // etmp = 2.0f * bit_fracf / (nb_bands + 1);
-                etmp = divide3216( L_shr( bit_fracf, Q2 ), add( nb_bands, 1 ) ); // Q15
-                // bit_fracf = etmp;
-                bit_fracf = L_shl( etmp, Q3 ); // Q18
+                etmp = divide3216( L_shr( bit_fracf, Q2 ), add( nb_bands, 1 ) ); /* Q15 */
+
+                bit_fracf = L_shl( etmp, Q3 ); /* Q18 */
+
                 FOR( j = nb_bands - 1; j >= 0; j-- )
                 {
-                    // bits_per_bands[j] = etmp;
-                    // etmp += bit_fracf;
-                    bits_per_bands[j] = L_add( bits_per_bands[j], L_shl( etmp, Q3 ) ); // Q18
+                    bits_per_bands[j] = L_add( bits_per_bands[j], L_shl( etmp, Q3 ) ); /* Q18 */
                     move32();
                     etmp = extract_l( L_add( etmp, L_shr( bit_fracf, Q3 ) ) );
                 }
             }
             ELSE
-#endif
             {
                 FOR( j = st_band; j < nb_bands; j++ )
                 {
@@ -692,6 +658,7 @@ void bands_and_bit_alloc_ivas_fx(
                 }
             }
         }
+
         /*--------------------------------------------------------------------------
          * Bit sum verification for GSC inactive at very high rate
          * The maximum number of bits per band of length 16 is 112
@@ -728,19 +695,20 @@ void bands_and_bit_alloc_ivas_fx(
                 move32(); /* Q18 */
             }
         }
+
         /*--------------------------------------------------------------------------
          * second step of bit sum verification, normally sum_bit == *bit
          *--------------------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
+
         sum_bit = 0;
         move32();
         FOR( i = 0; i < nb_bands; i++ )
         {
-            // bits_per_bands[i] = (float)floor(bits_per_bands[i]);
             bits_per_bands[i] = L_shl( L_shr( bits_per_bands[i], Q18 ), Q18 );
             move32();
             sum_bit = L_add( sum_bit, L_shr( bits_per_bands[i], Q18 ) ); /*Q0*/
         }
+
         test();
         IF( GSC_IVAS_mode != 0 && LT_32( sum_bit, *bit ) ) /* If we need to add bits, we are doing it on the LF */
         {
@@ -759,23 +727,7 @@ void bands_and_bit_alloc_ivas_fx(
             w_sum_bit = add( w_sum_bit, out_bits_per_bands[i] ); /* Q3 */
         }
         tmp = shl( *bit, 3 );
-#else
-    IF( GT_16( tmp, w_sum_bit ) )
-    {
-        i = sub( nb_bands, 1 );
-        move16();
-        FOR( ; tmp > w_sum_bit; w_sum_bit += ( 1 << 3 ) )
-        {
-            out_bits_per_bands[i] = add( out_bits_per_bands[i], 1 << 3 );
-            move16();
-            i = sub( i, 1 );
-            IF( i == 0 )
-            {
-                i = sub( nb_bands, 1 );
-            }
-        }
-    }
-#endif
+
         /*--------------------------------------------------------------------------
          * Recompute the real number/length of frequency bands to encode
          *--------------------------------------------------------------------------*/
@@ -794,7 +746,6 @@ void bands_and_bit_alloc_ivas_fx(
                 Copy( exc_diff + shl( max_ener_band[j], 4 ), concat_in + shl( j, 4 ), 16 );
             }
         }
-#if 1 // def ADD_LRTD
     }
     ELSE /* *bit == 0 */
     {
@@ -804,10 +755,11 @@ void bands_and_bit_alloc_ivas_fx(
         *pvq_len = 0;
         move16();
     }
-#endif
+
     return;
 }
-#if 1 // def ADD_LRTD
+
+
 /*-------------------------------------------------------------------*
  * reajust_bits()
  *
@@ -928,26 +880,28 @@ static Word32 Find_bit_frac_fx(
     return ( L_out );
 }
 
-static Word16 Find_bit_alloc_IVAS_fx(                               /*o: Number of band to encode */
-                                      const Word32 core_brate,      /* i  : core bit rate                                         */
-                                      const Word16 GSC_IVAS_mode,   /* i  : GSC IVAS mode                                         */
-                                      const Word16 Diff_len,        /* i  : Length of the difference signal (before pure spectral)*/
-                                      const Word16 nb_tot_bands_in, /* i  : total number of band */
-                                      Word16 *bit,                  /* i/o: Number of bit allowed for frequency quantization      */
-                                      Word16 *max_ener_band,        /* i/o: Energy based sorted order                             */
-                                      Word16 *ener_vec,             /* i/o: Energy per band order                                 */
-                                      Word32 *bits_per_bands        /* o  : Number of bit allowed per allowed subband        Q18  */
+
+/* o  : Number of band to encode */
+static Word16 Find_bit_alloc_IVAS_fx(
+    const Word32 core_brate,      /* i  : core bit rate                                         */
+    const Word16 GSC_IVAS_mode,   /* i  : GSC IVAS mode                                         */
+    const Word16 Diff_len,        /* i  : Length of the difference signal (before pure spectral)*/
+    const Word16 nb_tot_bands_in, /* i  : total number of band */
+    Word16 *bit,                  /* i/o: Number of bit allowed for frequency quantization      */
+    Word16 *max_ener_band,        /* i/o: Energy based sorted order                             */
+    Word16 *ener_vec,             /* i/o: Energy per band order                                 */
+    Word32 *bits_per_bands        /* o  : Number of bit allowed per allowed subband        Q18  */
 )
 {
     Word32 mp, mb, nb_bands_adj, bit_adj;
     Word16 nb_pulse_per_band[MBANDS_GN_BITALLOC16k];
-    Word32 SWB_bit_budget; // Q0 -> Q18
+    Word32 SWB_bit_budget; /* Q0 -> Q18 */
     Word16 i, j, nb_bands_max, st_band, nb_tot_bands_loc, etmp;
     Word32 sum_bit /*Q18*/, bit_fracf /*Q18*/;
     Word16 d_tmp, e_div, tmp16;
     Word32 Ltmp, etmp_32fx;
 
-    SWB_bit_budget = *bit; // Q0
+    SWB_bit_budget = *bit; /* Q0 */
     st_band = 5;
     nb_bands_max = nb_tot_bands_in;
 
@@ -997,12 +951,12 @@ static Word16 Find_bit_alloc_IVAS_fx(                               /*o: Number
     IF( EQ_16( GSC_IVAS_mode, 1 ) && LT_32( core_brate, GSC_L_RATE_STG ) )
     {
         /* nb_bands_adj = 0.0125f * SWB_bit_budget - 0.75f;*/
-        nb_bands_adj = L_sub( Mpy_32_32( Q31_0_0125, L_shl( SWB_bit_budget, Q18 ) ), Q18_0_75 ); // Q18
+        nb_bands_adj = L_sub( Mpy_32_32( Q31_0_0125, L_shl( SWB_bit_budget, Q18 ) ), Q18_0_75 ); /* Q18 */
     }
     ELSE IF( NE_16( GSC_IVAS_mode, 2 ) && GT_32( core_brate, GSC_H_RATE_STG ) )
     {
         /*nb_bands_adj = 0.02f * SWB_bit_budget - 1.2f;*/
-        nb_bands_adj = L_sub( Mpy_32_32( Q31_0_02, L_shl( SWB_bit_budget, Q18 ) ), Q18_1_2 ); // Q18
+        nb_bands_adj = L_sub( Mpy_32_32( Q31_0_02, L_shl( SWB_bit_budget, Q18 ) ), Q18_1_2 ); /* Q18 */
     }
     /*nb_bands_max = (int16_t)(nb_bands_max * nb_bands_adj + 0.5f);*/
 
@@ -1135,7 +1089,7 @@ static Word16 Find_bit_alloc_IVAS_fx(                               /*o: Number
                 move32();
             }
             mb = L_sub( mb, bit_fracf );
-            SWB_bit_budget = L_sub( SWB_bit_budget, bits_per_bands[max_ener_band[j]] ); // Q18
+            SWB_bit_budget = L_sub( SWB_bit_budget, bits_per_bands[max_ener_band[j]] ); /* Q18 */
         }
     }
 
@@ -1196,17 +1150,23 @@ static Word16 Find_bit_alloc_IVAS_fx(                               /*o: Number
             move32();
         }
     }
+
     return nb_tot_bands_loc;
 }
 
-static Word16 Find_norm_inv_fx( const Word32 ToDivide, Word16 *e_div ) /* Find normalized 1 / ToDivide */
+
+/* Find normalized 1 / ToDivide */
+static Word16 Find_norm_inv_fx(
+    const Word32 ToDivide,
+    Word16 *e_div )
 {
     Word16 d_tmp, e_tmp;
+
     e_tmp = norm_l( ToDivide );
     d_tmp = round_fx( L_shl( ToDivide, e_tmp ) );
     d_tmp = div_s( 16384, d_tmp ); /* 1.0 in Q14, dividend is normalize so >= 16384 as required for the division */
     *e_div = sub( 14, e_tmp );
     move16();
+
     return d_tmp;
 }
-#endif
diff --git a/lib_com/gs_gains.c b/lib_com/gs_gains.c
index 13fdbd67ca68c7cf8f20b01fa974dea2859a4cf1..8fa7694755c7c5ac9f912f26abdff9211895ff07 100644
--- a/lib_com/gs_gains.c
+++ b/lib_com/gs_gains.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,6 @@
 #include <math.h>
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "wmc_auto.h"
 
diff --git a/lib_com/gs_gains_fx.c b/lib_com/gs_gains_fx.c
index 8e603e15c957782c1dfac68f08c646f84724ac08..ecfe9aae0f28d32e24ac362414cc1f52f47b58b4 100644
--- a/lib_com/gs_gains_fx.c
+++ b/lib_com/gs_gains_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -104,13 +104,8 @@ void Comp_and_apply_gain_fx(
 
             FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L32 = L_shl_o( L_mult( exc_diffQ[i], y_gain ), tmp_exp, &Overflow ); /*Q_exc+16 */
                 exc_diffQ[i] = round_fx_o( L32, &Overflow );                         /*Q_exc */
-#else                                                                                /* BASOP_NOGLOB */
-                L32 = L_shl( L_mult( exc_diffQ[i], y_gain ), tmp_exp ); /*Q_exc+16 */
-                exc_diffQ[i] = round_fx( L32 );                         /*Q_exc */
-#endif                                                                               /* BASOP_NOGLOB */
                 move16();
             }
         }
@@ -127,23 +122,15 @@ void Comp_and_apply_gain_fx(
             y_gain = extract_l( Pow2( 14, frac ) );                      /* Put 14 as exponent so that */
                                                                          /* output of Pow2() will be: */
                                                                          /* 16384 < Pow2() <= 32767 */
-#ifdef BASOP_NOGLOB
             Ener_per_bd_yQ[i_band] = shl_o( y_gain, sub( exp1, 13 ), &Overflow );
-#else                 /* BASOP_NOGLOB */
-            Ener_per_bd_yQ[i_band] = shl( y_gain, sub( exp1, 13 ) );
-#endif                /* BASOP_NOGLOB */
             move16(); /*Q1     */
             tmp_exp = add( add( exp1, 1 ), sub( Q_exc, Qexc_diff ) );
 
             FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
             {
-                L32 = L_mult( exc_diffQ[i], y_gain ); /*Qexc_diff+15 */
-#ifdef BASOP_NOGLOB
+                L32 = L_mult( exc_diffQ[i], y_gain );                                       /*Qexc_diff+15 */
                 exc_diffQ[i] = round_fx_o( L_shl_o( L32, tmp_exp, &Overflow ), &Overflow ); /*Q_exc */
                 move16();
-#else /* BASOP_NOGLOB */
-                exc_diffQ[i] = round_fx( L_shl( L32, tmp_exp ) ); /*Q_exc */
-#endif
             }
         }
     }
@@ -190,13 +177,8 @@ void Comp_and_apply_gain_ivas_fx(
 
             FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L32 = L_mult( exc_diffQ[i], y_gain );        /*Q_exc+16-tmp_exp */
                 exc_diffQ[i] = round_fx_o( L32, &Overflow ); /*Q_exc-tmp_exp */
-#else                                                        /* BASOP_NOGLOB */
-                L32 = L_mult( exc_diffQ[i], y_gain );             /*Q_exc+16 */
-                exc_diffQ[i] = round_fx( L32 );                   /*Q_exc */
-#endif                                                       /* BASOP_NOGLOB */
                 move16();
                 IF( exc_diffQ[i] )
                 {
@@ -215,29 +197,21 @@ void Comp_and_apply_gain_ivas_fx(
              * y_gain  = pow(10.0, (Ener_per_bd_iQ[i_band]-Ener_per_bd_yQ[i_band]))
              * = pow(2, 3.321928*(Ener_per_bd_iQ[i_band]-Ener_per_bd_yQ[i_band]))
              *-----------------------------------------------------------------*/
-            L16 = sub_sat( Ener_per_bd_iQ[i_band], Ener_per_bd_yQ[i_band] ); /*Q12 */
-            L32 = L_mult( L16, 27213 );                                      /* 3.321928 in Q13 -> Q26 */
-            L32 = L_shr( L32, 10 );                                          /* From Q26 to Q16 */
-            frac = L_Extract_lc( L32, &exp1 );                               /* Extract exponent of gcode0 */
-            y_gain = extract_l( Pow2( 14, frac ) );                          /* Put 14 as exponent so that */
-                                                                             /* output of Pow2() will be: */
-                                                                             /* 16384 < Pow2() <= 32767 */
-#ifdef BASOP_NOGLOB
+            L16 = sub_sat( Ener_per_bd_iQ[i_band], Ener_per_bd_yQ[i_band] );      /*Q12 */
+            L32 = L_mult( L16, 27213 );                                           /* 3.321928 in Q13 -> Q26 */
+            L32 = L_shr( L32, 10 );                                               /* From Q26 to Q16 */
+            frac = L_Extract_lc( L32, &exp1 );                                    /* Extract exponent of gcode0 */
+            y_gain = extract_l( Pow2( 14, frac ) );                               /* Put 14 as exponent so that */
+                                                                                  /* output of Pow2() will be: */
+                                                                                  /* 16384 < Pow2() <= 32767 */
             Ener_per_bd_yQ[i_band] = shl_o( y_gain, sub( exp1, 13 ), &Overflow ); /*Q13*/
-#else                                                                             /* BASOP_NOGLOB */
-            Ener_per_bd_yQ[i_band] = shl( y_gain, sub( exp1, 13 ) );
-#endif                                                                            /* BASOP_NOGLOB */
             move16();                                                             /*Q1     */
             tmp_exp = add( add( exp1, 1 ), sub( *Q_exc, Qexc_diff ) );
 
             FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
             {
-                L32 = L_mult( exc_diffQ[i], y_gain ); /*Qexc_diff+15 */
-#ifdef BASOP_NOGLOB
+                L32 = L_mult( exc_diffQ[i], y_gain );        /*Qexc_diff+15 */
                 exc_diffQ[i] = round_fx_o( L32, &Overflow ); /*Q_exc-tmp_exp */
-#else                                                        /* BASOP_NOGLOB */
-                exc_diffQ[i] = round_fx( L_shl( L32, tmp_exp ) ); /*Q_exc */
-#endif
                 move16();
                 IF( exc_diffQ[i] )
                 {
@@ -1054,7 +1028,7 @@ Word16 gsc_gainQ_fx(                          /*Q12*/
         mean_4g[0] = round_fx( L_tmp );
         move16();
         idx_g = vquant_fx( mean_4g, Gain_meanNB_fx, mean_4g, Gain_mean_dicNB_fx, 1, 64 );
-        push_indice_fx( hBstr, IND_MEAN_GAIN2, idx_g, 6 );
+        push_indice( hBstr, IND_MEAN_GAIN2, idx_g, 6 );
 
         FOR( i = 0; i < Mbands_gn; i++ )
         {
@@ -1066,21 +1040,21 @@ Word16 gsc_gainQ_fx(                          /*Q12*/
         move16();
         set16_fx( y_gain_tmp + 10, 0, MBANDS_GN - 10 );
         idx_g = vquant_fx( y_gain_tmp, Mean_dic_NB_fx, y_gain_tmp, Gain_dic1_NB_fx, 3, 64 );
-        push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 6 );
+        push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 6 );
 
         IF( LT_32( core_brate, ACELP_9k60 ) )
         {
             idx_g = vquant_fx( y_gain_tmp + 3, Mean_dic_NB_fx + 3, y_gain_tmp + 3, Gain_dic2_NB_fx, 3, 32 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
             idx_g = vquant_fx( y_gain_tmp + 6, Mean_dic_NB_fx + 6, y_gain_tmp + 6, Gain_dic3_NB_fx, 4, 16 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 4 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 4 );
         }
         ELSE
         {
             idx_g = vquant_fx( y_gain_tmp + 3, Mean_dic_NB_fx + 3, y_gain_tmp + 3, Gain_dic2_NBHR_fx, 3, 64 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 6 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 6 );
             idx_g = vquant_fx( y_gain_tmp + 6, Mean_dic_NB_fx + 6, y_gain_tmp + 6, Gain_dic3_NBHR_fx, 4, 128 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 7 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 7 );
         } /*add end */
 
         test();
@@ -1148,7 +1122,7 @@ Word16 gsc_gainQ_fx(                          /*Q12*/
         move16();
 
         idx_g = vquant_fx( mean_4g, mean_m_fx, mean_4g, mean_gain_dic_fx, 1, 64 );
-        push_indice_fx( hBstr, IND_MEAN_GAIN2, idx_g, 6 );
+        push_indice( hBstr, IND_MEAN_GAIN2, idx_g, 6 );
 
         FOR( i = 0; i < Mbands_gn; i++ )
         {
@@ -1174,11 +1148,11 @@ Word16 gsc_gainQ_fx(                          /*Q12*/
             move16();
 
             idx_g = vquant_fx( y_gain_tmp2, YGain_mean_LR_fx, y_gain_tmp2, YGain_dic1_LR_fx, 3, 32 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
             idx_g = vquant_fx( y_gain_tmp2 + 3, YGain_mean_LR_fx + 3, y_gain_tmp2 + 3, YGain_dic2_LR_fx, 4, 32 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
             idx_g = vquant_fx( y_gain_tmp2 + 7, YGain_mean_LR_fx + 7, y_gain_tmp2 + 7, YGain_dic3_LR_fx, 5, 32 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
             set16_fx( y_gain_tmp2 + 12, 0, MBANDS_GN - 12 );
 
             /* Update to quantized vector */
@@ -1211,13 +1185,13 @@ Word16 gsc_gainQ_fx(                          /*Q12*/
         ELSE
         {
             idx_g = vquant_fx( y_gain_tmp, YG_mean16_fx, y_gain_tmp, YG_dicMR_1_fx, 4, 64 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 6 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 6 );
             idx_g = vquant_fx( y_gain_tmp + 4, YG_mean16_fx + 4, y_gain_tmp + 4, YG_dicMR_2_fx, 4, 32 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
             idx_g = vquant_fx( y_gain_tmp + 8, YG_mean16_fx + 8, y_gain_tmp + 8, YG_dicMR_3_fx, 4, 32 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 5 );
             idx_g = vquant_fx( y_gain_tmp + 12, YG_mean16_fx + 12, y_gain_tmp + 12, YG_dicMR_4_fx, 4, 16 );
-            push_indice_fx( hBstr, IND_Y_GAIN_TMP, idx_g, 4 );
+            push_indice( hBstr, IND_Y_GAIN_TMP, idx_g, 4 );
         }
     }
 
diff --git a/lib_com/gs_inact_switching_fx.c b/lib_com/gs_inact_switching_fx.c
index 18bff8d43c5a53393d593f2cc7ea841c3e2ad445..119811275e34a99e7b2f22226dc8385c9709fc6f 100644
--- a/lib_com/gs_inact_switching_fx.c
+++ b/lib_com/gs_inact_switching_fx.c
@@ -33,156 +33,24 @@
 /*------------------------------------------------------------------------*/
 /* OUTPUT ARGUMENTS :													  */
 /*------------------------------------------------------------------------*/
-
 /*------------------------------------------------------------------------*/
 /* RETURN ARGUMENTS :													  */
 /* _ None																  */
 /*========================================================================*/
-void Inac_swtch_ematch_fx(
-    Word16 exc2[],             /* i/o: CELP/GSC excitation buffer       Q_exc*/
-    Word16 dct_exc_tmp[],      /* i  : GSC excitation in DCT domain          */
-    Word16 lt_ener_per_band[], /* i/o: Long term energy per band        Q12  */
-    const Word16 coder_type,   /* i  : Coding mode                           */
-    const Word16 L_frame,      /* i  : Frame lenght                          */
-    const Word32 core_brate,   /* i  : Core bit rate					     */
-    const Word16 Q_exc         /* i  : input and output format of exc2       */
-    ,
-    const Word16 bfi /* i  : frame lost indicator                  */
-    ,
-    const Word16 last_core,      /* i  : Last core used                        */
-    const Word16 last_codec_mode /* i  : Last codec mode                       */
-)
-{
-    Word16 Ener_per_bd[MBANDS_GN];
-    Word16 ftmp;
-    Word16 *pt_exc;
-    Word16 j, i;
-
-    Word16 exp, frac;
-    Word32 L_tmp;
-
-    /*--------------------------------------------------------------------------
-     * average energy per band
-     *--------------------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( coder_type, AUDIO ) && bfi == 0 )
-    {
-        Ener_per_band_comp_fx( dct_exc_tmp, Ener_per_bd, Q_exc, MBANDS_GN, 1 );
-
-        /* reset long-term energy per band */
-        FOR( i = 0; i < MBANDS_GN; i++ )
-        {
-            lt_ener_per_band[i] = Ener_per_bd[i];
-            move16();
-        }
-    }
-    ELSE IF( EQ_16( coder_type, VOICED ) || EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) || ( last_core != ACELP_CORE ) || NE_16( last_codec_mode, MODE1 ) )
-    {
-        /* Find spectrum and energy per band for GC and VC frames */
-        edct_16fx( exc2, dct_exc_tmp, L_frame, 5, EVS_MONO );
-
-        Ener_per_band_comp_fx( dct_exc_tmp, Ener_per_bd, Q_exc, MBANDS_GN, 1 );
-
-        /* reset long-term energy per band */
-        FOR( i = 0; i < MBANDS_GN; i++ )
-        {
-            lt_ener_per_band[i] = Ener_per_bd[i];
-            move16();
-        }
-    }
-    ELSE IF( ( coder_type == INACTIVE ) && LE_32( core_brate, ACELP_24k40 ) )
-    {
-        /* Find spectrum and energy per band for inactive frames */
-        edct_16fx( exc2, dct_exc_tmp, L_frame, 5, EVS_MONO );
-        Ener_per_band_comp_fx( dct_exc_tmp, Ener_per_bd, Q_exc, MBANDS_GN, 1 );
-
-        /* More agressive smoothing in the first 50 frames */
-        pt_exc = dct_exc_tmp;
-        move16();
-        FOR( i = 0; i < MBANDS_GN; i++ )
-        {
-            /* Compute smoothing gain to apply with gain limitation */
-            L_tmp = L_mult( ALPHA0_FX, lt_ener_per_band[i] ); /*Q(15+12+1)=Q(28) */
-            L_tmp = L_mac( L_tmp, BETA0_FX, Ener_per_bd[i] ); /*Q28 */
-            lt_ener_per_band[i] = round_fx( L_tmp );          /*Q12 */
-            move16();
-
-            ftmp = sub( lt_ener_per_band[i], Ener_per_bd[i] ); /*Q12 */
-
-            /* ftmp = (float)pow(10, ftmp);= pow(2,3.321928*ftmp);*/
-
-            L_tmp = L_mult( 27213, ftmp );        /*Q(13+12+1)=Q26 ; 27213=3.321928 in Q13 */
-            L_tmp = L_shr( L_tmp, 10 );           /* From Q26 to Q16 */
-            frac = L_Extract_lc( L_tmp, &exp );   /* Extract exponent of ftmp */
-            ftmp = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
-            /* output of Pow2() will be: */
-            /* 16384 < Pow2() <= 32767 */
-
-            exp = sub( exp, 14 );
-            IF( LT_16( i, 2 ) )
-            {
-                FOR( j = 0; j < 8; j++ )
-                {
-                    L_tmp = L_mult( *pt_exc, ftmp ); /* Q_exc*Q0 -> Q(Q_exc+1) */
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc+1) -> Q(16+Q_exc)*/
-                    *pt_exc = round_fx_sat( L_tmp );
-#else
-                    L_tmp = L_shl( L_tmp, add( exp, 15 ) ); /* Q(Q_exc+1) -> Q(16+Q_exc)*/
-                    *pt_exc = round_fx( L_tmp );
-#endif
-                    move16();
-                    pt_exc++;
-                }
-            }
-            ELSE
-            {
-                FOR( j = 0; j < 16; j++ )
-                {
-                    L_tmp = L_mult( *pt_exc, ftmp ); /* Q_exc*Q0 -> Q(Q_exc+1) */
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc+1) -> Q(16+Q_exc)*/
-                    *pt_exc = round_fx_sat( L_tmp );            /*Q_exc*/
-#else
-                    L_tmp = L_shl( L_tmp, add( exp, 15 ) ); /* Q(Q_exc+1) -> Q(16+Q_exc)*/
-                    *pt_exc = round_fx( L_tmp );            /*Q_exc*/
-#endif
-                    move16();
-                    pt_exc++;
-                }
-            }
-        }
-
-        /* Going back to time */
-        edct_16fx( dct_exc_tmp, exc2, L_frame, 5, EVS_MONO );
-    }
-
-    return;
-}
-
 
-void Inac_switch_ematch_ivas_fx(
-    Word16 exc2[],             /* i/o: CELP/GSC excitation buffer       Q_exc*/
-    Word16 dct_exc_tmp[],      /* i  : GSC excitation in DCT domain          */
-    Word16 lt_ener_per_band[], /* i/o: Long term energy per band        Q12  */
-    const Word16 coder_type,   /* i  : Coding mode                           */
-    const Word16 L_frame,      /* i  : Frame lenght                          */
-    const Word32 total_brate,  /* i  : total bit rate					     */
-    const Word16 Q_exc         /* i  : input and output format of exc2       */
-    ,
-    const Word16 bfi /* i  : frame lost indicator                  */
-    ,
-    const Word16 last_core,      /* i  : Last core used                        */
-    const Word16 last_codec_mode /* i  : Last codec mode                       */
-    ,
-    const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag*/
-    const Word16 element_mode       /* i  : element mode                        */
+void Inac_switch_ematch_fx(
+    Word16 exc2[],                         /* i/o: CELP/GSC excitation buffer       Q_exc*/
+    Word16 dct_exc_tmp[],                  /* i  : GSC excitation in DCT domain          */
+    Word16 lt_ener_per_band[],             /* i/o: Long term energy per band        Q12  */
+    const Word16 coder_type,               /* i  : Coding mode                           */
+    const Word16 inactive_coder_type_flag, /* i  : AVQ (0) or GSC (1) IC flag            */
+    const Word16 L_frame,                  /* i  : Frame lenght                          */
+    const Word16 Q_exc,                    /* i  : input and output format of exc2       */
+    const Word16 bfi,                      /* i  : frame lost indicator                  */
+    const Word16 last_core,                /* i  : Last core used                        */
+    const Word16 last_codec_mode,          /* i  : Last codec mode                       */
+    const Word16 tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag  */
+    const Word16 element_mode              /* i  : element mode                          */
 )
 {
     Word16 Ener_per_bd[MBANDS_GN16k];
@@ -232,7 +100,7 @@ void Inac_switch_ematch_ivas_fx(
             move16();
         }
     }
-    ELSE IF( ( coder_type == INACTIVE ) && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) )
+    ELSE IF( ( coder_type == INACTIVE ) && inactive_coder_type_flag )
     {
         /* Find spectrum and energy per band for inactive frames */
         edct_16fx( exc2, dct_exc_tmp, L_frame, 5, element_mode );
@@ -263,31 +131,62 @@ void Inac_switch_ematch_ivas_fx(
             exp = sub( exp, 14 );
             IF( LT_16( i, 2 ) )
             {
-                FOR( j = 0; j < 8; j++ )
+                IF( EQ_16( element_mode, EVS_MONO ) )
                 {
-                    L_tmp = L_mult0( *pt_exc, ftmp );
-                    L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc) -> Q(15+Q_exc)*/
-                    *pt_exc = round_fx_sat( L_tmp );            /*Q_exc - 1*/
-                    move16();
-                    pt_exc++;
+                    FOR( j = 0; j < 8; j++ )
+                    {
+                        L_tmp = L_mult( *pt_exc, ftmp );
+                        L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc) -> Q(15+Q_exc)*/
+                        *pt_exc = round_fx_sat( L_tmp );            /*Q_exc - 1*/
+                        move16();
+                        pt_exc++;
+                    }
+                }
+                ELSE
+                {
+                    FOR( j = 0; j < 8; j++ )
+                    {
+                        L_tmp = L_mult0( *pt_exc, ftmp );
+                        L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc) -> Q(15+Q_exc)*/
+                        *pt_exc = round_fx_sat( L_tmp );            /*Q_exc - 1*/
+                        move16();
+                        pt_exc++;
+                    }
                 }
             }
             ELSE
             {
-                FOR( j = 0; j < 16; j++ )
+                IF( EQ_16( element_mode, EVS_MONO ) )
+                {
+                    FOR( j = 0; j < 16; j++ )
+                    {
+                        L_tmp = L_mult( *pt_exc, ftmp );
+                        L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc) -> Q(15+Q_exc)*/
+                        *pt_exc = round_fx_sat( L_tmp );            /*Q_exc - 1*/
+                        move16();
+                        pt_exc++;
+                    }
+                }
+                ELSE
                 {
-                    L_tmp = L_mult0( *pt_exc, ftmp );
-                    L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc) -> Q(15+Q_exc)*/
-                    *pt_exc = round_fx_sat( L_tmp );            /*Q_exc - 1*/
-                    move16();
-                    pt_exc++;
+                    FOR( j = 0; j < 16; j++ )
+                    {
+                        L_tmp = L_mult0( *pt_exc, ftmp );
+                        L_tmp = L_shl_sat( L_tmp, add( exp, 15 ) ); /* Q(Q_exc) -> Q(15+Q_exc)*/
+                        *pt_exc = round_fx_sat( L_tmp );            /*Q_exc - 1*/
+                        move16();
+                        pt_exc++;
+                    }
                 }
             }
         }
 
         /* Going back to time */
-        Scale_sig( dct_exc_tmp, 240, 1 ); // Q_exc
-        Scale_sig( exc2, 240, 1 );        // Q_exc
+        IF( GT_16( element_mode, EVS_MONO ) )
+        {
+            Scale_sig( dct_exc_tmp, 240, 1 ); // Q_exc
+            Scale_sig( exc2, 240, 1 );        // Q_exc
+        }
         edct_16fx( dct_exc_tmp, exc2, L_frame, 5, element_mode );
     }
 
diff --git a/lib_com/gs_noisefill_fx.c b/lib_com/gs_noisefill_fx.c
index 3761debf22ac219f23d2cbff1b1af687065c3554..208f205693ce9d67d04e96870bfcf4a15ea12d12 100644
--- a/lib_com/gs_noisefill_fx.c
+++ b/lib_com/gs_noisefill_fx.c
@@ -470,15 +470,11 @@ static void Decreas_freqPeak_fx(
                     {
                         tmp = abs_s( *src );
                         exp = norm_s( max_val );
-                        tmp1 = div_s( shl( 1, sub( 14, exp ) ), max_val ); /*Q(29 - exp - Q_exc) */
-                        L_tmp = L_mult( tmp, tmp1 );                       /*Q(30 - exp) */
-#ifdef BASOP_NOGLOB
+                        tmp1 = div_s( shl( 1, sub( 14, exp ) ), max_val );               /*Q(29 - exp - Q_exc) */
+                        L_tmp = L_mult( tmp, tmp1 );                                     /*Q(30 - exp) */
                         tmp = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q14 */
-#else
-                        tmp = round_fx( L_shl( L_tmp, exp ) ); /*Q14 */
-#endif
-                        tmp = sub( 32767, tmp );     /*Q14 */
-                        L_tmp = L_mult( avrg, tmp ); /*Q_exc +15 */
+                        tmp = sub( 32767, tmp );                                         /*Q14 */
+                        L_tmp = L_mult( avrg, tmp );                                     /*Q_exc +15 */
 
                         tmp = round_fx( L_shl( L_tmp, 1 ) );
                         tmp1 = negate( tmp );
@@ -569,11 +565,7 @@ static void envelop_modify_fx(
         /* output of Pow2() will be: */
         /* 16384 < Pow2() <= 32767 */
         exp = sub( exp, 14 );
-#ifdef BASOP_NOGLOB
         Ener1_fx = mult_ro( 13107, shl_o( tmp, exp, &Overflow ), &Overflow ); /*Q0 */
-#else                                                                         /* BASOP_NOGLOB */
-        Ener1_fx = mult_r( 13107, shl( tmp, exp ) );           /*Q0 */
-#endif                                                                        /* BASOP_NOGLOB */
 
         FOR( j = 0; j < 16; j++ )
         {
@@ -599,11 +591,7 @@ static void envelop_modify_fx(
     /* output of Pow2() will be: */
     /* 16384 < Pow2() <= 32767 */
     exp = sub( exp, 14 );
-#ifdef BASOP_NOGLOB
     Ener1_fx = mult_r( 13107, shl_o( tmp, exp, &Overflow ) ); /*Q0 */
-#else                                                         /* BASOP_NOGLOB */
-    Ener1_fx = mult_r( 13107, shl( tmp, exp ) );               /*Q0 */
-#endif                                                        /* BASOP_NOGLOB */
 
     src_fx = &exc_diffQ_fx[224];
     FOR( j = 0; j < 32; j++ )
@@ -720,17 +708,9 @@ void highband_exc_dct_in_fx(
         /* output of Pow2() will be: */
         /* 16384 < Pow2() <= 32767 */
         exp = sub( exp, 14 );
-#ifdef BASOP_NOGLOB
         tmp1 = shl_o( tmp, exp, &Overflow );
-#else  /* BASOP_NOGLOB */
-        tmp1 = shl( tmp, exp );
-#endif /* BASOP_NOGLOB */
         move16();
-#ifdef BASOP_NOGLOB
         ener = add_o( tmp1, ener, &Overflow ); /*Q0 */
-#else                                          /* BASOP_NOGLOB */
-        ener = add( tmp1, ener ); /*Q0 */
-#endif                                         /* BASOP_NOGLOB */
     }
 
     test();
@@ -813,7 +793,6 @@ void highband_exc_dct_in_fx(
         {
             IF( exc_diffQ[i] == 0 )
             {
-                // PMT("code below to be validated for IVAS use")
                 /* exc_diffQ[i] += 2.0f * noisepb[0] * ((float)own_random(seed_tcx) / PCM16_TO_FLT_FAC);*/
                 tmp = mult( shl( noisepb[0], 1 ), Random( seed_tcx ) ); /*Q15 */
                 tmp = shr( tmp, sub( 15, Qexc_diffQ ) );                /*qNoise_fac */
@@ -896,66 +875,7 @@ void highband_exc_dct_in_fx(
     /*--------------------------------------------------------------------------------------*
      * Apply decoded gain onto the difference signal
      *--------------------------------------------------------------------------------------*/
-#ifdef ADD_LRTD
-    if ( GSC_IVAS_mode >= 1 )
-    {
-        float scale_factLF = 0.9f;
-        float scale_factHF = 0.9f;
-
-        if ( GSC_IVAS_mode == 1 && GSC_noisy_speech == 0 )
-        {
-            scale_factHF = 0.8f;
-        }
-        else if ( GSC_IVAS_mode == 2 || GSC_noisy_speech == 1 )
-        {
-            scale_factHF = 0.71f;
-        }
-        else if ( GSC_IVAS_mode == 3 )
-        {
-            scale_factHF = 0.9f;
-        }
-        for ( i = 0; i < pit_band_idx * 16; i++ )
-        {
-            exc_diffQ[i] *= scale_factLF;
-        }
-        for ( ; i < L_frame; i++ )
-        {
-            exc_diffQ[i] *= scale_factHF;
-        }
-    }
-    else if ( GSC_noisy_speech )
-    {
-        float scale_fact = 0.9f;
 
-        if ( element_mode == IVAS_CPE_TD )
-        {
-            if ( coder_type == INACTIVE )
-            {
-                scale_fact = 1.0f;
-            }
-            else
-            {
-                scale_fact = 0.95f;
-            }
-        }
-        else if ( element_mode > IVAS_SCE )
-        {
-            scale_fact = 0.71f;
-        }
-
-        for ( i = 0; i < L_frame; i++ )
-        {
-            exc_diffQ[i] *= scale_fact;
-        }
-    }
-    if ( GSC_noisy_speech && element_mode > IVAS_SCE && core_brate < ACELP_7k20 )
-    {
-        for ( i = 80; i < L_frame; i++ )
-        {
-            exc_diffQ[i] *= ( +0.0024f * (float) i + 1.192f );
-        }
-    }
-#else
     IF( GSC_noisy_speech )
     {
         FOR( i = 0; i < L_frame; i++ )
@@ -964,7 +884,7 @@ void highband_exc_dct_in_fx(
             move16();
         }
     }
-#endif
+
     Comp_and_apply_gain_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, Q_exc );
 
     IF( exc_wo_nf != NULL )
@@ -1019,14 +939,10 @@ void highband_exc_dct_in_fx(
             FOR( i = sub( L_FRAME, 16 ); i < L_FRAME; i++ )
             {
                 /*exc_dct_in[i] *= (0.067f*i-15.f); */
-                tmp = mult_r( 17564, shl( i, 6 ) );   /*0.067 in Q18 and i in Q6= Q9 */
-                tmp = sub( tmp, 7680 );               /*15 in Q9 = Q9 */
-                L_tmp = L_mult( exc_dct_in[i], tmp ); /*Q(Q_exc+10) */
-#ifdef BASOP_NOGLOB
+                tmp = mult_r( 17564, shl( i, 6 ) );                                      /*0.067 in Q18 and i in Q6= Q9 */
+                tmp = sub( tmp, 7680 );                                                  /*15 in Q9 = Q9 */
+                L_tmp = L_mult( exc_dct_in[i], tmp );                                    /*Q(Q_exc+10) */
                 exc_dct_in[i] = round_fx_o( L_shl_o( L_tmp, 6, &Overflow ), &Overflow ); /*Q_exc */
-#else                                                                                    /* BASOP_NOGLOB */
-                exc_dct_in[i] = round_fx( L_shl( L_tmp, 6 ) );                  /*Q_exc */
-#endif                                                                                   /* BASOP_NOGLOB */
             }
         }
 
@@ -1061,15 +977,9 @@ void highband_exc_dct_in_fx(
                         IF( GT_16( tmp, abs_s( *dst ) ) )
                         {
                             tmp2 = *src;
-#ifdef BASOP_NOGLOB
                             *src = mult_r( 16384, sub_o( *src, abs_s( *dst ), &Overflow ) ); /*Q_exc */
                             move16();
                             tmp = mult_r( 16384, add_o( tmp2, abs_s( *dst ), &Overflow ) ); /*Q_exc */
-#else                                                                                       /* BASOP_NOGLOB */
-                            *src = mult_r( 16384, sub( *src, abs_s( *dst ) ) ); /*Q_exc */
-                            move16();
-                            tmp = mult_r( 16384, add( tmp2, abs_s( *dst ) ) ); /*Q_exc */
-#endif
                             if ( tmp2 > 0 )
                             {
                                 *src = tmp;
@@ -1176,17 +1086,9 @@ void highband_exc_dct_in_ivas_fx(
         /* output of Pow2() will be: */
         /* 16384 < Pow2() <= 32767 */
         exp = sub( exp, 14 );
-#ifdef BASOP_NOGLOB
         tmp1 = shl_o( tmp, exp, &Overflow );
-#else  /* BASOP_NOGLOB */
-        tmp1 = shl( tmp, exp );
-#endif /* BASOP_NOGLOB */
         move16();
-#ifdef BASOP_NOGLOB
         ener = add_o( tmp1, ener, &Overflow ); /*Q0 */
-#else                                          /* BASOP_NOGLOB */
-        ener = add( tmp1, ener ); /*Q0 */
-#endif                                         /* BASOP_NOGLOB */
     }
 
     test();
@@ -1270,7 +1172,6 @@ void highband_exc_dct_in_ivas_fx(
         {
             IF( exc_diffQ[i] == 0 )
             {
-                // PMT("code below to be validated for IVAS use")
                 /* exc_diffQ[i] += 2.0f * noisepb[0] * ((float)own_random(seed_tcx) / PCM16_TO_FLT_FAC);*/
                 tmp = mult( shl( noisepb[0], 1 ), Random( seed_tcx ) ); /*Q15 */
                 tmp = shr( tmp, sub( 15, Qexc_diffQ ) );                /*qNoise_fac */
@@ -1351,131 +1252,126 @@ void highband_exc_dct_in_ivas_fx(
             }
         }
     }
+
     /*--------------------------------------------------------------------------------------*
      * Apply decoded gain onto the difference signal
      *--------------------------------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
+
     IF( GSC_IVAS_mode >= 1 )
     {
-        // float scale_factLF = 0.9f;
-        Word16 scale_factLF = 29491;
+        Word16 scale_factLF = 29491; /* 0.9f */
         move16();
-        // float scale_factHF = 0.9f;
-        Word16 scale_factHF = 29491;
+        Word16 scale_factHF = 29491; /* 0.9f */
         move16();
 
         test();
         test();
         IF( EQ_16( GSC_IVAS_mode, 1 ) && GSC_noisy_speech == 0 )
         {
-            // scale_factHF = 0.8f;
             scale_factHF = 26214;
             move16();
         }
         ELSE IF( EQ_16( GSC_IVAS_mode, 2 ) || EQ_16( GSC_noisy_speech, 1 ) )
         {
-            // scale_factHF = 0.71f;
-            scale_factHF = 23265;
+            scale_factHF = 23265; /* 0.71f */
             move16();
         }
         ELSE IF( EQ_16( GSC_IVAS_mode, 3 ) )
         {
-            // scale_factHF = 0.9f;
-            scale_factHF = 29491;
+            scale_factHF = 29491; /* 0.9f */
             move16();
         }
         FOR( i = 0; i < pit_band_idx * 16; i++ )
         {
-            // exc_diffQ[i] *= scale_factLF;
             exc_diffQ[i] = mult_r( exc_diffQ[i], scale_factLF );
         }
         FOR( ; i < L_frame; i++ )
         {
-            // exc_diffQ[i] *= scale_factHF;
             exc_diffQ[i] = mult_r( exc_diffQ[i], scale_factHF );
             move16();
         }
     }
     ELSE IF( GSC_noisy_speech )
     {
-        // float scale_fact = 0.9f;
-        Word16 scale_fact = 29491;
+        Word16 scale_fact = 29491; /* 0.9f */
         move16();
 
         IF( EQ_16( element_mode, IVAS_CPE_TD ) )
         {
             IF( coder_type == INACTIVE )
             {
-                // scale_fact = 1.0f;
-                scale_fact = 32767;
+                scale_fact = 32767; /* 1.0f */
                 move16();
             }
             ELSE
             {
-                // scale_fact = 0.95f;
-                scale_fact = 31129;
+                scale_fact = 31129; /* 0.95f */
                 move16();
             }
         }
         ELSE IF( GT_16( element_mode, IVAS_SCE ) )
         {
-            // scale_fact = 0.71f;
-            scale_fact = 23265;
+            scale_fact = 23265; /* 0.71f */
             move16();
         }
 
         FOR( i = 0; i < L_frame; i++ )
         {
-            // exc_diffQ[i] *= scale_fact;
             exc_diffQ[i] = mult_r( exc_diffQ[i], scale_fact );
             move16();
         }
     }
+
     IF( GSC_noisy_speech && GT_16( element_mode, IVAS_SCE ) && LT_32( core_brate, ACELP_7k20 ) )
     {
         FOR( i = 80; i < L_frame; i++ )
         {
-            // exc_diffQ[i] *= (+0.0024f * (float)i + 1.192f);
+            /* exc_diffQ[i] *= (+0.0024f * (float)i + 1.192f); */
             exc_diffQ[i] = mult_r( shl( exc_diffQ[i], 1 ) /*Q16*/, (Word16) L_shr( L_add( 629 * i, 312475 ) /*Q18*/, Q4 ) /*Q14*/ );
             move16();
         }
     }
-#else
-    IF( GSC_noisy_speech )
+
+    IF( EQ_16( element_mode, EVS_MONO ) )
     {
-        FOR( i = 0; i < L_frame; i++ )
+        Comp_and_apply_gain_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, *Q_exc );
+
+        IF( exc_wo_nf != NULL )
         {
-            exc_diffQ[i] = mult_r( exc_diffQ[i], 29491 );
-            move16();
+            Comp_and_apply_gain_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Qexc_diffQ, *Q_exc );
+            Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );
         }
     }
-#endif
-    Word16 Q_tmp = *Q_exc;
-    move16();
-    Word16 Q_old = *Q_exc;
-    move16();
-    Comp_and_apply_gain_ivas_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, Q_exc );
-
-    IF( exc_wo_nf != NULL )
+    ELSE
     {
-        Comp_and_apply_gain_ivas_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Qexc_diffQ, &Q_tmp );
-        IF( GT_16( Q_tmp, *Q_exc ) )
+        Word16 Q_tmp = *Q_exc;
+        move16();
+        Word16 Q_old = *Q_exc;
+        move16();
+        Comp_and_apply_gain_ivas_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, Q_exc );
+
+        IF( exc_wo_nf != NULL )
         {
-            Scale_sig( exc_wo_nf, L_frame, sub( *Q_exc, Q_tmp ) );
+            Comp_and_apply_gain_ivas_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Qexc_diffQ, &Q_tmp );
+            IF( GT_16( Q_tmp, *Q_exc ) )
+            {
+                Scale_sig( exc_wo_nf, L_frame, sub( *Q_exc, Q_tmp ) );
+            }
+            ELSE IF( LT_16( Q_tmp, *Q_exc ) )
+            {
+                Scale_sig( exc_diffQ, L_frame, sub( Q_tmp, *Q_exc ) );
+                *Q_exc = Q_tmp;
+                move16();
+            }
+            Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, Q_old ) );
+            Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );
         }
-        ELSE IF( LT_16( Q_tmp, *Q_exc ) )
+        ELSE
         {
-            Scale_sig( exc_diffQ, L_frame, sub( Q_tmp, *Q_exc ) );
-            *Q_exc = Q_tmp;
-            move16();
+            Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, Q_old ) );
         }
-        Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, Q_old ) );
-        Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );
-    }
-    ELSE
-    {
-        Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, Q_old ) );
     }
+
     /*--------------------------------------------------------------------------------------*
      * add the correction layer to the LF bins,
      * and add the quantized pulses or the noise for the higher part of the spectrum
@@ -1515,7 +1411,10 @@ void highband_exc_dct_in_ivas_fx(
             Q_hb_exc = 0;
             move16();
             envelop_modify_fx( exc_diffQ, seed_tcx, last_bin, Ener_per_bd_iQ, *Q_exc, &Q_hb_exc );
-            IF( GT_16( *Q_exc, Q_hb_exc ) )
+
+            test();
+            test();
+            IF( GT_16( *Q_exc, Q_hb_exc ) && GT_16( element_mode, EVS_MONO ) && exc_wo_nf != NULL )
             {
                 Scale_sig( exc_wo_nf, L_frame, sub( Q_hb_exc, *Q_exc ) );
                 *Q_exc = Q_hb_exc;
@@ -1533,14 +1432,10 @@ void highband_exc_dct_in_ivas_fx(
             FOR( i = sub( L_FRAME, 16 ); i < L_FRAME; i++ )
             {
                 /*exc_dct_in[i] *= (0.067f*i-15.f); */
-                tmp = mult_r( 17564, shl( i, 6 ) );   /*0.067 in Q18 and i in Q6= Q9 */
-                tmp = sub( tmp, 7680 );               /*15 in Q9 = Q9 */
-                L_tmp = L_mult( exc_dct_in[i], tmp ); /*Q(Q_exc+10) */
-#ifdef BASOP_NOGLOB
+                tmp = mult_r( 17564, shl( i, 6 ) );                                      /*0.067 in Q18 and i in Q6= Q9 */
+                tmp = sub( tmp, 7680 );                                                  /*15 in Q9 = Q9 */
+                L_tmp = L_mult( exc_dct_in[i], tmp );                                    /*Q(Q_exc+10) */
                 exc_dct_in[i] = round_fx_o( L_shl_o( L_tmp, 6, &Overflow ), &Overflow ); /*Q_exc */
-#else                                                                                    /* BASOP_NOGLOB */
-                exc_dct_in[i] = round_fx( L_shl( L_tmp, 6 ) );                  /*Q_exc */
-#endif                                                                                   /* BASOP_NOGLOB */
             }
         }
 
@@ -1575,15 +1470,9 @@ void highband_exc_dct_in_ivas_fx(
                         IF( GT_16( tmp, abs_s( *dst ) ) )
                         {
                             tmp2 = *src;
-#ifdef BASOP_NOGLOB
                             *src = mult_r( 16384, sub_o( *src, abs_s( *dst ), &Overflow ) ); /*Q_exc */
                             move16();
                             tmp = mult_r( 16384, add_o( tmp2, abs_s( *dst ), &Overflow ) ); /*Q_exc */
-#else                                                                                       /* BASOP_NOGLOB */
-                            *src = mult_r( 16384, sub( *src, abs_s( *dst ) ) ); /*Q_exc */
-                            move16();
-                            tmp = mult_r( 16384, add( tmp2, abs_s( *dst ) ) ); /*Q_exc */
-#endif
                             IF( tmp2 > 0 )
                             {
                                 *src = tmp;
diff --git a/lib_com/gs_preech.c b/lib_com/gs_preech.c
deleted file mode 100644
index 092558fb85c4a12571164954832f0eeb71419692..0000000000000000000000000000000000000000
--- a/lib_com/gs_preech.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
-
-#define ATT_LENGHT16k 80
-#ifndef IVAS_FLOAT_FIXED
-#define INV_L_FRAME16k ( 1.0f / L_FRAME16k )
-#endif
-
-#define ATT_LENGHT  64
-#define ATT_SEG_LEN ( L_FRAME / ATT_LENGHT )
-
-#ifndef IVAS_FLOAT_FIXED
-#define INV_ATT_SEG_LEN ( 1.0f / ATT_SEG_LEN )
-#define INV_L_FRAME     ( 1.0f / L_FRAME )
-#endif
-
-#ifndef IVAS_FLOAT_FIXED
-/*-------------------------------------------------------------------*
- * pre_echo_att()
- *
- * Attenuation of the pre-echo when encoder specifies an attack
- *-------------------------------------------------------------------*/
-
-void pre_echo_att(
-    float *Last_frame_ener,        /* i/o: Energy of the last frame         */
-    float *exc,                    /* i/o: Excitation of the current frame  */
-    const int16_t attack_flag,     /* i  : attack flag (GSC or TC)          */
-    const int16_t last_coder_type, /* i  : Last coder type                  */
-    const int16_t L_frame          /* i  : frame length                     */
-)
-{
-    float etmp;
-    float etmp1;
-    float finc[ATT_LENGHT16k], ratio_float, inv_l_frame;
-    int16_t att_len;
-    int16_t attack_pos, i;
-
-    if ( attack_flag > 0 && last_coder_type == AUDIO )
-    {
-        /*-------------------------------------------------------------------------*
-         * Find where the onset (attack) occurs by computing the energy per section
-         * The inverse weighting aims to favor the first maxima in case of
-         * gradual onset
-         *-------------------------------------------------------------------------*/
-
-        att_len = ATT_LENGHT;
-        if ( L_frame == L_FRAME16k )
-        {
-            att_len = ATT_LENGHT16k;
-        }
-        for ( i = 0; i < att_len; i++ )
-        {
-            finc[i] = sum2_f( exc + i * ATT_SEG_LEN, ATT_SEG_LEN ) * ( (float) ( att_len - i ) / ( att_len ) );
-        }
-        etmp = -1;
-        attack_pos = maximum( finc, att_len, &etmp );
-
-        /* Scaled the maximum energy and allowed 6 dB increase*/
-        etmp *= INV_ATT_SEG_LEN;
-        etmp1 = etmp;
-        *Last_frame_ener *= 4.0f;
-
-        /* If the maximum normalized energy > last frame energy + 6dB */
-        if ( etmp > *Last_frame_ener && attack_pos > 0 )
-        {
-            /* Find the average energy before the attack */
-            etmp = sum_f( finc, attack_pos ) + 0.01f;
-            etmp /= ( attack_pos * ATT_SEG_LEN );
-
-            /* Find the correction factor and apply it before the attack */
-            ratio_float = (float) sqrt( *Last_frame_ener / etmp );
-
-
-            /* Pre-echo atttenuation should never increase the energy */
-            ratio_float = min( ratio_float, 1.0f );
-            for ( i = 0; i < attack_pos * ATT_SEG_LEN; i++ )
-            {
-                exc[i] *= ratio_float;
-            }
-        }
-        *Last_frame_ener = etmp1;
-    }
-    else
-    {
-        /*-------------------------------------------------------*
-         * In normal cases, just compute the energy of the frame
-         *-------------------------------------------------------*/
-
-        etmp = sum2_f( exc, L_frame ) + 0.01f;
-        inv_l_frame = INV_L_FRAME;
-        if ( L_frame == L_FRAME16k )
-        {
-            inv_l_frame = INV_L_FRAME16k;
-        }
-        etmp *= inv_l_frame;
-        *Last_frame_ener = etmp;
-    }
-
-    return;
-}
-#endif
-
-void pre_echo_att_fx(
-    Word32 *Last_frame_ener_fx,      /* i/o: Energy of the last frame         2*Q_new+1*/
-    Word16 *exc_fx,                  /* i/o: Excitation of the current frame  Q_new*/
-    const Word16 gsc_attack_flag_fx, /* i  : flag signalling attack encoded by AC mode (GSC)	Q0*/
-    const Word16 Q_new,
-    const Word16 last_coder_type, /* i  : Last coding mode		Q0*/
-    const Word16 L_frame          /* i  : Frame length			Q0*/
-)
-{
-    Word32 etmp_fx;
-    Word32 finc_fx[ATT_LENGHT16k] = { 0 };
-    move16();
-    Word16 ratio_fx;
-    Word16 attack_pos_fx, i;
-    Word32 L_tmp, L_tmp1;
-    Word16 tmp, n1, n2, exp, frac1, frac2;
-    Word32 etmp1_fx;
-    Word16 att_len;
-
-    test();
-    IF( gsc_attack_flag_fx > 0 && EQ_16( last_coder_type, AUDIO ) ) /*gsc_attack_flag_fx does not get set for all the test cases */
-    {
-        /*-------------------------------------------------------------------------*
-         * Find where the onset (attack) occurs by computing the energy per section
-         * The inverse weighting aims to favor the first maxima in case of
-         * gradual onset
-         *-------------------------------------------------------------------------*/
-        att_len = ATT_LENGHT; /* Q0 */
-        move16();
-        if ( EQ_16( L_frame, L_FRAME16k ) )
-        {
-            att_len = ATT_LENGHT16k; /* Q0 */
-            move16();
-        }
-        FOR( i = 0; i < att_len; i++ )
-        {
-            L_tmp = sum2_fx( &exc_fx[i * 4], ATT_SEG_LEN ); /*2*Q_new+1, //ATT_SEG_LEN=(L_FRAME/ATT_LENGHT)=4(=shl(x,2))*/
-            tmp = div_s( sub( att_len, i ), att_len );      /*Q15 */
-            L_tmp = Mult_32_16( L_tmp, tmp );               /*2*Q_new+1 */
-            finc_fx[i] = L_tmp;
-            move32(); /*2*Q_new+1 */
-        }
-
-        attack_pos_fx = maximum_32_fx( finc_fx, att_len, &etmp_fx );
-
-        /* Scaled the maximum energy and allowed 6 dB increase*/
-        etmp_fx = L_shr( etmp_fx, add( 2 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_ATT_SEG_LEN=1/4(=shr(x,2)) -> Q4 */
-        etmp1_fx = etmp_fx;
-        move32();
-#ifdef BASOP_NOGLOB
-        *Last_frame_ener_fx = L_shl_sat( *Last_frame_ener_fx, 2 );
-#else
-        *Last_frame_ener_fx = L_shl( *Last_frame_ener_fx, 2 );
-#endif
-        move32(); /*2*Q_new+1 */
-
-        /* If the maximum normalized energy > last frame energy + 6dB */
-        test();
-        IF( GT_32( etmp_fx, *Last_frame_ener_fx ) && attack_pos_fx > 0 )
-        {
-            /* Find the average energy before the attack */
-            L_tmp = sum32_fx( finc_fx, attack_pos_fx );                  /*Q1 */
-            L_tmp1 = L_shr( L_mult( attack_pos_fx, attack_pos_fx ), 1 ); /*Q0 */
-            tmp = round_fx( Isqrt( L_tmp1 ) );                           /*Q15 */
-            L_tmp = L_shr( L_tmp, 2 );                                   /*Q1 ; ATT_SEG_LEN=4 */
-            etmp_fx = Mult_32_16( L_tmp, tmp );                          /*Q1 */
-
-            etmp_fx = L_shr( etmp_fx, add( 1 - 4, shl( Q_new, 1 ) ) ); /* makes etmp i nQ4 as *Last_frame_ener_fx */
-                                                                       /* Find the correction factor and apply it before the attack */
-                                                                       /*   ratio = (float)sqrt(*Last_frame_ener/etmp);*/
-                                                                       /*         = isqrt(etmp/(*Last_frame_ener))			*/
-            etmp_fx = L_max( etmp_fx, 1 );
-            *Last_frame_ener_fx = L_max( *Last_frame_ener_fx, 1 );
-            move32();
-            n1 = norm_l( etmp_fx );
-            n2 = norm_l( *Last_frame_ener_fx );
-
-            n1 = sub( n1, 1 );
-            exp = sub( n1, n2 );
-
-            frac1 = round_fx( L_shl( etmp_fx, n1 ) );
-#ifdef BASOP_NOGLOB
-            frac2 = round_fx_sat( L_shl_sat( *Last_frame_ener_fx, n2 ) );
-#else
-            frac2 = round_fx( L_shl( *Last_frame_ener_fx, n2 ) );
-#endif
-            L_tmp = L_mult0( 128, div_s( frac1, frac2 ) ); /* s = gain_out / gain_in */
-            L_tmp = L_shr( L_tmp, exp );                   /* add exponent */
-
-            L_tmp = Isqrt( L_tmp );
-            ratio_fx = round_fx( L_shl( L_tmp, 9 ) ); /* Q13 */
-
-            /* Pre-echo atttenuation should never increase the energy */
-            ratio_fx = s_min( ratio_fx, 8192 /* 1 in Q13 */ ); /* Q13 */
-            FOR( i = 0; i < attack_pos_fx * ATT_SEG_LEN; i++ )
-            {
-                /*exc_fx[i] *= ratio_fx;*/
-                exc_fx[i] = round_fx( L_shl( L_mac( -8192, exc_fx[i], ratio_fx ), 2 ) );
-                move16();
-            }
-        }
-        *Last_frame_ener_fx = etmp1_fx; /*2*Q_new+1*/
-        move32();
-    }
-    ELSE
-    {
-        /*-------------------------------------------------------*
-         * In normal cases, just compute the energy of the frame
-         *-------------------------------------------------------*/
-
-        etmp_fx = sum2_fx( exc_fx, L_frame ); /*2*Q_new+1 */
-#ifdef ADD_LRTD
-        PMTE()
-        etmp_fx = L_shr( etmp_fx, add( 8 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_L_FRAME = 1/256 -> Q4*/
-#else
-        etmp_fx = L_shr( etmp_fx, add( 8 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_L_FRAME = 1/256 -> Q4*/
-#endif
-        *Last_frame_ener_fx = etmp_fx;
-        move32(); /*2*Q_new+1*/
-    }
-
-    return;
-}
-
-
-void pre_echo_att_ivas_fx(
-    Word32 *Last_frame_ener_fx,      /* i/o: Energy of the last frame         2*Q_new+1*/
-    Word16 *exc_fx,                  /* i/o: Excitation of the current frame  Q_new*/
-    const Word16 gsc_attack_flag_fx, /* i  : flag signalling attack encoded by AC mode (GSC)	Q0*/
-    const Word16 Q_new,
-    const Word16 last_coder_type, /* i  : Last coding mode				Q0*/
-    const Word16 L_frame          /* i  : Frame length					Q0*/
-)
-{
-    Word32 etmp_fx;
-    Word32 finc_fx[ATT_LENGHT16k] = { 0 };
-    move16();
-    Word16 ratio_fx;
-    Word16 attack_pos_fx, i;
-    Word32 L_tmp, L_tmp1;
-    Word16 tmp, n1, n2, exp, frac1, frac2;
-    Word32 etmp1_fx;
-    Word16 att_len;
-
-    test();
-    IF( gsc_attack_flag_fx > 0 && EQ_16( last_coder_type, AUDIO ) ) /*gsc_attack_flag_fx does not get set for all the test cases */
-    {
-        /*-------------------------------------------------------------------------*
-         * Find where the onset (attack) occurs by computing the energy per section
-         * The inverse weighting aims to favor the first maxima in case of
-         * gradual onset
-         *-------------------------------------------------------------------------*/
-        att_len = ATT_LENGHT; /* Q0 */
-        move16();
-        if ( EQ_16( L_frame, L_FRAME16k ) )
-        {
-            att_len = ATT_LENGHT16k; /* Q0 */
-            move16();
-        }
-        FOR( i = 0; i < att_len; i++ )
-        {
-            L_tmp = sum2_fx( &exc_fx[i * 4], ATT_SEG_LEN ); /*2*Q_new+1, //ATT_SEG_LEN=(L_FRAME/ATT_LENGHT)=4(=shl(x,2))*/
-            tmp = div_s( sub( att_len, i ), att_len );      /*Q15 */
-            L_tmp = Mult_32_16( L_tmp, tmp );               /*2*Q_new+1 */
-            finc_fx[i] = L_tmp;
-            move32(); /*2*Q_new+1 */
-        }
-
-        attack_pos_fx = maximum_32_fx( finc_fx, att_len, &etmp_fx );
-
-        /* Scaled the maximum energy and allowed 6 dB increase*/
-        etmp_fx = L_shr( etmp_fx, add( 2 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_ATT_SEG_LEN=1/4(=shr(x,2)) -> Q4 */
-        etmp1_fx = etmp_fx;
-        move32();
-#ifdef BASOP_NOGLOB
-        *Last_frame_ener_fx = L_shl_sat( *Last_frame_ener_fx, 2 );
-#else
-        *Last_frame_ener_fx = L_shl( *Last_frame_ener_fx, 2 );
-#endif
-        move32(); /*2*Q_new+1 */
-
-        /* If the maximum normalized energy > last frame energy + 6dB */
-        test();
-        IF( GT_32( etmp_fx, *Last_frame_ener_fx ) && attack_pos_fx > 0 )
-        {
-            /* Find the average energy before the attack */
-            L_tmp = sum32_fx( finc_fx, attack_pos_fx );                  /*Q1 */
-            L_tmp1 = L_shr( L_mult( attack_pos_fx, attack_pos_fx ), 1 ); /*Q0 */
-            tmp = round_fx( Isqrt( L_tmp1 ) );                           /*Q15 */
-            L_tmp = L_shr( L_tmp, 2 );                                   /*Q1 ; ATT_SEG_LEN=4 */
-            etmp_fx = Mult_32_16( L_tmp, tmp );                          /*Q1 */
-
-            etmp_fx = L_shr( etmp_fx, add( 1 - 4, shl( Q_new, 1 ) ) ); /* makes etmp i nQ4 as *Last_frame_ener_fx */
-                                                                       /* Find the correction factor and apply it before the attack */
-                                                                       /*   ratio = (float)sqrt(*Last_frame_ener/etmp);*/
-                                                                       /*         = isqrt(etmp/(*Last_frame_ener))			*/
-            etmp_fx = L_max( etmp_fx, 1 );
-            *Last_frame_ener_fx = L_max( *Last_frame_ener_fx, 1 );
-            move32();
-            n1 = norm_l( etmp_fx );
-            n2 = norm_l( *Last_frame_ener_fx );
-
-            n1 = sub( n1, 1 );
-            exp = sub( n1, n2 );
-
-            frac1 = round_fx( L_shl( etmp_fx, n1 ) );
-#ifdef BASOP_NOGLOB
-            frac2 = round_fx_sat( L_shl_sat( *Last_frame_ener_fx, n2 ) );
-#else
-            frac2 = round_fx( L_shl( *Last_frame_ener_fx, n2 ) );
-#endif
-            L_tmp = L_mult0( 128, div_s( frac1, frac2 ) ); /* s = gain_out / gain_in */
-            L_tmp = L_shr( L_tmp, exp );                   /* add exponent */
-
-            L_tmp = Isqrt( L_tmp );
-            ratio_fx = round_fx( L_shl( L_tmp, 9 ) );
-
-            /* Pre-echo atttenuation should never increase the energy */
-            ratio_fx = s_min( ratio_fx, 8192 /* 1 in Q13 */ ); /* Q13 */
-            FOR( i = 0; i < attack_pos_fx * ATT_SEG_LEN; i++ )
-            {
-                /*exc_fx[i] *= ratio_fx;*/
-                exc_fx[i] = round_fx( L_shl( L_mac( -8192, exc_fx[i], ratio_fx ), 2 ) );
-                move16();
-            }
-        }
-        *Last_frame_ener_fx = etmp1_fx; /* 2 * Q_new + 1 */
-        move32();
-    }
-    ELSE
-    {
-        /*-------------------------------------------------------*
-         * In normal cases, just compute the energy of the frame
-         *-------------------------------------------------------*/
-        Word16 exp_etmp = sub( 15, Q_new );
-        etmp_fx = sum2_16_exp_fx( exc_fx, L_frame, &exp_etmp, 7 ); /* Q = 31-exp_etmp */
-
-        etmp_fx = L_shr( etmp_fx, 8 ); /*31-exp_etmp//INV_L_FRAME = 1/256*/
-
-        IF( EQ_16( L_frame, L_FRAME16k ) )
-        {
-            etmp_fx = Mpy_32_16_1( etmp_fx, 26214 /* 0.8 in Q15 */ ); /*31 - exp_etmp*/
-        }
-        *Last_frame_ener_fx = L_shl( etmp_fx, sub( shl( Q_new, 1 ), sub( 30 /*31-1*/, exp_etmp ) ) ); /*2*Q_new+1*/
-        move32();                                                                                     /*2*Q_new+1*/
-    }
-
-    return;
-}
diff --git a/lib_com/gs_preech_fx.c b/lib_com/gs_preech_fx.c
index 548cba204f55601d6cfc57deb9ea5944478db8bf..16d3ce0e51bc79ee06acccdeaac96b3c6a8b737d 100644
--- a/lib_com/gs_preech_fx.c
+++ b/lib_com/gs_preech_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,9 +39,8 @@
 #include <math.h>
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -101,11 +100,7 @@ void pre_echo_att_fx(
         etmp_fx = L_shr( etmp_fx, add( 2 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_ATT_SEG_LEN=1/4(=shr(x,2)) -> Q4 */
         etmp1_fx = etmp_fx;
         move32();
-#ifdef BASOP_NOGLOB
         *Last_frame_ener_fx = L_shl_sat( *Last_frame_ener_fx, 2 );
-#else
-        *Last_frame_ener_fx = L_shl( *Last_frame_ener_fx, 2 );
-#endif
         move32(); /*2*Q_new+1 */
 
         /* If the maximum normalized energy > last frame energy + 6dB */
@@ -133,11 +128,7 @@ void pre_echo_att_fx(
             exp = sub( n1, n2 );
 
             frac1 = round_fx( L_shl( etmp_fx, n1 ) );
-#ifdef BASOP_NOGLOB
             frac2 = round_fx_sat( L_shl_sat( *Last_frame_ener_fx, n2 ) );
-#else
-            frac2 = round_fx( L_shl( *Last_frame_ener_fx, n2 ) );
-#endif
             L_tmp = L_mult0( 128, div_s( frac1, frac2 ) ); /* s = gain_out / gain_in */
             L_tmp = L_shr( L_tmp, exp );                   /* add exponent */
 
@@ -162,13 +153,8 @@ void pre_echo_att_fx(
          * In normal cases, just compute the energy of the frame
          *-------------------------------------------------------*/
 
-        etmp_fx = sum2_fx( exc_fx, L_frame ); /*2*Q_new+1 */
-#ifdef ADD_LRTD
-        PMTE()
+        etmp_fx = sum2_fx( exc_fx, L_frame );                          /*2*Q_new+1 */
         etmp_fx = L_shr( etmp_fx, add( 8 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_L_FRAME = 1/256 -> Q4*/
-#else
-        etmp_fx = L_shr( etmp_fx, add( 8 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_L_FRAME = 1/256 -> Q4*/
-#endif
         *Last_frame_ener_fx = etmp_fx;
         move32(); /*2*Q_new+1*/
     }
@@ -191,9 +177,10 @@ void pre_echo_att_ivas_fx(
     move16();
     Word16 ratio_fx;
     Word16 attack_pos_fx, i;
-    Word32 L_tmp, L_tmp1;
-    Word16 tmp, n1, n2, exp, frac1, frac2;
+    Word32 L_tmp;
+    Word16 tmp, tmp_e;
     Word32 etmp1_fx;
+    Word16 etmp_e;
     Word16 att_len;
 
     test();
@@ -226,11 +213,7 @@ void pre_echo_att_ivas_fx(
         etmp_fx = L_shr( etmp_fx, add( 2 + 1 - 4, shl( Q_new, 1 ) ) ); /*2*Q_new+1 //INV_ATT_SEG_LEN=1/4(=shr(x,2)) -> Q4 */
         etmp1_fx = etmp_fx;
         move32();
-#ifdef BASOP_NOGLOB
         *Last_frame_ener_fx = L_shl_sat( *Last_frame_ener_fx, 2 );
-#else
-        *Last_frame_ener_fx = L_shl( *Last_frame_ener_fx, 2 );
-#endif
         move32(); /*2*Q_new+1 */
 
         /* If the maximum normalized energy > last frame energy + 6dB */
@@ -238,36 +221,19 @@ void pre_echo_att_ivas_fx(
         IF( GT_32( etmp_fx, *Last_frame_ener_fx ) && attack_pos_fx > 0 )
         {
             /* Find the average energy before the attack */
-            L_tmp = sum32_fx( finc_fx, attack_pos_fx );                  /*Q1 */
-            L_tmp1 = L_shr( L_mult( attack_pos_fx, attack_pos_fx ), 1 ); /*Q0 */
-            tmp = round_fx( Isqrt( L_tmp1 ) );                           /*Q15 */
-            L_tmp = L_shr( L_tmp, 2 );                                   /*Q1 ; ATT_SEG_LEN=4 */
-            etmp_fx = Mult_32_16( L_tmp, tmp );                          /*Q1 */
-
-            etmp_fx = L_shr( etmp_fx, add( 1 - 4, shl( Q_new, 1 ) ) ); /* makes etmp i nQ4 as *Last_frame_ener_fx */
-                                                                       /* Find the correction factor and apply it before the attack */
-                                                                       /*   ratio = (float)sqrt(*Last_frame_ener/etmp);*/
-                                                                       /*         = isqrt(etmp/(*Last_frame_ener))			*/
-            etmp_fx = L_max( etmp_fx, 1 );
-            *Last_frame_ener_fx = L_max( *Last_frame_ener_fx, 1 );
-            move32();
-            n1 = norm_l( etmp_fx );
-            n2 = norm_l( *Last_frame_ener_fx );
-
-            n1 = sub( n1, 1 );
-            exp = sub( n1, n2 );
-
-            frac1 = round_fx( L_shl( etmp_fx, n1 ) );
-#ifdef BASOP_NOGLOB
-            frac2 = round_fx_sat( L_shl_sat( *Last_frame_ener_fx, n2 ) );
-#else
-            frac2 = round_fx( L_shl( *Last_frame_ener_fx, n2 ) );
-#endif
-            L_tmp = L_mult0( 128, div_s( frac1, frac2 ) ); /* s = gain_out / gain_in */
-            L_tmp = L_shr( L_tmp, exp );                   /* add exponent */
+            etmp_fx = sum32_fx( finc_fx, attack_pos_fx );
+            etmp_e = sub( 31, add( shl( Q_new, 1 ), 1 ) );
+            etmp_fx = L_add( etmp_fx, L_shr( 21474836 /*0.01 in Q31*/, etmp_e ) ); /* etmp = etmp + 0.01;   (exp = etmp_e) */
+            etmp_fx = L_deposit_h( BASOP_Util_Divide3232_Scale( etmp_fx, L_mult0( attack_pos_fx, ATT_SEG_LEN ), &tmp_e ) );
+            tmp_e = add( tmp_e, sub( etmp_e, 31 ) );
+            etmp_e = tmp_e;
+            move16();
 
-            L_tmp = Isqrt( L_tmp );
-            ratio_fx = round_fx( L_shl( L_tmp, 9 ) );
+            /* Find the correction factor and apply it before the attack */
+            tmp = BASOP_Util_Divide3232_Scale( *Last_frame_ener_fx, etmp_fx, &tmp_e ); /* numerator Q = 2 * Q_new + 1;  denominator Q = 31 - tmp_e */
+            tmp_e = add( tmp_e, sub( sub( 31, etmp_e ), add( shl( Q_new, 1 ), 1 ) ) ); /* tmp_e = tmp_e + (31 - tmp_e) - (2 * Q_new + 1) */
+            tmp = Sqrt16( tmp, &tmp_e );
+            ratio_fx = shr_sat( tmp, sub( 2, tmp_e ) ); /* Q13 */
 
             /* Pre-echo atttenuation should never increase the energy */
             ratio_fx = s_min( ratio_fx, 8192 /* 1 in Q13 */ ); /* Q13 */
diff --git a/lib_com/hp50.c b/lib_com/hp50.c
deleted file mode 100644
index 02c11ce6cb3427c6706d659f70056eb300c73ef5..0000000000000000000000000000000000000000
--- a/lib_com/hp50.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include <math.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*
- * hp20
- *
- * Function:
- *    2nd order high pass filter with nominal cut off frequency at 20 Hz.
- *
- * Returns:
- *    void
- */
-
-#ifndef IVAS_FLOAT_FIXED
-void hp20_flt(
-    Float32 signal[],
-    const Word16 lg,
-    Float32 mem[],
-    const Word32 Fs )
-{
-    Word16 i;
-    Float32 x0, x1, x2, y0, y1, y2;
-    Float32 a1, a2, b1, b2;
-
-    y1 = mem[0];
-    y2 = mem[1];
-    x0 = mem[2];
-    x1 = mem[3];
-
-    if ( Fs == 8000 )
-    {
-        /* hp filter 20Hz at 3dB for 8000KHz input sampling rate
-           [b,a] = butter(2, 20.0/4000.0, 'high');
-           b = [0.988954248067140  -1.977908496134280   0.988954248067140]
-           a =[1.000000000000000  -1.977786483776764   0.978030508491796]*/
-        a1 = 1.977786483776764f;
-        a2 = -0.978030508491796f;
-        b1 = -1.977908496134280f;
-        b2 = 0.988954248067140f;
-    }
-    else if ( Fs == 16000 )
-    {
-        /* hp filter 20Hz at 3dB for 16000KHz sampling rate
-           [b,a] = butter(2, 20.0/8000.0, 'high');
-           b =[ 0.994461788958195  -1.988923577916390   0.994461788958195]
-           a =[1.000000000000000  -1.988892905899653   0.988954249933127] */
-        a1 = 1.988892905899653f;
-        a2 = -0.988954249933127f;
-        b1 = -1.988923577916390f;
-        b2 = 0.994461788958195f;
-    }
-    else if ( Fs == 32000 )
-    {
-        /* hp filter 20Hz at 3dB for 32000KHz sampling rate
-           [b,a] = butter(2, 20.0/16000.0, 'high');
-           b =[0.997227049904470  -1.994454099808940   0.997227049904470]
-           a =[1.000000000000000  -1.994446410541927   0.994461789075954]*/
-        a1 = 1.994446410541927f;
-        a2 = -0.994461789075954f;
-        b1 = -1.994454099808940f;
-        b2 = 0.997227049904470f;
-    }
-    else
-    {
-        /* hp filter 20Hz at 3dB for 48000KHz sampling rate
-           [b,a] = butter(2, 20.0/24000.0, 'high');
-           b =[ 0.998150511190452  -1.996301022380904   0.998150511190452]
-           a =[1.000000000000000  -1.996297601769122   0.996304442992686]*/
-        a1 = 1.996297601769122f;
-        a2 = -0.996304442992686f;
-        b1 = -1.996301022380904f;
-        b2 = 0.998150511190452f;
-    }
-
-    for ( i = 0; i < lg; i++ )
-    {
-        x2 = x1;
-        x1 = x0;
-        x0 = signal[i];
-        y0 = ( y1 * a1 ) + ( y2 * a2 ) + ( x0 * b2 ) + ( x1 * b1 ) + ( x2 * b2 );
-        signal[i] = y0;
-        y2 = y1;
-        y1 = y0;
-    }
-
-    mem[0] = ( ( y1 > 1e-10 ) | ( y1 < -1e-10 ) ) ? y1 : 0;
-    mem[1] = ( ( y2 > 1e-10 ) | ( y2 < -1e-10 ) ) ? y2 : 0;
-    mem[2] = ( ( x0 > 1e-10 ) | ( x0 < -1e-10 ) ) ? x0 : 0;
-    mem[3] = ( ( x1 > 1e-10 ) | ( x1 < -1e-10 ) ) ? x1 : 0;
-
-    return;
-}
-#endif
-
-
-#define HP20_COEFF_SCALE ( 2 )
-/*
- * hp20
- *
- * Function:
- *    2nd order high pass filter with nominal cut off frequency at 20 Hz.
- *
- * Returns:
- *    void
- */
-
-static Word32 HP50_Mode2_Mpy_32_16_fix( Word32 a, Word16 b )
-{
-    Word32 result = Mpy_32_16_1( a, b );
-    /* perform rounding towards lower value for negative results */
-    if ( result < 0 )
-        result = L_add( result, 1 );
-    return result;
-}
-
-static Word32 HP50_Mpy_32_32_fix( Word32 a, Word32 b )
-{
-    Word32 result = Mpy_32_32( a, b );
-    /* perform rounding towards lower value for negative results */
-    if ( result < 0 )
-        result = L_add( result, 1 );
-    return result;
-}
-
-
-static void filter_2nd_order(
-    Word16 signal[],
-    const Word16 stride,
-    const Word16 prescale,
-    const Word16 lg,
-    Word32 mem[4],
-    Word32 a1,
-    Word32 a2,
-    Word32 b1,
-    Word32 b2 )
-{
-
-    Word16 i;
-    Word16 x2, x1;
-    Word32 L_sum, L_y1, L_y2;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-#endif
-
-
-    /*
-     * Saturation: The states of the filter, namely L_y1 and L_y2 shall
-     * never saturate, because that causes error in the filter feedback.
-     * The final output written into signal[] might saturate because of
-     * unavoidable filter overshoot.
-     */
-
-    /* Execute first 2 iterations with 32-bit x anx y memory values */
-    BASOP_SATURATE_ERROR_ON_EVS
-    L_sum = HP50_Mpy_32_32_fix( b2, mem[2] );                 /* b2*x2 */
-    L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( b1, mem[3] ) ); /* b1*x1 */
-    x2 = shr( signal[0], prescale );
-    L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b2, x2 ) ); /* b2*x0 */
-    L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[0], a2 ) );   /* y2*a2 */
-    L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[1], a1 ) );   /* y1*a1 */
-
-#ifdef BASOP_NOGLOB
-    L_y2 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-    L_y2 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
-    BASOP_SATURATE_ERROR_OFF_EVS
-    BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
-    signal[0] = round_fx_o( L_shl_o( L_y2, prescale, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    signal[0] = round_fx( L_shl( L_y2, prescale ) );
-#endif /* BASOP_NOGLOB */
-    BASOP_SATURATE_WARNING_ON_EVS
-
-    BASOP_SATURATE_ERROR_ON_EVS
-    L_sum = HP50_Mpy_32_32_fix( b2, mem[3] );                   /* b2*x2 */
-    L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b1, x2 ) ); /* b1*x1 */
-    x1 = shr( signal[stride], prescale );
-    L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b2, x1 ) ); /* b2*x0 */
-    L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[1], a2 ) );   /* y2*a2 */
-    L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a1 ) );     /* y1*a1 */
-
-#ifdef BASOP_NOGLOB
-    L_y1 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-    L_y1 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
-    BASOP_SATURATE_ERROR_OFF_EVS
-    BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
-    signal[stride] = round_fx_o( L_shl_o( L_y1, prescale, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    signal[stride] = round_fx( L_shl( L_y1, prescale ) );
-#endif /* BASOP_NOGLOB */
-    BASOP_SATURATE_WARNING_ON_EVS
-    move16();
-
-    /* New we use a trick and toggle x1/x2 and L_y1/L_y2 to save a few cycles unrolling the loop by 2 */
-    FOR( i = 2; i < lg; i += 2 )
-    {
-        /* y[i+0] = b2*x[i-2] + b1*x[i-1] + b2*x[i-0] + a2*y[i-2] + a1*y[i-1];  */
-        BASOP_SATURATE_ERROR_ON_EVS
-        L_sum = HP50_Mode2_Mpy_32_16_fix( b2, x2 );
-        L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b1, x1 ) );
-        x2 = shr( signal[i * stride], prescale );
-        L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b2, x2 ) );
-        L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a2 ) );
-        L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y1, a1 ) );
-
-#ifdef BASOP_NOGLOB
-        L_y2 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-        L_y2 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
-        BASOP_SATURATE_ERROR_OFF_EVS
-        BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
-        signal[i_mult( i, stride )] = round_fx_o( L_shl_o( L_y2, prescale, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        signal[i_mult( i, stride )] = round_fx( L_shl( L_y2, prescale ) );
-        move16();
-#endif /* BASOP_NOGLOB */
-        BASOP_SATURATE_WARNING_ON_EVS
-        /* y[i+1] = b2*x[i-1] + b1*x[i-0] + b2*x[i+1] + a2*y[i-1] + a1*y[i+0];  */
-        BASOP_SATURATE_ERROR_ON_EVS
-        L_sum = HP50_Mode2_Mpy_32_16_fix( b2, x1 );
-        L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b1, x2 ) );
-        x1 = shr( signal[( i + 1 ) * stride], prescale );
-        L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b2, x1 ) );
-        L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y1, a2 ) );
-        L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a1 ) );
-
-#ifdef BASOP_NOGLOB
-        L_y1 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-        L_y1 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
-        BASOP_SATURATE_ERROR_OFF_EVS
-        BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
-        signal[i_mult( add( i, 1 ), stride )] = round_fx_o( L_shl_o( L_y1, prescale, &Overflow ), &Overflow );
-#else /* BASOP_NOGLOB */
-        signal[i_mult( add( i, 1 ), stride )] = round_fx( L_shl( L_y1, prescale ) );
-#endif
-        BASOP_SATURATE_WARNING_ON_EVS
-        move16();
-    }
-    /* update static filter memory from variables */
-    mem[0] = L_y2;
-    move32();
-    mem[1] = L_y1;
-    move32();
-    mem[2] = L_deposit_h( x2 );
-    move32();
-    mem[3] = L_deposit_h( x1 );
-    move32();
-
-
-    return;
-}
-
-
-void hp20( Word16 signal[],     /* i/o: signal to filter                   any */
-           const Word16 stride, /* i  : stride to be applied accessing signal  */
-           const Word16 lg,     /* i  : length of signal (integer)          Q0 */
-           Word32 mem[5],       /* i/o: static filter memory with this layout: */
-           /*      mem[0]: y[-2] (32-bit)                 */
-           /*      mem[1]; y[-1] (32-bit)                 */
-           /*      mem[2]: x[-2] << 16                    */
-           /*      mem[3]: x[-1] << 16                    */
-           /* Note: mem[0..3] need to be scaled per frame */
-           /*      mem[4]: states scale                   */
-           const Word32 sFreq ) /* i  : input sampling rate                 Q0 */
-{
-    Word32 a1, b1, a2, b2;
-    Word16 prescale, prescaleOld, diff;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-#endif
-
-
-    prescale = getScaleFactor16( signal, lg );
-    prescaleOld = extract_l( mem[4] );
-#ifdef BASOP_NOGLOB
-    diff = norm_l( L_shl_sat( mem[2], prescaleOld ) );
-#else
-    diff = norm_l( L_shl( mem[2], prescaleOld ) );
-#endif
-    if ( mem[2] != 0 )
-    {
-        prescale = s_min( prescale, diff );
-    }
-#ifdef BASOP_NOGLOB
-    diff = norm_l( L_shl_o( mem[3], prescaleOld, &Overflow ) );
-#else
-    diff = norm_l( L_shl( mem[3], prescaleOld ) );
-#endif
-    if ( mem[3] != 0 )
-    {
-        prescale = s_min( prescale, diff );
-    }
-    /* Take into account the left shift performed into the loop + 1 bit headroom*/
-    prescale = s_max( -12, sub( 1 + HP20_COEFF_SCALE, prescale ) );
-    IF( prescale != prescaleOld )
-    {
-        diff = sub( prescale, prescaleOld );
-#ifdef BASOP_NOGLOB
-        mem[0] = L_shr_o( mem[0], diff, &Overflow );
-        move32();
-        mem[1] = L_shr_o( mem[1], diff, &Overflow );
-        move32();
-        mem[2] = L_shr_o( mem[2], diff, &Overflow );
-        move32();
-        mem[3] = L_shr_o( mem[3], diff, &Overflow );
-        move32();
-#else
-        mem[0] = L_shr( mem[0], diff );
-        move32();
-        mem[1] = L_shr( mem[1], diff );
-        move32();
-        mem[2] = L_shr( mem[2], diff );
-        move32();
-        mem[3] = L_shr( mem[3], diff );
-        move32();
-#endif
-        mem[4] = L_deposit_l( prescale );
-    }
-
-    IF( EQ_32( sFreq, 8000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 8000 Hz input sampling rate
-           [b,a] = butter(2, 20.0/4000.0, 'high');
-           b = [0.988954248067140  -1.977908496134280   0.988954248067140]
-           a = [1.000000000000000  -1.977786483776764   0.978030508491796]*/
-        a1 = 1061816033l /* 1.977786483776764 Q29*/;
-        move32();
-        a2 = -525076131l /*-0.978030508491796 Q29*/;
-        move32();
-        b1 = -1061881538l /*-1.977908496134280 Q29*/;
-        move32();
-        b2 = 530940769l /* 0.988954248067140 Q29*/;
-        move32();
-    }
-    ELSE IF( EQ_32( sFreq, 16000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 16000KHz sampling rate
-           [b,a] = butter(2, 20.0/8000.0, 'high');
-           b = [0.994461788958195  -1.988923577916390   0.994461788958195]
-           a = [1.000000000000000  -1.988892905899653   0.988954249933127] */
-        a1 = 1067778748l /* 1.988892905899653 Q29*/;
-        move32();
-        a2 = -530940770l /*-0.988954249933127 Q29*/;
-        move32();
-        b1 = -1067795215l /*-1.988923577916390 Q29*/;
-        move32();
-        b2 = 533897608l /* 0.994461788958195 Q29*/;
-        move32();
-    }
-    ELSE IF( EQ_32( sFreq, 32000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 32000KHz sampling rate
-           [b,a] = butter(2, 20.0/16000.0, 'high');
-           b = [0.997227049904470  -1.994454099808940   0.997227049904470]
-           a = [1.000000000000000  -1.994446410541927   0.994461789075954]*/
-        a1 = 1070760263l /* 1.994446410541927 Q29*/;
-        move32();
-        a2 = -533897608l /*-0.994461789075954 Q29*/;
-        move32();
-        b1 = -1070764392l /*-1.994454099808940 Q29*/;
-        move32();
-        b2 = 535382196l /* 0.997227049904470 Q29*/;
-        move32();
-    }
-    ELSE
-    {
-        assert( sFreq == 48000 );
-        /* hp filter 20Hz at 3dB for 48000KHz sampling rate
-           [b,a] = butter(2, 20.0/24000.0, 'high');
-           b =[0.998150511190452  -1.996301022380904   0.998150511190452]
-           a =[1.000000000000000  -1.996297601769122   0.996304442992686]*/
-        a1 = 1071754114l /* 1.996297601769122 Q29*/;
-        move32();
-        a2 = -534886875l /*-0.996304442992686 Q29*/;
-        move32();
-        b1 = -1071755951l /*-1.996301022380904 Q29*/;
-        move32();
-        b2 = 535877975l /* 0.998150511190452 Q29*/;
-        move32();
-    }
-
-
-    filter_2nd_order( signal, stride, prescale, lg,
-                      mem, a1, a2, b1, b2 );
-
-    return;
-}
-
-
-#ifdef HP20_FIX32_RECODING
-void hp20_fx_32(
-    Word32 signal_fx[],
-    const Word16 lg,
-    Word32 mem_fx[],
-    const Word32 Fs )
-{
-    Word32 i;
-    Word32 a1_fx, a2_fx, b1_fx, b2_fx;
-    Word32 diff_pos, diff_neg;
-#ifdef BASOP_NOGLOB
-    Flag Overflow = 0;
-#endif
-    Word16 prescale, prescaleOld, prescale_current_frame, diff;
-
-    prescale = getScaleFactor32( signal_fx, lg );
-    prescale_current_frame = s_min( 3, sub( 1 + HP20_COEFF_SCALE, prescale ) );
-
-
-    prescaleOld = extract_l( mem_fx[4] );
-
-#ifdef BASOP_NOGLOB
-    diff_pos = norm_l( L_shl_o( L_max( mem_fx[2], mem_fx[3] ), prescaleOld, &Overflow ) );
-    diff_neg = norm_l( L_shl_o( L_min( mem_fx[2], mem_fx[3] ), prescaleOld, &Overflow ) );
-#else
-    diff_pos = norm_l( L_shl( L_max( mem_fx[2], mem_fx[3] ), prescaleOld ) );
-    diff_neg = norm_l( L_shl( L_min( mem_fx[2], mem_fx[3] ), prescaleOld ) );
-#endif
-
-    diff = L_max( diff_pos, diff_neg );
-
-    IF( NE_16( diff, 0 ) )
-    {
-        prescale = s_min( prescale, diff );
-    }
-
-    prescale = s_min( 3, sub( 1 + HP20_COEFF_SCALE, prescale ) );
-
-    diff = sub( prescale, prescaleOld );
-#ifdef BASOP_NOGLOB
-    mem_fx[0] = L_shr_o( mem_fx[0], diff, &Overflow );
-    move32();
-    mem_fx[1] = L_shr_o( mem_fx[1], diff, &Overflow );
-    move32();
-    mem_fx[2] = L_shr_o( mem_fx[2], diff, &Overflow );
-    move32();
-    mem_fx[3] = L_shr_o( mem_fx[3], diff, &Overflow );
-    move32();
-#else
-    mem_fx[0] = L_shr( mem_fx[0], diff );
-    move32();
-    mem_fx[1] = L_shr( mem_fx[1], diff );
-    move32();
-    mem_fx[2] = L_shr( mem_fx[2], diff );
-    move32();
-    mem_fx[3] = L_shr( mem_fx[3], diff );
-    move32();
-#endif
-    mem_fx[4] = L_deposit_l( prescale_current_frame );
-    move32();
-
-    IF( EQ_32( Fs, 8000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 8000KHz input sampling rate
-           [b,a] = butter(2, 20.0/4000.0, 'high');
-           b = [0.988954248067140  -1.977908496134280   0.988954248067140]
-           a =[1.000000000000000  -1.977786483776764   0.978030508491796]*/
-        a1_fx = 1061816033l /* 1.977786483776764 Q29*/;
-        a2_fx = -525076131l /*-0.978030508491796 Q29*/;
-        b1_fx = -1061881538l /*-1.977908496134280 Q29*/;
-        b2_fx = 530940769l /* 0.988954248067140 Q29*/;
-    }
-    ELSE IF( EQ_32( Fs, 16000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 16000KHz sampling rate
-           [b,a] = butter(2, 20.0/8000.0, 'high');
-           b =[ 0.994461788958195  -1.988923577916390   0.994461788958195]
-           a =[1.000000000000000  -1.988892905899653   0.988954249933127] */
-        a1_fx = 1067778748l /* 1.988892905899653 Q29*/;
-        a2_fx = -530940770l /*-0.988954249933127 Q29*/;
-        b1_fx = -1067795215l /*-1.988923577916390 Q29*/;
-        b2_fx = 533897608l /* 0.994461788958195 Q29*/;
-    }
-    ELSE IF( EQ_32( Fs, 32000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 32000KHz sampling rate
-           [b,a] = butter(2, 20.0/16000.0, 'high');
-           b =[0.997227049904470  -1.994454099808940   0.997227049904470]
-           a =[1.000000000000000  -1.994446410541927   0.994461789075954]*/
-        a1_fx = 1070760263l /* 1.994446410541927 Q29*/;
-        a2_fx = -533897608l /*-0.994461789075954 Q29*/;
-        b1_fx = -1070764392l /*-1.994454099808940 Q29*/;
-        b2_fx = 535382196l /* 0.997227049904470 Q29*/;
-    }
-    ELSE
-    {
-        /* hp filter 20Hz at 3dB for 48000KHz sampling rate
-           [b,a] = butter(2, 20.0/24000.0, 'high');
-           b =[ 0.998150511190452  -1.996301022380904   0.998150511190452]
-           a =[1.000000000000000  -1.996297601769122   0.996304442992686]*/
-        a1_fx = 1071754114l /* 1.996297601769122 Q29*/;
-        a2_fx = -534886875l /*-0.996304442992686 Q29*/;
-        b1_fx = -1071755951l /*-1.996301022380904 Q29*/;
-        b2_fx = 535877975l /* 0.998150511190452 Q29*/;
-    }
-    move32();
-    move32();
-    move32();
-    move32();
-    Word64 W_sum, W_y0, W_y1, W_y2;
-    Word32 x0, x1, x2;
-
-    W_sum = W_mult_32_32( b2_fx, mem_fx[2] );       /* b2*x2 */
-    W_sum = W_mac_32_32( W_sum, b1_fx, mem_fx[3] ); /* b1*x1 */
-    x2 = L_shr( signal_fx[0], prescale );
-    W_sum = W_mac_32_32( W_sum, b2_fx, x2 );        /* b2*x0 */
-    W_sum = W_mac_32_32( W_sum, mem_fx[0], a2_fx ); /* y2*a2 */
-    W_sum = W_mac_32_32( W_sum, mem_fx[1], a1_fx ); /* y1*a1 */
-    W_y2 = W_shl( W_sum, HP20_COEFF_SCALE );
-    signal_fx[0] = W_extract_h( W_shl( W_y2, prescale ) );
-    move32();
-
-    W_sum = W_mult_32_32( b2_fx, mem_fx[3] ); /* b2*x2 */
-    W_sum = W_mac_32_32( W_sum, b1_fx, x2 );  /* b1*x1 */
-    x1 = L_shr( signal_fx[1], prescale );
-    W_sum = W_mac_32_32( W_sum, b2_fx, x1 );                  /* b2*x0 */
-    W_sum = W_mac_32_32( W_sum, mem_fx[1], a2_fx );           /* y2*a2 */
-    W_sum = W_mac_32_32( W_sum, W_extract_h( W_y2 ), a1_fx ); /* y1*a1 */
-    W_y1 = W_shl( W_sum, HP20_COEFF_SCALE );
-    signal_fx[1] = W_extract_h( W_shl( W_y1, prescale ) );
-    move32();
-
-    diff = sub( prescale_current_frame, prescale );
-    W_y1 = W_shr( W_y1, diff );
-    W_y2 = W_shr( W_y2, diff );
-    x2 = L_shr( x2, diff );
-    x1 = L_shr( x1, diff );
-
-    FOR( i = 2; i < lg; i++ )
-    {
-        W_sum = W_mult_32_32( b2_fx, x2 );       /* b2*x2 */
-        W_sum = W_mac_32_32( W_sum, b1_fx, x1 ); /* b1*x1 */
-        x0 = L_shr( signal_fx[i], prescale_current_frame );
-        W_sum = W_mac_32_32( W_sum, b2_fx, x0 );                  /* b2*x0 */
-        W_sum = W_mac_32_32( W_sum, W_extract_h( W_y2 ), a2_fx ); /* y2*a2 */
-        W_sum = W_mac_32_32( W_sum, W_extract_h( W_y1 ), a1_fx ); /* y1*a1 */
-        W_y0 = W_shl( W_sum, HP20_COEFF_SCALE );
-
-        signal_fx[i] = W_extract_h( W_shl( W_y0, prescale_current_frame ) );
-        move32();
-
-        x2 = x1;
-        x1 = x0;
-        W_y2 = W_y1;
-        W_y1 = W_y0;
-
-        move32();
-        move32();
-        move64();
-        move64();
-    }
-
-    mem_fx[0] = W_extract_h( W_y2 );
-    mem_fx[1] = W_extract_h( W_y1 );
-    mem_fx[2] = x2;
-    mem_fx[3] = x1;
-
-    move32();
-    move32();
-    move32();
-    move32();
-
-    return;
-}
-#else
-void hp20_fx_32(
-    Word32 signal_fx[],
-    const Word16 lg,
-    Word32 mem_fx[],
-    const Word32 Fs )
-{
-    Word16 i;
-    Word32 a1_fx, a2_fx, b1_fx, b2_fx;
-    Word16 Qx0, Qx1, Qx2, Qy1, Qprev_y1, Qy2, Qprev_y2, Qmin;
-    Word64 x0_fx64, x1_fx64, x2_fx64, y0_fx64, y1_fx64, y2_fx64, R1, R2, R3, R4, R5;
-
-    IF( EQ_32( Fs, 8000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 8000KHz input sampling rate
-           [b,a] = butter(2, 20.0/4000.0, 'high');
-           b = [0.988954248067140  -1.977908496134280   0.988954248067140]
-           a =[1.000000000000000  -1.977786483776764   0.978030508491796]*/
-        a1_fx = 1061816033l /* 1.977786483776764 Q29*/;
-        a2_fx = -525076131l /*-0.978030508491796 Q29*/;
-        b1_fx = -1061881538l /*-1.977908496134280 Q29*/;
-        b2_fx = 530940769l /* 0.988954248067140 Q29*/;
-    }
-    ELSE IF( EQ_32( Fs, 16000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 16000KHz sampling rate
-           [b,a] = butter(2, 20.0/8000.0, 'high');
-           b =[ 0.994461788958195  -1.988923577916390   0.994461788958195]
-           a =[1.000000000000000  -1.988892905899653   0.988954249933127] */
-        a1_fx = 1067778748l /* 1.988892905899653 Q29*/;
-        a2_fx = -530940770l /*-0.988954249933127 Q29*/;
-        b1_fx = -1067795215l /*-1.988923577916390 Q29*/;
-        b2_fx = 533897608l /* 0.994461788958195 Q29*/;
-    }
-    ELSE IF( EQ_32( Fs, 32000 ) )
-    {
-        /* hp filter 20Hz at 3dB for 32000KHz sampling rate
-           [b,a] = butter(2, 20.0/16000.0, 'high');
-           b =[0.997227049904470  -1.994454099808940   0.997227049904470]
-           a =[1.000000000000000  -1.994446410541927   0.994461789075954]*/
-        a1_fx = 1070760263l /* 1.994446410541927 Q29*/;
-        a2_fx = -533897608l /*-0.994461789075954 Q29*/;
-        b1_fx = -1070764392l /*-1.994454099808940 Q29*/;
-        b2_fx = 535382196l /* 0.997227049904470 Q29*/;
-    }
-    ELSE
-    {
-        /* hp filter 20Hz at 3dB for 48000KHz sampling rate
-           [b,a] = butter(2, 20.0/24000.0, 'high');
-           b =[ 0.998150511190452  -1.996301022380904   0.998150511190452]
-           a =[1.000000000000000  -1.996297601769122   0.996304442992686]*/
-        a1_fx = 1071754114l /* 1.996297601769122 Q29*/;
-        a2_fx = -534886875l /*-0.996304442992686 Q29*/;
-        b1_fx = -1071755951l /*-1.996301022380904 Q29*/;
-        b2_fx = 535877975l /* 0.998150511190452 Q29*/;
-    }
-    move32();
-    move32();
-    move32();
-    move32();
-
-    Qprev_y1 = extract_l( mem_fx[4] );
-    Qprev_y2 = extract_l( mem_fx[5] );
-    y1_fx64 = W_deposit32_l( mem_fx[0] );
-    y2_fx64 = W_deposit32_l( mem_fx[1] );
-    x0_fx64 = W_deposit32_l( mem_fx[2] );
-    x1_fx64 = W_deposit32_l( mem_fx[3] );
-
-    FOR( i = 0; i < lg; i++ )
-    {
-        x2_fx64 = x1_fx64;
-        move64();
-        x1_fx64 = x0_fx64;
-        move64();
-        x0_fx64 = W_deposit32_l( signal_fx[i] );
-
-        Qy1 = W_norm( y1_fx64 );
-        if ( y1_fx64 == 0 )
-        {
-            Qy1 = 62;
-            move16();
-        }
-        Qy1 = sub( Qy1, 34 );
-        R1 = W_mult0_32_32( W_extract_l( W_shl( y1_fx64, Qy1 ) ), a1_fx );
-        Qy1 = add( Qy1, Qprev_y1 );
-
-        Qy2 = W_norm( y2_fx64 );
-        if ( y2_fx64 == 0 )
-        {
-            Qy2 = 62;
-            move16();
-        }
-        Qy2 = sub( Qy2, 34 );
-        R2 = W_mult0_32_32( W_extract_l( W_shl( y2_fx64, Qy2 ) ), a2_fx );
-        Qy2 = add( Qy2, Qprev_y2 );
-
-        Qx0 = W_norm( x0_fx64 );
-        if ( x0_fx64 == 0 )
-        {
-            Qx0 = 62;
-            move16();
-        }
-        Qx0 = sub( Qx0, 34 );
-        R3 = W_mult0_32_32( W_extract_l( W_shl( x0_fx64, Qx0 ) ), b2_fx );
-
-        Qx1 = W_norm( x1_fx64 );
-        if ( x1_fx64 == 0 )
-        {
-            Qx1 = 62;
-            move16();
-        }
-        Qx1 = sub( Qx1, 34 );
-        R4 = W_mult0_32_32( W_extract_l( W_shl( x1_fx64, Qx1 ) ), b1_fx );
-
-        Qx2 = W_norm( x2_fx64 );
-        if ( x2_fx64 == 0 )
-        {
-            Qx2 = 62;
-            move16();
-        }
-        Qx2 = sub( Qx2, 34 );
-        R5 = W_mult0_32_32( W_extract_l( W_shl( x2_fx64, Qx2 ) ), b2_fx );
-
-        Qmin = s_min( Qy1, Qy2 );
-
-        y0_fx64 = W_add( W_shr( R1, sub( Qy1, Qmin ) ), W_shr( R2, sub( Qy2, Qmin ) ) );
-
-        Qmin = s_min( Qmin, Qx0 );
-        Qmin = s_min( Qmin, Qx1 );
-        Qmin = s_min( Qmin, Qx2 );
-
-        y0_fx64 = W_add( W_shr( y0_fx64, sub( s_min( Qy1, Qy2 ), Qmin ) ), W_add( W_shr( R3, sub( Qx0, Qmin ) ), W_add( W_shr( R4, sub( Qx1, Qmin ) ), W_shr( R5, sub( Qx2, Qmin ) ) ) ) );
-
-        y0_fx64 = W_shr( y0_fx64, 29 );
-
-        signal_fx[i] = W_extract_l( W_shr( y0_fx64, Qmin ) );
-        move32();
-        IF( signal_fx[i] < 0 )
-        {
-            signal_fx[i] = L_add( signal_fx[i], 1 );
-            move32();
-        }
-
-        y2_fx64 = y1_fx64;
-        y1_fx64 = y0_fx64;
-        Qprev_y2 = Qprev_y1;
-        Qprev_y1 = Qmin;
-        move64();
-        move64();
-        move16();
-        move16();
-    }
-
-    Qy1 = W_norm( y1_fx64 );
-    test();
-    IF( y1_fx64 != 0 && LT_16( Qy1, 32 ) )
-    {
-        y1_fx64 = W_shr( y1_fx64, sub( 32, Qy1 ) );
-        Qprev_y1 = sub( Qprev_y1, sub( 32, Qy1 ) );
-    }
-
-    Qy2 = W_norm( y2_fx64 );
-    test();
-    IF( y2_fx64 != 0 && LT_16( Qy2, 32 ) )
-    {
-        y2_fx64 = W_shr( y2_fx64, sub( 32, Qy2 ) );
-        Qprev_y2 = sub( Qprev_y2, sub( 32, Qy2 ) );
-    }
-
-    mem_fx[0] = W_extract_l( y1_fx64 );
-    mem_fx[1] = W_extract_l( y2_fx64 );
-    mem_fx[2] = W_extract_l( x0_fx64 );
-    mem_fx[3] = W_extract_l( x1_fx64 );
-    mem_fx[4] = Qprev_y1;
-    mem_fx[5] = Qprev_y2;
-    move32();
-    move32();
-    move32();
-    move32();
-    move32();
-    move32();
-
-    return;
-}
-#endif
diff --git a/lib_com/hp50_fx.c b/lib_com/hp50_fx.c
index 78e358a80881101ca146b9e16c50d2452ec748bf..f1864d7a792a27526a97321276cde5df053c8bb0 100644
--- a/lib_com/hp50_fx.c
+++ b/lib_com/hp50_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,19 +37,8 @@
 #include <stdint.h>
 #include <math.h>
 #include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
-
-/*
- * hp20
- *
- * Function:
- *    2nd order high pass filter with nominal cut off frequency at 20 Hz.
- *
- * Returns:
- *    void
- */
+#include "wmc_auto.h"
 
 
 #define HP20_COEFF_SCALE ( 2 )
@@ -118,18 +107,10 @@ static void filter_2nd_order(
     L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[0], a2 ) );   /* y2*a2 */
     L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[1], a1 ) );   /* y1*a1 */
 
-#ifdef BASOP_NOGLOB
     L_y2 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-    L_y2 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
     BASOP_SATURATE_ERROR_OFF_EVS
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     signal[0] = round_fx_o( L_shl_o( L_y2, prescale, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    signal[0] = round_fx( L_shl( L_y2, prescale ) );
-#endif /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
 
     BASOP_SATURATE_ERROR_ON_EVS
@@ -140,18 +121,10 @@ static void filter_2nd_order(
     L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[1], a2 ) );   /* y2*a2 */
     L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a1 ) );     /* y1*a1 */
 
-#ifdef BASOP_NOGLOB
     L_y1 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-    L_y1 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
     BASOP_SATURATE_ERROR_OFF_EVS
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     signal[stride] = round_fx_o( L_shl_o( L_y1, prescale, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    signal[stride] = round_fx( L_shl( L_y1, prescale ) );
-#endif /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
     move16();
 
@@ -167,19 +140,10 @@ static void filter_2nd_order(
         L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a2 ) );
         L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y1, a1 ) );
 
-#ifdef BASOP_NOGLOB
         L_y2 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-        L_y2 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
         BASOP_SATURATE_ERROR_OFF_EVS
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         signal[i_mult( i, stride )] = round_fx_o( L_shl_o( L_y2, prescale, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        signal[i_mult( i, stride )] = round_fx( L_shl( L_y2, prescale ) );
-        move16();
-#endif /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
         /* y[i+1] = b2*x[i-1] + b1*x[i-0] + b2*x[i+1] + a2*y[i-1] + a1*y[i+0];  */
         BASOP_SATURATE_ERROR_ON_EVS
@@ -190,18 +154,10 @@ static void filter_2nd_order(
         L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y1, a2 ) );
         L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a1 ) );
 
-#ifdef BASOP_NOGLOB
         L_y1 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
-#else
-        L_y1 = L_shl( L_sum, HP20_COEFF_SCALE );
-#endif
         BASOP_SATURATE_ERROR_OFF_EVS
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         signal[i_mult( add( i, 1 ), stride )] = round_fx_o( L_shl_o( L_y1, prescale, &Overflow ), &Overflow );
-#else /* BASOP_NOGLOB */
-        signal[i_mult( add( i, 1 ), stride )] = round_fx( L_shl( L_y1, prescale ) );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         move16();
     }
@@ -241,20 +197,12 @@ void hp20( Word16 signal[],     /* i/o: signal to filter                   any *
 
     prescale = getScaleFactor16( signal, lg );
     prescaleOld = extract_l( mem[4] );
-#ifdef BASOP_NOGLOB
     diff = norm_l( L_shl_sat( mem[2], prescaleOld ) );
-#else
-    diff = norm_l( L_shl( mem[2], prescaleOld ) );
-#endif
     if ( mem[2] != 0 )
     {
         prescale = s_min( prescale, diff );
     }
-#ifdef BASOP_NOGLOB
     diff = norm_l( L_shl_o( mem[3], prescaleOld, &Overflow ) );
-#else
-    diff = norm_l( L_shl( mem[3], prescaleOld ) );
-#endif
     if ( mem[3] != 0 )
     {
         prescale = s_min( prescale, diff );
@@ -264,7 +212,6 @@ void hp20( Word16 signal[],     /* i/o: signal to filter                   any *
     IF( prescale != prescaleOld )
     {
         diff = sub( prescale, prescaleOld );
-#ifdef BASOP_NOGLOB
         mem[0] = L_shr_o( mem[0], diff, &Overflow );
         move32();
         mem[1] = L_shr_o( mem[1], diff, &Overflow );
@@ -273,16 +220,6 @@ void hp20( Word16 signal[],     /* i/o: signal to filter                   any *
         move32();
         mem[3] = L_shr_o( mem[3], diff, &Overflow );
         move32();
-#else
-        mem[0] = L_shr( mem[0], diff );
-        move32();
-        mem[1] = L_shr( mem[1], diff );
-        move32();
-        mem[2] = L_shr( mem[2], diff );
-        move32();
-        mem[3] = L_shr( mem[3], diff );
-        move32();
-#endif
         mem[4] = L_deposit_l( prescale );
     }
 
@@ -366,9 +303,7 @@ void hp20_fx_32(
     Word32 i;
     Word32 a1_fx, a2_fx, b1_fx, b2_fx;
     Word32 diff_pos, diff_neg;
-#ifdef BASOP_NOGLOB
     Flag Overflow = 0;
-#endif
     Word16 prescale, prescaleOld, prescale_current_frame, diff;
 
     prescale = getScaleFactor32( signal_fx, lg );
@@ -377,13 +312,8 @@ void hp20_fx_32(
 
     prescaleOld = extract_l( mem_fx[4] );
 
-#ifdef BASOP_NOGLOB
     diff_pos = norm_l( L_shl_o( L_max( mem_fx[2], mem_fx[3] ), prescaleOld, &Overflow ) );
     diff_neg = norm_l( L_shl_o( L_min( mem_fx[2], mem_fx[3] ), prescaleOld, &Overflow ) );
-#else
-    diff_pos = norm_l( L_shl( L_max( mem_fx[2], mem_fx[3] ), prescaleOld ) );
-    diff_neg = norm_l( L_shl( L_min( mem_fx[2], mem_fx[3] ), prescaleOld ) );
-#endif
 
     diff = L_max( diff_pos, diff_neg );
 
@@ -395,7 +325,6 @@ void hp20_fx_32(
     prescale = s_min( 3, sub( 1 + HP20_COEFF_SCALE, prescale ) );
 
     diff = sub( prescale, prescaleOld );
-#ifdef BASOP_NOGLOB
     mem_fx[0] = L_shr_o( mem_fx[0], diff, &Overflow );
     move32();
     mem_fx[1] = L_shr_o( mem_fx[1], diff, &Overflow );
@@ -404,16 +333,6 @@ void hp20_fx_32(
     move32();
     mem_fx[3] = L_shr_o( mem_fx[3], diff, &Overflow );
     move32();
-#else
-    mem_fx[0] = L_shr( mem_fx[0], diff );
-    move32();
-    mem_fx[1] = L_shr( mem_fx[1], diff );
-    move32();
-    mem_fx[2] = L_shr( mem_fx[2], diff );
-    move32();
-    mem_fx[3] = L_shr( mem_fx[3], diff );
-    move32();
-#endif
     mem_fx[4] = L_deposit_l( prescale_current_frame );
     move32();
 
@@ -613,7 +532,11 @@ void hp20_fx_32(
             move16();
         }
         Qy1 = sub( Qy1, 34 );
+#ifdef OPT_STEREO_32KBPS_V1
+        R1 = W_mult0_32_32( W_shl_sat_l( y1_fx64, Qy1 ), a1_fx );
+#else  /* OPT_STEREO_32KBPS_V1 */
         R1 = W_mult0_32_32( W_extract_l( W_shl( y1_fx64, Qy1 ) ), a1_fx );
+#endif /* OPT_STEREO_32KBPS_V1 */
         Qy1 = add( Qy1, Qprev_y1 );
 
         Qy2 = W_norm( y2_fx64 );
@@ -623,7 +546,11 @@ void hp20_fx_32(
             move16();
         }
         Qy2 = sub( Qy2, 34 );
+#ifdef OPT_STEREO_32KBPS_V1
+        R2 = W_mult0_32_32( W_shl_sat_l( y2_fx64, Qy2 ), a2_fx );
+#else  /* OPT_STEREO_32KBPS_V1 */
         R2 = W_mult0_32_32( W_extract_l( W_shl( y2_fx64, Qy2 ) ), a2_fx );
+#endif /* OPT_STEREO_32KBPS_V1 */
         Qy2 = add( Qy2, Qprev_y2 );
 
         Qx0 = W_norm( x0_fx64 );
@@ -633,7 +560,11 @@ void hp20_fx_32(
             move16();
         }
         Qx0 = sub( Qx0, 34 );
+#ifdef OPT_STEREO_32KBPS_V1
+        R3 = W_mult0_32_32( W_shl_sat_l( x0_fx64, Qx0 ), b2_fx );
+#else  /* OPT_STEREO_32KBPS_V1 */
         R3 = W_mult0_32_32( W_extract_l( W_shl( x0_fx64, Qx0 ) ), b2_fx );
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         Qx1 = W_norm( x1_fx64 );
         if ( x1_fx64 == 0 )
@@ -642,7 +573,11 @@ void hp20_fx_32(
             move16();
         }
         Qx1 = sub( Qx1, 34 );
+#ifdef OPT_STEREO_32KBPS_V1
+        R4 = W_mult0_32_32( W_shl_sat_l( x1_fx64, Qx1 ), b1_fx );
+#else  /* OPT_STEREO_32KBPS_V1 */
         R4 = W_mult0_32_32( W_extract_l( W_shl( x1_fx64, Qx1 ) ), b1_fx );
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         Qx2 = W_norm( x2_fx64 );
         if ( x2_fx64 == 0 )
@@ -651,7 +586,11 @@ void hp20_fx_32(
             move16();
         }
         Qx2 = sub( Qx2, 34 );
+#ifdef OPT_STEREO_32KBPS_V1
+        R5 = W_mult0_32_32( W_shl_sat_l( x2_fx64, Qx2 ), b2_fx );
+#else  /* OPT_STEREO_32KBPS_V1 */
         R5 = W_mult0_32_32( W_extract_l( W_shl( x2_fx64, Qx2 ) ), b2_fx );
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         Qmin = s_min( Qy1, Qy2 );
 
@@ -705,6 +644,7 @@ void hp20_fx_32(
     mem_fx[3] = W_extract_l( x1_fx64 );
     mem_fx[4] = Qprev_y1;
     mem_fx[5] = Qprev_y2;
+
     move32();
     move32();
     move32();
diff --git a/lib_com/hq2_bit_alloc_fx.c b/lib_com/hq2_bit_alloc_fx.c
index 395854d5f678aa22df3ce3c5e1113ab17fa6bbda..61d00ce987958b6092975f5464c0108192b6ea7b 100644
--- a/lib_com/hq2_bit_alloc_fx.c
+++ b/lib_com/hq2_bit_alloc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -312,11 +312,9 @@ void hq2_bit_alloc_har_fx(
 
     Word16 exp_shift;
 
-#ifdef BASOP_NOGLOB
     Flag Overflow;
     Overflow = 0;
     move32();
-#endif
 
     L_THR1 = L_shl( L_deposit_l( THR1 ), SWB_BWE_LR_QRk );
     L_THR2 = L_shl( L_deposit_l( THR2 ), SWB_BWE_LR_QRk );
@@ -572,13 +570,9 @@ void hq2_bit_alloc_har_fx(
 
     L_temp = Mult_32_16( L_Ravg_sub[GRP_SB - 1], sub( GRP_SB, 1 ) ); /* Qbe+0+1 */
     L_temp = Mult_32_16( L_temp, Inv_norm_sum_fx );                  /* Qbe+1+QIpb+1 */
-#ifdef BASOP_NOGLOB
     lf_hf_ge_r_fx = round_fx_o( L_shl_o( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ), &Overflow ), &Overflow );
     Overflow = 0; /* reset BASOP Overflow */
     move32();
-#else
-    lf_hf_ge_r_fx = round_fx( L_shl( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ) ) );
-#endif
 
     exp_normn = norm_s( norm_sum_fx );
     exp_normn = sub( exp_normn, 1 );
diff --git a/lib_com/hq2_core_com.c b/lib_com/hq2_core_com.c
index a30655394a5efef3975152f8327db05f171ee71b..121dae06a1ef18c4cd878c09921758a9d0ced65e 100644
--- a/lib_com/hq2_core_com.c
+++ b/lib_com/hq2_core_com.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,7 @@
 #include <math.h>
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "basop_util.h"
 #include "basop_proto_func.h"
 #include "wmc_auto.h"
diff --git a/lib_com/hq2_core_com_fx.c b/lib_com/hq2_core_com_fx.c
index a7c71ea9fd1722bec49321c65c6a5d1433740496..bf0af5e87d969e7f2f4a226b008982dc83a97ac9 100644
--- a/lib_com/hq2_core_com_fx.c
+++ b/lib_com/hq2_core_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -163,11 +163,7 @@ void mdct_spectrum_denorm_fx(
             pd_fx = div_s( shl( npulses[k], exp_normn ), shl( band_width[k], exp_normd ) ); /* 15 + (exp_norm - exp_normd) */
             Qpd = add( sub( exp_normn, exp_normd ), 15 );
 
-#ifdef BASOP_NOGLOB
             cond_fx = sub( shl_o( pd_fx, sub( 15, Qpd ), &Overflow ), pd_thresh_fx /*Q15*/ ); /* Q15 */
-#else                                                                                         /* BASOP_NOGLOB */
-            cond_fx = sub( shl( pd_fx, sub( 15, Qpd ) ), pd_thresh_fx /*Q15*/ );
-#endif
             Overflow = 0;
             move16(); /* allow overflow happen. */
             IF( cond_fx < 0 )
@@ -200,11 +196,7 @@ void mdct_spectrum_denorm_fx(
                 /*gamma *= gain_tweak; */
                 L_tmp = L_mult( gamma_fx, gain_tweak_fx ); /* Qgamma+Qtweak+1 */
                 exp_norm = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
                 gamma_fx = round_fx_o( L_shl_o( L_tmp, exp_norm, &Overflow ), &Overflow );
-#else
-                gamma_fx = round_fx( L_shl( L_tmp, exp_norm ) );
-#endif
                 Qgamma = sub( add( add( Qgamma, Qtweak ), exp_norm ), 15 ); /*Qgamma+Qtweak+1+exp_norm-16; */
             }
 
@@ -343,11 +335,7 @@ void mdct_spectrum_denorm_ivas_fx(
             pd_fx = div_s( shl( npulses[k], exp_normn ), shl( band_width[k], exp_normd ) ); /* 15 + (exp_normn + exp_normd) */
             Qpd = add( sub( exp_normn, exp_normd ), 15 );
 
-#ifdef BASOP_NOGLOB
             cond_fx = sub( shl_o( pd_fx, sub( 15, Qpd ), &Overflow ), pd_thresh_fx /*Q15*/ ); /* Q15 */
-#else                                                                                         /* BASOP_NOGLOB */
-            cond_fx = sub( shl( pd_fx, sub( 15, Qpd ) ), pd_thresh_fx /*Q15*/ );
-#endif
             Overflow = 0;
             move16(); /* allow overflow happen. */
             IF( cond_fx < 0 )
@@ -380,11 +368,7 @@ void mdct_spectrum_denorm_ivas_fx(
                 /*gamma *= gain_tweak; */
                 L_tmp = L_mult( gamma_fx, gain_tweak_fx ); /* Qgamma+Qtweak+1 */
                 exp_norm = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
                 gamma_fx = round_fx_o( L_shl_o( L_tmp, exp_norm, &Overflow ), &Overflow );
-#else
-                gamma_fx = round_fx( L_shl( L_tmp, exp_norm ) );
-#endif
                 Qgamma = sub( add( add( Qgamma, Qtweak ), exp_norm ), 15 ); /*Qgamma+Qtweak+1+exp_norm-16; */
             }
 
diff --git a/lib_com/hq2_noise_inject_fx.c b/lib_com/hq2_noise_inject_fx.c
index c37ae1236e3e30a092fe30396e3aaca1207e1986..bc96fe0f8fd62525c23e6b49845f01cdcd68d515 100644
--- a/lib_com/hq2_noise_inject_fx.c
+++ b/lib_com/hq2_noise_inject_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -90,13 +90,8 @@ void hq2_noise_inject_fx(
 
     FOR( i = 0; i < bands; i++ )
     {
-#ifdef BASOP_NOGLOB
         Ep_fx[i] = L_shl_o( Ep_fx[i], 6, &Overflow ); /* Q-6 -> Q0 */
         move32();
-#else  /* BASOP_NOGLOB */
-        Ep_fx[i] = L_shl( Ep_fx[i], 6 ); /* Q-6 -> Q0 */
-        move32();
-#endif /* BASOP_NOGLOB */
     }
 
     tmp = add( band_end[bands - 1], 1 );
@@ -160,11 +155,7 @@ void hq2_noise_inject_fx(
         Q_env_fx[k] = sub( 31, exp2 );
         move16();
         tmp = sub( 17, Q_env_fx[k] );
-#ifdef BASOP_NOGLOB
         env_fx2[k] = extract_h( L_shl_o( env_fx[k], tmp, &Overflow ) ); /*Q1 */
-#else                                                                   /* BASOP_NOGLOB */
-        env_fx2[k] = extract_h( L_shl( env_fx[k], tmp ) ); /*Q1 */
-#endif                                                                  /* BASOP_NOGLOB */
         peak_fx[k] = 0;
         move16();
         count[k] = 0;
@@ -175,11 +166,7 @@ void hq2_noise_inject_fx(
             FOR( i = band_start[k]; i <= band_end[k]; i++ )
             {
                 L_tmp = L_mult0( y2hat_fx[i], y2hat_fx[i] ); /* Q0 */
-#ifdef BASOP_NOGLOB
                 Ep_fx[k] = L_sub_o( Ep_fx[k], L_tmp, &Overflow );
-#else                     /* BASOP_NOGLOB */
-                Ep_fx[k] = L_sub( Ep_fx[k], L_tmp );
-#endif                    /* BASOP_NOGLOB */
                 move32(); /* Q0 */
                 IF( GT_16( abs_s( y2hat_fx[i] ), peak_fx[k] ) )
                 {
@@ -399,12 +386,8 @@ void hq2_noise_inject_fx(
                         }
                         ELSE IF( count[k - 1] == 0 && tmp4 > 0 )
                         {
-                            L_tmp = L_mult( env_fx2[k - 1], tmp ); /* Q(1+Q_speech+1 = Q_speech+2) */
-#ifdef BASOP_NOGLOB
+                            L_tmp = L_mult( env_fx2[k - 1], tmp );                                  /* Q(1+Q_speech+1 = Q_speech+2) */
                             fac_fx = extract_h( L_shl_o( L_tmp, sub( 26, Q_speech ), &Overflow ) ); /*Q12 */
-#else
-                            fac_fx = extract_h( L_shl( L_tmp, sub( 26, Q_speech ) ) ); /*Q12 */
-#endif
                         }
                     }
 
@@ -453,11 +436,7 @@ void hq2_noise_inject_fx(
                                 tmp = sub( Q_env_fx[k], Q_Ep_fx[k] );
                                 tmp = sub( tmp, Q_speech );
                                 tmp = add( tmp, 25 );
-#ifdef BASOP_NOGLOB
-                                L_tmp = L_shr_sat( L_tmp2, tmp ); /*Q7 */
-#else
-                                L_tmp = L_shr( L_tmp2, tmp );                          /*Q7 */
-#endif
+                                L_tmp = L_shr_sat( L_tmp2, tmp );                        /*Q7 */
                                 tmp = extract_l( L_min( L_tmp, 192 /* 1.5 in Q7 */ ) );  /* */
                                 fac_fx = extract_h( L_shl( L_mult( fac_fx, tmp ), 8 ) ); /*Q12 */
                             }
@@ -467,11 +446,7 @@ void hq2_noise_inject_fx(
                                 L_tmp2 = Mult_32_16( env_fx[k], tmp );                  /*Q(Q_env_fx[k]+0-15 = Q_env_fx[k]-15) */
                                 L_tmp2 = Mult_32_16( L_tmp2, 20480 /* 1.25 in Q14 */ ); /*Q(Q_env_fx[k]-15+14-15 = Q_env_fx[k]-16) */
                                 tmp = sub( Q_env_fx[k], 23 );
-#ifdef BASOP_NOGLOB
-                                L_tmp = L_shr_sat( L_tmp2, tmp ); /*Q7 */
-#else
-                                L_tmp = L_shr( L_tmp2, tmp );                          /*Q7 */
-#endif
+                                L_tmp = L_shr_sat( L_tmp2, tmp );                           /*Q7 */
                                 tmp = extract_l( ( L_min( L_tmp, 192 /* 1.5 in Q7 */ ) ) ); /* Q7 */
                                 fac_fx = extract_h( L_shl( L_mult( fac_fx, tmp ), 8 ) );    /*Q12 */
                             }
@@ -492,11 +467,7 @@ void hq2_noise_inject_fx(
             }
 
             L_tmp = Mult_32_16( Ep_fx[k], fac_fx ); /*Q(Q_Ep_fx[k]+12-15 = Q_Ep_fx[k]-3) */
-#ifdef BASOP_NOGLOB
             ni_gain_fx[k] = L_shr_o( L_tmp, sub( Q_Ep_fx[k], 20 ), &Overflow );
-#else /* BASOP_NOGLOB */
-            ni_gain_fx[k] = L_shr( L_tmp, sub( Q_Ep_fx[k], 20 ) );
-#endif
             move32(); /*Q17 */
         }
         ELSE
@@ -618,22 +589,14 @@ void hq2_noise_inject_fx(
                 L_tmp = Mult_32_16( Ep_fx[k], tmp );        /*Q(Q_Ep_fx[k]+28-Q_speech-15 = Q_Ep_fx[k]+13-Q_speech) */
                 tmp = sub( Q_Ep_fx[k], Q_speech );
                 tmp = sub( 15, tmp );
-#ifdef BASOP_NOGLOB
                 tmp = extract_h( L_shl_o( L_tmp, tmp, &Overflow ) ); /*Q12 */
-#else
-                tmp = extract_h( L_shl( L_tmp, tmp ) );                    /*Q12 */
-#endif
             }
             ELSE
             {
                 tmp = 0x7fff;                        /*Q0 */
                 L_tmp = Mult_32_16( Ep_fx[k], tmp ); /*Q(Q_Ep_fx[k]+0-15 = Q_Ep_fx[k]-15) */
                 tmp = sub( 43, Q_Ep_fx[k] );
-#ifdef BASOP_NOGLOB
                 tmp = extract_h( L_shl_o( L_tmp, tmp, &Overflow ) ); /*Q12 */
-#else
-                tmp = extract_h( L_shl( L_tmp, tmp ) );                    /*Q12 */
-#endif
             }
             fac_fx = s_max( tmp, 4096 /* 1 in Q12 */ ); /*Q12 */
 
@@ -645,12 +608,8 @@ void hq2_noise_inject_fx(
                     IF( band_width[k] != 0 )
                     {
                         Q_speech = norm_s( band_width[k] );
-#ifdef BASOP_NOGLOB
                         tmp = shl_o( band_width[k], Q_speech, &Overflow ); /*Q(Q_speech) */
-#else
-                        tmp = shl( band_width[k], Q_speech );              /*Q(Q_speech) */
-#endif
-                        tmp = div_s( 16384 /* 0.5 in Q15 */, tmp ); /*Q(15+14-Q_speech) */
+                        tmp = div_s( 16384 /* 0.5 in Q15 */, tmp );        /*Q(15+14-Q_speech) */
                     }
                     ELSE
                     {
@@ -659,16 +618,12 @@ void hq2_noise_inject_fx(
                         move16();
                         move16();
                     }
-                    tmp1 = sub( fac_fx, 4096 /* 1 in Q12 */ ); /*Q12 */
-                    L_tmp = L_mult( tmp1, j );                 /*Q13 */
-                    L_tmp = Mult_32_16( L_tmp, tmp );          /*Q(13+29-Q_speech-15 = 27-Q_speech) */
-#ifdef BASOP_NOGLOB
+                    tmp1 = sub( fac_fx, 4096 /* 1 in Q12 */ );                          /*Q12 */
+                    L_tmp = L_mult( tmp1, j );                                          /*Q13 */
+                    L_tmp = Mult_32_16( L_tmp, tmp );                                   /*Q(13+29-Q_speech-15 = 27-Q_speech) */
                     tmp = extract_h( L_shl_o( L_tmp, add( 1, Q_speech ), &Overflow ) ); /*Q12 */
-#else
-                    tmp = extract_h( L_shl( L_tmp, add( 1, Q_speech ) ) ); /*Q12 */
-#endif
-                    tmp = sub( fac_fx, tmp );                 /*Q12 */
-                    L_tmp = Mult_32_16( ni_gain_fx[k], tmp ); /*Q(17+12-15=14) */
+                    tmp = sub( fac_fx, tmp );                                           /*Q12 */
+                    L_tmp = Mult_32_16( ni_gain_fx[k], tmp );                           /*Q(17+12-15=14) */
                     L_y2[i] = L_add( L_y2[i], L_shr( Mult_32_16( L_tmp, rand_fx ), 2 ) );
                     move32(); /*Q12                   */
                 }
diff --git a/lib_com/hq_conf.c b/lib_com/hq_conf.c
index 84b843fb49ed0868b71fa1b70d309a36dc7635f8..90a256ceab3e43b00c51885fe3e3ac35efea1113 100644
--- a/lib_com/hq_conf.c
+++ b/lib_com/hq_conf.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,9 +38,8 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 
 void hq_configure_fx(
diff --git a/lib_com/hq_conf_fx.c b/lib_com/hq_conf_fx.c
index 503975363a6fa1a3480f1d55b15ad4d06e919962..f6a01adfc0d066e7db3de4204037be610dae2b72 100644
--- a/lib_com/hq_conf_fx.c
+++ b/lib_com/hq_conf_fx.c
@@ -303,11 +303,7 @@ void hq_configure_evs_fx(
     *start_norm = 0;
     move16();
 
-#ifndef SOLVED_COMP_ENC_DEC
     IF( EQ_16( length, L_FRAME48k ) ) /*tbv SOLVED_COMP_ENC_DEC*/
-#else
-    IF( EQ_16( length, L_SPEC48k ) )
-#endif
     {
         IF( EQ_16( hqswb_clas, HQ_GEN_FB ) )
         {
diff --git a/lib_com/hq_tools_fx.c b/lib_com/hq_tools_fx.c
index 468bdd9a52c64a538da9e1909e78c475a657ec43..0e00b9428f61a9c68daa8f2a4da70847b4cc48dc 100644
--- a/lib_com/hq_tools_fx.c
+++ b/lib_com/hq_tools_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,6 @@
 #include "rom_com.h" /* Static table prototypes FIP version    */
 #include "stl.h"     /* required for wmc_tool */
 #include "prot_fx.h"
-#include "prot.h"
 #include "ivas_prot_fx.h"
 
 /*--------------------------------------------------------------------------*
@@ -84,12 +83,8 @@ void hq_swb_harmonic_calc_norm_envelop_fx(
 
         FOR( n_lag = 0; n_lag < n_lag_now; n_lag++ )
         {
-            L_tmp = L_abs( L_SWB_signal[n_lag] ); /*Q12*/
-#ifdef BASOP_NOGLOB
+            L_tmp = L_abs( L_SWB_signal[n_lag] );                              /*Q12*/
             L_envelope[env_index] = L_add_sat( L_envelope[env_index], L_tmp ); /*Q12*/
-#else
-            L_envelope[env_index] = L_add( L_envelope[env_index], L_tmp );
-#endif
             move32();
         }
         env_index = add( env_index, 1 );
@@ -105,12 +100,8 @@ void hq_swb_harmonic_calc_norm_envelop_fx(
         move16();
         FOR( n_lag = 0; n_lag < n_lag_now; n_lag++ )
         {
-            L_tmp = L_abs( L_SWB_signal[( n_freq + n_lag )] ); /*Q12*/
-#ifdef BASOP_NOGLOB
+            L_tmp = L_abs( L_SWB_signal[( n_freq + n_lag )] );                 /*Q12*/
             L_envelope[env_index] = L_add_sat( L_envelope[env_index], L_tmp ); /*Q12*/
-#else
-            L_envelope[env_index] = L_add( L_envelope[env_index], L_tmp );
-#endif
             move32();
         }
         env_index = add( env_index, 1 );
@@ -127,12 +118,8 @@ void hq_swb_harmonic_calc_norm_envelop_fx(
         move32();
         FOR( n_lag = 0; n_lag < n_lag_now; n_lag++ )
         {
-            L_tmp = L_abs( L_SWB_signal[( n_freq + n_lag )] ); /*Q12*/
-#ifdef BASOP_NOGLOB
+            L_tmp = L_abs( L_SWB_signal[( n_freq + n_lag )] );                 /*Q12*/
             L_envelope[env_index] = L_add_sat( L_envelope[env_index], L_tmp ); /*Q12*/
-#else
-            L_envelope[env_index] = L_add( L_envelope[env_index], L_tmp );
-#endif
             move32();
         }
         env_index = add( env_index, 1 );
@@ -560,11 +547,7 @@ void harm_bwe_fine_fx(
             norm_signal = norm_l( envelope[i] );
             enve_lo[i] = L_Extract_lc( L_shl( envelope[i], norm_signal ), &enve_hi[i] ); /*Q12+norm_signal-16*/
             L_signal[i] = Div_32( L_signal[i], enve_hi[i], enve_lo[i] );                 /*Q31 - norm_signal*/
-#ifdef BASOP_NOGLOB
-            SWB_signal[i] = round_fx_sat( L_shl_sat( L_signal[i], norm_signal ) ); /*Q15*/
-#else
-            SWB_signal[i] = round_fx( L_shl( L_signal[i], norm_signal ) );
-#endif
+            SWB_signal[i] = round_fx_sat( L_shl_sat( L_signal[i], norm_signal ) );       /*Q15*/
             move16();
             move16();
             move32();
@@ -574,11 +557,7 @@ void harm_bwe_fine_fx(
             norm_signal = norm_l( envelope[i] );
             enve_lo[i] = L_Extract_lc( L_shl( envelope[i], norm_signal ), &enve_hi[i] );         /*Q12+norm_signal-16*/
             L_signal[i] = L_negate( Div_32( L_negate( L_signal[i] ), enve_hi[i], enve_lo[i] ) ); /*Q31 - norm_signal*/
-#ifdef BASOP_NOGLOB
-            SWB_signal[i] = round_fx_sat( L_shl_sat( L_signal[i], norm_signal ) ); /*Q15*/
-#else
-            SWB_signal[i] = round_fx( L_shl( L_signal[i], norm_signal ) );
-#endif
+            SWB_signal[i] = round_fx_sat( L_shl_sat( L_signal[i], norm_signal ) );               /*Q15*/
             move16();
             move16();
             move32();
@@ -659,11 +638,7 @@ void hvq_bwe_fine_fx(
         /*SWB_signal[i] = SWB_signal[i] / envelope[i]; */
 
         shift = norm_l( L_envelope[i] );
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( L_envelope[i], shift ) ); /* 12+s-16=Q(-4+s) */
-#else
-        tmp = round_fx( L_shl( L_envelope[i], shift ) ); /* 12+s-16=Q(-4+s) */
-#endif
         /* Avoid division by zero */
         if ( tmp == 0 )
         {
@@ -962,34 +937,19 @@ void ivas_harm_bwe_fx(
         L_tmp2 = L_deposit_h( tmp1 );
         L_tmp2 = Isqrt_lc( L_tmp2, &exp1 ); /*Q31 - exp1*/
 
-#ifdef BASOP_NOGLOB
         beta = round_fx_sat( L_shl_sat( L_tmp2, exp1 ) ); /*Q15 */
         beta = shr( beta, 1 );                            /*Q15*/
-#else
-        beta = round_fx( L_shl( L_tmp2, exp1 ) );
-        beta = shr( beta, 1 );                                       /*Q15 */
-#endif
 
 
         FOR( sfm = sfm_start[i]; sfm < sfm_end[i]; sfm++ )
         {
-            L_tmp = Mult_32_16( E_L, coeff_fine[sfm] ); /*Q19 19 + 15 +1-16   */
-#ifdef BASOP_NOGLOB
-            L_tmp = L_shl_sat( L_tmp, 9 ); /*Q28 */
-#else
-            L_tmp = L_shl( L_tmp, 9 );                               /*Q28 */
-#endif
-            tmp = Random( bwe_seed );                 /*Q15 */
-            L_tmp2 = L_shr( L_mult( beta, tmp ), 3 ); /* Q28 31-3  15+15 +1-3 */
-#ifdef BASOP_NOGLOB
+            L_tmp = Mult_32_16( E_L, coeff_fine[sfm] );                  /*Q19 19 + 15 +1-16   */
+            L_tmp = L_shl_sat( L_tmp, 9 );                               /*Q28 */
+            tmp = Random( bwe_seed );                                    /*Q15 */
+            L_tmp2 = L_shr( L_mult( beta, tmp ), 3 );                    /* Q28 31-3  15+15 +1-3 */
             L_tmp = L_add_sat( L_tmp, L_tmp2 );                          /*Q28 */
             coeff_out[sfm] = L_shl_sat( Mult_32_32( L_tmp, normq ), 1 ); /*Q12  28 +14 +1 -31 */
             move32();
-#else
-            L_tmp = L_add( L_tmp, L_tmp2 );                          /*Q28 */
-            coeff_out[sfm] = L_shl( Mult_32_32( L_tmp, normq ), 1 ); /*Q12  28 +14 +1 -31 */
-            move32();
-#endif
         }
     }
 
@@ -1152,23 +1112,13 @@ void harm_bwe_fx(
 
         FOR( sfm = sfm_start[i]; sfm < sfm_end[i]; sfm++ )
         {
-            L_tmp = Mult_32_16( E_L, coeff_fine[sfm] ); /*Q19 19 + 15 +1-16   */
-#ifdef BASOP_NOGLOB
-            L_tmp = L_shl_sat( L_tmp, 9 ); /*Q28 */
-#else
-            L_tmp = L_shl( L_tmp, 9 );                               /*Q28 */
-#endif
-            tmp = Random( bwe_seed );                 /*Q15 */
-            L_tmp2 = L_shr( L_mult( beta, tmp ), 3 ); /* Q28 31-3  15+15 +1-3 */
-#ifdef BASOP_NOGLOB
+            L_tmp = Mult_32_16( E_L, coeff_fine[sfm] );                  /*Q19 19 + 15 +1-16   */
+            L_tmp = L_shl_sat( L_tmp, 9 );                               /*Q28 */
+            tmp = Random( bwe_seed );                                    /*Q15 */
+            L_tmp2 = L_shr( L_mult( beta, tmp ), 3 );                    /* Q28 31-3  15+15 +1-3 */
             L_tmp = L_add_sat( L_tmp, L_tmp2 );                          /*Q28 */
             coeff_out[sfm] = L_shl_sat( Mult_32_32( L_tmp, normq ), 1 ); /*Q12  28 +14 +1 -31 */
             move32();
-#else
-            L_tmp = L_add( L_tmp, L_tmp2 );                          /*Q28 */
-            coeff_out[sfm] = L_shl( Mult_32_32( L_tmp, normq ), 1 ); /*Q12  28 +14 +1 -31 */
-            move32();
-#endif
         }
     }
 
@@ -2086,7 +2036,7 @@ Word16 calc_nor_delta_hf_fx(
         /* updating norm & storing delta norm */
         add_bits_denv = 2;
         move16();
-        push_indice_fx( hBstr, IND_DELTA_ENV_HQ, sub( bitsforDelta, 2 ), 2 );
+        push_indice( hBstr, IND_DELTA_ENV_HQ, sub( bitsforDelta, 2 ), 2 );
         FOR( i = num_env_bands; i < nb_sfm; ++i )
         {
             IF( Rsubband[i] != 0 )
@@ -2102,7 +2052,7 @@ Word16 calc_nor_delta_hf_fx(
                     delta = min_delta; /*Q0*/
                     move16();
                 }
-                push_indice_fx( hBstr, IND_DELTA_ENV_HQ, delta - min_delta, bitsforDelta );
+                push_indice( hBstr, IND_DELTA_ENV_HQ, delta - min_delta, bitsforDelta );
                 ynrm[i] = add( ynrm[i], delta ); /*Q0*/
                 move16();
                 add_bits_denv = add( add_bits_denv, bitsforDelta );
@@ -2151,6 +2101,36 @@ void hq_bwe_fx(
     return;
 }
 
+void hq_bwe_ivas_fx(
+    const Word16 HQ_mode,             /* i  : HQ mode                                     Q0*/
+    Word32 *coeff_out1,               /* i/o: BWE input & temporary buffer                Q12*/
+    const Word16 *hq_generic_fenv,    /* i  : SWB frequency envelopes                     Q1*/
+    Word32 *coeff_out,                /* o  : SWB signal in MDCT domain                   Q12*/
+    const Word16 hq_generic_offset,   /* i  : frequency offset for representing hq generic Q0*/
+    Word16 *prev_L_swb_norm,          /* i/o: last normalize length                       Q0*/
+    const Word16 hq_generic_exc_clas, /* i  : hq generic hf excitation class              Q0*/
+    const Word16 *sfm_end,            /* i  : End of bands                                Q0*/
+    const Word16 num_sfm,             /* i  : Number of bands                             Q0*/
+    const Word16 num_env_bands,       /* i  : Number of coded envelope bands              Q0*/
+    const Word16 *R                   /* i  : Bit allocation                              Q0*/
+)
+{
+    Word16 n_swb_overlap_offset, n_swb_overlap;
+    Word32 hq_swb_overlap_buf_fx[L_FRAME32k];
+
+    n_swb_overlap_offset = add( swb_bwe_subband[0], hq_generic_offset );
+    n_swb_overlap = sub( sfm_end[( num_env_bands - 1 )], n_swb_overlap_offset ); /*Q0*/
+
+
+    Copy32( &coeff_out[n_swb_overlap_offset], hq_swb_overlap_buf_fx, sub( add( n_swb_overlap, sfm_end[( num_sfm - 1 )] ), sfm_end[( num_env_bands - 1 )] ) ); /*Q12*/
+
+    hq_generic_decoding_ivas_fx( HQ_mode, coeff_out1, hq_generic_fenv, coeff_out, hq_generic_offset, prev_L_swb_norm, hq_generic_exc_clas, R );
+
+    overlap_hq_bwe_fx( hq_swb_overlap_buf_fx, coeff_out, n_swb_overlap_offset, n_swb_overlap, R, num_env_bands, num_sfm, sfm_end );
+
+    return;
+}
+
 /*--------------------------------------------------------------------------*
  * hq_wb_nf_bwe()
  *
@@ -2216,14 +2196,10 @@ void hq_wb_nf_bwe_fx(
         IF( GT_16( last_sfm, 8 ) && total_bit > 0 )
         {
             exp = norm_s( total_bit );
-            tmp = shl( total_bit, exp );            /*Q(exp) */
-            tmp = div_s( 16384, tmp );              /*Q(15+14-exp) */
-            L_tmp = L_mult( tmp, bitalloc_var_fx ); /*Q(29-exp+1) */
-#ifdef BASOP_NOGLOB
+            tmp = shl( total_bit, exp );                               /*Q(exp) */
+            tmp = div_s( 16384, tmp );                                 /*Q(15+14-exp) */
+            L_tmp = L_mult( tmp, bitalloc_var_fx );                    /*Q(29-exp+1) */
             bitalloc_var_fx = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q14 */
-#else
-            bitalloc_var_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q14 */
-#endif
         }
         ELSE
         {
@@ -2239,11 +2215,7 @@ void hq_wb_nf_bwe_fx(
         {
             tmp = shl( sfmsize[sfm], 9 );   /*Q9 */
             tmp = mult( rat_fx[sfm], tmp ); /*Q(14+9-15=8) */
-#ifdef BASOP_NOGLOB
             IF( GE_16( shl_sat( R[sfm], 8 ), tmp ) )
-#else
-            IF( GE_16( shl( R[sfm], 8 ), tmp ) )
-#endif
             {
                 peak_fx = 0;
                 move16();
@@ -2251,12 +2223,8 @@ void hq_wb_nf_bwe_fx(
                 move16();
                 FOR( i = sfm_start[sfm]; i < sfm_end[sfm]; i++ )
                 {
-                    fabs_coeff_out_fx = L_abs( L_coeff_out[i] ); /*Q12*/
-#ifdef BASOP_NOGLOB
+                    fabs_coeff_out_fx = L_abs( L_coeff_out[i] );       /*Q12*/
                     mean_fx = L_add_sat( mean_fx, fabs_coeff_out_fx ); /*Q12 */
-#else
-                    mean_fx = L_add( mean_fx, fabs_coeff_out_fx ); /*Q12 */
-#endif
                     if ( GT_32( fabs_coeff_out_fx, peak_fx ) )
                     {
                         peak_fx = fabs_coeff_out_fx; /*Q12 */
@@ -2267,13 +2235,8 @@ void hq_wb_nf_bwe_fx(
                 IF( mean_fx != 0 )
                 {
                     exp = norm_l( mean_fx );
-#ifdef BASOP_NOGLOB
-                    mean_fx = L_shl_sat( mean_fx, exp ); /*Q(exp+12) */
-                    tmp = round_fx_sat( mean_fx );       /*Q(exp-4) */
-#else
-                    mean_fx = L_shl( mean_fx, exp );               /*Q(exp+12) */
-                    tmp = round_fx( mean_fx );                     /*Q(exp-4) */
-#endif
+                    mean_fx = L_shl_sat( mean_fx, exp );   /*Q(exp+12) */
+                    tmp = round_fx_sat( mean_fx );         /*Q(exp-4) */
                     tmp = div_s( 16384, tmp );             /*Q(15+14-exp+4 = 33-exp) */
                     L_tmp = Mult_32_16( peak_fx, tmp );    /*Q(12+33-exp-15 = 30-exp) */
                     tmp = shl( sfmsize[sfm], 9 );          /*Q9 */
@@ -2312,14 +2275,10 @@ void hq_wb_nf_bwe_fx(
             tmp = div_s( 1, last_sfm ); /*Q15 */
         }
 
-        L_tmp = L_mult( 5, sharp_fx );    /*Q15 */
-        L_tmp = Mult_32_16( L_tmp, tmp ); /*Q15 */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( 5, sharp_fx );                    /*Q15 */
+        L_tmp = Mult_32_16( L_tmp, tmp );                 /*Q15 */
         step_fx = round_fx_sat( L_shl_sat( L_tmp, 16 ) ); /*Q15  */
-#else
-        step_fx = round_fx( L_shl( L_tmp, 16 ) );                  /*Q15  */
-#endif
-        alfa_fx = 20480; /*Q13 = 2.5 */
+        alfa_fx = 20480;                                  /*Q13 = 2.5 */
         move16();
         /* fill noise for the insaturable subbands */
         FOR( sfm = 0; sfm < num_sfm; sfm++ )
@@ -2455,18 +2414,10 @@ void hq_wb_nf_bwe_fx(
                             exp = sub( 45, exp );
                         }
 
-#ifdef BASOP_NOGLOB
                         sharp_fx = add_sat( sharp_fx, shr( step_fx, 1 ) ); /*Q14*/
-#else
-                        sharp_fx = add( sharp_fx, shr( step_fx, 1 ) );
-#endif
                     }
 
-#ifdef BASOP_NOGLOB
                     IF( GT_32( L_tmp2, L_shl_sat( min_coef_fx, sub( exp, 13 ) ) ) ) /*exp  */
-#else
-                    IF( GT_32( L_tmp2, L_shl( min_coef_fx, sub( exp, 13 ) ) ) ) /*exp  */
-#endif
                     {
                         L_tmp2 = L_shr( min_coef_fx, 1 );
                         exp = 12;
@@ -2483,11 +2434,7 @@ void hq_wb_nf_bwe_fx(
                     /* smooth the noise magnitudes between inter-frame */
                     test();
                     test();
-#ifdef BASOP_NOGLOB
                     IF( GT_32( prev_avrg_norm_fx, L_shr( avrg_norm_fx, 1 ) ) && LT_32( prev_avrg_norm_fx, L_shl_sat( avrg_norm_fx, 1 ) ) && prev_is_transient == 0 )
-#else
-                    IF( GT_32( prev_avrg_norm_fx, L_shr( avrg_norm_fx, 1 ) ) && LT_32( prev_avrg_norm_fx, L_shl( avrg_norm_fx, 1 ) ) && prev_is_transient == 0 )
-#endif
                     {
                         exp1 = norm_l( prev_env_fx[sfm] );
                         L_tmp1 = L_shl( prev_env_fx[sfm], exp1 ); /* prev_env_Q[sfm] +exp1 */
@@ -2545,11 +2492,7 @@ void hq_wb_nf_bwe_fx(
             test();
             test();
             test();
-#ifdef BASOP_NOGLOB
             IF( EQ_16( sfm, sub( SFM_N_WB, 1 ) ) && prev_is_transient == 0 && GT_32( prev_normq_fx[sfm], L_shr( L_normq_v[sfm], 1 ) ) && LT_32( prev_normq_fx[sfm], L_shl_sat( L_normq_v[sfm], 1 ) ) && LE_16( bitalloc_var_fx, 4915 ) )
-#else
-            IF( EQ_16( sfm, sub( SFM_N_WB, 1 ) ) && prev_is_transient == 0 && GT_32( prev_normq_fx[sfm], L_shr( L_normq_v[sfm], 1 ) ) && LT_32( prev_normq_fx[sfm], L_shl( L_normq_v[sfm], 1 ) ) && LE_16( bitalloc_var_fx, 4915 ) )
-#endif
             {
                 Word32 *p_prev_coeff_out = prev_coeff_out_fx; /*Q12*/
                 FOR( i = add( sfm_start[sfm], 12 ); i < sfm_end[sfm]; i++ )
@@ -2558,17 +2501,9 @@ void hq_wb_nf_bwe_fx(
                     test();
                     test();
                     test();
-#ifdef BASOP_NOGLOB
                     IF( GT_32( L_abs( L_coeff_out[i] ), L_shl_sat( L_abs( *p_prev_coeff_out ), 2 ) ) || LT_32( L_abs( L_coeff_out[i] ), L_shr( L_abs( *p_prev_coeff_out ), 2 ) ) || ( ( R[sfm] == 0 || *prev_R == 0 ) && add_sat( R[sfm], *prev_R ) != 0 ) )
-#else
-                    IF( GT_32( L_abs( L_coeff_out[i] ), L_shl( L_abs( *p_prev_coeff_out ), 2 ) ) || LT_32( L_abs( L_coeff_out[i] ), L_shr( L_abs( *p_prev_coeff_out ), 2 ) ) || ( ( R[sfm] == 0 || *prev_R == 0 ) && add( R[sfm], *prev_R ) != 0 ) )
-#endif
                     {
-#ifdef BASOP_NOGLOB
                         L_tmp = L_add_sat( L_shr( L_abs( L_coeff_out[i] ), 1 ), L_shr( L_abs( *p_prev_coeff_out ), 1 ) ); /*Q12*/
-#else
-                        L_tmp = L_add( L_shr( L_abs( L_coeff_out[i] ), 1 ), L_shr( L_abs( *p_prev_coeff_out ), 1 ) );
-#endif
                         if ( L_coeff_out[i] <= 0 )
                         {
                             L_tmp = L_negate( L_tmp ); /*Q12*/
diff --git a/lib_com/ifft_rel.c b/lib_com/ifft_rel.c
index 40383cf3c0e76a55f6772d507367959c2c033138..9e64a4e254f17bd36d456d3d45bf35d36612720d 100644
--- a/lib_com/ifft_rel.c
+++ b/lib_com/ifft_rel.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 /*-----------------------------------------------------------------*
  * Local constants
  *-----------------------------------------------------------------*/
@@ -109,66 +108,28 @@ void ifft_rel_fx(
 
             FOR( i = is; i < n; i += id )
             {
-#ifdef BASOP_NOGLOB
                 t1 = sub_o( *xi1, *xi3, &Overflow );   /*Qx*/
                 *xi1 = add_o( *xi1, *xi3, &Overflow ); /*Qx*/
-#else                                                  /* BASOP_NOGLOB */
-                t1 = sub( *xi1, *xi3 );
-                *xi1 = add( *xi1, *xi3 );
-#endif                                                 /* BASOP_NOGLOB */
                 move16();
-#ifdef BASOP_NOGLOB
                 *xi2 = shl_o( *xi2, 1, &Overflow ); /*Qx*/
-#else                                               /* BASOP_NOGLOB */
-                *xi2 = shl( *xi2, 1 );
-#endif                                              /* BASOP_NOGLOB */
                 move16();
-#ifdef BASOP_NOGLOB
                 *xi3 = sub_o( t1, shl_o( *xi4, 1, &Overflow ), &Overflow ); /*Qx*/
-#else                                                                       /* BASOP_NOGLOB */
-                *xi3 = sub( t1, shl( *xi4, 1 ) );
-#endif                                                                      /* BASOP_NOGLOB */
                 move16();
-#ifdef BASOP_NOGLOB
                 *xi4 = add_o( t1, shl_o( *xi4, 1, &Overflow ), &Overflow ); /*Qx*/
-#else                                                                       /* BASOP_NOGLOB */
-                *xi4 = add( t1, shl( *xi4, 1 ) );
-#endif                                                                      /* BASOP_NOGLOB */
                 move16();
 
                 IF( NE_16( n4, 1 ) )
                 {
-#ifdef BASOP_NOGLOB
                     t1 = mult_r( sub_o( *( xi2 + n8 ), *( xi1 + n8 ), &Overflow ), INV_SQR2_FX /*Q15*/ ); /*Qx*/
                     t2 = mult_r( add_o( *( xi4 + n8 ), *( xi3 + n8 ), &Overflow ), INV_SQR2_FX /*Q15*/ ); /*Qx*/
-#else                                                                                                     /* BASOP_NOGLOB */
-                    t1 = mult_r( sub( *( xi2 + n8 ), *( xi1 + n8 ) ), INV_SQR2_FX );
-                    t2 = mult_r( add( *( xi4 + n8 ), *( xi3 + n8 ) ), INV_SQR2_FX );
-#endif                                                                                                    /* BASOP_NOGLOB */
 
-#ifdef BASOP_NOGLOB
                     *( xi1 + n8 ) = add_o( *( xi1 + n8 ), *( xi2 + n8 ), &Overflow ); /*Qx*/
-#else                                                                                 /* BASOP_NOGLOB */
-                    *( xi1 + n8 ) = add( *( xi1 + n8 ), *( xi2 + n8 ) );
-#endif                                                                                /* BASOP_NOGLOB */
                     move16();
-#ifdef BASOP_NOGLOB
                     *( xi2 + n8 ) = sub_o( *( xi4 + n8 ), *( xi3 + n8 ), &Overflow ); /*Qx*/
-#else                                                                                 /* BASOP_NOGLOB */
-                    *( xi2 + n8 ) = sub( *( xi4 + n8 ), *( xi3 + n8 ) );
-#endif                                                                                /* BASOP_NOGLOB */
                     move16();
-#ifdef BASOP_NOGLOB
                     *( xi3 + n8 ) = negate( shl_o( add_o( t2, t1, &Overflow ), 1, &Overflow ) ); /*Qx*/
-#else                                                                                            /* BASOP_NOGLOB */
-                    *( xi3 + n8 ) = negate( shl( add( t2, t1 ), 1 ) );
-#endif                                                                                           /* BASOP_NOGLOB */
                     move16();
-#ifdef BASOP_NOGLOB
                     *( xi4 + n8 ) = shl_o( sub_o( t1, t2, &Overflow ), 1, &Overflow ); /*Qx*/
-#else                                                                                  /* BASOP_NOGLOB */
-                    *( xi4 + n8 ) = shl( sub( t1, t2 ), 1 );
-#endif                                                                                 /* BASOP_NOGLOB */
                     move16();
                 }
                 xi1 += id;
@@ -217,82 +178,42 @@ void ifft_rel_fx(
 
                 FOR( i = is; i < n; i += id )
                 {
-#ifdef BASOP_NOGLOB
                     t1 = sub_o( *xup1, *xdn6, &Overflow );    /*Qx*/
                     *xup1 = add_o( *xup1, *xdn6, &Overflow ); /*Qx*/
-#else                                                         /* BASOP_NOGLOB */
-                    t1 = sub( *xup1, *xdn6 );
-                    *xup1 = add( *xup1, *xdn6 );
-#endif                                                        /* BASOP_NOGLOB */
                     move16();
                     xup1 += n4;
                     xdn6 -= n4;
 
-#ifdef BASOP_NOGLOB
                     t2 = sub_o( *xdn6, *xup1, &Overflow );    /*Qx*/
                     *xdn6 = add_o( *xup1, *xdn6, &Overflow ); /*Qx*/
-#else                                                         /* BASOP_NOGLOB */
-                    t2 = sub( *xdn6, *xup1 );
-                    *xdn6 = add( *xup1, *xdn6 );
-#endif                                                        /* BASOP_NOGLOB */
                     move16();
 
                     xdn6 += n4;
-#ifdef BASOP_NOGLOB
                     t3 = add_o( *xdn8, *xup3, &Overflow );    /*Qx*/
                     *xdn6 = sub_o( *xdn8, *xup3, &Overflow ); /*Qx*/
-#else                                                         /* BASOP_NOGLOB */
-                    t3 = add( *xdn8, *xup3 );
-                    *xdn6 = sub( *xdn8, *xup3 );
-#endif                                                        /* BASOP_NOGLOB */
                     move16();
 
                     xup3 += n4;
                     xdn8 -= n4;
 
-#ifdef BASOP_NOGLOB
                     t4 = add_o( *xup3, *xdn8, &Overflow );    /*Qx*/
                     *xup1 = sub_o( *xup3, *xdn8, &Overflow ); /*Qx*/
-#else                                                         /* BASOP_NOGLOB */
-                    t4 = add( *xup3, *xdn8 );
-                    *xup1 = sub( *xup3, *xdn8 );
-#endif                                                        /* BASOP_NOGLOB */
                     move16();
 
-#ifdef BASOP_NOGLOB
                     t5 = sub_o( t1, t4, &Overflow );                                  /*Qx*/
                     t1 = add_o( t1, t4, &Overflow );                                  /*Qx*/
                     t4 = sub_o( t2, t3, &Overflow );                                  /*Qx*/
                     t2 = add_o( t2, t3, &Overflow );                                  /*Qx*/
                     *xup3 = sub_o( mult_r( t1, cc3 ), mult_r( t2, ss3 ), &Overflow ); /*Qx*/
-#else                                                                                 /* BASOP_NOGLOB */
-                    t5 = sub( t1, t4 );
-                    t1 = add( t1, t4 );
-                    t4 = sub( t2, t3 );
-                    t2 = add( t2, t3 );
-                    *xup3 = sub( mult_r( t1, cc3 ), mult_r( t2, ss3 ) );
-#endif                                                                                /* BASOP_NOGLOB */
                     move16();
                     xup3 -= n4;
-#ifdef BASOP_NOGLOB
                     *xup3 = add_o( mult_r( t5, cc1 ), mult_r( t4, ss1 ), &Overflow ); /*Qx*/
-#else                                                                                 /* BASOP_NOGLOB */
-                    *xup3 = add( mult_r( t5, cc1 ), mult_r( t4, ss1 ) );
-#endif                                                                                /* BASOP_NOGLOB */
                     move16();
-#ifdef BASOP_NOGLOB
                     *xdn8 = sub_o( mult_r( t5, ss1 ), mult_r( t4, cc1 ), &Overflow ); /*Qx*/
-#else                                                                                 /* BASOP_NOGLOB */
-                    *xdn8 = sub( mult_r( t5, ss1 ), mult_r( t4, cc1 ) );
-#endif                                                                                /* BASOP_NOGLOB */
                     move16();
 
                     xdn8 += n4;
-#ifdef BASOP_NOGLOB
                     *xdn8 = add_o( mult_r( t2, cc3 ), mult_r( t1, ss3 ), &Overflow ); /*Qx*/
-#else                                                                                 /* BASOP_NOGLOB */
-                    *xdn8 = add( mult_r( t2, cc3 ), mult_r( t1, ss3 ) );
-#endif                                                                                /* BASOP_NOGLOB */
                     move16();
 
                     xup1 -= n4;
@@ -324,17 +245,9 @@ void ifft_rel_fx(
         {
             r1 = *xi0;
             move16();
-#ifdef BASOP_NOGLOB
             *xi0 = add_o( r1, *xi1, &Overflow ); /*Qx*/
-#else                                            /* BASOP_NOGLOB */
-            *xi0 = add( r1, *xi1 );
-#endif                                           /* BASOP_NOGLOB */
             move16();
-#ifdef BASOP_NOGLOB
             *xi1 = sub_o( r1, *xi1, &Overflow ); /*Qx*/
-#else                                            /* BASOP_NOGLOB */
-            *xi1 = sub( r1, *xi1 );
-#endif
             move16();
             xi0 += id;
             xi1 += id;
diff --git a/lib_com/igf_base_fx.c b/lib_com/igf_base_fx.c
index 5670088d3caef37e94378d5bd21ee60bdf243362..44cf27c5f3da77010f5d13489439a0dc2bc507c7 100644
--- a/lib_com/igf_base_fx.c
+++ b/lib_com/igf_base_fx.c
@@ -1142,19 +1142,11 @@ void IGFCommonFuncsCalcSfbEnergyPowerSpec( const Word16 startSfb,        /**< in
         {
             Carry = 0;
             move16();
-#ifdef BASOP_NOGLOB
             sfbEnergy[sfb] = L_add_co( sfbEnergy[sfb], pPowerSpectrum[line], &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-            sfbEnergy[sfb] = L_add_c( sfbEnergy[sfb], pPowerSpectrum[line] );
-#endif /* BASOP_NOGLOB */
             move32();
             Overflow = 0;
             move16();
-#ifdef BASOP_NOGLOB
             L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else /* BASOP_NOGLOB */
-            L_c = L_macNs( L_c, 0, 0 );
-#endif
         }
         sfbEnergy[sfb] = norm_llQ31( L_c, sfbEnergy[sfb], &( sfbEnergy_exp[sfb] ) );
         move32();
@@ -1194,12 +1186,8 @@ void IGFCommonFuncsMDCTSquareSpec( const Word16 sqrtBgn,                 /**< in
 
     FOR( i = sqrtBgn; i < sqrtEnd; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( mdctSpec[i], s1 ) ); /*(15 - mdctSpec_e)+ S1*/
-#else
-        tmp = round_fx( L_shl( mdctSpec[i], s1 ) );
-#endif
-        mdctSquareSpec[j++] = L_mult0( tmp, tmp ); /*31 - mdctSquareSpec_e*/
+        mdctSquareSpec[j++] = L_mult0( tmp, tmp );          /*31 - mdctSquareSpec_e*/
         move32();
     }
 }
@@ -1254,7 +1242,7 @@ void IGFCommonFuncsWriteSerialBit(
 
     IF( hBstr )
     {
-        push_next_indice_fx( hBstr, bit, 1 );
+        push_next_indice( hBstr, bit, 1 );
     }
     *pBitOffset = add( *pBitOffset, 1 );
     move16();
diff --git a/lib_com/int_lsp.c b/lib_com/int_lsp.c
index 37ca1ca4b350f7e21a4efafd2f5656db498c3d45..570e9ebd987527155d240e94341b7224aa876224 100644
--- a/lib_com/int_lsp.c
+++ b/lib_com/int_lsp.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,10 +37,9 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 
 void int_lsp_fx(
diff --git a/lib_com/interleave_spectrum.c b/lib_com/interleave_spectrum.c
index f65b7a5c5d6087ed678c97ad02906fe38a7c32a1..e8bb728ff891278b5eb24adb7f15f4d6ba001ed3 100644
--- a/lib_com/interleave_spectrum.c
+++ b/lib_com/interleave_spectrum.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,10 +37,9 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -64,11 +63,7 @@ void interleave_spectrum_fx(
     /* Common inits */
     p1 = coefs; /*Q12*/
     p_out = coefs_out;
-#ifdef SOLVED_COMP_ENC_DEC
-    IF( EQ_16( length, L_SPEC48k ) )
-#else
     IF( EQ_16( length, L_FRAME48k ) )
-#endif
     {
         bw = intl_bw_48;   /*Q0*/
         cnt = intl_cnt_48; /*Q0*/
@@ -338,20 +333,12 @@ void de_interleave_spectrum_fx(
     p1 = coefs_out;
     l_frame = length;
     move16();
-#ifdef SOLVED_COMP_ENC_DEC
-    IF( EQ_16( length, L_SPEC48k ) )
-#else
     IF( EQ_16( length, L_FRAME48k ) )
-#endif
     {
         bw = intl_bw_48;   /*Q0*/
         cnt = intl_cnt_48; /*Q0*/
         grps = N_INTL_GRP_48;
         move16();
-#ifdef SOLVED_COMP_ENC_DEC
-        l_frame = L_FRAME48k;
-        move16();
-#endif
         p2 = coefs_out + sublen[2]; /* 240, length/4 */
         p3 = coefs_out + sublen[4]; /* 480, 2*length/4 */
         p4 = coefs_out + sublen[5]; /* 720, 3*length/4 */
diff --git a/lib_com/interpol.c b/lib_com/interpol.c
index 7d74298b1be318e8fec8ef462195714d11760a76..a490a755269c9fa7d3f9bdeb440b60bf7f483253 100644
--- a/lib_com/interpol.c
+++ b/lib_com/interpol.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "rom_com.h"
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 
 
@@ -73,11 +72,7 @@ Word32 Interpol_lc_fx(                       /* o  : interpolated value
         }
         L_sum = W_sat_l( L_sum64 ); /*Q14*/
     }
-#ifdef BASOP_NOGLOB
     L_sum = L_shl_sat( L_sum, 1 ); /*Q15*/
-#else
-    L_sum = L_shl( L_sum, 1 );
-#endif
     return L_sum;
 }
 
@@ -108,15 +103,7 @@ Word16 Interpol_4(             /* Qx o  : interpolated value  */
     }
     BASOP_SATURATE_WARNING_OFF_EVS
     /* Here, saturation might occur by intention */
-#ifdef BASOP_NOGLOB
     L_sum = L_shl_o( L_sum, 1, &Overflow ); /*Qx+14+2*/
-#else                                       /* BASOP_NOGLOB */
-    L_sum = L_shl( L_sum, 1 );
-#endif                                      /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
-#ifdef BASOP_NOGLOB
     return round_fx_o( L_sum, &Overflow ); /*Qx*/
-#else                                      /* BASOP_NOGLOB */
-    return round_fx( L_sum );
-#endif
 }
diff --git a/lib_com/isf_dec_amr_wb_fx.c b/lib_com/isf_dec_amr_wb_fx.c
index 3b98b13461ba94bfdad3e96cfd68b23943a9256e..5ab82ee6dc158e877fd24f908e16cd20545f4f5c 100644
--- a/lib_com/isf_dec_amr_wb_fx.c
+++ b/lib_com/isf_dec_amr_wb_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/ivas_agc_com_fx.c b/lib_com/ivas_agc_com_fx.c
index 9159fa2599af27a55ca80dbf6a6df75a08d1a08a..3f6e181efb2154cf8fc2ce949321b0959c1dab90 100644
--- a/lib_com/ivas_agc_com_fx.c
+++ b/lib_com/ivas_agc_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,11 +34,10 @@
 #include "options.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include <math.h>
 #include "wmc_auto.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 /*------------------------------------------------------------------------------------------*
  * Local constants
diff --git a/lib_com/ivas_arith.c b/lib_com/ivas_arith_fx.c
similarity index 98%
rename from lib_com/ivas_arith.c
rename to lib_com/ivas_arith_fx.c
index 56f4c599c141fa375fb253d17ea60e927fe6d75f..311bccff8e206cbdb862bba20cd4f6e89d62ecc2 100644
--- a/lib_com/ivas_arith.c
+++ b/lib_com/ivas_arith_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,8 +33,6 @@
 #include <stdint.h>
 #include "options.h"
 #include "wmc_auto.h"
-#include "prot.h"
-#include "ivas_prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "stat_dec.h"
diff --git a/lib_com/ivas_avq_pos_reorder_com.c b/lib_com/ivas_avq_pos_reorder_com_fx.c
similarity index 97%
rename from lib_com/ivas_avq_pos_reorder_com.c
rename to lib_com/ivas_avq_pos_reorder_com_fx.c
index cd50e9ab230e93625ae18dfe1a2b6ea8b3d4debd..25f8be3ad2ae64b4b05bc88bfc19b22043377621 100644
--- a/lib_com/ivas_avq_pos_reorder_com.c
+++ b/lib_com/ivas_avq_pos_reorder_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,7 +32,7 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
 /*-----------------------------------------------------------------*
diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index b440299451557260c33eb4bbae825587dab3d6d0..097ba1789fbbe33cb9dd648fef5a97f070b98805 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -150,6 +150,7 @@ typedef enum
     RENDERER_OSBA_LS
 } RENDERER_TYPE;
 
+#define MAX_FREQUENCY_BANDS                    64
 
 /*----------------------------------------------------------------------------------*
  * IVAS general constants
@@ -508,8 +509,8 @@ enum
 #define STEREO_DFT32MS_N_NS                     FRAME_SIZE_NS               /* 20 ms */
 #define STEREO_DFT32MS_OVL_NS                   3125000L                    /* 3.125ms - Overlap for the outer edges of windows on decoder */
 #define STEREO_DFT32MS_OVL2_NS                  9375000L                    /* 9.375ms - Overlap for the inner edges of windows on decoder */
-#define STEREO_DFT32MS_WIN_CENTER_NS            ( int32_t )( ( FRAME_SIZE_NS + STEREO_DFT32MS_OVL_NS ) * 0.5f ) /* 11.5625ms - mid point of the two windows wrt the left edge of overlap */
-#define STEREO_DFT32MS_ZP_NS                    ( int32_t )( 0.5f * ( STEREO_DFT32MS_N_NS - STEREO_DFT32MS_WIN_CENTER_NS - ( STEREO_DFT32MS_OVL2_NS * 0.5f ) ) ) /* 2 sided zp calculated such that window size is satisfied */
+#define STEREO_DFT32MS_WIN_CENTER_NS            ( Word32 )( ( FRAME_SIZE_NS + STEREO_DFT32MS_OVL_NS ) * 0.5f ) /* 11.5625ms - mid point of the two windows wrt the left edge of overlap */
+#define STEREO_DFT32MS_ZP_NS                    ( Word32 )( 0.5f * ( STEREO_DFT32MS_N_NS - STEREO_DFT32MS_WIN_CENTER_NS - ( STEREO_DFT32MS_OVL2_NS * 0.5f ) ) ) /* 2 sided zp calculated such that window size is satisfied */
 
 #define STEREO_DFT32MS_OVL_MAX                  NS2SA( 48000, STEREO_DFT32MS_OVL_NS )
 #define STEREO_DFT32MS_OVL2_MAX                 NS2SA( 48000, STEREO_DFT32MS_OVL2_NS )
@@ -765,6 +766,7 @@ enum
 
 #define UNCLR_L_ETOT                            3
 #define UNCLR_L_RELE                            10
+#define ONE_BY_UNCLR_L_RELE_Q31                 214748365
 #define UNCLR_RC_ORDER                          20
 #define MAX_UV_CNT                              100
 
@@ -797,7 +799,7 @@ enum fea_names
 #define L_DEC_MEM_LEN_ICA                       L_NCSHIFTMAX + ( N_MAX_SHIFT_CHANGE + 1 ) + SINC_ORDER1 / INTERP_FACTOR1
 #define L_FRAME_DS                              NS2SA( CORR_INTER_FS, FRAME_SIZE_NS )
 #define L_XCORRMEM_DS                           NS2SA( CORR_INTER_FS, 2 * ( ACELP_LOOK_NS ) )
-#define L_NCSHIFT_DS                            ( int16_t )( ( ( int32_t )(CORR_INTER_FS) *L_NCSHIFTMAX ) / 48000L )
+#define L_NCSHIFT_DS                            ( Word16 )( ( ( Word32 )(CORR_INTER_FS) *L_NCSHIFTMAX ) / 48000L )
 #define L_SAMPLES_LA_NS                         625000L
 
 #define L_MEM_RECALC_TBE_16K                    NS2SA( 16000, L_MEM_RECALC_TBE_NS )
@@ -1283,7 +1285,7 @@ enum
 #define MASA_RATIO_THRESHOLD                    0.1f
 #define MASA_ANGLE_TOLERANCE                    0.5f
 #define MASA_RATIO_THRESHOLD_FX                 214748365   // 0.1 in Q31
-#define MASA_RATIO_TOLERANCE_FX                 214748364/*0.1 Q30*/
+#define MASA_RATIO_TOLERANCE_FX                 107374182   // 0.1 in Q30
 #define MASA_ANGLE_TOLERANCE_FX                 ONE_IN_Q21  // 0.5 in Q22
 #define MASA_LIMIT_NO_BANDS_SUR_COH             8
 #define MINIMUM_BIT_BUDGET_NORMAL_META          100
@@ -1438,13 +1440,13 @@ typedef enum _COV_SMOOTHING_TYPE
 } COV_SMOOTHING_TYPE;
 
 typedef struct {
-    const int32_t *value;
-    const uint16_t *length;
+    const Word32 *value;
+    const UWord16 *length;
 } HUFF_TAB;
 
 typedef struct {
-    int32_t value[81];
-    unsigned short length[81];
+    Word32 value[81];
+    UWord16 length[81];
 } HUFF_ELEMENTS;
 
 typedef struct {
@@ -1465,8 +1467,8 @@ typedef struct {
 
 typedef struct
 {
-    const int16_t (*alpha)[2];
-    const int16_t (*beta)[2];
+    const Word16 (*alpha)[2];
+    const Word16 (*beta)[2];
 } HUFF_NODE_TABLE;
 
 /*----------------------------------------------------------------------------------*
diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth_fx.c
similarity index 78%
rename from lib_com/ivas_cov_smooth.c
rename to lib_com/ivas_cov_smooth_fx.c
index 8b13f3fd1011f40f0d729178d59a1cf94191aeb6..9a8de3c1f055c1e3a119181c3c404a3a903242a7 100644
--- a/lib_com/ivas_cov_smooth.c
+++ b/lib_com/ivas_cov_smooth_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,9 +33,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
@@ -44,6 +42,8 @@
  *-----------------------------------------------------------------------------------------*/
 
 #define BAND_SMOOTH_REST_START_IDX ( 2 )
+#define ONEeN20_Q97                0x5E728433 // 1e-20 in Q97  1.584.563.251
+
 
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_calculate_update_factor_fx()
@@ -89,9 +89,10 @@ static void ivas_calculate_smoothning_factor_fx(
     move16();
 
     tmp = BASOP_Util_Divide3232_Scale( update_factor, L_shl( L_deposit_l( min_pool_size ), Q22 ), &exp_diff ); // Q(31 - exp_diff)
-    *Smoothing_factor = L_shl_sat( L_deposit_l( tmp ), add( Q16, exp_diff ) );                                 // Q31
+    *Smoothing_factor = L_shl_sat( L_deposit_h( tmp ), exp_diff );                                             // Q31
     move32();
 
+
     IF( NE_32( smooth_mode, COV_SMOOTH_MC ) )
     {
         IF( LT_32( ivas_total_brate, IVAS_24k4 ) )
@@ -266,19 +267,17 @@ void ivas_spar_covar_smooth_enc_close_fx(
     return;
 }
 
-
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_compute_smooth_cov_fx()
  *
  * Compute smooth covariance real/imag.
  *-----------------------------------------------------------------------------------------*/
-
 static void ivas_compute_smooth_cov_fx(
     ivas_cov_smooth_state_t *hCovState,
     ivas_filterbank_t *pFb,
     Word32 *pCov_buf[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],       // i/o: Q(q_cov[i][j])
     Word32 *pPrior_cov_buf[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], // i: hCovState->q_cov_real_per_band[i][j][k]
-    const Word32 fac,
+    const Word32 fac,                                           // i: ONEeN20_Q97 (1e-20 in Q97)
     const Word16 start_band,
     const Word16 end_band,
     const Word16 num_ch,
@@ -287,10 +286,15 @@ static void ivas_compute_smooth_cov_fx(
 {
     Word16 i, j, k;
     Word16 prev_idx = hCovState->prior_bank_idx;
-    Word32 factor = 0, L_tmp, L_tmp1;
+    Word32 factor = 0, L_tmp0, L_tmp1;
+
+    const Word16 q_fac = 97;
+    const Word16 fac_e = sub( Q31, q_fac );
+
+    Word16 cov_buf_e;
+
     Word16 sm_b;
     Word16 non_sm_b_idx;
-    Word16 q_tmp[IVAS_MAX_NUM_BANDS];
 
     sm_b = BAND_SMOOTH_REST_START_IDX;
     move16();
@@ -298,7 +302,6 @@ static void ivas_compute_smooth_cov_fx(
     move32();
 
     assert( end_band <= pFb->filterbank_num_bands );
-
     test();
     IF( EQ_16( prev_idx, -1 ) || EQ_16( transient_det[1], 1 ) )
     {
@@ -313,9 +316,11 @@ static void ivas_compute_smooth_cov_fx(
         {
             FOR( k = start_band; k < end_band; k++ )
             {
-                L_tmp = Mpy_32_32( hCovState->pSmoothing_factor_fx[k], fac );                                                        // (Q31, Q31) -> Q31
-                pCov_buf[i][i][k] = L_add( pCov_buf[i][i][k], L_shl( L_tmp, sub( hCovState->q_cov_real_per_band[i][i][k], Q31 ) ) ); // hCovState->q_cov_real_per_band[i][j][k]
+                /* ref: pCov_buf[i][i][k] += ( hCovState->pSmoothing_factor[k] * fac ); */
+                pCov_buf[i][i][k] = BASOP_Util_Add_Mant32Exp( pCov_buf[i][i][k], sub( Q31, q_cov[i][i] ), Mpy_32_32( hCovState->pSmoothing_factor_fx[k], fac ), fac_e, &cov_buf_e );
                 move32();
+                hCovState->q_cov_real_per_band[i][i][k] = sub( Q31, cov_buf_e );
+                move16();
             }
         }
     }
@@ -328,38 +333,45 @@ static void ivas_compute_smooth_cov_fx(
             {
                 IF( EQ_16( i, j ) )
                 {
-                    factor = fac; // Q31
+                    factor = fac; // Q97
                     move32();
                 }
                 ELSE
                 {
-                    factor = 0;
+                    factor = 0; // Q97
                     move32();
                 }
 
-                set16_fx( q_tmp, q_cov[i][j], sub( end_band, start_band ) );
                 FOR( k = start_band; k < non_sm_b_idx; k++ )
                 {
-                    L_tmp = Mpy_32_32( hCovState->pSmoothing_factor_fx[k], pCov_buf[i][j][k] );                                                                                   // (Q31, q_cov[i][j]) -> q_cov[i][j]
-                    L_tmp1 = Mpy_32_32( L_sub( ONE_IN_Q31, hCovState->pSmoothing_factor_fx[k] ), pPrior_cov_buf[i][j][k] );                                                       // (Q31, hCovState->q_cov_real_per_band[i][j][k]) -> hCovState->q_cov_real_per_band[i][j][k]
-                    pCov_buf[i][j][k] = BASOP_Util_Add_Mant32Exp( L_tmp, sub( Q31, q_cov[i][j] ), L_tmp1, sub( Q31, hCovState->q_prior_cov_real_per_band[i][j][k] ), &q_tmp[k] ); // Q(31 - q_tmp[k])
+                    /* ref: pCov_buf[i][j][k] = pPrior_cov_buf[i][j][k] + ( hCovState->pSmoothing_factor[k] * ( pCov_buf[i][j][k] - pPrior_cov_buf[i][j][k] + factor ) ); */
+                    /* mod: pCov_buf[i][j][k] = pCov_buf[i][j][k] * hCovState->pSmoothing_factor[k] +
+                                                    pPrior_cov_buf[i][j][k] * (1.0 - hCovState->pSmoothing_factor[k]) +
+                                                        factor * hCovState->pSmoothing_factor[k] ); */
+                    L_tmp0 = Mpy_32_32( hCovState->pSmoothing_factor_fx[k], pCov_buf[i][j][k] );                            // q_tmp0: q_cov[i][j]                                                                                  // (Q31, q_cov[i][j]) -> q_cov[i][j]
+                    L_tmp1 = Mpy_32_32( L_sub( ONE_IN_Q31, hCovState->pSmoothing_factor_fx[k] ), pPrior_cov_buf[i][j][k] ); // q_tmp1: hCovState->q_prior_cov_real_per_band[i][j][k]
+                    L_tmp0 = BASOP_Util_Add_Mant32Exp( L_tmp0, sub( Q31, q_cov[i][j] ), L_tmp1, sub( Q31, hCovState->q_prior_cov_real_per_band[i][j][k] ), &cov_buf_e );
+                    pCov_buf[i][j][k] = BASOP_Util_Add_Mant32Exp( L_tmp0, cov_buf_e, Mpy_32_32( hCovState->pSmoothing_factor_fx[k], factor ), fac_e, &cov_buf_e );
                     move32();
-                    q_tmp[k] = sub( Q31, q_tmp[k] ); // Q of pConv_buf[i][j][k] is now q_tmp[k]
+                    hCovState->q_cov_real_per_band[i][j][k] = sub( Q31, cov_buf_e ); // Q of pCov_buf[i][j][k]
+                    move16();
+                }
+                FOR( ; k < end_band; k++ )
+                {
+                    hCovState->q_cov_real_per_band[i][j][k] = q_cov[i][j];
                     move16();
-                    L_tmp = L_shl( Mpy_32_32( hCovState->pSmoothing_factor_fx[k], factor ), sub( q_tmp[k], Q31 ) ); // ((Q31, Q31) -> Q31) -> q_tmp[k]
-                    pCov_buf[i][j][k] = L_add( pCov_buf[i][j][k], L_tmp );                                          // q_tmp[k]
-                    move32();
                 }
-                Copy( q_tmp, hCovState->q_cov_real_per_band[i][j], sub( end_band, start_band ) ); // Q of pCov_buf[i][j][k] is hCovState->q_cov_real_per_band[i][j][j]
             }
         }
         FOR( i = 0; i < num_ch; i++ )
         {
             FOR( k = non_sm_b_idx; k < end_band; k++ )
             {
-                L_tmp = Mpy_32_32( hCovState->pSmoothing_factor_fx[k], fac );                                                        // (Q31, Q31) -> Q31
-                pCov_buf[i][i][k] = L_add( pCov_buf[i][i][k], L_shl( L_tmp, sub( hCovState->q_cov_real_per_band[i][i][k], Q31 ) ) ); // hCovState->q_cov_real_per_band[i][j][j]
+                /* ref: pCov_buf[i][i][k] += ( hCovState->pSmoothing_factor[k] * fac ); */
+                pCov_buf[i][i][k] = BASOP_Util_Add_Mant32Exp( pCov_buf[i][i][k], sub( Q31, q_cov[i][i] ), Mpy_32_32( hCovState->pSmoothing_factor_fx[k], fac ), fac_e, &cov_buf_e );
                 move32();
+                hCovState->q_cov_real_per_band[i][i][k] = sub( Q31, cov_buf_e ); // Q of pCov_buf[i][i][k]
+                move16();
             }
         }
     }
@@ -371,28 +383,29 @@ static void ivas_compute_smooth_cov_fx(
             {
                 IF( EQ_16( i, j ) )
                 {
-                    factor = fac; // Q31
+                    factor = fac; // Q97
                     move32();
                 }
                 ELSE
                 {
-                    factor = 0;
+                    factor = 0; // Q97
                     move32();
                 }
 
                 FOR( k = start_band; k < end_band; k++ )
                 {
-                    L_tmp = Mpy_32_32( hCovState->pSmoothing_factor_fx[k], pCov_buf[i][j][k] );                                                                                   // (Q31, q_cov[i][j]) -> q_cov[i][j]
-                    L_tmp1 = Mpy_32_32( L_sub( ONE_IN_Q31, hCovState->pSmoothing_factor_fx[k] ), pPrior_cov_buf[i][j][k] );                                                       // (Q31, hCovState->q_cov_real_per_band[i][j][k]) -> hCovState->q_cov_real_per_band[i][j][k]
-                    pCov_buf[i][j][k] = BASOP_Util_Add_Mant32Exp( L_tmp, sub( Q31, q_cov[i][j] ), L_tmp1, sub( Q31, hCovState->q_prior_cov_real_per_band[i][j][k] ), &q_tmp[k] ); // Q(31 - q_tmp[k])
+                    /* ref: pCov_buf[i][j][k] = pPrior_cov_buf[i][j][k] + ( hCovState->pSmoothing_factor[k] * ( pCov_buf[i][j][k] - pPrior_cov_buf[i][j][k] + factor ) ); */
+                    /* mod: pCov_buf[i][j][k] = pCov_buf[i][j][k] * hCovState->pSmoothing_factor[k] +
+                                                pPrior_cov_buf[i][j][k] * (1.0 - hCovState->pSmoothing_factor[k]) +
+                                                factor * hCovState->pSmoothing_factor[k] ); */
+                    L_tmp0 = Mpy_32_32( hCovState->pSmoothing_factor_fx[k], pCov_buf[i][j][k] );                            // q_tmp0: q_cov[i][j]                                                                                  // (Q31, q_cov[i][j]) -> q_cov[i][j]
+                    L_tmp1 = Mpy_32_32( L_sub( ONE_IN_Q31, hCovState->pSmoothing_factor_fx[k] ), pPrior_cov_buf[i][j][k] ); // q_tmp1: hCovState->q_prior_cov_real_per_band[i][j][k]
+                    L_tmp0 = BASOP_Util_Add_Mant32Exp( L_tmp0, sub( Q31, q_cov[i][j] ), L_tmp1, sub( Q31, hCovState->q_prior_cov_real_per_band[i][j][k] ), &cov_buf_e );
+                    pCov_buf[i][j][k] = BASOP_Util_Add_Mant32Exp( L_tmp0, cov_buf_e, Mpy_32_32( hCovState->pSmoothing_factor_fx[k], factor ), fac_e, &cov_buf_e );
                     move32();
-                    q_tmp[k] = sub( Q31, q_tmp[k] ); // Q of pConv_buf[i][j][k] is now q_tmp[k]
+                    hCovState->q_cov_real_per_band[i][j][k] = sub( Q31, cov_buf_e ); // Q of pCov_buf[i][j][k]
                     move16();
-                    L_tmp = L_shl( Mpy_32_32( hCovState->pSmoothing_factor_fx[k], factor ), sub( q_tmp[k], Q31 ) ); // ((Q31, Q31) -> Q31) -> q_tmp[k]
-                    pCov_buf[i][j][k] = L_add( pCov_buf[i][j][k], L_tmp );                                          // q_tmp[k]
-                    move32();
                 }
-                Copy( q_tmp, hCovState->q_cov_real_per_band[i][j], sub( end_band, start_band ) ); // Q of pCov_buf[i][j][k] is hCovState->q_cov_real_per_band[i][j][j]
             }
         }
     }
@@ -420,7 +433,7 @@ void ivas_cov_smooth_process_fx(
     Word16 i, j, k;
     Word16 num_bands = sub( end_band, start_band );
 
-    ivas_compute_smooth_cov_fx( hCovState, pFb, cov_real, hCovState->pPrior_cov_real_fx, 0, start_band, end_band, num_ch, transient_det, q_cov );
+    ivas_compute_smooth_cov_fx( hCovState, pFb, cov_real, hCovState->pPrior_cov_real_fx, ONEeN20_Q97, start_band, end_band, num_ch, transient_det, q_cov );
 
     FOR( i = 0; i < num_ch; i++ )
     {
diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com_fx.c
similarity index 94%
rename from lib_com/ivas_dirac_com.c
rename to lib_com/ivas_dirac_com_fx.c
index 4c0d8d03dbbbe6c035170bc6c16a89c4c4537c96..4279065b043f8ebf4767bccca68e997997ac77c6 100644
--- a/lib_com/ivas_dirac_com.c
+++ b/lib_com/ivas_dirac_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,11 +36,9 @@
 #include <math.h>
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
@@ -611,11 +609,8 @@ void computeDirectionVectors_fixed(
     Word32 *direction_vector_y, /* o: Q30*/
     Word32 *direction_vector_z, /* o: Q30*/
     Word16 i_e                  /*Exponent of all the intensity buffers*/
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
     ,
-    Word16 *i_e_band
-#endif
-)
+    Word16 *i_e_band )
 {
     Word16 i;
     Word32 intensityNorm;
@@ -633,12 +628,11 @@ void computeDirectionVectors_fixed(
         scaled_x = L_shl( *intensity_real_x, norm_x );
         scaled_y = L_shl( *intensity_real_y, norm_y );
         scaled_z = L_shl( *intensity_real_z, norm_z );
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
         IF( i_e_band != NULL )
         {
-            e_x = sub( i_e_band[i - enc_param_start_band], norm_x );
-            e_y = sub( i_e_band[i - enc_param_start_band], norm_y );
-            e_z = sub( i_e_band[i - enc_param_start_band], norm_z );
+            e_x = sub( Q31, add( i_e_band[i - enc_param_start_band], norm_x ) );
+            e_y = sub( Q31, add( i_e_band[i - enc_param_start_band], norm_y ) );
+            e_z = sub( Q31, add( i_e_band[i - enc_param_start_band], norm_z ) );
         }
         ELSE
         {
@@ -646,12 +640,6 @@ void computeDirectionVectors_fixed(
             e_y = sub( i_e, norm_y );
             e_z = sub( i_e, norm_z );
         }
-#else
-
-        e_x = sub( i_e, norm_x );
-        e_y = sub( i_e, norm_y );
-        e_z = sub( i_e, norm_z );
-#endif
         temp1 = BASOP_Util_Add_Mant32Exp( Mult_32_32( scaled_x, scaled_x ), shl( e_x, 1 ), Mult_32_32( scaled_y, scaled_y ), shl( e_y, 1 ), &exp1 );
         intensityNorm = BASOP_Util_Add_Mant32Exp( temp1, exp1, Mult_32_32( scaled_z, scaled_z ), shl( e_z, 1 ), &intensityNorm_e );
 
@@ -929,16 +917,8 @@ void computeDiffuseness_fixed(
     move32();
     Word32 *p_tmp;
     const Word32 *p_tmp_c;
-#ifdef FIX_867
-    const Word16 *p_q_tmp_c;
-#endif
     Word16 min_q_shift1, min_q_shift2, exp1, exp2, q_tmp;
-#ifdef FIX_867
-    Word16 q_ene[CLDFB_NO_CHANNELS_MAX];
-#else
-    Word16 q_ene;
-#endif
-    Word16 q_intensity, q_intensity_slow;
+    Word16 q_ene, q_intensity, q_intensity_slow;
 
     /* Compute Intensity slow and energy slow buffer_intensity and buffer_energy */
 
@@ -947,14 +927,10 @@ void computeDiffuseness_fixed(
     set_zero_fx( energy_slow, CLDFB_NO_CHANNELS_MAX );
 
     /* Calculate max possible shift for the buffer buffer_energy and buffer_intensity */
-#ifdef FIX_867
-    min_q_shift1 = find_guarded_bits_fx( DIRAC_NO_COL_AVG_DIFF );
-#else
     min_q_shift1 = Q31;
     move16();
     min_q_shift1 = s_min( min_q_shift1, getScaleFactor32( buffer_energy, i_mult( DIRAC_NO_COL_AVG_DIFF, num_freq_bands ) ) );
     min_q_shift1 = sub( min_q_shift1, find_guarded_bits_fx( DIRAC_NO_COL_AVG_DIFF ) );
-#endif
 
     min_q_shift2 = Q31;
     move16();
@@ -967,92 +943,67 @@ void computeDiffuseness_fixed(
     }
     min_q_shift2 = sub( min_q_shift2, find_guarded_bits_fx( DIRAC_NO_COL_AVG_DIFF ) );
 
-#ifdef FIX_867
-    set16_fx( q_ene, Q31 - find_guarded_bits_fx( DIRAC_NO_COL_AVG_DIFF ), num_freq_bands );
-#else
     q_ene = add( q_factor_energy[0], min_q_shift1 );
-#endif
     move16();
     q_intensity = add( q_factor_intensity[0], min_q_shift2 );
     move16();
 
     FOR( i = 0; i < DIRAC_NO_COL_AVG_DIFF; ++i )
     {
-#ifdef FIX_867
+        /* Energy slow */
         p_tmp_c = buffer_energy + i * num_freq_bands;
-        p_q_tmp_c = q_factor_energy + i * num_freq_bands;
-        FOR( k = 0; k < num_freq_bands; k++ )
-        {
-            /* Energy slow */
-            Word32 tmp1;
-            Word16 tmp1_q;
 
-#ifdef FIX_867_DBG
-            assert( norm_l( p_tmp_c[k] ) == 0 );
-            assert( p_tmp_c[k] >= 0 );
-#endif
-
-            tmp1 = L_shr( p_tmp_c[k], min_q_shift1 );
-            tmp1_q = sub( p_q_tmp_c[k], min_q_shift1 );
+        q_tmp = add( q_factor_energy[i], min_q_shift1 );
 
-            IF( LT_16( tmp1_q, q_ene[k] ) )
-            {
-                energy_slow[k] = L_shr( energy_slow[k], sub( q_ene[k], tmp1_q ) );
-                q_ene[k] = tmp1_q;
 
-                energy_slow[k] = L_add( energy_slow[k], tmp1 );
-            }
-            ELSE
-            {
-                tmp1 = L_shr( tmp1, sub( tmp1_q, q_ene[k] ) );
-                energy_slow[k] = L_add( energy_slow[k], tmp1 );
-            }
-#ifdef FIX_867_DBG
-            assert( energy_slow[k] >= 0 );
-#endif
+        Word16 shift_q = sub( q_tmp, q_ene );
+        Word32 shiftEquiv = L_add( 0, 0 );
+        Word16 shift_qtotal;
+        if ( shift_q < 0 )
+        {
+            shiftEquiv = L_lshl( (Word32) 0x80000000, shift_q );
         }
-#else
-        /* Energy slow */
-        p_tmp_c = buffer_energy + i * num_freq_bands;
+        if ( shift_q >= 0 )
+        {
+            shiftEquiv = L_add( 0x7FFFFFFF, 0 );
+        }
+        shift_qtotal = sub( min_q_shift1, s_max( shift_q, 0 ) );
 
-        q_tmp = add( q_factor_energy[i], min_q_shift1 );
         FOR( k = 0; k < num_freq_bands; k++ )
         {
-            tmp = L_shl( p_tmp_c[k], min_q_shift1 );
-            IF( LT_16( q_tmp, q_ene ) )
-            {
-                energy_slow[k] = L_add( L_shr( energy_slow[k], sub( q_ene, q_tmp ) ), tmp );
-                move32();
-            }
-            ELSE
-            {
-                energy_slow[k] = L_add( energy_slow[k], L_shr( tmp, sub( q_tmp, q_ene ) ) );
-                move32();
-            }
+            tmp = L_shl( p_tmp_c[k], shift_qtotal );
+            energy_slow[k] = Madd_32_32_r( tmp, energy_slow[k], shiftEquiv );
+            move32();
         }
+
+
         q_ene = s_min( q_ene, q_tmp );
-#endif
 
         /* Intensity slow */
         q_tmp = add( q_factor_intensity[i], min_q_shift2 );
+
+        shift_q = sub( q_tmp, q_intensity );
+        if ( shift_q < 0 )
+        {
+            shiftEquiv = L_lshl( (Word32) 0x80000000, shift_q );
+        }
+        if ( shift_q >= 0 )
+        {
+            shiftEquiv = L_lshl( 0x7FFFFFFF, 0 );
+        }
+        shift_qtotal = sub( min_q_shift2, s_max( shift_q, 0 ) );
+
         FOR( j = 0; j < DIRAC_NUM_DIMS; ++j )
         {
             p_tmp = buffer_intensity[j][i];
             FOR( k = 0; k < num_freq_bands; k++ )
             {
-                tmp = L_shl( p_tmp[k], min_q_shift2 );
-                IF( LT_16( q_intensity, q_tmp ) )
-                {
-                    intensity_slow[j * num_freq_bands + k] = L_add( intensity_slow[j * num_freq_bands + k], L_shr( tmp, sub( q_tmp, q_intensity ) ) );
-                    move32();
-                }
-                ELSE
-                {
-                    intensity_slow[j * num_freq_bands + k] = L_add( L_shr( intensity_slow[j * num_freq_bands + k], sub( q_intensity, q_tmp ) ), tmp );
-                    move32();
-                }
+                tmp = L_shl( p_tmp[k], shift_qtotal );
+                intensity_slow[j * num_freq_bands + k] = Madd_32_32_r( tmp, intensity_slow[j * num_freq_bands + k], shiftEquiv );
+                move32();
             }
         }
+
         q_intensity = s_min( q_intensity, q_tmp );
     }
 
@@ -1068,9 +1019,7 @@ void computeDiffuseness_fixed(
 
         FOR( k = 0; k < num_freq_bands; k++ )
         {
-            p_tmp[k] = Mpy_32_32( p_tmp[k], p_tmp[k] );
-            move32();
-            intensity_slow_abs[k] = L_add( intensity_slow_abs[k], p_tmp[k] );
+            intensity_slow_abs[k] = Madd_32_32( intensity_slow_abs[k], p_tmp[k], p_tmp[k] );
             move32();
         }
     }
@@ -1085,12 +1034,8 @@ void computeDiffuseness_fixed(
         exp1 = sub( 31, q_intensity_slow );
         tmp = Sqrt32( p_tmp[i], &exp1 );
 
-        tmp = BASOP_Util_Divide3232_Scale_cadence( tmp, L_add( energy_slow[i], EPSILLON_FX ), &exp2 );
-#ifdef FIX_867
-        q_tmp = add( sub( 31, exp2 ), sub( sub( 31, exp1 ), q_ene[i] ) );
-#else
+        tmp = BASOP_Util_Divide3232_Scale_newton( tmp, L_add( energy_slow[i], EPSILLON_FX ), &exp2 );
         q_tmp = add( sub( 31, exp2 ), sub( sub( 31, exp1 ), q_ene ) );
-#endif
 
         IF( LT_16( q_tmp, Q30 ) )
         {
@@ -1122,28 +1067,6 @@ void computeDiffuseness_fixed(
     *q_diffuseness = Q30;
     move16();
 
-#if 0
-	exp1 = L_norm_arr(diffuseness, num_freq_bands);
-	Scale_sig32(diffuseness,num_freq_bands,exp1);
-	*q_diffuseness = add(*q_diffuseness, exp1);
-#endif
-
-#ifdef FIX_867_DBG
-    FOR( Word16 l = 0; l < num_freq_bands; l++ )
-    {
-        static FILE *f = 0;
-        if ( f == 0 )
-            f = fopen( "diffuseness", "w" );
-
-        Word32 m = diffuseness[i];
-        Word16 e = *q_diffuseness;
-        float f1_m = (float) m;
-        float f1_e = powf( 2, e );
-        float f1 = f1_m / f1_e;
-        fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-    }
-#endif
-
     return;
 }
 
diff --git a/lib_com/ivas_entropy_coder_common.c b/lib_com/ivas_entropy_coder_common_fx.c
similarity index 99%
rename from lib_com/ivas_entropy_coder_common.c
rename to lib_com/ivas_entropy_coder_common_fx.c
index 8793723cdd9a55f61fa98ed43fec72a91edd11af..f52d59859e7833964f125b0837b23a7d18c91dce 100644
--- a/lib_com/ivas_entropy_coder_common.c
+++ b/lib_com/ivas_entropy_coder_common_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,10 +32,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "math.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h
index 1198008f647080f71550e28f940ff6f115dec98d..bbf951ab3dc12e2f14e05471e689bad8a91bce2a 100644
--- a/lib_com/ivas_error.h
+++ b/lib_com/ivas_error.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/ivas_error_utils.h b/lib_com/ivas_error_utils.h
index b686cf28333e63cdef4b611368e50cacf8846eed..0c3d5ce042d74d7b9ea0c4be32729f5c161889de 100644
--- a/lib_com/ivas_error_utils.h
+++ b/lib_com/ivas_error_utils.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/ivas_fb_mixer.c b/lib_com/ivas_fb_mixer_fx.c
similarity index 95%
rename from lib_com/ivas_fb_mixer.c
rename to lib_com/ivas_fb_mixer_fx.c
index 78603c1db43c9d913d5cff69c6bcb7fce4d16d27..d5cd8d4f17875b44cbcecb447e9bf0463a25f056 100644
--- a/lib_com/ivas_fb_mixer.c
+++ b/lib_com/ivas_fb_mixer_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,13 +34,11 @@
 #include <assert.h>
 #include <math.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 
@@ -560,7 +558,11 @@ void ivas_fb_mixer_pcm_ingest_fx(
         move16();
 
         ivas_mdft_fx( ppOut_pcm[fb_cfg->remix_order[i]], hFbMixer->ppFilterbank_inFR_re_fx[fb_cfg->remix_order[i]], hFbMixer->ppFilterbank_inFR_im_fx[fb_cfg->remix_order[i]], shl( frame_len, 1 ), frame_len );
-        hFbMixer->q_ppFilterbank_inFR[fb_cfg->remix_order[i]] = q_ppOut_pcm[fb_cfg->remix_order[i]];
+        q_shift = L_norm_arr( hFbMixer->ppFilterbank_inFR_re_fx[fb_cfg->remix_order[i]], frame_len );
+        q_shift = s_min( q_shift, L_norm_arr( hFbMixer->ppFilterbank_inFR_im_fx[fb_cfg->remix_order[i]], frame_len ) );
+        scale_sig32( hFbMixer->ppFilterbank_inFR_re_fx[fb_cfg->remix_order[i]], frame_len, q_shift );
+        scale_sig32( hFbMixer->ppFilterbank_inFR_im_fx[fb_cfg->remix_order[i]], frame_len, q_shift );
+        hFbMixer->q_ppFilterbank_inFR[fb_cfg->remix_order[i]] = add( q_shift, q_ppOut_pcm[fb_cfg->remix_order[i]] );
         move16();
     }
 
@@ -915,7 +917,10 @@ static Word16 ivas_calculate_abs_fr_fx(
     move16();
     Word16 idx_short_stride_bin_to_band = 0;
     move16();
+    Word16 quo, tmp, exp_diff;
 
+    Word32 temp = Mpy_32_32( sampling_rate, 42949673 /* FRAMES_PER_SEC in Q31 */ );
+    frame_len = extract_l( temp );
 
     FOR( i = 0; i < bands; i++ )
     {
@@ -932,13 +937,11 @@ static Word16 ivas_calculate_abs_fr_fx(
         Word32 short_stride_pow_spec_fx[MDFT_FB_BANDS_240];
         Word32 short_stride_nrg_fx = 0;
         move16();
-        Word16 exp_diff = 0, tmp;
+        exp_diff = 0;
         move16();
 
-        Word32 cldfb_nrg_fx = 0;
-        Word16 cldfb_nrg_e = 0;
-        move16();
-        move16();
+        Word64 cldfb_nrg_fx = 0;
+        move64();
         Word16 short_stride = pFb->fb_bin_to_band.short_stride;
         move16();
         Word32 res_dec1, res_frac, res_dec2;
@@ -959,38 +962,24 @@ static Word16 ivas_calculate_abs_fr_fx(
         {
 
             Word32 sq_abs_fx;
-            Word16 sq_abs_e;
 
             // Word32 real = L_shr( *long_mdft_ptr_re_fx, 3 ); // Q27
             Word32 real = *long_mdft_ptr_re_fx; // Q30
             move32();
             // Word32 imag = L_shr( *long_mdft_ptr_im_fx, 3 ); // Q27
             Word32 imag = *long_mdft_ptr_im_fx; // Q30
-
-            Word16 real_exp, imag_exp;
             move32();
-
-            Word32 real_sq, imag_sq;
-
-            real_sq = Mpy_32_32( real, real ); // Q30 + Q30 - 31 = Q29
-            real_exp = 2;
-            move32();
-            imag_sq = Mpy_32_32( imag, imag ); // Q30 + Q30 - 31 = Q29
-            imag_exp = 2;
-            move32();
-
-            sq_abs_fx = BASOP_Util_Add_Mant32Exp( real_sq, real_exp, imag_sq, imag_exp, &sq_abs_e ); // Q(31 - sq_abs_e)
-
+            Word64 acc = W_mac_32_32( W_mult_32_32( real, real ), imag, imag ); // Q61
+            sq_abs_fx = W_extract_h( acc );                                     // Q28
             long_mdft_ptr_re_fx++;
             long_mdft_ptr_im_fx++;
 
             /* accumulate bin energies within a short stride bin */
 
-            short_stride_nrg_fx = L_add( short_stride_nrg_fx, L_shl( sq_abs_fx, sub( Q22, sub( Q31, sq_abs_e ) ) ) );
-            short_stride_nrg_fx = L_add( short_stride_nrg_fx, L_shl( sq_abs_fx, sub( Q22, sub( Q31, sq_abs_e ) ) ) ); // Q(31 - sq_abs_e) -> Q22
+            short_stride_nrg_fx = L_add( short_stride_nrg_fx, L_shr( sq_abs_fx, 6 ) ); // Q22
             move32();
 
-            IF( !( ( j + 1 ) % num_bins_per_short_stride_bin ) )
+            IF( !( add( j, 1 ) % num_bins_per_short_stride_bin ) )
             {
                 /* new short stride bin */
                 short_stride_pow_spec_fx[j / num_bins_per_short_stride_bin] = short_stride_nrg_fx; /* energy rather than magnitude works better for covariance weighting*/
@@ -1001,33 +990,38 @@ static Word16 ivas_calculate_abs_fr_fx(
             }
 
             /* accumulate bin energies within a CLDFB band */
-            cldfb_nrg_fx = BASOP_Util_Add_Mant32Exp( cldfb_nrg_fx, cldfb_nrg_e, sq_abs_fx, sq_abs_e, &cldfb_nrg_e );
+            cldfb_nrg_fx = W_mac_32_32( cldfb_nrg_fx, sq_abs_fx, 1 ); // Q29
 
-            IF( !( ( j + 1 ) % num_bins_per_cldfb_band ) )
+            IF( !( add( j, 1 ) % num_bins_per_cldfb_band ) )
             {
-                Word32 temp = Sqrt32( cldfb_nrg_fx, &cldfb_nrg_e );
-                temp = L_shl( temp, sub( cldfb_nrg_e, Q9 ) );                                                 // Q22
+                Word16 exp = W_norm( cldfb_nrg_fx );
+                cldfb_nrg_fx = W_shl( cldfb_nrg_fx, exp );
+                exp = sub( 34, exp ); // 31 - (Q29 + exp -32)
+                temp = Sqrt32( W_extract_h( cldfb_nrg_fx ), &exp );
+                temp = L_shl( temp, sub( exp, Q9 ) );                                                         // Q22
                 pFb->fb_bin_to_band.pp_cldfb_weights_per_spar_band_fx[j / num_bins_per_cldfb_band][i] = temp; // Q22
                 move32();
                 cldfb_nrg_fx = 0;
                 move32();
-                cldfb_nrg_e = 0;
-                move16();
             }
         }
 
+        quo = BASOP_Util_Divide3232_Scale( ONE_IN_Q30, short_stride_max_per_spar_band_fx, &exp_diff );
+        /* Q of quo = Q30 - Q22 + (15 - exp_diff) --> Q23 - exp_diff.
+        With Mult_32_16, Q23 - exp_diff - 15 --> Q8 - exp_diff */
+        exp_diff = sub( Q8, exp_diff );
+
         /*loop over the short MDFT bins*/
         FOR( j = 0; j < short_stride; j++ )
         {
-            tmp = BASOP_Util_Divide3232_Scale( short_stride_pow_spec_fx[j], short_stride_max_per_spar_band_fx, &exp_diff );
-            short_stride_pow_spec_fx[j] = L_shl( L_deposit_l( tmp ), add( Q7, exp_diff ) ); // Q22
+            short_stride_pow_spec_fx[j] = L_shr( Mult_32_16( short_stride_pow_spec_fx[j], quo ), exp_diff ); // Q22
             move32();
             short_stride_pow_spec_fx[j] = L_max( L_sub( short_stride_pow_spec_fx[j], 1258291 ), 0 ); // 0.3f * ONE_IN_Q22
             move32();
-            tmp = BASOP_Util_Divide3232_Scale( short_stride_pow_spec_fx[j], 2936012, &exp_diff ); // 0.7f * ONE_IN_Q22
-            short_stride_pow_spec_fx[j] = L_shl( L_deposit_l( tmp ), add( Q7, exp_diff ) );       // Q22
+            short_stride_pow_spec_fx[j] = L_shl( Mpy_32_32( short_stride_pow_spec_fx[j], 1533916891 /* 1/0.7 in Q30 */ ), 1 ); // Q22
             move32();
 
+
             IF( short_stride_pow_spec_fx[j] > 0 )
             {
                 assert( idx_short_stride_bin_to_band < 2 * MDFT_FB_BANDS_240 ); /* array size of p_short_stride_bin_to_band */
@@ -1083,6 +1077,13 @@ static Word16 ivas_calculate_abs_fr_fx(
         sum_over_spar_bands_fx = L_max( sum_over_spar_bands_fx, EPSILON_FX ); // Q22
         move32();
 
+        exp_diff = 0;
+        move16();
+        tmp = BASOP_Util_Divide3232_Scale( ONE_IN_Q30, sum_over_spar_bands_fx, &exp_diff );
+        /* Q of quo = Q30 - Q22 + (15 - exp_diff) --> Q23 - exp_diff.
+        With Mult_32_16, Q23 - exp_diff - 15 --> Q8 - exp_diff */
+        exp_diff = sub( Q8, exp_diff );
+
         FOR( i = 0; i < bands; i++ )
         {
             test();
@@ -1096,20 +1097,13 @@ static Word16 ivas_calculate_abs_fr_fx(
                 move16();
             }
 
-            Word16 exp_diff = 0;
-            move16();
-            Word16 tmp = BASOP_Util_Divide3232_Scale( pFb->fb_bin_to_band.pp_cldfb_weights_per_spar_band_fx[j][i], sum_over_spar_bands_fx, &exp_diff );
-            pFb->fb_bin_to_band.pp_cldfb_weights_per_spar_band_fx[j][i] = L_shl( L_deposit_l( tmp ), add( Q7, exp_diff ) ); // Q22
+            pFb->fb_bin_to_band.pp_cldfb_weights_per_spar_band_fx[j][i] = L_shr( Mult_32_16( pFb->fb_bin_to_band.pp_cldfb_weights_per_spar_band_fx[j][i], tmp ), exp_diff );
             move32();
         }
         pFb->fb_bin_to_band.p_spar_start_bands[j] = spar_start;
         move16();
     }
 
-    Word16 exp;
-    frame_len = BASOP_Util_Divide3232_Scale( sampling_rate, FRAMES_PER_SEC, &exp );
-    frame_len = shr( frame_len, sub( 15, exp ) );
-
     set32_fx( ppFilterbank_FRs_s_fx, 0, frame_len );
 
     /*Commented logic is for calculating number of active bands, can be removed if not needed */
@@ -1136,7 +1130,7 @@ static Word16 ivas_calculate_abs_fr_fx(
             Word32 temp_fx = 0;
             move32();
 
-            Word16 exp_diff = 0;
+            exp_diff = 0;
             move16();
             Word32 real = L_shr( *pFilterbank_bin_to_band_re_fx, 3 ); // Q27
             Word32 imag = L_shr( *pFilterbank_bin_to_band_im_fx, 3 ); // Q27
@@ -1195,7 +1189,7 @@ static Word16 ivas_calculate_abs_fr_fx(
         {
             Word16 abs_active_bins = pFb->fb_bin_to_band.pFb_active_bins_per_band[j];
             Word16 abs_start_offset = pFb->fb_bin_to_band.pFb_start_bin_per_band[j];
-            Word16 exp_diff = 0, tmp;
+            exp_diff = 0;
 
             move16();
             move16();
@@ -1293,7 +1287,7 @@ static ivas_error ivas_filterbank_setup_fx(
 
         ivas_get_active_bins_fx( &pAll_bins_per_band, &pAll_bins_per_band_abs, &pAll_bins_start_offset, &pAll_bins_start_offset_abs, sampling_rate );
 
-        IF( EQ_16( pCfg->fb_latency, NS2SA( sampling_rate, DELAY_FB_1_NS ) ) )
+        IF( EQ_16( pCfg->fb_latency, NS2SA_FX2( sampling_rate, DELAY_FB_1_NS ) ) )
         {
             pAll_fb_fr_fx[0] = ivas_fb_fr_12band_1ms_re_fx; // Q30
             move32();
@@ -1482,7 +1476,7 @@ static ivas_error ivas_fb_mixer_get_window_fx(
     error = IVAS_ERR_OK;
     move32();
 
-    IF( EQ_16( fade_len, NS2SA( sampling_rate, DELAY_FB_4_NS ) ) )
+    IF( EQ_16( fade_len, NS2SA_FX2( sampling_rate, DELAY_FB_4_NS ) ) )
     {
         SWITCH( sampling_rate )
         {
@@ -1499,7 +1493,7 @@ static ivas_error ivas_fb_mixer_get_window_fx(
                 return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Unsupported Sampling frequency!" );
         }
     }
-    ELSE IF( EQ_16( fade_len, NS2SA( sampling_rate, DELAY_FB_1_NS ) ) )
+    ELSE IF( EQ_16( fade_len, NS2SA_FX2( sampling_rate, DELAY_FB_1_NS ) ) )
     {
         SWITCH( sampling_rate )
         {
diff --git a/lib_com/ivas_filters.c b/lib_com/ivas_filters_fx.c
similarity index 99%
rename from lib_com/ivas_filters.c
rename to lib_com/ivas_filters_fx.c
index 32ebe479ff26e38dccced55c702e6b7cf64ad713..1e9aaf0c20771fffa77bbebf43f7109a95cc50b5 100644
--- a/lib_com/ivas_filters.c
+++ b/lib_com/ivas_filters_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,7 +32,6 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_cnst.h"
 #include "ivas_stat_com.h"
 #include "wmc_auto.h"
diff --git a/lib_com/ivas_ism_com.c b/lib_com/ivas_ism_com_fx.c
similarity index 99%
rename from lib_com/ivas_ism_com.c
rename to lib_com/ivas_ism_com_fx.c
index 1dd7f0f8784132b4f3c550fc6d28041dc2058e00..5f1a13afb7ca1a431d823a6d5461813e136c34a0 100644
--- a/lib_com/ivas_ism_com.c
+++ b/lib_com/ivas_ism_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,12 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_stat_com.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
-#define IVAS_FLOAT_FIXED_TO_BE_REMOVED
 
 /*-----------------------------------------------------------------------*
  * Local constants
diff --git a/lib_com/ivas_lfe_com.c b/lib_com/ivas_lfe_com_fx.c
similarity index 98%
rename from lib_com/ivas_lfe_com.c
rename to lib_com/ivas_lfe_com_fx.c
index 56f14a18b424a16018594990233ae180fe8a1817..3d1e7aee66e4b495f8aadbff57788cacdcc5389c 100644
--- a/lib_com/ivas_lfe_com.c
+++ b/lib_com/ivas_lfe_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,8 +34,7 @@
 #include "math.h"
 #include "options.h"
 #include "ivas_stat_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "cnst.h"
diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com_fx.c
similarity index 99%
rename from lib_com/ivas_masa_com.c
rename to lib_com/ivas_masa_com_fx.c
index 1ff43334435d86db53d149122027d31ea33c94be..cfed06357fe908e6c3fda28720aa7272ca67adb0 100644
--- a/lib_com/ivas_masa_com.c
+++ b/lib_com/ivas_masa_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,14 +34,12 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_dec.h"
 #include "wmc_auto.h"
 #include "ivas_rom_com_fx.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
diff --git a/lib_com/ivas_mc_com.c b/lib_com/ivas_mc_com_fx.c
similarity index 98%
rename from lib_com/ivas_mc_com.c
rename to lib_com/ivas_mc_com_fx.c
index 39ba64d0e21976c9879554bfec77aff0770fbf8a..8201037a1a5f89eb53acb0e81787b0a87f68da5c 100644
--- a/lib_com/ivas_mc_com.c
+++ b/lib_com/ivas_mc_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,8 +34,7 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com_fx.c
similarity index 99%
rename from lib_com/ivas_mc_param_com.c
rename to lib_com/ivas_mc_param_com_fx.c
index be3f35606f874df9d56e143ee1f6964adafd4274..4469e7f93d82856a3e2db90e362e3e02265108be 100644
--- a/lib_com/ivas_mc_param_com.c
+++ b/lib_com/ivas_mc_param_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include <math.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_stat_com.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
diff --git a/lib_com/ivas_mcmasa_com.c b/lib_com/ivas_mcmasa_com-fx.c
similarity index 98%
rename from lib_com/ivas_mcmasa_com.c
rename to lib_com/ivas_mcmasa_com-fx.c
index fe29c84866f60c39eb8f043d71c8fb500a5046ab..23a3800fb792ba9eeee06ef4cd26001a9b54d5e6 100644
--- a/lib_com/ivas_mcmasa_com.c
+++ b/lib_com/ivas_mcmasa_com-fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,7 +31,6 @@
 *******************************************************************************************************/
 
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "options.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com_fx.c
similarity index 98%
rename from lib_com/ivas_mct_com.c
rename to lib_com/ivas_mct_com_fx.c
index 3d2d4c99b72ac9f2ce9ec43da94fa5793c8b5ac3..81a56df146d9ba7378dbcadacb6aeb39b98f28b0 100644
--- a/lib_com/ivas_mct_com.c
+++ b/lib_com/ivas_mct_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,8 +33,8 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "wmc_auto.h"
 #include <assert.h>
 
diff --git a/lib_com/ivas_mdct_core_com.c b/lib_com/ivas_mdct_core_com_fx.c
similarity index 97%
rename from lib_com/ivas_mdct_core_com.c
rename to lib_com/ivas_mdct_core_com_fx.c
index f3ad466ccee734a1fd4d88b1d9c9ede34b26f7d3..fe313eecdd7c3be915f9d9aa73c37081e79b61ac 100644
--- a/lib_com/ivas_mdct_core_com.c
+++ b/lib_com/ivas_mdct_core_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,10 +33,8 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 /*--------------------------------------------------------------------------*
diff --git a/lib_com/ivas_mdct_imdct_fx.c b/lib_com/ivas_mdct_imdct_fx.c
index 37c5251098d3dbd3c4fee6a0006386a71567aa02..542f5ca745df2f4a678581ab9c1968ba2966137e 100644
--- a/lib_com/ivas_mdct_imdct_fx.c
+++ b/lib_com/ivas_mdct_imdct_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft_fx.c
similarity index 99%
rename from lib_com/ivas_mdft_imdft.c
rename to lib_com/ivas_mdft_imdft_fx.c
index 4ed267ba50dec81360f68bc87c50ee6862b7be57..5d7bee1a6929347ac19968f7d8996878878f8897 100644
--- a/lib_com/ivas_mdft_imdft.c
+++ b/lib_com/ivas_mdft_imdft_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,14 +33,12 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include <assert.h>
 #include "wmc_auto.h"
 #include <stdint.h>
 #include <math.h>
-#include "prot_fx.h"
 #include "debug.h"
 #include "ivas_rom_com_fx.h"
 #include "ivas_prot_fx.h"
diff --git a/lib_com/ivas_omasa_com.c b/lib_com/ivas_omasa_com_fx.c
similarity index 99%
rename from lib_com/ivas_omasa_com.c
rename to lib_com/ivas_omasa_com_fx.c
index a86f90acb7246eb84a9a47e5c9410cc55f51f6db..1c1d4bf6cb6ca87def78b29f60c793547d2f3e4d 100644
--- a/lib_com/ivas_omasa_com.c
+++ b/lib_com/ivas_omasa_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,13 +33,11 @@
 #include "options.h"
 #include <stdlib.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "rom_com.h"
 #include <math.h>
-#include "prot_fx.h"
 
 /*---------------------------------------------------------------
  * Local constants
diff --git a/lib_com/ivas_pca_tools.c b/lib_com/ivas_pca_tools_fx.c
similarity index 99%
rename from lib_com/ivas_pca_tools.c
rename to lib_com/ivas_pca_tools_fx.c
index 6ccc07523ad68f96f1c1ba8ba06c732f0c320e2d..c84078a7d4291080687cfe2597eafe8af3aba784 100644
--- a/lib_com/ivas_pca_tools.c
+++ b/lib_com/ivas_pca_tools_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,13 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_cnst.h"
 #include <math.h>
 #include <assert.h>
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
deleted file mode 100644
index 03bc3d6e5761cb47156dd15f849625fe99545cea..0000000000000000000000000000000000000000
--- a/lib_com/ivas_prot.h
+++ /dev/null
@@ -1,4120 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#ifndef IVAS_PROT_H
-#define IVAS_PROT_H
-
-#include <stdint.h>
-#include "options.h"
-#include <stdio.h>
-#include "typedef.h"
-#include "stat_enc.h"
-#include "stat_dec.h"
-#include "stat_com.h"
-#include "ivas_stat_enc.h"
-#include "ivas_stat_dec.h"
-#include "ivas_stat_com.h"
-#include "ivas_error_utils.h"
-
-#define IVAS_FLOAT_FIXED_TO_BE_REMOVED
-
-/* clang-format off */
-
-/*----------------------------------------------------------------------------------*
- * General IVAS prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_enc(
-    Encoder_Struct *st_ivas,                                    /* i  : IVAS encoder structure                  */
-    const int16_t *data,                                        /* i  : input signal                            */
-    const int16_t n_samples                                     /* i  : number of input samples                 */
-);
-
-void stereo_dmx_evs_enc(
-    STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS,                    /* i/o: Stereo downmix for EVS encoder handle   */
-    const int32_t input_Fs,                                     /* i  : input sampling rate                     */
-    int16_t data[CPE_CHANNELS * L_FRAME48k],                    /* i/o: input signal                            */
-    const int16_t n_samples,                                    /* i  : number of input samples                 */
-    const bool is_binaural                                      /* i  : indication that input is binaural audio */
-);
-
-/*! r: number of channels to be analysed */
-
-void copy_encoder_config_ivas_fx(
-    Encoder_Struct *st_ivas,                                    /* i  : IVAS encoder structure                  */
-    Encoder_State *st,                                          /* o  : encoder state structure                 */
-    const Word16 flag_all                                      /* i  : flag 1==update all, 0=partial update    Q0*/
-);
-
-
-
-ivas_error create_sce_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */
-    const int16_t sce_id,                                       /* i  : SCE # identifier                        */
-    const int32_t element_brate                                 /* i  : element bitrate                         */
-);
-
-ivas_error create_evs_sce_enc(
-    Encoder_Struct *st_ivas,    /* i/o: IVAS encoder structure      */
-    const int16_t sce_id,       /* i  : SCE # identifier            */
-    const int32_t element_brate /* i  : element bitrate             */
-);
-
-ivas_error create_cpe_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */
-    const int16_t cpe_id,                                       /* i  : CPE # identifier                        */
-    const int32_t element_brate                                 /* i  : element bitrate                         */
-);
-
-ivas_error create_mct_enc_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-ivas_error ivas_sba_enc_reconfigure(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-void destroy_sce_enc(
-    SCE_ENC_HANDLE hSCE,                                        /* i/o: SCE encoder structure                   */
-    Flag is_evs                                                 /* i  : Flag to indicate EVS encoder            */  
-);
-
-void destroy_cpe_enc(
-    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder structure                   */
-);
-
-void ivas_mct_enc_close_fx(
-    MCT_ENC_HANDLE *hMCT                                        /* i/o: MCT encoder structure                   */
-);
-
-ivas_error ivas_corecoder_enc_reconfig(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */
-    const int16_t nSCE_old,                                     /* i  : number of SCEs in previous frame        */
-    const int16_t nCPE_old,                                     /* i  : number of CPEs in previous frame        */
-    const int16_t nchan_transport_old,                          /* i  : number of TCs in previous frame         */
-    const int32_t brate_SCE,                                    /* i  : bitrate to be set for the SCEs          */
-    const int32_t brate_CPE,                                    /* i  : bitrate to be set for the CPEs          */
-    const MC_MODE last_mc_mode                                  /* i  : switching between MC modes: last mode   */
-);
-
-ivas_error ivas_sce_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */
-    const int16_t sce_id,                                       /* i  : SCE # identifier                        */
-    const float data_f[],                                       /* i  : input signal for single channel         */
-    const int16_t input_frame,                                  /* i  : input frame length per channel          */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-
-ivas_error ivas_cpe_enc(
-    Encoder_Struct *st_ivas,      /* i/o: IVAS encoder structure          */
-    const Word16 cpe_id,          /* i  : CPE # identifier                */
-    float data_f_ch0[],           /* i  : input signal for channel 0      */
-    float data_f_ch1[],           /* i  : input signal for channel 1      */
-    const Word16 input_frame,     /* i  : input frame length per channel  */
-    const Word16 nb_bits_metadata /* i  : number of metadata bits         */
-);
-
-ivas_error ivas_mct_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */
-    float *data[MCT_MAX_CHANNELS],                              /* i  : input signal buffers                    */
-    const int16_t input_frame,                                  /* i  : input frame length per channel          */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-ivas_error pre_proc_front_ivas(
-    SCE_ENC_HANDLE hSCE,                                        /* i/o: SCE encoder structure                      */
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                      */
-    const int32_t element_brate,                                /* i  : SCE/CPE element bitrate                    */
-    const int16_t nb_bits_metadata,                             /* i  : number of metadata bits                    */
-    const int16_t input_frame,                                  /* i  : frame length                               */
-    const int16_t n,                                            /* i  : channel number                             */
-    float old_inp_12k8[],                                       /* o  : buffer of old input signal                 */
-    float old_inp_16k[],                                        /* o  : buffer of old input signal @16kHz          */
-    float *ener,                                                /* o  : residual energy from Levinson-Durbin       */
-    float *relE,                                                /* o  : frame relative energy                      */
-    float A[NB_SUBFR16k * ( M + 1 )],                           /* o  : A(z) unquantized for the 4 subframes       */
-    float Aw[NB_SUBFR16k * ( M + 1 )],                          /* o  : weighted A(z) unquantized for subframes    */
-    float epsP[M + 1],                                          /* o  : LP prediction errors                       */
-    float lsp_new[M],                                           /* o  : LSPs at the end of the frame               */
-    float lsp_mid[M],                                           /* o  : LSPs in the middle of the frame            */
-    int16_t *vad_hover_flag,                                    /* o  : VAD hangover flag                          */
-    int16_t *attack_flag,                                       /* o  : flag signaling attack                      */
-    float realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],  /* i/o: real buffer                                */
-    float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],  /* i/o: imag buffer                                */
-    float old_wsp[],                                            /* o  : weighted input signal buffer               */
-    float pitch_fr[NB_SUBFR],                                   /* o  : fractional pitch values                    */
-    float voicing_fr[NB_SUBFR],                                 /* o  : fractional pitch gains                     */
-    int16_t *loc_harm,                                          /* o  : harmonicity flag                           */
-    float *cor_map_sum,                                         /* o  : speech/music clasif. parameter             */
-    int16_t *vad_flag_dtx,                                      /* o  : HE-SAD flag with additional DTX HO         */
-    float enerBuffer[CLDFB_NO_CHANNELS_MAX],                    /* o  : energy buffer                              */
-    float fft_buff[2 * L_FFT],                                  /* o  : FFT buffer                                 */
-    const float tdm_A_PCh[M + 1],                               /* i  : unq. LP coeff. of primary channel          */
-    const float tdm_lsp_new_PCh[M],                             /* i  : unq. LSPs of primary channel               */
-    const float currFlatness,                                   /* i  : flatness parameter                         */
-    const int16_t tdm_ratio_idx,                                /* i  : Current Ratio_L index                      */ 
-    float fr_bands_LR[][2 * NB_BANDS],                          /* i  : energy in frequency bands                  */
-    const float Etot_LR[],                                      /* i  : total energy Left & Right channel          */
-    float lf_E_LR[][2 * VOIC_BINS],                             /* i  : per bin spectrum energy in lf, LR channels */
-    const int16_t localVAD_HE_SAD_LR[],                         /* i  : HE-SAD flag without hangover, LR channels  */
-    float band_energies_LR[2 * NB_BANDS],                       /* o  : energy in critical bands without minimum noise floor E_MIN      */
-    const int16_t flag_16k_smc,                                 /* i  : flag to indicate if the OL SMC is run at 16 kHz */
-    const int16_t front_vad_flag,                               /* i  : front-VAD flag to overwrite VAD decision   */
-    const int16_t force_front_vad,                              /* i  : flag to force VAD decision                 */
-    const int16_t front_vad_dtx_flag,                           /* i  : front-VAD DTX flag to overwrite VAD decision*/
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                                */
-    const int16_t MCT_flag, /* i  : hMCT handle allocated (1) or not (0)    */
-    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                         */
-);
-
-ivas_error pre_proc_front_ivas_fx(
-    SCE_ENC_HANDLE hSCE,                                       /* i/o: SCE encoder structure                   */
-    CPE_ENC_HANDLE hCPE,                                       /* i/o: CPE encoder structure                   */
-    const Word32 element_brate,            /* i  : SCE/CPE element bitrate					Q0*/
-    const Word16 nb_bits_metadata,         /* i  : number of metadata bits					Q0*/
-    const Word16 input_frame,              /* i  : frame length								Q0*/
-    const Word16 n,                        /* i  : channel number							Q0*/
-    Word16 old_inp_12k8_fx[],              /* o  : buffer of old input signal				Q_new-1*/
-    Word16 old_inp_16k_fx[],               /* o  : buffer of old input signal @16kHz		Q_new-1*/
-    Word32 *ener_fx,                       /* o  : residual energy from Levinson-Durbin		epsP_fx_q*/
-    Word16 *relE_fx,                       /* o  : frame relative energy					Q8*/
-    Word16 A_fx[NB_SUBFR16k * ( M + 1 )],  /* o  : A(z) unquantized for the 4 subframes		Q12*/
-    Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* o  : weighted A(z) unquantized for subframes	Q12*/
-    Word32 epsP_fx[M + 1],                 /* o  : LP prediction errors						epsP_fx_q*/
-    Word16 *epsP_fx_q,
-    Word16 lsp_new_fx[M],                                          /* o  : LSPs at the end of the frame				Q15*/
-    Word16 lsp_mid_fx[M],                                          /* o  : LSPs in the middle of the frame			Q15*/
-    Word16 *vad_hover_flag,                                        /* o  : VAD hangover flag						Q0*/
-    Word16 *attack_flag,                                           /* o  : flag signaling attack					Q0*/
-    Word32 realBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer								Q(q_re_im_buf)*/
-    Word32 imagBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer								Q(q_re_im_buf)*/
-    Word16 *q_re_im_buf,                                           /* i/o: Q-factor of real and imag buffer			*/
-    Word16 old_wsp_fx[],                                           /* o  : weighted input signal buffer				q_old_wsp*/
-    Word16 *q_old_wsp,
-    Word16 pitch_fr_fx[NB_SUBFR],                /* o  : fractional pitch values						Q6*/
-    Word16 voicing_fr_fx[NB_SUBFR],              /* o  : fractional pitch gains							Q15*/
-    Word16 *loc_harm,                            /* o  : harmonicity flag								Q0*/
-    Word16 *cor_map_sum_fx,                      /* o  : speech/music clasif. parameter					Q8*/
-    Word16 *vad_flag_dtx,                        /* o  : HE-SAD flag with additional DTX HO				Q0*/
-    Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o  : energy buffer									enerBuffer_fx_exp*/
-    Word16 *enerBuffer_fx_exp,                   /* o  : energy buffer									*/
-    Word16 fft_buff_fx[2 * L_FFT],               /* o  : FFT buffer										fft_buff_fx_q*/
-    Word16 *fft_buff_fx_q,                       /* o  : FFT buffer										*/
-    const Word16 tdm_A_PCh_fx[M + 1],            /* i  : unq. LP coeff. of primary channel				Q12*/
-    const Word16 tdm_lsp_new_PCh_fx[M],          /* i  : unq. LSPs of primary channel					Q15*/
-    const Word16 currFlatness_fx,                /* i  : flatness parameter								Q7*/
-    const Word16 tdm_ratio_idx,                  /* i  : Current Ratio_L index							Q0*/
-    Word32 fr_bands_LR_fx[][2 * NB_BANDS],       /* i  : energy in frequency bands (fr_bands_LR_fx_q)	fr_bands_LR_fx_q*/
-    Word16 fr_bands_LR_fx_q[CPE_CHANNELS],
-    const Word16 Etot_LR_fx[],          /* i  : total energy Left & Right channel						Q8*/
-    Word32 lf_E_LR_fx[][2 * VOIC_BINS], /* i  : per bin spectrum energy in lf, LR channels				(lf_E_LR_fx_q)*/
-    Word16 lf_E_LR_fx_q,
-    const Word16 localVAD_HE_SAD_LR[],        /* i  : HE-SAD flag without hangover, LR channels			Q0*/
-    Word32 band_energies_LR_fx[2 * NB_BANDS], /* o  : energy in critical bands without minimum noise floor E_MIN	(band_energies_LR_fx_q)*/
-    Word16 band_energies_LR_fx_q,
-    const Word16 flag_16k_smc,       /* i  : flag to indicate if the OL SMC is run at 16 kHz			Q0*/
-    const Word16 front_vad_flag,     /* i  : front-VAD flag to overwrite VAD decision					Q0*/
-    const Word16 force_front_vad,    /* i  : flag to force VAD decision									Q0*/
-    const Word16 front_vad_dtx_flag, /* i  : front-VAD DTX flag to overwrite VAD decision				Q0*/
-    const IVAS_FORMAT ivas_format,   /* i  : IVAS format												*/
-    const Word16 MCT_flag,           /* i  : hMCT handle allocated (1) or not (0)						Q0*/
-    const Word32 ivas_total_brate,   /* i  : IVAS total bitrate - for setting the DTX					Q0*/
-    Word16 *Q_new
-#ifdef DEBUG_MODE_INFO
-    ,
-    const Word16 ch_idx
-#endif
-);
-ivas_error pre_proc_ivas_fx(
-    Encoder_State *st,                     /* i/o: encoder state structure                 */
-    const Word16 last_element_mode,        /* i  : last element mode						Q0*/
-    const Word32 element_brate,            /* i  : element bitrate							Q0*/
-    const Word32 last_element_brate,       /* i  : last element bitrate						Q0*/
-    const Word16 input_frame,              /* i  : frame length								Q0*/
-    Word16 old_inp_12k8_fx[],              /* i/o: buffer of old input signal				Q_new-1 */
-    Word16 old_inp_16k_fx[],               /* i/o: buffer of old input signal @ 16kHz		Q_new-1 */
-    Word16 **inp_fx,                       /* o  : ptr. to inp. signal in the current frame	Q_new*/
-    Word32 *ener_fx,                       /* o  : residual energy from Levinson-Durbin		epsP_fx_q*/
-    Word16 A_fx[NB_SUBFR16k * ( M + 1 )],  /* i/o: A(z) unquantized for the 4 subframes		Q12*/
-    Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: weighted A(z) unquantized for subframes	Q14*/
-    Word32 epsP_fx[M + 1],                 /* i  : LP prediction errors						epsP_fx_q*/
-    Word16 *epsP_fx_q,                     /* i  : LP prediction errors						*/
-    Word16 lsp_new_fx[M],                  /* i/o: LSPs at the end of the frame				Q15*/
-    Word16 lsp_mid_fx[M],                  /* i/o: LSPs in the middle of the frame			Q15*/
-    Word16 *new_inp_resamp16k_fx,          /* o  : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE	Q_new-1*/
-    Word16 *Voicing_flag,                  /* o  : voicing flag for HQ FEC					Q0*/
-    Word16 old_wsp_fx[],                   /* i  : weighted input signal buffer				e_old_wsp*/
-    Word16 e_old_wsp,
-    const Word16 loc_harm,       /* i  : harmonicity flag									Q0*/
-    const Word16 vad_flag_dtx,   /* i  : HE-SAD flag with additional DTX HO					Q0*/
-    const Word16 MCT_flag,       /* i  : hMCT handle allocated (1) or not (0)				Q0*/
-    const Word16 vad_hover_flag, /* i  : VAD hangover flag									Q0*/
-    const Word16 flag_16k_smc,   /* i  : flag to indicate if the OL SMC is run at 16 kHz	Q0*/
-    Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX],	/* e_enerBuffer */
-    Word16 e_enerBuffer,
-    Word16 fft_buff_fx[2 * L_FFT], /* Qx */
-    Word16 cor_map_sum_fx,         /* Q8 */
-    Word16 *Q_new
-);
-/*! r: number of clipped samples */
-void ivas_initialize_handles_enc_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-ivas_error ivas_init_encoder(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-void ivas_destroy_enc_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-ivas_error ivas_initialize_MD_bstr_enc_fx(
-    BSTR_ENC_HANDLE *hBstr,                                     /* o  : encoder MD bitstream handle             */
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-void ivas_destroy_MD_bstr_enc_fx(
-    BSTR_ENC_HANDLE *hMetaData                                  /* i/o: encoder MD bitstream handle             */
-);
-
-ivas_error ivas_init_decoder_front(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-ivas_error ivas_init_decoder(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-ivas_error ivas_output_buff_dec(
-    float *p_output_f[],                                        /* i/o: output audio buffers                    */
-    const int16_t nchan_out_buff_old,                           /* i  : previous frame number of output channels*/
-    const int16_t nchan_out_buff                                /* i  : number of output channels               */
-);
-#endif
-
-ivas_error stereo_dmx_evs_init_encoder(
-    STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS,                   /* o  : Stereo downmix for EVS encoder handle   */
-    const int32_t input_Fs                                      /* i  : input sampling rate                     */
-);
-
-void stereo_dmx_evs_close_encoder(
-    STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS                    /* i/o: Stereo downmix for EVS encoder handle   */
-);
-
-ivas_error ivas_dec(
-    Decoder_Struct *st_ivas,                                    /* i  : IVAS decoder structure                  */
-    int16_t *data                                               /* o  : output synthesis signal                 */
-);
-
-
-ivas_error mct_dec_reconfigure(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const uint16_t b_nchan_change                               /* i  : flag indicating different channel count */
-);
-
-
-void ivas_mct_dec_close(
-    MCT_DEC_HANDLE *hMCT                                        /* i/o: MCT decoder structure                   */
-);
-
-ivas_error ivas_corecoder_dec_reconfig(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int16_t nSCE_old,                                     /* i  : number of SCEs in previous frame        */
-    int16_t nCPE_old,                                           /* i  : number of CPEs in previous frame                          */
-    const int16_t nchan_transport_old,                          /* i  : number of TCs in previous frame                           */
-    const int16_t sba_dirac_stereo_flag_old,                    /* i  : signal stereo rendering using DFT upmix in previous frame */
-    const int32_t brate_SCE,                                    /* i  : bitrate to be set for the SCEs                            */
-    const int32_t brate_CPE                                     /* i  : bitrate to be set for the CPEs                            */
-);
-
-ivas_error ivas_hp20_dec_reconfig(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int16_t nchan_hp20_old                                /* i  : number of HP20 filters in previous frame*/
-);
-
-ivas_error ivas_sce_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int16_t sce_id,                                       /* i  : SCE # identifier                        */
-    float *output[1],                                           /* o  : output synthesis signal                 */
-    const int16_t output_frame,                                 /* i  : output frame length per channel         */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-ivas_error ivas_cpe_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int16_t cpe_id,                                       /* i  : CPE # identifier                        */
-    float *output[CPE_CHANNELS],                                /* o  : output synthesis signal                 */
-    const int16_t output_frame,                                 /* i  : output frame length per channel         */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-ivas_error ivas_mct_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    float *output[],                                            /* o  : output synthesis signal                 */
-    const int16_t output_frame,                                 /* i  : output frame length per channel         */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-/*! r: number of channels to be synthesised */
-
-void copy_decoder_config(
-    Decoder_Struct *st_ivas,                                    /* i  : IVAS decoder structure                  */
-    Decoder_State *st                                           /* o  : decoder state structure                 */
-);
-
-void destroy_core_dec(
-    DEC_CORE_HANDLE hCoreCoder                                  /* i/o: core decoder structure                  */
-);
-
-
-void ivas_initialize_handles_dec(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-ivas_error ivas_core_enc_fx(
-    SCE_ENC_HANDLE hSCE,                                         /* i/o: SCE encoder structure                  */
-    CPE_ENC_HANDLE hCPE,                                         /* i/o: CPE encoder structure                  */
-    MCT_ENC_HANDLE hMCT,                                         /* i/o: MCT encoder structure                  */
-    const Word16 n_CoreChannels,          /* i  : number of core channels to be coded     Q0*/
-    Word16 old_inp_12k8_fx[][L_INP_12k8], /* i  : buffer of old input signal              Q_new-1*/
-    Word16 old_inp_16k_fx[][L_INP],       /* i  : buffer of old input signal              Q_new-1*/
-    Word16 Q_new[],
-    Word32 ener_fx[],                                                /* i  : residual energy from Levinson-Durbin	epsP_fx_q*/
-    Word16 A_fx[][NB_SUBFR16k * ( M + 1 )],                          /* i  : A(z) unquantized for the 4 subframes    Q12*/
-    Word16 Aw_fx[][NB_SUBFR16k * ( M + 1 )],                         /* i  : weighted A(z) unquantized for subframes Q12*/
-    Word32 epsP_fx[][M + 1],                                         /* i  : LP prediction errors					epsP_fx_q*/
-    Word16 epsP_fx_q[],                                              /* i  : LP prediction errors                   */
-    Word16 lsp_new_fx[][M],                                          /* i  : LSPs at the end of the frame			Q15*/
-    Word16 lsp_mid_fx[][M],                                          /* i  : LSPs in the middle of the frame		Q15*/
-    const Word16 vad_hover_flag[],                                   /* i  : VAD hanglover flag                     Q0*/
-    Word16 attack_flag[],                                            /* i  : attack flag (GSC or TC)                Q0*/
-    Word32 realBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer                            q_re_im_buf*/
-    Word32 imagBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer                            q_re_im_buf*/
-    Word16 *q_re_im_buf,
-    Word16 old_wsp_fx[][L_WSP], /* i  : weighted input signal buffer            e_old_wsp*/
-    Word16 e_old_wsp[],
-    const Word16 loc_harm[],                       /* i  : harmonicity flag							Q0*/
-    const Word16 cor_map_sum_fx[],                 /* i  : speech/music clasif. parameter			Q8*/
-    const Word16 vad_flag_dtx[],                   /* i  : HE-SAD flag with additional DTX HO		Q0*/
-    Word32 enerBuffer_fx[][CLDFB_NO_CHANNELS_MAX], /* o  : energy buffer							enerBuffer_fx_exp*/
-    Word16 enerBuffer_fx_exp[],                    /* o  : energy buffer							*/
-    Word16 fft_buff_fx[][2 * L_FFT],               /* i  : FFT buffer								Qx*/
-    const Word16 tdm_SM_or_LRTD_Pri,               /* i  : channel combination scheme flag			Q0*/
-    const Word16 ivas_format,                      /* i  : IVAS format								Q0*/
-    const Word16 flag_16k_smc                      /* i  : flag to indicate if the OL SMC is run at 16 kHz	Q0*/
-);
-
-
-
-void decod_gen_2sbfr(
-    Decoder_State *st,                                          /* i/o: decoder static memory                   */
-    const int16_t sharpFlag,                                    /* i  : formant sharpening flag                 */
-    const float *Aq,                                            /* i  : LP filter coefficient                   */
-    float *pitch_buf,                                           /* o  : floating pitch values for each subframe */
-    float *voice_factors,                                       /* o  : voicing factors                         */
-    float *exc,                                                 /* i/o: adapt. excitation exc                   */
-    float *exc2,                                                /* i/o: adapt. excitation/total exc             */
-    float *bwe_exc,                                             /* o  : excitation for SWB TBE                  */
-    float *gain_buf,                                            /* o  : floating pitch gain for each subframe   */
-    const int16_t tdm_Pitch_reuse_flag,                         /* i  : primary channel pitch reuse flag        */
-    const float tdm_Pri_pitch_buf[]                             /* i  : pitch values for primary channel        */
-);
-
-void synchro_synthesis(
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float *output[CPE_CHANNELS],                                /* i/o: output synthesis signal                 */
-    const int16_t output_frame,                                 /* i  : Number of samples                       */
-    const int16_t sba_dirac_stereo_flag                         /* i  : signal stereo output for SBA DirAC      */
-);
-
-void synchro_synthesis_fixed(
-  const int32_t ivas_total_brate,     /* i  : IVAS total bitrate                  */
-  CPE_DEC_HANDLE hCPE,                /* i/o: CPE decoder structure               */
-  float *output[CPE_CHANNELS],        /* i/o: output synthesis signal             */
-  const int16_t output_frame,         /* i  : Number of samples                   */
-  const int16_t sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC  */
-);
-
-void stereo_tcx_init_enc(
-    Encoder_State *st                                           /* i/o: encoder state structure                 */
-);
-
-
-
-
-void stereo_tcx_init_dec(
-    Decoder_State *st,                                          /* i/o: decoder state structure                 */
-    const int16_t MCT_flag,                                     /* i  : hMCT handle allocated (1) or not (0)    */
-    const int16_t last_element_mode                             /* i  : element mode of previous frame          */
-);
-
-/*! r: S/M decision (0 = speech or noise, 1 = unclear, 2 = music) */
-int16_t ivas_smc_gmm(
-    Encoder_State *st,                                          /* i/o: encoder state structure                         */
-    STEREO_CLASSIF_HANDLE hStereoClassif,                       /* i/o: stereo classifier structure                     */
-    const int16_t localVAD_HE_SAD,                              /* i  : HE-SAD flag without hangover                    */
-    const float Etot,                                           /* i  : total frame energy                              */
-    const float lsp_new[M],                                     /* i  : LSPs in current frame                           */
-    const float cor_map_sum,                                    /* i  : correlation map sum (from multi-harmonic anal.) */
-    const float epsP[M + 1],                                    /* i  : LP prediciton error                             */
-    const float PS[],                                           /* i  : energy spectrum                                 */
-    const float non_sta,                                        /* i  : unbound non-stationarity                        */
-    const float relE,                                           /* i  : relative frame energy                           */
-    int16_t *high_lpn_flag,                                     /* i/o: sp/mus LPN flag                                 */
-    const int16_t flag_spitch                                   /* i  : flag to indicate very short stable pitch        */
-);
-
-void ivas_smc_mode_selection(
-    Encoder_State *st,                                          /* i/o: encoder state structure                         */
-    const int32_t element_brate,                                /* i  : element bitrate                                 */
-    int16_t smc_dec,                                            /* i  : raw decision of the 1st stage classifier        */
-    const float relE,                                           /* i  : relative frame energy                           */
-    const float Etot,                                           /* i  : total frame energy                              */
-    int16_t *attack_flag,                                       /* i/o: attack flag (GSC or TC)                         */
-    const float *inp,                                           /* i  : input signal                                    */
-    const float S_map[],                                        /* i  : short-term correlation map                      */
-    const int16_t flag_spitch                                   /* i  : flag to indicate very short stable pitch        */
-);
-
-/*! r: S/M decision (0=speech or noise,1=unclear,2=music) */
-int16_t ivas_acelp_tcx20_switching(
-    Encoder_State *st,                                          /* i/o: encoder state structure                 */
-    const float *inp,                                           /* i  : new input signal                        */
-    const float *wsp,                                           /* i  : input weighted signal                   */
-    const float non_staX,                                       /* i  : unbound non-stationarity for sp/mu clas */
-    const float *pitch_fr,                                      /* i  : fraction pitch values                   */
-    const float *voicing_fr,                                    /* i  : fractional voicing values               */
-    const float currFlatness,                                   /* i  : flatness                                */
-    const float lsp_mid[M],                                     /* i  : LSPs at the middle of the frame         */
-    const float stab_fac,                                       /* i  : LP filter stability                     */
-    float *res_cod_SNR_M,
-    const int16_t flag_16k_smc                                  /* i  : flag to indicate if the OL SMC is run at 16 kHz */
-);
-
-
-
-void ivas_decision_matrix_dec(
-    Decoder_State *st,                                          /* i/o: decoder state structure                 */
-    int16_t *sharpFlag,                                         /* o  : formant sharpening flag                 */
-    int16_t *core_switching_flag,                               /* o  : ACELP->HQ switching frame flag          */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t nchan_out                                     /* i  : Number of output channels               */
-);
-
-void set_bw_stereo(
-    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder structures                  */
-);
-
-/*! r: flag indicating whether the coded BW has changed */
-int16_t set_bw_mct(
-    CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS],                        /* i/o: CPE encoder structures                  */
-    const int16_t nCPE                                          /* i  : number of CPEs                          */
-);
-void dec_acelp_fast(
-    Decoder_State *st,                                          /* i/o: decoder state structure                 */
-    const int16_t cdk_index,                                    /* i  : codebook index                          */
-    float code[],                                               /* o  : algebraic (fixed) codebook excitation   */
-    const int16_t L_subfr                                       /* i  : subframe length                         */
-);
-
-void set_transient_stereo(
-    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE structure                           */
-    float currFlatness[]                                        /* i/o: current flatness                        */
-);
-
-/*! r: preliminary flag to force ACELP */
-int16_t transient_analysis(
-    TRAN_DET_HANDLE hTranDet,                                   /* i  : handle transient detection             */
-    const float cor_map_LT[],                                   /* i  : LT correlation map                     */
-    const float multi_harm_limit                                /* i  : multi harminic threshold               */
-);
-
-void ivas_post_proc(
-    SCE_DEC_HANDLE hSCE,                                        /* i/o: SCE decoder structure                   */
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    const int16_t n,                                            /* i  : channel number                          */
-    float synth[],                                              /* i/o: output synthesis signal                 */
-    float *output[CPE_CHANNELS],                                /* i/o: output synthesis signal                 */
-    const int16_t output_frame,                                 /* i  : output frame length                     */
-    const int16_t sba_dirac_stereo_flag                         /* i  : signal stereo output for SBA DirAC      */
-);
-
-void ivas_renderer_select(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-ivas_error ivas_mc_enc_config_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-
-ivas_error ivas_mc_dec_config(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int16_t idx,                                          /* i  : LS config. index                        */
-    uint16_t *nSamplesRendered,                                 /* o  : samples flushed from last frame (JBM)   */
-    int16_t *data                                               /* o  : output synthesis signal                 */
-);
-
-/*! r: MC format mode (MCT, McMASA, ParamMC) */
-MC_MODE ivas_mc_mode_select(
-    const MC_LS_SETUP mc_ls_setup, /* i  : MC loudspeaker setup           */
-    const int32_t total_brate      /* i  : IVAS total bitrate             */
-);
-
-/*! r: number of loudspeaker channels */
-int16_t ivas_mc_ls_setup_get_num_channels(
-    const MC_LS_SETUP mc_ls_setup                               /* i  : loudspeaker setup (CICP)                */
-);
-
-/*! r: output configuration*/
-AUDIO_CONFIG ivas_mc_map_ls_setup_to_output_config(
-    const MC_LS_SETUP mc_ls_setup                               /* i  : multi channel loudspeaker setup         */
-);
-
-/*! r: multi channel loudspeaker setup */
-MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup(
-    const AUDIO_CONFIG output_config                            /* i  : output audio configuration              */
-);
-
-void smooth_dft2td_transition(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float *output[CPE_CHANNELS],                                /* i/o: synthesis @external Fs                  */
-    const int16_t output_frame                                  /* i  : output frame length                     */
-);
-
-
-/*! r: flag indicating a valid bitrate */
-Word16 is_IVAS_bitrate_fx(
-  const Word32 ivas_total_brate                              /* i  : IVAS total bitrate                      */
-);
-
-int16_t is_DTXrate(
-    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */
-);
-
-
-void TonalMdctConceal_create_concealment_noise_ivas(
-    float concealment_noise[L_FRAME48k],
-    CPE_DEC_HANDLE hCPE,
-    const int16_t L_frameTCX,
-    const int16_t L_frame,
-    const int16_t idchan,
-    const int16_t subframe_idx,
-    const int16_t core,
-    const float crossfade_gain,
-    const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode
-);
-
-void TonalMdctConceal_whiten_noise_shape_ivas(
-    Decoder_State *st,
-    const int16_t L_frame,
-    const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE
-);
-
-void dtx_read_padding_bits(
-    DEC_CORE_HANDLE st,
-    const int16_t num_bits 
-);
-
-
-
-/*----------------------------------------------------------------------------------*
- * JBM prototypes
- *----------------------------------------------------------------------------------*/
-
-
-
-ivas_error ivas_jbm_dec_flush_renderer(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */
-    const int16_t tc_granularity_new,                           /* i  : new renderer granularity                                    */
-    const RENDERER_TYPE renderer_type_old,                      /* i  : old renderer type                                           */
-    const AUDIO_CONFIG intern_config_old,                       /* i  : old internal config                                         */
-    const IVAS_OUTPUT_SETUP_HANDLE hIntSetupOld,                /* i  : old internal output setup                                   */
-    const MC_MODE mc_mode_old,                                  /* i  : old MC mode                                                 */
-    const ISM_MODE ism_mode_old,                                /* i  : old ISM mode                                                */
-    uint16_t *nSamplesRendered,                                 /* o  : number of samples flushed                                   */
-    int16_t *data                                               /* o  : output synthesis signal                                     */
-);
-
-void ivas_jbm_dec_feed_tc_to_renderer(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */
-    const int16_t nSamplesForRendering,                         /* i  : number of TC samples available for rendering                */
-    int16_t *nSamplesResidual,                                  /* o  : number of samples not fitting into the renderer grid and buffer for the next call*/
-    float *data                                                 /* i/o: transport channels/output synthesis signal                  */
-);
-
-ivas_error ivas_jbm_dec_set_discard_samples(
-    Decoder_Struct *st_ivas                                     /* i/o: main IVAS decoder structre                                  */
-);
-
-void ivas_jbm_dec_get_adapted_linear_interpolator(
-    const int16_t default_interp_length,                        /* i  : default length of the (full-frame) interpolator             */
-    const int16_t interp_length,                                /* i  : length of the interpolator to be created                    */
-    float *interpolator                                         /* o  : the interpolator                                            */
-);
-
-
-
-int16_t ivas_jbm_dec_get_num_tc_channels( 
-    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */
-);
-
-void ivas_jbm_dec_copy_tc_no_tsm( 
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                         */
-    float *tc[],                                                /* i  : transport channels                                          */
-    const int16_t output_frame                                  /* i  : output frame size                                           */
-);
-
-
-TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
-    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */
-);
-
-/*! r: render granularity */
-int16_t ivas_jbm_dec_get_render_granularity_flt(
-    const RENDERER_TYPE rendererType, /* i  : renderer type     */
-    const IVAS_FORMAT ivas_format,    /* i  : ivas format */
-    const MC_MODE mc_mode,            /* i  : MC mode */
-    const int32_t output_Fs           /* i  : sampling rate     */
-);
-
-ivas_error ivas_jbm_dec_tc_buffer_open(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */
-    const TC_BUFFER_MODE tc_buffer_mode,                        /* i  : buffer mode                                                 */
-    const int16_t nchan_transport_jbm,                          /* i  : number of real transport channels                           */
-    const int16_t nchan_transport_internal,                     /* i  : number of totally buffered channels                         */
-    const int16_t nchan_full,                                   /* i  : number of channels to fully store                           */
-    const int16_t n_samples_granularity                         /* i  : granularity of the renderer/buffer                          */
-);
-
-ivas_error ivas_jbm_dec_tc_buffer_reconfigure(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */
-    const TC_BUFFER_MODE tc_buffer_mode,                        /* i  : new buffer mode                                             */
-    const int16_t nchan_transport_jbm,                          /* i  : new number of real transport channels                       */
-    const int16_t nchan_transport_internal,                     /* i  : new number of totally buffered channels                     */
-    const int16_t nchan_full,                                   /* i  : new number of channels to fully store                       */
-    const int16_t n_samples_granularity                         /* i  : new granularity of the renderer/buffer                      */
-);
-
-void ivas_jbm_dec_tc_buffer_close(
-    DECODER_TC_BUFFER_HANDLE *phTcBuffer                        /* i/o: TC buffer handle                                            */
-);
-
-void ivas_jbm_dec_td_renderers_adapt_subframes(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */
-);
-
-ivas_error ivas_jbm_dec_metadata_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */
-);
-
-void ivas_jbm_masa_sf_to_sf_map(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * ISM prototypes
- *----------------------------------------------------------------------------------*/
-
-void bitbudget_to_brate(
-    const Word16 x[], /* i  : bitbudgets                        Q0  */
-    Word32 y[],       /* o  : bitrates                          Q0  */
-    const Word16 N    /* i  : number of entries to be converted   */
-);
-
-void ivas_ism_reset_metadata(
-    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handles                        */
-);
-
-void ivas_ism_reset_metadata_enc(
-    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */
-);
-void ivas_ism_reset_metadata_API(
-    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handles                        */
-);
-
-/*! r: index of the winning codeword */
-Word16 ism_quant_meta_fx(
-    const Word32 val,              /* i  : scalar value to quantize        Q22 */
-    Word32 *valQ,                  /* o  : quantized value                 Q22 */
-    const Word32 borders_fx[],     /* i  : level borders                   Q22 */
-    const Word32 q_step_fx,        /* i  : quantization step               Q22 */
-    const Word32 q_step_border_fx, /* i  : quantization step at the border Q22 */
-    const Word16 cbsize            /* i  : codebook size                       */
-);
-
-ivas_error ivas_ism_metadata_enc_create_fx(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */
-    const int16_t n_ISms,                                       /* i  : number of objects                           */
-    int32_t element_brate_tmp[]                                 /* o  : element bitrate per object                  */
-);
-
-ivas_error ivas_ism_metadata_dec_create(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */
-    const int16_t n_ISms,                                       /* i  : number of objects                           */
-    int32_t element_brate_tmp[]                                 /* o  : element bitrate per object                  */
-);
-
-ivas_error ivas_ism_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */
-    float *data[],                                             /* i  : input signal [channels][samples]            */
-    const int16_t input_frame,                                  /* i  : input frame length per channel              */
-    int16_t *nb_bits_metadata,                                  /* i  : number of metadata bits                     */
-    const int16_t flag_omasa_ener_brate                         /* i  : less bitrate for objects in OMASA flag      */
-);
-
-ivas_error ivas_ism_metadata_dec(
-    const int32_t ism_total_brate,                              /* i  : ISM total bitrate                           */
-    const int16_t nchan_ism,                                    /* i  : number of ISM channels                      */
-    int16_t *nchan_transport,                                   /* o  : number of transport channels                */
-    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */
-    SCE_DEC_HANDLE hSCE[],                                      /* i/o: SCE decoder handles                         */
-    const int16_t bfi,                                          /* i  : bfi flag                                    */
-    int16_t nb_bits_metadata[],                                 /* o  : number of metadata bits                     */
-    ISM_MODE ism_mode,                                          /* i  : ISM mode                                    */
-    ISM_DTX_DATA_DEC hISMDTX,                                   /* i/o: ISM DTX structure                           */
-    const PARAM_ISM_CONFIG_HANDLE hParamIsm,                    /* i  : Param ISM Config Handle                     */
-    int16_t *ism_extended_metadata_flag,                        /* i/o: Extended metadata active in renderer        */
-    int16_t *ism_extmeta_cnt,                                   /* i/o: Number of change frames observed            */
-    DEC_CORE_HANDLE st0                                         /* i  : core-coder handle                           */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Parametric ISM prototypes
- *----------------------------------------------------------------------------------*/
-
-/*! r: ISM format mode */
-
-ivas_error ivas_param_ism_enc_open_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */
-);
-
-void ivas_param_ism_enc_close_fx(
-    PARAM_ISM_CONFIG_HANDLE *hParamIsm,                         /* i/o: ParamISM handle                             */
-    const int32_t input_Fs                                      /* i  : input sampling_rate                         */
-);
-
-void ivas_ism_metadata_close(
-    ISM_METADATA_HANDLE hIsmMetaData[],                         /* i/o  : object metadata handles                   */
-    const int16_t first_idx                                     /* i  : index of first handle to deallocate         */
-);
-
-
-ivas_error ivas_ism_enc_config(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */
-);
-
-
-
-
-void ivas_param_ism_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */
-    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */
-);
-
-void ivas_ism_dec_digest_tc(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */
-);
-
-
-
-void ivas_param_ism_dec_render(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */
-    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */
-    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered              */
-    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render       */
-    float *output_f[]                                           /* o  : rendered time signal                        */
-);
-
-void ivas_param_ism_params_to_masa_param_mapping(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * ISM DTX prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_ism_dtx_open(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */
-);
-
-/*! r: indication of DTX frame */
-int16_t ivas_ism_dtx_enc(
-    ISM_DTX_HANDLE hISMDTX,                                     /* i/o: ISM DTX handle                              */
-    SCE_ENC_HANDLE hSCE[MAX_SCE],                               /* i/o: SCE encoder structure                       */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                          */
-    const int16_t nchan_ism,                                    /* i  : number of objects                           */
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    int16_t vad_flag[MAX_NUM_OBJECTS],                          /* i  : VAD flag                                    */
-    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */
-    int16_t md_diff_flag[],                                     /* o  : metadata differential flag                  */
-    int16_t *sid_flag                                           /* o  : indication of SID frame                     */
-);
-
-void ivas_ism_dtx_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */
-    int16_t *nb_bits_metadata                                   /* o  : number of metadata bits                     */
-);
-
-void ivas_ism_metadata_sid_enc_fx(
-    ISM_DTX_HANDLE hISMDTX,                                     /* i/o: ISM DTX handle                              */
-    const int16_t flag_noisy_speech,                            /* i  : noisy speech flag                           */
-    const int16_t nchan_ism,                                    /* i  : number of objects                           */
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                    */
-    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */
-    const int16_t sid_flag,                                     /* i  : indication of SID frame                     */
-    const int16_t md_diff_flag[],                               /* i  : metadata differental flag                   */
-    BSTR_ENC_HANDLE hBstr,                                      /* i/o: bitstream handle                            */
-    int16_t nb_bits_metadata[]                                  /* o  : number of metadata bits                     */
-);
-
-void ivas_ism_metadata_sid_dec(
-    SCE_DEC_HANDLE hSCE[MAX_SCE],                               /* i/o: SCE decoder structure                       */
-    const int32_t ism_total_brate,                              /* i  : ISM total bitrate                           */
-    const int16_t bfi,                                          /* i  : bfi flag                                    */
-    const int16_t nchan_ism,                                    /* i  : number of objects                           */
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                    */
-    int16_t *flag_noisy_speech,                                 /* o  : noisy speech flag                           */
-    int16_t *sce_id_dtx,                                        /* o  : SCE DTX ID                                  */
-    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */
-    int16_t nb_bits_metadata[]                                  /* o  : number of metadata bits                     */
-);
-
-
-void ivas_param_ism_compute_noisy_speech_flag_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure              */
-);
-
-
-void update_last_metadata(
-    const int16_t nchan_ism,                                    /* i  : number of objects                           */
-    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */
-    const int16_t updt_flag[]                                   /* i  : last metadata update flag                   */
-);
-
-void ivas_ism_dtx_limit_noise_energy_for_near_silence(
-    SCE_DEC_HANDLE hSCE[],                                      /* i/o: SCE decoder structures                      */
-    const int16_t sce_id_dtx,                                   /* i  : SCE DTX ID                                  */
-    const int16_t nchan_transport                               /* i  : number of transport channels                */
-);
-
-/*----------------------------------------------------------------------------------*
- * DFT Stereo prototypes
- *----------------------------------------------------------------------------------*/
-
-
-void stereo_dft_enc_analyze(
-    Encoder_State **sts,                                        /* i/o: encoder state structure             */
-    const int16_t n_channels,                                   /* i  : number of input channels            */
-    const int16_t input_frame,                                  /* i  : input frame length                  */
-    STEREO_DFT_ENC_DATA_HANDLE hStereoDft,                      /* i/o: encoder DFT stereo handle           */
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                    /* i/o: encoder MDCT stereo handle          */
-    float DFT[CPE_CHANNELS][STEREO_DFT_N_MAX_ENC],              /* o  : DFT buffers                         */
-    float *input_mem[CPE_CHANNELS]                              /* i/o: input buffer memory                 */
-);
-
-float stereo_dft_enc_synthesize(
-    STEREO_DFT_ENC_DATA_HANDLE hStereoDft,                      /* i/o: encoder DFT stereo handle           */
-    float *output,                                              /* o  : output synthesis                    */
-    const int16_t chan,                                         /* i  : channel number                      */
-    const int32_t input_Fs,                                     /* i  : input sampling rate                 */
-    const int32_t output_sampling_rate,                         /* i  : output sampling rate                */
-    const int16_t L_frame                                       /* i  : frame length at internal Fs         */
-);
-
-
-
-
-void stereo_dtf_cng( 
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure               */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                  */
-    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX],                /* i/o: DFT buffers                         */
-    const int16_t output_frame                                  /* i  : output frame size                   */
-);
-
-void stereo_dft_cng_side_gain(
-    STEREO_DFT_ENC_DATA_HANDLE hStereoDft,                      /* i/o: DFT stereo encoder handle           */
-    STEREO_CNG_ENC_HANDLE hStereoCng,                           /* i/o: Stereo CNG data structure           */
-    const int32_t core_brate,                                   /* i  : core bitrate                        */
-    const int32_t last_core_brate,                              /* i  : last core bitrate                   */
-    const int16_t bwidth                                        /* i  : audio band-width                    */
-);
-
-
-void stereo_dft_dequantize_itd(
-    int16_t *ind,
-    float *out,
-    const int32_t output_Fs 
-);
-
-
-
-void stereo_dft_dec_sid_coh(
-    Decoder_State *st,                                          /* i/o: decoder state structure             */
-    const int16_t nbands,                                       /* i  : number of DFT stereo bands          */
-    float *coh,                                                 /* i/o: coherence                           */
-    int16_t *nb_bits                                            /* i/o: number of bits read                 */
-);
-
-ivas_error stereo_dft_dec_create(
-    STEREO_DFT_DEC_DATA_HANDLE *hStereoDft,                     /* i/o: decoder DFT stereo handle           */
-    const int32_t element_brate,                                /* i  : element bitrate                     */
-    const int32_t output_Fs,                                    /* i  : output sampling rate                */
-    const int16_t sba_dirac_stereo_flag,                        /* i  : signal stereo output for SBA DirAC  */
-    const int16_t nchan_transport                               /* i  : number of transport channels        */
-);
-
-void stereo_dft_dec_reset(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft                       /* i/o: decoder DFT stereo handle           */
-);
-
-void stereo_dft_dec_update(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: decoder DFT stereo handle           */
-    const int16_t output_frame,                                 /* i  : output frame length                 */
-    const int16_t sba_dirac_stereo_flag                         /* i  : signal stereo output for SBA DirAC  */
-);
-
-void stereo_dft_dec_destroy(
-    STEREO_DFT_DEC_DATA_HANDLE *hStereoDft                      /* i/o: decoder DFT stereo handle           */
-);
-
-void stereo_dft_dec_analyze(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure               */
-    const float *input,                                         /* i  : input signal                        */
-    float out_DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX],            /* o  : DFT buffers                         */
-    const int16_t chan,                                         /* i  : channel number                      */
-    const int16_t input_frame,                                  /* i  : input frame size                    */
-    const int16_t output_frame,                                 /* i  : output frame size                   */
-    const DFT_STEREO_DEC_ANA_TYPE ana_type,                     /* i  : signal type to analyze              */
-    const int16_t k_offset,                                     /* i  : offset of DFT                       */
-    const int16_t delay                                         /* i  : delay in samples for input signal   */
-);
-
-void stereo_dft_dec_synthesize(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure               */
-    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX],                /* i  : DFT buffers                         */
-    const int16_t chan,                                         /* i  : channel number                      */
-    float output[L_FRAME48k],                                   /* o  : output synthesis signal             */
-    const int16_t output_frame                                  /* i  : output frame length                 */
-);
-
-
-void stereo_dft_res_ecu(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: Decoder DFT stereo handle           */
-    float *pDFT_RES,                                            /* i/o: residual signal                     */
-    float *const DFT_PRED_RES,                                  /* i/o: residual prediction signal          */
-    const int16_t k,                                            /* i  : Subframe index                      */
-    const int16_t output_frame,                                 /* i  : Output frame length                 */
-    const int16_t prev_bfi,                                     /* i  : Previous BFI                        */
-    const float dmx_nrg,                                        /* i  : Down-mix energy                     */
-    int16_t *num_plocs,                                         /* i/o: Number of peak locations            */
-    int16_t *plocs,                                             /* i/o: Peak locations (bin)                */
-    float *plocsi,                                              /* i/o: Peak locations (fractional)         */
-    float *input_mem                                            /* o  : Residual DFT buffer input mem       */
-);
-
-void stereo_dft_res_subst_spec(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: Decoder DFT stereo handle           */
-    float *pDFT_RES,                                            /* i/o: residual signal                     */
-    const float *const DFT_PRED_RES,                            /* i  : residual prediction signal          */
-    const int16_t time_offs,                                    /* i  : Time offset for phase adjustm.      */
-    const int16_t L_res,                                        /* i  : bandwidth of residual signal        */
-    const int16_t L_ana,                                        /* i  : Length of FFT analysis              */
-    const int16_t k,                                            /* i  : Subframe index                      */
-    int16_t *num_plocs,                                         /* i/o: Number of peak locations            */
-    int16_t *plocs,                                             /* i/o: Peak locations (bin)                */
-    float *plocsi,                                              /* i/o: Peak locations (fractional)         */
-    const int16_t analysis_flag                                 /* i  : Flag for running peak analysis      */
-);
-
-void stereo_dft_res_ecu_burst_att(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: Decoder DFT stereo handle           */
-    float *pDFT_RES,                                            /* i/o: residual signal /att. residual      */
-    const float dmx_nrg,                                        /* i  : dmx energy of current frame         */
-    const int16_t L_res,                                        /* i  : Bandwidth of residual               */
-    const int16_t L_ana                                         /* i  : Length of FFT analysis              */
-);
-
-/*! r: total energy of downmix with maximum swb bandwidth max */
-float stereo_dft_dmx_swb_nrg(
-    const float *dmx_k0,                                        /* i  : first subframe spectrum             */
-    const float *dmx_k1,                                        /* i  : second subframe spectrum            */
-    const int16_t frame_length                                  /* i  : frame lanegth                       */
-);
-
-int16_t stereo_dft_sg_recovery(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft                       /* i/o: Decoder DFT stereo handle           */
-);
-
-void stereo_dft_dec_res(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: decoder CPE handle                  */
-    float res_buf[STEREO_DFT_N_8k],                             /* i  : residual buffer                     */
-    float *output                                               /* o  : output frame                        */
-);
-
-/*! r: Decision to enable or disable BPF on DFT stereo residual */
-
-void bpf_pitch_coherence(
-    Decoder_State *st,                                          /* i/o: decoder state structure             */
-    const float pitch_buf[]                                     /* i  : pitch for each subframe [0,1,2,3]   */
-);
-
-void stereo_dft_dec_read_BS(
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                  */
-    const int32_t element_brate,                                /* i  : element bitrate                     */
-    int32_t *total_brate,                                       /* o  : total bitrate                       */
-    Decoder_State *st,                                          /* i/o: decoder state structure             */
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: decoder DFT stereo handle           */
-    const int16_t bwidth,                                       /* i  : bandwidth                           */
-    const int16_t output_frame,                                 /* i  : output frame length                 */
-    float res_buf[STEREO_DFT_N_8k],                             /* o  : residual buffer                     */
-    int16_t *nb_bits,                                           /* o  : number of bits read                 */
-    float *coh,                                                 /* i/o: Coherence                           */
-    const int16_t ivas_format                                   /* i  : ivas format                         */
-);
-
-void stereo_dft_dec_smooth_parameters(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: decoder DFT stereo handle           */
-    const int16_t prev_sid_nodata,                              /* i  : Previous SID/No data indicator      */
-    const int16_t active_frame_counter,                         /* i  : Active frame counter                */
-    const int32_t element_brate                                 /* i  : Element bitrate                     */
-);
-
-void stereo_dft_generate_res_pred(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: decoder DFT stereo handle           */
-    const float samp_ratio,                                     /* i  : sampling ratio                      */
-    float *pDFT_DMX,                                            /* i  : downmix signal                      */
-    float *DFT_PRED_RES,                                        /* o  : residual prediction signal          */
-    float *pPredGain,                                           /* i  : residual prediction gains           */
-    const int16_t k,                                            /* i  : subframe index                      */
-    float *ap_filt_DMX,                                         /* i  : enhanced stereo filling signal      */
-    int16_t *stop,                                              /* o  : last FD stereo filling bin          */
-    const int16_t bfi                                           /* i  : BFI flag                            */
-);
-
-void stereo_dft_dec_core_switching(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure               */
-    float output[],                                             /* i/o: synthesis @internal Fs              */
-    float synth[],                                              /* i  : synthesis @output Fs                */
-    float hb_synth[],                                           /* i/o: hb synthesis                        */
-    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX],                /* o  : DFT buffers                         */
-    const int16_t output_frame,                                 /* i  : output frame length                 */
-    const int16_t use_cldfb_for_dft,                            /* i  : flag to use of CLDFB for DFT Stereo */
-    const int16_t sba_dirac_stereo_dtx_flag                     /* i  : DTX indicator for SBA DirAC stereo  */
-);
-
-void init_basic_allpass(
-    basic_allpass_t *ap,                                        /* i/o: basic allpass structure             */
-    const float *gains,                                         /* i  : allpass filter gains                */
-    const int16_t *delays                                       /* i  : allpass filter delays               */
-);
-
-void filter_with_allpass(
-    const float *sig,                                           /* i  : allpass input signal                */
-    float *out,                                                 /* o  : filtered output                     */
-    const int16_t len,                                          /* i  : length of input                     */
-    basic_allpass_t *ap                                         /* i/o: basic allpass structure             */
-);
-
-/*! r: used GR order */
-
-/*! r: used GR order */
-
-
-/*! r: number of bits written */
-
-/*! r: number of bits written */
-
-
-void stereo_dft_enc_compute_itd(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */
-    float *DFT_L,
-    float *DFT_R,
-    const int16_t k_offset,
-    const int16_t input_frame,
-    const int16_t vad_flag_dtx[],  
-    const int16_t vad_hover_flag[],
-    float *bin_nrgL,
-    float *bin_nrgR 
-);
-
-void stereo_dft_config(
-    STEREO_DFT_CONFIG_DATA_HANDLE hConfig,                      /* o  : DFT stereo configuration                */
-    const int32_t brate,                                        /* i  : IVAS/CPE/nominal total bitrate          */
-    int16_t *bits_frame_nominal,                                /* o  : primary channel nominal bits per frame  */
-    int16_t *bits_frame_nominal_2                               /* o  : secondary channel nominal bits per frame*/
-);
-
-int16_t stereo_dft_band_config(
-    int16_t *band_limits,                                       /* o  : DFT band limits                         */
-    const int16_t band_res,                                     /* i  : DFT band resolution                     */
-    const int16_t NFFT,                                         /* i  : analysis/synthesis window length        */
-    const int16_t enc_dec                                       /* i  : flag to indicate enc vs dec             */
-);
-
-void stereo_dft_dmx_out_reset(
-    STEREO_DFT_DMX_DATA_HANDLE hStereoDftDmx                    /* i/o: DFT stereo DMX decoder                  */
-);
-
-void stereo_dft_unify_dmx(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: decoder stereo handle                   */
-    Decoder_State *st0,                                         /* i/o: decoder state structure                 */
-    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX],                /* i/o: DFT buffers                             */
-    float *input_mem,                                           /* i/o: mem of buffer DFT analysis              */
-    const int16_t prev_sid_nodata                               /* i  : Previous SID/No data indicator          */
-);
-
-void add_HB_to_mono_dmx(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float output[L_FRAME48k],                                   /* i/o: output synthesis                        */
-    float outputHB[L_FRAME48k],                                 /* i  : HB synthesis                            */
-    const int16_t last_core,                                    /* i  : last core, primary channel              */
-    const int16_t output_frame                                  /* i  : frame length                            */
-);
-
-/*----------------------------------------------------------------------------------*
- * Range Coder prototypes
- *----------------------------------------------------------------------------------*/
-
-void rc_uni_enc_init(
-    RangeUniEncState *rc_st_enc                                 /* i/o: RC state handle                     */
-);
-
-void rc_uni_enc_encode_fast(
-    RangeUniEncState *rc_st_enc,                                /* i/o: RC state handle                     */
-    const uint16_t cum_freq,                                    /* i  : Cumulative frequency up to symbol   */
-    const uint16_t sym_freq,                                    /* i  : Symbol frequency                    */
-    const uint16_t tot_shift                                    /* i  : Total frequency as a power of 2     */
-);
-
-void rc_uni_enc_encode_symbol_fastS(
-    RangeUniEncState *rc_st_enc,                                /* i/o: Encoder state                       */
-    const uint16_t symbol,                                      /* i  : Symbol to encode                    */
-    const uint16_t cum_freq[],                                  /* i  : Cumulative frequency up to symbol   */
-    const uint16_t sym_freq[],                                  /* i  : Symbol frequency                    */
-    const uint16_t tot_shift                                    /* i  : Total frequency as a power of 2     */
-);
-
-void rc_uni_enc_encode_bits(
-    RangeUniEncState *rc_st_enc,                                /* i/o: RC state handle                     */
-    const uint16_t value,                                       /* i  : Value to encode                     */
-    const int16_t bits                                          /* i  : Number of bits                      */
-);
-
-/*! r: Total number of bits produced */
-int16_t rc_uni_enc_virtual_finish(
-    RangeUniEncState *rc_st_enc                                 /* i  : RC state handle                     */
-);
-
-/*! r: Total number of bits produced */
-int16_t rc_uni_enc_finish(
-    RangeUniEncState *rc_st_enc                                 /* i/o: RC state handle                     */
-);
-
-void rc_uni_dec_init(
-    RangeUniDecState *rc_st_dec,                                /* i/o: RC state handle                     */
-    uint16_t *bit_buffer,                                       /* i  : Bit buffer                          */
-    const int16_t max_available_bits                            /* i  : Total maximum bits available        */
-);
-
-/*! r: Read symbol */
-uint16_t rc_uni_dec_read_symbol_fastS(
-    RangeUniDecState *rc_st_dec,                                /* i/o: Decoder State                       */
-    const uint16_t cum_freq_table[],                            /* i  : Cumulative frequency up to symbol   */
-    const uint16_t sym_freq_table[],                            /* i  : Symbol frequency                    */
-    const uint16_t alphabet_size,                               /* i  : Number of symbols in the alphabet   */
-    const uint16_t tot_shift                                    /* i  : Total frequency as a power of 2     */
-);
-
-/*! r: Read bit */
-uint16_t rc_uni_dec_read_bit(
-    RangeUniDecState *rc_st_dec                                 /* i/o: RC state handle                     */
-);
-
-/*! r: Read bit */
-uint16_t rc_uni_dec_read_bit_prob_fast(
-    RangeUniDecState *rc_st_dec,                                /* i/o: RC state handle                     */
-    const int16_t freq0,                                        /* i  : Frequency for symbol 0              */
-    const uint16_t tot_shift                                    /* i  : Total frequency as a power of 2     */
-);
-
-/*! r: Read bits */
-uint16_t rc_uni_dec_read_bits(
-    RangeUniDecState *rc_st_dec,                                /* i/o: RC state handle                     */
-    const int16_t bits                                          /* i  : Number of bits                      */
-);
-
-/*! r: Total number of bits consumed */
-int16_t rc_uni_dec_virtual_finish(
-    RangeUniDecState *rc_st_dec                                 /* i/o: RC state handle                     */
-);
-
-/*! r: Total number of bits consumed */
-int16_t rc_uni_dec_finish(
-    RangeUniDecState *rc_st_dec                                 /* i/o: RC state handle                     */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * ECLVQ Stereo prototypes
- *----------------------------------------------------------------------------------*/
-
-float ECSQ_dequantize_gain(
-    const int16_t index 
-);
-
-
-
-void ECSQ_init_instance(
-    ECSQ_instance *ecsq_inst,
-    const int16_t config_index,
-    void *ac_handle 
-);
-
-
-
-void ECSQ_dequantize_vector(
-    const int16_t *input,
-    const float global_gain,
-    const int16_t N,
-    float *output 
-);
-
-
-/*----------------------------------------------------------------------------------*
- * ICA Stereo prototypes
- *----------------------------------------------------------------------------------*/
-
-void stereo_tca_init_enc(
-    STEREO_TCA_ENC_HANDLE hStereoTCA,                           /* i/o: Stereo TCA encoder handle       */
-    const int32_t input_Fs                                      /* i  : input sampling frequency        */
-);
-
-void stereo_tca_enc(
-    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure           */
-    const int16_t input_frame                                   /* i  : length of a frame per channel   */
-);
-
-void stereo_tca_init_dec(
-    STEREO_TCA_DEC_HANDLE hStereoTCA                            /* i/o: Stereo TCA handle               */
-);
-
-void stereo_tca_dec(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure           */
-    float *synth[CPE_CHANNELS],                                 /* i/o: output synth                    */
-    const int16_t output_frame                                  /* i  : length of a frame per channel   */
-);
-
-void stereo_tca_scale_R_channel(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure           */
-    float *output,                                              /* i/o: output synthesis, R channel     */
-    const int16_t output_frame                                  /* i  : frame length                    */
-);
-
-void adjustTargetSignal(
-    float *target,
-    const int16_t prevShift,
-    const int16_t currShift,
-    const int16_t L_shift_adapt,
-    const int16_t method 
-);
-
-/*----------------------------------------------------------------------------------*
- * IC-BWE Stereo prototypes
- *----------------------------------------------------------------------------------*/
-
-
-void stereo_icBWE_preproc(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                           */
-    const int16_t input_frame,                                  /* i  : input frame length                              */
-    float shb_speech_nonref[]                                   /* o  : SHB speech non-ref channel                      */
-);
-
-void stereo_icBWE_enc(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                           */
-    const float shb_speech_ref[],                               /* i  : SHB speech ref channel                          */
-    float shb_speech_nonref[],                                  /* i/o: SHB speech non-ref channel                      */
-    const float *voice_factors                                  /* i  : voicing factors                                 */
-);
-
-void stereo_icBWE_init_dec(
-    STEREO_ICBWE_DEC_HANDLE hStereoICBWE                        /* i/o: Stereo inter-channel BWE handle                 */
-);
-
-void stereo_icBWE_dec(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                           */
-    float *synthRef,                                            /* i/o: Reference channel HB synthesis at output Fs     */
-    float *synth,                                               /* o  : Non reference channel HB synthesis at output Fs */
-    const float *fb_synth_ref,                                  /* i  : ref. high-band synthesis 16-20 kHz              */
-    const float *voice_factors,                                 /* i  : voicing factors                                 */
-    const int16_t output_frame                                  /* i  : frame length                                    */
-);
-
-void stereo_icBWE_decproc(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                           */
-    float *output[CPE_CHANNELS],                                /* i/o: output symthesis                                */
-    float outputHB[CPE_CHANNELS][L_FRAME48k],                   /* i  : HB synthesis                                    */
-    const int16_t last_core,                                    /* i  : last core, primary channel                      */
-    const int16_t last_bwidth,                                  /* i  : last bandwidth                                  */
-    const int16_t output_frame                                  /* i  : frame length                                    */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Stereo classifiers prototypes
- *----------------------------------------------------------------------------------*/
-
-/*! r: element mode */
-int16_t select_stereo_mode(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                           */
-    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                     */
-);
-
-
-void stereo_classifier_features(
-    STEREO_CLASSIF_HANDLE hStereoClassif,                       /* i/o: stereo classifier structure                     */
-    const int16_t idchan,                                       /* i  : channel ID                                      */
-    const int16_t element_mode,                                 /* i  : element mode                                    */
-    const int16_t vad_flag,                                     /* i  : VAD flag                                        */
-    const float lsf_new[],                                      /* i  : LSFs at the end of the frame                    */
-    const float epsP[],                                         /* i  : LP analysis residual energies for each iteration*/
-    const int16_t pitch[],                                      /* i  : open-loop pitch values for quantiz.             */
-    const float voicing[],                                      /* i  : OL maximum normalized correlation               */
-    const float cor_map_sum,                                    /* i  : speech/music clasif. parameter                  */
-    const float non_staX,                                       /* i  : unbound non-stationarity for sp/mu clas.        */
-    const float sp_div,                                         /* i  : spectral diversity feature                      */
-    const int16_t clas                                          /* i  : signal class                                    */
-);
-
-
-void xtalk_classifier_dft(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                           */
-    const int16_t itd,                                          /* i  : ITD from DFT stereo - used as a feature         */
-    const float gcc_phat[]                                      /* i  : GPHAT cross-channel correlation function        */
-);
-
-/*----------------------------------------------------------------------------------*
- * TD Stereo prototypes
- *----------------------------------------------------------------------------------*/
-
-void stereo_td_init_enc(
-    STEREO_TD_ENC_DATA_HANDLE hStereoTD,                        /* i/o: TD stereo encoder handle                */
-    const int16_t last_element_mode                             /* i  : last element mode                       */
-);
-
-
-
-void stereo_tdm_downmix(
-    STEREO_TD_ENC_DATA_HANDLE hStereoTD,                        /* i  : TD stereo IVAS encoder structure        */
-    float *Left_in,                                             /* i/o: Left channel -> Primary channel         */
-    float *Right_in,                                            /* i/o: Right channel -> Secondary channel      */
-    const int16_t input_frame,                                  /* i  : Number of samples                       */
-    const int16_t tdm_ratio_idx,                                /* i  : TDM ratio index                         */
-    const int16_t tdm_SM_flag,                                  /* i  : channel combination scheme flag         */
-    const int16_t tdm_ratio_idx_SM                              /* i  : TDM ratio index for SM mode             */
-);
-
-void stereo_td_init_dec(
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD,                        /* i/o: TD stereo decoder handle                */
-    const int16_t last_element_mode                             /* i  : last element mode                       */
-);
-
-void tdm_configure_dec(
-    const int16_t ivas_format,                                  /* i  : IVAS format                             */
-    const int16_t ism_mode,                                     /* i  : ISM mode in combined format             */
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    int16_t *tdm_ratio_idx,                                     /* o  : ratio index                             */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-void tdm_upmix_plain(
-    float Left[],                                               /* o  : left channel                            */
-    float Right[],                                              /* o  : right channel                           */
-    const float PCh_2_L[],                                      /* i  : primary channel                         */
-    const float SCh_2_R[],                                      /* i  : secondary channel                       */
-    const float LR_ratio,                                       /* i  : mixing ratio                            */
-    const float inv_den_LR_ratio,                               /* i  : inverse mixing ration                   */
-    const int16_t start_index,                                  /* i  : start index                             */
-    const int16_t end_index,                                    /* i  : end index                               */
-    const int16_t plus_minus_flag                               /* i  : plus/minus flag                         */
-);
-
-void stereo_tdm_combine(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float *PCh_2_L,                                             /* i/o: Primary channel -> output as L channel  */
-    float *SCh_2_R,                                             /* i/o: Seconday channel -> output as R channel */
-    const int16_t output_frame,                                 /* i  : Number of samples                       */
-    const int16_t flag_HB,                                      /* i  : flag to distinguish between core (0) and HB (1) synthesis */
-    const int16_t tdm_ratio_idx                                 /* i  : TDM ratio index                         */
-);
-
-/*! r: replication decision; 1 = Use old LP */
-void tdm_ol_pitch_comparison(
-    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */
-    float pitch_fr[CPE_CHANNELS][NB_SUBFR],                     /* i/o: fractional pitch values                 */
-    float voicing_fr[CPE_CHANNELS][NB_SUBFR]                    /* i/o: fractional pitch gains                  */
-);
-
-void tdm_configure_enc(
-    const int16_t ivas_format,                                  /* i  : IVAS format                             */
-    const int16_t ism_mode,                                     /* i  : ISM mode in combined format             */
-    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */
-    const float Etot_last[CPE_CHANNELS],                        /* i/o: Energy of last frame                    */
-    const int16_t tdm_SM_or_LRTD_Pri,                           /* i  : channel combination scheme flag in TD stereo OR LRTD primary channel */
-    const int16_t tdm_ratio_idx,                                /* i  : ratio index                             */
-    const int16_t tdm_ratio_idx_SM,                             /* i  : ratio index in SM mode                  */
-    const int16_t attack_flag,                                  /* i  : Primary channel attack flag             */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-
-void tdm_bit_alloc(
-    const int16_t ivas_format,                                  /* i  : IVAS format                             */
-    const int16_t ism_mode,                                     /* i  : ISM mode in combined format             */
-    const int32_t element_brate_wo_meta,                        /* i  : element bitrate without metadata        */
-    const int16_t tdm_lp_reuse_flag,                            /* i  : LPC reusage flag                        */
-    int32_t *total_brate_pri,                                   /* o  : Allocated primary channel bitrate       */
-    int32_t *total_brate_sec,                                   /* o  : Allocated secondary channel bitrate     */
-    int16_t *tdm_low_rate_mode,                                 /* o  : secondary channel low rate mode flag    */
-    const int16_t coder_type,                                   /* i  : secondary channel coder type            */
-    const int16_t ener_ratio_idx,                               /* i  : correlation ratio indexe                */
-    const int16_t tdm_Pitch_reuse_flag,                         /* i  : primary channel pitch reuse flag        */
-    const int16_t bwidth_pri,                                   /* i  : bandwidth of the primary channel        */
-    const int16_t bwidth_sec,                                   /* i  : bandwidth of the secondary channel      */
-    const int16_t flag_ACELP16k_pri,                            /* i  : ACELP@16kHz core flag, primary chan.    */
-    const int16_t tdm_LRTD_flag,                                /* i  : LRTD stereo mode flag                   */
-    const int16_t coder_type0,                                  /* i  : coder type (temporary in the encoder, from bitstream in decoder) */
-    const int16_t tdm_inst_ratio_idx                            /* i  : instantaneous correlation ratio index   */
-);
-
-
-/*! r: value of the indice */
-uint16_t get_indice_st(
-    Decoder_State *st,                                          /* i/o: decoder state structure                 */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t pos,                                          /* i  : absolute position in the bitstream      */
-    const int16_t nb_bits                                       /* i  : number of bits to quantize the indice   */
-);
-
-void tdm_low_rate_dec(
-    Decoder_State *st,                                          /* i/o: decoder static memory                   */
-    float dct_epit[],                                           /* o  : GSC excitation in DCT domain            */
-    float *tmp_noise,                                           /* o  : long term temporary noise energy        */
-    float *pitch_buf,                                           /* o  : floating pitch values for each subframe */
-    float *voice_factors,                                       /* o  : voicing factors                         */
-    float *exc,                                                 /* i/o: adapt. excitation exc                   */
-    float *exc2,                                                /* i/o: adapt. excitation/total exc             */
-    float *bwe_exc,                                             /* o  : excitation for SWB TBE                  */
-    const float *lsf_new                                        /* i  : ISFs at the end of the frame            */
-);
-
-void tdm_SCh_LSF_intra_pred(
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const float *tdm_lsfQ_PCh,                                  /* i  : primary channel LSFs                    */
-    float *pred_lsf_SCh                                         /* o  : predicted secondary channel LSFs        */
-);
-
-
-void first_VQstages(
-    const float *const *cb,
-    const float u[],                                            /* i  : vector to be encoded (prediction and mean removed)  */
-    const int16_t *levels,                                      /* i  : number of levels in each stage                      */
-    const int16_t stagesVQ,                                     /* i  : number of stages                                    */
-    const float w[],                                            /* i  : weights                                             */
-    const int16_t N,                                            /* i  : vector dimension                                    */
-    const int16_t max_inner,                                    /* i  : maximum number of swaps in inner loop               */
-    int16_t indices_VQstage[] 
-);
-
-
-void deindex_lvq_SHB( 
-    UWord32 index,
-    float *out,
-    const int16_t nbits,
-    const int16_t mode
-);
-
-/*----------------------------------------------------------------------------------*
- * MDCT Stereo prototypes
- *----------------------------------------------------------------------------------*/
-
-void stereo_td_itd_mdct_stereo( 
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder handle                      */
-    const int16_t vad_flag_dtx[],                               /* i  : VAD dtx flags                           */
-    const int16_t vad_hover_flag[],                             /* i  : VAD hangover flags                      */
-    const int16_t input_frame                                   /* i  : frame length                            */
-);
-
-void QuantizeTCXSpectrum(
-    Encoder_State *st,                                          /* i  : state handle                            */
-    const int16_t frame_cnt,                                    /* i  : frame counter in the super_frame        */
-    const float *x_orig,                                        /* i  : shaped MDCT spectrum                    */
-    const float *gainlpc,                                       /* i  : FDNS gains                              */
-    const Word16 *Aqind,                                        /* i  : frame-independent quantized coefficients (M+1) */
-    const int16_t tnsSize,                                      /* i  : number of tns parameters put into prm   */
-    const int16_t nb_bits,                                      /* i  : bit budget                              */
-    const int16_t vad_hover_flag,                               /* i  : VAD hangover flag                       */
-    int16_t *pL_frameTCX,                                       /* o  : full frame length                       */
-    int16_t *pL_frame,                                          /* o  : frame length                            */
-    int16_t *pL_spec,                                           /* o  : length of the coded spectrum            */
-    int16_t *ptcx_offset,                                       /* o  : folding point offset relative to the end of the previous frame */
-    int16_t *pnoiseFillingBorder,                               /* o  : noise filling border                    */
-    float spectrum[],                                           /* o  : quantized MDCT spectrum                 */
-    CONTEXT_HM_CONFIG *hm_cfg,                                  /* o  : Context-based harmonic model configuration */
-    int16_t *hm_active,                                         /* o  : flag indicating if the harmonic model is active */
-    float lf_deemph_fact[],                                     /* o  : low frequency deemphasis factors        */
-    int16_t *nf_seed,                                           /* o  : noise filling random seed               */
-    float *ener,                                                /* o  : energy of the quantized spectrum        */
-    float *gain_tcx,                                            /* o  : global gain                             */
-    int16_t prm[]                                               /* o  : tcx parameters                          */
-);
-
-void EstimateStereoTCXNoiseLevel(
-    Encoder_State **sts,                                        /* i  : state handle                            */
-    float *q_spectrum[CPE_CHANNELS][NB_DIV],                    /* i  : quantized MDCT spectrum                 */
-    float gain_tcx[][NB_DIV],                                   /* i  : global gain                             */
-    int16_t L_frame[][NB_DIV],                                  /* i  : frame length                            */
-    int16_t noiseFillingBorder[][NB_DIV],                       /* i  : noise filling border                    */
-    int16_t hm_active[][NB_DIV],                                /* i  : flag indicating if the harmonic model is active */
-    const int16_t ignore_chan[],                                /* i  : flag indicating whether the channel should be ignored */
-    float fac_ns[][NB_DIV],                                     /* o  : noise filling level                     */
-    int16_t param_core[][NB_DIV * NPRM_DIV],                    /* o  : quantized noise filling level           */
-    const int16_t MCT_flag                                      /* i  : hMCT handle allocated (1) or not (0)    */
-);
-
-void TNSAnalysisStereo(
-    Encoder_State **sts,                                        /* i  : state handle                            */
-    float *mdst_spectrum[CPE_CHANNELS][NB_DIV],                 /* o  : MDST spectrum                           */
-    const int16_t bWhitenedDomain,                              /* i  : whitened domain flag                    */
-    int16_t tnsSize[CPE_CHANNELS][NB_DIV],                      /* i  : number of tns parameters put into prm   */
-    int16_t tnsBits[CPE_CHANNELS][NB_DIV],                      /* i  : number of tns bits in the frame         */
-    int16_t param_core[][NB_DIV * NPRM_DIV],                    /* o  : quantized noise filling level           */
-    const int16_t mct_on                                        /* i  : flag mct block (1) or stereo (0)        */
-);
-
-void InternalTCXDecoder(
-    Encoder_State *st,                                          /* i/o: state handle                            */
-    const int16_t frame_cnt,                                    /* i  : frame counter in the super_frame        */
-    const int16_t L_frameTCX,                                   /* i  : full frame length                       */
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    const int16_t L_spec,                                       /* i  : length of the coded spectrum            */
-    const int16_t tcx_offset,                                   /* i  : folding point offset relative to the end of the previous frame */
-    const int16_t noiseFillingBorder,                           /* i  : noise filling border                    */
-    const float *x_quant,                                       /* i  : quantized spectrum                      */
-    const float ener,                                           /* i  : energy of the quantized spectrum        */
-    float lf_deemph_fact[],                                     /* i/o: low frequency deemphasis factors        */
-    const float fac_ns,                                         /* i  : noise filling level                     */
-    const int16_t nf_seed,                                      /* i  : noise filling random seed               */
-    const float *A,                                             /* i  : LPC representation of the FDNS gains    */
-    float *gainlpc,                                             /* i/o: FDNS gains                              */
-    const int16_t hm_active,                                    /* i  : flag indicating if the harmonic model is active */
-    float gain_tcx,                                             /* i/o: global gain / quantized global gain     */
-    float spectrum[],                                           /* o  : dequantized spectrum                    */
-    float synth[],                                              /* o  : time domain signal                      */
-    int16_t *gain_tcx_q                                         /* o  : quantized global gain (at low bitrates) */
-);
-
-void stereo_mdct_core_enc_fx(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */
-    Word16 new_samples[CPE_CHANNELS][L_INP],                     /* i  : new samples                             Q0*/
-    Word16 old_wsp[CPE_CHANNELS][L_WSP],                         /* i  : 12.8kHz weighted speech (for LTP        Qx*/
-    Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k]                  /* o  : floating pitch for each subframe     Q6*/
-);
-
-void initMdctStereoEncData(
-    STEREO_MDCT_ENC_DATA *hStereoMdct,                          /* i/o: mdct stereo parameters structure        */
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */
-    const int16_t element_mode,                                 /* i  : element mode                            */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t bwidth,                                       /* i  : bandwidth                               */
-    const int16_t igf,                                          /* i  : flag indicating IGF activity            */
-    const H_IGF_GRID hIgfGrid,                                  /* i  : IGF grid setup                          */
-    const int16_t mem_init                                      /* i  : initialize memory after malloc          */
-);
-
-ivas_error initMdctItdHandling(
-    STEREO_MDCT_ENC_DATA *hStereoMdct,                          /* i/o: mdct stereo parameters structure        */
-    const int32_t input_Fs                                      /* i  : input sampling rate                     */
-);
-
-void stereo_mdct_enc_destroy(
-    STEREO_MDCT_ENC_DATA_HANDLE *hStereoMdct                    /* i/o: encoder MDCT stereo handle              */
-);
-
-void initMdctStereoDecData(
-    STEREO_MDCT_DEC_DATA *hStereoMdct,                          /* i/o: mdct stereo parameters structure        */
-    const int16_t igf,                                          /* i  : flag indicating IGF activity            */
-    const H_IGF_GRID igfGrid,                                   /* i  : IGF grid configuration                  */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t bwidth                                        /* i  : audio bandwidth                         */
-);
-
-void stereo_mdct_init_bands(
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    const int16_t tmp_tcx_mode,                                 /* i  : tcx mode (TCX10, TCX 20), -1 if transition frame   */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t igf,                                          /* i  : flag indicating if IGF is used          */
-    const H_IGF_GRID hIgfGrid,                                  /* i  : IGF grid setup                          */
-    int16_t *sfbOffset,                                         /* o  : sfb offset table                        */
-    int16_t *sfbCnt                                             /* o  : number of sfbs                          */
-);
-
-void stereo_mdct_init_igf_start_band(
-    STEREO_MDCT_BAND_PARAMETERS *stbParams,                     /* i/o: stereo frequency band parameters        */
-    const float transFac,                                       /* i  : transform factor                        */
-    const int16_t bwidth,                                       /* i  : audio bandwidth                         */
-    const int32_t element_brate                                 /* i  : element bitrate                         */
-);
-
-void init_tcx_enc_info(
-    Encoder_State *st,                                          /* i  : coder memory state                      */
-    int16_t *L_frame,
-    int16_t *L_frameTCX,
-    int16_t *L_spec 
-);
-
-void decoder_tcx_invQ(
-    Decoder_State *st,                                          /* i/o: coder memory state                      */
-    int16_t prm[],                                              /* i  : parameters                              */
-    float A[],                                                  /* i  : coefficients NxAz[M+1]                  */
-    Word16 Aind[],                                              /* i  : frame-independent coefficients Az[M+1]  */
-    const int16_t L_spec,
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    float x[],
-    float gainlpc2[],
-    float xn_buf[],
-    int16_t *fUseTns,                                           /* o  : flag that is set if TNS data is present */
-    STnsData *tnsData,
-    float *gain_tcx,
-    const int16_t **prm_sqQ,
-    int16_t *nf_seed,
-    const int16_t bfi,                                          /* i  : Bad frame indicator                     */
-    const int16_t frame_cnt                                     /* i  : frame counter in the super frame        */
-);
-
-void decoder_tcx_noisefilling(
-    Decoder_State *st,                                          /* i/o: coder memory state                      */
-    float concealment_noise[L_FRAME48k],
-    const float A[],                                            /* i  : coefficients NxAz[M+1]                  */
-    const int16_t L_frameTCX_glob,
-    const int16_t L_spec,
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    float x[],
-    float gainlpc2[],
-    int16_t *temp_concealment_method,
-    const float gain_tcx,
-    const int16_t *prm_sqQ,
-    int16_t nf_seed,
-    const int16_t bfi,                                          /* i  : Bad frame indicator                     */
-    const int16_t MCT_flag,                                     /* i  : hMCT handle allocated (1) or not (0)    */
-    const int16_t frame_cnt                                     /* i  : frame counter in the super frame        */
-);
-
-void decoder_tcx_noiseshaping_igf(
-    Decoder_State *st,                                          /* i/o: coder memory state                      */
-    const int16_t L_spec,
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    const int16_t left_rect,
-    float x[],
-    const float gainlpc2[],
-    int16_t *temp_concealment_method,
-    const int16_t bfi                                           /* i  : Bad frame indicator                     */
-);
-
-void decoder_tcx_tns(
-    Decoder_State *st,                                          /* i/o: coder memory state                      */
-    const int16_t L_frame_glob,
-    const int16_t L_spec,
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    float x[N_MAX],
-    const int16_t fUseTns,                                      /* i  : flag that is set if TNS data is present */
-    STnsData *tnsData,
-    const int16_t bfi,                                          /* i  : Bad frame indicator                     */
-    const int16_t frame_cnt,                                    /* i  : frame counter in the super frame        */
-    const int16_t whitenedDomain 
-);
-
-void decoder_tcx_imdct(
-    Decoder_State *st,                                          /* i/o: coder memory state                      */
-    const int16_t L_frame_glob,                                 /* i  : frame length                            */
-    const int16_t L_frameTCX_glob,
-    const int16_t L_spec,
-    const int16_t tcx_offset,
-    const int16_t tcx_offsetFB,
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    const int16_t left_rect,
-    float x[N_MAX],
-    float xn_buf[],
-    const uint16_t kernelType,                                  /* i  : TCX transform kernel type               */
-    const int16_t fUseTns,                                      /* i  : flag that is set if TNS data is present */
-    float synth[],                                              /* i/o: synth[-M..L_frame]                      */
-    float synthFB[],
-    const int16_t bfi,                                          /* i  : Bad frame indicator                     */
-    const int16_t frame_cnt,                                    /* i  : frame counter in the super frame        */
-    const int16_t sba_dirac_stereo_flag                         /* i  : signal stereo output for SBA DirAC      */
-);
-
-void init_tcx_info(
-    Decoder_State *st,                                          /* i/o: coder memory state                                               */
-    const int16_t L_frame_glob,                                 /* i  : global frame length                                              */
-    const int16_t L_frameTCX_glob,                              /* i  : FB global frame length                                           */
-    const int16_t frame_cnt,                                    /* i  : frame counter in the super_frame                                 */
-    const int16_t bfi,                                          /* i  : bad frame indicator                                              */
-    int16_t *tcx_offset,                                        /* o  : folding point offset relative to the end of the previous frame   */
-    int16_t *tcx_offsetFB,                                      /* o  : FB folding point offset relative to the end of the previous frame*/
-    int16_t *L_frame,                                           /* o  : frame length                                                     */
-    int16_t *L_frameTCX,                                        /* o  : TCX frame length                                                 */
-    int16_t *left_rect,                                         /* o  : left part is rectangular                                         */
-    int16_t *L_spec                                             /* o  : spectrum length                                                  */
-);
-
-void decoder_tcx_IGF_mono(
-    Decoder_State *st,                                          /* i/o: coder memory state                      */
-    float x[],                                                  /* o  : de-quatized coefficients                */
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    const int16_t left_rect,                                    /* i  : left part is rectangular                */
-    const int16_t bfi,                                          /* i  : bad frame indicator                     */
-    const int16_t frame_cnt                                     /* i  : frame counter in the super_frame        */
-);
-
-void decoder_tcx_IGF_stereo(
-    Decoder_State **sts,                                        /* i/o: coder memory states                     */
-    STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct,                    /* i/o: MDCT stereo structure                   */
-    int16_t ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    float *x[CPE_CHANNELS][NB_DIV],                             /* o  : de-quatized coefficients                */
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    const int16_t left_rect,                                    /* i  : left part is rectangular                */
-    const int16_t k,                                            /* i  : Subframe index                          */
-    const int16_t bfi,                                          /* i  : bad frame indicator                     */
-    const int16_t MCT_flag                                      /* i  : hMCT handle allocated (1) or not (0)    */
-);
-
-void ms_processing(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                    /* i/o: MDCT encoder structure                  */
-    Encoder_State **sts,                                        /* i/o: Encoder state structure                 */
-    int16_t ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    const int16_t iSubframe,                                    /* i  : subframe number                         */
-    float x_0[],                                                /* i/o: spectrum 1                              */
-    float x_1[],                                                /* i/o: spectrum 2                              */
-    int16_t maxSfb                                              /* i  : number of stereo frequency bands        */
-);
-
-void ms_inv_mask_processing(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                    /* i/o: MDCT encoder structure                  */
-    Encoder_State **sts,                                        /* i/o: Encoder state structure                 */
-    int16_t ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    const int16_t iSubframe,                                    /* i  : subframe number                         */
-    const float x_0[],                                          /* i  : spectrum 1                              */
-    const float x_1[],                                          /* i  : spectrum 2                              */
-    float x_inv_0[],                                            /* o  : inverse spectrum 1                      */
-    float x_inv_1[],                                            /* o  : inverse spectrum 2                      */
-    int16_t maxSfb                                              /* i  : number of stereo frequency bands        */
-);
-
-void IGFDecApplyStereo_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDecL,                     /* i  : instance handle of IGF Decoder          */
-    const IGF_DEC_INSTANCE_HANDLE hIGFDecR,                     /* i  : instance handle of IGF Decoder          */
-    float *spectrumL,                                           /* i/o: L MDCT spectrum                         */
-    float *spectrumR,                                           /* i/o: R MDCT spectrum                         */
-    const int16_t igfGridIdx,                                   /* i  : in case of CELP->TCX switching, use 1.25 framelength */
-    const int16_t *coreMsMask,
-    const int16_t restrict_hopsize,
-    const int16_t bfi,                                          /* i  : frame loss == 1, frame good == 0        */
-    const int16_t bfi_apply_damping                             /* i  : decoder element mode                    */
-);
-
-void IGFEncStereoEncoder(
-    STEREO_MDCT_BAND_PARAMETERS *sfbParam,                      /* i/o: sfb parameters for the right channel    */
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc,                      /* i  : IGF handle                              */
-    const float *mdctSpectrumL,                                 /* i  : left spectrum                           */
-    const float *mdctSpectrumR,                                 /* i  : right spectrum                          */
-    int16_t *msMask,                                            /* i/o: MS mask                                 */
-    int16_t *igfStereoMode,                                     /* o  : IGF stereo mode                         */
-    const int16_t mdct_stereo_mode,                             /* i  : MDCT stereo mode                        */
-    const int16_t isTCX20,                                      /* i  : flag for indicating TCX20               */
-    const int16_t isTransition                                  /* i  : flag for transtition                    */
-);
-
-void IGFDecReplicateTCX10State_flt(
-    IGF_DEC_INSTANCE_HANDLE hIGFDec                             /* i/o: instance handle of IGF Decoder          */
-);
-
-
-void InitPsychLPC(
-    const int32_t sr_core,          /* i  : sampling rate of core-coder   */
-    const int16_t L_frame,          /* i  : frame length                  */
-    const TCX_CONFIG_HANDLE hTcxCfg /* i  : TCX configuration handle      */
-);
-
-
-void stereo_coder_tcx(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                    /* i/o: MDCT encoder structure                  */
-    Encoder_State **sts,                                        /* i/o: encoder state structure                 */
-    int16_t ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    float *mdst_spectrum[CPE_CHANNELS][NB_DIV],                 /* i/o: MDST spectrum                           */
-    float *inv_spectrum[CPE_CHANNELS][NB_DIV],                  /* i/o: inverse spectrum                        */
-    float *inv_mdst_spectrum[CPE_CHANNELS][NB_DIV],             /* i/o: inverse MDST spectrum                   */
-    const int16_t mct_on                                        /* i  : flag mct block (1) or stereo (0)        */
-);
-
-void stereo_decoder_tcx(
-    STEREO_MDCT_DEC_DATA *hStereoMdct,                          /* i/o: MDCT stereo decoder structure           */
-    int16_t ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    float *spec_r_0[NB_DIV],                                    /* i/o: spectrum right channel                  */
-    float *spec_l[],                                            /* i/o: spectrum left channel  [NB_DIV][N]      */
-    float *spec_r[],                                            /* i/o: spectrum right channel [NB_DIV][N]      */
-    const int16_t mdct_stereo_mode[],                           /* i  : stereo mode (FB/band wise MS, dual mono */
-    const int16_t core_l,                                       /* i  : core for left channel (TCX20/TCX10)     */
-    const int16_t core_r,                                       /* i  : core for right channel (TCX20/TCX10)    */
-    const int16_t igf,                                          /* i  : flag for IGF activity                   */
-    const int16_t L_frameTCX_l,                                 /* i  : TCX frame length of left channel        */
-    const int16_t L_frameTCX_r,                                 /* i  : TCX frame length of right channel       */
-    const int16_t mct_on,                                       /* i  : flag mct block (1) or stereo (0)        */
-    const int16_t last_core_l,                                  /* i  : last core for left channel              */
-    const int16_t last_core_r,                                  /* i  : last core for right channel             */
-    const int16_t tmp_plc_upmix                                 /* i  : indicates temp upmix for PLC decision   */
-);
-
-void stereo_mdct_core_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float *signal_out[CPE_CHANNELS],                            /* o  : synthesis @internal_FS                  */
-    float signal_outFB[CPE_CHANNELS][L_FRAME48k]                /* o  : synthesis @output_FS                    */
-);
-
-void splitAvailableBits(
-    const int16_t total_bits,                                   /* i  : total available bits for TCX coding     */
-    const int16_t split_ratio,                                  /* i  : split ratio                             */
-    const int16_t isSBAStereoMode,                              /* i  : signal core coding for SBA              */
-    int16_t *bits_ch0,                                          /* o  : bits for channel 0                      */
-    int16_t *bits_ch1                                           /* o  : bits for channel 1                      */
-);
-
-Word16 write_stereo_to_bitstream_fx
-(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                    /* i/o: Stereo MDCT encoder structure           */
-    Encoder_State **sts,                                        /* i/o: Encoder state structure                 */
-    Word16 ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                         Q0*/
-    const Word16 mct_on,                                       /* i  : flag mct block (1) or stereo (0)         Q0*/
-    BSTR_ENC_HANDLE hBstr                                       /* i/o: bitstream handle                        */
-);
-
-
-
-void ComputeSpectrumNoiseMeasure(
-    const float *powerSpec,
-    const int16_t L_frame,
-    const int16_t startLine,
-    const int16_t resetMemory,
-    int8_t *noiseFlags,
-    const int16_t lowpassLine 
-);
-
-void IGFSaveSpectrumForITF(
-    IGF_ENC_INSTANCE_HANDLE hIGFEnc,                            /* i/o: instance handle of IGF Encoder          */
-    const int16_t igfGridIdx,                                   /* i  : IGF grid index                          */
-    const float *pITFSpectrum                                   /* i  : MDCT spectrum                           */
-);
-
-void convert_coeffs_to_higher_res(
-    const float *in1,                                           /* i  : first subframe input                    */
-    const float *in2,                                           /* i  : second subframe input                   */
-    float *out,                                                 /* o  : converted output                        */
-    const int16_t len                                           /* i  : length of subframes                     */
-);
-
-int16_t quantize_sns(
-    float sns_in[CPE_CHANNELS][NB_DIV][M],
-    float snsQ_out[CPE_CHANNELS][NB_DIV][M],
-    Encoder_State **sts,
-    int16_t *indices,
-    int16_t *zero_side_flag,
-    int16_t *sns_stereo_mode
-);
-
-void dequantize_sns(
-    int16_t indices[CPE_CHANNELS][NPRM_LPC_NEW],
-    float snsQ_out[CPE_CHANNELS][NB_DIV][M],
-    Decoder_State **sts
-);
-
-void sns_avq_dec(
-    int16_t *index,                                             /* i  : Quantization indices                    */
-    float SNS_Q[NB_DIV][M],                                     /* o  : Quantized SNS vectors                   */
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    const int16_t numlpc                                        /* i  : Number of sets of lpc                   */
-);
-
-void sns_avq_dec_stereo(
-    int16_t *indexl,                                            /* i  : Quantization indices (left channel)     */
-    int16_t *indexr,                                            /* i  : Quantization indices (right channe)     */
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    float *SNS_Ql,                                              /* o  : Quantized SNS vectors (left channel)    */
-    float *SNS_Qr                                               /* o  : Quantized SNS vectors (right channe)    */
-);
-
-void convertToMS(
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    float x0[],                                                 /* i/o: mid/left channel coefficients           */
-    float x1[],                                                 /* i/o: side/right channel coefficients         */
-    const float norm_fac                                        /* i  : normalization factor                    */
-);
-
-void inverseMS(
-    const int16_t L_frame,                                      /* i  : frame length                            */
-    float x0[],                                                 /* i/o: mid/left channel coefficients           */
-    float x1[],                                                 /* i/o: side/right channel coefficients         */
-    const float norm_fac                                        /* i  : normalization factor                    */
-);
-
-void stereoFdCngCoherence(
-    Encoder_State **sts,                                        /* i/o: core encoder structures                 */
-    const int16_t last_element_mode,                            /* i  : last element mode                       */
-    float fft_buff[CPE_CHANNELS][2 * L_FFT]                     /* i  : fft buffers for L and R channels        */
-);
-
-void FdCngEncodeMDCTStereoSID(
-    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder state structure             */
-);
-
-void FdCngDecodeMDCTStereoSID(
-    CPE_DEC_HANDLE hCPE                                         /* i/o: CPE decoder state structure             */
-);
-
-ivas_error initMdctStereoDtxData(
-    CPE_DEC_HANDLE hCPE                                         /* i/o: CPE decoder handle                      */
-);
-
-void synchonize_channels_mdct_sid(
-    Decoder_State *sts[CPE_CHANNELS],                           /* i/o: decoder state structure                 */
-    const int16_t n                                             /* i  : channel number                          */
-);
-
-void updateBuffersForDmxMdctStereo(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE handle                              */
-    const int16_t output_frame,                                 /* i  : output frame length                     */
-    float *output[CPE_CHANNELS],                                /* i/o: decoder output                          */
-    float synth[CPE_CHANNELS][L_FRAME48k]                       /* i/o: decoder synthesis                       */
-);
-
-void applyDmxMdctStereo(
-    const CPE_DEC_HANDLE hCPE,                                  /* i  : CPE handle                              */
-    float *output[CPE_CHANNELS],                                /* o  : output from core decoder                */    
-    const int16_t output_frame                                  /* i  : output frame length                     */
-);
-
-/*----------------------------------------------------------------------------------*
- * Front-VAD prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error front_vad_create(
-    FRONT_VAD_ENC_HANDLE *hFrontVad,                            /* i/o: front-VAD handle                        */
-    const ENCODER_CONFIG_HANDLE hEncoderConfig                  /* i  : configuration structure                 */
-);
-
-void front_vad_destroy(
-    FRONT_VAD_ENC_HANDLE *hFrontVad                             /* i/o: front-VAD handle                        */
-);
-
-ivas_error front_vad(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure, nullable         */
-    Encoder_State *st,                                          /* i/o: encoder state structure                 */
-    const ENCODER_CONFIG_HANDLE hEncoderConfig,                 /* i  : configuration structure                 */
-    FRONT_VAD_ENC_HANDLE *hFrontVads,                           /* i/o: front-VAD handles                       */
-    const int16_t MCT_flag,                                     /* i  : hMCT handle allocated (1) or not (0)    */
-    const int16_t input_frame,                                  /* i  : frame length                            */
-    int16_t vad_flag_dtx[],                                     /* o  : HE-SAD flag with additional DTX HO      */
-    float fr_bands[][2 * NB_BANDS],                             /* i  : energy in frequency bands               */
-    float Etot_LR[],                                            /* o  : total energy Left & Right channel       */
-    float lf_E[][2 * VOIC_BINS],                                /* i  : per bin spectrum energy in lf, LR channels  */
-    int16_t localVAD_HE_SAD[],                                  /* o  : HE-SAD flag without hangover, LR channels   */
-    int16_t vad_hover_flag[],                                   /* o  : VAD hangover flag                           */
-    float band_energies_LR[2 * NB_BANDS],                       /* o  : energy in critical bands without minimum noise floor E_MIN */
-    float *PS_out,                                              /* o  : energy spectrum                         */
-    float *Bin_E_out                                            /* o  : log-energy spectrum of the current frame*/
-);
-
-ivas_error front_vad_spar(
-    SPAR_ENC_HANDLE hSpar,                                      /* i/o: SPAR encoder structure                  */
-    const float *omni_in,                                       /* i  : omnidirectional input signal            */
-    ENCODER_CONFIG_HANDLE hEncoderConfig,                       /* i  : encoder configuration handle            */
-    const int16_t input_frame                                   /* i  : input frame length                      */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Stereo CNG prototypes
- *----------------------------------------------------------------------------------*/
-
-void stereo_enc_cng_init(
-    STEREO_CNG_ENC_HANDLE hStereoCng                            /* i/o: stereo CNG encoder structure            */
-);
-
-void stereo_cng_upd_counters(
-    STEREO_CNG_ENC_HANDLE hStereoCng,                           /* i/o: Stereo CNG data structure               */
-    const int32_t element_mode,                                 /* i  : element mode                            */
-    const int16_t nbands,                                       /* i  : Number of bands in active               */
-    const float sidSideGain[],                                  /* i  : SID side gains                          */
-    const int16_t burst_ho_count,                               /* i  : Hang-over count                         */
-    int16_t *coh_fade_counter                                   /* i  : Coherence fade counter                  */
-);
-
-void stereo_cng_init_dec(
-    STEREO_CNG_DEC_HANDLE hStereoCng,                           /* i/o: stereo CNG decoder structure                               */
-    const int16_t *frameSize                                    /* i  : pointer to frameSize of channel 0 to be used for channel 1 */
-);
-
-void stereo_cng_compute_PScorr(
-    float *output[CPE_CHANNELS],                                /* i  : Output signal                           */
-    float *c_PS_LT,                                             /* i/o: Correlation                             */
-    const int16_t L_frame_0,                                    /* i  : L_frame channel 0                       */
-    const int16_t L_frame_1                                     /* i  : L_frame channel 1                       */
-);
-
-void stereo_cng_dec_update(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                    Q0*/
-);
-
-void stereo_cna_update_params(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float *output[CPE_CHANNELS],                                /* i  : Output signal                           */
-    const int16_t output_frame,                                 /* i  : Output frame length                     */
-    const int16_t tdm_ratio_idx                                 /* i  : TDM ratio index                         */
-);
-
-void dtx_enc_init(
-    Encoder_State *st,                                          /* i  : Encoder state handle                    */
-    const int16_t var_SID_rate_flag,                            /* i  : flag for variable SID update rate       */
-    const int16_t interval_SID                                  /* i  : interval for SID update                 */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Framework general prototypes
- *----------------------------------------------------------------------------------*/
-
-void mvc2c(
-    const uint8_t x[],                                          /* i  : input vector                            */
-    uint8_t y[],                                                /* o  : output vector                           */
-    const int16_t n                                             /* i  : vector size                             */
-);
-
-/*! r: Adjusted value */
-ivas_error stereo_memory_dec(
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    CPE_DEC_HANDLE hCPE,                                        /* i  : CPE decoder structure                   */
-    const int16_t nb_bits_metadata,                             /* i  : number of metadata bits                 */
-    const int32_t output_Fs,                                    /* i  : output sampling rate                    */
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */
-    const MC_MODE mc_mode,                                      /* i  : MC mode                                 */
-    const int16_t nchan_transport                               /* i  : number of transport channels            */
-);
-
-void stereo_switching_dec(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    const Word32 ivas_total_brate                               /* i  : IVAS total bitrate                    Q0*/
-);
-
-void stereo_td2dft_update(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    const int16_t n,                                            /* i  : channel number                          */
-    float output[],                                             /* i/o: synthesis @internal Fs                  */
-    float synth[],                                              /* i/o: synthesis @output Fs                    */
-    float hb_synth[],                                           /* i/o: hb synthesis                            */
-    const int16_t output_frame                                  /* i  : frame length                            */
-);
-
-void stereo_mdct2dft_update(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float output0[],                                            /* i/o: synthesis @internal Fs, ch0             */
-    float synth0[]                                              /* i/o: synthesis @output Fs, ch0               */
-);
-
-
-/*! r: number of bits written */
-
-
-
-/*----------------------------------------------------------------------------------*
- * MCT prototypes
- *----------------------------------------------------------------------------------*/
-void ivas_mdct_core_whitening_enc_fx(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */
-    Word16 new_samples_fx[CPE_CHANNELS][L_INP],                     /* i  : new samples                             */
-    Word16 old_wsp_fx[CPE_CHANNELS][L_WSP],                         /* i  : 12.8kHz weighted speech (for LTP        */
-    Word16 pitch_buf[CPE_CHANNELS][NB_SUBFR16k],                 /* o  : floating pitch for each subframe        */
-    Word32 *mdst_spectrum_long[CPE_CHANNELS],                    /* o  : buffer for MDST spectrum                */
-    int16_t tnsBits[CPE_CHANNELS][NB_DIV],                      /* o  : buffer TNS bits                         */
-    Word32 *orig_spectrum_long[CPE_CHANNELS],                    /* o  : origingal spectrum w/o whitening        */
-    int16_t tnsSize[CPE_CHANNELS][NB_DIV],                      /* o  : size of TNS                             */
-    int16_t p_param[CPE_CHANNELS][NB_DIV],                      /* o  : pointer to parameter array              */
-    BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */
-    const int16_t mct_on,                                       /* i  : flag mct block (1) or stereo (0)        */
-    const int16_t nChannels,                                     /* i  : total number of coded channels          */
-Word16 mdst_spectrum_e[CPE_CHANNELS][NB_DIV],
-Word16 orig_spectrum_e[CPE_CHANNELS][NB_DIV]
-);
-void ivas_mct_core_enc(
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */
-    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */
-    CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS],                        /* i/o: CPE encoder structures                  */
-    const int16_t nChannels,                                    /* i  : number of channels to be coded          */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int16_t switch_bw,                                    /* i  : flag bandwidth switch occurance         */
-    const int16_t lfe_bits,                                     /* i  : bits spent for LFE                      */
-    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */
-);
-
-void ivas_mdct_quant_coder(
-    CPE_ENC_HANDLE hCPE,                                        /* i/o: Encoder CPE handle                      */
-    int16_t tnsBits[CPE_CHANNELS][NB_DIV],                      /* i  : bits needed for TNS parameters          */
-    int16_t tnsSize[CPE_CHANNELS][NB_DIV],                      /* i  : size of TNS                             */
-    int16_t p_param[CPE_CHANNELS][NB_DIV],                      /* i  : pointer to parameter array              */
-    const int16_t MCT_flag                                      /* i  : hMCT handle allocated (1) or not (0)    */
-);
-
-void apply_MCT_enc(
-    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */
-    Encoder_State **sts,                                        /* i/o: encoder state structure                 */
-    float *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV],             /* i/o: MDST spectrum                           */
-    float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],              /* i/o: inverse spectrum                        */
-    float *inv_mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV],         /* i/o: inverse MDST spectrum                   */
-    const int16_t nchan                                         /* i  : number of channels                      */
-);
-
-void write_mct_bitstream(
-    Encoder_State **sts,                                        /* i/o: encoder state structure                 */
-    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */
-    const int16_t nchan                                         /* i  : number of channels                      */
-);
-
-void splitAvailableBitsMCT_fx(
-    void **sts,                                                 /* i/o: encoder/decoder state structure         */
-    const Word16 total_bits,                                    /* i  : total number of available bits          */
-    const Word16 split_ratio[MCT_MAX_CHANNELS],                 /* i  : ratio for splitting the bits         Q0 */
-    const Word16 enc_dec,                                       /* i  : encoder or decoder flag                 */
-    const Word16 nchan                                          /* i  : number of channels                      */
-);
-
-void getChannelEnergies(
-    Encoder_State **sts,                                        /* i  : Encoder state structure                 */
-    float nrg[MCT_MAX_CHANNELS],                                /* o  : energies                                */
-    const int16_t nchan                                         /* i  : number of channels                      */
-);
-
-void mctStereoIGF_enc(
-    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */
-    Encoder_State **sts,                                        /* i/o: encoder state structure                 */
-    float *orig_spectrum[MCT_MAX_CHANNELS][NB_DIV],             /* i  : MDCT spectrum for ITF                   */
-    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k],              /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */
-    float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],            /* i  : same as above but for inverse spect.    */
-    float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],              /* i  : inverse spectrum                        */
-    const int16_t sp_aud_decision0[MCT_MAX_CHANNELS]            /* i  : speech audio decision                   */
-);
-
-void ivas_mdct_dec_side_bits_frame_channel(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW],              /* o  : lpc_parameters                          */
-    int16_t p_param[CPE_CHANNELS][NB_DIV],                      /* o  : pointer to param buffer                 */
-    Decoder_State *st0,                                         /* i  : pointer to bitstream handle             */
-    int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV],                /* o  : number of bits for TNS                  */
-    int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV],         /* i/o: parameters buffer                       */
-    const int16_t MCT_flag,                                     /* i  : hMCT handle allocated (1) or not (0)    */
-    const int16_t odd_channel_cpe                               /* i  : flag cpe with odd nb of tc channels     */
-);
-
-void ivas_mct_side_bits(
-    MCT_DEC_HANDLE hMCT,                                        /* i/o: MCT decoder structure                   */
-    CPE_DEC_HANDLE hCPE[MCT_MAX_BLOCKS],                        /* i/o: CPE decoder structure                   */
-    const int16_t nCPE,                                         /* i  : number of CPEs                          */
-    Decoder_State *st0,                                         /* i  : decoder handle for Bstr                 */
-    const int16_t bfi,                                          /* i  : BFI flag                                */
-    uint16_t *bitstream,                                        /* o  : bitstream indices                       */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */
-);
-
-void ivas_mdct_core_invQ(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE handle                              */
-    int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV],                /* i  : number of TNS bits                      */
-    int16_t p_param[CPE_CHANNELS][NB_DIV],                      /* i  : pointer to param buffer                 */
-    int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW],              /* i  : lpc parameters                          */
-    int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV],         /* i  : param buffer                            */
-    int16_t fUseTns[CPE_CHANNELS][NB_DIV],                      /* i  : flag TNS enabled                        */
-    STnsData tnsData[CPE_CHANNELS][NB_DIV],                     /* i  : TNS parameter                           */
-    float *x_0[CPE_CHANNELS][NB_DIV],                           /* i/o: signal buffer                           */
-    float *x[CPE_CHANNELS][NB_DIV],                             /* i/o: signal buffer                           */
-    float Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )],    /* i  : LP coefficients                         */
-    int16_t ms_mask[NB_DIV][MAX_SFB],                           /* i  : M/S mask                                */
-    const int16_t MCT_flag                                      /* i  : hMCT handle allocated (1) or not (0)    */
-);
-
-void ivas_mdct_core_reconstruct(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    float *x[][NB_DIV],                                         /* i/o: pointers to synthesis @internal_FS      */
-    float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS],             /* o  : synthesis @output_FS                    */
-    int16_t fUseTns[CPE_CHANNELS][NB_DIV],                      /* i  : flage TNS enabled                       */
-    const int16_t MCT_flag                                      /* i  : hMCT handle allocated (1) or not (0)    */
-);
-
-void ivas_mdct_core_tns_ns(
-    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
-    int16_t fUseTns[CPE_CHANNELS][NB_DIV],                      /* i  : two entries for each channel in TCX10   */
-    STnsData tnsData[CPE_CHANNELS][NB_DIV],                     /* o  : TNS parameter                           */
-    float *x[CPE_CHANNELS][NB_DIV],                             /* o  : synthesis @internal_FS                  */
-    float Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )],    /* o  : LP coefficients                         */
-    const int16_t MCT_flag                                      /* i  : hMCT handle allocated (1) or not (0)    */
-);
-
-
-void ivas_mct_dec_mct(
-    MCT_DEC_HANDLE hMCT,                                        /* i/o: MCT decoder structure                   */
-    Decoder_State **sts,                                        /* i/o: decoder state structure                 */
-    const int16_t nchan                                         /* i  : number of channels                      */
-);
-
-void apply_MCT_dec(
-    MCT_DEC_HANDLE hMCT,                                        /* i/o: MCT decoder structure                   */
-    Decoder_State **sts,                                        /* i/o: decoder state structure                 */
-    float *x[MCT_MAX_CHANNELS][NB_DIV]                          /* i/o: decoded and dequan. spect. input to MCT */
-);
-
-void mctStereoIGF_dec(
-    MCT_DEC_HANDLE hMCT,                                        /* i/o: MCT decoder structure                   */
-    Decoder_State **sts,                                        /* i/o: decoder state structure                 */
-    float *x[MCT_MAX_CHANNELS][NB_DIV],                         /* i/o: decoded and dequantized spectrum        */
-    const int16_t bfi                                           /* i  : bad frame flag                          */
-);
-
-void enc_prm_igf_mdct(
-    Encoder_State *st,                                          /* i  : Encoder state handle                    */
-    BSTR_ENC_HANDLE hBstr                                       /* i/o: Bitstream handle                        */
-);
-
-void mdct_read_IGF_bits(
-    Decoder_State *st,                                          /* i/o: Encoder state handle                    */
-    Decoder_State *st0                                          /* i  : pointer to handle where bstr is read    */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Q Metadata prototypes for DirAC and MASA
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_qmetadata_enc_encode(
-    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: metadata bitstream handle               */
-    IVAS_QMETADATA *hQMetaData,                                 /* i/o: q_metadata handle                       */
-    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode          */
-);
-
-ivas_error ivas_qmetadata_enc_encode_hr_384_512(
-    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: metadata bitstream handle               */
-    IVAS_QMETADATA *hQMetaData,                                 /* i/o: metadata handle                         */
-    const int16_t bits_sph_idx,
-    const int16_t bits_sp_coh
-);
-
-void deindex_sph_idx(
-    const uint16_t sphIndex,                                    /* i  : Spherical index                         */
-    const SPHERICAL_GRID_DATA *gridData,                        /* i  : Prepared spherical grid                 */
-    float *theta,                                               /* o  : Elevation                               */
-    float *phi                                                  /* o  : Azimuth                                 */
-);
-
-/*! r: output index for direction */
-uint16_t index_theta_phi_16(
-    float * p_theta,                                            /* i/o: input elevation to be indexed           */
-    float * p_phi,                                              /* i/o: input azimuth to be indexed             */
-    const SPHERICAL_GRID_DATA *gridData                         /* i  : generated grid data                     */
-);
-
-void reset_metadata_spatial(
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */
-    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: Metadata bitstream handle               */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    int32_t *total_brate,                                       /* o  : total bitrate                           */
-    const int32_t core_brate,                                   /* i  : core bitrate                            */
-    const int16_t nb_bits_metadata                              /* i  : number of meatdata bits                 */
-);
-
-/*! r: number of bits written */
-
-/*! r: number of bits read */
-int16_t ivas_qmetadata_dec_decode(
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                       */
-    uint16_t *bitstream,                                        /* i  : bitstream                               */
-    int16_t *index,                                             /* i/o: bitstream position                      */
-    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode          */
-);
-
-/*! r: number of bits read */
-int16_t ivas_qmetadata_dec_decode_hr_384_512(
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: hQMetaData handle                       */
-    uint16_t *bitstream,                                        /* i  : bitstream                               */
-    int16_t *index,                                             /* i/o: bitstream position                      */
-    const SPHERICAL_GRID_DATA *sph_grid16,                      /* i  : spherical grid for deindexing           */
-    const int16_t bits_sph_idx,
-    const int16_t bits_sp_coh,
-    const uint8_t ncoding_bands_config
-);
-
-/*! r: number of bits read */
-int16_t ivas_qmetadata_dec_sid_decode(
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                       */
-    uint16_t *bitstream,                                        /* i  : bitstream                               */
-    int16_t *index,                                             /* i/o: bitstream position                      */
-    const int16_t nchan_transport,                              /* i  : number of transport channels            */
-    int16_t *element_mode,                                      /* o  : element mode                            */
-    const int16_t ivas_format                                   /* i  : IVAS format                             */
-);
-
-
-
-
-void restore_metadata_buffer(
-    BSTR_ENC_HANDLE hMetaData,
-    const int16_t next_ind_start,
-    const int16_t bit_pos_start
-);
-
-/*! r: codeword index */
-int16_t masa_sq(
-    const float in,                                             /* i  : input value                             */
-    const float *threshold,                                     /* i  : partition                               */
-    const int16_t cb_sz                                         /* i  : codebook size                           */
-);
-
-void ivas_qmetadata_azimuth_elevation_to_direction_vector(
-    const float az,                                             /* i  : azimuth                                 */
-    const float el,                                             /* i  : elevation                               */
-    float *dv                                                   /* o  : direction vector                        */
-);
-
-ivas_error only_reduce_bits_direction(
-    int16_t *reduce_bits_out,
-    IVAS_QDIRECTION *q_direction,                               /* i/o: quantized direction structure           */
-    int16_t reduce_bits,
-    const int16_t coding_subbands,
-    const int16_t no_subframes,
-    int16_t *ind_order
-);
-
-void quantize_direction_frame(
-    IVAS_QDIRECTION *q_direction,                               /* i/o: quantized direction structure           */
-    float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES],
-    float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES],
-    const int16_t hrmasa_flag                                   /* i  : flag indicating high-rate MASA MD coding*/
-);
-
-/*! r: quantized spherical index */
-uint16_t quantize_direction(
-    const float theta,                                          /* i  : input elevation value                   */
-    float phi,                                                  /* i  : input azimuth value                     */
-    const int16_t no_bits,                                      /* i  : number of bits                          */
-    float *theta_q,                                             /* o  : quantized elevation                     */
-    float *phi_q,                                               /* o  : quantized azimuth                       */
-    uint16_t *index_theta,                                      /* o  : quantized elevation index               */
-    uint16_t *index_phi,                                        /* o  : quantized azimuth index                 */
-    const MC_LS_SETUP mc_format                                 /* i  : channel format if in MC-mode            */
-);
-
-int16_t quantize_direction2D(
-    float phi,                                                  /* i  : input azimuth value                     */
-    const int16_t no_cw,                                        /* i  : number of bits                          */
-    float *phi_q,                                               /* o  : quantized azimuth value                 */
-    uint16_t *index_phi,                                        /* o  : quantized azimuth index                 */
-    const MC_LS_SETUP mc_format                                 /* i  : channel format if in MC-mode            */
-);
-
-void quantize_direction_frame2D(
-    IVAS_QDIRECTION *q_direction,                               /* i/o: quantized direction structure           */
-    float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES],   /* i  : input azimuth values                    */
-    float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES]  /* i  : input elevation values                  */
-);
-
-void small_requantize_direction_frame(
-    IVAS_QDIRECTION *q_direction,                               /* i/o: quantized direction structure           */
-    float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES],   /* i  : input azimuth values                    */
-    float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], /* i  : input elevation values                  */
-    const int16_t raw_flag[MASA_MAXIMUM_CODING_SUBBANDS],       /* i  : raw/EC encoding mode for each subband   */
-    int16_t bits_dir_bands[MASA_MAXIMUM_CODING_SUBBANDS],       /* i/o: number of bits per subband              */
-    int16_t *diff                                               /* i/o: number of bits to be reduced            */
-);
-
-/*! r: index azimuth */
-int16_t quantize_phi(
-    float phi,                                                  /* i  : azimuth value                                                 */
-    const int16_t flag_delta,                                   /* i  : flag indicating if the azimuth codebook is translated or not  */
-    float *phi_hat,                                             /* o  : quantized azimuth                                             */
-    const int16_t n                                             /* i  : azimuth codebook size                                         */
-);
-
-/*! r: decoded elevation value */
-float deindex_elevation(
-    uint16_t *id_th,                                            /* i  : input index                             */
-    const int16_t no_bits,                                      /* i  : number of bits for the spherical grid   */
-    const MC_LS_SETUP mc_format                                 /* i  : channel format if in MC-mode            */
-);
-
-float deindex_azimuth(
-    int16_t id_phi,                                             /* i  : index                                   */
-    const int16_t no_bits,                                      /* i  : number of bits for the spherical grid   */
-    const int16_t id_th,                                        /* i  : elevation index                         */
-    const int16_t remap,                                        /* i  : remapping flag                          */
-    const MC_LS_SETUP mc_format                                 /* i  : channel format if in MC-mode            */
-);
-
-UWord16 ivas_qmetadata_reorder_generic_fx(
-    const Word16 signed_value 
-);
-
-void ivas_sba_config(
-    const int32_t sba_total_brate,                              /* i  : SBA total bitrate                       */
-    int16_t sba_order,                                          /* i  : Ambisonic (SBA) order                   */
-    int16_t nb_channels,                                        /* i  : Number of Ambisonic (SBA) channels      */
-    int16_t *nchan_transport,                                   /* o  : number of transport channels            */
-    const int16_t sba_planar,                                   /* i  : SBA planar flag                         */
-    int16_t *nSCE,                                              /* o  : number of SCEs                          */
-    int16_t *nCPE,                                              /* o  : number of CPEs                          */
-    int16_t *element_mode                                       /* o  : element mode of the core coder          */
-);
-
-void ivas_sba_set_cna_cng_flag(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-ivas_error ivas_sba_dec_reconfigure(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    uint16_t *nSamplesFlushed,                                  /* o  : number of samples flushed               */
-    int16_t *data                                               /* o  : output synthesis signal                 */
-);
-
-ivas_error ivas_sba_digest_tc(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const int16_t nchan_transport,                              /* i  : number of transport channels            */
-    const int16_t nCldfbSlots,                                  /* i  : number of CLDFB slots                   */
-    const int16_t nSamplesForRendering,                         /* i  : number of samples provided              */
-    float *data[]                                               /* i  : transport channel samples               */
-);
-
-
-
-/*! r: Ambisonic (SBA) order */
-int16_t ivas_sba_get_order(
-    const int16_t nb_channels,                                  /* i  : Number of ambisonic channels            */
-    const int16_t sba_planar                                    /* i  : SBA planar flag                         */
-);
-
-/*! r: number of Ambisonic channels */
-int16_t ivas_sba_get_nchan(
-    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */
-    const int16_t sba_planar                                    /* i  : SBA planar flag                         */
-);
-
-/*! r: number of ambisonics metadata channels */
-
-void ivas_sba_getTCs(
-    float *sba_data[],                                          /* i  : SBA signals                             */
-    Encoder_Struct *st_ivas,                                    /* i/o: Encoder struct                          */
-    const int16_t input_frame                                   /* i  : frame length                            */
-);
-
-int16_t ivas_sba_remapTCs(
-    float *sba_data[],                                          /* i/o: SBA signals                             */
-    Decoder_Struct *st_ivas,                                    /* i/o: decoder struct                          */
-    const int16_t output_frame                                  /* i  : frame length                            */
-);
-
-void ivas_sba_dirac_stereo_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    float *output[CPE_CHANNELS],                                /* o  : output synthesis signal                 */
-    const int16_t output_frame,                                 /* i  : output frame length per channel         */
-    const int16_t mcmasa                                        /* i  : McMASA flag                             */
-);
-
-void ivas_sba_dirac_stereo_config(
-    STEREO_DFT_CONFIG_DATA_HANDLE hConfig                       /* o  : DFT stereo configuration                */
-);
-
-
-Word16 ivas_get_sba_dirac_stereo_flag(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-void ivas_sba_dirac_stereo_smooth_parameters(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft,                      /* i/o: encoder DFT stereo handle               */
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD handle for upmixing             */
-    const int16_t cross_fade_start_offset,                      /* i  : SPAR mixer delay compensation           */
-    const int32_t output_Fs,                                    /* i  : Fs for delay calculation                */
-    const int16_t num_md_sub_frames                             /* i  : number of subframes in mixing matrix    */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * DirAC prototypes
- *----------------------------------------------------------------------------------*/
-
-
-ivas_error ivas_dirac_enc_reconfigure(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                     */
-);
-
-
-
-ivas_error ivas_dirac_config(
-    void *st_ivas,                                              /* i/o: IVAS encoder/decoder state structure    */
-    const int16_t enc_dec                                       /* i  : encoder or decoder flag                 */
-);
-
-void ivas_dirac_config_bands(
-    int16_t *band_grouping,                                     /* o  : band grouping                           */
-    const int16_t nbands,                                       /* i  : number of bands                         */ 
-    const int16_t max_band,                                     /* i  : maximal band index +1                   */
-    int16_t *dirac_to_spar_md_bands,                            /* o  : mapping of DirAC parameter band index to SPAR FB band index */
-    const int8_t useLowerBandRes,                               /* i  : flag indicating lower band resolution for DirAC             */
-    const int16_t enc_param_start_band,                         /* i  : band index of first DirAC parameter band                    */
-    IVAS_FB_MIXER_HANDLE hFbMdft
-);
-
-void ivas_get_dirac_sba_max_md_bits(
-    const int32_t sba_total_brate,
-    int16_t *bits_frame_nominal,
-    int16_t *metadata_max_bits,
-    int16_t *qmetadata_max_bit_req,
-    const int16_t nbands
-	,
-	IVAS_FORMAT ivas_format
-);
-
-ivas_error ivas_dirac_sba_config(
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                                    */
-    int16_t *element_mode,                                      /* o  : element mode of the core coder                       */
-    int32_t sba_total_brate,                                    /* i  : SBA total bitrate                                    */
-    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                                */
-    const int16_t nbands                                        /* i  : number of frequency bands                            */
-	,
-	IVAS_FORMAT ivas_format
-);
-
-ivas_error ivas_dirac_dec_config(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                       */
-    const DIRAC_CONFIG_FLAG flag_configopen                     /* i/ : Flag determining if we open or reconfigure the DirAC decoder */
-);
-
-void ivas_dirac_dec_close(
-    DIRAC_DEC_HANDLE *hDirAC_out
-);
-
-void ivas_dirac_dec_read_BS(
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    Decoder_State *st,                                          /* i/o: decoder Core state structure            */
-    DIRAC_DEC_HANDLE hDirAC,                                    /* i/o: decoder DirAC handle                    */
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial rendering data handle    */
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q metadata                              */
-    int16_t *nb_bits,                                           /* o  : number of bits read                     */
-    const int16_t last_bit_pos,                                 /* i  : last read bitstream position            */
-    const int16_t hodirac_flag,                                 /* i  : flag to indicate HO-DirAC mode          */
-    int16_t *dirac_to_spar_md_bands                             /* o  : DirAC->SPAR MD bands                    */
-);
-
-void generate_masking_noise_lb_dirac(
-    HANDLE_FD_CNG_COM hFdCngCom,                                /* i/o: FD_CNG structure containing all buffers and variables */
-    float *tdBuffer,                                            /* i/o: time-domain signal, if NULL no LB-CNA                 */
-    const int16_t nCldfbTs,                                     /* i  : number of CLDFB slots that will be rendered           */
-    const int16_t cna_flag                                      /* i  : CNA flag for LB and HB                                */
-);
-
-
-void ivas_dirac_dec_render(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const int16_t nchan_transport,                              /* i  : number of transport channels            */
-    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested         */
-    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered          */
-    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render   */
-    float *output_f[]                                           /* o  : rendered time signal                    */
-);
-
-void ivas_dirac_dec_render_sf(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    float *output_f[],                                          /* i/o: synthesized core-coder transport channels/DirAC output  */
-    const int16_t nchan_transport,                              /* i  : number of transport channels            */
-    float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX],
-    float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]
-);
-
-
-void computeDirectionVectors(
-    float *intensity_real_x,
-    float *intensity_real_y,
-    float *intensity_real_z,
-    const int16_t enc_param_start_band,
-    const int16_t num_frequency_bands,
-    float *direction_vector_x,
-    float *direction_vector_y,
-    float *direction_vector_z 
-);
-
-void computeDiffuseness(
-    float *buffer_intensity[DIRAC_NUM_DIMS][DIRAC_NO_COL_AVG_DIFF],
-    const float *buffer_energy,
-    const int16_t num_freq_bands,
-    float *diffuseness 
-);
-
-void ivas_dirac_dec_get_response(
-    const int16_t azimuth,
-    const int16_t elevation,
-    float *response,
-    const int16_t ambisonics_order
-);
-
-
-
-ivas_error ivas_mc_paramupmix_enc_open_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                             */
-);
-
-void ivas_mc_paramupmix_enc_close_fx(
-    MC_PARAMUPMIX_ENC_HANDLE *hMCParamUpmix,                    /* i/o: MC Param-Upmix encoder handle                   */
-    const int32_t input_Fs                                      /* i  : input sampling rate                             */
-);
-
-ivas_error ivas_mc_paramupmix_dec_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */
-);
-
-void ivas_mc_paramupmix_dec_close(
-    MC_PARAMUPMIX_DEC_HANDLE *hMCParamUpmix_out                 /* i/o: Parametric MC decoder handle                    */
-);
-
-void ivas_mc_paramupmix_dec_read_BS(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */
-    Decoder_State *st,                                          /* i/o: decoder state structure                         */
-    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix,                     /* i/o: decoder MC Param-Upmix handle                   */
-    int16_t *nb_bits                                            /* o  : number of bits written                          */
-);
-
-void ivas_mc_paramupmix_dec_digest_tc(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */
-    const uint8_t nCldfbSlots,                                  /* i  : number of CLFBS slots in the transport channels */
-    const int16_t nSamplesForRendering                          /* i  : number of samples provided                      */
-);
-
-void ivas_param_mc_set_coded_bands_fx(
-    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC                  /* i/o: handle for the Parametric MC parameter coding state */
-);
-
-/*! r: number of IVAS transport channels */
-
-ivas_error ivas_param_mc_enc_open(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                                 */
-);
-
-ivas_error ivas_param_mc_enc_reconfig(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                                 */
-);
-
-void ivas_param_mc_enc_close(
-    PARAM_MC_ENC_HANDLE *hParamMC,                              /* i/o: Parametric MC encoder handle                        */
-    const int32_t input_Fs                                      /* i  : input sampling rate                                 */
-);
-
-void ivas_param_mc_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS Encoder handle                                 */
-    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: IVAS Metadata bitstream handle                      */
-    float *data_f[],                                            /* i/o: input/transport MC data                             */
-    const int16_t input_frame                                   /* i  : input frame length                                  */
-);
-
-ivas_error ivas_param_mc_dec_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                              */
-);
-
-ivas_error ivas_param_mc_dec_reconfig(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                              */
-);
-
-
-
-void ivas_param_mc_dec_digest_tc(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                 */
-    const uint8_t nCldfbSlots,                                  /* i  : number of CLFBS slots in the transport channels     */
-    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output*/
-);
-
-void ivas_param_mc_dec_render(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                 */
-    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested                     */
-    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered                      */
-    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render               */
-    float *output_f[]                                           /* o  : rendered time signal                                */
-);
-
-void ivas_param_mc_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                     */
-    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */
-);
-
-/*! r: number of cldfb synthesis instances */
-int16_t param_mc_get_num_cldfb_syntheses( 
-    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder structure                              */
-);
-
-UWord16 ivas_param_mc_get_configuration_index_fx(
-    const MC_LS_SETUP mc_ls_setup, /* i  : MC ls setup              */
-    const Word32 ivas_total_brate  /* i  : IVAS total bitrate       */
-);
-
-ivas_error ivas_dirac_dec_output_synthesis_cov_open(
-    DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params,   /* i/o: handle for the covariance synthesis parameters                                                        */
-    DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: handle for the covariance synthesis state                                                             */
-    const int16_t max_band_decorr,                                    /* i  : uppermost frequency band where decorrelation is applied                                               */
-    const int16_t interp_length,                                      /* i  : length for interpolating the mixing matrices in time slots                                            */
-    const int16_t num_param_bands,                                    /* i  : number of parameter bands                                                                             */
-    const int16_t num_param_bands_residual,                           /* i  : number of parameter bands with a residual mixing matrix (i.e. decorrelation                           */
-    const int16_t nchan_in,                                           /* i  : number of input (transport) channels                                                                  */
-    const int16_t nchan_out,                                          /* i  : number of output channels                                                                             */
-    const float *proto_matrix                                         /* i  : the prototype (upmix) matrix (only used if mode == 1)                                                 */
-);
-
-void ivas_dirac_dec_output_synthesis_get_interpolator(
-    DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters                  */
-    const uint16_t interp_length                                    /* i  : interpolator length                                             */
-);
-
-void ivas_dirac_dec_output_synthesis_cov_init(
-    DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: pointer to the state of the covariance synthesis                                                      */
-    const int16_t nchan_in,                                           /* i  : number of input (tranport) channels                                                                   */
-    const int16_t nchan_out,                                          /* i  : number of output channels                                                                             */
-    const int16_t n_param_bands,                                      /* i  : number of total parameter bands                                                                       */
-    const int16_t n_param_bands_res                                   /* i  : number of parameter bands with a residual mixing matrix (i.e. decorrelation                           */
-);
-
-void ivas_dirac_dec_output_synthesis_cov_close(
-    DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params,  /* i  : handle for the covariance synthesis parameters                                                         */
-    DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state /* i/o: handle for the covariance synthesis state                                                              */
-);
-
-
-void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot(
-    float *Cldfb_RealBuffer_in,                                     /* i  : input channel filter bank samples (real part)                    */
-    float *Cldfb_ImagBuffer_in,                                     /* i  : input channel filter bank samples (imaginary part)               */
-    float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o  : output channel filter bank samples (real part)                   */
-    float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o  : output channel filter bank samples (imaginary part)              */
-    float *mixing_matrix[],                                         /* i  : parameter band wise mixing matrices (direct part)                */
-    float *mixing_matrix_res[],                                     /* i  : parameter band wise mixing matrices (residual part)              */
-    const uint16_t slot_idx_sfr,                                    /* i  : time slot index for the current slot within the current subframe */
-    const uint16_t slot_idx_tot,                                    /* i  : time slot index for the current slot within the frame            */
-    const int16_t nX,                                               /* i  : number of input channels                                         */
-    const int16_t nY,                                               /* i  : number of output channels                                        */
-    PARAM_MC_DEC_HANDLE hParamMC                                    /* i  : handle to the Parametric MC decoder state                        */
-);
-
-
-void FdCngEncodeDiracMDCTStereoSID(
-    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder state structure             */
-);
-
-void FdCngDecodeDiracMDCTStereoSID(
-    CPE_DEC_HANDLE hCPE                                         /* i/o: CPE decoder state structure             */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * SPAR prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_spar_enc_open(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder handle                     */
-    const int16_t spar_reconfig_flag                            /* i  : SPAR reconfiguration flag               */
-);
-
-ivas_error ivas_spar_enc(
-    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */
-    float *data_f[],                                            /* i/o: input/transport audio channels          */
-    const int16_t input_frame,                                  /* i  : input frame length                      */
-    int16_t *nb_bits_metadata,                                  /* i  : number of MD bits written               */
-    BSTR_ENC_HANDLE hMetaData                                   /* o  : MetaData handle                         */    
-);
-
-ivas_error ivas_spar_dec_open(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const int16_t spar_reconfig_flag                            /* i  : SPAR reconfiguration flag               */
-);
-
-
-ivas_error ivas_spar_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder struct                     */
-    int16_t *nb_bits_read                                       /* o  : number of MD bits read                  */
-);
-
-void ivas_spar_config(
-	int32_t ivas_total_brate,                                   /* i  : codec total bitrate                     */
-	const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */
-	int16_t *nchan_transport,                                   /* o  : number of transport channels            */
-	int16_t *nSCE,                                              /* o  : number of SCEs                          */
-	int16_t *nCPE,                                              /* o  : number of CPEs                          */
-	int32_t *core_nominal_brate,                                /* o  : core-coding nominal bitrate             */
-	const int16_t sid_format                                    /* i  : IVAS format indicator from SID frame    */
-);
-
-ivas_error ivas_sba_linear_renderer(
-    float *output_f[],                                          /* i/o: synthesized core-coder transport channels/DirAC output  */
-    const int16_t output_frame,                                 /* i  : output frame length per channel                         */
-    const int16_t nchan_in,                                     /* i  : number of input ambisonics channels                     */
-	const int16_t nchan_ism,                                    /* i  : number of objects                                       */
-    const AUDIO_CONFIG output_config,                           /* i  : output audio configuration                              */
-    const IVAS_OUTPUT_SETUP output_setup                        /* i  : output format setup                                     */
-);
-
-void ivas_sba_mix_matrix_determiner(
-    SPAR_DEC_HANDLE hSpar,                                      /* i/o: SPAR decoder handle                     */
-    float *output[],                                            /* i/o: transport/output audio channels         */
-    const int16_t bfi,                                          /* i  : BFI flag                                */
-    const int16_t nchan_remapped,                               /* i  : num channels after remapping of TCs     */
-    const int16_t output_frame,                                 /* i  : output frame length                     */
-    const int16_t num_md_sub_frames                             /* i  : number of subframes in mixing matrix    */
-);
-
-/* AGC */
-/*! r: AGC enable flag */
-
-ivas_error ivas_spar_agc_enc_open( 
-    ivas_agc_enc_state_t **hAgcEnc,                             /* i/o: AGC decoder handle                      */
-    const int32_t input_Fs,                                     /* i  : input sampling rate                     */
-    const int16_t nchan_inp                                     /* i  : number of input channels                */
-);
-
-void ivas_spar_agc_enc_close( 
-    ivas_agc_enc_state_t **hAgcEnc                              /* i/o: AGC encoder handle                      */
-);
-
-void ivas_agc_enc_process( 
-    ivas_agc_enc_state_t *hAgcEnc,                              /* i/o: AGC encoder handle                      */
-    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: MetaData handle                         */
-    float **ppPcm_in,                                           /* i  : input audio channels                    */
-    float **ppPcm_out,                                          /* o  : output audio channels                   */
-    const int16_t n_channels,                                   /* i  : number of channels                      */
-    const ENCODER_CONFIG_HANDLE hEncoderConfig                  /* i  : configuration structure                 */
-);
-
-ivas_error ivas_spar_agc_dec_open( 
-    ivas_agc_dec_state_t **hAgcDec,                             /* i/o: AGC decoder handle                      */
-    const int32_t output_Fs                                     /* i  : output sampling rate                    */
-);
-
-void ivas_spar_agc_dec_close( 
-    ivas_agc_dec_state_t **hAgcDec                              /* i/o: AGC decoder handle                      */
-);
-
-
-void ivas_agc_dec_process( 
-    ivas_agc_dec_state_t *hAgcDec,                              /* i/o: AGC decoder handle                      */
-    float *pcm_in[],                                            /* i  : input audio channels                    */
-    float *pcm_out[],                                           /* o  : output audio channels                   */
-    const int16_t n_channels,                                   /* i  : number of channels                      */
-    const int16_t output_Fs                                     /* i  : output sampling rate                    */
-);
-
-void ivas_agc_read_bits( 
-    ivas_agc_dec_state_t *hAgcDec,                              /* i/o: AGC decoder handle                      */
-    Decoder_State *st0,                                         /* i/o: decoder state structure - for bitstream handling*/
-    const int16_t n_channels,                                   /* i  : number of channels                      */
-    const int16_t AGC_flag                                      /* i  : AGC on/off flag                         */
-);
-
-void ivas_agc_initWindowFunc( 
-    float *pWinFunc, 
-    const int16_t length 
-);
-
-void ivas_agc_calcGainParams( 
-    uint16_t *absEmin, 
-    uint16_t *betaE, 
-    uint16_t *maxAttExp, 
-    const int16_t numCoeffs 
-);
-
-float ivas_get_mdct_scaling_gain(
-    const int16_t dct_len_by_2 
-);
-
-void ivas_get_twid_factors( 
-    const int16_t length, 
-    const float **pTwid_re, 
-    const float **pTwid_im 
-);
-
-int16_t ivas_get_bw_idx_from_sample_rate( 
-    const int32_t sampling_rate                                 /* i  : sampling rate                           */
-);
-
-/*! r: config. table index */
-int16_t ivas_get_spar_table_idx( 
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int16_t sba_order,                                    /* i  : IVAS SBA order                          */
-    const int16_t bwidth,                                       /* i  : audio bandwidth                         */
-    int16_t *bitlen,                                            /* o  : number of bits                          */
-    int16_t *ind                                                /* o  : indice                                  */
-);
-
-/*! r: number of transport channels */
-int16_t ivas_get_sba_num_TCs( 
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int16_t sba_order                                     /* i  : IVAS SBA order                          */
-);
-
-
-void ivas_spar_bitrate_dist(
-    int32_t core_brates_act[],                                  /* o  : bitrates per core-coder                 */
-    const int16_t nAvailBits,                                   /* i  : number of available bits                */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */
-    const int16_t bwidth                                        /* i  : audio bandwidth                         */
-);
-
-void ivas_mdct( 
-    const float *pIn, 
-    float *pOut, 
-    const int16_t length 
-);
-
-void ivas_dct_windowing( 
-    const int16_t fade_len, 
-    const int16_t full_len, 
-    const int16_t dct_len, 
-    const int16_t zero_pad_len, 
-    const float *pWindow_coeffs, 
-    const int16_t frame_len, 
-    float *pOut_buf, 
-    float *pBuffer_prev, 
-    float *pTemp_lfe 
-);
-
-void ivas_tda( 
-    const float *pIn, 
-    float *pOut, 
-    const int16_t length 
-);
-
-void ivas_imdct( 
-    const float *pIn, 
-    float *pOut, 
-    const int16_t length 
-);
-
-void ivas_itda( 
-    const float *re, 
-    float *pOut, 
-    const int16_t length 
-);
-
-void ivas_spar_get_cldfb_gains(
-    SPAR_DEC_HANDLE hSpar,
-    HANDLE_CLDFB_FILTER_BANK cldfbAnaDec0,
-    HANDLE_CLDFB_FILTER_BANK cldfbSynDec0,
-    const DECODER_CONFIG_HANDLE hDecoderConfig
-);
-
-/*! r: 1 if prediction residual channel */
-
-void ivas_spar_dec_agc_pca(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    float *output[],                                            /* i/o: input/output audio channels             */
-    const Word16 output_frame                                  /* i  : output frame length                     */
-);
-
-void ivas_spar_dec_set_render_map(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int16_t nCldfbTs                                      /* i  : number of CLDFB time slots              */
-);
-
-void ivas_spar_dec_set_render_params(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const int16_t n_cldfb_slots                                 /* i  : number of cldfb slots in this frame     */
-);
-
-void ivas_spar_dec_digest_tc(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const int16_t nchan_transport,                              /* i  : number of transport channels            */
-    const int16_t nCldfbSlots,                                  /* i  : number of CLDFB slots                   */
-    const int16_t nSamplesForRendering                          /* i  : number of samples provided              */
-);
-
-void ivas_sba_dec_digest_tc(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const int16_t nCldfbSlots,                                  /* i  : number of CLDFB slots                   */
-    const int16_t nSamplesForRendering                          /* i  : number of samples provided              */
-);
-
-ivas_error ivas_sba_dec_render(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested         */
-    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered          */
-    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render   */
-    float *output_f[]                                           /* o  : rendered time signal                    */
-);
-
-void ivas_spar_dec_upmixer_sf(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    float *output[],                                            /* o  : output audio channels                   */
-    const int16_t nchan_internal                                /* i  : number of internal channels             */
-);
-
-void ivas_spar_dec_upmixer(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    float *output[],                                            /* i/o: input/output audio channels             */
-    const int16_t nchan_internal,                               /* i  : number of internal channels             */
-    const int16_t output_frame                                  /* i  : output frame length                     */
-);
-
-/* MD module */
-
-void ivas_spar_md_enc_close(
-    ivas_spar_md_enc_state_t **hMdEnc                           /* i/o: SPAR MD encoder handle                  */
-);
-
-void ivas_compute_spar_params(
-    float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
-    float dm_fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS],
-    const int16_t i_ts,
-    float ***mixer_mat,
-    const int16_t start_band,
-    const int16_t end_band,
-    const int16_t dtx_vad,
-    const int16_t num_ch,
-    const int16_t bands_bw,
-    const int16_t active_w,
-    const int16_t active_w_vlbr,
-    ivas_spar_md_com_cfg *hSparCfg,
-    ivas_spar_md_t *hSparMd,
-    float *pWscale,
-    const int16_t from_dirac,
-    const int16_t dyn_active_w_flag
-);
-
-void ivas_create_fullr_dmx_mat(
-    float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS],
-    float dm_fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS],
-    float ***mixer_mat,
-    const int16_t in_chans,
-    const int16_t start_band,
-    const int16_t end_band,
-    const int16_t active_w,
-    ivas_spar_md_com_cfg *hMdCfg
-);
-
-void ivas_calc_c_p_coeffs(
-    ivas_spar_md_t *pSparMd,
-    float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
-    const int16_t i_ts,
-    float ***mixer_mat,
-    const int16_t num_ch,
-    const int16_t num_dmx,
-    const int16_t band_idx,
-    const int16_t dtx_vad,
-    const int16_t compute_p_flag,
-    const int16_t dyn_active_w_flag
-);
-
-void ivas_get_spar_md_from_dirac(
-    float azi_dirac[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES],
-    float ele_dirac[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES],
-    float diffuseness[IVAS_MAX_NUM_BANDS],
-    const int16_t n_ts,
-    float ***mixer_mat,
-    ivas_spar_md_t *hSpar_md,
-    ivas_spar_md_com_cfg *hSpar_md_cfg,
-    const int16_t start_band,
-    const int16_t end_band,
-    const int16_t order,
-    const int16_t dtx_vad,
-    float Wscale_d[IVAS_MAX_NUM_BANDS],
-    const uint8_t useLowerRes,
-    const int16_t active_w_vlbr,
-    const int16_t  dyn_active_w_flag
-);
-
-/*! r: number of MD subframes */
-
-ivas_error ivas_spar_md_dec_matrix_open(
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
-    const int16_t num_channels,                                 /* i  : number of internal channels             */
-    const int16_t num_md_sub_frames 
-);
-
-void ivas_spar_md_dec_matrix_close(
-    ivas_spar_md_dec_state_t *hMdDecoder,                       /* i/o: SPAR MD decoder handle                  */
-    const int16_t num_channels                                  /* i  : number of internal channels             */
-);
-
-ivas_error ivas_spar_md_dec_open(
-    ivas_spar_md_dec_state_t **hMdDec_out,                      /* i/o: SPAR MD decoder handle                  */
-    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */
-    const int16_t num_channels,                                 /* i  : number of internal channels             */
-    const int16_t sba_order,                                    /* i  : SBA order                               */
-    const int16_t sid_format,                                   /* i  : SID format                              */
-    const int32_t last_active_ivas_total_brate                  /* i  : IVAS last active bitrate                */
-);
-
-void ivas_spar_md_dec_close(
-    ivas_spar_md_dec_state_t **hMdDec                           /* i/o: SPAR MD decoder handle                  */
-);
-
-void ivas_spar_get_parameters(
-  SPAR_DEC_HANDLE hSpar,                                      /* i/o: SPAR decoder handle                     */
-  const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */
-  const int16_t ts,                                           /* i  : time slot index                         */
-  const int16_t num_ch_out,                                   /* i  : number of channels out                  */
-  const int16_t num_ch_in,                                    /* i  : number of channels in                   */
-  const int16_t num_spar_bands,                               /* i  : number of SPAR bands                    */
-  float par_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]   /* o  : mixing matrix               */
-);
-
-ivas_error ivas_spar_md_dec_init(
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
-    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */
-    const int16_t num_channels,                                 /* i  : number of internal channels             */
-    const int16_t sba_order                                     /* i  : SBA order                               */
-);
-
-void ivas_spar_md_dec_process(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    Decoder_State *st0,                                         /* i/o: decoder state structure - for bitstream handling*/
-    const int16_t num_bands_out,                                /* i  : number of output bands                  */
-    const int16_t sba_order                                     /* i  : SBA order                               */
-);
-
-void ivas_spar_to_dirac(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
-    const int16_t dtx_vad,                                      /* i  : DTX frame flag                          */
-    const int16_t num_bands_out,                                /* i  : number of output bands                  */
-    const int16_t bw,                                           /* i  : band joining factor                     */
-    const int16_t dyn_active_w_flag                             /* i  : dynamic active W flag                   */
-);
-
-void ivas_spar_update_md_hist(
-    ivas_spar_md_dec_state_t *hMdDec                            /* i/o: SPAR MD decoder handle                  */
-);
-
-int16_t ivas_spar_chk_zero_coefs(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder handle                     */
-);
-
-void ivas_spar_smooth_md_dtx(
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
-    const int16_t num_bands_out,                                /* i  : number of output bands                  */
-    const int16_t num_md_sub_frames                             /* i  : number of metadata subframes            */
-);
-
-void ivas_spar_setup_md_smoothing(
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
-    const int16_t num_bands_out,                                /* i  : number of output bands                  */
-    const int16_t num_md_sub_frames                             /* i  : number of metadata subframes            */
-);
-
-void ivas_spar_dec_gen_umx_mat(
-    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
-    const int16_t nchan_transport,                              /* i  : number of transport channels            */
-    const int16_t num_bands_out,                                /* i  : number of output bands                  */
-    const int16_t bfi,                                          /* i  : bad frame indicator                     */
-    const int16_t num_md_sub_frames
-);
-
-
-
-
-
-/* Transient detector module */
-ivas_error ivas_transient_det_open_fx(
-    ivas_trans_det_state_t **hTranDet,                          /* i/o: Transient detector handle               */
-    const Word32 sampling_rate                                 /* i  : sampling rate                           */
-);
-
-void ivas_transient_det_close_fx(
-    ivas_trans_det_state_t **hTranDet                           /* i/o: Transient detector handle               */
-);
-
-void ivas_transient_det_process( 
-    ivas_trans_det_state_t *hTranDet,                           /* i/o: SPAR TD handle                          */
-    float *pIn_pcm,                                             /* i  : input audio channels                    */
-    const int16_t frame_len,                                    /* i  : frame length in samples                 */
-    int16_t transient_det[2]                                    /* o  : transient det outputs                   */
-);
-
-void ivas_td_decorr_get_ducking_gains( 
-    ivas_trans_det_state_t *hTranDet,                           /* i/o: Transient detector handle               */
-    float *pIn_pcm, 
-    float *pIn_duck_gains, 
-    float *pOut_duck_gains, 
-    const int16_t frame_len,
-    const int16_t tdet_flag 
-);
-
-#define IVAS_CMULT_FLOAT( in1_re, in1_im, in2_re, in2_im, out1_re, out1_im ) \
-    out1_re = ( in1_re * in2_re ) - ( in1_im * in2_im ); MAC(1); MULT(1);    \
-    out1_im = ( in1_re * in2_im ) + ( in2_re * in1_im ); MAC(1); MULT(1);
-
-#define IVAS_CALCULATE_ABS( re, im, out ) \
-    out = sqrtf( ( re * re ) + ( im * im ) ); MAC(1); MULT(1); SQRT(1);
-
-#define IVAS_CALCULATE_RABS( re, out ) \
-    out = sqrtf( re * re ); MULT(1); SQRT(1);
-
-#define IVAS_CALCULATE_SQ_ABS( re, im, out ) \
-    out = (float) ( ( re * re ) + ( im * im ) ); MAC(1); MULT(1);
-
-#define IVAS_RMULT_DOUBLE( in1_re, in2_re, out1_re ) \
-    out1_re = ( in1_re * in2_re ); DMULT(1);   \
-
-#define IVAS_CALCULATE_SQ_ABS_N( re, out ) \
-    out = (float) ( re * re ); MULT(1);
-
-#define IVAS_RMULT_FLOAT( in1_re, in2_re, out1_re ) \
-    out1_re = ( in1_re * in2_re ); MULT(1);
-
-
-/* PCA */
-void ivas_pca_enc_init( 
-    PCA_ENC_STATE *hPCA                                         /* i/o: PCA encoder structure                   */
-);
-
-void ivas_pca_read_bits( 
-    Decoder_State *st0,                                         /* i/o: decoder state structure - for bitstream handling*/
-    PCA_DEC_STATE *hPCA                                         /* i/o: PCA encoder structure                   */
-);
-
-void ivas_pca_dec_init( 
-    PCA_DEC_STATE *hPCA                                         /* i/o: PCA decoder structure                   */
-);
-
-void ivas_pca_dec(
-    PCA_DEC_STATE *hPCA,                                        /* i/o: PCA decoder structure                   */
-    const int16_t n_samples,                                    /* i  : output frame length                     */
-    const int16_t n_channels,                                   /* i  : number of channels                      */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int32_t last_ivas_total_brate,                        /* i  : last IVAS total bitrate                 */
-    const int16_t bfi,                                          /* i  : bad frame indicator                     */
-    float *pcm_out[]                                            /* o  : output audio channels                   */
-);
-
-void pca_dec_s3( 
-    const int32_t index, 
-    float *q 
-);
-
-
-void ivas_huffman_encode_fx(
-    ivas_huffman_cfg_t *huff_cfg,
-    Word16 in,
-    Word16 *hcode,
-    Word16 *hlen
-);
-
-
-
-ivas_error ivas_huffman_decode(
-    ivas_huffman_cfg_t *huff_cfg,
-    Decoder_State *st0,
-    int16_t *dec_out
-);
-
-void ivas_arith_decode_cmplx_cell_array(
-    ivas_arith_t *pArith_re,
-    ivas_arith_t *pArith_re_diff,
-    Decoder_State *st0,
-    ivas_cell_dim_t *pCell_dims,
-    int16_t *pDo_diff, const int16_t nB,
-    int16_t *pSymbol_re,
-    int16_t *pSymbol_re_old
-);
-
-
-
-
-void ivas_ari_done_encoding_14bits(
-    BSTR_ENC_HANDLE hBstr, Tastat *s
-);
-
-
-void ivas_wrap_arround(
-    int16_t *pArr,
-    const int16_t min_val,
-    const int16_t max_val,
-    const int16_t length
-);
-
-void ivas_get_cum_freq_model(
-    const int16_t *pFreq_model,
-    const int16_t length,
-    int16_t *pCum_freq_model
-);
-
-int16_t ivas_map_num_pred_r_to_idx(
-    const int16_t num_quant_points_pred_r,
-    const int16_t active_w_flag
-);
-
-int16_t ivas_map_num_drct_r_to_idx(
-    const int16_t num_quant_points_drct_r
-);
-
-int16_t ivas_map_num_decd_r_to_idx(
-    const int16_t num_quant_points_decd_r
-);
-
-/* Quantization utilities */
-void ivas_quantise_real_values(
-    const float *values,
-    const int16_t q_levels,
-    const float min_value,
-    const float max_value,
-    int16_t *index,
-    float *quant,
-    const int16_t dim
-);
-
-
-void ivas_spar_quant_dtx_init( 
-    ivas_spar_md_t *spar_md, 
-    float *min_max 
-);
-
-void ivas_map_prior_coeffs_quant(
-    ivas_spar_md_prev_t *pSpar_md_prior,
-    ivas_spar_md_com_cfg *pSpar_md_cfg,
-    const int16_t qsi,
-    const int16_t nB
-);
-
-
-void ivas_clear_band_coeffs( 
-    ivas_band_coeffs_t *pband_coeffs,
-    const uint16_t num_bands
-);
-
-void ivas_clear_band_coeff_idx( 
-    ivas_band_coeffs_ind_t *pband_coeff_idx, 
-    const uint16_t num_bands 
-);
-
-
-/*----------------------------------------------------------------------------------*
- * MASA prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_masa_decode(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder struct                             */
-    Decoder_State *st,                                          /* i/o: decoder state structure                         */
-    int16_t *nb_bits_read                                       /* o  : number of bits read                             */
-);
-
-void generate_gridEq(
-    SPHERICAL_GRID_DATA *data                                   /* o  : data structure for grid                         */
-);
-
-ivas_error ivas_masa_enc_open_fx(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                             */
-);
-
-void ivas_masa_enc_close_fx(
-    MASA_ENCODER_HANDLE *hMasa                                  /* i/o: MASA metadata structure                         */
-);
-
-void ivas_masa_enc_reconfigure(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                          */
-);
-
-ivas_error ivas_masa_dec_reconfigure(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */
-    uint16_t *nSamplesRendered,                                 /* o  : number of samples flushed from the previous frame (JBM) */
-    int16_t *data                                               /* o  : output synthesis signal                         */
-);
-
-ivas_error ivas_masa_encode(
-    MASA_ENCODER_HANDLE hMasa,                                  /* i/o: MASA encoder structure                          */
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                               */
-    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: Metadata bitstream handle                       */
-    int16_t *nb_bits_metadata,                                  /* o  : number of metadata bits written                 */
-    const int16_t nchan_transport,                              /* i  : number of MASA input/transport channels         */
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                                     */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                              */
-    const int16_t Opt_DTX_ON,                                   /* i  : DTX on flag                                     */
-    const int16_t element_mode,                                 /* i  : element mode                                    */
-    const ISM_MODE ism_mode,                                    /* i  : ISM format mode                                 */
-    const int16_t nchan_ism,                                    /* i  : number of ISM channels                          */
-    ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS],          /* i  : ISM metadata handle                             */
-    const int16_t idx_separated_object,                         /* i  : index of the separated object                   */
-    OMASA_ENC_HANDLE hOMasa,                                    /* i  : OMASA encoder handle                            */
-    const int16_t ism_imp,                                      /* i  : importance of separated object                  */
-    const int16_t flag_omasa_ener_brate                         /* i  : less bitrate for objects in OMASA flag          */
-);
-
-void ivas_masa_estimate_energy(
-    MASA_ENCODER_HANDLE hMasa,                                  /* i/o: MASA encoder structure                          */
-    float *data_f[],                                            /* i  : Input audio channels                            */
-    const int16_t input_frame,                                  /* i  : frame length                                    */
-    const int16_t nchan_transport                               /* i  : number of MASA input/transport channels         */
-);
-
-
-void ivas_masa_set_elements(
-    const int32_t ivas_total_brate,                             /* i  : codec total bitrate                             */
-    const int16_t mc_mode,                                      /* i  : MC format mode                                  */
-    const int16_t nchan_transport,                              /* i  : number of MASA input/transport channels         */
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                               */
-    int16_t *element_mode,                                      /* o  : element mode                                    */
-    int16_t *nSCE,                                              /* o  : number of SCEs                                  */
-    int16_t *nCPE,                                              /* o  : number of CPEs                                  */
-    const int16_t ivas_format,                                  /* i  : IVAS format                                     */
-    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                        */
-    const int32_t ism_total_brate                               /* i  : initial ISM total bitrate                       */
-);
-
-/*! r: valid or not 1/0 */
-int16_t valid_ratio_index(
-    int16_t index,                                              /* i  : index to be checked                             */
-    const int16_t K,                                            /* i  : L1 norm to check against                        */
-    const int16_t len                                           /* i  : vector length                                   */
-);
-
-void reconstruct_ism_ratios(
-    int16_t *ratio_ism_idx,
-    const int16_t nchan_ism,
-    const float step,
-    float *q_energy_ratio_ism
-);
-
-void distribute_evenly_ism(
-    int16_t *idx,
-    const int16_t K,
-    const int16_t nchan_ism
-);
-
-
-int16_t ivas_qmetadata_encode_extended_gr_length_fx(
-    const uint16_t value,
-    const uint16_t alphabet_size,
-    const int16_t gr_param);
-
-void ivas_qmetadata_encode_extended_gr_fx(
-    BSTR_ENC_HANDLE hMetaData,                                 /* i/o: q_metadata handle                                */
-    const uint16_t value,                                      /* i  : value to be encoded                              */
-    const uint16_t alphabet_size,                              /* i  : alphabet size                                    */
-    const int16_t gr_param);                                   /* i  : GR order                                         */
-
-/*! r: CPE bitrate value       */
-int32_t calculate_cpe_brate_MASA_ISM(
-    const ISM_MODE ism_mode,                                    /* i  : ism mode                                        */
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                              */
-    const int16_t nchan_ism                                     /* i  : number of objects                               */
-);
-
-void ivas_merge_masa_metadata(
-    MASA_ENCODER_HANDLE hMasa,                                  /* i/o: MASA enc handle. source for MASA metadata and combined metadata will be here */
-    OMASA_SPATIAL_META_HANDLE hOMasaMeta                        /* i  : ISM-object metadata to be merged with the MASA metadata                      */
-);
-
-
-/*!r : number of bits for ISM ratio index */
-int16_t bits_index_ism_ratio(
-    const int16_t nchan_ism                                     /* i  : number of objects                               */
-);
-
-void calculate_nbits_meta(
-    const int16_t nchan_ism,
-    float q_energy_ratio_ism[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
-    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],
-    const int16_t numSf,
-    const int16_t numCodingBands,
-    int16_t* bits_ism,
-    const int16_t idx_sep_obj,
-    const int16_t ism_imp
-);
-
-/*! r: limitation flag */
-int16_t calculate_brate_limit_flag(
-    const int16_t ism_imp[],                                    /* i  : ISM importance flags                            */
-    const int16_t nchan_ism                                     /* i  : number of objects                               */
-);
-
-void ivas_masa_set_coding_config(
-    MASA_CODEC_CONFIG* config,                                  /* i/o: MASA coding config structure                    */
-    int16_t* band_mapping,                                      /* o  : Band mapping used                               */
-    const int32_t ivas_total_brate,                             /* i  : codec total bitrate                             */
-    const int16_t nchan_transport,                              /* i  : number of transport channel (mono/stereo)       */
-    const uint8_t isMcMasa                                      /* i  : toggle for selecting McMASA specific config     */
-);
-
-/*! r: Surround coherence significant flag */
-uint8_t ivas_masa_surrcoh_signicant(
-    float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],   /* i  : Surround coherence         */
-    float diffuse_to_total_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i  : Diffuse to total ratio     */
-    const int16_t nSubFrames,                                   /* i  : Number of sub frames                            */
-    const int16_t nBands                                        /* i  : Number of frequency bands                       */
-);
-
-void masa_compensate_two_dir_energy_ratio_index(
-    const int16_t ratio_index_1,                                /* i  : Input ratio for direction 1                     */
-    const int16_t ratio_index_2,                                /* i  : Input ratio for direction 2                     */
-    int16_t *ratio_index_mod1,                                  /* o  : Output modified ratio for direction 1           */
-    int16_t *ratio_index_mod2,                                  /* o  : Output modified ratio for direction 2           */
-    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode                  */
-);
-
-void ivas_set_qmetadata_maxbit_req_fx(
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* o  : qmetadata structure where the requirement value is set */
-    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                     */
-);
-
-void masa_sample_rate_band_correction(
-    MASA_CODEC_CONFIG *config,                                  /* i/o: MASA codec config                               */
-    int16_t *band_mapping,                                      /* i/o: Band mapping used and modified                  */
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: QMetadata structure for modification            */
-    const uint8_t maxBand,                                      /* i  : max band                                        */
-    uint8_t is_encoder,                                         /* i  : signals if called at encoder                    */
-    MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta                /* i/o: MASA decoder metadata ext out buffer             */
-);
-
-void invdct4_transform(
-    float *v,                                                   /* i  : input vector                                    */
-    uint8_t *invdct_v                                           /* o  : transformed vector                              */
-);
-
-
-void ivas_spar_param_to_masa_param_mapping(
-    Decoder_Struct *st_ivas,                                       /* i/o: IVAS decoder struct                          */
-    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i  : Input audio in CLDFB domain, real            */
-    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i  : Input audio in CLDFB domain, imag            */
-    const int16_t subframe                                         /* i  : Subframe to map                              */
-);
-
-/*---------------------------------------------------------------------------------*
- * Binaural FastConv Renderer Prototypes
-*-----------------------------------------------------------------------------------*/
-
-
-void ivas_binaural_hrtf_close(
-    HRTFS_FASTCONV_HANDLE *hHrtfFastConv                        /* i/o: decoder binaural hrtf handle                    */
-);
-
-void ivas_binRenderer(
-    BINAURAL_RENDERER_HANDLE hBinRenderer,                      /* i/o: binaural renderer handle                                */
-    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,       /* i  : combined head and external orientation handle           */
-    const int16_t numTimeSlots,                                 /* i  : number of time slots to process                         */
-    float Cldfb_RealBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o  : Binaural signals */
-    float Cldfb_ImagBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o  : Binaural signals */
-    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],                /* i  : LS signals                   */
-    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]                 /* i  : LS signals                   */
-);
-
-void ivas_binaural_add_LFE(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                  */
-    int16_t output_frame,                                       /* i  : length of input frame                                   */
-    float *input_f[],                                           /* i  : transport channels                                      */
-    float *output_f[]                                           /* o  : synthesized core-coder transport channels/DirAC output  */
-);
-
-/*----------------------------------------------------------------------------------*
- * renderer prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_ism_renderer_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */
-);
-
-void ivas_ism_renderer_close(
-    ISM_RENDERER_HANDLE *hIsmRendererData                       /* i/o: ISM renderer handle                             */
-);
-
-void ivas_ism_render_sf(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */
-    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */
-    const int16_t n_samples_to_render                           /* i  : output frame length per channel                 */
-);
-
-
-void ivas_mc2sba(
-    IVAS_OUTPUT_SETUP hIntSetup,                                /* i  : Format of decoder output                        */
-    float *in_buffer_td[],                                      /* i  : MC signals (on input) and the HOA3 (on output)  */
-    float *buffer_td[],                                         /* o  : MC signals (on input) and the HOA3 (on output)  */
-    const int16_t output_frame,                                 /* i  : output frame length per channel                 */
-    const int16_t sba_order,                                    /* i  : SBA order                                       */
-    const float gain_lfe                                        /* i  : gain for LFE, 0=ignore LFE                      */
-);
-
-void ivas_param_mc_mc2sba_cldfb(
-    IVAS_OUTPUT_SETUP hTransSetup,                                                /* i  : transported MC Format                                       */
-    float *hoa_encoder,                                                           /* i  : HOA3 encoder for the transported MC format                  */
-    const int16_t slot_idx,                                                       /* i  : current slot in the subframe                                */
-    float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: Contains the MC signals (on input) and the HOA3 (on output) */
-    float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: Contains the MC signals (on input) and the HOA3 (on output) */
-    const int16_t nBands,                                                         /* i  : number of synth CLDFB bands                                 */
-    const float gain_lfe                                                          /* i  : gain applied to LFE                                        */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Amplitude Panning VBAP prototypes
- *----------------------------------------------------------------------------------*/
-
-void panning_wrap_angles(
-    const float azi_deg,                                        /* i  : azimuth in degrees for panning direction (positive left) */
-    const float ele_deg,                                        /* i  : elevation in degrees for panning direction (positive up) */
-    float *azi_wrapped,                                         /* o  : wrapped azimuth component                                */
-    float *ele_wrapped                                          /* o  : wrapped elevation component                              */
-);
-
-/*----------------------------------------------------------------------------------*
- * LS Renderer prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_ls_setup_conversion_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */
-);
-
-void ivas_ls_setup_conversion_close(
-    LSSETUP_CONVERSION_HANDLE *hLsSetUpConversion               /* i/o: LS converter handle                             */
-);
-
-
-void ivas_ls_setup_conversion(
-    Decoder_Struct *st_ivas,                                    /* i  : IVAS decoder structure                          */
-    const int16_t input_chans,                                  /* i  : number of input channels to the renderer        */
-    const int16_t output_frame,                                 /* i  : frame length                                    */
-    float *input[],                                             /* i  : LS input/output synthesis signal                */
-    float *output[]                                             /* i/o: LS input/output synthesis signal                */
-);
-
-void ivas_ls_setup_conversion_process_mdct(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */
-    float *output[]                                             /* i/o: output synthesis signal                         */
-);
-
-void ivas_ls_setup_conversion_process_mdct_param_mc(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */
-    float *x[][NB_DIV]                                          /* i/o: output synthesis signal                         */
-);
-
-void ivas_lssetupconversion_process_param_mc(
-    Decoder_Struct *st_ivas,                                    /* i/o: LS setup conversion renderer handle             */
-    const int16_t num_timeslots,                                /* i  : number of time slots to process                 */
-    float Cldfb_RealBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals                                         */
-    float Cldfb_ImagBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals                                         */
-    int16_t channel_active[MAX_CICP_CHANNELS]                                                                /* i  : bitmap indicating which output channels are active */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * Custom loudspeaker setup prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_ls_custom_open(
-    LSSETUP_CUSTOM_HANDLE *hLsSetupCustom                       /* o  : Custom loudspeaker setup handle                 */
-);
-
-
-
-/*----------------------------------------------------------------------------------*
- * McMASA prototypes
- *----------------------------------------------------------------------------------*/
-
-
-ivas_error ivas_mcmasa_dec_reconfig(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder handle                              */
-);
-
-void ivas_mcmasa_setNumTransportChannels(
-    int16_t* nchan_transport,                                   /* o  : Pointer to number of transport channels to be set */
-    int16_t* element_mode,                                      /* o  : Pointer to element mode to be set                 */
-    const int32_t ivas_total_brate                              /* i  : Total bitrate of IVAS                             */
-);
-
-void ivas_mcmasa_set_separate_channel_mode(
-    uint8_t *separateChannelEnabled,                            /* o  : Pointer to separate channel toggle                */
-    int16_t *separateChannelIndex,                              /* o  : Pointer to separate channel index                 */
-    const int32_t ivas_total_brate                              /* i  : Total bitrate of IVAS                             */
-);
-
-void ivas_mcmasa_split_brate(
-    const uint8_t separateChannelEnabled,                       /* i  : Transport running in "separate channel" mode      */
-    const int32_t ivas_total_brate,                             /* i  : Total bitrate available to be split               */
-    const int16_t nSCE,                                         /* i  : Number of SCEs in use (0 or 1)                    */
-    const int16_t nCPE,                                         /* i  : Number of CPEs in use (0 or 1)                    */
-    int32_t *brate_sce,                                         /* o  : Pointer to SCE element bitrate                    */
-    int32_t *brate_cpe                                          /* o  : Pointer to CPE element bitrate                    */
-);
-
-
-void ivas_mcmasa_dmx_modify_fx(
-  const Word16 n_samples,                                             /* i  : input frame length in samples                        */
-  Word32 dmx_fx[][L_FRAME48k + NS2SA(48000, IVAS_FB_ENC_DELAY_NS)], /* i/o: downmix signal to be transformed into another format Qx*/
-  Word16 dmx_Q[],                                                     /* i/o : Q of the intput signal which is being transformed*/
-  const Word16 n_chnls_dmx_old,                                       /* i  : number of downmix channels in the old format        Q0 */
-  const Word16 n_chnls_dmx_new                                      /* i  : number of downmix channels in the target format      Q0*/
-);
-
-ivas_error ivas_mono_dmx_renderer_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */
-);
-
-
-void ivas_mono_dmx_renderer_close(
-    MONO_DOWNMIX_RENDERER_HANDLE *hMonoDmxRenderer              /* i/ i/o: Mono downmix structure                       */
-);
-
-void ivas_mono_downmix_render_passive(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                */
-    float *output_f[],                                          /* i/o: synthesized core-coder transport channels/mono output */
-    const int16_t output_frame                                  /* i  : output frame length                                   */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * LFE encoder low pass filter prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_create_lfe_lpf_enc(
-    ivas_filters_process_state_t **hLfeLpf,                     /* o  : LFE LPF handle                          */
-    const int32_t input_Fs                                      /* i  : input sampling rate                     */
-);
-
-void ivas_lfe_lpf_enc_close_fx(
-    ivas_filters_process_state_t **hLfeLpf                      /* i/o: LFE LPF handle                          */
-);
-
-void ivas_lfe_lpf_enc_apply(
-    ivas_filters_process_state_t *hLfeLpf,                      /* i/o: LFE LPF handle                          */
-    float data_lfe_ch[],                                        /* i/o: LFE signal                              */
-    const int16_t input_frame                                   /* i  : input frame length per channel          */
-);
-
-
-/*----------------------------------------------------------------------------------*
- * LFE Coding prototypes
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_create_lfe_enc_fx(
-    LFE_ENC_HANDLE *hLFE,                                       /* o  : IVAS LFE encoder structure              */
-    const int32_t input_Fs                                      /* i  : input sampling rate                     */
-);
-
-void ivas_lfe_enc_close_fx( 
-    LFE_ENC_HANDLE *hLFE                                        /* i/o: LFE encoder handle                      */
-);
-
-void ivas_lfe_enc(
-    LFE_ENC_HANDLE hLFE,                                        /* i/o: LFE encoder handle                      */
-    float data_lfe_ch[],                                        /* i  : input LFE signal                        */
-    const int16_t input_frame,                                  /* i  : input frame length per channel          */
-    BSTR_ENC_HANDLE hBstr                                       /* i/o: bitstream handle                        */
-);
-
-void ivas_lfe_tdplc(
-    LFE_DEC_HANDLE hLFE, /* i/o: LFE decoder handle           */
-    float *prevsynth, /* i  : previous frame synthesis     */
-    float *ytda,               /* o  : output time-domain buffer    */
-    const int16_t output_frame /* i  : output frame length          */
-);
-void ivas_lfe_window_init(
-    LFE_WINDOW_HANDLE hLFEWindow,                               /* i/o: LFE window handle                       */
-    const int32_t sampling_rate,                                /* i  : sampling rate                           */
-    const int16_t frame_len                                     /* i  : frame length in samples                 */
-);
-
-void ivas_lfe_lpf_select_filt_coeff(
-    const int32_t sampling_rate,                                /* i  : sampling rate                           */
-    const int16_t order,                                        /* i  : filter order                            */
-    const float **ppFilt_coeff                                  /* o  : filter coefficients                     */
-);
-
-void ivas_filters_init( 
-    ivas_filters_process_state_t *filter_state,                 /* i/o: filter state handle                     */
-    const float *filt_coeff,                                    /* i  : filter coefficients                     */
-    const int16_t order                                         /* i  : filter order                            */
-);
-
-void ivas_filters_init_fx(
-    ivas_filters_process_state_t *filter_state, /* i/o: filter state handle     */
-    const Word32 *filt_coeff_fx,                /* i  : filter coefficients Q31- *filt_coeff_e   */
-    const Word16 *filt_coeff_e,                 /* i  : exponents of filter coefficients */
-    const Word16 order ) ;
-
-void ivas_filter_process( 
-    ivas_filters_process_state_t *filter_state,                 /* i/o: filter state handle                     */
-    float *pIn_Out,                                             /* i  : signal subject to filtering             */
-    const int16_t length                                        /* i  : filter order                            */
-);
-
-void ivas_filter_process_fx(
-    ivas_filters_process_state_t *filter_state, /* i/o: filter state handle             */
-    Word32 *pIn_Out_fx,                         /* i/o: signal subject to filtering Q(q_factor)   */
-    const Word16 length,                        /* i  : filter order                    */
-    Word16 q_factor );
-
-/*----------------------------------------------------------------------------------*
- * OSBA prototypes
- *----------------------------------------------------------------------------------*/
-ivas_error ivas_osba_enc_reconfig(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-);
-ivas_error ivas_osba_data_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder handle                     */
-);
-
-ivas_error ivas_osba_dirac_td_binaural_jbm(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested         */
-    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered          */
-    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render   */
-    float *output_f[]                                           /* o  : rendered time signal                    */
-);
-
-
-void ivas_osba_data_close(
-    SBA_ISM_DATA_HANDLE *hSbaIsmData                            /* i/o: OSBA rendering handle                   */
-);
-
-
-/*----------------------------------------------------------------------------------*
-* OMASA prototypes
-*---------------------------------------------------------------------------------*/
-
-ivas_error ivas_omasa_enc_open(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                     */
-);
-
-void ivas_omasa_enc_close(
-    OMASA_ENC_HANDLE *hOMasa                                    /* i/o: encoder OMASA handle                    */
-);
-
-
-ivas_error ivas_omasa_dec_config(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    uint16_t *nSamplesRendered,                                 /* o  : number of samples flushed from the previous frame (JBM) */
-    int16_t *data                                               /* o  : output synthesis signal                 */
-);
-
-
-
-
-void ivas_set_surplus_brate_enc(
-    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
-#ifdef DEBUG_MODE_INFO
-    ,
-    const int16_t *nb_bits_metadata                             /* i  : number of metadata bits                 */
-#endif
-);
-
-void ivas_set_surplus_brate_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    int32_t *ism_total_brate                                    /* i  : ISM total bitrate                       */
-);
-
-
-void ivas_set_ism_importance_interformat(
-    const int32_t ism_total_brate,                              /* i/o: ISms total bitrate                      */
-    const int16_t nchan_transport,                              /* i  : number of transported channels          */
-    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                    */
-    SCE_ENC_HANDLE hSCE[],                                      /* i/o: SCE encoder handles                     */
-    const float lp_noise_CPE,                                   /* i  : LP filtered total noise estimation      */
-    int16_t ism_imp[]                                           /* o  : ISM importance flags                    */
-);
-
-
-/*! r: adjusted bitrate */
-int32_t ivas_interformat_brate(
-    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                */
-    const int16_t nchan_ism,                                    /* i  : number of ISM channels                  */
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t ism_imp,                                      /* i  : ISM importance flag                     */
-    const int16_t limit_flag                                    /* i  : flag to limit the bitrate increase      */
-);
-
-void ivas_combined_format_brate_sanity(
-    const int32_t element_brate,                                /* i  : element bitrate                         */
-    const int16_t core,                                         /* i  : core                                    */
-    const int32_t total_brate,                                  /* i  : total bitrate                           */
-    int32_t *core_brate,                                        /* i/o: core bitrate                            */
-    int16_t *inactive_coder_type_flag,                          /* o  : inactive coder_type flag                */
-    int16_t *diff_nBits                                         /* o  : number of differential bits             */
-);
-
-ISM_MODE ivas_omasa_ism_mode_select(
-    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
-    const int16_t nchan_ism                                     /* i  : number of input ISM's                   */
-);
-
-void ivas_set_omasa_TC(
-    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                */
-    const int16_t nchan_ism,                                    /* i  : number of input ISMs                    */
-    int16_t *nSCE,                                              /* o  : number of SCEs                          */
-    int16_t *nCPE                                               /* o  : number of CPEs                          */
-);
-
-void ivas_merge_masa_transports(
-    float data_in_f1[][L_FRAME48k],                             /* i  : Transport audio signals 1               */
-    float *data_in_f2[],                                        /* i  : Transport audio signals 2               */
-    float *data_out_f[],                                        /* o  : Merged transport audio signals          */
-    const int16_t input_frame,                                  /* i  : Input frame size                        */
-    const int16_t num_transport_channels                        /* i  : Number of transport audio signals       */
-);
-
-
-ivas_error ivas_omasa_ism_metadata_dec(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const int32_t ism_total_brate,                              /* i  : ISM total bitrate                       */
-    int16_t *nchan_ism,                                         /* o  : number of ISM separated channels        */
-    int16_t *nchan_transport_ism,                               /* o  : number of ISM TCs                       */
-    const int16_t dirac_bs_md_write_idx,                        /* i  : DirAC bitstream write index             */
-    int16_t nb_bits_metadata[]                                  /* o  : number of ISM metadata bits             */
-);
-
-void ivas_omasa_preProcessStereoTransportsForMovedObjects(
-    Decoder_Struct *st_ivas,
-    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
-    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
-    const int16_t nBins,
-    const int16_t subframe
-);
-
-ivas_error ivas_omasa_separate_object_renderer_open(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-void ivas_omasa_separate_object_renderer_close(
-    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
-);
-
-void ivas_omasa_separate_object_render_jbm(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    const uint16_t nSamplesRendered,                            /* i  : number of samples rendered              */
-    float input_f[][L_FRAME48k],                                /* i  : separated object signal                 */
-    float *output_f[],                                          /* o  : rendered time signal                    */
-    const int16_t subframes_rendered,                           /* i  : number of subframes rendered            */
-    const int16_t slots_rendered                                /* i  : number of CLDFB slots rendered          */
-);
-
-void ivas_omasa_encode_masa_to_total(
-    float masa_to_total_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],
-    BSTR_ENC_HANDLE hMetaData,
-    const int16_t low_bitrate_mode,
-    const int16_t nbands,
-    const int16_t nblocks
-);
-
-void ivas_omasa_decode_masa_to_total(
-    uint16_t *bit_stream,
-    int16_t *index,
-    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],
-    const int16_t nbands,
-    const int16_t nblocks
-);
-
-void ivas_omasa_modify_masa_energy_ratios(
-    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                       */
-    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_MAXIMUM_CODING_SUBBANDS]
-);
-
-
-/*----------------------------------------------------------------------------------*
- * TD Binaural Object renderer
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_td_binaural_renderer(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    float *output[],                                            /* i/o: SCE channels / Binaural synthesis       */
-    const int16_t output_frame                                  /* i  : output frame length                     */
-);
-
-ivas_error ivas_td_binaural_renderer_sf(
-    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
-    float *output[],                                            /* i/o: SCE channels / Binaural synthesis       */
-    const int16_t n_samples_granularity                         /* i  : granularity of the renderer/buffer      */
-);
-
-/*----------------------------------------------------------------------------------*
- * Filter-bank (FB) Mixer
- *----------------------------------------------------------------------------------*/
-
-ivas_error ivas_fb_set_cfg(
-    IVAS_FB_CFG **pFb_cfg_out,                                  /* o  : FB config. handle                           */
-    const int16_t ivas_format,                                  /* i  : IVAS format                                 */
-    const int16_t num_in_chans,                                 /* i  : number of FB input channels                 */
-    const int16_t num_out_chans,                                /* i  : number of FB output channels                */
-    const int16_t active_w_mixing,                              /* i  : active_w_mixing flag                        */
-    const int32_t sampling_Fs,                                  /* i  : sampling rate                               */
-    const int16_t nachan_dirac_ana                              /* i  : number of DirAR analysis channels           */
-);
-
-void ivas_fb_mixer_pcm_ingest( 
-    IVAS_FB_MIXER_HANDLE hFbMixer,                              /* i/o: FB mixer handle                             */
-    float *pcm_in[],                                            /* i  : input audio channels                        */
-    float **ppOut_pcm,                                          /* o  : output audio channels                       */
-    const int16_t frame_length,                                 /* i  : frame length                                */
-    const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]
-);
-
-void ivas_fb_mixer_update_prior_input(
-    IVAS_FB_MIXER_HANDLE hFbMixer,                              /* i/o: FB mixer handle                             */
-    float *pcm_in[],                                            /* i  : input audio channels                        */
-    const int16_t length,                                       /* i  : length of time slot                         */
-    const int16_t nchan_fb_in                                   /* i  : number of analysis channels                 */
-);
-
-void ivas_fb_mixer_get_windowed_fr(
-    IVAS_FB_MIXER_HANDLE hFbMixer,                              /* i/o: FB mixer handle                             */
-    float *pcm_in[],                                            /* i  : input audio channels                        */
-    float *frame_f_real[],                                      /* o  : real freq domain values                     */
-    float *frame_f_imag[],                                      /* o  : imag freq domain values                     */
-    const int16_t length,                                       /* i  : number of new samples in time slot          */
-    const int16_t mdft_len,                                     /* i  : MDFT frame length                           */
-    const int16_t nchan_fb_in                                   /* i  : number of analysis channels                 */
-);
-
-/*! r: number of spectral bands */
-
-/* clang-format on */
diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h
index dd7191b3f61cfa26bdcae640ff4b286227e79268..8b6cdcac91760e658892ed170ac55ea2b067430a 100644
--- a/lib_com/ivas_prot_fx.h
+++ b/lib_com/ivas_prot_fx.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -53,6 +53,17 @@ void ivas_masa_dec_close_fx(
     MASA_DECODER_HANDLE *hMasa /* i/o: MASA metadata structure                         */
 );
 
+ivas_error create_evs_sce_enc_fx(
+    Encoder_Struct *st_ivas,   /* i/o: IVAS encoder structure      */
+    const Word16 sce_id,       /* i  : SCE # identifier            */
+    const Word32 element_brate /* i  : element bitrate             */
+);
+
+void destroy_sce_enc_fx(
+    SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure                   */
+    Flag is_evs          /* i  : Flag to indicate EVS encoder            */
+);
+
 void generate_gridEq_fx(
     SPHERICAL_GRID_DATA *data /* o  : data structure for grid  */
 );
@@ -658,11 +669,6 @@ Word16 read_flag_EC_DFT(
     Word16 *flag               /* o  : flag value           */
 );
 
-/*file : ivas_mc_param_dec_fx.c*/
-Word16 param_mc_get_num_cldfb_syntheses_ivas_fx(
-    Decoder_Struct *st_ivas /* i  : Parametric MC handle */
-);
-
 void ivas_init_dec_get_num_cldfb_instances(
     Decoder_Struct *st_ivas,  /* i  : IVAS decoder structure                  */
     Word16 *numCldfbAnalyses, /* o  : number of CLDFB analysis instances      */
@@ -1303,6 +1309,18 @@ Word16 matrix_diag_product_fx(
     Word32 *Z,             /* o  : resulting matrix after the matrix multiplication                                       */
     Word16 *Z_e );
 
+Word16 matrix_diag_product_fx_2(
+    const Word32 *X, /* i  : left hand matrix                                                                       Q31 - X_e*/
+    const Word16 X_e,
+    const Word16 rowsX,   /* i  : number of rows of the left hand matrix                                                 Q0*/
+    const Word16 colsX,   /* i  : number of columns of the left hand matrix                                              Q0*/
+    const Word16 transpX, /* i  : flag indicating the transposition of the left hand matrix prior to the multiplication  Q0*/
+    const Word32 *Y,      /* i  : right hand diagonal matrix as vector containing the diagonal elements                  Q31 - Y_e*/
+    const Word16 *Y_e,
+    const Word16 entriesY, /* i  : number of entries in the diagonal                                                      Q0*/
+    Word32 *Z,             /* o  : resulting matrix after the matrix multiplication                                       Q31 - Z_e*/
+    Word16 *Z_e );
+
 Word16 matrix_diag_product_fx_1(
     const Word32 *X, /* i  : left hand matrix                                                                       */
     const Word16 *X_e,
@@ -1868,7 +1886,7 @@ void ivas_wb_tbe_dec_fx(
     Word16 *synth,                /* o  : WB synthesis/final synthesis    */
     Word16 *Q_synth );
 
-void ivas_GenShapedWBExcitation_fx(
+void GenShapedWBExcitation_ivas_fx(
     Word16 *excSHB,                   /* o : synthesized shaped shb exctiation Q_bwe_exc*/
     const Word16 *lpc_shb,            /* i : lpc coefficients Q12*/
     Word16 *exc4kWhtnd,               /* o : whitened synthesized shb excitation Q_bwe_exc*/
@@ -1949,6 +1967,7 @@ void ivas_DetectTonalComponents_fx(
     const Word16 scaleFactors_exp[],
     const Word16 scaleFactors_max_e,
     const Word32 secondLastPowerSpectrum[],
+    const Word16 secondLastPowerSpectrum_e,
     const Word16 nSamples,
     const Word16 nSamplesCore,
     Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  */
@@ -2226,11 +2245,7 @@ void ivas_mct_side_bits_fx(
     const Word16 nb_bits_metadata        /* i  : number of metadata bits */
 );
 
-#ifdef BASOP_NOGLOB /*Critical overflow */
 Flag conv_fx_32(
-#else
-void conv_fx_32(
-#endif
     const Word16 x[], /* i  : i   vector                              Q_new*/
     const Word16 h[], /* i  : impulse response (or second i   vector) Q(15)*/
     Word32 y[],       /* o  : output vetor (result of convolution)      12 bits*/
@@ -2268,20 +2283,6 @@ ivas_error ivas_mct_dec_fx(
     const Word16 output_frame,    /* i  : output frame length per channel */
     const Word16 nb_bits_metadata /* i  : number of metadata bits         */
 );
-void swb_tbe_reset_synth_ivas_fx(
-    Word32 genSHBsynth_Hilbert_Mem[],
-    Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[],
-    Word32 genSHBsynth_state_lsyn_filt_shb_local_fx_32[] );
-
-void InitSWBdecBuffer_ivas_fx(
-    Decoder_State *st_fx /* i/o: SHB decoder structure */
-);
-
-void td_bwe_dec_init_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: SHB decoder structure */
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */
-    const Word32 output_Fs     /* i  : output sampling rate    */
-);
 
 void ivas_dirac_dec_render_sf_fx(
     Decoder_Struct *st_ivas,      /* i/o: IVAS decoder structure                  */
@@ -2710,7 +2711,8 @@ void stereo_coder_tcx_fx(
     Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],      /* i/o: inverse spectrum                */
     Word32 *inv_mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse MDST spectrum           */
     const Word16 mct_on,                                /* i  : flag mct block (1) or stereo (0)  */
-    Word16 q_spec );
+    Word16 exp_spec,
+    Word16 exp_mdst_spec );
 
 // bw_detect_fx.c
 Word16 set_bw_mct_fx(
@@ -2805,18 +2807,18 @@ Word16 mdct_classifier_ivas_fx(
  * Range Coder prototypes
  *----------------------------------------------------------------------------------*/
 
-void rc_uni_enc_init(
+void rc_uni_enc_init_fx(
     RangeUniEncState *rc_st_enc /* i/o: RC state handle                     */
 );
 
-void rc_uni_enc_encode_fast(
+void rc_uni_enc_encode_fast_fx(
     RangeUniEncState *rc_st_enc, /* i/o: RC state handle                     */
     const UWord16 cum_freq,      /* i  : Cumulative frequency up to symbol   */
     const UWord16 sym_freq,      /* i  : Symbol frequency                    */
     const UWord16 tot_shift      /* i  : Total frequency as a power of 2     */
 );
 
-void rc_uni_enc_encode_symbol_fastS(
+void rc_uni_enc_encode_symbol_fastS_fx(
     RangeUniEncState *rc_st_enc, /* i/o: Encoder state                       */
     const UWord16 symbol,        /* i  : Symbol to encode                    */
     const UWord16 cum_freq[],    /* i  : Cumulative frequency up to symbol   */
@@ -2825,16 +2827,16 @@ void rc_uni_enc_encode_symbol_fastS(
 );
 
 /*! r: Total number of bits produced */
-Word16 rc_uni_enc_finish(
+Word16 rc_uni_enc_finish_fx(
     RangeUniEncState *rc_st_enc /* i/o: RC state handle                     */
 );
 
 /*! r: Total number of bits produced */
-Word16 rc_uni_enc_virtual_finish(
+Word16 rc_uni_enc_virtual_finish_fx(
     RangeUniEncState *rc_st_enc /* i  : RC state handle                     */
 );
 
-void rc_uni_enc_encode_bits(
+void rc_uni_enc_encode_bits_fx(
     RangeUniEncState *rc_st_enc, /* i/o: RC state handle                     */
     const UWord16 value,         /* i  : Value to encode                     */
     const Word16 bits            /* i  : Number of bits                      */
@@ -2901,7 +2903,7 @@ void stereo_dft_enc_write_BS_fx(
 
 void stereo_dft_enc_res_fx(
     STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle       */
-    const Word32 *input_8k,                /* i  : input buffer sampled at 8kHz Q16 */
+    const Word32 *input_8k,                /* i  : input buffer sampled at 8kHz Q15 */
     BSTR_ENC_HANDLE hBstr,                 /* i/o: bitstream handle            */
     Word16 *nb_bits,                       /* o  : number of bits written      */
     const Word16 max_bits );
@@ -2968,7 +2970,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     Word16 non_staX,     /* i  : unbound non-stationarity for sp/mu clas */
     Word16 *pitch_fr,    /* i  : fraction pitch values                   */
     Word16 *voicing_fr,  /* i  : fractional voicing values               */
-    Word16 currFlatness, /* i  : flatness                                */
+    Word32 currFlatness, /* i  : flatness                                */
     Word16 lsp_mid[M],   /* i  : LSPs at the middle of the frame         */
     Word16 stab_fac,     /* i  : LP filter stability                     */
     Word32 *res_cod_SNR_M,
@@ -2997,10 +2999,11 @@ void acelp_fast_fx(
     BSTR_ENC_HANDLE hBstr,  /* i/o: encoder bitstream handle                      */
     const Word16 cdk_index, /* i  : codebook index                                */
     const Word16 dn_orig[L_SUBFR],
-    /* i  : corr. between target and h[].                 */ // Q_new + 1
+    /* i  : corr. between target and h[].                 */ // Q_dn
     Word16 Q_dn,
     const Word16 cn[L_SUBFR],
-    /* i  : residual after long term prediction           */ // Q_new + 1
+    /* i  : residual after long term prediction           */ // q_cn
+    const Word16 q_cn,
     const Word16 H[L_SUBFR],
     /* i  : impulse response of weighted synthesis filter */ // e(norm_s(H[0])+1)
     Word16 code[L_SUBFR],                                    /* o  : algebraic (fixed) codebook excitation         */
@@ -3085,7 +3088,7 @@ Word16 transient_analysis_ivas_fx(
 
 void set_transient_stereo_fx(
     CPE_ENC_HANDLE hCPE,  /* i  : CPE structure                           */
-    Word16 currFlatness[] /* i/o: current flatness                       Q7*/
+    Word32 currFlatness[] /* i/o: current flatness                       Q21*/
 );
 
 void ivas_smc_mode_selection_fx(
@@ -3101,6 +3104,12 @@ void ivas_smc_mode_selection_fx(
     const Word16 flag_spitch    /* i  : flag to indicate very short stable pitch*/
 );
 
+/*! r: element mode */
+Word16 select_stereo_mode_fx(
+    CPE_ENC_HANDLE hCPE,          /* i/o: CPE encoder structure                           */
+    const IVAS_FORMAT ivas_format /* i  : IVAS format                                     */
+);
+
 void stereo_classifier_features_ivas_fx(
     STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                     */
     const Word16 idchan,                  /* i  : channel ID                                      */
@@ -3229,11 +3238,8 @@ void computeDirectionVectors_fixed(
     Word32 *direction_vector_y, /*Q30*/
     Word32 *direction_vector_z, /*Q30*/
     Word16 i_e                  /*Exponent of all the intensity buffers*/
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
     ,
-    Word16 *i_e_band
-#endif
-);
+    Word16 *i_e_band );
 
 
 UWord8 ivas_masa_surrcoh_signicant_fx(
@@ -3328,15 +3334,16 @@ void ivas_omasa_enc_fx(
 );
 
 void mctStereoIGF_enc_fx(
-    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure               */
-    Encoder_State **sts,                                 /* i/o: encoder state structure             */
-    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF               */
-    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum */
-    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
-    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/
-    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx and powSpecMsInv_fx*/
-    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                    */
-    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision               */
+    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure                      */
+    Encoder_State **sts,                                 /* i/o: encoder state structure                    */
+    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */
+    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */
+    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */
+    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */
+    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/
+    Word16 *q_powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],  /* i  : Q for powSpecMsInv_fx                      */
+    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                           */
+    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision                      */
 );
 
 void ivas_mct_core_enc_fx(
@@ -3776,8 +3783,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
     const UWord16 nSamplesAsked, /* i  : number of CLDFB slots requested           */
     UWord16 *nSamplesRendered,   /* o  : number of CLDFB slots rendered            */
     UWord16 *nSamplesAvailable,  /* o  : number of CLDFB slots still to render     */
-    Word32 *output_fx[],         /* o  : rendered time signal                      */
-    Word16 out_len               /*Store the length of values in each channel*/
+    Word32 *output_fx[]          /* o  : rendered time signal                      */
 );
 
 ivas_error ivas_osba_ism_metadata_dec_fx(
@@ -3962,7 +3968,7 @@ ivas_error ivas_core_dec_fx(
     const Word16 sba_dirac_stereo_flag               /* i  : signal stereo output for SBA DirAC      */
 );
 
-void decod_gen_2sbfr_ivas_fx(
+void decod_gen_2sbfr_fx(
     Decoder_State *st,                 /* i/o: decoder static memory                     */
     const Word16 sharpFlag,            /* i  : formant sharpening flag                   `Q0*/
     const Word16 *Aq,                  /* i  : LP filter coefficient					 Q12*/
@@ -4282,7 +4288,7 @@ void stereo_dft_dec_read_BS_fx(
     const Word16 ivas_format               /* i  : ivas format				Q0*/
 );
 
-Word16 write_bitstream_adapt_GR(
+Word16 write_bitstream_adapt_GR_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle                    */
     const Word16 ind,      /* i  : bitstream index                             */
     const Word16 *in,      /* i  : values to be written in bitstream           */
@@ -4308,7 +4314,7 @@ Word16 adapt_GR_ief_fx(
     const Word16 try_diff           /*  i  : diff coding allowed 1/0                          */
 );
 
-Word16 adapt_GR_rpg1_ief(
+Word16 adapt_GR_rpg1_ief_fx(
     const Word16 *in,       /*  i  : res pred gains input vector                       */
     Word16 *in_diff,        /*  o  : encoded symbols in case of differential encoding  */
     const Word16 *prev,     /*  i  : previous frame data                               */
@@ -4322,14 +4328,14 @@ Word16 adapt_GR_rpg1_ief(
     const Word16 try_diff   /*  i  : diff coding allowed 1/0                           */
 );
 
-Word16 write_GR1(
+Word16 write_GR1_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle    */
     const Word16 ind,      /* i  : bitstream index             */
     const Word16 *in,      /* i  : data to be encoded          */
     const Word16 len       /* i  : input data length           */
 );
 
-Word16 write_bitstream_GR(
+Word16 write_bitstream_GR_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
     const Word16 ind,      /* i  : bitstream index          */
     const Word16 *in,      /* i  : input vector             */
@@ -4692,13 +4698,12 @@ Word32 dot_product_cholesky_fx(
     const Word32 *A, /* i  : Cholesky  matrix A              */
     const Word16 N   /* i  : vector & matrix size            */
 );
-Word32 dot_product_cholesky_fixed(
+
+Word64 dot_product_cholesky_fixed(
     const Word32 *x, /* i  : vector x                        */
     const Word32 *A, /* i  : Cholesky  matrix A              */
-    const Word16 N,  /* i  : vector & matrix size            */
-    const Word16 exp_x,
-    const Word16 exp_A,
-    Word16 *exp_sum );
+    const Word16 N   /* i  : vector & matrix size            */
+);
 
 void v_mult_mat_fx(
     Word32 *y_fx, /* o  : the product x*A                         */
@@ -4741,7 +4746,7 @@ ivas_error stereo_memory_enc_fx(
 
 void stereo_switching_enc_fx(
     CPE_ENC_HANDLE hCPE,           /* i  : CPE encoder structure               */
-    Word16 old_input_signal_pri[], /* i  : old input signal of primary channel */
+    Word32 old_input_signal_pri[], /* i  : old input signal of primary channel */
     const Word16 input_frame,      /* i  : input frame length                  */
     const Word16 q_inp );
 
@@ -4761,7 +4766,7 @@ void stereo_mdct2dft_update_fx(
     Word32 synth0_fx[]   /* i/o: synthesis @output Fs, ch0    Q11*/
 );
 
-Word16 write_GR0(
+Word16 write_GR0_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle    */
     const Word16 ind,      /* i  : bitstream index             */
     const Word16 *in,      /* i  : data to be encoded          */
@@ -4850,7 +4855,8 @@ void ivas_dirac_param_est_enc_fx(
     const Word16 hodirac_flag,
     const Word16 nchan_fb_in,
     Word16 *mono_frame_count,
-    Word16 *dirac_mono_flag );
+    Word16 *dirac_mono_flag,
+    const Word16 shift );
 
 ivas_error ivas_cldfb_dec_reconfig_fx(
     Decoder_Struct *st_ivas,           /* i/o: IVAS decoder structure                                */
@@ -4859,6 +4865,10 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
     const Word16 numCldfbSyntheses_old /* i  : number of CLDFB synthesis instances in previous frame */
 );
 
+ivas_error ivas_sba_enc_reconfigure_fx(
+    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure                  */
+);
+
 Word16 ivas_sba_get_order_fx(
     const Word16 nb_channels, /* i  : Number of ambisonic channels            */
     const Word16 sba_planar   /* i  : SBA planar flag                         */
@@ -4976,6 +4986,15 @@ void ivas_dirac_dec_get_response_fx(
     const Word16 ambisonics_order,
     Word16 Q_out );
 
+#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
+/*This is a derivate to ivas_dirac_dec_get_response_fx with fixed Q_out=29*/
+void ivas_dirac_dec_get_response_fx_29(
+    const Word16 azimuth,
+    const Word16 elevation,
+    Word32 *response_fx, /*Q_out=29*/
+    const Word16 ambisonics_order );
+#endif
+
 void calculate_hodirac_sector_parameters_fx(
     DIRAC_ENC_HANDLE hDirAC,                                          /* i  : DirAC handle                                  */
     Word32 RealBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i  : signal vector (L+1)^2 x N_bins, real part     */
@@ -5319,15 +5338,14 @@ ivas_error ivas_sba_dec_render_fx(
     const UWord16 nSamplesAsked,    /* i  : number of CLDFB slots requested           */
     UWord16 *nSamplesRendered,      /* o  : number of CLDFB slots rendered            */
     UWord16 *nSamplesAvailableNext, /* o  : number of CLDFB slots still to render     */
-    Word32 *output_fx[],            /* o  : rendered time signal                      Q11*/
-    Word16 out_len                  /*Store the length of values in each channel*/
+    Word32 *output_fx[]             /* o  : rendered time signal                      Q11*/
 );
 
 void ivas_spar_dec_upmixer_sf_fx(
-    Decoder_Struct *st_ivas,     /* i/o: IVAS decoder handle                     */
-    Word32 *output_fx[],         /* o  : output audio channels                   */
-    const Word16 nchan_internal, /* i  : number of internal channels             */
-    Word16 out_len );
+    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder handle                     */
+    Word32 *output_fx[],        /* o  : output audio channels                   */
+    const Word16 nchan_internal /* i  : number of internal channels             */
+);
 
 ivas_error ivas_spar_md_enc_open_fx(
     ivas_spar_md_enc_state_t **hMdEnc_in,       /* i/o: SPAR MD encoder handle  */
@@ -5750,8 +5768,8 @@ ivas_error ivas_dirac_enc_fx(
     const Word16 input_frame,      /* i  : input frame length                      */
     const Word16 dtx_vad,          /* i  : DTX vad flag                            */
     const IVAS_FORMAT ivas_format, /* i  : ivas format                             */
-    const Word16 hodirac_flag      /* i  : hodirac flag                            */
-);
+    const Word16 hodirac_flag,     /* i  : hodirac flag                            */
+    const Word16 shift );
 
 ivas_error ivas_spar_md_enc_init_fx(
     ivas_spar_md_enc_state_t *hMdEnc,           /* o  : MD encoder handle        */
@@ -5838,8 +5856,7 @@ ivas_error ivas_compute_core_buffers_fx(
     Word16 lsp_mid_fx[M],                  /* i/o: LSPs in the middle of the frame          */
     Word16 Q_old_inp_16k,
     Word16 Q_r[2],
-    Word16 *Q_new,
-    Word16 downscale_buf_speech_enc_pe );
+    Word16 *Q_new );
 
 ivas_error ivas_enc_fx(
     Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure      */
@@ -5855,4 +5872,819 @@ void reset_metadata_spatial_fx(
     const Word32 core_brate,       /* i  : core bitrate                            */
     const Word16 nb_bits_metadata  /* i  : number of meatdata bits                 */
 );
+
+/*=============================================================================================*/
+/* clang-format off */
+
+/*----------------------------------------------------------------------------------*
+ * General IVAS prototypes
+ *----------------------------------------------------------------------------------*/
+
+/*! r: number of channels to be analysed */
+
+void copy_encoder_config_ivas_fx(
+    Encoder_Struct *st_ivas,                                    /* i  : IVAS encoder structure                  */
+    Encoder_State *st,                                          /* o  : encoder state structure                 */
+    const Word16 flag_all                                      /* i  : flag 1==update all, 0=partial update    Q0*/
+);
+
+ivas_error create_mct_enc_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+void destroy_cpe_enc(
+    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder structure                   */
+);
+
+void ivas_mct_enc_close_fx(
+    MCT_ENC_HANDLE *hMCT                                        /* i/o: MCT encoder structure                   */
+);
+
+ivas_error pre_proc_front_ivas_fx(
+    SCE_ENC_HANDLE hSCE,                                       /* i/o: SCE encoder structure                   */
+    CPE_ENC_HANDLE hCPE,                                       /* i/o: CPE encoder structure                   */
+    const Word32 element_brate,            /* i  : SCE/CPE element bitrate					Q0*/
+    const Word16 nb_bits_metadata,         /* i  : number of metadata bits					Q0*/
+    const Word16 input_frame,              /* i  : frame length								Q0*/
+    const Word16 n,                        /* i  : channel number							Q0*/
+    Word16 old_inp_12k8_fx[],              /* o  : buffer of old input signal				Q_new-1*/
+    Word16 old_inp_16k_fx[],               /* o  : buffer of old input signal @16kHz		Q_new-1*/
+    Word32 *ener_fx,                       /* o  : residual energy from Levinson-Durbin		epsP_fx_q*/
+    Word16 *relE_fx,                       /* o  : frame relative energy					Q8*/
+    Word16 A_fx[NB_SUBFR16k * ( M + 1 )],  /* o  : A(z) unquantized for the 4 subframes		Q12*/
+    Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* o  : weighted A(z) unquantized for subframes	Q12*/
+    Word32 epsP_fx[M + 1],                 /* o  : LP prediction errors						epsP_fx_q*/
+    Word16 *epsP_fx_q,
+    Word16 lsp_new_fx[M],                                          /* o  : LSPs at the end of the frame				Q15*/
+    Word16 lsp_mid_fx[M],                                          /* o  : LSPs in the middle of the frame			Q15*/
+    Word16 *vad_hover_flag,                                        /* o  : VAD hangover flag						Q0*/
+    Word16 *attack_flag,                                           /* o  : flag signaling attack					Q0*/
+    Word32 realBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer								Q(q_re_im_buf)*/
+    Word32 imagBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer								Q(q_re_im_buf)*/
+    Word16 *q_re_im_buf,                                           /* i/o: Q-factor of real and imag buffer			*/
+    Word16 old_wsp_fx[],                                           /* o  : weighted input signal buffer				q_old_wsp*/
+    Word16 *q_old_wsp,
+    Word16 pitch_fr_fx[NB_SUBFR],                /* o  : fractional pitch values						Q6*/
+    Word16 voicing_fr_fx[NB_SUBFR],              /* o  : fractional pitch gains							Q15*/
+    Word16 *loc_harm,                            /* o  : harmonicity flag								Q0*/
+    Word16 *cor_map_sum_fx,                      /* o  : speech/music clasif. parameter					Q8*/
+    Word16 *vad_flag_dtx,                        /* o  : HE-SAD flag with additional DTX HO				Q0*/
+    Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o  : energy buffer									enerBuffer_fx_exp*/
+    Word16 *enerBuffer_fx_exp,                   /* o  : energy buffer									*/
+    Word16 fft_buff_fx[2 * L_FFT],               /* o  : FFT buffer										fft_buff_fx_q*/
+    Word16 *fft_buff_fx_q,                       /* o  : FFT buffer										*/
+    const Word16 tdm_A_PCh_fx[M + 1],            /* i  : unq. LP coeff. of primary channel				Q12*/
+    const Word16 tdm_lsp_new_PCh_fx[M],          /* i  : unq. LSPs of primary channel					Q15*/
+    const Word32 currFlatness_fx,                /* i  : flatness parameter								Q21*/
+    const Word16 tdm_ratio_idx,                  /* i  : Current Ratio_L index							Q0*/
+    Word32 fr_bands_LR_fx[][2 * NB_BANDS],       /* i  : energy in frequency bands (fr_bands_LR_fx_q)	fr_bands_LR_fx_q*/
+    Word16 fr_bands_LR_fx_q[CPE_CHANNELS],
+    const Word16 Etot_LR_fx[],          /* i  : total energy Left & Right channel						Q8*/
+    Word32 lf_E_LR_fx[][2 * VOIC_BINS], /* i  : per bin spectrum energy in lf, LR channels				(lf_E_LR_fx_q)*/
+    Word16 lf_E_LR_fx_q,
+    const Word16 localVAD_HE_SAD_LR[],        /* i  : HE-SAD flag without hangover, LR channels			Q0*/
+    Word32 band_energies_LR_fx[2 * NB_BANDS], /* o  : energy in critical bands without minimum noise floor E_MIN	(band_energies_LR_fx_q)*/
+    Word16 band_energies_LR_fx_q,
+    const Word16 flag_16k_smc,       /* i  : flag to indicate if the OL SMC is run at 16 kHz			Q0*/
+    const Word16 front_vad_flag,     /* i  : front-VAD flag to overwrite VAD decision					Q0*/
+    const Word16 force_front_vad,    /* i  : flag to force VAD decision									Q0*/
+    const Word16 front_vad_dtx_flag, /* i  : front-VAD DTX flag to overwrite VAD decision				Q0*/
+    const IVAS_FORMAT ivas_format,   /* i  : IVAS format												*/
+    const Word16 MCT_flag,           /* i  : hMCT handle allocated (1) or not (0)						Q0*/
+    const Word32 last_ivas_total_brate, /* i  : last IVAS total bitrate                                    Q0*/
+    const Word32 ivas_total_brate,   /* i  : IVAS total bitrate - for setting the DTX					Q0*/
+    Word16 *Q_new
+#ifdef DEBUG_MODE_INFO
+    ,
+    const Word16 ch_idx
+#endif
+);
+ivas_error pre_proc_ivas_fx(
+    Encoder_State *st,                     /* i/o: encoder state structure                 */
+    const Word16 last_element_mode,        /* i  : last element mode						Q0*/
+    const Word32 element_brate,            /* i  : element bitrate							Q0*/
+    const Word32 last_element_brate,       /* i  : last element bitrate						Q0*/
+    const Word16 input_frame,              /* i  : frame length								Q0*/
+    Word16 old_inp_12k8_fx[],              /* i/o: buffer of old input signal				Q_new-1 */
+    Word16 old_inp_16k_fx[],               /* i/o: buffer of old input signal @ 16kHz		Q_new-1 */
+    Word16 **inp_fx,                       /* o  : ptr. to inp. signal in the current frame	Q_new*/
+    Word32 *ener_fx,                       /* o  : residual energy from Levinson-Durbin		epsP_fx_q*/
+    Word16 A_fx[NB_SUBFR16k * ( M + 1 )],  /* i/o: A(z) unquantized for the 4 subframes		Q12*/
+    Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: weighted A(z) unquantized for subframes	Q14*/
+    Word32 epsP_fx[M + 1],                 /* i  : LP prediction errors						epsP_fx_q*/
+    Word16 *epsP_fx_q,                     /* i  : LP prediction errors						*/
+    Word16 lsp_new_fx[M],                  /* i/o: LSPs at the end of the frame				Q15*/
+    Word16 lsp_mid_fx[M],                  /* i/o: LSPs in the middle of the frame			Q15*/
+    Word16 *new_inp_resamp16k_fx,          /* o  : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE	Q_new-1*/
+    Word16 *Voicing_flag,                  /* o  : voicing flag for HQ FEC					Q0*/
+    Word16 old_wsp_fx[],                   /* i  : weighted input signal buffer				e_old_wsp*/
+    Word16 e_old_wsp,
+    const Word16 loc_harm,       /* i  : harmonicity flag									Q0*/
+    const Word16 vad_flag_dtx,   /* i  : HE-SAD flag with additional DTX HO					Q0*/
+    const Word16 MCT_flag,       /* i  : hMCT handle allocated (1) or not (0)				Q0*/
+    const Word16 vad_hover_flag, /* i  : VAD hangover flag									Q0*/
+    const Word16 flag_16k_smc,   /* i  : flag to indicate if the OL SMC is run at 16 kHz	Q0*/
+    Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX],	/* e_enerBuffer */
+    Word16 e_enerBuffer,
+    Word16 fft_buff_fx[2 * L_FFT], /* Qx */
+    Word16 cor_map_sum_fx,         /* Q8 */
+    Word16 *Q_new
+);
+/*! r: number of clipped samples */
+void ivas_initialize_handles_enc_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+ivas_error ivas_init_encoder(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+void ivas_destroy_enc_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+ivas_error ivas_initialize_MD_bstr_enc_fx(
+    BSTR_ENC_HANDLE *hBstr,                                     /* o  : encoder MD bitstream handle             */
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+void ivas_destroy_MD_bstr_enc_fx(
+    BSTR_ENC_HANDLE *hMetaData                                  /* i/o: encoder MD bitstream handle             */
+);
+
+ivas_error ivas_init_decoder_front(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+
+void ivas_mct_dec_close(
+    MCT_DEC_HANDLE *hMCT                                        /* i/o: MCT decoder structure                   */
+);
+
+/*! r: number of channels to be synthesised */
+
+void copy_decoder_config(
+    Decoder_Struct *st_ivas,                                    /* i  : IVAS decoder structure                  */
+    Decoder_State *st                                           /* o  : decoder state structure                 */
+);
+
+void ivas_initialize_handles_dec(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+ivas_error ivas_core_enc_fx(
+    SCE_ENC_HANDLE hSCE,                                         /* i/o: SCE encoder structure                  */
+    CPE_ENC_HANDLE hCPE,                                         /* i/o: CPE encoder structure                  */
+    MCT_ENC_HANDLE hMCT,                                         /* i/o: MCT encoder structure                  */
+    const Word16 n_CoreChannels,          /* i  : number of core channels to be coded     Q0*/
+    Word16 old_inp_12k8_fx[][L_INP_12k8], /* i  : buffer of old input signal              Q_new-1*/
+    Word16 old_inp_16k_fx[][L_INP],       /* i  : buffer of old input signal              Q_new-1*/
+    Word16 Q_new[],
+    Word32 ener_fx[],                                                /* i  : residual energy from Levinson-Durbin	epsP_fx_q*/
+    Word16 A_fx[][NB_SUBFR16k * ( M + 1 )],                          /* i  : A(z) unquantized for the 4 subframes    Q12*/
+    Word16 Aw_fx[][NB_SUBFR16k * ( M + 1 )],                         /* i  : weighted A(z) unquantized for subframes Q12*/
+    Word32 epsP_fx[][M + 1],                                         /* i  : LP prediction errors					epsP_fx_q*/
+    Word16 epsP_fx_q[],                                              /* i  : LP prediction errors                   */
+    Word16 lsp_new_fx[][M],                                          /* i  : LSPs at the end of the frame			Q15*/
+    Word16 lsp_mid_fx[][M],                                          /* i  : LSPs in the middle of the frame		Q15*/
+    const Word16 vad_hover_flag[],                                   /* i  : VAD hanglover flag                     Q0*/
+    Word16 attack_flag[],                                            /* i  : attack flag (GSC or TC)                Q0*/
+    Word32 realBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer                            q_re_im_buf*/
+    Word32 imagBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer                            q_re_im_buf*/
+    Word16 *q_re_im_buf,
+    Word16 old_wsp_fx[][L_WSP], /* i  : weighted input signal buffer            e_old_wsp*/
+    Word16 e_old_wsp[],
+    const Word16 loc_harm[],                       /* i  : harmonicity flag							Q0*/
+    const Word16 cor_map_sum_fx[],                 /* i  : speech/music clasif. parameter			Q8*/
+    const Word16 vad_flag_dtx[],                   /* i  : HE-SAD flag with additional DTX HO		Q0*/
+    Word32 enerBuffer_fx[][CLDFB_NO_CHANNELS_MAX], /* o  : energy buffer							enerBuffer_fx_exp*/
+    Word16 enerBuffer_fx_exp[],                    /* o  : energy buffer							*/
+    Word16 fft_buff_fx[][2 * L_FFT],               /* i  : FFT buffer								Qx*/
+    const Word16 tdm_SM_or_LRTD_Pri,               /* i  : channel combination scheme flag			Q0*/
+    const Word16 ivas_format,                      /* i  : IVAS format								Q0*/
+    const Word16 flag_16k_smc                      /* i  : flag to indicate if the OL SMC is run at 16 kHz	Q0*/
+);
+
+void ivas_renderer_select(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+ivas_error ivas_mc_enc_config_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+/*! r: flag indicating a valid bitrate */
+Word16 is_IVAS_bitrate_fx(
+  const Word32 ivas_total_brate                              /* i  : IVAS total bitrate                      */
+);
+
+int16_t is_DTXrate(
+    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * JBM prototypes
+ *----------------------------------------------------------------------------------*/
+
+ivas_error ivas_jbm_dec_set_discard_samples(
+    Decoder_Struct *st_ivas                                     /* i/o: main IVAS decoder structre                                  */
+);
+
+TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
+    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */
+);
+
+void ivas_jbm_dec_tc_buffer_close(
+    DECODER_TC_BUFFER_HANDLE *phTcBuffer                        /* i/o: TC buffer handle                                            */
+);
+
+void ivas_jbm_dec_td_renderers_adapt_subframes(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */
+);
+
+ivas_error ivas_jbm_dec_metadata_open(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */
+);
+
+void ivas_jbm_masa_sf_to_sf_map(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * ISM prototypes
+ *----------------------------------------------------------------------------------*/
+
+void bitbudget_to_brate(
+    const Word16 x[], /* i  : bitbudgets                        Q0  */
+    Word32 y[],       /* o  : bitrates                          Q0  */
+    const Word16 N    /* i  : number of entries to be converted   */
+);
+
+void ivas_ism_reset_metadata(
+    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handles                        */
+);
+
+void ivas_ism_reset_metadata_enc(
+    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */
+);
+void ivas_ism_reset_metadata_API(
+    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handles                        */
+);
+
+/*! r: index of the winning codeword */
+Word16 ism_quant_meta_fx(
+    const Word32 val,              /* i  : scalar value to quantize        Q22 */
+    Word32 *valQ,                  /* o  : quantized value                 Q22 */
+    const Word32 borders_fx[],     /* i  : level borders                   Q22 */
+    const Word32 q_step_fx,        /* i  : quantization step               Q22 */
+    const Word32 q_step_border_fx, /* i  : quantization step at the border Q22 */
+    const Word16 cbsize            /* i  : codebook size                       */
+);
+
+ivas_error ivas_ism_metadata_enc_create_fx(
+    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */
+    const Word16 n_ISms,                                       /* i  : number of objects                           */
+    Word32 element_brate_tmp[]                                 /* o  : element bitrate per object                  */
+);
+
+/*----------------------------------------------------------------------------------*
+ * Parametric ISM prototypes
+ *----------------------------------------------------------------------------------*/
+
+/*! r: ISM format mode */
+
+ivas_error ivas_param_ism_enc_open_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */
+);
+
+void ivas_param_ism_enc_close_fx(
+    PARAM_ISM_CONFIG_HANDLE *hParamIsm,                         /* i/o: ParamISM handle                             */
+    const Word32 input_Fs                                      /* i  : input sampling_rate                         */
+);
+
+void ivas_ism_metadata_close(
+    ISM_METADATA_HANDLE hIsmMetaData[],                         /* i/o  : object metadata handles                   */
+    const Word16 first_idx                                     /* i  : index of first handle to deallocate         */
+);
+
+
+ivas_error ivas_ism_enc_config(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */
+);
+
+/*----------------------------------------------------------------------------------*
+ * ISM DTX prototypes
+ *----------------------------------------------------------------------------------*/
+
+ivas_error ivas_ism_dtx_open(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */
+);
+
+void ivas_ism_metadata_sid_enc_fx(
+    ISM_DTX_HANDLE hISMDTX,                                     /* i/o: ISM DTX handle                              */
+    const Word16 flag_noisy_speech,                            /* i  : noisy speech flag                           */
+    const Word16 nchan_ism,                                    /* i  : number of objects                           */
+    const Word16 nchan_transport,                              /* i  : number of transport channels                */
+    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                    */
+    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */
+    const Word16 sid_flag,                                     /* i  : indication of SID frame                     */
+    const Word16 md_diff_flag[],                               /* i  : metadata differental flag                   */
+    BSTR_ENC_HANDLE hBstr,                                      /* i/o: bitstream handle                            */
+    Word16 nb_bits_metadata[]                                  /* o  : number of metadata bits                     */
+);
+
+
+
+void ivas_param_ism_compute_noisy_speech_flag_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure              */
+);
+
+/*----------------------------------------------------------------------------------*
+ * DFT Stereo prototypes
+ *----------------------------------------------------------------------------------*/
+
+void stereo_dft_dec_destroy(
+    STEREO_DFT_DEC_DATA_HANDLE *hStereoDft                      /* i/o: decoder DFT stereo handle           */
+);
+
+/*----------------------------------------------------------------------------------*
+ * Range Coder prototypes
+ *----------------------------------------------------------------------------------*/
+
+/*! r: Read bit */
+UWord16 rc_uni_dec_read_bit(
+    RangeUniDecState *rc_st_dec                                 /* i/o: RC state handle                     */
+);
+
+/*! r: Read bit */
+UWord16 rc_uni_dec_read_bit_prob_fast(
+    RangeUniDecState *rc_st_dec,                                /* i/o: RC state handle                     */
+    const Word16 freq0,                                        /* i  : Frequency for symbol 0              */
+    const UWord16 tot_shift                                    /* i  : Total frequency as a power of 2     */
+);
+
+/*! r: Read bits */
+UWord16 rc_uni_dec_read_bits(
+    RangeUniDecState *rc_st_dec,                                /* i/o: RC state handle                     */
+    const Word16 bits                                          /* i  : Number of bits                      */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * TD Stereo prototypes
+ *----------------------------------------------------------------------------------*/
+
+void tdm_bit_alloc(
+    const Word16 ivas_format,                                  /* i  : IVAS format                             */
+    const Word16 ism_mode,                                     /* i  : ISM mode in combined format             */
+    const Word32 element_brate_wo_meta,                        /* i  : element bitrate without metadata        */
+    const Word16 tdm_lp_reuse_flag,                            /* i  : LPC reusage flag                        */
+    Word32 *total_brate_pri,                                   /* o  : Allocated primary channel bitrate       */
+    Word32 *total_brate_sec,                                   /* o  : Allocated secondary channel bitrate     */
+    Word16 *tdm_low_rate_mode,                                 /* o  : secondary channel low rate mode flag    */
+    const Word16 coder_type,                                   /* i  : secondary channel coder type            */
+    const Word16 ener_ratio_idx,                               /* i  : correlation ratio indexe                */
+    const Word16 tdm_Pitch_reuse_flag,                         /* i  : primary channel pitch reuse flag        */
+    const Word16 bwidth_pri,                                   /* i  : bandwidth of the primary channel        */
+    const Word16 bwidth_sec,                                   /* i  : bandwidth of the secondary channel      */
+    const Word16 flag_ACELP16k_pri,                            /* i  : ACELP@16kHz core flag, primary chan.    */
+    const Word16 tdm_LRTD_flag,                                /* i  : LRTD stereo mode flag                   */
+    const Word16 coder_type0,                                  /* i  : coder type (temporary in the encoder, from bitstream in decoder) */
+    const Word16 tdm_inst_ratio_idx                            /* i  : instantaneous correlation ratio index   */
+);
+
+
+/*! r: value of the indice */
+uint16_t get_indice_st(
+    Decoder_State *st,                                          /* i/o: decoder state structure                 */
+    const Word32 element_brate,                                /* i  : element bitrate                         */
+    const Word16 pos,                                          /* i  : absolute position in the bitstream      */
+    const Word16 nb_bits                                       /* i  : number of bits to quantize the indice   */
+);
+
+/*----------------------------------------------------------------------------------*
+ * MDCT Stereo prototypes
+ *----------------------------------------------------------------------------------*/
+
+void stereo_mdct_core_enc_fx(
+    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */
+    Word16 new_samples[CPE_CHANNELS][L_INP],                     /* i  : new samples                             Q0*/
+    Word16 old_wsp[CPE_CHANNELS][L_WSP],                         /* i  : 12.8kHz weighted speech (for LTP        Qx*/
+    Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k]                  /* o  : floating pitch for each subframe     Q6*/
+);
+
+Word16 write_stereo_to_bitstream_fx
+(
+    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                    /* i/o: Stereo MDCT encoder structure           */
+    Encoder_State **sts,                                        /* i/o: Encoder state structure                 */
+    Word16 ms_mask[NB_DIV][MAX_SFB],                           /* i  : bandwise MS mask                         Q0*/
+    const Word16 mct_on,                                       /* i  : flag mct block (1) or stereo (0)         Q0*/
+    BSTR_ENC_HANDLE hBstr                                       /* i/o: bitstream handle                        */
+);
+
+/*----------------------------------------------------------------------------------*
+ * Stereo CNG prototypes
+ *----------------------------------------------------------------------------------*/
+void stereo_cng_dec_update(
+    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
+    const Word32 ivas_total_brate                              /* i  : IVAS total bitrate                    Q0*/
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * Framework general prototypes
+ *----------------------------------------------------------------------------------*/
+
+void mvc2c(
+    const uint8_t x[],                                          /* i  : input vector                            */
+    uint8_t y[],                                                /* o  : output vector                           */
+    const int16_t n                                             /* i  : vector size                             */
+);
+
+void stereo_switching_dec(
+    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
+    const Word32 ivas_total_brate                               /* i  : IVAS total bitrate                    Q0*/
+);
+
+
+/*! r: number of bits written */
+
+
+
+/*----------------------------------------------------------------------------------*
+ * MCT prototypes
+ *----------------------------------------------------------------------------------*/
+void ivas_mdct_core_whitening_enc_fx(
+    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */
+    Word16 new_samples_fx[CPE_CHANNELS][L_INP],                     /* i  : new samples                             */
+    Word16 old_wsp_fx[CPE_CHANNELS][L_WSP],                         /* i  : 12.8kHz weighted speech (for LTP        */
+    Word16 pitch_buf[CPE_CHANNELS][NB_SUBFR16k],                 /* o  : floating pitch for each subframe        */
+    Word32 *mdst_spectrum_long[CPE_CHANNELS],                    /* o  : buffer for MDST spectrum                */
+    Word16 tnsBits[CPE_CHANNELS][NB_DIV],                      /* o  : buffer TNS bits                         */
+    Word32 *orig_spectrum_long[CPE_CHANNELS],                    /* o  : origingal spectrum w/o whitening        */
+    Word16 tnsSize[CPE_CHANNELS][NB_DIV],                      /* o  : size of TNS                             */
+    Word16 p_param[CPE_CHANNELS][NB_DIV],                      /* o  : pointer to parameter array              */
+    BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */
+    const Word16 mct_on,                                       /* i  : flag mct block (1) or stereo (0)        */
+    const Word16 nChannels,                                     /* i  : total number of coded channels          */
+Word16 mdst_spectrum_e[CPE_CHANNELS][NB_DIV],
+Word16 orig_spectrum_e[CPE_CHANNELS][NB_DIV]
+);
+
+void splitAvailableBitsMCT_fx(
+    void **sts,                                                 /* i/o: encoder/decoder state structure         */
+    const Word16 total_bits,                                    /* i  : total number of available bits          */
+    const Word16 split_ratio[MCT_MAX_CHANNELS],                 /* i  : ratio for splitting the bits         Q0 */
+    const Word16 enc_dec,                                       /* i  : encoder or decoder flag                 */
+    const Word16 nchan                                          /* i  : number of channels                      */
+);
+
+void enc_prm_igf_mdct(
+    Encoder_State *st,                                          /* i  : Encoder state handle                    */
+    BSTR_ENC_HANDLE hBstr                                       /* i/o: Bitstream handle                        */
+);
+
+/*----------------------------------------------------------------------------------*
+ * Q Metadata prototypes for DirAC and MASA
+ *----------------------------------------------------------------------------------*/
+/*! r: number of bits written */
+
+/*! r: number of bits read */
+Word16 ivas_qmetadata_dec_decode(
+    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                       */
+    UWord16 *bitstream,                                        /* i  : bitstream                               */
+    Word16 *index,                                             /* i/o: bitstream position                      */
+    const Word16 hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode          */
+);
+
+/*! r: number of bits read */
+Word16 ivas_qmetadata_dec_decode_hr_384_512(
+    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: hQMetaData handle                       */
+    UWord16 *bitstream,                                        /* i  : bitstream                               */
+    Word16 *index,                                             /* i/o: bitstream position                      */
+    const SPHERICAL_GRID_DATA *sph_grid16,                      /* i  : spherical grid for deindexing           */
+    const Word16 bits_sph_idx,
+    const Word16 bits_sp_coh,
+    const UWord8 ncoding_bands_config
+);
+
+/*! r: number of bits read */
+Word16 ivas_qmetadata_dec_sid_decode(
+    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: q_metadata handle                       */
+    UWord16 *bitstream,                                        /* i  : bitstream                               */
+    Word16 *index,                                             /* i/o: bitstream position                      */
+    const Word16 nchan_transport,                              /* i  : number of transport channels            */
+    Word16 *element_mode,                                      /* o  : element mode                            */
+    const Word16 ivas_format                                   /* i  : IVAS format                             */
+);
+
+
+UWord16 ivas_qmetadata_reorder_generic_fx(
+    const Word16 signed_value 
+);
+
+void ivas_sba_set_cna_cng_flag(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+/*! r: number of ambisonics metadata channels */
+
+void ivas_sba_dirac_stereo_config(
+    STEREO_DFT_CONFIG_DATA_HANDLE hConfig                       /* o  : DFT stereo configuration                */
+);
+
+
+Word16 ivas_get_sba_dirac_stereo_flag(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * DirAC prototypes
+ *----------------------------------------------------------------------------------*/
+
+
+ivas_error ivas_dirac_enc_reconfigure(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                     */
+);
+
+ivas_error ivas_mc_paramupmix_enc_open_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                             */
+);
+
+void ivas_mc_paramupmix_enc_close_fx(
+    MC_PARAMUPMIX_ENC_HANDLE *hMCParamUpmix,                    /* i/o: MC Param-Upmix encoder handle                   */
+    const int32_t input_Fs                                      /* i  : input sampling rate                             */
+);
+
+ivas_error ivas_mc_paramupmix_dec_open(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */
+);
+
+void ivas_mc_paramupmix_dec_close(
+    MC_PARAMUPMIX_DEC_HANDLE *hMCParamUpmix_out                 /* i/o: Parametric MC decoder handle                    */
+);
+
+void ivas_mc_paramupmix_dec_read_BS(
+    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */
+    Decoder_State *st,                                          /* i/o: decoder state structure                         */
+    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix,                     /* i/o: decoder MC Param-Upmix handle                   */
+    Word16 *nb_bits                                            /* o  : number of bits written                          */
+);
+
+void ivas_mc_paramupmix_dec_digest_tc(
+    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */
+    const UWord8 nCldfbSlots,                                  /* i  : number of CLFBS slots in the transport channels */
+    const Word16 nSamplesForRendering                          /* i  : number of samples provided                      */
+);
+
+void ivas_param_mc_set_coded_bands_fx(
+    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC                  /* i/o: handle for the Parametric MC parameter coding state */
+);
+
+UWord16 ivas_param_mc_get_configuration_index_fx(
+    const MC_LS_SETUP mc_ls_setup, /* i  : MC ls setup              */
+    const Word32 ivas_total_brate  /* i  : IVAS total bitrate       */
+);
+
+/*----------------------------------------------------------------------------------*
+ * SPAR prototypes
+ *----------------------------------------------------------------------------------*/
+
+/* MD module */
+
+/*! r: number of MD subframes */
+ivas_error ivas_spar_md_dec_open(
+    ivas_spar_md_dec_state_t **hMdDec_out,                      /* i/o: SPAR MD decoder handle                  */
+    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */
+    const Word16 num_channels,                                 /* i  : number of internal channels             */
+    const Word16 sba_order,                                    /* i  : SBA order                               */
+    const Word16 sid_format,                                   /* i  : SID format                              */
+    const Word32 last_active_ivas_total_brate                  /* i  : IVAS last active bitrate                */
+);
+
+void ivas_spar_md_dec_close(
+    ivas_spar_md_dec_state_t **hMdDec                           /* i/o: SPAR MD decoder handle                  */
+);
+
+ivas_error ivas_spar_md_dec_init(
+    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */
+    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */
+    const Word16 num_channels,                                 /* i  : number of internal channels             */
+    const Word16 sba_order                                     /* i  : SBA order                               */
+);
+
+/* Transient detector module */
+ivas_error ivas_transient_det_open_fx(
+    ivas_trans_det_state_t **hTranDet,                          /* i/o: Transient detector handle               */
+    const Word32 sampling_rate                                 /* i  : sampling rate                           */
+);
+
+void ivas_transient_det_close_fx(
+    ivas_trans_det_state_t **hTranDet                           /* i/o: Transient detector handle               */
+);
+
+void ivas_huffman_encode_fx(
+    ivas_huffman_cfg_t *huff_cfg,
+    Word16 in,
+    Word16 *hcode,
+    Word16 *hlen
+);
+
+ivas_error ivas_huffman_decode(
+    ivas_huffman_cfg_t *huff_cfg,
+    Decoder_State *st0,
+    Word16 *dec_out
+);
+
+void ivas_arith_decode_cmplx_cell_array(
+    ivas_arith_t *pArith_re,
+    ivas_arith_t *pArith_re_diff,
+    Decoder_State *st0,
+    ivas_cell_dim_t *pCell_dims,
+    Word16 *pDo_diff, const Word16 nB,
+    Word16 *pSymbol_re,
+    Word16 *pSymbol_re_old
+);
+
+void ivas_map_prior_coeffs_quant(
+    ivas_spar_md_prev_t *pSpar_md_prior,
+    ivas_spar_md_com_cfg *pSpar_md_cfg,
+    const Word16 qsi,
+    const Word16 nB
+);
+
+void ivas_clear_band_coeff_idx( 
+    ivas_band_coeffs_ind_t *pband_coeff_idx, 
+    const UWord16 num_bands 
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * MASA prototypes
+ *----------------------------------------------------------------------------------*/
+ivas_error ivas_masa_enc_open_fx(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder handle                             */
+);
+
+void ivas_masa_enc_close_fx(
+    MASA_ENCODER_HANDLE *hMasa                                  /* i/o: MASA metadata structure                         */
+);
+
+int16_t ivas_qmetadata_encode_extended_gr_length_fx(
+    const UWord16 value,
+    const UWord16 alphabet_size,
+    const Word16 gr_param);
+
+void ivas_qmetadata_encode_extended_gr_fx(
+    BSTR_ENC_HANDLE hMetaData,                                 /* i/o: q_metadata handle                                */
+    const UWord16 value,                                      /* i  : value to be encoded                              */
+    const UWord16 alphabet_size,                              /* i  : alphabet size                                    */
+    const Word16 gr_param);                                   /* i  : GR order                                         */
+
+
+void ivas_set_qmetadata_maxbit_req_fx(
+    IVAS_QMETADATA_HANDLE hQMetaData,                           /* o  : qmetadata structure where the requirement value is set */
+    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                     */
+);
+
+
+/*---------------------------------------------------------------------------------*
+ * Binaural FastConv Renderer Prototypes
+*-----------------------------------------------------------------------------------*/
+
+
+void ivas_binaural_hrtf_close(
+    HRTFS_FASTCONV_HANDLE *hHrtfFastConv                        /* i/o: decoder binaural hrtf handle                    */
+);
+
+/*----------------------------------------------------------------------------------*
+ * renderer prototypes
+ *----------------------------------------------------------------------------------*/
+
+void ivas_ism_renderer_close(
+    ISM_RENDERER_HANDLE *hIsmRendererData                       /* i/o: ISM renderer handle                             */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * Amplitude Panning VBAP prototypes
+ *----------------------------------------------------------------------------------*/
+
+void panning_wrap_angles(
+    const float azi_deg,                                        /* i  : azimuth in degrees for panning direction (positive left) */
+    const float ele_deg,                                        /* i  : elevation in degrees for panning direction (positive up) */
+    float *azi_wrapped,                                         /* o  : wrapped azimuth component                                */
+    float *ele_wrapped                                          /* o  : wrapped elevation component                              */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * McMASA prototypes
+ *----------------------------------------------------------------------------------*/
+
+
+ivas_error ivas_mcmasa_dec_reconfig(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder handle                              */
+);
+
+void ivas_mcmasa_dmx_modify_fx(
+  const Word16 n_samples,                                             /* i  : input frame length in samples                        */
+  Word32 dmx_fx[][L_FRAME48k + NS2SA(48000, IVAS_FB_ENC_DELAY_NS)], /* i/o: downmix signal to be transformed into another format Qx*/
+  Word16 dmx_Q[],                                                     /* i/o : Q of the intput signal which is being transformed*/
+  const Word16 n_chnls_dmx_old,                                       /* i  : number of downmix channels in the old format        Q0 */
+  const Word16 n_chnls_dmx_new                                      /* i  : number of downmix channels in the target format      Q0*/
+);
+
+ivas_error ivas_mono_dmx_renderer_open(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */
+);
+
+
+void ivas_mono_dmx_renderer_close(
+    MONO_DOWNMIX_RENDERER_HANDLE *hMonoDmxRenderer              /* i/ i/o: Mono downmix structure                       */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * LFE encoder low pass filter prototypes
+ *----------------------------------------------------------------------------------*/
+
+void ivas_lfe_lpf_enc_close_fx(
+    ivas_filters_process_state_t **hLfeLpf                      /* i/o: LFE LPF handle                          */
+);
+
+
+/*----------------------------------------------------------------------------------*
+ * LFE Coding prototypes
+ *----------------------------------------------------------------------------------*/
+
+ivas_error ivas_create_lfe_enc_fx(
+    LFE_ENC_HANDLE *hLFE,                                       /* o  : IVAS LFE encoder structure              */
+    const Word32 input_Fs                                      /* i  : input sampling rate                     */
+);
+
+void ivas_lfe_enc_close_fx( 
+    LFE_ENC_HANDLE *hLFE                                        /* i/o: LFE encoder handle                      */
+);
+
+void ivas_filters_init_fx(
+    ivas_filters_process_state_t *filter_state, /* i/o: filter state handle     */
+    const Word32 *filt_coeff_fx,                /* i  : filter coefficients Q31- *filt_coeff_e   */
+    const Word16 *filt_coeff_e,                 /* i  : exponents of filter coefficients */
+    const Word16 order ) ;
+
+void ivas_filter_process_fx(
+    ivas_filters_process_state_t *filter_state, /* i/o: filter state handle             */
+    Word32 *pIn_Out_fx,                         /* i/o: signal subject to filtering Q(q_factor)   */
+    const Word16 length,                        /* i  : filter order                    */
+    Word16 q_factor );
+
+/*----------------------------------------------------------------------------------*
+ * OSBA prototypes
+ *----------------------------------------------------------------------------------*/
+ivas_error ivas_osba_enc_reconfig(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+);
+
+void ivas_set_surplus_brate_enc(
+    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */
+#ifdef DEBUG_MODE_INFO
+    ,
+    const int16_t *nb_bits_metadata                             /* i  : number of metadata bits                 */
+#endif
+);
+
+void ivas_set_surplus_brate_dec(
+    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
+    int32_t *ism_total_brate                                    /* i  : ISM total bitrate                       */
+);
+
+ivas_error ivas_omasa_separate_object_renderer_open(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+void ivas_omasa_separate_object_renderer_close(
+    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
+);
+
+/*----------------------------------------------------------------------------------*
+ * Filter-bank (FB) Mixer
+ *----------------------------------------------------------------------------------*/
+
+ivas_error ivas_fb_set_cfg(
+    IVAS_FB_CFG **pFb_cfg_out,                                  /* o  : FB config. handle                           */
+    const Word16 ivas_format,                                  /* i  : IVAS format                                 */
+    const Word16 num_in_chans,                                 /* i  : number of FB input channels                 */
+    const Word16 num_out_chans,                                /* i  : number of FB output channels                */
+    const Word16 active_w_mixing,                              /* i  : active_w_mixing flag                        */
+    const Word32 sampling_Fs,                                  /* i  : sampling rate                               */
+    const Word16 nachan_dirac_ana                              /* i  : number of DirAR analysis channels           */
+);
+
+
+/*=============================================================================================*/
+
 #endif
diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com_fx.c
similarity index 90%
rename from lib_com/ivas_qmetadata_com.c
rename to lib_com/ivas_qmetadata_com_fx.c
index 85d4332e0d8806efd57e95234d109bd47bf7a92a..a5fbf9e83c6d8c0c3b21f77d0a96f8d889f4543a 100644
--- a/lib_com/ivas_qmetadata_com.c
+++ b/lib_com/ivas_qmetadata_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,11 +36,9 @@
 #include "options.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
@@ -154,10 +152,8 @@ ivas_error ivas_qmetadata_allocate_memory_fx(
                 {
                     set32_fx( hQMetaData->q_direction[dir].band_data[j].elevation_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
                     set32_fx( hQMetaData->q_direction[dir].band_data[j].azimuth_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
-#ifdef MSAN_FIX
                     set32_fx( hQMetaData->q_direction[dir].band_data[j].q_elevation_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
                     set32_fx( hQMetaData->q_direction[dir].band_data[j].q_azimuth_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
-#endif
                     set32_fx( hQMetaData->q_direction[dir].band_data[j].energy_ratio_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
                 }
             }
@@ -317,14 +313,8 @@ ivas_error only_reduce_bits_direction_fx(
     Word16 *bits_dir0;
 
     Word16 bits_sph_idx_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES];
-#ifdef FIX_QMETADATA_PENALTY
     Word32 penalty[MASA_MAXIMUM_CODING_SUBBANDS];
     Word16 tmp;
-#else
-    Word16 penalty[MASA_MAXIMUM_CODING_SUBBANDS];
-    Word16 shift, tmp, tmp_e, flag;
-    Word32 tmp_32;
-#endif
     FOR( j = 0; j < coding_subbands; j++ )
     {
         FOR( k = 0; k < no_subframes; k++ )
@@ -409,7 +399,6 @@ ivas_error only_reduce_bits_direction_fx(
     }
     ELSE
     {
-#ifdef FIX_QMETADATA_PENALTY
 
         Word16 m, sorted, index1, index2;
 
@@ -457,67 +446,6 @@ ivas_error only_reduce_bits_direction_fx(
                 }
             }
         }
-
-
-#else
-        FOR( j = 0; j < coding_subbands; j++ )
-        {
-            penalty[j] = 0;
-            move16();
-            tmp_32 = 0;
-            move32();
-            shift = find_guarded_bits_fx( no_subframes );
-
-            flag = 1;
-            move16();
-            // This change was done due to loss of precision from BASOP_Util_Divide3232_Scale which was leading to penalty getting calculated wrongly
-            // and hence ind_order being sorted incorrectly which might cause infinite loop.
-            FOR( k = 0; k < no_subframes - 1; k++ )
-            {
-                IF( NE_16( bits_sph_idx_orig[j][k], bits_sph_idx_orig[j][k + 1] ) )
-                {
-                    flag = 0;
-                    move16();
-                }
-            }
-
-            IF( flag )
-            {
-                tmp = 0;
-                move16();
-                FOR( k = 0; k < no_subframes; k++ )
-                {
-                    IF( bits_sph_idx_orig[j][k] > 0 )
-                    {
-                        tmp = add( tmp, sub( bits_sph_idx_orig[j][k], q_direction->band_data[j].bits_sph_idx[k] ) );
-                    }
-                }
-
-                tmp = BASOP_Util_Divide1616_Scale( tmp, bits_sph_idx_orig[j][0], &tmp_e );
-
-                tmp_32 = L_shl( tmp, tmp_e ); /* Q15 */
-
-                penalty[j] = extract_l( L_shr( tmp_32, shift ) ); /* Q15 - shift */
-                move16();
-                // Division by no_subframes for penalty[j] not required
-            }
-            ELSE
-            {
-                FOR( k = 0; k < no_subframes; k++ )
-                {
-                    IF( bits_sph_idx_orig[j][k] > 0 )
-                    {
-                        tmp = BASOP_Util_Divide3232_Scale( extract_l( L_sub( bits_sph_idx_orig[j][k], q_direction->band_data[j].bits_sph_idx[k] ) ), bits_sph_idx_orig[j][k], &tmp_e );
-                        tmp_32 = L_add( tmp_32, L_shl( tmp, tmp_e ) );
-                    }
-                }
-                penalty[j] = extract_l( L_shr( tmp_32, shift ) ); /* Q15 - shift */
-                move16();
-                // Division by no_subframes for penalty[j] not required
-            }
-        }
-        sort_desc_ind_16_fx( penalty, coding_subbands, ind_order );
-#endif
     }
 
     *reduce_bits_out = negate( reduce_bits );
diff --git a/lib_com/ivas_qspherical_com.c b/lib_com/ivas_qspherical_com_fx.c
similarity index 98%
rename from lib_com/ivas_qspherical_com.c
rename to lib_com/ivas_qspherical_com_fx.c
index c3608d2483461da35ca25d976d69b74c104eb179..844c3ecdef2cdd60899fb73e3e549a35e4ee9e1b 100644
--- a/lib_com/ivas_qspherical_com.c
+++ b/lib_com/ivas_qspherical_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,13 +36,10 @@
 #include <math.h>
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 
@@ -317,9 +314,9 @@ Word16 quantize_phi_enc_fx(
     Word32 temp_res;
     Word16 temp_e;
 
-    delta_phi_fx = BASOP_Util_Divide3232_Scale_cadence( 360, n, &temp_e );
+    delta_phi_fx = BASOP_Util_Divide3232_Scale_newton( 360, n, &temp_e );
     delta_phi_fx = L_shl( delta_phi_fx, sub( temp_e, 9 ) );
-    inv_delta_phi_fx = BASOP_Util_Divide3232_Scale_cadence( n, 360, &temp_e );
+    inv_delta_phi_fx = BASOP_Util_Divide3232_Scale_newton( n, 360, &temp_e );
 
     IF( EQ_16( n, 1 ) )
     {
@@ -664,7 +661,7 @@ Word16 quantize_phi_chan_compand_fx(
 
     /* quantize companded value */
     // delta_phi = 360.0f / (float) n;
-    delta_phi = BASOP_Util_Divide3232_Scale_cadence( 360, n, &tmp_e );
+    delta_phi = BASOP_Util_Divide3232_Scale_newton( 360, n, &tmp_e );
     delta_phi = L_shr( delta_phi, sub( 9, tmp_e ) ); // Q22
     // id_phi = (int16_t) round_f( ( phi / (float) delta_phi ) );
     id_phi = BASOP_Util_Divide3232_Scale( phi, delta_phi, &tmp_e ); // Q15
diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c
index 5a864835cf67f9c253d74e680c78ae94eb14a267..560d1ee8e90fbaae2b3a51d6d758f140bef10ed7 100644
--- a/lib_com/ivas_rom_com.c
+++ b/lib_com/ivas_rom_com.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h
index b58e183ebda207962993ac3a75678cbc2ef4ce1d..6004760e31a69763dc430d498db97f83fa238e66 100644
--- a/lib_com/ivas_rom_com.h
+++ b/lib_com/ivas_rom_com.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/ivas_rom_com_fx.c b/lib_com/ivas_rom_com_fx.c
index ac47365616ae6dc38b6b80d115ebd47bb02c3e3e..e7ee30e8d54ce02c2ff4f261dceb3d806c2f1d40 100644
--- a/lib_com/ivas_rom_com_fx.c
+++ b/lib_com/ivas_rom_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -1356,6 +1356,16 @@ const UWord32 tdm_ratio_tabl_fx[TDM_NQ + 1] = {
     2147483647, 2147483647, 2147483647
 };
 
+// Q30
+const Word32 tdm_ratio_tabl_fx_Q30[] = {
+    0, 0, 11703786, 26306674, 46385648, 71940704, 102542344, 137868448,
+    177596896, 221298192, 268435456, 318471840, 370977792, 425201760, 480714208,
+    536870912, 593027584, 648540032, 702764032, 755270016, 805306368, 852443648,
+    896144896, 935873344, 971199488, 1001801152, 1027356160, 1047435136,
+    1062038016, 1073741824, 1073741824, 1073741824
+};
+
+
 // Q24
 const Word32 tdm_ratio_tabl_fx_Q24[TDM_NQ + 1] = {
     0, 0, 182871, 411041, 724775, 1124073, 1602224, 2154194,
@@ -1535,6 +1545,7 @@ const Word16 ivas_param_mc_quant_icc_fx[PARAM_MC_SZ_ICC_QUANTIZER] = {
 
 /* from 1 to 11 bits*/ /*q factor = 8*/
 const Word32 no_phi_masa_inv_fx[NO_SPHERICAL_GRIDS][MAX_NO_THETA] = {
+#ifndef FIX_1379_MASA_ANGLE_ROUND
     { 1073741824 },
     { 536870912 },
     { 536870912, 1073741824 },
@@ -1546,8 +1557,22 @@ const Word32 no_phi_masa_inv_fx[NO_SPHERICAL_GRIDS][MAX_NO_THETA] = {
     { 44739242, 45691141, 47721858, 52377649, 61356675, 76695844, 107374182, 178956970, 1073741824, 2147483647 },
     { 35791394, 35791394, 37025580, 38347922, 39768215, 42949672, 46684427, 52377649, 59652323, 71582788, 93368854, 126322567, 214748364, 2147483647 },
     { 24129029, 24129029, 24403223, 24970740, 25565281, 26512143, 27889398, 29417584, 31580641, 34087042, 37675151, 42107522, 48806446, 56512727, 71582788, 93368854, 143165576, 268435456, 2147483647 }
+#else
+    { 1073741824 },
+    { 536870912 },
+    { 536870912, 1073741824 },
+    { 268435456, 536870912 },
+    { 178956971, 306783378, 1073741824, 2147483647 },
+    { 153391689, 165191050, 238609294, 1073741824, 2147483647 },
+    { 97612893, 102261126, 126322568, 195225786, 715827883, 2147483647 },
+    { 65075262, 67108864, 74051160, 93368854, 126322568, 238609294, 2147483647 },
+    { 44739243, 45691141, 47721859, 52377650, 61356676, 76695845, 107374182, 178956971, 1073741824, 2147483647 },
+    { 35791394, 35791394, 37025580, 38347922, 39768216, 42949673, 46684427, 52377650, 59652324, 71582788, 93368854, 126322568, 214748365, 2147483647 },
+    { 24129030, 24129030, 24403223, 24970740, 25565282, 26512144, 27889398, 29417584, 31580642, 34087042, 37675152, 42107523, 48806447, 56512728, 71582788, 93368854, 143165577, 268435456, 2147483647 },
+#endif
 };
 
+
 const Word32 azimuth_cb_fx[8] = {
     0, -754974720, -377487360, 377487360, -188743680, 188743680, -566231040, 566231040
 };
@@ -1579,15 +1604,22 @@ const Word16 coherence_cb0_masa_Q14[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] =
 
 // q = 21
 const Word32 coherence_cb0_masa_fx[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] = {
-    100243, 534144, 1156579, 2068840, 2846464, 3531184, 4125936, 0, 253965, 864655, 1467377,
-    2129448, 2977326, 3768791, 0, 0, 338480, 1189924, 2035915, 2872888, 3640026, 0, 0, 0,
-    492621, 1532179, 2527278, 3470157, 0, 0, 0, 0, 499331, 1506803, 2465831, 3425697, 0,
-    0, 0, 0, 503316, 1473668, 2392221, 3406404, 0, 0, 0, 0, 737778, 1970903, 3450654, 0, 0,
-    0, 0, 0, 2097152, 0, 0, 0, 0, 0, 0, 0, 303038, 719742, 1122186, 1577897, 2117075, 2770337,
-    3648834, 0, 419849, 932603, 1440533, 2011797, 2745172, 3571240, 0, 0, 548824, 1165177,
-    1812987, 2555379, 3366138, 0, 0, 0, 695835, 1428160, 2190475, 3084910, 0, 0, 0, 0, 697093,
-    1381603, 2092957, 2970406, 0, 0, 0, 0, 708417, 1396283, 2099039, 2992426, 0, 0, 0, 0, 835924,
-    1728892, 2836607, 0, 0, 0, 0, 0, 2097152, 0, 0, 0, 0, 0, 0, 0
+    100244, 534145, 1156579, 2068841, 2846465, 3531185, 4125937, 0,
+    253965, 864656, 1467377, 2129448, 2977327, 3768792, 0, 0,
+    338480, 1189924, 2035915, 2872889, 3640027, 0, 0, 0,
+    492621, 1532179, 2527278, 3470158, 0, 0, 0, 0,
+    499332, 1506804, 2465831, 3425698, 0, 0, 0, 0,
+    503316, 1473669, 2392221, 3406404, 0, 0, 0, 0,
+    737778, 1970904, 3450654, 0, 0, 0, 0, 0,
+    2097152, 0, 0, 0, 0, 0, 0, 0,
+    303038, 719743, 1122186, 1577897, 2117075, 2770338, 3648835, 0,
+    419850, 932604, 1440534, 2011798, 2745172, 3571240, 0, 0,
+    548825, 1165178, 1812988, 2555380, 3366139, 0, 0, 0,
+    695835, 1428161, 2190475, 3084911, 0, 0, 0, 0,
+    697093, 1381604, 2092958, 2970406, 0, 0, 0, 0,
+    708418, 1396284, 2099040, 2992426, 0, 0, 0, 0,
+    835925, 1728892, 2836608, 0, 0, 0, 0, 0,
+    2097152, 0, 0, 0, 0, 0, 0, 0
 };
 
 // q = 15
@@ -1601,29 +1633,31 @@ const Word16 coherence_cb1_masa_Q15[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBAN
 
 // q = 21
 const Word32 coherence_cb1_masa_fx[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBANDS] = {
-    -3984, 544630, -565392, 1314704, -1320157, -11534, 541484, -583847, 1357486, -1371118,
-    -6081, 525546, -551551, 1362729, -1371537, -838, 533934, -540855, 1436758, -1414109,
-    3565, 528692, -519883, 1513514, -1500931
+    -3985, 544630, -565392, 1314705, -1320157,
+    -11534, 541485, -583847, 1357487, -1371118,
+    -6082, 525546, -551551, 1362729, -1371537,
+    -839, 533935, -540856, 1436759, -1414110,
+    3565, 528692, -519884, 1513515, -1500932
 };
 
 /* Multi-channel input and output setups */
-const int16_t ls_azimuth_CICP2_idx[2] = { 1, 2 };
-const int16_t ls_elevation_CICP2_idx[2] = { 0, 0 };
+const Word16 ls_azimuth_CICP2_idx[2] = { 1, 2 };
+const Word16 ls_elevation_CICP2_idx[2] = { 0, 0 };
 
-const int16_t ls_azimuth_CICP6_idx[5] = { 1, 2, 0, 7, 8 };
-const int16_t ls_elevation_CICP6_idx[5] = { 0, 0, 0, 0, 0 };
+const Word16 ls_azimuth_CICP6_idx[5] = { 1, 2, 0, 7, 8 };
+const Word16 ls_elevation_CICP6_idx[5] = { 0, 0, 0, 0, 0 };
 
-const int16_t ls_azimuth_CICP12_idx[7] = { 1, 2, 0, 7, 8, 9, 10 };
-const int16_t ls_elevation_CICP12_idx[7] = { 0, 0, 0, 0, 0, 0, 0 };
+const Word16 ls_azimuth_CICP12_idx[7] = { 1, 2, 0, 7, 8, 9, 10 };
+const Word16 ls_elevation_CICP12_idx[7] = { 0, 0, 0, 0, 0, 0, 0 };
 
-const int16_t ls_azimuth_CICP14_idx[7] = { 1, 2, 0, 7, 8, 1, 2 };
-const int16_t ls_elevation_CICP14_idx[7] = { 0, 0, 0, 0, 0, 3, 4 };
+const Word16 ls_azimuth_CICP14_idx[7] = { 1, 2, 0, 7, 8, 1, 2 };
+const Word16 ls_elevation_CICP14_idx[7] = { 0, 0, 0, 0, 0, 3, 4 };
 
-const int16_t ls_azimuth_CICP16_idx[9] = { 1, 2, 0, 7, 8, 1, 2, 7, 8 };
-const int16_t ls_elevation_CICP16_idx[9] = { 0, 0, 0, 0, 0, 3, 3, 3, 3 };
+const Word16 ls_azimuth_CICP16_idx[9] = { 1, 2, 0, 7, 8, 1, 2, 7, 8 };
+const Word16 ls_elevation_CICP16_idx[9] = { 0, 0, 0, 0, 0, 3, 3, 3, 3 };
 
-const int16_t ls_azimuth_CICP19_idx[11] = { 1, 2, 0, 9, 10, 5, 6, 1, 2, 9, 10 };
-const int16_t ls_elevation_CICP19_idx[11] = { 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3 };
+const Word16 ls_azimuth_CICP19_idx[11] = { 1, 2, 0, 9, 10, 5, 6, 1, 2, 9, 10 };
+const Word16 ls_elevation_CICP19_idx[11] = { 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3 };
 
 const Word32 shoebox_sin_cos_tbl_fx[11][2] = { { 0, 1073741824 }, // 0
                                                { 536870912, 929887680 },
diff --git a/lib_com/ivas_rom_com_fx.h b/lib_com/ivas_rom_com_fx.h
index 88bbaabbc1ff3dc34004d6192170ae7b2639044d..3344a35d208b8ed225895c9bab0f66db88ac7978 100644
--- a/lib_com/ivas_rom_com_fx.h
+++ b/lib_com/ivas_rom_com_fx.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -108,6 +108,7 @@ extern const Word16 pow_10_icbwe_gsMappingDFT_tbl_fx[];
  *----------------------------------------------------------------------------------*/
 
 extern const UWord32 tdm_ratio_tabl_fx[TDM_NQ + 1];
+extern const Word32 tdm_ratio_tabl_fx_Q30[TDM_NQ + 1];
 extern const Word32 tdm_ratio_tabl_fx_Q24[TDM_NQ + 1];
 extern const UWord32 tdm_den_ratio_tabl_fx[];
 extern const Word16 icbwe_gsMapping_tbl_fx[];    // Q12
diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config_fx.c
similarity index 99%
rename from lib_com/ivas_sba_config.c
rename to lib_com/ivas_sba_config_fx.c
index 370e8caa4db8076b09502f24bb7f344d85f8ba0f..b3a0806d4af63519605efa1c7ff5da40ba095d2e 100644
--- a/lib_com/ivas_sba_config.c
+++ b/lib_com/ivas_sba_config_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,8 +37,7 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_stat_com.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
diff --git a/lib_com/ivas_sns_com_fx.c b/lib_com/ivas_sns_com_fx.c
index 5931c4ea1345e88bdad1ca30b998dfbcae89a882..f1e44be78bdfea1016e77b24dd00e2433ca3d2cb 100644
--- a/lib_com/ivas_sns_com_fx.c
+++ b/lib_com/ivas_sns_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,9 +33,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include <math.h>
@@ -62,12 +60,11 @@ void sns_compute_scf_fx(
     Word64 sum;
     Word32 L_tmp;
     const Word32 *pow_tilt;
+    Word16 q_shift, q_out, f_tmp;
+    Word16 bw, inv_bw, exp;
     const UWord8 nBands = pPsychParams->nBands;
     move16();
     const UWord8 *bandLengths = pPsychParams->bandLengths;
-    Word8 bw = 0;
-    move16();
-    Word16 q_shift;
 
     const Word16 w_0 = 2730; // (1.0f / 12.0f) in Q15
     move16();
@@ -89,91 +86,83 @@ void sns_compute_scf_fx(
 
     IF( bandLengths == NULL )
     {
-        bw = (Word8) shr( L_frame, 6 );
+        bw = shr( L_frame, 6 );
         move16();
+
+        exp = norm_s( bw );
+        inv_bw = div_s( ONE_IN_Q14, shl( bw, exp ) ); // Q:15+14-exp = 29-exp
+        inv_bw = shl( inv_bw, sub( exp, 14 ) );       // Q15
+
         /* Energy per band */
         k = 0;
         move16();
         FOR( i = 0; i < nBands; ++i )
         {
-            x_64[i] = 0;
+            sum = 0;
             move64();
             FOR( n = 0; n < bw; ( ++n, ++k ) )
             {
-                x_64[i] = W_add( x_64[i], W_deposit32_l( spectrum[k] ) ); // Q_in
-                move64();
+                /* x[i] += spectrum[k];
+                   inv_bw is for x[i] /= bw; */
+                sum = W_mac_32_16( sum, spectrum[k], inv_bw ); // Q_in+15+1
             }
+            x_64[i] = sum; // Q_in+16
+            move64();
         }
     }
     ELSE
     {
         /* Energy per band */
         k = 0;
-        move32();
+        move16();
         FOR( i = 0; i < nBands; ++i )
         {
-            x_64[i] = 0;
+            exp = norm_s( bandLengths[i] );
+            inv_bw = div_s( ONE_IN_Q14, shl( bandLengths[i], exp ) ); // Q:15+14-exp
+            inv_bw = shl( inv_bw, sub( exp, 14 ) );                   // Q15
+
+            sum = 0;
             move64();
             FOR( n = 0; n < bandLengths[i]; ( ++n, ++k ) )
             {
-                x_64[i] = W_add( x_64[i], W_deposit32_l( spectrum[k] ) ); // Q_in
-                move64();
+                /* x[i] += spectrum[k];
+                   inv_bw is for x[i] /= bandLengths[i]; */
+                sum = W_mac_32_16( sum, spectrum[k], inv_bw ); // Q_in+15+1
             }
+            x_64[i] = sum; // Q_in+16
+            move64();
         }
     }
 
     /* Move accumulated values to 32-bit */
-    q_shift = 0;
-    move16();
-    IF( x_64[0] != 0 )
-    {
-        q_shift = W_norm( x_64[0] );
-    }
-    FOR( i = 1; i < nBands; ++i )
+    q_shift = W_norm_arr( x_64, nBands ); // W_norm_arr return 63 when all the values of the input buffer are zeroes
+    IF( EQ_16( q_shift, 63 ) )
     {
-        IF( x_64[i] != 0 )
-        {
-            q_shift = s_min( q_shift, W_norm( x_64[i] ) );
-        }
-    }
-    FOR( i = 0; i < nBands; ++i )
-    {
-        x[i] = W_extract_l( W_shl( x_64[i], sub( q_shift, 32 ) ) ); // Q_in + (q_shift - 32)
-    }
+        /* If all the values of x_64 are zeros, the scale factor (scf) values will be calculated as zeroes as per the below operations.
+           To avoid extra computations in such a case, set scf values as zeroes and return. */
 
-    IF( bandLengths == NULL )
-    {
-        Word16 inv_bw;
-        bw = (Word8) shr( L_frame, 6 );
-        move16();
-        inv_bw = div_l( ONE_IN_Q16 /*1 Q16*/, bw ); // Q15
-        FOR( i = 0; i < nBands; ++i )
-        {
-            x[i] = Mpy_32_16_1( x[i], inv_bw ); // Q_in + (q_shift - 32)
-            move32();
-        }
+        set_zero_fx( scf, SNS_NPTS );
+
+        return;
     }
-    ELSE
+
+    FOR( i = 0; i < nBands; ++i )
     {
-        FOR( i = 0; i < nBands; ++i )
-        {
-            Word16 inv_bw = div_l( ONE_IN_Q16 /*1 Q16*/, bandLengths[i] ); // Q15
-            x[i] = Mpy_32_16_1( x[i], inv_bw );                            // Q_in + (q_shift - 32)
-            move32();
-        }
+        x[i] = W_extract_h( W_shl( x_64[i], q_shift ) ); // Q: Q_in+16+q_shift-32 = Q_in+q_shift-16
+        move32();
     }
 
     /* Smoothing */
-    xs[0] = L_add( Mpy_32_16_1( x[0], 24576 /* 0.75 in Q15 */ ), Mpy_32_16_1( x[1], 8192 /* 0.25 in Q15 */ ) ); // Q_in + (q_shift - 32)
+    xs[0] = Madd_32_16( Mpy_32_16_1( x[0], 24576 /* 0.75 in Q15 */ ), x[1], 8192 /* 0.25 in Q15 */ ); // Q_in+q_shift-16
     move32();
 
     FOR( i = 1; i < FDNS_NPTS - 1; i++ )
     {
-        xs[i] = L_add( L_add( Mpy_32_16_1( x[i], 16384 /* 0.5 in Q15 */ ), Mpy_32_16_1( x[i - 1], 8192 /* 0.25 in Q15 */ ) ), Mpy_32_16_1( x[i + 1], 8192 /* 0.25 in Q15 */ ) ); // Q_in + (q_shift - 32)
+        xs[i] = Madd_32_16( Madd_32_16( Mpy_32_16_1( x[i], 16384 /* 0.5 in Q15 */ ), x[i - 1], 8192 /* 0.25 in Q15 */ ), x[i + 1], 8192 /* 0.25 in Q15 */ ); // Q_in+q_shift-16
         move32();
     }
 
-    xs[FDNS_NPTS - 1] = L_add( Mpy_32_16_1( x[FDNS_NPTS - 1], 24576 /* 0.75 in Q15 */ ), Mpy_32_16_1( x[FDNS_NPTS - 2], 8192 /* 0.25 in Q15 */ ) ); // Q_in + (q_shift - 32)
+    xs[FDNS_NPTS - 1] = Madd_32_16( Mpy_32_16_1( x[FDNS_NPTS - 1], 24576 /* 0.75 in Q15 */ ), x[FDNS_NPTS - 2], 8192 /* 0.25 in Q15 */ ); // Q_in+q_shift-16
     move32();
 
     /* Pre-emphasis */
@@ -195,86 +184,90 @@ void sns_compute_scf_fx(
 
     FOR( i = 0; i < FDNS_NPTS; i++ )
     {
-        xs[i] = Mpy_32_32( xs[i], pow_tilt[i] ); // Q_in + (q_shift - 32)
+        xs[i] = Mpy_32_32( xs[i], pow_tilt[i] ); // Q_in+q_shift-16+23-31 = Q_in+q_shift-24
         move32();
     }
 
     /* Noise floor at -40dB */
     sum = 0;
     move64();
-    FOR( Word16 ind = 0; ind < FDNS_NPTS; ind++ )
+    FOR( i = 0; i < FDNS_NPTS; i++ )
     {
-        sum = W_add( sum, W_deposit32_l( xs[ind] ) ); // Q_in + (q_shift - 32)
+        sum = W_mac_32_16( sum, xs[i], 1 ); // Q_in+q_shift-24+1
     }
-    mean = W_extract_l( W_shr( sum, 6 ) ); // Q_in + (q_shift - 32)
 
-    nf = Mpy_32_32( mean, 214748 /* powf( 10.0f, -4.0f ) in Q31 */ ); // Q_in + (q_shift - 32)
-    nf = L_max( nf, 0 /* powf( 2.0f, -32.0f ) in Q31 */ );            // Q_in + (q_shift - 32)
+    q_out = sub( add( Q_in, q_shift ), 24 );
+
+    /* mean = sum / FDNS_NPTS;
+      -Q6 is for division with FDNS_NPTS and -Q1 is to reduce Q by one */
+    mean = W_shl_sat_l( sum, -Q7 );                                   // q_out
+    nf = Mpy_32_32( mean, 214748 /* powf( 10.0f, -4.0f ) in Q31 */ ); // q_out
+
+    IF( LE_32( nf, L_shl_sat( 256, sub( q_out, 40 ) ) ) ) /* powf( 2.0f, -32.0f ) in Q40 */
+    {
+        nf = 256;
+        move32();
+        q_out = 40;
+        move16();
+    }
 
     FOR( i = 0; i < FDNS_NPTS; i++ )
     {
-        if ( LT_32( xs[i], nf ) )
-        {
-            xs[i] = nf; // Q_in + (q_shift - 32)
-            move32();
-        }
+        xs[i] = L_max( xs[i], nf ); // q_out
+        move32();
     }
 
     /* Log-domain */
     FOR( i = 0; i < FDNS_NPTS; i++ )
     {
-        Word16 e_tmp = norm_l( xs[i] );
-        Word16 f_tmp = Log2_norm_lc( L_shl( xs[i], e_tmp ) ); /*Q16*/
-        e_tmp = sub( sub( 34, e_tmp ), Q_in );
-        /* Note: Mpy_32_16 is used temporarily for this computation, It needs to be replaced with appropriate BASOP. */
-        xl[i] = Mpy_32_16( e_tmp, f_tmp, 16384 ); /* Q16 */
+        /*  xl[i] = logf( xs[i] ) * scale_log;
+            scale_log = INV_LOG_2 * 0.5f; */
+
+        exp = norm_l( xs[i] );
+        f_tmp = Log2_norm_lc( L_shl( xs[i], exp ) ); // Q15
+        exp = sub( sub( 30, exp ), q_out );
+        L_tmp = L_mac( L_deposit_h( exp ), f_tmp, 1 ); // Q16
+        xl[i] = L_shr( L_tmp, 1 );                     // Q16
         move32();
     }
 
     /* Downsampling */
-    L_tmp = L_deposit_l( 0 );
-    L_tmp = Madd_32_16( L_tmp, xl[0], w_0 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[0], w_1 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[1], w_2 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[2], w_3 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[3], w_4 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[4], w_5 ); // Q16
-    xl4[0] = L_tmp;                          // Q16
-    move32();
+    L_tmp = Madd_32_16( Mpy_32_16_1( xl[0], w_0 ), xl[0], w_1 ); // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[1], w_2 );                     // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[2], w_3 );                     // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[3], w_4 );                     // Q16
+    xl4[0] = Madd_32_16( L_tmp, xl[4], w_5 );                    // Q16
+
 
     FOR( n = 1; n < SNS_NPTS - 1; n++ )
     {
-        Word16 n4 = shl( n, 2 );
-
-        L_tmp = L_deposit_l( 0 );
-        L_tmp = Madd_32_16( L_tmp, xl[n4 - 1], w_0 ); // Q16
-        L_tmp = Madd_32_16( L_tmp, xl[n4], w_1 );     // Q16
-        L_tmp = Madd_32_16( L_tmp, xl[n4 + 1], w_2 ); // Q16
-        L_tmp = Madd_32_16( L_tmp, xl[n4 + 2], w_3 ); // Q16
-        L_tmp = Madd_32_16( L_tmp, xl[n4 + 3], w_4 ); // Q16
-        L_tmp = Madd_32_16( L_tmp, xl[n4 + 4], w_5 ); // Q16
-        xl4[n] = L_tmp;                               // Q16
+        L_tmp = Mpy_32_16_1( xl[4 * n - 1], w_0 );        // Q16
+        L_tmp = Madd_32_16( L_tmp, xl[4 * n], w_1 );      // Q16
+        L_tmp = Madd_32_16( L_tmp, xl[4 * n + 1], w_2 );  // Q16
+        L_tmp = Madd_32_16( L_tmp, xl[4 * n + 2], w_3 );  // Q16
+        L_tmp = Madd_32_16( L_tmp, xl[4 * n + 3], w_4 );  // Q16
+        xl4[n] = Madd_32_16( L_tmp, xl[4 * n + 4], w_5 ); // Q16
         move32();
     }
 
-    L_tmp = L_deposit_l( 0 );
-    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 5], w_0 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 4], w_1 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 3], w_2 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 2], w_3 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 1], w_4 ); // Q16
-    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 1], w_5 ); // Q16
-    xl4[SNS_NPTS - 1] = L_tmp;                           // Q16
+    L_tmp = Mpy_32_16_1( xl[FDNS_NPTS - 5], w_0 );                   // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 4], w_1 );             // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 3], w_2 );             // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 2], w_3 );             // Q16
+    L_tmp = Madd_32_16( L_tmp, xl[FDNS_NPTS - 1], w_4 );             // Q16
+    xl4[SNS_NPTS - 1] = Madd_32_16( L_tmp, xl[FDNS_NPTS - 1], w_5 ); // Q16
     move32();
 
     /* Remove mean and scaling */
     sum = 0;
     move64();
-    FOR( Word16 ind = 0; ind < SNS_NPTS; ind++ )
+    FOR( i = 0; i < SNS_NPTS; i++ )
     {
-        sum = W_add( sum, W_deposit32_l( xl4[ind] ) ); // Q16
+        sum = W_mac_32_16( sum, xl4[i], 1 ); // Q16+1
     }
-    mean = W_extract_l( W_shr( sum, 4 ) ); // Q16
+    /* mean = sum / SNS_NPTS;
+      -Q4 is for division with SNS_NPTS and -Q1 is to reduce Q by one */
+    mean = W_shl_sat_l( sum, -Q5 ); // Q16
 
     FOR( i = 0; i < SNS_NPTS; i++ )
     {
diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com_fx.c
similarity index 96%
rename from lib_com/ivas_spar_com.c
rename to lib_com/ivas_spar_com_fx.c
index 362c1c9ed71a7328f4184d0f5c73d0fbd563290d..c2ad11e2614664529fae09ba2f0bb0256349b627 100644
--- a/lib_com/ivas_spar_com.c
+++ b/lib_com/ivas_spar_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include "options.h"
 #include "basop_util.h"
 #include "ivas_stat_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "cnst.h"
@@ -53,24 +51,16 @@
  * Local constants
  *------------------------------------------------------------------------------------------*/
 
-#define IVAS_FLT_EPS ( 1e-10F )
-#define IVAS_FIX_EPS ( 1 )
-#define IVAS_DBL_EPS ( (double) 1e-20 )
+#define IVAS_FIX_EPS     ( 1 )
+#define IVAS_FIX_EPS_Q40 ( 110 )
 
-#define IVAS_REMIX_MULT_FAC ( 0.5f )
 
-#define IVAS_ACTIVEW_DM_F                        ( 1.0f )
 #define IVAS_ACTIVEW_DM_F_Q30                    ( ONE_IN_Q30 ) /*1 Q30*/
-#define IVAS_ACTIVEW_DM_F_DTX                    ( 0.25f )
-#define IVAS_ACTIVEW_DM_F_DTX_Q30                ( 268435456 ) /*0.25 Q30*/
-#define IVAS_ACTIVEW_DM_F_VLBR                   ( 0.25f )
-#define IVAS_ACTIVEW_DM_F_VLBR_Q30               ( 268435456 ) /*0.25 Q30*/
-#define IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH     ( 3.0f )
+#define IVAS_ACTIVEW_DM_F_DTX_Q30                ( 268435456 )  /*0.25 Q30*/
+#define IVAS_ACTIVEW_DM_F_VLBR_Q30               ( 268435456 )  /*0.25 Q30*/
 #define IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH_Q29 ( 1610612736 ) /*3 Q29*/
 
-#define IVAS_P_NORM_SCALING        ( 1.0f )
 #define IVAS_P_NORM_SCALING_FX     ( ONE_IN_Q31 ) // 1 Q31
-#define IVAS_P_NORM_SCALING_DTX    ( 0.75f )
 #define IVAS_P_NORM_SCALING_DTX_FX ( 1610612736 ) // 0.75 Q31
 
 #define IVAS_MAT_DIM_3 ( 3 )
@@ -995,7 +985,7 @@ static void ivas_get_pred_coeffs_enc_fx(
                 move32();
                 dm_g_q[b] = Q29;
                 move16();
-                DM_F[b] = BASOP_Util_Divide3232_Scale_cadence( Mpy_32_32( dm_g[b], num_f ), den_f, &s_dm_f ); // Q=(31-(s_dm_f+2+num_f_e-den_f_e))
+                DM_F[b] = BASOP_Util_Divide3232_Scale_newton( Mpy_32_32( dm_g[b], num_f ), den_f, &s_dm_f ); // Q=(31-(s_dm_f+2+num_f_e-den_f_e))
                 move32();
                 DM_F_q[b] = sub( 31, add( s_dm_f, sub( add( 2, num_f_e ), den_f_e ) ) );
                 move16();
@@ -1524,7 +1514,7 @@ static void ivas_get_pred_coeffs_fx(
                 den_f = L_max( den_f, 1 );     // Q=31-den_f_e
                 dm_g[b] = activew_quad_thresh; // Q29
                 move32();
-                DM_F[b] = BASOP_Util_Divide3232_Scale_cadence( Mpy_32_32( dm_g[b], num_f ), den_f, &s_dm_f ); // s_dm_f+2+num_f_e-den_f_e
+                DM_F[b] = BASOP_Util_Divide3232_Scale_newton( Mpy_32_32( dm_g[b], num_f ), den_f, &s_dm_f ); // s_dm_f+2+num_f_e-den_f_e
                 move32();
                 s_dm_f = add( s_dm_f, sub( add( 2, num_f_e ), den_f_e ) ); /*Resultant exp for DM_F s_dm_f +( 2 + num_f_e ) - den_f_e*/
                 div_shift = sub( s_dm_f, 1 );
@@ -1628,8 +1618,18 @@ static void ivas_get_Wscaling_factor_enc_fx(
                 ivas_calc_post_pred_per_band_enc_fx( cov_real, q_cov_real, mixer_mat, q_mixer_mat, num_ch, b, postpred_cov_re, &q_postpred_cov_re );
             }
 
-            Gw_sq = BASOP_Util_Divide3232_Scale( cov_real[0][0][b], L_max( postpred_cov_re[0][0], IVAS_FIX_EPS ), &tmp_exp ); // 15-(tmp_exp-(q_cov_real[0][0][b]- q_postpred_cov_re))
-            q_Gw_sq = add( sub( 15, tmp_exp ), sub( q_cov_real[0][0][b], q_postpred_cov_re ) );
+            tmp = L_shl_sat( IVAS_FIX_EPS_Q40, sub( q_postpred_cov_re, 40 ) );
+
+            IF( LE_32( postpred_cov_re[0][0], tmp ) )
+            {
+                Gw_sq = Mpy_32_32( cov_real[0][0][b], 1250000000 ); /*1/1e-10 = 1250000000 Q(-4)*/
+                q_Gw_sq = add( q_cov_real[0][0][b], -4 - 31 );
+            }
+            ELSE
+            {
+                Gw_sq = BASOP_Util_Divide3232_Scale( cov_real[0][0][b], postpred_cov_re[0][0], &tmp_exp ); // 15-(tmp_exp-(q_cov_real[0][0][b]- q_postpred_cov_re))
+                q_Gw_sq = add( sub( 15, tmp_exp ), sub( q_cov_real[0][0][b], q_postpred_cov_re ) );
+            }
 
             shift = MAX16B;
             move16();
@@ -1994,12 +1994,15 @@ static void ivas_calc_post_pred_per_band_enc_fx(
     Word32 postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], /*q_postpred_cov_re*/
     Word16 *q_postpred_cov_re )
 {
-    Word16 i, j, k, guard_bits, tmp, q_temp_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], q_tmp_re, q_W_tmp;
+    Word16 i, j, k;
     Word32 dmx_mat_conj[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
     Word32 temp_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
-    Word32 max_val;
-    Word64 tmp_re, W_tmp;
-    Word16 q_postpred_cov_re_per_value[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
+    Word16 temp_mat_e[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
+    Word16 q_postpred_cov_re_buf[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
+    Word16 min_val;
+    Word32 tmp_re;
+    Word16 tmp_q;
+    Word16 tmp_e;
 
     FOR( i = 0; i < num_ch; i++ )
     {
@@ -2016,135 +2019,71 @@ static void ivas_calc_post_pred_per_band_enc_fx(
         set32_fx( postpred_cov_re[i], 0, num_ch );
     }
 
-    max_val = 1;
-    move32();
+    min_val = MAX16B;
+    move16();
     /* num_ch x num_ch mult */
     FOR( i = 0; i < num_ch; i++ )
     {
         FOR( j = 0; j < num_ch; j++ )
         {
-            tmp_re = 0;
-            move64();
-            q_tmp_re = 31;
+            temp_mat[i][j] = 0;
+            move32();
+            temp_mat_e[i][j] = 0;
             move16();
             FOR( k = 0; k < num_ch; k++ )
             {
-                W_tmp = W_shr( W_mult0_32_32( cov_real[i][k][band_idx], dmx_mat_conj[k][j] ), q_mixer_mat ); /*q_cov_real[i][k][band_idx]*/
-                IF( LT_16( q_cov_real[i][k][band_idx], q_tmp_re ) )
+                tmp_re = Mpy_32_32( cov_real[i][k][band_idx], dmx_mat_conj[k][j] );
+                tmp_e = sub( 62, add( q_cov_real[i][k][band_idx], q_mixer_mat ) );
+                IF( tmp_re )
                 {
-                    tmp_re = W_add( W_shr( tmp_re, sub( q_tmp_re, q_cov_real[i][k][band_idx] ) ), W_tmp ); /*q_cov_real[i][k][band_idx]*/
-                    q_tmp_re = q_cov_real[i][k][band_idx];
-                    move16();
-                }
-                ELSE
-                {
-                    tmp_re = W_add( tmp_re, W_shr( W_tmp, sub( q_cov_real[i][k][band_idx], q_tmp_re ) ) ); /*q_tmp_re*/
+                    temp_mat[i][j] = BASOP_Util_Add_Mant32Exp( temp_mat[i][j], temp_mat_e[i][j], tmp_re, tmp_e, &temp_mat_e[i][j] );
+                    move32();
                 }
             }
-            IF( tmp_re == 0 )
-            {
-                q_temp_mat[i][j] = 31;
-                move16();
-                temp_mat[i][j] = 0;
-                move32();
-            }
-            ELSE
-            {
-                q_temp_mat[i][j] = q_tmp_re;
-                move16();
-                q_tmp_re = W_norm( tmp_re );
-                temp_mat[i][j] = W_extract_h( W_shl( tmp_re, q_tmp_re ) ); /*q_temp_mat[i][j]+ q_tmp_re -32*/
-                move32();
-                q_temp_mat[i][j] = sub( add( q_temp_mat[i][j], q_tmp_re ), 32 );
-                move16();
-            }
-            max_val = L_max( max_val, L_abs( temp_mat[i][j] ) );
         }
     }
 
-    guard_bits = find_guarded_bits_fx( num_ch );
-
-    tmp = norm_l( max_val );
-    IF( LT_16( tmp, guard_bits ) )
-    {
-        guard_bits = sub( guard_bits, tmp );
-    }
-    ELSE
-    {
-        guard_bits = 0;
-        move16();
-    }
-
-    *q_postpred_cov_re = 31;
-    move16();
     /* num_ch x num_ch mult */
     FOR( i = 0; i < num_ch; i++ )
     {
         FOR( j = i; j < num_ch; j++ )
         {
-            tmp_re = 0;
-            move64();
-            q_tmp_re = 31;
+            q_postpred_cov_re_buf[i][j] = *q_postpred_cov_re;
             move16();
             FOR( k = 0; k < num_ch; k++ )
             {
-                W_tmp = W_shr( W_mult0_32_32( mixer_mat[i][k][band_idx], temp_mat[k][j] ), guard_bits ); // q_temp_mat[k][j]+ q_mixer_mat-guard_bits
-                q_W_tmp = sub( add( q_temp_mat[k][j], q_mixer_mat ), guard_bits );
-                IF( LT_16( q_W_tmp, q_tmp_re ) )
+                tmp_re = Mpy_32_32( mixer_mat[i][k][band_idx], temp_mat[k][j] );
+                tmp_q = sub( q_mixer_mat, temp_mat_e[k][j] );
+                IF( tmp_re )
                 {
-                    tmp_re = W_add( W_shr( tmp_re, sub( q_tmp_re, q_W_tmp ) ), W_tmp ); // q_W_tmp
-                    q_tmp_re = q_W_tmp;
+                    tmp_e = sub( 31, q_postpred_cov_re_buf[i][j] );
+                    postpred_cov_re[i][j] = BASOP_Util_Add_Mant32Exp( postpred_cov_re[i][j], tmp_e, tmp_re, sub( Q31, tmp_q ), &tmp_e );
+                    move32();
+                    q_postpred_cov_re_buf[i][j] = sub( 31, tmp_e );
                     move16();
                 }
-                ELSE
-                {
-                    tmp_re = W_add( tmp_re, W_shr( W_tmp, sub( q_W_tmp, q_tmp_re ) ) ); // q_tmp_re
-                }
             }
-
-            if ( LT_64( W_abs( tmp_re ), L_shl( IVAS_FIX_EPS, guard_bits ) ) )
+            IF( postpred_cov_re[i][j] )
             {
-                tmp_re = 0;
-                move64();
+                min_val = s_min( min_val, q_postpred_cov_re_buf[i][j] );
             }
-
-            q_postpred_cov_re_per_value[i][j] = q_tmp_re;
-            move16();
-            IF( tmp_re == 0 )
-            {
-                postpred_cov_re[i][j] = W_extract_l( tmp_re ); /* q_tmp_re*/
-                move32();
-            }
-            ELSE
-            {
-                q_tmp_re = W_norm( tmp_re );
-                postpred_cov_re[i][j] = W_extract_h( W_shl( tmp_re, q_tmp_re ) ); /* q_tmp_re+ q_postpred_cov_re_per_value[i][j] -32*/
-                move32();
-                q_postpred_cov_re_per_value[i][j] = sub( add( q_tmp_re, q_postpred_cov_re_per_value[i][j] ), 32 );
-                move16();
-            }
-            *q_postpred_cov_re = s_min( *q_postpred_cov_re, q_postpred_cov_re_per_value[i][j] );
-            move16();
         }
     }
 
+    /*Changing Q of postpred_cov_re to min_val*/
     FOR( i = 0; i < num_ch; i++ )
     {
         FOR( j = i; j < num_ch; j++ )
         {
-            IF( postpred_cov_re[i][j] >= 0 )
+            IF( postpred_cov_re[i][j] )
             {
-                postpred_cov_re[i][j] = L_shr( postpred_cov_re[i][j], sub( q_postpred_cov_re_per_value[i][j], *q_postpred_cov_re ) ); //*q_postpred_cov_re
-                move32();
-            }
-            ELSE
-            {
-                postpred_cov_re[i][j] = L_negate( L_shr( L_negate( postpred_cov_re[i][j] ), sub( q_postpred_cov_re_per_value[i][j], *q_postpred_cov_re ) ) ); //*q_postpred_cov_re
+                postpred_cov_re[i][j] = L_shl( postpred_cov_re[i][j], sub( min_val, q_postpred_cov_re_buf[i][j] ) );
                 move32();
             }
         }
     }
 
+
     FOR( i = 0; i < num_ch; i++ )
     {
         FOR( j = 0; j < i; j++ )
@@ -2154,6 +2093,14 @@ static void ivas_calc_post_pred_per_band_enc_fx(
         }
     }
 
+    if ( EQ_16( min_val, MAX16B ) )
+    {
+        min_val = Q31;
+        move16();
+    }
+    *q_postpred_cov_re = min_val;
+    move16();
+
     return;
 }
 
@@ -2633,11 +2580,7 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
                                 test();
                                 IF( W_norm( re ) == 0 || W_norm( recon_uu_re[i][j] ) == 0 )
                                 {
-#ifdef FIX_ISSUE_1122
                                     recon_uu_re[i][j] = L_shr( recon_uu_re[i][j], 1 ); // q_recon_uu_re[i][j] - 1
-#else
-                                    re1[m] = L_shr( re1[m], 1 ); // q_recon_uu_re[i][j]-1
-#endif
                                     move32();
                                     q_recon_uu_re[i][j] = sub( q_recon_uu_re[i][j], 1 );
                                     move16();
@@ -2693,7 +2636,8 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
             trace = W_add( trace, W_deposit32_l( L_abs( cov_uu_re[i - num_dmx][i - num_dmx] ) ) ); // q_cov_uu_re
         }
 
-        factor = L_max( IVAS_FIX_EPS, postpred_cov_re[0][0] ); // q_postpred_cov_re
+        factor = postpred_cov_re[0][0]; // q_postpred_cov_re
+        move32();
         q_factor = q_postpred_cov_re;
         move16();
         IF( trace != 0 )
@@ -2714,10 +2658,22 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
             factor = L_max( factor, tmp ); // q_factor
         }
 
+        tmp = L_shl_sat( 189 /* 1e-20 in Q74 */, sub( q_factor, 74 ) );
+
         Word16 factor_exp = 0;
         move16();
-        factor = BASOP_Util_Divide3232_Scale( 1, factor, &factor_exp ); // q=15-(factor_exp+31-(31-q_factor))
-        factor_exp = add( factor_exp, q_factor );
+        IF( LE_32( factor, tmp ) )
+        {
+            factor = 22204; // (1 / 1e-20) in Q(-52)
+            factor_exp = Q15 - ( -52 );
+            move32();
+            move16();
+        }
+        ELSE
+        {
+            factor = BASOP_Util_Divide3232_Scale( 1, factor, &factor_exp ); // q=15-(factor_exp+31-(31-q_factor))
+            factor_exp = add( factor_exp, q_factor );
+        }
 
         /* normalise Hermitian (except for rounding) cov_uu */
         FOR( i = num_dmx; i < num_ch; i++ )
@@ -2734,7 +2690,7 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
                     {
                         q_tmp = W_norm( W_tmp );
                     }
-                    cov_uu_re[i - num_dmx][j - num_dmx] = W_extract_h( W_shl( W_mult0_32_32( cov_uu_re[i - num_dmx][j - num_dmx], factor ), q_tmp ) ); /*q_cov_uu_re+15-factor_exp+q_tmp-32*/
+                    cov_uu_re[i - num_dmx][j - num_dmx] = W_extract_h( W_shl( W_tmp, q_tmp ) ); /*q_cov_uu_re+15-factor_exp+q_tmp-32*/
                     move32();
                     q_cov_uu_re_per_value[i - num_dmx][j - num_dmx] = sub( add( add( q_cov_uu_re, sub( 15, factor_exp ) ), q_tmp ), 32 );
                     move16();
@@ -3317,6 +3273,9 @@ void ivas_calc_c_p_coeffs_enc_fx(
     Word16 i, j, q_postpred_cov_re;
     Word32 postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
 
+    q_postpred_cov_re = 0;
+    move16();
+
     FOR( i = 0; i < IVAS_SPAR_MAX_CH; i++ )
     {
         set_zero_fx( postpred_cov_re[i], IVAS_SPAR_MAX_CH );
@@ -3808,7 +3767,7 @@ void ivas_compute_spar_params_fx(
 {
     Word32 pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS];
 
-    Word16 b, i, ndm;
+    Word16 b, i, ndm, j;
     Word16 q_pred_coeffs;
 
     ivas_get_pred_coeffs_fx( cov_real, pred_coeffs_re, dm_fv_re, num_ch, start_band, end_band, active_w, active_w_vlbr, dtx_vad, from_dirac, dyn_active_w_flag, hSparMd->res_ind, &q_pred_coeffs, q_dm_fv_re );
@@ -3836,7 +3795,7 @@ void ivas_compute_spar_params_fx(
             }
             ELSE
             {
-                hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].pred_re_fx[i] = L_shr( hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].pred_re_fx[i], sub( tmp, 22 ) ); // q22
+                hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].pred_re_fx[i] = L_shr_r( hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].pred_re_fx[i], sub( tmp, 22 ) ); // q22
                 move32();
             }
         }
@@ -3863,24 +3822,14 @@ void ivas_compute_spar_params_fx(
             Word16 q_tmp = hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].q_C_re_fx;
             IF( NE_16( ndm, 1 ) )
             {
-#ifdef MSAN_FIX
                 FOR( i = 0; i < ( num_ch - ndm ); i++ )
                 {
-                    FOR( Word16 j = 0; j < sub( ndm, 1 ); j++ )
+                    FOR( j = 0; j < sub( ndm, 1 ); j++ )
                     {
                         hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].C_re_fx[i][j] = L_shr( hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].C_re_fx[i][j], sub( q_tmp, 22 ) ); // q22
                         move32();
                     }
                 }
-#else
-                for ( i = 0; i < IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS; i++ )
-                {
-                    for ( int j = 0; j < IVAS_SPAR_MAX_DMX_CHS - 1; j++ )
-                    {
-                        hSparMd->band_coeffs[b + i_ts * IVAS_MAX_NUM_BANDS].C_re_fx[i][j] = L_shr( hSparMd->band_coeffs[b + i_ts * IVAS_MAX_NUM_BANDS].C_re_fx[i][j], sub( q_tmp, 22 ) );
-                    }
-                }
-#endif
                 hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].q_C_re_fx = Q22;
                 move16();
             }
@@ -3888,7 +3837,7 @@ void ivas_compute_spar_params_fx(
             q_tmp = hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].q_P_re_fx;
             move16();
 
-            FOR( Word16 j = 0; j < sub( IVAS_SPAR_MAX_CH, 1 ); j++ )
+            FOR( j = 0; j < sub( IVAS_SPAR_MAX_CH, 1 ); j++ )
             {
                 hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].P_re_fx[j] = L_shr( hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].P_re_fx[j], sub( q_tmp, 22 ) ); // q22
                 move32();
@@ -4001,7 +3950,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
         move16();
         P_norm_fx[0] = 0;
         move32();
-        FOR( i = 0; i < max( 0, sub( foa_ch, ndm ) ); i++ )
+        Word16 len = s_max( 0, sub( foa_ch, ndm ) );
+        FOR( i = 0; i < len; i++ )
         {
             P_norm_fx[0] = L_add( P_norm_fx[0], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31
             move32();
@@ -4011,7 +3961,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
 
         P_norm_fx[1] = 0;
         move32();
-        FOR( ; i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) ); i++ )
+        len = s_max( 0, sub( s_min( num_ch, hoa2_ch ), ndm ) );
+        FOR( ; i < len; i++ ) // max( 0, ( min( num_ch, hoa2_ch ) - ndm ) )
         {
             P_norm_fx[1] = L_add( P_norm_fx[1], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31
             move32();
@@ -4028,8 +3979,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
         }
         P_norm_fx[2] = Mpy_32_32( L_shl( P_norm_fx[2], 3 ), diff_norm_order3_table[min( diff_norm_order3_fx, max( 0, ( num_ch - ndm ) ) )] ); // 2*q_P_re - 31
         move32();
-
-        FOR( i = 0; i < max( 0, ( foa_ch - ndm ) ); i++ )
+        len = s_max( 0, sub( foa_ch, ndm ) );
+        FOR( i = 0; i < len; i++ ) // i < max( 0, ( foa_ch - ndm ) )
         {
             idx = sub( remix_order[i + ndm], ndm );
             P_dir_fact_fx[idx] = Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ); // 2*q_P_re - 31
@@ -4042,7 +3993,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
                 move32();
             }
         }
-        FOR( ; i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) ); i++ )
+        len = s_max( 0, sub( s_min( num_ch, hoa2_ch ), ndm ) );
+        FOR( ; i < len; i++ ) // i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) )
         {
             idx = sub( remix_order[i + ndm], ndm );
             P_dir_fact_fx[idx] = Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ); // 2*q_P_re - 31
@@ -4054,6 +4006,7 @@ void ivas_get_spar_md_from_dirac_enc_fx(
                 move32();
             }
         }
+
         FOR( ; i < ( num_ch - ndm ); i++ )
         {
             idx = sub( remix_order[i + ndm], ndm );
@@ -4219,7 +4172,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
                     /*normalize 2nd order*/
                     norm_fx = 0;
                     move32();
-                    FOR( ch = foa_ch; ch < min( hoa2_ch_order, num_ch_order ); ch++ )
+                    Word16 min_ch_order = s_min( hoa2_ch_order, num_ch_order );
+                    FOR( ch = foa_ch; ch < min_ch_order; ch++ )
                     {
                         norm_fx = L_add( norm_fx, Mpy_32_32( response_avg_fx[ch], response_avg_fx[ch] ) ); // q29
                     }
@@ -4240,7 +4194,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
                         move16();
                     }
                     norm_fx = L_shr( norm_fx, sub( 1, norm_q ) ); // q30
-                    FOR( ch = foa_ch; ch < min( hoa2_ch_order, num_ch_order ); ch++ )
+                    min_ch_order = s_min( hoa2_ch_order, num_ch_order );
+                    FOR( ch = foa_ch; ch < min_ch_order; ch++ )
                     {
                         IF( LT_32( norm_fx, EPSILON_FX_THR ) )
                         {
@@ -4554,7 +4509,8 @@ void ivas_get_spar_md_from_dirac_fx(
         move16();
         P_norm_fx[0] = 0;
         move32();
-        FOR( i = 0; i < max( 0, sub( foa_ch, ndm ) ); i++ )
+        Word16 len = s_max( 0, sub( foa_ch, ndm ) );
+        FOR( i = 0; i < len; i++ ) // i < max( 0, sub( foa_ch, ndm ) )
         {
             P_norm_fx[0] = L_add( P_norm_fx[0], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31
             move32();
@@ -4564,7 +4520,8 @@ void ivas_get_spar_md_from_dirac_fx(
 
         P_norm_fx[1] = 0;
         move32();
-        FOR( ; i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) ); i++ )
+        len = s_max( 0, sub( s_min( num_ch, hoa2_ch ), ndm ) );
+        FOR( ; i < len; i++ ) // i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) )
         {
             P_norm_fx[1] = L_add( P_norm_fx[1], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31
             move32();
@@ -4581,8 +4538,8 @@ void ivas_get_spar_md_from_dirac_fx(
         }
         P_norm_fx[2] = Mpy_32_32( L_shl( P_norm_fx[2], 3 ), diff_norm_order3_table[min( diff_norm_order3_fx, max( 0, ( num_ch - ndm ) ) )] ); // 2*q_P_re - 31
         move32();
-
-        FOR( i = 0; i < max( 0, ( foa_ch - ndm ) ); i++ )
+        len = s_max( 0, sub( foa_ch, ndm ) );
+        FOR( i = 0; i < len; i++ ) // i < max( 0, ( foa_ch - ndm ) )
         {
             idx = sub( remix_order[i + ndm], ndm );
             P_dir_fact_fx[idx] = Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ); // 2*q_P_re - 31
@@ -4595,7 +4552,8 @@ void ivas_get_spar_md_from_dirac_fx(
                 move32();
             }
         }
-        FOR( ; i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) ); i++ )
+        len = s_max( 0, sub( s_min( num_ch, hoa2_ch ), ndm ) );
+        FOR( ; i < len; i++ ) // i < max( 0, ( min( num_ch, hoa2_ch ) - ndm ) )
         {
             idx = sub( remix_order[i + ndm], ndm );
             P_dir_fact_fx[idx] = Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ); // 2*q_P_re - 31
@@ -4772,7 +4730,8 @@ void ivas_get_spar_md_from_dirac_fx(
                     /*normalize 2nd order*/
                     norm_fx = 0;
                     move32();
-                    FOR( ch = foa_ch; ch < min( hoa2_ch_order, num_ch_order ); ch++ )
+                    Word16 min_ch_order = s_min( hoa2_ch_order, num_ch_order );
+                    FOR( ch = foa_ch; ch < min_ch_order; ch++ )
                     {
                         norm_fx = L_add( norm_fx, Mpy_32_32( response_avg_fx[ch], response_avg_fx[ch] ) ); // q29
                     }
@@ -4793,7 +4752,8 @@ void ivas_get_spar_md_from_dirac_fx(
                         move16();
                     }
                     norm_fx = L_shr( norm_fx, sub( 1, norm_q ) ); // q30
-                    FOR( ch = foa_ch; ch < min( hoa2_ch_order, num_ch_order ); ch++ )
+                    min_ch_order = s_min( hoa2_ch_order, num_ch_order );
+                    FOR( ch = foa_ch; ch < min_ch_order; ch++ )
                     {
                         IF( LT_32( norm_fx, EPSILON_FX_THR ) )
                         {
@@ -7044,7 +7004,7 @@ void ivas_dirac_dec_get_response_fx(
     Word16 Q_out )
 {
     Word16 index_azimuth, index_elevation;
-    Word16 el, e, az;
+    Word16 el, e, az, q_diff;
     Word32 cos_1_fx, cos_2_fx, sin_1_fx, cos_az_fx[3];
     Word32 sin_az_fx[3];
     Word32 f_fx;
@@ -7055,49 +7015,39 @@ void ivas_dirac_dec_get_response_fx(
     index_azimuth = add( azimuth, 180 ) % 360;
     move16();
     index_elevation = add( elevation, 90 );
-    IF( GT_16( index_elevation, 90 ) )
+
+    e = 1;
+    move16();
+
+    if ( GT_16( index_elevation, 90 ) )
     {
         e = -1;
-        move16();
-    }
-    ELSE
-    {
-        e = 1;
-        move16();
     }
 
-    IF( GT_16( index_elevation, 90 ) )
+    el = index_elevation;
+    move16();
+
+    if ( GT_16( index_elevation, 90 ) )
     {
         el = sub( 180, index_elevation );
-        move16();
-    }
-    ELSE
-    {
-        el = index_elevation;
-        move16();
     }
 
-    IF( GT_16( index_azimuth, 180 ) )
+    az = index_azimuth;
+    move16();
+
+    if ( GT_16( index_azimuth, 180 ) )
     {
         az = sub( 360, index_azimuth );
-        move16();
-    }
-    ELSE
-    {
-        az = index_azimuth;
-        move16();
     }
 
-    IF( GT_16( index_azimuth, 180 ) )
+    f_fx = 1;
+    move16();
+
+    if ( GT_16( index_azimuth, 180 ) )
     {
         f_fx = -1;
-        move16();
-    }
-    ELSE
-    {
-        f_fx = 1;
-        move16();
     }
+
     cos_1_fx = L_shr( dirac_gains_trg_term_fx[az][0], 1 );  // q30
     cos_2_fx = L_shl( Mpy_32_32( cos_1_fx, cos_1_fx ), 1 ); // q30
     sin_1_fx = L_shr( dirac_gains_trg_term_fx[az][1], 1 );  // q30
@@ -7122,54 +7072,54 @@ void ivas_dirac_dec_get_response_fx(
     response_fx[0] = L_shl_sat( 1, Q_out ); // Q_out
     move32();
 
+    q_diff = sub( Q_out, 29 );
+
     FOR( l = 1; l <= ambisonics_order; l++ )
     {
         b_2 = imult1616( l, l );
-        b1_2 = add( imult1616( l, l ), shl( l, 1 ) );
+        b1_2 = add( b_2, shl( l, 1 ) );
         FOR( m = 0; m < l; m += 2 )
         {
-            b = add( b_2, m );
+            b = b_2 + m;
             a = dirac_gains_P_idx[b];
-            move16();
+
             c_fx_better = local_result_table[el][a]; // q30
             move32();
-            response_fx[b] = L_shl( Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ), sub( Q_out, 29 ) ); // Q_out
+            response_fx[b] = L_shl( Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ), q_diff ); // Q_out
             move32();
 
-            b1 = sub( b1_2, m );
-            response_fx[b1] = L_shl( Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ), sub( Q_out, 29 ) ); // Q_out
+            b1 = b1_2 - m;
+            response_fx[b1] = L_shl( Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ), q_diff ); // Q_out
             move32();
         }
 
         FOR( m = 1; m < l; m += 2 )
         {
-            b = add( b_2, m );
+            b = b_2 + m;
             a = dirac_gains_P_idx[b];
-            move16();
             c_fx_better = local_result_table[el][a]; // q30
             move32();
             if ( EQ_16( e, -1 ) )
             {
                 c_fx_better = L_negate( c_fx_better ); // q30
             }
-            response_fx[b] = L_shl( Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ), sub( Q_out, 29 ) ); // Q_out
+            response_fx[b] = L_shl( Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ), q_diff ); // Q_out
             move32();
-            b1 = sub( b1_2, m );
-            response_fx[b1] = L_shl( Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ), sub( Q_out, 29 ) ); // Q_out
+
+            b1 = b1_2 - m;
+            response_fx[b1] = L_shl( Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ), q_diff ); // Q_out
             move32();
         }
 
         b = add( b_2, l );
         a = dirac_gains_P_idx[b];
-        move16();
         c_fx_better = local_result_table_2[el][a]; // q30
         move32();
-        IF( EQ_16( ( l % 2 ), 1 ) )
+        IF( EQ_16( s_and( l, 0x01 ), 1 ) )
         {
             if ( EQ_16( e, -1 ) )
             {
                 c_fx_better = L_negate( c_fx_better ); // q30
-                move32();
             }
         }
         response_fx[b] = L_shl( c_fx_better, sub( Q_out, 30 ) ); // Q_out
@@ -7179,6 +7129,133 @@ void ivas_dirac_dec_get_response_fx(
     return;
 }
 
+#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
+/*This is a derivate to ivas_dirac_dec_get_response_fx with fixed Q_out=29*/
+void ivas_dirac_dec_get_response_fx_29(
+    const Word16 azimuth,
+    const Word16 elevation,
+    Word32 *response_fx, /*Q_out*/
+    const Word16 ambisonics_order )
+{
+    Word16 index_azimuth, index_elevation;
+    Word16 el, az;
+    Word32 cos_1_fx, cos_2_fx, sin_1_fx, cos_az_fx[3];
+    Word32 sin_az_fx[3];
+    Word32 f_fx;
+    Word32 c_fx_better;
+    Word16 l, m;
+    Word16 b, b1, b_2, b1_2;
+    // Word16 Q_out = 29;
+
+    index_azimuth = add( azimuth, 180 ) % 360;
+    move16();
+    index_elevation = add( elevation, 90 );
+
+    Word32 e_fac = L_add( 0x7FFFFFFF, 0 );
+
+    if ( GT_16( index_elevation, 90 ) )
+    {
+        e_fac = MIN_32;
+    }
+
+
+    el = index_elevation;
+    move16();
+
+    if ( GT_16( index_elevation, 90 ) )
+    {
+        el = sub( 180, index_elevation );
+    }
+
+    az = index_azimuth;
+    move16();
+
+    if ( GT_16( index_azimuth, 180 ) )
+    {
+        az = sub( 360, index_azimuth );
+    }
+
+    f_fx = 1;
+    move16();
+
+    if ( GT_16( index_azimuth, 180 ) )
+    {
+        f_fx = -1;
+    }
+
+    cos_1_fx = L_shr( dirac_gains_trg_term_fx[az][0], 1 );  // q30
+    cos_2_fx = L_shl( Mpy_32_32( cos_1_fx, cos_1_fx ), 1 ); // q30
+    sin_1_fx = L_shr( dirac_gains_trg_term_fx[az][1], 1 );  // q30
+
+    if ( EQ_32( f_fx, -1 ) )
+    {
+        sin_1_fx = L_negate( sin_1_fx ); // q30
+    }
+    cos_az_fx[0] = cos_1_fx; // q30
+    move32();
+    cos_az_fx[1] = L_shl( L_sub( cos_2_fx, ONE_IN_Q29 /*0.5 q30*/ ), 1 ); /*q30*/
+    move32();
+    cos_az_fx[2] = L_sub( L_shl( Mpy_32_32( cos_1_fx, cos_az_fx[1] ), 2 ), cos_az_fx[0] /* cos_az_fx[0] q30*/ ); /*q30*/
+    move32();
+    sin_az_fx[0] = sin_1_fx; /*q30*/
+    move32();
+    sin_az_fx[1] = L_shl( Mpy_32_32( sin_1_fx, cos_1_fx ), 2 ); /*q30*/
+    move32();
+    sin_az_fx[2] = L_shl( Mpy_32_32( sin_1_fx, L_sub( cos_2_fx, ONE_IN_Q28 /*1/4 q30*/ ) ), 3 ); /*q30*/
+    move32();
+
+    response_fx[0] = 0x20000000;
+    move32();
+
+    FOR( l = 1; l <= ambisonics_order; l++ )
+    {
+        Word16 a;
+        b_2 = imult1616( l, l );
+        b1_2 = add( b_2, shl( l, 1 ) );
+        FOR( m = 0; m < l; m += 2 )
+        {
+            b = b_2 + m;
+            a = dirac_gains_P_idx[b];
+
+            c_fx_better = local_result_table[el][a]; // q30
+            move32();
+            response_fx[b] = Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ); // Q_out
+            move32();
+
+            b1 = b1_2 - m;
+            response_fx[b1] = Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ); // Q_out
+            move32();
+        }
+
+        FOR( m = 1; m < l; m += 2 )
+        {
+            b = b_2 + m;
+            a = dirac_gains_P_idx[b];
+            c_fx_better = local_result_table[el][a]; // q30
+            move32();
+            c_fx_better = Mpy_32_32( c_fx_better, e_fac );                   // q30
+            response_fx[b] = Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ); // Q_out
+            move32();
+
+            b1 = b1_2 - m;
+            response_fx[b1] = Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ); // Q_out
+            move32();
+        }
+
+        b = add( b_2, l );
+        a = dirac_gains_P_idx[b];
+        c_fx_better = local_result_table_2[el][a]; // q30
+        move32();
+        if ( s_and( l, 0x01 ) )
+        {
+            c_fx_better = Mpy_32_32( c_fx_better, e_fac ); // q30
+        }
+        response_fx[b] = L_shl( c_fx_better, -1 ); // Q_out
+        move32();
+    }
+    return;
+}
+#endif /*FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx*/
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_get_bits_to_encode
  *
diff --git a/lib_com/ivas_spar_com_quant_util.c b/lib_com/ivas_spar_com_quant_util_fx.c
similarity index 99%
rename from lib_com/ivas_spar_com_quant_util.c
rename to lib_com/ivas_spar_com_quant_util_fx.c
index 81044fb4025dde086941967a651c15711b6b3540..cfd03a3b3e68d51d66045229266e9f412a564231 100644
--- a/lib_com/ivas_spar_com_quant_util.c
+++ b/lib_com/ivas_spar_com_quant_util_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,9 +33,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "math.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include <assert.h>
 #include "wmc_auto.h"
diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h
index 090db04dbb413f44c2491d822da03799d7a990f9..fb11d3934486f3c09af3e8e5482ec78c90f6bc7a 100644
--- a/lib_com/ivas_stat_com.h
+++ b/lib_com/ivas_stat_com.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -46,18 +46,18 @@
 
 typedef struct
 {
-    int16_t last_angle1_idx; /* last frame index of coded azimuth/yaw */
-    int16_t angle1_diff_cnt; /* FEC counter of consecutive differentially azimuth/yaw coded frames */
-    int16_t last_angle2_idx; /* last frame index of coded elevation/pitch */
-    int16_t angle2_diff_cnt; /* FEC counter of consecutive differentially elevation/pitch coded frames */
+    Word16 last_angle1_idx; /* last frame index of coded azimuth/yaw */
+    Word16 angle1_diff_cnt; /* FEC counter of consecutive differentially azimuth/yaw coded frames */
+    Word16 last_angle2_idx; /* last frame index of coded elevation/pitch */
+    Word16 angle2_diff_cnt; /* FEC counter of consecutive differentially elevation/pitch coded frames */
 
 } ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE;
 
 /* ISM metadata handle (storage for one frame of read ISM metadata) */
 typedef struct
 {
-    int16_t ism_metadata_flag;      /* flag whether metadata are coded in particular frame of particular object */
-    int16_t last_ism_metadata_flag; /* last frame ism_metadata_flag */
+    Word16 ism_metadata_flag;      /* flag whether metadata are coded in particular frame of particular object */
+    Word16 last_ism_metadata_flag; /* last frame ism_metadata_flag */
 
     Word32 azimuth_fx; /* azimuth value read from the input metadata file */     /* Q22 */
     Word32 elevation_fx; /* elevation value read from the input metadata file */ /* Q22 */
@@ -65,25 +65,25 @@ typedef struct
     Word32 yaw_fx; /* yaw value read from the input metadata file */             /* Q22 */
     Word32 pitch_fx; /* pitch value read from the input metadata file */         /* Q22 */
 
-    int16_t non_diegetic_flag; /* Non-diegetic (non-headtracked) object flag */
+    Word16 non_diegetic_flag; /* Non-diegetic (non-headtracked) object flag */
 
     ISM_METADATA_ANGLE position_angle;    /* Angle structs for azimuth and elevation */
     ISM_METADATA_ANGLE orientation_angle; /* Angle structs for yaw and pitch */
-    int16_t last_radius_idx;              /* last frame index of coded radius */
-    int16_t radius_diff_cnt;              /* FEC counter of consecutive differentially radius coded frames */
+    Word16 last_radius_idx;               /* last frame index of coded radius */
+    Word16 radius_diff_cnt;               /* FEC counter of consecutive differentially radius coded frames */
 
     Word32 last_azimuth_fx; /* MD smoothing in DTX- last Q azimuth value */               /* Q22 */
     Word32 last_elevation_fx; /* MD smoothing in DTX - last Q elevation value */          /* Q22 */
     Word32 last_true_azimuth_fx; /* MD smoothing in DTX- last true Q azimuth value */     /* Q22 */
     Word32 last_true_elevation_fx; /* MD smoothing in DTX- last true Q elevation value */ /* Q22 */
 
-    int16_t ism_md_fec_cnt_enc;  /* counter of continuous frames where MD are not transmitted */
-    int16_t ism_md_inc_diff_cnt; /* counter of continuous frames where MD are transmitted in inactive segments when MD significantly changes */
-    Word16 last_true_radius_fx;  /* last true Q radius value */
+    Word16 ism_md_fec_cnt_enc;  /* counter of continuous frames where MD are not transmitted */
+    Word16 ism_md_inc_diff_cnt; /* counter of continuous frames where MD are transmitted in inactive segments when MD significantly changes */
+    Word16 last_true_radius_fx; /* last true Q radius value */
 
-    int16_t ism_imp; /* ISM importance flag */
-    int16_t ism_md_null_flag;
-    int16_t ism_md_lowrate_flag;
+    Word16 ism_imp; /* ISM importance flag */
+    Word16 ism_md_null_flag;
+    Word16 ism_md_lowrate_flag;
     Word32 q_azimuth_old_fx;
     Word32 q_elevation_old_fx;
 
@@ -96,15 +96,15 @@ typedef struct
 
 typedef struct stereo_dft_config_data_struct
 {
-    int16_t dmx_active;
-    int16_t band_res;
-    int16_t prm_res;       /* Send prm every # DFT frames */
-    int16_t res_pred_mode; /* mode : from 0 (off) to 1 (on) */
-    int16_t res_cod_mode;  /* mode : from 0 (off) to 3 */
-    int16_t hybrid_itd_flag;
-    int16_t ada_wb_res_cod_mode; /* res_cod_mode for adaptive wide band residual coding */
+    Word16 dmx_active;
+    Word16 band_res;
+    Word16 prm_res;       /* Send prm every # DFT frames */
+    Word16 res_pred_mode; /* mode : from 0 (off) to 1 (on) */
+    Word16 res_cod_mode;  /* mode : from 0 (off) to 3 */
+    Word16 hybrid_itd_flag;
+    Word16 ada_wb_res_cod_mode; /* res_cod_mode for adaptive wide band residual coding */
 
-    int16_t force_mono_transmission;
+    Word16 force_mono_transmission;
 
 } STEREO_DFT_CONFIG_DATA, *STEREO_DFT_CONFIG_DATA_HANDLE;
 
@@ -115,20 +115,20 @@ typedef struct stereo_dft_config_data_struct
 
 typedef struct
 {
-    uint8_t const bandLengthsTCX20[SMDCT_MAX_STEREO_BANDS_TCX20]; /* Length of a band in number of bins. Range is 4..160 */
-    const int16_t bdnCnt_TCX20[4];                                /* uppermost band for FB,SWB,WB,NB */
-    uint8_t const bandLengthsTCX10[SMDCT_MAX_STEREO_BANDS_TCX10]; /* Length of a band in number of bins. Range is 2..80, always divisible by 2 */
-    const int16_t bndCnt_TCX10[4];                                /* uppermost band for FB,SWB,WB,NB */
+    UWord8 const bandLengthsTCX20[SMDCT_MAX_STEREO_BANDS_TCX20]; /* Length of a band in number of bins. Range is 4..160 */
+    const Word16 bdnCnt_TCX20[4];                                /* uppermost band for FB,SWB,WB,NB */
+    UWord8 const bandLengthsTCX10[SMDCT_MAX_STEREO_BANDS_TCX10]; /* Length of a band in number of bins. Range is 2..80, always divisible by 2 */
+    const Word16 bndCnt_TCX10[4];                                /* uppermost band for FB,SWB,WB,NB */
 
 } MDCTStereoBands_config;
 
 /* MDCT stereo frequency band structure */
 typedef struct stereo_mdct_dec_band_parameters_struct
 {
-    int16_t sfbOffset[MAX_SFB + 1]; /* stereo frequency band start offsets */
-    int16_t sfbCnt;                 /* number of stereo frequency bands */
-    int16_t nBandsStereoCore;       /* number of stereo frequency bands in the core */
-    int16_t sfbIgfStart;            /*index for first IGF band*/
+    Word16 sfbOffset[MAX_SFB + 1]; /* stereo frequency band start offsets */
+    Word16 sfbCnt;                 /* number of stereo frequency bands */
+    Word16 nBandsStereoCore;       /* number of stereo frequency bands in the core */
+    Word16 sfbIgfStart;            /*index for first IGF band*/
 
 } STEREO_MDCT_BAND_PARAMETERS;
 
@@ -139,9 +139,9 @@ typedef struct stereo_mdct_dec_band_parameters_struct
 
 typedef struct
 {
-    int16_t config_index;
-    int16_t encoding_active;    /* internal state specifying if actual encoding is active or only length evaluation is active */
-    int32_t bit_count_estimate; /* uses 22Q10 fixed-point representation */
+    Word16 config_index;
+    Word16 encoding_active;    /* internal state specifying if actual encoding is active or only length evaluation is active */
+    Word32 bit_count_estimate; /* uses 22Q10 fixed-point representation */
     void *ac_handle;
 
 } ECSQ_instance;
@@ -153,9 +153,9 @@ typedef struct
 
 typedef struct ivas_dirac_config_data_struct
 {
-    int16_t enc_param_start_band;
-    int16_t dec_param_estim;
-    int16_t nbands;
+    Word16 enc_param_start_band;
+    Word16 dec_param_estim;
+    Word16 nbands;
 
 } DIRAC_CONFIG_DATA, *DIRAC_CONFIG_DATA_HANDLE;
 
@@ -180,9 +180,9 @@ typedef struct ivas_band_coeffs_t
 
 typedef struct ivas_band_coeffs_ind_t
 {
-    int16_t pred_index_re[IVAS_SPAR_MAX_CH - 1];
-    int16_t drct_index_re[IVAS_SPAR_MAX_C_COEFF];
-    int16_t decd_index_re[IVAS_SPAR_MAX_CH - 1];
+    Word16 pred_index_re[IVAS_SPAR_MAX_CH - 1];
+    Word16 drct_index_re[IVAS_SPAR_MAX_C_COEFF];
+    Word16 decd_index_re[IVAS_SPAR_MAX_CH - 1];
 
 } ivas_band_coeffs_ind_t;
 
@@ -192,7 +192,7 @@ typedef struct ivas_spar_md_t
     ivas_band_coeffs_ind_t band_coeffs_idx[IVAS_MAX_NUM_BANDS];
     Word16 num_bands;
     Word32 min_max_fx[2]; /*q28*/
-    int16_t dtx_vad;
+    Word16 dtx_vad;
     Word32 en_ratio_slow_fx[IVAS_MAX_NUM_BANDS];
     Word32 ref_pow_slow_fx[IVAS_MAX_NUM_BANDS];
     Word16 res_ind;
@@ -210,7 +210,7 @@ typedef struct ivas_quant_coeffs_t
 {
     Word32 min_fx; /* Q28 */
     Word32 max_fx; /* Q28 */
-    int16_t q_levels[2];
+    Word16 q_levels[2];
 } ivas_quant_coeffs_t;
 
 typedef struct ivas_quant_strat_t
@@ -224,23 +224,23 @@ typedef struct ivas_quant_strat_t
 
 typedef struct ivas_spar_md_com_cfg
 {
-    int16_t max_freq_per_chan[IVAS_SPAR_MAX_CH];
-    int16_t num_dmx_chans_per_band[IVAS_MAX_NUM_BANDS];
-    int16_t num_decorr_per_band[IVAS_MAX_NUM_BANDS];
-    int16_t active_w;
-    int16_t remix_unmix_order;
+    Word16 max_freq_per_chan[IVAS_SPAR_MAX_CH];
+    Word16 num_dmx_chans_per_band[IVAS_MAX_NUM_BANDS];
+    Word16 num_decorr_per_band[IVAS_MAX_NUM_BANDS];
+    Word16 active_w;
+    Word16 remix_unmix_order;
     ivas_quant_strat_t quant_strat[MAX_QUANT_STRATS];
-    int16_t quant_strat_bits;
-    int16_t nchan_transport;
-    int16_t num_quant_strats;
-    int16_t prior_strat;
-    int16_t tgt_bits_per_blk;
-    int16_t max_bits_per_blk;
-    int16_t prev_quant_idx;
-    int16_t agc_bits_ch_idx;
-    int16_t planarCP;
-    int16_t num_umx_chs;
-    int16_t max_md_bits_spar;
+    Word16 quant_strat_bits;
+    Word16 nchan_transport;
+    Word16 num_quant_strats;
+    Word16 prior_strat;
+    Word16 tgt_bits_per_blk;
+    Word16 max_bits_per_blk;
+    Word16 prev_quant_idx;
+    Word16 agc_bits_ch_idx;
+    Word16 planarCP;
+    Word16 num_umx_chs;
+    Word16 max_md_bits_spar;
 
 } ivas_spar_md_com_cfg;
 
@@ -248,26 +248,26 @@ typedef struct ivas_spar_md_com_cfg
 /* arithmetic coder structures */
 typedef struct ivas_cell_dim_t
 {
-    int16_t dim1;
-    int16_t dim2;
+    Word16 dim1;
+    Word16 dim2;
 
 } ivas_cell_dim_t;
 
 typedef struct ivas_freq_models_t
 {
-    int16_t freq_model[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS];
-    int16_t diff_freq_model[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS];
-    int16_t vals[IVAS_MAX_QUANT_LEVELS];
-    int16_t diff_vals[IVAS_MAX_QUANT_LEVELS];
-    int16_t num_models;
-    int16_t diff_num_models;
+    Word16 freq_model[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS];
+    Word16 diff_freq_model[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS];
+    Word16 vals[IVAS_MAX_QUANT_LEVELS];
+    Word16 diff_vals[IVAS_MAX_QUANT_LEVELS];
+    Word16 num_models;
+    Word16 diff_num_models;
 
 } ivas_freq_models_t;
 
 typedef struct ivas_huff_models_t
 {
-    int16_t code_book[IVAS_MAX_QUANT_LEVELS][3];
-    int16_t diff_code_book[IVAS_MAX_QUANT_LEVELS][3];
+    Word16 code_book[IVAS_MAX_QUANT_LEVELS][3];
+    Word16 diff_code_book[IVAS_MAX_QUANT_LEVELS][3];
 
 } ivas_huff_models_t;
 
@@ -275,22 +275,22 @@ typedef struct ivas_huff_models_t
 /* Entropy coder structures */
 typedef struct ivas_huffman_cfg_t
 {
-    const int16_t *codebook;
-    int16_t min_len;
-    int16_t max_len;
-    int16_t sym_len;
+    const Word16 *codebook;
+    Word16 min_len;
+    Word16 max_len;
+    Word16 sym_len;
 
 } ivas_huffman_cfg_t;
 
 typedef struct ivas_arith_t
 {
-    int16_t dyn_model_bits;
-    const int16_t *pFreq_model;
-    const int16_t *pAlt_freq_models[IVAS_NUM_PROB_MODELS];
-    const int16_t *vals;
-    int16_t cum_freq[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS];
-    int16_t range;
-    int16_t num_models;
+    Word16 dyn_model_bits;
+    const Word16 *pFreq_model;
+    const Word16 *pAlt_freq_models[IVAS_NUM_PROB_MODELS];
+    const Word16 *vals;
+    Word16 cum_freq[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS];
+    Word16 range;
+    Word16 num_models;
     Word32 saved_dist_arr[IVAS_NUM_PROB_MODELS][IVAS_MAX_QUANT_LEVELS]; /* Q15 */
 } ivas_arith_t;
 
@@ -338,18 +338,18 @@ typedef struct ivas_cov_smooth_state_t
     Word32 *pPrior_cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
     Word16 *q_cov_real_per_band[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
     Word16 *q_prior_cov_real_per_band[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
-    int16_t prior_bank_idx;
+    Word16 prior_bank_idx;
     Word32 *pSmoothing_factor_fx; /* Q31 */
-    int16_t num_bins;
+    Word16 num_bins;
 
 } ivas_cov_smooth_state_t;
 
 typedef struct ivas_cov_smooth_cfg_t
 {
     Word32 max_update_rate_fx; /* Q31 */
-    int16_t min_pool_size;
-    int16_t max_bands;
-    int16_t num_bins;
+    Word16 min_pool_size;
+    Word16 max_bands;
+    Word16 num_bins;
 
 } ivas_cov_smooth_cfg_t;
 
@@ -357,20 +357,20 @@ typedef struct ivas_cov_smooth_cfg_t
 /* SPAR bitrate constant table structure */
 typedef struct ivas_spar_br_table_t
 {
-    int32_t ivas_total_brate;
-    int16_t isPlanar;
-    int16_t sba_order;
-    int16_t bwidth;
-    int16_t fpcs;
-    int16_t nchan_transport;
+    Word32 ivas_total_brate;
+    Word16 isPlanar;
+    Word16 sba_order;
+    Word16 bwidth;
+    Word16 fpcs;
+    Word16 nchan_transport;
     ivas_spar_pmx_strings_t dmx_str;
-    int16_t active_w;
-    int16_t tmode;
-    int32_t core_brs[FOA_CHANNELS][3];
-    int16_t q_lvls[MAX_QUANT_STRATS][NUM_MD_Q_COEFS_SET];
-    int16_t td_ducking;
-    int16_t agc_bits_ch_idx; /* 0-3, Indicates core-coder channel index from which AGC bits have been taken from*/
-    int16_t usePlanarCoeff;
+    Word16 active_w;
+    Word16 tmode;
+    Word32 core_brs[FOA_CHANNELS][3];
+    Word16 q_lvls[MAX_QUANT_STRATS][NUM_MD_Q_COEFS_SET];
+    Word16 td_ducking;
+    Word16 agc_bits_ch_idx; /* 0-3, Indicates core-coder channel index from which AGC bits have been taken from*/
+    Word16 usePlanarCoeff;
 
 } ivas_spar_br_table_t;
 
@@ -419,7 +419,7 @@ typedef struct ivas_masa_common_spatial_meta_struct
 
 typedef struct ivas_omasa_meta_struct
 {
-    uint8_t num_dirs;
+    UWord8 num_dirs;
     MASA_DIRECTIONAL_SPATIAL_META directional_meta[MASA_MAXIMUM_DIRECTIONS];
     MASA_COMMON_SPATIAL_META common_meta;
 
@@ -435,16 +435,16 @@ typedef struct ivas_masa_metadata_frame_struct
 
 typedef struct ivas_masa_config_struct
 {
-    uint16_t max_metadata_bits;
-    int16_t block_grouping[5];
-    int16_t band_grouping[MASA_FREQUENCY_BANDS + 1];
-    uint8_t numCodingBands;
-    uint8_t numTwoDirBands;
-    uint8_t numberOfDirections;
-    uint8_t joinedSubframes;
-    uint8_t useCoherence;
-    uint8_t coherencePresent;
-    uint8_t mergeRatiosOverSubframes;
+    UWord16 max_metadata_bits;
+    Word16 block_grouping[5];
+    Word16 band_grouping[MASA_FREQUENCY_BANDS + 1];
+    UWord8 numCodingBands;
+    UWord8 numTwoDirBands;
+    UWord8 numberOfDirections;
+    UWord8 joinedSubframes;
+    UWord8 useCoherence;
+    UWord8 coherencePresent;
+    UWord8 mergeRatiosOverSubframes;
     IVAS_FORMAT input_ivas_format;
 
 } MASA_CODEC_CONFIG;
@@ -456,11 +456,11 @@ typedef struct ivas_masa_config_struct
 
 typedef struct
 {
-    int16_t nbands;
-    int16_t nblocks;
-    int16_t start_band;
-    uint8_t inactiveBands;
-    int16_t search_effort;
+    Word16 nbands;
+    Word16 nblocks;
+    Word16 start_band;
+    UWord8 inactiveBands;
+    Word16 search_effort;
     MC_LS_SETUP mc_ls_setup;
 
 } IVAS_METADATA_CONFIG;
@@ -615,10 +615,10 @@ typedef struct ivas_parametric_mc_metadata_struct
 
 typedef struct ivas_lfe_window
 {
-    int16_t dct_len;
-    int16_t fade_len;
-    int16_t zero_pad_len;
-    int16_t full_len;
+    Word16 dct_len;
+    Word16 fade_len;
+    Word16 zero_pad_len;
+    Word16 full_len;
     const Word32 *pWindow_coeffs_fx;
 
 
@@ -626,14 +626,14 @@ typedef struct ivas_lfe_window
 
 typedef struct ivas_lfe_freq_models
 {
-    uint16_t entropy_coder_model_fine_sg1[65];
-    uint16_t entropy_coder_model_fine_sg2[33];
-    uint16_t entropy_coder_model_fine_sg3[9];
-    uint16_t entropy_coder_model_fine_sg4[3];
-    uint16_t entropy_coder_model_coarse_sg1[33];
-    uint16_t entropy_coder_model_coarse_sg2[17];
-    uint16_t entropy_coder_model_coarse_sg3[5];
-    uint16_t entropy_coder_model_coarse_sg4;
+    UWord16 entropy_coder_model_fine_sg1[65];
+    UWord16 entropy_coder_model_fine_sg2[33];
+    UWord16 entropy_coder_model_fine_sg3[9];
+    UWord16 entropy_coder_model_fine_sg4[3];
+    UWord16 entropy_coder_model_coarse_sg1[33];
+    UWord16 entropy_coder_model_coarse_sg2[17];
+    UWord16 entropy_coder_model_coarse_sg3[5];
+    UWord16 entropy_coder_model_coarse_sg4;
 
 } ivas_lfe_freq_models;
 
diff --git a/lib_com/ivas_stereo_dft_com.c b/lib_com/ivas_stereo_dft_com_fx.c
similarity index 98%
rename from lib_com/ivas_stereo_dft_com.c
rename to lib_com/ivas_stereo_dft_com_fx.c
index 8b377bdbc73facd67aafe66145d2b5c1c00c1af3..6d63bc6d1565160d0a3a3edb4f84b812077e882e 100644
--- a/lib_com/ivas_stereo_dft_com.c
+++ b/lib_com/ivas_stereo_dft_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,8 +35,7 @@
 #include "options.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
diff --git a/lib_com/ivas_stereo_eclvq_com_fx.c b/lib_com/ivas_stereo_eclvq_com_fx.c
index 30d95afe95fa091b3d98cc883553707bce28c372..958781473910ff0f164ad50b9eb076fd3e0796e3 100644
--- a/lib_com/ivas_stereo_eclvq_com_fx.c
+++ b/lib_com/ivas_stereo_eclvq_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include <assert.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
 /*---------------------------------------------------------------
diff --git a/lib_com/ivas_stereo_ica_com_fx.c b/lib_com/ivas_stereo_ica_com_fx.c
index 3ebfd99c1e065ba93c7f0a8deeee608c1acb3ce0..8548797a4134d1805618080459a0f8ec38631269 100644
--- a/lib_com/ivas_stereo_ica_com_fx.c
+++ b/lib_com/ivas_stereo_ica_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,9 +36,7 @@
 #include "options.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
@@ -131,17 +129,7 @@ static void interpTargetChannel_fx(
     Word32 spread_factor2_fx;
     Word64 tempD1_fx, tempD2_fx;
 
-    d = negate( sub( currShift, prevShift ) );
-    IF( d >= 0 )
-    {
-        signShift = 1;
-        move16();
-    }
-    ELSE
-    {
-        signShift = -1;
-        move16();
-    }
+    d = sub( prevShift, currShift );
 
     IF( d == 0 )
     {
@@ -149,6 +137,15 @@ static void interpTargetChannel_fx(
         return;
     }
 
+    signShift = 1;
+    move16();
+
+    if ( d < 0 )
+    {
+        signShift = -1;
+        move16();
+    }
+
     N = L_shift_adapt;
     move16();
     Word32 *table_pointer = NULL;
@@ -207,7 +204,7 @@ static void interpTargetChannel_fx(
 
             FOR( j = lim1; j <= lim2; j++ )
             {
-                ptr2_fx[i] = L_add( Mpy_32_32( win_fx[j * INTERP_FACTOR1 - i], ptr1_fx[j] ), ptr2_fx[i] ); // qsynth
+                ptr2_fx[i] = Madd_32_32( ptr2_fx[i], win_fx[j * INTERP_FACTOR1 - i], ptr1_fx[j] ); // qsynth
                 move32();
             }
         }
@@ -225,44 +222,31 @@ static void interpTargetChannel_fx(
     tempD1_fx = W_deposit32_l( table_D1_pointer[abs( d )] );    // Q35
     tempD2_fx = W_mult0_32_32( 3, table_D1_pointer[abs( d )] ); // Q35
 
-    IF( EQ_16( signShift, 1 ) )
+    tempF1_fx = -ONE_IN_Q12; // Q12
+    move32();
+
+    if ( EQ_16( signShift, 1 ) )
     {
         tempF1_fx = ONE_IN_Q12; // Q12
         move32();
     }
-    ELSE
-    {
-        tempF1_fx = -ONE_IN_Q12; // Q12
-        move32();
-    }
+
     tempF1_fx = L_sub( imult3216( factor_fx, d ), tempF1_fx ); // Q12
-    FOR( k = 0; k < sub( N, 1 ); k++ )
+    FOR( k = 0; k < N - 1; k++ )
     {
-        Word32 local = L_sub( W_extract_l( W_shr( W_mult0_32_32( tempF1_fx, spread_factor2_fx ), 31 ) ), ONE_IN_Q12 ); // Q12
-        Word32 sign_local;
-        IF( local > 0 )
-        {
-            sign_local = 1;
-            move32();
-        }
-        ELSE
-        {
-            sign_local = -1;
-            move32();
-        }
-        Word32 local_int = W_extract_l( W_shr( W_abs( local ), 12 ) ); // Q0
+        Word32 local = Madd_32_32( -ONE_IN_Q12, tempF1_fx, spread_factor2_fx ); // Q12
+        Word32 local_int = L_shr( local, 12 );                                  // Q0
         Word32 res_a1, res_a2, res_a3;
         Word32 res_b1, res_b2, res_b3;
         Word32 res_c1, res_c2, res_c3;
         Word32 res_d1, res_d2, res_d3;
-        Word64 local_int_scaled;
+        Word32 local_int_scaled;
         Word64 res_a, res_b, res_c, res_d;
         Word64 tempa, tempb;
         Word64 mult_a_D1, mult_b_D2;
-        local_int = W_extract_l( W_mult0_32_32( sign_local, local_int ) ); // Q0
-        local_int_scaled = W_deposit32_l( L_shl( local_int, 12 ) );        // Q12
-        lim1 = extract_l( local_int );                                     // Q0
-        IF( W_sub( local_int_scaled, local ) > 0 )                         // Q21
+        local_int_scaled = L_shl( local_int, 12 );  // Q12
+        lim1 = extract_l( local_int );              // Q0
+        if ( L_sub( local_int_scaled, local ) > 0 ) // Q12
         {
             lim1 = sub( lim1, 1 ); // Q0
         }
@@ -387,7 +371,7 @@ static void targetCh_AlignStereoDFT_fx(
         }
         FOR( i = 0; i < L_shift_adapt; i++ )
         {
-            target_fx[i] = L_add( Mpy_32_32( alpha_fx, fadeInBuff_fx[i] ), Mpy_32_32( L_sub( ONE_IN_Q31, alpha_fx ), fadeOutBuff_fx[i] ) ); // qsynth
+            target_fx[i] = Madd_32_32( Mpy_32_32( alpha_fx, fadeInBuff_fx[i] ), L_sub( ONE_IN_Q31, alpha_fx ), fadeOutBuff_fx[i] ); // qsynth
             move32();
 
             alpha_fx = L_add_sat( alpha_fx, winSlope_fx ); // Q31
diff --git a/lib_com/ivas_stereo_mdct_bands_com.c b/lib_com/ivas_stereo_mdct_bands_com_fx.c
similarity index 98%
rename from lib_com/ivas_stereo_mdct_bands_com.c
rename to lib_com/ivas_stereo_mdct_bands_com_fx.c
index 153f477b6ebe97ddce6be91ef867060c7f20a456..43f2f16c7efc13d125717975cc63064027644d3d 100644
--- a/lib_com/ivas_stereo_mdct_bands_com.c
+++ b/lib_com/ivas_stereo_mdct_bands_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,22 +35,16 @@
 #include "options.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
-#include "ivas_prot.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------*
  * Local union
  *-------------------------------------------------------------------*/
 
-#ifndef BASOP_NOGLOB
-typedef union
-#else  /* BASOP_NOGLOB */
 typedef union
-#endif /* BASOP_NOGLOB */
 {
     MDCTStereoBands_config const *steBands;
     SpectrumWarping const *lpcBndsParam;
diff --git a/lib_com/ivas_stereo_mdct_stereo_com.c b/lib_com/ivas_stereo_mdct_stereo_com_fx.c
similarity index 97%
rename from lib_com/ivas_stereo_mdct_stereo_com.c
rename to lib_com/ivas_stereo_mdct_stereo_com_fx.c
index 45e734fea13b312b70d3083adafb53e990dca369..0a773169d07313155482bed27f0613b1cccb7a40 100644
--- a/lib_com/ivas_stereo_mdct_stereo_com.c
+++ b/lib_com/ivas_stereo_mdct_stereo_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,7 +33,6 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
 #include <assert.h>
 #include "prot_fx.h"
diff --git a/lib_com/ivas_stereo_psychlpc_com.c b/lib_com/ivas_stereo_psychlpc_com_fx.c
similarity index 98%
rename from lib_com/ivas_stereo_psychlpc_com.c
rename to lib_com/ivas_stereo_psychlpc_com_fx.c
index e34e8fd18884f0c2aff9175befd9f467510955d5..df514089560c440dde31ff103bf87fd0b1ff740f 100644
--- a/lib_com/ivas_stereo_psychlpc_com.c
+++ b/lib_com/ivas_stereo_psychlpc_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,9 +33,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_rom_com.h"
-#include "ivas_prot.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include <assert.h>
 
diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc_fx.c
similarity index 99%
rename from lib_com/ivas_stereo_td_bit_alloc.c
rename to lib_com/ivas_stereo_td_bit_alloc_fx.c
index 0f5eb402e0c5db0f6eff2d506e7c934bfa908201..b54c1d3deb5ae86bf589fe0fd34d0e9359885734 100644
--- a/lib_com/ivas_stereo_td_bit_alloc.c
+++ b/lib_com/ivas_stereo_td_bit_alloc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,12 +35,10 @@
 #include "cnst.h"
 #include "stat_enc.h"
 #include "rom_com.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools_fx.c
similarity index 90%
rename from lib_com/ivas_tools.c
rename to lib_com/ivas_tools_fx.c
index 8d486df04dd62d69e843008e92faa6cc86770729..ca8dec27615addfd578de77e9464538d8f21d519 100644
--- a/lib_com/ivas_tools.c
+++ b/lib_com/ivas_tools_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,11 +34,9 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_rom_com.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 #define ANGLE_90_DEG_Q22  377487360
@@ -308,12 +306,6 @@ void v_add_inc_fx(
     const Word16 N       /* i  : Vector length                         Q0*/
 )
 {
-#ifndef FIX_1107_VADDINC
-    Word16 i;
-    Word16 ix1 = 0;
-    Word16 ix2 = 0;
-    Word16 iy = 0;
-#else
     Word16 i, ix1, ix2, iy;
 
     /* The use of this function is currently always for the interleaved input format, */
@@ -336,7 +328,6 @@ void v_add_inc_fx(
     ix1 = 0;
     ix2 = 0;
     iy = 0;
-#endif
     move16();
     move16();
     move16();
@@ -607,41 +598,41 @@ void v_sub32_fx(
  *---------------------------------------------------------------------*/
 
 /*! r: the dot product x'*A*A'*x */
-Word32 dot_product_cholesky_fixed(
+Word64 dot_product_cholesky_fixed(
     const Word32 *x, /* i  : vector x                        Q31 - exp_x*/
     const Word32 *A, /* i  : Cholesky  matrix A              Q31 - exp_A*/
-    const Word16 N,  /* i  : vector & matrix size            Q0*/
-    const Word16 exp_x,
-    const Word16 exp_A,
-    Word16 *exp_sum )
+    const Word16 N   /* i  : vector & matrix size            Q0*/
+)
 {
     Word16 i, j;
-    Word32 suma, tmp_sum, mul;
+    Word64 suma, tmp_sum;
+    Word32 mul;
+    Word32 tmp;
     const Word32 *pt_x, *pt_A;
-    Word16 mul_exp, tmp_sum_exp;
-    mul_exp = add( exp_x, exp_A );
     pt_A = A;
     suma = 0;
-    move32();
+    move64();
+
     FOR( i = 0; i < N; i++ )
     {
         tmp_sum = 0;
         move32();
-        tmp_sum_exp = 0;
-        move16();
         pt_x = x;
 
         FOR( j = 0; j <= i; j++ )
         {
-            mul = Mpy_32_32( *pt_x++, *pt_A++ );                                                    /*Q31 - (exp_x + exp_A)*/
-            tmp_sum = BASOP_Util_Add_Mant32Exp( tmp_sum, tmp_sum_exp, mul, mul_exp, &tmp_sum_exp ); // exp_x+exp_A
+            mul = Mpy_32_32( *pt_x++, *pt_A++ );
+            tmp_sum = W_add( tmp_sum, W_deposit32_l( mul ) );
         }
 
-        suma = BASOP_Util_Add_Mant32Exp( suma, *exp_sum, Mpy_32_32( tmp_sum, tmp_sum ), shl( tmp_sum_exp, 1 ), exp_sum ); /*Q31 - exp_sum*/
+        tmp_sum = W_shr( tmp_sum, 4 ); // to make sure that the tmp_sum will not overflow
+        tmp = W_extract_l( tmp_sum );
+        suma = W_mac_32_32( suma, tmp, tmp );
     }
 
     return suma;
 }
+
 void v_mult_mat_fixed(
     Word32 *y,       /* o  : the product x*A               Qx - guardbits*/
     const Word32 *x, /* i  : vector x                      Qx*/
@@ -941,7 +932,12 @@ Word16 matrix_product_mant_exp_fx(
     Word16 out_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
     Word16 *Zp_fx_e = out_e;
     Word16 row, col;
-    Word16 x_idx, y_idx;
+    Word64 temp;
+    Word16 temp_e;
+    Word16 prod_e = add( X_fx_e, Y_fx_e );
+
+    Word16 max_exp = -31;
+    move16();
 
     /* Processing */
     test();
@@ -957,17 +953,26 @@ Word16 matrix_product_mant_exp_fx(
         {
             FOR( i = 0; i < colsX; ++i )
             {
-                ( *Zp_fx ) = 0;
-                move32();
-                ( *Zp_fx_e ) = 0;
-                move16();
+                temp = 0;
+                move64();
+
                 FOR( k = 0; k < rowsX; ++k )
                 {
-                    x_idx = add( k, imult1616( i, rowsX ) );
-                    y_idx = add( k, imult1616( j, rowsY ) );
-                    ( *Zp_fx ) = BASOP_Util_Add_Mant32Exp( *Zp_fx, *Zp_fx_e, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ), add( X_fx_e, Y_fx_e ), Zp_fx_e ); /*Q31 - Zp_fx_e*/
-                    move32();
+                    temp = W_mac_32_32( temp, X_fx[k + i * rowsX], Y_fx[k + j * rowsY] ); // X_fx_e + Y_fx_e
+                }
+                /* Maximize accumulated value to 32-bit */
+                temp_e = W_norm( temp );
+                temp = W_shl( temp, temp_e );
+                if ( 0 == temp )
+                {
+                    temp_e = prod_e;
+                    move16();
                 }
+                *Zp_fx_e = sub( prod_e, temp_e );
+                move16();
+                ( *Zp_fx ) = W_extract_h( temp );
+                move32();
+                max_exp = s_max( max_exp, *Zp_fx_e ); // Find the max exp
                 Zp_fx++;
                 Zp_fx_e++;
             }
@@ -987,17 +992,25 @@ Word16 matrix_product_mant_exp_fx(
         {
             FOR( i = 0; i < rowsX; ++i )
             {
-                ( *Zp_fx ) = 0;
-                move32();
-                ( *Zp_fx_e ) = 0;
-                move16();
+                temp = 0;
+                move64();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( i, imult1616( k, rowsX ) );
-                    y_idx = add( j, imult1616( k, rowsY ) );
-                    ( *Zp_fx ) = BASOP_Util_Add_Mant32Exp( *Zp_fx, *Zp_fx_e, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ), add( X_fx_e, Y_fx_e ), Zp_fx_e ); /*Q31 - Zp_fx_e*/
-                    move32();
+                    temp = W_mac_32_32( temp, X_fx[i + k * rowsX], Y_fx[j + k * rowsY] ); // X_fx_e + Y_fx_e
+                }
+                /* Maximize accumulated value to 32-bit */
+                temp_e = W_norm( temp );
+                temp = W_shl( temp, temp_e );
+                if ( 0 == temp )
+                {
+                    temp_e = prod_e;
+                    move16();
                 }
+                *Zp_fx_e = sub( prod_e, temp_e );
+                move16();
+                ( *Zp_fx ) = W_extract_h( temp );
+                move32();
+                max_exp = s_max( max_exp, *Zp_fx_e ); // Find the max exp
                 Zp_fx++;
                 Zp_fx_e++;
             }
@@ -1017,18 +1030,25 @@ Word16 matrix_product_mant_exp_fx(
         {
             FOR( i = 0; i < colsX; ++i )
             {
-                ( *Zp_fx ) = 0;
-                move32();
-                ( *Zp_fx_e ) = 0;
-                move16();
+                temp = 0;
+                move64();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( k, imult1616( i, rowsX ) );
-                    y_idx = add( j, imult1616( k, rowsY ) );
-                    ( *Zp_fx ) = BASOP_Util_Add_Mant32Exp( *Zp_fx, *Zp_fx_e, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ), add( X_fx_e, Y_fx_e ), Zp_fx_e ); /*Q31 - Zp_fx_e*/
-                    move32();
+                    temp = W_mac_32_32( temp, X_fx[k + i * rowsX], Y_fx[j + k * rowsY] ); // X_fx_e + Y_fx_e
                 }
-
+                /* Maximize accumulated value to 32-bit */
+                temp_e = W_norm( temp );
+                temp = W_shl( temp, temp_e );
+                if ( 0 == temp )
+                {
+                    temp_e = prod_e;
+                    move16();
+                }
+                *Zp_fx_e = sub( prod_e, temp_e );
+                move16();
+                ( *Zp_fx ) = W_extract_h( temp );
+                move32();
+                max_exp = s_max( max_exp, *Zp_fx_e ); // Find the max exp
                 Zp_fx++;
                 Zp_fx_e++;
             }
@@ -1049,17 +1069,24 @@ Word16 matrix_product_mant_exp_fx(
         {
             FOR( i = 0; i < rowsX; ++i )
             {
-                ( *Zp_fx ) = 0;
-                move32();
-                ( *Zp_fx_e ) = 0;
-                move16();
+                temp = 0;
+                move64();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( i, imult1616( k, rowsX ) );
-                    y_idx = add( k, imult1616( j, rowsY ) );
-                    ( *Zp_fx ) = BASOP_Util_Add_Mant32Exp( *Zp_fx, *Zp_fx_e, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ), add( X_fx_e, Y_fx_e ), Zp_fx_e ); /*Q31 - Zp_fx_e*/
-                    move32();
+                    temp = W_mac_32_32( temp, X_fx[i + k * rowsX], Y_fx[k + j * rowsY] ); // X_fx_e + Y_fx_e
                 }
+                /* Maximize accumulated value to 32-bit */
+                temp_e = W_norm( temp );
+                temp = W_shl( temp, temp_e );
+                if ( 0 == temp )
+                {
+                    temp_e = prod_e;
+                }
+                *Zp_fx_e = sub( prod_e, temp_e );
+                move16();
+                ( *Zp_fx ) = W_extract_h( temp );
+                move32();
+                max_exp = s_max( max_exp, *Zp_fx_e ); // Find the max exp
                 Zp_fx++;
                 Zp_fx_e++;
             }
@@ -1070,18 +1097,11 @@ Word16 matrix_product_mant_exp_fx(
         move16();
     }
     Zp_fx = Z_fx; /*Q31 - Zp_fx_e*/
+
     Zp_fx_e = out_e;
-    Word16 max_exp = -31;
     move16();
-    FOR( j = 0; j < row; ++j )
-    {
-        FOR( i = 0; i < col; ++i )
-        {
-            max_exp = s_max( max_exp, *Zp_fx_e );
-            Zp_fx_e++;
-        }
-    }
-    Zp_fx_e = out_e;
+
+
     *Z_fx_e = max_exp;
     move16();
     FOR( j = 0; j < row; ++j )
@@ -1111,7 +1131,6 @@ Word16 matrix_product_fx(
 )
 {
     Word16 i, j, k;
-    Word16 x_idx, y_idx;
     Word32 *Zp_fx = Z_fx;
 
     /* Processing */
@@ -1132,9 +1151,7 @@ Word16 matrix_product_fx(
                 move32();
                 FOR( k = 0; k < rowsX; ++k )
                 {
-                    x_idx = add( k, imult1616( i, rowsX ) );                             /*Q0*/
-                    y_idx = add( k, imult1616( j, rowsY ) );                             /*Q0*/
-                    ( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); /*Qx + Qy - 31*/
+                    ( *Zp_fx ) = Madd_32_32( *Zp_fx, X_fx[k + i * rowsX], Y_fx[k + j * rowsY] ); /*Qx + Qy - 31*/
                     move32();
                 }
                 Zp_fx++;
@@ -1155,9 +1172,7 @@ Word16 matrix_product_fx(
                 move32();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( i, imult1616( k, rowsX ) );                             /*Q0*/
-                    y_idx = add( j, imult1616( k, rowsY ) );                             /*Q0*/
-                    ( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); /*Qx + Qy - 31*/
+                    ( *Zp_fx ) = Madd_32_32( *Zp_fx, X_fx[i + k * rowsX], Y_fx[j + k * rowsY] ); /*Qx + Qy - 31*/
                     move32();
                 }
                 Zp_fx++;
@@ -1178,9 +1193,7 @@ Word16 matrix_product_fx(
                 move32();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( k, imult1616( i, rowsX ) );                             /*Q0*/
-                    y_idx = add( j, imult1616( k, rowsY ) );                             /*Q0*/
-                    ( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); /*Qx + Qy - 31*/
+                    ( *Zp_fx ) = Madd_32_32( *Zp_fx, X_fx[k + i * rowsX], Y_fx[j + k * rowsY] ); /*Qx + Qy - 31*/
                     move32();
                 }
 
@@ -1203,9 +1216,7 @@ Word16 matrix_product_fx(
                 move32();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( i, imult1616( k, rowsX ) );                                 /*Q0*/
-                    y_idx = add( k, imult1616( j, rowsY ) );                                 /*Q0*/
-                    ( *Zp_fx ) = L_add_sat( *Zp_fx, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); /*Qx + Qy - 31*/
+                    ( *Zp_fx ) = L_add_sat( *Zp_fx, Mpy_32_32( X_fx[i + k * rowsX], Y_fx[k + j * rowsY] ) ); /*Qx + Qy - 31*/
                     // TODO: overflow of Z_fx to be checked
                     move32();
                 }
@@ -1230,7 +1241,6 @@ Word16 matrix_product_q30_fx(
 )
 {
     Word16 i, j, k;
-    Word16 x_idx, y_idx;
     Word32 *Zp_fx = Z_fx;
     Word64 W_tmp;
 
@@ -1253,10 +1263,7 @@ Word16 matrix_product_q30_fx(
                 move64();
                 FOR( k = 0; k < rowsX; ++k )
                 {
-                    //( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[k + i * rowsX], Y_fx[k + j * rowsY] ) );
-                    x_idx = add( k, imult1616( i, rowsX ) );                           /*Q0*/
-                    y_idx = add( k, imult1616( j, rowsY ) );                           /*Q0*/
-                    W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); // Q56
+                    W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[k + i * rowsX], Y_fx[k + j * rowsY] ) ); // Q56
                 }
                 W_tmp = W_shl( W_tmp, 6 );         /*Q62*/
                 ( *Zp_fx ) = W_round64_L( W_tmp ); /*Q30*/
@@ -1280,10 +1287,7 @@ Word16 matrix_product_q30_fx(
                 move64();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    //( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[i + k * rowsX], Y_fx[j + k * rowsY] ) );
-                    x_idx = add( i, imult1616( k, rowsX ) );                           /*Q0*/
-                    y_idx = add( j, imult1616( k, rowsY ) );                           /*Q0*/
-                    W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); // Q56
+                    W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[i + k * rowsX], Y_fx[j + k * rowsY] ) ); // Q56
                 }
                 W_tmp = W_shl( W_tmp, 6 );         /*Q62*/
                 ( *Zp_fx ) = W_round64_L( W_tmp ); /*Q30*/
@@ -1307,9 +1311,6 @@ Word16 matrix_product_q30_fx(
                 move64();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    //( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[k + i * rowsX], Y_fx[j + k * rowsY] ) );
-                    x_idx = add( k, imult1616( i, rowsX ) );                                           /*Q0*/
-                    y_idx = add( j, imult1616( k, rowsY ) );                                           /*Q0*/
                     W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[k + i * rowsX], Y_fx[j + k * rowsY] ) ); // Q56
                 }
 
@@ -1336,10 +1337,7 @@ Word16 matrix_product_q30_fx(
                 move64();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    //( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[i + k * rowsX], Y_fx[k + j * rowsY] ) );
-                    x_idx = add( i, imult1616( k, rowsX ) );                           /*Q0*/
-                    y_idx = add( k, imult1616( j, rowsY ) );                           /*Q0*/
-                    W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); // Q56
+                    W_tmp = W_add( W_tmp, W_mult0_32_32( X_fx[i + k * rowsX], Y_fx[k + j * rowsY] ) ); // Q56
                 }
                 W_tmp = W_shl( W_tmp, 6 );         /*Q62*/
                 ( *Zp_fx ) = W_round64_L( W_tmp ); /*Q30*/
@@ -1372,7 +1370,6 @@ Word16 matrix_product_mant_exp(
     Word16 *Zp_e = Z_e;
     Word32 L_tmp;
     Word16 tmp_e;
-    Word16 x_idx, y_idx;
 
     /* Processing */
     test();
@@ -1394,11 +1391,8 @@ Word16 matrix_product_mant_exp(
                 move16();
                 FOR( k = 0; k < rowsX; ++k )
                 {
-                    x_idx = add( k, imult1616( i, rowsX ) ); /*Q0*/
-                    y_idx = add( k, imult1616( j, rowsY ) ); /*Q0*/
-                    //( *Zp ) += X[k + i * rowsX] * Y[k + j * rowsY];
-                    L_tmp = Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ); /*Q31 - (X_e + Y_e)*/
-                    tmp_e = add( X_e[x_idx], Y_e[y_idx] );
+                    L_tmp = Mpy_32_32( X_fx[k + i * rowsX], Y_fx[k + j * rowsY] ); /*Q31 - (X_e + Y_e)*/
+                    tmp_e = add( X_e[k + i * rowsX], Y_e[k + j * rowsY] );
 
                     ( *Zp ) = BASOP_Util_Add_Mant32Exp( *Zp, *Zp_e, L_tmp, tmp_e, &tmp_e );
                     move32();
@@ -1426,11 +1420,8 @@ Word16 matrix_product_mant_exp(
                 move16();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( i, imult1616( k, rowsX ) ); /*Q0*/
-                    y_idx = add( j, imult1616( k, rowsY ) ); /*Q0*/
-                    //( *Zp ) += X_fx[i + k * rowsX] * Y_fx[j + k * rowsY];
-                    L_tmp = Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ); /*Q31 - (X_e + Y_e)*/
-                    tmp_e = add( X_e[x_idx], Y_e[y_idx] );
+                    L_tmp = Mpy_32_32( X_fx[i + k * rowsX], Y_fx[j + k * rowsY] ); /*Q31 - (X_e + Y_e)*/
+                    tmp_e = add( X_e[i + k * rowsX], Y_e[j + k * rowsY] );
 
                     ( *Zp ) = BASOP_Util_Add_Mant32Exp( *Zp, *Zp_e, L_tmp, tmp_e, &tmp_e );
                     ( *Zp_e ) = tmp_e;
@@ -1457,11 +1448,8 @@ Word16 matrix_product_mant_exp(
                 move16();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( k, imult1616( i, rowsX ) ); /*Q0*/
-                    y_idx = add( j, imult1616( k, rowsY ) ); /*Q0*/
-                    //( *Zp ) += X_fx[k + i * rowsX] * Y_fx[j + k * rowsY];
-                    L_tmp = Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ); /*Q31 - (X_e + Y_e)*/
-                    tmp_e = add( X_e[x_idx], Y_e[y_idx] );
+                    L_tmp = Mpy_32_32( X_fx[k + i * rowsX], Y_fx[j + k * rowsY] ); /*Q31 - (X_e + Y_e)*/
+                    tmp_e = add( X_e[k + i * rowsX], Y_e[j + k * rowsY] );
 
                     ( *Zp ) = BASOP_Util_Add_Mant32Exp( *Zp, *Zp_e, L_tmp, tmp_e, &tmp_e );
                     move32();
@@ -1491,11 +1479,8 @@ Word16 matrix_product_mant_exp(
                 move16();
                 FOR( k = 0; k < colsX; ++k )
                 {
-                    x_idx = add( i, imult1616( k, rowsX ) ); /*Q0*/
-                    y_idx = add( k, imult1616( j, rowsY ) ); /*Q0*/
-                    //( *Zp ) += X_fx[i + k * rowsX] * Y_fx[k + j * rowsY];
-                    L_tmp = Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ); /*Q31 - (X_e + Y_e)*/
-                    tmp_e = add( X_e[x_idx], Y_e[y_idx] );
+                    L_tmp = Mpy_32_32( X_fx[i + k * rowsX], Y_fx[k + j * rowsY] ); /*Q31 - (X_e + Y_e)*/
+                    tmp_e = add( X_e[i + k * rowsX], Y_e[k + j * rowsY] );
 
                     ( *Zp ) = BASOP_Util_Add_Mant32Exp( *Zp, *Zp_e, L_tmp, tmp_e, &tmp_e );
                     move32();
@@ -1526,7 +1511,6 @@ Word16 matrix_diag_product_fx(
 {
     Word16 i, j;
     Word32 *Zp = Z;
-    Word16 tmp;
 
     /* Processing */
     IF( EQ_16( transpX, 1 ) ) /* We use X transpose */
@@ -1539,8 +1523,7 @@ Word16 matrix_diag_product_fx(
         {
             FOR( i = 0; i < colsX; ++i )
             {
-                tmp = add( j, imult1616( i, rowsX ) );
-                *( Zp ) = Mpy_32_32( X[tmp], Y[j] ); /*Q31 - (X_e + Y_e)*/
+                *( Zp ) = Mpy_32_32( X[j + i * rowsX], Y[j] ); /*Q31 - (X_e + Y_e)*/
                 move32();
                 Zp++;
             }
@@ -1571,6 +1554,98 @@ Word16 matrix_diag_product_fx(
     return EXIT_SUCCESS;
 }
 
+Word16 matrix_diag_product_fx_2(
+    const Word32 *X, /* i  : left hand matrix                                                                       Q31 - X_e*/
+    const Word16 X_e,
+    const Word16 rowsX,   /* i  : number of rows of the left hand matrix                                                 Q0*/
+    const Word16 colsX,   /* i  : number of columns of the left hand matrix                                              Q0*/
+    const Word16 transpX, /* i  : flag indicating the transposition of the left hand matrix prior to the multiplication  Q0*/
+    const Word32 *Y,      /* i  : right hand diagonal matrix as vector containing the diagonal elements                  Q31 - Y_e*/
+    const Word16 *Y_e,
+    const Word16 entriesY, /* i  : number of entries in the diagonal                                                      Q0*/
+    Word32 *Z,             /* o  : resulting matrix after the matrix multiplication                                       Q31 - Z_e*/
+    Word16 *Z_e )
+{
+    Word16 i, j;
+    Word32 *Zp = Z;
+    Word16 *Z_ep = Z_e;
+    Word16 tmp;
+    Word16 max_exp = -31;
+    move16();
+
+    /* Processing */
+    IF( EQ_16( transpX, 1 ) ) /* We use X transpose */
+    {
+        IF( NE_16( rowsX, entriesY ) )
+        {
+            return EXIT_FAILURE;
+        }
+        FOR( j = 0; j < entriesY; ++j )
+        {
+            FOR( i = 0; i < colsX; ++i )
+            {
+                tmp = j + i * rowsX;                 /*Q0*/
+                *( Zp ) = Mpy_32_32( X[tmp], Y[j] ); /*Q31 - (X_e + Y_e)*/
+                move32();
+                Zp++;
+                *( Z_ep ) = add( X_e, Y_e[j] );
+                move16();
+                max_exp = s_max( max_exp, *Z_ep ); // Find the max exp
+                Z_ep++;
+            }
+        }
+
+        Zp = Z;
+        Z_ep = Z_e;
+        FOR( j = 0; j < entriesY; ++j )
+        {
+            FOR( i = 0; i < colsX; ++i )
+            {
+                *Zp = L_shr( *Zp, sub( max_exp, *Z_ep ) );
+                *Z_ep = max_exp;
+                Zp++;
+                Z_ep++;
+            }
+        }
+    }
+    ELSE /* Regular case */
+    {
+        IF( NE_16( colsX, entriesY ) )
+        {
+            return EXIT_FAILURE;
+        }
+
+        FOR( j = 0; j < entriesY; ++j )
+        {
+            FOR( i = 0; i < rowsX; ++i )
+            {
+                *( Zp ) = Mpy_32_32( *( X ), Y[j] ); /*Q31 - (X_e + Y_e)*/
+                move32();
+                Zp++;
+                *( Z_ep ) = add( X_e, Y_e[j] );
+                move16();
+                max_exp = s_max( max_exp, *Z_ep ); // Find the max exp
+                Z_ep++;
+                X++;
+            }
+        }
+        Zp = Z;
+        Z_ep = Z_e;
+        FOR( j = 0; j < entriesY; ++j )
+        {
+            FOR( i = 0; i < rowsX; ++i )
+            {
+                *Zp = L_shr( *Zp, sub( max_exp, *Z_ep ) );
+                *Z_ep = max_exp;
+                Zp++;
+                Z_ep++;
+            }
+        }
+    }
+
+    return EXIT_SUCCESS;
+}
+
 Word16 matrix_diag_product_fx_1(
     const Word32 *X, /* i  : left hand matrix                                                                       Q31 - X_e*/
     const Word16 *X_e,
@@ -1586,7 +1661,6 @@ Word16 matrix_diag_product_fx_1(
     Word16 i, j;
     Word32 *Zp = Z;
     Word16 *Z_ep = Z_e;
-    Word16 tmp;
 
     /* Processing */
     IF( EQ_16( transpX, 1 ) ) /* We use X transpose */
@@ -1599,11 +1673,10 @@ Word16 matrix_diag_product_fx_1(
         {
             FOR( i = 0; i < colsX; ++i )
             {
-                tmp = add( j, imult1616( i, rowsX ) ); /*Q0*/
-                *( Zp ) = Mpy_32_32( X[tmp], Y[j] );   /*Q31 - (X_e + Y_e)*/
+                *( Zp ) = Mpy_32_32( X[j + i * rowsX], Y[j] ); /*Q31 - (X_e + Y_e)*/
                 move32();
                 Zp++;
-                *( Z_ep ) = add( X_e[tmp], Y_e[j] );
+                *( Z_ep ) = add( X_e[j + i * rowsX], Y_e[j] );
                 move16();
                 Z_ep++;
             }
@@ -1649,7 +1722,6 @@ Word16 diag_matrix_product_fx(
 {
     Word16 i, j;
     Word32 *Zp = Z;
-    Word16 tmp;
 
     /* Processing */
     IF( EQ_16( transpX, 1 ) ) /* We use X transpose */
@@ -1662,8 +1734,7 @@ Word16 diag_matrix_product_fx(
         {
             FOR( j = 0; j < entriesY; ++j )
             {
-                tmp = add( i, imult1616( j, rowsX ) ); /*Q0*/
-                *( Zp ) = Mpy_32_32( X[tmp], Y[j] );   /*Q31 - (X_e + Y_e)*/
+                *( Zp ) = Mpy_32_32( X[i + j * rowsX], Y[j] ); /*Q31 - (X_e + Y_e)*/
                 move32();
                 Zp++;
             }
@@ -1709,7 +1780,6 @@ Word16 matrix_product_diag_fx(
 {
     Word16 j, k;
     Word32 *Zp = Z;
-    Word16 y_idx, x_idx;
 
     /* Processing */
     test();
@@ -1728,9 +1798,7 @@ Word16 matrix_product_diag_fx(
             move32();
             FOR( k = 0; k < rowsX; ++k )
             {
-                x_idx = add( k, imult1616( j, rowsX ) );                     /*Q0*/
-                y_idx = add( k, imult1616( j, rowsY ) );                     /*Q0*/
-                ( *Zp ) = L_add( ( *Zp ), Mpy_32_32( X[x_idx], Y[y_idx] ) ); /*Q31 - (X_e + Y_e)*/
+                ( *Zp ) = Madd_32_32( ( *Zp ), X[k + j * rowsX], Y[k + j * rowsY] ); /*Q31 - (X_e + Y_e)*/
                 move32();
             }
             Zp++;
@@ -1748,9 +1816,7 @@ Word16 matrix_product_diag_fx(
             move32();
             FOR( k = 0; k < colsX; ++k )
             {
-                x_idx = add( j, imult1616( k, rowsX ) );                     /*Q0*/
-                y_idx = add( j, imult1616( k, rowsY ) );                     /*Q0*/
-                ( *Zp ) = L_add( ( *Zp ), Mpy_32_32( X[x_idx], Y[y_idx] ) ); /*Q31 - (X_e + Y_e)*/
+                ( *Zp ) = Madd_32_32( ( *Zp ), X[j + k * rowsX], Y[j + k * rowsY] ); /*Q31 - (X_e + Y_e)*/
                 move32();
             }
             Zp++;
@@ -1770,9 +1836,7 @@ Word16 matrix_product_diag_fx(
             move32();
             FOR( k = 0; k < colsX; ++k )
             {
-                x_idx = add( k, imult1616( j, rowsX ) );                     /*Q0*/
-                y_idx = add( j, imult1616( k, rowsY ) );                     /*Q0*/
-                ( *Zp ) = L_add( ( *Zp ), Mpy_32_32( X[x_idx], Y[y_idx] ) ); /*Q31 - (X_e + Y_e)*/
+                ( *Zp ) = Madd_32_32( ( *Zp ), X[k + j * rowsX], Y[j + k * rowsY] ); /*Q31 - (X_e + Y_e)*/
                 move32();
             }
 
@@ -1792,9 +1856,7 @@ Word16 matrix_product_diag_fx(
             move32();
             FOR( k = 0; k < colsX; ++k )
             {
-                x_idx = add( j, imult1616( k, rowsX ) );                     /*Q0*/
-                y_idx = add( k, imult1616( j, rowsY ) );                     /*Q0*/
-                ( *Zp ) = L_add( ( *Zp ), Mpy_32_32( X[x_idx], Y[y_idx] ) ); /*Q31 - (X_e + Y_e)*/
+                ( *Zp ) = Madd_32_32( ( *Zp ), X[j + k * rowsX], Y[k + j * rowsY] ); /*Q31 - (X_e + Y_e)*/
                 move32();
             }
             Zp++;
@@ -2686,7 +2748,7 @@ Word64 var_32_fx(
     Word16 q          /* q	 : q-factor for the array				 */
 )
 {
-
+    Word16 i;
     Word64 mean, var;
 
     mean = 0;
@@ -2694,14 +2756,14 @@ Word64 var_32_fx(
     var = 0;
     move64();
 
-    FOR( int i = 0; i < len; i++ )
+    FOR( i = 0; i < len; i++ )
     {
         mean = W_add( mean, x[i] ); /*q*/
     }
 
     mean = mean / len; /* NOTE: No BASOP for 64 bit division q*/
 
-    FOR( int i = 0; i < len; i++ )
+    FOR( i = 0; i < len; i++ )
     {
         var = W_add( var, Mpy_32_32( L_sub( x[i], W_extract_l( mean ) ), L_sub( x[i], W_extract_l( mean ) ) ) ); /*q + q - 31*/
     }
diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det_fx.c
similarity index 96%
rename from lib_com/ivas_transient_det.c
rename to lib_com/ivas_transient_det_fx.c
index 8f8905fdd66d59d6dd59589f9519afd9b55f09ec..fb8679ebc8e218ddcf1ce12ad0bcc59dcc899a35 100644
--- a/lib_com/ivas_transient_det.c
+++ b/lib_com/ivas_transient_det_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,11 +34,9 @@
 #include "options.h"
 #include "math.h"
 #include "wmc_auto.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_stat_com.h"
 
 /*------------------------------------------------------------------------------------------*
@@ -344,26 +342,26 @@ static Word32 ivas_calc_duck_gain_fx(
     Word32 duck_gain_out, L_tmp;
     Word16 tmp_e;
 
-    duck_gain_out = L_add( L_shl( Mpy_32_32( L_sub( duck_gain, ONE_IN_Q30 ), duck_coeff ), Q1 ), ONE_IN_Q30 ); /*Q30*/
+    duck_gain_out = L_add( Mpy_32_32( L_sub( duck_gain, ONE_IN_Q30 ), duck_coeff ), ONE_IN_Q29 ); /*Q29*/
 
-    IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( Mpy_32_32( duck_mult_fac, env_1 ), add( 2, env1_e ), Mpy_32_32( duck_gain_out, env_2 ), add( 1, env2_e ) ), -1 ) )
+    IF( LT_64( W_mult0_32_32( duck_mult_fac, env_1 ), W_shr( W_mult0_32_32( duck_gain_out, env_2 ), sub( env1_e, env2_e ) ) ) )
     {
+
+        duck_gain_out = 0;
+        move32();
+
         test();
-        IF( ( env_1 == 0 ) || ( env_2 == 0 ) )
+        IF( ( env_1 != 0 ) && ( env_2 != 0 ) )
         {
-            duck_gain_out = 0;
-            move32();
-        }
-        ELSE
-        {
-            L_tmp = BASOP_Util_Divide3232_Scale_cadence( env_1, env_2, &tmp_e );
+            L_tmp = BASOP_Util_Divide3232_Scale_newton( env_1, env_2, &tmp_e );
             L_tmp = L_shl( L_tmp, add( sub( env1_e, env2_e ), tmp_e ) );
 
             duck_gain_out = Mpy_32_32( duck_mult_fac, L_tmp ); /*Q29*/
-            duck_gain_out = L_shl( duck_gain_out, Q1 );        /*Q30*/
         }
     }
 
+    duck_gain_out = L_shl( duck_gain_out, Q1 ); /*Q30*/
+
     return duck_gain_out; /*Q30*/
 }
 /*-----------------------------------------------------------------------------------------*
diff --git a/lib_com/lag_wind.c b/lib_com/lag_wind.c
index 505cc0753b337600b9777af016703153dbceec27..9fb2872711d553565e75f883d9ddeafaef19cd40 100644
--- a/lib_com/lag_wind.c
+++ b/lib_com/lag_wind.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,7 +37,6 @@
 #include <assert.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "cnst.h"
 #include "rom_com.h"
diff --git a/lib_com/lerp.c b/lib_com/lerp.c
index ed2ee211c0fb1576f7b6c4a4027e6c01d35acca7..6f148057faa5dba000aa064e5e4ba169de6781ec 100644
--- a/lib_com/lerp.c
+++ b/lib_com/lerp.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,154 +36,25 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "wmc_auto.h"
 
-
 /*-------------------------------------------------------------*
  * Local function prototypes
  *-------------------------------------------------------------*/
 
-static void lerp_proc_flt( const float *f, float *f_out, const int16_t bufferNewSize, const int16_t bufferOldSize );
-
-
 /*-------------------------------------------------------------*
  * procedure lerp_flt()                                            *
  *                                                             *
  *                                                             *
  *-------------------------------------------------------------*/
 
-void lerp_flt(
-    const float *f,
-    float *f_out,
-    const int16_t bufferNewSize,
-    const int16_t bufferOldSize_inp )
-{
-    float maxFac;
-    int16_t bufferOldSize, tmpNewSize;
-
-    maxFac = 507.0 / 128.0;
-    bufferOldSize = bufferOldSize_inp;
-
-    if ( (float) bufferNewSize / bufferOldSize > maxFac )
-    {
-        tmpNewSize = bufferOldSize * 2;
-        while ( bufferNewSize > bufferOldSize )
-        {
-            if ( (float) bufferNewSize / bufferOldSize <= maxFac )
-            {
-                tmpNewSize = bufferNewSize;
-            }
-
-            lerp_proc_flt( f, f_out, tmpNewSize, bufferOldSize );
-
-            f = f_out;
-            bufferOldSize = tmpNewSize;
-            tmpNewSize *= 2;
-        }
-    }
-    else if ( (float) bufferOldSize / bufferNewSize > maxFac )
-    {
-        tmpNewSize = bufferOldSize / 2;
-        while ( bufferNewSize < bufferOldSize )
-        {
-            if ( (float) bufferOldSize / bufferNewSize <= maxFac )
-            {
-                tmpNewSize = bufferNewSize;
-            }
-
-            lerp_proc_flt( f, f_out, tmpNewSize, bufferOldSize );
-
-            f = f_out;
-            bufferOldSize = tmpNewSize;
-            tmpNewSize /= 2;
-        }
-    }
-    else
-    {
-        lerp_proc_flt( f, f_out, bufferNewSize, bufferOldSize );
-    }
-
-    return;
-}
-
 /*-------------------------------------------------------------*
  * procedure lerp_proc_flt()                                       *
  *                                                             *
  *                                                             *
  *-------------------------------------------------------------*/
 
-static void lerp_proc_flt(
-    const float *f,
-    float *f_out,
-    const int16_t bufferNewSize,
-    const int16_t bufferOldSize )
-{
-    int16_t i, idx;
-    float pos, shift, diff;
-    float buf[2 * L_FRAME_MAX];
-    Word16 tmp;
-
-    if ( bufferNewSize == bufferOldSize )
-    {
-        mvr2r( f, buf, bufferNewSize );
-        mvr2r( buf, f_out, bufferNewSize );
-        return;
-    }
-
-    /* Using the basop code to avoid reading beyond end of input for bufferOldSize=320, bufferNewSize=640 */
-    tmp = div_s( bufferOldSize, shl( bufferNewSize, 4 ) );
-    shift = (float) ( L_shl( L_deposit_l( tmp ), 4 - 15 + 16 ) ) / 65536.0f;
-    pos = 0.5f * shift - 0.5f;
-
-    if ( shift < 0.3f )
-    {
-        pos = pos - 0.13f;
-    }
-
-    /* first point of interpolation */
-    if ( pos < 0 )
-    {
-        buf[0] = f[0] + pos * ( f[1] - f[0] );
-    }
-    else
-    {
-        idx = (int16_t) pos;
-        diff = pos - idx;
-        buf[0] = f[idx] + diff * ( f[idx + 1] - f[idx] );
-    }
-
-    pos += shift;
-
-    for ( i = 1; i < bufferNewSize - 1; i++ )
-    {
-        idx = (int16_t) pos;
-        diff = pos - idx;
-
-        buf[i] = f[idx] + diff * ( f[idx + 1] - f[idx] );
-        pos += shift;
-    }
-
-
-    /* last point */
-    idx = (int16_t) pos;
-
-    if ( pos > bufferOldSize - 1 )
-    {
-        idx = bufferOldSize - 2;
-    }
-
-    diff = pos - idx;
-
-    buf[bufferNewSize - 1] = f[idx] + diff * ( f[idx + 1] - f[idx] );
-
-    mvr2r( buf, f_out, bufferNewSize );
-
-    return;
-}
-
-
 /*-------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------*/
@@ -310,11 +181,7 @@ static void lerp_proc( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 buff
         diff = shr( extract_l( pos ), 1 ); /*Q15*/
         /*buf[0]=f[0]+pos*(f[1]-f[0]);*/
         move16();
-#ifdef BASOP_NOGLOB
         *ptr++ = add_sat( f[0], msu_r( L_mult( diff, f[1] ), diff, f[0] ) ); /*Qx*/
-#else
-        *ptr++ = add( f[0], msu_r( L_mult( diff, f[1] ), diff, f[0] ) );
-#endif
     }
     ELSE
     {
@@ -324,11 +191,7 @@ static void lerp_proc( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 buff
         diff = lshr( extract_l( pos ), 1 ); /*Q15*/
 
         move16();
-#ifdef BASOP_NOGLOB
         *ptr++ = add_sat( f[idx], msu_r_sat( L_mult( diff, f[idx + 1] ), diff, f[idx] ) ); /*Qx*/
-#else
-        *ptr++ = add( f[idx], msu_r( L_mult( diff, f[idx + 1] ), diff, f[idx] ) );
-#endif
     }
 
     pos = L_add( pos, shift );
@@ -343,11 +206,7 @@ static void lerp_proc( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 buff
             diff = sub( 16384 /*0.5f Q15*/, diff ); /*Q15*/
         }
         move16();
-#ifdef BASOP_NOGLOB
         *ptr++ = add_sat( f[idx], msu_r_sat( L_mult( diff, f[idx + 1] ), diff, f[idx] ) ); /*Qx*/
-#else
-        *ptr++ = add( f[idx], msu_r( L_mult( diff, f[idx + 1] ), diff, f[idx] ) );
-#endif
 
 
         pos = L_add( pos, shift );
@@ -366,11 +225,7 @@ static void lerp_proc( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 buff
     diff = lshr( extract_l( L_shr( L_sub( pos, L_deposit_h( idx ) ), 1 ) ), 1 ); /*Q15*/
 
     move16();
-#ifdef BASOP_NOGLOB
     *ptr++ = add_sat( f[idx], shl_sat( msu_r_sat( L_mult( diff, f[idx + 1] ), diff, f[idx] ), 1 ) ); /*Qx*/
-#else
-    *ptr++ = add( f[idx], shl( msu_r( L_mult( diff, f[idx + 1] ), diff, f[idx] ), 1 ) );
-#endif
     test();
     test();
     test();
@@ -446,7 +301,7 @@ static void lerp_proc32( Word32 *f /*Qx*/, Word32 *f_out /*Qx*/, Word16 bufferNe
         {
             diff = sub( 16384 /*0.5f Q15*/, diff ); /*Q15*/
         }
-        *ptr++ = L_add_sat( f[idx], Mpy_32_16_1( L_sub( f[idx + 1], f[idx] ), diff ) ); /*Qx*/
+        *ptr++ = L_add_sat( f[idx], L_sub( Mpy_32_16_1( f[idx + 1], diff ), Mpy_32_16_1( f[idx], diff ) ) ); /*Qx*/
         move32();
         pos = L_add( pos, shift ); /*Q16*/
         idx = extract_h( pos );
@@ -501,10 +356,6 @@ void L_lerp_fx( Word32 *f /*q*/, Word32 *f_out /*q*/, Word16 bufferNewSize /*Q0*
             f[ind] = L_shr( f[ind], guard_bits ); /*Q(guard_bits)*/
             move32();
         }
-#ifndef MSAN_FIX
-        FOR( Word16 ind = 0; ind < bufferNewSize; ind++ )
-        f_out[ind] = L_shr( f_out[ind], guard_bits );
-#endif
     }
 
     IF( GT_32( L_mult0( 128, bufferNewSize ), L_mult0( bufferOldSize, 507 ) ) )
diff --git a/lib_com/limit_t0.c b/lib_com/limit_t0.c
deleted file mode 100644
index dfbfbb796cd91e6c78e58f20b751a8b81ee1e19d..0000000000000000000000000000000000000000
--- a/lib_com/limit_t0.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------*
- * Local constants
- *-------------------------------------------------*/
-
-#define LIMIT_PIT_REL_LOWER 2 /* delta interval to extend pitch coding in relative Q */
-#define LIMIT_PIT_REL_UPPER 0
-
-/*-------------------------------------------------*
- * limit_T0()
- *
- * Close-loop pitch lag search limitation
- *-------------------------------------------------*/
-
-void limit_T0(
-    const int16_t L_frame,    /* i  : length of the frame                                  */
-    const int16_t delta,      /* i  : Half the close-loop searched interval                */
-    const int16_t pit_flag,   /* i  : selecting absolute(0) or delta(1) pitch quantization */
-    const int16_t limit_flag, /* i  : flag for Q limits (0=restrained, 1=extended)         */
-    const int16_t T0,         /* i  : rough pitch estimate around which the search is done */
-    const int16_t T0_frac,    /* i  : pitch estimate fractional part                       */
-    int16_t *T0_min,          /* o  : lower pitch limit                                    */
-    int16_t *T0_max           /* o  : higher pitch limit                                   */
-)
-{
-    int16_t delta2, T1;
-    int16_t pit_min, pit_max;
-
-    if ( limit_flag == 0 ) /* restrained Q limits */
-    {
-        /* set limits */
-        if ( L_frame == L_FRAME )
-        {
-            pit_max = PIT_MAX;
-            pit_min = PIT_MIN;
-        }
-        else /* L_frame == L_FRAME16k */
-        {
-            pit_max = PIT16k_MAX;
-            pit_min = PIT16k_MIN;
-        }
-
-        delta2 = 2 * delta - 1;
-
-        T1 = T0;
-        if ( T0_frac >= 2 )
-        {
-            T1++;
-        }
-        *T0_min = T1 - delta;
-
-        if ( *T0_min < pit_min )
-        {
-            *T0_min = pit_min;
-        }
-        *T0_max = *T0_min + delta2;
-
-        if ( *T0_max > pit_max )
-        {
-            *T0_max = pit_max;
-            *T0_min = *T0_max - delta2;
-        }
-    }
-    else /* extended Q limits */
-    {
-
-        /* set limits */
-        if ( L_frame == L_FRAME )
-        {
-            pit_max = PIT_MAX;
-            pit_min = PIT_MIN_EXTEND;
-
-            if ( limit_flag == 2 )
-            {
-                pit_min = PIT_MIN_DOUBLEEXTEND;
-            }
-        }
-        else /* L_frame == L_FRAME16k */
-        {
-            pit_max = PIT16k_MAX;
-            pit_min = PIT16k_MIN_EXTEND;
-        }
-
-        delta2 = 2 * delta - 1;
-
-        T1 = T0;
-        if ( T0_frac >= 2 )
-        {
-            T1++;
-        }
-        *T0_min = T1 - delta;
-
-        if ( pit_flag == 0 )
-        {
-            /* subframes with absolute search: keep Q range */
-            if ( *T0_min < pit_min )
-            {
-                *T0_min = pit_min;
-            }
-            *T0_max = *T0_min + delta2;
-
-            if ( *T0_max > pit_max )
-            {
-                *T0_max = pit_max;
-                *T0_min = *T0_max - delta2;
-            }
-        }
-        else
-        {
-            /* subframes with relative search: extend Q range */
-            if ( *T0_min < pit_min - LIMIT_PIT_REL_LOWER )
-            {
-                *T0_min = pit_min - LIMIT_PIT_REL_LOWER;
-            }
-
-            if ( *T0_min < L_INTERPOL )
-            {
-                *T0_min = L_INTERPOL;
-            }
-            *T0_max = *T0_min + delta2;
-
-            if ( *T0_max > pit_max + LIMIT_PIT_REL_UPPER )
-            {
-                *T0_max = pit_max + LIMIT_PIT_REL_UPPER;
-                *T0_min = *T0_max - delta2;
-            }
-        }
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------*
- * Routine limit_T0_voiced_ivas()
- *
- * Close-loop pitch lag search limitation
- *-------------------------------------------------*/
-
-void limit_T0_voiced_ivas(
-    const int16_t nbits,
-    const int16_t res,
-    const int16_t T0,      /* i  : rough pitch estimate around which the search is done */
-    const int16_t T0_frac, /* i  : pitch estimate fractional part                       */
-    const int16_t T0_res,  /* i  : pitch resolution                                     */
-    int16_t *T0_min,       /* o  : lower pitch limit                                    */
-    int16_t *T0_min_frac,  /* o  : lower pitch limit                                    */
-    int16_t *T0_max,       /* o  : higher pitch limit                                   */
-    int16_t *T0_max_frac,  /* o  : higher pitch limit                                   */
-    const int16_t pit_min, /* i  : Minimum pitch lag                                    */
-    const int16_t pit_max  /* i  : Maximum pitch lag                                    */
-)
-{
-    int16_t T1, temp1, temp2;
-
-    /* Mid-point */
-    T1 = T0;
-    if ( ( T0_res > 1 ) && ( T0_frac >= ( T0_res >> 1 ) ) )
-    {
-        T1++;
-    }
-
-    /* Lower-bound */
-    temp1 = ( T1 * res ) - ( 1 << ( nbits - 1 ) );
-    temp2 = temp1 / res;
-    *T0_min = temp2;
-    *T0_min_frac = temp1 - temp2 * res;
-    if ( *T0_min < pit_min )
-    {
-        *T0_min = pit_min;
-        *T0_min_frac = 0;
-    }
-
-    /* Higher-bound */
-    temp1 = ( *T0_min * res ) + *T0_min_frac + ( 1 << nbits ) - 1;
-    temp2 = temp1 / res;
-    *T0_max = temp2;
-    *T0_max_frac = temp1 - temp2 * res;
-    if ( *T0_max > pit_max )
-    {
-        *T0_max = pit_max;
-        *T0_max_frac = res - 1;
-        temp1 = ( *T0_max * res ) + *T0_max_frac - ( 1 << nbits ) + 1;
-        temp2 = temp1 / res;
-        *T0_min = temp2;
-        *T0_min_frac = temp1 - temp2 * res;
-    }
-
-    return;
-}
diff --git a/lib_com/log2.c b/lib_com/log2.c
index 1fef489e9ab140faae3ba2ce127067af8effd941..3df1a960ec4728e537d09f4aaa9a8eb0a13e1d32 100644
--- a/lib_com/log2.c
+++ b/lib_com/log2.c
@@ -193,11 +193,7 @@ Word32 pow_10( Word32 x, Word16 *Q ) /*o : Q15, i: Q26*/
     {
         Overflow = 0;
         move16();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_tmp = L_shl_o( L_tmp, i, &Overflow );
-#else
-        L_tmp = L_shl( L_tmp, i );
-#endif
         if ( Overflow )
         {
             count = add( count, 1 );
diff --git a/lib_com/logqnorm_fx.c b/lib_com/logqnorm_fx.c
index c7852bbe422a8dd1d2fc186e9dfc582174403527..833ff03fb572f67dff94fca968c9136a5baec042 100644
--- a/lib_com/logqnorm_fx.c
+++ b/lib_com/logqnorm_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/longarith.c b/lib_com/longarith.c
index 68ba282d58ccc11258e538c2ac26fc0f4c0c568a..c5ace652c336a07802482ef76ace28690b51b749 100644
--- a/lib_com/longarith.c
+++ b/lib_com/longarith.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,10 +37,9 @@
 #include <assert.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------*
@@ -53,27 +52,27 @@
  *--------------------------------------------------------------------*/
 
 void longadd(
-    uint16_t a[],       /* i/o: vector of the length lena */
-    const uint16_t b[], /* i/o: vector of the length lenb */
-    const int16_t lena, /* i/o: length of vector a[]      */
-    const int16_t lenb  /* i/o: length of vector b[]      */
+    UWord16 a[],       /* i/o: vector of the length lena */
+    const UWord16 b[], /* i/o: vector of the length lenb */
+    const Word16 lena, /* i/o: length of vector a[]      */
+    const Word16 lenb  /* i/o: length of vector b[]      */
 )
 {
-    int16_t h;
-    int32_t carry = 0;
+    Word16 h;
+    Word32 carry = 0;
 
     assert( lena >= lenb );
     for ( h = 0; h < lenb; h++ )
     {
-        carry += ( (uint32_t) a[h] ) + ( (uint32_t) b[h] );
-        a[h] = (uint16_t) carry;
+        carry += ( (UWord32) a[h] ) + ( (UWord32) b[h] );
+        a[h] = (UWord16) carry;
         carry = carry >> 16;
     }
 
     for ( ; h < lena; h++ )
     {
-        carry = ( (uint32_t) a[h] ) + carry;
-        a[h] = (uint16_t) carry;
+        carry = ( (UWord32) a[h] ) + carry;
+        a[h] = (UWord16) carry;
         carry = carry >> 16;
     }
 
@@ -92,14 +91,14 @@ void longadd(
  *--------------------------------------------------------------------*/
 
 void longshiftright(
-    uint16_t a[],      /* i  : vector of the length lena                */
-    const int16_t b,   /* i  : number of bit positions to shift right   */
-    uint16_t d[],      /* o  : vector of the length lend                */
-    int16_t lena,      /* i  : length of vector a[]                     */
-    const int16_t lend /* i  : length of vector d[]                     */
+    UWord16 a[],      /* i  : vector of the length lena                */
+    const Word16 b,   /* i  : number of bit positions to shift right   */
+    UWord16 d[],      /* o  : vector of the length lend                */
+    Word16 lena,      /* i  : length of vector a[]                     */
+    const Word16 lend /* i  : length of vector d[]                     */
 )
 {
-    int16_t intb, fracb, fracb_u, k;
+    Word16 intb, fracb, fracb_u, k;
 
     intb = b >> 4;
 
@@ -165,16 +164,16 @@ void longshr(
  *--------------------------------------------------------------------*/
 
 void longshiftleft(
-    const uint16_t a[], /* i  : vector of the length len              */
-    const int16_t b,    /* i  : number of bit positions to shift left */
-    uint16_t d[],       /* o  : vector of the length len              */
-    const int16_t len   /* i  : length of vector a[] and d[]          */
+    const UWord16 a[], /* i  : vector of the length len              */
+    const Word16 b,    /* i  : number of bit positions to shift left */
+    UWord16 d[],       /* o  : vector of the length len              */
+    const Word16 len   /* i  : length of vector a[] and d[]          */
 )
 {
-    int16_t intb;    /* integer part of b */
-    int16_t fracb;   /* shift left value for all upper words a[k] */
-    int16_t fracb_l; /* shift right value for all lower words a[k-1] */
-    int16_t k = len - 1;
+    Word16 intb;    /* integer part of b */
+    Word16 fracb;   /* shift left value for all upper words a[k] */
+    Word16 fracb_l; /* shift right value for all lower words a[k-1] */
+    Word16 k = len - 1;
 
     intb = b >> 4;
     fracb = b & 0xF;
diff --git a/lib_com/low_rate_band_att_fx.c b/lib_com/low_rate_band_att_fx.c
index be06b8b0184b1d3cb7730c21276e3827b4915465..e51d2807b10162a20e29b17dca29ab55a8e7c13a 100644
--- a/lib_com/low_rate_band_att_fx.c
+++ b/lib_com/low_rate_band_att_fx.c
@@ -75,21 +75,13 @@ void ivas_fine_gain_pred_fx(
                 L_tmp = L_shl( xx, exp ); /*2*(15-shift)+exp */
                 exp = sub( 31, add( exp, sub( 30, shl( shift, 1 ) ) ) );
                 L_tmp = Isqrt_lc( L_tmp, &exp ); /*31 - exp */
-#ifndef FIX_ISSUE_987
-                Mpy_32_16_ss( L_tmp, ivas_fine_gain_pred_sqrt_bw[bw_idx], &L_tmp, &lsb ); /*31-exp+11-15=27-exp */
-#else
                 Word16 norm = norm_s( bw );
                 Word16 tmp1, tmp_exp = sub( 15, norm );
                 tmp1 = Sqrt16( shl( bw, norm ), &tmp_exp );
                 tmp1 = shr( tmp1, sub( sub( 15, tmp_exp ), Q11 ) );
-                Mpy_32_16_ss( L_tmp, tmp1, &L_tmp, &lsb );      /*31-exp+11-15=27-exp */
-#endif
+                Mpy_32_16_ss( L_tmp, tmp1, &L_tmp, &lsb ); /*31-exp+11-15=27-exp */
 
-#ifdef BASOP_NOGLOB
                 gp = round_fx_o( L_shl_o( L_tmp, add( 1, exp ), &Overflow ), &Overflow ); /*27-exp+1+exp-16=12 */
-#else
-                gp = round_fx( L_shl( L_tmp, add( 1, exp ) ) ); /*27-exp+1+exp-16=12 */
-#endif
                 test();
                 test();
                 IF( EQ_16( core, HQ_CORE ) && R != NULL && LE_16( R[i_sort[band]], 256 ) ) /* 256 is 32 in Q3 */
@@ -104,12 +96,8 @@ void ivas_fine_gain_pred_fx(
                     exp = add( exp, exp2 );
 
                     /*gp *= 1.0f - 0.05f / accuracy; */
-                    tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */
-#ifdef BASOP_NOGLOB
+                    tmp = div_s( 13107, accuracy );                /* 0.05 in Q18 */
                     tmp = shr_o( tmp, sub( 34, exp ), &Overflow ); /*15+18-exp+16-15=34-exp */
-#else                                                              /* BASOP_NOGLOB */
-                    tmp = shr( tmp, sub( 34, exp ) );           /*15+18-exp+16-15=34-exp */
-#endif
                     tmp = sub( 32767, tmp );
                     tmp = s_max( 27554, tmp ); /* Limit attenuation to norm quantizer error, 2^-0.25 in Q15 */
                     gp = mult_r( tmp, gp );    /*15+12+1-16=12 */
@@ -199,13 +187,9 @@ void fine_gain_pred_fx(
                 exp = norm_l( xx );
                 L_tmp = L_shl( xx, exp ); /*2*(15-shift)+exp */
                 exp = sub( 31, add( exp, sub( 30, shl( shift, 1 ) ) ) );
-                L_tmp = Isqrt_lc( L_tmp, &exp );                                     /*31 - exp */
-                Mpy_32_16_ss( L_tmp, fine_gain_pred_sqrt_bw[bw_idx], &L_tmp, &lsb ); /*31-exp+11-15=27-exp */
-#ifdef BASOP_NOGLOB
+                L_tmp = Isqrt_lc( L_tmp, &exp );                                          /*31 - exp */
+                Mpy_32_16_ss( L_tmp, fine_gain_pred_sqrt_bw[bw_idx], &L_tmp, &lsb );      /*31-exp+11-15=27-exp */
                 gp = round_fx_o( L_shl_o( L_tmp, add( 1, exp ), &Overflow ), &Overflow ); /*27-exp+1+exp-16=12 */
-#else
-                gp = round_fx( L_shl( L_tmp, add( 1, exp ) ) ); /*27-exp+1+exp-16=12 */
-#endif
                 test();
                 test();
                 IF( EQ_16( core, HQ_CORE ) && R != NULL && LE_16( R[i_sort[band]], 256 ) ) /* 256 is 32 in Q3 */
@@ -220,12 +204,8 @@ void fine_gain_pred_fx(
                     exp = add( exp, exp2 );
 
                     /*gp *= 1.0f - 0.05f / accuracy; */
-                    tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */
-#ifdef BASOP_NOGLOB
+                    tmp = div_s( 13107, accuracy );                /* 0.05 in Q18 */
                     tmp = shr_o( tmp, sub( 34, exp ), &Overflow ); /*15+18-exp+16-15=34-exp */
-#else                                                              /* BASOP_NOGLOB */
-                    tmp = shr( tmp, sub( 34, exp ) );           /*15+18-exp+16-15=34-exp */
-#endif
                     tmp = sub( 32767, tmp );
                     tmp = s_max( 27554, tmp ); /* Limit attenuation to norm quantizer error, 2^-0.25 in Q15 */
                     gp = mult_r( tmp, gp );    /*15+12+1-16=12 */
diff --git a/lib_com/lpc_tools_fx.c b/lib_com/lpc_tools_fx.c
index 8f478dde7c7fdb0d863b2221394b262df3dcba21..1035f017a5b95b59efef409b5dead1f1e95ea326 100644
--- a/lib_com/lpc_tools_fx.c
+++ b/lib_com/lpc_tools_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -427,11 +427,7 @@ static Word32 Div_32_opt( Word32 L_num /*Q31*/, Word16 denom_hi /*Qx -16*/, Word
 
     L_32 = Mpy_32_32( L_num, L_32 );
 
-#ifdef BASOP_NOGLOB
     L_32 = L_shl_o( L_32, 2, &Overflow );
-#else  /* BASOP_NOGLOB */
-    L_32 = L_shl( L_32, 2 );
-#endif /* BASOP_NOGLOB */
 
     return ( L_32 );
 }
@@ -530,21 +526,12 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
             t0 = Mac_32( t0, Rh[j], Rl[j], Ah[i - j], Al[i - j] );
         }
 
-#ifdef BASOP_NOGLOB
         t0 = L_shl_o( t0, 4, &Overflow ); /* result in Q27 -> convert to Q31 */
-#else                                     /* BASOP_NOGLOB */
-        t0 = L_shl( t0, 4 ); /* result in Q27 -> convert to Q31 */
-#endif                                    /* BASOP_NOGLOB */
                                           /* No overflow possible            */
 
         /* Compose and add R[i] in Q3 */
-#ifdef BASOP_NOGLOB
         t0 = L_mac_o( t0, Rl[i], 1, &Overflow );
         t0 = L_msu_o( t0, Rh[i], -32768, &Overflow );
-#else  /* BASOP_NOGLOB */
-        t0 = L_mac( t0, Rl[i], 1 );
-        t0 = L_msu( t0, Rh[i], -32768 );
-#endif /* BASOP_NOGLOB */
 
         /* K = -t0 / Alpha */
         t1 = L_abs( t0 );
@@ -559,11 +546,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
         {
             t2 = L_negate( t2 ); /* K =-t0/Alpha                    */
         }
-#ifdef BASOP_NOGLOB
         t2 = L_shl_o( t2, alp_exp, &Overflow ); /* denormalize; compare to Alpha   */
-#else                                           /* BASOP_NOGLOB */
-        t2 = L_shl( t2, alp_exp ); /* denormalize; compare to Alpha   */
-#endif                                          /* BASOP_NOGLOB */
         test();
         if ( ( mem != NULL ) && ( ( GT_16( abs_s( extract_h( t2 ) ), k_max ) ) ) )
         {
@@ -602,11 +585,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
         L_Extract( t2, &Ah[i], &Al[i] ); /* An[i] in Q27                   */
 
         /* Alpha = Alpha * (1-K**2) */
-#ifdef BASOP_NOGLOB
         t1 = L_mult_o( Kh, Kh, &Overflow ); /* K*K      in Q31 */
-#else                                       /* BASOP_NOGLOB */
-        t1 = L_mult( Kh, Kh );     /* K*K      in Q31 */
-#endif                                      /* BASOP_NOGLOB */
         t0 = L_mac( t1, mult( Kh, Kl ), 2 );
         t0 = L_abs( t0 );                       /* Some case <0 !! */
         t0 = L_sub( (Word32) 0x7fffffffL, t0 ); /* 1 - K*K  in Q31 */
@@ -642,11 +621,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
     FOR( i = 1; i <= order; i++ )
     {
         t0 = L_Comp( Ah[i], Al[i] );
-#ifdef BASOP_NOGLOB
         A[i] = round_fx_o( L_shl_o( t0, k, &Overflow ), &Overflow );
-#else
-        A[i] = round_fx( L_shl( t0, k ) );
-#endif
         move16();
     }
 
@@ -745,21 +720,12 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
             t0 = Mac_32( t0, Rh[j], Rl[j], Ah[i - j], Al[i - j] );
         }
 
-#ifdef BASOP_NOGLOB
         t0 = L_shl_o( t0, 4, &Overflow ); /* result in Q27 -> convert to Q31 */
-#else                                     /* BASOP_NOGLOB */
-        t0 = L_shl( t0, 4 ); /* result in Q27 -> convert to Q31 */
-#endif                                    /* BASOP_NOGLOB */
                                           /* No overflow possible            */
 
         /* Compose and add R[i] in Q3 */
-#ifdef BASOP_NOGLOB
         t0 = L_mac_o( t0, Rl[i], 1, &Overflow );
         t0 = L_msu_o( t0, Rh[i], -32768, &Overflow );
-#else  /* BASOP_NOGLOB */
-        t0 = L_mac( t0, Rl[i], 1 );
-        t0 = L_msu( t0, Rh[i], -32768 );
-#endif /* BASOP_NOGLOB */
 
         /* K = -t0 / Alpha */
         t1 = L_abs( t0 );
@@ -774,11 +740,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
         {
             t2 = L_negate( t2 ); /* K =-t0/Alpha                    */
         }
-#ifdef BASOP_NOGLOB
         t2 = L_shl_o( t2, alp_exp, &Overflow ); /* denormalize; compare to Alpha   */
-#else                                           /* BASOP_NOGLOB */
-        t2 = L_shl( t2, alp_exp ); /* denormalize; compare to Alpha   */
-#endif                                          /* BASOP_NOGLOB */
         test();
         if ( ( mem != NULL ) && ( ( GT_16( abs_s( extract_h( t2 ) ), k_max ) ) ) )
         {
@@ -817,11 +779,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
         L_Extract( t2, &Ah[i], &Al[i] ); /* An[i] in Q27                   */
 
         /* Alpha = Alpha * (1-K**2) */
-#ifdef BASOP_NOGLOB
         t1 = L_mult_o( Kh, Kh, &Overflow ); /* K*K      in Q31 */
-#else                                       /* BASOP_NOGLOB */
-        t1 = L_mult( Kh, Kh );     /* K*K      in Q31 */
-#endif                                      /* BASOP_NOGLOB */
         t0 = L_mac( t1, mult( Kh, Kl ), 2 );
         t0 = L_abs( t0 );                       /* Some case <0 !! */
         t0 = L_sub( (Word32) 0x7fffffffL, t0 ); /* 1 - K*K  in Q31 */
@@ -857,11 +815,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
     FOR( i = 1; i <= order; i++ )
     {
         t0 = L_Comp( Ah[i], Al[i] );
-#ifdef BASOP_NOGLOB
         A[i] = round_fx_o( L_shl_o( t0, k, &Overflow ), &Overflow );
-#else
-        A[i] = round_fx( L_shl( t0, k ) );
-#endif
         move16();
     }
 
@@ -961,21 +915,12 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
             t0 = Mac_32( t0, Rh[j], Rl[j], Ah[i - j], Al[i - j] );
         }
 
-#ifdef BASOP_NOGLOB
         t0 = L_shl_o( t0, 4, &Overflow ); /* result in Q27 -> convert to Q31 */
-#else                                     /* BASOP_NOGLOB */
-        t0 = L_shl( t0, 4 ); /* result in Q27 -> convert to Q31 */
-#endif                                    /* BASOP_NOGLOB */
                                           /* No overflow possible            */
 
         /* Compose and add R[i] in Q3 */
-#ifdef BASOP_NOGLOB
         t0 = L_mac_o( t0, Rl[i], 1, &Overflow );
         t0 = L_msu_o( t0, Rh[i], -32768, &Overflow );
-#else  /* BASOP_NOGLOB */
-        t0 = L_mac( t0, Rl[i], 1 );
-        t0 = L_msu( t0, Rh[i], -32768 );
-#endif /* BASOP_NOGLOB */
 
         /* K = -t0 / Alpha */
         t1 = L_abs( t0 );
@@ -990,11 +935,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
         {
             t2 = L_negate( t2 ); /* K =-t0/Alpha                    */
         }
-#ifdef BASOP_NOGLOB
         t2 = L_shl_o( t2, alp_exp, &Overflow ); /* denormalize; compare to Alpha   */
-#else                                           /* BASOP_NOGLOB */
-        t2 = L_shl( t2, alp_exp ); /* denormalize; compare to Alpha   */
-#endif                                          /* BASOP_NOGLOB */
         test();
         if ( ( mem != NULL ) && ( ( GT_16( abs_s( extract_h( t2 ) ), k_max ) ) ) )
         {
@@ -1033,11 +974,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
         L_Extract( t2, &Ah[i], &Al[i] ); /* An[i] in Q27                   */
 
         /* Alpha = Alpha * (1-K**2) */
-#ifdef BASOP_NOGLOB
         t1 = L_mult_o( Kh, Kh, &Overflow ); /* K*K      in Q31 */
-#else                                       /* BASOP_NOGLOB */
-        t1 = L_mult( Kh, Kh );     /* K*K      in Q31 */
-#endif                                      /* BASOP_NOGLOB */
         t0 = L_mac( t1, mult( Kh, Kl ), 2 );
         t0 = L_abs( t0 );                       /* Some case <0 !! */
         t0 = L_sub( (Word32) 0x7fffffffL, t0 ); /* 1 - K*K  in Q31 */
@@ -1073,11 +1010,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
     FOR( i = 1; i <= order; i++ )
     {
         t0 = L_Comp( Ah[i], Al[i] );
-#ifdef BASOP_NOGLOB
         A[i] = L_shl_o( t0, k, &Overflow );
-#else
-        A[i] = L_shl(t0, k));
-#endif
         move16();
     }
 
@@ -1181,7 +1114,7 @@ static void lsp_reorder(
     {
         lsp[i] = s_max( lsp[i], lsp_min );
         move16();
-        lsp_min = add( lsp[i], min_dist );
+        lsp_min = add_sat( lsp[i], min_dist );
     }
 
     /* Reverify the LSF ordering and minimum GAP in the reverse order (security) */
@@ -1277,6 +1210,91 @@ Word16 E_LPC_lsp_unweight(
     return 0;
 }
 
+/*
+ * E_LPC_schur_ivas
+ *
+ * Parameters:
+ *    R         I:   Rh[M+1] Vector of autocorrelations (msb)
+ *    reflCoeff O:   rc[M]   Reflection coefficients.          Q15
+ *    epsP      O:   error vector
+ *
+ * Function:
+ *    Schur algorithm to compute
+ *    the LPC parameters from the autocorrelations of speech.
+ *
+ * Returns:
+ *    void
+ */
+Word32 E_LPC_schur_ivas( Word32 r[] /*Qr*/, Word16 reflCoeff[] /*Q15*/, const Word16 m )
+{
+    Word16 i, j, temp16, mMi, s;
+    Word32 g0[M], *g1, tmp32;
+    const Word32 min_epsP = 1; /* > 0.01f*2^27/2^30 */
+    Word32 tmp_epsP;
+
+    s = getScaleFactor32( r, add( m, 1 ) );
+    IF( s != 0 )
+    {
+        scale_sig32( r, add( m, 1 ), s ); /* scale in-place */
+    }
+
+    g1 = r;
+    Copy32( r + 1, g0, m );
+
+    /* compute g0[0]/g1[0], where g0[0] < g1[0] */
+    temp16 = negate( divide3232( g0[0], g1[0] ) );
+    reflCoeff[0] = temp16;
+    move16();
+    //  epsP[0] = r[0];
+    move32();
+
+
+    FOR( i = 0; i < m; i++ )
+    {
+        /* g1[0] = g0[0]*temp16 + g1[0]; */
+        tmp32 = Mpy_32_16_1( g0[0], temp16 );
+        g1[0] = L_add( g1[0], tmp32 );
+        move32();
+
+        mMi = sub( m, i );
+        FOR( j = 1; j < mMi; j++ )
+        {
+            /* g0[j-1] = g0[j]        + g1[j]*temp16;
+            g1[j]   = g0[j]*temp16 + g1[j];       */
+            g0[j - 1] = L_add( g0[j], Mpy_32_16_1( g1[j], temp16 ) );
+            move32();
+            g1[j] = L_add( g1[j], Mpy_32_16_1( g0[j], temp16 ) );
+            move32();
+        }
+        temp16 = negate( divide3232( g0[0], g1[0] ) );
+        reflCoeff[i + 1] = temp16;
+        move16();
+
+        /* Prediction errors */
+        tmp_epsP = L_shr( g1[0], s );
+        if ( tmp_epsP <= 0 )
+        {
+            tmp_epsP = min_epsP;
+            move32();
+        }
+        // epsP[i + 1] = tmp_epsP;
+        move32();
+    }
+
+    /* epsP[i+1] = g0[0]*temp16 + g1[0]; */
+    tmp_epsP = L_add( g1[0], Mpy_32_16_1( g0[0], temp16 ) );
+    tmp_epsP = L_shr( tmp_epsP, s );
+    if ( tmp_epsP <= 0 )
+    {
+        tmp_epsP = min_epsP;
+        move32();
+    }
+
+    /* prediction gain = divide3232(L_shr(epsP[0], PRED_GAIN_E), g1[0]); */
+
+
+    return g1[0];
+}
 
 /*
  * E_LPC_schur
@@ -1638,30 +1656,20 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
         Word16 ImAr = extract_h( L_sub( ImagFFT[i], ImagFFT[N / 2 - i] ) );
         Word16 ImBr = extract_h( L_add( ImagFFT[i], ImagFFT[N / 2 - i] ) );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmpw15.v.re = mac_ro( L_mult( ptwiddle->v.re, pwn17->v.re ), ptwiddle->v.im, pwn17->v.im, &Overflow );
         move16();
         tmpw15.v.im = msu_ro( L_mult( ptwiddle->v.re, pwn17->v.im ), ptwiddle->v.im, pwn17->v.re, &Overflow );
         move16();
-#else  /* BASOP_NOGLOB */
-        tmpw15.v.re = mac_r( L_mult( ptwiddle->v.re, pwn17->v.re ), ptwiddle->v.im, pwn17->v.im );
-        tmpw15.v.im = msu_r( L_mult( ptwiddle->v.re, pwn17->v.im ), ptwiddle->v.im, pwn17->v.re );
-#endif /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
         RealOut[i] = mac_r( L_msu( L_msu( L_mult( ReAr, pwn17->v.re ), ImAr, pwn17->v.im ), ReBr, pwn15->v.im ), ImBr, pwn15->v.re );
         move16();
         ImagOut[i] = mac_r( L_mac( L_mac( L_mult( ReAr, pwn17->v.im ), ImAr, pwn17->v.re ), ReBr, pwn15->v.re ), ImBr, pwn15->v.im );
         move16();
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmpw15.v.re = msu_ro( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re, &Overflow );
         move16();
         tmpw15.v.im = mac_ro( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re, &Overflow );
         move16();
-#else  /* BASOP_NOGLOB */
-        tmpw15.v.re = msu_r( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re );
-        tmpw15.v.im = mac_r( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re );
-#endif /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
         RealOut[N / 2 - i] = msu_r( L_mac( L_mac( L_mult( ReAr, pwn17i->v.re ), ImAr, pwn17i->v.im ), ImBr, pwn15i->v.re ), ReBr, pwn15i->v.im );
         move16();
@@ -1682,30 +1690,20 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
         Word16 ImAr = extract_h( L_sub( ImagFFT[i], ImagFFT[N / 2 - i] ) );
         Word16 ImBr = extract_h( L_add( ImagFFT[i], ImagFFT[N / 2 - i] ) );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmpw15.v.re = mac_ro( L_mult( ptwiddle->v.im, pwn17->v.re ), ptwiddle->v.re, pwn17->v.im, &Overflow );
         move16();
         tmpw15.v.im = msu_ro( L_mult( ptwiddle->v.im, pwn17->v.im ), ptwiddle->v.re, pwn17->v.re, &Overflow );
         move16();
-#else  /* BASOP_NOGLOB */
-        tmpw15.v.re = mac_r( L_mult( ptwiddle->v.im, pwn17->v.re ), ptwiddle->v.re, pwn17->v.im );
-        tmpw15.v.im = msu_r( L_mult( ptwiddle->v.im, pwn17->v.im ), ptwiddle->v.re, pwn17->v.re );
-#endif /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
         RealOut[i] = mac_r( L_msu( L_msu( L_mult( ReAr, pwn17->v.re ), ImAr, pwn17->v.im ), ReBr, pwn15->v.im ), ImBr, pwn15->v.re );
         move16();
         ImagOut[i] = mac_r( L_mac( L_mac( L_mult( ReAr, pwn17->v.im ), ImAr, pwn17->v.re ), ReBr, pwn15->v.re ), ImBr, pwn15->v.im );
         move16();
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmpw15.v.re = msu_ro( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re, &Overflow );
         move16();
         tmpw15.v.im = mac_ro( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re, &Overflow );
         move16();
-#else /* BASOP_NOGLOB */
-        tmpw15.v.re = msu_r( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re );
-        tmpw15.v.im = mac_r( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         RealOut[N / 2 - i] = msu_r( L_mac( L_mac( L_mult( ReAr, pwn17i->v.re ), ImAr, pwn17i->v.im ), ImBr, pwn15i->v.re ), ReBr, pwn15i->v.im );
         move16();
@@ -1723,15 +1721,10 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
         Word16 ImAr = extract_h( L_sub( ImagFFT[i], ImagFFT[N / 2 - i] ) );
         Word16 ImBr = extract_h( ( L_negate( L_add( ImagFFT[i], ImagFFT[N / 2 - i] ) ) ) );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmpw15.v.re = mac_r_sat( L_mult( ptwiddle->v.im, pwn17->v.re ), ptwiddle->v.re, pwn17->v.im );
         move16();
         tmpw15.v.im = msu_r_sat( L_mult( ptwiddle->v.im, pwn17->v.im ), ptwiddle->v.re, pwn17->v.re );
         move16();
-#else
-        tmpw15.v.re = mac_r( L_mult( ptwiddle->v.im, pwn17->v.re ), ptwiddle->v.re, pwn17->v.im );
-        tmpw15.v.im = msu_r( L_mult( ptwiddle->v.im, pwn17->v.im ), ptwiddle->v.re, pwn17->v.re );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         RealOut[i] = msu_r( L_msu( L_msu( L_mult( ReAr, pwn17->v.re ), ImAr, pwn17->v.im ), ReBr, pwn15->v.im ), ImBr, pwn15->v.re );
         move16();
diff --git a/lib_com/lsf_dec_bfi_fx.c b/lib_com/lsf_dec_bfi_fx.c
index 6292630af70ea7d15bd23afe34d9148ccc50db9d..33de5d9ac09d01ac656426a142cbec602cb610c9 100644
--- a/lib_com/lsf_dec_bfi_fx.c
+++ b/lib_com/lsf_dec_bfi_fx.c
@@ -36,7 +36,7 @@ void lsf_dec_bfi(
     const Word16 Last_GSC_pit_band_idx,
     const Word16 Opt_AMR_WB, /* i  : IO flag                                */
     const Word8 tcxonly,
-    const short bwidth /* i: coded bandwidth */
+    const Word16 bwidth /* i: coded bandwidth */
 )
 {
     Word16 i;
diff --git a/lib_com/lsf_tools_fx.c b/lib_com/lsf_tools_fx.c
index 1b8438e84ad7f7266ddef765b5bed495cc7e340d..a41e10713968dd99b7d8fac5b16f4f448eb24163 100644
--- a/lib_com/lsf_tools_fx.c
+++ b/lib_com/lsf_tools_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -109,22 +109,14 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
         /* i = 5 */
         t0 = Mpy_32_16_1( b2, x ); /* t0 = x*b1                  */
         if ( !cheb )
-#ifdef BASOP_NOGLOB
             t0 = L_shl_o( t0, 1, &Overflow ); /* t0 = 2*x*b1                */
-#else                                         /* BASOP_NOGLOB */
-            t0 = L_shl( t0, 1 ); /* t0 = 2*x*b1                */
-#endif                                        /* BASOP_NOGLOB */
         t0 = L_sub( t0, b1 );                 /* t0 = 2*x*b1 - b2           */
         b1 = L_add( t0, *f++ );               /* b0 = 2*x*b1 - b2 + f[i]    */
 
         /* i = 6 */
         t0 = Mpy_32_16_1( b1, x ); /* t0 = x*b1                  */
         if ( !cheb )
-#ifdef BASOP_NOGLOB
             t0 = L_shl_o( t0, 1, &Overflow ); /* t0 = 2*x*b1                */
-#else                                         /* BASOP_NOGLOB */
-            t0 = L_shl( t0, 1 ); /* t0 = 2*x*b1                */
-#endif                                        /* BASOP_NOGLOB */
         t0 = L_sub( t0, b2 );                 /* t0 = 2*x*b1 - b2           */
     }
     /* IF (sub(n,8) == 0) */
@@ -134,11 +126,7 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
         /* i = 7 */
         t0 = Mpy_32_16_1( b2, x ); /* t0 = x*b1                  */
         if ( !cheb )
-#ifdef BASOP_NOGLOB
             t0 = L_shl_o( t0, 1, &Overflow ); /* t0 = 2*x*b1                */
-#else                                         /* BASOP_NOGLOB */
-            t0 = L_shl( t0, 1 ); /* t0 = 2*x*b1                */
-#endif                                        /* BASOP_NOGLOB */
         t0 = L_sub( t0, b1 );                 /* t0 = 2*x*b1 - b2           */
                                               /*b1 = L_add(b2,0);*/
     }
@@ -158,13 +146,8 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
 
 
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     t0 = L_shl_o( t0, shift, &Overflow ); /* Qx to Q30 with saturation */
     cheb = round_fx_o( t0, &Overflow );   /* Result in Q14              */
-#else                                     /* BASOP_NOGLOB */
-    t0 = L_shl( t0, shift );     /* Qx to Q30 with saturation */
-    cheb = round_fx( t0 );       /* Result in Q14              */
-#endif                                    /* BASOP_NOGLOB */
     cheb = s_max( -32767, cheb );         /* to avoid saturation        */
     BASOP_SATURATE_WARNING_ON_EVS
     return ( cheb );
@@ -303,11 +286,7 @@ void E_LPC_a_isp_conversion( const Word16 a[], Word16 isp[], const Word16 old_is
              * xint = xlow - ylow*(xhigh-xlow)/(yhigh-ylow)
              *--------------------------------------------------------*/
 
-#ifdef BASOP_NOGLOB
             y = sub_o( yhigh, ylow, &Overflow );
-#else
-            y = sub( yhigh, ylow );
-#endif
             IF( y != 0 )
             {
                 x = sub( xhigh, xlow );
@@ -466,15 +445,9 @@ void E_LPC_f_isp_a_conversion( const Word16 *isp, Word16 *a, const Word16 m )
 
         BASOP_SATURATE_WARNING_OFF_EVS /*overflow handling in loop expression*/
 
-#ifdef BASOP_NOGLOB
             t0 = L_shl_o( t0, q, &Overflow );
         t0n = L_sub_o( t0, 0x7FFFFFFF, &Overflow ); /*check for positive overflow*/
         t0p = L_sub_o( t0, 0x80000000, &Overflow ); /*check for negative overflow*/
-#else                                               /* BASOP_NOGLOB */
-            t0 = L_shl( t0, q );
-        t0n = L_sub( t0, 0x7FFFFFFF ); /*check for positive overflow*/
-        t0p = L_sub( t0, 0x80000000 ); /*check for negative overflow*/
-#endif                                              /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
 
         q = sub( q, 1 ); /*decrease q in case of overflow*/
@@ -631,6 +604,151 @@ Word16 lpc2lsp_fx(
     return ( 1 );
 }
 
+/*===================================================================*/
+/* FUNCTION : lpc2lsp_ivas_fx () */
+/*-------------------------------------------------------------------*/
+/* PURPOSE : Convert LPC coefficients to LSP coefficients */
+/*-------------------------------------------------------------------*/
+/* INPUT ARGUMENTS : */
+/* */
+/* _ (Word32 []) a : LPC coefficients, Q27 */
+/* _ (Word16 []) old_freq: Previous frame LSP coefficients, Q15 */
+/* _ (Word16 []) order: LPC order */
+/*-------------------------------------------------------------------*/
+/* OUTPUT ARGUMENTS : */
+/* _ (Word16 []) freq: LSP coefficients, Q15 */
+/*-------------------------------------------------------------------*/
+/* INPUT/OUTPUT ARGUMENTS : */
+/* _ None */
+/*-------------------------------------------------------------------*/
+/* RETURN ARGUMENTS : */
+/* _ (Word16) flag: 1 means all 10 LSPs are found, 0 otherwise */
+/*===================================================================*/
+
+/*NOTE: This function was created to avoid a crash that happens in the*/
+/*      first for loop of this function while performing L_shl on a in*/
+/*      lpc2lsp_fx, this computation assigns value to Lacc, which is  */
+/*      kept in Q26 here to avoid L_shl when a has saturated value.   */
+Word16 lpc2lsp_ivas_fx(
+    Word32 *a,
+    Word16 *freq,
+    Word16 *old_freq,
+    Word16 order )
+{
+    Word16 i;
+    Word16 rt, low, high, prev_rt, rc;
+    Word32 p[11], q[11]; /*  Q26 */
+    Word32 Ltemp, v_low;
+    Word32 Lacc;
+    Word16 tfreq[21];
+
+    /* First construct the P,Q polynomial */
+    /* p[0] = q[0] = 1 */
+    /* p[i] = -lpcCoeff[i] - lpcCoeff[11-i] - p[i-1] ( 1<=i<=5)*/
+    /* q[i] = -lpcCoeff[i] + lpcCoeff[11-i] + q[i-1] ( 1<=i<=5)*/
+    Ltemp = L_deposit_h( 0x400 ); /*  Ltemp is 1.0 in Q26 */
+
+    p[0] = Ltemp;
+    move32();
+    q[0] = Ltemp;
+    move32();
+
+    FOR( i = 1; i < ( order / 2 ) + 1; i++ )
+    {
+        Lacc = L_shr( a[order - i], 1 );
+        move32();                                   /* Q26 */
+        Lacc = L_sub( Lacc, L_shr( a[i - 1], 1 ) ); /*  Lacc=-lpcCoeff[i-1] + lpcCoeff[order-i]//Q26 */
+        q[i] = L_add( ( Lacc ), q[i - 1] );
+        move32(); /* Q26 */
+
+        Lacc = L_add( Lacc, a[i - 1] ); /*  Lacc=lpcCoeff[i-1] + lpcCoeff[order-i]//Q26 */
+
+        p[i] = L_sub( L_negate( Lacc ), p[i - 1] );
+        move32(); /* Q26 */
+    }
+
+    /* Search roots of the P and Q polynomials */
+
+    v_low = polynomial_eval_fx( 0, p, order ); /* Q25 */
+    move16();
+    move16();
+    move16();
+    move16();
+    low = 0;
+    high = 8;
+    prev_rt = 0;
+    rc = 0; /*  root counter */
+    FOR( i = 0; i < 32; i++ )
+    {
+        rt = root_search_fx( low, high, &v_low, p, order );
+        low = high;
+        move16();
+        high = add( high, 8 );
+
+        IF( GE_16( rt, prev_rt ) )
+        {
+            tfreq[rc] = rt;
+            move16();
+            rc = add( rc, 2 );
+        }
+        prev_rt = add( rt, 6 );
+    } /*  End for P roots */
+
+    tfreq[rc] = 0x3f80;
+    move16(); /*  Set a high enough value as fake root for Q search */
+
+    IF( LT_16( rc, order ) )
+    {
+        /*  lost P root */
+        /* copy from previous LSP and return */
+        FOR( i = 0; i < order; i++ )
+        {
+            move16();
+            freq[i] = old_freq[i];
+        }
+        return ( 0 );
+    }
+    ELSE
+    {
+        /*  Search for Q roots between P roots */
+        v_low = L_deposit_h( 0x800 ); /* Init a positive value for v_low */
+        rc = 1;
+        move16();
+        FOR( i = 0; i < order / 2; i++ )
+        {
+            low = shr( tfreq[rc - 1], 6 );
+            high = add( shr( tfreq[rc + 1], 6 ), 1 );
+            rt = root_search_fx( low, high, &v_low, q, order );
+
+            IF( rt < 0 )
+            {
+                /* No Q root in this interval */
+                /* copy from previous LSP and return */
+                FOR( i = 0; i < order; i++ )
+                {
+                    move16();
+                    freq[i] = old_freq[i];
+                }
+                return ( 0 );
+            }
+            ELSE
+            {
+                move16();
+                tfreq[rc] = rt;
+                rc = add( rc, 2 );
+            } /*  end else, find Q root */
+        }     /*  end for */
+    }         /* end else */
+
+    FOR( i = 0; i < order; i++ )
+    {
+        freq[i] = tfreq[i];
+        move16();
+    }
+
+    return ( 1 );
+}
+
 /*===================================================================*/
 /* FUNCTION      :  lsp2lpc_fx ()                                    */
 /*-------------------------------------------------------------------*/
@@ -683,11 +801,7 @@ void lsp2lpc_fx(
     move16();
     FOR( i = 0; i < order / 2; i++ )
     {
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         Ltemp = L_add_o( pq[i], pq[i + 1], &Overflow );
-#else
-        Ltemp = L_add( pq[i], pq[i + 1] );
-#endif
         giOverflow = (Word16) Overflow;
         move16();
         IF( EQ_16( giOverflow, 1 ) )
@@ -719,11 +833,7 @@ void lsp2lpc_fx(
 
     FOR( i = 0; i < order / 2; i++ )
     {
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         Ltemp = L_sub_o( pq[i + 1], pq[i], &Overflow );
-#else
-        Ltemp = L_sub( pq[i + 1], pq[i] );
-#endif
         giOverflow = (Word16) Overflow;
         move16();
         IF( EQ_16( giOverflow, 1 ) )
@@ -749,11 +859,7 @@ void lsp2lpc_fx(
         {
             Overflow = 0;
             move16();
-#ifdef BASOP_NOGLOB                                  /* Critical Overflow */
             Lacc = L_add_o( p[i], q[i], &Overflow ); /* p[i], q[i] in Q24 */
-#else
-            Lacc = L_add( p[i], q[i] );                /* p[i], q[i] in Q24 */
-#endif
             if ( Overflow )
             {
                 giOverflow = 1;
@@ -763,11 +869,7 @@ void lsp2lpc_fx(
             Lacc = L_negate( Lacc ); /* Lacc=-(p[i]-q[i])/2 in Q25 */
             Overflow = 0;
             move16();
-#ifdef BASOP_NOGLOB                                                              /* Critical Overflow */
             Lacc = L_add_o( L_shl_o( Lacc, 3, &Overflow ), 0x08000, &Overflow ); /* rounding */
-#else
-            Lacc = L_add( L_shl( Lacc, 3 ), 0x08000 ); /* rounding */
-#endif
             if ( Overflow )
             {
                 giOverflow = 1;
@@ -785,11 +887,7 @@ void lsp2lpc_fx(
         {
             Overflow = 0;
             move16();
-#ifdef BASOP_NOGLOB                                  /* Critical Overflow */
             Lacc = L_sub_o( q[i], p[i], &Overflow ); /* p[i], q[i] in Q24 */
-#else
-            Lacc = L_sub( q[i], p[i] );                /* p[i], q[i] in Q24 */
-#endif
             if ( Overflow )
             {
                 giOverflow = 1;
@@ -797,11 +895,7 @@ void lsp2lpc_fx(
             }
             Overflow = 0;
             move16();
-#ifdef BASOP_NOGLOB                                                              /* Critical Overflow */
             Lacc = L_add_o( L_shl_o( Lacc, 3, &Overflow ), 0x08000, &Overflow ); /* rounding */
-#else
-            Lacc = L_add( L_shl( Lacc, 3 ), 0x08000 ); /* rounding */
-#endif
             if ( Overflow )
             {
                 giOverflow = 1;
@@ -890,22 +984,13 @@ Word16 E_LPC_f_lsp_pol_get( const Word16 lsp[], Word32 f[], const Word16 n, cons
     Overflow = 0;
     move16();
     plsp = lsp;
-#ifdef BASOP_NOGLOB /* Critical Overflow and all those below*/
     f[0] = L_shl_o( 1, sub( 31, Q_out ), &Overflow );
-#else
-    f[0] = L_shl( 1, sub( 31, Q_out ) );
-#endif
     move32();
     /*b = -2.0f * *plsp;*/
     b = *plsp;
     move16();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
     m2 = shl_o( -2, sub( 15, Q_out ), &Overflow );
     f[1] = L_mult_o( b, m2, &Overflow );
-#else
-    m2 = shl( -2, sub( 15, Q_out ) );
-    f[1] = L_mult( b, m2 );
-#endif
     move32();
 
     FOR( i = 2; i <= n; i++ )
@@ -914,35 +999,19 @@ Word16 E_LPC_f_lsp_pol_get( const Word16 lsp[], Word32 f[], const Word16 n, cons
         /*b = 2.0f * *plsp;*/
         move16();
         b = *plsp;
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         b32 = L_mult_o( b, m2, &Overflow );
-#else
-        b32 = L_mult( b, m2 );
-#endif
         /*f[i] = -b*f[i-1] + 2.0f*f[i-2];*/
         move32();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         f[i] = L_shl_o( L_sub_o( f[i - 2], Mpy_32_16_1( f[i - 1], b ), &Overflow ), 1, &Overflow );
-#else
-        f[i] = L_shl( L_sub( f[i - 2], Mpy_32_16_1( f[i - 1], b ) ), 1 );
-#endif
 
         FOR( j = i - 1; j > 1; j-- )
         {
             /*f[j] += b*f[j-1] + f[j-2];*/
             move32();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
             f[j] = L_add_o( f[j], L_sub_o( f[j - 2], L_shl_o( Mpy_32_16_1( f[j - 1], b ), 1, &Overflow ), &Overflow ), &Overflow );
-#else
-            f[j] = L_add( f[j], L_sub( f[j - 2], L_shl( Mpy_32_16_1( f[j - 1], b ), 1 ) ) );
-#endif
         }
         move32();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         f[1] = L_add_o( f[1], b32, &Overflow );
-#else
-        f[1] = L_add( f[1], b32 );
-#endif
     }
 
 
@@ -1186,11 +1255,7 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
     {
         f1[nc - i] = L_add( f1[nc - i], f1[nc - i - 1] );
         move32();
-#ifdef BASOP_NOGLOB
         f2[nc - i] = L_sub_o( f2[nc - i], f2[nc - i - 1], &Overflow );
-#else
-        f2[nc - i] = L_sub( f2[nc - i], f2[nc - i - 1] );
-#endif
         move32();
     }
 
@@ -1202,13 +1267,8 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
     t0 = L_deposit_l( 0 );
     FOR( i = 1; i <= nc; i++ )
     {
-#ifdef BASOP_NOGLOB
         t0 = L_max( t0, L_abs( L_add_o( f1[i], f2[i], &Overflow ) ) );
         t0 = L_max( t0, L_abs( L_sub_o( f1[i], f2[i], &Overflow ) ) );
-#else
-        t0 = L_max( t0, L_abs( L_add( f1[i], f2[i] ) ) );
-        t0 = L_max( t0, L_abs( L_sub( f1[i], f2[i] ) ) );
-#endif
     }
     k = s_min( norm_l( t0 ), 6 );
     a[0] = shl( 256, k );
@@ -1223,30 +1283,14 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
     FOR( i = 1; i <= nc; i++ )
     {
         /* a[i] = 0.5*(f1[i] + f2[i]) */
-#ifdef BASOP_NOGLOB
         t0 = L_add_o( f1[i], f2[i], &Overflow );
-#else
-        t0 = L_add( f1[i], f2[i] );
-#endif
         t0 = L_shl( t0, k );
-#ifdef BASOP_NOGLOB
         a[i] = round_fx_o( t0, &Overflow ); /* from Q23 to Qx and * 0.5 */
-#else
-        a[i] = round_fx( t0 ); /* from Q23 to Qx and * 0.5 */
-#endif
 
         /* a[j] = 0.5*(f1[i] - f2[i]) */
-#ifdef BASOP_NOGLOB
         t0 = L_sub_o( f1[i], f2[i], &Overflow );
-#else
-        t0 = L_sub( f1[i], f2[i] );
-#endif
         t0 = L_shl( t0, k );
-#ifdef BASOP_NOGLOB
         a[j] = round_fx_o( t0, &Overflow ); /* from Q23 to Qx and * 0.5 */
-#else
-        a[j] = round_fx( t0 );                      /* from Q23 to Qx and * 0.5 */
-#endif
         j--;
     }
 
@@ -1459,6 +1503,80 @@ void lsp_weights_fx(
     move16();
 }
 
+void lsp_weights_ivas_fx(
+    Word16 lsp_nq_fx[],
+    Word16 w[],
+    Word16 Order,
+    Word16 *Qout )
+{
+    Word16 i;
+    Word16 q_weight[20];
+    Word32 weight[20];
+    Word16 delta1, delta2;
+    Word32 L_tmp;
+    Word16 q_min;
+
+    delta1 = lsp_nq_fx[0]; // Q15
+    move16();
+    delta2 = sub( lsp_nq_fx[1], lsp_nq_fx[0] ); // Q15
+
+    L_tmp = L_mult0( delta1, delta2 );                                            // Q30                    // Q30
+    L_tmp = root_a_over_b_ivas_fx( ALPHA_SQ_Q30, Q30, L_tmp, Q30, &q_weight[0] ); // q_weight[0]
+
+    weight[0] = Mpy_32_16_1( L_tmp, 32000 /* 250 in Q7*/ ); // q_weight[0]-8
+    q_weight[0] = sub( q_weight[0], 8 );
+    move32();
+    move16();
+
+    q_min = q_weight[0];
+    move16();
+
+    FOR( i = 1; i < Order - 1; i++ )
+    {
+        delta1 = sub( lsp_nq_fx[i], lsp_nq_fx[i - 1] ); // Q15
+        delta2 = sub( lsp_nq_fx[i + 1], lsp_nq_fx[i] ); // Q15
+
+        L_tmp = L_mult0( delta1, delta2 );                                            // Q30
+        L_tmp = root_a_over_b_ivas_fx( ALPHA_SQ_Q30, Q30, L_tmp, Q30, &q_weight[i] ); // q_weight[i]
+
+        weight[i] = Mpy_32_16_1( L_tmp, 32000 /* 250 in Q7*/ ); // q_weight[i]
+        q_weight[i] = sub( q_weight[i], 8 );
+        move32();
+        move16();
+
+        q_min = s_min( q_min, q_weight[i] );
+    }
+    delta1 = sub( lsp_nq_fx[i], lsp_nq_fx[i - 1] );      // Q15
+    delta2 = sub( 16384 /* 0.5 in Q15*/, lsp_nq_fx[i] ); // Q15
+
+    L_tmp = L_mult0( delta1, delta2 );                                            // Q30
+    L_tmp = root_a_over_b_ivas_fx( ALPHA_SQ_Q30, Q30, L_tmp, Q30, &q_weight[i] ); // q_weight[i]
+
+    weight[i] = Mpy_32_16_1( L_tmp, 32000 /* 250 in Q7*/ ); // q_weight[i]
+    q_weight[i] = sub( q_weight[i], 8 );
+    move32();
+    move16();
+
+    q_min = s_min( q_min, q_weight[i] );
+
+    FOR( i = 0; i < Order; i++ )
+    {
+        w[i] = round_fx( L_shl( weight[i], sub( q_min, q_weight[i] ) ) ); /* q_min-16 */
+        move16();
+    }
+
+    IF( Order != LPC_SHB_ORDER_WB )
+    {
+        w[3] = round_fx( L_shl( L_mult( w[3], 18022 ), 1 ) ); /* q_min-16 */
+        w[4] = round_fx( L_shl( L_mult( w[4], 18022 ), 1 ) ); /* q_min-16 */
+        move16();
+        move16();
+    }
+
+    *Qout = sub( q_min, 16 );
+    move16();
+}
+
 /*
  * E_LPC_isf_isp_conversion
  *
@@ -1678,41 +1796,23 @@ void a2rc_fx( const Word16 *a, /* i:  can be any Q     */
         FOR( j = 0; j < m / 2; j++ )
         {
             n = sub( sub( m, (Word16) 1 ), j );
-            L_tmp1 = L_mult( denom_mant, f_fx[j] ); /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
-#ifdef BASOP_NOGLOB
+            L_tmp1 = L_mult( denom_mant, f_fx[j] );              /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
             L_tmp1 = L_mac_o( L_tmp1, tmp, f_fx[n], &Overflow ); /* denom*f[j]+km*denom*f[n] in Q28 (floating with exp) */
-#else
-            L_tmp1 = L_mac( L_tmp1, tmp, f_fx[n] ); /* denom*f[j]+km*denom*f[n] in Q28 (floating with exp) */
-#endif
-            L_tmp2 = L_mult( denom_mant, f_fx[n] ); /* denom*f[n]. Q15*Q12 = Q28 (floating with exp) */
-#ifdef BASOP_NOGLOB
+            L_tmp2 = L_mult( denom_mant, f_fx[n] );              /* denom*f[n]. Q15*Q12 = Q28 (floating with exp) */
             L_tmp2 = L_mac_o( L_tmp2, tmp, f_fx[j], &Overflow ); /* denom*f[n]+km*denom*f[j] in Q28 (floating with exp) */
             L_tmp1 = L_shr_o( L_tmp1, exp, &Overflow );          /* bringing to true Q28 */
             L_tmp2 = L_shr_o( L_tmp2, exp, &Overflow );          /* bringing to true Q28 */
             f_fx[j] = round_fx_o( L_tmp1, &Overflow );           /* extracting in q_a */
             f_fx[n] = round_fx_o( L_tmp2, &Overflow );           /* extracting in q_a */
-#else
-            L_tmp2 = L_mac( L_tmp2, tmp, f_fx[j] ); /* denom*f[n]+km*denom*f[j] in Q28 (floating with exp) */
-            L_tmp1 = L_shr( L_tmp1, exp );          /* bringing to true Q28 */
-            L_tmp2 = L_shr( L_tmp2, exp );          /* bringing to true Q28 */
-            f_fx[j] = round_fx( L_tmp1 );           /* extracting in q_a */
-            f_fx[n] = round_fx( L_tmp2 );           /* extracting in q_a */
-#endif
         }
 
         IF( m & 1 )
         {
-            L_tmp1 = L_mult( denom_mant, f_fx[j] ); /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
-#ifdef BASOP_NOGLOB
+            L_tmp1 = L_mult( denom_mant, f_fx[j] );              /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
             L_tmp1 = L_mac_o( L_tmp1, tmp, f_fx[j], &Overflow ); /* denom*f[j]+km*denom*f[j] in Q28 (floating with exp) */
             L_tmp1 = L_shr_o( L_tmp1, exp, &Overflow );          /* bringing to true Q28 */
             f_fx[j] = round_fx_o( L_tmp1, &Overflow );           /* extracting in q_a */
             move16();
-#else
-            L_tmp1 = L_mac( L_tmp1, tmp, f_fx[j] ); /* denom*f[j]+km*denom*f[j] in Q28 (floating with exp) */
-            L_tmp1 = L_shr( L_tmp1, exp );          /* bringing to true Q28 */
-            f_fx[j] = round_fx( L_tmp1 );           /* extracting in q_a */
-#endif
         }
     }
 
@@ -2211,18 +2311,10 @@ Word16 lsf_stab_fx(                          /* o  : LP filter stability   Q15*/
     }
 
     e = sub( 30 - 21 - 1, e );
-#ifdef BASOP_NOGLOB
     tmp = round_fx_o( L_shl_o( L_tmp, e, &Overflow ), &Overflow ); /*Q14*/
-#else                                                              /* BASOP_NOGLOB */
-    tmp = round_fx( L_shl( L_tmp, e ) );            /*Q14*/
-#endif                                                             /* BASOP_NOGLOB */
 
-    tmp = sub( 20480, tmp ); /* 1.25 - tmp in Q14          */
-#ifdef BASOP_NOGLOB
+    tmp = sub( 20480, tmp );          /* 1.25 - tmp in Q14          */
     tmp = shl_o( tmp, 1, &Overflow ); /* Q14 -> Q15 with saturation */
-#else                                 /* BASOP_NOGLOB */
-    tmp = shl( tmp, 1 );                            /* Q14 -> Q15 with saturation */
-#endif
 
     tmp = s_max( tmp, 0 );
 
@@ -2312,20 +2404,12 @@ Word16 lsf_stab_ivas_fx(                          /* o  : LP filter stability
     }
 
     e = sub( 30 - 21 - 1, e );
-#ifdef BASOP_NOGLOB
     tmp = round_fx_o( L_shl_o( L_tmp, e, &Overflow ), &Overflow ); /*Q12*/
-#else                                                              /* BASOP_NOGLOB */
-    tmp = round_fx( L_shl( L_tmp, e ) );            /*Q14*/
-#endif                                                             /* BASOP_NOGLOB */
 
     // tmp = sub(20480, tmp);                /* 1.25 - tmp in Q14          */
     tmp = sub( 5120, tmp ); /* 1.25 - tmp in Q12          */
-#ifdef BASOP_NOGLOB
     // tmp = shl_o(tmcp, 1, &Overflow);                    /* Q14 -> Q15 with saturation */
     tmp = shl_sat( tmp, 3 ); /* Q12 -> Q15 with saturation */
-#else                        /* BASOP_NOGLOB */
-    tmp = shl( tmp, 1 );                            /* Q14 -> Q15 with saturation */
-#endif
 
     tmp = s_max( tmp, 0 );
 
@@ -2547,11 +2631,7 @@ void lsf2lsp_fx(
         {
             offset = negate( offset );
         }
-#ifdef BASOP_NOGLOB
         L_tmp = L_mult( sub_sat( offset, lsf_tmp ), round_fx( L_shl( L_and( L_tmp, 0xFFFF ), 15 ) ) );
-#else
-        L_tmp = L_mult( sub( offset, lsf_tmp ), round_fx( L_shl( L_and( L_tmp, 0xFFFF ), 15 ) ) );
-#endif
         L_tmp = L_msu( L_tmp, lsf_tmp, -32768 );
         lsp[i] = round_fx( L_tmp );
     }
@@ -2783,40 +2863,39 @@ Word16 qlsf_ARSN_tcvq_Dec_16k_fx(
 }
 
 /*======================================================================*/
-/* FUNCTION : lsf_syn_mem_backup_fx                                 */
+/* FUNCTION : lsf_syn_mem_backup_fx                                     */
 /*----------------------------------------------------------------------*/
 /* PURPOSE : back-up synthesis filter memory and LSF qunatizer memories */
 /*----------------------------------------------------------------------*/
-/*  INPUT ARGUMENTS :                            */
-/* _ (Word16*) lsp_new           : LSP vector to quantize                */
-/* _ (Word16*) lsf_new           : quantized LSF vector                  */
-/* _ (Word16*) lsp_mid           :  mid-frame LSP vector                 */
-/* _ (Encoder_State) st_fx :  Encoder state Structure                  */
-/*-----------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS :                           */
-/* _None                                                                 */
-/*-----------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :                           */
-/* _ (Word16) clip_var     : pitch clipping state var                    */
-/* _ (Word16*) mem_AR      : quantizer memory for AR model               */
-/* _ (Word16*) mem_MA      : quantizer memory for MA model               */
-/* _ (Word16*) lsp_new_bck : LSP vector to quantize- backup              */
-/* _ (Word16*) lsf_new_bck : quantized LSF vector - backup               */
-/* _ (Word16*) lsp_mid_bck : mid-frame LSP vector - backup               */
+/*  INPUT ARGUMENTS :                                                   */
+/* _ (Word16*) lsp_new           : LSP vector to quantize               */
+/* _ (Word16*) lsf_new           : quantized LSF vector                 */
+/* _ (Word16*) lsp_mid           :  mid-frame LSP vector                */
+/* _ (Encoder_State) st_fx :  Encoder state Structure                   */
+/*----------------------------------------------------------------------*/
+/* INPUT/OUTPUT ARGUMENTS :                                             */
+/* _None                                                                */
+/*----------------------------------------------------------------------*/
+/* OUTPUT ARGUMENTS :                                                   */
+/* _ (Word16) clip_var     : pitch clipping state var                   */
+/* _ (Word16*) mem_AR      : quantizer memory for AR model              */
+/* _ (Word16*) mem_MA      : quantizer memory for MA model              */
+/* _ (Word16*) lsp_new_bck : LSP vector to quantize- backup             */
+/* _ (Word16*) lsf_new_bck : quantized LSF vector - backup              */
+/* _ (Word16*) lsp_mid_bck : mid-frame LSP vector - backup              */
 /* _ (Word16)     mCb1     :counter for stationary frame after a transition frame */
-/* _ (Word32*) Bin_E       : FFT Bin energy 128 *2 sets                  */
-/* _ (Word32*) Bin_E_old   : FFT Bin energy 128 *2 sets                  */
-/* _ (Word16*) mem_syn_bck : synthesis filter memory                     */
-/* _ (Word16)  mem_w0_bck  : memory of the weighting filter              */
-/* _ (Word16) streaklimit  : LSF quantizer                               */
-/* _ (Word16) pstreaklen   : LSF quantizer                               */
-/*-----------------------------------------------------------------------*/
-
-/* _ None                                                                */
-/*-----------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :                           */
-/* _ None                                 */
-/*=======================================================================*/
+/* _ (Word32*) Bin_E       : FFT Bin energy 128 *2 sets                 */
+/* _ (Word32*) Bin_E_old   : FFT Bin energy 128 *2 sets                 */
+/* _ (Word16*) mem_syn_bck : synthesis filter memory                    */
+/* _ (Word16)  mem_w0_bck  : memory of the weighting filter             */
+/* _ (Word16) streaklimit  : LSF quantizer                              */
+/* _ (Word16) pstreaklen   : LSF quantizer                              */
+/*----------------------------------------------------------------------*/
+/* _ None                                                               */
+/*----------------------------------------------------------------------*/
+/* RETURN ARGUMENTS :                                                   */
+/* _ None                                                               */
+/*======================================================================*/
 
 void lsf_syn_mem_backup_fx(
     Encoder_State *st_fx,         /* o: state structure                                                                                      */
@@ -2824,23 +2903,22 @@ void lsf_syn_mem_backup_fx(
     Word32 *gc_threshold_fx,      /* i:                                                     Q16                                              */
     Word16 *clip_var_bck_fx,      /* i:                                                     Q(2.56), Q14, Q7, Q0, Q14, Q14                   */
     Word16 *next_force_sf_bck_fx, /* i:                                                                                                      */
-
-    Word16 *lsp_new,     /* o: LSP vector to quantize                              Q15                                              */
-    Word16 *lsf_new,     /* i: quantized LSF vector                                Q15                                              */
-    Word16 *lsp_mid,     /* o: mid-frame LSP vector                                Q15                                              */
-    Word16 *clip_var,    /* i: pitch clipping state var                            Q(2.56)                                          */
-    Word16 *mem_AR,      /* i: quantizer memory for AR model                       2.56                                             */
-    Word16 *mem_MA,      /* i: quantizer memory for MA model                       2.56                                             */
-    Word16 *lsp_new_bck, /* i: LSP vector to quantize- backup                      Q15                                              */
-    Word16 *lsf_new_bck, /* o: quantized LSF vector - backup                       Q15                                              */
-    Word16 *lsp_mid_bck, /* i: mid-frame LSP vector - backup                       Q15                                              */
-    Word16 *mCb1,        /* o: counter for stationary frame after a transition frame                                                */
-    Word32 *Bin_E,       /* i: FFT Bin energy 128 *2 sets                          q_bin                                            */
-    Word32 *Bin_E_old,   /* i: FFT Bin energy 128 sets                             q_bin                                            */
-    Word16 *mem_syn_bck, /* i: synthesis filter memory                             q                                                */
-    Word16 *mem_w0_bck,  /* i: memory of the weighting filter                      q                                                */
-    Word16 *streaklimit, /* i:LSF quantizer                                        Q15                                              */
-    Word16 *pstreaklen   /* i:LSF quantizer                                                                                         */
+    Word16 *lsp_new,              /* o: LSP vector to quantize                              Q15                                              */
+    Word16 *lsf_new,              /* i: quantized LSF vector                                Q15                                              */
+    Word16 *lsp_mid,              /* o: mid-frame LSP vector                                Q15                                              */
+    Word16 *clip_var,             /* i: pitch clipping state var                            Q(2.56)                                          */
+    Word16 *mem_AR,               /* i: quantizer memory for AR model                       2.56                                             */
+    Word16 *mem_MA,               /* i: quantizer memory for MA model                       2.56                                             */
+    Word16 *lsp_new_bck,          /* i: LSP vector to quantize- backup                      Q15                                              */
+    Word16 *lsf_new_bck,          /* o: quantized LSF vector - backup                       Q15                                              */
+    Word16 *lsp_mid_bck,          /* i: mid-frame LSP vector - backup                       Q15                                              */
+    Word16 *mCb1,                 /* o: counter for stationary frame after a transition frame                                                */
+    Word32 *Bin_E,                /* i: FFT Bin energy 128 *2 sets                          q_bin                                            */
+    Word32 *Bin_E_old,            /* i: FFT Bin energy 128 sets                             q_bin                                            */
+    Word16 *mem_syn_bck,          /* i: synthesis filter memory                             q                                                */
+    Word16 *mem_w0_bck,           /* i: memory of the weighting filter                      q                                                */
+    Word16 *streaklimit,          /* i:LSF quantizer                                        Q15                                              */
+    Word16 *pstreaklen            /* i:LSF quantizer                                                                                         */
 )
 {
     Word16 i;
@@ -2905,25 +2983,31 @@ void lsf_syn_mem_backup_fx(
     return;
 }
 
+
+/*-------------------------------------------------------------------*
+ * lsf_syn_mem_backup_fx()
+ *
+ *
+ *--------------------------------------------------------------------*/
+
 void lsf_syn_mem_backup_ivas_fx(
     Encoder_State *st_fx,         /* i: state structure                                                                            */
     Word16 *btilt_code_fx,        /* i: tilt code                                       Q15                                        */
     Word32 *gc_threshold_fx,      /* i:                                                 Q16                                        */
     Word16 *clip_var_bck_fx,      /* o:                                                 Q(2.56), Q14, Q7, Q0, Q14, Q14             */
     Word16 *next_force_sf_bck_fx, /* o:                                                                                            */
-
-    Word16 *lsp_new,     /* i: LSP vector to quantize                                   Q15                                        */
-    Word16 *lsp_mid,     /* i: mid-frame LSP vector                                     Q15                                        */
-    Word16 *clip_var,    /* o: pitch clipping state var                                 Q(2.56)                                    */
-    Word16 *mem_AR,      /* o: quantizer memory for AR model                            Q(2.56)                                    */
-    Word16 *mem_MA,      /* o: quantizer memory for AR model                            Q(2.56)                                    */
-    Word16 *lsp_new_bck, /* o: LSP vector to quantize- backup                           Q15                                        */
-    Word16 *lsp_mid_bck, /* o: mid-frame LSP vector - backup                            Q15                                        */
-    Word32 *Bin_E,       /* o: FFT Bin energy 128 *2 sets                               Q_new + Q_SCALE - 2                        */
-    Word32 *Bin_E_old,   /* o: FFT Bin energy 128 sets                                  Q_new + Q_SCALE - 2                        */
-    Word16 *mem_syn_bck, /* o: synthesis filter memory                                  ( 15 - st_fx->hLPDmem->e_mem_syn )         */
-    Word16 *mem_w0_bck,  /* o: memory of the weighting filter                           ( 15 - st_fx->hLPDmem->e_mem_syn )         */
-    Word16 *streaklimit, /*                                                             Q15                                        */
+    Word16 *lsp_new,              /* i: LSP vector to quantize                          Q15                                        */
+    Word16 *lsp_mid,              /* i: mid-frame LSP vector                            Q15                                        */
+    Word16 *clip_var,             /* o: pitch clipping state var                        Q(2.56)                                    */
+    Word16 *mem_AR,               /* o: quantizer memory for AR model                   Q(2.56)                                    */
+    Word16 *mem_MA,               /* o: quantizer memory for AR model                   Q(2.56)                                    */
+    Word16 *lsp_new_bck,          /* o: LSP vector to quantize- backup                  Q15                                        */
+    Word16 *lsp_mid_bck,          /* o: mid-frame LSP vector - backup                   Q15                                        */
+    Word32 *Bin_E,                /* o: FFT Bin energy 128 *2 sets                      Q_new + Q_SCALE - 2                        */
+    Word32 *Bin_E_old,            /* o: FFT Bin energy 128 sets                         Q_new + Q_SCALE - 2                        */
+    Word16 *mem_syn_bck,          /* o: synthesis filter memory                         ( 15 - st_fx->hLPDmem->e_mem_syn )         */
+    Word16 *mem_w0_bck,           /* o: memory of the weighting filter                  ( 15 - st_fx->hLPDmem->e_mem_syn )         */
+    Word16 *streaklimit,          /*                                                    Q15                                        */
     Word16 *pstreaklen )
 {
     Word16 i;
@@ -2964,11 +3048,11 @@ void lsf_syn_mem_backup_ivas_fx(
     /* back-up memories */
     FOR( i = 0; i < M; i++ )
     {
-        mem_syn_bck[i] = hLPDmem->mem_syn[i]; // Q: ( 15 - st_fx->hLPDmem->e_mem_syn )
+        mem_syn_bck[i] = hLPDmem->mem_syn[i]; // Q( st_fx->hLPDmem->q_mem_syn )
         move16();
     }
 
-    *mem_w0_bck = hLPDmem->mem_w0; // ( 15 - st_fx->hLPDmem->e_mem_syn )
+    *mem_w0_bck = hLPDmem->mem_w0; // Q( st_fx->hLPDmem->q_mem_syn )
     move16();
 
 
@@ -2999,66 +3083,68 @@ void lsf_update_memory(
         move16();
         mem_MA[i] = sub( sub( qlsf[i], lsf_means[narrowband][i] ), mult_r( MU_MA_FX, old_mem_MA[i] ) );
     }
+
+    return;
 }
 
+
 /*======================================================================*/
-/* FUNCTION : lsf_syn_mem_restore_fx                             */
+/* FUNCTION : lsf_syn_mem_restore_fx                                    */
 /*----------------------------------------------------------------------*/
 /* PURPOSE :  restore synthesis filter memory and LSF quantizer memories*/
 /*----------------------------------------------------------------------*/
-/*  INPUT ARGUMENTS :                             */
-/* _ (Word16) clip_var     : pitch clipping state var                  */
-/* _ (Word16*) mem_AR      : quantizer memory for AR model             */
-/* _ (Word16*) mem_MA      : quantizer memory for MA model             */
-/* _ (Word16*) lsp_new_bck : LSP vector to quantize- backup            */
-/* _ (Word16*) lsf_new_bck : quantized LSF vector - backup             */
-/* _ (Word16*) lsp_mid_bck : mid-frame LSP vector - backup             */
+/*  INPUT ARGUMENTS :                                                   */
+/* _ (Word16) clip_var     : pitch clipping state var                   */
+/* _ (Word16*) mem_AR      : quantizer memory for AR model              */
+/* _ (Word16*) mem_MA      : quantizer memory for MA model              */
+/* _ (Word16*) lsp_new_bck : LSP vector to quantize- backup             */
+/* _ (Word16*) lsf_new_bck : quantized LSF vector - backup              */
+/* _ (Word16*) lsp_mid_bck : mid-frame LSP vector - backup              */
 /* _ (Word16)     mCb1     :counter for stationary frame after a transition frame */
-/* _ (Word32*) Bin_E       : FFT Bin energy 128 *2 sets                  */
-/* _ (Word32*) Bin_E_old   : FFT Bin energy 128 *2 sets                  */
-/* _ (Word16*) mem_syn_bck : synthesis filter memory                     */
-/* _ (Word16)  mem_w0_bck  : memory of the weighting filter              */
-/* _ (Word16) streaklimit  : LSF quantizer                               */
-/* _ (Word16) pstreaklen   : LSF quantizer                               */
-/*-----------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS :                           */
-/* _None                                                                 */
-/*-----------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :                           */
-/* _ (Word16*) lsp_new           : LSP vector to quantize                */
-/* _ (Word16*) lsf_new           : quantized LSF vector                  */
-/* _ (Word16*) lsp_mid           :  mid-frame LSP vector                 */
-/* _ (Encoder_State) st_fx :  Encoder state Structure                  */
-/*-----------------------------------------------------------------------*/
-
-/* _ None                                                                */
-/*-----------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :                           */
-/* _ None                                 */
-/*=======================================================================*/
+/* _ (Word32*) Bin_E       : FFT Bin energy 128 *2 sets                 */
+/* _ (Word32*) Bin_E_old   : FFT Bin energy 128 *2 sets                 */
+/* _ (Word16*) mem_syn_bck : synthesis filter memory                    */
+/* _ (Word16)  mem_w0_bck  : memory of the weighting filter             */
+/* _ (Word16) streaklimit  : LSF quantizer                              */
+/* _ (Word16) pstreaklen   : LSF quantizer                              */
+/*----------------------------------------------------------------------*/
+/* INPUT/OUTPUT ARGUMENTS :                                             */
+/* _None                                                                */
+/*----------------------------------------------------------------------*/
+/* OUTPUT ARGUMENTS :                                                   */
+/* _ (Word16*) lsp_new           : LSP vector to quantize               */
+/* _ (Word16*) lsf_new           : quantized LSF vector                 */
+/* _ (Word16*) lsp_mid           :  mid-frame LSP vector                */
+/* _ (Encoder_State) st_fx :  Encoder state Structure                   */
+/*----------------------------------------------------------------------*/
+/* _ None                                                               */
+/*----------------------------------------------------------------------*/
+/* RETURN ARGUMENTS :                                                   */
+/* _ None                                                               */
+/*======================================================================*/
+
 void lsf_syn_mem_restore_fx(
     Encoder_State *st_fx,        /* o: state structure                                                                      */
     Word16 btilt_code_fx,        /* i:                                                  Q15                                 */
     Word32 gc_threshold_fx,      /* i:                                                  Q16                                 */
     Word16 *clip_var_bck_fx,     /* i:                                                  Q(2.56), Q14, Q7, Q0, Q14, Q14      */
     Word16 next_force_sf_bck_fx, /* i:                                                                                      */
-
-    Word16 *lsp_new,     /* o: LSP vector to quantize                                   Q15                                 */
-    Word16 *lsf_new,     /* o: quantized LSF vector                                     Q15                                 */
-    Word16 *lsp_mid,     /* o: mid-frame LSP vector                                     Q15                                 */
-    Word16 clip_var,     /* i: pitch clipping state var                                 Q(2.56)                             */
-    Word16 *mem_AR,      /* i: quantizer memory for AR model                            Q15                                 */
-    Word16 *mem_MA,      /* i: quantizer memory for MA model                            Q15                                 */
-    Word16 *lsp_new_bck, /* i: LSP vector to quantize- backup                           Q15                                 */
-    Word16 *lsf_new_bck, /* i: quantized LSF vector - backup                            Q15                                 */
-    Word16 *lsp_mid_bck, /* i: mid-frame LSP vector - backup                            Q15                                 */
-    Word16 mCb1,         /* i: counter for stationary frame after a transition frame                                        */
-    Word32 *Bin_E,       /* i: FFT Bin energy 128 *2 sets                               Q_new + Q_SCALE - 2                 */
-    Word32 *Bin_E_old,   /* i: FFT Bin energy 128 sets                                  Q_new + Q_SCALE - 2                 */
-    Word16 *mem_syn_bck, /* i: synthesis filter memory                                  ( 15 - st_fx->hLPDmem->e_mem_syn )  */
-    Word16 mem_w0_bck,   /* i: memory of the weighting filter                           ( 15 - st_fx->hLPDmem->e_mem_syn )  */
-    Word16 streaklimit,  /* i:LSF quantizer                                             Q15                                 */
-    Word16 pstreaklen    /* i:LSF quantizer                                                                                 */
+    Word16 *lsp_new,             /* o: LSP vector to quantize                           Q15                                 */
+    Word16 *lsf_new,             /* o: quantized LSF vector                             Q15                                 */
+    Word16 *lsp_mid,             /* o: mid-frame LSP vector                             Q15                                 */
+    Word16 clip_var,             /* i: pitch clipping state var                         Q(2.56)                             */
+    Word16 *mem_AR,              /* i: quantizer memory for AR model                    Q15                                 */
+    Word16 *mem_MA,              /* i: quantizer memory for MA model                    Q15                                 */
+    Word16 *lsp_new_bck,         /* i: LSP vector to quantize- backup                   Q15                                 */
+    Word16 *lsf_new_bck,         /* i: quantized LSF vector - backup                    Q15                                 */
+    Word16 *lsp_mid_bck,         /* i: mid-frame LSP vector - backup                    Q15                                 */
+    Word16 mCb1,                 /* i: counter for stationary frame after a transition frame                                */
+    Word32 *Bin_E,               /* i: FFT Bin energy 128 *2 sets                       Q_new + Q_SCALE - 2                 */
+    Word32 *Bin_E_old,           /* i: FFT Bin energy 128 sets                          Q_new + Q_SCALE - 2                 */
+    Word16 *mem_syn_bck,         /* i: synthesis filter memory                          ( 15 - st_fx->hLPDmem->e_mem_syn )  */
+    Word16 mem_w0_bck,           /* i: memory of the weighting filter                   ( 15 - st_fx->hLPDmem->e_mem_syn )  */
+    Word16 streaklimit,          /* i:LSF quantizer                                     Q15                                 */
+    Word16 pstreaklen            /* i:LSF quantizer                                                                         */
 )
 {
     Word16 i;
@@ -3183,12 +3269,12 @@ void lsf_syn_mem_restore_ivas_fx(
     }
 
     /* restoring memories */
-    hLPDmem->mem_w0 = mem_w0_bck; // Q(15 - st_fx->hLPDmem->e_mem_syn )
+    hLPDmem->mem_w0 = mem_w0_bck; // Q( st_fx->hLPDmem->q_mem_syn )
     move16();
 
     FOR( i = 0; i < M; i++ )
     {
-        hLPDmem->mem_syn[i] = mem_syn_bck[i]; // Q(15 - st_fx->hLPDmem->e_mem_syn )
+        hLPDmem->mem_syn[i] = mem_syn_bck[i]; // Q( st_fx->hLPDmem->q_mem_syn )
         move16();
     }
 
@@ -3221,71 +3307,6 @@ Word16 tcxlpc_get_cdk(
     return cdk;
 }
 
-#ifdef IVAS_MSVQ
-/*--------------------------------------------------------------------------*
- * dec_FDCNG_MSVQ_stage1()
- *
- *
- *--------------------------------------------------------------------------*/
-
-void dec_FDCNG_MSVQ_stage1(
-    int16_t j_full,            /* i  : index full range                     */
-    int16_t n,                 /* i  : dimension to generate                */
-    const float *invTrfMatrix, /* i  : IDCT matrix for synthesis            */
-    const DCTTYPE idcttype,    /* i  : specify which IDCT                   */
-    float *uq,                 /* o  : synthesized stage1 vector            */
-    Word16 *uq_ind             /* o  : synthesized stage1 vector in BASOP   */
-)
-{
-    int16_t col, segm_ind, j;
-    float dct_vec[FDCNG_VQ_MAX_LEN];
-    float idct_vec[FDCNG_VQ_MAX_LEN];
-    const Word8 *cbpW8;
-    const Word16 *dct_col_shift_tab;
-
-    assert( n <= FDCNG_VQ_MAX_LEN );
-    assert( n >= FDCNG_VQ_DCT_MINTRUNC );
-
-    segm_ind = 0;
-    for ( col = 1; col <= FDCNG_VQ_DCT_NSEGM; col++ )
-    {
-        if ( j_full >= cdk1_ivas_cum_entries_per_segment[col] )
-        {
-            segm_ind++;
-        }
-    }
-
-    j = j_full - cdk1_ivas_cum_entries_per_segment[segm_ind]; /* j  is the local segment index */
-
-    assert( j < cdk1_ivas_entries_per_segment[segm_ind] );
-
-    /* Word8 column variable Qx storage*/
-    cbpW8 = cdk_37bits_ivas_stage1_W8Qx_dct_sections[segm_ind]; /*   Word8 storage fixed  ptr_init */
-    cbpW8 += j * cdk1_ivas_cols_per_segment[segm_ind];          /*    adaptive ptr init */
-    dct_col_shift_tab = stage1_dct_col_syn_shift[segm_ind];
-
-    for ( col = 0; col < cdk1_ivas_cols_per_segment[segm_ind]; col++ )
-    {
-        dct_vec[col] = (float) shl( (Word16) cbpW8[col], dct_col_shift_tab[col] );
-        /*             LOGIC( 1 )        , SHIFT( 1 );
-           in BASOP:   s_and(for W8->W16), shl()
-         */
-    }
-    dctT2_N_apply_matrix( (const float *) dct_vec, idct_vec, cdk1_ivas_cols_per_segment[segm_ind], n, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, idcttype );
-
-    /*scale down to original fdcngvq domain and move to Q0  */
-    v_multc( idct_vec, fdcng_dct_scaleF[1], idct_vec, n );
-    /* fdcng_dct_scaleF[1] --> 0.0625-->scale down from  search Q4 domain  to Q0 ,
-       not really  relevant for  BASOP loop */
-
-    /*add common  mid fdcng vector,  in fdcng bands domain */
-    v_add( idct_vec, cdk1r_tr_midQ_truncQ, uq, n );
-    assert( uq_ind == NULL );
-
-    return;
-}
-
-#endif
 void msvq_dec(
     const Word16 *const *cb, /* i  : Codebook (indexed cb[*stages][levels][p]) (14Q1*1.28)*/
     const Word16 dims[],     /* i  : Dimension of each codebook stage (NULL: full dim.)   */
@@ -3294,11 +3315,7 @@ void msvq_dec(
     const Word16 N,          /* i  : Vector dimension                                     */
     const Word16 maxN,       /* i  : Codebook dimension                                   */
     const Word16 Idx[],      /* i  : Indices                                              */
-#ifdef IVAS_MSVQ
-    const int16_t applyIDCT_flag, /* i  : applyIDCT flag                                       */
-    const float *invTrfMatrix,    /* i  :   matrix for IDCT synthesis                          */
-#endif
-    Word16 *uq /* o  : quantized vector                          (14Q1*1.28)*/
+    Word16 *uq               /* o  : quantized vector                          (14Q1*1.28)*/
 )
 {
     Word16 i, j, offset;
@@ -3334,15 +3351,6 @@ void msvq_dec(
             start = offs[i];
             move16();
         }
-#ifdef IVAS_MSVQ
-        test();
-        IF( i == 0 && applyIDCT_flag != 0 )
-        {
-            assert( start == 0 );
-            dec_FDCNG_MSVQ_stage1( Idx[0], N, invTrfMatrix, IDCT_T2_XX_24, uq, uq_ind ); /* IDCT_T2 N=24 used for all synthesis  */
-        }
-        ELSE
-#endif
         {
             /*vr_add( uq+start, cb[i]+Idx[i]*maxn, uq+start, n );, where uq = a zero vector*/
             offset = i_mult2( Idx[i], N34 );
@@ -3824,13 +3832,9 @@ Word16 root_search_fx( Word16 low,
             L_tmp1 = L_shl( L_tmp, exp1 );
             tmp = extract_h( L_tmp1 );
             exp1 = sub( 30 - 25, exp1 );
-            tmp = div_s( 16384, tmp );        /* 15+exp1 */
-            Ltmp = Mult_32_16( *v_low, tmp ); /* 15+exp1+25-15 */
-#ifdef BASOP_NOGLOB
+            tmp = div_s( 16384, tmp );                        /* 15+exp1 */
+            Ltmp = Mult_32_16( *v_low, tmp );                 /* 15+exp1+25-15 */
             Ltemp = L_shl_o( Ltmp, ( 6 - exp1 ), &Overflow ); /* Q31 */
-#else
-            Ltemp = L_shl( Ltmp, ( 6 - exp1 ) ); /* Q31 */
-#endif
             if ( LT_32( *v_low, vh ) )
             {
                 Ltemp = L_negate( Ltemp );
@@ -4423,217 +4427,3 @@ void create_IDCT_N_Matrix_fx(
 
     return;
 }
-#ifdef IVAS_MSVQ
-
-/*-------------------------------------------------------------------*
- * dctT2_N_apply_matrix()
- *
- * dct/idct truncated matrix appl. for DCT basis vector lengths of N
- *-------------------------------------------------------------------*/
-
-void dctT2_N_apply_matrix(
-    const float *input,           /* i  : input  in fdcng or DCT(fdcng) domain     */
-    float *output,                /* o  : output in DCT(fdcng) or fdcng ordomain   */
-    const int16_t dct_dim,        /* i  : dct processing dim possibly truncated    */
-    const int16_t fdcngvq_dim,    /* i  : fdcng domain length                      */
-    const float *matrix,          /* i  : IDCT matrix                              */
-    const int16_t matrix_row_dim, /* i  :                                          */
-    const DCTTYPE dcttype         /* i  : matrix  operation type                   */
-)
-{
-    int16_t i, j, dim_in, dim_out;
-    int16_t mat_step_col, mat_step_row, mat_step_col_flag;
-    const float *pt_x, *pt_A;
-    float tmp_y[FDCNG_VQ_MAX_LEN];
-    float *pt_y;
-
-    /* non-square DCT_N and IDCT_N matrix application,
-       using a  stored format of  an IDCT_Nx(FDCNG_VQ_DCT_MAXTRUNC)   matrix  */
-    /* efficiently parallelized in SIMD */
-
-    assert( dct_dim <= FDCNG_VQ_DCT_MAXTRUNC );
-    assert( fdcngvq_dim <= FDCNG_VQ_MAX_LEN );
-
-    if ( ( dcttype & 1 ) == 0 ) /* even entries are DCTs */
-    {
-        /*  DCT_typeII   24,21  -> XX   in worst case  */
-        dim_in = fdcngvq_dim;
-        dim_out = dct_dim;
-        mat_step_col = matrix_row_dim; /* matrix maximum storage size dependent,  width of first row in matrix  */
-        mat_step_row = 0;
-        mat_step_col_flag = 1;
-        assert( dcttype == DCT_T2_21_XX || dcttype == DCT_T2_24_XX );
-    }
-    else
-    {
-        assert( ( dcttype & 1 ) != 0 ); /* idct */
-        dim_in = dct_dim;
-        dim_out = fdcngvq_dim;
-        mat_step_col = 1;
-        mat_step_row = matrix_row_dim;
-        mat_step_col_flag = 0;
-        assert( dcttype == IDCT_T2_XX_24 );
-    }
-
-    pt_y = tmp_y;
-    for ( i = 0; i < dim_out; i++ )
-    {
-        pt_x = input;
-        *pt_y = 0;
-
-        /* +i(DCT)  or   +i*maxTrunc(IDCT) */
-#define WMC_TOOL_SKIP
-        pt_A = &( matrix[i * ( mat_step_row + mat_step_col_flag )] ); /* ptr indexing */
-        PTR_INIT( 1 );
-#undef WMC_TOOL_SKIP
-        for ( j = 0; j < dim_in; j++ )
-        {
-#define WMC_TOOL_SKIP
-            *pt_y += ( *pt_x++ ) * ( *pt_A );
-            pt_A += mat_step_col; /* step +maxtrunc   or  +1 */ /* ptr indexing*/
-            MAC( 1 );
-#undef WMC_TOOL_SKIP
-        }
-        pt_y++;
-    }
-
-    mvr2r( tmp_y, output, dim_out );
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * extend_dctN_input()
- *
- * (inputN, dctN) -> idct(N_ext)    idct_N matrix application loop for
- *  extending, extrapolating  a  DCT basis vector length of N to N_ext
- *-------------------------------------------------------------------*/
-
-void extend_dctN_input(
-    const float *input,     /* i  :  input in fdcng domain                        */
-    const float *dct_input, /* i  :  input in dctN(fdcng) domain                  */
-    const int16_t in_dim,   /* i  :  in_dim == N                                  */
-    float *ext_sig,         /* o  :  extended output in fdcng domain              */
-    const int16_t out_dim,  /* i  :  output total dim                             */
-    float *matrix,          /* i  : idct synthesis matrix N rows, n_cols  columns */
-    const int16_t n_cols,   /* i  : number of columns ==  DCT truncation length   */
-    const DCTTYPE dcttype   /* i  : matrix operation type                         */
-)
-{
-    int16_t i, j, i_rev;
-    const float( *ptr )[FDCNG_VQ_DCT_MAXTRUNC] = (void *) matrix;
-
-    /* stored format is an IDCT_Nx(FDCNG_VQ_DCT_MAXTRUNC)   matrix  */
-    assert( in_dim < FDCNG_VQ_MAX_LEN );
-    assert( out_dim <= FDCNG_VQ_MAX_LEN );
-    assert( out_dim > in_dim );
-    assert( n_cols == FDCNG_VQ_DCT_MAXTRUNC ); /* for *ptr[MAX_TRUNC] adressing*/
-    assert( ( dcttype & 1 ) != 0 );            /* idct tables always in use for this basis vector extension */
-
-    mvr2r( input, ext_sig, in_dim ); /* copy initial part,  i.e.  only  last/tail  parts are  extended */
-    set_f( &( ext_sig[in_dim] ), 0.0, out_dim - in_dim );
-
-    i_rev = in_dim; /*ptr init*/
-    for ( i = in_dim; i < out_dim; i++ )
-    { /* for each extension sample */
-        /*   i  = 21  22  23;
-          i_rev = 20  19  18;    for odd dctII  reflect basis vector
-         */
-        i_rev--;
-
-        for ( j = 0; j < n_cols; j++ ) /* for each available  DCT coeff */
-        {
-            /* DCTcoeff * reflected basis vector */
-#define WMC_TOOL_SKIP
-            /*  pure ptr MAC   operations */
-            ext_sig[i] += dct_input[j] * ptr[i_rev][j]; /* sum up scaled and extended basis vector */
-            MAC( 1 );
-#undef WMC_TOOL_SKIP
-        }
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * create_IDCT_N_Matrix()
- *
- * inititate idct24 FDCNG_VQ_DCT_MAXTRUNCx N matrix in
- * RAM  from a  quantized compressed ROM format
- *-------------------------------------------------------------------*/
-
-void create_IDCT_N_Matrix(
-    float *inv_matrixFloatQ, /* i/o: RAM buffer                                     */
-    const int16_t N,         /* i  : DCT length, number of time samples             */
-    const int16_t n_cols,    /* i  : number of dct coeffs (as DCT may be truncated) */
-    const int16_t alloc_size /* i  : RAM buffer size in elements                    */
-)
-{
-    int16_t c, c1, r, r_flip, W16_val;
-    int16_t len;
-    int16_t mat_cpy_size;
-    const Word16 *absval_ptr;
-    const Word8 *idx_ptr;
-    Word16 idx;
-    float( *ptr )[FDCNG_VQ_DCT_MAXTRUNC] = (void *) inv_matrixFloatQ; /*  fixed number of columns pointers, to   simplifies adressing in ANSIC   */
-
-    absval_ptr = unique_idctT2_24coeffsQ16;
-    idx_ptr = idctT2_24_compressed_idx;
-    len = FDCNG_VQ_MAX_LEN;
-
-    if ( N == FDCNG_VQ_MAX_LEN_WB )
-    {
-        absval_ptr = unique_idctT2_21coeffsQ16;
-        idx_ptr = idctT2_21_compressed_idx;
-        len = N;
-    }
-
-    assert( alloc_size >= ( n_cols * len ) ); /* enough space for the full expanded IDCT matrix  */
-    assert( N <= len );
-
-    mat_cpy_size = ( n_cols ) * ( len >> 1 ); /* NB   integer division of "len" */
-
-    if ( ( len & 1 ) != 0 )
-    { /* odd sized DCT with a non-reflected center row  */
-        mat_cpy_size += n_cols;
-    }
-
-    for ( c = 0; c < mat_cpy_size; c++ )
-    {
-        idx = (Word16) ( idx_ptr[c] );
-        W16_val = absval_ptr[abs( idx )];
-
-        if ( idx < 0 )
-        {
-            W16_val = -( W16_val );
-        }
-        inv_matrixFloatQ[c] = ( +1.52587890625e-05f ) * ( (float) W16_val ); /* 1.0/2.^16 scaling to a float-"Q0"  , a scaling that is not done  in   BASOP */
-    }
-
-    /* for even number of coeffs DCT24,
-       flip symmetry for odd, even is used to save 50%   IDCT Table ROM */
-    /* for an odd DCT  center  is not flipped  e.g  for DCT21  */
-
-    assert( n_cols == FDCNG_VQ_DCT_MAXTRUNC );
-    assert( ( n_cols & 1 ) == 0 );
-
-    for ( c = 0; c < ( n_cols ); c += 2 )
-    {
-        c1 = c + 1;
-        r_flip = len - 1;
-        for ( r = 0; r < ( len / 2 ); r++, r_flip-- )
-        {
-#define WMC_TOOL_SKIP
-            ptr[r_flip][c] = ptr[r][c];        /* flipped */
-            ptr[r_flip][c1] = -( ptr[r][c1] ); /* flipped and sign swapped */
-            MOVE( 2 );
-            MULT( 1 ); /* for negate */
-#undef WMC_TOOL_SKIP
-        }
-    }
-
-    return;
-}
-#endif
diff --git a/lib_com/lsp_conv_poly_fx.c b/lib_com/lsp_conv_poly_fx.c
index 6c2c5552037189d3b9d500cc0d22f1e56dc4dc6e..4f493cacde1c222cba29c4859e08beb17776da29 100644
--- a/lib_com/lsp_conv_poly_fx.c
+++ b/lib_com/lsp_conv_poly_fx.c
@@ -6,10 +6,9 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
-#include "prot_fx.h"
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -346,18 +345,10 @@ static Word32 b_inv_sq(
     exp_den = add( sub( 30, exp_den ), sub( 16, exp_in ) );
 
     m_den = mult_r( m_den, m_den );
-#ifdef BASOP_NOGLOB
     exp_den = shl_o( exp_den, 1, &Overflow );
-#else  /* BASOP_NOGLOB */
-    exp_den = shl( exp_den, 1 );
-#endif /* BASOP_NOGLOB */
 
     div_out = div_s( 8192, m_den );
-#ifdef BASOP_NOGLOB
     Ltmp = L_shl_o( div_out, add( sub( 30 - 13, exp_den ), 15 ), &Overflow ); /*Q15*/
-#else                                                                         /* BASOP_NOGLOB */
-    Ltmp = L_shl( div_out, add( sub( 30 - 13, exp_den ), 15 ) ); /*Q15*/
-#endif                                                                        /* BASOP_NOGLOB */
 
     return Ltmp;
 }
@@ -387,11 +378,7 @@ static Word32 inv_pow(
     {
         exp1 = norm_l( re );
         tmp = extract_h( L_shl( re, exp1 ) );
-#ifdef BASOP_NOGLOB
         L_tmp = L_shr( L_mult_o( tmp, tmp, &Overflow ), 1 );
-#else  /* BASOP_NOGLOB */
-        L_tmp = L_shr( L_mult( tmp, tmp ), 1 );
-#endif /* BASOP_NOGLOB */
         Mpy_32_16_ss( L_tmp, x, &mh, &ml );
         r0 = L_add( L_tmp, mh );
     }
@@ -406,11 +393,7 @@ static Word32 inv_pow(
     {
         exp2 = norm_l( se );
         tmp = extract_h( L_shl( se, exp2 ) );
-#ifdef BASOP_NOGLOB
         L_tmp = L_shr( L_mult_o( tmp, tmp, &Overflow ), 1 );
-#else  /* BASOP_NOGLOB */
-        L_tmp = L_shr( L_mult( tmp, tmp ), 1 );
-#endif /* BASOP_NOGLOB */
         Mpy_32_16_ss( L_tmp, x, &mh, &ml );
         s0 = L_sub( L_tmp, mh );
     }
@@ -440,11 +423,7 @@ static Word32 inv_pow(
     }
     tmp = div_s( (Word16) ( ( 1 << 14 ) - 1 ), tmp );
     exp1 = add( exp1, exp2 );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shr_o( tmp, sub( 31, exp1 ), &Overflow ); /* result in Q15 */
-#else                                                   /* BASOP_NOGLOB */
-    L_tmp = L_shr( tmp, sub( 31, exp1 ) ); /* result in Q15 */
-#endif                                                  /* BASOP_NOGLOB */
 
     return ( L_tmp );
 }
@@ -546,11 +525,7 @@ static void spectautocorr_fx(
     move32();
     FOR( i = 2; i < N - 1; i++ )
     {
-#ifdef BASOP_NOGLOB
         r[0] = L_add_o( r[0], G[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-        r[0] = L_add( r[0], G[i] );
-#endif /* BASOP_NOGLOB */
         move32();
     }
 
@@ -584,20 +559,12 @@ static void spectautocorr_fx(
     move16(); /* 1.0 in Q15 */
     FOR( i = 1; i < imid; i++ )
     {
-#ifdef BASOP_NOGLOB
         gp = L_add_o( G[i], G[N - i - 1], &Overflow );
-#else  /* BASOP_NOGLOB */
-        gp = L_add( G[i], G[N - i - 1] );
-#endif /* BASOP_NOGLOB */
         gn = L_sub( G[i], G[N - i - 1] );
 
         /*r[1] = L_mac(r[1], x[i-1], gn);*/
         Mpy_32_16_ss( gn, x[i - 1], &mh, &ml );
-#ifdef BASOP_NOGLOB
         r[1] = L_add_o( r[1], mh, &Overflow );
-#else
-        r[1] = L_add( r[1], mh );
-#endif
         move32();
         c[1] = x[i - 1];
         move16();
@@ -606,55 +573,31 @@ static void spectautocorr_fx(
         {
             c[j] = mult_r( c[j - 1], x[i - 1] );
             move16();
-#ifdef BASOP_NOGLOB
             c[j] = add_o( c[j], sub_o( c[j], c[j - 2], &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-            c[j] = add( c[j], sub( c[j], c[j - 2] ) );
-#endif /* BASOP_NOGLOB */
             move16();
 
             /*r[j] = L_mac(r[j], c[j], gp);*/
             Mpy_32_16_ss( gp, c[j], &mh, &ml );
-#ifdef BASOP_NOGLOB
             r[j] = L_add_o( r[j], mh, &Overflow );
-#else  /* BASOP_NOGLOB */
-            r[j] = L_add( r[j], mh );
-#endif /* BASOP_NOGLOB */
             move32();
 
             c[j + 1] = mult_r( c[j], x[i - 1] );
             move16();
-#ifdef BASOP_NOGLOB
             c[j + 1] = add_o( c[j + 1], sub_o( c[j + 1], c[j - 1], &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-            c[j + 1] = add( c[j + 1], sub( c[j + 1], c[j - 1] ) );
-#endif /* BASOP_NOGLOB */
             move16();
 
             /*r[j+1] = L_mac(r[j+1], c[j+1], gn);*/
             Mpy_32_16_ss( gn, c[j + 1], &mh, &ml );
-#ifdef BASOP_NOGLOB
             r[j + 1] = L_add_o( r[j + 1], mh, &Overflow );
-#else  /* BASOP_NOGLOB */
-            r[j + 1] = L_add( r[j + 1], mh );
-#endif /* BASOP_NOGLOB */
             move32();
         }
         c[j] = mult_r( c[j - 1], x[i - 1] );
         move16();
-#ifdef BASOP_NOGLOB
         c[j] = add_o( c[j], sub_o( c[j], c[j - 2], &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        c[j] = add( c[j], sub( c[j], c[j - 2] ) );
-#endif /* BASOP_NOGLOB */
         move16();
 
         Mpy_32_16_ss( gp, c[j], &mh, &ml );
-#ifdef BASOP_NOGLOB
         r[j] = L_add_o( r[j], mh, &Overflow );
-#else  /* BASOP_NOGLOB */
-        r[j] = L_add( r[j], mh );
-#endif /* BASOP_NOGLOB */
         move32();
     }
 
@@ -662,31 +605,18 @@ static void spectautocorr_fx(
      * Add the endpoints x = cos(0) = 1 and x = cos(pi) = -1 as
      * well as the lower half of the unit circle.
      *---------------------------------------------------------------------*/
-#ifdef BASOP_NOGLOB
     gp = L_shr( L_add_o( G[0], G[N - 1], &Overflow ), 1 );
-#else  /* BASOP_NOGLOB */
-    gp = L_shr( L_add( G[0], G[N - 1] ), 1 );
-#endif /* BASOP_NOGLOB */
     gn = L_shr( L_sub( G[0], G[N - 1] ), 1 );
 
-#ifdef BASOP_NOGLOB
     r[0] = L_add_o( r[0], gp, &Overflow );
-#else  /* BASOP_NOGLOB */
-    r[0] = L_add( r[0], gp );
-#endif /* BASOP_NOGLOB */
     move32();
     exp0 = norm_l( r[0] );
     L_Extract( L_shl( r[0], exp0 ), &rh[0], &rl[0] );
 
     FOR( j = 1; j < M; j += 2 )
     {
-#ifdef BASOP_NOGLOB
         L_Extract( L_shl( L_add_o( r[j], gn, &Overflow ), exp0 ), &rh[j], &rl[j] );
         L_Extract( L_shl( L_add_o( r[j + 1], gp, &Overflow ), exp0 ), &rh[j + 1], &rl[j + 1] );
-#else /* BASOP_NOGLOB */
-        L_Extract( L_shl( L_add( r[j], gn ), exp0 ), &rh[j], &rl[j] );
-        L_Extract( L_shl( L_add( r[j + 1], gp ), exp0 ), &rh[j + 1], &rl[j + 1] );
-#endif
     }
 
     return;
diff --git a/lib_com/math_op.c b/lib_com/math_op.c
index ea0a7ef6cbb808a2979725570cd532101007b6b7..7014988b887944d6c9417a15c0d07363e7245c79 100644
--- a/lib_com/math_op.c
+++ b/lib_com/math_op.c
@@ -169,7 +169,6 @@ Word32 Pow2(                  /* (o) Q0  : result       (range: 0<=val<=0x7fffff
  |___________________________________________________________________________|
 */
 
-#ifdef BASOP_NOGLOB
 Word32 Dot_product12_o(                    /* (o) Q31: normalized result (1 < val <= -1) */
                         const Word16 x[],  /* (i) 12bits: x vector                       */
                         const Word16 y[],  /* (i) 12bits: y vector                       */
@@ -177,33 +176,15 @@ Word32 Dot_product12_o(                    /* (o) Q31: normalized result (1 < va
                         Word16 *exp,       /* (o)    : exponent of result (0..+30)       */
                         Flag *Overflow_out /* o :  propagating the Overflow flag to upper level, set to NULL to ignore internal overflows */
 )
-#else  /* BASOP_NOGLOB */
-Word32 Dot_product12(                   /* (o) Q31: normalized result (1 < val <= -1) */
-                      const Word16 x[], /* (i) 12bits: x vector                       */
-                      const Word16 y[], /* (i) 12bits: y vector                       */
-                      const Word16 lg,  /* (i)    : vector length                     */
-                      Word16 *exp       /* (o)    : exponent of result (0..+30)       */
-)
-#endif /* BASOP_NOGLOB */
 {
     Word16 i, sft;
     Word32 L_sum;
-#ifdef BASOP_NOGLOB
     Flag Overflow_ignored = 0;
-#endif /* BASOP_NOGLOB */
 
-#ifdef BASOP_NOGLOB
     L_sum = L_mac_o( 1, x[0], y[0], &Overflow_ignored );
-#else
-    L_sum = L_mac( 1, x[0], y[0] );
-#endif
     FOR( i = 1; i < lg; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_sum = L_mac_o( L_sum, x[i], y[i], Overflow_out ? Overflow_out : &Overflow_ignored );
-#else  /* BASOP_NOGLOB */
-        L_sum = L_mac( L_sum, x[i], y[i] );
-#endif /* BASOP_NOGLOB */
     }
 
     /* Normalize acc in Q31 */
@@ -217,7 +198,6 @@ Word32 Dot_product12(                   /* (o) Q31: normalized result (1 < val <
     return L_sum;
 }
 
-#ifdef BASOP_NOGLOB
 Word32 Dot_product12(                   /* (o) Q31: normalized result (1 < val <= -1) */
                       const Word16 x[], /* (i) 12bits: x vector                       */
                       const Word16 y[], /* (i) 12bits: y vector                       */
@@ -228,7 +208,6 @@ Word32 Dot_product12(                   /* (o) Q31: normalized result (1 < val <
     /* Ignore internal overflows */
     return Dot_product12_o( x, y, lg, exp, NULL );
 }
-#endif /* BASOP_NOGLOB */
 
 /*___________________________________________________________________________
  |                                                                           |
@@ -258,18 +237,10 @@ Word32 Energy_scale(                   /* (o) : Q31: normalized result (1 < val
 
     IF( expi == 0 )
     {
-#ifdef BASOP_NOGLOB
         L_sum = L_mac_o( 1, x[0], x[0], &Overflow );
-#else
-        L_sum = L_mac( 1, x[0], x[0] );
-#endif
         FOR( i = 1; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_sum = L_mac_o( L_sum, x[i], x[i], &Overflow );
-#else /* BASOP_NOGLOB */
-            L_sum = L_mac( L_sum, x[i], x[i] );
-#endif
         }
     }
     IF( expi < 0 )
@@ -280,16 +251,11 @@ Word32 Energy_scale(                   /* (o) : Q31: normalized result (1 < val
         FOR( i = 1; i < lg; i++ )
         {
             tmp = mult_r( x[i], sft );
-#ifdef BASOP_NOGLOB
             L_sum = L_mac_o( L_sum, tmp, tmp, &Overflow );
-#else
-            L_sum = L_mac( L_sum, tmp, tmp );
-#endif
         }
     }
     IF( expi > 0 )
     {
-#ifdef BASOP_NOGLOB
         tmp = shl_o( x[0], expi, &Overflow );
         L_sum = L_mac_o( 1, tmp, tmp, &Overflow );
         FOR( i = 1; i < lg; i++ )
@@ -297,15 +263,6 @@ Word32 Energy_scale(                   /* (o) : Q31: normalized result (1 < val
             tmp = shl_o( x[i], expi, &Overflow );
             L_sum = L_mac_o( L_sum, tmp, tmp, &Overflow );
         }
-#else
-        tmp = shl( x[0], expi );
-        L_sum = L_mac( 1, tmp, tmp );
-        FOR( i = 1; i < lg; i++ )
-        {
-            tmp = shl( x[i], expi );
-            L_sum = L_mac( L_sum, tmp, tmp );
-        }
-#endif
     }
 
     /* Normalize acc in Q31 */
diff --git a/lib_com/mime.h b/lib_com/mime.h
index 80d984617615fe5122fe62b9fe478058eb2de6c0..6e9e5fc87f48c20b650b2872fcf0401ec05bcbfa 100644
--- a/lib_com/mime.h
+++ b/lib_com/mime.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/modif_fs.c b/lib_com/modif_fs.c
index 06119b69e7edaf177945cdcf64adaa37177b2afc..10e64a57deb9efbc548a2416db10d1ec550d66cf 100644
--- a/lib_com/modif_fs.c
+++ b/lib_com/modif_fs.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,13 +38,13 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 
-void Interpolate_allpass_steep_32(
+/* IVAS 32-bit variant */
+void Interpolate_allpass_steep_fx32(
     const Word32 *in_fx, /* i  : input array of size N        Qx */
     Word32 *mem_fx,      /* i/o: memory                       Qx */
     const Word16 N,      /* i  : number of input samples         */
@@ -102,6 +102,8 @@ void Interpolate_allpass_steep_32(
 
     return;
 }
+
+/* IVAS 32-bit variant */
 void Decimate_allpass_steep_fx32(
     const Word32 *in, /* i  : input array of size N                  Qx */
     Word32 *mem,      /* i/o: memory                                 Qx */
@@ -115,6 +117,22 @@ void Decimate_allpass_steep_fx32(
     /* upper allpass filter chain */
     FOR( k = 0; k < N / 2; k++ )
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        temp[0] = Madd_32_16( mem[0], in[2 * k], AP1_STEEP_FX[0] ); // Qx
+        move32();
+        mem[0] = Msub_32_16( in[2 * k], temp[0], AP1_STEEP_FX[0] ); // Qx
+        move32();
+
+        temp[1] = Madd_32_16( mem[1], temp[0], AP1_STEEP_FX[1] ); // Qx
+        move32();
+        mem[1] = Msub_32_16( temp[0], temp[1], AP1_STEEP_FX[1] ); // Qx
+        move32();
+
+        out[k] = Madd_32_16( mem[ALLPASSSECTIONS_STEEP - 1], temp[ALLPASSSECTIONS_STEEP - 2], AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ); // Qx
+        move32();
+        mem[ALLPASSSECTIONS_STEEP - 1] = Msub_32_16( temp[ALLPASSSECTIONS_STEEP - 2], out[k], AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ); // Qx
+        move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
         temp[0] = L_add( mem[0], Mpy_32_16_1( in[2 * k], AP1_STEEP_FX[0] ) ); // Qx
         move32();
         mem[0] = L_sub( in[2 * k], Mpy_32_16_1( temp[0], AP1_STEEP_FX[0] ) ); // Qx
@@ -129,17 +147,31 @@ void Decimate_allpass_steep_fx32(
         move32();
         mem[ALLPASSSECTIONS_STEEP - 1] = L_sub( temp[ALLPASSSECTIONS_STEEP - 2], Mpy_32_16_1( out[k], AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ) ); // Qx
         move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
 
     /* lower allpass filter chain */
+#ifdef OPT_STEREO_32KBPS_V1
+    temp[0] = Madd_32_16( mem[ALLPASSSECTIONS_STEEP], mem[2 * ALLPASSSECTIONS_STEEP], AP2_STEEP_FX[0] ); // Qx
+    move32();
+    mem[ALLPASSSECTIONS_STEEP] = Msub_32_16( mem[2 * ALLPASSSECTIONS_STEEP], temp[0], AP2_STEEP_FX[0] ); // Qx
+    move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
     temp[0] = L_add( mem[ALLPASSSECTIONS_STEEP], Mpy_32_16_1( mem[2 * ALLPASSSECTIONS_STEEP], AP2_STEEP_FX[0] ) ); // Qx
     move32();
     mem[ALLPASSSECTIONS_STEEP] = L_sub( mem[2 * ALLPASSSECTIONS_STEEP], Mpy_32_16_1( temp[0], AP2_STEEP_FX[0] ) ); // Qx
     move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     /* for better performance, unroll this loop */
     FOR( n = 1; n < ALLPASSSECTIONS_STEEP - 1; n++ )
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        temp[n] = Madd_32_16( mem[ALLPASSSECTIONS_STEEP + n], temp[n - 1], AP2_STEEP_FX[n] ); // Qx
+        move32();
+        mem[ALLPASSSECTIONS_STEEP + 1] = Msub_32_16( temp[n - 1], temp[n], AP2_STEEP_FX[n] ); // Qx
+        move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
         temp[n] = L_add( mem[ALLPASSSECTIONS_STEEP + n], Mpy_32_16_1( temp[n - 1], AP2_STEEP_FX[n] ) ); // Qx
         move32();
         /*if ( fabs( temp[n] ) < 1e-12 )
@@ -148,26 +180,48 @@ void Decimate_allpass_steep_fx32(
         }*/
         mem[ALLPASSSECTIONS_STEEP + 1] = L_sub( temp[n - 1], Mpy_32_16_1( temp[n], AP2_STEEP_FX[n] ) ); // Qx
         move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
 
+#ifdef OPT_STEREO_32KBPS_V1
+    temp[ALLPASSSECTIONS_STEEP - 1] = Madd_32_16( mem[2 * ALLPASSSECTIONS_STEEP - 1], temp[ALLPASSSECTIONS_STEEP - 2], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ); // Qx
+    move32();
+
+    mem[2 * ALLPASSSECTIONS_STEEP - 1] = Msub_32_16( temp[ALLPASSSECTIONS_STEEP - 2], temp[ALLPASSSECTIONS_STEEP - 1], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ); // Qx
+    move32();
+#else                                                                                                                                           /* OPT_STEREO_32KBPS_V1 */
     temp[ALLPASSSECTIONS_STEEP - 1] = L_add( mem[2 * ALLPASSSECTIONS_STEEP - 1], Mpy_32_16_1( temp[ALLPASSSECTIONS_STEEP - 2], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ) ); // Qx
     move32();
 
     mem[2 * ALLPASSSECTIONS_STEEP - 1] = L_sub( temp[ALLPASSSECTIONS_STEEP - 2], Mpy_32_16_1( temp[ALLPASSSECTIONS_STEEP - 1], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ) ); // Qx
     move32();
+#endif                                                                                                                                          /* OPT_STEREO_32KBPS_V1 */
     out[0] = W_round48_L( W_mac_32_16( W_mult_32_16( out[0], 16384 /*0.5 in Q15*/ ), temp[ALLPASSSECTIONS_STEEP - 1], 16384 /*0.5 in Q15*/ ) ); // Qx
     move32();
 
     FOR( k = 1; k < N / 2; k++ )
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        temp[0] = Madd_32_16( mem[ALLPASSSECTIONS_STEEP], in[2 * k - 1], AP2_STEEP_FX[0] ); // Qx
+        move32();
+        mem[ALLPASSSECTIONS_STEEP] = Msub_32_16( in[2 * k - 1], temp[0], AP2_STEEP_FX[0] ); // Qx
+        move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
         temp[0] = L_add( mem[ALLPASSSECTIONS_STEEP], Mpy_32_16_1( in[sub( shl( k, 1 ), 1 )], AP2_STEEP_FX[0] ) ); // Qx
         move32();
         mem[ALLPASSSECTIONS_STEEP] = L_sub( in[sub( shl( k, 1 ), 1 )], Mpy_32_16_1( temp[0], AP2_STEEP_FX[0] ) ); // Qx
         move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         /* for better performance, unroll this loop */
         FOR( n = 1; n < ALLPASSSECTIONS_STEEP - 1; n++ )
         {
+#ifdef OPT_STEREO_32KBPS_V1
+            temp[n] = Madd_32_16( mem[ALLPASSSECTIONS_STEEP + n], temp[n - 1], AP2_STEEP_FX[n] ); // Qx
+            move32();
+            mem[ALLPASSSECTIONS_STEEP + n] = Msub_32_16( temp[n - 1], temp[n], AP2_STEEP_FX[n] ); // Qx
+            move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
             temp[n] = L_add( mem[ALLPASSSECTIONS_STEEP + n], Mpy_32_16_1( temp[n - 1], AP2_STEEP_FX[n] ) ); // Qx
             move32();
             /*if ( fabs( temp[n] ) < 1e-12 )
@@ -176,12 +230,20 @@ void Decimate_allpass_steep_fx32(
             }*/
             mem[ALLPASSSECTIONS_STEEP + n] = L_sub( temp[n - 1], Mpy_32_16_1( temp[n], AP2_STEEP_FX[n] ) ); // Qx
             move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
         }
 
+#ifdef OPT_STEREO_32KBPS_V1
+        temp[ALLPASSSECTIONS_STEEP - 1] = Madd_32_16( mem[2 * ALLPASSSECTIONS_STEEP - 1], temp[ALLPASSSECTIONS_STEEP - 2], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ); // Qx
+        move32();
+        mem[2 * ALLPASSSECTIONS_STEEP - 1] = Msub_32_16( temp[ALLPASSSECTIONS_STEEP - 2], temp[ALLPASSSECTIONS_STEEP - 1], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ); // Qx
+        move32();
+#else                                                                                                                                               /* OPT_STEREO_32KBPS_V1 */
         temp[ALLPASSSECTIONS_STEEP - 1] = L_add( mem[2 * ALLPASSSECTIONS_STEEP - 1], Mpy_32_16_1( temp[ALLPASSSECTIONS_STEEP - 2], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ) ); // Qx
         move32();
         mem[2 * ALLPASSSECTIONS_STEEP - 1] = L_sub( temp[ALLPASSSECTIONS_STEEP - 2], Mpy_32_16_1( temp[ALLPASSSECTIONS_STEEP - 1], AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1] ) ); // Qx
         move32();
+#endif                                                                                                                                              /* OPT_STEREO_32KBPS_V1 */
         out[k] = W_round48_L( W_mac_32_16( W_mult_32_16( out[k], 16384 /*0.5 in Q15*/ ), temp[ALLPASSSECTIONS_STEEP - 1], 16384 /*0.5 in Q15*/ ) ); // Qx
         move32();
     }
@@ -192,7 +254,9 @@ void Decimate_allpass_steep_fx32(
 
     return;
 }
-void interpolate_3_over_2_allpass_32(
+
+/* IVAS 32-bit variant */
+void interpolate_3_over_2_allpass_fx32(
     const Word32 *input, /* i  : input signal            Qx*/
     const Word16 len,    /* i  : number of input samples   */
     Word32 *out,         /* o  : output signal           Qx*/
@@ -211,12 +275,21 @@ void interpolate_3_over_2_allpass_32(
     FOR( i = 0; i < len; i++ )
     {
         /* Upper branch */
+#ifdef OPT_STEREO_32KBPS_V1
+        Vu[0] = Madd_32_16( mem[0], L_sub( input[i], mem[1] ), filt_coeff[0] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+        Vu[1] = Madd_32_16( mem[1], L_sub( Vu[0], mem[2] ), filt_coeff[1] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+        mem[3] = Madd_32_16( mem[2], L_sub( Vu[1], mem[3] ), filt_coeff[2] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
         Vu[0] = L_add( mem[0], Mpy_32_16_1( L_sub( input[i], mem[1] ), filt_coeff[0] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
         Vu[1] = L_add( mem[1], Mpy_32_16_1( L_sub( Vu[0], mem[2] ), filt_coeff[1] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
         mem[3] = L_add( mem[2], Mpy_32_16_1( L_sub( Vu[1], mem[3] ), filt_coeff[2] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         mem[1] = Vu[0]; // Qx
         move32();
@@ -226,12 +299,21 @@ void interpolate_3_over_2_allpass_32(
         move32();
 
         /* Middle branch */
+#ifdef OPT_STEREO_32KBPS_V1
+        Vm[0] = Madd_32_16( mem[0], L_sub( input[i], mem[4] ), filt_coeff[3] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+        Vm[1] = Madd_32_16( mem[4], L_sub( Vm[0], mem[5] ), filt_coeff[4] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+        mem[6] = Madd_32_16( mem[5], L_sub( Vm[1], mem[6] ), filt_coeff[5] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
         Vm[0] = L_add( mem[0], Mpy_32_16_1( L_sub( input[i], mem[4] ), filt_coeff[3] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
         Vm[1] = L_add( mem[4], Mpy_32_16_1( L_sub( Vm[0], mem[5] ), filt_coeff[4] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
         mem[6] = L_add( mem[5], Mpy_32_16_1( L_sub( Vm[1], mem[6] ), filt_coeff[5] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         mem[4] = Vm[0]; // Qx
         move32();
@@ -241,12 +323,21 @@ void interpolate_3_over_2_allpass_32(
         move32();
 
         /* Lower branch */
+#ifdef OPT_STEREO_32KBPS_V1
+        Vl[0] = Madd_32_16( mem[0], L_sub( input[i], mem[7] ), filt_coeff[6] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+        Vl[1] = Madd_32_16( mem[7], L_sub( Vl[0], mem[8] ), filt_coeff[7] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+        mem[9] = Madd_32_16( mem[8], L_sub( Vl[1], mem[9] ), filt_coeff[8] ); // Qx + Q15 - Q15 -> Qx
+        move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
         Vl[0] = L_add( mem[0], Mpy_32_16_1( L_sub( input[i], mem[7] ), filt_coeff[6] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
         Vl[1] = L_add( mem[7], Mpy_32_16_1( L_sub( Vl[0], mem[8] ), filt_coeff[7] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
         mem[9] = L_add( mem[8], Mpy_32_16_1( L_sub( Vl[1], mem[9] ), filt_coeff[8] ) ); // Qx + Q15 - Q15 -> Qx
         move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
 
         mem[0] = input[i]; // Qx
         move32();
@@ -265,10 +356,17 @@ void interpolate_3_over_2_allpass_32(
     {
         mem_temp = out1_buff[2 * i];
         move32();
+#ifdef OPT_STEREO_32KBPS_V1
+        out[i] = Madd_32_16( Mpy_32_16_1( L_add( mem_temp, mem[10] ), 1550 ), L_add( mem[11], mem[14] ), -4965 ); // Qx + Q15 - Q15 -> Qx
+        //  0.0473147f in Q15 -> 1550, -0.151521f in Q15 -> -4965
+        out[i] = Madd_32_16( out[i], L_add( mem[12], mem[13] ), 20125 );
+        // 0.614152f in Q15 -> 20125
+#else                      /* OPT_STEREO_32KBPS_V1 */
         out[i] = L_add( Mpy_32_16_1( L_add( mem_temp, mem[10] ), 1550 ), Mpy_32_16_1( L_add( mem[11], mem[14] ), -4965 ) ); // Qx + Q15 - Q15 -> Qx
         //  0.0473147f in Q15 -> 1550, -0.151521f in Q15 -> -4965
         out[i] = L_add( out[i], Mpy_32_16_1( L_add( mem[12], mem[13] ), 20125 ) );
         // 0.614152f in Q15 -> 20125
+#endif                     /* OPT_STEREO_32KBPS_V1 */
         mem[10] = mem[11]; // Qx
         move32();
         mem[11] = mem[12]; // Qx
@@ -284,8 +382,8 @@ void interpolate_3_over_2_allpass_32(
     return;
 }
 
-
-void interpolate_3_over_1_allpass_32(
+/* IVAS 32-bit variant */
+void interpolate_3_over_1_allpass_fx32(
     const Word32 *input, /* i  : input signal                    Qx */
     const Word16 len,    /* i  : number of input samples            */
     Word32 *out,         /* o  : output signal                      */
diff --git a/lib_com/modif_fs_fx.c b/lib_com/modif_fs_fx.c
index b53bb9d1ca18e0bbfaffa7e90245fcec66a9a64d..bcbff13d57bebe95c3159b1b75e34fdc517fad79 100644
--- a/lib_com/modif_fs_fx.c
+++ b/lib_com/modif_fs_fx.c
@@ -206,13 +206,8 @@ Word16 modify_Fs_ivas_fx(                          /* o  : length of output    Q
         {
             sigPtr = signal_fx + add( lg, add( mem_len, i ) );
             L_tmp = syn_kern_16( 0, A_fx, sigPtr );
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_sat( L_tmp, 3 );
             *sigPtr = round_fx_sat( L_tmp ); /* AZ ringing padding */
-#else
-            L_tmp = L_shl( L_tmp, 3 );
-            *sigPtr = round_fx( L_tmp ); /* AZ ringing padding */
-#endif
             move16();
         }
         mem_preemph_fx = signal_fx[mem_len + lg - LEN_WIN_SSS - 1];
@@ -238,11 +233,7 @@ Word16 modify_Fs_ivas_fx(                          /* o  : length of output    Q
     Word16 norm_cfg_ptr = norm_s( sub( cfg_ptr_fx->filter_fx[0], 1 ) );
     FOR( i = 0; i < lg_out; i++ )
     {
-#ifdef BASOP_NOGLOB
         sigOut_fx[i] = round_fx_sat( Interpol_lc_fx( sigIn_ptr, cfg_ptr_fx->filter_fx, frac, fac_num, filt_len_tmp ) );
-#else
-        sigOut_fx[i] = round_fx( Interpol_lc_fx( sigIn_ptr, cfg_ptr_fx->filter_fx, frac, fac_num, filt_len_tmp ) );
-#endif
         move16();
         frac = add( frac, fracstep );
 
@@ -282,13 +273,9 @@ Word16 modify_Fs_ivas_fx(                          /* o  : length of output    Q
                 test();
                 IF( GT_32( fin, 16000 ) && ( EQ_16( lg_out, L_FRAME ) || EQ_16( lg_out, L_FRAME16k ) || EQ_16( lg_out, 512 ) ) )
                 {
-#ifdef BASOP_NOGLOB
                     num_den = shl_o( num_den, 1, &Overflow );
                     *Q_new_inp = add( *Q_new_inp, 1 );
                     move16();
-#else
-                    num_den = shl( num_den, 1 );
-#endif
                 }
                 FOR( i = 0; i < lg_out; i++ )
                 {
@@ -343,9 +330,7 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
                      Word16 sigOut_fx[],      /* o  : decimated signal    Q0  */
                      const Word32 fout,       /* i  : frequency of output Q0  */
                      Word16 mem_fx[],         /* i/o: filter memory       Q0  */
-                     const Word16 nblp,       /* i  : flag indicating if NB low-pass is applied */
-                     Word16 *Q_new_inp,       // TO be removed
-                     Word16 *mem_decim_size   // TO be removed
+                     const Word16 nblp        /* i  : flag indicating if NB low-pass is applied */
 )
 {
     Word16 i;
@@ -377,17 +362,13 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
     /*-------------------------------------------------------------------*
      * Find the resampling configuration
      *-------------------------------------------------------------------*/
-    *Q_new_inp = 0;
-    move16();
+
     /* check if fin and fout are the same */
     IF( EQ_32( fin, fout ) )
     {
         /* just copy the signal_fx and quit */
         Copy( sigIn_fx, sigOut_fx, lg );
-        *mem_decim_size = 0;
-        *Q_new_inp = 0;
-        move16();
-        move16();
+
         return lg;
     }
     ELSE
@@ -452,8 +433,6 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
         }
 
         mem_len = shl( filt_len, 1 );
-        *mem_decim_size = mem_len;
-        move16();
         signal_fx = signal_tab_fx + 2 * L_FILT_MAX + sub( L_FRAME48k, add( mem_len, lg ) );
         signal_ana_fx = signal_fx;
         mem_len_ana = mem_len;
@@ -512,13 +491,8 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
             sigPtr = signal_fx + add( add( lg, mem_len ), i );
             move16(); /*+i*/
             L_tmp = syn_kern_16( 0, A_fx, sigPtr );
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_sat( L_tmp, 3 );
             *sigPtr = round_fx_sat( L_tmp ); /* AZ ringing padding */
-#else
-            L_tmp = L_shl( L_tmp, 3 );
-            *sigPtr = round_fx( L_tmp ); /* AZ ringing padding */
-#endif
         }
         mem_preemph_fx = signal_fx[mem_len + lg - LEN_WIN_SSS - 1];
         move16();
@@ -526,7 +500,7 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
     }
     /* interpolation */
 
-    datastep = shr( div_s( shl( fac_den, 7 ), shl( fac_num, 10 ) ), 12 );
+    datastep = shr( div_s( shl( fac_den, 8 ), shl( fac_num, 11 ) ), 12 );
     /* equivalent to 'datastep = fac_den % fac_num' */
     temp_n = i_mult2( datastep, fac_num ); /*Q0*/
     fracstep = sub( fac_den, temp_n );
@@ -542,11 +516,7 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
 
     FOR( i = 0; i < lg_out; i++ )
     {
-#ifdef BASOP_NOGLOB
         sigOut_fx[i] = round_fx_sat( Interpol_lc_fx( sigIn_ptr, cfg_ptr_fx->filter_fx, frac, fac_num, filt_len_tmp ) );
-#else
-        sigOut_fx[i] = round_fx( Interpol_lc_fx( sigIn_ptr, cfg_ptr_fx->filter_fx, frac, fac_num, filt_len_tmp ) );
-#endif
         move16();
         frac = add( frac, fracstep );
 
@@ -572,9 +542,6 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
                 FOR( i = 0; i < lg_out; i++ )
                 {
                     sigOut_fx[i] = round_fx( L_shl( L_mult( sigOut_fx[i], num_den ), 1 ) ); /*Q0*/
-                    *Q_new_inp = -1;
-                    move16();
-                    move16();
                 }
             }
             ELSE
@@ -584,9 +551,8 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
                 test();
                 if ( GT_32( fin, 16000 ) && ( EQ_16( lg_out, L_FRAME ) || EQ_16( lg_out, L_FRAME16k ) || EQ_16( lg_out, 512 ) ) )
                 {
-#ifdef BASOP_NOGLOB
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
                     num_den = shl_o( num_den, 1, &Overflow );
-                    //*Q_new_inp = 2;
 #else
                     num_den = shl( num_den, 1 );
 #endif
@@ -596,8 +562,6 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
                     sigOut_fx[i] = mult_r( sigOut_fx[i], num_den ); /*Q0*/
                     move16();
                 }
-                *Q_new_inp = -1;
-                move16();
             }
         }
         ELSE
@@ -605,13 +569,10 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
             IF( EQ_16( fac_num, 8 ) )
             {
                 num_den = 26214;
-                move16();
                 FOR( i = 0; i < lg_out; i++ )
                 {
                     sigOut_fx[i] = mult_r( sigOut_fx[i], num_den ); /*Q-1*/
                     move16();
-                    *Q_new_inp = -2;
-                    move16();
                 }
             }
             ELSE
@@ -620,9 +581,6 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
                 FOR( i = 0; i < lg_out; i++ )
                 {
                     sigOut_fx[i] = round_fx( L_mac( L_deposit_h( sigOut_fx[i] ), sigOut_fx[i], num_den ) ); /*Q0*/
-                    *Q_new_inp = -1;
-                    move16();
-                    move16();
                 }
             }
         }
@@ -633,8 +591,6 @@ Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
         {
             sigOut_fx[i] = mult_r( sigOut_fx[i], 16384 );
             move16(); /*Q-1*/
-            *Q_new_inp = -2;
-            move16();
         }
     }
     /* update the filter memory */
@@ -980,112 +936,63 @@ void Decimate_allpass_steep_fx(
     FOR( k = 0; k < N / 2; k++ )
     {
 
-        Lacc = L_deposit_h( mem[0] ); /* Q(16+x)   */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[0] );                                     /* Q(16+x)   */
         Lacc = L_mac_o( Lacc, AP1_STEEP_FX[0], in_fx[2 * k], &Overflow ); /* Q(16+x)   */
-#else
-        Lacc = L_mac( Lacc, AP1_STEEP_FX[0], in_fx[2 * k] );                                                              /* Q(16+x)   */
-#endif
-        Lacc1 = L_deposit_h( in_fx[2 * k] ); /* Q16+Qx    */
-        temp1 = extract_h( Lacc );           /* Qx        */
-#ifdef BASOP_NOGLOB
-        Lacc1 = L_msu_o( Lacc1, AP1_STEEP_FX[0], temp1, &Overflow ); /* Q16+Qx    */
-#else
-        Lacc1 = L_msu( Lacc1, AP1_STEEP_FX[0], temp1 );                                                                   /* Q16+Qx    */
-#endif
-        mem[0] = extract_h( Lacc1 ); /* Qx        */
+        Lacc1 = L_deposit_h( in_fx[2 * k] );                              /* Q16+Qx    */
+        temp1 = extract_h( Lacc );                                        /* Qx        */
+        Lacc1 = L_msu_o( Lacc1, AP1_STEEP_FX[0], temp1, &Overflow );      /* Q16+Qx    */
+        mem[0] = extract_h( Lacc1 );                                      /* Qx        */
         temp[0] = temp1;
         move16();
         move16();
 
-        Lacc1 = L_deposit_h( mem[1] ); /* Q16+Qx    */
-#ifdef BASOP_NOGLOB
+        Lacc1 = L_deposit_h( mem[1] );                                   /* Q16+Qx    */
         Lacc1 = ( L_mac_o( Lacc1, AP1_STEEP_FX[1], temp1, &Overflow ) ); /* Q16+Qx    */
-#else
-        Lacc1 = ( L_mac( Lacc1, AP1_STEEP_FX[1], temp1 ) );                                                               /* Q16+Qx    */
-#endif
 
-        temp2 = extract_h( Lacc1 ); /* Qx        */
-#ifdef BASOP_NOGLOB
+        temp2 = extract_h( Lacc1 );                                /* Qx        */
         Lacc = L_msu_o( Lacc, AP1_STEEP_FX[1], temp2, &Overflow ); /* Q16+Qx    */
-#else
-        Lacc = L_msu( Lacc, AP1_STEEP_FX[1], temp2 );                                                                     /* Q16+Qx    */
-#endif
-        mem[1] = extract_h( Lacc ); /* Qx        */
+        mem[1] = extract_h( Lacc );                                /* Qx        */
         temp[1] = temp2;
         move16();
         move16();
 
 
-        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x)              */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] );                                                /* Q(16+x)              */
         out_fx[k] = extract_h( L_mac_o( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ) ); /* Qx format            */
         move16();
         mem[ALLPASSSECTIONS_STEEP - 1] = extract_h( L_msu_o( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[k], &Overflow ) ); /* Qx    */
         move16();
-#else
-        out_fx[k] = extract_h( L_mac( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2 ) );                           /* Qx format            */
-        mem[ALLPASSSECTIONS_STEEP - 1] = extract_h( L_msu( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[k] ) ); /* Qx    */
-#endif
     }
 
     /* lower allpass filter chain  */
 
-    Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /*  Q(16+x)     */
-#ifdef BASOP_NOGLOB
+    Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] );                                   /*  Q(16+x)     */
     Lacc = L_mac_o( Lacc, AP2_STEEP_FX[0], mem[2 * ALLPASSSECTIONS_STEEP], &Overflow ); /*Q(16+x)   */
-#else
-    Lacc = L_mac( Lacc, AP2_STEEP_FX[0], mem[2 * ALLPASSSECTIONS_STEEP] );                                                /*Q(16+x)   */
-#endif
-    Lacc1 = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP] ); /*  Q(16+x)     */
-    temp1 = extract_h( Lacc );                             /*  Qx          */
-#ifdef BASOP_NOGLOB
-    Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow ); /*  Q(16+x)     */
-#else
-    Lacc1 = L_msu( Lacc1, AP2_STEEP_FX[0], temp1 );                                                                       /*  Q(16+x)     */
-#endif
+    Lacc1 = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP] );                              /*  Q(16+x)     */
+    temp1 = extract_h( Lacc );                                                          /*  Qx          */
+    Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow );                        /*  Q(16+x)     */
     mem[ALLPASSSECTIONS_STEEP] = extract_h( Lacc1 );
     temp[0] = temp1;
     move16();
 
-    Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] ); /*   Q(16+x) */
-#ifdef BASOP_NOGLOB
+    Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] );       /*   Q(16+x) */
     Lacc1 = L_mac_o( Lacc1, AP2_STEEP_FX[1], temp1, &Overflow ); /*  Q(16+x) */
-#else
-    Lacc1 = L_mac( Lacc1, AP2_STEEP_FX[1], temp1 );                                                                       /*  Q(16+x) */
-#endif
-    temp2 = extract_h( Lacc1 ); /*  Qx      */
+    temp2 = extract_h( Lacc1 );                                  /*  Qx      */
     temp[1] = temp2;
     move16();
-#ifdef BASOP_NOGLOB
     Lacc = L_msu_o( Lacc, AP2_STEEP_FX[1], temp2, &Overflow ); /*  Q(16+x) */
-#else
-    Lacc = L_msu( Lacc, AP2_STEEP_FX[1], temp2 );                                                                         /*  Q(16+x) */
-#endif
-    mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc ); /*  Qx      */
+    mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc );        /*  Qx      */
     move16();
 
-    Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x)  */
-#ifdef BASOP_NOGLOB
+    Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] );                          /* Q(16+x)  */
     Lacc = L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ); /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
-#else
-    Lacc = L_mac( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2 );                                                 /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
-#endif
-    temp[2] = extract_h( Lacc ); /* temp[2] in Qx  */
+    temp[2] = extract_h( Lacc );                                                       /* temp[2] in Qx  */
     move16();
-#ifdef BASOP_NOGLOB
     Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2], &Overflow ); /*   Q(16+x) */
-#else
-    Lacc1 = L_msu( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2] );                                             /*   Q(16+x) */
-#endif
-    mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 ); /*   Qx      */
+    mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 );                               /*   Qx      */
     move16();
-    sum = mult_r( out_fx[0], 16384 ); /* Qx */
-#ifdef BASOP_NOGLOB
+    sum = mult_r( out_fx[0], 16384 );                                             /* Qx */
     out_fx[0] = add_sat( sum, mult_r( temp[ALLPASSSECTIONS_STEEP - 1], 16384 ) ); /*    Qx  */
-#else
-    out_fx[0] = add( sum, mult_r( temp[ALLPASSSECTIONS_STEEP - 1], 16384 ) );                                             /*    Qx  */
-#endif
     move16();
 
 
@@ -1093,19 +1000,11 @@ void Decimate_allpass_steep_fx(
     {
 
 
-        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x)           */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] );                     /* Q(16+x)           */
         Lacc = L_mac_o( Lacc, AP2_STEEP_FX[0], in_fx[2 * k - 1], &Overflow ); /* Q(16+x):temp[0]   */
-#else
-        Lacc = L_mac( Lacc, AP2_STEEP_FX[0], in_fx[2 * k - 1] );                                                          /* Q(16+x):temp[0]   */
-#endif
-        Lacc1 = L_deposit_h( in_fx[2 * k - 1] ); /* Q(16+x)           */
-        temp1 = extract_h( Lacc );               /* Qx                */
-#ifdef BASOP_NOGLOB
-        Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x)           */
-#else
-        Lacc1 = L_msu( Lacc1, AP2_STEEP_FX[0], temp1 );                                                                   /* Q(16+x)           */
-#endif
+        Lacc1 = L_deposit_h( in_fx[2 * k - 1] );                              /* Q(16+x)           */
+        temp1 = extract_h( Lacc );                                            /* Qx                */
+        Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow );          /* Q(16+x)           */
 
         mem[ALLPASSSECTIONS_STEEP] = extract_h( Lacc1 ); /* Qx */
         move16();
@@ -1113,45 +1012,25 @@ void Decimate_allpass_steep_fx(
         move16();
 
 
-        Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] ); /* Q(16+x)  */
-#ifdef BASOP_NOGLOB
+        Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] );       /* Q(16+x)  */
         Lacc1 = L_mac_o( Lacc1, AP2_STEEP_FX[1], temp1, &Overflow ); /* Q(16+x)  */
-#else
-        Lacc1 = L_mac( Lacc1, AP2_STEEP_FX[1], temp1 );                                                                   /* Q(16+x)  */
-#endif
-        temp2 = extract_h( Lacc1 ); /* Qx       */
+        temp2 = extract_h( Lacc1 );                                  /* Qx       */
         temp[1] = temp2;
         move16();
-#ifdef BASOP_NOGLOB
         Lacc = L_msu_o( Lacc, AP2_STEEP_FX[1], temp2, &Overflow ); /* Q(16+x)  */
-#else
-        Lacc = L_msu( Lacc, AP2_STEEP_FX[1], temp2 );                                                                     /* Q(16+x)  */
-#endif
-        mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc ); /* Qx       */
+        mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc );        /* Qx       */
 
 
-        Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
-        Lacc = L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[1], &Overflow ); /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
-#else
-        Lacc = L_mac( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[1] );                                           /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
-#endif
-        temp[2] = extract_h( Lacc ); /*temp[2] in Qx  */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] );                              /* Q(16+x) */
+        Lacc = L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[1], &Overflow );   /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
+        temp[2] = extract_h( Lacc );                                                           /*temp[2] in Qx  */
         Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2], &Overflow ); /* Q(16+x) */
-#else
-        Lacc1 = L_msu( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2] );                                         /* Q(16+x) */
-#endif
-        mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 ); /* Qx  */
+        mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 );                               /* Qx  */
 
 
         sum = mult_r( out_fx[k], 16384 ); /* Qx */
-#ifdef BASOP_NOGLOB
         out_fx[k] = add_sat( sum, mult_r( temp[ALLPASSSECTIONS_STEEP - 1], 16384 ) );
         move16();
-#else
-        out_fx[k] = add( sum, mult_r( temp[ALLPASSSECTIONS_STEEP - 1], 16384 ) );
-#endif
         move16(); /* Qx  */
     }
 
@@ -1188,109 +1067,56 @@ void Interpolate_allpass_steep_fx(
     FOR( k = 0; k < N; k++ )
     {
 
-        Lacc = L_deposit_h( mem[0] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[0] );                                 /* Q(16+x) */
         Lacc = L_mac_o( Lacc, AP2_STEEP_FX[0], in_fx[k], &Overflow ); /* Q(16+x):temp[0] */
-#else
-        Lacc = L_mac( Lacc, AP2_STEEP_FX[0], in_fx[k] ); /* Q(16+x):temp[0] */
-#endif
-        Lacc1 = L_deposit_h( in_fx[k] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
-        temp1 = round_fx_o( Lacc, &Overflow );                       /* Qx */
-        Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x)  */
+        Lacc1 = L_deposit_h( in_fx[k] );                              /* Q(16+x) */
+        temp1 = round_fx_o( Lacc, &Overflow );                        /* Qx */
+        Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow );  /* Q(16+x)  */
 
         mem[0] = round_fx_o( Lacc1, &Overflow );
         move16();
-#else
-        temp1 = round_fx( Lacc );                        /* Qx */
-        Lacc1 = L_msu( Lacc1, AP2_STEEP_FX[0], temp1 );  /* Q(16+x)  */
-
-        mem[0] = round_fx( Lacc1 );
-#endif
-        Lacc1 = L_deposit_h( mem[1] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
+        Lacc1 = L_deposit_h( mem[1] );                                   /* Q(16+x) */
         Lacc1 = ( L_mac_o( Lacc1, AP2_STEEP_FX[1], temp1, &Overflow ) ); /* Q(16+x):temp[1] */
-#else
-        Lacc1 = ( L_mac( Lacc1, AP2_STEEP_FX[1], temp1 ) );                                                                      /* Q(16+x):temp[1] */
-#endif
         Lacc = L_deposit_h( temp1 );
 
-#ifdef BASOP_NOGLOB
         temp2 = round_fx_o( Lacc1, &Overflow );                    /* Qx */
         Lacc = L_msu_o( Lacc, AP2_STEEP_FX[1], temp2, &Overflow ); /* Q(16+x) */
         mem[1] = round_fx_o( Lacc, &Overflow );                    /* Qx */
         move16();
-#else
-        temp2 = round_fx( Lacc1 );                                                                                               /* Qx */
-        Lacc = L_msu( Lacc, AP2_STEEP_FX[1], temp2 );                                                                            /* Q(16+x) */
-        mem[1] = round_fx( Lacc );                                                                                               /* Qx */
-#endif
 
         Lacc1 = L_deposit_h( temp2 );
-        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] );                                                                    /* Q(16+x) */
         out_fx[2 * k + 1] = round_fx_o( L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ), &Overflow ); /* Qx format */
         move16();
         mem[ALLPASSSECTIONS_STEEP - 1] = round_fx_o( L_msu_o( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k + 1], &Overflow ), &Overflow ); /* Qx  */
         move16();
-#else
-        out_fx[2 * k + 1] = round_fx( L_mac( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2 ) );                           /* Qx format */
-        mem[ALLPASSSECTIONS_STEEP - 1] = round_fx( L_msu( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k + 1] ) ); /* Qx  */
-#endif
     }
 
     /*  lower allpass filter chain    */
 
     FOR( k = 0; k < N; k++ )
     {
-        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
+        Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] );             /* Q(16+x) */
         Lacc = L_mac_o( Lacc, AP1_STEEP_FX[0], in_fx[k], &Overflow ); /* Q(16+x):temp[0] */
-#else
-        Lacc = L_mac( Lacc, AP1_STEEP_FX[0], in_fx[k] );                                                                         /* Q(16+x):temp[0] */
-#endif
-        Lacc1 = L_deposit_h( in_fx[k] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
-        temp1 = round_fx_o( Lacc, &Overflow );                       /* Qx */
-        Lacc1 = L_msu_o( Lacc1, AP1_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x)  */
+        Lacc1 = L_deposit_h( in_fx[k] );                              /* Q(16+x) */
+        temp1 = round_fx_o( Lacc, &Overflow );                        /* Qx */
+        Lacc1 = L_msu_o( Lacc1, AP1_STEEP_FX[0], temp1, &Overflow );  /* Q(16+x)  */
 
         mem[ALLPASSSECTIONS_STEEP] = round_fx_o( Lacc1, &Overflow );
-#else
-        temp1 = round_fx( Lacc );                                                                                                /* Qx */
-        Lacc1 = L_msu( Lacc1, AP1_STEEP_FX[0], temp1 );                                                                          /* Q(16+x)  */
-
-        mem[ALLPASSSECTIONS_STEEP] = round_fx( Lacc1 );
-#endif
-        Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] ); /* Q(16+x) */
-#ifdef BASOP_NOGLOB
+        Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] );       /* Q(16+x) */
         Lacc1 = L_mac_o( Lacc1, AP1_STEEP_FX[1], temp1, &Overflow ); /* Q(16+x):temp[1] */
 
         temp2 = round_fx_o( Lacc1, &Overflow ); /* Qx */
-#else
-        Lacc1 = L_mac( Lacc1, AP1_STEEP_FX[1], temp1 ); /* Q(16+x):temp[1] */
-
-        temp2 = round_fx( Lacc1 );                                                                                               /* Qx */
-#endif
         Lacc = L_deposit_h( temp1 );
-#ifdef BASOP_NOGLOB
         Lacc = L_msu_o( Lacc, AP1_STEEP_FX[1], temp2, &Overflow );      /* Q(16+x) */
         mem[ALLPASSSECTIONS_STEEP + 1] = round_fx_o( Lacc, &Overflow ); /* Qx */
-#else
-        Lacc = L_msu( Lacc, AP1_STEEP_FX[1], temp2 );                                                                            /* Q(16+x) */
-        mem[ALLPASSSECTIONS_STEEP + 1] = round_fx( Lacc );                                                                       /* Qx */
-#endif
 
         Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
         Lacc1 = L_deposit_h( temp2 );
-#ifdef BASOP_NOGLOB
         out_fx[2 * k] = round_fx_o( L_mac_o( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ), &Overflow ); /* Qx format */
         move16();
         mem[2 * ALLPASSSECTIONS_STEEP - 1] = round_fx_o( L_msu_o( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k], &Overflow ), &Overflow ); /* Qx */
         move16();
-#else
-        out_fx[2 * k] = round_fx( L_mac( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2 ) );                               /* Qx format */
-        mem[2 * ALLPASSSECTIONS_STEEP - 1] = round_fx( L_msu( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k] ) ); /* Qx */
-#endif
     }
 
     return;
@@ -1346,19 +1172,11 @@ void interpolate_3_over_2_allpass_fx(
         Vu[1] = mem[1] + filt_coeff[1] * ( Vu[0] - mem[2] );
         mem[3] = mem[2] + filt_coeff[2] * ( Vu[1] - mem[3] );*/
 
-#ifdef BASOP_NOGLOB
         Vu[0] = add_sat( mem_fx[0], mult_r_sat( filt_coeff_fx[0], sub_sat( input_fx_temp[i], mem_fx[1] ) ) );
         move16(); /* all Vu's in : Q_current*/
         Vu[1] = add_sat( mem_fx[1], mult_r_sat( filt_coeff_fx[1], sub_sat( Vu[0], mem_fx[2] ) ) );
         move16();
         mem_fx[3] = add_sat( mem_fx[2], mult_r_sat( filt_coeff_fx[2], sub_sat( Vu[1], mem_fx[3] ) ) );
-#else
-        Vu[0] = add( mem_fx[0], mult_r( filt_coeff_fx[0], sub( input_fx_temp[i], mem_fx[1] ) ) );
-        move16(); /* all Vu's in : Q_current*/
-        Vu[1] = add( mem_fx[1], mult_r( filt_coeff_fx[1], sub( Vu[0], mem_fx[2] ) ) );
-        move16();
-        mem_fx[3] = add( mem_fx[2], mult_r( filt_coeff_fx[2], sub( Vu[1], mem_fx[3] ) ) );
-#endif
         move16();
 
 
@@ -1373,21 +1191,12 @@ void interpolate_3_over_2_allpass_fx(
         /* Vm[0] = mem[0] + filt_coeff[3] * (input[i]-mem[4]);
         Vm[1] = mem[4] + filt_coeff[4] * (Vm[0]-mem[5]);
         mem[6] = mem[5] + filt_coeff[5] * (Vm[1]-mem[6]); */
-#ifdef BASOP_NOGLOB
         Vm[0] = add_sat( mem_fx[0], mult_r_sat( filt_coeff_fx[3], sub_sat( input_fx_temp[i], mem_fx[4] ) ) );
         move16();
         Vm[1] = add_sat( mem_fx[4], mult_r_sat( filt_coeff_fx[4], sub_sat( Vm[0], mem_fx[5] ) ) );
         move16();
         mem_fx[6] = add_sat( mem_fx[5], mult_r_sat( filt_coeff_fx[5], sub_sat( Vm[1], mem_fx[6] ) ) );
         move16();
-#else
-        Vm[0] = add( mem_fx[0], mult_r( filt_coeff_fx[3], sub( input_fx_temp[i], mem_fx[4] ) ) );
-        move16();
-        Vm[1] = add( mem_fx[4], mult_r( filt_coeff_fx[4], sub( Vm[0], mem_fx[5] ) ) );
-        move16();
-        mem_fx[6] = add( mem_fx[5], mult_r( filt_coeff_fx[5], sub( Vm[1], mem_fx[6] ) ) );
-        move16();
-#endif
         mem_fx[4] = Vm[0];
         move16();
         mem_fx[5] = Vm[1];
@@ -1399,21 +1208,12 @@ void interpolate_3_over_2_allpass_fx(
         /* Vl[0] = mem[0] + filt_coeff[6] * (input[i]-mem[7]);
         Vl[1] = mem[7] + filt_coeff[7] * (Vl[0]-mem[8]);
         mem[9] = mem[8] + filt_coeff[8] * (Vl[1]-mem[9]); */
-#ifdef BASOP_NOGLOB
         Vl[0] = add_sat( mem_fx[0], mult_r_sat( filt_coeff_fx[6], sub_sat( input_fx_temp[i], mem_fx[7] ) ) );
         move16();
         Vl[1] = add_sat( mem_fx[7], mult_r_sat( filt_coeff_fx[7], sub_sat( Vl[0], mem_fx[8] ) ) );
         move16();
         mem_fx[9] = add_sat( mem_fx[8], mult_r_sat( filt_coeff_fx[8], sub_sat( Vl[1], mem_fx[9] ) ) );
         move16();
-#else
-        Vl[0] = add( mem_fx[0], mult_r( filt_coeff_fx[6], sub( input_fx_temp[i], mem_fx[7] ) ) );
-        move16();
-        Vl[1] = add( mem_fx[7], mult_r( filt_coeff_fx[7], sub( Vl[0], mem_fx[8] ) ) );
-        move16();
-        mem_fx[9] = add( mem_fx[8], mult_r( filt_coeff_fx[8], sub( Vl[1], mem_fx[9] ) ) );
-        move16();
-#endif
         mem_fx[0] = input_fx_temp[i];
         move16();
         mem_fx[7] = Vl[0];
@@ -1432,13 +1232,8 @@ void interpolate_3_over_2_allpass_fx(
     {
         mem_temp = out1_buff[shl( i, 1 )];
         move16();
-#ifdef BASOP_NOGLOB
         out_fx[i] = add_sat( mult_r_sat( 1550 /* 0.0473147f Q15*/, add_sat( mem_temp, mem_fx[10] ) ), mult_r_sat( -4965 /*-0.151521f Q15*/, add_sat( mem_fx[11], mem_fx[14] ) ) );
         out_fx[i] = add_sat( out_fx[i], mult_r_sat( 20125 /*0.614152f Q15*/, add_sat( mem_fx[12], mem_fx[13] ) ) );
-#else
-        out_fx[i] = add( mult_r( 1550 /* 0.0473147f Q15*/, add( mem_temp, mem_fx[10] ) ), mult_r( -4965 /*-0.151521f Q15*/, add( mem_fx[11], mem_fx[14] ) ) );
-        out_fx[i] = add( out_fx[i], mult_r( 20125 /*0.614152f Q15*/, add( mem_fx[12], mem_fx[13] ) ) );
-#endif
         mem_fx[10] = mem_fx[11];
         move16();
         mem_fx[11] = mem_fx[12];
@@ -1581,23 +1376,11 @@ void interpolate_3_over_1_allpass_fx(
         Vu[1] = mem[1] + filt_coeff[1] * ( Vu[0] - mem[2] );
         mem[3] = mem[2] + filt_coeff[2] * ( Vu[1] - mem[3] );*/
 
-#ifdef BASOP_NOGLOB
         Vu[0] = add_sat( mem_fx[0], mult_r( filt_coeff_fx[0], sub_sat( input_fx[i], mem_fx[1] ) ) );
-#else
-        Vu[0] = add( mem_fx[0], mult_r( filt_coeff_fx[0], sub( input_fx[i], mem_fx[1] ) ) );
-#endif
         move16(); /* all Vu's in : Q_current*/
-#ifdef BASOP_NOGLOB
         Vu[1] = add_sat( mem_fx[1], mult_r( filt_coeff_fx[1], sub_sat( Vu[0], mem_fx[2] ) ) );
-#else
-        Vu[1] = add( mem_fx[1], mult_r( filt_coeff_fx[1], sub( Vu[0], mem_fx[2] ) ) );
-#endif
         move16();
-#ifdef BASOP_NOGLOB
         mem_fx[3] = add_sat( mem_fx[2], mult_r( filt_coeff_fx[2], sub_sat( Vu[1], mem_fx[3] ) ) );
-#else
-        mem_fx[3] = add( mem_fx[2], mult_r( filt_coeff_fx[2], sub( Vu[1], mem_fx[3] ) ) );
-#endif
         move16();
 
 
@@ -1612,23 +1395,11 @@ void interpolate_3_over_1_allpass_fx(
         /* Vm[0] = mem[0] + filt_coeff[3] * (input[i]-mem[4]);
         Vm[1] = mem[4] + filt_coeff[4] * (Vm[0]-mem[5]);
         mem[6] = mem[5] + filt_coeff[5] * (Vm[1]-mem[6]); */
-#ifdef BASOP_NOGLOB
         Vm[0] = add_sat( mem_fx[0], mult_r( filt_coeff_fx[3], sub_sat( input_fx[i], mem_fx[4] ) ) );
-#else
-        Vm[0] = add( mem_fx[0], mult_r( filt_coeff_fx[3], sub( input_fx[i], mem_fx[4] ) ) );
-#endif
         move16();
-#ifdef BASOP_NOGLOB
         Vm[1] = add_sat( mem_fx[4], mult_r( filt_coeff_fx[4], sub_sat( Vm[0], mem_fx[5] ) ) );
-#else
-        Vm[1] = add( mem_fx[4], mult_r( filt_coeff_fx[4], sub( Vm[0], mem_fx[5] ) ) );
-#endif
         move16();
-#ifdef BASOP_NOGLOB
         mem_fx[6] = add_sat( mem_fx[5], mult_r( filt_coeff_fx[5], sub_sat( Vm[1], mem_fx[6] ) ) );
-#else
-        mem_fx[6] = add( mem_fx[5], mult_r( filt_coeff_fx[5], sub( Vm[1], mem_fx[6] ) ) );
-#endif
         move16();
 
         mem_fx[4] = Vm[0];
@@ -1642,23 +1413,11 @@ void interpolate_3_over_1_allpass_fx(
         /* Vl[0] = mem[0] + filt_coeff[6] * (input[i]-mem[7]);
         Vl[1] = mem[7] + filt_coeff[7] * (Vl[0]-mem[8]);
         mem[9] = mem[8] + filt_coeff[8] * (Vl[1]-mem[9]); */
-#ifdef BASOP_NOGLOB
         Vl[0] = add_sat( mem_fx[0], mult_r( filt_coeff_fx[6], sub_sat( input_fx[i], mem_fx[7] ) ) );
-#else
-        Vl[0] = add( mem_fx[0], mult_r( filt_coeff_fx[6], sub( input_fx[i], mem_fx[7] ) ) );
-#endif
         move16();
-#ifdef BASOP_NOGLOB
         Vl[1] = add_sat( mem_fx[7], mult_r( filt_coeff_fx[7], sub_sat( Vl[0], mem_fx[8] ) ) );
-#else
-        Vl[1] = add( mem_fx[7], mult_r( filt_coeff_fx[7], sub( Vl[0], mem_fx[8] ) ) );
-#endif
         move16();
-#ifdef BASOP_NOGLOB
         mem_fx[9] = add_sat( mem_fx[8], mult_r( filt_coeff_fx[8], sub_sat( Vl[1], mem_fx[9] ) ) );
-#else
-        mem_fx[9] = add( mem_fx[8], mult_r( filt_coeff_fx[8], sub( Vl[1], mem_fx[9] ) ) );
-#endif
         move16();
 
         mem_fx[0] = input_fx[i];
@@ -1675,11 +1434,7 @@ void interpolate_3_over_1_allpass_fx(
     {
         mem_temp = out_fx[i];
         move16();
-#ifdef BASOP_NOGLOB
         out_fx[i] = sub_sat( mult_r( 18768 /*0.57276865021499168f Q15*/, add_sat( mem_fx[12], mem_fx[11] ) ), mult_r( 2425 /*0.074004974641176793f Q15*/, add_sat( mem_temp, mem_fx[10] ) ) );
-#else
-        out_fx[i] = sub( mult_r( 18768 /*0.57276865021499168f Q15*/, add( mem_fx[12], mem_fx[11] ) ), mult_r( 2425 /*0.074004974641176793f Q15*/, add( mem_temp, mem_fx[10] ) ) );
-#endif
         mem_fx[10] = mem_fx[11];
         move16();
         mem_fx[11] = mem_fx[12];
diff --git a/lib_com/move.h b/lib_com/move.h
index 5c325fb1d5dc2d1b88edbfa6fb222e171e8928d7..7762ec79a10ad01297c253311190f95af13d647b 100644
--- a/lib_com/move.h
+++ b/lib_com/move.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/mslvq_com.c b/lib_com/mslvq_com.c
index bab16f16599e15dd4f3bb2f28c3ebeb1dcef628b..12234a4c055664712312c284ce500a2a019c119a 100644
--- a/lib_com/mslvq_com.c
+++ b/lib_com/mslvq_com.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,10 +38,8 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 /*-----------------------------------------------------------------*
@@ -76,10 +74,10 @@ static void make_offset_scale(
 void create_offset(
     UWord32 *offset_scale1,
     UWord32 *offset_scale2,
-    const int16_t mode,
-    const int16_t prediction_flag )
+    const Word16 mode,
+    const Word16 prediction_flag )
 {
-    int16_t tmp, tmp1;
+    Word16 tmp, tmp1;
 
     if ( prediction_flag == 0 )
     {
diff --git a/lib_com/mslvq_com_fx.c b/lib_com/mslvq_com_fx.c
index 7c6658e8fbc6e75464f0e5d791875c32a71f488f..7fcf36bfcfb81b1250315991a080644d2b49a6a0 100644
--- a/lib_com/mslvq_com_fx.c
+++ b/lib_com/mslvq_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,7 +31,6 @@
 *******************************************************************************************************/
 
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "stl.h"
@@ -122,9 +121,43 @@ void init_lvq_fx(
 )
 {
     Word16 i, j;
+#ifdef OPT_STEREO_32KBPS_V1
+    Word16 k;
+#endif /* OPT_STEREO_32KBPS_V1 */
     /* safety-net mode */
     FOR( i = 0; i < MAX_NO_MODES; i++ )
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        FOR( ( j = 0, k = 0 ); j < MAX_NO_SCALES; j++ )
+        {
+            if ( no_lead_fx[i][j] > 0 )
+            {
+                k = add( k, 1 );
+            }
+            if ( no_lead_fx[i][j] <= 0 )
+            {
+                j = MAX_NO_SCALES - 1;
+                move16();
+            }
+        }
+        no_scales[i][0] = k;
+        move16();
+
+        FOR( k = 0; j < MAX_NO_SCALES << 1; j++ )
+        {
+            if ( no_lead_fx[i][j] > 0 )
+            {
+                k = add( k, 1 );
+            }
+            if ( no_lead_fx[i][j] <= 0 )
+            {
+                j = MAX_NO_SCALES << 1;
+                move16();
+            }
+        }
+        no_scales[i][1] = k;
+        move16();
+#else  /* OPT_STEREO_32KBPS_V1 */
         j = 0;
         move16();
         test();
@@ -143,10 +176,44 @@ void init_lvq_fx(
         }
         no_scales[i][1] = sub( j, MAX_NO_SCALES );
         move16();
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
     /* predictive mode */
     FOR( i = 0; i < MAX_NO_MODES_p; i++ )
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        FOR( ( j = 0, k = 0 ); j < MAX_NO_SCALES; j++ )
+        {
+            if ( no_lead_p_fx[i][j] > 0 )
+            {
+                k = add( k, 1 );
+            }
+            if ( ( no_lead_p_fx[i][j] <= 0 ) )
+            {
+                j = MAX_NO_SCALES - 1;
+                move16();
+            }
+        }
+        no_scales_p[i][0] = k;
+        move16();
+
+        FOR( k = 0; j < MAX_NO_SCALES << 1; j++ )
+        {
+            if ( no_lead_p_fx[i][j] > 0 )
+            {
+                k = add( k, 1 );
+            }
+
+            if ( ( no_lead_p_fx[i][j] <= 0 ) )
+            {
+                j = MAX_NO_SCALES << 1;
+                move16();
+            }
+        }
+
+        no_scales_p[i][1] = k;
+        move16();
+#else  /* OPT_STEREO_32KBPS_V1 */
         j = 0;
         move16();
         WHILE( ( LT_16( j, MAX_NO_SCALES ) ) && ( no_lead_p_fx[i][j] > 0 ) )
@@ -165,6 +232,7 @@ void init_lvq_fx(
         }
         no_scales_p[i][1] = sub( j, MAX_NO_SCALES );
         move16();
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
     /* index offsets for each truncation */
     init_offset_fx( offset_scale1, offset_scale2, offset_scale1_p, offset_scale2_p, no_scales, no_scales_p );
@@ -412,12 +480,10 @@ static Word16 decode_indexes_ivas_fx(
         IF( index[i] < 0 )
         {
             set16_fx( x_lvq, 0, 2 * LATTICE_DIM );
-#ifdef MSAN_FIX
             scales_mslvq[0] = 0;
             move16();
             scales_mslvq[1] = 0;
             move16();
-#endif
             index[i] = 0;
             return 1;
         }
@@ -442,10 +508,8 @@ static Word16 decode_indexes_ivas_fx(
         FOR( i = 0; i < LATTICE_DIM; i++ )
         {
             x_lvq[i] = 0;
-#ifdef MSAN_FIX
             scales_mslvq[0] = 0;
             move16();
-#endif
         }
     }
     ELSE
@@ -454,12 +518,10 @@ static Word16 decode_indexes_ivas_fx(
         {
             /* safety check in case of bit errors */
             set16_fx( x_lvq, 0, 2 * LATTICE_DIM );
-#ifdef MSAN_FIX
             scales_mslvq[0] = 0;
             move16();
             scales_mslvq[1] = 0;
             move16();
-#endif
             return 1;
         }
 
@@ -500,10 +562,8 @@ static Word16 decode_indexes_ivas_fx(
             x_lvq[i] = 0;
             move16();
         }
-#ifdef MSAN_FIX
         scales_mslvq[1] = 0;
         move16();
-#endif
     }
     ELSE
     {
diff --git a/lib_com/nelp_fx.c b/lib_com/nelp_fx.c
index b37d57093f1a1e98164d7479c1a62568aec0b72a..39d57299e7dad568f0bf2d5c65e1f454d250f127 100644
--- a/lib_com/nelp_fx.c
+++ b/lib_com/nelp_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/oper_32b.c b/lib_com/oper_32b.c
index 0b01cf957a32a65b2f5a11f0a5c8f8270b553ed3..be34a12481f96713597bce743c203af7811e3719 100644
--- a/lib_com/oper_32b.c
+++ b/lib_com/oper_32b.c
@@ -128,15 +128,9 @@ Word32 Mpy_32( Word16 hi1, Word16 lo1, Word16 hi2, Word16 lo2 )
     Flag Overflow = 0;
 #endif
 
-#ifdef BASOP_NOGLOB
     L_32 = L_mult( hi1, hi2 );
     L_32 = L_mac_o( L_32, mult( hi1, lo2 ), 1, &Overflow );
     L_32 = L_mac_o( L_32, mult( lo1, hi2 ), 1, &Overflow );
-#else
-    L_32 = L_mult( hi1, hi2 );
-    L_32 = L_mac( L_32, mult( hi1, lo2 ), 1 );
-    L_32 = L_mac( L_32, mult( lo1, hi2 ), 1 );
-#endif
 
     return ( L_32 );
 }
@@ -169,15 +163,9 @@ Word32 Mac_32( Word32 L_num, Word16 hi1, Word16 lo1, Word16 hi2, Word16 lo2 )
     Flag Overflow = 0;
 #endif
 
-#ifdef BASOP_NOGLOB
     L_32 = L_mac_o( L_num, hi1, hi2, &Overflow );
     L_32 = L_mac_o( L_32, mult( hi1, lo2 ), 1, &Overflow );
     L_32 = L_mac_o( L_32, mult( lo1, hi2 ), 1, &Overflow );
-#else
-    L_32 = L_mac( L_num, hi1, hi2 );
-    L_32 = L_mac( L_32, mult( hi1, lo2 ), 1 );
-    L_32 = L_mac( L_32, mult( lo1, hi2 ), 1 );
-#endif
 
     return ( L_32 );
 }
@@ -209,13 +197,8 @@ Word32 Sqr_32( Word16 hi, Word16 lo )
     Flag Overflow = 0;
 #endif
 
-#ifdef BASOP_NOGLOB
     L_32 = L_mult_o( hi, hi, &Overflow );
     L_32 = L_mac_o( L_32, mult( hi, lo ), 2, &Overflow );
-#else
-    L_32 = L_mult( hi, hi );
-    L_32 = L_mac( L_32, mult( hi, lo ), 2 );
-#endif
 
     return ( L_32 );
 }
@@ -402,11 +385,7 @@ Word32 Div_32( Word32 L_num, Word16 denom_hi, Word16 denom_lo )
     lo = L_Extract_lc( L_32, &hi );
     n_lo = L_Extract_lc( L_num, &n_hi );
     L_32 = Mpy_32( n_hi, n_lo, hi, lo );
-#ifdef BASOP_NOGLOB
     L_32 = L_shl_sat( L_32, 2 );
-#else
-    L_32 = L_shl( L_32, 2 );
-#endif
     return ( L_32 );
 }
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 5217cc8c6bd1c5f1ce38286185da85cc731b5367..75323cf13b7741be6d33a19ce71efeb34e0fe5d9 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -41,16 +41,14 @@
 
 /* ################### Start DEBUGGING switches ######################## */
 
-#ifdef _MSC_VER
-#pragma warning(disable:4310)     /* cast truncates constant value this affects mainly constants tables*/
-#endif
-
 /*#define DEBUGGING*/                             /* Allows debugging message to be printed out during runtime */
 #ifdef DEBUGGING
 #define DEBUG_MODE_INFO                       /* Define to output most important parameters to the subdirectory "res/" */
 #define DEBUG_MODE_INFO_TWEAK                 /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */
-#define DEBUG_FORCE_MDCT_STEREO_MODE      /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */
+#define DEBUG_FORCE_MDCT_STEREO_MODE          /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */
+/*#define DEBUG_FORCE_DIR*/                       /* Force modes/parameters by reading from external binary files */
 /*#define DBG_WAV_WRITER*/                    /* Enable dbgwrite_wav() function for generating ".wav" files */
+#define SUPPORT_FORCE_TCX10_TCX20             /* VA: Enable -force tcx10|tcx20 command-line option */
 #endif
 
 #define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */
@@ -65,59 +63,39 @@
 
 /* #################### End DEBUGGING switches ############################ */
 
-#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */
 #ifndef BASOP_NOGLOB_DEV_USE_GLOBALS
 #define BASOP_NOGLOB_DECLARE_LOCAL
 #endif
 
-#define IVAS_FLOAT_FIXED
-#define IVAS_FLOAT_FIXED_CONVERSIONS /* Temporary macro to keep track of intermediate flt to fixed and fixed to flt conversions */
-#define MSAN_FIX
-#define ISM_DISABLE
-#define FIX_TMP_714
-#define BASOP_NOGLOB_TMP_715
-#define EVS_FUNC_MODIFIED
-//#define EVS_FLOAT_ENC
-#define IVAS_CNST
-#define REMOVE_IVAS_UNUSED_PARAMETERS_WARNING  /*temporary operation on unused EVS parameters to remove warnings, these parameters will be used in IVAS */
-#define MOD_BIT_ALLOC_ROM_TABLE   /* Just to highlight modification in bit allocation table and to ensure these modifications doesn't affect EVS modes*/
-#define SIMPLIFY_CODE_BE   // Simplify synthesis loop
-#define CR_2109_to_2112_cd0_ce0  /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and  */
-#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */
-#define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */
-#define NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS /* DLB: adjust prerendering and mixing gain in OSBA encoder. This is fix to float codes*/
-#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */
-#define FIX_ISSUE_1062_AND_1068_TON_ENE_EST_FX
-#define FIX_ISSUE_987
-#define FIX_1054_IF_ELSE_CMPLX                          /* VA: Fix 1054 incorrect counting of complexity when ELSE-IF sequence is encoutered in two functions */
-#define FIX_1052_COPY_CMPLX_DISCREPANCY       /* VA: modify IF-ELSE statements used in Copy*() functions to avoid dependency on x[] and y[] in RAM */
-#define FIX_1049_SHR_RO_COMPLEXITY              /* VA: fix for issue 1049: incorrect counting of complexity in the shr_ro() function */
-#define NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-#define FIX_1103_OPT_L_NORM_ARR                 /* FhG: Optimize L_norm_arr(), avoid IF */
-#define FIX_1105_OPT_MINIMUM_SL                 /* FhG: Optimize minimum_s(), minimum_l(), avoid IF */
-#define FIX_1104_OPT_GETMINSCALEFAC             /* FhG: Optimize get_min_scalefactor(), avoid IF */
-#define FIX_1106_SIMPLIFY_SET32FX               /* FhG: simplify set32_fx() */
-#define FIX_1107_VADDINC                        /* FhG: Optimize v_add_inc_fx() for most frequent case */
-#define FIX_1009_OPT_PARAMMC_RENDER             /* FhG: Optimize ivas_param_mc_dec_render_fx() */
-#define FIX_1109_OPTIM_MCT_STEREO_IGF_DEC       /* FhG: optimize mctStereoIGF_dec_fx() */
-#define FIX_1110_OPTIM_DIRAC_DECORR_PROC        /* FhG: optimize ivas_dirac_dec_decorr_process() */
-#define FIX_1127_IMPROVE_SBA_MLD                /* Ittiam: Avoid saturation for DiRAC reference power */
-#define FIX_1100_REMOVE_LPC_RESCALING           /* VA: Remove the rescaling of LPC coefficient to Q12 as residu and syn-filt are already taking care of it*/
-#define FIX_1133_IMPROVE_MC_MLD                 /* Ittiam: Correcting wrong updation of exponents in ivas_mc_paramupmix_param_est_enc_fx() */
-#define FIX_ISSUE_1122                          /* Ittiam: Fix issue 1122: corrected incorrect scaling of a buffer leading to incorrect metadata bits */
-#define FIX_1132_STACK_CORRUPTION               /* Stack corruption issue due of extending index access*/
-#define FIX_ISSUE_1092                          /* Ittiam: Fix for Issue 1092: BASOP asserts in stereo fx encoder for selection test inputs*/
-#define FIX_ISSUE_1148
-#define FIX_ISSUE_1147                          /*Ittiam: Fix for issue 1147: Added saturation in DetectTnsFilt_fx.*/
-#define FIX_ISSUE_1150                          /* Ittiam: Fix for Issue 1150: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from tcx_ltp_find_gain function*/
-#define FIX_ISSUE_1151                          /* Ittiam: Fix for Issue 1151: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from sp_mus_classif_gmm_fx function*/
-#define FIX_ISSUE_1153                          /* Ittiam: Fix for Issue 1153: Assertion error observed in stereo_dmx_evs_enc_fx from calc_poc_fx function*/
-#define FIX_ISSUE_1154                          /* Ittiam: Fix for Issue 1154: Encoder crash for ParamMC 7.1 at 96kbps in ivas_param_mc_param_est_enc_fx() */
-#define FIX_ISSUE_1157                          /* Ittiam: Fix for Issue 1157: Encoder crash for Stereo at 48/64kbps DTX on/off in kernel_switch_trafo_fx() */
-#define FIX_ISSUE_1152                          /* Ittiam: Fix for issue 1152: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from find_tilt_fx function*/
-#define FIX_ISSUE_1156                          /* Ittiam: Fix for Issue 1156: Encoder crash for Stereo at 32kbps in SWB_BWE_encoding_ivas_fx() */
-
-//#define FIX_867
-//#define FIX_867_DBG
-
+#define FIX_867_CLDFB_NRG_SCALE
+
+#define FIX_1378_ACELP_OUT_OF_BOUNDS
+
+#define FIX_1379_MASA_ANGLE_ROUND
+
+/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
+#define OPT_STEREO_32KBPS_V1                    /* Optimization made in stereo decoding path for 32kbps decoding */
+#define OPT_AVOID_STATE_BUF_RESCALE             /* Optimization made to avoid rescale of synth state buffer */
+#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx                 /*FhG: WMOPS tuning, nonbe*/
+#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot   /*FhG: WMOPS tuning, nonbe*/
+/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST*) are independent from each other, they refer to different code blocks */
+#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE    /* FhG: reduces WMOPS of param_mc_prm_est, bit-exact to previous version */
+//#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE /* FhG: reduces WMOPS of param_mc_prm_est, not bit-exact to previous version. Obsoleted by MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */
+#define HARM_PUSH_BIT
+#define HARM_ENC_INIT
+//#define HARM_SCE_INIT
+#define DIV32_OPT_NEWTON                               /* FhG: faster 32 by 32 bit division */ 
+#define	MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */
+#define MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of dmx calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Requires MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */
+#define	MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE /* FhG: reduce WMOPS by inlining the matrix multiplications for the smoothing operation. */
+#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/
+#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/
+#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/
+#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch*/
+#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2       /*FhG: reduces WMOPS*/
+#define FIX_1481_HARDCODE_DIV                          /* FhG: hardcode division results in stereo_dmx_evs_init_encoder_fx() */
+#define VEC_ARITH_OPT_v1
+#define FIX_1486_IND_SHB_RES                   /* VA: Fix for issue 1486: align the usage of IND_SHB_RES_GS indices with float code */
+
+#define TEST_HR
 #endif
diff --git a/lib_com/parameter_bitmaping_fx.c b/lib_com/parameter_bitmaping_fx.c
index 180275d8fa5a74888eac160af018d1e3936fa3a1..92387209012c8cd2dfd7a6bacdb30ab3903715ad 100644
--- a/lib_com/parameter_bitmaping_fx.c
+++ b/lib_com/parameter_bitmaping_fx.c
@@ -21,7 +21,7 @@ static Word16 PutIntoBitstream_fx(
     value = *( *pStream )++;
     codedValue = EncodeValue( value, index );
 
-    push_next_indice_fx( hBstr, codedValue, nBits );
+    push_next_indice( hBstr, codedValue, nBits );
 
     return value;
 }
@@ -58,15 +58,15 @@ static Word16 FixedWidthEncoding( Word16 value, Word16 index )
 
 void GetParameters(
     ParamsBitMap const *paramsBitMap,
-    const int16_t nArrayLength,
+    const Word16 nArrayLength,
     void const *pParameter,
-    int16_t **pStream,
-    int16_t *pnSize,
-    int16_t *pnBits )
+    Word16 **pStream,
+    Word16 *pnSize,
+    Word16 *pnBits )
 {
-    int16_t index;
-    int16_t iParam, nParams;
-    int16_t value;
+    Word16 index;
+    Word16 iParam, nParams;
+    Word16 value;
     void const *pSubStruct;
 
     assert( ( paramsBitMap != NULL ) && ( nArrayLength > 0 ) && ( pParameter != NULL ) && ( pStream != NULL ) && ( pnSize != NULL ) && ( pnBits != NULL ) );
@@ -168,14 +168,14 @@ void GetParameters_fx(
 
 void SetParameters(
     ParamsBitMap const *paramsBitMap,
-    const int16_t nArrayLength,
+    const Word16 nArrayLength,
     void *pParameter,
-    const int16_t **pStream,
-    int16_t *pnSize )
+    const Word16 **pStream,
+    Word16 *pnSize )
 {
-    int16_t index;
-    int16_t iParam, nParams;
-    int16_t value;
+    Word16 index;
+    Word16 iParam, nParams;
+    Word16 value;
     void *pSubStruct;
 
     assert( ( paramsBitMap != NULL ) && ( nArrayLength > 0 ) && ( pParameter != NULL ) && ( pStream != NULL ) && ( pnSize != NULL ) );
diff --git a/lib_com/phase_dispersion_fx.c b/lib_com/phase_dispersion_fx.c
index 16feab1917e55311b85814a1317c1a21639b6c5c..3103723becabab50ac704ec5634594e73531e5b3 100644
--- a/lib_com/phase_dispersion_fx.c
+++ b/lib_com/phase_dispersion_fx.c
@@ -57,11 +57,7 @@ void phase_dispersion(
     move16();
     prev_gain_pit[0] = gain_pit;
 
-#ifdef BASOP_NOGLOB
     IF( GT_32( gain_code, L_add_o( *prev_gain_code, L_shl_o( *prev_gain_code, 1, &Overflow ), &Overflow ) ) )
-#else
-    IF( GT_32( gain_code, L_add( *prev_gain_code, L_shl( *prev_gain_code, 1 ) ) ) )
-#endif
     {
         IF( LT_16( state, 2 ) )
         {
@@ -118,17 +114,12 @@ void phase_dispersion(
         scale2 = getScaleFactor32( x32, L_subfr );
         FOR( i = 0; i < L_subfr / 2 - 1; i++ )
         {
-#ifdef BASOP_NOGLOB
-            code[i] = round_fx_sat( L_shl_sat( x32[2 * i + 0], scale2 ) );
+            code[i] = round_fx_sat( L_shl_sat( x32[2 * i], scale2 ) );
             code[L_subfr - 1 - i] = round_fx_sat( L_shl_sat( x32[2 * i + 3], scale2 ) );
-#else
-            code[i] = round_fx( L_shl( x32[2 * i + 0], scale2 ) );
-            code[L_subfr - 1 - i] = round_fx( L_shl( x32[2 * i + 3], scale2 ) );
-#endif
         }
 
-        code[L_subfr / 2 - 1] = round_fx( L_shl( x32[L_subfr - 2], scale2 ) );
-        code[L_subfr / 2] = round_fx( L_shl( x32[1], scale2 ) );
+        code[L_subfr / 2 - 1] = round_fx_sat( L_shl_sat( x32[L_subfr - 2], scale2 ) );
+        code[L_subfr / 2] = round_fx_sat( L_shl_sat( x32[1], scale2 ) );
 
         j = sub( j, scale2 );
 
@@ -174,12 +165,8 @@ void phase_dispersion(
         scale2 = getScaleFactor32( x32, L_subfr );
         FOR( i = 0; i < L_subfr; i++ )
         {
-#ifdef BASOP_NOGLOB
             code[i] = round_fx_o( L_shl_o( x32[i], scale2, &Overflow ), &Overflow );
             move16();
-#else
-            code[i] = round_fx( L_shl( x32[i], scale2 ) );
-#endif
         }
         j = sub( j, scale2 );
     }
diff --git a/lib_com/ppp_fx.c b/lib_com/ppp_fx.c
index 92831ce2b7ed3a15c23d47e3a36e2915c3fedc6b..cc6b59bdba01a0428f477f792a6a8809e5594d80 100644
--- a/lib_com/ppp_fx.c
+++ b/lib_com/ppp_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -115,11 +115,7 @@ void deemph_lpc_fx(
     {
         /* LPC_de_curr[k] = a[0]*b[k] + a[1]*b[k+1]; */
         temp = mult( a_fx[0], b_fx[k] ); /* Q12 */
-#ifdef BASOP_NOGLOB
         LPC_de_curr_fx[k] = add_o( temp, b_fx[k + 1], &Overflow );
-#else
-        LPC_de_curr_fx[k] = add( temp, b_fx[k + 1] );
-#endif
         move16(); /* Q12 */
     }
 
@@ -141,11 +137,7 @@ void deemph_lpc_fx(
         {
             /* LPC_de_old[k] = a[0]*b[k] + a[1]*b[k+1]; */
             temp = mult( a_fx[0], b_fx[k] ); /* Q12 */
-#ifdef BASOP_NOGLOB
             LPC_de_old_fx[k] = add_o( temp, b_fx[k + 1], &Overflow );
-#else
-            LPC_de_old_fx[k] = add( temp, b_fx[k + 1] );
-#endif
             move16(); /* Q12 */
         }
     }
diff --git a/lib_com/pred_lt4_fx.c b/lib_com/pred_lt4_fx.c
index 935e6b33f9348b7cbad105a629eb3c97f22b3481..4f8dd871289b8fc78c85678a24cb737da7378c84 100644
--- a/lib_com/pred_lt4_fx.c
+++ b/lib_com/pred_lt4_fx.c
@@ -71,19 +71,11 @@ void pred_lt4(
             s = W_sat_l( s64 ); /* Q_exc + Q14 */
         }
 #if ( INTERP_EXP != -1 )
-#ifdef BASOP_NOGLOB
         s = L_shl_o( s, INTERP_EXP + 1, &Overflow ); /* Q_exc + Q15 */
-#else                                                /* BASOP_NOGLOB */
-        s = L_shl( s, INTERP_EXP + 1 );
-#endif                                               /* BASOP_NOGLOB */
 #endif
 
-#ifdef BASOP_NOGLOB
         excO[j] = round_fx_o( s, &Overflow ); /* Q_exc */
         move16();
-#else /* BASOP_NOGLOB */
-        excO[j] = round_fx( s );
-#endif
     }
     return;
 }
@@ -163,25 +155,15 @@ void pred_lt4_tc_fx(
                 k += UP_SAMP;
                 L_sum = L_mac( L_sum, x0[i], win[k] ); /* Q15 */
             }
-#ifdef BASOP_NOGLOB
             L_sum = L_shl_o( L_sum, 1, &Overflow );   /* Q16 */
             excO[j] = round_fx_o( L_sum, &Overflow ); /* Q0 */
             move16();
-#else
-            L_sum = L_shl( L_sum, 1 ); /*Q0h */
-
-            excO[j] = round_fx( L_sum );
-#endif
 
             x0++;
         }
         FOR( i = T0; i < L_SUBFR; i++ )
         {
-#ifdef BASOP_NOGLOB
             exc[i + i_subfr] = add_o( exc[i + i_subfr], mult_r( PIT_SHARP_fx, excO[i] ), &Overflow ); /* Q0 */
-#else
-            exc[i + i_subfr] = add( exc[i + i_subfr], mult_r( PIT_SHARP_fx, excO[i] ) );
-#endif
             move16();
         }
     }
diff --git a/lib_com/preemph.c b/lib_com/preemph.c
index 66a12c621786682d4a0ca6dba5f031d6d1c0616f..9ebc0f72a81c39542312ff9e6bbd3d76b5a49197 100644
--- a/lib_com/preemph.c
+++ b/lib_com/preemph.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,7 +36,7 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
 /*-------------------------------------------------------------*
diff --git a/lib_com/preemph_fx.c b/lib_com/preemph_fx.c
index 0864323b41f02ad4a6449df110d23fb1b8b3eeb1..0790f6c3f2c8fdda954347962a335a029e7057f1 100644
--- a/lib_com/preemph_fx.c
+++ b/lib_com/preemph_fx.c
@@ -26,18 +26,10 @@ void preemph_copy_fx(
     move16();
     FOR( i = lg - 1; i > 0; i-- )
     {
-#ifdef BASOP_NOGLOB
         y[i] = msu_ro( L_deposit_h( x[i] ), x[i - 1], mu, &Overflow ); /* Qx */
-#else
-        y[i] = msu_r( L_deposit_h( x[i] ), x[i - 1], mu );
-#endif
         move16();
     }
-#ifdef BASOP_NOGLOB
     y[0] = msu_ro( L_deposit_h( x[0] ), *mem, mu, &Overflow ); /* Qx */
-#else
-    y[0] = msu_r( L_deposit_h( x[0] ), *mem, mu );
-#endif
     move16();
 
     *mem = temp; /* Qx */
@@ -61,18 +53,10 @@ void preemph_copy_32fx(
     move16();
     FOR( i = lg - 1; i > 0; i-- )
     {
-#ifdef BASOP_NOGLOB
         y[i] = L_msu_o( L_deposit_h( x[i] ), x[i - 1], mu, &Overflow ); /* Qx+16 */
-#else
-        y[i] = L_msu( L_deposit_h( x[i] ), x[i - 1], mu );
-#endif
         move16();
     }
-#ifdef BASOP_NOGLOB
     y[0] = L_msu_o( L_deposit_h( x[0] ), *mem, mu, &Overflow ); /* Qx+16 */
-#else
-    y[0] = L_msu( L_deposit_h( x[0] ), *mem, mu );
-#endif
     move16();
 
     *mem = temp; /* Qx */
@@ -114,30 +98,18 @@ void E_UTIL_f_preemph2(
 
     FOR( i = lg - 1; i > 0; i-- )
     {
-        L_tmp = L_mult( signal[i], 16384 ); /* Qx + 15 */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( signal[i], 16384 );                      /* Qx + 15 */
         L_tmp = L_msu0_o( L_tmp, signal[i - 1], mu, &Overflow ); /* Qx + 15 */
         L_tmp = L_shl_o( L_tmp, add( shift, 1 ), &Overflow );    /* Qx + shift + 16 */
         signal[i] = round_fx_o( L_tmp, &Overflow );              /* Qx + shift */
         move16();
-#else
-        L_tmp = L_msu0( L_tmp, signal[i - 1], mu );
-        L_tmp = L_shl( L_tmp, add( shift, 1 ) );
-        signal[i] = round_fx( L_tmp );
-#endif
     }
 
-    L_tmp = L_mult( signal[0], 16384 ); /* Qx + 15 */
-#ifdef BASOP_NOGLOB
+    L_tmp = L_mult( signal[0], 16384 );                   /* Qx + 15 */
     L_tmp = L_msu0_o( L_tmp, *mem, mu, &Overflow );       /* Qx + 15 */
     L_tmp = L_shl_o( L_tmp, add( shift, 1 ), &Overflow ); /* Qx + shift + 16 */
     signal[0] = round_fx_o( L_tmp, &Overflow );           /* Qx + shift */
     move16();
-#else
-    L_tmp = L_msu0( L_tmp, *mem, mu );
-    L_tmp = L_shl( L_tmp, add( shift, 1 ) );
-    signal[0] = round_fx( L_tmp );
-#endif
 
     *mem = temp; /* Qx */
     move16();
diff --git a/lib_com/prot.h b/lib_com/prot.h
deleted file mode 100644
index 9985ca978d25841413a23beec53528ddca5ac455..0000000000000000000000000000000000000000
--- a/lib_com/prot.h
+++ /dev/null
@@ -1,8368 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#ifndef PROT_H
-#define PROT_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "options.h"
-#include "typedef.h"
-#include "stat_enc.h"
-#include "stat_dec.h"
-#include "stat_com.h"
-#include "ivas_stat_com.h"
-#include "ivas_stat_enc.h"
-#include "ivas_stat_dec.h"
-#include "cnst.h"
-#include "stl.h"
-#include "ivas_error_utils.h"
-
-
-/*----------------------------------------------------------------------------------*
- * Prototypes of global macros
- *----------------------------------------------------------------------------------*/
-
-#ifndef min
-#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
-#endif
-
-#ifndef max
-#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
-#endif
-
-#ifndef TRUNC
-#define TRUNC( x ) ( (int16_t) ( ( ( x ) >= 32767. ? 32767 : ( ( x ) <= -32768. ? -32768 : ( x ) ) ) + 0.5 ) )
-#endif
-
-#define log_base_2( x ) ( (double) log( (double) ( x ) ) * 1.4426950408889634074f )
-#define round_f( x )    ( ( ( x ) > 0 ) ? (int32_t) ( ( x ) + 0.5f ) : ( -(int32_t) ( ( -x ) + 0.5f ) ) )
-
-#ifndef ABSVAL
-#define ABSVAL( a ) ( ( a ) >= 0 ? ( a ) : ( -( a ) ) )
-#endif
-
-#ifndef SQR
-#define SQR( a ) ( ( a ) * ( a ) )
-#endif
-
-#ifndef SWAP
-#define SWAP( a, b )   \
-    {                  \
-        tempr = ( a ); \
-        ( a ) = ( b ); \
-        ( b ) = tempr; \
-    }
-#endif
-
-#ifndef swap
-#define swap( x, y, type ) \
-    {                      \
-        type u__p;         \
-        u__p = x;          \
-        x = y;             \
-        y = u__p;          \
-    }
-#endif
-
-#define set_max( a, b )   \
-    {                     \
-        if ( ( b ) > *a ) \
-        {                 \
-            *a = ( b );   \
-        }                 \
-    } /* If the first argument is already the highes or lowest, nothing is done. */
-#define set_min( a, b )   \
-    {                     \
-        if ( ( b ) < *a ) \
-        {                 \
-            *a = ( b );   \
-        }                 \
-    } /* Otherwise, the 2nd arg is stored at the address of the first arg. */
-
-
-/*----------------------------------------------------------------------------------*
- * MODE1 prototypes
- *----------------------------------------------------------------------------------*/
-
-/*! r: inverse square root of input value */
-float inv_sqrt(
-    const float x /* i  : input value                                     */
-);
-
-/*! r: output random value */
-int16_t own_random(
-    int16_t *seed /* i/o: random seed                                     */
-);
-
-/*! r: sign of x (+1/-1) */
-float sign(
-    const float x /* i  : input value of x                                */
-);
-
-/*! r: logarithm2 of x */
-float log2_f(
-    const float x /* i  : input value of x                                */
-);
-
-int16_t norm_ul_float(
-    uint32_t UL_var1 );
-
-/*! r: sum of all vector elements */
-int16_t sum_s(
-    const int16_t *vec, /* i  : input vector                                    */
-    const int16_t lvec  /* i  : length of input vector                          */
-);
-
-/*! r: sum of all vector elements */
-int32_t sum_l(
-    const int32_t *vec, /* i  : input vector                                    */
-    const int16_t lvec  /* i  : length of input vector                          */
-);
-
-/*! r: sum of all vector elements */
-float sum_f(
-    const float *vec,  /* i  : input vector                                    */
-    const int16_t lvec /* i  : length of input vector                          */
-);
-
-/*! r: sum of all squared vector elements */
-float sum2_f(
-    const float *vec,  /* i  : input vector                                    */
-    const int16_t lvec /* i  : length of input vector                          */
-);
-
-void set_c(
-    int8_t y[],     /* i/o: Vector to set                                   */
-    const int8_t a, /* i  : Value to set the vector to                      */
-    const int32_t N /* i  : Length of the vector                */
-);
-
-void set_s(
-    int16_t y[],     /* i/o: Vector to set                                   */
-    const int16_t a, /* i  : Value to set the vector to                      */
-    const int16_t N  /* i  : Lenght of the vector                            */
-);
-
-void set_l(
-    int32_t y[],     /* i/o: Vector to set                                   */
-    const int32_t a, /* i  : Value to set the vector to                      */
-    const int16_t N  /* i  : Length of the vector                            */
-);
-
-void set_f(
-    float y[],      /* i/o: Vector to set                                   */
-    const float a,  /* i  : Value to set the vector to                      */
-    const int16_t N /* i  : Lenght of the vector                            */
-);
-
-void set_zero_fx(
-    Word32 *vec,      /* o  : input vector                                    */
-    const Word16 lvec /* i  : length of the vector                            */
-);
-void set_zero2_fx(
-    Word32 *vec,      /* o  : input vector                                    */
-    const Word32 lvec /* i  : length of the vector                            */
-);
-void set16_zero_fx(
-    Word16 *vec,      /* o  : input vector                                    */
-    const Word16 lvec /* i  : length of the vector                            */
-);
-
-void set_zero(
-    float *vec,        /* o  : input vector                                    */
-    const int16_t lvec /* i  : length of the vector                            */
-);
-
-void mvr2r(
-    const float x[], /* i  : input vector                                    */
-    float y[],       /* o  : output vector                                   */
-    const int16_t n  /* i  : vector size                                     */
-);
-
-void mvs2s(
-    const int16_t x[], /* i  : input vector                                    */
-    int16_t y[],       /* o  : output vector                                   */
-    const int16_t n    /* i  : vector size                                     */
-);
-
-uint32_t mvr2s(
-    const float x[], /* i  : input vector                                    */
-    int16_t y[],     /* o  : output vector                                   */
-    const int16_t n  /* i  : vector size                                     */
-);
-
-void mvs2r(
-    const int16_t x[], /* i  : input vector                                    */
-    float y[],         /* o  : output vector                                   */
-    const int16_t n    /* i  : vector size                                     */
-);
-
-void mvl2l(
-    const int32_t x[], /* i  : input vector                                    */
-    int32_t y[],       /* o  : output vector                                   */
-    const int16_t n    /* i  : vector size                                     */
-);
-
-
-/*! r: index of the maximum value in the input vector */
-int16_t maximum(
-    const float *vec,   /* i  : input vector                                    */
-    const int16_t lvec, /* i  : length of input vector                          */
-    float *max_val      /* o  : maximum value in the input vector               */
-);
-/*! r: index of the maximum value in the input vector */
-int16_t maximumAbs(
-    const float *vec,   /* i  : input vector                                    */
-    const int16_t lvec, /* i  : length of input vector                          */
-    float *max_val      /* o  : maximum value in the input vector               */
-);
-
-Word16 maximumAbs_l(
-    const Word32 *vec, /* i  : input vector                                   */
-    const Word16 lvec, /* i  : length of input vector                         */
-    Word32 *max_val    /* o  : maximum value in the input vector              */
-);
-
-/*! r: index of the minimum value in the input vector */
-int16_t minimum(
-    const float *vec,   /* i  : input vector                                    */
-    const int16_t lvec, /* i  : length of input vector                          */
-    float *min_val      /* o  : minimum value in the input vector               */
-);
-
-/*! r: index of the minimum value in the input vector */
-int16_t minimum_s(
-    const int16_t *vec, /* i  : Input vector                                    */
-    const int16_t lvec, /* i  : Vector length                                   */
-    int16_t *min_val    /* o  : minimum value in the input vector               */
-);
-
-/*! r: return index with max energy value in vector */
-int16_t emaximum(
-    const float *vec,   /* i  : input vector                                    */
-    const int16_t lvec, /* i  : length of input vector                          */
-    float *ener_max     /* o  : maximum energy value                            */
-);
-
-/*! r: vector mean */
-float mean(
-    const float *vec,  /* i  : input vector                                    */
-    const int16_t lvec /* i  : length of input vector                          */
-);
-
-/*! r: dot product of x[] and y[] */
-float dotp(
-    const float x[], /* i  : vector x[]                                      */
-    const float y[], /* i  : vector y[]                                      */
-    const int16_t n  /* i  : vector length                                   */
-);
-
-void conv(
-    const float x[], /* i  : input vector                                    */
-    const float h[], /* i  : impulse response (or second input vector)       */
-    float y[],       /* o  : output vetor (result of convolution)            */
-    const int16_t L  /* i  : vector size                                     */
-);
-
-void fir(
-    const float x[],  /* i  : input vector                                    */
-    const float h[],  /* i  : impulse response of the FIR filter              */
-    float y[],        /* o  : output vector (result of filtering)             */
-    float mem[],      /* i/o: memory of the input signal (M samples)          */
-    const int16_t L,  /* i  : input vector size                               */
-    const int16_t K,  /* i  : order of the FIR filter (M+1 coefs.)            */
-    const int16_t upd /* i  : 1 = update the memory, 0 = not                  */
-);
-
-void v_add(
-    const float x1[], /* i  : Input vector 1                                  */
-    const float x2[], /* i  : Input vector 2                                  */
-    float y[],        /* o  : Output vector that contains vector 1 + vector 2 */
-    const int16_t N   /* i  : Vector length                                   */
-);
-
-void v_sub(
-    const float x1[], /* i  : Input vector 1                                  */
-    const float x2[], /* i  : Input vector 2                                  */
-    float y[],        /* o  : Output vector that contains vector 1 - vector 2 */
-    const int16_t N   /* i  : Vector length                                   */
-);
-
-void v_mult(
-    const float x1[], /* i  : Input vector 1                                  */
-    const float x2[], /* i  : Input vector 2                                  */
-    float y[],        /* o  : Output vector that contains vector 1 .* vector 2*/
-    const int16_t N   /* i  : Vector length                                   */
-);
-
-void v_multc(
-    const float x[], /* i  : Input vector                                     */
-    const float c,   /* i  : Constant                                         */
-    float y[],       /* o  : Output vector that contains c*x                  */
-    const int16_t N  /* i  : Vector length                                    */
-);
-
-/*! r: index of the winning codeword */
-int16_t squant(
-    const float x,       /* i  : scalar value to quantize                       */
-    float *xq,           /* o  : quantized value                                */
-    const float cb[],    /* i  : codebook                                       */
-    const int16_t cbsize /* i  : codebook size                                  */
-);
-
-int16_t squant_int(
-    uint8_t x,           /* i  : scalar value to quantize                       */
-    uint8_t *xq,         /* o  : quantized value                                */
-    const uint8_t *cb,   /* i  : codebook                                       */
-    const int16_t cbsize /* i  : codebook size                                  */
-);
-
-/*! r: index of the winning codevector */
-int16_t vquant(
-    float x[],            /* i  : vector to quantize                              */
-    const float x_mean[], /* i  : vector mean to subtract (0 if none)             */
-    float xq[],           /* o  : quantized vector                                */
-    const float cb[],     /* i  : codebook                                        */
-    const int16_t dim,    /* i  : dimension of codebook vectors                   */
-    const int16_t cbsize  /* i  : codebook size                                   */
-);
-
-/*! r: index of the winning codevector */
-int16_t w_vquant(
-    float x[],               /* i  : vector to quantize                              */
-    const float x_mean[],    /* i  : vector mean to subtract (0 if none)             */
-    const int16_t weights[], /* i  : error weights                                   */
-    float xq[],              /* o  : quantized vector                                */
-    const float cb[],        /* i  : codebook                                        */
-    const int16_t dim,       /* i  : dimension of codebook vectors                   */
-    const int16_t cbsize,    /* i  : codebook size                                   */
-    const int16_t reverse    /* i  : reverse codebook vectors                        */
-);
-
-/*! r: index of the winning codeword */
-int16_t usquant(
-    const float x,       /* i  : scalar value to quantize                        */
-    float *xq,           /* o  : quantized value                                 */
-    const float qlow,    /* i  : lowest codebook entry (index 0)                 */
-    const float delta,   /* i  : quantization step                               */
-    const int16_t cbsize /* i  : codebook size                                   */
-);
-
-/*! r: dequanzited gain */
-float usdequant(
-    const int16_t idx, /* i  : quantizer index                                 */
-    const float qlow,  /* i  : lowest codebook entry (index 0)                 */
-    const float delta  /* i  : quantization step                               */
-);
-
-void v_sort_float(
-    float *r,         /* i/o: Vector to be sorted in place                    */
-    const int16_t lo, /* i  : Low limit of sorting range                      */
-    const int16_t up  /* i  : High limit of sorting range                     */
-);
-
-void sort(
-    uint16_t *x, /* i/o: Vector to be sorted                             */
-    uint16_t len /* i/o: vector length                                   */
-);
-
-void sort_l(
-    Word32 *x, /* i/o: Vector to be sorted                             */
-    Word16 len /* i/o: vector length                                   */
-);
-
-/*! r: variance of vector */
-float var(
-    const float *x,   /* i  : input vector                                    */
-    const int16_t len /* i  : length of inputvector                           */
-);
-
-/*! r: standard deviation */
-float std_dev(
-    const float *x,   /* i  : input vector                                    */
-    const int16_t len /* i  : length of the input vector                      */
-);
-
-/*! r: the dot product x'*A*x */
-float dot_product_mat(
-    const float *x, /* i  : vector x                                        */
-    const float *A, /* i  : matrix A                                        */
-    const int16_t m /* i  : vector length                                   */
-);
-
-float root_a(
-    float a );
-
-float root_a_over_b(
-    float a,
-    float b );
-
-void polezero_filter(
-    const float *in,     /* i  : input vector                              */
-    float *out,          /* o  : output vector                             */
-    const int16_t N,     /* i  : input vector size                         */
-    const float *b,      /* i  : numerator coefficients                    */
-    const float *a,      /* i  : denominator coefficients                  */
-    const int16_t order, /* i  : filter order                              */
-    float *mem           /* i/o: filter memory                             */
-);
-
-double rint_new(
-    double x /* i/o: Round to the nearest integer with mid point exception */
-);
-
-double anint(
-    double x /* i/o: Round to the nearest integer               */
-);
-
-/*! r: Output either 1 if Numeric, 0 if NaN or Inf */
-int16_t is_numeric_float(
-    float x /* i  : Input value which is checked if numeric or not */
-);
-
-void delay_signal_float(
-    float x[],          /* i/o: signal to be delayed                    */
-    const int16_t len,  /* i  : length of the input signal              */
-    float mem[],        /* i/o: synchronization memory                  */
-    const int16_t delay /* i  : delay in samples                        */
-);
-
-ivas_error push_indice(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */
-    int16_t id,            /* i  : ID of the indice                            */
-    uint16_t value,        /* i  : value of the quantized indice               */
-    int16_t nb_bits        /* i  : number of bits used to quantize the indice  */
-);
-
-ivas_error push_next_indice(
-    BSTR_ENC_HANDLE hBstr,
-    UWord16 value, /* i  : value of the quantized indice          */
-    Word16 nb_bits /* i  : number of bits used to quantize the indice */
-);
-
-ivas_error push_next_bits(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle               */
-    const UWord16 bits[],  /* i  : bit buffer to pack, sequence of single bits */
-    const Word16 nb_bits   /* i  : number of bits to pack                 */
-);
-
-/*! r: maximum number of indices */
-Word16 get_ivas_max_num_indices_fx(
-    const IVAS_FORMAT ivas_format, /* i  : IVAS format               */
-    const Word32 ivas_total_brate  /* i  : IVAS total bitrate           */
-);
-
-/*! r: maximum number of indices */
-int16_t get_BWE_max_num_indices(
-    const int32_t extl_brate /* i  : extensiona layer bitrate  */
-);
-
-/*! r: maximum number of indices */
-Word16 get_ivas_max_num_indices_metadata_fx(
-    const IVAS_FORMAT ivas_format, /* i  : IVAS format              */
-    const Word32 ivas_total_brate  /* i  : IVAS total bitrate       */
-);
-ivas_error ind_list_realloc(
-    INDICE_HANDLE old_ind_list,    /* i  : pointer to the beginning of the old buffer of indices */
-    const int16_t max_num_indices, /* i  : new maximum number of allowed indices in the list */
-    Encoder_Struct *st_ivas        /* i  : IVAS encoder structure                  */
-);
-
-ivas_error check_ind_list_limits(
-    BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle                    */
-);
-
-void move_indices(
-    INDICE_HANDLE old_ind_list, /* i/o: old location of indices */
-    INDICE_HANDLE new_ind_list, /* i/o: new location of indices */
-    const int16_t nb_indices    /* i  : number of moved indices */
-);
-
-/*! r: index of the indice in the list, -1 if not found */
-int16_t find_indice(
-    BSTR_ENC_HANDLE hBstr, /* i  : encoder bitstream handle                    */
-    const int16_t id,      /* i  : ID of the indice                            */
-    uint16_t *value,       /* o  : value of the quantized indice               */
-    int16_t *nb_bits       /* o  : number of bits used to quantize the indice  */
-);
-
-/*! r: number of deleted indices                   */
-uint16_t delete_indice(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */
-    const int16_t id       /* i  : ID of the indice                            */
-);
-
-/*! r: value of the indice */
-uint16_t get_next_indice(
-    Decoder_State *st, /* i/o: decoder state structure                */
-    int16_t nb_bits    /* i  : number of bits that were used to quantize the indice */
-);
-
-/*! r: value of the indice */
-uint16_t get_next_indice_1(
-    Decoder_State *st /* i/o: decoder state structure                */
-);
-
-void get_next_indice_tmp(
-    Decoder_State *st, /* o  : decoder state structure                */
-    int16_t nb_bits    /* i  : number of bits that were used to quantize the indice */
-);
-
-/*! r: value of the indice */
-uint16_t get_indice(
-    Decoder_State *st, /* i/o: decoder state structure                */
-    int16_t pos,       /* i  : absolute position in the bitstream     */
-    int16_t nb_bits    /* i  : number of bits that were used to quantize the indice */
-);
-
-/*! r: value of the indice */
-uint16_t get_indice_1(
-    Decoder_State *st, /* i/o: decoder state structure                */
-    int16_t pos        /* i  : absolute position in the bitstream     */
-);
-
-void reset_indices_enc(
-    BSTR_ENC_HANDLE hBstr,        /* i/o: encoder bitstream handle               */
-    const int16_t max_num_indices /* i  : max number of indices                  */
-);
-
-void reset_indices_dec(
-    Decoder_State *st /* i/o: decoder state structure                */
-);
-
-ivas_error write_indices_ivas(
-    Encoder_Struct *st_ivas, /* i/o: encoder state structure                                       */
-    uint16_t *bit_stream,    /* i/o: output bitstream                                              */
-    uint16_t *num_bits       /* i/o: number of bits written to output                              */
-);
-
-Word16 rate2EVSmode_float(
-    const Word32 brate, /* i  : bitrate                                                    */
-    int16_t *is_amr_wb  /* o  : (flag) does the bitrate belong to AMR-WB? Can be NULL      */
-);
-
-
-/*! r: 1 = OK, 0 = something wrong */
-ivas_error read_indices(
-    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure                 */
-    uint16_t bit_stream[],   /* i  : bitstream buffer                       */
-    UWord16 num_bits,        /* i  : number of bits in bitstream            */
-    int16_t *prev_ft_speech,
-    int16_t *CNG,
-    int16_t bfi /* i  : bad frame indicator                    */
-);
-
-
-void ivas_set_bitstream_pointers(
-    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure    */
-);
-
-Decoder_State **reset_elements(
-    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */
-);
-
-
-void convertSerialToBytestream(
-    const uint16_t *const serial, /* i  : input serial bitstream with values 0 and 1  */
-    const uint16_t num_bits,      /* i  : number of bits in the input bitstream       */
-    uint8_t *const bytestream     /* o  : output compact bitstream (bytestream)       */
-);
-
-void convertBytestreamToSerial(
-    const uint8_t *const bytestream, /* i  : input compact bitstream (bytestream)        */
-    const uint16_t num_bits,         /* i  : number of bits in the input bitstream       */
-    uint16_t *const serial           /* o  : output serial bitstream with values 0 and 1 */
-);
-
-void mdct_switching_dec(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-void evs_dec_previewFrame_float(
-    uint8_t *bitstream,            /* i  : bitstream pointer                       */
-    int16_t bitstreamSize,         /* i  : bitstream size                          */
-    int16_t *partialCopyFrameType, /* o  : frame type of the partial copy          */
-    int16_t *partialCopyOffset     /* o  : offset of the partial copy relative to the primary copy */
-);
-
-
-void getPartialCopyInfo_float(
-    Decoder_State *st, /* i  : decoder state structure                 */
-    int16_t *sharpFlag );
-
-void get_NextCoderType(
-    uint8_t *bitstream,      /* i  : bitstream                               */
-    int16_t *next_coder_type /* o  : next coder type                         */
-);
-
-int16_t print_disclaimer(
-    FILE *fPtr );
-
-
-/*! r: delay value in ns */
-int32_t get_delay(
-    const int16_t enc_dec,          /* i  : encoder/decoder flag                  */
-    const int32_t io_fs,            /* i  : input/output sampling frequency       */
-    const IVAS_FORMAT ivas_format,  /* i  : IVAS format                           */
-    HANDLE_CLDFB_FILTER_BANK hCldfb /* i  : Handle of Cldfb analysis              */
-);
-
-void decision_matrix_enc(
-    Encoder_State *st,    /* i/o: encoder state structure                   */
-    int16_t *hq_core_type /* o  : HQ core type                              */
-);
-
-void signaling_enc(
-    Encoder_State *st /* i  : encoder state structure                   */
-);
-
-int16_t signaling_mode1_tcx20_enc(
-    Encoder_State *st, /* i/o: encoder state structure                   */
-    const int16_t push /* i  : flag to push indice                       */
-);
-
-void decision_matrix_dec(
-    Decoder_State *st,           /* i/o: decoder state structure                   */
-    int16_t *sharpFlag,          /* o  : formant sharpening flag                   */
-    int16_t *hq_core_type,       /* o  : HQ core type                              */
-    int16_t *core_switching_flag /* o  : ACELP->HQ switching frame flag            */
-);
-
-
-void amr_wb_dec_init(
-    AMRWB_IO_DEC_HANDLE hAmrwb_IO /* i/o: AMR-WB IO data handle                            */
-);
-
-void hf_synth_amr_wb_init(
-    AMRWB_IO_DEC_HANDLE hAmrwb_IO /* i/o: AMR-WB IO data handle                            */
-);
-
-void hf_synth_amr_wb_reset(
-    AMRWB_IO_DEC_HANDLE hAmrwb_IO, /* i/o: AMR-WB IO data handle                            */
-    ZERO_BWE_DEC_HANDLE hBWE_zero  /* o  : zero BWE decoder handle                          */
-);
-
-void hf_synth_amr_wb(
-    AMRWB_IO_DEC_HANDLE hAmrwb_IO, /* i/o: AMR-WB IO data handle                             */
-    ZERO_BWE_DEC_HANDLE hBWE_zero, /* o  : zero BWE decoder handle                           */
-    const int32_t core_brate,      /* i  : core bitrate                                      */
-    const int16_t output_frame,    /* i  : output frame length                               */
-    const float *Aq,               /* i  : quantized Az                                      */
-    const float *exc,              /* i  : excitation at 12.8 kHz                            */
-    float *synth,                  /* i/o: synthesis signal at 12.8 kHz                      */
-    int16_t *amr_io_class,         /* i  : signal class (determined by FEC algorithm)        */
-    float *synth_out,              /* i/o: synthesis signal at output Fs                     */
-    float fmerit,                  /* i  : classify parameter from FEC                       */
-    const int16_t *hf_gain,        /* i  : decoded HF gain                                   */
-    const float *voice_factors,    /* i  : voicing factors                                   */
-    const float pitch_buf[],       /* i  : pitch buffer                                      */
-    const float ng_ener_ST,        /* i  : Noise gate - short-term energy                    */
-    const float *lsf_new           /* i  : ISF vector                                        */
-);
-
-void hf_cod_init(
-    float *mem_hp400_enc,  /* o  : memory of hp 400 Hz filter   */
-    float *mem_hf1_enc,    /* o  : HF band-pass filter memory   */
-    float *mem_syn_hf_enc, /* o  : HF synthesis memory          */
-    float *mem_hf2_enc,    /* o  : HF band-pass filter memory   */
-    float *gain_alpha      /* o  : smoothing gain for transitions between active and inactive frames */
-);
-
-void hf_cod(
-    const int32_t core_brate, /* i  : core bitrate                 */
-    const float *speech16k,   /* i  : original speech at 16 kHz    */
-    const float Aq[],         /* i  : quantized Aq                 */
-    const float exc[],        /* i  : excitation at 12.8 kHz       */
-    float synth[],            /* i  : 12.8kHz synthesis signal     */
-    int16_t *seed2_enc,       /* i/o: random seed for HF noise gen */
-    float *mem_hp400_enc,     /* i/o: memory of hp 400 Hz filter   */
-    float *mem_syn_hf_enc,    /* i/o: HF synthesis memory          */
-    float *mem_hf1_enc,       /* i/o: HF band-pass filter memory   */
-    float *mem_hf2_enc,       /* i/o: HF band-pass filter memory   */
-    const int16_t *dtxHangoverCount,
-    float *gain_alpha, /* i/o: smoothing gain for transitions between active and inactive frames */
-    int16_t *hf_gain   /* o  :  HF gain to be transmitted to decoder */
-);
-
-void hf_synth_init(
-    ZERO_BWE_DEC_HANDLE hBWE_zero /* o  : zero BWE decoder handle     */
-);
-
-void hf_synth_reset(
-    ZERO_BWE_DEC_HANDLE hBWE_zero /* o  : zero BWE decoder handle     */
-);
-
-void hf_synth(
-    ZERO_BWE_DEC_HANDLE hBWE_zero, /* o  : zero BWE decoder handle     */
-    const int32_t core_brate,      /* i  : core bitrate                */
-    const int16_t output_frame,    /* i  : output frame length         */
-    const float *Aq,               /* i  : quantized Az                */
-    const float *exc,              /* i  : excitation at 12.8 kHz      */
-    float *synth,                  /* i/o: 12.8kHz synthesis signal    */
-    float *synth16k                /* i/o: 16kHz synthesis signal      */
-);
-
-void fft_rel(
-    float x[],       /* i/o: input/output vector    */
-    const int16_t n, /* i  : vector length          */
-    const int16_t m  /* i  : log2 of vector length  */
-);
-
-void ifft_rel(
-    float io[],      /* i/o: input/output vector   */
-    const int16_t n, /* i  : vector length         */
-    const int16_t m  /* i  : log2 of vector length */
-);
-
-void preemph(
-    float *signal,   /* i/o: signal             */
-    const float mu,  /* i  : preemphasis factor */
-    const int16_t L, /* i  : vector size        */
-    float *mem       /* i/o: memory (x[-1])     */
-);
-void preemph_ivas_fx(
-    Word32 *signal,  /* i/o: signal             Qx*/
-    const Word16 mu, /* i  : preemphasis factor Q15*/
-    const Word16 L,  /* i  : vector size        Q0*/
-    Word32 *mem      /* i/o: memory (x[-1])     Qx*/
-);
-void cb_shape(
-    const int16_t preemphFlag,     /* i  : flag for pre-emphasis                       */
-    const int16_t pitchFlag,       /* i  : flag for pitch sharpening                   */
-    const int16_t scramblingFlag,  /* i  : flag for phase scrambling                   */
-    const int16_t formantFlag,     /* i  : flag for formant sharpening                 */
-    const int16_t formantTiltFlag, /* i  : flag for formant tilt                       */
-    const float g1,                /* i  : formant sharpening numerator weighting      */
-    const float g2,                /* i  : formant sharpening denominator weighting    */
-    const float *p_Aq,             /* i  : LP filter coefficients                      */
-    float *code,                   /* i/o: signal to shape                             */
-    const float tilt_code,         /* i  : tilt of code                                */
-    const float pt_pitch,          /* i  : pointer to current subframe fractional pitch*/
-    const int16_t L_subfr          /* i  : subfframe length                            */
-);
-
-void CNG_exc(
-    const int32_t core_brate,      /* i  : core bitrate                            */
-    const int16_t L_frame,         /* i  : length of the frame                     */
-    float *Enew,                   /* i/o: decoded SID energy                      */
-    int16_t *seed,                 /* i/o: random generator seed                   */
-    float exc[],                   /* o  : current non-enhanced excitation         */
-    float exc2[],                  /* o  : current enhanced excitation             */
-    float *lp_ener,                /* i/o: LP filtered E                           */
-    const int32_t last_core_brate, /* i  : previous frame core bitrate             */
-    int16_t *first_CNG,            /* i/o: first CNG frame flag for energy init.   */
-    int16_t *cng_ener_seed,        /* i/o: random generator seed for CNG energy    */
-    float bwe_exc[],               /* o  : excitation for SWB TBE                  */
-    const int16_t allow_cn_step,   /* i  : allow CN step                           */
-    int16_t *last_allow_cn_step,   /* i/o: last CN_step                            */
-    const int16_t num_ho,          /* i  : number of selected hangover frames      */
-    float q_env[],
-    float *lp_env,
-    float *old_env,
-    float *exc_mem,
-    float *exc_mem1,
-    int16_t *sid_bw,
-    int16_t *cng_ener_seed1,
-    float exc3[],
-    const int16_t Opt_AMR_WB,  /* i  : AMR-WB interop flag                     */
-    const int16_t element_mode /* i  : IVAS Element mode                       */
-);
-
-
-void cng_params_postupd(
-    const int16_t ho_circ_ptr,    /* i  : pointer for CNG averaging buffers                   */
-    int16_t *cng_buf_cnt,         /* i/o: counter for CNG store buffers                       */
-    const float *cng_exc2_buf,    /* i  : Excitation buffer                                   */
-    const int32_t *cng_brate_buf, /* i  : bitrate buffer                                      */
-    float ho_env_circ[],          /* i/o: Envelope buffer                                     */
-    const int16_t element_mode,   /* i  : Element mode                                        */
-    const int16_t bwidth          /* i  : audio bandwidth                                     */
-);
-
-void calculate_hangover_attenuation_gain(
-    Encoder_State *st,           /* i  : encoder state structure                               */
-    float *att,                  /* o  : attenuation factor                                    */
-    const int16_t vad_hover_flag /* i  : VAD hangover flag                          */
-);
-
-int16_t get_cng_mode_ivas(
-    const int32_t last_active_brate /* i  : last active bitrate                                 */
-);
-
-void disf_ns_28b(
-    int16_t *indice, /* i  : quantized indices, use indice[0] = -1 in the decoder*/
-    float *isf_q     /* o  : ISF in the frequency domain (0..6400)               */
-);
-
-void limit_T0(
-    const int16_t L_frame,    /* i  : length of the frame                                  */
-    const int16_t delta,      /* i  : Half the close-loop searched interval                */
-    const int16_t pit_flag,   /* i  : selecting absolute(0) or delta(1) pitch quantization */
-    const int16_t limit_flag, /* i  : flag for limits (0=restrained, 1=extended)           */
-    const int16_t T0,         /* i  : rough pitch estimate around which the search is done */
-    const int16_t T0_frac,    /* i  : pitch estimate fractional part                       */
-    int16_t *T0_min,          /* o  : lower pitch limit                                    */
-    int16_t *T0_max           /* o  : higher pitch limit                                   */
-);
-
-/*! r: interpolated value */
-float interpolation(
-    const float *x,        /* i  : input vector                                */
-    const float *win,      /* i  : interpolation window                        */
-    const int16_t frac,    /* i  : fraction                                    */
-    const int16_t up_samp, /* i  : upsampling factor                           */
-    const int16_t nb_coef  /* i  : nb of filter coef                           */
-);
-
-void deemph(
-    float *signal,   /* i/o: signal                                      */
-    const float mu,  /* i  : deemphasis factor                           */
-    const int16_t L, /* i  : vector size                                 */
-    float *mem       /* i/o: memory (y[-1])                              */
-);
-
-void weight_a(
-    const float *a,    /* i  : LP filter coefficients                      */
-    float *ap,         /* o  : weighted LP filter coefficients             */
-    const float gamma, /* i  : weighting factor                            */
-    const int16_t m    /* i  : order of LP filter                          */
-);
-
-void weight_a_subfr(
-    const int16_t nb_subfr, /* i  : number of subframes                         */
-    const float *a,         /* i  : LP filter coefficients                      */
-    float *ap,              /* o  : weighted LP filter coefficients             */
-    const float gamma,      /* i  : weighting factor                            */
-    const int16_t m         /* i  : order of LP filter                          */
-);
-
-void syn_12k8(
-    const int16_t L_frame, /* i  : length of the frame                         */
-    const float *Aq,       /* i  : LP filter coefficients                      */
-    const float *exc,      /* i  : input signal                                */
-    float *synth,          /* o  : output signal                               */
-    float *mem,            /* i/o: initial filter states                       */
-    const int16_t update_m /* i  : update memory flag: 0 --> no memory update  */
-);                         /*                          1 --> update of memory  */
-
-void syn_filt(
-    const float a[],       /* i  : LP filter coefficients                      */
-    const int16_t m,       /* i  : order of LP filter                          */
-    const float x[],       /* i  : input signal                                */
-    float y[],             /* o  : output signal                               */
-    const int16_t l,       /* i  : size of filtering                           */
-    float mem[],           /* i/o: initial filter states                       */
-    const int16_t update_m /* i  : update memory flag: 0 --> no memory update  */
-);                         /*                          1 --> update of memory  */
-
-void synth_mem_updt2_flt(
-    const int16_t L_frame,      /* i  : frame length                                */
-    const int16_t last_L_frame, /* i  : frame length                                */
-    float old_exc[],            /* i/o: excitation buffer                           */
-    float mem_syn_r[],          /* i/o: synthesis filter memory                     */
-    float mem_syn2[],           /* o  : synthesis filter memory for find_target     */
-    float mem_syn[],            /* o  : synthesis filter memory for find_target     */
-    const int16_t dec           /* i  : flag for decoder indication                 */
-);
-
-void int_lsp(
-    const int16_t L_frame,   /* i  : length of the frame                         */
-    const float lsp_old[],   /* i  : LSPs from past frame                        */
-    const float lsp_new[],   /* i  : LSPs from present frame                     */
-    float *Aq,               /* o  : LP coefficients in both subframes           */
-    const int16_t m,         /* i  : order of LP filter                          */
-    const float *int_coeffs, /* i  : interpolation coefficients                  */
-    const int16_t Opt_AMR_WB /* i  : flag indicating AMR-WB IO mode              */
-);
-
-void int_lsp4(
-    const int16_t L_frame,        /* i  : length of the frame                         */
-    const float lsp_old[],        /* i  : previous end-frame LSPs                     */
-    const float lsp_mid[],        /* i  : current mid-frame LSPs                      */
-    const float lsp_new[],        /* i  : current end-frame LSPs                      */
-    float *Aq,                    /* o  : LP coefficients in both subframes           */
-    const int16_t m,              /* i  : order of LP filter                          */
-    int16_t relax_prev_lsf_interp /* i  : relax prev frame lsf interp after erasure   */
-);
-
-/*! r: length of output */
-int16_t modify_Fs(
-    const float sigIn[], /* i  : signal to decimate                          */
-    const int16_t lg,    /* i  : length of input                             */
-    const int32_t fin,   /* i  : frequency of input                          */
-    float sigOut[],      /* o  : decimated signal                            */
-    const int32_t fout,  /* i  : frequency of output                         */
-    float mem[],         /* i/o: filter memory                               */
-    const int16_t nblp   /* i  : flag indicating if NB low-pass is applied   */
-);
-
-void pred_lt4_flt(
-    const float excI[],     /* i  : input excitation buffer                     */
-    float excO[],           /* o  : output excitation buffer                    */
-    const int16_t T0,       /* i  : integer pitch lag                           */
-    int16_t frac,           /* i  : fraction of lag                             */
-    const int16_t L_subfr,  /* i  : subframe size                               */
-    const float *win,       /* i  : interpolation window                        */
-    const int16_t nb_coef,  /* i  : nb of filter coef                           */
-    const int16_t up_sample /* i  : up_sample                                   */
-);
-
-void pred_lt4_tc_flt(
-    float exc[],           /* i  : excitation buffer                           */
-    const int16_t T0,      /* i  : integer pitch lag                           */
-    int16_t frac,          /* i  : fraction of lag                             */
-    const float *win,      /* i  : interpolation window                        */
-    const int16_t imp_pos, /* i  : glottal impulse position                    */
-    const int16_t i_subfr  /* i  : subframe index                              */
-);
-
-void residu(
-    const float *a,  /* i  : LP filter coefficients                      */
-    const int16_t m, /* i  : order of LP filter                          */
-    const float *x,  /* i  : input signal (usually speech)               */
-    float *y,        /* o  : output signal (usually residual)            */
-    const int16_t l  /* i  : size of filtering                           */
-);
-
-void calc_residu(
-    const float *speech,  /* i  : weighted speech signal                      */
-    float *res,           /* o  : residual signal                             */
-    const float *p_Aq,    /* i  : quantized LP filter coefficients            */
-    const int16_t L_frame /* i  : size of frame                               */
-);
-
-/*! r: impulse response energy */
-float enr_1_Az(
-    const float Aq[], /* i  : LP filter coefs                             */
-    const int16_t len /* i  : impulse response length                     */
-);
-
-void Es_pred_enc(
-    float *Es_pred,          /* o  : predicited scaled innovation energy         */
-    int16_t *Es_pred_indice, /* o  : indice corresponding to above parameter     */
-    const int16_t L_frame,   /* i  : length of the frame                         */
-    const int16_t L_subfr,   /* i  : length of the subframe                      */
-    const float *res,        /* i  : residual signal                             */
-    const float *voicing,    /* i  : normal. correlattion in three 1/2frames     */
-    const int16_t nb_bits,   /* i  : allocated number of bits                    */
-    const int16_t no_ltp     /* i  : no_ltp flag                                 */
-);
-
-void create_offset(
-    UWord32 *offset_scale1,
-    UWord32 *offset_scale2,
-    const int16_t mode,
-    const int16_t prediction_flag );
-
-float mslvq(
-    float *pTmp,            /* i  : M-dimensional input vector                  */
-    float *quant,           /* o  : quantized vector                            */
-    float *cv_out,          /* o  : corresponding 8-dim lattice codevectors (without the scaling) */
-    int16_t *idx_lead,      /* o  : leader index for each 8-dim subvector       */
-    int16_t *idx_scale,     /* o  : scale index for each subvector              */
-    const float *w,         /* i  : weights for LSF quantization                */
-    const int16_t mode,     /* i  : number indicating the coding mode           */
-    const int16_t mode_glb, /* i  : LVQ coding mode                             */
-    const int16_t pred_flag /* i  : prediction flag (0: safety net, 1 - predictive )*/
-);
-
-void permute(
-    float *pTmp1,       /* i/o: vector whose components are to be permuted  */
-    const int16_t *perm /* i  : permutation info (indexes that should be interchanged), max two perms */
-);
-
-void sort_desc_ind(
-    float *s,
-    const int16_t len,
-    int16_t *ind );
-
-float mslvq_cng(
-    int16_t idx_cv,     /* i  : index of cv from previous stage             */
-    float *pTmp,        /* i  : 16 dimensional input vector                 */
-    float *quant,       /* o  : quantized vector                            */
-    float *cv_out,      /* o  : corresponding 8-dim lattice codevectors (without the scaling) */
-    int16_t *idx_lead,  /* o  : leader index for each 8-dim subvector       */
-    int16_t *idx_scale, /* o  : scale index for each subvector              */
-    const float *w      /* i  : weights for LSF quantization                */
-);
-
-int16_t deindex_lvq_cng(
-    int16_t *index,       /* i  : index to be decoded, as an array of 3 short */
-    float *x_lvq,         /* o  : decoded codevector                          */
-    const int16_t idx_cv, /* i  : relative mode_lvq, wrt START_CNG            */
-    const int16_t no_bits /* i  : number of bits for lattice                  */
-);
-
-void multiply32_32_64(
-    UWord32 x,   /* i  : operand 1                                   */
-    UWord32 y,   /* i  : operand 2                                   */
-    UWord32 *res /* o  : result as array of two uint32               */
-);
-
-int16_t deindex_lvq(
-    int16_t *index,        /* i  : index to be decoded, as an array of 3 short */
-    float *x_lvq,          /* o  : decoded codevector                          */
-    const int16_t mode,    /* i  : LVQ  coding mode (select scales & no_lead ), or idx_cv */
-    const int16_t sf_flag, /* i  : safety net flag                             */
-    const int16_t no_bits  /* i  : number of bits for lattice                  */
-);
-
-void index_lvq(
-    float *quant,                 /* i  : codevector to be indexed (2 8-dim subvectors)                     */
-    int16_t *idx_lead,            /* i  : leader class index for each subvector                             */
-    int16_t *idx_scale,           /* i  : scale index for each subvector                                    */
-    const int16_t mode,           /* i  : integer signaling the quantizer structure for the current bitrate */
-    int16_t *index,               /* o  : encoded index (represented on 3 short each with 15 bits )         */
-    const int16_t prediction_flag /* i  : predictive mode or not                                            */
-);
-
-int16_t qlsf_ARSN_tcvq_Dec_16k(
-    float *y,           /* o  : Quantized LSF vector                        */
-    int16_t *indice,    /* i  : Indices                                     */
-    const int16_t nBits /* i  : number of bits                              */
-);
-
-
-int16_t lsf_bctcvq_decprm_ivas(
-    Decoder_State *st,
-    int16_t *param_lpc );
-
-
-void disf_2s_36b(
-    int16_t *indice, /* i  : quantized indices (use indice[0] = -1 in the decoder) */
-    float *isf_q,    /* o  : quantized ISFs in the cosine domain         */
-    float *mem_AR,   /* i/o: quantizer memory for AR model               */
-    float *mem_MA    /* i/o: quantizer memory for MA model               */
-);
-
-void disf_2s_46b(
-    int16_t *indice, /* i  : quantized indices (use indice[0] = -1 in the decoder) */
-    float *isf_q,    /* o  : quantized ISFs in the cosine domain         */
-    float *mem_AR,   /* o  : quantizer memory for AR model               */
-    float *mem_MA    /* i/o: quantizer memory for MA model               */
-);
-
-void re8_k2y(
-    const int16_t *k, /* i  : Voronoi index k[0..7]                                   */
-    const int16_t m,  /* i  : Voronoi modulo (m = 2^r = 1<<r, where r is integer >=2) */
-    int16_t *y        /* o  : 8-dimensional point y[0..7] in RE8                      */
-);
-
-void re8_PPV(
-    const float x[], /* i  : point in R^8                                */
-    int16_t y[]      /* o  : point in RE8 (8-dimensional integer vector) */
-);
-
-void enhancer(
-    const int16_t codec_mode,   /* i  : flag indicating Codec Mode              */
-    const int32_t core_brate,   /* i  : core bitrate                            */
-    const int16_t cbk_index,    /* i  :                                         */
-    const int16_t Opt_AMR_WB,   /* i  : flag indicating AMR-WB IO mode          */
-    const int16_t coder_type,   /* i  : coding type                             */
-    const int16_t L_frame,      /* i  : frame size                              */
-    const float voice_fac,      /* i  : subframe voicing estimation             */
-    const float stab_fac,       /* i  : LP filter stablility measure            */
-    const float norm_gain_code, /* i  : normalized innovative cb. gain          */
-    const float gain_inov,      /* i  : gain of the unscaled innovation         */
-    float *gc_threshold,        /* i/o: code threshold                          */
-    float *code,                /* i/o: innovation                              */
-    float *exc2,                /* i/o: adapt. excitation/total exc.            */
-    const float gain_pit,       /* i  : Quantized pitch gain                    */
-    float *dispMem              /* i/o: Phase dispersion algorithm memory       */
-);
-
-void phase_dispersion_flt(
-    const float gain_code, /* i  : gain of code                            */
-    const float gain_pit,  /* i  : gain of pitch                           */
-    float code[],          /* i/o: code vector                             */
-    const int16_t mode,    /* i  : level, 0=hi, 1=lo, 2=off                */
-    float disp_mem[]       /* i/o: static memory (size = 8)                */
-);
-
-void re8_vor(
-    int16_t y[], /* i  : point in RE8 (8-dimensional integer vector)      */
-    int16_t *n,  /* o  : codebook number n=0,2,3,4,... (scalar integer)   */
-    int16_t k[], /* o  : Voronoi index (integer vector of dimension 8) used only if n>4 */
-    int16_t c[], /* o  : codevector in Q0, Q2, Q3, or Q4 if n<=4, y=c     */
-    int16_t *ka  /* o  : identifier of absolute leader (needed to index c)*/
-);
-
-void DoRTFT480(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT320(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT160(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT128(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT120(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT80(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT20(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFT40(
-    float *x, /* i/o: real part of input and output data       */
-    float *y  /* i/o: imaginary part of input and output data  */
-);
-
-void DoRTFTn(
-    float *x,       /* i/o: real part of input and output data       */
-    float *y,       /* i/o: imaginary part of input and output data  */
-    const int16_t n /* i  : size of the FFT n=(2^k) up to 1024       */
-);
-
-void BASOP_cfft_ivas(
-    Word32 *re,   /* i/o: real part                                 */
-    Word32 *im,   /* i/o: imag part                                 */
-    Word16 s,     /* i  : stride real and imag part                 */
-    Word16 *scale /* i  : scalefactor                               */
-);
-
-void fft(
-    float *re,            /* i/o: real part                         */
-    float *im,            /* i/o: imag part                         */
-    const int16_t length, /* i  : length of fft                     */
-    const int16_t s       /* i  : sign                              */
-);
-
-void rfft(
-    float *x,             /* i/o: values                            */
-    const float *w,       /* i  : window                            */
-    const int16_t length, /* i  : length of fft                     */
-    const int16_t isign   /* i  : sign                              */
-);
-
-void sinq(
-    const float tmp, /* i  : sinus factor cos(tmp*i+phi)  */
-    const float phi, /* i  : sinus phase cos(tmp*i+phi)   */
-    const int16_t N, /* i  : size of output               */
-    float x[]        /* o  : output vector                */
-);
-
-void edct2(
-    const int16_t n,
-    const int16_t isgn,
-    float *in,
-    float *a,
-    const int16_t *ip,
-    const float *w );
-
-void stat_noise_uv_mod(
-    const int16_t coder_type,   /* i  : coder type                           */
-    float noisiness,            /* i  : noisiness parameter                  */
-    const float *const lsp_old, /* i  : old LSP vector at 4th sfr            */
-    const float *const lsp_new, /* i  : LSP vector at 4th sfr                */
-    const float *const lsp_mid, /* i  : LSP vector at 2nd sfr                */
-    float *Aq,                  /* o  : A(z) quantized for the 4 subframes   */
-    float *exc2,                /* o  : excitation buffer                    */
-    const int16_t bfi,          /* i  : bad frame indicator                  */
-    float *ge_sm,               /* i/o: smoothed excitation gain             */
-    int16_t *uv_count,          /* i/o: unvoiced counter                     */
-    int16_t *act_count,         /* i/o: activation counter                   */
-    float lspold_s[],           /* i/o: old LSP                              */
-    int16_t *noimix_seed,       /* i/o: mixture seed                         */
-    float *st_min_alpha,        /* i/o: minimum alpha                        */
-    float *exc_pe,              /* i/o: memory of the preemphasis filter     */
-    const int32_t bitrate,      /* i  : core bitrate                         */
-    const int16_t bwidth        /* i  : audio bandwidth                      */
-);
-
-void limit_band_noise_level_calc(
-    const int16_t *wnorm,     /* i  : reordered norm of sub-vectors           */
-    int16_t *limit,           /* o  : highest band of bit allocation          */
-    const int32_t core_brate, /* i  : core bitrate                            */
-    float *noise_level        /* o  : noise level                             */
-);
-
-/*! r: hqswb_clas */
-int16_t peak_avrg_ratio(
-    const int32_t total_brate, /* i  : total bitrate              */
-    const float *input_hi,     /* i  : input signal               */
-    const int16_t N,           /* i  : number of coefficients     */
-    int16_t *mode_count,       /* i/o: HQ_HARMONIC mode count     */
-    int16_t *mode_count1       /* i/o: HQ_NORMAL mode count       */
-);
-
-/*! r: Number of coefficients in nf codebook */
-int16_t build_nf_codebook(
-    const int16_t flag_32K_env_ho, /* i  : Envelope attenuation hangover flag */
-    const float *coeff,            /* i  : Coded spectral coefficients        */
-    const int16_t *sfm_start,      /* i  : Subband start indices              */
-    const int16_t *sfmsize,        /* i  : Subband widths                     */
-    const int16_t *sfm_end,        /* i  : Subband end indices                */
-    const int16_t nb_sfm,          /* i  : Last coded band                    */
-    const int16_t *R,              /* i  : Per-band bit allocation            */
-    float *CodeBook,               /* o  : Noise-fill codebook                */
-    float *CodeBook_mod            /* o  : Densified noise-fill codebook      */
-);
-
-void apply_noisefill_HQ(
-    const int16_t *R,              /* i  : bit allocation                   */
-    const int16_t length,          /* i  : input frame length               */
-    const int16_t flag_32K_env_ho, /* i  : envelope stability hangover flag */
-    const int32_t core_brate,      /* i  : core bitrate                     */
-    const int16_t last_sfm,        /* i  : last coded subband               */
-    const float *CodeBook,         /* i  : Noise-fill codebook              */
-    const float *CodeBook_mod,     /* i  : Densified noise-fill codebook    */
-    const int16_t cb_size,         /* i  : Codebook length                  */
-    const int16_t *sfm_start,      /* i  : Subband start coefficient        */
-    const int16_t *sfm_end,        /* i  : Subband end coefficient          */
-    const int16_t *sfmsize,        /* i  : Subband band width               */
-    float *coeff                   /* i/o: coded/noisefilled spectrum       */
-);
-
-void harm_bwe_fine(
-    const int16_t *R,         /* i  : bit allocation                          */
-    const int16_t last_sfm,   /* i  : last coded subband                      */
-    const int16_t high_sfm,   /* i  : higher transition band to BWE           */
-    const int16_t num_sfm,    /* i  : total number of bands                   */
-    const int16_t *norm,      /* i  : quantization indices for norms          */
-    const int16_t *sfm_start, /* i  : Subband start coefficient               */
-    const int16_t *sfm_end,   /* i  : Subband end coefficient                 */
-    int16_t *prev_L_swb_norm, /* i/o: last normalize length                   */
-    float *coeff,             /* i/o: coded/noisefilled normalized spectrum   */
-    float *coeff_out,         /* o  : coded/noisefilled spectrum              */
-    float *coeff_fine         /* o  : BWE fine structure                      */
-);
-
-void hvq_bwe_fine(
-    const int16_t last_sfm,   /* i  : last coded subband                      */
-    const int16_t num_sfm,    /* i  : total number of bands                   */
-    const int16_t *sfm_end,   /* i  : Subband end coefficient                 */
-    const int16_t *peak_idx,  /* i  : Peak index                              */
-    const int16_t Npeaks,     /* i  : Number of peaks                         */
-    int16_t *peak_pos,        /* i/o: Peak positions                          */
-    int16_t *prev_L_swb_norm, /* i/o: last normalize length                   */
-    float *coeff,             /* i/o: coded/noisefilled normalized spectrum   */
-    int16_t *bwe_peaks,       /* o  : Positions of peaks in BWE               */
-    float *coeff_fine         /* o  : HVQ BWE fine structure                  */
-);
-
-void hq_fold_bwe(
-    const int16_t last_sfm, /* i  : last coded subband                      */
-    const int16_t *sfm_end, /* i  : Subband end coefficient                 */
-    const int16_t num_sfm,  /* i  : Number of subbands                      */
-    float *coeff            /* i/o: coded/noisefilled normalized spectrum   */
-);
-
-void apply_nf_gain(
-    const int16_t nf_idx,     /* i  : noise fill gain index                   */
-    const int16_t last_sfm,   /* i  : last coded subband                      */
-    const int16_t *R,         /* i  : bit allocation                          */
-    const int16_t *sfm_start, /* i  : Subband start coefficient               */
-    const int16_t *sfm_end,   /* i  : Subband end coefficient                 */
-    float *coeff              /* i/o: coded/noisefilled normalized spectrum   */
-
-);
-
-void hq_generic_fine(
-    float *coeff,             /* i  : coded/noisefilled normalized spectrum   */
-    const int16_t last_sfm,   /* i  : Last coded band                         */
-    const int16_t *sfm_start, /* i  : Subband start coefficient               */
-    const int16_t *sfm_end,   /* i  : Subband end coefficient                 */
-    int16_t *bwe_seed,        /* i/o: random seed for generating BWE input    */
-    float *coeff_out1         /* o  : HQ GENERIC input                        */
-);
-
-void harm_bwe(
-    const float *coeff_fine,    /* i  : fine structure for BWE                  */
-    const float *coeff,         /* i  : coded/noisefilled normalized spectrum   */
-    const int16_t num_sfm,      /* i  : Number of subbands                      */
-    const int16_t *sfm_start,   /* i  : Subband start coefficient               */
-    const int16_t *sfm_end,     /* i  : Subband end coefficient                 */
-    const int16_t last_sfm,     /* i  : last coded subband                      */
-    const int16_t high_sfm,     /* i  : higher transition band to BWE           */
-    const int16_t *R,           /* i  : bit allocation                          */
-    const int16_t prev_hq_mode, /* i  : previous hq mode                        */
-    int16_t *norm,              /* i/o: quantization indices for norms          */
-    float *noise_level,         /* i/o: noise levels for harmonic modes         */
-    float *prev_noise_level,    /* i/o: noise factor in previous frame          */
-    int16_t *bwe_seed,          /* i/o: random seed for generating BWE input    */
-    float *coeff_out,           /* o  : coded/noisefilled spectrum              */
-    const int16_t element_mode  /* i  : element mode                            */
-);
-
-void hvq_bwe(
-    const float *coeff,         /* i  : coded/noisefilled spectrum              */
-    const float *coeff_fine,    /* i  : BWE fine structure                      */
-    const int16_t *sfm_start,   /* i  : Subband start coefficient               */
-    const int16_t *sfm_end,     /* i  : Subband end coefficient                 */
-    const int16_t *sfm_len,     /* i  : Subband length                          */
-    const int16_t last_sfm,     /* i  : last coded subband                      */
-    const int16_t prev_hq_mode, /* i  : previous hq mode                        */
-    const int16_t *bwe_peaks,   /* i  : HVQ bwe peaks                           */
-    const int16_t bin_th,       /* i  : HVQ transition bin                      */
-    const int16_t num_sfm,      /* i  : Number of bands                         */
-    const int32_t core_brate,   /* i  : Core bitrate                            */
-    const int16_t *R,           /* i  : Bit allocation                          */
-    int16_t *norm,              /* i/o: quantization indices for norms          */
-    float *noise_level,         /* i/o: noise levels for harmonic modes         */
-    float *prev_noise_level,    /* i/o: noise factor in previous frame          */
-    int16_t *bwe_seed,          /* i/o: random seed for generating BWE input    */
-    float *coeff_out            /* o  : coded/noisefilled spectrum              */
-);
-
-void hvq_concat_bands(
-    const int16_t pvq_bands,  /* i  : Number of bands in concatenated PVQ target  */
-    const int16_t *sel_bnds,  /* i  : Array of selected high bands                */
-    const int16_t n_sel_bnds, /* i  : Number of selected high bands               */
-    int16_t *hvq_band_start,  /* o  : Band start indices                          */
-    int16_t *hvq_band_width,  /* o  : Band widths                                 */
-    int16_t *hvq_band_end     /* o  : Band end indices                            */
-);
-
-void hq_generic_bwe(
-    const int16_t HQ_mode,             /* i  : HQ mode                                     */
-    float *coeff_out1,                 /* i/o: BWE input & temporary buffer                */
-    const float *hq_generic_fenv,      /* i  : SWB frequency envelopes                     */
-    float *coeff_out,                  /* o  : SWB signal in MDCT domain                   */
-    const int16_t hq_generic_offset,   /* i  : frequency offset for representing hq generic*/
-    int16_t *prev_L_swb_norm,          /* i/o: last normalize length                       */
-    const int16_t hq_generic_exc_clas, /* i  : hq generic hf excitation class              */
-    const int16_t *sfm_end,            /* i  : End of bands                                */
-    const int16_t num_sfm,             /* i  : Number of bands                             */
-    const int16_t num_env_bands,       /* i  : Number of coded envelope bands              */
-    const int16_t *R                   /* i  : Bit allocation                              */
-);
-
-void map_hq_generic_fenv_norm(
-    const int16_t hqswb_clas,       /* i  : signal classification flag      */
-    const float *hq_generic_fenv,   /* i  : HQ GENERIC envelope             */
-    int16_t *ynrm,                  /* o  : high band norm indices          */
-    int16_t *normqlg2,              /* o  : high band norm values           */
-    const int16_t num_env_bands,    /* i  : Number coded envelope bands     */
-    const int16_t nb_sfm,           /* i  : Number of envelope bands        */
-    const int16_t hq_generic_offset /* i  : Freq offset for HQ GENERIC      */
-);
-
-/*! r: Number of bits consumed for the delta coding */
-int16_t calc_nor_delta_hf(
-    BSTR_ENC_HANDLE hBstr,       /* i/o: encoder bitstream handle       */
-    const float *t_audio,        /* i  : transform-domain coefficients  */
-    int16_t *ynrm,               /* i/o: norm indices                   */
-    int16_t *Rsubband,           /* i/o: sub-band bit allocation        */
-    const int16_t num_env_bands, /* i  : Number coded envelope bands    */
-    const int16_t nb_sfm,        /* i  : Number of envelope bands       */
-    const int16_t *sfmsize,      /* i  : band length                    */
-    const int16_t *sfm_start,    /* i  : Start index of bands           */
-    const int16_t core_sfm       /* i  : index of the end band for core */
-);
-
-/*! r: Number of bits consumed for the delta coding */
-int16_t get_nor_delta_hf(
-    Decoder_State *st,           /* i/o: Decoder state                  */
-    int16_t *ynrm,               /* i/o: norm indices                   */
-    int16_t *Rsubband,           /* i/o: sub-band bit allocation        */
-    const int16_t num_env_bands, /* i  : Number coded envelope bands    */
-    const int16_t nb_sfm,        /* i  : Number of envelope bands       */
-    const int16_t core_sfm );    /* i  : index of the end band for core */
-
-void hq_wb_nf_bwe(
-    const float *coeff,              /* i  : coded/noisefilled normal. spectrum      */
-    const int16_t is_transient,      /* i  : is transient flag                       */
-    const int16_t prev_bfi,          /* i  : previous bad frame indicator            */
-    const float *normq_v,            /* i  : norms                                   */
-    const int16_t num_sfm,           /* i  : Number of subbands                      */
-    const int16_t *sfm_start,        /* i  : Subband start coefficient               */
-    const int16_t *sfm_end,          /* i  : Subband end coefficient                 */
-    const int16_t *sfmsize,          /* i  : Subband band width                      */
-    const int16_t last_sfm,          /* i  : last coded subband                      */
-    const int16_t *R,                /* i  : bit allocation                          */
-    const int16_t prev_is_transient, /* i  : previous transient flag                 */
-    float *prev_normq,               /* i/o: previous norms                          */
-    float *prev_env,                 /* i/o: previous noise envelopes                */
-    int16_t *bwe_seed,               /* i/o: random seed for generating BWE input    */
-    float *prev_coeff_out,           /* i/o: decoded spectrum in previous frame      */
-    int16_t *prev_R,                 /* i/o: previous frame bit allocation info.     */
-    float *coeff_out                 /* o  : coded/noisefilled spectrum              */
-);
-
-/*! r: Number of bits */
-int16_t encode_envelope_indices(
-    BSTR_ENC_HANDLE hBstr,     /* i/o: encoder bitstream handle                */
-    const int16_t num_sfm,     /* i  : Number of subbands                      */
-    const int16_t numnrmibits, /* i  : Bitrate of fall-back coding mode        */
-    int16_t *difidx,           /* i/o: Diff indices/encoded diff indices       */
-    int16_t *LCmode,           /* o  : Coding mode                             */
-    const int16_t flag_pack,   /* i  : indicator of packing or estimating bits */
-    const int16_t flag_HQ2,    /* i  : indicator of HQ2 core                   */
-    const int16_t is_transient /* i  : transient flag                          */
-);
-
-void diff_envelope_coding(
-    const int16_t is_transient,  /* i  : transient indicator                     */
-    const int16_t num_env_bands, /* i  : number of envelope bands to code        */
-    const int16_t start_norm,    /* i  : start of envelope coding                */
-    int16_t *ynrm,               /* i/o: quantization indices for norms          */
-    int16_t *normqlg2,           /* i/o: quantized norms                         */
-    int16_t *difidx              /* o  : differential code                       */
-);
-
-/*! r: Number of bits */
-int16_t decode_envelope_indices(
-    Decoder_State *st,         /* i/o: decoder state structure                 */
-    const int16_t start_norm,  /* i  : First SDE encoded norm                  */
-    const int16_t num_sfm,     /* i  : Number of norms                         */
-    const int16_t numnrmibits, /* i  : Bitrate of fall-back coding mode        */
-    int16_t *ynrm,             /* o  : Decoded norm indices                    */
-    const int16_t flag_HQ2,    /* i  : indicator of HQ2 core                   */
-    const int16_t is_transient /* i  : transient flag                          */
-);
-
-/*! r: Number of bits */
-void dequantize_norms(
-    Decoder_State *st,          /* i/o: decoder state structure                 */
-    const int16_t start_norm,   /* i  : First SDE encoded norm                  */
-    const int16_t num_sfm,      /* i  : Number of norms                         */
-    const int16_t is_transient, /* i  : Transient flag                          */
-    int16_t *ynrm,              /* o  : Decoded norm indices                    */
-    int16_t *normqlg2           /* o  : Log2 of decoded norms                   */
-);
-
-void hq_configure(
-    const int16_t length,       /* i  : Frame length                              */
-    const int16_t hqswb_clas,   /* i  : HQ SWB class                              */
-    const int32_t core_brate,   /* i  : core bitrate                              */
-    int16_t *num_sfm,           /* o  : Total number of subbands                  */
-    int16_t *nb_sfm,            /* o  : Total number of coded bands               */
-    int16_t *start_norm,        /* o  : First norm to be SDE encoded              */
-    int16_t *num_sde_norm,      /* o  : Number of norms for SDE encoding          */
-    int16_t *numnrmibits,       /* o  : Number of bits in fall-back norm encoding */
-    int16_t *hq_generic_offset, /* o  : Freq offset for HQ GENERIC                */
-    int16_t *sfmsize,           /* o  : Subband bandwidths                        */
-    int16_t *sfm_start,         /* o  : Subband start coefficients                */
-    int16_t *sfm_end            /* o  : Subband end coefficients                  */
-);
-
-/*! r: Consumed bits */
-int16_t hvq_enc(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: encoder bitstream handle                */
-    const int16_t bwidth,     /* i  : audio bandwidth                         */
-    const int32_t core_brate, /* i  : core bitrate                            */
-    const int16_t hvq_bits,   /* i  : HVQ bit budget                          */
-    const int16_t Npeaks,     /* i  : Number of peaks                         */
-    const int16_t *ynrm,      /* i  : Envelope coefficients                   */
-    int16_t *R,               /* i/o: Bit allocation/updated bit allocation   */
-    int16_t *peaks,           /* i/o: Peak pos. / Encoded peak pos.           */
-    float *nf_gains,          /* i/o: Noise fill gains / Quant. nf gains      */
-    float *noise_level,       /* o  : Quantized noise level                   */
-    const float *pe_gains,    /* i  : Peak gains                              */
-    const float *coefs,       /* i  : spectrum coefficients                   */
-    float *coefs_out          /* o  : encoded spectrum coefficients           */
-);
-/*! r: Consumed bits */
-int16_t hq_classifier_dec(
-    Decoder_State *st,        /* i/o: decoder state structure                 */
-    const int32_t core_brate, /* i  : Core bitrate                            */
-    const int16_t length,     /* i  : Frame length                            */
-    int16_t *is_transient,    /* o  : Transient flag                          */
-    int16_t *hqswb_clas       /* o  : HQ class                                */
-);
-
-void hq_bit_allocation(
-    const int32_t core_brate,   /* i  : Core bitrate                                   */
-    const int16_t length,       /* i  : Frame length                                   */
-    const int16_t hqswb_clas,   /* i  : HQ class                                       */
-    int16_t *num_bits,          /* i/o: Remaining bit budget                           */
-    const int16_t *normqlg2,    /* i  : Quantized norms                                */
-    const int16_t nb_sfm,       /* i  : Number sub bands to be encoded                 */
-    const int16_t *sfmsize,     /* i  : Sub band bandwidths                            */
-    float *noise_level,         /* o  : HVQ noise level                                */
-    int16_t *R,                 /* o  : Bit allocation per sub band                    */
-    int16_t *Rsubband,          /* o  : Fractional bit allocation (Q3)                 */
-    int16_t *sum,               /* o  : Sum of allocated shape bits                    */
-    int16_t *core_sfm,          /* o  : Last coded band in core                        */
-    const int16_t num_env_bands /* i  : Number sub bands to be encoded for HQ_SWB_BWE  */
-);
-
-void enforce_zero_for_min_envelope(
-    const int16_t hqswb_clas, /* i  : HQ coding class                         */
-    const int16_t *ynrm,      /* i  : Envelope indices                        */
-    float *coefsq,            /* i/o: Quantized spectrum/zeroed spectrum      */
-    int16_t nb_sfm,           /* i  : Number of coded sub bands               */
-    const int16_t *sfm_start, /* i  : Sub band start indices                  */
-    const int16_t *sfm_end    /* i  : Sub band end indices                    */
-);
-
-void apply_envelope(
-    const float *coeff,       /* i/o: Coded/noisefilled normalized spectrum   */
-    const int16_t *norm,      /* i  : Envelope                                */
-    const float *norm_adj,    /* i  : Envelope adjustment                     */
-    const int16_t num_sfm,    /* i  : Total number of bands                   */
-    const int16_t last_sfm,   /* i  : Last coded band                         */
-    const int16_t HQ_mode,    /* i  : HQ mode                                 */
-    const int16_t length,     /* i  : Frame length                            */
-    const int16_t *sfm_start, /* i  : Sub band start indices                  */
-    const int16_t *sfm_end,   /* i  : Sub band end indices                    */
-    float *normq_v,           /* o  : Envelope with adjustment                */
-    float *coeff_out,         /* o  : coded/noisefilled spectrum              */
-    float *coeff_out1         /* o  : noisefilled spectrum for HQ SWB BWE     */
-);
-
-void apply_envelope_enc(
-    float *coeff,             /* i/o: Normalized/scaled normalized spectrum   */
-    const int16_t *norm,      /* i  : Envelope                                */
-    const int16_t num_sfm,    /* i  : Total number of bands                   */
-    const int16_t *sfm_start, /* i  : Sub band start indices                  */
-    const int16_t *sfm_end    /* i  : Sub band end indices                    */
-);
-
-/*! r: Leading_sign_index, index, size, k_val */
-PvqEntry mpvq_encode_vec(
-    const int16_t *vec_in, /* i  : Signed pulse train                       */
-    const int16_t dim_in,  /* i  : Dimension                                */
-    int16_t k_val_local    /* i/o: Num unit pulses                          */
-);
-
-/*! r: Size, dim, k_val */
-PvqEntry get_size_mpvq_calc_offset(
-    const int16_t dim_in,   /* i  : Dimension                                */
-    const int16_t k_val_in, /* i  : Num unit pulses                          */
-    uint32_t *h_mem         /* o  : Offsets                                  */
-);
-
-void mpvq_decode_vec(
-    const PvqEntry *entry, /* i  :  Sign_ind, index, dim, k_val             */
-    uint32_t *h_mem,       /* i  :  A/U offsets                             */
-    int16_t *vec_out       /* o  :  Pulse train                             */
-);
-
-/*! r: Multiplication result */
-uint32_t UMult_32_32(
-    const uint32_t UL_var1, /* i  : factor 1 */
-    const uint32_t UL_var2  /* i  : factor 2 */
-);
-
-/*! r: inverse */
-uint32_t UL_inverse_float(
-    const uint32_t UL_val, /* i  : input value Q_exp      */
-    int16_t *exp           /* i/o: input exp / result exp */
-);
-
-/*! r: ratio */
-Word16 ratio_float(
-    const Word32 numer, /* i  : numerator              */
-    const Word32 denom, /* i  : denominator            */
-    Word16 *expo        /* i/o: input exp / result exp */
-);
-
-/*! r: Angle between 0 and EVS_PI/2 radian (Q14) */
-Word16 atan2_fx_flt(
-    const Word32 y, /* i  : near side (Argument must be positive) (Q15) */
-    const Word32 x  /* i  : opposite side (Q15)                         */
-);
-
-void pvq_encode_frame(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: encoder bitstream handle                    */
-    const float *coefs_norm,  /* i  : normalized coefficients to encode           */
-    float *coefs_quant,       /* o  : quantized coefficients                      */
-    float *gopt,              /* o  : optimal shape gains                         */
-    int16_t *npulses,         /* o  : number of pulses per band                   */
-    int16_t *pulse_vector,    /* o  : non-normalized pulse shapes                 */
-    const int16_t *sfm_start, /* i  : indices of first coefficients in the bands  */
-    const int16_t *sfm_end,   /* i  : indices of last coefficients in the bands   */
-    const int16_t *sfmsize,   /* i  : band sizes                                  */
-    const int16_t nb_sfm,     /* i  : total number of bands                       */
-    const int16_t *R,         /* i  : bitallocation per band (Q3)                 */
-    const int16_t pvq_bits,   /* i  : number of bits avaiable                     */
-    const int16_t core        /* i  : core                                        */
-);
-
-void pvq_decode_frame(
-    Decoder_State *st,        /* i/o: Decoder state                        */
-    float *coefs_quant,       /* o  : quantized coefficients               */
-    int16_t *npulses,         /* o  : number of pulses per band            */
-    int16_t *pulse_vector,    /* o  : non-normalized pulse shapes          */
-    const int16_t *sfm_start, /* i  : indices of first coeffs in the bands */
-    const int16_t *sfm_end,   /* i  : indices of last coeffs in the bands  */
-    const int16_t *sfmsize,   /* i  : band sizes                           */
-    const int16_t nb_sfm,     /* i  : total number of bands                */
-    const int16_t *R,         /* i  : bitallocation per band (Q3)          */
-    const int16_t pvq_bits,   /* i  : number of bits avaiable              */
-    const int16_t core        /* i  : core                                 */
-);
-
-void srt_vec_ind(
-    const int16_t *linear, /* linear input                                     */
-    int16_t *srt,          /* sorted output                                    */
-    int16_t *I,            /* index for sorted output                          */
-    const int16_t length );
-
-void srt_vec_ind_f(
-    const float *linear, /* linear input                                     */
-    float *srt,          /* sorted output                                    */
-    int16_t *I,          /* index for sorted output                          */
-    const int16_t length /* length of vector                                 */
-);
-
-/*! r: floor(sqrt(input)) */
-uint32_t floor_sqrt_exact(
-    const uint32_t input /* i  : unsigned input  [0.. UINT_MAX/4]     */
-);
-
-void fine_gain_quant(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: encoder bitstream handle                    */
-    const int16_t *ord,       /* i  : Indices for energy order                    */
-    const int16_t num_sfm,    /* i  : Number of bands                             */
-    const int16_t *gain_bits, /* i  : Gain adjustment bits per sub band           */
-    float *fg_pred,           /* i/o: Predicted gains / Corrected gains           */
-    const float *gopt         /* i  : Optimal gains                               */
-);
-
-void apply_gain(
-    const int16_t *ord,        /* i  : Indices for energy order                    */
-    const int16_t *band_start, /* i  : Sub band start indices                      */
-    const int16_t *band_end,   /* i  : Sub band end indices                        */
-    const int16_t num_sfm,     /* i  : Number of bands                             */
-    const float *gains,        /* i  : Band gain vector                            */
-    float *xq                  /* i/o: float synthesis / gain adjusted synth       */
-);
-
-void fine_gain_pred(
-    const int16_t *sfm_start, /* i  : Sub band start indices                      */
-    const int16_t *sfm_end,   /* i  : Sub band end indices                        */
-    const int16_t *sfm_size,  /* i  : Sub band bandwidths                         */
-    const int16_t *i_sort,    /* i  : Energy sorting indices                      */
-    const int16_t *K,         /* i  : Number of pulses per band                   */
-    const int16_t *maxpulse,  /* i  : Maximum pulse per band                      */
-    const int16_t *R,         /* i  : Bits per sub band (Q3)                      */
-    const int16_t num_sfm,    /* i  : Number of sub bands                         */
-    float *xq,                /* i/o: Quantized vector /quantized vector with finegain adj */
-    int16_t *y,               /* i/o: Quantized vector                            */
-    float *fg_pred,           /* o  : Predicted fine gains                        */
-    const int16_t core        /* i  : Core                                        */
-);
-
-void fine_gain_dec(
-    Decoder_State *st,        /* i/o: Decoder state struct                        */
-    const int16_t *ord,       /* i  : Indices for energy order                    */
-    const int16_t num_sfm,    /* i  : Number of bands                             */
-    const int16_t *gain_bits, /* i  : Gain adjustment bits per sub band           */
-    float *fg_pred            /* i/o: Predicted gains / Corrected gains           */
-);
-
-void get_max_pulses(
-    const int16_t *band_start, /* i  : Sub band start indices                      */
-    const int16_t *band_end,   /* i  : Sub band end indices                        */
-    const int16_t *k_sort,     /* i  : Indices for sorting by energy               */
-    const int16_t *npulses,    /* i  : Pulses per sub band                         */
-    const int16_t BANDS,       /* i  : Number of bands                             */
-    int16_t *inp_vector,       /* i/o: Encoded shape vectors                       */
-    int16_t *maxpulse          /* o  : Maximum pulse height per band               */
-);
-
-Word32 ar_div_ivas(
-    Word32 num,
-    Word32 denum );
-
-void ar_encoder_start(
-    PARCODEC arInst,
-    TCQ_PBITSTREAM bsInst,
-    int16_t max_bits );
-
-void ar_decoder_start(
-    PARCODEC arInst,
-    TCQ_PBITSTREAM bsInst );
-
-void ar_encoder_done(
-    PARCODEC arInst );
-
-void ar_decoder_done(
-    PARCODEC arInst );
-
-
-Word32 Mult_32_16(
-    Word32 a,
-    Word16 b );
-
-Word32 Mult_32_32(
-    Word32 a,
-    Word32 b );
-
-
-void decode_mangitude_tcq_fx_ivas(
-    ARCODEC *pardec,
-    Word16 size,
-    Word16 npulses,
-    Word16 nzpos,
-    Word32 *positions,
-    Word32 *out,
-    Word32 *surplus_fx );
-
-void decode_signs_fx_ivas(
-    ARCODEC *pardec,
-    Word16 size,
-    Word32 *out );
-
-void srt_vec_ind_fx_ivas(
-    const Word32 *linear,
-    Word32 *srt,
-    Word16 *I,
-    Word16 length );
-
-
-void bit_allocation_second_fx2(
-    Word32 *Rk,
-    Word32 *Rk_sort,
-    Word16 BANDS,
-    const Word16 *band_width,
-    Word16 *k_sort,
-    Word16 *k_num,
-    const Word16 *p2a_flags,
-    const Word16 p2a_bands,
-    const Word16 *last_bitalloc,
-    const Word16 input_frame );
-
-
-Word32 encode_magnitude_tcq_fx_ivas(
-    ARCODEC *parenc,
-    float *magn_fx,
-    Word16 size,
-    Word16 npulses,
-    Word16 nzpos,
-    Word32 *savedstates,
-    Word32 *est_frame_bits_fx );
-
-Word32 encode_signs_fx_ivas(
-    ARCODEC *parenc,
-    float *magn,
-    Word16 size,
-    Word16 npos,
-    Word32 *est_frame_bits_fx );
-
-Word32 encode_magnitude_usq_fx_ivas(
-    ARCODEC *parenc,
-    float *magn_fx,
-    Word16 size,
-    Word16 npulses,
-    Word16 nzpos,
-    Word32 *est_frame_bits_fx );
-
-ivas_error tcq_core_LR_enc(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */
-    int32_t inp_vector[],
-    const float coefs_norm[],
-    float coefs_quant[],
-    const int16_t bit_budget, /* number of bits */
-    const int16_t nb_sfm,
-    const int16_t *sfm_start,
-    const int16_t *sfm_end,
-    const int16_t *sfmsize,
-    Word32 *Rk_fx,
-    int16_t *npulses,
-    int16_t *k_sort,
-    const int16_t *p2a_flags,
-    const int16_t p2a_bands,
-    const int16_t *last_bitalloc,
-    const int16_t input_frame,
-    const int16_t adjustFlag,
-    const int16_t is_transient );
-
-void tcq_core_LR_dec(
-    Decoder_State *st,
-    int32_t *inp_vector,
-    const int16_t bit_budget,
-    const int16_t bands,
-    const int16_t *band_start,
-    const int16_t *band_width,
-    Word32 *Rk_fx,
-    int16_t npulses[],
-    int16_t *k_sort,
-    const int16_t *p2a_flags,
-    const int16_t p2a_bands,
-    const int16_t *last_bitalloc,
-    const int16_t input_frame,
-    const int16_t adjustFlag,
-    const int16_t *is_transient );
-
-
-void TCQLSB(
-    int16_t bcount,
-    float *abuffer,
-    float *mbuffer,
-    float *sbuffer,
-    int16_t *dpath );
-
-void RestoreTCQ(
-    float *magn,
-    int16_t size,
-    int16_t *bcount,
-    float *mbuffer );
-
-void SaveTCQdata(
-    PARCODEC arInst,
-    int16_t *dpath,
-    int16_t bcount );
-
-void LoadTCQdata(
-    PARCODEC arInst,
-    int16_t *dpath,
-    int16_t bcount );
-
-void RestoreTCQdec(
-    int32_t *magn,
-    int16_t size,
-    int16_t *bcount,
-    float *mbuffer );
-
-void TCQLSBdec(
-    int16_t *dpath,
-    float *mbuffer,
-    int16_t bcount );
-
-void bit_allocation_second_fx2(
-    Word32 *Rk,
-    Word32 *Rk_sort,
-    Word16 BANDS,
-    const Word16 *band_width,
-    Word16 *k_sort,
-    Word16 *k_num,
-    const Word16 *p2a_flags,
-    const Word16 p2a_bands,
-    const Word16 *last_bitalloc,
-    const Word16 input_frame );
-
-void io_ini_enc(
-    const int32_t argc, /* i  : command line arguments number           */
-    char *argv[],       /* i  : command line arguments                  */
-    FILE **f_input,     /* o  : input signal file                       */
-    FILE **f_stream,    /* o  : output bitstream file                   */
-    FILE **f_rate,      /* o  : bitrate switching profile (0 if N/A)    */
-    FILE **f_bwidth,    /* o  : bandwidth switching profile (0 if N/A)  */
-    FILE **f_metadata,  /* o  : metadata files (NULL if N/A)            */
-#ifdef DEBUGGING
-    FILE **f_force, /* o  : force switching profile (0 if N/A)      */
-#endif
-    FILE **f_rf,         /* o  : channel aware configuration file        */
-    int16_t *quietMode,  /* o  : limit printouts                         */
-    int16_t *noDelayCmp, /* o  : turn off delay compensation             */
-    Encoder_Struct *st   /* o  : IVAS encoder structure                  */
-);
-
-void read_next_rfparam(
-    int16_t *rf_fec_offset,    /* o  : RF offset                               */
-    int16_t *rf_fec_indicator, /* o  : RF FEC indicator                        */
-    FILE *f_rf                 /* i  : file pointer to read parameters         */
-);
-
-void read_next_brate(
-    int32_t *total_brate,           /* i/o: total bitrate                           */
-    const int32_t last_total_brate, /* i  : last total bitrate                      */
-    FILE *f_rate,                   /* i  : bitrate switching profile (0 if N/A)    */
-    const int16_t element_mode,     /* i  : IVAS element mode                       */
-    int32_t input_Fs,               /* i  : input sampling frequency                */
-    int16_t *Opt_AMR_WB,            /* i  : flag indicating AMR-WB IO mode          */
-    int16_t *Opt_SC_VBR,            /* i/o: SC-VBR flag                             */
-    int16_t *codec_mode             /* i/o: Mode 1 or 2                             */
-);
-
-void read_next_bwidth(
-    int16_t *max_bwidth,         /* i/o: maximum encoded bandwidth               */
-    FILE *f_bwidth,              /* i  : bandwidth switching profile (0 if N/A)  */
-    int32_t *bwidth_profile_cnt, /* i/o: counter of frames for bandwidth switching profile file */
-    int32_t input_Fs             /* i  : input sampling rate                     */
-);
-
-#ifdef DEBUGGING
-void read_next_force(
-    int16_t *force,            /* i/o: force value (0/1, 0 = speech, 1 = music)*/
-    FILE *f_force,             /* i  : force switching profile (0 if N/A)      */
-    int32_t *force_profile_cnt /* i/o: counter of frames for force switching profile file */
-);
-#endif
-
-ivas_error init_encoder_ivas_fx(
-    Encoder_State *st,              /* i/o: state structure                      */
-    Encoder_Struct *st_ivas,        /* i/o: encoder state structure              */
-    const Word16 idchan,            /* i  : channel ID                           */
-    const Word16 var_SID_rate_flag, /* i  : flag for variable SID update rate    */
-    const Word16 interval_SID,      /* i  : interval for SID update              */
-    const Word16 vad_only_flag,     /* i  : flag to indicate front-VAD structure */
-    const ISM_MODE ism_mode,        /* i  : ISM mode                             */
-    const Word32 element_brate      /* i  : element bitrate                      */
-);
-
-void LPDmem_enc_init(
-    LPD_state_HANDLE hLPDmem /* i/o: LP memories                             */
-);
-
-ivas_error evs_enc(
-    Encoder_State *st,      /* i/o: state structure                         */
-    const int16_t *data,    /* i  : input signal                            */
-    float *mem_hp20_in,     /* i/o: hp20 filter memory                      */
-    const int16_t n_samples /* i  : number of input samples                 */
-);
-void amr_wb_enc(
-    Encoder_State *st,      /* i/o: encoder state structure                 */
-    const int16_t *data,    /* i  : input signal                            */
-    float *mem_hp20_in,     /* i/o: hp20 filter memory                      */
-    const int16_t n_samples /* i  : number of input samples                 */
-);
-
-void sc_vbr_enc_init(
-    SC_VBR_ENC_HANDLE hSC_VBR /* i/o: SC-VBR encoder handle                   */
-);
-
-void amr_wb_enc_init(
-    AMRWB_IO_ENC_HANDLE hAmrwb_IO /* i/o: AMR-WB IO encoder handle                */
-);
-
-void pre_proc(
-    Encoder_State *st,                                         /* i/o: encoder state structure                 */
-    const int16_t input_frame,                                 /* i  : frame length                            */
-    float old_inp_12k8[],                                      /* i/o: buffer of old input signal              */
-    float old_inp_16k[],                                       /* i/o: buffer of old input signal @ 16kHz      */
-    float **inp,                                               /* o  : ptr. to inp. signal in the current frame*/
-    float fr_bands[2 * NB_BANDS],                              /* i  : energy in frequency bands               */
-    float *ener,                                               /* o  : residual energy from Levinson-Durbin    */
-    int16_t pitch_orig[3],                                     /* o  : open-loop pitch values for quantization */
-    float A[NB_SUBFR16k * ( M + 1 )],                          /* i/o: A(z) unquantized for the 4 subframes    */
-    float Aw[NB_SUBFR16k * ( M + 1 )],                         /* i/o: weighted A(z) unquantized for subframes */
-    float epsP[M + 1],                                         /* i/o: LP prediction errors                    */
-    float lsp_new[M],                                          /* i/o: LSPs at the end of the frame            */
-    float lsp_mid[M],                                          /* i/o: LSPs in the middle of the frame         */
-    int16_t *vad_hover_flag,                                   /* i  : VAD hangover flag                       */
-    int16_t *attack_flag,                                      /* o  : attack flag                             */
-    float *new_inp_resamp16k,                                  /* o  : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE */
-    int16_t *Voicing_flag,                                     /* o  : voicing flag for HQ FEC                 */
-    float realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer                             */
-    float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer                             */
-    int16_t *hq_core_type                                      /* o  : HQ core type                            */
-);
-
-
-/*! r: HQ_CORE/TCX_20_CORE decision */
-int16_t mdct_classifier(
-    Encoder_State *st,        /* i/o: Encoder state variable                  */
-    const float *fft_buff,    /* i  : FFT spectrum from fft_rel               */
-    const float enerBuffer[], /* i  : energy buffer                           */
-    const int32_t brate       /* i  : current brate, IVAS: nominal bitrate, EVS: st->total_brate */
-);
-
-void MDCT_selector(
-    Encoder_State *st,       /* i/o: Encoder State                           */
-    const float sp_floor,    /* i  : Noise floor estimate                    */
-    const float Etot,        /* i  : Total energy                            */
-    const float cor_map_sum, /* i  : sum of correlation map                  */
-    const float enerBuffer[] /* i  : energy buffer                           */
-);
-
-ivas_error acelp_core_enc_ivas_fx(
-    Encoder_State *st,                  /* i/o: encoder state structure                 */
-    const Word16 inp[],                 /* i  : input signal of the current frame		Q_new*/
-    Word16 A[NB_SUBFR16k * ( M + 1 )],  /* i  : A(z) unquantized for the 4 subframes	Q12*/
-    Word16 Aw[NB_SUBFR16k * ( M + 1 )], /* i  : weighted A(z) unquant. for subframes	Q12*/
-    const Word32 epsP[M + 1],           /* i  : LP prediction errors					Qx*/
-    Word16 lsp_new[M],                  /* i  : LSPs at the end of the frame			Q15*/
-    Word16 lsp_mid[M],                  /* i  : LSPs in the middle of the frame			Q15*/
-    const Word16 vad_hover_flag,        /* i  : VAD hangover flag						Q0*/
-    const Word16 attack_flag,           /* i  : attack flag (GSC or TC)					Q0*/
-    Word32 bwe_exc_extended_fx[],       /* i/o: bandwidth extended excitation       st->prev_Q_bwe_exc*/
-    Word16 *voice_factors_fx,           /* o  : voicing factors							Q15*/
-    Word16 old_syn_12k8_16k[],          /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE		q_old_syn_12k8_16*/
-    Word16 *q_old_syn_12k8_16,
-    Word16 pitch_buf[NB_SUBFR16k],       /* o  : floating pitch for each subframe		Q6*/
-    Word16 *unbits,                      /* o  : number of unused bits					Q0*/
-    STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle            */
-    Word16 tdm_lsfQ_PCh[M],              /* i  : Q LSFs for primary channel				X2.56*/
-    Word16 Q_new );
-
-ivas_error acelp_core_switch_dec_bfi(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-void acelp_core_switch_enc(
-    Encoder_State *st,                     /* i/o: encoder state structure                 */
-    const float inp12k8[],                 /* i  : input signal @12.8 kHz                  */
-    const float inp16k[],                  /* i  : input signal @16 kHz                    */
-    const float A[NB_SUBFR16k * ( M + 1 )] /* i  : A(z) unquantized for the 4 subframes    */
-);
-
-/*! r: length of output */
-int16_t modify_Fs_intcub3m_sup(
-    const float sigIn[], /* i  : signal to decimate with memory of 2 samples (indexes -2 & -1) */
-    const int16_t lg,    /* i  : length of input                         */
-    const int32_t fin,   /* i  : frequency of input                      */
-    float sigOut[],      /* o  : decimated signal                        */
-    const int32_t fout,  /* i  : frequency of output                     */
-    int16_t *delayout    /* o  : delay of output                         */
-);
-
-void core_switching_OLA(
-    const float *mem_over_hp,     /* i  : upsampling filter memory                */
-    const int16_t last_L_frame,   /* i  : last L_frame lengthture                 */
-    const int32_t output_Fs,      /* i  : output sampling rate                    */
-    float *synth,                 /* i/o: synthesized signal from HQ core         */
-    const float *synth_subfr_out, /* i  : synthesized signal from ACELP core      */
-    float *synth_subfr_bwe,       /* i  : synthesized BWE from ACELP core         */
-    const int16_t output_frame,   /* i  : output frame length                     */
-    const int16_t bwidth          /* i  : output bandwidth                        */
-);
-
-void retro_interp4_5(
-    const float *syn,
-    float *pst_old_syn );
-
-void retro_interp5_4(
-    float *pst_old_syn );
-void core_switching_hq_prepare_dec(
-    Decoder_State *st,        /* i/o: decoder state structure                 */
-    int16_t *num_bits,        /* i/o: bit budget update                       */
-    const int16_t input_frame /* i  : input frame length                      */
-);
-
-ivas_error acelp_core_switch_dec(
-    Decoder_State *st,                 /* i/o: decoder structure              */
-    float *synth_subfr_out,            /* o  : synthesized ACELP subframe     */
-    float *tmp_synth_bwe,              /* o  : synthesized ACELP subframe BWE */
-    const int16_t output_frame,        /* i  : input frame length             */
-    const int16_t core_switching_flag, /* i  : core switching flag            */
-    float *mem_synth,                  /* o  : synthesis to overlap           */
-    const int16_t nchan_out            /* i  : number of output channels      */
-);
-
-void ResetSHBbuffer_Enc(
-    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle                      */
-);
-
-void ResetSHBbuffer_Dec(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                      */
-    const int16_t extl         /* i  : BWE extension layer                     */
-);
-
-void calc_st_filt(
-    const float *apond2,   /* i  : coefficients of numerator               */
-    const float *apond1,   /* i  : coefficients of denominator             */
-    float *parcor0,        /* o  : 1st parcor calcul. on composed filter   */
-    float *sig_ltp_ptr,    /* i/o: input of 1/A(gamma1) : scaled by 1/g0   */
-    float *mem_zero,       /* i/o: All zero memory                         */
-    const int16_t L_subfr, /* i  : the length of subframe                  */
-    const int16_t extl     /* i  : extension layer info                    */
-);
-
-
-void scale_st_ivas(
-    const float *sig_in,   /* i  : postfilter input signal                 */
-    float *sig_out,        /* i/o: postfilter output signal                */
-    float *gain_prec,      /* i/o: last value of gain for subframe         */
-    const int16_t L_subfr, /* i  : the length of subframe                  */
-    const int16_t extl     /* i  : extension layer info                    */
-);
-
-void filt_mu(
-    const float *sig_in,   /* i  : signal (beginning at sample -1)         */
-    float *sig_out,        /* o  : output signal                           */
-    const float parcor0,   /* i  : parcor0 (mu = parcor0 * gamma3)         */
-    const int16_t L_subfr, /* i  : the length of subframe                  */
-    const int16_t extl     /* i  : extension layer info                    */
-);
-
-void PostShortTerm(
-    float *sig_in,          /* i  : input signal (ptr. to current subframe  */
-    float *lpccoeff,        /* i  : LPC coefficients for current subframe   */
-    float *sig_out,         /* o  : postfiltered output                     */
-    float *mem_stp,         /* i/o: postfilter memory                       */
-    float *ptr_mem_stp,     /* i/o: pointer to postfilter memory            */
-    float *ptr_gain_prec,   /* i/o: for gain adjustment                     */
-    float *mem_zero,        /* i/o: null memory to compute h_st             */
-    const float formant_fac /* i  : Strength of post-filter [0,1]           */
-);
-
-/*! r: Formant filter strength [0,1] */
-float swb_formant_fac(
-    const float lpc_shb2, /* i  : 2nd HB LPC coefficient                  */
-    float *tilt_mem       /* i/o: Tilt smoothing memory                   */
-);
-
-void GenShapedSHBExcitation(
-    float *excSHB,                      /* o  : synthesized shaped shb exctiation       */
-    const float *lpc_shb,               /* i  : lpc coefficients                        */
-    float *exc16kWhtnd,                 /* o  : whitened synthesized shb excitation     */
-    float *mem_csfilt,                  /* i/o: memory                                  */
-    float *mem_genSHBexc_filt_down_shb, /* i/o: memory                                  */
-    float *state_lpc_syn,               /* i/o: memory                                  */
-    const int16_t coder_type,           /* i  : coding type                             */
-    const float *bwe_exc_extended,      /* i  : bandwidth extended excitation           */
-    int16_t bwe_seed[],                 /* i/o: random number generator seed            */
-    float voice_factors[],              /* i  : voicing factor                          */
-    const int16_t extl,                 /* i  : extension layer                         */
-    float *tbe_demph,                   /* i/o: de-emphasis memory                      */
-    float *tbe_premph,                  /* i/o: pre-emphasis memory                     */
-    float *lpc_shb_sf,                  /* i  : LP coefficients                         */
-    float *shb_ener_sf,                 /* i  : SHB subframe energies                   */
-    float *shb_res_gshape,              /* i  : SHB LP residual gain shape              */
-    float *shb_res,                     /* i  : SHB residual used in encoder only       */
-    int16_t *vf_ind,                    /* i/o: Mixing factor index                     */
-    const float formant_fac,            /* i  : Formant sharpening factor [0..1]        */
-    float fb_state_lpc_syn[],           /* i/o: memory                                  */
-    float *fb_tbe_demph,                /* i/o: fb de-emphasis memory                   */
-    const int32_t total_brate,          /* i  : overall bitrate                         */
-    const int16_t prev_bfi,             /* i  : previous frame was lost flag            */
-    const int16_t element_mode,         /* i  : element mode                            */
-    const int16_t flag_ACELP16k,        /* i  : ACELP@16kHz flag                        */
-    float *nlExc16k,                    /* i/o: NL exc for IC-BWE                       */
-    float *mixExc16k,                   /* i/o: exc spreading for IC-BWE                */
-    const int32_t extl_brate,           /* i  : TD BWE bitrate                          */
-    const int16_t MSFlag,               /* i  : Multi-source flag                       */
-    float EnvSHBres_4k[],               /* i/o: TD envelope of the SHB residual signal  */
-    float *prev_pow_exc16kWhtnd,        /* i/o: power of the LB excitation signal in the previous frame */
-    float *prev_mix_factor,             /* i/o: mixing factor in the previous frame     */
-    float *Env_error,                   /* o  : error in SHB residual envelope modelling*/
-    float Env_error_part[]              /* o  : per-segment error in SHB residual envelope modelling */
-);
-
-void GenSHBSynth(
-    const float *shb_target_speech,    /* i  : input synthesized speech                */
-    float *shb_syn_speech_32k,         /* o  : output highband component               */
-    float Hilbert_Mem[],               /* i/o: memory                                  */
-    float state_lsyn_filt_shb_local[], /* i/o: memory                                  */
-    const int16_t L_frame,             /* i  : ACELP Frame length                      */
-    int16_t *syn_dm_phase );
-
-void ScaleShapedSHB(
-    const int16_t length,   /* i  : SHB overlap length                      */
-    float *synSHB,          /* i/o: synthesized shb signal                  */
-    float *overlap,         /* i/o: buffer for overlap-add                  */
-    const float *subgain,   /* i  : subframe gain                           */
-    const float frame_gain, /* i  : frame gain                              */
-    const float *win,       /* i  : window                                  */
-    const float *subwin     /* i  : subframes window                        */
-);
-
-void Interpolate_allpass_steep(
-    const float *in, /* i  : input array of size N                   */
-    float *mem,      /* i/o: memory                                  */
-    const int16_t N, /* i  : number of input samples                 */
-    float *out       /* o  : output array of size 2*N                */
-);
-
-void Decimate_allpass_steep(
-    const float *in, /* i  : input array of size N                   */
-    float *mem,      /* i/o: memory                                  */
-    const int16_t N, /* i  : number of input samples                 */
-    float *out       /* o  : output array of size N/2                */
-);
-
-void interpolate_3_over_2_allpass(
-    const float *input, /* i  : input signal                            */
-    const int16_t len,  /* i  : number of input samples                 */
-    float *out,         /* o  : output signal                           */
-    float *mem          /* i/o: memory                                  */
-);
-
-void decimate_2_over_3_allpass(
-    const float *input, /* i  : input signal                            */
-    const int16_t len,  /* i  : number of input samples                 */
-    float *out,         /* o  : output signal                           */
-    float *mem,         /* i/o: memory                                  */
-    float *lp_mem );
-
-void interpolate_3_over_1_allpass(
-    const float *input, /* i  : input signal                            */
-    const int16_t len,  /* i  : number of input samples                 */
-    float *out,         /* o  : output signal                           */
-    float *mem          /* i/o: memory                                  */
-);
-
-void InitSWBencBuffer(
-    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle                      */
-);
-
-void InitSWBencBufferStates(
-    TD_BWE_ENC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                   */
-    float *shb_speech          /* o  : SHB target signal (6-14kHz) at 16kHz */
-);
-
-void swb_tbe_enc(
-    Encoder_State *st,                    /* i/o: encoder state structure                 */
-    STEREO_ICBWE_ENC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure                  */
-    const float *new_speech,              /* i  : original input signal                   */
-    const float *bwe_exc_extended,        /* i  : bandwidth extended exciatation          */
-    const float voice_factors[],          /* i  : voicing factors                         */
-    float *White_exc16k,                  /* o  : shaped white excitation for the FB TBE  */
-    const float pitch_buf[]               /* i  : pitch for each subframe                 */
-);
-
-void swb_tbe_dec(
-    Decoder_State *st,                    /* i/o: decoder state structure                 */
-    STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure                  */
-    const float *bwe_exc_extended,        /* i  : bandwidth extended exciatation          */
-    const float voice_factors[],          /* i  : voicing factors                         */
-    const float old_syn_12k8_16k[],       /* i  : low band synthesis at 12.8kHz or 16kHz  */
-    float *White_exc16k,                  /* o  : shaped white excitation for the FB TBE  */
-    float *synth,                         /* i/o: ACELP core synthesis/final synthesis    */
-    float *pitch_buf );
-
-void flip_and_downmix_generic(
-    float input[],                      /* i  : input spectrum                          */
-    float output[],                     /* o  : output  spectrum                        */
-    const int16_t length,               /* i  : length of spectra                       */
-    float mem1_ext[HILBERT_ORDER1],     /* i/o: Hilbert filter memory                   */
-    float mem2_ext[2 * HILBERT_ORDER2], /* i/o: memory                                  */
-    float mem3_ext[2 * HILBERT_ORDER2], /* i/o: memory                                  */
-    int16_t *phase_state                /* i/o: Phase state in case frequency isn't multiple of 50 Hz */
-);
-void flip_and_downmix_generic_fx_32(
-    Word32 input[],                      /* i : input spectrum Qx*/
-    Word32 output[],                     /* o : output spectrum Qx*/
-    const Word16 length,                 /* i : length of spectra */
-    Word32 mem1_ext[HILBERT_ORDER1],     /* i/o: memory Qx*/
-    Word32 mem2_ext[2 * HILBERT_ORDER2], /* i/o: memory Qx*/
-    Word32 mem3_ext[2 * HILBERT_ORDER2], /* i/o: memory Qx*/
-    Word16 *phase_state                  /* i/o: Phase state in case frequency isn't multiple of 50 Hz */
-);
-void non_linearity(
-    const float input[],          /* i  : input signal                            */
-    float output[],               /* i  : output signal                           */
-    float old_bwe_exc_extended[], /* i/o: memory bugffer                          */
-    const int16_t length,         /* i  : input length                            */
-    float *prev_scale,            /* i/o: memory                                  */
-    const int16_t coder_type,     /* i  : Coder Type                              */
-    const float *voice_factors,   /* i  : Voice Factors                           */
-    const int16_t L_frame         /* i  : ACELP frame length                      */
-);
-
-void interp_code_5over2(
-    const float inp_code[],  /* i  :  input vector                           */
-    float interp_code[],     /* o  :  output vector                          */
-    const int16_t inp_length /* i  :  length of the input vector             */
-);
-
-void interp_code_4over2(
-    const float inp_code[],  /* i  :  input vector                           */
-    float interp_code[],     /* o  :  output vector                          */
-    const int16_t inp_length /* i  :  length of the input vector             */
-);
-
-void flip_spectrum_and_decimby4(
-    const float input[],    /* i  : input spectrum                          */
-    float output[],         /* o  : output  spectrum                        */
-    const int16_t length,   /* i  : vector length                           */
-    float mem1[],           /* i/o: memory                                  */
-    float mem2[],           /* i/o: memory                                  */
-    const int16_t ramp_flag /* i  : flag to trigger slow ramp-up of output  */
-);
-
-void GenShapedWBExcitation(
-    float *excSHB,                   /* o  : synthesized shaped shb exctiation      */
-    const float *lpc_shb,            /* i  : lpc coefficients                       */
-    float *exc4kWhtnd,               /* o  : whitened synthesized shb excitation    */
-    float *mem_csfilt,               /* i/o: memory                                 */
-    float *mem_genSHBexc_filt_down1, /* i/o: memory                                 */
-    float *mem_genSHBexc_filt_down2, /* i/o: memory                                 */
-    float *mem_genSHBexc_filt_down3, /* i/o: memory                                 */
-    float *state_lpc_syn,            /* i/o: memory                                 */
-    const int16_t coder_type,        /* i  : coding type                            */
-    const float *bwe_exc_extended,   /* i  : bandwidth extended exciatation         */
-    int16_t bwe_seed[],              /* i/o: random number generator seed           */
-    const float voice_factors[],     /* i  : voicing factor                         */
-    const int16_t uv_flag,           /* i  : unvoiced flag                          */
-    const int16_t igf_flag );
-
-void GenWBSynth(
-    const float *input_synspeech, /* i  : input synthesized speech                */
-    float *shb_syn_speech_16k,    /* o  : output highband compnent                */
-    float *state_lsyn_filt_shb1,  /* i/o: memory                                  */
-    float *state_lsyn_filt_shb2   /* i/o: memory                                  */
-);
-
-void wb_tbe_enc(
-    Encoder_State *st,             /* i/o: encoder state structure                */
-    const float *hb_speech,        /* i  : HB target signal (6-8kHz) at 16kHz     */
-    const float *bwe_exc_extended, /* i  : bandwidth extended exciatation         */
-    const float pitch_buf[],       /* i  : pitch for each subframe                */
-    const float voicing[]          /* o  : OL maximum normalized correlation      */
-);
-
-void wb_tbe_dec(
-    Decoder_State *st,             /* i/o: decoder state structure                 */
-    const float *bwe_exc_extended, /* i  : bandwidth extended exciatation          */
-    const float voice_factors[],   /* i  : voicing factors                         */
-    float *synth                   /* i/o: ACELP core synthesis/final synthesis    */
-);
-
-void tbe_write_bitstream(
-    Encoder_State *st /* i/o: encoder state structure                 */
-);
-
-void tbe_read_bitstream(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-void GenTransition(
-    TD_BWE_DEC_HANDLE hBWE_TD,  /* i/o: TD BWE data handle                      */
-    float *outputHB,            /* o  : synthesized HB transitions signal       */
-    const int32_t output_Fs,    /* i  : output sampling rate                    */
-    const int16_t element_mode, /* i  : element mode                            */
-    const int16_t L_frame,      /* i  : ACELP frame length                      */
-    const int16_t rf_flag,      /* i  : RF flag                                 */
-    const int32_t total_brate   /* i  : total bitrate                           */
-);
-
-
-void GenTransition_fixed(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                   */
-    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal : Q11 */
-    const Word32 output_Fs,    /* i  : output sampling rate              : Q0  */
-    const Word16 element_mode, /* i  : element mode                      : Q0  */
-    const Word16 L_frame,      /* i  : ACELP frame length                : Q0  */
-    const Word16 rf_flag,      /* i  : RF flag                           : Q0  */
-    const Word32 total_brate,  /* i  : total bitrate                     : Q0  */
-    const Word16 prev_Qx );
-
-void GenTransition_WB(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                      */
-    float *outputHB,           /* o  : synthesized HB transitions signal       */
-    const int32_t output_Fs    /* i  : output sampling rate                    */
-);
-
-void GenTransition_WB_fixed(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                        */
-    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal  : Q11  */
-    const Word32 output_Fs     /* i  : output sampling rate                      */
-);
-
-void td_bwe_dec_init(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                      */
-    const int16_t extl,        /* i  : BWE extension layer                     */
-    const int32_t output_Fs    /* i  : output sampling rate                    */
-);
-
-void TBEreset_enc(
-    TD_BWE_ENC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                      */
-    const int16_t last_core,   /* i  : last core                               */
-    const int16_t bwidth       /* i  : audio bandwidth                         */
-);
-
-void TBEreset_dec(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-/*! r: TBE bit consumption per frame */
-int16_t get_tbe_bits(
-    const int32_t total_brate, /* i  : overall bitrate                         */
-    const int16_t bwidth,      /* i  : audio bandwidth                         */
-    const int16_t rf_mode      /* i  : channel aware mode                      */
-);
-
-void fb_tbe_enc(
-    Encoder_State *st,       /* i/o: encoder state structure                 */
-    const float new_input[], /* i  : input speech at 48 kHz sample rate      */
-    const float fb_exc[]     /* i  : FB excitation from the SWB part         */
-);
-
-void fb_tbe_dec(
-    Decoder_State *st,         /* i/o: decoder state structure                 */
-    const float fb_exc[],      /* i  : FB excitation from the SWB part         */
-    float *hb_synth,           /* i/o: high-band synthesis                     */
-    float *fb_synth_ref,       /* o  : high-band synthesis 16-20 kHz           */
-    const int16_t output_frame /* i  : output frame length                     */
-);
-
-void calc_tilt_bwe(
-    const float *sp, /* i  : input signal                            */
-    float *tilt,     /* o  : signal tilt                             */
-    const int16_t N  /* i  : signal length                           */
-);
-
-void fd_bwe_enc_init(
-    FD_BWE_ENC_HANDLE hBWE_FD /* i/o: FD BWE data handle                      */
-);
-
-void swb_pre_proc(
-    Encoder_State *st,                                         /* i/o: encoder state structure                 */
-    float *new_swb_speech,                                     /* o  : original input signal at 32kHz          */
-    float *shb_speech,                                         /* o  : SHB target signal (6-14kHz) at 16kHz    */
-    float realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i  : real buffer                             */
-    float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i  : imag buffer                             */
-    CPE_ENC_HANDLE hCPE                                        /* i/o: CPE encoder structure                   */
-);
-
-void wb_pre_proc(
-    Encoder_State *st,               /* i/o: encoder state structure                 */
-    const int16_t last_element_mode, /* i  : last element mode                       */
-    const float *new_inp_resamp16k,  /* i  : original input signal                   */
-    float *hb_speech                 /* o  : HB target signal (6-8kHz) at 16kHz      */
-);
-
-void wb_bwe_enc(
-    Encoder_State *st,         /* i/o: encoder state structure                 */
-    const float *new_wb_speech /* i  : original input signal at 16kHz          */
-);
-
-void wb_bwe_dec_flt(
-    Decoder_State *st,               /* i/o: decoder state structure                 */
-    const float output[],            /* i  : synthesis @internal Fs                  */
-    float *synth,                    /* i/o: ACELP core synthesis/final synthesis    */
-    float *hb_synth,                 /* o  : SHB synthesis/final synthesis           */
-    const int16_t use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo     */
-    const int16_t output_frame,      /* i  : frame length                            */
-    const float voice_factors[],     /* i  : voicing factors                         */
-    const float pitch_buf[]          /* i  : pitch buffer                            */
-);
-
-void swb_bwe_enc(
-    Encoder_State *st,               /* i/o: encoder state structure                 */
-    const int16_t last_element_mode, /* i  : last element mode                       */
-    const float *old_input_12k8,     /* i  : input signal @12.8kHz for SWB BWE       */
-    const float *old_input_16k,      /* i  : input signal @16kHz for SWB BWE         */
-    const float *old_syn_12k8_16k,   /* i  : ACELP core synthesis at 12.8kHz or 16kHz*/
-    const float *new_swb_speech,     /* i  : original input signal at 32kHz          */
-    const float *shb_speech          /* i  : SHB target signal (6-14kHz) at 16kHz    */
-);
-
-void swb_bwe_enc_hr(
-    Encoder_State *st,         /* i/o: encoder state structure                 */
-    const float *new_input,    /* i  : input signal                            */
-    const int16_t input_frame, /* i  : frame length                            */
-    const int16_t unbits       /* i  : number of core unused bits              */
-);
-
-void fd_bwe_dec_init_flt(
-    FD_BWE_DEC_HANDLE hBWE_FD /* i/o: FD BWE data handle                      */
-);
-
-void swb_bwe_dec_flt(
-    Decoder_State *st,               /* i/o: decoder state structure                 */
-    const float output[],            /* i  : synthesis @internal Fs                  */
-    const float *synth,              /* i  : ACELP core synthesis/final synthesis    */
-    float *hb_synth,                 /* o  : SHB synthesis/final synthesis           */
-    const int16_t use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo     */
-    const int16_t output_frame       /* i  : frame length                            */
-);
-
-void hr_bwe_dec_init_flt(
-    HR_BWE_DEC_HANDLE hBWE_FD_HR /* i/o: HR BWE data handle                      */
-);
-
-void swb_bwe_dec_hr(
-    Decoder_State *st,          /* i/o: decoder state structure                 */
-    const float *syn_12k8_16k,  /* i  : ACELP core synthesis @16kHz             */
-    float *hb_synth,            /* o  : SHB synthesis                           */
-    const int16_t output_frame, /* i  : frame length                            */
-    const int16_t unbits,       /* i  : number of core unused bits              */
-    const float pitch_buf[]     /* i  : pitch buffer                            */
-);
-
-
-void calc_normal_length(
-    const int16_t core,      /* i  : core                                    */
-    const float *sp,         /* i  : input signal                            */
-    const int16_t mode,      /* i  : input mode                              */
-    const int16_t extl,      /* i  : extension layer                         */
-    int16_t *L_swb_norm,     /* o  : normalize length                        */
-    int16_t *prev_L_swb_norm /* i/o: last normalize length                   */
-);
-
-void calc_norm_envelop(
-    const float SWB_signal[],  /* i  : SWB spectrum                            */
-    float *envelope,           /* o  : normalized envelope                     */
-    const int16_t L_swb_norm,  /* i  : length of envelope                      */
-    const int16_t SWB_flength, /* i  : Length of input/output                  */
-    const int16_t st_offset    /* i  : offset                                  */
-);
-
-void time_envelop_shaping(
-    float werr[],     /* i/o: SHB synthesis                           */
-    float SWB_tenv[], /* i/o: frequency envelope                      */
-    const int16_t L   /* i  : frame length                            */
-);
-
-void time_reduce_pre_echo(
-    const float *synth,   /* i  : ACELP core synthesis                    */
-    float *error,         /* o  : SHB BWE synthesis                       */
-    float prev_td_energy, /* o  : last td energy                          */
-    const int16_t L       /* i  : subframe length                         */
-);
-
-int16_t WB_BWE_gain_pred(
-    float *WB_fenv,                /* o  : WB frequency envelopes                  */
-    const float *core_dec_freq,    /* i  : Frequency domain core decoded signal    */
-    const int16_t coder_type,      /* i  : coding type                             */
-    const int16_t prev_code_type,  /* i  : coding type of last frame               */
-    const float prev_WB_fenv,      /* i  : envelope for last frame                 */
-    const float voice_factors[],   /* i  : voicing factors                         */
-    const float pitch_buf[],       /* i  : pitch buffer                            */
-    const int32_t last_core_brate, /* i  : previous frame core bitrate             */
-    const float last_wb_bwe_ener,  /* i  : previous frame wb bwe signal energy     */
-    const int16_t last_extl,       /* i  : extl. layer for last frame              */
-    const float tilt );
-
-void WB_BWE_decoding(
-    const float *core_dec_freq, /* i  : Frequency domain core decoded signal    */
-    float *WB_fenv,             /* i  : WB frequency envelopes                  */
-    float *WB_signal,           /* o  : WB signal in MDCT domain                */
-    const int16_t WB_flength,   /* i  : Length of input/output                  */
-    const int16_t mode,         /* i  : classification for WB signal            */
-    const int16_t last_extl,    /* i  : extl. layer for last frame              */
-    float *prev_Energy,         /* i/o: energy for last frame                   */
-    float *prev_WB_fenv,        /* i/o: envelope for last frame                 */
-    int16_t *prev_L_wb_norm,    /* i/o: length for last frame wb norm           */
-    const int16_t extl,         /* i  : extension layer                         */
-    const int16_t coder_type,   /* i  : coding type                             */
-    const int32_t total_brate,  /* i  : core layer bitrate                      */
-    int16_t *Seed,              /* i/o: random generator seed                   */
-    int16_t *prev_flag,         /* i/o: attenu flag of last frame               */
-    int16_t prev_coder_type     /* i  : coding type of last frame               */
-);
-
-void SWB_BWE_decoding(
-    const float *core_dec_freq, /* i  : Frequency domain core decoded signal    */
-    float *SWB_fenv,            /* i/o: SWB frequency envelopes                 */
-    float *SWB_signal,          /* o  : SWB signal in MDCT domain               */
-    const int16_t SWB_flength,  /* i  : Length of input/output                  */
-    const int16_t mode,         /* i  : classification for SWB signal           */
-    int16_t *frica_flag,        /* o  : fricative signal flag                   */
-    float *prev_Energy,         /* i/o: energy for last frame                   */
-    float *prev_SWB_fenv,       /* i/o: envelope for last frame                 */
-    int16_t *prev_L_swb_norm,   /* i/o: length for last frame wb norm           */
-    const float tilt_nb,        /* i  : tilt of synthesis wb signal             */
-    int16_t *Seed,              /* i/o: random generator seed                   */
-    const int16_t st_offset,    /* i  : offset value due to different core      */
-    float *prev_weight,         /* i/o: excitation weight value of last frame   */
-    const int16_t extl,         /* i  : extension layer                         */
-    const int16_t last_extl     /* i  : extension layer of last frame           */
-);
-
-void CNG_reset_enc(
-    Encoder_State *st,    /* i/o: encoder state structure                 */
-    float *pitch_buf,     /* o  : floating pitch for each subframe        */
-    float *voice_factors, /* o  : voicing factors                         */
-    int16_t VBR_cng_reset_flag );
-
-/*! r: stability flag */
-uint16_t a2rc(
-    const float *a,        /* i  : LPC coefficients                                */
-    float *refl,           /* o  : Reflection co-efficients                        */
-    const int16_t lpcorder /* i  : LPC order                                       */
-);
-
-
-void analy_sp(
-    const int16_t element_mode, /* i  : element mode                                     */
-    CPE_ENC_HANDLE hCPE,        /* i/o: CPE encoder structure                            */
-    const int32_t input_Fs,     /* i  : input sampling rate                              */
-    float *speech,              /* i  : speech buffer                                    */
-    float *Bin_E,               /* o  : per bin log energy spectrum                      */
-    float *Bin_E_old,           /* o  : per bin log energy spectrum for mid-frame        */
-    float *fr_bands,            /* o  : per band energy spectrum (2 analyses)            */
-    float lf_E[],               /* o  : per bin E for first VOIC_BINS bins (without DC)  */
-    float *Etot,                /* o  : total input energy                               */
-    const int16_t min_band,     /* i  : minimum critical band                            */
-    const int16_t max_band,     /* i  : maximum critical band                            */
-    float *band_ener,           /* o  : energy in critical frequency bands without minimum noise floor E_MIN */
-    float *PS,                  /* o  : Per bin energy spectrum                          */
-    float *fft_buff             /* o  : FFT coefficients                                 */
-);
-
-void CNG_enc(
-    Encoder_State *st,      /* i/o: State structure                                     */
-    float Aq[],             /* o  : LP coefficients                                     */
-    const float *speech,    /* i  : pointer to current frame input speech buffer        */
-    float enr,              /* i  : frame energy output from Levinson recursion         */
-    const float *lsp_mid,   /* i  : mid frame LSPs                                      */
-    float *lsp_new,         /* i/o: current frame LSPs                                  */
-    float *lsf_new,         /* i/o: current frame LSFs                                  */
-    int16_t *allow_cn_step, /* o  : allow CN step                                       */
-    float *q_env,
-    int16_t *sid_bw );
-
-void swb_CNG_enc(
-    Encoder_State *st,        /* i/o: State structure                                     */
-    const float *shb_speech,  /* i  : SHB target signal (6-14kHz) at 16kHz                */
-    const float *syn_12k8_16k /* i  : ACELP core synthesis at 12.8kHz or 16kHz            */
-);
-
-void lsf_enc(
-    Encoder_State *st,               /* i/o: state structure                            */
-    float *lsf_new,                  /* o  : quantized LSF vector                       */
-    float *lsp_new,                  /* i/o: LSP vector to quantize/quantized           */
-    float *lsp_mid,                  /* i  : mid-frame LSP vector                       */
-    float *Aq,                       /* o  : quantized A(z) for 4 subframes             */
-    const int16_t tdm_low_rate_mode, /* i  : secondary channel low rate mode flag       */
-    const int16_t GSC_IVAS_mode,     /* i  : GSC IVAS mode                              */
-    const float tdm_lsfQ_PCh[M]      /* i  : Q LSFs for primary channel                 */
-);
-
-void isf_enc_amr_wb(
-    Encoder_State *st, /* i/o: state structure                                     */
-    float *isf_new,    /* o  : quantized ISF vector                                */
-    float *isp_new,    /* i/o: ISP vector to quantize/quantized                    */
-    float *Aq          /* o  : quantized A(z) for 4 subframes                      */
-);
-
-void find_targets(
-    const float *speech,   /* i  : pointer to the speech frame                         */
-    const float *mem_syn,  /* i  : memory of the synthesis filter                      */
-    const int16_t i_subfr, /* i  : subframe index                                      */
-    float *mem_w0,         /* i/o: weighting filter denominator memory                 */
-    const float *p_Aq,     /* i  : interpolated quantized A(z) filter                  */
-    const float *res,      /* i  : residual signal                                     */
-    const int16_t L_subfr, /* i  : length of vectors for gain quantization             */
-    const float *Ap,       /* i  : unquantized A(z) filter with bandwidth expansion    */
-    const float tilt_fac,  /* i  : tilt factor                                         */
-    float *xn,             /* o  : Close-loop Pitch search target vector               */
-    float *cn,             /* o  : target vector in residual domain                    */
-    float *h1              /* o  : impulse response of weighted synthesis filter       */
-);
-
-Word16 quant_2p_2N1_fx(                    /* o:  return (2*N)+1 bits         */
-                        const Word16 pos1, /* i:  position of the pulse 1     */
-                        const Word16 pos2, /* i:  position of the pulse 2     */
-                        const Word16 N     /* i:  number of bits FOR position */
-);
-void find_tilt(
-    const float fr_bands[],   /* i  : energy in frequency bands                           */
-    const float bckr[],       /* i  : per band background noise energy estimate           */
-    float ee[2],              /* o  : lf/hf E ration for present frame                    */
-    const int16_t pitch[3],   /* i  : open loop pitch values for 3 half-frames            */
-    const float voicing[3],   /* i  : normalized correlation for 3 half-frames            */
-    const float *lf_E,        /* i  : per bin energy  for low frequencies                 */
-    const float corr_shift,   /* i  : normalized correlation correction                   */
-    const int16_t bwidth,     /* i  : input signal bandwidth                              */
-    const int16_t max_band,   /* i  : maximum critical band                               */
-    float hp_E[],             /* o  : energy in HF                                        */
-    const int16_t codec_mode, /* i  : Mode 1 or 2                                         */
-    float *bckr_tilt_lt,      /* i/o: lf/hf E ratio of background noise                   */
-    int16_t Opt_vbr_mode );
-
-void init_gp_clip(
-    float mem[] /* o  : memory of gain of pitch clipping algorithm          */
-);
-
-int16_t gp_clip(
-    const int16_t element_mode, /* i  : element mode                                        */
-    const int32_t core_brate,   /* i  : core bitrate                                        */
-    const float *voicing,       /* i  : normalized correlations (from OL pitch)             */
-    const int16_t i_subfr,      /* i  : subframe index                                      */
-    const int16_t coder_type,   /* i  : coding type                                         */
-    const float xn[],           /* i  : target vector                                       */
-    float mem[]                 /* i/o: memory of gain of pitch clipping algorithm          */
-);
-
-void gp_clip_test_lsf(
-    const int16_t element_mode, /* i  : element mode                                        */
-    const int32_t core_brate,   /* i  : core bitrate                                        */
-    const float lsf[],          /* i  : LSF vector                                          */
-    float mem[],                /* i/o: memory of gain of pitch clipping algorithm          */
-    const int16_t Opt_AMR_WB    /* i  : flag indicating AMR-WB IO mode                      */
-);
-
-void gp_clip_test_gain_pit(
-    const int16_t element_mode, /* i  : element mode                                        */
-    const int32_t core_brate,   /* i  : core bitrate                                        */
-    const float gain_pit,       /* i  :   gain of quantized pitch                           */
-    float mem[]                 /* i/o: memory of gain of pitch clipping algorithm          */
-);
-
-void analy_lp(
-    const float speech[],           /* i  : pointer to the denoised speech frame                */
-    const int16_t L_frame,          /* i  : length of the frame                                 */
-    const int16_t L_look,           /* i  : look-ahead length                                   */
-    float *ener,                    /* o  : residual signal energy                              */
-    float A[],                      /* o  : A(z) filter coefficients                            */
-    float epsP[],                   /* o  : LP analysis residual energies for each iteration    */
-    float lsp_new[],                /* o  : current frame ISPs                                  */
-    float lsp_mid[],                /* o  : current mid-frame ISPs                              */
-    float lsp_old[],                /* i/o: previous frame unquantized ISPs                     */
-    const int16_t Top[2],           /* i  : open loop pitch lag                                 */
-    const float Tnc[2],             /* i  : open loop pitch gain                                */
-    const int32_t sr_core,          /* i  : internal sampling rate                              */
-    const int16_t sec_chan_low_rate /* i  : TD secondary channel flag                           */
-);
-
-void analy_lp_AMR_WB(
-    const float speech[], /* i  : pointer to the speech frame                         */
-    float *ener,          /* o  : residual energy from Levinson-Durbin                */
-    float A[],            /* o  : A(z) filter coefficients                            */
-    float epsP[],         /* o  : LP analysis residual energies for each iteration    */
-    float isp_new[],      /* o  : current frame ISPs                                  */
-    float isp_old[],      /* i/o: previous frame unquantized ISPs                     */
-    float isf_new[],      /* o  : current frame ISFs                                  */
-    const int16_t Top,    /* i  : open loop pitch lag                                 */
-    const float Tnc       /* i  : open loop pitch gain                                */
-);
-
-void noise_est_init(
-    NOISE_EST_HANDLE hNoiseEst /* i/o: Noise estimation handle                             */
-);
-
-void speech_music_clas_init(
-    SP_MUS_CLAS_HANDLE hSpMusClas /* i/o: speech/music classifier handle                      */
-);
-
-void long_enr(
-    Encoder_State *st,                  /* i/o: encoder state structure                  */
-    const float Etot,                   /* i  : total channel energy                     */
-    const int16_t localVAD_HE_SAD,      /* i  : HE-SAD flag without hangover             */
-    const int16_t high_lpn_flag,        /* i  : sp/mus LPN flag                          */
-    FRONT_VAD_ENC_HANDLE hFrontVad[],   /* i/o: front-VAD handles                        */
-    const int16_t n_chan,               /* i  : number of channels                       */
-    const int16_t localVAD_HE_SAD_LR[], /* i  : HE-SAD flag without hangover LR channels */
-    const float Etot_LR[]               /* i  : total channel energy LR channels         */
-);
-
-void noise_est_pre(
-    const float Etot,               /* i  : Energy of current frame                             */
-    const int16_t ini_frame,        /* i  : Frame number (init)                                 */
-    NOISE_EST_HANDLE hNoiseEst,     /* i/o: Noise estimation data handle                        */
-    const int16_t idchan,           /* i  : channel ID                                          */
-    const int16_t element_mode,     /* i  : element mode                                        */
-    const int16_t last_element_mode /* i  : last element mode                                   */
-);
-
-void noise_est_down(
-    const float fr_bands[], /* i  : per band input energy (contains 2 vectors)          */
-    float bckr[],           /* i/o: per band background noise energy estimate           */
-    float tmpN[],           /* o  : temporary noise update                              */
-    float enr[],            /* o  : averaged energy over both subframes                 */
-    const int16_t min_band, /* i  : minimum critical band                               */
-    const int16_t max_band, /* i  : maximum critical band                               */
-    float *totalNoise,      /* o  : noise estimate over all critical bands              */
-    const float Etot,       /* i  : Energy of current frame                             */
-    float *Etot_last,       /* i/o: Energy of last frame                                */
-    float *Etot_v_h2        /* i/o: Energy variaions of noise frames                    */
-);
-
-void noise_est(
-    Encoder_State *st,                    /* i/o: encoder state structure                             */
-    const int16_t old_pitch1,             /* i  : previous frame OL pitch[1]                          */
-    const float tmpN[],                   /* i  : temporary noise update                              */
-    const float *epsP,                    /* i  : LP prediction error energies                        */
-    const float Etot,                     /* i  : total channel E                                     */
-    const float relE,                     /* i  : relative frame energy                               */
-    const float corr_shift,               /* i  : normalized correlation correction                   */
-    const float enr[],                    /* i  : averaged energy over both subframes                 */
-    float fr_bands[],                     /* i  : spectrum per critical bands of the current frame    */
-    float *cor_map_sum,                   /* o  : sum of correlation map from mult-harm analysis      */
-    float *ncharX,                        /* o  : noise character for sp/mus classifier               */
-    float *sp_div,                        /* o  : soectral diversity feature                          */
-    float *non_staX,                      /* o  : non-stationarity for sp/mus classifier              */
-    int16_t *loc_harm,                    /* o  : multi-harmonicity flag for UV classifier            */
-    const float *lf_E,                    /* i  : per bin energy  for low frequencies                 */
-    int16_t *st_harm_cor_cnt,             /* i  : 1st harm correlation timer                          */
-    const float Etot_l_lp,                /* i  : Smoothed low energy                                 */
-    float *sp_floor,                      /* o  : noise floor estimate                                */
-    float S_map[],                        /* o  : short-term correlation map                          */
-    STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                         */
-    FRONT_VAD_ENC_HANDLE hFrontVad,       /* i/o: front-VAD handle                                    */
-    const int16_t ini_frame               /* i  : Frame number (init)                                 */
-);
-
-void vad_param_updt(
-    Encoder_State *st,                /* i/o: encoder state structure                             */
-    const float corr_shift,           /* i  : correlation shift                                   */
-    const float corr_shiftR,          /* i  : correlation shift right channel                     */
-    const float A[],                  /* i  : A(z) unquantized for the 4 subframes                */
-    const int16_t old_pitch1,         /* i  : previous frame OL pitch[1]                          */
-    FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles                                   */
-    const int16_t n_channels          /* i  : number of channels                                  */
-);
-
-
-void lp_gain_updt(
-    const int16_t i_subfr,      /* i  :  subframe number                                */
-    const float gain_pit,       /* i  : Decoded gain pitch                              */
-    const float norm_gain_code, /* i  : Normalised gain code                            */
-    float *lp_gainp,            /* i/o: LP-filtered pitch gain(FEC)                     */
-    float *lp_gainc,            /* i/o: LP-filtered code gain (FEC)                     */
-    const int16_t L_frame       /* i  : length of the frame                             */
-);
-
-void GSC_enc_init(
-    GSC_ENC_HANDLE hGSCEnc /* i/o: GSC data handle                                  */
-);
-
-
-/*! r: index of the last band where pitch contribution is significant */
-int16_t Pit_exc_contribution_len(
-    Encoder_State *st,    /* i/o: state structure                                 */
-    const float *dct_res, /* i  : DCT of residual                                 */
-    float *dct_pitex,     /* i/o: DCT of pitch contribution                       */
-    float *pitch_buf,     /* i/o: Pitch per subframe                              */
-    int16_t *hangover     /* i  : Hangover for the time contribution switching    */
-);
-
-int16_t stab_est(
-    float etot,               /* i  : Total energy of the current frame                   */
-    float *lt_diff_etot,      /* i/o: Long term total energy variation                    */
-    float *mem_etot,          /* i/o: Total energy memory                                 */
-    int16_t *nb_thr_3,        /* i/o: Number of consecutives frames of level 3            */
-    int16_t *nb_thr_1,        /* i/o: Number of consecutives frames of level 1            */
-    float *thresh,            /* i/o: Detection thresold                                  */
-    int16_t *last_music_flag, /* i/o: Previous music detection ouptut                     */
-    const int16_t vad_flag    /* i  : VAD flag                                            */
-);
-
-float gsc_gainQ(
-    BSTR_ENC_HANDLE hBstr,       /* i/o: encoder bitstream handle                            */
-    const int16_t element_mode,  /* i  : element mode                                        */
-    const int16_t idchan,        /* i  : channel ID                                          */
-    const float y_gain4[],       /* i  : gain per band                                       */
-    float y_gainQ[],             /* o  : quantized gain per band                             */
-    const int32_t core_brate,    /* i  : Core rate                                           */
-    const int16_t coder_type,    /* i  : coding type                                         */
-    const int16_t bwidth,        /* i  : input signal bandwidth                              */
-    const int16_t L_frame,       /* i  : frame length                                        */
-    const int16_t tdm_LRTD_flag, /* i  : LRTD stereo mode flag                               */
-    const int32_t core_brate_inp /* i  : true core brate                                     */
-);
-
-void Comp_and_apply_gain(
-    float exc_diffQ[],      /* i/o: gain per band                                       */
-    float Ener_per_bd_iQ[], /* o  : Quant Ener per band                                 */
-    float Ener_per_bd_yQ[], /* o  : Ener per band for quantize y                        */
-    int16_t Mbands_gn,      /* i  : number of bands                                     */
-    const int16_t ReUseGain /* i  : Reuse the gain in Ener_per_bd_yQ                    */
-);
-
-void bands_and_bit_alloc_ivas_fx(
-    const Word16 cor_strong_limit, /* i  : HF correlation                                        */
-    const Word16 noise_lev,        /* i  : dwn scaling factor                                    */
-    const Word32 core_brate,       /* i  : core bit rate                                         */
-    const Word16 Diff_len,         /* i  : Lenght of the difference signal (before pure spectral)*/
-    const Word16 bits_used,        /* i  : Number of bit used before frequency Q                 */
-    Word16 *bit,                   /* i/o: Number of bit allowed for frequency quantization      */
-    const Word16 *Ener_per_bd_iQ,  /* i/o: Quantized energy vector                               */
-    Word16 *max_ener_band,         /* o  : Sorted order                                          */
-    Word16 *out_bits_per_bands,    /* i/o: Number of bit allowed per allowed subband        Q3   */
-    Word16 *nb_subbands,           /* o  : Number of subband allowed                             */
-    const Word16 *exc_diff,        /* i  : Difference signal to quantize (encoder side only)     */
-    Word16 *concat_in,             /* o  : Concatened PVQ's input vector (encoder side only)     */
-    Word16 *pvq_len,               /* o  : Number of bin covered with the PVQ                    */
-    const Word16 coder_type,       /* i  : coding type                                           */
-    const Word16 bwidth,           /* i  : input signal bandwidth                                */
-    const Word16 GSC_noisy_speech, /* i  : GSC noisy speech flag                                 */
-    const Word16 L_frame,          /* i  : frame length                                          */
-    const Word16 element_mode,     /* i  : element mode                                          */
-    const Word16 GSC_IVAS_mode     /* i  : GSC IVAS mode                                         */
-);
-
-void GSC_dec_init_ivas(
-    GSC_DEC_HANDLE hGSCDec /* i/o: GSC data handle                         */
-);
-
-void decod_audio(
-    Decoder_State *st,                  /* i/o: decoder static memory                     */
-    float dct_epit[],                   /* o  : GSC excitation in DCT domain              */
-    const float *Aq,                    /* i  : LP filter coefficient                     */
-    float *tmp_noise,                   /* o  : long term temporary noise energy          */
-    float *pitch_buf,                   /* o  : floating pitch values for each subframe   */
-    float *voice_factors,               /* o  : voicing factors                           */
-    float *exc_dct_in,                  /* i/o: adapt. excitation exc                     */
-    float *exc2,                        /* i/o: adapt. excitation/total exc               */
-    float *bwe_exc,                     /* o  : excitation for SWB TBE                    */
-    float *lsf_new,                     /* i  : current frame ISF vector                  */
-    float *gain_buf,                    /* o  : floating pitch gain for each subframe     */
-    const int16_t tdm_lp_reuse_flag,    /* i  : LPC reuse flag                            */
-    const int16_t tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag      */
-    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
-    const float tdm_Pri_pitch_buf[]     /* i  : primary channel pitch buffer              */
-);
-
-void gsc_dec(
-    Decoder_State *st,          /* i/o: State structure                           */
-    float exc_dct_in[],         /* i/o: dct of pitch-only/total excitation        */
-    const int16_t pit_band_idx, /* i  : pitch band index                          */
-    const int16_t Diff_len,     /* i  :  */
-    const int16_t bits_used,    /* i  : total number of bits used                 */
-    const int16_t nb_subfr,     /* i  : Number of subframe considered             */
-    const int16_t coder_type,   /* i  : coding type                               */
-    int16_t *last_bin,          /* i  : last bin of bit allocation                */
-    const float *lsf_new,       /* i  : ISFs at the end of the frame              */
-    float *exc_wo_nf,           /* o  : excitation (in f domain) without noisefill*/
-    float *tmp_noise            /* o  : long-term noise energy                    */
-);
-
-void dec_pit_exc(
-    Decoder_State *st,                  /* i/o: decoder static memory                     */
-    const int16_t L_frame,              /* i  : length of the frame                       */
-    const float *Aq,                    /* i  : LP filter coefficient                     */
-    const float Es_pred,                /* i  : predicted scaled innov. energy            */
-    float *pitch_buf,                   /* o  : floating pitch values for each subframe   */
-    float *code,                        /* o  : innovation                                */
-    float *exc,                         /* i/o: adapt. excitation exc                     */
-    const int16_t nb_subfr,             /* i  : Number of subframe considered             */
-    float *gain_buf,                    /* o  : floating pitch gain for each subframe     */
-    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
-    const float tdm_Pri_pitch_buf[]     /* i  : primary channel pitch buffer              */
-);
-
-void music_postfilt_init_flt(
-    MUSIC_POSTFILT_HANDLE hMusicPF /* i/o: LD music postfilter handle                  */
-);
-
-void LD_music_post_filter(
-    MUSIC_POSTFILT_HANDLE hMusicPF, /* i/o: LD music postfilter handle                  */
-    const float dtc_in[],           /* i  : input synthesis                             */
-    float dtc_out[],                /* o  : output synthesis                            */
-    const int32_t core_brate,       /* i  : core bitrate                                */
-    const int16_t coder_type,       /* i  : Coder type : -1 in case of IO               */
-    const int16_t Last_coder_type   /* i  : last Coder type                             */
-);
-
-void Post_music_postP(
-    float dct_buffer_in[],  /* i/o: excitation buffer                           */
-    float exc_buffer_out[], /* o  : DCT output buffer                           */
-    float *exc2,            /* i/o: Current excitation to be overwriten         */
-    const float *mem_tmp,   /* i  : previous frame synthesis memory             */
-    float *st_mem_syn2,     /* i/o: current frame synthesis memory              */
-    const float *Aq,        /* i  : LPC filter coefficients                     */
-    float *syn              /* i/o: 12k8 synthesis                              */
-);
-
-void Prep_music_postP(
-    float exc_buffer_in[],   /* i/o: excitation buffer                           */
-    float dct_buffer_out[],  /* o  : DCT output buffer                           */
-    float filt_lfE[],        /* i/o: long term spectrum energy                   */
-    const int16_t last_core, /* i  : last core                                   */
-    const float *pitch_buf,  /* i  : current frame pitch information             */
-    float *LDm_enh_lp_gbin   /* o  : smoothed suppression gain, per bin FFT      */
-);
-
-void speech_music_classif(
-    Encoder_State *st,             /* i/o: encoder state structure                         */
-    const float *new_inp,          /* i  : new input signal                                */
-    const float *inp,              /* i  : input signal to locate attach position          */
-    const int16_t localVAD_HE_SAD, /* i  : HE-SAD flag without hangover                    */
-    const float lsp_new[M],        /* i  : LSPs in current frame                           */
-    const float cor_map_sum,       /* i  : correlation map sum (from multi-harmonic anal.) */
-    const float epsP[M + 1],       /* i  : LP prediciton error                             */
-    const float PS[],              /* i  : energy spectrum                                 */
-    const float Etot,              /* i  : total frame energy                              */
-    const float old_cor,           /* i  : max correlation from previous frame             */
-    int16_t *attack_flag,          /* o  : attack flag (GSC or TC)                         */
-    const float non_staX,          /* i  : unbound non-stationarity for sp/mus classifier  */
-    const float relE,              /* i  : relative frame energy                           */
-    int16_t *high_lpn_flag,        /* o  : sp/mus LPN flag                                 */
-    const int16_t flag_spitch      /* i  : flag to indicate very short stable pitch        */
-);
-void ivas_find_wsp_fx(
-    const Word16 L_frame,  /* i  : length of the frame                   Q0*/
-    const Word16 L_subfr,  /* i  : length of subframe                    Q0*/
-    const Word16 nb_subfr, /* i  : number of subframes                   Q0*/
-    const Word16 *A_fx,
-    /* i  : A(z) filter coefficients              */ // Q12
-    Word16 *Aw_fx,
-    /* o  : weighted A(z) filter coefficients     */ // Q12
-    const Word16 *speech_fx,
-    /* i  : pointer to the denoised speech frame  */ // Q_new
-    const Word16 tilt_fact,
-    /* i  : tilt factor                           */ // Q15
-    Word16 *wsp_fx,
-    /* o  : poitnter to the weighted speech frame */ // Q_new
-    Word16 *mem_wsp_fx,
-    /* i/o: W(Z) denominator memory               */ // Q_new
-    const Word16 gamma,
-    /* i  : weighting factor                      */ // Q15
-    const Word16 L_look                              /* i  : look-ahead                            Q0*/
-);
-
-void gain_enc_amr_wb(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: encoder bitstream handle                                        */
-    const float *xn,          /* i  : target vector                                                   */
-    const float *y1,          /* i  : zero-memory filtered adaptive excitation                        */
-    const float *y2,          /* i  : zero-memory filtered algebraic codebook excitation              */
-    const float *code,        /* i  : algebraic excitation                                            */
-    const int32_t core_brate, /* i  : core bitrate                                                    */
-    float *gain_pit,          /* i/o: Pitch gain / Quantized pitch gain                               */
-    float *gain_code,         /* o  : Quantized codebook gain                                         */
-    float *gain_inov,         /* o  : innovation gain                                                 */
-    float *norm_gain_code,    /* o  : norm. gain of the codebook excitation                           */
-    float *coeff,             /* i/o: correlations <y1,y1>, -2<xn,y1>,<y2,y2>, -2<xn,y2> and 2<y1,y2> */
-    const int16_t clip_gain,  /* i  : gain pitch clipping flag (1 = clipping)                         */
-    float *past_qua_en        /* i/o: gain quantization memory (4 words)                              */
-);
-
-void gain_enc_lbr(
-    BSTR_ENC_HANDLE hBstr,      /* i/o: encoder bitstream handle                                        */
-    const int16_t gains_mode[], /* i  : gain bits                                                       */
-    const int16_t coder_type,   /* i  : coding type                                                     */
-    const int16_t i_subfr,      /* i  : subframe index                                                  */
-    const float *xn,            /* i  : target vector                                                   */
-    const float *y1,            /* i  : zero-memory filtered adaptive excitation                        */
-    const float *y2,            /* i  : zero-memory filtered algebraic codebook excitation              */
-    const float *code,          /* i  : algebraic excitation                                            */
-    float *gain_pit,            /* o  : quantized pitch gain                                            */
-    float *gain_code,           /* o  : quantized codebook gain                                         */
-    float *gain_inov,           /* o  : gain of the innovation (used for normalization)                 */
-    float *norm_gain_code,      /* o  : norm. gain of the codebook excitation                           */
-    float *g_corr,              /* i/o: correlations <y1,y1>, -2<xn,y1>,<y2,y2>, -2<xn,y2> and 2<y1,y2> */
-    float gains_mem[],          /* i/o: pitch gain and code gain from previous subframes                */
-    const int16_t clip_gain,    /* i  : gain pitch clipping flag (1 = clipping)                         */
-    const int16_t L_subfr       /* i  : subfr Lenght                                                    */
-);
-
-void gain_enc_mless(
-    BSTR_ENC_HANDLE hBstr,      /* i/o: encoder bitstream handle                                        */
-    const int16_t gains_mode[], /* i  : gain bits                                                       */
-    const int16_t element_mode, /* i  : element mode                                                    */
-    const int16_t L_frame,      /* i  : length of the frame                                             */
-    const int16_t i_subfr,      /* i  : subframe index                                                  */
-    const int16_t tc_subfr,     /* i  : TC subframe index                                               */
-    const float *xn,            /* i  : target vector                                                   */
-    const float *y1,            /* i  : zero-memory filtered adaptive excitation                        */
-    const float *y2,            /* i  : zero-memory filtered algebraic codebook excitation              */
-    const float *code,          /* i  : algebraic excitation                                            */
-    const float Es_pred,        /* i  : predicted scaled innovation energy                              */
-    float *gain_pit,            /* o  : quantized pitch gain                                            */
-    float *gain_code,           /* o  : quantized codebook gain                                         */
-    float *gain_inov,           /* o  : innovation gain                                                 */
-    float *norm_gain_code,      /* o  : norm. gain of the codebook excitation                           */
-    float *coeff,               /* i/o: correlations <y1,y1>, -2<xn,y1>,<y2,y2>, -2<xn,y2> and 2<y1,y2> */
-    const int16_t clip_gain     /* i  : gain pitch clipping flag (1 = clipping)                         */
-);
-
-void gain_enc_SQ(
-    BSTR_ENC_HANDLE hBstr,      /* i/o: encoder bitstream handle                                        */
-    const int16_t gains_mode[], /* i  : gain bits                                                       */
-    const int16_t i_subfr,      /* i  : subframe index                                                  */
-    const float *xn,            /* i  : target vector                                                   */
-    const float *yy1,           /* i  : zero-memory filtered adaptive excitation                        */
-    const float *y2,            /* i  : zero-memory filtered algebraic codebook excitation              */
-    const float *code,          /* i  : algebraic excitation                                            */
-    const float Es_pred,        /* i  : predicted scaled innovation energy                              */
-    float *gain_pit,            /* o  : quantized pitch gain                                            */
-    float *gain_code,           /* o  : quantized codebook gain                                         */
-    float *gain_inov,           /* o  : gain of the innovation (used for normalization)                 */
-    float *norm_gain_code,      /* o  : norm. gain of the codebook excitation                           */
-    float *g_corr,              /* i/o: correlations <y1,y1>, -2<xn,y1>,<y2,y2>, -2<xn,y2> and 2<y1,y2> */
-    const int16_t clip_gain     /* i  : gain pitch clipping flag (1 = clipping)                         */
-);
-
-/*! r: Return index of quantization */
-int16_t gain_enc_gaus(
-    float *gain,          /* i/o: Code gain to quantize                       */
-    const int16_t bits,   /* i  : number of bits to quantize                  */
-    const float lowBound, /* i  : lower bound of quantizer (dB)               */
-    const float topBound  /* i  : upper bound of quantizer (dB)               */
-);
-
-void E_corr_xy2(
-    const float xn[],     /* i  : target vector                               */
-    const float y1[],     /* i  : filtered excitation components 1            */
-    const float y2[],     /* i  : filtered excitation components 2            */
-    float g_corr[],       /* o  : correlations between x, y1, y2, y3, y4      */
-    const int16_t L_subfr /* i  : subframe size                               */
-);
-
-
-/*! r: coding type */
-int16_t find_uv(
-    Encoder_State *st,               /* i/o: encoder state structure                       */
-    const float *pitch_fr,           /* i  : pointer to adjusted fractional pitch (4 val.) */
-    const float *voicing_fr,         /* i  : refined correlation for each subframes        */
-    const float *speech,             /* i  : pointer to speech signal for E computation    */
-    const float *ee,                 /* i  : lf/hf Energy ratio for present frame          */
-    float *dE1X,                     /* o  : sudden energy increase for S/M classifier     */
-    const float corr_shift,          /* i  : normalized correlation correction in noise    */
-    const float relE,                /* i  : relative frame energy                         */
-    const float Etot,                /* i  : total energy                                  */
-    const float hp_E[],              /* i  : energy in HF                                  */
-    int16_t *flag_spitch,            /* i/o: flag to indicate very short stable pitch and high correlation */
-    const int16_t last_core_orig,    /* i  : original last core                            */
-    STEREO_CLASSIF_HANDLE hStereoClf /* i/o: stereo classifier structure                   */
-);
-
-/*! r: classification for current frames */
-int16_t signal_clas(
-    Encoder_State *st,    /* i/o: encoder state structure                           */
-    const float *speech,  /* i  : pointer to speech signal for E computation        */
-    const float *ee,      /* i  : lf/hf E ration for 2 half-frames                  */
-    const float relE,     /* i  : frame relative E to the long term average         */
-    const int16_t L_look, /* i  : look-ahead                                        */
-    int16_t *clas_mod     /* o  : class flag for NOOP detection                     */
-);
-
-void select_TC(
-    const int16_t codec_mode, /* i  : codec mode                                        */
-    const int16_t tc_cnt,     /* i  : TC frame counter                                  */
-    int16_t *coder_type,      /* i/o: coder type                                        */
-    const int16_t localVAD    /* i  : VAD without hangover                              */
-);
-
-
-void wb_vad_init(
-    VAD_HANDLE hVAD /* i/o: VAD data handle                            */
-);
-
-int16_t dtx_hangover_addition(
-    Encoder_State *st,               /* i/o: encoder state structure                    */
-    const int16_t vad_flag,          /* i  : VAD flag                                   */
-    const float snr,                 /* i  : input single SNR estimate                  */
-    const int16_t cldfb_subtraction, /* i  :                                            */
-    int16_t *vad_hover_flag,         /* o  : VAD hangover flag                          */
-    VAD_HANDLE hVAD,                 /* i/o: VAD handle for L or R channel              */
-    NOISE_EST_HANDLE hNoiseEst,      /* i  : Noise estimation handle                    */
-    int16_t *rem_dtx_ho              /* o  : Expected remaining hangover frames         */
-);
-
-int16_t wb_vad(
-    Encoder_State *st,              /* i/o: encoder state structure                    */
-    const float fr_bands[],         /* i  : per band input energy (contains 2 vectors) */
-    int16_t *noisy_speech_HO,       /* o  : SC-VBR noisy speech HO flag                */
-    int16_t *clean_speech_HO,       /* o  : SC-VBR clean speech HO flag                */
-    int16_t *NB_speech_HO,          /* o  : SC-VBR NB speech HO flag                   */
-    float *snr_sum_he,              /* i  : voicing metric from SAD                    */
-    int16_t *localVAD_HE_SAD,       /* o  : HE_SAD decision without hangovers          */
-    int16_t *flag_noisy_speech_snr, /* o  :                                            */
-    VAD_HANDLE hVAD,                /* i/o: VAD handle                                 */
-    NOISE_EST_HANDLE hNoiseEst,     /* i/o: Noise estimation handle                    */
-    float lp_speech,                /* i  : long term active speech energy average     */
-    float lp_noise                  /* i  : long term noise energy                     */
-);
-
-void bw_detect(
-    Encoder_State *st,             /* i/o: Encoder State                               */
-    const float signal_in[],       /* i  : input signal                                */
-    float *spectrum,               /* i  : MDCT spectrum                               */
-    const float *enerBuffer,       /* i  : energy buffer                               */
-    const IVAS_FORMAT ivas_format, /* i  : IVAS format                                 */
-    const int16_t mct_on           /* i  : flag MCT mode                               */
-);
-
-void set_bw(
-    const int16_t element_mode,  /* i  : element mode                                */
-    const int32_t element_brate, /* i  : element bitrate                             */
-    Encoder_State *st,           /* i/o: Encoder State                               */
-    const int16_t codec_mode     /* i  : codec mode                                  */
-);
-
-float gaus_encode(
-    Encoder_State *st,     /* i/o: encoder state structure                     */
-    const int16_t i_subfr, /* i  : subframe index                              */
-    const float *h1,       /* i  : weighted filter input response              */
-    const float *xn,       /* i  : target vector                               */
-    float *exc,            /* o  : pointer to excitation signal frame          */
-    float *mem_w0,         /* o  : weighting filter denominator memory         */
-    float *gp_clip_mem,    /* o  : memory of gain of pitch clipping algorithm  */
-    float *tilt_code,      /* o  : synthesis excitation spectrum tilt          */
-    float *code,           /* o  : algebraic excitation                        */
-    float *gain_code,      /* o  : Code gain.                                  */
-    float *y2,             /* o  : zero-memory filtered adaptive excitation    */
-    float *gain_inov,      /* o  : innovation gain                             */
-    float *voice_fac,      /* o  : voicing factor                              */
-    float *gain_pit,       /* o  : adaptive excitation gain                    */
-    float *norm_gain_code  /* o  : normalized innovative cb. gain              */
-);
-
-void td_cng_enc_init(
-    TD_CNG_ENC_HANDLE hTdCngEnc, /* i/o: DTX/TD CNG data handle                      */
-    const int16_t Opt_DTX_ON,    /* i  : flag indicating DTX operation               */
-    const int16_t max_bwidth     /* i  : maximum encoded bandwidth                   */
-);
-
-void dtx(
-    Encoder_State *st,              /* i/o: encoder state structure                     */
-    const int32_t ivas_total_brate, /* i  : IVAS total bitrate                */
-    const int16_t vad,              /* i  : VAD flag for DTX                            */
-    const float speech[]            /* i  : Pointer to the speech frame                 */
-);
-
-void dtx_hangover_control(
-    Encoder_State *st,     /* i/o: encoder state structure                     */
-    const float lsp_new[M] /* i  : current frame LSPs                          */
-);
-
-
-void updt_enc_common(
-    Encoder_State *st /* i/o: encoder state structure                     */
-);
-
-void updt_IO_switch_enc(
-    Encoder_State *st,        /* i/o: state structure                             */
-    const int16_t input_frame /* i  : input frame length                          */
-);
-
-void transition_enc(
-    Encoder_State *st,     /* i/o: encoder state structure                     */
-    const int16_t i_subfr, /* i  : subframe index                              */
-    int16_t *tc_subfr,     /* i/o: TC subframe index                           */
-    int16_t *Jopt_flag,    /* i  : joint optimization flag                     */
-    int16_t *position,     /* i/o: maximum of residual signal index            */
-    int16_t *T0,           /* i/o: close loop integer pitch                    */
-    int16_t *T0_frac,      /* i/o: close loop fractional part of the pitch     */
-    int16_t *T0_min,       /* i/o: lower limit for close-loop search           */
-    int16_t *T0_max,       /* i/o: higher limit for close-loop search          */
-    float *exc,            /* i/o: pointer to excitation signal frame          */
-    float *y1,             /* o  : zero-memory filtered adaptive excitation    */
-    const float *h1,       /* i  : weighted filter input response              */
-    const float *xn,       /* i  : target vector                               */
-    float *xn2,            /* o  : target vector for innovation search         */
-    float *gp_cl,          /* i/o: memory of gain of pitch clipping algorithm  */
-    float *gain_pit,       /* o  : adaptive excitation gain                    */
-    float *g_corr,         /* o  : ACELP correlation values                    */
-    int16_t *clip_gain,    /* i/o: adaptive gain clipping flag                 */
-    float **pt_pitch,      /* o  : floating pitch values                       */
-    float *bwe_exc,        /* i/o: excitation for SWB TBE                      */
-    int16_t *unbits        /* i/o: unused bits                                 */
-);
-
-void tc_classif_enc(
-    const int16_t L_frame,     /* i  : length of the frame                           */
-    int16_t *tc_subfr,         /* i/o: TC subframe index                             */
-    int16_t *position,         /* i/o: maximum of residual signal index              */
-    const int16_t attack_flag, /* i  : attack flag                                   */
-    const int16_t pitch,       /* i  : open loop pitch estimates for first halfframe */
-    const float *res           /* i  : pointer to the LP residual signal frame       */
-);
-
-
-void gain_enc_tc(
-    BSTR_ENC_HANDLE hBstr,      /* i/o: encoder bitstream handle                                */
-    const int16_t gains_mode[], /* i  : gain bits                                               */
-    const int16_t i_subfr,      /* i  : subframe index                                          */
-    const float xn[],           /* i  : target vector                                           */
-    const float y2[],           /* i  : zero-memory filtered algebraic codebook excitation      */
-    const float code[],         /* i  : algebraic excitation                                    */
-    const float Es_pred,        /* i  : predicted scaled innovation energy                      */
-    float *gain_pit,            /* o  : pitch gain / Quantized pitch gain                       */
-    float *gain_code,           /* o  : quantized codebook gain                                 */
-    float *gain_inov,           /* o  : innovation gain                                         */
-    float *norm_gain_code       /* o  : norm. gain of the codebook excitation                   */
-);
-
-
-/*! r: comfort noise gain factor */
-float AVQ_cod(
-    const float xri[],     /* i  : vector to quantize                      */
-    int16_t xriq[],        /* o  : quantized normalized vector (assuming the bit budget is enough) */
-    const int16_t nb_bits, /* i  : number of allocated bits                */
-    const int16_t Nsv      /* i  : number of subvectors (lg=Nsv*8)         */
-);
-
-void AVQ_encmux(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                        */
-    const int16_t extl,    /* i  : extension layer                                 */
-    int16_t xriq[],        /* i/o: rounded subvectors [0..8*Nsv-1] followed by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
-    int16_t *nb_bits,      /* i/o: number of allocated bits                        */
-    const int16_t Nsv,     /* i  : number of subvectors                            */
-    int16_t nq[],          /* o  : AVQ nq index                                    */
-    int16_t avq_bit_sFlag, /* i  : flag indicating AVQ bit savings                 */
-    int16_t trgtSvPos      /* i  : target SV for AVQ bit savings                   */
-);
-
-void ordr_esti(
-    const int16_t k,   /* i  : sub-vector index                         */
-    int16_t *Mpos,     /* i/o: dominant sub-vector position from ACV    */
-    int16_t svOrder[], /* i/o: AVQ sub-vector order                     */
-    const int16_t Nsv  /* i  : total sub-vectors in a sub-frames        */
-);
-
-void re8_cod(
-    int16_t x[], /* i  : point in RE8 (8-dimensional integer vector)                         */
-    int16_t *n,  /* i  : codebook number (*n is an integer defined in {0,2,3,4,..,n_max})    */
-    uint16_t *I, /* o  : index of c (pointer to unsigned 16-bit word)                        */
-    int16_t k[]  /* o  : index of v (8-dimensional vector of binary indices) = Voronoi index */
-);
-
-void pre_exc(
-    const int16_t Opt_AMR_WB, /* i  : flag indicating AMR-WB IO mode                       */
-    const int16_t L_frame,    /* i  : frame length                                         */
-    const float *speech,      /* i  : input speech                                         */
-    const float *p_Aq,        /* i  : 12k8 Lp coefficient                                  */
-    const float *p_A,         /* i  : unquantized A(q) filter with bandwidth expansion     */
-    const int16_t coder_type, /* i  : coding type                                          */
-    const int16_t i_subfr,    /* i  : current sub frame indicator                          */
-    float *Ap,                /* o  : weighted LP filter coefficients                      */
-    const float *res,         /* i  : residual signal                                      */
-    float *h1,                /* o  : impulse response of weighted synthesis filter        */
-    float *xn,                /* o  : close-loop Pitch search target vector                */
-    float *cn,                /* o  : target vector in residual domain                     */
-    float *mem_syn,           /* i/o: memory of the synthesis filter                       */
-    float *mem_w0,            /* i/o: weighting filter denominator memory                  */
-    const int16_t L_subfr     /* i  : subframe length                                      */
-);
-
-
-void encod_amr_wb(
-    Encoder_State *st,         /* i/o: state structure                                 */
-    const float speech[],      /* i  : input speech                                    */
-    const float Aw[],          /* i  : weighted A(z) unquantized for subframes         */
-    const float Aq[],          /* i  : 12k8 Lp coefficient                             */
-    const float *res,          /* i  : residual signal                                 */
-    float *syn,                /* i/o: core synthesis                                  */
-    float *exc,                /* i/o: current non-enhanced excitation                 */
-    float *exc2,               /* i/o: current enhanced excitation                     */
-    float *pitch_buf,          /* i/o: floating pitch values for each subframe         */
-    int16_t hf_gain[NB_SUBFR], /* o  : decoded HF gain                                 */
-    const float *speech16k     /* i  : input speech @16kHz                             */
-);
-
-void stat_noise_uv_enc(
-    Encoder_State *st,              /* i/o: state structure                      */
-    const float *epsP,              /* i  : LP prediction errors                 */
-    const float *isp_new,           /* i  : immittance spectral pairs at 4th sfr */
-    const float *isp_mid,           /* i  : immittance spectral pairs at 2nd sfr */
-    float *Aq,                      /* i/o: A(z) quantized for the 4 subframes   */
-    float *exc2,                    /* i/o: excitation buffer                    */
-    const int16_t uc_two_stage_flag /* o  : flag undicating two-stage UC         */
-);
-
-void re8_compute_base_index(
-    const int16_t *x, /* i  : Elemen of Q2, Q3 or Q4                          */
-    const int16_t ka, /* i  : Identifier of the absolute leader related to x  */
-    uint16_t *I       /* o  : index                                           */
-);
-
-void transf_cdbk_enc(
-    Encoder_State *st,             /* i/o: encoder state structure                     */
-    const int16_t harm_flag_acelp, /* i  : harmonic flag for higher rates ACELP        */
-    const int16_t i_subfr,         /* i  : subframe index                              */
-    float cn[],                    /* i/o: target vector in residual domain            */
-    float exc[],                   /* i/o: pointer to excitation signal frame          */
-    const float *p_Aq,             /* i  : 12k8 Lp coefficient                         */
-    const float Ap[],              /* i  : weighted LP filter coefficients             */
-    const float h1[],              /* i  : weighted filter input response              */
-    float xn[],                    /* i/o: target vector                               */
-    float xn2[],                   /* i/o: target vector for innovation search         */
-    float y1[],                    /* i/o: zero-memory filtered adaptive excitation    */
-    const float y2[],              /* i  : zero-memory filtered innovative excitation  */
-    const float Es_pred,           /* i  : predicited scaled innovation energy         */
-    float *gain_pit,               /* i/o: adaptive excitation gain                    */
-    const float gain_code,         /* i  : innovative excitation gain                  */
-    float g_corr[],                /* o  : ACELP correlation values                    */
-    const int16_t clip_gain,       /* i  : adaptive gain clipping flag                 */
-    float *gain_preQ,              /* o  : prequantizer excitation gain                */
-    float code_preQ[],             /* o  : prequantizer excitation                     */
-    int16_t *unbits                /* i/o: number of AVQ unused bits                   */
-);
-void deemph_lpc(
-    float *p_Aq_cuerr,  /* i  : LP coefficients current frame               */
-    float *p_Aq_old,    /* i  : LP coefficients previous frame              */
-    float *LPC_de_curr, /* o  : De-emphasized LP coefficients current frame */
-    float *LPC_de_old,  /* o  : De-emphasized LP coefficients previous frame*/
-    const int16_t deemph_old );
-
-void Interpol_delay(
-    float *out,       /* o  : pitch interpolation output                  */
-    float *last,      /* i  : last frame pitch lag                        */
-    float *current,   /* i  : current frame pitch lag                     */
-    int16_t SubNum,   /* i  : subframe number                             */
-    const float *frac /* i  : interpolation constant                      */
-);
-
-void dequantize_uvg(
-    int16_t iG1,         /* i  : gain 1 index                                */
-    int16_t *iG2,        /* i  : gain 2 index                                */
-    float *G,            /* o  : quantized gain                              */
-    const int16_t bwidth /* i  : audio bandwidth                             */
-);
-
-void generate_nelp_excitation(
-    int16_t *seed, /* i/o: random number seed                          */
-    float *Gains,  /* i  : excitation gains                            */
-    float *output, /* o  : excitation output                           */
-    float gain_fac /* i  : gain factor                                 */
-);
-
-void nelp_encoder(
-    Encoder_State *st, /* i/o: encoder state                               */
-    float *in,         /* i  : residual signal                             */
-    float *exc,        /* o  : NELP quantized excitation signal            */
-    const int16_t reduce_gains );
-
-void encod_nelp(
-    Encoder_State *st,    /* i/o: state structure                             */
-    const float *speech,  /* i  : input speech                                */
-    const float Aw[],     /* i  : weighted A(z) unquantized for subframes     */
-    const float *Aq,      /* i  : 12k8 Lp coefficient                         */
-    float *res,           /* o  : residual signal                             */
-    float *synth,         /* o  : core synthesis                              */
-    float *tmp_noise,     /* o  : long-term noise energy                      */
-    float *exc,           /* i/o: current non-enhanced excitation             */
-    float *exc2,          /* i/o: current enhanced excitation                 */
-    float *pitch_buf,     /* o  : floating pitch values for each subframe     */
-    float *voice_factors, /* o  : voicing factors                             */
-    float *bwe_exc        /* o  : excitation for SWB TBE                      */
-);
-
-void realft(
-    float *data,  /* i/o: data array                                  */
-    int16_t n,    /* i  : length of data array                        */
-    int16_t isign /* i  : sign +1 or -1                               */
-);
-
-ivas_error DTFS_new(
-    DTFS_STRUCTURE **dtfs_out );
-
-void DTFS_copy(
-    DTFS_STRUCTURE *Xout, /* o  : DTFS                                        */
-    DTFS_STRUCTURE Xinp   /* i  : DTFS                                        */
-);
-
-void DTFS_sub(
-    DTFS_STRUCTURE *tmp, /* o  : output DFTS                                 */
-    DTFS_STRUCTURE X1,   /* i  : DTFS input 1                                */
-    DTFS_STRUCTURE X2    /* i  : DTFS input 2                                */
-);
-
-void DTFS_to_fs(
-    const float *x,    /* i  : Time domain signal                          */
-    const int16_t N,   /* i  : Length of input vector                      */
-    DTFS_STRUCTURE *X, /* o  : DTFS structure with a, b, lag               */
-    const int32_t sampling_rate,
-    const int16_t FR_flag /* i  : FR flag                                     */
-);
-
-void DTFS_fs_inv(
-    DTFS_STRUCTURE *X, /* i  : DTFS                                         */
-    float *x,          /* o  : time domain sig                              */
-    const int16_t N,   /* i  : Output length                                */
-    float ph0          /* i  : Input phase                                  */
-);
-
-void DTFS_car2pol(
-    DTFS_STRUCTURE *X /* i/o: DTFS structure a, b, lag                    */
-                      /* input in Cartesion, output in Polar              */
-);
-
-void DTFS_pol2car(
-    DTFS_STRUCTURE *X /* i/o: DTFS structure a, b, lag                   */
-                      /* input in Polar, output in Cartesian             */
-);
-
-/*! r: Return Input RMS between f1/f2 b4 scaling */
-float DTFS_setEngyHarm(
-    float f1,         /* i  : lower band freq of input to control energy  */
-    float f2,         /* i  : upper band freq of input to control energy  */
-    float g1,         /* i  : lower band freq of output to control energy */
-    float g2,         /* i  : upper band freq of output to control energy */
-    float en2,        /* i  : Target Energy to set the DTFS to            */
-    DTFS_STRUCTURE *X /* i/o: DTFS to adjust the energy of                */
-);
-
-void DTFS_to_erb(
-    DTFS_STRUCTURE X, /* i  : DTFS input                             */
-    float *out        /* o  : ERB output                             */
-);
-
-void DTFS_zeroPadd(
-    const int16_t N,  /* i  : Target lag                            */
-    DTFS_STRUCTURE *X /* i/o: DTFS                                  */
-);
-
-/*! r: Energy */
-float DTFS_getEngy(
-    DTFS_STRUCTURE X /* i  : DTFS to compute energy of              */
-);
-
-void DTFS_adjustLag(
-    DTFS_STRUCTURE *X_DTFS, /* i/o: DTFS to adjust lag for                */
-    const int16_t N         /* i  : Target lag                            */
-);
-
-void DTFS_poleFilter(
-    DTFS_STRUCTURE *X, /* i/o: DTFS to poleFilter inplace            */
-    const float *LPC,  /* i  : LPCs                                  */
-    const int16_t N    /* i  : LPCORDER                              */
-);
-
-void DTFS_zeroFilter(
-    DTFS_STRUCTURE *X, /* i/o: DTFS to zeroFilter inplace            */
-    const float *LPC,  /* i  : LPCs                                  */
-    const int16_t N    /* i  : LPCORDER                              */
-);
-
-float DTFS_alignment_full(
-    DTFS_STRUCTURE X1_DTFS, /* i  : reference DTFS                         */
-    DTFS_STRUCTURE X2_DTFS, /* i  : DTFS to shift                          */
-    const int16_t num_steps /* i  : resolution                             */
-);
-
-void DTFS_phaseShift(
-    DTFS_STRUCTURE *X, /* i  : DTFS to shift                          */
-    float ph           /* i  : phase to shift                         */
-);
-
-void erb_add(
-    float *curr_erb,       /* i/o:  current ERB                          */
-    const int16_t l,       /* i  :  current lag                          */
-    const float *prev_erb, /* i  :  previous ERB                         */
-    const int16_t pl,      /* i  :  previous lag                         */
-    const int16_t *index,  /* i  :  ERB index                            */
-    const int16_t num_erb  /* i  :  number of ERBs                       */
-);
-
-void erb_slot(
-    int16_t lag,    /* i  : input lag                             */
-    int16_t *out,   /* o  : ERB slots                             */
-    float *mfreq,   /* i  : ERB frequencies                       */
-    int16_t num_erb /* i  : number of ERBs                        */
-);
-
-void erb_diff(
-    const float *prev_erb, /* i  : previous ERB                          */
-    const int16_t pl,      /* i  : previous lag                          */
-    const float *curr_erb, /* i  : current ERB                           */
-    const int16_t l,       /* i  : current lag                           */
-    const float *curr_lsp, /* i  : current LSP coefficients              */
-    float *out,            /* o  : ERB difference                        */
-    int16_t *index,        /* i  : ERB index                             */
-    const int16_t num_erb  /* i  : Number of ERBs                        */
-);
-
-void DTFS_erb_inv(
-    float *in,            /* i  : ERB inpt                               */
-    int16_t *slot,        /* i  : ERB slots filled based on lag          */
-    float *mfreq,         /* i  : erb frequence edges                    */
-    DTFS_STRUCTURE *X,    /* o  : DTFS after erb-inv                     */
-    const int16_t num_erb /* i  : Number of ERB bands                    */
-);
-
-ivas_error ppp_quarter_encoder(
-    int16_t *returnFlag,       /* o  : return value                            */
-    BSTR_ENC_HANDLE hBstr,     /* i/o: encoder bitstream handle                 */
-    DTFS_STRUCTURE *CURRCW_Q,  /* o  : Quantized (amp/phase) DTFS               */
-    DTFS_STRUCTURE *TARGETCW,  /* o  : DTFS with quant phase but unquant Amp    */
-    const int16_t prevCW_lag,  /* i  : previous lag                             */
-    DTFS_STRUCTURE vCURRCW_NQ, /* i  : Unquantized DTFS                         */
-    const float *curr_lpc,     /* i  : LPCS                                     */
-    float *lastLgainE,         /* i/o: last low band gain                       */
-    float *lastHgainE,         /* i/o: last high band gain                      */
-    float *lasterbE,           /* i/o: last ERB vector                          */
-    DTFS_STRUCTURE PREV_CW_E   /* i  : past DTFS                                */
-);
-
-ivas_error WIsyn(
-    DTFS_STRUCTURE PREVCW,        /* i  : Prev frame DTFS                          */
-    DTFS_STRUCTURE *CURR_CW_DTFS, /* i/o: Curr frame DTFS                          */
-    const float *curr_lpc,        /* i  : LPC                                      */
-    float *ph_offset,             /* i/o: Phase offset to line up at end of frame  */
-    float *out,                   /* o  : Waveform Interpolated time domain signal */
-    const int16_t N,              /* i  : Number of samples of output to generate  */
-    const int16_t FR_flag         /* i  : called for post-smoothing in FR          */
-);
-
-void set_ppp_mode(
-    Encoder_State *st,             /* i/o: encoder state structure                 */
-    const int16_t noisy_speech_HO, /* i  : SC-VBR noisy speech HO flag             */
-    const int16_t clean_speech_HO, /* i  : SC-VBR clean speech HO flag             */
-    const int16_t NB_speech_HO,    /* i  : SC-VBR NB speech HO flag                */
-    const int16_t localVAD_he      /* i  : HE-SAD flag without hangover            */
-);
-
-ivas_error ppp_voiced_encoder(
-    BSTR_ENC_HANDLE hBstr,             /* i/o: encoder bitstream handle                    */
-    SC_VBR_ENC_HANDLE hSC_VBR,         /* i/o: SC-VBR state structure                      */
-    const int16_t bwidth,              /* i  : audio bandwidth                             */
-    const int16_t last_coder_type_raw, /* i  : raw last_coder_type                         */
-    const float old_pitch_buf[],       /* i  : buffer of old subframe pitch values         */
-    float *in,                         /* i  : residual signal                             */
-    float *out,                        /* o  : Quantized residual signal                   */
-    const int16_t delay,               /* i  : open loop pitch                             */
-    float *lpc1,                       /* i  : prev frame de-emphasized LPC                */
-    float *lpc2,                       /* i  : current frame de-emphasized LPC             */
-    float *exc,                        /* i  : previous frame quantized excitation         */
-    float *pitch                       /* o  : floating pitch values for each subframe     */
-);
-
-ivas_error encod_ppp(
-    Encoder_State *st,    /* i/o: state structure                                 */
-    const float speech[], /* i  : input speech                                    */
-    const float Aw[],     /* i  : weighted A(z) unquantized for subframes         */
-    const float Aq[],     /* i  : 12k8 Lp coefficient                             */
-    float *res,           /* i/o: residual signal                                 */
-    float *synth,         /* i/o: core synthesis                                  */
-    float *exc,           /* i/o: current non-enhanced excitation                 */
-    float *exc2,          /* i/o: current enhanced excitation                     */
-    float *pitch_buf,     /* i/o: floating pitch values for each subframe         */
-    float *voice_factors, /* o  : voicing factors                                 */
-    float *bwe_exc        /* o  : excitation for SWB TBE                          */
-);
-
-void reset_rf_indices(
-    RF_ENC_HANDLE hRF,     /* i/o: RF state structure                  */
-    const int16_t L_frame, /* i  : frame length                        */
-    int16_t *rf_target_bits_write );
-
-void signaling_enc_rf(
-    Encoder_State *st /* i/o: encoder state structure             */
-);
-
-ivas_error acelp_core_dec(
-    Decoder_State *st,                   /* i/o: Decoder state structure             */
-    float output[],                      /* o  : synthesis @internal Fs              */
-    float synth[],                       /* o  : synthesis                           */
-    float save_hb_synth[],               /* o  : HB synthesis                        */
-    float bwe_exc_extended[],            /* i/o: bandwidth extended excitation       */
-    float *voice_factors,                /* o  : voicing factors                     */
-    float old_syn_12k8_16k[],            /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE */
-    const int16_t sharpFlag,             /* i  : formant sharpening flag             */
-    float pitch_buf[NB_SUBFR16k],        /* o  : floating pitch for each subframe    */
-    int16_t *unbits,                     /* o  : number of unused bits               */
-    int16_t *sid_bw,                     /* o  : 0-NB/WB, 1-SWB SID                  */
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle            */
-    const float tdm_lspQ_PCh[M],         /* i  : Q LSPs for primary channel          */
-    const float tdm_lsfQ_PCh[M],         /* i  : Q LSFs for primary channel          */
-    const int16_t use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo */
-    const int16_t last_element_mode,     /* i  : last element mode                   */
-    const int32_t last_element_brate,    /* i  : last element bitrate                */
-    const int16_t flag_sec_CNA,          /* i  : CNA flag for secondary channel      */
-    const int16_t nchan_out,             /* i  : number of output channels           */
-    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  :  stereo CNG handle                  */
-    const int16_t read_sid_info          /* i  : read SID info flag                  */
-);
-
-void bass_psfilter_init(
-    BPF_DEC_HANDLE hBPF /* o  : BPF data handle                     */
-);
-
-void bass_psfilter(
-    BPF_DEC_HANDLE hBPF,      /* o  : BPF data handle                     */
-    const int16_t Opt_AMR_WB, /* i  : AMR-WB IO flag                      */
-    const float synth_in[],   /* i  : synthesis (at 16kHz)                */
-    const int16_t L_frame,    /* i  : length of the last frame            */
-    const float pitch_buf[],  /* i  : pitch for every subfr [0,1,2,3]     */
-    const int16_t bpf_off,    /* i  : do not use BPF when set to 1        */
-    float v_stab,             /* i  : stability factor                    */
-    float *v_stab_smooth,     /* i  : smoothed stability factor           */
-    const int16_t coder_type, /* i  : coder_type                          */
-    float bpf_noise_buf[]     /* o  : BPF error signal (at int_fs)        */
-);
-
-void CNG_reset_dec(
-    Decoder_State *st,   /* i/o: decoder state structure            */
-    float *pitch_buf,    /* o  : floating pitch for each subframe   */
-    float *voice_factors /* o  : voicing factors                    */
-);
-
-void updt_dec(
-    Decoder_State *st,           /* i/o: state structure                         */
-    const float *old_exc,        /* i  : buffer of excitation                    */
-    const float *pitch_buf,      /* i  : floating pitch values for each subframe */
-    const float Es_pred,         /* i  : predicited scaled innovation energy     */
-    const float *Aq,             /* i  : A(z) quantized for all subframes        */
-    const float *lsf_new,        /* i  : current frame LSF vector                */
-    const float *lsp_new,        /* i  : current frame LSP vector                */
-    const float voice_factors[], /* i  : voicing factors                         */
-    const float *old_bwe_exc,    /* i  : buffer of excitation                    */
-    const float *gain_buf        /* o  : floating pitch gain for each subframe   */
-);
-
-void updt_IO_switch_dec(
-    const int16_t output_frame, /* i  : output frame length                     */
-    Decoder_State *st           /* i/o: state structure                         */
-);
-
-void updt_dec_common(
-    Decoder_State *st,                  /* i/o: decoder state structure     */
-    const int16_t hq_core_type,         /* i  : HQ core type                */
-    const int16_t concealWholeFrameTmp, /* i  : concealWholeFrameTmp flag   */
-    const float *synth                  /* i  : decoded synthesis           */
-);
-
-void td_cng_dec_init(
-    DEC_CORE_HANDLE st /* i/o: decoder state structure     */
-);
-
-void CNG_dec(
-    Decoder_State *st,               /* i/o: State structure                         */
-    const int16_t last_element_mode, /* i  : last element mode                       */
-    float Aq[],                      /* o  : LP coefficients                         */
-    float *lsp_new,                  /* i/o: current frame LSPs                      */
-    float *lsf_new,                  /* i/o: current frame LSFs                      */
-    int16_t *allow_cn_step,          /* o  : allow cn step                           */
-    int16_t *sid_bw,                 /* o  : 0-NB/WB, 1-SWB SID                      */
-    float *q_env );
-
-void swb_CNG_dec(
-    Decoder_State *st,   /* i/o: State structure                         */
-    const float *synth,  /* i  : ACELP core synthesis at 32kHz           */
-    float *shb_synth,    /* o  : high-band CNG synthesis                 */
-    const int16_t sid_bw /* i  : 0-NB/WB, 1-SWB SID                      */
-);
-
-void lsf_dec(
-    Decoder_State *st,               /* i/o: State structure                             */
-    const int16_t tc_subfr,          /* i  : TC subframe index                           */
-    float *Aq,                       /* o  : quantized A(z) for 4 subframes              */
-    int16_t *LSF_Q_prediction,       /* o  : LSF prediction mode                         */
-    float *lsf_new,                  /* o  : de-quantized LSF vector                     */
-    float *lsp_new,                  /* o  : de-quantized LSP vector                     */
-    float *lsp_mid,                  /* o  : de-quantized mid-frame LSP vector           */
-    const int16_t tdm_low_rate_mode, /* i  : secondary channel low rate mode flag        */
-    const float tdm_lsfQ_PCh[M]      /* i  : Q LSFs for primary channel                  */
-);
-
-void isf_dec_amr_wb(
-    Decoder_State *st, /* i/o: State structure                             */
-    float *Aq,         /* o  : quantized A(z) for 4 subframes              */
-    float *isf_new,    /* o  : de-quantized ISF vector                     */
-    float *isp_new     /* o  : de-quantized ISP vector                     */
-);
-
-void Es_pred_dec(
-    float *Es_pred,        /* o  : predicted scaled innovation energy          */
-    const int16_t enr_idx, /* i  : indice                                      */
-    const int16_t nb_bits, /* i  : number of bits                              */
-    const int16_t no_ltp   /* i  : no LTP flag                                 */
-);
-
-void gaus_dec(
-    Decoder_State *st,     /* i/o: decoder state structure                     */
-    const int16_t i_subfr, /* i  : subframe index                              */
-    float *code,           /* o  : gaussian excitation                         */
-    float *norm_gain_code, /* o  : gain of the normalized gaussian excitation  */
-    float *lp_gainp,       /* i/o: lp filtered pitch gain(FER)                 */
-    float *lp_gainc,       /* i/o: lp filtered code gain (FER)                 */
-    float *gain_inov,      /* o  : unscaled innovation gain                    */
-    float *tilt_code,      /* o  : synthesis excitation spectrum tilt          */
-    float *voice_fac,      /* o  : estimated voicing factor                    */
-    float *gain_pit,       /* o  : reset pitch gain                            */
-    float *pt_pitch,       /* o  : reset floating pitch buffer                 */
-    float *exc,            /* o  : excitation signal frame                     */
-    float *gain_code,      /* o  : gain of the gaussian excitation             */
-    float *exc2            /* o  : scaled excitation signal frame              */
-);
-
-void gain_dec_amr_wb(
-    Decoder_State *st,        /* i/o: decoder state structure               */
-    const int32_t core_brate, /* i  : core bitrate                          */
-    float *gain_pit,          /* o  : Quantized pitch gain                  */
-    float *gain_code,         /* o  : Quantized codeebook gain              */
-    float *past_qua_en,       /* i/o: gain quantization memory (4 words)    */
-    float *gain_inov,         /* o  : unscaled innovation gain              */
-    const float *code,        /* i  : algebraic code excitation             */
-    float *norm_gain_code     /* o  : norm. gain of the codebook excitation */
-);
-
-void gain_dec_lbr(
-    Decoder_State *st,        /* i/o: decoder state structure                          */
-    const int16_t coder_type, /* i  : coding type                                      */
-    const int16_t i_subfr,    /* i  : subframe index                                   */
-    const float *code,        /* i  : algebraic excitation                             */
-    float *gain_pit,          /* o  : quantized pitch gain                             */
-    float *gain_code,         /* o  : quantized codebook gain                          */
-    float *gain_inov,         /* o  : gain of the innovation (used for normalization)  */
-    float *norm_gain_code,    /* o  : norm. gain of the codebook excitation            */
-    float gains_mem[],        /* i/o: pitch gain and code gain from previous subframes */
-    const int16_t L_subfr     /* i  : subframe length                                  */
-);
-
-void gain_dec_mless(
-    Decoder_State *st,        /* i/o: decoder state structure               */
-    const int16_t L_frame,    /* i  : length of the frame                   */
-    const int16_t coder_type, /* i  : coding type                           */
-    const int16_t i_subfr,    /* i  : subframe number                       */
-    const int16_t tc_subfr,   /* i  : TC subframe index                     */
-    const float *code,        /* i  : algebraic code excitation             */
-    const float Es_pred,      /* i  : predicted scaled innov. energy        */
-    float *gain_pit,          /* o  : Quantized pitch gain                  */
-    float *gain_code,         /* o  : Quantized codeebook gain              */
-    float *gain_inov,         /* o  : unscaled innovation gain              */
-    float *norm_gain_code     /* o  : norm. gain of the codebook excitation */
-);
-
-void gain_dec_SQ(
-    Decoder_State *st,     /* i/o: decoder state structure               */
-    const int16_t i_subfr, /* i  : subframe number                       */
-    const float *code,     /* i  : algebraic code excitation             */
-    const float Es_pred,   /* i  : predicted scaled innov. energy        */
-    float *gain_pit,       /* o  : Quantized pitch gain                  */
-    float *gain_code,      /* o  : Quantized codeebook gain              */
-    float *gain_inov,      /* o  : unscaled innovation gain              */
-    float *norm_gain_code  /* o  : norm. gain of the codebook excitation */
-);
-
-/*! r: quantized codebook gain */
-float gain_dec_gaus(
-    const int16_t index,   /* i  : quantization index                      */
-    const int16_t bits,    /* i  : number of bits to quantize              */
-    const float lowBound,  /* i  : lower bound of quantizer (dB)           */
-    const float topBound,  /* i  : upper bound of quantizer (dB)           */
-    const float gain_inov, /* i  : unscaled innovation gain                */
-    float *norm_gain_code  /* o  : gain of normalized gaus. excit.         */
-);
-
-/*! r: floating pitch value */
-float pit_decode_flt(
-    Decoder_State *st,                  /* i/o: decoder state structure                 */
-    const int32_t core_brate,           /* i  : core bitrate                            */
-    const int16_t Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode          */
-    const int16_t L_frame,              /* i  : length of the frame                     */
-    int16_t i_subfr,                    /* i  : subframe index                          */
-    const int16_t coder_type,           /* i  : coding type                             */
-    int16_t *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits   */
-    int16_t *T0,                        /* o  : close loop integer pitch                */
-    int16_t *T0_frac,                   /* o  : close loop fractional part of the pitch */
-    int16_t *T0_min,                    /* i/o: delta search min for sf 2 & 4           */
-    int16_t *T0_max,                    /* i/o: delta search max for sf 2 & 4           */
-    const int16_t L_subfr,              /* i  : subframe length                         */
-    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag        */
-    const float tdm_Pri_pitch_buf[]     /* i  : primary channel pitch buffer            */
-);
-
-void abs_pit_dec_flt(
-    const int16_t fr_steps,   /* i  : fractional resolution steps (0, 2, 4)   */
-    int16_t pitch_index,      /* i  : pitch index                             */
-    const int16_t limit_flag, /* i  : restrained(0) or extended(1) Q limits   */
-    int16_t *T0,              /* o  : integer pitch lag                       */
-    int16_t *T0_frac          /* o  : pitch fraction                          */
-);
-
-void delta_pit_dec_flt(
-    const int16_t fr_steps,    /* i  : fractional resolution steps (0, 2, 4)   */
-    const int16_t pitch_index, /* i  : pitch index                             */
-    int16_t *T0,               /* o  : integer pitch lag                       */
-    int16_t *T0_frac,          /* o  : pitch fraction                          */
-    const int16_t T0_min       /* i  : delta search min                        */
-);
-
-void pit_Q_dec_flt(
-    const int16_t Opt_AMR_WB,  /* i  : flag indicating AMR-WB IO mode          */
-    const int16_t pitch_index, /* i  : pitch index                             */
-    const int16_t nBits,       /* i  : # of Q bits                             */
-    const int16_t delta,       /* i  : Half the CL searched interval           */
-    const int16_t pit_flag,    /* i  : absolute(0) or delta(1) pitch Q         */
-    const int16_t limit_flag,  /* i  : restrained(0) or extended(1) Q limits   */
-    int16_t *T0,               /* o  : integer pitch lag                       */
-    int16_t *T0_frac,          /* o  : pitch fraction                          */
-    int16_t *T0_min,           /* i/o: delta search min                        */
-    int16_t *T0_max,           /* i/o: delta search max                        */
-    int16_t *BER_detect        /* o  : BER detect flag                         */
-);
-
-void pit16k_Q_dec_flt(
-    const int16_t pitch_index, /* i  : pitch index                             */
-    const int16_t nBits,       /* i  : # of Q bits                             */
-    const int16_t limit_flag,  /* i  : restrained(0) or extended(1) Q limits   */
-    int16_t *T0,               /* o  : integer pitch lag                       */
-    int16_t *T0_frac,          /* o  : pitch fraction                          */
-    int16_t *T0_min,           /* i/o: delta search min                        */
-    int16_t *T0_max,           /* i/o: delta search max                        */
-    int16_t *BER_detect        /* o  : BER detect flag                         */
-);
-
-
-void inov_decode(
-    Decoder_State *st,        /* i/o: decoder state structure                         */
-    const int32_t core_brate, /* i  : core bitrate                                    */
-    const int16_t Opt_AMR_WB, /* i  : flag indicating AMR-WB IO mode                  */
-    const int16_t L_frame,    /* i  : length of the frame                             */
-    const int16_t sharpFlag,  /* i  : formant sharpening flag                         */
-    const int16_t i_subfr,    /* i  : subframe index                                  */
-    const float *p_Aq,        /* i  : LP filter coefficients                          */
-    const float tilt_code,    /* i  : tilt of of the excitation of previous subframe  */
-    const float pt_pitch,     /* i  : pointer to current subframe fractional pitch    */
-    float *code,              /* o  : algebraic excitation                            */
-    const int16_t L_subfr     /* i  : subframe length                                 */
-);
-
-void dec_acelp_1t64(
-    Decoder_State *st,    /* i/o: decoder state structure                         */
-    float code[],         /* o  : algebraic (fixed) codebook excitation           */
-    const int16_t L_subfr /* i  : subframe length                                 */
-);
-
-void dec_acelp_2t32(
-    Decoder_State *st, /* i/o: decoder state structure                         */
-    float code[]       /* o  : algebraic (fixed) codebook excitation           */
-);
-
-void dec_acelp_4t64(
-    Decoder_State *st,       /* i/o: decoder state structure                         */
-    int16_t nbbits,          /* i  : number of bits per codebook                     */
-    float code[],            /* o  : algebraic (fixed) codebook excitation           */
-    const int16_t Opt_AMR_WB /* i  : flag indicating AMR-WB IO mode                  */
-);
-
-
-void FEC_exc_estim(
-    Decoder_State *st,     /* i/o: Decoder static memory                           */
-    const int16_t L_frame, /* i  : length of the frame                             */
-    float *old_exc,        /* i/o: excitation buffer                               */
-    float *exc2,           /* o  : excitation buffer (for synthesis)               */
-    float *exc_dct_in,     /* o  : GSC excitation in DCT domain                    */
-    float *pitch_buf,      /* o  : Floating pitch   for each subframe              */
-    float *tmp_tc,         /* o  : FEC pitch                                       */
-    float *voice_factors,  /* o  : voicing factors                                 */
-    float *bwe_exc,        /* i/o: excitation for SWB TBE                          */
-    float *lsf_new,        /* i  : ISFs at the end of the frame                    */
-    float *tmp_noise       /* o  : long-term noise energy                          */
-);
-
-void FEC_lsf2lsp_interp_flt(
-    Decoder_State *st,     /* i/o: Decoder static memory                           */
-    const int16_t L_frame, /* i  : length of the frame                             */
-    float *Aq,             /* o  : calculated A(z) for 4 subframes                 */
-    float *lsf,            /* o  : estimated LSF vector                            */
-    float *lsp             /* o  : estimated LSP vector                            */
-);
-
-void FEC_lsf_estim_enc(
-    Encoder_State *st, /* i  : Encoder static memory                           */
-    float *lsf         /* o  : estimated LSF vector                            */
-);
-
-float frame_energy(
-    const int16_t L_frame, /* i  : length of the frame                             */
-    const float *pitch,    /* i  : pitch values for each subframe                  */
-    const float *speech,   /* i  : pointer to speech signal for E computation      */
-    const float lp_speech, /* i  : long term active speech energy average          */
-    float *frame_ener      /* o  : pitch-synchronous energy at frame end           */
-);
-
-void FEC_SinOnset(
-    float *exc,           /* i/o: exc vector to modify                           */
-    int16_t puls_pos,     /* i  : Last pulse position desired                    */
-    int16_t T0,           /* i  : decoded first frame pitch                      */
-    float enr_q,          /* i  : energy provided by the encoder                 */
-    float *Aq,            /* i  : Lsp coefficient                                */
-    const int16_t L_frame /* i  : Frame length                                   */
-);
-
-int16_t FEC_enhACB(
-    const int16_t L_frame,      /* i  : Frame length                                                              */
-    const int16_t last_L_frame, /* i  : frame length of last frame                                                */
-    float *exc_io,              /* i/o: Adaptive codebook memory                                                  */
-    const int16_t new_pit,      /* i  : decoded first frame pitch                                                 */
-    const int16_t puls_pos,     /* i  : decoder position of the last glottal pulses decoded in the previous frame */
-    const float bfi_pitch       /* i  : Pitch used for concealment                                                */
-);
-
-void FEC_scale_syn(
-    const int16_t L_frame,                     /* i  : length of the frame                     */
-    int16_t clas,                              /* i/o: frame classification                    */
-    const int16_t last_good,                   /* i  : last good frame classification          */
-    float *synth,                              /* i/o: synthesized speech at Fs = 12k8 Hz      */
-    const float *pitch,                        /* i  : pitch values for each subframe          */
-    float enr_old,                             /* i  : energy at the end of prvious frame      */
-    float enr_q,                               /* i  : transmitted energy for current frame    */
-    const int16_t coder_type,                  /* i  : coding type                             */
-    const int16_t LSF_Q_prediction,            /* i  : LSF prediction mode                     */
-    int16_t *scaling_flag,                     /* i/o: flag to indicate energy control of syn  */
-    float *lp_ener_FEC_av,                     /* i/o: averaged voiced signal energy           */
-    float *lp_ener_FEC_max,                    /* i/o: averaged voiced signal energy           */
-    const int16_t bfi,                         /* i  : current  frame BFI                      */
-    const int32_t total_brate,                 /* i  : total bitrate                           */
-    const int16_t prev_bfi,                    /* i  : previous frame BFI                      */
-    const int32_t last_core_brate,             /* i  : previous frame core bitrate             */
-    float *exc,                                /* i/o: excitation signal without enhancement   */
-    float *exc2,                               /* i/o: excitation signal with enhancement      */
-    const float Aq[],                          /* i  : LP filter coefs                         */
-    float *old_enr_LP,                         /* i/o: LP filter E of last good voiced frame   */
-    const float *mem_tmp,                      /* i  : temp. initial synthesis filter states   */
-    float *mem_syn,                            /* o  : initial synthesis filter states         */
-    const int16_t avoid_lpc_burst_on_recovery, /* i  : if true the excitation energy is limited if LP has big gain */
-    const int16_t force_scaling                /* i  : force scaling                           */
-);
-
-void FEC_pitch_estim(
-    const int16_t Opt_AMR_WB,    /* i  : flag indicating AMR-WB IO mode          */
-    const int16_t last_core,     /* i  : last core                               */
-    const int16_t L_frame,       /* i  : length of the frame                     */
-    const int16_t clas,          /* i  : current frame classification            */
-    const int16_t last_good,     /* i  : last good clas information              */
-    const float pitch_buf[],     /* i  : Floating pitch   for each subframe      */
-    const float old_pitch_buf[], /* i  : buffer of old subframe pitch values     */
-    float *bfi_pitch,            /* i/o: update of the estimated pitch for FEC   */
-    int16_t *bfi_pitch_frame,    /* o  : frame length when pitch was updated     */
-    int16_t *upd_cnt,            /* i/o: update counter                          */
-    const int16_t coder_type );
-
-void FEC_encode(
-    BSTR_ENC_HANDLE hBstr,        /* i/o: encoder bitstream handle                        */
-    const ACELP_config acelp_cfg, /* i  : configuration of the ACELP                      */
-    const float *synth,           /* i  : pointer to synthesized speech for E computation */
-    const int16_t coder_type,     /* i  : type of coder                                   */
-    int16_t clas,                 /* i  : signal clas for current frame                   */
-    const float *fpit,            /* i  : close loop fractional pitch buffer              */
-    const float *res,             /* i  : LP residual signal frame                        */
-    int16_t *last_pulse_pos,      /* i/o: Position of the last pulse                      */
-    const int16_t L_frame,        /* i  : Frame length                                    */
-    const int32_t total_brate     /* i  : total codec bitrate                             */
-);
-
-int16_t FEC_pos_dec(
-    Decoder_State *st,          /* i/o: decoder state structure                     */
-    int16_t *last_pulse_pos,    /* o  : Last glottal pulse position in the lost ACB */
-    float *enr_q,               /* o  : Decoded energy                              */
-    const int16_t nBits_es_Pred /* i  : number of bits for Es_pred Q                */
-);
-
-void improv_amr_wb_gs(
-    const int16_t clas,                 /* i  : bitrate allocated to the core           */
-    const int16_t coder_type,           /* i  : coder_type                              */
-    const int32_t core_brate,           /* i  : bitrate allocated to the core           */
-    int16_t *seed_tcx,                  /* i/o: Seed used for noise generation          */
-    float *old_Aq,                      /* i/o: old LPC filter coefficient              */
-    float *mem_syn2,                    /* i/o: synthesis memory                        */
-    const float lt_voice_fac,           /* i/o: long term voice factor                  */
-    const int16_t locattack,            /* i  : Flag for a detected attack              */
-    float *Aq,                          /* i/o: Decoded LP filter coefficient           */
-    float *exc2,                        /* i/o: Decoded complete excitation             */
-    float *mem_tmp,                     /* i/o: synthesis temporary memory              */
-    float *syn,                         /* i/o: Decoded synthesis to be updated         */
-    const float *pitch_buf,             /* i  : Decoded pitch buffer                    */
-    const float Last_ener,              /* i  : Last energy                             */
-    const int16_t rate_switching_reset, /* i  : rate switching reset flag               */
-    const int16_t last_coder_type,      /* i  : Last coder_type                         */
-    const int16_t VeryLowRateSTflag     /* i  : Enable the noise enhancement for very low rate stereo generic mode */
-);
-
-int16_t tc_classif(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-void transition_dec(
-    Decoder_State *st,      /* i/o: decoder state structure                 */
-    const int16_t L_frame,  /* i  : length of the frame                     */
-    const int16_t i_subfr,  /* i  : subframe index                          */
-    const int16_t tc_subfr, /* i  : TC subframe index                       */
-    int16_t *Jopt_flag,     /* i  : joint optimization flag                 */
-    float *exc,             /* i/o: current frame excitation signal         */
-    int16_t *T0,            /* o  : close loop integer pitch                */
-    int16_t *T0_frac,       /* o  : close loop fractional part of the pitch */
-    int16_t *T0_min,        /* i/o: delta search min for sf 2 & 4           */
-    int16_t *T0_max,        /* i/o: delta search max for sf 2 & 4           */
-    float **pt_pitch,       /* o  : floating pitch values                   */
-    int16_t *position,      /* i/o: first glottal impulse position in frame */
-    float *bwe_exc          /* i/o: excitation for SWB TBE                  */
-);
-
-void gain_dec_tc(
-    Decoder_State *st,     /* i/o: decoder state structure              */
-    const int16_t i_subfr, /* i  : subframe number                      */
-    const float Es_pred,   /* i  : predicted scaled innov. energy       */
-    const float *code,     /* i  : algebraic code excitation            */
-    float *gain_pit,       /* o  : pitch gain                           */
-    float *gain_code,      /* o  : Quantized codeebook gain             */
-    float *gain_inov,      /* o  : unscaled innovation gain             */
-    float *norm_gain_code  /* o  : norm. gain of the codebook excit.    */
-);
-
-void stat_noise_uv_dec(
-    Decoder_State *st,              /* i/o: decoder static memory               */
-    const float *lsp_new,           /* i  : end-frame LSP vector                */
-    const float *lsp_mid,           /* i  : mid-frame LSP vector                */
-    float *Aq,                      /* o  : A(z) quantized for the 4 subframes  */
-    float *exc2,                    /* i/o: excitation buffer                   */
-    const int16_t uc_two_stage_flag /* 1  : flag undicating two-stage UC        */
-);
-
-void sc_vbr_dec_init_flt(
-    SC_VBR_DEC_HANDLE hSC_VBR /* i/o: SC-VBR decoder handle                */
-);
-
-void decod_nelp(
-    Decoder_State *st,    /* i/o: decoder static memory                   */
-    float *tmp_noise,     /* o  : long term temporary noise energy        */
-    float *pitch_buf,     /* o  : floating pitch values for each subframe */
-    float *exc,           /* o  : adapt. excitation exc                   */
-    float *exc2,          /* o  : adapt. excitation/total exc             */
-    float *voice_factors, /* o  : voicing factors                         */
-    float *bwe_exc,       /* o  : excitation for SWB TBE                  */
-    const int16_t bfi,    /* i  : bad frame indicator                     */
-    float *gain_buf       /* o  : floating pitch gain for each subframe   */
-);
-
-void nelp_decoder(
-    Decoder_State *st,        /* i/o: decoder static memory                     */
-    float *exc_nelp,          /* o  : adapt. excitation/total exc               */
-    float *exc,               /* o  : adapt. excitation exc                     */
-    int16_t bfi,              /* i  : frame error rate                          */
-    const int16_t coder_type, /* i  : coding type                               */
-    float *gain_buf           /* o  : floating pitch gain for each subframe     */
-);
-
-ivas_error decod_ppp(
-    Decoder_State *st,    /* i/o: state structure                           */
-    const float Aq[],     /* i  : 12k8 Lp coefficient                       */
-    float *pitch_buf,     /* i/o: floating pitch values for each subframe   */
-    float *exc,           /* i/o: current non-enhanced excitation           */
-    float *exc2,          /* i/o: current enhanced excitation               */
-    float *voice_factors, /* o  : voicing factors                           */
-    float *bwe_exc,       /* o  : excitation for SWB TBE                    */
-    float *gain_buf,      /* o  : floating pitch gain for each subframe     */
-    const int16_t bfi     /* i  : BFI flag                                  */
-);
-
-ivas_error ppp_quarter_decoder(
-    Decoder_State *st,             /* i/o: decoder state structure                 */
-    DTFS_STRUCTURE *CURRCW_Q_DTFS, /* i/o: Current CW DTFS                         */
-    int16_t prevCW_lag,            /* i  : Previous lag                            */
-    float *lastLgainD,             /* i/o: Last gain lowband                       */
-    float *lastHgainD,             /* i/o: Last gain highwband                     */
-    float *lasterbD,               /* i/o: Last ERB vector                         */
-    int16_t bfi,                   /* i  : FER flag                                */
-    DTFS_STRUCTURE PREV_CW_D       /* i  : Previous DTFS                           */
-);
-
-ivas_error ppp_voiced_decoder(
-    Decoder_State *st, /* i/o: state structure                         */
-    float *out,        /* o  : residual signal                         */
-    const float *lpc2, /* i  : current frame LPC                       */
-    float *exc,        /* i  : previous frame excitation               */
-    float *pitch,      /* o  : floating pitch values for each subframe */
-    const int16_t bfi  /* i  : BFI flag                                */
-);
-
-void AVQ_demuxdec(
-    Decoder_State *st,     /* i/o: decoder state structure         */
-    int16_t xriq[],        /* o  : decoded subvectors [0..8*Nsv-1] */
-    int16_t *nb_bits,      /* i/o: number of allocated bits        */
-    const int16_t Nsv,     /* i  : number of subvectors            */
-    int16_t nq[],          /* i/o: AVQ nq index                    */
-    int16_t avq_bit_sFlag, /* i  : flag for AVQ bit saving solution*/
-    int16_t trgtSvPos      /* i  : target SV for AVQ bit savings   */
-);
-
-
-void Init_post_filter_ivas(
-    PFSTAT_HANDLE hPFstat /* i  : post-filter state memories              */
-);
-
-void nb_post_filt_ivas(
-    const int16_t L_frame,    /* i  : frame length                            */
-    const int16_t L_subfr,    /* i  : sub-frame length                        */
-    PFSTAT_HANDLE hPFstat,    /* i/o: Post filter related memories            */
-    float *lp_noise,          /* i/o: long term noise energy                  */
-    const float tmp_noise,    /* i  : noise energy                            */
-    float *synth,             /* i/o: synthesis                               */
-    const float *Aq,          /* i  : LP filter coefficient                   */
-    const float *pitch_buf,   /* i  : Floating pitch   for each subframe      */
-    const int16_t coder_type, /* i  : coder_type -> deactivated in AUDIO      */
-    const int16_t BER_detect, /* i  : BER detect flag                         */
-    const int16_t disable_hpf /* i  : flag to diabled HPF                     */
-);
-
-void decod_unvoiced(
-    Decoder_State *st,               /* i/o: decoder static memory                   */
-    const float *Aq,                 /* i  : LP filter coefficient                   */
-    const float Es_pred,             /* i  : predicted scaled innov. energy          */
-    const int16_t uc_two_stage_flag, /* i  : flag indicating two-stage UC            */
-    float *tmp_noise,                /* o  : long term temporary noise energy        */
-    float *pitch_buf,                /* o  : floating pitch values for each subframe */
-    float *voice_factors,            /* o  : voicing factors                         */
-    float *exc,                      /* o  : adapt. excitation exc                   */
-    float *exc2,                     /* o  : adapt. excitation/total exc             */
-    float *bwe_exc,                  /* i/o: excitation for SWB TBE                  */
-    float *gain_buf                  /* o  : floating pitch gain for each subfram    */
-);
-
-void decod_tran(
-    Decoder_State *st,       /* i/o: decoder static memory                   */
-    const int16_t L_frame,   /* i  : length of the frame                     */
-    const int16_t tc_subfr,  /* i  : TC subframe index                       */
-    const float *Aq,         /* i  : LP filter coefficient                   */
-    const float Es_pred,     /* i  : predicted scaled innov. energy          */
-    float *pitch_buf,        /* o  : floating pitch values for each subframe */
-    float *voice_factors,    /* o  : voicing factors                         */
-    float *exc,              /* i/o: adapt. excitation exc                   */
-    float *exc2,             /* i/o: adapt. excitation/total exc             */
-    float *bwe_exc,          /* i/o: excitation for SWB TBE                  */
-    int16_t *unbits,         /* i/o: number of unused bits                   */
-    const int16_t sharpFlag, /* i  : formant sharpening flag                 */
-    float *gain_buf          /* o  : floating pitch gain for each subframe   */
-);
-
-ivas_error decod_gen_voic(
-    Decoder_State *st,                  /* i/o: decoder static memory                   */
-    const int16_t L_frame,              /* i  : length of the frame                     */
-    const int16_t sharpFlag,            /* i  : formant sharpening flag                 */
-    const float *Aq,                    /* i  : LP filter coefficient                   */
-    const float Es_pred,                /* i  : predicted scaled innov. energy          */
-    const int16_t do_WI,                /* i  : FEC fast recovery flag                  */
-    float *pitch_buf,                   /* o  : floating pitch   for each subframe      */
-    float *voice_factors,               /* o  : voicing factors                         */
-    float *exc,                         /* i/o: adapt. excitation exc                   */
-    float *exc2,                        /* i/o: adapt. excitation/total exc             */
-    float *bwe_exc,                     /* i/o: excitation for SWB TBE                  */
-    int16_t *unbits,                    /* i/o: number of unused bits                   */
-    float *gain_buf,                    /* o  : floating pitch gain for each subframe   */
-    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag        */
-    const float tdm_Pri_pitch_buf[]     /* i  : primary channel pitch buffer            */
-);
-
-void decod_amr_wb(
-    Decoder_State *st,         /* i/o: decoder static memory                     */
-    const float *Aq,           /* i  : LP filter coefficients                    */
-    float *pitch_buf,          /* o  : floating pitch values for each subframe   */
-    float *exc,                /* i/o: adapt. excitation exc                     */
-    float *exc2,               /* i/o: adapt. excitation/total exc               */
-    int16_t hf_gain[NB_SUBFR], /* o  : decoded HF gain                           */
-    float *voice_factors,      /* o  : voicing factors                           */
-    float *gain_buf            /* o  : floating pitch gain for each subframe     */
-);
-
-ivas_error init_decoder(
-    Decoder_State *st,    /* o  : Decoder static variables structure        */
-    const int16_t idchan, /* i  : channel ID                                */
-    const MC_MODE mc_mode /* i  : MC mode                                   */
-);
-
-void destroy_cldfb_decoder_flt(
-    Decoder_State *st /* o  : Decoder static variables structure        */
-);
-
-void HQ_core_dec_init_flt(
-    HQ_DEC_HANDLE hHQ_core /* i/o: HQ core data handle                       */
-);
-
-void HQ_nbfec_init_flt(
-    HQ_NBFEC_HANDLE hHQ_nbfec /* i/o: HQ NB FEC data handle                    */
-);
-
-ivas_error evs_dec(
-    Decoder_State *st,              /* i/o: Decoder state structure                   */
-    float mem_hp20_out[L_HP20_MEM], /* i/o: HP filter memory for synthesis            */
-    float *output,                  /* o  : output synthesis signal                   */
-    FRAME_MODE frameMode            /* i  : Decoder frame mode                        */
-);
-
-void get_next_frame_parameters(
-    Decoder_State *st /* i/o: Decoder state structure                   */
-);
-
-ivas_error amr_wb_dec(
-    Decoder_State *st,              /* i/o: decoder state structure                   */
-    float mem_hp20_out[L_HP20_MEM], /* i/o: HP filter memory for synthesis            */
-    float *output                   /* o  : synthesis output                          */
-);
-
-void transf_cdbk_dec(
-    Decoder_State *st,             /* i/o: decoder state structure                   */
-    const int16_t harm_flag_acelp, /* i  : harmonic flag for higher rates ACELP      */
-    const int16_t i_subfr,         /* i  : subframe index                            */
-    const float Es_pred,           /* i  : predicited scaled innovation energy       */
-    const float gain_code,         /* i  : innovative excitation gain                */
-    float *gain_preQ,              /* o  : prequantizer excitation gain              */
-    float *norm_gain_preQ,         /* o  : normalized prequantizer excitation gain   */
-    float code_preQ[],             /* o  : prequantizer excitation                   */
-    int16_t *unbits                /* o  : number of AVQ unused bits                 */
-);
-
-/*! r: decoded gain */
-float gain_dequant(
-    int16_t index,       /* i  : quantization index                        */
-    const float min_val, /* i  : value of lower limit                      */
-    const float max_val, /* i  : value of upper limit                      */
-    const int16_t bits   /* i  : number of bits to dequantize              */
-);
-
-void hq_core_enc(
-    Encoder_State *st,           /* i/o: encoder state structure                   */
-    const float *audio,          /* i  : input audio signal                        */
-    const int16_t input_frame,   /* i  : frame length                              */
-    const int16_t hq_core_type,  /* i  : HQ core type                              */
-    const int16_t Voicing_flag,  /* i  : Voicing flag for FER method selection     */
-    const int16_t vad_hover_flag /* i  : VAD hangover flag                         */
-);
-
-int16_t detect_transient(
-    Encoder_State *st, /* i/o: encoder state structure             */
-    const float *in,   /* i  : input signal                        */
-    const int16_t L    /* i  : length                              */
-);
-
-void wtda(
-    const float *new_audio,   /* i  : input audio                         */
-    float *wtda_audio,        /* o  : windowed audio                      */
-    float *old_wtda,          /* i/o: windowed audio from previous frame  */
-    const int16_t left_mode,  /* i  : window overlap of previous frame (0: full, 2: none, or 3: half) */
-    const int16_t right_mode, /* i  : window overlap of current frame (0: full, 2: none, or 3: half) */
-    const int16_t L           /* i  : length                              */
-);
-
-void wtda_ext(
-    const float *new_audio,    /* i  : input audio                         */
-    float *wtda_audio,         /* o  : windowed audio                      */
-    const int16_t left_mode,   /* i  : window overlap of previous frame (0: full, 2: none, or 3: half) */
-    const int16_t right_mode,  /* i  : window overlap of current frame (0: full, 2: none, or 3: half) */
-    const int16_t L,           /* i  : length                              */
-    const uint16_t kernel_type /* i  : transform kernel type (0 - 3)       */
-);
-
-void tcx_get_windows_mode1_flt(
-    const int16_t left_mode,  /* i  : overlap mode of left window half    */
-    const int16_t right_mode, /* i  : overlap mode of right window half   */
-    float *left_win,          /* o  : left overlap window                 */
-    float *right_win,         /* o  : right overlap window                */
-    float *left_win_int,      /* o  : left overlap window                 */
-    float *right_win_int,     /* o  : right overlap window                */
-    const int16_t L           /* i  : length                              */
-);
-
-void direct_transform(
-    const float *in32,          /* i  : input signal                        */
-    float *out32,               /* o  : output transformation               */
-    const int16_t is_transient, /* i  : transient flag                      */
-    const int16_t L,            /* i  : length                              */
-    const int16_t element_mode  /* i  : IVAS element mode   */
-);
-
-
-void interleave_spectrum(
-    float *coefs,        /* i/o: input and output coefficients       */
-    const int16_t length /* i  : length of spectrum                  */
-);
-
-void hq_hr_enc(
-    Encoder_State *st,           /* i/o: encoder state structure             */
-    float *coefs,                /* i/o: transform-domain coefficients       */
-    const int16_t length,        /* i  : length of spectrum                  */
-    int16_t *num_bits,           /* i/o: number of available bits            */
-    const int16_t is_transient,  /* i  : transient flag                      */
-    const int16_t vad_hover_flag /* i  : VAD hangover flag                   */
-);
-
-void huff_dec(
-    Decoder_State *st,         /* i/o: decoder state structure                         */
-    const int16_t N,           /* i  : Number of codewords to decode                   */
-    const int16_t buffer_len,  /* i  : Number of bits to read                          */
-    const int16_t num_lengths, /* i  : Number of different huffman codeword lengths    */
-    const int16_t *thres,      /* i  : Threshold of first codeword of each length      */
-    const int16_t *offset,     /* i  : Offset for first codeword                       */
-    const int16_t *huff_tab,   /* i  : Huffman table order by codeword lengths         */
-    int16_t *index             /* o  : Decoded index                                   */
-);
-
-void reordernorm(
-    const int16_t *ynrm,     /* i  : quantization indices for norms      */
-    const int16_t *normqlg2, /* i  : quantized norms                     */
-    int16_t *idxbuf,         /* o  : reordered quantization indices      */
-    int16_t *normbuf,        /* o  : reordered quantized norms           */
-    const int16_t nb_sfm     /* i  : number of bands                     */
-);
-
-void diffcod(
-    const int16_t N, /* i  : number of sub-vectors               */
-    int16_t *y,      /* i/o: indices of quantized norms          */
-    int16_t *difidx  /* o  : differential code                   */
-);
-
-void diffcod_lrmdct(
-    const int16_t N,           /* i  : number of sub-vectors       */
-    const int16_t be_ref,      /* i  : band energy reference       */
-    int16_t *y,                /* i/o: indices of quantized norms  */
-    int16_t *difidx,           /* o  : differential code           */
-    const int16_t is_transient /* i  : transient flag              */
-);
-
-void bitallocsum(
-    int16_t *R,             /* i  : bit-allocation vector               */
-    const int16_t nb_sfm,   /* i  : number of sub-vectors               */
-    int16_t *sum,           /* o  : total number of bits allocated      */
-    int16_t *Rsubband,      /* o  : rate per subband (Q3)               */
-    const int16_t num_bits, /* i  : number of bits                      */
-    const int16_t length,   /* i  : length of spectrum                  */
-    const int16_t *sfmsize  /* i  : Length of bands                     */
-);
-/*! r: BWE class */
-int16_t swb_bwe_gain_deq_flt(
-    Decoder_State *st,       /* i/o: decoder state structure                     */
-    const int16_t core,      /* i  : core                                        */
-    float *SWB_tenv,         /* o  : time-domain BWE envelope                    */
-    float *SWB_fenv,         /* o  : frequency-domain BWE envelope               */
-    const int16_t hr_flag,   /* i  : high rate flag                              */
-    const int16_t hqswb_clas /* i  : HQ BWE class                                */
-);
-
-void save_old_syn(
-    const int16_t L_frame,    /* i  : frame length                                */
-    const float syn[],        /* i  : ACELP synthesis                             */
-    float old_syn[],          /* o  : old synthesis buffer                        */
-    float old_syn_12k8_16k[], /* i/o: old synthesis buffer                        */
-    const float preemph_fac,  /* i  : preemphasis factor                          */
-    float *mem_deemph         /* i/o: deemphasis filter memory                    */
-);
-
-void hq_generic_hf_decoding(
-    const int16_t HQ_mode,             /* i  : HQ mode                                     */
-    float *coeff_out1,                 /* i/o: BWE input & temporary buffer                */
-    const float *hq_generic_fenv,      /* i  : SWB frequency envelopes                     */
-    float *coeff_out,                  /* o  : SWB signal in MDCT domain                   */
-    const int16_t hq_generic_offset,   /* i  : frequency offset for representing hq swb bwe*/
-    int16_t *prev_L_swb_norm,          /* i/o: last normalize length                       */
-    const int16_t hq_swb_bwe_exc_clas, /* i  : bwe excitation class                        */
-    const int16_t *R );
-
-void hq_core_dec(
-    Decoder_State *st,                 /* i/o: decoder state structure                 */
-    float out[],                       /* o  : output synthesis                        */
-    const int16_t output_frame,        /* i  : output frame length                     */
-    const int16_t hq_core_type,        /* i  : HQ core type                            */
-    const int16_t core_switching_flag, /* i  : ACELP->HQ switching frame flag          */
-    float *output                      /* o  : LB synthesis in case of ACELP-HQ switch */
-);
-
-void IMDCT(
-    float *x,
-    float *old_syn_overl,
-    float *syn_Overl_TDAC,
-    float *xn_buf,
-    const float *tcx_aldo_window_1_trunc,
-    const float *tcx_aldo_window_2,
-    const float *tcx_mdct_window_half,
-    const float *tcx_mdct_window_minimum,
-    const float *tcx_mdct_window_trans,
-    const int16_t tcx_mdct_window_half_length,
-    const int16_t tcx_mdct_window_min_length,
-    int16_t index,
-    const uint16_t kernel_type, /* i  : TCX transform kernel type               */
-    const int16_t left_rect,
-    const int16_t tcx_offset,
-    const int16_t overlap,
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    const int16_t L_spec_TCX5,
-    const int16_t L_frame_glob,
-    const int16_t frame_cnt,
-    const int16_t bfi,
-    float *old_out,
-    const int16_t FB_flag,
-    Decoder_State *st,
-    const int16_t fullband,
-    float *acelp_zir );
-
-void hq_hr_dec(
-    Decoder_State *st,                /* i/o: decoder state structure         */
-    float *t_audio_q,                 /* o  : transform-domain coefficients   */
-    const int16_t length,             /* i  : frame length                    */
-    const int16_t num_bits,           /* i  : number of available bits        */
-    int16_t *ynrm,                    /* o  : norm quantization index vector  */
-    int16_t *is_transient,            /* o  : transient flag                  */
-    int16_t *hqswb_clas,              /* o  : HQ SWB class                    */
-    float *SWB_fenv,                  /* o  : SWB frequency envelopes         */
-    const int16_t core_switching_flag /* i  : Core switching flag             */
-
-);
-
-void hdecnrm_context(
-    Decoder_State *st, /* i/o: decoder state structure                 */
-    const int16_t N,   /* i  : number of norms                         */
-    int16_t *index,    /* o  : indices of quantized norms              */
-    int16_t *n_length  /* o  : decoded stream length                   */
-);
-
-void hdecnrm_tran(
-    Decoder_State *st, /* i/o: decoder state structure     */
-    const int16_t N,   /* i  : number of norms             */
-    int16_t *index     /* o  : indices of quantized norms  */
-);
-
-void hdecnrm_resize(
-    Decoder_State *st, /* i/o: decoder state structure                 */
-    const int16_t N,   /* i  : number of SFMs                          */
-    int16_t *index     /* o  : norm quantization index vector          */
-);
-
-void hdecnrm(
-    Decoder_State *st, /* i/o: decoder state structure                 */
-    const int16_t N,   /* i  : number of norms                         */
-    int16_t *index     /* o  : indices of quantized norms              */
-);
-
-/*! r: index of last band */
-int16_t find_last_band(
-    const int16_t *bitalloc, /* i  : bit allocation                          */
-    const int16_t nb_sfm     /* i  : number of possibly coded bands          */
-);
-
-void fill_spectrum(
-    float *coeff,                      /* i/o: normalized MLT spectrum / nf spectrum                 */
-    int16_t *R,                        /* i  : number of pulses per band                             */
-    const int16_t is_transient,        /* i  : transient flag                                        */
-    int16_t norm[],                    /* i  : quantization indices for norms                        */
-    const float *hq_generic_fenv,      /* i  : HQ GENERIC envelope                                   */
-    const int16_t hq_generic_offset,   /* i  : HQ GENERIC offset                                     */
-    const int16_t nf_idx,              /* i  : noise fill index                                      */
-    const int16_t length,              /* i  : Length of spectrum (32 or 48 kHz)                     */
-    const float env_stab,              /* i  : Envelope stability measure [0..1]                     */
-    int16_t *no_att_hangover,          /* i/o: Frame counter for attenuation hangover                */
-    float *energy_lt,                  /* i/o: Long-term energy measure for transient detection      */
-    int16_t *bwe_seed,                 /* i/o: random seed for generating BWE input                  */
-    const int16_t hq_generic_exc_clas, /* i  : HF excitation class                                   */
-    const int16_t core_sfm,            /* i  : index of the end band for core                        */
-    int16_t HQ_mode,                   /* i  : HQ mode                                               */
-    float noise_level[],               /* i  : noise level for harmonic modes                        */
-    int32_t core_brate,                /* i  : target bitrate                                        */
-    float prev_noise_level[],          /* i/o: noise factor in previous frame                        */
-    int16_t *prev_R,                   /* i/o: bit allocation info. in previous frame                */
-    float *prev_coeff_out,             /* i/o: decoded spectrum in previous frame                    */
-    const int16_t *peak_idx,           /* i  : peak positions                                        */
-    const int16_t Npeaks,              /* i  : number of peaks                                       */
-    const int16_t *npulses,            /* i  : Number of assigned pulses per band                    */
-    int16_t prev_is_transient,         /* i  : previous transient flag                               */
-    float *prev_normq,                 /* i  : previous norms                                        */
-    float *prev_env,                   /* i  : previous noise envelopes                              */
-    int16_t prev_bfi,                  /* i  : previous bad frame indicator                          */
-    const int16_t *sfmsize,            /* i  : Length of bands                                       */
-    const int16_t *sfm_start,          /* i  : Start of bands                                        */
-    const int16_t *sfm_end,            /* i  : End of bands                                          */
-    int16_t *prev_L_swb_norm,          /* i/o: last normalize length for harmonic mode               */
-    int16_t prev_hq_mode,              /* i  : previous HQ mode                                      */
-    const int16_t num_sfm,             /* i  : Number of bands                                       */
-    const int16_t num_env_bands,       /* i  : Number of envelope bands                              */
-    const int16_t element_mode         /* i  : element mode                                          */
-);
-
-void de_interleave_spectrum(
-    float *coefs,  /* i/o: input and output coefficients   */
-    int16_t length /* i  : length of spectrum              */
-);
-
-void inverse_transform(
-    const float *InMDCT,       /* i  : input MDCT vector               */
-    float *Out,                /* o  : output vector                   */
-    const int16_t IsTransient, /* i  : transient flag                  */
-    const int16_t L,           /* i  : output frame length             */
-    const int16_t L_inner,     /* i  : length of the transform         */
-    const int16_t element_mode /* i  : IVAS element mode   */
-);
-
-void window_ola(
-    const float *ImdctOut, /* i  : input                           */
-    float *auOut,          /* o  : output audio                    */
-    float *OldauOut,       /* i/o: audio from previous frame       */
-    const int16_t L,       /* i  : length                          */
-    const int16_t right_mode,
-    const int16_t left_mode,    /* i  : window overlap of current frame (0: full, 2: none, or 3: half) */
-    const int16_t use_bfi_win,  /* i  : use BFI windowing               */
-    const int16_t oldHqVoicing, /* i  : previous HqVoicing              */
-    float *oldgapsynth          /* i  : previous gapsynth               */
-);
-
-void window_ola_ext(
-    const float *ImdstOut, /* i  : input                       */
-    float *auOut,          /* o  : output audio                */
-    float *OldauOut,       /* i/o: audio from previous frame   */
-    const int16_t L,       /* i  : length                      */
-    const int16_t right_mode,
-    const int16_t left_mode,   /* i  : window overlap of current frame (0: full, 2: none, or 3: half) */
-    const uint16_t kernel_type /* i  : transform kernel type  */
-);
-
-void map_quant_weight(
-    const int16_t normqlg2[],  /* i  : quantized norms                 */
-    int16_t wnorm[],           /* o  : weighted norm                   */
-    const int16_t is_transient /* i  : transient flag                  */
-);
-
-void recovernorm(
-    const int16_t *const idxbuf, /* i  : reordered quantization indices */
-    int16_t *ynrm,               /* o  : recovered quantization indices */
-    int16_t *normqlg2,           /* o  : recovered quantized norms      */
-    const int16_t nb_sfm         /* i  : number of subbands             */
-);
-
-void reordvct(
-    int16_t *y,      /* i/o: vector to rearrange    */
-    const int16_t N, /* i  : dimensions             */
-    int16_t *idx     /* o  : reordered vector index */
-);
-
-void bitalloc(
-    int16_t *y,              /* i  : reordered norm of sub-vectors           */
-    int16_t *idx,            /* i  : reordered sub-vector indices            */
-    int16_t sum,             /* i  : number of available bits                */
-    int16_t N,               /* i  : number of norms                         */
-    int16_t K,               /* i  : maximum number of bits per dimension    */
-    int16_t *r,              /* o  : bit-allacation vector                   */
-    const int16_t *sfmsize,  /* i  : Length of bands                         */
-    const int16_t hqswb_clas /* i  : signal classification flag              */
-);
-
-/*! r: Integer (truncated) number of allocated bits */
-int16_t BitAllocF(
-    int16_t *y,                 /* i  : norm of sub-vectors                     */
-    int32_t bit_rate,           /* i  : bitrate                                 */
-    int16_t B,                  /* i  : number of available bits                */
-    int16_t N,                  /* i  : number of sub-vectors                   */
-    int16_t *R,                 /* o  : bit-allocation indicator                */
-    int16_t *Rsubband,          /* o  : sub-band bit-allocation vector (Q3)     */
-    const int16_t hqswb_clas,   /* i  : hq swb class                            */
-    const int16_t num_env_bands /* i  : Number sub bands to be encoded for HQ_SWB_BWE  */
-);
-
-/*! r: Integer (truncated) number of allocated bits */
-int16_t BitAllocWB(
-    int16_t *y,          /* i  : norm of sub-vectors                     */
-    int16_t B,           /* i  : number of available bits                */
-    int16_t N,           /* i  : number of sub-vectors                   */
-    int16_t *R,          /* o  : bit-allocation indicator                */
-    int16_t *Rsubband ); /* o  : sub-band bit-allocation vector (Q3)     */
-
-/*! r: Number of low frequency bands */
-int16_t hvq_pvq_bitalloc(
-    int16_t num_bits,         /* i/o: Number of available bits (including gain bits) */
-    const int32_t core_brate, /* i  : bitrate                     */
-    const int16_t bwidth,     /* i  : Encoded bandwidth           */
-    const int16_t *ynrm,      /* i  : Envelope coefficients       */
-    const int32_t manE_peak,  /* i  : Peak energy mantissa        */
-    const int16_t expE_peak,  /* i  : Peak energy exponent        */
-    int16_t *Rk,              /* o  : bit allocation for concatenated vector */
-    int16_t *R,               /* i/o: Global bit allocation       */
-    int16_t *sel_bands,       /* o  : Selected bands for encoding */
-    int16_t *n_sel_bands      /* o  : No. of selected bands for encoding */
-);
-
-void floating_point_add_float(
-    int32_t *mx,      /* i/o: mantissa of the addend Q31    */
-    int16_t *ex,      /* i/o: exponent of the addend Q0     */
-    const int32_t my, /* i  :  mantissa of the adder Q31    */
-    const int16_t ey  /* i  :  exponent of the adder Q0     */
-);
-
-/*! r: Number of bits needed */
-int16_t rc_get_bits2(
-    const int16_t N,     /* i  : Number of bits currently used */
-    const uint32_t range /* i  : Range of range coder          */
-);
-
-void rc_enc_init(
-    PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle            */
-    int16_t tot_bits     /* i  : Total bit budget              */
-);
-
-void rc_encode(
-    BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle            */
-    PVQ_ENC_HANDLE hPVQ,     /* i/o: PVQ encoder handle                  */
-    const uint32_t cum_freq, /* i  : Cumulative frequency up to symbol   */
-    const uint32_t sym_freq, /* i  : Symbol probability                  */
-    const uint32_t tot       /* i  : Total cumulative frequency          */
-);
-
-void rc_enc_finish(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle  */
-    PVQ_ENC_HANDLE hPVQ    /* i/o: PVQ encoder handle        */
-);
-
-void rc_enc_bits(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle  */
-    PVQ_ENC_HANDLE hPVQ,   /* i/o: PVQ encoder handle        */
-    const uint32_t value,  /* i  : Value to encode           */
-    const int16_t bits     /* i  : Number of bits used       */
-);
-
-void rc_enc_uniform(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle  */
-    PVQ_ENC_HANDLE hPVQ,   /* i/o: PVQ encoder handle        */
-    uint32_t value,        /* i  : Value to encode           */
-    uint32_t tot           /* i  : Maximum value             */
-);
-
-void rc_dec_init(
-    Decoder_State *st,   /* i/o: Decoder State       */
-    PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle  */
-    int16_t tot_bits     /* i  : Total bit budget    */
-);
-
-/*! r: Decoded value */
-uint32_t rc_decode(
-    int16_t *BER_detect, /* o  : Bit error detection flag        */
-    PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle              */
-    uint32_t tot         /* i  : Total cumulative frequency      */
-);
-
-void rc_dec_update(
-    Decoder_State *st,       /* i/o: Decoder State           */
-    PVQ_DEC_HANDLE hPVQ,     /* i/o: PVQ decoder handle      */
-    const uint32_t cum_freq, /* i  : Cumulative frequency    */
-    const uint32_t sym_freq  /* i  : Symbol frequency        */
-);
-
-/*! r: Decoded value   */
-uint32_t rc_dec_bits(
-    Decoder_State *st,   /* i/o: Decoder State          */
-    PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle     */
-    const int16_t bits   /* i  : Number of bits         */
-);
-
-/*! r: Decoded value   */
-uint32_t rc_dec_uniform(
-    Decoder_State *st,   /* i/o: Decoder State          */
-    PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle     */
-    const uint32_t tot   /* i  : Maximum value          */
-);
-
-void rc_dec_finish(
-    Decoder_State *st,  /* i/o: decoder state structure */
-    PVQ_DEC_HANDLE hPVQ /* i/o: PVQ decoder handle      */
-);
-
-/*! r: number of bits encoded */
-int16_t pvq_core_enc(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: encoder bitstream handle          */
-    float coefs_norm[],       /* i/o: normalized coefficients to encode */
-    float coefs_quant[],      /* o  : quantized coefficients            */
-    const int16_t bits_tot,   /* i  : total number of bits              */
-    const int16_t nb_sfm,     /* i  : number of bands                   */
-    const int16_t *sfm_start, /* i  : Subband start coefficient         */
-    const int16_t *sfm_end,   /* i  : Subband end coefficient           */
-    const int16_t *sfmsize,   /* i  : subband width                     */
-    int16_t *R,               /* i/o: Bit allocation/Adjusted bit alloc. (Q3) */
-    int16_t *Rs,              /* i/o: Integer bit allocation            */
-    int16_t *npulses,         /* o  : number of pulses                  */
-    int16_t *maxpulse,        /* i  : maximum pulse per band            */
-    const int16_t core        /* i  : number of bands                   */
-);
-
-/*! r: number of bits decoded  */
-int16_t pvq_core_dec(
-    Decoder_State *st,        /* i/o: Decoder state                        */
-    const int16_t *sfm_start, /* i  : indices of first coeffs in the bands */
-    const int16_t *sfm_end,   /* i  : indices of last coeffs in the bands  */
-    const int16_t *sfmsize,   /* i  : band sizes                           */
-    float coefs_quant[],      /* o  : output MDCT                          */
-    const int16_t bits_tot,   /* i  : bit budget                           */
-    const int16_t nb_sfm,     /* i  : number of bands                      */
-    int16_t *R,               /* i/o: Bit allocation/Adjusted bit alloc.(Q3) */
-    int16_t *Rs,              /* i/o: Integer bit allocation               */
-    int16_t *npulses,         /* o  : number of pulses per band            */
-    int16_t *maxpulse,        /* o  : maximum pulse per band               */
-    const int16_t core        /* i  : core                                 */
-);
-
-void pvq_encode(
-    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle             */
-    PVQ_ENC_HANDLE hPVQ,   /* i/o: PVQ encoder handle                   */
-    const float *x,        /* i  : vector to quantize                   */
-    int16_t *y,            /* o  : quantized vector (non-scaled integer)*/
-    float *xq,             /* o  : quantized vector (scaled float)      */
-    const int16_t pulses,  /* i  : number of allocated pulses           */
-    const int16_t N,       /* i  : Length of vector                     */
-    const float gain       /* i  : Gain                                 */
-);
-
-void pvq_decode(
-    Decoder_State *st,   /* i/o: Decoder State                    */
-    PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle               */
-    float *xq,           /* o  : decoded vector (scaled float)    */
-    int16_t *y,          /* o  : decoded vector (non-scaled short)*/
-    const int16_t K,     /* i  : number of allocated pulses       */
-    const int16_t N,     /* i  : Length of vector                 */
-    const float gain     /* i  : Gain                             */
-);
-
-void rangeCoderFinalizationFBits(
-    const int16_t Brc,    /*  i  : Current number of decoded bits */
-    const uint32_t INTrc, /*  i  : Range coder state              */
-    int16_t *FBits        /*  i  : Fractional finalization bits   */
-);
-
-void bandBitsAdjustment(
-    const int16_t Brc,     /* i  : Current number of read quanta in range coder */
-    const uint32_t INTrc,  /* i  : Range coder state                            */
-    const int16_t Bavail,  /* i  : Available number of quanta                   */
-    const int16_t Nbands,  /* i  : Number of bands                              */
-    const int16_t D,       /* i  : Remaining number of bands to encode          */
-    const int16_t L,       /* i  : Size of current band                         */
-    const int16_t Bband,   /* i  : Quanta allocation for current band           */
-    const int16_t Breserv, /* i  : Quanta reservoir                             */
-    int16_t *Bband_adj,    /* o  : Actual used number of quanta                 */
-    int16_t *Brem,         /* o  : Quanta remaining                             */
-    int16_t *Breservplus   /* o  : Quanta pool size                             */
-);
-
-void conservativeL1Norm(
-    const int16_t L,       /* i  : Length of vector segment      */
-    const int16_t Qvec,    /* i  : Assigned number of quanta     */
-    const int16_t Fcons,   /* i  : Conservative rounding flag    */
-    const int16_t Qavail,  /* i  : Input quanta remaining        */
-    const int16_t Qreserv, /* i  : Input quanta in reservoir     */
-    const int16_t Dspec,   /* i  : assigned diracs from bitalloc */
-    int16_t *Dvec,         /* o  : actual number of diracs       */
-    int16_t *Qspare,       /* o  : Output quanta remaining       */
-    int16_t *Qreservplus,  /* o  : Output quanta in reservoir    */
-    int16_t *Dspecplus     /* o  : Output number of diracs       */
-);
-
-void NearOppSplitAdjustment(
-    const int16_t qband,    /* i  : quanta for current band         */
-    const int16_t qzero,    /* i  : range coder finalization quanta */
-    const int16_t Qac,      /* i  : range coder current quanta      */
-    const uint32_t INTac,   /* i  : range coder state               */
-    const int16_t qglobal,  /* i  : quanta input                    */
-    const int16_t FlagCons, /* i  : conservative rounding flag      */
-    const int16_t Np,       /* i  : number of parts                 */
-    const int16_t Nhead,    /* i  : first part                      */
-    const int16_t Ntail,    /* i  : remaining parts                 */
-    const int16_t Nnear,    /* i  : length of near component        */
-    const int16_t Nopp,     /* i  : length of opposite component    */
-    int16_t oppRQ3,         /* i  : ratio                           */
-    int16_t *qnear,         /* o  : quantized near                  */
-    int16_t *qopp,          /* o  : quantized opposite              */
-    int16_t *qglobalupd     /* o  : quanta remaining                */
-);
-
-/*! r: Approximate integer division for positive input */
-int32_t intLimCDivPos(
-    const int32_t NUM, /* i  : numerator   */
-    const int16_t DEN  /* i  : denominator */
-);
-
-/*! r: Approximate integer division */
-int16_t shrtCDivSignedApprox_flt(
-    const int16_t num, /* i  : numerator   */
-    const int16_t den  /* i  : denominator */
-);
-
-void QuantaPerDsDirac(
-    const int16_t td,                  /* i  : Length of vector segment   */
-    const int16_t dsDiracIndex,        /* i  : Quanta table index         */
-    const uint8_t *const *dimFrQuanta, /* i  : Quanta lookup table        */
-    int16_t *Quanta                    /* i  : Quanta                     */
-);
-
-void obtainEnergyQuantizerDensity(
-    const int16_t L_in, /* i  : left vector energy  */
-    const int16_t R_in, /* i  : right vector energy */
-    int16_t *Density    /* o  : quantizer density   */
-);
-
-void densityAngle2RmsProjDec(
-    const int16_t D,        /* i  : density                   */
-    const int16_t indexphi, /* i  : decoded index from AR dec */
-    int16_t *oppQ15,        /* o  : opposite                  */
-    int16_t *nearQ15,       /* o  : near                      */
-    int16_t *oppRatioQ3     /* o  : ratio                     */
-);
-
-void densityAngle2RmsProjEnc(
-    const int16_t D,        /* i  : density  */
-    const int16_t phiQ14uq, /* i  : angle    */
-    int16_t *indexphi,      /* o  : index    */
-    int16_t *oppQ15,        /* o  : opposite */
-    int16_t *nearQ15,       /* o  : near     */
-    int16_t *oppRatioQ3     /* o  : ratio    */
-);
-
-void env_adj(
-    const int16_t *pulses,  /* i  : number of pulses per band             */
-    const int16_t length,   /* i  : length of spectrum                    */
-    const int16_t last_sfm, /* i  : Index of last band                    */
-    float *adj,             /* o  : Adjustment factors for the envelope   */
-    const float env_stab,   /* i  : Envelope stability parameter          */
-    const int16_t *sfmsize  /* i  : Length of bands                       */
-);
-
-float env_stability(
-    const int16_t *ynrm,              /* i  : Norm vector for current frame          */
-    const int16_t nb_sfm,             /* i  : Number of sub-bands                    */
-    int16_t *mem_norm,                /* i/o: Norm vector memory from past frame     */
-    int16_t *mem_env_delta,           /* i/o: Envelope stability memory for smoothing*/
-    const int16_t core_switching_flag /* i  : Core switching flag             */
-);
-
-/*! r: New speech/music state */
-float env_stab_smo(
-    float env_stab,          /* i  : env_stab value                         */
-    float *env_stab_state_p, /* i/o: env_stab state probabilities           */
-    int16_t *ho_cnt          /* i/o: hangover counter for speech state      */
-);
-void core_switching_post_enc(
-    Encoder_State *st, /* i/o: encoder state structure             */
-    // const float *old_inp_12k8, /* i  : old input signal @12.8kHz           */
-    float *old_inp_12k8, /* i  : old input signal @12.8kHz           */
-    // const float *old_inp_16k,  /* i  : old input signal @16kHz             */
-    float *old_inp_16k, /* i  : old input signal @16kHz             */
-    // const float A[]            /* i  : unquant. LP filter coefs.           */
-    Word16 A_fx[], /* i  : unquant. LP filter coefs.           */
-    Word16 Q_new );
-ivas_error core_switching_post_dec(
-    Decoder_State *st,                   /* i/o: decoder state structure                 */
-    float *synth,                        /* i/o: output synthesis                        */
-    float *output,                       /* i/o: LB synth/upsampled LB synth             */
-    float output_mem[],                  /* i  : OLA memory from last TCX/HQ frame       */
-    const IVAS_FORMAT ivas_format,       /* i  : IVAS format                             */
-    const int16_t use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo     */
-    const int16_t output_frame,          /* i  : frame length                            */
-    const int16_t core_switching_flag,   /* i  : ACELP->HQ switching frame flag          */
-    const int16_t sba_dirac_stereo_flag, /* i  : signal stereo output for SBA DirAC      */
-    const int16_t nchan_out,             /* i  : number of output channels               */
-    const int16_t last_element_mode      /* i  : element mode of previous frame          */
-);
-
-ivas_error core_switching_pre_dec(
-    Decoder_State *st,                 /* i/o: decoder state structure              */
-    const int16_t output_frame,        /* i  : frame length                         */
-    const int32_t last_core_brate_st0, /* i  : channel 0 last core bitrate          */
-    const int16_t nchan_out,           /* i  : number of output channels            */
-    const int16_t last_element_mode,   /* i  : last_element_mode                    */
-    const int32_t last_element_brate   /* i  : last element bitrate                 */
-);
-
-void bandwidth_switching_detect(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-void bw_switching_pre_proc(
-    Decoder_State *st,                /* i/o: decoder state structure                 */
-    const float *old_syn_12k8_16k,    /* i  : ACELP core synthesis @ 12.8kHz or 16kHz */
-    const int32_t last_element_brate, /* i  : last element bitrate                     */
-    const int16_t nchan_out           /* i  : number of output channels               */
-);
-
-void updt_bw_switching(
-    Decoder_State *st, /* i/o: decoder state structure                 */
-    const float *synth /* i  : float synthesis signal                  */
-);
-
-void swb_tbe_reset(
-    float mem_csfilt[],
-    float mem_genSHBexc_filt_down_shb[],
-    float state_lpc_syn[],
-    float syn_overlap[],
-    float state_syn_shbexc[],
-    float *tbe_demph,
-    float *tbe_premph,
-    float mem_stp_swb[],
-    float *gain_prec_swb );
-
-void swb_tbe_reset_synth(
-    float genSHBsynth_Hilbert_Mem[],
-    float genSHBsynth_state_lsyn_filt_shb_local[] );
-
-void find_td_envelope(
-    const float inp[],
-    const int16_t len,
-    const int16_t len_h,
-    float mem_h[],
-    float out[] );
-
-void fb_tbe_reset_enc(
-    float elliptic_bpf_2_48k_mem[][4],
-    float *prev_fb_energy );
-
-void fb_tbe_reset_synth(
-    float fbbwe_hpf_mem[][4],
-    float *prev_fbbwe_ratio );
-
-void wb_tbe_extras_reset(
-    float mem_genSHBexc_filt_down_wb2[],
-    float mem_genSHBexc_filt_down_wb3[] );
-
-void wb_tbe_extras_reset_synth(
-    float state_lsyn_filt_shb[],
-    float state_lsyn_filt_dwn_shb[],
-    float mem_resamp_HB[] );
-
-void tbe_celp_exc_flt(
-    const int16_t element_mode, /* i  : element mode                            */
-    const int16_t idchan,       /* i  : channel ID                              */
-    float *bwe_exc,             /* i/o: BWE excitation                          */
-    const int16_t L_frame,      /* i  : frame length                            */
-    const int16_t L_subfr,      /* i  : subframe length                         */
-    const int16_t i_subfr,      /* i  : subframe index                          */
-    const int16_t T0,           /* i  : integer pitch lag                       */
-    const int16_t T0_frac,      /* i  : fraction of lag                         */
-    float *error,               /* i/o: error                                   */
-    const int16_t tdm_LRTD_flag /* i  : LRTD stereo mode flag                   */
-);
-
-void prep_tbe_exc(
-    const int16_t L_frame,      /* i  : length of the frame                     */
-    const int16_t L_subfr,      /* i  : subframe length                         */
-    const int16_t i_subfr,      /* i  : subframe index                          */
-    const float gain_pit,       /* i  : Pitch gain                              */
-    const float gain_code,      /* i  : algebraic codebook gain                 */
-    const float code[],         /* i  : algebraic excitation                    */
-    const float voice_fac,      /* i  : voicing factor                          */
-    float *voice_factors,       /* o  : TBE voicing factor                      */
-    float bwe_exc[],            /* i/o: excitation for TBE                      */
-    const float gain_preQ,      /* i  : prequantizer excitation gain            */
-    const float code_preQ[],    /* i  : prequantizer excitation                 */
-    const int16_t T0,           /* i  : integer pitch variables                 */
-    const int16_t coder_type,   /* i  : coding type                             */
-    const int32_t core_brate,   /* i  : core bitrate                            */
-    const int16_t element_mode, /* i  : element mode                            */
-    const int16_t idchan,       /* i  : channel ID                              */
-    const int16_t flag_TD_BWE,  /* i  : flag indicating whether hTD_BWE exists  */
-    const int16_t tdm_LRTD_flag /* i  : LRTD stereo mode flag                   */
-);
-
-void synthesise_fb_high_band(
-    const float excitation_in[], /* i  : full band excitation                    */
-    float output[],              /* o  : high band speech - 14.0 to 20 kHz       */
-    const float fb_exc_energy,   /* i  : full band excitation energy             */
-    const float ratio_float,     /* i  : energy ratio                            */
-    const int16_t L_frame,       /* i  : ACELP frame length                      */
-    const int16_t bfi,           /* i  : BFI flag                                */
-    float *prev_fbbwe_ratio,     /* o  : previous frame energy for FEC           */
-    float bpf_memory[][4]        /* i/o: memory for elliptic bpf 48k             */
-);
-
-void elliptic_bpf_48k_generic(
-    const float input[],           /* i  : input signal                            */
-    float output[],                /* o  : output signal                           */
-    float memory[][4],             /* i/o: 4 arrays for memory                     */
-    const float full_band_bpf[][5] /* i  : filter coefficients b0,b1,b2,a0,a1,a2   */
-);
-
-void HQ_FEC_processing(
-    Decoder_State *st,            /* i/o: decoder state structure                          */
-    float *t_audio_q,             /* o  : MDCT coeffs. (for synthesis)                     */
-    int16_t is_transient,         /* i  : Old flag for transient                           */
-    float ynrm_values[][MAX_PGF], /* i  : Old average Norm values for each group of bands  */
-    float r_p_values[][MAX_ROW],  /* i  : Computed y-intercept and slope by Regression     */
-    int16_t num_Sb,               /* i  : Number of sub-band group                         */
-    int16_t nb_sfm,               /* i  : Number of sub-band                               */
-    int16_t *Num_bands_p,         /* i  : Number of coeffs. for each sub-band              */
-    int16_t output_frame,         /* i  : Frame size                                       */
-    const int16_t *sfm_start,     /* i  : Start of bands                                   */
-    const int16_t *sfm_end        /* i  : End of bands                                     */
-);
-
-void HQ_FEC_Mem_update(
-    Decoder_State *st, /* i/o: decoder state structure            */
-    const float *t_audio_q,
-    float *normq,
-    int16_t *ynrm,
-    const int16_t *Num_bands_p,
-    const int16_t is_transient,
-    const int16_t hqswb_clas,
-    const int16_t c_switching_flag,
-    const int16_t nb_sfm,
-    const int16_t num_Sb,
-    float *mean_en_high,
-    const int16_t hq_core_type, /* i  : normal or low-rate MDCT(HQ) core */
-    const int16_t output_frame  /* i  : Frame size                       */
-);
-
-void time_domain_FEC_HQ(
-    Decoder_State *st,         /* i  : Decoder State                           */
-    float *wtda_audio,         /* i  : input                                   */
-    float *out,                /* o  : output audio                            */
-    const float mean_en_high,  /* i  : transient flag                          */
-    const int16_t output_frame /* i  : Frame size                               */
-);
-
-void save_synthesis_hq_fec(
-    Decoder_State *st,          /* i/o: decoder state structure                 */
-    const float *output,        /* i  : decoded synthesis                       */
-    const int16_t output_frame, /* i  : decoded synthesis                       */
-    CPE_DEC_HANDLE hCPE         /* i  : CPE decoder structure                   */
-);
-
-void Next_good_after_burst_erasures(
-    const float *ImdctOut, /* i  : input                                   */
-    float *auOut,          /* o  : output audio                            */
-    float *OldauOut,       /* i/o: audio from previous frame               */
-    const int16_t ol_size  /* i  : overlap size                            */
-);
-
-
-void reset_preecho_dec(
-    HQ_DEC_HANDLE hHQ_core /* i/o: HQ decoder handle                       */
-);
-
-void preecho_sb(
-    const int32_t core_brate,  /* i  : core bitrate                                            */
-    const float wtda_audio[],  /* i  : imdct signal                                            */
-    float *rec_sig,            /* i  : reconstructed signal, output of the imdct transform     */
-    const int16_t framelength, /* i  : frame length                                            */
-    float *memfilt_lb,         /* i/o: memory                                                  */
-    float *mean_prev_hb,       /* i/o: memory                                                  */
-    float *smoothmem,          /* i/o: memory                                                  */
-    float *mean_prev,          /* i/o: memory                                                  */
-    float *mean_prev_nc,       /* i/o: memory                                                  */
-    float *wmold_hb,           /* i/o: memory                                                  */
-    int16_t *prevflag,         /* i/o: flag                                                    */
-    int16_t *pastpre,          /* i/o: flag                                                    */
-    const int16_t bwidth       /* i  : audio bandwidth                                         */
-);
-
-void hq2_core_configure(
-    const int16_t frame_length, /* i  : frame length                            */
-    const int16_t num_bits,     /* i  : number of bits                          */
-    const int16_t is_transient, /* i  : transient flag                          */
-    int16_t *bands,
-    int16_t *length,
-    int16_t band_width[],
-    int16_t band_start[],
-    int16_t band_end[],
-    Word32 *L_qint,              /* o  : Q29 */
-    Word16 *eref_fx,             /* o  : Q10 */
-    Word16 *bit_alloc_weight_fx, /* o  : Q13 */
-    int16_t *gqlevs,
-    int16_t *Ngq,
-    int16_t *p2a_bands,
-    float *p2a_th,
-    float *pd_thresh,
-    float *ld_slope,
-    float *ni_coef,
-    float *ni_pd_th,
-    int32_t bwe_br );
-
-void hq_lr_enc(
-    Encoder_State *st,         /* i/o: encoder state structure                 */
-    float t_audio[],           /* i/o: transform-domain coefs.                 */
-    const int16_t inner_frame, /* i  : inner frame length                      */
-    int16_t *num_bits,         /* i/o: number of available bits                */
-    const int16_t is_transient /* i  : transient flag                          */
-);
-
-void hq_lr_dec(
-    Decoder_State *st,         /* i/o: decoder state structure                 */
-    float yout[],              /* o  : transform-domain output coefs.          */
-    const int16_t inner_frame, /* i  : inner frame length                      */
-    int16_t num_bits,          /* i  : number of available bits                */
-    int16_t *is_transient      /* o  : transient flag                          */
-);
-
-void hq2_bit_alloc(
-    const float band_energy[],  /* i  : band energy of each subband                 */
-    const int16_t bands,        /* i  : total number of subbands in a frame         */
-    Word32 L_Rk[],              /* i/o: Bit allocation/Adjusted bit alloc.          */
-    int16_t *bit_budget,        /* i/o: bit bugdet                                  */
-    int16_t *p2a_flags,         /* i  : HF tonal indicator                          */
-    const Word16 weight_fx,     /* i  : weight (Q13)                                */
-    const int16_t band_width[], /* i  : Sub band bandwidth                          */
-    const int16_t num_bits,     /* i  : available bits                              */
-    const int16_t hqswb_clas,   /* i  : HQ2 class information                       */
-    const int16_t bwidth,       /* i  : input bandwidth                             */
-    const int16_t is_transient  /* i  : indicator HQ_TRANSIENT or not               */
-);
-
-void hq2_noise_inject(
-    float y2hat[],
-    const int16_t band_start[],
-    const int16_t band_end[],
-    const int16_t band_width[],
-    float Ep[],
-    float Rk[],
-    const int16_t npulses[],
-    int16_t ni_seed,
-    const int16_t bands,
-    const int16_t ni_start_band,
-    const int16_t bw_low,
-    const int16_t bw_high,
-    const float enerL,
-    const float enerH,
-    float last_ni_gain[],
-    float last_env[],
-    int16_t *last_max_pos_pulse,
-    int16_t *p2a_flags,
-    int16_t p2a_bands,
-    const int16_t hqswb_clas,
-    const int16_t bwidth,
-    const int32_t bwe_br );
-
-void mdct_spectrum_denorm(
-    const int32_t inp_vector[],
-    float y2[],
-    const int16_t band_start[],
-    const int16_t band_end[],
-    const int16_t band_width[],
-    const float band_energy[],
-    const int16_t npulses[],
-    const int16_t bands,
-    const float ld_slope,
-    const float pd_thresh );
-
-void reverse_transient_frame_energies(
-    float band_energy[], /* o  : band energies                           */
-    const int16_t bands  /* i  : number of bands                         */
-);
-
-
-void hvq_dec(
-    Decoder_State *st,        /* i/o: decoder state structure                */
-    const int16_t num_bits,   /* i  : Number of available bits               */
-    const int32_t core_brate, /* i  : Core bitrate                           */
-    const int16_t *ynrm,      /* i  : Envelope coefficients                  */
-    int16_t *R,               /* i/o: Bit allocation/updated bit allocation  */
-    float *noise_level,       /* o  : Noise level                            */
-    int16_t *peak_idx,        /* o  : Peak position vector                   */
-    int16_t *Npeaks,          /* o  : Total number of peaks                  */
-    float *coefsq_norm,       /* o  : Output vector                          */
-    const int16_t core        /* i  : Core                                   */
-);
-
-void hq_configure_bfi(
-    int16_t *nb_sfm,           /* o  : Number of sub bands               */
-    int16_t *num_Sb,           /* o  : Number of FEC sub bands ?         */
-    int16_t *num_bands_p,      /* o  : FEC sub bands                     */
-    const int16_t **sfmsize,   /* o  : Subband bandwidths                */
-    const int16_t **sfm_start, /* o  : Subband start coefficients        */
-    const int16_t **sfm_end    /* o  : Subband end coefficients          */
-);
-
-void swb_bwe_enc_lr(
-    Encoder_State *st,         /* i/o: encoder state structure     */
-    const float m_core[],      /* i  : core synthesis (MDCT)       */
-    const float m_orig[],      /* i/o: scaled orig signal (MDCT)   */
-    float m[],                 /* o  : output, SWB part (MDCT)     */
-    const int32_t total_brate, /* i  : total bitrate for selecting subband pattern */
-    int16_t BANDS,
-    int16_t *band_start,
-    int16_t *band_end,
-    float *band_energy,
-    int16_t *p2a_flags,
-    const int16_t hqswb_clas,
-    int16_t lowlength,
-    int16_t highlength,
-    int16_t *prev_frm_index,
-    const int16_t har_bands,
-    int16_t *prev_frm_hfe2,
-    int16_t *prev_stab_hfe2,
-    int16_t band_width[],
-    const float y2_ni[],
-    int16_t *ni_seed );
-
-void swb_bwe_dec_lr(
-    Decoder_State *st,         /* i/o: decoder state structure                     */
-    const float m_core[],      /* i  : lowband synthesis                           */
-    float m[],                 /* o  : highband synthesis with lowband zeroed      */
-    const int32_t total_brate, /* i  : total bitrate for selecting subband pattern */
-    int16_t BANDS,
-    int16_t *band_start,
-    int16_t *band_end,
-    float *band_energy,
-    int16_t *p2a_flags,
-    const int16_t hqswb_clas,
-    int16_t lowlength,
-    int16_t highlength,
-    const int16_t har_bands,
-    int16_t *prev_frm_hfe2,
-    int16_t *prev_stab_hfe2,
-    int16_t band_width[],
-    const float y2_ni[],
-    int16_t *ni_seed );
-
-int16_t get_usebit_npswb(
-    const int16_t hqswb_clas );
-
-void GetPredictedSignal(
-    const float *predBuf, /* i  : prediction buffer        */
-    float *outBuf,        /* o  : output buffer            */
-    const int16_t lag,    /* i  : prediction buffer offset */
-    const int16_t fLen,   /* i  : length of loop (output)  */
-    const float gain      /* i  : gain to be applied       */
-);
-
-void convert_lagIndices_pls2smp(
-    int16_t lagIndices_in[],
-    int16_t nBands_search,
-    int16_t lagIndices_out[],
-    const float sspectra[],
-    const int16_t sbWidth[],
-    const int16_t fLenLow );
-
-void FindNBiggest2_simple(
-    const float *inBuf, /* i  : input buffer (searched)                     */
-    GainItem *g,        /* o  : N biggest components found                  */
-    const int16_t nIdx, /* i  : search length                               */
-    int16_t *n,         /* i  : number of components searched (N biggest)   */
-    const int16_t N_NBIGGESTSEARCH );
-
-void updat_prev_frm(
-    float y2[],
-    float t_audio[],
-    const int32_t bwe_br,
-    const int16_t length,
-    const int16_t inner_frame,
-    const int16_t bands,
-    const int16_t bwidth,
-    const int16_t is_transient,
-    const int16_t hqswb_clas,
-    int16_t *prev_hqswb_clas,
-    int16_t *prev_SWB_peak_pos,
-    int16_t prev_SWB_peak_pos_tmp[],
-    int16_t *prev_frm_hfe2,
-    int16_t *prev_stab_hfe2,
-    const int16_t bws_cnt );
-
-void hf_parinitiz(
-    const int32_t total_brate,
-    const int16_t hqswb_clas,
-    int16_t lowlength,
-    int16_t highlength,
-    int16_t wBands[],
-    const int16_t **subband_search_offset,
-    const int16_t **subband_offsets,
-    int16_t *nBands,
-    int16_t *nBands_search,
-    int16_t *swb_lowband,
-    int16_t *swb_highband );
-
-float spectrumsmooth_noiseton(
-    float spectra[],
-    const float spectra_ni[],
-    float sspectra[],
-    float sspectra_diff[],
-    float sspectra_ni[],
-    const int16_t fLenLow,
-    int16_t *ni_seed );
-
-void noiseinj_hf(
-    float xSynth_har[],
-    const float th_g[],
-    const float band_energy[],
-    float *prev_En_sb,
-    const int16_t p2a_flags[],
-    const int16_t BANDS,
-    const int16_t band_start[],
-    const int16_t band_end[],
-    const int16_t fLenLow );
-
-void noise_extr_corcod(
-    float spectra[],
-    const float spectra_ni[],
-    float sspectra[],
-    float sspectra_diff[],
-    float sspectra_ni[],
-    const int16_t fLenLow,
-    int16_t prev_hqswb_clas,
-    float *prev_ni_ratio );
-
-void genhf_noise(
-    float noise_flr[],
-    float xSynth_har[],
-    float *predBuf,
-    int16_t bands,         /* i  : total number of subbands in a frame         */
-    int16_t harmonic_band, /* i  : Number of LF harmonic frames                */
-    int16_t har_freq_est2,
-    int16_t pos_max_hfe2,
-    int16_t *pul_res,
-    GainItem pk_sf[],
-    const int16_t fLenLow,
-    const int16_t fLenHigh,
-    const int16_t sbWidth[],
-    const int16_t lagIndices[],
-    const int16_t subband_offsets[],
-    const int16_t subband_search_offset[] );
-
-void ton_ene_est(
-    float xSynth_har[],
-    float be_tonal[],
-    float band_energy[],
-    int16_t band_start[],
-    int16_t band_end[],
-    int16_t band_width[],
-    const int16_t fLenLow,
-    const int16_t fLenHigh,
-    int16_t bands,
-    int16_t har_bands,
-    float ni_lvl,
-    GainItem pk_sf[],
-    int16_t *pul_res );
-
-void Gettonl_scalfact(
-    float *outBuf,          /* o  : synthesized spectrum                        */
-    const float *codbuf,    /* i  : core coder                                  */
-    const int16_t fLenLow,  /* i  : lowband length                              */
-    const int16_t fLenHigh, /* i  : highband length                             */
-    int16_t harmonic_band,  /* i  : Number of LF harmonic frames                */
-    int16_t bands,          /* i  : total number of subbands in a frame         */
-    float *band_energy,     /* i  : band energy of each subband                 */
-    int16_t *band_start,    /* i  : subband start indices                       */
-    int16_t *band_end,      /* i  : subband end indices                         */
-    const int16_t p2aflags[],
-    float be_tonal[],
-    GainItem *pk_sf,
-    int16_t *pul_res );
-
-void SpectrumSmoothing(
-    float *inBuf,
-    float *outBuf,
-    const int16_t fLen,
-    const float th_cut );
-
-void hq2_bit_alloc_har(
-    float *y,  /* i  : band energy of sub-vectors                    */
-    int16_t B, /* i  : number of available bits                      */
-    int16_t N, /* i  : number of sub-vectors                         */
-    Word32 *L_Rsubband,
-    int16_t p2a_bands,
-    int32_t core_brate, /* i  : core bitrate                                 */
-    int16_t p2a_flags[],
-    int16_t band_width[] );
-
-void GetSynthesizedSpecThinOut(
-    const float *predBuf,
-    float *outBuf,
-    const int16_t nBands,
-    const int16_t *sbWidth,
-    const int16_t *lagIndices,
-    const float *lagGains,
-    const int16_t predBufLen );
-
-void return_bits_normal2(
-    int16_t *bit_budget,
-    const int16_t p2a_flags[],
-    const int16_t bands,
-    const int16_t bits_lagIndices[] );
-
-void GetlagGains(
-    const float *predBuf,
-    const float *band_energy,
-    const int16_t nBands,
-    const int16_t *sbWidth,
-    const int16_t *lagIndices,
-    const int16_t predBufLen,
-    float *lagGains );
-
-void preset_hq2_swb(
-    const int16_t hqswb_clas,
-    const int16_t band_end[],
-    int16_t *har_bands,
-    int16_t p2a_bands,
-    const int16_t length,
-    const int16_t bands,
-    int16_t *lowlength,
-    int16_t *highlength,
-    float m[] );
-
-void post_hq2_swb(
-    const float m[],
-    const int16_t lowlength,
-    const int16_t highlength,
-    const int16_t hqswb_clas,
-    const int16_t har_bands,
-    const int16_t bands,
-    const int16_t p2a_flags[],
-    const int16_t band_start[],
-    const int16_t band_end[],
-    float y2[],
-    int16_t npulses[] );
-
-void har_denorm_pulcnt(
-    float spectra[],            /* i/o: MDCT domain spectrum                        */
-    const int16_t band_start[], /* i  : Number subbands/Frame                       */
-    const int16_t band_end[],   /* i  : Band Start of each SB                       */
-    const float band_energy[],  /* i  : Band end of each SB                         */
-    const int16_t band_width[],
-    const int16_t npulses[],
-    const int16_t har_bands /* i  : No. of harmonic bands                       */
-);
-
-int16_t har_est(
-    float spectra[],
-    const int16_t N,
-    int16_t *har_freq_est1,
-    int16_t *har_freq_est2,
-    int16_t *flag_dis,
-    int16_t *prev_frm_hfe2,
-    const int16_t subband_search_offset[],
-    const int16_t sbWidth[],
-    int16_t *prev_stab_hfe2 );
-
-void spt_shorten_domain_pre(
-    const int16_t band_start[],
-    const int16_t band_end[],
-    const int16_t prev_SWB_peak_pos[],
-    const int16_t BANDS,
-    const int32_t bwe_br,
-    int16_t new_band_start[],
-    int16_t new_band_end[],
-    int16_t new_band_width[] );
-
-void spt_shorten_domain_band_save(
-    const int16_t bands,
-    const int16_t band_start[],
-    const int16_t band_end[],
-    const int16_t band_width[],
-    int16_t org_band_start[],
-    int16_t org_band_end[],
-    int16_t org_band_width[] );
-
-void spt_shorten_domain_band_restore(
-    const int16_t bands,
-    int16_t band_start[],
-    int16_t band_end[],
-    int16_t band_width[],
-    const int16_t org_band_start[],
-    const int16_t org_band_end[],
-    const int16_t org_band_width[] );
-
-void spt_swb_peakpos_tmp_save(
-    const float y2[],
-    const int16_t bands,
-    const int16_t band_start[],
-    const int16_t band_end[],
-    int16_t prev_SWB_peak_pos_tmp[] );
-
-void hq_ecu(
-    const float *prevsynth,            /* i  : buffer of previously synthesized signal   */
-    float *ecu_rec,                    /* o  : reconstructed frame in tda domain         */
-    int16_t *time_offs,                /* i/o: Sample offset for consecutive frame losses*/
-    float *X_sav,                      /* i/o: Stored spectrum of prototype frame        */
-    int16_t *num_p,                    /* i/o: Number of identified peaks                */
-    int16_t *plocs,                    /* i/o: Peak locations                            */
-    float *plocsi,                     /* i/o: Interpolated peak locations               */
-    const float env_stab,              /* i  : Envelope stability parameter              */
-    int16_t *last_fec,                 /* i/o: Flag for usage of pitch dependent ECU     */
-    const int16_t ph_ecu_HqVoicing,    /* i  : HQ Voicing flag                           */
-    int16_t *ph_ecu_active,            /* i  : Phase ECU active flag                     */
-    float *gapsynth,                   /* o  : Gap synthesis                             */
-    const int16_t prev_bfi,            /* i  : indicating burst frame error              */
-    const int16_t old_is_transient[2], /* i  : flags indicating previous transient frames*/
-    float *mag_chg_1st,                /* i/o: per band magnitude modifier for transients*/
-    float Xavg[LGW_MAX],               /* i/o: Frequency group average gain to fade to   */
-    float *beta_mute,                  /* o  : Factor for long-term mute                 */
-    const int16_t output_frame,        /* i  : frame length                              */
-    Decoder_State *st                  /* i/o: decoder state structure                   */
-);
-
-void peakfinder(
-    const float *x0,        /* i  : vector from which the maxima will be found                     */
-    const int16_t len0,     /* i  : length of input vector                                         */
-    int16_t *plocs,         /* o  : the indicies of the identified peaks in x0                     */
-    int16_t *cInd,          /* o  : number of identified peaks                                     */
-    const float sel,        /* i  : The amount above surrounding data for a peak to be identified  */
-    const int16_t endpoints /* i  : Flag to include endpoints in peak search                       */
-);
-
-/*! r: interpolated maximum position */
-float imax_pos(
-    const float *y /* i  : Input vector for peak interpolation */
-);
-
-
-void fft3(
-    const float X[], /* i  : input frame                                */
-    float Y[],       /* o  : DFT of input frame                         */
-    const int16_t n  /* i  : block length (must be radix 3)             */
-);
-
-void ifft3(
-    const float X[], /* i  : input frame                                */
-    float Y[],       /* o  : iDFT of input frame                        */
-    const int16_t n  /* i  : block length (must be radix 3)             */
-);
-
-/*! r: updated estimate of background noise */
-void minimumStatistics(
-    float *noiseLevelMemory,  /* i/o: internal state                            */
-    int16_t *noiseLevelIndex, /* i/o: internal state                            */
-    int16_t *currLevelIndex,  /* i/o: internal state (circular buffer)          */
-    float *noiseEstimate,     /* i/o: previous estimate of background noise     */
-    float *lastFrameLevel,    /* i/o: level of the last frame                   */
-    float currentFrameLevel,  /* i  : level of the current frame                */
-    const float minLev,       /* i  : minimum level                             */
-    const int16_t buffSize    /* i  : buffer size                               */
-);
-
-void E_ACELP_toeplitz_mul(
-    const float R[],
-    const float c[],
-    float d[] );
-
-void E_ACELP_innovative_codebook(
-    const float *exc,           /* i  : pointer to the excitation frame                  */
-    const int16_t T0,           /* i  : integer pitch lag                                */
-    const int16_t T0_frac,      /* i  : fraction of lag                                  */
-    const int16_t T0_res,       /* i  : pitch resolution                                 */
-    const float pitch_gain,     /* i  : adaptive codebook gain                           */
-    const float tilt_code,      /* i  : tilt factor                                      */
-    ACELP_config *acelp_cfg,    /* i/o: configuration of the ACELP                       */
-    const int16_t i_subfr,      /* i  : subframe index                                   */
-    const float *Aq,            /* i  : quantized LPC coefficients                       */
-    const float *h1,            /* i  : impulse response of weighted synthesis filter    */
-    const float *xn,            /* i  : Close-loop Pitch search target vector            */
-    const float *cn,            /* i  : Innovative codebook search target vector         */
-    const float *y1,            /* i  : zero-memory filtered adaptive excitation         */
-    float *y2,                  /* o  : zero-memory filtered algebraic excitation        */
-    const int16_t acelpautoc,   /* i  : autocorrelation mode enabled                     */
-    int16_t **pt_indice,        /* i/o: quantization indices pointer                     */
-    float *code,                /* o  : innovative codebook                              */
-    const int16_t L_frame,      /* i  : length of the frame                              */
-    const int16_t last_L_frame, /* i  : length of the last frame                         */
-    const int32_t total_brate   /* i  : total bitrate                                    */
-);
-
-int16_t E_ACELP_code43bit(
-    const float code[],
-    uint32_t *ps,
-    int16_t *p,
-    uint16_t idxs[] );
-void D_ACELP_indexing_ivas(
-    float code[],
-    PulseConfig config,
-    const int16_t num_tracks,
-    int16_t prm[],
-    int16_t *BER_detect );
-
-void D_ACELP_decode_43bit(
-    uint16_t idxs[],
-    float code[],
-    int16_t *pulsestrack );
-
-void fcb_pulse_track_joint_decode_ivas(
-    uint16_t *idxs,
-    const int16_t wordcnt,
-    uint32_t *index_n,
-    const int16_t *pulse_num,
-    const int16_t track_num );
-
-void lag_wind_flt(
-    float r[],             /* i/o: autocorrelations                                       */
-    const int16_t m,       /* i  : order of LP filter                                     */
-    const int32_t sr_core, /* i  : sampling rate                                          */
-    const int16_t strength /* i  : LAGW_WEAK, LAGW_MEDIUM, or LAGW_STRONG                 */
-);
-
-void adapt_lag_wind_fx(
-    float r[],            /* i/o: autocorrelations                                       */
-    const int16_t m,      /* i  : order of LP filter                                     */
-    const int16_t Top,    /* i  : open loop pitch lags from curr. frame (or NULL if n/a) */
-    const float Tnc,      /* i  : open loop pitch gains from curr. frame (NULL if n/a)   */
-    const int32_t sr_core /* i  : core sampling rate                                     */
-);
-
-void core_coder_reconfig(
-    Encoder_State *st,             /* i/o: encoder state structure             */
-    const int32_t last_total_brate /* i  : last total bitrate                  */
-);
-
-void core_coder_mode_switch(
-    Encoder_State *st,              /* i/o: encoder state structure             */
-    const int32_t last_total_brate, /* i  : last bitrate                        */
-    const int16_t MCT_flag          /* i  : hMCT handle allocated (1) or not (0)*/
-);
-
-void enc_acelp_tcx_main(
-    Encoder_State *st,                 /* i/o: encoder state structure             */
-    const float new_samples[],         /* i  : new samples                         */
-    float Aw[NB_SUBFR16k * ( M + 1 )], /* i  : weighted A(z) unquant. for subframes*/
-    const float lsp_new[M],            /* i  : LSPs at the end of the frame        */
-    const float lsp_mid[M],            /* i  : LSPs at the middle of the frame     */
-    float bwe_exc_extended[],          /* i/o: bandwidth extended excitation       */
-    float *voice_factors,              /* o  : voicing factors                     */
-    float pitch_buf[],                 /* o  : floating pitch for each subframe    */
-    const int16_t vad_hover_flag       /* i  : VAD hangover flag                   */
-);
-
-void getTCXMode_ivas(
-    Decoder_State *st,    /* i/o: decoder memory state                */
-    Decoder_State *st0,   /* i  : bitstream                           */
-    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)*/
-);
-
-void getTCXWindowing_ivas(
-    const Word16 core,         /* i  : current frame mode                  */
-    const Word16 last_core,    /* i  : last frame mode                     */
-    const Word16 element_mode, /* i  : element mode                        */
-    TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle            */
-    Decoder_State *st0         /* i  : bitstream                           */
-);
-
-void getLPCparam_ivas(
-    Decoder_State *st,            /* i/o: decoder memory state                */
-    int16_t param_lpc[],          /* o  : LTP parameters                      */
-    Decoder_State *st0,           /* i  : bitstream                           */
-    const int16_t ch,             /* i  : channel                             */
-    const int16_t sns_low_br_mode /* i  : SNS low-bitrate mode                */
-);
-
-void getTCXparam_ivas(
-    Decoder_State *st,           /* i/o: Decoder State handle                  */
-    Decoder_State *st0,          /* i  : bitstream                             */
-    CONTEXT_HM_CONFIG hm_cfg,    /* i/o: HM config                             */
-    int16_t param[],             /* o  : decoded parameters                    */
-    const int16_t bits_common,   /* i  : number of common bits                 */
-    const int16_t start_bit_pos, /* i  : position of the start bit             */
-    const int16_t *no_param_tns, /* i  : number of TNS parameters per subframe */
-    int16_t p_param[2],          /* o  : pointer to parameters for next round of bs reading*/
-    int16_t nTnsBitsTCX10[2],
-    const int16_t pre_past_flag );
-
-void pitch_pred_linear_fit_flt(
-    const int16_t nbLostCmpt, /* i  : bfi counter                                     */
-    const int16_t last_good,  /* i  : last classification type                        */
-    float *old_pitch_buf,     /* i  : pitch lag buffer                                */
-    float *old_fpitch,        /* i/o: pitch used for initial ACB generation           */
-    float *T0_out,            /* o  : estimated close loop pitch                      */
-    const int16_t pit_min,    /* i  : Minimum pitch lag                               */
-    const int16_t pit_max,    /* i  : Maximum pitch lag                               */
-    float *mem_pitch_gain,    /* i  : lag pitch gain [0] is the most recent subfr lag */
-    const int16_t limitation,
-    const int16_t plc_use_future_lag, /* i  : number of subframes to predict                  */
-    int16_t *extrapolationFailed,     /* o  : flag if extrap decides not to change the pitch  */
-    const int16_t nb_subfr            /* i  : number of ACELP subframes                       */
-);
-
-void get_subframe_pitch_flt(
-    const int16_t nSubframes, /* i  : number of subframes                             */
-    float pitchStart,         /* i  : starting pitch lag (in subframe -1)             */
-    float pitchEnd,           /* i  : ending pitch lag (in subframe nSubframes-1)     */
-    float *pitchBuf           /* o  : interpolated pitch lag per subframe             */
-);
-
-void core_encode_openloop(
-    Encoder_State *st,                       /* i/o: encoder state structure             */
-    const float Aw[NB_SUBFR16k * ( M + 1 )], /* i  : weighted A(z) unquant. for subframes*/
-    const float lsp_new[M],                  /* i  : LSPs at the end of the frame        */
-    const float lsp_mid[M],                  /* i  : LSPs at the middle of the frame     */
-    float *pitch_buf,                        /* i/o: floating pitch values for each subfr*/
-    float *voice_factors,                    /* o  : voicing factors                     */
-    float *ptr_bwe_exc,                      /* o  : excitation for SWB TBE              */
-    const int16_t vad_hover_flag             /* i  : VAD hangover flag                   */
-);
-
-void core_acelp_tcx20_switching(
-    Encoder_State *st,            /* i/o: encoder state structure                   */
-    float non_staX,               /* i  : unbound non-stationarity for sp/mu clas   */
-    float *pitch_fr,              /* i/o: fraction pitch values                     */
-    float *voicing_fr,            /* i/o: fractional voicing values                 */
-    const float currTempFlatness, /* i  : flatness                                  */
-    const float lsp_mid[M],       /* i  : LSPs at the middle of the frame           */
-    const float stab_fac          /* i  : LP filter stability                       */
-);
-
-void core_encode_twodiv(
-    Encoder_State *st,                 /* i/o: coder memory state                  */
-    const float new_samples[],         /* i  : new samples                         */
-    float Aw[NB_SUBFR16k * ( M + 1 )], /* i  : weighted A(z) unquant. for subframes*/
-    const int16_t vad_hover_flag       /* i  : VAD hangover flag                   */
-);
-
-void core_encode_update(
-    Encoder_State *st /* i/o: encoder state structure             */
-);
-
-void core_encode_update_cng(
-    Encoder_State *st, /* i/o: encoder state structure             */
-    float *timeDomainBuffer,
-    float *A,
-    const float Aw[] /* i  : weighted A(z) unquant. for subframes*/
-);
-
-void core_signal_analysis_high_bitrate(
-    const float *new_samples,
-    const int16_t T_op[3], /* i  : open-loop pitch values for quantiz. */
-    float lsp_new[],
-    float lsp_mid[],
-    Encoder_State *st,
-    float *mdst_spectrum[2],
-    int16_t pTnsSize[],
-    int16_t pTnsBits[],
-    int16_t param_core[],
-    int16_t *ltpBits,
-    float *windowed_samples, /* i/o: backup of windowed time signal */
-    const int16_t L_frame,
-    const int16_t L_frameTCX,
-    const int16_t last_element_mode,
-    const int16_t vad_hover_flag /* i  : VAD hangover flag                          */
-);
-
-void encode_acelp_gains(
-    const float *code,
-    const int16_t gains_mode,
-    const float mean_ener_code,
-    const int16_t clip_gain,
-    ACELP_CbkCorr *g_corr,
-    float *gain_pit,
-    float *gain_code,
-    int16_t **pt_indice,
-    float *past_gcode,
-    float *gain_inov,
-    const int16_t L_subfr,
-    float *code2,
-    float *gain_code2,
-    const int16_t noisy_speech_flag );
-
-int16_t gain_enc_gacelp_uv(
-    const float *code,              /* i  : algebraic excitation                                            */
-    const float *code2,             /* i  : gaussian excitation                                             */
-    const int16_t lcode,            /* i  : Subframe size                                                   */
-    const float mean_ener,          /* i  : quantized mean energy of the frame                              */
-    float *gain_pit,                /* o  : quantized pitch gain                                            */
-    float *gain_code,               /* o  : quantized codebook gain                                         */
-    float *gain_code2,              /* o  : quantized codebook gain                                         */
-    ACELP_CbkCorr *coeff,           /* i/o: correlations <y1,y1>, -2<xn,y1>,<y2,y2>, -2<xn,y2> and 2<y1,y2> */
-    float *past_gcode,              /* i/o: past gain of code                                               */
-    float *gain_inov,               /* o  : unscaled innovation gain                                        */
-    const int16_t noisy_speech_flag /* i  : noisy speech flag                                               */
-);
-
-int16_t Mode2_gain_enc_mless(
-    const float *code,       /* i  : algebraic excitation                                            */
-    const int16_t lcode,     /* i  : Subframe size                                                   */
-    float *gain_pit,         /* o  : quantized pitch gain                                            */
-    float *gain_code,        /* o  : quantized codebook gain                                         */
-    ACELP_CbkCorr *coeff,    /* i/o: correlations <y1,y1>, -2<xn,y1>,<y2,y2>, -2<xn,y2> and 2<y1,y2> */
-    const float mean_ener,   /* i  : mean_ener defined in open-loop (3 bits)                         */
-    const int16_t clip_gain, /* i  : gain pitch clipping flag (1 = clipping)                         */
-    float *past_gcode,       /* i/o: past gain of code                                               */
-    float *gain_inov,        /* o  : unscaled innovation gain                                        */
-    const int16_t coder_type /* i  : type of coder                                                   */
-);
-
-void decode_acelp_gains(
-    const float *code,
-    const int16_t gains_mode,
-    const float mean_ener_code,
-    float *gain_pit,
-    float *gain_code,
-    int16_t **pt_indice,
-    float *past_gpit,
-    float *past_gcode,
-    float *gain_inov,
-    const int16_t L_subfr,
-    float *code2,
-    float *gain_code2 );
-
-void gain_dec_gacelp_uv(
-    int16_t index,         /* i/o: Quantization index vector             */
-    const float *code,     /* i  : algebraic code excitation             */
-    const float *code2,    /* i  : algebraic code excitation             */
-    const float mean_ener, /* i  : mean energy                           */
-    const int16_t lcode,   /* i  : Subframe size                         */
-    float *gain_pit,       /* o  : Quantized pitch gain                  */
-    float *gain_code,      /* o  : Quantized codebook gain               */
-    float *gain_code2,     /* o  : Quantized codebook gain               */
-    float *past_gpit,      /* i/o: past gain of pitch                    */
-    float *past_gcode,     /* i/o: past energy of code                   */
-    float *gain_inov       /* o  : unscaled innovation gain              */
-);
-
-void limit_T0_voiced_ivas(
-    const int16_t nbits,
-    const int16_t res,
-    const int16_t T0,      /* i  : rough pitch estimate around which the search is done */
-    const int16_t T0_frac, /* i  : pitch estimate fractional part                       */
-    const int16_t T0_res,  /* i  : pitch resolution                                     */
-    int16_t *T0_min,       /* o  : lower pitch limit                                    */
-    int16_t *T0_min_frac,  /* o  : lower pitch limit                                    */
-    int16_t *T0_max,       /* o  : higher pitch limit                                   */
-    int16_t *T0_max_frac,  /* o  : higher pitch limit                                   */
-    const int16_t pit_min, /* i  : Minimum pitch lag                                    */
-    const int16_t pit_max  /* i  : Maximum pitch lag                                    */
-);
-
-
-/*! r: floating pitch value */
-float Mode2_pit_decode_flt(
-    const int16_t coder_type, /* i  : coding model                            */
-    const int16_t i_subfr,    /* i  : subframe index                          */
-    const int16_t L_subfr,    /* i  : sub-frame length                */
-    int16_t **pt_indice,      /* i/o: quantization indices pointer            */
-    int16_t *T0,              /* o  : close loop integer pitch                */
-    int16_t *T0_frac,         /* o  : close loop fractional part of the pitch */
-    int16_t *T0_res,          /* i/o: pitch resolution                        */
-    int16_t *T0_min,          /* i/o: lower limit for close-loop search       */
-    int16_t *T0_min_frac,     /* i/o: lower limit for close-loop search       */
-    int16_t *T0_max,          /* i/o: higher limit for close-loop search      */
-    int16_t *T0_max_frac,     /* i/o: higher limit for close-loop search      */
-    const int16_t pit_min,
-    const int16_t pit_fr1,
-    const int16_t pit_fr1b,
-    const int16_t pit_fr2,
-    const int16_t pit_max,
-    const int16_t pit_res_max );
-
-void Mode2_abs_pit_dec_flt(
-    int16_t *T0,         /* o  : integer pitch lag              */
-    int16_t *T0_frac,    /* o  : pitch fraction                 */
-    int16_t *T0_res,     /* o  : pitch resolution               */
-    int16_t **pt_indice, /* i/o: pointer to Vector of Q indexes */
-    const int16_t pit_min,
-    const int16_t pit_fr1,
-    const int16_t pit_fr2,
-    const int16_t pit_res_max );
-
-void Mode2_delta_pit_dec_flt(
-    int16_t *T0,          /* o  : integer pitch lag              */
-    int16_t *T0_frac,     /* o  : pitch fraction                 */
-    int16_t T0_res,       /* i  : pitch resolution               */
-    int16_t *T0_min,      /* i  : delta search min               */
-    int16_t *T0_min_frac, /* i  : delta search min               */
-    int16_t **pt_indice   /* i/o: pointer to Vector of Q indexes */
-);
-
-void formant_post_filt_ivas(
-    PFSTAT_HANDLE hPFstat, /* i/o: Post filter related memories    */
-    float *synth_in,       /* i  : 12k8 synthesis                  */
-    const float *Aq,       /* i  : LP filter coefficient           */
-    float *synth_out,      /* i/o: input signal                    */
-    const int16_t L_frame, /* i  : frame length                    */
-    const int16_t L_subfr, /* i  : sub-frame length                */
-    const float lp_noise,  /* i  : background noise energy         */
-    const int32_t brate,   /* i  : bitrate                         */
-    const int16_t off_flag /* i  : Off flag                        */
-);
-
-
-int16_t dlpc_avq(
-    int16_t *index,       /* i  : Quantization indices            */
-    float *LSF_Q,         /* o  : Quantized LSF vectors           */
-    const int16_t numlpc, /* i  : Number of sets of lpc           */
-    const int32_t sr_core /* i  : internal sampling rate          */
-);
-
-int16_t decode_lpc_avq(
-    Decoder_State *st,            /* i/o: decoder state structure         */
-    const int16_t numlpc,         /* i  : Number of sets of lpc           */
-    int16_t *param_lpc,           /* o  : lpc parameters                  */
-    const int16_t ch,             /* i  : channel                         */
-    const int16_t element_mode,   /* i  : element mode                    */
-    const int16_t sns_low_br_mode /* i  : SNS low-bitrate mode            */
-);
-
-
-void vlpc_2st_dec_flt(
-    float *lsfq,          /* i/o: i:1st stage   o:1st+2nd stage   */
-    int16_t *indx,        /* i  : index[] (4 bits per words)      */
-    const int16_t mode,   /* i  : 0=abs, >0=rel                   */
-    const int32_t sr_core /* i  : internal sampling rate          */
-);
-
-void lsf_weight_2st_flt(
-    const float *lsfq,
-    float *w,
-    const int16_t mode,
-    const int32_t sr_core );
-
-void mdct_window_sine_flt(
-    float *window,
-    const int32_t Fs,
-    const int16_t n,
-    const int16_t window_type,
-    const int16_t element_mode );
-
-void mdct_window_aldo_flt(
-    float *window1,
-    float *window2,
-    const int16_t n );
-
-void AVQ_cod_lpc(
-    const float nvec[], /* i  : vector to quantize              */
-    int16_t nvecq[],    /* o  : quantized normalized vector (assuming the bit budget is enough) */
-    int16_t *indx,      /* o  : index[] (4 bits per words)      */
-    const int16_t Nsv   /* i  : number of subvectors (lg=Nsv*8) */
-);
-
-void AVQ_dec_lpc_ivas(
-    const int16_t indx[], /* i  : index[] (4 bits per words)      */
-    int16_t nvecq[],      /* o  : vector quantized                */
-    const int16_t Nsv     /* i  : number of subvectors (lg=Nsv*8) */
-);
-
-void vlpc_1st_dec_flt(
-    const int16_t index, /* i  : codebook index                  */
-    float *lsfq,         /* i/o: i:prediction   o:quantized lsf  */
-    const int32_t sr_core );
-
-void WindowSignal_flt(
-    TCX_CONFIG_HANDLE hTcxCfg,        /* i  : configuration of TCX                */
-    int16_t offset,                   /* i  : left folding point offset relative to the input signal pointer */
-    const int16_t left_overlap_mode,  /* i  : overlap mode of left window half    */
-    const int16_t right_overlap_mode, /* i  : overlap mode of right window half   */
-    int16_t *left_overlap_length,     /* o  : TCX window left overlap length      */
-    int16_t *right_overlap_length,    /* o  : TCX window right overlap length     */
-    const float in[],                 /* i  : input signal                        */
-    int16_t *L_frame,                 /* i/o: frame length                        */
-    float out[],                      /* o  : output windowed signal              */
-    const int16_t truncate_aldo,      /* i  : nonzero to truncate long ALDO slope */
-    const int16_t fullband            /* i  : fullband flag                       */
-);
-
-void HBAutocorrelation(
-    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
-    const int16_t left_mode,   /* i  : overlap mode of left window half   */
-    const int16_t right_mode,  /* i  : overlap mode of right window half  */
-    float speech[],            /* i  : speech                             */
-    int16_t L_frame_glob,      /* i/o: frame length                       */
-    float *r                   /* o  : autocorrelations vector            */
-);
-
-void TNSAnalysis(
-    TCX_CONFIG_HANDLE hTcxCfg,    /* i  : configuration of TCX                                                                    */
-    const int16_t L_frame,        /* i  : frame length                                                                            */
-    int16_t L_spec,               /* i  : length of the spectrum                                                                  */
-    const int16_t transform_type, /* i  : transform type for the frame/subframe - TCX20 | TCX10 | TCX 5 (meaning 2 x TCX 5)       */
-    const int16_t isAfterACELP,   /* i  : Flag indicating if the last frame was ACELP. For the second TCX subframe it should be 0 */
-    float spectrum[],             /* i  : MDCT spectrum of the subframe                                                           */
-    TRAN_DET_HANDLE hTranDet,     /* i  : handle transient detection                                                              */
-    const float ltp_gain,         /* i  : ltp gain                                                                                */
-    STnsData *pTnsData,           /* o  : TNS data                                                                                */
-    int8_t *pfUseTns,             /* o  : Flag indicating if TNS is used                                                          */
-    float *predictionGain         /* o  : TNS prediction gain                                                                     */
-);
-
-void CalculateTnsFilt(
-    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */
-    const float pSpectrum[],      /* i  : MDCT spectrum                     */
-    STnsData *pTnsData,           /* o  : TNS data struct                   */
-    float *predictionGain         /* o  : TNS prediction gain               */
-);
-
-void ShapeSpectrum(
-    TCX_CONFIG_HANDLE hTcxCfg,  /* i  : configuration of TCX                */
-    const float A[],            /* i  : quantized coefficients NxAz_q[M+1]  */
-    float gainlpc[],            /* o  : MDCT gains for the previous frame   */
-    const int16_t L_frame_glob, /* i  : frame length                        */
-    int16_t L_spec,             /* i  : length of the spectrum              */
-    float spectrum[],           /* i/o: MDCT spectrum                       */
-    const int8_t fUseTns,       /* i  : Flag indicating if TNS is used      */
-    Encoder_State *st,          /* i/o: encoder state structure             */
-    float *scf                  /* i  : scale factors                       */
-);
-
-void QuantizeSpectrum(
-    Encoder_State *st,           /* i/o: encoder state structure                     */
-    const float A[],             /* i  : quantized coefficients NxAz_q[M+1]          */
-    const Word16 Aqind[],        /* i  : frame-independent quantized coeffs (M+1)    */
-    float gainlpc[],             /* i  : MDCT gains of the previous frame            */
-    float synth[],               /* o  : synthesis buffer                            */
-    const int16_t nb_bits,       /* i  : bit budget                                  */
-    const int16_t tnsSize,       /* i  : number of tns parameters put into prm       */
-    int16_t prm[],               /* o  : tcx parameters                              */
-    const int16_t frame_cnt,     /* i  : frame counter in the super_frame            */
-    CONTEXT_HM_CONFIG *hm_cfg,   /* i  : HM configuration                            */
-    const int16_t vad_hover_flag /* i  : VAD hangover flag                           */
-);
-
-/*! r: index of next coefficient */
-int16_t get_next_coeff_mapped_ivas(
-    int16_t ii[2],            /* i/o: coefficient indexes                         */
-    int32_t *pp,              /* o  : peak(1)/hole(0) indicator                   */
-    int16_t *idx,             /* o  : index in unmapped domain                    */
-    CONTEXT_HM_CONFIG *hm_cfg /* i  : HM configuration                            */
-);
-
-
-void ACcontextMapping_encode2_no_mem_s17_LC(
-    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle                            */
-    int16_t *x,
-    int16_t nt,
-    int16_t lastnz,
-    int16_t nbbits,
-    int16_t resQMaxBits,
-    CONTEXT_HM_CONFIG *hm_cfg );
-
-int16_t ACcontextMapping_decode2_no_mem_s17_LC_ivas(
-    Decoder_State *st,        /* i/o: decoder state                               */
-    int16_t *x,               /* o  : decoded spectrum                            */
-    int16_t nt,               /* i  : size of spectrum                            */
-    int16_t nbbits,           /* i  : bit budget                                  */
-    int16_t resQMaxBits,      /* i  : residual coding maximum bits                */
-    CONTEXT_HM_CONFIG *hm_cfg /* i  : context-based harmonic model configuration  */
-);
-
-int16_t ACcontextMapping_encode2_estimate_no_mem_s17_LC(
-    const int16_t *x,
-    const int16_t nt,
-    int16_t *lastnz,
-    int16_t *nEncoded,
-    const int16_t target,
-    int16_t *stop,
-    CONTEXT_HM_CONFIG *hm_cfg );
-
-void RCcontextMapping_encode2_no_mem_s17_LCS(
-    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle                        */
-    int16_t *x,
-    const int16_t nt,
-    int16_t lastnz,
-    const int16_t nbbits,
-    const int16_t resQMaxBits,
-    CONTEXT_HM_CONFIG *hm_cfg );
-
-int16_t RCcontextMapping_decode2_no_mem_s17_LCS(
-    Decoder_State *st,         /* i/o: decoder state                               */
-    int16_t *x,                /* o  : decoded spectrum                            */
-    const int16_t nt,          /* i  : size of spectrum                            */
-    const int16_t nbbits,      /* i  : bit budget                                  */
-    const int16_t resQMaxBits, /* i  : residual coding maximum bits                */
-    CONTEXT_HM_CONFIG *hm_cfg  /* i  : context-based harmonic model configuration  */
-);
-
-int16_t RCcontextMapping_encode2_estimate_no_mem_s17_LCS(
-    int16_t *x,       /* Spectral coefficients */
-    const int16_t nt, /* L - size of spectrum (no. of spectral coefficients) */
-    int16_t *lastnz_out,
-    int16_t *nEncoded,    /* No. of spectral coefficients that can be coded without an overflow occuring */
-    const int16_t target, /* Target bits */
-    int16_t *stop,
-    int16_t mode,
-    CONTEXT_HM_CONFIG *hm_cfg /* context-based harmonic model configuration */
-);
-
-Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
-    Word16 *x,           /* Q0 */
-    const Word16 nt,     /* Q0 */
-    const Word16 target, /* Q0 */
-    HANDLE_RC_CONTEXT_MEM hContextMem );
-
-Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
-    Word16 *x,                        /* Q0 */
-    const Word16 start_line,          /* Q0 */
-    const Word16 end_line,            /* Q0 */
-    HANDLE_RC_CONTEXT_MEM hContextMem /* Q0 */
-);
-
-void tcx_get_windows_flt(
-    TCX_CONFIG_HANDLE hTcxCfg, /* i  : TCX configuration                   */
-    const int16_t left_mode,   /* i  : overlap mode of left window half    */
-    const int16_t right_mode,  /* i  : overlap mode of right window half   */
-    int16_t *left_overlap,     /* o  : left overlap length                 */
-    const float **left_win,    /* o  : left overlap window                 */
-    int16_t *right_overlap,    /* o  : right overlap length                */
-    const float **right_win,   /* o  : right overlap window                */
-    const int16_t fullband     /* i  : fullband flag                       */
-);
-
-void tcx_windowing_analysis_flt(
-    const float *signal,         /* i  : signal vector                              */
-    const int16_t L_frame,       /* i  : frame length                               */
-    const int16_t left_overlap,  /* i  : left overlap length                        */
-    const float *left_win,       /* i  : left overlap window                        */
-    const int16_t right_overlap, /* i  : right overlap length                       */
-    const float *right_win,      /* i  : right overlap window                       */
-    float *output                /* o  : windowed signal vector                     */
-);
-
-void tcx_windowing_synthesis_current_frame_flt(
-    float *signal,                    /* i/o: signal vector                              */
-    const float *window,              /* i  : TCX window vector                          */
-    const float *window_half,         /* i  : TCX window vector for half-overlap window  */
-    const float *window_min,          /* i  : TCX minimum overlap window                 */
-    const int16_t window_length,      /* i  : TCX window length                          */
-    const int16_t window_half_length, /* i  : TCX half window length                     */
-    const int16_t window_min_length,  /* i  : TCX minimum overlap length                 */
-    const int16_t left_rect,          /* i  : left part is rectangular                   */
-    const int16_t left_mode,          /* i  : overlap mode of left window half           */
-    float *acelp_zir,                 /* i/o: acelp ZIR                                  */
-    const float *old_syn,             /* i  : old synthesis                              */
-    const float *syn_overl,           /* i  : overlap synthesis                          */
-    const float *A_zir,
-    const float *window_trans, /* i  : window for transition from ACELP           */
-    int16_t acelp_zir_len,
-    const int16_t acelp_mem_len,
-    const int16_t last_core_bfi, /* i  : last mode                                  */
-    const int16_t last_is_cng,
-    const int16_t fullbandScale );
-
-void tcx_windowing_synthesis_past_frame_flt(
-    float *signal,                    /* i/o: signal vector                              */
-    const float *window,              /* i  : TCX window vector                          */
-    const float *window_half,         /* i  : TCX window vector for half-overlap window  */
-    const float *window_min,          /* i  : TCX minimum overlap window                 */
-    const int16_t window_length,      /* i  : TCX window length                          */
-    const int16_t window_half_length, /* i  : TCX half window length                     */
-    const int16_t window_min_length,  /* i  : TCX minimum overlap length                 */
-    const int16_t right_mode          /* i  : overlap mode (left_mode of current frame)  */
-);
-
-void ProcessIGF(
-    Encoder_State *st,              /* i  : Encoder state                               */
-    float *pMDCTSpectrum,           /* i  : MDCT spectrum                               */
-    const float *pITFMDCTSpectrum,  /* i  : MDCT spectrum fir ITF                       */
-    float *pPowerSpectrum,          /* i  : MDCT^2 + MDST^2 spectrum, or estimate       */
-    const int16_t isTCX20,          /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5 */
-    const int16_t frameno,          /* i  : flag indicating index of current subframe   */
-    const int16_t sp_aud_decision0, /* i  : first stage switching decision             */
-    const int16_t vad_hover_flag    /* i  : VAD hangover flag                          */
-);
-
-void ProcessStereoIGF(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,
-    Encoder_State *sts[CPE_CHANNELS],                 /* i  : Encoder state                           */
-    int16_t ms_mask[2][MAX_SFB],                      /* i  : bandwise MS mask                        */
-    float *pITFMDCTSpectrum[CPE_CHANNELS][NB_DIV],    /* i  : MDCT spectrum fir ITF                   */
-    float *pPowerSpectrum[CPE_CHANNELS],              /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
-    float *pPowerSpectrumMsInv[CPE_CHANNELS][NB_DIV], /* i  : inverse power spectrum                  */
-    float *inv_spectrum[CPE_CHANNELS][NB_DIV],        /* i  : inverse spectrum                        */
-    const int16_t frameno,                            /* i  : flag indicating index of current subframe*/
-    const int16_t sp_aud_decision0,                   /* i  : sp_aud_decision0                        */
-    const int32_t element_brate,                      /* i  : element bitrate                         */
-    const int16_t mct_on                              /* i  : flag mct block (1) or stereo (0)        */
-);
-
-void AnalyzePowerSpectrum(
-    Encoder_State *st,           /* i/o: encoder states                                */
-    const int16_t L_frame,       /* i  : frame length                                  */
-    const int16_t L_frameTCX,    /* i  : full band frame length                        */
-    const int16_t left_overlap,  /* i  : left overlap length                           */
-    const int16_t right_overlap, /* i  : right overlap length                          */
-    const float mdctSpectrum[],  /* i  : MDCT spectrum                                 */
-    const float signal[],        /* i  : windowed signal corresponding to mdctSpectrum */
-    float powerSpec[]            /* o  : Power spectrum                                */
-);
-
-void lpc2mdct_flt(
-    float *lpcCoeffs,
-    const int16_t lpcOrder,
-    float mdct_gains[],
-    const int16_t length,
-    const int16_t noInverse );
-
-void mdct_preShaping(
-    float x[],
-    const int16_t lg,
-    const float gains[] );
-
-void mdct_noiseShaping_flt(
-    float x[],
-    const int16_t lg,
-    const float gains[],
-    const int16_t nBands );
-
-
-void PsychAdaptLowFreqDeemph_flt(
-    float x[],
-    const float lpcGains[],
-    float lf_deemph_factors[] );
-
-void AdaptLowFreqDeemph_flt(
-    float x[],
-    int16_t tcx_lpc_shaped_ari,
-    const float lpcGains[],
-    const int16_t lg,
-    float lf_deemph_factors[] );
-
-
-void tcx_noise_filling_flt(
-    float *Q,
-    const int16_t noiseFillSeed,
-    const int16_t iFirstLine,
-    const int16_t lowpassLine,
-    const int16_t nTransWidth,
-    const int16_t L_frame,
-    const float tiltCompFactor,
-    float fac_ns,
-    Word16 *infoTCXNoise,
-    const int16_t element_mode /* i  : IVAS element mode                         */
-);
-
-
-void tcx_decoder_memory_update_flt(
-    Decoder_State *st,   /* i/o: decoder memory state                        */
-    const float *xn_buf, /* i  : mdct output buffer                          */
-    float *synth,        /* i/o: synth                                       */
-    const float *A       /* i  : Quantized LPC coefficients                  */
-);
-
-
-/*! r: number of bits used (including "bits") */
-int16_t tcx_ari_res_invQ_spec_flt(
-    float x_Q[],           /* i/o: quantized spectrum                          */
-    const int16_t L_frame, /* i  : number of lines                             */
-    const int16_t prm[],   /* i  : bitstream                                   */
-    int16_t target_bits,   /* i  : number of bits available                    */
-    int16_t bits,          /* i  : number of bits used so far                  */
-    const float deadzone,  /* i  : quantizer deadzone                          */
-    const float x_fac[]    /* i  : spectrum post-quantization factors          */
-);
-
-
-void ari_copy_states(
-    Tastat *source,
-    Tastat *dest );
-
-
-void ari_start_encoding_14bits(
-    Tastat *s );
-
-
-void ari_start_decoding_14bits_ivas(
-    Decoder_State *st,
-    Tastat *s );
-
-int16_t ari_start_decoding_14bits_prm_ivas(
-    const int16_t *ptr,
-    int16_t bp,
-    Tastat *s );
-
-void ari_decode_14bits_s17_ext_ivas(
-    Decoder_State *st,
-    uint16_t *res,
-    Tastat *s,
-    const uint16_t *cum_freq );
-
-void ari_decode_14bits_s27_ext_ivas(
-    Decoder_State *st,
-    uint16_t *res,
-    Tastat *s,
-    const uint16_t *cum_freq );
-
-void ari_decode_14bits_bit_ext_ivas(
-    Decoder_State *st,
-    uint16_t *res,
-    Tastat *s );
-
-/*! r: Q15 */
-Word16 expfp_evs_fx(
-    const Word16 x,  /* i  : mantissa  Q15-e                         */
-    const Word16 x_e /* i  : exponent  Q0                            */
-);
-
-
-void tcx_arith_render_envelope_ivas_fx(
-    const Word16 A_ind[],     /* i  : LPC coefficients of signal envelope        Q12*/
-    const Word16 L_frame,     /* i  : number of spectral lines                   Q0*/
-    const Word16 L_spec,      /* i  : length of the coded spectrum               Q0*/
-    const Word16 preemph_fac, /* i  : pre-emphasis factor                        Q15*/
-    const Word16 gamma_w,     /* i  : A_ind -> weighted envelope factor          Q15*/
-    const Word16 gamma_uw,    /* i  : A_ind -> non-weighted envelope factor      Q14*/
-    Word32 env[]              /* o  : shaped signal envelope                     Q16*/
-);
-
-int16_t ari_encode_14bits_range(
-    int16_t *ptr,
-    int16_t bp,
-    int32_t bits,
-    Tastat *s,
-    uint16_t cum_freq_low,
-    uint16_t cum_freq_high );
-
-
-int16_t ari_done_cbr_encoding_14bits(
-    int16_t *ptr,
-    int16_t bp,
-    int32_t bits,
-    Tastat *s );
-
-
-void tcx_arith_encode_envelope(
-    float spectrum[],            /* i/o: MDCT coefficients             */
-    int16_t signs[],             /* o  : signs (spectrum[.]<0)         */
-    const int16_t L_frame,       /* i  : frame or MDCT length          */
-    const int16_t L_spec,        /* i  : length w/o BW limitation      */
-    Encoder_State *st,           /* i/o: coder state                   */
-    const Word16 A_ind[],        /* i  : quantised LPC coefficients    */
-    int16_t target_bits,         /* i  : number of available bits      */
-    int16_t prm[],               /* o  : bitstream parameters          */
-    const int16_t use_hm,        /* i  : use HM in current frame?      */
-    int16_t prm_hm[],            /* o  : HM parameter area             */
-    const int16_t tcxltp_pitch,  /* i  : TCX LTP pitch in FD, -1 if n/a*/
-    int16_t *arith_bits,         /* o  : bits used for ari. coding     */
-    int16_t *signaling_bits,     /* o  : bits used for signaling       */
-    const int16_t low_complexity /* i  : low-complexity flag           */
-);
-
-void tcx_arith_decode_envelope(
-    Decoder_State *st,           /* i/o: coder state                   */
-    float q_spectrum[],          /* o  : quantised MDCT coefficients   */
-    const int16_t L_frame,       /* i  : frame or MDCT length          */
-    int16_t L_spec,              /* i  : length w/o BW limitation      */
-    const Word16 A_ind[],        /* i  : quantised LPC coefficients    */
-    const int16_t target_bits,   /* i  : number of available bits      */
-    const int16_t prm[],         /* i  : bitstream parameters          */
-    const int16_t use_hm,        /* i  : use HM in current frame?      */
-    const int16_t prm_hm[],      /* i  : HM parameter area             */
-    int16_t tcxltp_pitch,        /* i  : TCX LTP pitch in FD, -1 if n/a*/
-    int16_t *arith_bits,         /* o  : bits used for ari. coding     */
-    int16_t *signaling_bits,     /* o  : bits used for signaling       */
-    const int16_t low_complexity /* i  : low-complexity flag           */
-);
-
-void tcx_arith_decode_envelope_ivas_fx(
-    Decoder_State *st,          /* i/o: coder state                   */
-    Word32 q_spectrum[],        /* o  : quantised MDCT coefficients   */
-    Word16 *q_spectrum_e,       /* o  : MDCT exponent                 */
-    const Word16 L_frame,       /* i  : frame or MDCT length          */
-    Word16 L_spec,              /* i  : length w/o BW limitation      */
-    const Word16 A_ind[],       /* i  : quantised LPC coefficients    */
-    const Word16 target_bits,   /* i  : number of available bits      */
-    Word16 prm[],               /* i  : bitstream parameters          */
-    const Word16 use_hm,        /* i  : use HM in current frame?      */
-    const Word16 prm_hm[],      /* i  : HM parameter area             */
-    Word16 tcxltp_pitch,        /* i  : TCX LTP pitch in FD, -1 if n/a*/
-    Word16 *arith_bits,         /* o  : bits used for ari. coding     */
-    Word16 *signaling_bits,     /* o  : bits used for signaling       */
-    const Word16 low_complexity /* i  : low-complexity flag           */
-);
-
-
-void UnmapIndex_fx(
-    const Word16 PeriodicityIndex, /* Q0 */
-    const Word16 Bandwidth,        /* Q0 */
-    const Word16 LtpPitchLag,      /* Q0 */
-    const Word8 SmallerLags,       /* Q0 */
-    Word16 *FractionalResolution,  /* Q0 */
-    Word32 *Lag                    /* Q0 */
-);
-
-/*! r: PeriodicityIndex */
-int16_t SearchPeriodicityIndex(
-    const float Mdct[],            /* i  : Coefficients, Mdct[0..NumCoeffs-1]                      */
-    const float UnfilteredMdct[],  /* i  : Unfiltered coefficients, UnfilteredMdct[0..NumCoeffs-1] */
-    const int16_t NumCoeffs,       /* i  : Number of coefficients                                  */
-    const int16_t shortTargetBits, /* i  : Target bit budget (excl. Done flag)                     */
-    const int16_t LtpPitchLag,     /* i  : TCX-LTP pitch                                           */
-    const float LtpGain,           /* i  : LTP gain                                                */
-    float *RelativeScore           /* o  : Energy concentration factor                             */
-);
-
-
-int16_t EncodeIndex(
-    const int16_t Bandwidth, /* o  : NB, 1: (S)WB                                            */
-    int16_t PeriodicityIndex,
-    BSTR_ENC_HANDLE hBstr );
-
-
-Word16 CountIndexBits_fx(
-    Word16 Bandwidth,       /* 0: NB, 1: (S)WB	Q0*/
-    Word16 PeriodicityIndex /* Q0 */
-);
-
-int16_t DecodeIndex(
-    Decoder_State *st,
-    const int16_t Bandwidth, /* o  : NB, 1: (S)WB                                            */
-    int16_t *PeriodicityIndex );
-
-#define GET_ADJ( T, L )     GET_ADJ2( T, L, *FractionalResolution )
-#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )
-
-
-Word32 tcx_hm_render_fx(
-    const Word32 lag,       /* i: pitch lag                         Q0  */
-    const Word16 fract_res, /* i: fractional resolution of the lag  Q0  */
-    Word16 p[]              /* o: harmonic model                    Q13 */
-);
-
-
-void tcx_hm_modify_envelope_fx(
-    const Word16 gain,      /* i:   HM gain                           Q11 */
-    const Word32 lag,       /* i:   pitch lag                         Q0  */
-    const Word16 fract_res, /* i:   fractional resolution of the lag  Q0  */
-    const Word16 p[],       /* i:   harmonic model                    Q13 */
-    Word32 env[],           /* i/o: envelope                          Q16 */
-    const Word16 L_frame    /* i:   number of spectral lines          Q0  */
-);
-
-void tcx_hm_analyse(
-    const float abs_spectrum[], /* i  : absolute spectrum                     */
-    const int16_t L_frame,      /* i  : number of spectral lines              */
-    Word32 env[],               /* i/o: envelope shape (Q16)                  */
-    const int16_t targetBits,   /* i  : target bit budget                     */
-    const int16_t coder_type,   /* i  : GC/VC coder type                      */
-    int16_t prm_hm[],           /* o  : HM parameters                         */
-    int16_t LtpPitchLag,        /* i  : LTP pitch lag or -1 if none           */
-    const float LtpGain,        /* i  : LTP gain                              */
-    int16_t *hm_bits            /* o  : bit consumption                       */
-);
-
-void tcx_hm_decode_ivas(
-    const int16_t L_frame,     /* i  : number of spectral lines              */
-    Word32 env[],              /* i/o: envelope shape (Q16)                  */
-    const int16_t targetBits,  /* i  : target bit budget                     */
-    const int16_t coder_type,  /* i  : GC/VC coder type                      */
-    const int16_t prm_hm[],    /* i  : HM parameters                         */
-    const int16_t LtpPitchLag, /* i  : LTP pitch lag or -1 if none           */
-    int16_t *hm_bits           /* o  : bit consumption                       */
-);
-
-void tcx_hm_decode(
-    const Word16 L_frame,     /* i  : number of spectral lines      */
-    Word32 env[],             /* i/o: envelope shape (Q16)          */
-    const Word16 targetBits,  /* i  : target bit budget             */
-    const Word16 coder_type,  /* i  : GC/VC coder type              */
-    const Word16 prm_hm[],    /* i  : HM parameters                 */
-    const Word16 LtpPitchLag, /* i  : LTP pitch lag or -1 if none   */
-    Word16 *hm_bits           /* o  : bit consumption               */
-);
-
-void coder_tcx(
-    Encoder_State *st,          /* i/o: encoder state structure               */
-    TCX_CONFIG_HANDLE hTcxCfg,  /* i  : configuration of TCX                  */
-    const float A[],            /* i  : quantized coefficients NxAz_q[M+1]    */
-    const Word16 Aqind[],       /* i  : frame-independent quantized coefficients (M+1) */
-    float synth[],              /* o  : decoded synthesis                     */
-    const int16_t L_frame_glob, /* i  : frame length                          */
-    const int16_t L_frameTCX_glob,
-    const int16_t L_spec,
-    int16_t nb_bits,  /* i  : bit budget                            */
-    float spectrum[], /* i/o: MDCT spectrum                         */
-    int16_t prm[],    /* o  : tcx parameters                        */
-    CONTEXT_HM_CONFIG *hm_cfg,
-    const int16_t vad_hover_flag /* i  : VAD hangover flag */
-);
-
-void coder_tcx_post(
-    Encoder_State *st, /* i/o: encoder memory state                        */
-    float *A,          /* o  : Quantized LPC coefficients                  */
-    const float *Ai    /* i  : Unquantized (interpolated) LPC coefficients */
-);
-
-void decoder_tcx(
-    Decoder_State *st,                  /* i/o: coder memory state                    */
-    int16_t prm[],                      /* i  : parameters                            */
-    float A[],                          /* i  : coefficients NxAz[M+1]                */
-    Word16 Aind[],                      /* i  : frame-independent coefficients Az[M+1]*/
-    float synth[],                      /* i/o: synth[-M..lg]                         */
-    float synthFB[],                    /* i/o: encoder memory state                  */
-    const int16_t bfi,                  /* i  : Bad frame indicator                   */
-    const int16_t frame_cnt,            /* i  : frame counter in the super_frame      */
-    const int16_t sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC    */
-);
-
-void decoder_tcx_post(
-    Decoder_State *st, /* i/o: decoder memory state          */
-    float *synth,
-    float *synthFB,
-    float *A, /* i  : A(z) filter coefficients             */
-    const int16_t bfi,
-    const int16_t isMCT );
-
-void coder_acelp(
-    Encoder_State *st,    /* i/o: coder memory state          */
-    const float A[],      /* i  : coefficients 4xAz[M+1]      */
-    const float Aq[],     /* i  : coefficients 4xAz_q[M+1]    */
-    const float speech[], /* i  : speech[-M..lg]              */
-    LPD_state *LPDmem,    /* i/o: ACELP memories              */
-    int16_t *prm,         /* o  : acelp parameters            */
-    const float stab_fac,
-    const int16_t target_bits,
-    float *gain_pitch_buf, /* o  : gain pitch values           */
-    float *gain_code_buf,  /* o  : gain code values            */
-    float *pitch_buf,      /* o  : pitch values for each subfr.*/
-    float *voice_factors,  /* o  : voicing factors             */
-    float *bwe_exc         /* o  : excitation for SWB TBE      */
-);
-
-void coder_acelp_rf(
-    const int16_t target_bits,   /* i  :   target bits               */
-    const float speech[],        /* i  : speech[-M..lg]              */
-    const int16_t coder_type,    /* i  : coding type                 */
-    const int16_t rf_frame_type, /* i  : rf_frame_type               */
-    const float A[],             /* i  : coefficients 4xAz[M+1]      */
-    const float Aq[],            /* i  : coefficients 4xAz_q[M+1]    */
-    const float voicing[],       /* i  : open-loop LTP gain          */
-    const int16_t T_op[],        /* i  : open-loop LTP lag           */
-    const float stab_fac,        /* i  : LP stability factor         */
-    Encoder_State *st,           /* i/o: coder memory state          */
-    ACELP_config *acelp_cfg,     /* i/o: configuration of the ACELP  */
-    float *exc_rf,               /* i/o: pointer to RF excitation    */
-    float *syn_rf                /* i/o: pointer to RF synthesis     */
-);
-
-void decoder_acelp(
-    Decoder_State *st,              /* i/o:  coder memory state         */
-    int16_t prm[],                  /* i  : parameters                  */
-    const float A[],                /* i  : coefficients NxAz[M+1]      */
-    ACELP_config acelp_cfg,         /* i  : ACELP config                */
-    float synth[],                  /* i/o: synthesis                   */
-    int16_t *pT,                    /* o  : pitch for all subframe      */
-    float *pgainT,                  /* o  : pitch gain for all subfr    */
-    const float stab_fac,           /* i  : stability of isf            */
-    float *pitch_buffer,            /* o  : pitch values for each subfr.*/
-    float *voice_factors,           /* o  : voicing factors             */
-    const int16_t LSF_Q_prediction, /* i  : LSF prediction mode         */
-    float *bwe_exc                  /* o  : excitation for SWB TBE      */
-);
-
-void writeTCXMode_fx(
-    Encoder_State *st,     /* i/o: encoder state structure					*/
-    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle						*/
-    const Word16 MCT_flag, /* i  : hMCT handle allocated (1) or not (0)		Q0*/
-    Word16 *nbits_start    /* o  : nbits start								Q0*/
-);
-
-void writeTCXWindowing_fx(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: bitstream handle				*/
-    const Word16 overlap_mode /* i  : overlap mode					Q0*/
-);
-
-void writeLPCparam(
-    Encoder_State *st,              /* i/o: encoder state structure     */
-    BSTR_ENC_HANDLE hBstr,          /* i/o: bitstream handle            */
-    const int16_t param_lpc[],      /* i  : LPC parameters to write     */
-    const int16_t bits_param_lpc[], /* i  : bits per LPC parameter      */
-    const int16_t no_param_lpc,     /* i  : number of LPC parameters    */
-    int16_t *nbits_lpc              /* o  : LPC bits written            */
-);
-
-void enc_prm(
-    Encoder_State *st,   /* i/o: encoder state structure     */
-    int16_t param[],     /* i  : parameters                  */
-    int16_t param_lpc[], /* i  : LPC parameters              */
-    CONTEXT_HM_CONFIG hm_cfg[],
-    const int16_t bits_param_lpc[],
-    const int16_t no_param_lpc );
-
-void writeTCXparam(
-    Encoder_State *st,          /* i/o: Encoder State handle        */
-    BSTR_ENC_HANDLE hBstr,      /* i/o: bitstream handle            */
-    CONTEXT_HM_CONFIG hm_cfg[], /* i/o: HM config                   */
-    int16_t param[],            /* i  : parameters                  */
-    const int16_t nbits_header,
-    const int16_t nbits_start,
-    const int16_t nbits_lpc,
-    const int16_t *no_param_tns, /* i  : number of TNS parameters per subframe          */
-    int16_t p_param[2],          /* i/o: pointer to parameters from previous bs writing */
-    const int16_t target_bitsTCX10[2],
-    const int16_t pre_past_flag );
-
-void enc_prm_rf(
-    Encoder_State *st, /* i/o: encoder memory state          */
-    const int16_t rf_frame_type,
-    const int16_t fec_offset );
-
-void dec_prm_hm_ivas(
-    Decoder_State *st, /* i/o: decoder memory state          */
-    int16_t *prm_hm,
-    const int16_t hm_size );
-
-void dec_prm_ivas(
-    Decoder_State *st,     /* i/o: decoder memory state          */
-    int16_t param[],       /* o  : decoded parameters            */
-    int16_t param_lpc[],   /* i  : LPC parameters                */
-    int16_t *total_nbbits, /* i/o: number of bits / decoded bits */
-    int16_t *bitsRead );
-void gaus_L2_dec_flt(
-    float *code, /* o  : decoded gaussian codevector             */
-    float tilt_code,
-    const float *A,
-    float formant_enh_num,
-    int16_t *seed_acelp /* i/o: random seed             */
-);
-
-/*! r: interpolated value */
-float interpolation(
-    const float *x,        /* i  : input vector            */
-    const float *win,      /* i  : interpolation window    */
-    const int16_t frac,    /* i  : fraction                */
-    const int16_t up_samp, /* i  : upsampling factor       */
-    const int16_t nb_coef  /* i  : nb of filter coef       */
-);
-
-void predict_signal_flt(
-    const float excI[],     /* i  : input excitation buffer  */
-    float excO[],           /* o  : output excitation buffer */
-    const int16_t T0,       /* i  : integer pitch lag        */
-    int16_t frac,           /* i  : fraction of lag          */
-    const int16_t frac_max, /* i  : max fraction             */
-    const int16_t L_subfr   /* i  : subframe size            */
-);
-
-void tcx_ltp_encode(
-    Encoder_State *st,
-    const int16_t tcxMode,
-    const int16_t L_frame,
-    const float *speech,
-    float *speech_ltp,
-    const float *wsp,
-    const int16_t Top[],
-    int16_t *ltp_param,
-    int16_t *ltp_bits,
-    float *A,
-    const int16_t disable_ltp,
-    const int16_t element_mode );
-
-void tcx_ltp_post_flt(
-    Decoder_State *st,
-    TCX_LTP_DEC_HANDLE hTcxLtpDec,
-    const int16_t core,
-    const int16_t output_frame,
-    const int16_t L_frame,
-    float sig[],
-    const float tcx_buf[] );
-
-int16_t tcx_ltp_decode_params_flt(
-    int16_t *ltp_param,
-    int16_t *pitch_int,
-    int16_t *pitch_fr,
-    float *gain,
-    const int16_t pitmin,
-    const int16_t pitfr1,
-    const int16_t pitfr2,
-    const int16_t pitmax,
-    const int16_t pitres );
-
-void create_IDCT_N_Matrix(
-    float *inv_matrixFloatQ, /* i/o: RAM buffer */
-    const int16_t N,         /* i  : DCT length, number of time samples             */
-    const int16_t n_cols,    /* i  : number of dct coeffs (as DCT may be truncated) */
-    const int16_t alloc_size /* i  : RAM buffer size in elements                    */
-);
-
-void dctT2_N_apply_matrix(
-    const float *input,           /* i  : input  in fdcng or DCT(fdcng) domain     */
-    float *output,                /* o  : output in DCT(fdcng) or fdcng ordomain   */
-    const int16_t dct_dim,        /* i  : dct processing dim possibly truncated    */
-    const int16_t fdcngvq_dim,    /* i  : fdcng domain length                      */
-    const float *matrix,          /* i  : IDCT matrix                              */
-    const int16_t matrix_row_dim, /* i  :                                          */
-    const DCTTYPE dcttype         /* i  : matrix  operation type                   */
-);
-
-void extend_dctN_input(
-    const float *input,     /* i  : input in fdcng domain                         */
-    const float *dct_input, /* i  : input in dctN(fdcng) domain                   */
-    const int16_t in_dim,   /* i  : in_dim == N                                   */
-    float *ext_sig,         /* o  : extended output in fdcng domain               */
-    const int16_t out_dim,  /* i  : output total dim                              */
-    float *matrix,          /* i  : idct synthesis matrix N rows, n_cols  columns */
-    const int16_t n_cols,   /* i  : number of columns ==  DCT truncation length   */
-    const DCTTYPE dcttype   /* i  : matrix operation type                         */
-);
-
-
-void PulseResynchronization(
-    const float *src_exc,       /* i  : Input excitation buffer                 */
-    float *dst_exc,             /* o  : output excitation buffer                */
-    const int16_t nFrameLength, /* i  : frame length                            */
-    const int16_t nSubframes,   /* i  : Number of subframes                     */
-    const float pitchStart,     /* i  : Pitch at the end of the last frame      */
-    const float pitchEnd        /* i  : Pitch at the end of the current  frame  */
-);
-
-void con_acelp(
-    float A[],                /* i  : coefficients NxAz[M+1]      */
-    const int16_t coder_type, /* i  : ACELP coder type            */
-    float synth[],            /* i/o: synthesis                   */
-    int16_t *pT,              /* o  :   pitch for all subframe    */
-    float *pgainT,            /* o  :   pitch gain for all subfr  */
-    float stab_fac,           /* i  : stability of isf            */
-    Decoder_State *st,        /* i/o:  coder memory state         */
-    float pitch_buffer[],     /* i/o: floating pitch values for each subframe          */
-    float *voice_factors,     /* o  : voicing factors             */
-    float *bwe_exc            /* o  : excitation for SWB TBE      */
-);
-
-void con_tcx(
-    Decoder_State *st,       /* i/o: coder memory state          */
-    float synth[],           /* i/o: synth[]                     */
-    const float coh,         /* i  : coherence of stereo signal  */
-    int16_t *noise_seed,     /* i/o: noise seed for stereo       */
-    const int16_t only_left, /* i  : TD-PLC only in left channel */
-    const float A_cng[]      /* i  : CNG LP filter coefficients  */
-);
-
-int16_t lsf_msvq_ma_decprm_ivas(
-    Decoder_State *st,
-    int16_t *param_lpc );
-
-int16_t dec_lsf_tcxlpc_ivas(
-    Decoder_State *st,        /* i  : Decoder state        */
-    int16_t **indices,        /* o  : Ptr to VQ indices    */
-    const int16_t narrowband, /* i  : narrowband flag      */
-    const int16_t cdk         /* i  : codebook selector    */
-);
-
-int16_t D_lsf_tcxlpc_ivas(
-    const int16_t indices[],  /* i  : VQ indices           */
-    float lsf_q[],            /* o  : quantized lsf        */
-    Word16 lsp_q_ind[],       /* o  : quantized lsp (w/o MA prediction) */
-    const int16_t narrowband, /* i  : narrowband flag      */
-    const int16_t cdk,        /* i  : codebook selector    */
-    const float mem_MA[]      /* i  : MA memory            */
-);
-
-int16_t Q_lsf_tcxlpc(
-    /* const */ float lsf[],  /* i  : original lsf             */
-    float lsf_q[],            /* o  : quantized lsf            */
-    Word16 lsp_q_ind[],       /* o  : quantized lsp (w/o MA prediction) */
-    int16_t indices[],        /* o  : VQ indices               */
-    const int16_t narrowband, /* i  : narrowband flag          */
-    const int16_t cdk,        /* i  : codebook selector        */
-    const float mem_MA[],     /* i  : MA memory                */
-    const int16_t coder_type, /* i  : acelp extended mode      */
-    const float *Bin_Ener     /* i  : Spectrum energy          */
-);
-
-void midlsf_enc(
-    const float qlsf0[],
-    const float qlsf1[],
-    const float lsf[],
-    int16_t *idx,
-    const int16_t N,
-    const float *Bin_Ener,
-    const int16_t narrowBand,
-    const int32_t sr_core,
-    const int16_t coder_type );
-
-void lsf_end_enc(
-    Encoder_State *st,
-    const float *lsf,
-    float *qlsf,
-    const int16_t nBits,
-    const int16_t coder_type_org,
-    const int16_t force_sf,
-    int16_t *lpc_param,
-    int16_t *no_stages,
-    int16_t *bits_param_lpc,
-    const int16_t coder_type_raw,
-    const float tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel          */
-);
-
-void lsf_end_dec(
-    Decoder_State *st,            /* i/o: decoder state structure                 */
-    const int16_t coder_type_org, /* i  : coding type                             */
-    const int16_t bwidth,         /* i  : input signal bandwidth                  */
-    const int16_t nBits,          /* i  : number of bits used for ISF quantization*/
-    float *qlsf,                  /* o  : quantized LSFs in the cosine domain     */
-    int16_t *lpc_param,           /* i  : LPC parameters                          */
-    int16_t *LSF_Q_prediction,    /* o  : LSF prediction mode                     */
-    int16_t *nb_indices,          /* o  : number of indices                       */
-    const float tdm_lsfQ_PCh[M]   /* i  : Q LSFs for primary channel          */
-);
-
-void lpc_quantization(
-    Encoder_State *st,
-    const float lsp[],
-    const float lspmid[],
-    float lsp_q[],
-    float lsf_q[],
-    float lspmid_q[],
-    const int16_t coder_type,
-    const int16_t acelp_midLpc,
-    int16_t param_lpc[],
-    int16_t nbits_lpc[],
-    int16_t *bits_param_lpc,
-    int16_t *no_param_lpc );
-
-void lpc_unquantize(
-    Decoder_State *st,
-    float *lsf,
-    float *lsp,
-    int16_t *param_lpc,
-    float *lspmid,
-    float *lsfmid,
-    const int16_t coder_type,
-    int16_t *LSF_Q_prediction /* o  : LSF prediction mode                     */
-);
-
-void dlpc_bfi_flt(
-    const int16_t L_frame,
-    float *lsf_q,             /* o  : quantized lsfs                         */
-    const float *lsfold,      /* i  : past quantized lsf                     */
-    const int16_t last_good,  /* i  : last good received frame               */
-    const int16_t nbLostCmpt, /* i  : counter of consecutive bad frames      */
-    float mem_MA[],           /* i/o: quantizer memory for MA model          */
-    float mem_AR[],           /* i/o: quantizer memory for MA model          */
-    float *stab_fac,          /* i  : lsf stability factor                   */
-    float *lsf_adaptive_mean, /* i  : lsf adaptive mean, updated when BFI==0 */
-    const int16_t numlpc,     /* i  : Number of division per superframe      */
-    float lsf_cng[],
-    const int16_t plcBackgroundNoiseUpdated,
-    float *lsf_q_cng,     /* o  : quantized lsfs of background noise      */
-    float *old_lsf_q_cng, /* o  : old quantized lsfs for background noise */
-    const float lsfBase[] /* i  : base for differential lsf coding        */
-);
-
-void Unified_weighting(
-    const float Bin_Ener_128[], /* i  : FFT Bin energy 128 bins in two sets     */
-    const float lsf[],          /* i  : LSF vector                              */
-    float w[],                  /* o  : LP weighting filter (numerator)         */
-    const int16_t narrowBand,   /* i  : flag for Narrowband                     */
-    const int16_t unvoiced,     /* i  : flag for Unvoiced frame                 */
-    const int32_t sr_core,      /* i  : sampling rate of core-coder             */
-    const int16_t order         /* i  : LP order                                */
-);
-
-int16_t vad_init(
-    VAD_CLDFB_HANDLE hVAD_CLDFB /* i/o: CLDFB VAD state                         */
-);
-
-int16_t vad_proc(
-    float realValues[16][60],    /* i  : CLDFB real values                       */
-    float imagValues[16][60],    /* i  : CLDFB imag values                       */
-    float *sb_power,             /* i/o: Energy of CLDFB data                    */
-    const int16_t numBands,      /* i  : number of input bands                   */
-    VAD_CLDFB_HANDLE hVAD_CLDFB, /* i/o: CLDFB VAD state                         */
-    int16_t *cldfb_addition,
-    const int16_t vada_flag /* i  : VAD flag                                */
-);
-
-
-int16_t update_decision(
-    VAD_CLDFB_HANDLE hVAD_CLDFB,    /* i/o: CLDFB VAD state                        */
-    const float snr,                /* i  : frequency domain SNR                    */
-    const float tsnr,               /* i  : time domain SNR                         */
-    const float frame_energy,       /* i  : current frame energy                    */
-    const float high_eng,           /* i  : current frame high frequency energy     */
-    const int16_t vad_flag,         /* i  : VAD flag                                */
-    const int16_t music_backgound_f /* i  : background music flag                   */
-);
-
-void frame_spec_dif_cor_rate(
-    float spec_amp[],         /* i  : spectral amplitude                      */
-    float pre_spec_low_dif[], /* i/o: low spectrum different                  */
-    float f_tonality_rate[]   /* o  : tonality rate                           */
-);
-
-
-void SNR_calc(
-    const float frame_sb_energy[], /* i  : energy of sub-band divided non-uniformly*/
-    const float sb_bg_energy[],    /* i  : sub-band background energy              */
-    const float t_bg_energy,       /* i  : time background energy of several frames*/
-    float *snr,                    /* o  : frequency domain SNR                    */
-    float *tsnr,                   /* o  : time domain SNR                         */
-    const float frame_energy,      /* i  : current frame energy                    */
-    const int16_t bwidth           /* i  : audio bandwidth                         */
-);
-
-void background_update(
-    VAD_CLDFB_HANDLE hVAD_CLDFB,     /* i/o: CLDFB VAD state                         */
-    float frame_energy,              /* i  : current frame energy 2                  */
-    const int16_t update_flag,       /* i  : current frame update flag               */
-    const int16_t music_backgound_f, /* i  : background music flag                   */
-    const float snr );
-
-void bg_music_decision(
-    VAD_CLDFB_HANDLE hVAD_CLDFB, /* i/o: CLDFB VAD state                         */
-    int16_t *music_backgound_f,  /* i  : background music flag                   */
-    const float frame_energy     /* i  : current frame energy 1                  */
-);
-
-void est_energy(
-    float sb_power[],        /* o  : energy of sub-band divided uniformly    */
-    float frame_sb_energy[], /* o  : energy of sub-band divided non-uniformly*/
-    float *p_frame_energy,   /* o  : frame energy 1                          */
-    float *p_frame_energy2,  /* o  : frame energy 2                          */
-    float *p_high_energy,    /* o  : high frequency energy                   */
-    const int16_t bw         /* i  : bandwidth                               */
-);
-
-
-int16_t comvad_decision(
-    VAD_CLDFB_HANDLE hVAD_CLDFB,     /* i/o: CLDFB VAD state                         */
-    const float snr,                 /* i  : frequency domain SNR                    */
-    const float tsnr,                /* i  : time domain SNR                         */
-    const float snr_flux,            /* i  : average tsnr of several frames          */
-    const float lt_snr,              /* i  : long time SNR calculated by fg_energy and bg_energy*/
-    const float lt_snr_org,          /* i  : original long time SNR                  */
-    const float lf_snr,              /* i  : long time frequency domain SNR calculated by l_speech_snr and l_silence_snr*/
-    const float frame_energy,        /* i  : current frame energy                    */
-    const int16_t music_backgound_f, /* i  : background music flag                   */
-    int16_t *cldfb_addition,
-    const int16_t vada_flag /* i  : VAD flag                                */
-);
-
-void calc_snr_flux(
-    float tsnr,      /* i  : time-domain SNR                         */
-    float pre_snr[], /* i/o:  time-domain SNR storage                */
-    float *snr_flux  /* o  : average tsnr                            */
-);
-
-void calc_lt_snr(
-    float *lt_snr_org,              /* o  : original long time SNR                  */
-    float *lt_snr,                  /* o  : long time SNR calculated by fg_energy and bg_energy*/
-    const float fg_energy,          /* i  : foreground energy sum                   */
-    const int16_t fg_energy_count,  /* i  : number of the foreground energy frame   */
-    const float bg_energy,          /* i  : background energy sum                   */
-    const int16_t bg_energy_count,  /* i  : number of the background energy frame   */
-    const int16_t bw_index,         /* i  : band width index                        */
-    const float lt_noise_sp_center0 /* i  : long time noise spectral center by 0    */
-);
-
-void calc_lf_snr(
-    float *lf_snr_smooth,              /* o  : smoothed lf_snr                         */
-    float *lf_snr,                     /* o  : long time frequency domain SNR calculated by l_speech_snr and l_silence_snr*/
-    const float l_speech_snr,          /* i  : sum of active frames snr                */
-    const int16_t l_speech_snr_count,  /* i  : number of the active frame              */
-    const float l_silence_snr,         /* i  : sum of the nonactive frames snr         */
-    const int16_t l_silence_snr_count, /* i  : number of the nonactive frame           */
-    const int16_t fg_energy_count,     /* i  : number of the foreground energy frame   */
-    const int16_t bg_energy_count,     /* i  : number of the background energy frame   */
-    const int16_t bw_index             /* i  : band width index                        */
-);
-
-float construct_snr_thresh(
-    const float sp_center[],             /* i  : spectral center                         */
-    const float snr_flux,                /* i  : snr flux                                */
-    const float lt_snr,                  /* i  : long time time domain snr               */
-    const float lf_snr,                  /* i  : long time frequency domain snr          */
-    const int16_t continuous_speech_num, /* i  : continuous speech number                */
-    const int16_t continuous_noise_num,  /* i  : continuous noise number                 */
-    const int16_t fg_energy_est_start,   /* i  : whether if estimated energy             */
-    const int16_t bw_index               /* i  : band width index                        */
-);
-
-void minimum_statistics_flt(
-    const int16_t len,    /* i  : Vector length                                       */
-    const int16_t lenFFT, /* i  : Length of the FFT part of the vectors               */
-    float *psize_flt,
-    float *msPeriodog, /* i  : Periodograms                                        */
-    float *msNoiseFloor,
-    float *msNoiseEst, /* o  : Noise estimates                                     */
-    float *msAlpha,
-    float *msPsd,
-    float *msPsdFirstMoment,
-    float *msPsdSecondMoment,
-    float *msMinBuf,
-    float *msBminWin,
-    float *msBminSubWin,
-    float *msCurrentMin,
-    float *msCurrentMinOut,
-    float *msCurrentMinSubWindow,
-    int16_t *msLocalMinFlag,
-    int16_t *msNewMinFlag,
-    float *msPeriodogBuf,
-    int16_t *msPeriodogBufPtr,
-    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables   */
-    const int16_t enc_dec,       /* i  : encoder/decoder indicator                               */
-    const int16_t element_mode   /* i  : IVAS element mode                                       */
-);
-
-void generate_comfort_noise_enc(
-    Encoder_State *st /* i/o: encoder state structure                 */
-);
-
-void generate_comfort_noise_dec(
-    float **bufferReal,     /* o  : Real part of input bands                                */
-    float **bufferImag,     /* o  : Imaginary part of input bands                           */
-    Decoder_State *st,      /* i/o: decoder state structure                                 */
-    const int16_t nchan_out /* i  : number of output channels                               */
-);
-
-void generate_comfort_noise_dec_hf(
-    float **bufferReal,          /* o  : Real part of input bands                                */
-    float **bufferImag,          /* o  : Imaginary part of input bands                           */
-    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables   */
-    const int16_t cng_flag       /* i  : CNG Flag */
-);
-
-void generate_masking_noise(
-    float *timeDomainBuffer,          /* i/o: time-domain signal                               */
-    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables   */
-    const int16_t length,             /* i  : frame size                                       */
-    const int16_t core,               /* i  : core                                             */
-    const int16_t return_noise,       /* i  : noise is returned instead of added               */
-    const int16_t secondary,          /* i  : indicator for secondary channel                  */
-    const int16_t element_mode,       /* i  : element mode                                     */
-    STEREO_CNG_DEC_HANDLE hStereoCng, /* i  : stereo CNG handle                                */
-    const int16_t nchan_out           /* i  : number of output channels */
-);
-
-void generate_masking_noise_update_seed(
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables   */
-);
-
-void generate_masking_noise_mdct(
-    float *mdctBuffer,          /* i/o: time-domain signal                                      */
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables   */
-);
-
-void SynthesisSTFT_dirac_flt(
-    float *fftBuffer, /* i  : FFT bins */
-    float *timeDomainOutput,
-    float *olapBuffer,
-    const float *olapWin,
-    const int16_t samples_out,
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
-);
-
-void generate_masking_noise_dirac(
-    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables */
-    HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i  : filterbank state                                      */
-    float *tdBuffer,                  /* i/o: time-domain signal, if NULL no LB-CNA                 */
-    float *Cldfb_RealBuffer,          /* o  : CLDFD real buffer                                     */
-    float *Cldfb_ImagBuffer,          /* o  : CLDFD imaginary buffer                                */
-    const int16_t slot_index,         /* i  : CLDFB slot index                                      */
-    const int16_t cna_flag,           /* i  : CNA flag for LB and HB                                */
-    const int16_t fd_cng_flag         /* i  : FD-CNG flag for HB                                    */
-);
-
-void generate_stereo_masking_noise(
-    float *syn,                          /* i/o: time-domain signal              */
-    Decoder_State *st,                   /* i/o: decoder state structure         */
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i  : TD stereo structure             */
-    const int16_t flag_sec_CNA,          /* i  : CNA flag for secondary channel  */
-    const int16_t fadeOut,               /* i  : only fade out of previous state */
-    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : stereo CNG handle               */
-    const int16_t nchan_out              /* i  : number of output channels       */
-);
-
-void apply_scale_flt(
-    float *scale,                  /* i  : scale factor                                            */
-    const int16_t bwidth,          /* i  : audio bandwidth                                         */
-    const int32_t brate,           /* i  : Bit rate                                                */
-    const SCALE_SETUP *scaleTable, /* i  : Scale table                                             */
-    const int16_t scaleTableSize   /* i  : Size of scale table                                     */
-);
-
-void compress_range_flt(
-    float *in,
-    float *out,
-    const int16_t len );
-
-void expand_range_flt(
-    float *in,
-    float *out,
-    const int16_t len );
-
-void bandcombinepow_flt(
-    const float *bandpow,       /* i  : Power for each band */
-    const int16_t nband,        /* i  : Number of bands */
-    int16_t *part,              /* i  : Partition upper boundaries (band indices starting from 0) */
-    const int16_t npart,        /* i  : Number of partitions */
-    const float *psize_inv_flt, /* i  : Inverse partition sizes */
-    float *partpow              /* o  : Power for each partition */
-);
-
-void scalebands_flt(
-    const float *partpow,   /* i  : Power for each partition */
-    int16_t *part,          /* i  : Partition upper boundaries (band indices starting from 0) */
-    const int16_t npart,    /* i  : Number of partitions */
-    int16_t *midband,       /* i  : Central band of each partition */
-    const int16_t nFFTpart, /* i  : Number of FFT partitions */
-    const int16_t nband,    /* i  : Number of bands */
-    float *bandpow,         /* o  : Power for each band */
-    const int16_t flag_fft_en );
-
-void AnalysisSTFT_flt(
-    const float *timeDomainInput,
-    float *fftBuffer,    /* o  : FFT bins */
-    HANDLE_FD_CNG_COM st /* i/o: FD_CNG structure containing all buffers and variables */
-);
-
-void SynthesisSTFT_flt(
-    float *fftBuffer,
-    float *timeDomainOutput,
-    float *olapBuffer,
-    const float *olapWin,
-    const int16_t tcx_transition,
-    HANDLE_FD_CNG_COM hFdCngCom,
-    const int16_t element_mode, /* i  : element mode              */
-    const int16_t nchan_out     /* i  : number of output channels */
-);
-
-void lpc_from_spectrum_flt(
-    HANDLE_FD_CNG_COM hFdCngCom,
-    const int16_t start,
-    const int16_t stop,
-    const float preemph_fac );
-
-ivas_error createFdCngDec(
-    HANDLE_FD_CNG_DEC *hFdCngDec );
-
-void deleteFdCngDec(
-    HANDLE_FD_CNG_DEC *hFdCngDec );
-
-void initFdCngDec(
-    DEC_CORE_HANDLE st /* i/o: decoder state structure     */
-);
-
-void configureFdCngDec(
-    HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: Contains the variables related to the FD-based CNG process  */
-    const int16_t bwidth,
-    const int32_t total_brate,
-    const int16_t L_frame,
-    const int16_t last_L_frame,
-    const int16_t element_mode );
-
-void ApplyFdCng(
-    float *timeDomainInput,
-    float *powerSpectrum,
-    float **realBuffer, /* i/o: Real part of the buffer                 */
-    float **imagBuffer, /* i/o: Imaginary part of the buffer            */
-    Decoder_State *st,
-    const int16_t concealWholeFrame, /* i  : binary flag indicating frame loss       */
-    const int16_t is_music );
-
-void generate_comfort_noise_dec(
-    float **bufferReal,     /* o  : Real part of input bands      */
-    float **bufferImag,     /* o  : Imaginary part of input bands */
-    Decoder_State *st,      /* i/o: decoder state structure       */
-    const int16_t nchan_out /* i  : number of output channels     */
-);
-
-/*! r: CNG energy */
-float cng_energy(
-    const int16_t element_mode, /* i  : element mode                            */
-    const int16_t bwidth,       /* i  : audio bandwidh                          */
-    const int16_t CNG_mode,     /* i  : mode for DTX configuration              */
-    const float CNG_att,        /* i  : attenuation factor for CNG              */
-    const float *inputBuffer,   /* i  : input signal                            */
-    const int16_t len           /* i  : vector length                           */
-);
-
-void FdCng_decodeSID(
-    Decoder_State *st /* i/o: decoder state structure                 */
-);
-
-void FdCng_exc_flt(
-    HANDLE_FD_CNG_COM hFdCngCom,
-    int16_t *CNG_mode,
-    const int16_t L_frame,
-    const float *lsp_old,
-    const int16_t first_CNG,
-    float *lsp_CNG,
-    float *Aq,      /* o  : LPC coeffs                              */
-    float *lsp_new, /* o  : lsp                                     */
-    float *lsf_new, /* o  : lsf                                     */
-    float *exc,     /* o  : LP excitation                           */
-    float *exc2,    /* o  : LP excitation                           */
-    float *bwe_exc  /* o  : LP excitation for BWE                   */
-);
-
-void noisy_speech_detection(
-    HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure                        */
-    const int16_t vad,           /* i  : VAD flag                                */
-    const float syn[]            /* i  : input time-domain frame                 */
-);
-
-void deleteFdCngEnc(
-    HANDLE_FD_CNG_ENC *hFdCngEnc /* i/o: FD_CNG structure                        */
-);
-
-
-void resetFdCngEnc(
-    Encoder_State *st /* i/o: encoder state structure                                    */
-);
-
-void perform_noise_estimation_enc(
-    float *band_energies,        /* i  : energy in critical bands without minimum noise floor E_MIN */
-    float *enerBuffer,           /* i  : energy buffer                                              */
-    HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: CNG structure containing all buffers and variables         */
-    const int32_t input_Fs,      /* i  : input sampling rate                                        */
-    CPE_ENC_HANDLE hCPE );
-
-void AdjustFirstSID(
-    Encoder_State *st /* i/o: encoder state structure                                    */
-);
-
-void FdCng_encodeSID(
-    Encoder_State *st /* i/o: encoder state structure                                    */
-);
-
-void GetParameters(
-    ParamsBitMap const *paramsBitMap,
-    const int16_t nParams,
-    void const *pParameter,
-    int16_t **pStream,
-    int16_t *pnSize,
-    int16_t *pnBits );
-
-void SetParameters(
-    ParamsBitMap const *paramsBitMap,
-    const int16_t nParams,
-    void *pParameter,
-    const int16_t **pStream,
-    int16_t *pnSize );
-
-void WriteToBitstream(
-    ParamsBitMap const *paramsBitMap,
-    const int16_t nParams,
-    const int16_t **pStream,
-    int16_t *pnSize,
-    BSTR_ENC_HANDLE hBstr,
-    int16_t *pnBits );
-
-void ReadFromBitstream(
-    ParamsBitMap const *paramsBitMap,
-    const int16_t nArrayLength,
-    Decoder_State *st,
-    int16_t **pStream,
-    int16_t *pnSize );
-
-void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue );
-void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value );
-void const *GetNumOfTnsFilters_flt( void const *p, const int16_t index, int16_t *pValue );
-void *SetNumOfTnsFilters_flt( void *p, const int16_t index, const int16_t value );
-
-int16_t DecodeSWBTCX10TnsFilterCoeff_flt( Decoder_State *st, const int16_t index, int16_t *pValue );
-int16_t DecodeSWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const int16_t index, int16_t *pValue );
-
-int16_t DecodeWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const int16_t index, int16_t *pValue );
-
-int16_t DecodeTnsFilterOrderSWBTCX10_flt( Decoder_State *st, const int16_t index, int16_t *pValue );
-int16_t DecodeTnsFilterOrderSWBTCX20_flt( Decoder_State *st, const int16_t index, int16_t *pValue );
-
-int16_t EncodeTnsFilterOrderSWBTCX10_flt( const int16_t value, const int16_t index );
-
-int16_t GetTnsFilterOrderBitsSWBTCX10_flt( const int16_t value, const int16_t index );
-int16_t DecodeTnsFilterOrder_flt( Decoder_State *st, const int16_t index, int16_t *pValue );
-
-void ResetTnsData_flt(
-    STnsData *pTnsData );
-
-void ClearTnsFilterCoefficients_flt(
-    STnsFilter *pTnsFilter );
-
-
-int16_t DetectTnsFilt(
-    const STnsConfig *pTnsConfig, /* i  : TNS Configuration struct     */
-    const float pSpectrum[],      /* i  : MDCT spectrum                */
-    TRAN_DET_HANDLE hTranDet,     /* i  : transient detection handle   */
-    const int16_t isTCX10,        /* i  : TCX10 or TCX20?              */
-    const float ltp_gain,         /* i  : LTP gain                     */
-    STnsData *pTnsData,           /* o  : TNS data struct              */
-    float *predictionGain         /* o  : TNS prediction gain          */
-);
-
-void EncodeTnsData(
-    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */
-    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
-    int16_t *stream,              /* o  : internal data stream              */
-    int16_t *pnSize,              /* o  : number of written parameters      */
-    int16_t *pnBits               /* o  : number of written bits            */
-);
-
-int16_t DecodeTnsData_ivas(
-    STnsConfig const *pTnsConfig,
-    const int16_t *stream,
-    int16_t *pnSize,
-    STnsData *pTnsData );
-
-void WriteTnsData(
-    const STnsConfig *pTnsConfig, /* i  : TNS Configuration struct          */
-    const int16_t *stream,        /* i  : internal data stream              */
-    int16_t *pnSize,              /* o  : number of written parameters      */
-    BSTR_ENC_HANDLE hBstr,        /* o  : bitstream                         */
-    int16_t *pnBits               /* o  : number of written bits            */
-);
-
-void ReadTnsData_ivas(
-    STnsConfig const *pTnsConfig,
-    Decoder_State *st,
-    int16_t *pnBits,
-    int16_t *stream,
-    int16_t *pnSize );
-
-void cldfbAnalysis_ivas(
-    const float *timeIn,             /* i  : time buffer                 */
-    float **realBuffer,              /* o  : real value buffer           */
-    float **imagBuffer,              /* o  : imag value buffer           */
-    const int16_t samplesToProcess,  /* i  : number of input samples     */
-    HANDLE_CLDFB_FILTER_BANK h_cldfb /* i  : filterbank state            */
-);
-
-void cldfbAnalysis_ts_ivas(
-    const float *timeIn,                     /* i  : time buffer                 */
-    float realBuffer[CLDFB_NO_CHANNELS_MAX], /* o  : real value buffer           */
-    float imagBuffer[CLDFB_NO_CHANNELS_MAX], /* o  : imag value buffer           */
-    const int16_t samplesToProcess,          /* i  : samples to process          */
-    HANDLE_CLDFB_FILTER_BANK h_cldfb         /* i  : filterbank state            */
-);
-
-void cldfbSynthesis_ivas(
-    float **realBuffer,              /* i  : real values                 */
-    float **imagBuffer,              /* i  : imag values                 */
-    float *timeOut,                  /* o  : synthesized output          */
-    const int16_t samplesToProcess,  /* i  : number of samples           */
-    HANDLE_CLDFB_FILTER_BANK h_cldfb /* i  : filter bank state           */
-);
-
-void configureCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle        */
-    const int32_t sampling_rate       /* i  : sampling rate             */
-);
-
-
-void analysisCldfbEncoder_ivas(
-    Encoder_State *st, /* i/o: encoder state structure     */
-    const float *timeIn,
-    const int16_t samplesToProcess,
-    float realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
-    float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
-    float *ppBuf_Ener );
-
-void analysisCldfbEncoder_ivas_fx(
-    Encoder_State *st,       /* i/o: encoder state structure   */
-    Word32 *timeIn,          /*q11*/
-    Word16 timeInq,          /*q0*/
-    Word16 samplesToProcess, /*q0*/
-    Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
-    Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
-    Word16 realBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
-    Word16 imagBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
-    Word32 *ppBuf_Ener,
-    Word16 *enerBuffSum_exp,
-    CLDFB_SCALE_FACTOR *scale );
-
-ivas_error openCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle               */
-    CLDFB_TYPE type,                   /* i  : analysis or synthesis            */
-    const int32_t sampling_rate,       /* i  : sampling rate                    */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay) */
-);
-
-ivas_error openCldfb_ivas_enc(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle               */
-    CLDFB_TYPE type,                   /* i  : analysis or synthesis            */
-    const Word32 sampling_rate,        /* i  : sampling rate                    */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay) */
-);
-
-void resampleCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK hs, /* i/o: filter bank handle          */
-    const int32_t newSamplerate  /* i  : new samplerate to operate   */
-);
-
-ivas_error cldfb_save_memory_ivas(
-    HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle          */
-);
-
-void cldfb_restore_memory_ivas(
-    HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle          */
-);
-
-void cldfb_reset_memory_ivas(
-    HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle          */
-);
-
-void deleteCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle          */
-);
-
-void fft_cldfb(
-    float *data,       /* i/o: input/output vector         */
-    const int16_t size /* i  : size of fft operation       */
-);
-
-void BITS_ALLOC_init_config_acelp_IVAS(
-    const int32_t bit_rate,
-    const int16_t narrowBand,
-    const int16_t nb_subfr,
-    ACELP_config *acelp_cfg /* o  : configuration structure of ACELP    */
-);
-
-int16_t BITS_ALLOC_config_acelp_IVAS(
-    const int16_t bits_frame, /* i  : remaining bit budget for the frame  */
-    const int16_t coder_type, /* i  : acelp coder type                    */
-    ACELP_config *acelp_cfg,  /* i/o: configuration structure of ACELP    */
-    const int16_t narrowband, /* i  : narrowband flag                     */
-    const int16_t nb_subfr    /* i  : number of subframes                 */
-);
-
-ivas_error config_acelp1_IVAS(
-    const int16_t enc_dec,              /* i  : encoder/decoder flag                */
-    const int32_t total_brate,          /* i  : total bitrate                       */
-    const int32_t core_brate_inp,       /* i  : core bitrate                        */
-    const int16_t core,                 /* i  : core                                */
-    const int16_t extl,                 /* i  : extension layer                     */
-    const int32_t extl_brate,           /* i  : extension layer bitrate             */
-    const int16_t L_frame,              /* i  : frame length at internal Fs         */
-    const int16_t GSC_noisy_speech,     /* i  : GSC on SWB noisy speech flag        */
-    ACELP_config *acelp_cfg,            /* i  : ACELP bit-allocation                */
-    const int16_t signaling_bits,       /* i  : number of signaling bits            */
-    const int16_t coder_type,           /* i  : coder type                          */
-    const int16_t tc_subfr,             /* i  : TC subfr ID                         */
-    const int16_t tc_call,              /* i  : TC call number (0,1,2)              */
-    int16_t *nBits_es_Pred,             /* o  : number of bits for Es_pred Q        */
-    int16_t *unbits,                    /* o  : number of unused bits               */
-    const int16_t element_mode,         /* i  : element mode                        */
-    int16_t *uc_two_stage_flag,         /* o  : flag undicating two-stage UC        */
-    const int16_t tdm_lp_reuse_flag,    /* i  : LPC reuse flag (can be 1 only with secondary channel*/
-    const int16_t tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag*/
-    const int16_t idchan,               /* i  : channel id                          */
-    const int16_t active_cnt,           /* i  : Active frame counter                */
-    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag    */
-    const int16_t tdm_LRTD_flag,        /* i  : LRTD stereo mode flag               */
-    const int16_t GSC_IVAS_mode         /* i  : GSC IVAS mode                       */
-);
-
-/*! r: ACELP16k flag */
-
-
-void FEC_clas_estim(
-    const float *syn,
-    const float *pitch,                /* i  : pitch values for each subframe                 */
-    const int16_t L_frame,             /* i  : length of the frame                            */
-    const int16_t coder_type,          /* i  : coder type                                     */
-    const int16_t codec_mode,          /* i  : codec mode                                     */
-    float *mem_syn_clas_estim,         /* i/o: memory of the synthesis signal for frame class estimation */
-    int16_t *clas,                     /* i/o: frame classification                           */
-    float *lp_speech,                  /* i/o: long term active speech energy average         */
-    const int16_t Opt_AMR_WB,          /* i  : flag indicating AMR-WB IO mode                 */
-    int16_t *decision_hyst,            /* i/o: hysteresis of the music/speech decision        */
-    int16_t *locattack,                /* i/o: detection of attack (mainly to localized speech burst) */
-    int16_t *UV_cnt,                   /* i/o: number of consecutives frames classified as UV */
-    float *LT_UV_cnt,                  /* i/o: long term consecutives frames classified as UV */
-    float *Last_ener,                  /* i/o: last_energy frame                              */
-    int16_t *amr_io_class,             /* i/o: classification for AMR-WB IO mode              */
-    float *lt_diff_etot,               /* i/o: long-term total energy variation               */
-    float *class_para,                 /* o  : classification para. fmerit1                   */
-    const float LTP_Gain,              /* i  :                                                */
-    const int16_t narrowBand,          /* i  :                                                */
-    const SIGNAL_CLASSIFIER_MODE mode, /* i  :                                                */
-    const int16_t bfi,                 /* i  :                                                */
-    const float preemph_fac,           /* i  :                                                */
-    const int16_t tcxonly,             /* i  :                                                */
-    const int32_t last_core_brate,     /* i  : last core bitrate                              */
-    const int16_t FEC_mode             /* i  : ACELP FEC mode                                 */
-);
-
-
-void SetTCXModeInfo(
-    Encoder_State *st,        /* i/o: encoder state structure                 */
-    TRAN_DET_HANDLE hTranDet, /* i/o: transient detection handle              */
-    int16_t *tcxModeOverlap   /* o  : window overlap of current frame         */
-);
-
-void TCX_MDCT_flt(
-    const float *x,
-    float *y,
-    const int16_t l,
-    const int16_t m,
-    const int16_t r,
-    const int16_t element_mode );
-
-void TCX_MDST_flt(
-    const float *x,
-    float *y,
-    const int16_t l,
-    const int16_t m,
-    const int16_t r,
-    const int16_t element_mode );
-
-void TCX_MDCT_Inverse_flt(
-    const float *x,
-    float *y,
-    const int16_t l,
-    const int16_t m,
-    const int16_t r,
-    const int16_t element_mode );
-
-void TCX_MDST_Inverse_flt(
-    const float *x,
-    float *y,
-    const int16_t l,
-    const int16_t m,
-    const int16_t r,
-    const int16_t element_mode );
-
-void TCX_MDXT_Inverse_flt(
-    const float *x,
-    float *y,
-    const int16_t l,
-    const int16_t m,
-    const int16_t r,
-    const uint16_t kernel_type );
-
-void post_decoder_flt(
-    Decoder_State *st,
-    float synth_buf[],
-    const float pit_gain[],
-    const int16_t pitch[],
-    float signal_out[],
-    float bpf_noise_buf[] );
-void cldfb_synth_set_bandsToZero_flt(
-    Decoder_State *st, /* i/o: decoder state structure             */
-    float **rAnalysis,
-    float **iAnalysis,
-    const int16_t nTimeSlots );
-
-void longadd(
-    uint16_t a[],       /* i/o: vector of the length lena */
-    const uint16_t b[], /* i/o: vector of the length lenb */
-    const int16_t lena, /* i/o: length of vector a[]      */
-    const int16_t lenb  /* i/o: length of vector b[]      */
-);
-
-void longshiftright(
-    uint16_t a[],      /* i  : vector of the length lena                */
-    const int16_t b,   /* i  : number of bit positions to shift right   */
-    uint16_t d[],      /* o  : vector of the length lend                */
-    int16_t lena,      /* i  : length of vector a[]                     */
-    const int16_t lend /* i  : length of vector d[]                     */
-);
-
-void longshiftleft(
-    const uint16_t a[], /* i  : vector of the length len              */
-    const int16_t b,    /* i  : number of bit positions to shift left */
-    uint16_t d[],       /* o  : vector of the length len              */
-    const int16_t len   /* i  : length of vector a[] and d[]          */
-);
-
-void open_decoder_LPD(
-    Decoder_State *st,               /* i/o: decoder state structure                */
-    const int32_t total_brate,       /* i  : total bitrate                          */
-    const int32_t last_total_brate,  /* i  : last total bitrate                     */
-    const int16_t bwidth,            /* i  : audio bandwidth                        */
-    const int16_t MCT_flag,          /* i  : hMCT handle allocated (1) or not (0)   */
-    const int16_t last_element_mode, /* i  : last element mode                      */
-    const int16_t is_init            /* i  : indicate call during initialization    */
-);
-
-void acelp_plc_mdct_transition(
-    Decoder_State *st /* i/o: Decoder state */
-);
-
-void tcxltp_dec_init(
-    TCX_LTP_DEC_HANDLE hTcxLtpDec,
-    const int16_t ini_frame,
-    const int16_t last_codec_mode,
-    const int16_t element_mode,
-    const int16_t pit_max,
-    const int32_t sr_core );
-
-void reset_tcx_overl_buf(
-    TCX_DEC_HANDLE hTcxDec /* i/o: TCX decoder handle          */
-);
-
-void update_decoder_LPD_cng_flt(
-    Decoder_State *st, /* i/o: decoder state structure     */
-    float *timeDomainBuffer,
-    float *A,
-    float *bpf_noise_buf );
-
-void reconfig_decoder_LPD_ivas(
-    Decoder_State *st,         /* i/o: decoder state structure  */
-    const int16_t bits_frame,  /* i  : bit budget               */
-    const int16_t bwidth,      /* i  : audio bandwidth          */
-    const int32_t total_brate, /* i  : total bitrate            */
-    const int16_t L_frame_old  /* i  : frame length             */
-);
-
-void mode_switch_decoder_LPD(
-    Decoder_State *st,              /* i/o: decoder state structure             */
-    const int16_t bwidth,           /* i  : audio bandwidth                     */
-    const int32_t total_brate,      /* i  : total bitrate                       */
-    const int32_t last_total_brate, /* i  : last frame total bitrate            */
-    const int16_t frame_size_index, /* i  : index determining the frame size    */
-    const int16_t MCT_flag,         /* i  : hMCT handle allocated (1) or not (0)*/
-    const int16_t last_element_mode /* i  : last element mode                   */
-);
-
-void dec_acelp_tcx_frame(
-    Decoder_State *st,               /* i/o: decoder state structure             */
-    int16_t *concealWholeFrame,      /* i/o: concealment flag                    */
-    float *output,                   /* o  : synthesis                           */
-    float *bpf_noise_buf,            /* i/o: BPF noise buffer                    */
-    float *pcmbufFB,                 /* o  : synthesis @output_FS                */
-    float bwe_exc_extended[],        /* i/o: bandwidth extended excitation       */
-    float *voice_factors,            /* o  : voicing factors                     */
-    float pitch_buf[],               /* o  : floating pitch for each subframe    */
-    STEREO_CNG_DEC_HANDLE hStereoCng /* i  : stereo CNG handle                   */
-);
-
-void decoder_LPD(
-    Decoder_State *st,     /* i/o: decoder memory state pointer        */
-    float signal_out[],    /* o  : signal with LPD delay (7 subfrs)    */
-    float signal_outFB[],  /* o  : synthesis @output_FS                */
-    int16_t *total_nbbits, /* i/o: number of bits / decoded bits       */
-    float *bpf_noise_buf,  /* i/o: BPF noise buffer                    */
-    int16_t bfi,           /* i  : BFI flag                            */
-    int16_t *bitsRead,     /* o  : number of read bits                 */
-    int16_t param[],       /* o  : buffer of parameters                */
-    float *pitch_buf,      /* i/o: floating pitch values for each subfr*/
-    float *voice_factors,  /* o  : voicing factors                     */
-    float *ptr_bwe_exc     /* o  : excitation for SWB TBE              */
-);
-
-int16_t tcxGetNoiseFillingTilt_flt(
-    const float A[],
-    const int16_t L_frame,
-    const int16_t mode,
-    float *noiseTiltFactor );
-
-void tcxFormantEnhancement_flt(
-    float xn_buf[],
-    const float *gainlpc,
-    float spectrum[],
-    const int16_t L_frame );
-
-void tcxInvertWindowGrouping_flt(
-    TCX_CONFIG_HANDLE hTcxCfg,
-    float xn_buf[],
-    float spectrum[],
-    const int16_t L_frame,
-    const int8_t fUseTns,
-    const int16_t last_core,
-    const int16_t index,
-    const int16_t frame_cnt,
-    const int16_t bfi );
-
-void tcx5SpectrumInterleaving(
-    const int16_t tcx5Size,
-    float *spectrum );
-
-void tcx5SpectrumDeinterleaving(
-    const int16_t tcx5Size,
-    float *spectrum );
-
-void tcx5TnsGrouping(
-    const int16_t L_frame,
-    const int16_t L_spec,
-    float *spectrum );
-
-void tcx5TnsUngrouping(
-    const int16_t L_frame,
-    const int16_t L_spec,
-    float *spectrum,
-    const int16_t enc_dec );
-
-void lerp_flt(
-    const float *f,
-    float *f_out,
-    const int16_t bufferNewSize,
-    const int16_t bufferOldSize );
-
-void encoderSideLossSimulation(
-    Encoder_State *st,
-    PLC_ENC_EVS_HANDLE hPlc_Ext,
-    float *isf_q,
-    const float stab_fac,
-    const int16_t calcOnlyISF,
-    const int16_t L_frame );
-
-void enc_prm_side_Info(
-    PLC_ENC_EVS_HANDLE hPlc_Ext,
-    Encoder_State *st );
-
-void GplcTcxEncSetup(
-    const int16_t tcxltp_pitch_int,
-    PLC_ENC_EVS_HANDLE hPlc_Ext );
-
-int16_t encSideSpecPowDiffuseDetector(
-    float *isf_ref,
-    float *isf_con,
-    const int32_t sr_core,
-    float *prev_isf4_mean,
-    const int16_t sw,
-    const int16_t coder_type );
-
-void updateSpecPowDiffuseIdx(
-    const float gain_pitch_buf[], /* i  : gain pitch values   */
-    const float gain_code_buf[],  /* i  : gain pitch values   */
-    int16_t glr_idx[2],           /* o  : */
-    float mean_gc[2]              /* o  : */
-);
-
-void getLookAheadResSig_flt(
-    float *speechLookAhead,
-    const float *A,
-    float *res,
-    const int16_t L_frame,
-    const int16_t L_subfr,
-    const int16_t m,
-    const int16_t numSubFrame );
-
-void updatelsfForConcealment_flt(
-    PLC_ENC_EVS_HANDLE decState,
-    float *lsf );
-
-void getConcealedLP_flt(
-    PLC_ENC_EVS_HANDLE memDecState,
-    float *AqCon,
-    const float xsfBase[],
-    const int32_t sr_core,
-    const int16_t last_good,
-    const int16_t L_frame );
-
-void RecLpcSpecPowDiffuseLc_flt(
-    float *ispq,
-    float *isp_old,
-    float *isfq,
-    Decoder_State *st,
-    const int16_t reset_q );
-
-void modify_lsf_flt(
-    float *lsf,
-    const int16_t n,
-    const int32_t sr_core,
-    const int16_t reset_q );
-
-void init_PLC_enc(
-    PLC_ENC_EVS_HANDLE hPlcExt,
-    const int32_t sr_core );
-
-void gPLC_encInfo(
-    PLC_ENC_EVS_HANDLE hPlcExt,
-    const int32_t total_brate,
-    const int16_t bwidth,
-    const int16_t last_clas,
-    const int16_t coder_type );
-
-void resetTecDec(
-    TEC_DEC_HANDLE hTecDec );
-
-void calcGainTemp_TBE(
-    float **pCldfbRealSrc,
-    float **pCldfbImagSrc,
-    float *loBuffer,
-    const int16_t startPos,   /*!<  Start position of the current envelope. */
-    const int16_t stopPos,    /*!<  Stop position of the current envelope. */
-    const int16_t lowSubband, /* lowSubband */
-    float *pGainTemp,
-    const int16_t code );
-
-void procTecTfa_TBE(
-    float *hb_synth,
-    float *gain,
-    const int16_t flat_flag,
-    const int16_t last_core,
-    const int16_t L_subfr,
-    const int16_t code );
-
-void resetTecEnc(
-    TEC_ENC_HANDLE hTecEnc,
-    const int16_t flag );
-
-void calcHiEnvLoBuff(
-    const int16_t noCols,
-    const int16_t *pFreqBandTable, /* i  : freqbandTable            */
-    const int16_t nSfb,            /* i  : Number of scalefactors   */
-    float **pYBuf,
-    float *loBuf,
-    float *hiTempEnv );
-
-void calcLoEnvCheckCorrHiLo(
-    const int16_t noCols,
-    const int16_t *pFreqBandTable, /* i  : freqbandTable           */
-    float *loBuf,
-    float *loTempEnv,
-    float *loTempEnv_ns,
-    float *hiTempEnv,
-    int16_t *corr_flag /* o  : 0 for original, 1 for TEC */
-);
-
-
-void tecEnc_TBE(
-    int16_t *corrFlag,
-    const float *voicing,
-    const int16_t coder_type );
-
-void set_TEC_TFA_code(
-    const int16_t corrFlag,
-    int16_t *tec_flag,
-    int16_t *tfa_flag );
-
-float Damping_fact_flt(
-    const int16_t coder_type, /* i  : ACELP core coder type                            */
-    const int16_t nbLostCmpt, /* i  : compt for number of consecutive lost frame       */
-    int16_t last_good,        /* i  : class of last good received frame                */
-    float stab_fac,           /* i  : LSF stability factor                             */
-    float *lp_gainp,          /* i/o: low passed pitch gain used for concealment       */
-    const int16_t core        /* i  : current core: ACELP = 0, TCX20 = 1, TCX10 = 2    */
-);
-
-float getLevelSynDeemph(
-    const float h1Init[],    /* i  : input value or vector to be processed */
-    const float A[],         /* i  : LPC coefficients                      */
-    const int16_t lenLpcExc, /* i  : length of the LPC excitation buffer   */
-    const float preemph_fac, /* i  : preemphasis factor                    */
-    const int16_t numLoops   /* i  : number of loops                       */
-);
-
-void genPlcFiltBWAdap(
-    const int32_t sr_core, /* i  : core sampling rate                                         */
-    float *lpFiltAdapt,    /* o  : filter coefficients for filtering codebooks in case of flc */
-    const int16_t type,    /* i  : type of filter, either 0 : lowpass or 1 : highpass         */
-    const float alpha      /* i  : fade out factor [0 1) used decrease filter tilt            */
-);
-
-void highPassFiltering(
-    const int16_t last_good, /* i  : last classification type                           */
-    const int16_t L_buffer,  /* i  : buffer length                                      */
-    float exc2[],            /* i/o: unvoiced excitation before the high pass filtering */
-    const float hp_filt[],   /* i  : high pass filter coefficients                      */
-    const int16_t l_fir_fer  /* i  : high pass filter length                            */
-);
-
-int16_t GetPLCModeDecision(
-    Decoder_State *st /* i/o: decoder memory state pointer                        */
-);
-
-void addBassPostFilter(
-    const float *harm_timeIn,
-    const int16_t samplesToProcess,
-    float **rAnalysis,
-    float **iAnalysis,
-    HANDLE_CLDFB_FILTER_BANK cldfb );
-
-ivas_error TonalMDCTConceal_Init_ivas(
-    TonalMDCTConcealPtr hTonalMDCTConc,
-    const uint16_t samplesPerBlock,
-    const uint16_t nSamplesCore,
-    const uint16_t nScaleFactors,
-    TCX_CONFIG_HANDLE hTcxCfg );
-
-void TonalMDCTConceal_SaveFreqSignal_ivas(
-    TonalMDCTConcealPtr hTonalMDCTConc,
-    const float *mdctSpectrum,
-    const uint16_t numSamples,
-    const uint16_t nNewSamplesCore,
-    const float *scaleFactors,
-    const int16_t infoIGFStartLine );
-
-void TonalMDCTConceal_UpdateState_ivas(
-    TonalMDCTConcealPtr hTonalMDCTConc,
-    const int16_t numSamples,
-    const float pitchLag,
-    const int16_t badBlock,
-    const int16_t tonalConcealmentActive );
-
-void TonalMDCTConceal_SaveTimeSignal_ivas(
-    TonalMDCTConcealPtr hTonalMDCTConc,
-    float *timeSignal,
-    const int16_t numSamples );
-
-void TonalMDCTConceal_Detect_ivas(
-    const TonalMDCTConcealPtr hTonalMDCTConc,          /*IN */
-    const float pitchLag,                              /*IN */
-    int16_t *umIndices,                                /*OUT*/
-    const PsychoacousticParameters *psychParamsCurrent /*IN*/
-);
-
-void TonalMDCTConceal_Apply_ivas(
-    TonalMDCTConcealPtr hTonalMDCTConc,                /*IN */
-    float *mdctSpectrum,                               /*OUT*/
-    const PsychoacousticParameters *psychParamsCurrent /*IN*/
-);
-
-void TonalMDCTConceal_InsertNoise_ivas(
-    const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
-    float *mdctSpectrum,                      /*OUT*/
-    const int16_t tonalConcealmentActive,
-    int16_t *pSeed, /*IN/OUT*/
-    const float tiltCompFactor,
-    const float crossfadeGain,
-    const float concealment_noise[L_FRAME48k],
-    const float cngLevelBackgroundTrace_bfi,
-    const int16_t crossOverFreq );
-
-void DetectTonalComponents_flt(
-    uint16_t indexOfTonalPeak[],
-    uint16_t lowerIndex[],
-    uint16_t upperIndex[],
-    uint16_t *pNumIndexes,
-    const float lastPitchLag,
-    const float currentPitchLag,
-    const float lastMDCTSpectrum[],
-    const float scaleFactors[],
-    const float secondLastPowerSpectrum[],
-    const uint16_t nSamples,
-    const uint16_t nSamplesCore,
-    float floorPowerSpectrum,
-    const PsychoacousticParameters *psychParamsCurrent );
-
-void RefineTonalComponents_flt(
-    uint16_t indexOfTonalPeak[],
-    uint16_t lowerIndex[],
-    uint16_t upperIndex[],
-    float phaseDiff[],
-    float phases[],
-    uint16_t *pNumIndexes,
-    const float lastPitchLag,
-    const float currentPitchLag,
-    const float lastMDCTSpectrum[],
-    const float scaleFactors[],
-    const float secondLastPowerSpectrum[],
-    const uint16_t nSamples,
-    const uint16_t nSamplesCore,
-    float floorPowerSpectrum,
-    const PsychoacousticParameters *psychParamsCurrent );
-
-ivas_error PsychoacousticParameters_Init(
-    const int32_t sr_core,  /* i  : sampling rate of core-coder                                     */
-    const int16_t nBins,    /* i  : Number of bins (spectral lines)                                 */
-    const int8_t nBands,    /* i  : Number of spectrum subbands                                     */
-    const int16_t isTCX20,  /* i  : Flag indicating if the subband division is for TCX20 or TCX10   */
-    const int16_t isWarped, /* i  : Flag indicating if the scale is linear or warped                */
-    PsychoacousticParameters *pPsychParams );
-
-void concealment_init(
-    const int16_t L_frameTCX,
-    T_PLCInfo_HANDLE hPlcInfo );
-
-void concealment_decode(
-    const int16_t core,
-    float *invkoef,
-    T_PLCInfo_HANDLE hPlcInfo );
-
-void concealment_update(
-    const int16_t bfi,
-    const int16_t core,
-    const int16_t harmonic,
-    float *invkoef,
-    T_PLCInfo_HANDLE hPlcInfo );
-
-void concealment_update2(
-    const float *outx_new,
-    T_PLCInfo_HANDLE hPlcInfo,
-    const int16_t L_frameTCX );
-
-void concealment_signal_tuning(
-    Decoder_State *st,
-    const int16_t bfi,
-    float *outx_new,
-    const int16_t past_core_mode );
-
-void waveform_adj2(
-    T_PLCInfo_HANDLE hPlcInfo,
-    float *overlapbuf,
-    float *outx_new,
-    const int16_t delay,
-    const int16_t bfi_cnt,
-    const int16_t bfi );
-
-float SFM_Cal(
-    const float fcoef[],
-    const int16_t n );
-
-void set_state_ivas(
-    int16_t *state,
-    const int16_t num,
-    const int16_t N );
-
-int16_t RFFTN(
-    float *afftData,
-    const float *trigPtr,
-    const int16_t len,
-    const int16_t isign );
-
-void DoFFT(
-    float *re2,
-    float *im2,
-    const int16_t length );
-
-/*! r: flag indicating a valid bitrate */
-int16_t is_EVS_bitrate(
-    const int32_t ivas_total_brate, /* i  : EVS total bitrate  */
-    int16_t *Opt_AMR_WB             /* i  : AMR-WB IO flag     */
-);
-
-int16_t getTcxonly_ivas(
-    const int16_t element_mode, /* i  : IVAS element mode                   */
-    const int32_t total_brate,  /* i  : total bitrate                       */
-    const int16_t MCT_flag,     /* i  : hMCT handle allocated (1) or not (0)*/
-    const int16_t is_ism_format /* i  : flag indicating ISM format          */
-);
-
-int16_t getTnsAllowed(
-    const int32_t total_brate, /* i  : total bitrate               */
-    const int16_t igf,         /* i  : flag indicating IGF activity*/
-    const int16_t element_mode /* i  : IVAS element mode           */
-);
-
-int16_t getCtxHm(
-    const int16_t element_mode, /* i  : IVAS element mode           */
-    const int32_t total_brate,  /* i  : total bitrate               */
-    const int16_t rf_flag       /* i  : flag to signal the RF mode  */
-);
-
-int16_t getResq(
-    const int32_t total_brate /* i  : total bitrate   */
-);
-
-int16_t getMdctWindowLength(
-    const int16_t fscale );
-
-int16_t sr2fscale(
-    const int32_t sr_core /* i  : internal sampling rate        */
-);
-
-int32_t getCoreSamplerateMode2_flt(
-    const int16_t element_mode,     /* i  : IVAS element mode              */
-    const int32_t total_brate,      /* i  : total bitrate                  */
-    const int16_t bwidth,           /* i  : audio bandwidth                */
-    const int16_t flag_ACELP16k,    /* i  : ACELP@16kHz flag               */
-    const int16_t rf_mode,          /* i  : flag to signal the RF mode     */
-    const IVAS_FORMAT is_ism_format /* i  : flag indicating ISM format     */
-);
-
-float getTcxBandwidth_flt(
-    const int16_t bwidth /* i  : audio bandwidth        */
-);
-
-
-int16_t getCnaPresent(
-    const int16_t element_mode,  /* i  : element mode             */
-    const int32_t element_brate, /* i  : element bitrate          */
-    const int32_t total_brate,   /* i  : total bitrate            */
-    const int16_t bwidth         /* i  : audio bandwidth          */
-);
-
-int16_t getTcxLtp(
-    const int32_t sr_core /* i  : internal sampling rate                              */
-);
-
-int16_t initPitchLagParameters(
-    const int32_t sr_core, /* i  : internal sampling rate                              */
-    int16_t *pit_min,
-    int16_t *pit_fr1,
-    int16_t *pit_fr1b,
-    int16_t *pit_fr2,
-    int16_t *pit_max );
-
-void attenuateNbSpectrum(
-    const int16_t L_frame,
-    float *spectrum );
-
-void SetModeIndex(
-    Encoder_State *st,               /* i  : Encoder state                          */
-    const int32_t last_total_brate,  /* i  : last total bitrate                     */
-    const int16_t last_element_mode, /* i  : last IVAS element mode                 */
-    const int16_t MCT_flag           /* i  : hMCT handle allocated (1) or not (0)   */
-);
-
-int16_t getNumTcxCodedLines(
-    const int16_t bwidth /* i  : audio bandwidth        */
-);
-
-int16_t getTcxLpcShapedAri(
-    const int32_t total_brate, /* i  : total bitrate                */
-    const int16_t rf_mode,     /* i  : flag to signal the RF mode   */
-    const int16_t element_mode /* i  : IVAS element mode            */
-);
-
-void IGFEncApplyMono(
-    Encoder_State *st,              /* i  : Encoder state                                          */
-    const int16_t igfGridIdx,       /* i  : IGF grid index                                         */
-    float *pMDCTSpectrum,           /* i/o: MDCT spectrum                                          */
-    float *pPowerSpectrum,          /* i/o: MDCT^2 + MDST^2 spectrum, or estimate                  */
-    const int16_t isTCX20,          /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5  */
-    const int16_t isTNSActive,      /* i  : flag indicating if the TNS is active                   */
-    const int16_t sp_aud_decision0, /* i  : first stage switching decision                         */
-    const int16_t vad_hover_flag    /* i  : VAD hangover flag                                      */
-);
-
-void IGFEncApplyStereo(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,             /* i/o: MDCT stereo encoder structure               */
-    int16_t ms_mask[2][MAX_SFB],                         /* i  : bandwise MS mask                            */
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS], /* i  : instance handle of IGF Encoder              */
-    const int16_t igfGridIdx,                            /* i  : IGF grid index                              */
-    Encoder_State *sts[CPE_CHANNELS],                    /* i  : Encoder state                               */
-    float *pPowerSpectrum[CPE_CHANNELS],                 /* i/o: MDCT^2 + MDST^2 spectrum, or estimate       */
-    float *pPowerSpectrumMsInv[CPE_CHANNELS][NB_DIV],    /* i/o: inverse power spectrum                      */
-    float *inv_spectrum[CPE_CHANNELS][NB_DIV],           /* i  : inverse spectrum                            */
-    const int16_t frameno,                               /* i  : flag indicating index of current subframe   */
-    const int16_t sp_aud_decision0,                      /* i  : sp_aud_decision0                            */
-    const int32_t element_brate,                         /* i  : element bitrate                             */
-    const int16_t mct_on                                 /* i  : flag mct block (1) or stereo (0)              */
-);
-
-
-void IGFEncResetTCX10BitCounter(
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */
-);
-
-ivas_error IGF_Reconfig(
-    IGF_ENC_INSTANCE_HANDLE *hIGFEnc, /* i/o: instance handle of IGF Encoder  */
-    const int16_t igf,                /* i  : IGF on/off                      */
-    const int16_t reset,              /* i  : reset flag                      */
-    const int32_t brate,              /* i  : bitrate for configuration       */
-    const int16_t bwidth,             /* i  : signal bandwidth                */
-    const int16_t element_mode,       /* i  : IVAS element mode               */
-    const int16_t rf_mode             /* i  : flag to signal the RF mode      */
-);
-
-void IGFEncSetMode(
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder */
-    const int32_t total_brate,             /* i  : encoder total bitrate          */
-    const int16_t bwidth,                  /* i  : encoder audio bandwidth        */
-    const int16_t element_mode,            /* i  : IVAS element mode              */
-    const int16_t rf_mode                  /* i  : flag to signal the RF mode     */
-);
-
-/*! r: number of bits written per frame */
-int16_t IGFEncWriteBitstream(
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder                                              */
-    BSTR_ENC_HANDLE hBstr,                 /* i/o: encoder bitstream handle                                                    */
-    int16_t *pBitOffset,                   /* i  : ptr to bitOffset counter                                                    */
-    const int16_t igfGridIdx,              /* i  : igf grid index see declaration of IGF_GRID_IDX for details                  */
-    const int16_t isIndepFlag              /* i  : if 1 frame is independent, 0 = frame is coded with data from previous frame */
-);
-
-/*! r: total number of bits written */
-int16_t IGFEncWriteConcatenatedBitstream(
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder */
-    BSTR_ENC_HANDLE hBstr                  /* i/o: encoder bitstream handle       */
-);
-
-void IGFDecApplyMono_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i  : instance handle of IGF Decoder                       */
-    float *spectrum,                       /* i/o: MDCT spectrum                                        */
-    const int16_t igfGridIdx,              /* i  : in case of CELP->TCX switching, use 1.25 framelength */
-    const int16_t bfi,                     /* i  : frame loss == 1, frame good == 0                     */
-    const int16_t element_mode             /* i  : IVAS element mode                                    */
-);
-
-void IGFDecCopyLPCFlatSpectrum_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Decoder     */
-    const float *pSpectrumFlat,            /* i  : LPC flattend spectrum from TCX dec */
-    const int16_t igfGridIdx               /* i  : IGF grid index                     */
-);
-
-void IGFDecReadData_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Deccoder                      */
-    Decoder_State *st,                     /* i  : decoder state                                        */
-    const int16_t igfGridIdx,              /* i  : in case of CELP->TCX switching, use 1.25 framelength */
-    const int16_t isIndepFrame             /* i  : if 1: arith dec force reset, if 0: no reset          */
-);
-
-/*! r: return igfAllZero flag indicating if no envelope is transmitted */
-int16_t IGFDecReadLevel_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Deccoder                                  */
-    Decoder_State *st,                     /* i  : decoder state                                                    */
-    const int16_t igfGridIdx,              /* i  : in case of CELP->TCX switching, use 1.25 framelength             */
-    const int16_t isIndepFrame             /* i  : if 1: arith dec force reset, if 0: no reset                      */
-);
-
-void IGFDecRestoreTCX10SubFrameData_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* o  : instance handle of IGF Decoder      */
-    const int16_t subFrameIdx              /* i  : index of subframe                   */
-);
-
-void init_igf_dec_flt(
-    IGF_DEC_INSTANCE_HANDLE hIGFDec /* i/o: IGF decoder handle                  */
-);
-
-void IGFDecSetMode_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* o  : instance handle of IGF Decoder      */
-    const int32_t total_brate,             /* i  : bitrate                             */
-    const int16_t bwidth,                  /* i  : audio bandwidth                     */
-    const int16_t element_mode,            /* i  : IVAS element mode                   */
-    const int16_t defaultStartLine,        /* i  : default start subband index         */
-    const int16_t defaultStopLine,         /* i  : default stop subband index          */
-    const int16_t rf_mode                  /* i  : flag to signal the RF mode          */
-);
-
-void IGFDecStoreTCX10SubFrameData_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Decoder      */
-    const int16_t subFrameIdx              /* i  : index of subframe                   */
-);
-
-void IGFDecUpdateInfo_flt(
-    const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Decoder      */
-    const int16_t subFrameIdx,             /* i  : subframe index                      */
-    const int16_t igfGridIdx               /* i  : IGF grid index                      */
-);
-
-/*! r: error value: 0 -> error, 1 -> ok */
-int16_t IGFCommonFuncsIGFConfiguration_flt(
-    const int32_t total_brate,  /* i  : bitrate in bs e.g. 9600 for 9.6kbs  */
-    const int16_t bwidth,       /* i  : audio bandwidth                     */
-    const int16_t element_mode, /* i  : IVAS element mode                   */
-    H_IGF_INFO hIGFInfo,        /* o  : IGF info handle                     */
-    const int16_t rf_mode       /* i  : flag to signal the RF mode          */
-);
-
-/*! r: error value: 0 -> error, 1 -> ok */
-int16_t IGFCommonFuncsIGFGetCFTables_flt(
-    const int32_t total_brate,   /* i  : bitrate in bs e.g. 9600 for 9.6kbs  */
-    const int16_t bwidth,        /* i  : audio bandwidth                     */
-    const int16_t element_mode,  /* i  : element mode                        */
-    const int16_t rf_mode,       /* i  : flag to signal the RF mode          */
-    const uint16_t **cf_se00,    /* i  : CF table for t == 0 and f == 0      */
-    const uint16_t **cf_se01,    /* i  : CF table for t == 0 and f == 1      */
-    int16_t *cf_off_se01,        /* o  : offset for CF table above           */
-    const uint16_t **cf_se02,    /* i  : CF tables for t == 0 and f >= 2     */
-    const int16_t **cf_off_se02, /* o  : offsets for CF tables above         */
-    const uint16_t **cf_se10,    /* i  : CF table for t == 1 and f == 0      */
-    int16_t *cf_off_se10,        /* o  : offset for CF table above           */
-    const uint16_t **cf_se11,    /* i  : CF tables for t == 1 and f >= 1     */
-    const int16_t **cf_off_se11  /* o  : offsets for CF tables above         */
-);
-
-/*! r: multiplication factor */
-int16_t IGF_ApplyTransFac_flt(
-    const int16_t val,   /* i  : input value for multiplication, Q15                                          */
-    const float transFac /* i  : multiplicator for variable val, Q14: 1.25f=0x5000, 1.0f=0x4000, 0.5f=0x2000  */
-);
-
-/*! r: return bitrate index */
-int16_t IGF_MapBitRateToIndex_flt(
-    const int32_t brate,        /* i  :  bitrate                    */
-    const int16_t bwidth,       /* i  :  audio bandwidth            */
-    const int16_t element_mode, /* i  :  element mode               */
-    const int16_t rf_mode       /* i  :  flag to signal the RF mode */
-);
-
-
-void IGFSCFDecoderOpen_ivas(
-    IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i  : handle to public data       */
-    H_IGF_INFO hIgfInfo,                   /* i  : IGF info handle             */
-    const int32_t total_brate,
-    const int16_t bwidth,
-    const int16_t element_mode,
-    const int16_t rf_mode );
-
-void IGFSCFDecoderReset_ivas(
-    IGFSCFDEC_INSTANCE_HANDLE hPublicData /* i  : handle to public data or NULL in case there was no instance created     */
-);
-
-void IGFSCFDecoderDecode_ivas(
-    IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i  : handle to public data or NULL in case there was no instance created     */
-    Decoder_State *st,                     /* i/o: pointer to decoder state                                                */
-    int16_t *sfe,                          /* o  : ptr to an array which will contain the decoded quantized coefficients   */
-    const int16_t igfGridIdx,              /* i  : igf grid index see declaration of IGF_GRID_IDX for details              */
-    const int16_t indepFlag                /* i  : if  1 on input the decoder will be forced to reset,
-                                                   if  0 on input the decoder will be forced to encode without a reset     */
-);
-
-/*! r: offset value */
-int16_t tbe_celp_exc_offset_flt(
-    const int16_t T0,     /* i  : Integer pitch */
-    const int16_t T0_frac /* i  : Fractional part of the pitch */
-);
-
-void blend_subfr2_flt(
-    float *sigIn1, /* i  : input signal for fade-out */
-    float *sigIn2, /* i  : input signal for fade-in  */
-    float *sigOut  /* o  : output signal             */
-);
-
-void init_tcx_window_cfg(
-    TCX_CONFIG_HANDLE hTcxCfg,          /* i  : TCX Config handle        */
-    const int32_t sr_core,              /* i  : SR core                  */
-    const int32_t input_Fs,             /* i  : input/output SR          */
-    const int16_t L_frame,              /* i  : L_frame at sr_core       */
-    const int16_t L_frameTCX,           /* i  : L_frame at i/o SR        */
-    const int16_t encoderLookahead_enc, /* i  : encoder LA at sr_core    */
-    const int16_t encoderLookahead_FB,  /* i  : encoder LA at i/o SR     */
-    const int16_t mdctWindowLength,     /* i  : window length at sr_core */
-    const int16_t mdctWindowLengthFB,   /* i  : window length at i/o SR  */
-    const int16_t element_mode          /* i  : mode of CPE/SCE          */
-);
-
-void init_tcx_cfg(
-    TCX_CONFIG_HANDLE hTcxCfg,
-    const int32_t total_brate,
-    const int32_t sr_core,
-    const int32_t input_Fs,
-    const int16_t L_frame,
-    const int16_t bwidth,
-    const int16_t L_frameTCX,
-    const int16_t fscale,
-    const int16_t encoderLookahead_enc,
-    const int16_t encoderLookahead_FB,
-    const float preemph_fac,
-    const int16_t tcxonly,
-    const int16_t rf_mode,
-    const int16_t igf,
-    const int16_t infoIGFStopFreq,
-    const int16_t element_mode,
-    const int16_t ini_frame,
-    const int16_t MCT_flag /* i  : hMCT handle allocated (1) or not (0)  */
-);
-
-#endif
diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h
index 0080f41257f0537b1303b9d87237a88abd121e76..498be31379072cb95148cab1c0eae6187025a4bc 100644
--- a/lib_com/prot_fx.h
+++ b/lib_com/prot_fx.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -49,14 +49,56 @@
 #include "ivas_cnst.h"
 #include "stat_enc.h"
 #include "stat_dec.h"
+#include "stat_com.h"
 #include "ivas_stat_enc.h"
 #include "ivas_stat_dec.h"
+#include "ivas_stat_com.h"
 #include "ivas_error.h"
 #include "ivas_error_utils.h"
 #include "complex_basop.h"
 #define TCX_IMDCT_SCALE    15
 #define TCX_IMDCT_HEADROOM 1
 
+
+/*----------------------------------------------------------------------------------*
+ * Prototypes of global macros
+ *----------------------------------------------------------------------------------*/
+
+#ifndef min
+#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
+#endif
+
+#ifndef max
+#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
+#endif
+
+#ifndef ABSVAL
+#define ABSVAL( a ) ( ( a ) >= 0 ? ( a ) : ( -( a ) ) )
+#endif
+
+#ifndef SQR
+#define SQR( a ) ( ( a ) * ( a ) )
+#endif
+
+#ifndef SWAP
+#define SWAP( a, b )   \
+    {                  \
+        tempr = ( a ); \
+        ( a ) = ( b ); \
+        ( b ) = tempr; \
+    }
+#endif
+
+#ifndef swap
+#define swap( x, y, type ) \
+    {                      \
+        type u__p;         \
+        u__p = x;          \
+        x = y;             \
+        y = u__p;          \
+    }
+#endif
+
 /*================================================================================*/
 /* conversion functions: */
 /*================================================================================*/
@@ -218,6 +260,11 @@ Word32 sum2_fx(                    /* o  : sum of all squared vector elements
                 const Word16 lvec  /* i  : length of i   vector                */
 );
 
+Word64 sum2_fx_no_sat(                    /* o  : sum of all squared vector elements    Q(2x)*/
+                       const Word16 *vec, /* i  : i   vector                          Qx*/
+                       const Word16 lvec  /* i  : length of i   vector                */
+);
+
 Word16 sign_fx(
     const Word32 x /* i  : input value of x                                */
 );
@@ -429,6 +476,16 @@ void hq_generic_decoding_fx(
     const Word16 hq_generic_exc_clas, /* i  : bwe excitation class                        */
     const Word16 *R );
 
+void hq_generic_decoding_ivas_fx(
+    const Word16 HQ_mode,             /* i  : HQ mode                                     */
+    Word32 *coeff_out1_fx,            /* i/o: BWE i   & temporary buffer                */
+    const Word16 *hq_generic_fenv_fx, /* i  : SWB frequency envelopes                     */
+    Word32 *coeff_out_fx,             /* o  : SWB signal in MDCT domain                   */
+    const Word16 hq_generic_offset,   /* i  : frequency offset for representing hq generic*/
+    Word16 *prev_L_swb_norm,          /* i/o: last normalize length                       */
+    const Word16 hq_generic_exc_clas, /* i  : bwe excitation class                        */
+    const Word16 *R );
+
 void save_old_syn_fx(
     const Word16 L_frame,     /* i  : frame length                */
     const Word16 syn[],       /* i  : ACELP synthesis             */
@@ -701,6 +758,19 @@ void hq_bwe_fx(
     const Word16 num_env_bands,
     const Word16 *R );
 
+void hq_bwe_ivas_fx(
+    const Word16 HQ_mode,             /* i  : HQ mode                                     */
+    Word32 *coeff_out1,               /* i/o: BWE i   & temporary buffer                */
+    const Word16 *hq_generic_fenv,    /* i  : SWB frequency envelopes                     */
+    Word32 *coeff_out,                /* o  : SWB signal in MDCT domain                   */
+    const Word16 hq_generic_offset,   /* i  : frequency offset for representing hq generic bwe*/
+    Word16 *prev_L_swb_norm,          /*i/o : last normalize length                       */
+    const Word16 hq_generic_exc_clas, /* i  : bwe excitation class                        */
+    const Word16 *sfm_end,            /* i  : End of bands                                */
+    const Word16 num_sfm,
+    const Word16 num_env_bands,
+    const Word16 *R );
+
 void hq_wb_nf_bwe_fx(
     const Word16 *coeff_fx, /* i  : coded/noisefilled normalized spectrum */
     const Word16 is_transient,
@@ -808,6 +878,12 @@ Word16 lpc2lsp_fx(
     Word16 *old_freq,
     Word16 order );
 
+Word16 lpc2lsp_ivas_fx(
+    Word32 *a,
+    Word16 *freq,
+    Word16 *old_freq,
+    Word16 order );
+
 void lsp2lpc_fx(
     Word16 *a,
     Word16 *freq,
@@ -837,11 +913,7 @@ void msvq_dec(
     const Word16 N,          /* i  : Vector dimension                                     */
     const Word16 maxN,       /* i  : Codebook dimension                                   */
     const Word16 Idx[],      /* i  : Indices                                              */
-#ifdef IVAS_MSVQ
-    const int16_t applyIDCT_flag, /* i  : applyIDCT flag                                       */
-    const float *invTrfMatrix,    /* i  :   matrix for IDCT synthesis                          */
-#endif
-    Word16 *uq /* o  : quantized vector                              (3Q12) */
+    Word16 *uq               /* o  : quantized vector                              (3Q12) */
 );
 
 Word16 tcxlpc_get_cdk(
@@ -1071,6 +1143,12 @@ void lsp_weights_fx(
     Word16 Order,
     Word16 *Qout );
 
+void lsp_weights_ivas_fx(
+    Word16 lsp_nq_fx[],
+    Word16 w[],
+    Word16 Order,
+    Word16 *Qout );
+
 void space_lsfs_fx(
     Word16 *lsfs,      /* i/o: Line spectral frequencies   */
     const Word16 order /* i  : order of LP analysis        */
@@ -1156,6 +1234,7 @@ Word16 E_LPC_lsp_unweight(
 );
 
 Word32 E_LPC_schur( Word32 r[] /*Qr*/, Word16 reflCoeff[] /*Q15*/, Word32 epsP[] /*Qr*/, const Word16 m );
+Word32 E_LPC_schur_ivas( Word32 r[] /*Qr*/, Word16 reflCoeff[] /*Q15*/, const Word16 m );
 void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/, const Word16 *old_lsf /*15Q16*/, Word16 lpcOrder, Word8 lpcRep /*Q0*/ );
 
 
@@ -1235,7 +1314,8 @@ UWord16 get_indice_1_fx(                       /* o  : value of the indice */
 );
 
 void reset_indices_enc_fx(
-    BSTR_ENC_HANDLE hBstr /* i/o: encoder state structure */
+    BSTR_ENC_HANDLE hBstr,       /* i/o: encoder state structure */
+    const Word16 max_num_indices /* i  : max number of indices       */
 );
 
 void reset_indices_dec_fx(
@@ -1279,18 +1359,6 @@ Word16 BRATE2IDX16k_fx( Word32 brate );
 Word32 BIT_ALLOC_IDX_fx( Word32 brate, Word16 ctype, Word16 sfrm, Word16 tc );
 Word32 BIT_ALLOC_IDX_16KHZ_fx( Word32 brate, Word16 ctype, Word16 sfrm, Word16 tc );
 
-Word16 read_indices_fx(                       /* o  : 1 = OK, 0 = something wrong            */
-                        Decoder_State *st_fx, /* i/o: decoder state structure */
-                        FILE *file,           /* i  : bitstream file                         */
-                        Word16 rew_flag       /* i  : rewind flag (rewind file after reading) */
-);
-
-Word16 read_indices_mime(                    /* o  : 1 = reading OK, 0 = problem            */
-                          Decoder_State *st, /* i/o: decoder state structure                */
-                          FILE *file,        /* i  : bitstream file                         */
-                          Word16 rew_flag    /* i  : rewind flag (rewind file after reading)*/
-);
-
 void getPartialCopyInfo(
     Decoder_State *st, /* i  : decoder state structure       */
     Word16 *coder_type,
@@ -1322,19 +1390,6 @@ void get_NextCoderType_fx(
     Word16 *next_coder_type /* o : next coder type   */
 );
 
-void read_indices_from_djb_fx(
-    Decoder_State *st, /* i/o: decoder state structure */
-    UWord8 *pt_stream, /* i  : bitstream file                         */
-    Word16 nbits       /* i  : number of bits                         */
-    ,
-    Word16 isAMRWB_IOmode,
-    Word16 core_mode,
-    Word16 qbit,
-    Word16 partialframe /* i  : partial frame information     */
-    ,
-    Word16 next_coder_type /* i  : next coder type information     */
-);
-
 void evs_dec_previewFrame(
     UWord8 *bitstream,            /* i  : bitstream pointer */
     Word16 bitstreamSize,         /* i  : bitstream size    */
@@ -1382,6 +1437,13 @@ void scale_sig32(
     const Word16 lg,  /* i  : size of x[]                     Q0        */
     const Word16 exp0 /* i  : exponent: x = round(x << exp)   Qx xx exp  */
 );
+
+void Scale_sig64(
+    Word64 x[], /* i/o: signal to scale                 Qx        */
+    Word16 len, /* i  : size of x[]                     Q0        */
+    Word16 exp  /* i  : exponent: x = round(x << exp)   Qx  exp   */
+);
+
 void scale_sig32_r(
     Word32 x[],       /* i/o: signal to scale                 Qx        */
     const Word16 lg,  /* i  : size of x[]                     Q0        */
@@ -1459,6 +1521,13 @@ void fft_rel_fx(
     const Word16 n, /* i  : vector length          */
     const Word16 m  /* i  : log2 of vector length  */
 );
+void fft_rel_16_32fx(
+    Word16 x[],  /* i/o: input/output vector Qx   */
+    Word16 *q_x, /* extra scaling added on speech buffer*/
+    Word16 i_subfr,
+    const Word16 n, /* i  : vector length          */
+    const Word16 m  /* i  : log2 of vector length  */
+);
 void fft_rel_fx32(
     Word32 x[],     /* i/o: i  /output vector    */
     const Word16 n, /* i  : vector length          */
@@ -1504,19 +1573,19 @@ Word16 gsc_gainQ_fx(
 );
 
 Word16 gsc_gainQ_ivas_fx(
-    BSTR_ENC_HANDLE hBstr,      /* i/o: encoder bitstream handle     */
-    const int16_t element_mode, /* i  : element mode                 */
-    const int16_t idchan,       /* i  : channel ID                   */
+    BSTR_ENC_HANDLE hBstr,     /* i/o: encoder bitstream handle     */
+    const Word16 element_mode, /* i  : element mode                 */
+    const Word16 idchan,       /* i  : channel ID                   */
     const Word16 y_gain4[],
     /* i  : Energy per band              */ // Q12
     Word16 y_gainQ[],
     /* o  : quantized energy per band    */ // Q12
-    const int32_t core_brate,               /* i  : Core rate                    */
-    const int16_t coder_type,               /* i  : coding type                  */
-    const int16_t bwidth,                   /* i  : input signal bandwidth       */
-    const int16_t L_frame,                  /* i  : frame length                 */
-    const int16_t tdm_LRTD_flag,            /* i  : LRTD stereo mode flag        */
-    const int32_t core_brate_inp            /* i  : true core bitrate            */
+    const Word32 core_brate,                /* i  : Core rate                    */
+    const Word16 coder_type,                /* i  : coding type                  */
+    const Word16 bwidth,                    /* i  : input signal bandwidth       */
+    const Word16 L_frame,                   /* i  : frame length                 */
+    const Word16 tdm_LRTD_flag,             /* i  : LRTD stereo mode flag        */
+    const Word32 core_brate_inp             /* i  : true core bitrate            */
 );
 
 // frame_ener.c
@@ -1582,7 +1651,6 @@ void deemph_fx(
 void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, Word16 *mem );
 
 void deemph_fx_32(
-    Word16 shift,    /* i : scaled output      */
     Word32 *signal,  /* i/o: signal            */
     const Word16 mu, /* i  : deemphasis factor */
     const Word16 L,  /* i  : vector size       */
@@ -1689,13 +1757,11 @@ Word16 Enr_1_Az_fx(                    /* o  : impulse response energy      Q3
                     const Word16 Aq[], /* i  : LP filter coefs              Qx based on the fact that Aq[0] == 1.0 */
                     const Word16 len   /* i  : impulse response length      Q0  */
 );
-#ifdef BASOP_NOGLOB
 Word16 Enr_1_Az_fx_o(                    /* o  : impulse response energy      Q3  */
                       const Word16 Aq[], /* i  : LP filter coefs              Qx based on the fact that Aq[0] == 1.0 */
                       const Word16 len,  /* i  : impulse response length      Q0  */
                       Flag *Overflow_out /* o :  propagating the Overflow flag to upper level */
 );
-#endif
 
 // gs_gains_fx.c
 void Ener_per_band_comp_fx(
@@ -1710,7 +1776,7 @@ void Ener_per_band_comp_ivas_fx(
     const Word16 Q_exc,         /* i  : frame length                      */
     const Word16 Mband,         /* i  : Max band                          */
     const Word16 Eflag,         /* i  : flag of highest band              */
-    const int16_t L_frame       /* i  : frame length                */
+    const Word16 L_frame        /* i  : frame length                */
 );
 void Ener_per_band_comp_ivas_fx_2(
     const Word16 exc_diff_fx[], /* i  : target signal                     Q_exc_diff     */
@@ -2380,6 +2446,20 @@ void syn_filt_fx(
     const Word16 update_m /* i  : update memory flag Q0 : 0 --> no memory update */
 );                        /*                              1 --> update of memory */
 
+void syn_filt_fx32(
+    const Word16 a_e,     /* i  : exp of LP coeffs                          Q0   */
+    const Word32 a[],     /* i  : LP filter coefficients                    Q12  */
+    const Word16 m,       /* i  : order of LP filter                        Q0   */
+    const Word32 x[],     /* i  : input signal                              Qx   */
+    const Word16 x_e,     /* i  : input signal                              Qx   */
+    Word32 y[],           /* o  : output signal                             Qx   */
+    Word16 *y_e,          /* o  : output signal                             Qx   */
+    const Word16 l,       /* i  : size of filtering                         Q0   */
+    Word32 mem[],         /* i/o: initial filter states                     Qx   */
+    Word16 *mem_e,        /* i/o: initial filter states                     Qx   */
+    const Word16 update_m /* i  : update memory flag Q0 : 0 --> no memory update */
+);
+
 void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], Word16 y[], const Word16 lg, Word16 mem[], const Word16 update, const Word16 m );
 
 void E_UTIL_synthesis_fx( const Word16 shift, const Word32 a[], const Word32 x[], Word32 y[], const Word16 lg, Word32 mem[], const Word16 update, const Word16 m );
@@ -2509,14 +2589,12 @@ Word16 modify_Fs_ivas_fx(                          /* o  : length of output    Q
 // modif_fs_fx.c
 Word16 modify_Fs_fx(                          /* o  : length of output    Q0  */
                      const Word16 sigIn_fx[], /* i  : signal to decimate  Q0  */
-                     Word16 lg,               /* i  : length of input     Q0  */
-                     const Word32 fin,        /* i  : frequency of input  Q0  */
+                     Word16 lg,               /* i  : length of i       Q0  */
+                     const Word32 fin,        /* i  : frequency of i    Q0  */
                      Word16 sigOut_fx[],      /* o  : decimated signal    Q0  */
                      const Word32 fout,       /* i  : frequency of output Q0  */
                      Word16 mem_fx[],         /* i/o: filter memory       Q0  */
-                     const Word16 nblp,       /* i  : flag indicating if NB low-pass is applied */
-                     Word16 *Q_new_inp,       // TO be removed
-                     Word16 *mem_decim_size   // TO be removed
+                     const Word16 nblp        /* i  : flag indicating if NB low-pass is applied */
 );
 
 Word16 modify_Fs_intcub3m_sup_fx(                       /* o  : length of output    */
@@ -2530,49 +2608,70 @@ Word16 modify_Fs_intcub3m_sup_fx(                       /* o  : length of output
 
 void Decimate_allpass_steep_fx(
     const Word16 *in_fx,
-    Word16 mem[], /* array of size: 2*ALLPASSSECTIONS_STEEP+1 */
-    Word16 N,     /* number of input samples */
-    Word16 out_fx[] );
+    Word16 mem[],   /* array of size: 2*ALLPASSSECTIONS_STEEP+1 */
+    Word16 N,       /* number of input samples                  */
+    Word16 out_fx[] /* o  : output array of size N/2            */
+);
+
+void Decimate_allpass_steep_fx32(
+    const Word32 *in, /* i  : input array of size N                   */
+    Word32 *mem,      /* i/o: memory                                  */
+    const Word16 N,   /* i  : number of input samples                 */
+    Word32 *out       /* o  : output array of size N/2                */
+);
 
 void Interpolate_allpass_steep_fx(
     const Word16 *in_fx,
-    Word16 mem[], /* array of size: 2*ALLPASSSECTIONS_STEEP+1 */
-    Word16 N,     /* number of input samples */
-    Word16 out_fx[] );
+    Word16 mem[],   /* array of size: 2*ALLPASSSECTIONS_STEEP+1 */
+    Word16 N,       /* number of input samples                  */
+    Word16 out_fx[] /* o  : output array of size 2*N            */
+);
+
+void Interpolate_allpass_steep_fx32(
+    const Word32 *in_fx, /* i  : input array of size N       */
+    Word32 *mem_fx,      /* i/o: memory                      */
+    const Word16 N,      /* i  : number of input samples     */
+    Word32 *out_fx       /* o  : output array of size 2*N    */
+);
 
 void interpolate_3_over_2_allpass_fx(
-    const Word16 *input_fx,
-    /* i  : input signal            */ /* Q_input */
-    const Word16 len,                  /* i  : number of input samples */
-    Word16 *out_fx,
-    /* o  : output signal           */ /* Q_input */
-    Word16 *mem_fx,
-    /* i/o: memory                  */                             /* Q_input */
-    const Word16 *filt_coeff_fx /* i  : filter coefficients     */ /* Q15*/
+    const Word16 *input_fx,     /* i  : input signal             Q_input */
+    const Word16 len,           /* i  : number of input samples */
+    Word16 *out_fx,             /* o  : output signal            Q_input */
+    Word16 *mem_fx,             /* i/o: memory                   Q_input */
+    const Word16 *filt_coeff_fx /* i  : filter coefficients      Q15*/
+);
+
+void interpolate_3_over_2_allpass_fx32(
+    const Word32 *input, /* i  : input signal              Qx */
+    const Word16 len,    /* i  : number of input samples      */
+    Word32 *out,         /* o  : output signal                */
+    Word32 *mem          /* i/o: memory                       */
 );
 
 void interpolate_3_over_1_allpass_fx(
-    const Word16 *input_fx,
-    /* i  : input signal            */ /* Q_input */
-    const Word16 len,                  /* i  : number of input samples */
-    Word16 *out_fx,
-    /* o  : output signal           */                /* Q_input */
-    Word16 *mem_fx /* i/o: memory                  */ /* Q_input */
+    const Word16 *input_fx, /* i  : input signal             Q_input */
+    const Word16 len,       /* i  : number of input samples          */
+    Word16 *out_fx,         /* o  : output signal            Q_input */
+    Word16 *mem_fx          /* i/o: memory                   Q_input */
+);
+
+void interpolate_3_over_1_allpass_fx32(
+    const Word32 *input, /* i  : input signal                    Qx */
+    const Word16 len,    /* i  : number of input samples            */
+    Word32 *out,         /* o  : output signal                      */
+    Word32 *mem          /* i/o: memory                             */
 );
 
 void decimate_2_over_3_allpass_fx(
-    const Word16 *input,
-    /* i  : input signal            */ /* Q_input */
-    const Word16 len,                  /* i  : number of input samples */
-    Word16 *out_fx,
-    /* o  : output signal           */ /* Q_input */
-    Word16 *mem_fx,
-    /* i/o: memory                  */ /* Q_input */
-    const Word16 *filt_coeff_fx,
-    /* i  : filter coefficients     */ /* Q15*/
-    const Word16 *lp_num_fx,           /* i  : Num Coefficients : Q15 */
-    const Word16 *lp_den_fx,           /* o  : Den Coefficients : Q15 */
-    Word16 *lp_mem_fx                  /* o  : Filter memories  : Q_input */
+    const Word16 *input,         /* i  : input signal             Q_input */
+    const Word16 len,            /* i  : number of input samples          */
+    Word16 *out_fx,              /* o  : output signal            Q_input */
+    Word16 *mem_fx,              /* i/o: memory                   Q_input */
+    const Word16 *filt_coeff_fx, /* i  : filter coefficients          Q15 */
+    const Word16 *lp_num_fx,     /* i  : Num Coefficients :           Q15 */
+    const Word16 *lp_den_fx,     /* o  : Den Coefficients :           Q15 */
+    Word16 *lp_mem_fx            /* o  : Filter memories  :       Q_input */
 );
 
 void retro_interp4_5_fx(
@@ -2805,7 +2904,8 @@ void swb_tbe_reset_fx(
 
 void swb_tbe_reset_synth_fx(
     Word32 genSHBsynth_Hilbert_Mem[],
-    Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[] );
+    Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[],
+    Word32 genSHBsynth_state_lsyn_filt_shb_local_fx_32[] );
 
 void fb_tbe_reset_synth_fx(
     Word32 fbbwe_hpf_mem_fx[][4],
@@ -2828,16 +2928,16 @@ void tbe_celp_exc(
 );
 
 void tbe_celp_exc_ivas(
-    const int16_t element_mode, /* i  : element mode            */
-    const int16_t idchan,       /* i  : channel ID              */
-    const Word16 L_frame_fx,    /* i  : Frame lenght */
-    const int16_t L_subfr,      /* i  : subframe length         */
-    const Word16 i_subfr_fx,    /* i  : sub frame */
-    const Word16 T0_fx,         /* i  : Integer pitch */
-    const Word16 T0_frac_fx,    /* i  : Fractional part of the pitch */
-    Word16 *error_fx,           /* i/o: Error */
-    Word16 *bwe_exc_fx,         /* i/o: bandwitdh extension signal */
-    const int16_t tdm_LRTD_flag /* i  : LRTD stereo mode flag   */
+    const Word16 element_mode, /* i  : element mode            */
+    const Word16 idchan,       /* i  : channel ID              */
+    const Word16 L_frame_fx,   /* i  : Frame lenght */
+    const Word16 L_subfr,      /* i  : subframe length         */
+    const Word16 i_subfr_fx,   /* i  : sub frame */
+    const Word16 T0_fx,        /* i  : Integer pitch */
+    const Word16 T0_frac_fx,   /* i  : Fractional part of the pitch */
+    Word16 *error_fx,          /* i/o: Error */
+    Word16 *bwe_exc_fx,        /* i/o: bandwitdh extension signal */
+    const Word16 tdm_LRTD_flag /* i  : LRTD stereo mode flag   */
 );
 
 void flip_and_downmix_generic_fx(
@@ -2855,6 +2955,11 @@ void Calc_rc0_h(
     Word16 *rc0 /* o  : 1st parcor */
 );
 
+void Calc_rc0_h_ivas_enc_fx(
+    Word16 *h,  /* i  : impulse response of composed filter */
+    Word16 *rc0 /* o  : 1st parcor */
+);
+
 void PostShortTerm_fx(
     Word16 *sig_in,             /* i  : i   signal (pointer to current subframe */
     Word16 *lpccoeff,           /* i  : LPC coefficients for current subframe */
@@ -2949,27 +3054,12 @@ void GenShapedSHBExcitation_fx(
     Word16 n_mem2,         /* i :  n_mem2 scale factor to adjust 24.4/32kbps memories */
     Word16 prev_Q_bwe_syn, /* i :  st_fx->prev_Q_bwe_syn */
     const Word32 bitrate,
-    const Word16 prev_bfi
-#ifdef ADD_IVAS_TBE_CODE
-    ,                             /* i  : previous frame was concealed            */
-    const Word16 element_mode,    /* i  : element mode                            */
-    const Word16 flag_ACELP16k,   /* i  : ACELP@16kHz flag                        */
-    Word16 *nlExc16k,             /* i/o: NL exc for IC-BWE                       */
-    Word16 *mixExc16k,            /* i/o: exc spreading for IC-BWE                */
-    const Word32 extl_brate,      /* i  : extension layer bitarte                 */
-    const Word16 MSFlag,          /* i  : Multi Source flag                       */
-    Word16 EnvSHBres_4k[],        /* i/o: TD envelope of the SHB residual signal  */
-    Word16 *prev_pow_exc16kWhtnd, /* i/o: power of the LB excitation signal in the previous frame */
-    Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame     */
-    Word16 *Env_error,            /* o  : error in SHB residual envelope modelling*/
-    Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */
-#endif
-);
+    const Word16 prev_bfi );
 
 void GenShapedSHBExcitation_ivas_enc_fx(
     Word16 *excSHB,                      /* o : synthesized shaped shb excitation Q_bwe_exc*/
     const Word16 *lpc_shb,               /* i : lpc coefficients Q12*/
-    Word16 *White_exc16k_FB,             /* o : white excitation for the Fullband extension Q_bwe_exc */
+    Word16 *White_exc16k_FB,             /* o : white excitation for the Fullband extension Q_bwe_exc_fb */
     Word32 *mem_csfilt,                  /* i/o: memory */
     Word16 *mem_genSHBexc_filt_down_shb, /* i/o: memory */
     Word16 *state_lpc_syn,               /* i/o: memory */
@@ -2994,21 +3084,21 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     Word16 n_mem2,         /* i :  n_mem2 scale factor to adjust 24.4/32kbps memories */
     Word16 prev_Q_bwe_syn, /* i :  st_fx->prev_Q_bwe_syn */
     const Word32 bitrate,
-    const Word16 prev_bfi
-#if 1                             // def ADD_IVAS_TBE_CODE
-    ,                             /* i  : previous frame was concealed            */
-    const Word16 element_mode,    /* i  : element mode                            */
-    const Word16 flag_ACELP16k,   /* i  : ACELP@16kHz flag                        */
-    Word16 *nlExc16k,             /* i/o: NL exc for IC-BWE                       */
-    Word16 *mixExc16k,            /* i/o: exc spreading for IC-BWE                */
-    const Word32 extl_brate,      /* i  : extension layer bitarte                 */
-    const Word16 MSFlag,          /* i  : Multi Source flag                       */
-    Word16 EnvSHBres_4k[],        /* i/o: TD envelope of the SHB residual signal  */
+    const Word16 prev_bfi,
+    const Word16 element_mode,  /* i  : element mode                            */
+    const Word16 flag_ACELP16k, /* i  : ACELP@16kHz flag                        */
+    Word16 *nlExc16k,           /* i/o: NL exc for IC-BWE                       */
+    Word16 *nlExc16k_e,         /* i/o: exp of nlExc16k                         */
+    Word16 *mixExc16k,          /* i/o: exc spreading for IC-BWE                */
+    Word16 *mixExc16k_e,        /* i/o: exp of mixExc16k_fx                     */
+    const Word32 extl_brate,    /* i  : extension layer bitarte                 */
+    const Word16 MSFlag,        /* i  : Multi Source flag                       */
+    Word16 EnvSHBres_4k[],      /* i/o: TD envelope of the SHB residual signal  */
+    Word16 Q_EnvSHBres_4k,
     Word32 *prev_pow_exc16kWhtnd, /* i/o: power of the LB excitation signal in the previous frame */
     Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame     */
     Word16 *Env_error,            /* o  : error in SHB residual envelope modelling*/
     Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */
-#endif
 );
 
 void GenShapedSHBExcitation_ivas_dec_fx(
@@ -3039,9 +3129,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     Word16 n_mem2,         /* i :  n_mem2 scale factor to adjust 24.4/32kbps memories */
     Word16 prev_Q_bwe_syn, /* i :  st_fx->prev_Q_bwe_syn */
     const Word32 bitrate,
-    const Word16 prev_bfi
-#if 1                             // def ADD_IVAS_TBE_CODE
-    ,                             /* i  : previous frame was concealed            */
+    const Word16 prev_bfi,        /* i  : previous frame was concealed            */
     const Word16 element_mode,    /* i  : element mode                            */
     const Word16 flag_ACELP16k,   /* i  : ACELP@16kHz flag                        */
     Word16 *nlExc16k,             /* i/o: NL exc for IC-BWE                       */
@@ -3053,7 +3141,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame     */
     Word16 *Env_error,            /* o  : error in SHB residual envelope modelling*/
     Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */
-#endif
 );
 
 void GenSHBSynth_fx(
@@ -3064,13 +3151,13 @@ void GenSHBSynth_fx(
     const Word16 L_frame,             /* i  : ACELP Frame length                      */
     Word16 *syn_dm_phase );
 
-void GenSHBSynth_fx_32(
+void GenSHBSynth_fx32(
     const Word32 *input_synspeech,      /* i  : input synthesized speech    */
     Word32 *shb_syn_speech_32k,         /* o  : output highband component   */
     Word32 Hilbert_Mem[],               /* i/o: memory                      */
     Word32 state_lsyn_filt_shb_local[], /* i/o: memory                      */
-    const int16_t L_frame,              /* i  : ACELP frame length          */
-    int16_t *syn_dm_phase );
+    const Word16 L_frame,               /* i  : ACELP frame length          */
+    Word16 *syn_dm_phase );
 
 void ScaleShapedSHB_fx(
     const Word16 length,     /* i  : SHB overlap length                      */
@@ -3085,7 +3172,7 @@ void ScaleShapedSHB_fx(
     Word16 n_mem3,
     Word16 prev_Q_bwe_syn2 );
 
-void ScaleShapedSHB_32(
+void ScaleShapedSHB_fx32(
     const Word16 length,        /* i  : SHB overlap length      */
     Word32 *synSHB_fx,          /* i/o: synthesized shb signal  Qx */
     Word32 *overlap_fx,         /* i/o: buffer for overlap-add  Qx */
@@ -3152,6 +3239,20 @@ void interp_code_4over2_fx(
 
 void wb_tbe_extras_reset_synth_fx( Word16 state_lsyn_filt_shb[], Word16 state_lsyn_filt_dwn_shb[], Word16 state_32and48k_WB_upsample[], Word16 state_resamp_HB[] );
 
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+void elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+    const Word16 element_mode,
+#endif
+    Word16 IsUpsampled3,
+    Word16 input_fx[], /* i  : input signal                             Q_input_fx*/
+    Word16 *Q_input_fx,
+    Word16 output_fx[],    /* o  : output signal                               */
+    Word32 memory_fx[][4], /* i/o: 4 arrays of 4 for memory                   memory_fx_Q */
+    Word16 memory_fx_Q[],
+    const Word16 full_band_bpf[][5] /* i  : filter coefficients b0,b1,b2,a0,a1,a2  Q13  */
+);
+#else
 void elliptic_bpf_48k_generic_fx(
     const Word16 input_fx[], /* i  : i   signal                              Q_input_fx  */
     Word16 *Q_input_fx,
@@ -3160,6 +3261,7 @@ void elliptic_bpf_48k_generic_fx(
     Word16 memory_fx_Q[],
     const Word16 full_band_bpf[][5] /* i  : filter coefficients b0,b1,b2,a0,a1,a2  Q13  */
 );
+#endif
 
 void synthesise_fb_high_band_fx(
     const Word16 excitation_in[], /* i  : full band excitation                                */
@@ -3172,67 +3274,40 @@ void synthesise_fb_high_band_fx(
     Word16 *prev_fbbwe_ratio,   /* o  : previous frame energy for FEC                       */
     Word32 bpf_memory[][4],     /* i/o: memory for elliptic bpf 48k                         */
     Word16 bpf_memory_Q[],
-    Word16 Qout );
-
-void prep_tbe_exc_fx(
-    const Word16 L_frame_fx, /* i : length of the frame */
-#ifdef ADD_IVAS_TBE_CODE
-    const Word16 L_subfr,
-#endif
-    const Word16 i_subfr_fx,     /* i : subframe index */
-    const Word16 gain_pit_fx,    /* i : Pitch gain Q14*/
-    const Word32 gain_code_fx,   /* i : algebraic codebook gain 16+Q_exc*/
-    const Word16 code_fx[],      /* i : algebraic excitation Q9*/
-    const Word16 voice_fac_fx,   /* i : voicing factor Q15*/
-    Word16 *voice_factors_fx,    /* o : TBE voicing factor Q15*/
-    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE Q_exc*/
-    const Word16 gain_preQ_fx,   /* i : prequantizer excitation gain */
-    const Word16 code_preQ_fx[], /* i : prequantizer excitation */
-    const Word16 Q_exc,          /* i : Excitation, bwe_exc Q-factor */
-    Word16 T0,                   /* i : integer pitch variables Q0 */
-    Word16 T0_frac,              /* i : Fractional pitch variables Q0*/
-    const Word16 coder_type,     /* i : coding type */
-    Word32 core_brate            /* i :core bitrate */
-#ifdef ADD_IVAS_TBE_CODE
+    Word16 Qout
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
     ,
-    const Word16 element_mode, /* i  : element mode                */
-    const Word16 idchan,       /* i  : channel ID                  */
-    const Word16 flag_TD_BWE,  /* i  : flag indicating whether hTD_BWE exists  */
-    const Word16 tdm_LRTD_flag /* i  : LRTD stereo mode flag       */
-#endif
-);
-
-void prep_tbe_exc_ivas_fx(
-    const Word16 L_frame_fx, /* i : length of the frame */
-#if 1                        // def ADD_IVAS_TBE_CODE
-    const Word16 L_subfr,
-#endif
-    const Word16 i_subfr_fx,     /* i : subframe index */
-    const Word16 gain_pit_fx,    /* i : Pitch gain Q14*/
-    const Word32 gain_code_fx,   /* i : algebraic codebook gain 16+Q_exc*/
-    const Word16 code_fx[],      /* i : algebraic excitation Q9*/
-    const Word16 voice_fac_fx,   /* i : voicing factor Q15*/
-    Word16 *voice_factors_fx,    /* o : TBE voicing factor Q15*/
-    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE Q_exc*/
-    const Word16 gain_preQ_fx,   /* i : prequantizer excitation gain */
-    const Word16 code_preQ_fx[], /* i : prequantizer excitation */
-    const Word16 Q_exc,          /* i : Excitation, bwe_exc Q-factor */
-    Word16 T0,                   /* i : integer pitch variables Q0 */
-    Word16 T0_frac,              /* i : Fractional pitch variables Q0*/
-    const Word16 coder_type,     /* i : coding type */
-    Word32 core_brate
-#if 1                          // def ADD_IVAS_TBE_CODE
-    ,                          /* i  : core bitrate                */
-    const Word16 element_mode, /* i  : element mode                */
-    const Word16 idchan,       /* i  : channel ID                  */
-    const Word16 flag_TD_BWE,  /* i  : flag indicating whether hTD_BWE exists  */
-    const Word16 tdm_LRTD_flag /* i  : LRTD stereo mode flag       */
+    Word16 element_mode
 #endif
 );
 
-Word16 swb_formant_fac_fx(                        /* o : Formant filter strength [0,1] */
-                           const Word16 lpc_shb2, /* Q12 i : 2nd HB LPC coefficient */
-                           Word16 *tilt_mem       /* i/o: Tilt smoothing memory */
+void prep_tbe_exc_fx(
+    const Word16 L_frame_fx,     /* i  : length of the frame                    */
+    const Word16 L_subfr,        /* i  : subframe length                        */
+    const Word16 i_subfr_fx,     /* i  : subframe index                         */
+    const Word16 gain_pit_fx,    /* i  : Pitch gain                          Q14*/
+    const Word32 gain_code_fx,   /* i  : algebraic codebook gain        16+Q_exc*/
+    const Word16 code_fx[],      /* i  : algebraic excitation                 Q9*/
+    const Word16 voice_fac_fx,   /* i  : voicing factor                      Q15*/
+    Word16 *voice_factors_fx,    /* o  : TBE voicing factor                  Q15*/
+    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE                Q_exc*/
+    const Word16 gain_preQ_fx,   /* i  : prequantizer excitation gain           */
+    const Word16 code_preQ_fx[], /* i  : prequantizer excitation                */
+    const Word16 Q_exc,          /* i  : Excitation,           bwe_exc Q-factor */
+    const Word16 T0,             /* i  : integer pitch variables             Q0 */
+    const Word16 T0_frac,        /* i  : Fractional pitch variables           Q0*/
+    const Word16 coder_type,     /* i  : coding type                            */
+    const Word32 core_brate,     /* i  : core bitrate                           */
+    const Word16 element_mode,   /* i  : element mode                           */
+    const Word16 idchan,         /* i  : channel ID                             */
+    const Word16 flag_TD_BWE,    /* i  : flag indicating whether hTD_BWE exists */
+    const Word16 tdm_LRTD_flag   /* i  : LRTD stereo mode flag                  */
+);
+
+/*! r: Formant filter strength [0,1] */
+Word16 swb_formant_fac_fx(
+    const Word16 lpc_shb2, /* Q12 i : 2nd HB LPC coefficient */
+    Word16 *tilt_mem       /* i/o: Tilt smoothing memory */
 );
 
 void wb_tbe_extras_reset_fx(
@@ -3596,6 +3671,16 @@ Word16 ITF_Detect_fx( Word32 const pSpectrum[],
                       Word16 *curr_order,
                       Word16 Q );
 
+Word16 ITF_Detect_ivas_fx( Word32 const pSpectrum[],
+                           const Word16 startLine,
+                           const Word16 stopLine,
+                           const Word16 maxOrder,
+                           Word16 *A,
+                           Word16 *Q_A,
+                           Word16 *predictionGain,
+                           Word16 *curr_order,
+                           Word16 Q );
+
 void ITF_Apply_fx( Word32 spectrum[],
                    Word16 startLine,
                    Word16 stopLine,
@@ -3659,8 +3744,8 @@ void const *GetTnsEnabledSingleFilter( void const *p, const Word16 index, Word16
 
 void *SetTnsEnabledSingleFilter( void *p, const Word16 index, const Word16 value );
 
-void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue );
-void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value );
+void const *GetTnsOnWhite( void const *p, const Word16 index, Word16 *pValue );
+void *SetTnsOnWhite( void *p, const Word16 index, const Word16 value );
 
 /*tns_base.h*/
 /** Reset TNS data.
@@ -4025,8 +4110,8 @@ void cng_params_upd_ivas_fx(
     const Word16 element_mode, /* i  : Element mode                        */
     const Word16 bwidth        /* i  : Audio bandwidth                     */
 );
-int16_t get_cng_mode(
-    const int32_t last_active_brate /* i  : last active bitrate                                 */
+Word16 get_cng_mode(
+    const Word32 last_active_brate /* i  : last active bitrate                                 */
 );
 
 // core_com_config.c
@@ -4036,15 +4121,7 @@ Word16 get_codec_mode(
 );
 
 Word16 getTcxonly(
-#ifdef IVAS_CODE_SWITCHING
-    const Word16 element_mode, /* i  : IVAS element mode                   */
-#endif
     const Word32 total_brate /* i  : total bitrate                       */
-#ifdef IVAS_CODE_SWITCHING
-    ,
-    const Word16 MCT_flag,      /* i  : hMCT handle allocated (1) or not (0)*/
-    const int16_t is_ism_format /* i  : flag indicating ISM format          */
-#endif
 );
 
 Word16 getTcxonly_fx(
@@ -4221,12 +4298,12 @@ void lpc2mdct(
 
 void lpc2mdct_2(
     Word16 *lpcCoeffs,
-    const int16_t lpcOrder,
+    const Word16 lpcOrder,
     Word16 mdct_gains_fx[],
     Word16 mdct_gains_e[],
     Word16 mdct_inv_gains_fx[],
     Word16 mdct_inv_gains_e[],
-    const int16_t length );
+    const Word16 length );
 
 void mdct_shaping(
     Word32 x[],
@@ -4361,14 +4438,15 @@ void calcGainTemp_TBE_Fx(
     Word16 *pGainTemp_e,
     const Word16 code );
 
-Word16 procTecTfa_TBE_Fx( Word16 *hb_synth_Fx,
-                          Word16 hb_synth_fx_exp,
-                          Word16 *gain_m,
-                          Word16 *gain_e,
-                          Word16 flat_flag,
-                          Word16 last_core,
-                          Word16 l_subfr,
-                          Word16 code );
+Word16 procTecTfa_TBE_Fx(
+    Word16 *hb_synth_Fx,
+    Word16 hb_synth_fx_exp,
+    Word16 *gain_m,
+    Word16 *gain_e,
+    Word16 flat_flag,
+    Word16 last_core,
+    Word16 l_subfr,
+    Word16 code );
 
 void calcHiEnvLoBuff_Fix(
     const Word16 noCols,
@@ -4579,6 +4657,7 @@ Word16 find_guarded_bits_fx( Word32 n );
 
 Word16 L_norm_arr( const Word32 *arr, Word16 size );
 Word16 norm_arr( Word16 *arr, Word16 size );
+Word16 W_norm_arr( Word64 *arr, Word16 size );
 
 Word16 get_min_scalefactor( Word32 x, Word32 y );
 
@@ -4638,24 +4717,26 @@ void r_fft_fx_lc(
 );
 
 // cldfb_evs
-void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK anaCldfb, /*!< Handle of Cldfb Analysis Bank   */
-                             Word32 **cldfbReal,                /*!< Pointer to real subband slots */
-                             Word32 **cldfbImag,                /*!< Pointer to imag subband slots */
-                             CLDFB_SCALE_FACTOR *scaleFactor,   /*!< Scale factors of CLDFB data     */
-                             const Word16 *timeIn,              /*!< Time signal */
-                             const Word16 timeIn_e,             /*!< Time signal */
-                             const Word16 nTimeSlots,           /*!< Time slots to be processed */
-                             Word32 *pWorkBuffer                /*!< pointer to temporal working buffer */
-);
-
-void cldfbSynthesisFiltering( HANDLE_CLDFB_FILTER_BANK synCldfb,     /*!< Handle of Cldfb Synthesis Bank  */
-                              Word32 **CldfbBufferReal,              /*!< Pointer to 32 bit real subband slots */
-                              Word32 **CldfbBufferImag,              /*!< Pointer to 32 bit imag subband slots */
-                              const CLDFB_SCALE_FACTOR *scaleFactor, /*!< Scale factors of CLDFB data     */
-                              Word16 *timeOut,                       /*!< Time signal */
-                              const Word16 timeOut_e,                /*!< Target exponent for output signal */
-                              const Word16 nTimeSlots,               /*!< number of time slots to be processed */
-                              Word32 *pWorkBuffer                    /*!< pointer to temporal working buffer */
+void cldfbAnalysis_fx(
+    HANDLE_CLDFB_FILTER_BANK anaCldfb, /*!< Handle of Cldfb Analysis Bank   */
+    Word32 **cldfbReal,                /*!< Pointer to real subband slots */
+    Word32 **cldfbImag,                /*!< Pointer to imag subband slots */
+    CLDFB_SCALE_FACTOR *scaleFactor,   /*!< Scale factors of CLDFB data     */
+    const Word16 *timeIn,              /*!< Time signal */
+    const Word16 timeIn_e,             /*!< Time signal */
+    const Word16 nTimeSlots,           /*!< Time slots to be processed */
+    Word32 *pWorkBuffer                /*!< pointer to temporal working buffer */
+);
+
+void cldfbSynthesis_fx(
+    HANDLE_CLDFB_FILTER_BANK synCldfb,     /*!< Handle of Cldfb Synthesis Bank  */
+    Word32 **CldfbBufferReal,              /*!< Pointer to 32 bit real subband slots */
+    Word32 **CldfbBufferImag,              /*!< Pointer to 32 bit imag subband slots */
+    const CLDFB_SCALE_FACTOR *scaleFactor, /*!< Scale factors of CLDFB data     */
+    Word16 *timeOut,                       /*!< Time signal */
+    const Word16 timeOut_e,                /*!< Target exponent for output signal */
+    const Word16 nTimeSlots,               /*!< number of time slots to be processed */
+    Word32 *pWorkBuffer                    /*!< pointer to temporal working buffer */
 );
 
 void configureCldfb( HANDLE_CLDFB_FILTER_BANK h_cldfb, /*!< CLDFB Handle */
@@ -4730,33 +4811,6 @@ Word16 BITS_ALLOC_config_acelp(
     const Word16 narrowband,
     const Word16 nb_subfr );
 
-ivas_error config_acelp1(
-    const Word16 enc_dec,              /* i  : encoder/decoder flag            */
-    const Word32 total_brate,          /* i  : total bitrate                   */
-    const Word32 core_brate_inp,       /* i  : core bitrate                    */
-    const Word16 core,                 /* i  : core                            */
-    const Word16 extl,                 /* i  : extension layer                 */
-    const Word32 extl_brate,           /* i  : extension layer bitrate         */
-    const Word16 L_frame,              /* i  : frame length at internal Fs     */
-    const Word16 GSC_noisy_speech,     /* i  : GSC on SWB noisy speech flag    */
-    ACELP_config *acelp_cfg,           /* i  : ACELP bit-allocation            */
-    const Word16 signalling_bits,      /* i  : number of signalling bits       */
-    const Word16 coder_type,           /* i  : coder type                      */
-    const Word16 tc_subfr,             /* i  : TC subfr ID                     */
-    const Word16 tc_call,              /* i  : TC call number (0,1,2,3,5(DEC)) */
-    Word16 *nBits_es_Pred,             /* o  : number of bits for Es_pred Q    */
-    Word16 *unbits,                    /* o  : number of unused bits           */
-    const Word16 element_mode,         /* i  : element mode                    */
-    Word16 *uc_two_stage_flag,         /* o  : flag undicating two-stage UC    */
-    const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag (can be 1 only with secondary channel */
-    const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag */
-    const Word16 idchan,               /* i  : stereo channel ID               */
-    const Word16 active_cnt,           /* i  : Active frame counter            */
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/
-    const Word16 tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */
-    const Word16 GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
-);
-
 Word16 set_ACELP_flag(
     const Word16 element_mode,  /* i  : element mode                */
     const Word32 element_brate, /* i  : element bitrate             */
@@ -4786,24 +4840,18 @@ Word16 est_tilt_fx(                         /* o  : tilt of the code
                     const Word32 gain_code, /* i  : algebraic code gain             Q16 */
                     Word16 *voice_fac,      /* o  : voicing factor                  Q15 */
                     const Word16 Q_exc      /* i  : Scaling factor of excitation    Q0  */
-#ifdef ADD_LRTD
-                    ,
-                    const Word16 L_subfr /* i  : Sub frame lenght                    */
-#endif
 );
 
-Word16 est_tilt_ivas_fx(                         /* o  : tilt of the code              Q15      */
-                         const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */
-                         const Word16 gain_pit,  /* i  : adaptive gain                   Q14 */
-                         const Word16 *code,     /* i  : algebraic excitation vector    Q9  */
-                         const Word32 gain_code, /* i  : algebraic code gain             Q16 */
-                         Word16 *voice_fac,      /* o  : voicing factor                  Q15 */
-                         const Word16 Q_exc      /* i  : Scaling factor of excitation    Q0  */
-#if 1                                            // def ADD_LRTD
-                         ,
-                         const Word16 L_subfr,  /* i  : Sub frame length                    */
-                         const Word16 flag_tilt /* i  : flag for special tilt        */
-#endif
+/* o  : tilt of the code Q15 */
+Word16 est_tilt_ivas_fx(
+    const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */
+    const Word16 gain_pit,  /* i  : adaptive gain                   Q14 */
+    const Word16 *code,     /* i  : algebraic excitation vector    Q9  */
+    const Word32 gain_code, /* i  : algebraic code gain             Q16 */
+    Word16 *voice_fac,      /* o  : voicing factor                  Q15 */
+    const Word16 Q_exc,     /* i  : Scaling factor of excitation    Q0  */
+    const Word16 L_subfr,   /* i  : Sub frame length                    */
+    const Word16 flag_tilt  /* i  : flag for special tilt        */
 );
 
 Word16 Est_tilt2(                         /* o  : tilt of the code                    */
@@ -4890,25 +4938,25 @@ void cb_shape_fx(
 
 // longarith.c
 void longadd(
-    uint16_t a[],       /* i/o: vector of the length lena */
-    const uint16_t b[], /* i/o: vector of the length lenb */
-    const int16_t lena, /* i/o: length of vector a[]      */
-    const int16_t lenb  /* i/o: length of vector b[]      */
+    UWord16 a[],       /* i/o: vector of the length lena */
+    const UWord16 b[], /* i/o: vector of the length lenb */
+    const Word16 lena, /* i/o: length of vector a[]      */
+    const Word16 lenb  /* i/o: length of vector b[]      */
 );
 
 void longshiftright(
-    uint16_t a[],      /* i  : vector of the length lena                */
-    const int16_t b,   /* i  : number of bit positions to shift right   */
-    uint16_t d[],      /* o  : vector of the length lend                */
-    int16_t lena,      /* i  : length of vector a[]                     */
-    const int16_t lend /* i  : length of vector d[]                     */
+    UWord16 a[],      /* i  : vector of the length lena                */
+    const Word16 b,   /* i  : number of bit positions to shift right   */
+    UWord16 d[],      /* o  : vector of the length lend                */
+    Word16 lena,      /* i  : length of vector a[]                     */
+    const Word16 lend /* i  : length of vector d[]                     */
 );
 
 void longshiftleft(
-    const uint16_t a[], /* i  : vector of the length len              */
-    const int16_t b,    /* i  : number of bit positions to shift left */
-    uint16_t d[],       /* o  : vector of the length len              */
-    const int16_t len   /* i  : length of vector a[] and d[]          */
+    const UWord16 a[], /* i  : vector of the length len              */
+    const Word16 b,    /* i  : number of bit positions to shift left */
+    UWord16 d[],       /* o  : vector of the length len              */
+    const Word16 len   /* i  : length of vector a[] and d[]          */
 );
 
 void longshr(
@@ -4963,14 +5011,7 @@ void fine_gain_quant_fx(
     Word16 *fg_pred,         /* i/o: Predicted gains / Corrected gains        Q12 */
     const Word16 *gopt       /* i  : Optimal gains                            Q12 */
 );
-void fine_gain_quant_ivas_fx(
-    BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle                        */
-    const Word16 *ord,       /* i  : Indices for energy order                 Q0     */
-    const Word16 num_sfm,    /* i  : Number of bands                          Q0     */
-    const Word16 *gain_bits, /* i  : Gain adjustment bits per sub band        Q0     */
-    Word16 *fg_pred,         /* i/o: Predicted gains / Corrected gains i:Q12 / o:Q11 */
-    const Word16 *gopt       /* i  : Optimal gains                            Q12    */
-);
+
 void get_max_pulses_fx(
     const Word16 *band_start, /* i  : Sub band start indices    */
     const Word16 *band_end,   /* i  : Sub band end indices      */
@@ -5593,7 +5634,7 @@ void enhancer_fx(
 void enhancer_ivas_fx(
     const Word16 codec_mode,  /* i  : flag indicating Codec Mode              */
     const Word32 core_brate,  /* i  : decoder bitrate                          */
-    const int16_t cbk_index,  /* i  :                                         */
+    const Word16 cbk_index,   /* i  :                                         */
     const Word16 Opt_AMR_WB,  /* i  : flag indicating AMR-WB IO mode           */
     const Word16 coder_type,  /* i  : coder type                               */
     const Word16 i_subfr,     /* i  : subframe number                          */
@@ -5696,7 +5737,7 @@ Word16 tcx_ltp_decode_params(
     const Word16 pitres  /* Q0 */
 );
 
-void tcx_ltp_post(
+void tcx_ltp_post_fx(
     Decoder_State *st,
     TCX_LTP_DEC_HANDLE hTcxLtpDec,
     Word16 core,         /* Q0 */
@@ -5706,7 +5747,7 @@ void tcx_ltp_post(
     Word16 *tcx_buf      /* Qx */
 );
 
-void tcx_ltp_post32(
+void tcx_ltp_post_fx32(
     Decoder_State *st,
     TCX_LTP_DEC_HANDLE hTcxLtpDec,
     Word16 core,         /* Q0 */
@@ -5716,38 +5757,19 @@ void tcx_ltp_post32(
     Word32 *tcx_buf,     /* sig_q */
     Word16 sig_q );
 
-// gs_inact_switching_fx.c
-void Inac_swtch_ematch_fx(
-    Word16 exc2[],             /* i/o: CELP/GSC excitation buffer       Q_exc*/
-    Word16 dct_exc_tmp[],      /* i  : GSC excitation in DCT domain          */
-    Word16 lt_ener_per_band[], /* i/o: Long term energy per band        Q12  */
-    const Word16 coder_type,   /* i  : Coding mode                           */
-    const Word16 L_frame,      /* i  : Frame lenght                          */
-    const Word32 core_brate,   /* i  : Core bit rate                         */
-    const Word16 Q_exc         /* i  : i   and output format of exc2       */
-    ,
-    const Word16 bfi /* i  : frame lost indicator                  */
-    ,
-    const short last_core,      /* i  : Last core used                        */
-    const short last_codec_mode /* i  : Last codec mode                       */
-);
-
-void Inac_switch_ematch_ivas_fx(
-    Word16 exc2[],             /* i/o: CELP/GSC excitation buffer       Q_exc*/
-    Word16 dct_exc_tmp[],      /* i  : GSC excitation in DCT domain          */
-    Word16 lt_ener_per_band[], /* i/o: Long term energy per band        Q12  */
-    const Word16 coder_type,   /* i  : Coding mode                           */
-    const Word16 L_frame,      /* i  : Frame lenght                          */
-    const Word32 core_brate,   /* i  : Core bit rate					     */
-    const Word16 Q_exc         /* i  : input and output format of exc2       */
-    ,
-    const Word16 bfi /* i  : frame lost indicator                  */
-    ,
-    const Word16 last_core,      /* i  : Last core used                        */
-    const Word16 last_codec_mode /* i  : Last codec mode                       */
-    ,
-    const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag*/
-    const Word16 element_mode       /* i  : element mode                        */
+void Inac_switch_ematch_fx(
+    Word16 exc2[],                         /* i/o: CELP/GSC excitation buffer       Q_exc*/
+    Word16 dct_exc_tmp[],                  /* i  : GSC excitation in DCT domain          */
+    Word16 lt_ener_per_band[],             /* i/o: Long term energy per band        Q12  */
+    const Word16 coder_type,               /* i  : Coding mode                           */
+    const Word16 inactive_coder_type_flag, /* i  : AVQ (0) or GSC (1) IC flag            */
+    const Word16 L_frame,                  /* i  : Frame lenght                          */
+    const Word16 Q_exc,                    /* i  : input and output format of exc2       */
+    const Word16 bfi,                      /* i  : frame lost indicator                  */
+    const Word16 last_core,                /* i  : Last core used                        */
+    const Word16 last_codec_mode,          /* i  : Last codec mode                       */
+    const Word16 tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag  */
+    const Word16 element_mode              /* i  : element mode                          */
 );
 
 // igf_base_fx.c
@@ -5883,13 +5905,9 @@ Word32 calc_gain_inov(                     /* returns innovation gain
 /*              Lib_dec         */
 //////////////////////////////////
 // swb_tbe_dec.c
-
-void InitSWBdecBuffer_fx(
-    Decoder_State *swb_dnc_fx /* i/o: SHB decoder structure                   */
-);
-
 void ResetSHBbuffer_Dec_fx(
-    Decoder_State *st_fx /* i/o: decoder state structure     */
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */
+    const Word16 extl          /* i  : BWE extension layer     */
 );
 void wb_tbe_dec_fx(
     Decoder_State *st_fx,     /* i/o: decoder state structure                */
@@ -5948,72 +5966,52 @@ void tbe_read_bitstream_fx(
 );
 
 void GenTransition_fx(
-    const Word16 *i,                    /* i  : gain shape overlap buffer              */
-    const Word16 *old_hb_synth,         /* i  : synthesized HB from previous frame     */
-    Word16 length,                      /* i  : targeted length of transition signal   */
-    Word16 *output,                     /* o  : synthesized transitions signal         */
-    Word32 Hilbert_Mem[],               /* i/o: memory                                 */
-    Word16 state_lsyn_filt_shb_local[], /* i/o: memory                                 */
-    Word16 mem_resamp_HB_32k[],         /* i/o: memory                                 */
-    Word16 *syn_dm_phase,
-    Word32 output_Fs,
-    Word16 *up_mem,
-    Word16 rf_flag,
-    Word32 bitrate );
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                                        */
+    Word16 *output_HB,         /* o  : synthesized HB transitions signal  st_fx->prev_Q_bwe_syn2 */
+    const Word32 output_Fs,    /* i  : output sampling rate                                      */
+    Word16 rf_flag,            /* i  : RF flag                                                   */
+    Word32 total_bitrate       /* i  : total bitrate                                             */
+);
+
+void GenTransition_fx32(
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                   */
+    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal : Q11 */
+    const Word32 output_Fs,    /* i  : output sampling rate              : Q0  */
+    const Word16 L_frame,      /* i  : ACELP frame length                : Q0  */
+    const Word16 prev_Qx );
 
 void GenTransition_WB_fx(
-    const Word16 *i,            /* i  : gain shape overlap buffer            */
-    const Word16 *old_hb_synth, /* i  : synthesized HB from previous frame   */
-    const Word16 prev_Qx,       /* i  : scaling of old_hb_synth              */
-    Word16 length,              /* i  : targeted length of transition signal */
-    Word16 *output,             /* o  : synthesized transitions signal       */
-    Word16 state_lsyn_filt_shb1[],
-    Word16 state_lsyn_filt_shb2[],
-    Word32 output_Fs,
-    Word16 *up_mem );
-void TBEreset_dec_ivas_fx(
-    Decoder_State *st /* i/o: decoder state structure     */
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                   */
+    Word16 *output,            /* o  : synthesized transitions signal       */
+    const Word32 output_Fs     /* i  : output sampling rate                 */
+);
+
+void GenTransition_WB_fx32(
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                        */
+    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal  : Q11  */
+    const Word32 output_Fs     /* i  : output sampling rate                      */
 );
 
 void TBEreset_dec_fx(
-    Decoder_State *st_fx, /* i/o: decoder state structure                 */
-    Word16 bandwidth      /* i  : bandwidth mode                          */
+    Decoder_State *st_fx /* i/o: decoder state structure                 */
 );
 
 void td_bwe_dec_init_fx(
-    Decoder_State *st_fx,      /* i/o: SHB decoder structure */
     TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */
-#ifdef ADD_IVAS_BWE
-    const Word16 extl, /* i  : BWE extension layer     */
-#endif
-    const Word32 output_Fs /* i  : output sampling rate    */
+    const Word16 extl,         /* i  : BWE extension layer     */
+    const Word32 output_Fs     /* i  : output sampling rate    */
 );
 
-// lsf_dec_fx.c
 void lsf_dec_fx(
-    Decoder_State *st_fx,          /* i/o: State structure                               */
-    const Word16 tc_subfr,         /* i  : TC subframe index                           Q0*/
-    Word16 *Aq,                    /* o  : quantized A(z) for 4 subframes             Q12*/
-    Word16 *LSF_Q_prediction,      /* o  : LSF prediction mode                         Q0*/
-    Word16 *lsf_new,               /* o  : de-quantized LSF vector               Q(x2.56)*/
-    Word16 *lsp_new,               /* o  : de-quantized LSP vector                    Q15*/
-    Word16 *lsp_mid,               /* o  : de-quantized mid-frame LSP vector          Q15*/
-    const Word16 tdm_low_rate_mode /* i  : secondary channel low rate mode flag		   Q0*/
-    ,
-    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel          Qx*/
-);
-
-void lsf_dec_ivas_fx(
-    Decoder_State *st_fx,          /* i/o: State structure                               */
-    const Word16 tc_subfr,         /* i  : TC subframe index                           Q0*/
-    Word16 *Aq,                    /* o  : quantized A(z) for 4 subframes             Q12*/
-    Word16 *LSF_Q_prediction,      /* o  : LSF prediction mode                         Q0*/
-    Word16 *lsf_new,               /* o  : de-quantized LSF vector               Q(x2.56)*/
-    Word16 *lsp_new,               /* o  : de-quantized LSP vector                    Q15*/
-    Word16 *lsp_mid,               /* o  : de-quantized mid-frame LSP vector          Q15*/
-    const Word16 tdm_low_rate_mode /* i  : secondary channel low rate mode flag		   Q0*/
-    ,
-    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel          Qx*/
+    Decoder_State *st_fx,           /* i/o: State structure                               */
+    const Word16 tc_subfr,          /* i  : TC subframe index                           Q0*/
+    Word16 *Aq,                     /* o  : quantized A(z) for 4 subframes             Q12*/
+    Word16 *LSF_Q_prediction,       /* o  : LSF prediction mode                         Q0*/
+    Word16 *lsf_new,                /* o  : de-quantized LSF vector               Q(x2.56)*/
+    Word16 *lsp_new,                /* o  : de-quantized LSP vector                    Q15*/
+    Word16 *lsp_mid,                /* o  : de-quantized mid-frame LSP vector          Q15*/
+    const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag		Q0*/
+    const Word16 tdm_lsfQ_PCh[M]    /* i  : Q LSFs for primary channel                  Qx*/
 );
 
 /*! r: index of the maximum value in the input vector */
@@ -6058,6 +6056,15 @@ void v_add_fixed(
     const Word16 hdrm  /* i  : headroom for when subtraction result > 1 or < -1 */
 );
 
+#ifdef VEC_ARITH_OPT_v1
+void v_add_fixed_no_hdrm(
+    const Word32 x1[], /* i  : Input vector 1                                   */
+    const Word32 x2[], /* i  : Input vector 2                                   */
+    Word32 y[],        /* o  : Output vector that contains vector 1 + vector 2  */
+    const Word16 N     /* i  : Vector length                                    */
+);
+#endif /* VEC_ARITH_OPT_v1 */
+
 void v_add_fixed_me(
     const Word32 x1[], /* i  : Input vector 1                                   */
     const Word16 x1_e, /* i  : Exponent for input vector 1                      */
@@ -6092,6 +6099,15 @@ void v_sub_fixed(
     const Word16 hdrm  /* i  : headroom for when subtraction result > 1 or < -1 */
 );
 
+#ifdef VEC_ARITH_OPT_v1
+void v_sub_fixed_no_hdrm(
+    const Word32 x1[], /* i  : Input vector 1                                   */
+    const Word32 x2[], /* i  : Input vector 2                                   */
+    Word32 y[],        /* o  : Output vector that contains vector 1 - vector 2  */
+    const Word16 N     /* i  : Vector length                                    */
+);
+#endif /* VEC_ARITH_OPT_v1 */
+
 /*! r: dot product of x[] and y[] */
 Word32 dotp_fixed(
     const Word32 x[], /* i  : vector x[]                                      */
@@ -6158,20 +6174,9 @@ void lsf_mid_dec_fx(
     Word16 lsp_mid[]      /* o  : quantized LSPs					Q15*/
 );
 
-// cng_dec_fx.c
 void CNG_dec_fx(
     Decoder_State *st_fx,           /* i/o: State structure                          */
-    const Word16 last_element_mode, /* i  : last element mode                    Q0   */
-    Word16 Aq[],                    /* o  : LP coefficients                     Q12  */
-    Word16 *lsp_new,                /* i/o: current frame LSPs                  Q15  */
-    Word16 *lsf_new,                /* i/o: current frame LSFs                  Qlog2(2.56) */
-    Word16 *allow_cn_step,          /* o  : allow CN step                       Q0   */
-    Word16 *sid_bw,                 /* i  : 0-NB/WB, 1-SWB SID                  Q0   */
-    Word32 *q_env );
-
-void CNG_dec_ivas_fx(
-    Decoder_State *st_fx,           /* i/o: State structure                          */
-    const Word16 last_element_mode, /* i  : last element mode                    Q0   */
+    const Word16 last_element_mode, /* i  : last element mode                    Q0  */
     Word16 Aq[],                    /* o  : LP coefficients                     Q12  */
     Word16 *lsp_new,                /* i/o: current frame LSPs                  Q15  */
     Word16 *lsf_new,                /* i/o: current frame LSFs                  Qlog2(2.56) */
@@ -6199,82 +6204,136 @@ void td_cng_dec_init_fx(
     DEC_CORE_HANDLE st /* i/o: decoder state structure     */
 );
 
-void td_cng_dec_init_ivas_fx(
-    DEC_CORE_HANDLE st /* i/o: decoder state structure     */
-);
-
 // wavadjust_fec_dec_fx.c
-void set_state( Word16 *state, Word16 num, Word16 N );
-void concealment_init_x( Word16 N, void *_plcInfo );
-void concealment_init_ivas_fx(
+void set_state(
+    Word16 *state,
+    Word16 num,
+    Word16 N );
+
+void concealment_init_x(
     const Word16 L_frameTCX,
     T_PLCInfo_HANDLE hPlcInfo );
-void concealment_update_x( Word16 bfi, Word16 curr_mode, Word16 harmonic, Word32 *invkoef, Word16 *invkoef_scale, void *_plcInfo );
-Word16 Sqrt_x_fast( Word32 value );
-
-Word32 dot_w32_accuracy_x( Word16 *s1, Word16 *s2, Word16 nbits, Word16 N );
-
-Word16 int_div_s_x( Word16 a, Word16 b );
-
-Word16 GetW32Norm_x( Word32 *s, Word16 N );
-
-Word16 harmo_x( Word32 *X, Word16 Framesize, Word16 pitch );
-
-void LpFilter2_x( Word16 *x, Word16 *y, Word16 N );
-
-void sig_tilt_x( Word16 *s, Word16 FrameSize, Word32 *enr1, Word32 *enr2 );
 
-void get_maxConv_and_pitch_x( Word16 *s_LP, Word16 s, Word16 e, Word16 N, Word32 *maxConv, Word16 *maxConv_bits, Word16 *pitch );
+void concealment_init_ivas_fx(
+    const Word16 L_frameTCX,
+    T_PLCInfo_HANDLE hPlcInfo );
 
-Word16 get_voicing_x( Word16 *s_LP, Word16 pitch, Word32 covMax, Word16 maxConv_bits, Word16 Framesize );
+void concealment_update_x(
+    const Word16 bfi,
+    const Word16 core,
+    const Word16 tonality,
+    Word32 *invkoef /*Qinvkoef_scale*/,
+    Word16 *invkoef_scale,
+    T_PLCInfo_HANDLE hPlcInfo );
 
-void pitch_modify_x( Word16 *s_LP, Word16 *voicing, Word16 *pitch, Word16 FrameSize );
+Word16 Sqrt_x_fast(
+    Word32 value );
 
-Word16 Is_Periodic_x( Word32 *mdct_data, Word16 cov_max, Word16 zp, Word32 ener, Word32 ener_mean, Word16 pitch, Word16 Framesize );
+Word32 dot_w32_accuracy_x(
+    Word16 *s1,
+    Word16 *s2,
+    Word16 nbits,
+    Word16 N );
 
-Word16 get_conv_relation_x( Word16 *s_LP, Word16 shift, Word16 N );
+Word16 int_div_s_x(
+    Word16 a,
+    Word16 b );
 
-void concealment_decode_fix( Word16 curr_mode, Word32 *invkoef, Word16 *invkoef_scale, void *_plcInfo );
+Word16 GetW32Norm_x(
+    Word32 *s,
+    Word16 N );
+
+Word16 harmo_x(
+    Word32 *X,
+    Word16 Framesize,
+    Word16 pitch );
+
+void LpFilter2_x(
+    Word16 *x,
+    Word16 *y,
+    Word16 N );
+
+void sig_tilt_x(
+    Word16 *s,
+    Word16 FrameSize,
+    Word32 *enr1,
+    Word32 *enr2 );
+
+void get_maxConv_and_pitch_x(
+    Word16 *s_LP,
+    Word16 s,
+    Word16 e,
+    Word16 N,
+    Word32 *maxConv,
+    Word16 *maxConv_bits,
+    Word16 *pitch );
+
+Word16 get_voicing_x(
+    Word16 *s_LP,
+    Word16 pitch,
+    Word32 covMax,
+    Word16 maxConv_bits,
+    Word16 Framesize );
+
+void pitch_modify_x(
+    Word16 *s_LP,
+    Word16 *voicing,
+    Word16 *pitch,
+    Word16 FrameSize );
+
+Word16 Is_Periodic_x(
+    Word32 *mdct_data,
+    Word16 cov_max,
+    Word16 zp,
+    Word32 ener,
+    Word32 ener_mean,
+    Word16 pitch,
+    Word16 Framesize );
+
+Word16 get_conv_relation_x(
+    Word16 *s_LP,
+    Word16 shift,
+    Word16 N );
+
+void concealment_decode_fix(
+    Word16 curr_mode,
+    Word32 *invkoef,
+    Word16 *invkoef_scale,
+    T_PLCInfo_HANDLE hPlcInfo );
 
-Word32 Spl_Energy_x( const Word16 *vector, const Word16 vector_length, Word16 *scale_factor );
+Word32 Spl_Energy_x(
+    const Word16 *vector,
+    const Word16 vector_length,
+    Word16 *scale_factor );
 
-void Log10OfEnergy_x( const Word16 *s, Word32 *enerlogval, const Word16 len );
+void Log10OfEnergy_x(
+    const Word16 *s,
+    Word32 *enerlogval,
+    const Word16 len );
 
-void concealment_update2_x( const Word16 *outx_new, void *_plcInfo, const Word16 FrameSize );
+void concealment_update2_x(
+    const Word16 *outx_new,
+    T_PLCInfo_HANDLE hPlcInfo,
+    const Word16 FrameSize );
 
-Word16 ffr_getSfWord16( Word16 *vector, /*!< Pointer to i   vector */
-                        Word16 len );
+Word16 ffr_getSfWord16(
+    Word16 *vector, /*!< Pointer to i   vector */
+    Word16 len );
 
-void waveform_adj2_fix( Word16 *overlapbuf,
-                        Word16 *outx_new,
-                        Word16 *data_noise,
-                        Word16 *outx_new_n1,
-                        Word16 *nsapp_gain,
-                        Word16 *nsapp_gain_n,
-                        Word16 *recovery_gain,
-                        Word16 step_concealgain,
-                        Word16 pitch,
-                        Word16 Framesize,
-                        Word16 delay,
-                        Word16 bfi_cnt,
-                        Word16 bfi );
+void waveform_adj2_fix(
+    T_PLCInfo_HANDLE hPlcInfo,
+    Word16 *overlapbuf,
+    Word16 *outx_new,
+    const Word16 delay,
+    const Word16 bfi_cnt,
+    const Word16 bfi );
 
-void concealment_signal_tuning_fx( Word16 bfi,
-                                   Word16 curr_mode,
-                                   Word16 *outx_new_fx,
-                                   void *_plcInfo,
-                                   Word16 nbLostCmpt,
-                                   Word16 pre_bfi,
-                                   Word16 *OverlapBuf_fx,
-                                   Word16 past_core_mode,
-                                   Word16 *outdata2_fx,
-                                   Decoder_State *st );
+void concealment_signal_tuning_fx(
+    Decoder_State *st,
+    const Word16 bfi,
+    Word16 *outx_new_fx /*Qoutx_new_fx*/,
+    const Word16 past_core );
 
-// TonalComponentDetect.c
-/* Detect tonal components in the lastMDCTSpectrum, use
- * secondLastPowerSpectrum for the precise location of the peaks and
- * store them in indexOfTonalPeak.  Updates lowerIndex, upperIndex,
- * pNumIndexes accordingly. */
 void DetectTonalComponents(
     Word16 indexOfTonalPeak[],
     Word16 lowerIndex[],
@@ -6291,19 +6350,8 @@ void DetectTonalComponents(
     const Word16 nSamples,
     const Word16 nSamplesCore,
     Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  */
-    Word16 element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
-);
+    Word16 element_mode );
 
-/* When called, the tonal components are already stored in
- * indexOfTonalPeak.  Detect tonal components in the lastMDCTSpectrum,
- * use secondLastPowerSpectrum for the precise location of the peaks and
- * then keep in indexOfTonalPeak only the tonal components that are
- * again detected Updates indexOfTonalPeak, lowerIndex, upperIndex,
- * phaseDiff, phases, pNumIndexes accordingly. */
 void RefineTonalComponents(
     Word16 indexOfTonalPeak[],
     Word16 lowerIndex[],
@@ -6322,12 +6370,7 @@ void RefineTonalComponents(
     const Word16 nSamples,
     const Word16 nSamplesCore,
     const Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  */
-    Word16 element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
-);
+    Word16 element_mode );
 
 void ivas_RefineTonalComponents_fx(
     Word16 indexOfTonalPeak[],
@@ -6344,6 +6387,7 @@ void ivas_RefineTonalComponents_fx(
     const Word16 scaleFactors_exp[],
     const Word16 scaleFactors_max_e,
     const Word32 secondLastPowerSpectrum[],
+    const Word16 secondLastPowerSpectrum_e,
     const Word16 nSamples,
     const Word16 nSamplesCore,
     const Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  */
@@ -6351,11 +6395,11 @@ void ivas_RefineTonalComponents_fx(
     const PsychoacousticParameters *psychParamsCurrent );
 
 ivas_error PsychoacousticParameters_Init(
-    const int32_t sr_core,  /* i  : sampling rate of core-coder                                     */
-    const int16_t nBins,    /* i  : Number of bins (spectral lines)                                 */
-    const int8_t nBands,    /* i  : Number of spectrum subbands                                     */
-    const int16_t isTCX20,  /* i  : Flag indicating if the subband division is for TCX20 or TCX10   */
-    const int16_t isWarped, /* i  : Flag indicating if the scale is linear or warped                */
+    const Word32 sr_core,  /* i  : sampling rate of core-coder                                     */
+    const Word16 nBins,    /* i  : Number of bins (spectral lines)                                 */
+    const Word8 nBands,    /* i  : Number of spectrum subbands                                     */
+    const Word16 isTCX20,  /* i  : Flag indicating if the subband division is for TCX20 or TCX10   */
+    const Word16 isWarped, /* i  : Flag indicating if the scale is linear or warped                */
     PsychoacousticParameters *pPsychParams );
 
 // TonalIMDCTconcealment_fx.c
@@ -6383,12 +6427,7 @@ void TonalMDCTConceal_SaveFreqSignal(
     Word16 nNewSamplesCore,
     const Word16 *scaleFactors,
     const Word16 *scaleFactors_exp,
-    const Word16 gain_tcx_exp
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    ,
-    const Word16 infoIGFStartLine
-#endif
-);
+    const Word16 gain_tcx_exp );
 
 void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
     TonalMDCTConcealPtr hTonalMDCTConc,
@@ -6401,48 +6440,25 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
     const Word16 gain_tcx_exp,
     const Word16 infoIGFStartLine );
 
-/* The call to TonalMDCTConceal_UpdateState() should be called after TonalMDCTConceal_Apply. */
-TONALMDCTCONCEAL_ERROR TonalMDCTConceal_UpdateState( TonalMDCTConcealPtr self,
-                                                     Word16 nNewSamples,
-                                                     Word32 pitchLag,
-                                                     Word16 badBlock,
-                                                     Word8 tonalConcealmentActive );
-
-/* The call to TonalMDCTConceal_SaveTimeSignal() should be at the
- * place where the TD signal corresponds to the FD signal stored with TonalMDCTConceal_SaveFreqSignal. */
-void TonalMDCTConceal_SaveTimeSignal(
-    TonalMDCTConcealPtr hTonalMDCTConc,
-    Word16 *timeSignal,
-    Word16 nNewSamples );
+void TonalMDCTConceal_UpdateState(
+    TonalMDCTConcealPtr self,
+    Word16 nNewSamples,
+    Word32 pitchLag,
+    Word16 badBlock,
+    Word8 tonalConcealmentActive );
 
-/* Calculates MDST, power spectrum and performs peak detection.
- * Uses the TD signal in pastTimeSignal; if pastTimeSignal is NULL, uses the
- * TD signal stored using TonalMDCTConceal_SaveTimeSignal.  If the
- * second last frame was also lost, it is expected that pastTimeSignal
- * could hold a signal somewhat different from the one stored in
- * TonalMDCTConceal_SaveTimeSignal (e.g. including fade-out).*/
 void TonalMDCTConceal_Detect(
     const TonalMDCTConcealPtr self, /*IN */
     const Word32 pitchLag,          /*IN */
     Word16 *umIndices,              /*OUT*/
     Word16 element_mode             /* IN */
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
 );
 
-/* Conceals the lost frame using the FD signal previously stored using
- * TonalMDCTConceal_SaveFreqSignal.  Stores the concealed harmonic part of
- * the signal in mdctSpectrum, the rest of the spectrum is unchanged. */
 void TonalMDCTConceal_Apply(
-    const TonalMDCTConcealPtr hTonalMDCTConc,     /*IN */
-    Word32* mdctSpectrum,         /*IN/OUT*/
-    Word16* mdctSpectrum_exp      /*IN */
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    , const PsychoacousticParameters* psychParamsCurrent)
-#endif
-   );
+    const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
+    Word32 *mdctSpectrum,                     /*IN/OUT*/
+    Word16 *mdctSpectrum_exp                  /*IN */
+);
 
 void TonalMDCTConceal_Apply_ivas_fx(
     TonalMDCTConcealPtr hTonalMDCTConc,  /*IN */
@@ -6450,9 +6466,6 @@ void TonalMDCTConceal_Apply_ivas_fx(
     Word16 mdctSpectrum_exp[L_FRAME48k], /*IN */
     const PsychoacousticParameters *psychParamsCurrent );
 
-/* Conceals the lost frame using the FD signal previously stored using
- * TonalMDCTConceal_SaveFreqSignal.  Stores the concealed noise part of
- * the signal in mdctSpectrum, the rest of the spectrum is unchanged. */
 void TonalMDCTConceal_InsertNoise_ivas_fx(
     const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
     Word32 *mdctSpectrum,
@@ -6467,10 +6480,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
     const Word16 cngLevelBackgroundTrace_e,
     const Word16 crossOverFreq );
 
-
-/* Conceals the lost frame using the FD signal previously stored using
- * TonalMDCTConceal_SaveFreqSignal.  Stores the concealed noise part of
- * the signal in mdctSpectrum, the rest of the spectrum is unchanged. */
 void TonalMDCTConceal_InsertNoise(
     const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
     Word32 *mdctSpectrum,                     /*OUT*/
@@ -6479,28 +6488,13 @@ void TonalMDCTConceal_InsertNoise(
     Word16 *pSeed, /*IN/OUT*/
     const Word16 tiltCompFactor,
     Word16 crossfadeGain,
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    const Word16concealment_noise[L_FRAME48k],
-#endif
     const Word16 crossOverFreq );
-/* Conceals the lost frame using the FD signal previously stored using
- * TonalMDCTConceal_SaveFreqSignal.  Stores the concealed harmonic part of
- * the signal in mdctSpectrum, the rest of the spectrum is unchanged. */
-void TonalMDCTConceal_Apply(
-  const TonalMDCTConcealPtr hTonalMDCTConc,     /*IN */
-  Word32* mdctSpectrum,         /*IN/OUT*/
-  Word16* mdctSpectrum_exp      /*IN */
-#ifdef IVAS_CODE_MDCT_GSHAPE
-  , const PsychoacousticParameters* psychParamsCurrent)
-#endif
-  );
 
-/* The call to TonalMDCTConceal_SaveTimeSignal() should be at the
- * place where the TD signal corresponds to the FD signal stored with TonalMDCTConceal_SaveFreqSignal. */
 void TonalMDCTConceal_SaveTimeSignal(
     TonalMDCTConcealPtr hTonalMDCTConc,
     Word16 *timeSignal,
     Word16 nNewSamples );
+
 void TonalMDCTConceal_SaveTimeSignal_ivas_fx(
     TonalMDCTConcealPtr hTonalMDCTConc,
     Word16 *timeSignal,
@@ -6532,12 +6526,7 @@ void hf_synth_fx(
     Word16 *synth,                 /* i  : 12.8kHz synthesis signal		 Q_syn2*/
     Word16 *synth16k,              /* o  : 16kHz synthesis signal        Q_syn2*/
     const Word16 Q_exc,            /* i  : excitation scaling             */
-    const Word16 Q_syn2,           /* i  : synthesis scaling              */
-    Word16 *delay_syn_hf,          /*i/o: HF synthesis memory            Q_syn2*/
-    Word16 *memExp1,               /* o  : HF excitation exponent         */
-    Word16 *mem_hp_interp,         /* i/o: interpol. memory               Qx*/
-    const Word16 extl,             /* i  : flag indicating BWE            Q0*/
-    const Word16 CNG_mode          /* i  : CNG_mode                       Q0*/
+    const Word16 Q_syn2            /* i  : synthesis scaling              */
 );
 
 void hf_synth_amr_wb_init_fx(
@@ -6572,42 +6561,31 @@ void hf_synth_amr_wb_fx(
 // dec_post_fx
 void Init_post_filter_fx(
     PFSTAT_HANDLE hPFstat /* i : core decoder parameters */
-);                        /* (i)   : core decoder parameters */
+);                        /* i : core decoder parameters */
 
 
 void nb_post_filt_fx(
     const Word16 L_frame,    /* i  : frame length                            */
-    PFSTAT_HANDLE hPFstat,   /* i : core decoder parameters */
+    PFSTAT_HANDLE hPFstat,   /* i : core decoder parameters                  */
     Word16 *psf_lp_noise,    /* i  : Long term noise                   Q8    */
     const Word16 tmp_noise,  /* i  : noise energy                       Q0   */
     Word16 *Synth,           /* i  : 12k8 synthesis                    Qsyn  */
     const Word16 *Aq,        /* i  : LP filter coefficient             Q12   */
-    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q6    */
+    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q0    */
     const Word16 coder_type, /* i  : coder_type                              */
     const Word16 BER_detect, /* i  : BER detect flag                         */
     const Word16 disable_hpf /* i  : flag to diabled HPF                     */
 );
 
 void formant_post_filt_fx(
-    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
-    Word16 *synth_in,      /* i  : 12k8 synthesis                    */
-    Word16 *Aq,            /* i  : LP filter coefficient             */
-    Word16 *synth_out,     /* i/o: i   signal                      */
-    Word16 L_frame,
-    Word32 lp_noise,      /* (i) : background noise energy (15Q16) */
-    Word32 rate,          /* (i) : bit-rate */
-    const Word16 off_flag /* i  : off flag                        */
-);
-
-void formant_post_filt_ivas_fx(
-    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
+    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters            */
     Word16 *synth_in,      /* i  : 12k8 synthesis                    */
-    Word16 *Aq,            /* i  : LP filter coefficient             */
-    Word16 *synth_out,     /* i/o: i   signal                      */
-    Word16 L_frame,
-    Word32 lp_noise,      /* (i) : background noise energy (15Q16) */
-    Word32 rate,          /* (i) : bit-rate */
-    const Word16 off_flag /* i  : off flag                        */
+    Word16 *Aq,            /* i  : LP filter coefficient Q12         */
+    Word16 *synth_out,     /* i/o: input signal                      */
+    const Word16 L_frame,  /* i  : frame length                      */
+    const Word32 lp_noise, /* (i) : background noise energy (15Q16)  */
+    const Word32 brate,    /* (i) : bit-rate                         */
+    const Word16 off_flag  /* i  : off flag                          */
 );
 void Filt_mu_fx(
     Word16 *sig_in,  /* i  : signal (beginning at sample -1)     */
@@ -6773,33 +6751,17 @@ void PulseResynchronization_fx(
     Word32 /*float*/ const pitchEnd        /*i   Q16*/
 );
 
-// gs_dec_fx.c
 void decod_audio_fx(
-    Decoder_State *st_fx,  /* i/o: decoder static memory                     */
-    Word16 dct_epit[],     /* o  : GSC excitation in DCT domain              Qx*/
-    const Word16 *Aq,      /* i  : LP filter coefficient                     Q12*/
-    Word16 *pitch_buf,     /* o  : floating pitch values for each subframe   Q6*/
-    Word16 *voice_factors, /* o  : voicing factors                           Q15*/
-    Word16 *exc,           /* i/o: adapt. excitation exc                     Q_exc*/
-    Word16 *exc2,          /* i/o: adapt. excitation/total exc               Q_exc*/
-    Word16 *bwe_exc,       /* o  : excitation for SWB TBE                    Q_exc*/
-    Word16 *lsf_new        /* i  : ISFs at the end of the frame              Qx*/
-    ,
-    Word16 *gain_buf /*Q14*/
-);
-
-void decod_audio_ivas_fx(
-    Decoder_State *st_fx,  /* i/o: decoder static memory						*/
-    Word16 dct_epit[],     /* o  : GSC excitation in DCT domain              Qx*/
-    const Word16 *Aq,      /* i  : LP filter coefficient                     Q12*/
-    Word16 *pitch_buf,     /* o  : Word16 pitch values for each subframe      Q6*/
-    Word16 *voice_factors, /* o  : voicing factors                           Q15*/
-    Word16 *exc,           /* i/o: adapt. excitation exc                     Q_exc*/
-    Word16 *exc2,          /* i/o: adapt. excitation/total exc               Q_exc*/
-    Word16 *bwe_exc,       /* o  : excitation for SWB TBE                    Q_exc*/
-    Word16 *lsf_new        /* i  : ISFs at the end of the frame              Qx*/
-    ,
-    Word16 *gain_buf,                  /*Q14*/
+    Decoder_State *st_fx,              /* i/o: decoder static memory						*/
+    Word16 dct_epit[],                 /* o  : GSC excitation in DCT domain              Qx*/
+    const Word16 *Aq,                  /* i  : LP filter coefficient                     Q12*/
+    Word16 *pitch_buf,                 /* o  : Word16 pitch values for each subframe     Q6*/
+    Word16 *voice_factors,             /* o  : voicing factors                           Q15*/
+    Word16 *exc,                       /* i/o: adapt. excitation exc                     Q_exc*/
+    Word16 *exc2,                      /* i/o: adapt. excitation/total exc               Q_exc*/
+    Word16 *bwe_exc,                   /* o  : excitation for SWB TBE                    Q_exc*/
+    Word16 *lsf_new,                   /* i  : ISFs at the end of the frame              Qx*/
+    Word16 *gain_buf,                  /* o  : Word16 pitch gain for each subframe		 Q14*/
     const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag                            Q0*/
     const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag      Q0*/
     const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          Q0*/
@@ -6807,29 +6769,16 @@ void decod_audio_ivas_fx(
 );
 
 void gsc_dec_fx(
-    Decoder_State *st_fx,      /* i/o: State structure                                     */
-    Word16 exc_dct_in[],       /* i/o: dct of pitch-only excitation / total excitation     Q_exc*/
-    const Word16 pit_band_idx, /* i  : bin position of the cut-off frequency               Q0*/
-    const Word16 Diff_len,     /* i  : Lenght of the difference signal (before pure spectral)	Q0*/
-    const Word16 bits_used,    /* i  : Number of bit used before frequency Q               Q0*/
-    const Word16 nb_subfr,     /* i  : Number of subframe considered                       Q0*/
-    const Word16 coder_type,   /* i  : coding type                                         Q0*/
-    Word16 *last_bin,          /* i  : last bin of bit allocation                          Q0*/
-    const Word16 *lsf_new,     /* i  : ISFs at the end of the frame                        Qx*/
-    Word16 *exc_wo_nf,         /* o  : excitation (in f domain) without noisefill          Q_exc*/
-    Word16 Q_exc );
-
-void gsc_dec_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: State structure                                     */
-    Word16 exc_dct_in[],       /* i/o: dct of pitch-only excitation / total excitation     Q_exc*/
+    Decoder_State *st_fx,      /* i/o: State structure                                            */
+    Word16 exc_dct_in[],       /* i/o: dct of pitch-only excitation / total excitation       Q_exc*/
     const Word16 pit_band_idx, /* i  : bin position of the cut-off frequency               `	Q0*/
     const Word16 Diff_len,     /* i  : Lenght of the difference signal (before pure spectral)	Q0*/
     const Word16 bits_used,    /* i  : Number of bit used before frequency Q					Q0*/
     const Word16 nb_subfr,     /* i  : Number of subframe considered							Q0*/
     const Word16 coder_type,   /* i  : coding type												Q0*/
     Word16 *last_bin,          /* i  : last bin of bit allocation								Q0*/
-    const Word16 *lsf_new,     /* i  : ISFs at the end of the frame                        Qx*/
-    Word16 *exc_wo_nf,         /* o  : excitation (in f domain) without noisefill          Q_exc*/
+    const Word16 *lsf_new,     /* i  : ISFs at the end of the frame                             Qx*/
+    Word16 *exc_wo_nf,         /* o  : excitation (in f domain) without noisefill            Q_exc*/
     Word16 *Q_exc );
 
 void GSC_dec_init(
@@ -6840,18 +6789,15 @@ void GSC_dec_init_ivas_fx(
     GSC_DEC_HANDLE hGSCDec /* i/o: GSC data handle  */
 );
 
-
-// gain_dec_fx.c
-
 void Es_pred_dec_fx(
-    Word16 *Es_pred,      /* o  : predicited scaled innovation energy       Q8*/
-    const Word16 enr_idx, /* i  : indice                              */
-    const Word16 nb_bits, /* i  : number of bits                      */
-    const Word16 no_ltp   /* i  : no LTP flag                         */
+    Word16 *Es_pred,      /* o  : predicited scaled innovation energy     Q8*/
+    const Word16 enr_idx, /* i  : indice                                    */
+    const Word16 nb_bits, /* i  : number of bits                            */
+    const Word16 no_ltp   /* i  : no LTP flag                               */
 );
 
 void gain_dec_tc_fx(
-    Decoder_State *st_fx,     /* i/o: decoder state structure */
+    Decoder_State *st_fx,     /* i/o: decoder state structure             */
     const Word16 *code_fx,    /* i  : algebraic code excitation           */
     const Word16 i_subfr_fx,  /* i  : subframe number                     */
     const Word16 Es_pred_fx,  /* i  :  predicted scaled innov. energy     */
@@ -6896,24 +6842,8 @@ void gain_dec_lbr_fx(
     Word16 *gain_inov_fx,      /* o  : gain of the innovation (used for normalization)              Q12*/
     Word32 *norm_gain_code_fx, /* o  : norm. gain of the codebook excitation                        Q16*/
     Word32 gc_mem[],           /* i/o: gain_code from previous subframes                               */
-    Word16 gp_mem[]            /* i/o: gain_pitch from previous subframes                              */
-    ,
-    const Word16 L_subfr /* i  : subfr lenght                                                    */
-);
-
-void gain_dec_lbr_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: decoder state structure                                         */
-    const Word16 coder_type,   /* i  : coding type                                                     */
-    const Word16 i_subfr,      /* i  : subframe index                                                  */
-    const Word16 *code_fx,     /* i  : algebraic excitation                                         Q9 */
-    Word16 *gain_pit_fx,       /* o  : quantized pitch gain                                         Q14*/
-    Word32 *gain_code_fx,      /* o  : quantized codebook gain                                      Q16*/
-    Word16 *gain_inov_fx,      /* o  : gain of the innovation (used for normalization)              Q12*/
-    Word32 *norm_gain_code_fx, /* o  : norm. gain of the codebook excitation                        Q16*/
-    Word32 gc_mem[],           /* i/o: gain_code from previous subframes                               */
-    Word16 gp_mem[]            /* i/o: gain_pitch from previous subframes                              */
-    ,
-    const Word16 L_subfr /* i  : subfr lenght                                                    */
+    Word16 gp_mem[],           /* i/o: gain_pitch from previous subframes                              */
+    const Word16 L_subfr       /* i  : subfr lenght                                                    */
 );
 
 void lp_gain_updt_fx(
@@ -6934,13 +6864,14 @@ void lp_gain_updt_ivas_fx(
     const Word16 L_frame         /* i  : length of the frame         */
 );
 
-Word32 gain_dec_gaus_fx(                             /* o  : quantized codebook gain                Q16  */
-                         Word16 index,               /* i  : quantization index                          */
-                         const Word16 bits,          /* i  : number of bits to quantize                  */
-                         const Word16 lowBound,      /* i  : lower bound of quantizer (dB)               */
-                         const Word16 topBound,      /* i  : upper bound of quantizer (dB)               */
-                         const Word16 inv_gain_inov, /* o  : unscaled innovation gain                Q12 */
-                         Word32 *L_norm_gain_code    /* o  : gain of normalized gaussian excitation  Q16 */
+/*! r: quantized codebook gain    Q16  */
+Word32 gain_dec_gaus_fx(
+    Word16 index,               /* i  : quantization index                          */
+    const Word16 bits,          /* i  : number of bits to quantize                  */
+    const Word16 lowBound,      /* i  : lower bound of quantizer (dB)               */
+    const Word16 topBound,      /* i  : upper bound of quantizer (dB)               */
+    const Word16 inv_gain_inov, /* o  : unscaled innovation gain                Q12 */
+    Word32 *L_norm_gain_code    /* o  : gain of normalized gaussian excitation  Q16 */
 );
 
 void gain_dec_SQ_fx(
@@ -7034,43 +6965,19 @@ void re8_PPV_fx(
     Word16 y[]        /* o  : point in RE8 (8-dimensional integer vector)	Q0  */
 );
 
-// dec_pit_exc_fx.c
 void dec_pit_exc_fx(
-    Decoder_State *st_fx,    /* i/o: decoder static memory                     */
-    const Word16 *Aq_fx,     /* i  : LP filter coefficient                     */
-    const Word16 coder_type, /* i  : coding type                               */
-    const Word16 Es_pred_fx, /* i  : predicted scaled innov. energy            */
-    Word16 *pitch_buf_fx,    /* o  : floating pitch values for each subframe   */
-    Word16 *code_fx,         /* o  : innovation                                */
-    Word16 *exc_fx,          /* i/o: adapt. excitation exc                     */
-    Word16 *bwe_exc_fx,      /* o  : excitation for SWB TBE                    */
-    const Word16 nb_subfr_fx /* i  : Number of subframe considered             */
-    ,
-    Word16 *gain_buf /*Q14*/
-#ifdef ADD_LRTD
-    ,
+    Decoder_State *st_fx,              /* i/o: decoder static memory                     */
+    const Word16 *Aq_fx,               /* i  : LP filter coefficient                     */
+    const Word16 coder_type,           /* i  : coding type                               */
+    const Word16 Es_pred_fx,           /* i  : predicted scaled innov. energy            */
+    Word16 *pitch_buf_fx,              /* o  : floating pitch values for each subframe   */
+    Word16 *code_fx,                   /* o  : innovation                                */
+    Word16 *exc_fx,                    /* i/o: adapt. excitation exc                     */
+    Word16 *bwe_exc_fx,                /* o  : excitation for SWB TBE                    */
+    const Word16 nb_subfr_fx,          /* i  : Number of subframe considered             */
+    Word16 *gain_buf,                  /* o  : Word16 pitch gain for each subframe	  Q14*/
     const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
     const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              */
-#endif
-);
-
-void dec_pit_exc_ivas_fx(
-    Decoder_State *st_fx,    /* i/o: decoder static memory                     */
-    const Word16 *Aq_fx,     /* i  : LP filter coefficient                     */
-    const Word16 coder_type, /* i  : coding type                               */
-    const Word16 Es_pred_fx, /* i  : predicted scaled innov. energy            */
-    Word16 *pitch_buf_fx,    /* o  : floating pitch values for each subframe   */
-    Word16 *code_fx,         /* o  : innovation                                */
-    Word16 *exc_fx,          /* i/o: adapt. excitation exc                     */
-    Word16 *bwe_exc_fx,      /* o  : excitation for SWB TBE                    */
-    const Word16 nb_subfr_fx /* i  : Number of subframe considered             */
-    ,
-    Word16 *gain_buf /*Q14*/
-#if 1                // def ADD_LRTD
-    ,
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
-    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              */
-#endif
 );
 
 // pit_dec_fx.c
@@ -7112,41 +7019,22 @@ void Mode2_delta_pit_dec(
     Word16 **pt_indice   /* i/o: pointer to Vector of Q indexes */
 );
 
-Word16 pit_decode_fx(                          /* o  : floating pitch value                    */
-                      Decoder_State *st_fx,    /* i/o: decoder state structure                 */
-                      const Word32 core_brate, /* i  : core bitrate                            */
-                      const Word16 Opt_AMR_WB, /* i  : flag indicating AMR-WB IO mode          */
-                      const Word16 L_frame,    /* i  : length of the frame                     */
-                      Word16 i_subfr,          /* i  : subframe index                          */
-                      const Word16 coder_type, /* i  : coding type                             */
-                      Word16 *limit_flag,      /* i/o: restrained(0) or extended(1) Q limits   */
-                      Word16 *T0,              /* o  : close loop integer pitch                */
-                      Word16 *T0_frac,         /* o  : close loop fractional part of the pitch */
-                      Word16 *T0_min,          /* i/o: delta search min for sf 2 & 4           */
-                      Word16 *T0_max,          /* i/o: delta search max for sf 2 & 4           */
-                      const Word16 L_subfr     /* i  : subframe length                         */
-#ifdef ADD_LRTD
-                      ,
-                      const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag                */
-                      const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer                    */
-#endif
-);
-
-Word16 pit_decode_ivas_fx(                                    /* o  : floating pitch value                    */
-                           Decoder_State *st_fx,              /* i/o: decoder state structure                 */
-                           const Word32 core_brate,           /* i  : core bitrate                            */
-                           const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode          */
-                           const Word16 L_frame,              /* i  : length of the frame                     */
-                           Word16 i_subfr,                    /* i  : subframe index                          */
-                           const Word16 coder_type,           /* i  : coding type                             */
-                           Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits   */
-                           Word16 *T0,                        /* o  : close loop integer pitch                */
-                           Word16 *T0_frac,                   /* o  : close loop fractional part of the pitch */
-                           Word16 *T0_min,                    /* i/o: delta search min for sf 2 & 4           */
-                           Word16 *T0_max,                    /* i/o: delta search max for sf 2 & 4           */
-                           const Word16 L_subfr,              /* i  : subframe length                         */
-                           const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag        */
-                           const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer         Q6 */
+/* o  : floating pitch value */
+Word16 pit_decode_fx(
+    Decoder_State *st_fx,              /* i/o: decoder state structure                 */
+    const Word32 core_brate,           /* i  : core bitrate                            */
+    const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode          */
+    const Word16 L_frame,              /* i  : length of the frame                     */
+    Word16 i_subfr,                    /* i  : subframe index                          */
+    const Word16 coder_type,           /* i  : coding type                             */
+    Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits   */
+    Word16 *T0,                        /* o  : close loop integer pitch                */
+    Word16 *T0_frac,                   /* o  : close loop fractional part of the pitch */
+    Word16 *T0_min,                    /* i/o: delta search min for sf 2 & 4           */
+    Word16 *T0_max,                    /* i/o: delta search max for sf 2 & 4           */
+    const Word16 L_subfr,              /* i  : subframe length                         */
+    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag        */
+    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer         Q6 */
 );
 
 void pit_Q_dec_fx(
@@ -7493,21 +7381,7 @@ void configureFdCngDec_fx(
     const Word16 Last_L_frame,
     const Word16 element_mode );
 
-/* Apply the CLDFB-based CNG */
 Word16 ApplyFdCng_fx(
-    Word16 *timeDomainInput, /* i  : pointer to time domain i   */
-    Word16 Q,
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    Word16 *powerSpectrum,
-#endif
-    Word32 **cldfbBufferReal, /* i/o: real part of the CLDFB buffer */
-    Word32 **cldfbBufferImag, /* i/o: imaginary part of the CLDFB buffer */
-    Word16 *cldfbBufferScale, /* o  : pointer to the scalefactor for real and imaginary part of the CLDFB buffer */
-    Decoder_State *st,
-    const Word16 concealWholeFrame, /* i  : binary flag indicating frame loss */
-    Word16 is_music );
-
-Word16 ApplyFdCng_ivas_fx(
     Word16 *timeDomainInput, /* i  : pointer to time domain input */
     Word16 Q,
     Word32 *powerSpectrum,
@@ -7523,19 +7397,7 @@ Word16 ApplyFdCng_ivas_fx(
 void perform_noise_estimation_dec_fx(
     const Word16 *timeDomainInput, /* i:   pointer to time domain i   */
     const Word16 Q,
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    float *power_spectrum,
-#endif
     HANDLE_FD_CNG_DEC hFdCngDec /* i/o: FD_CNG structure containing all buffers and variables */
-#ifdef IVAS_CODE_CNG
-    ,
-    const Word16 element_mode,    /* i  : element mode                                          */
-    const Word16 bwidth,          /* i  : audio bandwidth                                       */
-    const Word16 L_frame,         /* i  : frame length at internal Fs                           */
-    const Word16 last_L_frame,    /* i  : frame length of the last frame at internal Fs         */
-    const Word32 last_core_brate, /* i  : previous frame core bitrate                           */
-    const Word16 VAD              /* i  : VAD flag in the decoder                               */
-#endif
 );
 
 void perform_noise_estimation_dec_ivas_fx(
@@ -7648,19 +7510,12 @@ Word16 WB_BWE_gain_deq_fx(
 );
 
 Word16 wb_bwe_dec_fx(
-#ifdef ADD_IVAS_BWE
-    const Word16 output[], /* i  : suntehsis @ internal Fs */
-#endif
-    Word16 *synth_fx,    /* i/o: ACELP core synthesis/final synthesis   Q0/Qpost */
-    Word16 *hb_synth_fx, /* o  : SHB synthesis/final synthesis          Q_syn_hb */
-#ifdef ADD_IVAS_BWE
-    const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo     */
-#endif
+    Word16 *synth_fx,            /* i/o: ACELP core synthesis/final synthesis   Q0/Qpost */
+    Word16 *hb_synth_fx,         /* o  : SHB synthesis/final synthesis          Q_syn_hb */
     const Word16 output_frame,   /* i  : frame length                            */
     Word16 *voice_factors_fx,    /* i  : voicing factors                 Q15        */
     const Word16 pitch_buf_fx[], /* i  : pitch buffer                      Q6      */
-    Decoder_State *st_fx         /* i/o: decoder state structure                 */
-    ,
+    Decoder_State *st_fx,        /* i/o: decoder state structure                 */
     Word16 *Qpost );
 
 Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class                           */
@@ -7672,18 +7527,11 @@ Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class
                             const Word16 hqswb_clas /* i  : HQ BWE class                        */
 );
 
-Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
-#ifdef ADD_IVAS_BWE
-                       const Word16 output[], /* i  : suntehsis @ internal Fs */
-#endif
-                       Decoder_State *st_fx, /* i/o: decoder state structure                 */
-                       Word16 *synth_fx,     /* i/o: ACELP core synthesis/final synthesis (might be rescaled inside wtda() )   Q0/Qpost */
-                       Word16 *hb_synth_fx,  /* o  : SHB synthesis/final synthesis          Q_syn_hb */
-#ifdef ADD_IVAS_BWE
-                       const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo     */
-#endif
-                       const Word16 output_frame /* i  : frame length                            */
-                       ,
+Word16 swb_bwe_dec_fx(                            /*o :Q_syn_hb*/
+                       Decoder_State *st_fx,      /* i/o: decoder state structure                 */
+                       Word16 *synth_fx,          /* i/o: ACELP core synthesis/final synthesis (might be rescaled inside wtda() )   Q0/Qpost */
+                       Word16 *hb_synth_fx,       /* o  : SHB synthesis/final synthesis          Q_syn_hb */
+                       const Word16 output_frame, /* i  : frame length                            */
                        Word16 *Qpost );
 
 void fd_bwe_dec_init(
@@ -7959,22 +7807,12 @@ ivas_error core_switching_pre_dec_fx(
 );
 
 ivas_error core_switching_post_dec_fx(
-    Decoder_State *st_fx, /* i/o: decoder state structure     */
-    Word16 *synth,        /* i/o: output synthesis Qsynth     Qsynth*/
-#ifdef IVAS_CODE_SWITCHING
-    float *output,                  /* i/o: LB synth/upsampled LB synth         */
-    float output_mem[],             /* i  : OLA memory from last TCX/HQ frame   */
-    const IVAS_FORMAT ivas_format,  /* i  : IVAS format                         */
-    const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo */
-#endif
+    Decoder_State *st_fx,             /* i/o: decoder state structure     */
+    Word16 *synth,                    /* i/o: output synthesis Qsynth     Qsynth*/
     const Word16 output_frame,        /* i  : frame length                Q0*/
     const Word16 core_switching_flag, /* i  : ACELP->HQ switching flag    Q0*/
-#ifdef IVAS_CODE_SWITCHING
-    const Word16 sba_dirac_stereo_flag, /* i  : signal stereo output for SBA DirAC  */
-    const Word16 nchan_out,             /* i  : number of output channels           */
-#endif
-    const Word16 last_element_mode, /* i  : element mode of previous frame      Q0*/
-    Word16 *Qsynth                  /* i/o: Scaling of ACELP exit (Q_syn2-1) or HQ exit (Qsynth); changes after this function */
+    const Word16 last_element_mode,   /* i  : element mode of previous frame      Q0*/
+    Word16 *Qsynth                    /* i/o: Scaling of ACELP exit (Q_syn2-1) or HQ exit (Qsynth); changes after this function */
 );
 
 ivas_error core_switching_post_dec_ivas_fx(
@@ -7982,7 +7820,6 @@ ivas_error core_switching_post_dec_ivas_fx(
     Word16 *synth,                      /* i/o: output synthesis                                                            Qsynth*/
     Word32 *output_fx,                  /* i/o: LB synth/upsampled LB synth														Q4*/
     Word16 output_mem_fx[],             /* i  : OLA memory from last TCX/HQ frame                                               Qx*/
-    const IVAS_FORMAT ivas_format,      /* i  : IVAS format                                                                       */
     const Word16 use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo                                             Q0*/
     const Word16 output_frame,          /* i  : frame length                                                                    Q0*/
     const Word16 core_switching_flag,   /* i  : ACELP->HQ switching flag                                                        Q0*/
@@ -8133,13 +7970,11 @@ void FEC_pitch_estim_fx(
     const Word32 old_pitch_buf[], /* i  : buffer of old subframe pitch values 15Q16  */
     Word16 *bfi_pitch,            /* i/o: update of the estimated pitch for FEC      */
     Word16 *bfi_pitch_frame,      /* o  : frame length when pitch was updated        */
-    Word16 *upd_cnt               /* i/o: update counter                             */
-    ,
-    const Word16 coder_type, /* i  : coder_type                                 */
-    Word16 element_mode      /* i  : element mode                                  */
+    Word16 *upd_cnt,              /* i/o: update counter                             */
+    const Word16 coder_type,      /* i  : coder_type                                 */
+    Word16 element_mode           /* i  : element mode                               */
 );
 
-// FEC_scale_sync_fx.c
 void FEC_scale_syn_fx(
     const Word16 L_frame,          /* i  : length of the frame                     */
     Word16 *update_flg,            /* o: flag indicating re-synthesis after scaling*/
@@ -8166,66 +8001,37 @@ void FEC_scale_syn_fx(
     Word16 *mem_syn,               /* o:   initial synthesis filter states         */
     Word16 Q_exc,
     Word16 Q_syn,
+    const Word16 element_mode,                /* i  : element mode                            */
     const Word16 avoid_lpc_burst_on_recovery, /* i  : if true the excitation energy is limited if LP has big gain */
-    const Word16 force_scaling                /* i: force scaling                             */
-);
-
-void FEC_scale_syn_ivas_fx(
-    const Word16 L_frame,          /* i  : length of the frame                     */
-    Word16 *update_flg,            /* o: flag indicating re-synthesis after scaling*/
-    Word16 clas,                   /* i/o: frame classification                    */
-    const Word16 last_good,        /* i:   last good frame classification          */
-    Word16 *synth,                 /* i/o: synthesized speech at Fs = 12k8 Hz      */
-    const Word16 *pitch,           /* i:   pitch values for each subframe          */
-    Word32 L_enr_old,              /* i:   energy at the end of previous frame     */
-    Word32 L_enr_q,                /* i:   transmitted energy for current frame    */
-    const Word16 coder_type,       /* i:   coder type                              */
-    const Word16 LSF_Q_prediction, /* i  : LSF prediction mode                     */
-    Word16 *scaling_flag,          /* i/o: flag to indicate energy control of syn  */
-    Word32 *lp_ener_FEC_av,        /* i/o: averaged voiced signal energy           */
-    Word32 *lp_ener_FEC_max,       /* i/o: averaged voiced signal energy           */
-    const Word16 bfi,              /* i:   current  frame BFI                      */
-    const Word32 total_brate,      /* i:   total bitrate                           */
-    const Word16 prev_bfi,         /* i:   previous frame BFI                      */
-    const Word32 last_core_brate,  /* i:   previous frame core bitrate             */
-    Word16 *exc,                   /* i/o: excitation signal without enhancement   */
-    Word16 *exc2,                  /* i/o: excitation signal with enhancement      */
-    Word16 Aq[],                   /* i/o: LP filter coefs (can be modified if BR) */
-    Word16 *old_enr_LP,            /* i/o: LP filter E of last good voiced frame   */
-    const Word16 *mem_tmp,         /* i:   temp. initial synthesis filter states   */
-    Word16 *mem_syn,               /* o:   initial synthesis filter states         */
-    Word16 Q_exc,
-    Word16 Q_syn,
-    const Word16 avoid_lpc_burst_on_recovery, /* i  : if true the excitation energy is limited if LP has big gain */
-    const Word16 force_scaling                /* i: force scaling                             */
+    const Word16 force_scaling                /* i  : force scaling                           */
 );
 
 // LD_music_post_filter_fx.c
 void LD_music_post_filter_fx(
-    MUSIC_POSTFILT_HANDLE hMusicPF, /* i/o: LD music postfilter handle */
-    const Word16 dtc_in[],          /* i   : i   synthesis                       Qdct   */
-    Word16 dtc_out[],               /* o   : output synthesis                      Qdct   */
-    const Word32 core_brate,        /* i   : core bitrate                             Q0  */
-    Word16 *Old_ener_Q,             /* i/o : Old energy scaling factor             */
-    const Word16 coder_type,        /* i   : Coder type : -1 in case of IO            Q0  */
-    const Word16 Last_coder_type,   /* i   : i   scaling                            Q0  */
-    const Word16 Qdct               /* i   : i   scaling                            Q0  */
+    MUSIC_POSTFILT_HANDLE hMusicPF, /* i/o: LD music postfilter handle                */
+    const Word16 dtc_in[],          /* i  : i   synthesis                      Qdct   */
+    Word16 dtc_out[],               /* o  : output synthesis                   Qdct   */
+    const Word32 core_brate,        /* i  : core bitrate                          Q0  */
+    Word16 *Old_ener_Q,             /* i/o: Old energy scaling factor                 */
+    const Word16 coder_type,        /* i  : Coder type : -1 in case of IO         Q0  */
+    const Word16 Last_coder_type,   /* i  : i   scaling                           Q0  */
+    const Word16 Qdct               /* i  : i   scaling                           Q0  */
 );
 
 void Prep_music_postP_fx(
-    Word16 exc_buffer_in[],    /* i/o: excitation buffer   Q_exc*/
-    Word16 dct_buffer_out[],   /* o  : DCT output buffer   (qdct)*/
-    Word16 filt_lfE[],         /* i/o: long term spectrum energy Q15 */
-    const Word16 last_core,    /* i  : last core  */
-    const Word16 element_mode, /* i  : element mode  */
-    const Word16 *pitch_buf,   /* i  : current frame pitch information Q6*/
-    Word16 *LDm_enh_lp_gbin,   /* o  : smoothed suppression gain, per bin FFT Q15*/
-    const Word16 Q_exc,        /* i  : excitation scaling         */
-    Word16 *qdct               /* o  : Scaling factor of dct coefficient */
+    Word16 exc_buffer_in[],    /* i/o: excitation buffer                       Q_exc*/
+    Word16 dct_buffer_out[],   /* o  : DCT output buffer                      (qdct)*/
+    Word16 filt_lfE[],         /* i/o: long term spectrum energy                Q15 */
+    const Word16 last_core,    /* i  : last core                                    */
+    const Word16 element_mode, /* i  : element mode                                 */
+    const Word16 *pitch_buf,   /* i  : current frame pitch information            Q6*/
+    Word16 *LDm_enh_lp_gbin,   /* o  : smoothed suppression gain, per bin FFT    Q15*/
+    const Word16 Q_exc,        /* i  : excitation scaling                           */
+    Word16 *qdct               /* o  : Scaling factor of dct coefficient            */
 );
 
 void Post_music_postP_fx(
-    Word16 dct_buffer_in[],          /* i/o: excitation buffer */
+    Word16 dct_buffer_in[],          /* i/o: excitation buffer                   */
     Word16 *exc2,                    /* i/o: Current excitation to be overwriten */
     const Word16 *mem_tmp,           /* i  : previous frame synthesis memory     */
     Word16 *st_mem_syn2,             /* i/o: current frame synthesis memory      */
@@ -8235,15 +8041,14 @@ void Post_music_postP_fx(
     Word16 *prev_Q_syn,              /* i  : previsous frame synthesis scaling   */
     Word16 *Q_syn,                   /* i  : Current frame synthesis scaling     */
     Word16 *mem_syn_clas_estim_fx,   /* i  : old 12k8 synthesis used for frame classification*/
-    const Word16 IsIO,               /* i: Flag to indicate IO mode */
-    Word16 *mem_deemph,              /* i/o: speech deemph filter memory                 */
-    Word16 *st_pst_old_syn_fx,       /* i/o:  psfiler                                     */
-    Word16 *st_pst_mem_deemp_err_fx, /* i/o:  psfiler                                     */
+    const Word16 IsIO,               /* i  : Flag to indicate IO mode            */
+    Word16 *mem_deemph,              /* i/o: speech deemph filter memory         */
+    Word16 *st_pst_old_syn_fx,       /* i/o:  psfiler                            */
+    Word16 *st_pst_mem_deemp_err_fx, /* i/o:  psfiler                            */
     Word16 *mem_agc,
-    PFSTAT *pf_stat,         /* i/o:  All memories related to NB post filter      */
-    const Word16 *tmp_buffer /* tmp_buffer in Q-1 */
-    ,
-    Word16 *mem_tmp2 /* Temporary memory used with scale_syn */
+    PFSTAT *pf_stat,          /* i/o:  All memories related to NB post filter      */
+    const Word16 *tmp_buffer, /* tmp_buffer in Q-1 */
+    Word16 *mem_tmp2          /* Temporary memory used with scale_syn */
 );
 
 void music_postfilt_init(
@@ -8270,10 +8075,6 @@ void improv_amr_wb_gs_fx(
     const Word16 Last_ener_fx,         /* i  : Last energy (Q8)                     Q0*/
     const Word16 rate_switching_reset, /* i  : rate switching reset flag            Q0*/
     const Word16 last_coder_type       /* i  : Last coder_type                      Q0*/
-#ifdef ADD_IVAS_GS_DEC_IMPR
-    ,
-    const Word16 VeryLowRateSTflag /* i  : Enable the noise enhancement for very low rate stereo generic mode */
-#endif
 );
 
 // dec_amr_wb_fx.c
@@ -8325,18 +8126,7 @@ ivas_error ppp_quarter_decoder_fx(
 void open_decoder_LPD_fx(
     Decoder_State *st,
     const Word32 total_brate, /* Q0 */
-#ifdef NEW_IVAS_OPEN_DEC
-    const Word32 last_total_brate,
-#endif
-    const Word16 bwidth /* Q0 */
-#ifdef NEW_IVAS_OPEN_DEC
-    ,
-    const Word16 is_mct, /* i  : MCT mode flag                           */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    const Word16 last_element_mode,
-#endif
-    const Word16 is_init /* i  : indicate call from init_decoder() to avoid double TC initialization */
-#endif
+    const Word16 bwidth       /* Q0 */
 );
 void open_decoder_LPD_ivas_fx(
     Decoder_State *st,              /* i/o: decoder state structure						*/
@@ -8441,7 +8231,7 @@ void stat_noise_uv_mod_ivas_fx(
     const Word16 *lsp_mid,   /* i  : LSP vector at 2nd sfr							Q=15*/
     Word16 *Aq,              /* o  : A(z)   quantized for the 4 subframes			Q=12*/
     Word16 *exc2,            /* i/o: excitation buffer							 Q=Q_exc*/
-    Word16 Q_exc,            /* i  : Q of exc2 excitation buffer [11..-1] expected		*/
+    Word16 *Q_exc,           /* i  : Q of exc2 excitation buffer [11..-1] expected		*/
     const Word16 bfi,        /* i  : Bad frame indicator								*/
     Word32 *ge_sm,           /* i/o: smoothed excitation gain      Q=Q_stat_noise_ge (6)*/
     Word16 *uv_count,        /* i/o: unvoiced counter					                */
@@ -8475,39 +8265,28 @@ Word16 FEC_enhACB_fx(
     const Word16 puls_pos,     /* i   : decoder position of the last glottal pulses decoded in the previous frame */
     const Word16 bfi_pitch     /* i   : Q6 pitch used for concealment                                             */
 );
-Word16 FEC_synchro_exc_fx(                               /* o  : do_WI flag                                       */
-                           const Word16 L_frame,         /* i  : length of the frame                               */
-                           Word16 *exc,                  /* i/o: exc vector to modify                              */
-                           const Word16 desire_puls_pos, /* i  : Pulse position send by the encoder                */
-                           const Word16 true_puls_pos,   /* i  : Present pulse location                            */
-                           const Word16 Old_pitch        /* i  : Pitch use to create temporary adaptive codebook   */
+
+/*! r: do_WI flag                                       */
+Word16 FEC_synchro_exc_fx(
+    const Word16 L_frame,         /* i  : length of the frame                               */
+    Word16 *exc,                  /* i/o: exc vector to modify                              */
+    const Word16 desire_puls_pos, /* i  : Pulse position send by the encoder                */
+    const Word16 true_puls_pos,   /* i  : Present pulse location                            */
+    const Word16 Old_pitch        /* i  : Pitch use to create temporary adaptive codebook   */
 );
 
-// dec_uv_fx.c
 void decod_unvoiced_fx(
-    Decoder_State *st_fx,     /*   i/o: decoder static memory                             */
-    const Word16 *Aq_fx,      /*   Q12        i  : LP filter coefficient                  */
-    const Word16 coder_type,  /*   Q0        i  : coding type                             */
-    Word16 *tmp_noise_fx,     /*   Q5        o  : long term temporary noise energy        */
-    Word16 *pitch_buf_fx,     /*   Q6        o  : floating pitch values for each subframe */
-    Word16 *voice_factors_fx, /*   Q15        o  : voicing factors                        */
-    Word16 *exc_fx,           /*   Q_X      o  : adapt. excitation exc                    */
-    Word16 *exc2_fx,          /*   Q_X        o  : adapt. excitation/total exc            */
-    Word16 *bwe_exc_fx,       /*   Q_X        i/o: excitation for SWB TBE                 */
-    Word16 *gain_buf );
-
-void decod_unvoiced_ivas_fx(
-    Decoder_State *st_fx,            /* 					i/o: decoder static memory                  */
-    const Word16 *Aq_fx,             /* 	Q12				i  : LP filter coefficient                  */
-    const Word16 Es_pred_fx,         /* i  : predicted scaled innov. energy          */
-    const int16_t uc_two_stage_flag, /* i  : flag indicating two-stage UC            */
-    const Word16 coder_type,         /* 	Q0				i  : coding type                            */
-    Word16 *tmp_noise_fx,            /* 	Q0				o  : long term temporary noise energy       */
-    Word16 *pitch_buf_fx,            /* 	Q6				o  : floating pitch values for each subframe*/
-    Word16 *voice_factors_fx,        /* 	Q15				o  : voicing factors                        */
-    Word16 *exc_fx,                  /* 	Q_X			o  : adapt. excitation exc                  */
-    Word16 *exc2_fx,                 /* 	Q_X				o  : adapt. excitation/total exc            */
-    Word16 *bwe_exc_fx,              /* 	Q_X				i/o: excitation for SWB TBE					*/
+    Decoder_State *st_fx,           /* 					i/o: decoder static memory                  */
+    const Word16 *Aq_fx,            /* 	Q12				i  : LP filter coefficient                  */
+    const Word16 Es_pred_fx,        /* i  : predicted scaled innov. energy          */
+    const Word16 uc_two_stage_flag, /* i  : flag indicating two-stage UC            */
+    const Word16 coder_type,        /* 	Q0				i  : coding type                            */
+    Word16 *tmp_noise_fx,           /* 	Q0				o  : long term temporary noise energy       */
+    Word16 *pitch_buf_fx,           /* 	Q6				o  : floating pitch values for each subframe*/
+    Word16 *voice_factors_fx,       /* 	Q15				o  : voicing factors                        */
+    Word16 *exc_fx,                 /* 	Q_X			o  : adapt. excitation exc                  */
+    Word16 *exc2_fx,                /* 	Q_X				o  : adapt. excitation/total exc            */
+    Word16 *bwe_exc_fx,             /* 	Q_X				i/o: excitation for SWB TBE					*/
     Word16 *gain_buf );
 
 // gaus_dec_fx.c
@@ -8539,37 +8318,20 @@ void gaus_L2_dec(
     Word16 *seed_acelp  /*i/o : random seed                     Q0  */
 );
 
-// dec_gen_voic_fx.c
 ivas_error decod_gen_voic_fx(
-    Decoder_State *st_fx,      /* i/o: decoder static memory                     */
-    const Word16 L_frame_fx,   /* i  : length of the frame                       */
-    const Word16 sharpFlag_fx, /* i  : formant sharpening flag                   */
-    const Word16 *Aq_fx,       /* i  : LP filter coefficient                     */
-    const Word16 Es_pred_fx,   /* i  : predicted scaled innov. energy            */
-    const Word16 do_WI_fx,     /* i  : do interpolation after a FER              */
-    Word16 *pitch_buf_fx,      /* o  : floating pitch values for each subframe   */
-    Word16 *voice_factors_fx,  /* o  : voicing factors                           */
-    Word16 *exc_fx,            /* i/o: adapt. excitation exc                     */
-    Word16 *exc2_fx,           /* i/o: adapt. excitation/total exc               */
-    Word16 *bwe_exc_fx,        /* o  : excitation for SWB TBE                    */
-    Word16 *unbits,            /* number of unused bits                          */
-    Word16 *gain_buf           /*Q14*/
-);
-
-ivas_error decod_gen_voic_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: decoder static memory                     */
-    const Word16 L_frame,      /* i  : length of the frame                       */
-    const Word16 sharpFlag_fx, /* i  : formant sharpening flag                   */
-    const Word16 *Aq_fx,       /* i  : LP filter coefficient                     */
-    const Word16 Es_pred_fx,   /* i  : predicted scaled innov. energy            */
-    const Word16 do_WI_fx,     /* i  : do interpolation after a FER              */
-    Word16 *pitch_buf_fx,      /* o  : floating pitch values for each subframe   */
-    Word16 *voice_factors_fx,  /* o  : voicing factors                           */
-    Word16 *exc_fx,            /* i/o: adapt. excitation exc                     */
-    Word16 *exc2_fx,           /* i/o: adapt. excitation/total exc               */
-    Word16 *bwe_exc_fx,        /* o  : excitation for SWB TBE                    */
-    Word16 *unbits,            /* number of unused bits                          */
-    Word16 *gain_buf,
+    Decoder_State *st_fx,              /* i/o: decoder static memory                     */
+    const Word16 L_frame,              /* i  : length of the frame                       */
+    const Word16 sharpFlag_fx,         /* i  : formant sharpening flag                   */
+    const Word16 *Aq_fx,               /* i  : LP filter coefficient                     */
+    const Word16 Es_pred_fx,           /* i  : predicted scaled innov. energy            */
+    const Word16 do_WI_fx,             /* i  : do interpolation after a FER              */
+    Word16 *pitch_buf_fx,              /* o  : floating pitch values for each subframe   */
+    Word16 *voice_factors_fx,          /* o  : voicing factors                           */
+    Word16 *exc_fx,                    /* i/o: adapt. excitation exc                     */
+    Word16 *exc2_fx,                   /* i/o: adapt. excitation/total exc               */
+    Word16 *bwe_exc_fx,                /* o  : excitation for SWB TBE                    */
+    Word16 *unbits,                    /* number of unused bits                          */
+    Word16 *gain_buf,                  /* o  : Word16 pitch gain for each subframe    Q14*/
     const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
     const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              */
 );
@@ -8664,10 +8426,6 @@ Word16 dec_acelp_tcx_frame_fx(
     Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation       */
     Word16 *voice_factors,     /* o  : voicing factors                     */
     Word16 pitch_buf[]         /* o  : floating pitch for each subframe    */
-#ifdef IVAS_CODE_CNG
-    ,
-    STEREO_CNG_DEC_HANDLE hStereoCng /* i  : stereo CNG handle                   */
-#endif
 );
 
 // dec_LPD_fx.c
@@ -8712,10 +8470,10 @@ void mode_switch_decoder_LPD_ivas_fx(
 
 // ari_hm_dec.c
 
-int16_t DecodeIndex(
+Word16 DecodeIndex(
     Decoder_State *st,
-    const int16_t Bandwidth, /* o  : NB, 1: (S)WB                                            */
-    int16_t *PeriodicityIndex );
+    const Word16 Bandwidth, /* o  : NB, 1: (S)WB                                            */
+    Word16 *PeriodicityIndex );
 Word16
 DecodeIndex_fx(
     Decoder_State *st,
@@ -8792,7 +8550,7 @@ void IGFSCFDecoderReset(
 void IGFSCFDecoderDecode(
     IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i/o: handle to public data or NULL in case there was no instance created   */
     Decoder_State *st,                     /* i/o: pointer to decoder state                                              */
-    int16_t *sfe,                          /* o  : ptr to an array which will contain the decoded quantized coefficients */
+    Word16 *sfe,                           /* o  : ptr to an array which will contain the decoded quantized coefficients */
     const Word16 igfGridIdx,               /* i  : igf grid index see declaration of IGF_GRID_IDX for details            */
     const Word16 indepFlag                 /* i  : if  1 on input the decoder will be forced to reset,
                                                     if  0 on input the decoder will be forced to encode without a reset   */
@@ -8893,28 +8651,18 @@ void tcx_hm_modify_envelope(
 );
 
 // tns_base_dec_fx.c
-#ifdef IVAS_CODE
-void
-#else
 Word16
-#endif
 ReadTnsData( STnsConfig const *pTnsConfig,
              Decoder_State *st,
              Word16 *pnBits,
              Word16 *stream,
              Word16 *pnSize );
-#define IVAS_CODE
-#ifdef IVAS_CODE
-void
-#else
-Word16
-#endif
-ReadTnsData_ivas_fx( STnsConfig const *pTnsConfig,
-                     Decoder_State *st,
-                     Word16 *pnBits,
-                     Word16 *stream,
-                     Word16 *pnSize );
-#undef IVAS_CODE
+
+void ReadTnsData_ivas_fx( STnsConfig const *pTnsConfig,
+                          Decoder_State *st,
+                          Word16 *pnBits,
+                          Word16 *stream,
+                          Word16 *pnSize );
 
 Word16 DecodeTnsData( STnsConfig const *pTnsConfig,
                       Word16 const *stream,
@@ -8930,11 +8678,11 @@ Word16 DecodeTnsData_ivas_fx(
 // parametr_bitmapping.c using ivas
 void GetParameters(
     ParamsBitMap const *paramsBitMap,
-    const int16_t nParams,
+    const Word16 nParams,
     void const *pParameter,
-    int16_t **pStream,
-    int16_t *pnSize,
-    int16_t *pnBits );
+    Word16 **pStream,
+    Word16 *pnSize,
+    Word16 *pnBits );
 
 void GetParameters_fx(
     ParamsBitMap const *paramsBitMap,
@@ -8954,10 +8702,10 @@ void EncodeTnsData_ivas_fx(
 
 void SetParameters(
     ParamsBitMap const *paramsBitMap,
-    const int16_t nParams,
+    const Word16 nParams,
     void *pParameter,
-    const int16_t **pStream,
-    int16_t *pnSize );
+    const Word16 **pStream,
+    Word16 *pnSize );
 
 void SetParameters_fx(
     ParamsBitMap const *paramsBitMap,
@@ -8968,18 +8716,18 @@ void SetParameters_fx(
 
 void WriteToBitstream(
     ParamsBitMap const *paramsBitMap,
-    const int16_t nParams,
-    const int16_t **pStream,
-    int16_t *pnSize,
+    const Word16 nParams,
+    const Word16 **pStream,
+    Word16 *pnSize,
     BSTR_ENC_HANDLE hBstr,
-    int16_t *pnBits );
+    Word16 *pnBits );
 
 void ReadFromBitstream(
     ParamsBitMap const *paramsBitMap,
-    const int16_t nArrayLength,
+    const Word16 nArrayLength,
     Decoder_State *st,
-    int16_t **pStream,
-    int16_t *pnSize );
+    Word16 **pStream,
+    Word16 *pnSize );
 
 void ReadFromBitstream_fx(
     ParamsBitMap const *paramsBitMap,
@@ -9100,15 +8848,8 @@ Word16 decode_lpc_avq_fx(
     Decoder_State *st,   /* i/o: decoder state structure     */
     const Word16 numlpc, /* i  : Number of sets of lpc       */
     Word16 *param_lpc    /* o  : lpc parameters              */
-#ifdef IVAS_CODE_AVQ_LPC
-    ,
-    const Word16 ch,             /* i  : channel                     */
-    const Word16 element_mode,   /* i  : element mode                */
-    const Word16 sns_low_br_mode /* i  : SNS low-bitrate mode        */
-#endif
 );
 
-// decode_lpc_avq_ivas_fx declaration with IVAS_CODE_AVQ_LPC enabled
 Word16 decode_lpc_avq_ivas_fx(
     Decoder_State *st,   /* i/o: decoder state structure     */
     const Word16 numlpc, /* i  : Number of sets of lpc       */
@@ -9332,17 +9073,6 @@ void modify_lsf(
 void con_tcx_fx(
     Decoder_State *st,                                      /* i/o: coder memory state            */
     Word16 synth[] /* i/o:   synth[]                     */ /*Q0 */
-#ifdef IVAS_CODE_CON_TCX
-    ,
-    const Word16 coh,      /* i  : coherence of stereo signal  */
-    Word16 *noise_seed,    /* i/o: noise seed for stereo       */
-    const Word16 only_left /* i  : TD-PLC only in left channel */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    ,
-    const float *A_cng /* i  : CNG LP filter coefficients  */
-#endif
-#endif
-
 );
 
 // er_scale_sync.c
@@ -9502,37 +9232,12 @@ void d_gain_pred_fx(
     Word16 *Es_pred,   /* o  : predicited scaled innovation energy       */
     Word16 **pt_indice /* i/o: pointer to the buffer of indices          */
 );
-// acelp_core_dec_fx.c
-ivas_error acelp_core_dec_fx(
-    Decoder_State *st_fx,      /* i/o: decoder state structure                    */
-    Word16 output[],           /* o  : synthesis @internal Fs                                                  */
-    Word16 synth_out[],        /* o  : synthesis                                  */
-    Word16 save_hb_synth[],    /* o  : HB synthesis                                                            */
-    Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation              */
-    Word16 *voice_factors,     /* o  : voicing factors                            */
-    Word16 old_syn_12k8_16k[], /* o  : intermediate ACELP synthesis for SWB BWE   */
-    Word16 sharpFlag,
-    Word16 pitch_buf_fx[NB_SUBFR16k], /* o  : floating pitch for each subframe           */
-    Word16 *unbits,                   /* o  : number of unused bits                      */
-    Word16 *sid_bw                    /* o  : 0-NB/WB, 1-SWB SID                         */
-    ,
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle                                                */
-    const Word16 tdm_lspQ_PCh[M],        /* i  : Q LSPs for primary channel                                              */
-    const Word16 tdm_lsfQ_PCh[M],        /* i  : Q LSFs for primary channel                                              */
-    const Word16 use_cldfb_for_dft,      /* i  : flag to use of CLDFB for DFT Stereo                                     */
-    const Word16 last_element_mode,      /* i  : last element mode                                                       */
-    const Word32 last_element_brate,     /* i  : last element bitrate                                                    */
-    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel                                          */
-    const Word16 nchan_out,              /* i  : number of output channels                                               */
-    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : stereo CNG handle                                                       */
-    const Word16 read_sid_info           /* i  : read SID info flag                                                      */
-);
 
 // evs_dec_fx.c
 ivas_error evs_dec_fx(
-    Decoder_State *st_fx,  /* i/o  : Decoder state structure  */
-    Word16 output_sp[],    /* o    : output synthesis signal  */
-    frameMode_fx frameMode /* i    : Decoder frame mode       */
+    Decoder_State *st_fx, /* i/o  : Decoder state structure  */
+    Word16 output_sp[],   /* o    : output synthesis signal  */
+    FRAME_MODE frameMode  /* i    : Decoder frame mode       */
 );
 
 void fft_cldfb_fx(
@@ -9559,13 +9264,6 @@ void set32_fx(
     const Word16 N  /* i  : Lenght of the vector                */
 );
 
-void delay_signal_fx(
-    Word32 x[],        /* i/o: signal to be delayed              */
-    const Word16 len,  /* i  : length of the input signal        */
-    Word32 mem[],      /* i/o: synchronization memory            */
-    const Word16 delay /* i  : delay in samples                  */
-);
-
 void delay_signal_q_adj_fx(
     Word32 x[],         /* i/o: signal to be delayed                    */
     const Word16 len,   /* i  : length of the input signal              */
@@ -9588,7 +9286,7 @@ void v_add_fx(
     const Word32 x1[], /* i  : Input vector 1                       */
     const Word32 x2[], /* i  : Input vector 2                       */
     Word32 y[],        /* o  : Output vector that contains vector 1 + vector 2  */
-    const int16_t N    /* i  : Vector length                                    */
+    const Word16 N     /* i  : Vector length                                    */
 );
 
 void v_shr_16(
@@ -9642,10 +9340,10 @@ void configureCldfb_ivas_fx(
 );
 // dec4t64.c
 void dec_acelp_fast_fx(
-    Decoder_State *st,       /* i/o: decoder state structure                 */
-    const int16_t cdk_index, /* i  : codebook index                          */
-    Word16 code[],           /* o  : algebraic (fixed) codebook excitation   */
-    const int16_t L_subfr    /* i  : subframe length                         */
+    Decoder_State *st,      /* i/o: decoder state structure                 */
+    const Word16 cdk_index, /* i  : codebook index                          */
+    Word16 code[],          /* o  : algebraic (fixed) codebook excitation   */
+    const Word16 L_subfr    /* i  : subframe length                         */
 );
 // codec_tcx_common.c
 void tcx5SpectrumInterleaving_fx(
@@ -9683,40 +9381,48 @@ void cldfbAnalysis_ivas_fx(
     const Word32 *timeIn_fx,         /* i  : time buffer         Qx    */
     Word32 **realBuffer_fx,          /* o  : real value buffer   Qx - 5*/
     Word32 **imagBuffer_fx,          /* o  : imag value buffer   QX - 5*/
-    const int16_t samplesToProcess,  /* i  : samples to process        */
+    const Word16 samplesToProcess,   /* i  : samples to process        */
     HANDLE_CLDFB_FILTER_BANK h_cldfb /* i  : filterbank state          */
 );
 
 void cldfbSynthesis_ivas_fx(
-    Word32 **realBuffer_fx,          /* i  : real values                 Qx*/
-    Word32 **imagBuffer_fx,          /* i  : imag values                 Qx*/
-    Word32 *timeOut_fx,              /* o  : output time domain samples  Qx - 1*/
-    const Word16 samplesToProcess,   /* i  : number of processed samples */
+    Word32 **realBuffer_fx,        /* i  : real values                 Qx*/
+    Word32 **imagBuffer_fx,        /* i  : imag values                 Qx*/
+    Word32 *timeOut_fx,            /* o  : output time domain samples  Qx - 1*/
+    const Word16 samplesToProcess, /* i  : number of processed samples */
+    const Word16 shift,            /* i  : scale for state buffer */
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+    const Word16 out_shift, /* i  : scale for output buffer */
+#endif
     HANDLE_CLDFB_FILTER_BANK h_cldfb /* i  : filter bank state           */
 );
 
 // bass_psfilter.c
 void addBassPostFilter_ivas_fx(
     const Word32 *harm_timeIn_fx,
-    const int16_t samplesToProcess,
+    const Word16 samplesToProcess,
     Word32 **rAnalysis_fx,
     Word32 **iAnalysis_fx,
     HANDLE_CLDFB_FILTER_BANK cldfb );
 
-Word32 ism_dequant_meta_fx(                                /* o  : Q22*/
-                            const Word16 idx,              /* i  : quantizer index              */
-                            const Word32 borders_fx[],     /* i  : level borders                Q22*/
-                            const Word32 q_step_fx,        /* i  : quantization step            Q22   */
-                            const Word32 q_step_border_fx, /* i  : quantization step at the border Q22*/
-                            const Word16 cbsize            /* i  : codebook size                */
+/* o  : Q22*/
+Word32 ism_dequant_meta_fx(
+    const Word16 idx,              /* i  : quantizer index              */
+    const Word32 borders_fx[],     /* i  : level borders                Q22*/
+    const Word32 q_step_fx,        /* i  : quantization step            Q22   */
+    const Word32 q_step_border_fx, /* i  : quantization step at the border Q22*/
+    const Word16 cbsize            /* i  : codebook size                */
 );
 
 void save_synthesis_hq_fec_fx(
     Decoder_State *st,         /* i/o: decoder state structure     */
+    const Word16 synth_fx[],   /* i  : decoded synthesis (EVS)     */
     const Word32 output_fx[],  /* i  : decoded synthesis           */
     const Word16 output_frame, /* i  : decoded synthesis           */
+    const Word16 Qpostd,       /* i  : Q value of delayed signal   */
     CPE_DEC_HANDLE hCPE        /* i  : CPE decoder structure       */
 );
+
 void calculate_nbits_meta_fx(
     const Word16 nchan_ism,
     Word32 q_energy_ratio_ism[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], // Q30
@@ -9736,8 +9442,8 @@ ivas_error openCldfb_ivas_fx(
     HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle                */
     CLDFB_TYPE type,                   /* i  : analysis or synthesis             */
     const Word32 sampling_rate,        /* i  : sampling rate                     */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay)  */
-);
+    CLDFB_PROTOTYPE prototype,         /* i  : CLDFB version (1.25ms/5ms delay)  */
+    const Word16 enc_dec );            /* i  : encoder/decoder flag            */
 
 Word32 rand_gauss_fx(
     Word32 *x,
@@ -9761,33 +9467,6 @@ void generate_masking_noise_dirac_ivas_fx(
     Word16 *q_cldfb );
 // modif_fs/c
 
-void interpolate_3_over_2_allpass_32(
-    const Word32 *input, /* i  : input signal              Qx */
-    const int16_t len,   /* i  : number of input samples      */
-    Word32 *out,         /* o  : output signal                */
-    Word32 *mem          /* i/o: memory                       */
-);
-
-void interpolate_3_over_1_allpass_32(
-    const Word32 *input, /* i  : input signal            */
-    const int16_t len,   /* i  : number of input samples */
-    Word32 *out,         /* o  : output signal           */
-    Word32 *mem          /* i/o: memory                  */
-);
-void Decimate_allpass_steep_fx32(
-    const Word32 *in, /* i  : input array of size N                   */
-    Word32 *mem,      /* i/o: memory                                  */
-    const Word16 N,   /* i  : number of input samples                 */
-    Word32 *out       /* o  : output array of size N/2                */
-);
-
-void Interpolate_allpass_steep_32(
-    const Word32 *in_fx, /* i  : input array of size N       */
-    Word32 *mem_fx,      /* i/o: memory                      */
-    const int16_t N,     /* i  : number of input samples     */
-    Word32 *out_fx       /* o  : output array of size 2*N    */
-);
-
 void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_TDAC, Word16 *xn_buf, const Word16 *tcx_aldo_window_1, const PWord16 *tcx_aldo_window_1_trunc, const PWord16 *tcx_aldo_window_2, const PWord16 *tcx_mdct_window_half, const PWord16 *tcx_mdct_window_minimum, const PWord16 *tcx_mdct_window_trans, Word16 tcx_mdct_window_half_length, Word16 tcx_mdct_window_min_length, Word16 index, Word16 left_rect, Word16 tcx_offset, Word16 overlap, Word16 L_frame, Word16 L_frameTCX, Word16 L_spec_TCX5, Word16 L_frame_glob, Word16 frame_cnt, Word16 bfi, Word16 *old_out, Word16 *Q_old_wtda, Decoder_State *st, Word16 fullbandScale, Word16 *acelp_zir );
 
 void IMDCT_ivas_fx(
@@ -9881,8 +9560,8 @@ void fd_bwe_dec_init_fx(
 
 void stereo_dft_dec_open(
     STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle    */
-    const int32_t output_Fs,               /* i  : output sampling rate         */
-    const int16_t nchan_transport          /* i  : number of transport channels */
+    const Word32 output_Fs,                /* i  : output sampling rate         */
+    const Word16 nchan_transport           /* i  : number of transport channels */
 );
 
 void ivas_bw_switching_pre_proc_fx(
@@ -9960,6 +9639,12 @@ Word16 usdequant_fx(                    /* Qx*/
                      const Word16 delta /* i: quantization step Qy*/
 );
 
+Word32 usdequant32_fx(                    /* Qx*/
+                       const Word16 idx,  /* i: quantizer index Q0*/
+                       const Word32 qlow, /* i: lowest codebook entry (index 0) Qx*/
+                       const Word32 delta /* i: quantization step Qy*/
+);
+
 Word16 usquant_fx(                     /* o: index of the winning codeword   */
                    const Word16 x,     /* i: scalar value to quantize        Qx*/
                    Word16 *xq,         /* o: quantized value                 Qx*/
@@ -9999,7 +9684,7 @@ void Scale_sig32(
     const Word16 exp0 /* i  : exponent: x = round(x << exp)   Qx ?exp  */
 );
 
-void Copy_Scale_sig_16_32(
+void Copy_Scale_sig_16_32_DEPREC(
     const Word16 x[], /* i  : signal to scale i             Qx        */
     Word32 y[],       /* o  : scaled signal output            Qx        */
     const Word16 lg,  /* i  : size of x[]                     Q0        */
@@ -10264,6 +9949,13 @@ Word32 root_a_over_b_fx(
     Word16 Q_b,
     Word16 *exp_out );
 
+Word32 root_a_over_b_ivas_fx(
+    Word32 a, /* Q(Q_a) */
+    Word16 Q_a,
+    Word32 b, /* Q(Q_b) */
+    Word16 Q_b,
+    Word16 *exp_out );
+
 void fir_fx( const Word16 x[], /* i  : input vector                              Qx*/
              const Word16 h[], /* i  : impulse response of the FIR filter        Q12*/
              Word16 y[],       /* o  : output vector (result of filtering)       Qx*/
@@ -10474,15 +10166,15 @@ void floating_point_add(
     const Word32 my, /* i:  mantissa of the adder Q31  */
     const Word16 ey  /* i:  exponent of the adder Q0   */
 );
-/*delay_signal_fx is also present*/
-void delay_signal(
+
+void delay_signal_fx(
     Word16 x[],        /* i/o: signal to be delayed              */
     const Word16 len,  /* i  : length of the input signal        */
     Word16 mem[],      /* i/o: synchronization memory            */
     const Word16 delay /* i  : delay in samples                  */
 );
 
-void delay_signal32(
+void delay_signal32_fx(
     Word32 x[],        /* i/o: signal to be delayed              */
     const Word16 len,  /* i  : length of the input signal        */
     Word32 mem[],      /* i/o: synchronization memory            */
@@ -10565,8 +10257,8 @@ void dctT2_N_apply_matrix_fx(
 );
 
 Word32 sum2_f_32_fx(
-    const Word32 *vec,  /* i  : input vector                          */
-    const int16_t lvec, /* i  : length of input vector                */
+    const Word32 *vec, /* i  : input vector                          */
+    const Word16 lvec, /* i  : length of input vector                */
     Word16 gb );
 
 Word32 sum2_32_fx(
@@ -10616,7 +10308,7 @@ Word16 swb_bwe_dec_fx32(
     Word16 output_frame       /* i  : frame length                                        */
 );
 
-ivas_error acelp_core_dec_ivas_fx(
+ivas_error acelp_core_dec_fx(
     Decoder_State *st,                   /* i/o: decoder state structure                                                 */
     Word16 output_fx[],                  /* o  : synthesis @internal Fs                                                  */
     Word16 synth_fx16[],                 /* o  : synthesis                                                               */
@@ -10716,10 +10408,10 @@ void generate_stereo_masking_noise_fx(
     Word16 Q_syn,
     Decoder_State *st,                   /* i/o: decoder state structure         */
     STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i  : TD stereo structure             */
-    const int16_t flag_sec_CNA,          /* i  : CNA flag for secondary channel  */
-    const int16_t fadeOut,               /* i  : only fade out of previous state */
+    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel  */
+    const Word16 fadeOut,                /* i  : only fade out of previous state */
     STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : Stereo CNG handle               */
-    const int16_t nchan_out              /* i  : number of output channels       */
+    const Word16 nchan_out               /* i  : number of output channels       */
 );
 
 void SynthesisSTFT_fx(
@@ -10727,10 +10419,10 @@ void SynthesisSTFT_fx(
     Word32 *timeDomainOutput,
     Word32 *olapBuffer,
     const Word16 *olapWin,
-    const int16_t tcx_transition,
+    const Word16 tcx_transition,
     HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
-    const int16_t element_mode,  /* i  : element mode */
-    const int16_t nchan_out      /* i  : number of output channels */
+    const Word16 element_mode,   /* i  : element mode */
+    const Word16 nchan_out       /* i  : number of output channels */
 );
 
 void FdCng_decodeSID_ivas_fx(
@@ -10819,27 +10511,33 @@ void ProcessStereoIGF_fx(
     Word32 *pITFMDCTSpectrum_fx[CPE_CHANNELS][NB_DIV], /* i  : MDCT spectrum fir ITF                   */
     Word16 q_pITFMDCTSpectrum_1,
     Word16 q_pITFMDCTSpectrum_2,
-    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],              /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
-    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i  : inverse power spectrum                  */
-    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],        /* i  : inverse spectrum                        */
-    const Word16 frameno,                                 /* i  : flag indicating index of current subfr. */
-    const Word16 sp_aud_decision0,                        /* i  : sp_aud_decision0                        */
-    const Word32 element_brate                            /* i  : element bitrate                         */
-);
+    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],                /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
+    Word16 exp_pPowerSpectrum_fx[CPE_CHANNELS],             /* i/o: exp of pPowerSpectrum_fx                */
+    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV],   /* i  : inverse power spectrum                  */
+    Word16 *q_pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i/o: Q of pPowerSpectrumMsInv_fx           */
+    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],          /* i  : inverse spectrum                        */
+    Word16 exp_inv_spectrum_fx[CPE_CHANNELS],               /* i/o: exp of inv_spectrum_fx                  */
+    const Word16 frameno,                                   /* i  : flag indicating index of current subfr. */
+    const Word16 sp_aud_decision0,                          /* i  : sp_aud_decision0                        */
+    const Word32 element_brate,                             /* i  : element bitrate                         */
+    const Word16 mct_on );
 /*igf_enc.c*/
 void IGFEncApplyStereo_fx(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,              /* i/o: MDCT stereo encoder structure           */
-    Word16 ms_mask[2][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS],  /* i  : instance handle of IGF Encoder          */
-    const Word16 igfGridIdx,                              /* i  : IGF grid index                          */
-    Encoder_State *sts[CPE_CHANNELS],                     /* i  : Encoder state                           */
-    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],              /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
-    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse power spectrum                  */
-    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],        /* i  : inverse spectrum                        */
-    const Word16 frameno,                                 /* i  : flag indicating index of current subfr. */
-    const Word16 sp_aud_decision0,                        /* i  : sp_aud_decision0                        */
-    const Word32 element_brate                            /* i  : element bitrate                         */
-);
+    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                /* i/o: MDCT stereo encoder structure           */
+    Word16 ms_mask[2][MAX_SFB],                             /* i  : bandwise MS mask                        */
+    const IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS],    /* i  : instance handle of IGF Encoder          */
+    const Word16 igfGridIdx,                                /* i  : IGF grid index                          */
+    Encoder_State *sts[CPE_CHANNELS],                       /* i  : Encoder state                           */
+    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],                /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
+    Word16 exp_pPowerSpectrum_fx[CPE_CHANNELS],             /* i/o: exp of pPowerSpectrum_fx                */
+    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV],   /* i/o: inverse power spectrum                  */
+    Word16 *q_pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i/o: Q of pPowerSpectrumMsInv_fx           */
+    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],          /* i  : inverse spectrum                        */
+    Word16 exp_inv_spectrum_fx[CPE_CHANNELS],               /* i  : exp of inverse spectrum                 */
+    const Word16 frameno,                                   /* i  : flag indicating index of current subfr. */
+    const Word16 sp_aud_decision0,                          /* i  : sp_aud_decision0                        */
+    const Word32 element_brate,                             /* i  : element bitrate                         */
+    const Word16 mct_on );
 
 void IGFSaveSpectrumForITF_ivas_fx(
     IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i/o: instance handle of IGF Encoder  */
@@ -10854,7 +10552,7 @@ Word16 IGFEncWriteBitstream_ivas_fx(
     const Word16 isIndepFlag               /* i  : if 1 frame is independent, 0 = frame is coded with data from previous frame */
 );
 /*igf_scf_enc.c*/
-Word16 IGFSCFEncoderEncode(
+Word16 IGFSCFEncoderEncode_ivas_fx(
     IGFSCFENC_INSTANCE_HANDLE hPublicData, /* i/o: handle to public data or NULL in case there was no instance created                           */
     BSTR_ENC_HANDLE hBstr,                 /* i/o: encoder bitstream handle                                                                      */
     const Word16 bitCount,                 /* i  : offset to the first bit in bitbuffer which should be readed by iisArithDecoderDecode function */
@@ -10892,7 +10590,6 @@ void IGFEncConcatenateBitstream(
     BSTR_ENC_HANDLE hBstr                  /* i/o: bitstream handle                                */
 );
 
-#endif
 
 void hq_generic_hf_encoding_fx(
     const Word32 *coefs_fx,         /* i  : MDCT coefficients of weighted original   */
@@ -10908,6 +10605,7 @@ Word16 ari_decode_14bits_pow_ivas(
     Word16 *res,
     Tastat *s,
     UWord16 base );
+
 Word16 ari_decode_14bits_sign_ivas(
     Word16 *ptr,
     Word16 bp,
@@ -10921,46 +10619,46 @@ void lsf_syn_mem_backup_ivas_fx(
     Word32 *gc_threshold_fx,      /* i:                                                 Q16                                        */
     Word16 *clip_var_bck_fx,      /* o:                                                 Q(2.56), Q14, Q7, Q0, Q14, Q14             */
     Word16 *next_force_sf_bck_fx, /* o:                                                                                            */
-
-    Word16 *lsp_new,     /* i: LSP vector to quantize                                   Q15                                        */
-    Word16 *lsp_mid,     /* i: mid-frame LSP vector                                     Q15                                        */
-    Word16 *clip_var,    /* o: pitch clipping state var                                 Q(2.56)                                    */
-    Word16 *mem_AR,      /* o: quantizer memory for AR model                            Q(2.56)                                    */
-    Word16 *mem_MA,      /* o: quantizer memory for AR model                            Q(2.56)                                    */
-    Word16 *lsp_new_bck, /* o: LSP vector to quantize- backup                           Q15                                        */
-    Word16 *lsp_mid_bck, /* o: mid-frame LSP vector - backup                            Q15                                        */
-    Word32 *Bin_E,       /* o: FFT Bin energy 128 *2 sets                               Q_new + Q_SCALE - 2                        */
-    Word32 *Bin_E_old,   /* o: FFT Bin energy 128 sets                                  Q_new + Q_SCALE - 2                        */
-    Word16 *mem_syn_bck, /* o: synthesis filter memory                                  ( 15 - st_fx->hLPDmem->e_mem_syn )         */
-    Word16 *mem_w0_bck,  /* o: memory of the weighting filter                           ( 15 - st_fx->hLPDmem->e_mem_syn )         */
-    Word16 *streaklimit, /*                                                             Q15                                        */
+    Word16 *lsp_new,              /* i: LSP vector to quantize                          Q15                                        */
+    Word16 *lsp_mid,              /* i: mid-frame LSP vector                            Q15                                        */
+    Word16 *clip_var,             /* o: pitch clipping state var                        Q(2.56)                                    */
+    Word16 *mem_AR,               /* o: quantizer memory for AR model                   Q(2.56)                                    */
+    Word16 *mem_MA,               /* o: quantizer memory for AR model                   Q(2.56)                                    */
+    Word16 *lsp_new_bck,          /* o: LSP vector to quantize- backup                  Q15                                        */
+    Word16 *lsp_mid_bck,          /* o: mid-frame LSP vector - backup                   Q15                                        */
+    Word32 *Bin_E,                /* o: FFT Bin energy 128 *2 sets                      Q_new + Q_SCALE - 2                        */
+    Word32 *Bin_E_old,            /* o: FFT Bin energy 128 sets                         Q_new + Q_SCALE - 2                        */
+    Word16 *mem_syn_bck,          /* o: synthesis filter memory                         ( 15 - st_fx->hLPDmem->e_mem_syn )         */
+    Word16 *mem_w0_bck,           /* o: memory of the weighting filter                  ( 15 - st_fx->hLPDmem->e_mem_syn )         */
+    Word16 *streaklimit,          /*                                                    Q15                                        */
     Word16 *pstreaklen );
 
-ivas_error config_acelp1_IVAS(
-    const Word16 enc_dec,              /* i  : encoder/decoder flag            */
-    const Word32 total_brate,          /* i  : total bitrate                   */
-    const Word32 core_brate_inp,       /* i  : core bitrate                    */
-    const Word16 core,                 /* i  : core                            */
-    const Word16 extl,                 /* i  : extension layer                 */
-    const Word32 extl_brate,           /* i  : extension layer bitrate         */
-    const Word16 L_frame,              /* i  : frame length at internal Fs     */
-    const Word16 GSC_noisy_speech,     /* i  : GSC on SWB noisy speech flag    */
-    ACELP_config *acelp_cfg,           /* i  : ACELP bit-allocation            */
-    const Word16 signaling_bits,       /* i  : number of signaling bits        */
-    const Word16 coder_type,           /* i  : coder type                      */
-    const Word16 tc_subfr,             /* i  : TC subfr ID                     */
-    const Word16 tc_call,              /* i  : TC call number (0,1,2,3,5(DEC)) */
-    Word16 *nBits_es_Pred,             /* o  : number of bits for Es_pred Q    */
-    Word16 *unbits,                    /* o  : number of unused bits           */
-    const Word16 element_mode,         /* i  : element mode                    */
-    Word16 *uc_two_stage_flag,         /* o  : flag undicating two-stage UC    */
-    const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag (can be 1 only with secondary channel */
-    const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag */
-    const Word16 idchan,               /* i  : stereo channel ID               */
-    const Word16 active_cnt,           /* i  : Active frame counter            */
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/
-    const Word16 tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */
-    const Word16 GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
+ivas_error config_acelp1_fx(
+    const Word16 enc_dec,                  /* i  : encoder/decoder flag            */
+    const Word32 total_brate,              /* i  : total bitrate                   */
+    const Word32 core_brate_inp,           /* i  : core bitrate                    */
+    const Word16 core,                     /* i  : core                            */
+    const Word16 extl,                     /* i  : extension layer                 */
+    const Word32 extl_brate,               /* i  : extension layer bitrate         */
+    const Word16 L_frame,                  /* i  : frame length at internal Fs     */
+    const Word16 GSC_noisy_speech,         /* i  : GSC on SWB noisy speech flag    */
+    ACELP_config *acelp_cfg,               /* i  : ACELP bit-allocation            */
+    const Word16 signaling_bits,           /* i  : number of signaling bits        */
+    const Word16 coder_type,               /* i  : coder type                      */
+    const Word16 inactive_coder_type_flag, /* i  : AVQ (0) or GSC (1) IC flag      */
+    const Word16 tc_subfr,                 /* i  : TC subfr ID                     */
+    const Word16 tc_call,                  /* i  : TC call number (0,1,2,3,5(DEC)) */
+    Word16 *nBits_es_Pred,                 /* o  : number of bits for Es_pred Q    */
+    Word16 *unbits,                        /* o  : number of unused bits           */
+    const Word16 element_mode,             /* i  : element mode                    */
+    Word16 *uc_two_stage_flag,             /* o  : flag undicating two-stage UC    */
+    const Word16 tdm_lp_reuse_flag,        /* i  : LPC reuse flag (can be 1 only with secondary channel */
+    const Word16 tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag */
+    const Word16 idchan,                   /* i  : stereo channel ID               */
+    const Word16 active_cnt,               /* i  : Active frame counter            */
+    const Word16 tdm_Pitch_reuse_flag,     /* i  : primary channel pitch reuse flag*/
+    const Word16 tdm_LRTD_flag,            /* i  : LRTD stereo mode flag           */
+    const Word16 GSC_IVAS_mode             /* i  : GSC IVAS mode                   */
 );
 
 ivas_error push_next_indice(
@@ -11014,11 +10712,13 @@ void calculate_hangover_attenuation_gain_ivas_fx(
 void init_coder_ace_plus_ivas_fx(
     Encoder_State *st,             /* i  : Encoder state                          */
     const Word32 last_total_brate, /* i  : last total bitrate                     */
+    const Word32 igf_brate,        /* i  : IGF configuration bitrate           */
     const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */
 );
 
 void core_coder_reconfig_ivas_fx(
-    Encoder_State *st );
+    Encoder_State *st,
+    const Word32 last_total_brate );
 
 void core_coder_mode_switch_ivas_fx(
     Encoder_State *st,             /* i/o: encoder state structure             */
@@ -11104,7 +10804,7 @@ Word16 msvq_stage1_dct_recalc_candidates_fdcng_wb_fx(
     const Word16 st1_syn_vec_e,       /* i  : exp for IDCT24 synthesis vectors       */
     const Word32 *u_fx,               /* i  : target   signal                        */
     const Word16 u_e,                 /* i  : exp for target   signal                */
-    const int16_t maxC_st1,           /* i  : number of candidates in stage1         */
+    const Word16 maxC_st1,            /* i  : number of candidates in stage1         */
     Word32 *dist_ptr_fx,              /* i/o: updated  MSE vector for stage1         */
     Word16 *dist_ptr_e                /* i/o: exp for updated  MSE vector for stage1 */
 );
@@ -11170,3 +10870,620 @@ void WriteToBitstream_ivas_fx(
     Word16 *pnSize,
     BSTR_ENC_HANDLE hBstr,
     Word16 *pnBits );
+
+
+/*===========================================================================================*/
+/*----------------------------------------------------------------------------------*
+ * MODE1 prototypes
+ *----------------------------------------------------------------------------------*/
+
+/*! r: output random value */
+Word16 own_random(
+    Word16 *seed /* i/o: random seed                                     */
+);
+
+Word16 norm_ul_float(
+    UWord32 UL_var1 );
+
+/*! r: sum of all vector elements */
+Word16 sum_s(
+    const Word16 *vec, /* i  : input vector                                    */
+    const Word16 lvec  /* i  : length of input vector                          */
+);
+
+/*! r: sum of all vector elements */
+Word32 sum_l(
+    const Word32 *vec, /* i  : input vector                                    */
+    const Word16 lvec  /* i  : length of input vector                          */
+);
+
+void set_c(
+    Word8 y[],     /* i/o: Vector to set                                   */
+    const Word8 a, /* i  : Value to set the vector to                      */
+    const Word32 N /* i  : Length of the vector                */
+);
+
+void set_s(
+    Word16 y[],     /* i/o: Vector to set                                   */
+    const Word16 a, /* i  : Value to set the vector to                      */
+    const Word16 N  /* i  : Lenght of the vector                            */
+);
+
+void set_l(
+    Word32 y[],     /* i/o: Vector to set                                   */
+    const Word32 a, /* i  : Value to set the vector to                      */
+    const Word16 N  /* i  : Length of the vector                            */
+);
+
+void set_zero_fx(
+    Word32 *vec,      /* o  : input vector                                    */
+    const Word16 lvec /* i  : length of the vector                            */
+);
+void set_zero2_fx(
+    Word32 *vec,      /* o  : input vector                                    */
+    const Word32 lvec /* i  : length of the vector                            */
+);
+void set16_zero_fx(
+    Word16 *vec,      /* o  : input vector                                    */
+    const Word16 lvec /* i  : length of the vector                            */
+);
+
+void set_zero(
+    float *vec,       /* o  : input vector                                    */
+    const Word16 lvec /* i  : length of the vector                            */
+);
+
+void mvr2r(
+    const float x[], /* i  : input vector                                    */
+    float y[],       /* o  : output vector                                   */
+    const Word16 n   /* i  : vector size                                     */
+);
+
+void mvs2s(
+    const Word16 x[], /* i  : input vector                                    */
+    Word16 y[],       /* o  : output vector                                   */
+    const Word16 n    /* i  : vector size                                     */
+);
+
+void mvl2l(
+    const Word32 x[], /* i  : input vector                                    */
+    Word32 y[],       /* o  : output vector                                   */
+    const Word16 n    /* i  : vector size                                     */
+);
+
+Word16 maximumAbs_l(
+    const Word32 *vec, /* i  : input vector                                   */
+    const Word16 lvec, /* i  : length of input vector                         */
+    Word32 *max_val    /* o  : maximum value in the input vector              */
+);
+
+/*! r: index of the minimum value in the input vector */
+Word16 minimum_s(
+    const Word16 *vec, /* i  : Input vector                                    */
+    const Word16 lvec, /* i  : Vector length                                   */
+    Word16 *min_val    /* o  : minimum value in the input vector               */
+);
+
+/*! r: dequanzited gain */
+float usdequant(
+    const Word16 idx, /* i  : quantizer index                                 */
+    const float qlow, /* i  : lowest codebook entry (index 0)                 */
+    const float delta /* i  : quantization step                               */
+);
+
+void sort(
+    UWord16 *x, /* i/o: Vector to be sorted                             */
+    UWord16 len /* i/o: vector length                                   */
+);
+
+void sort_l(
+    Word32 *x, /* i/o: Vector to be sorted                             */
+    Word16 len /* i/o: vector length                                   */
+);
+
+
+ivas_error push_indice(
+    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */
+    Word16 id,             /* i  : ID of the indice                            */
+    UWord16 value,         /* i  : value of the quantized indice               */
+    Word16 nb_bits         /* i  : number of bits used to quantize the indice  */
+);
+
+ivas_error push_next_indice(
+    BSTR_ENC_HANDLE hBstr,
+    UWord16 value, /* i  : value of the quantized indice          */
+    Word16 nb_bits /* i  : number of bits used to quantize the indice */
+);
+
+ivas_error push_next_bits(
+    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle               */
+    const UWord16 bits[],  /* i  : bit buffer to pack, sequence of single bits */
+    const Word16 nb_bits   /* i  : number of bits to pack                 */
+);
+
+/*! r: maximum number of indices */
+Word16 get_ivas_max_num_indices_fx(
+    const IVAS_FORMAT ivas_format, /* i  : IVAS format               */
+    const Word32 ivas_total_brate  /* i  : IVAS total bitrate           */
+);
+
+/*! r: maximum number of indices */
+Word16 get_BWE_max_num_indices(
+    const Word32 extl_brate /* i  : extensiona layer bitrate  */
+);
+
+/*! r: maximum number of indices */
+Word16 get_ivas_max_num_indices_metadata_fx(
+    const IVAS_FORMAT ivas_format, /* i  : IVAS format              */
+    const Word32 ivas_total_brate  /* i  : IVAS total bitrate       */
+);
+ivas_error ind_list_realloc(
+    INDICE_HANDLE old_ind_list,   /* i  : pointer to the beginning of the old buffer of indices */
+    const Word16 max_num_indices, /* i  : new maximum number of allowed indices in the list */
+    Encoder_Struct *st_ivas       /* i  : IVAS encoder structure                  */
+);
+
+ivas_error check_ind_list_limits(
+    BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle                    */
+);
+
+void move_indices(
+    INDICE_HANDLE old_ind_list, /* i/o: old location of indices */
+    INDICE_HANDLE new_ind_list, /* i/o: new location of indices */
+    const Word16 nb_indices     /* i  : number of moved indices */
+);
+
+/*! r: index of the indice in the list, -1 if not found */
+Word16 find_indice(
+    BSTR_ENC_HANDLE hBstr, /* i  : encoder bitstream handle                    */
+    const Word16 id,       /* i  : ID of the indice                            */
+    UWord16 *value,        /* o  : value of the quantized indice               */
+    Word16 *nb_bits        /* o  : number of bits used to quantize the indice  */
+);
+
+/*! r: number of deleted indices                   */
+UWord16 delete_indice(
+    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */
+    const Word16 id        /* i  : ID of the indice                            */
+);
+
+/*! r: value of the indice */
+UWord16 get_next_indice(
+    Decoder_State *st, /* i/o: decoder state structure                */
+    Word16 nb_bits     /* i  : number of bits that were used to quantize the indice */
+);
+
+/*! r: value of the indice */
+UWord16 get_next_indice_1(
+    Decoder_State *st /* i/o: decoder state structure                */
+);
+
+void get_next_indice_tmp(
+    Decoder_State *st, /* o  : decoder state structure                */
+    Word16 nb_bits     /* i  : number of bits that were used to quantize the indice */
+);
+
+/*! r: value of the indice */
+UWord16 get_indice(
+    Decoder_State *st, /* i/o: decoder state structure                */
+    Word16 pos,        /* i  : absolute position in the bitstream     */
+    Word16 nb_bits     /* i  : number of bits that were used to quantize the indice */
+);
+
+void reset_indices_dec(
+    Decoder_State *st /* i/o: decoder state structure                */
+);
+
+Word16 rate2EVSmode_float(
+    const Word32 brate, /* i  : bitrate                                                    */
+    Word16 *is_amr_wb   /* o  : (flag) does the bitrate belong to AMR-WB? Can be NULL      */
+);
+
+
+/*! r: 1 = OK, 0 = something wrong */
+ivas_error read_indices_fx(
+    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure                 */
+    UWord16 bit_stream[],    /* i  : bitstream buffer                       */
+    UWord16 num_bits,        /* i  : number of bits in bitstream            */
+    Word16 *prev_ft_speech,
+    Word16 *CNG,
+    Word16 bfi /* i  : bad frame indicator                    */
+);
+
+
+void ivas_set_bitstream_pointers(
+    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure    */
+);
+
+Decoder_State **reset_elements(
+    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */
+);
+
+void mdct_switching_dec_fx(
+    Decoder_State *st /* i/o: decoder state structure                 */
+);
+
+Word16 print_disclaimer(
+    FILE *fPtr );
+
+void fft_rel(
+    float x[],      /* i/o: input/output vector    */
+    const Word16 n, /* i  : vector length          */
+    const Word16 m  /* i  : log2 of vector length  */
+);
+
+void preemph_ivas_fx(
+    Word32 *signal,  /* i/o: signal             Qx*/
+    const Word16 mu, /* i  : preemphasis factor Q15*/
+    const Word16 L,  /* i  : vector size        Q0*/
+    Word32 *mem      /* i/o: memory (x[-1])     Qx*/
+);
+
+void create_offset(
+    UWord32 *offset_scale1,
+    UWord32 *offset_scale2,
+    const Word16 mode,
+    const Word16 prediction_flag );
+
+void BASOP_cfft_ivas(
+    Word32 *re,   /* i/o: real part                                 */
+    Word32 *im,   /* i/o: imag part                                 */
+    Word16 s,     /* i  : stride real and imag part                 */
+    Word16 *scale /* i  : scalefactor                               */
+);
+
+Word32 ar_div_ivas(
+    Word32 num,
+    Word32 denum );
+
+Word32 Mult_32_16(
+    Word32 a,
+    Word16 b );
+
+Word32 Mult_32_32(
+    Word32 a,
+    Word32 b );
+
+
+void bit_allocation_second_fx2(
+    Word32 *Rk,
+    Word32 *Rk_sort,
+    Word16 BANDS,
+    const Word16 *band_width,
+    Word16 *k_sort,
+    Word16 *k_num,
+    const Word16 *p2a_flags,
+    const Word16 p2a_bands,
+    const Word16 *last_bitalloc,
+    const Word16 input_frame );
+
+void bit_allocation_second_fx2(
+    Word32 *Rk,
+    Word32 *Rk_sort,
+    Word16 BANDS,
+    const Word16 *band_width,
+    Word16 *k_sort,
+    Word16 *k_num,
+    const Word16 *p2a_flags,
+    const Word16 p2a_bands,
+    const Word16 *last_bitalloc,
+    const Word16 input_frame );
+
+#ifdef DEBUGGING
+void read_next_force(
+    int16_t *force,            /* i/o: force value (0/1, 0 = speech, 1 = music)*/
+    FILE *f_force,             /* i  : force switching profile (0 if N/A)      */
+    int32_t *force_profile_cnt /* i/o: counter of frames for force switching profile file */
+);
+#endif
+
+ivas_error init_encoder_ivas_fx(
+    Encoder_State *st,              /* i/o: state structure                      */
+    Encoder_Struct *st_ivas,        /* i/o: encoder state structure              */
+    const Word16 idchan,            /* i  : channel ID                           */
+    const Word16 var_SID_rate_flag, /* i  : flag for variable SID update rate    */
+    const Word16 interval_SID,      /* i  : interval for SID update              */
+    const Word16 vad_only_flag,     /* i  : flag to indicate front-VAD structure */
+    const ISM_MODE ism_mode,        /* i  : ISM mode                             */
+    const Word32 element_brate      /* i  : element bitrate                      */
+);
+
+ivas_error acelp_core_enc_ivas_fx(
+    Encoder_State *st,                  /* i/o: encoder state structure                 */
+    const Word16 inp[],                 /* i  : input signal of the current frame		Q_new*/
+    Word16 A[NB_SUBFR16k * ( M + 1 )],  /* i  : A(z) unquantized for the 4 subframes	Q12*/
+    Word16 Aw[NB_SUBFR16k * ( M + 1 )], /* i  : weighted A(z) unquant. for subframes	Q12*/
+    const Word32 epsP[M + 1],           /* i  : LP prediction errors					Qx*/
+    Word16 lsp_new[M],                  /* i  : LSPs at the end of the frame			Q15*/
+    Word16 lsp_mid[M],                  /* i  : LSPs in the middle of the frame			Q15*/
+    const Word16 vad_hover_flag,        /* i  : VAD hangover flag						Q0*/
+    const Word16 attack_flag,           /* i  : attack flag (GSC or TC)					Q0*/
+    Word32 bwe_exc_extended_fx[],       /* i/o: bandwidth extended excitation       st->prev_Q_bwe_exc*/
+    Word16 *voice_factors_fx,           /* o  : voicing factors							Q15*/
+    Word16 old_syn_12k8_16k[],          /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE		q_old_syn_12k8_16*/
+    Word16 *q_old_syn_12k8_16,
+    Word16 pitch_buf[NB_SUBFR16k],       /* o  : floating pitch for each subframe		Q6*/
+    Word16 *unbits,                      /* o  : number of unused bits					Q0*/
+    STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle            */
+    Word16 tdm_lsfQ_PCh[M],              /* i  : Q LSFs for primary channel				X2.56*/
+    Word16 Q_new );
+
+void flip_and_downmix_generic_fx32(
+    Word32 input[],                      /* i : input spectrum Qx*/
+    Word32 output[],                     /* o : output spectrum Qx*/
+    const Word16 length,                 /* i : length of spectra */
+    Word32 mem1_ext[HILBERT_ORDER1],     /* i/o: memory Qx*/
+    Word32 mem2_ext[2 * HILBERT_ORDER2], /* i/o: memory Qx*/
+    Word32 mem3_ext[2 * HILBERT_ORDER2], /* i/o: memory Qx*/
+    Word16 *phase_state                  /* i/o: Phase state in case frequency isn't multiple of 50 Hz */
+);
+
+Word16 quant_2p_2N1_fx(                    /* o:  return (2*N)+1 bits         */
+                        const Word16 pos1, /* i:  position of the pulse 1     */
+                        const Word16 pos2, /* i:  position of the pulse 2     */
+                        const Word16 N     /* i:  number of bits FOR position */
+);
+
+void bands_and_bit_alloc_ivas_fx(
+    const Word16 cor_strong_limit, /* i  : HF correlation                                        */
+    const Word16 noise_lev,        /* i  : dwn scaling factor                                    */
+    const Word32 core_brate,       /* i  : core bit rate                                         */
+    const Word16 Diff_len,         /* i  : Lenght of the difference signal (before pure spectral)*/
+    const Word16 bits_used,        /* i  : Number of bit used before frequency Q                 */
+    Word16 *bit,                   /* i/o: Number of bit allowed for frequency quantization      */
+    const Word16 *Ener_per_bd_iQ,  /* i/o: Quantized energy vector                               */
+    Word16 *max_ener_band,         /* o  : Sorted order                                          */
+    Word16 *out_bits_per_bands,    /* i/o: Number of bit allowed per allowed subband        Q3   */
+    Word16 *nb_subbands,           /* o  : Number of subband allowed                             */
+    const Word16 *exc_diff,        /* i  : Difference signal to quantize (encoder side only)     */
+    Word16 *concat_in,             /* o  : Concatened PVQ's input vector (encoder side only)     */
+    Word16 *pvq_len,               /* o  : Number of bin covered with the PVQ                    */
+    const Word16 coder_type,       /* i  : coding type                                           */
+    const Word16 bwidth,           /* i  : input signal bandwidth                                */
+    const Word16 GSC_noisy_speech, /* i  : GSC noisy speech flag                                 */
+    const Word16 L_frame,          /* i  : frame length                                          */
+    const Word16 element_mode,     /* i  : element mode                                          */
+    const Word16 GSC_IVAS_mode     /* i  : GSC IVAS mode                                         */
+);
+
+void ivas_find_wsp_fx(
+    const Word16 L_frame,  /* i  : length of the frame                   Q0*/
+    const Word16 L_subfr,  /* i  : length of subframe                    Q0*/
+    const Word16 nb_subfr, /* i  : number of subframes                   Q0*/
+    const Word16 *A_fx,
+    /* i  : A(z) filter coefficients              */ // Q12
+    Word16 *Aw_fx,
+    /* o  : weighted A(z) filter coefficients     */ // Q12
+    const Word16 *speech_fx,
+    /* i  : pointer to the denoised speech frame  */ // Q_new
+    const Word16 tilt_fact,
+    /* i  : tilt factor                           */ // Q15
+    Word16 *wsp_fx,
+    /* o  : poitnter to the weighted speech frame */ // Q_new
+    Word16 *mem_wsp_fx,
+    /* i/o: W(Z) denominator memory               */ // Q_new
+    const Word16 gamma,
+    /* i  : weighting factor                      */ // Q15
+    const Word16 L_look                              /* i  : look-ahead                            Q0*/
+);
+
+Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
+    Word16 *x,           /* Q0 */
+    const Word16 nt,     /* Q0 */
+    const Word16 target, /* Q0 */
+    HANDLE_RC_CONTEXT_MEM hContextMem );
+
+Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
+    Word16 *x,                        /* Q0 */
+    const Word16 start_line,          /* Q0 */
+    const Word16 end_line,            /* Q0 */
+    HANDLE_RC_CONTEXT_MEM hContextMem /* Q0 */
+);
+
+
+/*! r: Q15 */
+Word16 expfp_evs_fx(
+    const Word16 x,  /* i  : mantissa  Q15-e                         */
+    const Word16 x_e /* i  : exponent  Q0                            */
+);
+
+
+void tcx_arith_render_envelope_ivas_fx(
+    const Word16 A_ind[],     /* i  : LPC coefficients of signal envelope        Q12*/
+    const Word16 L_frame,     /* i  : number of spectral lines                   Q0*/
+    const Word16 L_spec,      /* i  : length of the coded spectrum               Q0*/
+    const Word16 preemph_fac, /* i  : pre-emphasis factor                        Q15*/
+    const Word16 gamma_w,     /* i  : A_ind -> weighted envelope factor          Q15*/
+    const Word16 gamma_uw,    /* i  : A_ind -> non-weighted envelope factor      Q14*/
+    Word32 env[]              /* o  : shaped signal envelope                     Q16*/
+);
+
+void tcx_arith_decode_envelope_ivas_fx(
+    Decoder_State *st,          /* i/o: coder state                   */
+    Word32 q_spectrum[],        /* o  : quantised MDCT coefficients   */
+    Word16 *q_spectrum_e,       /* o  : MDCT exponent                 */
+    const Word16 L_frame,       /* i  : frame or MDCT length          */
+    Word16 L_spec,              /* i  : length w/o BW limitation      */
+    const Word16 A_ind[],       /* i  : quantised LPC coefficients    */
+    const Word16 target_bits,   /* i  : number of available bits      */
+    Word16 prm[],               /* i  : bitstream parameters          */
+    const Word16 use_hm,        /* i  : use HM in current frame?      */
+    const Word16 prm_hm[],      /* i  : HM parameter area             */
+    Word16 tcxltp_pitch,        /* i  : TCX LTP pitch in FD, -1 if n/a*/
+    Word16 *arith_bits,         /* o  : bits used for ari. coding     */
+    Word16 *signaling_bits,     /* o  : bits used for signaling       */
+    const Word16 low_complexity /* i  : low-complexity flag           */
+);
+
+
+void UnmapIndex_fx(
+    const Word16 PeriodicityIndex, /* Q0 */
+    const Word16 Bandwidth,        /* Q0 */
+    const Word16 LtpPitchLag,      /* Q0 */
+    const Word8 SmallerLags,       /* Q0 */
+    Word16 *FractionalResolution,  /* Q0 */
+    Word32 *Lag                    /* Q0 */
+);
+
+#define GET_ADJ( T, L )     GET_ADJ2( T, L, *FractionalResolution )
+#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )
+
+
+Word32 tcx_hm_render_fx(
+    const Word32 lag,       /* i: pitch lag                         Q0  */
+    const Word16 fract_res, /* i: fractional resolution of the lag  Q0  */
+    Word16 p[]              /* o: harmonic model                    Q13 */
+);
+
+
+void tcx_hm_modify_envelope_fx(
+    const Word16 gain,      /* i:   HM gain                           Q11 */
+    const Word32 lag,       /* i:   pitch lag                         Q0  */
+    const Word16 fract_res, /* i:   fractional resolution of the lag  Q0  */
+    const Word16 p[],       /* i:   harmonic model                    Q13 */
+    Word32 env[],           /* i/o: envelope                          Q16 */
+    const Word16 L_frame    /* i:   number of spectral lines          Q0  */
+);
+
+void tcx_hm_decode(
+    const Word16 L_frame,     /* i  : number of spectral lines      */
+    Word32 env[],             /* i/o: envelope shape (Q16)          */
+    const Word16 targetBits,  /* i  : target bit budget             */
+    const Word16 coder_type,  /* i  : GC/VC coder type              */
+    const Word16 prm_hm[],    /* i  : HM parameters                 */
+    const Word16 LtpPitchLag, /* i  : LTP pitch lag or -1 if none   */
+    Word16 *hm_bits           /* o  : bit consumption               */
+);
+
+void writeTCXMode_fx(
+    Encoder_State *st,     /* i/o: encoder state structure					*/
+    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle						*/
+    const Word16 MCT_flag, /* i  : hMCT handle allocated (1) or not (0)		Q0*/
+    Word16 *nbits_start    /* o  : nbits start								Q0*/
+);
+
+void writeTCXWindowing_fx(
+    BSTR_ENC_HANDLE hBstr,    /* i/o: bitstream handle				*/
+    const Word16 overlap_mode /* i  : overlap mode					Q0*/
+);
+
+void writeLPCparam(
+    Encoder_State *st,             /* i/o: encoder state structure     */
+    BSTR_ENC_HANDLE hBstr,         /* i/o: bitstream handle            */
+    const Word16 param_lpc[],      /* i  : LPC parameters to write     */
+    const Word16 bits_param_lpc[], /* i  : bits per LPC parameter      */
+    const Word16 no_param_lpc,     /* i  : number of LPC parameters    */
+    Word16 *nbits_lpc              /* o  : LPC bits written            */
+);
+
+void const *GetTnsOnWhite( void const *p, const Word16 index, Word16 *pValue );
+void *SetTnsOnWhite( void *p, const Word16 index, const Word16 value );
+void const *GetNumOfTnsFilters_flt( void const *p, const Word16 index, Word16 *pValue );
+void *SetNumOfTnsFilters_flt( void *p, const Word16 index, const Word16 value );
+
+Word16 DecodeSWBTCX10TnsFilterCoeff_flt( Decoder_State *st, const Word16 index, Word16 *pValue );
+Word16 DecodeSWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const Word16 index, Word16 *pValue );
+
+Word16 DecodeWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const Word16 index, Word16 *pValue );
+
+Word16 DecodeTnsFilterOrderSWBTCX10_flt( Decoder_State *st, const Word16 index, Word16 *pValue );
+Word16 DecodeTnsFilterOrderSWBTCX20_flt( Decoder_State *st, const Word16 index, Word16 *pValue );
+
+Word16 EncodeTnsFilterOrderSWBTCX10_flt( const Word16 value, const Word16 index );
+
+Word16 GetTnsFilterOrderBitsSWBTCX10_flt( const Word16 value, const Word16 index );
+Word16 DecodeTnsFilterOrder_flt( Decoder_State *st, const Word16 index, Word16 *pValue );
+
+void ResetTnsData_flt(
+    STnsData *pTnsData );
+
+void ClearTnsFilterCoefficients_flt(
+    STnsFilter *pTnsFilter );
+
+void EncodeTnsData(
+    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */
+    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
+    Word16 *stream,               /* o  : internal data stream              */
+    Word16 *pnSize,               /* o  : number of written parameters      */
+    Word16 *pnBits                /* o  : number of written bits            */
+);
+
+Word16 DecodeTnsData_ivas(
+    STnsConfig const *pTnsConfig,
+    const Word16 *stream,
+    Word16 *pnSize,
+    STnsData *pTnsData );
+
+void WriteTnsData(
+    const STnsConfig *pTnsConfig, /* i  : TNS Configuration struct          */
+    const Word16 *stream,         /* i  : internal data stream              */
+    Word16 *pnSize,               /* o  : number of written parameters      */
+    BSTR_ENC_HANDLE hBstr,        /* o  : bitstream                         */
+    Word16 *pnBits                /* o  : number of written bits            */
+);
+
+void ReadTnsData_ivas(
+    STnsConfig const *pTnsConfig,
+    Decoder_State *st,
+    Word16 *pnBits,
+    Word16 *stream,
+    Word16 *pnSize );
+
+void analysisCldfbEncoder_ivas_fx(
+    Encoder_State *st,       /* i/o: encoder state structure   */
+    Word32 *timeIn,          /*q11*/
+    Word16 timeInq,          /*q0*/
+    Word16 samplesToProcess, /*q0*/
+    Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
+    Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
+    Word16 realBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
+    Word16 imagBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
+    Word32 *ppBuf_Ener,
+    Word16 *enerBuffSum_exp,
+    CLDFB_SCALE_FACTOR *scale );
+
+ivas_error openCldfb_ivas(
+    HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle               */
+    CLDFB_TYPE type,                   /* i  : analysis or synthesis            */
+    const Word32 sampling_rate,        /* i  : sampling rate                    */
+    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay) */
+);
+
+void resampleCldfb_ivas(
+    HANDLE_CLDFB_FILTER_BANK hs, /* i/o: filter bank handle          */
+    const Word32 newSamplerate   /* i  : new samplerate to operate   */
+);
+
+ivas_error cldfb_save_memory_ivas(
+    HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle          */
+);
+
+/*! r: flag indicating a valid bitrate */
+Word16 is_EVS_bitrate(
+    const Word32 ivas_total_brate, /* i  : EVS total bitrate  */
+    Word16 *Opt_AMR_WB             /* i  : AMR-WB IO flag     */
+);
+
+void IGFEncResetTCX10BitCounter_ivas_fx(
+    const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */
+);
+
+ivas_error IGF_Reconfig(
+    IGF_ENC_INSTANCE_HANDLE *hIGFEnc, /* i/o: instance handle of IGF Encoder  */
+    const Word16 igf,                 /* i  : IGF on/off                      */
+    const Word16 reset,               /* i  : reset flag                      */
+    const Word32 brate,               /* i  : bitrate for configuration       */
+    const Word16 bwidth,              /* i  : signal bandwidth                */
+    const Word16 element_mode,        /* i  : IVAS element mode               */
+    const Word16 rf_mode              /* i  : flag to signal the RF mode      */
+);
+
+void ordr_esti(
+    const Word16 k,   /* i  : sub-vector index                         */
+    Word16 *Mpos,     /* i/o: dominant sub-vector position from ACV    */
+    Word16 svOrder[], /* i/o: AVQ sub-vector order                     */
+    const Word16 Nsv  /* i  : total sub-vectors in a sub-frames        */
+);
+
+/*===========================================================================================*/
+#endif
diff --git a/lib_com/pvq_com_fx.c b/lib_com/pvq_com_fx.c
index 36fa528b863fe573823b24915d60a7e4ca6e5fb3..1adcdb7ae6074f3f2b89dbd4883a144f48883b55 100644
--- a/lib_com/pvq_com_fx.c
+++ b/lib_com/pvq_com_fx.c
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include "options.h" /* Compilation switches                   */
 #include "prot_fx.h" /* Function prototypes                    */
-#include "prot.h"    /* Function prototypes                    */
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
 
@@ -457,11 +456,7 @@ void NearOppSplitAdjustment_fx(
     }
     *qnear = qboth; /* Q3 */
     move16();
-#ifdef BASOP_NOGLOB
     QIb = extract_h( L_shl_o( L_QIb, 16, &Overflow ) ); /* may saturate		Q0*/
-#else
-    QIb = extract_h( L_shl( L_QIb, 16 ) ); /* may saturate */
-#endif
     if ( LE_16( QIb, qboth ) )
     {
         *qnear = QIb; /* Q0 */
@@ -514,77 +509,6 @@ void apply_gain_fx(
  *
  * Fine gain quantization
  *--------------------------------------------------------------------------*/
-void fine_gain_quant_ivas_fx(
-    BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle                        */
-    const Word16 *ord,       /* i  : Indices for energy order                 Q0     */
-    const Word16 num_sfm,    /* i  : Number of bands                          Q0     */
-    const Word16 *gain_bits, /* i  : Gain adjustment bits per sub band        Q0     */
-    Word16 *fg_pred,         /* i/o: Predicted gains / Corrected gains i:Q12 / o:Q11 */
-    const Word16 *gopt       /* i  : Optimal gains                            Q12    */
-)
-{
-    Word16 band;
-    Word16 gbits;
-    Word16 idx;
-    Word16 gain_db, gain_dbq;
-    Word16 err;
-
-    Word16 tmp1, tmp2, exp1, exp2;
-    Word32 L_tmp;
-    UWord16 lsb;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-    FOR( band = 0; band < num_sfm; band++ )
-    {
-        gbits = gain_bits[ord[band]]; /* Q0 */
-        move16();
-        test();
-        IF( fg_pred[band] != 0 && gbits > 0 )
-        {
-            exp1 = norm_s( gopt[band] );
-            exp1 = sub( exp1, 1 );
-            tmp1 = shl( gopt[band], exp1 );
-            exp2 = norm_s( fg_pred[band] );
-            tmp2 = shl( fg_pred[band], exp2 ); /* Q12 + exp2 */
-            exp1 = add( 15, sub( exp1, exp2 ) );
-            err = div_s( tmp1, tmp2 ); /* Q15 */
-            tmp1 = norm_s( err );
-            exp2 = Log2_norm_lc( L_deposit_h( shl( err, tmp1 ) ) );
-            tmp1 = sub( 14, tmp1 );
-            tmp1 = sub( tmp1, exp1 );
-            L_tmp = L_Comp( tmp1, exp2 );
-            Mpy_32_16_ss( L_tmp, 24660, &L_tmp, &lsb ); /* 24660 = 20*log10(2) in Q12 */ /*16+12-15=13 */
-#ifdef BASOP_NOGLOB
-            gain_db = round_fx_sat( L_shl_o( L_tmp, 17, &Overflow ) ); /* Q14 */
-#else                                                                  /* BASOP_NOGLOB */
-            gain_db = round_fx( L_shl( L_tmp, 17 ) );
-#endif
-
-            idx = squant_fx( gain_db, &gain_dbq, finegain_fx[gbits - 1], gain_cb_size[gbits - 1] ); /* Q0 */
-            push_indice( hBstr, IND_PVQ_FINE_GAIN, idx, gbits );
-
-            L_tmp = L_mult0( gain_dbq, 21771 ); /* 21771=0.05*log2(10) */ /* 14+17=31 */
-            L_tmp = L_shr( L_tmp, 15 );                                   /* Q16 */
-            tmp1 = L_Extract_lc( L_tmp, &exp1 );
-            tmp1 = abs_s( tmp1 );
-            tmp1 = extract_l( Pow2( 14, tmp1 ) );
-            exp1 = sub( 14, exp1 );
-
-            L_tmp = L_mult0( fg_pred[band], tmp1 );                      /*12+exp1 */
-            fg_pred[band] = round_fx( L_shl( L_tmp, sub( 15, exp1 ) ) ); /*12+exp1+16-exp1-16=12 - 1-> Q11*/
-            move16();
-        }
-        ELSE
-        {
-            fg_pred[band] = shr( fg_pred[band], 1 ); // Q12 -> Q11 To align all the fg_pred indices in same Q.
-        }
-    }
-
-    return;
-}
 void fine_gain_quant_fx(
     BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle					  */
     const Word16 *ord,       /* i  : Indices for energy order                 Q0  */
@@ -628,14 +552,10 @@ void fine_gain_quant_fx(
             tmp1 = sub( tmp1, exp1 );
             L_tmp = L_Comp( tmp1, exp2 );
             Mpy_32_16_ss( L_tmp, 24660, &L_tmp, &lsb ); /* 24660 = 20*log10(2) in Q12 */ /*16+12-15=13 */
-#ifdef BASOP_NOGLOB
             gain_db = round_fx_sat( L_shl_o( L_tmp, 17, &Overflow ) );
-#else /* BASOP_NOGLOB */
-            gain_db = round_fx( L_shl( L_tmp, 17 ) );
-#endif
 
             idx = squant_fx( gain_db, &gain_dbq, finegain_fx[gbits - 1], gain_cb_size[gbits - 1] );
-            push_indice_fx( hBstr, IND_PVQ_FINE_GAIN, idx, gbits );
+            push_indice( hBstr, IND_PVQ_FINE_GAIN, idx, gbits );
 
             L_tmp = L_mult0( gain_dbq, 21771 ); /* 21771=0.05*log2(10) */ /* 14+17=31 */
             L_tmp = L_shr( L_tmp, 15 );                                   /* Q16 */
@@ -644,8 +564,8 @@ void fine_gain_quant_fx(
             tmp1 = extract_l( Pow2( 14, tmp1 ) );
             exp1 = sub( 14, exp1 );
 
-            L_tmp = L_mult0( fg_pred[band], tmp1 );                      /*12+exp1 */
-            fg_pred[band] = round_fx( L_shl( L_tmp, sub( 16, exp1 ) ) ); /*12+exp1+16-exp1-16=12 */
+            L_tmp = L_mult0( fg_pred[band], tmp1 );                              /*12+exp1 */
+            fg_pred[band] = round_fx_sat( L_shl_sat( L_tmp, sub( 16, exp1 ) ) ); /*12+exp1+16-exp1-16=12 */
             move16();
         }
     }
diff --git a/lib_com/re8_util_fx.c b/lib_com/re8_util_fx.c
index 746b7152ba401e6ac47dc6c51966b9cd9dbbc99a..de70279ebf63772e0a2bd841a2c5633ea1e94dca 100644
--- a/lib_com/re8_util_fx.c
+++ b/lib_com/re8_util_fx.c
@@ -275,11 +275,7 @@ static Word16 re8_identify_absolute_leader_fx(                  /* o : integer i
     {
         Ls = L_mac( Ls, y[i], y[i] ); /* Q1 */
     }
-#ifdef BASOP_NOGLOB
     s = extract_h( L_shl_sat( Ls, 16 - ( 3 + 1 ) ) ); /* s can saturate here */
-#else
-    s = extract_h( L_shl( Ls, 16 - ( 3 + 1 ) ) ); /* s can saturate here */
-#endif
     /*-----------------------------------------------------------------------*
      * compute the index 0 <= ka <= NB_LEADER+1 which identifies an absolute leader of Q0, Q2, Q3 or Q4
      *
diff --git a/lib_com/reordvct_fx.c b/lib_com/reordvct_fx.c
index 3b741203a824b9240d6c4b6ddbbca3d6e795e1d4..62eb2f352665c97f24322207fc2092e4ac2e5c64 100644
--- a/lib_com/reordvct_fx.c
+++ b/lib_com/reordvct_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/residu_fx.c b/lib_com/residu_fx.c
index 156e81eada140b1322e377afc47e24e24b15efd8..32d18d1feb543401666d751fb554240dce4e8e6f 100644
--- a/lib_com/residu_fx.c
+++ b/lib_com/residu_fx.c
@@ -7,7 +7,6 @@
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
 #include "prot_fx.h"
-#include "prot.h"
 
 /*--------------------------------------------------------------------*
  * residu_ivas_fx()
@@ -73,62 +72,32 @@ void Residu3_lc_fx(
     {
         q = add( q, shift );
     }
-#ifdef BASOP_NOGLOB
     *y++ = shl_o( x[0], shift, &Overflow );
-#else
-    *y++ = shl( x[0], shift );
-#endif
     move16();
 
     FOR( i = 1; i < m; i++ )
     {
-#ifdef BASOP_NOGLOB
         s = L_mult_o( x[i], a[0], &Overflow );
-#else
-        s = L_mult( x[i], a[0] );
-#endif
         /* Stop at i to Avoid Mults with Zeros */
         FOR( j = 1; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac_o( s, x[i - j], a[j], &Overflow );
-#else
-            s = L_mac( s, x[i - j], a[j] );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         s = L_shl_o( s, q, &Overflow );
         *y++ = round_fx_o( s, &Overflow );
-#else
-        s = L_shl( s, q );
-        *y++ = round_fx( s );
-#endif
     }
 
     FOR( ; i < lg; i++ )
     {
-#ifdef BASOP_NOGLOB
         s = L_mult_o( x[i], a[0], &Overflow );
-#else
-        s = L_mult( x[i], a[0] );
-#endif
         FOR( j = 1; j <= m; j++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac_o( s, x[i - j], a[j], &Overflow );
-#else
-            s = L_mac( s, x[i - j], a[j] );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         s = L_shl_o( s, q, &Overflow );
         *y++ = round_fx_o( s, &Overflow );
-#else
-        s = L_shl( s, q );
-        *y++ = round_fx( s );
-#endif
     }
 }
 
@@ -161,11 +130,7 @@ void Residu3_10_fx(
             s64 = W_mac_16_16( s64, x[i - j], a[j] );
         }
         s = W_shl_sat_l( s64, q );
-#ifdef BASOP_NOGLOB
         y[i] = round_fx_sat( s );
-#else
-        y[i] = round_fx( s );
-#endif
     }
 }
 /*--------------------------------------------------------------------*
@@ -205,12 +170,8 @@ void Residu3_fx(
         }
         s64 = W_mac_16_16( s64, x[i - 16], a[16] );
         s32 = W_shl_sat_l( s64, q );
-#ifdef BASOP_NOGLOB
         y[i] = round_fx_o( s32, &Overflow );
         move16();
-#else /* BASOP_NOGLOB */
-        y[i] = round_fx( s32 );
-#endif
     }
 }
 /*==========================================================================*/
diff --git a/lib_com/rom_basop_util.c b/lib_com/rom_basop_util.c
index 4a0eed6b617dfd1bc85101be3a0ea2f24eaed5e8..eb79cc02648c67df6dbd075f3da2a9704142e2f8 100644
--- a/lib_com/rom_basop_util.c
+++ b/lib_com/rom_basop_util.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -1449,7 +1449,7 @@ void BASOP_getTables( const PWord16 **ptwiddle /*Q15*/, const PWord16 **sin_twid
     ld2_length = sub( 16 - 1 - 1, norm_s( length ) );
 
     /* Extract sort of "eigenvalue" (the 5 left most bits) of length. */
-    SWITCH( (unsigned short) L_shl( length, sub( 15, ld2_length ) ) )
+    SWITCH( (UWord16) L_shl( length, sub( 15, ld2_length ) ) )
     {
         case 0xa000: /* 640 */
             move16();
diff --git a/lib_com/rom_basop_util.h b/lib_com/rom_basop_util.h
index f2e81f0a175ccb7bc2f948519e2a5e58a1d8eb8a..e7811db89fa50d2dce8a529ae386ae1654dd03bc 100644
--- a/lib_com/rom_basop_util.h
+++ b/lib_com/rom_basop_util.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/rom_com.c b/lib_com/rom_com.c
index 612e30bdf6d5a833984683cc135d7797466c2f83..a5c8a3b7c65d8747e20b83f4afa8205438fe54ac 100644
--- a/lib_com/rom_com.c
+++ b/lib_com/rom_com.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,10 +38,9 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "basop_util.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /* clang-format off */
 
@@ -1770,35 +1769,35 @@ static const Word16 filter_LP30_300K_fx[LFE_PLC_FDEL + 1] =
 const Resampling_cfg resampling_cfg_tbl[] =
 {	
     /* fin           fout          up.fact.    den.fac. len.out     filter coefs.                           filter length/2     filter mem./2                  flags */
-    {  8000,  8000,  12800, 12800,   8,     8,    5,     256,    /*filter5_39s320_120,*/ filter5_39s320_120_fx,      15,            15,                RS_INV_FAC, RS_INV_FAC    },
-	{  12800, 12800, 8000,  8000,    5,     5,    8,     160,    /*filter5_39s320_120,*/ filter5_39s320_120_fx,      L_FILT_UP8k,   L_FILT_UP8k,       RS_INV_FAC, RS_INV_FAC    },
-	{  16000, 16000, 8000,  8000,    6,     6,    12,    160,    /*filter_LP12_180H,*/   filter_LP12_180H_fx,        180 / 6,       180 / 6,             0,          0           },
-	{  12800, 12800, 16000, 16000,   15,    15,   12,    320,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,        L_FILT_UP16k,  L_FILT_UP16k,        0,          0           },
-	{  12800, 12800, 32000, 32000,   15,    15,   6,     640,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,        L_FILT_UP32k,  L_FILT_UP32k,        0,          0           },
-	{  12800, 12800, 48000, 48000,   15,    15,   4,     960,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,        L_FILT_UP48k,  L_FILT_UP48k,        0,          0           },
+    {  8000,  12800,   8,    5,     256,    /*filter5_39s320_120,*/ filter5_39s320_120_fx,       15,                RS_INV_FAC    },
+	{  12800, 8000,    5,    8,     160,    /*filter5_39s320_120,*/ filter5_39s320_120_fx,       L_FILT_UP8k,       RS_INV_FAC    },
+	{  16000, 8000,    6,    12,    160,    /*filter_LP12_180H,*/   filter_LP12_180H_fx,         180 / 6,             0           },
+	{  12800, 16000,   15,   12,    320,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,         L_FILT_UP16k,        0           },
+	{  12800, 32000,   15,   6,     640,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,         L_FILT_UP32k,        0           },
+	{  12800, 48000,   15,   4,     960,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,         L_FILT_UP48k,        0           },
 																								    
-    {  16000, 16000, 12800, 12800,   12,     12,   15,   256,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,        L_FILT16k,     L_FILT16k,           0,          0           },
-	{  16000, 16000, 32000, 32000,   12,     12,   6,    640,    /*filter_LP12_180H, */  filter_LP12_180H_fx,        L_FILT16k,     L_FILT16k,           0,          0           },
-	{  16000, 16000, 48000, 48000,   12,     12,   4,    960,    /*filter_LP12_180H,*/   filter_LP12_180H_fx,        L_FILT16k,     L_FILT16k,           0,          0           },
-													     
-    {  32000, 32000, 12800, 12800,   6,	    6,    15,    256,    /*filter_LP15_180H,*/   filter_LP15_180H_13b_fx,    L_FILT32k,     L_FILT32k,           0,          0			},
-	{  32000, 32000, 16000, 16000,   6,	    6,    12,    320,    /*filter_LP12_180H,*/   filter_LP12_180H_13b_fx,    L_FILT32k,     L_FILT32k,           0,          0			},
-	{  32000, 32000, 25600, 25600,   12,     12,   15,   512,    /*filter_LP15_360H,*/   filter_LP15_360H_13b_fx,    L_FILT32k,     L_FILT32k,           0,          0			},
-	{  32000, 32000, 48000, 48000,   3,      3,    2,    960,    /*filter_LP3_90H,*/     filter_LP3_90H_fx,          L_FILT32k,     L_FILT32k,           0,          0			},
-												  	     
-    {  48000, 48000, 12800, 12800,   4,      4,    15,   256,    /*filter_LP15_180H,*/   filter_LP15_180H_13b_fx,    L_FILT48k,     L_FILT48k,           0,          0			},
-	{  48000, 48000, 16000, 16000,   4,      4,    12,   320,    /*filter_LP12_180H,*/   filter_LP12_180H_13b_fx,    L_FILT48k,     L_FILT48k,           0,          0			},
-	{  48000, 48000, 25600, 25600,   8,      8,    15,   512,    /*filter_LP15_360H,*/   filter_LP15_360H_13b_fx,    L_FILT48k,     L_FILT48k,		     0,          0			},
-	{  48000, 48000, 32000, 32000,   2,      2,    3,    640,    /*filter_LP3_90H,*/     filter_LP3_90H_fx,          L_FILT48k,     L_FILT48k,		     0,          0			},
+    {  16000, 12800,    12,    15,   256,    /*filter_LP15_180H,*/   filter_LP15_180H_fx,        L_FILT16k,           0,                 },
+	{  16000, 32000,    12,    6,    640,    /*filter_LP12_180H, */  filter_LP12_180H_fx,        L_FILT16k,           0,                 },
+	{  16000, 48000,    12,    4,    960,    /*filter_LP12_180H,*/   filter_LP12_180H_fx,        L_FILT16k,           0,                 },
+							   
+    {  32000, 12800,    6,	   15,    256,    /*filter_LP15_180H,*/   filter_LP15_180H_13b_fx,    L_FILT32k,           0,      			},
+	{  32000, 16000,    6,	   12,    320,    /*filter_LP12_180H,*/   filter_LP12_180H_13b_fx,    L_FILT32k,           0,      			},
+	{  32000, 25600,    12,    15,   512,    /*filter_LP15_360H,*/   filter_LP15_360H_13b_fx,    L_FILT32k,           0,       		},
+	{  32000, 48000,    3,     2,    960,    /*filter_LP3_90H,*/     filter_LP3_90H_fx,          L_FILT32k,           0,       		},
+							     
+    {  48000, 12800,    4,     15,   256,    /*filter_LP15_180H,*/   filter_LP15_180H_13b_fx,    L_FILT48k,           0,       		},
+	{  48000, 16000,    4,     12,   320,    /*filter_LP12_180H,*/   filter_LP12_180H_13b_fx,    L_FILT48k,           0,       		},
+	{  48000, 25600,    8,     15,   512,    /*filter_LP15_360H,*/   filter_LP15_360H_13b_fx,    L_FILT48k,		     0,        		},
+	{  48000, 32000,    2,     3,    640,    /*filter_LP3_90H,*/     filter_LP3_90H_fx,          L_FILT48k,		     0,        		},
 												  
     /* configs with NB 4kHz low-pass */			  
-    {  16000, 16000, 12800, 12800,   12,     12,   15,   256,    /*filter_LP24_90H,*/    filter_LP24_90H_fx,        L_FILT16k,      L_FILT16k,		     0,          0			},
-	{  32000, 32000, 12800, 12800,   6,      6,    15,   256,    /*filter_LP24_90H,*/    filter_LP24_90H_13b_fx,    L_FILT32k,      L_FILT32k,           0,          0			},
-	{  48000, 48000, 12800, 12800,   4,      4,    15,   256,    /*filter_LP24_90H,*/    filter_LP24_90H_13b_fx,    L_FILT48k,      L_FILT48k,           0,          0			},
+    {  16000, 12800,   12,     15,   256,    /*filter_LP24_90H,*/    filter_LP24_90H_fx,         L_FILT16k,		     0,        		},
+	{  32000, 12800,   6,      15,   256,    /*filter_LP24_90H,*/    filter_LP24_90H_13b_fx,     L_FILT32k,           0,       		},
+	{  48000, 12800,   4,      15,   256,    /*filter_LP24_90H,*/    filter_LP24_90H_13b_fx,     L_FILT48k,           0,       		},
 
     /* entry for LFE PLC */
-    {  1600,  1600,  48000, 48000,   30,     30,   1,     960,   /*filter_LP30_300K,*/   filter_LP30_300K_fx,       LFE_PLC_FDEL/30,LFE_PLC_FDEL / 30,   0,          0           },
-    {  0,     0,      0,        0,    0,      0,   0,       0,    /*              0, */                    0,               0,           0,              0,          0           } /* trailing entry (just to calculate the length of this table) */
+    {  1600,  48000,    30,      1,     960,   /*filter_LP30_300K,*/   filter_LP30_300K_fx,      LFE_PLC_FDEL / 30,   0,                 },
+    {  0,      0,        0,      0,       0,    /*              0, */                    0,          0,              0,                 } /* trailing entry (just to calculate the length of this table) */
 };
 
 //den fac value for last entry is calculated as den.fac = (num.fac*fin)/fout
@@ -14271,6 +14270,25 @@ const Word16 win_lpc_hb_wb_fx[(L_LOOK_12k8 + L_SUBFR + L_FRAME) * 5 / 32] =
     32611,   32698,   32751
 };
 
+const Word16 win_lpc_hb_wb_ivas_fx[(L_LOOK_12k8 + L_SUBFR + L_FRAME) * 5 / 32] =
+{//Q15
+	6, 51, 140, 274,
+	453, 675, 940, 1247,
+	1596, 1985, 2414, 2882,
+	3386, 3926, 4499, 5106,
+	5743, 6410, 7104, 7823,
+	8566, 9331, 10114, 10915,
+	11731, 12559, 13398, 14245,
+	15099, 15955, 16813, 17669,
+	18523, 19370, 20209, 21037,
+	21853, 22654, 23437, 24202,
+	24945, 25664, 26358, 27025,
+	27662, 28269, 28842, 29382,
+	29886, 30354, 30783, 31172,
+	31521, 31828, 32093, 32315,
+	32494, 32628, 32717, 32762
+};
+
 
 const Word16 ola_win_shb_switch_fold_fx[L_SUBFR16k] =
 {//Q15
@@ -16772,7 +16790,6 @@ const Word16 GSC_freq_bits[] =
     26,    96,    0,    28, 18, 13, 12,10,10, 5,   4, 4, 1, 0, 1, 3, 4,            /* ACELP_22k60*/
     26,    96,    0,    28, 18, 13, 12,10,10, 5,   4, 4, 1, 0, 1, 3, 4             /* ACELP_24k40*/
 };	// Q0
-#ifdef MOD_BIT_ALLOC_ROM_TABLE
 const Word32 GSC_freq_bits_fx[] =/*Q18*/
 {
     5505024,	  17563648,	  -1572864,	   6553600,	   3932160,	   2883584,	   2621440,	   1310720,	         0,	         0,	   1310720,	   1048576,	         0,	         0,	   1048576,	         0,	         0,	           /* ACELP_5k00*/
@@ -16805,17 +16822,6 @@ const Word32 GSC_freq_bits_fx_Q18[] =/*Q18*/
     6815744, 25165824, 0, 7340032, 4718592, 3407872, 3145728, 2621440, 2621440, 1310720, 1048576, 1048576, 262144, 0, 262144, 786432, 1048576, 
     6815744, 25165824, 0, 7340032, 4718592, 3407872, 3145728, 2621440, 2621440, 1310720, 1048576, 1048576, 262144, 0, 262144, 786432, 1048576, 
 };
-#else
-const Word32 GSC_freq_bits_fx[] =
-{
-    5505024,	  17563648,	  -1572864,	   6553600,	   3932160,	   2883584,	   2621440,	   1310720,	         0,	         0,	   1310720,	   1048576,	         0,	         0,	   1048576,	         0,	         0,	           /* ACELP_7k20*/
-    5505024,	  19660800,	  -1048576,	   6815744,	   4194304,	   3145728,	   2883584,	   2359296,	         0,	         0,	   1048576,	   1048576,	    262144,	    262144,	    786432,	         0,	         0,	           /* ACELP_8k00*/
-    6815744,	  25165824,	  -1048576,	   7340032,	   4718592,	   3407872,	   3145728,	   2621440,	   2621440,	   1310720,	   1048576,	   1048576,	    262144,	         0,	    262144,	    786432,	   1048576,	           /* ACELP_11k60*/
-    6815744,	  25165824,	  -1048576,	   7340032,	   4718592,	   3407872,	   3145728,	   2621440,	   2621440,	   1310720,	   1048576,	   1048576,	    262144,	         0,	    262144,	    786432,	   1048576,	           /* ACELP_12k15*/
-    6815744,	  25165824,	  -1048576,	   7340032,	   4718592,	   3407872,	   3145728,	   2621440,	   2621440,	   1310720,	   1048576,	   1048576,	    262144,	         0,	    262144,	    786432,	   1048576,	           /* ACELP_12k85*/
-    8126464,	  25165824,	  -1048576,	   7340032,	   4718592,	   3407872,	   3145728,	   2621440,	   2621440,	   1310720,	   1048576,	   1048576,	    262144,	         0,	    262144,	    786432,	   1048576,	           /* ACELP_13k20*/
-};
-#endif
 const Word16 Compl_GSC_freq_bits[] =
 {
    5, 10, 10, 10         /* bitrate > ACELP_16k40 && FS = 16kHz */
@@ -22032,27 +22038,8 @@ const Word32 sigma_BWE_fx[] = {//Q31
 40792208 }; /* for 3 bits first stage */
 
 
-const Word16 inv_modified_sigma_BWE_fx[] = {//Q1
-  259,
-254,
-267,
-266,
-293,
-315,
-598,
-622,
-288,
-288,
-297,
-297,
-319,
-346,
-598,
-622
-};
-
-const Word16 modified_sigma_BWE_fx[] =//Q(log2(2.56)
-{ 323,
+const Word16 inv_modified_sigma_BWE_fx[] = {//x2.56
+323,
 329,
 313,
 314,
@@ -22067,8 +22054,27 @@ const Word16 modified_sigma_BWE_fx[] =//Q(log2(2.56)
 262,
 242,
 140,
-134 };
+134
+};
 
+const Word16 modified_sigma_BWE_fx[] =//Q15
+{  259,
+254,
+267,
+266,
+293,
+315,
+598,
+622,
+288,
+288,
+297,
+297,
+319,
+346,
+598,
+622 };
+ 
 
 const Word16 SHB_LSF_mean_fx[10] = {//Q15
 1353, 2646, 4046,
@@ -25333,6 +25339,21 @@ const Word16 lsp_shb_prev_tbl_fx[LPC_SHB_ORDER] = {
     13107,
     14746
 };
+
+const Word16 lsp_shb_prev_tbl_swb_tbe_enc_fx[LPC_SHB_ORDER] = {
+    // Q15
+    32767,
+    31165,
+    26509,
+    19262,
+    10123,
+    0,
+    -10124,
+    -19261,
+    -26509,
+    -31166,
+};
+
 const Word16 ivas_lsp_shb_prev_tbl_fx[LPC_SHB_ORDER] = {
     /* Q15 */
     1489,
diff --git a/lib_com/rom_com.h b/lib_com/rom_com.h
index 431c6b7047870558f861250a47cbd42b32b68e73..73156b9892df5be8df2ea273d450acaf492e1fdc 100644
--- a/lib_com/rom_com.h
+++ b/lib_com/rom_com.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -49,13 +49,8 @@
 #define INTERP_EXP 0
 typedef struct
 {
-    Word32 fin;    /* input frequency                   */
-    Word32 fin_fx; /* input frequency                   Q0	*/
-
-    Word32 fout;    /* output frequency                  */
-    Word32 fout_fx; /* output frequency                  Q0	*/
-
-    Word16 fac_num;    /* numerator of resampling factor    */
+    Word32 fin_fx;     /* input frequency                   Q0	*/
+    Word32 fout_fx;    /* output frequency                  Q0	*/
     Word16 fac_num_fx; /* numerator of resampling factor    Q0	*/
 
     Word16 fac_den_fx; /* denominator of resampling factor  Q0	*/
@@ -63,12 +58,9 @@ typedef struct
 
     const Word16 *filter_fx; /* resampling filter coefficients    Q14	*/
 
-    Word16 filt_len;    /* number of filter coeff.           */
     Word16 filt_len_fx; /* number of filter coeff.			Q0	*/
-
-    uint16_t flags;   /* flags from config. table          */
-    UWord16 flags_fx; /* flags from config. table          Q0	*/
-                      // UNS_Word16 flags_fx;     /* flags from config. table          Q0	*/
+    UWord16 flags_fx;   /* flags from config. table          Q0	*/
+                        // UNS_Word16 flags_fx;     /* flags from config. table          Q0	*/
 
 } Resampling_cfg;
 
@@ -612,6 +604,7 @@ extern const Word16 cos_fb_exc_fx[32]; // Q15
 
 extern const Word16 win_lpc_shb_fx[];                                        // Q15 /* Window for calculating SHB LPC coeffs */
 extern const Word16 win_lpc_hb_wb_fx[];                                      // Q15
+extern const Word16 win_lpc_hb_wb_ivas_fx[];                                 // Q15
 extern const Word16 ola_win_shb_switch_fold_fx[];                            // Q15
 extern const Word16 win_flatten_fx[];                                        // Q15
 extern const Word16 win_flatten_4k_fx[];                                     // Q15
@@ -1511,15 +1504,16 @@ extern const Word16 tab_hup_l_fx[]; // Q15
 extern const Word16 mfreq_loc_Q2fx[];   // Q0
 extern const Word16 mfreq_loc_div_25[]; // Q0
 
-extern const Word16 band_len_idx[];                // Q0
-extern const Word16 band_len_ener_shift[];         // Q0
-extern const Word16 fine_gain_pred_sqrt_bw[];      // Q11
-extern const Word16 ivas_band_len_idx[];           // Q0
-extern const Word16 ivas_band_len_ener_shift[];    // Q0
-extern const Word16 ivas_fine_gain_pred_sqrt_bw[]; // Q11
-extern const Word16 Mean_isf_wb[];                 // Q2.56
-extern const Word16 lsp_shb_prev_tbl_fx[];         // Q15
-extern const Word16 ivas_lsp_shb_prev_tbl_fx[];    // Q15
+extern const Word16 band_len_idx[];                    // Q0
+extern const Word16 band_len_ener_shift[];             // Q0
+extern const Word16 fine_gain_pred_sqrt_bw[];          // Q11
+extern const Word16 ivas_band_len_idx[];               // Q0
+extern const Word16 ivas_band_len_ener_shift[];        // Q0
+extern const Word16 ivas_fine_gain_pred_sqrt_bw[];     // Q11
+extern const Word16 Mean_isf_wb[];                     // Q2.56
+extern const Word16 lsp_shb_prev_tbl_fx[];             // Q15
+extern const Word16 lsp_shb_prev_tbl_swb_tbe_enc_fx[]; // Q15
+extern const Word16 ivas_lsp_shb_prev_tbl_fx[];        // Q15
 extern const Word16 tab_ari_qnew[4][4];
 
 // enhancer.c
diff --git a/lib_com/rom_com_fx.c b/lib_com/rom_com_fx.c
index e669a899593f299b38e4b84a13926a140188c5d1..49f50e1622ba4a26b851bc236695c6e4b472078d 100644
--- a/lib_com/rom_com_fx.c
+++ b/lib_com/rom_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,7 +38,7 @@
     EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
   ====================================================================================*/
 
-#include "prot.h"
+#include "prot_fx.h"
 #include "basop_util.h"
 #include "wmc_auto.h"
 #include "rom_com_fx.h"
diff --git a/lib_com/rom_com_fx.h b/lib_com/rom_com_fx.h
index 5c30ad5da6d01b2350a609285938fef00a34e265..29e7637574ac2d2085f44ff635a71493440b7444 100644
--- a/lib_com/rom_com_fx.h
+++ b/lib_com/rom_com_fx.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/scale_mem_fx.c b/lib_com/scale_mem_fx.c
index 9dd997680bf4a009fc03d4e30d3a29f2b9e91eb9..2ce2ffd12b8aad3cf41c48a53bfb7c253b1ee80b 100644
--- a/lib_com/scale_mem_fx.c
+++ b/lib_com/scale_mem_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -307,8 +307,15 @@ void scale_sig32(
         /* saturation can occur here */
         x[i] = L_shl( x[i], exp0 );
         move32();
+#ifdef OPT_STEREO_32KBPS_V1
+        if ( 0 == exp0 )
+        {
+            i = lg;
+        }
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
 }
+
 void scale_sig32_r(
     Word32 x[],       /* i/o: signal to scale                 Qx        */
     const Word16 lg,  /* i  : size of x[]                     Q0        */
@@ -322,6 +329,12 @@ void scale_sig32_r(
         /* saturation can occur here */
         x[i] = L_shl_r( x[i], exp0 );
         move32();
+#ifdef OPT_STEREO_32KBPS_V1
+        if ( 0 == exp0 )
+        {
+            i = lg;
+        }
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
 }
 
diff --git a/lib_com/stab_est_fx.c b/lib_com/stab_est_fx.c
index 73d58af44d8490e334a6e8f734a20a43392a6684..15cd254dfb9fbb09fc2dcacf3828682921c94baf 100644
--- a/lib_com/stab_est_fx.c
+++ b/lib_com/stab_est_fx.c
@@ -73,11 +73,7 @@ Word16 stab_est_fx(
     {
         /*fcorr += ftmp_c*ftmp_c;*/
         tmp16 = sub( lt_diff_etot[i], mean_diff );
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac0_sat( L_tmp, tmp16, tmp16 );
-#else
-        L_tmp = L_mac0( L_tmp, tmp16, tmp16 );
-#endif
     }
     /*------------------------------------------------------------------------*
      * Update
@@ -96,22 +92,14 @@ Word16 stab_est_fx(
 
     exp1 = norm_l( L_tmp );
     L_tmp = L_shl( L_tmp, exp1 );
-#ifdef BASOP_NOGLOB
     tmp16 = round_fx_sat( L_tmp );
-#else
-    tmp16 = round_fx( L_tmp );
-#endif
     exp2 = sub( 31, exp1 );
     L_tmp = Isqrt_lc( L_tmp, &exp2 );
     L_tmp = Mpy_32_16_1( L_tmp, tmp16 );      /* we now have sqrt(L_corr) Q24 (8+16)*/
     exp2 = sub( 31 - 15, sub( exp1, exp2 ) ); /* for Q8 (because of -8^2 from Etot)*/
 
-    L_tmp = L_shl( L_tmp, exp2 ); /* Q8 + Q16*/
-#ifdef BASOP_NOGLOB
+    L_tmp = L_shl( L_tmp, exp2 );             /* Q8 + Q16*/
     dev = extract_h( L_shl_sat( L_tmp, 3 ) ); /* Q(24+3-16) -> Q11 */
-#else                                         /* BASOP_NOGLOB */
-    dev = extract_h( L_shl( L_tmp, 3 ) ); /* Q(24+3-16) -> Q11 */
-#endif
 
     /*------------------------------------------------------------------------*
      * State machine to decide level of inter-harmonic noise reduction and
diff --git a/lib_com/stat_com.h b/lib_com/stat_com.h
index 78d358be577431cdc976dc0c1702b2317a471d24..f99d498027a98db71cfbed521e46712659506917 100644
--- a/lib_com/stat_com.h
+++ b/lib_com/stat_com.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -74,7 +74,7 @@ typedef struct
 typedef struct
 {
     Word16 lead_sign_ind;
-    uint32_t index, size;
+    UWord32 index, size;
     Word16 dim, k_val;
 } PvqEntry;
 
@@ -102,6 +102,13 @@ typedef struct
 
 } ARCODEC, *PARCODEC;
 
+struct dispMem_fx
+{
+    Word16 prev_state;       /*Q0 */
+    Word32 prev_gain_code;   /*Q16 */
+    Word16 prev_gain_pit[6]; /*Q14 */
+};
+
 /*---------------------------------------------------------------*
  * ACELP Encoder/Decoder Static RAM                              *
  *---------------------------------------------------------------*/
@@ -190,6 +197,8 @@ typedef struct TNS_filter_structure
     Word16 order;                           /* Filter order. */
     Word16 coefIndex[TNS_MAX_FILTER_ORDER]; /* Quantized filter coefficients. */
     Word16 predictionGain;                  /* Prediction gain. The ratio of a signal and TNS residual energy. E(PRED_GAIN_E), Q7 */
+    Word32 predictionGain32;                /* Prediction gain. The ratio of a signal and TNS residual energy.  predictionGain_e */
+    Word16 predictionGain_e;                /*Exponent for predictionGain32 */
     Word16 avgSqrCoef;                      /* Average squared filter coefficient. E(0), Q15 */
 } STnsFilter;
 
@@ -304,7 +313,7 @@ typedef struct
 {
     Word32 low;
     Word32 high;
-    uint32_t value;
+    UWord32 value;
     Word32 bits_to_follow;
 } Tastat;
 typedef struct
@@ -411,7 +420,7 @@ typedef struct
     Word16 psize_norm[NPART];          /* Partition sizes, fractional variable Q15-psize_norm_exp*/
     Word16 psize_inv[NPART];           /* Inverse of partition sizes Q15*/
                                        // Word16 FFTscalingFactor;  /* Squared ratio between core signal analysis FFT and noise estimator FFT */
-    Word16 scalingFactor;              // Q15
+    Word16 scalingFactor;              // exp = -15
     Word16 invScalingFactor;           // Q15
     Word16 nCLDFBpart;                 /* Number of CLDFB spectral partitions */
     Word16 CLDFBpart[NPARTCLDFB];      /* CLDFB Partition upper boundaries (band indices starting from 0 above the core coder bands) */
@@ -481,15 +490,6 @@ typedef Word16 ( *TEncodeValue )( Word16 value, Word16 index );
  */
 typedef Word16 ( *TDecodeValue )( struct Decoder_State *st, Word16 index, Word16 *pValue );
 
-/** Linear prediction analysis/synthesis filter definition.
- * @param order filter order.
- * @param parCoeff filter (PARCOR) coefficients.
- * @param state state of the filter. Must be at least of 'order' size.
- * @param x the current input value.
- * @return the output of the filter.
- */
-typedef float ( *TLinearPredictionFilter_flt )( const int16_t order, const float parCoeff[], float *state, float x );
-
 /** Structure that defines mapping between a parameter and a bitstream. */
 typedef struct ParamBitMap
 {
@@ -693,21 +693,6 @@ typedef enum
 /*---------------------------------------------------------------*
  * IGF                                                           *
  *---------------------------------------------------------------*/
-/*----------------------------------------------------------------------------------*
- * NB postfilter / formant postfilter static variables
- *----------------------------------------------------------------------------------*/
-typedef struct pfstat_structure
-{
-    Word16 on;                    /* On/off flag           */
-    Word16 reset;                 /* reset flag           */
-    Word16 mem_pf_in[L_SUBFR];    /* Input memory        Qqmem_pf_in  */
-    Word16 mem_stp[L_SUBFR];      /*  1/A(gamma1) memory   Qqmem_stp*/
-    Word16 mem_res2[DECMEM_RES2]; /* A(gamma2) residual    Q_syn*/
-    Word16 mem_zero[M];           /* null memory to compute i.r. of A(gamma2)/A(gamma1) Q_qmem_zero*/
-    Word16 gain_prec; /*Q14*/     /* for gain adjustment   */
-
-} PFSTAT, *PFSTAT_HANDLE;
-
 
 typedef struct
 {
diff --git a/lib_com/stat_noise_uv_mod_fx.c b/lib_com/stat_noise_uv_mod_fx.c
index e4771a1834bc6c5bb5d3bdf397e8ad9abc8ff4f3..c259745f2a7266bffbe33207cac60e540cfbc577 100644
--- a/lib_com/stat_noise_uv_mod_fx.c
+++ b/lib_com/stat_noise_uv_mod_fx.c
@@ -109,11 +109,7 @@ void stat_noise_uv_mod_fx(
             move16();
             tmp_res = div_l( L_tmp_res, tmp_den );
             move16();
-#ifdef BASOP_NOGLOB
             min_alpha = add_o( tmp_res, 16384, &Overflow );
-#else  /* BASOP_NOGLOB */
-            min_alpha = add( tmp_res, 16384 );
-#endif /* BASOP_NOGLOB */
             move16();
 
             /**st_min_alpha = sub(*st_min_alpha, 1638); move16();*/
@@ -164,12 +160,8 @@ void stat_noise_uv_mod_fx(
         {
             FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
             {
-                exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */
-#ifdef BASOP_NOGLOB
+                exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR );                    /*Q15 */
                 exctilt = mult( shl_o( sub( TILT_COMP_LIM_FX, min_alpha ), 2, &Overflow ), exctilt ); /*Q15  */
-#else                                                                                                 /* BASOP_NOGLOB */
-                exctilt = mult( shl( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15  */
-#endif                                                                                                /* BASOP_NOGLOB */
 
                 PREEMPH_FX( &Exc2_local[i_subfr], exctilt, L_SUBFR, exc_pe );
             }
@@ -194,11 +186,7 @@ void stat_noise_uv_mod_fx(
             tmp_shift = norm_s( tmp_den );
             tmp_den = shl( tmp_den, tmp_shift );
             tmp_res = div_s( tmp_nom, tmp_den );
-#ifdef BASOP_NOGLOB
             tmp_res = shl_o( tmp_res, tmp_shift, &Overflow );
-#else /* BASOP_NOGLOB */
-            tmp_res = shl( tmp_res, tmp_shift );
-#endif
             alpha = add( 32767, mult( tmp_res, sub( min_alpha, 32767 ) ) );
 
             *act_count = 0;
@@ -213,11 +201,7 @@ void stat_noise_uv_mod_fx(
         FOR( i = 1; i < L_FRAME; i++ )
         {
             Tmp = shr( Exc2_local[i], En_shift );
-#ifdef BASOP_NOGLOB
             vare = L_mac_sat( vare, Tmp, Tmp ); /* positive accumulation only */
-#else
-            vare = L_mac( vare, Tmp, Tmp );                                                  /* positive accumulation only */
-#endif
         }
 
         /* obtain Ge in Q_local with safety saturation */
@@ -261,20 +245,12 @@ void stat_noise_uv_mod_fx(
         /* L_Ge might be 0 in unvoiced WB */
         L_Ge = L_max( L_Ge, 1 );
         tmp_shift = norm_l( L_Ge );
-        tmp_den = extract_h( L_shl( L_Ge, tmp_shift ) );         /* Q_local+Q_ge+tmp_shift-16 */
-        tmp_res = div_s( 1 << 14, tmp_den );                     /* 15+14-Q_local-tmp_shift-Q_ge+16 */
-        L_tmp_res = Mult_32_16( *ge_sm, tmp_res );               /* Q_stat_noise_ge+45-Q_local-Q_ge-tmp_shift-15 */
-        L_tmp_res = Mult_32_16( L_tmp_res, sub( 32767, beta ) ); /*30-Q_local-tmp_shift+15-15         */
-#ifdef BASOP_NOGLOB
+        tmp_den = extract_h( L_shl( L_Ge, tmp_shift ) );                                             /* Q_local+Q_ge+tmp_shift-16 */
+        tmp_res = div_s( 1 << 14, tmp_den );                                                         /* 15+14-Q_local-tmp_shift-Q_ge+16 */
+        L_tmp_res = Mult_32_16( *ge_sm, tmp_res );                                                   /* Q_stat_noise_ge+45-Q_local-Q_ge-tmp_shift-15 */
+        L_tmp_res = Mult_32_16( L_tmp_res, sub( 32767, beta ) );                                     /*30-Q_local-tmp_shift+15-15         */
         L_tmp_res = L_add_sat( L_shl_sat( L_tmp_res, sub( add( Q_local, tmp_shift ), 15 ) ), beta ); /* Q15 */
-#else
-        L_tmp_res = L_add( L_shl( L_tmp_res, sub( add( Q_local, tmp_shift ), 15 ) ), beta ); /* Q15 */
-#endif
-#ifdef BASOP_NOGLOB
-        tmp_res = extract_h( L_shl_o( L_tmp_res, 15, &Overflow ) ); /* 15+15-16=14 */
-#else
-        tmp_res = extract_h( L_shl( L_tmp_res, 15 ) );                                       /* 15+15-16=14 */
-#endif
+        tmp_res = extract_h( L_shl_o( L_tmp_res, 15, &Overflow ) );                                  /* 15+15-16=14 */
 
         Noimix_fract = extract_l( Mult_32_16( L_tmp_res, Noimix_fract ) ); /*15+15-15 */
 
@@ -292,15 +268,11 @@ void stat_noise_uv_mod_fx(
             randval = mult_r( 28378, randval ); /* Q downscaled by 2 bits ends up in Q14 */    /*sqrt(12.0f) in Q13*/
             randval = extract_l( L_shl( Mult_32_16( L_Ge, randval ), 1 - *Q_stat_noise_ge ) ); /*Q_local+Q_ge+14-15+1-Q_ge=Q_local */
 
-            L_tmp = L_mult( Exc2_local[i], alpha );     /* Q_local + 16 */
-            L_tmp = L_mac( L_tmp, randval, alpha_m1 );  /* Q_local + 16 */
-            L_tmp3 = Mult_32_16( L_tmp, Noimix_fract ); /* Q_local+16+15-15 */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( Exc2_local[i], alpha );                                    /* Q_local + 16 */
+            L_tmp = L_mac( L_tmp, randval, alpha_m1 );                                 /* Q_local + 16 */
+            L_tmp3 = Mult_32_16( L_tmp, Noimix_fract );                                /* Q_local+16+15-15 */
             L_tmp = L_add_sat( L_tmp3, L_shl_sat( Mult_32_16( L_tmp, tmp_res ), 1 ) ); /* Q_local+16+14-15+1 */
-#else
-            L_tmp = L_add( L_tmp3, L_shl( Mult_32_16( L_tmp, tmp_res ), 1 ) );               /* Q_local+16+14-15+1 */
-#endif
-            Exc2_local[i] = extract_h( L_tmp ); /*Q_local */
+            Exc2_local[i] = extract_h( L_tmp );                                        /*Q_local */
             move16();
         }
         *Q_stat_noise = Q_local; /* update for next call, routine can only be called once every frame */
@@ -358,7 +330,6 @@ void stat_noise_uv_mod_fx(
         }
     }
 }
-
 /*--------------------------------------------------------------------*
  * stat_noise_uv_mod()
  *
@@ -373,7 +344,7 @@ void stat_noise_uv_mod_ivas_fx(
     const Word16 *lsp_mid,   /* i  : LSP vector at 2nd sfr							Q=15*/
     Word16 *Aq,              /* o  : A(z)   quantized for the 4 subframes			Q=12*/
     Word16 *exc2,            /* i/o: excitation buffer							 Q=Q_exc*/
-    Word16 Q_exc,            /* i  : Q of exc2 excitation buffer [11..-1] expected		*/
+    Word16 *Q_exc,           /* i  : Q of exc2 excitation buffer [11..-1] expected		*/
     const Word16 bfi,        /* i  : Bad frame indicator								*/
     Word32 *ge_sm,           /* i/o: smoothed excitation gain      Q=Q_stat_noise_ge (6)*/
     Word16 *uv_count,        /* i/o: unvoiced counter					                */
@@ -398,8 +369,9 @@ void stat_noise_uv_mod_ivas_fx(
     Word16 oldlsp_mix[M];
     Word16 midlsp_mix[M];
     Word16 newlsp_mix[M];
-    Word16 beta;         /* Q15 */
-    Word16 Noimix_fract; /* (noimix_fac - 1.0) in  Q15 */
+    Word16 beta;           /* Q15 */
+    Word16 Noimix_fract;   /* (noimix_fac - 1.0) in  Q15 */
+    Word32 L_Noimix_fract; /* (noimix_fac - 1.0) in  Q15 */
     /* noimix_fax * x <-> x + Noimix_fract * x */
     Word16 i_subfr;
     Word16 i, k;
@@ -410,7 +382,8 @@ void stat_noise_uv_mod_ivas_fx(
     Word32 L_tmp_res, L_tmp, L_tmp3, L_Ge;
 
     Word16 En_shift, Tmp;
-    Word16 Exc2_local[L_FRAME]; /* local_copy in scaled Q_local*/
+    Word16 Exc2_local[L_FRAME];   /* local_copy in scaled Q_local*/
+    Word32 L_Exc2_local[L_FRAME]; /* local_copy in scaled Q_local*/
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -443,11 +416,7 @@ void stat_noise_uv_mod_ivas_fx(
             L_tmp_res = L_shl( L_tmp_res, sub( tmp_shift, 1 ) );
             tmp_den = shl( tmp_den, tmp_shift );
             tmp_res = div_l( L_tmp_res, tmp_den );
-#ifdef BASOP_NOGLOB
             min_alpha = add_o( tmp_res, 16384, &Overflow );
-#else  /* BASOP_NOGLOB */
-            min_alpha = add( tmp_res, 16384 );
-#endif /* BASOP_NOGLOB */
 
             /**st_min_alpha = sub(*st_min_alpha, 1638); move16();*/
             min_alpha = s_max( min_alpha, sub( *st_min_alpha, 1638 ) );
@@ -469,9 +438,9 @@ void stat_noise_uv_mod_ivas_fx(
         Copy( exc2, Exc2_local, L_FRAME );
 
         /* bound Q for internal use, optimization possible */
-        Q_local = s_min( 11, s_max( -1, Q_exc ) );
+        Q_local = s_min( 11, s_max( -1, *Q_exc ) );
         /* local excitation Q and incoming excitation Q*/
-        Qdiff = sub( Q_local, Q_exc );
+        Qdiff = sub( Q_local, *Q_exc );
         /* only shift if incoming Q is outside [11..-1] shift is done in energy calculations aswell */
         Scale_sig( Exc2_local, L_FRAME, Qdiff );
         /* current excitation Q and previous stat_noise states Q */
@@ -497,12 +466,8 @@ void stat_noise_uv_mod_ivas_fx(
         {
             FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
             {
-                exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */
-#ifdef BASOP_NOGLOB
+                exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR );                    /*Q15 */
                 exctilt = mult( shl_o( sub( TILT_COMP_LIM_FX, min_alpha ), 2, &Overflow ), exctilt ); /*Q15  */
-#else                                                                                                 /* BASOP_NOGLOB */
-                exctilt = mult( shl( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15  */
-#endif                                                                                                /* BASOP_NOGLOB */
 
                 PREEMPH_FX( &Exc2_local[i_subfr], exctilt, L_SUBFR, exc_pe );
             }
@@ -527,11 +492,7 @@ void stat_noise_uv_mod_ivas_fx(
             tmp_shift = norm_s( tmp_den );
             tmp_den = shl( tmp_den, tmp_shift );
             tmp_res = div_s( tmp_nom, tmp_den );
-#ifdef BASOP_NOGLOB
             tmp_res = shl_o( tmp_res, tmp_shift, &Overflow );
-#else /* BASOP_NOGLOB */
-            tmp_res = shl( tmp_res, tmp_shift );
-#endif
             alpha = add( 32767, mult( tmp_res, sub( min_alpha, 32767 ) ) );
 
             *act_count = 0;
@@ -546,11 +507,7 @@ void stat_noise_uv_mod_ivas_fx(
         FOR( i = 1; i < L_FRAME; i++ )
         {
             Tmp = shr( Exc2_local[i], En_shift );
-#ifdef BASOP_NOGLOB
             vare = L_mac_sat( vare, Tmp, Tmp ); /* positive accumulation only */
-#else
-            vare = L_mac( vare, Tmp, Tmp );                                                  /* positive accumulation only */
-#endif
         }
 
         /* obtain Ge in Q_local with safety saturation */
@@ -583,33 +540,20 @@ void stat_noise_uv_mod_ivas_fx(
         L_tmp_res = L_mac( 0, alpha, alpha );
         L_tmp_res = L_mac( L_tmp_res, alpha_m1, alpha_m1 );
         tmp_den = round_fx( L_Frac_sqrtQ31( L_tmp_res ) );
-
-        tmp_nom = sub( 32767, tmp_den );
-        tmp_shift = norm_s( tmp_den );
-        tmp_den = shl( tmp_den, tmp_shift );
-        tmp_res = div_s( tmp_nom, tmp_den );
-
-        Noimix_fract = shr( tmp_res, tmp_shift ); /* float value is in range 0.0 to 0.42 */
-
+        Word16 exp_sqr = 0;
+        move16();
+        tmp_res = BASOP_Util_Divide1616_Scale( 32767, tmp_den, &exp_sqr ); // 15-exp_sqr
+        Noimix_fract = tmp_res;                                            // 15-exp_sqr
+        move16();
         /* L_Ge might be 0 in unvoiced WB */
         L_Ge = L_max( L_Ge, 1 );
         tmp_shift = norm_l( L_Ge );
-        tmp_den = extract_h( L_shl( L_Ge, tmp_shift ) );         /* Q_local+Q_ge+tmp_shift-16 */
-        tmp_res = div_s( 1 << 14, tmp_den );                     /* 15+14-Q_local-tmp_shift-Q_ge+16 */
-        L_tmp_res = Mult_32_16( *ge_sm, tmp_res );               /* Q_stat_noise_ge+45-Q_local-Q_ge-tmp_shift-15 */
-        L_tmp_res = Mult_32_16( L_tmp_res, sub( 32767, beta ) ); /*30-Q_local-tmp_shift+15-15         */
-#ifdef BASOP_NOGLOB
+        tmp_den = extract_h( L_shl( L_Ge, tmp_shift ) );                                             /* Q_local+Q_ge+tmp_shift-16 */
+        tmp_res = div_s( 1 << 14, tmp_den );                                                         /* 15+14-Q_local-tmp_shift-Q_ge+16 */
+        L_tmp_res = Mult_32_16( *ge_sm, tmp_res );                                                   /* Q_stat_noise_ge+45-Q_local-Q_ge-tmp_shift-15 */
+        L_tmp_res = Mult_32_16( L_tmp_res, sub( 32767, beta ) );                                     /*30-Q_local-tmp_shift+15-15         */
         L_tmp_res = L_add_sat( L_shl_sat( L_tmp_res, sub( add( Q_local, tmp_shift ), 15 ) ), beta ); /* Q15 */
-#else
-        L_tmp_res = L_add( L_shl( L_tmp_res, sub( add( Q_local, tmp_shift ), 15 ) ), beta ); /* Q15 */
-#endif
-#ifdef BASOP_NOGLOB
-        tmp_res = extract_h( L_shl_o( L_tmp_res, 15, &Overflow ) ); /* 15+15-16=14 */
-#else
-        tmp_res = extract_h( L_shl( L_tmp_res, 15 ) );                                       /* 15+15-16=14 */
-#endif
-
-        Noimix_fract = extract_l( Mult_32_16( L_tmp_res, Noimix_fract ) ); /*15+15-15 */
+        L_Noimix_fract = Mult_32_16( L_tmp_res, Noimix_fract );                                      /*15+15-exp_sqr-15  =15-exp_sqr */
 
         FOR( i = 0; i < L_FRAME; i++ )
         {
@@ -625,22 +569,27 @@ void stat_noise_uv_mod_ivas_fx(
             randval = mult_r( 28378, randval ); /* Q downscaled by 2 bits ends up in Q14 */          /*sqrt(12.0f) in Q13*/
             randval = extract_l( L_shl( Mult_32_16( L_Ge, randval ), sub( 1, *Q_stat_noise_ge ) ) ); /*Q_local+Q_ge+14-15+1-Q_ge=Q_local */
 
-            L_tmp = L_mult( Exc2_local[i], alpha );     /* Q_local + 16 */
-            L_tmp = L_mac( L_tmp, randval, alpha_m1 );  /* Q_local + 16 */
-            L_tmp3 = Mult_32_16( L_tmp, Noimix_fract ); /* Q_local+16+15-15 */
-#ifdef BASOP_NOGLOB
-            L_tmp = L_add_sat( L_tmp3, L_shl_sat( Mult_32_16( L_tmp, tmp_res ), 1 ) ); /* Q_local+16+14-15+1 */
-#else
-            L_tmp = L_add( L_tmp3, L_shl( Mult_32_16( L_tmp, tmp_res ), 1 ) );               /* Q_local+16+14-15+1 */
-#endif
-            Exc2_local[i] = extract_h( L_tmp ); /*Q_local */
+            L_tmp = L_mult( Exc2_local[i], alpha );                                       /* Q_local + 16 */
+            L_tmp = L_mac( L_tmp, randval, alpha_m1 );                                    /* Q_local + 16 */
+            L_tmp3 = Mult_32_32( L_tmp, L_Noimix_fract );                                 /* Q_local+16+15-exp_sqr-15 =Q_local +1 */
+            L_Exc2_local[i] = L_add( L_shr( L_tmp3, 1 ), Mpy_32_32( L_tmp, L_tmp_res ) ); // Q_local + 16 +15 -31 = Q_local
+            move32();
+        }
+        Word32 max_val;
+        maximum_abs_32_fx( L_Exc2_local, L_FRAME, &max_val );
+        Word16 shift = 0;
+        move16();
+        IF( GT_32( max_val, ONE_IN_Q15 ) )
+        {
+            shift = norm_l( max_val );
+            shift = sub( Q31 - Q15, shift );
+            *Q_exc = sub( Q_local, shift ); // Q_exc = Q_local -shift
             move16();
         }
         *Q_stat_noise = Q_local; /* update for next call, routine can only be called once every frame */
         move16();
-        Qdiff = sub( Q_exc, Q_local ); /* local excitation and incoming excitation */
-        Scale_sig( Exc2_local, L_FRAME, Qdiff );
-        Copy( Exc2_local, exc2, L_FRAME );
+
+        Copy_Scale_sig_32_16( L_Exc2_local, exc2, L_FRAME, negate( shift ) ); // Q_exc
 
         /*--------------------------------------------------------------------*
          * Generate low-pass filtered version of ISP coefficients
@@ -691,6 +640,7 @@ void stat_noise_uv_mod_ivas_fx(
         }
     }
 }
+
 /*---------------------------------------------------------------------------*
  * calc_tilt()
  *
@@ -717,17 +667,9 @@ static Word16 calc_tilt_fx(                       /* o  : Excitation tilt  Q15*/
     {
         /* r0 = L_mac(r0,x[i],x[i])                                        */
         /* r1 = L_mac(r1,x[i],x[i+1]) -> correlation loop can be optimized */
-#ifdef BASOP_NOGLOB
         r0 = L_mac_sat( r0, xi, xi );
-#else
-        r0 = L_mac( r0, xi, xi );
-#endif
         xi_p1 = shr( x[i + 1], Q_shift );
-#ifdef BASOP_NOGLOB
         r1 = L_mac_sat( r1, xi, xi_p1 );
-#else
-        r1 = L_mac( r1, xi, xi_p1 );
-#endif
         xi = xi_p1;
         move16();
     }
@@ -749,11 +691,7 @@ static Word16 calc_tilt_fx(                       /* o  : Excitation tilt  Q15*/
     r1 = L_abs( r1 );
 
     L_tmp_res = Div_32( r1, extract_h( r0 ), extract_l( r0 ) );
-#ifdef BASOP_NOGLOB
     L_tmp_res = L_shl_sat( L_tmp_res, tmp_shift ); /*Q31 */
-#else
-    L_tmp_res = L_shl( L_tmp_res, tmp_shift ); /*Q31 */
-#endif
     if ( tmp_sign != 0 )
     {
         L_tmp_res = L_negate( L_tmp_res ); /*Q31 */
diff --git a/lib_com/stl.h b/lib_com/stl.h
index 6643f5948d80c4a7260efbc6de80b2b20a4a1aee..0de974226623ff746492cf57aea4be1210dfbd37 100644
--- a/lib_com/stl.h
+++ b/lib_com/stl.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/swb_bwe_com_fx.c b/lib_com/swb_bwe_com_fx.c
index 873a7093eb5854f60af59e8863be738da3f33328..11da78c46f06cf04a6895050c706e53824225711 100644
--- a/lib_com/swb_bwe_com_fx.c
+++ b/lib_com/swb_bwe_com_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -99,31 +99,19 @@ Word16 WB_BWE_gain_pred_fx(
     enerL = L_deposit_l( 0 );
     FOR( n_freq = 128; n_freq < 192; n_freq++ )
     {
-#ifdef BASOP_NOGLOB
         enerL = L_mac0_sat( enerL, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2(Q_syn)  */
-#else
-        enerL = L_mac0( enerL, core_dec_freq[n_freq], core_dec_freq[n_freq] );           /*2(Q_syn)  */
-#endif
     }
 
     L_WB_fenv0 = L_deposit_l( 0 );
     FOR( n_freq = 192; n_freq < 224; n_freq++ )
     {
-#ifdef BASOP_NOGLOB
         L_WB_fenv0 = L_mac0_sat( L_WB_fenv0, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#else
-        L_WB_fenv0 = L_mac0( L_WB_fenv0, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#endif
     }
 
     L_WB_fenv1 = L_deposit_l( 0 );
     FOR( n_freq = 224; n_freq < 256; n_freq++ )
     {
-#ifdef BASOP_NOGLOB
         L_WB_fenv1 = L_mac0_sat( L_WB_fenv1, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#else
-        L_WB_fenv1 = L_mac0( L_WB_fenv1, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#endif
     }
 
     L_tmp = sum16_32_fx( voice_factors, 4 );
@@ -141,11 +129,7 @@ Word16 WB_BWE_gain_pred_fx(
     }
 
     test();
-#ifdef BASOP_NOGLOB
     IF( GT_32( L_WB_fenv0, L_shl_sat( L_WB_fenv1, 1 ) ) )
-#else
-    IF( GT_32( L_WB_fenv0, L_shl( L_WB_fenv1, 1 ) ) )
-#endif
     {
         exp = norm_l( L_WB_fenv0 );
         tmp = extract_h( L_shl( L_WB_fenv0, exp ) );
@@ -156,11 +140,7 @@ Word16 WB_BWE_gain_pred_fx(
         alfa = s_max( tmp, 3277 /* 0.1 in Q15 */ );  /*Q15 */
         L_WB_fenv0 = Mult_32_16( L_WB_fenv0, alfa ); /*2*Q_syn+15-15->2*Q_syn */
     }
-#ifdef BASOP_NOGLOB
     ELSE IF( GT_32( L_WB_fenv1, L_shl_sat( L_WB_fenv0, 1 ) ) && NE_16( coder_type, UNVOICED ) )
-#else
-    ELSE IF( GT_32( L_WB_fenv1, L_shl( L_WB_fenv0, 1 ) ) && NE_16( coder_type, UNVOICED ) )
-#endif
     {
         exp = norm_l( L_WB_fenv1 );
         tmp = extract_h( L_shl( L_WB_fenv1, exp ) );
@@ -187,11 +167,7 @@ Word16 WB_BWE_gain_pred_fx(
         enerL = L_deposit_l( 1 );
     }
 
-#ifdef BASOP_NOGLOB
     L_tmp = L_add_sat( L_WB_fenv0, L_WB_fenv1 ); /* In 2*Q_syn */
-#else
-    L_tmp = L_add( L_WB_fenv0, L_WB_fenv1 );                 /* In 2*Q_syn */
-#endif
     exp = norm_l( L_tmp );
     tmp = extract_h( L_shl( L_tmp, exp ) );
     /*exp = sub(exp, 30-(2*Q_syn+6)); //+6(/64) */
@@ -201,21 +177,13 @@ Word16 WB_BWE_gain_pred_fx(
     L_tmp = L_deposit_h( tmp );
     L_tmp = Isqrt_lc( L_tmp, &exp );
 
-#ifdef BASOP_NOGLOB
     WB_fenv[0] = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /* Q3 */
     move16();
-#else
-    WB_fenv[0] = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) ); /* Q3 */
-#endif
     test();
     test();
     IF( NE_16( coder_type, AUDIO ) && NE_16( coder_type, UNVOICED ) && ener_var_flag == 0 )
     {
-#ifdef BASOP_NOGLOB
         WB_fenv[0] = add_sat( WB_fenv[0], mult_r_sat( WB_fenv[0], 16384 /* 0.5 in Q15 */ ) );
-#else
-        WB_fenv[0] = add( WB_fenv[0], mult_r( WB_fenv[0], 16384 /* 0.5 in Q15 */ ) );
-#endif
         move16();
     }
 
@@ -226,12 +194,8 @@ Word16 WB_BWE_gain_pred_fx(
     tmp = div_s( 16384, tmp );
     L_tmp = L_deposit_h( tmp );
     L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB
     enerL_16 = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 15 ) ) ); /* Q0 */
-#else
-    enerL_16 = round_fx( L_shl( L_tmp, sub( exp, 15 ) ) );   /* Q0 */
-#endif
-    enerL_40 = mult_r( 6554 /* 0.2 in Q15 */, enerL_16 ); /*1/40 in Q18  ->Q3    */
+    enerL_40 = mult_r( 6554 /* 0.2 in Q15 */, enerL_16 );          /*1/40 in Q18  ->Q3    */
 
     test();
     test();
@@ -245,13 +209,9 @@ Word16 WB_BWE_gain_pred_fx(
         IF( WB_fenv[0] != 0 )
         {
             exp = norm_s( WB_fenv[0] );
-            tmp = div_s( shl( 1, sub( 14, exp ) ), WB_fenv[0] ); /*Q(29-exp-3) */
-            L_tmp = L_mult( enerL_40, tmp );                     /*Q(30-exp) */
-#ifdef BASOP_NOGLOB
+            tmp = div_s( shl( 1, sub( 14, exp ) ), WB_fenv[0] );     /*Q(29-exp-3) */
+            L_tmp = L_mult( enerL_40, tmp );                         /*Q(30-exp) */
             tmp = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 2 ) ) ); /*Q12 */
-#else
-            tmp = round_fx( L_shl( L_tmp, sub( exp, 2 ) ) ); /*Q12 */
-#endif
             tmp = s_min( tmp, 16384 /*4 in Q12*/ );
             L_tmp = L_shr( L_mult0( tmp, WB_fenv[0] ), 12 ); /*Q15 */
             WB_fenv[0] = extract_l( L_tmp );                 /*Q3 */
@@ -270,13 +230,9 @@ Word16 WB_BWE_gain_pred_fx(
     tmp1 = extract_l( L_shr( L_tmp, 13 ) );
 
     exp = norm_s( pitch );
-    tmp = div_s( shl( 1, sub( 14, exp ) ), pitch ); /*Q(29-exp-5) */
-    L_tmp = L_mult0( tmp1, tmp );                   /*29-exp-5->24-exp */
-#ifdef BASOP_NOGLOB
+    tmp = div_s( shl( 1, sub( 14, exp ) ), pitch );          /*Q(29-exp-5) */
+    L_tmp = L_mult0( tmp1, tmp );                            /*29-exp-5->24-exp */
     tmp = round_fx_sat( L_shl_sat( L_tmp, add( exp, 6 ) ) ); /*14          */
-#else
-    tmp = round_fx( L_shl( L_tmp, add( exp, 6 ) ) );         /*14          */
-#endif
     tmp1 = s_max( tmp, 8192 /* 0.5 in Q14 */ );
     alfa = s_min( 24576 /* 1.5 in Q14 */, tmp1 ); /*Q14 */
 
@@ -285,12 +241,8 @@ Word16 WB_BWE_gain_pred_fx(
     tmp = extract_l( L_tmp );
 
     enerL = L_deposit_l( enerL_16 );
-    enerL = L_shl( enerL, 6 ); /*Q6 */
-#ifdef BASOP_NOGLOB
-    tmp1 = i_mult_sat( 3, WB_fenv[0] ); /*Q3 */
-#else
-    tmp1 = i_mult( 3, WB_fenv[0] );                          /*Q3 */
-#endif
+    enerL = L_shl( enerL, 6 );           /*Q6 */
+    tmp1 = i_mult_sat( 3, WB_fenv[0] );  /*Q3 */
     L_tmp = L_mult0( tmp1, WB_fenv[0] ); /*Q6 */
 
     test();
@@ -303,13 +255,9 @@ Word16 WB_BWE_gain_pred_fx(
         enerL_64 = mult_r( 4096, enerL_16 ); /* 1/64 in Q18  ->Q3 */
 
         exp = norm_s( WB_fenv[0] );
-        tmp = div_s( shl( 1, sub( 14, exp ) ), WB_fenv[0] ); /*Q(29-exp-3) */
-        L_tmp = L_mult( enerL_64, tmp );                     /*Q(30-exp) */
-#ifdef BASOP_NOGLOB
+        tmp = div_s( shl( 1, sub( 14, exp ) ), WB_fenv[0] );     /*Q(29-exp-3) */
+        L_tmp = L_mult( enerL_64, tmp );                         /*Q(30-exp) */
         tmp = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 2 ) ) ); /*Q12 */
-#else
-        tmp = round_fx( L_shl( L_tmp, sub( exp, 2 ) ) );     /*Q12 */
-#endif
         tmp = s_min( tmp, 16384 /*4 in Q12*/ );
         L_tmp = L_shr( L_mult0( tmp, WB_fenv[0] ), 12 ); /*Q3 */
         WB_fenv[0] = extract_l( L_tmp );                 /*Q3 */
@@ -343,12 +291,8 @@ Word16 WB_BWE_gain_pred_fx(
         tmp = s_min( s_max( tmp1, 16 /* 0.125 in Q7 */ ), 256 /* 1 in Q7 */ ); /*Q7 */
         L_tmp = L_shr( L_mult0( WB_fenv[0], tmp ), 7 );                        /*Q3 */
                                                                                /*WB_fenv[0] = saturate(L_tmp); //Q3 */
-#ifdef BASOP_NOGLOB
-        WB_fenv[0] = round_fx_sat( L_shl_sat( L_tmp, 16 ) ); /*Q3 */
+        WB_fenv[0] = round_fx_sat( L_shl_sat( L_tmp, 16 ) );                   /*Q3 */
         move16();
-#else
-        WB_fenv[0] = round_fx( L_shl( L_tmp, 16 ) );         /*Q3 */
-#endif
     }
     test();
     IF( GT_32( last_core_brate, ACELP_8k00 ) && GT_16( WB_fenv[0], last_wb_bwe_ener ) )
@@ -454,11 +398,7 @@ static void calc_norm_envelop_lf_fx(
         tmp = add( lookback, n_freq );
         FOR( n_lag = 0; n_lag < tmp; n_lag++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_sat( L_tmp, L_abs( SWB_signal[n_lag] ) );
-#else
-            L_tmp = L_add( L_tmp, L_abs( SWB_signal[n_lag] ) );
-#endif
         }
         envelope[env_index] = L_tmp;
         move32();
@@ -471,11 +411,7 @@ static void calc_norm_envelop_lf_fx(
         Word32 L_tmp = L_deposit_l( 1 );
         FOR( n_lag = 0; n_lag < n_lag_now; n_lag++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_sat( L_tmp, L_abs( SWB_signal[n_freq - lookback + n_lag] ) );
-#else
-            L_tmp = L_add( L_tmp, L_abs( SWB_signal[n_freq - lookback + n_lag] ) );
-#endif
         }
 
         envelope[env_index] = L_tmp;
@@ -649,30 +585,16 @@ Word32 calc_tilt_bwe_fx(                      /* o  : Tilt in Q24
     /* Divide Frame Length by 32 */
     FOR( j = shr( N, 5 ); j > 0; j-- )
     {
-#ifdef BASOP_NOGLOB                                                 /* Critical Overflow and all those below*/
         tmp1 = mult_ro( *ptr++, 8192 /*0.25 in Q15 */, &Overflow ); /* Divide by 4 */
-#else
-        tmp1 = mult_r( *ptr++, 8192 /*0.25 in Q15 */ ); /* Divide by 4 */
-#endif
         L_ener = L_mult0( tmp1, tmp1 );
         /* With the shift by 4 and the L_mult0, no overflow possible for 32 samples */
         FOR( i = 1; i < 32; i++ )
         {
-#ifdef BASOP_NOGLOB                                                     /* Critical Overflow */
             tmp1 = mult_ro( *ptr++, 8192 /*0.25 in Q15 */, &Overflow ); /* Divide by 4 */
             L_ener = L_mac0_o( L_ener, tmp1, tmp1, &Overflow );
-#else
-            tmp1 = mult_r( *ptr++, 8192 );              /* Divide by 4 */
-            L_ener = L_mac0( L_ener, tmp1, tmp1 );
-#endif
         }
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_ener = L_shr_o( L_ener, exp2, &Overflow );
         L_temp = L_add_o( L_ener_tot, L_ener, &Overflow );
-#else
-        L_ener = L_shr( L_ener, exp2 );
-        L_temp = L_add( L_ener_tot, L_ener );
-#endif
         IF( Overflow != 0 )
         {
             L_ener_tot = L_shr( L_ener_tot, 1 );
@@ -682,27 +604,14 @@ Word32 calc_tilt_bwe_fx(                      /* o  : Tilt in Q24
             Overflow = 0;
             move16();
         }
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_ener_tot = L_add_o( L_ener_tot, L_ener, &Overflow );
-#else
-        L_ener_tot = L_add( L_ener_tot, L_ener );
-#endif
     }
-#ifdef BASOP_NOGLOB
     L_ener = L_deposit_l( abs_s( sub_o( sp[1], sp[0], &Overflow ) ) );
-#else
-    L_ener = L_deposit_l( abs_s( sub( sp[1], sp[0] ) ) );
-#endif
     FOR( i = 2; i < N; i++ )
     {
         /* Eq to (sp[i] - sp[i-1]) * (sp[i-1] - sp[i-2]) < 0 */
-#ifdef BASOP_NOGLOB
         tmp1 = sub_o( sp[i], sp[i - 1], &Overflow );
         tmp2 = sub_o( sp[i - 1], sp[i - 2], &Overflow );
-#else
-        tmp1 = sub( sp[i], sp[i - 1] );
-        tmp2 = sub( sp[i - 1], sp[i - 2] );
-#endif
         tmp2 = mult( tmp1, tmp2 );
         tmp1 = abs_s( tmp1 );
         /* to Get either 0 or -1 in 'tmp2' */
@@ -725,20 +634,12 @@ Word32 calc_tilt_bwe_fx(                      /* o  : Tilt in Q24
 
     /* *tilt_flt = (float)(r1/sqrt(r0)); */
     exp2 = norm_l( L_ener );
-#ifdef BASOP_NOGLOB
     L_temp = Mult_32_16( L_temp, round_fx_sat( L_shl_sat( L_ener, exp2 ) ) );
-#else
-    L_temp = Mult_32_16( L_temp, round_fx( L_shl( L_ener, exp2 ) ) );
-#endif
     exp2 = sub( exp2, tmp1 );
     exp2 = add( exp2, exp_sp );
 
     /* Put in Q24 */
-#ifdef BASOP_NOGLOB
     L_temp = L_shr_sat( L_temp, sub( exp2, 24 ) );
-#else
-    L_temp = L_shr( L_temp, sub( exp2, 24 ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
 
     return L_temp;
@@ -1397,20 +1298,12 @@ void SWB_BWE_decoding_fx(
     EnergyL = L_deposit_l( 0 );
     FOR( n_freq = 224 + st_offset; n_freq < swb_bwe_trans_subband[0] + st_offset; n_freq++ )
     {
-#ifdef BASOP_NOGLOB
         fenvL = L_mac0_sat( fenvL, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#else
-        fenvL = L_mac0( fenvL, core_dec_freq[n_freq], core_dec_freq[n_freq] );     /*2*Q_syn */
-#endif
     }
 
     FOR( n_freq = 16; n_freq < L_FRAME; n_freq++ )
     {
-#ifdef BASOP_NOGLOB
         EnergyL = L_mac0_sat( EnergyL, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#else
-        EnergyL = L_mac0( EnergyL, core_dec_freq[n_freq], core_dec_freq[n_freq] ); /*2*Q_syn */
-#endif
     }
 
     fenvL_16 = 0;
@@ -1425,17 +1318,9 @@ void SWB_BWE_decoding_fx(
         L_tmp = L_deposit_h( tmp );
         L_tmp = Isqrt_lc( L_tmp, &exp );
 
-#ifdef BASOP_NOGLOB
         fenvL_16 = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /* Q3 */
-#else
-        fenvL_16 = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) );                     /* Q3 */
-#endif
     }
-#ifdef BASOP_NOGLOB
     IF( GT_16( fenvL_16, shl_sat( SWB_fenv[0], 5 ) ) )
-#else
-    IF( GT_16( fenvL_16, shl( SWB_fenv[0], 5 ) ) )
-#endif
     {
         fenvL_16 = shl( SWB_fenv[0], 2 );
         move16();
@@ -1453,11 +1338,7 @@ void SWB_BWE_decoding_fx(
         L_tmp = L_deposit_h( tmp );
         L_tmp = Isqrt_lc( L_tmp, &exp );
 
-#ifdef BASOP_NOGLOB
         EnergyL_16 = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /* Q3 */
-#else
-        EnergyL_16 = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) );                                          /* Q3 */
-#endif
     }
     calc_normal_length_fx( ACELP_CORE, core_dec_freq, mode, extl, &L_swb_norm, prev_L_swb_norm, Q_syn );
 
@@ -1509,13 +1390,8 @@ void SWB_BWE_decoding_fx(
             tmp = add( swb_bwe_trans_subband[n_band + 1], st_offset );
             FOR( n_freq = add( swb_bwe_trans_subband[n_band], st_offset ); n_freq < tmp; n_freq++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_sat( SWB_signal[n_freq], SWB_signal[n_freq] ); /*Q31 */
                 energy = L_add_sat( energy, L_shr( L_tmp, 6 ) );              /*Q25 */
-#else
-                L_tmp = L_mult( SWB_signal[n_freq], SWB_signal[n_freq] );                                 /*Q31 */
-                energy = L_add( energy, L_shr( L_tmp, 6 ) );                                              /*Q25 */
-#endif
             }
 
             IF( energy == 0 )
@@ -1581,11 +1457,7 @@ void SWB_BWE_decoding_fx(
         tmp = div_s( shl( 1, sub( 14, exp ) ), SWB_FENV ); /*Q(29-exp) */
         L_tmp = Mult_32_16( L_energy, tmp );               /*Q(1+29-exp+1)->Q(15-exp) */
 
-#ifdef BASOP_NOGLOB
         Energy_16 = round_fx_sat( L_shl_sat( L_tmp, add( exp, 4 ) ) ); /* Q3 */
-#else
-        Energy_16 = round_fx( L_shl( L_tmp, add( exp, 4 ) ) );                                            /*Q3 */
-#endif
 
         test();
         IF( NE_16( last_extl, SWB_BWE ) && NE_16( last_extl, FB_BWE ) )
@@ -1659,13 +1531,8 @@ void SWB_BWE_decoding_fx(
                 Copy( &core_dec_freq[112], &SWB_signal[368 + st_offset], 128 );
                 Copy( &core_dec_freq[176], &SWB_signal[496 + st_offset], 64 );
 
-#ifdef BASOP_NOGLOB
                 tmp1 = add_sat( abs_s( SWB_signal[368 + st_offset] ), abs_s( SWB_signal[369 + st_offset] ) ); /*Q_syn */
                 tmp2 = add_sat( abs_s( SWB_signal[365 + st_offset] ), abs_s( SWB_signal[366 + st_offset] ) ); /*Q_syn */
-#else
-                tmp1 = add( abs_s( SWB_signal[368 + st_offset] ), abs_s( SWB_signal[369 + st_offset] ) ); /*Q_syn */
-                tmp2 = add( abs_s( SWB_signal[365 + st_offset] ), abs_s( SWB_signal[366 + st_offset] ) ); /*Q_syn */
-#endif
                 pit1 = &SWB_signal[368 + st_offset];
                 move16();
 
@@ -1679,32 +1546,20 @@ void SWB_BWE_decoding_fx(
                         *pit1 = mult_r( *pit1, tmp3 );
                         move16(); /*Q_syn */
                         pit1++;
-#ifdef BASOP_NOGLOB
                         tmp3 = add_sat( tmp3, 3277 /* 0.1 in Q15*/ ); /*Q15 */
-#else
-                        tmp3 = add( tmp3, 3277 /* 0.1 in Q15*/ );                                         /*Q15 */
-#endif
                     }
                 }
                 ELSE IF( LT_16( tmp2, tmp1 ) )
                 {
                     exp = norm_s( tmp1 );
-                    tmp = div_s( shl( 1, sub( 14, exp ) ), tmp1 ); /*Q(29-exp) */
-#ifdef BASOP_NOGLOB
+                    tmp = div_s( shl( 1, sub( 14, exp ) ), tmp1 );                          /*Q(29-exp) */
                     tmp3 = round_fx_sat( L_shl_sat( L_mult( tmp2, tmp ), add( exp, 2 ) ) ); /*Q15 */
-#else
-                    tmp3 = round_fx( L_shl( L_mult( tmp2, tmp ), add( exp, 2 ) ) );                       /*Q15 */
-#endif
                     WHILE( LT_16( tmp3, 32767 ) )
                     {
                         *pit1 = mult_r( *pit1, tmp3 );
                         move16(); /*Q_syn */
                         pit1++;
-#ifdef BASOP_NOGLOB
                         tmp3 = add_sat( tmp3, 3277 /* 0.1 in Q15*/ ); /*Q15 */
-#else
-                        tmp3 = add( tmp3, 3277 );                                                         /*Q15 */
-#endif
                     }
                 }
 
@@ -1715,23 +1570,14 @@ void SWB_BWE_decoding_fx(
                     /*20480 = 5 in Q12 */
                     FOR( tmp3 = 20480; tmp3 > 4096; tmp3 -= 2048 )
                     {
-#ifdef BASOP_NOGLOB
                         *pit1 = round_fx_sat( L_shl_sat( L_mult( *pit1, tmp3 ), 3 ) ); /*Q_syn */
-#else
-                        *pit1 = round_fx( L_shl( L_mult( *pit1, tmp3 ), 3 ) );                            /*Q_syn */
-#endif
                         move16();
                         pit1--;
                     }
                 }
 
-#ifdef BASOP_NOGLOB
                 tmp1 = add_sat( abs_s( SWB_signal[496 + st_offset] ), abs_s( SWB_signal[497 + st_offset] ) ); /*Q_syn */
                 tmp2 = add_sat( add_sat( abs_s( SWB_signal[492 + st_offset] ), abs_s( SWB_signal[493 + st_offset] ) ), add_sat( abs_s( SWB_signal[494 + st_offset] ), abs_s( SWB_signal[495 + st_offset] ) ) );
-#else
-                tmp1 = add( abs_s( SWB_signal[496 + st_offset] ), abs_s( SWB_signal[497 + st_offset] ) ); /*Q_syn */
-                tmp2 = add( add( abs_s( SWB_signal[492 + st_offset] ), abs_s( SWB_signal[493 + st_offset] ) ), add( abs_s( SWB_signal[494 + st_offset] ), abs_s( SWB_signal[495 + st_offset] ) ) );
-#endif
                 pit1 = &SWB_signal[496 + st_offset];
 
                 test();
@@ -1744,32 +1590,20 @@ void SWB_BWE_decoding_fx(
                         *pit1 = mult_r( *pit1, tmp3 );
                         move16(); /*Q_syn */
                         pit1++;
-#ifdef BASOP_NOGLOB
                         tmp3 = add_sat( tmp3, 3277 /* 0.1 in Q15 */ ); /*Q15 */
-#else
-                        tmp3 = add( tmp3, 3277 /* 0.1 in Q15 */ );                  /*Q15 */
-#endif
                     }
                 }
                 ELSE IF( LT_16( tmp2, tmp1 ) )
                 {
                     exp = norm_s( tmp1 );
-                    tmp = div_s( shl( 1, sub( 14, exp ) ), tmp1 ); /*Q(29-exp) */
-#ifdef BASOP_NOGLOB
+                    tmp = div_s( shl( 1, sub( 14, exp ) ), tmp1 );                          /*Q(29-exp) */
                     tmp3 = round_fx_sat( L_shl_sat( L_mult( tmp2, tmp ), add( exp, 2 ) ) ); /*Q15 */
-#else
-                    tmp3 = round_fx( L_shl( L_mult( tmp2, tmp ), add( exp, 2 ) ) ); /*Q15 */
-#endif
                     WHILE( LT_16( tmp3, 32767 ) )
                     {
                         *pit1 = mult_r( *pit1, tmp3 );
                         move16(); /*Q_syn */
                         pit1++;
-#ifdef BASOP_NOGLOB
                         tmp3 = add_sat( tmp3, 3277 /* 0.1 in Q15 */ ); /*Q15 */
-#else
-                        tmp3 = add( tmp3, 3277 /* 0.1 in Q15 */ );                  /*Q15 */
-#endif
                     }
                 }
                 pit1 = &SWB_signal[495 + st_offset];
@@ -1967,11 +1801,7 @@ FOR( n_band = 0; n_band < SWB_FENV; n_band += L )
     }
 }
 
-#ifdef BASOP_NOGLOB
 IF( GT_16( *prev_Energy, add_sat( Energy_16, shr( Energy_16, 2 ) ) ) && Energy_16 > 0 )
-#else
-IF( GT_16( *prev_Energy, add( Energy_16, shr( Energy_16, 2 ) ) ) && Energy_16 > 0 )
-#endif
 {
     weight = shr( div_s( Energy_16, *prev_Energy ), 1 ); /*Q15 */
 }
@@ -2005,11 +1835,7 @@ tmp2 = add( add( swb_bwe_subband[0], 8 ), st_offset );
 FOR( n_freq = add( swb_bwe_subband[0], st_offset ); n_freq < tmp2; n_freq++ )
 {
     L_tmp1 = Mult_32_16( SWB_signal_32[n_freq], factor );
-#ifdef BASOP_NOGLOB
     SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, tmp - 1 );
-#else
-    SWB_signal_32[n_freq] = L_shl( L_tmp1, tmp - 1 );
-#endif
     move32();                        /*15+Qsyn */
     factor = add( factor, factor1 ); /*Q3 */
 }
@@ -2040,17 +1866,9 @@ FOR( n_band = 0; n_band < 12; n_band++ )
     FOR( ; n_freq < tmp2; n_freq++ )
     {
         L_tmp1 = Mult_32_16( SWB_signal_32[n_freq], factor );
-#ifdef BASOP_NOGLOB
         SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, tmp - 1 );
-#else
-        SWB_signal_32[n_freq] = L_shl( L_tmp1, tmp - 1 );
-#endif
-        move32(); /*15+Qsyn */
-#ifdef BASOP_NOGLOB
+        move32();                            /*15+Qsyn */
         factor = add_sat( factor, factor1 ); /*Q1 */
-#else
-        factor = add( factor, factor1 ); /*Q1 */
-#endif
     }
 }
 L_tmp = L_mult( weight, prev_SWB_fenv[13] );                /*Q17 */
@@ -2063,11 +1881,7 @@ tmp2 = add( swb_bwe_sm_subband[13], st_offset );
 FOR( ; n_freq < tmp2; n_freq++ )
 {
     L_tmp1 = Mult_32_16( SWB_signal_32[n_freq], factor );
-#ifdef BASOP_NOGLOB
     SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, 13 );
-#else
-    SWB_signal_32[n_freq] = L_shl( L_tmp1, 13 );
-#endif
     move32();                        /*15+Qsyn */
     factor = add( factor, factor1 ); /*Q1 */
 }
@@ -2081,11 +1895,7 @@ FOR( n_band = 13; n_band < SWB_FENV; n_band++ )
     FOR( ; n_freq < tmp2; n_freq++ )
     {
         L_tmp1 = Mult_32_16( SWB_signal_32[n_freq], factor );
-#ifdef BASOP_NOGLOB
         SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, 13 );
-#else
-        SWB_signal_32[n_freq] = L_shl( L_tmp1, 13 );
-#endif
         move32(); /*15+Qsyn */
     }
 }
@@ -2148,11 +1958,7 @@ void time_envelop_shaping_fx(
         Energy = L_deposit_l( 0 );
         FOR( j = 0; j < L / 4; j++ )
         {
-#ifdef BASOP_NOGLOB
             Energy = L_mac0_sat( Energy, *pit, *pit ); /*(2*Q_synth) */
-#else
-            Energy = L_mac0( Energy, *pit, *pit ); /*(2*Q_synth) */
-#endif
             pit++;
         }
         Energy = Mult_32_16( Energy, inv_L ); /*Q(29-exp_L-15) -> Q(-exp_L+14+2*Q_synth) */
@@ -2175,11 +1981,7 @@ void time_envelop_shaping_fx(
         }
 
         test();
-#ifdef BASOP_NOGLOB
         IF( LT_32( SWB_tenv[i], 65536 /* 2 in Q15 */ ) && LT_32( Energy, L_shl_sat( SWB_tenv[i], sub( 16, exp ) ) ) )
-#else
-        IF( LT_32( SWB_tenv[i], 65536 /* 2 in Q15 */ ) && LT_32( Energy, L_shl( SWB_tenv[i], sub( 16, exp ) ) ) )
-#endif
         {
             *Q_synth = add( *Q_synth, 3 );
             move16();
@@ -2204,11 +2006,7 @@ void time_envelop_shaping_fx(
 
             FOR( j = 0; j < L / 4; j++ )
             {
-#ifdef BASOP_NOGLOB
                 *pit = round_fx_sat( L_shl_sat( L_mult( tmp, *pit ), sub( exp, 1 ) ) ); /*Q(13-exp+1)->Q(14-exp)->Qsyn-3 */
-#else
-                *pit = round_fx( L_shl( L_mult( tmp, *pit ), sub( exp, 1 ) ) ); /*Q(13-exp+1)->Q(14-exp)->Qsyn-3 */
-#endif
                 move16();
                 pit++;
             }
@@ -2267,11 +2065,7 @@ void time_envelop_shaping_ivas_fx(
         }
 
         test();
-#ifdef BASOP_NOGLOB
         IF( LT_32( SWB_tenv[i], 65536 /* 2 in Q15 */ ) && LT_32( Energy, L_shl_sat( SWB_tenv[i], sub( 16, exp ) ) ) )
-#else
-        IF( LT_32( SWB_tenv[i], 65536 /* 2 in Q15 */ ) && LT_32( Energy, L_shl( SWB_tenv[i], sub( 16, exp ) ) ) )
-#endif
         {
             *Q_synth = add( *Q_synth, 3 );
             move16();
@@ -2295,11 +2089,7 @@ void time_envelop_shaping_ivas_fx(
 
             FOR( j = 0; j < L / 4; j++ )
             {
-#ifdef BASOP_NOGLOB
                 *pit = round_fx_sat( L_shl_sat( L_mult( tmp, *pit ), sub( exp, 1 ) ) ); /*Q(13-exp+1)->Q(14-exp)->Qsyn-3 */
-#else
-                *pit = round_fx( L_shl( L_mult( tmp, *pit ), sub( exp, 1 ) ) );     /*Q(13-exp+1)->Q(14-exp)->Qsyn-3 */
-#endif
                 move16();
                 pit++;
             }
@@ -2356,11 +2146,7 @@ void time_reduce_pre_echo_fx(
         L_tmp = L_deposit_l( 0 );
         FOR( j = 0; j < L; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_sat( L_tmp, synth[Len + j], synth[Len + j] ); /*2*Q_syn */
-#else
-            L_tmp = L_mac0( L_tmp, synth[Len + j], synth[Len + j] );                /*2*Q_syn */
-#endif
         }
         energyL[i] = Mult_32_16( L_shr( L_tmp, sub( 14, exp_L ) ), inv_L );
         move32(); /*Q(2*Q_syn +29-exp_L-15 - (14-exp_L) ) -> Q(2*Q_syn) */
@@ -2400,11 +2186,7 @@ void time_reduce_pre_echo_fx(
         j = i_mult( L, pos );
         FOR( i = 0; i < j; i++ )
         {
-#ifdef BASOP_NOGLOB
             energy = L_mac0_sat( energy, error[i], error[i] ); /*Q(2*Q_synth) */
-#else
-            energy = L_mac0( energy, error[i], error[i] );                          /*Q(2*Q_synth) */
-#endif
         }
 
         exp_j = norm_s( j );
@@ -2445,22 +2227,14 @@ void time_reduce_pre_echo_fx(
         tmp_exp = add( 1, exp );
         FOR( i = 0; i < j; i++ )
         {
-#ifdef BASOP_NOGLOB
             error[i] = round_fx_sat( L_shl_sat( Mult_32_16( L_tmp, error[i] ), tmp_exp ) ); /*Q(30-exp+1-16)->Q(15-exp)->Q_synth */
-#else
-            error[i] = round_fx( L_shl( Mult_32_16( L_tmp, error[i] ), tmp_exp ) ); /*Q(30-exp+1-16)->Q(15-exp)->Q_synth */
-#endif
             move16();
         }
 
         energy = L_deposit_l( 0 );
         FOR( i = j; i < ( j + L ); i++ )
         {
-#ifdef BASOP_NOGLOB
             energy = L_mac0_sat( energy, error[i], error[i] ); /*(2*Q_synth) */
-#else
-            energy = L_mac0( energy, error[i], error[i] );                          /*(2*Q_synth) */
-#endif
         }
 
         energy = Mult_32_16( energy, inv_L ); /*Q(29-exp_L+1-16) -> Q(-exp_L+14) */
@@ -2495,15 +2269,11 @@ void time_reduce_pre_echo_fx(
         move16();
         FOR( i = 0; i < L; i++ )
         {
-            tmpi = round_fx( L_shl( L_mult( i, inv_L ), add( 1, exp_L ) ) ); /*Q15 */
-            L_tmp = L_sub( L_tmp1, Ltmp_ener );                              /*Q(30-exp) */
-            L_tmp = Mult_32_16( L_tmp, tmpi );                               /*Q(30-exp) */
-            L_tmp = L_add( Ltmp_ener, L_tmp );                               /*Q(30-exp) */
-#ifdef BASOP_NOGLOB
+            tmpi = round_fx( L_shl( L_mult( i, inv_L ), add( 1, exp_L ) ) );             /*Q15 */
+            L_tmp = L_sub( L_tmp1, Ltmp_ener );                                          /*Q(30-exp) */
+            L_tmp = Mult_32_16( L_tmp, tmpi );                                           /*Q(30-exp) */
+            L_tmp = L_add( Ltmp_ener, L_tmp );                                           /*Q(30-exp) */
             tmp = round_fx_sat( L_shl_sat( Mult_32_16( L_tmp, *pit ), add( 1, exp ) ) ); /*Q0 */
-#else
-            tmp = round_fx( L_shl( Mult_32_16( L_tmp, *pit ), add( 1, exp ) ) );    /*Q0 */
-#endif
             *pit++ = tmp;
             move16();
         }
@@ -2572,11 +2342,7 @@ void calc_normal_length_fx_32(
                 peak = mag;
                 move16();
             }
-#ifdef BASOP_NOGLOB
             mean = L_add_sat( mean, mag );
-#else
-            mean = L_add( mean, mag );
-#endif
             pit++;
         }
 
@@ -2666,11 +2432,7 @@ void calc_norm_envelop_fx_32(
         move16();
         FOR( n_lag = 0; n_lag < n_lag_now; n_lag++ )
         {
-#ifdef BASOP_NOGLOB
             envelope_fx[env_index] = L_add_sat( envelope_fx[env_index], L_abs( SWB_signal_fx[n_freq + n_lag] ) );
-#else
-            envelope_fx[env_index] = L_add( envelope_fx[env_index], L_abs( SWB_signal_fx[n_freq + n_lag] ) );
-#endif
             move32();
         }
         env_index = add( env_index, 1 );
@@ -2771,19 +2533,11 @@ void hq_generic_decoding_fx(
     IF( L_tmp != 0 )
     {
         exp = norm_l( L_tmp );
-#ifdef EVS_FUNC_MODIFIED
         frac = round_fx_sat( L_shl( L_tmp, exp ) ); /*cs+exp-16 */
-#else
-        frac = round_fx( L_shl( L_tmp, exp ) );                   /*cs+exp-16 */
-#endif
-        tmp = div_s( 16384, frac ); /*15 + 14 - (cs+exp-16) */
+        tmp = div_s( 16384, frac );                 /*15 + 14 - (cs+exp-16) */
         exp = sub( add( cs, exp ), 30 );
-        L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp ); /*Q31 - exp */
-#ifdef BASOP_NOGLOB
+        L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp );                  /*Q31 - exp */
         fenvL_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /*Q1 */
-#else
-        fenvL_fx = round_fx( L_shl( L_tmp, sub( exp, 14 ) ) );    /*Q1 */
-#endif
     }
 
     calc_normal_length_fx_32( HQ_CORE, coeff_out1_fx, HQ_GEN_SWB, -1, &L_swb_norm, prev_L_swb_norm );
@@ -3084,12 +2838,556 @@ void hq_generic_decoding_fx(
         exp2 = sub( norm_l( L_tmp2 ), 1 );
         tmp1_fx = extract_h( L_shl( L_tmp1, exp1 ) );
         tmp2_fx = extract_h( L_shl( L_tmp2, exp2 ) );
-        tmp3_fx = div_s( tmp2_fx, tmp1_fx ); /*15 + exp2 + 15 - (exp1 + 15) */
-#ifdef BASOP_NOGLOB
+        tmp3_fx = div_s( tmp2_fx, tmp1_fx );                       /*15 + exp2 + 15 - (exp1 + 15) */
+        tmp3_fx = shr_sat( tmp3_fx, add( 5, sub( exp2, exp1 ) ) ); /*10 */
+        if ( LT_16( tmp3_fx, 307 /* 0.3 in Q10*/ ) )
+        {
+            tmp3_fx = 307; /* 0.3 in Q10*/
+            move16();
+        }
+        FOR( ; tmp3_fx < 1024; tmp3_fx += 102 )
+        {
+            L_tmp = L_shl( Mult_32_16( *pit1_fx, tmp3_fx ), 5 ); /*15 + 5 + 10 -15 */
+            *pit1_fx++ = L_tmp;
+            move32();
+        }
+
+        pit1_fx = &coeff_out_fx[HQ_GENERIC_HIGH2 - 1 + hq_generic_offset];
+
+        exp1 = sub( norm_l( L_tmp1 ), 1 );
+        exp2 = norm_l( L_tmp2 );
+        tmp1_fx = extract_h( L_shl( L_tmp1, exp1 ) );
+        tmp2_fx = extract_h( L_shl( L_tmp2, exp2 ) );
+        tmp3_fx = div_s( tmp1_fx, tmp2_fx );                   /*15 + exp2 + 15 - (exp1 + 15) */
+        tmp3_fx = shr( tmp3_fx, add( 5, sub( exp1, exp2 ) ) ); /*10 */
+        tmp3_fx = shr( tmp3_fx, 1 );
+        tmp4_fx = mult_r( tmp3_fx, 1638 /* 0.05 in Q15 */ );
+        WHILE( tmp3_fx > 1024 /* 1 in Q10*/ )
+        {
+            L_tmp1 = L_shl( Mult_32_16( *pit1_fx, tmp3_fx ), 5 ); /*15 + 5 + 10 -15 */
+            *pit1_fx-- = L_tmp1;
+            move32();
+            tmp3_fx = sub( tmp3_fx, tmp4_fx );
+        }
+    }
+
+
+    wfenv_fx = hq_generic_fenv_fx[0];
+    move16(); /*1 */
+    i = 0;
+    move16();
+    tmp2 = add( add( swb_bwe_subband[0], hq_generic_offset ), 8 );
+    FOR( n_freq = add( swb_bwe_subband[0], hq_generic_offset ); n_freq < tmp2; n_freq++ )
+    {
+        factor_fx = shl( i, 12 );                             /*15 */
+        L_tmp1 = L_mult( sub( 32767, factor_fx ), fenvL_fx ); /*17 */
+        L_tmp2 = L_mult( factor_fx, wfenv_fx );               /*17 */
+        L_tmp1 = L_add( L_tmp1, L_tmp2 );                     /*17 */
+
+        cs = norm_l( L_tmp1 );
+        tmp = extract_h( L_shl( L_tmp1, cs ) );          /*17 + cs - 16 */
+        L_tmp = Mult_32_16( coeff_out_fx[n_freq], tmp ); /*12 + 15 + 17 + cs - 16 - 15 */
+        coeff_out_fx[n_freq] = L_shr( L_tmp, add( 1, cs ) );
+        move32(); /*12 */
+        i++;
+        move16();
+    }
+
+    k = sub( nenv, 2 );
+    FOR( n_band = 0; n_band < k; n_band++ )
+    {
+        wfenv_fx = hq_generic_fenv_fx[n_band + 1];
+        move16(); /*1 */
+
+        tmp2 = swb_bwe_sm_subband[n_band + 1] + hq_generic_offset;
+        FOR( i = 0; n_freq < tmp2; i++ )
+        {
+            L_tmp1 = L_mult( sub( wfenv_fx, hq_generic_fenv_fx[n_band] ), smooth_factor_fx[n_band] ); /*17 */
+            L_tmp1 = Mult_32_16( L_tmp1, shl( i, 10 ) );                                              /*17 + 10 - 15 */
+            L_tmp1 = L_add( L_tmp1, L_shl( hq_generic_fenv_fx[n_band], 11 ) );                        /*12 */
+
+            cs = norm_l( L_tmp1 );
+            tmp = extract_h( L_shl( L_tmp1, cs ) );          /*12 + cs - 16 */
+            L_tmp = Mult_32_16( coeff_out_fx[n_freq], tmp ); /*12 + 15 + 12 + cs - 16 - 15 */
+            coeff_out_fx[n_freq] = L_shl( L_tmp, sub( 4, cs ) );
+            move32(); /*12 */
+            n_freq++;
+        }
+    }
+
+    wfenv_fx = hq_generic_fenv_fx[nenv - 1];
+    move16(); /*1 */
+    tmp2 = add( swb_bwe_sm_subband[nenv - 1], hq_generic_offset );
+    FOR( i = 0; n_freq < tmp2; i++ )
+    {
+        L_tmp1 = L_mult( sub( wfenv_fx, hq_generic_fenv_fx[nenv - 2] ), smooth_factor_fx[nenv - 2] ); /*17 */
+        L_tmp1 = Mult_32_16( L_tmp1, shl( i, 10 ) );                                                  /*17 + 10 - 15 */
+        L_tmp1 = L_add( L_tmp1, L_shl( hq_generic_fenv_fx[nenv - 2], 11 ) );                          /*12 */
+
+        cs = norm_l( L_tmp1 );
+        tmp = extract_h( L_shl( L_tmp1, cs ) );          /*12 + cs - 16 */
+        L_tmp = Mult_32_16( coeff_out_fx[n_freq], tmp ); /*12 + 15 + 12 + cs - 16 - 15 */
+        coeff_out_fx[n_freq] = L_shl( L_tmp, sub( 4, cs ) );
+        move32(); /*12 */
+        n_freq++;
+    }
+
+    IF( EQ_16( HQ_mode, HQ_GEN_SWB ) )
+    {
+        FOR( n_band = sub( nenv, 1 ); n_band < nenv; ++n_band )
+        {
+            wfenv_fx = hq_generic_fenv_fx[n_band];
+            move16(); /*1 */
+            tmp2 = add( swb_bwe_subband[n_band + 1], hq_generic_offset );
+            FOR( ; n_freq < tmp2; n_freq++ )
+            {
+                L_tmp = Mult_32_16( coeff_out_fx[n_freq], wfenv_fx ); /*15 + 12 + 1 - 15 */
+                coeff_out_fx[n_freq] = L_shr( L_tmp, 1 );
+                move32(); /*12 */
+            }
+        }
+    }
+    ELSE
+    {
+        test();
+        IF( GT_16( sub( hq_generic_fenv_fx[nenv - 1], hq_generic_fenv_fx[nenv] ), 30 ) || LT_16( hq_generic_fenv_fx[nenv], 10 ) )
+        {
+            wfenv_fx = hq_generic_fenv_fx[nenv - 1];
+            move16(); /*1 */
+            FOR( i = 0; n_freq < fb_bwe_subband[0]; i++ )
+            {
+                L_tmp = Mult_32_16( coeff_out_fx[n_freq], wfenv_fx ); /*15 + 12 + 1 - 15 */
+                coeff_out_fx[n_freq] = L_shr( L_tmp, 1 );
+                move32(); /*12 */
+                n_freq++;
+            }
+
+            FOR( n_band = 0; n_band < DIM_FB; n_band++ )
+            {
+                wfenv_fx = hq_generic_fenv_fx[n_band + nenv];
+                move16(); /*1 */
+                tmp2 = fb_bwe_subband[n_band + 1];
+                FOR( i = 0; n_freq < tmp2; i++ )
+                {
+                    L_tmp = Mult_32_16( coeff_out_fx[n_freq], wfenv_fx ); /*15 + 12 + 1 - 15 */
+                    coeff_out_fx[n_freq] = L_shr( L_tmp, 1 );
+                    move32(); /*12 */
+                    n_freq++;
+                }
+            }
+        }
+        ELSE
+        {
+            FOR( n_band = 0; n_band < DIM_FB; n_band++ )
+            {
+                wfenv_fx = hq_generic_fenv_fx[n_band + nenv - 1];
+                move16(); /*1 */
+
+                FOR( i = 0; n_freq < fb_bwe_sm_subband[n_band]; i++ )
+                {
+                    L_tmp1 = L_mult( sub( wfenv_fx, hq_generic_fenv_fx[n_band + nenv] ), fb_smooth_factor_fx[n_band] ); /*17 */
+                    L_tmp1 = Mult_32_16( L_tmp1, shl( i, 9 ) );                                                         /*17 + 9 - 15 */
+                    L_tmp1 = L_add( L_tmp1, L_shl( hq_generic_fenv_fx[n_band + nenv], 10 ) );                           /*11 */
+
+                    cs = norm_l( L_tmp1 );
+                    tmp = extract_h( L_shl( L_tmp1, cs ) );          /*11 + cs - 16 */
+                    L_tmp = Mult_32_16( coeff_out_fx[n_freq], tmp ); /*12 + 15 + 11 + cs - 16 - 15 */
+                    coeff_out_fx[n_freq] = L_shl( L_tmp, sub( 5, cs ) );
+                    move32(); /*12 */
+                    n_freq = add( n_freq, 1 );
+                }
+            }
+
+            wfenv_fx = hq_generic_fenv_fx[tenv - 1];
+            move16(); /*1 */
+
+            FOR( ; n_freq < fb_bwe_subband[DIM_FB]; n_freq++ )
+            {
+                L_tmp = Mult_32_16( coeff_out_fx[n_freq], wfenv_fx ); /*15 + 12 + 1 - 15 */
+                coeff_out_fx[n_freq] = L_shr( L_tmp, 1 );
+                move32(); /*12 */
+            }
+        }
+    }
+
+    return;
+}
+
+void hq_generic_decoding_ivas_fx(
+    const Word16 HQ_mode,             /* i  : HQ mode                                      : Q0  */
+    Word32 *coeff_out1_fx,            /* i/o: BWE input & temporary buffer                 : Q12 */
+    const Word16 *hq_generic_fenv_fx, /* i  : SWB frequency envelopes                      : Q1  */
+    Word32 *coeff_out_fx,             /* o  : SWB signal in MDCT domain                    : Q12 */
+    const Word16 hq_generic_offset,   /* i  : frequency offset for representing hq generci : Q0  */
+    Word16 *prev_L_swb_norm,          /* i/o: last normalize length                        : Q0  */
+    const Word16 hq_generic_exc_clas, /* i  : bwe excitation class                         " Q0  */
+    const Word16 *R )
+{
+    Word16 i, n_freq, n_band, L_swb_norm;
+    Word16 k;
+    Word16 nenv;
+    Word16 tenv;
+
+    Word16 exp, exp1, exp2, frac, tmp, tmp2, cs;
+    Word32 L_tmp, L_tmp1, L_tmp2, max_coeff_fx;
+    Word16 fenvL_fx, wfenv_fx, factor_fx;
+    Word32 *pit1_fx;
+    Word16 tmp1_fx, tmp2_fx, tmp3_fx, tmp4_fx;
+    Word32 energy_fx;
+
+    Word32 envelope_fx[L_FRAME16k];
+    Word32 mean_vector_fx[20];
+    Word16 rn_weight0_fx;
+    Word16 s;
+    Word16 blen, nband_lf, sfidx, efidx;
+    Word16 bwe_seed;
+    Word16 signum[L_FRAME16k];
+
+    nenv = sub( SWB_FENV, 2 );
+    if ( LE_16( hq_generic_offset, HQ_GENERIC_FOFFSET_24K4 ) )
+    {
+        nenv = SWB_FENV;
+        move16();
+    }
+
+    tenv = nenv;
+    move16();
+    if ( EQ_16( HQ_mode, HQ_GEN_FB ) )
+    {
+        tenv = add( nenv, DIM_FB );
+    }
+
+    max_coeff_fx = 0;
+    move16();
+    tmp = add( swb_bwe_subband[0], hq_generic_offset );
+    FOR( n_freq = add( HQ_GENERIC_ST_FREQ, hq_generic_offset ); n_freq < tmp; n_freq++ )
+    {
+        max_coeff_fx = L_max( max_coeff_fx, L_abs( coeff_out1_fx[n_freq] ) );
+    }
+    cs = norm_l( max_coeff_fx );
+
+    L_tmp = 0;
+    move16();
+    tmp2 = add( swb_bwe_subband[0], hq_generic_offset );
+    FOR( n_freq = add( HQ_GENERIC_ST_FREQ, hq_generic_offset ); n_freq < tmp2; n_freq++ )
+    {
+        tmp = extract_h( L_shl( coeff_out1_fx[n_freq], cs ) ); /*12 + cs - 16 */
+        L_tmp1 = L_mult0( tmp, tmp );                          /*2*(cs-2) */
+        L_tmp = L_add( L_tmp, L_shr( L_tmp1, 5 ) );            /*2*(cs-2) - 5 */
+    }
+    cs = sub( shl( cs, 1 ), 9 );
+    fenvL_fx = 0;
+    move16();
+    IF( L_tmp != 0 )
+    {
+        exp = norm_l( L_tmp );
+        frac = round_fx_sat( L_shl( L_tmp, exp ) ); /*cs+exp-16 */
+        tmp = div_s( 16384, frac );                 /*15 + 14 - (cs+exp-16) */
+        exp = sub( add( cs, exp ), 30 );
+        L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp );                  /*Q31 - exp */
+        fenvL_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /*Q1 */
+    }
+
+    calc_normal_length_fx_32( HQ_CORE, coeff_out1_fx, HQ_GEN_SWB, -1, &L_swb_norm, prev_L_swb_norm );
+
+    calc_norm_envelop_lf_fx( coeff_out1_fx, envelope_fx, &L_swb_norm, HQ_mode, hq_generic_offset, &sfidx, &efidx );
+
+    blen = 16;
+    move16();
+
+    IF( EQ_16( hq_generic_exc_clas, HQ_GENERIC_EXC0 ) )
+    {
+        rn_weight0_fx = 819;
+        move16(); /* 0.8 Q10 */
+    }
+    ELSE IF( EQ_16( hq_generic_exc_clas, HQ_GENERIC_EXC1 ) )
+    {
+        rn_weight0_fx = 51;
+        move16(); /* 0.05 Q10*/
+    }
+    ELSE
+    {
+        rn_weight0_fx = 205;
+        move16(); /* 0.02 Q10 */
+    }
+
+    tmp = sub( efidx, sfidx );
+    IF( tmp == 0 )
+    {
+        nband_lf = 0;
+        move16();
+    }
+    ELSE
+    {
+        exp = norm_s( tmp );
+        nband_lf = shl( tmp, sub( exp, 1 ) );
+        exp1 = norm_s( blen );
+        tmp = shl( blen, exp1 );
+        nband_lf = shr( div_s( nband_lf, tmp ), add( sub( 14, exp1 ), exp ) ); /* 15 + exp-1 - exp1, Q0*/
+    }
+
+    FOR( n_freq = sfidx; n_freq < efidx; n_freq++ )
+    {
+        IF( coeff_out1_fx[n_freq] < 0 )
+        {
+            signum[n_freq] = -1;
+            move16();
+            coeff_out1_fx[n_freq] = L_negate( coeff_out1_fx[n_freq] );
+            move32();
+        }
+        ELSE
+        {
+            signum[n_freq] = 1;
+            move16();
+        }
+    }
+
+    /* applying whitening */
+    FOR( n_freq = sfidx; n_freq < efidx; n_freq++ )
+    {
+        exp = norm_l( coeff_out1_fx[n_freq] ) - 1;
+        exp1 = norm_l( envelope_fx[n_freq] );
+
+        L_tmp = L_shl( coeff_out1_fx[n_freq], exp );
+        L_tmp1 = L_shl( envelope_fx[n_freq], exp1 );
+
+        logic16();
+        coeff_out1_fx[n_freq] = Div_32( L_tmp, extract_h( L_tmp1 ), extract_l( L_shr( L_tmp1, 1 ) ) & 0x00007fff );
+        move32(); /*31 + exp1 - exp2*/
+
+        exp = add( 31, sub( exp, exp1 ) );
+        coeff_out1_fx[n_freq] = L_shl( coeff_out1_fx[n_freq], sub( 20, exp ) );
+        move32(); /*Q12->Q20*/
+    }
+
+    /* mean vector generation for controlling dynamic range */
+    FOR( k = 0; k < nband_lf; ++k )
+    {
+        energy_fx = 1;
+        move16();
+
+        tmp = add( i_mult2( add( k, 1 ), blen ), sfidx );
+        FOR( i = add( i_mult2( k, blen ), sfidx ); i < tmp; ++i )
+        {
+            energy_fx = L_add( energy_fx, coeff_out1_fx[i] );
+        }
+        exp = sub( norm_l( energy_fx ), 1 );
+        L_tmp = L_shl( energy_fx, exp );
+        exp1 = norm_l( L_and( blen, 0x00007fff ) );
+        L_tmp1 = L_shl( blen, exp1 );
+        logic16();
+        mean_vector_fx[k] = Div_32( L_tmp, extract_h( L_tmp1 ), extract_l( L_shr( L_tmp1, 1 ) ) & 0x00007fff );
+        move32(); /*31 + 20 + exp1 - exp2*/
+        exp = add( 51, sub( exp, exp1 ) );
+        mean_vector_fx[k] = L_shl( mean_vector_fx[k], sub( 20, exp ) );
+        move32(); /*Q12->Q20*/
+    }
+
+    /* dynamics control */
+    FOR( k = 0; k < nband_lf; ++k )
+    {
+        tmp = add( i_mult2( add( k, 1 ), blen ), sfidx );
+        FOR( i = add( i_mult2( k, blen ), sfidx ); i < tmp; ++i )
+        {
+            L_tmp = L_sub( coeff_out1_fx[i], mean_vector_fx[k] );
+            exp = norm_l( L_tmp );
+            L_tmp = L_shl( L_tmp, exp ); /* exp+12*/
+            exp1 = norm_l( rn_weight0_fx );
+            L_tmp1 = L_shl( rn_weight0_fx, exp1 ); /* exp1+10*/
+            L_tmp = L_mult( extract_h( L_tmp ), extract_h( L_tmp1 ) );
+            L_tmp = L_shr( L_tmp, add( exp, sub( exp1, 21 ) ) ); /* Q20*/
+            coeff_out1_fx[i] = L_sub( coeff_out1_fx[i], L_tmp );
+            move32();
+        }
+    }
+
+    IF( EQ_16( hq_generic_exc_clas, HQ_GENERIC_EXC0 ) )
+    {
+        bwe_seed = add( add( shl( R[0], 3 ), shl( R[1], 2 ) ), add( shl( R[2], 1 ), R[3] ) );
+
+        FOR( n_freq = sfidx; n_freq < efidx; n_freq++ )
+        {
+            IF( signum[n_freq] < 0 )
+            {
+                coeff_out1_fx[n_freq] = L_negate( coeff_out1_fx[n_freq] );
+                move32();
+            }
+
+            IF( Random( &bwe_seed ) < 0 )
+            {
+                coeff_out1_fx[n_freq] = L_negate( coeff_out1_fx[n_freq] );
+                move32();
+            }
+        }
+    }
+    ELSE
+    {
+        FOR( n_freq = sfidx; n_freq < efidx; n_freq++ )
+        {
+            IF( signum[n_freq] < 0 )
+            {
+                coeff_out1_fx[n_freq] = L_negate( coeff_out1_fx[n_freq] );
+                move32();
+            }
+        }
+    }
+
+    /* normalizing modified low frequency spectrum */
+    FOR( k = 0; k < nband_lf; ++k )
+    {
+        energy_fx = 1;
+        move16();
+        tmp = add( i_mult2( add( k, 1 ), blen ), sfidx );
+        FOR( i = add( ( i_mult2( k, blen ) ), sfidx ); i < tmp; ++i )
+        {
+            exp = norm_l( coeff_out1_fx[i] );
+            L_tmp1 = L_shl( coeff_out1_fx[i], exp ); /* exp + 12*/
+
+            L_tmp = Mult_32_32( L_tmp1, L_tmp1 );
+            L_tmp = L_shr( L_tmp, sub( i_mult2( 2, exp ), 11 ) ); /*Q20  */
+            energy_fx = L_add( energy_fx, L_tmp );
+        }
+
+        exp = norm_l( energy_fx );
+        L_tmp = L_shl( energy_fx, sub( exp, 1 ) );
+        exp1 = norm_s( blen );
+        L_tmp1 = L_shl( (Word32) blen, add( exp1, 16 ) );
+
+        L_tmp = Div_32( L_tmp, extract_h( L_tmp1 ), extract_l( L_shr( L_tmp1, 1 ) ) & 0x00007fff );
+        exp = sub( add( 34, exp ), exp1 );
+        L_tmp = L_shr( L_tmp, sub( exp, 31 ) );
+        exp = 31;
+        move16();
+
+        exp = sub( 31, exp );
+        IF( exp & 0x1 )
+        {
+            L_tmp = L_shr( L_tmp, 1 );
+            exp = add( exp, 1 );
+        }
+        L_tmp = Sqrt_l( L_tmp, &exp1 );
+        exp = add( 31, sub( shr( exp1, 1 ), shr( exp, 1 ) ) );
+        energy_fx = L_shl( L_tmp, sub( 31, exp ) ); /*Q31*/
+
+        tmp = add( i_mult2( add( k, 1 ), blen ), sfidx );
+        FOR( i = add( ( i_mult2( k, blen ) ), sfidx ); i < tmp; ++i )
+        {
+            IF( NE_32( L_abs( coeff_out1_fx[i] ), coeff_out1_fx[i] ) )
+            {
+                s = -1;
+                move16();
+                coeff_out1_fx[i] = L_abs( coeff_out1_fx[i] );
+                move32();
+            }
+            ELSE
+            {
+                s = 0;
+                move16();
+            }
+            exp = norm_l( coeff_out1_fx[i] );
+            L_tmp = L_shl( coeff_out1_fx[i], sub( exp, 1 ) );
+            exp1 = norm_l( energy_fx );
+            L_tmp1 = L_shl( (Word32) energy_fx, exp1 );
+            logic16();
+            L_tmp = Div_32( L_tmp, extract_h( L_tmp1 ), extract_l( L_shr( L_tmp1, 1 ) ) & 0x00007fff );
+            exp = add( sub( 19, exp1 ), exp );
+            coeff_out1_fx[i] = L_shl( L_tmp, add( sub( 12, exp ), 15 ) );
+            move32(); /* Q12 -> Q27 */
+            IF( s )
+            {
+                coeff_out1_fx[i] = L_negate( coeff_out1_fx[i] );
+                move32();
+            }
+        }
+    }
+
+    Copy32( &coeff_out1_fx[HQ_GENERIC_OFFSET], &coeff_out_fx[HQ_GENERIC_HIGH0 + hq_generic_offset], HQ_GENERIC_LEN0 );
+    Copy32( &coeff_out1_fx[HQ_GENERIC_OFFSET], &coeff_out_fx[HQ_GENERIC_HIGH1 + hq_generic_offset], HQ_GENERIC_LEN0 );
+
+    IF( LE_16( hq_generic_offset, HQ_GENERIC_FOFFSET_24K4 ) )
+    {
+        Copy32( &coeff_out1_fx[HQ_GENERIC_LOW0], &coeff_out_fx[HQ_GENERIC_HIGH2 + hq_generic_offset], HQ_GENERIC_END_FREQ - HQ_GENERIC_HIGH2 );
+    }
+
+    IF( EQ_16( HQ_mode, HQ_GEN_FB ) )
+    {
+        IF( LE_16( hq_generic_offset, HQ_GENERIC_FOFFSET_24K4 ) )
+        {
+            Copy32( &coeff_out1_fx[HQ_GENERIC_LOW0 + HQ_GENERIC_END_FREQ - HQ_GENERIC_HIGH2], &coeff_out_fx[fb_bwe_subband[0]], 160 );
+        }
+        ELSE
+        {
+            Copy32( &coeff_out1_fx[HQ_GENERIC_OFFSET + HQ_GENERIC_LEN0], &coeff_out_fx[fb_bwe_subband[0]], 160 );
+        }
+    }
+
+
+    L_tmp1 = L_deposit_l( 0 );
+    L_tmp2 = L_deposit_l( 0 );
+    FOR( i = 0; i < 5; ++i )
+    {
+        L_tmp1 = L_add( L_tmp1, L_shr( L_abs( coeff_out_fx[HQ_GENERIC_HIGH1 + hq_generic_offset + i] ), 3 ) );     // adding guard bits
+        L_tmp2 = L_add( L_tmp2, L_shr( L_abs( coeff_out_fx[HQ_GENERIC_HIGH1 - 2 + hq_generic_offset - i] ), 3 ) ); // adding guard bits
+    }
+
+    pit1_fx = &coeff_out_fx[HQ_GENERIC_HIGH1 + hq_generic_offset];
+    L_tmp1 = L_max( L_tmp1, 1 );
+    L_tmp2 = L_max( L_tmp2, 1 );
+    exp1 = norm_l( L_tmp1 );
+    exp2 = sub( norm_l( L_tmp2 ), 1 );
+    tmp1_fx = extract_h( L_shl( L_tmp1, exp1 ) );
+    tmp2_fx = extract_h( L_shl( L_tmp2, exp2 ) );
+    tmp3_fx = div_s( tmp2_fx, tmp1_fx );                   /*15 + exp2 + 15 - (exp1 + 15) */
+    tmp3_fx = shr( tmp3_fx, add( 5, sub( exp2, exp1 ) ) ); /*10 */
+
+    if ( LT_16( tmp3_fx, 307 /*0.3 in Q10 */ ) )
+    {
+        tmp3_fx = 307 /*0.3 in Q10 */;
+        move16();
+    }
+    FOR( ; tmp3_fx < 1024; tmp3_fx += 102 )
+    {
+        *pit1_fx = Mult_32_16( *pit1_fx, shl( tmp3_fx, 5 ) );
+        move32(); /*15 + 5 + 10 -15 */
+        pit1_fx++;
+    }
+
+    pit1_fx = &coeff_out_fx[HQ_GENERIC_HIGH1 - 1 + hq_generic_offset];
+
+    exp1 = sub( norm_l( L_tmp1 ), 1 );
+    exp2 = norm_l( L_tmp2 );
+    tmp1_fx = extract_h( L_shl( L_tmp1, exp1 ) );
+    tmp2_fx = extract_h( L_shl( L_tmp2, exp2 ) );
+    tmp3_fx = div_s( tmp1_fx, tmp2_fx );                   /*15 + exp2 + 15 - (exp1 + 15) */
+    tmp3_fx = shr( tmp3_fx, add( 5, sub( exp1, exp2 ) ) ); /*10 */
+
+    IF( GT_16( tmp3_fx, 5120 ) )
+    {
+        FOR( tmp3_fx = 5120; tmp3_fx > 1024; tmp3_fx -= 512 )
+        {
+            /* Adding saturation suggested as fix for issue #957 */
+            L_tmp1 = L_shl_sat( Mult_32_16( *pit1_fx, tmp3_fx ), 5 ); /*15 + 5 + 10 -15 */
+            *pit1_fx-- = L_tmp1;
+            move32();
+        }
+    }
+
+    IF( LE_16( hq_generic_offset, HQ_GENERIC_FOFFSET_24K4 ) )
+    {
+        L_tmp1 = L_add( L_abs( coeff_out_fx[HQ_GENERIC_HIGH2 + hq_generic_offset] ), L_abs( coeff_out_fx[HQ_GENERIC_HIGH2 + 1 + hq_generic_offset] ) );
+        L_tmp2 = L_add( L_abs( coeff_out_fx[HQ_GENERIC_HIGH2 - 4 + hq_generic_offset] ), L_add( L_abs( coeff_out_fx[HQ_GENERIC_HIGH2 - 3 + hq_generic_offset] ),
+                                                                                                L_add( L_abs( coeff_out_fx[HQ_GENERIC_HIGH2 - 2 + hq_generic_offset] ), L_abs( coeff_out_fx[HQ_GENERIC_HIGH2 - 1 + hq_generic_offset] ) ) ) );
+
+        pit1_fx = &coeff_out_fx[HQ_GENERIC_HIGH2 + hq_generic_offset];
+
+        L_tmp1 = L_max( L_tmp1, 1 );
+        L_tmp2 = L_max( L_tmp2, 1 );
+        exp1 = norm_l( L_tmp1 );
+        exp2 = sub( norm_l( L_tmp2 ), 1 );
+        tmp1_fx = extract_h( L_shl( L_tmp1, exp1 ) );
+        tmp2_fx = extract_h( L_shl( L_tmp2, exp2 ) );
+        tmp3_fx = div_s( tmp2_fx, tmp1_fx );                       /*15 + exp2 + 15 - (exp1 + 15) */
         tmp3_fx = shr_sat( tmp3_fx, add( 5, sub( exp2, exp1 ) ) ); /*10 */
-#else
-        tmp3_fx = shr( tmp3_fx, add( 5, sub( exp2, exp1 ) ) );    /*10 */
-#endif
         if ( LT_16( tmp3_fx, 307 /* 0.3 in Q10*/ ) )
         {
             tmp3_fx = 307; /* 0.3 in Q10*/
@@ -3114,11 +3412,7 @@ void hq_generic_decoding_fx(
         tmp4_fx = mult_r( tmp3_fx, 1638 /* 0.05 in Q15 */ );
         WHILE( tmp3_fx > 1024 /* 1 in Q10*/ )
         {
-#ifdef EVS_FUNC_MODIFIED
             L_tmp1 = L_shl( Mult_32_16( *pit1_fx, tmp3_fx ), 5 ); /*15 + 5 + 10 -15 */
-#else
-            L_tmp1 = Mult_32_16( L_shl( *pit1_fx, 5 ), tmp3_fx ); /*15 + 5 + 10 -15 */
-#endif
             *pit1_fx-- = L_tmp1;
             move32();
             tmp3_fx = sub( tmp3_fx, tmp4_fx );
diff --git a/lib_com/swb_bwe_com_lr_fx.c b/lib_com/swb_bwe_com_lr_fx.c
index 1f4fd180198108ce40b1c9d3e3480a79a4808681..8fd876f1cb9d6dd008231fd5bc074ec58e0612da 100644
--- a/lib_com/swb_bwe_com_lr_fx.c
+++ b/lib_com/swb_bwe_com_lr_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -986,11 +986,7 @@ void SpectrumSmoothing_fx(
         IF( GT_32( L_max_val[i], 0x1L ) )
         {
             exp_normd = norm_l( L_max_val[i] );
-#ifdef BASOP_NOGLOB
             max_val_norm_fx = div_s( 0x2800, round_fx_o( L_shl_o( L_max_val[i], exp_normd, &Overflow ), &Overflow ) ); /* Q10-(Qs+exp_normd-16) */
-#else
-            max_val_norm_fx = div_s( 0x2800, round_fx( L_shl( L_max_val[i], exp_normd ) ) ); /* Q10-(Qs+exp_normd-16) */
-#endif
             Qmax_val_norm[i] = sub( 10 - 12 + 16 + 15, exp_normd );
             move16(); /* 10 - (12+exp_normd-16) +15 */
             ;
@@ -1016,20 +1012,12 @@ void SpectrumSmoothing_fx(
             {
                 IF( L_inBuf_pss[j] >= 0 )
                 {
-#ifdef BASOP_NOGLOB
                     outBuf_pss_fx[j] = round_fx_o( L_shl_o( Mpy_32_16_r( L_shl_o( L_inBuf_pss[j], exp_norm, &Overflow ), max_val_norm_fx ), sub( exp_shift, exp_norm ), &Overflow ), &Overflow );
-#else
-                    outBuf_pss_fx[j] = round_fx( L_shl( Mpy_32_16_r( L_shl( L_inBuf_pss[j], exp_norm ), max_val_norm_fx ), sub( exp_shift, exp_norm ) ) );
-#endif
                     move32();
                 }
                 ELSE
                 {
-#ifdef BASOP_NOGLOB
                     outBuf_pss_fx[j] = negate( round_fx_o( L_shl_o( Mpy_32_16_r( L_shl_o( L_abs( L_inBuf_pss[j] ), exp_norm, &Overflow ), max_val_norm_fx ), sub( exp_shift, exp_norm ), &Overflow ), &Overflow ) );
-#else
-                    outBuf_pss_fx[j] = negate( round_fx( L_shl( Mpy_32_16_r( L_shl( L_abs( L_inBuf_pss[j] ), exp_norm ), max_val_norm_fx ), sub( exp_shift, exp_norm ) ) ) );
-#endif
                     move16();
                 }
             }
@@ -2327,11 +2315,7 @@ void ton_ene_est_fx(
         exp_pow = sub( 14, temp_hi_fx );
         L_band_energy_Linear[i] = Pow2( 14, temp_lo_fx );
         move32(); /* Qexp_pow */
-#ifdef BASOP_NOGLOB
         L_band_energy_Linear[i] = L_shl_sat( L_band_energy_Linear[i], sub( *QbeL, exp_pow ) );
-#else
-        L_band_energy_Linear[i] = L_shl( L_band_energy_Linear[i], sub( *QbeL, exp_pow ) );
-#endif
         move32();
         /* Div Part */
         E_r_fx = 0x7fff;
@@ -2354,11 +2338,7 @@ void ton_ene_est_fx(
         move16();
         /* 0.06=15729(Q18) */
         exp_shift = sub( 18, QE_r );
-#ifdef BASOP_NOGLOB
         E_r_shift_fx = shl_o( E_r_fx, exp_shift, &Overflow );
-#else
-        E_r_shift_fx = shl( E_r_fx, exp_shift );
-#endif
         IF( LT_16( E_r_shift_fx, 15729 ) ) /* E_r < 0.06  */
         {
             /* avg_pe[k] = (float) sqrt(pow(2.0f,band_energy[i])/band_width[i]); */
@@ -2386,11 +2366,7 @@ void ton_ene_est_fx(
                 exp_normn = norm_s( peak_fx[k] );
 
                 fac_fx = div_s( shl( temp2_fx, exp_normd ), shl( peak_fx[k], exp_normn ) );
-#ifdef FIX_ISSUE_1062_AND_1068_TON_ENE_EST_FX
                 fac_fx = shl_sat( fac_fx, sub( add( Qss, exp_normn ), add( Qtemp2, exp_normd ) ) ); /* Qtemp2+exp_normd-(Qss+exp_normn)+15 -> 15*/
-#else
-                fac_fx = shl( fac_fx, sub( add( Qss, exp_normn ), add( Qtemp2, exp_normd ) ) ); /* Qtemp2+exp_normd-(Qss+exp_normn)+15 -> 15*/
-#endif
             }
 
             ni_gain_fx[k] = mult_r( avg_pe_fx[k], fac_fx ); /* Qavg_pe[k] */
@@ -2400,11 +2376,7 @@ void ton_ene_est_fx(
             L_temp = Mult_32_16( L_temp, E_r_fx );
 
             /* 0.12f: 257698038 (Q31) */
-#ifdef BASOP_NOGLOB
             if ( GE_32( L_shl_o( L_temp, sub( 31, add( add( shl( Qavg_pe[k], 1 ), QE_r ), 1 - 15 ) ), &Overflow ), 257698038 ) )
-#else
-            if ( GE_32( L_shl( L_temp, sub( 31, add( add( shl( Qavg_pe[k], 1 ), QE_r ), 1 - 15 ) ) ), 257698038 ) )
-#endif
             {
                 ni_gain_fx[k] = mult_r( 1638, ni_gain_fx[k] ); /* 0.05 : 1638(Q15) */
                 move16();
@@ -2430,11 +2402,7 @@ void ton_ene_est_fx(
             L_E = sum2_fx( &xSynth_har_fx[sub( band_start[i], fLenLow )], band_width[i] );
             QE = add( shl( QxSynth_sft, 1 ), 1 );
 
-#ifdef BASOP_NOGLOB
             L_E = L_shl_sat( L_E, sub( *QbeL, QE ) );
-#else
-            L_E = L_shl( L_E, sub( *QbeL, QE ) );
-#endif
             QE = *QbeL;
             move16();
         }
@@ -2644,11 +2612,7 @@ void Gettonl_scalfact_fx(
             exp_pow = sub( 14, temp_hi_fx );
             L_band_energy_Linear[band_pos_fx] = Pow2( 14, temp_lo_fx );
             move32(); /* Qexp_pow */
-#ifdef BASOP_NOGLOB
             L_band_energy_Linear[band_pos_fx] = L_shl_sat( L_band_energy_Linear[band_pos_fx], sub( QbeL, exp_pow ) );
-#else
-            L_band_energy_Linear[band_pos_fx] = L_shl( L_band_energy_Linear[band_pos_fx], sub( QbeL, exp_pow ) );
-#endif
             move32();
             /* Div Part */
             exp_normd = norm_l( L_be_tonal[band_pos_fx] );
@@ -2656,11 +2620,7 @@ void Gettonl_scalfact_fx(
             exp_normn = norm_l( L_band_energy_Linear[band_pos_fx] );
             temp_fx = div_l( L_shl( L_be_tonal[band_pos_fx], exp_normd ), extract_h( L_shl( L_band_energy_Linear[band_pos_fx], exp_normn ) ) ); /* QbeL+exp_normd-(QbeL+exp_normn-16)-1 */
             sqrt_32n_16_fx( L_deposit_h( temp_fx ), add( sub( exp_normd, exp_normn ), 31 ), &temp_fx, &Qtemp );
-#ifdef BASOP_NOGLOB
             enrd_r_fx = extract_h( L_shl_sat( L_mult( enrd_r_fx, temp_fx ), sub( 15, Qtemp ) ) );
-#else
-            enrd_r_fx = extract_h( L_shl( L_mult( enrd_r_fx, temp_fx ), sub( 15, Qtemp ) ) );
-#endif
             enrd_r_fx = sub( enrd_r_fx, step_fx );
         }
         ELSE
@@ -3271,120 +3231,105 @@ void noiseinj_hf_fx(
         move32();
         IF( p2a_flags_fx[k] == 0 )
         {
-            FOR( i = band_start_fx[k]; i <= band_end_fx[k]; i++ )
-            {
-                IF( LE_32( L_abs( L_xSynth_har[i - fLenLow_fx] ), L_th_g[k - ( BANDS_fx - NB_SWB_SUBBANDS )] ) )
-                {
-                    *p_L_En = L_mac( *p_L_En, xSynth_har_fx[i - fLenLow_fx], xSynth_har_fx[i - fLenLow_fx] );
-                    move32();
-                }
-                ELSE
-                {
-                    map_pulse_t_fx[i] = 1;
-                    move16();
-                }
-            }
-#ifdef BASOP_NOGLOB
-            *p_L_En = L_shl_sat( *p_L_En, sub( QbeL, QE ) );
-#else
-            *p_L_En = L_shl( *p_L_En, sub( QbeL, QE ) );
-#endif
+            FOR( i = band_start_fx[k]; i <= band_end_fx[k]; i++ ){
+                IF( LE_32( L_abs( L_xSynth_har[i - fLenLow_fx] ), L_th_g[k - ( BANDS_fx - NB_SWB_SUBBANDS )] ) ){
+                        *p_L_En = L_mac( *p_L_En, xSynth_har_fx[i - fLenLow_fx], xSynth_har_fx[i - fLenLow_fx] );
             move32();
-            /**p_L_En = (float)sqrt(*p_En);*/
-            sqrt_32n_16_fx( *p_L_En, QbeL, p_sqrt_En_fx, &Qtemp );
-#ifdef BASOP_NOGLOB
-            *p_sqrt_En_fx = shl_o( *p_sqrt_En_fx, sub( QsEn, Qtemp ), &Overflow ); /* -> Q2 */
-            move16();
-#else
-            *p_sqrt_En_fx = shl( *p_sqrt_En_fx, sub( QsEn, Qtemp ) ); /* -> Q2 */
+        }
+        ELSE
+        {
+            map_pulse_t_fx[i] = 1;
             move16();
-#endif
         }
-        p_L_En++;
-        p_sqrt_En_fx++;
     }
+    *p_L_En = L_shl_sat( *p_L_En, sub( QbeL, QE ) );
+    move32();
+    /**p_L_En = (float)sqrt(*p_En);*/
+    sqrt_32n_16_fx( *p_L_En, QbeL, p_sqrt_En_fx, &Qtemp );
+    *p_sqrt_En_fx = shl_o( *p_sqrt_En_fx, sub( QsEn, Qtemp ), &Overflow ); /* -> Q2 */
+    move16();
+}
+p_L_En++;
+p_sqrt_En_fx++;
+}
 
-    p_sqrt_En_fx = sqrt_En_fx;
-    p_Enn_sm_sb_fx = Enn_sm_sb_fx;
-    p_prev_En_sb_fx = prev_En_sb_fx;
-    FOR( k = BANDS_fx - NB_SWB_SUBBANDS; k < BANDS_fx; k++ )
+p_sqrt_En_fx = sqrt_En_fx;
+p_Enn_sm_sb_fx = Enn_sm_sb_fx;
+p_prev_En_sb_fx = prev_En_sb_fx;
+FOR( k = BANDS_fx - NB_SWB_SUBBANDS; k < BANDS_fx; k++ )
+{
+    *p_Enn_sm_sb_fx = prev_En_sb_fx[k - ( BANDS_fx - NB_SWB_SUBBANDS )];
+    move16(); /* QsEn */
+    IF( p2a_flags_fx[k] == 0 )
     {
-        *p_Enn_sm_sb_fx = prev_En_sb_fx[k - ( BANDS_fx - NB_SWB_SUBBANDS )];
-        move16(); /* QsEn */
-        IF( p2a_flags_fx[k] == 0 )
+        L_temp = Mult_32_16( L_band_energy[k], 26214 ); /* 0.8: 26214(Q15) */
+        temp_fx = round_fx( L_shl( L_temp, sub( QsEn, sub( Qbe, 16 ) ) ) );
+        IF( LT_16( *p_prev_En_sb_fx, temp_fx ) )
         {
-            L_temp = Mult_32_16( L_band_energy[k], 26214 ); /* 0.8: 26214(Q15) */
-            temp_fx = round_fx( L_shl( L_temp, sub( QsEn, sub( Qbe, 16 ) ) ) );
-            IF( LT_16( *p_prev_En_sb_fx, temp_fx ) )
-            {
-                /**p_Enn_sm_sb = (0.15f*(*p_En)) + (0.85f*prev_En_sb[k-(BANDS-NB_SWB_SUBBANDS)]);*/
-                /* 0.15: 4915.2(Q15) 0.85: 27852.80(Q15) */
-                *p_Enn_sm_sb_fx = round_fx( L_mac( L_mult( *p_sqrt_En_fx, 4915 ), *p_prev_En_sb_fx, 27853 ) );
-            }
-            ELSE
-            {
-                /**p_Enn_sm_sb = (0.8f*(*p_En)) + (0.2f*prev_En_sb[k-(BANDS-NB_SWB_SUBBANDS)]);*/
-                /* 0.8: 26214.4(Q15) 0.2:6553.6(Q15) */
-                *p_Enn_sm_sb_fx = round_fx( L_mac( L_mult( *p_sqrt_En_fx, 26214 ), *p_prev_En_sb_fx, 6554 ) );
-            }
-            move16();
+            /**p_Enn_sm_sb = (0.15f*(*p_En)) + (0.85f*prev_En_sb[k-(BANDS-NB_SWB_SUBBANDS)]);*/
+            /* 0.15: 4915.2(Q15) 0.85: 27852.80(Q15) */
+            *p_Enn_sm_sb_fx = round_fx( L_mac( L_mult( *p_sqrt_En_fx, 4915 ), *p_prev_En_sb_fx, 27853 ) );
         }
-
-        p_Enn_sm_sb_fx++;
-        p_sqrt_En_fx++;
-        p_prev_En_sb_fx++;
+        ELSE
+        {
+            /**p_Enn_sm_sb = (0.8f*(*p_En)) + (0.2f*prev_En_sb[k-(BANDS-NB_SWB_SUBBANDS)]);*/
+            /* 0.8: 26214.4(Q15) 0.2:6553.6(Q15) */
+            *p_Enn_sm_sb_fx = round_fx( L_mac( L_mult( *p_sqrt_En_fx, 26214 ), *p_prev_En_sb_fx, 6554 ) );
+        }
+        move16();
     }
 
-    p_sqrt_En_fx = sqrt_En_fx;
-    p_Enn_sm_sb_fx = Enn_sm_sb_fx;
-    p_prev_En_sb_fx = prev_En_sb_fx;
-    map_pulse_fx[fLenLow_fx] = ( map_pulse_t_fx[fLenLow_fx] | map_pulse_t_fx[fLenLow_fx + 1] );
+    p_Enn_sm_sb_fx++;
+    p_sqrt_En_fx++;
+    p_prev_En_sb_fx++;
+}
+
+p_sqrt_En_fx = sqrt_En_fx;
+p_Enn_sm_sb_fx = Enn_sm_sb_fx;
+p_prev_En_sb_fx = prev_En_sb_fx;
+map_pulse_fx[fLenLow_fx] = ( map_pulse_t_fx[fLenLow_fx] | map_pulse_t_fx[fLenLow_fx + 1] );
+logic16();
+move16();
+FOR( i = fLenLow_fx + 1; i < band_end_fx[BANDS_fx - 1]; i++ )
+{
+    map_pulse_fx[i] = ( map_pulse_t_fx[i - 1] | map_pulse_t_fx[i] | map_pulse_t_fx[i + 1] );
     logic16();
-    move16();
-    FOR( i = fLenLow_fx + 1; i < band_end_fx[BANDS_fx - 1]; i++ )
-    {
-        map_pulse_fx[i] = ( map_pulse_t_fx[i - 1] | map_pulse_t_fx[i] | map_pulse_t_fx[i + 1] );
-        logic16();
-        logic16();
-        move16();
-    }
-    map_pulse_fx[i] = ( map_pulse_t_fx[i - 1] | map_pulse_t_fx[i] );
     logic16();
     move16();
+}
+map_pulse_fx[i] = ( map_pulse_t_fx[i - 1] | map_pulse_t_fx[i] );
+logic16();
+move16();
 
-    FOR( k = BANDS_fx - NB_SWB_SUBBANDS; k < BANDS_fx; k++ )
+FOR( k = BANDS_fx - NB_SWB_SUBBANDS; k < BANDS_fx; k++ )
+{
+    test();
+    IF( p2a_flags_fx[k] == 0 && *p_sqrt_En_fx != 0x0 )
     {
-        test();
-        IF( p2a_flags_fx[k] == 0 && *p_sqrt_En_fx != 0x0 )
-        {
-            /*ni_scale = sqrt((*p_Enn_sm_sb)/(*p_En));*/
-            /* Div Part */
-            exp_normn = norm_s( *p_Enn_sm_sb_fx );
-            exp_normn = sub( exp_normn, 1 );
-            exp_normd = norm_s( *p_sqrt_En_fx );
-            div_fx = div_s( shl( *p_Enn_sm_sb_fx, exp_normn ), shl( *p_sqrt_En_fx, exp_normd ) );
-            Qdiv = add( sub( exp_normn, exp_normd ), 15 );
-
-            /* SQRT Part */
-            sqrt_32n_16_fx( L_deposit_h( div_fx ), add( Qdiv, 16 ), &ni_scale_fx, &Qtemp );
-#ifdef BASOP_NOGLOB
-            ni_scale_fx = shl_o( ni_scale_fx, sub( 14, Qtemp ), &Overflow );
-#else
-            ni_scale_fx = shl( ni_scale_fx, sub( 14, Qtemp ) );
-#endif
-            ni_scale_fx = s_min( 20408, ni_scale_fx ); /* 1.25=20408.0(Q14) */
-
-            ni_scale_fx = s_max( 12288, ni_scale_fx ); /* 0.75=12288.0(Q14) */
-
-            ni_scale_fx = mult_r( ni_scale_fx, 26214 ); /* 0.8=26214.4(Q15)   -> Q14 */
-            FOR( i = band_start_fx[k]; i <= band_end_fx[k]; i++ ){
-                IF( LE_32( L_abs( L_xSynth_har[i - fLenLow_fx] ), L_th_g[k - ( BANDS_fx - NB_SWB_SUBBANDS )] ) ){
-                    IF( map_pulse_fx[i] == 0 ){
-                        L_xSynth_har[i - fLenLow_fx] = L_shl( Mult_32_16( L_xSynth_har[i - fLenLow_fx], ni_scale_fx ), 1 ); /* Q12+Q14-15-1 = Q12 */
-            move32();
-        }
+        /*ni_scale = sqrt((*p_Enn_sm_sb)/(*p_En));*/
+        /* Div Part */
+        exp_normn = norm_s( *p_Enn_sm_sb_fx );
+        exp_normn = sub( exp_normn, 1 );
+        exp_normd = norm_s( *p_sqrt_En_fx );
+        div_fx = div_s( shl( *p_Enn_sm_sb_fx, exp_normn ), shl( *p_sqrt_En_fx, exp_normd ) );
+        Qdiv = add( sub( exp_normn, exp_normd ), 15 );
+
+        /* SQRT Part */
+        sqrt_32n_16_fx( L_deposit_h( div_fx ), add( Qdiv, 16 ), &ni_scale_fx, &Qtemp );
+        ni_scale_fx = shl_o( ni_scale_fx, sub( 14, Qtemp ), &Overflow );
+        ni_scale_fx = s_min( 20408, ni_scale_fx ); /* 1.25=20408.0(Q14) */
+
+        ni_scale_fx = s_max( 12288, ni_scale_fx ); /* 0.75=12288.0(Q14) */
+
+        ni_scale_fx = mult_r( ni_scale_fx, 26214 ); /* 0.8=26214.4(Q15)   -> Q14 */
+        FOR( i = band_start_fx[k]; i <= band_end_fx[k]; i++ ){
+            IF( LE_32( L_abs( L_xSynth_har[i - fLenLow_fx] ), L_th_g[k - ( BANDS_fx - NB_SWB_SUBBANDS )] ) ){
+                IF( map_pulse_fx[i] == 0 ){
+                    L_xSynth_har[i - fLenLow_fx] = L_shl( Mult_32_16( L_xSynth_har[i - fLenLow_fx], ni_scale_fx ), 1 ); /* Q12+Q14-15-1 = Q12 */
+        move32();
     }
 }
+}
 *p_prev_En_sb_fx = *p_Enn_sm_sb_fx;
 move16();
 }
diff --git a/lib_com/swb_tbe_com.c b/lib_com/swb_tbe_com.c
deleted file mode 100644
index 9b20512a24e17ca91b7c39668a07e128894cf01f..0000000000000000000000000000000000000000
--- a/lib_com/swb_tbe_com.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-#include <assert.h>
-
-
-/*-----------------------------------------------------------------*
- * Local function prototypes
- *-----------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * flip_spectrum_and_decimby4()
- *
- *
- *-------------------------------------------------------------------*/
-
-
-void GenSHBSynth_fx_32(
-    const Word32 *input_synspeech,      /* i  : input synthesized speech    Qx*/
-    Word32 *shb_syn_speech_32k,         /* o  : output highband component   Qx*/
-    Word32 Hilbert_Mem[],               /* i/o: memory                      Qx*/
-    Word32 state_lsyn_filt_shb_local[], /* i/o: memory                      Qx*/
-    const Word16 L_frame,               /* i  : ACELP frame length          */
-    Word16 *syn_dm_phase )
-{
-    Word32 speech_buf_32k[L_FRAME32k];
-    Word16 i;
-
-    Interpolate_allpass_steep_32( input_synspeech, state_lsyn_filt_shb_local, L_FRAME16k, speech_buf_32k );
-
-    IF( EQ_16( L_frame, L_FRAME ) )
-    {
-        flip_and_downmix_generic_fx_32( speech_buf_32k, shb_syn_speech_32k, L_FRAME32k, Hilbert_Mem, Hilbert_Mem + HILBERT_ORDER1, Hilbert_Mem + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ), syn_dm_phase );
-    }
-    ELSE
-    {
-        FOR( i = 0; i < L_FRAME32k; i++ )
-        {
-            // shb_syn_speech_32k[i] = ( ( i % 2 ) == 0 ) ? ( -speech_buf_32k[i] ) : ( speech_buf_32k[i] );
-            IF( i % 2 == 0 )
-            {
-                shb_syn_speech_32k[i] = L_negate( speech_buf_32k[i] ); // Qx
-            }
-            ELSE
-            {
-                shb_syn_speech_32k[i] = speech_buf_32k[i]; // Qx
-            }
-            move32();
-        }
-    }
-
-    return;
-}
-void ScaleShapedSHB_32(
-    const Word16 length,        /* i  : SHB overlap length      */
-    Word32 *synSHB_fx,          /* i/o: synthesized shb signal  Q_inp/Q_new */
-    Word32 *overlap_fx,         /* i/o: buffer for overlap-add  Q_inp/Q_new */
-    const Word16 *subgain_fx,   /* i  : subframe gain           Q15 */
-    const Word32 frame_gain_fx, /* i  : frame gain              Q18*/
-    const Word16 *win_fx,       /* i  : window                  Q15 */
-    const Word16 *subwin_fx,    /* i  : subframes window        Q15 */
-    Word16 *Q_inp,
-    Word16 *Q_new )
-{
-    const Word16 *skip;
-    Word16 i, j, k, l_shb_lahead, l_frame;
-    Word16 join_length, num_join;
-    Word32 mod_syn_fx[L_FRAME16k + L_SHB_LAHEAD], L_tmp;
-    Word16 sum_gain_fx;
-
-    /* initilaization */
-    l_frame = L_FRAME16k;
-    l_shb_lahead = L_SHB_LAHEAD;
-    move16();
-    move16();
-    skip = skip_bands_SWB_TBE;
-
-    IF( EQ_16( length, SHB_OVERLAP_LEN / 2 ) )
-    {
-        skip = skip_bands_WB_TBE;
-        l_frame = L_FRAME16k / 4;
-        l_shb_lahead = L_SHB_LAHEAD / 4;
-        move16();
-        move16();
-    }
-
-    /* apply gain for each subframe, and store noise output signal using overlap-add */
-    set32_fx( mod_syn_fx, 0, l_frame + l_shb_lahead );
-
-    IF( EQ_16( length, SHB_OVERLAP_LEN / 2 ) )
-    {
-        sum_gain_fx = 0;
-        move16();
-        FOR( k = 0; k < shr( length, 1 ); k++ )
-        {
-            sum_gain_fx = mult_r( subwin_fx[2 * k + 2], subgain_fx[0] );
-            mod_syn_fx[skip[0] + k] = Mpy_32_16_1( synSHB_fx[skip[0] + k], sum_gain_fx );
-            move32();                                                                                                 // Qx
-            mod_syn_fx[skip[0] + k + length / 2] = Mpy_32_16_1( synSHB_fx[skip[0] + k + length / 2], subgain_fx[0] ); // Qx
-            move32();
-        }
-        FOR( i = 1; i < NUM_SHB_SUBFR / 2; i++ )
-        {
-            FOR( k = 0; k < length; k++ )
-            {
-                L_tmp = L_mult0( subwin_fx[k + 1], subgain_fx[i] );
-                sum_gain_fx = round_fx( L_mac0( L_tmp, subwin_fx[length - k - 1], subgain_fx[i - 1] ) );
-                mod_syn_fx[skip[i] + k] = L_shl( Mpy_32_16_1( synSHB_fx[skip[i] + k], sum_gain_fx ), 1 ); // Qx
-                move32();
-            }
-        }
-        FOR( k = 0; k < shr( length, 1 ); k++ )
-        {
-            sum_gain_fx = mult_r( subwin_fx[length - k * 2 - 2], subgain_fx[i - 1] );
-            mod_syn_fx[skip[i] + k] = Mpy_32_16_1( synSHB_fx[skip[i] + k], sum_gain_fx ); // Qx
-            move32();
-        }
-    }
-    ELSE
-    {
-        num_join = NUM_SHB_SUBFR / NUM_SHB_SUBGAINS;
-        join_length = i_mult( num_join, length );
-        j = 0;
-        move16();
-        move16();
-        FOR( k = 0; k < length; k++ )
-        {
-            mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[k + 1], subgain_fx[0] ) ); // Qx
-            move32();
-            j = add( j, 1 );
-        }
-        FOR( i = 0; i < NUM_SHB_SUBGAINS - 1; i++ )
-        {
-            FOR( k = 0; k < join_length - length; k++ )
-            {
-                mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[i * num_join] ); // Qx
-                move32();
-                j = add( j, 1 );
-            }
-
-            FOR( k = 0; k < length; k++ )
-            {
-                L_tmp = L_mult0( subwin_fx[length - k - 1], subgain_fx[i * num_join] );
-                mod_syn_fx[j] = L_shl( Mpy_32_16_1( synSHB_fx[j], round_fx( L_mac0( L_tmp, subwin_fx[k + 1], subgain_fx[( i + 1 ) * num_join] ) ) ), 1 ); // Qx
-                move32();
-                j = add( j, 1 );
-            }
-        }
-        FOR( k = 0; k < join_length - length; k++ )
-        {
-            mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ); // Qx
-            move32();
-            j = add( j, 1 );
-        }
-        FOR( k = 0; k < length; k++ )
-        {
-            mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[length - k - 1], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ) ); // Qx
-            move32();
-            j = add( j, 1 );
-        }
-    }
-
-    Word16 norm_shift = norm_l( frame_gain_fx );
-    if ( frame_gain_fx == 0 )
-    {
-        norm_shift = 31;
-        move16();
-    }
-
-    norm_shift = s_min( norm_shift, 14 );
-    norm_shift = sub( norm_shift, 1 );
-
-    *Q_new = add( *Q_inp, sub( norm_shift, 13 ) ); // Q_new = Q_inp + min(norm_shift,14) - 14;
-    move16();
-    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-    {
-        overlap_fx[i] = L_shl( overlap_fx[i], sub( *Q_new, *Q_inp ) );
-        move32();
-    }
-
-    FOR( i = 0; i < l_shb_lahead; i++ )
-    {
-        synSHB_fx[i] = Mpy_32_32( mod_syn_fx[i], Mpy_32_16_1( L_shl( frame_gain_fx, norm_shift ), win_fx[i] ) ); // Q_new
-        synSHB_fx[i] = L_add( synSHB_fx[i], overlap_fx[i] );
-        synSHB_fx[i + l_shb_lahead] = Mpy_32_32( mod_syn_fx[i], L_shl( frame_gain_fx, norm_shift ) ); // Q_new
-        move32();
-        move32();
-        move32();
-    }
-
-    FOR( ; i < l_frame; i++ )
-    {
-        synSHB_fx[i] = Mpy_32_32( mod_syn_fx[i], L_shl( frame_gain_fx, norm_shift ) ); // Q_new
-        move32();
-    }
-
-    FOR( ; i < l_frame + l_shb_lahead; i++ )
-    {
-        synSHB_fx[i] = L_shl( synSHB_fx[i], sub( *Q_new, *Q_inp ) );
-        overlap_fx[i - l_frame] = Mpy_32_32( mod_syn_fx[i], Mpy_32_16_1( L_shl( frame_gain_fx, norm_shift ), win_fx[l_frame + l_shb_lahead - 1 - i] ) ); // Q_new
-        move32();
-        move32();
-    }
-
-    *Q_inp = *Q_new;
-    move16();
-    return;
-}
diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c
index 7b64a29230c68436548d2a287fc4e0f17a99b7f1..08bbd6362e5ef0f2f6c78ebe9b0ef3ef0dcdd83e 100644
--- a/lib_com/swb_tbe_com_fx.c
+++ b/lib_com/swb_tbe_com_fx.c
@@ -7,17 +7,17 @@
 #include "options.h"
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
-#include "prot.h"
 #include "prot_fx.h"
 #include "basop_util.h"
 #include "ivas_prot_fx.h"
 #include "options_warnings.h"
 
-#define POW_EXC16k_WHTND             1.14e11f  /* power of random excitation, length 320 samples, uniform distribution */
-#define POW_EXC16k_WHTND_FX_INV_SQRT 6360      // Q31
-#define POW_EXC16k_WHTND_FX          178125000 // Q-6
-#define THR_ENV_ERROR_PLOSIVE        200.0f    /* threshold for envelope error used in plosive detection */
-#define THR_ENV_ERROR_PLOSIVE_FX     200       /* threshold for envelope error used in plosive detection Q0 */
+#define POW_EXC16k_WHTND                    1.14e11f   /* power of random excitation, length 320 samples, uniform distribution */
+#define POW_EXC16k_WHTND_FX_INV_SQRT        6360       // Q31
+#define POW_EXC16k_WHTND_FX_INV_SQRT_IN_Q49 1667313793 // Q49
+#define POW_EXC16k_WHTND_FX                 178125000  // Q-6
+#define THR_ENV_ERROR_PLOSIVE               200.0f     /* threshold for envelope error used in plosive detection */
+#define THR_ENV_ERROR_PLOSIVE_FX            200        /* threshold for envelope error used in plosive detection Q0 */
 
 /*-----------------------------------------------------------------*
  * Local function prototypes
@@ -73,7 +73,7 @@ void swb_tbe_reset_fx(
  * Reset the extra parameters needed for synthesis of the SWB TBE output
  *-------------------------------------------------------------------*/
 
-void swb_tbe_reset_synth_ivas_fx(
+void swb_tbe_reset_synth_fx(
     Word32 genSHBsynth_Hilbert_Mem[],
     Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[],
     Word32 genSHBsynth_state_lsyn_filt_shb_local_fx_32[] )
@@ -81,17 +81,11 @@ void swb_tbe_reset_synth_ivas_fx(
 
     set32_fx( genSHBsynth_Hilbert_Mem, 0, HILBERT_MEM_SIZE );
     set16_fx( genSHBsynth_state_lsyn_filt_shb_local_fx, 0, 2 * ALLPASSSECTIONS_STEEP );
-    set32_fx( genSHBsynth_state_lsyn_filt_shb_local_fx_32, 0, 2 * ALLPASSSECTIONS_STEEP );
-
-    return;
-}
-void swb_tbe_reset_synth_fx(
-    Word32 genSHBsynth_Hilbert_Mem[],
-    Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[] )
-{
 
-    set32_fx( genSHBsynth_Hilbert_Mem, 0, HILBERT_MEM_SIZE );
-    set16_fx( genSHBsynth_state_lsyn_filt_shb_local_fx, 0, 2 * ALLPASSSECTIONS_STEEP );
+    if ( genSHBsynth_state_lsyn_filt_shb_local_fx_32 != NULL )
+    {
+        set32_fx( genSHBsynth_state_lsyn_filt_shb_local_fx_32, 0, 2 * ALLPASSSECTIONS_STEEP );
+    }
 
     return;
 }
@@ -487,10 +481,12 @@ void flip_and_downmix_generic_fx(
 
     *phase_state = j;
     move16();
+
     return;
 }
 
-void flip_and_downmix_generic_fx_32(
+
+void flip_and_downmix_generic_fx32(
     Word32 input[],                      /* i : input spectrum Qx*/
     Word32 output[],                     /* o : output spectrum Qx*/
     const Word16 length,                 /* i : length of spectra */
@@ -810,6 +806,65 @@ void Calc_rc0_h(
     }
 }
 
+void Calc_rc0_h_ivas_enc_fx(
+    Word16 *h,  /* i  : impulse response of composed filter */
+    Word16 *rc0 /* o  : 1st parcor */
+)
+{
+    Word32 L_acc;
+    Word16 *ptrs;
+    Word16 acf0, acf1;
+    Word16 temp, sh_acf, tmp2;
+    Word16 i;
+
+    /* computation of the autocorrelation function acf */
+    L_acc = L_mult( h[0], h[0] );
+    FOR( i = 1; i < LONG_H_ST; i++ )
+    {
+        tmp2 = shr( h[i], 2 );
+        L_acc = L_mac( L_acc, tmp2, tmp2 );
+    }
+    sh_acf = norm_l( L_acc );
+    L_acc = L_shl( L_acc, sh_acf );
+    acf0 = extract_h( L_acc );
+
+    ptrs = h;
+
+    temp = *ptrs++;
+    move16();
+    L_acc = L_mult( temp, *ptrs );
+    FOR( i = 1; i < LONG_H_ST - 1; i++ )
+    {
+        temp = shr( *ptrs++, 2 );
+        move16();
+        L_acc = L_mac( L_acc, temp, shr( *ptrs, 2 ) );
+    }
+    L_acc = L_shl( L_acc, sh_acf );
+    acf1 = extract_h( L_acc );
+
+    /* Compute 1st parcor */
+    IF( acf0 == 0 )
+    {
+        *rc0 = 0;
+        move16();
+        return;
+    }
+
+    IF( LT_16( acf0, abs_s( acf1 ) ) )
+    {
+        *rc0 = 0;
+        move16();
+        return;
+    }
+    *rc0 = div_s( abs_s( acf1 ), acf0 );
+    move16();
+    IF( acf1 > 0 )
+    {
+        *rc0 = negate( *rc0 );
+        move16();
+    }
+}
+
 static void Calc_st_filt_tbe(
     Word16 *apond2,      /* i  : coefficients of numerator             */
     Word16 *apond1,      /* i  : coefficients of denominator           */
@@ -868,7 +923,7 @@ static void Calc_st_filt_tbe_ivas_enc_fx(
     /* compute i.r. of composed filter apond2 / apond1 */
     syn_filt_fx( temp, apond1, LPC_SHB_ORDER, apond2, h, LONG_H_ST, mem_zero, 0 );
     /* compute 1st parcor */
-    Calc_rc0_h( h, parcor0 );
+    Calc_rc0_h_ivas_enc_fx( h, parcor0 );
 
     /* compute g0 */
     L_g0 = L_mult0( 1, abs_s( h[0] ) );
@@ -982,7 +1037,7 @@ static void filt_mu_fx(
     FOR( n = 0; n < SubFrameLength; n++ )
     {
         temp = mult_r( mu, ( *ptrs++ ) );
-        temp = add( temp, *ptrs ); /*Q12 */
+        temp = add_sat( temp, *ptrs ); /*Q12 */
         sig_out[n] = shl_o( mult_r( ga, temp ), 1, &Overflow );
         move16(); /*Q12 */
     }
@@ -1082,13 +1137,8 @@ static void scale_st_swb(
         temp = mult_r( agc_fac_para_fx, gain_fx ); /*15 +14 -15 =14 */
         gain_fx = add( temp, g0_fx );              /* in Q14 */
         L_temp = L_mult( gain_fx, sig_out_fx[i] ); /*14 + Q_bwe_exc-1 +1 = 14 + Q_bwe_exc */
-#ifdef BASOP_NOGLOB
-        L_temp = L_shl_sat( L_temp, 1 );        /*14 + Q_bwe_exc +1 */
-        sig_out_fx[i] = round_fx_sat( L_temp ); /*Q_bwe_exc +15 -16 = Q_bwe_exc-1 */
-#else
-        L_temp = L_shl( L_temp, 1 );        /*14 + Q_bwe_exc +1 */
-        sig_out_fx[i] = round_fx( L_temp ); /*Q_bwe_exc +15 -16 = Q_bwe_exc-1 */
-#endif
+        L_temp = L_shl_sat( L_temp, 1 );           /*14 + Q_bwe_exc +1 */
+        sig_out_fx[i] = round_fx_sat( L_temp );    /*Q_bwe_exc +15 -16 = Q_bwe_exc-1 */
         move16();
     }
     *gain_prec_fx = gain_fx;
@@ -1355,7 +1405,7 @@ void flip_spectrum_and_decimby4_fx(
 /* CALLED FROM : */
 /*==========================================================================*/
 
-void ivas_GenShapedWBExcitation_fx(
+void GenShapedWBExcitation_ivas_fx(
     Word16 *excSHB,                   /* o : synthesized shaped shb exctiation Q_bwe_exc*/
     const Word16 *lpc_shb,            /* i : lpc coefficients Q12*/
     Word16 *exc4kWhtnd,               /* o : whitened synthesized shb excitation Q_bwe_exc*/
@@ -1487,35 +1537,22 @@ void ivas_GenShapedWBExcitation_fx(
             n1 = norm_s( max_val );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 excTmp2_frac[i] = shl_o( excTmp2[i], n1, &Overflow ); // Q_bwe_exc + n1
-#else
-                excTmp2_frac[i] = shl( excTmp2[i], n1 );
-#endif
-                move16(); /* Q14 */
+                move16();                                             /* Q14 */
             }
             n1 = sub( sub( 14, n1 ), Q_bwe_exc );
             pow1 = 1;
             move32();
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_o( excTmp2_frac[i], excTmp2_frac[i], &Overflow ); /* Q29 */
                 pow1 = L_add_o( pow1, L_shr( L_tmp, 10 ), &Overflow );           /* Q22 */
-#else
-                L_tmp = L_mult( excTmp2_frac[i], excTmp2_frac[i] ); /* Q29 */
-                pow1 = L_add( pow1, L_shr( L_tmp, 7 ) );            /* Q22 */
-#endif
             }
         }
 
         FOR( i = 0; i < L_FRAME16k / 4; i++ )
         {
-#ifdef BASOP_NOGLOB
             excNoisyEnv[i] = L_add_o( *mem_csfilt, L_mult_o( csfilt_num2[0], excTmp2[i], &Overflow ), &Overflow );
-#else
-            excNoisyEnv[i] = L_add( *mem_csfilt, L_mult( csfilt_num2[0], excTmp2[i] ) );
-#endif
             move32(); /* Q_bwe_exc+16  */
             *mem_csfilt = Mult_32_16( excNoisyEnv[i], neg_csfilt_den2[1] );
             move32(); /* Q_bwe_exc+16 */
@@ -1545,11 +1582,7 @@ void ivas_GenShapedWBExcitation_fx(
             n2 = norm_l( Lmax );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 exc4k_frac[i] = extract_h( L_shl_o( exc4k_32[i], n2, &Overflow ) ); /* Q(14-n2) */
-#else
-                exc4k_frac[i] = extract_h( L_shl( exc4k_32[i], n2 ) );                   /* Q(14-n2) */
-#endif
                 move16();
             }
             n2 = 30 - n2 - ( Q_bwe_exc + 6 );
@@ -1557,13 +1590,8 @@ void ivas_GenShapedWBExcitation_fx(
             move32();
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_o( exc4k_frac[i], exc4k_frac[i], &Overflow ); /* Q29 */
                 pow22 = L_add_o( pow22, L_shr( L_tmp, 10 ), &Overflow );     /* Q22     */
-#else
-                L_tmp = L_mult( exc4k_frac[i], exc4k_frac[i] );                          /* Q29 */
-                pow22 = L_add( pow22, L_shr( L_tmp, 7 ) );                               /* Q22     */
-#endif
             }
         }
 
@@ -1572,19 +1600,11 @@ void ivas_GenShapedWBExcitation_fx(
         IF( EQ_16( coder_type, UNVOICED ) || ( igf_flag != 0 && LT_16( avg_voice_fac, 6654 /* 0.2 in Q15 */ ) ) )
         {
             L_tmp = root_a_over_b_fx( pow1, sub( 19, shl( n1, 1 ) ), pow22, sub( 19, shl( n2, 1 ) ), &exp );
-#ifdef BASOP_NOGLOB
             scale = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#else
-            scale = round_fx( L_shl( L_tmp, exp ) );                                     /*Q15 */
-#endif
             sc = sub( add( n2, Q_bwe_exc ), 14 );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 exc4kWhtnd[i] = round_fx_o( L_shl_o( L_mult_o( exc4k_frac[i], scale, &Overflow ), sc, &Overflow ), &Overflow ); /*  Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
-#else
-                exc4kWhtnd[i] = round_fx( L_shl( L_mult( exc4k_frac[i], scale ), sc ) ); /*  Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
-#endif
                 move16();
             }
         }
@@ -1600,13 +1620,7 @@ void ivas_GenShapedWBExcitation_fx(
                 {
                     /*tmp_vfac = 2*voice_factors[i];
                       tmp_vfac = min(1, tmp_vfac);*/
-#ifdef BASOP_NOGLOB
                     tmp_vfac = shl_o( voice_factors[i], 1, &Overflow );
-#else
-                    BASOP_SATURATE_WARNING_OFF_EVS
-                    tmp_vfac = shl( voice_factors[i], 1 );
-                    BASOP_SATURATE_WARNING_ON_EVS
-#endif
                 }
                 ELSE
                 {
@@ -1615,29 +1629,15 @@ void ivas_GenShapedWBExcitation_fx(
                 }
 
                 Ltemp1 = root_a_fx( L_deposit_h( tmp_vfac ), 31, &exp );
-#ifdef BASOP_NOGLOB
                 temp1 = round_fx_o( L_shl_o( Ltemp1, exp, &Overflow ), &Overflow ); /* Q15 */
-#else
-                temp1 = round_fx( L_shl( Ltemp1, exp ) );                                /* Q15 */
-#endif
-                L_tmp = Mult_32_16( pow1, sub( 32767, tmp_vfac ) ); /* Q22*/
+                L_tmp = Mult_32_16( pow1, sub( 32767, tmp_vfac ) );                 /* Q22*/
                 Ltemp2 = root_a_over_b_fx( L_tmp, sub( 19, shl( n1, 1 ) ), pow22, sub( 19, shl( n2, 1 ) ), &exp );
-#ifdef BASOP_NOGLOB
                 temp2 = round_fx_o( L_shl_o( Ltemp2, exp, &Overflow ), &Overflow ); /* Q15 */
-#else
-                temp2 = round_fx( L_shl( Ltemp2, exp ) );                                /* Q15 */
-#endif
                 FOR( j = 0; j < L_FRAME16k / 16; j++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp = L_mult_o( temp1, exc4kWhtnd[k], &Overflow );                                                        /* Q(16+Q_bwe_exc) */
                     L_tmp = L_add_o( L_tmp, L_shl_o( L_mult_o( temp2, exc4k_frac[k], &Overflow ), sc, &Overflow ), &Overflow ); /* Q(16+Q_bwe_exc) */
                     exc4kWhtnd[k] = round_fx_o( L_tmp, &Overflow );                                                             /* Q_bwe_exc */
-#else
-                    L_tmp = L_mult( temp1, exc4kWhtnd[k] );                              /* Q(16+Q_bwe_exc) */
-                    L_tmp = L_add( L_tmp, L_shl( L_mult( temp2, exc4k_frac[k] ), sc ) ); /* Q(16+Q_bwe_exc) */
-                    exc4kWhtnd[k] = round_fx( L_tmp );                                   /* Q_bwe_exc */
-#endif
                     move16();
                     k++;
                 }
@@ -1645,7 +1645,12 @@ void ivas_GenShapedWBExcitation_fx(
         }
     }
 
-    Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 );
+    Scale_sig( state_lpc_syn, LPC_SHB_ORDER, -Q2 ); /* Q(Q_bwe_exc) -> Q(Q_bwe_exc - 2) */
+
+    Syn_filt_s( Q2, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 );
+
+    Scale_sig( state_lpc_syn, LPC_SHB_ORDER, Q2 ); /* Q(Q_bwe_exc - 2) -> Q(Q_bwe_exc) */
+    Scale_sig( excSHB, L_FRAME16k / 4, Q2 );       /* Q(Q_bwe_exc - 2) -> Q(Q_bwe_exc) */
 
     return;
 }
@@ -1784,11 +1789,7 @@ void GenShapedWBExcitation_fx(
             n1 = norm_s( max_val );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 excTmp2_frac[i] = shl_o( excTmp2[i], n1, &Overflow );
-#else
-                excTmp2_frac[i] = shl( excTmp2[i], n1 );
-#endif
                 move16(); /* Q14 */
             }
             n1 = sub( sub( 14, n1 ), Q_bwe_exc );
@@ -1796,23 +1797,14 @@ void GenShapedWBExcitation_fx(
             move32();
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_o( excTmp2_frac[i], excTmp2_frac[i], &Overflow ); /* Q29 */
                 pow1 = L_add_o( pow1, L_shr( L_tmp, 7 ), &Overflow );            /* Q22 */
-#else
-                L_tmp = L_mult( excTmp2_frac[i], excTmp2_frac[i] ); /* Q29 */
-                pow1 = L_add( pow1, L_shr( L_tmp, 7 ) );            /* Q22 */
-#endif
             }
         }
 
         FOR( i = 0; i < L_FRAME16k / 4; i++ )
         {
-#ifdef BASOP_NOGLOB
             excNoisyEnv[i] = L_add_o( *mem_csfilt, L_mult_o( csfilt_num2[0], excTmp2[i], &Overflow ), &Overflow );
-#else
-            excNoisyEnv[i] = L_add( *mem_csfilt, L_mult( csfilt_num2[0], excTmp2[i] ) );
-#endif
             move32(); /* Q_bwe_exc+16  */
             *mem_csfilt = Mpy_32_16_1( excNoisyEnv[i], neg_csfilt_den2[1] );
             move32(); /* Q_bwe_exc+16 */
@@ -1843,11 +1835,7 @@ void GenShapedWBExcitation_fx(
             n2 = norm_l( Lmax );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 exc4k_frac[i] = extract_h( L_shl_o( exc4k_32[i], n2, &Overflow ) ); /* Q(14-n2) */
-#else
-                exc4k_frac[i] = extract_h( L_shl( exc4k_32[i], n2 ) );                   /* Q(14-n2) */
-#endif
                 move16();
             }
             n2 = sub( sub( 30, n2 ), add( Q_bwe_exc, 6 ) );
@@ -1855,13 +1843,8 @@ void GenShapedWBExcitation_fx(
             move32();
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_o( exc4k_frac[i], exc4k_frac[i], &Overflow ); /* Q29 */
                 pow22 = L_add_o( pow22, L_shr( L_tmp, 7 ), &Overflow );      /* Q22     */
-#else
-                L_tmp = L_mult( exc4k_frac[i], exc4k_frac[i] );                          /* Q29 */
-                pow22 = L_add( pow22, L_shr( L_tmp, 7 ) );                               /* Q22     */
-#endif
             }
         }
 
@@ -1870,19 +1853,11 @@ void GenShapedWBExcitation_fx(
         IF( EQ_16( coder_type, UNVOICED ) || ( igf_flag != 0 && LT_16( avg_voice_fac, 6654 /*0.2 in Q15 */ ) ) )
         {
             L_tmp = root_a_over_b_fx( pow1, sub( 22, shl( n1, 1 ) ), pow22, sub( 22, shl( n2, 1 ) ), &exp );
-#ifdef BASOP_NOGLOB
             scale = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#else
-            scale = round_fx( L_shl( L_tmp, exp ) );                                     /*Q15 */
-#endif
             sc = sub( add( n2, Q_bwe_exc ), 14 );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 exc4kWhtnd[i] = round_fx_o( L_shl_o( L_mult_o( exc4k_frac[i], scale, &Overflow ), sc, &Overflow ), &Overflow ); /*  Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
-#else
-                exc4kWhtnd[i] = round_fx( L_shl( L_mult( exc4k_frac[i], scale ), sc ) ); /*  Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
-#endif
                 move16();
             }
         }
@@ -1899,13 +1874,7 @@ void GenShapedWBExcitation_fx(
                 {
                     /*tmp_vfac = 2*voice_factors[i];
                       tmp_vfac = min(1, tmp_vfac);*/
-#ifdef BASOP_NOGLOB
                     tmp_vfac = shl_o( voice_factors[i], 1, &Overflow );
-#else
-                    BASOP_SATURATE_WARNING_OFF_EVS
-                    tmp_vfac = shl( voice_factors[i], 1 );
-                    BASOP_SATURATE_WARNING_ON_EVS
-#endif
                 }
                 ELSE
                 {
@@ -1914,29 +1883,15 @@ void GenShapedWBExcitation_fx(
                 }
 
                 Ltemp1 = root_a_fx( L_deposit_h( tmp_vfac ), 31, &exp );
-#ifdef BASOP_NOGLOB
                 temp1 = round_fx_o( L_shl_o( Ltemp1, exp, &Overflow ), &Overflow ); /* Q15 */
-#else
-                temp1 = round_fx( L_shl( Ltemp1, exp ) );                                /* Q15 */
-#endif
-                L_tmp = Mpy_32_16_1( pow1, sub( 32767, tmp_vfac ) ); /* Q22*/
+                L_tmp = Mpy_32_16_1( pow1, sub( 32767, tmp_vfac ) );                /* Q22*/
                 Ltemp2 = root_a_over_b_fx( L_tmp, sub( 22, shl( n1, 1 ) ), pow22, sub( 22, shl( n2, 1 ) ), &exp );
-#ifdef BASOP_NOGLOB
                 temp2 = round_fx_o( L_shl_o( Ltemp2, exp, &Overflow ), &Overflow ); /* Q15 */
-#else
-                temp2 = round_fx( L_shl( Ltemp2, exp ) );                                /* Q15 */
-#endif
                 FOR( j = 0; j < L_FRAME16k / 16; j++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp = L_mult_o( temp1, exc4kWhtnd[k], &Overflow );                                                        /* Q(16+Q_bwe_exc) */
                     L_tmp = L_add_o( L_tmp, L_shl_o( L_mult_o( temp2, exc4k_frac[k], &Overflow ), sc, &Overflow ), &Overflow ); /* Q(16+Q_bwe_exc) */
                     exc4kWhtnd[k] = round_fx_o( L_tmp, &Overflow );                                                             /* Q_bwe_exc */
-#else
-                    L_tmp = L_mult( temp1, exc4kWhtnd[k] );                              /* Q(16+Q_bwe_exc) */
-                    L_tmp = L_add( L_tmp, L_shl( L_mult( temp2, exc4k_frac[k] ), sc ) ); /* Q(16+Q_bwe_exc) */
-                    exc4kWhtnd[k] = round_fx( L_tmp );                                   /* Q_bwe_exc */
-#endif
                     move16();
                     k = add( k, 1 );
                 }
@@ -1950,7 +1905,6 @@ void GenShapedWBExcitation_fx(
     return;
 }
 
-
 /*-------------------------------------------------------------------*
  * GenWBSynth()
  *
@@ -2148,22 +2102,7 @@ void GenShapedSHBExcitation_fx(
     Word16 n_mem2,         /* i :  n_mem2 scale factor to adjust 24.4/32kbps memories */
     Word16 prev_Q_bwe_syn, /* i :  st_fx->prev_Q_bwe_syn */
     const Word32 bitrate,
-    const Word16 prev_bfi
-#ifdef ADD_IVAS_TBE_CODE
-    ,                             /* i  : previous frame was concealed            */
-    const Word16 element_mode,    /* i  : element mode                            */
-    const Word16 flag_ACELP16k,   /* i  : ACELP@16kHz flag                        */
-    Word16 *nlExc16k,             /* i/o: NL exc for IC-BWE                       */
-    Word16 *mixExc16k,            /* i/o: exc spreading for IC-BWE                */
-    const Word32 extl_brate,      /* i  : extension layer bitarte                 */
-    const Word16 MSFlag,          /* i  : Multi Source flag                       */
-    Word16 EnvSHBres_4k[],        /* i/o: TD envelope of the SHB residual signal  */
-    Word16 *prev_pow_exc16kWhtnd, /* i/o: power of the LB excitation signal in the previous frame */
-    Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame     */
-    Word16 *Env_error,            /* o  : error in SHB residual envelope modelling*/
-    Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */
-#endif
-)
+    const Word16 prev_bfi )
 {
     Word16 i, j, k;
     Word16 wht_fil_mem[LPC_WHTN_ORDER];
@@ -2206,20 +2145,6 @@ void GenShapedSHBExcitation_fx(
     Word16 Q_temp;
     Word16 prev_Q_bwe_exc_fb;
 
-#ifdef ADD_IVAS_TBE_CODE
-    Word32 tempD;
-    Word16 alpha, step, mem_csfilt_left, mem_csfilt_right, excNoisyEnvLeft[L_FRAME16k], excNoisyEnvRight[L_FRAME16k];
-    Word16 cbsize;
-    Word16 mix_factor, old_fact, new_fact, fact, old_scale, new_scale, step_scale;
-    Word16 c0, c1, c2, c3, c4, c5, g1, g2, g, den;
-    Word16 EnvWhiteExc16k[L_FRAME16k], EnvExc16kWhtnd[L_FRAME16k];
-    Word16 EnvWhiteExc16k_4k[L_FRAME4k] = { 0 }, EnvExc16kWhtnd_4k[L_FRAME4k] = { 0 };
-    Word16 flag_plosive;
-    Word16 delta;
-    Word16 c0_part[NUM_SHB_SUBGAINS], c1_part[NUM_SHB_SUBGAINS], c2_part[NUM_SHB_SUBGAINS], c3_part[NUM_SHB_SUBGAINS], c4_part[NUM_SHB_SUBGAINS], c5_part[NUM_SHB_SUBGAINS];
-
-    mix_factor = 0.0f;
-#endif
     set16_fx( zero_mem, 0, LPC_SHB_ORDER );
     set16_fx( wht_fil_mem, 0, LPC_WHTN_ORDER );
 
@@ -2251,12 +2176,7 @@ void GenShapedSHBExcitation_fx(
 
     /* i: exc16k in Q_bwe_exc */
     /* o: exc16kWhtnd in Q_bwe_exc */
-
-#ifdef ADD_IVAS_TBE_CODE
-    IF( GE_32( extl_brate, SWB_TBE_2k8 ) )
-#else
     IF( GE_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         temp2 = 0;
         move16();
@@ -2277,11 +2197,7 @@ void GenShapedSHBExcitation_fx(
     /* Estimate pow1 associated with Low band nonlinear extended excitation */
     /* pow1=0.00001f */
     tmp = sub( shl( *Q_bwe_exc, 1 ), 31 );
-#ifdef BASOP_NOGLOB
     pow1 = L_shl_sat( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(Q_bwe_exc) */
-#else
-    pow1 = L_shl( 21475l /*0.00001f Q31*/, tmp );              /* 0.00001f in 2*(Q_bwe_exc) */
-#endif
     FOR( k = 0; k < L_FRAME16k; k++ )
     {
         /*excTmp2[k ] = (float)(fabs(exc16kWhtnd[k]));*/
@@ -2289,20 +2205,12 @@ void GenShapedSHBExcitation_fx(
         move16();
 
         /* pow1 += exc16kWhtnd[k] * exc16kWhtnd[k]; */
-#ifdef BASOP_NOGLOB
         pow1 = L_mac0_sat( pow1, exc16kWhtnd[k], exc16kWhtnd[k] ); /* 2*Q_bwe_exc */
-#else
-        pow1 = L_mac0( pow1, exc16kWhtnd[k], exc16kWhtnd[k] ); /* 2*Q_bwe_exc */
-#endif
     }
     Q_pow1 = shl( *Q_bwe_exc, 1 );
 
     test();
-#ifdef ADD_IVAS_TBE_CODE
-    IF( EQ_16( flag_ACELP16k, 0 ) )
-#else
     IF( ( LE_32( bitrate, ACELP_13k20 ) ) && ( GE_32( bitrate, ACELP_7k20 ) ) )
-#endif
     {
         /* varEnvShape = mean_fx(voice_factors, 4); */
         /* unroll the loop */
@@ -2348,11 +2256,7 @@ void GenShapedSHBExcitation_fx(
     test();
     test();
     test();
-#ifdef ADD_IVAS_TBE_CODE
-    IF( EQ_16( element_mode, EVS_MONO ) && *mem_csfilt == 0 && ( ( EQ_32( bitrate, ACELP_9k60 ) ) || ( EQ_32( bitrate, ACELP_16k40 ) ) || ( EQ_32( bitrate, ACELP_24k40 ) ) ) )
-#else
     IF( *mem_csfilt == 0 && ( ( EQ_32( bitrate, ACELP_9k60 ) ) || ( EQ_32( bitrate, ACELP_16k40 ) ) || ( EQ_32( bitrate, ACELP_24k40 ) ) ) )
-#endif
     {
         /* pre-init smoothing filter to avoid energy drop outs */
         L_tmp = L_mult( excTmp2[0], 1638 );
@@ -2379,42 +2283,6 @@ void GenShapedSHBExcitation_fx(
         *mem_csfilt = Mult_32_16( L_tmp, varEnvShape );
         move32();
     }
-#ifdef ADD_IVAS_TBE_CODE
-    if ( MSFlag > 0 )
-    {
-        varEnvShape = 0.995f;
-        csfilt_num2[0] = 1.0f - varEnvShape;
-        csfilt_den2[1] = -varEnvShape;
-    }
-
-    White_exc16k = exc16k;
-
-    /* Track the low band envelope */
-    if ( element_mode == IVAS_CPE_TD || element_mode == IVAS_CPE_DFT )
-    {
-        if ( extl_brate != SWB_TBE_1k10 && extl_brate != SWB_TBE_1k75 )
-        {
-            mem_csfilt_left = 0.0f;
-            mem_csfilt_right = 0.0f;
-            for ( k = 0; k < L_FRAME16k; k++ )
-            {
-                excNoisyEnvLeft[k] = mem_csfilt_left + csfilt_num2[0] * excTmp2[k];
-                mem_csfilt_left = -csfilt_den2[1] * excNoisyEnvLeft[k];
-                excNoisyEnvRight[L_FRAME16k - k - 1] = mem_csfilt_right + csfilt_num2[0] * excTmp2[L_FRAME16k - k - 1];
-                mem_csfilt_right = -csfilt_den2[1] * excNoisyEnvRight[L_FRAME16k - k - 1];
-            }
-
-            alpha = 0.0f;
-            step = 1.0f / L_FRAME16k;
-            for ( k = 0; k < L_FRAME16k; k++ )
-            {
-                excNoisyEnv[k] = alpha * excNoisyEnvLeft[k] + ( 1 - alpha ) * excNoisyEnvRight[k];
-                alpha += step;
-            }
-        }
-    }
-    else
-#endif
     {
         /* Track the low band envelope */
         L_tmp = *mem_csfilt;
@@ -2430,21 +2298,6 @@ void GenShapedSHBExcitation_fx(
         *mem_csfilt = L_tmp;
         move32();
     }
-#ifdef ADD_IVAS_TBE_CODE
-    if ( extl_brate == SWB_TBE_1k10 || extl_brate == SWB_TBE_1k75 )
-    {
-        /* generate gaussian (white) excitation */
-        for ( k = 0; k < L_FRAME16k; k++ )
-        {
-            White_exc16k[k] = (float) own_random( &bwe_seed[0] );
-        }
-
-        /* normalize the amplitude of the gaussian excitation to that of the LB exc. */
-        pow22 = POW_EXC16k_WHTND;
-        v_multc( White_exc16k, (float) sqrt( pow1 / pow22 ), White_exc16k, L_FRAME16k );
-    }
-    else
-#endif
     {
         /* create a random excitation - Reuse exc16k memory */
         White_exc16k = exc16k;
@@ -2455,11 +2308,7 @@ void GenShapedSHBExcitation_fx(
         tmp = add( *Q_bwe_exc, 1 );
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp4 = L_shl_sat( L_deposit_l( White_exc16k[k] ), tmp );
-#else
-            L_tmp4 = L_shl( L_deposit_l( White_exc16k[k] ), tmp );
-#endif
             if ( excNoisyEnv[k] != 0 )
             {
                 L_tmp4 = L_mult( excNoisyEnv[k], White_exc16k[k] ); /* (Q_bwe_exc)  +5 +1*/
@@ -2491,108 +2340,16 @@ void GenShapedSHBExcitation_fx(
             /* i: White_exc16k  in Q6               */
             /* o: White_exc16k in (Q_bwe_exc-NOISE_QADJ)  */
             /* pow22 += White_exc16k[k] * White_exc16k[k]; */
-#ifdef BASOP_NOGLOB
             pow22 = L_mac0_sat( pow22, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_bwe_exc-NOISE_QADJ)*/
-#else
-            pow22 = L_mac0( pow22, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_bwe_exc-NOISE_QADJ)*/
-#endif
         }
         /*Q_pow22 = sub( shl(*Q_bwe_exc,1), 18 );*/
         Q_pow22 = shl( sub( *Q_bwe_exc, NOISE_QADJ ), 1 );
     }
 
-#ifdef ADD_IVAS_TBE_CODE
-    flag_plosive = 0;
-    move16();
-    test();
-    test();
-    test();
-    IF(GE_32(extl_brate, SWB_TBE_2k8) || EQ_32(extl_brate, SWB_TBE_1k10) || EQ_32(extl_brate, SWB_TBE_1k75)))
-#else
     IF( GE_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         IF( EQ_16( *vf_ind, 20 ) ) /* encoder side */
         {
-#ifdef ADD_IVAS_TBE_CODE
-            if ( extl_brate == SWB_TBE_1k10 || extl_brate == SWB_TBE_1k75 )
-            {
-                /* calculate TD envelopes of exc16kWhtnd and White_exc16k */
-                find_td_envelope( White_exc16k, L_FRAME16k, 20, NULL, EnvWhiteExc16k );
-                find_td_envelope( exc16kWhtnd, L_FRAME16k, 20, NULL, EnvExc16kWhtnd );
-
-                for ( k = 0; k < L_FRAME4k; k++ )
-                {
-                    EnvWhiteExc16k_4k[k] = EnvWhiteExc16k[4 * k];
-                    EnvExc16kWhtnd_4k[k] = EnvExc16kWhtnd[4 * k];
-                }
-
-                /* calculate the optimal mix factor */
-                c0 = c1 = c2 = c3 = c4 = c5 = 0.0f;
-                for ( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-                {
-                    c0_part[i] = sum2_f( &EnvExc16kWhtnd_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
-                    c1_part[i] = -2.0f * dotp( &EnvSHBres_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], &EnvExc16kWhtnd_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
-                    c2_part[i] = sum2_f( &EnvWhiteExc16k_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
-                    c3_part[i] = -2.0f * dotp( &EnvSHBres_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], &EnvWhiteExc16k_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
-                    c4_part[i] = 2.0f * dotp( &EnvExc16kWhtnd_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], &EnvWhiteExc16k_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
-                    c5_part[i] = sum2_f( &EnvSHBres_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
-
-                    c0 += c0_part[i];
-                    c1 += c1_part[i];
-                    c2 += c2_part[i];
-                    c3 += c3_part[i];
-                    c4 += c4_part[i];
-                    c5 += c5_part[i];
-                }
-
-                den = 4.0f * c0 * c2 - c4 * c4;
-                g1 = ( c3 * c4 - 2 * c1 * c2 ) / den;
-                g2 = ( c1 * c4 - 2 * c0 * c3 ) / den;
-
-                *Env_error = 0.0f;
-                flag_plosive = 0;
-                for ( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-                {
-                    Env_error_part[i] = c5_part[i] + g1 * g1 * c0_part[i] + g1 * c1_part[i] + g2 * g2 * c2_part[i] + g2 * c3_part[i] + g1 * g2 * c4_part[i];
-                    *Env_error += Env_error_part[i];
-
-                    if ( Env_error_part[i] > THR_ENV_ERROR_PLOSIVE )
-                    {
-                        /* envelope error is too high -> likely a plosive */
-                        flag_plosive = 1;
-                    }
-                }
-
-                if ( flag_plosive )
-                {
-                    /* plosive detected -> set the mixing factor to 0 */
-                    *vf_ind = 0;
-                    mix_factor = 0.0f;
-                }
-                else
-                {
-                    /* normalize gain */
-                    g = g2 / ( g1 + g2 );
-
-                    /* quantization of the mixing factor */
-                    cbsize = 1 << NUM_BITS_SHB_VF;
-                    delta = 1.0f / ( cbsize - 1 );
-                    if ( g > 1.0f )
-                    {
-                        g = 1.0f;
-                    }
-                    else if ( g < delta )
-                    {
-                        /* prevent low gains to be quantized to 0 as this is reserved for plosives */
-                        g = delta;
-                    }
-
-                    *vf_ind = usquant( g, &mix_factor, 0.0f, 1.0f / ( cbsize - 1 ), cbsize );
-                }
-            }
-            else
-#endif
             {
                 Estimate_mix_factors_fx( shb_res, Q_shb, exc16kWhtnd, *Q_bwe_exc, White_exc16k,
                                          ( *Q_bwe_exc - NOISE_QADJ ), pow1, Q_pow1, pow22, Q_pow22, voiceFacEst, vf_ind );
@@ -2608,354 +2365,263 @@ void GenShapedSHBExcitation_fx(
             }
         }
         ELSE /* decoder side */
-        {
-#ifdef ADD_IVAS_TBE_CODE
-            if ( extl_brate == SWB_TBE_1k10 || extl_brate == SWB_TBE_1k75 )
-            {
-                if ( *vf_ind == 0 )
-                {
-                    mix_factor = 0.0f;
-                    flag_plosive = 1;
-                }
-                else
-                {
-                    mix_factor = usdequant( *vf_ind, 0.0f, 1.0f / ( ( 1 << NUM_BITS_SHB_VF ) - 1 ) );
-                }
-            }
-            else
-#endif
             {
-                /* *vf_ind is an integer scale by 0.125f*/
-                tmp = shl( *vf_ind, ( 15 - 3 ) );
-                tmp2 = MAX_16;
-                move16();
-                if ( LE_16( tmp, 22938 /*0.7f Q15*/ ) )
-                {
-                    tmp2 = 26214 /*0.8f Q15*/;
-                    move16();
-                }
-            }
-        }
-#ifdef ADD_IVAS_TBE_CODE
-        IF( NE_32( extl_brate, SWB_TBE_1k10 ) && NE_32( extl_brate, SWB_TBE_1k75 ) )
-#endif
+                { /* *vf_ind is an integer scale by 0.125f*/
+                  tmp = shl( *vf_ind, ( 15 - 3 ) );
+        tmp2 = MAX_16;
+        move16();
+        if ( LE_16( tmp, 22938 /*0.7f Q15*/ ) )
         {
-            voice_factors[0] = mult_r( voice_factors[0], tmp2 );
-            move16();
-            voice_factors[1] = mult_r( voice_factors[1], tmp2 );
-            move16();
-            voice_factors[2] = mult_r( voice_factors[2], tmp2 );
-            move16();
-            voice_factors[3] = mult_r( voice_factors[3], tmp2 );
-            move16();
-            voice_factors[4] = mult_r( voice_factors[4], tmp2 );
+            tmp2 = 26214 /*0.8f Q15*/;
             move16();
         }
     }
-#ifdef ADD_IVAS_TBE_CODE
-    if ( element_mode >= IVAS_CPE_DFT && nlExc16k != NULL )
-    {
-        /* save buffers for IC-BWE */
-        mvr2r( exc16kWhtnd, nlExc16k, L_FRAME16k );
-        v_multc( White_exc16k, (float) sqrt( pow1 / pow22 ), mixExc16k, L_FRAME16k );
-    }
-#endif
-
-    tmp = sub( Q_temp, 3 );
-    FOR( k = 0; k < L_FRAME16k; k++ )
-    {
-        White_exc16k_FB[k] = round_fx( L_shl( White_exc16k_32[k], tmp ) ); /* Q_bwe_exc +5 +1 +Q_temp -16 -3 */
-    }
-    prev_Q_bwe_exc_fb = *Q_bwe_exc_fb;
+}
+{
+    voice_factors[0] = mult_r( voice_factors[0], tmp2 );
     move16();
-    *Q_bwe_exc_fb = sub( add( *Q_bwe_exc, Q_temp ), 13 );
+    voice_factors[1] = mult_r( voice_factors[1], tmp2 );
     move16();
-    deemph_fx( White_exc16k, PREEMPH_FAC, L_FRAME16k, tbe_demph );
-    /* i/o: White_exc16k (Q_bwe_exc-NOISE_QADJ) */
-    /* i: tbe_demph (Q_bwe_exc-NOISE_QADJ) */
-#ifdef ADD_IVAS_TBE_CODE
-    if ( extl_brate == SWB_TBE_1k10 || extl_brate == SWB_TBE_1k75 )
+    voice_factors[2] = mult_r( voice_factors[2], tmp2 );
+    move16();
+    voice_factors[3] = mult_r( voice_factors[3], tmp2 );
+    move16();
+    voice_factors[4] = mult_r( voice_factors[4], tmp2 );
+    move16();
+}
+}
+
+tmp = sub( Q_temp, 3 );
+FOR( k = 0; k < L_FRAME16k; k++ )
+{
+    White_exc16k_FB[k] = round_fx( L_shl( White_exc16k_32[k], tmp ) ); /* Q_bwe_exc +5 +1 +Q_temp -16 -3 */
+}
+prev_Q_bwe_exc_fb = *Q_bwe_exc_fb;
+move16();
+*Q_bwe_exc_fb = sub( add( *Q_bwe_exc, Q_temp ), 13 );
+move16();
+deemph_fx( White_exc16k, PREEMPH_FAC, L_FRAME16k, tbe_demph );
+/* i/o: White_exc16k (Q_bwe_exc-NOISE_QADJ) */
+/* i: tbe_demph (Q_bwe_exc-NOISE_QADJ) */
+{
+    IF( EQ_16( coder_type, UNVOICED ) )
     {
-        if ( !flag_plosive ) /* use only LB excitation in case of plosives */
+        L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
+        scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
+        FOR( k = 0; k < L_FRAME16k; k++ )
         {
-            /* re-scale gaussian excitation at the beginning to gradually move from old energy to new energy */
-            old_scale = (float) sqrt( *prev_pow_exc16kWhtnd / pow1 );
-            new_scale = 1.0f;
-            step_scale = ( new_scale - old_scale ) / ( L_FRAME16k / 2 );
-            scale = old_scale;
-
-            /* interpolate between the old and the new value of the mixing factor */
-            old_fact = *prev_mix_factor;
-            new_fact = mix_factor;
-            step = ( new_fact - old_fact ) / ( L_FRAME16k / 2 );
-            fact = old_fact;
-
-            /* mixing of LB and gaussian excitation in the first half of the frame */
-            for ( k = 0; k < L_FRAME16k / 2; k++ )
-            {
-                exc16kWhtnd[k] = (float) fact * ( White_exc16k[k] * scale ) + (float) ( 1 - fact ) * exc16kWhtnd[k];
-                fact += step;
-                scale += step_scale;
-            }
-
-            /* mixing of LB and gaussian excitation in the second half of the frame */
-            for ( ; k < L_FRAME16k; k++ )
-            {
-                exc16kWhtnd[k] = (float) new_fact * White_exc16k[k] + (float) ( 1 - new_fact ) * exc16kWhtnd[k];
-            }
+            /* White_exc16k: (Q_bwe_exc-NOISE_QADJ), scale: Q15 */
+            L_tmp = L_mult( White_exc16k[k], scale );
+            /* L_tmp: (Q_bwe_exc-NOISE_QADJ) + 15 + 1 */
+            exc16kWhtnd[k] = round_fx( L_shl( L_tmp, NOISE_QADJ ) );
+            move16();
+            /* exc16kWhtnd:  Q_bwe_exc */
         }
-        preemph( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
+        PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
+        /* i/o: exc16kWhtnd  (Q_bwe_exc) */
+        /* i/o: tbe_premph (Q_bwe_exc) */
     }
-    else
-#endif
+    ELSE
     {
-#ifdef ADD_IVAS_TBE_CODE
-        if ( coder_type == UNVOICED || MSFlag == 1 )
-#else
-        IF( EQ_16( coder_type, UNVOICED ) )
-#endif
+        Word16 nbSubFr, lSubFr;
+        Word16 tempQ15;
+        Word32 tempQ31;
+        /*nbSubFr = ( bitrate < ACELP_24k40 )? NB_SUBFR : NB_SUBFR16k;*/
+        nbSubFr = NB_SUBFR16k;
+        lSubFr = ( L_FRAME16k / NB_SUBFR16k );
+        IF( LT_32( bitrate, ACELP_24k40 ) )
         {
-            L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
-            scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
-#else
-            scale = round_fx( L_shl( L_tmp, exp ) );         /*Q15 */
-#endif
-            FOR( k = 0; k < L_FRAME16k; k++ )
-            {
-                /* White_exc16k: (Q_bwe_exc-NOISE_QADJ), scale: Q15 */
-                L_tmp = L_mult( White_exc16k[k], scale );
-                /* L_tmp: (Q_bwe_exc-NOISE_QADJ) + 15 + 1 */
-                exc16kWhtnd[k] = round_fx( L_shl( L_tmp, NOISE_QADJ ) );
-                move16();
-                /* exc16kWhtnd:  Q_bwe_exc */
-            }
-            PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
-            /* i/o: exc16kWhtnd  (Q_bwe_exc) */
-            /* i/o: tbe_premph (Q_bwe_exc) */
+            nbSubFr = NB_SUBFR;
+            move16();
+            lSubFr = ( L_FRAME16k / NB_SUBFR );
+            move16();
         }
-        ELSE
+        k = 0;
+        FOR( i = 0; i < nbSubFr; i++ )
         {
-            Word16 nbSubFr, lSubFr;
-            Word16 tempQ15;
-            Word32 tempQ31;
-            /*nbSubFr = ( bitrate < ACELP_24k40 )? NB_SUBFR : NB_SUBFR16k;*/
-            nbSubFr = NB_SUBFR16k;
-            lSubFr = ( L_FRAME16k / NB_SUBFR16k );
-            IF( LT_32( bitrate, ACELP_24k40 ) )
+            test();
+            IF( EQ_16( coder_type, VOICED ) && ( LT_32( bitrate, ACELP_24k40 ) ) )
             {
-                nbSubFr = NB_SUBFR;
+                exp = 0;
                 move16();
-                lSubFr = ( L_FRAME16k / NB_SUBFR );
+                tempQ15 = Sqrt16( voice_factors[i], &exp ); /* Q15 */
+                temp = shl( tempQ15, exp );                 /* Q15 exc16kWhtnd scale factor */
+                exp = 0;
                 move16();
+                tempQ15 = Sqrt16( temp, &exp ); /* Q15 */
+                temp1 = shl( tempQ15, exp );    /* Q15 exc16kWhtnd scale factor */
+
+                /*temp2 = root_a_over_b_fx( pow1 * (1.0f - temp), pow22 ); */
+                temp = sub( MAX_16, temp );
+                tempQ31 = Mult_32_16( pow1, temp );
+                L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
+                temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
             }
-            k = 0;
-            FOR( i = 0; i < nbSubFr; i++ )
+            ELSE
             {
-                test();
-                IF( EQ_16( coder_type, VOICED ) && ( LT_32( bitrate, ACELP_24k40 ) ) )
-                {
-                    exp = 0;
-                    move16();
-                    tempQ15 = Sqrt16( voice_factors[i], &exp ); /* Q15 */
-                    temp = shl( tempQ15, exp );                 /* Q15 exc16kWhtnd scale factor */
-                    exp = 0;
-                    move16();
-                    tempQ15 = Sqrt16( temp, &exp ); /* Q15 */
-                    temp1 = shl( tempQ15, exp );    /* Q15 exc16kWhtnd scale factor */
-
-                    /*temp2 = root_a_over_b_fx( pow1 * (1.0f - temp), pow22 ); */
-                    temp = sub( MAX_16, temp );
-                    tempQ31 = Mult_32_16( pow1, temp );
-                    L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
-                    temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#else
-                    temp2 = round_fx( L_shl( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#endif
-                }
-                ELSE
-                {
-                    /* Adjust noise mixing for formant sharpening filter */
-                    tempQ15 = mult_r( SWB_NOISE_MIX_FAC_FX, formant_fac );
-                    /* vf_tmp = voice_factors[i] * (1.0f - vf_tmp); */
-                    vf_tmp = sub( MAX_16, tempQ15 );
-                    vf_tmp = mult_r( voice_factors[i], vf_tmp );
-
-                    exp = 0;
-                    move16();
-                    tempQ15 = Sqrt16( vf_tmp, &exp ); /* Q15 */
-                    temp1 = shl( tempQ15, exp );      /* Q15 exc16kWhtnd scale factor */
-
-                    /*temp2 = root_a_over_b(pow1 * (1.0f - vf_tmp), pow22); */
-                    temp = sub( MAX_16, vf_tmp );
-                    tempQ31 = Mult_32_16( pow1, temp );
-                    L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
-                    temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#else
-                    temp2 = round_fx( L_shl( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#endif
-                }
+                /* Adjust noise mixing for formant sharpening filter */
+                tempQ15 = mult_r( SWB_NOISE_MIX_FAC_FX, formant_fac );
+                /* vf_tmp = voice_factors[i] * (1.0f - vf_tmp); */
+                vf_tmp = sub( MAX_16, tempQ15 );
+                vf_tmp = mult_r( voice_factors[i], vf_tmp );
 
-                FOR( j = 0; j < lSubFr; j++ )
-                {
-                    /*exc16kWhtnd[k+j] = temp1 * exc16kWhtnd[k+j] + temp2 * White_exc16k[k+j]; */
-                    L_tmp = L_mult( temp2, White_exc16k[k + j] ); /* 16+(Q_bwe_exc-NOISE_QADJ)*/
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_shl_sat( L_tmp, NOISE_QADJ ); /* 16+(Q_bwe_exc) */
-                    exc16kWhtnd[k + j] = mac_r_sat( L_tmp, temp1, exc16kWhtnd[k + j] );
-#else
-                    L_tmp = L_shl( L_tmp, NOISE_QADJ );      /* 16+(Q_bwe_exc) */
-                    exc16kWhtnd[k + j] = mac_r( L_tmp, temp1, exc16kWhtnd[k + j] );
-#endif
-                    move16();
-                    /* Q_bwe_exc */
-                }
-                k = add( k, lSubFr );
-
-                /* estimate the pre-emph factor */
-                tempQ15 = sub( MAX_16, voice_factors[i] );
                 exp = 0;
                 move16();
-                temp = Sqrt16( tempQ15, &exp );
-                temp = shl( temp, exp - 1 );
-
-                temp2 = add( temp, shl( temp1, -1 ) ); /* shift right by 1 to avoid overflow */
-                temp = div_s( temp, temp2 );           /* Q15 */
-                temp = mult_r( PREEMPH_FAC, temp );
+                tempQ15 = Sqrt16( vf_tmp, &exp ); /* Q15 */
+                temp1 = shl( tempQ15, exp );      /* Q15 exc16kWhtnd scale factor */
+
+                /*temp2 = root_a_over_b(pow1 * (1.0f - vf_tmp), pow22); */
+                temp = sub( MAX_16, vf_tmp );
+                tempQ31 = Mult_32_16( pow1, temp );
+                L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
+                temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
+            }
 
-                PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );
-                /* exc16kWhtnd: Q_bwe_exc;
-                   tbe_premph: Q_bwe_exc*/
+            FOR( j = 0; j < lSubFr; j++ )
+            {
+                /*exc16kWhtnd[k+j] = temp1 * exc16kWhtnd[k+j] + temp2 * White_exc16k[k+j]; */
+                L_tmp = L_mult( temp2, White_exc16k[k + j] ); /* 16+(Q_bwe_exc-NOISE_QADJ)*/
+                L_tmp = L_shl_sat( L_tmp, NOISE_QADJ );       /* 16+(Q_bwe_exc) */
+                exc16kWhtnd[k + j] = mac_r_sat( L_tmp, temp1, exc16kWhtnd[k + j] );
+                move16();
+                /* Q_bwe_exc */
             }
-        }
-    }
+            k = add( k, lSubFr );
 
-#ifdef ADD_IVAS_TBE_CODE
-    IF( LT_32( extl_brate, SWB_TBE_2k8 ) )
-#else
-    IF( LT_32( bitrate, ACELP_24k40 ) )
-#endif
-    {
-        Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER, exc16kWhtnd, excSHB, L_FRAME16k, state_lpc_syn, 1 );
-        /* i: exc16kWhtnd in Q_bwe_exc */
-        /* o: excSHB in Q_bwe_exc */
+            /* estimate the pre-emph factor */
+            tempQ15 = sub( MAX_16, voice_factors[i] );
+            exp = 0;
+            move16();
+            temp = Sqrt16( tempQ15, &exp );
+            temp = shl( temp, exp - 1 );
+
+            temp2 = add( temp, shl( temp1, -1 ) ); /* shift right by 1 to avoid overflow */
+            temp = div_s( temp, temp2 );           /* Q15 */
+            temp = mult_r( PREEMPH_FAC, temp );
+
+            PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );
+            /* exc16kWhtnd: Q_bwe_exc;
+               tbe_premph: Q_bwe_exc*/
+        }
     }
-    ELSE
-    {
-        set16_fx( zero_mem, 0, LPC_SHB_ORDER );
+}
 
-        Syn_filt_s( 0, lpc_shb_sf, LPC_SHB_ORDER, exc16kWhtnd, tempSHB, 80, zero_mem, 1 );
-        syn_shb_ener_sf[0] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
-        move32();
+IF( LT_32( bitrate, ACELP_24k40 ) )
+{
+    Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER, exc16kWhtnd, excSHB, L_FRAME16k, state_lpc_syn, 1 );
+    /* i: exc16kWhtnd in Q_bwe_exc */
+    /* o: excSHB in Q_bwe_exc */
+}
+ELSE
+{
+    set16_fx( zero_mem, 0, LPC_SHB_ORDER );
 
-        Syn_filt_s( 0, lpc_shb_sf + ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 80, tempSHB, 80, zero_mem, 1 );
-        syn_shb_ener_sf[1] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
-        move32();
+    Syn_filt_s( 0, lpc_shb_sf, LPC_SHB_ORDER, exc16kWhtnd, tempSHB, 80, zero_mem, 1 );
+    syn_shb_ener_sf[0] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
+    move32();
 
-        Syn_filt_s( 0, lpc_shb_sf + 2 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 160, tempSHB, 80, zero_mem, 1 );
-        syn_shb_ener_sf[2] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
-        move32();
+    Syn_filt_s( 0, lpc_shb_sf + ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 80, tempSHB, 80, zero_mem, 1 );
+    syn_shb_ener_sf[1] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
+    move32();
 
-        Syn_filt_s( 0, lpc_shb_sf + 3 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 240, tempSHB, 80, zero_mem, 1 );
-        syn_shb_ener_sf[3] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
-        move32();
+    Syn_filt_s( 0, lpc_shb_sf + 2 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 160, tempSHB, 80, zero_mem, 1 );
+    syn_shb_ener_sf[2] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
+    move32();
 
-        /* i: exc16kWhtnd       in Q_bwe_exc        */
-        /* o: tempSHB           in Q_bwe_exc        */
-        /* o: syn_shb_ener_sf   in (2*Q_bwe_exc+1)  */
-        IF( LE_32( bitrate, ACELP_32k ) )
-        {
-            L_tmp = sum32_fx( syn_shb_ener_sf, 4 );
+    Syn_filt_s( 0, lpc_shb_sf + 3 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 240, tempSHB, 80, zero_mem, 1 );
+    syn_shb_ener_sf[3] = L_shr( sum2_fx( tempSHB, 80 ), 3 );
+    move32();
 
-            /* find root_a(tempSHB[0]) = root_a_over_b(shb_ener_sf[0]), L_tmp) */
-            tmp = shl( Q_shb, 1 );
-            tmp2 = add( shl( *Q_bwe_exc, 1 ), 1 );
-            L_tmp2 = root_a_over_b_fx( shb_ener_sf_32, tmp, L_tmp, tmp2, &exp ); /* L_tmp2 in (Q31-exp) */
+    /* i: exc16kWhtnd       in Q_bwe_exc        */
+    /* o: tempSHB           in Q_bwe_exc        */
+    /* o: syn_shb_ener_sf   in (2*Q_bwe_exc+1)  */
+    IF( LE_32( bitrate, ACELP_32k ) )
+    {
+        L_tmp = sum32_fx( syn_shb_ener_sf, 4 );
 
-            *Q_bwe_exc = sub( *Q_bwe_exc, exp );
-            move16(); /* compensate for the exp shift */
-            tmp2 = add( prev_Q_bwe_syn, n_mem2 );
-            IF( GT_16( *Q_bwe_exc, tmp2 ) )
-            {
-                L_tmp2 = L_shl( L_tmp2, sub( tmp2, *Q_bwe_exc ) );
-                *Q_bwe_exc = tmp2;
-                move16();
-            }
-            FOR( i = 0; i < L_FRAME16k; i++ )
-            {
-                L_tmp3 = Mult_32_16( L_tmp2, exc16kWhtnd[i] ); /* *Q_bwe_exc + (31-exp) - 15 */
-                exc16kWhtnd[i] = round_fx( L_tmp3 );           /* *Q_bwe_exc - exp */
-                move16();
-            }
-        }
-        /* i: L_tmp2 in (Q31-exp)                       */
-        /* i: exc16kWhtnd in Q_bwe_exc            */
-        /* o: exc16kWhtnd in Q_bwe_exc: (Q_bwe_exc-exp)   */
+        /* find root_a(tempSHB[0]) = root_a_over_b(shb_ener_sf[0]), L_tmp) */
+        tmp = shl( Q_shb, 1 );
+        tmp2 = add( shl( *Q_bwe_exc, 1 ), 1 );
+        L_tmp2 = root_a_over_b_fx( shb_ener_sf_32, tmp, L_tmp, tmp2, &exp ); /* L_tmp2 in (Q31-exp) */
 
-        /* Rescale the past memories: LP synth and SHB look ahead buffers */
-        tmp = sub( *Q_bwe_exc, prev_Q_bwe_syn );
-        FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+        *Q_bwe_exc = sub( *Q_bwe_exc, exp );
+        move16(); /* compensate for the exp shift */
+        tmp2 = add( prev_Q_bwe_syn, n_mem2 );
+        IF( GT_16( *Q_bwe_exc, tmp2 ) )
         {
-            state_lpc_syn[i] = shl( state_lpc_syn[i], tmp );
+            L_tmp2 = L_shl( L_tmp2, sub( tmp2, *Q_bwe_exc ) );
+            *Q_bwe_exc = tmp2;
             move16();
         }
-        FOR( i = -L_SHB_LAHEAD; i < 0; i++ )
+        FOR( i = 0; i < L_FRAME16k; i++ )
         {
-            excSHB[i] = shl( excSHB[i], tmp );
+            L_tmp3 = Mult_32_16( L_tmp2, exc16kWhtnd[i] ); /* *Q_bwe_exc + (31-exp) - 15 */
+            exc16kWhtnd[i] = round_fx( L_tmp3 );           /* *Q_bwe_exc - exp */
             move16();
         }
-        /* Do mem_stp_swb_fx scaling before PostShortTerm_fx */
-
-        Syn_filt_s( 0, lpc_shb_sf, LPC_SHB_ORDER, exc16kWhtnd, excSHB, 80, state_lpc_syn, 1 );
-        Syn_filt_s( 0, lpc_shb_sf + ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 80, excSHB + 80, 80, state_lpc_syn, 1 );
-        Syn_filt_s( 0, lpc_shb_sf + 2 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 160, excSHB + 160, 80, state_lpc_syn, 1 );
-        Syn_filt_s( 0, lpc_shb_sf + 3 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 240, excSHB + 240, 80, state_lpc_syn, 1 );
-        /* i: exc16kWhtnd in (Q_bwe_exc) */
-        /* o: excSHB in (Q_bwe_exc) */
     }
+    /* i: L_tmp2 in (Q31-exp)                       */
+    /* i: exc16kWhtnd in Q_bwe_exc            */
+    /* o: exc16kWhtnd in Q_bwe_exc: (Q_bwe_exc-exp)   */
 
-    IF( EQ_16( extl, FB_TBE ) )
+    /* Rescale the past memories: LP synth and SHB look ahead buffers */
+    tmp = sub( *Q_bwe_exc, prev_Q_bwe_syn );
+    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
     {
-        tmp = sub( add( *Q_bwe_exc_fb, 20 ), prev_Q_bwe_exc_fb );
-        Scale_sig( fb_state_lpc_syn, LPC_SHB_ORDER, tmp );
-        Scale_sig( fb_tbe_demph, 1, tmp );
-        Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER, White_exc16k_FB, White_exc16k_FB_temp, L_FRAME16k, fb_state_lpc_syn, 1 );
-        /* i: White_exc16k_FB       in (14-n2) */
-        /* o: White_exc16k_FB_temp  in (14-n2) */
+        state_lpc_syn[i] = shl( state_lpc_syn[i], tmp );
+        move16();
+    }
+    FOR( i = -L_SHB_LAHEAD; i < 0; i++ )
+    {
+        excSHB[i] = shl( excSHB[i], tmp );
+        move16();
+    }
+    /* Do mem_stp_swb_fx scaling before PostShortTerm_fx */
 
-        FOR( i = 0; i < 10; i++ )
-        {
-            FOR( j = 0; j < 32; ++j )
-            {
-                White_exc16k_FB_temp[i * 32 + j] = mult_r( White_exc16k_FB_temp[i * 32 + j], cos_fb_exc_fx[j] );
-                move16();
-            }
-        }
+    Syn_filt_s( 0, lpc_shb_sf, LPC_SHB_ORDER, exc16kWhtnd, excSHB, 80, state_lpc_syn, 1 );
+    Syn_filt_s( 0, lpc_shb_sf + ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 80, excSHB + 80, 80, state_lpc_syn, 1 );
+    Syn_filt_s( 0, lpc_shb_sf + 2 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 160, excSHB + 160, 80, state_lpc_syn, 1 );
+    Syn_filt_s( 0, lpc_shb_sf + 3 * ( LPC_SHB_ORDER + 1 ), LPC_SHB_ORDER, exc16kWhtnd + 240, excSHB + 240, 80, state_lpc_syn, 1 );
+    /* i: exc16kWhtnd in (Q_bwe_exc) */
+    /* o: excSHB in (Q_bwe_exc) */
+}
 
-        *Q_bwe_exc_fb = add( *Q_bwe_exc_fb, 20 );
-        move16(); /**Q_bwe_exc_fb  +35 +1 -16*/
-        flip_spectrum_fx( White_exc16k_FB_temp, White_exc16k_FB, L_FRAME16k );
+IF( EQ_16( extl, FB_TBE ) )
+{
+    tmp = sub( add( *Q_bwe_exc_fb, 20 ), prev_Q_bwe_exc_fb );
+    Scale_sig( fb_state_lpc_syn, LPC_SHB_ORDER, tmp );
+    Scale_sig( fb_tbe_demph, 1, tmp );
+    Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER, White_exc16k_FB, White_exc16k_FB_temp, L_FRAME16k, fb_state_lpc_syn, 1 );
+    /* i: White_exc16k_FB       in (14-n2) */
+    /* o: White_exc16k_FB_temp  in (14-n2) */
 
-        deemph_fx( White_exc16k_FB, fb_deemph_fac, L_FRAME16k, fb_tbe_demph );
-    }
-    ELSE
+    FOR( i = 0; i < 10; i++ )
     {
-        set16_fx( White_exc16k_FB, 0, L_FRAME16k );
+        FOR( j = 0; j < 32; ++j )
+        {
+            White_exc16k_FB_temp[i * 32 + j] = mult_r( White_exc16k_FB_temp[i * 32 + j], cos_fb_exc_fx[j] );
+            move16();
+        }
     }
 
-#ifdef ADD_IVAS_TBE_CODE
-    *prev_pow_exc16kWhtnd = pow1;
-    *prev_mix_factor = mix_factor;
-#endif
-    return;
+    *Q_bwe_exc_fb = add( *Q_bwe_exc_fb, 20 );
+    move16(); /**Q_bwe_exc_fb  +35 +1 -16*/
+    flip_spectrum_fx( White_exc16k_FB_temp, White_exc16k_FB, L_FRAME16k );
+
+    deemph_fx( White_exc16k_FB, fb_deemph_fac, L_FRAME16k, fb_tbe_demph );
+}
+ELSE
+{
+    set16_fx( White_exc16k_FB, 0, L_FRAME16k );
+}
+
+return;
 }
 
 void GenShapedSHBExcitation_ivas_enc_fx(
     Word16 *excSHB,                      /* o : synthesized shaped shb excitation Q_bwe_exc*/
     const Word16 *lpc_shb,               /* i : lpc coefficients Q12*/
-    Word16 *White_exc16k_FB,             /* o : white excitation for the Fullband extension Q_bwe_exc */
+    Word16 *White_exc16k_FB,             /* o : white excitation for the Fullband extension Q_bwe_exc_fb */
     Word32 *mem_csfilt,                  /* i/o: memory */
     Word16 *mem_genSHBexc_filt_down_shb, /* i/o: memory */
     Word16 *state_lpc_syn,               /* i/o: memory */
@@ -2977,21 +2643,24 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     Word16 *Q_bwe_exc,
     Word16 *Q_bwe_exc_fb,
     const Word16 Q_shb,
-    Word16 n_mem2,                /* i :  n_mem2 scale factor to adjust 24.4/32kbps memories         */
-    Word16 prev_Q_bwe_syn,        /* i :  st_fx->prev_Q_bwe_syn                                      */
-    const Word32 bitrate,         /* i  : bitrate                                                    */
-    const Word16 prev_bfi,        /* i  : previous frame was concealed                               */
-    const Word16 element_mode,    /* i  : element mode                                               */
-    const Word16 flag_ACELP16k,   /* i  : ACELP@16kHz flag                                           */
-    Word16 *nlExc16k,             /* i/o: NL exc for IC-BWE                                          */
-    Word16 *mixExc16k,            /* i/o: exc spreading for IC-BWE                                   */
-    const Word32 extl_brate,      /* i  : extension layer bitarte                                    */
-    const Word16 MSFlag,          /* i  : Multi Source flag                                          */
-    Word16 EnvSHBres_4k[],        /* i/o: TD envelope of the SHB residual signal                     */
-    Word32 *prev_pow_exc16kWhtnd, /* i/o: power of the LB excitation signal in the previous frame    */
-    Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame                        */
-    Word16 *Env_error,            /* o  : error in SHB residual envelope modelling                Q0 */
-    Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling    Q0 */
+    Word16 n_mem2,         /* i :  n_mem2 scale factor to adjust 24.4/32kbps memories */
+    Word16 prev_Q_bwe_syn, /* i :  st_fx->prev_Q_bwe_syn */
+    const Word32 bitrate,
+    const Word16 prev_bfi,
+    const Word16 element_mode,  /* i  : element mode                            */
+    const Word16 flag_ACELP16k, /* i  : ACELP@16kHz flag                        */
+    Word16 *nlExc16k,           /* i/o: NL exc for IC-BWE                       */
+    Word16 *nlExc16k_e,         /* i/o: exp of nlExc16k                         */
+    Word16 *mixExc16k,          /* i/o: exc spreading for IC-BWE                */
+    Word16 *mixExc16k_e,        /* i/o: exp of mixExc16k_fx                     */
+    const Word32 extl_brate,    /* i  : extension layer bitarte                 */
+    const Word16 MSFlag,        /* i  : Multi Source flag                       */
+    Word16 EnvSHBres_4k[],      /* i/o: TD envelope of the SHB residual signal  */
+    Word16 Q_EnvSHBres_4k,
+    Word32 *prev_pow_exc16kWhtnd, /* i/o: power of the LB excitation signal in the previous frame */
+    Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame     */
+    Word16 *Env_error,            /* o  : error in SHB residual envelope modelling*/
+    Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */
 )
 {
     Word16 i, j, k;
@@ -3007,6 +2676,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(
 
     Word16 excTmp2[L_FRAME16k];
     Word16 *White_exc16k;
+    Word16 Q_White_exc16k;
     Word16 excNoisyEnv[L_FRAME16k];
     Word16 csfilt_num2[1] = { 6554 }; /*0.2 in Q15 */
     move16();
@@ -3034,15 +2704,8 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     Word16 White_exc16k_FB_temp[L_FRAME16k];
     Word32 White_exc16k_32[L_FRAME16k];
     Word16 White_exc16k_tmp[L_FRAME16k];
-    Word16 Q_temp;
     Word16 prev_Q_bwe_exc_fb;
-    Word16 chk1, chk2;
-    chk1 = 0;
-    chk2 = 0;
-    move16();
-    move16();
 
-#if 1 // def ADD_IVAS_TBE_CODE
     Word16 alpha, step, mem_csfilt_left, mem_csfilt_right, excNoisyEnvLeft[L_FRAME16k], excNoisyEnvRight[L_FRAME16k];
     Word16 cbsize;
     Word16 mix_factor, old_fact, new_fact, fact, old_scale, new_scale, step_scale;
@@ -3057,7 +2720,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(
 
     mix_factor = 0; /* Q15 */
     move16();
-#endif
+
     set16_fx( zero_mem, 0, LPC_SHB_ORDER );
     set16_fx( wht_fil_mem, 0, LPC_WHTN_ORDER );
     FOR( i = 0; i < L_FRAME32k; i = i + 2 )
@@ -3089,11 +2752,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     /* i: exc16k in Q_bwe_exc */
     /* o: exc16kWhtnd in Q_bwe_exc */
 
-#if 1 // def ADD_IVAS_TBE_CODE
     IF( GE_32( extl_brate, SWB_TBE_2k8 ) )
-#else
-    IF( GE_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         temp2 = 0;
         move16();
@@ -3114,33 +2773,21 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     /* Estimate pow1 associated with Low band nonlinear extended excitation */
     /* pow1=0.00001f */
     tmp = sub( shl( *Q_bwe_exc, 1 ), 31 );
-#ifdef BASOP_NOGLOB
-    pow1 = L_shl_sat( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(Q_bwe_exc) */
-#else
-    pow1 = L_shl( 21475l /*0.00001f Q31*/, tmp );              /* 0.00001f in 2*(Q_bwe_exc) */
-#endif
+    W_tmp = W_shl( 21475 /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(Q_bwe_exc) */
     FOR( k = 0; k < L_FRAME16k; k++ )
     {
         /*excTmp2[k ] = (float)(fabs(exc16kWhtnd[k]));*/
         excTmp2[k] = abs_s( exc16kWhtnd[k] );
         move16();
-        chk1 = s_or( chk1, exc16kWhtnd[k] );
 
         /* pow1 += exc16kWhtnd[k] * exc16kWhtnd[k]; */
-#ifdef BASOP_NOGLOB
-        pow1 = L_mac0_sat( pow1, exc16kWhtnd[k], exc16kWhtnd[k] ); /* 2*Q_bwe_exc */
-#else
-        pow1 = L_mac0( pow1, exc16kWhtnd[k], exc16kWhtnd[k] ); /* 2*Q_bwe_exc */
-#endif
+        W_tmp = W_mac_16_16( W_tmp, exc16kWhtnd[k], exc16kWhtnd[k] ); // 2*Q_bwe_exc+1
     }
-    Q_pow1 = shl( *Q_bwe_exc, 1 );
+    exp = W_norm( W_tmp );
+    pow1 = W_extract_h( W_shl( W_tmp, exp ) ); // 2*Q_bwe_exc+1+exp-32 = // tmp+exp
+    Q_pow1 = add( tmp, exp );
 
-    test();
-#if 1 // ADD_IVAS_TBE_CODE
     IF( flag_ACELP16k == 0 )
-#else
-    IF( ( LE_32( bitrate, ACELP_13k20 ) ) && ( GE_32( bitrate, ACELP_7k20 ) ) )
-#endif
     {
         /* varEnvShape = mean_fx(voice_factors, 4); */
         /* unroll the loop */
@@ -3186,12 +2833,8 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     test();
     test();
     test();
-#if 1 // def ADD_IVAS_TBE_CODE
     test();
     IF( EQ_16( element_mode, EVS_MONO ) && *mem_csfilt == 0 && ( ( EQ_32( bitrate, ACELP_9k60 ) ) || ( EQ_32( bitrate, ACELP_16k40 ) ) || ( EQ_32( bitrate, ACELP_24k40 ) ) ) )
-#else
-    IF( *mem_csfilt == 0 && ( ( EQ_32( bitrate, ACELP_9k60 ) ) || ( EQ_32( bitrate, ACELP_16k40 ) ) || ( EQ_32( bitrate, ACELP_24k40 ) ) ) )
-#endif
     {
         /* pre-init smoothing filter to avoid energy drop outs */
         L_tmp = L_mult( excTmp2[0], 1638 );
@@ -3218,7 +2861,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         *mem_csfilt = Mult_32_16( L_tmp, varEnvShape );
         move32();
     }
-#if 1 // def ADD_IVAS_TBE_CODE
+
     IF( MSFlag > 0 )
     {
         // varEnvShape = 0.995f;
@@ -3232,7 +2875,6 @@ void GenShapedSHBExcitation_ivas_enc_fx(
     }
 
     White_exc16k = exc16k;
-    move16();
     Word16 Q_excTmp2 = add( getScaleFactor16( excTmp2, L_FRAME16k ), *Q_bwe_exc );
     IF( *mem_csfilt )
     {
@@ -3278,7 +2920,6 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         }
     }
     ELSE
-#endif
     {
         /* Track the low band envelope */
         L_tmp = L_shl( *mem_csfilt, sub( Q_excTmp2, *Q_bwe_exc ) );
@@ -3304,19 +2945,19 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         *mem_csfilt = L_shr( L_tmp, sub( Q_excTmp2, *Q_bwe_exc ) );
         move32();
     }
-#if 1 // def ADD_IVAS_TBE_CODE
+
     test();
     IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
     {
         /* generate gaussian (white) excitation */
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
-            White_exc16k[k] = own_random( &bwe_seed[0] );
+            White_exc16k[k] = own_random( &bwe_seed[0] ); // Q0
             move16();
         }
 
         /* normalize the amplitude of the gaussian excitation to that of the LB exc. */
-        Word32 pow22_inv = POW_EXC16k_WHTND_FX_INV_SQRT;
+        Word32 pow22_inv = POW_EXC16k_WHTND_FX_INV_SQRT; // Q31
         move32();
         move32();
         pow22 = POW_EXC16k_WHTND_FX;
@@ -3332,27 +2973,19 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         // v_multc_fixed_16_16(White_exc16k, round_fx(temp_pow), White_exc16k, L_FRAME16k);
         L_tmp = 0;
         move32();
+        Q_White_exc16k = add( getScaleFactor16( White_exc16k, L_FRAME16k ), norm_l( temp_pow ) );
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
-            White_exc16k_32[k] = Mpy_32_16_1( temp_pow, White_exc16k[k] );
+            White_exc16k_32[k] = Mpy_32_16_1( temp_pow, White_exc16k[k] ); // Q31 + Q0 - Q15 = Q16
             move32();
-            White_exc16k[k] = round_fx( L_shl( White_exc16k_32[k], sub( *Q_bwe_exc, NOISE_QADJ ) ) ); //  Q_bwe_exc - NOISE_QADJ
+            White_exc16k[k] = round_fx( L_shl( White_exc16k_32[k], Q_White_exc16k ) ); //  Q16 + Q_White_exc16k - Q16 = Q_White_exc16k
             move16();
             L_tmp = L_max( L_tmp, L_abs( White_exc16k_32[k] ) );
         }
-        Q_temp = norm_l( L_tmp );
-        IF( L_tmp == 0 )
-        {
-            Q_temp = 31;
-            move16();
-        }
     }
     ELSE
-#endif
     {
         /* create a random excitation - Reuse exc16k memory */
-        White_exc16k = exc16k;
-        move16();
         create_random_vector_fx( White_exc16k, L_FRAME, bwe_seed );                        // Q5
         create_random_vector_fx( White_exc16k + L_FRAME, L_FRAME16k - L_FRAME, bwe_seed ); // Q5
 
@@ -3365,57 +2998,47 @@ void GenShapedSHBExcitation_ivas_enc_fx(
             move32();
             L_tmp = L_max( L_tmp, L_abs( White_exc16k_32[k] ) );
         }
-        Q_temp = norm_l( L_tmp );
-        IF( L_tmp == 0 )
-        {
-            Q_temp = 31;
-            move16();
-        }
         /*Copy_Scale_sig( White_exc16k, White_exc16k, L_FRAME16k, sub(NOISE_QFAC, 5) );)*/
         /* White_exc16k in Q6 */
 
         /* calculate pow22 */
         /* pow22=0.00001f */
         tmp = sub( shl( sub( *Q_bwe_exc, NOISE_QADJ ), 1 ), 31 );
-        Word64 sum = W_shl( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(*Q_bwe_exc-NOISE_QADJ) */
+        W_tmp = W_shl( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(*Q_bwe_exc-NOISE_QADJ) */
+        Q_White_exc16k = getScaleFactor32( White_exc16k_32, L_FRAME16k );
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
             /* White_exc16k[k] *= excNoisyEnv[k]; */
-            White_exc16k[k] = mult_r( excNoisyEnv[k], shl( White_exc16k[k], 1 ) ); // Q_excTmp2 + 5 + 1 - 15 ==> Q_excTmp2 - 9
+            White_exc16k[k] = extract_h( L_shl( White_exc16k_32[k], Q_White_exc16k ) ); // Q_excTmp2 + 6 + Q_White_exc16k - 16 ==> Q_excTmp2 + Q_White_exc16k - 10
             move16();
-            chk2 = s_or( chk2, White_exc16k[k] );
             /* i: excNoisyEnv in (Q_excTmp2)     */
             /* i: White_exc16k  in Q6               */
             /* o: White_exc16k in (Q_bwe_exc-NOISE_QADJ)  */
+
             /* pow22 += White_exc16k[k] * White_exc16k[k]; */
-            sum = W_mac0_16_16( sum, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_excTmp2-NOISE_QADJ)*/
+            W_tmp = W_mac0_16_16( W_tmp, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_excTmp2 + Q_White_exc16k - 10)*/
         }
-        Q_pow22 = W_norm( sum );
-        pow22 = W_extract_h( W_shl( sum, Q_pow22 ) ); // 2*(Q_excTmp2-NOISE_QADJ)+Q_pow22-32
-        Q_pow22 = sub( add( Q_pow22, shl( sub( Q_excTmp2, NOISE_QADJ ), 1 ) ), 32 );
-        Scale_sig( White_exc16k, L_FRAME16k, sub( *Q_bwe_exc, Q_excTmp2 ) );
+        Q_pow22 = W_norm( W_tmp );
+        pow22 = W_extract_h( W_shl( W_tmp, Q_pow22 ) ); // 2*(Q_excTmp2 + Q_White_exc16k - 10)+Q_pow22-32
+        Q_pow22 = sub( add( Q_pow22, shl( sub( add( Q_White_exc16k, Q_excTmp2 ), 10 ), 1 ) ), 32 );
+        Q_White_exc16k = add( Q_White_exc16k, sub( Q_excTmp2, 10 ) );
     }
 
-#if 1 // def ADD_IVAS_TBE_CODE
     flag_plosive = 0;
     move16();
     test();
     test();
     test();
     IF( GE_32( extl_brate, SWB_TBE_2k8 ) || EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
-#else
-    IF( GE_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         IF( EQ_16( *vf_ind, 20 ) ) /* encoder side */
         {
-#ifndef ADD_IVAS_TBE_CODE // BELOW PART WILL NEED TO BE CONVERTED FOR ENCODER!!
             test();
             IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
             {
                 FOR( k = 0; k < L_FRAME16k; k++ )
                 {
-                    White_exc16k_tmp[k] = round_fx( L_shl( White_exc16k_32[k], *Q_bwe_exc ) );
+                    White_exc16k_tmp[k] = shl( White_exc16k[k], sub( *Q_bwe_exc, Q_White_exc16k ) );
                     move16();
                 }
 
@@ -3441,8 +3064,8 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                 move32();
 
                 temp1 = add( shl( *Q_bwe_exc, 1 ), 1 );
-                temp2 = add( add( Q_shb, *Q_bwe_exc ), 1 );
-                temp3 = add( shl( Q_shb, 1 ), 1 );
+                temp2 = add( add( Q_EnvSHBres_4k, *Q_bwe_exc ), 1 );
+                temp3 = add( shl( Q_EnvSHBres_4k, 1 ), 1 );
                 FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
                 {
                     // c0_part[i] = sum2_f( &EnvExc16kWhtnd_4k[i * L_FRAME4k / NUM_SHB_SUBGAINS], L_FRAME4k / NUM_SHB_SUBGAINS );
@@ -3574,6 +3197,9 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                     {
                         // g = 1.0f;
                         g = MAX16B; /* Q15 */
+                        move16();
+                        g_e = 0;
+                        move16();
                     }
                     // else if ( g < shl( delta, ( 15 - g_e ) - 14 ) )
                     ELSE IF( BASOP_Util_Cmp_Mant32Exp( g, add( 16, g_e ), delta, 17 ) < 0 )
@@ -3581,43 +3207,20 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                         /* prevent low gains to be quantized to 0 as this is reserved for plosives */
                         // g = delta;
                         g = shl( delta, 1 ); /* Q15 */
+                        g_e = 0;
+                        move16();
                     }
 
+                    g = shl_sat( g, g_e ); /* Q15 */
+
                     *vf_ind = usquant_fx( g, &mix_factor, 0, delta, cbsize );
                     move16();
                 }
             }
             ELSE
-#else
-            UNUSED_PARAM( Env_error_part );
-            UNUSED_PARAM( Env_error );
-            UNUSED_PARAM( EnvSHBres_4k );
-            UNUSED_PARAM( c5_part );
-            UNUSED_PARAM( c1 );
-            UNUSED_PARAM( den );
-            UNUSED_PARAM( c3_part );
-            UNUSED_PARAM( c0 );
-            UNUSED_PARAM( delta );
-            UNUSED_PARAM( c3 );
-            UNUSED_PARAM( c2_part );
-            UNUSED_PARAM( c1_part );
-            UNUSED_PARAM( EnvWhiteExc16k );
-            UNUSED_PARAM( g2 );
-            UNUSED_PARAM( c5 );
-            UNUSED_PARAM( c4_part );
-            UNUSED_PARAM( EnvWhiteExc16k_4k );
-            UNUSED_PARAM( c2 );
-            UNUSED_PARAM( g );
-            UNUSED_PARAM( cbsize );
-            UNUSED_PARAM( g1 );
-            UNUSED_PARAM( EnvExc16kWhtnd );
-            UNUSED_PARAM( c0_part );
-            UNUSED_PARAM( EnvExc16kWhtnd_4k );
-            UNUSED_PARAM( c4 );
-#endif
             {
                 Estimate_mix_factors_fx( shb_res, Q_shb, exc16kWhtnd, *Q_bwe_exc, White_exc16k,
-                                         ( *Q_bwe_exc - NOISE_QADJ ), pow1, Q_pow1, pow22, Q_pow22, voiceFacEst, vf_ind );
+                                         Q_White_exc16k, pow1, Q_pow1, pow22, Q_pow22, voiceFacEst, vf_ind );
                 tmp = voiceFacEst[0];
                 tmp2 = MAX_16;
                 move16();
@@ -3632,7 +3235,6 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         ELSE /* decoder side */
         {
             test();
-#if 1 // def ADD_IVAS_TBE_CODE
             IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
             {
                 IF( *vf_ind == 0 )
@@ -3650,7 +3252,6 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                 }
             }
             ELSE
-#endif
             {
                 /* *vf_ind is an integer scale by 0.125f*/
                 tmp = shl( *vf_ind, ( 15 - 3 ) );
@@ -3663,10 +3264,9 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                 }
             }
         }
-#if 1 // def ADD_IVAS_TBE_CODE
+
         test();
         IF( NE_32( extl_brate, SWB_TBE_1k10 ) && NE_32( extl_brate, SWB_TBE_1k75 ) )
-#endif
         {
             voice_factors[0] = mult_r( voice_factors[0], tmp2 );
             move16();
@@ -3680,130 +3280,124 @@ void GenShapedSHBExcitation_ivas_enc_fx(
             move16();
         }
     }
-#if 1 // def ADD_IVAS_TBE_CODE
+
     test();
     IF( GE_16( element_mode, IVAS_CPE_DFT ) && nlExc16k != NULL )
     {
         /* save buffers for IC-BWE */
         // mvr2r(exc16kWhtnd, nlExc16k, L_FRAME16k);
-        Copy( exc16kWhtnd, nlExc16k, L_FRAME16k );
+        Copy( exc16kWhtnd, nlExc16k, L_FRAME16k ); // Q_bwe_exc
+        *nlExc16k_e = sub( 15, *Q_bwe_exc );
+        move16();
+
         // v_multc(White_exc16k, (float)sqrt(pow1 / pow22), mixExc16k, L_FRAME16k);
-        /*Word16 temp_fac = divide3232(L_shr(pow1, Q_pow1), pow22);
-        Word16 temp_fac_exp = 0;
-        temp_fac = Sqrt16(temp_fac, &temp_fac_exp);*/
         L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
-        Word16 temp_fac = round_fx_sat( L_shl_sat( L_tmp, exp ) ); // Q15
-        // v_multc_fixed_16_16(White_exc16k,shr(temp_fac, temp_fac_exp) , mixExc16k, L_FRAME16k);
+        Word16 temp_fac = round_fx_sat( L_tmp ); // Q15-exp
+
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
-            mixExc16k[k] = mult_r( White_exc16k[k], temp_fac );
+            mixExc16k[k] = mult_r( White_exc16k[k], temp_fac ); // Q_White_exc16k+15-exp-15 = Q_White_exc16k-exp
             move16();
         }
+        *mixExc16k_e = sub( 15, sub( Q_White_exc16k, exp ) );
+        move16();
     }
-#endif
 
-    tmp = sub( Q_temp, 3 );
-    FOR( k = 0; k < L_FRAME16k; k++ )
-    {
-        White_exc16k_FB[k] = White_exc16k[k]; /* Q_bwe_exc-NOISE_QADJ */
-    }
+    Copy( White_exc16k, White_exc16k_FB, L_FRAME16k ); // Q_White_exc16k
     prev_Q_bwe_exc_fb = *Q_bwe_exc_fb;
+    *Q_bwe_exc_fb = Q_White_exc16k;
     move16();
-    *Q_bwe_exc_fb = sub( *Q_bwe_exc, NOISE_QADJ );
     move16();
-    deemph_fx( White_exc16k, PREEMPH_FAC, L_FRAME16k, tbe_demph );
-    /* i/o: White_exc16k (Q_bwe_exc-NOISE_QADJ) */
-    /* i: tbe_demph (Q_bwe_exc-NOISE_QADJ) */
 
-#if 1 // def ADD_IVAS_TBE_CODE
+    Word16 tbe_demph_fx = shl_sat( *tbe_demph, sub( Q_White_exc16k, *Q_bwe_exc ) ); // Q_White_exc16k
+
+    deemph_fx( White_exc16k, PREEMPH_FAC, L_FRAME16k, &tbe_demph_fx );
+    /* i/o: White_exc16k (Q_White_exc16k) */
+    /* i: tbe_demph_fx (Q_White_exc16k) */
+    *tbe_demph = shr_sat( tbe_demph_fx, sub( Q_White_exc16k, *Q_bwe_exc ) );
+    move16();
+
     test();
     IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
     {
         IF( !flag_plosive ) /* use only LB excitation in case of plosives */
         {
             /* re-scale gaussian excitation at the beginning to gradually move from old energy to new energy */
-            // old_scale = (float)sqrt(*prev_pow_exc16kWhtnd / pow1);
-            // old_scale = divide3232(*prev_pow_exc16kWhtnd, pow1); // exp = Q15 - (Q_pow1)
-            // Word16 old_scale_exp = Q15 - (Q_pow1);
-            // old_scale = Sqrt16(old_scale, &old_scale_exp);
-            // old_scale = shl(old_scale, old_scale_exp); //Q15
-            L_tmp = root_a_over_b_fx( *prev_pow_exc16kWhtnd, 0, pow1, Q_pow1, &exp );
-            old_scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); // Q15
+            /* old_scale = (float) sqrt( *prev_pow_exc16kWhtnd / pow1 ); */
+            old_scale = round_fx_sat( root_a_over_b_fx( *prev_pow_exc16kWhtnd, 0, pow1, Q_pow1, &exp ) ); // exp
+            old_scale = shl( old_scale, s_min( 0, exp ) );                                                // limit Q factor to 15
+            exp = s_max( 0, exp );
+
             // new_scale = 1.0f;
-            new_scale = 32767;
-            move16();
+            new_scale = shr( 32767, exp ); // exp
+
             // step_scale = (new_scale - old_scale) / (L_FRAME16k / 2);
-            step_scale = mult_r( sub( new_scale, old_scale ), 205 );
-            scale = old_scale;
+            step_scale = mult_r( sub( new_scale, old_scale ), 205 ); // exp
+            scale = old_scale;                                       // exp
             move16();
+
             /* interpolate between the old and the new value of the mixing factor */
-            old_fact = *prev_mix_factor;
+            old_fact = *prev_mix_factor; // Q15
+            new_fact = mix_factor;       // Q15
             move16();
-            new_fact = mix_factor;
             move16();
+
             // step = (new_fact - old_fact) / (L_FRAME16k / 2);
-            step = mult_r( sub( new_fact, old_fact ), 205 );
-            fact = old_fact;
+            step = mult_r( sub( new_fact, old_fact ), 205 ); // Q15
+            fact = old_fact;                                 // Q15
             move16();
+
+            shift = add( exp, sub( *Q_bwe_exc, Q_White_exc16k ) );
+
             /* mixing of LB and gaussian excitation in the first half of the frame */
             FOR( k = 0; k < L_FRAME16k / 2; k++ )
             {
-                // exc16kWhtnd[k] = (float)fact * (White_exc16k[k] * scale) + (float)(1 - fact) * exc16kWhtnd[k];
-                // exc16kWhtnd[k] = add(mult_r(fact, mult(shl(White_exc16k[k], *Q_bwe_exc), scale)), mult_r(sub(32767, fact), exc16kWhtnd[k]));
-                L_tmp = L_add( L_shl( L_mult( fact, mult_r( White_exc16k[k], scale ) ), NOISE_QADJ ),
-                               L_mult( sub( 32767, fact ), exc16kWhtnd[k] ) ); // Q_bwe_exc
-                exc16kWhtnd[k] = round_fx( L_tmp );
+                /* exc16kWhtnd[k] = (float)fact * (White_exc16k[k] * scale) + (float)(1 - fact) * exc16kWhtnd[k]; */
+                L_tmp = L_shl_sat( L_mult( fact, mult_r( White_exc16k[k], scale ) ), shift ); // Q_bwe_exc+16
+                exc16kWhtnd[k] = mac_r_sat( L_tmp, sub( 32767, fact ), exc16kWhtnd[k] );      // Q_bwe_exc
                 move16();
-                fact = add_sat( fact, step );
-                scale = add_sat( scale, step_scale );
+
+                fact = add_sat( fact, step );         // Q15
+                scale = add_sat( scale, step_scale ); // exp
             }
 
+            shift = sub( *Q_bwe_exc, Q_White_exc16k );
             /* mixing of LB and gaussian excitation in the second half of the frame */
             FOR( ; k < L_FRAME16k; k++ )
             {
                 // exc16kWhtnd[k] = (float)new_fact * White_exc16k[k] + (float)(1 - new_fact) * exc16kWhtnd[k];
-                // exc16kWhtnd[k] = add(mult_r(new_fact, shl(White_exc16k[k], *Q_bwe_exc)), mult_r(sub(32767, new_fact), exc16kWhtnd[k]));
-                L_tmp = L_add( L_shl( L_mult( new_fact, White_exc16k[k] ), NOISE_QADJ ),
-                               mult_r( sub( 32767, new_fact ), exc16kWhtnd[k] ) ); // Q_bwe_exc
-                exc16kWhtnd[k] = round_fx( L_tmp );
+                L_tmp = L_shl_sat( L_mult( new_fact, White_exc16k[k] ), shift );         // Q_bwe_exc+16
+                exc16kWhtnd[k] = mac_r( L_tmp, sub( 32767, new_fact ), exc16kWhtnd[k] ); // Q_bwe_exc
                 move16();
             }
         }
         // preemph(exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph);
-        PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
+        PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph ); // Q_bwe_exc
     }
     ELSE
-#endif
     {
-#if 1 // def ADD_IVAS_TBE_CODE
         test();
         IF( EQ_16( coder_type, UNVOICED ) || EQ_16( MSFlag, 1 ) )
-#else
-        IF( EQ_16( coder_type, UNVOICED ) )
-#endif
         {
-            L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
+            scale = 0;
+            move16();
+
             test();
-            if ( chk1 == 0 && chk2 == 0 )
+            IF( pow1 != 0 && pow22 != 0 )
             {
-                L_tmp = 0;
-                move32();
+                L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
+                scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
             }
-#ifdef BASOP_NOGLOB
-            scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
-#else
-            scale = round_fx( L_shl( L_tmp, exp ) );         /*Q15 */
-#endif
+
             FOR( k = 0; k < L_FRAME16k; k++ )
             {
-                /* White_exc16k: (Q_bwe_exc-NOISE_QADJ), scale: Q15 */
-                L_tmp = L_mult( White_exc16k[k], scale );
-                /* L_tmp: (Q_bwe_exc-NOISE_QADJ) + 15 + 1 */
-                exc16kWhtnd[k] = round_fx_sat( L_shl_sat( L_tmp, NOISE_QADJ ) );
+                exc16kWhtnd[k] = mult_r_sat( White_exc16k[k], scale ); // Q_White_exc16k
                 move16();
-                /* exc16kWhtnd:  Q_bwe_exc */
             }
-            PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
+
+            Scale_sig( exc16kWhtnd, L_FRAME16k, sub( *Q_bwe_exc, Q_White_exc16k ) ); // Q_bwe_exc
+
+            PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph ); // Q_bwe_exc
             /* i/o: exc16kWhtnd  (Q_bwe_exc) */
             /* i/o: tbe_premph (Q_bwe_exc) */
         }
@@ -3843,11 +3437,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                     temp = sub( MAX_16, temp );
                     tempQ31 = Mult_32_16( pow1, temp );
                     L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
                     temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#else
-                    temp2 = round_fx( L_shl( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#endif
                 }
                 ELSE
                 {
@@ -3866,26 +3456,16 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                     temp = sub( MAX_16, vf_tmp );
                     tempQ31 = Mult_32_16( pow1, temp );
                     L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
                     temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#else
-                    temp2 = round_fx( L_shl( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#endif
                 }
 
+                shift = sub( *Q_bwe_exc, Q_White_exc16k );
                 FOR( j = 0; j < lSubFr; j++ )
                 {
                     /*exc16kWhtnd[k+j] = temp1 * exc16kWhtnd[k+j] + temp2 * White_exc16k[k+j]; */
-                    L_tmp = L_mult( temp2, White_exc16k[k + j] ); /* 16+(Q_bwe_exc-NOISE_QADJ)*/
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_shl_sat( L_tmp, NOISE_QADJ ); /* 16+(Q_bwe_exc) */
-                    exc16kWhtnd[k + j] = mac_r_sat( L_tmp, temp1, exc16kWhtnd[k + j] );
-#else
-                    L_tmp = L_shl( L_tmp, NOISE_QADJ );      /* 16+(Q_bwe_exc) */
-                    exc16kWhtnd[k + j] = mac_r( L_tmp, temp1, exc16kWhtnd[k + j] );
-#endif
+                    L_tmp = L_shl_sat( L_mult( temp2, White_exc16k[k + j] ), shift );   // 16+(Q_bwe_exc)
+                    exc16kWhtnd[k + j] = mac_r_sat( L_tmp, temp1, exc16kWhtnd[k + j] ); // Q_bwe_exc
                     move16();
-                    /* Q_bwe_exc */
                 }
                 k = add( k, lSubFr );
 
@@ -3900,18 +3480,14 @@ void GenShapedSHBExcitation_ivas_enc_fx(
                 temp = div_s( temp, temp2 );           /* Q15 */
                 temp = mult_r( PREEMPH_FAC, temp );
 
-                PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );
+                PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph ); // Q_bwe_exc
                 /* exc16kWhtnd: Q_bwe_exc;
                    tbe_premph: Q_bwe_exc*/
             }
         }
     }
 
-#if 1 // def ADD_IVAS_TBE_CODE
     IF( LT_32( extl_brate, SWB_TBE_2k8 ) )
-#else
-    IF( LT_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         syn_filt_fx( 0, lpc_shb, LPC_SHB_ORDER, exc16kWhtnd, excSHB, L_FRAME16k, state_lpc_syn, 1 );
         /* i: exc16kWhtnd in Q_bwe_exc */
@@ -4022,8 +3598,8 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         Scale_sig( fb_state_lpc_syn, LPC_SHB_ORDER, tmp );
         Scale_sig( fb_tbe_demph, 1, tmp );
         syn_filt_fx( 0, lpc_shb, LPC_SHB_ORDER, White_exc16k_FB, White_exc16k_FB_temp, L_FRAME16k, fb_state_lpc_syn, 1 );
-        /* i: White_exc16k_FB       in (14-n2) */
-        /* o: White_exc16k_FB_temp  in (14-n2) */
+        /* i: White_exc16k_FB       in (Q_bwe_exc_fb) */
+        /* o: White_exc16k_FB_temp  in (Q_bwe_exc_fb) */
 
         FOR( i = 0; i < 10; i++ )
         {
@@ -4045,10 +3621,11 @@ void GenShapedSHBExcitation_ivas_enc_fx(
         set16_fx( White_exc16k_FB, 0, L_FRAME16k );
     }
 
-#if 1                                                  // def ADD_IVAS_TBE_CODE
     *prev_pow_exc16kWhtnd = L_shr_sat( pow1, Q_pow1 ); // power goes above MAX_32
     *prev_mix_factor = mix_factor;
-#endif
+    move32();
+    move16();
+
     return;
 }
 
@@ -4104,7 +3681,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     Word16 exc32k[L_FRAME32k], exc16k[L_FRAME16k];
     Word32 pow1, pow22;
     Word16 scale, temp1, temp2, temp3;
-
+    Word16 Q_White_exc16k;
     Word16 excTmp2[L_FRAME16k];
     Word16 *White_exc16k;
     Word16 excNoisyEnv[L_FRAME16k];
@@ -4135,14 +3712,14 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     Word32 White_exc16k_32[L_FRAME16k];
     Word16 White_exc16k_tmp[L_FRAME16k];
     Word16 Q_temp;
-    Word16 prev_Q_bwe_exc_fb;
-    Word16 chk1, chk2;
+    Word16 prev_Q_bwe_exc_fb, Q_exc16kWhtnd;
+    Word16 chk1;
+    Word32 chk2;
     chk1 = 0;
     chk2 = 0;
     move16();
-    move16();
+    move32();
 
-#if 1 // def ADD_IVAS_TBE_CODE
     Word16 alpha, step, mem_csfilt_left, mem_csfilt_right, excNoisyEnvLeft[L_FRAME16k], excNoisyEnvRight[L_FRAME16k];
     Word16 cbsize;
     Word16 mix_factor, old_fact, new_fact, fact, old_scale, new_scale, step_scale;
@@ -4157,7 +3734,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
 
     mix_factor = 0; /* Q15 */
     move16();
-#endif
+
     set16_fx( zero_mem, 0, LPC_SHB_ORDER );
     set16_fx( wht_fil_mem, 0, LPC_WHTN_ORDER );
     FOR( i = 0; i < L_FRAME32k; i = i + 2 )
@@ -4189,11 +3766,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     /* i: exc16k in Q_bwe_exc */
     /* o: exc16kWhtnd in Q_bwe_exc */
 
-#if 1 // def ADD_IVAS_TBE_CODE
     IF( GE_32( extl_brate, SWB_TBE_2k8 ) )
-#else
-    IF( GE_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         temp2 = 0;
         move16();
@@ -4214,11 +3787,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     /* Estimate pow1 associated with Low band nonlinear extended excitation */
     /* pow1=0.00001f */
     tmp = sub( shl( *Q_bwe_exc, 1 ), 31 );
-#ifdef BASOP_NOGLOB
     pow1 = L_shl_sat( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(Q_bwe_exc) */
-#else
-    pow1 = L_shl( 21475l /*0.00001f Q31*/, tmp );              /* 0.00001f in 2*(Q_bwe_exc) */
-#endif
     FOR( k = 0; k < L_FRAME16k; k++ )
     {
         /*excTmp2[k ] = (float)(fabs(exc16kWhtnd[k]));*/
@@ -4227,20 +3796,13 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         chk1 = s_or( chk1, exc16kWhtnd[k] );
 
         /* pow1 += exc16kWhtnd[k] * exc16kWhtnd[k]; */
-#ifdef BASOP_NOGLOB
         pow1 = L_mac0_sat( pow1, exc16kWhtnd[k], exc16kWhtnd[k] ); /* 2*Q_bwe_exc */
-#else
-        pow1 = L_mac0( pow1, exc16kWhtnd[k], exc16kWhtnd[k] ); /* 2*Q_bwe_exc */
-#endif
     }
     Q_pow1 = shl( *Q_bwe_exc, 1 );
 
     test();
-#if 1 // ADD_IVAS_TBE_CODE
+
     IF( flag_ACELP16k == 0 )
-#else
-    IF( ( LE_32( bitrate, ACELP_13k20 ) ) && ( GE_32( bitrate, ACELP_7k20 ) ) )
-#endif
     {
         /* varEnvShape = mean_fx(voice_factors, 4); */
         /* unroll the loop */
@@ -4286,12 +3848,8 @@ void GenShapedSHBExcitation_ivas_dec_fx(
     test();
     test();
     test();
-#if 1 // def ADD_IVAS_TBE_CODE
-    test();
+
     IF( EQ_16( element_mode, EVS_MONO ) && *mem_csfilt == 0 && ( ( EQ_32( bitrate, ACELP_9k60 ) ) || ( EQ_32( bitrate, ACELP_16k40 ) ) || ( EQ_32( bitrate, ACELP_24k40 ) ) ) )
-#else
-    IF( *mem_csfilt == 0 && ( ( EQ_32( bitrate, ACELP_9k60 ) ) || ( EQ_32( bitrate, ACELP_16k40 ) ) || ( EQ_32( bitrate, ACELP_24k40 ) ) ) )
-#endif
     {
         /* pre-init smoothing filter to avoid energy drop outs */
         L_tmp = L_mult( excTmp2[0], 1638 );
@@ -4318,7 +3876,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         *mem_csfilt = Mult_32_16( L_tmp, varEnvShape );
         move32();
     }
-#if 1 // def ADD_IVAS_TBE_CODE
+
     IF( MSFlag > 0 )
     {
         // varEnvShape = 0.995f;
@@ -4378,7 +3936,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         }
     }
     ELSE
-#endif
+
     {
         /* Track the low band envelope */
         L_tmp = L_shl( *mem_csfilt, sub( Q_excTmp2, *Q_bwe_exc ) );
@@ -4404,7 +3962,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         *mem_csfilt = L_shr( L_tmp, sub( Q_excTmp2, *Q_bwe_exc ) );
         move32();
     }
-#if 1 // def ADD_IVAS_TBE_CODE
     test();
     IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
     {
@@ -4416,7 +3973,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         }
 
         /* normalize the amplitude of the gaussian excitation to that of the LB exc. */
-        Word32 pow22_inv = POW_EXC16k_WHTND_FX_INV_SQRT;
+        Word32 pow22_inv = POW_EXC16k_WHTND_FX_INV_SQRT_IN_Q49;
         move32();
         move32();
         pow22 = POW_EXC16k_WHTND_FX;
@@ -4425,21 +3982,23 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         // v_multc(White_exc16k, (float)sqrt(pow1 / pow22), White_exc16k, L_FRAME16k);
         Word16 pow1_exp = sub( Q31, Q_pow1 );
         Word32 temp_pow = Sqrt32( pow1, &pow1_exp );
-        temp_pow = L_shl( Mpy_32_32( temp_pow, pow22_inv ), pow1_exp );
+        temp_pow = Mpy_32_32( temp_pow, pow22_inv );
         /*Word16 out_exp;
         Word32 temp_pow1 = root_a_over_b_fx(pow1, Q_pow1, pow22, Q_pow22, &out_exp);
         temp_pow1 = L_shl(temp_pow1, out_exp);*/
         // v_multc_fixed_16_16(White_exc16k, round_fx(temp_pow), White_exc16k, L_FRAME16k);
         L_tmp = 0;
         move32();
+        shift = getScaleFactor16( White_exc16k, L_FRAME16k );
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
             White_exc16k_32[k] = Mpy_32_16_1( temp_pow, White_exc16k[k] );
             move32();
-            White_exc16k[k] = round_fx( L_shl( White_exc16k_32[k], sub( *Q_bwe_exc, NOISE_QADJ ) ) ); //  Q_bwe_exc - NOISE_QADJ
+            White_exc16k[k] = round_fx( L_shl( White_exc16k_32[k], shift ) ); // Q_White_exc16k
             move16();
             L_tmp = L_max( L_tmp, L_abs( White_exc16k_32[k] ) );
         }
+        Q_White_exc16k = add( shift, sub( 49 - 31, pow1_exp ) );
         Q_temp = norm_l( L_tmp );
         IF( L_tmp == 0 )
         {
@@ -4448,7 +4007,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         }
     }
     ELSE
-#endif
     {
         /* create a random excitation - Reuse exc16k memory */
         White_exc16k = exc16k;
@@ -4477,42 +4035,35 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         /* calculate pow22 */
         /* pow22=0.00001f */
         tmp = sub( shl( sub( *Q_bwe_exc, NOISE_QADJ ), 1 ), 31 );
-        pow22 = L_shl( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(*Q_bwe_exc-NOISE_QADJ) */
+        Word64 sum = W_shl( 21475l /*0.00001f Q31*/, tmp ); /* 0.00001f in 2*(*Q_bwe_exc-NOISE_QADJ) */
+        Q_White_exc16k = getScaleFactor32( White_exc16k_32, L_FRAME16k );
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
-            /* White_exc16k[k] *= excNoisyEnv[k]; */
-            White_exc16k[k] = mult_r( excNoisyEnv[k], shl( White_exc16k[k], 1 ) ); // Q_excTmp2 + 5 + 1 - 15 ==> Q_excTmp2 - 9
-            move16();
-            chk2 = s_or( chk2, White_exc16k[k] );
+
+            White_exc16k[k] = extract_h( L_shl( White_exc16k_32[k], Q_White_exc16k ) ); // Q_excTmp2 + 6 + Q_White_exc16k - 16 ==> Q_excTmp2 + Q_White_exc16k - 10
+            chk2 = L_or( chk2, White_exc16k_32[k] );
             /* i: excNoisyEnv in (Q_excTmp2)     */
             /* i: White_exc16k  in Q6               */
-            /* o: White_exc16k in (Q_bwe_exc-NOISE_QADJ)  */
+            /* o: White_exc16k in (Q_White_exc16k)  */
             /* pow22 += White_exc16k[k] * White_exc16k[k]; */
-#ifdef BASOP_NOGLOB
-            pow22 = L_mac0_sat( pow22, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_excTmp2-NOISE_QADJ)*/
-#else
-            pow22 = L_mac0( pow22, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_bwe_exc-NOISE_QADJ)*/
-#endif
+            sum = W_mac0_16_16( sum, White_exc16k[k], White_exc16k[k] ); /* 2*(Q_excTmp2 + Q_White_exc16k - 10)*/
+            move16();
         }
-        /*Q_pow22 = sub( shl(*Q_bwe_exc,1), 18 );*/
-        Q_pow22 = shl( sub( Q_excTmp2, NOISE_QADJ ), 1 );
-        Scale_sig( White_exc16k, L_FRAME16k, sub( *Q_bwe_exc, Q_excTmp2 ) );
+        Q_pow22 = W_norm( sum );
+        pow22 = W_extract_h( W_shl( sum, Q_pow22 ) ); // 2*(Q_excTmp2 + Q_White_exc16k - 10)+Q_pow22-32
+        Q_pow22 = sub( add( Q_pow22, shl( sub( add( Q_White_exc16k, Q_excTmp2 ), 10 ), 1 ) ), 32 );
+        Q_White_exc16k = add( Q_White_exc16k, sub( Q_excTmp2, 10 ) );
     }
 
-#if 1 // def ADD_IVAS_TBE_CODE
     flag_plosive = 0;
     move16();
     test();
     test();
     test();
     IF( GE_32( extl_brate, SWB_TBE_2k8 ) || EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
-#else
-    IF( GE_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         IF( EQ_16( *vf_ind, 20 ) ) /* encoder side */
         {
-#ifndef ADD_IVAS_TBE_CODE // BELOW PART WILL NEED TO BE CONVERTED FOR ENCODER!!
             test();
             IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
             {
@@ -4691,33 +4242,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                 }
             }
             ELSE
-#else
-            UNUSED_PARAM( Env_error_part );
-            UNUSED_PARAM( Env_error );
-            UNUSED_PARAM( EnvSHBres_4k );
-            UNUSED_PARAM( c5_part );
-            UNUSED_PARAM( c1 );
-            UNUSED_PARAM( den );
-            UNUSED_PARAM( c3_part );
-            UNUSED_PARAM( c0 );
-            UNUSED_PARAM( delta );
-            UNUSED_PARAM( c3 );
-            UNUSED_PARAM( c2_part );
-            UNUSED_PARAM( c1_part );
-            UNUSED_PARAM( EnvWhiteExc16k );
-            UNUSED_PARAM( g2 );
-            UNUSED_PARAM( c5 );
-            UNUSED_PARAM( c4_part );
-            UNUSED_PARAM( EnvWhiteExc16k_4k );
-            UNUSED_PARAM( c2 );
-            UNUSED_PARAM( g );
-            UNUSED_PARAM( cbsize );
-            UNUSED_PARAM( g1 );
-            UNUSED_PARAM( EnvExc16kWhtnd );
-            UNUSED_PARAM( c0_part );
-            UNUSED_PARAM( EnvExc16kWhtnd_4k );
-            UNUSED_PARAM( c4 );
-#endif
             {
                 Estimate_mix_factors_fx( shb_res, Q_shb, exc16kWhtnd, *Q_bwe_exc, White_exc16k,
                                          ( *Q_bwe_exc - NOISE_QADJ ), pow1, Q_pow1, pow22, Q_pow22, voiceFacEst, vf_ind );
@@ -4735,7 +4259,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         ELSE /* decoder side */
         {
             test();
-#if 1 // def ADD_IVAS_TBE_CODE
             IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
             {
                 IF( *vf_ind == 0 )
@@ -4753,7 +4276,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                 }
             }
             ELSE
-#endif
             {
                 /* *vf_ind is an integer scale by 0.125f*/
                 tmp = shl( *vf_ind, ( 15 - 3 ) );
@@ -4766,10 +4288,8 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                 }
             }
         }
-#if 1 // def ADD_IVAS_TBE_CODE
         test();
         IF( NE_32( extl_brate, SWB_TBE_1k10 ) && NE_32( extl_brate, SWB_TBE_1k75 ) )
-#endif
         {
             voice_factors[0] = mult_r( voice_factors[0], tmp2 );
             move16();
@@ -4783,7 +4303,6 @@ void GenShapedSHBExcitation_ivas_dec_fx(
             move16();
         }
     }
-#if 1 // def ADD_IVAS_TBE_CODE
     test();
     IF( GE_16( element_mode, IVAS_CPE_DFT ) && nlExc16k != NULL )
     {
@@ -4796,29 +4315,42 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         temp_fac = Sqrt16(temp_fac, &temp_fac_exp);*/
         L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
         Word16 temp_fac = round_fx_sat( L_shl_sat( L_tmp, exp ) ); // Q15
+        shift = sub( sub( *Q_bwe_exc, NOISE_QADJ ), Q_White_exc16k );
         // v_multc_fixed_16_16(White_exc16k,shr(temp_fac, temp_fac_exp) , mixExc16k, L_FRAME16k);
         FOR( k = 0; k < L_FRAME16k; k++ )
         {
-            mixExc16k[k] = mult_r( White_exc16k[k], temp_fac );
+            mixExc16k[k] = mult_r( shl_sat( White_exc16k[k], shift ), temp_fac );
             move16();
         }
     }
-#endif
 
     tmp = sub( Q_temp, 3 );
     FOR( k = 0; k < L_FRAME16k; k++ )
     {
-        White_exc16k_FB[k] = White_exc16k[k]; /* Q_bwe_exc-NOISE_QADJ */
+        White_exc16k_FB[k] = White_exc16k[k]; /* Q_White_exc16k */
     }
     prev_Q_bwe_exc_fb = *Q_bwe_exc_fb;
     move16();
-    *Q_bwe_exc_fb = sub( *Q_bwe_exc, NOISE_QADJ );
+    *Q_bwe_exc_fb = Q_White_exc16k;
     move16();
+    *tbe_demph = shl_sat( *tbe_demph, sub( Q_White_exc16k, sub( *Q_bwe_exc, NOISE_QADJ ) ) );
     deemph_fx( White_exc16k, PREEMPH_FAC, L_FRAME16k, tbe_demph );
-    /* i/o: White_exc16k (Q_bwe_exc-NOISE_QADJ) */
-    /* i: tbe_demph (Q_bwe_exc-NOISE_QADJ) */
+    *tbe_demph = shl_sat( *tbe_demph, sub( sub( *Q_bwe_exc, NOISE_QADJ ), Q_White_exc16k ) );
+
+    Q_exc16kWhtnd = getScaleFactor16( exc16kWhtnd, L_FRAME16k );
+    Q_exc16kWhtnd = add( Q_exc16kWhtnd, *Q_bwe_exc );
+
+    shift = getScaleFactor16( White_exc16k, L_FRAME16k );
+
+    shift = s_min( Q_exc16kWhtnd, add( shift, Q_White_exc16k ) );
+    scale_sig( exc16kWhtnd, L_FRAME16k, sub( shift, *Q_bwe_exc ) );
+    scale_sig( White_exc16k, L_FRAME16k, sub( shift, Q_White_exc16k ) );
 
-#if 1 // def ADD_IVAS_TBE_CODE
+    Q_exc16kWhtnd = Q_White_exc16k = shift;
+    move16();
+    move16();
+    *tbe_premph = shl_sat( *tbe_premph, sub( Q_White_exc16k, sub( *Q_bwe_exc, NOISE_QADJ ) ) );
+    move16();
     test();
     IF( EQ_32( extl_brate, SWB_TBE_1k10 ) || EQ_32( extl_brate, SWB_TBE_1k75 ) )
     {
@@ -4851,11 +4383,8 @@ void GenShapedSHBExcitation_ivas_dec_fx(
             /* mixing of LB and gaussian excitation in the first half of the frame */
             FOR( k = 0; k < L_FRAME16k / 2; k++ )
             {
-                // exc16kWhtnd[k] = (float)fact * (White_exc16k[k] * scale) + (float)(1 - fact) * exc16kWhtnd[k];
-                // exc16kWhtnd[k] = add(mult_r(fact, mult(shl(White_exc16k[k], *Q_bwe_exc), scale)), mult_r(sub(32767, fact), exc16kWhtnd[k]));
-                L_tmp = L_add( L_shl( L_mult( fact, mult_r( White_exc16k[k], scale ) ), NOISE_QADJ ),
-                               L_mult( sub( 32767, fact ), exc16kWhtnd[k] ) ); // Q_bwe_exc
-                exc16kWhtnd[k] = round_fx( L_tmp );
+                exc16kWhtnd[k] = mac_r( L_mult( fact, mult_r( White_exc16k[k], scale ) ),
+                                        sub( 32767, fact ), exc16kWhtnd[k] ); // Q_exc16kWhtnd
                 move16();
                 fact = add_sat( fact, step );
                 scale = add_sat( scale, step_scale );
@@ -4864,11 +4393,8 @@ void GenShapedSHBExcitation_ivas_dec_fx(
             /* mixing of LB and gaussian excitation in the second half of the frame */
             FOR( ; k < L_FRAME16k; k++ )
             {
-                // exc16kWhtnd[k] = (float)new_fact * White_exc16k[k] + (float)(1 - new_fact) * exc16kWhtnd[k];
-                // exc16kWhtnd[k] = add(mult_r(new_fact, shl(White_exc16k[k], *Q_bwe_exc)), mult_r(sub(32767, new_fact), exc16kWhtnd[k]));
-                L_tmp = L_add( L_shl( L_mult( new_fact, White_exc16k[k] ), NOISE_QADJ ),
-                               mult_r( sub( 32767, new_fact ), exc16kWhtnd[k] ) ); // Q_bwe_exc
-                exc16kWhtnd[k] = round_fx( L_tmp );
+                exc16kWhtnd[k] = mac_r( L_mult( new_fact, White_exc16k[k] ),
+                                        sub( 32767, new_fact ), exc16kWhtnd[k] ); // Q_exc16kWhtnd
                 move16();
             }
         }
@@ -4876,14 +4402,9 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
     }
     ELSE
-#endif
     {
-#if 1 // def ADD_IVAS_TBE_CODE
         test();
         IF( EQ_16( coder_type, UNVOICED ) || EQ_16( MSFlag, 1 ) )
-#else
-        IF( EQ_16( coder_type, UNVOICED ) )
-#endif
         {
             L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
             test();
@@ -4892,23 +4413,15 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                 L_tmp = 0;
                 move32();
             }
-#ifdef BASOP_NOGLOB
             scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
-#else
-            scale = round_fx( L_shl( L_tmp, exp ) );         /*Q15 */
-#endif
             FOR( k = 0; k < L_FRAME16k; k++ )
             {
-                /* White_exc16k: (Q_bwe_exc-NOISE_QADJ), scale: Q15 */
-                L_tmp = L_mult( White_exc16k[k], scale );
-                /* L_tmp: (Q_bwe_exc-NOISE_QADJ) + 15 + 1 */
-                exc16kWhtnd[k] = round_fx_sat( L_shl_sat( L_tmp, NOISE_QADJ ) );
+                exc16kWhtnd[k] = mult_r_sat( White_exc16k[k], scale );
                 move16();
-                /* exc16kWhtnd:  Q_bwe_exc */
             }
             PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );
-            /* i/o: exc16kWhtnd  (Q_bwe_exc) */
-            /* i/o: tbe_premph (Q_bwe_exc) */
+            /* i/o: exc16kWhtnd  (Q_exc16kWhtnd) */
+            /* i/o: tbe_premph (Q_exc16kWhtnd) */
         }
         ELSE
         {
@@ -4946,11 +4459,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                     temp = sub( MAX_16, temp );
                     tempQ31 = Mult_32_16( pow1, temp );
                     L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
                     temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#else
-                    temp2 = round_fx( L_shl( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#endif
                 }
                 ELSE
                 {
@@ -4969,26 +4478,16 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                     temp = sub( MAX_16, vf_tmp );
                     tempQ31 = Mult_32_16( pow1, temp );
                     L_tmp = root_a_over_b_fx( tempQ31, Q_pow1, pow22, Q_pow22, &exp );
-#ifdef BASOP_NOGLOB
                     temp2 = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#else
-                    temp2 = round_fx( L_shl( L_tmp, exp ) ); /* Q15 whiteEnvShapedExc scale factor */
-#endif
                 }
 
                 FOR( j = 0; j < lSubFr; j++ )
                 {
                     /*exc16kWhtnd[k+j] = temp1 * exc16kWhtnd[k+j] + temp2 * White_exc16k[k+j]; */
-                    L_tmp = L_mult( temp2, White_exc16k[k + j] ); /* 16+(Q_bwe_exc-NOISE_QADJ)*/
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_shl_sat( L_tmp, NOISE_QADJ ); /* 16+(Q_bwe_exc) */
+                    L_tmp = L_mult( temp2, White_exc16k[k + j] );
                     exc16kWhtnd[k + j] = mac_r_sat( L_tmp, temp1, exc16kWhtnd[k + j] );
-#else
-                    L_tmp = L_shl( L_tmp, NOISE_QADJ );      /* 16+(Q_bwe_exc) */
-                    exc16kWhtnd[k + j] = mac_r( L_tmp, temp1, exc16kWhtnd[k + j] );
-#endif
                     move16();
-                    /* Q_bwe_exc */
+                    /* Q_exc16kWhtnd */
                 }
                 k = add( k, lSubFr );
 
@@ -5002,19 +4501,18 @@ void GenShapedSHBExcitation_ivas_dec_fx(
                 temp2 = add( temp, shl( temp1, -1 ) ); /* shift right by 1 to avoid overflow */
                 temp = div_s( temp, temp2 );           /* Q15 */
                 temp = mult_r( PREEMPH_FAC, temp );
-
                 PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );
-                /* exc16kWhtnd: Q_bwe_exc;
-                   tbe_premph: Q_bwe_exc*/
+                /* exc16kWhtnd: Q_exc16kWhtnd;
+                   tbe_premph: Q_exc16kWhtnd*/
             }
         }
     }
+    *tbe_premph = shl_sat( *tbe_premph, sub( sub( *Q_bwe_exc, NOISE_QADJ ), Q_White_exc16k ) );
+    move16();
+    Scale_sig( White_exc16k, L_FRAME16k, sub( sub( *Q_bwe_exc, NOISE_QADJ ), Q_White_exc16k ) );
+    Scale_sig( exc16kWhtnd, L_FRAME16k, sub( *Q_bwe_exc, Q_White_exc16k ) );
 
-#if 1 // def ADD_IVAS_TBE_CODE
     IF( LT_32( extl_brate, SWB_TBE_2k8 ) )
-#else
-    IF( LT_32( bitrate, ACELP_24k40 ) )
-#endif
     {
         Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER, exc16kWhtnd, excSHB, L_FRAME16k, state_lpc_syn, 1 );
         /* i: exc16kWhtnd in Q_bwe_exc */
@@ -5148,10 +4646,8 @@ void GenShapedSHBExcitation_ivas_dec_fx(
         set16_fx( White_exc16k_FB, 0, L_FRAME16k );
     }
 
-#if 1                                                  // def ADD_IVAS_TBE_CODE
     *prev_pow_exc16kWhtnd = L_shr_sat( pow1, Q_pow1 ); // power goes above MAX_32
     *prev_mix_factor = mix_factor;
-#endif
     return;
 }
 
@@ -5219,28 +4715,108 @@ void GenSHBSynth_fx(
     /*modify_Fs_fx( input_synspeech, L_FRAME16k, 16000, speech_buf_32k, 32000, allpass_mem, 0);*/
     IF( EQ_16( L_frame, L_FRAME ) )
     {
-        /* 12.8 k core flipping and downmixing */
-        flip_and_downmix_generic_fx( speech_buf_32k, shb_syn_speech_32k, L_FRAME32k,
-                                     Hilbert_Mem,
-                                     Hilbert_Mem + HILBERT_ORDER1,
-                                     Hilbert_Mem + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ),
-                                     syn_dm_phase );
+        /* 12.8 k core flipping and downmixing */
+        flip_and_downmix_generic_fx( speech_buf_32k, shb_syn_speech_32k, L_FRAME32k,
+                                     Hilbert_Mem,
+                                     Hilbert_Mem + HILBERT_ORDER1,
+                                     Hilbert_Mem + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ),
+                                     syn_dm_phase );
+    }
+    ELSE
+    {
+        /* 16 k core flipping and no downmixing */
+        FOR( i = 0; i < L_FRAME32k; i = i + 2 )
+        {
+            shb_syn_speech_32k[i] = negate( speech_buf_32k[i] );
+            move16();
+            shb_syn_speech_32k[i + 1] = speech_buf_32k[i + 1];
+            move16();
+        }
+    }
+
+    Scale_sig( shb_syn_speech_32k, L_FRAME32k, negate( shift ) );
+    Scale_sig( allpass_mem, 2 * ALLPASSSECTIONS_STEEP, negate( shift ) );
+    Scale_sig32( Hilbert_Mem, HILBERT_MEM_SIZE, negate( shift ) );
+
+    return;
+}
+
+
+/* IVAS 32-bit variant */
+void GenSHBSynth_fx32(
+    const Word32 *input_synspeech,      /* i  : input synthesized speech    Qx*/
+    Word32 *shb_syn_speech_32k,         /* o  : output highband component   Qx*/
+    Word32 Hilbert_Mem[],               /* i/o: memory                      Qx*/
+    Word32 state_lsyn_filt_shb_local[], /* i/o: memory                      Qx*/
+    const Word16 L_frame,               /* i  : ACELP frame length          */
+    Word16 *syn_dm_phase )
+{
+    Word32 speech_buf_32k[L_FRAME32k];
+    Word16 i;
+
+    Word16 shift = 0;
+    Word32 maxm32, input_synspeech_temp[L_FRAME16k];
+    move16();
+
+    /* find the maximum value and derive the shift to improve precision of the Hilber filter */
+    maxm32 = L_deposit_l( 0 );
+    FOR( i = 0; i < L_FRAME16k; i++ )
+    {
+        maxm32 = L_max( maxm32, L_abs( input_synspeech[i] ) );
+    }
+
+    FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
+    {
+        maxm32 = L_max( maxm32, L_abs( state_lsyn_filt_shb_local[i] ) );
+    }
+
+    FOR( i = 0; i < HILBERT_MEM_SIZE; i++ )
+    {
+        maxm32 = L_max( maxm32, L_abs( Hilbert_Mem[i] ) );
+    }
+
+    IF( maxm32 != 0 )
+    {
+        shift = sub( norm_l( maxm32 ), 3 );
+
+        Copy_Scale_sig32( input_synspeech, input_synspeech_temp, L_FRAME16k, shift );
+        Scale_sig32( state_lsyn_filt_shb_local, 2 * ALLPASSSECTIONS_STEEP, shift );
+        Scale_sig32( Hilbert_Mem, HILBERT_MEM_SIZE, shift );
+    }
+    ELSE
+    {
+        Copy32( input_synspeech, input_synspeech_temp, L_FRAME16k );
+    }
+
+    Interpolate_allpass_steep_fx32( input_synspeech_temp, state_lsyn_filt_shb_local, L_FRAME16k, speech_buf_32k );
+
+    IF( EQ_16( L_frame, L_FRAME ) )
+    {
+        flip_and_downmix_generic_fx32( speech_buf_32k, shb_syn_speech_32k, L_FRAME32k, Hilbert_Mem, Hilbert_Mem + HILBERT_ORDER1, Hilbert_Mem + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ), syn_dm_phase );
     }
     ELSE
     {
-        /* 16 k core flipping and no downmixing */
-        FOR( i = 0; i < L_FRAME32k; i = i + 2 )
+        FOR( i = 0; i < L_FRAME32k; i++ )
         {
-            shb_syn_speech_32k[i] = negate( speech_buf_32k[i] );
-            move16();
-            shb_syn_speech_32k[i + 1] = speech_buf_32k[i + 1];
-            move16();
+            // shb_syn_speech_32k[i] = ( ( i % 2 ) == 0 ) ? ( -speech_buf_32k[i] ) : ( speech_buf_32k[i] );
+            IF( i % 2 == 0 )
+            {
+                shb_syn_speech_32k[i] = L_negate( speech_buf_32k[i] ); // Qx
+            }
+            ELSE
+            {
+                shb_syn_speech_32k[i] = speech_buf_32k[i]; // Qx
+            }
+            move32();
         }
     }
 
-    Scale_sig( shb_syn_speech_32k, L_FRAME32k, negate( shift ) );
-    Scale_sig( allpass_mem, 2 * ALLPASSSECTIONS_STEEP, negate( shift ) );
-    Scale_sig32( Hilbert_Mem, HILBERT_MEM_SIZE, negate( shift ) );
+    IF( maxm32 != 0 )
+    {
+        Scale_sig32( shb_syn_speech_32k, L_FRAME32k, negate( shift ) );
+        Scale_sig32( state_lsyn_filt_shb_local, 2 * ALLPASSSECTIONS_STEEP, negate( shift ) );
+        Scale_sig32( Hilbert_Mem, HILBERT_MEM_SIZE, negate( shift ) );
+    }
 
     return;
 }
@@ -5467,6 +5043,165 @@ void ScaleShapedSHB_fx(
     return;
 }
 
+
+/* IVAS 32-bit variant */
+void ScaleShapedSHB_fx32(
+    const Word16 length,        /* i  : SHB overlap length      */
+    Word32 *synSHB_fx,          /* i/o: synthesized shb signal  Q_inp/Q_new */
+    Word32 *overlap_fx,         /* i/o: buffer for overlap-add  Q_inp/Q_new */
+    const Word16 *subgain_fx,   /* i  : subframe gain           Q15 */
+    const Word32 frame_gain_fx, /* i  : frame gain              Q18*/
+    const Word16 *win_fx,       /* i  : window                  Q15 */
+    const Word16 *subwin_fx,    /* i  : subframes window        Q15 */
+    Word16 *Q_inp,
+    Word16 *Q_new )
+{
+    const Word16 *skip;
+    Word16 i, j, k, l_shb_lahead, l_frame;
+    Word16 join_length, num_join;
+    Word32 mod_syn_fx[L_FRAME16k + L_SHB_LAHEAD], L_tmp;
+    Word16 sum_gain_fx;
+
+    /* initilaization */
+    l_frame = L_FRAME16k;
+    l_shb_lahead = L_SHB_LAHEAD;
+    move16();
+    move16();
+    skip = skip_bands_SWB_TBE;
+
+    IF( EQ_16( length, SHB_OVERLAP_LEN / 2 ) )
+    {
+        skip = skip_bands_WB_TBE;
+        l_frame = L_FRAME16k / 4;
+        l_shb_lahead = L_SHB_LAHEAD / 4;
+        move16();
+        move16();
+    }
+
+    /* apply gain for each subframe, and store noise output signal using overlap-add */
+    set32_fx( mod_syn_fx, 0, l_frame + l_shb_lahead );
+
+    IF( EQ_16( length, SHB_OVERLAP_LEN / 2 ) )
+    {
+        sum_gain_fx = 0;
+        move16();
+        FOR( k = 0; k < shr( length, 1 ); k++ )
+        {
+            sum_gain_fx = mult_r( subwin_fx[2 * k + 2], subgain_fx[0] );
+            mod_syn_fx[skip[0] + k] = Mpy_32_16_1( synSHB_fx[skip[0] + k], sum_gain_fx );
+            move32();                                                                                                 // Qx
+            mod_syn_fx[skip[0] + k + length / 2] = Mpy_32_16_1( synSHB_fx[skip[0] + k + length / 2], subgain_fx[0] ); // Qx
+            move32();
+        }
+        FOR( i = 1; i < NUM_SHB_SUBFR / 2; i++ )
+        {
+            FOR( k = 0; k < length; k++ )
+            {
+                L_tmp = L_mult0( subwin_fx[k + 1], subgain_fx[i] );
+                sum_gain_fx = round_fx( L_mac0( L_tmp, subwin_fx[length - k - 1], subgain_fx[i - 1] ) );
+                mod_syn_fx[skip[i] + k] = L_shl( Mpy_32_16_1( synSHB_fx[skip[i] + k], sum_gain_fx ), 1 ); // Qx
+                move32();
+            }
+        }
+        FOR( k = 0; k < shr( length, 1 ); k++ )
+        {
+            sum_gain_fx = mult_r( subwin_fx[length - k * 2 - 2], subgain_fx[i - 1] );
+            mod_syn_fx[skip[i] + k] = Mpy_32_16_1( synSHB_fx[skip[i] + k], sum_gain_fx ); // Qx
+            move32();
+        }
+    }
+    ELSE
+    {
+        num_join = NUM_SHB_SUBFR / NUM_SHB_SUBGAINS;
+        join_length = i_mult( num_join, length );
+        j = 0;
+        move16();
+        move16();
+        FOR( k = 0; k < length; k++ )
+        {
+            mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[k + 1], subgain_fx[0] ) ); // Qx
+            move32();
+            j = add( j, 1 );
+        }
+        FOR( i = 0; i < NUM_SHB_SUBGAINS - 1; i++ )
+        {
+            FOR( k = 0; k < join_length - length; k++ )
+            {
+                mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[i * num_join] ); // Qx
+                move32();
+                j = add( j, 1 );
+            }
+
+            FOR( k = 0; k < length; k++ )
+            {
+                L_tmp = L_mult0( subwin_fx[length - k - 1], subgain_fx[i * num_join] );
+                mod_syn_fx[j] = L_shl( Mpy_32_16_1( synSHB_fx[j], round_fx( L_mac0( L_tmp, subwin_fx[k + 1], subgain_fx[( i + 1 ) * num_join] ) ) ), 1 ); // Qx
+                move32();
+                j = add( j, 1 );
+            }
+        }
+        FOR( k = 0; k < join_length - length; k++ )
+        {
+            mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ); // Qx
+            move32();
+            j = add( j, 1 );
+        }
+        FOR( k = 0; k < length; k++ )
+        {
+            mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[length - k - 1], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ) ); // Qx
+            move32();
+            j = add( j, 1 );
+        }
+    }
+
+    Word16 norm_shift = norm_l( frame_gain_fx );
+    if ( frame_gain_fx == 0 )
+    {
+        norm_shift = 31;
+        move16();
+    }
+
+    norm_shift = s_min( norm_shift, 14 );
+    norm_shift = sub( norm_shift, 1 );
+
+    *Q_new = add( *Q_inp, sub( norm_shift, 13 ) ); // Q_new = Q_inp + min(norm_shift,14) - 14;
+    move16();
+    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+    {
+        overlap_fx[i] = L_shl( overlap_fx[i], sub( *Q_new, *Q_inp ) );
+        move32();
+    }
+
+    FOR( i = 0; i < l_shb_lahead; i++ )
+    {
+        synSHB_fx[i] = Mpy_32_32( mod_syn_fx[i], Mpy_32_16_1( L_shl( frame_gain_fx, norm_shift ), win_fx[i] ) ); // Q_new
+        synSHB_fx[i] = L_add( synSHB_fx[i], overlap_fx[i] );
+        synSHB_fx[i + l_shb_lahead] = Mpy_32_32( mod_syn_fx[i], L_shl( frame_gain_fx, norm_shift ) ); // Q_new
+        move32();
+        move32();
+        move32();
+    }
+
+    FOR( ; i < l_frame; i++ )
+    {
+        synSHB_fx[i] = Mpy_32_32( mod_syn_fx[i], L_shl( frame_gain_fx, norm_shift ) ); // Q_new
+        move32();
+    }
+
+    FOR( ; i < l_frame + l_shb_lahead; i++ )
+    {
+        synSHB_fx[i] = L_shl( synSHB_fx[i], sub( *Q_new, *Q_inp ) );
+        overlap_fx[i - l_frame] = Mpy_32_32( mod_syn_fx[i], Mpy_32_16_1( L_shl( frame_gain_fx, norm_shift ), win_fx[l_frame + l_shb_lahead - 1 - i] ) ); // Q_new
+        move32();
+        move32();
+    }
+
+    *Q_inp = *Q_new;
+    move16();
+    return;
+}
+
+
 /*-------------------------------------------------------------------*
  * ScaleShapedWB()
  *
@@ -5482,15 +5217,11 @@ void ScaleShapedWB_fx(
     const Word16 *win,       /* i    : window Q15*/
     const Word16 *subwin,    /* i    : subframes window Q15*/
     const Word16 Q_bwe_exc,
-    Word16 L_frame /* i : Frame length - determines whether 12.8 or 16kHz core in-use */
-    ,
-    Word16 dynQ /* i    : indicate whether output is dynamic Q, or Q0 */
-    ,
-    Word16 *Qx /* o    : newly computed Q factor for  synSHB   */
-    ,
-    Word16 prev_Qx /* i    : prev_Qx for memory scaling            */
-    ,
-    Word32 *Hilbert_Mem /* i    : Hilbert memory used for computing Qx  */
+    Word16 L_frame,     /* i : Frame length - determines whether 12.8 or 16kHz core in-use */
+    Word16 dynQ,        /* i : indicate whether output is dynamic Q, or Q0 */
+    Word16 *Qx,         /* o : newly computed Q factor for  synSHB   */
+    Word16 prev_Qx,     /* i : prev_Qx for memory scaling            */
+    Word32 *Hilbert_Mem /* i : Hilbert memory used for computing Qx  */
 )
 {
     const Word16 *skip;
@@ -5672,42 +5403,27 @@ void ScaleShapedWB_fx(
     FOR( i = 0; i < l_shb_lahead; i++ )
     {
         /* mod_syn in (16+Q_bwe_exc), frame_gain in Q18 */
-        L_tmp = Mult_32_32( mod_syn[i], frame_gain ); /* L_tmp in (Q_bwe_exc+3) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_32( mod_syn[i], frame_gain );                                /* L_tmp in (Q_bwe_exc+3) */
         synSHB[i] = round_fx_sat( L_shl_sat( Mult_32_16( L_tmp, win[i] ), shift ) ); /* Qx */
         move16();
         synSHB[i] = add_sat( synSHB[i], overlap[i] );
         move16();                                                             /* Qx */
         synSHB[i + l_shb_lahead] = round_fx_sat( L_shl_sat( L_tmp, shift ) ); /* Qx */
         move16();
-#else
-        synSHB[i] = round_fx( L_shl( Mult_32_16( L_tmp, win[i] ), shift ) ); /* Qx */
-        synSHB[i] = add( synSHB[i], overlap[i] );
-        move16();                                                                                                    /* Qx */
-        synSHB[i + l_shb_lahead] = round_fx( L_shl( L_tmp, shift ) );                                                /* Qx */
-#endif
     }
 
     FOR( ; i < l_frame; i++ )
     {
-        L_tmp = Mult_32_32( mod_syn[i], frame_gain ); /* L_tmp in (Q_bwe_exc+3) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_32( mod_syn[i], frame_gain );          /* L_tmp in (Q_bwe_exc+3) */
         synSHB[i] = round_fx_sat( L_shl_sat( L_tmp, shift ) ); /* Qx; */
-#else
-        synSHB[i] = round_fx( L_shl( L_tmp, shift ) );                                                               /* Qx; */
-#endif
         move16();
     }
 
     l_frame_tmp = add( l_frame, l_shb_lahead );
     FOR( ; i < l_frame_tmp; i++ )
     {
-        L_tmp = Mult_32_32( mod_syn[i], frame_gain ); /* (Q_bwe_exc+3) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_32( mod_syn[i], frame_gain );                                                                        /* (Q_bwe_exc+3) */
         overlap[i - l_frame] = round_fx_sat( L_shl_sat( Mult_32_16( L_tmp, win[l_frame + l_shb_lahead - 1 - i] ), shift ) ); /* Qx */
-#else
-        overlap[i - l_frame] = round_fx( L_shl( Mult_32_16( L_tmp, win[l_frame + l_shb_lahead - 1 - i] ), shift ) ); /* Qx */
-#endif
         move16();
     }
 
@@ -5737,12 +5453,8 @@ static Word32 non_linearity_scaled_copy(
     {
         FOR( i = 0; i < j; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_sat( input[i], input[i] ); /* 2*Q_inp+1 */
-#else
-            L_tmp = L_mult( input[i], input[i] );                                                                    /* 2*Q_inp+1 */
-#endif
-            L_tmp = Mult_32_32( L_tmp, prev_scale ); /* 2*Q_inp */
+            L_tmp = Mult_32_32( L_tmp, prev_scale );  /* 2*Q_inp */
             output[i] = L_tmp;
             move32();
 
@@ -5751,12 +5463,8 @@ static Word32 non_linearity_scaled_copy(
         }
         FOR( ; i < length; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_sat( input[i], input[i] ); /* 2*Q_inp+1 */
-#else
-            L_tmp = L_mult( input[i], input[i] );                                                                    /* 2*Q_inp+1 */
-#endif
-            L_tmp = Mult_32_32( L_tmp, prev_scale ); /* 2*Q_inp */
+            L_tmp = Mult_32_32( L_tmp, prev_scale );  /* 2*Q_inp */
             output[i] = L_tmp;
             move32();
         }
@@ -5765,12 +5473,8 @@ static Word32 non_linearity_scaled_copy(
     {
         FOR( i = 0; i < j; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_sat( input[i], input[i] ); /* 2*Q_inp+1 */
-#else
-            L_tmp = L_mult( input[i], input[i] );                                                                    /* 2*Q_inp+1 */
-#endif
-            L_tmp = Mult_32_32( L_tmp, prev_scale ); /* 2*Q_inp */
+            L_tmp = Mult_32_32( L_tmp, prev_scale );  /* 2*Q_inp */
 
             if ( input[i] < 0 )
             {
@@ -5785,11 +5489,7 @@ static Word32 non_linearity_scaled_copy(
 
         FOR( ; i < length; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_sat( input[i], input[i] ); /* 2*Q_inp+1 */
-#else                                                 /* BASOP_NOGLOB */
-            L_tmp = L_mult( input[i], input[i] );                                                                    /* 2*Q_inp+1 */
-#endif                                                /* BASOP_NOGLOB */
             L_tmp = Mult_32_32( L_tmp, prev_scale );  /* 2*Q_inp */
 
             if ( input[i] < 0 )
@@ -5891,11 +5591,7 @@ static Word32 non_linearity_scaled_copy_ivas(
 
         FOR( ; i < length; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_sat( input[i], input[i] ); /* 2*Q_inp+1 */
-#else                                                 /* BASOP_NOGLOB */
-            L_tmp = L_mult( input[i], input[i] );                                                                    /* 2*Q_inp+1 */
-#endif                                                /* BASOP_NOGLOB */
             L_tmp = Mult_32_32( L_tmp, prev_scale );  /* 2*Q_inp */
             test();
             test();
@@ -6072,20 +5768,12 @@ void non_linearity_fx(
             tmp = div_s( shl( 1, sub( 14, exp ) ), j ); /* Q(29-exp) */
 
             /* (log2(scale / prev_scale))/length */
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
-            L_tmp = L_shl( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) );                                               /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
 
             frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
 
             tmp = extract_l( Pow2( 14, frac ) );
-#ifdef BASOP_NOGLOB
             scale_step = shl_o( tmp, exp, &Overflow ); /* Q14 */
-#else
-            scale_step = shl( tmp, exp );                                                                            /* Q14 */
-#endif
         }
     }
 
@@ -6108,12 +5796,8 @@ void non_linearity_fx(
     IF( GT_16( max_val, shl( 1, Q_inp ) ) )
     {
         exp = norm_s( max_val );
-        tmp = div_s( shl( 1, sub( 14, exp ) ), max_val ); /* Q(29-exp-Q_inp) */
-#ifdef BASOP_NOGLOB
+        tmp = div_s( shl( 1, sub( 14, exp ) ), max_val );                                                   /* Q(29-exp-Q_inp) */
         scale = L_shl_o( L_mult( 21955 /* 0.67 in Q15 */, tmp ), add( exp, sub( Q_inp, 14 ) ), &Overflow ); /* Q31 */
-#else
-        scale = L_shl( L_mult( 21955, tmp ), add( exp, sub( Q_inp, 14 ) ) );                                         /* Q31 */
-#endif
     }
     ELSE
     {
@@ -6162,20 +5846,12 @@ void non_linearity_fx(
             tmp = div_s( shl( 1, sub( 14, exp ) ), tmp ); /* Q(29-exp) */
 
             /* (log2(scale / prev_scale))/length */
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
-            L_tmp = L_shl( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) );                                               /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
 
             frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
 
             tmp = extract_l( Pow2( 14, frac ) );
-#ifdef BASOP_NOGLOB
             scale_step = shl_o( tmp, exp, &Overflow ); /*Q14 */
-#else
-            scale_step = shl( tmp, exp );                                                                            /*Q14 */
-#endif
         }
     }
 
@@ -6344,20 +6020,12 @@ void non_linearity_ivas_fx(
             tmp = div_s( shl( 1, sub( 14, exp ) ), j ); /* Q(29-exp) */
 
             /* (log2(scale / prev_scale))/length */
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
-            L_tmp = L_shl( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) );                                               /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
 
             frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
 
             tmp = extract_l( Pow2( 14, frac ) );
-#ifdef BASOP_NOGLOB
             scale_step = shl_o( tmp, exp, &Overflow ); /* Q14 */
-#else
-            scale_step = shl( tmp, exp );                                                                            /* Q14 */
-#endif
         }
     }
 
@@ -6380,12 +6048,8 @@ void non_linearity_ivas_fx(
     IF( GT_16( max_val, shl( 1, Q_inp ) ) )
     {
         exp = norm_s( max_val );
-        tmp = div_s( shl( 1, sub( 14, exp ) ), max_val ); /* Q(29-exp-Q_inp) */
-#ifdef BASOP_NOGLOB
+        tmp = div_s( shl( 1, sub( 14, exp ) ), max_val );                                 /* Q(29-exp-Q_inp) */
         scale = L_shl_o( L_mult( 21955, tmp ), add( exp, sub( Q_inp, 14 ) ), &Overflow ); /* Q31 */
-#else
-        scale = L_shl( L_mult( 21955, tmp ), add( exp, sub( Q_inp, 14 ) ) );                                         /* Q31 */
-#endif
     }
     ELSE
     {
@@ -6434,20 +6098,12 @@ void non_linearity_ivas_fx(
             tmp = div_s( shl( 1, sub( 14, exp ) ), tmp ); /* Q(29-exp) */
 
             /* (log2(scale / prev_scale))/length */
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
-            L_tmp = L_shl( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) );                                               /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
 
             frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
 
             tmp = extract_l( Pow2( 14, frac ) );
-#ifdef BASOP_NOGLOB
             scale_step = shl_o( tmp, exp, &Overflow ); /*Q14 */
-#else
-            scale_step = shl( tmp, exp );                                                                            /*Q14 */
-#endif
         }
     }
 
@@ -6709,7 +6365,15 @@ void wb_tbe_extras_reset_synth_fx(
  *-------------------------------------------------------------------*/
 
 void elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+    const int16_t element_mode,
+#endif
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    Word16 IsUpsampled3,
+    Word16 input_fx[], /* i  : input signal                             Q_input_fx*/
+#else
     const Word16 input_fx[], /* i  : input signal                             Q_input_fx*/
+#endif
     Word16 *Q_input_fx,
     Word16 output_fx[],     /* o  : output signal                              memory_fx_Q */
     Word32 memory_fx2[][4], /* i/o: 4 arrays of 4 for memory                    */
@@ -6718,108 +6382,208 @@ void elliptic_bpf_48k_generic_fx(
 )
 {
     Word16 i, j;
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    Word16 memory_fx0, Q_temp, Q_temp2;
+    Word32 L_tmp_buffer[L_FRAME48k + 4], L_tmp2_buffer[L_FRAME48k + 4], L_output_buffer[L_FRAME48k + 4], L_tmpX;
+    Word32 L_tmpMax;
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+    Word64 W_tmpX;
+    Word64 W_tmpY;
+#endif
+
+    Word32 *L_tmp = &L_tmp_buffer[4];
+    Word32 *L_tmp2 = &L_tmp2_buffer[4];
+    Word32 *L_output = &L_output_buffer[4];
+#else
     Word16 memory_fx0[4][4], memory_fx[4][4], Q_temp, Q_temp2;
     Word32 L_tmp[L_FRAME48k], L_tmp2[L_FRAME48k], L_output[L_FRAME48k], L_tmpX, memory2_fx[4][4], L_tmpMax;
     Word32 memory2_fx_2[4], memory2_fx_3[4];
+#endif
 
     FOR( i = 0; i < 4; i++ )
     {
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+        memory_fx0 = extract_l( memory_fx2[0][i] );
+        input_fx[i - 4] = shl_sat( memory_fx0, sub( *Q_input_fx, memory_fx_Q[0] ) );
+        L_tmp[i - 4] = L_shl_sat( memory_fx2[1][i], sub( add( *Q_input_fx, 11 ), memory_fx_Q[1] ) );
+        L_tmp2[i - 4] = L_shl_sat( memory_fx2[2][i], sub( add( *Q_input_fx, 6 ), memory_fx_Q[2] ) );
+        // memory2_fx[3][i] = L_shl_sat( memory_fx2[3][i], sub( add( *Q_input_fx, 1 ), memory_fx_Q[3] ) );
+        move32();
+        move32();
+        move32();
+        move32();
+        move32();
+#else
         memory_fx0[0][i] = extract_l( memory_fx2[0][i] );
-#ifdef BASOP_NOGLOB
         memory_fx[0][i] = shl_sat( memory_fx0[0][i], sub( *Q_input_fx, memory_fx_Q[0] ) );
         memory2_fx[1][i] = L_shl_sat( memory_fx2[1][i], sub( add( *Q_input_fx, 11 ), memory_fx_Q[1] ) );
         memory2_fx[2][i] = L_shl_sat( memory_fx2[2][i], sub( add( *Q_input_fx, 6 ), memory_fx_Q[2] ) );
-        memory2_fx[3][i] = L_shl_sat( memory_fx2[3][i], sub( add( *Q_input_fx, 1 ), memory_fx_Q[3] ) );
         move32();
         move32();
         move32();
         move32();
         move32();
-#else
-        memory_fx[0][i] = shl( memory_fx0[0][i], sub( *Q_input_fx, memory_fx_Q[0] ) );
-        memory2_fx[1][i] = L_shl( memory_fx2[1][i], sub( add( *Q_input_fx, 11 ), memory_fx_Q[1] ) );
-        memory2_fx[2][i] = L_shl( memory_fx2[2][i], sub( add( *Q_input_fx, 6 ), memory_fx_Q[2] ) );
-        memory2_fx[3][i] = L_shl( memory_fx2[3][i], sub( add( *Q_input_fx, 1 ), memory_fx_Q[3] ) );
 #endif
     }
 
-    L_tmpX = L_shr( L_mult( memory_fx[0][0], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][1], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][1] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );     /*Q_input_fx + 13 + 1 - 3*/
-#ifdef BASOP_NOGLOB
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    L_tmpMax = L_add( 0, 0 );
+    IF( !IsUpsampled3 )
+    {
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+        IF( element_mode )
+        {
+            FOR( i = 0; i < L_FRAME48k; i++ )
+            {
+                /*duplicate this into unrolled loopsections in IsUpsampled3-path and dont forget to delete 0-set-input[1,2,4,5,7,8...]*/
+                W_tmpX = W_mac_16_16( 0, input_fx[i - 4], full_band_bpf_fx[0][4] );
+                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i - 3], full_band_bpf_fx[0][3] );
+                W_tmpY = W_msu_32_16( 0, L_tmp[i - 1], full_band_bpf_fx[3][1] );
+                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i - 2], full_band_bpf_fx[0][2] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 2], full_band_bpf_fx[3][2] );
+                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i - 1], full_band_bpf_fx[0][1] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );
+                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i], full_band_bpf_fx[0][0] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );
+                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/
+                move32();
+            }
+        }
+        ELSE
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+        {
+            FOR( i = 0; i < L_FRAME48k; i++ )
+            {
+                L_tmpX = L_shr( L_mult( input_fx[i - 4], full_band_bpf_fx[0][4] ), 3 );                             /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 1], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );            /*Q_input_fx + 13 + 1 - 3*/
+                L_tmp[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
+                move32();
+            }
+        }
+    } /*IsUpsampled3*/
+    ELSE
+    {
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+        IF( element_mode )
+        {
+            FOR( i = 0; i < L_FRAME48k; )
+            {
+                W_tmpX = W_mac_16_16( 0, input_fx[i - 3], full_band_bpf_fx[0][3] );
+                W_tmpY = W_msu_32_16( 0, L_tmp[i - 1], full_band_bpf_fx[3][1] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 2], full_band_bpf_fx[3][2] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );
+                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i], full_band_bpf_fx[0][0] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );
+                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/
+                move32();
+                i++;
+
+                W_tmpX = W_mac_16_16( 0, input_fx[i - 4], full_band_bpf_fx[0][4] );
+                W_tmpY = W_msu_32_16( 0, L_tmp[i - 1], full_band_bpf_fx[3][1] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 2], full_band_bpf_fx[3][2] );
+                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i - 1], full_band_bpf_fx[0][1] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );
+                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/
+                move32();
+                i++;
+
+                W_tmpY = W_msu_32_16( 0, L_tmp[i - 1], full_band_bpf_fx[3][1] );
+                W_tmpX = W_mac_16_16( 0, input_fx[i - 2], full_band_bpf_fx[0][2] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 2], full_band_bpf_fx[3][2] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );
+                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );
+                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/
+                move32();
+                i++;
+            }
+        }
+        ELSE
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+        {
+            FOR( i = 0; i < L_FRAME48k; )
+            {
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 3], full_band_bpf_fx[0][3] ), 3 ), 0 );             /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );            /*Q_input_fx + 13 + 1 - 3*/
+                L_tmp[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
+                move32();
+                i++;
+
+                L_tmpX = L_shr( L_mult( input_fx[i - 4], full_band_bpf_fx[0][4] ), 3 );                             /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 1], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmp[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
+                move32();
+                i++;
+
+                L_tmpX = L_sub_sat( 0, L_shl_sat( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );        /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
+                L_tmp[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
+                move32();
+                i++;
+            }
+        }
+
+    } /*IsUpsampled3*/
+
+#else  /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/
+    L_tmpX = L_shr( L_mult( memory_fx[0][0], full_band_bpf_fx[0][4] ), 3 );                                 /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][1], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );                /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );                /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );                /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmp[0] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][0], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
     move32();
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmp[0] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][0], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
-    move32();
-#endif
 
-    L_tmpX = L_shr( L_mult( memory_fx[0][1], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );     /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[1], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );     /*Q_input_fx + 13 + 1 - 3*/
-#ifdef BASOP_NOGLOB
+    L_tmpX = L_shr( L_mult( memory_fx[0][1], full_band_bpf_fx[0][4] ), 3 );                                 /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );                /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );                /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[1], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[0], full_band_bpf_fx[3][1] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmp[1] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
     move32();
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[0], full_band_bpf_fx[3][1] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmp[1] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
-    move32();
-#endif
 
-    L_tmpX = L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );     /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[1], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );     /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[2], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );     /*Q_input_fx + 13 + 1 - 3*/
-#ifdef BASOP_NOGLOB
+    L_tmpX = L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][4] ), 3 );                                 /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );                /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[1], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[2], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[1], full_band_bpf_fx[3][1] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[0], full_band_bpf_fx[3][2] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmp[2] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
     move32();
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[1], full_band_bpf_fx[3][1] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[0], full_band_bpf_fx[3][2] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmp[2] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
-    move32();
-#endif
-    L_tmpX = L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][4] ), 3 );              /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[1], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[2], full_band_bpf_fx[0][1] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-    L_tmpX = L_add( L_shr( L_mult( input_fx[3], full_band_bpf_fx[0][0] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
-#ifdef BASOP_NOGLOB
+    L_tmpX = L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][4] ), 3 );                                 /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[0], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[1], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[2], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
+    L_tmpX = L_add( L_shr( L_mult( input_fx[3], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 13 + 1 - 3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[2], full_band_bpf_fx[3][1] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[1], full_band_bpf_fx[3][2] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[0], full_band_bpf_fx[3][3] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
     L_tmp[3] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
     move32();
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[2], full_band_bpf_fx[3][1] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[1], full_band_bpf_fx[3][2] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[0], full_band_bpf_fx[3][3] ), 2 ) );           /*Q_input_fx + 11 + 13  -15 +2*/
-    L_tmp[3] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
-    move32();
-#endif
     FOR( i = 4; i < L_FRAME48k; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmpX = L_shr( L_mult( input_fx[i - 4], full_band_bpf_fx[0][4] ), 3 );                             /*Q_input_fx + 13 + 1 - 3*/
         L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
         L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
@@ -6830,19 +6594,8 @@ void elliptic_bpf_48k_generic_fx(
         L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );            /*Q_input_fx + 13 + 1 - 3*/
         L_tmp[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
         move32();
-#else
-        L_tmpX = L_shr( L_mult( input_fx [[i - 4]], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/
-        L_tmpX = L_add( L_shr( L_mult( input_fx[i - 3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX );    /*Q_input_fx + 13 + 1 - 3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-        L_tmpX = L_add( L_shr( L_mult( input_fx[i - 2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );    /*Q_input_fx + 13 + 1 - 3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[3][2] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-        L_tmpX = L_add( L_shr( L_mult( input_fx[i - 1], full_band_bpf_fx[0][1] ), 3 ), L_tmpX );    /*Q_input_fx + 13 + 1 - 3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
-        L_tmpX = L_add( L_shr( L_mult( input_fx[i], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );        /*Q_input_fx + 13 + 1 - 3*/
-        L_tmp[i] = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/
-        move32();
-#endif
     }
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/
 
     memory_fx2[0][0] = input_fx[L_FRAME48k - 4];
     memory_fx2[0][1] = input_fx[L_FRAME48k - 3];
@@ -6853,89 +6606,93 @@ void elliptic_bpf_48k_generic_fx(
     move32();
     move32();
     move32();
-    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][0], full_band_bpf_fx[1][4] ), 3 );                  /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[1][3] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[1][2] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][1] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-#ifdef BASOP_NOGLOB
+
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    L_tmpMax = L_add( 0, 0 );
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+    IF( element_mode )
+    {
+        FOR( i = 0; i < L_FRAME48k; i++ )
+        {
+            W_tmpX = W_mac_32_16( 0, L_tmp[i - 4], full_band_bpf_fx[1][4] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp[i - 3], full_band_bpf_fx[1][3] );
+            W_tmpY = W_msu_32_16( 0, L_tmp2[i - 1], full_band_bpf_fx[4][1] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp[i - 2], full_band_bpf_fx[1][2] );
+            W_tmpY = W_msu_32_16( W_tmpY, L_tmp2[i - 2], full_band_bpf_fx[4][2] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp[i - 1], full_band_bpf_fx[1][1] );
+            W_tmpY = W_msu_32_16( W_tmpY, L_tmp2[i - 3], full_band_bpf_fx[4][3] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp[i], full_band_bpf_fx[1][0] );
+            W_tmpY = W_msu_32_16( W_tmpY, L_tmp2[i - 4], full_band_bpf_fx[4][4] );
+            L_tmp2[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 + 16 ) ), 3 + 16 ) );
+            move32();
+            L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[i] ) );
+        }
+    }
+    ELSE
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+    {
+        FOR( i = 0; i < L_FRAME48k; i++ )
+        {
+            L_tmpX = L_shr( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[1][4] ), 3 );                              /*Q_input_fx + 11 + 13 - 15 -3*/
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
+            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[i - 1], full_band_bpf_fx[4][1] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
+            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[i - 2], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
+            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[i - 3], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp[i], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );             /*Q_input_fx + 11 + 13 - 15 -3*/
+            L_tmp2[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
+            move32();
+            L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[i] ) );
+        }
+    }
+#else /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/
+    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][0], full_band_bpf_fx[1][4] ), 3 );                             /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][1] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][1], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/
     L_tmp2[0] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][0], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2*/
     move32();
     L_tmpMax = L_abs( L_tmp2[0] );
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][1] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][1], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/
-    L_tmp2[0] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][0], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2*/
-    move32();
-    L_tmpMax = L_abs( L_tmp2[0] );
-#endif
-    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[1][4] ), 3 );                  /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[1][3] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][2] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-#ifdef BASOP_NOGLOB
+    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[1][4] ), 3 );                             /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][1] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
     L_tmp2[1] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][1], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
     move32();
     L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[1] ) );
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][1] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmp2[1] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][1], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
-    move32();
-    L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[1] ) );
-#endif
-    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[1][4] ), 3 );                  /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][3] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[2], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-#ifdef BASOP_NOGLOB
+    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][2], full_band_bpf_fx[1][4] ), 3 );                             /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[2], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[1], full_band_bpf_fx[4][1] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][2] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
     L_tmp2[2] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
     move32();
     L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[2] ) );
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[1], full_band_bpf_fx[4][1] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][2] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmp2[2] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
-    move32();
-    L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[2] ) );
-#endif
-    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][4] ), 3 );          /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][3] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][2] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[2], full_band_bpf_fx[1][1] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[3], full_band_bpf_fx[1][0] ), 3 ), L_tmpX ); /*Q_input_fx + 11 + 13 - 15 -3*/
-#ifdef BASOP_NOGLOB
+    L_tmpX = L_shr( Mult_32_16( memory2_fx[1][3], full_band_bpf_fx[1][4] ), 3 );                                                            /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );                                                   /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );                                                   /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[2], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );                                                   /*Q_input_fx + 11 + 13 - 15 -3*/
+    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[3], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                                                   /*Q_input_fx + 11 + 13 - 15 -3*/
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[2], full_band_bpf_fx[4][1] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[1], full_band_bpf_fx[4][2] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */
     L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][3] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */
     L_tmp2[3] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */ /*14 + Q_input_fx - shift_flag*/
     move32();
     L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[3] ) );
-#else
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[2], full_band_bpf_fx[4][1] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[1], full_band_bpf_fx[4][2] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][3] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */
-    L_tmp2[3] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */ /*14 + Q_input_fx - shift_flag*/
-    move32();
-    L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[3] ) );
-#endif
     FOR( i = 4; i < L_FRAME48k; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmpX = L_shr( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[1][4] ), 3 );                              /*Q_input_fx + 11 + 13 - 15 -3*/
         L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
         L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[i - 1], full_band_bpf_fx[4][1] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
@@ -6946,20 +6703,10 @@ void elliptic_bpf_48k_generic_fx(
         L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp[i], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );             /*Q_input_fx + 11 + 13 - 15 -3*/
         L_tmp2[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
         move32();
-#else
-        L_tmpX = L_shr( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[1][4] ), 3 );                      /*Q_input_fx + 11 + 13 - 15 -3*/
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[i - 3], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );     /*Q_input_fx + 11 + 13 - 15 -3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[i - 1], full_band_bpf_fx[4][1] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[i - 2], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );     /*Q_input_fx + 11 + 13 - 15 -3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[i - 2], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );     /*Q_input_fx + 11 + 13 - 15 -3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[i - 3], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[i], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );         /*Q_input_fx + 11 + 13 - 15 -3*/
-        L_tmp2[i] = L_sub( L_tmpX, L_shl( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */
-        move32();
-#endif
         L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[i] ) );
     }
+#endif
+
 
     Q_temp = norm_l( L_tmpMax );
     Q_temp = sub( Q_temp, 4 );
@@ -6974,20 +6721,69 @@ void elliptic_bpf_48k_generic_fx(
     move32();
     move32();
     move32();
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    FOR( j = 0; j < 4; j++ )
+    {
+        L_tmp2[j - 4] = L_shl_sat( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );
+        L_output[j - 4] = L_shl_sat( memory_fx2[3][j], sub( add( add( *Q_input_fx, 1 ), Q_temp ), memory_fx_Q[3] ) );
+        move32();
+        move32();
+        move32();
+    }
+#else
     FOR( j = 0; j < 4; j++ )
     {
-#ifdef BASOP_NOGLOB
         memory2_fx_2[j] = L_shl_sat( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );
         memory2_fx_3[j] = L_shl_sat( memory_fx2[3][j], sub( add( add( *Q_input_fx, 1 ), Q_temp ), memory_fx_Q[3] ) );
-#else
-        memory2_fx_2[j] = L_shl( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );
-        memory2_fx_3[j] = L_shl( memory_fx2[3][j], sub( add( add( *Q_input_fx, 1 ), Q_temp ), memory_fx_Q[3] ) );
-#endif
         move32();
         move32();
         move32();
     }
-#ifdef BASOP_NOGLOB
+#endif
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    L_tmpMax = L_add( 0, 0 );
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+    IF( element_mode )
+    {
+        FOR( i = 0; i < L_FRAME48k; i++ )
+        {
+            W_tmpX = W_mac_32_16( 0, L_tmp2[i - 4], full_band_bpf_fx[2][4] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp2[i - 3], full_band_bpf_fx[2][3] );
+            W_tmpY = W_msu_32_16( 0, L_output[i - 1], full_band_bpf_fx[5][1] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp2[i - 2], full_band_bpf_fx[2][2] );
+            W_tmpY = W_msu_32_16( W_tmpY, L_output[i - 2], full_band_bpf_fx[5][2] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp2[i - 1], full_band_bpf_fx[2][1] );
+            W_tmpY = W_msu_32_16( W_tmpY, L_output[i - 3], full_band_bpf_fx[5][3] );
+            W_tmpX = W_mac_32_16( W_tmpX, L_tmp2[i], full_band_bpf_fx[2][0] );
+            W_tmpY = W_msu_32_16( W_tmpY, L_output[i - 4], full_band_bpf_fx[5][4] );
+            L_output[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 + 16 ) ), 3 + 16 ) );
+            move32();
+            L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );
+        }
+    }
+    ELSE
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+    {
+        FOR( i = 0; i < L_FRAME48k; i++ )
+        {
+            L_tmpX = L_shr( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[2][4] ), 3 );                            /*Q_input_fx + 6 +Q_temp+13 -15 -3 */
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[i - 3], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );       /*Q_input_fx + 6 +Q_temp +13 -15 -3*/
+            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[i - 1], full_band_bpf_fx[5][1] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
+
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[i - 2], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );       /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
+            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[i - 2], full_band_bpf_fx[5][2] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
+
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[i - 1], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );       /*Q_input_fx + 6 +Q_temp +13 -15 -3*/
+            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[i - 3], full_band_bpf_fx[5][3] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
+
+            L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[i], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp +13 -15 -3*/
+            L_output[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[i - 4], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
+            move32();
+            L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );
+        }
+    }
+
+#else /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/
     L_tmpX = L_shr( Mult_32_16( memory2_fx_2[0], full_band_bpf_fx[2][4] ), 3 );                               /* *Q_input_fx+6 +Q_temp +13 -15 -3 */
     L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[1], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );          /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
     L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );          /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
@@ -7053,73 +6849,8 @@ void elliptic_bpf_48k_generic_fx(
         move32();
         L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );
     }
-#else
-    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[0], full_band_bpf_fx[2][4] ), 3 );                       /* *Q_input_fx+6 +Q_temp +13 -15 -3 */
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx_2[1], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );      /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );      /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );      /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[3], full_band_bpf_fx[5][1] ), 2 ) );      /*Q_input_fx + 1 +Q_temp+13 -15 + 2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[2], full_band_bpf_fx[5][2] ), 2 ) );      /*Q_input_fx + 1 +Q_temp+13 -15 + 2 */
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[1], full_band_bpf_fx[5][3] ), 2 ) );      /*Q_input_fx + 1 +Q_temp+13 -15 + 2 */
-    L_output[0] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[0], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2 */
-    move32();
-    L_tmpMax = L_abs( L_output[0] );
-
-    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[1], full_band_bpf_fx[2][4] ), 3 );                       /*Q_input_fx + 6 +Q_temp +13 -15 -3 */
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );      /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );      /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );            /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );            /*Q_input_fx+Q_temp + 6 +13 -15 -3*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[0], full_band_bpf_fx[5][1] ), 2 ) );          /*Q_input_fx + 1 +13 -15 + 2+Q_temp*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[3], full_band_bpf_fx[5][2] ), 2 ) );      /*Q_input_fx + 1 +13 -15 + 2+Q_temp*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[2], full_band_bpf_fx[5][3] ), 2 ) );      /*Q_input_fx + 1 +13 -15 + 2+Q_temp*/
-    L_output[1] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[1], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +13 -15 + 2+Q_temp*/
-    move32();
-    L_tmpMax = L_max( L_tmpMax, L_abs( L_output[1] ) );
-
-    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][4] ), 3 );                       /*Q_input_fx + 6 +Q_temp+13 -15 -3 */
-    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );      /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );            /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );            /*Q_input_fx +Q_temp + 6 +13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[2], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );            /*Q_input_fx +Q_temp + 6 +13 -15 -3*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[1], full_band_bpf_fx[5][1] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[0], full_band_bpf_fx[5][2] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[3], full_band_bpf_fx[5][3] ), 2 ) );      /*Q_input_fx + 1+Q_temp +13 -15 + 2*/
-    L_output[2] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[2], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    move32();
-    L_tmpMax = L_max( L_tmpMax, L_abs( L_output[2] ) );
-
-    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][4] ), 3 );                       /*Q_input_fx + 6 +Q_temp +13 -15 -3 */
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[2], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[3], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[2], full_band_bpf_fx[5][1] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[1], full_band_bpf_fx[5][2] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[0], full_band_bpf_fx[5][3] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    L_output[3] = L_sub( L_tmpX, L_shl( Mult_32_16( memory2_fx_3[3], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-    move32();
-    L_tmpMax = L_max( L_tmpMax, L_abs( L_output[3] ) );
-
-    FOR( i = 4; i < L_FRAME48k; i++ )
-    {
-        L_tmpX = L_shr( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[2][4] ), 3 );                    /*Q_input_fx + 6 +Q_temp+13 -15 -3 */
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[i - 3], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );   /*Q_input_fx + 6 +Q_temp +13 -15 -3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[i - 1], full_band_bpf_fx[5][1] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[i - 2], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );   /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[i - 2], full_band_bpf_fx[5][2] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[i - 1], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );   /*Q_input_fx + 6 +Q_temp +13 -15 -3*/
-        L_tmpX = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[i - 3], full_band_bpf_fx[5][3] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-
-        L_tmpX = L_add( L_shr( Mult_32_16( L_tmp2[i], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp +13 -15 -3*/
-        L_output[i] = L_sub( L_tmpX, L_shl( Mult_32_16( L_output[i - 4], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/
-        move32();
-        L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );
-    }
 #endif
+
     memory_fx2[2][0] = L_tmp2[L_FRAME48k - 4];
     memory_fx2[2][1] = L_tmp2[L_FRAME48k - 3];
     memory_fx2[2][2] = L_tmp2[L_FRAME48k - 2];
@@ -7183,10 +6914,20 @@ void synthesise_fb_high_band_fx(
     Word16 *prev_fbbwe_ratio,   /* o  : previous frame energy for FEC                       */
     Word32 bpf_memory[][4],     /* i/o: memory for elliptic bpf 48k                         */
     Word16 bpf_memory_Q[],
-    Word16 Qout )
+    Word16 Qout
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+    ,
+    int16_t element_mode
+#endif
+)
 {
     Word16 i, j;
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    Word16 excitation_in_interp3_buffer[L_FRAME48k + 4];
+    Word16 *excitation_in_interp3 = &excitation_in_interp3_buffer[0] + 4;
+#else
     Word16 excitation_in_interp3[L_FRAME48k];
+#endif
     Word16 tmp[L_FRAME48k];
     Word32 temp1;
     Word32 ratio2;
@@ -7211,12 +6952,32 @@ void synthesise_fb_high_band_fx(
     IF( EQ_16( L_frame, L_FRAME16k ) )
     {
         /* for 16kHz ACELP core */
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+        elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+            element_mode,
+#endif
+            1, // IsUpsampled3
+            excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_3_fx
+
+        );
+#else
         elliptic_bpf_48k_generic_fx( excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_3_fx );
+#endif
     }
     ELSE
     {
         /* for 12.8kHz ACELP core */
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+        elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+            element_mode,
+#endif
+            1, // IsUpsampled3
+            excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_1_fx );
+#else
         elliptic_bpf_48k_generic_fx( excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_1_fx );
+#endif
     }
     temp1 = sum2_fx_mod( tmp, L_FRAME48k );
 
@@ -7265,21 +7026,13 @@ void synthesise_fb_high_band_fx(
         L_tmp = Mult_32_16( ratio2, tmp[i] ); /* Q(16-exp+exp_tmp-15 = 1-exp+exp_tmp) */
         IF( L_tmp < 0 )
         {
-#ifdef BASOP_NOGLOB
             output[i] = negate( extract_h( L_shl_sat( L_negate( L_tmp ), tmp3 ) ) ); /*Qout*/
             move16();
-#else
-            output[i] = negate( extract_h( L_shl( L_negate( L_tmp ), tmp3 ) ) ); /*Qout*/
-#endif
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             output[i] = extract_h( L_shl_sat( L_tmp, tmp3 ) ); /*Qout*/
             move16();
-#else
-            output[i] = extract_h( L_shl( L_tmp, tmp3 ) );                       /*Qout*/
-#endif
         }
     }
     return;
@@ -7348,20 +7101,12 @@ void Estimate_mix_factors_fx(
         shb_res_local[i] = round_fx( L_tmp2 );
         move16();
         /* temp_numer1[i] = sub(shb_res_local[i], WN_exc_local[i]); */
-#ifdef BASOP_NOGLOB
         temp_numer1[i] = round_fx_sat( L_sub_sat( L_shl_sat( L_tmp2, sc2 ), L_shl_sat( L_tmp1, sc1 ) ) );
-#else
-        temp_numer1[i] = round_fx( L_sub( L_shl( L_tmp2, sc2 ), L_shl( L_tmp1, sc1 ) ) );
-#endif
         move16();
         /* (Q_bwe_exc) */
 
         /* temp_numer2[i] = sub(exc16kWhtnd[i], WN_exc_local[i]); */
-#ifdef BASOP_NOGLOB
         temp_numer2[i] = sub_sat( exc16kWhtnd[i], round_fx_sat( L_shl_sat( L_tmp1, sc1 ) ) );
-#else
-        temp_numer2[i] = sub( exc16kWhtnd[i], round_fx( L_shl( L_tmp1, sc1 ) ) );
-#endif
         move16();
         /* (Q_bwe_exc) */
     }
@@ -7381,11 +7126,7 @@ void Estimate_mix_factors_fx(
         expa = sub( 30, expa );
 
         expb = norm_l( temp_p1_p2 );
-#ifdef BASOP_NOGLOB
         fracb = round_fx_o( L_shl_o( temp_p1_p2, expb, &Overflow ), &Overflow );
-#else
-        fracb = round_fx( L_shl( temp_p1_p2, expb ) );
-#endif
         expb = sub( 30, expb );
 
         num_flag = 0;
@@ -7412,11 +7153,7 @@ void Estimate_mix_factors_fx(
 
         tmp = div_s( fracb, fraca );
         exp1 = sub( expb, expa );
-#ifdef BASOP_NOGLOB
         tmp = shl_sat( tmp, exp1 );
-#else
-        tmp = shl( tmp, exp1 );
-#endif
         if ( NE_16( num_flag, den_flag ) )
         {
             tmp = negate( tmp );
@@ -7449,56 +7186,7 @@ void Estimate_mix_factors_fx(
 
     return;
 }
-#ifdef ADD_IVAS_TBE_CODE
-/*-------------------------------------------------------------------*
- * tbe_celp_exc()                                                    *
- *                                                                   *
- * Prepare adaptive part of TBE excitation                           *
- *-------------------------------------------------------------------*/
-
-void tbe_celp_exc(
-    const int16_t element_mode, /* i  : element mode            */
-    const int16_t idchan,       /* i  : channel ID              */
-    float *bwe_exc,             /* i/o: BWE excitation          */
-    const int16_t L_frame,      /* i  : frame length            */
-    const int16_t L_subfr,      /* i  : subframe length         */
-    const int16_t i_subfr,      /* i  : subframe index          */
-    const int16_t T0,           /* i  : integer pitch lag       */
-    const int16_t T0_frac,      /* i  : fraction of lag         */
-    float *error,               /* i/o: error                   */
-    const int16_t tdm_LRTD_flag /* i  : LRTD stereo mode flag   */
-)
-{
-    int16_t i, offset;
-
-    if ( element_mode == IVAS_CPE_TD && idchan == 1 && !tdm_LRTD_flag )
-    {
-        return;
-    }
-
-    if ( L_frame == L_FRAME )
-    {
-        offset = tbe_celp_exc_offset( T0, T0_frac );
-
-        for ( i = 0; i < L_subfr * HIBND_ACB_L_FAC; i++ )
-        {
-            bwe_exc[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc[i + i_subfr * HIBND_ACB_L_FAC - offset + (int16_t) *error];
-        }
-        *error += (float) offset - (float) T0 * HIBND_ACB_L_FAC - 0.25f * HIBND_ACB_L_FAC * (float) T0_frac;
-    }
-    else
-    {
-        offset = T0 * 2 + (int16_t) ( (float) T0_frac * 0.5f + 4 + 0.5f ) - 4;
-        for ( i = 0; i < L_subfr * 2; i++ )
-        {
-            bwe_exc[i + i_subfr * 2] = bwe_exc[i + i_subfr * 2 - offset + (int16_t) *error];
-        }
-        *error += (float) offset - (float) T0 * 2 - 0.5f * (float) T0_frac;
-    }
 
-    return;
-}
-#endif
 /*======================================================================================*/
 /* FUNCTION : prep_tbe_exc_fx() */
 /*--------------------------------------------------------------------------------------*/
@@ -7520,7 +7208,6 @@ void tbe_celp_exc(
 /* INPUT/OUTPUT ARGUMENTS : */
 /* _ (Word16[]) bwe_exc_fx : excitation for TBE (Q_exc) */
 /*--------------------------------------------------------------------------------------*/
-
 /* _ None */
 /*--------------------------------------------------------------------------------------*/
 /* RETURN ARGUMENTS : */
@@ -7528,236 +7215,27 @@ void tbe_celp_exc(
 /*======================================================================================*/
 
 void prep_tbe_exc_fx(
-    const Word16 L_frame_fx, /* i : length of the frame */
-#ifdef ADD_IVAS_TBE_CODE
-    const Word16 L_subfr,
-#endif
-    const Word16 i_subfr_fx,     /* i : subframe index */
-    const Word16 gain_pit_fx,    /* i : Pitch gain Q14*/
-    const Word32 gain_code_fx,   /* i : algebraic codebook gain 16+Q_exc*/
-    const Word16 code_fx[],      /* i : algebraic excitation Q9*/
-    const Word16 voice_fac_fx,   /* i : voicing factor Q15*/
-    Word16 *voice_factors_fx,    /* o : TBE voicing factor Q15*/
-    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE Q_exc*/
-    const Word16 gain_preQ_fx,   /* i : prequantizer excitation gain */
-    const Word16 code_preQ_fx[], /* i : prequantizer excitation */
-    const Word16 Q_exc,          /* i : Excitation, bwe_exc Q-factor */
-    Word16 T0,                   /* i : integer pitch variables Q0 */
-    Word16 T0_frac,              /* i : Fractional pitch variables Q0*/
-    const Word16 coder_type,     /* i : coding type */
-    Word32 core_brate
-#ifdef ADD_IVAS_TBE_CODE
-    ,                           /* i  : core bitrate                */
-    const int16_t element_mode, /* i  : element mode                */
-    const int16_t idchan,       /* i  : channel ID                  */
-    const int16_t flag_TD_BWE,  /* i  : flag indicating whether hTD_BWE exists  */
-    const int16_t tdm_LRTD_flag /* i  : LRTD stereo mode flag       */
-#endif
-)
-{
-    Word16 i;
-    Word16 tmp_code_fx[2 * L_SUBFR * HIBND_ACB_L_FAC];
-    Word16 tmp_code_preInt_fx[L_SUBFR];
-    Word16 gain_code16 = 0;
-    move16();
-    Word16 tmp /*, tmp1, tmp2*/;
-    /*Word16 random_code[L_SUBFR * HIBND_ACB_L_FAC];*/
-    Word16 pitch;
-
-    Word32 L_tmp, Ltemp1, Ltemp2;
-    Word32 tempQ31;
-    Word16 tempQ15;
-#ifndef ADD_IVAS_TBE_CODE
-    Word16 L_subfr = L_SUBFR;
-    move16();
-#endif
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-    /**voice_factors = VF_0th_PARAM + VF_1st_PARAM * voice_fac + VF_2nd_PARAM * voice_fac * voice_fac;
-                     = VF_0th_PARAM + voice_fac * (VF_1st_PARAM  + VF_2nd_PARAM * voice_fac )
-    *voice_factors = min( max_val(0.0f, *voice_factors), 1.0f); */
-    tempQ31 = L_deposit_h( VF_1st_PARAM_FX );
-    tempQ15 = mac_r( tempQ31, VF_2nd_PARAM_FX, voice_fac_fx );
-    tempQ31 = L_deposit_h( VF_0th_PARAM_FX );
-    *voice_factors_fx = mac_r( tempQ31, voice_fac_fx, tempQ15 );
-    move16();
-    tmp = MAX_16;
-    move16();
-
-#ifdef BASOP_NOGLOB
-    pitch = shl_o( add( shl_o( T0, 2, &Overflow ), T0_frac ), 5, &Overflow ); /* Q7 */
-#else                                                                         /* BASOP_NOGLOB */
-    pitch = shl( add( shl( T0, 2 ), T0_frac ), 5 );                                            /* Q7 */
-#endif                                                                        /* BASOP_NOGLOB */
-
-    test();
-    test();
-    IF( ( ( EQ_16( coder_type, VOICED ) ) || ( GT_16( pitch, 14784 /* 115.5 in Q7 */ ) ) ) && ( GT_32( core_brate, ACELP_8k00 ) ) )
-    {
-        tmp = MAX_16;
-        move16();
-        *voice_factors_fx = mult_r( *voice_factors_fx, tmp );
-        move16();
-    }
-
-    *voice_factors_fx = s_min( s_max( *voice_factors_fx, 0 ), MAX_16 );
-    move16();
-#ifdef ADD_IVAS_TBE_CODE
-    IF( EQ_16( element_mode, IVAS_CPE_TD ) && EQ_16( idchan, 1 ) && !tdm_LRTD_flag )
-    {
-        IF( flag_TD_BWE && i_subfr == 0 )
-        {
-            set16_fx( bwe_exc, 0, L_FRAME32k );
-        }
-        return;
-    }
-
-#endif
-    IF( EQ_16( L_frame_fx, L_FRAME ) )
-    {
-        interp_code_5over2_fx( code_fx, tmp_code_fx, L_subfr ); /* code: Q9, tmp_code: Q9 */
-#ifdef BASOP_NOGLOB
-        gain_code16 = round_fx_o( L_shl_o( gain_code_fx, Q_exc, &Overflow ), &Overflow ); /*Q_exc */
-#else
-        gain_code16 = round_fx( L_shl( gain_code_fx, Q_exc ) );                                /*Q_exc */
-#endif
-        FOR( i = 0; i < L_subfr * HIBND_ACB_L_FAC; i++ )
-        {
-            L_tmp = L_mult( gain_code16, tmp_code_fx[i] ); /* Q9 + Q_exc + 1*/
-#ifdef BASOP_NOGLOB
-            L_tmp = L_shl_sat( L_tmp, 5 );                                                         /* Q9 + Q_exc + Q6*/
-            L_tmp = L_mac_sat( L_tmp, gain_pit_fx, bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] ); /*Q15+Q_exc */
-#else
-            L_tmp = L_shl( L_tmp, 5 );                                                         /* Q9 + Q_exc + Q6*/
-            L_tmp = L_mac( L_tmp, gain_pit_fx, bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] ); /*Q15+Q_exc */
-#endif
-#ifdef BASOP_NOGLOB
-            L_tmp = L_shl_o( L_tmp, 1, &Overflow ); /*16+Q_exc */                          /* saturation can occur here */
-            bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] = round_fx_o( L_tmp, &Overflow ); /*Q_exc */
-#else                                                                                      /* BASOP_NOGLOB */
-            L_tmp = L_shl( L_tmp, 1 ); /*16+Q_exc */                                           /* saturation can occur here */
-            bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] = round_fx( L_tmp );                  /*Q_exc */
-#endif                                                                                     /* BASOP_NOGLOB */
-            move16();
-        }
-    }
-    ELSE
-    {
-        IF( gain_preQ_fx != 0 )
-        {
-            FOR( i = 0; i < L_subfr; i++ )
-            {
-                /*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */
-                Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] );  /* Q16 + Q9 + 1 - 16 = Q10 */
-                Ltemp2 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /*Q2 * Q10 -> Q12  */
-
-#ifdef BASOP_NOGLOB
-                Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */
-                Ltemp2 = L_shl_o( Ltemp2, add( Q_exc, 4 ) /*Q_exc+16-13*/, &Overflow ); /*Q_exc+16 */
-
-                tmp_code_preInt_fx[i] = round_fx_o( L_add_o( Ltemp1, Ltemp2, &Overflow ), &Overflow ); /* Q_exc  */
-                move16();
-#else  /* BASOP_NOGLOB */
-                Ltemp1 = L_shl( Ltemp1, Q_exc + 6 /*Q_exc+16-19*/ );                           /*Q_exc+16 */
-                Ltemp2 = L_shl( Ltemp2, Q_exc + 4 /*Q_exc+16-13*/ );                           /*Q_exc+16 */
-
-                tmp_code_preInt_fx[i] = round_fx( L_add( Ltemp1, Ltemp2 ) );  /* Q_exc  */
-#endif /* BASOP_NOGLOB */
-            }
-        }
-        ELSE
-        {
-            FOR( i = 0; i < L_subfr; i++ )
-            {
-                /*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */
-                Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */
-#ifdef BASOP_NOGLOB
-                Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */
-                tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow );                /* Q_exc  */
-                move16();
-#else
-                Ltemp1 = L_shl( Ltemp1, Q_exc + 6 /*Q_exc+16-19*/ );          /*Q_exc+16 */
-                tmp_code_preInt_fx[i] = round_fx( Ltemp1 );                   /* Q_exc  */
-#endif
-            }
-        }
-
-        interp_code_4over2_fx( tmp_code_preInt_fx, tmp_code_fx, L_subfr ); /* o: tmp_code in Q_exc */
-        FOR( i = 0; i < L_subfr * 2; i++ )
-        {
-            L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + i_subfr_fx * 2] ); /*Q14+Q_exc+1 */
-#ifdef BASOP_NOGLOB
-            tmp = round_fx_o( L_shl_o( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/, &Overflow ), &Overflow ); /* tmp in Q_exc */
-            bwe_exc_fx[i + i_subfr_fx * 2] = add_o( tmp, tmp_code_fx[i], &Overflow );                   /*Q_exc */
-            move16();
-#else /* BASOP_NOGLOB */
-            tmp = round_fx( L_shl( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/ ) ); /* tmp in Q_exc */
-            bwe_exc_fx[i + i_subfr_fx * 2] = add( tmp, tmp_code_fx[i] );      /*Q_exc */
-            move16();
-#endif
-        }
-    }
-
-    return;
-}
-
-/*======================================================================================*/
-/* FUNCTION : prep_tbe_exc_ivas_fx() */
-/*--------------------------------------------------------------------------------------*/
-/* PURPOSE : Prepare TBE excitation */
-/*--------------------------------------------------------------------------------------*/
-/* INPUT ARGUMENTS : */
-/* _ (Word16) L_frame_fx : length of the frame */
-/* _ (Word16) i_subfr_fx : subframe index */
-/* _ (Word16) gain_pit_fx : Pitch gain (14) */
-/* _ (Word32) gain_code_fx : algebraic codebook gain (Q(16+Q_exc)) */
-/* _ (Word16*[]) code_fx : algebraic excitation (Q9) */
-/* _ (Word16) voice_fac_fx : voicing factor (Q15) */
-/* _ (Word16) gain_preQ_fx : prequantizer excitation gain */
-/* _ (Word16[]) code_preQ_fx : prequantizer excitation */
-/*--------------------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS : */
-/* _ (Word16*[]) voice_factors_fx : TBE voicing factor (Q15) */
-/*--------------------------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS : */
-/* _ (Word16[]) bwe_exc_fx : excitation for TBE (Q_exc) */
-/*--------------------------------------------------------------------------------------*/
-
-/* _ None */
-/*--------------------------------------------------------------------------------------*/
-/* RETURN ARGUMENTS : */
-/* _ None */
-/*======================================================================================*/
+    const Word16 L_frame_fx,     /* i  : length of the frame                    */
+    const Word16 L_subfr,        /* i  : subframe length                        */
+    const Word16 i_subfr_fx,     /* i  : subframe index                         */
+    const Word16 gain_pit_fx,    /* i  : Pitch gain                          Q14*/
+    const Word32 gain_code_fx,   /* i  : algebraic codebook gain        16+Q_exc*/
+    const Word16 code_fx[],      /* i  : algebraic excitation                 Q9*/
+    const Word16 voice_fac_fx,   /* i  : voicing factor                      Q15*/
+    Word16 *voice_factors_fx,    /* o  : TBE voicing factor                  Q15*/
+    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE                Q_exc*/
+    const Word16 gain_preQ_fx,   /* i  : prequantizer excitation gain           */
+    const Word16 code_preQ_fx[], /* i  : prequantizer excitation                */
+    const Word16 Q_exc,          /* i  : Excitation,           bwe_exc Q-factor */
+    const Word16 T0,             /* i  : integer pitch variables             Q0 */
+    const Word16 T0_frac,        /* i  : Fractional pitch variables           Q0*/
+    const Word16 coder_type,     /* i  : coding type                            */
+    const Word32 core_brate,     /* i  : core bitrate                           */
+    const Word16 element_mode,   /* i  : element mode                           */
+    const Word16 idchan,         /* i  : channel ID                             */
+    const Word16 flag_TD_BWE,    /* i  : flag indicating whether hTD_BWE exists */
+    const Word16 tdm_LRTD_flag   /* i  : LRTD stereo mode flag                  */
 
-void prep_tbe_exc_ivas_fx(
-    const Word16 L_frame_fx, /* i : length of the frame */
-#if 1                        // def ADD_IVAS_TBE_CODE
-    const Word16 L_subfr,
-#endif
-    const Word16 i_subfr_fx,     /* i : subframe index */
-    const Word16 gain_pit_fx,    /* i : Pitch gain Q14*/
-    const Word32 gain_code_fx,   /* i : algebraic codebook gain 16+Q_exc*/
-    const Word16 code_fx[],      /* i : algebraic excitation Q9*/
-    const Word16 voice_fac_fx,   /* i : voicing factor Q15*/
-    Word16 *voice_factors_fx,    /* o : TBE voicing factor Q15*/
-    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE Q_exc*/
-    const Word16 gain_preQ_fx,   /* i : prequantizer excitation gain */
-    const Word16 code_preQ_fx[], /* i : prequantizer excitation */
-    const Word16 Q_exc,          /* i : Excitation, bwe_exc Q-factor */
-    Word16 T0,                   /* i : integer pitch variables Q0 */
-    Word16 T0_frac,              /* i : Fractional pitch variables Q0*/
-    const Word16 coder_type,     /* i : coding type */
-    Word32 core_brate
-#if 1                          // def ADD_IVAS_TBE_CODE
-    ,                          /* i  : core bitrate                */
-    const Word16 element_mode, /* i  : element mode                */
-    const Word16 idchan,       /* i  : channel ID                  */
-    const Word16 flag_TD_BWE,  /* i  : flag indicating whether hTD_BWE exists  */
-    const Word16 tdm_LRTD_flag /* i  : LRTD stereo mode flag       */
-#endif
 )
 {
     Word16 i;
@@ -7789,11 +7267,7 @@ void prep_tbe_exc_ivas_fx(
     tmp = MAX_16;
     move16();
 
-#ifdef BASOP_NOGLOB
     pitch = shl_o( add( shl_o( T0, 2, &Overflow ), T0_frac ), 5, &Overflow ); /* Q7 */
-#else                                                                         /* BASOP_NOGLOB */
-    pitch = shl( add( shl( T0, 2 ), T0_frac ), 5 );                                            /* Q7 */
-#endif                                                                        /* BASOP_NOGLOB */
 
     test();
     test();
@@ -7807,7 +7281,7 @@ void prep_tbe_exc_ivas_fx(
 
     *voice_factors_fx = s_min( s_max( *voice_factors_fx, 0 ), MAX_16 );
     move16();
-#if 1 // def ADD_IVAS_TBE_CODE
+
     test();
     test();
     IF( EQ_16( element_mode, IVAS_CPE_TD ) && EQ_16( idchan, 1 ) && !tdm_LRTD_flag )
@@ -7820,28 +7294,17 @@ void prep_tbe_exc_ivas_fx(
         return;
     }
 
-#endif
     IF( EQ_16( L_frame_fx, L_FRAME ) )
     {
-        interp_code_5over2_fx( code_fx, tmp_code_fx, L_subfr ); /* code: Q9, tmp_code: Q9 */
-#ifdef BASOP_NOGLOB
+        interp_code_5over2_fx( code_fx, tmp_code_fx, L_subfr );                           /* code: Q9, tmp_code: Q9 */
         gain_code16 = round_fx_o( L_shl_o( gain_code_fx, Q_exc, &Overflow ), &Overflow ); /*Q_exc */
-#else
-        gain_code16 = round_fx( L_shl( gain_code_fx, Q_exc ) );                                /*Q_exc */
-#endif
         FOR( i = 0; i < L_subfr * HIBND_ACB_L_FAC; i++ )
         {
-            L_tmp = L_mult( gain_code16, tmp_code_fx[i] ); /* Q9 + Q_exc + 1*/
-            L_tmp = L_shl( L_tmp, 5 );                     /* Q9 + Q_exc + Q6*/
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( gain_code16, tmp_code_fx[i] );                                                  /* Q9 + Q_exc + 1*/
+            L_tmp = L_shl( L_tmp, 5 );                                                                      /* Q9 + Q_exc + Q6*/
             L_tmp = L_mac_o( L_tmp, gain_pit_fx, bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC], &Overflow ); /*Q15+Q_exc */
             L_tmp = L_shl_o( L_tmp, 1, &Overflow ); /*16+Q_exc */                                           /* saturation can occur here */
             bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] = round_fx_o( L_tmp, &Overflow );                  /*Q_exc */
-#else                                                                                                       /* BASOP_NOGLOB */
-            L_tmp = L_mac( L_tmp, gain_pit_fx, bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] ); /*Q15+Q_exc */
-            L_tmp = L_shl( L_tmp, 1 ); /*16+Q_exc */                                           /* saturation can occur here */
-            bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] = round_fx( L_tmp );                  /*Q_exc */
-#endif                                                                                                      /* BASOP_NOGLOB */
             move16();
         }
     }
@@ -7857,17 +7320,10 @@ void prep_tbe_exc_ivas_fx(
                 Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] );  /* Q16 + Q9 + 1 - 16 = Q10 */
                 Ltemp2 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /*Q2 * Q10 -> Q12  */
 
-#ifdef BASOP_NOGLOB
                 Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow );                   /*Q_exc+16 */
                 Ltemp2 = L_shl_o( Ltemp2, add( Q_exc, shift ) /*Q_exc+ 2 + 6 (or) 10 - 13*/, &Overflow ); /*Q_exc+16 */
 
                 tmp_code_preInt_fx[i] = round_fx_o( L_add_o( Ltemp1, Ltemp2, &Overflow ), &Overflow ); /* Q_exc  */
-#else                                                                                                  /* BASOP_NOGLOB */
-                Ltemp1 = L_shl( Ltemp1, Q_exc + 6 /*Q_exc+16-19*/ );                           /*Q_exc+16 */
-                Ltemp2 = L_shl( Ltemp2, Q_exc + 4 /*Q_exc+16-13*/ );                           /*Q_exc+16 */
-
-                tmp_code_preInt_fx[i] = round_fx( L_add( Ltemp1, Ltemp2 ) );  /* Q_exc  */
-#endif                                                                                                 /* BASOP_NOGLOB */
                 move16();
             }
         }
@@ -7876,14 +7332,9 @@ void prep_tbe_exc_ivas_fx(
             FOR( i = 0; i < L_subfr; i++ )
             {
                 /*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */
-                Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */
-#ifdef BASOP_NOGLOB
+                Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] );                        /* Q16 + Q9 + 1 - 16 = Q10 */
                 Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */
                 tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow );                /* Q_exc  */
-#else
-                Ltemp1 = L_shl( Ltemp1, Q_exc + 6 /*Q_exc+16-19*/ );          /*Q_exc+16 */
-                tmp_code_preInt_fx[i] = round_fx( Ltemp1 );                   /* Q_exc  */
-#endif
                 move16();
             }
         }
@@ -7891,22 +7342,17 @@ void prep_tbe_exc_ivas_fx(
         interp_code_4over2_fx( tmp_code_preInt_fx, tmp_code_fx, L_subfr ); /* o: tmp_code in Q_exc */
         FOR( i = 0; i < shl( L_subfr, 1 ); i++ )
         {
-            L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl( i_subfr_fx, 1 )] ); /*Q14+Q_exc+1 */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl( i_subfr_fx, 1 )] );                        /*Q14+Q_exc+1 */
             tmp = round_fx_o( L_shl_o( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/, &Overflow ), &Overflow ); /* tmp in Q_exc */
             bwe_exc_fx[i + shl( i_subfr_fx, 1 )] = add_o( tmp, tmp_code_fx[i], &Overflow );             /*Q_exc */
             move16();
-#else /* BASOP_NOGLOB */
-            tmp = round_fx( L_shl( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/ ) ); /* tmp in Q_exc */
-            bwe_exc_fx[i + i_subfr_fx * 2] = add( tmp, tmp_code_fx[i] );      /*Q_exc */
-            move16();
-#endif
         }
     }
 
     return;
 }
 
+
 /*=============================================================================*/
 /* FUNCTION : void swb_formant_fac_fx ( ) */
 /*------------------------------------------------------------------------------*/
@@ -7926,9 +7372,10 @@ void prep_tbe_exc_ivas_fx(
 /* CALLED FROM : */
 /*==============================================================================*/
 
-Word16 swb_formant_fac_fx(                        /* o : Formant filter strength [0,1] */
-                           const Word16 lpc_shb2, /* Q12 i : 2nd HB LPC coefficient */
-                           Word16 *tilt_mem       /* i/o: Tilt smoothing memory (Q12) */
+/*! r: Formant filter strength [0,1] */
+Word16 swb_formant_fac_fx(
+    const Word16 lpc_shb2, /* Q12 i : 2nd HB LPC coefficient    */
+    Word16 *tilt_mem       /* i/o: Tilt smoothing memory (Q12)  */
 )
 {
     Word16 formant_fac;
@@ -7948,7 +7395,6 @@ Word16 swb_formant_fac_fx(                        /* o : Formant filter strength
     tmp = sub( tmp, SWB_TILT_LOW_FX );              /* Q12 */
     formant_fac = mult_r( tmp, SWB_TILT_DELTA_FX ); /* Q12 */
 
-
     IF( GT_16( formant_fac, 4096 /* 1 in Q12 */ ) )
     {
         formant_fac = 4096; /* 1 in Q12 */
@@ -7963,15 +7409,17 @@ Word16 swb_formant_fac_fx(                        /* o : Formant filter strength
 
     /* formant_fac = 1.0f - 0.5f*formant_fac */
     tmp = mult_r( 16384, formant_fac ); /* 0.5 in Q15 */
-#ifdef BASOP_NOGLOB
     formant_fac = shl_o( sub( 4096 /* 1 in Q12 */, tmp ), 3, &Overflow );
-#else
-    formant_fac = shl( sub( 4096, tmp ), 3 );
-#endif
     return formant_fac; /*Q15 */
 }
 
 
+/*-------------------------------------------------------------------*
+ * wb_tbe_extras_reset_fx()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
 void wb_tbe_extras_reset_fx(
     Word16 mem_genSHBexc_filt_down_wb2[],
     Word16 mem_genSHBexc_filt_down_wb3[] )
@@ -7988,7 +7436,6 @@ void wb_tbe_extras_reset_fx(
  * Determine TBE bit consumption per frame from bitrate              *
  *-------------------------------------------------------------------*/
 
-
 Word16 get_tbe_bits_fx(
     const Word32 total_brate, /* o  : TBE bit consumption per frame           */
     const Word16 bwidth,      /* i  : overall bitrate                         */
diff --git a/lib_com/syn_filt_fx.c b/lib_com/syn_filt_fx.c
index 082ccb4c85e44f7bd5bb9fc5550641489e1aa183..ada0d243ea88b7c08fdb6ac8bd5d8720f9eb7f8f 100644
--- a/lib_com/syn_filt_fx.c
+++ b/lib_com/syn_filt_fx.c
@@ -14,13 +14,8 @@ static Word32 syn_kern_2( Word32 L_tmp, const Word16 a[], const Word16 y[] )
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
 #endif
-#ifdef BASOP_NOGLOB
     L_tmp = L_msu_o( L_tmp, y[-1], a[1], &Overflow );
     return L_msu_o( L_tmp, y[-2], a[2], &Overflow );
-#else
-    L_tmp = L_msu( L_tmp, y[-1], a[1] );
-    return L_msu( L_tmp, y[-2], a[2] );
-#endif
 }
 
 static Word32 syn_kern_4( Word32 L_tmp, const Word16 a[], const Word16 y[] )
@@ -135,33 +130,19 @@ void syn_filt_s_lc_fx(
         /* Stop at i to Avoid Mults with Zeros */
         FOR( j = 1; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_sat( L_tmp, y[-j], a[j] );
-#else
-            L_tmp = L_msu( L_tmp, y[-j], a[j] );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_tmp, q );
         *y++ = round_fx_sat( L_tmp );
-#else
-        L_tmp = L_shl( L_tmp, q );
-        *y++ = round_fx( L_tmp );
-#endif
         move16();
     }
 
     FOR( ; i < lg; i++ )
     {
         L_tmp = syn_kern_16( L_mult( *x++, a0 ), a, y );
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_tmp, q );
         *y++ = round_fx_sat( L_tmp );
-#else
-        L_tmp = L_shl( L_tmp, q );
-        *y++ = round_fx( L_tmp );
-#endif
         move16();
     }
 }
@@ -204,22 +185,17 @@ void syn_filt_fx(
 {
     Word16 i, j;
     Word16 buf[L_FRAME48k + L_FRAME48k / 2 + TCXLTP_LTP_ORDER]; /* temporary synthesis buffer */
-    Word16 s, *yy;
+    Word16 *yy;
+    Word32 s;
     Word16 q;
-#ifdef BASOP_NOGLOB
     Flag Overflow = 0;
     move16();
-#endif
     Word16 a0;
 
     yy = &buf[0];
     q = add( norm_s( a[0] ), 1 );
 
-#ifdef BASOP_NOGLOB
     a0 = shr_o( a[0], shift, &Overflow ); /* input / 2^shift */
-#else
-    a0 = shr( a[0], shift ); /* input / 2^shift */
-#endif
 
     /*------------------------------------------------------------------*
      * copy initial filter states into synthesis buffer and do synthesis
@@ -237,23 +213,16 @@ void syn_filt_fx(
 
     FOR( i = 0; i < l; i++ )
     {
-#ifdef BASOP_NOGLOB
-        s = mult_r( shl_o( a0, q, &Overflow ), x[i] );
-#else
-        s = mult_r( shl( a0, q ), x[i] );
-#endif
+        s = L_mult( a0, x[i] ); // Qx + Qa - shift + 1
         FOR( j = 1; j <= m; j++ )
         {
-#ifdef BASOP_NOGLOB
-            s = msu_ro( L_deposit_h( s ), shl_o( a[j], q, &Overflow ), yy[i - j], &Overflow );
-#else
-            s = msu_r( L_deposit_h( s ), shl( a[j], q ), yy[i - j] );
-#endif
+            s = L_msu_sat( s, a[j], yy[i - j] ); // Qa + Qx - shift + 1
         }
 
-        yy[i] = s;
+        s = L_shl_sat( s, q );  // Qx + (Qa + q)Q15 - shift + 1 = Qx - shift + Q16
+        yy[i] = extract_h( s ); // Qx - shift
         move16();
-        y[i] = s;
+        y[i] = extract_h( s );
         move16();
     }
 
@@ -274,6 +243,80 @@ void syn_filt_fx(
 }
 
 
+void syn_filt_fx32(
+    const Word16 a_e,     /* i  : exp of LP coeffs                          Q0   */
+    const Word32 a[],     /* i  : LP filter coefficients                    Q12  */
+    const Word16 m,       /* i  : order of LP filter                        Q0   */
+    const Word32 x[],     /* i  : input signal                              Qx   */
+    const Word16 x_e,     /* i  : input signal                              Qx   */
+    Word32 y[],           /* o  : output signal                             Qx   */
+    Word16 *y_e,          /* o  : output signal                             Qx   */
+    const Word16 l,       /* i  : size of filtering                         Q0   */
+    Word32 mem[],         /* i/o: initial filter states                     Qx   */
+    Word16 *mem_e,        /* i/o: initial filter states                     Qx   */
+    const Word16 update_m /* i  : update memory flag Q0 : 0 --> no memory update */
+    )                     /*                              1 --> update of memory */
+{
+    Word16 i, j;
+    Word64 buf[L_FRAME48k + L_FRAME48k / 2 + TCXLTP_LTP_ORDER]; /* temporary synthesis buffer */
+    Word64 s, *yy;
+
+    yy = &buf[0];
+
+    /*------------------------------------------------------------------*
+     * copy initial filter states into synthesis buffer and do synthesis
+     *------------------------------------------------------------------*/
+
+    FOR( i = 0; i < m; i++ )
+    {
+        *yy++ = W_deposit32_l( mem[i] );
+        move32();
+    }
+
+    /*-----------------------------------------------------------------------*
+     * Do the filtering
+     *-----------------------------------------------------------------------*/
+    Word64 max_val = 1;
+    FOR( i = 0; i < l; i++ )
+    {
+        s = W_deposit32_l( x[i] );
+        FOR( j = 1; j <= m; j++ )
+        {
+            s = W_sub( s, W_mult0_32_32( a[j], W_extract_l( W_shr( yy[i - j], sub( 31, a_e ) ) ) ) );
+        }
+
+        yy[i] = s;
+        move32();
+        if ( GT_64( W_abs( s ), max_val ) )
+        {
+            max_val = W_abs( s );
+        }
+    }
+
+    Word16 norm = W_norm( max_val );
+
+    FOR( i = 0; i < l; i++ )
+    {
+        y[i] = W_extract_l( W_shr( yy[i], sub( 32, norm ) ) );
+    }
+    *y_e = sub( 31, add( sub( 31, x_e ), sub( norm, 32 ) ) );
+    /*------------------------------------------------------------------*
+     * Update memory if required
+     *------------------------------------------------------------------*/
+
+    IF( update_m )
+    {
+        FOR( i = 0; i < m; i++ )
+        {
+            mem[i] = W_extract_l( W_shr( yy[l - m + i], sub( 32, norm ) ) );
+        }
+        *mem_e = sub( 31, add( sub( 31, x_e ), sub( norm, 32 ) ) );
+    }
+
+    return;
+}
+
+
 /*
  * E_UTIL_synthesis
  *
@@ -330,23 +373,14 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
      *-----------------------------------------------------------------------*/
     mem += m; /*move16();*/
 
-#ifdef BASOP_NOGLOB
     a0 = shr_o( a[0], shift, &Overflow ); /* input / 2^shift */
-#else
-    a0 = shr( a[0], shift ); /* input / 2^shift */
-#endif
     /*-----------------------------------------------------------------------*
      * Do the filtering
      *-----------------------------------------------------------------------*/
     /* Filtering Only from Input + Memory */
     L_tmp = syn_kern( L_mult( a0, *x++ ), a, mem );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_o( L_tmp, q, &Overflow );
     *y++ = round_fx_o( L_tmp, &Overflow );
-#else
-    L_tmp = L_shl( L_tmp, q );
-    *y++ = round_fx( L_tmp );
-#endif
     move16();
 
     /* Filtering from Input + Mix of Memory & Output Signal Past */
@@ -356,28 +390,15 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
         /* Process Output Signal Past */
         FOR( j = 1; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( L_tmp, a[j], y[-j], &Overflow );
-#else
-            L_tmp = L_msu( L_tmp, a[j], y[-j] );
-#endif
         }
         /* Process Memory */
         FOR( ; j <= m; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_sat( L_tmp, a[j], mem[i - j] );
-#else
-            L_tmp = L_msu( L_tmp, a[j], mem[i - j] );
-#endif
         }
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( L_tmp, q, &Overflow );
         *y++ = round_fx_o( L_tmp, &Overflow );
-#else
-        L_tmp = L_shl( L_tmp, q );
-        *y++ = round_fx( L_tmp );
-#endif
         move16();
     }
 
@@ -385,13 +406,8 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
     FOR( ; i < lg; i++ )
     {
         L_tmp = syn_kern( L_mult( a0, *x++ ), a, y );
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( L_tmp, q, &Overflow );
         *y++ = round_fx_o( L_tmp, &Overflow );
-#else /* BASOP_NOGLOB */
-        L_tmp = L_shl( L_tmp, q );
-        *y++ = round_fx( L_tmp );
-#endif
         move16();
     }
 
@@ -623,25 +639,7 @@ void synth_mem_updt2(
     {
         lerp( old_exc + L_EXC_MEM - last_L_frame, old_exc + L_EXC_MEM - L_frame, L_frame, last_L_frame );
     }
-#ifdef ADD_LRTD
-    IF( EQ_16( dec, DEC_IVAS ) )
-    {
-        IF( EQ_16( L_frame, L_FRAME16k ) )
-        {
-            /* find scaling factor */
-            PME()
-            en1 = 1.25f * sum2_f( mem_syn2, M );
-            en2 = sum2_f( mem_syn_r + L_SYN_MEM - M, M );
 
-            loc_rat = sqrtf( en2 ) / ( sqrtf( en1 ) + 0.01f );
-            /* scale synthesis filter memory */
-            FOR( i = 0; i < M; i++ )
-            {
-                mem_syn_r[L_SYN_MEM - M + i] *= loc_rat;
-            }
-        }
-    }
-#endif
     /*Resamp memory*/
     /*Size of LPC syn memory*/
     /* 1.25/20.0 = 1.0/16.0 -> shift 4 to the right. */
diff --git a/lib_com/tcq_position_arith_fx.c b/lib_com/tcq_position_arith_fx.c
index 581ef7395240953b989c8d5f246e8390e08aa09e..3abd527ca8bfa8b8690066da37fd978afd1aadb9 100644
--- a/lib_com/tcq_position_arith_fx.c
+++ b/lib_com/tcq_position_arith_fx.c
@@ -942,14 +942,9 @@ Word32 GetISCScale_fx(
                                 tmp16 = extract_l( t32 );
                             }
                         }
-#ifdef BASOP_NOGLOB
                         tmp32 = L_shl_sat( tmp32, sub( 1, SafeExp ) );                                     /* *2 */
                         tmp32 = L_sub_sat( L_shl_sat( L_mult0( g_fx, tmp16 ), sub( Qsxy, exp ) ), tmp32 ); /*Qsxy */
-#else
-                        tmp32 = L_shl( tmp32, 1 - SafeExp );                                       /* *2 */
-                        tmp32 = L_sub( L_shl( L_mult0( g_fx, tmp16 ), sub( Qsxy, exp ) ), tmp32 ); /*Qsxy */
-#endif
-                        dist_fx[i] = Mult_32_16( tmp32, g_fx ); /*Qsxy + exp - 15 */
+                        dist_fx[i] = Mult_32_16( tmp32, g_fx );                                            /*Qsxy + exp - 15 */
                         move32();
                         exp_dist[i] = add( sub( Qsxy, 15 ), exp );
                         move16();
@@ -1988,7 +1983,7 @@ Word32 encode_magnitude_tcq_fx(
     move16();
 
     bits_fx = L_deposit_l( 0 );
-    tcq_bits_fx = L_sub( table_logcum_fx[npulses], L_add( table_logcum_fx[nzpos], table_logcum_fx[npulses - nzpos - 1] ) );
+    tcq_bits_fx = L_sub( table_logcum_fx[npulses], L_add( table_logcum_fx[nzpos], table_logcum_fx[npulses - ( nzpos - 1 )] ) );
     *est_frame_bits_fx = L_add( *est_frame_bits_fx, tcq_bits_fx );
     move32();
 
@@ -2471,7 +2466,7 @@ void decode_mangitude_tcq_fx(
     move16();
 
     bits_fx = L_deposit_l( 0 );
-    tcq_bits_fx = L_sub( table_logcum_fx[npulses], L_add( table_logcum_fx[nzpos], table_logcum_fx[npulses - nzpos - 1] ) );
+    tcq_bits_fx = L_sub( table_logcum_fx[npulses], L_add( table_logcum_fx[nzpos], table_logcum_fx[npulses - ( nzpos - 1 )] ) );
 
     IF( EQ_16( nzpos, npulses ) )
     {
diff --git a/lib_com/tcx_ltp_fx.c b/lib_com/tcx_ltp_fx.c
index a42272f0b7a5806dbaaf6febb9e62d4544b2891a..322549a6f0841e9d147075092d263ad85526b9da 100644
--- a/lib_com/tcx_ltp_fx.c
+++ b/lib_com/tcx_ltp_fx.c
@@ -44,12 +44,8 @@ void tcx_ltp_get_lpc(
         if ( L_tmp > 0 )
             r = L_shr( r, 2 );
 
-        tmp = shl( x[j], s ); /* Qx + s */
-#ifdef BASOP_NOGLOB
+        tmp = shl( x[j], s );          /* Qx + s */
         r = L_mac0_sat( r, tmp, tmp ); /* Q30 */
-#else
-        r = L_mac0( r, tmp, tmp );
-#endif
     }
     r = L_max( r, L_shl( 100, shl( s, 1 ) ) );   /* Q30 */
     r = Mpy_32_16_1( r, 16386 /*1.0001f Q14*/ ); /* Q29 */
@@ -249,25 +245,15 @@ static void tcx_ltp_get_zir(
         move16();
         FOR( i = 0; i < L; i++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac_sat( L_mac_sat( s, w0[k], x0[i] ), w1[k], x1[-i] );   /* Qx */
             s2 = L_mac_sat( L_mac_sat( s2, v0[k], y0[i] ), v1[k], y1[-i] ); /* Qx */
-#else
-            s = L_mac( L_mac( s, w0[k], x0[i] ), w1[k], x1[-i] );
-            s2 = L_mac( L_mac( s2, v0[k], y0[i] ), v1[k], y1[-i] );
-#endif
             k = k + pitres;
         }
 
         /* s2 *= ALPHA;
            buf[j] = ( synth[j] - gain * s2 ) - ( synth_ltp[j] - gain * s ); */
-#ifdef BASOP_NOGLOB
         i = sub_sat( round_fx_sat( s ), mult_r_sat( round_fx_sat( s2 ), ALPHA ) );
         buf[j] = add_sat( sub_sat( synth[j], synth_ltp[j] ), mult_r_sat( gain, i ) ); /* Qx */
-#else
-        i = sub( round_fx( s ), mult_r( round_fx( s2 ), ALPHA ) );
-        buf[j] = add( sub( synth[j], synth_ltp[j] ), mult_r( gain, i ) );
-#endif
         move16();
 
         x0++;
@@ -422,17 +408,10 @@ void predict_signal(
 
     FOR( j = 0; j < L_subfr; j++ )
     {
-#ifdef BASOP_NOGLOB
         s = L_mult_o( win[0], x0[0], &Overflow );        /* Qx + 16 */
         s = L_mac_o( s, win[1], x0[1], &Overflow );      /* Qx + 16 */
         s = L_mac_o( s, win[2], x0[2], &Overflow );      /* Qx + 16 */
         excO[j] = mac_ro( s, win[3], x0[3], &Overflow ); /* Qx + 16 */
-#else
-        s = L_mult( win[0], x0[0] );
-        s = L_mac( s, win[1], x0[1] );
-        s = L_mac( s, win[2], x0[2] );
-        excO[j] = mac_r( s, win[3], x0[3] );
-#endif
         move16();
 
         x0++;
@@ -512,13 +491,8 @@ static void tcx_ltp_synth_filter(
             move16();
             FOR( i = 0; i < L; i++ )
             {
-#ifdef BASOP_NOGLOB
                 s = L_mac_sat( L_mac_sat( s, w0[k], x0[i] ), w1[k], x1[-i] );   /* Qx */
                 s2 = L_mac_sat( L_mac_sat( s2, v0[k], y0[i] ), v1[k], y1[-i] ); /* Qx */
-#else
-                s = L_mac( L_mac( s, w0[k], x0[i] ), w1[k], x1[-i] );
-                s2 = L_mac( L_mac( s2, v0[k], y0[i] ), v1[k], y1[-i] );
-#endif
                 k = k + pitch_res;
             }
 
@@ -526,39 +500,24 @@ static void tcx_ltp_synth_filter(
                normal:      synth_ltp[j] = synth[j] - gain * s2 + gain * s;
                zir:         synth_ltp[j] = synth[j] - gain * s2 + gain * s - zir[j];
                fade-in/out: synth_ltp[j] = synth[j] - alpha * gain * s2 + alpha * gain * s; */
-#ifdef BASOP_NOGLOB
             i = sub_sat( round_fx_sat( s ), mult_r_sat( round_fx_sat( s2 ), ALPHA ) ); /* Qx */
-#else
-            i = sub( round_fx( s ), mult_r( round_fx( s2 ), ALPHA ) );
-#endif
-            k = mult_r( gain, i ); /* Qx */
+            k = mult_r( gain, i );                                                     /* Qx */
             if ( fade != 0 )
                 k = mult_r( k, alpha ); /* Qx */
-#ifdef BASOP_NOGLOB
             k = add_sat( synth[j], k ); /* Qx */
             if ( zir != NULL )
             {
                 k = sub_sat( k, zir[j] ); /* Qx */
             }
-#else
-            k = add( synth[j], k );
-            if ( zir != NULL )
-                k = sub( k, zir[j] );
-#endif
 
             synth_ltp[j] = k; /* Qx */
             move16();
 
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             if ( fade != 0 )
             {
                 alpha = add_sat( alpha, step );
             }
-#else
-            if ( fade != 0 )
-                alpha = add( alpha, step );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             x0++;
@@ -646,13 +605,8 @@ static void tcx_ltp_synth_filter32(
             move16();
             FOR( i = 0; i < L; i++ )
             {
-#ifdef BASOP_NOGLOB
                 s = Madd_32_16_r( Madd_32_16_r( s, x0[i], w0[k] ), x1[-i], w1[k] );   /* Qx */
                 s2 = Madd_32_16_r( Madd_32_16_r( s2, y0[i], v0[k] ), y1[-i], v1[k] ); /* Qx */
-#else
-                s = L_mac( L_mac( s, w0[k], x0[i] ), w1[k], x1[-i] );
-                s2 = L_mac( L_mac( s2, v0[k], y0[i] ), v1[k], y1[-i] );
-#endif
                 k = k + pitch_res;
             }
 
@@ -660,39 +614,24 @@ static void tcx_ltp_synth_filter32(
                normal:      synth_ltp[j] = synth[j] - gain * s2 + gain * s;
                zir:         synth_ltp[j] = synth[j] - gain * s2 + gain * s - zir[j];
                fade-in/out: synth_ltp[j] = synth[j] - alpha * gain * s2 + alpha * gain * s; */
-#ifdef BASOP_NOGLOB
             L_tmp = L_sub_sat( s, Mpy_32_16_r( s2, ALPHA ) ); /* Qx */
-#else
-            i = sub( round_fx( s ), mult_r( round_fx( s2 ), ALPHA ) );
-#endif
-            L_tmp2 = Mpy_32_16_r( L_tmp, gain ); /* Qx */
+            L_tmp2 = Mpy_32_16_r( L_tmp, gain );              /* Qx */
             IF( fade != 0 )
-            L_tmp2 = Mpy_32_16_r( L_tmp2, alpha ); /* Qx */
-#ifdef BASOP_NOGLOB
+            L_tmp2 = Mpy_32_16_r( L_tmp2, alpha );  /* Qx */
             L_tmp2 = L_add_sat( synth[j], L_tmp2 ); /* Qx */
             if ( zir != NULL )
             {
                 L_tmp2 = L_sub_sat( L_tmp2, zir[j] ); /* Qx */
             }
-#else
-            L_tmp2 = add( synth[j], L_tmp2 );
-            if ( zir != NULL )
-                L_tmp2 = sub( L_tmp2, zir[j] );
-#endif
 
             synth_ltp[j] = L_tmp2; /* Qx */
             move16();
 
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             if ( fade != 0 )
             {
                 alpha = add_sat( alpha, step );
             }
-#else
-            if ( fade != 0 )
-                alpha = add( alpha, step );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             x0++;
@@ -1313,7 +1252,7 @@ Word16 tcx_ltp_decode_params(
     return 0;
 }
 
-void tcx_ltp_post(
+void tcx_ltp_post_fx(
     Decoder_State *st,
     TCX_LTP_DEC_HANDLE hTcxLtpDec,
     Word16 core,         /* Q0 */
@@ -1343,7 +1282,7 @@ void tcx_ltp_post(
 
     filtIdx = 0; /* just to avoid comilation warnings */
     move16();
-    tcx_buf_len = NS2SA( st->output_Fs, TCXLTP_DELAY_NS ); /* Q0 */
+    tcx_buf_len = NS2SA_FX2( st->output_Fs, TCXLTP_DELAY_NS ); /* Q0 */
     SideInfoOnly = 0;
     move16();
     if ( GE_32( total_brate, HQ_96k ) )
@@ -1677,7 +1616,8 @@ void tcx_ltp_post(
 }
 
 
-void tcx_ltp_post32(
+/* IVAS 32-bit variant */
+void tcx_ltp_post_fx32(
     Decoder_State *st,
     TCX_LTP_DEC_HANDLE hTcxLtpDec,
     Word16 core,         /* Q0 */
diff --git a/lib_com/tcx_mdct_fx.c b/lib_com/tcx_mdct_fx.c
index 26e7e234569154959b5b3f628448f7a1184a7269..b2cee32e67e81bb3cd4b8af746959d3d014edd81 100644
--- a/lib_com/tcx_mdct_fx.c
+++ b/lib_com/tcx_mdct_fx.c
@@ -106,9 +106,7 @@ void TCX_MDCT(
     Word16 i;
     Word16 factor, neg_factor;
     Word16 factor_e;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) element_mode;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -128,11 +126,7 @@ void TCX_MDCT(
     }
     FOR( i = 0; i < l / 2; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[m / 2 + r / 2 + m / 2 + i] = L_msu_o( L_mult( x[i], factor ), x[l - 1 - i], factor, &Overflow ); /* exp(y_e) */
-#else                                                                                                      /* BASOP_NOGLOB */
-        y[m / 2 + r / 2 + m / 2 + i] = L_msu( L_mult( x[i], factor ), x[l - 1 - i], factor );
-#endif                                                                                                     /* BASOP_NOGLOB */
         move32();
     }
     FOR( i = 0; i < m / 2; i++ )
@@ -142,11 +136,7 @@ void TCX_MDCT(
     }
     FOR( i = 0; i < r / 2; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac_o( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], neg_factor, &Overflow ); /* exp(y_e) */
-#else                                                                                                                                  /* BASOP_NOGLOB */
-        y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], neg_factor );
-#endif                                                                                                                                 /* BASOP_NOGLOB */
         move32();
     }
 
@@ -172,9 +162,7 @@ void TCX_MDST(
     Word16 i;
     Word16 factor, neg_factor;
     Word16 factor_e;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) element_mode;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -194,11 +182,7 @@ void TCX_MDST(
     }
     FOR( i = 0; i < l / 2; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[m / 2 + r / 2 + m / 2 + i] = L_msu_o( L_mult( x[i], neg_factor ), x[l - 1 - i], factor, &Overflow ); /* exp(y_e) */
-#else                                                                                                          /* BASOP_NOGLOB */
-        y[m / 2 + r / 2 + m / 2 + i] = L_msu( L_mult( x[i], neg_factor ), x[l - 1 - i], factor );
-#endif
         move32();
     }
     FOR( i = 0; i < m / 2; i++ )
@@ -208,11 +192,7 @@ void TCX_MDST(
     }
     FOR( i = 0; i < r / 2; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac_sat( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], factor ); /* exp(y_e) */
-#else
-        y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], factor );
-#endif
         move32();
     }
 
@@ -242,9 +222,7 @@ void TCX_MDCT_Inverse(
     Word16 L2 = l, R2 = r;
     Word32 tmp_buf[N_MAX + L_MDCT_OVLP_MAX / 2];
     Word16 fac_e;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) element_mode;
-#endif
     L2 = shr( l, 1 );
     R2 = shr( r, 1 );
 
@@ -262,22 +240,14 @@ void TCX_MDCT_Inverse(
 
     FOR( i = 0; i < R2; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[l + m + R2 + i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[L2 + i], negfac ), s ) ); /* fold out right end of DCT	exp(fac_e)*/
-#else
-        y[l + m + R2 + i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + i], negfac ), s ) ); /* fold out right end of DCT */
-#endif
 
         move16();
     }
 
     FOR( i = 0; i < L2; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[L2 + m + R2 + i], fac ), s ) ); /* negate, fold out left end of DCT	exp(fac_e)*/
-#else
-        y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + m + R2 + i], fac ), s ) );        /* negate, fold out left end of DCT */
-#endif
         move16();
     }
 
@@ -285,13 +255,8 @@ void TCX_MDCT_Inverse(
     {
         Word16 f;
 
-#ifdef BASOP_NOGLOB
         f = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[L2 + i], negfac ), s ) );
         y[L2 + i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[l + m + R2 - 1 - i], negfac ), s ) ); /* time-reverse mid of DCT	exp(fac_e)*/
-#else
-        f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + i], negfac ), s ) );
-        y[L2 + i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[l + m + R2 - 1 - i], negfac ), s ) ); /* time-reverse mid of DCT */
-#endif
         move16();
         y[l + m + R2 - 1 - i] = f;
         move16();
diff --git a/lib_com/tcx_mdct_window.c b/lib_com/tcx_mdct_window.c
index 110a1160d9fb2cb12d38d71d218fccfe27979ef4..0316ec5827ecd13a1d174b67fb89d18eacdf521b 100644
--- a/lib_com/tcx_mdct_window.c
+++ b/lib_com/tcx_mdct_window.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,6 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
@@ -124,9 +123,6 @@ void mdct_window_sine(
     Word16 n         /* Q0 */
 )
 {
-#ifdef IVAS_CODE
-    if ( element_mode == EVS_MONO )
-#endif
     {
         const PWord16 *table;
         table = getSineWindowTable( n );
@@ -139,42 +135,6 @@ void mdct_window_sine(
         }
         // PMT("getSineWindowTable needs to be updated for IVAS")
     }
-#ifdef IVAS_CODE
-    else
-    {
-        const float *window_table = 0;
-        Word16 buf_in_size = 0;
-        switch ( window_type )
-        {
-            case FULL_OVERLAP:
-                window_table = tcx_mdct_window_48;
-                buf_in_size = 420;
-                break;
-            case HALF_OVERLAP:
-                window_table = tcx_mdct_window_half_48;
-                buf_in_size = 180;
-                break;
-            case TRANSITION_OVERLAP:
-            case MIN_OVERLAP:
-                window_table = tcx_mdct_window_trans_48;
-                buf_in_size = 60;
-                break;
-
-            default:
-                assert( 0 && "Unsupported window type" );
-                break;
-        }
-
-        if ( Fs == 48000 )
-        {
-            mvr2r( window_table, window, n );
-        }
-        else
-        {
-            lerp( window_table, window, n, buf_in_size );
-        }
-    }
-#endif
 }
 
 
diff --git a/lib_com/tcx_utils_fx.c b/lib_com/tcx_utils_fx.c
index 26e29b10423f8562d2fbc0d8e60a3c66d1302e4d..c5ff95e04e68c7904a93ddc7444440333131cded 100644
--- a/lib_com/tcx_utils_fx.c
+++ b/lib_com/tcx_utils_fx.c
@@ -9,7 +9,6 @@
 #include "rom_com.h"
 #include "rom_basop_util.h"
 #include "basop_util.h"
-#include "prot.h"
 
 #define inv_int InvIntTable
 
@@ -348,11 +347,7 @@ void tcx_windowing_synthesis_current_frame(
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             lerp( acelp_zir, tmp_buf, acelp_zir_len, idiv1616U( shl_sat( acelp_zir_len, LD_FSCALE_DENOM ), fullbandScale ) );
-#else
-            lerp( acelp_zir, tmp_buf, acelp_zir_len, idiv1616U( shl( acelp_zir_len, LD_FSCALE_DENOM ), fullbandScale ) );
-#endif
             acelp_zir = tmp_buf; /*Qx*/
         }
 
@@ -387,17 +382,10 @@ void tcx_windowing_synthesis_current_frame(
                 tmp2 = mult_r( signal[i + overlap - acelp_mem_len], window_trans[i].v.im ); /*Qx*/
 
                 /*Time TDAC: 1)forward part of ACELP*/
-#ifdef BASOP_NOGLOB
                 tmp2 = add_sat( tmp2, mult_r( old_syn[acelp_zir_len - tmp + i], mult_r( window_trans[i].v.re, window_trans[i].v.re ) ) ); /*Qx*/
 
                 /*Time TDAC: 1)reward part of ACELP*/
                 tmp2 = add_sat( tmp2, mult_r( old_syn[acelp_zir_len - i - 1], mult_r( window_trans[i].v.im, window_trans[i].v.re ) ) ); /*Qx*/
-#else
-                tmp2 = add( tmp2, mult_r( old_syn[acelp_zir_len - tmp + i], mult_r( window_trans[i].v.re, window_trans[i].v.re ) ) );
-
-                /*Time TDAC: 1)reward part of ACELP*/
-                tmp2 = add( tmp2, mult_r( old_syn[acelp_zir_len - i - 1], mult_r( window_trans[i].v.im, window_trans[i].v.re ) ) );
-#endif
                 move16();
                 signal[i + overlap - acelp_mem_len] = tmp2; /*Qx*/
             }
@@ -408,17 +396,9 @@ void tcx_windowing_synthesis_current_frame(
                 tmp2 = mult_r( signal[i + overlap - acelp_mem_len], window_trans[tmp - 1 - i].v.re ); /*Qx*/
 
                 /*Time TDAC: 1)forward part of ACELP*/
-#ifdef BASOP_NOGLOB
                 tmp2 = add_sat( tmp2, mult_r( old_syn[acelp_zir_len - tmp + i], mult_r( window_trans[tmp - 1 - i].v.im, window_trans[tmp - 1 - i].v.im ) ) ); /*Qx*/
-#else
-                tmp2 = add( tmp2, mult_r( old_syn[acelp_zir_len - tmp + i], mult_r( window_trans[tmp - 1 - i].v.im, window_trans[tmp - 1 - i].v.im ) ) );
-#endif
                 /*Time TDAC: 1)reward part of ACELP*/
-#ifdef BASOP_NOGLOB
                 tmp2 = add_sat( tmp2, mult_r( old_syn[acelp_zir_len - i - 1], mult_r( window_trans[tmp - 1 - i].v.re, window_trans[tmp - 1 - i].v.im ) ) ); /*Qx*/
-#else
-                tmp2 = add( tmp2, mult_r( old_syn[acelp_zir_len - i - 1], mult_r( window_trans[tmp - 1 - i].v.re, window_trans[tmp - 1 - i].v.im ) ) );
-#endif
                 move16();
                 signal[i + overlap - acelp_mem_len] = tmp2; /*Qx*/
             }
@@ -426,11 +406,7 @@ void tcx_windowing_synthesis_current_frame(
             FOR( i = 0; i < M; i++ )
             {
                 move16();
-#ifdef BASOP_NOGLOB
                 signal[overlap + acelp_mem_len - M + i] = sub_sat( signal[overlap + acelp_mem_len - M + i], old_syn[acelp_zir_len - M + i] ); /*Qx*/
-#else
-                signal[overlap + acelp_mem_len - M + i] = sub( signal[overlap + acelp_mem_len - M + i], old_syn[acelp_zir_len - M + i] );
-#endif
             }
         }
         /* ZIR at the end of the ACELP frame */
@@ -484,11 +460,7 @@ void tcx_windowing_synthesis_current_frame(
         {
             /*remove reconstructed ZIR and add ACELP ZIR*/
             move16();
-#ifdef BASOP_NOGLOB
             signal[i + overlap + acelp_mem_len] = sub_sat( signal[i + overlap + acelp_mem_len], mult_r_sat( acelp_zir[i], div_s( sub_sat( acelp_zir_len, i ), acelp_zir_len ) ) ); /*Qx*/
-#else
-            signal[i + overlap + acelp_mem_len] = sub( signal[i + overlap + acelp_mem_len], mult_r( acelp_zir[i], div_s( sub( acelp_zir_len, i ), acelp_zir_len ) ) );
-#endif
         }
     }
     /* Rectangular window (past-frame is TCX) */
@@ -1072,11 +1044,7 @@ void mdct_shaping(
 
             FOR( l = 0; l < k; l++ )
             {
-#ifdef BASOP_NOGLOB
                 *x = L_shl_o( Mpy_32_16_r( *x, *gains ), *gains_exp, &Overflow ); /*Qx*/
-#else
-                *x = L_shl( Mpy_32_16_r( *x, *gains ), *gains_exp ); /*Qx*/
-#endif
                 move32();
                 x++;
             }
@@ -1095,11 +1063,7 @@ void mdct_shaping(
             gains_exp = pgainsexp;
             FOR( i = 0; i < FDNS_NPTS; i++ )
             {
-#ifdef BASOP_NOGLOB
                 *x = L_shl_o( Mpy_32_16_r( *x, *gains ), *gains_exp, &Overflow ); /*Qx*/
-#else
-                *x = L_shl( Mpy_32_16_r( *x, *gains ), *gains_exp );
-#endif
                 move32();
                 x += k;
                 gains++;
@@ -1474,12 +1438,8 @@ void PsychAdaptLowFreqDeemph(
         L_tmp = BASOP_Util_Log2( L_tmp );                             /* Q25 */
         L_tmp = L_shr( L_tmp, 7 );                                    /* 0.0078125f = 1.f/(1<<7) */
         L_tmp = BASOP_Util_InvLog2( L_tmp );                          /* Q31 */
-#ifdef BASOP_NOGLOB
-        tmp = round_fx_o( L_tmp, &Overflow ); /* Q15 */
-#else                                         /* BASOP_NOGLOB */
-        tmp = round_fx( L_tmp ); /* Q15 */
-#endif
-        fac = tmp; /* Q15 */
+        tmp = round_fx_o( L_tmp, &Overflow );                         /* Q15 */
+        fac = tmp;                                                    /* Q15 */
         move16();
 
         /* gradual lowering of lowest 32 bins; DC is lowered by (max_val/tmp)^1/4 */
@@ -1714,11 +1674,7 @@ void tcx_noise_filling(
     tmp32 = BASOP_Util_Log2( L_deposit_h( s_max( 0x3000, tiltCompFactor ) ) ); /* 6Q25 */
     tmp32 = L_shr( Mpy_32_16_1( tmp32, tmp1 ), 6 );                            /*Q25*/
     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
     tilt_factor = round_fx_sat( BASOP_Util_InvLog2( tmp32 ) ); /*Q15*/
-#else
-    tilt_factor = round_fx( BASOP_Util_InvLog2( tmp32 ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS;
 
     /* find last nonzero line below iFirstLine, use it as start offset */
@@ -1860,11 +1816,7 @@ void tcx_noise_filling_with_shift(
     tmp32 = BASOP_Util_Log2( L_deposit_h( s_max( 0x3000, tiltCompFactor ) ) ); /* 6Q25 */
     tmp32 = L_shr( Mpy_32_16_1( tmp32, tmp1 ), 6 );                            /*Q25*/
     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
     tilt_factor = round_fx_sat( BASOP_Util_InvLog2( tmp32 ) ); /*Q15*/
-#else
-    tilt_factor = round_fx( BASOP_Util_InvLog2( tmp32 ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS;
 
     /* find last nonzero line below iFirstLine, use it as start offset */
@@ -2177,11 +2129,7 @@ void tcx_get_gain(
     ener = L_shl( ener, tmp ); /*Q31 - ener_e + tmp*/
     ener_e = sub( ener_e, tmp );
 
-#ifdef BASOP_NOGLOB
     tmp = div_s( abs_s( round_fx_o( corr, &Overflow ) ), round_fx_o( ener, &Overflow ) ); /*Q15 - (corr_e - ener_e)*/
-#else
-    tmp = div_s( abs_s( round_fx( corr ) ), round_fx( ener ) );
-#endif
     if ( corr < 0 )
         tmp = negate( tmp );
 
diff --git a/lib_com/tec_com.c b/lib_com/tec_com.c
index c51a2cd02a77f6fe48b61088f16bf245fcc97304..0a37504df957bc577c8fc9eed3c64c0b4fa17de3 100644
--- a/lib_com/tec_com.c
+++ b/lib_com/tec_com.c
@@ -317,11 +317,7 @@ static void calcHiTempEnv_Fx(
 
         FOR( k = lowSubband; k < highSubband; k++ )
         {
-#ifdef BASOP_NOGLOB
             nrg = L_add_sat( nrg, L_shr( pCldfbPow[timeIndex][k], s1 ) ); /*Q31 - s1*/
-#else
-            nrg = L_add( nrg, L_shr( pCldfbPow[timeIndex][k], s1 ) );
-#endif
         }
 
 
diff --git a/lib_com/tns_base.c b/lib_com/tns_base.c
index 039c7a04226d8e6604b56a5fe41aecfef2d2fee1..5e18430be5631649c80cbd2524996ee7f008a419 100644
--- a/lib_com/tns_base.c
+++ b/lib_com/tns_base.c
@@ -12,7 +12,6 @@
 #include "rom_com.h"
 #include "prot_fx.h"
 #include "basop_util.h"
-#include "prot.h"
 
 /*----------------------------------------------------------------------------
  * Local constants
@@ -97,10 +96,8 @@ void InitTnsConfiguration(
     Word32 nSampleRate;
     Word16 s1;
     Word16 s2;
-#ifndef ADD_IVAS_TNS
     (void) ( element_mode );
     (void) ( is_mct );
-#endif
     nSampleRate = bwMode2fs[bwidth];
     move32();
     startLineFilter = &pTnsConfig->iFilterBorders[1];
@@ -139,21 +136,6 @@ void InitTnsConfiguration(
         ELSE
         IF( GT_32( nSampleRate, INT_FS_16k ) )
         {
-#ifdef ADD_IVAS_TNS
-            if ( ( element_mode > IVAS_SCE ) && ( total_brate >= ( is_mct ? IVAS_32k : IVAS_48k ) ) )
-            {
-                pTnsConfig->nMaxFilters = sizeof( tnsParameters32kHz_Stereo ) / sizeof( tnsParameters32kHz_Stereo[0] );
-                if ( nSampleRate == 100 * frameLength ) /* sub-frame length is <= 10 ms */
-                {
-                    pTnsConfig->pTnsParameters = tnsParameters32kHz_grouped;
-                }
-                else
-                {
-                    pTnsConfig->pTnsParameters = tnsParameters32kHz_Stereo;
-                }
-            }
-            else
-#endif
             {
 
                 move16();
@@ -213,9 +195,6 @@ void InitTnsConfiguration(
         move16();
         pTnsConfig->iFilterBorders[0] = frameLength;
     }
-#ifdef ADD_IVAS_TNS
-    pTnsConfig->allowTnsOnWhite = 0;
-#endif
     return; /*TNS_NO_ERROR;*/
 }
 
@@ -496,11 +475,7 @@ Word16 ITF_Detect_fx(
 
         /* Check threshold HLM_MIN_NRG */
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         tmp32 = L_sub( L_shl_o( L_tmp, sub( shift, sub( 24, Q ) ), &Overflow ), 4194304l /*HLM_MIN_NRG Q7*/ ); /*Q7*/
-#else                                                                                                          /* BASOP_NOGLOB */
-        tmp32 = L_sub( L_shl( L_tmp, sub( shift, 24 - Q ) ), 4194304l /*HLM_MIN_NRG Q7*/ );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
 
         /* get pre-shift for autocorrelation */
@@ -531,11 +506,7 @@ Word16 ITF_Detect_fx(
             L_tmp = L_shl( L_tmp, sub( shift, tmp ) ); /* shift L_tmp to that exponent */
 
             /* calc factor (with 2 bits headroom for sum of 3 subdivisions) */
-#ifdef BASOP_NOGLOB
             facs[iSubdivisions] = div_s( 0x2000, round_fx_sat( L_tmp ) ); /* L_tmp is >= 0x2000000 Q15*/
-#else
-            facs[iSubdivisions] = div_s( 0x2000, round_fx( L_tmp ) ); /* L_tmp is >= 0x2000000 */
-#endif
             move16();
         }
     }
@@ -610,6 +581,145 @@ Word16 ITF_Detect_fx(
 
     return 1;
 }
+
+Word16 ITF_Detect_ivas_fx(
+    const Word32 pSpectrum[], /*Q*/
+    const Word16 startLine,   /*Q0*/
+    const Word16 stopLine,    /*Q0*/
+    const Word16 maxOrder,    /*Q0*/
+    Word16 *A,                /*Q_A*/
+    Word16 *Q_A,
+    Word16 *predictionGain, /*Q7*/
+    Word16 *curr_order,     /*Q0*/
+    Word16 Q )
+{
+    Word32 norms[MAX_SUBDIVISIONS];
+    Word16 num_subdivisions, i, length;
+    Word16 iStartLine, iEndLine, spectrumLength;
+    Word32 rxx[ITF_MAX_FILTER_ORDER + 1];
+    Word16 q_rxx[ITF_MAX_FILTER_ORDER + 1];
+    Word32 temp_spectrum[640];
+    const Word16 *pWindow;
+    const Word32 *ptr_spectrum1, *ptr_spectrum2;
+    Word16 iSubdivisions, lag;
+    Word16 headroom, guard_bits, shift, q_min;
+    Word64 sum;
+    Word16 fac, q_fac, exp, q_temp;
+    Word32 temp;
+
+    IF( maxOrder <= 0 )
+    {
+        return 0;
+    }
+    pWindow = tnsAcfWindow_fx;
+    set_zero_fx( norms, MAX_SUBDIVISIONS );
+    set_zero_fx( rxx, ITF_MAX_FILTER_ORDER + 1 );     /* This initialization is required */
+    set16_fx( q_rxx, Q31, ITF_MAX_FILTER_ORDER + 1 ); /* This initialization is required */
+
+    spectrumLength = sub( stopLine, startLine );
+    num_subdivisions = 0;
+    move16();
+
+    /* Calculate norms for each spectrum part */
+    FOR( iSubdivisions = 0; iSubdivisions < MAX_SUBDIVISIONS; iSubdivisions++ )
+    {
+        /* iStartLine = startLine + ( stopLine - startLine ) * iSubdivisions / nSubdivisions; */
+        iStartLine = add( startLine, mult( imult1616( spectrumLength, iSubdivisions ), 10923 /* 1/MAX_SUBDIVISIONS in Q15 */ ) ); /*Q0*/
+        /* iEndLine = startLine + ( stopLine - startLine ) * ( iSubdivisions + 1 ) / nSubdivisions; */
+        iEndLine = add( startLine, mult( imult1616( spectrumLength, add( iSubdivisions, 1 ) ), 10923 /* 1/MAX_SUBDIVISIONS in Q15 */ ) ); /*Q0*/
+
+
+        /*         Variable initialization             */
+        /* norms[iSubdivisions] = sum2_f(pSpectrum + iStartLine - IGF_START_MN, iEndLine - iStartLine); */
+
+        ptr_spectrum1 = pSpectrum + sub( iStartLine, IGF_START_MN );
+        length = sub( iEndLine, iStartLine );
+        headroom = L_norm_arr( ptr_spectrum1, length );
+        guard_bits = find_guarded_bits_fx( length );
+        shift = sub( headroom, guard_bits );
+
+        Copy_Scale_sig32( ptr_spectrum1, temp_spectrum, length, shift ); // Q -> Q+shift
+
+        sum = 0;
+        move64();
+        FOR( i = 0; i < length; i++ )
+        {
+            sum = W_mac_32_32( sum, temp_spectrum[i], temp_spectrum[i] ); // 2(Q+shift)+1
+        }
+
+        IF( LE_64( sum, W_shl( 32768 * 2 /* HLM_MIN_NRG in Q1 */, shl( add( Q, shift ), 1 ) ) ) )
+        {
+            BREAK;
+        }
+
+        /* fac = 1.0f / norms[iSubdivisions]; */
+        exp = W_norm( sum );
+        sum = W_shl( sum, exp );                                    // 2(Q+shift)+1+exp
+        fac = div_s( ONE_IN_Q14, extract_h( W_extract_h( sum ) ) ); // 15+14-(2(Q+shift)+1+exp-48) = 76-(2(Q+shift)+exp)
+        q_fac = sub( 76, add( shl( add( Q, shift ), 1 ), exp ) );
+        pWindow = tnsAcfWindow_fx;
+
+        /* For additional loop condition */
+        /* Variable initialization */
+        /*for ( lag = 1; lag <= maxOrder; lag++ )
+        {
+            rxx[lag] += fac * ( *pWindow ) * dotp( pSpectrum + iStartLine - IGF_START_MN, pSpectrum + iStartLine - IGF_START_MN + lag, iEndLine - iStartLine - lag );
+            pWindow++;
+        }*/
+
+        ptr_spectrum1 = temp_spectrum; // pSpectrum + iStartLine - IGF_START_MN;
+        FOR( lag = 1; lag <= maxOrder; lag++ )
+        {
+            /* dotp( pSpectrum + iStartLine - IGF_START_MN, pSpectrum + iStartLine - IGF_START_MN + lag, iEndLine - iStartLine - lag ) */
+            ptr_spectrum2 = temp_spectrum + lag; //  pSpectrum + iStartLine - IGF_START_MN + lag;
+
+            sum = 0;
+            move64();
+            FOR( i = 0; i < iEndLine - iStartLine - lag; i++ )
+            {
+                sum = W_mac_32_32( sum, ptr_spectrum1[i], ptr_spectrum2[i] ); // 2(Q+shift)+1
+            }
+            exp = W_norm( sum );
+            sum = W_shl( sum, exp );                                          // 2(Q+shift)+1+exp
+            temp = Mpy_32_32( L_mult0( fac, *pWindow ), W_extract_h( sum ) ); // (q_fac+15)+(2(Q+shift)+1+exp-32)-31 = q_fac+2(Q+shift)+exp-47
+            q_temp = sub( add( q_fac, add( shl( add( Q, shift ), 1 ), exp ) ), 47 );
+
+            /* rxx[lag] += fac * (*pWindow) * dotp(pSpectrum + iStartLine - IGF_START_MN, pSpectrum + iStartLine - IGF_START_MN + lag, iEndLine - iStartLine - lag); */
+            q_min = sub( s_min( q_temp, q_rxx[lag] ), 1 );
+            rxx[lag] = L_add( L_shl( rxx[lag], sub( q_min, q_rxx[lag] ) ), L_shl( temp, sub( q_min, q_temp ) ) );
+            q_rxx[lag] = q_min;
+            move32();
+            move16();
+
+            pWindow++;
+        }
+
+        num_subdivisions = add( num_subdivisions, 1 );
+    }
+
+    minimum_s( q_rxx + 1, ITF_MAX_FILTER_ORDER, &q_min );
+    q_min = s_min( Q29, q_min );
+
+    FOR( i = 1; i < ITF_MAX_FILTER_ORDER; i++ )
+    {
+        rxx[i] = L_shl( rxx[i], sub( q_min, q_rxx[i] ) );
+        move32();
+    }
+
+    IF( EQ_16( iSubdivisions, MAX_SUBDIVISIONS ) ) /* meaning there is no subdivision with low energy */
+    {
+        rxx[0] = L_shl( MAX_SUBDIVISIONS, q_min );
+        move32();
+
+        /* Limit the maximum order to spectrum length/4 */
+        ITF_GetFilterParameters_fx( rxx, s_min( maxOrder, shr( spectrumLength, 2 ) ), A, Q_A, predictionGain );
+
+        *curr_order = maxOrder; /*Q0*/
+        move16();
+    }
+
+    return 1;
+}
 /* Helper functions for Hufmann table coding */
 
 
@@ -699,43 +809,19 @@ static Word16 DecodeUsingTable( Decoder_State *st, Word16 *pValue /*Q0*/, const
 
 /* TNS filter coefficients */
 
-int16_t DecodeSWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const int16_t index, int16_t *pValue )
+Word16 DecodeSWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const Word16 index, Word16 *pValue )
 {
     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
     return DecodeUsingTable( st, pValue, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes );
 }
 
-// int16_t GetSWBTCX10TnsFilterCoeffBits_flt( const int16_t value, const int16_t index )
-//{
-//     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
-//     return GetBitsFromTable( value, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes );
-// }
-
-// int16_t EncodeSWBTCX10TnsFilterCoeff_flt( const int16_t value, const int16_t index )
-//{
-//     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
-//     return EncodeUsingTable( value, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes );
-// }
-
-int16_t DecodeSWBTCX10TnsFilterCoeff_flt( Decoder_State *st, const int16_t index, int16_t *pValue )
+Word16 DecodeSWBTCX10TnsFilterCoeff_flt( Decoder_State *st, const Word16 index, Word16 *pValue )
 {
     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
     return DecodeUsingTable( st, pValue, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes );
 }
 
-// int16_t GetWBTCX20TnsFilterCoeffBits_flt( const int16_t value, const int16_t index )
-//{
-//     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
-//     return GetBitsFromTable( value, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes );
-// }
-
-// int16_t EncodeWBTCX20TnsFilterCoeff_flt( const int16_t value, const int16_t index )
-//{
-//     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
-//     return EncodeUsingTable( value, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes );
-// }
-
-int16_t DecodeWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const int16_t index, int16_t *pValue )
+Word16 DecodeWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const Word16 index, Word16 *pValue )
 {
     assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
     return DecodeUsingTable( st, pValue, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes );
@@ -744,49 +830,25 @@ int16_t DecodeWBTCX20TnsFilterCoeff_flt( Decoder_State *st, const int16_t index,
 
 /* TNS filter order */
 
-// void const *GetTnsFilterOrder_flt( void const *p, const int16_t index, int16_t *pValue )
-//{
-//     *pValue = ( (STnsFilter const *) p )[index].order;
-//     return ( (STnsFilter const *) p )[index].coefIndex;
-// }
-
-// void *SetTnsFilterOrder_flt( void *p, const int16_t index, const int16_t value )
-//{
-//     ( (STnsFilter *) p )[index].order = value;
-//     return ( (STnsFilter *) p )[index].coefIndex;
-// }
-
-// int16_t GetTnsFilterOrderBitsSWBTCX20_flt( const int16_t value, const int16_t index )
-//{
-//     (void) index;
-//     return GetBitsFromTable( value - 1, codesTnsOrderTCX20, nTnsOrderCodes );
-// }
-
-// int16_t EncodeTnsFilterOrderSWBTCX20_flt( const int16_t value, const int16_t index )
-//{
-//     (void) index;
-//     return EncodeUsingTable( value - 1, codesTnsOrderTCX20, nTnsOrderCodes );
-// }
-
-int16_t DecodeTnsFilterOrderSWBTCX20_flt( Decoder_State *st, const int16_t index, int16_t *pValue )
+Word16 DecodeTnsFilterOrderSWBTCX20_flt( Decoder_State *st, const Word16 index, Word16 *pValue )
 {
     (void) index;
     return DecodeUsingTable( st, pValue, codesTnsOrderTCX20, nTnsOrderCodes );
 }
 
-int16_t GetTnsFilterOrderBitsSWBTCX10_flt( const int16_t value, const int16_t index )
+Word16 GetTnsFilterOrderBitsSWBTCX10_flt( const Word16 value, const Word16 index )
 {
     (void) index;
     return GetBitsFromTable( value - 1, codesTnsOrderTCX10, nTnsOrderCodes );
 }
 
-int16_t EncodeTnsFilterOrderSWBTCX10_flt( const int16_t value, const int16_t index )
+Word16 EncodeTnsFilterOrderSWBTCX10_flt( const Word16 value, const Word16 index )
 {
     (void) index;
     return EncodeUsingTable( value - 1, codesTnsOrderTCX10, nTnsOrderCodes );
 }
 
-int16_t DecodeTnsFilterOrderSWBTCX10_flt( Decoder_State *st, const int16_t index, int16_t *pValue )
+Word16 DecodeTnsFilterOrderSWBTCX10_flt( Decoder_State *st, const Word16 index, Word16 *pValue )
 {
     (void) index;
     return DecodeUsingTable( st, pValue, codesTnsOrderTCX10, nTnsOrderCodes );
@@ -995,42 +1057,36 @@ void *SetTnsEnabled( void *p, const Word16 index, const Word16 value )
 
 /* Number of TNS filters */
 
-void const *GetNumOfTnsFilters_flt( void const *p, const int16_t index, int16_t *pValue )
+void const *GetNumOfTnsFilters_flt( void const *p, const Word16 index, Word16 *pValue )
 {
-    *pValue = (int16_t) abs( ( (STnsData const *) p )[index].nFilters );
+    *pValue = (Word16) abs( ( (STnsData const *) p )[index].nFilters );
     return ( (STnsData const *) p )[index].filter;
 }
 
-void *SetNumOfTnsFilters_flt( void *p, const int16_t index, const int16_t value )
+void *SetNumOfTnsFilters_flt( void *p, const Word16 index, const Word16 value )
 {
-    ( (STnsData *) p )[index].nFilters = (int16_t) abs( value );
+    ( (STnsData *) p )[index].nFilters = (Word16) abs( value );
     return ( (STnsData *) p )[index].filter;
 }
-int16_t DecodeTnsFilterOrder_flt( Decoder_State *st, const int16_t index, int16_t *pValue )
+Word16 DecodeTnsFilterOrder_flt( Decoder_State *st, const Word16 index, Word16 *pValue )
 {
     (void) index;
     return DecodeUsingTable( st, pValue, codesTnsOrder, nTnsOrderCodes );
 }
 /* TNS on whitened spectra  flag */
 
-void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue )
+void const *GetTnsOnWhite( void const *p, const Word16 index, Word16 *pValue )
 {
     *pValue = ( (STnsData const *) p )[index].tnsOnWhitenedSpectra > 0 ? 1 : 0;
     return NULL;
 }
 
-void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value )
+void *SetTnsOnWhite( void *p, const Word16 index, const Word16 value )
 {
     ( (STnsData *) p )[index].tnsOnWhitenedSpectra = value;
     return NULL;
 }
 
-// void const *GetTnsEnabledSingleFilter( void const *p, const int16_t index, int16_t *pValue )
-//{
-//     *pValue = ( (STnsData const *) p )[index].nFilters != 0 ? 1 : 0;
-//     return ( (STnsData const *) p )[index].filter;
-// }
-
 void const *GetTnsEnabledSingleFilter( void const *p, const Word16 index, Word16 *pValue )
 {
     move16();
@@ -1071,6 +1127,10 @@ void ResetTnsData( STnsData *pTnsData )
         move16();
         pTnsFilter->predictionGain = ONE_IN_Q7; /*Q7*/
         move16();
+        pTnsFilter->predictionGain32 = ONE_IN_Q23; /*Q23*/
+        move32();
+        pTnsFilter->predictionGain_e = PRED_GAIN_E;
+        move16();
         pTnsFilter->avgSqrCoef = 0;
         move16();
         pTnsFilter->filterType = TNS_FILTER_OFF; /*Q0*/
diff --git a/lib_com/tools.c b/lib_com/tools.c
index 7810edb94f46fdf91511d68701e6439f91ae67b6..9166d16eb4226e03503dca05ee5e1937f06336bd 100644
--- a/lib_com/tools.c
+++ b/lib_com/tools.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,7 +37,6 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
 #include "prot_fx.h"
 #include "wmc_auto.h"
 
@@ -48,51 +47,23 @@
  *------------------------------------------------------------------*/
 
 /*! r: output random value */
-int16_t own_random(
-    int16_t *seed /* i/o: random seed         */
+Word16 own_random(
+    Word16 *seed /* i/o: random seed         */
 )
 {
-    *seed = (int16_t) ( *seed * 31821L + 13849L );
+    *seed = (Word16) ( *seed * 31821L + 13849L );
 
     return ( *seed );
 }
 
 /*---------------------------------------------------------------------
- * sign()
+ * norm_ul_float()
  *
  *---------------------------------------------------------------------*/
 
-/*! r: sign of x (+1/-1) */
-float sign(
-    const float x /* i  : input value of x  */
-)
-{
-    if ( x < 0.0f )
-    {
-        return -1.0f;
-    }
-    else
-    {
-        return 1.0f;
-    }
-}
-
-/*---------------------------------------------------------------------
- * log2_f()
- *
- *---------------------------------------------------------------------*/
-
-/*! r: logarithm2 of x */
-float log2_f(
-    const float x /* i  : input value of x   */
-)
-{
-    return (float) ( log( x ) / log( 2.0f ) );
-}
-
-int16_t norm_ul_float( uint32_t UL_var1 )
+Word16 norm_ul_float( UWord32 UL_var1 )
 {
-    int16_t var_out;
+    Word16 var_out;
 
     if ( UL_var1 == 0 )
     {
@@ -100,7 +71,7 @@ int16_t norm_ul_float( uint32_t UL_var1 )
     }
     else
     {
-        for ( var_out = 0; UL_var1 < (uint32_t) 0x80000000U; var_out++ )
+        for ( var_out = 0; UL_var1 < (UWord32) 0x80000000U; var_out++ )
         {
             UL_var1 <<= 1;
         }
@@ -119,13 +90,13 @@ int16_t norm_ul_float( uint32_t UL_var1 )
  *---------------------------------------------------------------------*/
 
 /*! r: sum of all vector elements */
-int16_t sum_s(
-    const int16_t *vec, /* i  : input vector                          */
-    const int16_t lvec  /* i  : length of input vector                */
+Word16 sum_s(
+    const Word16 *vec, /* i  : input vector                          */
+    const Word16 lvec  /* i  : length of input vector                */
 )
 {
-    int16_t i;
-    int16_t tmp;
+    Word16 i;
+    Word16 tmp;
 
     tmp = 0;
     for ( i = 0; i < lvec; i++ )
@@ -136,23 +107,6 @@ int16_t sum_s(
     return tmp;
 }
 
-/*! r: sum of all vector elements */
-int32_t sum_l(
-    const int32_t *vec, /* i  : input vector                          */
-    const int16_t lvec  /* i  : length of input vector                */
-)
-{
-    int16_t i;
-    int32_t tmpL;
-
-    tmpL = 0;
-    for ( i = 0; i < lvec; i++ )
-    {
-        tmpL += vec[i];
-    }
-
-    return tmpL;
-}
 /*! r: sum of all vector elements */
 Word32 sum_l_fx(
     const Word32 *vec, /* i  : input vector                          */
@@ -171,23 +125,6 @@ Word32 sum_l_fx(
 
     return tmpL;
 }
-/*! r: sum of all vector elements */
-float sum_f(
-    const float *vec,  /* i  : input vector                          */
-    const int16_t lvec /* i  : length of input vector                */
-)
-{
-    int16_t i;
-    float tmp;
-
-    tmp = 0.0f;
-    for ( i = 0; i < lvec; i++ )
-    {
-        tmp += vec[i];
-    }
-
-    return tmp;
-}
 
 /*----------------------------------------------------------------------
  * sum2_f()
@@ -217,7 +154,7 @@ Word32 sum2_f_16_gb_fx(
     const Word16 lvec, /* i  : length of input vector                */
     Word16 gb )
 {
-    int16_t i;
+    Word16 i;
     Word32 tmp;
 
     tmp = 0;
@@ -228,22 +165,6 @@ Word32 sum2_f_16_gb_fx(
 
     return tmp;
 }
-float sum2_f(
-    const float *vec,  /* i  : input vector                          */
-    const int16_t lvec /* i  : length of input vector                */
-)
-{
-    int16_t i;
-    float tmp;
-
-    tmp = 0.0f;
-    for ( i = 0; i < lvec; i++ )
-    {
-        tmp += vec[i] * vec[i];
-    }
-
-    return tmp;
-}
 
 Word32 sum2_16_exp_fx(
     const Word16 *vec, /* i  : input vector           Q(15 - exp) */
@@ -362,7 +283,6 @@ Word32 sum2_32_fx(
 /*-------------------------------------------------------------------*
  * set_c()
  * set_s()
- * set_f()
  * set_l()
  * set_d()
  *
@@ -370,12 +290,12 @@ Word32 sum2_32_fx(
  *-------------------------------------------------------------------*/
 
 void set_c(
-    int8_t y[],     /* i/o: Vector to set                       */
-    const int8_t a, /* i  : Value to set the vector to          */
-    const int32_t N /* i  : Length of the vector                */
+    Word8 y[],     /* i/o: Vector to set                       */
+    const Word8 a, /* i  : Value to set the vector to          */
+    const Word32 N /* i  : Length of the vector                */
 )
 {
-    int16_t i;
+    Word16 i;
 
     for ( i = 0; i < N; i++ )
     {
@@ -387,12 +307,12 @@ void set_c(
 
 
 void set_s(
-    int16_t y[],     /* i/o: Vector to set                       */
-    const int16_t a, /* i  : Value to set the vector to          */
-    const int16_t N  /* i  : Length of the vector                */
+    Word16 y[],     /* i/o: Vector to set                       */
+    const Word16 a, /* i  : Value to set the vector to          */
+    const Word16 N  /* i  : Length of the vector                */
 )
 {
-    int16_t i;
+    Word16 i;
 
     for ( i = 0; i < N; i++ )
     {
@@ -404,28 +324,12 @@ void set_s(
 
 
 void set_l(
-    int32_t y[],     /* i/o: Vector to set                       */
-    const int32_t a, /* i  : Value to set the vector to          */
-    const int16_t N  /* i  : Length of the vector                */
-)
-{
-    int16_t i;
-
-    for ( i = 0; i < N; i++ )
-    {
-        y[i] = a;
-    }
-
-    return;
-}
-
-void set_f(
-    float y[],      /* i/o: Vector to set                       */
-    const float a,  /* i  : Value to set the vector to          */
-    const int16_t N /* i  : Lenght of the vector                */
+    Word32 y[],     /* i/o: Vector to set                       */
+    const Word32 a, /* i  : Value to set the vector to          */
+    const Word16 N  /* i  : Length of the vector                */
 )
 {
-    int16_t i;
+    Word16 i;
 
     for ( i = 0; i < N; i++ )
     {
@@ -442,11 +346,11 @@ void set_f(
  *---------------------------------------------------------------------*/
 
 void set_zero(
-    float *vec,        /* o  : input vector         */
-    const int16_t lvec /* i  : length of the vector */
+    float *vec,       /* o  : input vector         */
+    const Word16 lvec /* i  : length of the vector */
 )
 {
-    int16_t i;
+    Word16 i;
 
     for ( i = 0; i < lvec; i++ )
     {
@@ -460,8 +364,6 @@ void set_zero(
 /*---------------------------------------------------------------------*
  * mvr2r()
  * mvs2s()
- * mvr2s()
- * mvs2r()
  * mvr2d()
  * mvd2r()
  *
@@ -471,10 +373,10 @@ void set_zero(
 void mvr2r(
     const float x[], /* i  : input vector  */
     float y[],       /* o  : output vector */
-    const int16_t n  /* i  : vector size   */
+    const Word16 n   /* i  : vector size   */
 )
 {
-    int16_t i;
+    Word16 i;
 
     if ( n <= 0 )
     {
@@ -501,12 +403,12 @@ void mvr2r(
 }
 
 void mvs2s(
-    const int16_t x[], /* i  : input vector  */
-    int16_t y[],       /* o  : output vector */
-    const int16_t n    /* i  : vector size   */
+    const Word16 x[], /* i  : input vector  */
+    Word16 y[],       /* o  : output vector */
+    const Word16 n    /* i  : vector size   */
 )
 {
-    int16_t i;
+    Word16 i;
 
     if ( n <= 0 )
     {
@@ -532,108 +434,13 @@ void mvs2s(
     return;
 }
 
-uint32_t mvr2s(
-    const float x[], /* i  : input vector  */
-    int16_t y[],     /* o  : output vector */
-    const int16_t n  /* i  : vector size   */
-)
-{
-    int16_t i;
-    float temp;
-    uint32_t noClipping = 0;
-
-    if ( n <= 0 )
-    {
-        /* cannot transfer vectors with size 0 */
-        return 0;
-    }
-
-    if ( (void *) y <= (const void *) x )
-    {
-        for ( i = 0; i < n; i++ )
-        {
-            temp = x[i];
-            temp = (float) floor( temp + 0.5f );
-
-            if ( temp > MAX16B_FLT )
-            {
-                temp = MAX16B_FLT;
-                noClipping++;
-            }
-            else if ( temp < MIN16B_FLT )
-            {
-                temp = MIN16B_FLT;
-                noClipping++;
-            }
-
-            y[i] = (int16_t) temp;
-        }
-    }
-    else
-    {
-        for ( i = n - 1; i >= 0; i-- )
-        {
-            temp = x[i];
-            temp = (float) floor( temp + 0.5f );
-
-            if ( temp > MAX16B_FLT )
-            {
-                temp = MAX16B_FLT;
-                noClipping++;
-            }
-            else if ( temp < MIN16B_FLT )
-            {
-                temp = MIN16B_FLT;
-                noClipping++;
-            }
-
-            y[i] = (int16_t) temp;
-        }
-    }
-
-    return noClipping;
-}
-
-void mvs2r(
-    const int16_t x[], /* i  : input vector  */
-    float y[],         /* o  : output vector */
-    const int16_t n    /* i  : vector size   */
-)
-{
-    int16_t i;
-
-    if ( n <= 0 )
-    {
-        /* cannot transfer vectors with size 0 */
-        return;
-    }
-
-    if ( (void *) y < (const void *) x )
-    {
-        for ( i = 0; i < n; i++ )
-        {
-            y[i] = (float) x[i];
-        }
-    }
-    else
-    {
-        for ( i = n - 1; i >= 0; i-- )
-        {
-            y[i] = (float) x[i];
-        }
-    }
-
-    return;
-}
-
-
 void mvl2l(
-    const int32_t x[], /* i  : input vector  */
-    int32_t y[],       /* o  : output vector */
-    const int16_t n    /* i  : vector size   */
+    const Word32 x[], /* i  : input vector  */
+    Word32 y[],       /* o  : output vector */
+    const Word16 n    /* i  : vector size   */
 )
 {
-    int16_t i;
+    Word16 i;
 
     if ( n <= 0 )
     {
@@ -659,44 +466,6 @@ void mvl2l(
     return;
 }
 
-
-/*---------------------------------------------------------------------*
- * maximum()
- *
- * Find index and value of the maximum in a vector
- *---------------------------------------------------------------------*/
-
-/*! r: index of the maximum value in the input vector */
-int16_t maximum(
-    const float *vec,   /* i  : input vector                                   */
-    const int16_t lvec, /* i  : length of input vector                         */
-    float *max_val      /* o  : maximum value in the input vector              */
-)
-{
-    int16_t j, ind;
-    float tmp;
-
-    ind = 0;
-    tmp = vec[0];
-
-    for ( j = 1; j < lvec; j++ )
-    {
-        if ( vec[j] > tmp )
-        {
-            ind = j;
-            tmp = vec[j];
-        }
-    }
-
-    if ( max_val != NULL )
-    {
-        *max_val = tmp;
-    }
-
-    return ind;
-}
-
-
 /*! r: index of the maximum value in the input vector */
 Word16 maximum_s(
     const Word16 *vec, /* i  : input vector                                   */
@@ -766,42 +535,6 @@ Word16 maximum_l(
     return ind;
 }
 
-/*---------------------------------------------------------------------*
- * maximumAbs()
- *
- * Find index and value of the maximum in a vector
- *---------------------------------------------------------------------*/
-
-/*! r: index of the maximum value in the input vector */
-int16_t maximumAbs(
-    const float *vec,   /* i  : input vector                                   */
-    const int16_t lvec, /* i  : length of input vector                         */
-    float *max_val      /* o  : maximum value in the input vector              */
-)
-{
-    int16_t j, ind;
-    float tmp;
-
-    ind = 0;
-    tmp = (float) fabs( vec[0] );
-
-    for ( j = 1; j < lvec; j++ )
-    {
-        if ( (float) fabs( vec[j] ) > tmp )
-        {
-            ind = j;
-            tmp = (float) fabs( vec[j] );
-        }
-    }
-
-    if ( max_val != NULL )
-    {
-        *max_val = tmp;
-    }
-
-    return ind;
-}
-
 /*! r: index of the maximum value in the input vector */
 Word16 maximumAbs_l(
     const Word32 *vec, /* i  : input vector                                   */
@@ -835,42 +568,6 @@ Word16 maximumAbs_l(
     return ind;
 }
 
-/*---------------------------------------------------------------------*
- * minimum()
- *
- * Find index of a minimum in a vector
- *---------------------------------------------------------------------*/
-
-/*! r: index of the minimum value in the input vector */
-int16_t minimum(
-    const float *vec,   /* i  : input vector                                   */
-    const int16_t lvec, /* i  : length of input vector                         */
-    float *min_val      /* o  : minimum value in the input vector              */
-)
-{
-    int16_t j, ind;
-    float tmp;
-
-    ind = 0;
-    tmp = vec[0];
-
-    for ( j = 1; j < lvec; j++ )
-    {
-        if ( vec[j] < tmp )
-        {
-            ind = j;
-            tmp = vec[j];
-        }
-    }
-
-    if ( min_val != NULL )
-    {
-        *min_val = tmp;
-    }
-
-    return ind;
-}
-
 /*-------------------------------------------------------------------*
  * minimum_s()
  *
@@ -884,45 +581,23 @@ Word16 minimum_s(
     Word16 *min_val    /* o  : minimum value in the input vector */
 )
 {
-#ifdef FIX_1105_OPT_MINIMUM_SL
     Word16 i, ind;
-#else
-    Word16 i, ind, tmp;
-#endif
 
     ind = 0;
     move16();
-#ifndef FIX_1105_OPT_MINIMUM_SL
-    tmp = vec[0];
-    move16();
-#endif
 
     FOR( i = 1; i < lvec; i++ )
     {
-#ifdef FIX_1105_OPT_MINIMUM_SL
         if ( LT_16( vec[i], vec[ind] ) )
         {
             ind = i;
             move16();
         }
-#else
-        IF( LT_16( vec[i], tmp ) )
-        {
-            ind = i;
-            move16();
-            tmp = vec[i];
-            move16();
-        }
-#endif
     }
 
     if ( min_val != NULL )
     {
-#ifdef FIX_1105_OPT_MINIMUM_SL
         *min_val = vec[ind];
-#else
-        *min_val = tmp;
-#endif
         move16();
     }
 
@@ -943,104 +618,28 @@ Word16 minimum_l(
 )
 {
     Word16 i, ind;
-#ifndef FIX_1105_OPT_MINIMUM_SL
-    Word32 tmp;
-#endif
 
     ind = 0;
-#ifndef FIX_1105_OPT_MINIMUM_SL
-    tmp = vec[0];
-#endif
     move16();
-#ifndef FIX_1105_OPT_MINIMUM_SL
-    move32();
-#endif
 
     FOR( i = 1; i < lvec; i++ )
     {
-#ifdef FIX_1105_OPT_MINIMUM_SL
         if ( LT_32( vec[i], vec[ind] ) )
         {
             ind = i;
             move16();
         }
-#else
-        IF( LT_32( vec[i], tmp ) )
-        {
-            ind = i;
-            tmp = vec[i];
-            move16();
-            move32();
-        }
-#endif
     }
 
     if ( min_val != NULL )
     {
-#ifdef FIX_1105_OPT_MINIMUM_SL
         *min_val = vec[ind];
-#else
-        *min_val = tmp;
-#endif
         move32();
     }
 
     return ind;
 }
 
-/*---------------------------------------------------------------------*
- * emaximum()
- *
- * Find index of a maximum energy in a vector
- *---------------------------------------------------------------------*/
-
-/*! r: return index with max energy value in vector */
-int16_t emaximum(
-    const float *vec,   /* i  : input vector                                   */
-    const int16_t lvec, /* i  : length of input vector                         */
-    float *ener_max     /* o  : maximum energy value                           */
-)
-{
-    int16_t j, ind;
-    float temp;
-
-    *ener_max = 0.0f;
-    ind = 0;
-
-    for ( j = 0; j < lvec; j++ )
-    {
-        temp = vec[j] * vec[j];
-
-        if ( temp > *ener_max )
-        {
-            ind = j;
-            *ener_max = temp;
-        }
-    }
-
-    return ind;
-}
-
-
-/*---------------------------------------------------------------------*
- * mean()
- *
- * Find the mean of the vector
- *---------------------------------------------------------------------*/
-
-/*! r: mean of vector */
-float mean(
-    const float *vec,  /* i  : input vector                           */
-    const int16_t lvec /* i  : length of input vector                 */
-)
-{
-    float tmp;
-
-    tmp = sum_f( vec, lvec ) / (float) lvec;
-
-    return tmp;
-}
-
 /*---------------------------------------------------------------------*
  * dotp()
  *
@@ -1048,46 +647,20 @@ float mean(
  *---------------------------------------------------------------------*/
 
 /*! r: dot product of x[] and y[] */
-float dotp(
-    const float x[], /* i  : vector x[]                    */
-    const float y[], /* i  : vector y[]                    */
-    const int16_t n  /* i  : vector length                 */
+Word32 dotp_fixed(
+    const Word32 x[], /* i  : vector x[]                Qx */
+    const Word32 y[], /* i  : vector y[]                Qy */
+    const Word16 n    /* i  : vector length                */
 )
 {
-    int16_t i;
-    float suma;
+    Word16 i;
+    Word32 suma;
 
-    suma = x[0] * y[0];
+    suma = Mpy_32_32( x[0], y[0] );
 
-    for ( i = 1; i < n; i++ )
+    FOR( i = 1; i < n; i++ )
     {
-        suma += x[i] * y[i];
-    }
-
-    return suma;
-}
-
-/*---------------------------------------------------------------------*
- * dotp()
- *
- * Dot product of vector x[] and vector y[]
- *---------------------------------------------------------------------*/
-
-/*! r: dot product of x[] and y[] */
-Word32 dotp_fixed(
-    const Word32 x[], /* i  : vector x[]                Qx */
-    const Word32 y[], /* i  : vector y[]                Qy */
-    const Word16 n    /* i  : vector length                */
-)
-{
-    Word16 i;
-    Word32 suma;
-
-    suma = Mpy_32_32( x[0], y[0] );
-
-    FOR( i = 1; i < n; i++ )
-    {
-        suma = L_add( suma, Mpy_32_32( x[i], y[i] ) );
+        suma = L_add( suma, Mpy_32_32( x[i], y[i] ) );
     }
 
     return suma;
@@ -1154,128 +727,6 @@ Word32 dotp_fixed_32(
     return W_extract_l( suma );
 }
 
-/*---------------------------------------------------------------------*
- * inv_sqrt()
- *
- * Find the inverse square root of the input value
- *---------------------------------------------------------------------*/
-
-/*! r: inverse square root of input value */
-float inv_sqrt(
-    const float x /* i  : input value                        */
-)
-{
-    return (float) ( 1.0 / sqrt( x ) );
-}
-
-
-/*-------------------------------------------------------------------*
- * conv()
- *
- * Convolution between vectors x[] and h[] written to y[]
- * All vectors are of length L. Only the first L samples of the
- * convolution are considered.
- *-------------------------------------------------------------------*/
-
-void conv(
-    const float x[], /* i  : input vector                              */
-    const float h[], /* i  : impulse response (or second input vector) */
-    float y[],       /* o  : output vetor (result of convolution)      */
-    const int16_t L  /* i  : vector size                               */
-)
-{
-    float temp;
-    int16_t i, n;
-    for ( n = 0; n < L; n++ )
-    {
-        temp = x[0] * h[n];
-        for ( i = 1; i <= n; i++ )
-        {
-            temp += x[i] * h[n - i];
-        }
-        y[n] = temp;
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * fir()
- *
- * FIR filtering of vector x[] with filter having impulse response h[]
- * written to y[]
- * The input vector has length L and the FIR filter has an order of K, i.e.
- * K+1 coefficients. The memory of the input signal is provided in the vector mem[]
- * which has K values
- * The maximum length of the input signal is L_FRAME32k and the maximum order
- * of the FIR filter is L_FILT_MAX
- *-------------------------------------------------------------------*/
-
-void fir(
-    const float x[],  /* i  : input vector                              */
-    const float h[],  /* i  : impulse response of the FIR filter        */
-    float y[],        /* o  : output vector (result of filtering)       */
-    float mem[],      /* i/o: memory of the input signal (L samples)    */
-    const int16_t L,  /* i  : input vector size                         */
-    const int16_t K,  /* i  : order of the FIR filter (K+1 coefs.)      */
-    const int16_t upd /* i  : 1 = update the memory, 0 = not            */
-)
-{
-    float buf_in[L_FRAME48k + 60], buf_out[L_FRAME48k], s;
-    int16_t i, j;
-
-    /* prepare the input buffer (copy and update memory) */
-    mvr2r( mem, buf_in, K );
-    mvr2r( x, buf_in + K, L );
-
-    if ( upd )
-    {
-        mvr2r( buf_in + L, mem, K );
-    }
-
-    /* do the filtering */
-    for ( i = 0; i < L; i++ )
-    {
-        s = buf_in[K + i] * h[0];
-
-        for ( j = 1; j <= K; j++ )
-        {
-            s += h[j] * buf_in[K + i - j];
-        }
-
-        buf_out[i] = s;
-    }
-
-    /* copy to the output buffer */
-    mvr2r( buf_out, y, L );
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * v_add()
- *
- * Addition of two vectors sample by sample
- *-------------------------------------------------------------------*/
-
-void v_add(
-    const float x1[], /* i  : Input vector 1                       */
-    const float x2[], /* i  : Input vector 2                       */
-    float y[],        /* o  : Output vector that contains vector 1 + vector 2  */
-    const int16_t N   /* i  : Vector length                                    */
-)
-{
-    int16_t i;
-
-    for ( i = 0; i < N; i++ )
-    {
-        y[i] = x1[i] + x2[i];
-    }
-
-    return;
-}
-
-
 /*-------------------------------------------------------------------*
  * v_add_w64()
  *
@@ -1301,32 +752,8 @@ void v_add_w64(
     return;
 }
 
-
-/*-------------------------------------------------------------------*
- * v_sub()
- *
- * Subtraction of two vectors sample by sample
- *-------------------------------------------------------------------*/
-
-void v_sub(
-    const float x1[], /* i  : Input vector 1                                   */
-    const float x2[], /* i  : Input vector 2                                   */
-    float y[],        /* o  : Output vector that contains vector 1 - vector 2  */
-    const int16_t N   /* i  : Vector length                                    */
-)
-{
-    int16_t i;
-
-    for ( i = 0; i < N; i++ )
-    {
-        y[i] = x1[i] - x2[i];
-    }
-
-    return;
-}
-
 /*-------------------------------------------------------------------*
- * v_sub()
+ * v_sub_fixed()
  *
  * Subtraction of two vectors sample by sample
  *-------------------------------------------------------------------*/
@@ -1350,51 +777,25 @@ void v_sub_fixed(
     return;
 }
 
-/*-------------------------------------------------------------------*
- * v_mult()
- *
- * Multiplication of two vectors
- *-------------------------------------------------------------------*/
-
-void v_mult(
-    const float x1[], /* i  : Input vector 1                                   */
-    const float x2[], /* i  : Input vector 2                                   */
-    float y[],        /* o  : Output vector that contains vector 1 .* vector 2 */
-    const int16_t N   /* i  : Vector length                                    */
-)
-{
-    int16_t i;
-
-    for ( i = 0; i < N; i++ )
-    {
-        y[i] = x1[i] * x2[i];
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * v_multc()
- *
- * Multiplication of vector by constant
- *-------------------------------------------------------------------*/
-
-void v_multc(
-    const float x[], /* i  : Input vector                                     */
-    const float c,   /* i  : Constant                                         */
-    float y[],       /* o  : Output vector that contains c*x                  */
-    const int16_t N  /* i  : Vector length                                    */
+#ifdef VEC_ARITH_OPT_v1
+void v_sub_fixed_no_hdrm(
+    const Word32 x1[], /* i  : Input vector 1                                   */
+    const Word32 x2[], /* i  : Input vector 2                                   */
+    Word32 y[],        /* o  : Output vector that contains vector 1 - vector 2  */
+    const Word16 N     /* i  : Vector length                                    */
 )
 {
-    int16_t i;
+    Word16 i;
 
-    for ( i = 0; i < N; i++ )
+    FOR( i = 0; i < N; i++ )
     {
-        y[i] = c * x[i];
+        y[i] = L_sub( x1[i], x2[i] );
+        move32();
     }
 
     return;
 }
+#endif /* VEC_ARITH_OPT_v1 */
 
 /*-------------------------------------------------------------------*
  * v_multc_fixed()
@@ -1456,102 +857,6 @@ void v_multc_fixed_16_16(
     return;
 }
 
-/*-------------------------------------------------------------------*
- * squant()
- *
- * Scalar quantizer according to MMSE criterion (nearest neighbour in Euclidean space)
- *
- * Searches a given codebook to find the nearest neighbour in Euclidean space.
- * Index of the winning codeword and the winning codeword itself are returned.
- *-------------------------------------------------------------------*/
-
-/*! r: index of the winning codeword */
-int16_t squant(
-    const float x,       /* i  : scalar value to quantize        */
-    float *xq,           /* o  : quantized value                 */
-    const float cb[],    /* i  : codebook                        */
-    const int16_t cbsize /* i  : codebook size                   */
-)
-{
-    float dist, mindist, tmp;
-    int16_t c, idx;
-
-    idx = 0;
-    mindist = 1e16f;
-
-    for ( c = 0; c < cbsize; c++ )
-    {
-        dist = 0.0f;
-        tmp = x - cb[c];
-        dist += tmp * tmp;
-        if ( dist < mindist )
-        {
-            mindist = dist;
-            idx = c;
-        }
-    }
-
-    *xq = cb[idx];
-
-    return idx;
-}
-
-/*! r: index of the winning codeword */
-int16_t squant_int(
-    uint8_t x,           /* i  : scalar value to quantize  */
-    uint8_t *xq,         /* o  : quantized value           */
-    const uint8_t *cb,   /* i  : codebook                  */
-    const int16_t cbsize /* i  : codebook size             */
-)
-{
-    int16_t i, idx;
-    float mindist, d;
-
-    idx = 0;
-    mindist = 10000000.0f;
-    for ( i = 0; i < cbsize; i++ )
-    {
-        d = (float) ( x - cb[i] ) * ( x - cb[i] );
-        if ( d < mindist )
-        {
-            mindist = d;
-            idx = i;
-        }
-    }
-    *xq = cb[idx];
-
-    return idx;
-}
-
-
-/*-------------------------------------------------------------------*
- * usquant()
- *
- * Uniform scalar quantizer according to MMSE criterion
- * (nearest neighbour in Euclidean space)
- *
- * Applies quantization based on scale and round operations.
- * Index of the winning codeword and the winning codeword itself are returned.
- *-------------------------------------------------------------------*/
-
-/*! r: index of the winning codeword */
-int16_t usquant(
-    const float x,       /* i  : scalar value to quantize        */
-    float *xq,           /* o  : quantized value                 */
-    const float qlow,    /* i  : lowest codebook entry (index 0) */
-    const float delta,   /* i  : quantization step               */
-    const int16_t cbsize /* i  : codebook size                   */
-)
-{
-    int16_t idx;
-
-    idx = (int16_t) max( 0.f, min( cbsize - 1, ( ( x - qlow ) / delta + 0.5f ) ) );
-    *xq = idx * delta + qlow;
-
-    return idx;
-}
-
-
 /*-------------------------------------------------------------------*
  * usdequant()
  *
@@ -1561,9 +866,9 @@ int16_t usquant(
  *-------------------------------------------------------------------*/
 
 float usdequant(
-    const int16_t idx, /* i  : quantizer index                 */
-    const float qlow,  /* i  : lowest codebook entry (index 0) */
-    const float delta  /* i  : quantization step               */
+    const Word16 idx, /* i  : quantizer index                 */
+    const float qlow, /* i  : lowest codebook entry (index 0) */
+    const float delta /* i  : quantization step               */
 )
 {
     float g;
@@ -1573,219 +878,6 @@ float usdequant(
     return ( g );
 }
 
-
-/*-------------------------------------------------------------------*
- * vquant()
- *
- * Vector quantizer according to MMSE criterion (nearest neighbour in Euclidean space)
- *
- * Searches a given codebook to find the nearest neighbour in Euclidean space.
- * Index of the winning codevector and the winning vector itself are returned.
- *-------------------------------------------------------------------*/
-
-/*! r: index of the winning codevector */
-int16_t vquant(
-    float x[],            /* i  : vector to quantize              */
-    const float x_mean[], /* i  : vector mean to subtract (0 if none) */
-    float xq[],           /* o  : quantized vector                */
-    const float cb[],     /* i  : codebook                        */
-    const int16_t dim,    /* i  : dimension of codebook vectors   */
-    const int16_t cbsize  /* i  : codebook size                   */
-)
-{
-    float dist, mindist, tmp;
-    int16_t c, d, idx, j;
-
-    idx = 0;
-    mindist = 1e16f;
-
-    if ( x_mean != 0 )
-    {
-        for ( d = 0; d < dim; d++ )
-        {
-            x[d] -= x_mean[d];
-        }
-    }
-
-    j = 0;
-    for ( c = 0; c < cbsize; c++ )
-    {
-        dist = 0.0f;
-        for ( d = 0; d < dim; d++ )
-        {
-            tmp = x[d] - cb[j++];
-            dist += tmp * tmp;
-        }
-
-        if ( dist < mindist )
-        {
-            mindist = dist;
-            idx = c;
-        }
-    }
-
-    if ( xq == 0 )
-    {
-        return idx;
-    }
-
-    j = idx * dim;
-    for ( d = 0; d < dim; d++ )
-    {
-        xq[d] = cb[j++];
-    }
-
-    if ( x_mean != 0 )
-    {
-        for ( d = 0; d < dim; d++ )
-        {
-            xq[d] += x_mean[d];
-        }
-    }
-
-    return idx;
-}
-
-/*-------------------------------------------------------------------*
- * w_vquant()
- *
- * Vector quantizer according to MMSE criterion (nearest neighbour in Euclidean space)
- *
- * Searches a given codebook to find the nearest neighbour in Euclidean space.
- * Weights are put on the error for each vector element.
- * Index of the winning codevector and the winning vector itself are returned.
- *-------------------------------------------------------------------*/
-
-/*! r: index of the winning codevector */
-int16_t w_vquant(
-    float x[],               /* i  : vector to quantize              */
-    const float x_mean[],    /* i  : vector mean to subtract (0 if none) */
-    const int16_t weights[], /* i  : error weights                   */
-    float xq[],              /* o  : quantized vector                */
-    const float cb[],        /* i  : codebook                        */
-    const int16_t dim,       /* i  : dimension of codebook vectors   */
-    const int16_t cbsize,    /* i  : codebook size                   */
-    const int16_t rev_vect   /* i  : reverse codebook vectors        */
-)
-{
-    float dist, mindist, tmp;
-    int16_t c, d, idx, j, k;
-
-    idx = 0;
-    mindist = 1e16f;
-
-    if ( x_mean != 0 )
-    {
-        for ( d = 0; d < dim; d++ )
-        {
-            x[d] -= x_mean[d];
-        }
-    }
-
-    j = 0;
-    if ( rev_vect )
-    {
-        k = dim - 1;
-        for ( c = 0; c < cbsize; c++ )
-        {
-            dist = 0.0f;
-
-            for ( d = k; d >= 0; d-- )
-            {
-                tmp = x[d] - cb[j++];
-                dist += weights[d] * ( tmp * tmp );
-            }
-
-            if ( dist < mindist )
-            {
-                mindist = dist;
-                idx = c;
-            }
-        }
-
-        if ( xq == 0 )
-        {
-            return idx;
-        }
-
-        j = idx * dim;
-        for ( d = k; d >= 0; d-- )
-        {
-            xq[d] = cb[j++];
-        }
-    }
-    else
-    {
-        for ( c = 0; c < cbsize; c++ )
-        {
-            dist = 0.0f;
-
-            for ( d = 0; d < dim; d++ )
-            {
-                tmp = x[d] - cb[j++];
-                dist += weights[d] * ( tmp * tmp );
-            }
-
-            if ( dist < mindist )
-            {
-                mindist = dist;
-                idx = c;
-            }
-        }
-
-        if ( xq == 0 )
-        {
-            return idx;
-        }
-
-        j = idx * dim;
-        for ( d = 0; d < dim; d++ )
-        {
-            xq[d] = cb[j++];
-        }
-    }
-
-    if ( x_mean != 0 )
-    {
-        for ( d = 0; d < dim; d++ )
-        {
-            xq[d] += x_mean[d];
-        }
-    }
-
-    return idx;
-}
-
-
-/*----------------------------------------------------------------------------------*
- * v_sort()
- *
- * Sorting of vectors. This is very fast with almost ordered vectors.
- *----------------------------------------------------------------------------------*/
-
-void v_sort_float(
-    float *r,         /* i/o: Vector to be sorted in place */
-    const int16_t lo, /* i  : Low limit of sorting range   */
-    const int16_t up  /* I  : High limit of sorting range  */
-)
-{
-    int16_t i, j;
-    float tempr;
-
-    for ( i = up - 1; i >= lo; i-- )
-    {
-        tempr = r[i];
-        for ( j = i + 1; j <= up && ( tempr > r[j] ); j++ )
-        {
-            r[j - 1] = r[j];
-        }
-
-        r[j - 1] = tempr;
-    }
-
-    return;
-}
-
 void sort(
     UWord16 *x, /* i/o: Vector to be sorted     */
     UWord16 len /* i/o: vector length           */
@@ -1810,430 +902,3 @@ void sort(
 
     return;
 }
-
-/*---------------------------------------------------------------------*
- * var()
- *
- * Calculate the variance of a vector
- *---------------------------------------------------------------------*/
-
-/*! r: variance of vector */
-float var(
-    const float *x,   /* i  : input vector                          */
-    const int16_t len /* i  : length of inputvector                 */
-)
-{
-    float m;
-    float v;
-    int16_t i;
-
-    m = mean( x, len );
-
-    v = 0.0f;
-    for ( i = 0; i < len; i++ )
-    {
-        v += ( x[i] - m ) * ( x[i] - m );
-    }
-    v /= len;
-
-    return v;
-}
-
-
-/*---------------------------------------------------------------------*
- * std_dev()
- *
- * Calculate the standard deviation of a vector
- *---------------------------------------------------------------------*/
-
-/*! r: standard deviation */
-float std_dev(
-    const float *x,   /* i  : input vector                          */
-    const int16_t len /* i  : length of the input vector            */
-)
-{
-    int16_t i;
-    float std;
-
-    std = 1e-16f;
-    for ( i = 0; i < len; i++ )
-    {
-        std += x[i] * x[i];
-    }
-
-    std = (float) sqrt( std / len );
-
-    return std;
-}
-
-
-/*---------------------------------------------------------------------*
- * dot_product_mat()
- *
- * Calculates dot product of type x'*A*x, where x is column vector of size m,
- * and A is square matrix of size m*m
- *---------------------------------------------------------------------*/
-
-/*! r: the dot product x'*A*x */
-float dot_product_mat(
-    const float *x, /* i  : vector x                      */
-    const float *A, /* i  : matrix A                      */
-    const int16_t m /* i  : vector & matrix size          */
-)
-{
-    int16_t i, j;
-    float suma, tmp_sum;
-    const float *pt_x, *pt_A;
-
-    pt_A = A;
-    suma = 0;
-
-    for ( i = 0; i < m; i++ )
-    {
-        tmp_sum = 0;
-        pt_x = x;
-        for ( j = 0; j < m; j++ )
-        {
-            tmp_sum += *pt_x++ * *pt_A++;
-        }
-
-        suma += x[i] * tmp_sum;
-    }
-
-    return suma;
-}
-
-
-/*--------------------------------------------------------------------------------*
- * polezero_filter()
- *
- * Y(Z)=X(Z)(b[0]+b[1]z^(-1)+..+b[L]z^(-L))/(a[0]+a[1]z^(-1)+..+a[M]z^(-M))
- *          mem[n]=x[n]+cp[0]mem[n-1]+..+cp[M-1]mem[n-M], where cp[i]=-a[i+1]/a[0]
- *          y[n]=cz[0]mem[n]+cz[1]mem[n-1]+..+cz[L]mem[n-L], where cz[i]=b[i]/a[0]
- *          mem={mem[n-K] mem[n-K+1] . . . . mem[n-2] mem[n-1]}, where K=max(L,M)
- *
- * a[0] must be equal to 1.0f!
- *---------------------------------------------------------------------------------*/
-
-void polezero_filter(
-    const float *in,     /* i  : input vector                              */
-    float *out,          /* o  : output vector                             */
-    const int16_t N,     /* i  : input vector size                         */
-    const float *b,      /* i  : numerator coefficients                    */
-    const float *a,      /* i  : denominator coefficients                  */
-    const int16_t order, /* i  : filter order                              */
-    float *mem           /* i/o: filter memory                             */
-)
-{
-    int16_t i, j, k;
-
-
-    for ( i = 0; i < order; i++ )
-    {
-        out[i] = in[i] * b[0];
-        for ( j = 0; j < i; j++ )
-        {
-            out[i] += in[i - 1 - j] * b[j + 1] - out[i - 1 - j] * a[j + 1];
-        }
-
-        for ( k = order - 1; j < order; j++, k-- )
-        {
-            out[i] += mem[k] * b[j + 1] - mem[k + order] * a[j + 1];
-        }
-    }
-
-    for ( ; i < N; i++ )
-    {
-        out[i] = in[i] * b[0];
-        for ( j = 0; j < order; j++ )
-        {
-            out[i] += in[i - 1 - j] * b[j + 1] - out[i - 1 - j] * a[j + 1];
-        }
-    }
-
-    for ( i = 0; i < order; i++ )
-    {
-        mem[i] = in[N - order + i];
-        mem[i + order] = out[N - order + i];
-    }
-
-    return;
-}
-
-#define WMC_TOOL_SKIP
-static float fleft_shift( float input, const int16_t shift )
-{
-    return ( input * (float) pow( 2.0, (double) shift ) );
-}
-
-static float fright_shift( float input, const int16_t shift )
-{
-    return ( input * (float) pow( 0.5, (double) shift ) );
-}
-#undef WMC_TOOL_SKIP
-
-
-/*--------------------------------------------------------------------------------*
- * root_a()
- *
- * Implements a quadratic approximation to sqrt(a)
- * Firstly, a is normalized to lie between 0.25 & 1.0
- * by shifting the input left or right by an even number of
- * shifts. Even shifts represent powers of 4 which, after
- * the sqrt, can easily be converted to powers of 2 and are
- * easily dealt with.
- * At the heart of the algorithm is a quadratic
- * approximation of the curve sqrt(a) for 0.25 <= a <= 1.0.
- * Sqrt(a) approx = 0.27 + 1.0127 * a - 0.2864 * a^2
- *
- *---------------------------------------------------------------------------------*/
-
-float root_a(
-    float a )
-{
-    int16_t shift_a;
-    float mod_a;
-    float approx;
-
-    if ( a <= 0.0f )
-    {
-        return 0.0;
-    }
-
-#define WMC_TOOL_SKIP
-    /* This next piece of code implements a "norm" function */
-    /* and returns the shift needed to scale "a" to have a  */
-    /* 1 in the (MSB-1) position. This is equivalent to     */
-    /* giving a value between 0.5 & 1.0.                    */
-    mod_a = a;
-
-    shift_a = 0;
-    while ( mod_a > 1.0 )
-    {
-        mod_a /= 2.0;
-        shift_a--;
-    }
-
-    while ( mod_a < 0.5 )
-    {
-        mod_a *= 2.0;
-        shift_a++;
-    }
-#undef WMC_TOOL_SKIP
-
-    shift_a &= 0xfffe;
-    mod_a = fleft_shift( a, shift_a );
-
-    approx = 0.27f + 1.0127f * mod_a - 0.2864f * mod_a * mod_a;
-
-    approx = fright_shift( approx, ( shift_a >> 1 ) );
-
-    return ( approx );
-}
-
-/*--------------------------------------------------------------------------------*
- * root_a_over_b()
- *
- * Implements an approximation to sqrt(a/b)
- * Firstly a & b are normalized to lie between 0.25 & 1.0
- * by shifting the inputs left or right by an even number
- * of shifts.
- * Even shifts represent powers of 4 which, after the sqrt,
- * become powers of 2 and are easily dealt with.
- * At the heart of the algorithm is an approximation of the
- * curve sqrt(a/b) for 0.25 <= a <= 1.0 & 0.25 <= b <= 1.0.
- * Given the value of b, the 2nd order coefficients p0, p1
- * & p2 can be determined so that...
- * Sqrt(a/b) approx = p0 + p1 * a + p2 * a^2
- * where p0 approx =  0.7176 - 0.8815 * b + 0.4429 * b^2
- *       p1 approx =  2.6908 - 3.3056 * b + 1.6608 * b^2
- *       p2 approx = -0.7609 + 0.9346 * b - 0.4695 * b^2
- *
- *---------------------------------------------------------------------------------*/
-
-float root_a_over_b(
-    float a,
-    float b )
-{
-    int16_t shift_a, shift_b, shift;
-    float mod_a, mod_b;
-    float p2 = -0.7609f;
-    float p1 = 2.6908f;
-    float p0 = 0.7176f;
-    float b_sqr;
-    float approx;
-
-    if ( ( a <= 0.0f ) || ( b <= 0.0f ) )
-    {
-        return 0.0;
-    }
-#define WMC_TOOL_SKIP
-    if ( isinf( a ) )
-#undef WMC_TOOL_SKIP
-    {
-        return FLT_MAX;
-    }
-#define WMC_TOOL_SKIP
-    if ( isinf( b ) )
-#undef WMC_TOOL_SKIP
-    {
-        return 0.f;
-    }
-
-    a += 0x00000001;
-    b += 0x00000001;
-
-#define WMC_TOOL_SKIP
-    /* This next piece of code implements a "norm" function */
-    /* and returns the shift needed to scale "a" to have a  */
-    /* 1 in the (MSB-1) position. This is equivalent to     */
-    /* giving a value between 0.5 & 1.0.                    */
-    mod_a = a;
-
-    shift_a = 0;
-    while ( mod_a > 1.0 )
-    {
-        mod_a /= 2.0;
-        shift_a--;
-    }
-
-    while ( mod_a < 0.5 )
-    {
-        mod_a *= 2.0;
-        shift_a++;
-    }
-#undef WMC_TOOL_SKIP
-
-    shift_a &= 0xfffe;
-    mod_a = fleft_shift( a, shift_a );
-
-#define WMC_TOOL_SKIP
-    /* This next piece of code implements a "norm" function */
-    /* and returns the shift needed to scale "b" to have a  */
-    /* 1 in the (MSB-1) position. This is equivalent to     */
-    /* giving a value between 0.5 & 1.0.                    */
-    mod_b = b;
-
-    shift_b = 0;
-    while ( mod_b > 1.0 )
-    {
-        mod_b /= 2.0;
-        shift_b--;
-    }
-
-    while ( mod_b < 0.5 )
-    {
-        mod_b *= 2.0;
-        shift_b++;
-    }
-#undef WMC_TOOL_SKIP
-
-    shift_b &= 0xfffe;
-    mod_b = fleft_shift( b, shift_b );
-
-    shift = ( shift_b - shift_a ) >> 1;
-
-    b_sqr = mod_b * mod_b;
-
-    p2 += 0.9346f * mod_b + -0.4695f * b_sqr;
-    p1 += -3.3056f * mod_b + 1.6608f * b_sqr;
-    p0 += -0.8815f * mod_b + 0.4429f * b_sqr;
-
-    approx = p0 + p1 * mod_a + p2 * mod_a * mod_a;
-
-    approx = fleft_shift( approx, shift );
-
-    return ( approx );
-}
-
-/*--------------------------------------------------------------------------------*
- * rint_new()
- *
- * Round to the nearest integer with mid-point exception
- *---------------------------------------------------------------------------------*/
-
-double rint_new(
-    double x )
-{
-    int16_t a;
-
-    /* middle value point test */
-    if ( ceil( x + 0.5 ) == floor( x + 0.5 ) )
-    {
-        a = (int16_t) ceil( x );
-
-        if ( a % 2 == 0 )
-        {
-            return ceil( x );
-        }
-        else
-        {
-            return floor( x );
-        }
-    }
-    else
-    {
-        return floor( x + 0.5 );
-    }
-}
-
-
-/*-------------------------------------------------------------------*
- * anint()
- *
- * Round to the nearest integer.
- *-------------------------------------------------------------------*/
-
-double anint(
-    double x )
-{
-    return ( x ) >= 0 ? (int32_t) ( ( x ) + 0.5 ) : (int32_t) ( (x) -0.5 );
-}
-
-/*-------------------------------------------------------------------*
- * is_numeric_float()
- *
- * Returns 0 for all NaN and Inf values defined according to IEEE 754
- * floating point number's definition. Returns 1 for numeric values.
- *-------------------------------------------------------------------*/
-
-int16_t is_numeric_float(
-    float x )
-{
-#ifndef BASOP_NOGLOB
-    union float_int
-#else  /* BASOP_NOGLOB */
-    union float_int
-#endif /* BASOP_NOGLOB */
-    {
-        float float_val;
-        int32_t int_val;
-    } float_int;
-
-    float_int.float_val = x;
-
-    return ( ( float_int.int_val & 0x7f800000 ) != 0x7f800000 );
-}
-
-/*-------------------------------------------------------------------*
- * delay_signal_float()
- *
- * Delay buffer by defined number of samples
- *-------------------------------------------------------------------*/
-
-void delay_signal_float(
-    float x[],          /* i/o: signal to be delayed              */
-    const int16_t len,  /* i  : length of the input signal        */
-    float mem[],        /* i/o: synchronization memory            */
-    const int16_t delay /* i  : delay in samples                  */
-)
-{
-    float tmp_buffer[L_FRAME48k];
-
-    mvr2r( mem, tmp_buffer, delay );
-    mvr2r( x + len - delay, mem, delay );
-    mvr2r( x, x + delay, len - delay );
-    mvr2r( tmp_buffer, x, delay );
-
-    return;
-}
diff --git a/lib_com/tools_fx.c b/lib_com/tools_fx.c
index 746c2564afe5ebebe4c1c343159bf15e6e0cb56a..77e779efdcb1844eb7e56cee51b25079083aca26 100644
--- a/lib_com/tools_fx.c
+++ b/lib_com/tools_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -50,7 +50,6 @@
 #include "basop32.h"
 #include "wmc_auto.h"
 #include "prot_fx_enc.h"
-#include "prot.h"
 #include "ivas_prot_fx.h"
 
 #define INV_BANDS10 3277                            /* 1/10 in Q15 */
@@ -242,9 +241,9 @@ void fix2f_16( Word16 *var_fix, float *var_flt, Word32 expo )
 
 #undef WMC_TOOL_SKIP
 
-int16_t norm_ul( uint32_t UL_var1 )
+Word16 norm_ul( UWord32 UL_var1 )
 {
-    int16_t var_out;
+    Word16 var_out;
 
     if ( UL_var1 == 0 )
     {
@@ -252,7 +251,7 @@ int16_t norm_ul( uint32_t UL_var1 )
     }
     else
     {
-        for ( var_out = 0; UL_var1 < (uint32_t) 0x80000000U; var_out++ )
+        for ( var_out = 0; UL_var1 < (UWord32) 0x80000000U; var_out++ )
         {
             UL_var1 <<= 1;
         }
@@ -279,13 +278,33 @@ Word16 usdequant_fx(                    /* Qx*/
     Word32 L_tmp;
 
     /*g = idx * delta + qlow;*/
-    L_tmp = L_deposit_l( qlow );        /*Qx */
-    L_tmp = L_mac( L_tmp, idx, delta ); /*Qx */
-#ifdef BASOP_NOGLOB
+    L_tmp = L_deposit_l( qlow );                /*Qx */
+    L_tmp = L_mac( L_tmp, idx, delta );         /*Qx */
     g = round_fx_sat( L_shl_sat( L_tmp, 16 ) ); /*Qx */
-#else
-    g = round_fx( L_shl( L_tmp, 16 ) );                                                     /*Qx */
-#endif
+    return ( g );
+}
+
+Word32 usdequant32_fx(                    /* Qx*/
+                       const Word16 idx,  /* i: quantizer index Q0*/
+                       const Word32 qlow, /* i: lowest codebook entry (index 0) Qx*/
+                       const Word32 delta /* i: quantization step Qx-1*/
+)
+{
+    Word32 g;
+    Word64 L_tmp;
+
+    /*g = idx * delta + qlow;*/
+    L_tmp = W_deposit32_l( qlow ); /*Qx */
+    L_tmp = W_mac_32_16( L_tmp, delta, idx );
+    IF( GE_64( L_tmp, MAX_32 ) )
+    {
+        g = MAX_32;
+        move32();
+    }
+    ELSE
+    {
+        g = W_extract_l( L_tmp ); /*Qx */
+    }
     return ( g );
 }
 
@@ -316,26 +335,17 @@ Word16 usquant_fx(                     /* o: index of the winning codeword   */
 
     /*    idx = (short)( (x - qlow)/delta + 0.5f); */
     exp = norm_s( delta );
-    tmp = div_s( shl( 1, sub( 14, exp ) ), delta ); /*Q(29-exp-(Qx-1))->Q(30-exp-Qx) */
-#ifdef BASOP_NOGLOB
+    tmp = div_s( shl( 1, sub( 14, exp ) ), delta );                                                      /*Q(29-exp-(Qx-1))->Q(30-exp-Qx) */
     L_tmp = L_mult( sub_o( x, qlow, &Overflow ), tmp );                                                  /*Q(31-exp) */
     idx = extract_l( L_shr_r( L_add( L_tmp, shl_o( 1, sub( 30, exp ), &Overflow ) ), sub( 31, exp ) ) ); /*Q0 */
-#else                                                                                                    /* BASOP_NOGLOB */
-    L_tmp = L_mult( sub( x, qlow ), tmp );                                                  /*Q(31-exp) */
-    idx = extract_l( L_shr_r( L_add( L_tmp, shl( 1, sub( 30, exp ) ) ), sub( 31, exp ) ) ); /*Q0 */
-#endif                                                                                                   /* BASOP_NOGLOB */
 
     idx = s_min( idx, sub( cbsize, 1 ) );
     idx = s_max( idx, 0 );
 
     /*    *xq = idx*delta + qlow; */
-    L_tmp = L_deposit_l( qlow );        /*Qx */
-    L_tmp = L_mac( L_tmp, idx, delta ); /*Qx */
-#ifdef BASOP_NOGLOB
+    L_tmp = L_deposit_l( qlow );                                    /*Qx */
+    L_tmp = L_mac( L_tmp, idx, delta );                             /*Qx */
     *xq = round_fx_o( L_shl_o( L_tmp, 16, &Overflow ), &Overflow ); /*Qx */
-#else
-    *xq = round_fx( L_shl( L_tmp, 16 ) );                                                   /*Qx */
-#endif
     return idx;
 }
 /*-------------------------------------------------------------------*
@@ -408,16 +418,30 @@ Word32 sum2_fx(                    /* o  : sum of all squared vector elements
     L_tmp = L_deposit_l( 0 );
     FOR( i = 0; i < lvec; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_o( L_tmp, vec[i], vec[i], &Overflow ); /*Q(2x+1) */
-#else                                                        /* BASOP_NOGLOB */
-        L_tmp = L_mac( L_tmp, vec[i], vec[i] );                                             /*Q(2x+1) */
-#endif                                                       /* BASOP_NOGLOB */
     }
 
     return L_tmp;
 }
 
+Word64 sum2_fx_no_sat(                    /* o  : sum of all squared vector elements    Q(2*Qx)*/
+                       const Word16 *vec, /* i  : input vector                          Qx*/
+                       const Word16 lvec  /* i  : length of input vector                */
+)
+{
+    Word16 i;
+    Word64 sum;
+
+    sum = 0;
+    move64();
+    FOR( i = 0; i < lvec; i++ )
+    {
+        sum = W_mac0_16_16( sum, vec[i], vec[i] ); // 2*Qx
+    }
+
+    return sum;
+}
+
 Word32 sum_32_fx(
     const Word32 *vec, /* i  : input vector                          */
     const Word16 lvec, /* i  : length of input vector                */
@@ -456,11 +480,7 @@ Word32 sum2_fx_mod(                    /* o  : sum of all squared vector element
     L_tmp = L_deposit_l( 0 );
     FOR( i = 0; i < lvec; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_add_o( L_tmp, L_shr( L_mult_o( vec[i], vec[i], &Overflow ), 9 ), &Overflow );
-#else
-        L_tmp = L_add( L_tmp, L_shr( L_mult( vec[i], vec[i] ), 9 ) );
-#endif
     }
 
     return L_tmp;
@@ -487,26 +507,17 @@ void Copy(
             move16();
         }
 
-#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY
         /* Location of x and y may differ depending on platform/memory allocation. Since IF and ELSE has different complexity count, the early return is used instead of ELSE to ensure the same complexity number regardless of x and y memory addresses. */
         return;
-#endif
     }
 
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
-    ELSE
+    FOR( i = L - 1; i >= 0; i-- )
     {
-#endif
-        FOR( i = L - 1; i >= 0; i-- )
-        {
-            y[i] = x[i];
-            move16();
-        }
-
-        return;
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
+        y[i] = x[i];
+        move16();
     }
-#endif
+
+    return;
 }
 /*-------------------------------------------------------------------*
  * Copy64:
@@ -528,26 +539,17 @@ void Copy64(
             move64();
         }
 
-#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY
         /* Location of x and y may differ depending on platform/memory allocation. Since IF and ELSE has different complexity count, the early return is used instead of ELSE to ensure the same complexity number regardless of x and y memory addresses. */
         return;
-#endif
     }
 
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
-    ELSE
+    FOR( i = L - 1; i >= 0; i-- )
     {
-#endif
-        FOR( i = L - 1; i >= 0; i-- )
-        {
-            y[i] = x[i];
-            move64();
-        }
-
-        return;
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
+        y[i] = x[i];
+        move64();
     }
-#endif
+
+    return;
 }
 
 void set64_fx(
@@ -584,28 +586,19 @@ void Copy_pword(
             move16();
         }
 
-#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY
         /* Location of x and y may differ depending on platform/memory allocation. Since IF and ELSE has different complexity count, the early return is used instead of ELSE to ensure the same complexity number regardless of x and y memory addresses. */
         return;
-#endif
     }
 
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
-    ELSE
+    FOR( i = L - 1; i >= 0; i-- )
     {
-#endif
-        FOR( i = L - 1; i >= 0; i-- )
-        {
-            y[i].v.im = x[i].v.im;
-            y[i].v.re = x[i].v.re;
-            move16();
-            move16();
-        }
-
-        return;
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
+        y[i].v.im = x[i].v.im;
+        y[i].v.re = x[i].v.re;
+        move16();
+        move16();
     }
-#endif
+
+    return;
 }
 /*-------------------------------------------------------------------*
  * Copy32:
@@ -627,23 +620,14 @@ void Copy32(
             move32();
         }
 
-#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY
         return;
-#endif
     }
 
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
-    ELSE
+    FOR( i = L - 1; i >= 0; i-- )
     {
-#endif
-        FOR( i = L - 1; i >= 0; i-- )
-        {
-            y[i] = x[i];
-            move32();
-        }
-#ifndef FIX_1052_COPY_CMPLX_DISCREPANCY
+        y[i] = x[i];
+        move32();
     }
-#endif
 }
 
 void set8_fx(
@@ -692,7 +676,6 @@ void set32_fx(
     const Word16 N  /* i  : Lenght of the vector                */
 )
 {
-#ifdef FIX_1106_SIMPLIFY_SET32FX
     Word16 i;
 
     FOR( i = 0; i < N; i++ )
@@ -700,26 +683,6 @@ void set32_fx(
         y[i] = a;
         move32();
     }
-#else
-    Word16 i, tmp;
-    tmp = extract_l( a );
-    IF( EQ_32( L_deposit_l( tmp ), a ) )
-    {
-        FOR( i = 0; i < N; i++ )
-        {
-            y[i] = L_deposit_l( tmp );
-            move32();
-        }
-    }
-    ELSE
-    {
-        FOR( i = 0; i < N; i++ )
-        {
-            y[i] = a;
-            move32();
-        }
-    }
-#endif
 
     return;
 }
@@ -762,11 +725,7 @@ void Copy_Scale_sig(
     }
     FOR( i = 0; i < lg; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[i] = shl_o( x[i], exp0, &Overflow );
-#else
-        y[i] = shl( x[i], exp0 );
-#endif
         move16(); /* saturation can occur here */
     }
 }
@@ -775,7 +734,7 @@ void Copy_Scale_sig(
  *
  * Up/down scale a 16 bits vector x and move it into y
  *-------------------------------------------------------------------*/
-void Copy_Scale_sig_16_32(
+void Copy_Scale_sig_16_32_DEPREC(
     const Word16 x[], /* i  : signal to scale input           Qx        */
     Word32 y[],       /* o  : scaled signal output            Qx        */
     const Word16 lg,  /* i  : size of x[]                     Q0        */
@@ -804,20 +763,20 @@ void Copy_Scale_sig_16_32(
         /*Should not happen */
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = L_deposit_l( shl_o( x[i], exp0, &Overflow ) );
-#else
-            y[i] = L_deposit_l( shl( x[i], exp0 ) );
-#endif
             move32();
         }
         return;
     }
-#ifdef BASOP_NOGLOB
-    tmp = shl_o( 1, exp0, &Overflow );
+#ifdef DEBUGGING
+    if ( exp0 >= 16 )
+    {
+        printf( "Issue in Copy_Scale_sig_16_32_DEPREC\n" );
+    }
 #else
-    tmp = shl( 1, exp0 );
+    assert( exp0 < 16 );
 #endif
+    tmp = shl_o( 1, exp0, &Overflow );
     FOR( i = 0; i < lg; i++ )
     {
         y[i] = L_mult0( x[i], tmp );
@@ -854,26 +813,42 @@ void Copy_Scale_sig_16_32_no_sat(
         /*Should not happen */
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = L_deposit_l( shl_o( x[i], exp0, &Overflow ) );
-#else
-            y[i] = L_deposit_l( shl( x[i], exp0 ) );
-#endif
             move32();
         }
         return;
     }
-#ifdef BASOP_NOGLOB
+#ifdef FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat
     L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );
+
+    IF( L_tmp >= 0x7FFF )
+    {
+        FOR( i = 0; i < lg; i++ )
+        {
+            // y[i] = L_mult0(x[i], L_tmp);
+            y[i] = W_extract_l( W_mult_32_16( L_tmp, x[i] ) );
+            move32(); /* Overflow can occur here */
+        }
+        return;
+    }
+    // ELSE
+    {
+        Word16 tmp = extract_l( L_tmp );
+        FOR( i = 0; i < lg; i++ )
+        {
+            y[i] = L_mult( x[i], tmp );
+            move32();
+        }
+    }
 #else
-    tmp = shl( 1, exp0 );
-#endif
+    L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );
     FOR( i = 0; i < lg; i++ )
     {
         // y[i] = L_mult0(x[i], L_tmp);
         y[i] = W_extract_l( W_mult_32_16( L_tmp, x[i] ) );
-        move32(); /* saturation can occur here */
+        move32(); /* Overflow can occur here */
     }
+#endif
 }
 
 void Copy_Scale_sig_32_16(
@@ -895,11 +870,7 @@ void Copy_Scale_sig_32_16(
     {
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = round_fx_o( L_shl_o( x[i], tmp, &Overflow ), &Overflow );
-#else
-            y[i] = round_fx( L_shl( x[i], tmp ) );
-#endif
             move16();
         }
     }
@@ -907,11 +878,7 @@ void Copy_Scale_sig_32_16(
     {
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = round_fx_o( x[i], &Overflow );
-#else
-            y[i] = round_fx( x[i] );
-#endif
             move16();
         }
     }
@@ -933,14 +900,14 @@ void Scale_sig32(
     Flag Overflow = 0;
     move32();
 #endif
+    IF( 0 == exp0 )
+    {
+        return;
+    }
 
     FOR( i = 0; i < lg; i++ )
     {
-#ifdef BASOP_NOGLOB
         x[i] = L_shl_o( x[i], exp0, &Overflow );
-#else
-        x[i] = L_shl( x[i], exp0 );
-#endif
         move32(); /* saturation can occur here */
     }
 }
@@ -990,31 +957,17 @@ void Scale_sig(
     {
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             x[i] = shl_sat( x[i], exp0 );
-#else                 /* BASOP_NOGLOB */
-            x[i] = shl( x[i], exp0 );
-#endif                /* BASOP_NOGLOB */
             move16(); /* saturation can occur here */
         }
         return;
     }
     IF( exp0 < 0 )
     {
-#ifdef BASOP_NOGLOB
         tmp = shl_sat( -32768, exp0 ); /* we use negative to correctly represent 1.0 */
-#else
-        BASOP_SATURATE_WARNING_OFF_EVS
-        tmp = shl( -32768, exp0 ); /* we use negative to correctly represent 1.0 */
-        BASOP_SATURATE_WARNING_ON_EVS
-#endif
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             x[i] = msu_r_sat( 0, x[i], tmp );
-#else
-            x[i] = msu_r( 0, x[i], tmp );
-#endif
             move16(); /* msu instead of mac because factor is negative */
         }
         return;
@@ -1044,7 +997,7 @@ void scale_sig(
 }
 
 /*---------------------------------------------------------------------*
- * mean()
+ * mean_fx()
  *
  *---------------------------------------------------------------------*/
 Word16 mean_fx(                       /* o  : mean of vector                         */
@@ -1108,11 +1061,7 @@ void Vr_add(
 
     FOR( i = 0; i < Len; i++ )
     {
-#ifdef BASOP_NOGLOB
         out[i] = add_sat( in1[i], in2[i] );
-#else  /* BASOP_NOGLOB */
-        out[i] = add( in1[i], in2[i] );
-#endif /* BASOP_NOGLOB */
         move16();
     }
 }
@@ -1552,12 +1501,8 @@ Word32 var_fx_32(                  /* o: variance of vector                    Q
     v = L_deposit_l( 0 );
     FOR( i = 0; i < len; i++ )
     {
-        tmp = sub( x[i], m ); /*Qx */
-#ifdef BASOP_NOGLOB
+        tmp = sub( x[i], m );          /*Qx */
         v = L_mac0_sat( v, tmp, tmp ); /*(Qx+Qx) */
-#else                                  /* BASOP_NOGLOB */
-        v = L_mac0( v, tmp, tmp ); /*(Qx+Qx) */
-#endif                                 /* BASOP_NOGLOB */
     }
     L_tmp = Mult_32_16( v, inv_len );             /*Q(14-exp+Qx+Qx) */
     v = L_shl( L_tmp, add( exp, sub( 2, Qx ) ) ); /*Qx+16 */
@@ -1598,11 +1543,7 @@ Word32 var_fx_32in_32out(                   /* o: variance of vector
  * convolution are considered.
  *-------------------------------------------------------------------*/
 
-#ifdef BASOP_NOGLOB /*Critical overflow */
 Flag conv_fx(
-#else
-void conv_fx(
-#endif
     const Word16 x[], /* i  : input vector                              Q_new*/
     const Word16 h[], /* i  : impulse response (or second input vector) Q(15)*/
     Word16 y[],       /* o  : output vetor (result of convolution)      12 bits*/
@@ -1623,22 +1564,12 @@ void conv_fx(
         L_sum = L_mult( x[0], h[n] );
         FOR( i = 1; i < n; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_sum = L_mac_o( L_sum, x[i], h[n - i], &Overflow );
-#else
-            L_sum = L_mac( L_sum, x[i], h[n - i] );
-#endif
         }
-#ifdef BASOP_NOGLOB
         y[n] = mac_ro( L_sum, x[i], h[0], &Overflow );
-#else
-        y[n] = mac_r( L_sum, x[i], h[0] );
-#endif
         move16();
     }
-#ifdef BASOP_NOGLOB
     return Overflow;
-#endif
 }
 
 /*-------------------------------------------------------------------*
@@ -1648,11 +1579,7 @@ void conv_fx(
  * All vectors are of length L. Only the first L samples of the
  * convolution are considered.
  *-------------------------------------------------------------------*/
-#ifdef BASOP_NOGLOB /*Critical overflow */
 Flag conv_fx_32(
-#else
-void conv_fx_32(
-#endif
     const Word16 x[], /* i  : input vector                              Q_new*/
     const Word16 h[], /* i  : impulse response (or second input vector) Q(15)*/
     Word32 y[],       /* o  : output vetor (result of convolution)      12 bits*/
@@ -1675,9 +1602,7 @@ void conv_fx_32(
         y[n] = L_mac_o( L_sum, x[i], h[0], &Overflow );
         move32();
     }
-#ifdef BASOP_NOGLOB
     return Overflow;
-#endif
 }
 Word16 var_fx(                  /* o: variance of vector                    Qx*/
                const Word16 *x, /* i: input vector                          Qx*/
@@ -1706,20 +1631,11 @@ Word16 var_fx(                  /* o: variance of vector                    Qx*/
     v = L_deposit_l( 0 );
     FOR( i = 0; i < len; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = sub_sat( x[i], m );      /*Qx */
         v = L_mac0_sat( v, tmp, tmp ); /*(Qx+Qx) */
-#else
-        tmp = sub( x[i], m );                                    /*Qx */
-        v = L_mac0( v, tmp, tmp );                               /*(Qx+Qx) */
-#endif
     }
-    L_tmp = Mult_32_16( v, inv_len ); /*Q(14-exp+Qx+Qx) */
-#ifdef BASOP_NOGLOB
+    L_tmp = Mult_32_16( v, inv_len );                                    /*Q(14-exp+Qx+Qx) */
     v_16 = round_fx_sat( L_shl_sat( L_tmp, add( exp, sub( 2, Qx ) ) ) ); /*Qx */
-#else                                                                    /* BASOP_NOGLOB */
-    v_16 = round_fx( L_shl( L_tmp, add( exp, sub( 2, Qx ) ) ) ); /*Qx */
-#endif                                                                   /* BASOP_NOGLOB */
 
     return v_16;
 }
@@ -1811,11 +1727,7 @@ void Vr_subt(
 
     FOR( i = 0; i < N; i++ )
     {
-#ifdef BASOP_NOGLOB
         y[i] = sub_sat( x1[i], x2[i] );
-#else  /* BASOP_NOGLOB */
-        y[i] = sub( x1[i], x2[i] );
-#endif /* BASOP_NOGLOB */
         move16();
     }
 }
@@ -2010,7 +1922,6 @@ Word16 w_vquant_fx(
         {
             dist = L_deposit_l( 0 );
 
-#ifdef BASOP_NOGLOB
             tmp = sub_o( x[3], shr( cb[j++], Qx ), &Overflow );
             if ( weights[3] != 0 )
             {
@@ -2031,28 +1942,6 @@ Word16 w_vquant_fx(
             {
                 dist = L_mac0_o( dist, tmp, tmp, &Overflow );
             }
-#else
-            tmp = sub( x[3], shr( cb[j++], Qx ) );
-            if ( weights[3] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-            tmp = sub( x[2], shr( cb[j++], Qx ) );
-            if ( weights[2] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-            tmp = sub( x[1], shr( cb[j++], Qx ) );
-            if ( weights[1] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-            tmp = sub( x[0], shr( cb[j++], Qx ) );
-            if ( weights[0] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-#endif
             if ( LT_32( dist, minDist ) )
             {
                 idx = c;
@@ -2082,7 +1971,6 @@ Word16 w_vquant_fx(
         {
             dist = L_deposit_l( 0 );
 
-#ifdef BASOP_NOGLOB
             tmp = sub_o( x[0], shr( cb[j++], Qx ), &Overflow );
             if ( weights[0] != 0 )
             {
@@ -2103,28 +1991,6 @@ Word16 w_vquant_fx(
             {
                 dist = L_mac0_o( dist, tmp, tmp, &Overflow );
             }
-#else
-            tmp = sub( x[0], shr( cb[j++], Qx ) );
-            if ( weights[0] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-            tmp = sub( x[1], shr( cb[j++], Qx ) );
-            if ( weights[1] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-            tmp = sub( x[2], shr( cb[j++], Qx ) );
-            if ( weights[2] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-            tmp = sub( x[3], shr( cb[j++], Qx ) );
-            if ( weights[3] != 0 )
-            {
-                dist = L_mac0( dist, tmp, tmp );
-            }
-#endif
             if ( LT_32( dist, minDist ) )
             {
                 idx = c;
@@ -2183,11 +2049,7 @@ Word16 emaximum_fx(                    /* o  : return index with max energy valu
         emax = L_max( emax, L_tmp );
     }
 
-#ifdef BASOP_NOGLOB
     *ener_max = L_shr_sat( emax, add( Qvec, Qvec ) );
-#else  /* BASOP_NOGLOB */
-    *ener_max = L_shr( emax, add( Qvec, Qvec ) );
-#endif /* BASOP_NOGLOB */
     move32();
 
     return ind;
@@ -2224,11 +2086,7 @@ Word16 emaximum_32fx(                    /* o  : return index with max energy va
         }
     }
 
-#ifdef BASOP_NOGLOB
     *ener_max = W_extract_l( W_shr( emax, add( Qvec, Qvec ) ) );
-#else  /* BASOP_NOGLOB */
-    *ener_max = L_shr( emax, add( Qvec, Qvec ) );
-#endif /* BASOP_NOGLOB */
     move32();
 
     return ind;
@@ -2272,11 +2130,7 @@ Word32 sum32_fx(                    /* o  : sum of all vector elements
     tmp = L_deposit_l( 0 );
     FOR( i = 0; i < lvec; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = L_add_sat( tmp, vec[i] ); /*Qx */
-#else                                   /* BASOP_NOGLOB */
-        tmp = L_add( tmp, vec[i] );             /*Qx */
-#endif                                  /* BASOP_NOGLOB */
     }
 
     return tmp;
@@ -2292,11 +2146,7 @@ Word16 sum16_fx(                    /* o  : sum of all vector elements
     move16();
     FOR( i = 0; i < lvec; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = add_sat( tmp, vec[i] ); /*Qx */
-#else
-        tmp = add( tmp, vec[i] );               /*Qx */
-#endif
     }
 
     return tmp;
@@ -2321,7 +2171,7 @@ Word16 own_random2_fx( Word16 seed )
 }
 
 /*---------------------------------------------------------------------
- * sign()
+ * sign_fx()
  *
  *---------------------------------------------------------------------*/
 
@@ -2539,30 +2389,17 @@ void pz_filter_sp_fx(
         Lacc = L_deposit_h( x[i] ); /* Lacc in Q(16+Qn)*/
         Lacc = L_shl( Lacc, s );    /* Lacc=x[i] in Q(16+Qn-2Qa+1)*/
         FOR( j = PDR - 1; j >= 0; j-- )
-#ifdef BASOP_NOGLOB
         Lacc = L_msu_sat( Lacc, buf[j], a[j + 1] ); /*Q(16+Qn-2Qa+1)*/
-#else
-        Lacc = L_msu( Lacc, buf[j], a[j + 1] ); /*Q(16+Qn-2Qa+1)*/
-#endif
 
 
         Lacc = L_shr( Lacc, 1 );
-#ifdef BASOP_NOGLOB
         Ltemp1 = L_add_sat( L_shl_sat( Lacc, Qa ), 0x08000 );
-#else
-        Ltemp1 = L_add( L_shl( Lacc, Qa ), 0x08000 );
-#endif
         s_mem = extract_h( Ltemp1 );
 
         Lacc = L_deposit_l( 0 );
         FOR( j = PNR - 1; j >= 0; j-- )
-#ifdef BASOP_NOGLOB
         Lacc = L_mac_sat( Lacc, buf[j], b[j + 1] );
         Lacc = L_mac_sat( Lacc, s_mem, b[0] );
-#else
-        Lacc = L_mac( Lacc, buf[j], b[j + 1] );
-        Lacc = L_mac( Lacc, s_mem, b[0] );
-#endif
         /* Lacc in Q(1+Qc+Qn-Qa)*/
 
         FOR( j = s_max( PDR, PNR ) - 1; j > 0; j-- )
@@ -2574,12 +2411,8 @@ void pz_filter_sp_fx(
         buf[0] = s_mem;
         move16();
 
-#ifdef BASOP_NOGLOB
         Ltemp1 = L_add_sat( L_shr_sat( Lacc, s ), 0x08000 ); /*  Ltemp1 in Qc+Qa+Qn=Q(Qn) */
-#else
-        Ltemp1 = L_add( L_shr( Lacc, s ), 0x08000 ); /*  Ltemp1 in Qc+Qa+Qn=Q(Qn) */
-#endif
-        y[i] = extract_h( Ltemp1 ); /*  y[i] in Qn */
+        y[i] = extract_h( Ltemp1 );                          /*  y[i] in Qn */
         move16();
     }
 }
@@ -2637,27 +2470,15 @@ Word32 root_a_over_b_fx(
     }
 
     exp_num = norm_l( b );
-#ifdef BASOP_NOGLOB
     num = round_fx_o( L_shl_o( b, exp_num, &Overflow ), &Overflow );
-#else
-    num = round_fx( L_shl( b, exp_num ) );
-#endif
     exp_num = sub( sub( 30, exp_num ), Q_b );
 
     exp_den = norm_l( a );
-#ifdef BASOP_NOGLOB
     den = round_fx_o( L_shl_o( a, exp_den, &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    den = round_fx( L_shl( a, exp_den ) );
-#endif /* BASOP_NOGLOB */
     exp_den = sub( sub( 30, exp_den ), Q_a );
 
     scale = shr( sub( den, num ), 15 );
-#ifdef BASOP_NOGLOB
     num = shl_o( num, scale, &Overflow );
-#else
-    num = shl( num, scale );
-#endif
     exp_num = sub( exp_num, scale );
 
     tmp = div_s( num, den );
@@ -2672,6 +2493,109 @@ Word32 root_a_over_b_fx(
     return L_tmp;
 }
 
+Word32 root_a_over_b_ivas_fx(
+    Word32 a, /* Q(Q_a) */
+    Word16 Q_a,
+    Word32 b, /* Q(Q_b) */
+    Word16 Q_b,
+    Word16 *q_out )
+{
+    Word16 shift_a, shift_b, shift;
+    Word32 mod_a, mod_b, one_in_Q_a, one_in_Q_b, half_in_Q_a, half_in_Q_b;
+    Word32 a_sqr, b_sqr, p0, p1, p2, approx;
+    Word16 exp;
+
+    test();
+    IF( ( a <= 0 ) || ( b <= 0 ) )
+    {
+        *q_out = 0;
+        move16();
+        return 0;
+    }
+
+    one_in_Q_a = L_shl( 1, Q_a );         // 1.0f in Q_a
+    one_in_Q_b = L_shl( 1, Q_b );         // 1.0f in Q_b
+    half_in_Q_a = L_shr( one_in_Q_a, 1 ); // 0.5f in Q_a
+    half_in_Q_b = L_shr( one_in_Q_b, 1 ); // 0.5f in Q_b
+
+    a = L_add( a, one_in_Q_a );
+    b = L_add( b, one_in_Q_b );
+
+    /* This next piece of code implements a "norm" function */
+    /* and returns the shift needed to scale "a" to have a  */
+    /* 1 in the (MSB-1) position. This is equivalent to     */
+    /* giving a value between 0.5 & 1.0.                    */
+
+    mod_a = a;
+    move32();
+
+    shift_a = 0;
+    move16();
+    WHILE( GT_32( mod_a, one_in_Q_a ) )
+    {
+        mod_a = L_shr( mod_a, 1 );
+        shift_a = sub( shift_a, 1 );
+    }
+
+    WHILE( LT_32( mod_a, half_in_Q_a ) )
+    {
+        mod_a = L_shl( mod_a, 1 );
+        shift_a = add( shift_a, 1 );
+    }
+
+    shift_a = s_and( shift_a, -2 );
+    mod_a = L_shl( a, shift_a ); // Q_a
+
+    /* This next piece of code implements a "norm" function */
+    /* and returns the shift needed to scale "b" to have a  */
+    /* 1 in the (MSB-1) position. This is equivalent to     */
+    /* giving a value between 0.5 & 1.0.                    */
+    mod_b = b;
+    move32();
+
+    shift_b = 0;
+    move16();
+    WHILE( GT_32( mod_b, one_in_Q_b ) )
+    {
+        mod_b = L_shr( mod_b, 1 );
+        shift_b = sub( shift_b, 1 );
+    }
+
+    WHILE( LT_32( mod_b, half_in_Q_b ) )
+    {
+        mod_b = L_shl( mod_b, 1 );
+        shift_b = add( shift_b, 1 );
+    }
+
+    shift_b = s_and( shift_b, -2 );
+    mod_b = L_shl( b, shift_b ); // Q_b
+
+    shift = shr( sub( shift_b, shift_a ), 1 );
+
+    a_sqr = W_extract_h( W_shl( W_mult0_32_32( mod_a, mod_a ), sub( 32, Q_a ) ) ); // Q_a
+    b_sqr = W_extract_h( W_shl( W_mult0_32_32( mod_b, mod_b ), sub( 32, Q_b ) ) ); // Q_b
+
+    p2 = L_shl( -408505077 /* -0.7609f in Q29 */, sub( Q_b, 31 ) ); // Qb-2
+    p1 = L_shl( 1444612250 /* 2.6908f in Q29 */, sub( Q_b, 31 ) );  // Qb-2
+    p0 = L_shl( 385258566 /* 0.7176f in Q29 */, sub( Q_b, 31 ) );   // Qb-2
+
+    p2 = Madd_32_32( Madd_32_32( p2, 501759554 /* 0.9346f in Q29*/, mod_b ), -252060893 /* -0.4695f in Q29 */, b_sqr );   // Q_b-2
+    p1 = Madd_32_32( Madd_32_32( p1, -1774680487 /* -3.3056f in Q29 */, mod_b ), 891635211 /* 1.6608f in Q29 */, b_sqr ); // Q_b-2
+    p0 = Madd_32_32( Madd_32_32( p0, -473251709 /* -0.8815f in Q29 */, mod_b ), 237780127 /* 0.4429f in Q29 */, b_sqr );  // Q_b-2
+
+    /* approx = p0 + p1 * mod_a + p2 * mod_a * mod_a; */
+    approx = Madd_32_32( Mpy_32_32( p1, mod_a ), p2, a_sqr ); // Q_a+Q_b-33
+    approx = L_add( approx, L_shl( p0, sub( Q_a, 31 ) ) );    // Q_a+Q_b-33
+
+    exp = sub( norm_l( approx ), 1 );
+    approx = L_shl( approx, exp ); // // Q_a+Q_b-33+exp
+
+    *q_out = sub( add( sub( add( Q_a, Q_b ), 33 ), exp ), shift );
+    move16();
+
+    return approx;
+}
+
 /*===================================================================*/
 /* FUNCTION      :  fir_fx ()                     */
 /*-------------------------------------------------------------------*/
@@ -2725,7 +2649,6 @@ void fir_fx( const Word16 x[], /* i  : input vector
     /* do the filtering */
     FOR( i = 0; i < L; i++ )
     {
-#ifdef BASOP_NOGLOB
         s = L_mult_o( buf_in[K + i], h[0], &Overflow );
 
         FOR( j = 1; j <= K; j++ )
@@ -2734,16 +2657,6 @@ void fir_fx( const Word16 x[], /* i  : input vector
         }
         s = L_shl_o( s, shift, &Overflow );
         y[i] = round_fx_o( s, &Overflow ); /*Qx */
-#else
-        s = L_mult( buf_in[K + i], h[0] );
-
-        FOR( j = 1; j <= K; j++ )
-        {
-            s = L_mac( s, h[j], buf_in[K + i - j] );
-        }
-        s = L_shl( s, shift );
-        y[i] = round_fx( s ); /*Qx */
-#endif
         move16();
     }
 }
@@ -2891,18 +2804,10 @@ Word16 squant_fx(                     /* o: index of the winning codeword   */
     FOR( c = 0; c < cbsize; c++ )
     {
         L_dist = L_deposit_l( 0 );
-#ifdef BASOP_NOGLOB
         tmp = sub_o( x, cb[c], &Overflow );
-#else  /* BASOP_NOGLOB */
-        tmp = sub( x, cb[c] );
-#endif /* BASOP_NOGLOB */
 
         /*dist += tmp*tmp; */
-#ifdef BASOP_NOGLOB
         L_dist = L_mac_o( L_dist, tmp, tmp, &Overflow );
-#else  /* BASOP_NOGLOB */
-        L_dist = L_mac( L_dist, tmp, tmp );
-#endif /* BASOP_NOGLOB */
 
         if ( LT_32( L_dist, L_mindist ) )
         {
@@ -3003,11 +2908,7 @@ void pz_filter_dp_fx(
         FOR( j = PDR - 1; j >= 0; j-- )
         Lacc = Msub_32_16( Lacc, buf[j], a[j + 1] ); /*Q(16+Qn-2Qa+1)*/
 
-#ifdef BASOP_NOGLOB
         s_mem = L_shl_sat( Lacc, sub( Qa, 1 ) ); /*Qn-Qa+16=Qn+Qc*/
-#else
-        s_mem = L_shl( Lacc, sub( Qa, 1 ) ); /*Qn-Qa+16=Qn+Qc*/
-#endif
         Lacc = L_deposit_l( 0 );
         FOR( j = PNR - 1; j >= 0; j-- )
         Lacc = Madd_32_16( Lacc, buf[j], b[j + 1] );
@@ -3023,12 +2924,8 @@ void pz_filter_dp_fx(
         buf[0] = s_mem;
         move16();
 
-#ifdef BASOP_NOGLOB
         Ltemp1 = L_shr_sat( Lacc, s ); /* Ltemp1 in Qc+Qa+Qn=Q(16+Qn) */
-#else
-        Ltemp1 = L_shr( Lacc, s );           /* Ltemp1 in Qc+Qa+Qn=Q(16+Qn) */
-#endif
-        y[i] = extract_h( Ltemp1 ); /* y[i] in Qn */
+        y[i] = extract_h( Ltemp1 );    /* y[i] in Qn */
         move16();
     }
 }
@@ -3065,20 +2962,12 @@ void Copy_Scale_sig32(
     {
         FOR( i = 0; i < lg; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = L_shl_o( x[i], tmp, &Overflow );
-#else
-            y[i] = L_shl( x[i], tmp );
-#endif
             move16();
         }
         return;
     }
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );
-#else
-    tmp = shl( 1, exp0 );
-#endif
     FOR( i = 0; i < lg; i++ )
     {
         y[i] = W_extract_l( W_mult_32_32( L_tmp, x[i] ) );
@@ -3105,11 +2994,7 @@ void Copy_Scale_sig32_16(
     {
         FOR( i = 0; i < len; i++ )
         {
-#ifdef BASOP_NOGLOB
             *dst++ = round_fx_sat( *src++ );
-#else
-            *dst++ = round_fx( *src++ );
-#endif
             move16();
         }
         return;
@@ -3117,15 +3002,9 @@ void Copy_Scale_sig32_16(
 
     FOR( i = 0; i < len; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_temp = L_shl_sat( *src++, exp0 );
 
         *dst++ = round_fx_sat( L_temp );
-#else
-        L_temp = L_shl( *src++, exp0 );
-
-        *dst++ = round_fx( L_temp );
-#endif
         move16();
     }
 }
@@ -3275,11 +3154,7 @@ void add_vec_fx(
     {
         FOR( i = 0; i < N; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = add_o( x1[i], shr_ro( x2[i], Qyx2, &Overflow ), &Overflow );
-#else
-            y[i] = add( x1[i], shr_r( x2[i], Qyx2 ) );
-#endif
             move16();
         }
     }
@@ -3287,11 +3162,7 @@ void add_vec_fx(
     {
         FOR( i = 0; i < N; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = add_o( shr_ro( x1[i], Qyx1, &Overflow ), shr_ro( x2[i], Qyx2, &Overflow ), &Overflow );
-#else
-            y[i] = add( shr_r( x1[i], Qyx1 ), shr_r( x2[i], Qyx2 ) );
-#endif
             move16();
         }
     }
@@ -3418,39 +3289,21 @@ Word32 Calc_Energy_Autoscaled(                       /* o: Result (Energy)
     FOR( i = 0; i < j; i++ )
     {
         /* divide by 2 so energy will be divided by 4 */
-#ifdef BASOP_NOGLOB /* Critical Overflow and all those below*/
         temp = mult_ro( *signal++, 16384, &Overflow );
         L_Energy = L_mac0_o( L_Energy, temp, temp, &Overflow );
-#else
-        temp = mult_r( *signal++, 16384 );
-        L_Energy = L_mac0( L_Energy, temp, temp );
-#endif
     }
     FOR( i = j; i < len; i += 8 ) /* Process 8 Samples at a time */
     {
         /* divide by 2 so energy will be divided by 4 */
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         temp = mult_ro( *signal++, 16384, &Overflow );
-#else
-        temp = mult_r( *signal++, 16384 );
-#endif
         L_temp = L_mult0( temp, temp );
         FOR( j = 1; j < 8; j++ )
         {
-#ifdef BASOP_NOGLOB /* Critical Overflow */
             temp = mult_ro( *signal++, 16384, &Overflow );
             L_temp = L_mac0_o( L_temp, temp, temp, &Overflow );
-#else
-            temp = mult_r( *signal++, 16384 );
-            L_temp = L_mac0( L_temp, temp, temp );
-#endif
         }
 
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_temp = L_shr_o( L_temp, temp2, &Overflow );
-#else
-        L_temp = L_shr( L_temp, temp2 );
-#endif
         /* Here we try the addition just to check if we can sum
            the energy of the small (8 Iterations) loop with the
            total energy calculated so far without an overflow.
@@ -3458,11 +3311,7 @@ Word32 Calc_Energy_Autoscaled(                       /* o: Result (Energy)
            energies are div by 2. Otherwise, nothing is done.
            After the 'IF', the sum is done again and will always
            be without an overflow. */
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_add_o( L_Energy, L_temp, &Overflow );
-#else
-        L_add( L_Energy, L_temp );
-#endif
         IF( Overflow != 0 )
         {
             L_Energy = L_shr( L_Energy, 1 );
@@ -3471,11 +3320,7 @@ Word32 Calc_Energy_Autoscaled(                       /* o: Result (Energy)
             Overflow = 0;
             move16();
         }
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_Energy = L_add_o( L_Energy, L_temp, &Overflow );
-#else
-        L_Energy = L_add( L_Energy, L_temp );
-#endif
     }
     /* Calc Final Exponent (sub 2 because of the mult_r by 16384 that already divs the ener by 4) */
     temp2 = sub( sub( shl( signal_exp, 1 ), temp2 ), 2 );
@@ -3547,11 +3392,7 @@ Word32 Sqrt_Ratio32(                /* o: Result in Q31
     exp2 = add( exp2, temp );
 
     /* Prepare for Inverse */
-#ifdef BASOP_NOGLOB
     temp = round_fx_sat( L_val1 );
-#else
-    temp = round_fx( L_val1 );
-#endif
     temp = div_s( 16384, temp );
     /* Mult Now */
     L_val2 = Mult_32_16( L_val2, temp );
@@ -3786,8 +3627,8 @@ Word16 erb_diff_search_fx( Word16 *prev_erb, const Word16 *curr_erb, Word16 *dif
             }
             ELSE
             {
-                dh = sub( dif_erb[i + offset], cb_fx[j * cb_dim + i] ); /* Q13 */
-                Ltemp1 = L_mult( dh, dh );                              /* Q27 */
+                dh = sub_sat( dif_erb[i + offset], cb_fx[j * cb_dim + i] ); /* Q13 */
+                Ltemp1 = L_mult_sat( dh, dh );                              /* Q27 */
                 dh = extract_h( Ltemp1 );
                 dl = extract_l( Ltemp1 );
 
@@ -3849,17 +3690,10 @@ void Acelp_dec_total_exc(
 
     FOR( i = 0; i < L_subfr; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_mult( gain_pit_fx, exc_fx[i + i_subfr] ), 1 );            /*Q16+Q_exc*/
         exc2_fx[i + i_subfr] = round_fx_sat( L_tmp );                                  /*Q_exc*/
         L_tmp = L_add_sat( L_tmp, L_shl_sat( L_mult( gain_code16, code_fx[i] ), 6 ) ); /*Q16+Q_exc*/
         exc_fx[i + i_subfr] = round_fx_sat( L_tmp );                                   /*Q_exc*/
-#else
-        L_tmp = L_shl( L_mult( gain_pit_fx, exc_fx[i + i_subfr] ), 1 );        /*Q16+Q_exc*/
-        exc2_fx[i + i_subfr] = round_fx( L_tmp );                              /*Q_exc*/
-        L_tmp = L_add( L_tmp, L_shl( L_mult( gain_code16, code_fx[i] ), 6 ) ); /*Q16+Q_exc*/
-        exc_fx[i + i_subfr] = round_fx( L_tmp );                               /*Q_exc*/
-#endif
         move16();
         move16();
     }
@@ -4053,20 +3887,12 @@ Word16 dot_prod_satcontr( const Word16 *x, const Word16 *y, Word16 qx, Word16 qy
     {
         Overflow = 0;
         move16();
-#ifdef BASOP_NOGLOB /* Critical Overflow and all those below*/
         L_tmp = L_shl_o( 1, s_max( sub( add( add( qx, qy ), 7 ), shift ), 0 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        L_tmp = L_shl( 1, s_max( sub( add( add( qx, qy ), 7 ), shift ), 0 ) );
-#endif /* BASOP_NOGLOB */
         pt1 = tmp_tab_x;
         pt2 = tmp_tab_y;
         FOR( i = 0; i < len; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, *pt1++, *pt2++, &Overflow ); /*Q(qx+qy-shift) */
-#else                                                             /* BASOP_NOGLOB */
-            L_tmp = L_mac0( L_tmp, *pt1++, *pt2++ ); /*Q(qx+qy-shift) */
-#endif
         }
 
         IF( Overflow != 0 )
@@ -4167,13 +3993,14 @@ void floating_point_add(
     move16();
     return;
 }
+
 /*-------------------------------------------------------------------*
- * delay_signal()
+ * delay_signal_fx()
  *
  * Delay buffer by defined number of samples
  *-------------------------------------------------------------------*/
 
-void delay_signal(
+void delay_signal_fx(
     Word16 x[],        /* i/o: signal to be delayed              */
     const Word16 len,  /* i  : length of the input signal        */
     Word16 mem[],      /* i/o: synchronization memory            */
@@ -4190,14 +4017,13 @@ void delay_signal(
     return;
 }
 
-void delay_signal_fx(
+void delay_signal32_fx(
     Word32 x[],        /* i/o: signal to be delayed              */
     const Word16 len,  /* i  : length of the input signal        */
     Word32 mem[],      /* i/o: synchronization memory            */
     const Word16 delay /* i  : delay in samples                  */
 )
 {
-
     Word32 tmp_buffer[L_FRAME48k];
 
     Copy32( mem, tmp_buffer, delay );
@@ -4207,6 +4033,7 @@ void delay_signal_fx(
 
     return;
 }
+
 void delay_signal_q_adj_fx(
     Word32 x[],         /* i/o: signal to be delayed                    */
     const Word16 len,   /* i  : length of the input signal              */
@@ -4299,30 +4126,6 @@ void v_shr_16(
     return;
 }
 
-/*-------------------------------------------------------------------*
- * delay_signal()
- *
- * Delay buffer by defined number of samples
- *-------------------------------------------------------------------*/
-
-void delay_signal32(
-    Word32 x[],        /* i/o: signal to be delayed              */
-    const Word16 len,  /* i  : length of the input signal        */
-    Word32 mem[],      /* i/o: synchronization memory            */
-    const Word16 delay /* i  : delay in samples                  */
-)
-{
-    Word32 tmp_buffer[L_FRAME48k];
-
-    Copy32( mem, tmp_buffer, delay );
-    Copy32( x + sub( len, delay ), mem, delay );
-    Copy32( x, x + delay, sub( len, delay ) );
-    Copy32( tmp_buffer, x, delay );
-
-    return;
-}
-
-
 /*---------------------------------------------------------------------*
  * lin_interp_fx()
  *
@@ -4404,7 +4207,7 @@ Word16 lin_interp_ivas_fx(
 }
 
 /*---------------------------------------------------------------------
- * sign()
+ * sign_l()
  *
  *---------------------------------------------------------------------*/
 
@@ -4442,7 +4245,7 @@ void v_mult16_fixed(
 }
 
 /*---------------------------------------------------------------------*
- * set_zero()
+ * set_zero_fx()
  *
  * Set a vector vec[] of dimension lvec to zero
  *---------------------------------------------------------------------*/
@@ -4514,10 +4317,11 @@ UWord32 mvl2s_r(
 
     IF( (void *) y <= (const void *) x )
     {
+        Word32 tempd = L_shl( 1, sub( q_x, 1 ) );
         FOR( i = 0; i < n; i++ )
         {
-            temp = L_shr( x[i], sub( q_x, 1 ) );
-            temp = L_shr( L_add( temp, 1 ), 1 );
+            temp = L_add( x[i], tempd );
+            temp = L_shr( temp, q_x );
 
             IF( GT_32( temp, MAX16B ) )
             {
@@ -4538,10 +4342,11 @@ UWord32 mvl2s_r(
     }
     ELSE
     {
+        Word32 tempd = L_shl( 1, sub( q_x, 1 ) );
         FOR( i = n - 1; i >= 0; i-- )
         {
-            temp = L_shr( x[i], sub( q_x, 1 ) );
-            temp = L_shr( L_add( temp, 1 ), 1 );
+            temp = L_add( x[i], tempd );
+            temp = L_shr( temp, q_x );
 
             IF( GT_32( temp, MAX16B ) )
             {
@@ -4743,6 +4548,26 @@ void v_add_fixed(
     return;
 }
 
+#ifdef VEC_ARITH_OPT_v1
+void v_add_fixed_no_hdrm(
+    const Word32 x1[], /* i  : Input vector 1                                   */
+    const Word32 x2[], /* i  : Input vector 2                                   */
+    Word32 y[],        /* o  : Output vector that contains vector 1 + vector 2  */
+    const Word16 N     /* i  : Vector length                                    */
+)
+{
+    Word16 i;
+
+    FOR( i = 0; i < N; i++ )
+    {
+        y[i] = L_add( x1[i], x2[i] );
+        move32();
+    }
+
+    return;
+}
+#endif /* VEC_ARITH_OPT_v1 */
+
 void v_add_fixed_me(
     const Word32 x1[], /* i  : Input vector 1                                   */
     const Word16 x1_e, /* i  : Exponent for input vector 1                      */
@@ -4769,3 +4594,167 @@ void v_add_fixed_me(
 
     return;
 }
+
+Word16 find_guarded_bits_fx( Word32 n )
+{
+    // return n <= 1 ? 0 : n <= 2 ? 1
+    //   : n <= 4 ? 2
+    //   : n <= 8 ? 3
+    //   : n <= 16 ? 4
+    //   : n <= 32 ? 5
+    //   : n <= 64 ? 6
+    //   : n <= 128 ? 7
+    //   : n <= 256 ? 8
+    //   : n <= 512 ? 9
+    //   : n <= 1024 ? 10
+    //   : n <= 2048 ? 11
+    //   : n <= 4096 ? 12
+    //   : n <= 8192 ? 13
+    //   : n <= 16384 ? 14
+    //   : 15;
+    /*Word16 val = 0;
+    move32();
+    test();
+    WHILE( GT_32( n, L_shl( 1, val ) ) && LT_32( val, 16 ) )
+    {
+        val = add( val, 1 );
+    }*/
+    IF( LE_32( n, 1 ) )
+    {
+        return 0;
+    }
+    ELSE
+    {
+
+        return sub( 31, norm_l( L_sub( n, 1 ) ) );
+    }
+}
+
+Word16 L_norm_arr( const Word32 *arr, Word16 size )
+{
+    Word16 q = 31;
+    move16();
+    FOR( Word16 i = 0; i < size; i++ )
+    {
+        Word16 q_tst;
+
+        q_tst = norm_l( arr[i] );
+        if ( arr[i] != 0 )
+        {
+            q = s_min( q, q_tst );
+        }
+    }
+
+    return q;
+}
+
+Word16 norm_arr( Word16 *arr, Word16 size )
+{
+    Word16 q = 15;
+    Word16 exp = 0;
+    move16();
+    move16();
+    FOR( Word16 i = 0; i < size; i++ )
+    {
+        if ( arr[i] != 0 )
+        {
+            exp = norm_s( arr[i] );
+        }
+        if ( arr[i] != 0 )
+        {
+            q = s_min( q, exp );
+        }
+    }
+    return q;
+}
+
+Word16 W_norm_arr( Word64 *arr, Word16 size )
+{
+    Word16 q = 63;
+    Word16 exp = 0;
+    move16();
+    move16();
+    FOR( Word16 i = 0; i < size; i++ )
+    {
+        if ( arr[i] != 0 )
+        {
+            exp = W_norm( arr[i] );
+        }
+        if ( arr[i] != 0 )
+        {
+            q = s_min( q, exp );
+        }
+    }
+    return q;
+}
+
+Word16 get_min_scalefactor( Word32 x, Word32 y )
+{
+    Word16 scf_y;
+    Word16 scf = Q31;
+    move16();
+
+    test();
+    if ( x == 0 && y == 0 )
+    {
+        scf = 0;
+        move16();
+    }
+
+    if ( x != 0 )
+    {
+        scf = norm_l( x );
+    }
+
+    scf_y = norm_l( y );
+    if ( y != 0 )
+    {
+        scf = s_min( scf_y, scf );
+    }
+
+    return scf;
+}
+
+
+Flag is_zero_arr( Word32 *arr, Word16 size )
+{
+    FOR( Word16 i = 0; i < size; i++ )
+    IF( arr[i] != 0 )
+    {
+        return 0;
+    }
+
+    return 1;
+}
+
+Flag is_zero_arr16( Word16 *arr, Word16 size )
+{
+    FOR( Word16 i = 0; i < size; i++ )
+    IF( arr[i] != 0 )
+    {
+        return 0;
+    }
+
+    return 1;
+}
+
+void Scale_sig64(
+    Word64 x[], /* i/o: signal to scale                 Qx        */
+    Word16 len, /* i  : size of x[]                     Q0        */
+    Word16 exp  /* i  : exponent: x = round(x << exp)   Qx exp    */
+)
+{
+    Word16 i;
+    assert( exp <= 63 && exp >= -63 );
+    IF( exp == 0 )
+    {
+        return;
+    }
+
+    FOR( i = 0; i < len; i++ )
+    {
+        /* saturation can occur here */
+        x[i] = W_shl( x[i], exp );
+        move64();
+    }
+}
diff --git a/lib_com/trans_direct_fx.c b/lib_com/trans_direct_fx.c
index d4792fb7517c940a9244a9cc51089d14137b636a..6a3cdf108733bc3601d87d7398f6686087eae3cf 100644
--- a/lib_com/trans_direct_fx.c
+++ b/lib_com/trans_direct_fx.c
@@ -40,9 +40,7 @@ void direct_transform_fx(
     Word16 shift, Qmin = 31;
     Word32 L_tmp;
     Word16 Qs[NUM_TIME_SWITCHING_BLOCKS];
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) ( element_mode );
-#endif
     move16();
 
     segment_length = shr( L, 1 );
diff --git a/lib_com/trans_inv_fx.c b/lib_com/trans_inv_fx.c
index cc562c8999d960dc77257c30b538430068a4d1c3..0683e266ce67faea01f2768f6b51a98bd56f3ab4 100644
--- a/lib_com/trans_inv_fx.c
+++ b/lib_com/trans_inv_fx.c
@@ -84,7 +84,9 @@ void preecho_sb_fx(
     UWord16 tmp_u16;
     Word32 mean_prev_hb_fx_loc, mean_prev_nc_fx_loc, mean_prev_fx_loc; /*                                                  */
     Word16 q16p1, qmemp1, qtmp;
-
+#ifdef OPT_STEREO_32KBPS_V1
+    Word16 shift_q = sub( 15, q_sig32 );
+#endif /* OPT_STEREO_32KBPS_V1 */
 
     q16p1 = add( q_sig16, 1 );
     qmemp1 = q16p1;
@@ -93,11 +95,7 @@ void preecho_sb_fx(
     {
 
         mean_prev_fx_loc = L_add( *mean_prev_fx, 0 );
-#ifdef BASOP_NOGLOB
         mean_prev_hb_fx_loc = L_shl_sat( *mean_prev_hb_fx, shl( q_sig16, 1 ) ); /*Q0 to q_sig16*/
-#else
-        mean_prev_hb_fx_loc = L_shl( *mean_prev_hb_fx, shl( q_sig16, 1 ) ); /*Q0 to q_sig16*/
-#endif
         mean_prev_nc_fx_loc = L_add( *mean_prev_nc_fx, 0 );
         framelength_m1 = sub( framelength, 1 );
         nb_flag = 0;
@@ -141,26 +139,33 @@ void preecho_sb_fx(
         /*            len3xLp20 = framelength/2-(short)((float)framelength*N_ZERO_MDCT/FRAME_SIZE_MS); in float*/
 
         fxptr1 = imdct_mem_fx;
+#ifdef OPT_STEREO_32KBPS_V1
+        FOR( i = 0; i < len3xLp20; i++ )
+        {
+            *fxptr1++ = negate( extract_h( L_shl_sat( wtda_audio_fx[len3xLp20 - 1 - i], shift_q ) ) ); /*Q-1*/
+            move16();                                                                                  /*convert to Word16 Q-1 with saturation (saturation not a problem here) */
+        }
+        FOR( i = 0; i < framelength >> 1; i++ )
+        {
+            *fxptr1++ = negate( extract_h( L_shl_sat( wtda_audio_fx[i], shift_q ) ) ); /*Q-1*/
+            move16();                                                                  /*convert to Word16 Q-1 with saturation (saturation not a problem here) */
+        }
+#else  /* OPT_STEREO_32KBPS_V1 */
         fx32ptr1 = wtda_audio_fx + len3xLp20 - 1; /*q_sig32*/
         FOR( i = 0; i < len3xLp20; i++ )
         {
-#ifdef BASOP_NOGLOB
             *fxptr1++ = negate( extract_h( L_shl_sat( *fx32ptr1--, sub( 15, q_sig32 ) ) ) ); /*Q-1*/
-#else
-            *fxptr1++ = negate( extract_h( L_shl( *fx32ptr1--, 15 - q_sig32 ) ) );
-#endif
-            move16(); /*convert to Word16 Q-1 with saturation (saturation not a problem here) */
+            move16();                                                                        /*convert to Word16 Q-1 with saturation (saturation not a problem here) */
         }
         FOR( i = 0; i < L_shr( framelength, 1 ); i++ )
         {
-#ifdef BASOP_NOGLOB
             *fxptr1++ = negate( extract_h( L_shl_sat( wtda_audio_fx[i], sub( 15, q_sig32 ) ) ) ); /*Q-1*/
-#else
-            *fxptr1++ = negate( extract_h( L_shl( wtda_audio_fx[i], 15 - q_sig32 ) ) );
-#endif
-            move16(); /*convert to Word16 Q-1 with saturation (saturation not a problem here) */
+            move16();                                                                             /*convert to Word16 Q-1 with saturation (saturation not a problem here) */
         }
+#endif /* OPT_STEREO_32KBPS_V1 */
+
         qmemp1 = 0; /*already in q-1*/
+        move16();
 
         subframelength = shr( framelength, LOG2_NUMSF );                  /*Q0*/
         subsubframelength = shr( subframelength, log2_num_subsubframes ); /*Q0*/
@@ -195,13 +200,9 @@ void preecho_sb_fx(
         fxptr3 = rec_sig_fx + 1; /*q_sig16*/
         fxptr4 = rec_sig_fx + 2; /*q_sig16*/
 
-#ifdef BASOP_NOGLOB
         tmp_fxL1 = L_mult( shl_sat( *memfilt_lb_fx, q_sig16 ), 8192 ); /* *memfilt_lb_fx in q0  */
-#else
-        tmp_fxL1 = L_mult( shl( *memfilt_lb_fx, q_sig16 ), 8192 ); /* *memfilt_lb_fx in q0  */
-#endif
-        tmp_fxL1 = L_mac( tmp_fxL1, *fxptr3, 8192 /*Q15*/ ); /*Q16*/
-        *fxptr1 = mac_r( tmp_fxL1, *fxptr2, 16384 /*Q15*/ ); /*Q0*/
+        tmp_fxL1 = L_mac( tmp_fxL1, *fxptr3, 8192 /*Q15*/ );           /*Q16*/
+        *fxptr1 = mac_r( tmp_fxL1, *fxptr2, 16384 /*Q15*/ );           /*Q0*/
         move16();
         fxptr1++;
 
@@ -234,12 +235,8 @@ void preecho_sb_fx(
         }
 
         fxptr2--;
-#ifdef BASOP_NOGLOB
         *memfilt_lb_fx = shr_sat( *fxptr2, q_sig16 ); /*Q0*/
-#else
-        *memfilt_lb_fx = shr( *fxptr2, q_sig16 );
-#endif
-        move16(); /* *memfilt_lb_fx in q0  */
+        move16();                                     /* *memfilt_lb_fx in q0  */
 
         /* energy of low bands 8 present and 1 future sub-frames */
         sptr1 = zcr; /*Q0*/
@@ -258,16 +255,9 @@ void preecho_sb_fx(
         FOR( j = 0; j < NUMSF; j++ ) /* 8 present subframes */
         {
             tmp_fx2 = sub( j, 1 );
-#ifdef BASOP_NOGLOB
             tmp_fx1 = shr_sat( *fxptr2, q16p1 );            /*q-1 to avoisd saturation in energy*/
             tmp_fxL1 = L_mac0_sat( 25, tmp_fx1, tmp_fx1 );  /*2*(Q-1)*/
             tmp_fxL2 = L_mac0_sat( 100, *fxptr3, *fxptr3 ); /*2*(q_sig16)*/
-#else
-            tmp_fx1 = shr( *fxptr2, q16p1 ); /*q-1 to avoisd saturation in energy*/
-            tmp_fxL1 = L_mac0( 25, tmp_fx1, tmp_fx1 );
-
-            tmp_fxL2 = L_mac0( 100, *fxptr3, *fxptr3 );
-#endif
             sptr2_loc = 0;
             move16();
 
@@ -287,15 +277,9 @@ void preecho_sb_fx(
                     *fx32ptr6 = tmp_fxL1; /*2*(Q-1)*/
                     move32();
                 }
-#ifdef BASOP_NOGLOB
                 tmp_fx1 = shr_sat( *fxptr2, q16p1 );                 /*q-1 to avoisd saturation in energy*/
                 tmp_fxL1 = L_mac0_sat( tmp_fxL1, tmp_fx1, tmp_fx1 ); /*2*(Q-1)*/
                 tmp_fxL2 = L_mac0_sat( tmp_fxL2, *fxptr3, *fxptr3 ); /*2*(q_sig16)*/
-#else
-                tmp_fx1 = shr( *fxptr2, q16p1 ); /*q-1 to avoisd saturation in energy*/
-                tmp_fxL1 = L_mac0( tmp_fxL1, tmp_fx1, tmp_fx1 );
-                tmp_fxL2 = L_mac0( tmp_fxL2, *fxptr3, *fxptr3 );
-#endif
                 cntnzcr = add( cntnzcr, 1 );
                 IF( L_mult0( *fxptr2, *( fxptr2 - 1 ) ) <= 0 )
                 {
@@ -357,11 +341,7 @@ void preecho_sb_fx(
             move32();
             if ( LT_32( *fx32ptr5, L_shr( *fx32ptr1, 1 ) ) )
             {
-#ifdef BASOP_NOGLOB
                 tmp_fxL1 = L_shl_sat( L_sub_sat( *fx32ptr1, *fx32ptr5 ), 1 ); /*2*(Q-1)*/
-#else
-                tmp_fxL1 = L_shl( L_sub( *fx32ptr1, *fx32ptr5 ), 1 );
-#endif
             }
             *fx32ptr5 = tmp_fxL1; /*2*(Q-1)*/
             move32();
@@ -383,12 +363,8 @@ void preecho_sb_fx(
         tmp_fx3 = sub( len3xLp20, 1 );
         FOR( i = 1; i < len3xLp20; i++ )
         {
-            tmp_fx1 = shr( *fxptr2, qmemp1 ); /*q-1 to avoisd saturation in energy*/
-#ifdef BASOP_NOGLOB
+            tmp_fx1 = shr( *fxptr2, qmemp1 );                    /*q-1 to avoisd saturation in energy*/
             tmp_fxL1 = L_mac0_sat( tmp_fxL1, tmp_fx1, tmp_fx1 ); /*2*(Q-1)*/
-#else
-            tmp_fxL1 = L_mac0( tmp_fxL1, tmp_fx1, tmp_fx1 );
-#endif
             if ( *fxptr2 * *( fxptr2 - 1 ) <= 0 )
             {
                 sptr1_loc = add( sptr1_loc, 1 );
@@ -411,31 +387,19 @@ void preecho_sb_fx(
 
         FOR( j = 1; j < tmp_fx3; j++ ) /* tmp_fx3 still contains subframelength*1.2-1 */
         {
-            tmp_fxL1 = L_mult( *fxptr2, -8192 /*Q15*/ ); /*q_sig16+Q16*/
-#ifdef BASOP_NOGLOB
+            tmp_fxL1 = L_mult( *fxptr2, -8192 /*Q15*/ );             /*q_sig16+Q16*/
             tmp_fxL1 = L_mac_sat( tmp_fxL1, *fxptr4, -8192 );        /*q_sig16+Q16*/
             tmp_fx1 = mac_r_sat( tmp_fxL1, *fxptr3, 16384 /*Q15*/ ); /*q_sig16*/
 
             tmp_fxL2 = L_mac0_sat( tmp_fxL2, tmp_fx1, tmp_fx1 ); /*2*(q_sig16)*/
-#else
-            tmp_fxL1 = L_mac( tmp_fxL1, *fxptr4, -8192 );
-            tmp_fx1 = mac_r( tmp_fxL1, *fxptr3, 16384 );
-
-            tmp_fxL2 = L_mac0( tmp_fxL2, tmp_fx1, tmp_fx1 );
-#endif
             fxptr2++;
             fxptr3++;
             fxptr4++;
         }
 
-        tmp_fxL1 = L_mult( *fxptr2, -8192 /*Q15*/ ); /*q_sig16+Q16*/
-#ifdef BASOP_NOGLOB
+        tmp_fxL1 = L_mult( *fxptr2, -8192 /*Q15*/ );                     /*q_sig16+Q16*/
         tmp_fx1 = mac_r_sat( tmp_fxL1, *fxptr3, 16384 /*Q15*/ );         /*q_sig16*/
         es_mdct_hb_fx[NUMSF] = L_mac0_sat( tmp_fxL2, tmp_fx1, tmp_fx1 ); /*2*(q_sig16)*/
-#else
-        tmp_fx1 = mac_r( tmp_fxL1, *fxptr3, 16384 );
-        es_mdct_hb_fx[NUMSF] = L_mac0( tmp_fxL2, tmp_fx1, tmp_fx1 );
-#endif
         move32();
 
         max_es_hb_fx = L_add( es_mdct_hb_fx[0], 0 ); /* for memorising the max energy */
@@ -444,6 +408,17 @@ void preecho_sb_fx(
         move16();
         FOR( i = 1; i <= NUMSF; i++ )
         {
+#ifdef OPT_STEREO_32KBPS_V1
+            max_es_hb_fx = L_max( max_es_hb_fx, es_mdct_hb_fx[i] ); /* max energy low band, 8 present and 1 future subframes */
+
+            max_es_fx = L_max( max_es_fx, es_mdct_fx[i] ); /* max energy low band, 8 present and 1 future subframes */
+
+            if ( GE_32( es_mdct_fx[i], max_es_fx ) ) /* '='  to handle the first window*/
+            {
+                maxind = i;
+                move16();
+            }
+#else  /* OPT_STEREO_32KBPS_V1 */
             IF( GE_32( es_mdct_hb_fx[i], max_es_hb_fx ) ) /* '='  to handle the first window*/
             {
                 max_es_hb_fx = L_add( es_mdct_hb_fx[i], 0 ); /* max energy low band, 8 present and 1 future subframes */
@@ -455,6 +430,7 @@ void preecho_sb_fx(
                 maxind = i;
                 move16();
             }
+#endif /* OPT_STEREO_32KBPS_V1 */
         }
 
         cnt2 = cnt5 = 0;
@@ -467,11 +443,7 @@ void preecho_sb_fx(
             move16();
         }
 
-#ifdef BASOP_NOGLOB
         if ( LT_32( max_es_fx, L_shl_sat( mean_prev_fx_loc, 2 ) ) ) /*OK if saturated*/
-#else
-        if ( LT_32( max_es_fx, L_shl( mean_prev_fx_loc, 2 ) ) ) /*OK if saturated*/
-#endif
         {
             maxind = 0;
             move16();
@@ -543,11 +515,7 @@ void preecho_sb_fx(
                         tmp_fx1 = norm_l( es_mdct_hb_fx[i] );
                         tmp_fxL1 = L_shl( es_mdct_hb_fx[i], tmp_fx1 );
                         tmp_fxL2 = L_shl( mean_prev_hb_fx_loc, tmp_fx1 );
-#ifdef FIX_1013_CRASH_HQ_CORE_DEC
                         tmp_fx1 = round_fx_sat( tmp_fxL1 );
-#else
-                        tmp_fx1 = round_fx( tmp_fxL1 );
-#endif
                         tmp_fx2 = round_fx( tmp_fxL2 );
                         tmp_fx3 = div_s( tmp_fx2, tmp_fx1 );
                         min_g_hb_fx[i] = Frac_sqrt( tmp_fx3 );
@@ -708,12 +676,8 @@ void preecho_sb_fx(
                 FOR( i = 0; i < subsubframelength; i++ )
                 {
 
-                    tmp_fx1 = shr( *ptr_fx, qtmp ); /* q-1, to have same shift as es_mdct_.. */
-#ifdef BASOP_NOGLOB
+                    tmp_fx1 = shr( *ptr_fx, qtmp );                      /* q-1, to have same shift as es_mdct_.. */
                     tmp_fxL1 = L_mac0_sat( tmp_fxL1, tmp_fx1, tmp_fx1 ); /*2*(Q-1)*/
-#else
-                    tmp_fxL1 = L_mac0( tmp_fxL1, tmp_fx1, tmp_fx1 );
-#endif
                     ptr_fx++;
                 }
                 if ( GT_32( tmp_fxL1, max_plus_es_mdct_fx ) )
@@ -721,12 +685,8 @@ void preecho_sb_fx(
                     max_plus_es_mdct_fx = L_add( tmp_fxL1, 0 );
                 }
 
-#ifdef BASOP_NOGLOB
                 sum_plus_es_fx = L_add_sat( sum_plus_es_fx, L_shl_sat( tmp_fxL1, 2 ) ); /*2*(Q-1)*/
-#else
-                sum_plus_es_fx = L_add( sum_plus_es_fx, L_shl( tmp_fxL1, 2 ) );
-#endif
-                *fx32ptr1 = tmp_fxL1; /*2*(Q-1)*/
+                *fx32ptr1 = tmp_fxL1;                                                   /*2*(Q-1)*/
                 fx32ptr1++;
                 Mpy_32_16_ss( sum_plus_es_fx, inv_jp2[j], fx32ptr4, &tmp_u16 ); /* 410 for 1/80*/
                 if ( LT_32( *fx32ptr4, maxcrit_fx ) )
@@ -899,11 +859,7 @@ void preecho_sb_fx(
             fxptr1 = preechogain_fx + tmp_fx2;                                                              /*Q15*/
             FOR( j = 0; j < smooth_len; j++ )
             {
-#ifdef BASOP_NOGLOB
                 *fxptr1 = add_sat( *fxptr1, tmp_fx1 ); /*Q15*/
-#else
-                *fxptr1 = add( *fxptr1, tmp_fx1 );
-#endif
                 move16();
                 tmp_fx1 = add( tmp_fx1, tmp_fx3 ); /*Q15*/
                 fxptr1++;
@@ -941,20 +897,12 @@ void preecho_sb_fx(
             {
                 savehalfe_fx = L_add( mean_prev_nc_fx_loc, 0 ); /*2*(Q-1)*/
             }
-#ifdef BASOP_NOGLOB
             mean_prev_nc_fx_loc = L_add_sat( mean_prev_nc_fx_loc, es_mdct_fx[i] ); /*2*(Q-1)*/
-#else
-            mean_prev_nc_fx_loc = L_add( mean_prev_nc_fx_loc, es_mdct_fx[i] );
-#endif
         }
 
         if ( LT_32( savehalfe_fx, L_shr( mean_prev_nc_fx_loc, 1 ) ) )
         {
-#ifdef BASOP_NOGLOB
             mean_prev_nc_fx_loc = L_shl_sat( L_sub_sat( mean_prev_nc_fx_loc, savehalfe_fx ), 1 ); /*2*(Q-1)*/
-#else
-            mean_prev_nc_fx_loc = L_shl( L_sub( mean_prev_nc_fx_loc, savehalfe_fx ), 1 );
-#endif
         }
         mean_prev_nc_fx_loc = L_shr( mean_prev_nc_fx_loc, 3 ); /* >> LOG2_NUMSF in fixpoint 2*(Q-1)*/
 
@@ -994,13 +942,8 @@ void preecho_sb_fx(
             mean_prev_hb_fx_loc = L_shl( tmp_fxL1, 1 ); /*2*(q_sig16)*/
         }
 
-#ifdef BASOP_NOGLOB
         last2_fx = L_shr( L_add_sat( es_mdct_fx[NUMSF_M1], es_mdct_fx[NUMSF_M2] ), 1 );          /*q_sig16*/
         last2_hb_fx = L_shr( L_add_sat( es_mdct_hb_fx[NUMSF_M1], es_mdct_hb_fx[NUMSF_M2] ), 1 ); /*q_sig16*/
-#else
-        last2_fx = L_shr( L_add( es_mdct_fx[NUMSF_M1], es_mdct_fx[NUMSF_M2] ), 1 );
-        last2_hb_fx = L_shr( L_add( es_mdct_hb_fx[NUMSF_M1], es_mdct_hb_fx[NUMSF_M2] ), 1 );
-#endif
         if ( GT_32( last2_fx, mean_prev_fx_loc ) )
         {
             mean_prev_fx_loc = L_add( last2_fx, 0 );
@@ -1012,13 +955,9 @@ void preecho_sb_fx(
         }
         *mean_prev_fx = mean_prev_fx_loc; /*2*(Q-1)*/
         move32();
-#ifdef BASOP_NOGLOB
         *mean_prev_hb_fx = L_shr_sat( mean_prev_hb_fx_loc, shl_sat( q_sig16, 1 ) ); /*Q0*/
-#else
-        *mean_prev_hb_fx = L_shr( mean_prev_hb_fx_loc, shl( q_sig16, 1 ) );
-#endif
-        move32();                               /*save in Q0*/
-        *mean_prev_nc_fx = mean_prev_nc_fx_loc; /*2*(Q-1)*/
+        move32();                                                                   /*save in Q0*/
+        *mean_prev_nc_fx = mean_prev_nc_fx_loc;                                     /*2*(Q-1)*/
         move32();
     }
 
@@ -1053,9 +992,7 @@ void Inverse_Transform(
     Word16 segment_length_div2, segment_length_div4;
     Word16 tmp, q_out;
     Word32 L_temp;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) ( element_mode );
-#endif
     /* This value is used to right shift all vectors returned by 'iedct_short_fx()' */
     /* to bring them to a scaling that is equal to the 1st 'Q' returned by the 1st  */
     /* call to 'iedct_short_fx()' minus these guard bits.                           */
diff --git a/lib_com/typedef.h b/lib_com/typedef.h
index 3d86229dd6e90e93261e44def4b6235c67ba4dab..d3aba3e9895d7beca76dea1cb09c6e073f008e3e 100644
--- a/lib_com/typedef.h
+++ b/lib_com/typedef.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_com/weight_a_fx.c b/lib_com/weight_a_fx.c
index 78297923648004976ea8e1110f24d853272c04af..7bea66ea0b0f2194210a0a06fdcc932f7660841c 100644
--- a/lib_com/weight_a_fx.c
+++ b/lib_com/weight_a_fx.c
@@ -122,11 +122,7 @@ void weight_a_fx(
     move16();
     FOR( i = 1; i < m; i++ )
     {
-#ifdef BASOP_NOGLOB
         ap[i] = round_fx_o( L_shl( L_mult0( a[i], fac ), shift ), &Overflow ); /* Q11 + shift */
-#else                                                                          /* BASOP_NOGLOB */
-        ap[i] = round_fx( L_shl( L_mult0( a[i], fac ), shift ) );
-#endif
         move16();
         fac = mult_r( fac, gamma ); /* Q15 */
     }
diff --git a/lib_com/wi_fx.c b/lib_com/wi_fx.c
index 19788dc0af989d21ec12d29937e457a4e4050c7c..591645017b05fddc498af77d499f50e1433571a5 100644
--- a/lib_com/wi_fx.c
+++ b/lib_com/wi_fx.c
@@ -320,13 +320,8 @@ static Word16 DTFS_alignment_weight_fx(
 
     FOR( k = 0; k <= HalfLag; k++ )
     {
-#ifdef BASOP_NOGLOB
         ab1[k] = round_fx_o( L_mac0_o( L_mult0( X1.a_fx[k], X2.a_fx[k] ), X1.b_fx[k], X2.b_fx[k], &Overflow ), &Overflow ); /*  Q(-15) */
         ab2[k] = round_fx_o( L_msu0_o( L_mult0( X1.a_fx[k], X2.b_fx[k] ), X1.b_fx[k], X2.a_fx[k], &Overflow ), &Overflow ); /*  Q(-15) */
-#else
-        ab1[k] = round_fx( L_mac0( L_mult0( X1.a_fx[k], X2.a_fx[k] ), X1.b_fx[k], X2.b_fx[k] ) ); /*  Q(-15) */
-        ab2[k] = round_fx( L_msu0( L_mult0( X1.a_fx[k], X2.b_fx[k] ), X1.b_fx[k], X2.a_fx[k] ) ); /*  Q(-15) */
-#endif
         move16();
         move16();
     }
@@ -349,13 +344,8 @@ static Word16 DTFS_alignment_weight_fx(
 
         FOR( k = 0; k <= HalfLag; k++ )
         {
-#ifdef BASOP_NOGLOB
             corr_fx = L_mac0_o( corr_fx, ab1[k], cos_table[s_and( temp, 511 )], &Overflow );
             corr_fx = L_mac0_o( corr_fx, ab2[k], cos_table[s_and( add( temp, 128 ), 511 )], &Overflow );
-#else
-            corr_fx = L_mac0( corr_fx, ab1[k], cos_table[s_and( temp, 511 )] );
-            corr_fx = L_mac0( corr_fx, ab2[k], cos_table[s_and( add( temp, 128 ), 511 )] );
-#endif
             move32();
             move32();
             temp = add( temp, temp1 );
@@ -368,28 +358,15 @@ static Word16 DTFS_alignment_weight_fx(
             move16();
         }
 
-#ifdef BASOP_NOGLOB
         temp1 = round_fx_o( (Word32) L_shl_o( corr_fx, Qcorr, &Overflow ), &Overflow ); /*  Q(Qcorr-16) */
         wcorr_fx = L_mult_o( temp1, shl_o( temp, 2, &Overflow ), &Overflow );           /*  Q(Qcorr-16+13+2+1)=Q(Qcorr) */
-#else
-        temp1 = round_fx( (Word32) L_shl( corr_fx, Qcorr ) );                                                                   /*  Q(Qcorr-16) */
-        wcorr_fx = L_mult( temp1, shl( temp, 2 ) );                                                                             /*  Q(Qcorr-16+13+2+1)=Q(Qcorr) */
-#endif
         IF( GE_16( Qmaxcorr, Qcorr ) )
         {
-#ifdef BASOP_NOGLOB
             diff_corr = L_sub_o( wcorr_fx, L_shl_o( maxcorr_fx, sub( Qcorr, Qmaxcorr ), &Overflow ), &Overflow ); /*  Qcorr */
-#else
-            diff_corr = L_sub( wcorr_fx, L_shl( maxcorr_fx, sub( Qcorr, Qmaxcorr ) ) );                                         /*  Qcorr */
-#endif
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             diff_corr = L_sub_o( L_shl_o( wcorr_fx, sub( Qmaxcorr, Qcorr ), &Overflow ), maxcorr_fx, &Overflow ); /*  Qmaxcorr */
-#else
-            diff_corr = L_sub( L_shl( wcorr_fx, sub( Qmaxcorr, Qcorr ) ), maxcorr_fx );                                         /*  Qmaxcorr */
-#endif
         }
 
         IF( diff_corr > 0 )
@@ -448,18 +425,10 @@ Word16 DTFS_alignment_full_fx(
     /* Calculating the expected alignment shift */
     Eshift = mult_r( ph_offset_fx, shl( X2_DTFS_fx.lag_fx, 7 ) ); /* confirmed I<2 by smv12.org, Q7 */
     find_rem( (Word16) L_FRAME, shr( add( X2_DTFS_fx.lag_fx, X1_DTFS_fx.lag_fx ), 1 ), &temp );
-#ifdef BASOP_NOGLOB
     temp = add_sat( shl( temp, 7 ), Eshift ); /*  Q7 */
-#else
-    temp = add( shl( temp, 7 ), Eshift );                                                                                       /*  Q7 */
-#endif
     IF( temp < 0 )
     {
-#ifdef BASOP_NOGLOB
         temp = add_sat( temp, shl_sat( X1_DTFS_fx.lag_fx, 7 ) ); /*  Q7 */
-#else
-        temp = add( temp, shl( X1_DTFS_fx.lag_fx, 7 ) );                                                                        /*  Q7 */
-#endif
     }
     find_rem( temp, shl( X1_DTFS_fx.lag_fx, 7 ), &Eshift ); /*  Q7 */
     Eshift = shl( shr( Eshift, 7 ), 1 );                    /* Q1 but integer */
@@ -484,13 +453,8 @@ Word16 DTFS_alignment_full_fx(
 
     FOR( k = 0; k <= HalfLag; k++ )
     {
-#ifdef BASOP_NOGLOB
         ab1[k] = round_fx_o( L_mac_o( L_mult_o( X1_DTFS_fx.a_fx[k], X2_DTFS_fx.a_fx[k], &Overflow ), X1_DTFS_fx.b_fx[k], X2_DTFS_fx.b_fx[k], &Overflow ), &Overflow ); /*  Q(-15); */
         ab2[k] = round_fx_o( L_msu_o( L_mult_o( X1_DTFS_fx.b_fx[k], X2_DTFS_fx.a_fx[k], &Overflow ), X1_DTFS_fx.a_fx[k], X2_DTFS_fx.b_fx[k], &Overflow ), &Overflow ); /*  Q(-15); */
-#else
-        ab1[k] = round_fx( L_mac( L_mult( X1_DTFS_fx.a_fx[k], X2_DTFS_fx.a_fx[k] ), X1_DTFS_fx.b_fx[k], X2_DTFS_fx.b_fx[k] ) ); /*  Q(-15); */
-        ab2[k] = round_fx( L_msu( L_mult( X1_DTFS_fx.b_fx[k], X2_DTFS_fx.a_fx[k] ), X1_DTFS_fx.a_fx[k], X2_DTFS_fx.b_fx[k] ) ); /*  Q(-15); */
-#endif
     }
     IF( FR_flag == 0 )
     {
@@ -520,15 +484,9 @@ Word16 DTFS_alignment_full_fx(
         temp1 = add( n, shl( X2_DTFS_fx.lag_fx, 1 ) ); /* add lag_fx in Q1to make positive */
         FOR( k = 0; k <= HalfLag; k++ )
         {
-#ifdef BASOP_NOGLOB
             corr_fx = L_mac_o( corr_fx, ab1[k], C_fx[( 2 * temp ) % ( 4 * X2_DTFS_fx.lag_fx )], &Overflow );
             corr_fx = L_mac_o( corr_fx, ab2[k], S_fx[( 2 * temp ) % ( 4 * X2_DTFS_fx.lag_fx )], &Overflow );
             temp = add_o( temp, temp1, &Overflow );
-#else
-            corr_fx = L_mac( corr_fx, ab1[k], C_fx[( 2 * temp ) % ( 4 * X2_DTFS_fx.lag_fx )] );
-            corr_fx = L_mac( corr_fx, ab2[k], S_fx[( 2 * temp ) % ( 4 * X2_DTFS_fx.lag_fx )] );
-            temp = add( temp, temp1 );
-#endif
         }
 
         IF( GT_32( corr_fx, maxcorr_fx ) )
@@ -648,15 +606,9 @@ void Q2phaseShift_fx(
         FOR( k = 0; k <= HalfLag; k++ )
         {
             temp = X_fx->a_fx[k];
-#ifdef BASOP_NOGLOB
             X_fx->a_fx[k] = round_fx_o( L_msu_o( L_mult_o( temp, C_fx[temp2 % ( 4 * Lag )], &Overflow ), X_fx->b_fx[k], S_fx[temp2 % ( 4 * Lag )], &Overflow ), &Overflow ); /*  X.Q */
             X_fx->b_fx[k] = round_fx_o( L_mac_o( L_mult_o( X_fx->b_fx[k], C_fx[temp2 % ( 4 * Lag )], &Overflow ), temp, S_fx[temp2 % ( 4 * Lag )], &Overflow ), &Overflow );
             temp2 = L_add_o( temp2, (Word32) ph, &Overflow );
-#else
-            X_fx->a_fx[k] = round_fx( L_msu( L_mult( temp, C_fx[temp2 % ( 4 * Lag )] ), X_fx->b_fx[k], S_fx[temp2 % ( 4 * Lag )] ) ); /*  X.Q */
-            X_fx->b_fx[k] = round_fx( L_mac( L_mult( X_fx->b_fx[k], C_fx[temp2 % ( 4 * Lag )] ), temp, S_fx[temp2 % ( 4 * Lag )] ) );
-            temp2 = L_add( temp2, (Word32) ph );
-#endif
             move16();
             move16();
         }
@@ -668,15 +620,9 @@ void Q2phaseShift_fx(
         FOR( k = 0; k <= HalfLag; k++ )
         {
             temp = X_fx->a_fx[k];
-#ifdef BASOP_NOGLOB
             X_fx->a_fx[k] = round_fx_o( L_mac_o( L_mult_o( temp, C_fx[temp2 % ( 4 * Lag )], &Overflow ), X_fx->b_fx[k], S_fx[temp2 % ( 4 * Lag )], &Overflow ), &Overflow ); /*  X.Q */
             X_fx->b_fx[k] = round_fx_o( L_msu_o( L_mult_o( X_fx->b_fx[k], C_fx[temp2 % ( 4 * Lag )], &Overflow ), temp, S_fx[temp2 % ( 4 * Lag )], &Overflow ), &Overflow );
             temp2 = add_o( (Word16) temp2, negate( ph ), &Overflow );
-#else
-            X_fx->a_fx[k] = round_fx( L_mac( L_mult( temp, C_fx[temp2 % ( 4 * Lag )] ), X_fx->b_fx[k], S_fx[temp2 % ( 4 * Lag )] ) ); /*  X.Q */
-            X_fx->b_fx[k] = round_fx( L_msu( L_mult( X_fx->b_fx[k], C_fx[temp2 % ( 4 * Lag )] ), temp, S_fx[temp2 % ( 4 * Lag )] ) );
-            temp2 = add( (Word16) temp2, negate( ph ) );
-#endif
             move16();
             move16();
         }
@@ -819,25 +765,15 @@ void DTFS_to_fs_fx(
     move16();
 
     exp = norm_s( X_fx->lag_fx );
-    tmp = div_s( shl( 1, sub( 14, exp ) ), X_fx->lag_fx ); /* Q29-exp */
-#ifdef BASOP_NOGLOB
+    tmp = div_s( shl( 1, sub( 14, exp ) ), X_fx->lag_fx );               /* Q29-exp */
     L_tmp1 = L_mult_o( 12800, tmp, &Overflow );                          /* Q(30-exp) */
     diff_fx = extract_h( L_shl_o( L_tmp1, sub( exp, 14 ), &Overflow ) ); /* Q0 */
-#else
-    L_tmp1 = L_mult( 12800, tmp );                          /* Q(30-exp) */
-    diff_fx = extract_h( L_shl( L_tmp1, sub( exp, 14 ) ) ); /* Q0 */
-#endif
 
     exp = norm_s( diff_fx );
-    tmp = div_s( shl( 1, sub( 14, exp ) ), diff_fx ); /* Q29-exp */
-#ifdef BASOP_NOGLOB
+    tmp = div_s( shl( 1, sub( 14, exp ) ), diff_fx );                    /* Q29-exp */
     L_tmp1 = L_mult_o( X_fx->upper_cut_off_freq_fx, tmp, &Overflow );    /* Q(30-exp) */
     nH_band = extract_h( L_shl_o( L_tmp1, sub( exp, 14 ), &Overflow ) ); /* Q0 */
-#else
-    L_tmp1 = L_mult( X_fx->upper_cut_off_freq_fx, tmp );    /* Q(30-exp) */
-    nH_band = extract_h( L_shl( L_tmp1, sub( exp, 14 ) ) ); /* Q0 */
-#endif
-    nH_4kHz = mult( 10240, ( X_fx->lag_fx ) ); /* 4000/12800 in Q15 */
+    nH_4kHz = mult( 10240, ( X_fx->lag_fx ) );                           /* 4000/12800 in Q15 */
 
     if ( GE_16( sub( X_fx->upper_cut_off_freq_fx, shr( (Word16) L_mult( diff_fx, nH_band ), 1 ) ), diff_fx ) )
     {
@@ -860,13 +796,8 @@ void DTFS_to_fs_fx(
 
     exp = norm_s( N );
     tmp = div_s( shl( 1, ( sub( 14, exp ) ) ), N );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_o( tmp, add( exp, 6 ), &Overflow );
     inv_lag = round_fx_o( L_tmp, &Overflow );
-#else
-    L_tmp = L_shl( tmp, add( exp, 6 ) );
-    inv_lag = round_fx( L_tmp );
-#endif
     Lx0 = L_deposit_h( x[0] );
     Labmax = L_deposit_l( 0 );
     FOR( k = 1; k <= nH; k++ )
@@ -880,13 +811,8 @@ void DTFS_to_fs_fx(
         move16();
         FOR( n = 1; n < N; n++ )
         {
-#ifdef BASOP_NOGLOB
             L_a = L_mac0_o( L_a, x[n], C_fx[( 4 * sum ) % ( 4 * N )], &Overflow ); /*  Q16 of x[n]*cos(sum) */
             L_b = L_mac0_o( L_b, x[n], S_fx[( 4 * sum ) % ( 4 * N )], &Overflow ); /*  Q16 of x[n]*sin(sum) */
-#else
-            L_a = L_mac0( L_a, x[n], C_fx[( 4 * sum ) % ( 4 * N )] ); /*  Q16 of x[n]*cos(sum) */
-            L_b = L_mac0( L_b, x[n], S_fx[( 4 * sum ) % ( 4 * N )] ); /*  Q16 of x[n]*sin(sum) */
-#endif
             sum = add( sum, temp );
         }
         La[k] = L_shr( L_a, 6 ); /*  Q8 of a[k]*2.0 */
@@ -923,22 +849,13 @@ void DTFS_to_fs_fx(
         temp_neg = negate( temp );
         FOR( n = 0; n < N - 1; n += 2 )
         {
-#ifdef BASOP_NOGLOB
             L_a = L_mac_o( L_a, x[n], temp, &Overflow ); /*  Q1 */
             L_a = L_mac_o( L_a, x[n + 1], temp_neg, &Overflow );
-#else
-            L_a = L_mac( L_a, x[n], temp );                           /*  Q1 */
-            L_a = L_mac( L_a, x[n + 1], temp_neg );
-#endif
             /*temp= negate(temp); */
         }
         if ( s_and( N, 1 ) ) /*if N is odd we need to calculate last  */
         {
-#ifdef BASOP_NOGLOB
             L_a = L_mac_o( L_a, x[n], temp, &Overflow ); /*  Q1 */
-#else
-            L_a = L_mac( L_a, x[n], temp );               /*  Q1 */
-#endif
         }
 
         La[k] = L_shl( L_a, 7 );
@@ -965,7 +882,6 @@ void DTFS_to_fs_fx(
 
     FOR( k = 1; k <= nH; k++ )
     {
-#ifdef BASOP_NOGLOB
         X_fx->a_fx[k] = round_fx_o( L_shl_o( La[k], temp, &Overflow ), &Overflow ); /* Q(8+temp-16)=Q(temp-8) */
         move16();
         X_fx->a_fx[k] = mult_ro( X_fx->a_fx[k], inv_lag, &Overflow );
@@ -974,28 +890,13 @@ void DTFS_to_fs_fx(
         move16();
         X_fx->b_fx[k] = mult_ro( X_fx->b_fx[k], inv_lag, &Overflow );
         move16(); /* Q(temp-8+19+1-16)=Q(temp-4) of b[k]*2.0/N */
-#else
-        X_fx->a_fx[k] = round_fx( L_shl( La[k], temp ) ); /* Q(8+temp-16)=Q(temp-8) */
-        move16();
-        X_fx->a_fx[k] = mult_r( X_fx->a_fx[k], inv_lag );
-        move16();                                         /* Q(temp-8+19+1-16)=Q(temp-4) of a[k]*2.0/N */
-        X_fx->b_fx[k] = round_fx( L_shl( Lb[k], temp ) ); /* Q(8+temp-16)=Q(temp-8) */
-        move16();
-        X_fx->b_fx[k] = mult_r( X_fx->b_fx[k], inv_lag );
-        move16();                                         /* Q(temp-8+19+1-16)=Q(temp-4) of b[k]*2.0/N */
-#endif
     }
 
     /* IF ( N%2 == 0 ) */
     IF( s_and( N, 1 ) == 0 )
     {
-#ifdef BASOP_NOGLOB
         X_fx->a_fx[k] = round_fx_o( L_shl_o( La[k], temp, &Overflow ), &Overflow ); /* Q(8+temp-16)=Q(temp-8) */
         X_fx->a_fx[k] = mult_ro( X_fx->a_fx[k], inv_lag, &Overflow );
-#else
-        X_fx->a_fx[k] = round_fx( L_shl( La[k], temp ) ); /* Q(8+temp-16)=Q(temp-8) */
-        X_fx->a_fx[k] = mult_r( X_fx->a_fx[k], inv_lag );
-#endif
         move16();
         move16(); /* Q(temp-8+19+1-16)=Q(temp-4) of a[k]*1.0/N */
         X_fx->b_fx[k] = 0;
@@ -1249,11 +1150,7 @@ static void DTFS_transform_fx(
             m = L_add( 1000 * LL - OSLENGTH / 2, add( l1, j ) ) % LL; /* use circular addressing */
             tmptmp3_40_fx = L_add( tmptmp3_40_fx, Mult_32_16( x_r_fx[m], sinc_fx[k][j] ) );
         }
-#ifdef BASOP_NOGLOB
         out_fx[i] = round_fx_sat( L_shl_sat( tmptmp3_40_fx, 2 ) );
-#else
-        out_fx[i] = round_fx( L_shl( tmptmp3_40_fx, 2 ) );
-#endif
         move16();
     }
 
@@ -1320,17 +1217,11 @@ void DTFS_zeroFilter_fx(
 
         FOR( n = 0; n < N; n++ )
         {
-#ifdef BASOP_NOGLOB
             sum1_fx = L_mac_o( sum1_fx, LPC[n], C_fx[( 4 * temp2 ) % ( 4 * X_fx->lag_fx )], &Overflow ); /* Q(12+15+1) */
             sum2_fx = L_mac_o( sum2_fx, LPC[n], S_fx[( 4 * temp2 ) % ( 4 * X_fx->lag_fx )], &Overflow );
-#else
-            sum1_fx = L_mac( sum1_fx, LPC[n], C_fx[i_mult( 4, temp2 ) % i_mult( 4, X_fx->lag_fx )] ); /* Q(12+15+1) */
-            sum2_fx = L_mac( sum2_fx, LPC[n], S_fx[i_mult( 4, temp2 ) % i_mult( 4, X_fx->lag_fx )] );
-#endif
             temp2 = add( temp2, temp );
         }
 
-#ifdef BASOP_NOGLOB
         temp1 = round_fx_o( sum1_fx, &Overflow ); /* Q(12+15+1-16)=Q(12) */
         temp2 = round_fx_o( sum2_fx, &Overflow ); /*               Q(12) */
 
@@ -1339,16 +1230,6 @@ void DTFS_zeroFilter_fx(
         L_temp1 = L_msu_o( L_temp1, temp2, X_fx->b_fx[k], &Overflow ); /*  Q(12+Q+1) */
         L_temp2 = L_mult_o( temp1, X_fx->b_fx[k], &Overflow );
         L_temp2 = L_mac_o( L_temp2, temp2, X_fx->a_fx[k], &Overflow ); /*  Q(12+Q+1) */
-#else
-        temp1 = round_fx( sum1_fx ); /* Q(12+15+1-16)=Q(12) */
-        temp2 = round_fx( sum2_fx ); /*               Q(12) */
-
-        /* Calculate the circular convolution */
-        L_temp1 = L_mult( temp1, X_fx->a_fx[k] );
-        L_temp1 = L_msu( L_temp1, temp2, X_fx->b_fx[k] ); /*  Q(12+Q+1) */
-        L_temp2 = L_mult( temp1, X_fx->b_fx[k] );
-        L_temp2 = L_mac( L_temp2, temp2, X_fx->a_fx[k] );          /*  Q(12+Q+1) */
-#endif
         /*  normalization */
         na = norm_l( L_temp1 );
         if ( L_temp1 == 0 )
@@ -1368,13 +1249,8 @@ void DTFS_zeroFilter_fx(
             nb = na;
             move16();
         }
-#ifdef BASOP_NOGLOB
         X_fx->a_fx[k] = round_fx_o( (Word32) L_shl_o( L_temp1, nb, &Overflow ), &Overflow ); /* Q(13+Q+nb-16)=Q(Q+nb-3) */
         X_fx->b_fx[k] = round_fx_o( (Word32) L_shl_o( L_temp2, nb, &Overflow ), &Overflow ); /*               Q(Q+nb-3) */
-#else
-        X_fx->a_fx[k] = round_fx( (Word32) L_shl( L_temp1, nb ) ); /* Q(13+Q+nb-16)=Q(Q+nb-3) */
-        X_fx->b_fx[k] = round_fx( (Word32) L_shl( L_temp2, nb ) ); /*               Q(Q+nb-3) */
-#endif
         move32();
         move32();
 
@@ -1390,17 +1266,10 @@ void DTFS_zeroFilter_fx(
     /* bring to the same Q */
     FOR( k = 0; k <= HalfLag; k++ )
     {
-#ifdef BASOP_NOGLOB
         X_fx->a_fx[k] = shl_o( X_fx->a_fx[k], sub( Qmin, Qab[k] ), &Overflow );
         move16(); /*  Q(Q+Qab[k]+Qmin-Qab[k]=Q(Q+Qmin) */
         X_fx->b_fx[k] = shl_o( X_fx->b_fx[k], sub( Qmin, Qab[k] ), &Overflow );
         move16(); /*                         Q(Q+Qmin) */
-#else
-        X_fx->a_fx[k] = shl( X_fx->a_fx[k], sub( Qmin, Qab[k] ) );
-        move16(); /*  Q(Q+Qab[k]+Qmin-Qab[k]=Q(Q+Qmin) */
-        X_fx->b_fx[k] = shl( X_fx->b_fx[k], sub( Qmin, Qab[k] ) );
-        move16(); /*                         Q(Q+Qmin) */
-#endif
     }
 
     X_fx->Q = add( X_fx->Q, Qmin );
@@ -1657,23 +1526,14 @@ Word32 DTFS_getEngy_fx(
         temp_b_fx = X_fx->b_fx[k];
         move16();
 
-#ifdef BASOP_NOGLOB
         en_fx = L_mac0_o( en_fx, temp_a_fx, temp_a_fx, &Overflow );
         en_fx = L_mac0_o( en_fx, temp_b_fx, temp_b_fx, &Overflow );
-#else
-        en_fx = L_mac0( en_fx, temp_a_fx, temp_a_fx );
-        en_fx = L_mac0( en_fx, temp_b_fx, temp_b_fx );
-#endif
     }
 
     en_fx = L_shr( en_fx, 1 );
     temp_a_fx = X_fx->a_fx[0];
     move16();
-#ifdef BASOP_NOGLOB
     en_fx = L_mac0_o( en_fx, temp_a_fx, temp_a_fx, &Overflow );
-#else
-    en_fx = L_mac0( en_fx, temp_a_fx, temp_a_fx );
-#endif
     /*  IF (X_fx->lag_fx%2 == 0)  */
     IF( s_and( X_fx->lag_fx, 1 ) == 0 )
     {
@@ -1682,13 +1542,8 @@ Word32 DTFS_getEngy_fx(
         temp_b_fx = X_fx->b_fx[k];
         move16();
 
-#ifdef BASOP_NOGLOB
         en_fx = L_mac0_o( en_fx, temp_a_fx, temp_a_fx, &Overflow );
         en_fx = L_mac0_o( en_fx, temp_b_fx, temp_b_fx, &Overflow );
-#else
-        en_fx = L_mac0( en_fx, temp_a_fx, temp_a_fx );
-        en_fx = L_mac0( en_fx, temp_b_fx, temp_b_fx );
-#endif
     }
 
     return en_fx; /*  2*X1.Q+1=Q13 */
@@ -1727,30 +1582,16 @@ Word32 DTFS_getEngy_P2A_fx(
     HalfLag_fx = s_min( HalfLag_fx, X_fx->nH_fx );
     FOR( k = 1; k <= HalfLag_fx; k++ )
     {
-#ifdef BASOP_NOGLOB
         en_fx = L_mac0_o( en_fx, X_fx->a_fx[k], X_fx->a_fx[k], &Overflow );
         en_fx = L_mac0_o( en_fx, X_fx->b_fx[k], X_fx->b_fx[k], &Overflow );
-#else
-        en_fx = L_mac0( en_fx, X_fx->a_fx[k], X_fx->a_fx[k] );
-        en_fx = L_mac0( en_fx, X_fx->b_fx[k], X_fx->b_fx[k] );
-#endif
     }
     en_fx = L_shr( en_fx, 1 );
-#ifdef BASOP_NOGLOB
     en_fx = L_mac0_o( en_fx, X_fx->a_fx[0], X_fx->a_fx[0], &Overflow );
-#else
-    en_fx = L_mac0( en_fx, X_fx->a_fx[0], X_fx->a_fx[0] );
-#endif
     /* IF (X_fx->lag_fx%2 == 0) */
     IF( s_and( X_fx->lag_fx, 1 ) == 0 )
     {
-#ifdef BASOP_NOGLOB
         en_fx = L_mac0_o( en_fx, X_fx->a_fx[k], X_fx->a_fx[k], &Overflow );
         en_fx = L_mac0_o( en_fx, X_fx->b_fx[k], X_fx->b_fx[k], &Overflow );
-#else
-        en_fx = L_mac0( en_fx, X_fx->a_fx[k], X_fx->a_fx[k] );
-        en_fx = L_mac0( en_fx, X_fx->b_fx[k], X_fx->b_fx[k] );
-#endif
     }
 
     return en_fx; /*  2*X1.Q */
@@ -1810,11 +1651,7 @@ static Word32 DTFS_setEngy_fx(
 
 
         expb = norm_l( en1_fx );
-#ifdef BASOP_NOGLOB
         fracb = round_fx_sat( L_shl_sat( en1_fx, expb ) );
-#else
-        fracb = round_fx( L_shl( en1_fx, expb ) );
-#endif
         expb = sub( 30, add( expb, shl( X_DTFS_FX->Q, 1 ) ) );
 
 
@@ -1891,13 +1728,9 @@ void DTFS_car2pol_fx(
     FOR( k = 1; k <= HalfLag_fx; k++ )
     {
 
-        Lacc_fx = L_mult( X_fx->a_fx[k], X_fx->a_fx[k] ); /*  a[k]^2, 2Q+1 */
-#ifdef BASOP_NOGLOB
+        Lacc_fx = L_mult( X_fx->a_fx[k], X_fx->a_fx[k] );                      /*  a[k]^2, 2Q+1 */
         Lacc_fx = L_mac_o( Lacc_fx, X_fx->b_fx[k], X_fx->b_fx[k], &Overflow ); /*  a[k]^2+b[k]^2, 2Q+1 */
-#else
-        Lacc_fx = L_mac( Lacc_fx, X_fx->b_fx[k], X_fx->b_fx[k] ); /*  a[k]^2+b[k]^2, 2Q+1 */
-#endif
-        Lacc_fx = L_shr( Lacc_fx, 3 ); /*  Lacc=(a[k]^2+b[k]^2)/4, 2Q */
+        Lacc_fx = L_shr( Lacc_fx, 3 );                                         /*  Lacc=(a[k]^2+b[k]^2)/4, 2Q */
 
         IF( Lacc_fx )
         {
@@ -2019,11 +1852,7 @@ Word32 DTFS_setEngyHarm_fx(
     Lacc = L_deposit_l( 0 );
     FOR( k = f_low_fx + 1; k <= HalfLag_fx; k++ )
     {
-#ifdef BASOP_NOGLOB
         Lacc = L_mac0_o( Lacc, X_fx->a_fx[k], X_fx->a_fx[k], &Overflow ); /*  2*X1.Q */
-#else
-        Lacc = L_mac0( Lacc, X_fx->a_fx[k], X_fx->a_fx[k] );      /*  2*X1.Q */
-#endif
         Lacc_max = L_max( Lacc_max, Lacc );
 
         count = add( count, 1 );
@@ -2038,13 +1867,8 @@ Word32 DTFS_setEngyHarm_fx(
         Lacc = L_deposit_l( 0 );
         FOR( k = f_low_fx + 1; k <= HalfLag_fx; k++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult_o( X_fx->a_fx[k], X_fx->a_fx[k], &Overflow );
             Lacc = L_add_o( Lacc, L_shr( L_tmp, expp ), &Overflow ); /*  2*X1.Q-expp */
-#else
-            L_tmp = L_mult( X_fx->a_fx[k], X_fx->a_fx[k] );
-            Lacc = L_add( Lacc, L_shr( L_tmp, expp ) ); /*  2*X1.Q-expp */
-#endif
             count = add( count, 1 );
         }
     }
@@ -2057,11 +1881,7 @@ Word32 DTFS_setEngyHarm_fx(
 
     exp = norm_s( count );
     tmp = div_s( shl( 1, sub( 14, exp ) ), count ); /* 29 - exp */
-#ifdef BASOP_NOGLOB
     en1_fx = L_shl_o( Mult_32_16( Lacc, tmp ), sub( exp, 14 ), &Overflow );
-#else
-    en1_fx = L_shl( Mult_32_16( Lacc, tmp ), sub( exp, 14 ) );
-#endif
     test();
     IF( en1_fx > 0 && en2_fx > 0 )
     {
@@ -2072,11 +1892,7 @@ Word32 DTFS_setEngyHarm_fx(
 
 
         expb = norm_l( en1_fx );
-#ifdef BASOP_NOGLOB
         fracb = round_fx_o( L_shl_o( en1_fx, expb, &Overflow ), &Overflow );
-#else
-        fracb = round_fx( L_shl( en1_fx, expb ) );
-#endif
         IF( GE_32( Lacc_max, 2147483647 /*1.Q31*/ ) )
         {
             expb = sub( 30, add( expb, sub( shl( X_fx->Q, 1 ), expp ) ) );
@@ -2114,11 +1930,7 @@ Word32 DTFS_setEngyHarm_fx(
     {
         /*L_temp_fx =(Word32)Mpy_32_16(extract_h(factor_fx),extract_l(factor_fx), X_fx->a_fx[k]);  move32();           */ /*  Q(temp+X1.Q-15) */
         L_temp_fx = Mult_32_16( factor_fx, X_fx->a_fx[k] );                                                               /*  Q(temp+X1.Q-15) */
-#ifdef BASOP_NOGLOB
-        X_fx->a_fx[k] = round_fx_o( L_temp_fx, &Overflow ); /*  Q(temp+X1.Q-15-16)=Q(temp+X1.Q-31); */
-#else
-        X_fx->a_fx[k] = round_fx( L_temp_fx ); /*  Q(temp+X1.Q-15-16)=Q(temp+X1.Q-31); */
-#endif
+        X_fx->a_fx[k] = round_fx_o( L_temp_fx, &Overflow );                                                               /*  Q(temp+X1.Q-15-16)=Q(temp+X1.Q-31); */
         move16();
     }
 
@@ -2254,11 +2066,7 @@ static void cubicPhase_fx(
     Ltemp3 = L_sub( Ltemp3, L_shl( Ltemp1, 1 ) ); /*  Ltemp3=N*c1-2*Ltemp1, Q20 */
 
 
-#ifdef BASOP_NOGLOB
     IF( GE_32( L_abs( Ltemp3 ), L_shl_o( Ltemp2, 8, &Overflow ) ) )
-#else
-    IF( GE_32( L_abs( Ltemp3 ), L_shl( Ltemp2, 8 ) ) )
-#endif
     {
         Lacc = L_add( MIN_32, 0 );
         if ( Ltemp3 > 0 )
@@ -2271,11 +2079,7 @@ static void cubicPhase_fx(
     ELSE
     {
         expa = norm_l( Ltemp3 );
-#ifdef BASOP_NOGLOB
         fraca = extract_h( L_shl_o( Ltemp3, expa, &Overflow ) );
-#else
-        fraca = extract_h( L_shl( Ltemp3, expa ) );
-#endif
         expa = sub( 30, add( expa, 20 ) );
         if ( fraca < 0 )
         {
@@ -2284,11 +2088,7 @@ static void cubicPhase_fx(
         }
 
         expb = norm_l( Ltemp2 );
-#ifdef BASOP_NOGLOB
         fracb = extract_h( L_shl_o( Ltemp2, expb, &Overflow ) );
-#else
-        fracb = extract_h( L_shl( Ltemp2, expb ) );
-#endif
         expb = sub( 30, expb );
         if ( fracb < 0 )
         {
@@ -2305,11 +2105,7 @@ static void cubicPhase_fx(
             fracb = negate( fracb );
         }
         scale = shr( sub( fracb, fraca ), 15 );
-#ifdef BASOP_NOGLOB
         fraca = shl_o( fraca, scale, &Overflow );
-#else
-        fraca = shl( fraca, scale );
-#endif
         expa = sub( expa, scale );
 
         tmp = div_s( fraca, fracb ); /* 15-exp */
@@ -2325,13 +2121,8 @@ static void cubicPhase_fx(
             tmp = negate( tmp );
         }
 
-#ifdef BASOP_NOGLOB
         Lacc = L_shl_o( tmp, add( exp, 34 ), &Overflow );
         Lacc = L_add_o( Lacc, 0x08000, &Overflow );
-#else
-        Lacc = L_shl( tmp, add( exp, 34 ) );
-        Lacc = L_add( Lacc, 0x08000 );
-#endif
         c0 = extract_h( Lacc ); /*  c0 in Q33 */
     }
 
@@ -2457,11 +2248,7 @@ static void cubicPhase_fx(
                 Ltemp3 = L_add( Ltemp3, 1 );
             }
 
-#ifdef BASOP_NOGLOB
             Ltemp3 = L_shl_o( Mult_32_16( L_shl_o( Ltemp3, 7, &Overflow ), c0 ), 2, &Overflow ); /*  Ltemp3=c0*n^3, Q27 */
-#else
-            Ltemp3 = L_shl( Mult_32_16( L_shl( Ltemp3, 7 ), c0 ), 2 ); /*  Ltemp3=c0*n^3, Q27 */
-#endif
             Ltemp2 = L_shl( Mult_32_16( N2, c1 ), 1 );
             /*  Ltemp2 = (Word32)L_mult_su(c1,(UNS_Word16)n2); : Ltemp2=c1*n^2, Q27 */
             Ltemp1 = L_shl( L_mult( c2, n ), 7 ); /*  Ltemp1=c2*n, Q27 */
@@ -2587,12 +2374,8 @@ void DTFS_to_erb_fx(
 
     FOR( i = 0; i < num_erb_fx; i++ )
     {
-#ifdef BASOP_NOGLOB
         out_fx[i] = round_fx_o( L_shl_o( sum_a_fx[i], n, &Overflow ), &Overflow ); /*  Q13 */
         move16();
-#else
-        out_fx[i] = round_fx( L_shl( sum_a_fx[i], n ) );               /*  Q13 */
-#endif
         IF( GT_16( count[i], 1 ) )
         {
             IF( sum_a_fx[i] < 0 )
@@ -2619,14 +2402,8 @@ void DTFS_to_erb_fx(
 
             tmp = div_s( fracb, fraca );
             exp = sub( expb, expa );
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_sat( tmp, add( exp, 14 ) );
             out_fx[i] = round_fx_sat( L_tmp );
-#else
-            L_tmp = L_shl( tmp, add( exp, 14 ) );
-
-            out_fx[i] = round_fx( L_tmp );
-#endif
             move16();
         }
     }
@@ -2754,29 +2531,17 @@ void erb_slot_fx(
     }
     FOR( j = 0; j < num_erb_fx; j++ )
     {
-#ifdef BASOP_NOGLOB
         mfreq_fx[j] = round_fx_o( L_shl_o( mf_fx[j], 11, &Overflow ), &Overflow ); /*  Q15 */
-#else
-        mfreq_fx[j] = round_fx( L_shl( mf_fx[j], 11 ) ); /*  Q15 */
-#endif
         move16();
         IF( GT_16( out_fx[j], 1 ) )
         {
             expb = norm_l( mf_fx[j] );
-#ifdef BASOP_NOGLOB
             fracb = round_fx_o( L_shl_o( mf_fx[j], expb, &Overflow ), &Overflow );
-#else
-            fracb = round_fx( L_shl( mf_fx[j], expb ) );
-#endif
             expb = sub( 30, add( expb, 20 ) );
 
 
             expa = norm_l( out_fx[j] );
-#ifdef BASOP_NOGLOB
             fraca = extract_h( L_shl_o( out_fx[j], expa, &Overflow ) );
-#else
-            fraca = extract_h( L_shl( out_fx[j], expa ) );
-#endif
             expa = sub( 30, expa );
 
             scale = shr( sub( fraca, fracb ), 15 );
@@ -2785,16 +2550,10 @@ void erb_slot_fx(
 
             tmp = div_s( fracb, fraca );
             exp = sub( expb, expa );
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_o( tmp, add( exp, 16 ), &Overflow );
 
             mfreq_fx[j] = round_fx_o( L_tmp, &Overflow );
             move16();
-#else
-            L_tmp = L_shl( tmp, add( exp, 16 ) );
-
-            mfreq_fx[j] = round_fx( L_tmp );
-#endif
         }
     }
     return;
@@ -2933,11 +2692,7 @@ void DTFS_erb_inv_fx(
                     d2h = 31;
                     move16();
                 }
-#ifdef BASOP_NOGLOB
                 X_fx->a_fx[i] = round_fx_o( L_shl_o( Ltemp_fx, d2h, &Overflow ), &Overflow ); /*  Q(28-n+d2h) */
-#else
-                X_fx->a_fx[i] = round_fx( L_shl( Ltemp_fx, d2h ) ); /*  Q(28-n+d2h) */
-#endif
                 move16();
                 q[i] = add( sub( 28, n ), d2h );
                 move16();
@@ -3146,11 +2901,11 @@ void quant_target_fx( DTFS_STRUCTURE *X_fx, const Word16 *curr_lpc, Word16 *w, W
     Ltemp1 = log10_fx( Ltemp1 );
 
     /*  subtract 10log10(2)*(2Q-13), Q23 */
-    Ltemp1 = L_sub( Ltemp1, Ltemp3 );
+    Ltemp1 = L_sub_sat( Ltemp1, Ltemp3 );
     Ltemp1 = L_max( 0, Ltemp1 );
     Ltemp2 = getSpEngyFromResAmp_fx( X_fx, 2828, X_fx->upper_cut_off_freq_fx, curr_lpc, sin_tab, cos_tab );
-    Ltemp2 = log10_fx( Ltemp2 );      /*  Ltemp1=10log10(eng_hb), Q23, need to adjust for Q factor of energy (2Q-13) */
-    Ltemp2 = L_sub( Ltemp2, Ltemp3 ); /*  Ltemp2 in Q23 */
+    Ltemp2 = log10_fx( Ltemp2 );          /*  Ltemp1=10log10(eng_hb), Q23, need to adjust for Q factor of energy (2Q-13) */
+    Ltemp2 = L_sub_sat( Ltemp2, Ltemp3 ); /*  Ltemp2 in Q23 */
 
     Ltemp2 = L_max( 0, Ltemp2 );
 
@@ -3174,10 +2929,10 @@ void quant_target_fx( DTFS_STRUCTURE *X_fx, const Word16 *curr_lpc, Word16 *w, W
     tmp = round_fx( Ltemp );            /*  tmp in Q(22-n) */
     Ltemp1 = Mult_32_16( Ltemp1, tmp ); /*  Q(30-n) */
     n = sub( 8, exp );
-    w[0] = round_fx( L_shl( Ltemp1, n ) ); /*  w[0] in Q15 */
+    w[0] = round_fx_sat( L_shl_sat( Ltemp1, n ) ); /*  w[0] in Q15 */
     move16();
     Ltemp2 = Mult_32_16( Ltemp2, tmp );
-    w[1] = round_fx( L_shl( Ltemp2, n ) ); /*  w[1] in Q15 */
+    w[1] = round_fx_sat( L_shl_sat( Ltemp2, n ) ); /*  w[1] in Q15 */
     move16();
 
     logLag = log10_fx( X_fx->lag_fx );                       /*  logLag=10*log10(lag), Q23 */
@@ -3481,11 +3236,7 @@ Word16 ppp_extract_pitch_period_fx(
             spike = i;
             move16();
         }
-#ifdef BASOP_NOGLOB
         en1 = L_mac0_sat( en1, ptr[i], ptr[i] ); /*  Q0 */
-#else
-        en1 = L_mac0( en1, ptr[i], ptr[i] );                        /*  Q0 */
-#endif
     }
 
     IF( ptr[spike] > 0 )
@@ -3618,11 +3369,7 @@ Word16 ppp_extract_pitch_period_fx(
     Lacc = L_deposit_l( 0 );
     FOR( i = 0; i < l; i++ )
     {
-#ifdef BASOP_NOGLOB
         Lacc = L_mac0_sat( Lacc, out[i], out[i] ); /*  Q0 */
-#else
-        Lacc = L_mac0( Lacc, out[i], out[i] );                      /*  Q0 */
-#endif
     }
 
 
@@ -3636,11 +3383,7 @@ Word16 ppp_extract_pitch_period_fx(
 
 
         expb = norm_l( Lacc );
-#ifdef BASOP_NOGLOB
         fracb = round_fx_sat( L_shl_sat( Lacc, expb ) );
-#else
-        fracb = round_fx( L_shl( Lacc, expb ) );
-#endif
         expb = sub( 30, add( expb, Qres ) );
 
         scale1 = shr( sub( fraca, fracb ), 15 );
@@ -3700,11 +3443,7 @@ void DTFS_peaktoaverage_fx( DTFS_STRUCTURE X_fx, Word32 *pos_fx, Word16 *Qpos, W
 
     FOR( i = 0; i < 256; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_temp = L_mult_sat( time_fx[i], time_fx[i] ); /*  Q(1) */
-#else
-        L_temp = L_mult( time_fx[i], time_fx[i] ); /*  Q(1) */
-#endif
         IF( time_fx[i] >= 0 )
         {
             if ( GT_32( L_temp, maxPosEn_fx ) )
@@ -3742,29 +3481,17 @@ void DTFS_peaktoaverage_fx( DTFS_STRUCTURE X_fx, Word32 *pos_fx, Word16 *Qpos, W
         ELSE
         {
             expa = norm_l( maxPosEn_fx );
-#ifdef BASOP_NOGLOB
             fraca = extract_h( L_shl_o( maxPosEn_fx, expa, &Overflow ) );
-#else
-            fraca = extract_h( L_shl( maxPosEn_fx, expa ) );
-#endif
             expa = sub( 30, add( expa, 1 ) );
 
 
             expb = norm_l( L_sum );
-#ifdef BASOP_NOGLOB
             fracb = round_fx_o( L_shl_o( L_sum, expb, &Overflow ), &Overflow );
-#else
-            fracb = round_fx( L_shl( L_sum, expb ) );
-#endif
             expb = sub( 30, add( expb, shl( X_fx.Q, 1 ) ) );
 
 
             scale = shr( sub( fraca, fracb ), 15 );
-#ifdef BASOP_NOGLOB
             fracb = shl_o( fracb, scale, &Overflow );
-#else
-            fracb = shl( fracb, scale );
-#endif
             expb = sub( expb, scale );
 
             tmp = div_s( fracb, fraca );
@@ -3788,29 +3515,17 @@ void DTFS_peaktoaverage_fx( DTFS_STRUCTURE X_fx, Word32 *pos_fx, Word16 *Qpos, W
         {
 
             expa = norm_l( maxNegEn_fx );
-#ifdef BASOP_NOGLOB
             fraca = extract_h( L_shl_o( maxNegEn_fx, expa, &Overflow ) );
-#else
-            fraca = extract_h( L_shl( maxNegEn_fx, expa ) );
-#endif
             expa = sub( Q29, expa ); // 30 - expa - 1;
 
 
             expb = norm_l( L_sum );
-#ifdef BASOP_NOGLOB
             fracb = round_fx_o( L_shl_o( L_sum, expb, &Overflow ), &Overflow );
-#else
-            fracb = round_fx( L_shl( L_sum, expb ) );
-#endif
             expb = sub( 30, add( expb, shl( X_fx.Q, 1 ) ) );
 
 
             scale = shr( sub( fraca, fracb ), 15 );
-#ifdef BASOP_NOGLOB
             fracb = shl_o( fracb, scale, &Overflow );
-#else
-            fracb = shl( fracb, scale );
-#endif
             expb = sub( expb, scale );
 
             tmp = div_s( fracb, fraca );
@@ -4109,7 +3824,6 @@ static void c_fft_wi_fx( Word16 *farray_ptr_fx, Word16 size, Word16 stage, Word1
                     tmp1 = round_fx( ftmp_real_fx );
                     tmp2 = round_fx( ftmp_imag_fx );
 
-#ifdef BASOP_NOGLOB
                     *( farray_ptr_fx + kj ) = sub_sat( *( farray_ptr_fx + k ), tmp1 );
                     move16();
                     *( farray_ptr_fx + kj + 1 ) = sub_sat( *( farray_ptr_fx + k + 1 ), tmp2 );
@@ -4118,16 +3832,6 @@ static void c_fft_wi_fx( Word16 *farray_ptr_fx, Word16 size, Word16 stage, Word1
                     move16();
                     *( farray_ptr_fx + k + 1 ) = add_sat( *( farray_ptr_fx + k + 1 ), tmp2 );
                     move16();
-#else
-                    *( farray_ptr_fx + kj ) = sub( *( farray_ptr_fx + k ), tmp1 );
-                    move16();
-                    *( farray_ptr_fx + kj + 1 ) = sub( *( farray_ptr_fx + k + 1 ), tmp2 );
-                    move16();
-                    *( farray_ptr_fx + k ) = add( *( farray_ptr_fx + k ), tmp1 );
-                    move16();
-                    *( farray_ptr_fx + k + 1 ) = add( *( farray_ptr_fx + k + 1 ), tmp2 );
-                    move16();
-#endif
                 }
             }
         }
@@ -4314,13 +4018,8 @@ void copy_phase_fx( DTFS_STRUCTURE *X1_fx, DTFS_STRUCTURE X2_fx, DTFS_STRUCTURE
 
     FOR( k = 1; k <= HalfLag; k++ )
     {
-#ifdef BASOP_NOGLOB
         Lacc_fx = L_mult_o( X1_fx->a_fx[k], X1_fx->a_fx[k], &Overflow );
         Lacc_fx = L_mac_o( Lacc_fx, X1_fx->b_fx[k], X1_fx->b_fx[k], &Overflow ); /*  2*Q+1 */
-#else
-        Lacc_fx = L_mult( X1_fx->a_fx[k], X1_fx->a_fx[k] );
-        Lacc_fx = L_mac( Lacc_fx, X1_fx->b_fx[k], X1_fx->b_fx[k] ); /*  2*Q+1 */
-#endif
 
         exp = norm_l( Lacc_fx );
         tmp = extract_h( L_shl( Lacc_fx, exp ) );
@@ -4361,7 +4060,6 @@ void copy_phase_fx( DTFS_STRUCTURE *X1_fx, DTFS_STRUCTURE X2_fx, DTFS_STRUCTURE
 
         d1h = extract_h( Ltemp_fx );
         d1l = extract_l( Ltemp_fx );
-#ifdef BASOP_NOGLOB
         Ltemp_fx = L_mult0( X1_fx->b_fx[k], d1l );
         Ltemp_fx = L_add_o( L_shr( Ltemp_fx, 15 ), L_mult_o( X1_fx->b_fx[k], d1h, &Overflow ), &Overflow ); /*  sin(w) in Q(q+16+Q-15) */
         sn = round_fx_o( L_shl_o( Ltemp_fx, sub( 30, add( q, X1_fx->Q ) ), &Overflow ), &Overflow );        /*  Q15 */
@@ -4373,19 +4071,6 @@ void copy_phase_fx( DTFS_STRUCTURE *X1_fx, DTFS_STRUCTURE X2_fx, DTFS_STRUCTURE
         cn = round_fx_o( L_shl_o( Ltemp_fx, sub( 30, add( q, X1_fx->Q ) ), &Overflow ), &Overflow );        /*  Q15 */
         retX_fx->a_fx[k] = mult_ro( X2_fx.a_fx[k], cn, &Overflow );                                         /*  X2_fx.Q         */
         move16();
-#else
-        Ltemp_fx = L_mult0( X1_fx->b_fx[k], d1l );
-        Ltemp_fx = L_add( L_shr( Ltemp_fx, 15 ), L_mult( X1_fx->b_fx[k], d1h ) ); /*  sin(w) in Q(q+16+Q-15) */
-        sn = round_fx( L_shl( Ltemp_fx, sub( 30, add( q, X1_fx->Q ) ) ) );        /*  Q15 */
-        retX_fx->b_fx[k] = mult_r( X2_fx.a_fx[k], sn );                           /*  X2_fx.Q */
-        move16();
-
-        Ltemp_fx = L_mult0( X1_fx->a_fx[k], d1l );
-        Ltemp_fx = L_add( L_shr( Ltemp_fx, 15 ), L_mult( X1_fx->a_fx[k], d1h ) ); /*  cos(w) in Q(q+Q+1) */
-        cn = round_fx( L_shl( Ltemp_fx, sub( 30, add( q, X1_fx->Q ) ) ) );        /*  Q15 */
-        retX_fx->a_fx[k] = mult_r( X2_fx.a_fx[k], cn );                           /*  X2_fx.Q         */
-        move16();
-#endif
     }
     k = sub( k, 1 );
 
@@ -4476,12 +4161,8 @@ Word32 getSpEngyFromResAmp_fx( DTFS_STRUCTURE *X_fx, Word16 lband, Word16 hband,
             FOR( i = 0; i < M + 1; i++ )
             {
                 /*  Compute Re */
-#ifdef BASOP_NOGLOB
                 Lacc = L_mac_o( Lacc, curr_lpc[i], cos_tab[n % M_fx], &Overflow ); /*  Q28 */
-#else
-                Lacc = L_mac( Lacc, curr_lpc[i], cos_tab[n % M_fx] );   /*  Q28 */
-#endif
-                n = add( n, k4 ); /*  n=4*i*k */
+                n = add( n, k4 );                                                  /*  n=4*i*k */
             }
             Re = L_shr( Lacc, 1 ); /*  Q27 */
 
@@ -4491,21 +4172,13 @@ Word32 getSpEngyFromResAmp_fx( DTFS_STRUCTURE *X_fx, Word16 lband, Word16 hband,
             FOR( i = 0; i < M + 1; i++ )
             {
                 /*  Compute Im */
-#ifdef BASOP_NOGLOB
                 Lacc = L_msu_o( Lacc, curr_lpc[i], sin_tab[n % M_fx], &Overflow ); /*  Q28 */
-#else
-                Lacc = L_msu( Lacc, curr_lpc[i], sin_tab[n % M_fx] );   /*  Q28 */
-#endif
-                n = add( n, k4 ); /*  n=4*i*k */
+                n = add( n, k4 );                                                  /*  n=4*i*k */
             }
-            Im = L_shr( Lacc, 1 ); /*  Q27 */
-                                   /* Lacc=L_add(L_mult_ll(Re,Re),(Word32)L_mult_ll(Im,Im)); : Lacc=Re^2+Im^2 in Q23 */
-#ifdef BASOP_NOGLOB
+            Im = L_shr( Lacc, 1 );                                                   /*  Q27 */
+                                                                                     /* Lacc=L_add(L_mult_ll(Re,Re),(Word32)L_mult_ll(Im,Im)); : Lacc=Re^2+Im^2 in Q23 */
             Lacc = L_add_o( Mult_32_32( Re, Re ), Mult_32_32( Im, Im ), &Overflow ); /*  Lacc=Re^2+Im^2 in Q23 */
-#else
-            Lacc = L_add( Mult_32_32( Re, Re ), Mult_32_32( Im, Im ) ); /*  Lacc=Re^2+Im^2 in Q23 */
-#endif
-            Ltemp = L_mult0( X_fx->a_fx[k], X_fx->a_fx[k] ); /*  2*a[k]^2 in 2Q */
+            Ltemp = L_mult0( X_fx->a_fx[k], X_fx->a_fx[k] );                         /*  2*a[k]^2 in 2Q */
             /* Ltemp=(Word32)L_sat32_40(divide_dp(Ltemp,Lacc,-19,1)); : Ltemp in Q(2Q-13) */
 
             if ( Lacc < 0 )
@@ -4531,11 +4204,7 @@ Word32 getSpEngyFromResAmp_fx( DTFS_STRUCTURE *X_fx, Word16 lband, Word16 hband,
 
                 tmp = div_s( fracb, fraca ); /* 15-exp */
                 exp = sub( expb, expa );
-#ifdef BASOP_NOGLOB
                 Ltemp = L_shl_o( tmp, sub( add( shl( X_fx->Q, 1 ), exp ), 27 ), &Overflow );
-#else
-                Ltemp = L_shl( tmp, sub( add( shl( X_fx->Q, 1 ), exp ), 27 ) );
-#endif
             }
             ELSE
             {
@@ -4601,41 +4270,21 @@ void DTFS_poleFilter_fx( DTFS_STRUCTURE *X_fx, Word16 *LPC, Word16 N, Word16 *S_
         sum2_fx = L_deposit_l( 0 );
         FOR( n = 0; n < N; n++ )
         {
-#ifdef BASOP_NOGLOB
             sum1_fx = L_mac_o( sum1_fx, LPC[n], C_fx[shl( temp2, 2 ) % shl( X_fx->lag_fx, 2 )], &Overflow ); /* Q(12+15+1) */
             sum2_fx = L_mac_o( sum2_fx, LPC[n], S_fx[shl( temp2, 2 ) % shl( X_fx->lag_fx, 2 )], &Overflow ); /* Q(12+15+1) */
-#else
-            sum1_fx = L_mac( sum1_fx, LPC[n], C_fx[( 4 * temp2 ) % ( 4 * X_fx->lag_fx )] ); /* Q(12+15+1) */
-            sum2_fx = L_mac( sum2_fx, LPC[n], S_fx[( 4 * temp2 ) % ( 4 * X_fx->lag_fx )] ); /* Q(12+15+1) */
-#endif
             temp2 = add( temp2, k );
         }
 
 
-#ifdef BASOP_NOGLOB
         temp1 = round_fx_o( sum1_fx, &Overflow ); /* Q(12+15+1-16)=Q(12) */
         temp2 = round_fx_o( sum2_fx, &Overflow ); /*               Q(12) */
         /* Calculate the circular convolution */
         sum = L_mac_o( L_mult_o( temp1, temp1, &Overflow ), temp2, temp2, &Overflow ); /*  Q(12+12+1)=Q(25) */
-#else
-        temp1 = round_fx( sum1_fx );                                                        /* Q(12+15+1-16)=Q(12) */
-        temp2 = round_fx( sum2_fx );                                                        /*               Q(12) */
-        /* Calculate the circular convolution */
-        sum = L_mac( L_mult( temp1, temp1 ), temp2, temp2 );                               /*  Q(12+12+1)=Q(25) */
-#endif
 
         L_temp1 = L_mult( temp1, X_fx->a_fx[k] );
-#ifdef BASOP_NOGLOB
         L_temp1 = L_mac_o( L_temp1, temp2, X_fx->b_fx[k], &Overflow ); /*  Q(12+Q+1)=Q(13+Q) */
-#else
-        L_temp1 = L_mac( L_temp1, temp2, X_fx->b_fx[k] );                                  /*  Q(12+Q+1)=Q(13+Q) */
-#endif
         L_temp2 = L_mult( temp1, X_fx->b_fx[k] );
-#ifdef BASOP_NOGLOB
         L_temp2 = L_msu_o( L_temp2, temp2, X_fx->a_fx[k], &Overflow ); /*  Q(12+Q+1)=Q(13+Q) */
-#else
-        L_temp2 = L_msu( L_temp2, temp2, X_fx->a_fx[k] );                                  /*  Q(12+Q+1)=Q(13+Q) */
-#endif
         IF( sum )
         {
             exp = norm_l( sum );
@@ -4750,13 +4399,8 @@ void poleFilter_setup_fx( const Word16 *LPC, Word16 N, DTFS_STRUCTURE X_fx, Word
         sum2_fx = L_deposit_l( 0 );
         FOR( n = 0; n < N; n++ )
         {
-#ifdef BASOP_NOGLOB
             sum1_fx = L_mac_o( sum1_fx, LPC[n], C_fx[( 4 * temp2 ) % ( 4 * X_fx.lag_fx )], &Overflow ); /* Q(12+15+1) */
             sum2_fx = L_mac_o( sum2_fx, LPC[n], S_fx[( 4 * temp2 ) % ( 4 * X_fx.lag_fx )], &Overflow ); /* Q(12+15+1) */
-#else
-            sum1_fx = L_mac( sum1_fx, LPC[n], C_fx[( 4 * temp2 ) % ( 4 * X_fx.lag_fx )] ); /* Q(12+15+1) */
-            sum2_fx = L_mac( sum2_fx, LPC[n], S_fx[( 4 * temp2 ) % ( 4 * X_fx.lag_fx )] ); /* Q(12+15+1) */
-#endif
             temp2 = add( temp2, k );
         }
 
diff --git a/lib_com/window_fx.c b/lib_com/window_fx.c
index 2b3c50ac6749ca1a74fed4bd80ad51a09e5f3d76..a1ff625b08f2328fac98ec8066afed188f7e453d 100644
--- a/lib_com/window_fx.c
+++ b/lib_com/window_fx.c
@@ -46,13 +46,8 @@ void ham_cos_window(
     {
         /* fh_f[i] = 0.54f - 0.46f * (Float32)cos(cc);	*/
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         fh[i] = sub_o( P54_0Q15, mult_r( getCosWord16( round_fx_o( L_shl_o( cc, 9, &Overflow ), &Overflow ) ), P92_0Q15 ), &Overflow ); /*0Q15*/
         move16();
-#else
-        fh[i] = sub( P54_0Q15, mult_r( getCosWord16( round_fx( L_shl( cc, 9 ) ) ), P92_0Q15 ) ); /*0Q15*/
-        move16();
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         cc = L_add( cc, cte ); /*0Q15*/
     }
@@ -68,13 +63,8 @@ void ham_cos_window(
     FOR( i = n1; i < n1 + n2; i++ )
     {
         /* fh_f[i] = (Float32)cos(cc);		*/
-#ifdef BASOP_NOGLOB
         fh[i] = shl_o( getCosWord16( round_fx( L_shl( cc, 10 ) ) ), 1, &Overflow ); /*0Q15*/
         move16();
-#else
-        fh[i] = shl( getCosWord16( round_fx( L_shl( cc, 10 ) ) ), 1 ); /*0Q15*/
-        move16();
-#endif
         cc = L_add( cc, cte );
     }
     BASOP_SATURATE_WARNING_ON_EVS
diff --git a/lib_com/window_ola_fx.c b/lib_com/window_ola_fx.c
index 40763be995bdd9a8d5664f33fcc19c2409891084..2948e725ecdb0ca7d1add2a05b91500c4b2b8aaa 100644
--- a/lib_com/window_ola_fx.c
+++ b/lib_com/window_ola_fx.c
@@ -27,16 +27,12 @@ void sinq_fx(
     L_tmp = Mult_32_16( L_tmp, 5461 ); /*Q31; division by 6 */
     tmp2 = round_fx( L_tmp );          /*Q15 */
     x[1] = sub( tmp1, tmp2 );
-    move16(); /* sin(x) approximated by (x-x^3/3!); Q15 */
-#ifdef BASOP_NOGLOB
+    move16();                                 /* sin(x) approximated by (x-x^3/3!); Q15 */
     tmp1 = add_sat( shl_sat( tmp, 1 ), phi ); /*Q15 */
-#else
-    tmp1 = add( shl( tmp, 1 ), phi );                                                                    /*Q15 */
-#endif
-    L_tmp = L_mult( tmp1, tmp1 );      /*Q31 */
-    L_tmp = Mult_32_16( L_tmp, tmp1 ); /*Q31 */
-    L_tmp = Mult_32_16( L_tmp, 5461 ); /*Q31; division by 6 */
-    tmp2 = round_fx( L_tmp );          /*Q15 */
+    L_tmp = L_mult( tmp1, tmp1 );             /*Q31 */
+    L_tmp = Mult_32_16( L_tmp, tmp1 );        /*Q31 */
+    L_tmp = Mult_32_16( L_tmp, 5461 );        /*Q31; division by 6 */
+    tmp2 = round_fx( L_tmp );                 /*Q15 */
     x[2] = sub( tmp1, tmp2 );
     move16(); /* sin(x) approximated by (x-x^3/3!); Q15 */
 
@@ -62,13 +58,8 @@ void sinq_fx(
         L_tmp = Mult_32_32( A32, tmp_old );              /*Q30 */
         L_tmp = L_sub( L_tmp, L_shr( tmp_old_old, 1 ) ); /*Q30 */
         tmp_old_old = L_add( tmp_old, 0 );               /*Q31   */
-#ifdef BASOP_NOGLOB
-        tmp_old = L_shl_sat( L_tmp, 1 ); /*Q31   */
-        x[i] = round_fx_sat( tmp_old );  /*Q15 */
-#else
-        tmp_old = L_shl( L_tmp, 1 );                                                                     /*Q31   */
-        x[i] = round_fx( tmp_old );                                                                      /*Q15 */
-#endif
+        tmp_old = L_shl_sat( L_tmp, 1 );                 /*Q31   */
+        x[i] = round_fx_sat( tmp_old );                  /*Q15 */
         move16();
     }
 
@@ -328,11 +319,7 @@ void window_ola_fx(
             p4 = OldauOut + n;
             FOR( i = 0; i < temp; i++ )
             {
-#ifdef BASOP_NOGLOB
                 *p1 = add_sat( mult( *p1, *p2 ), shl_sat( mult( *p4, *p3 ), 5 ) ); /*auOut[i]*SS2[i]+ OldauOut[i+n]*(SS2[L-n-i-1])/(wret2[i]+0.01f);;*/
-#else
-                *p1 = add( mult( *p1, *p2 ), shl( mult( *p4, *p3 ), 5 ) );                               /*auOut[i]*SS2[i]+ OldauOut[i+n]*(SS2[L-n-i-1])/(wret2[i]+0.01f);;*/
-#endif
                 move16();
                 p1++;
                 p2++;
@@ -359,15 +346,9 @@ void window_ola_fx(
             temp_len = sub( shr( L, 1 ), n );
             FOR( i = 0; i < temp_len; i += 2 )
             {
-#ifdef BASOP_NOGLOB
                 *p1++ = round_fx_sat( L_add_sat( L_shl_sat( Mult_32_16( *pa++, *p3 ), 1 ), L_deposit_h( *p4++ ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
                 p3 -= decimate;
                 *p1++ = round_fx_sat( L_add_sat( L_shl_sat( Mult_32_16( *pa++, *p5-- ), 1 ), L_deposit_h( *p4++ ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#else
-                *p1++ = round_fx( L_add( L_shl( Mult_32_16( *pa++, *p3 ), 1 ), L_deposit_h( *p4++ ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-                p3 -= decimate;
-                *p1++ = round_fx( L_add( L_shl( Mult_32_16( *pa++, *p5-- ), 1 ), L_deposit_h( *p4++ ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#endif
                 move16();
                 /*  paout[i] = ImdctOut[L/2 + i] * win_right[(2*L_FRAME16k-(n16+(i-n)/2))*decimate-1-decay-windecay48]+OldauOut[i];
                 paout[i+1] = ImdctOut[L/2 + i +1] * win_int_right[2*L_FRAME16k-(n16+(i-n)/2)-1-windecay16]+OldauOut[i+1];*/
@@ -380,13 +361,8 @@ void window_ola_fx(
             temp_len = sub( shr( L, 1 ), n );
             FOR( i = 0; i < temp_len; i += 2 )
             {
-#ifdef BASOP_NOGLOB
                 *p1++ = round_fx_sat( L_sub_sat( L_deposit_h( *p4++ ), L_shl_sat( Mult_32_16( *pa--, *p5-- ), 1 ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
                 *p1++ = round_fx_sat( L_sub_sat( L_deposit_h( *p4++ ), L_shl_sat( Mult_32_16( *pa--, *p3 ), 1 ) ) );   /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#else
-                *p1++ = round_fx( L_sub( L_deposit_h( *p4++ ), L_shl( Mult_32_16( *pa--, *p5-- ), 1 ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-                *p1++ = round_fx( L_sub( L_deposit_h( *p4++ ), L_shl( Mult_32_16( *pa--, *p3 ), 1 ) ) );   /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#endif
                 move16();
                 p3 -= decimate;
                 /* paout[L/2 + i ] = -ImdctOut[L - 1 - i] * win_int_right[(3*L_FRAME16k/2-1-i/2)-windecay16]+OldauOut[i+L/2];
@@ -450,11 +426,7 @@ void window_ola_fx(
             temp_len = sub( shr( L, 1 ), n );
             FOR( i = 0; i < temp_len; i++ )
             {
-#ifdef BASOP_NOGLOB
                 *p1++ = round_fx_sat( L_add_sat( L_shl( Mult_32_16( *pa++, *p3 ), 1 ), L_deposit_h( *p4++ ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#else
-                *p1++ = round_fx( L_add( L_shl( Mult_32_16( *pa++, *p3 ), 1 ), L_deposit_h( *p4++ ) ) );   /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#endif
                 move16();
                 p3 -= decimate;
                 /*paout[i] = ImdctOut[L/2 + i] * win_right[(2*L-i)*decimate-1-decay-windecay48]+OldauOut[i];*/
@@ -466,11 +438,7 @@ void window_ola_fx(
             temp_len = sub( shr( L, 1 ), n );
             FOR( i = 0; i < temp_len; i++ )
             {
-#ifdef BASOP_NOGLOB
                 *p1++ = round_fx_sat( L_sub_sat( L_deposit_h( *p4++ ), L_shl_sat( Mult_32_16( *pa--, *p3 ), 1 ) ) ); /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#else
-                *p1++ = round_fx( L_sub( L_deposit_h( *p4++ ), L_shl( Mult_32_16( *pa--, *p3 ), 1 ) ) );   /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
-#endif
                 move16();
                 p3 -= decimate;
                 /* paout[L/2 + i] = -ImdctOut[L - 1 - i] * win_right[(3*L/2-1-i)*decimate+decay-windecay48]+OldauOut[i+L/2]; */
@@ -865,13 +833,13 @@ void core_switching_OLA_fx(
 
         IF( ( output_frame - L_FRAME16k ) == 0 ) /* no resampling */
         {
-            Copy( mem_over_hp + 2, tmp_buf_switch + i_mult2( SWITCH_GAP_LENGTH_8k, delta ), NS2SA( output_Fs, DELAY_CLDFB_NS ) );
+            Copy( mem_over_hp + 2, tmp_buf_switch + i_mult2( SWITCH_GAP_LENGTH_8k, delta ), NS2SA_FX2( output_Fs, DELAY_CLDFB_NS ) );
         }
         ELSE
         {
             IF( ( output_frame - L_FRAME8k ) == 0 ) /* not done yet */
             {
-                Copy( synth_subfr_out + SWITCH_GAP_LENGTH_8k, tmp_buf_switch + SWITCH_GAP_LENGTH_8k, NS2SA( output_Fs, DELAY_CLDFB_NS ) ); /* copy subframe to tmp buffer */
+                Copy( synth_subfr_out + SWITCH_GAP_LENGTH_8k, tmp_buf_switch + SWITCH_GAP_LENGTH_8k, NS2SA_FX2( output_Fs, DELAY_CLDFB_NS ) ); /* copy subframe to tmp buffer */
             }
             ELSE
             {
@@ -930,15 +898,9 @@ void core_switching_OLA_fx(
         temp_len = i_mult2( ( R2_16 >> 2 ), delta );
         FOR( i = 0; i < temp_len; i += 2 )
         {
-#ifdef BASOP_NOGLOB
             *pt = shl_sat( mult_r_sat( *pt, *pt5 ), 1 );
             move16(); /*      // Q14* Q15 + shl  ==> Q15 */
             *pt2 = shl_sat( mult_r_sat( *pt2, *pt4 ), 1 );
-#else
-            *pt = shl( mult_r( *pt, *pt5 ), 1 );
-            move16(); /*      // Q14* Q15 + shl  ==> Q15 */
-            *pt2 = shl( mult_r( *pt2, *pt4 ), 1 );
-#endif
             move16(); /*/= win[(3*L_FRAME16k/2-1-i/2)*decimate+decay-L_FRAME48k*14/20]; */
             pt += 2;
             pt2 += 2;
@@ -954,11 +916,7 @@ void core_switching_OLA_fx(
         temp_len = i_mult2( ( R2_16 >> 2 ), delta );
         FOR( i = 0; i < temp_len; i++ )
         {
-#ifdef BASOP_NOGLOB
             *pt = shl_sat( mult_r_sat( *pt, *pt5 ), 1 );
-#else
-            *pt = shl( mult_r( *pt, *pt5 ), 1 );
-#endif
             move16(); /*  /= win[(3*output_frame/2-1-i)*decimate+decay-L_FRAME48k*14/20]; */
             pt++;
             pt5 -= decimate;
@@ -992,7 +950,7 @@ void core_switching_OLA_fx(
 
     pt = synth;
     pt2 = tmp_buf_switch;
-    tmp = NS2SA( output_Fs, DELAY_CLDFB_NS );
+    tmp = NS2SA_FX2( output_Fs, DELAY_CLDFB_NS );
     move16();
     pt3 = synth_subfr_bwe;
 
@@ -1007,11 +965,7 @@ void core_switching_OLA_fx(
     temp_len = sub( L, tmp );
     FOR( i = 0; i < temp_len; i++ )
     {
-#ifdef BASOP_NOGLOB
         *pt = add_sat( add_sat( *pt, *pt2++ ), *pt3++ );
-#else
-        *pt = add( add( *pt, *pt2++ ), *pt3++ );
-#endif
         move16();
         pt++;
     }
diff --git a/lib_com/wtda.c b/lib_com/wtda.c
index 6bce31db96a7307ceb822a71a80d809f1a3cbea0..3fb40813816c7b4462bdcc3ec82b8df2314fb845 100644
--- a/lib_com/wtda.c
+++ b/lib_com/wtda.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,11 +37,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include <assert.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 
 void wtda_fx32(
diff --git a/lib_com/wtda_fx.c b/lib_com/wtda_fx.c
index 5f35a3c299fc9aff890d85c361be94182f978ff5..e060984dff14eb316ed1d965e06830487eb1624b 100644
--- a/lib_com/wtda_fx.c
+++ b/lib_com/wtda_fx.c
@@ -572,7 +572,7 @@ void wtda_ivas_fx(
 
 void wtda_ext_fx(
     const Word16 *new_audio,  /* i  : input audio (Q_in)                  */
-    Word16 *wtda_audio,       /* o  : windowed audio (Q_in)               */
+    Word16 *wtda_audio,       /* o  : windowed audio (Q_in - 1)           */
     const Word16 left_mode,   /* i  : window overlap of previous frame (0: full, 2: none, or 3: half) */
     const Word16 right_mode,  /* i  : window overlap of current frame (0: full, 2: none, or 3: half) */
     const Word16 L,           /* i  : length                              */
@@ -628,10 +628,10 @@ void wtda_ext_fx(
             FOR( i = 0; i < L / 2 - n; i += 2 )
             {
                 wtda_audio[i] = round_fx( L_mac0( L_mult0( negate( allsig_r[L / 2 - i - 1] ), win_int_right[3 * L_FRAME16k / 2 - i / 2 - 1 - windecay16] ),
-                                                  allsig_r[L / 2 + i], win_int_right[3 * L_FRAME16k / 2 + i / 2 - windecay16] ) ); // q_in
+                                                  allsig_r[L / 2 + i], win_int_right[3 * L_FRAME16k / 2 + i / 2 - windecay16] ) ); // q_in - 1
                 move16();
                 wtda_audio[i + 1] = round_fx( L_mac0( L_mult0( negate( allsig_r[L / 2 - ( i + 1 ) - 1] ), win_right[( 3 * L_FRAME16k / 2 - i / 2 - 1 ) * decimate + decay - windecay48] ),
-                                                      allsig_r[L / 2 + i + 1], win_right[( 3 * L_FRAME16k / 2 + 1 + i / 2 ) * decimate - decay - 1 - windecay48] ) ); // q_in
+                                                      allsig_r[L / 2 + i + 1], win_right[( 3 * L_FRAME16k / 2 + 1 + i / 2 ) * decimate - decay - 1 - windecay48] ) ); // q_in - 1
                 move16();
             }
         }
@@ -640,19 +640,19 @@ void wtda_ext_fx(
             FOR( i = 0; i < L / 2 - n; i += 2 )
             {
                 wtda_audio[i] = round_fx( L_msu0( L_mult0( negate( allsig_r[L / 2 - i - 1] ), win_int_right[3 * L_FRAME16k / 2 - i / 2 - 1 - windecay16] ),
-                                                  allsig_r[L / 2 + i], win_int_right[3 * L_FRAME16k / 2 + i / 2 - windecay16] ) ); // q_in
+                                                  allsig_r[L / 2 + i], win_int_right[3 * L_FRAME16k / 2 + i / 2 - windecay16] ) ); // q_in - 1
                 move16();
                 wtda_audio[i + 1] = round_fx( L_msu0( L_mult0( negate( allsig_r[L / 2 - ( i + 1 ) - 1] ), win_right[( 3 * L_FRAME16k / 2 - i / 2 - 1 ) * decimate + decay - windecay48] ),
-                                                      allsig_r[L / 2 + i + 1], win_right[( 3 * L_FRAME16k / 2 + 1 + i / 2 ) * decimate - decay - 1 - windecay48] ) ); // q_in
+                                                      allsig_r[L / 2 + i + 1], win_right[( 3 * L_FRAME16k / 2 + 1 + i / 2 ) * decimate - decay - 1 - windecay48] ) ); // q_in - 1
                 move16();
             }
         }
 
         FOR( i = L / 2 - n; i < L / 2; i += 2 )
         {
-            wtda_audio[i] = shr( negate( allsig_r[L / 2 - i - 1] ), 1 ); // q_in
+            wtda_audio[i] = shr( negate( allsig_r[L / 2 - i - 1] ), 1 ); // q_in - 1
             move16();
-            wtda_audio[i + 1] = shr( negate( allsig_r[L / 2 - ( i + 1 ) - 1] ), 1 ); // q_in
+            wtda_audio[i + 1] = shr( negate( allsig_r[L / 2 - ( i + 1 ) - 1] ), 1 ); // q_in - 1
             move16();
         }
 
@@ -661,20 +661,20 @@ void wtda_ext_fx(
             FOR( i = 0; i < n; i += 2 )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( negate( allsig_l[i] ), win_left[( i / 2 ) * decimate + decay] ),
-                                                          new_audio[n - i - 1], MAX16B ) ); // q_in
+                                                          new_audio[n - i - 1], MAX16B ) ); // q_in - 1
                 move16();
                 wtda_audio[i + L / 2 + 1] = round_fx( L_msu0( L_mult0( negate( allsig_l[i + 1] ), win_int_left[i / 2] ),
-                                                              new_audio[n - ( i + 1 ) - 1], MAX16B ) ); // q_in
+                                                              new_audio[n - ( i + 1 ) - 1], MAX16B ) ); // q_in - 1
                 move16();
             }
 
             FOR( i = n; i < L / 2; i += 2 )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( negate( allsig_l[i] ), win_left[( i / 2 ) * decimate + decay] ),
-                                                          allsig_l[L - i - 1], win_left[( L / 2 - i / 2 ) * decimate - 1 - decay] ) ); // q_in
+                                                          allsig_l[L - i - 1], win_left[( L / 2 - i / 2 ) * decimate - 1 - decay] ) ); // q_in - 1
                 move16();
                 wtda_audio[i + L / 2 + 1] = round_fx( L_msu0( L_mult0( negate( allsig_l[i + 1] ), win_int_left[i / 2] ),
-                                                              allsig_l[L - ( i + 1 ) - 1], win_int_left[L / 2 - i / 2 - 1] ) ); // q_in
+                                                              allsig_l[L - ( i + 1 ) - 1], win_int_left[L / 2 - i / 2 - 1] ) ); // q_in - 1
                 move16();
             }
         }
@@ -683,20 +683,20 @@ void wtda_ext_fx(
             FOR( i = 0; i < n; i += 2 )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( allsig_l[i], win_left[( i / 2 ) * decimate + decay] ),
-                                                          new_audio[n - i - 1], MAX16B ) ); // q_in
+                                                          new_audio[n - i - 1], MAX16B ) ); // q_in - 1
                 move16();
                 wtda_audio[i + L / 2 + 1] = round_fx( L_msu0( L_mult0( allsig_l[i + 1], win_int_left[i / 2] ),
-                                                              new_audio[n - ( i + 1 ) - 1], MAX16B ) ); // q_in
+                                                              new_audio[n - ( i + 1 ) - 1], MAX16B ) ); // q_in - 1
                 move16();
             }
 
             FOR( i = n; i < L / 2; i += 2 )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( allsig_l[i], win_left[( i / 2 ) * decimate + decay] ),
-                                                          allsig_l[L - i - 1], win_left[( L / 2 - i / 2 ) * decimate - 1 - decay] ) ); // q_in
+                                                          allsig_l[L - i - 1], win_left[( L / 2 - i / 2 ) * decimate - 1 - decay] ) ); // q_in - 1
                 move16();
                 wtda_audio[i + L / 2 + 1] = round_fx( L_msu0( L_mult0( allsig_l[i + 1], win_int_left[i / 2] ),
-                                                              allsig_l[L - ( i + 1 ) - 1], win_int_left[L / 2 - i / 2 - 1] ) ); // q_in
+                                                              allsig_l[L - ( i + 1 ) - 1], win_int_left[L / 2 - i / 2 - 1] ) ); // q_in - 1
                 move16();
             }
         }
@@ -708,7 +708,7 @@ void wtda_ext_fx(
             FOR( i = 0; i < L / 2 - n; i++ )
             {
                 wtda_audio[i] = round_fx( L_mac0( L_mult0( negate( allsig_r[L / 2 - i - 1] ), win_right[3 * L / 2 * decimate - ( i + 1 ) * decimate + decay - windecay48] ),
-                                                  allsig_r[L / 2 + i], win_right[3 * L / 2 * decimate - 1 + ( i + 1 ) * decimate - decay - windecay48] ) ); // q_in
+                                                  allsig_r[L / 2 + i], win_right[3 * L / 2 * decimate - 1 + ( i + 1 ) * decimate - decay - windecay48] ) ); // q_in - 1
                 move16();
             }
         }
@@ -717,14 +717,14 @@ void wtda_ext_fx(
             FOR( i = 0; i < L / 2 - n; i++ )
             {
                 wtda_audio[i] = round_fx( L_msu0( L_mult0( negate( allsig_r[L / 2 - i - 1] ), win_right[3 * L / 2 * decimate - ( i + 1 ) * decimate + decay - windecay48] ),
-                                                  allsig_r[L / 2 + i], win_right[3 * L / 2 * decimate - 1 + ( i + 1 ) * decimate - decay - windecay48] ) ); // q_in
+                                                  allsig_r[L / 2 + i], win_right[3 * L / 2 * decimate - 1 + ( i + 1 ) * decimate - decay - windecay48] ) ); // q_in - 1
                 move16();
             }
         }
 
         FOR( i = L / 2 - n; i < L / 2; i++ )
         {
-            wtda_audio[i] = shr( negate( allsig_r[L / 2 - i - 1] ), 1 ); // q_in
+            wtda_audio[i] = shr( negate( allsig_r[L / 2 - i - 1] ), 1 ); // q_in - 1
             move16();
         }
 
@@ -733,14 +733,14 @@ void wtda_ext_fx(
             FOR( i = 0; i < n; i++ )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( negate( allsig_l[i] ), win_left[i * decimate + decay] ),
-                                                          new_audio[n - i - 1], MAX16B ) ); // q_in
+                                                          new_audio[n - i - 1], MAX16B ) ); // q_in - 1
                 move16();
             }
 
             FOR( i = n; i < L / 2; i++ )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( negate( allsig_l[i] ), win_left[i * decimate + decay] ),
-                                                          allsig_l[L - i - 1], win_left[L * decimate - i * decimate - 1 - decay] ) ); // q_in
+                                                          allsig_l[L - i - 1], win_left[L * decimate - i * decimate - 1 - decay] ) ); // q_in - 1
                 move16();
             }
         }
@@ -749,14 +749,14 @@ void wtda_ext_fx(
             FOR( i = 0; i < n; i++ )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( allsig_l[i], win_left[i * decimate + decay] ),
-                                                          new_audio[n - i - 1], MAX16B ) ); // q_in
+                                                          new_audio[n - i - 1], MAX16B ) ); // q_in - 1
                 move16();
             }
 
             FOR( i = n; i < L / 2; i++ )
             {
                 wtda_audio[i + L / 2] = round_fx( L_msu0( L_mult0( allsig_l[i], win_left[i * decimate + decay] ),
-                                                          allsig_l[L - i - 1], win_left[L * decimate - i * decimate - 1 - decay] ) ); // q_in
+                                                          allsig_l[L - i - 1], win_left[L * decimate - i * decimate - 1 - decay] ) ); // q_in - 1
                 move16();
             }
         }
diff --git a/lib_debug/debug.c b/lib_debug/debug.c
index f1cfa928ab136ad2fb2817655dae23025cf79eed..aafc1b66332ef261ec444a0c2ca4cd269cb1a325 100644
--- a/lib_debug/debug.c
+++ b/lib_debug/debug.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,6 +39,7 @@
 #include "options.h"
 #ifdef DEBUGGING
 #include "debug.h"
+#include <assert.h>
 #ifdef DEBUG_MODE_INFO
 #ifdef DEBUG_MODE_INFO_TWEAK
 #include <sys/stat.h>
@@ -363,6 +364,13 @@ int16_t dbgread(
     {
         index = in_count;
         in_fileptr[index] = fopen( filename, "rb" );
+#ifdef DEBUG_FORCE_DIR
+        if ( in_fileptr[index] == NULL )
+        {
+            /* file does not exist or could not be opened -> just return */
+            return -1;
+        }
+#endif
         in_filename[index] = malloc( sizeof( char ) * ( strlen( filename ) + 1 ) );
         strcpy( in_filename[index], filename );
         in_count++;
@@ -751,7 +759,7 @@ int16_t tweakdbgfolder( const char *filename, char *filename_mod, int16_t *textm
 #endif
 
 
-#ifdef DEBUG_MODE_INFO
+#ifdef DEBUGGING
 /*-------------------------------------------------------------------*
    * fname()
    *
@@ -771,10 +779,21 @@ char *fname(
     const int16_t id,
     const int16_t enc_dec )
 {
-    char idd[5] = ".idX";
-    idd[3] = (char) ( id + '0' );
+    char idd[6];
+
+    assert( id < 100 );
+    sprintf( idd, ".id%d", id );
 
     strcpy( tmp_fname, dir );
+#ifdef DEBUG_FORCE_DIR
+    size_t len;
+    len = strlen( tmp_fname );
+    if (tmp_fname[len - 1] != '/' && tmp_fname[len - 1] != '\\' )
+    {
+        /* add trailing '/' slash */
+        strcat( tmp_fname, "/" );
+    }
+#endif
     strcat( tmp_fname, file );
 
     if ( enc_dec == DEC )
diff --git a/lib_debug/debug.h b/lib_debug/debug.h
index e88def922b0992a0ba765942089cb59a8d4a76c6..c79ff60465cf7fc043aff2930846e853c02edde2 100644
--- a/lib_debug/debug.h
+++ b/lib_debug/debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -60,12 +60,16 @@ extern int16_t debug_level;
 #define DEBUG_LINE( level ) if ( 0 )
 #endif
 
-#ifdef DEBUG_MODE_INFO
+#ifdef DEBUGGING
 extern char tmp_fname[];
 extern char debug_dir[6];
 char *fname( char *dir, char *file, const int16_t n, const int16_t id, const int16_t enc_dec );
 #endif
 
+#ifdef DEBUG_FORCE_DIR
+#define FORCE_DIR_MAX_LENGTH 255 /* maximum length of the directory for modes/parameters enforcement */
+#endif
+
 /*------------------------------------------------------------------------------------------*
  * Read/write I/O tool
  *------------------------------------------------------------------------------------------*/
diff --git a/lib_debug/sba_debug.c b/lib_debug/sba_debug.c
index a85bc7be02b5fa643dd1905a3cbea48b030f60ff..c05ae96ef6279111db026a5dadff58fa2ce72045 100644
--- a/lib_debug/sba_debug.c
+++ b/lib_debug/sba_debug.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_debug/sba_debug.h b/lib_debug/sba_debug.h
index 60f74401d56816137be28e5723c06c938ee63576..2be427d524e82f92deec2ab9e8c0964374474dab 100644
--- a/lib_debug/sba_debug.h
+++ b/lib_debug/sba_debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_debug/snr.c b/lib_debug/snr.c
index bd8af44e820ea26b29e3baf59dfdc8fc2d0c0cc2..cf15a2907b50dec0580121c2773f91191c8b4afc 100644
--- a/lib_debug/snr.c
+++ b/lib_debug/snr.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/ACcontextMapping_dec.c b/lib_dec/ACcontextMapping_dec.c
deleted file mode 100644
index cf5b4a9b7daa4d9139d1be45f8dec3f96ad4dd39..0000000000000000000000000000000000000000
--- a/lib_dec/ACcontextMapping_dec.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "ivas_rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h" /* Range coder header file */
-#include <assert.h>
diff --git a/lib_dec/ACcontextMapping_dec_fx.c b/lib_dec/ACcontextMapping_dec_fx.c
index 34e74a06f9ae9d5f1838d46efb8007cec71a00d8..acf372565408b238d2a86c40b85a396f5660b5ae 100644
--- a/lib_dec/ACcontextMapping_dec_fx.c
+++ b/lib_dec/ACcontextMapping_dec_fx.c
@@ -12,7 +12,6 @@
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 /*-------------------------------------------------------------------*
  * ACcontextMapping_decode2_no_mem_s17_LC()
@@ -329,9 +328,6 @@ Word16 ACcontextMapping_decode2_no_mem_s17_LC(
     return resQBits;
 }
 
-#define IVAS_CONTEXT_MAPPING
-#ifdef IVAS_CONTEXT_MAPPING
-
 /*-------------------------------------------------------------------*
  * RCcontextMapping_decode2_no_mem_s17_LCS()
  *
@@ -738,6 +734,3 @@ Word16 RCcontextMapping_decode2_no_mem_s17_LCS_fx(
 
     return resQBits;
 }
-
-#endif
-#undef IVAS_CONTEXT_MAPPING
diff --git a/lib_dec/FEC.c b/lib_dec/FEC.c
deleted file mode 100644
index fc669bf26e5d7f47a17d6e62ec8ebfb50941216e..0000000000000000000000000000000000000000
--- a/lib_dec/FEC.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "rom_dec.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-
-#define WMC_TOOL_SKIP
-/*-------------------------------------------------------------------*
- * pulseRes_preCalc()
- *
- * calculates some conditions for Pulse resynchronization to take place
- *-------------------------------------------------------------------*/
-
-#undef WMC_TOOL_SKIP
diff --git a/lib_dec/FEC_HQ_core.c b/lib_dec/FEC_HQ_core.c
deleted file mode 100644
index 794f6dab36c75867d5d0cb3e0b91766f37586557..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_HQ_core.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_dec.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-
-void save_synthesis_hq_fec_fx(
-    Decoder_State *st,         /* i/o: decoder state structure     */
-    const Word32 output_fx[],  /* i  : decoded synthesis           */
-    const Word16 output_frame, /* i  : decoded synthesis           */
-    CPE_DEC_HANDLE hCPE        /* i  : CPE decoder structure       */
-)
-{
-    Word16 post_hq_delay;
-
-    SWITCH( st->element_mode )
-    {
-        case EVS_MONO:
-            post_hq_delay = NS2SA_FX2( st->output_Fs, POST_HQ_DELAY_NS );
-            BREAK;
-        case IVAS_SCE:
-            post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );
-            BREAK;
-        case IVAS_CPE_DFT:
-            test();
-            IF( EQ_16( hCPE->nchan_out, 1 ) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF )
-            {
-                post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );
-            }
-            ELSE
-            {
-                post_hq_delay = 0;
-                move16();
-            }
-            BREAK;
-        default:
-            post_hq_delay = 0;
-            move16();
-            BREAK;
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( EQ_16( st->codec_mode, MODE1 ) && st->hTcxDec != NULL ) && ( ( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) ) || EQ_16( st->core, HQ_CORE ) ) )
-    {
-        Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ) );
-        FOR( Word16 i = 0; i < output_frame; i++ )
-        {
-            st->hTcxDec->old_synthFB_fx[( ( i + output_frame ) - post_hq_delay )] = extract_h( L_shl_sat( output_fx[i], 16 ) ); // Q16
-            move16();
-        }
-
-        IF( st->element_mode == EVS_MONO )
-        {
-            /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill
-               this buffer are not available for all cases, the impact on the output is limited */
-
-            set16_fx( st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay );
-            IF( GE_16( output_frame, L_FRAME16k ) )
-            {
-                Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );
-            }
-            ELSE
-            {
-                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
-            }
-
-            IF( st->core != ACELP_CORE )
-            {
-                IF( GE_16( output_frame, L_FRAME16k ) )
-                {
-                    Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );
-                    Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
-                }
-                ELSE
-                {
-                    Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );
-                    Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
-                }
-            }
-        }
-        ELSE
-        {
-            IF( st->core != ACELP_CORE )
-            {
-                Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), post_hq_delay );
-                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
-            }
-        }
-    }
-    return;
-}
diff --git a/lib_dec/FEC_HQ_core_fx.c b/lib_dec/FEC_HQ_core_fx.c
index 01002b56b665bd15f18fc5908b93b9006a00dff5..cc03dcf525f424e500118ee9f8d2362c74ebedd3 100644
--- a/lib_dec/FEC_HQ_core_fx.c
+++ b/lib_dec/FEC_HQ_core_fx.c
@@ -78,13 +78,8 @@ static void Regression_Anal_fx(
     {
         b_p_fx[0] = L_add( b_p_fx[0], L_shr( values_fx[i], 2 ) ); /*10 */
         move32();
-#ifdef BASOP_NOGLOB
         b_p_fx[1] = L_add( b_p_fx[1], Mult_32_16( values_fx[i], shl_o( sub( num_pgf, i ), 13, &Overflow ) ) ); /*10 */
         move32();
-#else
-        b_p_fx[1] = L_add( b_p_fx[1], Mult_32_16( values_fx[i], shl( sub( num_pgf, i ), 13 ) ) ); /*10 */
-        move32();
-#endif
     }
 
     tmp = sub( i_mult( aindex_fx[0], aindex_fx[2] ), i_mult( aindex_fx[1], aindex_fx[1] ) );
@@ -378,11 +373,7 @@ void HQ_FEC_processing_fx(
                 exp2 = norm_l( norm_values_fx[0] );
                 tmp_fx = div_s( extract_h( L_shl( norm_p_fx[i], exp1 ) ),
                                 extract_h( L_shl( norm_values_fx[0], exp2 ) ) ); /*15 + (5 + exp1 - 16) - (12 + exp2 - 16)*/
-#ifdef BASOP_NOGLOB
-                tmp_fx = shl_sat( tmp_fx, add( 6, sub( exp2, exp1 ) ) ); /*14*/
-#else
-                tmp_fx = shl( tmp_fx, add( 6, sub( exp2, exp1 ) ) ); /*14*/
-#endif
+                tmp_fx = shl_sat( tmp_fx, add( 6, sub( exp2, exp1 ) ) );         /*14*/
                 if ( GT_16( tmp_fx, 16384 ) )
                 {
                     tmp_fx = 16384;
@@ -391,14 +382,9 @@ void HQ_FEC_processing_fx(
 
                 FOR( j = 0; j < Num_bands_p[i]; j++ )
                 {
-#ifdef BASOP_NOGLOB
                     hHQ_nbfec->Norm_gain_fx[k] = shl_o( tmp_fx, 1, &Overflow );
                     move16();
                     k = add( k, 1 );
-#else
-                    hHQ_nbfec->Norm_gain_fx[k++] = shl( tmp_fx, 1 );
-                    move16();
-#endif
                 }
             }
             ELSE
@@ -532,12 +518,8 @@ void ivas_HQ_FEC_Mem_update_fx(
                 L_tmp = L_add( L_tmp, L_shr( normq_fx[k], 3 ) ); /*11*/
                 k = add( k, 1 );
             }
-#ifdef BASOP_NOGLOB
             tmp_fx = shl_o( inv_tbl_fx[Num_bands_p[i]], 1, &Overflow ); /*16*/
-#else
-            tmp_fx = shl( inv_tbl_fx[Num_bands_p[i]], 1 ); /*16*/
-#endif
-            norm_values_fx[0] = Mult_32_16( L_tmp, tmp_fx ); /*11 + 16 - 15*/
+            norm_values_fx[0] = Mult_32_16( L_tmp, tmp_fx );            /*11 + 16 - 15*/
             move32();
             tmp_energy_fx = L_add( tmp_energy_fx, L_shr( L_tmp, 3 ) ); /*8*/
         }
@@ -656,11 +638,7 @@ void ivas_HQ_FEC_Mem_update_fx(
             exp2 = norm_l( hHQ_nbfec->ynrm_values_fx[i][0] );
             tmp_fx = div_s( extract_h( L_shl( en_high_fx[i], exp1 ) ), extract_h( L_shl( hHQ_nbfec->ynrm_values_fx[i][0], exp2 ) ) );
             exp = add( 15, sub( exp1, exp2 ) );
-#ifdef BASOP_NOGLOB
             *mean_en_high_fx = add_o( *mean_en_high_fx, shr_o( tmp_fx, sub( exp, 5 ), &Overflow ), &Overflow );
-#else
-            *mean_en_high_fx = add( *mean_en_high_fx, shr( tmp_fx, sub( exp, 5 ) ) );
-#endif
             move16();
         }
         *mean_en_high_fx = mult( *mean_en_high_fx, inv_tbl_fx[sub( num_Sb, k )] );
@@ -747,10 +725,9 @@ void HQ_FEC_Mem_update_fx(
     move32();
 #endif
     move32(); // tmp_energy_fx
-#ifdef ADD_IVAS_HQ_CODE_FEC
+
     IF( EQ_16( output_frame, L_FRAME8k ) )
     {
-#endif
 
         IF( is_transient )
         {
@@ -781,238 +758,222 @@ void HQ_FEC_Mem_update_fx(
                 }
             }
         }
-#ifndef ADD_IVAS_HQ_CODE_FEC
-        IF( EQ_16( output_frame, L_FRAME8k ) )
-        {
-#endif
-            /* if LR MDCT core is used, recalculate norms from decoded MDCT spectrum (using code from hq_hr_enc_fx()) */
-            test();
-            IF( ( EQ_16( hqswb_clas, HQ_HVQ ) ) || ( EQ_16( hq_core_type, LOW_RATE_HQ_CORE ) ) )
-            {
-                /* First group */
-                logqnorm_fx( t_audio_q_fx, 12, ynrm, 32, WID_G1, (const Word16) EQ_16( hqswb_clas, HQ_HVQ ) );
-                j = ynrm[0];
-                move16();
-                offset = WID_G1;
-                move16();
 
-                FOR( i = 1; i < SFM_G1; i++ )
-                {
-                    logqnorm_fx( &t_audio_q_fx[offset], 12, &ynrm[i], 40, WID_G1, (const Word16) EQ_16( hqswb_clas, HQ_HVQ ) );
-                    offset = add( offset, WID_G1 );
-                }
+        /* if LR MDCT core is used, recalculate norms from decoded MDCT spectrum (using code from hq_hr_enc_fx()) */
+        test();
+        IF( ( EQ_16( hqswb_clas, HQ_HVQ ) ) || ( EQ_16( hq_core_type, LOW_RATE_HQ_CORE ) ) )
+        {
+            /* First group */
+            logqnorm_fx( t_audio_q_fx, 12, ynrm, 32, WID_G1, (const Word16) EQ_16( hqswb_clas, HQ_HVQ ) );
+            j = ynrm[0];
+            move16();
+            offset = WID_G1;
+            move16();
 
-                /* Second group */
-                FOR( i = SFM_G1; i < SFM_G1 + 2; i++ )
-                {
-                    logqnorm_fx( &t_audio_q_fx[offset], 12, &ynrm[i], 40, WID_G2, (const Word16) EQ_16( hqswb_clas, HQ_HVQ ) );
-                    offset = add( offset, WID_G2 );
-                }
+            FOR( i = 1; i < SFM_G1; i++ )
+            {
+                logqnorm_fx( &t_audio_q_fx[offset], 12, &ynrm[i], 40, WID_G1, (const Word16) EQ_16( hqswb_clas, HQ_HVQ ) );
+                offset = add( offset, WID_G1 );
             }
 
-            /* Memory update for the LGF log2 Norm */
-            FOR( i = 0; i < nb_sfm; i++ )
+            /* Second group */
+            FOR( i = SFM_G1; i < SFM_G1 + 2; i++ )
             {
-                normq_fx[i] = dicn_fx[ynrm[i]];
-                move32();
+                logqnorm_fx( &t_audio_q_fx[offset], 12, &ynrm[i], 40, WID_G2, (const Word16) EQ_16( hqswb_clas, HQ_HVQ ) );
+                offset = add( offset, WID_G2 );
             }
-            k = 0;
-            move16();
-            FOR( i = 0; i < num_Sb; i++ )
-            {
-                norm_values_fx = &hHQ_nbfec->ynrm_values_fx[i][0];
-                Copy32( norm_values_fx, &norm_values_fx[1], MAX_PGF - 1 );
+        }
 
-                L_tmp = L_deposit_l( 0 );
-                FOR( j = 0; j < Num_bands_p[i]; j++ )
-                {
-                    L_tmp = L_add( L_tmp, L_shr( normq_fx[k], 3 ) ); /*11*/
-                    k = add( k, 1 );
-                }
-#ifdef BASOP_NOGLOB
-                tmp_fx = shl_o( inv_tbl_fx[Num_bands_p[i]], 1, &Overflow ); /*16*/
-#else
-        tmp_fx = shl( inv_tbl_fx[Num_bands_p[i]], 1 ); /*16*/
-#endif
-                norm_values_fx[0] = Mult_32_16( L_tmp, tmp_fx ); /*11 + 16 - 15*/
-                move32();
-                tmp_energy_fx = L_add( tmp_energy_fx, L_shr( L_tmp, 3 ) ); /*8*/
+        /* Memory update for the LGF log2 Norm */
+        FOR( i = 0; i < nb_sfm; i++ )
+        {
+            normq_fx[i] = dicn_fx[ynrm[i]];
+            move32();
+        }
+        k = 0;
+        move16();
+        FOR( i = 0; i < num_Sb; i++ )
+        {
+            norm_values_fx = &hHQ_nbfec->ynrm_values_fx[i][0];
+            Copy32( norm_values_fx, &norm_values_fx[1], MAX_PGF - 1 );
+
+            L_tmp = L_deposit_l( 0 );
+            FOR( j = 0; j < Num_bands_p[i]; j++ )
+            {
+                L_tmp = L_add( L_tmp, L_shr( normq_fx[k], 3 ) ); /*11*/
+                k = add( k, 1 );
             }
-            test();
-            test();
-            IF( ( c_switching_flag ) || ( ( st_fx->last_core == ACELP_CORE ) && ( EQ_16( st_fx->core, HQ_CORE ) ) ) )
+            tmp_fx = shl_o( inv_tbl_fx[Num_bands_p[i]], 1, &Overflow ); /*16*/
+            norm_values_fx[0] = Mult_32_16( L_tmp, tmp_fx );            /*11 + 16 - 15*/
+            move32();
+            tmp_energy_fx = L_add( tmp_energy_fx, L_shr( L_tmp, 3 ) ); /*8*/
+        }
+        test();
+        test();
+        IF( ( c_switching_flag ) || ( ( st_fx->last_core == ACELP_CORE ) && ( EQ_16( st_fx->core, HQ_CORE ) ) ) )
+        {
+            FOR( i = 0; i < MAX_SB_NB; i++ )
             {
-                FOR( i = 0; i < MAX_SB_NB; i++ )
+                FOR( j = 1; j < MAX_PGF; j++ )
                 {
-                    FOR( j = 1; j < MAX_PGF; j++ )
-                    {
-                        hHQ_nbfec->ynrm_values_fx[i][j] = hHQ_nbfec->ynrm_values_fx[i][0];
-                        move32();
-                    }
+                    hHQ_nbfec->ynrm_values_fx[i][j] = hHQ_nbfec->ynrm_values_fx[i][0];
+                    move32();
                 }
             }
-            set16_fx( hHQ_nbfec->Norm_gain_fx, 32767, SFM_N_NB ); /*15*/
-            /* st->energy_MA_Curr[1]=Energy of the current frame */
-            tmp_fx = inv_tbl_fx[nb_sfm];
-            move16();                                    /*15*/
-            L_tmp = Mult_32_16( tmp_energy_fx, tmp_fx ); /*8 + 15 - 15*/
-
-#ifdef BASOP_NOGLOB
-            hHQ_nbfec->energy_MA_Curr_fx[1] = extract_h( L_shl_sat( L_tmp, 16 - 8 ) );
-            move16();
-#else
-    hHQ_nbfec->energy_MA_Curr_fx[1] = extract_h( L_shl( L_tmp, 16 - 8 ) );
-#endif
-            /* Moving Average */
-            hHQ_nbfec->energy_MA_Curr_fx[0] = s_max( 1, add( mult_r( 26214, hHQ_nbfec->energy_MA_Curr_fx[0] ), mult_r( 6554, hHQ_nbfec->energy_MA_Curr_fx[1] ) ) );
-            move16();
+        }
+        set16_fx( hHQ_nbfec->Norm_gain_fx, 32767, SFM_N_NB ); /*15*/
+        /* st->energy_MA_Curr[1]=Energy of the current frame */
+        tmp_fx = inv_tbl_fx[nb_sfm];
+        move16();                                    /*15*/
+        L_tmp = Mult_32_16( tmp_energy_fx, tmp_fx ); /*8 + 15 - 15*/
 
-            /*st->diff_energy = (float)fabs((st->energy_MA_Curr[1] - st->energy_MA_Curr[0])/st->energy_MA_Curr[0]); */
-            hHQ_nbfec->diff_energy_fx = abs_s( sub( hHQ_nbfec->energy_MA_Curr_fx[1], hHQ_nbfec->energy_MA_Curr_fx[0] ) );
+        hHQ_nbfec->energy_MA_Curr_fx[1] = extract_h( L_shl_sat( L_tmp, 16 - 8 ) );
+        move16();
+        /* Moving Average */
+        hHQ_nbfec->energy_MA_Curr_fx[0] = s_max( 1, add( mult_r( 26214, hHQ_nbfec->energy_MA_Curr_fx[0] ), mult_r( 6554, hHQ_nbfec->energy_MA_Curr_fx[1] ) ) );
+        move16();
+
+        /*st->diff_energy = (float)fabs((st->energy_MA_Curr[1] - st->energy_MA_Curr[0])/st->energy_MA_Curr[0]); */
+        hHQ_nbfec->diff_energy_fx = abs_s( sub( hHQ_nbfec->energy_MA_Curr_fx[1], hHQ_nbfec->energy_MA_Curr_fx[0] ) );
+        move16();
+        exp1 = sub( norm_l( hHQ_nbfec->diff_energy_fx ), 1 );
+        exp2 = norm_l( hHQ_nbfec->energy_MA_Curr_fx[0] );
+        hHQ_nbfec->diff_energy_fx = div_s( extract_h( L_shl( hHQ_nbfec->diff_energy_fx, exp1 ) ), extract_h( L_shl( hHQ_nbfec->energy_MA_Curr_fx[0], exp2 ) ) );
+        move16();
+        exp = add( 15, sub( exp1, exp2 ) );
+        hHQ_nbfec->diff_energy_fx = shl( hHQ_nbfec->diff_energy_fx, sub( 11, exp ) ); /*11*/
+        move16();
+
+        /* Classify the stationary mode : 12%  */
+        IF( LT_16( hHQ_nbfec->diff_energy_fx, ED_THRES_12P_fx ) )
+        {
+            stat_mode_curr = 1;
             move16();
-            exp1 = sub( norm_l( hHQ_nbfec->diff_energy_fx ), 1 );
-            exp2 = norm_l( hHQ_nbfec->energy_MA_Curr_fx[0] );
-            hHQ_nbfec->diff_energy_fx = div_s( extract_h( L_shl( hHQ_nbfec->diff_energy_fx, exp1 ) ), extract_h( L_shl( hHQ_nbfec->energy_MA_Curr_fx[0], exp2 ) ) );
+        }
+        ELSE
+        {
+            stat_mode_curr = 0;
             move16();
-            exp = add( 15, sub( exp1, exp2 ) );
-            hHQ_nbfec->diff_energy_fx = shl( hHQ_nbfec->diff_energy_fx, sub( 11, exp ) ); /*11*/
+        }
+
+        /* Apply Hysteresis to prevent frequent mode changing */
+        if ( EQ_16( hHQ_nbfec->stat_mode_old, stat_mode_curr ) )
+        {
+            hHQ_nbfec->stat_mode_out = stat_mode_curr;
             move16();
+        }
 
-            /* Classify the stationary mode : 12%  */
-            IF( LT_16( hHQ_nbfec->diff_energy_fx, ED_THRES_12P_fx ) )
-            {
-                stat_mode_curr = 1;
-                move16();
-            }
-            ELSE
-            {
-                stat_mode_curr = 0;
-                move16();
-            }
+        hHQ_nbfec->stat_mode_old = stat_mode_curr;
+        move16();
 
-            /* Apply Hysteresis to prevent frequent mode changing */
-            if ( EQ_16( hHQ_nbfec->stat_mode_old, stat_mode_curr ) )
+        /* Find max. band index (Minimum value means maximum energy) */
+        Min_ind = 0;
+        move16();
+        Min_value = L_deposit_l( 100 );
+        FOR( i = 0; i < num_Sb; i++ )
+        {
+            IF( GT_32( Min_value, ynrm[i] ) )
             {
-                hHQ_nbfec->stat_mode_out = stat_mode_curr;
+                Min_value = ynrm[i];
+                move16();
+                Min_ind = i;
                 move16();
             }
+        }
 
-            hHQ_nbfec->stat_mode_old = stat_mode_curr;
-            move16();
-
-            /* Find max. band index (Minimum value means maximum energy) */
-            Min_ind = 0;
-            move16();
-            Min_value = L_deposit_l( 100 );
-            FOR( i = 0; i < num_Sb; i++ )
+        /* Find max. coeff in band 0 */
+        Max_ind = 0;
+        move16();
+        IF( Min_ind == 0 )
+        {
+            Max_coeff_fx = L_deposit_l( 0 );
+            FOR( i = 0; i < 8; i++ )
             {
-                IF( GT_32( Min_value, ynrm[i] ) )
+                L_tmp = L_abs( t_audio_q_fx[i] );
+                IF( LT_32( Max_coeff_fx, L_tmp ) )
                 {
-                    Min_value = ynrm[i];
-                    move16();
-                    Min_ind = i;
+                    Max_coeff_fx = L_add( L_tmp, 0 );
+                    Max_ind = i;
                     move16();
                 }
             }
+        }
 
-            /* Find max. coeff in band 0 */
-            Max_ind = 0;
-            move16();
-            IF( Min_ind == 0 )
-            {
-                Max_coeff_fx = L_deposit_l( 0 );
-                FOR( i = 0; i < 8; i++ )
-                {
-                    L_tmp = L_abs( t_audio_q_fx[i] );
-                    IF( LT_32( Max_coeff_fx, L_tmp ) )
-                    {
-                        Max_coeff_fx = L_add( L_tmp, 0 );
-                        Max_ind = i;
-                        move16();
-                    }
-                }
-            }
+        /* Find energy difference from band 16 */
+        k = 1;
+        move16();
 
-            /* Find energy difference from band 16 */
-            k = 1;
+        FOR( i = k; i < num_Sb; i++ )
+        {
+            en_high_fx[i] = L_deposit_l( 0 );
             move16();
-
-            FOR( i = k; i < num_Sb; i++ )
+            FOR( j = 0; j < 2; j++ )
             {
-                en_high_fx[i] = L_deposit_l( 0 );
-                move16();
-                FOR( j = 0; j < 2; j++ )
-                {
-                    /*en_high[i] += 0.5f*st->ynrm_values[i][j+1];*/
-                    en_high_fx[i] = L_add( en_high_fx[i], L_shr( hHQ_nbfec->ynrm_values_fx[i][j + 1], 1 ) ); /*Q12*/
-                    move32();
-                }
+                /*en_high[i] += 0.5f*st->ynrm_values[i][j+1];*/
+                en_high_fx[i] = L_add( en_high_fx[i], L_shr( hHQ_nbfec->ynrm_values_fx[i][j + 1], 1 ) ); /*Q12*/
+                move32();
             }
+        }
 
-            *mean_en_high_fx = 0;
-            move16();
-            FOR( i = k; i < num_Sb; i++ )
-            {
-                /* *mean_en_high += (float)(en_high[i]/st->ynrm_values[i][0]);*/
-                exp1 = sub( norm_l( en_high_fx[i] ), 1 );
-                exp2 = norm_l( hHQ_nbfec->ynrm_values_fx[i][0] );
-                tmp_fx = div_s( extract_h( L_shl( en_high_fx[i], exp1 ) ), extract_h( L_shl( hHQ_nbfec->ynrm_values_fx[i][0], exp2 ) ) );
-                exp = add( 15, sub( exp1, exp2 ) );
-#ifdef BASOP_NOGLOB
-                *mean_en_high_fx = add_o( *mean_en_high_fx, shr_o( tmp_fx, sub( exp, 5 ), &Overflow ), &Overflow );
-#else
-        *mean_en_high_fx = add( *mean_en_high_fx, shr( tmp_fx, sub( exp, 5 ) ) );
-#endif
-                move16();
-            }
-            *mean_en_high_fx = mult( *mean_en_high_fx, inv_tbl_fx[sub( num_Sb, k )] );
+        *mean_en_high_fx = 0;
+        move16();
+        FOR( i = k; i < num_Sb; i++ )
+        {
+            /* *mean_en_high += (float)(en_high[i]/st->ynrm_values[i][0]);*/
+            exp1 = sub( norm_l( en_high_fx[i] ), 1 );
+            exp2 = norm_l( hHQ_nbfec->ynrm_values_fx[i][0] );
+            tmp_fx = div_s( extract_h( L_shl( en_high_fx[i], exp1 ) ), extract_h( L_shl( hHQ_nbfec->ynrm_values_fx[i][0], exp2 ) ) );
+            exp = add( 15, sub( exp1, exp2 ) );
+            *mean_en_high_fx = add_o( *mean_en_high_fx, shr_o( tmp_fx, sub( exp, 5 ), &Overflow ), &Overflow );
             move16();
+        }
+        *mean_en_high_fx = mult( *mean_en_high_fx, inv_tbl_fx[sub( num_Sb, k )] );
+        move16();
 
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( LT_16( Min_ind, 5 ) ) && ( LT_16( abs_s( sub( Min_ind, hHQ_nbfec->old_Min_ind ) ), 2 ) ) && ( LT_16( hHQ_nbfec->diff_energy_fx, ED_THRES_90P_fx ) ) && ( !st_fx->bfi ) && ( !st_fx->prev_bfi ) && ( !st_fx->prev_old_bfi ) && ( !is_transient ) && ( !hHQ_core->old_is_transient[1] ) && EQ_16( hHQ_nbfec->prev_last_core, HQ_CORE ) && EQ_16( st_fx->last_core, HQ_CORE ) )
+        {
+            hHQ_nbfec->phase_mat_flag = 1;
+            move16();
             test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( ( LT_16( Min_ind, 5 ) ) && ( LT_16( abs_s( sub( Min_ind, hHQ_nbfec->old_Min_ind ) ), 2 ) ) && ( LT_16( hHQ_nbfec->diff_energy_fx, ED_THRES_90P_fx ) ) && ( !st_fx->bfi ) && ( !st_fx->prev_bfi ) && ( !st_fx->prev_old_bfi ) && ( !is_transient ) && ( !hHQ_core->old_is_transient[1] ) && EQ_16( hHQ_nbfec->prev_last_core, HQ_CORE ) && EQ_16( st_fx->last_core, HQ_CORE ) )
-            {
-                hHQ_nbfec->phase_mat_flag = 1;
-                move16();
-                test();
-                if ( Min_ind == 0 && ( LT_16( Max_ind, 3 ) ) )
-                {
-                    hHQ_nbfec->phase_mat_flag = 0;
-                    move16();
-                }
-            }
-            ELSE
+            if ( Min_ind == 0 && ( LT_16( Max_ind, 3 ) ) )
             {
                 hHQ_nbfec->phase_mat_flag = 0;
                 move16();
             }
-
-            hHQ_nbfec->old_Min_ind = Min_ind;
+        }
+        ELSE
+        {
+            hHQ_nbfec->phase_mat_flag = 0;
             move16();
         }
 
+        hHQ_nbfec->old_Min_ind = Min_ind;
+        move16();
+
+
         FOR( i = 0; i < L_FRAME8k; i++ )
         {
             hHQ_nbfec->old_coeffs_fx[i] = t_audio_q_fx[i];
             move32();
         }
-
-        hHQ_core->old_is_transient[2] = hHQ_core->old_is_transient[1];
-        move16();
-        hHQ_core->old_is_transient[1] = hHQ_core->old_is_transient[0];
-        move16();
-        hHQ_core->old_is_transient[0] = is_transient;
-        move16();
-#ifdef ADD_IVAS_HQ_CODE_FEC
     }
-#endif
+
+    hHQ_core->old_is_transient[2] = hHQ_core->old_is_transient[1];
+    move16();
+    hHQ_core->old_is_transient[1] = hHQ_core->old_is_transient[0];
+    move16();
+    hHQ_core->old_is_transient[0] = is_transient;
+    move16();
+
     return;
 }
 
@@ -1049,13 +1010,8 @@ static Word16 find_best_delay_fx(
         accB_fx = L_deposit_l( 0 );
         FOR( i = 0; i < lin; i += delta )
         {
-#ifdef BASOP_NOGLOB
             accA_fx = L_add_sat( accA_fx, L_shr( L_mult_sat( mu_o_fx[d1 + i], mu_o_fx[d1 + i] ), 2 ) );
             accB_fx = L_add_sat( accB_fx, L_shr( L_mult_sat( mu_o_fx[d1 + i], in_fx[i] ), 2 ) );
-#else
-            accA_fx = L_add( accA_fx, L_shr( L_mult( mu_o_fx[d1 + i], mu_o_fx[d1 + i] ), 2 ) );
-            accB_fx = L_add( accB_fx, L_shr( L_mult( mu_o_fx[d1 + i], in_fx[i] ), 2 ) );
-#endif
         }
 
         Rxy_fx[k] = accB_fx;
@@ -1107,12 +1063,8 @@ static Word16 find_best_delay_fx(
         exp2 = norm_l( min_corr_fx );
         L_tmp1 = L_shl( min_sq_cross_fx, exp1 );
         L_tmp2 = L_shl( min_corr_fx, exp2 );
-        tmp = div_s( extract_h( L_tmp1 ), extract_h( L_tmp2 ) ); /*15 + exp1 - exp2 */
-#ifdef BASOP_NOGLOB
+        tmp = div_s( extract_h( L_tmp1 ), extract_h( L_tmp2 ) );    /*15 + exp1 - exp2 */
         tmp = shl_o( tmp, sub( exp2, add( exp1, 1 ) ), &Overflow ); /*14 */
-#else
-        tmp = shl( tmp, sub( exp2, add( exp1, 1 ) ) ); /*14 */
-#endif
     }
 
     *false_flag = 0;
@@ -1306,11 +1258,7 @@ static Word16 FEC_phase_matching_fx(
         tmp = shl( tmp, sub( sub( exp2, exp1 ), 1 ) );                                            /*14*/
         FOR( i = N_ZERO_NB; i < L * 2; i++ )
         {
-#ifdef BASOP_NOGLOB
             ImdctOutWin_fx[i] = shl_sat( mult( ImdctOutWin_fx[i], tmp ), 1 );
-#else
-            ImdctOutWin_fx[i] = shl( mult( ImdctOutWin_fx[i], tmp ), 1 );
-#endif
             move16();
         }
     }
@@ -1582,11 +1530,7 @@ static void Repetition_smoothing_nextgood_fx(
     /*mvr2r(&ImdctOutWin[L], OldauOut, L);*/
     FOR( i = 0; i < L; i++ )
     {
-#ifdef BASOP_NOGLOB
         auOut_fx[i] = add_sat( ImdctOutWin_fx[N_ZERO_NB + i], OldauOut_fx[i] ); // Q0
-#else
-        auOut_fx[i] = add( ImdctOutWin_fx[N_ZERO_NB + i], OldauOut_fx[i] );
-#endif
         move16();
     }
     Copy( &ImdctOutWin_fx[L], OldauOut_fx, L );
@@ -1678,11 +1622,7 @@ static void common_overlapping_fx(
     FOR( i = 0; i < end1; i++ )
     {
         /*auOut_fx[i] = L_add(ImdctOutWin_fx[i+7*L/20], OldauOut_fx[i+offset1]);*/
-#ifdef BASOP_NOGLOB
         auOut_fx[i] = add_sat( ImdctOutWin_fx[i + N_ZERO_NB], OldauOut_fx[i + offset1] );
-#else
-        auOut_fx[i] = add( ImdctOutWin_fx[i + N_ZERO_NB], OldauOut_fx[i + offset1] );
-#endif
         move16();
     }
     FOR( i = start2; i < end2; i++ )
@@ -2016,89 +1956,105 @@ static void Next_good_after_burst_erasures_fx(
     return;
 }
 
-#ifdef ADD_IVAS_HQ_CODE_FEC
 /*--------------------------------------------------------------------------
- * save_synthesis_hq_fec()
+ * save_synthesis_hq_fec_fx()
  *
  * Save synthesis for HQ FEC
  *-------------------------------------------------------------------------*/
 
-void save_synthesis_hq_fec(
-    Decoder_State *st,          /* i/o: decoder state structure     */
-    const float *output,        /* i  : decoded synthesis           */
-    const int16_t output_frame, /* i  : decoded synthesis           */
-    CPE_DEC_HANDLE hCPE         /* i  : CPE decoder structure       */
+void save_synthesis_hq_fec_fx(
+    Decoder_State *st,         /* i/o: decoder state structure     */
+    const Word16 synth_fx[],   /* i  : decoded synthesis (EVS)     */
+    const Word32 output_fx[],  /* i  : decoded synthesis           */
+    const Word16 output_frame, /* i  : decoded synthesis           */
+    const Word16 Qpostd,       /* i  : Q value of delayed signal   */
+    CPE_DEC_HANDLE hCPE        /* i  : CPE decoder structure       */
 )
 {
-    int16_t post_hq_delay;
+    Word16 post_hq_delay;
 
-    switch ( st->element_mode )
+    SWITCH( st->element_mode )
     {
         case EVS_MONO:
-            post_hq_delay = NS2SA( st->output_Fs, POST_HQ_DELAY_NS );
-            break;
+            post_hq_delay = NS2SA_FX2( st->output_Fs, POST_HQ_DELAY_NS );
+            BREAK;
         case IVAS_SCE:
-            post_hq_delay = NS2SA( st->output_Fs, DELAY_CLDFB_NS );
-            break;
+            post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );
+            BREAK;
         case IVAS_CPE_DFT:
-            if ( hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF )
+            test();
+            IF( EQ_16( hCPE->nchan_out, 1 ) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF )
             {
-                post_hq_delay = NS2SA( st->output_Fs, DELAY_CLDFB_NS );
+                post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );
             }
-            else
+            ELSE
             {
                 post_hq_delay = 0;
+                move16();
             }
-            break;
+            BREAK;
         default:
             post_hq_delay = 0;
-            break;
+            move16();
+            BREAK;
     }
 
-
-    if ( ( st->codec_mode == MODE1 && st->hTcxDec != NULL ) && ( ( st->core == ACELP_CORE && !( st->bfi == 1 && st->con_tcx == 1 ) ) || st->core == HQ_CORE ) )
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( EQ_16( st->codec_mode, MODE1 ) && st->hTcxDec != NULL ) && ( ( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) ) || EQ_16( st->core, HQ_CORE ) ) )
     {
-        mvr2r( st->hTcxDec->synth_history + output_frame, st->hTcxDec->synth_history, output_frame - post_hq_delay + NS2SA( st->output_Fs, PH_ECU_MEM_NS ) );
-        mvr2r( output, st->hTcxDec->old_synthFB + output_frame - post_hq_delay, output_frame );
-
-        if ( st->element_mode == EVS_MONO )
+        IF( st->element_mode == EVS_MONO )
         {
+            Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ) ); /*hTcxDec->q_synth_history_fx*/
+            Copy_Scale_sig( synth_fx, st->hTcxDec->old_synthFB_fx + sub( output_frame, post_hq_delay ), output_frame, negate( Qpostd ) );                                              /* output_sp not initialized yet */
             /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill
                this buffer are not available for all cases, the impact on the output is limited */
-            set_f( st->hTcxDec->old_synthFB + 2 * output_frame - post_hq_delay, 0.f, post_hq_delay );
-            if ( output_frame >= L_FRAME16k )
+            set16_fx( st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay );
+
+            IF( GE_16( output_frame, L_FRAME16k ) )
             {
-                mvr2r( st->prev_synth_buffer, st->hTcxDec->old_synthFB + 2 * output_frame - NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );
+                Copy_Scale_sig( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), negate( st->Qprev_synth_buffer_fx ) ); /*Q0*/
             }
+            /* IVAS Floating point code has the commented-out else branch below, but it does not appear to be necessary. To be verified
             else
             {
                 mvr2r( st->hHQ_core->old_out + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB + 2 * output_frame, NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
             }
+            */
 
-            if ( st->core != ACELP_CORE )
+            IF( st->core != ACELP_CORE )
             {
-                if ( output_frame >= L_FRAME16k )
+                IF( GE_16( output_frame, L_FRAME16k ) )
                 {
-                    mvr2r( st->delay_buf_out, st->hTcxDec->old_synthFB + 2 * output_frame - NS2SA( st->output_Fs, DELAY_CLDFB_NS ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) );
-                    mvr2r( st->hHQ_core->old_out + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB + 2 * output_frame, NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
+                    Copy_Scale_sig( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ), negate( Qpostd ) );                      /*Q0*/
+                    Copy_Scale_sig( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ), negate( st->hHQ_core->Q_old_wtda ) ); /*Q0*/
                 }
-                else
+                ELSE
                 {
-                    mvr2r( st->delay_buf_out, st->hTcxDec->old_synthFB + 2 * output_frame - NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) );
-                    mvr2r( st->hHQ_core->old_out + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB + 2 * output_frame - NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
+
+                    Copy_Scale_sig( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ), negate( Qpostd ) );                                                                                          /*Q0*/
+                    Copy_Scale_sig( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ), negate( st->hHQ_core->Q_old_wtda ) ); /*Q0*/
                 }
             }
         }
-        else
+        ELSE
         {
-            if ( st->core != ACELP_CORE )
+            Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ) );
+            FOR( Word16 i = 0; i < output_frame; i++ )
             {
-                mvr2r( st->delay_buf_out, st->hTcxDec->old_synthFB + 2 * output_frame - post_hq_delay, post_hq_delay );
-                mvr2r( st->hHQ_core->old_out + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB + 2 * output_frame, NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
+                st->hTcxDec->old_synthFB_fx[( ( i + output_frame ) - post_hq_delay )] = extract_h( L_shl_sat( output_fx[i], 16 ) ); // Q16
+                move16();
+            }
+
+            IF( st->core != ACELP_CORE )
+            {
+                Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), post_hq_delay );
+                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
             }
         }
     }
-
     return;
 }
-#endif
diff --git a/lib_dec/FEC_HQ_phase_ecu.c b/lib_dec/FEC_HQ_phase_ecu.c
deleted file mode 100644
index 2df90bf117b7384825a00d5521e06605170c3e63..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_HQ_phase_ecu.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "rom_dec.h"
-#include "rom_com.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/FEC_HQ_phase_ecu_fx.c b/lib_dec/FEC_HQ_phase_ecu_fx.c
index f31f20af5e6b633270f0244618bbc1ed75055802..ad2f8607311a94fdc8a81ec9955dd2e16e97bb04 100644
--- a/lib_dec/FEC_HQ_phase_ecu_fx.c
+++ b/lib_dec/FEC_HQ_phase_ecu_fx.c
@@ -64,26 +64,11 @@ static void windowing( const Word16 *, Word16 *, const Word16 *, const Word16, c
 static void windowing_ROM_optimized( const Word16 *, Word16 *, const Word16, const Word16, const Word16 );
 static void fft_spec2_fx( const Word16[], Word32[], const Word16 );
 static void trans_ana_fx( const Word16 *, Word16 *, Word16 *, Word16 *, const Word16, const Word16, const Word16, const Word16, Word16 *, Word16 *, Word16 *, Word16 * );
-static void peakfinder_fx( const Word16 *, const Word16, Word16 *, Word16 *, const Word16
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                           ,
-                           const Word16 endpoints /* i  : Flag to include endpoints in peak search                       */
-#endif
-);
+static void peakfinder_fx( const Word16 *, const Word16, Word16 *, Word16 *, const Word16 );
 static Word16 imax_fx( const Word16 *, const Word16 );
-static void spec_ana_fx( const Word16 *prevsynth, Word16 *plocs, Word32 *plocsi, Word16 *num_plocs, Word16 *X_sav, const Word16 output_frame, const Word16 bwidth_fx, Word16 *Q
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                         ,
-                         const Word16 element_mode,
-                         Word16 *noise_fac,
-                         const Word16 pcorr
-#endif
-);
+static void spec_ana_fx( const Word16 *prevsynth, Word16 *plocs, Word32 *plocsi, Word16 *num_plocs, Word16 *X_sav, const Word16 output_frame, const Word16 bwidth_fx, Word16 *Q );
 static void subst_spec_fx( const Word16 *, const Word32 *, Word16 *, const Word16, Word16 *, const Word16 *, const Word16, const Word16 *, const Word16, Word16 *, const Word16 *, const Word16 *, Word16, const Word16 * );
 static Word16 rand_phase_fx( const Word16 seed, Word16 *sin_F, Word16 *cos_F );
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-static float imax2_jacobsen_mag( const float *y_re, const float *y_im );
-#endif
 
 /*------------------------------------------------------------------*
  * rand_phase()
@@ -491,23 +476,15 @@ static void trans_ana_fx(
             tr_dec[k] = 0;
             move16();
             Mpy_32_16_ss( *pGrPowLeft, THRESH_TR_LIN_BY2_FX, &acc, &lsb ); /* To facilitate fixed-point implementation, divide threshold by 2. */
-#ifdef BASOP_NOGLOB
-            acc = L_or( L_shl_sat( acc, 16 ), L_and( 0xffffL, lsb ) ); /* Equivalent to concatenate acc and lsb, and then down shift by 16 bits. */
-#else
-            acc = L_or( L_shl( acc, 16 ), L_and( 0xffffL, lsb ) ); /* Equivalent to concatenate acc and lsb, and then down shift by 16 bits. */
-#endif
-            if ( GT_32( *pGrPowRight, acc ) ) /* gr_pow_right > thres_tr_lin*gr_pow_left */
+            acc = L_or( L_shl_sat( acc, 16 ), L_and( 0xffffL, lsb ) );     /* Equivalent to concatenate acc and lsb, and then down shift by 16 bits. */
+            if ( GT_32( *pGrPowRight, acc ) )                              /* gr_pow_right > thres_tr_lin*gr_pow_left */
             {
                 tr_dec[k] = 1;
                 move16();
             }
             Mpy_32_16_ss( *pGrPowRight, THRESH_TR_LIN_BY2_FX, &acc, &lsb );
-#ifdef BASOP_NOGLOB
             acc = L_or( L_shl_sat( acc, 16 ), L_and( 0xffffL, lsb ) ); /* Equivalent to concatenate acc and lsb, and then down shift by 16 bits. */
-#else
-            acc = L_or( L_shl( acc, 16 ), L_and( 0xffffL, lsb ) ); /* Equivalent to concatenate acc and lsb, and then down shift by 16 bits. */
-#endif
-            if ( GT_32( *pGrPowLeft, acc ) ) /* gr_pow_left > thres_tr_lin*gr_pow_right */
+            if ( GT_32( *pGrPowLeft, acc ) )                           /* gr_pow_left > thres_tr_lin*gr_pow_right */
             {
                 tr_dec[k] = 1;
                 move16();
@@ -674,9 +651,6 @@ static void ivas_peakfinder_fx(
         move16();
     }
     len0Minus2 = sub( len0, 2 );
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    PMT( "\nlen0Minus2 = sub(len0, 2) is it still correct if IVAS_FEC_ECU_TO_COMPLETE is activated\n" )
-#endif
 
     FOR( i = 0; i < len0Minus2; i++ )
     {
@@ -920,10 +894,6 @@ static void peakfinder_fx(
     Word16 *plocs,     /* o : the indices of the identified peaks in x0                  Q0 */
     Word16 *cInd,      /* o : number of identified peaks                                 Q0 */
     const Word16 sel   /* i : The amount above surrounding data for a peak to be identified */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const Word16 endpoints /* i  : Flag to include endpoints in peak search                       */
-#endif
 )
 {
     const Word16 *pX0;
@@ -959,11 +929,6 @@ static void peakfinder_fx(
     pInd = indarr;
     pDx01 = dx0;
     pDx0 = pDx01 + 1;
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    len = 0;
-    move16();
-    IF( endpoints )
-#endif
     {
         *pX++ = *pX0++;
         move16();
@@ -973,9 +938,6 @@ static void peakfinder_fx(
         move16();
     }
     len0Minus2 = sub( len0, 2 );
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    PMT( "\nlen0Minus2 = sub(len0, 2) is it still correct if IVAS_FEC_ECU_TO_COMPLETE is activated\n" )
-#endif
 
     FOR( i = 0; i < len0Minus2; i++ )
     {
@@ -989,9 +951,6 @@ static void peakfinder_fx(
         }
         pX0++;
     }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    IF( endpoints )
-#endif
     {
         *pInd = len0Minus1;
         move16();
@@ -1002,13 +961,7 @@ static void peakfinder_fx(
     minimum_fx( x, len, &minMag );
 
     pInd = indarr;
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    test();
-    test();
-    IF( GT_16( len, 2 ) || ( !endpoints && ( len > 0 ) ) )
-#else
     IF( GT_16( len, 2 ) )
-#endif
     {
         /* Set initial parameters for loop */
         tempMag = minMag;
@@ -1019,9 +972,6 @@ static void peakfinder_fx(
         move16();
         threshold = add( leftMin, sel );
 
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        IF( len > 0 )
-#endif
         {
             /* Deal with first point a little differently since tacked it on
                Calculate the sign of the derivative since we took the first point
@@ -1068,20 +1018,6 @@ static void peakfinder_fx(
             }
             pX--; /* After decrement, pX points to either x[-1] or x[0]. */
         }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        ELSE
-        {
-            PMTE()
-            ii = -1; /* First point is a peak */
-            if ( len >= 2 )
-            {
-                if ( x[1] >= x[0] )
-                {
-                    ii = 0; /* First point is a valley, skip it */
-                }
-            }
-        }
-#endif
         *cInd = 0;
         move16();
         /*Loop through extrema which should be peaks and then valleys*/
@@ -1187,9 +1123,6 @@ static void peakfinder_fx(
     }
     ELSE /* This is a monotone function where an endpoint is the only peak */
     {
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        IF( endpoints )
-#endif
         {
             xInd = 1;
             move16();
@@ -1214,13 +1147,6 @@ static void peakfinder_fx(
                 move16();
             }
         }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        ELSE
-        { /* Input constant or all zeros -- no peaks found */
-            *cInd = 0;
-            move16();
-        }
-#endif
     }
 }
 
@@ -1274,13 +1200,9 @@ static Word16 imax_fx(                      /* o: The location, relative to the
     }
     /* Although the output of ratio() is in Q14, adding the missing factor of 2 (See above)
      * in the denominator, the output is now considered to be in Q15. */
-    man = ratio( numer, denom, &expo ); /* The mantissa is considered in Q15 */
-#ifdef BASOP_NOGLOB
+    man = ratio( numer, denom, &expo );   /* The mantissa is considered in Q15 */
     posi = shr_o( man, expo, &Overflow ); /* in Q15 (Due to saturation, it is automatically bound inside [-1.0,1.0].) */
-#else
-    posi = shr( man, expo ); /* in Q15 (Due to saturation, it is automatically bound inside [-1.0,1.0].) */
-#endif
-    if ( sign < 0 ) /* Restore the sign. */
+    if ( sign < 0 )                       /* Restore the sign. */
     {
         posi = negate( posi );
     }
@@ -1602,7 +1524,7 @@ static void ivas_spec_ana_fx(
         test();
         IF( n > 0 && *pPlocs == 0 ) /* Very 1st peak position possible to have a peak at 0/DC index position. */
         {
-            Copy_Scale_sig_16_32( &xfp[*pPlocs], xfp_32, 3, Q16 );                  // Q + 16
+            Copy_Scale_sig_16_32_no_sat( &xfp[*pPlocs], xfp_32, 3, Q15 );           // Q + 15
             acc = L_deposit_h( *pPlocs );                                           // Q16
             *pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) /* Q15 */, 1 ) ); // Q16
             move32();
@@ -1613,7 +1535,7 @@ static void ivas_spec_ana_fx(
         test();
         IF( n > 0 && EQ_16( *pPlocs, 1 ) ) /* Also 2nd peak position uses DC which makes jacobsen unsuitable. */
         {
-            Copy_Scale_sig_16_32( &xfp[*pPlocs - 1], xfp_32, 3, Q16 );              // Q + 16
+            Copy_Scale_sig_16_32_no_sat( &xfp[*pPlocs - 1], xfp_32, 3, Q15 );       // Q + 15
             acc = L_deposit_h( sub( *pPlocs, 1 ) );                                 // Q16
             *pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) /* Q15 */, 1 ) ); // Q16
             move32();
@@ -1659,7 +1581,7 @@ static void ivas_spec_ana_fx(
 
             IF( EQ_16( currPlocs, ( sub( Lprot2_1, DELTA_CORR_F0_INT ) ) ) ) /* Also 2nd last peak position uses fs/2  which makes jacobsen less suitable. */
             {
-                Copy_Scale_sig_16_32( &xfp[currPlocs - 1], xfp_32, 3, Q16 );            // Q + 16
+                Copy_Scale_sig_16_32_no_sat( &xfp[currPlocs - 1], xfp_32, 3, Q15 );     // Q + 15
                 acc = L_deposit_h( sub( currPlocs, 1 ) );                               // Q16
                 *pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) /* Q15 */, 1 ) ); // Q16
                 move32();
@@ -1673,7 +1595,7 @@ static void ivas_spec_ana_fx(
              * whould point */
             IF( n > 0 ) /* fs/2 which makes special case . */
             {
-                Copy_Scale_sig_16_32( &xfp[currPlocs - 2], xfp_32, 3, Q16 );            // Q + 16
+                Copy_Scale_sig_16_32_no_sat( &xfp[currPlocs - 2], xfp_32, 3, Q15 );     // Q + 15
                 acc = L_deposit_h( sub( currPlocs, 2 ) );                               // Q16
                 *pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) /* Q15 */, 1 ) ); // Q16
                 move32();
@@ -1721,12 +1643,6 @@ static void spec_ana_fx(
     const Word16 output_frame, /* i : Frame length                                     Q0  */
     const Word16 bwidth_fx,    /* i : Encoded bandwidth index                          Q0  */
     Word16 *Q                  /* o : Q value of the fft spectrum                          */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const Word16 element_mode, /* i  : IVAS element mode                               */
-    Word16 *noise_fac,         /* o  : for few peaks zeroing valleys decision making   */
-    const Word16 pcorr
-#endif
 )
 {
     Word16 Lprot, LprotLog2Minus1, hamm_len2, Lprot2, Lprot2_1, m, n;
@@ -1794,52 +1710,18 @@ static void spec_ana_fx(
     IF( EQ_16( output_frame, L_FRAME48k ) )
     {
         /* Apply hamming-rect window */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        IF( EQ_16( element_mode, EVS_MONO ) )
-#endif
         {
             windowing( xfp, xfp, w_hamm_sana48k_2_fx, rectLength, hamm_len2 );
         }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        ELSE
-        {
-            PMTE()
-            // window_corr = w_hamm[0];
-            // window_corr_step = w_hamm[0] / hamm_len2;
-            // for (i = 0; i < hamm_len2; i++)
-            //{
-            //     xfp[i] = prevsynth[i] * (w_hamm[i] - window_corr);
-            //     xfp[Lprot - i - 1] = prevsynth[Lprot - i - 1] * (w_hamm[i] - window_corr);
-            //     window_corr -= window_corr_step;
-            // }
-        }
-#endif
         /* Spectrum */
         fft3_fx( xfp, xfp, Lprot );
     }
     ELSE
     {
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        IF( EQ_16( element_mode, EVS_MONO ) )
-#endif
         {
             /* Apply hamming-rect window */
             windowing_ROM_optimized( xfp, xfp, sinTblOffset, rectLength, hamm_len2 );
         }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        ELSE
-        {
-            PMTE()
-            // window_corr = w_hamm[0];
-            // window_corr_step = w_hamm[0] / hamm_len2;
-            // for (i = 0; i < hamm_len2; i++)
-            //{
-            //     xfp[i] = prevsynth[i] * (w_hamm[i] - window_corr);
-            //     xfp[Lprot - i - 1] = prevsynth[Lprot - i - 1] * (w_hamm[i] - window_corr);
-            //     window_corr -= window_corr_step;
-            // }
-        }
-#endif
         /* Spectrum */
         r_fft_fx_lc( pFftTbl, Lprot, Lprot2, LprotLog2Minus1, xfp, xfp, 1 );
     }
@@ -1884,11 +1766,7 @@ static void spec_ana_fx(
                 man = mult_r( man, FEC_HQ_ECU_ROOT2 ); /* FEC_HQ_ECU_ROOT2 is sqrt(2) in Q14 */
                 expoBy2 = sub( expoBy2, 1 );
             }
-#ifdef BASOP_NOGLOB
             *pXfp++ = shr_sat( man, expoBy2 );
-#else
-            *pXfp++ = shr( man, expoBy2 );
-#endif
             move16(); /* Denormalize the mantissa back to Q0. */
         }
     }
@@ -1896,35 +1774,12 @@ static void spec_ana_fx(
     /* Find maximum and minimum. */
     maximum_fx( xfp, Lprot2_1, &Xmax );
     minimum_fx( xfp, Lprot2_1, &Xmin );
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    IF( EQ_16( element_mode, EVS_MONO ) )
-#endif
     {
         sel = mult_r( sub( Xmax, Xmin ), CMPLMNT_PFIND_SENS_FX );
     }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ELSE
-    {
-        sel = ( Xmax - Xmin ) * ( 1.0f - ST_PFIND_SENS );
-    }
-#endif
-    peakfinder_fx( xfp, Lprot2_1, plocs, num_plocs, sel
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                   ,
-                   endpoints
-#endif
-    );
+    peakfinder_fx( xfp, Lprot2_1, plocs, num_plocs, sel );
 
 
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    /* Currently not the pitch correlation but some LF correlation */
-    if ( element_mode != EVS_MONO && *num_plocs > 50 && pcorr < 0.6f )
-    {
-        *num_plocs = 0;
-    }
-
-    IF( EQ_16( element_mode, EVS_MONO ) )
-#endif
     {
 
         /* Refine peaks */
@@ -1971,105 +1826,6 @@ static void spec_ana_fx(
             move32(); /* in Q16. Append the fractional part to the integral part. */
         }
     }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ELSE
-    {
-        Lprot2p1 = Lprot / 2 + 1;
-
-        /* Refine peaks */
-        pPlocsi = plocsi;
-        pPlocs = plocs;
-        n = *num_plocs; /* number of peaks to process */
-
-        /* Special case-- The very 1st peak if it is at 0 index position (DC) */
-        /* With DELTA_CORR_F0_INT == 2 one needs to handle both *pPlocs==0 and *pPlocs==1 */
-        if ( n > 0 && *pPlocs == 0 ) /* Very 1st peak position possible to have a peak at 0/DC index position. */
-        {
-            *pPlocsi++ = *pPlocs + imax_pos( &xfp[*pPlocs] );
-            pPlocs++;
-            n = n - 1;
-        }
-
-        if ( n > 0 && *pPlocs == 1 ) /* Also 2nd peak position uses DC which makes jacobsen unsuitable. */
-        {
-            *pPlocsi++ = *pPlocs - 1 + imax_pos( &xfp[*pPlocs - 1] );
-            currPlocs = *pPlocs++;
-            n = n - 1;
-        }
-
-        /* All remaining peaks except the very last two possible integer positions */
-        currPlocs = *pPlocs++;
-        endPlocs = Lprot2p1 - DELTA_CORR_F0_INT; /* last *pPlocs position for Jacobsen */
-
-        /* precompute number of turns based on endpoint integer location  and make into  a proper for loop */
-        if ( n > 0 )
-        {
-            nJacob = n;
-            if ( sub( endPlocs, plocs[sub( *num_plocs, 1 )] ) <= 0 )
-            {
-                nJacob = sub( nJacob, 1 );
-            }
-
-            for ( k = 0; k < nJacob; k++ )
-            {
-                *pPlocsi++ = currPlocs + imax2_jacobsen_mag( &( X_sav[currPlocs - 1] ), &( X_sav[Lprot - 1 - currPlocs] ) );
-                currPlocs = *pPlocs++;
-            }
-            n = n - nJacob;
-        }
-
-        /* At this point there should at most two plocs left to process */
-        /* the position before fs/2 and fs/2 both use the same magnitude points */
-        if ( n > 0 )
-        {
-            /* [ . . .            .  .  .  . ]   Lprot/2+1 positions  */
-            /*   |                   |     |           */
-            /*   0         (Lprot/2-2)     (Lprot/2)   */
-
-            if ( currPlocs == ( Lprot2p1 - DELTA_CORR_F0_INT ) ) /* Also 2nd last peak position uses fs/2  which makes jacobsen less suitable. */
-            {
-                *pPlocsi++ = currPlocs - 1 + imax_pos( &xfp[currPlocs - 1] );
-                currPlocs = *pPlocs++;
-                n = n - 1;
-            }
-
-            /* Here the only remaining point would be a  fs/2 plocs */
-            /*    pXfp = xfp + sub(Lprot2,1); already set just a reminder where it
-             * whould point */
-            if ( n > 0 ) /* fs/2 which makes special case . */
-            {
-                *pPlocsi++ = currPlocs - 2 + imax_pos( &xfp[currPlocs - 2] );
-                currPlocs = *pPlocs++;
-                n = n - 1;
-            }
-        }
-
-        /* For few peaks decide noise floor attenuation */
-        if ( *num_plocs < 3 && *num_plocs > 0 )
-        {
-            sig = sum_f( xfp, Lprot2_1 ) + EPSILON;
-
-            /*excluding peaks and neighboring bins*/
-            for ( i = 0; i < *num_plocs; i++ )
-            {
-                st_point = max( 0, plocs[i] - DELTA_CORR );
-                end_point = min( Lprot2_1 - 1, plocs[i] + DELTA_CORR );
-                set_f( &xfp[st_point], 0.0f, end_point - st_point + 1 );
-            }
-            noise = sum_f( xfp, Lprot2_1 ) + EPSILON;
-            nsr = noise / sig;
-
-            if ( nsr < 0.03f )
-            {
-                *noise_fac = 0.5f;
-            }
-            else
-            {
-                *noise_fac = 1.0f;
-            }
-        }
-    }
-#endif
 }
 
 /*-------------------------------------------------------------------*
@@ -2156,7 +1912,7 @@ static void ivas_subst_spec_fx(
     ELSE
     {
         // tmp = NS2SA(output_frame*50,PH_ECU_ALDO_OLP2_NS-PH_ECU_LOOKAHEAD_NS);
-        tmp = NS2SA_FX2( output_frame * 50, PH_ECU_ALDO_OLP2_NS );
+        tmp = NS2SA_FX2( L_mult0( output_frame, 50 ), PH_ECU_ALDO_OLP2_NS );
         move16();
         tmp = sub( tmp, ph_ecu_lookahead );
         tmp = add( tmp, sub( Lecu, shr( sub( Lecu, Lprot ), 1 ) ) );
@@ -2490,12 +2246,6 @@ static void subst_spec_fx(
     const Word16 *beta,        /* i   : Magnitude modification factors for fade to average Q15 */
     Word16 beta_mute,          /* i   : Factor for long-term mute                          Q15 */
     const Word16 *Xavg         /* i   : Frequency group averages to fade to                Q0  */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const Word16 element_mode,     /* i  : IVAS element mode                                  */
-    const Word16 ph_ecu_lookahead, /* i  : Phase ECU lookahead                                */
-    const Word16 noise_fac         /* i  : noise factor                                       */
-#endif
 )
 {
     Word16 Xph_short;
@@ -2516,11 +2266,6 @@ static void subst_spec_fx(
     Word16 alpha_local;
     Word16 beta_local;
     Word16 expo;
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    Word16 one_peak_flag_mask;
-    Word16 alpha_local;
-    Word16 beta_local;
-#endif
     Word16 mag_chg_local; /*for peak attenuation in burst */
 
     Lprot = 512;
@@ -2559,7 +2304,7 @@ static void subst_spec_fx(
     }
     ELSE
     {
-        tmp = NS2SA( output_frame * 50, PH_ECU_ALDO_OLP2_NS - PH_ECU_LOOKAHEAD_NS );
+        tmp = NS2SA_FX2( L_mult0( output_frame, 50 ), PH_ECU_ALDO_OLP2_NS - PH_ECU_LOOKAHEAD_NS );
         move16();
         tmp = add( tmp, sub( Lecu, shr( sub( Lecu, Lprot ), 1 ) ) );
         tmp = sub( tmp, shr( output_frame, 1 ) );
@@ -2576,21 +2321,6 @@ static void subst_spec_fx(
             move32();
         }
     }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    one_peak_flag_mask = 1; /* all ones mask -> keep  */
-    IF( NE_16( element_mode, EVS_MONO ) )
-    {
-        if ( ( *num_plocs > 0 ) && sub( *num_plocs, 3 ) < 0 )
-        {
-            one_peak_flag_mask = noise_fac; /* all zeroes  mask -> zero  */
-        }
-        if ( *num_plocs == 0 )
-        {
-            X[0] = 0;               /* reset DC if there are no  peaks */
-            X[shr( Lprot, 1 )] = 0; /* also reset fs/2 if there are no peaks */
-        }
-    }
-#endif
     lprotBy2Minus1 = sub( shr( Lprot, 1 ), 1 );
     i = 1;
     move16();
@@ -2651,21 +2381,10 @@ static void subst_spec_fx(
             move16();
             im = *pImX;
             move16();
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-            IF( EQ_16( element_mode, EVS_MONO ) )
-#endif
             {
                 tmp = sub( mult_r( re, cos_F ), mult_r( im, sin_F ) );
                 im = add( mult_r( re, sin_F ), mult_r( im, cos_F ) );
             }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-            ELSE
-            {
-                PMTE()
-                // tmp = one_peak_flag_mask * (X[i] * cos_F - X[im_ind] * sin_F);
-                // X[im_ind] = one_peak_flag_mask * (X[i] * sin_F + X[im_ind] * cos_F);
-            }
-#endif
             IF( LT_16( alpha[k], 32766 ) )
             {
                 *seed = rand_phase_fx( *seed, &sin_F, &cos_F );
@@ -2782,26 +2501,10 @@ static void subst_spec_fx(
             move16();
             im = *pImX;
             move16();
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-            IF( EQ_16( element_mode, EVS_MONO ) )
-#endif
             {
-#ifdef BASOP_NOGLOB
                 tmp = sub_sat( mult_r( re, cos_F ), mult_r( im, sin_F ) );
                 im = add_sat( mult_r( re, sin_F ), mult_r( im, cos_F ) );
-#else
-                tmp = sub( mult_r( re, cos_F ), mult_r( im, sin_F ) );
-                im = add( mult_r( re, sin_F ), mult_r( im, cos_F ) );
-#endif
             }
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-            ELSE
-            {
-                PMTE()
-                // tmp = one_peak_flag_mask * (X[i] * cos_F - X[im_ind] * sin_F);
-                // X[im_ind] = one_peak_flag_mask * (X[i] * sin_F + X[im_ind] * cos_F);
-            }
-#endif
             IF( LT_16( alpha[k], 32766 ) )
             {
                 alpha_local = mag_chg_local;
@@ -2925,9 +2628,9 @@ static void ivas_rec_wtda_fx(
     Word16 copy_len;
     Word16 ola_len;
 
-    copy_len = NS2SA( output_frame * FRAMES_PER_SEC, ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* prototype fill on each side of xsubst to fill MDCT Frame */
+    copy_len = NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* prototype fill on each side of xsubst to fill MDCT Frame */
     move16();
-    ola_len = NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS - ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* remaining lengt of LA_ZEROS to overlap add decoded with xsubst */
+    ola_len = NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), N_ZERO_MDCT_NS - ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* remaining lengt of LA_ZEROS to overlap add decoded with xsubst */
     move16();
 
     xf_len = 26;
@@ -2985,7 +2688,7 @@ static void ivas_rec_wtda_fx(
     }
 
     /* extract reconstructed frame with aldo window */
-    timesh = sub( NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), shr( sub( shl( output_frame, 1 ), Lprot ), 1 ) );
+    timesh = sub( NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), N_ZERO_MDCT_NS ), shr( sub( shl( output_frame, 1 ), Lprot ), 1 ) );
 
     set16_fx( xsubst_, 0, add( sub( shl( output_frame, 1 ), Lprot ), timesh ) );
     Copy( X, xsubst_ + add( sub( shl( output_frame, 1 ), Lprot ), timesh ), sub( Lprot, timesh ) );
@@ -2993,9 +2696,9 @@ static void ivas_rec_wtda_fx(
     /* Copy and OLA look ahead zero part of MDCT window from decoded signal  */
     IF( element_mode != EVS_MONO )
     {
-        Copy( old_dec, xsubst_ + NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), copy_len ); /* also need to scale to Q0 ?? */
+        Copy( old_dec, xsubst_ + NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), N_ZERO_MDCT_NS ), copy_len ); /* also need to scale to Q0 ?? */
         pOld = old_dec + copy_len;
-        pNew = xsubst_ + add( copy_len, NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) );
+        pNew = xsubst_ + add( copy_len, NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), N_ZERO_MDCT_NS ) );
         tmp = div_s( 1, shl( ola_len, 1 ) );                    // Q15
         tmp = round_fx( L_shl( L_mult( tmp, EVS_PI_FX ), 2 ) ); // Q15
         sinq_fx( tmp, 0, ola_len, xfwin );
@@ -3053,97 +2756,7 @@ static void rec_wtda_fx(
     Word16 *p_ecu;
     Word16 g;
     Word16 tbl_delta;
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    float xsubst_[2 * L_FRAME48k];
-    const float *w_hamm;
-    float *pX_start, *pX_end;
-    float tmp;
-    int16_t hamm_len2;
-    float *pNew;
-    const float *pOldW, *pNewW;
-    float xfwin[NS2SA( L_FRAME48k * FRAMES_PER_SEC, N_ZERO_MDCT_NS - ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 )];
-    const float *pOld;
-    int16_t copy_len;
-    int16_t ola_len;
-
-    copy_len = NS2SA( output_frame * FRAMES_PER_SEC, ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 );                 /* prototype fill on each side of xsubst to fill MDCT Frame */
-    ola_len = NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS - ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* remaining lengt of LA_ZEROS to overlap add decoded with xsubst */
-
-    if ( output_frame == L_FRAME48k )
-    {
-        w_hamm = w_hamm_sana48k_2;
-        hamm_len2 = L_PROT_HAMM_LEN2_48k;
-    }
-    else if ( output_frame == L_FRAME32k )
-    {
-        w_hamm = w_hamm_sana32k_2;
-        hamm_len2 = L_PROT_HAMM_LEN2_32k;
-    }
-    else
-    {
-        w_hamm = w_hamm_sana16k_2;
-        hamm_len2 = L_PROT_HAMM_LEN2_16k;
-    }
 
-    if ( element_mode != EVS_MONO && *num_p > 0 && plocs[0] > 3 )
-    {
-        /* Perform inverse windowing of hammrect */
-        pX_start = X;
-        pX_end = X + Lprot - 1;
-        for ( i = 0; i < hamm_len2; i++ )
-        {
-            tmp = 1.0f / *w_hamm;
-            *pX_start *= tmp;
-            *pX_end *= tmp;
-            pX_start++;
-            pX_end--;
-            w_hamm++;
-        }
-    }
-
-    /* extract reconstructed frame with aldo window */
-    timesh = NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) - ( 2 * output_frame - Lprot ) / 2;
-
-    set_f( xsubst_, 0.0f, 2 * output_frame - Lprot + timesh );
-    mvr2r( X, xsubst_ + 2 * output_frame - Lprot + timesh, Lprot - timesh );
-
-    /* Copy and OLA look ahead zero part of MDCT window from decoded signal  */
-    if ( element_mode != EVS_MONO )
-    {
-        mvr2r( old_dec, xsubst_ + NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), copy_len ); /* also need to scale to Q0 ?? */
-        pOld = old_dec + copy_len;
-        pNew = xsubst_ + copy_len + NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS );
-        sinq( EVS_PI / ( ola_len * 2 ), 0.0f, ola_len, xfwin );
-        v_mult( xfwin, xfwin, xfwin, ola_len ); /* xfwin = sin^2 of 0..pi/4 */
-        pOldW = xfwin + ola_len - 1;
-        pNewW = xfwin;
-        for ( i = 0; i < ola_len; i++ )
-        {
-            *pNew = *pOld * *pOldW + *pNew * *pNewW;
-            pOld += 1;
-            pNew += 1;
-            pOldW -= 1;
-            pNewW += 1;
-        }
-    }
-    else
-    {
-        /* Smoothen onset of ECU frame */
-        xf_len = (int16_t) ( (float) output_frame * N_ZERO_MDCT_NS / FRAME_SIZE_NS ) - ( output_frame - Lprot / 2 );
-        p_ecu = xsubst_ + 2 * output_frame - Lprot + timesh;
-        tbl_delta = 64.f / xf_len; /* 64 samples = 1/4 cycle in sincos_t */
-        for ( i = 0; i < xf_len; i++, p_ecu++ )
-        {
-            g = sincos_t[( (int16_t) ( i * tbl_delta ) )];
-            g *= g;
-            *p_ecu = g * ( *p_ecu );
-        }
-    }
-
-    /* Apply TDA and windowing to ECU frame */
-    wtda( xsubst_ + output_frame, ecu_rec, NULL, ALDO_WINDOW, ALDO_WINDOW, output_frame );
-
-#else
     // PMTE()
     xsubst_ = rec_buf + output_frame;
     Lprot2 = shr( Lprot, 1 );
@@ -3196,7 +2809,6 @@ static void rec_wtda_fx(
     out_ptr = rec_buf + sub( shl( output_frame, 1 ), timesh );
     wtda_fx( out_ptr, &Qin, ecu_rec, NULL, 0, ALDO_WINDOW, ALDO_WINDOW, /* window overlap of current frame (0: full, 2: none, or 3: half) */
              output_frame );
-#endif
     return;
 }
 
@@ -3260,15 +2872,7 @@ static void rec_frame_fx(
     Word16 *X,                 /* i  : FFT spectrum */
     Word32 *ecu_rec,           /* o  : Reconstructed frame in tda domain */
     const Word16 output_frame, /* i  : Frame length */
-    const Word16 Q
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const float *old_dec,       /* i  : end of last decoded for OLA before tda and itda */
-    const int16_t element_mode, /* i  : IVAS element mode                     */
-    const int16_t *num_p,       /* i  : Number of peaks                       */
-    const int16_t *plocs        /* i  : Peak locations                        */
-#endif
-)
+    const Word16 Q )
 {
     const Word16 *pFftTbl;
     Word16 Lprot, lprotLog2Minus1;
@@ -3322,11 +2926,7 @@ static Word32 mult_32_32_q( const Word32 a, const Word32 b, const Word16 q )
 #endif
     Mpy_32_32_ss( a, b, &hi, &lo );
 
-#ifdef BASOP_NOGLOB
     return L_or( L_shl_o( hi, sub( 32 - 1, q ), &Overflow ), L_lshr( (Word32) lo, add( q, 1 ) ) );
-#else
-    return L_or( L_shl( hi, 32 - q - 1 ), L_lshr( lo, q + 1 ) );
-#endif
 }
 
 static void fir_dwn_fx(
@@ -3360,19 +2960,11 @@ static void fir_dwn_fx(
 
         FOR( j = 1; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac0_sat( s, *ptr_h++, *ptr_x-- ); // Q(h_Q) + Q(x_q)
-#else
-            s = L_mac0( s, *ptr_h++, *ptr_x-- );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         *ptr_y++ = extract_h( L_shl_sat( s, centering ) );
         move16();
-#else
-        *ptr_y++ = extract_h( L_shl( s, centering ) );
-#endif
     }
     FOR( i = K; i < L; i += decimation )
     {
@@ -3383,19 +2975,11 @@ static void fir_dwn_fx(
 
         FOR( j = 1; j <= K; j++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac0_sat( s, *ptr_h++, *ptr_x-- ); // Q(h_Q) + Q(x_q)
-#else
-            s = L_mac0( s, *ptr_h++, *ptr_x-- );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         *ptr_y++ = extract_h( L_shl_sat( s, centering ) );
         move16();
-#else
-        *ptr_y++ = extract_h( L_shl( s, centering ) );
-#endif
     }
     tmp = add( L, Kdiv2 );
     FOR( i = i; i < tmp; i += decimation )
@@ -3408,19 +2992,11 @@ static void fir_dwn_fx(
 
         FOR( j = i - L + 1; j <= K; j++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac0_sat( s, *ptr_h++, *ptr_x-- );
-#else
-            s = L_mac0( s, *ptr_h++, *ptr_x-- );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         *ptr_y++ = extract_h( L_shl_sat( s, centering ) );
         move16();
-#else
-        *ptr_y++ = extract_h( L_shl( s, centering ) );
-#endif
     }
 
     return;
@@ -3896,20 +3472,11 @@ static void sin_cos_est_fx( Word32 phi, Word16 *cosfreq, Word16 *sinfreq )
     tmp = L_shl( Mult_32_16( delta, cosb ), 1 ); /*Q31 */
     sinv = L_add( L_deposit_h( sinb ), tmp );
     tmp = L_shl( Mult_32_16( delta, sinb ), 1 ); /*Q31 */
-#ifdef BASOP_NOGLOB
     cosv = L_sub_sat( L_deposit_h( cosb ), tmp );
-#else
-    cosv = L_sub( L_deposit_h( cosb ), tmp );
-#endif
-#ifdef BASOP_NOGLOB
     *sinfreq = round_fx_sat( sinv );
     move16();
     *cosfreq = round_fx_sat( cosv );
     move16();
-#else
-    *sinfreq = round_fx( sinv );
-    *cosfreq = round_fx( cosv );
-#endif
 
     return;
 }
@@ -3963,11 +3530,7 @@ static Word16 abs_iter_fx( Word16 re /*Qx*/, Word16 im /*Qx*/, Word16 N )
     i = s_min( sub( i, 1 ), 9 );
     tmp = abs_s( re );
     /*A = round_fx(L_shr(L_mult(tmp, cor[i]), exp)); //this can be ommited, if we don't need the exact abs value */
-#ifdef BASOP_NOGLOB
     A = shr_sat( tmp, exp );
-#else
-    A = shr( tmp, exp );
-#endif
     return A;
 }
 /*--------------------------------------------------------------------------
@@ -4039,13 +3602,8 @@ static void ivas_fec_ecu_dft_fx(
         {
             tmp_short = extract_l( L_shr( Tmp, 15 ) );
             tmp = extract_l( L_msu( Tmp, tmp_short, 16384 ) );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult( sub_sat( target[tmp_short + 1], target[tmp_short] ), tmp ); /*Qin+16 */
             Tfr16[i] = add_sat( target[tmp_short], round_fx_sat( L_tmp ) );
-#else
-            L_tmp = L_mult( sub( target[tmp_short + 1], target[tmp_short] ), tmp ); /*Qin+16 */
-            Tfr16[i] = add( target[tmp_short], round_fx( L_tmp ) );
-#endif
             move16(); /*Qin */
             Tmp = L_add( Tmp, fac );
         }
@@ -4056,7 +3614,7 @@ static void ivas_fec_ecu_dft_fx(
     tmp = Exp16Array( *Nfft, Tfr16 );
     *exp = add( tmp, add( 2, norm_s( *Nfft ) ) );
     move16();
-    Copy_Scale_sig_16_32( Tfr16, Tfr32, *Nfft, *exp ); /*Qin+exp; */
+    Copy_Scale_sig_16_32_no_sat( Tfr16, Tfr32, *Nfft, *exp ); /*Qin+exp; */
     *exp = s_min( *exp, 15 );
 
     DoRTFTn_fx( Tfr32, Tfi32, *Nfft );
@@ -4101,28 +3659,11 @@ static void fec_ecu_dft_fx(
     Word16 *Tf_abs,     /*Qout */
     Word16 *Nfft,
     Word16 *exp /*Qout = Qin+exp */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const int16_t element_mode /* i  : IVAS element mode */
-#endif
 )
 {
     Word32 L_tmp, Tmp, Tfr32[512], Tfi32[512], fac, *Pt1, *Pt2;
     Word16 i, tmp, tmp_short, N_LP, target[2 * L_FRAME48k], Tfr16[FEC_FFT_MAX_SIZE], *pt1, *pt2, *pt3;
     Word16 tmp_loop;
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    int16_t alignment_point;
-
-    Lon20 = (int16_t) 160 / 20;
-    if ( element_mode == EVS_MONO )
-    {
-        alignment_point = 2 * 160 - 3 * Lon20;
-    }
-    else
-    {
-        alignment_point = 2 * 160;
-    }
-#endif
     tmp = sub( 296, N );
     Copy( &prevsynth_LP[tmp], target, N );
 
@@ -4160,13 +3701,8 @@ static void fec_ecu_dft_fx(
         {
             tmp_short = extract_l( L_shr( Tmp, 15 ) );
             tmp = extract_l( L_msu( Tmp, tmp_short, 16384 ) );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mult( sub_sat( target[tmp_short + 1], target[tmp_short] ), tmp ); /*Qin+16 */
             Tfr16[i] = add_sat( target[tmp_short], round_fx_sat( L_tmp ) );
-#else
-            L_tmp = L_mult( sub( target[tmp_short + 1], target[tmp_short] ), tmp ); /*Qin+16 */
-            Tfr16[i] = add( target[tmp_short], round_fx( L_tmp ) );
-#endif
             move16(); /*Qin */
             Tmp = L_add( Tmp, fac );
         }
@@ -4177,7 +3713,12 @@ static void fec_ecu_dft_fx(
     tmp = Exp16Array( *Nfft, Tfr16 );
     *exp = add( tmp, add( 2, norm_s( *Nfft ) ) );
     move16();
-    Copy_Scale_sig_16_32( Tfr16, Tfr32, *Nfft, *exp ); /*Qin+exp; */
+    {
+        Word16 loctmp = *exp;
+        move16();
+        loctmp = s_min( 15, loctmp );
+        Copy_Scale_sig_16_32_DEPREC( Tfr16, Tfr32, *Nfft, loctmp ); /*Qin+exp; */ /*Even with limiting loctmp, if Copy_Scale_sig_16_32_no_sat() is used, can lead to 1 difference */
+    }
 
     DoRTFTn_fx( Tfr32, Tfi32, *Nfft );
     N_LP = shr( *Nfft, 1 );
@@ -4235,11 +3776,7 @@ static void singenerator_fx(
 
     ptr = xx;
 
-#ifdef BASOP_NOGLOB
     *ptr = L_add_sat( *ptr, L_C0 );
-#else
-    *ptr = L_add( *ptr, L_C0 );
-#endif
     move32();
     ptr++;
 
@@ -4250,11 +3787,7 @@ static void singenerator_fx(
         L_C1 = L_msu( L_C1, S0, sinfreq ); /*Qin+16 */
         L_S1 = L_mult( C0, sinfreq );
         S1 = mac_r( L_S1, S0, cosfreq );
-#ifdef BASOP_NOGLOB
         *ptr = L_add_sat( *ptr, L_C1 );
-#else
-        *ptr = L_add( *ptr, L_C1 );
-#endif
         move32(); /*Qin+16 */
         ptr++;
 
@@ -4263,11 +3796,7 @@ static void singenerator_fx(
         L_C0 = L_msu( L_C0, S1, sinfreq );
         L_S0 = L_mult( C1, sinfreq );
         S0 = mac_r( L_S0, S1, cosfreq );
-#ifdef BASOP_NOGLOB
         *ptr = L_add_sat( *ptr, L_C0 );
-#else
-        *ptr = L_add( *ptr, L_C0 );
-#endif
         move32();
         ptr++;
     }
@@ -4276,11 +3805,7 @@ static void singenerator_fx(
     S0 = extract_h( L_S0 );
     L_C1 = L_mult( C0, cosfreq );
     L_C1 = L_msu( L_C1, S0, sinfreq );
-#ifdef BASOP_NOGLOB
     *ptr = L_add_sat( *ptr, L_C1 );
-#else
-    *ptr = L_add( *ptr, L_C1 );
-#endif
     move32();
     ptr++;
 
@@ -4574,11 +4099,7 @@ static void ivas_fec_noise_filling_fx(
     move16();
     FOR( k = 0; k < tmp_fx; k++ )
     {
-#ifdef BASOP_NOGLOB
         ( *pt1++ ) = sub_sat( ( *pt2++ ), ( *pt3++ ) );
-#else
-        ( *pt1++ ) = sub( ( *pt2++ ), ( *pt3++ ) );
-#endif
         move16();
     }
 
@@ -4625,14 +4146,9 @@ static void ivas_fec_noise_filling_fx(
         tmp_fx = s_min( Rnd_N_noise, flag );
         FOR( i = 0; i < tmp_fx; i++ )
         {
-            L_tmp = L_mult( ( *pt1++ ), ( *pt3++ ) ); /*Qsynth+16 */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( ( *pt1++ ), ( *pt3++ ) );           /*Qsynth+16 */
             L_tmp = L_mac_sat( L_tmp, ( *pt2++ ), ( *pt4-- ) ); /*Qsynth+16 */
             *pt5 = add_sat( *pt5, round_fx_sat( L_tmp ) );
-#else
-            L_tmp = L_mac( L_tmp, ( *pt2++ ), ( *pt4-- ) ); /*Qsynth+16 */
-            *pt5 = add( *pt5, round_fx( L_tmp ) );
-#endif
             move16(); /*Qsynth */
             pt5++;
         }
@@ -4647,7 +4163,7 @@ static void ivas_fec_noise_filling_fx(
     }
     ELSE
     {
-        kk = NS2SA( L * FRAMES_PER_SEC, N_ZERO_MDCT_NS );
+        kk = NS2SA_FX2( L_mult0( L, FRAMES_PER_SEC ), N_ZERO_MDCT_NS );
         p_mdct_ola = old_out + kk;
     }
 
@@ -4657,13 +4173,13 @@ static void ivas_fec_noise_filling_fx(
     pt6 = &p_mdct_ola[0];
     FOR( k = 0; k < tmp_fx; k++ )
     {
-        L_tmp = L_mult( *sinq_tab, *sinq_tab ); /*Q30 */
+        L_tmp = L_mult( *sinq_tab, *sinq_tab ); /*Q31 */
         sinq_tab++;
-        q2 = round_fx( L_sub( 2147483647, L_tmp ) );          /*Q15 */
-        q1 = round_fx( L_tmp );                               /*Q15 */
-        L_tmp = L_mult( ( *pt1 ), q1 );                       /*Qsynth+16 */
-        L_tmp = L_mac( L_tmp, shr( *pt6++, Q_old_out ), q2 ); /*Qsynth+16 */
-        ( *pt1++ ) = round_fx( L_tmp );                       /*Qsynth */
+        q2 = round_fx( L_sub( 2147483647, L_tmp ) );                                                  /*Q15 */
+        q1 = round_fx( L_tmp );                                                                       /*Q15 */
+        L_tmp = L_mult( ( *pt1 ), q1 );                                                               /*Qsynth+16 */
+        L_tmp = L_add_sat( L_tmp, L_shr_sat( Mpy_32_16_1( L_deposit_h( *pt6++ ), q2 ), Q_old_out ) ); /*Qsynth+16 */
+        ( *pt1++ ) = round_fx_sat( L_tmp );                                                           /*Qsynth */
         move16();
     }
 
@@ -4680,11 +4196,6 @@ static void fec_noise_filling_fx(
     const Word16 N,
     const Word16 HqVoicing,
     Word16 *gapsynth_fx /*Qsynth */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const int16_t element_mode, /* i  : IVAS element mode                          */
-    const float *old_out
-#endif
 )
 {
 
@@ -4699,22 +4210,6 @@ static void fec_noise_filling_fx(
     Word32 L_tmp;
     const Word16 *sinq_tab;
 
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-
-    const float *p_mdct_ola;
-    int16_t alignment_point;
-    PMTE()
-    if ( element_mode == EVS_MONO )
-    {
-        alignment_point = 2 * L - 3 * L / 20;
-    }
-    else
-    {
-        alignment_point = 2 * L;
-    }
-    mvr2r( prevsynth + alignment_point - N, noisevect, N );
-#endif
-
     IF( EQ_16( L, L_FRAME32k ) )
     {
         sinq_tab = sinq_32k;
@@ -4748,11 +4243,7 @@ static void fec_noise_filling_fx(
     move16();
     FOR( k = 0; k < tmp_fx; k++ )
     {
-#ifdef BASOP_NOGLOB
         ( *pt1++ ) = sub_sat( ( *pt2++ ), ( *pt3++ ) );
-#else
-        ( *pt1++ ) = sub( ( *pt2++ ), ( *pt3++ ) );
-#endif
         move16();
     }
 
@@ -4787,24 +4278,8 @@ static void fec_noise_filling_fx(
         Rnd_N_noise = extract_h( L_mult( N_noise, tmp_fx ) ); /*Q0 */
 
 
-        tmp_fx = div_s( 1, Rnd_N_noise ); /*Q15 */
-#ifdef BASOP_NOGLOB
+        tmp_fx = div_s( 1, Rnd_N_noise );                                 /*Q15 */
         tmp_fx = round_fx_sat( L_shl_sat( L_mult( tmp_fx, 25736 ), 2 ) ); /*Q15 */
-#else
-        tmp_fx = round_fx( L_shl( L_mult( tmp_fx, 25736 ), 2 ) ); /*Q15 */
-#endif
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        if ( element_mode == EVS_MONO )
-        {
-            kk = 7 * L / 20;
-            p_mdct_ola = prevsynth + 37 * L / 20;
-        }
-        else
-        {
-            kk = NS2SA( L * FRAMES_PER_SEC, N_ZERO_MDCT_NS );
-            p_mdct_ola = old_out + kk;
-        }
-#endif
 
         sinq_fx( shr( tmp_fx, 1 ), shr( tmp_fx, 2 ), Rnd_N_noise, SS_fx );
 
@@ -4815,14 +4290,9 @@ static void fec_noise_filling_fx(
         tmp_fx = s_min( Rnd_N_noise, flag );
         FOR( i = 0; i < tmp_fx; i++ )
         {
-            L_tmp = L_mult( ( *pt1++ ), ( *pt3++ ) ); /*Qsynth+16 */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( ( *pt1++ ), ( *pt3++ ) );           /*Qsynth+16 */
             L_tmp = L_mac_sat( L_tmp, ( *pt2++ ), ( *pt4-- ) ); /*Qsynth+16 */
             *pt5 = add_sat( *pt5, round_fx_sat( L_tmp ) );
-#else
-            L_tmp = L_mac( L_tmp, ( *pt2++ ), ( *pt4-- ) );       /*Qsynth+16 */
-            *pt5 = add( *pt5, round_fx( L_tmp ) );
-#endif
             move16(); /*Qsynth */
             pt5++;
         }
@@ -4917,11 +4387,6 @@ static void fec_alg_fx(
     const Word16 decimatefactor,
     const Word16 HqVoicing,
     Word16 *gapsynth /*Qin */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const Word16 element_mode, /* i  : IVAS element mode                          */
-    const Word16 *old_out
-#endif
 )
 {
     Word16 Nfft;
@@ -4933,21 +4398,11 @@ static void fec_alg_fx(
     Word16 exp;
     Word16 n, Q;
 
-    fec_ecu_dft_fx( prevsynth_LP, N, Tfr, Tfi, &sum_Tf_abs, Tf_abs, &Nfft, &exp
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                    ,
-                    element_mode
-#endif
-    );
+    fec_ecu_dft_fx( prevsynth_LP, N, Tfr, Tfi, &sum_Tf_abs, Tf_abs, &Nfft, &exp );
 
     sinusoidal_synthesis_fx( Tfr, Tfi, Tf_abs, N, output_frame, decimatefactor, Nfft, sum_Tf_abs, synthesis, HqVoicing, exp );
 
-    fec_noise_filling_fx( prevsynth, synthesis, ni_seed_forfec, output_frame, i_mult2( N, decimatefactor ), HqVoicing, gapsynth
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                          ,
-                          element_mode, old_out
-#endif
-    );
+    fec_noise_filling_fx( prevsynth, synthesis, ni_seed_forfec, output_frame, i_mult2( N, decimatefactor ), HqVoicing, gapsynth );
 
     n = R1_48 - R2_48;
     move16();
@@ -5016,7 +4471,7 @@ static void ivas_hq_phase_ecu_fx(
 
     IF( element_mode == EVS_MONO )
     {
-        ph_ecu_lookahead = NS2SA( output_frame * FRAMES_PER_SEC, PH_ECU_LOOKAHEAD_NS );
+        ph_ecu_lookahead = NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), PH_ECU_LOOKAHEAD_NS );
         move16();
     }
     ELSE
@@ -5095,7 +4550,7 @@ static void ivas_hq_phase_ecu_fx(
                         alpha, beta, *beta_mute, Xavg, element_mode, ph_ecu_lookahead, noise_fac );
 
     /* reconstructed frame in tda domain */
-    old_dec = prevsynth + sub( shl( output_frame, 1 ), NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) );
+    old_dec = prevsynth + sub( shl( output_frame, 1 ), NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), N_ZERO_MDCT_NS ) );
     ivas_rec_frame_fx( X, ecu_rec, output_frame, *Q_spec, old_dec, element_mode, num_p, plocs );
 
     *last_fec = 0;
@@ -5123,11 +4578,6 @@ static void hq_phase_ecu_fx(
     Word16 *beta_mute,                /* o   : Factor for long-term mute Q15                */
     const Word16 bwidth_fx,           /* i  : Encoded bandwidth                         */
     const Word16 output_frame         /* i   : frame length                             */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    ,
-    const Word16 pcorr,
-    const Word16 element_mode /* i  : IVAS element mode                          */
-#endif
 )
 {
     Word16 lprot, offset;
@@ -5135,22 +4585,6 @@ static void hq_phase_ecu_fx(
     Word16 seed;
     Word16 alpha[LGW_MAX], beta[LGW_MAX];
 
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    const float *old_dec;
-    float noise_fac;
-    int16_t ph_ecu_lookahead;
-
-    noise_fac = 1.0f;
-
-    if ( element_mode == EVS_MONO )
-    {
-        ph_ecu_lookahead = NS2SA( output_frame * FRAMES_PER_SEC, PH_ECU_LOOKAHEAD_NS );
-    }
-    else
-    {
-        ph_ecu_lookahead = 0;
-    }
-#endif
     IF( EQ_16( output_frame, L_FRAME48k ) )
     {
         lprot = L_PROT48k; /* 1536 = (2*output_frame)*1024/1280 */
@@ -5179,30 +4613,17 @@ static void hq_phase_ecu_fx(
     {
         test();
         // PMT("verify condition compared to float")
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        IF( !( prev_bfi != 0 && *last_fec != 0 ) && EQ_16( element_mode == EVS_MONO ) )
-#else
         if ( !( prev_bfi != 0 && *last_fec != 0 ) )
-#endif
         {
             *time_offs = 0;
             move16();
         }
 
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        offset = add( sub( sub( shl( output_frame, 1 ), lprot ), *time_offs ), ph_ecu_lookahead );
-#else
         offset = sub( sub( shl( output_frame, 1 ), lprot ), *time_offs );
-#endif
         trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
                       *last_fec, alpha, beta, beta_mute, Xavg );
 
-        spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                     ,
-                     element_mode, noise_fac, pcorr
-#endif
-        );
+        spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec );
 
         test();
         IF( prev_bfi != 0 && *last_fec != 0 )
@@ -5232,23 +4653,10 @@ static void hq_phase_ecu_fx(
     }
 
     subst_spec_fx( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed,
-                   alpha, beta, *beta_mute, Xavg
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                   ,
-                   element_mode, ph_ecu_lookahead, noise_fac
-#endif
-    );
+                   alpha, beta, *beta_mute, Xavg );
 
     /* reconstructed frame in tda domain */
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    old_dec = prevsynth + 2 * output_frame - NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS );
-#endif
-    rec_frame_fx( X, ecu_rec, output_frame, *Q_spec
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-                  ,
-                  old_dec, element_mode, num_p, plocs
-#endif
-    );
+    rec_frame_fx( X, ecu_rec, output_frame, *Q_spec );
 
     *last_fec = 0;
     move16();
@@ -5300,11 +4708,11 @@ void ivas_hq_ecu_fx(
     move16();
     IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
     {
-        fec_alg_input = prevsynth + NS2SA( output_frame * FRAMES_PER_SEC, ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS );
+        fec_alg_input = prevsynth + NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS );
     }
     ELSE
     {
-        fec_alg_input = prevsynth - NS2SA( output_frame * FRAMES_PER_SEC, PH_ECU_LOOKAHEAD_NS );
+        fec_alg_input = prevsynth - NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), PH_ECU_LOOKAHEAD_NS );
     }
     /* init (values ar changed after) */
 
@@ -5363,7 +4771,7 @@ void ivas_hq_ecu_fx(
     }
     ELSE
     {
-        ivas_hq_phase_ecu_fx( prevsynth - NS2SA( output_frame * FRAMES_PER_SEC, PH_ECU_LOOKAHEAD_NS ), ecu_rec, time_offs, X_sav, Q_spec, num_p, plocs, plocsi,
+        ivas_hq_phase_ecu_fx( prevsynth - NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), PH_ECU_LOOKAHEAD_NS ), ecu_rec, time_offs, X_sav, Q_spec, num_p, plocs, plocsi,
                               env_stab, last_fec, ph_ecu_active, prev_bfi, old_is_transient,
                               mag_chg_1st, Xavg, beta_mute, st_fx->bwidth, output_frame, corr, st_fx->element_mode );
 
@@ -5402,22 +4810,6 @@ void hq_ecu_fx(
     Word16 decimatefactor;
     Word16 corr; /*Q15 */
     Word16 prevsynth_LP[2 * L_FRAME8k];
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-    HQ_DEC_HANDLE hHQ_core;
-    const float *fec_alg_input;
-    int16_t evs_mode_selection;
-    int16_t ivas_mode_selection;
-
-    hHQ_core = st->hHQ_core;
-    if ( st->element_mode == EVS_MONO )
-    {
-        fec_alg_input = prevsynth + NS2SA( output_frame * FRAMES_PER_SEC, ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS );
-    }
-    else
-    {
-        fec_alg_input = prevsynth - NS2SA( output_frame * FRAMES_PER_SEC, PH_ECU_LOOKAHEAD_NS );
-    }
-#endif
     /* init (values ar changed after) */
     decimatefactor = 4;
     move16();
@@ -5428,11 +4820,7 @@ void hq_ecu_fx(
 
     IF( !( LT_16( output_frame, L_FRAME16k ) ) )
     {
-#ifdef IVAS_FEC_ECU_TO_COMPLETE
-        fec_ecu_pitch_fx( fec_alg_input, prevsynth_LP, output_frame, &N, &corr, &decimatefactor, ph_ecu_HqVoicing );
-#else
-        fec_ecu_pitch_fx( prevsynth + NS2SA( output_frame * 50, ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, output_frame, &N, &corr, &decimatefactor, ph_ecu_HqVoicing );
-#endif
+        fec_ecu_pitch_fx( prevsynth + NS2SA_FX2( L_mult0( output_frame, 50 ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, output_frame, &N, &corr, &decimatefactor, ph_ecu_HqVoicing );
     }
     ELSE
     {
@@ -5455,38 +4843,12 @@ void hq_ecu_fx(
     test();
     test();
     test();
-#if defined IVAS_FEC_ECU_TO_COMPLETE
-    evs_mode_selection = ( st->total_brate >= 48000 && ( output_frame >= L_FRAME16k && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) &&
-                                                         ( ph_ecu_HqVoicing || ( ( ( hHQ_core->env_stab_plc > 0.5 ) && ( corr < 0.6 ) ) || ( hHQ_core->env_stab_plc < 0.5 && ( corr > 0.85 ) ) ) ) ) ) ||
-                         ( st->total_brate < 48000 && ( ( ph_ecu_HqVoicing || corr > 0.85 ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) ) );
-
-    ivas_mode_selection = ( N < PH_ECU_N_LIMIT ) || ( corr < PH_ECU_CORR_LIMIT );
-    if ( ( ( st->element_mode == EVS_MONO ) && evs_mode_selection ) ||
-         ( ( st->element_mode != EVS_MONO ) && evs_mode_selection && ivas_mode_selection ) )
-
-    {
-        fec_alg_fx( fec_alg_input, prevsynth_LP, ecu_rec, output_frame, N, decimatefactor, ph_ecu_HqVoicing, gapsynth, &hHQ_core->ni_seed_forfec, st->element_mode, st->hHQ_core->old_out );
-        *last_fec = 1;
-        *ph_ecu_active = 0;
-        move16();
-        *time_offs = output_frame;
-        move16();
-        ;
-    }
-    else
-    {
-        hq_phase_ecu( prevsynth - NS2SA( output_frame * FRAMES_PER_SEC, PH_ECU_LOOKAHEAD_NS ), ecu_rec, time_offs, X_sav, num_p, plocs, plocsi, env_stab, last_fec, prev_bfi, old_is_transient, mag_chg_1st, Xavg, beta_mute, st->bwidth, output_frame, corr, st->element_mode );
-
-        *last_fec = 0;
-        *ph_ecu_active = 1;
-    }
-#else
     IF( ( GE_32( st_fx->total_brate, 48000 ) &&
           ( GE_16( output_frame, L_FRAME16k ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) && ( NE_16( ph_ecu_HqVoicing, 0 ) || ( ( ( NE_16( st_fx->hHQ_core->env_stab_plc_fx, 0 ) ) && ( LT_16( corr, 19661 ) ) ) || ( !( NE_16( st_fx->hHQ_core->env_stab_plc_fx, 0 ) ) && ( GT_16( corr, 27853 ) ) ) ) ) ) ) ||
         ( LT_32( st_fx->total_brate, 48000 ) && ( ( ph_ecu_HqVoicing || GT_16( corr, 27853 ) ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) ) ) )
     {
 
-        fec_alg_fx( prevsynth + NS2SA( output_frame * 50, ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, &st_fx->hHQ_core->ni_seed_forfec, ecu_rec, output_frame, N, decimatefactor, ph_ecu_HqVoicing, gapsynth );
+        fec_alg_fx( prevsynth + NS2SA_FX2( L_mult0( output_frame, 50 ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, &st_fx->hHQ_core->ni_seed_forfec, ecu_rec, output_frame, N, decimatefactor, ph_ecu_HqVoicing, gapsynth );
         *last_fec = 1;
         move16();
         *ph_ecu_active = 0;
@@ -5500,7 +4862,6 @@ void hq_ecu_fx(
                          env_stab, last_fec, ph_ecu_active, prev_bfi, old_is_transient,
                          mag_chg_1st, Xavg, beta_mute, st_fx->bwidth, output_frame );
     }
-#endif
     return;
 }
 
@@ -5623,11 +4984,7 @@ static void windowing_ROM_optimized(
     FOR( i = 0; i < quarterLen; i++ )
     {
         acc = L_deposit_h( FEC_HQ_WIN_A0 );
-#ifdef BASOP_NOGLOB
         hamm = mac_r_sat( acc, *pSine, FEC_HQ_WIN_A1 );
-#else
-        hamm = mac_r( acc, *pSine, FEC_HQ_WIN_A1 );
-#endif
         *pY++ = mult_r( hamm, *pX++ );
         move16();
         pSine += downSamples; /* Increment address counter */
@@ -5643,13 +5000,9 @@ static void windowing_ROM_optimized(
     /* 1st half of the right half of the Hamming window. */
     FOR( i = 0; i < quarterLen; i++ )
     {
-        pSine -= downSamples;               /* Decrement address counter */
-        acc = L_deposit_h( FEC_HQ_WIN_A0 ); // Q31
-#ifdef BASOP_NOGLOB
+        pSine -= downSamples;                           /* Decrement address counter */
+        acc = L_deposit_h( FEC_HQ_WIN_A0 );             // Q31
         hamm = mac_r_sat( acc, *pSine, FEC_HQ_WIN_A1 ); // Q15
-#else
-        hamm = mac_r( acc, *pSine, FEC_HQ_WIN_A1 );
-#endif
         *pY++ = mult_r( hamm, *pX++ );
         move16();
     }
diff --git a/lib_dec/FEC_adapt_codebook.c b/lib_dec/FEC_adapt_codebook.c
deleted file mode 100644
index b2dcc556003357d6e4441122ad670cfdd7bde413..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_adapt_codebook.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_dec.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------------
- * FEC_synchro_exc()
- *
- * Perform resynchronisation of the last glottal pulse in voiced frame lost
- *------------------------------------------------------------------------*/
-
-/*! r: do_WI flag */
diff --git a/lib_dec/FEC_clas_estim.c b/lib_dec/FEC_clas_estim.c
deleted file mode 100644
index 4d461a0dc573e8a1290d05b7acaa24ebcbe52f21..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_clas_estim.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include "cnst.h"
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "stat_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/FEC_clas_estim_fx.c b/lib_dec/FEC_clas_estim_fx.c
index 4c268186d8851b3a0f05a69385a6160f8f787bc0..2bd38153a3c533568ec9b21792b3d21df478853b 100644
--- a/lib_dec/FEC_clas_estim_fx.c
+++ b/lib_dec/FEC_clas_estim_fx.c
@@ -82,7 +82,7 @@ void FEC_clas_estim_fx(
     Word16 bfi,
     /* i  : bad frame indicator                                                 */ /*B*/
     Word32 last_core_brate,                                                        /* i  : bitrate of previous frame                                           */
-    const int16_t FEC_mode                                                         /* i  : ACELP FEC mode                                 */
+    const Word16 FEC_mode                                                          /* i  : ACELP FEC mode                                 */
 )
 {
     Word16 i, j, pos;
@@ -285,11 +285,17 @@ void FEC_clas_estim_fx(
 
 
             Corre( &pt1[pos], &pt1[pos - T0], T0, &cor_max[0] );
-#ifdef BASOP_NOGLOB
-            T0 = mult_r_sat( add_sat( pitch[2], pitch[3] ), 256 );
-#else
-            T0 = mult_r( add( pitch[2], pitch[3] ), 256 );
-#endif
+            IF( NE_16( st_fx->element_mode, EVS_MONO ) )
+            {
+                IF( LT_16( sub( pos, T0 ), sub( L_frame, L_SUBFR ) ) )
+                {
+                    T0 = mult_r_sat( add_sat( pitch[2], pitch[3] ), 256 );
+                }
+            }
+            ELSE
+            {
+                T0 = mult_r_sat( add_sat( pitch[2], pitch[3] ), 256 );
+            }
             pos_limit = sub( L_frame, L_SUBFR );
             j = s_min( 1, s_max( 0, sub( pos, pos_limit ) ) );
             Ltmp = L_deposit_l( cor_max[0] );
@@ -334,11 +340,7 @@ void FEC_clas_estim_fx(
             test();
             IF( EQ_16( codec_mode, MODE1 ) || !( NE_16( LTP_Gain, -32768 /*-1.f Q15*/ ) && EQ_16( mode, CLASSIFIER_TCX ) ) )
             {
-#ifdef BASOP_NOGLOB
                 pc = shr( abs_s( sub( add_sat( pitch[3], sub( pitch[2], pitch[1] ) ), pitch[0] ) ), 6 );
-#else
-                pc = shr( abs_s( sub( add( pitch[3], sub( pitch[2], pitch[1] ) ), pitch[0] ) ), 6 );
-#endif
 
                 IF( EQ_16( L_frame, L_FRAME16k ) )
                 {
@@ -359,13 +361,8 @@ void FEC_clas_estim_fx(
             {
                 pt1++;
                 pt2++;
-#ifdef BASOP_NOGLOB
                 Ltmp = L_mac0_sat( Ltmp, *pt1, *pt1 );
                 Ltmp1 = L_mac0_sat( Ltmp1, *pt1, *pt2 );
-#else
-                Ltmp = L_mac0( Ltmp, *pt1, *pt1 );
-                Ltmp1 = L_mac0( Ltmp1, *pt1, *pt2 );
-#endif
             }
             tilt = 0;
             move16();
@@ -383,21 +380,13 @@ void FEC_clas_estim_fx(
                 tmp_x = extract_h( L_shl( Ltmp, exp2 ) );
                 exp2 = sub( 31 - 1 + 3, exp2 );
                 BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
                 tmpS = shr( sub_sat( tmp_x, tmp_y ), 16 ); /* if tmp_x >= tmp_y tmpS = 0, -1 otherwise */
-#else
-                tmpS = shr( sub( tmp_x, tmp_y ), 16 ); /* if tmp_x >= tmp_y tmpS = 0, -1 otherwise */
-#endif
                 BASOP_SATURATE_WARNING_ON_EVS
                 tmp_y = shl( tmp_y, tmpS );
                 exp1 = sub( exp1, tmpS );
 
                 tilt = div_s( tmp_y, tmp_x );
-#ifdef BASOP_NOGLOB
                 tilt = shl_sat( tilt, sub( exp1, exp2 ) ); /* saturate to 1.0 */
-#else
-                tilt = shl( tilt, sub( exp1, exp2 ) ); /* saturate to 1.0 */
-#endif
 
                 tilt = i_mult2( tilt, tmp16 );
             }
@@ -420,11 +409,7 @@ void FEC_clas_estim_fx(
             zcn = extract_h( L_shl( L_mac( C_ZC_FX, K_ZC_FX, zc_frame ), 4 ) ); /* Q4 -> Q8*/
 
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             tmp16 = sub_sat( LTP_Gain, -32768 /*-1.f Q15*/ );
-#else
-            tmp16 = sub( LTP_Gain, -32768 /*-1.f Q15*/ );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             test();
             test();
@@ -446,11 +431,7 @@ void FEC_clas_estim_fx(
             Ltmp = L_mac( Ltmp, pcn, UNS6 );
             Ltmp = L_mac( Ltmp, enern, UNS6 );
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             fmerit1 = round_fx_sat( L_shl_sat( Ltmp, 15 - 8 ) ); /*Q15 can saturate to 1.0 */
-#else
-            fmerit1 = round_fx( L_shl( Ltmp, 15 - 8 ) ); /*Q15 can saturate to 1.0 */
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             test();
             IF( EQ_16( codec_mode, MODE2 ) && narrowBand != 0 )
@@ -754,8 +735,8 @@ void FEC_clas_estim_fx(
 
 
     } /* Do the classification only
- - MODE1: when the class is not transmitted in the bitstream
- - MODE2: on good frames (classifier is also called for bfi=1) */
+    - MODE1: when the class is not transmitted in the bitstream
+    - MODE2: on good frames (classifier is also called for bfi=1) */
 
 
     /* update the memory of synthesis for frame class estimation */
@@ -938,11 +919,7 @@ static void Corre(
 
     /* keep Q15 normalized result */
     cor = extract_h( Dot_product12( x, y, l, &cor_exp ) );
-#ifdef BASOP_NOGLOB
     den = add_sat( extract_h( Dot_product12( y, y, l, &den_exp ) ), 1 );
-#else
-    den = add( extract_h( Dot_product12( y, y, l, &den_exp ) ), 1 );
-#endif
     den2 = extract_h( Dot_product12( x, x, l, &den2_exp ) );
 
     /* keep Q31 normalized result */
@@ -953,10 +930,6 @@ static void Corre(
 
     tmp = Isqrt_lc( tmp, &tmp_exp );
     /* keep Q15 result */
-#ifdef BASOP_NOGLOB
     gain[0] = shl_sat( mult_r( cor, extract_h( tmp ) ), add( cor_exp, tmp_exp ) );
-#else
-    gain[0] = shl( mult_r( cor, extract_h( tmp ) ), add( cor_exp, tmp_exp ) );
-#endif
     move16();
 }
diff --git a/lib_dec/FEC_fx.c b/lib_dec/FEC_fx.c
index c0976e68a0764e9ed958564472fa481fdd8de8ba..48d91a87a1956594ba84a662e33c8cc73d52d89f 100644
--- a/lib_dec/FEC_fx.c
+++ b/lib_dec/FEC_fx.c
@@ -126,11 +126,7 @@ void FEC_exc_estim_fx(
 
         gainCNG = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) ); /* In Q3 */
     }
-#ifdef BASOP_NOGLOB
     tmp1 = shl_o( st_fx->lp_gainc_fx, 1, &Overflow );
-#else
-    tmp1 = shl( st_fx->lp_gainc_fx, 1 );
-#endif
     gainCNG = s_min( gainCNG, tmp1 );
     set16_fx( exc_dct_in, 0, L_FRAME16k );
 
@@ -191,15 +187,9 @@ void FEC_exc_estim_fx(
     {
         test();
         test();
-#ifdef BASOP_NOGLOB
         IF( ( LT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) ), shl_o( mult( 29491, st_fx->bfi_pitch_fx ), 1, &Overflow ) ) &&
               GT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) ), mult( 19661, st_fx->bfi_pitch_fx ) ) ) || /* last pitch coherent with the past  */
             GE_16( st_fx->upd_cnt, MAX_UPD_CNT ) )                                                                                /* or last update too far in the past */
-#else
-        IF( ( LT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) ), shl( mult( 29491, st_fx->bfi_pitch_fx ), 1 ) ) &&
-              GT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) ), mult( 19661, st_fx->bfi_pitch_fx ) ) ) || /* last pitch coherent with the past  */
-            GE_16( st_fx->upd_cnt, MAX_UPD_CNT ) )                                                                                /* or last update too far in the past */
-#endif
         {
             /* take the pitch value of last subframe of the previous frame */
             *tmp_tc = round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) );
@@ -210,15 +200,9 @@ void FEC_exc_estim_fx(
     {
         test();
         test();
-#ifdef BASOP_NOGLOB
         IF( ( LT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) ), shl_o( mult( 29491, st_fx->bfi_pitch_fx ), 1, &Overflow ) ) &&
               GT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) ), mult( 19661, st_fx->bfi_pitch_fx ) ) ) || /* last pitch coherent with the past  */
             GE_16( st_fx->upd_cnt, MAX_UPD_CNT ) )                                                                                   /* or last update too far in the past */
-#else
-        IF( ( LT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) ), shl( mult( 29491, st_fx->bfi_pitch_fx ), 1 ) ) &&
-              GT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) ), mult( 19661, st_fx->bfi_pitch_fx ) ) ) || /* last pitch coherent with the past  */
-            GE_16( st_fx->upd_cnt, MAX_UPD_CNT ) )                                                                                   /* or last update too far in the past */
-#endif
         {
             /* take the pitch value of last subframe of the previous frame */
             *tmp_tc = round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) );
@@ -312,11 +296,7 @@ void FEC_exc_estim_fx(
         IF( LE_16( st_fx->nbLostCmpt, 1 ) )
         {
             /* if stable, do not decrease the energy, pitch_gain = 0 */
-#ifdef BASOP_NOGLOB
             alpha = mac_ro( ( 1L << 16 ) * 2 * _ALPHA_U_FX, st_fx->stab_fac_fx, 32768 - 2 * _ALPHA_U_FX, &Overflow ); /*st_fx->stab_fac_fx in Q15*/
-#else
-            alpha = mac_r( ( 1L << 16 ) * 2 * _ALPHA_U_FX, st_fx->stab_fac_fx, 32768 - 2 * _ALPHA_U_FX );                            /*st_fx->stab_fac_fx in Q15*/
-#endif
         }
         ELSE IF( EQ_16( st_fx->nbLostCmpt, 2 ) )
         {
@@ -365,11 +345,7 @@ void FEC_exc_estim_fx(
             L_tmp = L_deposit_h( tmp );
             L_tmp = Isqrt_lc( L_tmp, &exp );
 
-#ifdef BASOP_NOGLOB
             gain = extract_h( L_shl_o( L_tmp, exp, &Overflow ) );
-#else
-            gain = extract_h( L_shl( L_tmp, exp ) );
-#endif
 
             gain = s_min( gain, 32113 ); /*0.98 */
             gain = s_max( gain, 27853 ); /*0.85 */
@@ -528,21 +504,16 @@ void FEC_exc_estim_fx(
     test();
     test();
     test();
-    IF( EQ_16( st_fx->last_coder_type, AUDIO ) || ( EQ_16( st_fx->last_good, INACTIVE_CLAS ) && LE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) && !st_fx->Opt_AMR_WB ) )
+    IF( EQ_16( st_fx->last_coder_type, AUDIO ) || ( EQ_16( st_fx->last_good, INACTIVE_CLAS ) && st_fx->inactive_coder_type_flag && !st_fx->Opt_AMR_WB ) )
     {
         st_fx->GSC_noisy_speech = st_fx->Last_GSC_noisy_speech_flag;
         move16();
         /* st_fx->L_frame / L_SUBFR */
         tmp = shr( st_fx->L_frame, 6 );
+
         /* Replication of the last spectrum, with a slight downscaling of its dynamic */
-        IF( st_fx->element_mode == EVS_MONO )
-        {
-            gsc_dec_fx( st_fx, exc_dct_in, hGSCDec->Last_GSC_pit_band_idx, Diff_len, 0, tmp, st_fx->last_coder_type, &last_bin_fx, lsf_new, NULL, st_fx->Q_exc );
-        }
-        ELSE
-        {
-            gsc_dec_ivas_fx( st_fx, exc_dct_in, hGSCDec->Last_GSC_pit_band_idx, Diff_len, 0, tmp, st_fx->last_coder_type, &last_bin_fx, lsf_new, NULL, &st_fx->Q_exc );
-        }
+        gsc_dec_fx( st_fx, exc_dct_in, hGSCDec->Last_GSC_pit_band_idx, Diff_len, 0, tmp, st_fx->last_coder_type, &last_bin_fx, lsf_new, NULL, &st_fx->Q_exc );
+
         *tmp_noise = shr_r( st_fx->lp_gainc_fx, 3 ); /*Q0*/
         move16();
         /* Transform back to time domain */
@@ -658,11 +629,7 @@ void FEC_exc_estim_fx(
             /* non-causal ringing of the FIR filter */
             /**pt_exc++ *= (gain_inov * gain);*/
             L_tmp = L_mult( tmp, *pt_exc ); /* Q_exc+18 * Q-3 -> Q_exc+16 */
-#ifdef BASOP_NOGLOB
             *pt_exc++ = round_fx_sat( L_shl_sat( L_tmp, exp ) );
-#else
-            *pt_exc++ = round_fx( L_shl( L_tmp, exp ) );
-#endif
             move16();
         }
 
@@ -671,11 +638,7 @@ void FEC_exc_estim_fx(
             /* the inner part of the FIR filter */
             /* *pt_exc++ *= (gain_inov * gain); */
             L_tmp = L_mult( tmp, *pt_exc );
-#ifdef BASOP_NOGLOB
             *pt_exc++ = round_fx_sat( L_shl_sat( L_tmp, exp ) );
-#else
-            *pt_exc++ = round_fx( L_shl( L_tmp, exp ) );
-#endif
             move16();
             /* gain -= step; */
             L_tmp2 = L_sub( L_tmp2, L_step );
@@ -686,11 +649,7 @@ void FEC_exc_estim_fx(
         {
             /* *pt_exc++ *= (gain_inov * gain) */
             L_tmp = L_mult( tmp, *pt_exc );
-#ifdef BASOP_NOGLOB
             *pt_exc++ = round_fx_sat( L_shl_sat( L_tmp, exp ) );
-#else
-            *pt_exc++ = round_fx( L_shl( L_tmp, exp ) );
-#endif
             move16();
         }
     }
@@ -702,7 +661,7 @@ void FEC_exc_estim_fx(
     test();
     test();
     test();
-    IF( ( EQ_16( st_fx->last_coder_type, AUDIO ) || EQ_16( st_fx->last_good, INACTIVE_CLAS ) ) && LE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) && !st_fx->Opt_AMR_WB )
+    IF( EQ_16( st_fx->last_coder_type, AUDIO ) || ( EQ_16( st_fx->last_good, INACTIVE_CLAS ) && st_fx->inactive_coder_type_flag && !st_fx->Opt_AMR_WB ) )
     {
         /* For GSC - the excitation is already computed */
         Copy( exc, exc2, st_fx->L_frame );
@@ -726,17 +685,9 @@ void FEC_exc_estim_fx(
             L_tmp = L_mult( hp_filt[0], pt_exc[0] );
             FOR( j = 1; j < MODE1_L_FIR_FER; j++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac_sat( L_tmp, hp_filt[j], pt_exc[j] );
-#else
-                L_tmp = L_mac( L_tmp, hp_filt[j], pt_exc[j] );
-#endif
             }
-#ifdef BASOP_NOGLOB
             exc2[i] = msu_r_sat( L_tmp, -32768, exc[i] );
-#else
-            exc2[i] = msu_r( L_tmp, -32768, exc[i] );
-#endif
             move16();
             pt_exc++;
         }
@@ -812,11 +763,7 @@ static void pulseRes_preCalc( Word16 *cond1, Word16 *cond2, Word32 *cond3, Word1
     tmp_frame = sub( 32767 /*1.f Q15*/, tmp_frame ); /*Q15*/
     BASOP_SATURATE_WARNING_OFF_EVS
     /*To calc Q15 threshold, overflow may happen - do negation and compare with negated value to check also highest possible value*/
-#ifdef BASOP_NOGLOB
     tmp_pit = shl_o( negate( tmp_pit ), tmp_pit_e, &Overflow );
-#else
-    tmp_pit = shl( negate( tmp_pit ), tmp_pit_e );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     *cond1 = sub( tmp_pit, negate( tmp_frame ) );
     move16();
@@ -829,11 +776,7 @@ static void pulseRes_preCalc( Word16 *cond1, Word16 *cond2, Word32 *cond3, Word1
     tmp_pit2 = L_mult( Tc, 4915 /*0.15f Q15*/ ); /*Q16*/
     BASOP_SATURATE_WARNING_OFF_EVS
     /*To calc Q15 threshold, overflow may happen - do negation and compare with negated value to check also highest possible value*/
-#ifdef BASOP_NOGLOB
     tmp_pit2 = L_shl_sat( L_negate( tmp_pit2 ), sub( 15 - 16, tmp_pit_e ) );
-#else
-    tmp_pit2 = L_shl( L_negate( tmp_pit2 ), sub( 15 - 16, tmp_pit_e ) );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     *cond3 = L_sub( L_mult0( -1, tmp_pit ), tmp_pit2 );
     move32();
diff --git a/lib_dec/FEC_lsf_estim.c b/lib_dec/FEC_lsf_estim.c
deleted file mode 100644
index 1fa0758f744aa77ba4adf437deef92afb4795fe1..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_lsf_estim.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * FEC_lsf2lsp_interp_flt()
- *
- * - LSP calculation
- * - A(z) calculation
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/FEC_pitch_estim.c b/lib_dec/FEC_pitch_estim.c
deleted file mode 100644
index 1b9ed9484bba69c85ffac45d65729be6b855b40b..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_pitch_estim.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/FEC_pitch_estim_fx.c b/lib_dec/FEC_pitch_estim_fx.c
index 45304a94cebb2fae2cf31d7140947e525b4d0f1f..b7ad94f8931293ef25288170d9be242c4e0fabc8 100644
--- a/lib_dec/FEC_pitch_estim_fx.c
+++ b/lib_dec/FEC_pitch_estim_fx.c
@@ -59,11 +59,7 @@ void FEC_pitch_estim_fx(
     tmp3 = shl_sat( tmp2, 1 );                                                            /*Q6 (1.4f * old_pitch_buf[2*NB_SUBFR-1])*/
 
     tmp16k1 = round_fx( L_shl( Mpy_32_16_1( old_pitch_buf[2 * NB_SUBFR16k - 1], 22938 ), 6 ) ); /*Q6 0.7f * old_pitch_buf[2*NB_SUBFR16k-1]*/
-#ifdef BASOP_NOGLOB
-    tmp16k2 = shl_sat( tmp16k1, 1 ); /*Q6 1.4f * old_pitch_buf[2*NB_SUBFR16k-1]*/
-#else
-    tmp16k2 = shl( tmp16k1, 1 ); /*Q6 1.4f * old_pitch_buf[2*NB_SUBFR16k-1]*/
-#endif
+    tmp16k2 = shl_sat( tmp16k1, 1 );                                                            /*Q6 1.4f * old_pitch_buf[2*NB_SUBFR16k-1]*/
 
     test();
     test();
diff --git a/lib_dec/FEC_scale_syn.c b/lib_dec/FEC_scale_syn.c
deleted file mode 100644
index 7d23dd6f703552ed5f1af9f2941cf4dee9763f27..0000000000000000000000000000000000000000
--- a/lib_dec/FEC_scale_syn.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/FEC_scale_syn_fx.c b/lib_dec/FEC_scale_syn_fx.c
index f8f3d834688235c542a60f170d5df435a4672f13..7f4586083e938d9eecb623b325a54dcecad9e71a 100644
--- a/lib_dec/FEC_scale_syn_fx.c
+++ b/lib_dec/FEC_scale_syn_fx.c
@@ -76,6 +76,7 @@ void FEC_scale_syn_fx(
     Word16 *mem_syn,               /* o:   initial synthesis filter states         Q_syn*/
     Word16 Q_exc,
     Word16 Q_syn,
+    const Word16 element_mode,                /* i  : element mode                            */
     const Word16 avoid_lpc_burst_on_recovery, /* i  : if true the excitation energy is limited if LP has big gain */
     const Word16 force_scaling                /* i: force scaling                             */
 )
@@ -171,626 +172,10 @@ void FEC_scale_syn_fx(
      * Find the energy/gain at the end of the frame
      *-----------------------------------------------------------------*/
 
-    frame_ener_fx( L_frame, clas, synth, pitch[( L_frame >> 6 ) - 1], &L_enr2 /*Q0*/, 1, Q_syn, 3, 0 );
-
-
-    test();
-    test();
-    IF( bfi || ( EQ_32( total_brate, ACELP_7k20 ) ) || ( EQ_32( total_brate, ACELP_8k00 ) ) )
-    {
-        /* previous frame erased and no TC frame */
-        IF( *scaling_flag > 0 )
-        {
-            /*enr2 += 0.01f;*/
-            L_enr2 = L_max( L_enr2, 1 ); /* L_enr2 is in Q0 */
-
-            IF( bfi ) /* In all bad frames, limit the gain to 1  */
-            {
-                /* gain2 = (float)sqrt( enr_old / enr2 );*/
-                L_tmp = Sqrt_Ratio32( L_enr_old, 0, L_enr2, 0, &exp2 );
-#ifdef BASOP_NOGLOB
-                gain2 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                gain2 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#endif
-
-                /*if( gain2 > 1.0f )gain2 = 1.0f;*/
-                gain2 = s_min( gain2, 16384 );
-
-                /* find the energy/gain at the beginning of the frame */
-                frame_ener_fx( L_frame, clas, synth, pitch[0], &L_enr1 /*Q0*/, 1, Q_syn, 3, 0 );
-
-                /*enr1 += 0.1f;*/
-                L_enr1 = L_max( L_enr1, 1 ); /* L_enr2 is in Q0 */
-
-                /*gain1 = (float)sqrt( enr_old / enr1 );*/
-                L_tmp = Sqrt_Ratio32( L_enr_old, 0, L_enr1, 0, &exp2 );
-#ifdef BASOP_NOGLOB
-                gain1 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                gain1 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#endif
-
-                /*if( gain1 > 1.0f )gain1 = 1.0f;*/
-                gain1 = s_min( gain1, 16384 ); /*Q14*/
-            }
-            ELSE /* good frame  */
-            {
-                IF( L_enr_q == 0 ) /* If E info (FEC protection bits) is not available in the bitstream */
-                {
-                    L_enr_q = L_enr2; /*Q0*/
-                    set16_fx( h1, 0, L_FRAME / 2 );
-                    h1[0] = 1024; /*1.0f in Q10*/
-                    move16();
-                    /*syn_filt( Aq+(3*(M+1)), M, h1, h1, L_FRAME/2, h1+(M+1), 0 );*/
-                    E_UTIL_synthesis( 1, Aq + ( 3 * ( M + 1 ) ), h1, h1, L_FRAME / 2, h1 + ( M + 1 ), 0, M );
-
-                    /*Compute tilt */
-                    /*rr0 = dotp( h1, h1, L_FRAME/2-1 ) + 0.1f;*/
-                    /*rr1 = dotp( h1, h1+1, L_FRAME/2-1 );*/
-                    /*tilt = rr1 / rr0;*/
-#ifdef BASOP_NOGLOB
-                    tilt = extract_h( L_shl_sat( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) ); /*Q15*/
-#else
-                    tilt = extract_h( L_shl( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) );
-#endif
-                    pitch_dist = 0;
-                    move16();
-                    L_mean_pitch = L_mult( pitch[0], 8192 /*1.0f in Q13*/ ); /*Q14*/
-                    FOR( k = 0; k < ( NB_SUBFR - 1 ); k++ )
-                    {
-                        pitch_dist = add( pitch_dist, abs_s( sub( pitch[k + 1], pitch[k] ) ) ); /*Q0*/
-                        L_mean_pitch = L_mac( L_mean_pitch, pitch[k + 1], 8192 );               /*Q14*/
-                    }
-                    /*pitch_dist /= (float)(NB_SUBFR-1);	*/
-                    pitch_dist = mult_r( shl( pitch_dist, 4 ), 10923 /*1/(float)(NB_SUBFR-1) in Q15*/ ); /*Q4*/
-                    /*mean_pitch /= (float)(NB_SUBFR);*/
-                    mean_pitch = extract_h( L_shl( L_mean_pitch, 4 ) ); /*Q4*/
-
-
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    IF( ( GT_16( tilt, 22938 ) ) &&                                                     /* HF resonnant filter */
-                        ( ( GT_16( pitch_dist, 8 << 4 ) ) || ( LT_16( mean_pitch, PIT_MIN << 4 ) ) ) && /* pitch unstable or very short      */
-                        ( ( prev_bfi ) || ( ( EQ_16( coder_type, GENERIC ) ) && ( EQ_16( LSF_Q_prediction, AUTO_REGRESSIVE ) ) ) ) )
-                    {
-                        /*if( enr_q > scaling * enr_old ){enr_q = scaling * enr_old;}*/
-#ifdef BASOP_NOGLOB
-                        L_enr_q = L_min( L_enr_q, L_shl_sat( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#else
-                        L_enr_q = L_min( L_enr_q, L_shl( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#endif
-                    }
-                    ELSE
-                    {
-                        ener_max = *lp_ener_FEC_max; /*Q0*/
-                        move32();
-                        test();
-                        if ( EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) )
-                        {
-                            ener_max = *lp_ener_FEC_av; /*Q0*/
-                            move32();
-                        }
-                        /*if( enr_old > ener_max )ener_max = enr_old;*/
-                        ener_max = L_max( ener_max, L_enr_old );
-
-                        /*if( enr_q > scaling * ener_max ){enr_q = scaling * ener_max;}*/
-#ifdef BASOP_NOGLOB
-                        L_enr_q = L_min( L_enr_q, L_shl_sat( Mult_32_16( ener_max, scaling ), 1 ) ); /* scaling in Q14*/
-#else
-                        L_enr_q = L_min( L_enr_q, L_shl( Mult_32_16( ener_max, scaling ), 1 ) );  /* scaling in Q14*/
-#endif
-                    }
-                }
-                /*gain2 = (float)sqrt( enr_q / enr2 );*/
-                L_enr_q = L_max( L_enr_q, 1 ); /* L_enr2 is in Q0 */
-                L_tmp = Sqrt_Ratio32( L_enr_q, 0, L_enr2, 0, &exp2 );
-                gain2 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-
-                /*-----------------------------------------------------------------*
-                 * Find the energy/gain at the beginning of the frame to ensure smooth transition after erasure(s)
-                 *-----------------------------------------------------------------*/
-
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                IF( ( ( GE_16( last_good, VOICED_TRANSITION ) && LT_16( last_good, INACTIVE_CLAS ) && ( clas == UNVOICED_CLAS || EQ_16( clas, INACTIVE_CLAS ) ) ) ||
-                      EQ_32( last_core_brate, SID_1k75 ) || EQ_32( last_core_brate, SID_2k40 ) || last_core_brate == FRAME_NO_DATA ) &&
-                    prev_bfi )
-                {
-                    /* voiced -> unvoiced signal transition */
-                    /* CNG -> active signal transition */
-                    gain1 = gain2; /*Q14*/
-                    move16();
-                }
-                ELSE
-                {
-                    /* find the energy at the beginning of the frame */
-                    frame_ener_fx( L_frame, clas, synth, pitch[0], &L_enr1 /*Q0*/, 1, Q_syn, 3, 0 );
-
-                    /*enr1 += 0.1f;*/
-                    L_enr1 = L_max( L_enr1, 1 ); /* L_enr1 is in Q0 */
-
-                    /*gain1 = (float)sqrt( enr_old / enr1 );*/
-                    L_tmp = Sqrt_Ratio32( L_enr_old, 0, L_enr1, 0, &exp2 );
-#ifdef BASOP_NOGLOB
-                    gain1 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                    gain1 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) );                           /* in Q14 */
-#endif
-
-                    /*if( gain1 > 1.2f )gain1 = 1.2f;*/
-                    /* prevent clipping */
-                    gain1 = s_min( gain1, 19661 /*1.2f in Q14*/ );
-
-                    /* prevent amplifying the unvoiced or inactive part of the frame in case an offset is followed by an onset */
-                    test();
-                    test();
-                    if ( EQ_16( clas, ONSET ) && GT_16( gain1, gain2 ) && prev_bfi )
-                    {
-                        gain1 = gain2; /*Q14*/
-                        move16();
-                    }
-                }
-
-                L_enr2 = L_enr_q; /*Q0*/
-                move32();         /* Set the end frame energy to the scaled energy, to be used in the lp_ener_FEC  */
-            }
-
-            /*------------------------------------------------------------------------------*
-             * Smooth the energy evolution by exponentially evolving from gain1 to gain2
-             *------------------------------------------------------------------------------*/
-
-            /*gain2 *= ( 1.0f - AGC );*/
-            L_tmp = L_mult( gain2, (Word16) ( 32768 /*Q15*/ - AGC_FX ) ); /*Q30*/
-            FOR( i = 0; i < L_frame; i++ )
-            {
-                /*gain1 = gain1 * AGC + gain2;*/
-                gain1 = mac_r( L_tmp, gain1, AGC_FX ); /* in Q14 */
-                /*exc[i] *= gain1;*/
-                exc[i] = mac_r( L_mult( exc[i], gain1 ), exc[i], gain1 );
-                move16();
-                /*exc2[i] *= gain1;*/
-#ifdef BASOP_NOGLOB
-                exc2[i] = mac_r_sat( L_mult( exc2[i], gain1 ), exc2[i], gain1 );
-#else
-                exc2[i] = mac_r( L_mult( exc2[i], gain1 ), exc2[i], gain1 );
-#endif
-                move16();
-            }
-            /* smoothing is done in excitation domain, so redo synthesis */
-            Copy( mem_tmp, mem_syn, M ); /* Q_syn */
-            syn_12k8_fx( L_frame, Aq, exc2, synth, mem_syn, 1, Q_exc, Q_syn );
-            *update_flg = 1;
-            move16();
-        }
-    }
-    ELSE
-    {
-        /* previous frame erased and no TC frame */
-        test();
-        IF( prev_bfi && NE_16( coder_type, TRANSITION ) )
-        {
-            IF( L_enr_q == 0 )
-            {
-                L_enr_q = L_max( 1, L_enr2 ); /* sets to 'L_enr2' in 1 clock */
-                set16_fx( h1, 0, L_FRAME / 2 );
-                h1[0] = 1024; /*1.0f in Q10*/
-                move16();
-                /*syn_filt( Aq+(3*(M+1)), M, h1, h1, L_FRAME/2, h1+(M+1), 0 );*/
-                E_UTIL_synthesis( 1, Aq + ( 3 * ( M + 1 ) ), h1, h1, L_FRAME / 2, h1 + ( M + 1 ), 0, M );
-                /*Compute tilt */
-                /*rr0 = dotp( h1, h1, L_FRAME/2-1 ) + 0.1f;*/
-                /*rr1 = dotp( h1, h1+1, L_FRAME/2-1 );*/
-                /*tilt = rr1 / rr0;*/
-#ifdef BASOP_NOGLOB
-                tilt = extract_h( L_shl_sat( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) ); /*Q15*/
-#else
-                tilt = extract_h( L_shl( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) );
-#endif
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                IF( ( ( ( EQ_32( total_brate, ACELP_13k20 ) ) || ( EQ_32( total_brate, ACELP_12k85 ) ) || ( EQ_32( total_brate, ACELP_12k15 ) ) || ( EQ_32( total_brate, ACELP_11k60 ) ) ||
-                        ( EQ_32( total_brate, ACELP_9k60 ) ) ) &&
-                      ( GT_16( tilt, 22938 ) ) &&                                               /* HF resonnant filter */
-                      ( ( ( clas == UNVOICED_CLAS ) ) || ( EQ_16( clas, INACTIVE_CLAS ) ) ) ) ) /* unvoiced classification */
-                {
-                    /*if( enr_q > scaling * enr_old )enr_q = scaling * enr_old;*/
-#ifdef BASOP_NOGLOB
-                    L_enr_q = L_min( L_enr_q, L_shl_sat( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#else
-                    L_enr_q = L_min( L_enr_q, L_shl( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#endif
-                }
-                ELSE IF( GE_16( last_good, VOICED_TRANSITION ) && LT_16( last_good, INACTIVE_CLAS ) && GE_16( clas, VOICED_TRANSITION ) && LT_16( clas, INACTIVE_CLAS ) )
-                {
-                    /* Voiced-voiced recovery */
-                    test();
-#ifdef BASOP_NOGLOB
-                    IF( *old_enr_LP != 0 && GT_16( enr_LP, shl_sat( *old_enr_LP, 1 ) ) )
-#else
-                    IF( *old_enr_LP != 0 && GT_16( enr_LP, shl( *old_enr_LP, 1 ) ) )
-#endif
-                    {
-                        /* enr_q /= enr_LP */
-                        exp = norm_l( L_enr_q );
-                        tmp = extract_h( L_shl( L_enr_q, exp ) );
-
-                        exp2 = norm_s( enr_LP );
-                        tmp2 = shl( enr_LP, exp2 );
-
-                        exp = sub( exp2, exp );
-
-                        tmp3 = sub( tmp, tmp2 );
-                        IF( tmp3 > 0 )
-                        {
-                            tmp = shr( tmp, 1 );
-                            exp = add( exp, 1 );
-                        }
-                        tmp = div_s( tmp, tmp2 );
-
-                        /* L_enr_q *= 2 * *old_enr_LP */
-                        L_enr_q = L_shl( L_mult( tmp, shl( *old_enr_LP, 1 ) ), exp );
-                    }
-
-                    ELSE
-                    {
-                        test();
-                        IF( avoid_lpc_burst_on_recovery && GT_16( enr_LP, 160 /*20.0f in Q3*/ ) )
-                        {
-                            exp = norm_s( enr_LP );
-                            tmp = shl( enr_LP, exp );
-
-                            exp2 = 7;
-                            move16();
-                            tmp2 = 160 << 7; /* 160 = 20.0f in Q3 */
-                            move16();
-                            exp = sub( exp2, exp );
-
-                            IF( GT_16( tmp, tmp2 ) )
-                            {
-                                tmp = shr( tmp, 1 );
-                                exp = add( exp, 1 );
-                            }
-                            tmp = div_s( tmp, tmp2 );                     /* tmp*2^exp = enr_LP/20.0 */
-                            L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp ); /* L_tmp*2^exp = sqrt(20.0/enr_LP) */
-                            L_enr_q = L_shl( Mpy_32_32( L_enr_q, L_tmp ), exp );
-                        }
-                    }
-                }
-
-                test();
-                test();
-                test();
-                test();
-                IF( ( GE_16( last_good, VOICED_TRANSITION ) && LT_16( last_good, INACTIVE_CLAS ) && GE_16( clas, VOICED_TRANSITION ) && LT_16( clas, INACTIVE_CLAS ) ) || force_scaling )
-                {
-
-                    IF( GT_32( L_enr_q, L_enr_old ) ) /* Prevent energy to increase on voiced */
-                    {
-                        L_enr_q = L_add( Mpy_32_16_1( L_enr_old, 32767 - SCLSYN_LAMBDA ), Mpy_32_16_1( L_enr_q, SCLSYN_LAMBDA ) ); /*Q0*/
-                    }
-                }
-            }
-
-            L_enr_q = L_max( 1, L_enr_q );
-
-            /* gain2 = (float)sqrt( enr_q / enr2 );*/
-            exp = norm_l( L_enr_q );
-            tmp = extract_h( L_shl( L_enr_q, exp ) );
-
-            exp2 = norm_l( L_enr2 );
-            tmp2 = extract_h( L_shl( L_enr2, exp2 ) );
-
-            exp2 = sub( exp, exp2 ); /* Denormalize and substract */
-
-            tmp3 = sub( tmp2, tmp );
-            IF( tmp3 > 0 )
-            {
-                tmp2 = shr( tmp2, 1 );
-                exp2 = add( exp2, 1 );
-            }
-
-            tmp = div_s( tmp2, tmp );
-
-            L_tmp = L_deposit_h( tmp );
-            L_tmp = Isqrt_lc( L_tmp, &exp2 );
-#ifdef BASOP_NOGLOB
-            gain2 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-            gain2 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) );     /* in Q14 */
-#endif
-            /*-----------------------------------------------------------------*
-             * Clipping of the smoothing gain at the frame end
-             *-----------------------------------------------------------------*/
-
-            gain2 = s_min( gain2, 19661 /*1.2f in Q14*/ ); /* Gain modification clipping */
-            if ( LT_32( L_enr_q, 2 ) )
-            {
-                gain2 = s_min( gain2, 16384 /*1.0f in Q14*/ ); /* Gain modification clipping */
-            }
-
-            /*-----------------------------------------------------------------*
-             * Find the energy/gain at the beginning of the frame to ensure smooth transition after erasure(s)
-             *-----------------------------------------------------------------*/
-
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( EQ_16( clas, SIN_ONSET ) ) /* slow increase */
-            {
-                gain1 = shr( gain2, 1 ); /*0.5f * gain2*/
-            }
-            /*------------------------------------------------------------*
-             * voiced->unvoiced transition recovery
-             *------------------------------------------------------------*/
-            ELSE IF( ( GE_16( last_good, VOICED_TRANSITION ) && LT_16( last_good, INACTIVE_CLAS ) && ( clas == UNVOICED_CLAS || EQ_16( clas, INACTIVE_CLAS ) ) ) || /* voiced->unvoiced transition recovery */
-                     EQ_32( last_core_brate, SID_1k75 ) || EQ_32( last_core_brate, SID_2k40 ) || last_core_brate == FRAME_NO_DATA )                                 /* CNG -> active signal transition */
-            {
-                gain1 = gain2; /*Q14*/
-                move16();
-            }
-            ELSE
-            {
-                /*--------------------------------------------------------*
-                 * Find the energy at the beginning of the frame
-                 *--------------------------------------------------------*/
-                tmp = frame_ener_fx( L_frame, clas, synth, pitch[0], &L_enr1, 0, Q_syn, 3, 0 );
-
-                /*gain1 = (float)sqrt( enr_old / enr1 );*/
-                exp = norm_l( L_enr_old );
-                tmp = extract_h( L_shl( L_enr_old, exp ) );
-                exp2 = norm_l( L_enr1 );
-                tmp2 = extract_h( L_shl( L_enr1, exp2 ) );
-
-                exp2 = sub( exp, exp2 ); /* Denormalize and substract */
-
-                tmp3 = sub( tmp2, tmp );
-
-                IF( tmp3 > 0 )
-                {
-                    tmp2 = shr( tmp2, 1 );
-                    exp2 = add( exp2, 1 );
-                }
-
-                tmp = div_s( tmp2, tmp );
-
-                L_tmp = L_deposit_h( tmp );
-                L_tmp = Isqrt_lc( L_tmp, &exp2 );
-#ifdef BASOP_NOGLOB
-                gain1 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                gain1 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#endif
-                /* exp2 is always <= 1 */
-
-                gain1 = s_min( gain1, 19661 /*1.2F in Q14*/ );
-
-                test();
-                test();
-                if ( avoid_lpc_burst_on_recovery && ( GT_16( enr_LP, 160 ) ) && ( LE_16( enr_LP, shl_sat( *old_enr_LP, 1 ) ) ) )
-                {
-                    gain1 = s_min( gain1, 16384 /*1.0f in Q14*/ );
-                }
-
-                /*--------------------------------------------------------*
-                 * Prevent a catastrophy in case of offset followed by onset
-                 *--------------------------------------------------------*/
-                test();
-                if ( ( EQ_16( clas, ONSET ) ) && ( GT_16( gain1, gain2 ) ) )
-                {
-                    gain1 = gain2; /*Q14*/
-                    move16();
-                }
-            }
-            /*-----------------------------------------------------------------*
-             * Smooth the energy evolution by exponentially evolving from
-             * gain1 to gain2
-             *-----------------------------------------------------------------*/
-
-            L_tmp = L_mult( gain2, (Word16) ( 32768 /*Q15*/ - AGC_FX ) );
-
-            FOR( i = 0; i < L_frame; i++ )
-            {
-                gain1 = mac_r( L_tmp, gain1, AGC_FX ); /* in Q14 */
-#ifdef BASOP_NOGLOB
-                exc[i] = mac_r_sat( L_mult_sat( exc[i], gain1 ), exc[i], gain1 );
-                move16();
-                exc2[i] = mac_r_sat( L_mult_sat( exc2[i], gain1 ), exc2[i], gain1 );
-#else
-                exc[i] = mac_r( L_mult( exc[i], gain1 ), exc[i], gain1 );
-                move16();
-                exc2[i] = mac_r( L_mult( exc2[i], gain1 ), exc2[i], gain1 );
-#endif
-                move16();
-            }
-
-            Copy( mem_tmp, mem_syn, M ); /* Q_syn */
-            syn_12k8_fx( L_frame, Aq, exc2, synth, mem_syn, 1, Q_exc, Q_syn );
-            *update_flg = 1;
-            move16();
-        }
-    }
-    /*-----------------------------------------------------------------*
-     * Update low-pass filtered energy for voiced frames
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    IF( !bfi && ( GE_16( clas, VOICED_TRANSITION ) && LT_16( clas, INACTIVE_CLAS ) ) )
-    {
-        IF( EQ_16( clas, VOICED_TRANSITION ) )
-        {
-            L_enr2_av = L_enr2; /*Q0*/
-            move32();
-            frame_ener_fx( L_frame, VOICED_CLAS, synth, pitch[sub( shr( L_frame, 6 ), 1 )], &L_ener2_max /*Q0*/, 1, Q_syn, 3, 0 );
-        }
-        ELSE
-        {
-            L_ener2_max = L_enr2; /*Q0*/
-            move32();
-            frame_ener_fx( L_frame, UNVOICED_CLAS, synth, pitch[sub( shr( L_frame, 6 ), 1 )], &L_enr2_av /*Q0*/, 1, Q_syn, 3, 0 );
-        }
-
-        /**lp_ener_FEC_av = 0.2f * enr2_av + 0.8f * *lp_ener_FEC_av;      move32();*/
-        *lp_ener_FEC_av = Madd_32_16( Mult_32_16( *lp_ener_FEC_av, 31130 /*0.95f in Q15*/ ), L_enr2_av, 1638 /*0.05F Q15*/ ); /*Q0*/
-        move32();
-        /**lp_ener_FEC_max = 0.2f * enr2_max + 0.8f * *lp_ener_FEC_max;      move32();*/
-        *lp_ener_FEC_max = Madd_32_16( Mult_32_16( *lp_ener_FEC_max, 31130 /*0.95f in Q15*/ ), L_ener2_max, 1638 /*0.05F Q15*/ ); /*Q0*/
-        move32();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Update the LP filter energy for voiced frames
-     *-----------------------------------------------------------------*/
-    test();
-    if ( GE_16( clas, VOICED_TRANSITION ) && LT_16( clas, INACTIVE_CLAS ) )
-    {
-        *old_enr_LP = enr_LP; /*Q3*/
-        move16();
-    }
-
-    return;
-}
-
-void FEC_scale_syn_ivas_fx(
-    const Word16 L_frame,          /* i  : length of the frame                     */
-    Word16 *update_flg,            /* o: flag indicating re-synthesis after scaling*/
-    Word16 clas,                   /* i/o: frame classification                    */
-    const Word16 last_good,        /* i:   last good frame classification          */
-    Word16 *synth,                 /* i/o: synthesized speech at Fs = 12k8 Hz      Q_syn*/
-    const Word16 *pitch,           /* i:   pitch values for each subframe          Q0*/
-    Word32 L_enr_old,              /* i:   energy at the end of previous frame     */
-    Word32 L_enr_q,                /* i:   transmitted energy for current frame    */
-    const Word16 coder_type,       /* i:   coder type                              */
-    const Word16 LSF_Q_prediction, /* i  : LSF prediction mode                     */
-    Word16 *scaling_flag,          /* i/o: flag to indicate energy control of syn  */
-    Word32 *lp_ener_FEC_av,        /* i/o: averaged voiced signal energy           Q0*/
-    Word32 *lp_ener_FEC_max,       /* i/o: averaged voiced signal energy           Q0*/
-    const Word16 bfi,              /* i:   current  frame BFI                      */
-    const Word32 total_brate,      /* i:   total bitrate                           */
-    const Word16 prev_bfi,         /* i:   previous frame BFI                      */
-    const Word32 last_core_brate,  /* i:   previous frame core bitrate             */
-    Word16 *exc,                   /* i/o: excitation signal without enhancement   */
-    Word16 *exc2,                  /* i/o: excitation signal with enhancement      */
-    Word16 Aq[],                   /* i/o: LP filter coefs (can be modified if BR) Q12*/
-    Word16 *old_enr_LP,            /* i/o: LP filter E of last good voiced frame   Q3*/
-    const Word16 *mem_tmp,         /* i:   temp. initial synthesis filter states   Q_syn*/
-    Word16 *mem_syn,               /* o:   initial synthesis filter states         Q_syn*/
-    Word16 Q_exc,
-    Word16 Q_syn,
-    const Word16 avoid_lpc_burst_on_recovery, /* i  : if true the excitation energy is limited if LP has big gain */
-    const Word16 force_scaling                /* i: force scaling                             */
-)
-{
-    Word16 i;
-    Word32 L_enr1, L_enr2;
-    Word16 gain1, gain2, enr_LP;
-    Word16 tmp, tmp2, exp, exp2;
-    Word16 tmp3;
-    Word32 L_tmp;
-    Word16 scaling;
-    Word32 ener_max, L_enr2_av, L_ener2_max;
-    Word16 h1[L_FRAME / 2], tilt, pitch_dist, mean_pitch;
-    Word16 k;
-    Word32 L_mean_pitch;
-
-    enr_LP = 0;
-    move16();
-    gain2 = 0;
-    move16();
-    gain1 = 0;
-    move16();
-    *update_flg = 0;
-    move16();
-    L_enr_old = L_max( 1, L_enr_old ); /* to avoid division by zero (*L_enr_old is always >= 0) */
-    scaling = 16384;
-    move16(); /* Q14*/
+    tmp = sub( 3, getScaleFactor16( synth, L_frame ) );
 
-    /*-----------------------------------------------------------------*
-     * Find the synthesis filter impulse response on voiced
-     *-----------------------------------------------------------------*/
     test();
-    IF( GE_16( clas, VOICED_TRANSITION ) && LT_16( clas, INACTIVE_CLAS ) )
-    {
-        IF( EQ_16( L_frame, L_FRAME ) )
-        {
-            enr_LP = Enr_1_Az_fx( Aq + ( NB_SUBFR - 1 ) * ( M + 1 ), L_SUBFR );
-        }
-        ELSE /* L_frame == L_FRAME16k */
-        {
-            enr_LP = Enr_1_Az_fx( Aq + ( NB_SUBFR16k - 1 ) * ( M + 1 ), L_SUBFR ); /*Q3*/
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Define when to scale the synthesis
-     *-----------------------------------------------------------------*/
-
-    IF( bfi )
-    {
-        *scaling_flag = 1;
-        move16(); /* Always check synthesis on bad frames */
-    }
-    ELSE IF( prev_bfi )
-    {
-        test();
-        IF( ( EQ_16( LSF_Q_prediction, AUTO_REGRESSIVE ) ) || ( EQ_16( LSF_Q_prediction, MOVING_AVERAGE ) ) )
-        {
-            *scaling_flag = 2;
-            move16(); /* Decoded LSFs affected  */
-        }
-        ELSE IF( NE_16( coder_type, TRANSITION ) )
-        {
-            *scaling_flag = 1;
-            move16(); /* SN, but not TC mode - LSF still affected by the interpolation */
-        }
-        ELSE
-        {
-            *scaling_flag = 0;
-            move16(); /* LSF still possibly affected due to interpolation */
-        }
-        scaling = 24576; /*1.5 Q14*/
-        move16();
-    }
-    ELSE
-    {
-        test();
-        IF( ( EQ_16( LSF_Q_prediction, AUTO_REGRESSIVE ) ) && ( EQ_16( *scaling_flag, 2 ) ) )
-        {
-            *scaling_flag = 2;
-            move16(); /* Continue with energy control till the end of AR prediction */
-        }
-        ELSE IF( *scaling_flag > 0 )
-        {
-            ( *scaling_flag ) = sub( *scaling_flag, 1 ); /* If scaling flag was equal to 2, add one control frame to account for the LSF interpolation */
-            move16();
-        }
-        scaling = 32767; /*2.0 Q14*/
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Find the energy/gain at the end of the frame
-     *-----------------------------------------------------------------*/
-    tmp = sub( 3, getScaleFactor16( synth, L_frame ) );
-    IF( tmp > 0 )
+    IF( tmp > 0 && GT_16( element_mode, EVS_MONO ) )
     {
         Word16 synth_tmp[L_FRAME16k];
         Copy_Scale_sig( synth, synth_tmp, L_frame, -tmp ); // Q_synth - tmp
@@ -815,11 +200,7 @@ void FEC_scale_syn_ivas_fx(
             {
                 /* gain2 = (float)sqrt( enr_old / enr2 );*/
                 L_tmp = Sqrt_Ratio32( L_enr_old, 0, L_enr2, 0, &exp2 );
-#ifdef BASOP_NOGLOB
                 gain2 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                gain2 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#endif
 
                 /*if( gain2 > 1.0f )gain2 = 1.0f;*/
                 gain2 = s_min( gain2, 16384 /*1.0f in Q14*/ ); /*Q14*/
@@ -832,11 +213,7 @@ void FEC_scale_syn_ivas_fx(
 
                 /*gain1 = (float)sqrt( enr_old / enr1 );*/
                 L_tmp = Sqrt_Ratio32( L_enr_old, 0, L_enr1, 0, &exp2 );
-#ifdef BASOP_NOGLOB
                 gain1 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                gain1 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#endif
 
                 /*if( gain1 > 1.0f )gain1 = 1.0f;*/
                 gain1 = s_min( gain1, 16384 /*1.0f in Q14*/ ); /*Q14*/
@@ -856,11 +233,7 @@ void FEC_scale_syn_ivas_fx(
                     /*rr0 = dotp( h1, h1, L_FRAME/2-1 ) + 0.1f;*/
                     /*rr1 = dotp( h1, h1+1, L_FRAME/2-1 );*/
                     /*tilt = rr1 / rr0;*/
-#ifdef BASOP_NOGLOB
                     tilt = extract_h( L_shl_sat( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) ); /*Q15*/
-#else
-                    tilt = extract_h( L_shl( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) );
-#endif
                     pitch_dist = 0;
                     move16();
                     L_mean_pitch = L_mult( pitch[0], 8192 ); /*Q14*/
@@ -886,11 +259,7 @@ void FEC_scale_syn_ivas_fx(
                         ( ( prev_bfi ) || ( ( EQ_16( coder_type, GENERIC ) ) && ( EQ_16( LSF_Q_prediction, AUTO_REGRESSIVE ) ) ) ) )
                     {
                         /*if( enr_q > scaling * enr_old ){enr_q = scaling * enr_old;}*/
-#ifdef BASOP_NOGLOB
                         L_enr_q = L_min( L_enr_q, L_shl_sat( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#else
-                        L_enr_q = L_min( L_enr_q, L_shl( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#endif
                     }
                     ELSE
                     {
@@ -906,11 +275,7 @@ void FEC_scale_syn_ivas_fx(
                         ener_max = L_max( ener_max, L_enr_old );
 
                         /*if( enr_q > scaling * ener_max ){enr_q = scaling * ener_max;}*/
-#ifdef BASOP_NOGLOB
                         L_enr_q = L_min( L_enr_q, L_shl_sat( Mult_32_16( ener_max, scaling ), 1 ) ); /* scaling in Q14*/
-#else
-                        L_enr_q = L_min( L_enr_q, L_shl( Mult_32_16( ener_max, scaling ), 1 ) );  /* scaling in Q14*/
-#endif
                     }
                 }
                 /*gain2 = (float)sqrt( enr_q / enr2 );*/
@@ -947,11 +312,7 @@ void FEC_scale_syn_ivas_fx(
 
                     /*gain1 = (float)sqrt( enr_old / enr1 );*/
                     L_tmp = Sqrt_Ratio32( L_enr_old, 0, L_enr1, 0, &exp2 );
-#ifdef BASOP_NOGLOB
                     gain1 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                    gain1 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) );                           /* in Q14 */
-#endif
 
                     /*if( gain1 > 1.2f )gain1 = 1.2f;*/
                     /* prevent clipping */
@@ -985,11 +346,7 @@ void FEC_scale_syn_ivas_fx(
                 exc[i] = mac_r( L_mult( exc[i], gain1 ), exc[i], gain1 );
                 move16();
                 /*exc2[i] *= gain1;*/
-#ifdef BASOP_NOGLOB
                 exc2[i] = mac_r_sat( L_mult( exc2[i], gain1 ), exc2[i], gain1 );
-#else
-                exc2[i] = mac_r( L_mult( exc2[i], gain1 ), exc2[i], gain1 );
-#endif
                 move16();
             }
             /* smoothing is done in excitation domain, so redo synthesis */
@@ -1017,11 +374,7 @@ void FEC_scale_syn_ivas_fx(
                 /*rr0 = dotp( h1, h1, L_FRAME/2-1 ) + 0.1f;*/
                 /*rr1 = dotp( h1, h1+1, L_FRAME/2-1 );*/
                 /*tilt = rr1 / rr0;*/
-#ifdef BASOP_NOGLOB
                 tilt = extract_h( L_shl_sat( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) ); /*Q15*/
-#else
-                tilt = extract_h( L_shl( get_gain( h1 + 1, h1, L_FRAME / 2 - 1 ), 15 ) );
-#endif
                 test();
                 test();
                 test();
@@ -1036,21 +389,13 @@ void FEC_scale_syn_ivas_fx(
                       ( ( ( clas == UNVOICED_CLAS ) ) || ( EQ_16( clas, INACTIVE_CLAS ) ) ) ) ) /* unvoiced classification */
                 {
                     /*if( enr_q > scaling * enr_old )enr_q = scaling * enr_old;*/
-#ifdef BASOP_NOGLOB
                     L_enr_q = L_min( L_enr_q, L_shl_sat( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#else
-                    L_enr_q = L_min( L_enr_q, L_shl( Mult_32_16( L_enr_old, scaling ), 1 ) ); /* scaling in Q14*/
-#endif
                 }
                 ELSE IF( GE_16( last_good, VOICED_TRANSITION ) && LT_16( last_good, INACTIVE_CLAS ) && GE_16( clas, VOICED_TRANSITION ) && LT_16( clas, INACTIVE_CLAS ) )
                 {
                     /* Voiced-voiced recovery */
                     test();
-#ifdef BASOP_NOGLOB
                     IF( *old_enr_LP != 0 && GT_16( enr_LP, shl_sat( *old_enr_LP, 1 ) ) )
-#else
-                    IF( *old_enr_LP != 0 && GT_16( enr_LP, shl( *old_enr_LP, 1 ) ) )
-#endif
                     {
                         /* enr_q /= enr_LP */
                         exp = norm_l( L_enr_q );
@@ -1135,11 +480,7 @@ void FEC_scale_syn_ivas_fx(
 
             L_tmp = L_deposit_h( tmp );
             L_tmp = Isqrt_lc( L_tmp, &exp2 );
-#ifdef BASOP_NOGLOB
             gain2 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-            gain2 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) );     /* in Q14 */
-#endif
             /*-----------------------------------------------------------------*
              * Clipping of the smoothing gain at the frame end
              *-----------------------------------------------------------------*/
@@ -1200,11 +541,7 @@ void FEC_scale_syn_ivas_fx(
 
                 L_tmp = L_deposit_h( tmp );
                 L_tmp = Isqrt_lc( L_tmp, &exp2 );
-#ifdef BASOP_NOGLOB
                 gain1 = round_fx_sat( L_shl_sat( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#else
-                gain1 = round_fx( L_shl( L_tmp, sub( exp2, 1 ) ) ); /* in Q14 */
-#endif
                 /* exp2 is always <= 1 */
 
                 gain1 = s_min( gain1, 19661 /*1.2f in Q14*/ ); /*Q14*/
@@ -1236,15 +573,9 @@ void FEC_scale_syn_ivas_fx(
             FOR( i = 0; i < L_frame; i++ )
             {
                 gain1 = mac_r( L_tmp, gain1, AGC_FX ); /* in Q14 */
-#ifdef BASOP_NOGLOB
                 exc[i] = mac_r_sat( L_mult_sat( exc[i], gain1 ), exc[i], gain1 );
                 move16();
                 exc2[i] = mac_r_sat( L_mult_sat( exc2[i], gain1 ), exc2[i], gain1 );
-#else
-                exc[i] = mac_r( L_mult( exc[i], gain1 ), exc[i], gain1 );
-                move16();
-                exc2[i] = mac_r( L_mult( exc2[i], gain1 ), exc2[i], gain1 );
-#endif
                 move16();
             }
 
diff --git a/lib_dec/LD_music_post_filter.c b/lib_dec/LD_music_post_filter.c
deleted file mode 100644
index b2b69cc4506ca9cbac64eb5e1b85bb3920c05818..0000000000000000000000000000000000000000
--- a/lib_dec/LD_music_post_filter.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/LD_music_post_filter_fx.c b/lib_dec/LD_music_post_filter_fx.c
index 04252087049f01e5d53724775d022d625c1d856c..5b48ab47225f7355d8f46111c86dd939b2fc7461 100644
--- a/lib_dec/LD_music_post_filter_fx.c
+++ b/lib_dec/LD_music_post_filter_fx.c
@@ -186,11 +186,7 @@ void LD_music_post_filter_fx(
         FOR( k = j; k < mfreq_bindiv_LD[i] + j; k++ )
         {
             /*m_ave += lf_E[k];*/
-#ifdef BASOP_NOGLOB
             Ltmp = L_add_o( lf_E[k], Ltmp, &Overflow ); /*2*Qdct+10*/
-#else
-            Ltmp = L_add( lf_E[k], Ltmp );
-#endif
             max_val = L_max( max_val, lf_E[k] );
         }
         Ltmp_max = L_max( Ltmp_max, max_val ); /*2*Qdct+10*/
@@ -364,27 +360,19 @@ void LD_music_post_filter_fx(
 
             FOR( ; i < BIN_2KHZ; i++ )
             {
-                tmp16 = s_min( max_ovf_2k, hMusicPF->filt_lfE_fx[i] ); /*Q12*/
-                tmp16 = s_max( min_g_2k, tmp16 );                      /*Q12*/
-                                                                       /*DCT_buf[i] *= ftmp;*/
-#ifdef BASOP_NOGLOB
+                tmp16 = s_min( max_ovf_2k, hMusicPF->filt_lfE_fx[i] );                    /*Q12*/
+                tmp16 = s_max( min_g_2k, tmp16 );                                         /*Q12*/
+                                                                                          /*DCT_buf[i] *= ftmp;*/
                 dtc_out[i] = round_fx_sat( L_shl_sat( L_mult( dtc_out[i], tmp16 ), 3 ) ); /*Q15*/
-#else
-                dtc_out[i] = round_fx( L_shl( L_mult( dtc_out[i], tmp16 ), 3 ) );
-#endif
                 move16();
             }
 
             FOR( ; i < BIN_4KHZ; i++ )
             {
-                tmp16 = s_min( max_ovf_4k, hMusicPF->filt_lfE_fx[i] ); /*Q12*/
-                tmp16 = s_max( min_g_4k, tmp16 );                      /*Q12*/
-                                                                       /*DCT_buf[i] *= ftmp;*/
-#ifdef BASOP_NOGLOB
+                tmp16 = s_min( max_ovf_4k, hMusicPF->filt_lfE_fx[i] );                        /*Q12*/
+                tmp16 = s_max( min_g_4k, tmp16 );                                             /*Q12*/
+                                                                                              /*DCT_buf[i] *= ftmp;*/
                 dtc_out[i] = round_fx_sat( L_shl_sat( L_mult_sat( dtc_out[i], tmp16 ), 3 ) ); /*Q15*/
-#else
-                dtc_out[i] = round_fx( L_shl( L_mult( dtc_out[i], tmp16 ), 3 ) );
-#endif
                 move16();
             }
 
@@ -394,14 +382,10 @@ void LD_music_post_filter_fx(
                 /* Do not modify HF when coded with GSC at LR, because the spectrum is just noise */
                 FOR( ; i < DCT_L_POST; i++ )
                 {
-                    tmp16 = s_min( max_ovf_6k, hMusicPF->filt_lfE_fx[i] ); /*Q12*/
-                    tmp16 = s_max( min_g_6k, tmp16 );                      /*Q12*/
-                                                                           /*DCT_buf[i] *= ftmp;*/
-#ifdef BASOP_NOGLOB
+                    tmp16 = s_min( max_ovf_6k, hMusicPF->filt_lfE_fx[i] );                        /*Q12*/
+                    tmp16 = s_max( min_g_6k, tmp16 );                                             /*Q12*/
+                                                                                                  /*DCT_buf[i] *= ftmp;*/
                     dtc_out[i] = round_fx_sat( L_shl_sat( L_mult_sat( dtc_out[i], tmp16 ), 3 ) ); /*Q15*/
-#else
-                    dtc_out[i] = round_fx( L_shl( L_mult( dtc_out[i], tmp16 ), 3 ) );
-#endif
                     move16();
                 }
             }
@@ -411,13 +395,9 @@ void LD_music_post_filter_fx(
             /* When unsure on content type only slight clean-up allowed, no overshoot allowed */
             FOR( ; i < DCT_L_POST; i++ )
             {
-                tmp16 = s_min( 4096 /*1.0f in Q12*/, hMusicPF->filt_lfE_fx[i] ); /*Q12*/
-                                                                                 /*DCT_buf[i] *= ftmp;*/
-#ifdef BASOP_NOGLOB
+                tmp16 = s_min( 4096 /*1.0f in Q12*/, hMusicPF->filt_lfE_fx[i] );              /*Q12*/
+                                                                                              /*DCT_buf[i] *= ftmp;*/
                 dtc_out[i] = round_fx_sat( L_shl_sat( L_mult_sat( dtc_out[i], tmp16 ), 3 ) ); /*Q15*/
-#else
-                dtc_out[i] = round_fx( L_shl( L_mult( dtc_out[i], tmp16 ), 3 ) );
-#endif
                 move16();
             }
         }
@@ -543,11 +523,7 @@ static void spectrum_mod_dct_fx(
 
     IF( music_flag != 0 ) /* prevent subtraction on clean speech */
     {
-#ifdef BASOP_NOGLOB
         IF( LE_32( maxNoise, L_shl_o( 10, scaling, &Overflow ) ) )
-#else
-        IF( LE_32( maxNoise, L_shl( 10, scaling ) ) )
-#endif
         {
             minE = 18432 / 2; /*Q14*/
             move16();
@@ -623,21 +599,12 @@ static void spectrum_mod_dct_fx(
 
                     Ltmp = L_mult( tmpN, m_binE ); /*2*Qdct+e_binE+9*/
                     e_binE = sub( add( e_tmp, e_binE ), 15 );
-#ifdef BASOP_NOGLOB
                     Ltmp = L_shr_o( Ltmp, e_binE, &Overflow );  /*2*Qdct+9*/
                     Lgain = L_add_o( Ltmp, Lshift, &Overflow ); /*Saturation can occure here result in Q30*/
-#else
-                    Ltmp = L_shr( Ltmp, e_binE );
-                    Lgain = L_add( Ltmp, Lshift ); /*Saturation can occure here result in Q30*/
-#endif
                 }
 
                 Lpt2++;
-#ifdef BASOP_NOGLOB
                 gain = round_fx_o( Lgain, &Overflow ); /*gain in Q30-16 = Q14*/
-#else
-                gain = round_fx( Lgain );          /*gain in Q30-16 = Q14*/
-#endif
                 /*if (gain < minE)gain = minE;*/
                 gain = s_max( gain, minE ); /*Q14*/
                 /*if (gain > 1.0f+MAX_GN)gain = 1.0f+MAX_GN;*/
@@ -661,14 +628,10 @@ static void spectrum_mod_dct_fx(
                 alpha = shl( sub( 16384 /*Q14*/, sqrt_gain ), 1 ); /*Q15*/
 
                 /**pt_gbin = gain + alpha * *pt_gbin;*/
-                Ltmp = L_mult( gain, 32767 /*Q15*/ );                  /*Q30*/
-                *pt_gbin = round_fx( L_mac( Ltmp, alpha, *pt_gbin ) ); /*Q14*/
-                                                                       /**pt++ *= *pt_gbin;*/
-#ifdef BASOP_NOGLOB
+                Ltmp = L_mult( gain, 32767 /*Q15*/ );                          /*Q30*/
+                *pt_gbin = round_fx( L_mac( Ltmp, alpha, *pt_gbin ) );         /*Q14*/
+                                                                               /**pt++ *= *pt_gbin;*/
                 *pt = round_fx_sat( L_shl_sat( L_mult( *pt, *pt_gbin ), 1 ) ); /*Qdct*/
-#else
-                *pt = round_fx( L_shl( L_mult( *pt, *pt_gbin ), 1 ) );
-#endif
                 move16();
                 move16();
                 pt++;
@@ -774,11 +737,7 @@ static void find_enr_dct_fx(
         {
             /* energy  */
             /**ptE = *ptR * *ptR;           */
-#ifdef BASOP_NOGLOB
             Ltmp = L_mult_sat( *ptR, *ptR ); /*2*Qdct+1*/
-#else
-            Ltmp = L_mult( *ptR, *ptR );
-#endif
             /* normalization */
             /**ptE *= 1.0f / (DCT_L_POST);*/
             Ltmp = Mult_32_16( Ltmp, 26214 ); /*26214 = 1.0/640 ->Q15+9 --> 2*Q_dct + 10*/
@@ -787,11 +746,7 @@ static void find_enr_dct_fx(
             move32();
 
             /*band[i] += *ptE++;*/
-#ifdef BASOP_NOGLOB
             Ltmp1 = L_add_sat( Ltmp, Ltmp1 ); /*2*Q_dct + 10*/
-#else
-            Ltmp1 = L_add( Ltmp, Ltmp1 );
-#endif
 
             ptE++;
             ptR++;
@@ -812,11 +767,7 @@ static void find_enr_dct_fx(
     FOR( i = min_band; i <= NB_LIMIT_BAND; i++ )
     {
         /* total channel energy */
-#ifdef BASOP_NOGLOB
         Ltmp = L_add_sat( band[i], Ltmp ); /* 2*Q_dct + 10*/
-#else
-        Ltmp = L_add( band[i], Ltmp );
-#endif
     }
 
     *Etot = Ltmp; /* 2*Q_dct + 10*/
@@ -965,11 +916,7 @@ static Word16 norm_lfe(
         exp3 = sub( exp2, 12 + 16 - 3 ); /* if exp2 < 31, means that tmp >= 1.0 */
         /* Need to shl by 3 to take into account the 3 multiplications */
     }
-#ifdef BASOP_NOGLOB
     tmp16 = shl_o( tmp16, exp3, &Overflow ); /* Result in Q12 */
-#else
-    tmp16 = shl( tmp16, exp3 ); /* Result in Q12 */
-#endif
 
     return tmp16;
 }
diff --git a/lib_dec/TonalComponentDetection.c b/lib_dec/TonalComponentDetection.c
deleted file mode 100644
index 040d4569daf24e167a6e355e26da5e8284ea5779..0000000000000000000000000000000000000000
--- a/lib_dec/TonalComponentDetection.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#define _USE_MATH_DEFINES
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "stat_com.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
diff --git a/lib_dec/TonalComponentDetection_fx.c b/lib_dec/TonalComponentDetection_fx.c
index b555eff8e7ae98691f576fd38dc9927c192562e8..409b975f5c18312785f64650e5bfda0631cb6d75 100644
--- a/lib_dec/TonalComponentDetection_fx.c
+++ b/lib_dec/TonalComponentDetection_fx.c
@@ -20,13 +20,17 @@
 static void calcPseudoSpec( const Word32 *mdctSpec, const Word16 mdctSpec_exp, const Word16 nSamples, Word16 floorPowerSpectrum, Word32 *powerSpec, Word16 *powerSpec_exp );
 static void getEnvelope( const Word16 nSamples, const Word32 *powerSpec, Word16 F0, Word32 *envelope, Word32 *smoothedSpectrum );
 static void GetF0( Word16 const nSamples, Word16 const nSamplesCore, Word32 const *const powerSpectrum, Word32 const pitchLag, Word16 *const pOrigF0, Word16 *const pF0 );
+static void ivas_GetF0_fx( Word16 const nSamples, Word16 const nSamplesCore, Word32 const *const powerSpectrum, Word32 const pitchLag, Word16 *const pOrigF0, Word16 *const pF0 );
 static void findStrongestHarmonics( const Word16 nSamples, const Word32 *powerSpectrum, const Word16 F0, const Word16 nTotalHarmonics, Word16 *pHarmonicIndexes, Word16 *pnHarmonics );
 static void CorrectF0( const Word16 *pHarmonicIndexes, const Word16 nHarmonics, Word16 *pF0 );
+static void ivas_CorrectF0_fx( const Word16 *pHarmonicIndexes, const Word16 nHarmonics, Word16 *pF0 );
 static void findCandidates( const Word16 nSamples, const Word32 *MDCTSpectrum, const Word16 MDCTSpectrum_exp, Word16 *thresholdModificationNew, Word16 floorPowerSpectrum );
 static void modifyThreshold( Word16 i, Word16 F0, Word16 threshold, Word16 *thresholdModification );
 static void modifyThresholds( Word16 F0, Word16 origF0, Word16 *thresholdModification );
 static void RefineThresholdsUsingPitch( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, Word16 *pF0, Word16 *thresholdModification );
+static void ivas_RefineThresholdsUsingPitch_fx( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, Word16 *pF0, Word16 *thresholdModification );
 static void findTonalComponents( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, Word16 F0, Word16 *thresholdModification, Word16 element_mode );
+static void ivas_findTonalComponents_fx( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, const Word16 powerSpectrum_e, Word16 F0, Word16 *thresholdModification, Word16 element_mode );
 
 /*-------------------------------------------------------------------*
  * DetectTonalComponents()
@@ -49,7 +53,8 @@ void ivas_DetectTonalComponents_fx(
     const Word16 scaleFactors[],
     const Word16 scaleFactors_exp[],
     const Word16 scaleFactors_max_e,
-    const Word32 secondLastPowerSpectrum[], /*Qx*/
+    const Word32 secondLastPowerSpectrum[], /*Q31-secondLastPowerSpectrum_e*/
+    const Word16 secondLastPowerSpectrum_e,
     const Word16 nSamples,
     const Word16 nSamplesCore,
     Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  Q0*/
@@ -71,13 +76,11 @@ void ivas_DetectTonalComponents_fx(
         pScaledMdctSpectrum[i] = L_shl( lastMDCTSpectrum[i], 16 ); /*15-lastMDCTSpectrum_exp+16 -> 31 - lastMDCTSpectrum_exp*/
         move32();
     }
-#ifdef MSAN_FIX
     FOR( Word16 i = 0; i < FDNS_NPTS; i++ )
     {
         sns_int_scf_fx[i] = L_shl_sat( scaleFactors[i], add( 1, scaleFactors_exp[i] ) ); // Q16
         move32();
     }
-#endif
     IF( psychParamsCurrent == NULL )
     {
         nBands = FDNS_NPTS;
@@ -89,12 +92,6 @@ void ivas_DetectTonalComponents_fx(
     }
     ELSE
     {
-#ifndef MSAN_FIX
-        FOR( Word16 i = 0; i < FDNS_NPTS; i++ )
-        {
-            sns_int_scf_fx[i] = L_shl( scaleFactors[i], add( 1, scaleFactors_exp[i] ) ); // Q16
-        }
-#endif
         q_pScaledMdctSpectrum = sub( 31, lastMDCTSpectrum_exp );
         sns_shape_spectrum_fx( pScaledMdctSpectrum, &q_pScaledMdctSpectrum, psychParamsCurrent, sns_int_scf_fx, 16, nSamplesCore, NULL );
         q_pScaledMdctSpectrum = add( q_pScaledMdctSpectrum, 1 );
@@ -121,10 +118,10 @@ void ivas_DetectTonalComponents_fx(
     findCandidates( nSamples, pScaledMdctSpectrum, lastMDCTSpect_exp, thresholdModification, floorPowerSpectrum );
 
     /* Refine peak candidates using the pitch information */
-    RefineThresholdsUsingPitch( nSamples, nSamplesCore, secondLastPowerSpectrum, lastPitchLag, currentPitchLag, &F0, thresholdModification );
+    ivas_RefineThresholdsUsingPitch_fx( nSamples, nSamplesCore, secondLastPowerSpectrum, lastPitchLag, currentPitchLag, &F0, thresholdModification );
 
     /* Find peaks in the second last frame */
-    findTonalComponents( indexOfTonalPeak, lowerIndex, upperIndex, pNumIndexes, nSamples, secondLastPowerSpectrum, F0, thresholdModification, element_mode );
+    ivas_findTonalComponents_fx( indexOfTonalPeak, lowerIndex, upperIndex, pNumIndexes, nSamples, secondLastPowerSpectrum, secondLastPowerSpectrum_e, F0, thresholdModification, element_mode );
 }
 
 void DetectTonalComponents(
@@ -143,33 +140,13 @@ void DetectTonalComponents(
     const Word16 nSamples,
     const Word16 nSamplesCore,
     Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  Q0*/
-    Word16 element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
-)
+    Word16 element_mode )
 {
     Word16 F0;
     Word16 thresholdModification[L_FRAME_MAX], lastMDCTSpect_exp;
     Word32 pScaledMdctSpectrum[L_FRAME_MAX];
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    Word16 nBands;
-    IF( psychParamsCurrent == NULL )
-    {
-        nBands = FDNS_NPTS;
-        PMT( "add nBands argument to mdct_shaping_16" )
-#endif
 
-        mdct_shaping_16( lastMDCTSpectrum, nSamplesCore, nSamples, scaleFactors, scaleFactors_exp, scaleFactors_max_e, pScaledMdctSpectrum );
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    }
-    ELSE
-    {
-        sns_shape_spectrum( pScaledMdctSpectrum, psychParamsCurrent, scaleFactors, nSamplesCore );
-        nBands = psychParamsCurrent->nBands;
-    }
-#endif
+    mdct_shaping_16( lastMDCTSpectrum, nSamplesCore, nSamples, scaleFactors, scaleFactors_exp, scaleFactors_max_e, pScaledMdctSpectrum );
 
     lastMDCTSpect_exp = add( lastMDCTSpectrum_exp, scaleFactors_max_e );
 
@@ -211,12 +188,7 @@ void RefineTonalComponents(
     const Word16 nSamples,
     const Word16 nSamplesCore,
     const Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  Q0*/
-    Word16 element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
-)
+    Word16 element_mode )
 {
     Word16 newIndexOfTonalPeak[MAX_NUMBER_OF_IDX]; /*Q0*/
     Word16 newLowerIndex[MAX_NUMBER_OF_IDX];       /*Q0*/
@@ -227,12 +199,7 @@ void RefineTonalComponents(
 
 
     DetectTonalComponents( newIndexOfTonalPeak, newLowerIndex, newUpperIndex, &newNumIndexes, lastPitchLag, currentPitchLag, lastMDCTSpectrum,
-                           lastMDCTSpectrum_exp, scaleFactors, scaleFactors_exp, scaleFactors_max_e, secondLastPowerSpectrum, nSamples, nSamplesCore, floorPowerSpectrum, element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-                           ,
-                           psychParamsCurrent
-#endif
-    );
+                           lastMDCTSpectrum_exp, scaleFactors, scaleFactors_exp, scaleFactors_max_e, secondLastPowerSpectrum, nSamples, nSamplesCore, floorPowerSpectrum, element_mode );
 
     nPreservedPeaks = 0;
     move16();
@@ -303,7 +270,8 @@ void ivas_RefineTonalComponents_fx(
     const Word16 scaleFactors[],
     const Word16 scaleFactors_exp[],
     const Word16 scaleFactors_max_e,
-    const Word32 secondLastPowerSpectrum[], /*Qx*/
+    const Word32 secondLastPowerSpectrum[], /*Q31-secondLastPowerSpectrum_e*/
+    const Word16 secondLastPowerSpectrum_e,
     const Word16 nSamples,
     const Word16 nSamplesCore,
     const Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins  Q0*/
@@ -319,7 +287,7 @@ void ivas_RefineTonalComponents_fx(
 
 
     ivas_DetectTonalComponents_fx( newIndexOfTonalPeak, newLowerIndex, newUpperIndex, &newNumIndexes, lastPitchLag, currentPitchLag, lastMDCTSpectrum,
-                                   lastMDCTSpectrum_exp, scaleFactors, scaleFactors_exp, scaleFactors_max_e, secondLastPowerSpectrum, nSamples, nSamplesCore, floorPowerSpectrum,
+                                   lastMDCTSpectrum_exp, scaleFactors, scaleFactors_exp, scaleFactors_max_e, secondLastPowerSpectrum, secondLastPowerSpectrum_e, nSamples, nSamplesCore, floorPowerSpectrum,
                                    psychParamsCurrent, element_mode );
 
     nPreservedPeaks = 0;
@@ -491,11 +459,7 @@ static void getEnvelope(
     /* No need for PTR_INIT for powerSpec[i+n2] as we continue from the previous loop */
     FOR( i = 0; i < n1; i++ )
     {
-#ifdef BASOP_NOGLOB
-        sum = L_add_sat( sum, powerSpec[i + n2] ); /*powerSpec_exp*/
-#else
-        sum = L_add( sum, powerSpec[i + n2] );
-#endif
+        sum = L_add_sat( sum, powerSpec[i + n2] );                     /*powerSpec_exp*/
         tmp = Mpy_32_16_1( sum /*Q31,powerSpec_exp*/, level /*Q12*/ ); /*Q28,powerSpec_exp*/
         envelope[i] /*Q28,powerSpec_exp*/ = Mpy_32_16_1( tmp /*Q28,powerSpec_exp*/, InvIntTable[i + nSecondHalfFilterLength] /*Q15*/ );
         move32();
@@ -504,12 +468,8 @@ static void getEnvelope(
     inv_len = mult_r( level, InvIntTable[nFilterLength] ); /*Q12*/
     FOR( i = n1; i < nSamples - n2; i++ )
     {
-#ifdef BASOP_NOGLOB
         sum = L_add_sat( sum, L_sub( powerSpec[i + n2], powerSpec[i - n1] ) ); /*powerSpec_exp*/
-#else
-        sum = L_add( sum, L_sub( powerSpec[i + n2], powerSpec[i - n1] ) );
-#endif
-        envelope[i] = Mpy_32_16_1( sum, inv_len ); /*Q28*/
+        envelope[i] = Mpy_32_16_1( sum, inv_len );                             /*Q28*/
         move32();
     }
 
@@ -593,6 +553,65 @@ static void GetF0(
     return;
 }
 
+static void ivas_GetF0_fx(
+    Word16 /*short*/ const nSamples,     /*i   -  Q0 */
+    Word16 /*short*/ const nSamplesCore, /*i   -  Q0 */
+    Word32 /*int*/ const *const powerSpectrum,
+    /*i   -  Qx */                   /*is justed handed over and given back*/
+    Word32 /*int*/ const pitchLag,   /*i   -  Q16*/
+    Word16 /*short*/ *const pOrigF0, /*o   -  Q10*/
+    Word16 /*short*/ *const pF0 )    /*o   -  Q10*/
+{
+    Word16 /*short*/ tmpPitchLag;
+    Word16 /*short*/ rgiStrongHarmonics[MAX_PEAKS_FROM_PITCH]; /*Q0*/
+    Word16 /*short*/ nTotalHarmonics, nStrongHarmonics;
+    Word16 tmp;
+
+
+    assert( LAST_HARMONIC_POS_TO_CHECK <= nSamplesCore );
+
+    /* Use only F0 >= 100 Hz */
+    test();
+    IF( ( pitchLag > 0 ) && ( LE_16( round_fx( pitchLag ), shr( nSamplesCore, 1 ) ) ) )
+    {
+
+        tmpPitchLag                             /*"halfPitchLag" in FLC - read as Q5 for comparison to halfpitchlag Q4*/
+            = round_fx( L_shl( pitchLag, 4 ) ); /*no division by 2, will be done in following division -
+                                           furthermore, do a leftshift before rounding, to preserve more accuracy -
+                                           will be accommodated also in following division*/
+
+        /**pF0 = nSamplesCore/tmpPitchLag;*/
+        BASOP_Util_Divide_MantExp( nSamplesCore, 0, tmpPitchLag, -( 1 /*division by 2*/ + 4 /*accommodate accuracy-prevention-leftshift*/ ), pF0, &tmp ); /*pF0 is Q15*/
+        move16();
+        *pF0 = shr_sat( *pF0, sub( 5, tmp ) ); /*Q10 without scalingfactor*/
+        move16();
+        *pOrigF0 = *pF0; /*Q10*/
+        move16();
+        tmp = 2 * LAST_HARMONIC_POS_TO_CHECK;
+        if ( LT_16( nSamples, 2 * LAST_HARMONIC_POS_TO_CHECK ) )
+        {
+            move16();
+            tmp = nSamples;
+        }
+        BASOP_Util_Divide_MantExp( tmp, 15, *pF0, 5, &nTotalHarmonics, &tmp );
+        nTotalHarmonics = shl( nTotalHarmonics, sub( tmp, 15 ) );
+
+
+        /* Get in rgiStrongHarmonics all i for which i*F0 are the strongest harmonics */
+        findStrongestHarmonics( nSamples, powerSpectrum, *pF0, nTotalHarmonics, rgiStrongHarmonics, &nStrongHarmonics );
+
+        ivas_CorrectF0_fx( rgiStrongHarmonics, nStrongHarmonics, pF0 );
+    }
+    ELSE
+    {
+        move16();
+        move16();
+        *pF0 = 0;
+        *pOrigF0 = 0;
+    }
+    return;
+}
+
 
 static void findStrongestHarmonics(
     const Word16 nSamples,
@@ -691,15 +710,159 @@ static void CorrectF0(
 
     Word16 tmp;
 
-#ifdef IVAS_CODE
+    F0 = *pF0; /*Q10*/
+
+    test();
+    IF( F0 > 0 && nHarmonics != 0 )
+    {
+        tmp = sub( nHarmonics, 1 );
+        FOR( i = 0; i < tmp; i++ )
+        {
+            diff[i] = sub( pHarmonicIndexes[i + 1], pHarmonicIndexes[i] ); /*Q0*/
+            move16();
+            sortedDiff[i] = diff[i]; /*Q0*/
+            move16();
+        }
+        sort_fx( sortedDiff, 0, sub( nHarmonics, 1 + 1 ) );
+        iMostCommonDiff = sortedDiff[0]; /*Q0*/
+        move16();
+        nSameDiff = 1;
+        move16();
+        i = 1;
+        move16();
+        IF( EQ_16( imult1616( sortedDiff[0], pHarmonicIndexes[0] ), 1 ) )
+        {
+            /* Find how many distances between peaks have length 1 */
+            FOR( ; i < tmp; i++ )
+            {
+                if ( EQ_16( sortedDiff[i], 1 ) )
+                {
+                    nSameDiff = add( nSameDiff, 1 );
+                }
+            }
+        }
+        nMostCommonDiff = nSameDiff; /*Q0*/
+        move16();
+
+        /* If there are at least 3 distances between peaks with length 1 and if the 1st harmonic is in pHarmonicIndexes then keep the original F0 */
+        /* Otherwise find the most common distance between peaks */
+        IF( LT_16( nSameDiff, 3 ) )
+        {
+            /* Find the most common difference */
+            FOR( i = nSameDiff; i < tmp; i++ )
+            {
+                IF( EQ_16( sortedDiff[i], sortedDiff[i - 1] ) )
+                {
+                    nSameDiff = add( nSameDiff, 1 );
+                }
+                ELSE
+                {
+                    IF( GT_16( nSameDiff, nMostCommonDiff ) )
+                    {
+                        nMostCommonDiff = nSameDiff; /*Q0*/
+                        move16();
+                        iMostCommonDiff = sortedDiff[i - 1]; /*Q0*/
+                        move16();
+                    }
+                    ELSE
+                    {
+                        test();
+                        IF( EQ_16( nSameDiff, nMostCommonDiff ) && GT_16( abs_s( sub( iMostCommonDiff, pHarmonicIndexes[0] ) ), abs_s( sub( sortedDiff[i - 1], pHarmonicIndexes[0] ) ) ) )
+                        {
+                            nMostCommonDiff = nSameDiff; /*Q0*/
+                            move16();
+                            iMostCommonDiff = sortedDiff[i - 1]; /*Q0*/
+                            move16();
+                        }
+                    }
+                    nSameDiff = 1;
+                    move16();
+                }
+            }
+            IF( GT_16( nSameDiff, nMostCommonDiff ) )
+            {
+                nMostCommonDiff = nSameDiff; /*Q0*/
+                move16();
+                iMostCommonDiff = sortedDiff[nHarmonics - 2]; /*Q0*/
+                move16();
+            }
+        }
+
+        /* If there are enough peaks at the same distance */
+        IF( GE_16( nMostCommonDiff, MAX_PEAKS_FROM_PITCH / 2 ) )
+        {
+            iMult = 1;
+            move16();
+            FOR( i = 0; i < tmp; i++ )
+            {
+                IF( EQ_16( diff[i], iMostCommonDiff ) )
+                {
+                    iMult = pHarmonicIndexes[i]; /*Q0*/
+                    move16();
+                    BREAK;
+                }
+                /* for rare cases of octave mismatch or missing harmonics */
+                test();
+                test();
+                IF( GT_16( sub( nHarmonics, 2 ), i ) && ( EQ_16( diff[i], diff[i + 1] ) ) && ( EQ_16( add( diff[i], diff[i + 1] ), iMostCommonDiff ) ) )
+                {
+                    iMult = pHarmonicIndexes[i]; /*Q0*/
+                    move16();
+                    BREAK;
+                }
+            }
+
+            /* If the real F0 is much higher than the original F0 from the pitch */
+
+            IF( LE_16( iMult, 3 ) )
+            {
+                /* Use iMostCommonDiff, because the lowest pHarmonicIndexes[i] (which is equal to iMult) may not correspond to the new F0, but to it's multiple */
+                F0 = round_fx_sat( L_shl_sat( L_mult( iMostCommonDiff /*Q0*/, F0 /*Q10*/ ), 15 ) ); /*Q10*/
+            }
+            ELSE
+            {
+                F0 = 0;
+                move16();
+            }
+        }
+        /* Otherwise if there are at least 3 distances between peaks with length 1 and if the 1st harmonic is in pHarmonicIndexes then keep the original F0 */
+        /* Otherwise don't use F0 */
+        ELSE
+        {
+            test();
+            if ( ( GT_16( iMostCommonDiff, 1 ) ) || ( LT_16( nMostCommonDiff, 3 ) ) )
+            {
+                /* Not enough peaks at the same distance => don't use the pitch. */
+                F0 = 0;
+                move16();
+            }
+        }
+        *pF0 = F0;
+        move16();
+    }
+    return;
+}
+
+static void ivas_CorrectF0_fx(
+    const Word16 /*short*/ *pHarmonicIndexes, /*I    - Q0  */
+    const Word16 /*short*/ nHarmonics,        /*I    - Q0  */
+    Word16 /*short*/ *pF0 )                   /*I/O  - Q10 range: {0}, [4..18) */
+{
+    Word16 /*short*/ i;
+    Word16 /*short*/ F0;
+    Word16 /*short*/ diff[MAX_PEAKS_FROM_PITCH - 1], sortedDiff[MAX_PEAKS_FROM_PITCH - 1]; /*Q0*/
+    Word16 /*short*/ iMostCommonDiff, nMostCommonDiff, nSameDiff, iMult;                   /*Q0*/
+
+    Word16 tmp;
+
     FOR( i = 0; i < MAX_PEAKS_FROM_PITCH - 1; i++ )
     {
         diff[i] = 0;
         sortedDiff[i] = 0;
-        move16));
-        move16));
+        move16();
+        move16();
     }
-#endif
+
     F0 = *pF0; /*Q10*/
 
     test();
@@ -1073,6 +1236,210 @@ static void RefineThresholdsUsingPitch(
     return;
 }
 
+static void ivas_findTonalComponents_fx(
+    Word16 *indexOfTonalPeak,    /* OUT Q0*/
+    Word16 *lowerIndex,          /* OUT Q0*/
+    Word16 *upperIndex,          /* OUT Q0*/
+    Word16 *numIndexes,          /* OUT Q0*/
+    Word16 nSamples,             /* IN */
+    const Word32 *powerSpectrum, /* IN Q31-powerSpectrum_e*/
+    const Word16 powerSpectrum_e,
+    Word16 F0,                     /* IN */
+    Word16 *thresholdModification, /* IN Q10*/
+    Word16 element_mode )          /* IN */
+{
+    Word32 envelope[L_FRAME_MAX];         /*powerSpec_exp + LEVEL_EXP*/
+    Word32 smoothedSpectrum[L_FRAME_MAX]; /*powerSpec_exp + LEVEL_EXP*/
+    Word16 nrOfFIS;
+    Word16 upperIdx, lowerIdx, lowerBound;
+    Word16 k, j, m;
+    Word32 biggerNeighbor;
+    Word16 tmp_loop1, tmp_loop2, tmp_loop3;
+
+    getEnvelope( nSamples, powerSpectrum, F0, envelope, smoothedSpectrum );
+
+
+    nrOfFIS = 0;
+    move16();
+    lowerBound = 0;
+    move16();
+
+    k = GROUP_LENGTH / 2;
+    move16();
+    tmp_loop1 = sub( nSamples, ( GROUP_LENGTH - GROUP_LENGTH / 2 ) );
+    tmp_loop2 = sub( nSamples, 1 );
+    WHILE( LE_16( k, tmp_loop1 ) )
+    {
+        Word64 mult_64 = W_mult_32_16( envelope[k], thresholdModification[k] ); // (Q31-(powerSpectrum_e+LEVEL_EXP))+1+10
+        Word16 lshift = W_norm( mult_64 );
+        Word32 mult_32 = W_extract_h( W_shl( mult_64, lshift ) ); //(Q31-(powerSpectrum_e+LEVEL_EXP) + lshift )+11 -32
+        Word16 mult_exp = sub( Q31, sub( add( sub( Q31, add( powerSpectrum_e, LEVEL_EXP ) ), add( 10, lshift ) ), 31 ) );
+        Word16 flag = BASOP_Util_Cmp_Mant32Exp( smoothedSpectrum[k], ( powerSpectrum_e + LEVEL_EXP ), mult_32, mult_exp );
+        /* There is 3 bits headroom in envelope and max of thresholdModification is 16384, so shifting left for 4 would produce overflow only when the result is anyhow close to 1 */
+        IF( EQ_16( flag, 1 ) )
+        {
+            /* The check that bin at k is bigger than bins at k-1 and k+1 is needed to avoid deadlocks when the thresholds are low. */
+            /* It removes some true peaks, especially if non weighted sum is used for the smoothed spectrum. */
+            biggerNeighbor = L_max( powerSpectrum[k - 1], powerSpectrum[k + 1] ); /*Qx*/
+
+            IF( GE_32( powerSpectrum[k], biggerNeighbor ) )
+            {
+                /* Find the right foot */
+                upperIdx = add( k, 1 );
+                WHILE( LT_16( upperIdx, tmp_loop2 ) )
+                {
+                    IF( LT_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx + 1] ) )
+                    {
+                        /* Side lobes may increase for certain amount */
+                        IF( LT_32( L_shl( Mpy_32_16_1( powerSpectrum[upperIdx], ALLOWED_SIDE_LOBE_FLUCTUATION ), ALLOWED_SIDE_LOBE_FLUCTUATION_EXP ), powerSpectrum[upperIdx + 1] ) )
+                        {
+                            BREAK;
+                        }
+                        /* Check for further decrease after a side lobe increase */
+                        FOR( j = add( upperIdx, 1 ); j < tmp_loop2; j++ )
+                        {
+                            IF( LT_32( powerSpectrum[j], L_shl( Mpy_32_16_1( powerSpectrum[j + 1], ALLOWED_SIDE_LOBE_FLUCTUATION ), ALLOWED_SIDE_LOBE_FLUCTUATION_EXP ) ) )
+                            {
+                                BREAK;
+                            }
+                        }
+                        /* Side lobe increase must be 2 times smaller than the decrease to the foot */
+                        /* Eq. to 2.0f*powerSpectrum[lowerIdx-1]/powerSpectrum[lowerIdx] > powerSpectrum[lowerIdx]/powerSpectrum[j] */
+                        test();
+                        test();
+                        test();
+                        IF( ( EQ_16( element_mode, EVS_MONO ) && GT_32( Mpy_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), Mpy_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) ) ||
+                            ( NE_16( element_mode, EVS_MONO ) && ( GT_64( W_mult_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), W_mult_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) ) ) )
+                        {
+                            BREAK;
+                        }
+                        upperIdx = sub( j, 1 );
+                    }
+                    upperIdx = add( upperIdx, 1 );
+                }
+                /* left foot */
+                lowerIdx = sub( k, 1 );
+                WHILE( GT_16( lowerIdx, lowerBound ) )
+                {
+                    IF( LT_32( powerSpectrum[lowerIdx], powerSpectrum[lowerIdx - 1] ) )
+                    {
+                        /* Side lobes may increase for certain amount */
+                        IF( LT_32( L_shl( Mpy_32_16_1( powerSpectrum[lowerIdx], ALLOWED_SIDE_LOBE_FLUCTUATION ), ALLOWED_SIDE_LOBE_FLUCTUATION_EXP ), powerSpectrum[lowerIdx - 1] ) )
+                        {
+                            BREAK;
+                        }
+                        /* Check for further decrease after a side lobe increase */
+                        FOR( j = sub( lowerIdx, 1 ); j > 0; j-- )
+                        {
+                            IF( LT_32( powerSpectrum[j], L_shl( Mpy_32_16_1( powerSpectrum[j - 1], ALLOWED_SIDE_LOBE_FLUCTUATION ), ALLOWED_SIDE_LOBE_FLUCTUATION_EXP ) ) )
+                            {
+                                BREAK;
+                            }
+                        }
+                        /* Side lobe increase must be 2 times smaller than the decrease to the foot */
+                        /* Eq. to 2.0f*powerSpectrum[lowerIdx-1]/powerSpectrum[lowerIdx] > powerSpectrum[lowerIdx]/powerSpectrum[j] */
+                        IF( GT_32( Mpy_32_32( L_shl( powerSpectrum[lowerIdx - 1], 1 ), powerSpectrum[j] ), Mpy_32_32( powerSpectrum[lowerIdx], powerSpectrum[lowerIdx] ) ) )
+                        {
+                            BREAK;
+                        }
+                        lowerIdx = add( j, 1 );
+                    }
+                    lowerIdx = sub( lowerIdx, 1 );
+                }
+
+                lowerBound = upperIdx;
+                move16();
+
+                /* Check if there is a bigger peak up to the next peak foot */
+                tmp_loop3 = s_min( upperIdx, tmp_loop1 );
+                FOR( j = s_max( GROUP_LENGTH / 2, lowerIdx ); j <= tmp_loop3; j++ )
+                {
+                    if ( GT_32( powerSpectrum[j], powerSpectrum[k] ) )
+                    {
+
+                        k = j;
+                        move16();
+                    }
+                }
+
+                assert( ( nrOfFIS == 0 ) || ( indexOfTonalPeak[nrOfFIS - 1] < k ) );
+
+                lowerIndex[nrOfFIS] = sub( k, GROUP_LENGTH / 2 );
+                move16();
+
+                upperIndex[nrOfFIS] = add( k, ( GROUP_LENGTH - GROUP_LENGTH / 2 - 1 ) );
+                move16();
+
+                test();
+                IF( ( nrOfFIS > 0 ) && ( LE_16( lowerIndex[nrOfFIS], upperIndex[nrOfFIS - 1] ) ) )
+                {
+                    m = shr( add( k, indexOfTonalPeak[nrOfFIS - 1] ), 1 );
+                    upperIndex[nrOfFIS - 1] = m;
+                    move16();
+                    lowerIndex[nrOfFIS] = add( m, 1 );
+                    move16();
+                }
+
+                indexOfTonalPeak[nrOfFIS++] = k;
+                move16();
+
+                IF( EQ_16( nrOfFIS, MAX_NUMBER_OF_IDX ) )
+                {
+                    BREAK;
+                }
+                /* Jump to the next foot of the peak. */
+                k = upperIdx;
+                move16();
+            }
+        }
+        k = add( k, 1 );
+    }
+
+    *numIndexes = nrOfFIS;
+    move16();
+    return;
+}
+
+
+static void ivas_RefineThresholdsUsingPitch_fx(
+    const Word16 nSamples,
+    const Word16 nSamplesCore,
+    const Word32 powerSpectrum[], /*Qx*/
+    const Word32 lastPitchLag,    /*Qx*/
+    const Word32 currentPitchLag, /*Qx*/
+    Word16 *pF0,                  /*Q10*/
+    Word16 *thresholdModification /*Q10*/
+)
+{
+    Word16 pitchIsStable;
+    Word16 origF0;
+    Word32 L_tmp;
+
+    /*pitchIsStable = (fabs(lastPitchLag-currentPitchLag) < 0.25f);*/
+    pitchIsStable = 0;
+    move16();
+    L_tmp = L_abs( L_sub( lastPitchLag, currentPitchLag ) );
+    if ( LT_32( L_tmp, 16384l /*0.25f Q16*/ ) )
+    {
+        pitchIsStable = 1;
+        move16();
+    }
+
+    IF( pitchIsStable )
+    {
+        ivas_GetF0_fx( nSamples,
+                       nSamplesCore,
+                       powerSpectrum, lastPitchLag, &origF0, pF0 );
+
+        modifyThresholds( *pF0, origF0, thresholdModification );
+    }
+    ELSE
+    {
+        *pF0 = 0;
+        move16();
+    }
+    return;
+}
 static void findTonalComponents(
     Word16 *indexOfTonalPeak,      /* OUT Q0*/
     Word16 *lowerIndex,            /* OUT Q0*/
diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c
deleted file mode 100644
index 5350d6dbccc02b25f54c41761456798faa12ca11..0000000000000000000000000000000000000000
--- a/lib_dec/acelp_core_dec.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-
-#include <stdint.h>
-#include <assert.h>
-#include <math.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/acelp_core_dec_fx.c b/lib_dec/acelp_core_dec_fx.c
index a41a0c813ebf50cb2a41d9fa92dcc0e33e414b91..2fff712f931c660f6a6c0724fd164b92bc8ac994 100644
--- a/lib_dec/acelp_core_dec_fx.c
+++ b/lib_dec/acelp_core_dec_fx.c
@@ -1,219 +1,233 @@
+/******************************************************************************************************
+
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+   contributors to this repository. All Rights Reserved.
+
+   This software is protected by copyright law and by international treaties.
+   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
+   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+   contributors to this repository retain full ownership rights in their respective contributions in
+   the software. This notice grants no license of any kind, including but not limited to patent
+   license, nor is any license granted by implication, estoppel or otherwise.
+
+   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
+   contributions.
+
+   This software is provided "AS IS", without any express or implied warranties. The software is in the
+   development stage. It is intended exclusively for experts who have experience with such software and
+   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
+   and fitness for a particular purpose are hereby disclaimed and excluded.
+
+   Any dispute, controversy or claim arising under or in relation to providing this software shall be
+   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
+   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
+   the United Nations Convention on Contracts on the International Sales of Goods.
+
+*******************************************************************************************************/
+
 /*====================================================================================
-    EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
+    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
   ====================================================================================*/
-
 #include <stdint.h>
 #include <assert.h>
-#include "options.h" /* Compilation switches                   */
-#include "rom_com.h" /* Static table prototypes                */
-#include "prot_fx.h" /* Function prototypes                    */
+#include <math.h>
+#include "options.h"
+#include "cnst.h"
+#include "rom_com.h"
+#include "prot_fx.h"
+#include "ivas_cnst.h"
+#include "ivas_rom_com.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "ivas_cnst.h" /* Common constants                       */
-#include "cnst.h"      /* Common constants                       */
-/*==========================================================================*/
-/* FUNCTION      : void acelp_core_dec_fx ()                                */
-/*--------------------------------------------------------------------------*/
-/* PURPOSE       :  ACELP core decoder                                      */
-/*--------------------------------------------------------------------------*/
-/* INPUT ARGUMENTS  :                                                       */
-/*  _ Word16 coder_type        i  : coder type                           */
-
-/*--------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :                                                       */
-/*   _ Word16 *voice_factors      o  : voicing factors      Q15             */
-/*   _ Word16 old_syn_12k8_16k[]  o  : intermediate ACELP    Q_syn2-1       */
-/*          synthesis at 12.8kHz or 16kHz to be used by SWB BWE             */
-/*   _ Word16 synth_out[]         o  : synthesis        Q_syn2-1            */
-/*--------------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS :                                                 */
-/*   _ Decoder_State_fx *st_fx:                                             */
-/*   _ Word16 bwe_exc_extended[]       i/o: bandwidth extended excitation Q0*/
-/*--------------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :                                                       */
-/*           _ None                                                         */
-/*--------------------------------------------------------------------------*/
-/* CALLED FROM : RX                                                         */
-/*==========================================================================*/
+
+
+/*-------------------------------------------------------------------*
+ * acelp_core_dec_fx()
+ *
+ * ACELP core decoder
+ *-------------------------------------------------------------------*/
 
 ivas_error acelp_core_dec_fx(
-    Decoder_State *st_fx,      /* i/o: decoder state structure                     */
-    Word16 output[],           /* o  : synthesis @internal Fs                      */
-    Word16 synth_out[],        /* o  : synthesis                                   Q_syn2-1*/
-    Word16 save_hb_synth[],    /* o  : HB synthesis                                */
-    Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation               Q0*/
-    Word16 *voice_factors,     /* o  : voicing factors                            Q15 */
-    Word16 old_syn_12k8_16k[], /* o  : intermediate ACELP synthesis for SWB BWE    Q_syn2-1*/
-    Word16 sharpFlag,
-    Word16 pitch_buf_fx[NB_SUBFR16k],    /* o  : floating pitch for each subframe          Q6*/
-    Word16 *unbits,                      /* o  : number of unused bits                       */
-    Word16 *sid_bw,                      /* o  : 0-NB/WB, 1-SWB SID                          */
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle                    */
-    const Word16 tdm_lspQ_PCh[M],        /* i  : Q LSPs for primary channel                  */
-    const Word16 tdm_lsfQ_PCh[M],        /* i  : Q LSFs for primary channel                  */
-    const Word16 use_cldfb_for_dft,      /* i  : flag to use of CLDFB for DFT Stereo         */
-    const Word16 last_element_mode,      /* i  : last element mode                           */
-    const Word32 last_element_brate,     /* i  : last element bitrate                        */
-    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel              */
-    const Word16 nchan_out,              /* i  : number of output channels                   */
-    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : stereo CNG handle                           */
-    const Word16 read_sid_info           /* i  : read SID info flag                          */
+    Decoder_State *st,                   /* i/o: decoder state structure                                                 */
+    Word16 output_fx[],                  /* o  : synthesis @internal Fs                                                  Q_syn*/
+    Word16 synth_fx16[],                 /* o  : synthesis                                                               Q_syn2*/
+    Word16 save_hb_synth_fx16[],         /* o  : HB synthesis                                                            Q0*/
+    Word32 bwe_exc_extended_fx[],        /* i/o: bandwidth extended excitation                                           2*Q_exc*/
+    Word16 *voice_factors_fx,            /* o  : voicing factors                                                         Q15*/
+    Word16 old_syn_12k8_16k_fx[],        /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE  Q_syn2-1*/
+    const Word16 sharpFlag,              /* i  : formant sharpening flag                                                 */
+    Word16 pitch_buf_fx[NB_SUBFR16k],    /* o  : Word16 pitch for each subframe                                        Q6*/
+    Word16 *unbits,                      /* o  : number of unused bits                                                   */
+    Word16 *sid_bw,                      /* o  : 0-NB/WB, 1-SWB SID                                                      */
+    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle                                                Qlog2(2.56)*/
+    const Word16 tdm_lspQ_PCh_fx[M],     /* i  : Q LSPs for primary channel                                              Q15*/
+    const Word16 tdm_lsfQ_PCh_fx[M],     /* i  : Q LSFs for primary channel                                              */
+    const Word16 use_cldfb_for_dft,      /* i  : flag to use of CLDFB for DFT Stereo                                     */
+    const Word16 last_element_mode,      /* i  : last element mode                                                       */
+    const Word32 last_element_brate,     /* i  : last element bitrate                                                    */
+    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel                                          */
+    const Word16 nchan_out,              /* i  : number of output channels                                               */
+    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : stereo CNG handle                                                       */
+    const Word16 read_sid_info           /* i  : read SID info flag                                                      */
 )
 {
-    Word16 old_exc_fx[L_EXC_DEC] = { 0 }, *exc_fx;     /* excitation signal buffer (Q0)         */
-    Word16 syn_fx_tmp[L_FRAME_16k + L_SUBFR], *syn_fx; /* synthesis signal buffer                  */
-    Word16 temp_buf[L_FRAME16k + L_SYN_MEM];
-    Word16 output_frame;  /* frame length at output sampling freq. */
-    Word16 mem_tmp_fx[M]; /* temporary synthesis filter memory     */
-    Word32 enr_q_fx;      /* E information for FER protection      */
-    Word16 tmp_noise_fx;  /* Long term temporary noise energy      */
-    Word16 i, int_fs;
-    Word16 tc_subfr_fx;
-    Word16 allow_cn_step_fx;
+    Word32 synth_fx[960], save_hb_synth_fx[960] /*, bwe_exc_extended_fx[L_FRAME32k + NL_BUFF_OFFSET]*/;
+    Word16 old_exc_fx[L_EXC_DEC], *exc_fx;                                           /* excitation signal buffer              */
+    Word16 syn_tmp_fx[L_FRAME16k + L_SUBFR], *psyn_fx;                               /* synthesis signal buffer               */
+    Word16 output_frame;                                                             /* frame length at output sampling freq. */
+    Word16 lsf_new_fx[M];                                                            /* LSFs at the end of the frame  Qlog2(2.56)        */
+    Word16 lsp_new_fx[M];                                                            /* LSPs at the end of the frame    Q15   */
+    Word16 lsp_mid_fx[M];                                                            /* LSPs in the middle of the frame       */
+    Word16 Aq_fx[NB_SUBFR16k * ( M + 1 )];                                           /* A(q) quantized for the 4 subframes    */
+    Word16 old_exc2_fx[L_FRAME16k + L_EXC_MEM], *exc2_fx;                            /* total excitation buffer               */
+    Word16 mem_tmp_fx[M];                                                            /* temporary synthesis filter memory     */
+    Word32 enr_q_fx;                                                                 /* E information for FER protection      */
+    Word16 tmp_noise_fx;                                                             /* Long term temporary noise energy      */
+    Word16 Es_pred_fx;                                                               /* predicted scaled innov. energy Q8     */
+    Word16 FEC_pitch_fx;                                                             /* FEC pitch                             */
+    Word16 old_bwe_exc_fx[( ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 )]; /* excitation buffer                     */
+    Word16 *bwe_exc_fx;                                                              /* Excitation for SWB TBE                */
+    Word16 i, j, int_fs;
+    Word16 tc_subfr;
+    Word16 allow_cn_step;
     Word16 temp_buf_fx[L_FRAME16k + L_SYN_MEM];
-
-    Word16 Aq_fx[NB_SUBFR16k * ( M + 1 )] = { 0 };                                           /*Q12*/
-    Word16 Es_pred_fx;                                                                       /*Q8*/
-    Word16 old_bwe_exc_fx[( ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 )] = { 0 }; /* excitation buffer Q_exc*/
-    Word16 old_exc2_fx[L_FRAME16k + L_EXC_MEM], *exc2_fx;                                    /* total excitation buffer               */
-    Word16 *bwe_exc_fx;
-    Word16 lsf_new_fx[M]; /* LSFs at the end of the frame    */
-    Word16 lsp_new_fx[M]; /* LSPs at the end of the frame    */
-    Word16 lsp_mid_fx[M]; /* LSPs in the middle of the frame */
-    Word16 FEC_pitch_fx;  /*Q6*/
     Word16 last_pulse_pos;
     Word16 T0_tmp;
-    Word16 do_WI_fx;
+    Word16 do_WI;
     Word16 dct_buffer_fx[DCT_L_POST];
     Word16 exc_buffer_fx[DCT_L_POST];
-    Word16 dct_exc_tmp[L_FRAME16k];
-    Word16 qdct;
-    Word16 delta_mem_scale;
-    Word16 bpf_error_signal[L_FRAME16k];
-    CLDFB_SCALE_FACTOR scaleFactor;
-    Word32 workBuffer[128 * 3];
-    Word32 q_env[20];
-    Word16 exc3_fx[L_FRAME16k];
-    Word16 syn1_fx_tmp[L_FRAME16k + 2], *syn1_fx;
-    Word32 *realBuffer[CLDFB_NO_COL_MAX], *imagBuffer[CLDFB_NO_COL_MAX];
-    Word16 gain_buf[NB_SUBFR16k]; /*Q14*/
+    Word16 dct_exc_tmp_fx[L_FRAME16k];
+    Word16 nb_bits; /* number of bits                       */
+    Word16 indice;  /* parameter indices to write           */
+    Word16 gain_buf_fx[NB_SUBFR16k];
     Word16 syn_fx_tmp2[L_FRAME_16k];
     Word16 pitch_buf_tmp[NB_SUBFR16k];
-    Word16 k;
     Word16 update_flg;
-    Word32 realBufferTmp[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-    Word32 imagBufferTmp[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-    Word16 LSF_Q_prediction; /* o  : LSF prediction mode                 */
+    Word32 q_env_fx[20];
+    Word16 exc3_fx[L_FRAME16k];
+    Word16 syn1_tmp_fx[L_FRAME16k + 2], *syn1_fx;
+    Word32 *realBuffer_fx[CLDFB_NO_COL_MAX], *imagBuffer_fx[CLDFB_NO_COL_MAX];
+    Word32 realBufferTmp_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
+    Word32 imagBufferTmp_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
+    Word16 LSF_Q_prediction; /* LSF prediction mode                  */
     Word16 avoid_lpc_burst_on_recovery;
-    Word16 uc_two_stage_flag, dec;
-    Word16 nb_bits, indice;
+    Word16 tmpF_fx;
+    Word16 uc_two_stage_flag;
     Word16 tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag;
-#ifdef ADD_LRTD
-    Word16 *p_tdm_Pri_pitch_buf;
-#endif
-    MUSIC_POSTFILT_HANDLE hMusicPF;
-    BPF_DEC_HANDLE hBPF;
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    FD_BWE_DEC_HANDLE hBWE_FD;
-    TCX_DEC_HANDLE hTcxDec;
+    Word16 *old_exc_s_fx; /* Start of last excitation frame       */
+    Word16 *p_tdm_Pri_pitch_buf_fx;
+    Word16 tmp, exp, local_element_mode;
     ivas_error error;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
-    (void) ( tdm_lspQ_PCh );
-    (void) ( tdm_lsfQ_PCh );
-    (void) ( use_cldfb_for_dft );
-    (void) ( last_element_mode );
-    (void) ( last_element_brate );
-    (void) ( flag_sec_CNA );
-    (void) ( nchan_out );
-    (void) ( save_hb_synth );
-    (void) ( output );
-    (void) ( read_sid_info );
-    (void) hStereoCng;
-#endif
-    hMusicPF = st_fx->hMusicPF;
-    hBPF = st_fx->hBPF;
-    hBWE_TD = st_fx->hBWE_TD;
-    hBWE_FD = st_fx->hBWE_FD;
-    hTcxDec = st_fx->hTcxDec;
+    Word32 bpf_error_signal_fx[L_FRAME16k];
+    Word16 bpf_error_signal_16fx[L_FRAME16k];
+    Word16 Q_real;
+    Word32 max_real, max_imag, max_val;
+
+    set32_fx( bpf_error_signal_fx, 0, L_FRAME16k );
+    set16_fx( bpf_error_signal_16fx, 0, L_FRAME16k );
+    set16_fx( Aq_fx, 0, NB_SUBFR16k * ( M + 1 ) );
+    set16_fx( old_bwe_exc_fx, 0, ( ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 ) );
+
     error = IVAS_ERR_OK;
     move32();
-    // IF ( EQ_16(st_fx->element_mode, IVAS_CPE_MDCT) && EQ_16(nchan_out, 1) && EQ_16(st_fx->idchan, 1) && LE_32(last_element_brate, IVAS_SID_4k4) )
+
     test();
     test();
     test();
-    IF( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && EQ_16( nchan_out, 1 ) && EQ_16( st_fx->idchan, 1 ) && LE_32( last_element_brate, IVAS_SID_5k2 ) )
+    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( nchan_out, 1 ) && EQ_16( st->idchan, 1 ) && LE_32( last_element_brate, IVAS_SID_5k2 ) )
     {
         /* In MDCT-Stereo DTX with mono output, we can skip CNG for the second channel, except for the first inactive frame following an active period */
         return error;
     }
 
+    push_wmops( "acelp_core_dec" );
 
-#ifdef IVAS_CODE
-    output_frame = (int16_t) ( st->output_Fs / FRAMES_PER_SEC );
+    /* output_frame = (int16_t) ( st->output_Fs / FRAMES_PER_SEC ); */
+    output_frame = extract_l( Mpy_32_32( st->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );
 
     /*----------------------------------------------------------------*
      * stereo SID and CNG frames processing
      *----------------------------------------------------------------*/
 
-    if ( st->core_brate <= SID_2k40 && st->element_mode == IVAS_CPE_DFT && nchan_out == 2 )
+    test();
+    test();
+    IF( LE_32( st->core_brate, SID_2k40 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) && EQ_16( nchan_out, 2 ) )
     {
-        if ( st->cng_type == FD_CNG )
+        IF( EQ_16( st->cng_type, FD_CNG ) )
         {
             configureFdCngDec_fx( st->hFdCngDec, st->bwidth, ACELP_14k25, st->L_frame, st->last_L_frame, st->element_mode );
 
+            Word16 old_NoiseEstExp;
+            old_NoiseEstExp = st->hFdCngDec->hFdCngCom->sidNoiseEstExp;
+            move16();
+
             /* Only run parameter decoding in SID frames */
-            if ( st->core_brate == SID_2k40 )
+            IF( EQ_32( st->core_brate, SID_2k40 ) )
             {
-                FdCng_decodeSID_fx( st );
+                FdCng_decodeSID_ivas_fx( st );
+
+                Word16 n1, n2;
+                n1 = L_norm_arr( st->hFdCngDec->hFdCngCom->sidNoiseEst, NPART );
+                n2 = L_norm_arr( st->hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART );
+
+                Word16 common_e = s_max( sub( old_NoiseEstExp, n2 ), sub( st->hFdCngDec->hFdCngCom->sidNoiseEstExp, n1 ) );
+                scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEst, NPART, sub( st->hFdCngDec->hFdCngCom->sidNoiseEstExp, common_e ) );
+                scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART, sub( old_NoiseEstExp, common_e ) );
+                st->hFdCngDec->hFdCngCom->sidNoiseEstExp = common_e;
+                move16();
             }
 
-            for ( i = 0; i < NPART; i++ )
+            FOR( i = 0; i < NPART; i++ )
             {
-                st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] = STEREO_DFT_FD_FILT * st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] + ( 1 - STEREO_DFT_FD_FILT ) * st->hFdCngDec->hFdCngCom->sidNoiseEst[i];
+                st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] = Madd_32_32( Mpy_32_32( STEREO_DFT_FD_FILT_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] ),
+                                                                         STEREO_DFT_FD_FILT_COMP_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEst[i] );
+                move32();
             }
 
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-            ApplyFdCng_fx( NULL, NULL, NULL, NULL, st, 0, 0 );
-#else
-            ApplyFdCng_fx( NULL, NULL, NULL, NULL, st, 0, 0 );
-#endif
+            ApplyFdCng_fx( NULL, 0, NULL, 0, NULL, NULL, NULL, st, 0, 0 );
         }
-        else
+        ELSE
         {
             configureFdCngDec_fx( st->hFdCngDec, st->bwidth, ACELP_14k25, st->L_frame, st->last_L_frame, st->element_mode );
 
             /* decode CNG parameters */
-            CNG_dec( st, last_element_mode, Aq, lsp_new, lsf_new, &allow_cn_step, sid_bw, q_env );
+            CNG_dec_fx( st, last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step, sid_bw, q_env_fx );
 
             /* comfort noise generation */
-            CNG_exc( st->core_brate, st->L_frame, &st->hTdCngDec->Enew, &st->hTdCngDec->cng_seed, NULL, NULL, &st->lp_ener, st->last_core_brate, &st->first_CNG, &( st->hTdCngDec->cng_ener_seed ), NULL, allow_cn_step, &st->hTdCngDec->last_allow_cn_step, st->hTdCngDec->num_ho, q_env, st->hTdCngDec->lp_env, st->hTdCngDec->old_env, st->hTdCngDec->exc_mem, st->hTdCngDec->exc_mem1, sid_bw, &st->hTdCngDec->cng_ener_seed1, NULL, st->Opt_AMR_WB, st->element_mode );
+            CNG_exc_fx( st->core_brate, st->L_frame, &st->hTdCngDec->Enew_fx, &st->hTdCngDec->cng_seed, NULL, NULL, &st->lp_ener_fx, st->last_core_brate, &st->first_CNG, &( st->hTdCngDec->cng_ener_seed ), NULL, allow_cn_step, &st->hTdCngDec->last_allow_cn_step, st->prev_Q_exc, st->Q_exc, st->hTdCngDec->num_ho, q_env_fx, st->hTdCngDec->lp_env_fx, st->hTdCngDec->old_env_fx, st->hTdCngDec->exc_mem_fx, st->hTdCngDec->exc_mem1_fx, sid_bw, &st->hTdCngDec->cng_ener_seed1, NULL, st->Opt_AMR_WB, st->element_mode );
 
-            mvr2r( Aq, st->Aq_cng, M + 1 );
+            Copy( Aq_fx, st->Aq_cng, M + 1 ); /*Q12*/
 
             /* update old LSP and LSF vector */
-            mvr2r( lsf_new, st->lsf_old, M );
-            mvr2r( lsp_new, st->lsp_old, M );
+            Copy( lsf_new_fx, st->lsf_old_fx, M ); /*Qlog2(2.56)*/
+            Copy( lsp_new_fx, st->lsp_old_fx, M ); /*Q15*/
         }
 
-        set_f( output, 0, output_frame ); /* output and synth are not used in DFT domain CNG generation and the decoder output is unaffected if they are left uninitalized */
-        set_f( synth, 0, output_frame );  /* They are however read in a few places which causes errors in the valgrind tests. Simplest solution from a code perspective was to set them to zero. */
+        set16_fx( output_fx, 0, output_frame );  /* output and synth are not used in DFT domain CNG generation and the decoder output is unaffected if they are left uninitalized */
+        set16_fx( synth_fx16, 0, output_frame ); /* They are however read in a few places which causes errors in the valgrind tests. Simplest solution from a code perspective was to set them to zero. */
 
         /* CN generation done in DFT domain */
-        wmops_sub_end();
+        pop_wmops();
+
         return error;
     }
 
     /*----------------------------------------------------------------*
      * Active frames processing
      *----------------------------------------------------------------*/
-#endif
+
+    /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */
     FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
     {
-        set32_fx( realBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
-        set32_fx( imagBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
-        realBuffer[i] = realBufferTmp[i];
-        move32();
-        imagBuffer[i] = imagBufferTmp[i];
-        move32();
+        set32_fx( realBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
+        set32_fx( imagBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
+        realBuffer_fx[i] = realBufferTmp_fx[i];
+        imagBuffer_fx[i] = imagBufferTmp_fx[i];
     }
 
     /*----------------------------------------------------------------*
@@ -222,60 +236,61 @@ ivas_error acelp_core_dec_fx(
 
     LSF_Q_prediction = -1;
     move16();
-    set16_fx( syn_fx_tmp, 0, L_SUBFR );
-    syn_fx = syn_fx_tmp + L_SUBFR;
-    syn1_fx_tmp[0] = 0;
-    move16();
-    syn1_fx_tmp[1] = 0;
+    set16_fx( syn_tmp_fx, 0, L_SUBFR );
+    psyn_fx = syn_tmp_fx + L_SUBFR;
+    syn1_tmp_fx[0] = 0;
     move16();
-    syn1_fx = syn1_fx_tmp + 2;
-    /*output_frame = (Word16)(st_fx->output_Fs_fx / 50); move16();*/
-    output_frame = st_fx->output_frame_fx;
+    syn1_tmp_fx[1] = 0;
     move16();
-    st_fx->bpf_off = 0;
+    syn1_fx = syn1_tmp_fx + 2;
+    st->bpf_off = 0;
     move16();
+
     test();
     test();
     test();
     test();
     test();
     test();
-    IF( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && LE_32( st_fx->last_core_brate, SID_2k40 ) ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && LE_32( st_fx->last_core_brate, SID_2k40 ) ) )
+    IF( EQ_16( st->last_core, HQ_CORE ) || EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && LE_32( st->last_core_brate, SID_2k40 ) ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && LE_32( st->last_core_brate, SID_2k40 ) ) )
     {
         /* in case of HQ->ACELP switching, do not apply BPF */
-        st_fx->bpf_off = 1;
+        st->bpf_off = 1;
         move16();
-        /* in case of core switching, reset post-filter memories */
-        if ( st_fx->hPFstat != NULL )
+        if ( st->hPFstat != NULL )
         {
-            st_fx->hPFstat->on = 0;
+            /* in case of core switching, reset post-filter memories */
+            st->hPFstat->on = 0;
             move16();
         }
 
-        /* reset the GSC pre echo energy threshold in case of switching */
-        if ( st_fx->hGSCDec != NULL )
+        if ( st->hGSCDec != NULL )
         {
-            st_fx->hGSCDec->Last_frame_ener_fx = MAX_32;
+            /* reset the GSC pre echo energy threshold in case of switching */
+            st->hGSCDec->Last_frame_ener_fx = MAX_32;
             move32();
         }
     }
-    IF( st_fx->prev_bfi > 0 )
+
+    test();
+    if ( st->hGSCDec != NULL && ( st->prev_bfi > 0 ) )
     {
         /* reset the GSC pre echo energy threshold in case of FEC */
-        if ( st_fx->hGSCDec != NULL )
-        {
-            st_fx->hGSCDec->Last_frame_ener_fx = MAX_32;
-            move32();
-        }
+        st->hGSCDec->Last_frame_ener_fx = MAX_32;
+        move32();
     }
-#ifdef IVAS_CODE
-    if ( st->hFdCngDec != NULL && ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) && ( st->last_core_brate == SID_2k40 || st->last_core_brate == FRAME_NO_DATA ) )
+
+    test();
+    test();
+    test();
+    test();
+    IF( st->hFdCngDec != NULL && ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && ( EQ_32( st->last_core_brate, SID_2k40 ) || st->last_core_brate == FRAME_NO_DATA ) )
     {
-        set_zero( st->hFdCngDec->hFdCngCom->olapBufferSynth2, FFTLEN );
-        set_zero( hStereoCng->olapBufferSynth22, FFTLEN );
+        set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, FFTLEN );
+        set16_fx( hStereoCng->olapBufferSynth22_fx, 0, FFTLEN );
     }
-#endif
-    st_fx->clas_dec = st_fx->last_good;
+
+    st->clas_dec = st->last_good;
     move16();
     enr_q_fx = 0;
     move32();
@@ -283,21 +298,22 @@ ivas_error acelp_core_dec_fx(
     move16();
     tmp_noise_fx = 0;
     move16();
-    Copy( st_fx->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC ); // Q_exc
+    Copy( st->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC ); /*Q_exc*/
     exc_fx = old_exc_fx + L_EXC_MEM_DEC;
 
-    IF( st_fx->hWIDec != NULL )
+    IF( st->hWIDec != NULL )
     {
-        Copy( st_fx->hWIDec->old_exc2_fx, old_exc2_fx, L_EXC_MEM );
+        Copy( st->hWIDec->old_exc2_fx, old_exc2_fx, L_EXC_MEM );
     }
     ELSE
     {
         set16_fx( old_exc2_fx, 0, L_EXC_MEM );
     }
     exc2_fx = old_exc2_fx + L_EXC_MEM;
-    IF( st_fx->hBWE_TD != NULL )
+
+    IF( st->hBWE_TD != NULL )
     {
-        Copy( hBWE_TD->old_bwe_exc_fx, old_bwe_exc_fx, PIT16k_MAX * 2 ); // Q_exc
+        Copy( st->hBWE_TD->old_bwe_exc_fx, old_bwe_exc_fx, PIT16k_MAX * 2 ); /*Q_exc*/
         bwe_exc_fx = old_bwe_exc_fx + PIT16k_MAX * 2;
     }
     ELSE
@@ -307,279 +323,270 @@ ivas_error acelp_core_dec_fx(
 
     last_pulse_pos = 0;
     move16();
-    do_WI_fx = 0;
+    do_WI = 0;
     move16();
-    st_fx->GSC_noisy_speech = 0;
+    st->GSC_noisy_speech = 0;
     move16();
-    st_fx->relax_prev_lsf_interp = 0;
+    st->relax_prev_lsf_interp = 0;
     move16();
+    set16_fx( gain_buf_fx, 0, NB_SUBFR16k );
 
-    set16_fx( gain_buf, 0, NB_SUBFR16k );
-    IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+    IF( EQ_16( st->L_frame, L_FRAME ) )
     {
-        st_fx->gamma = GAMMA1;
+        st->gamma = GAMMA1;
         move16();
-        st_fx->preemph_fac = PREEMPH_FAC;
+        st->inv_gamma = GAMMA1_INV;
         move16();
-        int_fs = INT_FS_FX;
+        st->preemph_fac = PREEMPH_FAC;
+        move16();
+        int_fs = INT_FS_12k8;
         move16();
     }
     ELSE
     {
-        st_fx->gamma = GAMMA16k;
+        st->gamma = GAMMA16k;
+        move16();
+        st->inv_gamma = GAMMA16k_INV;
         move16();
-        st_fx->preemph_fac = PREEMPH_FAC_16k;
+        st->preemph_fac = PREEMPH_FAC_16k;
         move16();
         int_fs = INT_FS_16k;
         move16();
     }
 
-    /* reset post-filter in case post-filtering was off in previous frame  */
-    IF( st_fx->hPFstat != NULL )
+    test();
+    /* reset post-filter in case of switching */
+    if ( st->hPFstat != NULL && ( st->hPFstat->on == 0 ) )
     {
-        if ( st_fx->hPFstat->on == 0 )
-        {
-            st_fx->hPFstat->reset = 1;
-            move16();
-        }
+        st->hPFstat->reset = 1;
+        move16();
     }
+
     avoid_lpc_burst_on_recovery = 0;
     move16();
     test();
     test();
-    if ( st_fx->last_con_tcx && NE_16( st_fx->L_frameTCX_past, st_fx->L_frame ) && st_fx->last_core != 0 )
+    if ( st->last_con_tcx && NE_16( st->L_frameTCX_past, st->L_frame ) && ( st->last_core != 0 ) )
     {
         avoid_lpc_burst_on_recovery = 1;
         move16();
     }
-    /* TD stereo parameters */
     test();
-    IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && st_fx->idchan == 1 )
+
+    /* TD stereo parameters */
+    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( st->idchan, 1 ) )
     {
         tdm_lp_reuse_flag = hStereoTD->tdm_lp_reuse_flag;
-        tdm_low_rate_mode = hStereoTD->tdm_low_rate_mode;
-        tdm_Pitch_reuse_flag = hStereoTD->tdm_Pitch_reuse_flag;
-#ifdef ADD_LRTD
-        p_tdm_Pri_pitch_buf = hStereoTD->tdm_Pri_pitch_buf;
-#endif
-        move16();
         move16();
+        tdm_low_rate_mode = hStereoTD->tdm_low_rate_mode;
         move16();
+        tdm_Pitch_reuse_flag = hStereoTD->tdm_Pitch_reuse_flag;
         move16();
+        p_tdm_Pri_pitch_buf_fx = hStereoTD->tdm_Pri_pitch_buf_fx;
     }
     ELSE
     {
         tdm_lp_reuse_flag = 0;
-        tdm_low_rate_mode = 0;
         move16();
+        tdm_low_rate_mode = 0;
         move16();
         test();
-        if ( EQ_16( st_fx->element_mode, IVAS_SCE ) && st_fx->low_rate_mode )
+        if ( EQ_16( st->element_mode, IVAS_SCE ) && st->low_rate_mode )
         {
             tdm_low_rate_mode = 1;
             move16();
         }
         tdm_Pitch_reuse_flag = 0;
-#ifdef ADD_LRTD
-        p_tdm_Pri_pitch_buf = NULL;
-#endif
         move16();
+        p_tdm_Pri_pitch_buf_fx = NULL;
     }
+
     /*----------------------------------------------------------------*
      * Updates in case of internal sampling rate switching
      *----------------------------------------------------------------*/
+
     test();
     test();
-    IF( NE_16( st_fx->last_L_frame, st_fx->L_frame ) && ( st_fx->last_core == ACELP_CORE || EQ_16( st_fx->last_core, AMR_WB_CORE ) ) )
+    IF( NE_16( st->last_L_frame, st->L_frame ) && ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) )
     {
-        IF( st_fx->hPFstat->on != 0 )
+        Word16 dec;
+
+        IF( ( st->hPFstat->on != 0 ) )
         {
             Word16 mem_syn_r_size_old, mem_syn_r_size_new;
-
-            mem_syn_r_size_old = shr( st_fx->last_L_frame, 4 );
-            mem_syn_r_size_new = shr( st_fx->L_frame, 4 );
-            lerp( st_fx->hPFstat->mem_stp + L_SYN_MEM - mem_syn_r_size_old, st_fx->hPFstat->mem_stp + L_SYN_MEM - mem_syn_r_size_new, mem_syn_r_size_new, mem_syn_r_size_old );
-            lerp( st_fx->hPFstat->mem_pf_in + L_SYN_MEM - mem_syn_r_size_old, st_fx->hPFstat->mem_pf_in + L_SYN_MEM - mem_syn_r_size_new, mem_syn_r_size_new, mem_syn_r_size_old );
+            mem_syn_r_size_old = mult_r( 2048, st->last_L_frame ); /* 1.25/20.f = 2048 (Q15)*/
+            mem_syn_r_size_new = mult_r( 2048, st->L_frame );      /* 1.25/20.f = 2048 (Q15)*/
+            lerp( st->hPFstat->mem_stp + sub( L_SYN_MEM, mem_syn_r_size_old ), st->hPFstat->mem_stp + sub( L_SYN_MEM, mem_syn_r_size_new ), mem_syn_r_size_new, mem_syn_r_size_old );
+            lerp( st->hPFstat->mem_pf_in + sub( L_SYN_MEM, mem_syn_r_size_old ), st->hPFstat->mem_pf_in + sub( L_SYN_MEM, mem_syn_r_size_new ), mem_syn_r_size_new, mem_syn_r_size_old );
         }
+
         /* convert quantized LSP vector */
-        st_fx->rate_switching_reset = lsp_convert_poly_fx( st_fx->lsp_old_fx, st_fx->L_frame, 0 );
+        st->rate_switching_reset = lsp_convert_poly_fx( st->lsp_old_fx, st->L_frame, 0 );
         move16();
+
         /* convert old quantized LSF vector */
-        lsp2lsf_fx( st_fx->lsp_old_fx, st_fx->lsf_old_fx, M, int_fs );
+        lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, int_fs );
 
         /* FEC - update adaptive LSF mean vector */
-        Copy( st_fx->lsf_old_fx, st_fx->lsfoldbfi1_fx, M );        // Qlog2(2.56)
-        Copy( st_fx->lsf_old_fx, st_fx->lsfoldbfi0_fx, M );        // Qlog2(2.56)
-        Copy( st_fx->lsf_old_fx, st_fx->lsf_adaptive_mean_fx, M ); // Qlog2(2.56)
+        Copy( st->lsf_old_fx, st->lsfoldbfi1_fx, M );        /*Qlog2(2.56)*/
+        Copy( st->lsf_old_fx, st->lsfoldbfi0_fx, M );        /*Qlog2(2.56)*/
+        Copy( st->lsf_old_fx, st->lsf_adaptive_mean_fx, M ); /*Qlog2(2.56)*/
 
         /* Reset LPC mem */
-        IF( EQ_32( st_fx->sr_core, INT_FS_16k ) )
+        IF( EQ_32( st->sr_core, INT_FS_16k ) )
         {
-            Copy( GEWB2_Ave_fx, st_fx->mem_AR_fx, M ); // Qlog2(2.56)
+            Copy( GEWB2_Ave_fx, st->mem_AR_fx, M ); /*Qlog2(2.56)*/
         }
         ELSE
         {
-            Copy( GEWB_Ave_fx, st_fx->mem_AR_fx, M ); // Qlog2(2.56)
+            Copy( GEWB_Ave_fx, st->mem_AR_fx, M ); /*Qlog2(2.56)*/
         }
-        set16_fx( st_fx->mem_MA_fx, 0, M );
-#if 1 // def IVAS_CODE
+        set16_fx( st->mem_MA_fx, 0, M );
+
+        /* update synthesis filter memories */
         dec = DEC;
         move16();
-        IF( NE_16( st_fx->element_mode, EVS_MONO ) )
+        if ( st->element_mode != EVS_MONO )
         {
             dec = DEC_IVAS;
             move16();
         }
-
-        /* update synthesis filter memories */
-        synth_mem_updt2( st_fx->L_frame, st_fx->last_L_frame, st_fx->old_exc_fx, st_fx->mem_syn_r, st_fx->mem_syn2_fx, NULL, dec );
-#else
-        synth_mem_updt2( st_fx->L_frame, st_fx->last_L_frame, st_fx->old_exc_fx, st_fx->mem_syn_r, st_fx->mem_syn2_fx, NULL, DEC );
-#endif
-        Copy( st_fx->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC );                                 // Q_exc
-        Copy_Scale_sig( st_fx->mem_syn2_fx, st_fx->mem_syn1_fx, M, sub( -1, st_fx->Q_syn ) ); /*Q-1*/
-
-        Copy( st_fx->mem_syn2_fx, st_fx->mem_syn3_fx, M );
+        ivas_synth_mem_updt2_fx( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, dec );
+        Copy( st->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC );                           /*Q_exc*/
+        Copy_Scale_sig( st->mem_syn2_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); /*Q-1*/
+        Copy( st->mem_syn2_fx, st->mem_syn3_fx, M );                                 /*Q_syn*/
     }
 
-    IF( NE_16( st_fx->last_L_frame, st_fx->L_frame ) )
+    /* update buffer of old subframe pitch values */
+    IF( NE_16( st->last_L_frame, st->L_frame ) )
     {
-        /* update buffer of old subframe pitch values */
-        IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+        IF( EQ_16( st->L_frame, L_FRAME ) )
         {
-
-            IF( EQ_16( st_fx->last_L_frame, L_FRAME32k ) )
+            IF( EQ_16( st->last_L_frame, L_FRAME32k ) )
             {
-                /* (float)12800/(float)32000; */
-                k = 13107; // Q15
+                tmpF_fx = 13107; // Q15
                 move16();
             }
-            ELSE IF( EQ_16( st_fx->last_L_frame, 512 ) )
+            ELSE IF( EQ_16( st->last_L_frame, 512 ) )
             {
-                /* (float)12800/(float)25600; */
-                k = 16384; // Q15
+                tmpF_fx = 16384; // Q15
                 move16();
             }
             ELSE /* st->last_L_frame == L_FRAME16k */
             {
-                /* (float)12800/(float)16000; */
-                k = 26214; // Q15
+                tmpF_fx = 26214; // Q15
                 move16();
             }
 
             FOR( i = NB_SUBFR16k - NB_SUBFR; i < NB_SUBFR16k; i++ )
             {
-                st_fx->old_pitch_buf_fx[i - 1] = Mpy_32_16_1( st_fx->old_pitch_buf_fx[i], k ); // Q(15+15+1-16)
+                st->old_pitch_buf_fx[i - 1] = Mpy_32_16_1( st->old_pitch_buf_fx[i], tmpF_fx ); // Q16
                 move32();
             }
 
             FOR( i = 2 * NB_SUBFR16k - NB_SUBFR; i < 2 * NB_SUBFR16k; i++ )
             {
-                st_fx->old_pitch_buf_fx[i - 2] = Mpy_32_16_1( st_fx->old_pitch_buf_fx[i], k ); // Q15
+                st->old_pitch_buf_fx[i - 2] = Mpy_32_16_1( st->old_pitch_buf_fx[i], tmpF_fx ); // Q16
                 move32();
             }
         }
         ELSE
         {
-
-            IF( EQ_16( st_fx->last_L_frame, L_FRAME32k ) )
+            exp = 0;
+            move16();
+            IF( EQ_16( st->last_L_frame, L_FRAME32k ) )
             {
-                /* (float)16000/(float)32000; */
-                k = -16384; // -0.5 in Q15
+                tmpF_fx = 16384; // Q15
                 move16();
             }
-            ELSE IF( EQ_16( st_fx->last_L_frame, 512 ) )
+            ELSE IF( EQ_16( st->last_L_frame, 512 ) )
             {
-                /* tmpF = (float)16000/(float)25600; */
-                k = -12288; //-0.375 in Q15
+                tmpF_fx = 20480; // Q15
                 move16();
             }
             ELSE /* st->last_L_frame == L_FRAME12k8 */
             {
-                /* tmpF = (float)16000/(float)12800; */
-                k = 8192; //.25 in Q15
+                tmpF_fx = 20480; // Q14
+                move16();
+                exp = 1;
                 move16();
             }
-
             FOR( i = 2 * NB_SUBFR - 1; i >= NB_SUBFR; i-- )
             {
-                st_fx->old_pitch_buf_fx[i + 2] = L_add( st_fx->old_pitch_buf_fx[i], Mpy_32_16_1( st_fx->old_pitch_buf_fx[i], k ) ); // Q15
+                st->old_pitch_buf_fx[i + 2] = Mpy_32_16_1( L_shl( st->old_pitch_buf_fx[i], exp ), tmpF_fx ); // Q15
                 move32();
             }
-            st_fx->old_pitch_buf_fx[NB_SUBFR + 1] = st_fx->old_pitch_buf_fx[NB_SUBFR + 2];
+            st->old_pitch_buf_fx[NB_SUBFR + 1] = st->old_pitch_buf_fx[NB_SUBFR + 2];
             move32();
 
             FOR( i = NB_SUBFR - 1; i >= 0; i-- )
             {
-                st_fx->old_pitch_buf_fx[i + 1] = L_add( st_fx->old_pitch_buf_fx[i], Mpy_32_16_1( st_fx->old_pitch_buf_fx[i], k ) ); // Q15
+                st->old_pitch_buf_fx[i + 1] = Mpy_32_16_1( L_shl( st->old_pitch_buf_fx[i], exp ), tmpF_fx ); // Q15
                 move32();
             }
-            st_fx->old_pitch_buf_fx[0] = st_fx->old_pitch_buf_fx[1];
+            st->old_pitch_buf_fx[0] = st->old_pitch_buf_fx[1];
             move32();
         }
     }
 
-    IF( NE_16( st_fx->bfi_pitch_frame, st_fx->L_frame ) )
+    IF( NE_16( st->bfi_pitch_frame, st->L_frame ) )
     {
-        IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+        IF( EQ_16( st->L_frame, L_FRAME ) )
         {
-
-            IF( EQ_16( st_fx->bfi_pitch_frame, L_FRAME32k ) )
+            IF( EQ_16( st->bfi_pitch_frame, L_FRAME32k ) )
             {
-                /* (float)12800/(float)32000; */
-                k = 13107; // Q15
+                tmpF_fx = 13107; // Q15
                 move16();
             }
-            ELSE IF( EQ_16( st_fx->bfi_pitch_frame, 512 ) )
+            ELSE IF( EQ_16( st->bfi_pitch_frame, 512 ) )
             {
-                /* (float)12800/(float)25600; */
-                k = 16384; // Q15
+                tmpF_fx = 16384; // Q15
                 move16();
             }
             ELSE /* st->bfi_pitch_frame == L_FRAME16k */
             {
-                /* (float)12800/(float)16000; */
-                k = 26214; // Q15
+                tmpF_fx = 26214; // Q15
                 move16();
             }
-            st_fx->bfi_pitch_fx = mult_r( k, st_fx->bfi_pitch_fx );
+            st->bfi_pitch_fx = mult_r( st->bfi_pitch_fx, tmpF_fx );
             move16();
-            st_fx->bfi_pitch_frame = L_FRAME;
+            st->bfi_pitch_frame = L_FRAME;
             move16();
         }
         ELSE
         {
-
-            IF( EQ_16( st_fx->bfi_pitch_frame, L_FRAME32k ) )
+            exp = 0;
+            move16();
+            IF( EQ_16( st->bfi_pitch_frame, L_FRAME32k ) )
             {
-                /* (float)16000/(float)32000; */
-                k = -16384; //-0.5 in Q15
+                tmpF_fx = 16384; // Q15
                 move16();
             }
-            ELSE IF( EQ_16( st_fx->bfi_pitch_frame, 512 ) )
+            ELSE IF( EQ_16( st->bfi_pitch_frame, 512 ) )
             {
-                /* tmpF = (float)16000/(float)25600; */
-                k = -12288; // -0.375 in Q15
+                tmpF_fx = 20480; // Q15
                 move16();
             }
             ELSE /* st->bfi_pitch_frame == L_FRAME12k8 */
             {
-                /* tmpF = (float)16000/(float)12800; */
-                k = 8192; // .25 in Q15
+                tmpF_fx = 20480; // Q14
+                move16();
+                exp = 1;
                 move16();
             }
-            st_fx->bfi_pitch_fx = add( st_fx->bfi_pitch_fx, mult_r( st_fx->bfi_pitch_fx, k ) );
+
+            st->bfi_pitch_fx = mult_r( shl_sat( st->bfi_pitch_fx, exp ), tmpF_fx );
             move16();
-            st_fx->bfi_pitch_frame = L_FRAME16k;
+            st->bfi_pitch_frame = L_FRAME16k;
             move16();
         }
     }
 
     test();
     test();
-    if ( EQ_16( st_fx->last_bwidth, NB ) && NE_16( st_fx->bwidth, NB ) && st_fx->ini_frame != 0 )
+    if ( EQ_16( st->last_bwidth, NB ) && NE_16( st->bwidth, NB ) && ( st->ini_frame != 0 ) )
     {
-        st_fx->rate_switching_reset = 1;
+        st->rate_switching_reset = 1;
         move16();
     }
 
@@ -587,159 +594,251 @@ ivas_error acelp_core_dec_fx(
      * GOOD frame
      *----------------------------------------------------------------------*/
 
-    IF( !st_fx->bfi )
+    IF( !st->bfi )
     {
 
         /*----------------------------------------------------------------*
          * Decoding of TC subframe classification
          *----------------------------------------------------------------*/
 
-        tc_subfr_fx = -1;
+        tc_subfr = -1;
         move16();
-        IF( EQ_16( st_fx->coder_type, TRANSITION ) )
+        IF( EQ_16( st->coder_type, TRANSITION ) )
         {
-            tc_subfr_fx = tc_classif_fx( st_fx, st_fx->L_frame );
+            tc_subfr = tc_classif_fx( st, st->L_frame );
         }
-#if 1 // def IVAS_CODE
+
         /*----------------------------------------------------------------*
          * Decoding of GSC IVAS mode
          *----------------------------------------------------------------*/
-        st_fx->GSC_IVAS_mode = 0;
-        move16();
+
         test();
         test();
         test();
         test();
-        IF( ( st_fx->element_mode > EVS_MONO ) && st_fx->idchan == 0 && !( ( st_fx->core_brate == FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) ) && !tdm_low_rate_mode )
+        IF( st->element_mode > EVS_MONO && st->idchan == 0 && !( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) ) && !tdm_low_rate_mode )
         {
             test();
             test();
-            IF( EQ_16( st_fx->coder_type, AUDIO ) || ( ( st_fx->coder_type == INACTIVE ) && LE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) ) )
+            IF( EQ_16( st->coder_type, AUDIO ) || ( EQ_16( st->coder_type, INACTIVE ) && EQ_16( st->inactive_coder_type_flag, 1 ) ) )
             {
-                st_fx->GSC_IVAS_mode = get_next_indice( st_fx, 2 );
+                st->GSC_IVAS_mode = get_next_indice_fx( st, 2 );
                 move16();
             }
         }
-#endif
+
         /*----------------------------------------------------------------*
          * Decoding of inactive CNG frames
          *----------------------------------------------------------------*/
+
         test();
-        IF( st_fx->core_brate == FRAME_NO_DATA || EQ_32( st_fx->core_brate, SID_2k40 ) )
+        IF( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) )
         {
             /* decode CNG parameters */
-            IF( st_fx->cng_type == LP_CNG )
+            IF( st->cng_type == LP_CNG )
             {
+                CNG_dec_fx( st, last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step, sid_bw, q_env_fx );
+                Copy( Aq_fx, st->Aq_cng, add( M, 1 ) );
 
-                CNG_dec_fx( st_fx, st_fx->last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step_fx, sid_bw, q_env );
-#ifdef IVAS_CODE
-                local_element_mode = st_fx->element_mode;
+                /* comfort noise generation */
+                local_element_mode = st->element_mode;
                 move16();
-                IF( ( EQ_16( nchan_out, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) ) || EQ_16( st_fx->masa_sid_format, 1 ) )
+
+                test();
+                test();
+                if ( ( EQ_16( nchan_out, 1 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) || EQ_16( st->masa_sid_format, 1 ) )
                 {
                     local_element_mode = IVAS_SCE; /* For DFT Stereo mono decoding, run CNG_exc as in SCE */
                     move16();
                 }
-#endif
-                /* comfort noise generation */
-                CNG_exc_fx( st_fx->core_brate, st_fx->L_frame, &st_fx->hTdCngDec->Enew_fx, &st_fx->hTdCngDec->cng_seed, exc_fx, exc2_fx, &st_fx->lp_ener_fx, st_fx->last_core_brate,
-                            &st_fx->first_CNG, &( st_fx->hTdCngDec->cng_ener_seed ), bwe_exc_fx, allow_cn_step_fx, &st_fx->hTdCngDec->last_allow_cn_step, st_fx->prev_Q_exc, st_fx->Q_exc, st_fx->hTdCngDec->num_ho,
-                            q_env, st_fx->hTdCngDec->lp_env_fx, st_fx->hTdCngDec->old_env_fx, st_fx->hTdCngDec->exc_mem_fx, st_fx->hTdCngDec->exc_mem1_fx, sid_bw, &st_fx->hTdCngDec->cng_ener_seed1, exc3_fx, st_fx->Opt_AMR_WB, st_fx->element_mode );
-#if 1                                                // def IVAS_CODE
-                Copy( Aq_fx, st_fx->Aq_cng, M + 1 ); // Q12
-#endif
+                CNG_exc_fx( st->core_brate, st->L_frame, &st->hTdCngDec->Enew_fx, &st->hTdCngDec->cng_seed, exc_fx, exc2_fx, &st->lp_ener_fx, st->last_core_brate, &st->first_CNG, &( st->hTdCngDec->cng_ener_seed ), bwe_exc_fx, allow_cn_step, &st->hTdCngDec->last_allow_cn_step, st->prev_Q_exc, st->Q_exc, st->hTdCngDec->num_ho, q_env_fx, st->hTdCngDec->lp_env_fx, st->hTdCngDec->old_env_fx, st->hTdCngDec->exc_mem_fx, st->hTdCngDec->exc_mem1_fx, sid_bw, &st->hTdCngDec->cng_ener_seed1, exc3_fx, st->Opt_AMR_WB, local_element_mode );
             }
             ELSE
             {
                 test();
-                IF( EQ_32( st_fx->core_brate, SID_2k40 ) && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
+                IF( EQ_32( st->core_brate, SID_2k40 ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
                 {
-                    FdCng_decodeSID_fx( st_fx->hFdCngDec->hFdCngCom, st_fx );
+                    IF( EQ_16( st->element_mode, EVS_MONO ) )
+                    {
+                        FdCng_decodeSID_fx( st->hFdCngDec->hFdCngCom, st );
+                    }
+                    ELSE
+                    {
+                        Word16 old_NoiseEstExp = st->hFdCngDec->hFdCngCom->sidNoiseEstExp;
+                        move16();
+
+                        FdCng_decodeSID_ivas_fx( st );
+
+                        Scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART, sub( old_NoiseEstExp, st->hFdCngDec->hFdCngCom->sidNoiseEstExp ) );
+                        Scale_sig( st->hFdCngDec->hFdCngCom->A_cng, M + 1, sub( norm_s( st->hFdCngDec->hFdCngCom->A_cng[0] ), Q2 ) ); // Qx
+                    }
+
                     *sid_bw = 0;
                     move16();
                 }
-#ifdef IVAS_CODE
-                if ( st->element_mode == IVAS_CPE_DFT )
+
+                IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
                 {
                     assert( nchan_out == 1 );
 
-                    for ( i = 0; i < NPART; i++ )
+                    FOR( i = 0; i < NPART; i++ )
+                    {
+                        st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] = Madd_32_32( Mpy_32_32( STEREO_DFT_FD_FILT_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] ),
+                                                                                 STEREO_DFT_FD_FILT_COMP_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEst[i] );
+                        move32();
+                    }
+
+                    ApplyFdCng_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
+
+                    Word16 new_sidNoiseEstExp = 31 - Q4;
+                    move16();
+                    Scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART, sub( st->hFdCngDec->hFdCngCom->sidNoiseEstExp, new_sidNoiseEstExp ) ); // Q(31-sidNoiseEstExp)
+                    Scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEst, NPART, sub( st->hFdCngDec->hFdCngCom->sidNoiseEstExp, new_sidNoiseEstExp ) );   // Q(31-sidNoiseEstExp)
+                    st->hFdCngDec->hFdCngCom->sidNoiseEstExp = new_sidNoiseEstExp;
+                    move16();
+                    Word16 new_cngNoiseLevelExp = 31 - Q4;
+                    move16();
+                    Scale_sig32( st->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, sub( st->hFdCngDec->hFdCngCom->cngNoiseLevelExp, new_cngNoiseLevelExp ) ); // Q(31-cngNoiseLevelExp)
+                    st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = new_cngNoiseLevelExp;
+                    move16();
+
+                    test();
+                    ApplyFdCng_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( EQ_16( st->coder_type, AUDIO ) && !st->GSC_noisy_speech ) );
+
+                    IF( st->hFdCngDec->hFdCngCom->cngNoiseLevelExp < 0 )
                     {
-                        st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] = STEREO_DFT_FD_FILT * st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] + ( 1 - STEREO_DFT_FD_FILT ) * st->hFdCngDec->hFdCngCom->sidNoiseEst[i];
+                        Scale_sig32( st->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ); // Q(31-cngNoiseLevelExp)
+                        st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = 0;
+                        move16();
                     }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                    ApplyFdCng_fx( syn, 0, NULL, realBuffer, imagBuffer, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-#else
-                    ApplyFdCng_fx( syn, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-#endif
                 }
-                if ( !read_sid_info )
+
+                IF( !read_sid_info )
                 {
-                    float noise_lvl_highest;
+                    Word32 noise_lvl_highest_fx;
 
-                    noise_lvl_highest = st->hFdCngDec->hFdCngCom->cngNoiseLevel[st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand - 1];
-                    for ( int16_t b = st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand; b < st->hFdCngDec->hFdCngCom->stopBand; b++ )
+                    noise_lvl_highest_fx = st->hFdCngDec->hFdCngCom->cngNoiseLevel[( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ) - 1];
+                    move32();
+
+                    FOR( Word16 b = ( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ); b < st->hFdCngDec->hFdCngCom->stopBand; b++ )
                     {
-                        st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest;
+                        st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest_fx;
+                        move32();
                     }
                 }
-#endif
-                generate_comfort_noise_dec_fx( NULL, NULL, NULL, st_fx, &( st_fx->Q_exc ), 2, -1 );
 
-                FdCng_exc( st_fx->hFdCngDec->hFdCngCom, &st_fx->CNG_mode, st_fx->L_frame, st_fx->lsp_old_fx, st_fx->first_CNG, st_fx->lspCNG_fx, Aq_fx, lsp_new_fx, lsf_new_fx, exc_fx, exc2_fx, bwe_exc_fx );
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    generate_comfort_noise_dec_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 2, -1 );
+                }
+                ELSE
+                {
+                    generate_comfort_noise_dec_ivas_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 1, nchan_out );
+                }
+
+                FdCng_exc( st->hFdCngDec->hFdCngCom, &st->CNG_mode, st->L_frame, st->lsp_old_fx, st->first_CNG, st->lspCNG_fx, Aq_fx, lsp_new_fx, lsf_new_fx, exc_fx, exc2_fx, bwe_exc_fx );
 
-                Copy( exc2_fx, exc3_fx, st_fx->L_frame );
+                Copy( exc2_fx, exc3_fx, st->L_frame );
             }
 
-            delta_mem_scale = 3;
+            Word16 delta_mem_scale = 3;
             move16();
             test();
-            if ( LT_32( st_fx->lp_ener_fx, 40 ) && ( st_fx->cng_type == LP_CNG ) ) /* very low energy frames, less than 0.3125 */
+            if ( LT_32( st->lp_ener_fx, 40 ) && st->cng_type == LP_CNG ) /* very low energy frames, less than 0.3125 */
             {
                 delta_mem_scale = 0;
                 move16();
             }
-            i = st_fx->Q_exc;
+            i = st->Q_exc;
             move16();
-            Rescale_exc( hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st_fx->hGSCDec->last_exc_dct_in_fx, st_fx->L_frame,
-                         st_fx->L_frame * HIBND_ACB_L_FAC, 0, &( st_fx->Q_exc ), st_fx->Q_subfr, NULL, 0, INACTIVE );
-            Rescale_mem( st_fx->Q_exc, &st_fx->prev_Q_syn, &st_fx->Q_syn, st_fx->mem_syn2_fx, st_fx->mem_syn_clas_estim_fx, delta_mem_scale,
-                         &st_fx->mem_deemph_fx, hBPF->pst_old_syn_fx, &hBPF->pst_mem_deemp_err_fx, &st_fx->agc_mem_fx[1], st_fx->hPFstat, 0, 0, NULL );
-            Copy_Scale_sig( exc2_fx, exc2_fx, st_fx->L_frame, sub( st_fx->Q_exc, i ) ); // Q_exc
+
+            test();
+            IF( st->hMusicPF && st->hGSCDec )
+            {
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    // VE: TBV:  should 'st_fx->L_frame * HIBND_ACB_L_FAC' be corrected in EVS?
+                    Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame,
+                                 st->L_frame * HIBND_ACB_L_FAC, 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );
+                }
+                ELSE
+                {
+                    Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame,
+                                 L_FRAME32k, 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );
+                }
+            }
+
+            IF( st->hPFstat != NULL )
+            {
+                Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, delta_mem_scale,
+                             &st->mem_deemph_fx, st->hBPF->pst_old_syn_fx, &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, 0, 0, NULL );
+            }
+            ELSE
+            {
+                Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, delta_mem_scale,
+                             &st->mem_deemph_fx, NULL, NULL, &st->agc_mem_fx[1], NULL, 0, 0, NULL );
+            }
+
+            Copy_Scale_sig( exc2_fx, exc2_fx, st->L_frame, sub( st->Q_exc, i ) ); // Q_exc
 
             /* update past excitation signals for LD music post-filter */
-            IF( hMusicPF != NULL )
+            IF( st->hMusicPF != NULL )
             {
-                Copy( hMusicPF->dct_post_old_exc_fx + L_FRAME, hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
-                Copy( exc2_fx, hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
+                Copy( st->hMusicPF->dct_post_old_exc_fx + L_FRAME, st->hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
+                Copy( exc2_fx, st->hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
+
                 /* Update music post processing values */
                 /* Filter energies update */
-                FOR( i = 0; i < DCT_L_POST; i++ )
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
                 {
-                    /*st_fx->filt_lfE_fx[i] = 0.3f + 0.7f * st_fx->filt_lfE_fx[i];*/
-                    hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( ( 1228 << ( 16 ) ), 22938, hMusicPF->filt_lfE_fx[i] ) );
-                    move16();
+                    FOR( i = 0; i < DCT_L_POST; i++ )
+                    {
+                        st->hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( ( 1228 << ( 16 ) ), 22938, st->hMusicPF->filt_lfE_fx[i] ) );
+                        move16();
+                    }
+                }
+                ELSE
+                {
+                    FOR( i = 0; i < DCT_L_POST; i++ )
+                    {
+                        st->hMusicPF->filt_lfE_fx[i] = add( 9830, mult_r( 22937, st->hMusicPF->filt_lfE_fx[i] ) ); // Q15,  9830 =.3f in Q15, 22937=.7f in Q15
+                        move16();
+                    }
                 }
             }
+
             /* synthesis at 12.8kHz sampling rate */
-            syn_12k8_fx( st_fx->L_frame, Aq_fx, exc2_fx, syn_fx, st_fx->mem_syn2_fx, 1, st_fx->Q_exc, st_fx->Q_syn );
-            syn_12k8_fx( st_fx->L_frame, Aq_fx, exc3_fx, syn1_fx, st_fx->mem_syn3_fx, 1, st_fx->Q_exc, st_fx->Q_syn );
+            move16();
+            syn_12k8_fx( st->L_frame, Aq_fx, exc2_fx, psyn_fx, st->mem_syn2_fx, 1, st->Q_exc, st->Q_syn );
+            syn_12k8_fx( st->L_frame, Aq_fx, exc3_fx, syn1_fx, st->mem_syn3_fx, 1, st->Q_exc, st->Q_syn );
 
             /* reset the decoder */
-            CNG_reset_dec_fx( st_fx, pitch_buf_fx, voice_factors );
+            CNG_reset_dec_fx( st, pitch_buf_fx, voice_factors_fx );
+
+            IF( EQ_16( st->element_mode, EVS_MONO ) )
+            {
+                /* update st_fx->mem_syn1 for ACELP core switching */
+                Copy( st->mem_syn3_fx, st->mem_syn1_fx, M );
+            }
+            ELSE
+            {
+                st->Q_syn_cng = st->Q_syn;
+                move16();
+                st->Q_exc_cng = st->Q_exc;
+                move16();
 
-            /* update st_fx->mem_syn1 for ACELP core switching */
-            Copy( st_fx->mem_syn3_fx, st_fx->mem_syn1_fx, M );
+                /* update st->mem_syn1 for ACELP core switching */
+                Copy_Scale_sig( st->mem_syn3_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); // Q(-1)
+            }
 
             /* update old synthesis for classification */
-            Copy( syn1_fx + st_fx->L_frame - L_SYN_MEM_CLAS_ESTIM, st_fx->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
-
+            Copy( syn1_fx + st->L_frame - L_SYN_MEM_CLAS_ESTIM, st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
 
             /* save and delay synthesis to be used by SWB BWE */
-            Copy_Scale_sig( syn1_fx, temp_buf_fx, st_fx->L_frame, sub( -1, st_fx->Q_syn ) ); // Q_syn -> Q(-1)
-            IF( hBWE_FD != NULL )
+            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn -> Q(-1)
+            IF( st->hBWE_FD != NULL )
             {
-                save_old_syn_fx( st_fx->L_frame, temp_buf_fx, old_syn_12k8_16k, hBWE_FD->old_syn_12k8_16k_fx, st_fx->preemph_fac, &hBWE_FD->mem_deemph_old_syn_fx );
+                save_old_syn_fx( st->L_frame, temp_buf_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );
             }
         }
 
@@ -749,21 +848,24 @@ ivas_error acelp_core_dec_fx(
 
         ELSE
         {
+
             /*-----------------------------------------------------------------*
              * Configure ACELP bit allocation
              *-----------------------------------------------------------------*/
+
             nb_bits = 0;
-            st_fx->acelp_cfg.FEC_mode = 0;
-            uc_two_stage_flag = 0;
             move16();
+            st->acelp_cfg.FEC_mode = 0;
             move16();
+            uc_two_stage_flag = 0;
             move16();
+
             test();
-            IF( !st_fx->nelp_mode_dec && !st_fx->ppp_mode_dec )
+            IF( !st->nelp_mode_dec && !st->ppp_mode_dec )
             {
                 Word16 tc_subfr_tmp;
 
-                tc_subfr_tmp = tc_subfr_fx;
+                tc_subfr_tmp = tc_subfr;
                 move16();
                 if ( LT_16( tc_subfr_tmp, L_SUBFR ) )
                 {
@@ -771,20 +873,19 @@ ivas_error acelp_core_dec_fx(
                     move16();
                 }
 
-                if ( EQ_16( tc_subfr_fx, TC_0_192 ) )
+                if ( EQ_16( tc_subfr, TC_0_192 ) )
                 {
                     nb_bits = -1;
                     move16();
                 }
 
-                config_acelp1( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, tc_subfr_tmp, 1, &nb_bits, unbits, st_fx->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_cnt, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
-
+                config_acelp1_fx( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, st->inactive_coder_type_flag, tc_subfr_tmp, 1, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
 
                 test();
                 test();
-                IF( EQ_16( st_fx->coder_type, TRANSITION ) && LT_16( tc_subfr_fx, L_SUBFR ) && EQ_16( st_fx->L_frame, L_FRAME ) )
+                IF( EQ_16( st->coder_type, TRANSITION ) && LT_16( tc_subfr, L_SUBFR ) && EQ_16( st->L_frame, L_FRAME ) )
                 {
-                    config_acelp1( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, -1, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, tc_subfr_fx, 2, &nb_bits, unbits, st_fx->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_cnt, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
+                    config_acelp1_fx( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, -1, &( st->acelp_cfg ), st->next_bit_pos, TRANSITION, -1, tc_subfr, 2, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
                 }
             }
 
@@ -794,131 +895,126 @@ ivas_error acelp_core_dec_fx(
 
             test();
             test();
-            IF( st_fx->hTdCngDec != NULL && ( st_fx->last_core_brate == FRAME_NO_DATA || EQ_32( st_fx->last_core_brate, SID_2k40 ) ) )
+            IF( st->hTdCngDec != NULL && ( st->last_core_brate == FRAME_NO_DATA || EQ_32( st->last_core_brate, SID_2k40 ) ) )
             {
-                Copy( st_fx->lspCNG_fx, st_fx->lsp_old_fx, M ); // Q15
-
-                lsp2lsf_fx( st_fx->lspCNG_fx, st_fx->lsf_old_fx, M, int_fs );
+                Copy( st->lspCNG_fx, st->lsp_old_fx, M ); /*Q15*/
+                lsp2lsf_fx( st->lspCNG_fx, st->lsf_old_fx, M, int_fs );
             }
 
             /*-----------------------------------------------------------------*
              * Reset higher ACELP pre-quantizer in case of switching
              *-----------------------------------------------------------------*/
 
-            IF( !st_fx->use_acelp_preq )
+            IF( !st->use_acelp_preq )
             {
-                st_fx->mem_preemp_preQ_fx = 0;
+                st->mem_preemp_preQ_fx = 0;
                 move16();
-                st_fx->last_nq_preQ = 0;
+                st->last_nq_preQ = 0;
                 move16();
-#ifdef IVAS_CODE
-                st_fx->last_code_preq = 0;
+                st->last_code_preq = 0;
                 move16();
-#endif
             }
 
-            st_fx->use_acelp_preq = 0;
+            st->use_acelp_preq = 0;
             move16();
 
             /*-----------------------------------------------------------------*
              * LSF de-quantization and interpolation
              *-----------------------------------------------------------------*/
-#ifdef ADD_LRTD
-            if ( !tdm_lp_reuse_flag )
-#endif
+
+            IF( !tdm_lp_reuse_flag )
             {
-                lsf_dec_fx( st_fx, tc_subfr_fx, Aq_fx, &LSF_Q_prediction, lsf_new_fx, lsp_new_fx, lsp_mid_fx, tdm_low_rate_mode,
-                            tdm_lsfQ_PCh );
+                lsf_dec_fx( st, tc_subfr, Aq_fx, &LSF_Q_prediction, lsf_new_fx, lsp_new_fx, lsp_mid_fx, tdm_low_rate_mode, tdm_lsfQ_PCh_fx );
             }
-#ifdef ADD_LRTD
-            else
+            ELSE
             {
-                const float *pt_interp_2;
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-                if ( st->active_cnt != 1 )
+                const Word16 *pt_interp_2_fx;
+
+                IF( NE_16( st->active_cnt, 1 ) )
                 {
-                    int16_t beta_index;
+                    Word16 beta_index;
 
-                    beta_index = get_next_indice( st, TDM_IC_LSF_PRED_BITS );
-                    tdm_SCh_lsf_reuse( DEC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, NULL, &beta_index );
+                    beta_index = get_next_indice_fx( st, TDM_IC_LSF_PRED_BITS );
+                    tdm_SCh_lsf_reuse_fx( DEC, st->element_brate, lsf_new_fx, lsp_new_fx, tdm_lsfQ_PCh_fx, NULL, &beta_index );
                 }
-                else
+                ELSE
                 {
-                    mvr2r( tdm_lspQ_PCh, lsp_new, M );
-                    mvr2r( tdm_lsfQ_PCh, lsf_new, M );
+                    Copy( tdm_lspQ_PCh_fx, lsp_new_fx, M );
+                    Copy( tdm_lsfQ_PCh_fx, lsf_new_fx, M );
                 }
-#else
-                mvr2r( tdm_lspQ_PCh, lsp_new, M );
-                mvr2r( tdm_lsfQ_PCh, lsf_new, M );
-#endif
-                if ( st->rate_switching_reset )
+
+                IF( st->rate_switching_reset )
                 {
                     /* extrapolation in case of unstable LSF convert */
-                    mvr2r( lsp_new, st->lsp_old, M );
-                    mvr2r( lsf_new, st->lsf_old, M );
+                    Copy( lsp_new_fx, st->lsp_old_fx, M );
+                    Copy( lsf_new_fx, st->lsf_old_fx, M );
                 }
 
-                pt_interp_2 = interpol_frac_12k8;
-                if ( tdm_low_rate_mode == 1 && st->coder_type > UNVOICED )
+                pt_interp_2_fx = interpol_frac_fx;
+                test();
+                if ( EQ_16( tdm_low_rate_mode, 1 ) && GT_16( st->coder_type, UNVOICED ) )
                 {
-                    pt_interp_2 = interpol_frac2;
+                    pt_interp_2_fx = interpol_frac2_fx;
                 }
 
-                if ( st->active_cnt == 1 )
+                IF( EQ_16( st->active_cnt, 1 ) )
                 {
-                    mvr2r( lsp_new, st->lsp_old, M );
-                    lsp2lsf( lsp_new, st->lsf_old, M, st->sr_core );
+                    Copy( lsp_new_fx, st->lsp_old_fx, M );
+                    lsp2lsf_fx( lsp_new_fx, st->lsf_old_fx, M, st->sr_core );
                 }
 
                 /* LSP interpolation and conversion of LSPs to A(z) */
-                int_lsp( st->L_frame, st->lsp_old, lsp_new, Aq, M, pt_interp_2, 0 );
+                int_lsp_fx( st->L_frame, st->lsp_old_fx, lsp_new_fx, Aq_fx, M, pt_interp_2_fx, 0 );
+
                 /* Check LSF stability (distance between old LSFs and current LSFs) */
-                st->stab_fac = lsf_stab( lsf_new, st->lsf_old, 0, st->L_frame );
+                st->stab_fac_fx = lsf_stab_ivas_fx( lsf_new_fx, st->lsf_old_fx, 0, st->L_frame );
+                move16();
             }
 
-            if ( st->last_core == HQ_CORE && st->element_mode > EVS_MONO )
+            test();
+            IF( EQ_16( st->last_core, HQ_CORE ) && st->element_mode > EVS_MONO )
             {
                 /* Prepare ACB memory from last HQ frame */
-                old_exc_s = st->old_exc + L_EXC_MEM_DEC - st->L_frame;
-                tmpF = *old_exc_s;
-                st->mem_deemph = old_exc_s[st->L_frame - 1];
-                preemph( old_exc_s, st->preemph_fac, L_FRAME16k, &tmpF );
-                mvr2r( old_exc_s + st->L_frame - M, st->mem_syn2, M );
-                residu( Aq, M, old_exc_s, old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );
+                old_exc_s_fx = st->old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame );
+                tmpF_fx = *old_exc_s_fx;
+                st->mem_deemph_fx = shl_sat( old_exc_s_fx[st->L_frame - 1], st->Q_syn ); /* Q0 -> Q_syn */
+                move16();
+                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );
+                Copy( old_exc_s_fx + sub( st->L_frame, M ), st->mem_syn2_fx, M );
+                Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); /* Q0 -> Q_syn */
+                Residu3_fx( Aq_fx, old_exc_s_fx, old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame ), st->L_frame, 0 );
+                Scale_sig( old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame ), st->L_frame, st->Q_exc ); /* Q0 -> Q_exc */
             }
-            if ( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )
+
+            test();
+            IF( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )
             {
                 /* Prepare ACB memory of old_bwe_exc */
-#ifdef CR_FIX_639_HQ_ACELP_TRANSITION
-                if ( st->L_frame == L_FRAME )
+                IF( EQ_16( st->L_frame, L_FRAME ) )
                 {
-                    lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );
+                    lerp( old_exc_fx, old_bwe_exc_fx, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );
                 }
-                else
+                ELSE
                 {
-                    lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * 2, L_EXC_MEM_DEC );
+                    lerp( old_exc_fx, old_bwe_exc_fx, L_EXC_MEM_DEC << 1, L_EXC_MEM_DEC );
                 }
-#else
-                lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );
-#endif
             }
-#endif
+
             /*-----------------------------------------------------------------*
              * FEC - first good frame after lost frame(s) (possibility to correct the ACB)
              *-----------------------------------------------------------------*/
 
-            IF( st_fx->acelp_cfg.FEC_mode > 0 )
+            IF( st->acelp_cfg.FEC_mode > 0 )
             {
                 last_pulse_pos = 0;
                 move16();
 
                 /* decode the last glottal pulse position */
-                T0_tmp = FEC_pos_dec_fx( st_fx, &last_pulse_pos, &enr_q_fx, nb_bits );
-
+                T0_tmp = FEC_pos_dec_fx( st, &last_pulse_pos, &enr_q_fx, nb_bits );
 
                 test();
                 test();
-                IF( NE_16( st_fx->last_core, HQ_CORE ) || ( EQ_16( st_fx->last_core, HQ_CORE ) && st_fx->last_con_tcx ) )
+                IF( NE_16( st->last_core, HQ_CORE ) || ( EQ_16( st->last_core, HQ_CORE ) && st->last_con_tcx ) )
                 {
                     test();
                     test();
@@ -926,16 +1022,13 @@ ivas_error acelp_core_dec_fx(
                     test();
                     test();
                     test();
-                    test();
-                    IF( EQ_16( st_fx->clas_dec, SIN_ONSET ) && last_pulse_pos != 0 && EQ_16( st_fx->prev_bfi, 1 ) )
+                    IF( EQ_16( st->clas_dec, SIN_ONSET ) && last_pulse_pos != 0 && EQ_16( st->prev_bfi, 1 ) )
                     {
-                        st_fx->Q_exc =
-                            FEC_SinOnset_fx( old_exc_fx + L_EXC_MEM_DEC - L_EXC_MEM, last_pulse_pos, T0_tmp, enr_q_fx, Aq_fx, st_fx->L_frame, st_fx->Q_exc );
-                        move16();
+                        FEC_SinOnset_fx( old_exc_fx + L_EXC_MEM_DEC - L_EXC_MEM, last_pulse_pos, T0_tmp, enr_q_fx, Aq_fx, st->L_frame, st->Q_exc );
                     }
-                    ELSE IF( ( EQ_16( st_fx->coder_type, GENERIC ) || EQ_16( st_fx->coder_type, VOICED ) ) && last_pulse_pos != 0 && EQ_16( st_fx->old_bfi_cnt, 1 ) && EQ_16( output_frame, L_FRAME16k ) && st_fx->hWIDec != NULL )
+                    ELSE IF( ( EQ_16( st->coder_type, GENERIC ) || EQ_16( st->coder_type, VOICED ) ) && last_pulse_pos != 0 && EQ_16( st->old_bfi_cnt, 1 ) && st->hWIDec != NULL )
                     {
-                        do_WI_fx = FEC_enhACB_fx( st_fx->L_frame, st_fx->last_L_frame, old_exc_fx + L_EXC_MEM_DEC - L_EXC_MEM, T0_tmp, last_pulse_pos, st_fx->bfi_pitch_fx );
+                        do_WI = FEC_enhACB_fx( st->L_frame, st->last_L_frame, old_exc_fx + L_EXC_MEM_DEC - L_EXC_MEM, T0_tmp, last_pulse_pos, st->bfi_pitch_fx );
                     }
                 }
             }
@@ -944,16 +1037,16 @@ ivas_error acelp_core_dec_fx(
              * In case of first frame after an erasure and transition from voiced to unvoiced or inactive
              * redo the LPC interpolation
              *------------------------------------------------------------*/
+
             test();
             test();
             test();
             test();
             test();
             test();
-            IF( st_fx->stab_fac_fx == 0 && st_fx->old_bfi_cnt > 0 && NE_16( st_fx->clas_dec, VOICED_CLAS ) && NE_16( st_fx->clas_dec, ONSET ) &&
-                st_fx->relax_prev_lsf_interp == 0 && !( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && EQ_16( st_fx->idchan, 1 ) ) )
+            IF( ( st->stab_fac_fx == 0 ) && ( st->old_bfi_cnt > 0 ) && NE_16( st->clas_dec, VOICED_CLAS ) && NE_16( st->clas_dec, ONSET ) && ( st->relax_prev_lsf_interp == 0 ) && !( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( st->idchan, 1 ) ) )
             {
-                int_lsp4_fx( st_fx->L_frame, st_fx->lsp_old_fx, lsp_mid_fx, lsp_new_fx, Aq_fx, M, 2 );
+                int_lsp4_ivas_fx( st->L_frame, st->lsp_old_fx, lsp_mid_fx, lsp_new_fx, Aq_fx, M, 2 );
             }
 
             /*---------------------------------------------------------------*
@@ -962,7 +1055,7 @@ ivas_error acelp_core_dec_fx(
 
             IF( nb_bits > 0 )
             {
-                indice = get_next_indice( st_fx, nb_bits );
+                indice = get_next_indice_fx( st, nb_bits );
                 Es_pred_dec_fx( &Es_pred_fx, indice, nb_bits, uc_two_stage_flag );
             }
 
@@ -972,104 +1065,113 @@ ivas_error acelp_core_dec_fx(
 
             test();
             test();
-#ifdef ADD_LRTD
             IF( tdm_low_rate_mode ) /* tdm stereo low rate mode */
             {
-                IF( LE_16( st_fx->coder_type, UNVOICED ) )
+                IF( LE_16( st->coder_type, UNVOICED ) )
                 {
-                    tdm_low_rate_dec( st_fx, dct_exc_tmp, &tmp_noise, pitch_buf, voice_factors, exc, exc2, bwe_exc, lsf_new );
+                    tdm_low_rate_dec_fx( st, dct_exc_tmp_fx /*, &tmp_noise*/, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, lsf_new_fx );
+                    tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
                 }
                 ELSE /* GENERIC */
                 {
-                    decod_gen_2sbfr( st_fx, sharpFlag, Aq, pitch_buf, voice_factors, exc, exc2, bwe_exc, gain_buf, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf );
+                    decod_gen_2sbfr_fx( st, sharpFlag, Aq_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, gain_buf_fx, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf_fx );
 
-                    IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
+                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
                     {
-                        tmp_noise = st_fx->lp_gainc_fx;
-                        move16();
+                        tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
                     }
                 }
             }
-            else
-#endif
-                IF( EQ_16( st_fx->nelp_mode_dec, 1 ) )
+            ELSE IF( st->nelp_mode_dec )
             {
-                /* SC-VBR - NELP frames */
-                Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st_fx->Q_exc ) ); // Q0
-                st_fx->Q_exc = 0;
+                Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st->Q_exc ) ); // Q0
+                st->Q_exc = 0;
                 move16();
 
-                decod_nelp_fx( st_fx, &tmp_noise_fx, pitch_buf_fx, exc_fx, exc2_fx, voice_factors, bwe_exc_fx, &st_fx->Q_exc, st_fx->bfi, gain_buf );
-                Rescale_exc( hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st_fx->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st_fx->Q_exc ), st_fx->Q_subfr, exc2_fx, L_FRAME, st_fx->coder_type );
+                /* SC-VBR - NELP frames */
+                decod_nelp_fx( st, &tmp_noise_fx, pitch_buf_fx, exc_fx, exc2_fx, voice_factors_fx, bwe_exc_fx, &st->Q_exc, st->bfi, gain_buf_fx );
+
+                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st->Q_exc ), st->Q_subfr, exc2_fx, L_FRAME, st->coder_type );
             }
-            ELSE IF( EQ_16( st_fx->coder_type, UNVOICED ) )
+            ELSE IF( EQ_16( st->coder_type, UNVOICED ) )
             {
                 /* UNVOICED frames */
-                decod_unvoiced_fx( st_fx, Aq_fx, st_fx->coder_type, &tmp_noise_fx, pitch_buf_fx, voice_factors, exc_fx, exc2_fx, bwe_exc_fx, gain_buf );
+                decod_unvoiced_fx( st, Aq_fx, Es_pred_fx, uc_two_stage_flag, st->coder_type, &tmp_noise_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, gain_buf_fx );
+
+                tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
             }
-            ELSE IF( EQ_16( st_fx->ppp_mode_dec, 1 ) )
+            ELSE IF( st->ppp_mode_dec )
             {
-                Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st_fx->Q_exc ) ); // Q0
-                st_fx->Q_exc = 0;
+                Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st->Q_exc ) ); // Q0
+                st->Q_exc = 0;
                 move16();
+
                 /* SC-VBR - PPP frames */
-                IF( NE_32( ( error = decod_ppp_fx( st_fx, Aq_fx, pitch_buf_fx, exc_fx, exc2_fx, st_fx->bfi, gain_buf, voice_factors, bwe_exc_fx ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = decod_ppp_fx( st, Aq_fx, pitch_buf_fx, exc_fx, exc2_fx, st->bfi, gain_buf_fx, voice_factors_fx, bwe_exc_fx ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
 
-                Rescale_exc( hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st_fx->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st_fx->Q_exc ), st_fx->Q_subfr, exc2_fx, L_FRAME, st_fx->coder_type );
+                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st->Q_exc ), st->Q_subfr, exc2_fx, L_FRAME, st->coder_type );
             }
-            ELSE IF( EQ_16( st_fx->coder_type, TRANSITION ) )
+            ELSE IF( EQ_16( st->coder_type, TRANSITION ) )
             {
-                decod_tran_fx( st_fx, st_fx->L_frame, tc_subfr_fx, Aq_fx, Es_pred_fx, pitch_buf_fx, voice_factors, exc_fx, exc2_fx, bwe_exc_fx, unbits, sharpFlag, gain_buf );
+                decod_tran_fx( st, st->L_frame, tc_subfr, Aq_fx, Es_pred_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, unbits, sharpFlag, gain_buf_fx );
             }
-            ELSE IF( EQ_16( st_fx->coder_type, AUDIO ) || ( ( st_fx->coder_type == INACTIVE ) && LE_32( st_fx->core_brate, MAX_GSC_INACTIVE_BRATE ) ) )
+            ELSE IF( EQ_16( st->coder_type, AUDIO ) || ( ( st->coder_type == INACTIVE ) && st->inactive_coder_type_flag ) )
             {
-                decod_audio_fx( st_fx, dct_exc_tmp, Aq_fx, pitch_buf_fx, voice_factors, exc_fx, exc2_fx, bwe_exc_fx, lsf_new_fx, gain_buf
-#ifdef ADD_LRTD
-                                ,
-                                tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf
-#endif
-                );
-                tmp_noise_fx = shr_r( st_fx->lp_gainc_fx, 3 ); /*Q0*/
+                /* AUDIO and INACTIVE frames (coded by GSC technology) */
+                decod_audio_fx( st, dct_exc_tmp_fx, Aq_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, lsf_new_fx, gain_buf_fx,
+                                tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf_fx );
+
+                tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
             }
             ELSE
             {
-                IF( NE_32( ( error = decod_gen_voic_fx( st_fx, st_fx->L_frame, sharpFlag, Aq_fx, Es_pred_fx, do_WI_fx, pitch_buf_fx, voice_factors, exc_fx, exc2_fx, bwe_exc_fx, unbits, gain_buf /*, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf*/ ) ), IVAS_ERR_OK ) )
+                /* GENERIC, VOICED and INACTIVE frames (coded by AVQ technology) */
+                IF( NE_32( ( error = decod_gen_voic_fx( st, st->L_frame, sharpFlag, Aq_fx, Es_pred_fx, do_WI, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, unbits, gain_buf_fx, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf_fx ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
 
-                IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
+                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
                 {
-                    tmp_noise_fx = shr_r( st_fx->lp_gainc_fx, 3 ); /*Q0*/
+                    tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
                 }
             }
 
             /* synthesis for ACELP core switching and SWB BWE */
-            syn_12k8_fx( st_fx->L_frame, Aq_fx, exc_fx, temp_buf_fx, st_fx->mem_syn1_fx, 1, st_fx->Q_exc, -1 );
+            syn_12k8_fx( st->L_frame, Aq_fx, exc_fx, temp_buf_fx, st->mem_syn1_fx, 1, st->Q_exc, -1 );
+
             /* save and delay synthesis to be used by SWB BWE */
-            IF( hBWE_FD != NULL )
+            IF( st->hBWE_FD != NULL )
             {
-                save_old_syn_fx( st_fx->L_frame, temp_buf_fx, old_syn_12k8_16k, hBWE_FD->old_syn_12k8_16k_fx, st_fx->preemph_fac, &hBWE_FD->mem_deemph_old_syn_fx );
+                save_old_syn_fx( st->L_frame, temp_buf_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );
             }
 
             /*-----------------------------------------------------------------*
              * Apply energy matching when switching to inactive frames
              *-----------------------------------------------------------------*/
 
-            Inac_swtch_ematch_fx( exc2_fx, dct_exc_tmp, st_fx->hGSCDec->lt_ener_per_band_fx, st_fx->coder_type, st_fx->L_frame, st_fx->core_brate, st_fx->Q_exc, st_fx->bfi, st_fx->last_core, st_fx->last_codec_mode );
+            Inac_switch_ematch_fx( exc2_fx, dct_exc_tmp_fx, st->hGSCDec->lt_ener_per_band_fx, st->coder_type, st->inactive_coder_type_flag, st->L_frame, st->Q_exc, st->bfi, st->last_core, st->last_codec_mode, tdm_low_rate_mode, st->element_mode );
+
             /*------------------------------------------------------------*
              * Decode information and modify the excitation signal of stationary unvoiced frames
              *------------------------------------------------------------*/
+
             test();
             test();
             test();
             test();
-            IF( !( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) ) && NE_16( st_fx->nelp_mode_dec, 1 ) && !( EQ_16( st_fx->element_mode, IVAS_SCE ) && tdm_low_rate_mode ) )
+            IF( !( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) ) && NE_16( st->nelp_mode_dec, 1 ) && !( EQ_16( st->element_mode, IVAS_SCE ) && tdm_low_rate_mode ) )
             {
-                stat_noise_uv_dec_fx( st_fx, lsp_new_fx, lsp_mid_fx, Aq_fx, exc2_fx, uc_two_stage_flag );
+                Word16 temp_q_exc = st->Q_exc;
+                move16();
+                stat_noise_uv_dec_fx( st, lsp_new_fx, lsp_mid_fx, Aq_fx, exc2_fx, uc_two_stage_flag );
+                IF( NE_16( temp_q_exc, st->Q_exc ) )
+                {
+                    scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM + st->L_frame, sub( st->Q_exc, temp_q_exc ) );
+                }
             }
 
             /*------------------------------------------------------------*
@@ -1078,80 +1180,92 @@ ivas_error acelp_core_dec_fx(
              *------------------------------------------------------------*/
 
             /* update past excitation signals for LD music post-filter */
-            IF( hMusicPF != NULL )
+            IF( st->hMusicPF != NULL )
             {
-                Copy( hMusicPF->dct_post_old_exc_fx + L_FRAME, hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
-                Copy( exc2_fx, hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
-                Copy( hMusicPF->dct_post_old_exc_fx, exc_buffer_fx, DCT_L_POST - OFFSET2 );
+                Copy( st->hMusicPF->dct_post_old_exc_fx + L_FRAME, st->hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
+                Copy( exc2_fx, st->hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
+                Copy( st->hMusicPF->dct_post_old_exc_fx, exc_buffer_fx, DCT_L_POST - OFFSET2 );
             }
+
             test();
             test();
             test();
-            test();
-            IF( hMusicPF != NULL && ( ( EQ_16( st_fx->coder_type, AUDIO ) && st_fx->GSC_noisy_speech == 0 ) || ( GE_16( st_fx->GSC_IVAS_mode, 1 ) && EQ_16( st_fx->L_frame, L_FRAME ) ) ) )
+            IF( ( EQ_16( st->coder_type, AUDIO ) && !st->GSC_noisy_speech ) || ( GE_16( st->GSC_IVAS_mode, 1 ) && EQ_16( st->L_frame, L_FRAME ) ) )
             {
-
-                Word16 last_coder_type = st_fx->last_coder_type;
+                Word16 last_coder_type = st->last_coder_type;
                 move16();
+
                 test();
                 test();
                 test();
-                if ( ( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) ) || ( GE_16( st_fx->GSC_IVAS_mode, 1 ) && st_fx->GSC_noisy_speech == 0 ) )
+                if ( ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) ) || ( GE_16( st->GSC_IVAS_mode, 1 ) && ( st->GSC_noisy_speech == 0 ) ) )
                 {
                     last_coder_type = AUDIO;
                     move16();
                 }
-                /* Extrapolation of the last future part, windowing and high resolution DCT transform */
-                qdct = 0;
+
+                Word16 qdct = 0;
                 move16();
-#ifdef _DIFF_FLOAT_FIX_ /* FLoat point using last_core which fits with the inner part of the function */
-                Prep_music_postP_fx( exc_buffer_fx, dct_buffer_fx, hMusicPF->filt_lfE_fx, st_fx->last_core, st_fx->element_mode, pitch_buf_fx,
-                                     hMusicPF->LDm_enh_lp_gbin_fx, st_fx->Q_exc, &qdct );
-#else
-                Prep_music_postP_fx( exc_buffer_fx, dct_buffer_fx, hMusicPF->filt_lfE_fx, st_fx->last_coder_type, st_fx->element_mode, pitch_buf_fx,
-                                     hMusicPF->LDm_enh_lp_gbin_fx, st_fx->Q_exc, &qdct );
-#endif
+
+                /* Extrapolation of the last future part, windowing and high resolution DCT transform */
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    // VE: TBV: this is likely a bug in EVS - 'st->last_coder_type' should be replaced by 'st->core_brate'
+                    Prep_music_postP_fx( exc_buffer_fx, dct_buffer_fx, st->hMusicPF->filt_lfE_fx, st->last_coder_type, st->element_mode, pitch_buf_fx,
+                                         st->hMusicPF->LDm_enh_lp_gbin_fx, st->Q_exc, &qdct );
+                }
+                ELSE
+                {
+                    Prep_music_postP_fx( exc_buffer_fx, dct_buffer_fx, st->hMusicPF->filt_lfE_fx, st->last_core, st->element_mode, pitch_buf_fx, st->hMusicPF->LDm_enh_lp_gbin_fx, st->Q_exc, &qdct );
+                }
+
                 /* LD music post-filter */
-                LD_music_post_filter_fx( hMusicPF, dct_buffer_fx, dct_buffer_fx, st_fx->core_brate,
-                                         &hMusicPF->Old_ener_Q, AUDIO, last_coder_type, qdct );
+                LD_music_post_filter_fx( st->hMusicPF, dct_buffer_fx, dct_buffer_fx, st->core_brate, &st->hMusicPF->Old_ener_Q, AUDIO, last_coder_type, qdct );
 
                 /* Inverse DCT transform, retrieval of the aligned excitation, re-synthesis */
-                Post_music_postP_fx( dct_buffer_fx, exc2_fx, st_fx->mem_syn2_fx, st_fx->mem_syn2_fx, Aq_fx, syn_fx, &st_fx->Q_exc, &st_fx->prev_Q_syn,
-                                     &st_fx->Q_syn, st_fx->mem_syn_clas_estim_fx, 0, &st_fx->mem_deemph_fx, hBPF->pst_old_syn_fx,
-                                     &hBPF->pst_mem_deemp_err_fx, &st_fx->agc_mem_fx[1], st_fx->hPFstat, temp_buf_fx, mem_tmp_fx );
+                IF( NE_16( st->element_mode, EVS_MONO ) ) // VE: TBC whether needed in IVAS
+                {
+                    Copy( st->mem_syn2_fx, mem_tmp_fx, M ); /*Q_syn*/
+                }
+
+                Post_music_postP_fx( dct_buffer_fx, exc2_fx, st->mem_syn2_fx, st->mem_syn2_fx, Aq_fx, psyn_fx, &st->Q_exc, &st->prev_Q_syn,
+                                     &st->Q_syn, st->mem_syn_clas_estim_fx, 0, &st->mem_deemph_fx, st->hBPF->pst_old_syn_fx,
+                                     &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, temp_buf_fx, mem_tmp_fx );
             }
             ELSE
             {
                 /* Core synthesis at 12.8kHz or 16kHz */
                 i = 1;
                 move16();
-                if ( st_fx->coder_type == INACTIVE )
+                test();
+                if ( st->coder_type == INACTIVE && st->element_mode == EVS_MONO )
                 {
                     i = 0;
                     move16();
                 }
+
                 /* add extra headroom in case a CNA addition is likely (i.e. st_fx->psf_lp_noise_fx is close to the threshold) */
-                k = 0;
+                Word16 k = 0;
                 move16();
                 test();
                 test();
-                if ( ( st_fx->coder_type == INACTIVE ) && st_fx->flag_cna && GE_16( round_fx( L_shl( st_fx->lp_noise, 1 ) ), 15 << 7 ) )
+                if ( st->coder_type == INACTIVE && st->flag_cna && GE_16( round_fx( L_shl( st->lp_noise, 1 ) ), 15 << 7 ) )
                 {
                     k = 1;
                     move16();
                 }
 
-                Rescale_mem( st_fx->Q_exc, &st_fx->prev_Q_syn, &st_fx->Q_syn, st_fx->mem_syn2_fx, st_fx->mem_syn_clas_estim_fx, 4, &st_fx->mem_deemph_fx,
-                             hBPF->pst_old_syn_fx, &hBPF->pst_mem_deemp_err_fx, &st_fx->agc_mem_fx[1], st_fx->hPFstat, i, k, temp_buf_fx );
-                Copy( st_fx->mem_syn2_fx, mem_tmp_fx, M ); // Q_syn
+                Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, 4, &st->mem_deemph_fx,
+                             st->hBPF->pst_old_syn_fx, &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, i, k, temp_buf_fx );
 
-                syn_12k8_fx( st_fx->L_frame, Aq_fx, exc2_fx, syn_fx, st_fx->mem_syn2_fx, 1, st_fx->Q_exc, st_fx->Q_syn );
-                IF( hMusicPF != NULL )
+                Copy( st->mem_syn2_fx, mem_tmp_fx, M ); /*Q_syn*/
+                syn_12k8_fx( st->L_frame, Aq_fx, exc2_fx, psyn_fx, st->mem_syn2_fx, 1, st->Q_exc, st->Q_syn );
+
+                IF( st->hMusicPF != NULL )
                 {
                     FOR( i = 0; i < DCT_L_POST; i++ )
                     {
-                        /*st_fx->filt_lfE_fx[i] = 0.3f + 0.7f * st_fx->filt_lfE_fx[i];*/
-                        hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( ( 1228 << ( 16 ) ), 22938, hMusicPF->filt_lfE_fx[i] ) );
+                        st->hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( ( 1228 << ( 16 ) ), 22938, st->hMusicPF->filt_lfE_fx[i] ) );
                         move16();
                     }
                 }
@@ -1161,43 +1275,35 @@ ivas_error acelp_core_dec_fx(
              * FEC - Estimate the classification information
              *------------------------------------------------------------*/
 
-            FEC_clas_estim_fx( st_fx, st_fx->Opt_AMR_WB, st_fx->L_frame, &st_fx->clas_dec, st_fx->coder_type, pitch_buf_fx,
-                               syn_fx, &st_fx->lp_ener_FER_fx, &st_fx->decision_hyst,
-                               NULL, NULL, NULL, NULL, 0, NULL, st_fx->Q_syn, temp_buf_fx,
-                               st_fx->mem_syn_clas_estim_fx, &st_fx->classifier_Q_mem_syn,
-                               0, 0, 0, st_fx->last_core_brate, st_fx->acelp_cfg.FEC_mode );
+            FEC_clas_estim_fx( st, st->Opt_AMR_WB, st->L_frame, &st->clas_dec, st->coder_type, pitch_buf_fx, psyn_fx, &st->lp_ener_FER_fx, &st->decision_hyst,
+                               NULL, NULL, NULL, NULL, 0, NULL, st->Q_syn, temp_buf_fx, st->mem_syn_clas_estim_fx, &st->classifier_Q_mem_syn, 0, 0, 0, st->last_core_brate, st->acelp_cfg.FEC_mode );
+
             /*------------------------------------------------------------*
              * FEC - Estimate pitch
              *------------------------------------------------------------*/
 
-            FEC_pitch_estim_fx( st_fx->Opt_AMR_WB, st_fx->last_core, st_fx->L_frame, st_fx->clas_dec, st_fx->last_good, pitch_buf_fx, st_fx->old_pitch_buf_fx,
-                                &st_fx->bfi_pitch_fx, &st_fx->bfi_pitch_frame, &st_fx->upd_cnt, st_fx->coder_type, st_fx->element_mode );
+            FEC_pitch_estim_fx( st->Opt_AMR_WB, st->last_core, st->L_frame, st->clas_dec, st->last_good, pitch_buf_fx, st->old_pitch_buf_fx,
+                                &st->bfi_pitch_fx, &st->bfi_pitch_frame, &st->upd_cnt, st->coder_type, st->element_mode );
 
             /*------------------------------------------------------------*
              * FEC - Smooth the speech energy evolution when recovering after a BAD frame
              * (smoothing is performed in the excitation domain and signal is resynthesized after)
              *------------------------------------------------------------*/
 
-            k = 0;
-            move16();
-            FOR( i = 0; i < st_fx->L_frame; i += L_SUBFR )
-            {
-                pitch_buf_tmp[k] = mult_r( pitch_buf_fx[k], 512 ); // Q0(6+9-15) , (512 = 1.0f in Q9)
-                move16();
-                k = add( k, 1 );
-            }
+            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, st->nb_subfr, -Q6 ); // Q0
 
-            FEC_scale_syn_fx( st_fx->L_frame, &update_flg, st_fx->clas_dec, st_fx->last_good, syn_fx, pitch_buf_tmp, st_fx->enr_old_fx, enr_q_fx, st_fx->coder_type, LSF_Q_prediction,
-                              &st_fx->scaling_flag, &st_fx->lp_ener_FEC_av, &st_fx->lp_ener_FEC_max, st_fx->bfi, st_fx->total_brate, st_fx->prev_bfi, st_fx->last_core_brate,
-                              exc_fx, exc2_fx, Aq_fx, &st_fx->old_enr_LP, mem_tmp_fx, st_fx->mem_syn2_fx, st_fx->Q_exc, st_fx->Q_syn, avoid_lpc_burst_on_recovery, 0 );
+            FEC_scale_syn_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, psyn_fx, pitch_buf_tmp, st->enr_old_fx, enr_q_fx, st->coder_type, LSF_Q_prediction,
+                              &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,
+                              exc_fx, exc2_fx, Aq_fx, &st->old_enr_LP, mem_tmp_fx, st->mem_syn2_fx, st->Q_exc, st->Q_syn, st->element_mode, avoid_lpc_burst_on_recovery, 0 );
 
             test();
             test();
             test();
             test();
-            IF( ( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && LE_32( st_fx->total_brate, ACELP_7k20 ) ) || ( EQ_32( st_fx->total_brate, ACELP_7k20 ) ) || ( EQ_32( st_fx->total_brate, ACELP_8k00 ) ) )
+            /* estimate the pitch-synchronous speech energy per sample to be used when normal operation recovers */
+            IF( ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && LE_32( st->total_brate, ACELP_7k20 ) ) || EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )
             {
-                frame_ener_fx( st_fx->L_frame, st_fx->clas_dec, syn_fx, pitch_buf_tmp[sub( shr( st_fx->L_frame, 6 ), 1 )], &st_fx->enr_old_fx, st_fx->L_frame, st_fx->Q_syn, 3, 0 );
+                frame_ener_fx( st->L_frame, st->clas_dec, psyn_fx, pitch_buf_tmp[( ( st->L_frame ) >> 6 ) - 1], &st->enr_old_fx, st->L_frame, st->Q_syn, 3, 0 );
             }
         }
 
@@ -1206,206 +1312,188 @@ ivas_error acelp_core_dec_fx(
     /*----------------------------------------------------------------*
      * BAD frame
      *----------------------------------------------------------------*/
+
     ELSE
     {
         /* SC-VBR */
-        if ( EQ_16( st_fx->last_nelp_mode_dec, 1 ) )
+        if ( EQ_16( st->last_nelp_mode_dec, 1 ) )
         {
-            st_fx->nelp_mode_dec = 1;
+            st->nelp_mode_dec = 1;
             move16();
         }
 
-        /* long burst frame erasures */
         test();
         test();
-        if ( GT_16( st_fx->nbLostCmpt, 5 ) && GE_16( st_fx->clas_dec, VOICED_CLAS ) && LT_16( st_fx->clas_dec, INACTIVE_CLAS ) )
+        /* long burst frame erasures */
+        if ( GT_16( st->nbLostCmpt, 5 ) && GE_16( st->clas_dec, VOICED_CLAS ) && LT_16( st->clas_dec, INACTIVE_CLAS ) )
         {
-            st_fx->last_good = VOICED_TRANSITION;
+            st->last_good = VOICED_TRANSITION;
             move16();
         }
 
         /* LSF estimation and A(z) calculation */
-        lsf_dec_bfi( MODE1, lsf_new_fx, st_fx->lsf_old_fx, st_fx->lsf_adaptive_mean_fx, NULL, st_fx->mem_MA_fx, st_fx->mem_AR_fx,
-                     st_fx->stab_fac_fx, st_fx->last_coder_type, st_fx->L_frame, st_fx->last_good,
-                     st_fx->nbLostCmpt, 0, NULL, NULL, NULL, st_fx->hGSCDec->Last_GSC_pit_band_idx, st_fx->Opt_AMR_WB, 0, st_fx->bwidth );
-
-        FEC_lsf2lsp_interp( st_fx, st_fx->L_frame, Aq_fx, lsf_new_fx, lsp_new_fx );
+        lsf_dec_bfi( MODE1, lsf_new_fx, st->lsf_old_fx, st->lsf_adaptive_mean_fx, NULL, st->mem_MA_fx, st->mem_AR_fx, st->stab_fac_fx, st->last_coder_type, st->L_frame, st->last_good, st->nbLostCmpt, 0, NULL, NULL, NULL, st->hGSCDec->Last_GSC_pit_band_idx, st->Opt_AMR_WB, 0, st->bwidth );
 
-        IF( EQ_16( st_fx->nelp_mode_dec, 1 ) )
+        FEC_lsf2lsp_interp( st, st->L_frame, Aq_fx, lsf_new_fx, lsp_new_fx );
+        IF( EQ_16( st->nelp_mode_dec, 1 ) )
         {
             /* SC-VBR */
-            Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st_fx->Q_exc ) ); // Q0
-            st_fx->Q_exc = 0;
+            Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st->Q_exc ) ); // Q0
+            st->Q_exc = 0;
             move16();
 
-            decod_nelp_fx( st_fx, &tmp_noise_fx, pitch_buf_fx, exc_fx, exc2_fx, voice_factors, bwe_exc_fx, &st_fx->Q_exc, st_fx->bfi, gain_buf );
+            decod_nelp_fx( st, &tmp_noise_fx, pitch_buf_fx, exc_fx, exc2_fx, voice_factors_fx, bwe_exc_fx, &st->Q_exc, st->bfi, gain_buf_fx );
             FEC_pitch_fx = pitch_buf_fx[3];
             move16();
-
-            Rescale_exc( hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st_fx->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st_fx->Q_exc ), st_fx->Q_subfr, exc2_fx, L_FRAME, st_fx->coder_type );
+            Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st->Q_exc ), st->Q_subfr, exc2_fx, L_FRAME, st->coder_type );
         }
         ELSE
         {
             /* calculation of excitation signal */
+            FEC_exc_estim_fx( st, st->L_frame, exc_fx, exc2_fx, dct_exc_tmp_fx, pitch_buf_fx, voice_factors_fx, &FEC_pitch_fx, bwe_exc_fx, lsf_new_fx, &st->Q_exc, &tmp_noise_fx );
 
-            FEC_exc_estim_fx( st_fx, st_fx->L_frame, exc_fx, exc2_fx, dct_exc_tmp, pitch_buf_fx, voice_factors, &FEC_pitch_fx, bwe_exc_fx, lsf_new_fx, &st_fx->Q_exc, &tmp_noise_fx );
-
-            Rescale_exc( NULL, exc_fx, bwe_exc_fx, st_fx->hGSCDec->last_exc_dct_in_fx, st_fx->L_frame, L_FRAME32k, (Word32) 0,
-                         &( st_fx->Q_exc ), st_fx->Q_subfr, exc2_fx, st_fx->L_frame, st_fx->last_coder_type );
+            Rescale_exc( NULL, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame, L_FRAME32k, (Word32) 0,
+                         &( st->Q_exc ), st->Q_subfr, exc2_fx, st->L_frame, st->last_coder_type );
 
-            tmp_noise_fx = shr_r( st_fx->lp_gainc_fx, 3 ); /*Q0*/
+            tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
 
             /* SC-VBR */
-            st_fx->prev_gain_pit_dec_fx = st_fx->lp_gainp_fx;
-            move16(); /*Q14*/
+            st->prev_gain_pit_dec_fx = st->lp_gainp_fx;
+            move16();
         }
 
         /* synthesis for ACELP core switching and SWB BWE */
-        syn_12k8_fx( st_fx->L_frame, Aq_fx, exc_fx, temp_buf_fx, st_fx->mem_syn1_fx, 1, st_fx->Q_exc, -1 ); /*old_syn_12k8_16k directly in q-1*/
+        syn_12k8_fx( st->L_frame, Aq_fx, exc_fx, temp_buf_fx, st->mem_syn1_fx, 1, st->Q_exc, -1 );
 
         /* save and delay synthesis to be used by SWB BWE */
-        IF( hBWE_FD != NULL )
+        IF( st->hBWE_FD != NULL )
         {
-            save_old_syn_fx( st_fx->L_frame, temp_buf_fx, old_syn_12k8_16k, hBWE_FD->old_syn_12k8_16k_fx, st_fx->preemph_fac, &hBWE_FD->mem_deemph_old_syn_fx );
+            save_old_syn_fx( st->L_frame, temp_buf_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );
         }
+
         /* Apply energy matching when switching to inactive frames */
-        Inac_swtch_ematch_fx( exc2_fx, dct_exc_tmp, st_fx->hGSCDec->lt_ener_per_band_fx, st_fx->coder_type, st_fx->L_frame, st_fx->core_brate, st_fx->Q_exc, st_fx->bfi, st_fx->last_core, st_fx->last_codec_mode );
+        Inac_switch_ematch_fx( exc2_fx, dct_exc_tmp_fx, st->hGSCDec->lt_ener_per_band_fx, st->coder_type, st->inactive_coder_type_flag, st->L_frame, st->Q_exc, st->bfi, st->last_core, st->last_codec_mode, tdm_low_rate_mode, st->element_mode );
 
-        /* udate past excitation signals for LD music post-filter */
-        IF( hMusicPF != NULL )
+        /* update past excitation signals for LD music post-filter */
+        IF( st->hMusicPF != NULL )
         {
-            Copy( hMusicPF->dct_post_old_exc_fx + L_FRAME, hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
-            Copy( exc2_fx, hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
+            Copy( st->hMusicPF->dct_post_old_exc_fx + L_FRAME, st->hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
+            Copy( exc2_fx, st->hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
+
             /* Update music post processing values */
             /* Filter energies update */
             FOR( i = 0; i < DCT_L_POST; i++ )
             {
-                /*st_fx->filt_lfE_fx[i] = 0.3f + 0.7f * st_fx->filt_lfE_fx[i];*/
-                hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( ( 1228 << ( 16 ) ), 22938, hMusicPF->filt_lfE_fx[i] ) );
+                st->hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( 1228 << 16, 22938, st->hMusicPF->filt_lfE_fx[i] ) );
                 move16();
             }
+
             /* Update circular buffer, keep last energy difference unchanged */
             FOR( i = 1; i < MAX_LT; i++ )
             {
-                hMusicPF->LDm_lt_diff_etot_fx[i - 1] = hMusicPF->LDm_lt_diff_etot_fx[i];
+                st->hMusicPF->LDm_lt_diff_etot_fx[i - 1] = st->hMusicPF->LDm_lt_diff_etot_fx[i];
                 move16();
             }
         }
+
         /* synthesis at 12k8 Hz sampling rate */
         /* add extra headroom in case a CNA addition is likely (i.e. st_fx->psf_lp_noise_fx is close to the threshold) */
-        k = 0;
+        Word16 k = 0;
         move16();
         test();
         test();
-        if ( ( st_fx->coder_type == INACTIVE ) && st_fx->flag_cna && GE_16( round_fx( L_shl( st_fx->lp_noise, 1 ) ), 15 << 7 ) )
+        if ( st->coder_type == INACTIVE && st->flag_cna && GE_16( round_fx( L_shl( st->lp_noise, 1 ) ), 15 << 7 ) )
         {
             k = 1;
             move16();
         }
 
-        Rescale_mem( st_fx->Q_exc, &st_fx->prev_Q_syn, &st_fx->Q_syn, st_fx->mem_syn2_fx, st_fx->mem_syn_clas_estim_fx, 4, &st_fx->mem_deemph_fx,
-                     hBPF->pst_old_syn_fx, &hBPF->pst_mem_deemp_err_fx, &st_fx->agc_mem_fx[1], st_fx->hPFstat, 1, k, temp_buf_fx );
+        Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, 4, &st->mem_deemph_fx,
+                     st->hBPF->pst_old_syn_fx, &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, 1, k, temp_buf_fx );
 
         test();
-        IF( ( EQ_32( st_fx->total_brate, ACELP_7k20 ) ) || ( EQ_32( st_fx->total_brate, ACELP_8k00 ) ) )
+        IF( EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )
         {
-            Copy( st_fx->mem_syn2_fx, mem_tmp_fx, M ); // Q_syn
+            Copy( st->mem_syn2_fx, mem_tmp_fx, M );
         }
-        syn_12k8_fx( st_fx->L_frame, Aq_fx, exc2_fx, syn_fx, st_fx->mem_syn2_fx, 1, st_fx->Q_exc, st_fx->Q_syn );
+        syn_12k8_fx( st->L_frame, Aq_fx, exc2_fx, psyn_fx, st->mem_syn2_fx, 1, st->Q_exc, st->Q_syn );
 
         /* update buffer for classifier */
-        IF( st_fx->hWIDec != NULL )
+        IF( st->hWIDec != NULL )
         {
-            Copy( exc2_fx + st_fx->L_frame - L_EXC_MEM, st_fx->hWIDec->old_exc2_fx, L_EXC_MEM );
-            Copy( syn_fx + st_fx->L_frame - L_EXC_MEM, st_fx->hWIDec->old_syn2_fx, L_EXC_MEM );
+            Copy( exc2_fx + sub( st->L_frame, L_EXC_MEM ), st->hWIDec->old_exc2_fx, L_EXC_MEM );
+            Copy( psyn_fx + sub( st->L_frame, L_EXC_MEM ), st->hWIDec->old_syn2_fx, L_EXC_MEM );
         }
-        st_fx->prev_Q_exc_fr = st_fx->Q_exc;
+        st->prev_Q_exc_fr = st->Q_exc;
         move16();
-        st_fx->prev_Q_syn_fr = st_fx->Q_syn;
+        st->prev_Q_syn_fr = st->Q_syn;
         move16();
+        Copy( psyn_fx + sub( st->L_frame, L_SYN_MEM_CLAS_ESTIM ), st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
 
-        Copy( syn_fx + st_fx->L_frame - L_SYN_MEM_CLAS_ESTIM, st_fx->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
+        /*------------------------------------------------------------*
+         * FEC - Smooth the speech energy evolution when recovering after a BAD frame
+         * (smoothing is performed in the excitation domain and signal is resynthesized after)
+         *------------------------------------------------------------*/
 
         test();
-        IF( ( EQ_32( st_fx->total_brate, ACELP_7k20 ) ) || ( EQ_32( st_fx->total_brate, ACELP_8k00 ) ) )
+        IF( EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )
         {
-            k = 0;
-            move16();
-            FOR( i = 0; i < st_fx->L_frame; i += L_SUBFR )
-            {
-                pitch_buf_tmp[k] = mult_r( pitch_buf_fx[k], 512 ); // Q0(6+9-15) , (512 = 1.0f in Q9)
-                move16();
-                k = add( k, 1 );
-            }
-
-            /*------------------------------------------------------------*
-             * FEC - Smooth the speech energy evolution when recovering after a BAD frame
-             * (smoothing is performed in the excitation domain and signal is resynthesized after)
-             *------------------------------------------------------------*/
+            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, st->nb_subfr, -Q6 ); // Q0
 
-            FEC_scale_syn_fx( st_fx->L_frame, &update_flg, st_fx->clas_dec, st_fx->last_good, syn_fx, pitch_buf_tmp, st_fx->enr_old_fx, enr_q_fx, st_fx->coder_type, LSF_Q_prediction,
-                              &st_fx->scaling_flag, &st_fx->lp_ener_FEC_av, &st_fx->lp_ener_FEC_max, st_fx->bfi, st_fx->total_brate, st_fx->prev_bfi, st_fx->last_core_brate,
-                              exc_fx, exc2_fx, Aq_fx, &st_fx->old_enr_LP, mem_tmp_fx, st_fx->mem_syn2_fx, st_fx->Q_exc, st_fx->Q_syn, avoid_lpc_burst_on_recovery, 0 );
+            FEC_scale_syn_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, psyn_fx, pitch_buf_tmp, st->enr_old_fx, enr_q_fx, st->coder_type, LSF_Q_prediction,
+                              &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,
+                              exc_fx, exc2_fx, Aq_fx, &st->old_enr_LP, mem_tmp_fx, st->mem_syn2_fx, st->Q_exc, st->Q_syn, st->element_mode, avoid_lpc_burst_on_recovery, 0 );
         }
 
         /* estimate the pitch-synchronous speech energy per sample to be used when normal operation recovers */
-        /* fer_energy( st_fx->L_frame, st_fx->last_good, syn_fx, FEC_pitch_fx, &st_fx->enr_old_fx, st_fx->L_frame ); */
-        frame_ener_fx( st_fx->L_frame, st_fx->last_good, syn_fx, shr( add( FEC_pitch_fx, 32 ), 6 ), &st_fx->enr_old_fx, st_fx->L_frame, st_fx->Q_syn, 3, 0 );
+        frame_ener_fx( st->L_frame, st->last_good, psyn_fx, shr( add( FEC_pitch_fx, 32 ), 6 ), &st->enr_old_fx, st->L_frame, st->Q_syn, 3, 0 );
 
-        IF( st_fx->nelp_mode_dec != 1 )
+        IF( NE_16( st->nelp_mode_dec, 1 ) )
         {
             /* modify the excitation signal of stationary unvoiced frames */
-            stat_noise_uv_mod_fx( st_fx->coder_type, 0, st_fx->lsp_old_fx, lsp_new_fx, lsp_new_fx, Aq_fx, exc2_fx, st_fx->Q_exc, 1, &st_fx->ge_sm_fx,
-                                  &st_fx->uv_count, &st_fx->act_count, st_fx->lspold_s_fx, &st_fx->noimix_seed, &st_fx->min_alpha_fx,
-                                  &st_fx->exc_pe_fx, st_fx->core_brate, st_fx->bwidth, &st_fx->Q_stat_noise, &st_fx->Q_stat_noise_ge );
+            stat_noise_uv_mod_fx( st->coder_type, 0, st->lsp_old_fx, lsp_new_fx, lsp_new_fx, Aq_fx, exc2_fx, st->Q_exc, 1, &st->ge_sm_fx,
+                                  &st->uv_count, &st->act_count, st->lspold_s_fx, &st->noimix_seed, &st->min_alpha_fx,
+                                  &st->exc_pe_fx, st->core_brate, st->bwidth, &st->Q_stat_noise, &st->Q_stat_noise_ge );
         }
-
-        /* SC-VBR */
-        st_fx->hSC_VBR->FadeScale_fx = mult( st_fx->hSC_VBR->FadeScale_fx, 24576 ); /*24576 in Q15*/
-        move16();
     }
-    IF( hBWE_TD != NULL )
+
+    IF( st->hBWE_TD != NULL )
     {
-        IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+        IF( EQ_16( st->L_frame, L_FRAME ) )
         {
-            Copy( Aq_fx + 2 * ( M + 1 ), hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) ); // Q12
+            Copy( Aq_fx + 2 * ( M + 1 ), st->hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) );
         }
         ELSE
         {
-            Copy( Aq_fx + 3 * ( M + 1 ), hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) ); // Q12
+            Copy( Aq_fx + 3 * ( M + 1 ), st->hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) );
         }
     }
+
     /*--------------------------------------------------------*
      * Apply NB postfilter in case of 8kHz output
      *--------------------------------------------------------*/
+
     test();
-    IF( EQ_16( st_fx->last_bwidth, NB ) && st_fx->hPFstat != NULL )
+    IF( st->last_bwidth == NB && st->hPFstat != NULL )
     {
-        k = 0;
-        move16();
-        FOR( i = 0; i < st_fx->L_frame; i += L_SUBFR )
-        {
-            pitch_buf_tmp[k] = mult_r( pitch_buf_fx[k], 512 ); // Q0(6+9-15) , (512 = 1.0f in Q9)
-            move16();
-            k = add( k, 1 );
-        }
+        Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, st->nb_subfr, -Q6 ); // Q0
 
-        IF( EQ_16( st_fx->bwidth, NB ) )
+        IF( st->bwidth == NB )
         {
-            st_fx->hPFstat->on = 1;
+            st->hPFstat->on = 1;
             move16();
-            nb_post_filt_fx( st_fx->L_frame, st_fx->hPFstat, &st_fx->psf_lp_noise_fx, tmp_noise_fx, syn_fx, Aq_fx, pitch_buf_tmp, st_fx->coder_type, st_fx->BER_detect, 0 );
+            nb_post_filt_fx( st->L_frame, st->hPFstat, &st->psf_lp_noise_fx, tmp_noise_fx, psyn_fx, Aq_fx, pitch_buf_tmp, st->coder_type, st->BER_detect, 0 );
         }
         ELSE
         {
-            st_fx->hPFstat->on = 0;
+            st->hPFstat->on = 0;
             move16();
-            nb_post_filt_fx( st_fx->L_frame, st_fx->hPFstat, &st_fx->psf_lp_noise_fx, tmp_noise_fx, syn_fx, Aq_fx, pitch_buf_tmp, AUDIO, st_fx->BER_detect, 0 );
+            nb_post_filt_fx( st->L_frame, st->hPFstat, &st->psf_lp_noise_fx, tmp_noise_fx, psyn_fx, Aq_fx, pitch_buf_tmp, AUDIO, st->BER_detect, 0 );
         }
     }
     ELSE
     {
-        st_fx->psf_lp_noise_fx = round_fx( L_shl( st_fx->lp_noise, 1 ) );
+        st->psf_lp_noise_fx = round_fx( L_shl( st->lp_noise, 1 ) );
         move16();
     }
 
@@ -1413,241 +1501,256 @@ ivas_error acelp_core_dec_fx(
      * Perform fixed deemphasis through 1/(1 - g*z^-1)
      *-----------------------------------------------------------------*/
 
-    /* Update old synthesis buffer - needed for ACELP internal sampling rate switching */
-    Copy( syn_fx + st_fx->L_frame - L_SYN_MEM, st_fx->mem_syn_r, L_SYN_MEM );
-    deemph_fx( syn_fx, st_fx->preemph_fac, st_fx->L_frame, &( st_fx->mem_deemph_fx ) );
-    unscale_AGC( syn_fx, st_fx->Q_syn, syn_fx_tmp2, st_fx->agc_mem_fx, st_fx->L_frame );
-    Copy( syn_fx_tmp2, syn_fx, st_fx->L_frame );
-
-    /* Update MODE2 memories*/
-    IF( hTcxDec != NULL )
+    /* update old synthesis buffer - needed for ACELP internal sampling rate switching */
+    Copy( psyn_fx + sub( st->L_frame, L_SYN_MEM ), st->mem_syn_r, L_SYN_MEM );
+    deemph_fx( psyn_fx, st->preemph_fac, st->L_frame, &( st->mem_deemph_fx ) );
+    unscale_AGC( psyn_fx, st->Q_syn, syn_fx_tmp2, st->agc_mem_fx, st->L_frame );
+    Copy( syn_fx_tmp2, psyn_fx, st->L_frame );
+    IF( st->hTcxDec != NULL )
     {
-        Copy_Scale_sig( syn_fx + shr( st_fx->L_frame, 1 ), hTcxDec->old_syn_Overl, shr( st_fx->L_frame, 1 ), sub( -1, st_fx->Q_syn ) ); /*Q-1*/
+        Copy_Scale_sig( psyn_fx + shr( st->L_frame, 1 ), st->hTcxDec->old_syn_Overl, shr( st->L_frame, 1 ), sub( -1, st->Q_syn ) ); /*Q-1*/
+        st->hTcxDec->Q_old_syn_Overl = -1;
     }
-    Copy_Scale_sig( syn_fx + st_fx->L_frame - M - 1, st_fx->syn, M + 1, sub( 0, st_fx->Q_syn ) ); /*Q0*/
+    Copy_Scale_sig( psyn_fx + sub( st->L_frame, M + 1 ), st->syn, M + 1, sub( 0, st->Q_syn ) ); /*Q0*/
 
     /*------------------------------------------------------------------*
      * Formant post-filter
      *-----------------------------------------------------------------*/
 
-    IF( st_fx->hPFstat != NULL )
+    test();
+    test();
+    test();
+    test();
+    IF( st->hPFstat != NULL && GE_16( st->last_bwidth, WB ) && ( GT_32( st->core_brate, ACELP_24k40 ) || st->element_mode > EVS_MONO ) && LE_32( st->core_brate, ACELP_32k ) )
     {
-        test();
-        test();
-        test();
-        IF( GE_16( st_fx->last_bwidth, WB ) && ( GT_32( st_fx->core_brate, ACELP_24k40 ) || ( st_fx->element_mode > EVS_MONO ) ) && LE_32( st_fx->core_brate, ACELP_32k ) )
+        st->hPFstat->on = 1;
+        move16();
+        Copy( psyn_fx, temp_buf_fx + L_SYN_MEM, L_FRAME16k );
+        set16_fx( st->hPFstat->mem_zero, 0, M );
+
+        formant_post_filt_fx( st->hPFstat, temp_buf_fx + L_SYN_MEM, Aq_fx, psyn_fx, st->L_frame, st->lp_noise, st->total_brate, 0 );
+    }
+    ELSE IF( st->hPFstat != NULL && GE_16( st->last_bwidth, WB ) )
+    {
+        IF( st->hPFstat->on )
         {
-            Copy( syn_fx, temp_buf + L_SYN_MEM, L_FRAME16k );
-            st_fx->hPFstat->on = 1;
-            move16();
-            formant_post_filt_fx( st_fx->hPFstat, temp_buf + L_SYN_MEM, Aq_fx, syn_fx, L_FRAME16k, st_fx->lp_noise, st_fx->total_brate, 0 );
-        }
-        ELSE IF( GE_16( st_fx->last_bwidth, WB ) )
-        {
-            IF( st_fx->hPFstat->on )
-            {
-                Copy( st_fx->hPFstat->mem_pf_in + L_SYN_MEM - M, temp_buf, M );
-                Copy( syn_fx, temp_buf + M, L_SUBFR );
-                Residu3_fx( Aq_fx, temp_buf + M, temp_buf + M + L_SUBFR, L_SUBFR, 1 );
-                E_UTIL_synthesis( 1, Aq_fx, temp_buf + M + L_SUBFR, temp_buf, L_SUBFR, st_fx->hPFstat->mem_stp + L_SYN_MEM - M, 0, M );
-                scale_st_fx( syn_fx, temp_buf, &st_fx->hPFstat->gain_prec, L_SUBFR );
-                Copy( temp_buf, syn_fx, L_SUBFR / 2 );
-                blend_subfr2_fx( temp_buf + L_SUBFR / 2, syn_fx + L_SUBFR / 2, syn_fx + L_SUBFR / 2 );
-            }
-            st_fx->hPFstat->on = 0;
-            move16();
+            Copy( st->hPFstat->mem_pf_in + L_SYN_MEM - M, temp_buf_fx, M );
+            Copy( psyn_fx, temp_buf_fx + M, L_SUBFR );
+
+            Residu3_fx( Aq_fx, temp_buf_fx + M, temp_buf_fx + M + L_SUBFR, L_SUBFR, 1 );
+            E_UTIL_synthesis( 1, Aq_fx, temp_buf_fx + M + L_SUBFR, temp_buf_fx, L_SUBFR, st->hPFstat->mem_stp + L_SYN_MEM - M, 0, M );
+            scale_st_fx( psyn_fx, temp_buf_fx, &st->hPFstat->gain_prec, L_SUBFR );
+            Copy( temp_buf_fx, psyn_fx, ( L_SUBFR >> 1 ) );
+            blend_subfr2_fx( temp_buf_fx + L_SUBFR / 2, psyn_fx + L_SUBFR / 2, psyn_fx + L_SUBFR / 2 );
         }
+        st->hPFstat->on = 0;
+        move16();
     }
+
     /*----------------------------------------------------------------*
      * Comfort noise addition
      *----------------------------------------------------------------*/
 
     test();
     test();
-    IF( ( st_fx->hFdCngDec != NULL || EQ_16( st_fx->idchan, 1 ) ) && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
+    IF( ( st->hFdCngDec != NULL || EQ_16( st->idchan, 1 ) ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
     {
         test();
         test();
         test();
         test();
         test();
-        IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || st_fx->flag_cna || ( EQ_16( st_fx->cng_type, FD_CNG ) && LE_32( st_fx->total_brate, ACELP_32k ) ) || ( ( st_fx->cng_type == LP_CNG ) && LE_32( st_fx->total_brate, SID_2k40 ) ) )
+        IF( EQ_16( st->element_mode, IVAS_CPE_TD ) || st->flag_cna || ( EQ_16( st->cng_type, FD_CNG ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->cng_type == LP_CNG && LE_32( st->core_brate, SID_2k40 ) ) )
         {
             /*VAD only for non inactive frame*/
             test();
-            st_fx->VAD = st_fx->VAD && ( st_fx->coder_type != INACTIVE );
+            st->VAD = st->VAD && st->coder_type != INACTIVE;
             move16();
             test();
             test();
             test();
             test();
             test();
-            IF( st_fx->idchan == 0 && ( st_fx->flag_cna || ( EQ_16( st_fx->cng_type, FD_CNG ) && LE_32( st_fx->total_brate, ACELP_32k ) ) ||
-                                        ( EQ_16( st_fx->cng_type, LP_CNG ) && LE_32( st_fx->total_brate, SID_2k40 ) ) ) )
+            IF( st->idchan == 0 && ( st->flag_cna || ( EQ_16( st->cng_type, FD_CNG ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->cng_type == LP_CNG && LE_32( st->core_brate, SID_2k40 ) ) ) )
             {
                 /*Noisy speech detector*/
-                noisy_speech_detection_fx( st_fx->hFdCngDec, st_fx->VAD, syn_fx, st_fx->Q_syn );
+                noisy_speech_detection_fx( st->hFdCngDec, st->VAD, psyn_fx, st->Q_syn );
 
-                st_fx->hFdCngDec->hFdCngCom->likelihood_noisy_speech = mult_r( st_fx->hFdCngDec->hFdCngCom->likelihood_noisy_speech, 32440 /*0.99 Q15*/ );
+                st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = mult_r( st->hFdCngDec->hFdCngCom->likelihood_noisy_speech, 32440 /*0.99 Q15*/ );
                 move16();
-                IF( st_fx->hFdCngDec->hFdCngCom->flag_noisy_speech != 0 )
+                IF( st->hFdCngDec->hFdCngCom->flag_noisy_speech != 0 )
                 {
-                    st_fx->hFdCngDec->hFdCngCom->likelihood_noisy_speech = add( st_fx->hFdCngDec->hFdCngCom->likelihood_noisy_speech, 328 /*0.01 Q15*/ );
+                    st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = add( st->hFdCngDec->hFdCngCom->likelihood_noisy_speech, 328 /*0.01 Q15*/ );
                     move16();
                 }
+                move32();
             }
-            if ( st_fx->idchan == 0 )
+
+            if ( st->idchan == 0 )
             {
-                st_fx->lp_noise = st_fx->hFdCngDec->lp_noise;
+                st->lp_noise = st->hFdCngDec->lp_noise;
                 move32();
             }
-            /*Noise estimate*/
-            IF( NE_16( st_fx->element_mode, IVAS_CPE_TD ) /* && !st->cng_ism_flag IVAS_CODE */ )
+
+            test();
+            IF( NE_16( st->element_mode, IVAS_CPE_TD ) && !st->cng_ism_flag )
             {
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                PMT( "Code for IVAS_CODE_CNG_FIX185_PLC_FADEOUT not done" )
-                ApplyFdCng_fx( syn, st_fx->Q_syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-#else
-                ApplyFdCng_fx( syn_fx, st_fx->Q_syn, realBuffer, imagBuffer, NULL, st_fx, 0, ( EQ_16( st_fx->coder_type, AUDIO ) && st_fx->GSC_noisy_speech == 0 ) );
-#endif
+                /* Noise estimate */
+                ApplyFdCng_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
             }
-            /* CNA: Generate additional comfort noise to mask potential coding artefacts */
 
-#ifdef IVAS_CODE
-            if ( !st->cna_dirac_flag )
+            IF( !st->cna_dirac_flag )
             {
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
                 /* CNA: Generate additional comfort noise to mask potential coding artefacts */
-                if ( st->flag_cna && !( st->coder_type == AUDIO && !( st->element_mode > EVS_MONO && st->GSC_noisy_speech ) ) )
+                IF( st->flag_cna && !( EQ_16( st->coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->GSC_noisy_speech ) ) )
                 {
-                    if ( st->element_mode == IVAS_CPE_TD && nchan_out == 2 )
+                    test();
+                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( nchan_out, 2 ) )
                     {
-                        if ( hStereoCng->flag_cna_fade )
+                        IF( hStereoCng->flag_cna_fade )
                         {
-                            generate_stereo_masking_noise( syn, st, hStereoTD, flag_sec_CNA, 1, hStereoCng, nchan_out );
+                            generate_stereo_masking_noise_fx( psyn_fx, st->Q_syn, st, hStereoTD, flag_sec_CNA, 1, hStereoCng, nchan_out );
                             hStereoCng->flag_cna_fade = 0;
+                            move16();
                         }
-                        else
+                        ELSE
                         {
-                            if ( st->element_mode != last_element_mode && st->idchan == 0 )
+                            test();
+                            IF( NE_16( st->element_mode, last_element_mode ) && ( st->idchan == 0 ) )
                             {
                                 /* Clear memory for secondary channel CNA */
-                                set_f( hStereoCng->olapBufferSynth22, 0.0f, st->hFdCngDec->hFdCngCom->frameSize / 2 );
+                                set16_fx( hStereoCng->olapBufferSynth22_fx, 0, shr( st->hFdCngDec->hFdCngCom->frameSize, 1 ) );
                             }
 
-                            generate_stereo_masking_noise( syn, st, hStereoTD, flag_sec_CNA, 0, hStereoCng, nchan_out );
+                            generate_stereo_masking_noise_fx( psyn_fx, st->Q_syn, st, hStereoTD, flag_sec_CNA, 0, hStereoCng, nchan_out );
                         }
                     }
-                    else if ( st->element_mode != IVAS_CPE_DFT )
+                    ELSE IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
                     {
-                        if ( st->idchan == 0 )
+                        IF( EQ_16( st->element_mode, EVS_MONO ) )
                         {
-                            if ( st->element_mode != last_element_mode )
+                            generate_masking_noise_fx( psyn_fx, st->Q_syn, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0 );
+                        }
+                        ELSE
+                        {
+                            IF( st->idchan == 0 )
                             {
-                                set_f( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0.0f, st->hFdCngDec->hFdCngCom->fftlen );
+                                IF( NE_16( st->element_mode, last_element_mode ) )
+                                {
+                                    set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
+                                }
+
+                                Word32 psyn_32_fx[L_FRAME16k];
+                                Copy_Scale_sig_16_32_no_sat( psyn_fx, psyn_32_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( Q6, st->Q_syn ) );                                                                // Q6
+                                Copy_Scale_sig_16_32_no_sat( st->hFdCngDec->hFdCngCom->olapBufferSynth2, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), Q15 ); // Q15
+
+                                generate_masking_noise_ivas_fx( psyn_32_fx, &exp, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0, 0, 0, st->element_mode, hStereoCng, nchan_out );
+
+                                Copy_Scale_sig_32_16( psyn_32_fx, psyn_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( st->Q_syn, exp ) );                                                                // Q = st->Q_syn
+                                Copy_Scale_sig_32_16( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth2, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), -Q15 ); // Q0
                             }
-                            generate_masking_noise_fx( syn, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0, 0, 0, st->element_mode, hStereoCng, nchan_out );
                         }
                     }
                 }
-                else if ( st->flag_cna && st->coder_type == AUDIO && ( ( st->last_core == ACELP_CORE && !( st->last_coder_type == AUDIO && !( st->element_mode > EVS_MONO && st->Last_GSC_noisy_speech_flag ) ) ) || st->last_core == TCX_20_CORE ) )
+                ELSE IF( st->flag_cna && EQ_16( st->coder_type, AUDIO ) && ( ( st->last_core == ACELP_CORE && !( EQ_16( st->last_coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->Last_GSC_noisy_speech_flag ) ) ) || EQ_16( st->last_core, TCX_20_CORE ) ) )
                 {
-                    if ( st->element_mode == IVAS_CPE_TD && nchan_out == 2 )
+                    test();
+                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( nchan_out, 2 ) )
                     {
-                        generate_stereo_masking_noise( syn, st, hStereoTD, flag_sec_CNA, 1, hStereoCng, nchan_out );
+                        generate_stereo_masking_noise_fx( psyn_fx, st->Q_syn, st, hStereoTD, flag_sec_CNA, 1, hStereoCng, nchan_out );
                         hStereoCng->flag_cna_fade = 1;
+                        move16();
                     }
-                    else
+                    ELSE
                     {
-                        v_multc( st->hFdCngDec->hFdCngCom->olapBufferSynth2 + 5 * st->hFdCngDec->hFdCngCom->frameSize / 4, (float) ( st->hFdCngDec->hFdCngCom->fftlen / 2 ), temp_buf, st->hFdCngDec->hFdCngCom->frameSize / 2 );
-                        v_add( temp_buf, syn, syn, st->hFdCngDec->hFdCngCom->frameSize / 2 );
+                        FOR( i = 0; i < ( st->hFdCngDec->hFdCngCom->frameSize ) / 2; i++ )
+                        {
+                            psyn_fx[i] = add( psyn_fx[i], shr_r( mult_r( st->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * ( st->hFdCngDec->hFdCngCom->frameSize / 4 )], st->hFdCngDec->hFdCngCom->fftlenFac ), negate( st->Q_syn ) ) );
+                            move16();
+                        }
                     }
                 }
-                else
+                ELSE
                 {
-                    if ( hStereoCng != NULL )
+                    IF( hStereoCng != NULL )
                     {
                         hStereoCng->flag_cna_fade = 1;
+                        move16();
                         hStereoCng->enableSecCNA = 0;
+                        move16();
                     }
                 }
 
-                if ( st->element_mode == IVAS_CPE_TD )
+                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
                 {
+                    test();
+                    test();
+                    test();
                     /*Noise estimate*/
-                    if ( st->idchan == 0 && ( nchan_out == 2 || ( st->core_brate != FRAME_NO_DATA && st->core_brate != SID_2k40 ) ) )
+                    IF( ( st->idchan == 0 ) && ( EQ_16( nchan_out, 2 ) || ( st->core_brate != FRAME_NO_DATA && NE_32( st->core_brate, SID_2k40 ) ) ) )
                     {
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                        ApplyFdCng_fx( syn, st_fx->Q_syn, realBuffer, imagBuffer, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-#else
-                        ApplyFdCng_fx( syn, st_fx->Q_syn, realBuffer, imagBuffer, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-#endif
+                        ApplyFdCng_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
                     }
                 }
             }
-#endif
         }
 
-#ifdef IVAS_CODE
-        if ( !st->cna_dirac_flag )
+        IF( !st->cna_dirac_flag )
         {
-            if ( st->flag_cna == 0 && st->L_frame == L_FRAME16k && st->last_flag_cna == 1 && ( ( st->last_core == ACELP_CORE && !( st->last_coder_type == AUDIO && !( st->element_mode > EVS_MONO && st->Last_GSC_noisy_speech_flag ) ) ) || st->last_core == AMR_WB_CORE ) )
-            {
-                v_multc( st->hFdCngDec->hFdCngCom->olapBufferSynth2 + 5 * st->L_frame / 4, 256.f, temp_buf, st->L_frame / 2 );
-                v_add( temp_buf, syn, syn, st->L_frame / 2 );
-            }
-
-            if ( st->flag_cna == 0 || ( st->coder_type == AUDIO && !( st->element_mode > EVS_MONO && st->GSC_noisy_speech ) ) )
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( ( st->flag_cna == 0 ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->last_flag_cna, 1 ) && ( ( st->last_core == ACELP_CORE && !( EQ_16( st->last_coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->Last_GSC_noisy_speech_flag ) ) ) || EQ_16( st->last_core, AMR_WB_CORE ) ) )
             {
-                if ( st->idchan == 0 )
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
                 {
-                    set_f( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0.f, st->hFdCngDec->hFdCngCom->fftlen );
+                    // VE: TBV - is it correct in EVS? in FLP, it is:
+                    // v_multc( st->hFdCngDec->hFdCngCom->olapBufferSynth2 + 5 * st->L_frame / 4, 256.f, temp_buf, st->L_frame / 2 );
+                    // v_add( temp_buf, syn, syn, st->L_frame / 2 );
+                    FOR( i = 0; i < st->L_frame / 2; i++ )
+                    {
+                        psyn_fx[i] = add( psyn_fx[i], shr_r( st->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * st->L_frame / 4], negate( st->Q_syn ) ) );
+                        move16();
+                    }
                 }
-                if ( hStereoCng != NULL && st->idchan == 0 )
+                ELSE
                 {
-                    set_f( hStereoCng->olapBufferSynth22, 0.f, st->hFdCngDec->hFdCngCom->fftlen );
+                    FOR( i = 0; i < ( st->hFdCngDec->hFdCngCom->frameSize ) / 2; i++ )
+                    {
+                        psyn_fx[i] = add( psyn_fx[i], shr_r( mult_r( st->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * ( st->hFdCngDec->hFdCngCom->frameSize / 4 )], st->hFdCngDec->hFdCngCom->fftlenFac ), -st->Q_syn ) );
+                        move16();
+                    }
                 }
             }
-        }
-#else
-        test();
-        test();
-        test();
-        test();
-        IF( st_fx->flag_cna && NE_16( st_fx->coder_type, AUDIO ) )
-        {
-            generate_masking_noise_fx( syn_fx, st_fx->Q_syn, st_fx->hFdCngDec->hFdCngCom, st_fx->hFdCngDec->hFdCngCom->frameSize, 0 );
-        }
-        ELSE IF( st_fx->flag_cna && EQ_16( st_fx->coder_type, AUDIO ) && st_fx->last_core == ACELP_CORE && NE_16( st_fx->last_coder_type, AUDIO ) )
-        {
-            FOR( i = 0; i < st_fx->hFdCngDec->hFdCngCom->frameSize / 2; i++ )
-            {
-                syn_fx[i] = add( syn_fx[i], shr_r( mult_r( st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * st_fx->hFdCngDec->hFdCngCom->frameSize / 4], st_fx->hFdCngDec->hFdCngCom->fftlenFac ), -st_fx->Q_syn ) );
-                move16();
-            }
-        }
-#endif
 
-#ifndef IVAS_CODE
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( st_fx->flag_cna == 0 && EQ_16( st_fx->L_frame, L_FRAME16k ) && EQ_16( st_fx->last_flag_cna, 1 ) && ( ( st_fx->last_core == ACELP_CORE && NE_16( st_fx->last_coder_type, AUDIO ) ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) ) )
-        {
-            FOR( i = 0; i < st_fx->L_frame / 2; i++ )
+            test();
+            test();
+            test();
+            IF( ( st->flag_cna == 0 ) || ( EQ_16( st->coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->GSC_noisy_speech ) ) )
             {
-                syn_fx[i] = add( syn_fx[i], shr_r( st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * st_fx->L_frame / 4], negate( st_fx->Q_syn ) ) );
-                move16();
+                IF( st->idchan == 0 )
+                {
+                    set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
+                }
+                IF( hStereoCng != NULL && ( st->idchan == 0 ) )
+                {
+                    set16_fx( hStereoCng->olapBufferSynth22_fx, 0, st->hFdCngDec->hFdCngCom->fftlen );
+                }
             }
         }
-
-        test();
-        IF( st_fx->flag_cna == 0 || EQ_16( st_fx->coder_type, AUDIO ) )
-        {
-            set16_fx( st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st_fx->hFdCngDec->hFdCngCom->fftlen );
-        }
-#endif
     }
 
     /*----------------------------------------------------------------*
@@ -1655,62 +1758,44 @@ ivas_error acelp_core_dec_fx(
      * Bass post-filter
      *----------------------------------------------------------------*/
 
-    /* check if the CLDFB works on the right sample rate */
-    IF( ( st_fx->cldfbAna->usb * st_fx->cldfbAna->no_col ) != st_fx->L_frame )
+    IF( EQ_16( st->element_mode, EVS_MONO ) )
     {
-        /* resample to ACELP internal sampling rate */
-        Word16 newCldfbBands = CLDFB_getNumChannels( L_mult0( st_fx->L_frame, FRAMES_PER_SEC ) );
-        resampleCldfb( st_fx->cldfbAna, newCldfbBands, st_fx->L_frame, 0 );
-        resampleCldfb( st_fx->cldfbBPF, newCldfbBands, st_fx->L_frame, 0 );
+        CLDFB_SCALE_FACTOR scaleFactor;
+        Word32 workBuffer[128 * 3];
 
-        IF( st_fx->ini_frame > 0 )
+        /* check if the CLDFB works on the right sample rate */
+        IF( ( st->cldfbAna->usb * st->cldfbAna->no_col ) != st->L_frame )
         {
-            st_fx->cldfbSyn->bandsToZero = sub( st_fx->cldfbSyn->no_channels, st_fx->cldfbAna->no_channels );
-            move16();
+            /* resample to ACELP internal sampling rate */
+            Word16 newCldfbBands = CLDFB_getNumChannels( L_mult0( st->L_frame, FRAMES_PER_SEC ) );
+            resampleCldfb( st->cldfbAna, newCldfbBands, st->L_frame, 0 );
+            resampleCldfb( st->cldfbBPF, newCldfbBands, st->L_frame, 0 );
+
+            IF( st->ini_frame > 0 )
+            {
+                st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels );
+                move16();
+            }
         }
-    }
-#ifdef ADD_LRTD
-    /* analyze pitch coherence for bass post-filter */
-    bpf_pitch_coherence( st, pitch_buf );
-#endif
-    test();
-    IF( !( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && st_fx->bpf_off ) )
-    {
+
         test();
-        IF( NE_16( st_fx->L_frame, st_fx->last_L_frame ) && NE_16( st_fx->last_codec_mode, MODE2 ) )
+        IF( NE_16( st->L_frame, st->last_L_frame ) && NE_16( st->last_codec_mode, MODE2 ) )
         {
-            IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+            IF( EQ_16( st->L_frame, L_FRAME ) )
             {
-                retro_interp5_4_fx( hBPF->pst_old_syn_fx );
+                retro_interp5_4_fx( st->hBPF->pst_old_syn_fx );
             }
-            ELSE IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
+            ELSE IF( EQ_16( st->L_frame, L_FRAME16k ) )
             {
-                retro_interp4_5_fx( syn_fx, hBPF->pst_old_syn_fx );
+                retro_interp4_5_fx( psyn_fx, st->hBPF->pst_old_syn_fx );
             }
         }
 
-        bass_psfilter_fx( st_fx->hBPF, st_fx->Opt_AMR_WB, syn_fx, st_fx->L_frame, pitch_buf_fx, st_fx->bpf_off,
-                          st_fx->stab_fac_fx, &st_fx->stab_fac_smooth_fx, st_fx->coder_type, st_fx->Q_syn, bpf_error_signal );
-    }
-    test();
-    IF( NE_16( st_fx->element_mode, IVAS_CPE_DFT ) || use_cldfb_for_dft )
-    {
-#ifdef IVAS_CODE
-        float realBufferSave[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-        float imagBufferSave[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-        float *pRealSave[CLDFB_NO_COL_MAX], *pImagSave[CLDFB_NO_COL_MAX];
-        for ( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-        {
-            pRealSave[i] = realBufferSave[i];
-            pImagSave[i] = imagBufferSave[i];
-        }
-        if ( st->p_bpf_noise_buf )
-        {
-            mvr2r( bpf_error_signal, st->p_bpf_noise_buf, st->L_frame );
-        }
-#endif
+        bass_psfilter_fx( st->hBPF, st->Opt_AMR_WB, psyn_fx, st->L_frame, pitch_buf_fx, st->bpf_off,
+                          st->stab_fac_fx, &st->stab_fac_smooth_fx, st->coder_type, st->Q_syn, bpf_error_signal_16fx );
+
         /* analysis of the synthesis at internal sampling rate */
-        cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn_fx, negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX, workBuffer );
+        cldfbAnalysis_fx( st->cldfbAna, realBuffer_fx, imagBuffer_fx, &scaleFactor, psyn_fx, negate( st->Q_syn ), CLDFB_NO_COL_MAX, workBuffer );
 
         scaleFactor.hb_scale = scaleFactor.lb_scale;
         move16();
@@ -1718,25 +1803,26 @@ ivas_error acelp_core_dec_fx(
         /* analysis and add the BPF error signal */
         i = 0;
         move16();
-        if ( st_fx->bpf_off == 0 )
+        if ( st->bpf_off == 0 )
         {
             i = CLDFB_NO_COL_MAX;
             move16();
         }
-        addBassPostFilter_fx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate( st_fx->Q_syn ),
-                              i, st_fx->cldfbAna->no_col, st_fx->cldfbAna->no_channels, &scaleFactor );
+
+        addBassPostFilter_fx( bpf_error_signal_16fx, realBuffer_fx, imagBuffer_fx, st->cldfbBPF, workBuffer, negate( st->Q_syn ),
+                              i, st->cldfbAna->no_col, st->cldfbAna->no_channels, &scaleFactor );
 
         /* set output mask for upsampling */
-        IF( EQ_16( st_fx->bwidth, NB ) )
+        IF( EQ_16( st->bwidth, NB ) )
         {
             /* set NB mask for upsampling */
-            st_fx->cldfbSyn->bandsToZero = sub( st_fx->cldfbSyn->no_channels, 10 );
+            st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, 10 );
             move16();
         }
-        ELSE IF( NE_16( st_fx->cldfbSyn->bandsToZero, sub( st_fx->cldfbSyn->no_channels, st_fx->cldfbAna->no_channels ) ) )
+        ELSE IF( NE_16( st->cldfbSyn->bandsToZero, sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels ) ) )
         {
             /* in case of BW switching, re-init to default */
-            st_fx->cldfbSyn->bandsToZero = sub( st_fx->cldfbSyn->no_channels, st_fx->cldfbAna->no_channels );
+            st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels );
             move16();
         }
 
@@ -1744,108 +1830,447 @@ ivas_error acelp_core_dec_fx(
         scaleFactor.hb_scale = scaleFactor.lb_scale;
         move16();
 
-
         test();
-        IF( !st_fx->cng_sba_flag || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
+        test();
+        test();
+        IF( ( ( st->core_brate == FRAME_NO_DATA ) || EQ_32( st->core_brate, SID_2k40 ) ) && ( EQ_16( st->cng_type, FD_CNG ) ) && ( LT_16( st->hFdCngDec->hFdCngCom->numCoreBands, st->cldfbSyn->no_channels ) ) )
         {
-            test();
-            test();
-            test();
-            IF( ( ( st_fx->core_brate == FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) ) && ( EQ_16( st_fx->cng_type, FD_CNG ) ) && ( LT_16( st_fx->hFdCngDec->hFdCngCom->numCoreBands, st_fx->cldfbSyn->no_channels ) ) )
+            generate_comfort_noise_dec_hf_fx( realBuffer_fx, imagBuffer_fx, &scaleFactor.hb_scale, st );
+
+            st->cldfbSyn->bandsToZero = 0;
+            move16();
+            IF( LT_16( st->hFdCngDec->hFdCngCom->regularStopBand, st->cldfbSyn->no_channels ) )
             {
-                generate_comfort_noise_dec_hf_fx( realBuffer, imagBuffer, &scaleFactor.hb_scale, st_fx );
+                st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->hFdCngDec->hFdCngCom->regularStopBand );
+                move16();
+            }
+            st->cldfbSyn->lsb = st->cldfbAna->no_channels;
+            move16();
+        }
+
+        /* synthesis of the combined signal */
+        st->Q_syn2 = st->Q_syn;
+        move16();
+        cldfbSynthesis_fx( st->cldfbSyn, realBuffer_fx, imagBuffer_fx, &scaleFactor, synth_fx16, negate( st->Q_syn2 ), CLDFB_NO_COL_MAX, workBuffer );
+
+        /* Bring CLDFB output to Q0 */
+        Scale_sig( synth_fx16, output_frame, negate( st->Q_syn2 ) );
+        st->Q_syn2 = 0;
+        move16();
+
+        /* save synthesis - needed in case of core switching */
+        Copy( synth_fx16, st->previoussynth_fx, output_frame );
+    }
+    ELSE
+    {
+        /* check if the CLDFB works on the right sample rate */
+        IF( NE_16( imult1616( st->cldfbAna->no_channels, st->cldfbAna->no_col ), st->L_frame ) )
+        {
+            resampleCldfb_ivas_fx( st->cldfbAna, L_mult0( st->L_frame, FRAMES_PER_SEC ) );
+            resampleCldfb_ivas_fx( st->cldfbBPF, L_mult0( st->L_frame, FRAMES_PER_SEC ) );
 
-                st_fx->cldfbSyn->bandsToZero = 0;
+            IF( st->ini_frame > 0 )
+            {
+                st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels );
                 move16();
-                IF( LT_16( st_fx->hFdCngDec->hFdCngCom->regularStopBand, st_fx->cldfbSyn->no_channels ) )
+            }
+        }
+
+        /* analyze pitch coherence for bass post-filter */
+        Word32 pitch_buf_fx_q20[12];
+        Scale_sig32( st->old_pitch_buf_fx, 2 * NB_SUBFR16k + 2, Q4 ); // Q(x+4)
+        Word16 lim = shr( st->L_frame, 6 );
+        FOR( Word16 lp = 0; lp < lim; lp++ )
+        {
+            pitch_buf_fx_q20[lp] = L_shl( pitch_buf_fx[lp], Q14 );
+            move32();
+        }
+        bpf_pitch_coherence_ivas_fx( st, pitch_buf_fx_q20 );
+        Scale_sig32( st->old_pitch_buf_fx, 2 * NB_SUBFR16k + 2, -Q4 ); // Qx
+
+        test();
+        IF( !( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->bpf_off ) )
+        {
+            test();
+            IF( NE_16( st->L_frame, st->last_L_frame ) && NE_16( st->last_codec_mode, MODE2 ) )
+            {
+                IF( EQ_16( st->L_frame, L_FRAME ) )
                 {
-                    st_fx->cldfbSyn->bandsToZero = sub( st_fx->cldfbSyn->no_channels, st_fx->hFdCngDec->hFdCngCom->regularStopBand );
-                    move16();
+                    retro_interp5_4_fx( st->hBPF->pst_old_syn_fx );
+                }
+                ELSE IF( EQ_16( st->L_frame, L_FRAME16k ) )
+                {
+                    retro_interp4_5_fx( psyn_fx, st->hBPF->pst_old_syn_fx );
                 }
-                st_fx->cldfbSyn->lsb = st_fx->cldfbAna->no_channels;
-                move16();
             }
+
+            bass_psfilter_fx( st->hBPF, st->Opt_AMR_WB, psyn_fx, st->L_frame, pitch_buf_fx, st->bpf_off,
+                              st->stab_fac_fx, &st->stab_fac_smooth_fx, st->coder_type, st->Q_syn, bpf_error_signal_16fx );
         }
-        /* synthesis of the combined signal */
-        st_fx->Q_syn2 = st_fx->Q_syn;
-        move16();
-#ifdef IVAS_CODE
-        if ( save_hb_synth != NULL )
+
+        Word32 syn_tmp_32_fx[L_FRAME16k + L_SUBFR], *syn_32_fx;
+        set32_fx( syn_tmp_32_fx, 0, L_FRAME16k + L_SUBFR );
+        syn_32_fx = syn_tmp_32_fx + L_SUBFR;
+        test();
+        IF( NE_16( st->element_mode, IVAS_CPE_DFT ) || use_cldfb_for_dft )
         {
-            /* save and then zero-out lowband */
-            for ( int16_t j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+            /* analysis of the synthesis at internal sampling rate */
+            Word32 realBufferSave_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
+            Word32 imagBufferSave_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
+            Word32 *pRealSave_fx[CLDFB_NO_COL_MAX], *pImagSave_fx[CLDFB_NO_COL_MAX];
+            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
             {
-                for ( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                pRealSave_fx[i] = realBufferSave_fx[i];
+                pImagSave_fx[i] = imagBufferSave_fx[i];
+            }
+            IF( st->p_bpf_noise_buf_32 )
+            {
+                Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
+                Copy32( bpf_error_signal_fx, st->p_bpf_noise_buf_32, st->L_frame );
+                Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( Q11, sub( st->Q_syn, 1 ) ) ); // Q11
+            }
+
+            FOR( i = 0; i < st->L_frame; i++ )
+            {
+                syn_32_fx[i] = L_shr( L_deposit_h( psyn_fx[i] ), add( 4, st->Q_syn ) ); // Q12
+                move32();
+            }
+
+            Word16 offset = sub( st->cldfbAna->p_filter_length, st->cldfbAna->no_channels );
+            Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, 1 ); // Q12
+            st->cldfbAna->Q_cldfb_state = Q12;
+            move16();
+
+            cldfbAnalysis_ivas_fx( syn_32_fx, realBuffer_fx, imagBuffer_fx, -1, st->cldfbAna );
+
+            Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, -1 ); // Q11
+            st->cldfbAna->Q_cldfb_state = Q11;
+            move16();
+            /* analysis and add the BPF error signal */
+            Word32 tmp_bpf_error_signal_fx[L_FRAME16k];
+            Word16 q_bpf_error_signal;
+            Word16 cldfb_state_offset = sub( st->cldfbBPF->p_filter_length, st->cldfbBPF->no_channels );
+
+            q_bpf_error_signal = Q6;
+            move16();
+            Copy_Scale_sig_16_32_no_sat( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, st->L_frame, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
+            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+            {
+                Scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
+                Scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
+            }
+            Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, sub( q_bpf_error_signal, Q10 ) ); // q_bpf_error_signal (Q6)
+            st->cldfbBPF->Q_cldfb_state = q_bpf_error_signal;
+            move16();
+            tmp = -1;
+            move16();
+            if ( st->bpf_off )
+            {
+                tmp = 0;
+                move16();
+            }
+
+            addBassPostFilter_ivas_fx( tmp_bpf_error_signal_fx, tmp, realBuffer_fx, imagBuffer_fx, st->cldfbBPF );
+
+            Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, negate( ( sub( q_bpf_error_signal, Q10 ) ) ) ); // Q10
+            st->cldfbBPF->Q_cldfb_state = Q10;
+            move16();
+            /* set output mask for upsampling */
+            IF( EQ_16( st->bwidth, NB ) )
+            {
+                /* set NB mask for upsampling */
+                st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, 10 );
+                move16();
+            }
+            ELSE IF( NE_16( st->cldfbSyn->bandsToZero, sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels ) ) )
+            {
+                /* in case of BW switching, re-init to default */
+                st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels );
+                move16();
+            }
+            test();
+            IF( !st->cng_sba_flag || EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+            {
+                test();
+                test();
+                test();
+                /*WB/SWB-FD_CNG*/
+                IF( ( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) ) && ( EQ_16( st->cng_type, FD_CNG ) ) && ( LT_16( st->hFdCngDec->hFdCngCom->numCoreBands, st->cldfbSyn->no_channels ) ) )
                 {
-                    realBufferSave[i][j] = realBuffer[i][j];
-                    imagBufferSave[i][j] = imagBuffer[i][j];
-                    if ( j < st->hFdCngDec->hFdCngCom->numCoreBands && i < st->hFdCngDec->hFdCngCom->numSlots )
+                    Word16 tmpBufferScale = 0;
+                    move16();
+                    generate_comfort_noise_dec_hf_ivas_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st->hFdCngDec->hFdCngCom, st->cng_ism_flag );
+
+                    FOR( i = 0; i < st->hFdCngDec->hFdCngCom->numSlots; i++ )
                     {
-                        realBuffer[i][j] = 0.0f;
-                        imagBuffer[i][j] = 0.0f;
+                        Scale_sig32( realBuffer_fx[i] + st->hFdCngDec->hFdCngCom->numCoreBands, sub( st->hFdCngDec->hFdCngCom->regularStopBand, st->hFdCngDec->hFdCngCom->numCoreBands ), sub( add( tmpBufferScale, 15 ), Q31 ) ); // Q0
+                        Scale_sig32( imagBuffer_fx[i] + st->hFdCngDec->hFdCngCom->numCoreBands, sub( st->hFdCngDec->hFdCngCom->regularStopBand, st->hFdCngDec->hFdCngCom->numCoreBands ), sub( add( tmpBufferScale, 15 ), Q31 ) ); // Q0
+                    }
+
+                    IF( LT_16( st->hFdCngDec->hFdCngCom->regularStopBand, st->cldfbSyn->no_channels ) )
+                    {
+                        st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->hFdCngDec->hFdCngCom->regularStopBand );
+                        move16();
+                    }
+                    ELSE
+                    {
+                        st->cldfbSyn->bandsToZero = 0;
+                        move16();
                     }
                 }
             }
 
-            cldfbSynthesis( realBuffer, imagBuffer, save_hb_synth, -1, st->cldfbSynHB );
+            IF( save_hb_synth_fx16 != NULL )
+            {
+                /* save and then zero-out lowband */
+                max_real = 0;
+                max_imag = 0;
+                move32();
+                move32();
+                FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                {
+                    FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+                    {
+                        max_real = L_max( max_real, L_abs( realBuffer_fx[i][j] ) );
+                        max_imag = L_max( max_imag, L_abs( imagBuffer_fx[i][j] ) );
+                    }
+                }
+                max_val = L_max( max_real, max_imag );
+                Q_real = sub( norm_l( max_val ), 3 ) /* Guard bits */;
+                FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                {
+                    scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
+                    scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
+                }
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
+#ifdef OPT_STEREO_32KBPS_V1
+                scale_sig32( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( Q_real, Q11 ) ); // Q10 - > (Q_real-1)
+#else                                                                                                               /* OPT_STEREO_32KBPS_V1 */
+                scale_sig32_r( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); // (Q_real-1)
+#endif                                                                                                              /* OPT_STEREO_32KBPS_V1 */
+                st->cldfbSynHB->Q_cldfb_state = sub( Q_real, 1 );
+                move16();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+
+                FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+                {
+                    FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                    {
+                        realBufferSave_fx[i][j] = realBuffer_fx[i][j];
+                        imagBufferSave_fx[i][j] = imagBuffer_fx[i][j];
+                        move32();
+                        move32();
+                        IF( LT_16( j, st->hFdCngDec->hFdCngCom->numCoreBands ) && LT_16( i, st->hFdCngDec->hFdCngCom->numSlots ) )
+                        {
+                            realBuffer_fx[i][j] = 0;
+                            imagBuffer_fx[i][j] = 0;
+                            move32();
+                            move32();
+                        }
+                    }
+                }
+
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, save_hb_synth_fx, -1, sub( Q11, Q_real ), -10, st->cldfbSynHB );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, save_hb_synth_fx, -1, 0, st->cldfbSynHB );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
 
-            /* restore lowband */
-            for ( int16_t j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
+                Scale_sig32( save_hb_synth_fx, L_FRAME48k, negate( ( sub( Q_real, 1 ) ) ) );                                  // Q0
+                Scale_sig32( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
+                st->cldfbSynHB->Q_cldfb_state = Q10;
+                move16();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+                /* restore lowband */
+                FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+                {
+                    FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                    {
+                        realBuffer_fx[i][j] = realBufferSave_fx[i][j];
+                        imagBuffer_fx[i][j] = imagBufferSave_fx[i][j];
+                        move32();
+                        move32();
+                    }
+                }
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
+                Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); // Q_real-1
+                st->cldfbSynHB->Q_cldfb_state = sub( Q_real, 1 );
+                move16();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( pRealSave_fx, pImagSave_fx, synth_fx, -1, sub( Q11, Q_real ), -10, st->cldfbSyn );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( pRealSave_fx, pImagSave_fx, synth_fx, -1, 0, st->cldfbSyn );
+                Scale_sig32( synth_fx, L_FRAME48k, negate( sub( Q_real, 1 ) ) );                                          // Q0
+                Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
+                st->cldfbSynHB->Q_cldfb_state = Q10;
+                move16();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+            }
+            ELSE
             {
-                for ( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                /* synthesis of the combined signal */
+                max_real = 0;
+                max_imag = 0;
+                move32();
+                move32();
+                FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
                 {
-                    realBuffer[i][j] = realBufferSave[i][j];
-                    imagBuffer[i][j] = imagBufferSave[i][j];
+                    FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+                    {
+                        max_real = L_max( max_real, L_abs( realBuffer_fx[i][j] ) );
+                        max_imag = L_max( max_imag, L_abs( imagBuffer_fx[i][j] ) );
+                    }
                 }
+                max_val = L_max( max_real, max_imag );
+                Q_real = sub( norm_l( max_val ), 3 ) /* Guard bits */;
+                FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+                {
+                    scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
+                    scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
+                }
+#ifdef OPT_STEREO_32KBPS_V1
+                scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q_real, Q11 ) ); // Q10 - > (Q_real-1)
+#else                                                                                                           /* OPT_STEREO_32KBPS_V1 */
+                scale_sig32_r( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); //(Q_real - 1)
+#endif                                                                                                          /* OPT_STEREO_32KBPS_V1 */
+                st->cldfbSyn->Q_cldfb_state = sub( Q_real, 1 );
+                move16();
+
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx, -1, 0, 0, st->cldfbSyn );
+#else                                                                                                                     /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx, -1, 0, st->cldfbSyn );
+#endif                                                                                                                    /* OPT_AVOID_STATE_BUF_RESCALE */
+                scale_sig32( synth_fx, output_frame, negate( sub( Q_real, 1 ) ) );                                        // Q0
+                scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
+                st->cldfbSyn->Q_cldfb_state = Q10;
+                move16();
             }
 
-            cldfbSynthesis( pRealSave, pImagSave, synth, -1, st->cldfbSyn );
+            /* save synthesis - needed in case of core switching */
+            Copy32( synth_fx, st->previoussynth_fx_32, output_frame ); // Q0
         }
-        else
-#endif
+        ELSE
         {
-            cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out, negate( st_fx->Q_syn2 ), CLDFB_NO_COL_MAX, workBuffer );
-        }
-        /* Bring CLDFB output to Q0 */
-        Scale_sig( synth_out, output_frame, negate( st_fx->Q_syn2 ) );
-        st_fx->Q_syn2 = 0;
-        move16();
+            Word16 nSamples = NS2SA_FX2( i_mult( st->L_frame, FRAMES_PER_SEC ), FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ); /* IVAS-64: optimization is likely possible here (don't resample the whole frame) */
 
-        /* save synthesis - needed in case of core switching */
-        Copy( synth_out, st_fx->previoussynth_fx, output_frame );
-    }
-#ifdef IVAS_CODE
-    ELSE
-    {
-        int16_t nSamples = NS2SA( st->L_frame * FRAMES_PER_SEC, FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ); /* IVAS-64: optimization is likely possible here (don't resample the whole frame) */
+            /* analysis of the synthesis at internal sampling rate - needed for DFT stereo -> TD stereo switching */
+            FOR( i = 0; i < st->L_frame; i++ )
+            {
+                syn_32_fx[i] = L_shr( L_deposit_h( psyn_fx[i] ), add( 4, st->Q_syn ) );
+                move32();
+            }
 
-        /* analysis of the synthesis at internal sampling rate - needed for DFT stereo -> TD stereo switching */
-        cldfbAnalysis( syn + st->L_frame - nSamples, realBuffer, imagBuffer, nSamples, st->cldfbAna );
+            Word16 offset = sub( st->cldfbAna->p_filter_length, st->cldfbAna->no_channels );
+            Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, 1 ); // Q12
+            st->cldfbAna->Q_cldfb_state = Q12;
+            move16();
+
+            cldfbAnalysis_ivas_fx( syn_32_fx + sub( st->L_frame, nSamples ), realBuffer_fx, imagBuffer_fx, nSamples, st->cldfbAna );
+
+            Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, -1 ); // Q11
+            st->cldfbAna->Q_cldfb_state = Q11;
+            move16(); /* analysis and add the BPF error signal - needed for DFT stereo -> TD stereo switching */
+            Word32 tmp_bpf_error_signal_fx[L_FRAME16k];
+            Word16 q_bpf_error_signal;
+            Word16 cldfb_state_offset;
+            cldfb_state_offset = sub( st->cldfbBPF->p_filter_length, st->cldfbBPF->no_channels );
 
-        /* analysis and add the BPF error signal - needed for DFT stereo -> TD stereo switching */
-        addBassPostFilter( bpf_error_signal + st->L_frame - nSamples, st->bpf_off ? 0 : nSamples, realBuffer, imagBuffer, st->cldfbBPF );
+            // Get Q-factor
+            q_bpf_error_signal = Q6;
+            move16();
+            Copy_Scale_sig_16_32_no_sat( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
+            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+            {
+                Scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
+                Scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
+            }
+            Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, sub( q_bpf_error_signal, Q10 ) ); // q_bpf_error_signal (Q6)
+            st->cldfbBPF->Q_cldfb_state = q_bpf_error_signal;
+            move16();
+            tmp = 0;
+            move16();
+            if ( !st->bpf_off )
+            {
+                tmp = nSamples;
+                move16();
+            }
 
-        /* synthesis of the combined signal - needed for DFT stereo -> TD stereo switching */
-        cldfbSynthesis( realBuffer, imagBuffer, synth /*dummy*/, NS2SA( st->output_Fs, FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ), st->cldfbSyn );
+            addBassPostFilter_ivas_fx( tmp_bpf_error_signal_fx + sub( st->L_frame, nSamples ), tmp, realBuffer_fx, imagBuffer_fx, st->cldfbBPF );
 
-        if ( st->p_bpf_noise_buf )
+            Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, negate( sub( q_bpf_error_signal, Q10 ) ) ); // Q10
+            st->cldfbBPF->Q_cldfb_state = Q10;
+            move16();
+            /* synthesis of the combined signal - needed for DFT stereo -> TD stereo switching */
+            max_real = 0;
+            max_imag = 0;
+            move32();
+            move32();
+            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+            {
+                FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
+                {
+                    max_real = L_max( max_real, L_abs( realBuffer_fx[i][j] ) );
+                    max_imag = L_max( max_imag, L_abs( imagBuffer_fx[i][j] ) );
+                }
+            }
+            max_val = L_max( max_real, max_imag );
+            Q_real = sub( norm_l( max_val ), 3 ) /* Guard bits */;
+            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+            {
+                scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
+                scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
+            }
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
+#ifdef OPT_STEREO_32KBPS_V1
+            scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q_real, Q11 ) ); // Q10 - > (Q_real-1)
+#else                                                                                                       /* OPT_STEREO_32KBPS_V1 */
+            scale_sig32_r( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) );         //(Q_real - 1)
+#endif                                                                                                      /* OPT_STEREO_32KBPS_V1 */
+#endif                                                                                                      /* OPT_AVOID_STATE_BUF_RESCALE */
+
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx /*dummy*/, NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ), sub( Q10, sub( Q_real, 1 ) ), -10, st->cldfbSyn );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+            cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx /*dummy*/, NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ), 0, st->cldfbSyn );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
+            Scale_sig32( synth_fx, output_frame, negate( sub( Q_real, 1 ) ) );                                        // Q0
+            Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
+            st->cldfbSyn->Q_cldfb_state = Q10;
+            move16();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+            IF( st->p_bpf_noise_buf_32 )
+            {
+                Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
+                Copy32( bpf_error_signal_fx, st->p_bpf_noise_buf_32, st->L_frame );
+
+                Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( Q11, sub( st->Q_syn, 1 ) ) ); // Q11
+            }
+
+            set32_fx( synth_fx, 0, output_frame );
+        }
+
+        /* Copy output signal */
+        Scale_sig( syn_tmp_fx, add( st->L_frame, L_SUBFR ), negate( st->Q_syn ) ); // Q0
+        IF( st->element_mode > EVS_MONO )
         {
-            mvr2r( bpf_error_signal, st->p_bpf_noise_buf, st->L_frame );
+            Copy( psyn_fx, output_fx, st->L_frame ); /*Q_syn*/
         }
 
-        set_f( synth, 0.0f, output_frame );
+        st->Q_syn2 = 0;
+        move16();
     }
 
-    /* Copy output signal */
-    if ( st->element_mode > EVS_MONO )
-    {
-        mvr2r( syn, output, st->L_frame );
-    }
-#endif
     /*-----------------------------------------------------------------*
      * Bandwidth extension 6kHz-7kHz
      *-----------------------------------------------------------------*/
-    IF( st_fx->hBWE_zero != NULL )
+
+    IF( st->hBWE_zero != NULL )
     {
         test();
         test();
@@ -1854,15 +2279,27 @@ ivas_error acelp_core_dec_fx(
         test();
         test();
         test();
-        IF( ( EQ_16( st_fx->L_frame, L_FRAME ) && NE_16( st_fx->bwidth, NB ) && GE_16( output_frame, L_FRAME16k ) &&
-              ( EQ_16( st_fx->extl, -1 ) || EQ_16( st_fx->extl, SWB_CNG ) || ( EQ_16( st_fx->extl, WB_BWE ) && st_fx->extl_brate == 0 && NE_16( st_fx->coder_type, AUDIO ) ) ) ) )
+        IF( ( EQ_16( st->L_frame, L_FRAME ) && ( st->bwidth != NB ) && GE_16( output_frame, L_FRAME16k ) &&
+              ( EQ_16( st->extl, -1 ) || EQ_16( st->extl, SWB_CNG ) || ( EQ_16( st->extl, WB_BWE ) && st->extl_brate == 0 && NE_16( st->coder_type, AUDIO ) ) ) ) )
         {
-            hf_synth_fx( st_fx->hBWE_zero, st_fx->core_brate, output_frame, Aq_fx, exc2_fx, syn_fx, synth_out, st_fx->Q_exc,
-                         st_fx->Q_syn2, st_fx->hBWE_zero->delay_syn_hf_fx, &st_fx->hBWE_zero->memExp1, st_fx->hBWE_zero->mem_hp_interp_fx, st_fx->extl, st_fx->CNG_mode );
+            IF( EQ_16( st->element_mode, EVS_MONO ) )
+            {
+                hf_synth_fx( st->hBWE_zero, st->core_brate, output_frame, Aq_fx, exc2_fx, psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2 );
+            }
+            ELSE
+            {
+                Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q0
+                hf_synth_fx( st->hBWE_zero, st->core_brate, output_frame, Aq_fx, exc2_fx, psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2 );
+                Copy_Scale_sig_16_32_DEPREC( synth_fx16, synth_fx, output_frame, 0 );
+            }
         }
         ELSE
         {
-            hf_synth_reset_fx( st_fx->hBWE_zero );
+            hf_synth_reset_fx( st->hBWE_zero );
+            IF( NE_16( st->element_mode, EVS_MONO ) ) // VE: TBV: tmp hack - it is a bug in EVS but condition is here to keep EVS bit-exact for the moment
+            {
+                set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
+            }
         }
     }
 
@@ -1870,8 +2307,7 @@ ivas_error acelp_core_dec_fx(
      * Populate parameters for SWB TBE
      *-----------------------------------------------------------------*/
 
-    /* Apply a non linearity to the SHB excitation */
-    IF( hBWE_TD != NULL )
+    IF( st->hBWE_TD != NULL )
     {
         test();
         test();
@@ -1885,11 +2321,11 @@ ivas_error acelp_core_dec_fx(
         test();
         test();
         test();
-        IF( ( !st_fx->bfi && ( st_fx->prev_bfi ) ) || ( ( EQ_16( st_fx->last_vbr_hw_BWE_disable_dec, 1 ) ) && ( st_fx->vbr_hw_BWE_disable_dec == 0 ) ) || ( ( EQ_16( st_fx->extl, SWB_TBE ) || EQ_16( st_fx->extl, WB_TBE ) || EQ_16( st_fx->extl, FB_TBE ) ) && NE_16( st_fx->last_extl, SWB_TBE ) && NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, FB_TBE ) ) || ( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && !st_fx->tdm_LRTD_flag ) )
+        IF( ( !st->bfi && st->prev_bfi ) || ( EQ_16( st->last_vbr_hw_BWE_disable_dec, 1 ) && ( st->vbr_hw_BWE_disable_dec == 0 ) ) || ( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, WB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, WB_TBE ) && NE_16( st->last_extl, FB_TBE ) ) || ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && !st->tdm_LRTD_flag ) )
         {
-            hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
+            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
             move32();
-            set16_fx( hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET );
+            set16_fx( st->hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET );
         }
 
         test();
@@ -1897,41 +2333,70 @@ ivas_error acelp_core_dec_fx(
         test();
         test();
         test();
-        IF( !st_fx->ppp_mode_dec && ( st_fx->idchan == 0 || NE_16( st_fx->element_mode, IVAS_CPE_TD ) || ( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && st_fx->tdm_LRTD_flag ) ) )
+        IF( !st->ppp_mode_dec && ( st->idchan == 0 || NE_16( st->element_mode, IVAS_CPE_TD ) || ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && st->tdm_LRTD_flag ) ) )
         {
-            non_linearity_fx( bwe_exc_fx, bwe_exc_extended, L_FRAME32k, &hBWE_TD->bwe_non_lin_prev_scale_fx, st_fx->Q_exc,
-                              st_fx->coder_type, voice_factors, st_fx->L_frame );
+            IF( EQ_16( st->element_mode, EVS_MONO ) )
+            {
+                non_linearity_fx( bwe_exc_fx, bwe_exc_extended_fx, L_FRAME32k, &st->hBWE_TD->bwe_non_lin_prev_scale_fx, st->Q_exc, st->coder_type, voice_factors_fx, st->L_frame );
+            }
+            ELSE
+            {
+                Copy_Scale_sig_16_32_no_sat( st->hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_fx, NL_BUFF_OFFSET, ( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
+                non_linearity_ivas_fx( bwe_exc_fx, bwe_exc_extended_fx + NL_BUFF_OFFSET, L_FRAME32k, &st->hBWE_TD->bwe_non_lin_prev_scale_fx, st->Q_exc, st->coder_type, voice_factors_fx, st->L_frame );
+                Copy_Scale_sig_32_16( bwe_exc_extended_fx + L_FRAME32k, st->hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET, negate( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
+            }
         }
 
         test();
-        IF( ( st_fx->core_brate == FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) )
+        if ( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) )
         {
-            hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
+            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
             move32();
         }
     }
+
     /*----------------------------------------------------------------------*
      * Updates
      *----------------------------------------------------------------------*/
 
-    updt_dec_fx( st_fx, old_exc_fx, pitch_buf_fx, Es_pred_fx, Aq_fx, lsf_new_fx, lsp_new_fx, voice_factors, old_bwe_exc_fx, gain_buf );
+    updt_dec_fx( st, old_exc_fx, pitch_buf_fx, Es_pred_fx, Aq_fx, lsf_new_fx, lsp_new_fx, voice_factors_fx, old_bwe_exc_fx, gain_buf_fx );
 
     test();
     test();
-    IF( GT_32( st_fx->core_brate, SID_2k40 ) && st_fx->hTdCngDec != NULL && st_fx->hFdCngDec != NULL )
+    IF( GT_32( st->core_brate, SID_2k40 ) && st->hTdCngDec != NULL && st->hFdCngDec != NULL )
     {
         /* update CNG parameters in active frames */
-        cng_params_upd_fx( lsp_new_fx, exc_fx, st_fx->L_frame, &st_fx->hTdCngDec->ho_circ_ptr, st_fx->hTdCngDec->ho_ener_circ_fx, &st_fx->hTdCngDec->ho_circ_size, st_fx->hTdCngDec->ho_lsp_circ_fx,
-                           st_fx->Q_exc, DEC, st_fx->hTdCngDec->ho_env_circ_fx, NULL, NULL, NULL, NULL, st_fx->last_active_brate );
+        IF( EQ_16( st->element_mode, EVS_MONO ) )
+        {
+            cng_params_upd_fx( lsp_new_fx, exc_fx, st->L_frame, &st->hTdCngDec->ho_circ_ptr, st->hTdCngDec->ho_ener_circ_fx, &st->hTdCngDec->ho_circ_size, st->hTdCngDec->ho_lsp_circ_fx,
+                               st->Q_exc, DEC, st->hTdCngDec->ho_env_circ_fx, NULL, NULL, NULL, NULL, st->last_active_brate );
+        }
+        ELSE
+        {
+            cng_params_upd_ivas_fx( lsp_new_fx, exc_fx, st->L_frame, &st->hTdCngDec->ho_circ_ptr, st->hTdCngDec->ho_ener_circ_fx, &st->hTdCngDec->ho_circ_size,
+                                    st->hTdCngDec->ho_lsp_circ_fx, st->Q_exc, DEC, st->hTdCngDec->ho_env_circ_fx, NULL, NULL, NULL, NULL, st->last_active_brate, st->element_mode,
+                                    st->hFdCngDec->hFdCngCom->CngBandwidth );
+        }
+
         /* Set 16k LSP flag for CNG buffer */
-        st_fx->hTdCngDec->ho_16k_lsp[st_fx->hTdCngDec->ho_circ_ptr] = 0;
+        st->hTdCngDec->ho_16k_lsp[st->hTdCngDec->ho_circ_ptr] = 0;
         move16();
-        if ( NE_16( st_fx->L_frame, L_FRAME ) )
+        if ( NE_16( st->L_frame, L_FRAME ) )
         {
-            st_fx->hTdCngDec->ho_16k_lsp[st_fx->hTdCngDec->ho_circ_ptr] = 1;
+            st->hTdCngDec->ho_16k_lsp[st->hTdCngDec->ho_circ_ptr] = 1;
             move16();
         }
     }
 
-    return IVAS_ERR_OK;
+    IF( NE_16( st->element_mode, EVS_MONO ) )
+    {
+        IF( save_hb_synth_fx16 )
+        {
+            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, L_FRAME48k, 0 ); // Q0
+        }
+        Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q_syn2
+    }
+
+    pop_wmops();
+    return error;
 }
diff --git a/lib_dec/acelp_core_dec_ivas_fx.c b/lib_dec/acelp_core_dec_ivas_fx.c
deleted file mode 100644
index 49b3297836a70ff42e2b69e68ed4471fea852703..0000000000000000000000000000000000000000
--- a/lib_dec/acelp_core_dec_ivas_fx.c
+++ /dev/null
@@ -1,2219 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-#include <stdint.h>
-#include <assert.h>
-#include <math.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
-#include "ivas_prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * acelp_core_dec_ivas_fx()
- *
- * ACELP core decoder
- *-------------------------------------------------------------------*/
-static void rescale_fdCngDec( HANDLE_FD_CNG_DEC hFdCngDec, Word16 old_NoiseExp );
-ivas_error acelp_core_dec_ivas_fx(
-    Decoder_State *st,                   /* i/o: decoder state structure                                                 */
-    Word16 output_fx[],                  /* o  : synthesis @internal Fs                                                  Q_syn*/
-    Word16 synth_fx16[],                 /* o  : synthesis                                                               Q_syn2*/
-    Word16 save_hb_synth_fx16[],         /* o  : HB synthesis                                                            Q0*/
-    Word32 bwe_exc_extended_fx[],        /* i/o: bandwidth extended excitation                                           2*Q_exc*/
-    Word16 *voice_factors_fx,            /* o  : voicing factors                                                         Q15*/
-    Word16 old_syn_12k8_16k_fx[],        /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE  Q_syn2-1*/
-    const Word16 sharpFlag,              /* i  : formant sharpening flag                                                 */
-    Word16 pitch_buf_fx[NB_SUBFR16k],    /* o  : Word16 pitch for each subframe                                        Q6*/
-    Word16 *unbits,                      /* o  : number of unused bits                                                   */
-    Word16 *sid_bw,                      /* o  : 0-NB/WB, 1-SWB SID                                                      */
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle                                                Qlog2(2.56)*/
-    const Word16 tdm_lspQ_PCh_fx[M],     /* i  : Q LSPs for primary channel                                              Q15*/
-    const Word16 tdm_lsfQ_PCh_fx[M],     /* i  : Q LSFs for primary channel                                              */
-    const Word16 use_cldfb_for_dft,      /* i  : flag to use of CLDFB for DFT Stereo                                     */
-    const Word16 last_element_mode,      /* i  : last element mode                                                       */
-    const Word32 last_element_brate,     /* i  : last element bitrate                                                    */
-    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel                                          */
-    const Word16 nchan_out,              /* i  : number of output channels                                               */
-    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : stereo CNG handle                                                       */
-    const Word16 read_sid_info           /* i  : read SID info flag                                                      */
-)
-{
-    Word32 synth_fx[960], save_hb_synth_fx[960] /*, bwe_exc_extended_fx[L_FRAME32k + NL_BUFF_OFFSET]*/;
-
-    Word16 old_exc_fx[L_EXC_DEC], *exc_fx;             /* excitation signal buffer              */
-    Word16 syn_tmp_fx[L_FRAME16k + L_SUBFR], *psyn_fx; /* synthesis signal buffer               */
-    Word16 output_frame;                               /* frame length at output sampling freq. */
-    Word16 lsf_new_fx[M];                              /* LSFs at the end of the frame  Qlog2(2.56)        */
-    Word16 lsp_new_fx[M];                              /* LSPs at the end of the frame    Q15      */
-    Word16 lsp_mid_fx[M];                              /* LSPs in the middle of the frame       */
-#ifdef MSAN_FIX
-    Word16 Aq_fx[NB_SUBFR16k * ( M + 1 )]; /* A(q) quantized for the 4 subframes    */
-#else
-    Word16 Aq_fx[NB_SUBFR16k * ( M + 1 )];                                           /* A(q) quantized for the 4 subframes    */
-#endif
-    Word16 old_exc2_fx[L_FRAME16k + L_EXC_MEM], *exc2_fx; /* total excitation buffer               */
-    Word16 mem_tmp_fx[M];                                 /* temporary synthesis filter memory     */
-    Word32 enr_q_fx;                                      /* E information for FER protection      */
-    Word16 tmp_noise_fx;                                  /* Long term temporary noise energy      */
-    Word16 Es_pred_fx;                                    /* predicted scaled innov. energy Q8       */
-    Word16 FEC_pitch_fx;                                  /* FEC pitch                             */
-#ifdef MSAN_FIX
-    Word16 old_bwe_exc_fx[( ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 )]; /* excitation buffer                     */
-#else
-    Word16 old_bwe_exc_fx[( ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 )]; /* excitation buffer                     */
-#endif
-    Word16 *bwe_exc_fx; /* Excitation for SWB TBE                */
-    Word16 i, j, int_fs;
-    Word16 tc_subfr;
-    Word16 allow_cn_step;
-    Word16 temp_buf_fx[L_FRAME16k + L_SYN_MEM];
-    Word16 last_pulse_pos;
-    Word16 T0_tmp;
-    Word16 do_WI;
-    Word16 dct_buffer_fx[DCT_L_POST];
-    Word16 exc_buffer_fx[DCT_L_POST];
-    Word16 dct_exc_tmp_fx[L_FRAME16k];
-    Word16 nb_bits; /* number of bits                       */
-    Word16 indice;  /* parameter indices to write           */
-    Word16 gain_buf_fx[NB_SUBFR16k];
-    Word16 syn_fx_tmp2[L_FRAME_16k];
-    Word16 pitch_buf_tmp[NB_SUBFR16k];
-    Word16 update_flg;
-    Word32 q_env_fx[20];
-    Word16 exc3_fx[L_FRAME16k];
-    Word16 syn1_tmp_fx[L_FRAME16k + 2], *syn1_fx;
-    Word32 *realBuffer_fx[CLDFB_NO_COL_MAX], *imagBuffer_fx[CLDFB_NO_COL_MAX];
-    Word32 realBufferTmp_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-    Word32 imagBufferTmp_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-    Word16 LSF_Q_prediction; /* LSF prediction mode                  */
-    Word16 avoid_lpc_burst_on_recovery;
-    Word16 tmpF_fx;
-    Word16 uc_two_stage_flag;
-    Word16 tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag;
-    Word16 *old_exc_s_fx; /* Start of last excitation frame       */
-    Word16 *p_tdm_Pri_pitch_buf_fx;
-    Word16 local_element_mode;
-    ivas_error error;
-
-    Word32 bpf_error_signal_fx[L_FRAME16k];
-#ifdef MSAN_FIX
-    set32_fx( bpf_error_signal_fx, 0, L_FRAME16k );
-#endif
-    Word16 bpf_error_signal_16fx[L_FRAME16k];
-#ifdef MSAN_FIX
-    set16_fx( bpf_error_signal_16fx, 0, L_FRAME16k );
-#endif
-    set16_fx( Aq_fx, 0, NB_SUBFR16k * ( M + 1 ) );
-    set16_fx( old_bwe_exc_fx, 0, ( ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 ) );
-    Word16 tmp;
-
-    error = IVAS_ERR_OK;
-    move32();
-
-    test();
-    test();
-    test();
-    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( nchan_out, 1 ) && EQ_16( st->idchan, 1 ) && LE_32( last_element_brate, IVAS_SID_5k2 ) )
-    {
-        /* In MDCT-Stereo DTX with mono output, we can skip CNG for the second channel, except for the first inactive frame following an active period */
-        return error;
-    }
-
-    push_wmops( "acelp_core_dec" );
-
-    /* output_frame = (int16_t) ( st->output_Fs / FRAMES_PER_SEC ); */
-    output_frame = extract_l( Mpy_32_32( st->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );
-
-    /*----------------------------------------------------------------*
-     * stereo SID and CNG frames processing
-     *----------------------------------------------------------------*/
-    test();
-    test();
-    IF( LE_32( st->core_brate, SID_2k40 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) && EQ_16( nchan_out, 2 ) )
-    {
-        IF( EQ_16( st->cng_type, FD_CNG ) )
-        {
-            configureFdCngDec_fx( st->hFdCngDec, st->bwidth, ACELP_14k25, st->L_frame, st->last_L_frame, st->element_mode );
-            Word16 old_NoiseEstExp;
-            old_NoiseEstExp = st->hFdCngDec->hFdCngCom->sidNoiseEstExp;
-            move16();
-            /* Only run parameter decoding in SID frames */
-            IF( EQ_32( st->core_brate, SID_2k40 ) )
-            {
-                FdCng_decodeSID_ivas_fx( st );
-                rescale_fdCngDec( st->hFdCngDec, sub( old_NoiseEstExp, st->hFdCngDec->hFdCngCom->sidNoiseEstExp ) );
-            }
-            FOR( i = 0; i < NPART; i++ )
-            {
-                st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] = Madd_32_32( Mpy_32_32( STEREO_DFT_FD_FILT_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] ),
-                                                                         STEREO_DFT_FD_FILT_COMP_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEst[i] );
-                move32();
-            }
-            ApplyFdCng_ivas_fx( NULL, 0, NULL, 0, NULL, NULL, NULL, st, 0, 0 );
-        }
-        ELSE
-        {
-            configureFdCngDec_fx( st->hFdCngDec, st->bwidth, ACELP_14k25, st->L_frame, st->last_L_frame, st->element_mode );
-
-            /* decode CNG parameters */
-            CNG_dec_ivas_fx( st, last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step, sid_bw, q_env_fx );
-
-            /* comfort noise generation */
-            CNG_exc_fx( st->core_brate, st->L_frame, &st->hTdCngDec->Enew_fx, &st->hTdCngDec->cng_seed, NULL, NULL, &st->lp_ener_fx, st->last_core_brate, &st->first_CNG, &( st->hTdCngDec->cng_ener_seed ), NULL, allow_cn_step, &st->hTdCngDec->last_allow_cn_step, st->prev_Q_exc, st->Q_exc, st->hTdCngDec->num_ho, q_env_fx, st->hTdCngDec->lp_env_fx, st->hTdCngDec->old_env_fx, st->hTdCngDec->exc_mem_fx, st->hTdCngDec->exc_mem1_fx, sid_bw, &st->hTdCngDec->cng_ener_seed1, NULL, st->Opt_AMR_WB, st->element_mode );
-
-            Copy( Aq_fx, st->Aq_cng, M + 1 ); /*Q12*/
-
-            /* update old LSP and LSF vector */
-            Copy( lsf_new_fx, st->lsf_old_fx, M ); /*Qlog2(2.56)*/
-            Copy( lsp_new_fx, st->lsp_old_fx, M ); /*Q15*/
-        }
-
-        set16_fx( output_fx, 0, output_frame );  /* output and synth are not used in DFT domain CNG generation and the decoder output is unaffected if they are left uninitalized */
-        set16_fx( synth_fx16, 0, output_frame ); /* They are however read in a few places which causes errors in the valgrind tests. Simplest solution from a code perspective was to set them to zero. */
-
-        /* CN generation done in DFT domain */
-        pop_wmops();
-
-        return error;
-    }
-
-    /*----------------------------------------------------------------*
-     * Active frames processing
-     *----------------------------------------------------------------*/
-
-    /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */
-    FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-    {
-        set32_fx( realBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
-        set32_fx( imagBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
-        realBuffer_fx[i] = realBufferTmp_fx[i];
-        imagBuffer_fx[i] = imagBufferTmp_fx[i];
-    }
-    /*----------------------------------------------------------------*
-     * Initialization
-     *----------------------------------------------------------------*/
-
-    LSF_Q_prediction = -1;
-    move16();
-    set16_fx( syn_tmp_fx, 0, L_SUBFR );
-    psyn_fx = syn_tmp_fx + L_SUBFR;
-    syn1_tmp_fx[0] = 0;
-    move16();
-    syn1_tmp_fx[1] = 0;
-    move16();
-    syn1_fx = syn1_tmp_fx + 2;
-
-    st->bpf_off = 0;
-    move16();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( st->last_core, HQ_CORE ) || EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && LE_32( st->last_core_brate, SID_2k40 ) ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && LE_32( st->last_core_brate, SID_2k40 ) ) )
-    {
-        /* in case of HQ->ACELP switching, do not apply BPF */
-        st->bpf_off = 1;
-        move16();
-        if ( st->hPFstat != NULL )
-        {
-            /* in case of core switching, reset post-filter memories */
-            st->hPFstat->on = 0;
-            move16();
-        }
-
-        if ( st->hGSCDec != NULL )
-        {
-            /* reset the GSC pre echo energy threshold in case of switching */
-            st->hGSCDec->Last_frame_ener_fx = MAX_32;
-            move32();
-        }
-    }
-
-    test();
-    if ( st->hGSCDec != NULL && ( st->prev_bfi > 0 ) )
-    {
-        /* reset the GSC pre echo energy threshold in case of FEC */
-        st->hGSCDec->Last_frame_ener_fx = MAX_32;
-        move32();
-    }
-    test();
-    test();
-    test();
-    test();
-    IF( st->hFdCngDec != NULL && ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && ( EQ_32( st->last_core_brate, SID_2k40 ) || st->last_core_brate == FRAME_NO_DATA ) )
-    {
-        set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, FFTLEN );
-        set16_fx( hStereoCng->olapBufferSynth22_fx, 0, FFTLEN );
-    }
-
-    st->clas_dec = st->last_good;
-    move16();
-    enr_q_fx = 0;
-    move32();
-    Es_pred_fx = 0;
-    move16();
-    tmp_noise_fx = 0;
-    move16();
-    Copy( st->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC ); /*Q_exc*/
-    exc_fx = old_exc_fx + L_EXC_MEM_DEC;
-
-    IF( st->hWIDec != NULL )
-    {
-        Copy( st->hWIDec->old_exc2_fx, old_exc2_fx, L_EXC_MEM );
-    }
-    ELSE
-    {
-        set16_fx( old_exc2_fx, 0, L_EXC_MEM );
-    }
-    exc2_fx = old_exc2_fx + L_EXC_MEM;
-
-    IF( st->hBWE_TD != NULL )
-    {
-        Copy( st->hBWE_TD->old_bwe_exc_fx, old_bwe_exc_fx, PIT16k_MAX * 2 ); /*Q_exc*/
-        bwe_exc_fx = old_bwe_exc_fx + PIT16k_MAX * 2;
-    }
-    ELSE
-    {
-        bwe_exc_fx = NULL;
-    }
-
-    last_pulse_pos = 0;
-    move16();
-    do_WI = 0;
-    move16();
-    st->GSC_noisy_speech = 0;
-    move16();
-    st->relax_prev_lsf_interp = 0;
-    move16();
-    set16_fx( gain_buf_fx, 0, NB_SUBFR16k );
-
-    IF( EQ_16( st->L_frame, L_FRAME ) )
-    {
-        st->gamma = GAMMA1;
-        move16();
-        st->inv_gamma = GAMMA1_INV;
-        move16();
-        st->preemph_fac = PREEMPH_FAC;
-        move16();
-        int_fs = INT_FS_12k8;
-        move16();
-    }
-    ELSE
-    {
-        st->gamma = GAMMA16k;
-        move16();
-        st->inv_gamma = GAMMA16k_INV;
-        move16();
-        st->preemph_fac = PREEMPH_FAC_16k;
-        move16();
-        int_fs = INT_FS_16k;
-        move16();
-    }
-    test();
-    /* reset post-filter in case of switching */
-    if ( st->hPFstat != NULL && ( st->hPFstat->on == 0 ) )
-    {
-        st->hPFstat->reset = 1;
-        move16();
-    }
-
-    avoid_lpc_burst_on_recovery = 0;
-    move16();
-    test();
-    test();
-    if ( st->last_con_tcx && NE_16( st->L_frameTCX_past, st->L_frame ) && ( st->last_core != 0 ) )
-    {
-        avoid_lpc_burst_on_recovery = 1;
-        move16();
-    }
-    test();
-    /* TD stereo parameters */
-    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( st->idchan, 1 ) )
-    {
-        tdm_lp_reuse_flag = hStereoTD->tdm_lp_reuse_flag;
-        move16();
-        tdm_low_rate_mode = hStereoTD->tdm_low_rate_mode;
-        move16();
-        tdm_Pitch_reuse_flag = hStereoTD->tdm_Pitch_reuse_flag;
-        move16();
-        p_tdm_Pri_pitch_buf_fx = hStereoTD->tdm_Pri_pitch_buf_fx;
-    }
-    ELSE
-    {
-        tdm_lp_reuse_flag = 0;
-        move16();
-        tdm_low_rate_mode = 0;
-        move16();
-        test();
-        if ( EQ_16( st->element_mode, IVAS_SCE ) && st->low_rate_mode )
-        {
-            tdm_low_rate_mode = 1;
-            move16();
-        }
-        tdm_Pitch_reuse_flag = 0;
-        move16();
-        p_tdm_Pri_pitch_buf_fx = NULL;
-    }
-
-    /*----------------------------------------------------------------*
-     * Updates in case of internal sampling rate switching
-     *----------------------------------------------------------------*/
-    test();
-    test();
-    IF( NE_16( st->last_L_frame, st->L_frame ) && ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) )
-    {
-        Word16 dec;
-
-        IF( ( st->hPFstat->on != 0 ) )
-        {
-            Word16 mem_syn_r_size_old, mem_syn_r_size_new;
-            mem_syn_r_size_old = mult_r( 2048, st->last_L_frame ); /* 1.25/20.f = 2048 (Q15)*/
-            mem_syn_r_size_new = mult_r( 2048, st->L_frame );      /* 1.25/20.f = 2048 (Q15)*/
-            lerp( st->hPFstat->mem_stp + sub( L_SYN_MEM, mem_syn_r_size_old ), st->hPFstat->mem_stp + sub( L_SYN_MEM, mem_syn_r_size_new ), mem_syn_r_size_new, mem_syn_r_size_old );
-            lerp( st->hPFstat->mem_pf_in + sub( L_SYN_MEM, mem_syn_r_size_old ), st->hPFstat->mem_pf_in + sub( L_SYN_MEM, mem_syn_r_size_new ), mem_syn_r_size_new, mem_syn_r_size_old );
-        }
-
-        /* convert quantized LSP vector */
-        st->rate_switching_reset = lsp_convert_poly_fx( st->lsp_old_fx, st->L_frame, 0 );
-        move16();
-
-        /* convert old quantized LSF vector */
-        lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, int_fs );
-
-        /* FEC - update adaptive LSF mean vector */
-        Copy( st->lsf_old_fx, st->lsfoldbfi1_fx, M );        /*Qlog2(2.56)*/
-        Copy( st->lsf_old_fx, st->lsfoldbfi0_fx, M );        /*Qlog2(2.56)*/
-        Copy( st->lsf_old_fx, st->lsf_adaptive_mean_fx, M ); /*Qlog2(2.56)*/
-
-        /* Reset LPC mem */
-        IF( EQ_32( st->sr_core, INT_FS_16k ) )
-        {
-            Copy( GEWB2_Ave_fx, st->mem_AR_fx, M ); /*Qlog2(2.56)*/
-        }
-        ELSE
-        {
-            Copy( GEWB_Ave_fx, st->mem_AR_fx, M ); /*Qlog2(2.56)*/
-        }
-        set16_fx( st->mem_MA_fx, 0, M );
-
-        /* update synthesis filter memories */
-        dec = DEC;
-        move16();
-        if ( st->element_mode != EVS_MONO )
-        {
-            dec = DEC_IVAS;
-            move16();
-        }
-        ivas_synth_mem_updt2_fx( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, dec );
-        Copy( st->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC );                           /*Q_exc*/
-        Copy_Scale_sig( st->mem_syn2_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); /*Q-1*/
-        Copy( st->mem_syn2_fx, st->mem_syn3_fx, M );                                 /*Q_syn*/
-    }
-
-    /* update buffer of old subframe pitch values */
-    IF( NE_16( st->last_L_frame, st->L_frame ) )
-    {
-        IF( EQ_16( st->L_frame, L_FRAME ) )
-        {
-            IF( EQ_16( st->last_L_frame, L_FRAME32k ) )
-            {
-                tmpF_fx = 13107; // Q15
-                move16();
-            }
-            ELSE IF( EQ_16( st->last_L_frame, 512 ) )
-            {
-                tmpF_fx = 16384; // Q15
-                move16();
-            }
-            ELSE /* st->last_L_frame == L_FRAME16k */
-            {
-                tmpF_fx = 26214; // Q15
-                move16();
-            }
-
-            FOR( i = NB_SUBFR16k - NB_SUBFR; i < NB_SUBFR16k; i++ )
-            {
-                st->old_pitch_buf_fx[i - 1] = Mpy_32_16_1( st->old_pitch_buf_fx[i], tmpF_fx ); // Q16
-                move32();
-            }
-
-            FOR( i = 2 * NB_SUBFR16k - NB_SUBFR; i < 2 * NB_SUBFR16k; i++ )
-            {
-                st->old_pitch_buf_fx[i - 2] = Mpy_32_16_1( st->old_pitch_buf_fx[i], tmpF_fx ); // Q16
-                move32();
-            }
-        }
-        ELSE
-        {
-            Word16 exp = 0;
-            move16();
-            IF( EQ_16( st->last_L_frame, L_FRAME32k ) )
-            {
-                tmpF_fx = 16384; // Q15
-                move16();
-            }
-            ELSE IF( EQ_16( st->last_L_frame, 512 ) )
-            {
-                tmpF_fx = 20480; // Q15
-                move16();
-            }
-            ELSE /* st->last_L_frame == L_FRAME12k8 */
-            {
-                tmpF_fx = 20480; // Q14
-                move16();
-                exp = 1;
-                move16();
-            }
-            FOR( i = 2 * NB_SUBFR - 1; i >= NB_SUBFR; i-- )
-            {
-                st->old_pitch_buf_fx[i + 2] = Mpy_32_16_1( L_shl( st->old_pitch_buf_fx[i], exp ), tmpF_fx ); // Q15
-                move32();
-            }
-            st->old_pitch_buf_fx[NB_SUBFR + 1] = st->old_pitch_buf_fx[NB_SUBFR + 2];
-            move32();
-
-            FOR( i = NB_SUBFR - 1; i >= 0; i-- )
-            {
-                st->old_pitch_buf_fx[i + 1] = Mpy_32_16_1( L_shl( st->old_pitch_buf_fx[i], exp ), tmpF_fx ); // Q15
-                move32();
-            }
-            st->old_pitch_buf_fx[0] = st->old_pitch_buf_fx[1];
-            move32();
-        }
-    }
-
-    IF( NE_16( st->bfi_pitch_frame, st->L_frame ) )
-    {
-        IF( EQ_16( st->L_frame, L_FRAME ) )
-        {
-            IF( EQ_16( st->bfi_pitch_frame, L_FRAME32k ) )
-            {
-                tmpF_fx = 13107; // Q15
-                move16();
-            }
-            ELSE IF( EQ_16( st->bfi_pitch_frame, 512 ) )
-            {
-                tmpF_fx = 16384; // Q15
-                move16();
-            }
-            ELSE /* st->bfi_pitch_frame == L_FRAME16k */
-            {
-                tmpF_fx = 26214; // Q15
-                move16();
-            }
-            st->bfi_pitch_fx = mult_r( st->bfi_pitch_fx, tmpF_fx );
-            move16();
-            st->bfi_pitch_frame = L_FRAME;
-            move16();
-        }
-        ELSE
-        {
-            Word16 exp = 0;
-            move16();
-            IF( EQ_16( st->bfi_pitch_frame, L_FRAME32k ) )
-            {
-                tmpF_fx = 16384; // Q15
-                move16();
-            }
-            ELSE IF( EQ_16( st->bfi_pitch_frame, 512 ) )
-            {
-                tmpF_fx = 20480; // Q15
-                move16();
-            }
-            ELSE /* st->bfi_pitch_frame == L_FRAME12k8 */
-            {
-                tmpF_fx = 20480; // Q14
-                move16();
-                exp = 1;
-                move16();
-            }
-            st->bfi_pitch_fx = mult_r( shl_sat( st->bfi_pitch_fx, exp ), tmpF_fx );
-            move16();
-            st->bfi_pitch_frame = L_FRAME16k;
-            move16();
-        }
-    }
-    test();
-    test();
-    if ( EQ_16( st->last_bwidth, NB ) && NE_16( st->bwidth, NB ) && ( st->ini_frame != 0 ) )
-    {
-        st->rate_switching_reset = 1;
-        move16();
-    }
-
-    /*----------------------------------------------------------------------*
-     * GOOD frame
-     *----------------------------------------------------------------------*/
-
-    IF( !st->bfi )
-    {
-
-        /*----------------------------------------------------------------*
-         * Decoding of TC subframe classification
-         *----------------------------------------------------------------*/
-
-        tc_subfr = -1;
-        move16();
-        IF( EQ_16( st->coder_type, TRANSITION ) )
-        {
-            tc_subfr = tc_classif_fx( st, st->L_frame );
-        }
-
-        /*----------------------------------------------------------------*
-         * Decoding of GSC IVAS mode
-         *----------------------------------------------------------------*/
-        test();
-        test();
-        test();
-        test();
-        IF( st->element_mode > EVS_MONO && st->idchan == 0 && !( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) ) && !tdm_low_rate_mode )
-        {
-            test();
-            test();
-            IF( EQ_16( st->coder_type, AUDIO ) || ( st->coder_type == INACTIVE && LE_32( st->total_brate, MAX_GSC_INACTIVE_BRATE ) ) )
-            {
-                st->GSC_IVAS_mode = get_next_indice_fx( st, 2 );
-                move16();
-            }
-        }
-
-        /*----------------------------------------------------------------*
-         * Decoding of inactive CNG frames
-         *----------------------------------------------------------------*/
-        test();
-        IF( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) )
-        {
-            /* decode CNG parameters */
-            IF( st->cng_type == LP_CNG )
-            {
-                CNG_dec_ivas_fx( st, last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step, sid_bw, q_env_fx );
-#ifndef FIX_1100_REMOVE_LPC_RESCALING
-                FOR( Word32 nsf = 0; nsf < NB_SUBFR16k; nsf++ )
-                {
-                    Scale_sig( Aq_fx + imult3216( nsf, ( M + 1 ) ), M + 1, sub( norm_s( Aq_fx[nsf * ( M + 1 )] ), Q2 ) );
-                    Aq_fx[nsf * ( M + 1 )] = ONE_IN_Q12;
-                    move16();
-                }
-#endif
-                Copy( Aq_fx, st->Aq_cng, add( M, 1 ) );
-
-                /* comfort noise generation */
-                local_element_mode = st->element_mode;
-                move16();
-                test();
-                test();
-                if ( ( EQ_16( nchan_out, 1 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) || EQ_16( st->masa_sid_format, 1 ) )
-                {
-                    local_element_mode = IVAS_SCE; /* For DFT Stereo mono decoding, run CNG_exc as in SCE */
-                    move16();
-                }
-                CNG_exc_fx( st->core_brate, st->L_frame, &st->hTdCngDec->Enew_fx, &st->hTdCngDec->cng_seed, exc_fx, exc2_fx, &st->lp_ener_fx, st->last_core_brate, &st->first_CNG, &( st->hTdCngDec->cng_ener_seed ), bwe_exc_fx, allow_cn_step, &st->hTdCngDec->last_allow_cn_step, st->prev_Q_exc, st->Q_exc, st->hTdCngDec->num_ho, q_env_fx, st->hTdCngDec->lp_env_fx, st->hTdCngDec->old_env_fx, st->hTdCngDec->exc_mem_fx, st->hTdCngDec->exc_mem1_fx, sid_bw, &st->hTdCngDec->cng_ener_seed1, exc3_fx, st->Opt_AMR_WB, local_element_mode );
-            }
-            ELSE
-            {
-                test();
-                IF( EQ_32( st->core_brate, SID_2k40 ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
-                {
-                    Word16 old_NoiseEstExp = st->hFdCngDec->hFdCngCom->sidNoiseEstExp;
-                    move16();
-                    FdCng_decodeSID_ivas_fx( st );
-                    rescale_fdCngDec( st->hFdCngDec, sub( old_NoiseEstExp, st->hFdCngDec->hFdCngCom->sidNoiseEstExp ) );
-                    Scale_sig( st->hFdCngDec->hFdCngCom->A_cng, M + 1, sub( norm_s( st->hFdCngDec->hFdCngCom->A_cng[0] ), Q2 ) ); // Qx
-                    *sid_bw = 0;
-                    move16();
-                }
-
-                IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-                {
-                    assert( nchan_out == 1 );
-
-                    FOR( i = 0; i < NPART; i++ )
-                    {
-                        st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] = Madd_32_32( Mpy_32_32( STEREO_DFT_FD_FILT_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEstLp[i] ),
-                                                                                 STEREO_DFT_FD_FILT_COMP_Q31, st->hFdCngDec->hFdCngCom->sidNoiseEst[i] );
-                        move32();
-                    }
-                    ApplyFdCng_ivas_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-                    Word16 new_sidNoiseEstExp = 31 - Q4;
-                    move16();
-                    Scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART, sub( st->hFdCngDec->hFdCngCom->sidNoiseEstExp, new_sidNoiseEstExp ) ); // Q(31-sidNoiseEstExp)
-                    Scale_sig32( st->hFdCngDec->hFdCngCom->sidNoiseEst, NPART, sub( st->hFdCngDec->hFdCngCom->sidNoiseEstExp, new_sidNoiseEstExp ) );   // Q(31-sidNoiseEstExp)
-                    st->hFdCngDec->hFdCngCom->sidNoiseEstExp = new_sidNoiseEstExp;
-                    move16();
-                    Word16 new_cngNoiseLevelExp = 31 - Q4;
-                    move16();
-                    Scale_sig32( st->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, sub( st->hFdCngDec->hFdCngCom->cngNoiseLevelExp, new_cngNoiseLevelExp ) ); // Q(31-cngNoiseLevelExp)
-                    st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = new_cngNoiseLevelExp;
-                    move16();
-
-                    test();
-                    ApplyFdCng_ivas_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( EQ_16( st->coder_type, AUDIO ) && !st->GSC_noisy_speech ) );
-
-                    IF( st->hFdCngDec->hFdCngCom->cngNoiseLevelExp < 0 )
-                    {
-                        Scale_sig32( st->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ); // Q(31-cngNoiseLevelExp)
-                        st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = 0;
-                        move16();
-                    }
-                }
-
-                IF( !read_sid_info )
-                {
-                    Word32 noise_lvl_highest_fx;
-
-                    noise_lvl_highest_fx = st->hFdCngDec->hFdCngCom->cngNoiseLevel[( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ) - 1];
-                    move32();
-                    FOR( Word16 b = ( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ); b < st->hFdCngDec->hFdCngCom->stopBand; b++ )
-                    {
-                        st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest_fx;
-                        move32();
-                    }
-                }
-
-                generate_comfort_noise_dec_ivas_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 1, nchan_out );
-
-                FdCng_exc( st->hFdCngDec->hFdCngCom, &st->CNG_mode, st->L_frame, st->lsp_old_fx, st->first_CNG, st->lspCNG_fx, Aq_fx, lsp_new_fx, lsf_new_fx, exc_fx, exc2_fx, bwe_exc_fx );
-
-                Copy( exc2_fx, exc3_fx, st->L_frame );
-            }
-
-            Word16 delta_mem_scale = 3;
-            move16();
-            test();
-            if ( LT_32( st->lp_ener_fx, 40 ) && st->cng_type == LP_CNG ) /* very low energy frames, less than 0.3125 */
-            {
-                delta_mem_scale = 0;
-                move16();
-            }
-            i = st->Q_exc;
-            move16();
-            test();
-            IF( st->hMusicPF && st->hGSCDec )
-            {
-                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame,
-                             imult1616( st->L_frame, HIBND_ACB_L_FAC ), 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );
-            }
-            IF( st->hPFstat != NULL )
-            {
-                Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, delta_mem_scale,
-                             &st->mem_deemph_fx, st->hBPF->pst_old_syn_fx, &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, 0, 0, NULL );
-            }
-            ELSE
-            {
-                Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, delta_mem_scale,
-                             &st->mem_deemph_fx, NULL, NULL, &st->agc_mem_fx[1], NULL, 0, 0, NULL );
-            }
-            Copy_Scale_sig( exc2_fx, exc2_fx, st->L_frame, sub( st->Q_exc, i ) ); // Q_exc
-
-            /* update past excitation signals for LD music post-filter */
-            IF( st->hMusicPF != NULL )
-            {
-                Copy( st->hMusicPF->dct_post_old_exc_fx + L_FRAME, st->hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
-                Copy( exc2_fx, st->hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
-
-                /* Update music post processing values */
-                /* Filter energies update */
-                FOR( i = 0; i < DCT_L_POST; i++ )
-                {
-                    st->hMusicPF->filt_lfE_fx[i] = add( 9830, mult_r( 22937, st->hMusicPF->filt_lfE_fx[i] ) ); // Q15,  9830 =.3f in Q15, 22937=.7f in Q15
-                    move16();
-                }
-            }
-
-
-            /* synthesis at 12.8kHz sampling rate */
-#ifndef FIX_1100_REMOVE_LPC_RESCALING
-            Aq_fx[0] = ONE_IN_Q12;
-#endif
-            move16();
-            syn_12k8_fx( st->L_frame, Aq_fx, exc2_fx, psyn_fx, st->mem_syn2_fx, 1, st->Q_exc, st->Q_syn );
-            syn_12k8_fx( st->L_frame, Aq_fx, exc3_fx, syn1_fx, st->mem_syn3_fx, 1, st->Q_exc, st->Q_syn );
-            st->Q_syn_cng = st->Q_syn;
-            move16();
-            st->Q_exc_cng = st->Q_exc;
-            move16();
-            /* reset the decoder */
-            CNG_reset_dec_fx( st, pitch_buf_fx, voice_factors_fx );
-
-            /* update st->mem_syn1 for ACELP core switching */
-            Copy_Scale_sig( st->mem_syn3_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); // Q(-1)
-
-            /* update old synthesis for classification */
-            Copy( syn1_fx + st->L_frame - L_SYN_MEM_CLAS_ESTIM, st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
-
-            /* save and delay synthesis to be used by SWB BWE */
-            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn
-            IF( st->hBWE_FD != NULL )
-            {
-                save_old_syn_fx( st->L_frame, syn1_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );
-            }
-        }
-
-        /*----------------------------------------------------------------*
-         * Decoding of all other frames
-         *----------------------------------------------------------------*/
-
-        ELSE
-        {
-
-            /*-----------------------------------------------------------------*
-             * Configure ACELP bit allocation
-             *-----------------------------------------------------------------*/
-
-            nb_bits = 0;
-            move16();
-            st->acelp_cfg.FEC_mode = 0;
-            move16();
-            uc_two_stage_flag = 0;
-            move16();
-            test();
-            IF( !st->nelp_mode_dec && !st->ppp_mode_dec )
-            {
-                Word16 tc_subfr_tmp;
-
-                tc_subfr_tmp = tc_subfr;
-                move16();
-                if ( LT_16( tc_subfr_tmp, L_SUBFR ) )
-                {
-                    tc_subfr_tmp = 0;
-                    move16();
-                }
-
-                if ( EQ_16( tc_subfr, TC_0_192 ) )
-                {
-                    nb_bits = -1;
-                    move16();
-                }
-
-                config_acelp1_IVAS( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, tc_subfr_tmp, 1, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
-                test();
-                test();
-                IF( EQ_16( st->coder_type, TRANSITION ) && LT_16( tc_subfr, L_SUBFR ) && EQ_16( st->L_frame, L_FRAME ) )
-                {
-                    config_acelp1_IVAS( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, -1, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, tc_subfr, 2, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
-                }
-            }
-
-            /*-----------------------------------------------------------------*
-             * After CNG period, use the most up-to-date LSPs
-             *-----------------------------------------------------------------*/
-
-            test();
-            test();
-            IF( st->hTdCngDec != NULL && ( st->last_core_brate == FRAME_NO_DATA || EQ_32( st->last_core_brate, SID_2k40 ) ) )
-            {
-                Copy( st->lspCNG_fx, st->lsp_old_fx, M ); /*Q15*/
-                lsp2lsf_fx( st->lspCNG_fx, st->lsf_old_fx, M, int_fs );
-            }
-
-            /*-----------------------------------------------------------------*
-             * Reset higher ACELP pre-quantizer in case of switching
-             *-----------------------------------------------------------------*/
-
-            IF( !st->use_acelp_preq )
-            {
-                st->mem_preemp_preQ_fx = 0;
-                move16();
-                st->last_nq_preQ = 0;
-                move16();
-                st->last_code_preq = 0;
-                move16();
-            }
-            st->use_acelp_preq = 0;
-            move16();
-            /*-----------------------------------------------------------------*
-             * LSF de-quantization and interpolation
-             *-----------------------------------------------------------------*/
-
-            IF( !tdm_lp_reuse_flag )
-            {
-                lsf_dec_ivas_fx( st, tc_subfr, Aq_fx, &LSF_Q_prediction, lsf_new_fx, lsp_new_fx, lsp_mid_fx, tdm_low_rate_mode, tdm_lsfQ_PCh_fx );
-            }
-            ELSE
-            {
-                const Word16 *pt_interp_2_fx;
-
-                IF( NE_16( st->active_cnt, 1 ) )
-                {
-                    Word16 beta_index;
-
-                    beta_index = get_next_indice_fx( st, TDM_IC_LSF_PRED_BITS );
-                    tdm_SCh_lsf_reuse_fx( DEC, st->element_brate, lsf_new_fx, lsp_new_fx, tdm_lsfQ_PCh_fx, NULL, &beta_index );
-                }
-                ELSE
-                {
-                    Copy( tdm_lspQ_PCh_fx, lsp_new_fx, M );
-                    Copy( tdm_lsfQ_PCh_fx, lsf_new_fx, M );
-                }
-
-                IF( st->rate_switching_reset )
-                {
-                    /* extrapolation in case of unstable LSF convert */
-                    Copy( lsp_new_fx, st->lsp_old_fx, M );
-                    Copy( lsf_new_fx, st->lsf_old_fx, M );
-                }
-
-                pt_interp_2_fx = interpol_frac_fx;
-                test();
-                if ( EQ_16( tdm_low_rate_mode, 1 ) && GT_16( st->coder_type, UNVOICED ) )
-                {
-                    pt_interp_2_fx = interpol_frac2_fx;
-                }
-
-                IF( EQ_16( st->active_cnt, 1 ) )
-                {
-                    Copy( lsp_new_fx, st->lsp_old_fx, M );
-                    lsp2lsf_fx( lsp_new_fx, st->lsf_old_fx, M, st->sr_core );
-                }
-
-                /* LSP interpolation and conversion of LSPs to A(z) */
-                int_lsp_fx( st->L_frame, st->lsp_old_fx, lsp_new_fx, Aq_fx, M, pt_interp_2_fx, 0 );
-                /* Check LSF stability (distance between old LSFs and current LSFs) */
-                st->stab_fac_fx = lsf_stab_ivas_fx( lsf_new_fx, st->lsf_old_fx, 0, st->L_frame );
-                move16();
-            }
-#ifndef FIX_1100_REMOVE_LPC_RESCALING
-#ifndef MSAN_FIX
-            for ( int nsf = 0; nsf < NB_SUBFR16k; nsf++ )
-#else
-            FOR( Word32 nsf = 0; nsf < st->nb_subfr; nsf++ )
-#endif
-            {
-                Scale_sig( Aq_fx + imult3216( nsf, ( M + 1 ) ), M + 1, sub( norm_s( Aq_fx[nsf * ( M + 1 )] ), Q2 ) ); // Q(x-2)
-                Aq_fx[nsf * ( M + 1 )] = ONE_IN_Q12;
-                move16();
-            }
-#endif
-            test();
-            IF( EQ_16( st->last_core, HQ_CORE ) && st->element_mode > EVS_MONO )
-            {
-                /* Prepare ACB memory from last HQ frame */
-                old_exc_s_fx = st->old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame );
-                tmpF_fx = *old_exc_s_fx;
-                st->mem_deemph_fx = shl_sat( old_exc_s_fx[st->L_frame - 1], st->Q_syn ); /* Q0 -> Q_syn */
-                move16();
-                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );
-                Copy( old_exc_s_fx + sub( st->L_frame, M ), st->mem_syn2_fx, M );
-                Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); /* Q0 -> Q_syn */
-                Residu3_fx( Aq_fx, old_exc_s_fx, old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame ), st->L_frame, 0 );
-                Scale_sig( old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame ), st->L_frame, st->Q_exc ); /* Q0 -> Q_exc */
-            }
-            test();
-            IF( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )
-            {
-                /* Prepare ACB memory of old_bwe_exc */
-                IF( EQ_16( st->L_frame, L_FRAME ) )
-                {
-                    lerp( old_exc_fx, old_bwe_exc_fx, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );
-                }
-                ELSE
-                {
-                    lerp( old_exc_fx, old_bwe_exc_fx, L_EXC_MEM_DEC << 1, L_EXC_MEM_DEC );
-                }
-            }
-
-            /*-----------------------------------------------------------------*
-             * FEC - first good frame after lost frame(s) (possibility to correct the ACB)
-             *-----------------------------------------------------------------*/
-
-            IF( st->acelp_cfg.FEC_mode > 0 )
-            {
-                last_pulse_pos = 0;
-                move16();
-                /* decode the last glottal pulse position */
-                T0_tmp = FEC_pos_dec_fx( st, &last_pulse_pos, &enr_q_fx, nb_bits );
-                test();
-                test();
-                IF( NE_16( st->last_core, HQ_CORE ) || ( EQ_16( st->last_core, HQ_CORE ) && st->last_con_tcx ) )
-                {
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    IF( EQ_16( st->clas_dec, SIN_ONSET ) && last_pulse_pos != 0 && EQ_16( st->prev_bfi, 1 ) )
-                    {
-                        FEC_SinOnset_fx( old_exc_fx + L_EXC_MEM_DEC - L_EXC_MEM, last_pulse_pos, T0_tmp, enr_q_fx, Aq_fx, st->L_frame, st->Q_exc );
-                    }
-                    ELSE IF( ( EQ_16( st->coder_type, GENERIC ) || EQ_16( st->coder_type, VOICED ) ) && last_pulse_pos != 0 && EQ_16( st->old_bfi_cnt, 1 ) && st->hWIDec != NULL )
-                    {
-                        do_WI = FEC_enhACB_fx( st->L_frame, st->last_L_frame, old_exc_fx + L_EXC_MEM_DEC - L_EXC_MEM, T0_tmp, last_pulse_pos, st->bfi_pitch_fx );
-                    }
-                }
-            }
-
-            /*------------------------------------------------------------*
-             * In case of first frame after an erasure and transition from voiced to unvoiced or inactive
-             * redo the LPC interpolation
-             *------------------------------------------------------------*/
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( ( st->stab_fac_fx == 0 ) && ( st->old_bfi_cnt > 0 ) && NE_16( st->clas_dec, VOICED_CLAS ) && NE_16( st->clas_dec, ONSET ) && ( st->relax_prev_lsf_interp == 0 ) && !( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( st->idchan, 1 ) ) )
-            {
-                int_lsp4_ivas_fx( st->L_frame, st->lsp_old_fx, lsp_mid_fx, lsp_new_fx, Aq_fx, M, 2 );
-            }
-
-            /*---------------------------------------------------------------*
-             * Decoding of the scaled predicted innovation energy
-             *---------------------------------------------------------------*/
-
-            IF( nb_bits > 0 )
-            {
-                indice = get_next_indice_fx( st, nb_bits );
-                Es_pred_dec_fx( &Es_pred_fx, indice, nb_bits, uc_two_stage_flag );
-            }
-
-            /*------------------------------------------------------------*
-             * Decode excitation according to coding type
-             *------------------------------------------------------------*/
-            test();
-            test();
-            IF( tdm_low_rate_mode ) /* tdm stereo low rate mode */
-            {
-                IF( LE_16( st->coder_type, UNVOICED ) )
-                {
-                    tdm_low_rate_dec_fx( st, dct_exc_tmp_fx /*, &tmp_noise*/, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, lsf_new_fx );
-                    tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
-                }
-                ELSE /* GENERIC */
-                {
-                    decod_gen_2sbfr_ivas_fx( st, sharpFlag, Aq_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, gain_buf_fx, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf_fx );
-
-                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
-                    {
-                        tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
-                    }
-                }
-            }
-            ELSE IF( st->nelp_mode_dec )
-            {
-                /* SC-VBR - NELP frames */
-                Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st->Q_exc ) ); // Q0
-                st->Q_exc = 0;
-                move16();
-                /* SC-VBR - NELP frames */
-                decod_nelp_fx( st, &tmp_noise_fx, pitch_buf_fx, exc_fx, exc2_fx, voice_factors_fx, bwe_exc_fx, &st->Q_exc, st->bfi, gain_buf_fx );
-                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st->Q_exc ), st->Q_subfr, exc2_fx, L_FRAME, st->coder_type );
-            }
-            ELSE IF( EQ_16( st->coder_type, UNVOICED ) )
-            {
-                /* UNVOICED frames */
-                decod_unvoiced_ivas_fx( st, Aq_fx, Es_pred_fx, uc_two_stage_flag, st->coder_type, &tmp_noise_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, gain_buf_fx );
-                tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
-            }
-            ELSE IF( st->ppp_mode_dec )
-            {
-                Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st->Q_exc ) ); // Q0
-                st->Q_exc = 0;
-                move16();
-                /* SC-VBR - PPP frames */
-                IF( NE_32( ( error = decod_ppp_fx( st, Aq_fx, pitch_buf_fx, exc_fx, exc2_fx, st->bfi, gain_buf_fx, voice_factors_fx, bwe_exc_fx ) ), IVAS_ERR_OK ) )
-                {
-                    return error;
-                }
-
-                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st->Q_exc ), st->Q_subfr, exc2_fx, L_FRAME, st->coder_type );
-            }
-            ELSE IF( EQ_16( st->coder_type, TRANSITION ) )
-            {
-                decod_tran_fx( st, st->L_frame, tc_subfr, Aq_fx, Es_pred_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, unbits, sharpFlag, gain_buf_fx );
-            }
-            ELSE IF( EQ_16( st->coder_type, AUDIO ) || ( ( st->coder_type == INACTIVE ) && st->inactive_coder_type_flag ) )
-            {
-                /* AUDIO and INACTIVE frames (coded by GSC technology) */
-                decod_audio_ivas_fx( st, dct_exc_tmp_fx, Aq_fx, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, lsf_new_fx, gain_buf_fx
-#if 1 // def ADD_LRTD
-                                     ,
-                                     tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf_fx
-#endif
-                );
-                tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
-            }
-            ELSE
-            {
-                /* GENERIC, VOICED and INACTIVE frames (coded by AVQ technology) */
-                IF( NE_32( ( error = decod_gen_voic_ivas_fx( st, st->L_frame, sharpFlag, Aq_fx, Es_pred_fx, do_WI, pitch_buf_fx, voice_factors_fx, exc_fx, exc2_fx, bwe_exc_fx, unbits, gain_buf_fx, tdm_Pitch_reuse_flag, p_tdm_Pri_pitch_buf_fx ) ), IVAS_ERR_OK ) )
-                {
-                    return error;
-                }
-
-                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
-                {
-                    tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
-                }
-            }
-
-            /* synthesis for ACELP core switching and SWB BWE */
-            syn_12k8_fx( st->L_frame, Aq_fx, exc_fx, temp_buf_fx, st->mem_syn1_fx, 1, st->Q_exc, -1 );
-
-            /* save and delay synthesis to be used by SWB BWE */
-            IF( st->hBWE_FD != NULL )
-            {
-                save_old_syn_fx( st->L_frame, temp_buf_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );
-            }
-
-            /*-----------------------------------------------------------------*
-             * Apply energy matching when switching to inactive frames
-             *-----------------------------------------------------------------*/
-
-            Inac_switch_ematch_ivas_fx( exc2_fx, dct_exc_tmp_fx, st->hGSCDec->lt_ener_per_band_fx, st->coder_type, st->L_frame, st->total_brate, st->Q_exc, st->bfi, st->last_core, st->last_codec_mode, tdm_low_rate_mode, st->element_mode );
-
-            /*------------------------------------------------------------*
-             * Decode information and modify the excitation signal of stationary unvoiced frames
-             *------------------------------------------------------------*/
-            test();
-            test();
-            test();
-            test();
-            IF( !( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) ) && NE_16( st->nelp_mode_dec, 1 ) && !( EQ_16( st->element_mode, IVAS_SCE ) && tdm_low_rate_mode ) )
-            {
-                stat_noise_uv_dec_fx( st, lsp_new_fx, lsp_mid_fx, Aq_fx, exc2_fx, uc_two_stage_flag );
-            }
-
-            /*------------------------------------------------------------*
-             * Save filter memory in case the synthesis is redone after scaling
-             * Synthesis at 12k8 Hz sampling rate
-             *------------------------------------------------------------*/
-
-            /* update past excitation signals for LD music post-filter */
-            IF( st->hMusicPF != NULL )
-            {
-                Copy( st->hMusicPF->dct_post_old_exc_fx + L_FRAME, st->hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
-                Copy( exc2_fx, st->hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
-                Copy( st->hMusicPF->dct_post_old_exc_fx, exc_buffer_fx, DCT_L_POST - OFFSET2 );
-            }
-
-            test();
-            test();
-            test();
-            IF( ( EQ_16( st->coder_type, AUDIO ) && !st->GSC_noisy_speech ) || ( GE_16( st->GSC_IVAS_mode, 1 ) && EQ_16( st->L_frame, L_FRAME ) ) )
-            {
-                Word16 last_coder_type = st->last_coder_type;
-                move16();
-                test();
-                test();
-                test();
-                if ( ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) ) || ( GE_16( st->GSC_IVAS_mode, 1 ) && ( st->GSC_noisy_speech == 0 ) ) )
-                {
-                    last_coder_type = AUDIO;
-                    move16();
-                }
-
-                Word16 qdct = 0;
-                move16();
-                /* Extrapolation of the last future part, windowing and high resolution DCT transform */
-                Prep_music_postP_fx( exc_buffer_fx, dct_buffer_fx, st->hMusicPF->filt_lfE_fx, st->last_core, st->element_mode, pitch_buf_fx, st->hMusicPF->LDm_enh_lp_gbin_fx, st->Q_exc, &qdct );
-
-                /* LD music post-filter */
-                LD_music_post_filter_fx( st->hMusicPF, dct_buffer_fx, dct_buffer_fx, st->core_brate, &st->hMusicPF->Old_ener_Q, AUDIO, last_coder_type, qdct );
-
-                /* Inverse DCT transform, retrieval of the aligned excitation, re-synthesis */
-                Copy( st->mem_syn2_fx, mem_tmp_fx, M ); /*Q_syn*/
-                Post_music_postP_fx( dct_buffer_fx, exc2_fx, st->mem_syn2_fx, st->mem_syn2_fx, Aq_fx, psyn_fx, &st->Q_exc, &st->prev_Q_syn,
-                                     &st->Q_syn, st->mem_syn_clas_estim_fx, 0, &st->mem_deemph_fx, st->hBPF->pst_old_syn_fx,
-                                     &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, temp_buf_fx, mem_tmp_fx );
-            }
-            ELSE
-            {
-                /* Core synthesis at 12.8kHz or 16kHz */
-                i = 1;
-                move16();
-                test();
-                if ( st->coder_type == INACTIVE && st->element_mode == EVS_MONO )
-                {
-                    i = 0;
-                    move16();
-                }
-                /* add extra headroom in case a CNA addition is likely (i.e. st_fx->psf_lp_noise_fx is close to the threshold) */
-                Word16 k = 0;
-                move16();
-                test();
-                test();
-                if ( st->coder_type == INACTIVE && st->flag_cna && GE_16( round_fx( L_shl( st->lp_noise, 1 ) ), 15 << 7 ) )
-                {
-                    k = 1;
-                    move16();
-                }
-
-                Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, 4, &st->mem_deemph_fx,
-                             st->hBPF->pst_old_syn_fx, &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, i, k, temp_buf_fx );
-
-                Copy( st->mem_syn2_fx, mem_tmp_fx, M ); /*Q_syn*/
-                syn_12k8_fx( st->L_frame, Aq_fx, exc2_fx, psyn_fx, st->mem_syn2_fx, 1, st->Q_exc, st->Q_syn );
-
-                IF( st->hMusicPF != NULL )
-                {
-                    FOR( i = 0; i < DCT_L_POST; i++ )
-                    {
-                        st->hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( ( 1228 << ( 16 ) ), 22938, st->hMusicPF->filt_lfE_fx[i] ) );
-                        move16();
-                    }
-                }
-            }
-
-            /*------------------------------------------------------------*
-             * FEC - Estimate the classification information
-             *------------------------------------------------------------*/
-            FEC_clas_estim_fx( st, st->Opt_AMR_WB, st->L_frame, &st->clas_dec, st->coder_type, pitch_buf_fx,
-                               psyn_fx, &st->lp_ener_FER_fx, &st->decision_hyst,
-                               NULL, NULL, NULL, NULL, 0, NULL, st->Q_syn, temp_buf_fx,
-                               st->mem_syn_clas_estim_fx, &st->classifier_Q_mem_syn,
-                               0, 0, 0, st->last_core_brate, st->acelp_cfg.FEC_mode );
-            /*------------------------------------------------------------*
-             * FEC - Estimate pitch
-             *------------------------------------------------------------*/
-
-            FEC_pitch_estim_fx( st->Opt_AMR_WB, st->last_core, st->L_frame, st->clas_dec, st->last_good, pitch_buf_fx, st->old_pitch_buf_fx,
-                                &st->bfi_pitch_fx, &st->bfi_pitch_frame, &st->upd_cnt, st->coder_type, st->element_mode );
-
-            /*------------------------------------------------------------*
-             * FEC - Smooth the speech energy evolution when recovering after a BAD frame
-             * (smoothing is performed in the excitation domain and signal is resynthesized after)
-             *------------------------------------------------------------*/
-
-
-            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, NB_SUBFR16k, -Q6 ); // Q0
-            FEC_scale_syn_ivas_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, psyn_fx, pitch_buf_tmp, st->enr_old_fx, enr_q_fx, st->coder_type, LSF_Q_prediction,
-                                   &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,
-                                   exc_fx, exc2_fx, Aq_fx, &st->old_enr_LP, mem_tmp_fx, st->mem_syn2_fx, st->Q_exc, st->Q_syn, avoid_lpc_burst_on_recovery, 0 );
-            test();
-            test();
-            test();
-            test();
-            /* estimate the pitch-synchronous speech energy per sample to be used when normal operation recovers */
-            IF( ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && LE_32( st->total_brate, ACELP_7k20 ) ) || EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )
-            {
-                frame_ener_fx( st->L_frame, st->clas_dec, psyn_fx, pitch_buf_tmp[( ( st->L_frame ) >> 6 ) - 1], &st->enr_old_fx, st->L_frame, st->Q_syn, 3, 0 );
-            }
-        }
-
-    } /* End of GOOD FRAME */
-
-    /*----------------------------------------------------------------*
-     * BAD frame
-     *----------------------------------------------------------------*/
-
-    ELSE
-    {
-        /* SC-VBR */
-        if ( EQ_16( st->last_nelp_mode_dec, 1 ) )
-        {
-            st->nelp_mode_dec = 1;
-            move16();
-        }
-        test();
-        test();
-        /* long burst frame erasures */
-        if ( GT_16( st->nbLostCmpt, 5 ) && GE_16( st->clas_dec, VOICED_CLAS ) && LT_16( st->clas_dec, INACTIVE_CLAS ) )
-        {
-            st->last_good = VOICED_TRANSITION;
-            move16();
-        }
-
-        /* LSF estimation and A(z) calculation */
-        lsf_dec_bfi( MODE1, lsf_new_fx, st->lsf_old_fx, st->lsf_adaptive_mean_fx, NULL, st->mem_MA_fx, st->mem_AR_fx, st->stab_fac_fx, st->last_coder_type, st->L_frame, st->last_good, st->nbLostCmpt, 0, NULL, NULL, NULL, st->hGSCDec->Last_GSC_pit_band_idx, st->Opt_AMR_WB, 0, st->bwidth );
-
-        FEC_lsf2lsp_interp( st, st->L_frame, Aq_fx, lsf_new_fx, lsp_new_fx );
-#ifndef FIX_1100_REMOVE_LPC_RESCALING
-#ifndef MSAN_FIX
-        for ( int nsf = 0; nsf < NB_SUBFR16k; nsf++ )
-#else
-        FOR( Word32 nsf = 0; nsf < st->nb_subfr; nsf++ )
-#endif
-        {
-            Scale_sig( Aq_fx + imult3216( nsf, ( M + 1 ) ), M + 1, sub( norm_s( Aq_fx[nsf * ( M + 1 )] ), Q2 ) ); // Qx->Q(x-2)
-            Aq_fx[nsf * ( M + 1 )] = ONE_IN_Q12;
-            move16();
-        }
-#endif
-        IF( EQ_16( st->nelp_mode_dec, 1 ) )
-        {
-            /* SC-VBR */
-            Scale_sig( exc_fx - L_EXC_MEM, L_EXC_MEM, negate( st->Q_exc ) ); // Q0
-            st->Q_exc = 0;
-            move16();
-
-            decod_nelp_fx( st, &tmp_noise_fx, pitch_buf_fx, exc_fx, exc2_fx, voice_factors_fx, bwe_exc_fx, &st->Q_exc, st->bfi, gain_buf_fx );
-            FEC_pitch_fx = pitch_buf_fx[3];
-            move16();
-            Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, NULL, st->hGSCDec->last_exc_dct_in_fx, L_FRAME, 0, (Word32) 0, &( st->Q_exc ), st->Q_subfr, exc2_fx, L_FRAME, st->coder_type );
-        }
-        ELSE
-        {
-            /* calculation of excitation signal */
-            FEC_exc_estim_fx( st, st->L_frame, exc_fx, exc2_fx, dct_exc_tmp_fx, pitch_buf_fx, voice_factors_fx, &FEC_pitch_fx, bwe_exc_fx, lsf_new_fx, &st->Q_exc, &tmp_noise_fx );
-
-            Rescale_exc( NULL, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame, L_FRAME32k, (Word32) 0,
-                         &( st->Q_exc ), st->Q_subfr, exc2_fx, st->L_frame, st->last_coder_type );
-
-            tmp_noise_fx = shr_r( st->lp_gainc_fx, 3 ); /*Q0*/
-
-            /* SC-VBR */
-            st->prev_gain_pit_dec_fx = st->lp_gainp_fx;
-            move16();
-        }
-
-        /* synthesis for ACELP core switching and SWB BWE */
-        syn_12k8_fx( st->L_frame, Aq_fx, exc_fx, temp_buf_fx, st->mem_syn1_fx, 1, st->Q_exc, -1 );
-
-        /* save and delay synthesis to be used by SWB BWE */
-        IF( st->hBWE_FD != NULL )
-        {
-            save_old_syn_fx( st->L_frame, temp_buf_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );
-        }
-
-        /* Apply energy matching when switching to inactive frames */
-        Inac_switch_ematch_ivas_fx( exc2_fx, dct_exc_tmp_fx, st->hGSCDec->lt_ener_per_band_fx, st->coder_type, st->L_frame, st->total_brate, st->Q_exc, st->bfi, st->last_core, st->last_codec_mode, tdm_low_rate_mode, st->element_mode );
-
-        /* update past excitation signals for LD music post-filter */
-        IF( st->hMusicPF != NULL )
-        {
-            Copy( st->hMusicPF->dct_post_old_exc_fx + L_FRAME, st->hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );
-            Copy( exc2_fx, st->hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );
-
-            /* Update music post processing values */
-            /* Filter energies update */
-            FOR( i = 0; i < DCT_L_POST; i++ )
-            {
-                st->hMusicPF->filt_lfE_fx[i] = round_fx( L_mac( 1228 << 16, 22938, st->hMusicPF->filt_lfE_fx[i] ) );
-                move16();
-            }
-            /* Update circular buffer, keep last energy difference unchanged */
-            FOR( i = 1; i < MAX_LT; i++ )
-            {
-                st->hMusicPF->LDm_lt_diff_etot_fx[i - 1] = st->hMusicPF->LDm_lt_diff_etot_fx[i];
-                move16();
-            }
-        }
-
-        /* synthesis at 12k8 Hz sampling rate */
-        /* add extra headroom in case a CNA addition is likely (i.e. st_fx->psf_lp_noise_fx is close to the threshold) */
-        Word16 k = 0;
-        move16();
-        test();
-        test();
-        if ( st->coder_type == INACTIVE && st->flag_cna && GE_16( round_fx( L_shl( st->lp_noise, 1 ) ), 15 << 7 ) )
-        {
-            k = 1;
-            move16();
-        }
-
-        Rescale_mem( st->Q_exc, &st->prev_Q_syn, &st->Q_syn, st->mem_syn2_fx, st->mem_syn_clas_estim_fx, 4, &st->mem_deemph_fx,
-                     st->hBPF->pst_old_syn_fx, &st->hBPF->pst_mem_deemp_err_fx, &st->agc_mem_fx[1], st->hPFstat, 1, k, temp_buf_fx );
-        test();
-        IF( EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )
-        {
-            Copy( st->mem_syn2_fx, mem_tmp_fx, M );
-        }
-        syn_12k8_fx( st->L_frame, Aq_fx, exc2_fx, psyn_fx, st->mem_syn2_fx, 1, st->Q_exc, st->Q_syn );
-
-        /* update buffer for classifier */
-        IF( st->hWIDec != NULL )
-        {
-            Copy( exc2_fx + sub( st->L_frame, L_EXC_MEM ), st->hWIDec->old_exc2_fx, L_EXC_MEM );
-            Copy( psyn_fx + sub( st->L_frame, L_EXC_MEM ), st->hWIDec->old_syn2_fx, L_EXC_MEM );
-        }
-        st->prev_Q_exc_fr = st->Q_exc;
-        move16();
-        st->prev_Q_syn_fr = st->Q_syn;
-        move16();
-        Copy( psyn_fx + sub( st->L_frame, L_SYN_MEM_CLAS_ESTIM ), st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
-
-        /*------------------------------------------------------------*
-         * FEC - Smooth the speech energy evolution when recovering after a BAD frame
-         * (smoothing is performed in the excitation domain and signal is resynthesized after)
-         *------------------------------------------------------------*/
-        test();
-        IF( EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )
-        {
-            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, NB_SUBFR16k, -Q6 ); // Q0
-
-            FEC_scale_syn_ivas_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, psyn_fx, pitch_buf_tmp, st->enr_old_fx, enr_q_fx, st->coder_type, LSF_Q_prediction,
-                                   &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,
-                                   exc_fx, exc2_fx, Aq_fx, &st->old_enr_LP, mem_tmp_fx, st->mem_syn2_fx, st->Q_exc, st->Q_syn, avoid_lpc_burst_on_recovery, 0 );
-        }
-
-        /* estimate the pitch-synchronous speech energy per sample to be used when normal operation recovers */
-        frame_ener_fx( st->L_frame, st->last_good, psyn_fx, shr( add( FEC_pitch_fx, 32 ), 6 ), &st->enr_old_fx, st->L_frame, st->Q_syn, 3, 0 );
-
-        IF( NE_16( st->nelp_mode_dec, 1 ) )
-        {
-            /* modify the excitation signal of stationary unvoiced frames */
-            stat_noise_uv_mod_fx( st->coder_type, 0, st->lsp_old_fx, lsp_new_fx, lsp_new_fx, Aq_fx, exc2_fx, st->Q_exc, 1, &st->ge_sm_fx,
-                                  &st->uv_count, &st->act_count, st->lspold_s_fx, &st->noimix_seed, &st->min_alpha_fx,
-                                  &st->exc_pe_fx, st->core_brate, st->bwidth, &st->Q_stat_noise, &st->Q_stat_noise_ge );
-        }
-    }
-
-    IF( st->hBWE_TD != NULL )
-    {
-        IF( EQ_16( st->L_frame, L_FRAME ) )
-        {
-            Copy( Aq_fx + 2 * ( M + 1 ), st->hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) );
-        }
-        ELSE
-        {
-            Copy( Aq_fx + 3 * ( M + 1 ), st->hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) );
-        }
-    }
-
-    /*--------------------------------------------------------*
-     * Apply NB postfilter in case of 8kHz output
-     *--------------------------------------------------------*/
-    test();
-    IF( st->last_bwidth == NB && st->hPFstat != NULL )
-    {
-        Copy( pitch_buf_fx, pitch_buf_tmp, NB_SUBFR16k );
-        IF( st->bwidth == NB )
-        {
-            st->hPFstat->on = 1;
-            move16();
-            nb_post_filt_fx( st->L_frame, st->hPFstat, &st->psf_lp_noise_fx, tmp_noise_fx, psyn_fx, Aq_fx, pitch_buf_tmp, st->coder_type, st->BER_detect, 0 );
-        }
-        ELSE
-        {
-            st->hPFstat->on = 0;
-            move16();
-            nb_post_filt_fx( st->L_frame, st->hPFstat, &st->psf_lp_noise_fx, tmp_noise_fx, psyn_fx, Aq_fx, pitch_buf_tmp, AUDIO, st->BER_detect, 0 );
-        }
-    }
-    ELSE
-    {
-        st->psf_lp_noise_fx = round_fx( L_shl( st->lp_noise, 1 ) );
-        move16();
-    }
-
-    /*------------------------------------------------------------------*
-     * Perform fixed deemphasis through 1/(1 - g*z^-1)
-     *-----------------------------------------------------------------*/
-
-    /* update old synthesis buffer - needed for ACELP internal sampling rate switching */
-    Copy( psyn_fx + sub( st->L_frame, L_SYN_MEM ), st->mem_syn_r, L_SYN_MEM );
-    deemph_fx( psyn_fx, st->preemph_fac, st->L_frame, &( st->mem_deemph_fx ) );
-    unscale_AGC( psyn_fx, st->Q_syn, syn_fx_tmp2, st->agc_mem_fx, st->L_frame );
-    Copy( syn_fx_tmp2, psyn_fx, st->L_frame );
-    IF( st->hTcxDec != NULL )
-    {
-        Copy_Scale_sig( psyn_fx + shr( st->L_frame, 1 ), st->hTcxDec->old_syn_Overl, shr( st->L_frame, 1 ), sub( -1, st->Q_syn ) ); /*Q-1*/
-    }
-    Copy_Scale_sig( psyn_fx + sub( st->L_frame, M + 1 ), st->syn, M + 1, sub( 0, st->Q_syn ) ); /*Q0*/
-
-    /*------------------------------------------------------------------*
-     * Formant post-filter
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    test();
-    IF( st->hPFstat != NULL && GE_16( st->last_bwidth, WB ) && ( GT_32( st->core_brate, ACELP_24k40 ) || st->element_mode > EVS_MONO ) && LE_32( st->core_brate, ACELP_32k ) )
-    {
-        st->hPFstat->on = 1;
-        move16();
-        /*----ftf conversions---*/
-        Copy( psyn_fx, temp_buf_fx + L_SYN_MEM, L_FRAME16k );
-
-        set16_fx( st->hPFstat->mem_zero, 0, M );
-
-        formant_post_filt_ivas_fx( st->hPFstat, temp_buf_fx + L_SYN_MEM, Aq_fx, psyn_fx, st->L_frame, st->lp_noise, st->total_brate, 0 );
-    }
-    ELSE IF( st->hPFstat != NULL && GE_16( st->last_bwidth, WB ) )
-    {
-        IF( st->hPFstat->on )
-        {
-            Copy( st->hPFstat->mem_pf_in + L_SYN_MEM - M, temp_buf_fx, M );
-            Copy( psyn_fx, temp_buf_fx + M, L_SUBFR );
-
-            Residu3_fx( Aq_fx, temp_buf_fx + M, temp_buf_fx + M + L_SUBFR, L_SUBFR, 1 );
-            E_UTIL_synthesis( 1, Aq_fx, temp_buf_fx + M + L_SUBFR, temp_buf_fx, L_SUBFR, st->hPFstat->mem_stp + L_SYN_MEM - M, 0, M );
-            scale_st_fx( psyn_fx, temp_buf_fx, &st->hPFstat->gain_prec, L_SUBFR );
-            Copy( temp_buf_fx, psyn_fx, ( L_SUBFR >> 1 ) );
-            blend_subfr2_fx( temp_buf_fx + L_SUBFR / 2, psyn_fx + L_SUBFR / 2, psyn_fx + L_SUBFR / 2 );
-        }
-        st->hPFstat->on = 0;
-        move16();
-    }
-
-    /*----------------------------------------------------------------*
-     * Comfort noise addition
-     *----------------------------------------------------------------*/
-    test();
-    test();
-    IF( ( st->hFdCngDec != NULL || EQ_16( st->idchan, 1 ) ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( EQ_16( st->element_mode, IVAS_CPE_TD ) || st->flag_cna || ( EQ_16( st->cng_type, FD_CNG ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->cng_type == LP_CNG && LE_32( st->core_brate, SID_2k40 ) ) )
-        {
-            /*VAD only for non inactive frame*/
-            test();
-            st->VAD = st->VAD && st->coder_type != INACTIVE;
-            move16();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( st->idchan == 0 && ( st->flag_cna || ( EQ_16( st->cng_type, FD_CNG ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->cng_type == LP_CNG && LE_32( st->core_brate, SID_2k40 ) ) ) )
-            {
-                /*Noisy speech detector*/
-                noisy_speech_detection_fx( st->hFdCngDec, st->VAD, psyn_fx, st->Q_syn );
-
-                st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = mult_r( st->hFdCngDec->hFdCngCom->likelihood_noisy_speech, 32440 /*0.99 Q15*/ );
-                move16();
-                IF( st->hFdCngDec->hFdCngCom->flag_noisy_speech != 0 )
-                {
-                    st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = add( st->hFdCngDec->hFdCngCom->likelihood_noisy_speech, 328 /*0.01 Q15*/ );
-                    move16();
-                }
-                move32();
-            }
-
-            if ( st->idchan == 0 )
-            {
-                st->lp_noise = st->hFdCngDec->lp_noise;
-                move32();
-            }
-            test();
-            IF( NE_16( st->element_mode, IVAS_CPE_TD ) && !st->cng_ism_flag )
-            {
-                /*Noise estimate*/
-                /*==========================================================*/
-                ApplyFdCng_ivas_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-                /*==========================================================*/
-            }
-
-            IF( !st->cna_dirac_flag )
-            {
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                /* CNA: Generate additional comfort noise to mask potential coding artefacts */
-                IF( st->flag_cna && !( EQ_16( st->coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->GSC_noisy_speech ) ) )
-                {
-                    test();
-                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( nchan_out, 2 ) )
-                    {
-                        IF( hStereoCng->flag_cna_fade )
-                        {
-                            generate_stereo_masking_noise_fx( psyn_fx, st->Q_syn, st, hStereoTD, flag_sec_CNA, 1, hStereoCng, nchan_out );
-                            hStereoCng->flag_cna_fade = 0;
-                            move16();
-                        }
-                        ELSE
-                        {
-                            test();
-                            IF( NE_16( st->element_mode, last_element_mode ) && ( st->idchan == 0 ) )
-                            {
-                                /* Clear memory for secondary channel CNA */
-                                set16_fx( hStereoCng->olapBufferSynth22_fx, 0, shr( st->hFdCngDec->hFdCngCom->frameSize, 1 ) );
-                            }
-
-                            generate_stereo_masking_noise_fx( psyn_fx, st->Q_syn, st, hStereoTD, flag_sec_CNA, 0, hStereoCng, nchan_out );
-                        }
-                    }
-                    ELSE IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
-                    {
-                        IF( st->idchan == 0 )
-                        {
-                            IF( NE_16( st->element_mode, last_element_mode ) )
-                            {
-                                set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
-                            }
-                            Word32 psyn_32_fx[L_FRAME16k];
-                            Word16 exp;
-                            Copy_Scale_sig_16_32_no_sat( psyn_fx, psyn_32_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( Q6, st->Q_syn ) );                                                                // Q6
-                            Copy_Scale_sig_16_32_no_sat( st->hFdCngDec->hFdCngCom->olapBufferSynth2, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), Q15 ); // Q15
-                            generate_masking_noise_ivas_fx( psyn_32_fx, &exp, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0, 0, 0, st->element_mode, hStereoCng, nchan_out );
-                            Copy_Scale_sig_32_16( psyn_32_fx, psyn_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( st->Q_syn, exp ) );                                                                // Q = st->Q_syn
-                            Copy_Scale_sig_32_16( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth2, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), -Q15 ); // Q0
-                        }
-                    }
-                }
-                ELSE IF( st->flag_cna && EQ_16( st->coder_type, AUDIO ) && ( ( st->last_core == ACELP_CORE && !( EQ_16( st->last_coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->Last_GSC_noisy_speech_flag ) ) ) || EQ_16( st->last_core, TCX_20_CORE ) ) )
-                {
-                    test();
-                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( nchan_out, 2 ) )
-                    {
-                        generate_stereo_masking_noise_fx( psyn_fx, st->Q_syn, st, hStereoTD, flag_sec_CNA, 1, hStereoCng, nchan_out );
-                        hStereoCng->flag_cna_fade = 1;
-                        move16();
-                    }
-                    ELSE
-                    {
-                        FOR( i = 0; i < ( st->hFdCngDec->hFdCngCom->frameSize ) / 2; i++ )
-                        {
-                            psyn_fx[i] = add( psyn_fx[i], shr_r( mult_r( st->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * ( st->hFdCngDec->hFdCngCom->frameSize / 4 )], st->hFdCngDec->hFdCngCom->fftlenFac ), negate( st->Q_syn ) ) );
-                            move16();
-                        }
-                    }
-                }
-                ELSE
-                {
-                    IF( hStereoCng != NULL )
-                    {
-                        hStereoCng->flag_cna_fade = 1;
-                        move16();
-                        hStereoCng->enableSecCNA = 0;
-                        move16();
-                    }
-                }
-
-                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
-                {
-                    test();
-                    test();
-                    test();
-                    /*Noise estimate*/
-                    IF( ( st->idchan == 0 ) && ( EQ_16( nchan_out, 2 ) || ( st->core_brate != FRAME_NO_DATA && NE_32( st->core_brate, SID_2k40 ) ) ) )
-                    {
-                        ApplyFdCng_ivas_fx( psyn_fx, st->Q_syn, NULL, 0, realBuffer_fx, imagBuffer_fx, NULL, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
-                    }
-                }
-            }
-        }
-
-        IF( !st->cna_dirac_flag )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( ( st->flag_cna == 0 ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->last_flag_cna, 1 ) && ( ( st->last_core == ACELP_CORE && !( EQ_16( st->last_coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->Last_GSC_noisy_speech_flag ) ) ) || EQ_16( st->last_core, AMR_WB_CORE ) ) )
-            {
-                FOR( i = 0; i < ( st->hFdCngDec->hFdCngCom->frameSize ) / 2; i++ )
-                {
-                    psyn_fx[i] = add( psyn_fx[i], shr_r( mult_r( st->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * ( st->hFdCngDec->hFdCngCom->frameSize / 4 )], st->hFdCngDec->hFdCngCom->fftlenFac ), -st->Q_syn ) );
-                    move16();
-                }
-            }
-
-            test();
-            test();
-            test();
-            IF( ( st->flag_cna == 0 ) || ( EQ_16( st->coder_type, AUDIO ) && !( st->element_mode > EVS_MONO && st->GSC_noisy_speech ) ) )
-            {
-                IF( st->idchan == 0 )
-                {
-                    set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
-                }
-                IF( hStereoCng != NULL && ( st->idchan == 0 ) )
-                {
-                    set16_fx( hStereoCng->olapBufferSynth22_fx, 0, st->hFdCngDec->hFdCngCom->fftlen );
-                }
-            }
-        }
-    }
-
-    /*----------------------------------------------------------------*
-     * Resample to the output sampling rate (8/16/32/48 kHz)
-     * Bass post-filter
-     *----------------------------------------------------------------*/
-
-    /* check if the CLDFB works on the right sample rate */
-    IF( NE_16( imult1616( st->cldfbAna->no_channels, st->cldfbAna->no_col ), st->L_frame ) )
-    {
-        resampleCldfb_ivas_fx( st->cldfbAna, L_mult0( st->L_frame, FRAMES_PER_SEC ) );
-        resampleCldfb_ivas_fx( st->cldfbBPF, L_mult0( st->L_frame, FRAMES_PER_SEC ) );
-
-        IF( st->ini_frame > 0 )
-        {
-            st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels );
-            move16();
-        }
-    }
-
-    /* analyze pitch coherence for bass post-filter */
-
-    Word32 pitch_buf_fx_q20[12];
-
-    Scale_sig32( st->old_pitch_buf_fx, 2 * NB_SUBFR16k + 2, Q4 ); // Q(x+4)
-    Word16 lim = shr( st->L_frame, 6 );
-    FOR( Word16 lp = 0; lp < lim; lp++ )
-    {
-        pitch_buf_fx_q20[lp] = L_shl( pitch_buf_fx[lp], Q14 );
-        move32();
-    }
-    bpf_pitch_coherence_ivas_fx( st, pitch_buf_fx_q20 );
-    Scale_sig32( st->old_pitch_buf_fx, 2 * NB_SUBFR16k + 2, -Q4 ); // Qx
-
-    test();
-    IF( !( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->bpf_off ) )
-    {
-        test();
-        IF( NE_16( st->L_frame, st->last_L_frame ) && NE_16( st->last_codec_mode, MODE2 ) )
-        {
-            IF( EQ_16( st->L_frame, L_FRAME ) )
-            {
-                retro_interp5_4_fx( st->hBPF->pst_old_syn_fx );
-            }
-            ELSE IF( EQ_16( st->L_frame, L_FRAME16k ) )
-            {
-                retro_interp4_5_fx( psyn_fx, st->hBPF->pst_old_syn_fx );
-            }
-        }
-
-        bass_psfilter_fx( st->hBPF, st->Opt_AMR_WB, psyn_fx, st->L_frame, pitch_buf_fx, st->bpf_off,
-                          st->stab_fac_fx, &st->stab_fac_smooth_fx, st->coder_type, st->Q_syn, bpf_error_signal_16fx );
-    }
-
-    Word32 syn_tmp_32_fx[L_FRAME16k + L_SUBFR], *syn_32_fx;
-    set32_fx( syn_tmp_32_fx, 0, L_FRAME16k + L_SUBFR );
-    syn_32_fx = syn_tmp_32_fx + L_SUBFR;
-    test();
-    IF( NE_16( st->element_mode, IVAS_CPE_DFT ) || use_cldfb_for_dft )
-    {
-        /* analysis of the synthesis at internal sampling rate */
-        Word32 realBufferSave_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-        Word32 imagBufferSave_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
-        Word32 *pRealSave_fx[CLDFB_NO_COL_MAX], *pImagSave_fx[CLDFB_NO_COL_MAX];
-        FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-        {
-            pRealSave_fx[i] = realBufferSave_fx[i];
-            pImagSave_fx[i] = imagBufferSave_fx[i];
-        }
-#ifndef MSAN_FIX
-        Copy_Scale_sig_16_32( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
-#endif
-        IF( st->p_bpf_noise_buf_32 )
-        {
-#ifdef MSAN_FIX
-            Copy_Scale_sig_16_32( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
-#endif
-            Copy32( bpf_error_signal_fx, st->p_bpf_noise_buf_32, st->L_frame );
-            Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( Q11, sub( st->Q_syn, 1 ) ) ); // Q11
-        }
-
-#ifdef MSAN_FIX
-        FOR( i = 0; i < st->L_frame; i++ )
-#else
-        for ( i = 0; i < L_FRAME16k; i++ )
-#endif
-        {
-            syn_32_fx[i] = L_shr( L_deposit_h( psyn_fx[i] ), add( 4, st->Q_syn ) ); // Q12
-            move32();
-        }
-
-        Word16 offset = sub( st->cldfbAna->p_filter_length, st->cldfbAna->no_channels );
-        Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, 1 ); // Q12
-        st->cldfbAna->Q_cldfb_state = Q12;
-        move16();
-        cldfbAnalysis_ivas_fx( syn_32_fx, realBuffer_fx, imagBuffer_fx, -1, st->cldfbAna );
-        Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, -1 ); // Q11
-        st->cldfbAna->Q_cldfb_state = Q11;
-        move16();
-        /* analysis and add the BPF error signal */
-        Word32 tmp_bpf_error_signal_fx[L_FRAME16k];
-        Word16 q_bpf_error_signal;
-        Word16 cldfb_state_offset = sub( st->cldfbBPF->p_filter_length, st->cldfbBPF->no_channels );
-
-        q_bpf_error_signal = Q6;
-        move16();
-#ifdef MSAN_FIX
-        Copy_Scale_sig_16_32( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, st->L_frame, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
-#else
-        Copy_Scale_sig_16_32( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, q_bpf_error_signal - st->Q_syn ); // Q6
-#endif
-        FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-        {
-            Scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
-            Scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
-        }
-        Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, sub( q_bpf_error_signal, Q10 ) ); // q_bpf_error_signal (Q6)
-        st->cldfbBPF->Q_cldfb_state = q_bpf_error_signal;
-        move16();
-        tmp = -1;
-        move16();
-        if ( st->bpf_off )
-        {
-            tmp = 0;
-            move16();
-        }
-
-        addBassPostFilter_ivas_fx( tmp_bpf_error_signal_fx, tmp, realBuffer_fx, imagBuffer_fx, st->cldfbBPF );
-        Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, negate( ( sub( q_bpf_error_signal, Q10 ) ) ) ); // Q10
-        st->cldfbBPF->Q_cldfb_state = Q10;
-        move16();
-        /* set output mask for upsampling */
-        IF( EQ_16( st->bwidth, NB ) )
-        {
-            /* set NB mask for upsampling */
-            st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, 10 );
-            move16();
-        }
-        ELSE IF( NE_16( st->cldfbSyn->bandsToZero, sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels ) ) )
-        {
-            /* in case of BW switching, re-init to default */
-            st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->cldfbAna->no_channels );
-            move16();
-        }
-        test();
-        IF( !st->cng_sba_flag || EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-        {
-            test();
-            test();
-            test();
-            /*WB/SWB-FD_CNG*/
-            IF( ( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) ) && ( EQ_16( st->cng_type, FD_CNG ) ) && ( LT_16( st->hFdCngDec->hFdCngCom->numCoreBands, st->cldfbSyn->no_channels ) ) )
-            {
-                Word16 tmpBufferScale = 0;
-                move16();
-                generate_comfort_noise_dec_hf_ivas_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st->hFdCngDec->hFdCngCom, st->cng_ism_flag );
-
-                FOR( i = 0; i < st->hFdCngDec->hFdCngCom->numSlots; i++ )
-                {
-                    Scale_sig32( realBuffer_fx[i] + st->hFdCngDec->hFdCngCom->numCoreBands, sub( st->hFdCngDec->hFdCngCom->regularStopBand, st->hFdCngDec->hFdCngCom->numCoreBands ), sub( add( tmpBufferScale, 15 ), Q31 ) ); // Q0
-                    Scale_sig32( imagBuffer_fx[i] + st->hFdCngDec->hFdCngCom->numCoreBands, sub( st->hFdCngDec->hFdCngCom->regularStopBand, st->hFdCngDec->hFdCngCom->numCoreBands ), sub( add( tmpBufferScale, 15 ), Q31 ) ); // Q0
-                }
-
-                IF( LT_16( st->hFdCngDec->hFdCngCom->regularStopBand, st->cldfbSyn->no_channels ) )
-                {
-                    st->cldfbSyn->bandsToZero = sub( st->cldfbSyn->no_channels, st->hFdCngDec->hFdCngCom->regularStopBand );
-                    move16();
-                }
-                ELSE
-                {
-                    st->cldfbSyn->bandsToZero = 0;
-                    move16();
-                }
-            }
-        }
-
-        IF( save_hb_synth_fx16 != NULL )
-        {
-            /* save and then zero-out lowband */
-            Word16 Q_real = 0, Q_imag = 0;
-            Word32 max_real = 0, max_imag = 0;
-            move16();
-            move16();
-            move32();
-            move32();
-            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-            {
-                FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
-                {
-                    max_real = L_max( max_real, L_abs( realBuffer_fx[i][j] ) );
-                    max_imag = L_max( max_imag, L_abs( imagBuffer_fx[i][j] ) );
-                }
-            }
-            Word32 max_val = L_max( max_real, max_imag );
-            Q_imag = sub( norm_l( max_val ), 3 ) /* Guard bits */;
-            Q_real = Q_imag;
-            move16();
-            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-            {
-                scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
-                scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_imag ); // Q_imag
-            }
-            scale_sig32_r( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); // (Q_real-1)
-            st->cldfbSynHB->Q_cldfb_state = sub( Q_real, 1 );
-            move16();
-            Scale_sig32( save_hb_synth_fx, L_FRAME48k, sub( Q_real, 1 ) ); // Q_real-1
-
-            FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
-            {
-                FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-                {
-                    realBufferSave_fx[i][j] = realBuffer_fx[i][j];
-                    imagBufferSave_fx[i][j] = imagBuffer_fx[i][j];
-                    move32();
-                    move32();
-                    IF( LT_16( j, st->hFdCngDec->hFdCngCom->numCoreBands ) && LT_16( i, st->hFdCngDec->hFdCngCom->numSlots ) )
-                    {
-                        realBuffer_fx[i][j] = 0;
-                        imagBuffer_fx[i][j] = 0;
-                        move32();
-                        move32();
-                    }
-                }
-            }
-
-            cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, save_hb_synth_fx, -1, st->cldfbSynHB );
-
-            Scale_sig32( save_hb_synth_fx, L_FRAME48k, negate( ( sub( Q_real, 1 ) ) ) );                                  // Q0
-            Scale_sig32( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
-            st->cldfbSynHB->Q_cldfb_state = Q10;
-            move16();
-            /* restore lowband */
-            FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
-            {
-                FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-                {
-                    realBuffer_fx[i][j] = realBufferSave_fx[i][j];
-                    imagBuffer_fx[i][j] = imagBufferSave_fx[i][j];
-                    move32();
-                    move32();
-                }
-            }
-            Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); // Q_real-1
-            st->cldfbSynHB->Q_cldfb_state = sub( Q_real, 1 );
-            move16();
-            cldfbSynthesis_ivas_fx( pRealSave_fx, pImagSave_fx, synth_fx, -1, st->cldfbSyn );
-            Scale_sig32( synth_fx, L_FRAME48k, negate( sub( Q_real, 1 ) ) );                                          // Q0
-            Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
-            st->cldfbSynHB->Q_cldfb_state = Q10;
-            move16();
-        }
-        ELSE
-        {
-            /* synthesis of the combined signal */
-            Word16 Q_real, Q_imag;
-            Word32 max_real, max_imag;
-            Q_real = 0;
-            Q_imag = 0;
-            max_real = 0;
-            max_imag = 0;
-            move16();
-            move16();
-            move32();
-            move32();
-            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-            {
-                FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
-                {
-                    max_real = L_max( max_real, L_abs( realBuffer_fx[i][j] ) );
-                    max_imag = L_max( max_imag, L_abs( imagBuffer_fx[i][j] ) );
-                }
-            }
-            Word32 max_val = L_max( max_real, max_imag );
-            Q_imag = sub( norm_l( max_val ), 3 ) /* Guard bits */;
-            Q_real = Q_imag;
-            move16();
-            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-            {
-                scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
-                scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
-            }
-            scale_sig32_r( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); //(Q_real - 1)
-            st->cldfbSyn->Q_cldfb_state = sub( Q_real, 1 );
-            move16();
-#ifndef MSAN_FIX
-            Scale_sig32( synth_fx, L_FRAME48k, Q_real - 1 );
-#endif
-
-            cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx, -1, st->cldfbSyn );
-#ifdef MSAN_FIX
-            scale_sig32( synth_fx, output_frame, negate( sub( Q_real, 1 ) ) ); // Q0
-#else
-            Scale_sig32( synth_fx, L_FRAME48k, -( Q_real - 1 ) );
-#endif
-            scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
-            st->cldfbSyn->Q_cldfb_state = Q10;
-            move16();
-        }
-
-        /* save synthesis - needed in case of core switching */
-        Copy32( synth_fx, st->previoussynth_fx_32, output_frame ); // Q0
-    }
-    ELSE
-    {
-        Word16 nSamples = NS2SA_FX2( i_mult( st->L_frame, FRAMES_PER_SEC ), FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ); /* IVAS-64: optimization is likely possible here (don't resample the whole frame) */
-
-        /* analysis of the synthesis at internal sampling rate - needed for DFT stereo -> TD stereo switching */
-#ifndef MSAN_FIX
-        for ( i = 0; i < L_FRAME16k; i++ )
-#else
-        FOR( i = 0; i < st->L_frame; i++ )
-#endif
-        {
-            syn_32_fx[i] = L_shr( L_deposit_h( psyn_fx[i] ), add( 4, st->Q_syn ) );
-            move32();
-        }
-
-        Word16 offset = sub( st->cldfbAna->p_filter_length, st->cldfbAna->no_channels );
-        Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, 1 ); // Q12
-        st->cldfbAna->Q_cldfb_state = Q12;
-        move16();
-        cldfbAnalysis_ivas_fx( syn_32_fx + sub( st->L_frame, nSamples ), realBuffer_fx, imagBuffer_fx, nSamples, st->cldfbAna );
-
-        Scale_sig32( st->cldfbAna->cldfb_state_fx, offset, -1 ); // Q11
-        st->cldfbAna->Q_cldfb_state = Q11;
-        move16(); /* analysis and add the BPF error signal - needed for DFT stereo -> TD stereo switching */
-        Word32 tmp_bpf_error_signal_fx[L_FRAME16k];
-        Word16 q_bpf_error_signal;
-        Word16 cldfb_state_offset;
-        cldfb_state_offset = sub( st->cldfbBPF->p_filter_length, st->cldfbBPF->no_channels );
-
-        // Get Q-factor
-        q_bpf_error_signal = Q6;
-        move16();
-        Copy_Scale_sig_16_32( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
-        FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-        {
-            Scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
-            Scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
-        }
-        Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, sub( q_bpf_error_signal, Q10 ) ); // q_bpf_error_signal (Q6)
-        st->cldfbBPF->Q_cldfb_state = q_bpf_error_signal;
-        move16();
-        tmp = 0;
-        move16();
-        if ( !st->bpf_off )
-        {
-            tmp = nSamples;
-            move16();
-        }
-        addBassPostFilter_ivas_fx( tmp_bpf_error_signal_fx + sub( st->L_frame, nSamples ), tmp, realBuffer_fx, imagBuffer_fx, st->cldfbBPF );
-
-
-        Scale_sig32( st->cldfbBPF->cldfb_state_fx, cldfb_state_offset, negate( sub( q_bpf_error_signal, Q10 ) ) ); // Q10
-        st->cldfbBPF->Q_cldfb_state = Q10;
-        move16();
-        /* synthesis of the combined signal - needed for DFT stereo -> TD stereo switching */
-        Word16 Q_real, Q_imag;
-        Word32 max_real, max_imag;
-        Q_real = 0;
-        Q_imag = 0;
-        max_real = 0;
-        max_imag = 0;
-        move16();
-        move16();
-        move32();
-        move32();
-        FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-        {
-            FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
-            {
-                max_real = L_max( max_real, L_abs( realBuffer_fx[i][j] ) );
-                max_imag = L_max( max_imag, L_abs( imagBuffer_fx[i][j] ) );
-            }
-        }
-        Word32 max_val = L_max( max_real, max_imag );
-        Q_imag = sub( norm_l( max_val ), 3 ) /* Guard bits */;
-        Q_real = Q_imag;
-        move16();
-        FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-        {
-            scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
-            scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
-        }
-        scale_sig32_r( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); //(Q_real - 1)
-#ifndef MSAN_FIX
-        Scale_sig32( synth_fx, L_FRAME48k, Q_real - 1 );
-#endif
-
-        cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx /*dummy*/, NS2SA( st->output_Fs, FRAME_SIZE_NS /*DELAY_CLDFB_NS*/ ), st->cldfbSyn );
-
-#ifdef MSAN_FIX
-        Scale_sig32( synth_fx, output_frame, negate( sub( Q_real, 1 ) ) ); // Q0
-#else
-        Scale_sig32( synth_fx, L_FRAME48k, -( Q_real - 1 ) );
-#endif
-        Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
-        st->cldfbSyn->Q_cldfb_state = Q10;
-        move16();
-        IF( st->p_bpf_noise_buf_32 )
-        {
-            Copy_Scale_sig_16_32( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
-            Copy32( bpf_error_signal_fx, st->p_bpf_noise_buf_32, st->L_frame );
-
-            Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( Q11, sub( st->Q_syn, 1 ) ) ); // Q11
-        }
-
-        set32_fx( synth_fx, 0, output_frame );
-    }
-
-    /* Copy output signal */
-#ifndef MSAN_FIX
-    Scale_sig( syn_tmp_fx, L_FRAME16k + L_SUBFR, -st->Q_syn );
-#else
-    Scale_sig( syn_tmp_fx, add( st->L_frame, L_SUBFR ), negate( st->Q_syn ) ); // Q0
-#endif
-    IF( st->element_mode > EVS_MONO )
-    {
-        Copy( psyn_fx, output_fx, st->L_frame ); /*Q_syn*/
-    }
-
-    st->Q_syn2 = 0;
-    move16();
-    /*-----------------------------------------------------------------*
-     * Bandwidth extension 6kHz-7kHz
-     *-----------------------------------------------------------------*/
-    IF( st->hBWE_zero != NULL )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( EQ_16( st->L_frame, L_FRAME ) && ( st->bwidth != NB ) && GE_16( output_frame, L_FRAME16k ) &&
-              ( EQ_16( st->extl, -1 ) || EQ_16( st->extl, SWB_CNG ) || ( EQ_16( st->extl, WB_BWE ) && st->extl_brate == 0 && NE_16( st->coder_type, AUDIO ) ) ) ) )
-        {
-#ifdef MSAN_FIX
-            Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q0
-#else
-            Copy_Scale_sig_32_16( synth_fx, synth_fx16, L_FRAME48k, 0 );
-#endif
-            hf_synth_fx( st->hBWE_zero, st->core_brate, output_frame, Aq_fx, exc2_fx,
-                         psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2, st->hBWE_zero->delay_syn_hf_fx, &st->hBWE_zero->memExp1,
-                         st->hBWE_zero->mem_hp_interp_fx, st->extl, st->CNG_mode );
-#ifdef MSAN_FIX
-            Copy_Scale_sig_16_32( synth_fx16, synth_fx, output_frame, 0 );
-#else
-            Copy_Scale_sig_16_32( synth_fx16, synth_fx, L_FRAME48k, 0 );
-#endif
-        }
-        ELSE
-        {
-            hf_synth_reset_fx( st->hBWE_zero );
-#ifdef MSAN_FIX
-            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
-#endif
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Populate parameters for SWB TBE
-     *-----------------------------------------------------------------*/
-
-    IF( st->hBWE_TD != NULL )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( !st->bfi && st->prev_bfi ) || ( EQ_16( st->last_vbr_hw_BWE_disable_dec, 1 ) && ( st->vbr_hw_BWE_disable_dec == 0 ) ) || ( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, WB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, WB_TBE ) && NE_16( st->last_extl, FB_TBE ) ) || ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && !st->tdm_LRTD_flag ) )
-        {
-            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-            set16_fx( st->hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET );
-        }
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( !st->ppp_mode_dec && ( st->idchan == 0 || NE_16( st->element_mode, IVAS_CPE_TD ) || ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && st->tdm_LRTD_flag ) ) )
-        {
-            Copy_Scale_sig_16_32( st->hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_fx, NL_BUFF_OFFSET, ( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
-            non_linearity_ivas_fx( bwe_exc_fx, bwe_exc_extended_fx + NL_BUFF_OFFSET, L_FRAME32k, &st->hBWE_TD->bwe_non_lin_prev_scale_fx, st->Q_exc, st->coder_type, voice_factors_fx, st->L_frame );
-            Copy_Scale_sig_32_16( bwe_exc_extended_fx + L_FRAME32k, st->hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET, negate( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
-        }
-        test();
-        if ( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) )
-        {
-            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-        }
-    }
-    /*----------------------------------------------------------------------*
-     * Updates
-     *----------------------------------------------------------------------*/
-
-    updt_dec_fx( st, old_exc_fx, pitch_buf_fx, Es_pred_fx, Aq_fx, lsf_new_fx, lsp_new_fx, voice_factors_fx, old_bwe_exc_fx, gain_buf_fx );
-    test();
-    test();
-    IF( GT_32( st->core_brate, SID_2k40 ) && st->hTdCngDec != NULL && st->hFdCngDec != NULL )
-    {
-        /* update CNG parameters in active frames */
-        cng_params_upd_ivas_fx( lsp_new_fx, exc_fx, st->L_frame, &st->hTdCngDec->ho_circ_ptr, st->hTdCngDec->ho_ener_circ_fx, &st->hTdCngDec->ho_circ_size,
-                                st->hTdCngDec->ho_lsp_circ_fx, st->Q_exc, DEC, st->hTdCngDec->ho_env_circ_fx, NULL, NULL, NULL, NULL, st->last_active_brate, st->element_mode,
-                                st->hFdCngDec->hFdCngCom->CngBandwidth );
-
-
-        /* Set 16k LSP flag for CNG buffer */
-        st->hTdCngDec->ho_16k_lsp[st->hTdCngDec->ho_circ_ptr] = 0;
-        move16();
-        if ( NE_16( st->L_frame, L_FRAME ) )
-        {
-            st->hTdCngDec->ho_16k_lsp[st->hTdCngDec->ho_circ_ptr] = 1;
-            move16();
-        }
-    }
-
-    {
-        IF( save_hb_synth_fx16 )
-        {
-            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, L_FRAME48k, 0 ); // Q0
-        }
-#ifdef MSAN_FIX
-        Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q_syn2
-#else
-        Copy_Scale_sig_32_16( synth_fx, synth_fx16, L_FRAME48k, 0 );
-#endif
-#ifndef FIX_1100_REMOVE_LPC_RESCALING
-        if ( st->hFdCngDec )
-        {
-            st->hFdCngDec->hFdCngCom->A_cng[0] = ONE_IN_Q12;
-            move16();
-        }
-#endif
-    }
-
-    pop_wmops();
-    return error;
-}
-
-
-static void rescale_fdCngDec( HANDLE_FD_CNG_DEC hFdCngDec, Word16 Exp_diff )
-{
-    Scale_sig32( hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART, Exp_diff );
-}
diff --git a/lib_dec/acelp_core_switch_dec.c b/lib_dec/acelp_core_switch_dec.c
deleted file mode 100644
index fd4f3cb7c53af6bc1a4a149c6db6799b8f39655e..0000000000000000000000000000000000000000
--- a/lib_dec/acelp_core_switch_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/acelp_core_switch_dec_fx.c b/lib_dec/acelp_core_switch_dec_fx.c
index 8224a74eb5ada3306a55839662d9a103e8038ea7..363db82020cf81eefbdb2258c27eb77877faf380 100644
--- a/lib_dec/acelp_core_switch_dec_fx.c
+++ b/lib_dec/acelp_core_switch_dec_fx.c
@@ -7,7 +7,6 @@
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
 #include "prot_fx.h" /* Function prototypes                    */
-#include "prot.h"    /* Function prototypes                    */
 /*---------------------------------------------------------------------*
  * Local function prototypes
  *---------------------------------------------------------------------*/
@@ -128,7 +127,9 @@ ivas_error acelp_core_switch_dec_fx(
         /*----------------------------------------------------------------*
          * Excitation decoding
          *----------------------------------------------------------------*/
-        config_acelp1( DEC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, GENERIC, -1, -1, &decode_bwe /* dummy */, &i, st_fx->element_mode, &i /*dummy*/, 0, 0, st_fx->idchan, st_fx->active_cnt, 0, 0, 0 );
+
+        config_acelp1_fx( DEC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, GENERIC, st_fx->inactive_coder_type_flag, -1, -1, &decode_bwe /* dummy */, &i, st_fx->element_mode, &i /*dummy*/, 0, 0, st_fx->idchan, st_fx->active_cnt, 0, 0, 0 );
+
         decod_gen_voic_core_switch_fx( st_fx, L_frame_for_cs, 0, Aq, exc, cbrate, &st_fx->Q_exc );
 
         /*----------------------------------------------------------------*
@@ -199,8 +200,7 @@ ivas_error acelp_core_switch_dec_fx(
         {
             return error;
         }
-        cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, synth_intFreq,
-                                negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX_SWITCH, workBuffer );
+        cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, synth_intFreq, negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX_SWITCH, workBuffer );
         cldfb_restore_memory( st_fx->cldfbAna );
 
         /* CLDFB synthesis of the combined signal */
@@ -231,12 +231,12 @@ ivas_error acelp_core_switch_dec_fx(
         {
             return error;
         }
-        cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_subfr_out, 0, CLDFB_NO_COL_MAX_SWITCH, workBuffer );
+        cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_subfr_out, 0, CLDFB_NO_COL_MAX_SWITCH, workBuffer );
         cldfb_restore_memory( st_fx->cldfbSyn );
         *Q_syn = 0;
         move16();
 
-        Copy_Scale_sig( synth_intFreq + sub( NS2SA( i_mult( L_frame_for_cs, 50 ), ( SWITCH_GAP_LENGTH_NS - DELAY_CLDFB_NS ) ), 2 ), mem_synth, add( NS2SA( i_mult( L_frame_for_cs, 50 ), DELAY_CLDFB_NS ), 2 ), negate( st_fx->Q_syn ) ); /* Copy mem with Q0 */
+        Copy_Scale_sig( synth_intFreq + sub( NS2SA_FX2( i_mult( L_frame_for_cs, 50 ), ( SWITCH_GAP_LENGTH_NS - DELAY_CLDFB_NS ) ), 2 ), mem_synth, add( NS2SA_FX2( i_mult( L_frame_for_cs, 50 ), DELAY_CLDFB_NS ), 2 ), negate( st_fx->Q_syn ) ); /* Copy mem with Q0 */
 
         /*----------------------------------------------------------------*
          * BWE decoding
@@ -332,12 +332,8 @@ ivas_error acelp_core_switch_dec_fx(
             pt2 = &hb_synth_tmp[tmp];
             FOR( i = 0; i < gapsize; i++ )
             {
-#ifdef BASOP_NOGLOB
                 *pt1++ = round_fx_sat( L_shl_sat( L_mult_sat( ( *pt2++ ), gain ), 2 ) );
                 move16();
-#else
-                *pt1++ = round_fx( L_shl( L_mult( ( *pt2++ ), gain ), 2 ) );
-#endif
             }
         }
         ELSE
@@ -577,8 +573,7 @@ ivas_error acelp_core_switch_dec_bfi_fx(
     {
         return error;
     }
-    cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn,
-                            negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer );
+    cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn, negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer );
     cldfb_restore_memory( st_fx->cldfbAna );
 
     scaleFactor.hb_scale = scaleFactor.lb_scale;
@@ -589,8 +584,8 @@ ivas_error acelp_core_switch_dec_bfi_fx(
     {
         return error;
     }
-    cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out,
-                             negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer );
+    cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out,
+                       negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer );
 
     /* output to Q0 */
     Scale_sig( synth_out, L_FRAME48k, negate( st_fx->Q_syn ) ); // Q0
@@ -820,12 +815,12 @@ ivas_error acelp_core_switch_dec_bfi_ivas_fx(
      *----------------------------------------------------------------*/
     /* CLDFB analysis of the synthesis at internal sampling rate */
     Qtmp = sub( 11, st_fx->Q_syn );
-    Copy_Scale_sig_16_32( syn, syn32, L_FRAME16k, Qtmp ); // Q(11)
+    Copy_Scale_sig_16_32_no_sat( syn, syn32, L_FRAME16k, Qtmp ); // Q(11)
     IF( NE_32( ( error = cldfb_save_memory_ivas_fx( st_fx->cldfbAna ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
-    /*cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn,
+    /*cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn,
                             negate(st_fx->Q_syn), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer);*/
     cldfbAnalysis_ivas_fx( syn32, realBuffer, imagBuffer, shr( st_fx->L_frame, 1 ), st_fx->cldfbAna );
     cldfb_restore_memory_ivas_fx( st_fx->cldfbAna );
@@ -835,19 +830,27 @@ ivas_error acelp_core_switch_dec_bfi_ivas_fx(
     {
         return error;
     }
-    /*cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out,
+    /*cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out,
                              negate(st_fx->Q_syn), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer );*/
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
     Scale_sig32( st_fx->cldfbSyn->cldfb_state_fx, st_fx->cldfbSyn->cldfb_state_length, 1 ); // Q_cldfb_state+1
     st_fx->cldfbSyn->Q_cldfb_state = add( st_fx->cldfbSyn->Q_cldfb_state, 1 );
     move16();
-    Copy_Scale_sig_16_32( synth_out, synth32, L_FRAME48k, 5 ); /*11-5-1*/
+    Copy_Scale_sig_16_32_DEPREC( synth_out, synth32, L_FRAME48k, 5 ); /*11-5-1*/
 
-    // cldfbSynthesis_ivas_fx(realBuffer, imagBuffer, synth_out, (int16_t)(st_fx->output_Fs * 0.01f), st_fx->cldfbSyn);
-    cldfbSynthesis_ivas_fx( realBuffer, imagBuffer, synth32, extract_l( Mpy_32_16_1( st_fx->output_Fs, 328 ) ), st_fx->cldfbSyn );
+    cldfbSynthesis_ivas_fx( realBuffer, imagBuffer, synth32, extract_l( Mpy_32_16_1( st_fx->output_Fs, 328 ) ), 0, st_fx->cldfbSyn );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+    Word16 out_len = extract_l( Mpy_32_16_1( st_fx->output_Fs, 328 ) );
+    cldfbSynthesis_ivas_fx( realBuffer, imagBuffer, synth32, out_len, -1, 0, st_fx->cldfbSyn );
+    Copy_Scale_sig_32_16( synth32, synth_out, out_len, -4 );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
     Scale_sig32( st_fx->cldfbSyn->cldfb_state_fx, st_fx->cldfbSyn->cldfb_state_length, -1 ); // Q_cldfb_state-1
     st_fx->cldfbSyn->Q_cldfb_state = sub( st_fx->cldfbSyn->Q_cldfb_state, 1 );
     move16();
     Copy_Scale_sig_32_16( synth32, synth_out, L_FRAME48k, -5 ); // 11-5-1 -> 11
+#endif                                                          /* OPT_AVOID_STATE_BUF_RESCALE */
 
     // Scale_sig( synth_out, L_FRAME48k, negate( st_fx->Q_syn ) );
 
@@ -913,7 +916,7 @@ static void decod_gen_voic_core_switch_fx(
      * Decode pitch lag
      *----------------------------------------------------------------------*/
 
-    pitch = pit_decode_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR ); /*Q6*/
+    pitch = pit_decode_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR, 0, NULL ); /*Q6*/
 
     /*--------------------------------------------------------------*
      * Find the adaptive codebook vector.
@@ -973,11 +976,7 @@ static void decod_gen_voic_core_switch_fx(
     IF( st_fx->prev_bfi )
     {
         /*gain_code = min(gain_code, 0.5f*gain_code+0.5f*st->lp_gainc);*/
-#ifdef BASOP_NOGLOB
         gain_code16 = s_min( gain_code16, mac_r( L_mult( 16384, gain_code16 ), shl_o( 16384 >> 3, st_fx->Q_exc, &Overflow ), st_fx->lp_gainc_fx ) ); /* st_fx->lp_gainc_fx in Q3 >>3 to bring it to Q0 as gain_code16 */
-#else
-        gain_code16 = s_min( gain_code16, mac_r( L_mult( 16384, gain_code16 ), shl( 16384 >> 3, st_fx->Q_exc ), st_fx->lp_gainc_fx ) ); /* st_fx->lp_gainc_fx in Q3 >>3 to bring it to Q0 as gain_code16 */
-#endif
     }
 
     FOR( i = 0; i < L_SUBFR; i++ )
diff --git a/lib_dec/amr_wb_dec.c b/lib_dec/amr_wb_dec.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_dec/amr_wb_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/amr_wb_dec_fx.c b/lib_dec/amr_wb_dec_fx.c
index 72ceb6cd3155a6e56df40e72df0c3a6a323f7ded..96ae82ddee71c1e6a9a0115bce5ce2e84dea8334 100644
--- a/lib_dec/amr_wb_dec_fx.c
+++ b/lib_dec/amr_wb_dec_fx.c
@@ -214,11 +214,10 @@ ivas_error amr_wb_dec_fx(
     test();
     IF( !st_fx->bfi && st_fx->prev_bfi && ( EQ_16( st_fx->last_codec_mode, MODE2 ) ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) )
     {
-        /* v_multc(st_fx->old_out_fx, st_fx->plcInfo.recovery_gain, */
-        /*         st_fx->old_out_fx, st_fx->L_frameTCX); */
+        /* v_multc(st_fx->old_out_fx, st_fx->hPlcInfo.recovery_gain, st_fx->old_out_fx, st_fx->L_frameTCX); */
         FOR( i = 0; i < hTcxDec->L_frameTCX; i++ )
         {
-            hHQ_core->old_out_fx[i] = shl( mult_r( hHQ_core->old_out_fx[i], st_fx->plcInfo.recovery_gain ), 1 );
+            hHQ_core->old_out_fx[i] = shl( mult_r( hHQ_core->old_out_fx[i], st_fx->hPlcInfo->recovery_gain ), 1 );
             move16();
         }
     }
@@ -629,7 +628,7 @@ ivas_error amr_wb_dec_fx(
 
             FEC_scale_syn_fx( L_FRAME, &update_flg, st_fx->clas_dec, st_fx->last_good, syn_fx, pitch_buf_tmp, st_fx->enr_old_fx, L_enr_q_fx, -1, MOVING_AVERAGE,
                               &st_fx->scaling_flag, &st_fx->lp_ener_FEC_av, &st_fx->lp_ener_FEC_max, st_fx->bfi, st_fx->total_brate, st_fx->prev_bfi, st_fx->last_core_brate,
-                              exc_fx, exc2_fx, Aq_fx, &st_fx->old_enr_LP, mem_tmp_fx, st_fx->mem_syn2_fx, st_fx->Q_exc, st_fx->Q_syn, avoid_lpc_burst_on_recovery, 0 );
+                              exc_fx, exc2_fx, Aq_fx, &st_fx->old_enr_LP, mem_tmp_fx, st_fx->mem_syn2_fx, st_fx->Q_exc, st_fx->Q_syn, EVS_MONO, avoid_lpc_burst_on_recovery, 0 );
 
             frame_ener_fx( L_FRAME, st_fx->clas_dec, syn_fx, pitch_buf_tmp[3], &st_fx->enr_old_fx, L_FRAME, st_fx->Q_syn, 3, 0 );
         }
@@ -711,7 +710,7 @@ ivas_error amr_wb_dec_fx(
         FEC_scale_syn_fx( L_FRAME, &update_flg, st_fx->clas_dec, st_fx->last_good, syn_fx, pitch_buf_tmp, st_fx->enr_old_fx, L_enr_q_fx, -1,
                           MOVING_AVERAGE, &st_fx->scaling_flag, &st_fx->lp_ener_FEC_av, &st_fx->lp_ener_FEC_max, st_fx->bfi, st_fx->total_brate,
                           st_fx->prev_bfi, st_fx->last_core_brate, exc_fx, exc2_fx, Aq_fx, &st_fx->old_enr_LP, mem_tmp_fx, st_fx->mem_syn2_fx,
-                          st_fx->Q_exc, st_fx->Q_syn, 0, 0 );
+                          st_fx->Q_exc, st_fx->Q_syn, EVS_MONO, 0, 0 );
 
         /* estimate the pitch-synchronous speech energy per sample to be used when normal operation recovers */
         frame_ener_fx( L_FRAME, st_fx->last_good, syn_fx, shr( FEC_pitch_fx, 6 ), &st_fx->enr_old_fx, L_FRAME, st_fx->Q_syn, 3, 0 );
@@ -756,6 +755,7 @@ ivas_error amr_wb_dec_fx(
 
     /* TCX=Q-1, ACELP2 Q0 */
     Copy_Scale_sig( syn_fx + L_FRAME / 2, hTcxDec->old_syn_Overl, L_FRAME / 2, sub( -1, st_fx->Q_syn ) );
+    hTcxDec->Q_old_syn_Overl = -1;
     Copy_Scale_sig( syn_fx + L_FRAME - M - 1, st_fx->syn, M + 1, sub( 0, st_fx->Q_syn ) );
 
     /*------------------------------------------------------------------*
@@ -792,12 +792,9 @@ ivas_error amr_wb_dec_fx(
             st_fx->VAD = 0;
             move16();
         }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        PMT( "Fixed point not done here " )
-        ApplyFdCng_fx( syn, NULL, NULL, NULL, st, 0, 0 );
-#else
-        ApplyFdCng_fx( syn_fx, st_fx->Q_syn, NULL, NULL, NULL, st_fx, 0, 0 );
-#endif
+
+        ApplyFdCng_fx( syn_fx, st_fx->Q_syn, NULL, 0, NULL, NULL, NULL, st_fx, 0, 0 );
+
         st_fx->hFdCngDec->hFdCngCom->frame_type_previous = st_fx->m_frame_type;
         move16();
 
@@ -872,8 +869,7 @@ ivas_error amr_wb_dec_fx(
     bass_psfilter_fx( st_fx->hBPF, st_fx->Opt_AMR_WB, syn_fx, L_FRAME, pitch_buf_fx, st_fx->bpf_off, st_fx->stab_fac_fx,
                       &st_fx->stab_fac_smooth_fx, GENERIC, st_fx->Q_syn, bpf_error_signal );
 
-    cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn_fx,
-                            negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX, workBuffer );
+    cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, syn_fx, negate( st_fx->Q_syn ), CLDFB_NO_COL_MAX, workBuffer );
 
     scaleFactor.hb_scale = scaleFactor.lb_scale;
     move16();
@@ -898,8 +894,9 @@ ivas_error amr_wb_dec_fx(
         move16();
     }
     cldfb_synth_set_bandsToZero( st_fx, realBuffer, imagBuffer, CLDFB_NO_COL_MAX, scaleFactor );
+
     /* CLDFB synthesis of the combined signal */
-    cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out_fx, negate( st_fx->Q_syn2 ), CLDFB_NO_COL_MAX, workBuffer );
+    cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out_fx, negate( st_fx->Q_syn2 ), CLDFB_NO_COL_MAX, workBuffer );
 
     /* Bring CLDFB output to Q-1 */
     Scale_sig( synth_out_fx, output_frame, negate( st_fx->Q_syn2 ) );
@@ -963,7 +960,7 @@ ivas_error amr_wb_dec_fx(
     test();
     test();
 
-    IF( !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st_fx->plcInfo.concealment_method, TCX_NONTONAL ) && LT_32( st_fx->plcInfo.nbLostCmpt, 4 ) )
+    IF( !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st_fx->hPlcInfo->concealment_method, TCX_NONTONAL ) && LT_32( st_fx->hPlcInfo->nbLostCmpt, 4 ) )
     {
         waveadj_rec = 1;
         move16();
@@ -1046,11 +1043,7 @@ ivas_error amr_wb_dec_fx(
 
         FOR( i = 0; i < tmps; i++ )
         {
-#ifdef BASOP_NOGLOB
             synth_out_fx[( i + delay_comp )] = msu_r_sat( L_mult( synth_out_fx[( i + delay_comp )], alpha ), hHQ_core->old_out_fx[( i + nz )], add( alpha, -32768 ) );
-#else
-            synth_out_fx[i + delay_comp] = msu_r( L_mult( synth_out_fx[i + delay_comp], alpha ), hHQ_core->old_out_fx[i + nz], add( alpha, -32768 ) );
-#endif
             move16();
             alpha = add( alpha, step );
         }
@@ -1066,7 +1059,7 @@ ivas_error amr_wb_dec_fx(
     {
         tmps = NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS );
         Scale_sig( st_fx->prev_synth_buffer_fx, tmps, sub( st_fx->Q_syn2, st_fx->Qprev_synth_buffer_fx ) );
-        delay_signal( synth_out_fx, output_frame, st_fx->prev_synth_buffer_fx, tmps );
+        delay_signal_fx( synth_out_fx, output_frame, st_fx->prev_synth_buffer_fx, tmps );
     }
 
     IF( waveadj_rec )
@@ -1079,9 +1072,7 @@ ivas_error amr_wb_dec_fx(
             move16();
         }
 
-        waveform_adj2_fix( st_fx->tonalMDCTconceal.secondLastPcmOut, synth_out_fx + tmps, st_fx->plcInfo.data_noise, &st_fx->plcInfo.outx_new_n1_fx,
-                           &st_fx->plcInfo.nsapp_gain_fx, &st_fx->plcInfo.nsapp_gain_n_fx, &st_fx->plcInfo.recovery_gain, st_fx->plcInfo.step_concealgain_fx,
-                           st_fx->plcInfo.Pitch_fx, st_fx->plcInfo.FrameSize, tmps, add( extract_l( st_fx->plcInfo.nbLostCmpt ), 1 ), st_fx->bfi );
+        waveform_adj2_fix( st_fx->hPlcInfo, st_fx->hTonalMDCTConc->secondLastPcmOut, synth_out_fx + tmps, tmps, add( extract_l( st_fx->hPlcInfo->nbLostCmpt ), 1 ), st_fx->bfi );
     }
 
     /* HP filter */
@@ -1099,7 +1090,7 @@ ivas_error amr_wb_dec_fx(
         move16();
         Scale_sig( hTcxLtpDec->tcxltp_mem_in, delta, sub( st_fx->Q_syn2, st_fx->Qprev_synth_buffer_fx ) );
         Scale_sig( hTcxLtpDec->tcxltp_mem_out, output_frame, sub( st_fx->Q_syn2, st_fx->Qprev_synth_buffer_fx ) );
-        tcx_ltp_post( st_fx, hTcxLtpDec, ACELP_CORE, output_frame, 0, synth_out_fx, NULL );
+        tcx_ltp_post_fx( st_fx, hTcxLtpDec, ACELP_CORE, output_frame, 0, synth_out_fx, NULL );
     }
     /* final output of synthesis signal */
     syn_output_fx( st_fx->codec_mode, synth_out_fx, output_frame, output_sp, st_fx->Q_syn2 );
diff --git a/lib_dec/ari_dec.c b/lib_dec/ari_dec.c
deleted file mode 100644
index 8dedcea1e57bfd2eef330c0a2ca1e074f37abb0e..0000000000000000000000000000000000000000
--- a/lib_dec/ari_dec.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "stat_com.h"
-#include "basop_util.h"
-#include "wmc_auto.h"
-
-
-/*---------------------------------------------------------------
- * Ari decode 14 bits routines
-  -------------------------------------------------------------*/
-
-/*---------------------------------------------------------------
- * ari_start_decoding_14bits_ivas()
- *
- * Start ArCo decoding
- *-------------------------------------------------------------*/
-
-
-Word16 ari_start_decoding_14bits_prm_ivas_fx(
-    const Word16 *ptr,
-    Word16 bp,
-    Tastat *s )
-{
-    Word32 val;
-    Word16 i;
-    const Word16 *p;
-
-    val = 0;
-    move32();
-    p = ptr + bp;
-
-    FOR( i = 0; i < cbitsnew; i++ )
-    {
-        val = L_or( L_shl( val, 1 ), *( p + i ) );
-    }
-    s->low = 0;
-    move32();
-    s->high = ari_q4new;
-    move32();
-    s->value = val;
-    move32();
-
-    return add( bp, i );
-}
-
-
-Word16 ari_decode_14bits_pow_ivas(
-    Word16 *ptr,
-    Word16 bp,
-    Word16 bits,
-    Word16 *res,
-    Tastat *s,
-    UWord16 base )
-{
-    UWord16 symbol;
-    Word32 low, high;
-    UWord32 range, value, cum;
-    Word16 pows[12]; /* "base" to the power of 2, 4, 8,... 2^12 */
-    Word16 lowlim, highlim, testval;
-    Word16 k;
-
-    highlim = 0;
-    low = s->low;
-    high = L_add( s->high, 1 );
-    value = s->value;
-    lowlim = 0;
-    symbol = 0;
-    move16();
-    move32();
-    move32();
-    move16();
-    move16();
-
-    range = (UWord32) W_sub( high, low );
-    move32();
-
-    /* the value read from bitstream */
-    assert( value >= (UWord32) low );
-    cum = (UWord32) W_add( W_shl( ( W_sub( value, low ) ), stat_bitsnew ), ( 1 << stat_bitsnew ) - 1 );
-    move32();
-
-    /* search for the interval where "cum" fits */
-    IF( GT_64( W_mult0_32_32( L_shr( base, 1 ), range ), cum ) ) /* below pow-1 */
-    {
-        pows[0] = testval = base;
-        move16();
-        move16();
-        /* increase exponent until it is smaller than "cum" */
-        FOR( k = 1; k < 12; k++ )
-        {
-            highlim = testval;
-            move16();
-            pows[k] = mult_r( pows[k - 1], pows[k - 1] );
-            move16();
-            testval = mult_r( pows[k], base );
-            IF( LE_64( W_mult0_32_32( shr( testval, 1 ), range ), cum ) ) /* found! big range is [lowlim,testval], (now narrow it down) */
-            {
-                lowlim = testval;
-                move16();
-                k = sub( k, 1 );
-                symbol = (UWord16) L_shl( 1, k );
-                BREAK;
-            }
-        }
-        assert( k < 12 ); /* maximum 2^10-1*/
-        /* narrow the range down */
-        FOR( k--; k > 0; k-- )
-        {
-            testval = mult_r( highlim, pows[k] );
-            IF( LE_64( W_mult0_32_32( shr( testval, 1 ), range ), cum ) )
-            {
-                lowlim = testval;
-                move16();
-                symbol = (UWord16) L_sub( symbol, L_shl( 1, sub( k, 1 ) ) );
-            }
-            ELSE
-            {
-                highlim = testval;
-                move16();
-            }
-        }
-        highlim = shr( highlim, 1 );
-        lowlim = shr( lowlim, 1 );
-    }
-    ELSE /* trivial case, above pow-1, that is, first symbol */
-    {
-        symbol = 0;
-        lowlim = extract_l( L_shr( base, 1 ) );
-        highlim = 16384;
-        move16();
-        move16();
-    }
-
-
-    high = L_add( low, mul_sbc_14bits( range, highlim ) );
-
-    low = L_add( low, mul_sbc_14bits( range, lowlim ) );
-
-    /*ptr init for ptr*/
-    FOR( ; bp < bits; )
-    {
-        IF( GT_32( high, ari_q2new ) )
-        {
-            IF( GE_32( low, ari_q2new ) )
-            {
-                value = (UWord32) W_sub( value, ari_q2new );
-                low = L_sub( low, ari_q2new );
-                high = L_sub( high, ari_q2new );
-            }
-            ELSE
-            {
-                test();
-                IF( GE_32( low, ari_q1new ) && LE_32( high, ari_q3new ) )
-                {
-                    value = (UWord32) W_sub( value, ari_q1new );
-                    low = L_sub( low, ari_q1new );
-                    high = L_sub( high, ari_q1new );
-                }
-                ELSE
-                {
-                    BREAK;
-                }
-            }
-        }
-        low = L_add( low, low );
-        high = L_add( high, high );
-
-        assert( abs( ptr[bp] ) <= 1 && "AC expects reading binary values!!!" );
-
-        value = (UWord32) ( W_shl( value, 1 ) | ptr[bp++] );
-    }
-
-    test();
-    test();
-    test();
-    IF( !( NE_16( bp, bits ) || !( EQ_32( s->low, low ) && ( EQ_32( s->high, high ) ) && ( EQ_64( s->value, value ) ) ) ) )
-    {
-        /* This should not happen except of bit errors. */
-        s->high = s->low = 0;
-        move32();
-        move32();
-        *res = 0;
-        move16();
-        return -1;
-    }
-
-    s->low = low;
-    s->high = L_sub( high, 1 );
-    s->value = value;
-    move32();
-    move32();
-    move32();
-
-    *res = symbol;
-    move16();
-    return bp;
-}
-
-Word16 ari_decode_14bits_sign_ivas(
-    Word16 *ptr,
-    Word16 bp,
-    Word16 bits,
-    Word16 *res,
-    Tastat *s )
-{
-    Word16 symbol;
-    Word32 low, high;
-    UWord32 range, value, cum;
-
-    low = s->low;
-    high = L_add( s->high, 1 );
-    value = s->value;
-    move32();
-    move32();
-
-    range = (UWord32) W_sub( high, low );
-
-    IF( LT_16( bp, bits ) )
-    {
-        assert( value >= (UWord32) low );
-        cum = (UWord32) W_add( W_shl( ( W_sub( value, low ) ), stat_bitsnew ), ( 1 << stat_bitsnew ) - 1 );
-        IF( GT_64( W_shl( range, 13 ), cum ) )
-        {
-            symbol = 2;
-            move16();
-            high = L_add( low, W_extract_l( W_shr( range, 1 ) ) );
-        }
-        ELSE
-        {
-            symbol = 1;
-            move16();
-            low = L_add( low, W_extract_l( W_shr( range, 1 ) ) );
-        }
-
-        /*ptr init for ptr*/
-        FOR( ; bp < bits; )
-        {
-            IF( GT_32( high, ari_q2new ) )
-            {
-                IF( GE_32( low, ari_q2new ) )
-                {
-                    value = (UWord32) W_sub( value, ari_q2new );
-                    low = L_sub( low, ari_q2new );
-                    high = L_sub( high, ari_q2new );
-                }
-                ELSE
-                {
-                    test();
-                    IF( GE_32( low, ari_q1new ) && LE_32( high, ari_q3new ) )
-                    {
-                        value = (UWord32) W_sub( value, ari_q1new );
-                        low = L_sub( low, ari_q1new );
-                        high = L_sub( high, ari_q1new );
-                    }
-                    ELSE
-                    {
-                        BREAK;
-                    }
-                }
-            }
-            low = L_add( low, low );
-            high = L_add( high, high );
-
-            assert( abs( ptr[bp] ) <= 1 && "AC expects reading binary values!!!" );
-
-            value = (UWord32) ( W_shl( value, 1 ) | ptr[bp++] );
-        }
-    }
-    ELSE
-    {
-        cum = (UWord32) W_sub( value, low );
-        range = (UWord32) W_shr( range, 1 );
-        IF( GT_64( range, cum ) )
-        {
-            symbol = 2;
-            move16();
-            high = L_add( low, range );
-        }
-        ELSE
-        {
-            symbol = 1;
-            move16();
-            low = L_add( low, range );
-        }
-    }
-
-    s->low = low;
-    s->high = L_sub( high, 1 );
-    s->value = value;
-    move32();
-    move32();
-    move32();
-
-    *res = symbol;
-    move16();
-
-    return bp;
-}
diff --git a/lib_dec/ari_dec_fx.c b/lib_dec/ari_dec_fx.c
index 3681568f28f46665132a75fefe5aa2ec05ac5bca..3aabbdaa58cbcdda0a7c83d962eb9297c8a8608f 100644
--- a/lib_dec/ari_dec_fx.c
+++ b/lib_dec/ari_dec_fx.c
@@ -551,3 +551,291 @@ Word16 ari_decode_14bits_sign_fx( Word16 *ptr, Word16 bp, Word16 bits, Word16 *r
 {
     return ari_decode_14bits_notbl_fx( ptr, bp, bits, res, s, 0, ari_lookup_sign_fx );
 }
+
+/*---------------------------------------------------------------
+ * ari_start_decoding_14bits_ivas()
+ *
+ * Start ArCo decoding
+ *-------------------------------------------------------------*/
+
+
+Word16 ari_start_decoding_14bits_prm_ivas_fx(
+    const Word16 *ptr,
+    Word16 bp,
+    Tastat *s )
+{
+    Word32 val;
+    Word16 i;
+    const Word16 *p;
+
+    val = 0;
+    move32();
+    p = ptr + bp;
+
+    FOR( i = 0; i < cbitsnew; i++ )
+    {
+        val = L_or( L_shl( val, 1 ), *( p + i ) );
+    }
+    s->low = 0;
+    move32();
+    s->high = ari_q4new;
+    move32();
+    s->value = val;
+    move32();
+
+    return add( bp, i );
+}
+
+
+Word16 ari_decode_14bits_pow_ivas(
+    Word16 *ptr,
+    Word16 bp,
+    Word16 bits,
+    Word16 *res,
+    Tastat *s,
+    UWord16 base )
+{
+    UWord16 symbol;
+    Word32 low, high;
+    UWord32 range, value, cum;
+    Word16 pows[12]; /* "base" to the power of 2, 4, 8,... 2^12 */
+    Word16 lowlim, highlim, testval;
+    Word16 k;
+
+    highlim = 0;
+    low = s->low;
+    high = L_add( s->high, 1 );
+    value = s->value;
+    lowlim = 0;
+    symbol = 0;
+    move16();
+    move32();
+    move32();
+    move16();
+    move16();
+
+    range = (UWord32) W_sub( high, low );
+    move32();
+
+    /* the value read from bitstream */
+    assert( value >= (UWord32) low );
+    cum = (UWord32) W_add( W_shl( ( W_sub( value, low ) ), stat_bitsnew ), ( 1 << stat_bitsnew ) - 1 );
+    move32();
+
+    /* search for the interval where "cum" fits */
+    IF( GT_64( W_mult0_32_32( L_shr( base, 1 ), range ), cum ) ) /* below pow-1 */
+    {
+        pows[0] = testval = base;
+        move16();
+        move16();
+        /* increase exponent until it is smaller than "cum" */
+        FOR( k = 1; k < 12; k++ )
+        {
+            highlim = testval;
+            move16();
+            pows[k] = mult_r( pows[k - 1], pows[k - 1] );
+            move16();
+            testval = mult_r( pows[k], base );
+            IF( LE_64( W_mult0_32_32( shr( testval, 1 ), range ), cum ) ) /* found! big range is [lowlim,testval], (now narrow it down) */
+            {
+                lowlim = testval;
+                move16();
+                k = sub( k, 1 );
+                symbol = (UWord16) L_shl( 1, k );
+                BREAK;
+            }
+        }
+        assert( k < 12 ); /* maximum 2^10-1*/
+        /* narrow the range down */
+        FOR( k--; k > 0; k-- )
+        {
+            testval = mult_r( highlim, pows[k] );
+            IF( LE_64( W_mult0_32_32( shr( testval, 1 ), range ), cum ) )
+            {
+                lowlim = testval;
+                move16();
+                symbol = (UWord16) L_sub( symbol, L_shl( 1, sub( k, 1 ) ) );
+            }
+            ELSE
+            {
+                highlim = testval;
+                move16();
+            }
+        }
+        highlim = shr( highlim, 1 );
+        lowlim = shr( lowlim, 1 );
+    }
+    ELSE /* trivial case, above pow-1, that is, first symbol */
+    {
+        symbol = 0;
+        lowlim = extract_l( L_shr( base, 1 ) );
+        highlim = 16384;
+        move16();
+        move16();
+    }
+
+
+    high = L_add( low, mul_sbc_14bits( range, highlim ) );
+
+    low = L_add( low, mul_sbc_14bits( range, lowlim ) );
+
+    /*ptr init for ptr*/
+    FOR( ; bp < bits; )
+    {
+        IF( GT_32( high, ari_q2new ) )
+        {
+            IF( GE_32( low, ari_q2new ) )
+            {
+                value = (UWord32) W_sub( value, ari_q2new );
+                low = L_sub( low, ari_q2new );
+                high = L_sub( high, ari_q2new );
+            }
+            ELSE
+            {
+                test();
+                IF( GE_32( low, ari_q1new ) && LE_32( high, ari_q3new ) )
+                {
+                    value = (UWord32) W_sub( value, ari_q1new );
+                    low = L_sub( low, ari_q1new );
+                    high = L_sub( high, ari_q1new );
+                }
+                ELSE
+                {
+                    BREAK;
+                }
+            }
+        }
+        low = L_add( low, low );
+        high = L_add( high, high );
+
+        assert( abs( ptr[bp] ) <= 1 && "AC expects reading binary values!!!" );
+
+        value = (UWord32) ( W_shl( value, 1 ) | ptr[bp++] );
+    }
+
+    test();
+    test();
+    test();
+    IF( !( NE_16( bp, bits ) || !( EQ_32( s->low, low ) && ( EQ_32( s->high, high ) ) && ( EQ_64( s->value, value ) ) ) ) )
+    {
+        /* This should not happen except of bit errors. */
+        s->high = s->low = 0;
+        move32();
+        move32();
+        *res = 0;
+        move16();
+        return -1;
+    }
+
+    s->low = low;
+    s->high = L_sub( high, 1 );
+    s->value = value;
+    move32();
+    move32();
+    move32();
+
+    *res = symbol;
+    move16();
+    return bp;
+}
+
+Word16 ari_decode_14bits_sign_ivas(
+    Word16 *ptr,
+    Word16 bp,
+    Word16 bits,
+    Word16 *res,
+    Tastat *s )
+{
+    Word16 symbol;
+    Word32 low, high;
+    UWord32 range, value, cum;
+
+    low = s->low;
+    high = L_add( s->high, 1 );
+    value = s->value;
+    move32();
+    move32();
+
+    range = (UWord32) W_sub( high, low );
+
+    IF( LT_16( bp, bits ) )
+    {
+        assert( value >= (UWord32) low );
+        cum = (UWord32) W_add( W_shl( ( W_sub( value, low ) ), stat_bitsnew ), ( 1 << stat_bitsnew ) - 1 );
+        IF( GT_64( W_shl( range, 13 ), cum ) )
+        {
+            symbol = 2;
+            move16();
+            high = L_add( low, W_extract_l( W_shr( range, 1 ) ) );
+        }
+        ELSE
+        {
+            symbol = 1;
+            move16();
+            low = L_add( low, W_extract_l( W_shr( range, 1 ) ) );
+        }
+
+        /*ptr init for ptr*/
+        FOR( ; bp < bits; )
+        {
+            IF( GT_32( high, ari_q2new ) )
+            {
+                IF( GE_32( low, ari_q2new ) )
+                {
+                    value = (UWord32) W_sub( value, ari_q2new );
+                    low = L_sub( low, ari_q2new );
+                    high = L_sub( high, ari_q2new );
+                }
+                ELSE
+                {
+                    test();
+                    IF( GE_32( low, ari_q1new ) && LE_32( high, ari_q3new ) )
+                    {
+                        value = (UWord32) W_sub( value, ari_q1new );
+                        low = L_sub( low, ari_q1new );
+                        high = L_sub( high, ari_q1new );
+                    }
+                    ELSE
+                    {
+                        BREAK;
+                    }
+                }
+            }
+            low = L_add( low, low );
+            high = L_add( high, high );
+
+            assert( abs( ptr[bp] ) <= 1 && "AC expects reading binary values!!!" );
+
+            value = (UWord32) ( W_shl( value, 1 ) | ptr[bp++] );
+        }
+    }
+    ELSE
+    {
+        cum = (UWord32) W_sub( value, low );
+        range = (UWord32) W_shr( range, 1 );
+        IF( GT_64( range, cum ) )
+        {
+            symbol = 2;
+            move16();
+            high = L_add( low, range );
+        }
+        ELSE
+        {
+            symbol = 1;
+            move16();
+            low = L_add( low, range );
+        }
+    }
+
+    s->low = low;
+    s->high = L_sub( high, 1 );
+    s->value = value;
+    move32();
+    move32();
+    move32();
+
+    *res = symbol;
+    move16();
+
+    return bp;
+}
diff --git a/lib_dec/ari_hm_dec.c b/lib_dec/ari_hm_dec.c
index f290ca9fbebd7a101484a3e805253924c07a84ef..ef4fb62d5579e0f89500a76227fbe459a7f1719e 100644
--- a/lib_dec/ari_hm_dec.c
+++ b/lib_dec/ari_hm_dec.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -40,10 +40,9 @@
 #include "cnst.h"
 #include "stl.h"
 #include "basop_util.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 Word16
 DecodeIndex_fx(
diff --git a/lib_dec/arith_coder_dec.c b/lib_dec/arith_coder_dec.c
deleted file mode 100644
index a9579d5d212f073c932b6e60606d507285763ecb..0000000000000000000000000000000000000000
--- a/lib_dec/arith_coder_dec.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "basop_util.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------*
- * tcx_arith_decode()
- *
- *
- *-------------------------------------------------------*/
-
-/*! r: number of bits consumed */
-
-static Word16 tcx_arith_decode_ivas_fx(
-    const Word16 L_frame,     /* i  : number of spectral lines               */
-    const Word16 envelope[],  /* i  : scaled envelope (Q15-envelope_e)                */
-    Word16 envelope_e,        /* i  : scaled envelope exponent (Q0)          */
-    const Word16 target_bits, /* i  : target bit budget                      */
-    Word16 prm[],             /* i  : bitstream parameters                   */
-    Word32 q_spectrum[],      /* o  : scalar quantized spectrum (Q31-q_spectrum_e) */
-    Word16 *q_spectrum_e      /* o  : spectrum exponent                      */
-)
-{
-    Word16 bp, k, q;
-    Word16 s;
-    Tastat as;
-    UWord16 exp_k;
-    Word16 tmp;
-
-    bp = ari_start_decoding_14bits_prm_ivas_fx( prm, 0, &as );
-
-    tmp = sub( envelope_e, 1 );
-
-    FOR( k = 0; k < L_frame; k++ )
-    {
-        IF( EQ_16( envelope[k], 0 ) ) /* safety check in case of bit errors */
-        {
-            set32_fx( q_spectrum, 0, L_frame );
-            return -1;
-        }
-        ELSE
-        {
-            exp_k = expfp_evs_fx( negate( envelope[k] ), tmp );
-        }
-
-        /* decode line magnitude */
-        bp = ari_decode_14bits_pow_ivas( prm, bp, target_bits, &q, &as, exp_k );
-
-        IF( q )
-        {
-            /* line is non-zero, decode sign */
-            bp = ari_decode_14bits_sign_ivas( prm, bp, target_bits, &s, &as );
-            q_spectrum[k] = L_mult( q, sub( 3, shl( s, 1 ) ) );
-            move32();
-            q_spectrum[k] = L_shl( q_spectrum[k], 30 - SPEC_EXP_DEC ); // Q(31-20)
-            move32();
-        }
-        ELSE
-        {
-            /* line is zero, no sign needed */
-            q_spectrum[k] = 0;
-            move32();
-        }
-
-        IF( LE_32( as.high, as.low ) )
-        {
-            if ( LT_16( bp, target_bits ) ) /* safety check in case of bit errors */
-            {
-                bp = -1;
-                move16();
-            }
-            BREAK; /* no bits left, so exit loop */
-        }
-    }
-    *q_spectrum_e = SPEC_EXP_DEC;
-    move16();
-
-    set32_fx( q_spectrum + k, 0, sub( L_frame, k ) );
-
-    return bp;
-}
-
-/*-------------------------------------------------------*
- * tcx_arith_decode_envelope()
- *
- *
- *-------------------------------------------------------*/
-
-void tcx_arith_decode_envelope_ivas_fx(
-    Decoder_State *st,          /* i/o: coder state                   */
-    Word32 q_spectrum[],        /* o  : quantised MDCT coefficients Q(31-q_spectrum_e)  */
-    Word16 *q_spectrum_e,       /* o  : MDCT exponent                 */
-    const Word16 L_frame,       /* i  : frame or MDCT length          */
-    Word16 L_spec,              /* i  : length w/o BW limitation      */
-    const Word16 A_ind[],       /* i  : quantised LPC coefficients    */
-    const Word16 target_bits,   /* i  : number of available bits      */
-    Word16 prm[],               /* i  : bitstream parameters          */
-    const Word16 use_hm,        /* i  : use HM in current frame?      */
-    const Word16 prm_hm[],      /* i  : HM parameter area             */
-    Word16 tcxltp_pitch,        /* i  : TCX LTP pitch in FD, -1 if n/a*/
-    Word16 *arith_bits,         /* o  : bits used for ari. coding     */
-    Word16 *signaling_bits,     /* o  : bits used for signaling       */
-    const Word16 low_complexity /* i  : low-complexity flag           */
-)
-{
-    Word32 env[N_MAX_ARI]; /* unscaled envelope (Q16) */
-    Word16 *envelope;      /* scaled envelope (Q15-e) */
-    Word16 envelope_e;
-    Word16 L_spec_core;
-    TCX_CONFIG_HANDLE hTcxCfg;
-    TCX_DEC_HANDLE hTcxDec;
-    Word16 gamma_w, gamma_uw;
-    Word16 hm_bits;
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( GT_16( L_spec, N_MAX_ARI ) || ( ( st->element_mode == EVS_MONO ) && GT_16( target_bits, ( ACELP_13k20 / FRAMES_PER_SEC ) ) ) ||
-        ( EQ_16( st->element_mode, IVAS_SCE ) && ( GT_16( st->bits_frame_nominal, ( LPC_SHAPED_ARI_MAX_RATE / FRAMES_PER_SEC ) ) ) ) ||
-        ( GT_16( st->element_mode, IVAS_SCE ) && ( GT_16( st->bits_frame_nominal, ( LPC_SHAPED_ARI_MAX_RATE_CPE / FRAMES_PER_SEC ) ) ) ) ||
-        ( target_bits <= 0 ) )
-    {
-        /* this could happen in case of bit errors */
-        st->BER_detect = 1;
-        move16();
-        L_spec = N_MAX_ARI;
-        move16();
-        *signaling_bits = 0;
-        move16();
-        *arith_bits = 0;
-        move16();
-        set32_fx( q_spectrum, 0, L_frame );
-
-        return;
-    }
-
-    hTcxCfg = st->hTcxCfg;
-    hTcxDec = st->hTcxDec;
-    *signaling_bits = 0;
-    move16();
-
-    assert( hTcxDec->enableTcxLpc );
-    gamma_w = MAX16B;
-    move16();
-    gamma_uw = st->inv_gamma;
-    move16();
-
-#define WMC_TOOL_SKIP
-    tcx_arith_render_envelope_ivas_fx( A_ind, L_frame, L_spec, hTcxCfg->preemph_fac, gamma_w, gamma_uw, env );
-#undef WMC_TOOL_SKIP
-
-    IF( use_hm != 0 )
-    {
-        IF( prm_hm[0] != 0 )
-        {
-            tcx_hm_decode( L_spec, env, target_bits, st->coder_type, prm_hm, tcxltp_pitch, &hm_bits );
-
-            IF( hm_bits < 0 )
-            {
-                st->BER_detect = 1;
-                move16();
-                *signaling_bits = 0;
-                move16();
-                *arith_bits = 0;
-                move16();
-                set32_fx( q_spectrum, 0, L_frame );
-
-                return;
-            }
-        }
-        ELSE
-        {
-            hm_bits = 1;
-            move16();
-        }
-        *signaling_bits = add( *signaling_bits, hm_bits );
-        move16();
-    }
-
-    L_spec_core = L_spec;
-    move16();
-    IF( st->igf )
-    {
-        L_spec_core = s_min( L_spec_core, st->hIGFDec->infoIGFStartLine );
-    }
-
-    envelope = (Word16 *) env;
-    tcx_arith_scale_envelope( L_spec, L_spec_core, env, target_bits, low_complexity, envelope, &envelope_e );
-
-    *arith_bits = tcx_arith_decode_ivas_fx( L_spec, envelope, envelope_e, target_bits, prm, q_spectrum, q_spectrum_e );
-    move16();
-
-    /* safety check in case of bit errors */
-    IF( *arith_bits < 0 )
-    {
-        st->BER_detect = 1;
-        move16();
-        set32_fx( q_spectrum, 0, L_frame );
-    }
-
-    set32_fx( q_spectrum + L_spec, 0, sub( L_frame, L_spec ) );
-
-    return;
-}
diff --git a/lib_dec/arith_coder_dec_fx.c b/lib_dec/arith_coder_dec_fx.c
index 68736867d887d10af7e0c4f1e6e26110e50c1e62..60a59c4da469f113f7195179ed0521d2c343bc2d 100644
--- a/lib_dec/arith_coder_dec_fx.c
+++ b/lib_dec/arith_coder_dec_fx.c
@@ -8,6 +8,8 @@
 #include "cnst.h"
 #include "rom_com.h"
 #include "prot_fx.h"
+#include "basop_util.h"
+#include "basop_proto_func.h"
 
 /* Returns: number of bits consumed */
 static Word16 tcx_arith_decode_fx(
@@ -61,11 +63,7 @@ static Word16 tcx_arith_decode_fx(
         {
             bp = ari_decode_14bits_sign_fx( prm, bp, target_bits, &s, &as );
 
-#ifdef BASOP_NOGLOB
             L_tmp = L_macNs_co( L_tmp, q, k, &Carry, &Overflow );
-#else
-            L_tmp = L_macNs( L_tmp, q, k );
-#endif
 
             Q = L_mult( q, negate( shl( 1, sub( 30, SPEC_EXP_DEC ) ) ) );
             IF( EQ_16( s, 0 ) )
@@ -217,3 +215,207 @@ void tcx_arith_decode_envelope_fx(
 
     set32_fx( q_spectrum + L_spec, 0, sub( L_frame, L_spec ) );
 }
+
+/*-------------------------------------------------------*
+ * tcx_arith_decode()
+ *
+ *
+ *-------------------------------------------------------*/
+
+/*! r: number of bits consumed */
+
+static Word16 tcx_arith_decode_ivas_fx(
+    const Word16 L_frame,     /* i  : number of spectral lines               */
+    const Word16 envelope[],  /* i  : scaled envelope (Q15-envelope_e)                */
+    Word16 envelope_e,        /* i  : scaled envelope exponent (Q0)          */
+    const Word16 target_bits, /* i  : target bit budget                      */
+    Word16 prm[],             /* i  : bitstream parameters                   */
+    Word32 q_spectrum[],      /* o  : scalar quantized spectrum (Q31-q_spectrum_e) */
+    Word16 *q_spectrum_e      /* o  : spectrum exponent                      */
+)
+{
+    Word16 bp, k, q;
+    Word16 s;
+    Tastat as;
+    UWord16 exp_k;
+    Word16 tmp;
+
+    bp = ari_start_decoding_14bits_prm_ivas_fx( prm, 0, &as );
+
+    tmp = sub( envelope_e, 1 );
+
+    FOR( k = 0; k < L_frame; k++ )
+    {
+        IF( EQ_16( envelope[k], 0 ) ) /* safety check in case of bit errors */
+        {
+            set32_fx( q_spectrum, 0, L_frame );
+            return -1;
+        }
+        ELSE
+        {
+            exp_k = expfp_evs_fx( negate( envelope[k] ), tmp );
+        }
+
+        /* decode line magnitude */
+        bp = ari_decode_14bits_pow_ivas( prm, bp, target_bits, &q, &as, exp_k );
+
+        IF( q )
+        {
+            /* line is non-zero, decode sign */
+            bp = ari_decode_14bits_sign_ivas( prm, bp, target_bits, &s, &as );
+            q_spectrum[k] = L_mult( q, sub( 3, shl( s, 1 ) ) );
+            move32();
+            q_spectrum[k] = L_shl( q_spectrum[k], 30 - SPEC_EXP_DEC ); // Q(31-20)
+            move32();
+        }
+        ELSE
+        {
+            /* line is zero, no sign needed */
+            q_spectrum[k] = 0;
+            move32();
+        }
+
+        IF( LE_32( as.high, as.low ) )
+        {
+            if ( LT_16( bp, target_bits ) ) /* safety check in case of bit errors */
+            {
+                bp = -1;
+                move16();
+            }
+            BREAK; /* no bits left, so exit loop */
+        }
+    }
+    *q_spectrum_e = SPEC_EXP_DEC;
+    move16();
+
+    set32_fx( q_spectrum + k, 0, sub( L_frame, k ) );
+
+    return bp;
+}
+
+/*-------------------------------------------------------*
+ * tcx_arith_decode_envelope()
+ *
+ *
+ *-------------------------------------------------------*/
+
+void tcx_arith_decode_envelope_ivas_fx(
+    Decoder_State *st,          /* i/o: coder state                   */
+    Word32 q_spectrum[],        /* o  : quantised MDCT coefficients Q(31-q_spectrum_e)  */
+    Word16 *q_spectrum_e,       /* o  : MDCT exponent                 */
+    const Word16 L_frame,       /* i  : frame or MDCT length          */
+    Word16 L_spec,              /* i  : length w/o BW limitation      */
+    const Word16 A_ind[],       /* i  : quantised LPC coefficients    */
+    const Word16 target_bits,   /* i  : number of available bits      */
+    Word16 prm[],               /* i  : bitstream parameters          */
+    const Word16 use_hm,        /* i  : use HM in current frame?      */
+    const Word16 prm_hm[],      /* i  : HM parameter area             */
+    Word16 tcxltp_pitch,        /* i  : TCX LTP pitch in FD, -1 if n/a*/
+    Word16 *arith_bits,         /* o  : bits used for ari. coding     */
+    Word16 *signaling_bits,     /* o  : bits used for signaling       */
+    const Word16 low_complexity /* i  : low-complexity flag           */
+)
+{
+    Word32 env[N_MAX_ARI]; /* unscaled envelope (Q16) */
+    Word16 *envelope;      /* scaled envelope (Q15-e) */
+    Word16 envelope_e;
+    Word16 L_spec_core;
+    TCX_CONFIG_HANDLE hTcxCfg;
+    TCX_DEC_HANDLE hTcxDec;
+    Word16 gamma_w, gamma_uw;
+    Word16 hm_bits;
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( GT_16( L_spec, N_MAX_ARI ) || ( ( st->element_mode == EVS_MONO ) && GT_16( target_bits, ( ACELP_13k20 / FRAMES_PER_SEC ) ) ) ||
+        ( EQ_16( st->element_mode, IVAS_SCE ) && ( GT_16( st->bits_frame_nominal, ( LPC_SHAPED_ARI_MAX_RATE / FRAMES_PER_SEC ) ) ) ) ||
+        ( GT_16( st->element_mode, IVAS_SCE ) && ( GT_16( st->bits_frame_nominal, ( LPC_SHAPED_ARI_MAX_RATE_CPE / FRAMES_PER_SEC ) ) ) ) ||
+        ( target_bits <= 0 ) )
+    {
+        /* this could happen in case of bit errors */
+        st->BER_detect = 1;
+        move16();
+        L_spec = N_MAX_ARI;
+        move16();
+        *signaling_bits = 0;
+        move16();
+        *arith_bits = 0;
+        move16();
+        set32_fx( q_spectrum, 0, L_frame );
+
+        return;
+    }
+
+    hTcxCfg = st->hTcxCfg;
+    hTcxDec = st->hTcxDec;
+    *signaling_bits = 0;
+    move16();
+
+    assert( hTcxDec->enableTcxLpc );
+    gamma_w = MAX16B;
+    move16();
+    gamma_uw = st->inv_gamma;
+    move16();
+
+#define WMC_TOOL_SKIP
+    tcx_arith_render_envelope_ivas_fx( A_ind, L_frame, L_spec, hTcxCfg->preemph_fac, gamma_w, gamma_uw, env );
+#undef WMC_TOOL_SKIP
+
+    IF( use_hm != 0 )
+    {
+        IF( prm_hm[0] != 0 )
+        {
+            tcx_hm_decode( L_spec, env, target_bits, st->coder_type, prm_hm, tcxltp_pitch, &hm_bits );
+
+            IF( hm_bits < 0 )
+            {
+                st->BER_detect = 1;
+                move16();
+                *signaling_bits = 0;
+                move16();
+                *arith_bits = 0;
+                move16();
+                set32_fx( q_spectrum, 0, L_frame );
+
+                return;
+            }
+        }
+        ELSE
+        {
+            hm_bits = 1;
+            move16();
+        }
+        *signaling_bits = add( *signaling_bits, hm_bits );
+        move16();
+    }
+
+    L_spec_core = L_spec;
+    move16();
+    IF( st->igf )
+    {
+        L_spec_core = s_min( L_spec_core, st->hIGFDec->infoIGFStartLine );
+    }
+
+    envelope = (Word16 *) env;
+    tcx_arith_scale_envelope( L_spec, L_spec_core, env, target_bits, low_complexity, envelope, &envelope_e );
+
+    *arith_bits = tcx_arith_decode_ivas_fx( L_spec, envelope, envelope_e, target_bits, prm, q_spectrum, q_spectrum_e );
+    move16();
+
+    /* safety check in case of bit errors */
+    IF( *arith_bits < 0 )
+    {
+        st->BER_detect = 1;
+        move16();
+        set32_fx( q_spectrum, 0, L_frame );
+    }
+
+    set32_fx( q_spectrum + L_spec, 0, sub( L_frame, L_spec ) );
+
+    return;
+}
diff --git a/lib_dec/avq_dec.c b/lib_dec/avq_dec.c
deleted file mode 100644
index 27bb2c3245453c4ea715bf395c5e448974151ac4..0000000000000000000000000000000000000000
--- a/lib_dec/avq_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "cnst.h"
-#include "wmc_auto.h"
-#include <math.h>
diff --git a/lib_dec/avq_dec_fx.c b/lib_dec/avq_dec_fx.c
index 3bf7e3eb62ff897d2028a462d3e8f30c33ead199..a8ba2bfc3612253b30e153d2cb22f863afe3d4a4 100644
--- a/lib_dec/avq_dec_fx.c
+++ b/lib_dec/avq_dec_fx.c
@@ -7,7 +7,6 @@
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
-#include "prot.h"    /* Function prototypes                    */
 #include "prot_fx.h" /* Function prototypes                    */
 
 /*-------------------------------------------------------------------*
diff --git a/lib_dec/bass_psfilter.c b/lib_dec/bass_psfilter.c
deleted file mode 100644
index a33149fffd514053b3f9107efd778fc3887489e6..0000000000000000000000000000000000000000
--- a/lib_dec/bass_psfilter.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_prot.h"
-#include "cnst.h"
-#include "stat_dec.h"
-#include "rom_com.h"
-#include <assert.h>
-#include "wmc_auto.h"
-#include "ivas_prot_fx.h"
-
-/*---------------------------------------------------------------------*
- * Local constants
- *---------------------------------------------------------------------*/
-
-
-#define NBPSF_L_EXTRA        120
-#define BPF_STOP_STOPBAND_16 16
-#define K_PC_DEC_FX          -1170     /* -0.0357f in Q15            */
-#define K_PC_DEC_FX32        -76665166 /* -0.0357f in Q31            */
-#define C_PC_DEC_FX          6583      /*in Q8*/
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------*
- * bass_psfilter()
- *
- * Perform low-frequency postfiltering
- *---------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------*
- * Pit_track()
- *
- * Perform pitch tracking and test pitch/2 to avoid continuous pitch doubling
- *---------------------------------------------------------------------*/
-
-/*! r: Pitch */
-
-
-/*---------------------------------------------------------------------*
- * addBassPostFilter()
- *
- * Add BPF component in cldfb domain
- *---------------------------------------------------------------------*/
-
-
-void addBassPostFilter_ivas_fx(
-    const Word32 *harm_timeIn_fx, // Qx
-    const Word16 samplesToProcess,
-    Word32 **rAnalysis_fx, // Qx - 5
-    Word32 **iAnalysis_fx, // Qx - 5
-    HANDLE_CLDFB_FILTER_BANK cldfb )
-{
-    Word32 *tmp_R_fx[CLDFB_NO_COL_MAX];
-    Word32 *tmp_I_fx[CLDFB_NO_COL_MAX];
-    Word32 cldfbBufferReal_fx[CLDFB_NO_COL_MAX][20];
-    Word32 cldfbBufferImag_fx[CLDFB_NO_COL_MAX][20];
-    Word16 i, b;
-    Word16 maxBand;
-    const Word32 *weights_fx;
-    Word16 nCol = cldfb->no_col;
-    move16();
-    Word16 nColToProcess = nCol;
-    move16();
-    Word16 nChan = cldfb->no_channels;
-    move16();
-    IF( GT_16( samplesToProcess, -1 ) )
-    {
-        nColToProcess = idiv1616( sub( add( samplesToProcess, cldfb->no_channels ), 1 ), cldfb->no_channels );
-        move16();
-    }
-
-    assert( nCol == 16 );
-
-    weights_fx = bpf_weights_16_ivas_fx_32;
-
-    IF( GT_16( nChan, BPF_STOP_STOPBAND_16 ) )
-    {
-        maxBand = BPF_STOP_STOPBAND_16;
-        move16();
-    }
-    ELSE
-    {
-        maxBand = nChan;
-        move16();
-    }
-
-    FOR( i = 0; i < nColToProcess; i++ )
-    {
-        tmp_R_fx[i] = cldfbBufferReal_fx[i];
-        tmp_I_fx[i] = cldfbBufferImag_fx[i];
-    }
-
-    cldfbAnalysis_ivas_fx( harm_timeIn_fx, tmp_R_fx, tmp_I_fx, samplesToProcess, cldfb );
-
-    /* now do the subtraction */
-    FOR( i = 0; i < nColToProcess; i++ )
-    {
-        /* loop over low frequency bands */
-        FOR( b = 0; b < maxBand; b++ )
-        {
-            rAnalysis_fx[i][b] = Msub_32_32( rAnalysis_fx[i][b], tmp_R_fx[i][b], weights_fx[b] ); // Qx - 6
-            move32();
-            iAnalysis_fx[i][b] = Msub_32_32( iAnalysis_fx[i][b], tmp_I_fx[i][b], weights_fx[b] ); // Qx - 6
-            move32();
-        }
-    }
-
-    return;
-}
-
-
-/*---------------------------------------------------------------------*
- * res_bpf_adapt_ivas_fx()
- *
- * Analyze BPF output and decide if it should be applied on DFT stereo
- * residual signal
- *---------------------------------------------------------------------*/
-
-/*! r: Decision to enable or disable BPF on DFT stereo residual */
-Word16 res_bpf_adapt_ivas_fx(
-    STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */
-    const Word32 *bpf_error_signal_8k,     /* i  : BPF modification signal   */
-    Word32 res_buf[STEREO_DFT_N_8k],       /* i  : residual buffer Q12       */
-    Word16 q_res )
-{
-    Word32 error_nrg;
-    Word32 tmp;
-    Word32 res_hb_nrg;
-    Word16 bpf_error_ratio;
-    Word16 res_bpf_flag;
-    Word16 i;
-    Word16 i_start;
-    Word16 i_end;
-    Word16 bw_inv;
-    Word64 W_tmp;
-
-    IF( EQ_16( hStereoDft->res_cod_band_max, 6 ) )
-    {
-        i_start = 39;
-        move16();
-        i_end = 64;
-        move16();
-        bw_inv = 1311;
-        move16(); /* 1/(64 - 39) in Q15 */
-    }
-    ELSE
-    {
-        i_start = 28;
-        move16();
-        i_end = 40;
-        move16();
-        bw_inv = 2720;
-        move16(); /* 1/(40 - 28) in Q15*/
-    }
-
-    /* Measure energy of high frequency band in MDCT domain */
-    res_hb_nrg = L_deposit_l( 0 );
-    W_tmp = W_deposit32_l( 0 );
-    FOR( i = i_start; i < i_end; i++ )
-    {
-        W_tmp = W_add_nosat( W_tmp, W_mult0_32_32( res_buf[i], res_buf[i] ) );
-    }
-
-    res_hb_nrg = W_extract_l( W_shr( W_tmp, shl( q_res, 1 ) ) ); // Q0
-    res_hb_nrg = Mpy_32_16_1( res_hb_nrg, bw_inv );              // Q0
-    res_hb_nrg = L_add( Mpy_32_16_1( res_hb_nrg, STEREO_DFT_BPF_ADAPT_ALPHA_FX ), Mpy_32_16_1( hStereoDft->res_hb_nrg_mem_fx, sub( MAX_16, STEREO_DFT_BPF_ADAPT_ALPHA_FX ) ) );
-    hStereoDft->res_hb_nrg_mem_fx = res_hb_nrg;
-    move32();
-
-    /* Measure energy of discontinuities at subframe boundaries */
-    error_nrg = 0;
-    move32();
-    FOR( i = 0; i < L_FRAME8k; i += STEREO_DFT_L_SUBFR_8k )
-    {
-        tmp = L_sub( bpf_error_signal_8k[i], hStereoDft->bpf_error_signal_last_fx );
-        error_nrg = Madd_32_32( error_nrg, tmp, tmp );
-        hStereoDft->bpf_error_signal_last_fx = bpf_error_signal_8k[( i + ( STEREO_DFT_L_SUBFR_8k - 1 ) )];
-        move32();
-    }
-    error_nrg = L_shl( error_nrg, 1 );                            // Q0
-    error_nrg = Mpy_32_16_1( error_nrg, 6553 /* 0.2f in Q15 */ ); /* Division by 5 for average value */
-    /* Form decision variable and apply limit */
-    IF( LT_32( ( L_shr( error_nrg, 1 ) ), res_hb_nrg ) )
-    {
-        Word16 temp;
-        bpf_error_ratio = BASOP_Util_Divide3232_Scale( error_nrg, res_hb_nrg, &temp );
-        bpf_error_ratio = shl( bpf_error_ratio, sub( 13, sub( 15, temp ) ) );
-    }
-    ELSE
-    {
-        bpf_error_ratio = ONE_IN_Q14; // Q13
-        move16();
-    }
-    bpf_error_ratio = add( mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), mult( ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx ) );
-    hStereoDft->bpf_error_ratio_mem_fx = bpf_error_ratio;
-    move16();
-
-    res_bpf_flag = (Word16) LT_16( bpf_error_ratio, ONE_IN_Q13 );
-    move16();
-
-    return res_bpf_flag;
-}
-
-void bpf_pitch_coherence_ivas_fx(
-    Decoder_State *st,       /* i/o: decoder state structure            */
-    const Word32 pitch_buf[] /* i  : pitch for every subfr [0,1,2,3]   Q20 */
-)
-{
-    Word16 nb_subfr;
-    Word32 pc, pcn1, pcn2, pcn3;
-    Word32 scaled_inv_L_frame; // Q8 + Q23
-
-    SWITCH( st->L_frame )
-    {
-        case 80:
-            scaled_inv_L_frame = 26843545; // 1/80 in Q31
-            move32();
-            BREAK;
-        case 160:
-            scaled_inv_L_frame = 13421773; // 1/160 in Q31
-            move32();
-            BREAK;
-        case 256:
-            scaled_inv_L_frame = 8388608; // 1/256 in Q31
-            move32();
-            BREAK;
-        case 320:
-            scaled_inv_L_frame = 6710886; // 1/320 in Q31
-            move32();
-            BREAK;
-        case 512:
-            scaled_inv_L_frame = 4194304; // 1/512 in Q31
-            move32();
-            BREAK;
-        case 640:
-            scaled_inv_L_frame = 3355443; // 1/640 in Q31
-            move32();
-            BREAK;
-        case 960:
-            scaled_inv_L_frame = 2236962; // 1/80 in Q31
-            move32();
-            BREAK;
-        default:
-            scaled_inv_L_frame = 0;
-            move32();
-    }
-
-    nb_subfr = shr( st->L_frame, 6 );
-    test();
-    IF( GT_16( st->clas_dec, UNVOICED_CLAS ) && ( st->element_mode != EVS_MONO ) )
-    {
-        pc = L_abs( L_sub( L_add( st->old_pitch_buf_fx[nb_subfr + 3], st->old_pitch_buf_fx[nb_subfr + 2] ), L_add( st->old_pitch_buf_fx[nb_subfr], st->old_pitch_buf_fx[nb_subfr + 1] ) ) );
-        pc = Mpy_32_32( pc, scaled_inv_L_frame );
-        pcn1 = L_add( Mpy_32_32( pc, K_PC_DEC_FX32 ), C_PC_DEC_FX );
-        pcn1 = L_max( L_min( pcn1, 4096 ), 0 ); // 4096 = 1 in Q12
-
-        pc = L_abs( L_sub( L_add( pitch_buf[nb_subfr - 1], pitch_buf[nb_subfr - 2] ), L_add( pitch_buf[1], pitch_buf[0] ) ) );
-        pc = Mpy_32_32( pc, scaled_inv_L_frame );
-        pcn2 = L_add( Mpy_32_32( pc, K_PC_DEC_FX32 ), C_PC_DEC_FX );
-        pcn2 = L_max( L_min( pcn2, 4096 ), 0 ); // 4096 = 1 in Q12
-
-        pc = L_abs( L_sub( L_add( st->old_pitch_buf_fx[nb_subfr + 3], st->old_pitch_buf_fx[nb_subfr + 2] ), L_add( pitch_buf[1], pitch_buf[0] ) ) );
-        pc = Mpy_32_32( pc, scaled_inv_L_frame );
-        pcn3 = L_add( Mpy_32_32( pc, K_PC_DEC_FX32 ), C_PC_DEC_FX );
-        pcn3 = L_max( L_min( pcn3, 4096 ), 0 ); // 4096 = 1 in Q12
-
-        IF( LT_32( L_add( pcn1, L_add( pcn2, pcn3 ) ), 10240 /*2.5f in Q12*/ ) )
-        {
-            st->hBPF->psf_att_fx = 13107; //.4 in Q15
-            move16();                     /*Q15*/
-            set16_fx( &st->hBPF->Track_on_hist[L_TRACK_HIST - nb_subfr], 1, nb_subfr );
-        }
-    }
-
-    return;
-}
diff --git a/lib_dec/bass_psfilter_fx.c b/lib_dec/bass_psfilter_fx.c
index 0f290fc8f5dd770c37bab21d27fd2440614ed8ce..4a5ef932892437f9d1ac7662c765c3aece88f343 100644
--- a/lib_dec/bass_psfilter_fx.c
+++ b/lib_dec/bass_psfilter_fx.c
@@ -4,11 +4,12 @@
 
 #include <assert.h>
 #include <stdint.h>
-#include "options.h" /* Compilation switches                   */
-#include "prot_fx.h" /* Function prototypes                    */
-#include "cnst.h"    /* Common constants                       */
-#include "rom_com.h" /* Static table prototypes                */
-#include "rom_dec.h" /* Static table prototypes                */
+#include "options.h"      /* Compilation switches                   */
+#include "prot_fx.h"      /* Function prototypes                    */
+#include "ivas_prot_fx.h" /* Function prototypes                    */
+#include "cnst.h"         /* Common constants                       */
+#include "rom_com.h"      /* Static table prototypes                */
+#include "rom_dec.h"      /* Static table prototypes                */
 #include "basop_util.h"
 
 /*---------------------------------------------------------------------*
@@ -17,6 +18,9 @@
 
 #define NBPSF_L_EXTRA        120
 #define BPF_STOP_STOPBAND_16 16
+#define K_PC_DEC_FX          -1170     /* -0.0357f in Q15            */
+#define K_PC_DEC_FX32        -76665166 /* -0.0357f in Q31            */
+#define C_PC_DEC_FX          6583      /*in Q8*/
 
 /*---------------------------------------------------------------------*
  * Local function prototypes
@@ -192,12 +196,8 @@ void bass_psfilter_fx(
     }
 
     tmp = sum16_fx( hBPF->Track_on_hist, L_TRACK_HIST );
-#ifdef BASOP_NOGLOB
     TrackOnR = round_fx_sat( L_shl_sat( L_mult0( tmp, 3277 ), 16 ) ); /*Q15  */
-#else
-    TrackOnR = round_fx( L_shl( L_mult0( tmp, 3277 ), 16 ) ); /*Q15  */
-#endif
-    vibratR = sum16_fx( hBPF->vibrato_hist, L_TRACK_HIST ); /*Q0 */
+    vibratR = sum16_fx( hBPF->vibrato_hist, L_TRACK_HIST );           /*Q0 */
 
     alp_tmp = sub( 32767, TrackOnR ); /*Q15 */
 
@@ -328,21 +328,13 @@ void bass_psfilter_fx(
             because it is a signed sum. */
             FOR( j = 0; j < subfr_len; j += 2 )
             {
-                Lcorr0 = L_mult0( syn_fx[j], syn2_fx[j] );  /* Q31 */
-                Lener0 = L_mult0( syn2_fx[j], syn2_fx[j] ); /* Q31 */
-#ifdef BASOP_NOGLOB
+                Lcorr0 = L_mult0( syn_fx[j], syn2_fx[j] );                     /* Q31 */
+                Lener0 = L_mult0( syn2_fx[j], syn2_fx[j] );                    /* Q31 */
                 Lcorr0 = L_mac0_sat( Lcorr0, syn_fx[j + 1], syn2_fx[j + 1] );  /* Q31 */
                 Lener0 = L_mac0_sat( Lener0, syn2_fx[j + 1], syn2_fx[j + 1] ); /* Q31 */
 
                 Lcorr = L_add_sat( Lcorr, L_shr( Lcorr0, 4 ) );
                 Lener = L_add_sat( Lener, L_shr( Lener0, 4 ) );
-#else
-                Lcorr0 = L_mac0( Lcorr0, syn_fx[j + 1], syn2_fx[j + 1] );
-                Lener0 = L_mac0( Lener0, syn2_fx[j + 1], syn2_fx[j + 1] );
-
-                Lcorr = L_add( Lcorr, L_shr( Lcorr0, 4 ) );
-                Lener = L_add( Lener, L_shr( Lener0, 4 ) );
-#endif
                 /* this loop is not efficient but it provide a
                 respectable precision while avoiding overflow. */
             }
@@ -354,24 +346,16 @@ void bass_psfilter_fx(
 
             Ltmp = L_abs( Lcorr );
             exp = norm_l( Ltmp );
-#ifdef BASOP_NOGLOB
             tmp = round_fx_sat( L_shl_sat( Ltmp, exp ) );
-#else
-            tmp = round_fx( L_shl( Ltmp, exp ) );
-#endif
             exp2 = norm_l( Lener );
-#ifdef BASOP_NOGLOB
             tmp2 = round_fx_sat( L_shl( Lener, exp2 ) );
-#else
-            tmp2 = round_fx( L_shl( Lener, exp2 ) );
-#endif
             if ( GT_16( tmp, tmp2 ) )
             {
                 exp = sub( exp, 1 );
             }
             exp2 = sub( exp, exp2 ); /* exponent num - exponent denom */
             /* gain = corr / ener */
-            gain = div_s( round_fx( L_shl( Ltmp, exp ) ), tmp2 );
+            gain = div_s( round_fx_sat( L_shl( Ltmp, exp ) ), tmp2 );
             if ( Lcorr < 0 )
             {
                 gain = sub( 0, gain );
@@ -381,11 +365,7 @@ void bass_psfilter_fx(
             FOR( i = 0; i < subfr_len; i++ )
             {
                 /* err[i] = syn_fx[i] - gain*syn2_fx[i] */
-#ifdef BASOP_NOGLOB
                 err[i] = msu_r_sat( L_shr_sat( L_mult0( gain, syn2_fx[i] ), exp2 ), syn_fx[i], 16384 ); /* Q15 */
-#else
-                err[i] = msu_r( L_shr( L_mult0( gain, syn2_fx[i] ), exp2 ), syn_fx[i], 16384 );
-#endif
                 move16();
                 /* the sign is inverted but it is not important because
                 we calculate energy with 'err[i]' x 'err[i]'
@@ -404,28 +384,16 @@ void bass_psfilter_fx(
             tmp2 = sub( tmp2, 1 + 4 ); /* substract 1 because 'Lener' is divided by two */
             tmp2 = add( tmp2, Q_syn2x );
             tmp2 = s_max( 0, s_min( 30, tmp2 ) );
-#ifdef BASOP_NOGLOB
             Lener = L_add_sat( Lener, Pow2( tmp2, exp2 ) );
-#else
-            Lener = L_add( Lener, Pow2( tmp2, exp2 ) );
-#endif
             exp2 = norm_l( Lener );
-#ifdef BASOP_NOGLOB
             tmp2 = round_fx_sat( L_shl( Lener, exp2 ) );
-#else
-            tmp2 = round_fx( L_shl( Lener, exp2 ) );
-#endif
             if ( GT_16( tmp, tmp2 ) )
             {
                 exp = sub( exp, 1 );
             }
-            exp2 = sub( exp, exp2 ); /* exponent num - exponent denom */
-                                     /* alpha = corr / ener */
-#ifdef BASOP_NOGLOB
+            exp2 = sub( exp, exp2 );                                                        /* exponent num - exponent denom */
+                                                                                            /* alpha = corr / ener */
             alpha = shr_sat( div_s( round_fx_sat( L_shl_sat( Ltmp, exp ) ), tmp2 ), exp2 ); /*Q15 */
-#else
-            alpha = shr( div_s( round_fx( L_shl( Ltmp, exp ) ), tmp2 ), exp2 ); /*Q15 */
-#endif
             if ( Lcorr < 0 )
             {
                 alpha = sub( 0, alpha );
@@ -471,13 +439,8 @@ void bass_psfilter_fx(
             FOR( i = 0; i < subfr_len; i++ )
             {
                 /*syn2_fx[i] = alpha*(syn_fx[i]-syn2_fx[i]); */
-#ifdef BASOP_NOGLOB
                 tmp = sub_sat( syn_fx[i], syn2_fx[i] );
                 syn2_fx[i] = mult_sat( alpha, shl_sat( tmp, 1 ) );
-#else
-                tmp = sub( syn_fx[i], syn2_fx[i] );
-                syn2_fx[i] = mult( alpha, shl( tmp, 1 ) );
-#endif
                 move16(); /*Q_syn2 */
             }
 
@@ -490,11 +453,7 @@ void bass_psfilter_fx(
             This sum is divided by 4 */
             FOR( i = 0; i < subfr_len; i++ )
             {
-#ifdef BASOP_NOGLOB
                 Lener = L_mac0_sat( Lener, err[i], err[i] ); /* Q31 */
-#else
-                Lener = L_mac0( Lener, err[i], err[i] );
-#endif
             }
             exp2 = -1 - 2;
             move16();
@@ -506,11 +465,7 @@ void bass_psfilter_fx(
                 FOR( i = 0; i < shr( subfr_len, 1 ); i++ )
                 {
                     Lener0 = L_mult0( sigPtr[i], sigPtr[i] ); /* Q31 */
-#ifdef BASOP_NOGLOB
                     Lener = L_add( Lener, L_shr( L_mac0_sat( Lener0, err[i], err[i] ), 5 ) );
-#else
-                    Lener = L_add( Lener, L_shr( L_mac0( Lener0, err[i], err[i] ), 5 ) );
-#endif
                 }
                 exp2 = sub( exp2, 5 );
             }
@@ -563,21 +518,13 @@ void bass_psfilter_fx(
             sigPtr1 = syn2_fx + 1;
             FOR( j = 0; j < subfr_len; j += 2 )
             {
-                Lcorr0 = L_mult0( syn_fx[j], syn2_fx[j] );  /* Q31 */
-                Lener0 = L_mult0( syn2_fx[j], syn2_fx[j] ); /* Q31 */
-#ifdef BASOP_NOGLOB
+                Lcorr0 = L_mult0( syn_fx[j], syn2_fx[j] );             /* Q31 */
+                Lener0 = L_mult0( syn2_fx[j], syn2_fx[j] );            /* Q31 */
                 Lcorr0 = L_mac0_sat( Lcorr0, sigPtr[j], sigPtr1[j] );  /* Q31 */
                 Lener0 = L_mac0_sat( Lener0, sigPtr1[j], sigPtr1[j] ); /* Q31 */
 
                 Lcorr = L_add_sat( Lcorr, L_shr( Lcorr0, 4 ) );
                 Lener = L_add_sat( Lener, L_shr( Lener0, 4 ) );
-#else
-                Lcorr0 = L_mac0( Lcorr0, sigPtr[j], sigPtr1[j] );
-                Lener0 = L_mac0( Lener0, sigPtr1[j], sigPtr1[j] );
-
-                Lcorr = L_add( Lcorr, L_shr( Lcorr0, 4 ) );
-                Lener = L_add( Lener, L_shr( Lener0, 4 ) );
-#endif
                 /* this loop is not efficient but it provide a
                 respectable precision while avoiding overflow. */
             }
@@ -589,15 +536,9 @@ void bass_psfilter_fx(
 
             Ltmp = L_abs( Lcorr );
             exp = norm_l( Ltmp );
-#ifdef BASOP_NOGLOB
             tmp = round_fx_sat( L_shl_sat( Ltmp, exp ) );
             exp2 = norm_l( Lener );
             tmp2 = round_fx_sat( L_shl_sat( Lener, exp2 ) );
-#else
-            tmp = round_fx( L_shl( Ltmp, exp ) );
-            exp2 = norm_l( Lener );
-            tmp2 = round_fx( L_shl( Lener, exp2 ) );
-#endif
             if ( GT_16( tmp, tmp2 ) )
             {
                 exp = sub( exp, 1 );
@@ -633,17 +574,9 @@ void bass_psfilter_fx(
             tmp2 = sub( tmp2, 1 + 4 ); /* substract 1 because 'Lener' is divided by two */
             tmp2 = add( tmp2, Q_syn2x );
             tmp2 = s_max( 0, s_min( 30, tmp2 ) );
-#ifdef BASOP_NOGLOB
             Lener = L_add_sat( Lener, Pow2( tmp2, exp2 ) );
-#else
-            Lener = L_add( Lener, Pow2( tmp2, exp2 ) );
-#endif
             exp2 = norm_l( Lener );
-#ifdef BASOP_NOGLOB
             tmp2 = round_fx_sat( L_shl( Lener, exp2 ) );
-#else
-            tmp2 = round_fx( L_shl( Lener, exp2 ) );
-#endif
             if ( GT_16( tmp, tmp2 ) )
             {
                 exp = sub( exp, 1 );
@@ -675,11 +608,7 @@ void bass_psfilter_fx(
             This sum is divided by 4 */
             FOR( i = 0; i < subfr_len; i++ )
             {
-#ifdef BASOP_NOGLOB
                 Lener = L_mac0_sat( Lener, err[i], err[i] ); /* Q31 */
-#else
-                Lener = L_mac0( Lener, err[i], err[i] );
-#endif
             }
             exp2 = -1 - 2;
             move16();
@@ -691,11 +620,7 @@ void bass_psfilter_fx(
                 FOR( i = 0; i < subfr_len / 2; i++ )
                 {
                     Lener0 = L_mult0( sigPtr[i], sigPtr[i] ); /* Q31 */
-#ifdef BASOP_NOGLOB
                     Lener = L_add_sat( Lener, L_shr( L_mac0_sat( Lener0, err[i], err[i] ), 5 ) );
-#else
-                    Lener = L_add( Lener, L_shr( L_mac0( Lener0, err[i], err[i] ), 5 ) );
-#endif
                 }
                 exp2 = sub( exp2, 5 );
             }
@@ -798,15 +723,9 @@ static Word16 Pit_track_fx(               /* o  : Pitch											*/
         Lcorr0 = L_mult0( *v1++, *v2++ ); /* Q31 */
         FOR( i = 1; i < ( ( L_HALFR16k + NBPSF_L_EXTRA ) / 14 ); i++ )
         {
-#ifdef BASOP_NOGLOB
             Lener0 = L_mac0_sat( Lener0, *v1, *v1 );     /* Q31 */
             Ltmp0 = L_mac0_sat( Ltmp0, *v2, *v2 );       /* Q31 */
             Lcorr0 = L_mac0_sat( Lcorr0, *v1++, *v2++ ); /* Q31 */
-#else
-            Lener0 = L_mac0( Lener0, *v1, *v1 );
-            Ltmp0 = L_mac0( Ltmp0, *v2, *v2 );
-            Lcorr0 = L_mac0( Lcorr0, *v1++, *v2++ );
-#endif
         }
         BASOP_SATURATE_WARNING_ON_EVS
         test();
@@ -846,11 +765,7 @@ static Word16 Pit_track_fx(               /* o  : Pitch											*/
     exp1 = norm_l( Lener );
     exp2 = norm_l( Ltmp );
     /* Multiply the Most Significant 16 bits */
-#ifdef BASOP_NOGLOB
     Ltmp = L_mult0( round_fx_sat( L_shl_sat( Lener, exp1 ) ), round_fx_sat( L_shl_sat( Ltmp, exp2 ) ) ); /* Q31 */
-#else
-    Ltmp = L_mult0( round_fx( L_shl( Lener, exp1 ) ), round_fx( L_shl( Ltmp, exp2 ) ) );
-#endif
     exp1 = add( exp1, exp2 );
     /* Correct if Odd # of Shifts */
     exp2 = s_and( exp1, 1 );
@@ -868,11 +783,7 @@ static Word16 Pit_track_fx(               /* o  : Pitch											*/
     exp1 = sub( exp1, exp2 );
     Ltmp = Mpy_32_16_1( Lcorr, round_fx( Ltmp ) );
     /* Go to Q31 */
-#ifdef BASOP_NOGLOB
     Ltmp = L_shl_sat( Ltmp, exp1 );
-#else
-    Ltmp = L_shl( Ltmp, exp1 );
-#endif
     /* cn = normalized correlation of pitch/2 */
     if ( GT_32( Ltmp, 2040109466L ) ) /* 0.95f in Q31 */
     {
@@ -930,14 +841,7 @@ void addBassPostFilter_fx(
     }
 
     /* do the CLDFB anlysis of filtered signal */
-    cldfbAnalysisFiltering( cldfbBank_bpf_Fx,
-                            tmp_R_Fx,
-                            tmp_I_Fx,
-                            &scale,
-                            harm_timeIn_Fx,
-                            timeIn_e,
-                            nTimeSlots,
-                            workBuffer );
+    cldfbAnalysis_fx( cldfbBank_bpf_Fx, tmp_R_Fx, tmp_I_Fx, &scale, harm_timeIn_Fx, timeIn_e, nTimeSlots, workBuffer );
 
     /* now do the subtraction */
 
@@ -982,108 +886,241 @@ void addBassPostFilter_fx(
     return;
 }
 
-#ifdef ADD_BPF_ADAPT
 /*---------------------------------------------------------------------*
- * res_bpf_adapt()
+ * addBassPostFilter()
+ *
+ * Add BPF component in cldfb domain
+ *---------------------------------------------------------------------*/
+
+
+void addBassPostFilter_ivas_fx(
+    const Word32 *harm_timeIn_fx, // Qx
+    const Word16 samplesToProcess,
+    Word32 **rAnalysis_fx, // Qx - 5
+    Word32 **iAnalysis_fx, // Qx - 5
+    HANDLE_CLDFB_FILTER_BANK cldfb )
+{
+    Word32 *tmp_R_fx[CLDFB_NO_COL_MAX];
+    Word32 *tmp_I_fx[CLDFB_NO_COL_MAX];
+    Word32 cldfbBufferReal_fx[CLDFB_NO_COL_MAX][20];
+    Word32 cldfbBufferImag_fx[CLDFB_NO_COL_MAX][20];
+    Word16 i, b;
+    Word16 maxBand;
+    const Word32 *weights_fx;
+    Word16 nCol = cldfb->no_col;
+    move16();
+    Word16 nColToProcess = nCol;
+    move16();
+    Word16 nChan = cldfb->no_channels;
+    move16();
+    IF( GT_16( samplesToProcess, -1 ) )
+    {
+        nColToProcess = idiv1616( sub( add( samplesToProcess, cldfb->no_channels ), 1 ), cldfb->no_channels );
+        move16();
+    }
+
+    assert( nCol == 16 );
+
+    weights_fx = bpf_weights_16_ivas_fx_32;
+
+    IF( GT_16( nChan, BPF_STOP_STOPBAND_16 ) )
+    {
+        maxBand = BPF_STOP_STOPBAND_16;
+        move16();
+    }
+    ELSE
+    {
+        maxBand = nChan;
+        move16();
+    }
+
+    FOR( i = 0; i < nColToProcess; i++ )
+    {
+        tmp_R_fx[i] = cldfbBufferReal_fx[i];
+        tmp_I_fx[i] = cldfbBufferImag_fx[i];
+    }
+
+    cldfbAnalysis_ivas_fx( harm_timeIn_fx, tmp_R_fx, tmp_I_fx, samplesToProcess, cldfb );
+
+    /* now do the subtraction */
+    FOR( i = 0; i < nColToProcess; i++ )
+    {
+        /* loop over low frequency bands */
+        FOR( b = 0; b < maxBand; b++ )
+        {
+            rAnalysis_fx[i][b] = Msub_32_32( rAnalysis_fx[i][b], tmp_R_fx[i][b], weights_fx[b] ); // Qx - 6
+            move32();
+            iAnalysis_fx[i][b] = Msub_32_32( iAnalysis_fx[i][b], tmp_I_fx[i][b], weights_fx[b] ); // Qx - 6
+            move32();
+        }
+    }
+
+    return;
+}
+
+
+/*---------------------------------------------------------------------*
+ * res_bpf_adapt_ivas_fx()
  *
  * Analyze BPF output and decide if it should be applied on DFT stereo
  * residual signal
  *---------------------------------------------------------------------*/
 
 /*! r: Decision to enable or disable BPF on DFT stereo residual */
-int16_t res_bpf_adapt(
+Word16 res_bpf_adapt_ivas_fx(
     STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */
-    const float *bpf_error_signal_8k,      /* i  : BPF modification signal   */
-    float res_buf[STEREO_DFT_BUF_MAX]      /* i  : residual buffer           */
-)
+    const Word32 *bpf_error_signal_8k,     /* i  : BPF modification signal   */
+    Word32 res_buf[STEREO_DFT_N_8k],       /* i  : residual buffer Q12       */
+    Word16 q_res )
 {
-    float error_nrg;
-    float tmp;
-    float res_hb_nrg;
-    float bpf_error_ratio;
-    int16_t res_bpf_flag;
-    int16_t i;
-    int16_t i_start;
-    int16_t i_end;
-    float bw_inv;
-
-    if ( hStereoDft->res_cod_band_max == 6 )
+    Word32 error_nrg;
+    Word32 tmp;
+    Word32 res_hb_nrg;
+    Word16 bpf_error_ratio;
+    Word16 res_bpf_flag;
+    Word16 i;
+    Word16 i_start;
+    Word16 i_end;
+    Word16 bw_inv;
+    Word64 W_tmp;
+
+    IF( EQ_16( hStereoDft->res_cod_band_max, 6 ) )
     {
         i_start = 39;
+        move16();
         i_end = 64;
-        bw_inv = 0.04f; /* 1/(64 - 39) */
+        move16();
+        bw_inv = 1311;
+        move16(); /* 1/(64 - 39) in Q15 */
     }
-    else
+    ELSE
     {
         i_start = 28;
+        move16();
         i_end = 40;
-        bw_inv = 0.083f; /* 1/(40 - 28) */
+        move16();
+        bw_inv = 2720;
+        move16(); /* 1/(40 - 28) in Q15*/
     }
 
     /* Measure energy of high frequency band in MDCT domain */
-    res_hb_nrg = EPSILON;
-    for ( i = i_start; i < i_end; i++ )
+    res_hb_nrg = L_deposit_l( 0 );
+    W_tmp = W_deposit32_l( 0 );
+    FOR( i = i_start; i < i_end; i++ )
     {
-        res_hb_nrg += res_buf[i] * res_buf[i];
+        W_tmp = W_add_nosat( W_tmp, W_mult0_32_32( res_buf[i], res_buf[i] ) );
     }
-    res_hb_nrg *= bw_inv;
-    res_hb_nrg = STEREO_DFT_BPF_ADAPT_ALPHA * res_hb_nrg + ( 1 - STEREO_DFT_BPF_ADAPT_ALPHA ) * hStereoDft->res_hb_nrg_mem;
-    hStereoDft->res_hb_nrg_mem = res_hb_nrg;
+
+    res_hb_nrg = W_extract_l( W_shr( W_tmp, shl( q_res, 1 ) ) ); // Q0
+    res_hb_nrg = Mpy_32_16_1( res_hb_nrg, bw_inv );              // Q0
+    res_hb_nrg = L_add( Mpy_32_16_1( res_hb_nrg, STEREO_DFT_BPF_ADAPT_ALPHA_FX ), Mpy_32_16_1( hStereoDft->res_hb_nrg_mem_fx, sub( MAX_16, STEREO_DFT_BPF_ADAPT_ALPHA_FX ) ) );
+    hStereoDft->res_hb_nrg_mem_fx = res_hb_nrg;
+    move32();
 
     /* Measure energy of discontinuities at subframe boundaries */
     error_nrg = 0;
-    for ( i = 0; i < L_FRAME8k; i += STEREO_DFT_L_SUBFR_8k )
+    move32();
+    FOR( i = 0; i < L_FRAME8k; i += STEREO_DFT_L_SUBFR_8k )
+    {
+        tmp = L_sub( bpf_error_signal_8k[i], hStereoDft->bpf_error_signal_last_fx );
+        error_nrg = Madd_32_32( error_nrg, tmp, tmp );
+        hStereoDft->bpf_error_signal_last_fx = bpf_error_signal_8k[( i + ( STEREO_DFT_L_SUBFR_8k - 1 ) )];
+        move32();
+    }
+    error_nrg = L_shl( error_nrg, 1 );                            // Q0
+    error_nrg = Mpy_32_16_1( error_nrg, 6553 /* 0.2f in Q15 */ ); /* Division by 5 for average value */
+    /* Form decision variable and apply limit */
+    IF( LT_32( ( L_shr( error_nrg, 1 ) ), res_hb_nrg ) )
     {
-        tmp = bpf_error_signal_8k[i] - hStereoDft->bpf_error_signal_last;
-        error_nrg += tmp * tmp;
-        hStereoDft->bpf_error_signal_last = bpf_error_signal_8k[i + STEREO_DFT_L_SUBFR_8k - 1];
+        Word16 temp;
+        bpf_error_ratio = BASOP_Util_Divide3232_Scale( error_nrg, res_hb_nrg, &temp );
+        bpf_error_ratio = shl( bpf_error_ratio, sub( 13, sub( 15, temp ) ) );
+    }
+    ELSE
+    {
+        bpf_error_ratio = ONE_IN_Q14; // Q13
+        move16();
     }
-    error_nrg *= 0.2f;                                  /* Division by 5 for average value */
-    bpf_error_ratio = min( 2, error_nrg / res_hb_nrg ); /* Form decision variable and apply limit */
-    bpf_error_ratio = STEREO_DFT_BPF_ADAPT_BETA * bpf_error_ratio + ( 1 - STEREO_DFT_BPF_ADAPT_BETA ) * hStereoDft->bpf_error_ratio_mem;
-    hStereoDft->bpf_error_ratio_mem = bpf_error_ratio;
+    bpf_error_ratio = add( mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), mult( ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx ) );
+    hStereoDft->bpf_error_ratio_mem_fx = bpf_error_ratio;
+    move16();
 
-    res_bpf_flag = bpf_error_ratio < 1;
+    res_bpf_flag = (Word16) LT_16( bpf_error_ratio, ONE_IN_Q13 );
+    move16();
 
     return res_bpf_flag;
 }
 
-/*---------------------------------------------------------------------*
- * bpf_pitch_coherence()
- *
- * Analyse pitch coherence
- *---------------------------------------------------------------------*/
-void bpf_pitch_coherence(
-    Decoder_State *st,      /* i/o: decoder state structure            */
-    const float pitch_buf[] /* i  : pitch for every subfr [0,1,2,3]    */
+void bpf_pitch_coherence_ivas_fx(
+    Decoder_State *st,       /* i/o: decoder state structure            */
+    const Word32 pitch_buf[] /* i  : pitch for every subfr [0,1,2,3]   Q20 */
 )
 {
-    int16_t nb_subfr;
-    float pc, pcn1, pcn2, pcn3;
-
-    nb_subfr = st->L_frame / L_SUBFR;
+    Word16 nb_subfr;
+    Word32 pc, pcn1, pcn2, pcn3;
+    Word32 scaled_inv_L_frame; // Q8 + Q23
 
-    if ( st->clas_dec > UNVOICED_CLAS && st->element_mode != EVS_MONO )
+    SWITCH( st->L_frame )
     {
-        pc = (float) fabs( st->old_pitch_buf[nb_subfr + 3] + st->old_pitch_buf[nb_subfr + 2] - st->old_pitch_buf[nb_subfr] - st->old_pitch_buf[nb_subfr + 1] ) * 256.0f / (float) st->L_frame;
-        pcn1 = K_PC_DEC * pc + C_PC_DEC;
-        pcn1 = max( min( pcn1, 1.0f ), 0.0f );
-
-        pc = (float) fabs( pitch_buf[nb_subfr - 1] + pitch_buf[nb_subfr - 2] - pitch_buf[1] - pitch_buf[0] ) * 256.0f / (float) st->L_frame;
-        pcn2 = K_PC_DEC * pc + C_PC_DEC;
-        pcn2 = max( min( pcn2, 1.0f ), 0.0f );
-
-        pc = (float) fabs( st->old_pitch_buf[nb_subfr + 3] + st->old_pitch_buf[nb_subfr + 2] - pitch_buf[1] - pitch_buf[0] ) * 256.0f / (float) st->L_frame;
-        pcn3 = K_PC_DEC * pc + C_PC_DEC;
-        pcn3 = max( min( pcn3, 1.0f ), 0.0f );
+        case 80:
+            scaled_inv_L_frame = 26843545; // 1/80 in Q31
+            move32();
+            BREAK;
+        case 160:
+            scaled_inv_L_frame = 13421773; // 1/160 in Q31
+            move32();
+            BREAK;
+        case 256:
+            scaled_inv_L_frame = 8388608; // 1/256 in Q31
+            move32();
+            BREAK;
+        case 320:
+            scaled_inv_L_frame = 6710886; // 1/320 in Q31
+            move32();
+            BREAK;
+        case 512:
+            scaled_inv_L_frame = 4194304; // 1/512 in Q31
+            move32();
+            BREAK;
+        case 640:
+            scaled_inv_L_frame = 3355443; // 1/640 in Q31
+            move32();
+            BREAK;
+        case 960:
+            scaled_inv_L_frame = 2236962; // 1/80 in Q31
+            move32();
+            BREAK;
+        default:
+            scaled_inv_L_frame = 0;
+            move32();
+    }
 
-        if ( pcn1 + pcn2 + pcn3 < 2.5f )
+    nb_subfr = shr( st->L_frame, 6 );
+    test();
+    IF( GT_16( st->clas_dec, UNVOICED_CLAS ) && ( st->element_mode != EVS_MONO ) )
+    {
+        pc = L_abs( L_sub( L_add( st->old_pitch_buf_fx[nb_subfr + 3], st->old_pitch_buf_fx[nb_subfr + 2] ), L_add( st->old_pitch_buf_fx[nb_subfr], st->old_pitch_buf_fx[nb_subfr + 1] ) ) );
+        pc = Mpy_32_32( pc, scaled_inv_L_frame );
+        pcn1 = L_add( Mpy_32_32( pc, K_PC_DEC_FX32 ), C_PC_DEC_FX );
+        pcn1 = L_max( L_min( pcn1, 4096 ), 0 ); // 4096 = 1 in Q12
+
+        pc = L_abs( L_sub( L_add( pitch_buf[nb_subfr - 1], pitch_buf[nb_subfr - 2] ), L_add( pitch_buf[1], pitch_buf[0] ) ) );
+        pc = Mpy_32_32( pc, scaled_inv_L_frame );
+        pcn2 = L_add( Mpy_32_32( pc, K_PC_DEC_FX32 ), C_PC_DEC_FX );
+        pcn2 = L_max( L_min( pcn2, 4096 ), 0 ); // 4096 = 1 in Q12
+
+        pc = L_abs( L_sub( L_add( st->old_pitch_buf_fx[nb_subfr + 3], st->old_pitch_buf_fx[nb_subfr + 2] ), L_add( pitch_buf[1], pitch_buf[0] ) ) );
+        pc = Mpy_32_32( pc, scaled_inv_L_frame );
+        pcn3 = L_add( Mpy_32_32( pc, K_PC_DEC_FX32 ), C_PC_DEC_FX );
+        pcn3 = L_max( L_min( pcn3, 4096 ), 0 ); // 4096 = 1 in Q12
+
+        IF( LT_32( L_add( pcn1, L_add( pcn2, pcn3 ) ), 10240 /*2.5f in Q12*/ ) )
         {
-            st->hBPF->psf_att = 0.4f;
-            set_s( &st->hBPF->Track_on_hist[L_TRACK_HIST - nb_subfr], 1, nb_subfr );
+            st->hBPF->psf_att_fx = 13107; //.4 in Q15
+            move16();                     /*Q15*/
+            set16_fx( &st->hBPF->Track_on_hist[L_TRACK_HIST - nb_subfr], 1, nb_subfr );
         }
     }
 
     return;
 }
-#endif
diff --git a/lib_dec/cng_dec.c b/lib_dec/cng_dec.c
deleted file mode 100644
index 515dd295af034fe7645af8028d29af3c3cb69e33..0000000000000000000000000000000000000000
--- a/lib_dec/cng_dec.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "ivas_cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
diff --git a/lib_dec/cng_dec_fx.c b/lib_dec/cng_dec_fx.c
index 1ca8f8ac3e10d50b7a0038defbcbcc27f9196aba..fdb6488db8232ce7f77edebb2a5ea5fbb61a84b6 100644
--- a/lib_dec/cng_dec_fx.c
+++ b/lib_dec/cng_dec_fx.c
@@ -6,7 +6,6 @@
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_cnst.h"
 
@@ -23,713 +22,19 @@ static void shb_CNG_decod_fx( Decoder_State *st_fx, const Word16 *synth_fx, Word
 static void shb_CNG_decod_ivas_fx( Decoder_State *st_fx, const Word16 *synth_fx, Word16 *shb_synth_fx, const Word16 sid_bw, const Word16 Qsyn );
 
 /*-----------------------------------------------------------------*
- * Decode residual signal energy
- *-----------------------------------------------------------------*/
-
-void CNG_dec_fx(
-    Decoder_State *st_fx,           /* i/o: State structure                          */
-    const Word16 last_element_mode, /* i  : last element mode                    Q0   */
-    Word16 Aq[],                    /* o  : LP coefficients                     Q12  */
-    Word16 *lsp_new,                /* i/o: current frame LSPs                  Q15  */
-    Word16 *lsf_new,                /* i/o: current frame LSFs                  Qlog2(2.56) */
-    Word16 *allow_cn_step,          /* o  : allow CN step                       Q0   */
-    Word16 *sid_bw                  /* i  : 0-NB/WB, 1-SWB SID                  Q0   */
-    ,
-    Word32 *q_env )
-{
-    Word16 istep;
-    Word16 i, L_enr_index;
-    Word32 L_ener;
-    Word16 ener_fra, ener_int;
-    Word16 num_bits;
-    Word16 weights, ptr, j, k;
-    Word16 m1;
-    Word16 m = 0;
-    move16();
-    Word16 tmp[HO_HIST_SIZE * M];
-    Word16 burst_ho_cnt = 0;
-    move16();
-    Word16 ll, s_ptr;
-    Word32 L_enr, L_tmp1;
-    Word16 tmp1, exp;
-    Word16 lsf_tmp[M];
-    Word32 C[M];
-    Word32 max_val[2];
-    Word16 max_idx[2];
-    Word16 ftmp_fx;
-    Word16 lsp_tmp[M];
-    Word16 dev;
-    Word16 max_dev;
-    Word16 dist;
-    Word16 tmpv;
-    Word16 env_idx[2];
-    Word32 enr1;
-    Word32 env[NUM_ENV_CNG];
-    Word32 tmp_env[HO_HIST_SIZE * NUM_ENV_CNG];
-    Word32 L_tmp;
-    Word16 fra;
-    Word16 temp_lo_fx, temp_hi_fx;
-    Word16 exp_pow;
-    Word16 tmp_loop;
-    Word16 enr_new, Aq_tmp[M + 1];
-
-    Word16 LSF_Q_prediction; /* o  : LSF prediction mode - just temporary variable in CNG                */
-    TD_CNG_DEC_HANDLE hTdCngDec;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-    hTdCngDec = st_fx->hTdCngDec;
-
-    m = 0;
-    move16();
-    /*-----------------------------------------------------------------*
-     * Decode CNG spectral envelope (only in SID frame)
-     *-----------------------------------------------------------------*/
-    test();
-    IF( EQ_32( st_fx->core_brate, SID_1k75 ) || EQ_32( st_fx->core_brate, SID_2k40 ) )
-    {
-        /* de-quantize the LSF vector */
-        IF( st_fx->Opt_AMR_WB != 0 )
-        {
-            /* Flt function */
-            isf_dec_amr_wb_fx( st_fx, Aq, lsf_new, lsp_new );
-            /* check IF ISPs  may trigger too much synthesis energy */
-
-            E_LPC_f_isp_a_conversion( lsp_new, Aq_tmp, M );
-            enr_new = Enr_1_Az_fx( Aq_tmp, 2 * L_SUBFR );
-
-            IF( ( shr( enr_new, 14 ) > 0 ) )
-            {
-                /* Use old LSP vector */
-                Copy( st_fx->lsp_old_fx, lsp_new, M ); /* Q15 */
-                Copy( st_fx->lsf_old_fx, lsf_new, M ); /* Q2.56 */
-            }
-        }
-        ELSE
-        {
-            lsf_dec_fx( st_fx, 0, Aq, &LSF_Q_prediction, lsf_new, lsp_new, 0, 0,
-                        NULL );
-            /* check IF LSPs  may trigger too much synthesis energy */
-
-            E_LPC_f_lsp_a_conversion( lsp_new, Aq_tmp, M );
-            enr_new = Enr_1_Az_fx( Aq_tmp, 2 * L_SUBFR );
-
-            IF( shr( enr_new, 14 ) > 0 )
-            {
-                /* Use old LSP vector */
-                Copy( st_fx->lsp_old_fx, lsp_new, M ); /* Q15 */
-                Copy( st_fx->lsf_old_fx, lsf_new, M ); /* Q2.56 */
-            }
-        }
-    }
-    ELSE
-    {
-        /* Use old LSP vector */
-        Copy( st_fx->lsp_old_fx, lsp_new, M ); /* Q15 */
-        Copy( st_fx->lsf_old_fx, lsf_new, M ); /* Q2.56 */
-    }
-
-    /* Initialize the CNG spectral envelope in case of the very first CNG frame */
-    IF( st_fx->first_CNG == 0 )
-    {
-        Copy( st_fx->lsp_old_fx, st_fx->lspCNG_fx, M ); /* Q15 */
-    }
-
-    /*-----------------------------------------------------------------*
-     * Decode residual signal energy
-     *-----------------------------------------------------------------*/
-
-    *allow_cn_step = 0;
-    move16();
-    test();
-    IF( EQ_32( st_fx->core_brate, SID_1k75 ) || EQ_32( st_fx->core_brate, SID_2k40 ) )
-    {
-        istep = ISTEP_AMR_WB_SID_FX; /* Q15 */
-        move16();
-        if ( EQ_32( st_fx->core_brate, SID_2k40 ) )
-        {
-            istep = ISTEP_SID_FX; /* Q15 */
-            move16();
-        }
-
-        /* initialize the energy quantization parameters */
-        num_bits = 6;
-        move16();
-        if ( st_fx->Opt_AMR_WB == 0 )
-        {
-            num_bits = 7;
-            move16();
-        }
-
-        /* decode the energy index */
-        L_enr_index = get_next_indice_fx( st_fx, num_bits );
-
-        IF( LE_32( st_fx->last_core_brate, SID_2k40 ) || EQ_16( st_fx->prev_bfi, 1 ) )
-        {
-            tmp1 = add( hTdCngDec->old_enr_index, 20 );
-        }
-        ELSE
-        {
-            tmp1 = add( hTdCngDec->old_enr_index, 40 );
-        }
-        IF( GT_16( L_enr_index, tmp1 ) && hTdCngDec->old_enr_index >= 0 ) /* Likely bit error and not startup */
-        {
-            L_enr_index = tmp1;
-            move16();
-            L_enr_index = s_min( L_enr_index, 127 ); /* Q0 */
-            IF( st_fx->Opt_AMR_WB )
-            {
-                L_enr_index = s_min( L_enr_index, 63 ); /* Q0 */
-            }
-        }
-
-        test();
-        test();
-        test();
-        IF( GT_32( st_fx->last_core_brate, SID_1k75 ) &&
-            NE_16( st_fx->first_CNG, 0 ) &&
-            GE_16( hTdCngDec->old_enr_index, 0 ) &&
-            GT_16( L_enr_index, add( hTdCngDec->old_enr_index, 1 ) ) )
-        {
-            *allow_cn_step = 1;
-            move16();
-        }
-
-        hTdCngDec->old_enr_index = L_enr_index;
-        move16();
-        if ( !L_enr_index )
-        {
-            L_enr_index = -5;
-            move16();
-        }
-        /* st_fx->Enew = L_enr_index / step - 2.0f;*/
-        L_ener = L_mult( L_enr_index, istep ); /* Q16 (0+15) */
-        /* subtract by 2 not done to leave Energy in Q2 */
-
-        /* extract integral and fractional parts */
-        ener_fra = L_Extract_lc( L_ener, &ener_int );
-        ener_int = add( ener_int, 4 ); /* Q2 to Q6 */
-
-        /* find the new energy value */
-        hTdCngDec->Enew_fx = Pow2( ener_int, ener_fra );
-        move32();
-
-        IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
-        {
-            burst_ho_cnt = get_next_indice_fx( st_fx, 3 ); /* 3bit */
-
-            *sid_bw = get_next_indice_fx( st_fx, 1 );
-            move16();
-            IF( *sid_bw == 0 )
-            {
-                env_idx[0] = get_next_indice_fx( st_fx, 6 );
-                move16();
-
-                /* get quantized res_env_details */
-                FOR( i = 0; i < NUM_ENV_CNG; i++ )
-                {
-                    q_env[i] = L_deposit_l( CNG_details_codebook_fx[env_idx[0]][i] );
-                    move32();
-                }
-            }
-        }
-        /* Reset CNG history IF CNG frame length is changed */
-        test();
-        test();
-        IF( EQ_16( st_fx->bwidth, WB ) && NE_16( st_fx->first_CNG, 0 ) && NE_16( st_fx->L_frame, st_fx->last_CNG_L_frame ) )
-        {
-            hTdCngDec->ho_hist_size = 0;
-            move16();
-        }
-    }
-
-    /*---------------------------------------------------------------------*
-     * CNG spectral envelope update
-     * Find A(z) coefficients
-     *---------------------------------------------------------------------*/
-    test();
-    test();
-    test();
-    IF( LE_32( st_fx->last_core_brate, SID_2k40 ) )
-    {
-        /* Reset hangover counter if not first SID period */
-        if ( GT_32( st_fx->core_brate, FRAME_NO_DATA ) )
-        {
-            hTdCngDec->num_ho = 0;
-            move16();
-        }
-        /* Update LSPs IF last SID energy not outliers or insufficient number of hangover frames */
-        test();
-        IF( LT_16( hTdCngDec->num_ho, 3 ) || LT_32( Mult_32_16( hTdCngDec->Enew_fx, 21845 /*1/1.5f, Q15*/ ), st_fx->lp_ener_fx ) )
-        {
-            FOR( i = 0; i < M; i++ )
-            {
-                /* AR low-pass filter  */
-                st_fx->lspCNG_fx[i] = mac_r( L_mult( CNG_ISF_FACT_FX, st_fx->lspCNG_fx[i] ), 32768 - CNG_ISF_FACT_FX, lsp_new[i] );
-                move16(); /* Q15 (15+15+1-16) */
-            }
-        }
-    }
-    ELSE
-    {
-        /* Update CNG_mode IF allowed */
-        test();
-        test();
-        test();
-        IF( ( st_fx->Opt_AMR_WB || EQ_16( st_fx->bwidth, WB ) ) && ( !st_fx->first_CNG || GE_16( hTdCngDec->act_cnt2, MIN_ACT_CNG_UPD ) ) )
-        {
-            IF( GT_32( st_fx->last_active_brate, ACELP_16k40 ) )
-            {
-                st_fx->CNG_mode = -1;
-                move16();
-            }
-            ELSE
-            {
-                st_fx->CNG_mode = get_cng_mode( st_fx->last_active_brate );
-                move16();
-            }
-        }
-
-        /* If first sid after active burst update LSF history from circ buffer */
-        burst_ho_cnt = s_min( burst_ho_cnt, hTdCngDec->ho_circ_size ); /* MODE1_DTX_IN_CODEC_B_FIX   Q0*/
-        hTdCngDec->act_cnt = 0;
-        move16();
-        s_ptr = add( sub( hTdCngDec->ho_circ_ptr, burst_ho_cnt ), 1 );
-        IF( s_ptr < 0 )
-        {
-            s_ptr = add( s_ptr, hTdCngDec->ho_circ_size );
-        }
-
-        FOR( ll = burst_ho_cnt; ll > 0; ll-- )
-        {
-            hTdCngDec->ho_hist_ptr = add( hTdCngDec->ho_hist_ptr, 1 ); /* Q0 */
-            move16();
-            if ( EQ_16( hTdCngDec->ho_hist_ptr, HO_HIST_SIZE ) )
-            {
-                hTdCngDec->ho_hist_ptr = 0;
-                move16();
-            }
-
-            /* Conversion between 12.8k and 16k LSPs */
-            test();
-            test();
-            test();
-            IF( ( EQ_16( st_fx->L_frame, L_FRAME16k ) && hTdCngDec->ho_16k_lsp[s_ptr] == 0 ) || ( EQ_16( st_fx->L_frame, L_FRAME ) && EQ_16( hTdCngDec->ho_16k_lsp[s_ptr], 1 ) ) )
-            {
-                /* Conversion from 16k LPSs to 12k8 */
-                lsp_convert_poly_fx( &( hTdCngDec->ho_lsp_circ_fx[s_ptr * M] ), st_fx->L_frame, 0 );
-            }
-            /* update the circular buffers */
-            Copy( &( hTdCngDec->ho_lsp_circ_fx[s_ptr * M] ), &( hTdCngDec->ho_lsp_hist_fx[hTdCngDec->ho_hist_ptr * M] ), M ); /* Qx */
-            Copy32( &( hTdCngDec->ho_ener_circ_fx[s_ptr] ), &( hTdCngDec->ho_ener_hist_fx[hTdCngDec->ho_hist_ptr] ), 1 );     /* Q6 */
-            hTdCngDec->ho_sid_bw = L_shl( L_and( hTdCngDec->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
-            move32();
-            Copy32( &( hTdCngDec->ho_env_circ_fx[s_ptr * NUM_ENV_CNG] ), &( hTdCngDec->ho_env_hist_fx[hTdCngDec->ho_hist_ptr * NUM_ENV_CNG] ), NUM_ENV_CNG ); /* Qx */
-
-            hTdCngDec->ho_hist_size = add( hTdCngDec->ho_hist_size, 1 );
-            move16();
-
-            if ( GT_16( hTdCngDec->ho_hist_size, HO_HIST_SIZE ) )
-            {
-                hTdCngDec->ho_hist_size = HO_HIST_SIZE;
-                move16();
-            }
-
-            s_ptr = add( s_ptr, 1 );
-            if ( EQ_16( s_ptr, hTdCngDec->ho_circ_size ) )
-            {
-                s_ptr = 0;
-                move16();
-            }
-        }
-
-        IF( hTdCngDec->ho_hist_size > 0 ) /* can be -1 at init    MODE1_DTX_IN_CODEC_B_FIX    */
-        {
-            /* *allow_cn_step |= ( st_fx->ho_ener_hist[st_fx->ho_hist_ptr] > 4.0f * st_fx->lp_ener );*/
-            L_tmp1 = L_shr( hTdCngDec->ho_ener_hist_fx[hTdCngDec->ho_hist_ptr], 2 );
-            L_tmp1 = L_sub( L_tmp1, st_fx->lp_ener_fx );
-
-            test();
-            test();
-            IF( ( L_tmp1 > 0 && ( st_fx->first_CNG || st_fx->element_mode == EVS_MONO ) ) )
-            {
-                *allow_cn_step = s_or( *allow_cn_step, 1 );
-                move16();
-            }
-        }
-        IF( EQ_16( last_element_mode, IVAS_CPE_TD ) )
-        {
-            *allow_cn_step = 1;
-            move16();
-        }
-        test();
-        IF( EQ_16( *allow_cn_step, 0 ) && GT_16( hTdCngDec->ho_hist_size, 0 ) )
-        {
-            /* Use average of energies below last energy */
-            ptr = hTdCngDec->ho_hist_ptr;
-            move16();
-            Copy( &( hTdCngDec->ho_lsp_hist_fx[ptr * M] ), tmp, M ); /* Qx */
-            m1 = 0;
-            move16();
-            IF( L_and( hTdCngDec->ho_sid_bw, (Word32) 0x1 ) == 0 )
-            {
-                Copy32( &hTdCngDec->ho_env_hist_fx[ptr * NUM_ENV_CNG], tmp_env, NUM_ENV_CNG );
-                m1 = 1;
-                move16();
-            }
-            L_enr = Mult_32_16( hTdCngDec->ho_ener_hist_fx[ptr], W_DTX_HO_FX[0] ); /* Q6+15-15->Q6 */
-
-            weights = W_DTX_HO_FX[0]; /* Q15 */
-            move16();
-
-            m = 1;
-            move16();
-            FOR( k = 1; k < hTdCngDec->ho_hist_size; k++ )
-            {
-                ptr--;
-                if ( ptr < 0 )
-                {
-                    ptr = HO_HIST_SIZE - 1;
-                    move16();
-                }
-
-                test();
-                IF( LT_32( Mult_32_16( hTdCngDec->ho_ener_hist_fx[ptr], ONE_OVER_BUF_H_NRG_FX ), hTdCngDec->ho_ener_hist_fx[hTdCngDec->ho_hist_ptr] ) &&
-                    GT_32( hTdCngDec->ho_ener_hist_fx[ptr], Mult_32_16( hTdCngDec->ho_ener_hist_fx[hTdCngDec->ho_hist_ptr], BUF_L_NRG_FX ) ) )
-                {
-                    /*enr += W_DTX_HO[k] * st_fx->ho_ener_hist[ptr];*/
-                    L_tmp1 = Mult_32_16( hTdCngDec->ho_ener_hist_fx[ptr], W_DTX_HO_FX[k] ); /* Q6+15-15->Q6 */
-                    L_enr = L_add( L_enr, L_tmp1 );                                         /* Q6 */
-
-                    /*weights += W_DTX_HO[k];*/
-                    weights = add( weights, W_DTX_HO_FX[k] ); /* Q15 */
-
-                    Copy( &hTdCngDec->ho_lsp_hist_fx[ptr * M], &tmp[m * M], M ); /* Qx */
-                    IF( EQ_32( L_and( hTdCngDec->ho_sid_bw, L_shl( (Word32) 0x1, k ) ), 0 ) )
-                    {
-                        Copy32( &hTdCngDec->ho_env_hist_fx[ptr * NUM_ENV_CNG], &tmp_env[m1 * NUM_ENV_CNG], NUM_ENV_CNG ); /* Qx */
-                        m1++;
-                    }
-                    m++;
-                }
-            }
-
-            /*enr /= weights;*/
-            exp = norm_s( weights );
-            tmp1 = div_s( shl( 1, sub( 14, exp ) ), weights ); /* Q(15+14-exp-15) */
-            L_tmp1 = Mult_32_16( L_enr, tmp1 );                /* Q(14-exp+6-15)->Q(5-exp) */
-            L_enr = L_shl( L_tmp1, add( exp, 1 ) );            /* Q6 */
-
-            st_fx->lp_ener_fx = L_enr; /* Q6 */
-            move32();
-            set32_fx( max_val, 0, 2 );
-            set16_fx( max_idx, 0, 2 );
-
-            FOR( i = 0; i < m; i++ )
-            {
-                IF( EQ_16( st_fx->L_frame, L_FRAME ) )
-                {
-                    lsp2lsf_fx( &tmp[i * M], lsf_tmp, M, INT_FS_FX );
-                    ftmp_fx = 964;
-                    move16();                                            /*X2.56 */
-                    tmpv = sub( 16384, add( lsf_tmp[M - 1], ftmp_fx ) ); /*QX2.56*/
-                    L_tmp = L_mult0( tmpv, tmpv );                       /*QX6.5536*/
-                }
-                ELSE
-                {
-                    lsp2lsf_fx( &tmp[i * M], lsf_tmp, M, INT_FS_16k_FX );
-                    ftmp_fx = 1205;
-                    move16();                                            /*QX2.56*/
-                    tmpv = sub( 20480, add( lsf_tmp[M - 1], ftmp_fx ) ); /*QX2.56*/
-                    L_tmp = L_mult0( tmpv, tmpv );                       /*QX6.5536*/
-                }
-
-                tmpv = sub( lsf_tmp[0], ftmp_fx );   /*QX2.56*/
-                L_tmp = L_mac0( L_tmp, tmpv, tmpv ); /*QX6.5536*/
-                FOR( j = 0; j < M - 1; j++ )
-                {
-                    tmpv = sub( sub( lsf_tmp[j + 1], lsf_tmp[j] ), ftmp_fx ); /*QX2.56*/
-                    L_tmp = L_mac0( L_tmp, tmpv, tmpv );                      /*QX6.5536*/
-                }
-
-                C[i] = Mpy_32_16_1( L_tmp, 1928 ); /*QX6.5536*/
-                move32();
-
-                IF( GT_32( C[i], max_val[0] ) )
-                {
-                    max_val[1] = max_val[0];
-                    move32();
-                    max_idx[1] = max_idx[0];
-                    move16();
-                    max_val[0] = C[i];
-                    move32();
-                    max_idx[0] = i;
-                    move16();
-                }
-                ELSE IF( GT_32( C[i], max_val[1] ) )
-                {
-                    max_val[1] = C[i];
-                    move32();
-                    max_idx[1] = i;
-                    move16();
-                }
-            }
-
-            IF( EQ_16( m, 1 ) )
-            {
-                Copy( tmp, lsp_tmp, M ); /* Qx */
-            }
-            ELSE IF( LT_16( m, 4 ) )
-            {
-                FOR( i = 0; i < M; i++ )
-                {
-                    L_tmp1 = 0;
-                    move32();
-                    FOR( j = 0; j < m; j++ )
-                    {
-                        L_tmp1 = L_add( L_tmp1, L_deposit_l( tmp[j * M + i] ) );
-                    }
-
-                    L_tmp1 = L_sub( L_tmp1, L_deposit_l( tmp[max_idx[0] * M + i] ) );
-                    tmpv = div_s( 1, sub( m, 1 ) );       /*Q15*/
-                    L_tmp1 = Mpy_32_16_1( L_tmp1, tmpv ); /*Q15*/
-                    lsp_tmp[i] = extract_l( L_tmp1 );     /*Q15*/
-                    move16();
-                }
-            }
-            ELSE
-            {
-                FOR( i = 0; i < M; i++ )
-                {
-                    L_tmp1 = 0;
-                    move32();
-                    FOR( j = 0; j < m; j++ )
-                    {
-                        L_tmp1 = L_add( L_tmp1, L_deposit_l( tmp[j * M + i] ) );
-                    }
-
-                    L_tmp1 = L_sub( L_tmp1, L_add( L_deposit_l( tmp[max_idx[0] * M + i] ), L_deposit_l( tmp[max_idx[1] * M + i] ) ) ); /*Q15*/
-                    tmpv = div_s( 1, sub( m, 2 ) );                                                                                    /*Q15*/
-                    L_tmp1 = Mpy_32_16_1( L_tmp1, tmpv );                                                                              /*Q15*/
-                    lsp_tmp[i] = extract_l( L_tmp1 );                                                                                  /*Q15*/
-                    move16();
-                }
-            }
-
-            dist = 0;
-            move16(); /*Q15*/
-            max_dev = 0;
-            move16(); /*Q15*/
-            FOR( i = 0; i < M; i++ )
-            {
-                dev = abs_s( sub( lsp_tmp[i], lsp_new[i] ) ); /*Q15*/
-#ifdef BASOP_NOGLOB
-                dist = add_o( dist, dev, &Overflow ); /*Q15*/
-#else
-                dist = add( dist, dev ); /*Q15*/
-#endif
-                if ( GT_16( dev, max_dev ) )
-                {
-                    max_dev = dev;
-                    move16();
-                }
-            }
-
-            test();
-            IF( GT_16( dist, 13107 ) || GT_16( max_dev, 3277 ) ) /* 0.4 and 0.1 in Q15 */
-            {
-                FOR( i = 0; i < M; i++ )
-                {
-                    st_fx->lspCNG_fx[i] = lsp_tmp[i];
-                    move16(); /*Q15*/
-                }
-            }
-            ELSE
-            {
-                FOR( i = 0; i < M; i++ )
-                {
-                    /* AR low-pass filter  */
-                    st_fx->lspCNG_fx[i] = add( mult_r( 26214, lsp_tmp[i] ), mult_r( 6554, lsp_new[i] ) ); /* Q15 */
-                    move16();
-                }
-            }
-            IF( m1 > 0 )
-            {
-                FOR( i = 0; i < NUM_ENV_CNG; i++ )
-                {
-                    L_tmp = L_deposit_l( 0 );
-                    FOR( j = 0; j < m1; j++ )
-                    {
-                        /* env[i] += tmp_env[j*NUM_ENV_CNG+i];*/
-#ifdef BASOP_NOGLOB
-                        L_tmp = L_add_sat( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#else
-                        L_tmp = L_add( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#endif
-                    }
-                    /*    env[i] /= (float)m1;  */
-                    /*    env[i] = env[i] - 2*st_fx->lp_ener_fx; */
-                    IF( EQ_16( m1, 1 ) )
-                    {
-#ifdef BASOP_NOGLOB
-                        L_tmp = L_sub_sat( L_tmp, L_add_sat( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) ); /* Q6 */
-#else
-                        L_tmp = L_sub( L_tmp, L_add( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) );
-#endif
-                    }
-                    ELSE
-                    {
-                        tmp1 = div_s( 1, m1 );
-                        L_tmp = Mult_32_16( L_tmp, tmp1 ); /* Q6 */
-#ifdef BASOP_NOGLOB
-                        L_tmp = L_sub_sat( L_tmp, L_add_sat( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) ); /* Q6 */
-#else
-                        L_tmp = L_sub( L_tmp, L_add( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) );
-#endif
-                    }
-                    env[i] = L_tmp; /* Q6 */
-                    move32();
-                }
-
-                Copy32( env, hTdCngDec->lp_env_fx, NUM_ENV_CNG ); /* Q6 */
-            }
-        }
-        ELSE
-        {
-            Copy( lsp_new, st_fx->lspCNG_fx, M ); /* use newly analyzed ISFs */ /* Q15 */
-        }
-    }
-
-    test();
-    IF( EQ_32( st_fx->core_brate, SID_1k75 ) || EQ_32( st_fx->core_brate, SID_2k40 ) )
-    {
-        /* Update hangover memory during CNG */
-        test();
-#ifdef BASOP_NOGLOB
-        IF( ( *allow_cn_step == 0 ) && LT_32( hTdCngDec->Enew_fx, L_add_sat( st_fx->lp_ener_fx, L_shr( st_fx->lp_ener_fx, 1 ) ) ) )
-#else
-        IF( *allow_cn_step == 0 && LT_32( hTdCngDec->Enew_fx, L_add( st_fx->lp_ener_fx, L_shr( st_fx->lp_ener_fx, 1 ) ) ) )
-#endif
-        {
-            /* update the pointer to circular buffer of old LSP vectors */
-            hTdCngDec->ho_hist_ptr++;
-            move16();
-            if ( EQ_16( hTdCngDec->ho_hist_ptr, HO_HIST_SIZE ) )
-            {
-                hTdCngDec->ho_hist_ptr = 0;
-                move16();
-            }
-
-            /* update the circular buffer of old LSP vectors with the new LSP vector */
-            Copy( lsp_new, &( hTdCngDec->ho_lsp_hist_fx[( hTdCngDec->ho_hist_ptr ) * M] ), M ); /* Q15 */
-
-            /* update the hangover energy buffer */
-            hTdCngDec->ho_ener_hist_fx[hTdCngDec->ho_hist_ptr] = hTdCngDec->Enew_fx; /* Q6 */
-            move32();
-            test();
-            IF( EQ_32( st_fx->core_brate, SID_2k40 ) && ( *sid_bw == 0 ) )
-            {
-                /*  enr1 = (float)log10( st->Enew*L_frame + 0.1f ) / (float)log10( 2.0f );*/
-                exp = norm_l( hTdCngDec->Enew_fx );
-                L_tmp = L_shl( hTdCngDec->Enew_fx, exp );              /*Q(exp+6)*/
-                L_tmp = Mult_32_16( L_tmp, shl( st_fx->L_frame, 5 ) ); /*Q(exp+6+5-15=exp-4)*/
-#ifdef BASOP_NOGLOB
-                L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) ); /*Q6*/
-#else
-                L_tmp = L_shr( L_tmp, sub( exp, 10 ) ); /*Q6*/
-#endif
-                exp = norm_l( L_tmp );
-                fra = Log2_norm_lc( L_shl( L_tmp, exp ) );
-                exp = sub( sub( 30, exp ), 6 );
-                L_tmp = L_Comp( exp, fra );
-                enr1 = L_shr( L_tmp, 10 ); /* Q6 */
-
-                FOR( i = 0; i < NUM_ENV_CNG; i++ )
-                {
-                    /* get quantized envelope */
-                    /*  env[i] = pow(2.0f,(enr1 - q_env[i])) + 2*st->Enew;*/
-                    L_tmp = L_sub( enr1, q_env[i] ); /* Q6 */
-                    L_tmp = L_shl( L_tmp, 10 );      /* 16 */
-                    temp_lo_fx = L_Extract_lc( L_tmp, &temp_hi_fx );
-
-                    exp_pow = sub( 14, temp_hi_fx );
-                    L_tmp = Pow2( 14, temp_lo_fx );             /* Qexp_pow */
-                    env[i] = L_shl( L_tmp, sub( 6, exp_pow ) ); /* Q6 */
-                    move32();
-                    L_tmp = L_add( hTdCngDec->Enew_fx, hTdCngDec->Enew_fx );
-                    env[i] = L_add( env[i], L_tmp ); /* Q6 */
-                    move32();
-                }
-                hTdCngDec->ho_sid_bw = L_shl( L_and( hTdCngDec->ho_sid_bw, (Word32) 0x3fffffffL ), 1 ); /* Q0 */
-                move32();
-                Copy32( env, &( hTdCngDec->ho_env_hist_fx[hTdCngDec->ho_hist_ptr * NUM_ENV_CNG] ), NUM_ENV_CNG ); /* Q6 */
-            }
-            ELSE IF( ( *sid_bw != 0 ) )
-            {
-                hTdCngDec->ho_sid_bw = L_shl( L_and( hTdCngDec->ho_sid_bw, (Word32) 0x3fffffffL ), 1 ); /* Q0 */
-                move32();
-                hTdCngDec->ho_sid_bw = L_or( hTdCngDec->ho_sid_bw, 0x1L ); /* Q0 */
-                move32();
-            }
-
-            hTdCngDec->ho_hist_size = add( hTdCngDec->ho_hist_size, 1 );
-            move16();
-            if ( GT_16( hTdCngDec->ho_hist_size, HO_HIST_SIZE ) )
-            {
-                hTdCngDec->ho_hist_size = HO_HIST_SIZE;
-                move16();
-            }
-        }
-        /* Update the frame length memory */
-        st_fx->last_CNG_L_frame = st_fx->L_frame;
-        move16();
-
-        if ( NE_32( st_fx->core_brate, SID_1k75 ) )
-        {
-            hTdCngDec->num_ho = m;
-            move16();
-        }
-    }
-
-    IF( st_fx->element_mode == EVS_MONO )
-    {
-        st_fx->last_CNG_L_frame = st_fx->L_frame;
-        move16();
-
-        IF( NE_32( st_fx->core_brate, SID_1k75 ) )
-        {
-            hTdCngDec->num_ho = m;
-            move16();
-        }
-    }
-    IF( st_fx->Opt_AMR_WB )
-    {
-        E_LPC_f_isp_a_conversion( st_fx->lspCNG_fx, Aq, M );
-    }
-    ELSE
-    {
-        E_LPC_f_lsp_a_conversion( st_fx->lspCNG_fx, Aq, M );
-    }
-
-    tmp_loop = shr( st_fx->L_frame, 6 );
-    FOR( i = 1; i < tmp_loop; i++ ) /* L_frame/L_SUBFR */
-    {
-        Copy( Aq, &Aq[i * ( M + 1 )], add( M, 1 ) ); /* Q12 */
-    }
-
-    return;
-}
+ * CNG_dec_fx()
+ *
+ * Decode residual signal energy
+ *-----------------------------------------------------------------*/
 
-void CNG_dec_ivas_fx(
+void CNG_dec_fx(
     Decoder_State *st_fx,           /* i/o: State structure                          */
-    const Word16 last_element_mode, /* i  : last element mode                    Q0   */
+    const Word16 last_element_mode, /* i  : last element mode                    Q0  */
     Word16 Aq[],                    /* o  : LP coefficients                     Q12  */
     Word16 *lsp_new,                /* i/o: current frame LSPs                  Q15  */
     Word16 *lsf_new,                /* i/o: current frame LSFs                  Qlog2(2.56) */
     Word16 *allow_cn_step,          /* o  : allow CN step                       Q0   */
-    Word16 *sid_bw                  /* i  : 0-NB/WB, 1-SWB SID                  Q0   */
-    ,
+    Word16 *sid_bw,                 /* i  : 0-NB/WB, 1-SWB SID                  Q0   */
     Word32 *q_env )
 {
     Word16 istep;
@@ -767,7 +72,6 @@ void CNG_dec_ivas_fx(
     Word16 exp_pow;
     Word16 tmp_loop;
     Word16 enr_new, Aq_tmp[M + 1];
-
     Word16 LSF_Q_prediction; /* o  : LSF prediction mode - just temporary variable in CNG                */
     TD_CNG_DEC_HANDLE hTdCngDec;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
@@ -803,10 +107,9 @@ void CNG_dec_ivas_fx(
         }
         ELSE
         {
-            lsf_dec_ivas_fx( st_fx, 0, Aq, &LSF_Q_prediction, lsf_new, lsp_new, 0, 0,
-                             NULL );
-            /* check IF LSPs  may trigger too much synthesis energy */
+            lsf_dec_fx( st_fx, 0, Aq, &LSF_Q_prediction, lsf_new, lsp_new, 0, 0, NULL );
 
+            /* check IF LSPs  may trigger too much synthesis energy */
             E_LPC_f_lsp_a_conversion( lsp_new, Aq_tmp, M );
             enr_new = Enr_1_Az_fx( Aq_tmp, 2 * L_SUBFR );
 
@@ -1219,11 +522,7 @@ void CNG_dec_ivas_fx(
             FOR( i = 0; i < M; i++ )
             {
                 dev = abs_s( sub( lsp_tmp[i], lsp_new[i] ) ); /*Q15*/
-#ifdef BASOP_NOGLOB
-                dist = add_o( dist, dev, &Overflow ); /*Q15*/
-#else
-                dist = add( dist, dev );                /*Q15*/
-#endif
+                dist = add_o( dist, dev, &Overflow );         /*Q15*/
                 if ( GT_16( dev, max_dev ) )
                 {
                     max_dev = dev;
@@ -1257,31 +556,19 @@ void CNG_dec_ivas_fx(
                     FOR( j = 0; j < m1; j++ )
                     {
                         /* env[i] += tmp_env[j*NUM_ENV_CNG+i];*/
-#ifdef BASOP_NOGLOB
                         L_tmp = L_add_sat( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#else
-                        L_tmp = L_add( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#endif
                     }
                     /*    env[i] /= (float)m1;  */
                     /*    env[i] = env[i] - 2*st_fx->lp_ener_fx; */
                     IF( EQ_16( m1, 1 ) )
                     {
-#ifdef BASOP_NOGLOB
                         L_tmp = L_sub_sat( L_tmp, L_add_sat( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) ); /* Q6 */
-#else
-                        L_tmp = L_sub( L_tmp, L_add( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) );
-#endif
                     }
                     ELSE
                     {
                         tmp1 = div_s( 1, m1 );
-                        L_tmp = Mult_32_16( L_tmp, tmp1 ); /* Q6 */
-#ifdef BASOP_NOGLOB
+                        L_tmp = Mult_32_16( L_tmp, tmp1 );                                             /* Q6 */
                         L_tmp = L_sub_sat( L_tmp, L_add_sat( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) ); /* Q6 */
-#else
-                        L_tmp = L_sub( L_tmp, L_add( st_fx->lp_ener_fx, st_fx->lp_ener_fx ) );
-#endif
                     }
                     env[i] = L_tmp; /* Q6 */
                     move32();
@@ -1301,11 +588,7 @@ void CNG_dec_ivas_fx(
     {
         /* Update hangover memory during CNG */
         test();
-#ifdef BASOP_NOGLOB
         IF( ( *allow_cn_step == 0 ) && LT_32( hTdCngDec->Enew_fx, L_add_sat( st_fx->lp_ener_fx, L_shr( st_fx->lp_ener_fx, 1 ) ) ) )
-#else
-        IF( *allow_cn_step == 0 && LT_32( hTdCngDec->Enew_fx, L_add( st_fx->lp_ener_fx, L_shr( st_fx->lp_ener_fx, 1 ) ) ) )
-#endif
         {
             /* update the pointer to circular buffer of old LSP vectors */
             hTdCngDec->ho_hist_ptr++;
@@ -1329,11 +612,7 @@ void CNG_dec_ivas_fx(
                 exp = norm_l( hTdCngDec->Enew_fx );
                 L_tmp = L_shl( hTdCngDec->Enew_fx, exp );              /*Q(exp+6)*/
                 L_tmp = Mult_32_16( L_tmp, shl( st_fx->L_frame, 5 ) ); /*Q(exp+6+5-15=exp-4)*/
-#ifdef BASOP_NOGLOB
-                L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) ); /*Q6*/
-#else
-                L_tmp = L_shr( L_tmp, sub( exp, 10 ) );                                                                              /*Q6*/
-#endif
+                L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) );            /*Q6*/
                 exp = norm_l( L_tmp );
                 fra = Log2_norm_lc( L_shl( L_tmp, exp ) );
                 exp = sub( sub( 30, exp ), 6 );
@@ -1426,9 +705,8 @@ void swb_CNG_dec_fx(
     Decoder_State *st_fx,   /* i/o: State structure                          */
     const Word16 *synth_fx, /* i  : ACELP core synthesis at 32kHz		 Qsyn*/
     Word16 *shb_synth_fx,   /* o  : high-band CNG synthesis                Qx*/
-    const Word16 sid_bw     /* i  : 0-NB/WB, 1-SWB SID                     Q0*/
-    ,
-    const Word16 Qsyn /* i  : Q value of ACELP core synthesis          */
+    const Word16 sid_bw,    /* i  : 0-NB/WB, 1-SWB SID                     Q0*/
+    const Word16 Qsyn       /* i  : Q value of ACELP core synthesis          */
 )
 {
     test();
@@ -1442,18 +720,18 @@ void swb_CNG_dec_fx(
         }
         st_fx->last_vad_fx = 0;
         move16();
-        st_fx->hTdCngDec->burst_cnt = 0;
+        st_fx->hTdCngDec->burst_cnt_fx = 0;
         move16();
     }
     ELSE
     {
         st_fx->last_vad_fx = 1;
         move16();
-        st_fx->hTdCngDec->burst_cnt = add( st_fx->hTdCngDec->burst_cnt, 1 );
+        st_fx->hTdCngDec->burst_cnt_fx = add( st_fx->hTdCngDec->burst_cnt_fx, 1 );
         move16();
-        if ( GT_16( st_fx->hTdCngDec->burst_cnt, 10 ) )
+        if ( GT_16( st_fx->hTdCngDec->burst_cnt_fx, 10 ) )
         {
-            st_fx->hTdCngDec->burst_cnt = 0;
+            st_fx->hTdCngDec->burst_cnt_fx = 0;
             move16();
         }
     }
@@ -1480,18 +758,18 @@ void swb_CNG_dec_ivas_fx(
         }
         st_fx->last_vad_fx = 0;
         move16();
-        st_fx->hTdCngDec->burst_cnt = 0;
+        st_fx->hTdCngDec->burst_cnt_fx = 0;
         move16();
     }
     ELSE
     {
         st_fx->last_vad_fx = 1;
         move16();
-        st_fx->hTdCngDec->burst_cnt = add_sat( st_fx->hTdCngDec->burst_cnt, 1 ); // saturation reached?
+        st_fx->hTdCngDec->burst_cnt_fx = add_sat( st_fx->hTdCngDec->burst_cnt_fx, 1 ); // saturation reached?
         move16();
-        if ( GT_16( st_fx->hTdCngDec->burst_cnt, 10 ) )
+        if ( GT_16( st_fx->hTdCngDec->burst_cnt_fx, 10 ) )
         {
-            st_fx->hTdCngDec->burst_cnt = 0;
+            st_fx->hTdCngDec->burst_cnt_fx = 0;
             move16();
         }
     }
@@ -1515,6 +793,7 @@ static void shb_CNG_decod_fx(
 {
     Word16 i;
     Word16 idx_ener_fx;
+    TD_CNG_DEC_HANDLE hTdCngDec;
     Word16 shb_lpcCNG_fx[LPC_SHB_ORDER + 1];
     Word16 shb_lspCNG_fx[LPC_SHB_ORDER];
     Word16 excTmp_fx[L_FRAME16k];
@@ -1538,7 +817,9 @@ static void shb_CNG_decod_fx(
     move16();
     Word16 q;
     TD_BWE_DEC_HANDLE hBWE_TD;
+
     hBWE_TD = st_fx->hBWE_TD;
+    hTdCngDec = st_fx->hTdCngDec;
 
     IF( st_fx->bfi == 0 )
     {
@@ -1555,18 +836,12 @@ static void shb_CNG_decod_fx(
             IF( st_fx->element_mode == EVS_MONO )
             {
                 /* de-quantization of SHB CNG parameters */
-                L_tmp = L_mult( idx_ener_fx, 27400 );                                          /*Q14  */
-                st_fx->last_shb_cng_ener_fx = extract_l( L_shr( L_sub( L_tmp, 295924 ), 6 ) ); /*Q8 */
+                L_tmp = L_mult( idx_ener_fx, 27400 );                                              /*Q14  */
+                hTdCngDec->last_shb_cng_ener_fx = extract_l( L_shr( L_sub( L_tmp, 295924 ), 6 ) ); /*Q8 */
                 move16();
             }
             ELSE
             {
-#ifdef IVAS_CODE_CNG
-                /* de-quantization of SHB CNG parameters */ To be verified
-                    L_tmp = L_mult( idx_ener_fx, 17615 );                                      /*Q13*/
-                st_fx->last_shb_cng_ener_fx = extract_l( L_shr( L_sub( L_tmp, 147962 ), 5 ) ); /*Q8 */
-                move16();
-#endif
             }
         }
     }
@@ -1574,25 +849,21 @@ static void shb_CNG_decod_fx(
     /* SHB spectrum estimation */
 
 
-    interp_fx = s_min( st_fx->shb_dtx_count_fx, 32 );
-#ifdef BASOP_NOGLOB
+    interp_fx = s_min( hTdCngDec->shb_dtx_count_fx, 32 );
     interp_fx = shl_sat( interp_fx, 10 ); /*Q15*/
-#else
-    interp_fx = shl( interp_fx, 10 );                                                                                                /*Q15*/
-#endif
     FOR( i = 0; i < LPC_SHB_ORDER; i++ )
     {
-        tmp2 = mult( interp_fx, st_fx->lsp_shb_prev_fx[i] );                   /*Q14*/
-        tmp = mult( sub( 32767, interp_fx ), st_fx->lsp_shb_prev_prev_fx[i] ); /*Q14*/
+        tmp2 = mult( interp_fx, hTdCngDec->lsp_shb_prev_fx[i] );                   /*Q14*/
+        tmp = mult( sub( 32767, interp_fx ), hTdCngDec->lsp_shb_prev_prev_fx[i] ); /*Q14*/
         shb_lspCNG_fx[i] = add( tmp2, tmp );
         move16(); /*Q14*/
     }
 
     IF( NE_16( st_fx->element_mode, IVAS_CPE_DFT ) )
     {
-        if ( LT_16( st_fx->shb_dtx_count_fx, 1000 ) )
+        if ( LT_16( hTdCngDec->shb_dtx_count_fx, 1000 ) )
         {
-            st_fx->shb_dtx_count_fx = add( st_fx->shb_dtx_count_fx, 1 );
+            hTdCngDec->shb_dtx_count_fx = add( hTdCngDec->shb_dtx_count_fx, 1 );
             move16();
         }
     }
@@ -1601,9 +872,6 @@ static void shb_CNG_decod_fx(
 
     Copy_Scale_sig( shb_lpcCNG_fx, shb_lpcCNG_fx, LPC_SHB_ORDER + 1, sub( norm_s( shb_lpcCNG_fx[0] ), 2 ) ); /* Q12 */
 
-#ifdef IVAS_CODE_CNG
-    // mvr2r(shb_lpcCNG, st->hTdCngDec->shb_lpcCNG, LPC_SHB_ORDER + 1);
-#endif
     /* SHB energy estimation */
     wb_ener_fx = L_deposit_l( 1 ); /*Q1 */
     FOR( i = 0; i < L_FRAME32k; i++ )
@@ -1617,10 +885,10 @@ static void shb_CNG_decod_fx(
     wb_ener16_fx = round_fx( L_shl( wb_ener_fx, 10 ) ); /*wb_ener_fx in Q8 */
     if ( !st_fx->first_CNG )
     {
-        st_fx->wb_cng_ener_fx = wb_ener16_fx;
+        hTdCngDec->wb_cng_ener_fx = wb_ener16_fx;
         move16(); /*Q8 */
     }
-    if ( GT_16( abs_s( sub( wb_ener16_fx, st_fx->wb_cng_ener_fx ) ), 3072 ) )
+    if ( GT_16( abs_s( sub( wb_ener16_fx, hTdCngDec->wb_cng_ener_fx ) ), 3072 ) )
     {
         allow_cn_step_fx = 1;
         move16();
@@ -1628,52 +896,52 @@ static void shb_CNG_decod_fx(
 
     IF( EQ_16( allow_cn_step_fx, 1 ) )
     {
-        st_fx->wb_cng_ener_fx = wb_ener16_fx;
+        hTdCngDec->wb_cng_ener_fx = wb_ener16_fx;
         move16(); /*Q8 */
     }
     ELSE
     {
-        tmp = sub( wb_ener16_fx, st_fx->wb_cng_ener_fx );          /*Q8 */
-        tmp = mult_r( tmp, 29491 );                                /*Q8 */
-        st_fx->wb_cng_ener_fx = add( st_fx->wb_cng_ener_fx, tmp ); /*Q8 */
+        tmp = sub( wb_ener16_fx, hTdCngDec->wb_cng_ener_fx );              /*Q8 */
+        tmp = mult_r( tmp, 29491 );                                        /*Q8 */
+        hTdCngDec->wb_cng_ener_fx = add( hTdCngDec->wb_cng_ener_fx, tmp ); /*Q8 */
         move16();
     }
     test();
     test();
     IF( EQ_32( st_fx->core_brate, SID_2k40 ) && EQ_16( sid_bw, 1 ) && ( st_fx->bfi == 0 ) )
     {
-        st_fx->last_wb_cng_ener_fx = st_fx->wb_cng_ener_fx;
+        hTdCngDec->last_wb_cng_ener_fx = hTdCngDec->wb_cng_ener_fx;
         move16();
 
         if ( !st_fx->first_CNG )
         {
-            st_fx->shb_cng_ener_fx = st_fx->last_shb_cng_ener_fx;
+            hTdCngDec->shb_cng_ener_fx = hTdCngDec->last_shb_cng_ener_fx;
             move16();
         }
     }
 
-    gain_fx = sub( st_fx->wb_cng_ener_fx, st_fx->last_wb_cng_ener_fx ); /* Q8 */
+    gain_fx = sub( hTdCngDec->wb_cng_ener_fx, hTdCngDec->last_wb_cng_ener_fx ); /* Q8 */
     if ( GT_16( gain_fx, 15 ) )
     {
         gain_fx = 15;
         move16();
     }
-    step_fx = sub( add( gain_fx, st_fx->last_shb_cng_ener_fx ), st_fx->shb_cng_ener_fx ); /*Q8 */
+    step_fx = sub( add( gain_fx, hTdCngDec->last_shb_cng_ener_fx ), hTdCngDec->shb_cng_ener_fx ); /*Q8 */
     test();
     IF( EQ_16( allow_cn_step_fx, 1 ) || GT_32( st_fx->last_core_brate, SID_2k40 ) )
     {
-        st_fx->shb_cng_ener_fx = add( st_fx->shb_cng_ener_fx, step_fx ); /* Q8 */
+        hTdCngDec->shb_cng_ener_fx = add( hTdCngDec->shb_cng_ener_fx, step_fx ); /* Q8 */
         move16();
     }
     ELSE
     {
-        st_fx->shb_cng_ener_fx = add( st_fx->shb_cng_ener_fx, mult( 8192, step_fx ) ); /*Q8 */
+        hTdCngDec->shb_cng_ener_fx = add( hTdCngDec->shb_cng_ener_fx, mult( 8192, step_fx ) ); /*Q8 */
         move16();
     }
     /* generate white noise excitation */
     FOR( i = 0; i < L_FRAME16k; i++ )
     {
-        excTmp_fx[i] = shr_r( Random( &st_fx->swb_cng_seed ), 8 );
+        excTmp_fx[i] = shr_r( Random( &hTdCngDec->swb_cng_seed ), 8 );
         move16(); /*Q-8*/
     }
 
@@ -1694,27 +962,23 @@ static void shb_CNG_decod_fx(
     ener_excSHB_fx = round_fx( L_tmp ); /*Qq */
     IF( EQ_16( st_fx->last_vad_fx, 1 ) )
     {
-        st_fx->trans_cnt_fx = 0;
+        hTdCngDec->trans_cnt_fx = 0;
         move16();
         test();
-        IF( GT_16( st_fx->hTdCngDec->burst_cnt, 3 ) && NE_16( st_fx->last_core, HQ_CORE ) )
+        IF( GT_16( hTdCngDec->burst_cnt_fx, 3 ) && NE_16( st_fx->last_core, HQ_CORE ) )
         {
-            st_fx->trans_cnt_fx = 5;
+            hTdCngDec->trans_cnt_fx = 5;
             move16();
         }
     }
 
-    ener_fx = st_fx->shb_cng_ener_fx;
+    ener_fx = hTdCngDec->shb_cng_ener_fx;
     move16(); /*Q8 */
-    IF( st_fx->trans_cnt_fx > 0 )
+    IF( hTdCngDec->trans_cnt_fx > 0 )
     {
-        i = extract_l( L_mult0( st_fx->trans_cnt_fx, 17 ) ); /*Q0 */
-#ifdef BASOP_NOGLOB
-        ener_fx = add_sat( st_fx->shb_cng_ener_fx, mult( sin_table256_fx[i], sub_sat( st_fx->last_shb_ener_fx, st_fx->shb_cng_ener_fx ) ) ); /*Q8 */
-#else
-        ener_fx = add( st_fx->shb_cng_ener_fx, mult( sin_table256_fx[i], sub( st_fx->last_shb_ener_fx, st_fx->shb_cng_ener_fx ) ) ); /*Q8 */
-#endif
-        st_fx->trans_cnt_fx = sub( st_fx->trans_cnt_fx, 1 );
+        i = extract_l( L_mult0( hTdCngDec->trans_cnt_fx, 17 ) );                                                                                         /*Q0 */
+        ener_fx = add_sat( hTdCngDec->shb_cng_ener_fx, mult( sin_table256_fx[i], sub_sat( hTdCngDec->last_shb_ener_fx, hTdCngDec->shb_cng_ener_fx ) ) ); /*Q8 */
+        hTdCngDec->trans_cnt_fx = sub( hTdCngDec->trans_cnt_fx, 1 );
         move16();
     }
 
@@ -1728,11 +992,7 @@ static void shb_CNG_decod_fx(
         move32();
     }
     fra = L_Extract_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_sat( Pow2( exp, fra ), 5 ); /*Q5 */
-#else
-    L_tmp = L_shl( Pow2( exp, fra ), 5 );                                                                                            /*Q5 */
-#endif
     L_tmp = L_shr( L_tmp, 10 );
     if ( !L_tmp )
     {
@@ -1755,9 +1015,7 @@ static void shb_CNG_decod_fx(
     L_tmp = L_deposit_h( tmp ); /*Q31 */
     tmp = sub( add( 5, exp ), add( q, exp1 ) );
     L_gain_fx = Isqrt_lc( L_tmp, &tmp ); /*Q31-Qtmp */
-#ifdef IVAS_CODE_CNG
-    st->hTdCngDec->shb_cng_gain = ener_fx;
-#endif
+
     FOR( i = 0; i < L_FRAME16k; i++ )
     {
         shb_syn16k_fx[i] = extract_l( L_shr( Mpy_32_16_1( L_gain_fx, excSHB_fx[i] ), sub( 5, tmp ) ) ); /*Q3 = 31-Qtmp-8-15-5+Qtmp */
@@ -1770,13 +1028,13 @@ static void shb_CNG_decod_fx(
         /* rescale the Hilbert memories to Q0 */
         FOR( i = 0; i < HILBERT_MEM_SIZE; i++ )
         {
-            hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], st_fx->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
+            hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
             move32();
         }
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
-            hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], st_fx->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
+            hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
             move16();
         }
     }
@@ -1784,13 +1042,10 @@ static void shb_CNG_decod_fx(
 
     IF( EQ_32( st_fx->output_Fs, 48000 ) )
     {
-        interpolate_3_over_2_allpass_fx( shb_synth_fx, L_FRAME32k, shb_synth_fx, st_fx->interpol_3_2_cng_dec_fx, allpass_poles_3_ov_2 );
+        interpolate_3_over_2_allpass_fx( shb_synth_fx, L_FRAME32k, shb_synth_fx, hTdCngDec->interpol_3_2_cng_dec_fx, allpass_poles_3_ov_2 );
     }
-#ifdef IVAS_CODE_CNG
-    ResetSHBbuffer_Dec( st->hBWE_TD, st->extl );
-#else
-    ResetSHBbuffer_Dec_fx( st_fx );
-#endif
+
+    ResetSHBbuffer_Dec_fx( st_fx->hBWE_TD, st_fx->extl );
 
     return;
 }
@@ -1804,6 +1059,7 @@ static void shb_CNG_decod_ivas_fx(
 {
     Word16 i;
     Word16 idx_ener;
+    TD_CNG_DEC_HANDLE hTdCngDec;
     Word16 shb_lpcCNG_fx[LPC_SHB_ORDER + 1];
     Word16 shb_lspCNG_fx[LPC_SHB_ORDER];
     Word16 excTmp_fx[L_FRAME16k];
@@ -1825,7 +1081,9 @@ static void shb_CNG_decod_ivas_fx(
     Word16 allow_cn_step_fx;
     Word16 q;
     TD_BWE_DEC_HANDLE hBWE_TD;
+
     hBWE_TD = st->hBWE_TD;
+    hTdCngDec = st->hTdCngDec;
     allow_cn_step_fx = 0;
     move16();
 
@@ -1845,41 +1103,37 @@ static void shb_CNG_decod_ivas_fx(
             /* de-quantization of SHB CNG parameters */
             IF( st->element_mode == EVS_MONO )
             {
-                st->hTdCngDec->last_shb_cng_ener_fx_32 = L_sub( L_mult0( idx_ener, 6850 ), 36991 ); // Q11
+                hTdCngDec->last_shb_cng_ener_fx_32 = L_sub( L_mult0( idx_ener, 6850 ), 36991 ); // Q11
                 move32();
             }
             ELSE
             {
-                st->hTdCngDec->last_shb_cng_ener_fx_32 = L_sub( L_mult0( idx_ener, 8807 ), 36991 ); // Q11
+                hTdCngDec->last_shb_cng_ener_fx_32 = L_sub( L_mult0( idx_ener, 8807 ), 36991 ); // Q11
                 move32();
             }
         }
     }
 
     /* SHB spectrum estimation */
-    interp_fx = s_min( st->hTdCngDec->shb_dtx_count, 32 );
-#ifdef BASOP_NOGLOB
+    interp_fx = s_min( hTdCngDec->shb_dtx_count_fx, 32 );
     interp_fx = shl_sat( interp_fx, 10 ); /*Q15*/
-#else
-    interp_fx = shl( interp_fx, 10 ); /*Q15*/
-#endif
 
     FOR( i = 0; i < LPC_SHB_ORDER; i++ )
     {
-        shb_lspCNG_fx[i] = add( mult_r( interp_fx, st->hTdCngDec->lsp_shb_prev_fx[i] ), mult_r( sub( 32767, interp_fx ), st->hTdCngDec->lsp_shb_prev_prev_fx[i] ) ); // Q14
+        shb_lspCNG_fx[i] = add( mult_r( interp_fx, hTdCngDec->lsp_shb_prev_fx[i] ), mult_r( sub( 32767, interp_fx ), hTdCngDec->lsp_shb_prev_prev_fx[i] ) ); // Q14
         move16();
     }
 
-    IF( LE_16( st->hTdCngDec->shb_dtx_count, 1000 ) )
+    IF( LE_16( hTdCngDec->shb_dtx_count_fx, 1000 ) )
     {
-        st->hTdCngDec->shb_dtx_count = add( st->hTdCngDec->shb_dtx_count, 1 );
+        hTdCngDec->shb_dtx_count_fx = add( hTdCngDec->shb_dtx_count_fx, 1 );
         move16();
     }
 
     E_LPC_lsf_lsp_conversion( shb_lspCNG_fx, tmp_lsp, LPC_SHB_ORDER ); /*Q14*/
     E_LPC_f_lsp_a_conversion( tmp_lsp, shb_lpcCNG_fx, LPC_SHB_ORDER );
 
-    Copy_Scale_sig( shb_lpcCNG_fx, st->hTdCngDec->shb_lpcCNG_fx, LPC_SHB_ORDER + 1, sub( norm_s( shb_lpcCNG_fx[0] ), -1 ) ); /* Q15 */
+    Copy_Scale_sig( shb_lpcCNG_fx, hTdCngDec->shb_lpcCNG_fx, LPC_SHB_ORDER + 1, sub( norm_s( shb_lpcCNG_fx[0] ), -1 ) ); /* Q15 */
 
     Copy_Scale_sig( shb_lpcCNG_fx, shb_lpcCNG_fx, LPC_SHB_ORDER + 1, sub( norm_s( shb_lpcCNG_fx[0] ), 2 ) ); /* Q12 */
 
@@ -1900,10 +1154,10 @@ static void shb_CNG_decod_ivas_fx(
     Word32 wb_ener32_fx = L_shl( wb_ener16_fx, 3 );     /*wb_ener_fx in Q11 */
     if ( EQ_16( st->first_CNG, 0 ) )
     {
-        st->hTdCngDec->wb_cng_ener_fx_32 = wb_ener32_fx;
+        hTdCngDec->wb_cng_ener_fx_32 = wb_ener32_fx;
         move32(); /*Q11 */
     }
-    if ( GT_32( L_abs( L_sub( wb_ener32_fx, st->hTdCngDec->wb_cng_ener_fx_32 ) ), 24576 ) ) /* 12.0f in Q11 */
+    if ( GT_32( L_abs( L_sub( wb_ener32_fx, hTdCngDec->wb_cng_ener_fx_32 ) ), 24576 ) ) /* 12.0f in Q11 */
     {
         allow_cn_step_fx = 1;
         move16();
@@ -1911,52 +1165,52 @@ static void shb_CNG_decod_ivas_fx(
 
     IF( EQ_16( allow_cn_step_fx, 1 ) )
     {
-        st->hTdCngDec->wb_cng_ener_fx_32 = wb_ener32_fx;
+        hTdCngDec->wb_cng_ener_fx_32 = wb_ener32_fx;
         move32(); /*Q11 */
     }
     ELSE
     {
-        tmp = L_sub( wb_ener32_fx, st->hTdCngDec->wb_cng_ener_fx_32 );                     /*Q11 */
-        tmp = Mpy_32_16_1( tmp, 29491 );                                                   /*Q11 */
-        st->hTdCngDec->wb_cng_ener_fx_32 = L_add( st->hTdCngDec->wb_cng_ener_fx_32, tmp ); /*Q11 */
+        tmp = L_sub( wb_ener32_fx, hTdCngDec->wb_cng_ener_fx_32 );                 /*Q11 */
+        tmp = Mpy_32_16_1( tmp, 29491 );                                           /*Q11 */
+        hTdCngDec->wb_cng_ener_fx_32 = L_add( hTdCngDec->wb_cng_ener_fx_32, tmp ); /*Q11 */
         move32();
     }
     test();
     test();
     IF( EQ_32( st->core_brate, SID_2k40 ) && EQ_16( sid_bw, 1 ) && EQ_16( st->bfi, 0 ) )
     {
-        st->hTdCngDec->last_wb_cng_ener_fx_32 = st->hTdCngDec->wb_cng_ener_fx_32; /* Q11 */
+        hTdCngDec->last_wb_cng_ener_fx_32 = hTdCngDec->wb_cng_ener_fx_32; /* Q11 */
         move32();
 
         if ( !st->first_CNG )
         {
-            st->hTdCngDec->shb_cng_ener_fx_32 = st->hTdCngDec->last_shb_cng_ener_fx_32; /* Q11 */
+            hTdCngDec->shb_cng_ener_fx_32 = hTdCngDec->last_shb_cng_ener_fx_32; /* Q11 */
             move32();
         }
     }
 
-    gain_fx = L_sub( st->hTdCngDec->wb_cng_ener_fx_32, st->hTdCngDec->last_wb_cng_ener_fx_32 ); /*Q11 */
+    gain_fx = L_sub( hTdCngDec->wb_cng_ener_fx_32, hTdCngDec->last_wb_cng_ener_fx_32 ); /*Q11 */
     if ( GT_32( gain_fx, 30720 ) )
     {
         gain_fx = 30720;
         move32();
     }
-    step_fx = L_sub( L_add( gain_fx, st->hTdCngDec->last_shb_cng_ener_fx_32 ), st->hTdCngDec->shb_cng_ener_fx_32 ); /*Q11 */
+    step_fx = L_sub( L_add( gain_fx, hTdCngDec->last_shb_cng_ener_fx_32 ), hTdCngDec->shb_cng_ener_fx_32 ); /*Q11 */
     test();
     IF( EQ_16( allow_cn_step_fx, 1 ) || GT_32( st->last_core_brate, SID_2k40 ) )
     {
-        st->hTdCngDec->shb_cng_ener_fx_32 = L_add( st->hTdCngDec->shb_cng_ener_fx_32, step_fx ); /* Q11 */
+        hTdCngDec->shb_cng_ener_fx_32 = L_add( hTdCngDec->shb_cng_ener_fx_32, step_fx ); /* Q11 */
         move32();
     }
     ELSE
     {
-        st->hTdCngDec->shb_cng_ener_fx_32 = L_add( st->hTdCngDec->shb_cng_ener_fx_32, L_shr( step_fx, 2 ) ); /*Q11 */
+        hTdCngDec->shb_cng_ener_fx_32 = L_add( hTdCngDec->shb_cng_ener_fx_32, L_shr( step_fx, 2 ) ); /*Q11 */
         move32();
     }
     /* generate white noise excitation */
     FOR( i = 0; i < L_FRAME16k; i++ )
     {
-        excTmp_fx[i] = shr_r( Random( &st->hTdCngDec->swb_cng_seed ), 8 );
+        excTmp_fx[i] = shr_r( Random( &hTdCngDec->swb_cng_seed ), 8 );
         move16(); /*Q-8*/
     }
 
@@ -1975,29 +1229,26 @@ static void shb_CNG_decod_ivas_fx(
     L_tmp = L_shl( L_tmp, q );
     q = sub( q, 32 );
     ener_excSHB_fx = round_fx( L_tmp ); /*Qq */
-#ifdef MSAN_FIX
+
     IF( EQ_16( st->last_vad_fx, 1 ) )
-#else
-    IF( EQ_16( st->last_vad, 1 ) )
-#endif
     {
-        st->hTdCngDec->trans_cnt = 0;
+        hTdCngDec->trans_cnt_fx = 0;
         move16();
         test();
-        if ( GT_16( st->hTdCngDec->burst_cnt, 3 ) && NE_16( st->last_core, HQ_CORE ) )
+        if ( GT_16( hTdCngDec->burst_cnt_fx, 3 ) && NE_16( st->last_core, HQ_CORE ) )
         {
-            st->hTdCngDec->trans_cnt = 5;
+            hTdCngDec->trans_cnt_fx = 5;
             move16();
         }
     }
 
-    ener_fx = st->hTdCngDec->shb_cng_ener_fx_32;
+    ener_fx = hTdCngDec->shb_cng_ener_fx_32;
     move32(); /*Q11 */
-    IF( GT_16( st->hTdCngDec->trans_cnt, 0 ) )
+    IF( GT_16( st->hTdCngDec->trans_cnt_fx, 0 ) )
     {
-        i = extract_l( L_mult0( st->hTdCngDec->trans_cnt, 17 ) );                                                                                                             /*Q0 */
-        ener_fx = L_add( st->hTdCngDec->shb_cng_ener_fx_32, Mpy_32_16_1( L_sub( st->hTdCngDec->last_shb_ener_fx, st->hTdCngDec->shb_cng_ener_fx_32 ), sin_table256_fx[i] ) ); /*Q11 */
-        st->hTdCngDec->trans_cnt = sub( st->hTdCngDec->trans_cnt, 1 );
+        i = extract_l( L_mult0( hTdCngDec->trans_cnt_fx, 17 ) );                                                                                                     /*Q0 */
+        ener_fx = L_add( hTdCngDec->shb_cng_ener_fx_32, Mpy_32_16_1( L_sub( hTdCngDec->last_shb_ener_fx_32, hTdCngDec->shb_cng_ener_fx_32 ), sin_table256_fx[i] ) ); /*Q11 */
+        hTdCngDec->trans_cnt_fx = sub( hTdCngDec->trans_cnt_fx, 1 );
         move16();
     }
 
@@ -2039,7 +1290,7 @@ static void shb_CNG_decod_ivas_fx(
     L_tmp = L_deposit_h( tmp_16 ); /*Q31 */
     tmp_16 = sub( add( 5, exp ), add( q, exp1 ) );
     L_gain_fx = Isqrt_lc( L_tmp, &tmp_16 ); /*Q31-Qtmp */
-    st->hTdCngDec->shb_cng_gain_fx_32 = ener_fx;
+    hTdCngDec->shb_cng_gain_fx_32 = ener_fx;
     move32();
     FOR( i = 0; i < L_FRAME16k; i++ )
     {
@@ -2053,13 +1304,13 @@ static void shb_CNG_decod_ivas_fx(
         /* rescale the Hilbert memories to Q0 */
         FOR( i = 0; i < HILBERT_MEM_SIZE; i++ )
         {
-            hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], st->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
+            hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
             move32();
         }
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
-            hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], st->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
+            hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
             move16();
         }
     }
@@ -2067,11 +1318,13 @@ static void shb_CNG_decod_ivas_fx(
 
     IF( EQ_32( st->output_Fs, 48000 ) )
     {
-        interpolate_3_over_2_allpass_fx( shb_synth_fx, L_FRAME32k, shb_synth_fx, st->interpol_3_2_cng_dec_fx, allpass_poles_3_ov_2 );
+        interpolate_3_over_2_allpass_fx( shb_synth_fx, L_FRAME32k, shb_synth_fx, hTdCngDec->interpol_3_2_cng_dec_fx, allpass_poles_3_ov_2 );
     }
 
     Scale_sig( shb_synth_fx, L_FRAME48k, -3 ); /* Qx - 3 */
-    ResetSHBbuffer_Dec_fx( st );
+
+    ResetSHBbuffer_Dec_fx( st->hBWE_TD, st->extl );
+
     return;
 }
 
@@ -2084,96 +1337,6 @@ static void shb_CNG_decod_ivas_fx(
 void td_cng_dec_init_fx(
     DEC_CORE_HANDLE st /* i/o: decoder state structure     */
 )
-{
-    TD_CNG_DEC_HANDLE hTdCngDec;
-
-    hTdCngDec = st->hTdCngDec;
-
-    hTdCngDec->cng_seed = RANDOM_INITSEED;
-    move16();
-    hTdCngDec->cng_ener_seed = RANDOM_INITSEED;
-    move16();
-    hTdCngDec->cng_ener_seed1 = RANDOM_INITSEED;
-    move16();
-    hTdCngDec->old_enr_index = -1;
-    move16();
-    hTdCngDec->Enew_fx = L_deposit_l( 0 ); /* Q6*/
-    move16();
-    hTdCngDec->last_allow_cn_step = 0;
-    move16();
-#ifdef IVAS_CODE_CNG
-    //    mvr2r(st->lsp_old, st->lspCNG, M);
-    //    hTdCngDec->shb_cng_ener = -6.02f;
-    IF( st->element_mode != EVS_MONO )
-    {
-        // set_f(hTdCngDec->shb_lpcCNG, 0.0f, LPC_SHB_ORDER + 1);
-        // hTdCngDec->shb_lpcCNG[0] = 1.0f;
-        // hTdCngDec->shb_cng_gain = -82.0; /* a  dB value approximately corresponding to  shb  index 0(used as index -15)   */
-    }
-    // hTdCngDec->wb_cng_ener = -6.02f;
-    // hTdCngDec->last_wb_cng_ener = -6.02f;
-    // hTdCngDec->last_shb_cng_ener = -6.02f;
-    // hTdCngDec->swb_cng_seed = RANDOM_INITSEED;
-#endif
-    hTdCngDec->ho_hist_ptr = -1;
-    move16();
-    hTdCngDec->ho_sid_bw = L_deposit_l( 0 );
-    move16();
-    set16_fx( hTdCngDec->ho_lsp_hist_fx, 0, HO_HIST_SIZE * M );
-    set32_fx( hTdCngDec->ho_ener_hist_fx, 0, HO_HIST_SIZE );
-    set32_fx( hTdCngDec->ho_env_hist_fx, 0, HO_HIST_SIZE * NUM_ENV_CNG );
-    hTdCngDec->ho_hist_size = 0;
-    move16();
-    hTdCngDec->act_cnt = 0;
-    move16();
-    hTdCngDec->ho_circ_ptr = -1;
-    move16();
-    set16_fx( hTdCngDec->ho_lsp_circ_fx, 0, HO_HIST_SIZE * M );
-    set32_fx( hTdCngDec->ho_ener_circ_fx, 0, HO_HIST_SIZE );
-    set32_fx( hTdCngDec->ho_env_circ_fx, 0, HO_HIST_SIZE * NUM_ENV_CNG );
-    hTdCngDec->ho_circ_size = 0;
-    move16();
-
-    set16_fx( hTdCngDec->ho_16k_lsp, 0, HO_HIST_SIZE );
-    hTdCngDec->act_cnt2 = 0;
-    move16();
-    hTdCngDec->num_ho = 0;
-    move16();
-    hTdCngDec->last_cng_type_fx = -1;
-    move16();
-    set32_fx( hTdCngDec->lp_env_fx, 0, NUM_ENV_CNG );
-    set16_fx( hTdCngDec->exc_mem_fx, 0, 24 );
-    set16_fx( hTdCngDec->exc_mem1_fx, 0, 30 );
-    set32_fx( hTdCngDec->old_env_fx, 0, NUM_ENV_CNG );
-#ifdef IVAS_CODE_CNG
-    // st->CNG_mode = -1;
-    // for (i = 0; i < LPC_SHB_ORDER; i++)
-    //{
-    //     IF (st->element_mode != EVS_MONO)
-    //     {
-    //         hTdCngDec->lsp_shb_prev[i] = 0.5f * ((float)(i + 1)) / ((float)(LPC_SHB_ORDER + 1));
-    //     }
-    //     else
-    //     {
-    //         hTdCngDec->lsp_shb_prev[i] = 0.5f * ((float)i) / ((float)LPC_SHB_ORDER);
-    //     }
-    //     hTdCngDec->lsp_shb_prev_prev[i] = hTdCngDec->lsp_shb_prev[i];
-    // }
-
-    // hTdCngDec->shb_dtx_count = 0;
-    // hTdCngDec->trans_cnt = 0;
-    // hTdCngDec->last_shb_ener = 0.001f;
-    // set_f(hTdCngDec->interpol_3_2_cng_dec, 0.0f, INTERP_3_2_MEM_LEN);
-#endif
-    hTdCngDec->burst_cnt = 0;
-    move16();
-
-    return;
-}
-
-void td_cng_dec_init_ivas_fx(
-    DEC_CORE_HANDLE st /* i/o: decoder state structure     */
-)
 {
     Word16 i;
     TD_CNG_DEC_HANDLE hTdCngDec;
@@ -2193,6 +1356,8 @@ void td_cng_dec_init_ivas_fx(
     Copy( st->lsp_old_fx, st->lspCNG_fx, M ); // Q(15)
     hTdCngDec->last_allow_cn_step = 0;
     move16();
+    hTdCngDec->shb_cng_ener_fx = -1541; // Q8
+    move16();
     hTdCngDec->shb_cng_ener_fx_32 = -12329; // -6.02 in Q(11)
     move32();
     IF( st->element_mode != EVS_MONO )
@@ -2204,10 +1369,16 @@ void td_cng_dec_init_ivas_fx(
         move32();
     }
 
+    hTdCngDec->wb_cng_ener_fx = -1541; // Q8
+    move16();
     hTdCngDec->wb_cng_ener_fx_32 = -12329; // Q(11)
     move32();
+    hTdCngDec->last_wb_cng_ener_fx = -1541; // Q8
+    move16();
     hTdCngDec->last_wb_cng_ener_fx_32 = -12329; // Q(11)
     move32();
+    hTdCngDec->last_shb_cng_ener_fx = -1541; // Q8
+    move16();
     hTdCngDec->last_shb_cng_ener_fx_32 = -12329; // Q(11)
     move32();
     hTdCngDec->swb_cng_seed = RANDOM_INITSEED;
@@ -2259,17 +1430,18 @@ void td_cng_dec_init_ivas_fx(
         move16();
     }
 
-    hTdCngDec->shb_dtx_count = 0;
+    hTdCngDec->shb_dtx_count_fx = 0;
     move16();
-    hTdCngDec->trans_cnt = 0;
+    hTdCngDec->trans_cnt_fx = 0;
     move16();
-    hTdCngDec->burst_cnt = 0;
+    hTdCngDec->burst_cnt_fx = 0;
     move16();
 
-    hTdCngDec->last_shb_ener_fx = 2; // 0.001 in Q11
+    hTdCngDec->last_shb_ener_fx = 0; // Q8
+    move16();
+    hTdCngDec->last_shb_ener_fx_32 = 2; // 0.001 in Q11
     move32();
 
-
     set16_fx( hTdCngDec->interpol_3_2_cng_dec_fx, 0, INTERP_3_2_MEM_LEN );
 
     return;
diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c
deleted file mode 100644
index 48464fb35ab2a99e1f471e34d301c609a2ab0b8f..0000000000000000000000000000000000000000
--- a/lib_dec/core_dec_init.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "stat_com.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-/*-----------------------------------------------------------------------*
- * open_decoder_LPD()
- *
- * Initialization of state variables
- *-----------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------*
- * tcxltp_dec_init()
- *
- * Initialization TCX-LTP handle
- *-----------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------*
- * reset_tcx_overl_buf()
- *
- * Reset TCX core overlap buffers
- *-----------------------------------------------------------------------*/
-
-void reset_tcx_overl_buf_fx(
-    TCX_DEC_HANDLE hTcxDec /* i/o: TCX decoder handle */
-)
-{
-    set16_fx( hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
-    hTcxDec->Q_old_syn_Overl = 0;
-    move16();
-    set16_fx( hTcxDec->syn_Overl_TDAC, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
-    hTcxDec->Q_syn_Overl_TDAC = 0;
-    move16();
-    set16_fx( hTcxDec->syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
-    hTcxDec->Q_syn_Overl = 0;
-    move16();
-    set16_fx( hTcxDec->syn_Overl_TDACFB, 0, L_FRAME_MAX / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
-    hTcxDec->Q_syn_Overl_TDACFB = 0;
-    move16();
-    return;
-}
-
-/*-----------------------------------------------------------------------*
- * acelp_plc_mdct_transition()
- *
- * Prepare MDCT OLA memories in TCX/HQ after ACELP PLC
- *-----------------------------------------------------------------------*/
diff --git a/lib_dec/core_dec_init_fx.c b/lib_dec/core_dec_init_fx.c
index 671dbfd2ca520671ad8ab10abb004f32f8b055f2..eb34e1bc1e4ad06bdf2fa06d34dfe06806550b3e 100644
--- a/lib_dec/core_dec_init_fx.c
+++ b/lib_dec/core_dec_init_fx.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "basop_util.h"
 #include "rom_com.h"
@@ -21,18 +20,7 @@
 void open_decoder_LPD_fx(
     Decoder_State *st,
     const Word32 total_brate, /* Q0 */
-#ifdef NEW_IVAS_OPEN_DEC
-    const Word32 last_total_brate,
-#endif
-    const Word16 bwidth /* Q0 */
-#ifdef NEW_IVAS_OPEN_DEC
-    ,
-    const Word16 is_mct, /* i  : MCT mode flag                           */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    const Word16 last_element_mode,
-#endif
-    const Word16 is_init /* i  : indicate call from init_decoder() to avoid double TC initialization */
-#endif
+    const Word16 bwidth       /* Q0 */
 )
 {
     Word16 i;
@@ -51,10 +39,8 @@ void open_decoder_LPD_fx(
     hTcxLtpDec = st->hTcxLtpDec;
     hTcxDec = st->hTcxDec;
 
-#ifndef NEW_IVAS_OPEN_DEC
     st->total_brate = total_brate;
     move32();
-#endif
 
     if ( NE_16( st->codec_mode, MODE1 ) ) /*already updated in MODE1*/
     {
@@ -71,40 +57,18 @@ void open_decoder_LPD_fx(
     /* initializing variables for frame lengths etc. right in the beginning */
     st->L_frame = extract_l( Mult_32_16( st->sr_core, 0x0290 ) );
     move16();
-#ifndef NEW_IVAS_OPEN_DEC
     hTcxDec->L_frameTCX = extract_l( Mult_32_16( st->output_Fs, 0x0290 ) );
     move16();
-#endif
     IF( st->ini_frame == 0 )
     {
         st->last_L_frame = st->L_frame_past = st->L_frame;
         move16();
         move16();
-#ifndef NEW_IVAS_OPEN_DEC
         st->L_frameTCX_past = hTcxDec->L_frameTCX;
-#endif
         move16();
     }
-#ifdef NEW_IVAS_OPEN_DEC
-    IF( st->hTcxDec != NULL )
-    {
-        hTcxDec->L_frameTCX = extract_l( Mult_32_16( st->output_Fs, 0x0290 ) );
-        IF( st->ini_frame == 0 )
-        {
-            st->L_frameTCX_past = st->hTcxDec->L_frameTCX;
-            move16();
-        }
-    }
-#endif
     st->tcxonly = getTcxonly(
-#ifdef IVAS_CODE_SWITCHING
-        st->element_mode,
-#endif
         st->total_brate
-#ifdef IVAS_CODE_SWITCHING
-        ,
-        is_mct
-#endif
         /*, st->is_ism_format Needed in the last version of float IVAS */
     );
     move16();
@@ -156,9 +120,6 @@ void open_decoder_LPD_fx(
             // st->pit_res_max = initPitchLagParameters(12800, &st->pit_min, &st->pit_fr1, &st->pit_fr1b, &st->pit_fr2, &st->pit_max);
             // hTcxDec->pit_max_TCX = (int16_t)(st->pit_max * st->output_Fs / 12800);
             // hTcxDec->pit_min_TCX = (int16_t)(st->pit_min * st->output_Fs / 12800);
-#if 0
-            PMT("Fixed point to be verified here")
-#endif
             i = mult_r( hTcxDec->L_frameTCX, getInvFrameLen( L_FRAME ) );             /* Q6 */
             hTcxDec->pit_max_TCX = extract_l( L_shr( L_mult( st->pit_max, i ), 7 ) ); /* Q0 */
             move16();
@@ -244,7 +205,6 @@ void open_decoder_LPD_fx(
     }
 
     /*TCX config*/
-#ifndef NEW_IVAS_OPEN_DEC
     st->hTcxCfg->preemph_fac = st->preemph_fac;
     move16();
     st->hTcxCfg->tcx_mdct_window_length_old = st->hTcxCfg->tcx_mdct_window_length;
@@ -305,34 +265,6 @@ void open_decoder_LPD_fx(
     }
     resetTecDec_Fx( st->hTECDec );
 
-
-#else
-    if ( st->hIGFDec != NULL )
-    {
-        PMT( "To be done" )
-        // IF (!is_init || st->element_mode != IVAS_CPE_MDCT)
-        //{
-        //     init_tcx_cfg(st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag);
-        // }
-        // else
-        //{
-        //     st->hTcxCfg->tcx_curr_overlap_mode = st->hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW;
-        //     st->hTcxCfg->last_aldo = 1;
-        // }
-    }
-    /*Constraint for adaptive BPF, otherwise parameter estimation and post-processing not time aligned*/
-    IF( st->tcxonly == 0 )
-    {
-        assert( 0 == ( st->hTcxCfg->lfacNext > 0 ? st->hTcxCfg->lfacNext : 0 ) );
-    }
-    // IF (st->tecDec_fx != NULL)
-    {
-        resetTecDec_Fx( &( st->tecDec_fx ) );
-    }
-
-#endif
-
-
     /* Initialize decoder delay */
 
 
@@ -448,7 +380,6 @@ void open_decoder_LPD_fx(
             move16();
 
             /*PLC*/
-#ifndef NEW_IVAS_OPEN_DEC
             IF( st->prev_bfi != 0 )
             {
                 PWord16 const *w;
@@ -499,10 +430,6 @@ void open_decoder_LPD_fx(
                 hTcxDec->Q_syn_Overl_TDAC = hHQ_core->Q_old_wtda_LB;
                 move16();
             }
-#else
-            PMT( "acelp_plc_mdct_transition is missing" )
-            // acelp_plc_mdct_transition(st);
-#endif
         }
 
         test();
@@ -546,9 +473,6 @@ void open_decoder_LPD_fx(
                 set16_fx( hTcxDec->syn_Overl_TDAC, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/    /* Q_syn_Overl_TDAC */
                 set16_fx( hTcxDec->syn_Overl_TDACFB, 0, L_FRAME_MAX / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/ /* Q_syn_Overl_TDACFB */
                 set16_fx( hTcxDec->syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/         /* Q_syn_Overl */
-#if 0
-                PMT("to be moved to reset_tcx_overl_buf")
-#endif
             }
             IF( st->hTcxCfg != NULL )
             {
@@ -576,15 +500,6 @@ void open_decoder_LPD_fx(
             cldfb_reset_memory( st->cldfbAna );
             cldfb_reset_memory( st->cldfbBPF );
             cldfb_reset_memory( st->cldfbSyn );
-#ifndef NEW_IVAS_OPEN_DEC
-#if 0
-            PMT("cldfbSynHB is missing ")
-#endif
-            // IF (st->cldfbSynHB != NULL)
-            //{
-            //     cldfb_reset_memory(st->cldfbSynHB);
-            // }
-#endif
         }
         ELSE IF( ( NE_16( st->L_frame, st->last_L_frame ) ) && ( LE_16( st->L_frame, L_FRAME16k ) ) && ( LE_16( st->last_L_frame, L_FRAME16k ) ) ) /* Rate switching between 12.8 and 16 kHz*/
         {
@@ -818,10 +733,6 @@ void open_decoder_LPD_fx(
         test();
         IF( EQ_16( st->core, ACELP_CORE ) && EQ_16( st->last_core, HQ_CORE ) )
         {
-            /*_DIFF_FLOAT_FIX_*/
-#if 0
-            PMT("floating point is using L_frameTCX instead of output_frame, is it ok?")
-#endif
             frame_ener_fx( st->output_frame_fx, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );
         }
     }
@@ -837,24 +748,10 @@ void open_decoder_LPD_fx(
     st->Mode2_lp_gainp = L_deposit_l( 0 ); /* 15Q16 */
     move32();
 
-    st->prev_widow_left_rect = 0;
+    st->hTcxDec->prev_widow_left_rect = 0;
     move16();
     if ( st->hTcxDec != NULL )
     {
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        /* Todo: should be considered for other stereo modes as well */
-        IF( is_init || MCT_flag || !( st->element_mode == IVAS_CPE_MDCT && st->element_mode == last_element_mode ) )
-        {
-            PMT( "Fixed point to be done" )
-            st->hTcxDec->CngLevelBackgroundTrace_bfi = PLC_MIN_CNG_LEV;
-            st->hTcxDec->NoiseLevelIndex_bfi = PLC_MIN_STAT_BUFF_SIZE - 1;
-            st->hTcxDec->CurrLevelIndex_bfi = 0;
-            st->hTcxDec->LastFrameLevel_bfi = PLC_MIN_CNG_LEV;
-            set_f( st->hTcxDec->NoiseLevelMemory_bfi, PLC_MIN_CNG_LEV, PLC_MIN_STAT_BUFF_SIZE );
-
-            st->hTcxDec->cummulative_damping_tcx = 1.0f;
-        }
-#else
         hTcxDec->conCngLevelBackgroundTrace = PLC_MIN_CNG_LEV_Q21; /*Q21*/
         move16();
         hTcxDec->conNoiseLevelIndex = PLC_MIN_STAT_BUFF_SIZE - 1; /* Q0 */
@@ -872,7 +769,6 @@ void open_decoder_LPD_fx(
 
         hTcxDec->cummulative_damping_tcx = 32767 /*1.0f Q15*/;
         move16();
-#endif
     }
     st->cummulative_damping = 32767 /*1.0f Q15*/;
     move16();
@@ -892,10 +788,8 @@ void open_decoder_LPD_fx(
 
     st->old_fpitch = L_deposit_h( st->pit_min );
     move32();
-#ifndef NEW_IVAS_OPEN_DEC
     st->old_fpitchFB = L_deposit_h( hTcxDec->pit_min_TCX );
     move32();
-#endif
     st->rate_switching_init = 1;
     move16();
 
@@ -925,9 +819,6 @@ void open_decoder_LPD_fx(
     test();
     IF( hTcxLtpDec != NULL && ( EQ_16( st->ini_frame, 0 ) || ( EQ_16( st->last_codec_mode, MODE1 ) && st->element_mode == EVS_MONO ) ) )
     {
-#if 0
-        PMT("TO be verify, update seems to differ from float")
-#endif
         hTcxLtpDec->tcxltp_pitch_int = st->pit_max; /* Q0 */
         move16();
         hTcxLtpDec->tcxltp_pitch_fr = 0; /* Q0 */
@@ -1030,33 +921,29 @@ void open_decoder_LPD_fx(
         test();
         IF( EQ_16( st->ini_frame, 0 ) || LT_32( st->last_total_brate, HQ_48k ) || EQ_16( st->last_codec_mode, MODE1 ) || st->force_lpd_reset )
         {
-            concealment_init_x( hTcxDec->L_frameTCX, &st->plcInfo );
+            concealment_init_x( hTcxDec->L_frameTCX, st->hPlcInfo );
         }
     }
 
     /* PLC: [TCX: Tonal Concealment] */
-#if 0
-    PMT("handle to tonalMDCTconceal is missing")
-#endif
-    //#ifdef ADD_IVAS_HTONALMDCTCONC
     test();
     test();
-    IF( /*st->ADD_IVAS_HTONALMDCTCONC != NULL &&*/ !( st->element_mode > EVS_MONO && NE_16( st->ini_frame, 0 ) && EQ_16( st->tonalMDCTconceal.nSamples, st->hTcxDec->L_frameTCX ) ) )
+    IF( st->hTonalMDCTConc != NULL && !( st->element_mode > EVS_MONO && NE_16( st->ini_frame, 0 ) && EQ_16( st->hTonalMDCTConc->nSamples, st->hTcxDec->L_frameTCX ) ) )
     {
-        st->tonalMDCTconceal.nScaleFactors = 0;
+        st->hTonalMDCTConc->nScaleFactors = 0;
         move16();
-        st->tonalMDCTconceal.nSamples = 0;
+        st->hTonalMDCTConc->nSamples = 0;
         move16();
-        st->tonalMDCTconceal.lastPcmOut = 0x0;
+        st->hTonalMDCTConc->lastPcmOut = 0x0;
         move16();
-        st->tonalMDCTconceal.q_lastPcmOut = Q15;
+        st->hTonalMDCTConc->q_lastPcmOut = Q15;
         move16();
-        st->tonalMDCTconceal.lastBlockData.tonalConcealmentActive = 0;
+        st->hTonalMDCTConc->lastBlockData.tonalConcealmentActive = 0;
         move16();
-        st->tonalMDCTconceal.lastBlockData.nSamples = 0;
+        st->hTonalMDCTConc->lastBlockData.nSamples = 0;
         move16();
 
-        TonalMDCTConceal_Init( &st->tonalMDCTconceal, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );
+        TonalMDCTConceal_Init( st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );
     }
     st->last_tns_active = 0;
     move16();
@@ -1064,12 +951,6 @@ void open_decoder_LPD_fx(
     move16();
     st->second_last_core = -1;
     move16();
-#ifdef NEW_IVAS_OPEN_DEC
-    IF( st->hTcxCfg != NULL && st->element_mode != EVS_MONO )
-    {
-        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf );
-    }
-#endif
     IF( hTcxDec != NULL )
     {
         hTcxDec->tcxltp_second_last_pitch = st->old_fpitch; /*15Q16*/
@@ -1110,10 +991,8 @@ void open_decoder_LPD_fx(
         hTcxDec->tcx_hm_LtpPitchLag = -1;
         move16();
     }
-#ifndef NEW_IVAS_OPEN_DEC
     st->hTcxCfg->na_scale = 32767 /*1.0f Q15*/;
     move16();
-#endif
     if ( hTcxLtpDec != NULL )
     {
         hTcxLtpDec->tcxltp_gain = 0; /* Q15 */
@@ -2191,3 +2070,28 @@ void open_decoder_LPD_ivas_fx(
 
     return;
 }
+
+/*-----------------------------------------------------------------------*
+ * reset_tcx_overl_buf()
+ *
+ * Reset TCX core overlap buffers
+ *-----------------------------------------------------------------------*/
+
+void reset_tcx_overl_buf_fx(
+    TCX_DEC_HANDLE hTcxDec /* i/o: TCX decoder handle */
+)
+{
+    set16_fx( hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
+    hTcxDec->Q_old_syn_Overl = 0;
+    move16();
+    set16_fx( hTcxDec->syn_Overl_TDAC, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
+    hTcxDec->Q_syn_Overl_TDAC = 0;
+    move16();
+    set16_fx( hTcxDec->syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
+    hTcxDec->Q_syn_Overl = 0;
+    move16();
+    set16_fx( hTcxDec->syn_Overl_TDACFB, 0, L_FRAME_MAX / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/
+    hTcxDec->Q_syn_Overl_TDACFB = 0;
+    move16();
+    return;
+}
diff --git a/lib_dec/core_dec_reconf.c b/lib_dec/core_dec_reconf.c
deleted file mode 100644
index f8f6d6a6fbe971408dea336364c639a89c470215..0000000000000000000000000000000000000000
--- a/lib_dec/core_dec_reconf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_dec.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
diff --git a/lib_dec/core_dec_switch.c b/lib_dec/core_dec_switch.c
deleted file mode 100644
index 9fb0cf7882be3549e115080f0f158540d6808548..0000000000000000000000000000000000000000
--- a/lib_dec/core_dec_switch.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------*
- * mode_switch_decoder_LPD()
- *
- *
- *-------------------------------------------------------------*/
diff --git a/lib_dec/core_dec_switch_fx.c b/lib_dec/core_dec_switch_fx.c
index c7d2c526574e7a61c710be168e72836de7c5b81b..94b6efb1bd051fd5f71bf9fab7d3a5c68025d7a2 100644
--- a/lib_dec/core_dec_switch_fx.c
+++ b/lib_dec/core_dec_switch_fx.c
@@ -8,24 +8,12 @@
 #include "basop_util.h"
 #include "prot_fx.h"
 #include "rom_com.h"
-#include "prot.h"
 
 void mode_switch_decoder_LPD_fx(
-    Decoder_State *st,  /* i/o: decoder state structure           */
-    Word16 bwidth,      /* i  : audio bandwidth                 Q0*/
-    Word32 total_brate, /* i  : total bitrate                   Q0*/
-#ifdef IVAS_CODE_SWITCHING
-    const Word32 last_total_brate, /* i  : last frame total bitrate        */
-#endif
+    Decoder_State *st,      /* i/o: decoder state structure           */
+    Word16 bwidth,          /* i  : audio bandwidth                 Q0*/
+    Word32 total_brate,     /* i  : total bitrate                   Q0*/
     Word16 frame_size_index /* i  : index determining the frame size  Q0*/
-#ifdef IVAS_CODE_SWITCHING
-    ,
-    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)*/
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    ,
-    const Word16 last_element_mode
-#endif
-#endif
 )
 {
     Word16 fscale, switchWB;
@@ -101,15 +89,7 @@ void mode_switch_decoder_LPD_fx(
     test();
     IF( NE_16( fscale, st->fscale ) || ( switchWB != 0 ) || ( bSwitchFromAmrwbIO != 0 ) || EQ_16( st->last_codec_mode, MODE1 ) || st->force_lpd_reset )
     {
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        open_decoder_LPD_fx( st, total_brate, last_total_brate, bwidth, MCT_flag, last_element_mode, 0 );
-#else
-#ifdef IVAS_CODE
-        open_decoder_LPD_fx( st, total_brate, last_total_brate, bwidth, is_mct, 0 );
-#else
         open_decoder_LPD_fx( st, total_brate, bwidth );
-#endif
-#endif
     }
     ELSE
     {
@@ -154,9 +134,6 @@ void mode_switch_decoder_LPD_fx(
             IF( ( st->hTcxCfg->fIsTNSAllowed != 0 ) && st->hIGFDec != NULL )
             {
                 InitTnsConfigs( bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFDec->infoIGFStopFreq, total_brate, st->element_mode, 0 /* 0 should be replaced with MCT_flag*/ );
-#ifdef IVAS_CODE
-                SetAllowTnsOnWhite( st->hTcxCfg->tnsConfig, st->element_mode == IVAS_CPE_MDCT );
-#endif
             }
         }
     }
@@ -198,11 +175,7 @@ void mode_switch_decoder_LPD_fx(
             ( EQ_16( st->bwidth, SWB ) && NE_16( st->last_extl, SWB_TBE ) ) ||
             ( EQ_16( st->bwidth, FB ) && NE_16( st->last_extl, FB_TBE ) ) )
         {
-#ifdef IVAS_CODE
             TBEreset_dec_fx( st );
-#else
-            TBEreset_dec_fx( st, st->bwidth );
-#endif
         }
         ELSE
         {
@@ -446,7 +419,7 @@ void mode_switch_decoder_LPD_ivas_fx(
             ( EQ_16( st->bwidth, SWB ) && NE_16( st->last_extl, SWB_TBE ) ) ||
             ( EQ_16( st->bwidth, FB ) && NE_16( st->last_extl, FB_TBE ) ) )
         {
-            TBEreset_dec_ivas_fx( st );
+            TBEreset_dec_fx( st );
         }
         ELSE
         {
diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c
deleted file mode 100644
index 323deae0ac32506e8208d09fcd45eb92f04fa50b..0000000000000000000000000000000000000000
--- a/lib_dec/core_switching_dec.c
+++ /dev/null
@@ -1,1072 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_cnst.h"
-#include "wmc_auto.h"
-
-#include "ivas_prot_fx.h"
-#include "debug.h"
-/*---------------------------------------------------------------------*
- * Local prototypes
- *---------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------------*
- * core_switching_pre_dec()
- *
- * Preprocessing/preparation for ACELP/HQ core switching
- *---------------------------------------------------------------------*/
-ivas_error core_switching_pre_dec_ivas_fx(
-    Decoder_State *st,                /* i/o: decoder state structure      */
-    const Word16 output_frame,        /* i  : frame length                 */
-    const Word32 last_core_brate_st0, /* i  : channel 0 last core bitrate  */
-    const Word16 nchan_out,           /* i  : number of output channels    */
-    const Word16 last_element_mode,   /* i  : last_element_mode            */
-    const Word32 last_element_brate,  /* i  : last element bitrate         */
-    Word16 Q_old_synthFB,
-    Word16 *Q_olapBufferSynth,
-    Word16 *Q_olapBufferSynth2 )
-{
-    Word32 tmp_fx; /*Q-12*/
-    Word16 i, oldLenClasBuff, newLenClasBuff;
-    ivas_error error;
-    Word16 exp = 25;
-    move16();
-    error = IVAS_ERR_OK;
-    move32();
-
-    /* Codec mode switching */
-    test();
-    test();
-    test();
-    IF( EQ_16( st->last_codec_mode, MODE2 ) || ( ( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) ) && ( st->element_mode > EVS_MONO ) ) )
-    {
-        st->mem_deemph_fx = st->syn[M];
-        move16();
-        set16_fx( st->agc_mem_fx, 0, 2 );
-        Scale_sig( &( st->mem_deemph_fx ), 1, st->Q_syn ); /* Brings mem_deemph to Qsyn */
-
-        Copy_Scale_sig( st->mem_syn2_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); /*Q-1*/
-
-        st->bpf_off = 1;
-        move16();
-        IF( st->hPFstat != NULL )
-        {
-            Scale_sig( st->hPFstat->mem_pf_in, L_SUBFR, st->Q_syn );    /* Post_filter mem  ,Q_syn*/
-            Scale_sig( st->hPFstat->mem_res2, DECMEM_RES2, st->Q_syn ); /* NB post_filter mem , Q_syn*/
-            Scale_sig( st->hPFstat->mem_stp, L_SUBFR, st->Q_syn );      /* Post_filter mem  ,Q_syn*/
-            set16_fx( st->hBPF->pst_old_syn_fx, 0, NBPSF_PIT_MAX );     /* BPF mem*/
-        }
-        IF( st->hBPF != NULL )
-        {
-            st->hBPF->pst_lp_ener_fx = round_fx( L_shl( Mpy_32_16_1( st->lp_error_ener, 0x6054 ), 2 + 8 ) ); /* convert from 15Q16, log2 -> 7Q8 10*log10  */
-            st->hBPF->pst_mem_deemp_err_fx = 0;
-            move16();
-            move16();
-        }
-        st->psf_lp_noise_fx = round_fx( L_shl( st->lp_noise, 1 ) ); // Q(23+1-16)->Q8
-        move16();
-
-        /* reset old HB synthesis buffer */
-        IF( EQ_16( st->last_L_frame, L_FRAME ) )
-        {
-            st->old_bwe_delay = NS2SA( st->output_Fs, MAX_DELAY_TBE_NS - DELAY_SWB_TBE_12k8_NS );
-        }
-        ELSE
-        {
-            st->old_bwe_delay = NS2SA( st->output_Fs, MAX_DELAY_TBE_NS - DELAY_SWB_TBE_16k_NS );
-        }
-        move16();
-        set16_fx( st->hb_prev_synth_buffer_fx, 0, NS2SA( 48000, DELAY_BWE_TOTAL_NS ) );
-
-        test();
-        IF( st->hBWE_TD != NULL && ( st->last_core != ACELP_CORE ) )
-        {
-#ifdef MSAN_FIX
-            st->hBWE_TD->prev_hb_synth_fx_exp = 31;
-            move16();
-#endif // MSAN_FIX
-            /* reset BWE memories */
-            set16_fx( st->hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-        }
-
-        /* reset upd_cnt */
-        st->upd_cnt = MAX_UPD_CNT;
-        move16();
-
-        st->igf = 0;
-        move16();
-
-        test();
-        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )
-        {
-            hf_synth_reset_fx( st->hBWE_zero );
-#ifdef MSAN_FIX
-            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
-#endif
-        }
-
-        IF( st->hBWE_FD != NULL )
-        {
-            set16_fx( st->hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
-        }
-
-        IF( st->hHQ_core != NULL )
-        {
-            set32_fx( st->hHQ_core->prev_env_fx, 0, SFM_N_WB );
-            set32_fx( st->hHQ_core->prev_normq_fx, 0, SFM_N_WB );
-
-            set32_fx( st->hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
-            set16_fx( st->hHQ_core->last_env_fx, 0, BANDS_MAX );
-
-            st->hHQ_core->last_max_pos_pulse = 0;
-            move16();
-
-            IF( GT_32( st->output_Fs, 16000 ) )
-            {
-                set32_fx( st->hHQ_core->prev_coeff_out_fx, 0, L_HQ_WB_BWE );
-            }
-
-            /* pre-echo */
-            st->hHQ_core->pastpre = 0;
-            move16();
-        }
-
-        /* reset the GSC pre echo energy threshold in case of switching */
-        if ( st->hGSCDec != NULL )
-        {
-            st->hGSCDec->Last_frame_ener_fx = MAX_32;
-            move32();
-        }
-
-        test();
-        IF( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) )
-        {
-            IF( st->element_mode == EVS_MONO )
-            {
-                st->last_core = HQ_CORE;
-                move16();
-
-                Copy32( st->hTcxDec->FBTCXdelayBuf_32, st->prev_synth_buffer32_fx, NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );
-                // Copy_Scale_sig_32_16( st->hTcxDec->FBTCXdelayBuf_32, st->prev_synth_buffer_fx, NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), -11 ); //Q11 -> Q0
-            }
-
-            IF( st->hHQ_core != NULL )
-            {
-                set32_fx( st->hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
-                set16_fx( st->hHQ_core->last_env_fx, 0, BANDS_MAX );
-                st->hHQ_core->last_max_pos_pulse = 0;
-                move16();
-
-                set16_fx( st->hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
-                st->hHQ_core->prev_frm_hfe2 = 0;
-                st->hHQ_core->prev_stab_hfe2 = 0;
-                move16();
-                move16();
-            }
-        }
-
-        IF( st->prev_bfi != 0 )
-        {
-            Word16 delay_comp;
-
-            /*switch off Hq Voicing as it was not updated in MODE2*/
-            IF( st->hHQ_core != NULL )
-            {
-                st->hHQ_core->oldHqVoicing = 0;
-                st->hHQ_core->HqVoicing = 0;
-                move16();
-                move16();
-            }
-
-            delay_comp = NS2SA( st->output_Fs, DELAY_CLDFB_NS );
-            /*TODO To be tested:control not entering the block*/
-            test();
-            test();
-            IF( !st->last_con_tcx && ( st->last_core_bfi == ACELP_CORE ) && EQ_16( st->core, HQ_CORE ) )
-            {
-                /*TODO None of the test dtreams are entering this block,hence enabled assert(0)*/
-                assert( 0 );
-                Word32 *realBuffer_fx[CLDFB_NO_COL_MAX_SWITCH], *imagBuffer_fx[CLDFB_NO_COL_MAX_SWITCH];
-                Word32 realBufferTmp_fx[CLDFB_NO_COL_MAX_SWITCH][CLDFB_NO_CHANNELS_MAX], imagBufferTmp_fx[CLDFB_NO_COL_MAX_SWITCH][CLDFB_NO_CHANNELS_MAX];
-                Word32 syn_Overl_fx[320];
-                Word32 fer_samples_fx[960];
-                Copy_Scale_sig_16_32( st->hTcxDec->syn_Overl, syn_Overl_fx, 320, 15 );
-                Copy_Scale_sig_16_32( st->hHQ_core->fer_samples_fx, fer_samples_fx, 960, 15 );
-
-
-                FOR( i = 0; i < CLDFB_NO_COL_MAX_SWITCH; i++ )
-                {
-                    set32_fx( realBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
-                    set32_fx( imagBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
-                    realBuffer_fx[i] = realBufferTmp_fx[i];
-                    imagBuffer_fx[i] = imagBufferTmp_fx[i];
-                }
-
-                /* CLDFB analysis of the synthesis at internal sampling rate */
-                IF( NE_32( ( error = cldfb_save_memory_ivas_fx( st->cldfbAna ) ), IVAS_ERR_OK ) )
-                {
-                    return error;
-                }
-
-                cldfbAnalysis_ivas_fx( syn_Overl_fx, realBuffer_fx, imagBuffer_fx, delay_comp, st->cldfbAna );
-                cldfb_restore_memory_ivas_fx( st->cldfbAna ); /*Assuming Q10*/
-
-                /* CLDFB synthesis of the combined signal */
-                IF( NE_32( ( error = cldfb_save_memory_ivas_fx( st->cldfbSyn ) ), IVAS_ERR_OK ) )
-                {
-                    return error;
-                }
-
-                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, fer_samples_fx, delay_comp, st->cldfbSyn );
-                cldfb_restore_memory_ivas_fx( st->cldfbSyn );
-                Copy_Scale_sig_32_16( syn_Overl_fx, st->hTcxDec->syn_Overl, 320, 15 );
-                Copy_Scale_sig_32_16( fer_samples_fx, st->hHQ_core->fer_samples_fx, 960, 9 );
-            }
-
-            test();
-            test();
-            IF( !st->last_con_tcx && ( st->last_core_bfi == ACELP_CORE ) && EQ_16( st->core, HQ_CORE ) )
-            {
-                lerp( st->hTcxDec->syn_Overl, st->hHQ_core->fer_samples_fx + delay_comp, shr( output_frame, 1 ), shr( st->last_L_frame, 1 ) );
-                /*Set to zero the remaining part*/
-                set16_fx( st->hHQ_core->fer_samples_fx + delay_comp + output_frame / 2, 0, sub( shr( output_frame, 1 ), delay_comp ) );
-            }
-        }
-
-        st->use_acelp_preq = 0;
-        st->reset_mem_AR = 0;
-        move16();
-        move16();
-    }
-
-    /*FEC*/
-    IF( LE_16( st->L_frame, L_FRAME16k ) )
-    {
-        test();
-        IF( LE_16( st->last_L_frame, L_FRAME16k ) && NE_16( st->core, HQ_CORE ) )
-        {
-            IF( NE_16( st->L_frame, st->last_L_frame ) )
-            {
-                IF( GT_16( st->L_frame, st->last_L_frame ) )
-                {
-                    oldLenClasBuff = mult_r( L_SYN_MEM_CLAS_ESTIM, div_s( st->last_L_frame, st->L_frame ) );
-                    newLenClasBuff = L_SYN_MEM_CLAS_ESTIM;
-                    move16();
-                }
-                ELSE
-                {
-                    oldLenClasBuff = L_SYN_MEM_CLAS_ESTIM;
-                    move16();
-                    newLenClasBuff = mult_r( L_SYN_MEM_CLAS_ESTIM, div_s( st->L_frame, st->last_L_frame ) );
-                }
-                lerp( &st->mem_syn_clas_estim_fx[L_SYN_MEM_CLAS_ESTIM - oldLenClasBuff], &st->mem_syn_clas_estim_fx[L_SYN_MEM_CLAS_ESTIM - newLenClasBuff], newLenClasBuff, oldLenClasBuff );
-            }
-        }
-        ELSE
-        {
-            set16_fx( st->mem_syn_clas_estim_fx, 0, L_SYN_MEM_CLAS_ESTIM );
-        }
-    }
-
-    /* Here we only handle cases where last_ppp and last_nelp not updated when coming from CodecB or other cores
-       within ACELP_CORE if switching from another bitarate to vbr, last_ppp and last_nelp is always updated in the previous frame */
-    test();
-    test();
-    IF( ( st->core == ACELP_CORE ) && ( ( st->last_core != ACELP_CORE ) || EQ_16( st->last_codec_mode, MODE2 ) ) )
-    {
-        st->last_ppp_mode_dec = 0;
-        st->last_nelp_mode_dec = 0;
-        move16();
-        move16();
-    }
-
-    /* Handle state reset of stat_noise_uv_mod memory */
-    test();
-    test();
-    test();
-    IF( ( st->core == ACELP_CORE ) && ( ( st->last_core != ACELP_CORE ) || EQ_16( st->last_codec_mode, MODE2 ) || LE_32( st->last_total_brate, PPP_NELP_2k80 ) ) )
-    {
-        st->act_count = 3;
-        st->uv_count = 0;
-        move16();
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( ( st->core == ACELP_CORE ) || EQ_16( st->core, AMR_WB_CORE ) ) && EQ_16( st->last_core, HQ_CORE ) ) || ( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( last_element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( nchan_out, 2 ) &&
-                                                                                                                     NE_32( st->core_brate, SID_2k40 ) && ( st->core_brate != FRAME_NO_DATA ) && ( ( last_core_brate_st0 == FRAME_NO_DATA ) || EQ_32( last_core_brate_st0, SID_2k40 ) ) ) )
-    {
-        test();
-        if ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
-        {
-            st->hPFstat->reset = 1;
-            move16();
-        }
-
-        IF( EQ_16( st->L_frame, L_FRAME16k ) )
-        {
-            Copy( TRWB2_Ave_fx, st->lsf_old_fx, M ); /* init of LSP */
-            Copy( TRWB2_Ave_fx, st->lsfoldbfi1_fx, M );
-            Copy( TRWB2_Ave_fx, st->lsfoldbfi0_fx, M );
-            Copy( TRWB2_Ave_fx, st->lsf_adaptive_mean_fx, M );
-            lsf2lsp_fx( st->lsf_old_fx, st->lsp_old_fx, M, INT_FS_16k );
-        }
-        ELSE
-        {
-            Copy( TRWB_Ave_fx, st->lsf_old_fx, M ); /* init of LSP */
-            Copy( TRWB_Ave_fx, st->lsfoldbfi1_fx, M );
-            Copy( TRWB_Ave_fx, st->lsfoldbfi0_fx, M );
-            Copy( TRWB_Ave_fx, st->lsf_adaptive_mean_fx, M );
-            lsf2lsp_fx( st->lsf_old_fx, st->lsp_old_fx, M, INT_FS_12k8 );
-        }
-
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && EQ_16( nchan_out, 2 ) && GT_32( st->core_brate, SID_2k40 ) && ( ( last_core_brate_st0 == FRAME_NO_DATA ) || EQ_32( last_core_brate_st0, SID_2k40 ) ) && st->hTcxDec != NULL )
-        {
-            /* Last frame was Stereo CNG and the synthesis memory is outdated -- reset */
-            set16_fx( st->hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 );
-            set16_fx( st->hFdCngDec->hFdCngCom->olapBufferAna_fx, 0, FFTLEN );
-            set16_fx( st->agc_mem_fx, 0, 2 );
-        }
-        st->mem_deemph_fx = 0;
-        move16();
-        IF( !st->last_con_tcx )
-        {
-            set16_fx( st->mem_syn2_fx, 0, M );
-        }
-        set16_fx( st->mem_syn1_fx, 0, M );
-        if ( st->hBWE_TD != NULL )
-        {
-            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-        }
-
-        /* Reset ACELP parameters */
-        set16_fx( st->mem_MA_fx, 0, M );
-
-        IF( EQ_32( st->sr_core, INT_FS_16k ) )
-        {
-            Copy( GEWB2_Ave_fx, st->mem_AR_fx, M );
-        }
-        ELSE
-        {
-            Copy( GEWB_Ave_fx, st->mem_AR_fx, M );
-        }
-
-        st->tilt_code_fx = 0;
-        st->gc_threshold_fx = 0;
-        st->dm_fx.prev_gain_code = 0;
-        st->dm_fx.prev_state = 0;
-        move16();
-        move32();
-        move32();
-        move16();
-        set16_fx( st->dm_fx.prev_gain_pit, 0, 6 );
-
-        st->last_coder_type = GENERIC;
-        move16();
-
-        fer_energy_fx( output_frame, UNVOICED_CLAS, st->previoussynth_fx_32, 0, -1, &st->enr_old_fx, 1 ); /*Q-0*/
-        st->lp_gainp_fx = 0;
-        move16();
-        st->lp_gainc_fx = extract_h( Sqrt32( st->lp_ener_fx, &exp ) ); /*Q=15-exp*/
-        move16();
-        st->lp_gainc_fx = shr( st->lp_gainc_fx, sub( 12, exp ) ); /*Q3*/
-        move16();
-
-        st->last_voice_factor_fx = 0;
-        st->Last_GSC_noisy_speech_flag = 0;
-        move16();
-        move16();
-
-        /* reset CLDFB memories */
-        cldfb_reset_memory_fx( st->cldfbAna );
-        cldfb_reset_memory_fx( st->cldfbBPF );
-        cldfb_reset_memory_fx( st->cldfbSyn );
-
-        /* reset TBE memories */
-        test();
-        test();
-        IF( !st->last_con_tcx && !( ( EQ_16( st->last_core, HQ_CORE ) ) && ( st->element_mode > EVS_MONO ) ) )
-        {
-            set16_fx( st->old_exc_fx, 0, L_EXC_MEM_DEC );
-        }
-        ELSE IF( LT_16( st->L_frame, L_FRAME16k ) )
-        {
-            /* resample from 16kHz to 12.8kHZ */
-            synth_mem_updt2( st->L_frame, L_FRAME16k, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, DEC );
-        }
-
-        IF( st->hBWE_TD != NULL )
-        {
-            set16_fx( st->hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-        }
-
-        test();
-        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )
-        {
-            hf_synth_reset_fx( st->hBWE_zero );
-#ifdef MSAN_FIX
-            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
-#endif
-        }
-
-        IF( st->hBWE_FD != NULL )
-        {
-            set16_fx( st->hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
-        }
-    }
-
-    test();
-    test();
-    test();
-    IF( ( ( st->core == ACELP_CORE ) || EQ_16( st->core, AMR_WB_CORE ) ) && ( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) ) )
-    {
-        IF( st->hBWE_TD != NULL )
-        {
-            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-            set16_fx( st->hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-        }
-
-        st->tilt_code_fx = 0;
-        st->gc_threshold_fx = 0;
-        st->dm_fx.prev_gain_code = 0;
-        st->dm_fx.prev_state = 0;
-        move16();
-        move32();
-        move32();
-        move16();
-        set16_fx( st->dm_fx.prev_gain_pit, 0, 6 );
-        st->last_coder_type = GENERIC;
-        move16();
-        fer_energy_fx( output_frame, UNVOICED_CLAS, st->previoussynth_fx_32, 0, -1, &st->enr_old_fx, 1 ); /*Q-0*/
-
-        st->lp_gainp_fx = 0;
-        move16();
-        st->lp_gainc_fx = extract_h( Sqrt32( st->lp_ener_fx, &exp ) ); /*Q=15-exp*/
-        move16();
-        st->lp_gainc_fx = shr( st->lp_gainc_fx, sub( 12, exp ) ); /*Q3*/
-        move16();
-
-        st->last_voice_factor_fx = 0;
-        st->Last_GSC_noisy_speech_flag = 0;
-        move16();
-        move16();
-
-        test();
-        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )
-        {
-            hf_synth_reset_fx( st->hBWE_zero );
-#ifdef MSAN_FIX
-            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
-#endif
-        }
-
-        IF( st->hBWE_FD != NULL )
-        {
-            set16_fx( st->hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
-        }
-
-        test();
-        test();
-        test();
-        IF( EQ_16( nchan_out, 1 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) && LE_32( st->element_brate, IVAS_24k4 ) && GT_32( last_element_brate, IVAS_24k4 ) )
-        {
-            /* update cldbf state with previous frame TCX synthesis when going from a bitrate with residual coding to a bitrate without it */
-            Word16 offset;
-            offset = sub( st->cldfbAna->p_filter_length, st->cldfbAna->no_channels );
-            Word32 *old_synthFB_fx;
-            IF( ( old_synthFB_fx = (Word32 *) malloc( st->hTcxDec->old_synth_lenFB * sizeof( Word32 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for old_synth_lenFB (32 bit) \n" ) );
-            }
-            Copy_Scale_sig_16_32( st->hTcxDec->old_synthFB_fx, old_synthFB_fx, st->hTcxDec->old_synth_lenFB, sub( Q10, Q_old_synthFB ) ); // Q10
-            Copy32( old_synthFB_fx + st->hTcxDec->old_synth_lenFB - offset, st->cldfbAna->cldfb_state_fx, offset );
-            st->cldfbAna->Q_cldfb_state = Q10;
-            move16();
-            IF( old_synthFB_fx )
-            free( old_synthFB_fx );
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( st->core, HQ_CORE ) && ( ( st->last_core == ACELP_CORE ) || EQ_16( st->last_core, AMR_WB_CORE ) || ( ( ( st->element_mode != EVS_MONO ) ) && ( NE_16( st->last_core, HQ_CORE ) ) ) ) )
-    {
-        set32_fx( st->hHQ_core->prev_env_fx, 0, SFM_N_WB );
-        set32_fx( st->hHQ_core->prev_normq_fx, 0, SFM_N_WB );
-
-        set32_fx( st->hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
-        set16_fx( st->hHQ_core->last_env_fx, 0, BANDS_MAX );
-        st->hHQ_core->last_max_pos_pulse = 0;
-        move16();
-
-        set16_fx( st->hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
-        st->hHQ_core->prev_frm_hfe2 = 0;
-        st->hHQ_core->prev_stab_hfe2 = 0;
-        move16();
-        move16();
-        IF( GT_32( st->output_Fs, 16000 ) )
-        {
-            set32_fx( st->hHQ_core->prev_coeff_out_fx, 0, L_HQ_WB_BWE );
-        }
-
-        IF( st->element_mode != EVS_MONO )
-        {
-            /* Estimate mem_env_delta to reinit env_stab */
-            tmp_fx = L_max( 0, L_add( ENV_STAB_EST1_FX, L_add( Mult_32_16( st->stab_fac_smooth_lt_fx, ENV_STAB_EST2_FX ), Mult_32_16( st->log_energy_diff_lt_fx, ENV_STAB_EST3_FX ) ) ) ); /*Q12*/
-
-            st->hHQ_core->mem_env_delta = extract_l( L_min( MAX16B, tmp_fx ) ); /* Convert to Q12 and handle saturation */
-            move16();
-            test();
-            IF( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) )
-            {
-                set16_fx( st->hHQ_core->old_out_fx, 0, output_frame );
-                set32_fx( st->hHQ_core->old_outLB_fx, 0, L_FRAME16k );
-                set16_fx( st->hHQ_core->old_out_LB_fx, 0, L_FRAME16k );
-            }
-
-            st->hHQ_core->no_att_hangover = 0;
-            move16();
-            st->hHQ_core->energy_lt_fx = 2457600; /*300.0f Q13*/
-            move32();
-            set16_fx( st->hHQ_core->old_is_transient, 0, 3 );
-            set16_fx( st->hHQ_core->prev_noise_level_fx, 0, 2 );
-            st->hHQ_core->prev_R = 0;
-            move16();
-            set16_fx( st->hHQ_core->mem_norm + 1, 39, SFM_N_ENV_STAB - 1 );
-            st->hHQ_core->prev_hqswb_clas = HQ_NORMAL;
-            st->hHQ_core->prev_ni_ratio_fx = 16384; /*Q15*/
-            move16();
-            move16();
-            set16_fx( st->hHQ_core->prev_En_sb_fx, 0, NB_SWB_SUBBANDS );
-        }
-        ELSE
-        {
-            set16_fx( st->hHQ_core->old_out_fx, 0, output_frame );
-            set32_fx( st->hHQ_core->old_outLB_fx, 0, L_FRAME16k );
-        }
-    }
-
-    /* handle switching cases where preecho_sb was not called in the last frame (memory not up to date) */
-    IF( st->hHQ_core != NULL )
-    {
-        st->hHQ_core->pastpre = sub( st->hHQ_core->pastpre, 1 );
-        move16();
-        IF( st->hHQ_core->pastpre < 0 )
-        {
-            reset_preecho_dec_fx( st->hHQ_core );
-        }
-    }
-    test();
-    IF( st->core_brate == FRAME_NO_DATA )
-    {
-        st->VAD = 0;
-        st->m_frame_type = ZERO_FRAME;
-    }
-    ELSE IF( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, SID_1k75 ) )
-    {
-        st->VAD = 0;
-        st->m_frame_type = SID_FRAME;
-    }
-    ELSE
-    {
-        st->VAD = 1;
-        st->m_frame_type = ACTIVE_FRAME;
-    }
-
-    move16();
-    move16();
-    /*switch on CNA on active frames*/
-    IF( ( st->element_mode == EVS_MONO ) ) /* for IVAS modes, st->flag_cna is set earlier */
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( st->VAD && ( ( NE_16( st->core, AMR_WB_CORE ) && LE_32( st->total_brate, CNA_MAX_BRATE ) ) || ( EQ_16( st->core, AMR_WB_CORE ) && LE_32( st->total_brate, ACELP_8k85 ) ) ) )
-        {
-            st->flag_cna = 1;
-            move16();
-        }
-        ELSE IF( st->VAD || ( EQ_16( st->cng_type, FD_CNG ) && EQ_16( st->L_frame, L_FRAME16k ) ) )
-        {
-            st->flag_cna = 0;
-            move16();
-        }
-    }
-
-    if ( EQ_16( st->core, AMR_WB_CORE ) )
-    {
-        st->cng_type = LP_CNG;
-        move16();
-    }
-
-    /* Reconfigure CNG */
-    test();
-    test();
-    test();
-    test();
-    IF( st->hFdCngDec && ( NE_16( st->last_L_frame, st->L_frame ) || NE_16( st->hFdCngDec->hFdCngCom->frameSize, st->L_frame ) || ( st->ini_frame == 0 ) || NE_16( st->bwidth, st->last_bwidth ) ) )
-    {
-        /* || st->last_core == AMR_WB_CORE || st->last_codec_mode == MODE2)){*/
-        IF( NE_16( st->core, AMR_WB_CORE ) )
-        {
-            test();
-            IF( EQ_16( st->rf_flag, 1 ) && EQ_32( st->total_brate, ACELP_13k20 ) )
-            {
-                configureFdCngDec_ivas_fx( st->hFdCngDec, st->bwidth, ACELP_9k60, st->L_frame, st->last_L_frame, st->element_mode );
-            }
-            ELSE
-            {
-                configureFdCngDec_ivas_fx( st->hFdCngDec, st->bwidth, st->total_brate, st->L_frame, st->last_L_frame, st->element_mode );
-            }
-        }
-        ELSE
-        {
-            configureFdCngDec_ivas_fx( st->hFdCngDec, WB, ACELP_8k00, st->L_frame, st->last_L_frame, st->element_mode );
-
-            if ( st->VAD )
-            {
-                st->hFdCngDec->hFdCngCom->CngBitrate = st->total_brate;
-                move32();
-            }
-        }
-        test();
-        test();
-        IF( NE_16( st->last_L_frame, st->L_frame ) && LE_16( st->L_frame, L_FRAME16k ) && LE_16( st->last_L_frame, L_FRAME16k ) )
-        {
-            test();
-            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
-            {
-                lerp( st->hFdCngDec->hFdCngCom->olapBufferAna_fx + st->last_L_frame, st->hFdCngDec->hFdCngCom->olapBufferAna_fx + st->L_frame, st->L_frame, st->last_L_frame );
-            }
-
-            L_lerp_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ), Q_olapBufferSynth2 );
-
-            test();
-            IF( LE_32( st->total_brate, SID_2k40 ) && LE_32( st->last_total_brate, SID_2k40 ) )
-            {
-                L_lerp_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth_fx, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ), Q_olapBufferSynth );
-
-                IF( EQ_16( st->L_frame, L_FRAME ) )
-                {
-                    FOR( i = 0; i < ( st->L_frame * 2 ); i++ )
-                    {
-                        st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i] = Mult_32_16( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i], (Word16) 20480 /* 0.6250f in Q15 */ );
-                        move32();
-                    }
-                }
-                ELSE
-                {
-                    FOR( i = 0; i < ( st->L_frame * 2 ); i++ )
-                    {
-                        st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i] = Mult_32_16( L_shl( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i], 1 ), (Word16) 26214 /* 1.6f in Q14 */ );
-                        move32();
-                    }
-                }
-            }
-        }
-    }
-
-    return error;
-}
-/*---------------------------------------------------------------------*
- * core_switching_hq_prepare_dec()
- *
- * Preprocessing in the first HQ frame after ACELP frame
- * Modify bit allocation for HQ core by removing ACELP subframe budget
- *---------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------*
- * bandwidth_switching_detect()
- *
- * Classification for band-width switching
- *---------------------------------------------------------------------*/
-
-void bandwidth_switching_detect_ivas_fx(
-    Decoder_State *st_fx /* i/o: encoder state structure */
-)
-{
-    test();
-    test();
-    IF( ( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && EQ_16( st_fx->idchan, 1 ) ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
-    {
-        /* there is no BWE in TD stereo secondary channel and in MDCT stereo, IGF is part of the core decoding -> no BW switching -> reset BWS counters */
-        st_fx->prev_bws_cnt = 0;
-        st_fx->bws_cnt = 0;
-        st_fx->bws_cnt1 = 0;
-        move16();
-        move16();
-        move16();
-
-        return;
-    }
-    /* update band-width switching counter */
-    test();
-    test();
-    test();
-    test();
-    IF( GE_16( st_fx->bws_cnt1, N_NS2W_FRAMES ) )
-    {
-        st_fx->bws_cnt1 = 0;
-        move16();
-    }
-    ELSE IF( GT_32( st_fx->total_brate, ACELP_9k60 ) && LT_32( st_fx->last_core_brate, ACELP_9k60 ) && EQ_16( st_fx->bwidth, SWB ) && EQ_16( st_fx->last_bwidth, WB ) && ( st_fx->last_low_rate_mode == 0 ) )
-    {
-        st_fx->bws_cnt1 = add( st_fx->bws_cnt1, 1 );
-        move16();
-    }
-    ELSE IF( st_fx->bws_cnt1 > 0 )
-    {
-        IF( LT_16( st_fx->bwidth, st_fx->last_bwidth ) )
-        {
-            st_fx->bws_cnt = sub( shl( sub( N_NS2W_FRAMES, st_fx->bws_cnt1 ), 1 ), 1 );
-            move16();
-        }
-        ELSE
-        {
-            st_fx->bws_cnt = 0;
-            move16();
-        }
-
-        IF( LT_16( st_fx->bwidth, st_fx->last_bwidth ) )
-        {
-            st_fx->bws_cnt1 = 0;
-            move16();
-        }
-        ELSE
-        {
-            IF( EQ_16( st_fx->bwidth, SWB ) )
-            {
-                st_fx->bws_cnt1 = add( st_fx->bws_cnt1, 1 );
-                move16();
-            }
-            ELSE
-            {
-                st_fx->bws_cnt1 = 0;
-                move16();
-            }
-        }
-    }
-
-    /* update band-width switching counter */
-    test();
-    test();
-    test();
-    IF( GE_16( st_fx->bws_cnt, N_WS2N_FRAMES ) )
-    {
-        st_fx->bws_cnt = 0;
-        move16();
-    }
-    ELSE IF( LT_32( st_fx->total_brate, ACELP_9k60 ) && GT_32( st_fx->last_core_brate, ACELP_9k60 ) && LT_16( st_fx->bwidth, st_fx->last_bwidth ) && EQ_16( st_fx->bwidth, WB ) )
-    {
-        st_fx->bws_cnt = add( st_fx->bws_cnt, 1 );
-        move16();
-    }
-    ELSE IF( st_fx->bws_cnt > 0 )
-    {
-        IF( GT_16( st_fx->bwidth, st_fx->last_bwidth ) )
-        {
-            st_fx->bws_cnt1 = shr( sub( N_WS2N_FRAMES, st_fx->bws_cnt ), 1 );
-            move16();
-        }
-        ELSE
-        {
-            st_fx->bws_cnt1 = 0;
-            move16();
-        }
-
-        IF( GT_16( st_fx->bwidth, st_fx->last_bwidth ) )
-        {
-            st_fx->bws_cnt = 0;
-            move16();
-        }
-        ELSE
-        {
-            IF( EQ_16( st_fx->bwidth, WB ) )
-            {
-                st_fx->bws_cnt = add( st_fx->bws_cnt, 1 );
-                move16();
-            }
-            ELSE
-            {
-                st_fx->bws_cnt = 0;
-                move16();
-            }
-        }
-    }
-
-    return;
-}
-
-
-/*---------------------------------------------------------------------*
- * bw_switching_pre_proc()
- *
- * Band-width switching pre-processing
- *---------------------------------------------------------------------*/
-void ivas_bw_switching_pre_proc_fx(
-    Decoder_State *st,               /* i/o: decoder state structure                  */
-    const Word32 last_element_brate, /* i  : last element bitrate                     */
-    const Word16 nchan_out /* i  : number of output channels                */,
-    Word32 *old_syn_12k8_16k_fx,
-    Word16 Q,
-    Word16 Q_audio )
-{
-    Word16 i;
-    Word32 syn_dct_fx[L_FRAME];
-
-
-    Flag Overflow = 0;
-    move32();
-
-    IF( st->element_mode > EVS_MONO )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) && st->hBWE_FD != NULL && !( LE_32( st->core_brate, SID_2k40 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) && EQ_16( nchan_out, 2 ) ) && !( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( nchan_out, 1 ) && EQ_16( st->idchan, 1 ) && LE_32( last_element_brate, IVAS_SID_5k2 ) ) )
-        {
-            /* Calculate tilt of the ACELP core synthesis - needed in SWB BWE decoding */
-            Word16 old_syn_12k8_16k_tmp_16fx[L_FRAME16k];
-            Copy_Scale_sig_32_16( old_syn_12k8_16k_fx, old_syn_12k8_16k_tmp_16fx, st->L_frame, sub( -1, Q ) );
-            st->tilt_wb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( old_syn_12k8_16k_tmp_16fx, -1, st->L_frame ), sub( Q, 8 ) ) ); // Q24+(Q-8) - 16
-            move16();
-        }
-
-        return;
-    }
-
-
-    test();
-    test();
-    IF( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) )
-    {
-        /*----------------------------------------------------------------------*
-         * Calculate tilt of the ACELP core synthesis
-         *----------------------------------------------------------------------*/
-
-        st->tilt_wb_fx = ivas_calc_tilt_bwe_fx( old_syn_12k8_16k_fx, Q, st->L_frame );
-        move16();
-        /*-------------------------------------------------------------------------------*
-         * Calculate frequency energy of 0~3.2kHz and 3.2~6.4kHz the ACELP core synthesis
-         *-------------------------------------------------------------------------------*/
-        edct_fx( old_syn_12k8_16k_fx, syn_dct_fx, L_FRAME, &Q );
-        Word64 W_tmp = 0;
-        move64();
-        Word32 tmp;
-        Word16 shift;
-        FOR( i = 0; i < L_FRAME / 2; i++ )
-        {
-            W_tmp = W_add( W_tmp, W_shr( W_mult0_32_32( syn_dct_fx[i], syn_dct_fx[i] ), Q ) );
-        }
-        shift = W_norm( W_tmp );
-        W_tmp = W_shl( W_tmp, shift );
-        tmp = W_extract_h( W_tmp );
-        tmp = L_shr( tmp, 8 );
-
-        tmp = getSqrtWord32( tmp );
-        st->enerLL_fx = tmp;
-        move32();
-        st->enerLL_fx_Q = shr( sub( add( Q, shift ), 32 ), 1 );
-        move16();
-        W_tmp = 0;
-        move64();
-        FOR( ; i < L_FRAME; i++ )
-        {
-            W_tmp = W_add( W_tmp, W_shr( W_mult0_32_32( syn_dct_fx[i], syn_dct_fx[i] ), Q ) );
-        }
-        shift = W_norm( W_tmp );
-        W_tmp = W_shl( W_tmp, shift );
-        tmp = W_extract_h( W_tmp ); // Q = Q + shift - 32
-        tmp = L_shr( tmp, 7 );      // divide by 128
-        tmp = getSqrtWord32( tmp );
-        st->enerLH_fx = tmp;
-        move32();
-        st->enerLH_fx_Q = shr( sub( add( Q, shift ), 32 ), 1 );
-        move16();
-    }
-    ELSE
-    {
-        IF( st->hHQ_core->old_is_transient[0] )
-        {
-            Word32 tmp, L_tmp = 0;
-            move32();
-            FOR( i = 0; i < 32; i++ )
-            {
-                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
-            }
-            tmp = L_shr( L_tmp, 5 ); // divide by 32
-            tmp = getSqrtWord32( tmp );
-            st->enerLL_fx = tmp;
-            move32();
-            st->enerLL_fx_Q = Q_audio;
-            move16();
-
-            L_tmp = 0;
-            move32();
-            FOR( ; i < 64; i++ )
-            {
-                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
-            }
-
-            tmp = L_shr( L_tmp, 5 ); // divide by 32
-            tmp = getSqrtWord32( tmp );
-            st->enerLH_fx = tmp;
-            move32();
-            st->enerLH_fx_Q = Q_audio;
-            move16();
-        }
-        ELSE
-        {
-            Word32 tmp, L_tmp = 0;
-            move32();
-            FOR( i = 0; i < L_FRAME / 2; i++ )
-            {
-                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
-            }
-            tmp = L_shr( L_tmp, 5 ); // divide by 32
-            tmp = getSqrtWord32( tmp );
-            st->enerLL_fx = tmp;
-            move32();
-            st->enerLL_fx_Q = Q_audio;
-            move16();
-
-            L_tmp = 0;
-            move32();
-            FOR( ; i < L_FRAME; i++ )
-            {
-                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
-            }
-            tmp = L_shr( L_tmp, 5 ); // divide by 32
-            tmp = getSqrtWord32( tmp );
-            st->enerLL_fx = tmp;
-            move32();
-            st->enerLL_fx_Q = Q_audio;
-            move16();
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( st->last_bwidth, 0 ) && LE_16( st->extl, SWB_CNG ) )
-    {
-
-        st->prev_ener_shb_fx = 0;
-        move16();
-        IF( st->hBWE_FD != NULL )
-        {
-            set16_fx( st->prev_SWB_fenv_fx, 0, SWB_FENV );
-        }
-    }
-    ELSE IF( ( ( ( st->core == ACELP_CORE ) && ( EQ_16( st->last_core, HQ_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) || EQ_16( st->last_core, TCX_20_CORE ) ) ) || ( EQ_16( st->core, st->last_core ) && NE_16( st->extl, st->last_extl ) ) ) && GE_16( st->last_bwidth, SWB ) )
-    {
-        st->attenu_fx = 3277; // 0.1f in Q15
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    if ( EQ_16( st->last_core, HQ_CORE ) || ( ( st->last_core == ACELP_CORE ) && !( EQ_16( st->last_extl, WB_TBE ) || EQ_16( st->last_extl, SWB_TBE ) || EQ_16( st->last_extl, FB_TBE ) ) && GT_32( st->core_brate, ACELP_8k00 ) ) )
-    {
-        st->prev_fractive = 0;
-        move16();
-    }
-
-    return;
-}
-/*---------------------------------------------------------------------*
- * core_switch_lb_upsamp()
- *
- * Resample HQ/TCX-LB to the output sampling rate (8/16/32/48 kHz)
- *---------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------------*
- * smoothTransitionDtxToTcx()
- *
- * apply smoothing to the transition part for inactive to active transitions in DTX
- *---------------------------------------------------------------------*/
-
-#define TRANSITION_SMOOTHING_LEN_16k 15
-#define TRANSITION_SMOOTHING_LEN_32k 31
-#define TRANSITION_SMOOTHING_LEN_48k 47
diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c
index bd7d53bc66a32206b5d4f9104111c346526e6289..ba7c73741751664b8b8545bcdb85a0d66fc6f557 100644
--- a/lib_dec/core_switching_dec_fx.c
+++ b/lib_dec/core_switching_dec_fx.c
@@ -16,10 +16,6 @@
  *
  *
  *---------------------------------------------------------------------*/
-#ifdef IVAS_CODE_SWITCHING
-static void core_switch_lb_upsamp( Decoder_State *st, float *output );
-static void smoothTransitionDtxToTcx( float synth[], const int16_t output_frame, const int16_t delay_comp );
-#endif
 
 static void smoothTransitionDtxToTcx_fx( Word16 synth[], const Word16 output_frame, const Word16 delay_comp );
 static void core_switch_lb_upsamp_fx( Decoder_State *st, Word32 *output );
@@ -189,30 +185,11 @@ void bw_switching_pre_proc_fx(
     Flag Overflow = 0;
     move32();
 #endif
-#ifdef IVAS_CODE_SWITCHING
+
     IF( st_fx->element_mode > EVS_MONO )
     {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( EQ_16( st_fx->core, ACELP_CORE ) && !( EQ_16( st_fx->bfi, 1 ) && EQ_16( st_fx->con_tcx, 1 ) ) &&
-            st_fx->hBWE_FD != NULL && !( LE_16( st_fx->core_brate, SID_2k40 ) && EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && EQ_16( nchan_out, 2 ) ) &&
-            !( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && EQ_16( nchan_out, 1 ) && EQ_16( st_fx->idchan, 1 ) && LE_16( last_element_brate, IVAS_SID_4k4 ) ) )
-        {
-            /* Calculate tilt of the ACELP core synthesis - needed in SWB BWE decoding */
-            calc_tilt_bwe( old_syn_12k8_16k, &st->tilt_wb, st->L_frame );
-        }
-
-        return;
     }
-#endif
+
     test();
     test();
     IF( EQ_16( st_fx->core, ACELP_CORE ) && !( EQ_16( st_fx->bfi, 1 ) && EQ_16( st_fx->con_tcx, 1 ) ) )
@@ -221,12 +198,8 @@ void bw_switching_pre_proc_fx(
          * Calculate tilt of the ACELP core synthesis
          *----------------------------------------------------------------------*/
 
-#ifdef BASOP_NOGLOB
         st_fx->tilt_wb_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( old_syn_12k8_16k_fx, -1, st_fx->L_frame ), 3, &Overflow ), &Overflow ); /* Q11 */
         move16();
-#else
-        st_fx->tilt_wb_fx = round_fx( L_shl( calc_tilt_bwe_fx( old_syn_12k8_16k_fx, -1, st_fx->L_frame ), 3 ) );
-#endif
         /*-------------------------------------------------------------------------------*
          * Calculate frequency energy of 0~3.2kHz and 3.2~6.4kHz the ACELP core synthesis
          *-------------------------------------------------------------------------------*/
@@ -236,11 +209,7 @@ void bw_switching_pre_proc_fx(
         L_tmp = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME / 2; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, syn_dct_fx[i], syn_dct_fx[i], &Overflow ); /* (2 * Q_syn2) */
-#else
-            L_tmp = L_mac0( L_tmp, syn_dct_fx[i], syn_dct_fx[i] );
-#endif
         }
         L_tmp = L_shr( L_tmp, 7 );                                              /* 2 * Q_syn2 */
         st_fx->enerLL_fx = Calc_freq_ener_fx( L_tmp, shl( st_fx->Q_syn2, 1 ) ); /* Q_syn2 */
@@ -248,11 +217,7 @@ void bw_switching_pre_proc_fx(
         L_tmp = L_deposit_l( 0 );
         FOR( ; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, syn_dct_fx[i], syn_dct_fx[i], &Overflow );
-#else
-            L_tmp = L_mac0( L_tmp, syn_dct_fx[i], syn_dct_fx[i] );
-#endif
         }
         L_tmp = L_shr( L_tmp, 7 );                                              /* 2 * Q_syn2 */
         st_fx->enerLH_fx = Calc_freq_ener_fx( L_tmp, shl( st_fx->Q_syn2, 1 ) ); /* Q_syn2 */
@@ -265,11 +230,7 @@ void bw_switching_pre_proc_fx(
             L_tmp = L_deposit_l( 0 );
             FOR( i = 0; i < 32; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_o( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i], &Overflow ); /* 2 * Q_syn2 */
-#else
-                L_tmp = L_mac0( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i] );
-#endif
             }
             L_tmp = L_shr( L_tmp, 5 );                                              /* 2 * Q_syn2 */
             st_fx->enerLL_fx = Calc_freq_ener_fx( L_tmp, shl( st_fx->Q_syn2, 1 ) ); /* Q_syn2 */
@@ -277,11 +238,7 @@ void bw_switching_pre_proc_fx(
             L_tmp = L_deposit_l( 0 );
             FOR( ; i < 64; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_o( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i], &Overflow ); /* 2 * Q_syn2 */
-#else
-                L_tmp = L_mac0( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i] );
-#endif
             }
             L_tmp = L_shr( L_tmp, 5 );                                              /* 2 * Q_syn2 */
             st_fx->enerLH_fx = Calc_freq_ener_fx( L_tmp, shl( st_fx->Q_syn2, 1 ) ); /* Q_syn2 */
@@ -292,11 +249,7 @@ void bw_switching_pre_proc_fx(
             L_tmp = L_deposit_l( 0 );
             FOR( i = 0; i < L_FRAME / 2; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_o( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i], &Overflow ); /* 2 * Q_syn2 */
-#else
-                L_tmp = L_mac0( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i] );
-#endif
             }
             L_tmp = L_shr( L_tmp, 7 );                                              /* 2 * Q_syn2 */
             st_fx->enerLL_fx = Calc_freq_ener_fx( L_tmp, shl( st_fx->Q_syn2, 1 ) ); /* Q_syn2 */
@@ -304,11 +257,7 @@ void bw_switching_pre_proc_fx(
             L_tmp = L_deposit_l( 0 );
             FOR( ; i < L_FRAME; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_o( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i], &Overflow ); /* 2 * Q_syn2 */
-#else
-                L_tmp = L_mac0( L_tmp, st_fx->t_audio_q_fx[i], st_fx->t_audio_q_fx[i] );
-#endif
             }
             L_tmp = L_shr( L_tmp, 7 );                                              /* 2 * Q_syn2 */
             st_fx->enerLH_fx = Calc_freq_ener_fx( L_tmp, shl( st_fx->Q_syn2, 1 ) ); /* Q_syn2 */
@@ -328,7 +277,7 @@ void bw_switching_pre_proc_fx(
     {
         st_fx->prev_ener_shb_fx = 0;
         move16();
-        set16_fx( st_fx->prev_SWB_fenv_fx, 0, SWB_FENV );
+        set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );
     }
     ELSE IF( ( ( st_fx->core == ACELP_CORE && ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) ) ) || ( EQ_16( st_fx->core, st_fx->last_core ) && NE_16( st_fx->extl, st_fx->last_extl ) ) ) && GE_16( st_fx->last_bwidth, SWB ) )
     {
@@ -349,149 +298,7 @@ void bw_switching_pre_proc_fx(
     return;
 }
 
-#ifdef IVAS_CODE_SWITCHING
-
-
-/*---------------------------------------------------------------------*
- * core_switch_lb_upsamp()
- *
- * Resample HQ/TCX-LB to the output sampling rate (8/16/32/48 kHz)
- *---------------------------------------------------------------------*/
-
-static void core_switch_lb_upsamp(
-    Decoder_State *st, /* i/o: Decoder state               */
-    float *output      /* i/o: LB synth/upsampled LB synth */
-)
-{
-    int16_t i;
-    float *realBuffer[CLDFB_OVRLP_MIN_SLOTS], *imagBuffer[CLDFB_OVRLP_MIN_SLOTS];
-    float realBufferTmp[CLDFB_OVRLP_MIN_SLOTS][CLDFB_NO_CHANNELS_MAX];
-    float imagBufferTmp[CLDFB_OVRLP_MIN_SLOTS][CLDFB_NO_CHANNELS_MAX];
-
-    /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */
-    for ( i = 0; i < CLDFB_OVRLP_MIN_SLOTS; i++ )
-    {
-        set_f( realBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
-        set_f( imagBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
-        realBuffer[i] = realBufferTmp[i];
-        imagBuffer[i] = imagBufferTmp[i];
-    }
-
-    /* check if the CLDFB works on the right sample rate */
-    if ( ( st->cldfbAna->no_channels * st->cldfbAna->no_col ) != st->L_frame )
-    {
-        resampleCldfb( st->cldfbAna, st->L_frame * FRAMES_PER_SEC );
-
-        if ( st->cldfbBPF != NULL && st->L_frame <= L_FRAME16k )
-        {
-            resampleCldfb( st->cldfbBPF, st->L_frame * FRAMES_PER_SEC );
-        }
-
-        if ( st->ini_frame > 0 )
-        {
-            st->cldfbSyn->bandsToZero = st->cldfbSyn->no_channels - st->cldfbAna->no_channels;
-        }
-    }
-
-    /* analysis of the synthesis at internal sampling rate */
-    cldfbAnalysis( output, realBuffer, imagBuffer, CLDFB_OVRLP_MIN_SLOTS * st->cldfbAna->no_channels, st->cldfbAna );
-
-    /* analysis and add the BPF error signal */
-    if ( st->p_bpf_noise_buf )
-    {
-        addBassPostFilter( st->p_bpf_noise_buf, st->bpf_off ? 0 : CLDFB_OVRLP_MIN_SLOTS * st->cldfbBPF->no_channels, realBuffer, imagBuffer, st->cldfbBPF );
-    }
-
-    /* set output mask for upsampling */
-    if ( st->bwidth == NB )
-    {
-        /* set NB mask for upsampling */
-        st->cldfbSyn->bandsToZero = st->cldfbSyn->no_channels - 10;
-    }
-    else if ( st->cldfbSyn->bandsToZero != st->cldfbSyn->no_channels - st->cldfbAna->no_channels )
-    {
-        /* in case of BW switching, re-init to default */
-        st->cldfbSyn->bandsToZero = st->cldfbSyn->no_channels - st->cldfbAna->no_channels;
-    }
-
-    /* synthesis of the combined signal */
-    cldfbSynthesis( realBuffer, imagBuffer, output, CLDFB_OVRLP_MIN_SLOTS * st->cldfbSyn->no_channels, st->cldfbSyn );
-
-    /* save synthesis - needed in case of core switching */
-    if ( st->hTcxDec != NULL )
-    {
-        mvr2r( output, st->previoussynth, st->hTcxDec->L_frameTCX );
-    }
-
-    return;
-}
-
-/*---------------------------------------------------------------------*
- * smoothTransitionMdctStereoDtx()
- *
- * apply smoothing to the transition part for MDCT-Stereo DTX
- *---------------------------------------------------------------------*/
-
-#define TRANSITION_SMOOTHING_LEN_16k 15
-#define TRANSITION_SMOOTHING_LEN_32k 31
-#define TRANSITION_SMOOTHING_LEN_48k 47
-
-static void smoothTransitionMdctStereoDtx(
-    float synth[],              /* i/o: synthesis                       */
-    const int16_t output_frame, /* i  : output frame length             */
-    const int16_t delay_comp    /* i  : delay compensation in samples   */
-)
-{
-    int16_t i, filter_len;
-    float w, mem, step, fade_in;
-    float smoothing_input_buffer[2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k];
-    float smoothing_out_buffer[2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k];
-
-    filter_len = TRANSITION_SMOOTHING_LEN_16k;
-    if ( output_frame == L_FRAME32k )
-    {
-        filter_len = TRANSITION_SMOOTHING_LEN_32k;
-    }
-    else if ( output_frame == L_FRAME48k )
-    {
-        filter_len = TRANSITION_SMOOTHING_LEN_48k;
-    }
-
-    /* prepare buffer */
-    for ( i = 0; i < filter_len / 2; i++ )
-    {
-        smoothing_input_buffer[i] = synth[0];
-    }
-    mvr2r( synth, smoothing_input_buffer + filter_len / 2, 2 * delay_comp + filter_len / 2 );
-
-    /* apply Mean filter */
-    w = 1.f / filter_len;
-    mem = sum_f( smoothing_input_buffer, filter_len );
-    for ( i = 0; i < 2 * delay_comp; i++ )
-    {
-        smoothing_out_buffer[i] = w * mem;
-        mem = mem - smoothing_input_buffer[i] + smoothing_input_buffer[i + filter_len];
-    }
-
-    /* apply fades around transition */
-    step = 1.f / delay_comp;
-    fade_in = 0.f;
-    for ( i = 0; i < delay_comp; i++ )
-    {
-        synth[i] = smoothing_out_buffer[i] * fade_in + synth[i] * ( 1 - fade_in );
-        fade_in += step;
-    }
-
-    fade_in = 0.f;
-    for ( ; i < 2 * delay_comp; i++ )
-    {
-        synth[i] = synth[i] * fade_in + smoothing_out_buffer[i] * ( 1 - fade_in );
-        fade_in += step;
-    }
 
-    return;
-}
-#endif
 /*---------------------------------------------------------------------*
  * core_switching_pre_dec_fx()
  *
@@ -679,7 +486,7 @@ ivas_error core_switching_pre_dec_fx(
                 {
                     return error;
                 }
-                cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, hTcxDec->syn_Overl, 0, no_col, workBuffer );
+                cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &scaleFactor, hTcxDec->syn_Overl, 0, no_col, workBuffer );
                 cldfb_restore_memory( st_fx->cldfbAna );
 
                 scaleFactor.hb_scale = scaleFactor.lb_scale;
@@ -690,7 +497,7 @@ ivas_error core_switching_pre_dec_fx(
                 {
                     return error;
                 }
-                cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, hHQ_core->fer_samples_fx, 0, no_col, workBuffer );
+                cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, hHQ_core->fer_samples_fx, 0, no_col, workBuffer );
                 cldfb_restore_memory( st_fx->cldfbSyn );
             }
 
@@ -766,13 +573,7 @@ ivas_error core_switching_pre_dec_fx(
 
     test();
     test();
-    IF( ( ( EQ_16( st_fx->core, ACELP_CORE ) || EQ_16( st_fx->core, AMR_WB_CORE ) ) && EQ_16( st_fx->last_core, HQ_CORE ) )
-        //#ifdef IVAS_CODE_SWITCHING
-        //        || ((EQ_16(st_fx->element_mode, IVAS_CPE_DFT) || EQ_16(st_fx->element_mode, IVAS_CPE_TD) ||
-        //            (EQ_16(st_fx->element_mode, IVAS_CPE_MDCT) && last_element_mode == IVAS_CPE_DFT)) && EQ_16(nchan_out,2) &&
-        //            NE_16(st_fx->core_brate, SID_2k40) && NE_16(st_fx->core_brate, FRAME_NO_DATA) && (EQ_16(last_core_brate_st0, FRAME_NO_DATA) || EQ_16(last_core_brate_st0, SID_2k40)))
-        //#endif
-    )
+    IF( ( ( EQ_16( st_fx->core, ACELP_CORE ) || EQ_16( st_fx->core, AMR_WB_CORE ) ) && EQ_16( st_fx->last_core, HQ_CORE ) ) )
     {
         test();
         IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
@@ -798,14 +599,7 @@ ivas_error core_switching_pre_dec_fx(
             lsf2lsp_fx( st_fx->lsf_old_fx, st_fx->lsp_old_fx, M, INT_FS_FX );
         }
 
-#ifdef IVAS_CODE_SWITCHING
-        if ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) && nchan_out == 2 && st->core_brate > SID_2k40 && ( last_core_brate_st0 == FRAME_NO_DATA || last_core_brate_st0 == SID_2k40 ) && st->hTcxDec != NULL )
-        {
-            /* Last frame was Stereo CNG and the synthesis memory is outdated -- reset */
-            set_f( st->hTcxDec->old_syn_Overl, 0.0f, L_FRAME32k / 2 );
-            set_f( st->hFdCngDec->hFdCngCom->olapBufferAna, 0.0f, FFTLEN );
-        }
-#endif
+
         set16_fx( st_fx->agc_mem_fx, 0, 2 );
         st_fx->mem_deemph_fx = 0;
         move16();
@@ -904,47 +698,7 @@ ivas_error core_switching_pre_dec_fx(
             set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_NS ) );
         }
     }
-#ifdef IVAS_CODE_SWITCHING
-    if ( ( st->core == ACELP_CORE || st->core == AMR_WB_CORE ) && ( st->last_core == TCX_20_CORE || st->last_core == TCX_10_CORE ) )
-    {
-        if ( st->hBWE_TD != NULL )
-        {
-            st->hBWE_TD->bwe_non_lin_prev_scale = 0.0f;
-            set_f( st->hBWE_TD->old_bwe_exc, 0, PIT16k_MAX * 2 );
-        }
-
-        st->tilt_code = 0.0f;
-        st->gc_threshold = 0.0f;
-        set_f( st->dispMem, 0, 8 );
-
-        st->last_coder_type = GENERIC;
-
-        fer_energy( output_frame, UNVOICED_CLAS, st->previoussynth, -1, &st->enr_old, 1 );
-        st->lp_gainp = 0.0f;
-        st->lp_gainc = (float) sqrt( st->lp_ener );
-
-        st->last_voice_factor = 0;
-        st->Last_GSC_noisy_speech_flag = 0;
-
-        if ( st->output_Fs >= 16000 && st->hBWE_zero != NULL )
-        {
-            hf_synth_reset( st->hBWE_zero );
-        }
-
-        if ( st->hBWE_FD != NULL )
-        {
-            set_f( st->hBWE_FD->old_syn_12k8_16k, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
-        }
 
-        if ( nchan_out == 1 && st->element_mode == IVAS_CPE_DFT && st->element_brate <= IVAS_24k4 && last_element_brate > IVAS_24k4 )
-        {
-            /* update cldbf state with previous frame TCX synthesis when going from a bitrate with residual coding to a bitrate without it */
-            int16_t offset;
-            offset = st->cldfbAna->p_filter_length - st->cldfbAna->no_channels;
-            mvr2r( st->hTcxDec->old_synthFB + st->hTcxDec->old_synth_lenFB - offset, st->cldfbAna->cldfb_state, offset );
-        }
-    }
-#endif
     test();
     test();
     test();
@@ -969,40 +723,16 @@ ivas_error core_switching_pre_dec_fx(
         {
             set32_fx( hHQ_core->prev_coeff_out_fx, 0, L_HQ_WB_BWE );
         }
-#ifdef IVAS_CODE_SWITCHING
-        if ( st->element_mode != EVS_MONO )
-        {
-            /* Estimate mem_env_delta to reinit env_stab */
-            tmp = max( 0, ENV_STAB_EST1 + ( ENV_STAB_EST2 * st->stab_fac_smooth_lt ) + ( ENV_STAB_EST3 * st->log_energy_diff_lt ) );
-            st->hHQ_core->mem_env_delta = (int16_t) min( MAX16B, (int32_t) ( tmp * ( 1 << 12 ) ) ); /* Convert to Q12 and handle saturation */
-
-            if ( st->last_core != TCX_20_CORE && st->last_core != TCX_10_CORE )
-            {
-                set_f( st->hHQ_core->old_out, 0, output_frame );
-                set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k );
-            }
 
-            st->hHQ_core->no_att_hangover = 0;
-            st->hHQ_core->energy_lt = 300.0f;
-
-            set_s( st->hHQ_core->old_is_transient, 0, 3 );
-            set_f( st->hHQ_core->prev_noise_level, 0.0f, 2 );
-            st->hHQ_core->prev_R = 0;
-            set_s( st->hHQ_core->mem_norm + 1, 39, SFM_N_ENV_STAB - 1 );
-            st->hHQ_core->prev_hqswb_clas = HQ_NORMAL;
-            st->hHQ_core->prev_ni_ratio = 0.5f;
-            set_f( st->hHQ_core->prev_En_sb, 0.0f, NB_SWB_SUBBANDS );
+        if ( st_fx->element_mode != EVS_MONO )
+        {
         }
         else
-#endif
         {
             set16_fx( hHQ_core->old_out_fx, 0, output_frame );
             hHQ_core->Q_old_wtda_LB = 15;
             hHQ_core->Q_old_wtda = 15;
             move16();
-#ifdef IVAS_CODE_SWITCHING
-            set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k );
-#endif
         }
     }
 
@@ -1109,12 +839,10 @@ ivas_error core_switching_pre_dec_fx(
         IF( NE_16( st_fx->last_L_frame, st_fx->L_frame ) && LE_16( st_fx->L_frame, L_FRAME16k ) && LE_16( st_fx->last_L_frame, L_FRAME16k ) )
         {
             test();
-#ifdef IVAS_CODE_SWITCHING
             IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
             {
-                lerp( st_fx->hFdCngDec->hFdCngCom->olapBufferAna + st_fx->last_L_frame, st_fx->hFdCngDec->hFdCngCom->olapBufferAna + st_fx->L_frame, st_fx->L_frame, st_fx->last_L_frame );
             }
-#endif
+
             lerp( st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2, st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2, shl( st_fx->L_frame, 1 ), shl( st_fx->last_L_frame, 1 ) );
             test();
             IF( LE_32( st_fx->total_brate, SID_2k40 ) && LE_32( st_fx->last_total_brate, SID_2k40 ) )
@@ -1150,22 +878,12 @@ ivas_error core_switching_pre_dec_fx(
  *---------------------------------------------------------------------*/
 
 ivas_error core_switching_post_dec_fx(
-    Decoder_State *st_fx, /* i/o: decoder state structure     */
-    Word16 *synth,        /* i/o: output synthesis			Qsynth*/
-#ifdef IVAS_CODE_SWITCHING
-    float *output,                  /* i/o: LB synth/upsampled LB synth         */
-    float output_mem[],             /* i  : OLA memory from last TCX/HQ frame   */
-    const IVAS_FORMAT ivas_format,  /* i  : IVAS format                         */
-    const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo */
-#endif
+    Decoder_State *st_fx,             /* i/o: decoder state structure     */
+    Word16 *synth,                    /* i/o: output synthesis			Qsynth*/
     const Word16 output_frame,        /* i  : frame length                Q0*/
     const Word16 core_switching_flag, /* i  : ACELP->HQ switching flag    Q0*/
-#ifdef IVAS_CODE_SWITCHING
-    const Word16 sba_dirac_stereo_flag, /* i  : signal stereo output for SBA DirAC  */
-    const Word16 nchan_out,             /* i  : number of output channels           */
-#endif
-    const Word16 last_element_mode, /* i  : element mode of previous frame      Q0*/
-    Word16 *Qsynth                  /* i/o: Scaling of ACELP exit (Q_syn2-1) or HQ exit (Qsynth); changes after this function */
+    const Word16 last_element_mode,   /* i  : element mode of previous frame      Q0*/
+    Word16 *Qsynth                    /* i/o: Scaling of ACELP exit (Q_syn2-1) or HQ exit (Qsynth); changes after this function */
 )
 {
     Word16 i, delay_comp, delta;
@@ -1180,20 +898,13 @@ ivas_error core_switching_post_dec_fx(
     HQ_DEC_HANDLE hHQ_core;
     ivas_error error;
 
-#ifdef IVAS_CODE_SWITCHING
-    int16_t offset;
-#endif
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) ( last_element_mode );
-#endif
     hBWE_TD = st_fx->hBWE_TD;
     hBWE_FD = st_fx->hBWE_FD;
     hHQ_core = st_fx->hHQ_core;
     error = IVAS_ERR_OK;
     move32();
 
-    // PMT("core_switching_post_dec_fx : Only handles has been converted, code needs to be entirely reviewed ")
-
     /* Rescale synthesis in Q0 to avoid multiple rescaling after */
     tmp = Find_Max_Norm16( synth, output_frame );
     Scale_sig( synth, output_frame, tmp );
@@ -1265,10 +976,7 @@ ivas_error core_switching_post_dec_fx(
         Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, hHQ_core->Q_old_postdec ) ); /* Qtmp */
         hHQ_core->Q_old_postdec = Qtmp;
         move16();
-
-        Copy( synth, &synth[delay_comp], output_frame );                   /* Qsynth */
-        Copy( st_fx->delay_buf_out_fx, synth, delay_comp );                /* Q0 */
-        Copy( &synth[output_frame], st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth */
+        delay_signal_fx( synth, output_frame, st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth, Q0 */
 
         test();
         test();
@@ -1301,12 +1009,8 @@ ivas_error core_switching_post_dec_fx(
 
             FOR( i = 0; i < shift; i++ )
             {
-                L_tmp = L_mult( ( *ptmp1 ), tmpF ); /*Qsynth + 16*/
-#ifdef BASOP_NOGLOB
+                L_tmp = L_mult( ( *ptmp1 ), tmpF );                                                           /*Qsynth + 16*/
                 *ptmp1 = round_fx_sat( L_mac_sat( L_tmp, add_sat( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) ); /*Qsynth*/
-#else
-                *ptmp1 = round_fx( L_mac( L_tmp, add( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) );         /*Qsynth*/
-#endif
                 ptmp1++;
                 ptmp2++;
                 tmpF = add( tmpF, tmp );
@@ -1325,12 +1029,8 @@ ivas_error core_switching_post_dec_fx(
             ptmp2 = hHQ_core->fer_samples_fx;
             FOR( i = 0; i < shift; i++ )
             {
-                L_tmp = L_mult( ( *ptmp1 ), tmpF ); /*Qsynth + 16*/
-#ifdef BASOP_NOGLOB
+                L_tmp = L_mult( ( *ptmp1 ), tmpF );                                                           /*Qsynth + 16*/
                 *ptmp1 = round_fx_sat( L_mac_sat( L_tmp, add_sat( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) ); /*Qsynth*/
-#else
-                *ptmp1 = round_fx( L_mac( L_tmp, add( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) );         /*Qsynth*/
-#endif
                 move16();
                 tmpF = add( tmpF, tmp );
                 ptmp1++;
@@ -1448,7 +1148,7 @@ ivas_error core_switching_post_dec_fx(
         move16();
         hBWE_FD->prev_weight_fx = 6554;
         move16(); /*0.2 in Q15*/
-        st_fx->prev_fb_ener_adjust_fx = 0;
+        hBWE_FD->prev_fb_ener_adjust_fx = 0;
         move16();
     }
 
@@ -1500,8 +1200,8 @@ ivas_error core_switching_post_dec_fx(
         swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
                           hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
 
-        set16_fx( st_fx->GainShape_Delay, 0, NUM_SHB_SUBFR / 2 );
-        swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx );
+        set16_fx( hBWE_TD->GainShape_Delay_fx, 0, NUM_SHB_SUBFR / 2 );
+        swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
 
         IF( EQ_16( output_frame, L_FRAME16k ) )
         {
@@ -1528,9 +1228,9 @@ ivas_error core_switching_post_dec_fx(
     test();
     test();
     test();
-    IF( EQ_32( st_fx->output_Fs, 48000 ) && ( ( GT_32( st_fx->last_core_brate, SID_2k40 ) ) && ( EQ_32( st_fx->core_brate, FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) ) ) )
+    IF( st_fx->hTdCngDec != NULL && EQ_32( st_fx->output_Fs, 48000 ) && ( ( GT_32( st_fx->last_core_brate, SID_2k40 ) ) && ( EQ_32( st_fx->core_brate, FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) ) ) )
     {
-        set16_fx( st_fx->interpol_3_2_cng_dec_fx, 0, INTERP_3_2_MEM_LEN );
+        set16_fx( st_fx->hTdCngDec->interpol_3_2_cng_dec_fx, 0, INTERP_3_2_MEM_LEN );
     }
 
     /* reset FB TBE buffers */
@@ -1564,7 +1264,6 @@ ivas_error core_switching_post_dec_ivas_fx(
     Word16 *synth,                      /* i/o: output synthesis                                                            Qsynth*/
     Word32 *output_fx,                  /* i/o: LB synth/upsampled LB synth														Q4*/
     Word16 output_mem_fx[],             /* i  : OLA memory from last TCX/HQ frame                                               Qx*/
-    const IVAS_FORMAT ivas_format,      /* i  : IVAS format                                                                       */
     const Word16 use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo                                             Q0*/
     const Word16 output_frame,          /* i  : frame length                                                                    Q0*/
     const Word16 core_switching_flag,   /* i  : ACELP->HQ switching flag                                                        Q0*/
@@ -1585,7 +1284,7 @@ ivas_error core_switching_post_dec_ivas_fx(
     FD_BWE_DEC_HANDLE hBWE_FD;
     HQ_DEC_HANDLE hHQ_core;
     ivas_error error;
-    int16_t offset;
+    Word16 offset;
 
     L_tmp = 0;
     move32();
@@ -1596,8 +1295,6 @@ ivas_error core_switching_post_dec_ivas_fx(
     error = IVAS_ERR_OK;
     move32();
 
-    // PMT("core_switching_post_dec_fx : Only handles has been converted, code needs to be entirely reviewed ")
-
     /* Rescale synthesis in Q0 to avoid multiple rescaling after */
     tmp = Find_Max_Norm16( synth, output_frame );
     Scale_sig( synth, output_frame, tmp ); /* Qsynth + tmp */
@@ -1707,13 +1404,7 @@ ivas_error core_switching_post_dec_ivas_fx(
             Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, hHQ_core->Q_old_postdec ) ); /* Qtmp */
             hHQ_core->Q_old_postdec = Qtmp;
             move16();
-            Word16 temp_buffer[L_FRAME48k];
-
-            Copy( st_fx->delay_buf_out_fx, temp_buffer, delay_comp );                             /* Q0 */
-            Copy( synth + sub( output_frame, delay_comp ), st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth */
-            move16();
-            Copy( synth, synth + delay_comp, sub( output_frame, delay_comp ) ); /* Qsynth */
-            Copy( temp_buffer, synth, delay_comp );                             /* Q0 */
+            delay_signal_fx( synth, output_frame, st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth, Q0 */
 
             test();
             test();
@@ -1753,12 +1444,8 @@ ivas_error core_switching_post_dec_ivas_fx(
 
                     FOR( i = 0; i < shift; i++ )
                     {
-                        L_tmp = L_mult( ( *ptmp1 ), tmpF ); /*Qsynth + 16*/
-#ifdef BASOP_NOGLOB
+                        L_tmp = L_mult( ( *ptmp1 ), tmpF );                                                           /*Qsynth + 16*/
                         *ptmp1 = round_fx_sat( L_mac_sat( L_tmp, add_sat( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) ); /*Qsynth*/
-#else
-                        *ptmp1 = round_fx( L_mac( L_tmp, add( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) ); /*Qsynth*/
-#endif
                         ptmp1++;
                         ptmp2++;
                         tmpF = add( tmpF, tmp );
@@ -1777,12 +1464,8 @@ ivas_error core_switching_post_dec_ivas_fx(
                     ptmp2 = hHQ_core->fer_samples_fx;
                     FOR( i = 0; i < shift; i++ )
                     {
-                        L_tmp = L_mult( ( *ptmp1 ), tmpF ); /*Qsynth + 16*/
-#ifdef BASOP_NOGLOB
+                        L_tmp = L_mult( ( *ptmp1 ), tmpF );                                                           /*Qsynth + 16*/
                         *ptmp1 = round_fx_sat( L_mac_sat( L_tmp, add_sat( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) ); /*Qsynth*/
-#else
-                        *ptmp1 = round_fx( L_mac( L_tmp, add( sub( 24576, tmpF ), 8192 ), ( *ptmp2 ) ) ); /*Qsynth*/
-#endif
                         move16();
                         tmpF = add( tmpF, tmp );
                         ptmp1++;
@@ -1809,7 +1492,7 @@ ivas_error core_switching_post_dec_ivas_fx(
                 Copy_Scale_sig( st_fx->previoussynth_fx, synth, delay_comp, *Qsynth ); /* Qsynth */
 
                 /* Overlap between TCX-LB and TCX-FB*/
-                Word16 tmpDelta = NS2SA( st_fx->output_Fs, DELAY_BWE_TOTAL_NS );
+                Word16 tmpDelta = NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS );
                 Word32 L_tmp2;
                 FOR( i = 0; i < tmpDelta; i++ )
                 {
@@ -1828,11 +1511,12 @@ ivas_error core_switching_post_dec_ivas_fx(
                 test();
                 test();
                 test();
-                IF( ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( ivas_format, ISM_FORMAT ) && EQ_16( st_fx->core, TCX_20_CORE ) /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && LE_32( st_fx->last_core_brate, SID_2k40 ) && GT_32( st_fx->core_brate, SID_2k40 ) )
+                IF( ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || ( st_fx->is_ism_format && EQ_16( st_fx->core, TCX_20_CORE ) /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && LE_32( st_fx->last_core_brate, SID_2k40 ) && GT_32( st_fx->core_brate, SID_2k40 ) )
                 {
                     /* smooth transitions to avoid pops in car noise items */
                     smoothTransitionDtxToTcx_fx( synth, output_frame, delay_comp );
                 }
+
                 /* Reset memories of CLDFBs */
                 IF( st_fx->cldfbAna != NULL )
                 {
@@ -1968,7 +1652,7 @@ ivas_error core_switching_post_dec_ivas_fx(
                 }
                 IF( output_mem_fx != NULL )
                 {
-                    Scale_sig( output_mem_fx, NS2SA( st_fx->output_Fs, STEREO_DFT32MS_OVL_NS ), Qtmp ); /* Qtmp */
+                    Scale_sig( output_mem_fx, NS2SA_FX2( st_fx->output_Fs, STEREO_DFT32MS_OVL_NS ), Qtmp ); /* Qtmp */
                 }
                 *Qsynth = Qtmp;
                 move16();
@@ -2096,7 +1780,7 @@ ivas_error core_switching_post_dec_ivas_fx(
         move16();
         hBWE_FD->prev_weight_fx = 6554;
         move16(); /*0.2 in Q15*/
-        st_fx->prev_fb_ener_adjust_fx = 0;
+        hBWE_FD->prev_fb_ener_adjust_fx = 0;
         move16();
     }
 
@@ -2157,12 +1841,11 @@ ivas_error core_switching_post_dec_ivas_fx(
             swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
                               hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
 
-            set16_fx( st_fx->GainShape_Delay, 0, NUM_SHB_SUBFR / 2 );
-            // swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx );
-            swb_tbe_reset_synth_ivas_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
+            set16_fx( hBWE_TD->GainShape_Delay_fx, 0, NUM_SHB_SUBFR / 2 );
+            swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
 
-            st_fx->hBWE_TD->prev_pow_exc16kWhtnd_fx32 = 1; /* Q0 1.f */
-            st_fx->hBWE_TD->prev_mix_factor_fx = 32767;    /* Q15 1.f */
+            hBWE_TD->prev_pow_exc16kWhtnd_fx32 = 1; /* Q0 1.f */
+            hBWE_TD->prev_mix_factor_fx = 32767;    /* Q15 1.f */
             move16();
             move16();
 
@@ -2186,7 +1869,7 @@ ivas_error core_switching_post_dec_ivas_fx(
         }
         ELSE IF( st_fx->hBWE_TD != NULL && ( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) ) )
         {
-            TBEreset_dec_ivas_fx( st_fx );
+            TBEreset_dec_fx( st_fx );
         }
 
         /* reset FB TBE buffers */
@@ -2218,9 +1901,9 @@ ivas_error core_switching_post_dec_ivas_fx(
     test();
     test();
     test();
-    IF( EQ_32( st_fx->output_Fs, 48000 ) && ( ( GT_32( st_fx->last_core_brate, SID_2k40 ) ) && ( EQ_32( st_fx->core_brate, FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) ) ) )
+    IF( st_fx->hTdCngDec != NULL && EQ_32( st_fx->output_Fs, 48000 ) && ( ( GT_32( st_fx->last_core_brate, SID_2k40 ) ) && ( EQ_32( st_fx->core_brate, FRAME_NO_DATA ) || EQ_32( st_fx->core_brate, SID_2k40 ) ) ) )
     {
-        set16_fx( st_fx->interpol_3_2_cng_dec_fx, 0, INTERP_3_2_MEM_LEN );
+        set16_fx( st_fx->hTdCngDec->interpol_3_2_cng_dec_fx, 0, INTERP_3_2_MEM_LEN );
     }
 
     return error;
@@ -2373,7 +2056,11 @@ static void core_switch_lb_upsamp_fx(
     }
 
     /* synthesis of the combined signal */
-    cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, output, i_mult( CLDFB_OVRLP_MIN_SLOTS, st->cldfbSyn->no_channels ), st->cldfbSyn );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+    cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, output, i_mult( CLDFB_OVRLP_MIN_SLOTS, st->cldfbSyn->no_channels ), 0, 0, st->cldfbSyn );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+    cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, output, i_mult( CLDFB_OVRLP_MIN_SLOTS, st->cldfbSyn->no_channels ), 0, st->cldfbSyn );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
 
     /*rescaling whole buffer to a common Q*/
     no_col = st->cldfbSyn->no_col;
@@ -2411,13 +2098,8 @@ static void smoothTransitionDtxToTcx_fx(
     Word16 i, filter_len;
     Word16 w, step, fade_in;
     Word32 mem;
-#ifdef MSAN_FIX
-    Word16 smoothing_input_buffer[2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k];
-    Word16 smoothing_out_buffer[2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k];
-#else
     Word16 smoothing_input_buffer[2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k];
     Word16 smoothing_out_buffer[2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k];
-#endif
 
     set16_fx( smoothing_input_buffer, 0, 2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k );
     set16_fx( smoothing_out_buffer, 0, 2 * NS2SA( 48000, DELAY_CLDFB_NS ) + TRANSITION_SMOOTHING_LEN_48k );
@@ -2479,3 +2161,1003 @@ static void smoothTransitionDtxToTcx_fx(
 
     return;
 }
+
+
+/*---------------------------------------------------------------------*
+ * core_switching_pre_dec()
+ *
+ * Preprocessing/preparation for ACELP/HQ core switching
+ *---------------------------------------------------------------------*/
+ivas_error core_switching_pre_dec_ivas_fx(
+    Decoder_State *st,                /* i/o: decoder state structure      */
+    const Word16 output_frame,        /* i  : frame length                 */
+    const Word32 last_core_brate_st0, /* i  : channel 0 last core bitrate  */
+    const Word16 nchan_out,           /* i  : number of output channels    */
+    const Word16 last_element_mode,   /* i  : last_element_mode            */
+    const Word32 last_element_brate,  /* i  : last element bitrate         */
+    Word16 Q_old_synthFB,
+    Word16 *Q_olapBufferSynth,
+    Word16 *Q_olapBufferSynth2 )
+{
+    Word32 tmp_fx; /*Q-12*/
+    Word16 i, oldLenClasBuff, newLenClasBuff;
+    ivas_error error;
+    Word16 exp = 25;
+    move16();
+    error = IVAS_ERR_OK;
+    move32();
+
+    /* Codec mode switching */
+    test();
+    test();
+    test();
+    IF( EQ_16( st->last_codec_mode, MODE2 ) || ( ( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) ) && ( st->element_mode > EVS_MONO ) ) )
+    {
+        st->mem_deemph_fx = st->syn[M];
+        move16();
+        set16_fx( st->agc_mem_fx, 0, 2 );
+        Scale_sig( &( st->mem_deemph_fx ), 1, st->Q_syn ); /* Brings mem_deemph to Qsyn */
+
+        Copy_Scale_sig( st->mem_syn2_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); /*Q-1*/
+
+        st->bpf_off = 1;
+        move16();
+        IF( st->hPFstat != NULL )
+        {
+            Scale_sig( st->hPFstat->mem_pf_in, L_SUBFR, st->Q_syn );    /* Post_filter mem  ,Q_syn*/
+            Scale_sig( st->hPFstat->mem_res2, DECMEM_RES2, st->Q_syn ); /* NB post_filter mem , Q_syn*/
+            Scale_sig( st->hPFstat->mem_stp, L_SUBFR, st->Q_syn );      /* Post_filter mem  ,Q_syn*/
+            set16_fx( st->hBPF->pst_old_syn_fx, 0, NBPSF_PIT_MAX );     /* BPF mem*/
+        }
+        IF( st->hBPF != NULL )
+        {
+            st->hBPF->pst_lp_ener_fx = round_fx( L_shl( Mpy_32_16_1( st->lp_error_ener, 0x6054 ), 2 + 8 ) ); /* convert from 15Q16, log2 -> 7Q8 10*log10  */
+            st->hBPF->pst_mem_deemp_err_fx = 0;
+            move16();
+            move16();
+        }
+        st->psf_lp_noise_fx = round_fx( L_shl( st->lp_noise, 1 ) ); // Q(23+1-16)->Q8
+        move16();
+
+        /* reset old HB synthesis buffer */
+        IF( EQ_16( st->last_L_frame, L_FRAME ) )
+        {
+            st->old_bwe_delay = NS2SA( st->output_Fs, MAX_DELAY_TBE_NS - DELAY_SWB_TBE_12k8_NS );
+        }
+        ELSE
+        {
+            st->old_bwe_delay = NS2SA( st->output_Fs, MAX_DELAY_TBE_NS - DELAY_SWB_TBE_16k_NS );
+        }
+        move16();
+        set16_fx( st->hb_prev_synth_buffer_fx, 0, NS2SA( 48000, DELAY_BWE_TOTAL_NS ) );
+
+        test();
+        IF( st->hBWE_TD != NULL && ( st->last_core != ACELP_CORE ) )
+        {
+            st->hBWE_TD->prev_hb_synth_fx_exp = 31;
+            move16();
+            /* reset BWE memories */
+            set16_fx( st->hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
+            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
+            move32();
+        }
+
+        /* reset upd_cnt */
+        st->upd_cnt = MAX_UPD_CNT;
+        move16();
+
+        st->igf = 0;
+        move16();
+
+        test();
+        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )
+        {
+            hf_synth_reset_fx( st->hBWE_zero );
+            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
+        }
+
+        IF( st->hBWE_FD != NULL )
+        {
+            set16_fx( st->hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
+        }
+
+        IF( st->hHQ_core != NULL )
+        {
+            set32_fx( st->hHQ_core->prev_env_fx, 0, SFM_N_WB );
+            set32_fx( st->hHQ_core->prev_normq_fx, 0, SFM_N_WB );
+
+            set32_fx( st->hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
+            set16_fx( st->hHQ_core->last_env_fx, 0, BANDS_MAX );
+
+            st->hHQ_core->last_max_pos_pulse = 0;
+            move16();
+
+            IF( GT_32( st->output_Fs, 16000 ) )
+            {
+                set32_fx( st->hHQ_core->prev_coeff_out_fx, 0, L_HQ_WB_BWE );
+            }
+
+            /* pre-echo */
+            st->hHQ_core->pastpre = 0;
+            move16();
+        }
+
+        /* reset the GSC pre echo energy threshold in case of switching */
+        if ( st->hGSCDec != NULL )
+        {
+            st->hGSCDec->Last_frame_ener_fx = MAX_32;
+            move32();
+        }
+
+        test();
+        IF( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) )
+        {
+            IF( st->element_mode == EVS_MONO )
+            {
+                st->last_core = HQ_CORE;
+                move16();
+
+                Copy32( st->hTcxDec->FBTCXdelayBuf_32, st->prev_synth_buffer32_fx, NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );
+                // Copy_Scale_sig_32_16( st->hTcxDec->FBTCXdelayBuf_32, st->prev_synth_buffer_fx, NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), -11 ); //Q11 -> Q0
+            }
+
+            IF( st->hHQ_core != NULL )
+            {
+                set32_fx( st->hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
+                set16_fx( st->hHQ_core->last_env_fx, 0, BANDS_MAX );
+                st->hHQ_core->last_max_pos_pulse = 0;
+                move16();
+
+                set16_fx( st->hHQ_core->prev_SWB_peak_pos_fx, 0, SPT_SHORTEN_SBNUM );
+                st->hHQ_core->prev_frm_hfe2 = 0;
+                st->hHQ_core->prev_stab_hfe2 = 0;
+                move16();
+                move16();
+            }
+        }
+
+        IF( st->prev_bfi != 0 )
+        {
+            Word16 delay_comp;
+
+            /*switch off Hq Voicing as it was not updated in MODE2*/
+            IF( st->hHQ_core != NULL )
+            {
+                st->hHQ_core->oldHqVoicing = 0;
+                st->hHQ_core->HqVoicing = 0;
+                move16();
+                move16();
+            }
+
+            delay_comp = NS2SA( st->output_Fs, DELAY_CLDFB_NS );
+            /*TODO To be tested:control not entering the block*/
+            test();
+            test();
+            IF( !st->last_con_tcx && ( st->last_core_bfi == ACELP_CORE ) && EQ_16( st->core, HQ_CORE ) )
+            {
+                /*TODO None of the test dtreams are entering this block,hence enabled assert(0)*/
+                assert( 0 );
+                Word32 *realBuffer_fx[CLDFB_NO_COL_MAX_SWITCH], *imagBuffer_fx[CLDFB_NO_COL_MAX_SWITCH];
+                Word32 realBufferTmp_fx[CLDFB_NO_COL_MAX_SWITCH][CLDFB_NO_CHANNELS_MAX], imagBufferTmp_fx[CLDFB_NO_COL_MAX_SWITCH][CLDFB_NO_CHANNELS_MAX];
+                Word32 syn_Overl_fx[320];
+                Word32 fer_samples_fx[960];
+                Copy_Scale_sig_16_32_DEPREC( st->hTcxDec->syn_Overl, syn_Overl_fx, 320, 15 );
+                Copy_Scale_sig_16_32_DEPREC( st->hHQ_core->fer_samples_fx, fer_samples_fx, 960, 15 );
+
+
+                FOR( i = 0; i < CLDFB_NO_COL_MAX_SWITCH; i++ )
+                {
+                    set32_fx( realBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
+                    set32_fx( imagBufferTmp_fx[i], 0, CLDFB_NO_CHANNELS_MAX );
+                    realBuffer_fx[i] = realBufferTmp_fx[i];
+                    imagBuffer_fx[i] = imagBufferTmp_fx[i];
+                }
+
+                /* CLDFB analysis of the synthesis at internal sampling rate */
+                IF( NE_32( ( error = cldfb_save_memory_ivas_fx( st->cldfbAna ) ), IVAS_ERR_OK ) )
+                {
+                    return error;
+                }
+
+                cldfbAnalysis_ivas_fx( syn_Overl_fx, realBuffer_fx, imagBuffer_fx, delay_comp, st->cldfbAna );
+                cldfb_restore_memory_ivas_fx( st->cldfbAna ); /*Assuming Q10*/
+
+                /* CLDFB synthesis of the combined signal */
+                IF( NE_32( ( error = cldfb_save_memory_ivas_fx( st->cldfbSyn ) ), IVAS_ERR_OK ) )
+                {
+                    return error;
+                }
+
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, fer_samples_fx, delay_comp, 0, 0, st->cldfbSyn );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, fer_samples_fx, delay_comp, 0, st->cldfbSyn );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfb_restore_memory_ivas_fx( st->cldfbSyn );
+                Copy_Scale_sig_32_16( syn_Overl_fx, st->hTcxDec->syn_Overl, 320, 15 );
+                Copy_Scale_sig_32_16( fer_samples_fx, st->hHQ_core->fer_samples_fx, 960, 9 );
+            }
+
+            test();
+            test();
+            IF( !st->last_con_tcx && ( st->last_core_bfi == ACELP_CORE ) && EQ_16( st->core, HQ_CORE ) )
+            {
+                lerp( st->hTcxDec->syn_Overl, st->hHQ_core->fer_samples_fx + delay_comp, shr( output_frame, 1 ), shr( st->last_L_frame, 1 ) );
+                /*Set to zero the remaining part*/
+                set16_fx( st->hHQ_core->fer_samples_fx + delay_comp + output_frame / 2, 0, sub( shr( output_frame, 1 ), delay_comp ) );
+            }
+        }
+
+        st->use_acelp_preq = 0;
+        st->reset_mem_AR = 0;
+        move16();
+        move16();
+    }
+
+    /*FEC*/
+    IF( LE_16( st->L_frame, L_FRAME16k ) )
+    {
+        test();
+        IF( LE_16( st->last_L_frame, L_FRAME16k ) && NE_16( st->core, HQ_CORE ) )
+        {
+            IF( NE_16( st->L_frame, st->last_L_frame ) )
+            {
+                IF( GT_16( st->L_frame, st->last_L_frame ) )
+                {
+                    oldLenClasBuff = mult_r( L_SYN_MEM_CLAS_ESTIM, div_s( st->last_L_frame, st->L_frame ) );
+                    newLenClasBuff = L_SYN_MEM_CLAS_ESTIM;
+                    move16();
+                }
+                ELSE
+                {
+                    oldLenClasBuff = L_SYN_MEM_CLAS_ESTIM;
+                    move16();
+                    newLenClasBuff = mult_r( L_SYN_MEM_CLAS_ESTIM, div_s( st->L_frame, st->last_L_frame ) );
+                }
+                lerp( &st->mem_syn_clas_estim_fx[L_SYN_MEM_CLAS_ESTIM - oldLenClasBuff], &st->mem_syn_clas_estim_fx[L_SYN_MEM_CLAS_ESTIM - newLenClasBuff], newLenClasBuff, oldLenClasBuff );
+            }
+        }
+        ELSE
+        {
+            set16_fx( st->mem_syn_clas_estim_fx, 0, L_SYN_MEM_CLAS_ESTIM );
+        }
+    }
+
+    /* Here we only handle cases where last_ppp and last_nelp not updated when coming from CodecB or other cores
+       within ACELP_CORE if switching from another bitarate to vbr, last_ppp and last_nelp is always updated in the previous frame */
+    test();
+    test();
+    IF( ( st->core == ACELP_CORE ) && ( ( st->last_core != ACELP_CORE ) || EQ_16( st->last_codec_mode, MODE2 ) ) )
+    {
+        st->last_ppp_mode_dec = 0;
+        st->last_nelp_mode_dec = 0;
+        move16();
+        move16();
+    }
+
+    /* Handle state reset of stat_noise_uv_mod memory */
+    test();
+    test();
+    test();
+    IF( ( st->core == ACELP_CORE ) && ( ( st->last_core != ACELP_CORE ) || EQ_16( st->last_codec_mode, MODE2 ) || LE_32( st->last_total_brate, PPP_NELP_2k80 ) ) )
+    {
+        st->act_count = 3;
+        st->uv_count = 0;
+        move16();
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( ( ( st->core == ACELP_CORE ) || EQ_16( st->core, AMR_WB_CORE ) ) && EQ_16( st->last_core, HQ_CORE ) ) || ( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( last_element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( nchan_out, 2 ) &&
+                                                                                                                     NE_32( st->core_brate, SID_2k40 ) && ( st->core_brate != FRAME_NO_DATA ) && ( ( last_core_brate_st0 == FRAME_NO_DATA ) || EQ_32( last_core_brate_st0, SID_2k40 ) ) ) )
+    {
+        test();
+        if ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
+        {
+            st->hPFstat->reset = 1;
+            move16();
+        }
+
+        IF( EQ_16( st->L_frame, L_FRAME16k ) )
+        {
+            Copy( TRWB2_Ave_fx, st->lsf_old_fx, M ); /* init of LSP */
+            Copy( TRWB2_Ave_fx, st->lsfoldbfi1_fx, M );
+            Copy( TRWB2_Ave_fx, st->lsfoldbfi0_fx, M );
+            Copy( TRWB2_Ave_fx, st->lsf_adaptive_mean_fx, M );
+            lsf2lsp_fx( st->lsf_old_fx, st->lsp_old_fx, M, INT_FS_16k );
+        }
+        ELSE
+        {
+            Copy( TRWB_Ave_fx, st->lsf_old_fx, M ); /* init of LSP */
+            Copy( TRWB_Ave_fx, st->lsfoldbfi1_fx, M );
+            Copy( TRWB_Ave_fx, st->lsfoldbfi0_fx, M );
+            Copy( TRWB_Ave_fx, st->lsf_adaptive_mean_fx, M );
+            lsf2lsp_fx( st->lsf_old_fx, st->lsp_old_fx, M, INT_FS_12k8 );
+        }
+
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && EQ_16( nchan_out, 2 ) && GT_32( st->core_brate, SID_2k40 ) && ( ( last_core_brate_st0 == FRAME_NO_DATA ) || EQ_32( last_core_brate_st0, SID_2k40 ) ) && st->hTcxDec != NULL )
+        {
+            /* Last frame was Stereo CNG and the synthesis memory is outdated -- reset */
+            set16_fx( st->hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 );
+            set16_fx( st->hFdCngDec->hFdCngCom->olapBufferAna_fx, 0, FFTLEN );
+            set16_fx( st->agc_mem_fx, 0, 2 );
+        }
+        st->mem_deemph_fx = 0;
+        move16();
+        IF( !st->last_con_tcx )
+        {
+            set16_fx( st->mem_syn2_fx, 0, M );
+        }
+        set16_fx( st->mem_syn1_fx, 0, M );
+        if ( st->hBWE_TD != NULL )
+        {
+            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
+            move32();
+        }
+
+        /* Reset ACELP parameters */
+        set16_fx( st->mem_MA_fx, 0, M );
+
+        IF( EQ_32( st->sr_core, INT_FS_16k ) )
+        {
+            Copy( GEWB2_Ave_fx, st->mem_AR_fx, M );
+        }
+        ELSE
+        {
+            Copy( GEWB_Ave_fx, st->mem_AR_fx, M );
+        }
+
+        st->tilt_code_fx = 0;
+        st->gc_threshold_fx = 0;
+        st->dm_fx.prev_gain_code = 0;
+        st->dm_fx.prev_state = 0;
+        move16();
+        move32();
+        move32();
+        move16();
+        set16_fx( st->dm_fx.prev_gain_pit, 0, 6 );
+
+        st->last_coder_type = GENERIC;
+        move16();
+
+        fer_energy_fx( output_frame, UNVOICED_CLAS, st->previoussynth_fx_32, 0, -1, &st->enr_old_fx, 1 ); /*Q-0*/
+        st->lp_gainp_fx = 0;
+        move16();
+        st->lp_gainc_fx = extract_h( Sqrt32( st->lp_ener_fx, &exp ) ); /*Q=15-exp*/
+        move16();
+        st->lp_gainc_fx = shr( st->lp_gainc_fx, sub( 12, exp ) ); /*Q3*/
+        move16();
+
+        st->last_voice_factor_fx = 0;
+        st->Last_GSC_noisy_speech_flag = 0;
+        move16();
+        move16();
+
+        /* reset CLDFB memories */
+        cldfb_reset_memory_fx( st->cldfbAna );
+        cldfb_reset_memory_fx( st->cldfbBPF );
+        cldfb_reset_memory_fx( st->cldfbSyn );
+
+        /* reset TBE memories */
+        test();
+        test();
+        IF( !st->last_con_tcx && !( ( EQ_16( st->last_core, HQ_CORE ) ) && ( st->element_mode > EVS_MONO ) ) )
+        {
+            set16_fx( st->old_exc_fx, 0, L_EXC_MEM_DEC );
+        }
+        ELSE IF( LT_16( st->L_frame, L_FRAME16k ) )
+        {
+            /* resample from 16kHz to 12.8kHZ */
+            synth_mem_updt2( st->L_frame, L_FRAME16k, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, DEC );
+        }
+
+        IF( st->hBWE_TD != NULL )
+        {
+            set16_fx( st->hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
+        }
+
+        test();
+        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )
+        {
+            hf_synth_reset_fx( st->hBWE_zero );
+            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
+        }
+
+        IF( st->hBWE_FD != NULL )
+        {
+            set16_fx( st->hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
+        }
+    }
+
+    test();
+    test();
+    test();
+    IF( ( ( st->core == ACELP_CORE ) || EQ_16( st->core, AMR_WB_CORE ) ) && ( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) ) )
+    {
+        IF( st->hBWE_TD != NULL )
+        {
+            st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
+            move32();
+            set16_fx( st->hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
+        }
+
+        st->tilt_code_fx = 0;
+        st->gc_threshold_fx = 0;
+        st->dm_fx.prev_gain_code = 0;
+        st->dm_fx.prev_state = 0;
+        move16();
+        move32();
+        move32();
+        move16();
+        set16_fx( st->dm_fx.prev_gain_pit, 0, 6 );
+        st->last_coder_type = GENERIC;
+        move16();
+        fer_energy_fx( output_frame, UNVOICED_CLAS, st->previoussynth_fx_32, 0, -1, &st->enr_old_fx, 1 ); /*Q-0*/
+
+        st->lp_gainp_fx = 0;
+        move16();
+        st->lp_gainc_fx = extract_h( Sqrt32( st->lp_ener_fx, &exp ) ); /*Q=15-exp*/
+        move16();
+        st->lp_gainc_fx = shr( st->lp_gainc_fx, sub( 12, exp ) ); /*Q3*/
+        move16();
+
+        st->last_voice_factor_fx = 0;
+        st->Last_GSC_noisy_speech_flag = 0;
+        move16();
+        move16();
+
+        test();
+        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )
+        {
+            hf_synth_reset_fx( st->hBWE_zero );
+            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
+        }
+
+        IF( st->hBWE_FD != NULL )
+        {
+            set16_fx( st->hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
+        }
+
+        test();
+        test();
+        test();
+        IF( EQ_16( nchan_out, 1 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) && LE_32( st->element_brate, IVAS_24k4 ) && GT_32( last_element_brate, IVAS_24k4 ) )
+        {
+            /* update cldbf state with previous frame TCX synthesis when going from a bitrate with residual coding to a bitrate without it */
+            Word16 offset;
+            offset = sub( st->cldfbAna->p_filter_length, st->cldfbAna->no_channels );
+            Word32 *old_synthFB_fx;
+            IF( ( old_synthFB_fx = (Word32 *) malloc( st->hTcxDec->old_synth_lenFB * sizeof( Word32 ) ) ) == NULL )
+            {
+                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for old_synth_lenFB (32 bit) \n" ) );
+            }
+            Copy_Scale_sig_16_32_no_sat( st->hTcxDec->old_synthFB_fx, old_synthFB_fx, st->hTcxDec->old_synth_lenFB, sub( Q10, Q_old_synthFB ) ); // Q10
+            Copy32( old_synthFB_fx + st->hTcxDec->old_synth_lenFB - offset, st->cldfbAna->cldfb_state_fx, offset );
+            st->cldfbAna->Q_cldfb_state = Q10;
+            move16();
+            IF( old_synthFB_fx )
+            free( old_synthFB_fx );
+        }
+    }
+
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_16( st->core, HQ_CORE ) && ( ( st->last_core == ACELP_CORE ) || EQ_16( st->last_core, AMR_WB_CORE ) || ( ( ( st->element_mode != EVS_MONO ) ) && ( NE_16( st->last_core, HQ_CORE ) ) ) ) )
+    {
+        set32_fx( st->hHQ_core->prev_env_fx, 0, SFM_N_WB );
+        set32_fx( st->hHQ_core->prev_normq_fx, 0, SFM_N_WB );
+
+        set32_fx( st->hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
+        set16_fx( st->hHQ_core->last_env_fx, 0, BANDS_MAX );
+        st->hHQ_core->last_max_pos_pulse = 0;
+        move16();
+
+        set16_fx( st->hHQ_core->prev_SWB_peak_pos_fx, 0, SPT_SHORTEN_SBNUM );
+        st->hHQ_core->prev_frm_hfe2 = 0;
+        st->hHQ_core->prev_stab_hfe2 = 0;
+        move16();
+        move16();
+        IF( GT_32( st->output_Fs, 16000 ) )
+        {
+            set32_fx( st->hHQ_core->prev_coeff_out_fx, 0, L_HQ_WB_BWE );
+        }
+
+        IF( st->element_mode != EVS_MONO )
+        {
+            /* Estimate mem_env_delta to reinit env_stab */
+            tmp_fx = L_max( 0, L_add( ENV_STAB_EST1_FX, L_add( Mult_32_16( st->stab_fac_smooth_lt_fx, ENV_STAB_EST2_FX ), Mult_32_16( st->log_energy_diff_lt_fx, ENV_STAB_EST3_FX ) ) ) ); /*Q12*/
+
+            st->hHQ_core->mem_env_delta = extract_l( L_min( MAX16B, tmp_fx ) ); /* Convert to Q12 and handle saturation */
+            move16();
+            test();
+            IF( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) )
+            {
+                set16_fx( st->hHQ_core->old_out_fx, 0, output_frame );
+                set32_fx( st->hHQ_core->old_out_LB_fx32, 0, L_FRAME16k );
+                set16_fx( st->hHQ_core->old_out_LB_fx, 0, L_FRAME16k );
+            }
+
+            st->hHQ_core->no_att_hangover = 0;
+            move16();
+            st->hHQ_core->energy_lt_fx = 2457600; /*300.0f Q13*/
+            move32();
+            set16_fx( st->hHQ_core->old_is_transient, 0, 3 );
+            set16_fx( st->hHQ_core->prev_noise_level_fx, 0, 2 );
+            st->hHQ_core->prev_R = 0;
+            move16();
+            set16_fx( st->hHQ_core->mem_norm + 1, 39, SFM_N_ENV_STAB - 1 );
+            st->hHQ_core->prev_hqswb_clas = HQ_NORMAL;
+            st->hHQ_core->prev_ni_ratio_fx = 16384; /*Q15*/
+            move16();
+            move16();
+            set16_fx( st->hHQ_core->prev_En_sb_fx, 0, NB_SWB_SUBBANDS );
+        }
+        ELSE
+        {
+            set16_fx( st->hHQ_core->old_out_fx, 0, output_frame );
+            set32_fx( st->hHQ_core->old_out_LB_fx32, 0, L_FRAME16k );
+        }
+    }
+
+    /* handle switching cases where preecho_sb was not called in the last frame (memory not up to date) */
+    IF( st->hHQ_core != NULL )
+    {
+        st->hHQ_core->pastpre = sub( st->hHQ_core->pastpre, 1 );
+        move16();
+        IF( st->hHQ_core->pastpre < 0 )
+        {
+            reset_preecho_dec_fx( st->hHQ_core );
+        }
+    }
+    test();
+    IF( st->core_brate == FRAME_NO_DATA )
+    {
+        st->VAD = 0;
+        st->m_frame_type = ZERO_FRAME;
+    }
+    ELSE IF( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, SID_1k75 ) )
+    {
+        st->VAD = 0;
+        st->m_frame_type = SID_FRAME;
+    }
+    ELSE
+    {
+        st->VAD = 1;
+        st->m_frame_type = ACTIVE_FRAME;
+    }
+
+    move16();
+    move16();
+    /*switch on CNA on active frames*/
+    IF( ( st->element_mode == EVS_MONO ) ) /* for IVAS modes, st->flag_cna is set earlier */
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( st->VAD && ( ( NE_16( st->core, AMR_WB_CORE ) && LE_32( st->total_brate, CNA_MAX_BRATE ) ) || ( EQ_16( st->core, AMR_WB_CORE ) && LE_32( st->total_brate, ACELP_8k85 ) ) ) )
+        {
+            st->flag_cna = 1;
+            move16();
+        }
+        ELSE IF( st->VAD || ( EQ_16( st->cng_type, FD_CNG ) && EQ_16( st->L_frame, L_FRAME16k ) ) )
+        {
+            st->flag_cna = 0;
+            move16();
+        }
+    }
+
+    if ( EQ_16( st->core, AMR_WB_CORE ) )
+    {
+        st->cng_type = LP_CNG;
+        move16();
+    }
+
+    /* Reconfigure CNG */
+    test();
+    test();
+    test();
+    test();
+    IF( st->hFdCngDec && ( NE_16( st->last_L_frame, st->L_frame ) || NE_16( st->hFdCngDec->hFdCngCom->frameSize, st->L_frame ) || ( st->ini_frame == 0 ) || NE_16( st->bwidth, st->last_bwidth ) ) )
+    {
+        /* || st->last_core == AMR_WB_CORE || st->last_codec_mode == MODE2)){*/
+        IF( NE_16( st->core, AMR_WB_CORE ) )
+        {
+            test();
+            IF( EQ_16( st->rf_flag, 1 ) && EQ_32( st->total_brate, ACELP_13k20 ) )
+            {
+                configureFdCngDec_ivas_fx( st->hFdCngDec, st->bwidth, ACELP_9k60, st->L_frame, st->last_L_frame, st->element_mode );
+            }
+            ELSE
+            {
+                configureFdCngDec_ivas_fx( st->hFdCngDec, st->bwidth, st->total_brate, st->L_frame, st->last_L_frame, st->element_mode );
+            }
+        }
+        ELSE
+        {
+            configureFdCngDec_ivas_fx( st->hFdCngDec, WB, ACELP_8k00, st->L_frame, st->last_L_frame, st->element_mode );
+
+            if ( st->VAD )
+            {
+                st->hFdCngDec->hFdCngCom->CngBitrate = st->total_brate;
+                move32();
+            }
+        }
+        test();
+        test();
+        IF( NE_16( st->last_L_frame, st->L_frame ) && LE_16( st->L_frame, L_FRAME16k ) && LE_16( st->last_L_frame, L_FRAME16k ) )
+        {
+            test();
+            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
+            {
+                lerp( st->hFdCngDec->hFdCngCom->olapBufferAna_fx + st->last_L_frame, st->hFdCngDec->hFdCngCom->olapBufferAna_fx + st->L_frame, st->L_frame, st->last_L_frame );
+            }
+
+            L_lerp_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ), Q_olapBufferSynth2 );
+
+            test();
+            IF( LE_32( st->total_brate, SID_2k40 ) && LE_32( st->last_total_brate, SID_2k40 ) )
+            {
+                L_lerp_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth_fx, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ), Q_olapBufferSynth );
+
+                IF( EQ_16( st->L_frame, L_FRAME ) )
+                {
+                    FOR( i = 0; i < ( st->L_frame * 2 ); i++ )
+                    {
+                        st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i] = Mult_32_16( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i], (Word16) 20480 /* 0.6250f in Q15 */ );
+                        move32();
+                    }
+                }
+                ELSE
+                {
+                    FOR( i = 0; i < ( st->L_frame * 2 ); i++ )
+                    {
+                        st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i] = Mult_32_16( L_shl( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i], 1 ), (Word16) 26214 /* 1.6f in Q14 */ );
+                        move32();
+                    }
+                }
+            }
+        }
+    }
+
+    return error;
+}
+/*---------------------------------------------------------------------*
+ * core_switching_hq_prepare_dec()
+ *
+ * Preprocessing in the first HQ frame after ACELP frame
+ * Modify bit allocation for HQ core by removing ACELP subframe budget
+ *---------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------*
+ * bandwidth_switching_detect()
+ *
+ * Classification for band-width switching
+ *---------------------------------------------------------------------*/
+
+void bandwidth_switching_detect_ivas_fx(
+    Decoder_State *st_fx /* i/o: encoder state structure */
+)
+{
+    test();
+    test();
+    IF( ( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && EQ_16( st_fx->idchan, 1 ) ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
+    {
+        /* there is no BWE in TD stereo secondary channel and in MDCT stereo, IGF is part of the core decoding -> no BW switching -> reset BWS counters */
+        st_fx->prev_bws_cnt = 0;
+        st_fx->bws_cnt = 0;
+        st_fx->bws_cnt1 = 0;
+        move16();
+        move16();
+        move16();
+
+        return;
+    }
+    /* update band-width switching counter */
+    test();
+    test();
+    test();
+    test();
+    IF( GE_16( st_fx->bws_cnt1, N_NS2W_FRAMES ) )
+    {
+        st_fx->bws_cnt1 = 0;
+        move16();
+    }
+    ELSE IF( GT_32( st_fx->total_brate, ACELP_9k60 ) && LT_32( st_fx->last_core_brate, ACELP_9k60 ) && EQ_16( st_fx->bwidth, SWB ) && EQ_16( st_fx->last_bwidth, WB ) && ( st_fx->last_low_rate_mode == 0 ) )
+    {
+        st_fx->bws_cnt1 = add( st_fx->bws_cnt1, 1 );
+        move16();
+    }
+    ELSE IF( st_fx->bws_cnt1 > 0 )
+    {
+        IF( LT_16( st_fx->bwidth, st_fx->last_bwidth ) )
+        {
+            st_fx->bws_cnt = sub( shl( sub( N_NS2W_FRAMES, st_fx->bws_cnt1 ), 1 ), 1 );
+            move16();
+        }
+        ELSE
+        {
+            st_fx->bws_cnt = 0;
+            move16();
+        }
+
+        IF( LT_16( st_fx->bwidth, st_fx->last_bwidth ) )
+        {
+            st_fx->bws_cnt1 = 0;
+            move16();
+        }
+        ELSE
+        {
+            IF( EQ_16( st_fx->bwidth, SWB ) )
+            {
+                st_fx->bws_cnt1 = add( st_fx->bws_cnt1, 1 );
+                move16();
+            }
+            ELSE
+            {
+                st_fx->bws_cnt1 = 0;
+                move16();
+            }
+        }
+    }
+
+    /* update band-width switching counter */
+    test();
+    test();
+    test();
+    IF( GE_16( st_fx->bws_cnt, N_WS2N_FRAMES ) )
+    {
+        st_fx->bws_cnt = 0;
+        move16();
+    }
+    ELSE IF( LT_32( st_fx->total_brate, ACELP_9k60 ) && GT_32( st_fx->last_core_brate, ACELP_9k60 ) && LT_16( st_fx->bwidth, st_fx->last_bwidth ) && EQ_16( st_fx->bwidth, WB ) )
+    {
+        st_fx->bws_cnt = add( st_fx->bws_cnt, 1 );
+        move16();
+    }
+    ELSE IF( st_fx->bws_cnt > 0 )
+    {
+        IF( GT_16( st_fx->bwidth, st_fx->last_bwidth ) )
+        {
+            st_fx->bws_cnt1 = shr( sub( N_WS2N_FRAMES, st_fx->bws_cnt ), 1 );
+            move16();
+        }
+        ELSE
+        {
+            st_fx->bws_cnt1 = 0;
+            move16();
+        }
+
+        IF( GT_16( st_fx->bwidth, st_fx->last_bwidth ) )
+        {
+            st_fx->bws_cnt = 0;
+            move16();
+        }
+        ELSE
+        {
+            IF( EQ_16( st_fx->bwidth, WB ) )
+            {
+                st_fx->bws_cnt = add( st_fx->bws_cnt, 1 );
+                move16();
+            }
+            ELSE
+            {
+                st_fx->bws_cnt = 0;
+                move16();
+            }
+        }
+    }
+
+    return;
+}
+
+
+/*---------------------------------------------------------------------*
+ * bw_switching_pre_proc()
+ *
+ * Band-width switching pre-processing
+ *---------------------------------------------------------------------*/
+void ivas_bw_switching_pre_proc_fx(
+    Decoder_State *st,               /* i/o: decoder state structure                  */
+    const Word32 last_element_brate, /* i  : last element bitrate                     */
+    const Word16 nchan_out /* i  : number of output channels                */,
+    Word32 *old_syn_12k8_16k_fx,
+    Word16 Q,
+    Word16 Q_audio )
+{
+    Word16 i;
+    Word32 syn_dct_fx[L_FRAME];
+
+
+    Flag Overflow = 0;
+    move32();
+
+    IF( st->element_mode > EVS_MONO )
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) && st->hBWE_FD != NULL && !( LE_32( st->core_brate, SID_2k40 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) && EQ_16( nchan_out, 2 ) ) && !( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( nchan_out, 1 ) && EQ_16( st->idchan, 1 ) && LE_32( last_element_brate, IVAS_SID_5k2 ) ) )
+        {
+            /* Calculate tilt of the ACELP core synthesis - needed in SWB BWE decoding */
+            Word16 old_syn_12k8_16k_tmp_16fx[L_FRAME16k];
+            Copy_Scale_sig_32_16( old_syn_12k8_16k_fx, old_syn_12k8_16k_tmp_16fx, st->L_frame, sub( -1, Q ) );
+            st->tilt_wb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( old_syn_12k8_16k_tmp_16fx, -1, st->L_frame ), sub( Q, 8 ) ) ); // Q24+(Q-8) - 16
+            move16();
+        }
+
+        return;
+    }
+
+
+    test();
+    test();
+    IF( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) )
+    {
+        /*----------------------------------------------------------------------*
+         * Calculate tilt of the ACELP core synthesis
+         *----------------------------------------------------------------------*/
+
+        st->tilt_wb_fx = ivas_calc_tilt_bwe_fx( old_syn_12k8_16k_fx, Q, st->L_frame );
+        move16();
+        /*-------------------------------------------------------------------------------*
+         * Calculate frequency energy of 0~3.2kHz and 3.2~6.4kHz the ACELP core synthesis
+         *-------------------------------------------------------------------------------*/
+        edct_fx( old_syn_12k8_16k_fx, syn_dct_fx, L_FRAME, &Q );
+        Word64 W_tmp = 0;
+        move64();
+        Word32 tmp;
+        Word16 shift;
+        FOR( i = 0; i < L_FRAME / 2; i++ )
+        {
+            W_tmp = W_add( W_tmp, W_shr( W_mult0_32_32( syn_dct_fx[i], syn_dct_fx[i] ), Q ) );
+        }
+        shift = W_norm( W_tmp );
+        W_tmp = W_shl( W_tmp, shift );
+        tmp = W_extract_h( W_tmp );
+        tmp = L_shr( tmp, 8 );
+
+        tmp = getSqrtWord32( tmp );
+        st->enerLL_fx = tmp;
+        move32();
+        st->enerLL_fx_Q = shr( sub( add( Q, shift ), 32 ), 1 );
+        move16();
+        W_tmp = 0;
+        move64();
+        FOR( ; i < L_FRAME; i++ )
+        {
+            W_tmp = W_add( W_tmp, W_shr( W_mult0_32_32( syn_dct_fx[i], syn_dct_fx[i] ), Q ) );
+        }
+        shift = W_norm( W_tmp );
+        W_tmp = W_shl( W_tmp, shift );
+        tmp = W_extract_h( W_tmp ); // Q = Q + shift - 32
+        tmp = L_shr( tmp, 7 );      // divide by 128
+        tmp = getSqrtWord32( tmp );
+        st->enerLH_fx = tmp;
+        move32();
+        st->enerLH_fx_Q = shr( sub( add( Q, shift ), 32 ), 1 );
+        move16();
+    }
+    ELSE
+    {
+        IF( st->hHQ_core->old_is_transient[0] )
+        {
+            Word32 tmp, L_tmp = 0;
+            move32();
+            FOR( i = 0; i < 32; i++ )
+            {
+                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
+            }
+            tmp = L_shr( L_tmp, 5 ); // divide by 32
+            tmp = getSqrtWord32( tmp );
+            st->enerLL_fx = tmp;
+            move32();
+            st->enerLL_fx_Q = Q_audio;
+            move16();
+
+            L_tmp = 0;
+            move32();
+            FOR( ; i < 64; i++ )
+            {
+                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
+            }
+
+            tmp = L_shr( L_tmp, 5 ); // divide by 32
+            tmp = getSqrtWord32( tmp );
+            st->enerLH_fx = tmp;
+            move32();
+            st->enerLH_fx_Q = Q_audio;
+            move16();
+        }
+        ELSE
+        {
+            Word32 tmp, L_tmp = 0;
+            move32();
+            FOR( i = 0; i < L_FRAME / 2; i++ )
+            {
+                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
+            }
+            tmp = L_shr( L_tmp, 5 ); // divide by 32
+            tmp = getSqrtWord32( tmp );
+            st->enerLL_fx = tmp;
+            move32();
+            st->enerLL_fx_Q = Q_audio;
+            move16();
+
+            L_tmp = 0;
+            move32();
+            FOR( ; i < L_FRAME; i++ )
+            {
+                L_tmp = L_mac0_o( L_tmp, st->t_audio_q_fx[i], st->t_audio_q_fx[i], &Overflow );
+            }
+            tmp = L_shr( L_tmp, 5 ); // divide by 32
+            tmp = getSqrtWord32( tmp );
+            st->enerLL_fx = tmp;
+            move32();
+            st->enerLL_fx_Q = Q_audio;
+            move16();
+        }
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_16( st->last_bwidth, 0 ) && LE_16( st->extl, SWB_CNG ) )
+    {
+        st->prev_ener_shb_fx = 0;
+        move16();
+        IF( st->hBWE_FD != NULL )
+        {
+            set16_fx( st->hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );
+        }
+    }
+    ELSE IF( ( ( ( st->core == ACELP_CORE ) && ( EQ_16( st->last_core, HQ_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) || EQ_16( st->last_core, TCX_20_CORE ) ) ) || ( EQ_16( st->core, st->last_core ) && NE_16( st->extl, st->last_extl ) ) ) && GE_16( st->last_bwidth, SWB ) )
+    {
+        st->attenu_fx = 3277; // 0.1f in Q15
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    if ( EQ_16( st->last_core, HQ_CORE ) || ( ( st->last_core == ACELP_CORE ) && !( EQ_16( st->last_extl, WB_TBE ) || EQ_16( st->last_extl, SWB_TBE ) || EQ_16( st->last_extl, FB_TBE ) ) && GT_32( st->core_brate, ACELP_8k00 ) ) )
+    {
+        st->prev_fractive = 0;
+        move16();
+    }
+
+    return;
+}
diff --git a/lib_dec/d_gain2p.c b/lib_dec/d_gain2p.c
deleted file mode 100644
index bcdeaa0415b3291cebf3e4463a6e123980ab180f..0000000000000000000000000000000000000000
--- a/lib_dec/d_gain2p.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/d_gain2p_fx.c b/lib_dec/d_gain2p_fx.c
index 3af3affc3e792c8ee82c453d53181a0e24574b24..4d1c101c05441b731f8d866b3d1b8e5cc92c40e3 100644
--- a/lib_dec/d_gain2p_fx.c
+++ b/lib_dec/d_gain2p_fx.c
@@ -43,11 +43,7 @@ static Word32 calc_gain_code_fx( Word16 g_code, Word16 gcode0, Word16 exp_gcode0
 
     L_tmp = L_mult( g_code, gcode0 ); /* Q11*Q15 -> Q27 */
     exp_gcode0 = add( exp_gcode0, -11 );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_sat( L_tmp, exp_gcode0 ); /*   Q27 -> Q16 */
-#else
-    L_tmp = L_shl( L_tmp, exp_gcode0 );                   /*   Q27 -> Q16 */
-#endif
 
     return L_tmp;
 }
@@ -81,11 +77,7 @@ static void Mode2_gain_dec_mless_fx(
 
     /**gain_inov = 1.0f / (float)sqrt( ( dot_product( code, code, lcode ) + 0.01f ) / lcode);*/
     L_tmp = calc_gain_inov( code, lcode, &L_tmp1, &exp_L_tmp1 );
-#ifdef BASOP_NOGLOB
     *gain_inov = round_fx_sat( L_shl_sat( L_tmp, 15 - 3 ) ); /* gain_inov in Q12 */
-#else
-    *gain_inov = round_fx( L_shl( L_tmp, 15 - 3 ) );      /* gain_inov in Q12 */
-#endif
     move16();
     /*-----------------------------------------------------------------*
      * Select the gains quantization table
@@ -203,11 +195,7 @@ static void gain_dec_uv_fx(
     move16();
     *past_gcode = L_tmp;
     move32();
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_sat( Mpy_32_16_1( L_tmp, *gain_inov ), 3 ); /* Q16*Q12 -> Q13 -> Q16 */
-#else
-    L_tmp = L_shl( Mpy_32_16_1( L_tmp, *gain_inov ), 3 ); /* Q16*Q12 -> Q13 -> Q16 */
-#endif
     *gain_code = L_tmp;
     move32();
 
@@ -269,11 +257,7 @@ static void gain_dec_gacelp_uv_fx(
     /* g_code2 = pred_nrg_frame * norm_code2; */
     L_tmp = Mpy_32_16_1( pred_nrg_frame, norm_code2 ); /* 18Q13 */
     i = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
     g_code2 = round_fx_sat( L_shl_sat( L_tmp, i ) );
-#else
-    g_code2 = round_fx( L_shl( L_tmp, i ) );
-#endif
     exp_gcode2 = sub( 18, i );
 
     /*-----------------------------------------------------------------*
@@ -313,11 +297,7 @@ static void gain_dec_gacelp_uv_fx(
     *past_gcode = L_shl( L_tmp1, sub( exp_L_tmp1, 15 ) ); /* Q16 */
     move32();
 
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( Mpy_32_16_1( *past_gcode, *gain_inov ), 3 );
-#else
-    *gain_code = L_shl( Mpy_32_16_1( *past_gcode, *gain_inov ), 3 );
-#endif
     move32();
 
 
diff --git a/lib_dec/dec2t32.c b/lib_dec/dec2t32.c
deleted file mode 100644
index 6b94be229c8053da69de10ebf2fa0cba4eb9830b..0000000000000000000000000000000000000000
--- a/lib_dec/dec2t32.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*----------------------------------------------------------------------------------*
- * dec_acelp_2t32()
- *
- * 12 bits algebraic codebook decoder.
- * 2 track x 32 positions per track = 64 samples.
- *
- * 12 bits --> 2 pulses in a frame of 64 samples.
- *
- * All pulses can have two (2) possible amplitudes: +1 or -1.
- * Each pulse can have 32 possible positions.
- *
- * See cod2t32.c for more details of the algebraic code.
- *----------------------------------------------------------------------------------*/
diff --git a/lib_dec/dec4t64.c b/lib_dec/dec4t64.c
deleted file mode 100644
index e931b0a6816a8af39857cb89c8b4839671fe8de6..0000000000000000000000000000000000000000
--- a/lib_dec/dec4t64.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec4t64_fx.c b/lib_dec/dec4t64_fx.c
index 58f9048c4c69194c0874af32fad1343b5a9bde92..ee6ef65a6ce3aa2b91e1020f51ad5f12405baa84 100644
--- a/lib_dec/dec4t64_fx.c
+++ b/lib_dec/dec4t64_fx.c
@@ -793,242 +793,7 @@ void D_ACELP_decode_43bit_fx( UWord16 idxs[], Word16 code[], Word16 *pulsestrack
 
     return;
 }
-#ifdef IVAS_CODE_FCB
 
-/*-------------------------------------------------------*
- * dec_1p_N1()
- *
- * Decode 1 pulse with N+1 bits
- *-------------------------------------------------------*/
-
-static void dec_1p_N1_L_subfr(
-    const int32_t index,  /* i  : quantization index    */
-    const int16_t nb_pos, /* i  : number of positions   */
-    const int16_t N,      /* i  : nb. of bits           */
-    int16_t pos[]         /* o  : pulse position        */
-)
-{
-    int16_t i, pos1;
-    int32_t mask;
-
-    mask = ( ( 1 << N ) - 1 );
-    pos1 = (int16_t) ( index & mask );
-    i = (int16_t) ( index >> N ) & 1;
-
-    if ( i == 1 )
-    {
-        pos1 += nb_pos;
-    }
-
-    pos[0] = pos1;
-
-    return;
-}
-
-/*-------------------------------------------------------*
- * add_pulses()
- *
- * Add decoded pulses to the codeword
- *-------------------------------------------------------*/
-
-static void add_pulses_L_subfr(
-    const int16_t nb_pos,   /* i  : number of positions */
-    const int16_t pos[],    /* i  : pulse position      */
-    const int16_t nb_pulse, /* i  : nb. of pulses       */
-    const int16_t track,    /* i  : no. of the tracks   */
-    float code[]            /* i/o: decoded codevector  */
-)
-{
-    int16_t i, k;
-
-    for ( k = 0; k < nb_pulse; k++ )
-    {
-        i = ( ( pos[k] & ( nb_pos - 1 ) ) * NB_TRACK_FCB_4T ) + track;
-        if ( ( pos[k] & nb_pos ) == 0 )
-        {
-            code[i] += 1.0f;
-        }
-        else
-        {
-            code[i] -= 1.0f;
-        }
-    }
-
-    return;
-}
-
-/*----------------------------------------------------------------------------------*
- * dec_acelp_fast()
- *
- * fast algebraic codebook decoder
- *----------------------------------------------------------------------------------*/
-
-void dec_acelp_fast(
-    Decoder_State *st,       /* i/o: decoder state structure                 */
-    const int16_t cdk_index, /* i  : codebook index                          */
-    float code[],            /* o  : algebraic (fixed) codebook excitation   */
-    const int16_t L_subfr    /* i  : subframe length                         */
-)
-{
-    int16_t k, pos[7], skip_track;
-    int32_t L_index;
-    PulseConfig config;
-
-    skip_track = -1;
-    set_f( code, 0.0f, L_subfr );
-
-    if ( L_subfr == L_SUBFR )
-    {
-        config = PulseConfTable[cdk_index];
-
-        if ( cdk_index == 2 )
-        {
-            dec_acelp_2t32( st, code );
-        }
-        else if ( config.nb_pulse == 2 )
-        {
-            /* 10 bits,  2 pulses, 4 tracks  1010 (used only even tracks) */
-            for ( k = 0; k < NB_TRACK_FCB_4T - 1; k += 2 )
-            {
-                L_index = get_next_indice( st, 5 );
-                dec_1p_N1( L_index, 4, 0, pos );
-                add_pulses( pos, 1, k, code );
-            }
-        }
-        else if ( config.nb_pulse == 3 )
-        {
-            if ( config.codetrackpos == TRACKPOS_FIXED_FIRST )
-            {
-                /* 15 bits,  3 pulses, 4 tracks  1110 fixed track to first  ? */
-                for ( k = 0; k < NB_TRACK_FCB_4T - 1; k++ )
-                {
-                    L_index = get_next_indice( st, 5 );
-                    dec_1p_N1( L_index, 4, 0, pos );
-                    add_pulses( pos, 1, k, code );
-                }
-            }
-            else if ( config.codetrackpos == TRACKPOS_FREE_THREE )
-            {
-                /* 17 bits,  3 pulses, 4 tracks  (used all tracks) - 1110, 1101, 1011, 0111 */
-                skip_track = get_next_indice( st, 2 );
-                for ( k = 0; k < NB_TRACK_FCB_4T; k++ )
-                {
-                    if ( k != skip_track )
-                    {
-                        L_index = get_next_indice( st, 5 );
-                        dec_1p_N1( L_index, 4, 0, pos );
-                        add_pulses( pos, 1, k, code );
-                    }
-                }
-            }
-        }
-        else
-        {
-            if ( config.bits == 20 )
-            {
-                skip_track = -1;
-            }
-            else if ( config.codetrackpos == TRACKPOS_FIXED_FIRST )
-            {
-                skip_track = 0;
-            }
-            else if ( config.codetrackpos == TRACKPOS_FREE_ONE )
-            {
-                skip_track = get_next_indice( st, 2 );
-            }
-
-            for ( k = 0; k < NB_TRACK_FCB_4T; k++ )
-            {
-                if ( k == skip_track )
-                {
-                    L_index = get_next_indice( st, 9 );
-                    dec_2p_2N1( L_index, 4, 0, pos );
-                    add_pulses( pos, 2, k, code );
-                }
-                else
-                {
-                    L_index = get_next_indice( st, 5 );
-                    dec_1p_N1( L_index, 4, 0, pos );
-                    add_pulses( pos, 1, k, code );
-                }
-            }
-        }
-    }
-    else /* L_subfr == 2*L_SUBFR */
-    {
-        config.bits = cdk_index;
-
-        if ( cdk_index == 14 )
-        {
-            /* 14 bits, 2 pulses, 2 tracks: 11 (used all tracks) */
-            int16_t index, i0, i1;
-
-            index = get_next_indice( st, 14 );
-
-            i0 = ( ( index >> 7 ) & ( NB_POS_FCB_2T_128 - 1 ) ) * NB_TRACK_FCB_2T;
-            i1 = ( ( index & ( NB_POS_FCB_2T_128 - 1 ) ) * NB_TRACK_FCB_2T ) + 1;
-
-            code[i0] = -1.0f;
-            if ( ( index & 0x2000 ) == 0 )
-            {
-                code[i0] = 1.0f;
-            }
-
-            code[i1] = -1.0f;
-            if ( ( index & 0x40 ) == 0 )
-            {
-                code[i1] = 1.0f;
-            }
-        }
-        else if ( cdk_index == 12 )
-        {
-            /* 12 bits, 2 pulses, 4 tracks: 1010 (used only even tracks) */
-            for ( k = 0; k < NB_TRACK_FCB_4T - 1; k += 2 )
-            {
-                L_index = get_next_indice( st, 6 );
-                dec_1p_N1_L_subfr( L_index, NB_POS_FCB_4T_128, 5, pos );
-                add_pulses_L_subfr( NB_POS_FCB_4T_128, pos, 1, k, code );
-            }
-        }
-        else if ( cdk_index == 18 )
-        {
-            /* 18 bits, 3 pulses, 4 tracks: 1110 (used first three tracks) */
-            for ( k = 0; k < NB_TRACK_FCB_4T - 1; k++ )
-            {
-                L_index = get_next_indice( st, 6 );
-                dec_1p_N1_L_subfr( L_index, NB_POS_FCB_4T_128, 5, pos );
-                add_pulses_L_subfr( NB_POS_FCB_4T_128, pos, 1, k, code );
-            }
-        }
-        else if ( cdk_index == 20 )
-        {
-            /* 20 bits, 3 pulses, 4 tracks (used all tracks): 1110, 1101, 1011, 0111 */
-            skip_track = get_next_indice( st, 2 );
-            for ( k = 0; k < NB_TRACK_FCB_4T; k++ )
-            {
-                if ( k != skip_track )
-                {
-                    L_index = get_next_indice( st, 6 );
-                    dec_1p_N1_L_subfr( L_index, NB_POS_FCB_4T_128, 5, pos );
-                    add_pulses_L_subfr( NB_POS_FCB_4T_128, pos, 1, k, code );
-                }
-            }
-        }
-        else if ( cdk_index == 24 )
-        {
-            /* 24 bits, 4 pulses, 4 tracks: 1111 */
-            for ( k = 0; k < NB_TRACK_FCB_4T; k++ )
-            {
-                L_index = get_next_indice( st, 6 );
-                dec_1p_N1_L_subfr( L_index, NB_POS_FCB_4T_128, 5, pos );
-                add_pulses_L_subfr( NB_POS_FCB_4T_128, pos, 1, k, code );
-            }
-        }
-    }
-
-    return;
-}
-#endif
 
 /*-------------------------------------------------------*
  * dec_1p_N1()
diff --git a/lib_dec/dec_LPD.c b/lib_dec/dec_LPD.c
deleted file mode 100644
index 9af4fa20ed52472eebe81f066ec3f3d89807e31d..0000000000000000000000000000000000000000
--- a/lib_dec/dec_LPD.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "cnst.h"
-#include "basop_proto_func.h"
-#include "stat_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-
-/*-------------------------------------------------------------------*
- * decoder_LPD()
- *
- * Core decoder MODE2
- *--------------------------------------------------------------------*/
diff --git a/lib_dec/dec_LPD_fx.c b/lib_dec/dec_LPD_fx.c
index f3443349a1a542e0ff66f85b2ba1650107e1c2f8..b638a36e55bbc3de081e4667c74e8cc8c5be9b66 100644
--- a/lib_dec/dec_LPD_fx.c
+++ b/lib_dec/dec_LPD_fx.c
@@ -455,7 +455,7 @@ void decoder_LPD_fx(
         }
         if ( bfi )
         {
-            st->plcInfo.nbLostCmpt = add( st->plcInfo.nbLostCmpt, 1 );
+            st->hPlcInfo->nbLostCmpt = add( st->hPlcInfo->nbLostCmpt, 1 );
             move16();
         }
     }
@@ -555,7 +555,8 @@ void decoder_LPD_fx(
                         st->relax_prev_lsf_interp = 2;
                         move16();
                     }
-                    int_lsp4_fx( L_frame, &lsp[0], lspmid, &lsp[M], Aq, M, st->relax_prev_lsf_interp );
+
+                    int_lsp4_ivas_fx( L_frame, &lsp[0], lspmid, &lsp[M], Aq, M, st->relax_prev_lsf_interp );
                 }
                 ELSE
                 {
@@ -569,11 +570,7 @@ void decoder_LPD_fx(
         IF( bfi != 0 && ( st->last_core != ACELP_CORE ) )
         {
             /* PLC: [TCX: TD PLC] */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-            con_tcx_fx( st, &synthFB[0], -1.f, NULL, 0, NULL );
-#else
             con_tcx_fx( st, &synthFB[0] );
-#endif
             lerp( synthFB, synth, st->L_frame, hTcxDec->L_frameTCX );
             st->con_tcx = 1;
             move16();
@@ -634,7 +631,7 @@ void decoder_LPD_fx(
 
         /* PLC: [TCX: Tonal Concealment] */
         /* Signal that this frame is not TCX */
-        TonalMDCTConceal_UpdateState( &st->tonalMDCTconceal, 0, 0, 0, 0 );
+        TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, 0, 0, 0, 0 );
 
         IF( bfi == 0 )
         {
@@ -752,21 +749,18 @@ void decoder_LPD_fx(
               EQ_16( st->last_codec_mode, MODE2 ) ) )
         {
             /* waveform adjustment */
+            concealment_signal_tuning_fx( st, bfi, synthFB, past_core_mode );
 
-            concealment_signal_tuning_fx( bfi, st->core,
-                                          synthFB, &st->plcInfo, st->nbLostCmpt, st->prev_bfi,
-                                          st->tonalMDCTconceal.secondLastPcmOut,
-                                          past_core_mode, st->tonalMDCTconceal.lastPcmOut, st );
             test();
             test();
             test();
-            IF( ( bfi || st->prev_bfi ) && st->plcInfo.Pitch_fx && ( ( st->plcInfo.concealment_method == TCX_NONTONAL ) ) )
+            IF( ( bfi || st->prev_bfi ) && st->hPlcInfo->Pitch_fx && ( ( st->hPlcInfo->concealment_method == TCX_NONTONAL ) ) )
             {
                 lerp( synthFB, synth, L_frame, L_frameTCX );
                 test();
                 if ( !bfi && st->prev_bfi )
                 {
-                    st->plcInfo.Pitch_fx = 0;
+                    st->hPlcInfo->Pitch_fx = 0;
                     move16();
                 }
             }
@@ -774,13 +768,9 @@ void decoder_LPD_fx(
 
         IF( !bfi )
         {
-            TonalMDCTConceal_SaveTimeSignal( &st->tonalMDCTconceal, synthFB, L_frameTCX );
+            TonalMDCTConceal_SaveTimeSignal( st->hTonalMDCTConc, synthFB, L_frameTCX );
         }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        decoder_tcx_post_fx( st, synth, synthFB, Aq, bfi, 0 );
-#else
         decoder_tcx_post_fx( st, synth, synthFB, Aq, bfi );
-#endif
         IF( EQ_16( st->core, TCX_20_CORE ) )
         {
             /* LPC Interpolation for BWE/post-processing */
@@ -977,13 +967,13 @@ void decoder_LPD_fx(
     {
         if ( !bfi )
         {
-            st->plcInfo.nbLostCmpt = 0;
+            st->hPlcInfo->nbLostCmpt = 0;
             move16();
         }
 
         IF( st->core == 0 )
         {
-            set_state( st->plcInfo.Transient, st->core, MAX_POST_LEN );
+            set_state( st->hPlcInfo->Transient, st->core, MAX_POST_LEN );
         }
     }
 
diff --git a/lib_dec/dec_ace.c b/lib_dec/dec_ace.c
deleted file mode 100644
index da306d76e7c9cb3b04b81593815e8dd94e8ae62a..0000000000000000000000000000000000000000
--- a/lib_dec/dec_ace.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include <math.h>
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec_ace_fx.c b/lib_dec/dec_ace_fx.c
index df518a39549fff9de4220971f06d99556c8a9ec9..9c366e3f3190c2138e9940a69e30a447609a0d1f 100644
--- a/lib_dec/dec_ace_fx.c
+++ b/lib_dec/dec_ace_fx.c
@@ -508,27 +508,15 @@ void decoder_acelp_fx(
                     Ltmp = Mpy_32_16_1( gain_code2, code2[i] );
                     Ltmp = L_shl( Ltmp, add( 5, st->Q_exc ) );
                     Ltmp = L_mac( Ltmp, gain_pit, exc[i + i_subfr] );
-#ifdef BASOP_NOGLOB
                     exc2[( i + i_subfr )] = round_fx_sat( L_shl_sat( Ltmp, 1 ) );
-#else
-                    exc2[i + i_subfr] = round_fx( L_shl( Ltmp, 1 ) );
-#endif
                     move16();
                     Ltmp2 = Mpy_32_16_1( gain_code, code[i] );
                     Ltmp2 = L_shl( Ltmp2, add( 5, st->Q_exc ) );
                     Ltmp = L_add( Ltmp, Ltmp2 );
                     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
                     Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here */
-#else
-                    Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-#endif
                     BASOP_SATURATE_WARNING_ON_EVS
-#ifdef BASOP_NOGLOB
                     exc[( i + i_subfr )] = round_fx_sat( Ltmp );
-#else
-                    exc[i + i_subfr] = round_fx( Ltmp );
-#endif
                     move16();
                 }
                 tmp2 = L_SUBFR;
@@ -544,30 +532,24 @@ void decoder_acelp_fx(
             move16();
             IF( st->igf != 0 )
             {
-                prep_tbe_exc_fx( st->L_frame,
-#ifdef ADD_IVAS_TBE_CODE
-                                 L_SUBFR,
-#endif
-                                 i_subfr, gain_pit, gain_code, code, st->voice_fac, &voice_factors[idx], bwe_exc,
-                                 gain_preQ, code_preQ, st->Q_exc, T0, T0_frac, st->coder_type, st->core_brate
-#ifdef ADD_IVAS_TBE_CODE
-                                 ,
-                                 st->element_mode, st->idchan, st->hBWE_TD != NULL, 0
-#endif
-                );
+                prep_tbe_exc_fx( st->L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, st->voice_fac, &voice_factors[idx], bwe_exc,
+                                 gain_preQ, code_preQ, st->Q_exc, T0, T0_frac, st->coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, 0 );
             }
 
             /*---------------------------------------------------------*
              * Enhance the excitation                                  *
              *---------------------------------------------------------*/
+
             E_UTIL_enhancer( st->voice_fac, stab_fac, st->past_gcode, gain_inov, &( st->gc_threshold_fx ), code, &exc2[i_subfr],
                              gain_pit, &st->dm_fx.prev_gain_code, st->dm_fx.prev_gain_pit, &st->dm_fx.prev_state, st->coder_type,
                              acelp_cfg.fixed_cdk_index[idx], L_SUBFR, st->L_frame, st->Q_exc );
 
         } /* !RF_NELP frame partial copy */
+
         /*----------------------------------------------------------*
          * - compute the synthesis speech                           *
          *----------------------------------------------------------*/
+
         rescale_mem( &st->Q_exc, &prev_Q_syn, &st->Q_syn, mem_syn, syn, M, i_subfr );
 
         E_UTIL_synthesis( sub( st->Q_exc, st->Q_syn ), p_A, &exc2[i_subfr], &syn[i_subfr], L_SUBFR, mem_syn, 1, M );
@@ -641,12 +623,8 @@ void decoder_acelp_fx(
     Ltmp = Dot_productSq16HQ( 0, h1, L_SUBFR, &st->last_gain_syn_deemph_e );
     st->last_gain_syn_deemph_e = add( st->last_gain_syn_deemph_e, 10 /*scaling of h1[0] and E_UTIL_synthesis * 2*/ );
     move16();
-#ifdef BASOP_NOGLOB
     st->last_gain_syn_deemph = round_fx_sat( Sqrt32( Ltmp, &st->last_gain_syn_deemph_e ) ); // Q(15-last_gain_syn_deemph_e - (16))
     move16();
-#else
-    st->last_gain_syn_deemph = round_fx( Sqrt32( Ltmp, &st->last_gain_syn_deemph_e ) );
-#endif
 
     /* Do the classification */
     {
@@ -699,8 +677,9 @@ void decoder_acelp_fx(
 
         FEC_scale_syn_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, syn, pBuf_scaleSyn, st->enr_old_fx, 0,
                           st->coder_type, LSF_Q_prediction, &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,
-                          exc, exc2, A, &( st->old_enr_LP ), mem_back, mem_syn, st->Q_exc, st->Q_syn, avoid_lpc_burst_on_recovery, force_scale_syn );
+                          exc, exc2, A, &( st->old_enr_LP ), mem_back, mem_syn, st->Q_exc, st->Q_syn, EVS_MONO, avoid_lpc_burst_on_recovery, force_scale_syn );
     }
+
     /* update ACELP synthesis memory */
     Copy( mem_syn, st->mem_syn2_fx, M );
     Copy( syn + st->L_frame - L_SYN_MEM, st->mem_syn_r, L_SYN_MEM );
diff --git a/lib_dec/dec_acelp.c b/lib_dec/dec_acelp.c
deleted file mode 100644
index 7cae6239199739a71ac8690e9e1aa700d90078a5..0000000000000000000000000000000000000000
--- a/lib_dec/dec_acelp.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
diff --git a/lib_dec/dec_acelp_fx.c b/lib_dec/dec_acelp_fx.c
index 07750469f1515adef0f16688151631db8c2fef4b..51cbef624c6ea7d74e2a0b70cd7c4e6727ef2ba8 100644
--- a/lib_dec/dec_acelp_fx.c
+++ b/lib_dec/dec_acelp_fx.c
@@ -169,6 +169,7 @@ void D_ACELP_indexing_fx(
         pulses = pulsestrack[0];
         move16();
 
+#ifndef FIX_1378_ACELP_OUT_OF_BOUNDS
         /* safety check in case of bit errors */
         IF( GE_64( s, pulsestostates[16][pulses - 1] ) )
         {
@@ -177,9 +178,20 @@ void D_ACELP_indexing_fx(
             move16();
             return;
         }
+#endif
 
         IF( pulses )
         {
+#ifdef FIX_1378_ACELP_OUT_OF_BOUNDS
+            /* safety check in case of bit errors */
+            IF( GE_64( s, pulsestostates[16][pulses - 1] ) )
+            {
+                set16_fx( code, 0, L_SUBFR );
+                *BER_detect = 1;
+                move16();
+                return;
+            }
+#endif
             D_ACELP_decode_arithtrack_fx( code, s, pulses, num_tracks, 16 );
         }
         ELSE
diff --git a/lib_dec/dec_acelp_tcx_main.c b/lib_dec/dec_acelp_tcx_main.c
deleted file mode 100644
index 4e5d4e3aef0ff50eb31871d3c5105c3010d00f71..0000000000000000000000000000000000000000
--- a/lib_dec/dec_acelp_tcx_main.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include "prot.h"
-#include "rom_com.h"
-#include <stdint.h>
-#include "options.h"
-#include "stat_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec_acelp_tcx_main_fx.c b/lib_dec/dec_acelp_tcx_main_fx.c
index 7edd2354961721af2eb1ee3be18067cd3f76704f..eea558914c2af6701f3cca58975eaa6ed3a5a4d7 100644
--- a/lib_dec/dec_acelp_tcx_main_fx.c
+++ b/lib_dec/dec_acelp_tcx_main_fx.c
@@ -10,12 +10,7 @@
 #include "stat_com.h"
 #include "prot_fx.h"
 #include "basop_util.h"
-static void decode_frame_type_fx( Decoder_State *st
-#ifdef IVAS_CODE_CNG
-                                  ,
-                                  STEREO_CNG_DEC_HANDLE hStereoCng
-#endif
-)
+static void decode_frame_type_fx( Decoder_State *st )
 {
     Word32 L_tmp;
     Word16 num_bits;
@@ -213,11 +208,7 @@ static void decode_frame_type_fx( Decoder_State *st
             move16();
 
             /* Reconf Core */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-            mode_switch_decoder_LPD_fx( st, st->bwidth, st->total_brate, st->last_total_brate, frame_size_index, 0, st->element_mode );
-#else
             mode_switch_decoder_LPD_fx( st, st->bwidth, st->total_brate, frame_size_index );
-#endif
             /* Reconf CLDFB */
             IF( NE_16( i_mult( st->cldfbAna->no_channels, st->cldfbAna->no_col ), st->L_frame ) )
             {
@@ -259,9 +250,7 @@ static void decode_frame_type_fx( Decoder_State *st
                 IF( EQ_16( st->m_frame_type, SID_FRAME ) && NE_16( st->hFdCngDec->hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
                 {
                     lerp( st->hFdCngDec->hFdCngCom->olapBufferSynth, st->hFdCngDec->hFdCngCom->olapBufferSynth, st->L_frame * 2, st->last_L_frame * 2 );
-#ifdef IVAS_CODE_CNG
-                    lerp( hStereoCng->olapBufferSynth22, hStereoCng->olapBufferSynth22, st->L_frame * 2, st->last_L_frame * 2 );
-#endif
+
                     IF( EQ_16( st->L_frame, L_FRAME ) )
                     {
                         FOR( n = 0; n < shl( st->L_frame, 1 ); n++ )
@@ -311,10 +300,6 @@ Word16 dec_acelp_tcx_frame_fx(
     Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation    Q0   */
     Word16 *voice_factors,     /* o  : voicing factors                  Q15   */
     Word16 pitch_buf[]         /* o  : floating pitch for each subframe  Q6  */
-#ifdef IVAS_CODE_CNG
-    ,
-    STEREO_CNG_DEC_HANDLE hStereoCng /* i  : stereo CNG handle                   */
-#endif
 )
 {
     Word16 num_bits;
@@ -366,12 +351,7 @@ Word16 dec_acelp_tcx_frame_fx(
         Word32 total_brate = st->last_total_brate;
         move32();
 
-        decode_frame_type_fx( st
-#ifdef IVAS_CODE_CNG
-                              ,
-                              hStereoCng
-#endif
-        );
+        decode_frame_type_fx( st );
 
         st->force_lpd_reset = 0;
         move16();
@@ -384,7 +364,7 @@ Word16 dec_acelp_tcx_frame_fx(
         {
             /* Copy back parameters from previous frame, because there is a high risk they are corrupt
              * DO concealment with configuration used in previous frame                                */
-            st->m_frame_type = (uint8_t) m_frame_type;
+            st->m_frame_type = (UWord8) m_frame_type;
             move16();
             st->bwidth = bwidth;
             move16();
diff --git a/lib_dec/dec_amr_wb.c b/lib_dec/dec_amr_wb.c
deleted file mode 100644
index 0874e988a748d4239c1a70f82e2ed8c1c0494117..0000000000000000000000000000000000000000
--- a/lib_dec/dec_amr_wb.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * decod_amr_wb()
- *
- * Decode excitation signal in AMR-WB IO mode
- *---------------------------------------------------------------------*/
diff --git a/lib_dec/dec_amr_wb_fx.c b/lib_dec/dec_amr_wb_fx.c
index baea98a2c0883f936ad95cb0290a90234fdcadf6..500fe34bab921a2c385caf751d34616d63e0045f 100644
--- a/lib_dec/dec_amr_wb_fx.c
+++ b/lib_dec/dec_amr_wb_fx.c
@@ -71,12 +71,8 @@ void decod_amr_wb_fx(
          * Decode pitch lag
          *----------------------------------------------------------------------*/
 
-        *pt_pitch_fx = pit_decode_fx( st_fx, st_fx->core_brate, 1, L_FRAME, i_subfr, -1, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR
-#ifdef ADD_LRTD
-                                      ,
-                                      0, NULL
-#endif
-        );
+        *pt_pitch_fx = pit_decode_fx( st_fx, st_fx->core_brate, 1, L_FRAME, i_subfr, -1, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR, 0, NULL );
+
         /*--------------------------------------------------------------*
          * Find the adaptive codebook vector
          *--------------------------------------------------------------*/
diff --git a/lib_dec/dec_gen_voic.c b/lib_dec/dec_gen_voic.c
deleted file mode 100644
index fd4f3cb7c53af6bc1a4a149c6db6799b8f39655e..0000000000000000000000000000000000000000
--- a/lib_dec/dec_gen_voic.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec_gen_voic_fx.c b/lib_dec/dec_gen_voic_fx.c
index 1cfff9b84f68904f57bd8e5d3122d5fcec91af38..3e42d953561ca8a04f7ffddc2076c6560c30bf1a 100644
--- a/lib_dec/dec_gen_voic_fx.c
+++ b/lib_dec/dec_gen_voic_fx.c
@@ -18,8 +18,7 @@
 /*----------------------------------------------------------------------*/
 /* GLOBAL INPUT ARGUMENTS :                                             */
 /* _ (Struct)    st_fx            : decoder static memory               */
-/* _ (Word16) L_frame        : length of the frame                   */
-
+/* _ (Word16) L_frame             : length of the frame                 */
 /* _ (Word16[]) Aq_fx            : LP filter coefficient        Q12     */
 /* _ (Word16) Es_pred_fx        : predicted scaled innov. energy Q8     */
 /* _ (Word16[]) pitch_buf_fx    : floating pitch values for each subframe Q6*/
@@ -29,541 +28,30 @@
 /* _ (Word16[]) exc_fx            : adapt. excitation exc (Q_exc)       */
 /* _ (Word16[]) exc2_fx           : adapt. excitation/total exc (Q_exc) */
 /*----------------------------------------------------------------------*/
-
-
 /*----------------------------------------------------------------------*/
 /* RETURN ARGUMENTS :                                                   */
 /* _ None                                                               */
 /*======================================================================*/
 
 ivas_error decod_gen_voic_fx(
-    Decoder_State *st_fx,      /* i/o: decoder static memory                     */
-    const Word16 L_frame,      /* i  : length of the frame                       */
-    const Word16 sharpFlag_fx, /* i  : formant sharpening flag                   */
-    const Word16 *Aq_fx,       /* i  : LP filter coefficient          Q12           */
-    const Word16 Es_pred_fx,   /* i  : predicted scaled innov. energy    Q8        */
-    const Word16 do_WI_fx,     /* i  : do interpolation after a FER              */
-    Word16 *pitch_buf_fx,      /* o  : floating pitch values for each subframe Q6  */
-    Word16 *voice_factors_fx,  /* o  : voicing factors   Q15                        */
-    Word16 *exc_fx,            /* i/o: adapt. excitation exc Q_exc                     */
-    Word16 *exc2_fx,           /* i/o: adapt. excitation/total exc  Q_exc             */
-    Word16 *bwe_exc_fx,        /* o  : excitation for SWB TBE Q_exc                   */
-    Word16 *unbits,            /* number of unused bits                          */
-    Word16 *gain_buf           /*Q14*/
-)
-{
-
-
-    Word16 T0_fx, T0_frac_fx, T0_min_fx, T0_max_fx; /* integer pitch variables                     */
-    Word16 gain_pit_fx = 0;                         /* pitch gain               Q14                         */
-    move16();
-    Word32 gain_code_fx = 0; /* gain/normalized gain of the algebraic excitation Q16 */
-    move32();
-    Word32 norm_gain_code_fx = 0; /* normalized gain of the algebraic excitation    Q16   */
-    move32();
-    Word16 gain_inov_fx = 0; /* Innovation gain  Q12                                 */
-    move16();
-    Word32 gc_mem[NB_SUBFR - 1]; /* gain_code from previous subframes                    */
-    Word16 gp_mem[NB_SUBFR - 1]; /* gain_pitch from previous subframes                   */
-    Word16 voice_fac_fx;         /* voicing factor  Q15                                  */
-    Word16 code_fx[L_SUBFR];     /* algebraic codevector      Q12                        */
-
-    const Word16 *p_Aq_fx; /* Pointer to frame LP coefficient Q12                  */
-    Word16 *pt_pitch_fx;   /* pointer to floating pitch     Q6                     */
-    Word16 i_subfr_fx, i;  /* tmp variables                                        */
-    Word16 error_fx = 0;
-    move16();
-    Word16 gain_preQ_fx = 0; /* Gain of prequantizer excitation                      */
-    move16();
-    Word16 code_preQ_fx[L_SUBFR]; /* Prequantizer excitation                              */
-    Word32 norm_gain_preQ_fx;
-    Word16 pitch_limit_flag_fx;
-
-    Word16 tmp1_fx, gain_code16;
-    Word32 L_tmp_GC;
-    Word32 L_tmp;
-
-    Word16 harm_flag_acelp;
-
-    Word16 shft_prev, ph_offset_fx;
-    Word32 prev_res_nrg;
-    Word32 prev_spch_nrg;
-    Word32 curr_res_nrg;
-    Word32 curr_spch_nrg;
-    Word16 rint_bfi_pitch, rint_pitch;
-    Word16 fraca, fracb, expa, expb, scale, exp1;
-    Word16 *p_exc;
-    Word16 mem_tmp_fx[M];
-    Word16 syn_tmp_fx[L_FRAME16k];
-    Word16 shft_curr;
-    Word16 *p_syn;
-    Word16 sp_enratio, Qsp_enratio;
-    Word16 enratio, Qenratio;
-    DTFS_STRUCTURE *PREVP, *CURRP;
-    Word16 S_fx[PIT_MAX * 4 + 1], C_fx[PIT_MAX * 4 + 1];
-    Word16 dummy2[2];
-    Word16 out_fx[L_FRAME16k];
-
-    Word16 pf_temp1[MAXLAG_WI]; /*may not need more than MAXLAG_WI/2+1 */
-    Word16 pf_temp2[MAXLAG_WI];
-    Word16 pf_temp[MAXLAG_WI];
-    Word16 pf_n2[MAXLAG_WI];
-    MUSIC_POSTFILT_HANDLE hMusicPF;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-    hMusicPF = st_fx->hMusicPF;
-
-    GSC_DEC_HANDLE hGSCDec;
-    hGSCDec = st_fx->hGSCDec;
-    ivas_error error;
-
-    error = IVAS_ERR_OK;
-    move32();
-
-    T0_fx = PIT_MIN;
-    move16();
-    T0_frac_fx = 0;
-    move16();
-
-    /* read harmonicity flag */
-    harm_flag_acelp = 0;
-    move16();
-    test();
-    test();
-    IF( ( GE_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) && LE_32( st_fx->core_brate, MAX_BRATE_AVQ_EXC_TD ) ) && EQ_16( st_fx->coder_type, GENERIC ) )
-    {
-        harm_flag_acelp = (Word16) get_next_indice( st_fx, 1 );
-    }
-
-    /*------------------------------------------------------------------*
-     * ACELP subframe loop
-     *------------------------------------------------------------------*/
-
-    p_Aq_fx = Aq_fx;            /* pointer to interpolated LPC parameters */
-    pt_pitch_fx = pitch_buf_fx; /* pointer to the pitch buffer */
-    norm_gain_preQ_fx = 0;
-    move32();
-    gain_preQ_fx = 0;
-    move16();
-    set16_fx( code_preQ_fx, 0, L_SUBFR );
-
-    FOR( i_subfr_fx = 0; i_subfr_fx < L_frame; i_subfr_fx += L_SUBFR )
-    {
-        /*----------------------------------------------------------------------*
-         * Decode pitch lag
-         *----------------------------------------------------------------------*/
-
-        *pt_pitch_fx = pit_decode_fx( st_fx, st_fx->core_brate, 0, L_frame, i_subfr_fx, st_fx->coder_type, &pitch_limit_flag_fx,
-                                      &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_SUBFR );
-        move16(); /*Q6*/
-
-        /*--------------------------------------------------------------*
-         * Find the adaptive codebook vector
-         *--------------------------------------------------------------*/
-
-        pred_lt4( &exc_fx[i_subfr_fx], &exc_fx[i_subfr_fx], T0_fx, T0_frac_fx, L_SUBFR + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
-
-        tbe_celp_exc( L_frame, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx );
-
-        /*--------------------------------------------------------------*
-         * LP filtering of the adaptive excitation
-         *--------------------------------------------------------------*/
-        lp_filt_exc_dec_fx( st_fx, MODE1, i_subfr_fx, L_SUBFR, L_frame, st_fx->acelp_cfg.ltf_mode, exc_fx );
-        /*-----------------------------------------------------------------*
-         * Transform-domain contribution decoding (active frames)
-         *-----------------------------------------------------------------*/
-
-        test();
-        IF( GE_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) && ( st_fx->coder_type != INACTIVE ) )
-        {
-            gain_code_fx = 0;
-            move16();
-            transf_cdbk_dec_fx( st_fx, harm_flag_acelp, i_subfr_fx, Es_pred_fx, gain_code_fx, &gain_preQ_fx, &norm_gain_preQ_fx, code_preQ_fx, unbits );
-        }
-
-        /*--------------------------------------------------------------*
-         * Innovation decoding
-         *--------------------------------------------------------------*/
-
-        inov_decode_fx( st_fx, st_fx->core_brate, 0, L_frame, sharpFlag_fx, i_subfr_fx, p_Aq_fx, st_fx->tilt_code_fx, *pt_pitch_fx, code_fx, L_SUBFR );
-
-        /*--------------------------------------------------------------*
-         * Gain decoding
-         * Estimate spectrum tilt and voicing
-         *--------------------------------------------------------------*/
-
-        IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
-        {
-            gain_dec_lbr_fx( st_fx, st_fx->coder_type, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_SUBFR );
-        }
-        ELSE IF( GT_32( st_fx->core_brate, ACELP_32k ) )
-        {
-            gain_dec_SQ_fx( st_fx, i_subfr_fx, code_fx, Es_pred_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx );
-        }
-        ELSE
-        {
-            gain_dec_mless_fx( st_fx, L_frame, st_fx->coder_type, i_subfr_fx, -1, code_fx, Es_pred_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx );
-        }
-        st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, st_fx->Q_exc ); // Q15
-        move16();
-
-        /*-----------------------------------------------------------------*
-         * Transform domain contribution decoding
-         *-----------------------------------------------------------------*/
-        test();
-        IF( GE_32( st_fx->core_brate, MAX_GSC_INACTIVE_BRATE ) && ( st_fx->coder_type == INACTIVE ) )
-        {
-            transf_cdbk_dec_fx( st_fx, harm_flag_acelp, i_subfr_fx, Es_pred_fx, gain_code_fx, &gain_preQ_fx, &norm_gain_preQ_fx, code_preQ_fx, unbits );
-        }
-
-        /* update LP filtered gains for the case of frame erasures */
-        lp_gain_updt_fx( i_subfr_fx, gain_pit_fx, L_add( norm_gain_code_fx, norm_gain_preQ_fx ), &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_frame );
-
-        /*----------------------------------------------------------------------*
-         * Find the total excitation
-         *----------------------------------------------------------------------*/
-
-        IF( EQ_16( L_frame, L_FRAME ) ) /* Rescaling for 12.8k core */
-        {
-            Rescale_exc( hMusicPF->dct_post_old_exc_fx, &exc_fx[i_subfr_fx], &bwe_exc_fx[i_subfr_fx * HIBND_ACB_L_FAC], hGSCDec->last_exc_dct_in_fx,
-                         L_SUBFR, L_SUBFR * HIBND_ACB_L_FAC, gain_code_fx, &( st_fx->Q_exc ), st_fx->Q_subfr, exc2_fx, i_subfr_fx, st_fx->coder_type );
-        }
-        ELSE /* Rescaling for 16k core */
-        {
-
-            L_tmp_GC = L_max( gain_code_fx, L_shl( gain_preQ_fx, 16 ) ); /* Chose the maximum of gain_code or the prequantizer excitation x4 to keep some room*/
-            Rescale_exc( hMusicPF->dct_post_old_exc_fx, &exc_fx[i_subfr_fx], &bwe_exc_fx[i_subfr_fx * 2], hGSCDec->last_exc_dct_in_fx,
-                         L_SUBFR, L_SUBFR * 2, L_tmp_GC, &( st_fx->Q_exc ), st_fx->Q_subfr, exc2_fx, i_subfr_fx, st_fx->coder_type );
-        }
-
-        gain_code16 = round_fx( L_shl( gain_code_fx, st_fx->Q_exc ) ); /*Q_exc*/
-
-        /*-----------------------------------------------------------------*
-         * Add the ACELP pre-quantizer contribution
-         *-----------------------------------------------------------------*/
-
-        IF( gain_preQ_fx != 0 )
-        {
-            IF( st_fx->element_mode == EVS_MONO )
-            {
-                tmp1_fx = add( 15 - Q_AVQ_OUT_DEC - 2, st_fx->Q_exc );
-            }
-            ELSE
-            {
-                tmp1_fx = add( 15 - Q_AVQ_OUT - 2, st_fx->Q_exc );
-            }
-            FOR( i = 0; i < L_SUBFR; i++ )
-            {
-                Word32 Ltmp1;
-                /* Contribution from AVQ layer */
-                Ltmp1 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q6 -> Q9*/
-                Ltmp1 = L_shl_sat( Ltmp1, tmp1_fx );             /* Q16 + Q_exc */
-
-                /* Compute exc2 */
-#ifdef BASOP_NOGLOB
-                L_tmp = L_shl_sat( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 ); // Q_exc+Q14+1+1
-                exc2_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( L_tmp, Ltmp1 ) );   // Q_exc
-#else
-                L_tmp = L_shl( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );
-                exc2_fx[i + i_subfr_fx] = round_fx( L_add( L_tmp, Ltmp1 ) );
-#endif
-                move16();
-                /*  gain_pit in Q14 */
-                L_tmp = L_mult( gain_code16, code_fx[i] ); // Q_exc+Q9+1
-#ifdef BASOP_NOGLOB
-                L_tmp = L_shl_sat( L_tmp, 5 );                                   // Q_exc+Q9+1+5
-                L_tmp = L_mac_sat( L_tmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); // Q_exc+Q15 +1
-                L_tmp = L_shl_sat( L_tmp, 1 );                                   /* saturation can occur here */
-
-                exc_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( L_tmp, Ltmp1 ) ); // Q_exc
-                move16();
-#else
-                L_tmp = L_shl( L_tmp, 5 );
-                L_tmp = L_mac( L_tmp, exc_fx[i + i_subfr_fx], gain_pit_fx );
-                L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-
-                exc_fx[i + i_subfr_fx] = round_fx( L_add( L_tmp, Ltmp1 ) );
-#endif
-            }
-        }
-        ELSE
-        {
-            Acelp_dec_total_exc( exc_fx, exc2_fx, gain_code16, gain_pit_fx, i_subfr_fx, code_fx, L_SUBFR );
-        }
-
-        /*-----------------------------------------------------------------*
-         * Prepare TBE excitation
-         *-----------------------------------------------------------------*/
-
-        Word16 idx = 0;
-        move16();
-        IF( i_subfr_fx != 0 )
-        {
-            idx = idiv1616( i_subfr_fx, L_SUBFR );
-        }
-
-        prep_tbe_exc_fx( L_frame, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
-                         &voice_factors_fx[idx], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
-                         st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate );
-
-
-        /*----------------------------------------------------------------*
-         * Excitation enhancements (update of total excitation signal)
-         *----------------------------------------------------------------*/
-
-        test();
-        IF( GT_32( st_fx->core_brate, ACELP_32k ) || ( st_fx->coder_type == INACTIVE ) )
-        {
-            Copy( exc_fx + i_subfr_fx, exc2_fx + i_subfr_fx, L_SUBFR );
-        }
-        ELSE
-        {
-            enhancer_fx( st_fx->core_brate, 0, st_fx->coder_type, i_subfr_fx, L_frame, voice_fac_fx, st_fx->stab_fac_fx,
-                         norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
-        }
-
-        p_Aq_fx += ( M + 1 );
-        pt_pitch_fx++;
-        gain_buf[idx] = gain_pit_fx; // Q14
-        move16();
-    }
-
-    /* FEC fast recovery */
-
-    IF( do_WI_fx )
-    {
-        /* shft_prev = L_EXC_MEM - rint_new_fx(st_fx->bfi_pitch_fx);*/
-        L_tmp = L_shl( L_deposit_l( st_fx->bfi_pitch_fx ), 10 ); /*Q16*/
-        rint_bfi_pitch = rint_new_fx( L_tmp );                   /*Q0*/
-        shft_prev = sub( L_EXC_MEM, rint_bfi_pitch );            /*Q0*/
-
-        p_exc = st_fx->hWIDec->old_exc2_fx + shft_prev;
-        p_syn = st_fx->hWIDec->old_syn2_fx + shft_prev;
-        move16();
-        move16();
-
-        prev_res_nrg = L_deposit_l( 1 );
-        prev_spch_nrg = L_deposit_l( 1 );
-        FOR( i = 0; i < rint_bfi_pitch; i++ )
-        {
-#ifdef BASOP_NOGLOB
-            prev_res_nrg = L_mac0_sat( prev_res_nrg, *p_exc, *p_exc );   /* 2*st_fx->prev_Q_exc_fr */
-            prev_spch_nrg = L_mac0_sat( prev_spch_nrg, *p_syn, *p_syn ); /* 2*st_fx->prev_Q_syn_fr */
-#else
-            prev_res_nrg = L_mac0( prev_res_nrg, *p_exc, *p_exc );   /* 2*st_fx->prev_Q_exc_fr */
-            prev_spch_nrg = L_mac0( prev_spch_nrg, *p_syn, *p_syn ); /* 2*st_fx->prev_Q_syn_fr */
-#endif
-            p_exc++;
-            p_syn++;
-        }
-
-        Copy( st_fx->mem_syn2_fx, mem_tmp_fx, M );
-
-        syn_12k8_fx( st_fx->L_frame, Aq_fx, exc2_fx, syn_tmp_fx, mem_tmp_fx, 1, st_fx->Q_exc, st_fx->Q_syn );
-
-        L_tmp = L_shl( L_deposit_l( pitch_buf_fx[NB_SUBFR16k - 1] ), 10 ); /*Q16*/
-        rint_pitch = rint_new_fx( L_tmp );                                 /*Q0*/
-        shft_curr = sub( st_fx->L_frame, rint_pitch );                     /*Q0*/
-
-        p_exc = exc2_fx + shft_curr;
-        p_syn = syn_tmp_fx + shft_curr;
-
-        curr_res_nrg = L_deposit_l( 1 );
-        curr_spch_nrg = L_deposit_l( 1 );
-        FOR( i = 0; i < rint_pitch; i++ )
-        {
-#ifdef BASOP_NOGLOB
-            curr_res_nrg = L_mac0_sat( curr_res_nrg, *p_exc, *p_exc );   /* 2*st_fx->Q_exc */
-            curr_spch_nrg = L_mac0_sat( curr_spch_nrg, *p_syn, *p_syn ); /* 2*st_fx->Q_syn */
-#else
-            curr_res_nrg = L_mac0( curr_res_nrg, *p_exc, *p_exc );   /* 2*st_fx->Q_exc */
-            curr_spch_nrg = L_mac0( curr_spch_nrg, *p_syn, *p_syn ); /* 2*st_fx->Q_syn */
-#endif
-            p_exc++;
-            p_syn++;
-        }
-
-        /* enratio = (curr_res_nrg / prev_res_nrg); */
-        IF( prev_res_nrg > 0 )
-        {
-            expa = norm_l( prev_res_nrg );
-            fraca = extract_h( L_shl( prev_res_nrg, expa ) ); /* 2*st_fx->prev_Q_exc_fr -16+expa +1*/
-            expa = sub( 30, add( expa, ( shl( st_fx->prev_Q_exc_fr, 1 ) ) ) );
-
-            expb = norm_l( curr_res_nrg );
-#ifdef BASOP_NOGLOB
-            fracb = round_fx_sat( L_shl_sat( curr_res_nrg, expb ) ); /* 2*st_fx->Q_exc +expb+1 -16*/
-#else
-            fracb = round_fx( L_shl( curr_res_nrg, expb ) );
-#endif
-            expb = sub( 30, add( expb, shl( st_fx->Q_exc, 1 ) ) );
-
-            scale = shr( sub( fraca, fracb ), 15 );
-            fracb = shl( fracb, scale ); // Q(15-expb)+scale
-            expb = sub( expb, scale );
-
-            enratio = div_s( fracb, fraca ); // Q(15-(expb-expa))
-            exp1 = sub( expb, expa );
-            Qenratio = sub( 15, exp1 );
-        }
-        ELSE
-        {
-            enratio = 0;
-            move16();
-            Qenratio = 0;
-            move16();
-        }
-
-        /* sp_enratio = curr_spch_nrg/prev_spch_nrg */
-        IF( prev_spch_nrg > 0 )
-        {
-            expa = norm_l( prev_spch_nrg );
-            fraca = extract_h( L_shl( prev_spch_nrg, expa ) ); /* 2*st_fx->prev_Q_syn_fr +expa+1-16*/
-            expa = sub( 30, add( expa, shl( st_fx->prev_Q_syn_fr, 1 ) ) );
-
-            expb = norm_l( curr_spch_nrg );
-#ifdef BASOP_NOGLOB
-            fracb = round_fx_sat( L_shl_sat( curr_spch_nrg, expb ) ); /* 2*st_fx->Q_syn +expb-16 */
-#else
-            fracb = round_fx( L_shl( curr_spch_nrg, expb ) );
-#endif
-            expb = sub( 30, add( expb, shl( st_fx->Q_syn, 1 ) ) );
-
-            scale = shr( sub( fraca, fracb ), 15 );
-            fracb = shl( fracb, scale ); // Q(15-expb) +scale
-            expb = sub( expb, scale );
-
-            sp_enratio = div_s( fracb, fraca ); // Q(15-(expb-expa))
-            exp1 = sub( expb, expa );
-            Qsp_enratio = sub( 15, exp1 );
-        }
-        ELSE
-        {
-            sp_enratio = 0;
-            move16();
-            Qsp_enratio = 0;
-            move16();
-        }
-
-        test();
-        test();
-        test();
-        test();
-#ifdef BASOP_NOGLOB
-        IF( GT_16( shl_ro( enratio, sub( 15, Qenratio ), &Overflow ), 8192 ) &&       /*compare with 0.25 in Q15*/
-            LT_16( shl_ro( enratio, sub( 10, Qenratio ), &Overflow ), 15360 ) &&      /*compare with 15.0 in Q10*/
-            GT_16( shl_ro( sp_enratio, sub( 15, Qsp_enratio ), &Overflow ), 4915 ) && /*compare with 0.15 in Q15*/
-            LT_16( st_fx->bfi_pitch_fx, 9600 ) &&                                     /*Q6*/
-            LT_16( pitch_buf_fx[NB_SUBFR16k - 1], 9600 ) )                            /*Q6*/
-#else
-        IF( GT_16( shl_r( enratio, 15 - Qenratio ), 8192 ) &&       /*compare with 0.25 in Q15*/
-            LT_16( shl_r( enratio, 10 - Qenratio ), 15360 ) &&      /*compare with 15.0 in Q10*/
-            GT_16( shl_r( sp_enratio, 15 - Qsp_enratio ), 4915 ) && /*compare with 0.15 in Q15*/
-            st_fx->bfi_pitch_fx < 9600 &&                           /*Q6*/
-            pitch_buf_fx[sub( NB_SUBFR16k, 1 )] < 9600 )            /*Q6*/
-#endif
-        {
-            IF( NE_32( ( error = DTFS_new_fx( &PREVP ) ), IVAS_ERR_OK ) )
-            {
-                return error;
-            }
-
-            IF( NE_32( ( error = DTFS_new_fx( &CURRP ) ), IVAS_ERR_OK ) )
-            {
-                return error;
-            }
-
-            GetSinCosTab_fx( rint_bfi_pitch, S_fx, C_fx );
-            DTFS_to_fs_fx( st_fx->hWIDec->old_exc2_fx + shft_prev, rint_bfi_pitch, PREVP, (Word16) st_fx->output_Fs, do_WI_fx, S_fx, C_fx );
-            PREVP->Q = add( PREVP->Q, st_fx->prev_Q_exc_fr );
-            move16();
-
-            GetSinCosTab_fx( rint_pitch, S_fx, C_fx );
-            DTFS_to_fs_fx( exc2_fx + shft_curr, rint_pitch, CURRP, (Word16) st_fx->output_Fs, do_WI_fx, S_fx, C_fx );
-            CURRP->Q = add( CURRP->Q, st_fx->Q_exc );
-            move16();
-
-            ph_offset_fx = 0;
-            move16();
-            IF( NE_32( ( error = WIsyn_fx( *PREVP, CURRP, dummy2, &( ph_offset_fx ), out_fx, (Word16) st_fx->L_frame, 1, S_fx, C_fx, pf_temp1, pf_temp2, pf_temp, pf_n2 ) ), IVAS_ERR_OK ) )
-            {
-                return error;
-            }
-
-
-            Copy_Scale_sig( out_fx, exc2_fx, st_fx->L_frame, st_fx->Q_exc ); // Q_exc
-            Copy_Scale_sig( out_fx, exc_fx, st_fx->L_frame, st_fx->Q_exc );  // Q_exc
-
-            /* update bwe_exc for SWB-TBE */
-            FOR( i_subfr_fx = 0; i_subfr_fx < L_frame; i_subfr_fx += L_SUBFR )
-            {
-                interp_code_4over2_fx( exc_fx + i_subfr_fx, bwe_exc_fx + shl( i_subfr_fx, 1 ), L_SUBFR );
-            }
-
-            free( PREVP );
-            free( CURRP );
-        }
-    }
-
-    /* SC-VBR */
-    st_fx->prev_gain_pit_dec_fx = gain_pit_fx;
-    move16(); /*Q14*/
-    st_fx->prev_tilt_code_dec_fx = st_fx->tilt_code_fx;
-    move16(); /*Q15*/
-
-    return error;
-}
-
-/*======================================================================*/
-/* FUNCTION : decod_gen_voic_ivas_fx()                                       */
-/*----------------------------------------------------------------------*/
-/* PURPOSE : Decode generic (GC), voiced (VC) and AMR-WB IO frames      */
-/*                                                                      */
-/*----------------------------------------------------------------------*/
-/* GLOBAL INPUT ARGUMENTS :                                             */
-/* _ (Struct)    st_fx            : decoder static memory               */
-/* _ (Word16) L_frame        : length of the frame                   */
-
-/* _ (Word16[]) Aq_fx            : LP filter coefficient        Q12     */
-/* _ (Word16) Es_pred_fx        : predicted scaled innov. energy Q8     */
-/* _ (Word16[]) pitch_buf_fx    : floating pitch values for each subframe Q6*/
-/* _ (Word16[])    voice_factors_fx: frame error rate           Q15     */
-/*----------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :                                                   */
-/* _ (Word16[]) exc_fx            : adapt. excitation exc (Q_exc)       */
-/* _ (Word16[]) exc2_fx           : adapt. excitation/total exc (Q_exc) */
-/*----------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :                                                   */
-/* _ None                                                               */
-/*======================================================================*/
-
-ivas_error decod_gen_voic_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: decoder static memory                     */
-    const Word16 L_frame,      /* i  : length of the frame                       */
-    const Word16 sharpFlag_fx, /* i  : formant sharpening flag                   */
-    const Word16 *Aq_fx,       /* i  : LP filter coefficient                     Q12*/
-    const Word16 Es_pred_fx,   /* i  : predicted scaled innov. energy          Q8  */
-    const Word16 do_WI_fx,     /* i  : do interpolation after a FER              */
-    Word16 *pitch_buf_fx,      /* o  : Word16 pitch values for each subframe   Q6*/
-    Word16 *voice_factors_fx,  /* o  : voicing factors                         Q15  */
-    Word16 *exc_fx,            /* i/o: adapt. excitation exc                    Q_exc */
-    Word16 *exc2_fx,           /* i/o: adapt. excitation/total exc              Q_exc */
-    Word16 *bwe_exc_fx,        /* o  : excitation for SWB TBE                   Q_exc */
-    Word16 *unbits,            /* number of unused bits                          */
-    Word16 *gain_buf,
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
-    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer   Q6           */
+    Decoder_State *st_fx,              /* i/o: decoder static memory                            */
+    const Word16 L_frame,              /* i  : length of the frame                              */
+    const Word16 sharpFlag_fx,         /* i  : formant sharpening flag                          */
+    const Word16 *Aq_fx,               /* i  : LP filter coefficient                    Q12     */
+    const Word16 Es_pred_fx,           /* i  : predicted scaled innov. energy           Q8      */
+    const Word16 do_WI_fx,             /* i  : do interpolation after a FER                     */
+    Word16 *pitch_buf_fx,              /* o  : Word16 pitch values for each subframe    Q6      */
+    Word16 *voice_factors_fx,          /* o  : voicing factors                          Q15     */
+    Word16 *exc_fx,                    /* i/o: adapt. excitation exc                    Q_exc   */
+    Word16 *exc2_fx,                   /* i/o: adapt. excitation/total exc              Q_exc   */
+    Word16 *bwe_exc_fx,                /* o  : excitation for SWB TBE                   Q_exc   */
+    Word16 *unbits,                    /* number of unused bits                                 */
+    Word16 *gain_buf,                  /* o  : Word16 pitch gain for each subframe		Q14     */
+    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag                 */
+    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer     Q6              */
 )
 {
-
-
-    Word16 T0_fx, T0_frac_fx, T0_min_fx, T0_max_fx; /* integer pitch variables                     */
+    Word16 T0_fx, T0_frac_fx, T0_min_fx, T0_max_fx; /* integer pitch variables                              */
     Word16 gain_pit_fx;                             /* pitch gain               Q14                         */
     Word32 gain_code_fx;                            /* gain/normalized gain of the algebraic excitation Q16 */
     Word32 norm_gain_code_fx;                       /* normalized gain of the algebraic excitation    Q16   */
@@ -574,7 +62,7 @@ ivas_error decod_gen_voic_ivas_fx(
     Word16 code_fx[L_SUBFR];                        /* algebraic codevector      Q12                        */
 
     const Word16 *p_Aq_fx; /* Pointer to frame LP coefficient Q12                  */
-    Word16 *pt_pitch_fx;   /* pointer to Word16 pitch     Q6                     */
+    Word16 *pt_pitch_fx;   /* pointer to Word16 pitch     Q6                       */
     Word16 i_subfr_fx, i;  /* tmp variables                                        */
     Word16 error_fx;
     Word16 gain_preQ_fx;          /* Gain of prequantizer excitation                      */
@@ -671,10 +159,8 @@ ivas_error decod_gen_voic_ivas_fx(
          * Decode pitch lag
          *----------------------------------------------------------------------*/
 
-        /**pt_pitch_fx = pit_decode_fx(st_fx, st_fx->core_brate, 0, L_frame, i_subfr_fx, st_fx->coder_type, &pitch_limit_flag_fx,
-            &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_SUBFR);*/
-        *pt_pitch_fx = pit_decode_ivas_fx( st_fx, st_fx->core_brate, 0, L_frame, i_subfr_fx, st_fx->coder_type, &pitch_limit_flag_fx,
-                                           &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_SUBFR, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
+        *pt_pitch_fx = pit_decode_fx( st_fx, st_fx->core_brate, 0, L_frame, i_subfr_fx, st_fx->coder_type, &pitch_limit_flag_fx,
+                                      &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_SUBFR, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
         move16(); /*Q6*/
 
         /*--------------------------------------------------------------*
@@ -715,7 +201,7 @@ ivas_error decod_gen_voic_ivas_fx(
 
         IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
         {
-            gain_dec_lbr_ivas_fx( st_fx, st_fx->coder_type, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_SUBFR );
+            gain_dec_lbr_fx( st_fx, st_fx->coder_type, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_SUBFR );
         }
         ELSE IF( GT_32( st_fx->core_brate, ACELP_32k ) )
         {
@@ -732,13 +218,20 @@ ivas_error decod_gen_voic_ivas_fx(
          * Transform domain contribution decoding
          *-----------------------------------------------------------------*/
         test();
-        IF( GE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) && ( st_fx->coder_type == INACTIVE ) )
+        IF( !st_fx->inactive_coder_type_flag && st_fx->coder_type == INACTIVE )
         {
             transf_cdbk_dec_fx( st_fx, harm_flag_acelp, i_subfr_fx, Es_pred_fx, gain_code_fx, &gain_preQ_fx, &norm_gain_preQ_fx, code_preQ_fx, unbits );
         }
 
         /* update LP filtered gains for the case of frame erasures */
-        lp_gain_updt_ivas_fx( i_subfr_fx, gain_pit_fx, L_add( norm_gain_code_fx, norm_gain_preQ_fx ), &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_frame );
+        IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
+        {
+            lp_gain_updt_fx( i_subfr_fx, gain_pit_fx, L_add( norm_gain_code_fx, norm_gain_preQ_fx ), &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_frame );
+        }
+        ELSE
+        {
+            lp_gain_updt_ivas_fx( i_subfr_fx, gain_pit_fx, L_add( norm_gain_code_fx, norm_gain_preQ_fx ), &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_frame );
+        }
 
         /*----------------------------------------------------------------------*
          * Find the total excitation
@@ -794,37 +287,20 @@ ivas_error decod_gen_voic_ivas_fx(
                 Word32 Ltmp1;
                 /* Contribution from AVQ layer */
                 Ltmp1 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q6 -> Q9*/
-#ifdef BASOP_NOGLOB
-                Ltmp1 = L_shl_sat( Ltmp1, tmp1_fx ); /* Q16 + Q_exc */
-#else
-                Ltmp1 = L_shl( Ltmp1, tmp1_fx );                    /* Q16 + Q_exc */
-#endif
+                Ltmp1 = L_shl_sat( Ltmp1, tmp1_fx );             /* Q16 + Q_exc */
 
                 /* Compute exc2 */
-#ifdef BASOP_NOGLOB
                 L_tmp = L_shl_sat( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );
                 exc2_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( L_tmp, Ltmp1 ) ); // Q_exc
-#else
-                L_tmp = L_shl( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );
-                exc2_fx[i + i_subfr_fx] = round_fx( L_add( L_tmp, Ltmp1 ) );
-#endif
                 move16();
                 /* gain_pit in Q14 */
-                L_tmp = L_mult( gain_code16, code_fx[i] ); // Q_exc+Q9+1
-#ifdef BASOP_NOGLOB
+                L_tmp = L_mult( gain_code16, code_fx[i] );                       // Q_exc+Q9+1
                 L_tmp = L_shl_sat( L_tmp, 5 );                                   // Q_exc+Q9+1+5
                 L_tmp = L_mac_sat( L_tmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); // Q_exc+16
                 L_tmp = L_shl_sat( L_tmp, 1 );                                   /* saturation can occur here */
 
                 exc_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( L_tmp, Ltmp1 ) ); // Q_exc
                 move16();
-#else
-                L_tmp = L_shl( L_tmp, 5 );
-                L_tmp = L_mac( L_tmp, exc_fx[i + i_subfr_fx], gain_pit_fx );
-                L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-
-                exc_fx[i + i_subfr_fx] = round_fx( L_add( L_tmp, Ltmp1 ) );
-#endif
             }
         }
         ELSE
@@ -836,10 +312,6 @@ ivas_error decod_gen_voic_ivas_fx(
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
-        /*prep_tbe_exc_fx(L_frame, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
-            &voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
-            st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate);*/
-
         Word16 idx;
         idx = 0;
         move16();
@@ -848,10 +320,10 @@ ivas_error decod_gen_voic_ivas_fx(
             idx = idiv1616( i_subfr_fx, L_SUBFR );
         }
 
-        prep_tbe_exc_ivas_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
-                              &voice_factors_fx[idx], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
-                              st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
-                              st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
+        prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
+                         &voice_factors_fx[idx], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
+                         st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
+                         st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
 
 
         /*----------------------------------------------------------------*
@@ -865,8 +337,16 @@ ivas_error decod_gen_voic_ivas_fx(
         }
         ELSE
         {
-            enhancer_ivas_fx2( st_fx->core_brate, 0, st_fx->coder_type, i_subfr_fx, L_frame, voice_fac_fx, st_fx->stab_fac_fx,
-                               norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
+            IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
+            {
+                enhancer_fx( st_fx->core_brate, 0, st_fx->coder_type, i_subfr_fx, L_frame, voice_fac_fx, st_fx->stab_fac_fx,
+                             norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
+            }
+            ELSE
+            {
+                enhancer_ivas_fx2( st_fx->core_brate, 0, st_fx->coder_type, i_subfr_fx, L_frame, voice_fac_fx, st_fx->stab_fac_fx,
+                                   norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
+            }
         }
 
         p_Aq_fx += ( M + 1 );
@@ -894,13 +374,8 @@ ivas_error decod_gen_voic_ivas_fx(
         move32();
         FOR( i = 0; i < rint_bfi_pitch; i++ )
         {
-#ifdef BASOP_NOGLOB
             prev_res_nrg = L_mac0_sat( prev_res_nrg, *p_exc, *p_exc );   /* 2*st_fx->prev_Q_exc_fr */
             prev_spch_nrg = L_mac0_sat( prev_spch_nrg, *p_syn, *p_syn ); /* 2*st_fx->prev_Q_syn_fr */
-#else
-            prev_res_nrg = L_mac0( prev_res_nrg, *p_exc, *p_exc );   /* 2*st_fx->prev_Q_exc_fr */
-            prev_spch_nrg = L_mac0( prev_spch_nrg, *p_syn, *p_syn ); /* 2*st_fx->prev_Q_syn_fr */
-#endif
             p_exc++;
             p_syn++;
         }
@@ -986,19 +461,11 @@ ivas_error decod_gen_voic_ivas_fx(
         test();
         test();
         test();
-#ifdef BASOP_NOGLOB
         IF( GT_16( shl_ro( enratio, sub( 15, Qenratio ), &Overflow ), 8192 ) &&       /*compare with 0.25 in Q15*/
             LT_16( shl_ro( enratio, sub( 10, Qenratio ), &Overflow ), 15360 ) &&      /*compare with 15.0 in Q10*/
             GT_16( shl_ro( sp_enratio, sub( 15, Qsp_enratio ), &Overflow ), 4915 ) && /*compare with 0.15 in Q15*/
             LT_16( st_fx->bfi_pitch_fx, 9600 ) &&                                     /*Q6*/
             LT_16( pitch_buf_fx[( NB_SUBFR16k - 1 )], 9600 ) )                        /*Q6*/
-#else
-        IF( GT_16( shl_r( enratio, 15 - Qenratio ), 8192 ) &&        /*compare with 0.25 in Q15*/
-            LT_16( shl_r( enratio, 10 - Qenratio ), 15360 ) &&       /*compare with 15.0 in Q10*/
-            GT_16( shl_r( sp_enratio, 15 - Qsp_enratio ), 4915 ) &&  /*compare with 0.15 in Q15*/
-            st_fx->bfi_pitch_fx < 9600 &&                            /*Q6*/
-            pitch_buf_fx[sub( NB_SUBFR16k, 1 )] < 9600 )             /*Q6*/
-#endif
         {
             IF( NE_32( ( error = DTFS_new_fx( &PREVP ) ), IVAS_ERR_OK ) )
             {
diff --git a/lib_dec/dec_higher_acelp.c b/lib_dec/dec_higher_acelp.c
deleted file mode 100644
index 2a9bb28cb10ce6aa83cbcd6a71f6cd31fadf4659..0000000000000000000000000000000000000000
--- a/lib_dec/dec_higher_acelp.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-----------------------------------------------------------------*
- * transf_cdbk_dec()
- *
- * Transform domain contribution decoding
- *-----------------------------------------------------------------*/
diff --git a/lib_dec/dec_higher_acelp_fx.c b/lib_dec/dec_higher_acelp_fx.c
index 49789732cb37758d0b8c36fa349732df765fb49c..6144765a8707dec75df9f6ffd037cb64681ddb17 100644
--- a/lib_dec/dec_higher_acelp_fx.c
+++ b/lib_dec/dec_higher_acelp_fx.c
@@ -8,8 +8,6 @@
 #include "prot_fx.h" /* Function prototypes                    */
 #include "rom_com.h" /* Static table prototypes                */
 
-#define IVAS_CODE
-#define IVAS_CODE_AVQ
 /*-----------------------------------------------------------------*
  * transf_cdbk_dec()
  * Transform domain contribution decoding
@@ -36,7 +34,6 @@ void transf_cdbk_dec_fx(
     Flag Overflow = 0;
     move32();
 #endif
-#ifdef IVAS_CODE
     Word16 avq_bit_sFlag;
     Word16 trgtSvPos;
     Word16 Nsv;
@@ -50,7 +47,7 @@ void transf_cdbk_dec_fx(
         move16();
         avq_bit_sFlag = 1;
     }
-#endif
+
     /*--------------------------------------------------------------*
      * Set bit-allocation
      *--------------------------------------------------------------*/
@@ -83,13 +80,8 @@ void transf_cdbk_dec_fx(
         }
 
         L_tmp = Mult_32_16( gain_code, gain16 ); /* Q16 * Q12 - 15 -> Q13*/
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shl_sat( L_tmp, 5 );      /* Q13 -> Q18*/
-        *gain_preQ = round_fx_sat( L_tmp ); /* Q2*/
-#else
-        L_tmp = L_shl( L_tmp, 5 );      /* Q13 -> Q18*/
-        *gain_preQ = round_fx( L_tmp ); /* Q2*/
-#endif
+        L_tmp = L_shl_sat( L_tmp, 5 );           /* Q13 -> Q18*/
+        *gain_preQ = round_fx_sat( L_tmp );      /* Q2*/
         move16();
     }
     ELSE
@@ -117,7 +109,7 @@ void transf_cdbk_dec_fx(
         *gain_preQ = round_fx( L_tmp );          /* Q2*/
         move16();
     }
-#ifdef IVAS_CODE
+
     trgtSvPos = sub( Nsv, 1 );
     test();
     test();
@@ -131,12 +123,11 @@ void transf_cdbk_dec_fx(
         move16();
         move16();
     }
-#endif
+
     /*--------------------------------------------------------------*
      * Demultiplex and decode subvectors from bit-stream
      *--------------------------------------------------------------*/
 
-#ifdef IVAS_CODE_AVQ
     AVQ_demuxdec_fx( st_fx, code_preQ, &nBits, 8, nq, avq_bit_sFlag, trgtSvPos );
     Word16 q_Code_preQ;
     IF( ( st_fx->element_mode == EVS_MONO ) )
@@ -149,16 +140,9 @@ void transf_cdbk_dec_fx(
         q_Code_preQ = Q_AVQ_OUT;
         move16();
     }
-#else
-    AVQ_demuxdec_fx( st_fx, code_preQ, &nBits, 8, nq );
-#endif
     FOR( i = 0; i < L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         code_preQ[i] = shl_o( code_preQ[i], q_Code_preQ, &Overflow );
-#else
-        code_preQ[i] = shl( code_preQ[i], q_Code_preQ );
-#endif
         move16(); /* code_preQ in Q6*/
     }
 
@@ -196,7 +180,6 @@ void transf_cdbk_dec_fx(
     st_fx->last_nq_preQ = nq[7];
     move16();
 
-#ifdef IVAS_CODE_AVQ
     /* TD pre-quantizer: in extreme cases at subframe boundaries, lower the preemphasis memory to avoid a saturation */
     test();
     test();
@@ -220,7 +203,6 @@ void transf_cdbk_dec_fx(
 
     st_fx->last_code_preq = code_preQ[L_SUBFR - 1]; // q_Code_preQ
     move16();
-#endif
     PREEMPH_FX( code_preQ, FAC_PRE_AVQ_FX, L_SUBFR, &st_fx->mem_preemp_preQ_fx );
     /*--------------------------------------------------------------*
      * Compute normalized prequantizer excitation gain for FEC
diff --git a/lib_dec/dec_nelp.c b/lib_dec/dec_nelp.c
deleted file mode 100644
index e7a8ca967132cf8896fc4a231dbaf74eed596840..0000000000000000000000000000000000000000
--- a/lib_dec/dec_nelp.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec_pit_exc.c b/lib_dec/dec_pit_exc.c
deleted file mode 100644
index e5ee5c0c04b0adc8423be1951998a54e6ca01b6d..0000000000000000000000000000000000000000
--- a/lib_dec/dec_pit_exc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * dec_pit_exc()
- *
- * Decode pitch-only contribution (used by the GSC technology)
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/dec_pit_exc_fx.c b/lib_dec/dec_pit_exc_fx.c
index f3bb07aef0387a63838dd1ed88806984ee88d6e0..a18029cdccfe8bb1a5a2c0bd01a939c414b1adc9 100644
--- a/lib_dec/dec_pit_exc_fx.c
+++ b/lib_dec/dec_pit_exc_fx.c
@@ -14,13 +14,13 @@
 /*--------------------------------------------------------------------------*/
 /*    INPUT ARGUMENTS :												        */
 /* _ (Word16*) Aq_fx  		   : LP filter coefficient		Q12			    */
-/* _ (Word16) coder_type    : coding type				Q0			    */
+/* _ (Word16) coder_type       : coding type				Q0			    */
 /* _ (Word16) nb_subfr_fx      :Number of subframe considered               */
 /* _ (Word16) Es_pred_fx       :predicted scaled innov. energy              */
 /*--------------------------------------------------------------------------*/
 /* OUTPUT ARGUMENTS :													    */
 /* _ (Word16*) pitch_buf_fx	: floating pitch values for each subframe Q6    */
-/* _ (Word16*)	code_fx     : innovation Q12                                    */
+/* _ (Word16*)	code_fx     : innovation Q12                                */
 /*--------------------------------------------------------------------------*/
 /* INPUT/OUTPUT ARGUMENTS :  											    */
 /*  Decoder_State_fx *st_fx     : decoder state structure                   */
@@ -29,473 +29,30 @@
 /* RETURN ARGUMENTS :													    */
 /* _ None																    */
 /*==========================================================================*/
-void dec_pit_exc_fx(
-    Decoder_State *st_fx,    /* i/o: decoder static memory                     */
-    const Word16 *Aq_fx,     /* i  : LP filter coefficient                     */
-    const Word16 coder_type, /* i  : coding type                               */
-    const Word16 Es_pred_fx, /* i  : predicted scaled innov. energy            */
-    Word16 *pitch_buf_fx,    /* o  : floating pitch values for each subframe   */
-    Word16 *code_fx,         /* o  : innovation                                */
-    Word16 *exc_fx,          /* i/o: adapt. excitation exc                     */
-    Word16 *bwe_exc_fx,      /* o  : excitation for SWB TBE                    */
-    const Word16 nb_subfr_fx /* i  : Number of subframe considered             */
-    ,
-    Word16 *gain_buf /*Q14*/
-#ifdef ADD_LRTD
-    ,
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
-    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              */
-#endif
-)
-{
-    Word16 T0_fx, T0_frac_fx, T0_min_fx, T0_max_fx; /* integer pitch variables    */
-    Word16 gain_pit_fx;                             /* pitch gain               Q14                            */
-    Word32 gain_code_fx;                            /* gain/normalized gain of the algebraic excitation Q16      */
-    Word32 norm_gain_code_fx;                       /* normalized gain of the algebraic excitation        Q16   */
-    Word16 gain_inov_fx;                            /* Innovation gain  Q12                                      */
-    Word16 voice_fac_fx;                            /* voicing factor  Q15                                      */
-    Word16 L_subfr_fx, pit_idx_fx;
-    const Word16 *p_Aq_fx; /* Pointer to frame LP coefficient Q12                      */
-    Word16 *pt_pitch_fx;   /* pointer to floating pitch     Q6                        */
-    Word16 i_subfr_fx, i;  /* tmp variables                                         */
-    Word32 Local_BR_fx, Pitch_BR_fx;
-    Word16 pitch_limit_flag, Pitch_CT_fx;
-    Word16 exc2_bidon[L_SUBFR];
-    Word16 *pt_gain; /* Pointer to floating gain values for each subframe     */
-
-    Word16 gain_code16, gain_pitx2;
-    Word32 L_tmp;
-    Word16 nbits;
-    GSC_DEC_HANDLE hGSCDec;
-    gain_pit_fx = 0;
-    move16();
-    hGSCDec = st_fx->hGSCDec;
-
-    MUSIC_POSTFILT_HANDLE hMusicPF;
-    hMusicPF = st_fx->hMusicPF;
-
-    Word16 use_fcb;
-    Word32 gc_mem[NB_SUBFR - 1]; /* gain_code from previous subframes                    */
-    Word16 gp_mem[NB_SUBFR - 1]; /* gain_pitch from previous subframes                   */
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move16();
-#endif
-
-    use_fcb = 0;
-    move16();
-    test();
-    test();
-    IF( ( st_fx->GSC_IVAS_mode > 0 ) && ( EQ_16( st_fx->GSC_noisy_speech, 1 ) || GT_32( st_fx->core_brate, GSC_H_RATE_STG ) ) )
-    {
-        Local_BR_fx = ACELP_8k00;
-        Pitch_CT_fx = GENERIC;
-        Pitch_BR_fx = ACELP_8k00;
-        move32();
-        move32();
-        move16();
-        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-        {
-            Local_BR_fx = ACELP_14k80;
-            move32();
-            if ( st_fx->GSC_IVAS_mode > 0 )
-            {
-                Local_BR_fx = ACELP_9k60;
-                move32();
-            }
-            Pitch_BR_fx = st_fx->core_brate;
-            move32();
-        }
-    }
-    ELSE IF( EQ_16( st_fx->GSC_noisy_speech, 1 ) )
-    {
-        Local_BR_fx = ACELP_7k20;
-        move32();
-        Pitch_CT_fx = GENERIC;
-        move16();
-        Pitch_BR_fx = ACELP_7k20;
-        move32();
-        if ( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-        {
-            Pitch_BR_fx = st_fx->core_brate;
-            move32();
-        }
-    }
-    ELSE
-    {
-        Local_BR_fx = ACELP_7k20;
-        move32();
-        Pitch_CT_fx = AUDIO;
-        move16();
-        Pitch_BR_fx = st_fx->core_brate;
-        move32();
-        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-        {
-            Pitch_BR_fx = ACELP_13k20;
-            move32();
-            Pitch_CT_fx = GENERIC;
-            move16();
-        }
-    }
-    L_subfr_fx = mult_r( st_fx->L_frame, div_s( 1, nb_subfr_fx ) ); /* TV2Opt : this could be less complex with 2 ifs*/
-
-
-    gain_code_fx = 0;
-    move16();
-    pitch_limit_flag = 1;
-    move16(); /* always extended pitch Q range */
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && ( ( EQ_16( st_fx->L_frame, L_FRAME ) && GE_32( st_fx->core_brate, ACELP_13k20 ) ) || ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, GSC_H_RATE_STG ) ) || st_fx->GSC_IVAS_mode == 0 ) ) ) && EQ_16( L_subfr_fx, L_SUBFR ) ) )
-    {
-        use_fcb = 1;
-        move16();
-    }
-    ELSE IF( ( st_fx->GSC_IVAS_mode > 0 ) && EQ_16( L_subfr_fx, 2 * L_SUBFR ) && LT_16( st_fx->GSC_IVAS_mode, 3 ) )
-    {
-        use_fcb = 2;
-        st_fx->acelp_cfg.fcb_mode = 1;
-        move16();
-        move16();
-        set16_fx( st_fx->acelp_cfg.gains_mode, 6, 4 );
-        set16_fx( st_fx->acelp_cfg.pitch_bits, 9, 4 );
-        set16_fx( st_fx->acelp_cfg.fixed_cdk_index, 14, 5 );
-    }
-    /*------------------------------------------------------------------*
-     * ACELP subframe loop
-     *------------------------------------------------------------------*/
-    p_Aq_fx = Aq_fx;            /* pointer to interpolated LPC parameters */
-    pt_pitch_fx = pitch_buf_fx; /* pointer to the pitch buffer */
-    pt_gain = gain_buf;         /* pointer to the gain buffer  */
-    FOR( i_subfr_fx = 0; i_subfr_fx < st_fx->L_frame; i_subfr_fx += L_subfr_fx )
-    {
-        /*----------------------------------------------------------------------*
-         *  Decode pitch lag
-         *----------------------------------------------------------------------*/
-        *pt_pitch_fx = pit_decode_fx( st_fx, Pitch_BR_fx, 0, st_fx->L_frame, i_subfr_fx, Pitch_CT_fx, &pitch_limit_flag, &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_subfr_fx
-#ifdef ADD_LRTD
-                                      ,
-                                      tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf
-#endif
-        );
-        move16();
-
-        /*--------------------------------------------------------------*
-         * Find the adaptive codebook vector.
-         *--------------------------------------------------------------*/
-
-        pred_lt4( &exc_fx[i_subfr_fx], &exc_fx[i_subfr_fx], T0_fx, T0_frac_fx, L_subfr_fx + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
-
-        /*--------------------------------------------------------------*
-         * Innovation decoding
-         *--------------------------------------------------------------*/
-
-        IF( EQ_16( use_fcb, 1 ) )
-        {
-            inov_decode_fx( st_fx, Local_BR_fx, 0, st_fx->L_frame, 1, i_subfr_fx, p_Aq_fx, st_fx->tilt_code_fx, *pt_pitch_fx, code_fx, L_subfr_fx );
-            /*--------------------------------------------------------------*
-             * Gain decoding
-             * Estimate spectrum tilt and voicing
-             *--------------------------------------------------------------*/
-
-            gain_dec_mless_fx( st_fx, st_fx->L_frame, LOCAL_CT, i_subfr_fx, -1, code_fx, Es_pred_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx );
-
-            st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, 0
-#ifdef ADD_LRTD
-                                               ,
-                                               L_subfr_fx
-#endif
-            );
-            move16();
-        }
-        ELSE IF( EQ_16( use_fcb, 2 ) ) /* IVAS only */
-        {
-            inov_decode_fx( st_fx, Local_BR_fx, 0, st_fx->L_frame, 1, i_subfr_fx, p_Aq_fx, st_fx->tilt_code_fx, *pt_pitch_fx, code_fx, L_subfr_fx );
-            /*--------------------------------------------------------------*
-             * Gain decoding
-             * Estimate spectrum tilt and voicing
-             *--------------------------------------------------------------*/
-
-            gain_dec_lbr_fx( st_fx, GENERIC, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_subfr_fx );
-
-            st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, 0
-#ifdef ADD_LRTD
-                                               ,
-                                               L_subfr_fx
-#endif
-            );
-            move16();
-        }
-        ELSE
-        {
-            nbits = 5;
-            move16();
-            if ( LT_32( st_fx->core_brate, MIN_RATE_FCB ) )
-            {
-                nbits = 4;
-                move16();
-            }
-
-            set16_fx( code_fx, 0, L_SUBFR );
-            gain_code_fx = L_deposit_l( 0 );
-            st_fx->tilt_code_fx = 0;
-            move16();
-            pit_idx_fx = (Word16) get_next_indice( st_fx, nbits );
-            move16();
-
-            gain_pit_fx = add( 9590, dic_gp_fx[pit_idx_fx] );
-            move16(); /*Q14  0.5853 in Q14 9590*/
-
-            if ( st_fx->BER_detect ) /* Bitstream is corrupted, use the past pitch gain */
-            {
-                gain_pit_fx = st_fx->lp_gainp_fx;
-                move16();
-            }
-#ifdef BASOP_NOGLOB
-            gain_code_fx = L_mult0( s_max( sub( 32767, shl_o( gain_pit_fx, 1, &Overflow ) ), 16384 ), st_fx->lp_gainc_fx ); /* Use gain pitch and past gain code as an indicator to help finding the best scaling value. gain_code_fx used a temp var*/
-#else
-            gain_code_fx = L_mult0( s_max( sub( 32767, shl( gain_pit_fx, 1 ) ), 16384 ), st_fx->lp_gainc_fx ); /* Use gain pitch and past gain code as an indicator to help finding the best scaling value. gain_code_fx used a temp var*/
-#endif
-        }
-
-        /*----------------------------------------------------------------------*
-         * Find the total excitation
-         *----------------------------------------------------------------------*/
 
-        Rescale_exc( hMusicPF->dct_post_old_exc_fx, &exc_fx[i_subfr_fx], &bwe_exc_fx[( i_subfr_fx * ( 2 * HIBND_ACB_L_FAC ) ) / 2], hGSCDec->last_exc_dct_in_fx,
-                     L_subfr_fx, shr( imult1616( L_subfr_fx, 2 * HIBND_ACB_L_FAC ), 1 ), gain_code_fx, &( st_fx->Q_exc ), st_fx->Q_subfr, NULL, i_subfr_fx, coder_type );
-
-        gain_code16 = round_fx( L_shl( gain_code_fx, st_fx->Q_exc ) ); /*Q_exc*/
-
-        IF( use_fcb != 0 )
-        {
-            Acelp_dec_total_exc( exc_fx, exc2_bidon - i_subfr_fx, gain_code16, gain_pit_fx, i_subfr_fx, code_fx, L_subfr_fx );
-        }
-        ELSE
-        {
-            IF( norm_s( s_or( gain_pit_fx, 1 ) ) == 0 )
-            {
-                FOR( i = 0; i < L_subfr_fx; i++ )
-                {
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_shl_sat( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 ); /*Q16+Q_exc*/
-                    exc_fx[i + i_subfr_fx] = round_fx_sat( L_tmp );                        /*Q_exc*/
-#else
-                    L_tmp = L_shl( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );                         /*Q16+Q_exc*/
-                    exc_fx[i + i_subfr_fx] = round_fx( L_tmp );                                                /*Q_exc*/
-#endif
-                    move16();
-                }
-            }
-            ELSE
-            {
-                gain_pitx2 = shl( gain_pit_fx, 1 ); /*Q15*/
-
-                FOR( i = 0; i < L_subfr_fx; i++ )
-                {
-                    L_tmp = L_mult( gain_pitx2, exc_fx[i + i_subfr_fx] ); /*Q16+Q_exc*/
-#ifdef BASOP_NOGLOB
-                    exc_fx[i + i_subfr_fx] = round_fx_sat( L_tmp ); /*Q_exc*/
-#else
-                    exc_fx[i + i_subfr_fx] = round_fx( L_tmp );                                                /*Q_exc*/
-#endif
-                    move16();
-                }
-            }
-        }
-
-        IF( EQ_16( L_subfr_fx, L_FRAME16k ) )
-        {
-            /* update gains for FEC - equivalent to lp_gain_updt() */
-            st_fx->lp_gainp_fx = gain_pit_fx;
-            move16();
-            st_fx->lp_gainc_fx = 0;
-            move32();
-
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            pt_pitch_fx++;
-            move16();
-            move16();
-            move16();
-            move16();
-            p_Aq_fx += 5 * ( M + 1 );
-        }
-        ELSE IF( EQ_16( L_subfr_fx, L_FRAME16k / 2 ) )
-        {
-            IF( i_subfr_fx == 0 )
-            {
-                pt_pitch_fx++;
-                *pt_pitch_fx = *( pt_pitch_fx - 1 );
-                pt_pitch_fx++;
-                p_Aq_fx += 2 * ( M + 1 );
-                move16();
-
-                /* update gains for FEC - equivalent to lp_gain_updt() */
-                st_fx->lp_gainp_fx = extract_h( L_mult( 6554, gain_pit_fx ) ); /*Q14 (3/15 in Q15 9830)*/
-                st_fx->lp_gainc_fx = 0;
-                move16();
-                move16();
-            }
-            ELSE
-            {
-                pt_pitch_fx++;
-                *pt_pitch_fx = *( pt_pitch_fx - 1 );
-                pt_pitch_fx++;
-                *pt_pitch_fx = *( pt_pitch_fx - 1 );
-                pt_pitch_fx++;
-                p_Aq_fx += 3 * ( M + 1 );
-                move16();
-                move16();
-
-                /* update gains for FEC - equivalent to lp_gain_updt() */
-                st_fx->lp_gainp_fx = extract_h( L_mult( 26214, gain_pit_fx ) ); /*Q14 (12/15 in Q15 9830)*/
-                st_fx->lp_gainc_fx = 0;
-                move16();
-                move16();
-            }
-        }
-        ELSE IF( EQ_16( L_subfr_fx, 128 ) ) /*2*L_SUBFR*/
-        {
-            p_Aq_fx += 2 * ( M + 1 );
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            move16();
-            pt_pitch_fx++;
-            *pt_gain = gain_pit_fx;
-            move16();
-            pt_gain++;
-            *pt_gain = *( pt_gain - 1 );
-            move16();
-            pt_gain++;
-            IF( i_subfr_fx == 0 )
-            {
-                /* update gains for FEC - equivalent to lp_gain_updt() */
-                st_fx->lp_gainp_fx = extract_h( L_mult( 9830, gain_pit_fx ) ); /*Q14 (3/10 in Q15 9830)*/
-                st_fx->lp_gainc_fx = 0;
-                move16();
-                move16();
-            }
-            ELSE
-            {
-                /* update gains for FEC - equivalent to lp_gain_updt() */
-                st_fx->lp_gainp_fx = extract_h( L_mult( 22938, gain_pit_fx ) ); /*Q14 (7/10 in Q15 22938)*/
-                st_fx->lp_gainc_fx = 0;
-                move16();
-                move16();
-            }
-        }
-        ELSE IF( EQ_16( L_subfr_fx, 256 ) ) /*4*L_SUBFR*/
-        {
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            move16();
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            move16();
-            pt_pitch_fx++;
-            *pt_pitch_fx = *( pt_pitch_fx - 1 );
-            move16();
-            pt_pitch_fx++;
-            *pt_gain = gain_pit_fx;
-            move16();
-            pt_gain++;
-            *pt_gain = *( pt_gain - 1 );
-            move16();
-            pt_gain++;
-            *pt_gain = *( pt_gain - 1 );
-            move16();
-            pt_gain++;
-            *pt_gain = *( pt_gain - 1 );
-            move16();
-            pt_gain++;
-            p_Aq_fx += 4 * ( M + 1 );
-
-            /* update gains for FEC - equivalent to lp_gain_updt() */
-            st_fx->lp_gainp_fx = gain_pit_fx;
-            move16();
-            st_fx->lp_gainc_fx = 0;
-            move16();
-        }
-        ELSE
-        {
-            p_Aq_fx += ( M + 1 );
-            move16();
-            pt_pitch_fx++;
-            move16();
-            *pt_gain = gain_pit_fx;
-            move16();
-            pt_gain++;
-
-            lp_gain_updt_fx( i_subfr_fx, gain_pit_fx, 0, &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, st_fx->L_frame );
-        }
-    }
-
-    return;
-}
-
-/*==========================================================================*/
-/* FUNCTION : void  dec_pit_exc_ivas_fx()       	    							*/
-/*--------------------------------------------------------------------------*/
-/* PURPOSE  :  Decode pitch only contribution                          	    */
-/*--------------------------------------------------------------------------*/
-/*    INPUT ARGUMENTS :												        */
-/* _ (Word16*) Aq_fx  		   : LP filter coefficient		Q12			    */
-/* _ (Word16) coder_type    : coding type				Q0			    */
-/* _ (Word16) nb_subfr_fx      :Number of subframe considered               */
-/* _ (Word16) Es_pred_fx       :predicted scaled innov. energy              */
-/*--------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :													    */
-/* _ (Word16*) pitch_buf_fx	: Word16 pitch values for each subframe Q6    */
-/* _ (Word16*)	code_fx     : innovation                                    */
-/*--------------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS :  											    */
-/*  Decoder_State_fx *st_fx     : decoder state structure                   */
-/* _ (Word16*) exc_fx			: adapt. excitation exc         		    */
-/*--------------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :													    */
-/* _ None																    */
-/*==========================================================================*/
-void dec_pit_exc_ivas_fx(
-    Decoder_State *st_fx,    /* i/o: decoder static memory                     */
-    const Word16 *Aq_fx,     /* i  : LP filter coefficient                     */
-    const Word16 coder_type, /* i  : coding type                               */
-    const Word16 Es_pred_fx, /* i  : predicted scaled innov. energy            */
-    Word16 *pitch_buf_fx,    /* o  : Word16 pitch values for each subframe   */
-    Word16 *code_fx,         /* o  : innovation                                */
-    Word16 *exc_fx,          /* i/o: adapt. excitation exc                     */
-    Word16 *bwe_exc_fx,      /* o  : excitation for SWB TBE                    */
-    const Word16 nb_subfr_fx /* i  : Number of subframe considered             */
-    ,
-    Word16 *gain_buf /*Q14*/
-#if 1                // def ADD_LRTD
-    ,
+void dec_pit_exc_fx(
+    Decoder_State *st_fx,              /* i/o: decoder static memory                     */
+    const Word16 *Aq_fx,               /* i  : LP filter coefficient                     */
+    const Word16 coder_type,           /* i  : coding type                               */
+    const Word16 Es_pred_fx,           /* i  : predicted scaled innov. energy            */
+    Word16 *pitch_buf_fx,              /* o  : Word16 pitch values for each subframe     */
+    Word16 *code_fx,                   /* o  : innovation                                */
+    Word16 *exc_fx,                    /* i/o: adapt. excitation exc                     */
+    Word16 *bwe_exc_fx,                /* o  : excitation for SWB TBE                    */
+    const Word16 nb_subfr_fx,          /* i  : Number of subframe considered             */
+    Word16 *gain_buf,                  /* o  : Word16 pitch gain for each subframe    Q14*/
     const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          */
     const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              */
-#endif
 )
 {
-    Word16 T0_fx, T0_frac_fx, T0_min_fx, T0_max_fx; /* integer pitch variables    */
-    Word16 gain_pit_fx;                             /* pitch gain               Q14                            */
-    Word32 gain_code_fx;                            /* gain/normalized gain of the algebraic excitation Q16      */
+    Word16 T0_fx, T0_frac_fx, T0_min_fx, T0_max_fx; /* integer pitch variables                                  */
+    Word16 gain_pit_fx;                             /* pitch gain               Q14                             */
+    Word32 gain_code_fx;                            /* gain/normalized gain of the algebraic excitation Q16     */
     Word32 norm_gain_code_fx;                       /* normalized gain of the algebraic excitation        Q16   */
-    Word16 gain_inov_fx;                            /* Innovation gain  Q12                                      */
+    Word16 gain_inov_fx;                            /* Innovation gain  Q12                                     */
     Word16 voice_fac_fx;                            /* voicing factor  Q15                                      */
     Word16 L_subfr_fx, pit_idx_fx;
-    const Word16 *p_Aq_fx; /* Pointer to frame LP coefficient Q12                      */
+    const Word16 *p_Aq_fx; /* Pointer to frame LP coefficient Q12                   */
     Word16 *pt_pitch_fx;   /* pointer to Word16 pitch     Q6                        */
     Word16 i_subfr_fx, i;  /* tmp variables                                         */
     Word32 Local_BR_fx, Pitch_BR_fx;
@@ -604,23 +161,22 @@ void dec_pit_exc_ivas_fx(
         set16_fx( st_fx->acelp_cfg.pitch_bits, 9, 4 );
         set16_fx( st_fx->acelp_cfg.fixed_cdk_index, 14, 5 );
     }
+
     /*------------------------------------------------------------------*
      * ACELP subframe loop
      *------------------------------------------------------------------*/
+
     p_Aq_fx = Aq_fx;            /* pointer to interpolated LPC parameters */
     pt_pitch_fx = pitch_buf_fx; /* pointer to the pitch buffer */
     pt_gain = gain_buf;         /* pointer to the gain buffer  */
+
     FOR( i_subfr_fx = 0; i_subfr_fx < st_fx->L_frame; i_subfr_fx += L_subfr_fx )
     {
         /*----------------------------------------------------------------------*
          *  Decode pitch lag
          *----------------------------------------------------------------------*/
-        *pt_pitch_fx = pit_decode_ivas_fx( st_fx, Pitch_BR_fx, 0, st_fx->L_frame, i_subfr_fx, Pitch_CT_fx, &pitch_limit_flag, &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_subfr_fx
-#if 1 // def ADD_LRTD
-                                           ,
-                                           tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf
-#endif
-        );
+
+        *pt_pitch_fx = pit_decode_fx( st_fx, Pitch_BR_fx, 0, st_fx->L_frame, i_subfr_fx, Pitch_CT_fx, &pitch_limit_flag, &T0_fx, &T0_frac_fx, &T0_min_fx, &T0_max_fx, L_subfr_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
         move16();
 
         /*--------------------------------------------------------------*
@@ -636,6 +192,7 @@ void dec_pit_exc_ivas_fx(
         IF( EQ_16( use_fcb, 1 ) )
         {
             inov_decode_fx( st_fx, Local_BR_fx, 0, st_fx->L_frame, 1, i_subfr_fx, p_Aq_fx, st_fx->tilt_code_fx, *pt_pitch_fx, code_fx, L_subfr_fx );
+
             /*--------------------------------------------------------------*
              * Gain decoding
              * Estimate spectrum tilt and voicing
@@ -643,31 +200,22 @@ void dec_pit_exc_ivas_fx(
 
             gain_dec_mless_fx( st_fx, st_fx->L_frame, LOCAL_CT, i_subfr_fx, -1, code_fx, Es_pred_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx );
 
-            st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, 0
-#if 1 // def ADD_LRTD
-                                                    ,
-                                                    L_subfr_fx, 0
-#endif
-            );
+            st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, 0, L_subfr_fx, 0 );
             move16();
         }
         ELSE IF( EQ_16( use_fcb, 2 ) ) /* IVAS only */
         {
             /*inov_decode_fx(st_fx, Local_BR_fx, 0, st_fx->L_frame, 1, i_subfr_fx, p_Aq_fx, st_fx->tilt_code_fx, *pt_pitch_fx, code_fx, L_subfr_fx);*/
             inov_decode_fx( st_fx, st_fx->core_brate, 0, st_fx->L_frame, 0, i_subfr_fx, p_Aq_fx, st_fx->tilt_code_fx, *pt_pitch_fx, code_fx, L_subfr_fx );
+
             /*--------------------------------------------------------------*
              * Gain decoding
              * Estimate spectrum tilt and voicing
              *--------------------------------------------------------------*/
 
-            gain_dec_lbr_ivas_fx( st_fx, GENERIC, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_subfr_fx );
+            gain_dec_lbr_fx( st_fx, GENERIC, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_subfr_fx );
 
-            st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, 0
-#if 1 // def ADD_LRTD
-                                                    ,
-                                                    L_subfr_fx, 0
-#endif
-            );
+            st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, 0, L_subfr_fx, 0 );
             move16();
         }
         ELSE
@@ -694,11 +242,7 @@ void dec_pit_exc_ivas_fx(
                 gain_pit_fx = st_fx->lp_gainp_fx;
                 move16();
             }
-#ifdef BASOP_NOGLOB
             gain_code_fx = L_mult0( s_max( sub( 32767, shl_o( gain_pit_fx, 1, &Overflow ) ), 16384 /*0.5.Q15*/ ), st_fx->lp_gainc_fx ); /* Use gain pitch and past gain code as an indicator to help finding the best scaling value. gain_code_fx used a temp var*/
-#else
-            gain_code_fx = L_mult0( s_max( sub( 32767, shl( gain_pit_fx, 1 ) ), 16384 ), st_fx->lp_gainc_fx ); /* Use gain pitch and past gain code as an indicator to help finding the best scaling value. gain_code_fx used a temp var*/
-#endif
         }
 
         /*----------------------------------------------------------------------*
diff --git a/lib_dec/dec_post.c b/lib_dec/dec_post.c
deleted file mode 100644
index 10836b7799b2982d308f8c9647c4e2f58329a7e5..0000000000000000000000000000000000000000
--- a/lib_dec/dec_post.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Local constants
- *---------------------------------------------------------------------*/
-
-#define FORMAT_POST_FILT_G1 0.75f /*0.75f*/ /*denominator 0.9,0.75,0.15,0.9*/
-
-
-/*--------------------------------------------------------------------------
- * Local function prototypes
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*
- *  Function  Init_post_filter_ivas()
- *
- *  Post-filter initialization
- *--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------
- * nb_post_filt_ivas()
- *
- * Main routine to perform post filtering of NB signals
- *--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------
- *  formant_post_filt_ivas:
- *
- *  WB and SWB formant post-filtering
- *--------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------
- * Dec_postfilt()
- *
- * Adaptive postfilter main function
- *   Short-term postfilter :
- *     Hst(z) = Hst0(z) Hst1(z)
- *     Hst0(z) = 1/g0 A(gamma2)(z) / A(gamma1)(z)
- *     if {hi} = i.r. filter A(gamma2)/A(gamma1) (truncated)
- *     g0 = SUM(|hi|) if > 1
- *     g0 = 1. else
- *     Hst1(z) = 1/(1 - |mu|) (1 + mu z-1)
- *     with mu = k1 * gamma3
- *     k1 = 1st parcor calculated on {hi}
- *     gamma3 = gamma3_minus if k1<0, gamma3_plus if k1>0
- *   Long-term postfilter :
- *     harmonic postfilter :   H0(z) = gl * (1 + b * z-p)
- *       b = gamma_g * gain_ltp
- *       gl = 1 / 1 + b
- *     computation of delay p on A(gamma2)(z) s(z)
- *     sub optimal search
- *       1. search around 1st subframe delay (3 integer values)
- *       2. search around best integer with fract. delays (1/8)
- *----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------
- * Dec_formant_postfilt
- *
- * Post - adaptive postfilter main function
- *   Short term postfilter :
- *     Hst(z) = Hst0(z) Hst1(z)
- *     Hst0(z) = 1/g0 A(gamma2)(z) / A(gamma1)(z)
- *     if {hi} = i.r. filter A(gamma2)/A(gamma1) (truncated)
- *     g0 = SUM(|hi|) if > 1
- *     g0 = 1. else
- *     Hst1(z) = 1/(1 - |mu|) (1 + mu z-1)
- *     with mu = k1 * gamma3
- *     k1 = 1st parcor calculated on {hi}
- *     gamma3 = gamma3_minus if k1<0, gamma3_plus if k1>0
- *----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------
- * pst_ltp()
- *
- * Perform harmonic postfilter
- *----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
- * search_del()
- *
- * Computes best (shortest) integer LTP delay + fine search
- *---------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
- * filt_plt()
- *
- * Perform long term postfilter
- *----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
- * compute_ltp_l()
- *
- * compute delayed signal, num & den of gain for fractional delay
- * with long interpolation filter
- *----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
- *  select_ltp()
- *
- *  selects best of (gain1, gain2)
- *  with gain1 = num1 * 2** sh_num1 / den1 * 2** sh_den1
- *  and  gain2 = num2 * 2** sh_num2 / den2 * 2** sh_den2
- *----------------------------------------------------------------------------*/
-
-/*! r: 1 = 1st gain, 2 = 2nd gain */
-
-
-/*------------------------------------------------------------------------------------
- * modify_pst_param()
- *
- * Modify gamma1 and gamma2 values in function of the long-term noise level
- *-----------------------------------------------------------------------------------*/
diff --git a/lib_dec/dec_post_fx.c b/lib_dec/dec_post_fx.c
index 27abd7b2d416e2e029a0e6aa18e187431164b579..37d088a8f98d7049e8ed7d130e26f5e2deab8e22 100644
--- a/lib_dec/dec_post_fx.c
+++ b/lib_dec/dec_post_fx.c
@@ -35,8 +35,6 @@ static void modify_pst_param_fx( const Word16 lp_noise, Word16 *g1, Word16 *g2,
 
 static void Dec_formant_postfilt_fx( PFSTAT_HANDLE hPFstat, Word16 *signal_ptr, Word16 *coeff, Word16 *sig_out, Word16 gamma1, Word16 gamma2 );
 
-static void Dec_formant_postfilt_ivas_fx( PFSTAT_HANDLE hPFstat, Word16 *signal_ptr, Word16 *coeff, Word16 *sig_out, Word16 gamma1, Word16 gamma2 );
-
 static void calc_st_filt_ivas_fx( Word16 *apond2, Word16 *apond1, Word16 *parcor0, Word16 *sig_ltp_ptr, Word16 *mem_zero, const Word16 extl );
 
 
@@ -81,12 +79,12 @@ void Init_post_filter_fx(
  *--------------------------------------------------------------------------*/
 void nb_post_filt_fx(
     const Word16 L_frame,    /* i  : frame length                            */
-    PFSTAT_HANDLE hPFstat,   /* i : core decoder parameters */
+    PFSTAT_HANDLE hPFstat,   /* i : core decoder parameters                  */
     Word16 *psf_lp_noise,    /* i  : Long term noise                   Q8    */
     const Word16 tmp_noise,  /* i  : noise energy                       Q0   */
     Word16 *Synth,           /* i  : 12k8 synthesis                    Qsyn  */
     const Word16 *Aq,        /* i  : LP filter coefficient             Q12   */
-    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q6    */
+    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q0    */
     const Word16 coder_type, /* i  : coder_type                              */
     const Word16 BER_detect, /* i  : BER detect flag                         */
     const Word16 disable_hpf /* i  : flag to diabled HPF                     */
@@ -142,7 +140,7 @@ void nb_post_filt_fx(
     move16();
     FOR( i = 0; i < L_frame; i += L_SUBFR )
     {
-        T0_first = Pitch_buf[j]; // Q6
+        T0_first = Pitch_buf[j]; // Q0
         move16();
         Dec_postfilt_fx( hPFstat, T0_first, &Pf_in[i], p_Aq, &Synth[i], Post_G1, Post_G2, Gain_factor, disable_hpf );
 
@@ -179,7 +177,7 @@ void nb_post_filt_fx(
  *----------------------------------------------------------------------------*/
 static void Dec_postfilt_fx(
     PFSTAT_HANDLE hPFstat,    /* i : core decoder parameters */
-    const Word16 t0,          /* i  : pitch delay given by coder Q6                   */
+    const Word16 t0,          /* i  : pitch delay given by coder Q0                   */
     const Word16 *signal_ptr, /* i  : input signal (pointer to current subframe Q0    */
     const Word16 *coeff,      /* i  : LPC coefficients for current subframe Q12        */
     Word16 *sig_out,          /* o  : postfiltered output                          Q15*/
@@ -255,21 +253,21 @@ static void Dec_postfilt_fx(
  *
  *  Main routine to perform formant post filtering
  *--------------------------------------------------------------------------*/
+
 void formant_post_filt_fx(
-    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
+    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters            */
     Word16 *synth_in,      /* i  : 12k8 synthesis                    */
-    Word16 *Aq,            /* i  : LP filter coefficient Q12            */
+    Word16 *Aq,            /* i  : LP filter coefficient Q12         */
     Word16 *synth_out,     /* i/o: input signal                      */
-    Word16 L_frame,
-    Word32 lp_noise,      /* (i) : background noise energy (15Q16) */
-    Word32 brate,         /* (i) : bit-rate */
-    const Word16 off_flag /* i  : off flag                        */
+    const Word16 L_frame,  /* i  : frame length                      */
+    const Word32 lp_noise, /* (i) : background noise energy (15Q16)  */
+    const Word32 brate,    /* (i) : bit-rate                         */
+    const Word16 off_flag  /* i  : off flag                          */
 )
 {
     Word16 i_subfr;
     Word16 *p_Aq;
-    Word16 post_G1, post_G2; // Q15
-
+    Word16 post_G1, post_G2;
 
     /*default parameter for noisy speech and high bit-rates*/
     IF( EQ_16( L_frame, L_FRAME ) )
@@ -378,134 +376,13 @@ void formant_post_filt_fx(
         Dec_formant_postfilt_fx( hPFstat, &synth_in[i_subfr], p_Aq, &synth_out[i_subfr], post_G1, post_G2 );
         p_Aq += ( M + 1 );
     }
-}
-
-void formant_post_filt_ivas_fx(
-    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
-    Word16 *synth_in,      /* i  : 12k8 synthesis                    */
-    Word16 *Aq,            /* i  : LP filter coefficient Q12             */
-    Word16 *synth_out,     /* i/o: input signal                      */
-    Word16 L_frame,
-    Word32 lp_noise,      /* (i) : background noise energy (15Q16) */
-    Word32 brate,         /* (i) : bit-rate */
-    const Word16 off_flag /* i  : off flag                        */
-)
-{
-    Word16 i_subfr;
-    Word16 *p_Aq;
-    Word16 post_G1, post_G2;
-
-
-    /*default parameter for noisy speech and high bit-rates*/
-    IF( EQ_16( L_frame, L_FRAME ) )
-    {
-        post_G2 = 22938 /*0.7f Q15*/;
-        move16();
-        IF( LT_32( lp_noise, LP_NOISE_THRESH ) )
-        {
-            /*Clean speech*/
-            IF( LT_32( brate, ACELP_13k20 ) )
-            {
-                /*Low rates*/
-
-                post_G1 = 26214 /*0.8f Q15*/;
-                move16();
-            }
-            ELSE IF( LT_32( brate, ACELP_24k40 ) )
-            {
-                /*Low rates*/
-
-                post_G1 = 24576 /*0.75f Q15*/;
-                move16();
-            }
-            ELSE
-            {
-                post_G1 = 23593 /*0.72f Q15*/;
-                move16();
-            }
-        }
-        ELSE /*Noisy speech*/
-        {
-            post_G1 = 22938 /*0.7f Q15*/;
-            move16();
-            if ( LT_32( brate, ACELP_15k85 ) )
-            {
-                /*Low rates*/
-                post_G1 = 24576 /*0.75f Q15*/;
-                move16();
-            }
-        }
-    }
-    ELSE
-    {
-        post_G2 = 24904 /*0.76f Q15*/;
-        move16();
-        test();
-        IF( GE_32( lp_noise, LP_NOISE_THRESH ) )
-        {
-            post_G1 = 24904 /*0.76f Q15*/;
-        }
-        ELSE IF( EQ_32( brate, ACELP_13k20 ) )
-        {
-            post_G1 = 26870 /*0.82f Q15*/;
-            move16();
-        }
-        ELSE IF( EQ_32( brate, ACELP_16k40 ) )
-        {
-            post_G1 = 26214 /*0.80f Q15*/;
-            move16();
-        }
-        ELSE IF( EQ_32( brate, ACELP_24k40 ) || EQ_32( brate, ACELP_32k ) )
-        {
-            post_G1 = 25559 /*0.78f Q15*/;
-            move16();
-        }
-        ELSE
-        {
-            post_G1 = 24904 /*0.76f Q15*/;
-            move16();
-        }
-    }
-
-    /* Switch off post-filter */
-    if ( off_flag != 0 )
-    {
-        post_G1 = post_G2;
-        move16();
-    }
-
-    /* Reset post filter */
-    IF( hPFstat->reset != 0 )
-    {
-        post_G1 = MAX16B;
-        move16();
-        post_G2 = MAX16B;
-        move16();
-        hPFstat->reset = 0;
-        move16();
-        Copy( &synth_in[L_frame - L_SYN_MEM], hPFstat->mem_pf_in, L_SYN_MEM );
-        Copy( &synth_in[L_frame - L_SYN_MEM], hPFstat->mem_stp, L_SYN_MEM );
-        hPFstat->gain_prec = 16384; // 1.Q14
-        move16();
-        Copy( synth_in, synth_out, L_frame );
 
-        return;
-    }
+    return;
+}
 
-    /* input memory*/
-    Copy( hPFstat->mem_pf_in, synth_in - L_SYN_MEM, L_SYN_MEM );
-    Copy( &synth_in[L_frame - L_SYN_MEM], hPFstat->mem_pf_in, L_SYN_MEM );
 
-    move16();
-    p_Aq = Aq; // Q12
-    FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_SUBFR )
-    {
-        Dec_formant_postfilt_ivas_fx( hPFstat, &synth_in[i_subfr], p_Aq, &synth_out[i_subfr], post_G1, post_G2 );
-        p_Aq += ( M + 1 );
-    }
-}
 /*----------------------------------------------------------------------------
- * Dec_formant_postfilt_fx
+ * Dec_formant_postfilt_fx()
  *
  * Post - adaptive postfilter main function
  *   Short term postfilter :
@@ -519,92 +396,14 @@ void formant_post_filt_ivas_fx(
  *     k1 = 1st parcor calculated on {hi}
  *     gamma3 = gamma3_minus if k1<0, gamma3_plus if k1>0
  *----------------------------------------------------------------------------*/
-static void Dec_formant_postfilt_fx(
-    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
-    Word16 *signal_ptr,    /* i  : input signal (pointer to current subframe Q14*/
-    Word16 *coeff,         /* i  : LPC coefficients for current subframe Q12    */
-    Word16 *sig_out,       /* o  : postfiltered output                       */
-    Word16 gamma1,         /* i  : short term postfilt. den. weighting factor Q15*/
-    Word16 gamma2          /* i  : short term postfilt. num. weighting factor Q15*/
-)
-{
-    /* Local variables and arrays */
-    Word16 apond1[M + 1];        /* s.t. denominator coeff. Q12*/
-    Word16 apond2[LONG_H_ST];    // Q12
-    Word16 res2[L_SUBFR];        // Q14
-    Word16 resynth[L_SUBFR + 1]; // Qy
-    Word16 parcor0;              // Q15
-    Word16 i, max;
-    Word16 scale_down;
-
-    /* Compute weighted LPC coefficients */
-    weight_a_fx( coeff, apond1, gamma1, M );
-    weight_a_fx( coeff, apond2, gamma2, M );
-    set16_fx( &apond2[M + 1], 0, LONG_H_ST - ( M + 1 ) );
-
-    max = abs_s( signal_ptr[0] ); // Q14
-    FOR( i = 1; i < L_SUBFR; i++ )
-    {
-        max = s_max( max, abs_s( signal_ptr[i] ) );
-    }
-    scale_down = 0;
-    move16();
-    if ( GT_16( max, 16384 /*1.Q14*/ ) )
-    {
-        scale_down = 1;
-        move16();
-    }
-
-    /* Compute A(gamma2) residual */
-    IF( !scale_down )
-    {
-        Residu3_fx( apond2, signal_ptr, res2, L_SUBFR, 1 );
-    }
-    ELSE
-    {
-        Residu3_fx( apond2, signal_ptr, res2, L_SUBFR, 0 );
-        Scale_sig( hPFstat->mem_stp, L_SYN_MEM, -1 );
-    }
 
-    /* Controls short term pst filter gain and compute parcor0 */
-    calc_st_filt_local_fx( apond2, apond1, &parcor0, res2, hPFstat->mem_zero );
-
-    /* 1/A(gamma1) filtering, mem_stp is updated */
-    resynth[0] = *( hPFstat->mem_stp + sub( L_SYN_MEM, 1 ) );
-    move16();
-
-    E_UTIL_synthesis( 1, apond1, res2, &( resynth[1] ), L_SUBFR, hPFstat->mem_stp + L_SYN_MEM - M, 0, M );
-
-    IF( !scale_down )
-    {
-        Copy( &( resynth[1] ) + L_SUBFR - L_SYN_MEM, hPFstat->mem_stp, L_SYN_MEM );
-    }
-    ELSE
-    {
-        Copy_Scale_sig( &( resynth[1] ) + L_SUBFR - L_SYN_MEM, hPFstat->mem_stp, L_SYN_MEM, 1 );
-    }
-
-    /* Tilt filtering */
-    Filt_mu_fx( resynth, sig_out, parcor0, L_SUBFR );
-    IF( scale_down )
-    {
-        Scale_sig( sig_out, L_SUBFR, 1 );
-    }
-
-    /* Gain control */
-    scale_st_fx( signal_ptr, sig_out, &hPFstat->gain_prec, L_SUBFR );
-
-
-    return;
-}
-
-static void Dec_formant_postfilt_ivas_fx(
-    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
-    Word16 *signal_ptr,    /* i  : input signal (pointer to current subframe Q14*/
-    Word16 *coeff,         /* i  : LPC coefficients for current subframe Q12     */
-    Word16 *sig_out,       /* o  : postfiltered output                       */
-    Word16 gamma1,         /* i  : short term postfilt. den. weighting factor Q15*/
-    Word16 gamma2          /* i  : short term postfilt. num. weighting factor Q15*/
+static void Dec_formant_postfilt_fx(
+    PFSTAT_HANDLE hPFstat, /* i  : core decoder parameters                          */
+    Word16 *signal_ptr,    /* i  : input signal (pointer to current subframe     Q14*/
+    Word16 *coeff,         /* i  : LPC coefficients for current subframe Q12        */
+    Word16 *sig_out,       /* o  : postfiltered output                              */
+    Word16 gamma1,         /* i  : short term postfilt. den. weighting factor    Q15*/
+    Word16 gamma2          /* i  : short term postfilt. num. weighting factor    Q15*/
 )
 {
     /* Local variables and arrays */
@@ -703,11 +502,7 @@ static void modify_pst_param_fx(
     test();
     IF( NE_16( coder_type, INACTIVE ) && LT_16( lp_noise, LP_NOISE_THR_FX ) )
     {
-#ifdef BASOP_NOGLOB
         lp_noiseQ12 = shl_o( lp_noise, 4, &Overflow ); /* to go from Q8 to Q12 */
-#else
-        lp_noiseQ12 = shl( lp_noise, 4 ); /* to go from Q8 to Q12 */
-#endif
 
         /* ftmp = lp_noise*BG1_FX + CG1_FX */
         tmp = mac_r( CG1_FX * 65536L, lp_noiseQ12, BG1_FX * 8 ); /* x8 to go from Q12 to Q15 */
@@ -753,7 +548,7 @@ static void modify_pst_param_fx(
  * Perform harmonic postfilter
  *----------------------------------------------------------------------------*/
 static void pst_ltp_fx(
-    Word16 t0,            /* i  : pitch delay given by coder Q6       */
+    Word16 t0,            /* i  : pitch delay given by coder Q0       */
     Word16 *ptr_sig_in,   /* i  : postfilter i  filter (residu2) Qx   */
     Word16 *ptr_sig_pst0, /* o  : harmonic postfilter o Qx           */
     Word16 gain_factor    /* i  : Gain Factor (Q15)                */
@@ -846,11 +641,7 @@ static void pst_ltp_fx(
             FOR( i = 0; i < L_SUBFR; i++ )
             {
                 /* nb_sh_sig may be >0, <0 or =0 */
-#ifdef BASOP_NOGLOB
                 ptr_y_up[i] = shl_sat( ptr_y_up[i], nb_sh_sig );
-#else
-                ptr_y_up[i] = shl( ptr_y_up[i], nb_sh_sig );
-#endif
                 move16();
             }
         }
@@ -884,11 +675,7 @@ static void pst_ltp_fx(
         /* decrease gain in noisy condition */
         /* gain_plt += (1.0f-gain_plt) * gain_factor */
         /* gain_plt = gain_plt + gain_factor - gain_plt*gain_factor */
-#ifdef BASOP_NOGLOB
         gain_plt = msu_ro( L_msu( L_deposit_h( gain_plt ), gain_plt, gain_factor ), -32768, gain_factor, &Overflow ); // Q15
-#else
-        gain_plt = msu_r( L_msu( L_deposit_h( gain_plt ), gain_plt, gain_factor ), -32768, gain_factor );
-#endif
 
         /** filtering by H0(z) = harmonic filter **/
         filt_plt_fx( ptr_sig_in, ptr_y_up, ptr_sig_pst0, gain_plt );
@@ -944,11 +731,7 @@ static void search_del_fx(
     L_acc = L_mult( ptr_sig_in[0], ptr_sig_in[0] );
     FOR( i = 1; i < L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_acc = L_mac_sat( L_acc, ptr_sig_in[i], ptr_sig_in[i] );
-#else
-        L_acc = L_mac( L_acc, ptr_sig_in[i], ptr_sig_in[i] );
-#endif
     }
     IF( L_acc == 0 )
     {
@@ -985,20 +768,12 @@ static void search_del_fx(
         L_acc = L_mult( ptr_sig_in[0], ptr_sig_past[0] );
         FOR( n = 1; n < L_SUBFR; n++ )
         {
-#ifdef BASOP_NOGLOB
             L_acc = L_mac_sat( L_acc, ptr_sig_in[n], ptr_sig_past[n] );
-#else
-            L_acc = L_mac( L_acc, ptr_sig_in[n], ptr_sig_past[n] );
-#endif
         }
 
 
         L_acc = L_max( L_acc, 0 );
-#ifdef BASOP_NOGLOB
         L_temp = L_sub_sat( L_acc, L_num_int );
-#else
-        L_temp = L_sub( L_acc, L_num_int );
-#endif
         if ( L_temp > 0L )
         {
             i_max = (Word16) i;
@@ -1032,11 +807,7 @@ static void search_del_fx(
     {
         temp = *ptr_sig_past++;
         move16();
-#ifdef BASOP_NOGLOB
         L_acc = L_mac_sat( L_acc, temp, temp );
-#else
-        L_acc = L_mac( L_acc, temp, temp );
-#endif
     }
     IF( L_acc == 0L )
     {
@@ -1094,30 +865,18 @@ static void search_del_fx(
         L_acc = L_mult( ptr_y_up[1], ptr_y_up[1] );
         FOR( n = 2; n < L_SUBFR; n++ )
         {
-#ifdef BASOP_NOGLOB
             L_acc = L_mac_sat( L_acc, ptr_y_up[n], ptr_y_up[n] );
-#else
-            L_acc = L_mac( L_acc, ptr_y_up[n], ptr_y_up[n] );
-#endif
         }
         L_temp0 = L_acc; /* sets to 'L_acc' in 1 clock (saved for den1) */
         move32();
 
         /* den0 */
-#ifdef BASOP_NOGLOB
         L_acc = L_mac_sat( L_acc, ptr_y_up[0], ptr_y_up[0] );
-#else
-        L_acc = L_mac( L_acc, ptr_y_up[0], ptr_y_up[0] );
-#endif
         *ptr_L_den0 = L_acc;
         move32();
 
         /* den1 */
-#ifdef BASOP_NOGLOB
         L_acc = L_mac_sat( L_temp0, ptr_y_up[L_SUBFR], ptr_y_up[L_SUBFR] );
-#else
-        L_acc = L_mac( L_temp0, ptr_y_up[L_SUBFR], ptr_y_up[L_SUBFR] );
-#endif
         *ptr_L_den1 = L_acc;
         move32();
 
@@ -1208,11 +967,7 @@ static void search_del_fx(
         L_acc = L_mult( ptr_sig_in[0], ptr_y_up[0] );
         FOR( n = 1; n < L_SUBFR; n++ )
         {
-#ifdef BASOP_NOGLOB
             L_acc = L_mac_sat( L_acc, ptr_sig_in[n], ptr_y_up[n] );
-#else
-            L_acc = L_mac( L_acc, ptr_sig_in[n], ptr_y_up[n] );
-#endif
         }
         L_acc = L_shr( L_acc, sh_num ); /* sh_num > 0 */
         L_acc = L_max( 0, L_acc );
@@ -1245,11 +1000,7 @@ static void search_del_fx(
         L_acc = L_mult( ptr_sig_in[0], ptr_y_up[0] );
         FOR( n = 1; n < L_SUBFR; n++ )
         {
-#ifdef BASOP_NOGLOB
             L_acc = L_mac_sat( L_acc, ptr_sig_in[n], ptr_y_up[n] );
-#else
-            L_acc = L_mac( L_acc, ptr_sig_in[n], ptr_y_up[n] );
-#endif
         }
         L_acc = L_shr( L_acc, sh_num ); /* sh_num > 0 */
         L_acc = L_max( 0, L_acc );
@@ -1461,11 +1212,7 @@ static void compute_ltp_l_fx(
     L_acc = L_mult( y_up[0], y_up[0] );
     FOR( n = 1; n < L_SUBFR; n++ )
     {
-#ifdef BASOP_NOGLOB
         L_acc = L_mac_sat( L_acc, y_up[n], y_up[n] );
-#else
-        L_acc = L_mac( L_acc, y_up[n], y_up[n] );
-#endif
     }
     temp = sub( 16, norm_l( L_acc ) );
     temp = s_max( temp, 0 );
@@ -1701,11 +1448,7 @@ void Filt_mu_fx(
 
     temp = sub( 1, abs_s( mu ) );
     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
     mu2 = add_o( 32767, temp, &Overflow ); /* Q15 (1 - |mu|) */
-#else
-    mu2 = add( 32767, temp );              /* 2**15 (1 - |mu|) */
-#endif
     BASOP_SATURATE_WARNING_ON_EVS;
     ga = div_s( fact, mu2 ); /* Q(sh_fact) / (1 - |mu|) */
 
@@ -1719,19 +1462,11 @@ void Filt_mu_fx(
         L_temp = L_mac( L_acc, 16384, *ptrs ); /* sig_in(n) * 2**15 */
 
         L_temp = Madd_32_16( L_fact, L_temp, ga );
-#ifdef BASOP_NOGLOB
         L_temp = L_shr_sat( L_temp, sh_fact ); /* mult. temp x ga */
-#else
-        L_temp = L_shr( L_temp, sh_fact ); /* mult. temp x ga */
-#endif
         BASOP_SATURATE_WARNING_OFF_EVS;
         /*sig_out[n] = saturate(L_temp); move16();*/
-#ifdef BASOP_NOGLOB
         sig_out[n] = round_fx_sat( L_temp );
         move16();
-#else
-        sig_out[n] = round_fx( L_temp );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
 
@@ -1807,11 +1542,7 @@ void Filt_mu_ivas_fx(
 
     temp = sub( 1, abs_s( mu ) );
     BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
     mu2 = add_o( 32767, temp, &Overflow ); /* Q15 (1 - |mu|) */
-#else
-    mu2 = add( 32767, temp ); /* 2**15 (1 - |mu|) */
-#endif
     BASOP_SATURATE_WARNING_ON_EVS;
     ga = div_s( fact, mu2 ); /* Q(sh_fact) / (1 - |mu|) */
 
@@ -1829,11 +1560,7 @@ void Filt_mu_ivas_fx(
 
         BASOP_SATURATE_WARNING_OFF_EVS;
         /*sig_out[n] = saturate(L_temp); move16();*/
-#ifdef BASOP_NOGLOB
         sig_out[n] = round_fx_sat( L_temp );
-#else
-        sig_out[n] = round_fx( L_temp );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
 
@@ -1917,11 +1644,7 @@ void scale_st_fx(
         }
         /* L_gain_in/L_gain_out in Q14 */
         /* overflows if L_gain_in > 2 * L_gain_out */
-#ifdef BASOP_NOGLOB
-        g0 = shr_sat( g0, sh_g0 ); /* sh_g0 may be >0, <0, or =0 */
-#else
-        g0 = shr( g0, sh_g0 ); /* sh_g0 may be >0, <0, or =0 */
-#endif
+        g0 = shr_sat( g0, sh_g0 );      /* sh_g0 may be >0, <0, or =0 */
         g0 = mult_r( g0, AGC_FAC1_FX ); /* L_gain_in/L_gain_out * AGC_FAC1_FX */
     }
 
@@ -1934,13 +1657,8 @@ void scale_st_fx(
         temp = mult_r( AGC_FAC_FX, gain );
         gain = add( temp, g0 ); /* in Q14 */
         L_temp = L_mult( gain, sig_out[i] );
-#ifdef BASOP_NOGLOB
         L_temp = L_shl_sat( L_temp, 1 );
         sig_out[i] = round_fx_sat( L_temp );
-#else
-        L_temp = L_shl( L_temp, 1 );
-        sig_out[i] = round_fx( L_temp );
-#endif
         move16();
     }
     *gain_prec = gain;
@@ -1975,15 +1693,9 @@ void blend_subfr2_fx(
     move16();
     FOR( i = 0; i < L_SUBFR / 2; i++ )
     {
-#ifdef BASOP_NOGLOB
         sigOut[i] = mac_ro( L_mult_o( fac1, sigIn1[i], &Overflow ), fac2, sigIn2[i], &Overflow ); // Qx
         fac1 = sub_o( fac1, step, &Overflow );
         fac2 = add_o( fac2, step, &Overflow );
-#else
-        sigOut[i] = mac_r( L_mult( fac1, sigIn1[i] ), fac2, sigIn2[i] );
-        fac1 = sub( fac1, step );
-        fac2 = add( fac2, step );
-#endif
         move16();
     }
 
diff --git a/lib_dec/dec_ppp.c b/lib_dec/dec_ppp.c
deleted file mode 100644
index e7a8ca967132cf8896fc4a231dbaf74eed596840..0000000000000000000000000000000000000000
--- a/lib_dec/dec_ppp.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec_ppp_fx.c b/lib_dec/dec_ppp_fx.c
index 4849e147a04c9f10f351aa1c9ae5d89750637be4..4b3f4f554ec8100ae08fb5f6f7bac0383f398224 100644
--- a/lib_dec/dec_ppp_fx.c
+++ b/lib_dec/dec_ppp_fx.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include "options.h" /* Compilation switches */
 #include "prot_fx.h" /* Function prototypes */
+
 /*===================================================================*/
 /* FUNCTION      : void decod_ppp_fx ()								 */
 /*-------------------------------------------------------------------*/
@@ -45,20 +46,20 @@
 /*-------------------------------------------------------------------*/
 /* CALLED FROM : RX													 */
 /*===================================================================*/
+
 ivas_error decod_ppp_fx(
-    Decoder_State *st_fx, /* i/o: state structure */
-    const Word16 Aq_fx[], /* i  : 12k8 Lp coefficient */
-    Word16 *pitch_buf_fx, /* i/o: fixed pitch values for each subframe */
-    Word16 *exc_fx,       /* i/o: current non-enhanced excitation */
-    Word16 *exc2_fx,      /* i/o: current enhanced excitation */
-    Word16 bfi,           /* i  : bad frame indicator */
-    Word16 *gain_buf,
+    Decoder_State *st_fx,  /* i/o: state structure */
+    const Word16 Aq_fx[],  /* i  : 12k8 Lp coefficient */
+    Word16 *pitch_buf_fx,  /* i/o: fixed pitch values for each subframe */
+    Word16 *exc_fx,        /* i/o: current non-enhanced excitation */
+    Word16 *exc2_fx,       /* i/o: current enhanced excitation */
+    Word16 bfi,            /* i  : bad frame indicator */
+    Word16 *gain_buf,      /* o  : Word16 pitch gain for each subframe		 Q14*/
     Word16 *voice_factors, /* o  : voicing factors */
     Word16 *bwe_exc_fx     /* o  : excitation for SWB TBE */
 )
 {
     Word16 k;
-
     Word16 LPC_de_curr_fx[M + 1], p_Aq_curr_fx[M], p_Aq_old_fx[M + 1];
     Word16 excQ_ppp_fx[L_FRAME], pitch_fx[NB_SUBFR], LPC_de_old_fx[M + 1];
     ivas_error error;
diff --git a/lib_dec/dec_prm.c b/lib_dec/dec_prm.c
deleted file mode 100644
index 33c62a67a09e57e3f54e7cd49aace17014132f00..0000000000000000000000000000000000000000
--- a/lib_dec/dec_prm.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * getTCXMode_ivas()
- *
- * get TCX mode
- *--------------------------------------------------------------------*/
-void getTCXMode_ivas_fx(
-    Decoder_State *st,    /* i/o: decoder memory state                 */
-    Decoder_State *st0,   /* i  : bitstream                            */
-    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0) */
-)
-{
-    UWord16 ind;
-
-    IF( st->tcxonly )
-    {
-        /* get core */
-        ind = get_next_indice_fx( st0, 1 ); /* Store decoder memory of last_core */
-        st->core = add( ind, TCX_20_CORE );
-        move16();
-        /* get class */
-        ind = get_next_indice_fx( st0, 2 );
-
-        st->clas_dec = ONSET;
-        move16();
-        IF( ind == 0 )
-        {
-            st->clas_dec = UNVOICED_CLAS;
-            move16();
-        }
-        ELSE IF( EQ_16( ind, 1 ) )
-        {
-            IF( GE_16( st->last_good, VOICED_TRANSITION ) )
-            {
-                st->clas_dec = VOICED_TRANSITION;
-                move16();
-            }
-            ELSE
-            {
-                st->clas_dec = UNVOICED_TRANSITION;
-                move16();
-            }
-        }
-        ELSE IF( EQ_16( ind, 2 ) )
-        {
-            st->clas_dec = VOICED_CLAS;
-            move16();
-        }
-
-        st->coder_type = INACTIVE;
-        move16();
-        test();
-        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && !MCT_flag )
-        {
-            st->VAD = get_next_indice_fx( st0, 1 );
-            move16();
-        }
-        ELSE
-        {
-            st->VAD = 0;
-            move16();
-        }
-    }
-    ELSE
-    {
-        IF( EQ_16( st->mdct_sw, MODE1 ) )
-        {
-            /* 2 bits instead of 3 as TCX is already signaled */
-            st->core = TCX_20_CORE;
-            move16();
-            st->hTcxCfg->coder_type = get_next_indice_fx( st0, 2 );
-            move16();
-            st->coder_type = st->hTcxCfg->coder_type;
-            move16();
-        }
-        ELSE
-        {
-            IF( EQ_16( st->mdct_sw_enable, MODE2 ) )
-            {
-                IF( get_next_indice_1_fx( st0 ) )
-                {
-                    ind = get_next_indice_fx( st0, 3 );
-                    assert( !( ind & 4 ) || !"HQ_CORE encountered in dec_prm_ivas" );
-                    st->core = TCX_20_CORE;
-                    move16();
-                    st->hTcxCfg->coder_type = ind;
-                    move16();
-                    st->coder_type = st->hTcxCfg->coder_type;
-                    move16();
-                }
-                ELSE /* ACELP */
-                {
-                    st->core = ACELP_CORE;
-                    move16();
-                    st->coder_type = get_next_indice_fx( st0, 2 );
-                    move16();
-                }
-            }
-            ELSE
-            {
-                IF( EQ_16( st->rf_flag, 1 ) )
-                {
-                    IF( !st->use_partial_copy )
-                    {
-                        ind = get_next_indice_fx( st0, 1 );
-                        IF( ind == 0 )
-                        {
-                            st->core = ACELP_CORE;
-                            move16();
-                        }
-                        ELSE
-                        {
-                            st->core = TCX_20_CORE;
-                            move16();
-                            st->hTcxCfg->coder_type = st->coder_type;
-                            move16();
-                        }
-                    }
-                }
-                ELSE
-                {
-                    ind = get_next_indice_fx( st, 3 );
-                    IF( LT_16( ind, ACELP_MODE_MAX ) )
-                    {
-                        st->core = ACELP_CORE;
-                        move16();
-                        st->coder_type = ind;
-                        move16();
-                    }
-                    ELSE
-                    {
-                        st->core = TCX_20_CORE;
-                        move16();
-                        st->hTcxCfg->coder_type = sub( ind, ACELP_MODE_MAX );
-                        move16();
-                        st->coder_type = st->hTcxCfg->coder_type;
-                        move16();
-                    }
-                }
-            }
-        }
-
-        IF( EQ_16( st->element_mode, EVS_MONO ) )
-        {
-            test();
-            IF( st->igf && EQ_16( st->core, ACELP_CORE ) )
-            {
-                st->bits_frame_core = sub( st->bits_frame_core, get_tbe_bits_fx( st->total_brate, st->bwidth, st->rf_flag ) );
-                move16();
-            }
-
-            IF( st->rf_flag )
-            {
-                st->bits_frame_core = sub( st->bits_frame_core, add( st->rf_target_bits, 1 ) ); /* +1 as flag-bit not considered in rf_target_bits */
-                move16();
-            }
-        }
-
-        /* Inactive frame detection on non-DTX mode */
-        IF( EQ_16( st->coder_type, INACTIVE ) )
-        {
-            st->VAD = 0;
-            move16();
-        }
-        ELSE
-        {
-            st->VAD = 1;
-            move16();
-        }
-    }
-
-    /*Core extended mode mapping for correct PLC classification*/
-    st->core_ext_mode = st->coder_type;
-    move16();
-    if ( EQ_16( st->coder_type, INACTIVE ) )
-    {
-        st->core_ext_mode = UNVOICED;
-        move16();
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * getTCXWindowing_ivas()
- *
- * get TCX transform type for each subframe
- *--------------------------------------------------------------------*/
-void getTCXWindowing_ivas_fx(
-    const Word16 core,         /* i  : current core                  */
-    const Word16 last_core,    /* i  : last frame core               */
-    const Word16 element_mode, /* i  : element mode                  */
-    TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle      */
-    Decoder_State *st0         /* i  : bitstream                     */
-)
-{
-    Word16 overlap_code;
-
-    /* Set the last overlap mode based on the previous and current frame type and coded overlap mode */
-    test();
-    test();
-    test();
-    IF( EQ_16( last_core, ACELP_CORE ) || EQ_16( last_core, AMR_WB_CORE ) )
-    {
-        hTcxCfg->tcx_last_overlap_mode = TRANSITION_OVERLAP;
-        move16();
-    }
-    ELSE IF( EQ_16( core, TCX_10_CORE ) && EQ_16( hTcxCfg->tcx_curr_overlap_mode, ALDO_WINDOW ) )
-    {
-        hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP;
-        move16();
-    }
-    ELSE IF( NE_16( core, TCX_10_CORE ) && EQ_16( hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) )
-    {
-        hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW;
-        move16();
-    }
-    ELSE
-    {
-        hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
-        move16();
-    }
-
-    /* Set the current overlap mode based on the current frame type and coded overlap mode */
-    hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
-    move16();
-
-    IF( NE_16( core, ACELP_CORE ) )
-    {
-        overlap_code = 0;
-        move16();
-        IF( get_next_indice_fx( st0, 1 ) )
-        {
-            overlap_code = add( 2, get_next_indice_fx( st0, 1 ) );
-        }
-
-        assert( MIN_OVERLAP == 2 && HALF_OVERLAP == 3 );
-        hTcxCfg->tcx_curr_overlap_mode = overlap_code;
-        move16();
-        /*TCX10 : always symmetric windows*/
-        test();
-        test();
-        test();
-        IF( EQ_16( core, TCX_20_CORE ) && ( overlap_code == 0 ) && NE_16( last_core, ACELP_CORE ) && NE_16( last_core, AMR_WB_CORE ) )
-        {
-            hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
-            move16();
-        }
-    }
-
-    test();
-    IF( NE_16( element_mode, EVS_MONO ) && EQ_16( core, TCX_10_CORE ) )
-    {
-        /* also read last overlap */
-        overlap_code = 0;
-        move16();
-
-        IF( get_next_indice_fx( st0, 1 ) )
-        {
-            overlap_code = add( 2, get_next_indice_fx( st0, 1 ) );
-        }
-
-        hTcxCfg->tcx_last_overlap_mode = overlap_code;
-        move16();
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * getLPCparam_ivas()
- *
- * get LPC parameters
- *--------------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * Function  dec_prm_ivas()                                             *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                   *
- *
- * SQ is used for TCX modes
- *
- * decode parameters according to selected mode                    *
- *-----------------------------------------------------------------*/
diff --git a/lib_dec/dec_prm_fx.c b/lib_dec/dec_prm_fx.c
index 73edd3b3b3c98d0a0018f9e206153a54254a3ec3..16e588396b547fb2f56c6e88a6f44d616bbed3bc 100644
--- a/lib_dec/dec_prm_fx.c
+++ b/lib_dec/dec_prm_fx.c
@@ -1003,12 +1003,7 @@ void dec_prm_fx(
         {
             IF( st->lpcQuantization == 0 )
             {
-                decode_lpc_avq_fx( st, st->numlpc, param_lpc
-#ifdef IVAS_CODE_AVQ_LPC
-                                   ,
-                                   , ,
-#endif
-                );
+                decode_lpc_avq_fx( st, st->numlpc, param_lpc );
                 move16();
             }
             ELSE IF( EQ_16( st->lpcQuantization, 1 ) )
@@ -1742,3 +1737,272 @@ void dec_prm_fx(
 
     return;
 }
+
+
+/*-------------------------------------------------------------------*
+ * getTCXMode_ivas()
+ *
+ * get TCX mode
+ *--------------------------------------------------------------------*/
+void getTCXMode_ivas_fx(
+    Decoder_State *st,    /* i/o: decoder memory state                 */
+    Decoder_State *st0,   /* i  : bitstream                            */
+    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0) */
+)
+{
+    UWord16 ind;
+
+    IF( st->tcxonly )
+    {
+        /* get core */
+        ind = get_next_indice_fx( st0, 1 ); /* Store decoder memory of last_core */
+        st->core = add( ind, TCX_20_CORE );
+        move16();
+        /* get class */
+        ind = get_next_indice_fx( st0, 2 );
+
+        st->clas_dec = ONSET;
+        move16();
+        IF( ind == 0 )
+        {
+            st->clas_dec = UNVOICED_CLAS;
+            move16();
+        }
+        ELSE IF( EQ_16( ind, 1 ) )
+        {
+            IF( GE_16( st->last_good, VOICED_TRANSITION ) )
+            {
+                st->clas_dec = VOICED_TRANSITION;
+                move16();
+            }
+            ELSE
+            {
+                st->clas_dec = UNVOICED_TRANSITION;
+                move16();
+            }
+        }
+        ELSE IF( EQ_16( ind, 2 ) )
+        {
+            st->clas_dec = VOICED_CLAS;
+            move16();
+        }
+
+        st->coder_type = INACTIVE;
+        move16();
+        test();
+        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && !MCT_flag )
+        {
+            st->VAD = get_next_indice_fx( st0, 1 );
+            move16();
+        }
+        ELSE
+        {
+            st->VAD = 0;
+            move16();
+        }
+    }
+    ELSE
+    {
+        IF( EQ_16( st->mdct_sw, MODE1 ) )
+        {
+            /* 2 bits instead of 3 as TCX is already signaled */
+            st->core = TCX_20_CORE;
+            move16();
+            st->hTcxCfg->coder_type = get_next_indice_fx( st0, 2 );
+            move16();
+            st->coder_type = st->hTcxCfg->coder_type;
+            move16();
+        }
+        ELSE
+        {
+            IF( EQ_16( st->mdct_sw_enable, MODE2 ) )
+            {
+                IF( get_next_indice_1_fx( st0 ) )
+                {
+                    ind = get_next_indice_fx( st0, 3 );
+                    assert( !( ind & 4 ) || !"HQ_CORE encountered in dec_prm_ivas" );
+                    st->core = TCX_20_CORE;
+                    move16();
+                    st->hTcxCfg->coder_type = ind;
+                    move16();
+                    st->coder_type = st->hTcxCfg->coder_type;
+                    move16();
+                }
+                ELSE /* ACELP */
+                {
+                    st->core = ACELP_CORE;
+                    move16();
+                    st->coder_type = get_next_indice_fx( st0, 2 );
+                    move16();
+                }
+            }
+            ELSE
+            {
+                IF( EQ_16( st->rf_flag, 1 ) )
+                {
+                    IF( !st->use_partial_copy )
+                    {
+                        ind = get_next_indice_fx( st0, 1 );
+                        IF( ind == 0 )
+                        {
+                            st->core = ACELP_CORE;
+                            move16();
+                        }
+                        ELSE
+                        {
+                            st->core = TCX_20_CORE;
+                            move16();
+                            st->hTcxCfg->coder_type = st->coder_type;
+                            move16();
+                        }
+                    }
+                }
+                ELSE
+                {
+                    ind = get_next_indice_fx( st, 3 );
+                    IF( LT_16( ind, ACELP_MODE_MAX ) )
+                    {
+                        st->core = ACELP_CORE;
+                        move16();
+                        st->coder_type = ind;
+                        move16();
+                    }
+                    ELSE
+                    {
+                        st->core = TCX_20_CORE;
+                        move16();
+                        st->hTcxCfg->coder_type = sub( ind, ACELP_MODE_MAX );
+                        move16();
+                        st->coder_type = st->hTcxCfg->coder_type;
+                        move16();
+                    }
+                }
+            }
+        }
+
+        IF( EQ_16( st->element_mode, EVS_MONO ) )
+        {
+            test();
+            IF( st->igf && EQ_16( st->core, ACELP_CORE ) )
+            {
+                st->bits_frame_core = sub( st->bits_frame_core, get_tbe_bits_fx( st->total_brate, st->bwidth, st->rf_flag ) );
+                move16();
+            }
+
+            IF( st->rf_flag )
+            {
+                st->bits_frame_core = sub( st->bits_frame_core, add( st->rf_target_bits, 1 ) ); /* +1 as flag-bit not considered in rf_target_bits */
+                move16();
+            }
+        }
+
+        /* Inactive frame detection on non-DTX mode */
+        IF( EQ_16( st->coder_type, INACTIVE ) )
+        {
+            st->VAD = 0;
+            move16();
+        }
+        ELSE
+        {
+            st->VAD = 1;
+            move16();
+        }
+    }
+
+    /*Core extended mode mapping for correct PLC classification*/
+    st->core_ext_mode = st->coder_type;
+    move16();
+    if ( EQ_16( st->coder_type, INACTIVE ) )
+    {
+        st->core_ext_mode = UNVOICED;
+        move16();
+    }
+
+    return;
+}
+
+/*-------------------------------------------------------------------*
+ * getTCXWindowing_ivas()
+ *
+ * get TCX transform type for each subframe
+ *--------------------------------------------------------------------*/
+void getTCXWindowing_ivas_fx(
+    const Word16 core,         /* i  : current core                  */
+    const Word16 last_core,    /* i  : last frame core               */
+    const Word16 element_mode, /* i  : element mode                  */
+    TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle      */
+    Decoder_State *st0         /* i  : bitstream                     */
+)
+{
+    Word16 overlap_code;
+
+    /* Set the last overlap mode based on the previous and current frame type and coded overlap mode */
+    test();
+    test();
+    test();
+    IF( EQ_16( last_core, ACELP_CORE ) || EQ_16( last_core, AMR_WB_CORE ) )
+    {
+        hTcxCfg->tcx_last_overlap_mode = TRANSITION_OVERLAP;
+        move16();
+    }
+    ELSE IF( EQ_16( core, TCX_10_CORE ) && EQ_16( hTcxCfg->tcx_curr_overlap_mode, ALDO_WINDOW ) )
+    {
+        hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP;
+        move16();
+    }
+    ELSE IF( NE_16( core, TCX_10_CORE ) && EQ_16( hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) )
+    {
+        hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW;
+        move16();
+    }
+    ELSE
+    {
+        hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
+        move16();
+    }
+
+    /* Set the current overlap mode based on the current frame type and coded overlap mode */
+    hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
+    move16();
+
+    IF( NE_16( core, ACELP_CORE ) )
+    {
+        overlap_code = 0;
+        move16();
+        IF( get_next_indice_fx( st0, 1 ) )
+        {
+            overlap_code = add( 2, get_next_indice_fx( st0, 1 ) );
+        }
+
+        assert( MIN_OVERLAP == 2 && HALF_OVERLAP == 3 );
+        hTcxCfg->tcx_curr_overlap_mode = overlap_code;
+        move16();
+        /*TCX10 : always symmetric windows*/
+        test();
+        test();
+        test();
+        IF( EQ_16( core, TCX_20_CORE ) && ( overlap_code == 0 ) && NE_16( last_core, ACELP_CORE ) && NE_16( last_core, AMR_WB_CORE ) )
+        {
+            hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
+            move16();
+        }
+    }
+
+    test();
+    IF( NE_16( element_mode, EVS_MONO ) && EQ_16( core, TCX_10_CORE ) )
+    {
+        /* also read last overlap */
+        overlap_code = 0;
+        move16();
+
+        IF( get_next_indice_fx( st0, 1 ) )
+        {
+            overlap_code = add( 2, get_next_indice_fx( st0, 1 ) );
+        }
+
+        hTcxCfg->tcx_last_overlap_mode = overlap_code;
+        move16();
+    }
+
+    return;
+}
diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c
deleted file mode 100644
index ae0474f3d987d452a00f59905bd09924038a8e21..0000000000000000000000000000000000000000
--- a/lib_dec/dec_tcx.c
+++ /dev/null
@@ -1,497 +0,0 @@
-
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "prot_fx.h"
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "stat_com.h"
-#include "cnst.h"
-#include "wmc_auto.h"
-#include "ivas_rom_com.h"
-#include "ivas_prot_fx.h"
-#include "debug.h"
-
-/*-------------------------------------------------------------------*
- * decoder_tcx_post()
- *
- *
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- *  decoder_tcx_tns()
- *
- *  TCX: TNS application
- *-------------------------------------------------------------------*/
-
-void decoder_tcx_tns_fx(
-    Decoder_State *st,         /* i/o: coder memory state                      */
-    const Word16 L_frame_glob, /* i  : frame length                            */
-    const Word16 L_spec,
-    const Word16 L_frame,
-    const Word16 L_frameTCX,
-    Word32 x_fx[N_MAX],   // Qx
-    const Word16 fUseTns, /* i  : flag that is set if TNS data is present */
-    STnsData *tnsData,
-    const Word16 bfi,       /* i  : Bad frame indicator                     */
-    const Word16 frame_cnt, /* i  : frame counter in the super frame        */
-    const Word16 whitenedDomain,
-    Word16 *length )
-{
-    Word16 index, isTCX5, L, tmp;
-    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
-
-    index = hTcxCfg->tcx_last_overlap_mode; /* backup last TCX overlap mode */
-    move16();
-
-    isTCX5 = 0;
-    move16();
-    L = L_frameTCX;
-    move16();
-    tmp = L;
-    move16();
-
-    test();
-    IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && NE_16( st->tcxonly, 0 ) )
-    {
-        test();
-        test();
-        IF( NE_16( frame_cnt, 0 ) && EQ_16( bfi, 0 ) && NE_16( st->last_core, ACELP_CORE ) )
-        {
-            /* fix sub-window overlap */
-            hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
-            move16();
-        }
-
-        test();
-        test();
-        test();
-        IF( ( NE_16( hTcxCfg->fIsTNSAllowed, 0 ) && NE_16( fUseTns, 0 ) && NE_16( bfi, 1 ) ) || GT_16( L_spec, L_frameTCX ) )
-        {
-            L = L_spec;
-            move16();
-            tmp = L;
-            move16();
-        }
-
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( EQ_16( bfi, 0 ) && ( NE_16( hTcxCfg->tcx_last_overlap_mode, FULL_OVERLAP ) ||
-                                   ( EQ_16( hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) && EQ_16( frame_cnt, 0 ) && EQ_16( index, 0 ) ) ) ) ||
-            ( NE_16( bfi, 0 ) && ( NE_16( hTcxCfg->tcx_last_overlap_mode, FULL_OVERLAP ) &&
-                                   NE_16( hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) ) ) )
-        {
-            isTCX5 = 1;
-            move16();
-
-            tcx5SpectrumDeinterleaving_fx( shr( L, 1 ), x_fx );
-        }
-    }
-
-    /*-----------------------------------------------------------*
-     * Temporal Noise Shaping Synthesis                          *
-     *-----------------------------------------------------------*/
-
-
-    test();
-    test();
-    test();
-    IF( NE_16( hTcxCfg->fIsTNSAllowed, 0 ) && NE_16( fUseTns, 0 ) && NE_16( bfi, 1 ) && EQ_16( tnsData->tnsOnWhitenedSpectra, whitenedDomain ) )
-    {
-        /* Apply TNS to get the reconstructed signal */
-        SetTnsConfig( hTcxCfg, L_frame_glob == st->L_frame, ( st->last_core == ACELP_CORE ) && ( frame_cnt == 0 ) );
-
-        test();
-        test();
-        IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && NE_16( st->tcxonly, 0 ) && NE_16( isTCX5, 0 ) )
-        {
-            tcx5TnsGrouping_fx( shr( L, 1 ), shr( hTcxCfg->tnsConfig[0][0].iFilterBorders[0], 1 ), x_fx );
-        }
-
-        ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, tnsData, x_fx, 0 );
-
-        test();
-        test();
-        IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && NE_16( st->tcxonly, 0 ) && NE_16( isTCX5, 0 ) )
-        {
-            test();
-            IF( EQ_16( st->element_mode, EVS_MONO ) || LT_16( L_spec, L_frameTCX ) ) /* todo: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */
-            {
-                tcx5TnsUngrouping_fx( shr( L_frameTCX, 1 ), shr( hTcxCfg->tnsConfig[0][0].iFilterBorders[0], 1 ), x_fx, DEC );
-                tmp = L_frameTCX;
-                move16();
-            }
-            ELSE
-            {
-                tcx5TnsUngrouping_fx( shr( L, 1 ), shr( hTcxCfg->tnsConfig[0][0].iFilterBorders[0], 1 ), x_fx, DEC );
-            }
-        }
-    }
-    test();
-    IF( NE_16( whitenedDomain, 0 ) && NE_16( isTCX5, 0 ) )
-    {
-        tcx5SpectrumInterleaving_fx( shr( L, 1 ), x_fx );
-    }
-
-    /* restore index */
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && NE_16( st->tcxonly, 0 ) && NE_16( frame_cnt, 0 ) && EQ_16( bfi, 0 ) && NE_16( st->last_core, ACELP_CORE ) )
-    {
-        /* restore sub-window overlap */
-        hTcxCfg->tcx_last_overlap_mode = index;
-        move16();
-    }
-
-    if ( length != NULL )
-    {
-        *length = tmp;
-        move16();
-    }
-
-    return;
-}
-
-
-void decoder_tcx_imdct_fx(
-    Decoder_State *st,         /* i/o: coder memory state                      */
-    const Word16 L_frame_glob, /* i  : frame length                            */
-    const Word16 L_frameTCX_glob,
-    const Word16 L_spec,
-    const Word16 tcx_offset,
-    const Word16 tcx_offsetFB,
-    const Word16 L_frame,
-    const Word16 L_frameTCX,
-    const Word16 left_rect,
-    Word32 x_fx[N_MAX], // Q(11)
-    Word16 q_x,
-    Word16 xn_buf_fx[], // Q(-2)
-    Word16 q_win,
-    const UWord16 kernelType,          /* i  : TCX transform kernel type               */
-    const Word16 fUseTns,              /* i  : flag that is set if TNS data is present */
-    Word16 synth_fx[],                 // Q(-2)             /* i/o: synth[-M..L_frame]                      */
-    Word16 synthFB_fx[],               // Q(-2)
-    const Word16 bfi,                  /* i  :  Bad frame indicator                    */
-    const Word16 frame_cnt,            /* i  : frame counter in the super frame        */
-    const Word16 sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC      */
-)
-{
-    Word16 j, L, overlap, curr_order, startLine, endLine, isTCX5;
-    Word16 overlapFB;
-    Word32 x_tmp_fx[L_FRAME_PLUS];
-    Word32 xn_bufFB_fx[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX] = { 0 };
-    Word16 xn_bufFB_fx_16[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX];
-    Word16 acelp_zir_fx[L_FRAME_MAX / 2];
-    Word32 x_itf_fx[N_MAX_TCX - IGF_START_MN];
-    Word16 index, proc = 0;
-    TCX_LTP_DEC_HANDLE hTcxLtpDec = st->hTcxLtpDec;
-    TCX_DEC_HANDLE hTcxDec = st->hTcxDec;
-    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
-    Word16 predictionGain_fx;
-    Word16 A_itf_fx[ITF_MAX_FILTER_ORDER + 1]; // q_a_itf
-    Word16 q_a_itf = 15;
-    Word16 x_e = sub( 31, q_x );
-    move16();
-
-    /*-----------------------------------------------------------------*
-     * Initializations
-     *-----------------------------------------------------------------*/
-
-    /* Init lengths */
-    overlap = hTcxCfg->tcx_mdct_window_length;
-    move16();
-    overlapFB = hTcxCfg->tcx_mdct_window_lengthFB;
-    move16();
-
-    index = hTcxCfg->tcx_last_overlap_mode; /* backup last TCX overlap mode */
-    move16();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && ( st->tcxonly != 0 ) && ( frame_cnt != 0 ) && ( bfi == 0 ) && ( st->last_core != ACELP_CORE ) )
-    {
-        /* fix sub-window overlap */
-        hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
-        move16();
-    }
-
-    IF( st->igf != 0 )
-    {
-        proc = st->hIGFDec->flatteningTrigger;
-        move16();
-
-        test();
-        IF( proc && fUseTns != 0 )
-        {
-            proc = 0;
-            move16();
-        }
-
-        IF( proc )
-        {
-
-            startLine = st->hIGFDec->infoIGFStartLine;
-            move16();
-            endLine = st->hIGFDec->infoIGFStopLine;
-            move16();
-            curr_order = 0;
-            move16();
-            predictionGain_fx = 0;
-            move16();
-            L = L_frameTCX;
-            move16();
-            isTCX5 = 0;
-            move16();
-
-            /* interleave again for ITF */
-            test();
-            IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && st->tcxonly )
-            {
-                test();
-                test();
-                test();
-                IF( ( hTcxCfg->fIsTNSAllowed && ( fUseTns != 0 ) && NE_16( bfi, 1 ) ) || GT_16( L_spec, L_frameTCX ) )
-                {
-                    L = L_spec;
-                    move16();
-                }
-
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                test();
-                IF( ( ( bfi == 0 ) && ( ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) ||
-                                        ( ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( frame_cnt == 0 ) && ( index == 0 ) ) ) ) ||
-                    ( ( bfi != 0 ) && ( ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) &&
-                                        ( hTcxCfg->tcx_curr_overlap_mode != FULL_OVERLAP ) ) ) )
-                {
-                    isTCX5 = 1;
-                    move16();
-
-                    tcx5SpectrumInterleaving_fx( shr( L, 1 ), x_fx );
-                }
-            }
-
-            FOR( j = startLine; j < endLine; j++ )
-            {
-                IF( EQ_16( st->hIGFDec->flag_sparse[j - IGF_START_MN], 2 ) )
-                {
-                    x_itf_fx[j - IGF_START_MN] = x_fx[j]; // q_x
-                    move32();
-                    x_fx[j] = st->hIGFDec->virtualSpec_fx[j - IGF_START_MN];
-                    move32();
-                }
-            }
-
-            ITF_Detect_fx( x_fx + IGF_START_MN, startLine, endLine, 8 /*maxOrder*/, A_itf_fx, &q_a_itf, &predictionGain_fx, &curr_order, shl( x_e, 1 ) );
-
-            ITF_Apply_fx( x_fx, startLine, endLine, A_itf_fx, q_a_itf, curr_order );
-
-            FOR( j = startLine; j < endLine; j++ )
-            {
-                IF( EQ_16( st->hIGFDec->flag_sparse[j - IGF_START_MN], 2 ) )
-                {
-                    x_fx[j] = x_itf_fx[j - IGF_START_MN]; // q_x
-                    move32();
-                }
-            }
-
-            /* deinterleave */
-            IF( NE_16( isTCX5, 0 ) )
-            {
-                tcx5SpectrumDeinterleaving_fx( shr( L, 1 ), x_fx );
-            }
-        }
-    }
-
-    /*-----------------------------------------------------------*
-     * Prepare OLA buffer after waveadjustment.                  *
-     * Compute inverse MDCT of x[].                              *
-     *-----------------------------------------------------------*/
-
-
-    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        set32_fx( x_tmp_fx, 0, L_FRAME_PLUS );
-        Copy32( x_fx, x_tmp_fx, s_min( L_FRAME48k, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ) );    // q_x
-        Copy32( x_fx, xn_bufFB_fx, s_min( L_FRAME48k, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ) ); // q_x
-    }
-    ELSE IF( ( st->element_mode == EVS_MONO ) )
-    {
-        Copy32( x_fx, xn_bufFB_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ); // q_x
-    }
-    ELSE
-    {
-        Copy32( x_fx, x_tmp_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) );    // q_x
-        Copy32( x_fx, xn_bufFB_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ); // q_x
-    }
-
-    IF( ( st->igf != 0 ) )
-    {
-        set32_fx( xn_bufFB_fx + st->hIGFDec->infoIGFStartLine, 0, L_frameTCX - st->hIGFDec->infoIGFStartLine );
-    }
-
-    test();
-    IF( NE_16( st->element_mode, IVAS_CPE_DFT ) && !sba_dirac_stereo_flag )
-    {
-
-        IMDCT_ivas_fx( xn_bufFB_fx, q_x, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf_fx, hTcxCfg->tcx_aldo_window_1, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2,
-                       hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,
-                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );
-    }
-
-    /* Generate additional comfort noise to mask potential coding artefacts */
-    test();
-    test();
-    test();
-    IF( ( st->flag_cna != 0 ) && NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) && ( st->cna_dirac_flag == 0 ) )
-    {
-        generate_masking_noise_mdct_ivas_fx( x_fx, &x_e, st->hFdCngDec->hFdCngCom );
-        FOR( Word16 ind = 0; ind < L_frame; ind++ )
-        {
-            x_fx[ind] = L_shr( x_fx[ind], sub( 31, add( x_e, q_x ) ) ); // q_x
-        }
-    }
-
-    test();
-    IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || ( sba_dirac_stereo_flag != 0 ) )
-    {
-        Copy32( x_fx, xn_bufFB_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ); // q_x
-
-        IMDCT_ivas_fx( xn_bufFB_fx, q_x, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf_fx, hTcxCfg->tcx_aldo_window_1, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,
-                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );
-    }
-
-    FOR( Word16 ind = 0; ind < L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; ind++ )
-    {
-        xn_bufFB_fx_16[ind] = extract_l( L_shr( xn_bufFB_fx[ind], sub( q_x, q_win ) ) ); // q_x
-        move16();
-    }
-    IF( st->element_mode != EVS_MONO )
-    {
-        IMDCT_ivas_fx( x_tmp_fx, q_x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB_fx_16, hTcxCfg->tcx_aldo_window_1_FB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB,
-                       hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,
-                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir_fx, q_win );
-    }
-    ELSE
-    {
-
-        IMDCT_ivas_fx( x_fx, q_x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB_fx_16, hTcxCfg->tcx_aldo_window_1_FB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,
-                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir_fx, q_win );
-    }
-    FOR( Word16 ind = 0; ind < L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; ind++ )
-    {
-        xn_bufFB_fx[ind] = L_shl( xn_bufFB_fx_16[ind], sub( q_x, q_win ) ); // Q_x
-    }
-
-    IF( ( bfi == 0 ) )
-    {
-        Word16 res_m, res_e = 0;
-        move16();
-        st->second_last_tns_active = st->last_tns_active;
-        move16();
-        st->last_tns_active = hTcxCfg->fIsTNSAllowed & fUseTns;
-        move16();
-        hTcxDec->tcxltp_third_last_pitch = hTcxDec->tcxltp_second_last_pitch;
-        move32();
-        hTcxDec->tcxltp_second_last_pitch = st->old_fpitch;
-        move32();
-        res_m = BASOP_Util_Divide1616_Scale( hTcxLtpDec->tcxltp_pitch_fr, st->pit_res_max, &res_e );
-        st->old_fpitch = L_add( L_shl( hTcxLtpDec->tcxltp_pitch_int, 16 ), L_shl( res_m, add( res_e, 1 ) ) );
-
-        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-        {
-            res_m = BASOP_Util_Divide1616_Scale( L_frame_glob, L_FRAME, &res_e );
-            st->old_fpitch = L_shl( Mpy_32_16_1( st->old_fpitch, res_m ), res_e );
-        }
-
-        IF( GT_16( st->element_mode, EVS_MONO ) )
-        {
-            res_m = BASOP_Util_Divide1616_Scale( L_frameTCX_glob, L_frame_glob, &res_e );
-            st->old_fpitchFB = L_shl( Mpy_32_16_1( st->old_fpitch, res_m ), res_e );
-        }
-        ELSE
-        {
-            res_m = BASOP_Util_Divide1616_Scale( L_frameTCX, L_frame, &res_e );
-            st->old_fpitchFB = L_shl( Mpy_32_16_1( st->old_fpitch, res_m ), res_e );
-        }
-    }
-
-    /* Update old_syn_overl */
-    IF( hTcxCfg->last_aldo == 0 )
-    {
-        Copy( xn_buf_fx + L_frame, hTcxDec->syn_Overl, overlap ); // Q(-2)
-        FOR( Word16 ind = 0; ind < overlapFB; ind++ )
-        {
-            hTcxDec->syn_OverlFB[ind] = (Word16) L_shr( xn_bufFB_fx[( ind + L_frameTCX )], sub( q_x, q_win ) ); // q_x
-        }
-    }
-
-    /* Output */
-    Copy( xn_buf_fx + sub( shr( overlap, 1 ), tcx_offset ), synth_fx, L_frame_glob ); // Q(-2)
-    FOR( Word16 ind = 0; ind < L_frameTCX_glob; ind++ )
-    {
-        synthFB_fx[ind] = (Word16) L_shr( xn_bufFB_fx[( ind + ( ( overlapFB >> 1 ) - tcx_offsetFB ) )], sub( q_x, q_win ) ); // q_x
-    }
-
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- *  init_tcx_info()
- *
- *  Initialize lengths for TCX processing, update IGF subframe info
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c
index 20f7d297d739e3030ff5c8bdb468b1b7c12a6097..883024002ea4c2191cd20d7a5ac09c021b9e6c2f 100644
--- a/lib_dec/dec_tcx_fx.c
+++ b/lib_dec/dec_tcx_fx.c
@@ -9,9 +9,7 @@
 #include "basop_util.h"
 #include "stl.h"
 #include "options.h"
-#include "prot.h"
 #include "math.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
@@ -155,7 +153,7 @@ void decoder_tcx_fx(
         L_frameTCX = st->L_frameTCX_past;
         move16();
 
-        left_rect = st->prev_widow_left_rect;
+        left_rect = hTcxDec->prev_widow_left_rect;
         move16();
 
         IF( left_rect != 0 )
@@ -192,7 +190,7 @@ void decoder_tcx_fx(
             move16();
             left_rect = 1;
             move16();
-            st->prev_widow_left_rect = 1;
+            hTcxDec->prev_widow_left_rect = 1;
             move16();
         }
         ELSE
@@ -204,7 +202,7 @@ void decoder_tcx_fx(
             move16();
             left_rect = 0;
             move16();
-            st->prev_widow_left_rect = 0;
+            hTcxDec->prev_widow_left_rect = 0;
             move16();
         }
 
@@ -434,11 +432,7 @@ void decoder_tcx_fx(
         gain_tcx_e = add( extract_l( L_shr( tmp32, 25 ) ), 1 ); /* get exponent */
         gain_tcx = round_fx( BASOP_Util_InvLog2( L_or( tmp32, (Word32) 0xFE000000 ) ) );
 
-#ifdef BASOP_NOGLOB
         tmp1 = mult_r( shl_sat( L_spec, 5 ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#else
-        tmp1 = mult_r( shl( L_spec, 5 ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#endif
         s = 15 - 5 - 7;
         move16();
         IF( GE_16( L_spec, 1024 ) ) /*reduce precision for avoiding overflow*/
@@ -553,11 +547,7 @@ void decoder_tcx_fx(
             st->last_gain_syn_deemph_e = add( st->last_gain_syn_deemph_e, 10 /*scaling of h1[0] and E_UTIL_synthesis * 2*/ );
             move16();
             tmp32 = Sqrt32( tmp32, &st->last_gain_syn_deemph_e );
-#ifdef BASOP_NOGLOB
             st->last_gain_syn_deemph = round_fx_o( tmp32, &Overflow );
-#else
-            st->last_gain_syn_deemph = round_fx( tmp32 );
-#endif
             move16();
             /*for avoiding compiler warnings*/
             hTcxDec->gainHelper = 32768 / 2;
@@ -575,11 +565,7 @@ void decoder_tcx_fx(
             /* gainCompensate = st->last_gain_syn_deemph/(float)sqrt(dot_product( h1, h1, L_SUBFR)); */
             tmp32 = Dot_productSq16HQ( 0, h1, L_SUBFR, &gainCompensate_e ) /*Q15, gainCompensate_e*/;
             gainCompensate_e = add( gainCompensate_e, 10 /*scaling of h1[0] and E_UTIL:synthesis*/ );
-#ifdef BASOP_NOGLOB
             gainCompensate = round_fx_sat( Sqrt32( tmp32, &gainCompensate_e ) ) /*Q15, gainCompensate_e*/;
-#else
-            gainCompensate = round_fx( Sqrt32( tmp32, &gainCompensate_e ) ) /*Q15, gainCompensate_e*/;
-#endif
             BASOP_Util_Divide_MantExp( st->last_gain_syn_deemph,
                                        st->last_gain_syn_deemph_e,
                                        gainCompensate,
@@ -752,11 +738,7 @@ void decoder_tcx_fx(
             tmp32 = L_deposit_l( 0 );
             FOR( i = 0; i < L_spec; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp32 = L_macNs_co( tmp32, abs_s( prm_sqQ[i] ), i, &Carry, &Overflow );
-#else
-                tmp32 = L_macNs( tmp32, abs_s( prm_sqQ[i] ), i );
-#endif
             }
             nf_seed = extract_l( tmp32 );
         }
@@ -781,42 +763,42 @@ void decoder_tcx_fx(
         {
             IF( EQ_16( st->nbLostCmpt, 1 ) )
             {
-                st->plcInfo.concealment_method = TCX_NONTONAL;
+                st->hPlcInfo->concealment_method = TCX_NONTONAL;
                 move16();
                 /* tonal/non-tonal decision */
                 test();
                 test();
-                IF( EQ_16( st->plcInfo.Transient[0], 1 ) && EQ_16( st->plcInfo.Transient[1], 1 ) && EQ_16( st->plcInfo.Transient[2], 1 ) )
+                IF( EQ_16( st->hPlcInfo->Transient[0], 1 ) && EQ_16( st->hPlcInfo->Transient[1], 1 ) && EQ_16( st->hPlcInfo->Transient[2], 1 ) )
                 {
                     Word16 sum_word16 = 0;
                     move16();
 
                     FOR( i = 9; i >= 0; i-- )
                     {
-                        sum_word16 = add( sum_word16, st->plcInfo.TCX_Tonality[i] );
+                        sum_word16 = add( sum_word16, st->hPlcInfo->TCX_Tonality[i] );
                     }
 
                     if ( GE_16( sum_word16, 6 ) )
                     {
-                        st->plcInfo.concealment_method = TCX_TONAL;
+                        st->hPlcInfo->concealment_method = TCX_TONAL;
                         move16();
                     }
                 }
 
                 if ( st->tonal_mdct_plc_active )
                 {
-                    st->plcInfo.concealment_method = TCX_TONAL;
+                    st->hPlcInfo->concealment_method = TCX_TONAL;
                     move16();
                 }
             }
 
             if ( GT_16( L_frameTCX, hTcxDec->L_frameTCX ) )
             {
-                st->plcInfo.concealment_method = TCX_TONAL;
+                st->hPlcInfo->concealment_method = TCX_TONAL;
                 move16();
             }
 
-            temp_concealment_method = st->plcInfo.concealment_method;
+            temp_concealment_method = st->hPlcInfo->concealment_method;
             move16();
 
             if ( EQ_16( st->core, TCX_10_CORE ) )
@@ -828,7 +810,7 @@ void decoder_tcx_fx(
         /* get the starting location of the subframe in the frame */
         IF( EQ_16( st->core, TCX_10_CORE ) )
         {
-            st->plcInfo.subframe_fx = extract_l( L_mult0( frame_cnt, L_frameTCX_glob ) );
+            st->hPlcInfo->subframe_fx = extract_l( L_mult0( frame_cnt, L_frameTCX_glob ) );
             move16();
         }
     }
@@ -839,8 +821,7 @@ void decoder_tcx_fx(
 
     IF( bfi == 0 )
     {
-        TonalMDCTConceal_SaveFreqSignal( &st->tonalMDCTconceal, x, x_e, L_frameTCX,
-                                         L_frame, gainlpc2, gainlpc2_e, gain_tcx_e );
+        TonalMDCTConceal_SaveFreqSignal( st->hTonalMDCTConc, x, x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e );
     }
     ELSE
     {
@@ -870,24 +851,20 @@ void decoder_tcx_fx(
                 Word16 exp1, exp2;
                 Word32 E_2ndlast, E_last;
 
-                E_2ndlast = CalculateAbsEnergy_fx( 1, &( st->tonalMDCTconceal.lastBlockData.spectralData[0] ), infoIGFStartLine, &exp2 );
-                E_last = CalculateAbsEnergy_fx( 1, &( st->tonalMDCTconceal.lastBlockData.spectralData[1] ), infoIGFStartLine, &exp1 );
+                E_2ndlast = CalculateAbsEnergy_fx( 1, &( st->hTonalMDCTConc->lastBlockData.spectralData[0] ), infoIGFStartLine, &exp2 );
+                E_last = CalculateAbsEnergy_fx( 1, &( st->hTonalMDCTConc->lastBlockData.spectralData[1] ), infoIGFStartLine, &exp1 );
 
                 BASOP_Util_Divide_MantExp( extract_h( E_2ndlast ), exp2, extract_h( E_last ), exp1, &tmp1, &tmp2 );
 
                 tmp1 = shr( tmp1, 2 ); /*Q13*/
-#ifdef BASOP_NOGLOB
                 tmp1 = shl_sat( tmp1, tmp2 );
-#else
-                tmp1 = shl( tmp1, tmp2 );
-#endif
                 /* replace higher energy TCX5 frame by lower one to avoid energy fluctuation */
                 IF( GT_16( tmp1, 16384 /*2 in Q13*/ ) )
                 {
                     FOR( i = 0; i < infoIGFStartLine; i += 2 )
                     {
                         move32();
-                        st->tonalMDCTconceal.lastBlockData.spectralData[i] = st->tonalMDCTconceal.lastBlockData.spectralData[i + 1];
+                        st->hTonalMDCTConc->lastBlockData.spectralData[i] = st->hTonalMDCTConc->lastBlockData.spectralData[i + 1];
                     }
                 }
                 ELSE IF( LT_16( tmp1, 4096 /*0.5 in Q13*/ ) )
@@ -895,7 +872,7 @@ void decoder_tcx_fx(
                     FOR( i = 0; i < infoIGFStartLine; i += 2 )
                     {
                         move32();
-                        st->tonalMDCTconceal.lastBlockData.spectralData[i + 1] = st->tonalMDCTconceal.lastBlockData.spectralData[i];
+                        st->hTonalMDCTConc->lastBlockData.spectralData[i + 1] = st->hTonalMDCTConc->lastBlockData.spectralData[i];
                     }
                 }
             }
@@ -914,11 +891,8 @@ void decoder_tcx_fx(
 
             tcxGetNoiseFillingTilt( A, M, L_frame, tmp, &noiseTiltFactor );
 
-            TonalMDCTConceal_InsertNoise( &st->tonalMDCTconceal, x, &x_e, st->tonal_mdct_plc_active, &st->seed_tcx_plc,
+            TonalMDCTConceal_InsertNoise( st->hTonalMDCTConc, x, &x_e, st->tonal_mdct_plc_active, &st->seed_tcx_plc,
                                           noiseTiltFactor, f,
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                                          concealment_noise,
-#endif
                                           infoIGFStartLine );
         }
     }
@@ -1002,7 +976,7 @@ void decoder_tcx_fx(
     test();
     IF( bfi && st->tonal_mdct_plc_active )
     {
-        TonalMDCTConceal_Apply( &st->tonalMDCTconceal, x, &x_e );
+        TonalMDCTConceal_Apply( st->hTonalMDCTConc, x, &x_e );
     }
 
     tmp32 = L_deposit_h( 0 );
@@ -1018,11 +992,8 @@ void decoder_tcx_fx(
         tmp8 = 1;
         move16();
     }
-    TonalMDCTConceal_UpdateState( &st->tonalMDCTconceal,
-                                  L_frameTCX,
-                                  tmp32,
-                                  bfi,
-                                  tmp8 );
+
+    TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, L_frameTCX, tmp32, bfi, tmp8 );
 
     IF( st->enablePlcWaveadjust )
     {
@@ -1033,10 +1004,11 @@ void decoder_tcx_fx(
         IF( bfi && ( EQ_16( temp_concealment_method, TCX_NONTONAL ) ) )
         {
             /* x_e =31-x_scale; */
-            concealment_decode_fix( core, x, &x_e, &st->plcInfo );
+            concealment_decode_fix( core, x, &x_e, st->hPlcInfo );
         }
+
         /* update spectrum buffer, tonality flag, etc. */
-        concealment_update_x( bfi, core, st->tonality_flag, x, &x_e, &st->plcInfo );
+        concealment_update_x( bfi, core, st->tonality_flag, x, &x_e, st->hPlcInfo );
     }
 
     /*-----------------------------------------------------------*
@@ -1327,7 +1299,7 @@ void decoder_tcx_post_fx( Decoder_State *st_fx,
     {
         test();
         /* run lpc gain compensation not for waveform adjustment */
-        IF( 0 == st_fx->enablePlcWaveadjust || EQ_16( st_fx->plcInfo.concealment_method, TCX_TONAL ) )
+        IF( 0 == st_fx->enablePlcWaveadjust || EQ_16( st_fx->hPlcInfo->concealment_method, TCX_TONAL ) )
         {
             UWord32 dmy;
             tmp32_1 /*gainHelperFB*/ = L_shl_r( L_deposit_h( hTcxDec->gainHelper ), sub( hTcxDec->gainHelper_e, 31 - 28 ) );             /*Q28*/
@@ -1345,11 +1317,7 @@ void decoder_tcx_post_fx( Decoder_State *st_fx,
             FOR( i = 0; i < hTcxDec->L_frameTCX; i++ )
             {
                 tmp32 = L_shl( tmp32_1 /*Q28*/, -( 28 - 15 ) ); /*16Q15*/
-#ifdef BASOP_NOGLOB
                 synthFB[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp32, synthFB[i] ), 16 ) );
-#else
-                synthFB[i] = round_fx( L_shl( Mpy_32_16_1( tmp32, synthFB[i] ), 16 ) );
-#endif
                 move16();
                 tmp32_1 = L_sub( tmp32_1, tmp32_2 );
             }
@@ -1383,11 +1351,7 @@ void decoder_tcx_post_fx( Decoder_State *st_fx,
     }
     tmp32 = Mpy_32_16_1( tmp32, getInvFrameLen( hTcxDec->L_frameTCX ) );
     tmp2 = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
     tmp1 = round_fx_o( L_shl( tmp32, tmp2 ), &Overflow );
-#else
-    tmp1 = round_fx( L_shl( tmp32, tmp2 ) );
-#endif
     s = sub( sub( sub( 1, shl( s, 1 ) ), 6 /*table lookup for inverse framelength*/ ), tmp2 );
     tmp1 = Sqrt16( tmp1, &s );
     move16();
@@ -1480,87 +1444,44 @@ void decoder_tcx_post_fx( Decoder_State *st_fx,
             &tmp1 );
         tmp2 = BASOP_Util_Add_MantExp( hTcxDec->conceal_eof_gain, 15 - 14, negate( tmp1 ), tmp2, &tmp1 );
 
-#ifdef BASOP_NOGLOB
         step = L_shl_o( L_mult( tmp1, getInvFrameLen( st_fx->L_frame ) ), sub( tmp2, 6 /*scaling from table lookup*/ + 1 /*go to Q30*/ ), &Overflow ); /*Q30*/
-#else
-        step = L_shl( L_mult( tmp1, getInvFrameLen( st_fx->L_frame ) ), sub( tmp2, 6 /*scaling from table lookup*/ + 1 /*go to Q30*/ ) ); /*Q30*/
-#endif
         {
             Word32 stepFB;
             UWord32 dmy;
             conceal_eof_gainFB = L_deposit_h( hTcxDec->conceal_eof_gain ); /*Q30*/
             Mpy_32_32_ss( step, L_shl( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ), &stepFB, &dmy );
-#ifdef BASOP_NOGLOB
             stepFB = L_shl_o( stepFB, 3 - 1, &Overflow ); /*Q30*/
-#else
-            stepFB = L_shl( stepFB, 3 - 1 );                                                                                              /*Q30*/
-#endif
             FOR( i = 0; i < hTcxDec->L_frameTCX; i++ )
             {
-#ifdef BASOP_NOGLOB
                 synthFB[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( conceal_eof_gainFB, synthFB[i] ), 1 ) );
-#else
-                synthFB[i] = round_fx( L_shl( Mpy_32_16_1( conceal_eof_gainFB, synthFB[i] ), 1 ) );
-#endif
                 move16();
-#ifdef BASOP_NOGLOB
                 conceal_eof_gainFB = L_sub_o( conceal_eof_gainFB, stepFB, &Overflow );
-#else
-                conceal_eof_gainFB = L_sub( conceal_eof_gainFB, stepFB );
-#endif
             }
         }
         conceal_eof_gain32 = L_deposit_h( hTcxDec->conceal_eof_gain ); /*Q30*/
         FOR( i = 0; i < st_fx->L_frame; i++ )
         {
-#ifdef BASOP_NOGLOB
             xn_buf[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( conceal_eof_gain32 /*Q30*/, xn_buf[i] ), 1 ) );
-#else
-            xn_buf[i] = round_fx( L_shl( Mpy_32_16_1( conceal_eof_gain32 /*Q30*/, xn_buf[i] ), 1 ) );
-#endif
             move16();
-#ifdef BASOP_NOGLOB
             conceal_eof_gain32 = L_sub_o( conceal_eof_gain32, step, &Overflow );
-#else
-            conceal_eof_gain32 = L_sub( conceal_eof_gain32, step );
-#endif
         }
-#ifdef BASOP_NOGLOB
         hTcxDec->conceal_eof_gain = round_fx_o( conceal_eof_gain32, &Overflow ); /*Q14*/
         move16();
-#else
-        hTcxDec->conceal_eof_gain = round_fx( conceal_eof_gain32 ); /*Q14*/
-        move16();
-#endif
         /* run lpc gain compensation not for waveform adjustment */
         test();
-        IF( 0 == st_fx->enablePlcWaveadjust || EQ_16( st_fx->plcInfo.concealment_method, TCX_TONAL ) )
-        {
-#ifdef BASOP_NOGLOB
-            st_fx->plcInfo.recovery_gain = extract_h( L_shl_o( Mpy_32_16_1( conceal_eof_gainFB,
-                                                                            st_fx->last_concealed_gain_syn_deemph ),
-                                                               st_fx->last_concealed_gain_syn_deemph_e, &Overflow ) ); /*Q30->Q14*/
-#else
-            st_fx->plcInfo.recovery_gain = extract_h( L_shl( Mpy_32_16_1( conceal_eof_gainFB,
-                                                                          st_fx->last_concealed_gain_syn_deemph ),
-                                                             st_fx->last_concealed_gain_syn_deemph_e ) ); /*Q30->Q14*/
-#endif
+        IF( 0 == st_fx->enablePlcWaveadjust || EQ_16( st_fx->hPlcInfo->concealment_method, TCX_TONAL ) )
+        {
+            st_fx->hPlcInfo->recovery_gain = extract_h( L_shl_o( Mpy_32_16_1( conceal_eof_gainFB,
+                                                                              st_fx->last_concealed_gain_syn_deemph ),
+                                                                 st_fx->last_concealed_gain_syn_deemph_e, &Overflow ) ); /*Q30->Q14*/
             move16();
         }
         ELSE
         {
-            st_fx->plcInfo.recovery_gain = extract_h( conceal_eof_gainFB ); /*Q14*/
+            st_fx->hPlcInfo->recovery_gain = extract_h( conceal_eof_gainFB ); /*Q14*/
             move16();
         }
-        st_fx->plcInfo.step_concealgain_fx =
-#ifdef BASOP_NOGLOB
-            round_fx_sat( L_shl_sat( L_mult0( round_fx_sat( step ), round_fx_sat( L_shl_sat( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ) ) ), 3 ) ); /*Q15*/
-#else
-            round_fx( L_shl( L_mult0(
-                                 round_fx( step ),
-                                 round_fx( L_shl( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ) ) ),
-                             3 ) ); /*Q15*/
-#endif
+        st_fx->hPlcInfo->step_concealgain_fx = round_fx_sat( L_shl_sat( L_mult0( round_fx_sat( step ), round_fx_sat( L_shl_sat( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ) ) ), 3 ) ); /*Q15*/
         move16();
     }
 
@@ -1584,11 +1505,7 @@ void decoder_tcx_post_fx( Decoder_State *st_fx,
     move32();
     Copy32( &st_fx->old_pitch_buf_fx[st_fx->nb_subfr + 2], &st_fx->old_pitch_buf_fx[2], st_fx->nb_subfr );
     set32_fx( &st_fx->old_pitch_buf_fx[st_fx->nb_subfr + 2], st_fx->old_fpitch, st_fx->nb_subfr );
-#ifdef BASOP_NOGLOB /*TBV st_fx->old_fpitch seems to have an odd value for this bitstream stv48n1_dtx_sw_164_1280_48kHz.f06.COD at frame 10 */
     st_fx->bfi_pitch_fx = shl_sat( round_fx( st_fx->old_fpitch ), 6 );
-#else
-    st_fx->bfi_pitch_fx = shl( round_fx( st_fx->old_fpitch ), 6 );
-#endif
     move16();
     st_fx->bfi_pitch_frame = st_fx->L_frame;
     move16();
@@ -1661,7 +1578,7 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx,
         test();
         test();
         /* run lpc gain compensation not for waveform adjustment */
-        IF( 0 == st_fx->enablePlcWaveadjust || ( st_fx->hPlcInfo != NULL && EQ_16( st_fx->plcInfo.concealment_method, TCX_TONAL ) ) )
+        IF( 0 == st_fx->enablePlcWaveadjust || ( st_fx->hPlcInfo != NULL && EQ_16( st_fx->hPlcInfo->concealment_method, TCX_TONAL ) ) )
         {
             UWord32 dmy;
             tmp32_1 /*gainHelperFB*/ = L_shl_r( L_deposit_h( hTcxDec->gainHelper ), sub( hTcxDec->gainHelper_e, 31 - 28 ) );             /*Q28*/
@@ -1678,12 +1595,8 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx,
 
             FOR( i = 0; i < hTcxDec->L_frameTCX; i++ )
             {
-                tmp32 = L_shl( tmp32_1 /*Q28*/, -( 28 - 15 ) ); /*16Q15*/
-#ifdef BASOP_NOGLOB
+                tmp32 = L_shl( tmp32_1 /*Q28*/, -( 28 - 15 ) );                                 /*16Q15*/
                 synthFB[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp32, synthFB[i] ), 16 ) ); // Q_syn
-#else
-                synthFB[i] = round_fx( L_shl( Mpy_32_16_1( tmp32, synthFB[i] ), 16 ) );
-#endif
                 move16();
                 tmp32_1 = L_sub( tmp32_1, tmp32_2 );
             }
@@ -1716,11 +1629,7 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx,
     }
     tmp32 = Mpy_32_16_1( tmp32, getInvFrameLen( hTcxDec->L_frameTCX ) );
     tmp2 = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
     tmp1 = round_fx_o( L_shl( tmp32, tmp2 ), &Overflow );
-#else
-    tmp1 = round_fx( L_shl( tmp32, tmp2 ) );
-#endif
     // s = sub(sub(sub(1, shl(s, 1)), 6/*table lookup for inverse framelength*/), tmp2);
     s = sub( 25, add( shl( add( Q_syn, s ), 1 ), tmp2 ) );
     tmp1 = Sqrt16( tmp1, &s );
@@ -1888,35 +1797,22 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx,
         }
 
         /* run lpc gain compensation not for waveform adjustment */
-        test();
-        IF( 0 == st_fx->enablePlcWaveadjust || EQ_16( st_fx->plcInfo.concealment_method, TCX_TONAL ) )
-        {
-#ifdef BASOP_NOGLOB
-            st_fx->plcInfo.recovery_gain = extract_h( L_shl_o( Mpy_32_16_1( conceal_eof_gainFB,
-                                                                            st_fx->last_concealed_gain_syn_deemph ),
-                                                               st_fx->last_concealed_gain_syn_deemph_e, &Overflow ) ); /*Q30->Q14*/
-#else
-            st_fx->plcInfo.recovery_gain = extract_h( L_shl( Mpy_32_16_1( conceal_eof_gainFB,
-                                                                          st_fx->last_concealed_gain_syn_deemph ),
-                                                             st_fx->last_concealed_gain_syn_deemph_e ) ); /*Q30->Q14*/
-#endif
-            move16();
-        }
-        ELSE
+        IF( st_fx->hPlcInfo != NULL )
         {
-            st_fx->plcInfo.recovery_gain = extract_h( conceal_eof_gainFB ); /*Q14*/
+            test();
+            IF( 0 == st_fx->enablePlcWaveadjust || EQ_16( st_fx->hPlcInfo->concealment_method, TCX_TONAL ) )
+            {
+                st_fx->hPlcInfo->recovery_gain = extract_h( L_shl_o( Mpy_32_16_1( conceal_eof_gainFB, st_fx->last_concealed_gain_syn_deemph ), st_fx->last_concealed_gain_syn_deemph_e, &Overflow ) ); /*Q30->Q14*/
+                move16();
+            }
+            ELSE
+            {
+                st_fx->hPlcInfo->recovery_gain = extract_h( conceal_eof_gainFB ); /*Q14*/
+                move16();
+            }
+            st_fx->hPlcInfo->step_concealgain_fx = round_fx_sat( L_shl_sat( L_mult0( round_fx_sat( L_shr_sat( step, sub( 1, step_e ) ) ), round_fx_sat( L_shl_sat( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ) ) ), 4 ) ); /*Q15*/
             move16();
         }
-        st_fx->plcInfo.step_concealgain_fx =
-#ifdef BASOP_NOGLOB
-            round_fx_sat( L_shl_sat( L_mult0( round_fx_sat( L_shr_sat( step, sub( 1, step_e ) ) ), round_fx_sat( L_shl_sat( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ) ) ), 4 ) ); /*Q15*/
-#else
-            round_fx( L_shl( L_mult0(
-                                 round_fx( L_shr( step, sub( 1, step_e ) ),
-                                 round_fx( L_shl( L_mult0( st_fx->L_frame, getInvFrameLen( hTcxDec->L_frameTCX ) ), 8 ) ) ),
-                             4 ) ); /*Q15*/
-#endif
-        move16();
     }
 
     /*-----------------------------------------------------------*
@@ -1939,11 +1835,7 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx,
     move32();
     Copy32( &st_fx->old_pitch_buf_fx[st_fx->nb_subfr + 2], &st_fx->old_pitch_buf_fx[2], st_fx->nb_subfr );
     set32_fx( &st_fx->old_pitch_buf_fx[st_fx->nb_subfr + 2], st_fx->old_fpitch, st_fx->nb_subfr );
-#ifdef BASOP_NOGLOB /*TBV st_fx->old_fpitch seems to have an odd value for this bitstream stv48n1_dtx_sw_164_1280_48kHz.f06.COD at frame 10 */
     st_fx->bfi_pitch_fx = shl_sat( round_fx( st_fx->old_fpitch ), 6 );
-#else
-    st_fx->bfi_pitch_fx = shl( round_fx( st_fx->old_fpitch ), 6 );
-#endif
     st_fx->bfi_pitch_frame = st_fx->L_frame;
     move16();
 
@@ -1980,7 +1872,6 @@ static Word32 CalculateAbsEnergy_fx(                     /* o : normalized resul
     move32();
     L_c = 0;
     move32();
-#ifdef BASOP_NOGLOB /* Critical Overflow/Carry */
     L_sum = L_macNs_co( L_off, 0, 0, &Carry, &Overflow );
     IF( L_sum > 0 )
     {
@@ -1990,31 +1881,16 @@ static Word32 CalculateAbsEnergy_fx(                     /* o : normalized resul
     {
         L_c = L_msuNs_co( L_c, 0, 0, &Carry, &Overflow );
     }
-#else
-    L_sum = L_macNs( L_off, 0, 0 );
-    if ( L_sum > 0 )
-        L_c = L_macNs( L_c, 0, 0 );
-    if ( L_sum < 0 )
-        L_c = L_msuNs( L_c, 0, 0 );
-#endif
     FOR( i = 0; i < lg; i += 2 )
     {
         Carry = 0;
         move32();
         BASOP_SATURATE_WARNING_OFF_EVS /*multiplication of -32768 * -32768 throws an overflow, but is not critical*/
-#ifdef BASOP_NOGLOB                    /* Critical Overflow/Carry */
             L_sum = L_macNs_co( L_sum, x[i], x[i], &Carry, &Overflow );
-#else
-            L_sum = L_macNs( L_sum, x[i], x[i] );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         Overflow = 0; /* to avoid useless warning in L_macNs calling L_mult */
         move32();
-#ifdef BASOP_NOGLOB /* Critical Overflow/Carry */
         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else
-        L_c = L_macNs( L_c, 0, 0 );
-#endif
     }
     L_sum = norm_llQ31( L_c, L_sum, exp );
     return L_sum;
@@ -2371,11 +2247,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
             {
                 FOR( i = 0; i < L_frame; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     xn_buf[i] = shr_sat( xn_buf[i], Q );
-#else
-                    xn_buf[i] = shr( xn_buf[i], Q );
-#endif
                     move16();
                 }
             }
@@ -2467,11 +2339,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                 tmp1 = sub( overlap, tcx_mdct_window_min_length );
                 FOR( i = 0; i < tmp1; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     xn_buf[i + tmp4] = shl_sat( add_sat( xn_buf[i + tmp4], shr_sat( old_out[i + nz], tmp2 ) ), TCX_IMDCT_HEADROOM );
-#else
-                    xn_buf[i + tmp4] = shl( add( xn_buf[i + tmp4], shr( old_out[i + nz], tmp2 ) ), TCX_IMDCT_HEADROOM );
-#endif
                     move16();
                 }
 
@@ -2480,31 +2348,19 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                 FOR( ; i < tmp1; i++ )
                 {
                     tmp3 = mult_r( shr( old_out[i + nz], tmp2 ), tcx_mdct_window_minimum[i - overlap + tcx_mdct_window_min_length].v.re );
-#ifdef BASOP_NOGLOB
                     xn_buf[i + tmp4] = shl_sat( add_sat( xn_buf[i + tmp4], tmp3 ), TCX_IMDCT_HEADROOM );
-#else
-                    xn_buf[i + tmp4] = shl( add( xn_buf[i + tmp4], tmp3 ), TCX_IMDCT_HEADROOM );
-#endif
                     move16();
                 }
                 FOR( ; i < overlap; i++ )
                 {
                     tmp3 = mult_r( shr( old_out[i + nz], tmp2 ), tcx_mdct_window_minimum[overlap - 1 - i].v.im );
-#ifdef BASOP_NOGLOB
                     xn_buf[i + tmp4] = shl_sat( add_sat( xn_buf[i + tmp4], tmp3 ), TCX_IMDCT_HEADROOM );
-#else
-                    xn_buf[i + tmp4] = shl( add( xn_buf[i + tmp4], tmp3 ), TCX_IMDCT_HEADROOM );
-#endif
                     move16();
                 }
 
                 FOR( i = add( i, tmp4 ); i < L_frame; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                    xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                     move16();
                 }
             }
@@ -2535,43 +2391,26 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                     tmp3 = shr( tcx_mdct_window_half_length, 1 );
                     FOR( i = 0; i < tmp1; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
                     FOR( i = 0; i < tmp3; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         tmp2 = add_sat( xn_buf[i + tmp1], mult_r( old_syn_overl[i], tcx_mdct_window_half[i].v.re ) );
                         xn_buf[i + tmp1] = shl_sat( tmp2, TCX_IMDCT_HEADROOM );
-#else
-                        tmp2 = add( xn_buf[i + tmp1], mult_r( old_syn_overl[i], tcx_mdct_window_half[i].v.re ) );
-                        xn_buf[i + tmp1] = shl( tmp2, TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
                     FOR( ; i < tcx_mdct_window_half_length; i++ )
                     {
                         tmp2 = add( xn_buf[i + tmp1], mult_r( old_syn_overl[i], tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im ) );
-#ifdef BASOP_NOGLOB
                         xn_buf[i + tmp1] = shl_sat( tmp2, TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf[i + tmp1] = shl( tmp2, TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
                     IF( LT_16( add( i, tmp1 ), L_frame ) )
                     {
                         FOR( i = add( i, tmp1 ); i < L_frame; i++ )
                         {
-#ifdef BASOP_NOGLOB
                             xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                            xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                             move16();
                         }
                     }
@@ -2581,11 +2420,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                     FOR( i = 0; i < overlap; i++ )
                     {
 
-#ifdef BASOP_NOGLOB
                         xn_buf[i] = shl_sat( add_sat( xn_buf[i], old_syn_overl[i] ), TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf[i] = shl( add( xn_buf[i], old_syn_overl[i] ), TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
 
@@ -2593,11 +2428,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                     {
                         FOR( ; i < L_frame; i++ )
                         {
-#ifdef BASOP_NOGLOB
                             xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                            xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                             move16();
                         }
                     }
@@ -2607,22 +2438,14 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                     tmp1 = shr( overlap, 1 );
                     FOR( i = 0; i < tmp1; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
 
                     tmpP16 = xn_buf + tmp1;
                     FOR( i = 0; i < overlap; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         tmpP16[i] = shl_sat( add( tmpP16[i], old_syn_overl[i] ), TCX_IMDCT_HEADROOM );
-#else
-                        tmpP16[i] = shl( add( tmpP16[i], old_syn_overl[i] ), TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
 
@@ -2630,11 +2453,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
                     {
                         FOR( i = add( i, tmp1 ); i < L_frame; i++ )
                         {
-#ifdef BASOP_NOGLOB
                             xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                            xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                             move16();
                         }
                     }
@@ -2652,11 +2471,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
             BASOP_SATURATE_WARNING_OFF_EVS;
             FOR( i = 0; i < L_frame; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf[i] = shl_sat( xn_buf[i], TCX_IMDCT_HEADROOM );
-#else
-                xn_buf[i] = shl( xn_buf[i], TCX_IMDCT_HEADROOM );
-#endif
                 move16();
             }
             BASOP_SATURATE_WARNING_ON_EVS;
@@ -2722,25 +2537,15 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
             tmp3 = shr( tcx_mdct_window_half_length, 1 );
             FOR( i = 0; i < tmp3; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf[i + tmp1] = mult_r_sat( xn_buf[i + tmp1], tcx_mdct_window_half[i].v.im );
                 xn_buf[i + tmp1] = add_sat( xn_buf[i + tmp1], mult_r_sat( hTcxDec->syn_OverlFB[i], mult_r_sat( tcx_mdct_window_half[i].v.re, tcx_mdct_window_half[i].v.re ) ) );
-#else
-                xn_buf[i + tmp1] = mult_r( xn_buf[i + tmp1], tcx_mdct_window_half[i].v.im );
-                xn_buf[i + tmp1] = add( xn_buf[i + tmp1], mult_r( hTcxDec->syn_OverlFB[i], mult_r( tcx_mdct_window_half[i].v.re, tcx_mdct_window_half[i].v.re ) ) );
-#endif
                 move16();
                 move16();
             }
             FOR( ; i < tcx_mdct_window_half_length; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf[i + tmp1] = mult_r_sat( xn_buf[i + tmp1], tcx_mdct_window_half[( ( tcx_mdct_window_half_length - 1 ) - i )].v.re );
                 xn_buf[i + tmp1] = add_sat( xn_buf[i + tmp1], mult_r_sat( hTcxDec->syn_OverlFB[i], mult_r_sat( tcx_mdct_window_half[( ( tcx_mdct_window_half_length - 1 ) - i )].v.im, tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im ) ) );
-#else
-                xn_buf[i + tmp1] = mult_r( xn_buf[i + tmp1], tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.re );
-                xn_buf[i + tmp1] = add( xn_buf[i + tmp1], mult_r( hTcxDec->syn_OverlFB[i], mult_r( tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im, tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im ) ) );
-#endif
                 move16();
                 move16();
             }
@@ -2751,25 +2556,15 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T
             tmp3 = shr( tcx_mdct_window_half_length, 1 );
             FOR( i = 0; i < tmp3; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf[i + tmp1] = mult_r_sat( xn_buf[i + tmp1], tcx_mdct_window_half[i].v.im );
                 xn_buf[i + tmp1] = add_sat( xn_buf[i + tmp1], mult_r_sat( hTcxDec->syn_Overl[i], mult_r_sat( tcx_mdct_window_half[i].v.re, tcx_mdct_window_half[i].v.re ) ) );
-#else
-                xn_buf[i + tmp1] = mult_r( xn_buf[i + tmp1], tcx_mdct_window_half[i].v.im );
-                xn_buf[i + tmp1] = add( xn_buf[i + tmp1], mult_r( hTcxDec->syn_Overl[i], mult_r( tcx_mdct_window_half[i].v.re, tcx_mdct_window_half[i].v.re ) ) );
-#endif
                 move16();
                 move16();
             }
             FOR( ; i < tcx_mdct_window_half_length; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf[i + tmp1] = mult_r_sat( xn_buf[i + tmp1], tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.re );
                 xn_buf[i + tmp1] = add_sat( xn_buf[i + tmp1], mult_r_sat( hTcxDec->syn_Overl[i], mult_r_sat( tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im, tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im ) ) );
-#else
-                xn_buf[i + tmp1] = mult_r( xn_buf[i + tmp1], tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.re );
-                xn_buf[i + tmp1] = add( xn_buf[i + tmp1], mult_r( hTcxDec->syn_Overl[i], mult_r( tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im, tcx_mdct_window_half[tcx_mdct_window_half_length - 1 - i].v.im ) ) );
-#endif
                 move16();
                 move16();
             }
@@ -2838,10 +2633,10 @@ void IMDCT_ivas_fx(
     {
         Word32 fac;
         // fac = shl_sat( mult_r( extract_h( L_shr_sat( hTcxDec->conceal_eof_gain32, sub( 1, hTcxDec->conceal_eof_gain_e ) ) ), st->last_concealed_gain_syn_deemph ), 1 );
-        fac = Mpy_32_16_1( hTcxDec->conceal_eof_gain32, st->last_concealed_gain_syn_deemph ); // q = 31 - hTcxDec->conceal_eof_gain_e
+        fac = Mpy_32_16_1( hTcxDec->conceal_eof_gain32, st->last_concealed_gain_syn_deemph ); // q = 31 - hTcxDec->conceal_eof_gain_e - last_concealed_gain_syn_deemph_e
         FOR( Word16 ind = 0; ind < overlap; ind++ )
         {
-            old_syn_overl_fx[ind] = extract_l( L_shl_sat( Mpy_32_32( old_syn_overl_fx[ind], fac ), hTcxDec->conceal_eof_gain_e ) ); // Q(-2)
+            old_syn_overl_fx[ind] = extract_h( L_shl_sat( Mpy_32_16_1( fac, old_syn_overl_fx[ind] ), add( hTcxDec->conceal_eof_gain_e, st->last_concealed_gain_syn_deemph_e ) ) ); // Q(-2)
             move16();
         }
     }
@@ -2884,7 +2679,7 @@ void IMDCT_ivas_fx(
             }
             move16();
 
-            set16_fx( win_fx, 0, shr( add( L_FRAME_PLUS, L_MDCT_OVLP_MAX ), 1 ) );
+            set16_fx( win_fx, 0, ( L_FRAME_PLUS + L_MDCT_OVLP_MAX ) >> 1 );
             Word16 tcx_offset_tmp = add( tcx_offset, shr( L_ola, 1 ) );
             set16_fx( xn_buf_fx, 0, tcx_offset_tmp ); /* zero left end of buffer */
 
@@ -3063,9 +2858,10 @@ void IMDCT_ivas_fx(
                 q_tmp_fx_32 = q_xn_buf_fx_32;
                 move16();
 
+                Word16 diff = sub( q_tmp_fx_32, q_win );
                 FOR( Word16 ind = 0; ind < L_frame; ind++ )
                 {
-                    old_out_fx_32[ind] = L_shl( old_out_fx[ind], sub( q_tmp_fx_32, q_win ) );
+                    old_out_fx_32[ind] = L_shl( old_out_fx[ind], diff );
                     move32();
                 }
 
@@ -3073,8 +2869,8 @@ void IMDCT_ivas_fx(
 
                 FOR( Word16 ind = 0; ind < L_frame; ind++ )
                 {
-                    old_out_fx[ind] = (Word16) L_shr( old_out_fx_32[ind], sub( q_tmp_fx_32, q_win ) );
-                    xn_buf_fx[ind] = (Word16) L_shr( xn_buf_fx_32[ind], sub( q_tmp_fx_32, q_win ) );
+                    old_out_fx[ind] = extract_l( L_shr( old_out_fx_32[ind], diff ) );
+                    xn_buf_fx[ind] = extract_l( L_shr( xn_buf_fx_32[ind], diff ) );
                     move16();
                     move16();
                 }
@@ -3098,19 +2894,23 @@ void IMDCT_ivas_fx(
                 q_tmp_fx_32 = sub( q_xn_buf_fx_32, res_e );
                 // v_multc_fixed( xn_buf_fx_32 + overlap / 2 + nz, (float) sqrt( (float) L_frame / NORM_MDCT_FACTOR ), tmp_fx_32, L_frame );
 
+                Word16 q_diff = sub( q_xn_buf_fx_32, q_win );
                 FOR( Word16 ind = 0; ind < L_frame; ind++ )
                 {
-                    xn_buf_fx[( ind + ( overlap / 2 ) ) + nz] = (Word16) L_shr( xn_buf_fx_32[( ind + ( overlap / 2 ) ) + nz], sub( q_xn_buf_fx_32, q_win ) );
+                    xn_buf_fx[( ind + ( overlap / 2 ) ) + nz] = extract_l( L_shr( xn_buf_fx_32[( ind + ( overlap / 2 ) ) + nz], q_diff ) );
                     move16();
                 }
 
                 window_ola_fx( tmp_fx_32, xn_buf_fx, &q_tmp_fx_32, old_out_fx, &q_old_out, L_frame, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );
 
+                q_diff = sub( q_old_out, q_win );
+
+                Word16 diff = sub( q_tmp_fx_32, q_win );
                 FOR( Word16 ind = 0; ind < L_frame; ind++ )
                 {
-                    old_out_fx[ind] = shr_sat( old_out_fx[ind], sub( q_old_out, q_win ) );
+                    old_out_fx[ind] = shr_sat( old_out_fx[ind], q_diff );
                     move16();
-                    xn_buf_fx[ind] = shr_sat( xn_buf_fx[ind], sub( q_tmp_fx_32, q_win ) );
+                    xn_buf_fx[ind] = shr_sat( xn_buf_fx[ind], diff );
                     move16();
                 }
             }
@@ -3203,11 +3003,7 @@ void IMDCT_ivas_fx(
             {
                 FOR( i = 0; i < sub( overlap, tcx_mdct_window_min_length ); i++ )
                 {
-#ifdef BASOP_NOGLOB
                     xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add_sat( xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )], old_out_fx[( i + nz )] ); // Q(-2)
-#else
-                    xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add( xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )], old_out_fx[( i + nz )] );
-#endif
                     move16();
                 }
 
@@ -3220,30 +3016,17 @@ void IMDCT_ivas_fx(
                     // tested
                     FOR( ; i < overlap; i++ ) /* perfectly reconstructing ALDO shortening */
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], old_out_fx[( i + nz )] ); // Q(-2)
-#else
-                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], old_out_fx[( i + nz )] ); // Q(-2)
-
-#endif
                         move16();
                     }
                     FOR( i = 0; i < ( tcx_mdct_window_min_length / 2 ); i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add_sat( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( old_out_fx[( ( i + nz ) + overlap )], tcx_mdct_window_minimum_fx[i].v.re ) ); // Q(-2)
-#else
-                        xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( old_out_fx[( ( i + nz ) + overlap )], tcx_mdct_window_minimum_fx[i].v.re ) );
-#endif
                         move16();
                     }
                     FOR( ; i < tcx_mdct_window_min_length; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add_sat( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( old_out_fx[( ( i + nz ) + overlap )], tcx_mdct_window_minimum_fx[( tcx_mdct_window_min_length - ( 1 + i ) )].v.im ) ); // Q(-2)
-#else
-                        xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( old_out_fx[( ( i + nz ) + overlap )], tcx_mdct_window_minimum_fx[( tcx_mdct_window_min_length - ( 1 + i ) )].v.im ) );
-#endif
                         move16();
                     }
                 }
@@ -3251,20 +3034,12 @@ void IMDCT_ivas_fx(
                 {
                     FOR( ; i < ( overlap - ( tcx_mdct_window_min_length / 2 ) ); i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_out_fx[( i + nz )], tcx_mdct_window_minimum_fx[( ( tcx_mdct_window_min_length - overlap ) + i )].v.re ) ); // Q(-2)
-#else
-                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_out_fx[( i + nz )], tcx_mdct_window_minimum_fx[( ( tcx_mdct_window_min_length - overlap ) + i )].v.re ) );
-#endif
                         move16();
                     }
                     FOR( ; i < overlap; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_out_fx[( i + nz )], tcx_mdct_window_minimum_fx[( overlap - ( 1 + i ) )].v.im ) ); // Q(-2)
-#else
-                        xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_out_fx[( i + nz )], tcx_mdct_window_minimum_fx[( overlap - ( 1 + i ) )].v.im ) );
-#endif
                         move16();
                     }
                 }
@@ -3277,21 +3052,12 @@ void IMDCT_ivas_fx(
                 {
                     FOR( i = 0; i < ( tcx_mdct_window_half_length / 2 ); i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_syn_overl_fx[i], tcx_mdct_window_half_fx[i].v.re ) ); // Q(-2)
-#else
-                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_syn_overl_fx[i], tcx_mdct_window_half_fx[i].v.re ) );
-
-#endif
                         move16();
                     }
                     FOR( ; i < tcx_mdct_window_half_length; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_syn_overl_fx[i], tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.im ) ); // Q(-2)
-#else
-                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_syn_overl_fx[i], tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.im ) );
-#endif
                         move16();
                     }
                 }
@@ -3307,11 +3073,7 @@ void IMDCT_ivas_fx(
                 {
                     FOR( i = 0; i < overlap; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf_fx[( i + ( overlap / 2 ) )] = add_sat( xn_buf_fx[( i + ( overlap / 2 ) )], old_syn_overl_fx[i] ); // Q(-2)
-#else
-                        xn_buf_fx[( i + ( overlap / 2 ) )] = add( xn_buf_fx[( i + ( overlap / 2 ) )], old_syn_overl_fx[i] );
-#endif
                         move16();
                     }
                 }
@@ -3387,22 +3149,14 @@ void IMDCT_ivas_fx(
             FOR( i = 0; i < ( tcx_mdct_window_half_length / 2 ); i++ )
             {
                 xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = mult_r( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], tcx_mdct_window_half_fx[i].v.im );
-#ifdef BASOP_NOGLOB
                 xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( mult_r( hTcxDec->syn_Overl[i], tcx_mdct_window_half_fx[i].v.re ), tcx_mdct_window_half_fx[i].v.re ) ); // Q(-2)
-#else
-                xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( mult_r( hTcxDec->syn_Overl[i], tcx_mdct_window_half_fx[i].v.re ), tcx_mdct_window_half_fx[i].v.re ) );
-#endif
                 move16();
                 move16();
             }
             FOR( ; i < tcx_mdct_window_half_length; i++ )
             {
                 xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = mult_r( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.re );
-#ifdef BASOP_NOGLOB
                 xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( mult_r( hTcxDec->syn_Overl[i], tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.im ), tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.im ) ); // Q(-2)
-#else
-                xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( mult_r( hTcxDec->syn_Overl[i], tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.im ), tcx_mdct_window_half_fx[( tcx_mdct_window_half_length - ( 1 + i ) )].v.im ) );
-#endif
                 move16();
                 move16();
             }
@@ -3852,7 +3606,8 @@ void decoder_tcx_ivas_fx(
     st->hHQ_core->Q_old_wtda_LB = 0;
     move16();
 
-    Scale_sig( st->hTcxDec->old_syn_Overl, 320, 1 ); // Scaling to Q_syn
+    Scale_sig( st->hTcxDec->old_syn_Overl, 320, st->Q_syn - st->hTcxDec->Q_old_syn_Overl ); // Scaling to Q_syn
+    st->hTcxDec->Q_old_syn_Overl = st->Q_syn;
     Copy_Scale_sig_16_32_no_sat( st->old_Aq_12_8_fx, st->old_Aq_12_8_fx_32, M + 1, ( sub( 28, ( sub( 15, norm_s( sub( st->old_Aq_12_8_fx[0], 1 ) ) ) ) ) ) );
 
     Scale_sig( synth_fx, L_frame_glob, st->Q_syn );      // Scaling to Q_syn
@@ -3869,7 +3624,8 @@ void decoder_tcx_ivas_fx(
     // Scale_sig( st->hHQ_core->old_out_LB_fx, L_FRAME32k, ( sub( st->hHQ_core->Q_old_wtda, st->Q_syn ) ) );
     st->hHQ_core->Q_old_wtda_LB = st->Q_syn;
     // Scale_sig( st->hHQ_core->old_out_fx, L_FRAME48k, ( sub( st->hHQ_core->Q_old_wtda, st->Q_syn ) ) );
-    Scale_sig( st->hTcxDec->old_syn_Overl, 320, ( -2 + st->Q_syn ) ); // Scaling to Q-2
+    Scale_sig( st->hTcxDec->old_syn_Overl, 320, ( -2 - st->hTcxDec->Q_old_syn_Overl ) ); // Scaling to Q-2
+    st->hTcxDec->Q_old_syn_Overl = -2;
 }
 
 /*-------------------------------------------------------------------*
@@ -4050,11 +3806,7 @@ void decoder_tcx_invQ_fx(
                 FOR( i = 0; i < noiseFillingSize; ++i )
                 {
                     tmp32 = L_shr( x[i], sub( 31, *x_e ) );
-#ifdef BASOP_NOGLOB
-                    *nf_seed = add_o( *nf_seed, (Word16) abs( tmp32 ) * i * 2, &Overflow );
-#else
-                    *nf_seed = add( *nf_seed, (Word16) abs( tmp32 ) * i * 2 );
-#endif
+                    *nf_seed = add_o( *nf_seed, extract_l( L_shl( i_mult( (Word16) L_abs( tmp32 ), i ), 1 ) ), &Overflow ); // abs( tmp32 ) * i * 2
                     move16();
                 }
             }
@@ -4122,7 +3874,8 @@ void decoder_tcx_invQ_fx(
         test();
         IF( !st->tcxonly || ( hTcxCfg->resq && hTcxDec->tcx_lpc_shaped_ari ) )
         {
-            FOR( i = 0; i < max( L_spec, L_frameTCX ); i++ )
+            Word16 len = s_max( L_spec, L_frameTCX );
+            FOR( i = 0; i < len; i++ )
             {
                 xn_buf[i] = ONE_IN_Q14;
                 move16();
@@ -4149,11 +3902,7 @@ void decoder_tcx_invQ_fx(
         move16();
         move16();
 
-#ifdef BASOP_NOGLOB
         tmp1 = mult_r( shl_sat( L_spec, 5 ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#else
-        tmp1 = mult_r( shl( L_spec, 5 ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#endif
         s = 15 - 5 - 7;
         move16();
         IF( GE_16( L_spec, 1024 ) ) /*reduce precision for avoiding overflow*/
@@ -4297,11 +4046,7 @@ void decoder_tcx_invQ_fx(
             st->last_gain_syn_deemph_e = add( st->last_gain_syn_deemph_e, 10 /*scaling of h1[0] and E_UTIL_synthesis * 2*/ );
             move16();
             tmp32 = Sqrt32( tmp32, &st->last_gain_syn_deemph_e );
-#ifdef BASOP_NOGLOB
             st->last_gain_syn_deemph = round_fx_o( tmp32, &Overflow ); // Q15
-#else
-            last_gain_syn_deemph_fx = round_fx( tmp32 );
-#endif
             move16();
         }
 
@@ -4594,11 +4339,7 @@ void decoder_tcx_noisefilling_fx(
             tmp32 = L_deposit_l( 0 );
             FOR( i = 0; i < L_spec; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp32 = L_macNs_co( tmp32, abs_s( prm_sqQ[i] ), i, &Carry, &Overflow );
-#else
-                tmp32 = L_macNs( tmp32, abs_s( prm_sqQ[i] ), i );
-#endif
             }
             nf_seed = extract_l( tmp32 );
         }
@@ -4667,7 +4408,7 @@ void decoder_tcx_noisefilling_fx(
         /* get the starting location of the subframe in the frame */
         IF( EQ_16( st->core, TCX_10_CORE ) )
         {
-            st->hPlcInfo->subframe = extract_l( L_mult0( frame_cnt, L_frameTCX_glob ) );
+            st->hPlcInfo->subframe_fx = extract_l( L_mult0( frame_cnt, L_frameTCX_glob ) );
             move16();
         }
     }
@@ -4749,11 +4490,7 @@ void decoder_tcx_noisefilling_fx(
                     tmp1 = BASOP_Util_Divide3232_Scale( W_extract_h( E_2ndlast ), W_extract_h( E_last ), &tmp2 );
                     tmp2 = add( tmp2, sub( exp2, exp1 ) );
 
-#ifdef BASOP_NOGLOB
                     tmp1 = shl_sat( tmp1, sub( tmp2, 2 ) );
-#else
-                    tmp1 = shl( tmp1, tmp2 );
-#endif
 
                     /* replace higher energy TCX5 frame by lower one to avoid energy fluctuation */
                     IF( st->element_mode > EVS_MONO )
@@ -5062,11 +4799,11 @@ void decoder_tcx_noiseshaping_igf_fx(
         /* spectrum concealment */
         IF( bfi && EQ_16( *temp_concealment_method, TCX_NONTONAL ) )
         {
-            concealment_decode_fix( st->core, x_fx, x_e, &st->hPlcInfo );
+            concealment_decode_fix( st->core, x_fx, x_e, st->hPlcInfo );
         }
 
         /* update spectrum buffer, tonality flag, etc. */
-        concealment_update_x( bfi, st->core, st->tonality_flag, x_fx, x_e, &st->hPlcInfo );
+        concealment_update_x( bfi, st->core, st->tonality_flag, x_fx, x_e, st->hPlcInfo );
 
         *x_len = s_max( *x_len, st->hPlcInfo->L_frameTCX );
         move16();
@@ -5118,3 +4855,449 @@ void decoder_tcx_noiseshaping_igf_fx(
 
     return;
 }
+
+
+/*-------------------------------------------------------------------*
+ *  decoder_tcx_tns()
+ *
+ *  TCX: TNS application
+ *-------------------------------------------------------------------*/
+
+void decoder_tcx_tns_fx(
+    Decoder_State *st,         /* i/o: coder memory state                      */
+    const Word16 L_frame_glob, /* i  : frame length                            */
+    const Word16 L_spec,
+    const Word16 L_frame,
+    const Word16 L_frameTCX,
+    Word32 x_fx[N_MAX],   // Qx
+    const Word16 fUseTns, /* i  : flag that is set if TNS data is present */
+    STnsData *tnsData,
+    const Word16 bfi,       /* i  : Bad frame indicator                     */
+    const Word16 frame_cnt, /* i  : frame counter in the super frame        */
+    const Word16 whitenedDomain,
+    Word16 *length )
+{
+    Word16 index, isTCX5, L, tmp;
+    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
+
+    index = hTcxCfg->tcx_last_overlap_mode; /* backup last TCX overlap mode */
+    move16();
+
+    isTCX5 = 0;
+    move16();
+    L = L_frameTCX;
+    move16();
+    tmp = L;
+    move16();
+
+    test();
+    IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && st->tcxonly != 0 )
+    {
+        test();
+        test();
+        IF( frame_cnt != 0 && bfi == 0 && st->last_core != ACELP_CORE )
+        {
+            /* fix sub-window overlap */
+            hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
+            move16();
+        }
+
+        test();
+        test();
+        test();
+        IF( ( NE_16( hTcxCfg->fIsTNSAllowed, 0 ) && NE_16( fUseTns, 0 ) && NE_16( bfi, 1 ) ) || GT_16( L_spec, L_frameTCX ) )
+        {
+            L = L_spec;
+            move16();
+            tmp = L;
+            move16();
+        }
+
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( EQ_16( bfi, 0 ) && ( NE_16( hTcxCfg->tcx_last_overlap_mode, FULL_OVERLAP ) ||
+                                   ( EQ_16( hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) && EQ_16( frame_cnt, 0 ) && EQ_16( index, 0 ) ) ) ) ||
+            ( NE_16( bfi, 0 ) && ( NE_16( hTcxCfg->tcx_last_overlap_mode, FULL_OVERLAP ) &&
+                                   NE_16( hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) ) ) )
+        {
+            isTCX5 = 1;
+            move16();
+
+            tcx5SpectrumDeinterleaving_fx( shr( L, 1 ), x_fx );
+        }
+    }
+
+    /*-----------------------------------------------------------*
+     * Temporal Noise Shaping Synthesis                          *
+     *-----------------------------------------------------------*/
+
+
+    test();
+    test();
+    test();
+    IF( NE_16( hTcxCfg->fIsTNSAllowed, 0 ) && fUseTns != 0 && NE_16( bfi, 1 ) && EQ_16( tnsData->tnsOnWhitenedSpectra, whitenedDomain ) )
+    {
+        /* Apply TNS to get the reconstructed signal */
+        SetTnsConfig( hTcxCfg, L_frame_glob == st->L_frame, ( st->last_core == ACELP_CORE ) && ( frame_cnt == 0 ) );
+
+        test();
+        test();
+        IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && st->tcxonly != 0 && isTCX5 != 0 )
+        {
+            tcx5TnsGrouping_fx( shr( L, 1 ), shr( hTcxCfg->tnsConfig[0][0].iFilterBorders[0], 1 ), x_fx );
+        }
+
+        ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, tnsData, x_fx, 0 );
+
+        test();
+        test();
+        IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && st->tcxonly != 0 && isTCX5 != 0 )
+        {
+            test();
+            IF( st->element_mode == EVS_MONO || LT_16( L_spec, L_frameTCX ) ) /* todo: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */
+            {
+                tcx5TnsUngrouping_fx( shr( L_frameTCX, 1 ), shr( hTcxCfg->tnsConfig[0][0].iFilterBorders[0], 1 ), x_fx, DEC );
+                tmp = L_frameTCX;
+                move16();
+            }
+            ELSE
+            {
+                tcx5TnsUngrouping_fx( shr( L, 1 ), shr( hTcxCfg->tnsConfig[0][0].iFilterBorders[0], 1 ), x_fx, DEC );
+            }
+        }
+    }
+    test();
+    IF( NE_16( whitenedDomain, 0 ) && NE_16( isTCX5, 0 ) )
+    {
+        tcx5SpectrumInterleaving_fx( shr( L, 1 ), x_fx );
+    }
+
+    /* restore index */
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && NE_16( st->tcxonly, 0 ) && NE_16( frame_cnt, 0 ) && EQ_16( bfi, 0 ) && NE_16( st->last_core, ACELP_CORE ) )
+    {
+        /* restore sub-window overlap */
+        hTcxCfg->tcx_last_overlap_mode = index;
+        move16();
+    }
+
+    if ( length != NULL )
+    {
+        *length = tmp;
+        move16();
+    }
+
+    return;
+}
+
+
+void decoder_tcx_imdct_fx(
+    Decoder_State *st,         /* i/o: coder memory state                      */
+    const Word16 L_frame_glob, /* i  : frame length                            */
+    const Word16 L_frameTCX_glob,
+    const Word16 L_spec,
+    const Word16 tcx_offset,
+    const Word16 tcx_offsetFB,
+    const Word16 L_frame,
+    const Word16 L_frameTCX,
+    const Word16 left_rect,
+    Word32 x_fx[N_MAX], // Q(11)
+    Word16 q_x,
+    Word16 xn_buf_fx[], // Q(-2)
+    Word16 q_win,
+    const UWord16 kernelType,          /* i  : TCX transform kernel type               */
+    const Word16 fUseTns,              /* i  : flag that is set if TNS data is present */
+    Word16 synth_fx[],                 // Q(-2)             /* i/o: synth[-M..L_frame]                      */
+    Word16 synthFB_fx[],               // Q(-2)
+    const Word16 bfi,                  /* i  :  Bad frame indicator                    */
+    const Word16 frame_cnt,            /* i  : frame counter in the super frame        */
+    const Word16 sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC      */
+)
+{
+    Word16 j, L, overlap, curr_order, startLine, endLine, isTCX5;
+    Word16 overlapFB;
+    Word32 x_tmp_fx[L_FRAME_PLUS];
+    Word32 xn_bufFB_fx[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX] = { 0 };
+    Word16 xn_bufFB_fx_16[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX];
+    Word16 acelp_zir_fx[L_FRAME_MAX / 2];
+    Word32 x_itf_fx[N_MAX_TCX - IGF_START_MN];
+    Word16 index, proc = 0;
+    TCX_LTP_DEC_HANDLE hTcxLtpDec = st->hTcxLtpDec;
+    TCX_DEC_HANDLE hTcxDec = st->hTcxDec;
+    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
+    Word16 predictionGain_fx;
+    Word16 A_itf_fx[ITF_MAX_FILTER_ORDER + 1]; // q_a_itf
+    Word16 q_a_itf = 15;
+    Word16 x_e = sub( 31, q_x );
+    move16();
+    Word16 shift_q = sub( q_x, q_win );
+
+    /*-----------------------------------------------------------------*
+     * Initializations
+     *-----------------------------------------------------------------*/
+
+    /* Init lengths */
+    overlap = hTcxCfg->tcx_mdct_window_length;
+    move16();
+    overlapFB = hTcxCfg->tcx_mdct_window_lengthFB;
+    move16();
+
+    index = hTcxCfg->tcx_last_overlap_mode; /* backup last TCX overlap mode */
+    move16();
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && ( st->tcxonly != 0 ) && ( frame_cnt != 0 ) && ( bfi == 0 ) && ( st->last_core != ACELP_CORE ) )
+    {
+        /* fix sub-window overlap */
+        hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
+        move16();
+    }
+
+    IF( st->igf != 0 )
+    {
+        proc = st->hIGFDec->flatteningTrigger;
+        move16();
+
+        test();
+        IF( proc && fUseTns != 0 )
+        {
+            proc = 0;
+            move16();
+        }
+
+        IF( proc )
+        {
+
+            startLine = st->hIGFDec->infoIGFStartLine;
+            move16();
+            endLine = st->hIGFDec->infoIGFStopLine;
+            move16();
+            curr_order = 0;
+            move16();
+            predictionGain_fx = 0;
+            move16();
+            L = L_frameTCX;
+            move16();
+            isTCX5 = 0;
+            move16();
+
+            /* interleave again for ITF */
+            test();
+            IF( EQ_16( L_frame, shr( st->L_frame, 1 ) ) && st->tcxonly )
+            {
+                test();
+                test();
+                test();
+                IF( ( hTcxCfg->fIsTNSAllowed && ( fUseTns != 0 ) && NE_16( bfi, 1 ) ) || GT_16( L_spec, L_frameTCX ) )
+                {
+                    L = L_spec;
+                    move16();
+                }
+
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                test();
+                IF( ( ( bfi == 0 ) && ( ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) ||
+                                        ( ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( frame_cnt == 0 ) && ( index == 0 ) ) ) ) ||
+                    ( ( bfi != 0 ) && ( ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) &&
+                                        ( hTcxCfg->tcx_curr_overlap_mode != FULL_OVERLAP ) ) ) )
+                {
+                    isTCX5 = 1;
+                    move16();
+
+                    tcx5SpectrumInterleaving_fx( shr( L, 1 ), x_fx );
+                }
+            }
+
+            FOR( j = startLine; j < endLine; j++ )
+            {
+                IF( EQ_16( st->hIGFDec->flag_sparse[j - IGF_START_MN], 2 ) )
+                {
+                    x_itf_fx[j - IGF_START_MN] = x_fx[j]; // q_x
+                    move32();
+                    x_fx[j] = st->hIGFDec->virtualSpec_fx[j - IGF_START_MN];
+                    move32();
+                }
+            }
+
+            ITF_Detect_fx( x_fx + IGF_START_MN, startLine, endLine, 8 /*maxOrder*/, A_itf_fx, &q_a_itf, &predictionGain_fx, &curr_order, shl( x_e, 1 ) );
+
+            ITF_Apply_fx( x_fx, startLine, endLine, A_itf_fx, q_a_itf, curr_order );
+
+            FOR( j = startLine; j < endLine; j++ )
+            {
+                IF( EQ_16( st->hIGFDec->flag_sparse[j - IGF_START_MN], 2 ) )
+                {
+                    x_fx[j] = x_itf_fx[j - IGF_START_MN]; // q_x
+                    move32();
+                }
+            }
+
+            /* deinterleave */
+            IF( NE_16( isTCX5, 0 ) )
+            {
+                tcx5SpectrumDeinterleaving_fx( shr( L, 1 ), x_fx );
+            }
+        }
+    }
+
+    /*-----------------------------------------------------------*
+     * Prepare OLA buffer after waveadjustment.                  *
+     * Compute inverse MDCT of x[].                              *
+     *-----------------------------------------------------------*/
+
+
+    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        Word16 copy_len = s_min( L_FRAME48k, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) );
+        set32_fx( x_tmp_fx, 0, L_FRAME_PLUS );
+        Copy32( x_fx, x_tmp_fx, copy_len );    // q_x
+        Copy32( x_fx, xn_bufFB_fx, copy_len ); // q_x
+    }
+    ELSE IF( ( st->element_mode == EVS_MONO ) )
+    {
+        Copy32( x_fx, xn_bufFB_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ); // q_x
+    }
+    ELSE
+    {
+        Word16 copy_len = s_max( L_spec, s_max( L_frame, L_frameTCX ) );
+        Copy32( x_fx, x_tmp_fx, copy_len );    // q_x
+        Copy32( x_fx, xn_bufFB_fx, copy_len ); // q_x
+    }
+
+    IF( ( st->igf != 0 ) )
+    {
+        set32_fx( xn_bufFB_fx + st->hIGFDec->infoIGFStartLine, 0, L_frameTCX - st->hIGFDec->infoIGFStartLine );
+    }
+
+    test();
+    IF( NE_16( st->element_mode, IVAS_CPE_DFT ) && !sba_dirac_stereo_flag )
+    {
+
+        IMDCT_ivas_fx( xn_bufFB_fx, q_x, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf_fx, hTcxCfg->tcx_aldo_window_1, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2,
+                       hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,
+                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );
+    }
+
+    /* Generate additional comfort noise to mask potential coding artefacts */
+    test();
+    test();
+    test();
+    IF( ( st->flag_cna != 0 ) && NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) && ( st->cna_dirac_flag == 0 ) )
+    {
+        generate_masking_noise_mdct_ivas_fx( x_fx, &x_e, st->hFdCngDec->hFdCngCom );
+        FOR( Word16 ind = 0; ind < L_frame; ind++ )
+        {
+            x_fx[ind] = L_shr( x_fx[ind], sub( 31, add( x_e, q_x ) ) ); // q_x
+        }
+    }
+
+    test();
+    IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || ( sba_dirac_stereo_flag != 0 ) )
+    {
+        Copy32( x_fx, xn_bufFB_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ); // q_x
+
+        IMDCT_ivas_fx( xn_bufFB_fx, q_x, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf_fx, hTcxCfg->tcx_aldo_window_1, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,
+                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );
+    }
+
+    FOR( Word16 ind = 0; ind < L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; ind++ )
+    {
+        xn_bufFB_fx_16[ind] = extract_l( L_shr( xn_bufFB_fx[ind], shift_q ) ); // q_x
+        move16();
+    }
+
+    Word16 ratio_e;
+    Word16 ratio = BASOP_Util_Divide1616_Scale( L_frameTCX_glob, L_frame_glob, &ratio_e ); // Q = 15-ratio_e. * FSCALE_DENOM is (1 << 9)
+    ratio = shr( ratio, sub( 6, ratio_e ) );
+
+    IF( st->element_mode != EVS_MONO )
+    {
+        IMDCT_ivas_fx( x_tmp_fx, q_x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB_fx_16, hTcxCfg->tcx_aldo_window_1_FB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB,
+                       hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,
+                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, 1, st, ratio, acelp_zir_fx, q_win );
+    }
+    ELSE
+    {
+
+        IMDCT_ivas_fx( x_fx, q_x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB_fx_16, hTcxCfg->tcx_aldo_window_1_FB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,
+                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, 1, st, ratio, acelp_zir_fx, q_win );
+    }
+    FOR( Word16 ind = 0; ind < L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; ind++ )
+    {
+        xn_bufFB_fx[ind] = L_shl( L_deposit_l( xn_bufFB_fx_16[ind] ), shift_q ); // Q_x
+    }
+
+    IF( ( bfi == 0 ) )
+    {
+        Word16 res_m, res_e = 0;
+        move16();
+        st->second_last_tns_active = st->last_tns_active;
+        move16();
+        st->last_tns_active = hTcxCfg->fIsTNSAllowed & fUseTns;
+        move16();
+        hTcxDec->tcxltp_third_last_pitch = hTcxDec->tcxltp_second_last_pitch;
+        move32();
+        hTcxDec->tcxltp_second_last_pitch = st->old_fpitch;
+        move32();
+        res_m = BASOP_Util_Divide1616_Scale( hTcxLtpDec->tcxltp_pitch_fr, st->pit_res_max, &res_e );
+        st->old_fpitch = L_add( L_shl( hTcxLtpDec->tcxltp_pitch_int, 16 ), L_shl( res_m, add( res_e, 1 ) ) );
+
+        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+        {
+            // Using sat as a single instruction shifts and extracts
+            st->old_fpitch = W_shl_sat_l( W_mult0_32_32( st->old_fpitch, L_frame_glob ), -8 ); // Divide by 256 ==> SHR by 8
+            move32();
+        }
+
+        IF( GT_16( st->element_mode, EVS_MONO ) )
+        {
+            res_m = BASOP_Util_Divide1616_Scale( L_frameTCX_glob, L_frame_glob, &res_e );
+            st->old_fpitchFB = L_shl( Mpy_32_16_1( st->old_fpitch, res_m ), res_e );
+            move32();
+        }
+        ELSE
+        {
+            res_m = BASOP_Util_Divide1616_Scale( L_frameTCX, L_frame, &res_e );
+            st->old_fpitchFB = L_shl( Mpy_32_16_1( st->old_fpitch, res_m ), res_e );
+            move32();
+        }
+    }
+
+    /* Update old_syn_overl */
+    IF( hTcxCfg->last_aldo == 0 )
+    {
+        Copy( xn_buf_fx + L_frame, hTcxDec->syn_Overl, overlap ); // Q(-2)
+        FOR( Word16 ind = 0; ind < overlapFB; ind++ )
+        {
+            hTcxDec->syn_OverlFB[ind] = extract_l( L_shr( xn_bufFB_fx[( ind + L_frameTCX )], shift_q ) ); // q_x
+        }
+    }
+
+    /* Output */
+    Copy( xn_buf_fx + sub( shr( overlap, 1 ), tcx_offset ), synth_fx, L_frame_glob ); // Q(-2)
+    FOR( Word16 ind = 0; ind < L_frameTCX_glob; ind++ )
+    {
+        synthFB_fx[ind] = extract_l( L_shr( xn_bufFB_fx[( ind + ( ( overlapFB >> 1 ) - tcx_offsetFB ) )], shift_q ) ); // q_x
+    }
+
+
+    return;
+}
diff --git a/lib_dec/dec_tran.c b/lib_dec/dec_tran.c
deleted file mode 100644
index 88f93c73337a55edba9c3770c1f9dbcd7280b9d7..0000000000000000000000000000000000000000
--- a/lib_dec/dec_tran.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * decod_tran()
- *
- * Decode transition (TC) frames
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/dec_tran_fx.c b/lib_dec/dec_tran_fx.c
index d21109dce767cb8d9a39949efdea4901b90e628d..de3a1ff3fb8f8521004f0d0cb1d3dd1260e57e19 100644
--- a/lib_dec/dec_tran_fx.c
+++ b/lib_dec/dec_tran_fx.c
@@ -234,21 +234,12 @@ void decod_tran_fx(
             FOR( i = 0; i < L_SUBFR; i++ )
             {
                 L_tmp = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q10 -> Q13*/
-#ifdef BASOP_NOGLOB
-                L_tmp = L_shl_sat( L_tmp, tmp1_fx ); /* Q16 + Q_exc      */
+                L_tmp = L_shl_sat( L_tmp, tmp1_fx );             /* Q16 + Q_exc      */
                 tmp_fx = round_fx_sat( L_tmp );
                 exc2_fx[i + i_subfr] = add_sat( exc2_fx[i + i_subfr], tmp_fx );
                 move16();
                 exc_fx[i + i_subfr] = add_sat( exc_fx[i + i_subfr], tmp_fx );
                 move16();
-#else
-                L_tmp = L_shl( L_tmp, tmp1_fx ); /* Q16 + Q_exc      */
-                tmp_fx = round_fx( L_tmp );
-                exc2_fx[i + i_subfr] = add( exc2_fx[i + i_subfr], tmp_fx );
-                move16();
-                exc_fx[i + i_subfr] = add( exc_fx[i + i_subfr], tmp_fx );
-                move16();
-#endif
             }
         }
 
@@ -262,9 +253,11 @@ void decod_tran_fx(
         {
             tmp_idx_2 = idiv1616( i_subfr, L_SUBFR );
         }
-        prep_tbe_exc_fx( L_frame_fx, i_subfr, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
+
+        prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
                          &voice_factors_fx[tmp_idx_2], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
-                         st_fx->Q_exc, T0, T0_frac, st_fx->coder_type, st_fx->core_brate );
+                         st_fx->Q_exc, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
+                         st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
 
         /*----------------------------------------------------------------*
          * Excitation enhancements (update of total excitation signal)
diff --git a/lib_dec/dec_uv.c b/lib_dec/dec_uv.c
deleted file mode 100644
index e748899a9667996f0776eb65127752b66796a660..0000000000000000000000000000000000000000
--- a/lib_dec/dec_uv.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/dec_uv_fx.c b/lib_dec/dec_uv_fx.c
index 352738d5f524a16ecebeaf947766054f147f5475..f1ba21979228b1e0634efef8bf139c511869fc4f 100644
--- a/lib_dec/dec_uv_fx.c
+++ b/lib_dec/dec_uv_fx.c
@@ -26,105 +26,17 @@ static void gain_dec_gacelp_uv_fx(
  *-------------------------------------------------------------------*/
 
 void decod_unvoiced_fx(
-    Decoder_State *st_fx,     /* 					i/o: decoder static memory                  */
-    const Word16 *Aq_fx,      /* 	Q12				i  : LP filter coefficient                  */
-    const Word16 coder_type,  /* 	Q0				i  : coding type                            */
-    Word16 *tmp_noise_fx,     /* 	Q0				o  : long term temporary noise energy       */
-    Word16 *pitch_buf_fx,     /* 	Q6				o  : floating pitch values for each subframe*/
-    Word16 *voice_factors_fx, /* 	Q15				o  : voicing factors                        */
-    Word16 *exc_fx,           /* 	Q_X			o  : adapt. excitation exc                  */
-    Word16 *exc2_fx,          /* 	Q_X				o  : adapt. excitation/total exc            */
-    Word16 *bwe_exc_fx,       /* 	Q_X				i/o: excitation for SWB TBE					*/
-    Word16 *gain_buf )
-{
-    Word16 gain_pit_fx;       /* Quantized pitch gain                 */
-    Word32 gain_code_fx;      /* Quantized algebraic codeebook gain   */
-    Word16 gain_inov_fx;      /* inovation gain                       */
-    Word32 norm_gain_code_fx; /* normalized algebraic codeebook gain  */
-    Word16 voice_fac_fx;      /* Voicing factor                       */
-    Word16 code_fx[L_SUBFR];  /* algebraic codevector                 */
-    Word16 i_subfr_fx;
-    const Word16 *p_Aq_fx;
-    Word16 *pt_pitch_fx;
-
-    gain_pit_fx = 0;
-    move16();
-
-    test();
-    IF( EQ_16( st_fx->last_ppp_mode_dec, 1 ) || EQ_16( st_fx->last_nelp_mode_dec, 1 ) )
-    {
-        /* SC_VBR - reset the decoder, to avoid memory not updated issue for this unrealistic case */
-        CNG_reset_dec_fx( st_fx, pitch_buf_fx, voice_factors_fx );
-    }
-
-    p_Aq_fx = Aq_fx;
-    move16(); /*Q12*/ /* pointer to interpolated LPC parameters */
-    pt_pitch_fx = pitch_buf_fx;
-    move16(); /* pointer to the pitch buffer  */
-
-    FOR( i_subfr_fx = 0; i_subfr_fx < L_FRAME; i_subfr_fx += L_SUBFR )
-    {
-        /*----------------------------------------------------------------*
-         * Unvoiced subframe processing
-         *----------------------------------------------------------------*/
-
-        gaus_dec_fx( st_fx, i_subfr_fx, code_fx, &norm_gain_code_fx, &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, &gain_inov_fx, &st_fx->tilt_code_fx,
-                     &voice_fac_fx, &gain_pit_fx, pt_pitch_fx, exc_fx, &gain_code_fx, exc2_fx, bwe_exc_fx, &( st_fx->Q_exc ), st_fx->Q_subfr );
-
-        *tmp_noise_fx = extract_h( norm_gain_code_fx ); /*Q16*/
-        move16();
-
-        /*----------------------------------------------------------------*
-         * Excitation enhancements (update of total excitation signal)
-         *----------------------------------------------------------------*/
-
-        enhancer_fx( st_fx->core_brate, 0, coder_type, i_subfr_fx, L_FRAME, voice_fac_fx, st_fx->stab_fac_fx,
-                     norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
-
-        Word16 tmp_idx = 0;
-        move16();
-        IF( i_subfr_fx != 0 )
-        {
-            tmp_idx = idiv1616( i_subfr_fx, L_SUBFR );
-        }
-        voice_factors_fx[tmp_idx] = 0;
-        move16();
-
-        interp_code_5over2_fx( &exc_fx[i_subfr_fx], &bwe_exc_fx[( ( i_subfr_fx * 2 * HIBND_ACB_L_FAC ) >> 1 )], L_SUBFR );
-
-        p_Aq_fx += ( M + 1 );
-        pt_pitch_fx++;
-        st_fx->tilt_code_dec_fx[tmp_idx] = st_fx->tilt_code_fx;
-        move16();
-    }
-
-    /* SC-VBR */
-    st_fx->prev_gain_pit_dec_fx = gain_pit_fx;
-    move16();
-
-    set16_fx( gain_buf, 0, NB_SUBFR );
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * decod_unvoiced()
- *
- * Decode unvoiced (UC) frames
- *-------------------------------------------------------------------*/
-
-void decod_unvoiced_ivas_fx(
-    Decoder_State *st_fx,            /* 					i/o: decoder static memory                  */
-    const Word16 *Aq_fx,             /* 	Q12				i  : LP filter coefficient                  */
-    const Word16 Es_pred_fx,         /* i  : predicted scaled innov. energy          */
-    const int16_t uc_two_stage_flag, /* i  : flag indicating two-stage UC            */
-    const Word16 coder_type,         /* 	Q0				i  : coding type                            */
-    Word16 *tmp_noise_fx,            /* 	Q0				o  : long term temporary noise energy       */
-    Word16 *pitch_buf_fx,            /* 	Q6				o  : floating pitch values for each subframe*/
-    Word16 *voice_factors_fx,        /* 	Q15				o  : voicing factors                        */
-    Word16 *exc_fx,                  /* 	Q_X			o  : adapt. excitation exc                  */
-    Word16 *exc2_fx,                 /* 	Q_X				o  : adapt. excitation/total exc            */
-    Word16 *bwe_exc_fx,              /* 	Q_X				i/o: excitation for SWB TBE					*/
+    Decoder_State *st_fx,           /* 					i/o: decoder static memory                  */
+    const Word16 *Aq_fx,            /* 	Q12				i  : LP filter coefficient                  */
+    const Word16 Es_pred_fx,        /* i  : predicted scaled innov. energy          */
+    const Word16 uc_two_stage_flag, /* i  : flag indicating two-stage UC            */
+    const Word16 coder_type,        /* 	Q0				i  : coding type                            */
+    Word16 *tmp_noise_fx,           /* 	Q0				o  : long term temporary noise energy       */
+    Word16 *pitch_buf_fx,           /* 	Q6				o  : floating pitch values for each subframe*/
+    Word16 *voice_factors_fx,       /* 	Q15				o  : voicing factors                        */
+    Word16 *exc_fx,                 /* 	Q_X			o  : adapt. excitation exc                  */
+    Word16 *exc2_fx,                /* 	Q_X				o  : adapt. excitation/total exc            */
+    Word16 *bwe_exc_fx,             /* 	Q_X				i/o: excitation for SWB TBE					*/
     Word16 *gain_buf )
 {
     Word16 gain_pit_fx;  /* Quantized pitch gain                 */
@@ -207,7 +119,14 @@ void decod_unvoiced_ivas_fx(
             move16();
 
             /* update LP filtered gains for the case of frame erasures */
-            lp_gain_updt_ivas_fx( i_subfr_fx, gain_pit_fx, norm_gain_code_fx, &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_FRAME );
+            IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
+            {
+                lp_gain_updt_fx( i_subfr_fx, gain_pit_fx, norm_gain_code_fx, &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_FRAME );
+            }
+            ELSE
+            {
+                lp_gain_updt_ivas_fx( i_subfr_fx, gain_pit_fx, norm_gain_code_fx, &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_FRAME );
+            }
 
             /*-------------------------------------------------------*
              * - Find the total excitation.                          *
@@ -240,6 +159,7 @@ void decod_unvoiced_ivas_fx(
             }
             // Scale_sig(code_fx, L_SUBFR, 3); //Q12
         }
+
         *tmp_noise_fx = extract_h( norm_gain_code_fx ); /*Q16*/
         move16();
 
@@ -247,20 +167,27 @@ void decod_unvoiced_ivas_fx(
          * Excitation enhancements (update of total excitation signal)
          *----------------------------------------------------------------*/
 
-        /*enhancer_fx(st_fx->core_brate, 0, coder_type, i_subfr_fx, L_FRAME, voice_fac_fx, st_fx->stab_fac_fx,
-            norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &(st_fx->dm_fx), st_fx->Q_exc);*/
-        enhancer_ivas_fx( MODE1, st_fx->core_brate, uc_two_stage_flag, 0, coder_type, i_subfr_fx, L_FRAME, voice_fac_fx, st_fx->stab_fac_fx,
-                          norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx /*Q9/Q12?*/, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
+        IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
+        {
+            enhancer_fx( st_fx->core_brate, 0, coder_type, i_subfr_fx, L_FRAME, voice_fac_fx, st_fx->stab_fac_fx,
+                         norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
+        }
+        ELSE
+        {
+            enhancer_ivas_fx( MODE1, st_fx->core_brate, uc_two_stage_flag, 0, coder_type, i_subfr_fx, L_FRAME, voice_fac_fx, st_fx->stab_fac_fx,
+                              norm_gain_code_fx, gain_inov_fx, &st_fx->gc_threshold_fx, code_fx /*Q9/Q12?*/, exc2_fx, gain_pit_fx, &( st_fx->dm_fx ), st_fx->Q_exc );
+        }
 
         Word16 tmp_idx;
         tmp_idx = 0;
         move16();
-        if ( i_subfr_fx != 0 )
+        IF( i_subfr_fx != 0 )
         {
-            idiv1616( i_subfr_fx, L_SUBFR );
+            tmp_idx = idiv1616( i_subfr_fx, L_SUBFR );
         }
         voice_factors_fx[tmp_idx] = 0;
         move16();
+
         interp_code_5over2_fx( &exc_fx[i_subfr_fx], &bwe_exc_fx[( ( i_subfr_fx * 2 * HIBND_ACB_L_FAC ) >> 1 )], L_SUBFR );
 
         p_Aq_fx += ( M + 1 );
@@ -372,11 +299,7 @@ static void gain_dec_gacelp_uv_fx(
     *past_gcode = L_shl( L_tmp1, sub( exp_L_tmp1, 15 ) ); /* Q16 */
     move32();
 
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( Mpy_32_16_1( *past_gcode, *gain_inov ), 3 );
-#else
-    *gain_code = L_shl( Mpy_32_16_1( *past_gcode, *gain_inov ), 3 );
-#endif
     move32();
 
 
diff --git a/lib_dec/decision_matrix_dec.c b/lib_dec/decision_matrix_dec.c
deleted file mode 100644
index a96d130cb7b5bdcee22cb5dcb02c029006dee9e8..0000000000000000000000000000000000000000
--- a/lib_dec/decision_matrix_dec.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "stat_dec.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-----------------------------------------------------------------*
- * decision_matrix_dec()
- *
- * ACELP/HQ core selection
- * Read ACELP signaling bits from the bitstream
- * Set extension layers
- *-----------------------------------------------------------------*/
diff --git a/lib_dec/decision_matrix_dec_fx.c b/lib_dec/decision_matrix_dec_fx.c
index 9c0020223150cbb48adcfa4f6497e23fbe600359..0bc7794dc7b8322b5e9f670b889945c80aebebdf 100644
--- a/lib_dec/decision_matrix_dec_fx.c
+++ b/lib_dec/decision_matrix_dec_fx.c
@@ -681,12 +681,12 @@ void decision_matrix_dec_fx(
         st->nb_subfr = NB_SUBFR16k;
         move16();
     }
-#if 1 // def ADD_IVAS_BWE  0> NEEDED for IO with conf_acelp1
+
     st->extl_orig = st->extl;
     move16();
     st->extl_brate_orig = st->extl_brate;
     move32();
-#endif
+
     test();
     IF( EQ_32( st->output_Fs, 8000 ) )
     {
@@ -713,5 +713,18 @@ void decision_matrix_dec_fx(
         move16();
     }
 
+    /*-----------------------------------------------------------------*
+     * set inactive coder_type flag in ACELP core
+     *-----------------------------------------------------------------*/
+
+    st->inactive_coder_type_flag = 0; /* AVQ by default */
+    move16();
+
+    if ( LE_32( st->total_brate, MAX_GSC_INACTIVE_BRATE ) )
+    {
+        st->inactive_coder_type_flag = 1; /* GSC */
+        move16();
+    }
+
     return;
 }
diff --git a/lib_dec/dlpc_avq.c b/lib_dec/dlpc_avq.c
deleted file mode 100644
index 3514dda88db2f9cf14dc1f1e4ef2e3a51656e03a..0000000000000000000000000000000000000000
--- a/lib_dec/dlpc_avq.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
-
-/*------------------------------------------------------------------*
- * dlpc_avq()
- *
- * Variable bitrate multiple LPC un-quantizer
- *------------------------------------------------------------------*/
diff --git a/lib_dec/dlpc_avq_fx.c b/lib_dec/dlpc_avq_fx.c
index 3d9a00b7f1bbbb7be3c76f639125fe0913d033f3..07f1ea6f21206fa6b7d77d2886afc525462e6f85 100644
--- a/lib_dec/dlpc_avq_fx.c
+++ b/lib_dec/dlpc_avq_fx.c
@@ -149,20 +149,11 @@ Word16 decode_lpc_avq_fx(
     Decoder_State *st,   /* i/o: decoder state structure     */
     const Word16 numlpc, /* i  : Number of sets of lpc       */
     Word16 *param_lpc    /* o  : lpc parameters              */
-#ifdef IVAS_CODE_AVQ_LPC
-    ,
-    const Word16 ch,             /* i  : channel                     */
-    const Word16 element_mode,   /* i  : element mode                */
-    const Word16 sns_low_br_mode /* i  : SNS low-bitrate mode        */
-#endif
 )
 {
     Word16 k, j;
     Word16 nb, qn1, qn2, avqBits, q_type;
     Word16 start_bit_pos;
-#ifdef IVAS_CODE_AVQ_LPC
-    Word16 stereo_mode = 0;
-#endif
     move16();
     move16();
     move16();
@@ -189,41 +180,11 @@ Word16 decode_lpc_avq_fx(
             param_lpc[j] = q_type;
             j = add( j, 1 );
         }
-#ifdef IVAS_CODE_AVQ_LPC
-        test();
-        IF( EQ_16( element_mode, IVAS_CPE_MDCT ) && k == 0 )
-        {
-            stereo_mode = ch;
-            move16();
-            if ( ch == 0 )
-            {
-                stereo_mode = param_lpc[j];
-                move16();
-            }
-            param_lpc[j++] = stereo_mode;
-            move16();
-        }
-#endif
         /* Decode quantization indices */
 
         IF( q_type == 0 )
         {
             /* Absolute quantizer with 1st stage stochastic codebook */
-#ifdef IVAS_CODE_AVQ_LPC
-            IF( EQ_16( element_mode, IVAS_CPE_MDCT ) )
-            {
-                IF( NE_16( stereo_mode, 3 ) )
-                {
-                    param_lpc[j] = get_next_indice_fx( st, SNS_ABS_QUANT_BITS );
-                }
-                ELSE
-                {
-                    param_lpc[j] = sub( get_next_indice_fx( st, 1 ), 2 );
-                }
-                move16();
-            }
-            ELSE
-#endif
             {
                 move16();
                 param_lpc[j] = get_next_indice_fx( st, 8 );
@@ -235,9 +196,6 @@ Word16 decode_lpc_avq_fx(
          *   - we are in low bitrate mode and no joint SNS coding is used
          *   - OR the side-SNS-is-zero flag is set for joint SNS
          */
-#ifdef IVAS_CODE_AVQ_LPC
-        IF( NE_16( element_mode, IVAS_CPE_MDCT ) || ( !( sns_low_br_mode && ( EQ_16( stereo_mode, 0 ) || EQ_16( stereo_mode, 1 ) ) && !( EQ_16( q_type, 0 ) && EQ_16( param_lpc[j - 1], -2 ) ) ) ) )
-#endif
         {
             /* 2 bits to specify Q2,Q3,Q4,ext */
             qn1 = add( 2, get_next_indice_fx( st, 2 ) );
@@ -321,21 +279,11 @@ Word16 decode_lpc_avq_fx(
             pack4bits_fx( avqBits, st, &param_lpc[j] );
             j = add( j, qn2 );
         }
-#ifdef IVAS_CODE_AVQ_LPC
-        ELSE
-        {
-            param_lpc[j] = 0;
-            j = add( j, 1 );
-            param_lpc[j] = 0;
-            j = add( j, 1 );
-            move16();
-            move16();
-        }
-#endif
     }
 
     return sub( st->next_bit_pos, start_bit_pos );
 }
+
 Word16 decode_lpc_avq_ivas_fx(
     Decoder_State *st,   /* i/o: decoder state structure     */
     const Word16 numlpc, /* i  : Number of sets of lpc       */
diff --git a/lib_dec/dlpc_stoch.c b/lib_dec/dlpc_stoch.c
deleted file mode 100644
index c1956b8d903ffc59fcb8895a07ecbe363d6ce954..0000000000000000000000000000000000000000
--- a/lib_dec/dlpc_stoch.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-
-/*------------------------------------------------------------------*
- * lpc_unquantize()
- *
- *
- *------------------------------------------------------------------*/
diff --git a/lib_dec/er_dec_acelp.c b/lib_dec/er_dec_acelp.c
deleted file mode 100644
index 68731d8f1702d45c4fc58916c47fef083afa1903..0000000000000000000000000000000000000000
--- a/lib_dec/er_dec_acelp.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/er_dec_acelp_fx.c b/lib_dec/er_dec_acelp_fx.c
index f61e782e342baee1480fbf6b0e2eefa0f8aadfb9..e30553d388e32c0a53b2b903aa763b120af22ab0 100644
--- a/lib_dec/er_dec_acelp_fx.c
+++ b/lib_dec/er_dec_acelp_fx.c
@@ -202,11 +202,7 @@ void con_acelp_fx(
 
         Tc = round_fx( tmp_tc );       /* Q0 */
         BASOP_SATURATE_WARNING_OFF_EVS /*if this ever saturates, it doesn't matter*/
-#ifdef BASOP_NOGLOB
             tmp = sub( shl_sat( abs_s( sub( T0, Tc ) ), 6 ), mult( 19661 /*0.15f Q17*/, shl_sat( Tc, 4 ) ) /*Q6*/ );
-#else
-            tmp = sub( shl( abs_s( sub( T0, Tc ) ), 6 ), mult( 19661 /*0.15f Q17*/, shl( Tc, 4 ) ) /*Q6*/ );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         test();
         test();
@@ -419,11 +415,7 @@ void con_acelp_fx(
             FOR( ; i < l; i++ )
             {
                 BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
                 exc[i] = mult_r( exc[i], shl_sat( gain, 1 ) ); /*overflow is first iteration because gain may be 1 after shift*/ /*Qf_exc*/
-#else
-                exc[i] = mult_r( exc[i], shl( gain, 1 ) ); /*overflow is first iteration because gain may be 1 after shift*/  /*Qf_exc*/
-#endif
                 BASOP_SATURATE_WARNING_ON_EVS
                 move16();
                 gain = sub( gain, step );
@@ -434,11 +426,7 @@ void con_acelp_fx(
         FOR( ; i < l; i++ )
         {
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             exc[i] = mult_r( exc[i], shl_sat( gain, 1 ) ); /*overflow is first iteration because gain may become 1 due to shift*/ /*Qf_exc*/
-#else
-            exc[i] = mult_r( exc[i], shl( gain, 1 ) ); /*overflow is first iteration because gain may become 1 due to shift*/ /*Qf_exc*/
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             move16();
             gain = sub( gain, step );
@@ -458,7 +446,7 @@ void con_acelp_fx(
     ELSE
     {
         /* No harmonic part */
-        assert( (int) ( sizeof( buf ) / sizeof( buf[0] ) ) - M - L_EXC_MEM_DEC >= st->L_frame + st->L_frame / 2 );
+        assert( (Word32) ( sizeof( buf ) / sizeof( buf[0] ) ) - M - L_EXC_MEM_DEC >= st->L_frame + st->L_frame / 2 );
         set16_fx( &exc[0], 0, add( st->L_frame, shr( st->L_frame, 1 ) ) );
 
         FOR( i = 0; i < st->nb_subfr; i++ )
@@ -541,24 +529,12 @@ void con_acelp_fx(
     gain_32 = st->Mode2_lp_gainc; /*15Q16 */ /* start-of-the-frame gain */
     move32();
 
-#ifdef BASOP_NOGLOB
     ftmp = round_fx_sat( L_shl_sat( gain_32, 1 ) ); /*Q0*/
-#else
-    ftmp = round_fx( L_shl( gain_32, 1 ) );                                                                                   /*Q0*/
-#endif
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     tmp_16 = sub( shl_sat( gainCNG, sub( gainCNG_e, 5 /*Q5*/ ) ), ftmp ); /*Q0*/
-#else
-    tmp_16 = sub( shl( gainCNG, sub( gainCNG_e, 5 /*Q5*/ ) ), ftmp );
-#endif
     /*in case of overflow:*/
     test();
-#ifdef BASOP_NOGLOB
     if ( ( EQ_16( shl_sat( ftmp, sub( gainCNG_e, 1 ) ), MAXVAL_WORD16 ) ) && EQ_16( gainCNG, MAXVAL_WORD16 ) )
-#else
-    if ( ( EQ_16( shl( ftmp, sub( gainCNG_e, 1 ) ), MAXVAL_WORD16 ) ) && EQ_16( gainCNG, MAXVAL_WORD16 ) )
-#endif
     {
         tmp_16 = 1;
         move16();
@@ -670,24 +646,15 @@ void con_acelp_fx(
     /* non-causal ringing of the FIR filter   */
 
     /* gain_16 = gain_32 = gain_inov * gain */
-    gain_32 = Mpy_32_16_1( gain_32, gain_inov ); /* 15Q16 * Q15 * 2^s_gain_inov */
-#ifdef BASOP_NOGLOB
+    gain_32 = Mpy_32_16_1( gain_32, gain_inov );            /* 15Q16 * Q15 * 2^s_gain_inov */
     gain_32 = L_shl_sat( gain_32, add( 15, s_gain_inov ) ); /* Q31 */
     gain_16 = round_fx_sat( gain_32 );                      /* Q15 */
-#else
-    gain_32 = L_shl( gain_32, add( 15, s_gain_inov ) );                                                        /* Q31 */
-    gain_16 = round_fx( gain_32 );                                                                             /* Q15 */
-#endif
 
     /* step_32 = gain_inov * step */
     step_32 = Mpy_32_16_1( step_32, gain_inov );        /* 15Q16 * Q15 * 2^s_gain_inov */
     step_32 = L_shl( step_32, add( 15, s_gain_inov ) ); /* Q31 */
 
-#ifdef BASOP_NOGLOB
     g_e = norm_s( round_fx_sat( L_shl_sat( Mpy_32_16_1( st->Mode2_lp_gainc, gain_inov ), add( 15, s_gain_inov ) ) ) ); /* norm_s for gain*gain_inov at the end of the following loops */
-#else
-    g_e = norm_s( round_fx( L_shl( Mpy_32_16_1( st->Mode2_lp_gainc, gain_inov ), add( 15, s_gain_inov ) ) ) ); /* norm_s for gain*gain_inov at the end of the following loops */
-#endif
     g_e = s_min( norm_s( gain_16 ), g_e );
     gain_16 = shl( gain_16, g_e );   /*Q15 + g_e*/
     gain_32 = L_shl( gain_32, g_e ); /*Q31 + g_e*/
@@ -826,13 +793,8 @@ void con_acelp_fx(
             /* i_subfr / L_SUBFR */
             tmp_16 = shr( i_subfr, Q6 );
             g = mult_r( st->last_gain_syn_deemph, gain_lpc[tmp_16] ); /* Q15 - gain_lpc_e[tmp_16] */
-#ifdef BASOP_NOGLOB
             g_e = add_sat( st->last_gain_syn_deemph_e, gain_lpc_e[tmp_16] );
             g = shl_sat( g, g_e ); /* Q15 */
-#else
-            g_e = add( st->last_gain_syn_deemph_e, gain_lpc_e[tmp_16] );
-            g = shl( g, g_e );
-#endif
 
             FOR( i = 0; i < L_SUBFR; i++ )
             {
@@ -917,11 +879,7 @@ void con_acelp_fx(
         tmp_16 = shr( i_subfr, Q6 );
         g = mult_r( st->last_gain_syn_deemph, gain_lpc[tmp_16] ); /* Q15 - gain_lpc_e[tmp_16] */
         g_e = add( st->last_gain_syn_deemph_e, gain_lpc_e[tmp_16] );
-#ifdef BASOP_NOGLOB
         g = shl_sat( g, g_e ); /*Q15*/
-#else
-        g = shl( g, g_e );
-#endif
         FOR( i = 0; i < L_SUBFR; i++ )
         {
             /* exc[i_subfr + i] *= st->last_gain_syn_deemph*gain_lpc[j]; */
@@ -990,11 +948,7 @@ void con_acelp_fx(
     {
         FOR( i = 0; i < st->L_frame; i++ )
         {
-#ifdef BASOP_NOGLOB
             syn[i] = add_sat( syn[i], syn_unv[i] ); /*Qf_syn*/
-#else
-            syn[i] = add( syn[i], syn_unv[i] );
-#endif
             move16();
         }
     }
@@ -1048,11 +1002,7 @@ void con_acelp_fx(
     /*updating enr_old parameters*/
     frame_ener_fx( st->L_frame, st->last_good, syn, round_fx( tmp_tc ), &( st->enr_old_fx ), 1, 0, 0, 0 );
 
-#ifdef BASOP_NOGLOB
     st->enr_old_fx = L_shl_sat( st->enr_old_fx, shl( negate( Qf_syn ), 1 ) ); /*Q0*/
-#else
-    st->enr_old_fx = L_shl( st->enr_old_fx, shl( negate( Qf_syn ), 1 ) );
-#endif
     move32();
     /* update ACELP synthesis memory */
     Copy( mem_syn, st->mem_syn2_fx, M );                             /*Qf_syn*/
@@ -1187,11 +1137,7 @@ static void memsynPrecission_fx( Word16 nbLostCmpt, Word16 *mem_syn /*Qx*/, Word
         {
             /*saturation doesn't matter*/
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             tmp = add_sat( tmp, abs_s( mem_syn[i] ) );
-#else
-            tmp = add( tmp, abs_s( mem_syn[i] ) );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
         }
         /*if there is energy in scale_syn, then increase precision*/
diff --git a/lib_dec/er_dec_tcx.c b/lib_dec/er_dec_tcx.c
deleted file mode 100644
index 2d8fdd56a26863aa278c3049828685d97e31264f..0000000000000000000000000000000000000000
--- a/lib_dec/er_dec_tcx.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/er_dec_tcx_fx.c b/lib_dec/er_dec_tcx_fx.c
index 352c46ad63048ce8e6c30f33b38de9e964391e24..3d0eab8153845c06cda2e6562038b4da91a1b2c2 100644
--- a/lib_dec/er_dec_tcx_fx.c
+++ b/lib_dec/er_dec_tcx_fx.c
@@ -36,34 +36,18 @@ static void calcGainc_fx( Word16 *exc, Word16 Q_exc, Word32 old_fpitch /*Q16*/,
     tmp16 = round_fx( old_fpitch ); /*Q0*/
     tmp_loop = shl( L_subfr, 1 );
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     tmp16_2 = round_fx_o( L_shl_o( lp_gainp, 2, &Overflow ), &Overflow ); /*Q31->Q15, no severe saturation, because st->lp_gainp here is [0,1]*/
-#else
-    tmp16_2 = round_fx( L_shl( lp_gainp, 2 ) ); /*Q31->Q15, no severe saturation, because st->lp_gainp here is [0,1]*/
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
 
     FOR( i = 0; i < tmp_loop; i++ )
     {
         /*st->lp_gainc += ( exc[i-2*L_subfr] - st->Mode2_lp_gainp * exc[i-2*L_subfr-(int)(st->old_fpitch+0.5f)] ) *
                           ( exc[i-2*L_subfr] - st->Mode2_lp_gainp * exc[i-2*L_subfr-(int)(st->old_fpitch+0.5f)] );*/
-#ifdef BASOP_NOGLOB
         tmp16_3 = sub_o( exc[( i - ( L_subfr * 2 ) )] /*Q1*/, mult_r( tmp16_2 /*Q15*/, exc[( ( i - ( L_subfr * 2 ) ) - tmp16 )] /*Q1*/ ) /*Q1*/, &Overflow );
-#else
-        tmp16_3 = sub( exc[sub( i, shl( L_subfr, 1 ) )] /*Q1*/, mult_r( tmp16_2 /*Q15*/, exc[sub( sub( i, shl( L_subfr, 1 ) ), tmp16 )] /*Q1*/ ) /*Q1*/ );
-#endif
-#ifdef BASOP_NOGLOB
         L_acc = L_macNs_co( L_acc, tmp16_3, tmp16_3, &Carry, &Overflow ); /*Q3*/
-#else
-        L_acc = L_macNs( L_acc, tmp16_3, tmp16_3 );                                                                 /*Q3*/
-#endif
         Overflow = 0;
         move16();
-#ifdef BASOP_NOGLOB
         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Accumulate Carrys Q-1*/
-#else
-        L_c = L_macNs( L_c, 0, 0 );                                                                                 /*Accumulate Carrys*/
-#endif
         Carry = 0;
         move16();
     }
@@ -105,18 +89,10 @@ static void calcGainc2_fx( Word16 *exc, Word16 Q_exc, Word16 L_subfr /*Q0*/, Wor
     FOR( i = 0; i < cnt; i++ )
     {
         /* *gainc += ( exc[i-2*L_subfr] ) * ( exc[i-2*L_subfr]); */
-#ifdef BASOP_NOGLOB                                                                                                               /* Critical Carry/Overflow */
         L_acc = L_macNs_co( L_acc, exc[( i - ( L_subfr * 2 ) )] /*Q1*/, exc[( i - ( L_subfr * 2 ) )] /*Q1*/, &Carry, &Overflow ); /*Q3*/
-#else
-        L_acc = L_macNs( L_acc, exc[sub( i, shl( L_subfr, 1 ) )] /*Q1*/, exc[sub( i, shl( L_subfr, 1 ) )] /*Q1*/ ); /*Q3*/
-#endif
         Overflow = 0;
         move16();
-#ifdef BASOP_NOGLOB                                       /* Critical Carry/Overflow */
         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /* Accumulate Carrys Q-1*/
-#else
-        L_c = L_macNs( L_c, 0, 0 );                                                                                 /* Accumulate Carrys */
-#endif
         Carry = 0;
         move16();
     }
@@ -145,17 +121,6 @@ con_tcx
 void con_tcx_fx(
     Decoder_State *st, /* i/o: coder memory state            */
     Word16 synth[]     /* i/o:   synth[]                     Q0*/
-#ifdef IVAS_CODE_CON_TCX
-    ,
-    const Word16 coh,      /* i  : coherence of stereo signal  Q14*/
-    Word16 *noise_seed,    /* i/o: noise seed for stereo       Q0*/
-    const Word16 only_left /* i  : TD-PLC only in left channel Q0*/
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    ,
-    const float *A_cng /* i  : CNG LP filter coefficients  Q14*/
-#endif
-#endif
-
 )
 {
     Word16 i, s, c, L_frame, L_subfr, fLowPassFilter, T0;
@@ -401,7 +366,6 @@ void con_tcx_fx(
             {
                 FOR( i = 0; i < Tc; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     *pt_exc++ = mac_r_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat(
                                                                                                                                        L_mult( 174 /* 0.0053f Q15*/, pt1_exc[-5] ),
                                                                                                                                        0 /* 0.0000f Q15*/, pt1_exc[-4] ),
@@ -414,20 +378,6 @@ void con_tcx_fx(
                                                                  -1442 /*-0.0440f Q15*/, pt1_exc[3] ),
                                                       0 /* 0.0000f Q15*/, pt1_exc[4] ),
                                            174 /* 0.0053f Q15*/, pt1_exc[5] ); /*Q_exc*/
-#else
-                    *pt_exc++ = mac_r( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac(
-                                                                                                   L_mult( 174 /* 0.0053f Q15*/, pt1_exc[-5] ),
-                                                                                                   0 /* 0.0000f Q15*/, pt1_exc[-4] ),
-                                                                                               -1442 /*-0.0440f Q15*/, pt1_exc[-3] ),
-                                                                                        0 /* 0.0000f Q15*/, pt1_exc[-2] ),
-                                                                                 8641 /* 0.2637f Q15*/, pt1_exc[-1] ),
-                                                                          18022 /* 0.5500f Q15*/, pt1_exc[0] ),
-                                                                   8641 /* 0.2637f Q15*/, pt1_exc[1] ),
-                                                            0 /* 0.0000f Q15*/, pt1_exc[2] ),
-                                                     -1442 /*-0.0440f Q15*/, pt1_exc[3] ),
-                                              0 /* 0.0000f Q15*/, pt1_exc[4] ),
-                                       174 /* 0.0053f Q15*/, pt1_exc[5] );
-#endif
                     move16();
                     pt1_exc++;
                 }
@@ -436,7 +386,6 @@ void con_tcx_fx(
             {
                 FOR( i = 0; i < Tc; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     *pt_exc++ = mac_r_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat( L_mac_sat(
                                                                                                                                        L_mult( -174 /*-0.0053f Q15*/, pt1_exc[-5] ),
                                                                                                                                        -121 /*-0.0037f Q15*/, pt1_exc[-4] ),
@@ -449,20 +398,6 @@ void con_tcx_fx(
                                                                  -459 /*-0.0140f Q15*/, pt1_exc[3] ),
                                                       -121 /*-0.0037f Q15*/, pt1_exc[4] ),
                                            -174 /*-0.0053f Q15*/, pt1_exc[5] ); /*Q_exc*/
-#else
-                    *pt_exc++ = mac_r( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac( L_mac(
-                                                                                                   L_mult( -174 /*-0.0053f Q15*/, pt1_exc[-5] ),
-                                                                                                   -121 /*-0.0037f Q15*/, pt1_exc[-4] ),
-                                                                                               -459 /*-0.0140f Q15*/, pt1_exc[-3] ),
-                                                                                        590 /* 0.0180f Q15*/, pt1_exc[-2] ),
-                                                                                 8743 /* 0.2668f Q15*/, pt1_exc[-1] ),
-                                                                          16355 /* 0.4991f Q15*/, pt1_exc[0] ),
-                                                                   8743 /* 0.2668f Q15*/, pt1_exc[1] ),
-                                                            590 /* 0.0180f Q15*/, pt1_exc[2] ),
-                                                     -459 /*-0.0140f Q15*/, pt1_exc[3] ),
-                                              -121 /*-0.0037f Q15*/, pt1_exc[4] ),
-                                       -174 /*-0.0053f Q15*/, pt1_exc[5] );
-#endif
                     move16();
                     pt1_exc++;
                 }
@@ -543,19 +478,7 @@ void con_tcx_fx(
         move16();
 
         /* PLC: calculate damping factor */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        alpha = 1.0f;
-        if ( st->element_mode == IVAS_CPE_MDCT && st->nbLostCmpt >= MDCT_ST_PLC_FADEOUT_START_FRAME )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_START_FRAME, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-        else if ( st->element_mode != IVAS_CPE_MDCT )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-#else
         alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac_fx, &( st->Mode2_lp_gainp ), 0 ); /*Q14*/
-#endif
         IF( EQ_16( st->nbLostCmpt, 1 ) )
         {
             st->cummulative_damping = 32767 /*1.f Q15*/;
@@ -563,11 +486,7 @@ void con_tcx_fx(
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             st->cummulative_damping = shl_sat( mult_r_sat( st->cummulative_damping /*Q15*/, alpha /*Q14*/ ), 1 ) /*Q15*/;
-#else
-            st->cummulative_damping = shl( mult_r( st->cummulative_damping /*Q15*/, alpha /*Q14*/ ), 1 ) /*Q15*/;
-#endif
             move16();
         }
 
@@ -595,15 +514,9 @@ void con_tcx_fx(
         tmp_loop = shr( imult1616( L_frame, 3 ), 1 );
         FOR( i = offset; i < tmp_loop; i++ )
         {
-#ifdef BASOP_NOGLOB
             exc[i] = mult_r( exc[i], round_fx_sat( gain32 ) ) /*Q1*/;
             move16();
             gain32 = L_sub_sat( gain32, step32 ); /*Q31*/
-#else
-            exc[i] = mult_r( exc[i], round_fx( gain32 ) ) /*Q1*/;
-            move16();
-            gain32 = L_sub( gain32, step32 );
-#endif
         }
 
         /* update old exc without random part */
@@ -630,63 +543,15 @@ void con_tcx_fx(
         {
             calcGainc2_fx( &exc[0], Q_exc, L_subfr, &( st->Mode2_lp_gainc ) );
         }
-        set32_fx( pitch_buf, L_deposit_h( L_SUBFR ), st->nb_subfr ); /*Q16*/
-                                                                     /* PLC: calculate damping factor */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        alpha = 1.0f;
-        if ( st->element_mode == IVAS_CPE_MDCT && st->nbLostCmpt >= MDCT_ST_PLC_FADEOUT_START_FRAME )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_START_FRAME, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-        else if ( st->element_mode != IVAS_CPE_MDCT )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-#else
+        set32_fx( pitch_buf, L_deposit_h( L_SUBFR ), st->nb_subfr );                                                              /*Q16*/
+                                                                                                                                  /* PLC: calculate damping factor */
         alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac_fx, &( st->Mode2_lp_gainp ), 0 ); /*Q14*/
-#endif
     }
 
     /*-----------------------------------------------------------------*
      * Construct the random part of excitation
      *-----------------------------------------------------------------*/
-#ifdef IVAS_CODE_CON_TCX
-    if ( coh != -1.f )
-    {
-        int16_t tmpSeed1;
-        float alpha_coh;
-        float random1, random2;
-
-        tmpSeed1 = *noise_seed;
-        noise = buf;
 
-        alpha_coh = sqrtf( ( 1 - coh ) / ( 1 + coh ) );
-        if ( st->idchan == 1 )
-        {
-            alpha_coh = -alpha_coh;
-        }
-
-        for ( i = 0; i < L_frame + L_FIR_FER2 - 1; i++ )
-        {
-            random1 = (float) own_random( &tmpSeed1 );
-            random2 = (float) own_random( &tmpSeed1 );
-            noise[i] = random1 + alpha_coh * random2;
-        }
-
-        if ( st->idchan == 1 || only_left )
-        {
-            *noise_seed = tmpSeed1;
-        }
-
-        for ( ; i < L_frame + ( L_frame / 2 ) + 2 * L_FIR_FER2; i++ )
-        {
-            random1 = (float) own_random( &tmpSeed1 );
-            random2 = (float) own_random( &tmpSeed1 );
-            noise[i] = random1 + alpha_coh * random2;
-        }
-    }
-    else
-#endif /*IVAS_CODE_CON_TCX*/
     {
         tmpSeed = st->seed_acelp;
         move16();
@@ -771,20 +636,9 @@ void con_tcx_fx(
     }
 
     /* PLC: [TCX: Fade-out] retrieve background level */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    if ( A_cng != NULL )
-    {
-        gainSynthDeemph = getLevelSynDeemph_fx( &( tmp ), A_cng, L_frame / 4, st->preemph_fac, 1 ) / 4.f;
-    }
-    else
-    {
-        gainSynthDeemph = getLevelSynDeemph_fx( &( tmp ), A_local, L_frame / 4, st->preemph_fac, 1 );
-    }
-#else
     tmp16 = 32767;
     move16();
     gainSynthDeemph = getLevelSynDeemph_fx( &( tmp16 ), A_local, M, shr( L_frame, 2 ), st->preemph_fac, 1, &gainSynthDeemph_e ); /*Q5*/
-#endif
     IF( st->tcxonly != 0 )
     {
         /* gainCNG = st->conCngLevelBackgroundTrace/gainSynthDeemph; */
@@ -792,19 +646,6 @@ void con_tcx_fx(
                                    hTcxDec->conCngLevelBackgroundTrace_e,
                                    gainSynthDeemph, gainSynthDeemph_e,
                                    &gainCNG, &gainCNG_e );
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        if ( st->element_mode == IVAS_CPE_MDCT && A_cng != NULL )
-        {
-            if ( st->nbLostCmpt > MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME + MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN )
-            {
-                gainCNG = 0.f;
-            }
-            else if ( st->nbLostCmpt > MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME )
-            {
-                gainCNG *= 1.f - (float) ( st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME ) / MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN;
-            }
-        }
-#endif
     }
     ELSE
     {
@@ -821,11 +662,7 @@ void con_tcx_fx(
     {
         gain32 = Mpy_32_16_1( gain32, 22938 /*0.7f Q15*/ ); /*Q16*/
     }
-#ifdef BASOP_NOGLOB                 /* Critical Overflow */
     L_tmp = L_shl_sat( gain32, 1 ); /*Q16*/
-#else
-    L_tmp = L_shl( gain32, 1 );
-#endif
     IF( GT_32( L_shl( L_deposit_h( gainCNG ), sub( gainCNG_e, 31 - 16 ) /*Q16*/ ), L_tmp ) )
     {
         gainCNG_e = sub( 15 + 1, norm_l( L_tmp ) );
@@ -872,11 +709,7 @@ void con_tcx_fx(
         tmp_e = norm_l( L_tmp );
         L_tmp = L_shl( L_tmp, tmp_e );
         gain_inov_e = add( sub( gain_inov_e, tmp_e ), 31 - 29 ); /*->Q31*/
-#ifdef BASOP_NOGLOB                                              /* Critical Overflow */
         gain_inov = round_fx_sat( L_tmp );                       /*Q15,gain_inov_e*/
-#else
-        gain_inov = round_fx( L_tmp );                                                           /*Q15,gain_inov_e*/
-#endif
     }
 
     st->Mode2_lp_gainp = L_shr( L_deposit_h( alpha /*Q14*/ ) /*Q14+16*/, 1 ); /*Q29*/
@@ -925,13 +758,8 @@ void con_tcx_fx(
         tmp16 = add( L_frame, shr( L_frame, 1 ) );
         FOR( i = 0; i < tmp16; i++ )
         {
-#ifdef BASOP_NOGLOB
             exc[i] = add_sat( exc[i], shl_sat( noise[i + ( L_FIR_FER2 / 2 )], add( Q_exc, noise_e ) ) ); /*Q1*/
             move16();
-#else
-            exc[i] = add( exc[i], shl( noise[i + ( L_FIR_FER2 / 2 )], add( Q_exc, noise_e ) ) ); /*Q1*/
-            move16();
-#endif
         }
     }
     ELSE
@@ -978,44 +806,12 @@ void con_tcx_fx(
 
     Copy_Scale_sig( buf, mem_syn, M, exp_scale ); /*Q: tmp16*/
 
-#ifdef BASOP_NOGLOB
     tmp_deemph = shl_sat( tmp_deemph, Q_syn ); /*Q_syn*/
-#else
-    tmp_deemph = shl( tmp_deemph, Q_syn );
-#endif
     st->Q_syn = Q_syn;
     move16();
 
     /*buf[OLD_EXC_SIZE_DEC;3/2 L_frame] Q1: exc*/
     /*buf[0;M] Q0: mem_syn*/
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    if ( A_cng != NULL )
-    {
-        float alpha_delayed;
-
-        alpha_delayed = 1.0f;
-        if ( st->nbLostCmpt > MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE )
-        {
-            alpha_delayed = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE, st->last_good, st->stab_fac, &( st->lp_gainp ), ACELP_CORE );
-        }
-
-        if ( st->plcBackgroundNoiseUpdated && alpha_delayed != 1.0f )
-        {
-            float lsp_local[M], lsp_fade[M], alpha_inv;
-
-            alpha_inv = 1.0f - alpha_delayed;
-
-            a2lsp_stab( A_local, lsp_local, lsp_local );
-
-            for ( i = 0; i < M; i++ )
-            {
-                lsp_fade[i] = alpha_delayed * lsp_local[i] + alpha_inv * st->lspold_cng[i];
-            }
-
-            lsp2a_stab( lsp_fade, A_local, M );
-        }
-    }
-#endif
     E_UTIL_synthesis(
         sub( Q_exc, Q_syn ),
         A_local,
@@ -1080,11 +876,7 @@ void con_tcx_fx(
         lerp( syn, st->hWIDec->old_syn2_fx, L_EXC_MEM, L_frame );
     }
 
-#ifdef BASOP_NOGLOB
     st->bfi_pitch_fx /*Q6*/ = round_fx_sat( L_shl_sat( pitch_buf[( st->nb_subfr - 1 )] /*15Q16*/, 6 /*Q6*/ ) );
-#else
-    st->bfi_pitch_fx /*Q6*/ = round_fx( L_shl( pitch_buf[sub( st->nb_subfr, 1 )] /*15Q16*/, 6 /*Q6*/ ) );
-#endif
     move16();
     st->bfi_pitch_frame = st->L_frame;
     move16();
@@ -1108,21 +900,13 @@ void con_tcx_fx(
 
     FOR( i = 0; i < W2; i++ )
     {
-#ifdef BASOP_NOGLOB
         hTcxDec->syn_Overl_TDACFB[i] = add_sat( buf[i], buf[( ( W1 - 1 ) - i )] ); /*hTcxDec->Q_syn_Overl_TDACFB*/
-#else
-        hTcxDec->syn_Overl_TDACFB[i] = add( buf[i], buf[sub( sub( W1, 1 ), i )] );
-#endif
         move16();
     }
 
     FOR( i = 0; i < W2; i++ )
     {
-#ifdef BASOP_NOGLOB
         hTcxDec->syn_Overl_TDACFB[( W2 + i )] = add_sat( buf[( W2 + i )], buf[( ( ( W1 - 1 ) - W2 ) - i )] ); /*hTcxDec->Q_syn_Overl_TDACFB*/
-#else
-        hTcxDec->syn_Overl_TDACFB[add( W2, i )] = add( buf[add( W2, i )], buf[sub( sub( sub( W1, 1 ), W2 ), i )] );
-#endif
         move16();
     }
 
@@ -1261,7 +1045,7 @@ void con_tcx_ivas_fx(
         /* apply pre-emphasis to the signal */
         mem = synth[( -( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + M + M ) - 1 )]; /*Q0*/
         move16();
-        Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), 2 * M )] ), st->preemph_fac, add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), &mem, 1 );
+        Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + 2 * M )] ), st->preemph_fac, add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), &mem, 1 );
         st->Mode2_lp_gainc = L_deposit_l( 0 );
 
         st->Mode2_lp_gainp = get_gain2( synth - shl( L_subfr, 1 ), synth - add( shl( L_subfr, 1 ), Tc ), shl( L_subfr, 1 ) );
@@ -1527,19 +1311,7 @@ void con_tcx_ivas_fx(
         move16();
 
         /* PLC: calculate damping factor */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        alpha = 1.0f;
-        if ( st->element_mode == IVAS_CPE_MDCT && st->nbLostCmpt >= MDCT_ST_PLC_FADEOUT_START_FRAME )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_START_FRAME, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-        else if ( st->element_mode != IVAS_CPE_MDCT )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-#else
         alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac_fx, &( st->Mode2_lp_gainp ), 0 ); /*Q14*/
-#endif
         IF( EQ_16( st->nbLostCmpt, 1 ) )
         {
             st->cummulative_damping = 32767 /*1.f Q15*/;
@@ -1547,11 +1319,7 @@ void con_tcx_ivas_fx(
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             st->cummulative_damping = shl_sat( mult_r_sat( st->cummulative_damping /*Q15*/, alpha /*Q14*/ ), 1 ) /*Q15*/;
-#else
-            st->cummulative_damping = shl( mult_r( st->cummulative_damping /*Q15*/, alpha /*Q14*/ ), 1 ) /*Q15*/;
-#endif
             move16();
         }
 
@@ -1579,15 +1347,9 @@ void con_tcx_ivas_fx(
         tmp_loop = shr( imult1616( L_frame, 3 ), 1 );
         FOR( i = offset; i < tmp_loop; i++ )
         {
-#ifdef BASOP_NOGLOB
             exc[i] = mult_r( exc[i], round_fx_sat( gain32 ) ) /*Q1*/;
             move16();
             gain32 = L_sub_sat( gain32, step32 ); /*Q31*/
-#else
-            exc[i] = mult_r( exc[i], round_fx( gain32 ) ) /*Q1*/;
-            move16();
-            gain32 = L_sub( gain32, step32 );
-#endif
         }
 
         /* update old exc without random part */
@@ -1614,27 +1376,15 @@ void con_tcx_ivas_fx(
         {
             calcGainc2_fx( &exc[0], Q_exc, L_subfr, &( st->Mode2_lp_gainc ) );
         }
-        set32_fx( pitch_buf, L_deposit_h( L_SUBFR ), st->nb_subfr ); /*Q16*/
-                                                                     /* PLC: calculate damping factor */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        alpha = 1.0f;
-        if ( st->element_mode == IVAS_CPE_MDCT && st->nbLostCmpt >= MDCT_ST_PLC_FADEOUT_START_FRAME )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_START_FRAME, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-        else if ( st->element_mode != IVAS_CPE_MDCT )
-        {
-            alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac, &( st->lp_gainp ), 0 );
-        }
-#else
+        set32_fx( pitch_buf, L_deposit_h( L_SUBFR ), st->nb_subfr );                                                              /*Q16*/
+                                                                                                                                  /* PLC: calculate damping factor */
         alpha = Damping_fact_fx( st->core_ext_mode, st->nbLostCmpt, st->last_good, st->stab_fac_fx, &( st->Mode2_lp_gainp ), 0 ); /*Q14*/
-#endif
     }
 
     /*-----------------------------------------------------------------*
      * Construct the random part of excitation
      *-----------------------------------------------------------------*/
-#ifndef IVAS_CODE_CON_TCX
+
     IF( NE_16( coh, -16384 ) )
     {
         Word16 tmpSeed1;
@@ -1684,7 +1434,6 @@ void con_tcx_ivas_fx(
         }
     }
     ELSE
-#endif /*IVAS_CODE_CON_TCX*/
     {
         tmpSeed = st->seed_acelp; /*Q0*/
         move16();
@@ -1769,7 +1518,6 @@ void con_tcx_ivas_fx(
     }
 
     /* PLC: [TCX: Fade-out] retrieve background level */
-#ifndef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
     tmp16 = 32767;
     move16();
     IF( A_cng != NULL )
@@ -1780,11 +1528,6 @@ void con_tcx_ivas_fx(
     {
         gainSynthDeemph = getLevelSynDeemph_fx( &( tmp16 ), A_local, M, shr( L_frame, 2 ), st->preemph_fac, 1, &gainSynthDeemph_e ); /*Q13*/
     }
-#else
-    tmp16 = 32767;
-    move16();
-    gainSynthDeemph = getLevelSynDeemph_fx( &( tmp16 ), A_local, M, shr( L_frame, 2 ), st->preemph_fac, 1, &gainSynthDeemph_e );
-#endif
     IF( st->tcxonly != 0 )
     {
         /* gainCNG = st->conCngLevelBackgroundTrace/gainSynthDeemph; */
@@ -1792,7 +1535,6 @@ void con_tcx_ivas_fx(
                                    hTcxDec->conCngLevelBackgroundTrace_e,
                                    gainSynthDeemph, gainSynthDeemph_e,
                                    &gainCNG, &gainCNG_e );
-#ifndef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
         test();
         IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && A_cng != NULL )
         {
@@ -1808,7 +1550,6 @@ void con_tcx_ivas_fx(
                 gainCNG = extract_l( Mpy_32_32( gainCNG, L_tmp ) );                                                                                                             /*Q15-gainCNG_e*/
             }
         }
-#endif
     }
     ELSE
     {
@@ -1930,13 +1671,8 @@ void con_tcx_ivas_fx(
         tmp16 = add( L_frame, shr( L_frame, 1 ) );
         FOR( i = 0; i < tmp16; i++ )
         {
-#ifdef BASOP_NOGLOB
             exc[i] = add_sat( exc[i], shl_sat( noise[i + ( L_FIR_FER2 / 2 )], add( Q_exc, noise_e ) ) ); /*Q1*/
             move16();
-#else
-            exc[i] = add( exc[i], shl( noise[i + ( L_FIR_FER2 / 2 )], add( Q_exc, noise_e ) ) ); /*Q1*/
-            move16();
-#endif
         }
     }
     ELSE
@@ -1984,17 +1720,12 @@ void con_tcx_ivas_fx(
 
     Copy_Scale_sig( buf, mem_syn, M, exp_scale ); /* Q: tmp16 */
 
-#ifdef BASOP_NOGLOB
     tmp_deemph = shl_sat( tmp_deemph, Q_syn );
-#else
-    tmp_deemph = shl( tmp_deemph, Q_syn );
-#endif
     st->Q_syn = Q_syn;
     move16();
 
     /*buf[OLD_EXC_SIZE_DEC;3/2 L_frame] Q1: exc*/
     /*buf[0;M] Q0: mem_syn*/
-#ifndef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
     IF( A_cng != NULL )
     {
         Word16 alpha_delayed;
@@ -2026,7 +1757,6 @@ void con_tcx_ivas_fx(
             E_LPC_f_lsp_a_conversion( lsp_fade, A_local, M );
         }
     }
-#endif
 
     E_UTIL_synthesis(
         sub( Q_exc, Q_syn ),
@@ -2092,11 +1822,7 @@ void con_tcx_ivas_fx(
         lerp( syn, st->hWIDec->old_syn2_fx, L_EXC_MEM, L_frame );
     }
 
-#ifdef BASOP_NOGLOB
     st->bfi_pitch_fx /*Q6*/ = round_fx_sat( L_shl_sat( pitch_buf[sub( st->nb_subfr, 1 )] /*15Q16*/, 6 /*Q6*/ ) );
-#else
-    st->bfi_pitch_fx /*Q6*/ = round_fx( L_shl( pitch_buf[sub( st->nb_subfr, 1 )] /*15Q16*/, 6 /*Q6*/ ) );
-#endif
     move16();
     st->bfi_pitch_frame = st->L_frame;
     move16();
@@ -2152,6 +1878,7 @@ void con_tcx_ivas_fx(
     st->Q_syn = Q_syn;
     move16();
     Scale_sig( hTcxDec->old_syn_Overl, shr( st->L_frame, 1 ), sub( -1, Q_syn ) ); /*Q_syn*/
+    st->hTcxDec->Q_old_syn_Overl = -1;
     lerp( hTcxDec->syn_OverlFB, hTcxDec->syn_Overl, shr( st->L_frame, 1 ), shr( L_frame, 1 ) );
     lerp( hTcxDec->syn_Overl_TDACFB, hTcxDec->syn_Overl_TDAC, shr( st->L_frame, 1 ), shr( L_frame, 1 ) );
     hTcxDec->Q_syn_Overl_TDAC = hTcxDec->Q_syn_Overl_TDACFB;
diff --git a/lib_dec/er_scale_syn.c b/lib_dec/er_scale_syn.c
deleted file mode 100644
index a45d9a0bdf5a0577866c41abe0db7147f5179e46..0000000000000000000000000000000000000000
--- a/lib_dec/er_scale_syn.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "wmc_auto.h"
-
-
-/*----------------------------------------------------------------------------------*
- * Damping_fact_flt()
- *
- *  Estimate damping factor
- *----------------------------------------------------------------------------------*/
diff --git a/lib_dec/er_scale_syn_fx.c b/lib_dec/er_scale_syn_fx.c
index 6061ac0992ffde683144b2a39520f16980ee3147..35ad826486d758fbbaa190df3afa1374320fc238 100644
--- a/lib_dec/er_scale_syn_fx.c
+++ b/lib_dec/er_scale_syn_fx.c
@@ -97,14 +97,10 @@ Word16 Damping_fact_fx( /* o : damping factor
                 move16();
                 gain32 = Sqrt32( lp_tmp, &s_gainp ); /*Q31-s_gainp*/
 
-#ifdef BASOP_NOGLOB
                 gain = round_fx_o( L_shl_o( gain32, s_gainp, &Overflow ), &Overflow ); /* Q15*/
-#else
-                gain = round_fx( L_shl( gain32, s_gainp ) ); /* Q15*/
-#endif
-                gain = s_min( gain, 32113 /*0.98f Q15*/ ); /*Q15*/
-                gain = s_max( gain, 27853 /*0.85f Q15*/ ); /*Q15*/
-                alpha = mult_r( alpha, gain );             /*Q14*/
+                gain = s_min( gain, 32113 /*0.98f Q15*/ );                             /*Q15*/
+                gain = s_max( gain, 27853 /*0.85f Q15*/ );                             /*Q15*/
+                alpha = mult_r( alpha, gain );                                         /*Q14*/
             }
             ELSE IF( EQ_16( nbLostCmpt, 2 ) )
             {
diff --git a/lib_dec/er_sync_exc.c b/lib_dec/er_sync_exc.c
deleted file mode 100644
index 8b2b54876ffbc5c1d7401614037c840599902f59..0000000000000000000000000000000000000000
--- a/lib_dec/er_sync_exc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/er_sync_exc_fx.c b/lib_dec/er_sync_exc_fx.c
index 19ae2edcccf2d48656a9fd4354652ef664519607..48be80d43cecd12d70b57d6f2d4d8a47c93cbe3a 100644
--- a/lib_dec/er_sync_exc_fx.c
+++ b/lib_dec/er_sync_exc_fx.c
@@ -52,28 +52,16 @@ static Word16 GetMinimumPosition_fx(
         move16();
         FOR( i = 0; i < cnt; i++ )
         {
-            tmp16 = shr( x[i], tmp_e ); /*Qx*/
-#ifdef BASOP_NOGLOB
+            tmp16 = shr( x[i], tmp_e );                     /*Qx*/
             energy = L_msu_sat( energy_old, tmp16, tmp16 ); /*2Qx+1*/
-#else
-            energy = L_msu( energy_old, tmp16, tmp16 );
-#endif
-            tmp16 = shr( x[( i + filterLength )], tmp_e ); /*Qx*/
-            BASOP_SATURATE_WARNING_OFF_EVS                 /*Saturation will be handled*/
-#ifdef BASOP_NOGLOB
+            tmp16 = shr( x[( i + filterLength )], tmp_e );  /*Qx*/
+            BASOP_SATURATE_WARNING_OFF_EVS                  /*Saturation will be handled*/
                 energy = L_mac_sat( energy, tmp16, tmp16 ); /*2Qx+1*/
-#else
-                energy = L_mac( energy, tmp16, tmp16 );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
 
             /*if (energy == MAXVAL_WORD32)*/
-            BASOP_SATURATE_WARNING_OFF_EVS /*saturates if energy < 0*/
-#ifdef BASOP_NOGLOB
+            BASOP_SATURATE_WARNING_OFF_EVS                             /*saturates if energy < 0*/
                 tmptest = L_sub_o( energy, MAXVAL_WORD32, &Overflow ); /*Q31*/
-#else
-                tmptest = L_sub( energy, MAXVAL_WORD32 );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             IF( tmptest == 0 )
             {
@@ -307,11 +295,7 @@ void PulseResynchronization_fx(
     tmp3_e = tmp2_e;
     move16();
     tmp32_a = L_negate( tmp32_a );
-#ifdef BASOP_NOGLOB
     tmp32_a = L_add( L_shl_o( 1, sub( 31, tmp3_e ), &Overflow ), tmp32_a ); /*Q31,tmp3_e*/ /*tmp32_a= 1.0f-pitchStart*freqStart*/
-#else
-    tmp32_a = L_add( L_shl( 1, sub( 31, tmp3_e ) ), tmp32_a ); /*Q31,tmp3_e*/ /*tmp32_a= 1.0f-pitchStart*freqStart*/
-#endif
     tmp2_e = norm_s( nFrameLength );
     tmp16_a = shl( nFrameLength, tmp2_e );                                                         /*Q0+tmp2_e*/
     tmp32_a = Mpy_32_16_1( tmp32_a /*Q31,tmp3_e*/, tmp16_a /*Q0,-tmp2_e*/ ); /*Q16,tmp3_e-tmp2_e*/ /*tmp32_a= nFrameLength*(1.0f-pitchStart*freqStart)*/
@@ -376,12 +360,8 @@ void PulseResynchronization_fx(
         fractionalLeft = lshr( extract_l( tmp32_a ), 1 ); /*Q15*/
         tmp_e = sub( 15, norm_l( tmp32 ) );
         cycleDelta_e = add( cycleDelta_e, tmp_e );
-        tmp32 = L_shr( tmp32, sub( tmp_e, 15 ) ); /*Q31 frac, cycleDelta_e*/
-#ifdef BASOP_NOGLOB
+        tmp32 = L_shr( tmp32, sub( tmp_e, 15 ) );    /*Q31 frac, cycleDelta_e*/
         cycleDelta = round_fx_o( tmp32, &Overflow ); /*Q15, cycleDelta_e*/
-#else
-        cycleDelta = round_fx( tmp32 );                                       /*Q15, cycleDelta_e*/
-#endif
         if ( cycleDelta == 0 )
         {
             cycleDelta_e = 0;
diff --git a/lib_dec/er_util.c b/lib_dec/er_util.c
deleted file mode 100644
index 88c1af13fe655e9dd67bcd92af230f8c869c8bbc..0000000000000000000000000000000000000000
--- a/lib_dec/er_util.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "stat_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/er_util_fx.c b/lib_dec/er_util_fx.c
index 7452e9bf69e7c92528e70eaec8adf7f46574d194..cecbad2943bb83dc1528388e365cec92fa40c75e 100644
--- a/lib_dec/er_util_fx.c
+++ b/lib_dec/er_util_fx.c
@@ -53,11 +53,7 @@ void minimumStatistics_fx(
 
 
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     IF( LT_16( shl_o( currentFrameLevel, currentFrameLevel_e, &Overflow ), PLC_MIN_CNG_LEV ) )
-#else
-    IF( LT_16( shl( currentFrameLevel, currentFrameLevel_e ), PLC_MIN_CNG_LEV ) )
-#endif
     {
         BASOP_SATURATE_WARNING_ON_EVS
         currentFrameLevel = PLC_MIN_CNG_LEV; /*Q15*/
@@ -271,11 +267,7 @@ Word16 getLevelSynDeemph_fx( /*10Q5*/
     *Exp = sub( 10, s16 );                         /*Set exponent in order to transform returnvalue to Q15*/
     move16();
 
-#ifdef BASOP_NOGLOB
     return round_fx_sat( levelSynDeemph ); /*Q15*/
-#else
-    return round_fx( levelSynDeemph ); /*Q15*/
-#endif
 }
 
 /* BASOP version: up to date with rev 7422 */
@@ -447,8 +439,6 @@ Word16 GetPLCModeDecision_ivas_fx(
                 test();
                 test();
                 test();
-                // PMT("handle to tonalMDCTconceal is missing")
-                //#ifdef ADD_IVAS_HTONALMDCTCONC
                 IF( ( st->hTonalMDCTConc != NULL && EQ_16( st->last_core, TCX_20_CORE ) ) && ( EQ_16( st->second_last_core, TCX_20_CORE ) ) && ( ( LE_32( st->old_fpitch, L_deposit_h( shr( st->L_frame, 1 ) ) ) ) || ( LE_16( hTcxDec->tcxltp_last_gain_unmodified, 13107 /*0.4f Q15*/ ) ) )
                     /* it is fine to call the detection even if no ltp information
                        is available, meaning that st->old_fpitch ==
@@ -462,12 +452,8 @@ Word16 GetPLCModeDecision_ivas_fx(
                     {
                         pitch = L_add( st->old_fpitch, 0 ); /*Q16*/
                     }
-                    // TonalMDCTConceal_Detect_ivas_fx(&st->tonalMDCTconceal, pitch,  &numIndices
-                    //     , (st->element_mode == IVAS_CPE_MDCT ? &(st->hTcxCfg->psychParamsTCX20) : st->hTcxCfg->psychParamsCurrent)
-                    //);
 
-                    TonalMDCTConceal_Detect_ivas_fx( st->hTonalMDCTConc, pitch, &numIndices, ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ),
-                                                     st->element_mode );
+                    TonalMDCTConceal_Detect_ivas_fx( st->hTonalMDCTConc, pitch, &numIndices, ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ), st->element_mode );
 
                     test();
                     test();
@@ -562,6 +548,7 @@ Word16 GetPLCModeDecision_fx(
             core = st->last_core_bfi;
             move16();
         }
+
         IF( EQ_16( st->nbLostCmpt, 1 ) )
         {
             st->tonal_mdct_plc_active = 0;
@@ -577,9 +564,7 @@ Word16 GetPLCModeDecision_fx(
                 test();
                 test();
                 test();
-                // PMT("handle to tonalMDCTconceal is missing")
-                //#ifdef ADD_IVAS_HTONALMDCTCONC
-                IF( ( /*st->ADD_IVAS_HTONALMDCTCONC != NULL &&*/ EQ_16( st->last_core, TCX_20_CORE ) ) && ( EQ_16( st->second_last_core, TCX_20_CORE ) ) && ( ( LE_32( st->old_fpitch, L_deposit_h( shr( st->L_frame, 1 ) ) ) ) || ( LE_16( hTcxDec->tcxltp_last_gain_unmodified, 13107 /*0.4f Q15*/ ) ) )
+                IF( ( st->hTonalMDCTConc != NULL && EQ_16( st->last_core, TCX_20_CORE ) ) && ( EQ_16( st->second_last_core, TCX_20_CORE ) ) && ( ( LE_32( st->old_fpitch, L_deposit_h( shr( st->L_frame, 1 ) ) ) ) || ( LE_16( hTcxDec->tcxltp_last_gain_unmodified, 13107 /*0.4f Q15*/ ) ) )
                     /* it is fine to call the detection even if no ltp information
                        is available, meaning that st->old_fpitch ==
                        st->tcxltp_second_last_pitch == st->L_frame */
@@ -593,24 +578,8 @@ Word16 GetPLCModeDecision_fx(
                     {
                         pitch = L_add( st->old_fpitch, 0 ); /*Q16*/
                     }
-                    IF( st->element_mode == EVS_MONO )
-                    {
-                        TonalMDCTConceal_Detect( &st->tonalMDCTconceal, pitch, &numIndices, st->element_mode
-#ifdef ADD_IVAS_HTONALMDCTCONC
-                                                 ,
-                                                 ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent )
-#endif
-                        );
-                    }
-                    ELSE
-                    {
-                        TonalMDCTConceal_Detect( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode
-#ifdef ADD_IVAS_HTONALMDCTCONC
-                                                 ,
-                                                 ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent )
-#endif
-                        );
-                    }
+
+                    TonalMDCTConceal_Detect( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );
 
                     test();
                     test();
diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_dec/evs_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c
index 5e027e6526be1198ea66f6415065115823a4768f..9c81fddf347529f42c78a49bbaae321ffc589306 100644
--- a/lib_dec/evs_dec_fx.c
+++ b/lib_dec/evs_dec_fx.c
@@ -16,9 +16,9 @@
  *--------------------------------------------------------------------------*/
 
 ivas_error evs_dec_fx(
-    Decoder_State *st_fx,  /* i/o  : Decoder state structure  */
-    Word16 output_sp[],    /* o    : output synthesis signal  Q0*/
-    frameMode_fx frameMode /* i    : Decoder frame mode       */
+    Decoder_State *st_fx, /* i/o  : Decoder state structure  */
+    Word16 output_sp[],   /* o    : output synthesis signal  Q0*/
+    FRAME_MODE frameMode  /* i    : Decoder frame mode       */
 )
 {
     Word16 i, j, output_frame;
@@ -27,7 +27,6 @@ ivas_error evs_dec_fx(
     Word16 core_switching_flag;
     Word16 unbits;
     Word16 hq_core_type;
-    Word16 post_hq_delay;
     Word32 bwe_exc_extended_fx[L_FRAME32k + NL_BUFF_OFFSET];
     Word16 voice_factors_fx[NB_SUBFR16k];
     Word16 hb_synth_fx[L_FRAME48k];
@@ -36,11 +35,7 @@ ivas_error evs_dec_fx(
     Word16 exp, fra;
     Word16 tmp_buffer_fx[L_FRAME48k];
     Word16 tmp16, tmp16_2;
-#ifdef IVAS_CODE
     Word16 synth_fx[L_FRAME48k];
-#else
-    Word16 synth_fx[L_FRAME48k + HQ_DELTA_MAX * HQ_DELAY_COMP];
-#endif
     Word16 fb_exc_fx[L_FRAME16k];
     Word16 pitch_buf_fx[NB_SUBFR16k] = { 0 };
     Word16 Q_fb_exc;
@@ -58,8 +53,6 @@ ivas_error evs_dec_fx(
     Word16 Q_synth;
     Word16 Qpostd_prev;
 
-    Word32 *realBuffer[CLDFB_NO_COL_MAX], *imagBuffer[CLDFB_NO_COL_MAX];
-    Word32 realBufferTmp[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], imagBufferTmp[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
     Word16 timeIn_e;
     TD_BWE_DEC_HANDLE hBWE_TD;
     HQ_DEC_HANDLE hHQ_core;
@@ -102,15 +95,6 @@ ivas_error evs_dec_fx(
     move32();
     st_fx->flag_ACELP16k = set_ACELP_flag( EVS_MONO, -1, st_fx->total_brate, 0, 0, -1, -1 );
 
-    FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
-    {
-        set32_fx( realBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
-        set32_fx( imagBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
-        realBuffer[i] = realBufferTmp[i];
-        move32();
-        imagBuffer[i] = imagBufferTmp[i];
-        move32();
-    }
     if ( st_fx->bfi == 0 )
     {
         st_fx->extl = -1;
@@ -159,24 +143,15 @@ ivas_error evs_dec_fx(
     test();
     IF( !st_fx->bfi && st_fx->prev_bfi && ( EQ_16( st_fx->last_codec_mode, MODE2 ) ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) )
     {
-        /* v_multc(st_fx->old_out_fx, st_fx->plcInfo.recovery_gain, */
-        /*         st_fx->old_out_fx, st_fx->L_frameTCX); */
+        /* v_multc(st_fx->old_out_fx, st_fx->hPlcInfo.recovery_gain, st_fx->old_out_fx, st_fx->L_frameTCX); */
         FOR( i = 0; i < hTcxDec->L_frameTCX; i++ )
         {
-#ifdef BASOP_NOGLOB
-            hHQ_core->old_out_fx[i] = shl_sat( mult_r( hHQ_core->old_out_fx[i], st_fx->plcInfo.recovery_gain ), 1 ); /*hHQ_core->exp_old_out*/
-#else
-            hHQ_core->old_out_fx[i] = shl( mult_r( hHQ_core->old_out_fx[i], st_fx->plcInfo.recovery_gain ), 1 );
-#endif
+            hHQ_core->old_out_fx[i] = shl_sat( mult_r( hHQ_core->old_out_fx[i], st_fx->hPlcInfo->recovery_gain ), 1 ); /*hHQ_core->exp_old_out*/
             move16();
         }
         FOR( i = 0; i < st_fx->L_frame; i++ )
         {
-#ifdef BASOP_NOGLOB
-            hHQ_core->old_out_LB_fx[i] = shl_sat( mult_r( hHQ_core->old_out_LB_fx[i], st_fx->plcInfo.recovery_gain ), 1 ); /*hHQ_core->exp_old_out*/
-#else
-            hHQ_core->old_out_LB_fx[i] = shl( mult_r( hHQ_core->old_out_LB_fx[i], st_fx->plcInfo.recovery_gain ), 1 );
-#endif
+            hHQ_core->old_out_LB_fx[i] = shl_sat( mult_r( hHQ_core->old_out_LB_fx[i], st_fx->hPlcInfo->recovery_gain ), 1 ); /*hHQ_core->exp_old_out*/
             move16();
         }
         /* attenuate PLC buffers, if no aldo window
@@ -192,11 +167,7 @@ ivas_error evs_dec_fx(
             tmp1 = extract_l( L_shr_r( f, s ) ); /*Q14 - s*/
             FOR( i = 0; i < st_fx->hTcxCfg->tcx_mdct_window_lengthFB; i++ )
             {
-#ifdef BASOP_NOGLOB
                 hTcxDec->syn_OverlFB[i] = shl_sat( mult_sat( tmp1, hTcxDec->syn_OverlFB[i] ), add( s, 1 ) ); /*hTcxDec->Q_syn_Overl*/
-#else
-                hTcxDec->syn_OverlFB[i] = shl( mult( tmp1, hTcxDec->syn_OverlFB[i] ), add( s, 1 ) );
-#endif
                 move16();
             }
             s = norm_l( f );
@@ -204,11 +175,7 @@ ivas_error evs_dec_fx(
             tmp1 = extract_l( L_shr_r( f, s ) ); /*Q14 - s*/
             FOR( i = 0; i < st_fx->hTcxCfg->tcx_mdct_window_length; i++ )
             {
-#ifdef BASOP_NOGLOB
                 hTcxDec->syn_Overl[i] = shl_sat( mult_sat( tmp1, hTcxDec->syn_Overl[i] ), s ); /*hTcxDec->Q_syn_Overl*/
-#else
-                hTcxDec->syn_Overl[i] = shl( mult( tmp1, hTcxDec->syn_Overl[i] ), s );
-#endif
                 move16();
             }
         }
@@ -299,6 +266,7 @@ ivas_error evs_dec_fx(
     /*------------------------------------------------------------------*
      * Decoding
      *-----------------------------------------------------------------*/
+
     IF( EQ_16( st_fx->codec_mode, MODE1 ) )
     {
         /*------------------------------------------------------------------*
@@ -322,6 +290,7 @@ ivas_error evs_dec_fx(
             }
         }
     }
+
     IF( EQ_16( st_fx->codec_mode, MODE1 ) )
     {
         /*------------------------------------------------------------------*
@@ -349,7 +318,7 @@ ivas_error evs_dec_fx(
         /*---------------------------------------------------------------------*
          * Preprocessing (preparing) for ACELP/HQ core switching
          *---------------------------------------------------------------------*/
-        // PMT("core_switching_pre_dec_fx missign args")
+
         IF( ( error = core_switching_pre_dec_fx( st_fx, output_frame ) ) != IVAS_ERR_OK )
         {
             return error;
@@ -359,10 +328,10 @@ ivas_error evs_dec_fx(
          * ACELP core decoding
          * HQ core decoding
          *---------------------------------------------------------------------*/
+
         IF( EQ_16( st_fx->core, ACELP_CORE ) )
         {
             /* ACELP core decoder */
-
             IF( ( error = acelp_core_dec_fx( st_fx, NULL, synth_fx, NULL, bwe_exc_extended_fx, voice_factors_fx, old_syn_12k8_16k_fx, sharpFlag, pitch_buf_fx, &unbits, &sid_bw, NULL, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL, 1 ) ) != IVAS_ERR_OK )
             {
                 return error;
@@ -372,33 +341,24 @@ ivas_error evs_dec_fx(
         }
         ELSE
         {
-            // PMT("HQ core missing args")
-
             hq_core_dec_fx( st_fx, synth_fx, &Q_synth, output_frame, hq_core_type, core_switching_flag );
             Qpostd = Q_synth;
             move16();
         }
+
         /*---------------------------------------------------------------------*
          * Postprocessing for ACELP/HQ core switching
          *---------------------------------------------------------------------*/
 
-        if ( ( error = core_switching_post_dec_fx( st_fx, synth_fx,
-#ifdef IVAS_CODE_SWITCHING
-                                                   output, output_mem[], IVAS_FORMAT ivas_format, use_cldfb_for_dft,
-#endif
-                                                   output_frame, core_switching_flag,
-#ifdef IVAS_CODE_SWITCHING
-                                                   sba_dirac_stereo_flag, nchan_out,
-#endif
-                                                   st_fx->last_element_mode, &Qpostd ) ) != IVAS_ERR_OK )
+        if ( ( error = core_switching_post_dec_fx( st_fx, synth_fx, output_frame, core_switching_flag, EVS_MONO, &Qpostd ) ) != IVAS_ERR_OK )
         {
             return error;
         }
+
         /*---------------------------------------------------------------------*
          * Pre-processing for bandwidth switching
          *---------------------------------------------------------------------*/
 
-        /// PMT("bw_switching_pre_proc_fx missing args")
         bw_switching_pre_proc_fx( old_syn_12k8_16k_fx, st_fx );
 
         /*---------------------------------------------------------------------*
@@ -414,15 +374,7 @@ ivas_error evs_dec_fx(
         ELSE IF( EQ_16( st_fx->extl, WB_BWE ) && st_fx->bws_cnt == 0 )
         {
             /* WB BWE decoder */
-            hb_synth_fx_exp = wb_bwe_dec_fx(
-#ifdef ADD_IVAS_BWE
-                NULL,
-#endif
-                synth_fx, hb_synth_fx,
-#ifdef ADD_IVAS_BWE
-                0,
-#endif
-                output_frame, voice_factors_fx, pitch_buf_fx, st_fx, &Qpostd ); /*Q0*/
+            hb_synth_fx_exp = wb_bwe_dec_fx( synth_fx, hb_synth_fx, output_frame, voice_factors_fx, pitch_buf_fx, st_fx, &Qpostd ); /*Q0*/
         }
 
         /*---------------------------------------------------------------------*
@@ -452,9 +404,11 @@ ivas_error evs_dec_fx(
         test();
         IF( EQ_16( st_fx->extl, SWB_TBE ) || EQ_16( st_fx->extl, FB_TBE ) || ( NE_16( st_fx->coder_type, AUDIO ) && NE_16( st_fx->coder_type, INACTIVE ) && GT_32( st_fx->core_brate, SID_2k40 ) && EQ_16( st_fx->core, ACELP_CORE ) && GE_32( st_fx->output_Fs, 32000 ) && GT_16( st_fx->bwidth, NB ) && st_fx->bws_cnt > 0 && !st_fx->ppp_mode_dec && !( EQ_16( st_fx->nelp_mode_dec, 1 ) && EQ_16( st_fx->bfi, 1 ) ) ) )
         {
+            /* SWB TBE decoder */
             swb_tbe_dec_fx( st_fx, st_fx->coder_type, bwe_exc_extended_fx, st_fx->Q_exc, voice_factors_fx,
                             old_syn_12k8_16k_fx, fb_exc_fx, &Q_fb_exc, hb_synth_fx, &hb_synth_fx_exp, pitch_buf_fx );
-            /* FB TBE decoder/synthesis */
+
+            /* FB TBE decoder */
             test();
             IF( EQ_16( output_frame, L_FRAME48k ) && EQ_16( st_fx->extl, FB_TBE ) )
             {
@@ -465,15 +419,7 @@ ivas_error evs_dec_fx(
                  ( GE_32( st_fx->output_Fs, 32000 ) && EQ_16( st_fx->core, ACELP_CORE ) && GT_16( st_fx->bwidth, NB ) && st_fx->bws_cnt > 0 && !st_fx->ppp_mode_dec && !( EQ_16( st_fx->nelp_mode_dec, 1 ) && EQ_16( st_fx->bfi, 1 ) ) ) )
         {
             /* SWB BWE decoder */
-            hb_synth_fx_exp = swb_bwe_dec_fx(
-#ifdef ADD_IVAS_BWE
-                NULL,
-#endif
-                st_fx, synth_fx, hb_synth_fx,
-#ifdef ADD_IVAS_BWE
-                0,
-#endif
-                output_frame, &Qpostd ); /*Q0*/
+            hb_synth_fx_exp = swb_bwe_dec_fx( st_fx, synth_fx, hb_synth_fx, output_frame, &Qpostd ); /*Q0*/
         }
         ELSE IF( EQ_16( st_fx->extl, SWB_BWE_HIGHRATE ) || EQ_16( st_fx->extl, FB_BWE_HIGHRATE ) )
         {
@@ -504,17 +450,14 @@ ivas_error evs_dec_fx(
                 /*hb_synth[i] *= (i*tmp);*/
                 hb_synth_fx[i] = mult_r( hb_synth_fx[i], tmp16_2 ); /*hb_synth_fx_exp*/
                 move16();
-#ifdef BASOP_NOGLOB
                 tmp16_2 = add_o( tmp16_2, tmp16, &Overflow );
-#else
-                tmp16_2 = add( tmp16_2, tmp16 );
-#endif
             }
         }
 
         /*---------------------------------------------------------------------*
          * SWB CNG
          *---------------------------------------------------------------------*/
+
         IF( GE_16( output_frame, L_FRAME32k ) )
         {
             /* SHB CNG decoder */
@@ -543,10 +486,7 @@ ivas_error evs_dec_fx(
             Scale_sig( st_fx->prev_synth_buffer_fx, tmps, sub( exp, st_fx->Qprev_synth_buffer_fx ) ); /*exp*/
             st_fx->Qprev_synth_buffer_fx = exp;
             move16();
-            Copy( synth_fx, tmp_buffer_fx, output_frame );                                  /*exp*/
-            Copy( st_fx->prev_synth_buffer_fx, synth_fx, tmps );                            /*st_fx->Qprev_synth_buffer_fx*/
-            Copy( tmp_buffer_fx, synth_fx + tmps, output_frame - tmps );                    /*exp*/
-            Copy( tmp_buffer_fx + output_frame - tmps, st_fx->prev_synth_buffer_fx, tmps ); /*exp*/
+            delay_signal_fx( synth_fx, output_frame, st_fx->prev_synth_buffer_fx, tmps ); /*exp, t_fx->Qprev_synth_buffer_fx*/
         }
         ELSE
         {
@@ -566,7 +506,7 @@ ivas_error evs_dec_fx(
         test();
         test();
         test();
-        IF( EQ_16( st_fx->core, ACELP_CORE ) && !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st_fx->plcInfo.concealment_method, TCX_NONTONAL ) && LT_32( st_fx->plcInfo.nbLostCmpt, 4 ) )
+        IF( EQ_16( st_fx->core, ACELP_CORE ) && !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st_fx->hPlcInfo->concealment_method, TCX_NONTONAL ) && LT_32( st_fx->hPlcInfo->nbLostCmpt, 4 ) )
         {
             tmps = 0;
             move16();
@@ -575,20 +515,8 @@ ivas_error evs_dec_fx(
                 tmps = NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS ); /*Q0*/
             }
 
-            waveform_adj2_fix( st_fx->tonalMDCTconceal.secondLastPcmOut,
-                               synth_fx + tmps,
-                               st_fx->plcInfo.data_noise,
-                               &st_fx->plcInfo.outx_new_n1_fx,
-                               &st_fx->plcInfo.nsapp_gain_fx,
-                               &st_fx->plcInfo.nsapp_gain_n_fx,
-                               &st_fx->plcInfo.recovery_gain,
-                               st_fx->plcInfo.step_concealgain_fx,
-                               st_fx->plcInfo.Pitch_fx,
-                               st_fx->plcInfo.FrameSize,
-                               tmps,
-                               add( extract_l( st_fx->plcInfo.nbLostCmpt ), 1 ),
-                               st_fx->bfi );
-            st_fx->plcInfo.Pitch_fx = 0;
+            waveform_adj2_fix( st_fx->hPlcInfo, st_fx->hTonalMDCTConc->secondLastPcmOut, synth_fx + tmps, tmps, add( extract_l( st_fx->hPlcInfo->nbLostCmpt ), 1 ), st_fx->bfi );
+            st_fx->hPlcInfo->Pitch_fx = 0;
             move16();
         }
 
@@ -685,16 +613,14 @@ ivas_error evs_dec_fx(
 
                 Copy( tmp_buffer_fx, st_fx->hb_prev_synth_buffer_fx, tmps ); /*Q15 - hBWE_TD->prev_hb_synth_fx_exp*/
             }
+
             /* Delay hb_synth */
             tmp16 = sub( hb_synth_fx_exp, hBWE_TD->prev_hb_synth_fx_exp );
             IF( tmp16 != 0 )
             {
                 Scale_sig( st_fx->hb_prev_synth_buffer_fx, tmps, tmp16 ); /*Q15 - hb_synth_fx_exp*/
             }
-            Copy( hb_synth_fx, tmp_buffer_fx, output_frame );                                        /*Q15 - hb_synth_fx_exp*/
-            Copy( st_fx->hb_prev_synth_buffer_fx, hb_synth_fx, tmps );                               /*Q15 - hb_synth_fx_exp*/
-            Copy( tmp_buffer_fx, hb_synth_fx + tmps, sub( output_frame, tmps ) );                    /*Q15 - hb_synth_fx_exp*/
-            Copy( tmp_buffer_fx + sub( output_frame, tmps ), st_fx->hb_prev_synth_buffer_fx, tmps ); /*Q15 - hb_synth_fx_exp*/
+            delay_signal_fx( hb_synth_fx, output_frame, st_fx->hb_prev_synth_buffer_fx, tmps ); /*Q15 - hb_synth_fx_exp, Q15 - hb_synth_fx_exp*/
 
             st_fx->old_bwe_delay = tmps;
             move16();
@@ -757,11 +683,7 @@ ivas_error evs_dec_fx(
                 fra = Log2_norm_lc( L_shl( L_tmp, exp ) );
                 exp = sub( sub( 30, shl( hb_synth_fx_exp, 1 ) ), exp );
                 L_tmp = Mpy_32_16( exp, fra, LG10 );
-#ifdef BASOP_NOGLOB
-                st_fx->last_shb_ener_fx = round_fx_sat( L_shl_sat( L_tmp, 10 ) ); /*Q8*/
-#else
-                st_fx->last_shb_ener_fx = round_fx( L_shl( L_tmp, 10 ) ); /*Q8*/
-#endif
+                st_fx->hTdCngDec->last_shb_ener_fx = round_fx_sat( L_shl_sat( L_tmp, 10 ) ); /*Q8*/
             }
         }
         hBWE_TD->prev_hb_synth_fx_exp = hb_synth_fx_exp;
@@ -771,17 +693,16 @@ ivas_error evs_dec_fx(
         delta = NS2SA_FX2( st_fx->output_Fs, TCXLTP_DELAY_NS );                            /*Q0*/
         Scale_sig( hTcxLtpDec->tcxltp_mem_in, delta, sub( Qpostd, Qpostd_prev ) );         /*Qpostd*/
         Scale_sig( hTcxLtpDec->tcxltp_mem_out, output_frame, sub( Qpostd, Qpostd_prev ) ); /*Qpostd*/
-        tcx_ltp_post( st_fx, hTcxLtpDec, ACELP_CORE, output_frame, 0, synth_fx, NULL );
-
+        tcx_ltp_post_fx( st_fx, hTcxLtpDec, ACELP_CORE, output_frame, 0, synth_fx, NULL );
 
         /* final output of synthesis signal */
         Copy( synth_fx, output_sp, output_frame ); /*Qpostd*/
     }
-    ELSE /* MODE2 PART */
+    ELSE /* Mode 2 */
     {
 
         /* -------------------------------------------------------------- */
-        /* CONCEALMENT                                                    */
+        /* Mode 2 concealment                                             */
         /* -------------------------------------------------------------- */
 
         concealWholeFrame = 0;
@@ -821,11 +742,10 @@ ivas_error evs_dec_fx(
 
 
         /* -------------------------------------------------------------- */
-        /* DECODE CORE                                                    */
+        /* Decode core                                                   */
         /* -------------------------------------------------------------- */
 
-        dec_acelp_tcx_frame_fx( st_fx, &concealWholeFrame, output_sp,
-                                st_fx->p_bpf_noise_buf, pcmbufFB, bwe_exc_extended_fx, voice_factors_fx, pitch_buf_fx );
+        dec_acelp_tcx_frame_fx( st_fx, &concealWholeFrame, output_sp, st_fx->p_bpf_noise_buf, pcmbufFB, bwe_exc_extended_fx, voice_factors_fx, pitch_buf_fx );
 
         concealWholeFrameTmp = concealWholeFrame; /*Q0*/
         move16();
@@ -834,10 +754,10 @@ ivas_error evs_dec_fx(
             frameMode = FRAMEMODE_MISSING;
             move32();
         }
+
         IF( st_fx->igf )
         {
-
-            /* TBE interface */
+            /* TBE for Mode 2 interface */
             test();
             test();
             IF( ( st_fx->bfi == 0 || st_fx->last_core == ACELP_CORE ) && st_fx->core == ACELP_CORE )
@@ -943,29 +863,26 @@ ivas_error evs_dec_fx(
                         IF( ( EQ_16( st_fx->bwidth, SWB ) || EQ_16( st_fx->bwidth, FB ) ) &&
                             ( ( EQ_16( st_fx->last_extl, SWB_TBE ) || EQ_16( st_fx->last_extl, FB_TBE ) ) && EQ_16( st_fx->last_codec_mode, MODE2 ) ) )
                         {
-                            GenTransition_fx( hBWE_TD->syn_overlap_fx, hBWE_TD->old_tbe_synth_fx, 2 * NS2SA( st_fx->output_Fs, DELAY_BWE_TOTAL_NS ), hb_synth_fx,
-                                              hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx,
-                                              hBWE_TD->mem_resamp_HB_32k_fx,
-                                              &( hBWE_TD->syn_dm_phase ), st_fx->output_Fs, hBWE_TD->int_3_over_2_tbemem_dec_fx, st_fx->rf_flag, st_fx->total_brate );
+                            GenTransition_fx( hBWE_TD, hb_synth_fx, st_fx->output_Fs, st_fx->rf_flag, st_fx->total_brate );
 
-                            hb_synth_fx_exp = st_fx->prev_Q_bwe_syn2;
+                            hb_synth_fx_exp = hBWE_TD->prev_Q_bwe_syn2;
                             move16();
                         }
                         ELSE IF( EQ_16( st_fx->bwidth, WB ) && EQ_16( st_fx->last_extl, WB_TBE ) )
                         {
-                            GenTransition_WB_fx( hBWE_TD->syn_overlap_fx, hBWE_TD->old_tbe_synth_fx, st_fx->prev_Qx, 2 * NS2SA( st_fx->output_Fs, DELAY_BWE_TOTAL_NS ), hb_synth_fx,
-                                                 hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx, st_fx->output_Fs, hBWE_TD->mem_resamp_HB_fx );
+                            GenTransition_WB_fx( hBWE_TD, hb_synth_fx, st_fx->output_Fs );
 
-                            hb_synth_fx_exp = st_fx->prev_Qx;
+                            hb_synth_fx_exp = hBWE_TD->prev_Qx;
                             move16();
                         }
 
-                        TBEreset_dec_fx( st_fx, st_fx->bwidth );
+                        TBEreset_dec_fx( st_fx );
                     }
                     ELSE IF( EQ_16( st_fx->last_codec_mode, MODE1 ) )
                     {
                         swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
                                           hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
+
                         IF( EQ_16( st_fx->extl, FB_TBE ) )
                         {
                             set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
@@ -973,7 +890,8 @@ ivas_error evs_dec_fx(
                             move16();
                             fb_tbe_reset_synth_fx( hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, &hBWE_TD->prev_fbbwe_ratio_fx );
                         }
-                        swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx );
+
+                        swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
                     }
                 }
             }
@@ -987,10 +905,23 @@ ivas_error evs_dec_fx(
         }
 
         /* -------------------------------------------------------------- */
-        /* APPLY POSTPROC                                                 */
+        /* Postprocessing                                                 */
         /* -------------------------------------------------------------- */
 
         {
+            Word32 *realBuffer[CLDFB_NO_COL_MAX], *imagBuffer[CLDFB_NO_COL_MAX];
+            Word32 realBufferTmp[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], imagBufferTmp[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
+
+            FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+            {
+                set32_fx( realBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
+                set32_fx( imagBufferTmp[i], 0, CLDFB_NO_CHANNELS_MAX );
+                realBuffer[i] = realBufferTmp[i];
+                move32();
+                imagBuffer[i] = imagBufferTmp[i];
+                move32();
+            }
+
             nab = s_min( st_fx->cldfbAna->no_channels, st_fx->cldfbSyn->no_channels );                  /*Q0*/
             st_fx->cldfbSyn->lsb = s_min( st_fx->cldfbAna->no_channels, st_fx->cldfbSyn->no_channels ); /*Q0*/
             st_fx->cldfbSyn->usb = st_fx->cldfbSyn->no_channels;                                        /*Q0*/
@@ -1006,11 +937,12 @@ ivas_error evs_dec_fx(
             test();
             IF( st_fx->hFdCngDec != NULL && ( EQ_32( st_fx->sr_core, 8000 ) || EQ_32( st_fx->sr_core, INT_FS_12k8 ) || EQ_32( st_fx->sr_core, INT_FS_16k ) ) && LE_32( st_fx->total_brate, ACELP_32k ) )
             {
-                /***************************************
-                 In CLDFB domain:
-                 - perform noise estimation during active frames
-                 - do CNG during inactive frames
-                ****************************************/
+                /* -------------------------------------------------------------- *
+                 * In CLDFB domain:
+                 *   - perform noise estimation during active frames
+                 *   - do CNG during inactive frames
+                 * -------------------------------------------------------------- */
+
                 HANDLE_FD_CNG_DEC hFdCngDec = st_fx->hFdCngDec;
                 noisy_speech_detection_fx( st_fx->hFdCngDec, st_fx->VAD && EQ_16( st_fx->m_frame_type, ACTIVE_FRAME ), output_sp, 0 );
 
@@ -1021,11 +953,9 @@ ivas_error evs_dec_fx(
                 }
                 st_fx->lp_noise = hFdCngDec->lp_noise; /*Q9.23*/
                 move32();
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                ApplyFdCng_fx( output, NULL, realBuffer, imagBuffer, st, concealWholeFrame, 0 );
-#else
-                ApplyFdCng_fx( output_sp, 0, realBuffer, imagBuffer, &st_fx->scaleFactor.hb_scale, st_fx, concealWholeFrame, 0 );
-#endif
+
+                ApplyFdCng_fx( output_sp, 0, NULL, 0, realBuffer, imagBuffer, &st_fx->scaleFactor.hb_scale, st_fx, concealWholeFrame, 0 );
+
                 /* Generate additional comfort noise to mask potential coding artefacts */
                 test();
                 IF( EQ_16( st_fx->m_frame_type, ACTIVE_FRAME ) && st_fx->flag_cna )
@@ -1044,11 +974,7 @@ ivas_error evs_dec_fx(
             {
                 FOR( i = 0; i < st_fx->L_frame / 2; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     output_sp[i] = add_sat( output_sp[i], st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * st_fx->L_frame / 4] ); /*Q0*/
-#else
-                    output_sp[i] = add( output_sp[i], st_fx->hFdCngDec->hFdCngCom->olapBufferSynth2[i + 5 * st_fx->L_frame / 4] );
-#endif
                     move16();
                 }
             }
@@ -1062,7 +988,7 @@ ivas_error evs_dec_fx(
                 }
                 Scale_sig( output_sp, st_fx->L_frame, timeIn_e ); /*timeIn_e*/
                 timeIn_e = negate( timeIn_e );
-                cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &st_fx->scaleFactor, output_sp, timeIn_e, CLDFB_NO_COL_MAX, workBuffer );
+                cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &st_fx->scaleFactor, output_sp, timeIn_e, CLDFB_NO_COL_MAX, workBuffer );
                 st_fx->scaleFactor.hb_scale = st_fx->scaleFactor.lb_scale;
                 move16();
             }
@@ -1075,6 +1001,7 @@ ivas_error evs_dec_fx(
                 Copy( st_fx->hFdCngDec->hFdCngCom->A_cng, A, M + 1 );                                    /*Q12*/
 
                 update_decoder_LPD_cng( st_fx, st_fx->coder_type, timeDomainBuffer, A, st_fx->p_bpf_noise_buf );
+
                 /* Generate additional comfort noise to mask potential coding artefacts */
                 test();
                 test();
@@ -1093,6 +1020,7 @@ ivas_error evs_dec_fx(
                         move16();
                     }
                 }
+
                 /* check if the CLDFB works on the right sample rate */
                 IF( NE_16( i_mult( st_fx->cldfbAna->no_channels, st_fx->cldfbAna->no_col ), st_fx->L_frame ) )
                 {
@@ -1123,7 +1051,7 @@ ivas_error evs_dec_fx(
                 }
 
                 timeIn_e = negate( timeIn_e );
-                cldfbAnalysisFiltering( st_fx->cldfbAna, realBuffer, imagBuffer, &st_fx->scaleFactor, timeDomainBuffer, timeIn_e, CLDFB_NO_COL_MAX, workBuffer );
+                cldfbAnalysis_fx( st_fx->cldfbAna, realBuffer, imagBuffer, &st_fx->scaleFactor, timeDomainBuffer, timeIn_e, CLDFB_NO_COL_MAX, workBuffer );
             }
 
             IF( st_fx->flag_cna == 0 )
@@ -1173,8 +1101,7 @@ ivas_error evs_dec_fx(
             }
 
             timeIn_e = s_min( 0, add( timeIn_e, 2 ) );
-            cldfbSynthesisFiltering( st_fx->cldfbSyn, realBuffer, imagBuffer, &st_fx->scaleFactor, output_sp, timeIn_e, CLDFB_NO_COL_MAX, workBuffer );
-            /*CLDFB output always in timeIn_e*/
+            cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &st_fx->scaleFactor, output_sp, timeIn_e, CLDFB_NO_COL_MAX, workBuffer ); /*CLDFB output always in timeIn_e*/
 
             /* MODE1 MDCT to ACELP 2 transition */
             delay_comp = NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS );
@@ -1218,11 +1145,7 @@ ivas_error evs_dec_fx(
 
                     FOR( i = 0; i < tmps; i++ )
                     {
-#ifdef BASOP_NOGLOB
-                        output_sp[i + delay_comp] = msu_r_sat( L_mult_sat( output_sp[i + delay_comp], alpha ), shr( hHQ_core->old_out_fx[i + nz], timeIn_e ), add( alpha, -32768 ) ); /*timeIn_e*/
-#else
-                        output_sp[i + delay_comp] = msu_r( L_mult( output_sp[i + delay_comp], alpha ), shr( hHQ_core->old_out_fx[i + nz], timeIn_e ), add( alpha, -32768 ) );
-#endif
+                        output_sp[i + delay_comp] = msu_r_sat( L_mult_sat( output_sp[i + delay_comp], alpha ), shr_sat( hHQ_core->old_out_fx[i + nz], timeIn_e ), add( alpha, -32768 ) ); /*timeIn_e*/
                         move16();
                         alpha = add( alpha, step );
                     }
@@ -1266,10 +1189,9 @@ ivas_error evs_dec_fx(
         /* Delay compensation for TD-BWE*/
         IF( GE_16( output_frame, L_FRAME16k ) )
         {
-            Copy( output_sp, tmp_buffer_fx, output_frame );                                                                         /*timeIn_e*/
-            Copy_Scale_sig( st_fx->prev_synth_buffer_fx, output_sp, delay_tdbwe, negate( timeIn_e ) );                              /*st_fx->q_prev_synth_buffer_fx*/
-            Copy( tmp_buffer_fx, output_sp + delay_tdbwe, sub( output_frame, delay_tdbwe ) );                                       /*timeIn_e*/
-            Copy_Scale_sig( tmp_buffer_fx + sub( output_frame, delay_tdbwe ), st_fx->prev_synth_buffer_fx, delay_tdbwe, timeIn_e ); /*timeIn_e*/
+            Scale_sig( st_fx->prev_synth_buffer_fx, delay_tdbwe, negate( timeIn_e ) );
+            delay_signal_fx( output_sp, output_frame, st_fx->prev_synth_buffer_fx, delay_tdbwe ); /*timeIn_e, st_fx->q_prev_synth_buffer_fx*/
+            Scale_sig( st_fx->prev_synth_buffer_fx, delay_tdbwe, timeIn_e );
         }
 
         test();
@@ -1303,11 +1225,11 @@ ivas_error evs_dec_fx(
                   ( ( EQ_16( st_fx->last_core, ACELP_CORE ) ) && ( NE_16( st_fx->bwidth, NB ) && EQ_16( st_fx->last_codec_mode, MODE2 ) ) ) ) &&
                 ( GT_32( st_fx->output_Fs, 8000 ) ) )
             {
+                /* Add the delayed hb_synth component to the delayed core synthesis */
                 add_vec_fx( output_sp, negate( timeIn_e ), hb_synth_fx, hb_synth_fx_exp, output_sp, negate( timeIn_e ), output_frame );
             }
         }
 
-
         IF( EQ_32( st_fx->output_Fs, 8000 ) )
         {
             tmps = NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS ); /*Q0*/
@@ -1321,19 +1243,23 @@ ivas_error evs_dec_fx(
         test();
         test();
         test();
+        /* TCX/ACELP/HQ-CORE->TCX */
         IF( ( st_fx->bfi && GT_16( st_fx->last_core, ACELP_CORE ) ) || GT_16( st_fx->core, ACELP_CORE ) )
         {
             test();
             test();
             test();
             test();
+            /* TCX / HQ-CORE / TD-TCX-PLC -> TCX / TD-TCX-PLC */
             IF( GT_16( st_fx->last_core_bfi, ACELP_CORE ) || ( st_fx->bfi && st_fx->last_core > ACELP_CORE ) || ( st_fx->prev_bfi && st_fx->last_con_tcx ) )
             {
                 Copy_Scale_sig( hTcxDec->FBTCXdelayBuf, output_sp, tmps, negate( timeIn_e ) );                      /*Q0*/
                 Copy_Scale_sig( pcmbufFB, output_sp + tmps, sub( hTcxDec->L_frameTCX, tmps ), negate( timeIn_e ) ); /*Q0*/
             }
+            /* ACELP -> TCX */
             ELSE
             {
+                /*cross-fading between LB-TCX and FB-TCX over 2.3125ms*/
                 Word16 step, alpha;
 
                 i = 15;
@@ -1345,11 +1271,7 @@ ivas_error evs_dec_fx(
 
                 FOR( i = 0; i < tmps; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     output_sp[i + tmps] = msu_r_sat( L_mult_sat( shr( pcmbufFB[i], timeIn_e ), alpha ), output_sp[i + tmps], add( alpha, -32768 ) ); /*Q0*/
-#else
-                    output_sp[i + tmps] = msu_r( L_mult( shr( pcmbufFB[i], timeIn_e ), alpha ), output_sp[i + tmps], add( alpha, -32768 ) );
-#endif
                     move16();
                     alpha = add( alpha, step );
                 }
@@ -1363,15 +1285,16 @@ ivas_error evs_dec_fx(
             {
                 IF( EQ_32( st_fx->output_Fs, 8000 ) )
                 {
-                    Copy( hTcxDec->FBTCXdelayBuf, st_fx->delay_buf_out_fx, NS2SA( st_fx->output_Fs, DELAY_CLDFB_NS ) ); /*st_fx->q_prev_synth_buffer_fx*/
+                    Copy( hTcxDec->FBTCXdelayBuf, st_fx->delay_buf_out_fx, NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS ) ); /*st_fx->q_prev_synth_buffer_fx*/
                 }
                 ELSE
                 {
-                    Copy( hTcxDec->FBTCXdelayBuf, st_fx->prev_synth_buffer_fx, NS2SA( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );                                         /*st_fx->Qprev_synth_buffer_fx*/
-                    Copy( hTcxDec->FBTCXdelayBuf + NS2SA( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), st_fx->delay_buf_out_fx, NS2SA( st_fx->output_Fs, DELAY_CLDFB_NS ) ); /*Q0*/
+                    Copy( hTcxDec->FBTCXdelayBuf, st_fx->prev_synth_buffer_fx, NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );                                             /*st_fx->Qprev_synth_buffer_fx*/
+                    Copy( hTcxDec->FBTCXdelayBuf + NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), st_fx->delay_buf_out_fx, NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS ) ); /*Q0*/
                 }
             }
         }
+        /* TCX/TD TCX PLC->ACELP */
         ELSE IF( ( EQ_16( st_fx->last_codec_mode, MODE2 ) ) && ( GT_16( st_fx->last_core, ACELP_CORE ) ) )
         {
             Word16 step, alpha;
@@ -1387,17 +1310,9 @@ ivas_error evs_dec_fx(
 
             FOR( i = delta; i < tmps; i++ )
             {
-#ifdef BASOP_NOGLOB
                 output_sp[i] = msu_r_sat( L_mult( output_sp[i], alpha ), shr_sat( hTcxDec->FBTCXdelayBuf[i], timeIn_e ), add( alpha, -32768 ) ); /*Q0*/
-#else
-                output_sp[i] = msu_r( L_mult( output_sp[i], alpha ), shr( hTcxDec->FBTCXdelayBuf[i], timeIn_e ), add( alpha, -32768 ) );
-#endif
                 move16();
-#ifdef BASOP_NOGLOB
                 alpha = add_sat( alpha, step );
-#else
-                alpha = add( alpha, step );
-#endif
             }
         }
 
@@ -1406,46 +1321,18 @@ ivas_error evs_dec_fx(
 
         Scale_sig( output_sp, output_frame, timeIn_e ); /*timeIn_e*/
 
-        tcx_ltp_post( st_fx, hTcxLtpDec, st_fx->core, output_frame /*hTcxDec->L_frameTCX*/, NS2SA_FX2( st_fx->output_Fs, ACELP_LOOK_NS ) + tmps,
-                      output_sp, hTcxDec->FBTCXdelayBuf );
+        tcx_ltp_post_fx( st_fx, hTcxLtpDec, st_fx->core, output_frame /*hTcxDec->L_frameTCX*/, add( NS2SA_FX2( st_fx->output_Fs, ACELP_LOOK_NS ), tmps ), output_sp, hTcxDec->FBTCXdelayBuf );
         Copy( output_sp, synth_fx, output_frame ); /*timeIn_e*/
 
-    } /* end of MODE2 */
+    } /* end of Mode 2 */
 
 
     /*----------------------------------------------------------------*
      * Save synthesis for HQ FEC
      *----------------------------------------------------------------*/
-    // PMT("The code below could be move to save_synthesis_hq_fec")
-    post_hq_delay = NS2SA_FX2( st_fx->output_Fs, POST_HQ_DELAY_NS );
-    IF( EQ_16( st_fx->codec_mode, MODE1 ) )
-    {
-
-        Copy( hTcxDec->synth_history_fx + output_frame, hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA_FX2( st_fx->output_Fs, PH_ECU_MEM_NS ) ) ); /*hTcxDec->q_synth_history_fx*/
-        Copy_Scale_sig( synth_fx, hTcxDec->old_synthFB_fx + sub( output_frame, post_hq_delay ), output_frame, negate( Qpostd ) );                                             /* output_sp not initialized yet */
-        /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill
-           this buffer are not available for all cases, the impact on the output is limited */
-        set16_fx( hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay );
 
-        IF( GE_16( output_frame, L_FRAME16k ) )
-        {
-            Copy_Scale_sig( st_fx->prev_synth_buffer_fx, hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), negate( st_fx->Qprev_synth_buffer_fx ) ); /*Q0*/
-        }
-        IF( NE_16( st_fx->core, ACELP_CORE ) )
-        {
-            IF( GE_16( output_frame, L_FRAME16k ) )
-            {
-                Copy_Scale_sig( synth_fx + output_frame, hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS ), negate( Qpostd ) );           /*Q0*/
-                Copy_Scale_sig( hHQ_core->old_out_fx + NS2SA_FX2( st_fx->output_Fs, N_ZERO_MDCT_NS ), hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st_fx->output_Fs, PH_ECU_LOOKAHEAD_NS ), negate( hHQ_core->Q_old_wtda ) ); /*Q0*/
-            }
-            ELSE
-            {
+    save_synthesis_hq_fec_fx( st_fx, synth_fx, NULL, output_frame, Qpostd, NULL );
 
-                Copy_Scale_sig( synth_fx + output_frame, hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st_fx->output_Fs, DELAY_CLDFB_NS ), negate( Qpostd ) );                                                                            /*Q0*/
-                Copy_Scale_sig( hHQ_core->old_out_fx + NS2SA_FX2( st_fx->output_Fs, N_ZERO_MDCT_NS ), hTcxDec->old_synthFB_fx + shl( output_frame, 1 ) - NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), NS2SA_FX2( st_fx->output_Fs, PH_ECU_LOOKAHEAD_NS ), negate( hHQ_core->Q_old_wtda ) ); /*Q0*/
-            }
-        }
-    }
     /*----------------------------------------------------------------*
      * HP filtering
      *----------------------------------------------------------------*/
diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c
deleted file mode 100644
index ea716c8670066173ec98d3213e4fdada2bf2d310..0000000000000000000000000000000000000000
--- a/lib_dec/fd_cng_dec.c
+++ /dev/null
@@ -1,1386 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-#include "ivas_rom_dec.h"
-#include "ivas_rom_com_fx.h"
-#include "prot_fx.h"
-#include "ivas_prot_fx.h"
-#include "basop_util.h"
-#include "rom_basop_util.h"
-
-/*-------------------------------------------------------------------
- * Local constants
- *-------------------------------------------------------------------*/
-
-#define DELTA_MASKING_NOISE_Q15      0
-#define CNA_ACT_DN_LARGE_PARTITION   50         /* index of the first larger partition */
-#define FIRST_CNA_NOISE_UPD_FRAMES   5          /* minimum number of CN initialization frames */
-#define LOG_10_BASE_2                1783446566 /* Q29 */
-#define GAIN_Q_OFFSET_IVAS_FX        45
-#define LOG_10_BASE_2_BY_10_Q31      713378606
-#define TWO_BY_THREE_Q31             1431655765
-#define ONE_BY_FRAMES_PER_SEC_Q15    656
-#define NB_LAST_BAND_SCALE_Q31       1717986918
-#define SWB_13k2_LAST_BAND_SCALE_Q31 1717986918
-
-/*-------------------------------------------------------------------
- * Local fucntions declarations
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------
- * createFdCngDec()
- *
- * Create an instance of type FD_CNG
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------
- * initFdCngDec()
- *
- * Initialize an instance of type FD_CNG
- *-------------------------------------------------------------------*/
-void configureFdCngDec_ivas_fx(
-    HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: Contains the variables related to the FD-based CNG process */
-    const Word16 bwidth,         /*Q0*/
-    const Word32 total_brate,    /*Q0*/
-    const Word16 L_frame,        /*Q0*/
-    const Word16 last_L_frame,   /*Q0*/
-    const Word16 element_mode /*Q0*/ )
-{
-    Word16 j, stopBandFR;
-    HANDLE_FD_CNG_COM hsCom = hFdCngDec->hFdCngCom;
-
-    hsCom->CngBandwidth = bwidth; /*Q0*/
-    move16();
-    if ( EQ_16( hsCom->CngBandwidth, FB ) )
-    {
-        hsCom->CngBandwidth = SWB;
-        move16();
-    }
-    test();
-    IF( NE_32( total_brate, FRAME_NO_DATA ) && NE_32( total_brate, SID_2k40 ) )
-    {
-        hsCom->CngBitrate = total_brate; /*Q0*/
-        move32();
-    }
-    ELSE IF( EQ_32( hsCom->CngBitrate, -1 ) )
-    {
-        /* set minimum active CBR bitrate IF CngBitrate is uninitialized */
-        IF( element_mode > EVS_MONO )
-        {
-            hsCom->CngBitrate = IVAS_13k2;
-            move32();
-        }
-        ELSE
-        {
-            hsCom->CngBitrate = ACELP_7k20;
-            move32();
-        }
-    }
-
-    /* FD-CNG config for MDCT-Stereo is always the same (since for > 48 kbps only) */
-    /* This may need adjustment in the future IF 2TC DTX for some mode uses MDCT-Stereo DTX for lower bitrates too */
-    if ( EQ_16( element_mode, IVAS_CPE_MDCT ) )
-    {
-        hsCom->CngBitrate = IVAS_48k;
-        move32();
-    }
-    hsCom->numSlots = 16;
-    move32();
-
-    /* NB configuration */
-    IF( EQ_16( bwidth, NB ) )
-    {
-        hsCom->FdCngSetup = FdCngSetup_nb;
-        hsCom->numCoreBands = 16;
-        move16();
-        hsCom->regularStopBand = 16;
-        move16();
-    }
-
-    /* WB configuration */
-    ELSE IF( EQ_16( bwidth, WB ) )
-    {
-        /* FFT 6.4kHz, no CLDFB */
-        test();
-        test();
-        IF( LE_32( hsCom->CngBitrate, ACELP_8k00 ) && EQ_16( L_frame, L_FRAME ) )
-        {
-            hsCom->FdCngSetup = FdCngSetup_wb1;
-            hsCom->numCoreBands = 16;
-            move16();
-            hsCom->regularStopBand = 16;
-            move16();
-        }
-        /* FFT 6.4kHz, CLDFB 8.0kHz */
-        ELSE IF( LE_32( hsCom->CngBitrate, ACELP_13k20 ) || EQ_16( L_frame, L_FRAME ) )
-        {
-            hsCom->FdCngSetup = FdCngSetup_wb2;
-            hsCom->numCoreBands = 16;
-            move16();
-            hsCom->regularStopBand = 20;
-            move16();
-            IF( EQ_16( L_frame, L_FRAME16k ) )
-            {
-                hsCom->FdCngSetup = FdCngSetup_wb2;
-                hsCom->numCoreBands = 20;
-                move16();
-                hsCom->regularStopBand = 20;
-                move16();
-                hsCom->FdCngSetup.fftlen = 640;
-                move16();
-                hsCom->FdCngSetup.stopFFTbin = 256;
-                move16();
-            }
-        }
-        /* FFT 8.0kHz, no CLDFB */
-        ELSE
-        {
-            hsCom->FdCngSetup = FdCngSetup_wb3;
-            hsCom->numCoreBands = 20;
-            move16();
-            hsCom->regularStopBand = 20;
-            move16();
-        }
-    }
-
-    /* SWB/FB configuration */
-    ELSE
-    {
-        /* FFT 6.4kHz, CLDFB 14kHz */
-        IF( EQ_16( L_frame, L_FRAME ) )
-        {
-            hsCom->FdCngSetup = FdCngSetup_swb1;
-            hsCom->numCoreBands = 16;
-            move16();
-            hsCom->regularStopBand = 35;
-            move16();
-        }
-        /* FFT 8.0kHz, CLDFB 16kHz */
-        ELSE
-        {
-            hsCom->FdCngSetup = FdCngSetup_swb2;
-            hsCom->numCoreBands = 20;
-            move16();
-            hsCom->regularStopBand = 40;
-            move16();
-            test();
-            if ( EQ_16( last_L_frame, L_FRAME ) && EQ_16( element_mode, IVAS_CPE_DFT ) )
-            {
-                hsCom->regularStopBand = 35;
-                move16();
-            }
-        }
-    }
-
-
-    hsCom->fftlen = hsCom->FdCngSetup.fftlen;
-    move16();
-    hsCom->stopFFTbin = hsCom->FdCngSetup.stopFFTbin;
-    move16();
-
-    /* Configure the SID quantizer and the Comfort Noise Generator */
-
-    hsCom->startBand = 2;
-    move16();
-    hsCom->stopBand = add( hsCom->FdCngSetup.sidPartitions[( hsCom->FdCngSetup.numPartitions - 1 )], 1 ); /*Q0*/
-    initPartitions( hsCom->FdCngSetup.sidPartitions, hsCom->FdCngSetup.numPartitions, hsCom->startBand, hsCom->stopBand, hsCom->part, &hsCom->npart, hsCom->midband, hsCom->psize, hsCom->psize_norm, &hsCom->psize_norm_exp, hsCom->psize_inv, 0 );
-
-    IF( EQ_16( hsCom->stopFFTbin, 160 ) )
-    {
-        hsCom->nFFTpart = 17;
-        move16();
-    }
-    ELSE IF( EQ_16( hsCom->stopFFTbin, 256 ) )
-    {
-        hsCom->nFFTpart = 20;
-        move16();
-    }
-    ELSE
-    {
-        hsCom->nFFTpart = 21;
-        move16();
-    }
-    hsCom->nCLDFBpart = sub( hsCom->npart, hsCom->nFFTpart ); /*Q0*/
-    move16();
-    FOR( j = 0; j < hsCom->nCLDFBpart; j++ )
-    {
-        hsCom->CLDFBpart[j] = sub( hsCom->part[( j + hsCom->nFFTpart )], sub( hsCom->stopFFTbin, hsCom->startBand ) ); /*Q0*/
-        move16();
-        hsCom->CLDFBpsize_inv[j] = hsCom->psize_inv[( j + hsCom->nFFTpart )];
-        move16();
-    }
-
-    stopBandFR = 40; //(Word16)floor(1000.f /*Hz*/ / 25.f /*Hz/Bin*/);
-    move16();
-    if ( GT_16( stopBandFR, hsCom->stopFFTbin ) )
-    {
-        stopBandFR = hsCom->stopFFTbin; /*Q0*/
-        move16();
-    }
-
-    initPartitions( hsCom->FdCngSetup.shapingPartitions, hsCom->FdCngSetup.numShapingPartitions, hsCom->startBand, hsCom->stopFFTbin, hFdCngDec->part_shaping, &hFdCngDec->npart_shaping, hFdCngDec->midband_shaping, hFdCngDec->psize_shaping, hFdCngDec->psize_shaping_norm, &hFdCngDec->psize_shaping_norm_exp, hFdCngDec->psize_inv_shaping, stopBandFR );
-
-    hFdCngDec->nFFTpart_shaping = hFdCngDec->npart_shaping; /*Q0*/
-    move16();
-
-    BASOP_getTables( &hsCom->olapWinAna, NULL, NULL, shr( hsCom->fftlen, 1 ) );
-    BASOP_getTables( &hsCom->olapWinSyn, NULL, NULL, shr( hsCom->fftlen, 2 ) );
-
-    SWITCH( hsCom->fftlen )
-    {
-        case 512:
-            hsCom->olapWinAna_fx = olapWinAna512_fx; /*Q30*/
-            hsCom->fftSineTab_fx = NULL;
-            hsCom->olapWinSyn_fx = olapWinSyn256_fx; /*Q15*/
-            hsCom->fftlenShift = 8;
-            move16();
-            hsCom->fftlenFac = 32767 /*1.0 Q15*/;
-            move16();
-            BREAK;
-        case 640:
-            hsCom->olapWinAna_fx = olapWinAna640_fx; /*Q30*/
-            hsCom->fftSineTab_fx = fftSineTab640_fx; /*Q15*/
-            hsCom->olapWinSyn_fx = olapWinSyn320_fx; /*Q15*/
-            hsCom->fftlenShift = 9;
-            move16();
-            hsCom->fftlenFac = 20480 /*0.625 Q15*/;
-            move16();
-            BREAK;
-        default:
-            assert( !"Unsupported FFT length for FD-based CNG" );
-            BREAK;
-    }
-    BASOP_getTables( &hsCom->olapWinAna, NULL, NULL, shr( hsCom->fftlen, 1 ) );
-    BASOP_getTables( &hsCom->olapWinSyn, NULL, NULL, shr( hsCom->fftlen, 2 ) );
-    hsCom->frameSize = shr( hsCom->fftlen, 1 );
-
-    return;
-}
-
-/*-------------------------------------------------------------------
- * deleteFdCngDec()
- *
- * Delete the instance of type FD_CNG
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------
- * ApplyFdCng()
- *
- * Apply the CLDFB-based CNG at the decoder
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------
- * FdCng_decodeSID()
- *
- * Decode the FD-CNG bitstream
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------
- * FdCng_decodeSID_ivas_fx()
- *
- * Decode the FD-CNG bitstream
- *-------------------------------------------------------------------*/
-
-void FdCng_decodeSID_ivas_fx(
-    Decoder_State *st /* i/o: decoder state structure */
-)
-{
-    Word16 N;
-    Word32 *sidNoiseEst;
-    Word32 gain;
-    Word16 i, index;
-    Word32 v[32];
-    Word16 indices[32];
-    HANDLE_FD_CNG_COM hFdCngCom;
-    Word32 *invTrfMatrix_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    Word16 tmp16;
-
-    IF( st->element_mode == EVS_MONO )
-    {
-        tmp16 = GAIN_Q_OFFSET_EVS_FX_Q0;
-        move16();
-    }
-    ELSE
-    {
-        tmp16 = GAIN_Q_OFFSET_IVAS_FX_Q0;
-        move16();
-    }
-
-    const Word16 gain_q_offset = tmp16; /* Q0 */
-    move16();
-
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /*Q31*/
-
-    hFdCngCom = ( st->hFdCngDec )->hFdCngCom;
-
-    sidNoiseEst = hFdCngCom->sidNoiseEst; /*Q16*/
-
-    N = hFdCngCom->npart; /*Q0*/
-    move16();
-    gain = 0;
-    move32();
-    hFdCngCom->sid_frame_counter = add( hFdCngCom->sid_frame_counter, 1 );
-    move16();
-
-    /* Read bitstream */
-    FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
-    {
-        indices[i] = get_next_indice_fx( st, bits_37bits[i] ); /*Q0*/
-        move16();
-    }
-
-    index = get_next_indice_fx( st, 7 );
-
-    /* MSVQ decoder */
-
-    IF( st->element_mode != EVS_MONO )
-    {
-        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );
-        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, v, NULL, 7 );
-    }
-    ELSE
-    { /* Legacy EVS_MONO MSVQ tables */
-        msvq_dec_fx( cdk_37bits, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v, NULL, 7 );
-    }
-
-
-    /* Decode gain */
-    // gain = ((float)index - gain_q_offset) / 1.5f;
-    gain = L_mult0( sub( index, gain_q_offset ), 21845 ); // Q15
-
-    /* Apply gain and undo log */
-    Word16 res_exp[NPART];
-    Word16 max_res_exp = 0;
-    move16();
-    FOR( i = 0; i < N; i++ )
-    {
-        sidNoiseEst[i] = BASOP_util_Pow2( Mpy_32_32( L_add( v[i], gain ), LOG_10_BASE_2_BY_10_Q31 ), Q16, &res_exp[i] ); /*Q31 - res_exp[i]*/
-        move32();
-        if ( LT_16( max_res_exp, res_exp[i] ) )
-        {
-            max_res_exp = res_exp[i];
-            move16();
-        }
-    }
-
-    FOR( i = 0; i < N; i++ )
-    {
-        sidNoiseEst[i] = L_shr( sidNoiseEst[i], sub( max_res_exp, res_exp[i] ) ); /*Q31 - max_res_exp*/
-        move32();
-    }
-
-    hFdCngCom->sidNoiseEstExp = max_res_exp;
-    move16();
-
-    /* NB last band energy compensation */
-
-    IF( hFdCngCom->CngBandwidth == NB )
-    {
-        sidNoiseEst[( N - 1 )] = Mpy_32_16_1( sidNoiseEst[( N - 1 )], NB_LAST_BAND_SCALE ); /*Q31 - max_res_exp*/
-        move32();
-    }
-
-    test();
-    IF( EQ_16( hFdCngCom->CngBandwidth, SWB ) && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
-    {
-        sidNoiseEst[( N - 1 )] = Mpy_32_16_1( sidNoiseEst[( N - 1 )], SWB_13k2_LAST_BAND_SCALE ); /*Q31 - max_res_exp*/
-        move32();
-    }
-
-    scalebands( sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );
-    hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
-    move16();
-
-    lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, st->preemph_fac );
-
-    return;
-}
-
-/*-------------------------------------------------------------------
- * noisy_speech_detection()
- *
- *
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------
- * generate_comfort_noise_dec()
- *
- * Generate the comfort noise based on the target noise level
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------
- * generate_masking_noise()
- *
- * Generate additional comfort noise (kind of noise filling)
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------
- * generate_masking_noise_ivas_fx()
- *
- * Generate additional comfort noise (kind of noise filling)
- *-------------------------------------------------------------------*/
-
-void generate_masking_noise_ivas_fx(
-    Word32 *timeDomainBuffer,         /* i/o: time-domain signal Q31 - *exp_out*/
-    Word16 *exp_out,                  /* o  : time-domain signal exp */
-    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables */
-    const Word16 length,              /* i  : frame size                                       Q0*/
-    const Word16 core,                /* i  : core                                             Q0*/
-    const Word16 return_noise,        /* i  : noise is returned instead of added Q0*/
-    const Word16 secondary,           /* i  : flag to indicate secondary noise generation Q0*/
-    const Word16 element_mode,        /* i  : element mode Q0*/
-    STEREO_CNG_DEC_HANDLE hStereoCng, /* i  : stereo CNG handle */
-    const Word16 nchan_out            /* i  : number of output channels Q0*/
-)
-{
-    Word32 *cngNoiseLevel_fx = hFdCngCom->cngNoiseLevel;
-    Word32 *ptr_level_fx = cngNoiseLevel_fx;
-    Word32 *fftBuffer_fx = hFdCngCom->fftBuffer;
-    Word16 i;
-    Word32 maskingNoise_fx[L_FRAME16k];
-    Word32 *ptr_r_fx;
-    Word32 *ptr_i_fx;
-    Word16 startBand;
-    Word16 *seed = &( hFdCngCom->seed );
-    Word32 scale_fx;
-    Word16 shift;
-    scale_fx = 0x40000000; // 1.0 in Q30
-    move32();
-    startBand = hFdCngCom->startBand; /*Q0*/
-    move16();
-    shift = getScaleFactor32( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
-    if ( LT_16( sub( hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
-    {
-        shift = sub( hFdCngCom->cngNoiseLevelExp, 4 ); /*Q0*/
-    }
-    scale_sig32( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); /*hFdCngCom->cngNoiseLevelExp*/
-    hFdCngCom->cngNoiseLevelExp = sub( hFdCngCom->cngNoiseLevelExp, shift );
-    move16();
-
-    /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
-    *exp_out = Q15;
-    move16();
-    IF( GT_16( hFdCngCom->likelihood_noisy_speech, DELTA_MASKING_NOISE_Q15 ) )
-    {
-        IF( NE_16( core, AMR_WB_CORE ) )
-        {
-            /* Compute additional CN level */
-            FOR( i = 0; i < SIZE_SCALE_TABLE_CN; i++ )
-            {
-                test();
-                test();
-                if ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) &&
-                     GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) &&
-                     LT_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) )
-                {
-                    BREAK;
-                }
-            }
-
-            scale_fx = L_deposit_h( scaleTable_cn_only[i].scale_ivas ); /* Q30 */
-        }
-        ELSE
-        {
-            /* Compute additional CN level */
-            FOR( i = 0; i < SIZE_SCALE_TABLE_CN_AMRWB; i++ )
-            {
-                if ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only_amrwbio[i][0] ) )
-                {
-                    BREAK;
-                }
-            }
-
-            IF( LT_16( i, SIZE_SCALE_TABLE_CN_AMRWB ) )
-            {
-                scale_fx = L_deposit_h( scaleTable_cn_only_amrwbio[i][1] ); /* Q30 */
-            }
-            ELSE
-            {
-                scale_fx = 0;
-                move32();
-            }
-        }
-
-        /* Exclude clean speech */
-        scale_fx = Mpy_32_16_1( scale_fx, hFdCngCom->likelihood_noisy_speech ); // Q30
-
-        /* Generate Gaussian random noise in real and imaginary parts of the FFT bins
-          Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each bin */
-        IF( startBand == 0 )
-        {
-            rand_gauss_fx( &fftBuffer_fx[0], seed, *exp_out ); // Q15
-            ptr_r_fx = fftBuffer_fx + 2;                       /*Q31 - hFdCngCom->fftBuffer_exp*/
-            Word16 exp1;
-            exp1 = add( hFdCngCom->cngNoiseLevelExp, 1 );
-            Word32 mpy1;
-            mpy1 = Sqrt32( Mpy_32_32( scale_fx, *ptr_level_fx ), &exp1 );                   /*Q31 - exp1*/
-            mpy1 = L_shl( mpy1, exp1 );                                                     // Q31
-            fftBuffer_fx[0] = Mpy_32_32( fftBuffer_fx[0], mpy1 ); /* DC component in FFT */ // Q = Q15
-            ptr_level_fx++;
-        }
-        ELSE
-        {
-            fftBuffer_fx[0] = 0;
-            move32();
-            set32_fx( fftBuffer_fx + 2, 0, shl( sub( startBand, 1 ), 1 ) );
-            ptr_r_fx = fftBuffer_fx + shl( startBand, 1 ); /*Q31 - hFdCngCom->fftBuffer_exp*/
-        }
-        ptr_i_fx = ptr_r_fx + 1;
-        FOR( ; ptr_level_fx < cngNoiseLevel_fx + hFdCngCom->stopFFTbin - startBand; ptr_level_fx++ )
-        {
-            /* Real part in FFT bins */
-            rand_gauss_fx( ptr_r_fx, seed, *exp_out ); // Q15
-            Word16 exp2;
-            exp2 = add( hFdCngCom->cngNoiseLevelExp, 1 );
-            Word32 mpy2;
-            mpy2 = Sqrt32( L_shr( Mpy_32_32( scale_fx, *ptr_level_fx ), 1 ), &exp2 ); /*Q31 - exp2*/
-            ( *ptr_r_fx ) = L_shl( Mpy_32_32( *ptr_r_fx, mpy2 ), exp2 );              // Q = Q15
-            move32();
-            ptr_r_fx += 2;
-
-            /* Imaginary part in FFT bins */
-            rand_gauss_fx( ptr_i_fx, seed, *exp_out );                   // Q15
-            ( *ptr_i_fx ) = L_shl( Mpy_32_32( *ptr_i_fx, mpy2 ), exp2 ); // Q = Q15
-            ptr_i_fx += 2;
-        }
-
-        /* Remaining FFT bins are set to zero */
-        set32_fx( fftBuffer_fx + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
-        /* Nyquist frequency is discarded */
-        fftBuffer_fx[1] = 0;
-        move32();
-    }
-    ELSE
-    {
-        /* very low level case - update random seeds and reset FFT buffer; don't fully skip SynthesisSTFT_flt(), because of the buffer updates done there... */
-        generate_masking_noise_update_seed_fx( hFdCngCom );
-
-        set32_fx( fftBuffer_fx, 0, hFdCngCom->fftlen );
-    }
-
-    /* Perform STFT synthesis */
-    IF( secondary )
-    {
-        SynthesisSTFT_fx( fftBuffer_fx, maskingNoise_fx, hStereoCng->olapBufferSynth22_32fx, hFdCngCom->olapWinSyn_fx, 0, hFdCngCom, element_mode, nchan_out );
-    }
-    ELSE
-    {
-        SynthesisSTFT_fx( fftBuffer_fx, maskingNoise_fx, hFdCngCom->olapBufferSynth2_fx, hFdCngCom->olapWinSyn_fx, 0, hFdCngCom, element_mode, nchan_out );
-    }
-    *exp_out = sub( *exp_out, Q9 );
-    move16();
-
-    /* Add some comfort noise on top of decoded signal */
-    IF( return_noise )
-    {
-        Copy32( maskingNoise_fx, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ) ); /*Q31 - *exp_out*/
-    }
-    ELSE
-    {
-        v_add_fixed( maskingNoise_fx, timeDomainBuffer, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ), 0 ); /*Q31 - *exp_out*/
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------
- * generate_masking_noise_update_seed()
- *
- * Update seed for scenarios where generate_masking_noise() is
- * not called based on signal statistics
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------
- * generate_stereo_masking_noise_fx()
- *
- * Generate additional comfort noise (kind of noise filling)
- *-------------------------------------------------------------------*/
-
-void generate_stereo_masking_noise_fx(
-    Word16 *syn, /* i/o: time-domain signal              Q_syn*/
-    Word16 Q_syn,
-    Decoder_State *st,                   /* i/o: decoder state structure         */
-    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i  : TD stereo structure             */
-    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel  Q0*/
-    const Word16 fadeOut,                /* i  : only fade out of previous state Q0*/
-    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : Stereo CNG handle               */
-    const Word16 nchan_out               /* i  : number of output channels       Q0*/
-)
-{
-    HANDLE_FD_CNG_COM hFdCngCom;
-    Word32 gamma_fx, scale_fx /*, SP_ratio_fx needs to be integrated*/;
-    Word32 Np_fx[L_FRAME16k];
-    Word32 Ns_fx[L_FRAME16k];
-    Word32 N1_fx[L_FRAME16k];
-    Word32 N2_fx[L_FRAME16k];
-    Word16 N1_fx_exp, N2_fx_exp;
-    Word16 i;
-
-    IF( st->idchan == 0 )
-    {
-        hFdCngCom = st->hFdCngDec->hFdCngCom;
-        Copy_Scale_sig_16_32( hStereoCng->olapBufferSynth22_fx, Ns_fx, shr( hFdCngCom->frameSize, 1 ), sub( Q6, st->Q_syn ) ); /*Q6*/
-        Copy32( hFdCngCom->olapBufferSynth2_fx, Np_fx, shr( hFdCngCom->frameSize, 1 ) );                                       /*st->Q_syn*/
-
-        set32_fx( &Np_fx[( hFdCngCom->frameSize / 2 )], 0, shr( hFdCngCom->frameSize, 1 ) );
-        set32_fx( &Ns_fx[( hFdCngCom->frameSize / 2 )], 0, shr( hFdCngCom->frameSize, 1 ) );
-
-        IF( !fadeOut )
-        {
-            Copy_Scale_sig_16_32( hStereoCng->olapBufferSynth22_fx, hStereoCng->olapBufferSynth22_32fx, hFdCngCom->fftlen, sub( Q15, st->Q_syn ) ); /*Q15*/
-
-            generate_masking_noise_ivas_fx( N1_fx, &N1_fx_exp, hFdCngCom, hFdCngCom->frameSize, 0, 1, 0, st->element_mode, hStereoCng, nchan_out ); // N1_fx Q6
-            /* Generate masking noise for secondary channel */
-            IF( flag_sec_CNA )
-            {
-                generate_masking_noise_ivas_fx( N2_fx, &N2_fx_exp, hFdCngCom, hFdCngCom->frameSize, 0, 1, 1, st->element_mode, hStereoCng, nchan_out ); // N2_fx Q6
-                gamma_fx = L_shr( Mpy_32_32( hStereoCng->c_PS_LT_fx, hStereoCng->c_PS_LT_fx ), 1 );                                                     /*Q30*/
-                scale_fx = ONE_IN_Q30;
-                move32();
-                IF( LT_32( gamma_fx, 966367642 /* 0.9 in Q30 */ ) )
-                {
-                    Word16 exp_gamma;
-                    exp_gamma = 0;
-                    move16();
-                    Word16 divisor1;
-                    divisor1 = Inv16( (Word16) L_shr( L_sub( ONE_IN_Q30, gamma_fx ), Q15 ), &exp_gamma ); // Q15-exp_gamma
-                    gamma_fx = L_shl( Mpy_32_16_1( gamma_fx, divisor1 ), exp_gamma );                     // Q30
-                    Word16 exp_gamma1, exp_gamma2, exp_gamma3;
-                    exp_gamma1 = Q1;
-                    exp_gamma2 = Q1;
-                    exp_gamma3 = Q1;
-                    move16();
-                    move16();
-                    move16();
-                    gamma_fx = Sqrt32( L_add( gamma_fx, ONE_IN_Q30 ), &exp_gamma1 ); /*Q31 - exp_gamma1*/
-                    Word32 temp;
-                    temp = Sqrt32( gamma_fx, &exp_gamma2 );                                     // Q31-exp_gamma1
-                    gamma_fx = L_sub( gamma_fx, L_shl( temp, sub( exp_gamma2, exp_gamma1 ) ) ); // Q31-exp_gamma1
-                    gamma_fx = L_shl( gamma_fx, sub( exp_gamma1, Q1 ) );                        // Q30
-                    Word32 divisor2;
-                    divisor2 = Sqrt32( L_add( ONE_IN_Q30, L_shl( Mpy_32_32( gamma_fx, gamma_fx ), Q1 ) ), &exp_gamma3 ); // Q31 - exp_gamma3
-                    scale_fx = L_shl( divide3232( ONE_IN_Q30, divisor2 ), add( Q15, exp_gamma3 ) );                      // Q30
-                }
-                ELSE
-                {
-                    gamma_fx = 0;
-                    move16();
-                }
-
-                FOR( i = 0; i < 2 * hFdCngCom->frameSize / 4; i++ )
-                {
-                    Np_fx[i] = L_add( Np_fx[i],
-                                      Mpy_32_32( scale_fx, L_shl( L_add( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ) ); // Q6
-                    move32();
-                    Word32 add2;
-                    add2 = Mpy_32_32( scale_fx, L_shl( L_sub( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ); // Q6
-                    if ( hStereoCng->c_PS_LT_fx < 0 )
-                    {
-                        add2 = L_negate( add2 ); /*Q6*/
-                    }
-                    Ns_fx[i] = L_add( Ns_fx[i], add2 ); /*Q6*/
-                    move32();
-                }
-                FOR( ; i < hFdCngCom->frameSize; i++ )
-                {
-                    Np_fx[i] = Mpy_32_32( scale_fx, L_shl( L_add( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ); // Q6
-                    move32();
-                    Ns_fx[i] = Mpy_32_32( scale_fx, L_shl( L_sub( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ); // Q6
-                    move32();
-                    IF( hStereoCng->c_PS_LT_fx < 0 )
-                    {
-                        Ns_fx[i] = L_negate( Ns_fx[i] );
-                        move32();
-                    }
-                }
-                /* Below code to be converted */
-                Word32 scale_fx_tmp = Mpy_32_32( scale_fx, L_shl( shr( hFdCngCom->fftlen, 1 ), Q22 ) ); // Q21
-                FOR( i = 0; i < shr( hFdCngCom->frameSize, 1 ); i++ )
-                {
-                    hFdCngCom->olapBufferSynth2[i] = (Word16) L_shr( Mpy_32_32( scale_fx_tmp,
-                                                                                L_add( L_shr( hFdCngCom->olapBufferSynth2[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )], Q15 ),
-                                                                                       Mpy_32_16_1( gamma_fx, hStereoCng->olapBufferSynth22_fx[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )] ) ) ),
-                                                                     Q14 ); // Q_olap
-                    move16();
-                    hStereoCng->olapBufferSynth22_fx[i] = (Word16) L_shr( Mpy_32_32( scale_fx_tmp,
-                                                                                     L_sub( L_shr( hFdCngCom->olapBufferSynth2[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )], Q15 ),
-                                                                                            Mpy_32_16_1( gamma_fx, hStereoCng->olapBufferSynth22_fx[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )] ) ) ),
-                                                                          Q14 ); // Q_olap
-                    move16();
-                }
-            }
-            ELSE
-            {
-                FOR( i = 0; i < shr( hFdCngCom->frameSize, 1 ); i++ )
-                {
-                    Np_fx[i] = L_add( Np_fx[i], N1_fx[i] ); // Q6
-                    move32();
-                }
-                Copy32( &N1_fx[( hFdCngCom->frameSize / 2 )], &Np_fx[( hFdCngCom->frameSize / 2 )], shr( hFdCngCom->frameSize, 1 ) ); /*Q6*/
-                scale_fx = L_shl( shr( hFdCngCom->fftlen, 1 ), Q22 );                                                                 // Q21
-                FOR( i = 0; i < hFdCngCom->frameSize; i++ )
-                {
-                    hFdCngCom->olapBufferSynth2[i] = (Word16) L_shr( Mpy_32_16_1( scale_fx, hFdCngCom->olapBufferSynth2[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )] ), Q6 ); // Q_olap
-                    move16();
-                }
-            }
-
-            Copy_Scale_sig_32_16( hStereoCng->olapBufferSynth22_32fx, hStereoCng->olapBufferSynth22_fx, hFdCngCom->fftlen, sub( st->Q_syn, 15 ) ); /*st->Q_syn*/
-        }
-        ELSE
-        {
-            set16_fx( hFdCngCom->olapBufferSynth2, 0, shr( hFdCngCom->frameSize, 1 ) );
-            set16_fx( hStereoCng->olapBufferSynth22_fx, 0, shr( hFdCngCom->frameSize, 1 ) );
-        }
-        IF( flag_sec_CNA )
-        {
-            Copy_Scale_sig_32_16( Ns_fx, hStereoCng->maskingNoiseS_fx, hFdCngCom->frameSize, 0 ); // Q6
-            hStereoCng->enableSecCNA = 1;
-            move16();
-        }
-        ELSE
-        {
-            set16_fx( hStereoCng->olapBufferSynth22_fx, 0, hFdCngCom->frameSize );
-        }
-
-        /* add masking noise */
-        FOR( i = 0; i < hFdCngCom->frameSize; i++ )
-        {
-            syn[i] = add( syn[i], (Word16) L_shr( Np_fx[i], sub( Q16 + Q6, Q_syn ) ) ); // Q_syn
-            move16();
-        }
-    }
-    ELSE IF( hStereoCng->enableSecCNA )
-    {
-        Word16 SP_ratio_fx;
-        SP_ratio_fx = extract_h( hStereoTD->SP_ratio_LT_fx ); /* Use long-term SP ratio based on L/R synthesis Q15*/
-        Word16 prevSP_ratio_fx;
-        prevSP_ratio_fx = hStereoTD->prevSP_ratio_fx; /* Use long-term SP ratio based on L/R synthesis Q15*/
-        move16();
-        /* scale and add masking noise */
-        FOR( i = 0; i < shr( *hStereoCng->frameSize, 2 ); i++ )
-        {
-            Word16 s;
-            Word16 scale_fx_tmp;
-            scale_fx_tmp = BASOP_Util_Divide3216_Scale( L_add( L_mult0( prevSP_ratio_fx, sub( shr( *hStereoCng->frameSize, 2 ), i ) ), L_mult0( SP_ratio_fx, i ) ), shr( *hStereoCng->frameSize, 2 ), &s ); // Q15
-            scale_fx_tmp = shl( scale_fx_tmp, s );
-            syn[i] = add( syn[i], mult( scale_fx_tmp, shr( hStereoCng->maskingNoiseS_fx[i], sub( Q6, Q_syn ) ) ) ); /*Q_syn*/
-            move16();
-        }
-        FOR( ; i < *hStereoCng->frameSize / 2; i++ )
-        {
-            syn[i] = add( syn[i], mult( SP_ratio_fx, shr( hStereoCng->maskingNoiseS_fx[i], sub( Q6, Q_syn ) ) ) ); /*Q_syn*/
-            move16();
-        }
-        FOR( ; i < *hStereoCng->frameSize; i++ )
-        {
-            syn[i] = add( syn[i], mult( SP_ratio_fx, shr( hStereoCng->maskingNoiseS_fx[i], sub( Q6, Q_syn ) ) ) ); /*Q_syn*/
-            move16();
-        }
-        hStereoTD->prevSP_ratio_fx = extract_h( hStereoTD->SP_ratio_LT_fx ); /*Q15*/
-        move16();
-    }
-
-    return;
-}
-void generate_masking_noise_lb_dirac_fx(
-    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
-    Word32 *tdBuffer,            /* i/o: time-domain signal, if NULL no LB-CNA                 Q11*/
-    const Word16 nCldfbTs,       /* i  : number of CLDFB slots that will be rendered           Q0*/
-    const Word16 cna_flag        /* i  : CNA flag for LB and HB                                Q0*/
-)
-{
-    Word16 i;
-    Word32 *cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*hFdCngCom->cngNoiseLevelExp*/
-    Word32 *fftBuffer = hFdCngCom->fftBuffer;         /*hFdCngCom->fftBuffer_exp*/
-    Word32 *ptr_r;
-    Word32 *ptr_i;
-    Word32 *ptr_level;
-    Word16 *seed = &( hFdCngCom->seed );
-    Word32 scale;
-    Word16 n_samples_out, n_samples_start, n_samples_out_loop;
-
-    push_wmops( "fd_cng_dirac" );
-
-    /* Init */
-    scale = 0;
-    move32();
-    n_samples_out = i_mult( shr( hFdCngCom->frameSize, 4 ), nCldfbTs );
-    n_samples_start = 0;
-    move16();
-    Word16 exp_out = Q11;
-    move16();
-    /*LB CLDFB - CNA from STFT*/
-    IF( cna_flag )
-    {
-        /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
-        IF( GT_16( hFdCngCom->likelihood_noisy_speech, DELTA_MASKING_NOISE_Q15 ) )
-        {
-            /* Compute additional CN level */
-            FOR( i = 0; i < 15; i++ )
-            {
-                test();
-                test();
-                if ( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_dirac[i].bwmode ) ) &&
-                     GE_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateFrom ) &&
-                     LT_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateTo ) )
-                {
-                    BREAK;
-                }
-            }
-
-            scale = L_deposit_h( scaleTable_cn_dirac[i].scale_ivas );         /* Q30 */
-            scale = Mpy_32_16_1( scale, hFdCngCom->likelihood_noisy_speech ); /* Q30 */
-        }
-    }
-
-    /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/
-    test();
-    IF( cna_flag && tdBuffer != NULL )
-    {
-        WHILE( n_samples_out > 0 )
-        {
-            n_samples_out_loop = s_min( hFdCngCom->frameSize, n_samples_out );
-            IF( scale != 0 )
-            {
-                /*Generate LF comfort noise only at first slot, for the whole frame*/
-                ptr_level = cngNoiseLevel; /*hFdCngCom->cngNoiseLevelExp*/
-
-                /* Generate Gaussian random noise in real and imaginary parts of the FFT bins
-                   Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each bin */
-                IF( EQ_16( hFdCngCom->startBand, 0 ) )
-                {
-                    rand_gauss_fx( &fftBuffer[0], seed, exp_out );
-                    ptr_r = fftBuffer + 2; /*hFdCngCom->fftBuffer_exp*/
-
-                    Word16 exp2 = sub( 31, hFdCngCom->cngNoiseLevelExp );
-                    Word32 sqr = Sqrt32( L_shr( Mpy_32_32( scale, *ptr_level ), 1 ), &exp2 ); /* DC component in FFT Q31 - exp2*/
-                    sqr = L_shl( sqr, exp2 );                                                 /*Q31*/
-                    fftBuffer[0] = Mpy_32_32( fftBuffer[0], sqr );                            /* DC component in FFT Q31 - hFdCngCom->fftBuffer_exp*/
-                    move32();
-                    ptr_level++;
-                }
-                ELSE
-                {
-                    fftBuffer[0] = 0;
-                    move32();
-                    set32_fx( fftBuffer + 2, 0, shl( sub( hFdCngCom->startBand, 1 ), 1 ) );
-                    ptr_r = fftBuffer + shl( hFdCngCom->startBand, 1 ); /*hFdCngCom->fftBuffer_exp*/
-                }
-                ptr_i = ptr_r + 1; /*hFdCngCom->fftBuffer_exp*/
-
-                FOR( ; ptr_level < cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); ptr_level++ )
-                {
-                    rand_gauss_fx( ptr_r, seed, exp_out );
-                    Word16 exp2 = hFdCngCom->cngNoiseLevelExp;
-                    Word32 mpy2 = Sqrt32( Mpy_32_32( scale, *ptr_level ), &exp2 ); /*Q31 - exp2*/
-                    ( *ptr_r ) = L_shl( Mpy_32_32( *ptr_r, mpy2 ), exp2 );         /*Q31 - hFdCngCom->fftBuffer_exp*/
-                    move32();
-                    ptr_r += 2;
-
-                    /* Imaginary part in FFT bins */
-                    rand_gauss_fx( ptr_i, seed, exp_out );
-                    ( *ptr_i ) = L_shl( Mpy_32_32( *ptr_i, mpy2 ), exp2 ); /*Q31 - hFdCngCom->fftBuffer_exp*/
-                    move32();
-                    ptr_i += 2;
-                }
-                /* Remaining FFT bins are set to zero */
-                set32_fx( fftBuffer + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
-                /* Nyquist frequency is discarded */
-                fftBuffer[1] = 0;
-                move32();
-
-                /* Perform STFT synthesis */
-                SynthesisSTFT_dirac_fx( fftBuffer, tdBuffer + n_samples_start, hFdCngCom->olapBufferSynth2_fx, hFdCngCom->olapWinSyn_fx, n_samples_out_loop, hFdCngCom );
-                scale_sig32( tdBuffer + n_samples_start, n_samples_out_loop, Q9 ); // Q2 -> Q11
-            }
-
-            ELSE
-            {
-                /* very low level case - update random seeds */
-                generate_masking_noise_update_seed_fx( hFdCngCom );
-
-                set32_fx( fftBuffer, 0, hFdCngCom->fftlen );
-                /* Perform STFT synthesis */
-                SynthesisSTFT_dirac_fx( fftBuffer, tdBuffer + n_samples_start, hFdCngCom->olapBufferSynth2_fx, hFdCngCom->olapWinSyn_fx, n_samples_out_loop, hFdCngCom );
-            }
-            hFdCngCom->fftBuffer_exp = 31 - 11;
-            move16();
-            n_samples_out = sub( n_samples_out, hFdCngCom->frameSize );
-            n_samples_start = add( n_samples_start, hFdCngCom->frameSize );
-        }
-    }
-
-    pop_wmops();
-
-    return;
-}
-void generate_masking_noise_dirac_ivas_fx(
-    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables */
-    HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i  : filterbank state                                      */
-    Word32 *tdBuffer_fx,              /* i/o: time-domain signal, if NULL no LB-CNA                 q_input*/
-    Word32 *Cldfb_RealBuffer_fx,      /* o  : CLDFD real buffer                                     q_cldfb*/
-    Word32 *Cldfb_ImagBuffer_fx,      /* o  : CLDFD imaginary buffer                                q_cldfb*/
-    const Word16 slot_index,          /* i  : CLDFB slot index                                      Q0*/
-    const Word16 cna_flag,            /* i  : CNA flag for LB and HB                                Q0*/
-    const Word16 fd_cng_flag,         /* i  : FD-CNG flag for HB                                    Q0*/
-    Word16 q_input,
-    Word16 *q_cldfb )
-{
-    Word16 i;
-    Word32 *ptr_level_fx;
-    Word16 *seed = &( hFdCngCom->seed );
-    Word32 scale_fx;
-    Word16 q_scale, q_shift, q_ptr_level;
-
-    push_wmops( "fd_cng_dirac" );
-
-    /* Init */
-    scale_fx = 0;
-    move32();
-
-    /* Resample CLDFB memories if necessary*/
-    IF( NE_16( i_mult( h_cldfb->no_channels, h_cldfb->no_col ), hFdCngCom->frameSize ) )
-    {
-        resampleCldfb_ivas_fx( h_cldfb, hFdCngCom->frameSize * FRAMES_PER_SEC );
-    }
-
-    set32_fx( Cldfb_RealBuffer_fx, 0, CLDFB_NO_CHANNELS_MAX );
-    set32_fx( Cldfb_ImagBuffer_fx, 0, CLDFB_NO_CHANNELS_MAX );
-
-    /*LB CLDFB - CNA from STFT*/
-    IF( cna_flag != 0 )
-    {
-        /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
-        IF( hFdCngCom->likelihood_noisy_speech > 0 )
-        {
-            /* Compute additional CN level */
-            FOR( i = 0; i < 15; i++ )
-            {
-                test();
-                test();
-                if ( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_dirac[i].bwmode ) ) &&
-                     ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateFrom ) ) &&
-                     ( LT_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateTo ) ) )
-                {
-                    BREAK;
-                }
-            }
-
-            scale_fx = L_shr( L_deposit_h( scaleTable_cn_dirac[i].scale_ivas ), Q3 ); /* Q27 */
-            scale_fx = Mpy_32_16_1( scale_fx, hFdCngCom->likelihood_noisy_speech );
-        }
-    }
-    /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/
-    IF( cna_flag && tdBuffer_fx != NULL )
-    {
-        *q_cldfb = q_input;
-        move16();
-        IF( scale_fx != 0 )
-        {
-            /* LF CLDFB*/
-            cldfbAnalysis_ts_fx_fixed_q( &( tdBuffer_fx[( hFdCngCom->numCoreBands * slot_index )] ), Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hFdCngCom->numCoreBands, h_cldfb, q_cldfb );
-        }
-        ELSE
-        {
-            /* LB ana CLDFB*/
-            cldfbAnalysis_ts_fx_fixed_q( &( tdBuffer_fx[( hFdCngCom->numCoreBands * slot_index )] ), Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hFdCngCom->numCoreBands, h_cldfb, q_cldfb );
-        }
-    }
-
-    /*HF CLDFB - CNA and/or FD-CNG*/
-    if ( fd_cng_flag )
-    {
-        scale_fx = L_add( scale_fx, ONE_IN_Q27 ); // 1 in Q27
-    }
-    IF( scale_fx != 0 )
-    {
-        q_scale = 27;
-        move16();
-        q_shift = norm_l( scale_fx );
-        scale_fx = L_shl( scale_fx, q_shift ); /*q_scale+q_shift*/
-        q_scale = add( q_scale, q_shift );
-        scale_fx = Mpy_32_32( scale_fx, Mpy_32_16_1( L_mult( h_cldfb->scale, h_cldfb->scale ), CLDFB_SCALING ) ); // Q = q_scale + 2 * Q8 - 34
-        q_scale = sub( add( q_scale, 2 * Q8 ), 31 );
-        ptr_level_fx = hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-        q_ptr_level = sub( 31, hFdCngCom->cngNoiseLevelExp );
-
-        FOR( i = hFdCngCom->numCoreBands; i < hFdCngCom->regularStopBand; i++ )
-        {
-            Word32 num;
-            Word16 exp, q_num;
-            q_shift = norm_l( scale_fx );
-            scale_fx = L_shl( scale_fx, q_shift ); /*q_scale+q_shift*/
-            q_scale = add( q_scale, q_shift );
-            num = Mpy_32_32( scale_fx, *ptr_level_fx ); /*q_num*/
-            q_num = sub( add( q_scale, q_ptr_level ), 31 );
-            exp = sub( 31, q_num );
-            num = Sqrt32( num, &exp ); /*Q31 - exp*/
-            /* Real part in CLDFB band */
-            rand_gauss_fx( &Cldfb_RealBuffer_fx[i], seed, *q_cldfb );
-            Cldfb_RealBuffer_fx[i] = L_shl( Mpy_32_32( Cldfb_RealBuffer_fx[i], num ), exp );
-            move32();
-            /* Imaginary part in CLDFB band */
-            rand_gauss_fx( &Cldfb_ImagBuffer_fx[i], seed, *q_cldfb );
-            Cldfb_ImagBuffer_fx[i] = L_shl( Mpy_32_32( Cldfb_ImagBuffer_fx[i], num ), exp );
-            move32();
-
-            ptr_level_fx++;
-        }
-    }
-
-    pop_wmops();
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------
- * FdCngDecodeMDCTStereoSID()
- *
- * Decode FD-Cng parameters for CNG in MDCT-Stereo mode from the bitstream
- *
- *-------------------------------------------------------------------*/
-
-void FdCngDecodeMDCTStereoSID_fx(
-    CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure     */
-)
-{
-    DEC_CORE_HANDLE sts[CPE_CHANNELS];
-    HANDLE_FD_CNG_COM hFdCngCom;
-    Word32 *ms_ptr_fx[CPE_CHANNELS];
-    Word32 *lr_ptr_fx[CPE_CHANNELS];
-    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
-    Word32 gain_fx[CPE_CHANNELS];
-    Word16 indices[FD_CNG_stages_37bits];
-    Word16 N, i, ch, p, stages;
-    Word16 is_out_ms;
-    Word32 *invTrfMatrix_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    Word16 shift, exp_diff, max_exp_idx;
-    Word16 exp_arr[NPART];
-    Word32 tmp32, tmp32_arr[NPART];
-
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;
-    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC ); // Q31
-
-    is_out_ms = 0;
-    move16();
-    if ( hCPE->hCoreCoder[0]->cng_sba_flag )
-    {
-        is_out_ms = 1;
-        move16();
-    }
-
-    N = 0; /* to avoid compilation warning */
-    move16();
-
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        sts[ch] = hCPE->hCoreCoder[ch];
-        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];                         /*Q20*/
-        lr_ptr_fx[ch] = &sts[ch]->hFdCngDec->hFdCngCom->sidNoiseEst[0]; /*Q18*/
-    }
-
-    /* decode noise shapes and gains */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        sts[ch] = hCPE->hCoreCoder[ch];
-        hFdCngCom = ( sts[ch]->hFdCngDec )->hFdCngCom;
-        N = hFdCngCom->npart;
-        move16();
-        hFdCngCom->sid_frame_counter = add( hFdCngCom->sid_frame_counter, 1 ); /*Q0*/
-        move16();
-
-        IF( ch )
-        {
-            stages = FD_CNG_JOINT_stages_25bits;
-            move16();
-        }
-        ELSE
-        {
-            stages = FD_CNG_stages_37bits;
-            move16();
-        }
-
-        /* read bitstream */
-        FOR( i = 0; i < stages; i++ )
-        {
-            indices[i] = get_next_indice_fx( sts[ch], bits_37bits[i] ); /*Q0*/
-            move16();
-        }
-        {
-            gain_fx[ch] = Mpy_32_32( L_shl( L_sub( get_next_indice_fx( sts[ch], 7 ), GAIN_Q_OFFSET_IVAS_FX ), Q20 ), TWO_BY_THREE_Q31 /* 2/3 in Q31 */ ); // Q20
-            move32();
-        }
-
-        /* MSVQ decoder */
-        shift = find_guarded_bits_fx( N );
-        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, ms_ptr_fx[ch], NULL, 7 ); // Q20 - shift
-
-        Scale_sig32( ms_ptr_fx[ch], N, shift ); // Q20
-    }
-
-    dtx_read_padding_bits_fx( sts[1], mult( sub( IVAS_SID_5k2, 4400 ), ONE_BY_FRAMES_PER_SEC_Q15 ) );
-
-    IF( sts[0]->hFdCngDec->hFdCngCom->no_side_flag )
-    {
-        set32_fx( ms_ptr_fx[1], 0, NPART );
-    }
-
-    IF( EQ_16( is_out_ms, 0 ) )
-    {
-        inverseMS_fx( N, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q31 );
-    }
-
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        max_exp_idx = 0;
-        move16();
-        hFdCngCom = sts[ch]->hFdCngDec->hFdCngCom;
-        FOR( p = 0; p < N; p++ )
-        {
-            tmp32 = L_add( ms_ptr_fx[ch][p], gain_fx[ch] );                                                  // Q20
-            tmp32_arr[p] = BASOP_util_Pow2( Mpy_32_32( tmp32, LOG_10_BASE_2_BY_10_Q31 ), Q11, &exp_arr[p] ); /*Q31 - exp_arr[p]*/
-            move32();
-            if ( LT_16( exp_arr[max_exp_idx], exp_arr[p] ) )
-            {
-                max_exp_idx = p; /*Q0*/
-                move16();
-            }
-        }
-
-        // Bringing in same exponent
-        FOR( p = 0; p < N; p++ )
-        {
-            lr_ptr_fx[ch][p] = L_shl( tmp32_arr[p], sub( exp_arr[p], exp_arr[max_exp_idx] ) ); /*Q31 - exp_arr[max_exp_idx]*/
-            move32();
-        }
-
-        hFdCngCom->sidNoiseEstExp = exp_arr[max_exp_idx];
-        move16();
-
-        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );
-
-        hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
-        move16();
-
-        lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, sts[ch]->preemph_fac );
-    }
-
-    test();
-    IF( EQ_16( hCPE->nchan_out, 1 ) && LE_32( hCPE->last_element_brate, IVAS_SID_5k2 ) )
-    {
-        /* create proper M noise shape in channel zero after gains have been applied */
-        exp_diff = sub( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, sts[1]->hFdCngDec->hFdCngCom->sidNoiseEstExp );
-        move16();
-        FOR( p = 0; p < N; p++ )
-        {
-            IF( GT_16( exp_diff, 0 ) )
-            {
-                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], add( exp_diff, 1 ) ) ); /*Q18*/
-                move32();
-            }
-            ELSE
-            {
-                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], sub( 1, exp_diff ) ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ) ); /*Q18*/
-                move32();
-            }
-        }
-        IF( LT_16( exp_diff, 0 ) )
-        {
-            sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp = add( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, negate( exp_diff ) );
-            move16();
-        }
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------
- * FdCngDecodeDiracMDCTStereoSID_fx()
- *
- * Decode FD-CNG parameters for CNG in 2TC DirAC mode from the bitstream
- *-------------------------------------------------------------------*/
-
-void FdCngDecodeDiracMDCTStereoSID_fx(
-    CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure     */
-)
-{
-    DEC_CORE_HANDLE sts[CPE_CHANNELS];
-    HANDLE_FD_CNG_COM hFdCngCom;
-    Word32 *ms_ptr_fx[CPE_CHANNELS];
-    Word32 *lr_ptr_fx[CPE_CHANNELS];
-    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
-    Word32 gain_fx[CPE_CHANNELS];
-    Word16 indices[FD_CNG_stages_37bits];
-    Word16 N, i, ch, p;
-    Word32 *invTrfMatrix_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    Word16 shift, exp_diff, max_exp_idx;
-    Word16 exp_arr[NPART];
-    Word32 tmp32, tmp32_arr[NPART];
-
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;                                                                                        /* dynamically filled  */
-    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC ); // Q31
-
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        sts[ch] = hCPE->hCoreCoder[ch];
-        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];                         /*Q20*/
-        lr_ptr_fx[ch] = &sts[ch]->hFdCngDec->hFdCngCom->sidNoiseEst[0]; /*Q20*/
-        ( sts[ch]->hFdCngDec )->hFdCngCom->sid_frame_counter++;         /*Q18*/
-    }
-
-    /* decode noise shapes and gains */
-    hFdCngCom = ( sts[0]->hFdCngDec )->hFdCngCom;
-    N = hFdCngCom->npart; /*Q0*/
-    move16();
-
-    /* read bitstream */
-    FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
-    {
-        indices[i] = get_next_indice_fx( sts[0], bits_37bits[i] ); /*Q0*/
-        move16();
-    }
-    gain_fx[0] = Mpy_32_32( L_shl( L_sub( get_next_indice_fx( sts[0], 7 ), GAIN_Q_OFFSET_IVAS_FX ), Q20 ), TWO_BY_THREE_Q31 /* 2/3 in Q31 */ ); // Q20
-    move32();
-
-    gain_fx[1] = gain_fx[0]; /*Q20*/
-    move32();
-
-    /* MSVQ decoder */
-    shift = find_guarded_bits_fx( N );
-    msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, ms_ptr_fx[0], NULL, 7 ); // Q20 - shift
-
-    Scale_sig32( ms_ptr_fx[0], N, shift ); // Q20
-
-    Copy32( ms_ptr_fx[0], ms_ptr_fx[1], N ); /*Q20*/
-
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        max_exp_idx = 0;
-        move16();
-        hFdCngCom = sts[ch]->hFdCngDec->hFdCngCom;
-
-        FOR( p = 0; p < N; p++ )
-        {
-            tmp32 = L_add( ms_ptr_fx[ch][p], gain_fx[ch] );                                                  // Q20
-            tmp32_arr[p] = BASOP_util_Pow2( Mpy_32_32( tmp32, LOG_10_BASE_2_BY_10_Q31 ), Q11, &exp_arr[p] ); /*Q31 - exp_arr[p]*/
-            move32();
-            if ( LT_16( exp_arr[max_exp_idx], exp_arr[p] ) )
-            {
-                max_exp_idx = p; /*Q0*/
-                move16();
-            }
-        }
-
-        // Bringing in same exponent
-        FOR( p = 0; p < N; p++ )
-        {
-            lr_ptr_fx[ch][p] = L_shl( tmp32_arr[p], sub( exp_arr[p], exp_arr[max_exp_idx] ) ); /*Q20*/
-            move32();
-        }
-
-        hFdCngCom->sidNoiseEstExp = exp_arr[max_exp_idx]; /*Q0*/
-        move16();
-
-        /* NB last band energy compensation */
-        test();
-        IF( hFdCngCom->CngBandwidth == NB )
-        {
-            lr_ptr_fx[ch][( N - 1 )] = Mpy_32_32( lr_ptr_fx[ch][( N - 1 )], NB_LAST_BAND_SCALE_Q31 ); /*Q20*/
-            move32();
-        }
-        ELSE IF( EQ_16( hFdCngCom->CngBandwidth, SWB ) && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
-        {
-            lr_ptr_fx[ch][( N - 1 )] = Mpy_32_32( lr_ptr_fx[ch][( N - 1 )], SWB_13k2_LAST_BAND_SCALE_Q31 ); /*Q20*/
-            move32();
-        }
-
-        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );
-
-        hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
-        move16();
-
-        lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, sts[ch]->preemph_fac );
-    }
-    sts[0]->hFdCngDec->hFdCngCom->coherence_fx = 0;
-    move16();
-    sts[1]->hFdCngDec->hFdCngCom->coherence_fx = 0;
-    move16();
-
-    IF( EQ_16( hCPE->nchan_out, 1 ) )
-    {
-        /* create proper M noise shape in channel zero after gains have been applied */
-        exp_diff = sub( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, sts[1]->hFdCngDec->hFdCngCom->sidNoiseEstExp );
-        FOR( p = 0; p < N; p++ )
-        {
-            IF( exp_diff > 0 )
-            {
-                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], add( exp_diff, 1 ) ) ); /*Q18*/
-                move32();
-            }
-            ELSE
-            {
-                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], sub( 1, exp_diff ) ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ) ); /*Q18*/
-                move32();
-            }
-        }
-        IF( exp_diff < 0 )
-        {
-            sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp = add( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, negate( exp_diff ) );
-            move16();
-        }
-    }
-
-    return;
-}
diff --git a/lib_dec/fd_cng_dec_fx.c b/lib_dec/fd_cng_dec_fx.c
index 2bb2a39ec3184f06b3bda44d11079d0c3afa0ebf..cc83eeca320bd3c993587d97b9320ebfc768e0c4 100644
--- a/lib_dec/fd_cng_dec_fx.c
+++ b/lib_dec/fd_cng_dec_fx.c
@@ -20,10 +20,18 @@
 #endif
 
 
-#define CNA_ACT_DN_LARGE_PARTITION 50    /* index of the first larger partition */
-#define ST_PERIODOG_FACT_Q15       29491 /* 0.9 in Q15, short-term filter factor for periodogram */
-#define CNA_ACT_DN_FACT_Q15        22938 /* 0.7 in Q15, downward updating factor for CNA during active frames */
-#define FIRST_CNA_NOISE_UPD_FRAMES 5     /* minimum number of CN initialization frames */
+#define CNA_ACT_DN_LARGE_PARTITION   50    /* index of the first larger partition */
+#define ST_PERIODOG_FACT_Q15         29491 /* 0.9 in Q15, short-term filter factor for periodogram */
+#define CNA_ACT_DN_FACT_Q15          22938 /* 0.7 in Q15, downward updating factor for CNA during active frames */
+#define FIRST_CNA_NOISE_UPD_FRAMES   5     /* minimum number of CN initialization frames */
+#define DELTA_MASKING_NOISE_Q15      0
+#define LOG_10_BASE_2                1783446566 /* Q29 */
+#define GAIN_Q_OFFSET_IVAS_FX        45
+#define LOG_10_BASE_2_BY_10_Q31      713378606
+#define TWO_BY_THREE_Q31             1431655765
+#define ONE_BY_FRAMES_PER_SEC_Q15    656
+#define NB_LAST_BAND_SCALE_Q31       1717986918
+#define SWB_13k2_LAST_BAND_SCALE_Q31 1717986918
 
 /********************************
  * External tables               *
@@ -179,9 +187,7 @@ void initFdCngDec_ivas_fx(
     st->CNG_mode = -1;
     move16();
     Copy( st->lsp_old_fx, st->lspCNG_fx, M ); /*Q15*/
-#ifdef MSAN_FIX
     hFdCngDec->hFdCngCom->sid_frame_counter = 0;
-#endif
     return;
 }
 
@@ -271,30 +277,6 @@ void initFdCngDec_fx(
     hFdCngDec->smoothed_psd_exp = 0;
     move16();
 
-#ifdef IVAS_CODE_CNG
-    set_f( hFdCngDec->hFdCngCom->sidNoiseEstLp, 0.0f, NPART );
-
-    set_f( hFdCngDec->smoothed_psd, 0.0f, L_FRAME16k );
-    set_f( hFdCngDec->msPeriodog_ST, 0.0f, NPART_SHAPING );
-
-    hFdCngDec->ms_last_inactive_bwidth = NB;
-    hFdCngDec->ms_cnt_bw_up = 0;
-
-    hFdCngDec->cna_LR_LT = 0.5f;
-    hFdCngDec->cna_ILD_LT = 0.0f;
-    hFdCngDec->first_cna_noise_updated = 0;
-    hFdCngDec->first_cna_noise_update_cnt = 0;
-    hFdCngDec->cna_nbands = 6;
-    mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, MAX_CNA_NBANDS + 1 );
-    hFdCngDec->cna_act_fact = 1.0f;
-    hFdCngDec->cna_rescale_fact = 0.0f;
-    hFdCngDec->cna_seed = 5687;
-    set_zero( hFdCngDec->cna_cm, STEREO_DFT_BAND_MAX );
-    set_zero( hFdCngDec->cna_g_state, STEREO_DFT_BAND_MAX );
-
-    st->CNG_mode = -1;
-    mvr2r( st->lsp_old, st->lspCNG, M );
-#endif
     return;
 }
 /*
@@ -572,14 +554,14 @@ void deleteFdCngDec_fx( HANDLE_FD_CNG_DEC *hFdCngDec )
     Returns:
     error
 */
+
 Word16 ApplyFdCng_fx(
     Word16 *timeDomainInput, /* i  : pointer to time domain input Q*/
     Word16 Q,
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    Word16 *powerSpectrum,
-#endif
-    Word32 **cldfbBufferReal, /* i/o: real part of the CLDFB buffer     cldfbBufferScale*/
-    Word32 **cldfbBufferImag, /* i/o: imaginary part of the CLDFB buffer     cldfbBufferScale*/
+    Word32 *powerSpectrum, /*Q_power_spectrum*/
+    Word16 Q_power_spectrum,
+    Word32 **cldfbBufferReal, /* i/o: real part of the CLDFB buffer    cldfbBufferScale*/
+    Word32 **cldfbBufferImag, /* i/o: imaginary part of the CLDFB buffer   cldfbBufferScale*/
     Word16 *cldfbBufferScale, /* o  : pointer to the scalefactor for real and imaginary part of the CLDFB buffer */
     Decoder_State *st,
     const Word16 concealWholeFrame, /* i  : binary flag indicating frame loss Q0*/
@@ -604,20 +586,16 @@ Word16 ApplyFdCng_fx(
     move16();
     move16();
 #endif
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    int16_t L_frame, last_L_frame;
-    int32_t sr_core;
-
-    PMT( "Fix point code missing for IVAS_CODE_CNG_FIX185_PLC_FADEOUT" )
-    /* limit L_frame and core fs values for MDCT-Stereo modes which can have higher core sampling than 16kHz, but use a downsampled buffer */
-    L_frame = min( st->L_frame, L_FRAME16k );
-    last_L_frame = min( st->last_L_frame, L_FRAME16k );
-    sr_core = min( st->sr_core, INT_FS_16k );
-#endif
+    Word16 L_frame, last_L_frame;
 
     hFdCngDec = st->hFdCngDec;
     hFdCngCom = hFdCngDec->hFdCngCom;
 
+    Word32 *sidNoiseEst = hFdCngCom->sidNoiseEst; /*Q31 - hFdCngCom->sidNoiseEstExp*/
+
+    /* limit L_frame and core fs values for MDCT-Stereo modes which can have higher core sampling than 16kHz, but use a downsampled buffer */
+    L_frame = s_min( st->L_frame, L_FRAME16k );
+    last_L_frame = s_min( st->last_L_frame, L_FRAME16k );
 
     if ( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
     {
@@ -627,10 +605,9 @@ Word16 ApplyFdCng_fx(
     IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
     {
         hFdCngDec->flag_dtx_mode = hFdCngDec->flag_dtx_mode || st->first_CNG;
-        test();
         move16();
     }
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    cngNoiseLevel = hFdCngCom->cngNoiseLevel;
     move32();
     cngNoiseLevel_exp = &hFdCngCom->cngNoiseLevelExp;
     move16();
@@ -652,10 +629,6 @@ Word16 ApplyFdCng_fx(
             /* set noise estimation inactive during concealment, as no update with noise generated by concealment should be performed. */
             /* set noise estimation inactive during concealment, no update with noise generated by concealment should be performed. */
 
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-            test();
-            test();
-            test();
             test();
             test();
             test();
@@ -663,16 +636,6 @@ Word16 ApplyFdCng_fx(
             test();
             test();
             test();
-            if ( concealWholeFrame == 0 &&
-                 ( timeDomainInput == NULL ||
-                   ( *timeDomainInput<FLT_MAX && * timeDomainInput>( -FLT_MAX ) &&
-                     *( timeDomainInput + hFdCngCom->frameSize - 1 ) < FLT_MAX &&
-                     *( timeDomainInput + hFdCngCom->frameSize - 1 ) > ( -FLT_MAX ) ) ) &&
-                 ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD ) &&
-                     !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) ||
-                   ( st->element_mode == IVAS_CPE_TD ) ) &&
-                 ( !st->BER_detect ) )
-#else
             test();
             test();
             test();
@@ -683,25 +646,36 @@ Word16 ApplyFdCng_fx(
             test();
             test();
             test();
-            test();
-            IF(
-                ( concealWholeFrame == 0 ) &&
-                ( LT_16( *timeDomainInput, MAXVAL_WORD16 ) ) && GT_16( *timeDomainInput, MINVAL_WORD16 ) && ( LT_16( *( timeDomainInput + sub( hFdCngCom->frameSize, 1 ) ), MAXVAL_WORD16 ) ) && GT_16( *( timeDomainInput + sub( hFdCngCom->frameSize, 1 ) ), MINVAL_WORD16 ) && ( ( ( hFdCngDec->flag_dtx_mode == 0 ) && ( st->VAD != 0 ) ) == 0 ) && ( ( ( st->cng_type == LP_CNG ) && ( hFdCngDec->flag_dtx_mode != 0 ) ) == 0 ) && ( is_music == 0 ) && ( st->BER_detect == 0 ) )
-#endif
+            IF( EQ_16( concealWholeFrame, 0 ) &&
+                ( timeDomainInput == NULL ||
+                  ( LT_16( *timeDomainInput, MAXVAL_WORD16 ) && GT_16( *timeDomainInput, MINVAL_WORD16 ) &&
+                    LT_16( *( timeDomainInput + sub( hFdCngCom->frameSize, 1 ) ), MAXVAL_WORD16 ) &&
+                    GT_16( *( timeDomainInput + sub( hFdCngCom->frameSize, 1 ) ), MINVAL_WORD16 ) ) ) &&
+                ( ( ( ( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( LT_16( st->ini_frame, 100 ) && st->is_ism_format ) ) &&
+                    !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) ||
+                  EQ_16( st->element_mode, IVAS_CPE_TD ) ) &&
+                ( !st->BER_detect ) )
             {
                 /* Perform noise estimation at the decoder */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                perform_noise_estimation_dec_fx( timeDomainInput, powerSpectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
-#else
-                perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );
-#endif
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );
+                }
+                ELSE
+                {
+                    perform_noise_estimation_dec_ivas_fx( timeDomainInput, Q, powerSpectrum, Q_power_spectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
+                }
 
                 /* Update the shaping parameters */
                 test();
-                IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
                 {
                     scalebands( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, nBins, hFdCngDec->bandNoiseShape, 1 );
                 }
+                ELSE IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
+                {
+                    scalebands_fx( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, nBins, hFdCngDec->bandNoiseShape, 1 );
+                }
                 hFdCngDec->bandNoiseShape_exp = hFdCngDec->msNoiseEst_exp;
                 move16();
 
@@ -724,6 +698,7 @@ Word16 ApplyFdCng_fx(
 
                     j = 0;
                     move16();
+                    // s2 = -( WORD32_BITS - 1 );
                     s2 = -( WORD32_BITS - 1 );
                     move16();
                     FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
@@ -757,9 +732,9 @@ Word16 ApplyFdCng_fx(
                             move16();
                         }
                         /* Set unique exponent, if mantissa is equal to zero */
-                        if ( facTab[k] == 0 )
+                        IF( EQ_16( facTab[k], 0 ) )
                         {
-                            facTabExp[k] = -( WORD32_BITS - 1 );
+                            facTabExp[k] = -( ( WORD32_BITS - 1 ) );
                             move16();
                         }
                         s2 = s_max( s2, facTabExp[k] );
@@ -768,7 +743,7 @@ Word16 ApplyFdCng_fx(
                     FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
                     {
                         s = sub( facTabExp[k], s2 );
-                        s = s_max( s_min( s, WORD32_BITS - 1 ), -( WORD32_BITS - 1 ) );
+                        s = s_max( s_min( s, ( WORD32_BITS - 1 ) ), -( ( WORD32_BITS - 1 ) ) );
                         FOR( ; j <= hFdCngCom->part[k]; j++ )
                         {
                             cngNoiseLevel[j] = L_shl( Mpy_32_16_1( hFdCngDec->bandNoiseShape[j], facTab[k] ), s ); /*Q31 - hFdCngDec->bandNoiseShape_exp*/
@@ -780,16 +755,24 @@ Word16 ApplyFdCng_fx(
                     IF( NE_16( s2, -( WORD32_BITS - 1 ) ) )
                     {
                         s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
-                        FOR( ; k < hFdCngCom->npart; k++ )
+                        Word16 e_shift = 0;
+                        move16();
+                        IF( s > 0 )
                         {
-                            FOR( ; j <= hFdCngCom->part[k]; j++ )
+                            Word16 q_norm = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );
+                            IF( GT_16( s, q_norm ) )
                             {
-                                cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/
-                                move32();
+                                scale_sig32( cngNoiseLevel, j, sub( q_norm, s ) ); /*q_norm*/
+                                e_shift = sub( s, q_norm );
                             }
                         }
+                        FOR( ; j < FFTCLDFBLEN; j++ )
+                        {
+                            cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], sub( s, e_shift ) ); /*Q: s*/
+                            move32();
+                        }
 
-                        *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
+                        *cngNoiseLevel_exp = add( add( hFdCngDec->bandNoiseShape_exp, s2 ), e_shift );
                         move16();
                     }
                 }
@@ -806,17 +789,85 @@ Word16 ApplyFdCng_fx(
                         move16();
                     }
                 }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                if ( st->element_mode == IVAS_CPE_MDCT && timeDomainInput == NULL )
+
+                IF( ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && timeDomainInput == NULL ) )
                 {
-                    st->hTcxDec->CngLevelBackgroundTrace_bfi = sqrtf( sum_f( cngNoiseLevel, hFdCngCom->stopFFTbin - hFdCngCom->startBand ) / NORM_MDCT_FACTOR );
+
+                    tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
+                    L_tmp = L_deposit_h( 0 );
+                    L_c = L_deposit_h( 0 );
+                    FOR( j = 0; j < tmp_loop; j++ )
+                    {
+
+                        Carry = 0;
+                        move16();
+                        L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31*/
+                        Overflow = 0;
+                        move16();
+
+                        IF( *( cngNoiseLevel + j ) < 0 )
+                        {
+                            L_c = L_msuNs( L_c, 0, 0 ); /*Q-1*/
+                        }
+                        IF( *( cngNoiseLevel + j ) >= 0 )
+                        {
+                            L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
+                        }
+                    }
+                    L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
+                    L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
+
+                    L_tmp = Mpy_32_16_1( L_tmp, 1 ); /*Q16 - L_tmp_exp*/
+
+                    L_tmp = Mpy_32_16_1( L_tmp, shr( T_DIV_L_Frame[L_shl( L_mac( -28000, NORM_MDCT_FACTOR, 95 ), 1 - 15 )], 1 ) ); /*Q16,exp -7*/
+                    L_tmp_exp = add( L_tmp_exp, -7 );                                                                              /*->Q16, L_tmp_exp */
+                    L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                                         /*->Q31, L_tmp_exp*/
+
+                    st->hTcxDec->conCngLevelBackgroundTrace = round_fx_sat( Sqrt32( L_tmp, &L_tmp_exp ) ); /*Q15 - L_tmp_exp*/
+                    move16();
+                    L_tmp_exp = add( L_tmp_exp, 1 );
+                    st->hTcxDec->conCngLevelBackgroundTrace_e = L_tmp_exp;
+                    move16();
                 }
-                else
+                ELSE
                 {
-                    st->hTcxDec->CngLevelBackgroundTrace_bfi = (float) sqrt( ( sum_f( cngNoiseLevel, hFdCngCom->stopFFTbin - hFdCngCom->startBand ) / 2 * hFdCngCom->fftlen ) / L_frame );
+
+                    tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
+                    L_tmp = L_deposit_h( 0 );
+                    L_c = L_deposit_h( 0 );
+                    FOR( j = 0; j < tmp_loop; j++ )
+                    {
+
+                        Carry = 0;
+                        move16();
+                        L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31 - L_tmp_exp*/
+                        Overflow = 0;
+                        move16();
+
+                        IF( *( cngNoiseLevel + j ) < 0 )
+                        {
+                            L_c = L_msuNs( L_c, 0, 0 ); /*Q-1*/
+                        }
+                        IF( *( cngNoiseLevel + j ) >= 0 )
+                        {
+                            L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
+                        }
+                    }
+                    L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
+                    L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
+
+                    L_tmp = Mpy_32_16_1( L_tmp, hFdCngCom->fftlen ); /*Q16 - L_tmp_exp*/
+
+                    L_tmp = Mpy_32_16_1( L_tmp, T_DIV_L_Frame[L_shl( L_mac( -28000, st->L_frame, 95 ), 1 - 15 )] ); /*Q16,exp -7*/
+                    L_tmp_exp = add( L_tmp_exp, -7 );                                                               /*->Q16, L_tmp_exp */
+                    L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                          /*->Q31, L_tmp_exp*/
+
+                    st->hTcxDec->conCngLevelBackgroundTrace = round_fx_sat( Sqrt32( L_tmp, &L_tmp_exp ) ); /*Q15 - L_tmp_exp*/
+                    move16();
+                    st->hTcxDec->conCngLevelBackgroundTrace_e = L_tmp_exp;
+                    move16();
                 }
-#endif
-                /*st->cngTDLevel = (float)sqrt( (sumFLOAT(cngNoiseLevel, hFdCngCom->stopFFTbin - hFdCngCom->startBand) / 2 * hFdCngCom->fftlen) / st->Mode2_L_frame);*/
+
                 tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
                 L_tmp = L_deposit_h( 0 );
                 L_c = L_deposit_h( 0 );
@@ -825,11 +876,7 @@ Word16 ApplyFdCng_fx(
 
                     Carry = 0;
                     move16();
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31*/
-#else
-                    L_tmp = L_add_c( L_tmp, *( cngNoiseLevel + j ) );
-#endif
+                    L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31 - L_tmp_exp*/
                     Overflow = 0;
                     move16();
 
@@ -839,11 +886,7 @@ Word16 ApplyFdCng_fx(
                     }
                     IF( *( cngNoiseLevel + j ) >= 0 )
                     {
-#ifdef BASOP_NOGLOB
                         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
-#else
-                        L_c = L_macNs( L_c, 0, 0 );
-#endif
                     }
                 }
                 L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
@@ -855,11 +898,8 @@ Word16 ApplyFdCng_fx(
                 L_tmp_exp = add( L_tmp_exp, -7 );                                                               /*->Q16, L_tmp_exp */
                 L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                          /*->Q31, L_tmp_exp*/
 
-#ifdef BASOP_NOGLOB
                 st->cngTDLevel = round_fx_sat( Sqrt32( L_tmp, &L_tmp_exp ) ); /*Q15 - L_tmp_exp*/
-#else
-                st->cngTDLevel = round_fx( Sqrt32( L_tmp, &L_tmp_exp ) );
-#endif
+                move16();
                 st->cngTDLevel_e = L_tmp_exp;
                 move16();
             }
@@ -868,84 +908,56 @@ Word16 ApplyFdCng_fx(
                 IF( hFdCngCom->active_frame_counter > 0 )
                 {
                     /* Perform noise estimation in active frames in the decoder for downward updates */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                    perform_noise_estimation_dec_fx( timeDomainInput, powerSpectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
-#else
-                    perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );
-#endif
+                    IF( EQ_16( st->element_mode, EVS_MONO ) )
+                    {
+                        perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );
+                    }
+                    ELSE
+                    {
+                        perform_noise_estimation_dec_ivas_fx( timeDomainInput, Q, powerSpectrum, Q_power_spectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
+                    }
                 }
             }
+
             test();
-            test();
-            L_tmp = 0;
-            FOR( j = hFdCngCom->startBand; j < hFdCngCom->stopFFTbin; j++ )
-            {
-                L_tmp = L_add( L_tmp, L_shr( cngNoiseLevel[j], 16 ) );
-            }
-            L_tmp_exp = add( *cngNoiseLevel_exp, 16 );
-            test();
-            test();
-#ifdef BASOP_NOGLOB
-            IF( EQ_16( concealWholeFrame, 1 ) && EQ_16( st->nbLostCmpt, 1 ) && ( GT_32( L_shl_o( L_tmp, L_tmp_exp, &Overflow ), 21474836 ) /*0.01f Q31*/ ) )
-#else
-            IF( EQ_16( concealWholeFrame, 1 ) && EQ_16( st->nbLostCmpt, 1 ) && ( L_shl( L_tmp, L_tmp_exp ) > 21474836 /*0.01f Q31*/ ) )
-#endif
+            IF( EQ_16( concealWholeFrame, 1 ) && EQ_16( st->nbLostCmpt, 1 ) )
             {
-                /* update isf cng estimate for concealment. Do that during concealment, in order to avoid addition clean channel complexity*/
-#ifndef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, 0 );
-                E_LPC_a_lsp_conversion( hFdCngCom->A_cng, lsp_cng, st->lspold_cng, M );
-                Copy( lsp_cng, st->lspold_cng, M ); /*Q15*/
-
-                lsp2lsf_fx( lsp_cng, st->lsf_cng, M, st->sr_core );
-#else
-                if ( st->element_mode == IVAS_CPE_MDCT && st->core != ACELP_CORE )
+                /* always set psychParameters for MDCT-Stereo ... */
+                test();
+                IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->hTonalMDCTConc != NULL )
                 {
-                    float scf[SNS_NPTS];
-                    float scf_int[FDNS_NPTS];
-                    float whitenend_noise_shape[L_FRAME16k];
-                    int16_t inc, start_idx, stop_idx;
-                    float *noiseLevelPtr;
-
-
-                    inc = ( st->core > TCX_20 ) ? 2 : 1;
-                    start_idx = hFdCngCom->startBand / inc;
-                    stop_idx = L_frame / inc;
-                    noiseLevelPtr = cngNoiseLevel;
+                    st->hTonalMDCTConc->psychParams = EQ_16( st->core, TCX_20_CORE ) ? &st->hTonalMDCTConc->psychParamsTCX20 : &st->hTonalMDCTConc->psychParamsTCX10;
+                }
+                /* update isf cng estimate for concealment. Do that during concealment, in order to avoid addition clean channel complexity*/
 
-                    set_zero( whitenend_noise_shape, start_idx );
-                    for ( j = start_idx; j < stop_idx; j++, noiseLevelPtr += inc )
-                    {
-                        whitenend_noise_shape[j] = *noiseLevelPtr;
-                    }
-                    if ( st->core == TCX_20_CORE )
+                L_tmp = 0;
+                move32();
+                FOR( j = hFdCngCom->startBand; j < hFdCngCom->stopFFTbin; j++ )
+                {
+                    L_tmp = L_add_sat( L_tmp, L_shl_sat( cngNoiseLevel[j], sub( 31, *cngNoiseLevel_exp ) ) ); /*Q31*/
+                }
+                L_tmp_exp = 0;
+                move16();
+                IF( GT_32( L_shl_o( L_tmp, L_tmp_exp, &Overflow ), 21474836 ) /*0.01f Q31*/ )
+                {
+                    test();
+                    test();
+                    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && NE_16( st->core, ACELP_CORE ) )
                     {
-                        st->hTonalMDCTConc->psychParams = &st->hTonalMDCTConc->psychParamsTCX20;
+                        TonalMdctConceal_whiten_noise_shape_ivas_fx( st, L_frame, ON_FIRST_LOST_FRAME );
                     }
-                    else
+                    ELSE IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) || EQ_16( st->core, ACELP_CORE ) )
                     {
-                        st->hTonalMDCTConc->psychParams = &st->hTonalMDCTConc->psychParamsTCX10;
-                    }
+                        lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, 0 );
+                        E_LPC_a_lsp_conversion( hFdCngCom->A_cng, lsp_cng, st->lspold_cng, M );
+                        Copy( lsp_cng, st->lspold_cng, M ); /*Q15*/
 
-                    sns_compute_scf( whitenend_noise_shape, st->hTonalMDCTConc->psychParams, L_frame, scf );
-                    sns_interpolate_scalefactors( scf_int, scf, ENC );
-                    sns_interpolate_scalefactors( st->hTonalMDCTConc->scaleFactorsBackground_flt, scf, DEC );
-                    sns_shape_spectrum( whitenend_noise_shape, st->hTonalMDCTConc->psychParams, scf_int, L_frame );
+                        lsp2lsf_fx( lsp_cng, st->lsf_cng, M, st->sr_core ); /*x2.56*/
+                    }
 
-                    mvr2r( whitenend_noise_shape + start_idx, cngNoiseLevel, stop_idx - start_idx );
-                    wmops_sub_end();
-                }
-                else if ( st->element_mode != IVAS_CPE_MDCT )
-                {
-                    lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, 0.f );
-                    a2lsp_stab( hFdCngCom->A_cng, lsp_cng, st->lspold_cng );
-                    mvr2r( lsp_cng, st->lspold_cng, M );
-                    lsp2lsf( lsp_cng, st->lsf_cng, M, sr_core );
+                    st->plcBackgroundNoiseUpdated = 1;
+                    move16();
                 }
-
-#endif
-                st->plcBackgroundNoiseUpdated = 1;
-                move16();
             }
             BREAK;
 
@@ -958,30 +970,52 @@ Word16 ApplyFdCng_fx(
         case ZERO_FRAME:
 
             test();
-            IF( st != NULL && st->cng_type == LP_CNG )
+            IF( st != NULL && EQ_16( st->cng_type, LP_CNG ) )
             {
                 /* Perform noise estimation on inactive phase at the decoder */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                perform_noise_estimation_dec_fx( timeDomainInput, powerSpectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
-#else
-                perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );
-#endif
-                /* Update the shaping parameters */
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );
+                }
+                ELSE
+                {
+                    perform_noise_estimation_dec_ivas_fx( timeDomainInput, Q, powerSpectrum, Q_power_spectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
+                }
 
+                /* Update the shaping parameters */
                 test();
-                IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
                 {
                     scalebands( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );
                 }
+                ELSE IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
+                {
+                    scalebands_fx( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );
+                }
                 hFdCngDec->bandNoiseShape_exp = hFdCngDec->msNoiseEst_exp;
                 move16();
+
                 /* This sets the new CNG levels until a SID update overwrites it */
-                Copy32( hFdCngDec->bandNoiseShape, cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ); /* This sets the new CNG levels until a SID update overwrites it Q31 - hFdCngDec->bandNoiseShape_exp*/
-                *cngNoiseLevel_exp = hFdCngDec->bandNoiseShape_exp;
-                move16();
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-                st->cngTDLevel = (float) sqrt( ( sum_f( cngNoiseLevel, hFdCngCom->stopFFTbin - hFdCngCom->startBand ) / 2 * hFdCngCom->fftlen ) / L_frame );
-#else
+                Copy32( hFdCngDec->bandNoiseShape, cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ); /* This sets the new CNG levels until a SID update overwrites it */ /*Q31 - hFdCngDec->bandNoiseShape_exp*/
+
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    *cngNoiseLevel_exp = hFdCngDec->bandNoiseShape_exp;
+                    move16();
+                }
+                ELSE
+                {
+                    Word16 shift1 = L_norm_arr( cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) );
+                    Word16 shift2 = L_norm_arr( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ) );
+                    Word16 shift = s_max( sub( hFdCngDec->bandNoiseShape_exp, shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );
+
+                    scale_sig32( cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( hFdCngDec->bandNoiseShape_exp, shift ) );
+                    scale_sig32( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ), sub( *cngNoiseLevel_exp, shift ) );
+
+                    *cngNoiseLevel_exp = shift;
+                    move16();
+                }
+
                 /*st->cngTDLevel = (float)sqrt( (sumFLOAT(cngNoiseLevel, hFdCngCom->stopFFTbin - hFdCngCom->startBand) / 2 * hFdCngCom->fftlen) / st->Mode2_L_frame);*/
                 tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
                 L_tmp = L_deposit_h( 0 );
@@ -991,8 +1025,7 @@ Word16 ApplyFdCng_fx(
 
                     Carry = 0;
                     move16();
-#ifdef BASOP_NOGLOB /* Critical Carry/Overflow */
-                    L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31*/
+                    L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31 - L_tmp_exp*/
                     Overflow = 0;
                     move16();
 
@@ -1004,19 +1037,6 @@ Word16 ApplyFdCng_fx(
                     {
                         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
                     }
-#else
-                    L_tmp = L_add_c( L_tmp, *( cngNoiseLevel + j ) );
-                    Overflow = 0;
-
-                    if ( *( cngNoiseLevel + j ) < 0 )
-                    {
-                        L_c = L_msuNs( L_c, 0, 0 );
-                    }
-                    if ( *( cngNoiseLevel + j ) >= 0 )
-                    {
-                        L_c = L_macNs( L_c, 0, 0 );
-                    }
-#endif
                 }
                 L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
                 L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
@@ -1027,15 +1047,10 @@ Word16 ApplyFdCng_fx(
                 L_tmp_exp = add( L_tmp_exp, -7 );                                                               /*->Q16, L_tmp_exp */
                 L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                          /*->Q31, L_tmp_exp*/
 
-#ifdef BASOP_NOGLOB /* Critical Carry/Overflow */
-                st->cngTDLevel = round_fx_o( Sqrt32( L_tmp, &L_tmp_exp ), &Overflow );                          /*Q15 - L_tmp_exp*/
+                st->cngTDLevel = round_fx_o( Sqrt32( L_tmp, &L_tmp_exp ), &Overflow ); /*Q15 - L_tmp_exp*/
                 move16();
-#else
-                st->cngTDLevel = round_fx( Sqrt32( L_tmp, &L_tmp_exp ) );
-#endif
                 st->cngTDLevel_e = L_tmp_exp;
                 move16();
-#endif
                 BREAK;
             }
             hFdCngCom->inactive_frame_counter = add( hFdCngCom->inactive_frame_counter, 1 );
@@ -1058,12 +1073,10 @@ Word16 ApplyFdCng_fx(
                     hFdCngCom->psize_inv,
                     hFdCngDec->partNoiseShape,
                     &hFdCngDec->partNoiseShape_exp );
-#ifdef IVAS_CODE_CNG
                 IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
                 {
-                    Copy( hFdCngDec->hFdCngCom->sidNoiseEst, hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART );
+                    Copy32( hFdCngDec->hFdCngCom->sidNoiseEst, hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART ); /*Q31 - hFdCngDec->sidNoiseEstExp*/
                 }
-#endif
             }
 
             IF( EQ_16( st->m_frame_type, SID_FRAME ) )
@@ -1071,31 +1084,41 @@ Word16 ApplyFdCng_fx(
                 IF( LT_32( hFdCngCom->msFrCnt_init_counter, L_deposit_l( hFdCngCom->msFrCnt_init_thresh ) ) )
                 {
                     /* At initialization, interpolate the bin/band-wise levels from the partition levels */
-                    scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
-                                hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );
-                    *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
-                    move16();
+                    IF( EQ_16( st->element_mode, EVS_MONO ) )
+                    {
+                        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );
+                    }
+                    ELSE
+                    {
+                        scalebands_fx( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );
+                    }
+
+                    *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
+                    move16();
                 }
                 ELSE
                 {
                     if ( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
                     {
-#ifdef IVAS_CODE_CNG
-                        sidNoiseEst = hFdCngCom->sidNoiseEstLp;
-                        move16();
-#endif
+                        sidNoiseEst = hFdCngCom->sidNoiseEstLp; /*Q31 - hFdCngDec->sidNoiseEstExp*/
                     }
                     /* Interpolate the CLDFB band levels from the SID (partition) levels */
                     IF( GT_16( hFdCngCom->regularStopBand, hFdCngCom->numCoreBands ) )
                     {
-                        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
-                                    hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );
+                        IF( EQ_16( st->element_mode, EVS_MONO ) )
+                        {
+                            scalebands( sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );
+                        }
+                        ELSE
+                        {
+                            scalebands_fx( sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );
+                        }
 
                         *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
                         move16();
                     }
 
-                    s2 = -( WORD32_BITS - 1 );
+                    s2 = -( ( WORD32_BITS - 1 ) );
                     move16();
                     /* Shape the SID noise levels in each FFT bin */
                     j = 0;
@@ -1109,16 +1132,16 @@ Word16 ApplyFdCng_fx(
                         move16();
                         IF( hFdCngDec->partNoiseShape[k] != 0 )
                         {
-                            s1 = norm_l( hFdCngCom->sidNoiseEst[k] );
-                            L_tmp = L_shl( hFdCngCom->sidNoiseEst[k], s1 ); /*Q31 - hFdCngCom->sidNoiseEstExp + s1*/
+                            s1 = norm_l( sidNoiseEst[k] );
+                            L_tmp = L_shl( sidNoiseEst[k], s1 ); /*Q31 - ( hFdCngCom->sidNoiseEstExp - s1 )*/
                             L_tmp_exp = sub( hFdCngCom->sidNoiseEstExp, s1 );
-                            L_tmp = BASOP_Util_Add_Mant32Exp( hFdCngCom->sidNoiseEst[k], hFdCngCom->sidNoiseEstExp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
+                            L_tmp = BASOP_Util_Add_Mant32Exp( sidNoiseEst[k], hFdCngCom->sidNoiseEstExp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
                             L_tmp = L_shr( L_tmp, 1 );
                             s = add( L_tmp_exp, 1 );
                             num = extract_h( L_tmp ); /*Q15 - L_tmp_exp*/
 
                             s1 = norm_l( hFdCngDec->partNoiseShape[k] );
-                            L_tmp = L_shl( hFdCngDec->partNoiseShape[k], s1 ); /*Q31 - hFdCngDec->partNoiseShape_exp + s1*/
+                            L_tmp = L_shl( hFdCngDec->partNoiseShape[k], s1 ); /*Q31 - ( hFdCngDec->partNoiseShape_ex - s1 )*/
                             L_tmp_exp = sub( hFdCngDec->partNoiseShape_exp, s1 );
                             L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_exp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
                             s = sub( s, L_tmp_exp );
@@ -1129,228 +1152,86 @@ Word16 ApplyFdCng_fx(
                             facTabExp[k] = s;
                             move16();
                         }
-                        /* Set unique exponent, if mantissa is equal to zero */
-                        if ( facTab[k] == 0 )
+                        /* Set unique exponent, IF mantissa is equal to zero */
+                        IF( EQ_16( facTab[k], 0 ) )
                         {
-                            facTabExp[k] = -( WORD32_BITS - 1 );
+                            facTabExp[k] = -( ( WORD32_BITS - 1 ) );
                             move16();
                         }
                         s2 = s_max( s2, facTabExp[k] );
                     }
-
+                    if ( EQ_16( s2, -31 ) )
+                    {
+                        s2 = 0;
+                        move16();
+                    }
                     FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
                     {
                         s = sub( facTabExp[k], s2 );
-                        s = s_max( s_min( s, WORD32_BITS - 1 ), -( WORD32_BITS - 1 ) );
+                        s = s_max( s_min( s, ( WORD32_BITS - 1 ) ), -( ( WORD32_BITS - 1 ) ) );
                         FOR( ; j <= hFdCngCom->part[k]; j++ )
                         {
                             cngNoiseLevel[j] = L_shl( Mpy_32_16_1( hFdCngDec->bandNoiseShape[j], facTab[k] ), s ); /*Q31 - hFdCngDec->bandNoiseShape_exp*/
                             move32();
                         }
                     }
-                    /* adapt scaling for rest of the buffer */
-                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
-                    FOR( ; k < hFdCngCom->npart; k++ )
+
+                    IF( EQ_16( st->element_mode, EVS_MONO ) )
                     {
-                        FOR( ; j <= hFdCngCom->part[k]; j++ )
+                        /* adapt scaling for rest of the buffer */
+                        s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
+                        FOR( ; k < hFdCngCom->npart; k++ )
                         {
-                            cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/
-                            move32();
+                            FOR( ; j <= hFdCngCom->part[k]; j++ )
+                            {
+                                cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/
+                                move32();
+                            }
                         }
+                        *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
+                        move16();
                     }
-                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
-                    move16();
-                }
-            }
-#ifdef IVAS_CODE_CNG
-            else if ( st->element_mode == IVAS_CPE_DFT )
-            {
-                if ( !( hFdCngCom->msFrCnt_init_counter < hFdCngCom->msFrCnt_init_thresh ) )
-                {
-                    sidNoiseEst = hFdCngCom->sidNoiseEstLp;
-                    j = 0;
-                    for ( k = 0; k < hFdCngCom->nFFTpart; k++ )
+                    ELSE
                     {
-                        factor = ( sidNoiseEst[k] + DELTA ) / ( hFdCngDec->partNoiseShape[k] + DELTA );
-                        for ( ; j <= hFdCngCom->part[k]; j++ )
-                        {
-                            cngNoiseLevel[j] = hFdCngDec->bandNoiseShape[j] * factor;
-                        }
+                        Word16 shift1 = L_norm_arr( cngNoiseLevel, j );
+                        Word16 shift2 = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );
+                        Word16 shift = s_max( sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );
+
+                        scale_sig32( cngNoiseLevel, j, sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift ) );
+                        scale_sig32( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ), sub( *cngNoiseLevel_exp, shift ) );
+
+                        *cngNoiseLevel_exp = shift;
+                        move16();
                     }
                 }
             }
-#endif
-            IF( EQ_16( st->codec_mode, MODE2 ) )
-            {
-                /* Generate comfort noise during SID or zero frames */
-                generate_comfort_noise_dec_fx( cldfbBufferReal, cldfbBufferImag, cldfbBufferScale, st, &( st->Q_exc ), 2, -1 );
-            }
-
-            BREAK;
-
-        default:
-            return -1;
-    }
-
-
-    return 0;
-}
-
-Word16 ApplyFdCng_ivas_fx(
-    Word16 *timeDomainInput, /* i  : pointer to time domain input Q*/
-    Word16 Q,
-    Word32 *powerSpectrum, /*Q_power_spectrum*/
-    Word16 Q_power_spectrum,
-    Word32 **cldfbBufferReal, /* i/o: real part of the CLDFB buffer    cldfbBufferScale*/
-    Word32 **cldfbBufferImag, /* i/o: imaginary part of the CLDFB buffer   cldfbBufferScale*/
-    Word16 *cldfbBufferScale, /* o  : pointer to the scalefactor for real and imaginary part of the CLDFB buffer */
-    Decoder_State *st,
-    const Word16 concealWholeFrame, /* i  : binary flag indicating frame loss Q0*/
-    Word16 is_music /*Q0*/ )
-{
-    Word16 j, k, nBins;
-    Word16 s, s1, s2, num, denom;
-    Word32 *cngNoiseLevel;
-    Word16 *cngNoiseLevel_exp;
-    Word32 L_tmp;
-    Word16 L_tmp_exp;
-    Word16 facTab[NPART];
-    Word16 facTabExp[NPART];
-    Word16 tmp_loop;
-    Word32 L_c;
-    Word16 lsp_cng[M];
-    HANDLE_FD_CNG_DEC hFdCngDec;
-    HANDLE_FD_CNG_COM hFdCngCom;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    Flag Carry = 0;
-    move16();
-    move16();
-#endif
-    Word16 L_frame, last_L_frame;
-
-    hFdCngDec = st->hFdCngDec;
-    hFdCngCom = hFdCngDec->hFdCngCom;
-
-    Word32 *sidNoiseEst = hFdCngCom->sidNoiseEst; /*Q31 - hFdCngCom->sidNoiseEstExp*/
-
-    /* limit L_frame and core fs values for MDCT-Stereo modes which can have higher core sampling than 16kHz, but use a downsampled buffer */
-    L_frame = s_min( st->L_frame, L_FRAME16k );
-    last_L_frame = s_min( st->last_L_frame, L_FRAME16k );
-
-    if ( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
-    {
-        hFdCngCom->inactive_frame_counter = 0;
-        move16();
-    }
-    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
-    {
-        hFdCngDec->flag_dtx_mode = hFdCngDec->flag_dtx_mode || st->first_CNG;
-        move16();
-    }
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel;
-    move32();
-    cngNoiseLevel_exp = &hFdCngCom->cngNoiseLevelExp;
-    move16();
-    nBins = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
-
-    SWITCH( st->m_frame_type )
-    {
-        case ACTIVE_FRAME:
-
-            /**************************
-             * ACTIVE_FRAME at DECODER *
-             **************************/
-
-            hFdCngCom->inactive_frame_counter = 0;
-            move16();
-            hFdCngCom->sid_frame_counter = 0;
-            move16();
-
-            /* set noise estimation inactive during concealment, as no update with noise generated by concealment should be performed. */
-            /* set noise estimation inactive during concealment, no update with noise generated by concealment should be performed. */
-
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( EQ_16( concealWholeFrame, 0 ) &&
-                ( timeDomainInput == NULL ||
-                  ( LT_16( *timeDomainInput, MAXVAL_WORD16 ) && GT_16( *timeDomainInput, MINVAL_WORD16 ) &&
-                    LT_16( *( timeDomainInput + sub( hFdCngCom->frameSize, 1 ) ), MAXVAL_WORD16 ) &&
-                    GT_16( *( timeDomainInput + sub( hFdCngCom->frameSize, 1 ) ), MINVAL_WORD16 ) ) ) &&
-                ( ( ( ( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( LT_16( st->ini_frame, 100 ) && st->is_ism_format ) ) &&
-                    !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) ||
-                  EQ_16( st->element_mode, IVAS_CPE_TD ) ) &&
-                ( !st->BER_detect ) )
+            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
             {
-                /* Perform noise estimation at the decoder */
-                perform_noise_estimation_dec_ivas_fx( timeDomainInput, Q, powerSpectrum, Q_power_spectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
-
-                /* Update the shaping parameters */
-                test();
-                IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
-                {
-                    scalebands_fx( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, nBins, hFdCngDec->bandNoiseShape, 1 );
-                }
-                hFdCngDec->bandNoiseShape_exp = hFdCngDec->msNoiseEst_exp;
-                move16();
-
-
-                /* Update CNG levels */
-                test();
-                IF( hFdCngDec->flag_dtx_mode != 0 && EQ_16( st->cng_type, FD_CNG ) )
+                IF( !( LT_16( hFdCngCom->msFrCnt_init_counter, hFdCngCom->msFrCnt_init_thresh ) ) )
                 {
-                    /* This needs to be done only once per inactive phase */
-                    bandcombinepow(
-                        hFdCngDec->bandNoiseShape,
-                        hFdCngDec->bandNoiseShape_exp,
-                        nBins,
-                        hFdCngCom->part,
-                        hFdCngCom->nFFTpart,
-                        hFdCngCom->psize_inv,
-                        hFdCngDec->partNoiseShape,
-                        &hFdCngDec->partNoiseShape_exp );
-
-
+                    s2 = -( ( WORD32_BITS - 1 ) );
+                    /* Shape the SID noise levels in each FFT bin */
                     j = 0;
                     move16();
-                    // s2 = -( WORD32_BITS - 1 );
-                    s2 = -( WORD32_BITS - 1 );
-                    move16();
                     FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
                     {
                         assert( hFdCngDec->partNoiseShape[k] >= 0 );
-                        assert( hFdCngCom->sidNoiseEst[k] >= 0 );
 
                         /* add DELTA as it is done in FLC version, in order to avoid num > denom */
                         facTab[k] = 0;
                         move16();
                         IF( hFdCngDec->partNoiseShape[k] != 0 )
                         {
-                            s1 = norm_l( hFdCngCom->sidNoiseEst[k] );
-                            L_tmp = L_shl( hFdCngCom->sidNoiseEst[k], s1 ); /*Q31 - hFdCngCom->sidNoiseEstExp + s1*/
+                            s1 = norm_l( hFdCngCom->sidNoiseEstLp[k] );
+                            L_tmp = L_shl( hFdCngCom->sidNoiseEstLp[k], s1 ); /*Q31 - ( hFdCngCom->sidNoiseEstExp - s1 )*/
                             L_tmp_exp = sub( hFdCngCom->sidNoiseEstExp, s1 );
-                            L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_exp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
+                            L_tmp = BASOP_Util_Add_Mant32Exp( hFdCngCom->sidNoiseEstLp[k], hFdCngCom->sidNoiseEstExp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
                             L_tmp = L_shr( L_tmp, 1 );
                             s = add( L_tmp_exp, 1 );
                             num = extract_h( L_tmp ); /*Q15 - L_tmp_exp*/
 
                             s1 = norm_l( hFdCngDec->partNoiseShape[k] );
-                            L_tmp = L_shl( hFdCngDec->partNoiseShape[k], s1 ); /*Q31 - hFdCngDec->partNoiseShape_exp + s1*/
+                            L_tmp = L_shl( hFdCngDec->partNoiseShape[k], s1 ); /*Q31 - ( hFdCngDec->partNoiseShape_exp - s1 )*/
                             L_tmp_exp = sub( hFdCngDec->partNoiseShape_exp, s1 );
                             L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_exp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
                             s = sub( s, L_tmp_exp );
@@ -1361,19 +1242,23 @@ Word16 ApplyFdCng_ivas_fx(
                             facTabExp[k] = s;
                             move16();
                         }
-                        /* Set unique exponent, if mantissa is equal to zero */
-                        IF( EQ_16( facTab[k], 0 ) )
+                        /* Set unique exponent, IF mantissa is equal to zero */
+                        if ( facTab[k] == 0 )
                         {
-                            facTabExp[k] = -( ( WORD32_BITS - 1 ) );
+                            facTabExp[k] = -( WORD32_BITS - 1 );
                             move16();
                         }
                         s2 = s_max( s2, facTabExp[k] );
                     }
-
+                    IF( EQ_16( s2, -31 ) )
+                    {
+                        s2 = 0;
+                        move16();
+                    }
                     FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
                     {
                         s = sub( facTabExp[k], s2 );
-                        s = s_max( s_min( s, ( WORD32_BITS - 1 ) ), -( ( WORD32_BITS - 1 ) ) );
+                        s = s_max( s_min( s, sub( WORD32_BITS, 1 ) ), negate( sub( WORD32_BITS, 1 ) ) );
                         FOR( ; j <= hFdCngCom->part[k]; j++ )
                         {
                             cngNoiseLevel[j] = L_shl( Mpy_32_16_1( hFdCngDec->bandNoiseShape[j], facTab[k] ), s ); /*Q31 - hFdCngDec->bandNoiseShape_exp*/
@@ -1381,931 +1266,133 @@ Word16 ApplyFdCng_ivas_fx(
                         }
                     }
 
-                    /* adapt scaling for rest of the buffer */
-                    IF( NE_16( s2, -( WORD32_BITS - 1 ) ) )
-                    {
-                        s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
-                        Word16 e_shift = 0;
-                        move16();
-                        IF( s > 0 )
-                        {
-                            Word16 q_norm = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );
-                            IF( GT_16( s, q_norm ) )
-                            {
-                                scale_sig32( cngNoiseLevel, j, sub( q_norm, s ) ); /*q_norm*/
-                                e_shift = sub( s, q_norm );
-                            }
-                        }
-                        FOR( ; k < hFdCngCom->npart; k++ )
-                        {
-                            FOR( ; j <= hFdCngCom->part[k]; j++ )
-                            {
-                                cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], sub( s, e_shift ) ); /*Q: s*/
-                                move32();
-                            }
-                        }
+                    Word16 shift1 = L_norm_arr( cngNoiseLevel, j );
+                    Word16 shift2 = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );
+                    Word16 shift = s_max( sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );
 
-                        *cngNoiseLevel_exp = add( add( hFdCngDec->bandNoiseShape_exp, s2 ), e_shift );
-                        move16();
-                    }
+                    scale_sig32( cngNoiseLevel, j, sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift ) );
+                    scale_sig32( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ), sub( *cngNoiseLevel_exp, shift ) );
+
+                    *cngNoiseLevel_exp = shift;
+                    move16();
+                }
+            }
+            IF( EQ_16( st->codec_mode, MODE2 ) )
+            {
+                /* Generate comfort noise during SID or zero frames */
+                IF( EQ_16( st->element_mode, EVS_MONO ) )
+                {
+                    generate_comfort_noise_dec_fx( cldfbBufferReal, cldfbBufferImag, cldfbBufferScale, st, &( st->Q_exc ), 2, -1 );
                 }
                 ELSE
                 {
-                    /* This sets the new CNG levels until a SID update overwrites it */
-                    test();
-                    test();
-                    test();
-                    IF( !( EQ_16( st->element_mode, IVAS_CPE_TD ) ) || ( EQ_16( st->element_mode, IVAS_CPE_TD ) && !hFdCngDec->flag_dtx_mode && !st->VAD ) )
-                    {
-                        Copy32( hFdCngDec->bandNoiseShape, cngNoiseLevel, nBins ); /*Q31 - hFdCngDec->bandNoiseShape_exp*/
-                        *cngNoiseLevel_exp = hFdCngDec->bandNoiseShape_exp;
-                        move16();
-                    }
+                    generate_comfort_noise_dec_ivas_fx( cldfbBufferReal, cldfbBufferImag, cldfbBufferScale, st, &( st->Q_exc ), 2, -1 );
                 }
+            }
 
-                IF( ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && timeDomainInput == NULL ) )
-                {
+            BREAK;
 
-                    tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
-                    L_tmp = L_deposit_h( 0 );
-                    L_c = L_deposit_h( 0 );
-                    FOR( j = 0; j < tmp_loop; j++ )
-                    {
+        default:
+            return -1;
+    }
 
-                        Carry = 0;
-                        move16();
-#ifdef BASOP_NOGLOB
-                        L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31*/
-#else
-                        L_tmp = L_add_c( L_tmp, *( cngNoiseLevel + j ) );
-#endif
-                        Overflow = 0;
-                        move16();
 
-                        IF( *( cngNoiseLevel + j ) < 0 )
-                        {
-                            L_c = L_msuNs( L_c, 0, 0 ); /*Q-1*/
-                        }
-                        IF( *( cngNoiseLevel + j ) >= 0 )
-                        {
-#ifdef BASOP_NOGLOB
-                            L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
-#else
-                            L_c = L_macNs( L_c, 0, 0 );
-#endif
-                        }
-                    }
-                    L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
-                    L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
+    return 0;
+}
 
-                    L_tmp = Mpy_32_16_1( L_tmp, 1 ); /*Q16 - L_tmp_exp*/
+/*
+   perform_noise_estimation_dec_fx
 
-                    L_tmp = Mpy_32_16_1( L_tmp, shr( T_DIV_L_Frame[L_shl( L_mac( -28000, NORM_MDCT_FACTOR, 95 ), 1 - 15 )], 1 ) ); /*Q16,exp -7*/
-                    L_tmp_exp = add( L_tmp_exp, -7 );                                                                              /*->Q16, L_tmp_exp */
-                    L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                                         /*->Q31, L_tmp_exp*/
+    Parameters:
 
-#ifdef BASOP_NOGLOB
-                    st->hTcxDec->conCngLevelBackgroundTrace = round_fx_sat( Sqrt32( L_tmp, &L_tmp_exp ) ); /*Q15 - L_tmp_exp*/
-#else
-                    st->hTcxDec->conCngLevelBackgroundTrace = round_fx( Sqrt32( L_tmp, &L_tmp_exp ) );
-#endif
-                    move16();
-                    L_tmp_exp = add( L_tmp_exp, 1 );
-                    st->hTcxDec->conCngLevelBackgroundTrace_e = L_tmp_exp;
-                    move16();
-                }
-                ELSE
-                {
+    timeDomainInput,      i:   pointer to time domain input
+    bitrate,              i:   bitrate
+    st                    i/o: FD_CNG structure containing all buffers and variables
 
-                    tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
-                    L_tmp = L_deposit_h( 0 );
-                    L_c = L_deposit_h( 0 );
-                    FOR( j = 0; j < tmp_loop; j++ )
-                    {
+    Function:
+    perform noise estimation
 
-                        Carry = 0;
-                        move16();
-#ifdef BASOP_NOGLOB
-                        L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31 - L_tmp_exp*/
-#else
-                        L_tmp = L_add_c( L_tmp, *( cngNoiseLevel + j ) );
-#endif
-                        Overflow = 0;
-                        move16();
+    Returns:
+    void
+*/
+void perform_noise_estimation_dec_fx(
+    const Word16 *timeDomainInput, /* i:   pointer to time domain input Q*/
+    const Word16 Q,
+    HANDLE_FD_CNG_DEC hFdCngDec /* i/o: FD_CNG structure containing all buffers and variables */
+)
+{
+    Word16 i, tmp_r, tmp_i, fac, fftBuffer_exp;
+    Word16 s, len, npart, nFFTpart;
+    Word16 startBand, stopFFTbin;
 
-                        IF( *( cngNoiseLevel + j ) < 0 )
-                        {
-                            L_c = L_msuNs( L_c, 0, 0 ); /*Q-1*/
-                        }
-                        IF( *( cngNoiseLevel + j ) >= 0 )
-                        {
-#ifdef BASOP_NOGLOB
-                            L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
-#else
-                            L_c = L_macNs( L_c, 0, 0 );
-#endif
-                        }
-                    }
-                    L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
-                    L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
+    Word16 *part, *psize_inv, *psize_norm;
+    Word32 tmp, *fftBuffer, *periodog, *ptr_per, *ptr_r, *ptr_i;
 
-                    L_tmp = Mpy_32_16_1( L_tmp, hFdCngCom->fftlen ); /*Q16 - L_tmp_exp*/
+    /* pointer initialization */
+    periodog = hFdCngDec->hFdCngCom->periodog;   /*Q31 - hFdCngDec->hFdCngCom->periodog_exp*/
+    fftBuffer = hFdCngDec->hFdCngCom->fftBuffer; /*Q31 - hFdCngDec->hFdCngCom->fftBuffer_exp*/
 
-                    L_tmp = Mpy_32_16_1( L_tmp, T_DIV_L_Frame[L_shl( L_mac( -28000, st->L_frame, 95 ), 1 - 15 )] ); /*Q16,exp -7*/
-                    L_tmp_exp = add( L_tmp_exp, -7 );                                                               /*->Q16, L_tmp_exp */
-                    L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                          /*->Q31, L_tmp_exp*/
+    part = hFdCngDec->part_shaping;             /*Q0*/
+    psize_inv = hFdCngDec->psize_inv_shaping;   /*Q15*/
+    psize_norm = hFdCngDec->psize_shaping_norm; /*Q15 - hFdCngDec->psize_shaping_norm_exp*/
 
-#ifdef BASOP_NOGLOB
-                    st->hTcxDec->conCngLevelBackgroundTrace = round_fx_sat( Sqrt32( L_tmp, &L_tmp_exp ) ); /*Q15 - L_tmp_exp*/
-                    move16();
-#else
-                    st->hTcxDec->conCngLevelBackgroundTrace = round_fx( Sqrt32( L_tmp, &L_tmp_exp ) );
-                    st->hTcxDec->CngLevelBackgroundTrace_bfi_fx = ( Sqrt32( L_tmp, &L_tmp_exp ) );
-#endif
-                    st->hTcxDec->conCngLevelBackgroundTrace_e = L_tmp_exp;
-                    move16();
-                }
+    /* variable initialization */
+    startBand = hFdCngDec->hFdCngCom->startBand; /*Q0*/
+    move16();
+    stopFFTbin = hFdCngDec->hFdCngCom->stopFFTbin; /*Q0*/
+    move16();
 
-                tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
-                L_tmp = L_deposit_h( 0 );
-                L_c = L_deposit_h( 0 );
-                FOR( j = 0; j < tmp_loop; j++ )
-                {
+    npart = hFdCngDec->npart_shaping; /*Q0*/
+    move16();
+    nFFTpart = hFdCngDec->nFFTpart_shaping; /*Q0*/
+    move16();
 
-                    Carry = 0;
-                    move16();
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31 - L_tmp_exp*/
-#else
-                    L_tmp = L_add_c( L_tmp, *( cngNoiseLevel + j ) );
-#endif
-                    Overflow = 0;
-                    move16();
+    /* Perform STFT analysis */
+    /* Perform STFT analysis */
+    AnalysisSTFT( timeDomainInput, Q, fftBuffer, &fftBuffer_exp, hFdCngDec->hFdCngCom );
+    fftBuffer_exp = add( fftBuffer_exp, WORD16_BITS - 1 );
 
-                    IF( *( cngNoiseLevel + j ) < 0 )
-                    {
-                        L_c = L_msuNs( L_c, 0, 0 ); /*Q-1*/
-                    }
-                    IF( *( cngNoiseLevel + j ) >= 0 )
-                    {
-#ifdef BASOP_NOGLOB
-                        L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
-#else
-                        L_c = L_macNs( L_c, 0, 0 );
-#endif
-                    }
-                }
-                L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
-                L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
+    {
+        assert( startBand != 0 );
 
-                L_tmp = Mpy_32_16_1( L_tmp, hFdCngCom->fftlen ); /*Q16 - L_tmp_exp*/
+        len = sub( stopFFTbin, startBand );
 
-                L_tmp = Mpy_32_16_1( L_tmp, T_DIV_L_Frame[L_shl( L_mac( -28000, st->L_frame, 95 ), 1 - 15 )] ); /*Q16,exp -7*/
-                L_tmp_exp = add( L_tmp_exp, -7 );                                                               /*->Q16, L_tmp_exp */
-                L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                          /*->Q31, L_tmp_exp*/
+        s = getScaleFactor32( &fftBuffer[( startBand * 2 )], shl( len, 1 ) );
+        s = sub( s, 1 );
 
-#ifdef BASOP_NOGLOB
-                st->cngTDLevel = round_fx_sat( Sqrt32( L_tmp, &L_tmp_exp ) ); /*Q15 - L_tmp_exp*/
-#else
-                st->cngTDLevel = round_fx( Sqrt32( L_tmp, &L_tmp_exp ) );
-#endif
-                move16();
-                st->cngTDLevel_e = L_tmp_exp;
-                move16();
-            }
-            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-            {
-                IF( hFdCngCom->active_frame_counter > 0 )
-                {
-                    /* Perform noise estimation in active frames in the decoder for downward updates */
-                    perform_noise_estimation_dec_ivas_fx( timeDomainInput, Q, powerSpectrum, Q_power_spectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
-                }
-            }
+        ptr_per = periodog;
+        IF( startBand == 0 )
+        {
+            /* DC component */
+            tmp_r = extract_h( L_shl( fftBuffer[0], s ) ); /*Q15 - fftBuffer_exp + s*/
 
-            test();
-            IF( EQ_16( concealWholeFrame, 1 ) && EQ_16( st->nbLostCmpt, 1 ) )
-            {
-                /* always set psychParameters for MDCT-Stereo ... */
-                test();
-                IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->hTonalMDCTConc != NULL )
-                {
-                    st->hTonalMDCTConc->psychParams = EQ_16( st->core, TCX_20_CORE ) ? &st->hTonalMDCTConc->psychParamsTCX20 : &st->hTonalMDCTConc->psychParamsTCX10;
-                }
-                /* update isf cng estimate for concealment. Do that during concealment, in order to avoid addition clean channel complexity*/
+            tmp = L_mult( tmp_r, tmp_r ); /*Q31 - 2*(fftBuffer_exp - s)*/
+            *ptr_per = tmp;               /*Q31 - 2*(fftBuffer_exp - s)*/
+            move32();
 
-                L_tmp = 0;
-                move32();
-                FOR( j = hFdCngCom->startBand; j < hFdCngCom->stopFFTbin; j++ )
-                {
-                    L_tmp = L_add_sat( L_tmp, L_shl_sat( cngNoiseLevel[j], sub( 31, *cngNoiseLevel_exp ) ) ); /*Q31*/
-                }
-                L_tmp_exp = 0;
-                move16();
-#ifdef BASOP_NOGLOB
-                IF( GT_32( L_shl_o( L_tmp, L_tmp_exp, &Overflow ), 21474836 ) /*0.01f Q31*/ )
-#else
-                IF( L_shl( L_tmp, L_tmp_exp ) > 21474836 /*0.01f Q31*/ )
-#endif
-                {
-                    test();
-                    test();
-                    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && NE_16( st->core, ACELP_CORE ) )
-                    {
-                        TonalMdctConceal_whiten_noise_shape_ivas_fx( st, L_frame, ON_FIRST_LOST_FRAME );
-                    }
-                    ELSE IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) || EQ_16( st->core, ACELP_CORE ) )
-                    {
-                        lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, 0 );
-                        E_LPC_a_lsp_conversion( hFdCngCom->A_cng, lsp_cng, st->lspold_cng, M );
-                        Copy( lsp_cng, st->lspold_cng, M ); /*Q15*/
+            ptr_per++;
+            ptr_r = fftBuffer + 2; /*Q31 - fftBuffer_exp*/
+            len = sub( len, 1 );
+        }
+        ELSE
+        {
+            ptr_r = fftBuffer + shl( startBand, 1 ); /*fftBuffer_exp*/
+        }
 
-                        lsp2lsf_fx( lsp_cng, st->lsf_cng, M, st->sr_core ); /*x2.56*/
-                    }
+        ptr_i = ptr_r + 1;
+        FOR( i = 0; i < len; i++ )
+        {
+            tmp_r = extract_h( L_shl( *ptr_r, s ) ); /*Q15 - fftBuffer_exp + s*/
+            tmp_i = extract_h( L_shl( *ptr_i, s ) ); /*Q15 - fftBuffer_exp + s*/
 
-                    st->plcBackgroundNoiseUpdated = 1;
-                    move16();
-                }
-            }
-            BREAK;
+            tmp = L_mac( L_mult( tmp_r, tmp_r ), tmp_i, tmp_i ); /*Q31 - 2*(fftBuffer_exp - s)*/
+            *ptr_per = tmp;                                      /*Q31 - 2*(fftBuffer_exp - s)*/
+            move32();
 
-        case SID_FRAME:
-
-            hFdCngDec->flag_dtx_mode = 1;
-            move16();
-            /* no break */
-
-        case ZERO_FRAME:
-
-            test();
-            IF( st != NULL && EQ_16( st->cng_type, LP_CNG ) )
-            {
-                /* Perform noise estimation on inactive phase at the decoder */
-                perform_noise_estimation_dec_ivas_fx( timeDomainInput, Q, powerSpectrum, Q_power_spectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
-
-                /* Update the shaping parameters */
-
-                test();
-                IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
-                {
-                    scalebands_fx( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );
-                }
-                hFdCngDec->bandNoiseShape_exp = hFdCngDec->msNoiseEst_exp;
-                move16();
-                /* This sets the new CNG levels until a SID update overwrites it */
-                Copy32( hFdCngDec->bandNoiseShape, cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ); /* This sets the new CNG levels until a SID update overwrites it */ /*Q31 - hFdCngDec->bandNoiseShape_exp*/
-                *cngNoiseLevel_exp = hFdCngDec->bandNoiseShape_exp;
-                move16();
-
-                /*st->cngTDLevel = (float)sqrt( (sumFLOAT(cngNoiseLevel, hFdCngCom->stopFFTbin - hFdCngCom->startBand) / 2 * hFdCngCom->fftlen) / st->Mode2_L_frame);*/
-                tmp_loop = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
-                L_tmp = L_deposit_h( 0 );
-                L_c = L_deposit_h( 0 );
-                FOR( j = 0; j < tmp_loop; j++ )
-                {
-
-                    Carry = 0;
-                    move16();
-#ifdef BASOP_NOGLOB                                                                       /* Critical Carry/Overflow */
-                    L_tmp = L_add_co( L_tmp, *( cngNoiseLevel + j ), &Carry, &Overflow ); /*Q31 - L_tmp_exp*/
-                    Overflow = 0;
-                    move16();
-
-                    IF( *( cngNoiseLevel + j ) < 0 )
-                    {
-                        L_c = L_msuNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
-                    }
-                    IF( *( cngNoiseLevel + j ) >= 0 )
-                    {
-                        L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Q-1*/
-                    }
-#else
-                    L_tmp = L_add_c( L_tmp, *( cngNoiseLevel + j ) );
-                    Overflow = 0;
-
-                    if ( *( cngNoiseLevel + j ) < 0 )
-                    {
-                        L_c = L_msuNs( L_c, 0, 0 );
-                    }
-                    if ( *( cngNoiseLevel + j ) >= 0 )
-                    {
-                        L_c = L_macNs( L_c, 0, 0 );
-                    }
-#endif
-                }
-                L_tmp = norm_llQ31( L_c, L_tmp, &L_tmp_exp ); /*Q31 - L_tmp_exp*/
-                L_tmp_exp = sub( add( L_tmp_exp, *cngNoiseLevel_exp ), 1 );
-
-                L_tmp = Mpy_32_16_1( L_tmp, hFdCngCom->fftlen ); /*Q16 - L_tmp_exp*/
-
-                L_tmp = Mpy_32_16_1( L_tmp, T_DIV_L_Frame[L_shl( L_mac( -28000, st->L_frame, 95 ), 1 - 15 )] ); /*Q16,exp -7*/
-                L_tmp_exp = add( L_tmp_exp, -7 );                                                               /*->Q16, L_tmp_exp */
-                L_tmp_exp = add( L_tmp_exp, 31 - 16 );                                                          /*->Q31, L_tmp_exp*/
-
-#ifdef BASOP_NOGLOB                                                                    /* Critical Carry/Overflow */
-                st->cngTDLevel = round_fx_o( Sqrt32( L_tmp, &L_tmp_exp ), &Overflow ); /*Q15 - L_tmp_exp*/
-#else
-                st->cngTDLevel = round_fx( Sqrt32( L_tmp, &L_tmp_exp ) );
-#endif
-                move16();
-                st->cngTDLevel_e = L_tmp_exp;
-                move16();
-                BREAK;
-            }
-            hFdCngCom->inactive_frame_counter = add( hFdCngCom->inactive_frame_counter, 1 );
-            move16();
-
-            /*************************************
-             * SID_FRAME or ZERO_FRAME at DECODER *
-             *************************************/
-
-            /* Detect first non-active frame */
-            IF( EQ_16( hFdCngCom->inactive_frame_counter, 1 ) )
-            {
-                /* Compute the fine spectral structure of the comfort noise shape using the decoder-side noise estimates */
-                bandcombinepow(
-                    hFdCngDec->bandNoiseShape,
-                    hFdCngDec->bandNoiseShape_exp,
-                    nBins,
-                    hFdCngCom->part,
-                    hFdCngCom->nFFTpart,
-                    hFdCngCom->psize_inv,
-                    hFdCngDec->partNoiseShape,
-                    &hFdCngDec->partNoiseShape_exp );
-                IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-                {
-                    Copy32( hFdCngDec->hFdCngCom->sidNoiseEst, hFdCngDec->hFdCngCom->sidNoiseEstLp, NPART ); /*Q31 - hFdCngDec->sidNoiseEstExp*/
-                }
-            }
-
-            IF( EQ_16( st->m_frame_type, SID_FRAME ) )
-            {
-                IF( LT_32( hFdCngCom->msFrCnt_init_counter, L_deposit_l( hFdCngCom->msFrCnt_init_thresh ) ) )
-                {
-                    /* At initialization, interpolate the bin/band-wise levels from the partition levels */
-                    scalebands_fx( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
-                                   hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );
-                    *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
-                    move16();
-                }
-                ELSE
-                {
-                    if ( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-                    {
-                        sidNoiseEst = hFdCngCom->sidNoiseEstLp; /*Q31 - hFdCngDec->sidNoiseEstExp*/
-                    }
-                    /* Interpolate the CLDFB band levels from the SID (partition) levels */
-                    IF( GT_16( hFdCngCom->regularStopBand, hFdCngCom->numCoreBands ) )
-                    {
-                        scalebands_fx( sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
-                                       hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );
-
-                        *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
-                        move16();
-                    }
-
-                    s2 = -( ( WORD32_BITS - 1 ) );
-                    move16();
-                    /* Shape the SID noise levels in each FFT bin */
-                    j = 0;
-                    move16();
-                    FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
-                    {
-                        assert( hFdCngDec->partNoiseShape[k] >= 0 );
-
-                        /* add DELTA as it is done in FLC version, in order to avoid num > denom */
-                        facTab[k] = 0;
-                        move16();
-                        IF( hFdCngDec->partNoiseShape[k] != 0 )
-                        {
-                            s1 = norm_l( sidNoiseEst[k] );
-                            L_tmp = L_shl( sidNoiseEst[k], s1 ); /*Q31 - ( hFdCngCom->sidNoiseEstExp - s1 )*/
-                            L_tmp_exp = sub( hFdCngCom->sidNoiseEstExp, s1 );
-                            L_tmp = BASOP_Util_Add_Mant32Exp( sidNoiseEst[k], hFdCngCom->sidNoiseEstExp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
-                            L_tmp = L_shr( L_tmp, 1 );
-                            s = add( L_tmp_exp, 1 );
-                            num = extract_h( L_tmp ); /*Q15 - L_tmp_exp*/
-
-                            s1 = norm_l( hFdCngDec->partNoiseShape[k] );
-                            L_tmp = L_shl( hFdCngDec->partNoiseShape[k], s1 ); /*Q31 - ( hFdCngDec->partNoiseShape_ex - s1 )*/
-                            L_tmp_exp = sub( hFdCngDec->partNoiseShape_exp, s1 );
-                            L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_exp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
-                            s = sub( s, L_tmp_exp );
-                            denom = extract_h( L_tmp ); /*Q15 - L_tmp_exp*/
-
-                            facTab[k] = div_s( num, denom ); /*Q15 - s*/
-                            move16();
-                            facTabExp[k] = s;
-                            move16();
-                        }
-                        /* Set unique exponent, IF mantissa is equal to zero */
-                        IF( EQ_16( facTab[k], 0 ) )
-                        {
-                            facTabExp[k] = -( ( WORD32_BITS - 1 ) );
-                            move16();
-                        }
-                        s2 = s_max( s2, facTabExp[k] );
-                    }
-                    if ( EQ_16( s2, -31 ) )
-                    {
-                        s2 = 0;
-                        move16();
-                    }
-                    FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
-                    {
-                        s = sub( facTabExp[k], s2 );
-                        s = s_max( s_min( s, ( WORD32_BITS - 1 ) ), -( ( WORD32_BITS - 1 ) ) );
-                        FOR( ; j <= hFdCngCom->part[k]; j++ )
-                        {
-                            cngNoiseLevel[j] = L_shl( Mpy_32_16_1( hFdCngDec->bandNoiseShape[j], facTab[k] ), s ); /*Q31 - hFdCngDec->bandNoiseShape_exp*/
-                            move32();
-                        }
-                    }
-                    /* adapt scaling for rest of the buffer */
-                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
-                    FOR( ; k < hFdCngCom->npart; k++ )
-                    {
-                        FOR( ; j <= hFdCngCom->part[k]; j++ )
-                        {
-                            cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/
-                            move32();
-                        }
-                    }
-                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
-                    move16();
-                }
-            }
-            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-            {
-                IF( !( LT_16( hFdCngCom->msFrCnt_init_counter, hFdCngCom->msFrCnt_init_thresh ) ) )
-                {
-                    s2 = -( ( WORD32_BITS - 1 ) );
-                    /* Shape the SID noise levels in each FFT bin */
-                    j = 0;
-                    move16();
-                    FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
-                    {
-                        assert( hFdCngDec->partNoiseShape[k] >= 0 );
-
-                        /* add DELTA as it is done in FLC version, in order to avoid num > denom */
-                        facTab[k] = 0;
-                        move16();
-                        IF( hFdCngDec->partNoiseShape[k] != 0 )
-                        {
-                            s1 = norm_l( hFdCngCom->sidNoiseEstLp[k] );
-                            L_tmp = L_shl( hFdCngCom->sidNoiseEstLp[k], s1 ); /*Q31 - ( hFdCngCom->sidNoiseEstExp - s1 )*/
-                            L_tmp_exp = sub( hFdCngCom->sidNoiseEstExp, s1 );
-                            L_tmp = BASOP_Util_Add_Mant32Exp( hFdCngCom->sidNoiseEstLp[k], hFdCngCom->sidNoiseEstExp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
-                            L_tmp = L_shr( L_tmp, 1 );
-                            s = add( L_tmp_exp, 1 );
-                            num = extract_h( L_tmp ); /*Q15 - L_tmp_exp*/
-
-                            s1 = norm_l( hFdCngDec->partNoiseShape[k] );
-                            L_tmp = L_shl( hFdCngDec->partNoiseShape[k], s1 ); /*Q31 - ( hFdCngDec->partNoiseShape_exp - s1 )*/
-                            L_tmp_exp = sub( hFdCngDec->partNoiseShape_exp, s1 );
-                            L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_exp, DELTA_MANTISSA_W32, DELTA_EXPONENT, &L_tmp_exp );
-                            s = sub( s, L_tmp_exp );
-                            denom = extract_h( L_tmp ); /*Q15 - L_tmp_exp*/
-
-                            facTab[k] = div_s( num, denom ); /*Q15 - s*/
-                            move16();
-                            facTabExp[k] = s;
-                            move16();
-                        }
-                        /* Set unique exponent, IF mantissa is equal to zero */
-                        if ( facTab[k] == 0 )
-                        {
-                            facTabExp[k] = -( WORD32_BITS - 1 );
-                            move16();
-                        }
-                        s2 = s_max( s2, facTabExp[k] );
-                    }
-                    IF( EQ_16( s2, -31 ) )
-                    {
-                        s2 = 0;
-                        move16();
-                    }
-                    FOR( k = 0; k < hFdCngCom->nFFTpart; k++ )
-                    {
-                        s = sub( facTabExp[k], s2 );
-                        s = s_max( s_min( s, sub( WORD32_BITS, 1 ) ), negate( sub( WORD32_BITS, 1 ) ) );
-                        FOR( ; j <= hFdCngCom->part[k]; j++ )
-                        {
-                            cngNoiseLevel[j] = L_shl( Mpy_32_16_1( hFdCngDec->bandNoiseShape[j], facTab[k] ), s ); /*Q31 - hFdCngDec->bandNoiseShape_exp*/
-                            move32();
-                        }
-                    }
-                    /* adapt scaling for rest of the buffer */
-                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
-                    FOR( ; k < hFdCngCom->npart; k++ )
-                    {
-                        FOR( ; j <= hFdCngCom->part[k]; j++ )
-                        {
-                            cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/
-                            move32();
-                        }
-                    }
-                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
-                    move16();
-                }
-            }
-            IF( EQ_16( st->codec_mode, MODE2 ) )
-            {
-                /* Generate comfort noise during SID or zero frames */
-                generate_comfort_noise_dec_ivas_fx( cldfbBufferReal, cldfbBufferImag, cldfbBufferScale, st, &( st->Q_exc ), 2, -1 );
-            }
-
-            BREAK;
-
-        default:
-            return -1;
-    }
-
-
-    return 0;
-}
-
-/*
-   perform_noise_estimation_dec_fx
-
-    Parameters:
-
-    timeDomainInput,      i:   pointer to time domain input
-    bitrate,              i:   bitrate
-    st                    i/o: FD_CNG structure containing all buffers and variables
-
-    Function:
-    perform noise estimation
-
-    Returns:
-    void
-*/
-void perform_noise_estimation_dec_fx(
-    const Word16 *timeDomainInput, /* i:   pointer to time domain input Q*/
-    const Word16 Q,
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    float *power_spectrum,
-#endif
-    HANDLE_FD_CNG_DEC hFdCngDec /* i/o: FD_CNG structure containing all buffers and variables */
-#ifdef IVAS_CODE_CNG
-    ,
-    const int16_t element_mode,    /* i  : element mode                                          */
-    const int16_t bwidth,          /* i  : audio bandwidth                                       */
-    const int16_t L_frame,         /* i  : frame length at internal Fs                           */
-    const int16_t last_L_frame,    /* i  : frame length of the last frame at internal Fs         */
-    const int32_t last_core_brate, /* i  : previous frame core bitrate                           */
-    const int16_t VAD              /* i  : VAD flag in the decoder                               */
-#endif
-)
-{
-    Word16 i, tmp_r, tmp_i, fac, fftBuffer_exp;
-    Word16 s, len, npart, nFFTpart;
-    Word16 startBand, stopFFTbin;
-
-    Word16 *part, *psize_inv, *psize_norm;
-    Word32 tmp, *fftBuffer, *periodog, *ptr_per, *ptr_r, *ptr_i;
-#ifdef IVAS_CODE_CNG
-    PMT( "lots of code related to IVAS needs to be done " )
-#endif
-
-
-    /* pointer initialization */
-    periodog = hFdCngDec->hFdCngCom->periodog;   /*Q31 - hFdCngDec->hFdCngCom->periodog_exp*/
-    fftBuffer = hFdCngDec->hFdCngCom->fftBuffer; /*Q31 - hFdCngDec->hFdCngCom->fftBuffer_exp*/
-
-    part = hFdCngDec->part_shaping;             /*Q0*/
-    psize_inv = hFdCngDec->psize_inv_shaping;   /*Q15*/
-    psize_norm = hFdCngDec->psize_shaping_norm; /*Q15 - hFdCngDec->psize_shaping_norm_exp*/
-
-    /* variable initialization */
-    startBand = hFdCngDec->hFdCngCom->startBand; /*Q0*/
-    move16();
-    stopFFTbin = hFdCngDec->hFdCngCom->stopFFTbin; /*Q0*/
-    move16();
-
-    npart = hFdCngDec->npart_shaping; /*Q0*/
-    move16();
-    nFFTpart = hFdCngDec->nFFTpart_shaping; /*Q0*/
-    move16();
-
-    /* Perform STFT analysis */
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    IF( !( EQ_16( element_mode, IVAS_CPE_MDCT ) && power_spectrum != NULL ) )
-    {
-        /* Perform STFT analysis */
-        AnalysisSTFT( timeDomainInput, Q, fftBuffer, &fftBuffer_exp, hFdCngDec->hFdCngCom );
-    }
-#else
-    /* Perform STFT analysis */
-    AnalysisSTFT( timeDomainInput, Q, fftBuffer, &fftBuffer_exp, hFdCngDec->hFdCngCom );
-#endif
-    fftBuffer_exp = add( fftBuffer_exp, WORD16_BITS - 1 );
-#ifdef IVAS_CODE_CNG
-    if ( element_mode == IVAS_CPE_TD || element_mode == IVAS_CPE_DFT )
-    {
-        /* Calculate periodogram (squared magnitude in each FFT bin) */
-        if ( startBand == 0 )
-        {
-            ( *ptr_per ) = fftBuffer[0] * fftBuffer[0];
-            ptr_per++;
-            ptr_r = fftBuffer + 2;
-        }
-        else
-        {
-            ptr_r = fftBuffer + 2 * startBand;
-        }
-
-        ptr_i = ptr_r + 1;
-
-        for ( ; ptr_per < periodog + stopFFTbin - startBand; ptr_per++ )
-        {
-            ( *ptr_per ) = ( *ptr_r ) * ( *ptr_r ) + ( *ptr_i ) * ( *ptr_i );
-            ptr_r += 2;
-            ptr_i += 2;
-        }
-
-        /* Rescale to get energy/sample: it should be 2*(1/N)*(2/N), parseval relation with 1/N,*2 for nrg computed till Nyquist only, 2/N as windowed samples correspond to half a frame*/
-        v_multc( periodog, 4.f / (float) ( hFdCngDec->hFdCngCom->fftlen * hFdCngDec->hFdCngCom->fftlen ), periodog, stopFFTbin - startBand );
-
-        /* Combine bins of power spectrum into partitions */
-        i = 0;
-        for ( p = 0; p < npart; p++ )
-        {
-
-            /* calculate mean over all bins in power partition */
-            temp = 0;
-            for ( ; i <= part[p]; i++ )
-            {
-                temp += periodog[i];
-            }
-            msPeriodog[p] = temp * psize_inv[p];
-        }
-
-        /* compensate for the loss of variance - don't do when first noise update is not completed yet due to risk of msPeriodog[p] < 0 */
-        if ( hFdCngDec->first_cna_noise_updated )
-        {
-            i = 0;
-            for ( p = 0; p < npart; p++ )
-            {
-                /* calculate variance over all bins in power partition */
-                temp = 0;
-                for ( ; i <= part[p]; i++ )
-                {
-                    delta = periodog[i] - msPeriodog[p];
-                    temp += delta * delta;
-                }
-                temp *= psize_inv[p];
-
-                /* compensate for the loss of variance */
-                msPeriodog[p] = (float) ( msPeriodog[p] + sqrt( temp ) * rand_gauss( &ftemp, &hFdCngDec->cna_seed ) );
-
-                if ( msPeriodog[p] < 1e-5f )
-                {
-                    msPeriodog[p] = 1e-5f;
-                }
-            }
-        }
-
-        /* calculate total energy (short-term and long-term) */
-        enr_tot = sum_f( msPeriodog, npart ) + EPSILON;
-        enr_tot0 = sum_f( msNoiseEst, npart ) + EPSILON;
-
-        /* update short-term periodogram on larger partitions */
-        for ( p = CNA_ACT_DN_LARGE_PARTITION; p < npart; p++ )
-        {
-            if ( L_frame != last_L_frame || last_core_brate <= SID_2k40 )
-            {
-                /* core Fs has changed or last frame was SID/NO_DATA -> re-initialize short-term periodogram */
-                hFdCngDec->msPeriodog_ST[p] = msPeriodog[p];
-            }
-            else
-            {
-                hFdCngDec->msPeriodog_ST[p] = (float) ( ST_PERIODOG_FACT * hFdCngDec->msPeriodog_ST[p] + ( 1 - ST_PERIODOG_FACT ) * msPeriodog[p] );
-            }
-        }
-
-        /* core Fs has changed -> partitions have changed -> re-calculate long-term periodogram */
-        /* part L_FRAME16k L_FRAME */
-        /* ...                     */
-        /* [55] 146        146     */
-        /* [56] 174        160     */
-        /* [57] 210        174     */
-        /* [58] 254        190     */
-        /* [59] 306        210     */
-        /* [60] 317        230     */
-        /* [61]            253     */
-
-        if ( last_L_frame == L_FRAME16k && L_frame == L_FRAME )
-        {
-            msNoiseEst[61] = msNoiseEst[58];
-            msNoiseEst[60] = min( msNoiseEst[58], msNoiseEst[57] );
-            msNoiseEst[59] = msNoiseEst[57];
-            msNoiseEst[58] = msNoiseEst[56];
-            msNoiseEst[57] = msNoiseEst[56];
-            msNoiseEst[56] = min( msNoiseEst[56], msNoiseEst[55] );
-        }
-        else if ( last_L_frame == L_FRAME && L_frame == L_FRAME16k )
-        {
-            msNoiseEst[56] = min( msNoiseEst[56], msNoiseEst[57] );
-            msNoiseEst[57] = min( msNoiseEst[58], msNoiseEst[59] );
-            msNoiseEst[58] = min( msNoiseEst[60], msNoiseEst[61] );
-            msNoiseEst[59] = 0.0f;
-            msNoiseEst[60] = 0.0f;
-            msNoiseEst[61] = 0.0f;
-
-            hFdCngDec->ms_cnt_bw_up = FIRST_CNA_NOISE_UPD_FRAMES;
-        }
-
-        /* Smooth with IIR filter */
-        if ( !hFdCngDec->first_cna_noise_updated )
-        {
-            if ( !VAD )
-            {
-                /* background noise update with moving average */
-                alpha = 1.0f / ( hFdCngDec->first_cna_noise_update_cnt + 1 );
-                for ( p = 0; p < npart; p++ )
-                {
-                    msNoiseEst[p] = ( 1 - alpha ) * msNoiseEst[p] + alpha * msPeriodog[p];
-                }
-
-                /* check, if we reached the required number of first CNA noise update frames */
-                if ( hFdCngDec->first_cna_noise_update_cnt < FIRST_CNA_NOISE_UPD_FRAMES - 1 )
-                {
-                    hFdCngDec->first_cna_noise_update_cnt++;
-                }
-                else
-                {
-                    hFdCngDec->first_cna_noise_updated = 1;
-                    if ( hFdCngDec->hFdCngCom->msFrCnt_init_counter == 0 )
-                    {
-                        hFdCngDec->hFdCngCom->msFrCnt_init_counter = 1;
-                    }
-                }
-            }
-            else
-            {
-                hFdCngDec->first_cna_noise_update_cnt = 0;
-            }
-        }
-        else
-        {
-            hFdCngDec->hFdCngCom->msFrCnt_init_counter = 1;
-            if ( VAD )
-            {
-                /* no updates during active frames except for significant energy drops */
-                enr_ratio = enr_tot / enr_tot0;
-                if ( enr_ratio < 0.5f )
-                {
-                    /* total energy significantly decreases during active frames -> downward update */
-                    wght = lin_interp( enr_ratio, 0.0f, 0.8f, 0.5f, 0.95f, 1 );
-                    for ( p = 0; p < npart; p++ )
-                    {
-                        if ( msPeriodog[p] < msNoiseEst[p] )
-                        {
-                            msNoiseEst[p] = wght * msNoiseEst[p] + ( 1 - wght ) * msPeriodog[p];
-                        }
-                    }
-                }
-                else
-                {
-                    /* energy significantly decreases in one of the larger partitions during active frames -> downward update */
-                    for ( p = CNA_ACT_DN_LARGE_PARTITION; p < npart; p++ )
-                    {
-                        if ( hFdCngDec->msPeriodog_ST[p] < msNoiseEst[p] )
-                        {
-                            msNoiseEst[p] = (float) ( CNA_ACT_DN_FACT * msNoiseEst[p] + ( 1 - CNA_ACT_DN_FACT ) * hFdCngDec->msPeriodog_ST[p] );
-                        }
-                    }
-                }
-            }
-            else
-            {
-
-                if ( bwidth >= WB && hFdCngDec->ms_last_inactive_bwidth == NB )
-                {
-                    /* bandwidth increased -> set counter for fast initilization  */
-                    hFdCngDec->ms_cnt_bw_up = FIRST_CNA_NOISE_UPD_FRAMES;
-                }
-                hFdCngDec->ms_last_inactive_bwidth = bwidth;
-                /* update background noise during inactive frames */
-                ptr_per = msNoiseEst;
-                for ( p = 0; p < npart; p++ )
-                {
-                    enr = msPeriodog[p];
-                    alpha = 0.95f;
-                    /* bandwidth increased -> do fast re-initilization  */
-                    if ( hFdCngDec->ms_cnt_bw_up > 0 && p > 55 )
-                    {
-                        alpha = 1.0f / ( hFdCngDec->ms_cnt_bw_up + 1 );
-                    }
-                    else if ( enr < *ptr_per && part[p] == 1 )
-                    {
-                        /* faster downward update for single-bin partitions */
-                        alpha = 0.8f;
-                    }
-                    else if ( enr > 2.0f * ( *ptr_per ) )
-                    {
-                        /* prevent abrupt upward updates */
-                        enr = 2.0f * ( *ptr_per );
-                    }
-
-                    /* IIR smoothing */
-                    *ptr_per *= alpha;
-                    *ptr_per += ( 1 - alpha ) * enr;
-                    ptr_per++;
-                }
-
-                if ( hFdCngDec->ms_cnt_bw_up > 0 )
-                {
-                    hFdCngDec->ms_cnt_bw_up--;
-                }
-            }
-        }
-
-        mvr2r( msNoiseEst, hFdCngDec->msPsd, npart );
-
-        /* Expand partitions into bins of power spectrum */
-        scalebands( msNoiseEst, part, nFFTpart, hFdCngDec->midband_shaping, nFFTpart, stopFFTbin - startBand, hFdCngDec->bandNoiseShape, 1 );
-
-        mvr2r( hFdCngDec->bandNoiseShape, &hFdCngDec->smoothed_psd[startBand], stopFFTbin - startBand );
-        set_zero( &hFdCngDec->smoothed_psd[stopFFTbin], L_FRAME16k - stopFFTbin );
-    }
-    else
-#endif
-    {
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        if ( element_mode == IVAS_CPE_MDCT && power_spectrum != NULL )
-        {
-            /* use power spectrum calculated in the MDCT-domain instead of calculating new power spectrum */
-            periodog = power_spectrum;
-        }
-        else
-        {
-            /* Compute the squared magnitude in each FFT bin */
-            if ( startBand == 0 )
-            {
-                ( *ptr_per ) = fftBuffer[0] * fftBuffer[0]; /* DC component */
-                ptr_per++;
-                ptr_r = fftBuffer + 2;
-            }
-            else
-            {
-                ptr_r = fftBuffer + 2 * startBand;
-            }
-
-            ptr_i = ptr_r + 1;
-
-            for ( ; ptr_per < periodog + stopFFTbin - startBand; ptr_per++ )
-            {
-                ( *ptr_per ) = ( *ptr_r ) * ( *ptr_r ) + ( *ptr_i ) * ( *ptr_i );
-                ptr_r += 2;
-                ptr_i += 2;
-            }
-            /* Nyquist frequency is discarded */
-
-            /* Rescale to get energy/sample: it should be 2*(1/N)*(2/N), parseval relation with 1/N,*2 for nrg computed till Nyquist only, 2/N as windowed samples correspond to half a frame*/
-            v_multc( periodog, 4.f / (float) ( hFdCngDec->hFdCngCom->fftlen * hFdCngDec->hFdCngCom->fftlen ), periodog, stopFFTbin - startBand );
-        }
-#else
-        assert( startBand != 0 );
-
-        len = sub( stopFFTbin, startBand );
-
-        s = getScaleFactor32( &fftBuffer[( startBand * 2 )], shl( len, 1 ) );
-        s = sub( s, 1 );
-
-        ptr_per = periodog;
-        IF( startBand == 0 )
-        {
-            /* DC component */
-            tmp_r = extract_h( L_shl( fftBuffer[0], s ) ); /*Q15 - fftBuffer_exp + s*/
-
-            tmp = L_mult( tmp_r, tmp_r ); /*Q31 - 2*(fftBuffer_exp - s)*/
-            *ptr_per = tmp;               /*Q31 - 2*(fftBuffer_exp - s)*/
-            move32();
-
-            ptr_per++;
-            ptr_r = fftBuffer + 2; /*Q31 - fftBuffer_exp*/
-            len = sub( len, 1 );
-        }
-        ELSE
-        {
-            ptr_r = fftBuffer + shl( startBand, 1 ); /*fftBuffer_exp*/
-        }
-
-        ptr_i = ptr_r + 1;
-        FOR( i = 0; i < len; i++ )
-        {
-            tmp_r = extract_h( L_shl( *ptr_r, s ) ); /*Q15 - fftBuffer_exp + s*/
-            tmp_i = extract_h( L_shl( *ptr_i, s ) ); /*Q15 - fftBuffer_exp + s*/
-
-            tmp = L_mac( L_mult( tmp_r, tmp_r ), tmp_i, tmp_i ); /*Q31 - 2*(fftBuffer_exp - s)*/
-            *ptr_per = tmp;                                      /*Q31 - 2*(fftBuffer_exp - s)*/
-            move32();
-
-            ptr_r += 2;
-            ptr_i += 2;
-            ptr_per++;
-        }
+            ptr_r += 2;
+            ptr_i += 2;
+            ptr_per++;
+        }
 
         hFdCngDec->hFdCngCom->periodog_exp = shl( sub( fftBuffer_exp, s ), 1 );
         move16();
@@ -2345,7 +1432,6 @@ void perform_noise_estimation_dec_fx(
         }
         hFdCngDec->hFdCngCom->periodog_exp = add( hFdCngDec->hFdCngCom->periodog_exp, sub( 2, s ) );
         move16();
-#endif
 
         /* Adjust to the desired frequency resolution by averaging over spectral partitions for SID transmission */
         bandcombinepow( periodog, hFdCngDec->hFdCngCom->periodog_exp, sub( stopFFTbin, startBand ), part, npart, psize_inv, hFdCngDec->msPeriodog, &hFdCngDec->msPeriodog_exp );
@@ -2382,12 +1468,7 @@ void perform_noise_estimation_dec_fx(
             hFdCngDec->msNewMinFlag,
             hFdCngDec->msPeriodogBuf,
             &( hFdCngDec->msPeriodogBufPtr ),
-            hFdCngDec->hFdCngCom
-#ifdef IVAS_CODE_CNG
-            ,
-            DEC, element_mode
-#endif
-        );
+            hFdCngDec->hFdCngCom );
 
         /* Expand MS outputs */
         expand_range( hFdCngDec->msLogNoiseEst, hFdCngDec->msNoiseEst, &hFdCngDec->msNoiseEst_exp, npart );
@@ -2426,11 +1507,7 @@ void perform_noise_estimation_dec_ivas_fx(
     Word16 tmp_s, tmp_q, min_q = 31;
     Word16 q_shift;
     Word32 max_l;
-    Word16 norm_shift;
-#ifdef IVAS_CODE_CNG
-    PMT( "lots of code related to IVAS needs to be done " )
-#endif
-
+    Word16 norm_shift;
 
     /* pointer initialization */
     periodog = hFdCngDec->hFdCngCom->periodog;   /*Q31 - hFdCngDec->hFdCngCom->periodog_exp*/
@@ -2783,10 +1860,16 @@ void perform_noise_estimation_dec_ivas_fx(
                 }
                 ELSE
                 {
-                    Word16 tmp = s_max( sub( hFdCngDec->msPeriodog_exp, getScaleFactor32( msPeriodog, npart ) ), sub( hFdCngDec->msNoiseEst_exp, getScaleFactor32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ) ) ) );
-                    Copy_Scale_sig32( msPeriodog, msNoiseEst, npart, sub( hFdCngDec->msPeriodog_exp, tmp ) );              /*Q31 - tmp*/
-                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, tmp ) ); /*Q31 - tmp*/
-                    hFdCngDec->msNoiseEst_exp = tmp;
+                    Copy32( msPeriodog, msNoiseEst, npart );
+
+                    Word16 shift1 = L_norm_arr( msNoiseEst, npart );
+                    Word16 shift2 = L_norm_arr( &msNoiseEst[npart], sub( NPART_SHAPING, npart ) );
+                    Word16 shift = s_max( sub( hFdCngDec->msPeriodog_exp, shift1 ), sub( hFdCngDec->msNoiseEst_exp, shift2 ) );
+
+                    scale_sig32( msNoiseEst, npart, sub( hFdCngDec->msPeriodog_exp, shift ) );
+                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, shift ) );
+
+                    hFdCngDec->msNoiseEst_exp = shift;
                     move16();
                 }
 
@@ -3095,480 +2178,972 @@ void perform_noise_estimation_dec_ivas_fx(
                 ( *ptr_per ) = W_extract_l( W_shr( W_tmp, sub( i_mult( sub( 31, fftBuffer_exp ), 2 ), min_q ) ) ); // Q = min_q
                 move32();
 
-                /* Rescale to get energy/sample: it should be 2*(1/N)*(2/N), parseval relation with 1/N,*2 for nrg computed till Nyquist only, 2/N as windowed samples correspond to half a frame*/
-                ( *ptr_per ) = Mpy_32_32_r( ( *ptr_per ), rescale_fac ); // Q = min_q
-                move32();
-                IF( tmp_q <= 0 )
-                {
-                    ( *ptr_per ) = L_shl( ( *ptr_per ), negate( tmp_q ) );
-                    move32();
-                }
+                /* Rescale to get energy/sample: it should be 2*(1/N)*(2/N), parseval relation with 1/N,*2 for nrg computed till Nyquist only, 2/N as windowed samples correspond to half a frame*/
+                ( *ptr_per ) = Mpy_32_32_r( ( *ptr_per ), rescale_fac ); // Q = min_q
+                move32();
+                IF( tmp_q <= 0 )
+                {
+                    ( *ptr_per ) = L_shl( ( *ptr_per ), negate( tmp_q ) );
+                    move32();
+                }
+
+                ptr_r += 2;
+                ptr_i += 2;
+            }
+
+            hFdCngDec->hFdCngCom->periodog_exp = sub( 31, min_q );
+            move16();
+            hFdCngDec->hFdCngCom->fftBuffer_exp = fftBuffer_exp;
+            move16();
+
+            tmp_s = getScaleFactor32( periodog, L_frame );
+            IF( GT_16( tmp_s, 3 ) )
+            {
+                tmp_s = sub( tmp_s, 3 );
+                hFdCngDec->hFdCngCom->periodog_exp = sub( hFdCngDec->hFdCngCom->periodog_exp, tmp_s );
+                move16();
+                FOR( p = 0; p < stopFFTbin - startBand; p++ )
+                {
+                    periodog[p] = L_shl( periodog[p], tmp_s ); /*Q31 - hFdCngDec->hFdCngCom->periodog_exp + tmp_s*/
+                    move32();
+                }
+            }
+            periodog_exp = hFdCngDec->hFdCngCom->periodog_exp;
+            move16();
+        }
+
+        /* Adjust to the desired frequency resolution by averaging over spectral partitions for SID transmission */
+        bandcombinepow( periodog, periodog_exp, sub( stopFFTbin, startBand ), part, npart, psize_inv, hFdCngDec->msPeriodog, &hFdCngDec->msPeriodog_exp );
+
+
+        hFdCngDec->msPeriodog_exp_fft = hFdCngDec->msPeriodog_exp;
+        move16();
+        hFdCngDec->msPeriodog_exp_cldfb = hFdCngDec->msPeriodog_exp;
+        move16();
+
+
+        /* Compress MS inputs */
+        compress_range( hFdCngDec->msPeriodog, hFdCngDec->msPeriodog_exp, hFdCngDec->msLogPeriodog, npart );
+
+        /* Call the minimum statistics routine for noise estimation */
+        minimum_statistics_fx(
+            npart,
+            nFFTpart,
+            psize_norm,
+            hFdCngDec->msLogPeriodog,
+            hFdCngDec->msNoiseFloor,
+            hFdCngDec->msLogNoiseEst,
+            hFdCngDec->msAlpha,
+            hFdCngDec->msPsd,
+            hFdCngDec->msPsdFirstMoment,
+            hFdCngDec->msPsdSecondMoment,
+            hFdCngDec->msMinBuf,
+            hFdCngDec->msBminWin,
+            hFdCngDec->msBminSubWin,
+            hFdCngDec->msCurrentMin,
+            hFdCngDec->msCurrentMinOut,
+            hFdCngDec->msCurrentMinSubWindow,
+            hFdCngDec->msLocalMinFlag,
+            hFdCngDec->msNewMinFlag,
+            hFdCngDec->msPeriodogBuf,
+            &( hFdCngDec->msPeriodogBufPtr ),
+            hFdCngDec->hFdCngCom,
+            DEC, element_mode );
+
+        FOR( i = 0; i < hFdCngDec->npart_shaping; i++ )
+        {
+            hFdCngDec->msPsd_fx[i] = (Word32) hFdCngDec->msPsd[i];
+            move32();
+        }
+        hFdCngDec->msPsd_exp_fft = 6 + WORD16_BITS;
+        move16();
+
+        /* Expand MS outputs */
+        expand_range( hFdCngDec->msLogNoiseEst, hFdCngDec->msNoiseEst, &hFdCngDec->msNoiseEst_exp, npart );
+    }
+}
+
+
+/*
+   FdCng_decodeSID_fx
+
+    Parameters:
+
+    st               i/o: FD_CNG structure containing all buffers and variables
+    bs_word16        i  : Bitstream
+    amrwb_io         i  : amr wideband mode
+    preemph_fac      i  : preemphase factor
+
+    Function:
+    decode the FD-CNG bitstream
+
+    Returns:
+    void
+*/
+void FdCng_decodeSID_fx( HANDLE_FD_CNG_COM st, Decoder_State *corest )
+{
+    Word16 i, N, index;
+    Word32 *sidNoiseEst;
+
+    Word16 indices[32], v16[32];
+    Word32 v[32], gain;
+
+    Word32 tmp, maxVal, E_ExpLd64;
+    Word16 sidNoiseEst_Exp;
+
+    Word16 preemph_fac;
+    Word32 *invTrfMatrix_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;
+
+
+    sidNoiseEst = st->sidNoiseEst; /*Q31 - st->sidNoiseEstExp*/
+    move16();
+    preemph_fac = corest->preemph_fac; /*Q15*/
+    move16();
+
+    N = st->npart; /*Q0*/
+    move16();
+
+    st->sid_frame_counter = add( st->sid_frame_counter, 1 ); /*Q15*/
+    move16();
+
+    /* Read bitstream */
+    FOR( i = 0; i < stages_37bits; i++ )
+    {
+        indices[i] = get_next_indice_fx( corest, bits_37bits[i] ); /*Q0*/
+        move16();
+    }
+    index = get_next_indice_fx( corest, 7 ); /*Q0*/
+
+    /* MSVQ decoder */
+    IF( corest->element_mode != EVS_MONO )
+    {
+        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );
+        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages_37bits, N, maxN_37bits, indices, 1, invTrfMatrix_fx, v, NULL, 7 );
+    }
+    ELSE
+    {
+        msvq_decoder(
+            cdk_37bits,
+            stages_37bits,
+            N,
+            maxN_37bits,
+            indices,
+            v16 );
+
+        FOR( i = 0; i < N; i++ )
+        {
+            v[i] = L_deposit_h( v16[i] ); /*Q23*/
+            move32();
+        }
+    }
+
+
+    /* decode gain, format gain: Q9.23 */
+    gain = L_shl( L_deposit_l( index ), WORD32_BITS - 1 - 8 );
+    gain = L_sub( gain, 503316480l /*60.0 Q23*/ );       /*Q23*/
+    gain = Mpy_32_16_1( gain, 21845 /*2.0f/3.0f Q15*/ ); /*Q23*/
+
+
+    /* Apply gain and undo log */
+
+    /* calculate worst case for scaling */
+    maxVal = L_add( 0x80000000 /*-1.0 Q31*/, 0 );
+    FOR( i = 0; i < N; i++ )
+    {
+        maxVal = L_max( maxVal, v[i] ); /*Q23*/
+    }
+
+    maxVal = L_add( maxVal, gain );                                          /*Q23*/
+    maxVal = L_shl( Mpy_32_16_1( maxVal, 21771 /*0.66438561897 Q15*/ ), 1 ); /*Q23*/
+
+    sidNoiseEst_Exp = 0;
+    move16();
+    FOR( ; maxVal >= 0; maxVal -= 33554432l /*0.015625 Q31*/ )
+    {
+        sidNoiseEst_Exp = add( sidNoiseEst_Exp, 1 );
+    }
+    st->sidNoiseEstExp = sidNoiseEst_Exp;
+    move16();
+    E_ExpLd64 = L_shl( sidNoiseEst_Exp, WORD32_BITS - 1 - LD_DATA_SCALE );
+
+    /* format v: Q9.23, format sidNoiseEst: Q6.26, 0.66438561897 = log10(10)/log10(2.0) / 10.0 * 2.0 */
+    FOR( i = 0; i < N; i++ )
+    {
+        tmp = L_add( v[i], gain );                                         /*Q23*/
+        tmp = L_shl( Mpy_32_16_1( tmp, 21771 /*0.66438561897 Q15*/ ), 1 ); /*Q23*/
+        tmp = L_sub( tmp, E_ExpLd64 );
+        assert( tmp < 0 );
+        st->sidNoiseEst[i] = BASOP_Util_InvLog2( tmp ); /*Q31 - st->sidNoiseEstExp*/
+        move32();
+    }
+
+    /* NB last band energy compensation */
+    IF( st->CngBandwidth == NB )
+    {
+        st->sidNoiseEst[( N - 1 )] = Mpy_32_16_1( st->sidNoiseEst[( N - 1 )], NB_LAST_BAND_SCALE ); /*Q31 - st->sidNoiseEstExp*/
+        move32();
+    }
+
+    test();
+    IF( EQ_16( st->CngBandwidth, SWB ) && LE_32( st->CngBitrate, ACELP_13k20 ) )
+    {
+        st->sidNoiseEst[( N - 1 )] = Mpy_32_16_1( st->sidNoiseEst[( N - 1 )], SWB_13k2_LAST_BAND_SCALE ); /*Q31 - st->sidNoiseEstExp*/
+        move32();
+    }
+
+
+    scalebands( sidNoiseEst, st->part, st->npart, st->midband, st->nFFTpart, sub( st->stopBand, st->startBand ), st->cngNoiseLevel, 1 );
+    st->cngNoiseLevelExp = st->sidNoiseEstExp;
+    move16();
+
+
+    lpc_from_spectrum( st, st->startBand, st->stopFFTbin, preemph_fac );
+}
+
+/*
+    noisy_speech_detection_fx
+
+    Parameters:
+
+    vad                 i  : VAD decision
+    Etot                i  : total channel E
+    Etot_exp            i  : exponent for total channel E
+    totalNoise          i  : noise estimate over all critical bands
+    totalNoise_exp      i  : exponent for noise estimate over all critical bands
+    lp_noise            i/o: pointer to long term total Noise energy average
+    lp_speech           i/o: pointer to long term active speech energy average
+
+    Function:
+    detector for noisy speech, lp_noise and lp_speech are scaled by LD_DATA_SCALE+2 bits
+
+    Returns: flag, that indicates whether noisy speech has been detected
+
+    void
+*/
+void noisy_speech_detection_fx(
+    HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure            */
+    const Word16 vad,            /*Q0*/
+    const Word16 *syn,           /* i  : input time-domain frame                  Q*/
+    const Word16 Q )
+{
+    Word16 i;
+    Word32 tmp;
+    Word32 Etot;
+    Word16 Etot_exp;
+    Word32 logEtot;
+    Word32 logEtotExp;
+    Word32 totalNoise;
+    Word16 totalNoise_exp;
+    Word32 logTotalNoise;
+    Word32 logTotalNoiseExp;
+
 
-                ptr_r += 2;
-                ptr_i += 2;
-            }
+    IF( vad == 0 )
+    {
+        totalNoise = dotWord32_16_Mant32Exp( hFdCngDec->msNoiseEst, hFdCngDec->msNoiseEst_exp, hFdCngDec->psize_shaping_norm, hFdCngDec->psize_shaping_norm_exp, hFdCngDec->nFFTpart_shaping, &totalNoise_exp ); /*Q31 - totalNoise_exp*/
 
-            hFdCngDec->hFdCngCom->periodog_exp = sub( 31, min_q );
-            move16();
-            hFdCngDec->hFdCngCom->fftBuffer_exp = fftBuffer_exp;
-            move16();
+        /*
+          - logTotalNoise is scaled by LD_DATA_SCALE+2
+          - logTotalNoise = 10.0 * log10(totalNoise + DELTA);
+          - constant: -0.78125 = 10.0*log10(DELTA)/(1<<(LD_DATA_SCALE+2))
+          - constant:  0.75257498916 = 10.0 * log10(2.0)/log10(10.0)/(1<<2)
+        */
+        IF( totalNoise == 0 )
+        {
+            logTotalNoise = L_add( -1677721600l /*-0.78125 Q31*/, 0 ); /*Q31*/
+        }
+        ELSE
+        {
+            logTotalNoise = BASOP_Util_Log2( totalNoise ); /*Q25*/
+            logTotalNoiseExp = L_shl( L_deposit_l( totalNoise_exp ), WORD32_BITS - 1 - LD_DATA_SCALE );
+            logTotalNoise = Mpy_32_16_1( L_add( logTotalNoise, logTotalNoiseExp ), 24660 /*0.75257498916 Q15*/ ); /*Q31 - logTotalNoiseExp*/
+        }
 
-            tmp_s = getScaleFactor32( periodog, L_frame );
-            IF( GT_16( tmp_s, 3 ) )
+        hFdCngDec->lp_noise = L_add( Mpy_32_16_1( hFdCngDec->lp_noise, 32604 /*0.995 Q15*/ ), L_shr( Mpy_32_16_1( logTotalNoise, 20972 /*0.64 Q15*/ ), 7 ) ); /*hFdCngDec->q_lp_noise*/
+        move32();
+    }
+    ELSE
+    {
+        Etot = 0;
+        move32();
+        Etot_exp = 31;
+        move16();
+        FOR( i = 0; i < hFdCngDec->hFdCngCom->frameSize; i++ )
+        {
+            tmp = L_shr_r( L_mult0( syn[i], syn[i] ), sub( Etot_exp, 31 ) ); /*2*(Q) - (Etot_exp - 31)*/
+            IF( LT_32( L_sub( maxWord32, tmp ), Etot ) )
             {
-                tmp_s = sub( tmp_s, 3 );
-                hFdCngDec->hFdCngCom->periodog_exp = sub( hFdCngDec->hFdCngCom->periodog_exp, tmp_s );
-                move16();
-                FOR( p = 0; p < stopFFTbin - startBand; p++ )
-                {
-                    periodog[p] = L_shl( periodog[p], tmp_s ); /*Q31 - hFdCngDec->hFdCngCom->periodog_exp + tmp_s*/
-                    move32();
-                }
+                Etot_exp = add( Etot_exp, 1 );
+                Etot = L_shr_r( Etot, 1 ); /*Q31 - Etot_exp*/
+                tmp = L_shr_r( tmp, 1 );
             }
-            periodog_exp = hFdCngDec->hFdCngCom->periodog_exp;
-            move16();
+            Etot = L_add( Etot, tmp );
         }
+        Etot_exp = sub( Etot_exp, shl( Q, 1 ) );
 
-        /* Adjust to the desired frequency resolution by averaging over spectral partitions for SID transmission */
-        bandcombinepow( periodog, periodog_exp, sub( stopFFTbin, startBand ), part, npart, psize_inv, hFdCngDec->msPeriodog, &hFdCngDec->msPeriodog_exp );
+        /*
+          - logEtot is scaled by LD_DATA_SCALE+2
+          - logEtot = 10.0 * log10(totalNoise + DELTA);
+          - constant: -0.78125 = 10.0*log10(DELTA)/(1<<(LD_DATA_SCALE+2))
+          - constant:  0.75257498916 = 10.0 * log10(2.0)/log10(10.0)/(1<<2)
+        */
+        IF( Etot == 0 )
+        {
+            logEtot = L_add( -1677721600l /*-0.78125 Q31*/, 0 ); /*Q31*/
+        }
+        ELSE
+        {
+            logEtot = BASOP_Util_Log2( Etot ); /*Q25*/
+            logEtotExp = L_shl( L_deposit_l( Etot_exp ), WORD32_BITS - 1 - LD_DATA_SCALE );
+            logEtot = Mpy_32_16_1( L_add( logEtot, logEtotExp ), 24660 /*0.75257498916 Q15*/ ); /*Q31 - logEtotExp*/
+            IF( EQ_16( hFdCngDec->hFdCngCom->frameSize, L_FRAME16k ) )
+            {
+                logEtot = L_add( logEtot, -184894985l /*-0.086098436822497 Q31*/ ); /*Q31 - logEtotExp*/
+            }
+            ELSE
+            {
+                logEtot = L_add( logEtot, -176765584l /*-0.082312889439370 Q31*/ ); /*Q31 - logEtotExp*/
+            }
+        }
 
+        hFdCngDec->lp_speech = L_add( Mpy_32_16_1( hFdCngDec->lp_speech, 32604 /*0.995 Q15*/ ), L_shr( Mpy_32_16_1( logEtot, 20972 /*0.64 Q15*/ ), 7 ) ); /*hFdCngDec->q_lp_speech*/
+        move32();
+    }
 
-        hFdCngDec->msPeriodog_exp_fft = hFdCngDec->msPeriodog_exp;
-        move16();
-        hFdCngDec->msPeriodog_exp_cldfb = hFdCngDec->msPeriodog_exp;
+    tmp = L_sub( hFdCngDec->lp_speech, 377487360l /*45.0 Q23*/ ); /*Q23*/
+
+    if ( LT_32( hFdCngDec->lp_noise, tmp ) )
+    {
+        hFdCngDec->lp_noise = tmp; /*Q23*/
+        move32();
+    }
+
+    hFdCngDec->hFdCngCom->flag_noisy_speech = 0;
+    move16();
+    if ( LT_32( L_sub( hFdCngDec->lp_speech, hFdCngDec->lp_noise ), 234881024l /*28.0 Q23*/ ) )
+    {
+        hFdCngDec->hFdCngCom->flag_noisy_speech = 1;
         move16();
+    }
 
 
-        /* Compress MS inputs */
-        compress_range( hFdCngDec->msPeriodog, hFdCngDec->msPeriodog_exp, hFdCngDec->msLogPeriodog, npart );
+    return;
+}
 
-        /* Call the minimum statistics routine for noise estimation */
-        minimum_statistics_fx(
-            npart,
-            nFFTpart,
-            psize_norm,
-            hFdCngDec->msLogPeriodog,
-            hFdCngDec->msNoiseFloor,
-            hFdCngDec->msLogNoiseEst,
-            hFdCngDec->msAlpha,
-            hFdCngDec->msPsd,
-            hFdCngDec->msPsdFirstMoment,
-            hFdCngDec->msPsdSecondMoment,
-            hFdCngDec->msMinBuf,
-            hFdCngDec->msBminWin,
-            hFdCngDec->msBminSubWin,
-            hFdCngDec->msCurrentMin,
-            hFdCngDec->msCurrentMinOut,
-            hFdCngDec->msCurrentMinSubWindow,
-            hFdCngDec->msLocalMinFlag,
-            hFdCngDec->msNewMinFlag,
-            hFdCngDec->msPeriodogBuf,
-            &( hFdCngDec->msPeriodogBufPtr ),
-            hFdCngDec->hFdCngCom,
-            DEC, element_mode );
+void generate_comfort_noise_dec_fx(
+    Word32 **bufferReal, /* o   : matrix to real part of input bands  bufferScale*/
+    Word32 **bufferImag, /* o   : matrix to imaginary part of input bands  bufferScale*/
+    Word16 *bufferScale, /* o   : pointer to scalefactor for real and imaginary part of input bands */
+    Decoder_State *st,
+    Word16 *Q_new,
+    Word16 gen_exc,        /*Q0*/
+    const Word16 nchan_out /* i  : number of output channels     Q0*/
+)
+{
+    Word16 i, j, s, sc, sn, cnt;
+    Word16 startBand2;
+    Word16 stopFFTbin2;
+    Word16 scaleCLDFB;
+    Word16 preemph_fac;
+    Word32 sqrtNoiseLevel;
+    Word16 randGaussExp;
+    Word16 fftBufferExp;
+    Word16 cngNoiseLevelExp;
+    Word16 *seed;
+    Word16 *timeDomainOutput;
+    Word32 *ptr_r, *ptr_i;
+    Word32 *cngNoiseLevel;
+    Word32 *ptr_level;
+    Word32 *fftBuffer;
+    Word16 old_syn_pe_tmp[16];
+    Word16 tcx_transition = 0;
+    HANDLE_FD_CNG_DEC hFdCngDec = st->hFdCngDec;
+    HANDLE_FD_CNG_COM hFdCngCom = hFdCngDec->hFdCngCom;
+    TCX_DEC_HANDLE hTcxDec;
+    move16();
 
-        FOR( i = 0; i < hFdCngDec->npart_shaping; i++ )
-        {
-            hFdCngDec->msPsd_fx[i] = (Word32) hFdCngDec->msPsd[i];
-            move32();
-        }
-        hFdCngDec->msPsd_exp_fft = 6 + WORD16_BITS;
-        move16();
+    hTcxDec = st->hTcxDec;
 
-        /* Expand MS outputs */
-        expand_range( hFdCngDec->msLogNoiseEst, hFdCngDec->msNoiseEst, &hFdCngDec->msNoiseEst_exp, npart );
-    }
-}
+    /* Warning fix */
+    s = 0;
+    move16();
+    // PMTE(); /*IVAS CODE need to be added */
 
+    /* pointer initialization */
 
-/*
-   FdCng_decodeSID_fx
+    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
+    ptr_level = cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    seed = &( hFdCngCom->seed );
+    fftBuffer = hFdCngCom->fftBuffer; /*Q31 - hFdCngCom->fftBuffer_exp*/
+    timeDomainOutput = hFdCngCom->timeDomainBuffer;
 
-    Parameters:
+    /* scaleCLDFB: CLDFBinvScalingFactor_EXP + 1 */
+    scaleCLDFB = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
 
-    st               i/o: FD_CNG structure containing all buffers and variables
-    bs_word16        i  : Bitstream
-    amrwb_io         i  : amr wideband mode
-    preemph_fac      i  : preemphase factor
+    /*
+      Generate Gaussian random noise in real and imaginary parts of the FFT bins
+      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
+      scaling Gaussian random noise: format Q3.29
+    */
+    sn = 0;
+    move16();
+    IF( s_and( cngNoiseLevelExp, 1 ) != 0 )
+    {
+        sn = add( sn, 1 );
+        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );
+        move16();
+    }
 
-    Function:
-    decode the FD-CNG bitstream
+    randGaussExp = CNG_RAND_GAUSS_SHIFT;
+    move16();
+    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
+    IF( hFdCngCom->startBand == 0 )
+    {
+        /* DC component in FFT */
+        s = 0;
+        move16();
+        sqrtNoiseLevel = Sqrt32( L_shr( *ptr_level, sn ), &s ); /*Q31 - s*/
 
-    Returns:
-    void
-*/
-void FdCng_decodeSID_fx( HANDLE_FD_CNG_COM st, Decoder_State *corest )
-{
-    Word16 i, N, index;
-    Word32 *sidNoiseEst;
+        fftBuffer[0] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+        move32();
 
-    Word16 indices[32], v16[32];
-    Word32 v[32], gain;
+        /* Nyquist frequency is discarded */
+        fftBuffer[1] = L_deposit_l( 0 );
+
+        ptr_level = ptr_level + 1;
+        ptr_r = fftBuffer + 2; /*Q31 - hFdCngCom->fftBuffer_exp*/
+        cnt = sub( cnt, 1 );
+    }
+    ELSE
+    {
+        startBand2 = shl( hFdCngCom->startBand, 1 ); /*Q0*/
+        set32_fx( fftBuffer, 0, startBand2 );
+        ptr_r = fftBuffer + startBand2; /*Q31 - hFdCngCom->fftBuffer_exp*/
+    }
 
-    Word32 tmp, maxVal, E_ExpLd64;
-    Word16 sidNoiseEst_Exp;
+    sn = add( sn, 1 );
+    ptr_i = ptr_r + 1; /*Q31 - hFdCngCom->fftBuffer_exp*/
+    FOR( i = 0; i < cnt; i++ )
+    {
+        s = 0;
+        move16();
+        sqrtNoiseLevel = Sqrt32( L_shr( *ptr_level, sn ), &s ); /*Q31 - s*/
 
-    Word16 preemph_fac;
-    Word32 *invTrfMatrix_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;
+        /* Real part in FFT bins */
+        *ptr_r = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s );
+        move32();
 
+        /* Imaginary part in FFT bins */
+        *ptr_i = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s );
+        move32();
 
-    sidNoiseEst = st->sidNoiseEst; /*Q31 - st->sidNoiseEstExp*/
-    move16();
-    preemph_fac = corest->preemph_fac; /*Q15*/
-    move16();
+        ptr_r = ptr_r + 2;
+        ptr_i = ptr_i + 2;
+        ptr_level = ptr_level + 1;
+    }
 
-    N = st->npart; /*Q0*/
-    move16();
+    /* Remaining FFT bins are set to zero */
+    stopFFTbin2 = shl( hFdCngCom->stopFFTbin, 1 );
+    set32_fx( fftBuffer + stopFFTbin2, 0, sub( hFdCngCom->fftlen, stopFFTbin2 ) );
 
-    st->sid_frame_counter = add( st->sid_frame_counter, 1 ); /*Q15*/
-    move16();
+    fftBufferExp = add( shr( cngNoiseLevelExp, 1 ), randGaussExp );
 
-    /* Read bitstream */
-    FOR( i = 0; i < stages_37bits; i++ )
+    /* If previous frame is active, reset the overlap-add buffer */
+    IF( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
     {
-        indices[i] = get_next_indice_fx( corest, bits_37bits[i] ); /*Q0*/
-        move16();
+        set16_fx( hFdCngCom->olapBufferSynth, 0, hFdCngCom->fftlen );
+        test();
+        test();
+        if ( ( st->last_core_bfi > ACELP_CORE && EQ_16( st->codec_mode, MODE2 ) ) || EQ_16( st->codec_mode, MODE1 ) )
+        {
+            tcx_transition = 1;
+            move16();
+        }
     }
-    index = get_next_indice_fx( corest, 7 ); /*Q0*/
 
-    /* MSVQ decoder */
-    IF( corest->element_mode != EVS_MONO )
+    /* Perform STFT synthesis */
+    SynthesisSTFT( fftBuffer, fftBufferExp, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn,
+                   tcx_transition, hFdCngCom, gen_exc, Q_new, st->element_mode, nchan_out );
+
     {
-        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );
-        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages_37bits, N, maxN_37bits, indices, 1, invTrfMatrix_fx, v, NULL, 7 );
+        Word32 Lener, att;
+        Word16 exp;
+        /* update CNG excitation energy for LP_CNG */
+
+        /* calculate the residual signal energy */
+        /*enr = dotp( hFdCngCom->exc_cng, hFdCngCom->exc_cng, hFdCngCom->frameSize ) / hFdCngCom->frameSize;*/
+        Lener = Dot_productSq16HQ( 1, hFdCngCom->exc_cng, st->L_frame, &exp ); /*Q31 - exp*/
+        exp = add( sub( shl( sub( 15, *Q_new ), 1 ), 8 ), exp );               /*8 = log2(256)*/
+
+        /* convert log2 of residual signal energy */
+        /*(float)log10( enr + 0.1f ) / (float)log10( 2.0f );*/
+        Lener = BASOP_Util_Log2( Lener );                                                     /*Q25*/
+        Lener = L_add( Lener, L_shl( L_deposit_l( exp ), WORD32_BITS - 1 - LD_DATA_SCALE ) ); /*Q25*/
+        if ( EQ_16( st->L_frame, L_FRAME16k ) )
+        {
+            Lener = L_sub( Lener, 10802114l /*0.3219280949f Q25*/ ); /*log2(320) = 8.3219280949f Q25*/
+        }
+        /* decrease the energy in case of WB input */
+        IF( st->bwidth != NB )
+        {
+            IF( EQ_16( st->bwidth, WB ) )
+            {
+                IF( st->CNG_mode >= 0 )
+                {
+                    /* Bitrate adapted attenuation */
+                    att = L_shl( L_deposit_l( ENR_ATT_fx[st->CNG_mode] ), 17 ); /*Q23*/
+                }
+                ELSE
+                {
+                    /* Use least attenuation for higher bitrates */
+                    att = L_shl( L_deposit_l( ENR_ATT_fx[4] ), 17 ); /*Q23*/
+                }
+            }
+            ELSE
+            {
+                att = 384 << 17; /*1.5 Q8<<17=Q25*/
+                move16();
+            }
+            Lener = L_sub( Lener, att ); /*Q23*/
+        }
+        /*st->lp_ener = 0.8f * stcod->lp_ener + 0.2f * pow( 2.0f, enr );*/
+        Lener = BASOP_util_Pow2( Lener, 6, &exp );      /*Q31 - exp*/
+        Lener = Mult_32_16( Lener, 6554 /*0.2f Q15*/ ); /*Q31 - exp*/
+        exp = sub( 25, exp );
+        Lener = L_shr( Lener, exp );                                                       /*Q6*/
+        st->lp_ener_fx = L_add( Mult_32_16( st->lp_ener_fx, 26214 /*0.8f Q15*/ ), Lener ); /*Q6*/
+        move32();
     }
-    ELSE
+
+    /*
+      Generate Gaussian random noise in real and imaginary parts of the CLDFB bands
+      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each band
+    */
+    test();
+    IF( bufferReal != NULL && ( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) ) )
     {
-        msvq_decoder(
-            cdk_37bits,
-            stages_37bits,
-            N,
-            maxN_37bits,
-            indices,
-            v16 );
 
-        FOR( i = 0; i < N; i++ )
+        sn = sub( sn, 1 );
+        sc = add( shr( add( cngNoiseLevelExp, CLDFBinvScalingFactor_EXP + 1 - 1 ), 1 ), randGaussExp );
+        move16();
+        assert( ( ( cngNoiseLevelExp + CLDFBinvScalingFactor_EXP + 1 - 1 ) & 1 ) == 0 );
+
+        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
         {
-            v[i] = L_deposit_h( v16[i] ); /*Q23*/
-            move32();
+            /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */
+            s = 0;
+            move16();
+            sqrtNoiseLevel = Sqrt32( L_shr( Mpy_32_16_1( *ptr_level, scaleCLDFB ), sn ), &s ); /*Q31 - s*/
+
+            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
+            {
+                /* Real part in CLDFB band */
+                bufferReal[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                move32();
+                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferReal[i][j],sc));*/
+
+                /* Imaginary part in CLDFB band */
+                bufferImag[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                move32();
+                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferImag[i][j],sc));*/
+            }
+            ptr_level = ptr_level + 1;
         }
+        *bufferScale = sub( sc, 15 );
+        move16();
     }
 
+    /* Overlap-add when previous frame is active */
+    test();
+    IF( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) && EQ_16( st->codec_mode, MODE2 ) )
+    {
+        Word32 old_exc_ener, gain, noise32;
+        Word16 seed_loc, lpcorder, old_syn, tmp, gain16, N, N2, N4, N8;
+        Word16 old_exc_ener_exp, gain_exp;
+        Word16 normFacE, normShiftE, normShiftEM1;
+        Word16 normFacG, normShiftG, normShiftGM1;
+        Word16 noiseExp, *old_exc, *old_Aq, *old_syn_pe;
+        Word16 noise[640], normShiftP2;
+        Word16 Q_exc, Q_syn;
 
-    /* decode gain, format gain: Q9.23 */
-    gain = L_shl( L_deposit_l( index ), WORD32_BITS - 1 - 8 );
-    gain = L_sub( gain, 503316480l /*60.0 Q23*/ );       /*Q23*/
-    gain = Mpy_32_16_1( gain, 21845 /*2.0f/3.0f Q15*/ ); /*Q23*/
 
+        assert( hFdCngCom->frameSize <= 640 );
 
-    /* Apply gain and undo log */
+        seed_loc = hFdCngCom->seed;
+        move16();
+        N = hFdCngCom->frameSize; /*Q0*/
+        move16();
+        N2 = shr( hFdCngCom->frameSize, 1 );
 
-    /* calculate worst case for scaling */
-    maxVal = L_add( 0x80000000 /*-1.0 Q31*/, 0 );
-    FOR( i = 0; i < N; i++ )
-    {
-        maxVal = L_max( maxVal, v[i] ); /*Q23*/
-    }
+        IF( st->last_core_bfi > ACELP_CORE )
+        {
+            Word16 left_overlap_mode;
+            left_overlap_mode = st->hTcxCfg->tcx_last_overlap_mode; /*Q0*/
+            move16();
+            if ( EQ_16( left_overlap_mode, ALDO_WINDOW ) )
+            {
+                left_overlap_mode = FULL_OVERLAP;
+                move16();
+            }
+            tcx_windowing_synthesis_current_frame( timeDomainOutput, st->hTcxCfg->tcx_mdct_window, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, st->hTcxCfg->tcx_mdct_window_length, st->hTcxCfg->tcx_mdct_window_half_length,
+                                                   st->hTcxCfg->tcx_mdct_window_min_length, 0, left_overlap_mode, NULL, NULL, NULL, NULL, NULL, shr( N, 1 ), shr( sub( abs_s( st->hTcxCfg->tcx_offset ), st->hTcxCfg->tcx_offset ), 1 ), 1, 0, 0 );
 
-    maxVal = L_add( maxVal, gain );                                          /*Q23*/
-    maxVal = L_shl( Mpy_32_16_1( maxVal, 21771 /*0.66438561897 Q15*/ ), 1 ); /*Q23*/
+            IF( st->hTcxCfg->last_aldo != 0 )
+            {
+                FOR( i = 0; i < hFdCngCom->frameSize - NS2SA( st->sr_core, N_ZERO_MDCT_NS ); i++ )
+                {
+                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( st->hHQ_core->old_out_LB_fx[i + NS2SA_FX2( st->sr_core, N_ZERO_MDCT_NS )], st->hHQ_core->Q_old_wtda_LB ) ); /*st->q_old_outLB_fx*/
+                    move16();
+                }
+            }
+            ELSE
+            {
+                tcx_windowing_synthesis_past_frame( hTcxDec->syn_Overl, st->hTcxCfg->tcx_mdct_window, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum,
+                                                    st->hTcxCfg->tcx_mdct_window_length, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, st->hTcxCfg->tcx_last_overlap_mode );
 
-    sidNoiseEst_Exp = 0;
-    move16();
-    FOR( ; maxVal >= 0; maxVal -= 33554432l /*0.015625 Q31*/ )
-    {
-        sidNoiseEst_Exp = add( sidNoiseEst_Exp, 1 );
-    }
-    st->sidNoiseEstExp = sidNoiseEst_Exp;
-    move16();
-    E_ExpLd64 = L_shl( sidNoiseEst_Exp, WORD32_BITS - 1 - LD_DATA_SCALE );
+                FOR( i = 0; i < st->hTcxCfg->tcx_mdct_window_length; i++ )
+                {
+                    timeDomainOutput[i] = add( timeDomainOutput[i], shl( hTcxDec->syn_Overl[i], TCX_IMDCT_HEADROOM ) ); /*st->q_old_outLB_fx*/
+                    move16();
+                }
+            }
+        }
+        ELSE
+        {
 
-    /* format v: Q9.23, format sidNoiseEst: Q6.26, 0.66438561897 = log10(10)/log10(2.0) / 10.0 * 2.0 */
-    FOR( i = 0; i < N; i++ )
-    {
-        tmp = L_add( v[i], gain );                                         /*Q23*/
-        tmp = L_shl( Mpy_32_16_1( tmp, 21771 /*0.66438561897 Q15*/ ), 1 ); /*Q23*/
-        tmp = L_sub( tmp, E_ExpLd64 );
-        assert( tmp < 0 );
-        st->sidNoiseEst[i] = BASOP_Util_InvLog2( tmp ); /*Q31 - st->sidNoiseEstExp*/
-        move32();
-    }
+            /*
+              - the scaling of the LPCs (e.g. old_Aq) is always Q12 (encoder or decoder)
 
-    /* NB last band energy compensation */
-    IF( st->CngBandwidth == NB )
-    {
-        st->sidNoiseEst[( N - 1 )] = Mpy_32_16_1( st->sidNoiseEst[( N - 1 )], NB_LAST_BAND_SCALE ); /*Q31 - st->sidNoiseEstExp*/
-        move32();
-    }
+              - the scaling of the deemphasized signals (e.g. old_syn) is always Q0 (encoder or decoder)
 
-    test();
-    IF( EQ_16( st->CngBandwidth, SWB ) && LE_32( st->CngBitrate, ACELP_13k20 ) )
-    {
-        st->sidNoiseEst[( N - 1 )] = Mpy_32_16_1( st->sidNoiseEst[( N - 1 )], SWB_13k2_LAST_BAND_SCALE ); /*Q31 - st->sidNoiseEstExp*/
-        move32();
-    }
+              - the scaling of the excitation signals in the encoder (e.g. old_exc) is Q_new
+              - the scaling of the preemphasized signals in the encoder (e.g. old_syn_pe) is Q_new-1
+
+              - the scaling of the excitation signals in the decoder (e.g. old_exc) is Q_exc (or stdec->Q_exc)
+              - the scaling of the preemphasized signals in the decoder (e.g. old_syn_pe) is Q_syn (or stdec->Q_syn)
+            */
 
+            lpcorder = M;
+            move16();
+            old_Aq = st->old_Aq_12_8_fx;                         /*Q12*/
+            old_exc = st->old_exc_fx + sub( L_EXC_MEM_DEC, N2 ); /*Q_exc*/
+            old_syn_pe = st->mem_syn2_fx;                        /*Q_syn*/
+            old_syn = st->syn[lpcorder];                         /*Q_syn*/
+            move16();
+            preemph_fac = st->preemph_fac; /*Q15*/
+            move16();
+            Q_exc = st->Q_exc;
+            move16();
+            Q_syn = st->Q_syn;
+            move16();
 
-    scalebands( sidNoiseEst, st->part, st->npart, st->midband, st->nFFTpart, sub( st->stopBand, st->startBand ), st->cngNoiseLevel, 1 );
-    st->cngNoiseLevelExp = st->sidNoiseEstExp;
-    move16();
+            /* shift to be in the range of values supported by getNormReciprocalWord16() */
+            N8 = shr( N2, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
 
+            assert( N2 == ( N8 << CNG_NORM_RECIPROCAL_RANGE_SHIFT ) );
 
-    lpc_from_spectrum( st, st->startBand, st->stopFFTbin, preemph_fac );
-}
+            normFacE = getNormReciprocalWord16( N8 );
+            normShiftE = BASOP_util_norm_s_bands2shift( N8 );
+            normShiftEM1 = sub( normShiftE, 1 );
+            normShiftP2 = add( normShiftE, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
 
-/*
-    noisy_speech_detection_fx
+            old_exc_ener = L_shr( L_mult( old_exc[0], old_exc[0] ), normShiftP2 ); /*2*(Q_exc)+1+normShiftP2*/
+            FOR( i = 1; i < N2; i++ )
+            {
+                old_exc_ener = L_add( old_exc_ener, L_shr( L_mult( old_exc[i], old_exc[i] ), normShiftP2 ) ); /*2*(Q_exc)+1+normShiftP2*/
+            }
+            old_exc_ener = L_shl( Mpy_32_16_1( old_exc_ener, shl( normFacE, normShiftEM1 ) ), 1 ); /*Q31*/
 
-    Parameters:
+            old_exc_ener_exp = 0;
+            move16();
+            old_exc_ener = Sqrt32( old_exc_ener, &old_exc_ener_exp ); /*Q31 - old_exc_ener_exp*/
+            old_exc_ener_exp = add( old_exc_ener_exp, ( sub( 15, Q_exc ) ) );
 
-    vad                 i  : VAD decision
-    Etot                i  : total channel E
-    Etot_exp            i  : exponent for total channel E
-    totalNoise          i  : noise estimate over all critical bands
-    totalNoise_exp      i  : exponent for noise estimate over all critical bands
-    lp_noise            i/o: pointer to long term total Noise energy average
-    lp_speech           i/o: pointer to long term active speech energy average
+            /* shift to be in the range of values supported by getNormReciprocalWord16() */
+            N4 = shr( N, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
 
-    Function:
-    detector for noisy speech, lp_noise and lp_speech are scaled by LD_DATA_SCALE+2 bits
+            assert( N == ( N4 << CNG_NORM_RECIPROCAL_RANGE_SHIFT ) );
 
-    Returns: flag, that indicates whether noisy speech has been detected
+            normFacG = getNormReciprocalWord16( N4 );
+            normShiftG = BASOP_util_norm_s_bands2shift( N4 );
+            normShiftGM1 = sub( normShiftG, 1 );
+            normShiftP2 = add( normShiftG, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
 
-    void
-*/
-void noisy_speech_detection_fx(
-    HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure            */
-    const Word16 vad,            /*Q0*/
-    const Word16 *syn,           /* i  : input time-domain frame                  Q*/
-    const Word16 Q )
-{
-    Word16 i;
-    Word32 tmp;
-    Word32 Etot;
-    Word16 Etot_exp;
-    Word32 logEtot;
-    Word32 logEtotExp;
-    Word32 totalNoise;
-    Word16 totalNoise_exp;
-    Word32 logTotalNoise;
-    Word32 logTotalNoiseExp;
+            gain = L_deposit_l( 0 );
+            FOR( i = 0; i < N; i++ )
+            {
+                noise32 = rand_gauss( &seed_loc );
+                noise[i] = extract_h( noise32 );
+                move16();
+                gain = L_add( gain, L_shr( L_mult( noise[i], noise[i] ), normShiftP2 ) );
+            }
+            gain = L_shl( Mpy_32_16_1( gain, shl( normFacG, normShiftGM1 ) ), 1 ); /*Q31 - gain_exp*/
 
+            gain_exp = 2 * CNG_RAND_GAUSS_SHIFT;
+            move16();
+            gain = ISqrt32( gain, &gain_exp ); /*Q31 - gain_exp*/
 
-    IF( vad == 0 )
-    {
-        totalNoise = dotWord32_16_Mant32Exp( hFdCngDec->msNoiseEst, hFdCngDec->msNoiseEst_exp, hFdCngDec->psize_shaping_norm, hFdCngDec->psize_shaping_norm_exp, hFdCngDec->nFFTpart_shaping, &totalNoise_exp ); /*Q31 - totalNoise_exp*/
+            gain = Mpy_32_32( old_exc_ener, gain ); /*Q31 - old_exc_ener_exp - gain_exp*/
+            gain16 = extract_h( gain );             /*Q15 - old_exc_ener_exp - gain_exp*/
 
-        /*
-          - logTotalNoise is scaled by LD_DATA_SCALE+2
-          - logTotalNoise = 10.0 * log10(totalNoise + DELTA);
-          - constant: -0.78125 = 10.0*log10(DELTA)/(1<<(LD_DATA_SCALE+2))
-          - constant:  0.75257498916 = 10.0 * log10(2.0)/log10(10.0)/(1<<2)
-        */
-        IF( totalNoise == 0 )
-        {
-            logTotalNoise = L_add( -1677721600l /*-0.78125 Q31*/, 0 ); /*Q31*/
-        }
-        ELSE
-        {
-            logTotalNoise = BASOP_Util_Log2( totalNoise ); /*Q25*/
-            logTotalNoiseExp = L_shl( L_deposit_l( totalNoise_exp ), WORD32_BITS - 1 - LD_DATA_SCALE );
-            logTotalNoise = Mpy_32_16_1( L_add( logTotalNoise, logTotalNoiseExp ), 24660 /*0.75257498916 Q15*/ ); /*Q31 - logTotalNoiseExp*/
-        }
+            gain_exp = add( old_exc_ener_exp, gain_exp );
+            noiseExp = add( CNG_RAND_GAUSS_SHIFT, gain_exp );
 
-        hFdCngDec->lp_noise = L_add( Mpy_32_16_1( hFdCngDec->lp_noise, 32604 /*0.995 Q15*/ ), L_shr( Mpy_32_16_1( logTotalNoise, 20972 /*0.64 Q15*/ ), 7 ) ); /*hFdCngDec->q_lp_noise*/
-        move32();
-    }
-    ELSE
-    {
-        Etot = 0;
-        move32();
-        Etot_exp = 31;
-        move16();
-        FOR( i = 0; i < hFdCngDec->hFdCngCom->frameSize; i++ )
-        {
-            tmp = L_shr_r( L_mult0( syn[i], syn[i] ), sub( Etot_exp, 31 ) ); /*2*(Q) - (Etot_exp - 31)*/
-            IF( LT_32( L_sub( maxWord32, tmp ), Etot ) )
+            s = sub( 15 - NOISE_HEADROOM, noiseExp );
+            FOR( i = 0; i < N; i++ )
             {
-                Etot_exp = add( Etot_exp, 1 );
-                Etot = L_shr_r( Etot, 1 ); /*Q31 - Etot_exp*/
-                tmp = L_shr_r( tmp, 1 );
+                noise[i] = shr_sat( mult( noise[i], gain16 ), s ); /*Q15 - noiseExp*/
+                move16();
             }
-            Etot = L_add( Etot, tmp );
-        }
-        Etot_exp = sub( Etot_exp, shl( Q, 1 ) );
 
-        /*
-          - logEtot is scaled by LD_DATA_SCALE+2
-          - logEtot = 10.0 * log10(totalNoise + DELTA);
-          - constant: -0.78125 = 10.0*log10(DELTA)/(1<<(LD_DATA_SCALE+2))
-          - constant:  0.75257498916 = 10.0 * log10(2.0)/log10(10.0)/(1<<2)
-        */
-        IF( Etot == 0 )
-        {
-            logEtot = L_add( -1677721600l /*-0.78125 Q31*/, 0 ); /*Q31*/
-        }
-        ELSE
-        {
-            logEtot = BASOP_Util_Log2( Etot ); /*Q25*/
-            logEtotExp = L_shl( L_deposit_l( Etot_exp ), WORD32_BITS - 1 - LD_DATA_SCALE );
-            logEtot = Mpy_32_16_1( L_add( logEtot, logEtotExp ), 24660 /*0.75257498916 Q15*/ ); /*Q31 - logEtotExp*/
-            IF( EQ_16( hFdCngDec->hFdCngCom->frameSize, L_FRAME16k ) )
-            {
-                logEtot = L_add( logEtot, -184894985l /*-0.086098436822497 Q31*/ ); /*Q31 - logEtotExp*/
-            }
-            ELSE
+            assert( lpcorder <= 16 );
+
+            s = sub( 15 - NOISE_HEADROOM, ( sub( 15, Q_syn ) ) );
+            FOR( i = 0; i < lpcorder; i++ )
             {
-                logEtot = L_add( logEtot, -176765584l /*-0.082312889439370 Q31*/ ); /*Q31 - logEtotExp*/
+                old_syn_pe_tmp[i] = shr_sat( old_syn_pe[i], s ); /*Q0*/
+                move16();
             }
-        }
 
-        hFdCngDec->lp_speech = L_add( Mpy_32_16_1( hFdCngDec->lp_speech, 32604 /*0.995 Q15*/ ), L_shr( Mpy_32_16_1( logEtot, 20972 /*0.64 Q15*/ ), 7 ) ); /*hFdCngDec->q_lp_speech*/
-        move32();
-    }
+            E_UTIL_synthesis(
+                0,              /* i  : scaling to apply for a[0]                 Q0   */
+                old_Aq,         /* i  : LP filter coefficients                    Q12  */
+                noise,          /* i  : input signal                              Qx   */
+                noise,          /* o  : output signal                             Qx-s */
+                N,              /* i  : size of filtering                         Q0   */
+                old_syn_pe_tmp, /* i/o: memory associated with this filtering.    Q0 */
+                0,              /* i  : 0=no update, 1=update of memory.          Q0   */
+                lpcorder        /* i  : order of LP filter                        Q0   */
+            );
 
-    tmp = L_sub( hFdCngDec->lp_speech, 377487360l /*45.0 Q23*/ ); /*Q23*/
+            tmp = old_syn;
+            move16();
 
-    if ( LT_32( hFdCngDec->lp_noise, tmp ) )
-    {
-        hFdCngDec->lp_noise = tmp; /*Q23*/
-        move32();
-    }
+            E_UTIL_deemph2(
+                NOISE_HEADROOM,
+                noise,       /* I/O: signal			  Qx */
+                preemph_fac, /* I: deemphasis factor	  Qx */
+                N,           /* I: vector size              */
+                &tmp         /* I/O: memory (signal[-1]) Qx */
+            );
 
-    hFdCngDec->hFdCngCom->flag_noisy_speech = 0;
-    move16();
-    if ( LT_32( L_sub( hFdCngDec->lp_speech, hFdCngDec->lp_noise ), 234881024l /*28.0 Q23*/ ) )
-    {
-        hFdCngDec->hFdCngCom->flag_noisy_speech = 1;
-        move16();
+            FOR( i = 0; i < N4; i++ )
+            {
+                tmp = mult( noise[i], hFdCngCom->olapWinSyn[i].v.re ); /*Q15 - noiseExp*/
+                timeDomainOutput[i] = add( timeDomainOutput[i], tmp );
+                move16();
+                tmp = mult( noise[( i + N4 )], hFdCngCom->olapWinSyn[( ( N4 - 1 ) - i )].v.im ); /*Q15 - noiseExp*/
+                timeDomainOutput[( i + N4 )] = add( timeDomainOutput[( i + N4 )], tmp );
+                move16();
+            }
+        }
     }
-
-
-    return;
 }
 
-void generate_comfort_noise_dec_fx(
-    Word32 **bufferReal, /* o   : matrix to real part of input bands  bufferScale*/
-    Word32 **bufferImag, /* o   : matrix to imaginary part of input bands  bufferScale*/
+void generate_comfort_noise_dec_ivas_fx(
+    Word32 **bufferReal, /* o  : Real part of input bands      bufferScale*/
+    Word32 **bufferImag, /* o  : Imaginary part of input bands bufferScale*/
     Word16 *bufferScale, /* o   : pointer to scalefactor for real and imaginary part of input bands */
-    Decoder_State *st,
+    Decoder_State *st,   /* i/o: decoder state structure       */
     Word16 *Q_new,
     Word16 gen_exc,        /*Q0*/
     const Word16 nchan_out /* i  : number of output channels     Q0*/
 )
 {
-    Word16 i, j, s, sc, sn, cnt;
-    Word16 startBand2;
-    Word16 stopFFTbin2;
-    Word16 scaleCLDFB;
-    Word16 preemph_fac;
-    Word32 sqrtNoiseLevel;
-    Word16 randGaussExp;
-    Word16 fftBufferExp;
-    Word16 cngNoiseLevelExp;
-    Word16 *seed;
-    Word16 *timeDomainOutput;
+    Word16 i, j, s;
     Word32 *ptr_r, *ptr_i;
-    Word32 *cngNoiseLevel;
-    Word32 *ptr_level;
-    Word32 *fftBuffer;
-    Word16 old_syn_pe_tmp[16];
-    Word16 tcx_transition = 0;
     HANDLE_FD_CNG_DEC hFdCngDec = st->hFdCngDec;
     HANDLE_FD_CNG_COM hFdCngCom = hFdCngDec->hFdCngCom;
-    TCX_DEC_HANDLE hTcxDec;
+    Word32 *cngNoiseLevel = hFdCngCom->cngNoiseLevel;
+    Word16 cngNoiseLevel_exp = hFdCngCom->cngNoiseLevelExp;
     move16();
 
-    hTcxDec = st->hTcxDec;
-
-    /* Warning fix */
-    s = 0;
+    Word32 *ptr_level = cngNoiseLevel;
+    Word16 *seed = &( hFdCngCom->seed );
+    Word16 *seed2;
+    Word16 c1, c2;
+    Word32 tmp1, tmp2;
+    Word16 scaleCldfb;
+    Word32 *fftBuffer = hFdCngCom->fftBuffer; /*hFdCngCom->fftBuffer_exp*/
+    Word16 fftBuffer_exp = hFdCngCom->fftBuffer_exp;
+    Word16 fftBuffer_temp_exp[FFTLEN];
+    Word16 *timeDomainOutput = hFdCngCom->timeDomainBuffer;
+    Word16 temp;
+    Word32 sqrtNoiseLevel;
+    Word16 sqrtNoiseLevel_exp;
+    Word16 idx = 0;
+    move16();
+    Word16 preemph_fac;
+    Word16 old_syn_pe_tmp[16];
+    Word16 tcx_transition = 0;
+    TCX_DEC_HANDLE hTcxDec;
     move16();
-    // PMTE(); /*IVAS CODE need to be added */
 
-    /* pointer initialization */
+    hTcxDec = st->hTcxDec;
 
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
-    ptr_level = cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-    seed = &( hFdCngCom->seed );
-    fftBuffer = hFdCngCom->fftBuffer; /*Q31 - hFdCngCom->fftBuffer_exp*/
-    timeDomainOutput = hFdCngCom->timeDomainBuffer;
+    scaleCldfb = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
 
-    /* scaleCLDFB: CLDFBinvScalingFactor_EXP + 1 */
-    scaleCLDFB = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
+    temp = 0;
+    move16();
+    c1 = Sqrt16( hFdCngCom->coherence_fx, &temp ); /*Q15 - temp*/
+    c1 = shl( c1, temp );                          /*Q15*/
+    temp = 0;
+    move16();
+    c2 = Sqrt16( sub( MAX_16, hFdCngCom->coherence_fx ), &temp ); /*Q15 - temp*/
+    c2 = shl( c2, temp );                                         /*Q15*/
 
-    /*
-      Generate Gaussian random noise in real and imaginary parts of the FFT bins
-      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
-      scaling Gaussian random noise: format Q3.29
-    */
-    sn = 0;
+    temp = getScaleFactor32( fftBuffer, FFTLEN );
+    scale_sig32( fftBuffer, FFTLEN, temp ); /*Q31 - hFdCngCom->fftBuffer_exp + temp*/
+    fftBuffer_exp = sub( fftBuffer_exp, temp );
+    hFdCngCom->fftBuffer_exp = fftBuffer_exp;
     move16();
-    IF( s_and( cngNoiseLevelExp, 1 ) != 0 )
+    set16_fx( fftBuffer_temp_exp, fftBuffer_exp, FFTLEN );
+    fftBuffer_exp = 0;
+    move16();
+
+    seed2 = &( hFdCngCom->seed2 );
+    test();
+    if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( st->idchan, 1 ) )
     {
-        sn = add( sn, 1 );
-        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );
-        move16();
+        seed2 = &( hFdCngCom->seed3 );
     }
 
-    randGaussExp = CNG_RAND_GAUSS_SHIFT;
-    move16();
-    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
+    /* Generate Gaussian random noise in real and imaginary parts of the FFT bins
+      Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each bin */
+
     IF( hFdCngCom->startBand == 0 )
     {
-        /* DC component in FFT */
-        s = 0;
+        test();
+        test();
+        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
+        {
+            rand_gauss_fx( &tmp1, seed, Q15 );
+            rand_gauss_fx( &tmp2, seed2, Q15 );
+            fftBuffer[0] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q0*/
+            move32();
+            fftBuffer_temp_exp[0] = Q16 + Q15;
+            move16();
+        }
+        ELSE
+        {
+            rand_gauss_fx( &fftBuffer[0], seed, Q15 );
+            fftBuffer_temp_exp[0] = Q16;
+            move16();
+        }
+        sqrtNoiseLevel_exp = cngNoiseLevel_exp;
         move16();
-        sqrtNoiseLevel = Sqrt32( L_shr( *ptr_level, sn ), &s ); /*Q31 - s*/
-
-        fftBuffer[0] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+        sqrtNoiseLevel = Sqrt32( *ptr_level, &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
+        fftBuffer[0] = Mpy_32_32( fftBuffer[0], sqrtNoiseLevel );   /*Q31 - (sqrtNoiseLevel_exp + fftBuffer_temp_exp[0])*/
         move32();
-
-        /* Nyquist frequency is discarded */
-        fftBuffer[1] = L_deposit_l( 0 );
-
-        ptr_level = ptr_level + 1;
-        ptr_r = fftBuffer + 2; /*Q31 - hFdCngCom->fftBuffer_exp*/
-        cnt = sub( cnt, 1 );
+        fftBuffer_temp_exp[0] = add( sqrtNoiseLevel_exp, fftBuffer_temp_exp[0] );
+        move16();
+        ptr_level++;
+        ptr_r = fftBuffer + 2; /*Q31 - (fftBuffer_temp_exp)*/
+        idx = 2;
     }
     ELSE
     {
-        startBand2 = shl( hFdCngCom->startBand, 1 ); /*Q0*/
-        set32_fx( fftBuffer, 0, startBand2 );
-        ptr_r = fftBuffer + startBand2; /*Q31 - hFdCngCom->fftBuffer_exp*/
+        fftBuffer[0] = 0;
+        move16();
+        set32_fx( fftBuffer + 2, 0, shl( sub( hFdCngCom->startBand, 1 ), 1 ) );
+        ptr_r = fftBuffer + shl( hFdCngCom->startBand, 1 ); /*Q31 - fftBuffer_exp*/
+        idx = shl( hFdCngCom->startBand, 1 );               /*Q0*/
     }
 
-    sn = add( sn, 1 );
-    ptr_i = ptr_r + 1; /*Q31 - hFdCngCom->fftBuffer_exp*/
-    FOR( i = 0; i < cnt; i++ )
+    ptr_i = ptr_r + 1; /*Q31 - fftBuffer_exp*/
+    FOR( ; ptr_level < cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); ptr_level++ )
     {
-        s = 0;
-        move16();
-        sqrtNoiseLevel = Sqrt32( L_shr( *ptr_level, sn ), &s ); /*Q31 - s*/
-
         /* Real part in FFT bins */
-        *ptr_r = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s );
+        test();
+        test();
+        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
+        {
+            rand_gauss_fx( &tmp1, seed, Q15 );                                  /*Q15*/
+            rand_gauss_fx( &tmp2, seed2, Q15 );                                 /*Q15*/
+            *ptr_r = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
+            move32();
+            fftBuffer_temp_exp[idx] = Q16;
+            move16();
+        }
+        ELSE
+        {
+            rand_gauss_fx( ptr_r, seed, Q15 ); /*Q15*/
+            fftBuffer_temp_exp[idx] = Q16;
+            move16();
+        }
+
+        sqrtNoiseLevel_exp = sub( cngNoiseLevel_exp, 1 );
+        sqrtNoiseLevel = Sqrt32( *ptr_level, &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
+        ( *ptr_r ) = Mpy_32_32( ( *ptr_r ), sqrtNoiseLevel );       /*Q15 - sqrtNoiseLevel_exp*/
         move32();
+        fftBuffer_temp_exp[idx] = add( fftBuffer_temp_exp[idx], sqrtNoiseLevel_exp );
+        move16();
+        idx = add( idx, 1 );
+        ptr_r += 2;
 
         /* Imaginary part in FFT bins */
-        *ptr_i = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s );
+        test();
+        test();
+        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
+        {
+            rand_gauss_fx( &tmp1, seed, Q15 );                                  /*Q15*/
+            rand_gauss_fx( &tmp2, seed2, Q15 );                                 /*Q15*/
+            *ptr_i = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
+            move32();
+            fftBuffer_temp_exp[idx] = Q16;
+            move16();
+        }
+        ELSE
+        {
+            rand_gauss_fx( ptr_i, seed, Q15 ); /*Q15*/
+            fftBuffer_temp_exp[idx] = Q16;
+            move16();
+        }
+        sqrtNoiseLevel_exp = sub( cngNoiseLevel_exp, 1 );
+        sqrtNoiseLevel = Sqrt32( *ptr_level, &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
+        ( *ptr_i ) = Mpy_32_32( ( *ptr_i ), sqrtNoiseLevel );       /*Q15 - sqrtNoiseLevel_exp*/
         move32();
-
-        ptr_r = ptr_r + 2;
-        ptr_i = ptr_i + 2;
-        ptr_level = ptr_level + 1;
+        fftBuffer_temp_exp[idx] = add( fftBuffer_temp_exp[idx], sqrtNoiseLevel_exp );
+        move16();
+        idx = add( idx, 1 );
+        ptr_i += 2;
     }
 
     /* Remaining FFT bins are set to zero */
-    stopFFTbin2 = shl( hFdCngCom->stopFFTbin, 1 );
-    set32_fx( fftBuffer + stopFFTbin2, 0, sub( hFdCngCom->fftlen, stopFFTbin2 ) );
+    set32_fx( fftBuffer + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
+    set16_fx( fftBuffer_temp_exp + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
 
-    fftBufferExp = add( shr( cngNoiseLevelExp, 1 ), randGaussExp );
+    /* Nyquist frequency is discarded */
+    fftBuffer[1] = 0;
+    move32();
+
+    fftBuffer_exp = MAX_16;
+    move16();
+    FOR( i = 0; i < hFdCngCom->fftlen; i++ )
+    {
+        IF( fftBuffer[i] != 0 )
+        {
+            fftBuffer_exp = s_min( fftBuffer_exp, add( sub( 31, fftBuffer_temp_exp[i] ), norm_l( fftBuffer[i] ) ) );
+        }
+    }
+    if ( EQ_16( fftBuffer_exp, MAX_16 ) )
+    {
+        fftBuffer_exp = 0;
+        move16();
+    }
+    fftBuffer_exp = sub( 31, fftBuffer_exp );
+    FOR( i = 0; i < hFdCngCom->fftlen; i++ )
+    {
+        fftBuffer[i] = L_shr( fftBuffer[i], sub( fftBuffer_exp, fftBuffer_temp_exp[i] ) ); /*Q31 - fftBuffer_temp_exp[i]*/
+        move32();
+    }
 
     /* If previous frame is active, reset the overlap-add buffer */
+    tcx_transition = 0;
+    move16();
     IF( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
     {
         set16_fx( hFdCngCom->olapBufferSynth, 0, hFdCngCom->fftlen );
@@ -3582,8 +3157,9 @@ void generate_comfort_noise_dec_fx(
     }
 
     /* Perform STFT synthesis */
-    SynthesisSTFT( fftBuffer, fftBufferExp, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn,
-                   tcx_transition, hFdCngCom, gen_exc, Q_new, st->element_mode, nchan_out );
+    SynthesisSTFT_ivas_fx( fftBuffer, fftBuffer_exp, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn,
+                           tcx_transition, hFdCngCom, gen_exc, Q_new, st->element_mode, nchan_out );
+    scale_sig32( fftBuffer + hFdCngCom->fftlen, sub( FFTLEN, hFdCngCom->fftlen ), sub( fftBuffer_exp, hFdCngCom->fftBuffer_exp ) ); /*Q31 - fftBuffer_exp*/
 
     {
         Word32 Lener, att;
@@ -3601,7 +3177,7 @@ void generate_comfort_noise_dec_fx(
         Lener = L_add( Lener, L_shl( L_deposit_l( exp ), WORD32_BITS - 1 - LD_DATA_SCALE ) ); /*Q25*/
         if ( EQ_16( st->L_frame, L_FRAME16k ) )
         {
-            Lener = L_sub( Lener, 10802114l /*0.3219280949f Q25*/ ); /*log2(320) = 8.3219280949f Q25*/
+            Lener = L_sub( Lener, 10802114l /*0.3219280949f Q25*/ ); /*log2(320) = 8.3219280949f*/
         }
         /* decrease the energy in case of WB input */
         IF( st->bwidth != NB )
@@ -3610,70 +3186,116 @@ void generate_comfort_noise_dec_fx(
             {
                 IF( st->CNG_mode >= 0 )
                 {
-                    /* Bitrate adapted attenuation */
-                    att = L_shl( L_deposit_l( ENR_ATT_fx[st->CNG_mode] ), 17 ); /*Q23*/
+                    /* Bitrate adapted attenuation */
+                    att = L_shl( L_deposit_l( ENR_ATT_fx[st->CNG_mode] ), 17 ); /*Q25*/
+                }
+                ELSE
+                {
+                    /* Use least attenuation for higher bitrates */
+                    att = L_shl( L_deposit_l( ENR_ATT_fx[4] ), 17 ); /*Q25*/
+                }
+            }
+            ELSE
+            {
+                att = 384 << 17; /*1.5 Q8<<17=Q25*/
+                move16();
+            }
+            Lener = L_sub( Lener, att );
+        }
+        /*st->lp_ener = 0.8f * stcod->lp_ener + 0.2f * pow( 2.0f, enr );*/
+        Lener = BASOP_util_Pow2( Lener, 6, &exp );      /*Q31 - exp*/
+        Lener = Mult_32_16( Lener, 6554 /*0.2f Q15*/ ); /*Q31 - exp*/
+        exp = sub( 25, exp );
+        Lener = L_shr( Lener, exp );                                                       /*Q6*/
+        st->lp_ener_fx = L_add( Mult_32_16( st->lp_ener_fx, 26214 /*0.8f Q15*/ ), Lener ); /*Q6*/
+        move32();
+    }
+
+    /* Generate Gaussian random noise in real and imaginary parts of the CLDFB bands
+      Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each band */
+
+    test();
+    IF( bufferReal != NULL && ( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) ) )
+    {
+        Word16 bufferReal_exp[CLDFB_NO_COL_MAX];
+        Word16 bufferImag_exp[CLDFB_NO_COL_MAX];
+        *bufferScale = 0;
+        move16();
+        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
+        {
+            sqrtNoiseLevel_exp = add( CLDFBinvScalingFactor_EXP, sub( cngNoiseLevel_exp, 1 ) );
+            sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *ptr_level, scaleCldfb ), &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
+
+            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
+            {
+                /* Real part in CLDFB band */
+                IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
+                {
+                    rand_gauss_fx( &tmp1, seed, Q15 );                                            /*Q15*/
+                    rand_gauss_fx( &tmp2, seed2, Q15 );                                           /*Q15*/
+                    bufferReal[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
+                    move32();
+                    bufferReal_exp[j] = Q16;
+                    move16();
+                }
+                ELSE
+                {
+                    rand_gauss_fx( &bufferReal[i][j], seed, Q15 ); /*Q15*/
+                    move32();
+                    bufferReal_exp[j] = Q16;
+                    move16();
+                }
+
+                bufferReal[i][j] = Mpy_32_32( bufferReal[i][j], sqrtNoiseLevel ); /*Q31 - ( bufferReal_exp[j] + sqrtNoiseLevel_exp )*/
+                move32();
+                bufferReal_exp[j] = add( bufferReal_exp[j], sqrtNoiseLevel_exp );
+                move16();
+
+                /* Imaginary part in CLDFB band */
+                IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
+                {
+                    rand_gauss_fx( &tmp1, seed, Q15 );                                            /*Q15*/
+                    rand_gauss_fx( &tmp2, seed2, Q15 );                                           /*Q15*/
+                    bufferImag[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
+                    move32();
+                    bufferImag_exp[j] = Q16;
+                    move16();
                 }
                 ELSE
                 {
-                    /* Use least attenuation for higher bitrates */
-                    att = L_shl( L_deposit_l( ENR_ATT_fx[4] ), 17 ); /*Q23*/
+                    rand_gauss_fx( &bufferImag[i][j], seed, Q15 ); /*Q15*/
+                    bufferImag_exp[j] = Q16;
+                    move16();
                 }
-            }
-            ELSE
-            {
-                att = 384 << 17; /*1.5 Q8<<17=Q25*/
+                bufferImag[i][j] = Mpy_32_32( bufferImag[i][j], sqrtNoiseLevel ); /*Q31 - ( bufferReal_exp[j] + sqrtNoiseLevel_exp )*/
+                bufferImag_exp[j] = add( bufferImag_exp[j], sqrtNoiseLevel_exp );
                 move16();
+
+                move32();
             }
-            Lener = L_sub( Lener, att ); /*Q23*/
+            ptr_level++;
         }
-        /*st->lp_ener = 0.8f * stcod->lp_ener + 0.2f * pow( 2.0f, enr );*/
-        Lener = BASOP_util_Pow2( Lener, 6, &exp );      /*Q31 - exp*/
-        Lener = Mult_32_16( Lener, 6554 /*0.2f Q15*/ ); /*Q31 - exp*/
-        exp = sub( 25, exp );
-        Lener = L_shr( Lener, exp );                                                       /*Q6*/
-        st->lp_ener_fx = L_add( Mult_32_16( st->lp_ener_fx, 26214 /*0.8f Q15*/ ), Lener ); /*Q6*/
-        move32();
-    }
-
-    /*
-      Generate Gaussian random noise in real and imaginary parts of the CLDFB bands
-      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each band
-    */
-    test();
-    IF( bufferReal != NULL && ( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) ) )
-    {
-
-        sn = sub( sn, 1 );
-        sc = add( shr( add( cngNoiseLevelExp, CLDFBinvScalingFactor_EXP + 1 - 1 ), 1 ), randGaussExp );
-        move16();
-        assert( ( ( cngNoiseLevelExp + CLDFBinvScalingFactor_EXP + 1 - 1 ) & 1 ) == 0 );
 
         FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
         {
-            /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */
-            s = 0;
+            *bufferScale = s_max( *bufferScale, bufferReal_exp[j] );
             move16();
-            sqrtNoiseLevel = Sqrt32( L_shr( Mpy_32_16_1( *ptr_level, scaleCLDFB ), sn ), &s ); /*Q31 - s*/
+            *bufferScale = s_max( *bufferScale, bufferImag_exp[j] );
+            move16();
+        }
 
+        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
+        {
             FOR( i = 0; i < hFdCngCom->numSlots; i++ )
             {
-                /* Real part in CLDFB band */
-                bufferReal[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                bufferImag[i][j] = L_shr( bufferImag[i][j], sub( *bufferScale, bufferImag_exp[j] ) ); /*bufferImag_exp*/
                 move32();
-                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferReal[i][j],sc));*/
-
-                /* Imaginary part in CLDFB band */
-                bufferImag[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                bufferReal[i][j] = L_shr( bufferReal[i][j], sub( *bufferScale, bufferReal_exp[j] ) ); /*bufferReal_exp*/
                 move32();
-                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferImag[i][j],sc));*/
             }
-            ptr_level = ptr_level + 1;
         }
-        *bufferScale = sub( sc, 15 );
-        move16();
     }
 
-    /* Overlap-add when previous frame is active */
     test();
     IF( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) && EQ_16( st->codec_mode, MODE2 ) )
     {
@@ -3689,7 +3311,7 @@ void generate_comfort_noise_dec_fx(
 
         assert( hFdCngCom->frameSize <= 640 );
 
-        seed_loc = hFdCngCom->seed;
+        seed_loc = hFdCngCom->seed; /*Q0*/
         move16();
         N = hFdCngCom->frameSize; /*Q0*/
         move16();
@@ -3698,7 +3320,7 @@ void generate_comfort_noise_dec_fx(
         IF( st->last_core_bfi > ACELP_CORE )
         {
             Word16 left_overlap_mode;
-            left_overlap_mode = st->hTcxCfg->tcx_last_overlap_mode; /*Q0*/
+            left_overlap_mode = st->hTcxCfg->tcx_last_overlap_mode;
             move16();
             if ( EQ_16( left_overlap_mode, ALDO_WINDOW ) )
             {
@@ -3710,9 +3332,9 @@ void generate_comfort_noise_dec_fx(
 
             IF( st->hTcxCfg->last_aldo != 0 )
             {
-                FOR( i = 0; i < sub( hFdCngCom->frameSize, NS2SA( st->sr_core, N_ZERO_MDCT_NS ) ); i++ )
+                FOR( i = 0; i < hFdCngCom->frameSize - NS2SA( st->sr_core, N_ZERO_MDCT_NS ); i++ )
                 {
-                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( st->hHQ_core->old_out_LB_fx[i + NS2SA( st->sr_core, N_ZERO_MDCT_NS )], st->hHQ_core->Q_old_wtda_LB ) ); /*st->q_old_outLB_fx*/
+                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( st->hHQ_core->old_out_LB_fx[i + NS2SA_FX2( st->sr_core, N_ZERO_MDCT_NS )], st->hHQ_core->Q_old_wtda_LB ) ); /*st->q_old_outLB_fx*/
                     move16();
                 }
             }
@@ -3812,11 +3434,7 @@ void generate_comfort_noise_dec_fx(
             s = sub( 15 - NOISE_HEADROOM, noiseExp );
             FOR( i = 0; i < N; i++ )
             {
-#ifdef BASOP_NOGLOB
                 noise[i] = shr_sat( mult( noise[i], gain16 ), s ); /*Q15 - noiseExp*/
-#else
-                noise[i] = shr( mult( noise[i], gain16 ), s );
-#endif
                 move16();
             }
 
@@ -3825,11 +3443,7 @@ void generate_comfort_noise_dec_fx(
             s = sub( 15 - NOISE_HEADROOM, ( sub( 15, Q_syn ) ) );
             FOR( i = 0; i < lpcorder; i++ )
             {
-#ifdef BASOP_NOGLOB
                 old_syn_pe_tmp[i] = shr_sat( old_syn_pe[i], s ); /*Q0*/
-#else
-                old_syn_pe_tmp[i] = shr( old_syn_pe[i], s );
-#endif
                 move16();
             }
 
@@ -3863,1589 +3477,1692 @@ void generate_comfort_noise_dec_fx(
                 tmp = mult( noise[( i + N4 )], hFdCngCom->olapWinSyn[( ( N4 - 1 ) - i )].v.im ); /*Q15 - noiseExp*/
                 timeDomainOutput[( i + N4 )] = add( timeDomainOutput[( i + N4 )], tmp );
                 move16();
+                move16();
             }
         }
     }
+    return;
 }
 
-void generate_comfort_noise_dec_ivas_fx(
-    Word32 **bufferReal, /* o  : Real part of input bands      bufferScale*/
-    Word32 **bufferImag, /* o  : Imaginary part of input bands bufferScale*/
+void generate_comfort_noise_dec_hf_fx(
+    Word32 **bufferReal, /* o   : matrix to real part of input bands  bufferScale*/
+    Word32 **bufferImag, /* o   : matrix to imaginary part of input bands  bufferScale*/
     Word16 *bufferScale, /* o   : pointer to scalefactor for real and imaginary part of input bands */
-    Decoder_State *st,   /* i/o: decoder state structure       */
-    Word16 *Q_new,
-    Word16 gen_exc,        /*Q0*/
-    const Word16 nchan_out /* i  : number of output channels     Q0*/
-)
+    Decoder_State *st )
 {
-    Word16 i, j, s;
-    Word32 *ptr_r, *ptr_i;
-    HANDLE_FD_CNG_DEC hFdCngDec = st->hFdCngDec;
-    HANDLE_FD_CNG_COM hFdCngCom = hFdCngDec->hFdCngCom;
-    Word32 *cngNoiseLevel = hFdCngCom->cngNoiseLevel;
-    Word16 cngNoiseLevel_exp = hFdCngCom->cngNoiseLevelExp;
-    move16();
-
-    Word32 *ptr_level = cngNoiseLevel;
-    Word16 *seed = &( hFdCngCom->seed );
-    Word16 *seed2;
-    Word16 c1, c2;
-    Word32 tmp1, tmp2;
-    Word16 scaleCldfb;
-    Word32 *fftBuffer = hFdCngCom->fftBuffer; /*hFdCngCom->fftBuffer_exp*/
-    Word16 fftBuffer_exp = hFdCngCom->fftBuffer_exp;
-    Word16 fftBuffer_temp_exp[FFTLEN];
-    Word16 *timeDomainOutput = hFdCngCom->timeDomainBuffer;
-    Word16 temp;
+    Word16 i, j, s, sc, sn;
+    Word16 scaleCLDFB;
     Word32 sqrtNoiseLevel;
-    Word16 sqrtNoiseLevel_exp;
-    Word16 idx = 0;
-    move16();
-    Word16 preemph_fac;
-    Word16 old_syn_pe_tmp[16];
-    Word16 tcx_transition = 0;
-    TCX_DEC_HANDLE hTcxDec;
-    move16();
-
-    hTcxDec = st->hTcxDec;
-
-    scaleCldfb = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
+    Word16 randGaussExp;
+    Word16 cngNoiseLevelExp;
+    Word16 *seed;
+    Word32 *cngNoiseLevel;
+    Word32 *ptr_level;
+    HANDLE_FD_CNG_COM hFdCngCom = st->hFdCngDec->hFdCngCom;
 
-    temp = 0;
-    move16();
-    c1 = Sqrt16( hFdCngCom->coherence_fx, &temp ); /*Q15 - temp*/
-    c1 = shl( c1, temp );                          /*Q15*/
-    temp = 0;
+    cngNoiseLevel = hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
     move16();
-    c2 = Sqrt16( sub( MAX_16, hFdCngCom->coherence_fx ), &temp ); /*Q15 - temp*/
-    c2 = shl( c2, temp );                                         /*Q15*/
+    ptr_level = cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    seed = &( hFdCngCom->seed );
 
-    temp = getScaleFactor32( fftBuffer, FFTLEN );
-    scale_sig32( fftBuffer, FFTLEN, temp ); /*Q31 - hFdCngCom->fftBuffer_exp + temp*/
-    fftBuffer_exp = sub( fftBuffer_exp, temp );
-    hFdCngCom->fftBuffer_exp = fftBuffer_exp;
-    move16();
-    set16_fx( fftBuffer_temp_exp, fftBuffer_exp, FFTLEN );
-    fftBuffer_exp = 0;
-    move16();
+    /* scaleCLDFB: CLDFBinvScalingFactor_EXP + 1 */
+    scaleCLDFB = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
 
-    seed2 = &( hFdCngCom->seed2 );
-    test();
-    if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && EQ_16( st->idchan, 1 ) )
+    sn = 0;
+    move16();
+    IF( s_and( cngNoiseLevelExp, 1 ) != 0 )
     {
-        seed2 = &( hFdCngCom->seed3 );
+        sn = add( sn, 1 );
+        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );
     }
 
-    /* Generate Gaussian random noise in real and imaginary parts of the FFT bins
-      Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each bin */
-
-    IF( hFdCngCom->startBand == 0 )
-    {
-        test();
-        test();
-        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
-        {
-            rand_gauss_fx( &tmp1, seed, Q15 );
-            rand_gauss_fx( &tmp2, seed2, Q15 );
-            fftBuffer[0] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q0*/
-            move32();
-            fftBuffer_temp_exp[0] = Q16 + Q15;
-            move16();
-        }
-        ELSE
-        {
-            rand_gauss_fx( &fftBuffer[0], seed, Q15 );
-            fftBuffer_temp_exp[0] = Q16;
-            move16();
-        }
-        sqrtNoiseLevel_exp = cngNoiseLevel_exp;
-        move16();
-        sqrtNoiseLevel = Sqrt32( *ptr_level, &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
-        fftBuffer[0] = Mpy_32_32( fftBuffer[0], sqrtNoiseLevel );   /*Q31 - (sqrtNoiseLevel_exp + fftBuffer_temp_exp[0])*/
-        move32();
-        fftBuffer_temp_exp[0] = add( sqrtNoiseLevel_exp, fftBuffer_temp_exp[0] );
-        move16();
-        ptr_level++;
-        ptr_r = fftBuffer + 2; /*Q31 - (fftBuffer_temp_exp)*/
-        idx = 2;
-    }
-    ELSE
-    {
-        fftBuffer[0] = 0;
-        move16();
-        set32_fx( fftBuffer + 2, 0, shl( sub( hFdCngCom->startBand, 1 ), 1 ) );
-        ptr_r = fftBuffer + shl( hFdCngCom->startBand, 1 ); /*Q31 - fftBuffer_exp*/
-        idx = shl( hFdCngCom->startBand, 1 );               /*Q0*/
-    }
+    randGaussExp = CNG_RAND_GAUSS_SHIFT;
+    move16();
 
-    ptr_i = ptr_r + 1; /*Q31 - fftBuffer_exp*/
-    FOR( ; ptr_level < cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); ptr_level++ )
+    IF( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) )
     {
-        /* Real part in FFT bins */
-        test();
-        test();
-        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
-        {
-            rand_gauss_fx( &tmp1, seed, Q15 );                                  /*Q15*/
-            rand_gauss_fx( &tmp2, seed2, Q15 );                                 /*Q15*/
-            *ptr_r = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
-            move32();
-            fftBuffer_temp_exp[idx] = Q16;
-            move16();
-        }
-        ELSE
-        {
-            rand_gauss_fx( ptr_r, seed, Q15 ); /*Q15*/
-            fftBuffer_temp_exp[idx] = Q16;
-            move16();
-        }
 
-        sqrtNoiseLevel_exp = sub( cngNoiseLevel_exp, 1 );
-        sqrtNoiseLevel = Sqrt32( *ptr_level, &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
-        ( *ptr_r ) = Mpy_32_32( ( *ptr_r ), sqrtNoiseLevel );       /*Q15 - sqrtNoiseLevel_exp*/
-        move32();
-        fftBuffer_temp_exp[idx] = add( fftBuffer_temp_exp[idx], sqrtNoiseLevel_exp );
+        sc = add( shr( add( cngNoiseLevelExp, CLDFBinvScalingFactor_EXP + 1 - 1 ), 1 ), randGaussExp );
         move16();
-        idx = add( idx, 1 );
-        ptr_r += 2;
+        assert( ( ( cngNoiseLevelExp + CLDFBinvScalingFactor_EXP + 1 - 1 ) & 1 ) == 0 );
 
-        /* Imaginary part in FFT bins */
-        test();
-        test();
-        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
-        {
-            rand_gauss_fx( &tmp1, seed, Q15 );                                  /*Q15*/
-            rand_gauss_fx( &tmp2, seed2, Q15 );                                 /*Q15*/
-            *ptr_i = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
-            move32();
-            fftBuffer_temp_exp[idx] = Q16;
-            move16();
-        }
-        ELSE
+        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
         {
-            rand_gauss_fx( ptr_i, seed, Q15 ); /*Q15*/
-            fftBuffer_temp_exp[idx] = Q16;
+            /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */
+            s = 0;
             move16();
+            sqrtNoiseLevel = Sqrt32( L_shr( Mpy_32_16_1( *ptr_level, scaleCLDFB ), sn ), &s ); /*Q31 - s*/
+
+            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
+            {
+                /* Real part in CLDFB band */
+                bufferReal[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                move32();
+                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferReal[i][j],sc));*/
+
+                /* Imaginary part in CLDFB band */
+                bufferImag[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                move32();
+                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferImag[i][j],sc));*/
+            }
+            ptr_level = ptr_level + 1; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
         }
-        sqrtNoiseLevel_exp = sub( cngNoiseLevel_exp, 1 );
-        sqrtNoiseLevel = Sqrt32( *ptr_level, &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
-        ( *ptr_i ) = Mpy_32_32( ( *ptr_i ), sqrtNoiseLevel );       /*Q15 - sqrtNoiseLevel_exp*/
-        move32();
-        fftBuffer_temp_exp[idx] = add( fftBuffer_temp_exp[idx], sqrtNoiseLevel_exp );
+        *bufferScale = sub( sc, 15 );
         move16();
-        idx = add( idx, 1 );
-        ptr_i += 2;
     }
+}
 
-    /* Remaining FFT bins are set to zero */
-    set32_fx( fftBuffer + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
-    set16_fx( fftBuffer_temp_exp + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
+void generate_comfort_noise_dec_hf_ivas_fx(
+    Word32 **bufferReal,         /* o   : matrix to real part of input bands   bufferScale*/
+    Word32 **bufferImag,         /* o   : matrix to imaginary part of input bands  bufferScale*/
+    Word16 *bufferScale,         /* o   : pointer to scalefactor for real and imaginary part of input bands */
+    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables  */
+    const Word16 cng_coh_flag    /* i  : CNG Flag for coherence handling                        Q0*/
+)
+{
+    Word16 i, j, s, sc, sn;
+    Word16 scaleCLDFB;
+    Word32 sqrtNoiseLevel;
+    Word16 randGaussExp;
+    Word16 cngNoiseLevelExp;
+    Word16 *seed;
+    Word16 *seed2;
+    Word16 c1, c2;
+    Word32 *ptr_level;
+    Word32 *cngNoiseLevel;
+    Word32 tmp1, tmp2;
 
-    /* Nyquist frequency is discarded */
-    fftBuffer[1] = 0;
-    move32();
+    cngNoiseLevel = hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
+    move16();
+    ptr_level = cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
 
-    fftBuffer_exp = MAX_16;
+    seed = &( hFdCngCom->seed );
+
+    /* scaleCLDFB: CLDFBinvScalingFactor_EXP + 1 */
+    scaleCLDFB = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
+
+    seed2 = &( hFdCngCom->seed );
+
+    c1 = 0;
     move16();
-    FOR( i = 0; i < hFdCngCom->fftlen; i++ )
-    {
-        IF( fftBuffer[i] != 0 )
-        {
-            fftBuffer_exp = s_min( fftBuffer_exp, add( sub( 31, fftBuffer_temp_exp[i] ), norm_l( fftBuffer[i] ) ) );
-        }
-    }
-    if ( EQ_16( fftBuffer_exp, MAX_16 ) )
+    c2 = 0;
+    move16();
+    sc = 0;
+    move16();
+
+    IF( cng_coh_flag )
     {
-        fftBuffer_exp = 0;
+        seed2 = &( hFdCngCom->seed2 );
+
+        s = 0;
         move16();
-    }
-    fftBuffer_exp = sub( 31, fftBuffer_exp );
-    FOR( i = 0; i < hFdCngCom->fftlen; i++ )
-    {
-        fftBuffer[i] = L_shr( fftBuffer[i], sub( fftBuffer_exp, fftBuffer_temp_exp[i] ) ); /*Q31 - fftBuffer_temp_exp[i]*/
-        move32();
+
+        c1 = Sqrt16( hFdCngCom->coherence_fx, &s ); /*Q15 - s*/
+        c1 = shl( c1, s );                          // Q15
+
+        s = 0;
+        move16();
+        c2 = Sqrt16( sub( MAX16B, hFdCngCom->coherence_fx ), &s ); /*Q15 - s*/
+        c2 = shl( c2, s );                                         // Q15
     }
 
-    /* If previous frame is active, reset the overlap-add buffer */
-    tcx_transition = 0;
+    sn = 0;
     move16();
-    IF( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
+    IF( s_and( cngNoiseLevelExp, 1 ) != 0 )
     {
-        set16_fx( hFdCngCom->olapBufferSynth, 0, hFdCngCom->fftlen );
-        test();
-        test();
-        if ( ( st->last_core_bfi > ACELP_CORE && EQ_16( st->codec_mode, MODE2 ) ) || EQ_16( st->codec_mode, MODE1 ) )
-        {
-            tcx_transition = 1;
-            move16();
-        }
+        sn = add( sn, 1 );
+        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );
+        move16();
     }
 
-    /* Perform STFT synthesis */
-    SynthesisSTFT_ivas_fx( fftBuffer, fftBuffer_exp, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn,
-                           tcx_transition, hFdCngCom, gen_exc, Q_new, st->element_mode, nchan_out );
-    scale_sig32( fftBuffer + hFdCngCom->fftlen, sub( FFTLEN, hFdCngCom->fftlen ), sub( fftBuffer_exp, hFdCngCom->fftBuffer_exp ) ); /*Q31 - fftBuffer_exp*/
+    randGaussExp = CNG_RAND_GAUSS_SHIFT + 1;
+    move16();
 
+    /*
+      Generate Gaussian random noise in real and imaginary parts of the CLDFB bands
+      Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each band
+    */
+    IF( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) )
     {
-        Word32 Lener, att;
-        Word16 exp;
-        /* update CNG excitation energy for LP_CNG */
-
-        /* calculate the residual signal energy */
-        /*enr = dotp( hFdCngCom->exc_cng, hFdCngCom->exc_cng, hFdCngCom->frameSize ) / hFdCngCom->frameSize;*/
-        Lener = Dot_productSq16HQ( 1, hFdCngCom->exc_cng, st->L_frame, &exp ); /*Q31 - exp*/
-        exp = add( sub( shl( sub( 15, *Q_new ), 1 ), 8 ), exp );               /*8 = log2(256)*/
+        sc = add( shr( add( cngNoiseLevelExp, CLDFBinvScalingFactor_EXP + 1 - 1 ), 1 ), randGaussExp );
+        move16();
+        assert( ( ( cngNoiseLevelExp + CLDFBinvScalingFactor_EXP + 1 - 1 ) & 1 ) == 0 );
 
-        /* convert log2 of residual signal energy */
-        /*(float)log10( enr + 0.1f ) / (float)log10( 2.0f );*/
-        Lener = BASOP_Util_Log2( Lener );                                                     /*Q25*/
-        Lener = L_add( Lener, L_shl( L_deposit_l( exp ), WORD32_BITS - 1 - LD_DATA_SCALE ) ); /*Q25*/
-        if ( EQ_16( st->L_frame, L_FRAME16k ) )
-        {
-            Lener = L_sub( Lener, 10802114l /*0.3219280949f Q25*/ ); /*log2(320) = 8.3219280949f*/
-        }
-        /* decrease the energy in case of WB input */
-        IF( st->bwidth != NB )
+        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
         {
-            IF( EQ_16( st->bwidth, WB ) )
+            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
             {
-                IF( st->CNG_mode >= 0 )
+                /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */
+                s = 0;
+                move16();
+                sqrtNoiseLevel = Sqrt32( L_shr( Mpy_32_16_1( *ptr_level, scaleCLDFB ), sn ), &s ); /*Q31 - s*/
+
+                IF( cng_coh_flag )
                 {
-                    /* Bitrate adapted attenuation */
-                    att = L_shl( L_deposit_l( ENR_ATT_fx[st->CNG_mode] ), 17 ); /*Q25*/
+                    rand_gauss_fx( &tmp1, seed, Q28 );  /*Q28*/
+                    rand_gauss_fx( &tmp2, seed2, Q28 ); /*Q28*/
+
+                    bufferReal[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*bufferScale*/
+                    move32();
+                    bufferReal[i][j] = L_shl( Mpy_32_32( bufferReal[i][j], sqrtNoiseLevel ), s ); /*bufferScale*/
+                    move32();
+
+                    rand_gauss_fx( &tmp1, seed, Q28 );  /*Q28*/
+                    rand_gauss_fx( &tmp2, seed2, Q28 ); /*Q28*/
+
+                    bufferImag[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*bufferScale*/
+                    move32();
+                    bufferImag[i][j] = L_shl( Mpy_32_32( bufferImag[i][j], sqrtNoiseLevel ), s ); /*bufferScale*/
+                    move32();
                 }
                 ELSE
                 {
-                    /* Use least attenuation for higher bitrates */
-                    att = L_shl( L_deposit_l( ENR_ATT_fx[4] ), 17 ); /*Q25*/
+                    /* Real part in CLDFB band */
+                    bufferReal[i][j] = L_shl( Mpy_32_32( L_shr( rand_gauss( seed ), 1 ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                    move32();
+
+                    /* Imaginary part in CLDFB band */
+                    bufferImag[i][j] = L_shl( Mpy_32_32( L_shr( rand_gauss( seed ), 1 ), sqrtNoiseLevel ), s ); /*bufferScale*/
+                    move32();
                 }
             }
-            ELSE
-            {
-                att = 384 << 17; /*1.5 Q8<<17=Q25*/
-                move16();
-            }
-            Lener = L_sub( Lener, att );
+            ptr_level = ptr_level + 1; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
         }
-        /*st->lp_ener = 0.8f * stcod->lp_ener + 0.2f * pow( 2.0f, enr );*/
-        Lener = BASOP_util_Pow2( Lener, 6, &exp );      /*Q31 - exp*/
-        Lener = Mult_32_16( Lener, 6554 /*0.2f Q15*/ ); /*Q31 - exp*/
-        exp = sub( 25, exp );
-        Lener = L_shr( Lener, exp );                                                       /*Q6*/
-        st->lp_ener_fx = L_add( Mult_32_16( st->lp_ener_fx, 26214 /*0.8f Q15*/ ), Lener ); /*Q6*/
-        move32();
+        *bufferScale = sub( sc, 15 );
+        move16();
     }
 
-    /* Generate Gaussian random noise in real and imaginary parts of the CLDFB bands
-      Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each band */
+    return;
+}
 
-    test();
-    IF( bufferReal != NULL && ( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) ) )
-    {
-        Word16 bufferReal_exp[CLDFB_NO_COL_MAX];
-        Word16 bufferImag_exp[CLDFB_NO_COL_MAX];
-        *bufferScale = 0;
-        move16();
-        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
-        {
-            sqrtNoiseLevel_exp = add( CLDFBinvScalingFactor_EXP, sub( cngNoiseLevel_exp, 1 ) );
-            sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *ptr_level, scaleCldfb ), &sqrtNoiseLevel_exp ); /*Q31 - sqrtNoiseLevel_exp*/
 
-            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
-            {
-                /* Real part in CLDFB band */
-                IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
-                {
-                    rand_gauss_fx( &tmp1, seed, Q15 );                                            /*Q15*/
-                    rand_gauss_fx( &tmp2, seed2, Q15 );                                           /*Q15*/
-                    bufferReal[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
-                    move32();
-                    bufferReal_exp[j] = Q16;
-                    move16();
-                }
-                ELSE
-                {
-                    rand_gauss_fx( &bufferReal[i][j], seed, Q15 ); /*Q15*/
-                    move32();
-                    bufferReal_exp[j] = Q16;
-                    move16();
-                }
+/*
+    generate_masking_noise_fx
+
+    Parameters:
+
+    timeDomainBuffer       i/o : pointer to time domain output buffer 15Q0
+    st                     i/o : pointer to FD_CNG_COM structure
+    bitrate                i   : bitrate
+
+    Function:
+    Generate additional comfort noise (kind of noise filling)
+
+    Returns: none
+
+    void
+*/
+void generate_masking_noise_fx(
+    Word16 *timeDomainBuffer, /* i/o : pointer to time domain output buffer 15Q0 */
+    Word16 Q,
+    HANDLE_FD_CNG_COM hFdCngCom /* i/o : pointer to FD_CNG_COM structure */
+    ,
+    Word16 length, /*Q0*/
+    Word16 core /*Q0*/ )
+{
+    Word16 i, s, s1, s2, sq, cnt, startBand2, stopFFTbin2;
+    Word16 scaleExp, fftBufferExp, cngNoiseLevelExp;
+    Word16 scale, scaleTableSize;
+    Word16 maskingNoise[L_FRAME16k];
+    Word32 sqrtNoiseLevel;
+    Word32 *cngNoiseLevel;
+    Word32 *fftBuffer;
+    Word16 *seed;
+
+    // PMTE(); /*IVAS CODE need to be added */
 
-                bufferReal[i][j] = Mpy_32_32( bufferReal[i][j], sqrtNoiseLevel ); /*Q31 - ( bufferReal_exp[j] + sqrtNoiseLevel_exp )*/
-                move32();
-                bufferReal_exp[j] = add( bufferReal_exp[j], sqrtNoiseLevel_exp );
-                move16();
+    /* pointer initializations */
+    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    fftBuffer = hFdCngCom->fftBuffer;         /*Q31 - hFdCngCom->fftBuffer_exp*/
+    seed = &( hFdCngCom->seed );
 
-                /* Imaginary part in CLDFB band */
-                IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && st->cng_ism_flag ) )
-                {
-                    rand_gauss_fx( &tmp1, seed, Q15 );                                            /*Q15*/
-                    rand_gauss_fx( &tmp2, seed2, Q15 );                                           /*Q15*/
-                    bufferImag[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*Q15*/
-                    move32();
-                    bufferImag_exp[j] = Q16;
-                    move16();
-                }
-                ELSE
-                {
-                    rand_gauss_fx( &bufferImag[i][j], seed, Q15 ); /*Q15*/
-                    bufferImag_exp[j] = Q16;
-                    move16();
-                }
-                bufferImag[i][j] = Mpy_32_32( bufferImag[i][j], sqrtNoiseLevel ); /*Q31 - ( bufferReal_exp[j] + sqrtNoiseLevel_exp )*/
-                bufferImag_exp[j] = add( bufferImag_exp[j], sqrtNoiseLevel_exp );
-                move16();
+    /* Compute additional CN level */
+    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
+    move16();
 
-                move32();
-            }
-            ptr_level++;
-        }
+    IF( NE_16( core, AMR_WB_CORE ) )
+    {
+        scaleTableSize = 18;
+        move16();
+        assert( scaleTableSize == ( sizeof( scaleTable_cn_only ) / sizeof( scaleTable_cn_only[0] ) ) );
 
-        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
+        scale = -1;
+        move16();
+        FOR( i = 0; i < scaleTableSize; i++ )
         {
-            *bufferScale = s_max( *bufferScale, bufferReal_exp[j] );
-            move16();
-            *bufferScale = s_max( *bufferScale, bufferImag_exp[j] );
-            move16();
-        }
+            test();
+            test();
+            IF( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) ) && ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) ) && ( LT_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) ) )
 
-        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
-        {
-            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
             {
-                bufferImag[i][j] = L_shr( bufferImag[i][j], sub( *bufferScale, bufferImag_exp[j] ) ); /*bufferImag_exp*/
-                move32();
-                bufferReal[i][j] = L_shr( bufferReal[i][j], sub( *bufferScale, bufferReal_exp[j] ) ); /*bufferReal_exp*/
-                move32();
+                scale = scaleTable_cn_only[i].scale; /*Q14*/
+                move16();
+                BREAK;
             }
         }
+        assert( scale >= 0 );
     }
-
-    test();
-    IF( EQ_16( hFdCngCom->frame_type_previous, ACTIVE_FRAME ) && EQ_16( st->codec_mode, MODE2 ) )
+    ELSE
     {
-        Word32 old_exc_ener, gain, noise32;
-        Word16 seed_loc, lpcorder, old_syn, tmp, gain16, N, N2, N4, N8;
-        Word16 old_exc_ener_exp, gain_exp;
-        Word16 normFacE, normShiftE, normShiftEM1;
-        Word16 normFacG, normShiftG, normShiftGM1;
-        Word16 noiseExp, *old_exc, *old_Aq, *old_syn_pe;
-        Word16 noise[640], normShiftP2;
-        Word16 Q_exc, Q_syn;
-
-
-        assert( hFdCngCom->frameSize <= 640 );
-
-        seed_loc = hFdCngCom->seed; /*Q0*/
-        move16();
-        N = hFdCngCom->frameSize; /*Q0*/
+        scaleTableSize = 3;
         move16();
-        N2 = shr( hFdCngCom->frameSize, 1 );
+        assert( scaleTableSize == ( sizeof( scaleTable_cn_only_amrwbio ) / sizeof( scaleTable_cn_only_amrwbio[0] ) ) );
 
-        IF( st->last_core_bfi > ACELP_CORE )
+        scale = 0;
+        move16();
+        FOR( i = 0; i < scaleTableSize; i++ )
         {
-            Word16 left_overlap_mode;
-            left_overlap_mode = st->hTcxCfg->tcx_last_overlap_mode;
-            move16();
-            if ( EQ_16( left_overlap_mode, ALDO_WINDOW ) )
+            IF( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only_amrwbio[i][0] ) )
             {
-                left_overlap_mode = FULL_OVERLAP;
+                scale = scaleTable_cn_only_amrwbio[i][1]; /*Q14*/
                 move16();
-            }
-            tcx_windowing_synthesis_current_frame( timeDomainOutput, st->hTcxCfg->tcx_mdct_window, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, st->hTcxCfg->tcx_mdct_window_length, st->hTcxCfg->tcx_mdct_window_half_length,
-                                                   st->hTcxCfg->tcx_mdct_window_min_length, 0, left_overlap_mode, NULL, NULL, NULL, NULL, NULL, shr( N, 1 ), shr( sub( abs_s( st->hTcxCfg->tcx_offset ), st->hTcxCfg->tcx_offset ), 1 ), 1, 0, 0 );
-
-            IF( st->hTcxCfg->last_aldo != 0 )
-            {
-                FOR( i = 0; i < sub( hFdCngCom->frameSize, NS2SA( st->sr_core, N_ZERO_MDCT_NS ) ); i++ )
-                {
-                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( st->hHQ_core->old_out_LB_fx[i + NS2SA( st->sr_core, N_ZERO_MDCT_NS )], st->hHQ_core->Q_old_wtda_LB ) ); /*st->q_old_outLB_fx*/
-                    move16();
-                }
-            }
-            ELSE
-            {
-                tcx_windowing_synthesis_past_frame( hTcxDec->syn_Overl, st->hTcxCfg->tcx_mdct_window, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum,
-                                                    st->hTcxCfg->tcx_mdct_window_length, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, st->hTcxCfg->tcx_last_overlap_mode );
-
-                FOR( i = 0; i < st->hTcxCfg->tcx_mdct_window_length; i++ )
-                {
-                    timeDomainOutput[i] = add( timeDomainOutput[i], shl( hTcxDec->syn_Overl[i], TCX_IMDCT_HEADROOM ) ); /*st->q_old_outLB_fx*/
-                    move16();
-                }
+                BREAK;
             }
         }
-        ELSE
-        {
-
-            /*
-              - the scaling of the LPCs (e.g. old_Aq) is always Q12 (encoder or decoder)
-
-              - the scaling of the deemphasized signals (e.g. old_syn) is always Q0 (encoder or decoder)
+    }
 
-              - the scaling of the excitation signals in the encoder (e.g. old_exc) is Q_new
-              - the scaling of the preemphasized signals in the encoder (e.g. old_syn_pe) is Q_new-1
+    /* Exclude clean speech */
 
-              - the scaling of the excitation signals in the decoder (e.g. old_exc) is Q_exc (or stdec->Q_exc)
-              - the scaling of the preemphasized signals in the decoder (e.g. old_syn_pe) is Q_syn (or stdec->Q_syn)
-            */
+    s1 = norm_s( scale );
+    s2 = norm_s( hFdCngCom->likelihood_noisy_speech );
 
-            lpcorder = M;
-            move16();
-            old_Aq = st->old_Aq_12_8_fx;                         /*Q12*/
-            old_exc = st->old_exc_fx + sub( L_EXC_MEM_DEC, N2 ); /*Q_exc*/
-            old_syn_pe = st->mem_syn2_fx;                        /*Q_syn*/
-            old_syn = st->syn[lpcorder];                         /*Q_syn*/
-            move16();
-            preemph_fac = st->preemph_fac; /*Q15*/
-            move16();
-            Q_exc = st->Q_exc;
-            move16();
-            Q_syn = st->Q_syn;
-            move16();
+    /* scaleTable_cn_only[i].scale is scaled by 1 bit */
+    scaleExp = sub( 1, add( s1, s2 ) );
+    scale = mult_r( shl( scale, s1 ), shl( hFdCngCom->likelihood_noisy_speech, s2 ) ); /*Q15 - scaleExp*/
 
-            /* shift to be in the range of values supported by getNormReciprocalWord16() */
-            N8 = shr( N2, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
+    {
+        /* add exponent of scale and cngNoiseLevel */
+        fftBufferExp = add( scaleExp, cngNoiseLevelExp );
 
-            assert( N2 == ( N8 << CNG_NORM_RECIPROCAL_RANGE_SHIFT ) );
+        /* even scalefactor needed for sqrt calculation */
+        s = s_and( fftBufferExp, 1 );
+        fftBufferExp = add( fftBufferExp, s );
 
-            normFacE = getNormReciprocalWord16( N8 );
-            normShiftE = BASOP_util_norm_s_bands2shift( N8 );
-            normShiftEM1 = sub( normShiftE, 1 );
-            normShiftP2 = add( normShiftE, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
+        /* sqrt calculation => shift exponent */
+        fftBufferExp = shr( fftBufferExp, 1 );
 
-            old_exc_ener = L_shr( L_mult( old_exc[0], old_exc[0] ), normShiftP2 ); /*2*(Q_exc)+1+normShiftP2*/
-            FOR( i = 1; i < N2; i++ )
-            {
-                old_exc_ener = L_add( old_exc_ener, L_shr( L_mult( old_exc[i], old_exc[i] ), normShiftP2 ) ); /*2*(Q_exc)+1+normShiftP2*/
-            }
-            old_exc_ener = L_shl( Mpy_32_16_1( old_exc_ener, shl( normFacE, normShiftEM1 ) ), 1 ); /*Q31*/
+        /* consider scaling of random noise */
+        fftBufferExp = add( fftBufferExp, CNG_RAND_GAUSS_SHIFT );
 
-            old_exc_ener_exp = 0;
-            move16();
-            old_exc_ener = Sqrt32( old_exc_ener, &old_exc_ener_exp ); /*Q31 - old_exc_ener_exp*/
-            old_exc_ener_exp = add( old_exc_ener_exp, ( sub( 15, Q_exc ) ) );
+        cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q0*/
+        /*
+          Generate Gaussian random noise in real and imaginary parts of the FFT bins
+          Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
+        */
+        IF( hFdCngCom->startBand == 0 )
+        {
+            /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
 
-            /* shift to be in the range of values supported by getNormReciprocalWord16() */
-            N4 = shr( N, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
+            /* DC component in FFT */
 
-            assert( N == ( N4 << CNG_NORM_RECIPROCAL_RANGE_SHIFT ) );
+            /* -s => consider scalefactor adaptation for sqrt calculation */
+            sq = sub( 0, s );
+            sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq );                   /*Q31 - sq*/
+            hFdCngCom->fftBuffer[0] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*q31 - hFdCngCom->fftBuffer_exp*/
+            move32();
+            hFdCngCom->fftBuffer[1] = 0;
+            move32();
 
-            normFacG = getNormReciprocalWord16( N4 );
-            normShiftG = BASOP_util_norm_s_bands2shift( N4 );
-            normShiftGM1 = sub( normShiftG, 1 );
-            normShiftP2 = add( normShiftG, CNG_NORM_RECIPROCAL_RANGE_SHIFT );
+            fftBuffer = hFdCngCom->fftBuffer + 2;
+            cngNoiseLevel++;
 
-            gain = L_deposit_l( 0 );
-            FOR( i = 0; i < N; i++ )
-            {
-                noise32 = rand_gauss( &seed_loc );
-                noise[i] = extract_h( noise32 );
-                move16();
-                gain = L_add( gain, L_shr( L_mult( noise[i], noise[i] ), normShiftP2 ) );
-            }
-            gain = L_shl( Mpy_32_16_1( gain, shl( normFacG, normShiftGM1 ) ), 1 ); /*Q31 - gain_exp*/
+            cnt = sub( cnt, 1 );
+        }
+        ELSE
+        {
+            startBand2 = shl( hFdCngCom->startBand, 1 );
+            set32_fx( hFdCngCom->fftBuffer, 0, startBand2 );
+            fftBuffer = hFdCngCom->fftBuffer + startBand2; /*Q31 - hFdCngCom->fftBuffer_exp*/
+        }
 
-            gain_exp = 2 * CNG_RAND_GAUSS_SHIFT;
-            move16();
-            gain = ISqrt32( gain, &gain_exp ); /*Q31 - gain_exp*/
+        FOR( i = 0; i < cnt; i++ )
+        {
+            /* -1 => weighting with 0.5, -s => consider scalefactor adaptation for sqrt calculation */
+            sq = sub( -1, s );
+            sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq ); /*Q31 - sq*/
 
-            gain = Mpy_32_32( old_exc_ener, gain ); /*Q31 - old_exc_ener_exp - gain_exp*/
-            gain16 = extract_h( gain );             /*Q15 - old_exc_ener_exp - gain_exp*/
+            /* real part in FFT bins */
 
-            gain_exp = add( old_exc_ener_exp, gain_exp );
-            noiseExp = add( CNG_RAND_GAUSS_SHIFT, gain_exp );
+            /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
+            *fftBuffer = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+            move32();
+            fftBuffer++;
 
-            s = sub( 15 - NOISE_HEADROOM, noiseExp );
-            FOR( i = 0; i < N; i++ )
-            {
-#ifdef BASOP_NOGLOB
-                noise[i] = shr_sat( mult( noise[i], gain16 ), s ); /*Q15 - noiseExp*/
-#else
-                noise[i] = shr( mult( noise[i], gain16 ), s );
-#endif
-                move16();
-            }
+            /* imaginary part in FFT bins */
 
-            assert( lpcorder <= 16 );
+            /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
+            *fftBuffer = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+            move32();
+            fftBuffer++;
 
-            s = sub( 15 - NOISE_HEADROOM, ( sub( 15, Q_syn ) ) );
-            FOR( i = 0; i < lpcorder; i++ )
-            {
-#ifdef BASOP_NOGLOB
-                old_syn_pe_tmp[i] = shr_sat( old_syn_pe[i], s ); /*Q0*/
-#else
-                old_syn_pe_tmp[i] = shr( old_syn_pe[i], s );
-#endif
-                move16();
-            }
+            cngNoiseLevel++;
+        }
 
-            E_UTIL_synthesis(
-                0,              /* i  : scaling to apply for a[0]                 Q0   */
-                old_Aq,         /* i  : LP filter coefficients                    Q12  */
-                noise,          /* i  : input signal                              Qx   */
-                noise,          /* o  : output signal                             Qx-s */
-                N,              /* i  : size of filtering                         Q0   */
-                old_syn_pe_tmp, /* i/o: memory associated with this filtering.    Q0 */
-                0,              /* i  : 0=no update, 1=update of memory.          Q0   */
-                lpcorder        /* i  : order of LP filter                        Q0   */
-            );
+        /* remaining FFT bins are set to zero */
+        stopFFTbin2 = shl( hFdCngCom->stopFFTbin, 1 );
+        set32_fx( hFdCngCom->fftBuffer + stopFFTbin2, 0, sub( hFdCngCom->fftlen, stopFFTbin2 ) );
 
-            tmp = old_syn;
-            move16();
 
-            E_UTIL_deemph2(
-                NOISE_HEADROOM,
-                noise,       /* I/O: signal			  Qx */
-                preemph_fac, /* I: deemphasis factor	  Qx */
-                N,           /* I: vector size              */
-                &tmp         /* I/O: memory (signal[-1]) Qx */
-            );
+        /* perform STFT synthesis */
+        assert( hFdCngCom->olapBufferSynth2 != NULL );
+        SynthesisSTFT( hFdCngCom->fftBuffer, fftBufferExp, maskingNoise, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn,
+                       0, hFdCngCom, 0, NULL, -1 /*st->element_mode*/, -1 /*nchan_out*/ );
+        // PMT("parameters need update")
 
-            FOR( i = 0; i < N4; i++ )
+
+        /* add some comfort noise on top of decoded signal */
+        IF( hFdCngCom->frameSize > length )
+        {
+            FOR( i = 0; i < length; i++ )
             {
-                tmp = mult( noise[i], hFdCngCom->olapWinSyn[i].v.re ); /*Q15 - noiseExp*/
-                timeDomainOutput[i] = add( timeDomainOutput[i], tmp );
-                move16();
-                tmp = mult( noise[( i + N4 )], hFdCngCom->olapWinSyn[( ( N4 - 1 ) - i )].v.im ); /*Q15 - noiseExp*/
-                timeDomainOutput[( i + N4 )] = add( timeDomainOutput[( i + N4 )], tmp );
+                timeDomainBuffer[i] = add( timeDomainBuffer[i], shr_r( maskingNoise[i], -Q ) ); /*Q0*/
                 move16();
+            }
+        }
+        ELSE
+        {
+            FOR( i = 0; i < hFdCngCom->frameSize; i++ )
+            {
+                timeDomainBuffer[i] = add_sat( timeDomainBuffer[i], shr_r_sat( maskingNoise[i], -Q ) ); /*Q0*/
                 move16();
             }
         }
     }
-    return;
 }
 
-void generate_comfort_noise_dec_hf_fx(
-    Word32 **bufferReal, /* o   : matrix to real part of input bands  bufferScale*/
-    Word32 **bufferImag, /* o   : matrix to imaginary part of input bands  bufferScale*/
-    Word16 *bufferScale, /* o   : pointer to scalefactor for real and imaginary part of input bands */
-    Decoder_State *st )
+/*-------------------------------------------------------------------
+ * generate_masking_noise_update_seed_fx()
+ *
+ * Update seed for scenarios where generate_masking_noise_fx() is
+ * not called based on signal statistics
+ *-------------------------------------------------------------------*/
+
+void generate_masking_noise_update_seed_fx(
+    HANDLE_FD_CNG_COM hFdCngCom /* i/o : pointer to FD_CNG_COM structure */
+)
 {
-    Word16 i, j, s, sc, sn;
-    Word16 scaleCLDFB;
-    Word32 sqrtNoiseLevel;
-    Word16 randGaussExp;
-    Word16 cngNoiseLevelExp;
     Word16 *seed;
-    Word32 *cngNoiseLevel;
-    Word32 *ptr_level;
-    HANDLE_FD_CNG_COM hFdCngCom = st->hFdCngDec->hFdCngCom;
+    Word16 cnt, i;
 
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
-    move16();
-    ptr_level = cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    /* pointer initializations */
     seed = &( hFdCngCom->seed );
 
-    /* scaleCLDFB: CLDFBinvScalingFactor_EXP + 1 */
-    scaleCLDFB = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
+    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q0*/
 
-    sn = 0;
-    move16();
-    IF( s_and( cngNoiseLevelExp, 1 ) != 0 )
+    IF( hFdCngCom->startBand == 0 )
     {
-        sn = add( sn, 1 );
-        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );
+        rand_gauss( seed ); /*Q15*/
+        cnt = sub( cnt, 1 );
     }
 
-    randGaussExp = CNG_RAND_GAUSS_SHIFT;
-    move16();
-
-    IF( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) )
+    FOR( i = 0; i < cnt; i++ )
     {
+        rand_gauss( seed ); /*Q15*/
+        rand_gauss( seed ); /*Q15*/
+    }
 
-        sc = add( shr( add( cngNoiseLevelExp, CLDFBinvScalingFactor_EXP + 1 - 1 ), 1 ), randGaussExp );
-        move16();
-        assert( ( ( cngNoiseLevelExp + CLDFBinvScalingFactor_EXP + 1 - 1 ) & 1 ) == 0 );
-
-        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
-        {
-            /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */
-            s = 0;
-            move16();
-            sqrtNoiseLevel = Sqrt32( L_shr( Mpy_32_16_1( *ptr_level, scaleCLDFB ), sn ), &s ); /*Q31 - s*/
-
-            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
-            {
-                /* Real part in CLDFB band */
-                bufferReal[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
-                move32();
-                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferReal[i][j],sc));*/
 
-                /* Imaginary part in CLDFB band */
-                bufferImag[i][j] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), s ); /*bufferScale*/
-                move32();
-                /*fprintf(pFile,"%13.10f\n",WORD322FL_SCALE(bufferImag[i][j],sc));*/
-            }
-            ptr_level = ptr_level + 1; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-        }
-        *bufferScale = sub( sc, 15 );
-        move16();
-    }
+    return;
 }
 
-void generate_comfort_noise_dec_hf_ivas_fx(
-    Word32 **bufferReal,         /* o   : matrix to real part of input bands   bufferScale*/
-    Word32 **bufferImag,         /* o   : matrix to imaginary part of input bands  bufferScale*/
-    Word16 *bufferScale,         /* o   : pointer to scalefactor for real and imaginary part of input bands */
-    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables  */
-    const Word16 cng_coh_flag    /* i  : CNG Flag for coherence handling                        Q0*/
-)
+/************************************************************
+ * Generate additional comfort noise (kind of noise filling) *
+ ************************************************************/
+void generate_masking_noise_mdct_fx(
+    Word32 *mdctBuffer,         /* i/o: time-domain signal Q31 - mdctBuffer_e*/
+    Word16 *mdctBuffer_e,       /* i/o: exponent time-domain signal */
+    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
+    ,
+    Word16 L_frame )
 {
-    Word16 i, j, s, sc, sn;
-    Word16 scaleCLDFB;
+    Word16 i, s, s1, s2, sq, cnt;
+    Word16 scaleExp, maskingNoiseExp, cngNoiseLevelExp;
+    Word16 scale, scaleTableSize;
+    Word32 noise;
     Word32 sqrtNoiseLevel;
-    Word16 randGaussExp;
-    Word16 cngNoiseLevelExp;
-    Word16 *seed;
-    Word16 *seed2;
-    Word16 c1, c2;
-    Word32 *ptr_level;
+    Word32 maskingNoise[2 * L_FRAME16k];
+    Word32 *pMaskingNoise;
     Word32 *cngNoiseLevel;
-    Word32 tmp1, tmp2;
+    Word16 *seed;
 
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    // PMTE(); /*IVAS CODE need to be added */
+    /* pointer initializations */
+    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+    seed = &( hFdCngCom->seed );
+
+    /* Compute additional CN level */
     cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
     move16();
-    ptr_level = cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
 
-    seed = &( hFdCngCom->seed );
+    /* Compute additional CN level */
+    scaleTableSize = 18;
+    move16();
+    assert( scaleTableSize == ( sizeof( scaleTable_cn_only ) / sizeof( scaleTable_cn_only[0] ) ) );
 
-    /* scaleCLDFB: CLDFBinvScalingFactor_EXP + 1 */
-    scaleCLDFB = mult( hFdCngCom->invScalingFactor, CLDFB_SCALING ); /*CLDFBinvScalingFactor_EXP + 1*/
+    scale = -1;
+    move16();
+    FOR( i = 0; i < scaleTableSize; i++ )
+    {
+        test();
+        test();
+        IF( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) ) && ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) ) && ( LT_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) ) )
+        {
+            scale = scaleTable_cn_only[i].scale; /*Q14*/
+            move16();
+            BREAK;
+        }
+    }
+    assert( scale >= 0 );
 
-    seed2 = &( hFdCngCom->seed );
+    /* Exclude clean speech */
+    s1 = norm_s( scale );
+    s2 = norm_s( hFdCngCom->likelihood_noisy_speech );
 
-    c1 = 0;
-    move16();
-    c2 = 0;
-    move16();
-    sc = 0;
-    move16();
+    /* scaleTable_cn_only[i].scale is scaled by 1 bit */
+    scaleExp = sub( 1, add( s1, s2 ) );
+    scale = mult_r( shl( scale, s1 ), shl( hFdCngCom->likelihood_noisy_speech, s2 ) ); /*Q15 - scaleExp*/
 
-    IF( cng_coh_flag )
+    /* add exponent of scale and cngNoiseLevel */
+    maskingNoiseExp = add( scaleExp, cngNoiseLevelExp );
+
+    /* even scalefactor needed for sqrt calculation */
+    s = s_and( maskingNoiseExp, 1 );
+    maskingNoiseExp = add( maskingNoiseExp, s );
+
+    /* sqrt calculation => shift exponent */
+    maskingNoiseExp = shr( maskingNoiseExp, 1 );
+
+    /* consider scaling of random noise */
+    maskingNoiseExp = add( maskingNoiseExp, CNG_RAND_GAUSS_SHIFT );
+
+    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q0*/
+
+    /*
+      Generate Gaussian random noise in real and imaginary parts of the FFT bins
+      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
+    */
+    IF( hFdCngCom->startBand == 0 )
     {
-        seed2 = &( hFdCngCom->seed2 );
+        /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
 
-        s = 0;
-        move16();
+        /* DC component in FFT */
 
-        c1 = Sqrt16( hFdCngCom->coherence_fx, &s ); /*Q15 - s*/
-        c1 = shl( c1, s );                          // Q15
+        /* -1 => weighting with 0.5, -s => consider scalefactor adaptation for sqrt calculation */
+        sq = sub( -1, s );
+        sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq );           /*Q31 - sq*/
+        maskingNoise[0] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q15*/
+        move32();
 
-        s = 0;
-        move16();
-        c2 = Sqrt16( sub( MAX16B, hFdCngCom->coherence_fx ), &s ); /*Q15 - s*/
-        c2 = shl( c2, s );                                         // Q15
+        pMaskingNoise = &maskingNoise[1]; /*Q15*/
+        cngNoiseLevel++;
+
+        cnt = sub( cnt, 1 );
+    }
+    ELSE
+    {
+        set32_fx( maskingNoise, 0, hFdCngCom->startBand );
+        pMaskingNoise = maskingNoise + hFdCngCom->startBand; /*Q15*/
     }
 
-    sn = 0;
-    move16();
-    IF( s_and( cngNoiseLevelExp, 1 ) != 0 )
-    {
-        sn = add( sn, 1 );
-        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );
-        move16();
+    FOR( i = 0; i < cnt; i++ )
+    {
+        /* -1 => weighting with 0.5, -s => consider scalefactor adaptation for sqrt calculation */
+        sq = sub( -1, s );
+        sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq ); /*Q31 - sq*/
+
+        /* real part in FFT bins */
+
+        /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
+        *pMaskingNoise = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q15*/
+        move32();
+        pMaskingNoise++;
+
+        cngNoiseLevel++;
     }
 
-    randGaussExp = CNG_RAND_GAUSS_SHIFT + 1;
-    move16();
-
-    /*
-      Generate Gaussian random noise in real and imaginary parts of the CLDFB bands
-      Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each band
+    /* re-normalization of energy level
+       16 * 0.79056941504 = sqrt(NORM_MDCT_FACTOR)
     */
-    IF( LT_16( hFdCngCom->numCoreBands, hFdCngCom->regularStopBand ) )
-    {
-        sc = add( shr( add( cngNoiseLevelExp, CLDFBinvScalingFactor_EXP + 1 - 1 ), 1 ), randGaussExp );
-        move16();
-        assert( ( ( cngNoiseLevelExp + CLDFBinvScalingFactor_EXP + 1 - 1 ) & 1 ) == 0 );
+    assert( NORM_MDCT_FACTOR == 160 );
 
-        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )
+    /* do weighting with factor 0.79056941504 later */
+    maskingNoiseExp = add( maskingNoiseExp, 4 );
+
+    s = s_max( *mdctBuffer_e, maskingNoiseExp );
+    s1 = sub( s, *mdctBuffer_e );
+    s2 = sub( s, maskingNoiseExp );
+
+    /* avoid rescaling of mdct samples if no comfort noise is added */
+    IF( scale != 0 )
+    {
+        /* Add some comfort noise on top of decoded signal */
+        IF( s1 == 0 )
         {
-            FOR( i = 0; i < hFdCngCom->numSlots; i++ )
+            FOR( i = 0; i < hFdCngCom->stopFFTbin; i++ )
             {
-                /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */
-                s = 0;
-                move16();
-                sqrtNoiseLevel = Sqrt32( L_shr( Mpy_32_16_1( *ptr_level, scaleCLDFB ), sn ), &s ); /*Q31 - s*/
+                /* If shifting negative noise values the lowest result is -1 but never 0.
+                   Shift positive noise values to avoid unwanted amplification of these small values later */
+                noise = L_shr( Mpy_32_16_1( L_abs( maskingNoise[i] ), 25905 /*0.79056941504 Q15*/ ), s2 ); /*Q31 - maskingNoiseExp - s2*/
 
-                IF( cng_coh_flag )
+                if ( maskingNoise[i] < 0 )
                 {
-                    rand_gauss_fx( &tmp1, seed, Q28 );  /*Q28*/
-                    rand_gauss_fx( &tmp2, seed2, Q28 ); /*Q28*/
-
-                    bufferReal[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*bufferScale*/
-                    move32();
-                    bufferReal[i][j] = L_shl( Mpy_32_32( bufferReal[i][j], sqrtNoiseLevel ), s ); /*bufferScale*/
-                    move32();
-
-                    rand_gauss_fx( &tmp1, seed, Q28 );  /*Q28*/
-                    rand_gauss_fx( &tmp2, seed2, Q28 ); /*Q28*/
-
-                    bufferImag[i][j] = L_add( Mpy_32_16_1( tmp1, c1 ), Mpy_32_16_1( tmp2, c2 ) ); /*bufferScale*/
-                    move32();
-                    bufferImag[i][j] = L_shl( Mpy_32_32( bufferImag[i][j], sqrtNoiseLevel ), s ); /*bufferScale*/
-                    move32();
+                    noise = L_negate( noise );
                 }
-                ELSE
-                {
-                    /* Real part in CLDFB band */
-                    bufferReal[i][j] = L_shl( Mpy_32_32( L_shr( rand_gauss( seed ), 1 ), sqrtNoiseLevel ), s ); /*bufferScale*/
-                    move32();
 
-                    /* Imaginary part in CLDFB band */
-                    bufferImag[i][j] = L_shl( Mpy_32_32( L_shr( rand_gauss( seed ), 1 ), sqrtNoiseLevel ), s ); /*bufferScale*/
-                    move32();
-                }
+                mdctBuffer[i] = L_add( mdctBuffer[i], noise ); /*Q31 - s*/
+                move32();
             }
-            ptr_level = ptr_level + 1; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
         }
-        *bufferScale = sub( sc, 15 );
-        move16();
+        ELSE
+        {
+            FOR( i = 0; i < hFdCngCom->stopFFTbin; i++ )
+            {
+                mdctBuffer[i] = L_add( L_shr( mdctBuffer[i], s1 ),
+                                       Mpy_32_16_1( maskingNoise[i], 25905 /*0.79056941504 Q15*/ ) ); /*Q31 - s*/
+                move32();
+            }
+            FOR( i = hFdCngCom->stopFFTbin; i < L_frame; i++ )
+            {
+                mdctBuffer[i] = L_shr( mdctBuffer[i], s1 ); /*Q31 - s*/
+                move32();
+            }
+            *mdctBuffer_e = s;
+            move16();
+        }
     }
-
-    return;
 }
 
-
-/*
-    generate_masking_noise_fx
-
-    Parameters:
-
-    timeDomainBuffer       i/o : pointer to time domain output buffer 15Q0
-    st                     i/o : pointer to FD_CNG_COM structure
-    bitrate                i   : bitrate
-
-    Function:
-    Generate additional comfort noise (kind of noise filling)
-
-    Returns: none
-
-    void
-*/
-void generate_masking_noise_fx(
-    Word16 *timeDomainBuffer, /* i/o : pointer to time domain output buffer 15Q0 */
-    Word16 Q,
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o : pointer to FD_CNG_COM structure */
-    ,
-    Word16 length, /*Q0*/
-    Word16 core /*Q0*/ )
+void generate_masking_noise_mdct_ivas_fx(
+    Word32 *mdctBuffer,   /* i/o: time-domain signal Q31 - mdctBuffer_e*/
+    Word16 *mdctBuffer_e, /* i/o: exponent time-domain signal */
+    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ )
 {
-    Word16 i, s, s1, s2, sq, cnt, startBand2, stopFFTbin2;
-    Word16 scaleExp, fftBufferExp, cngNoiseLevelExp;
-    Word16 scale, scaleTableSize;
-    Word16 maskingNoise[L_FRAME16k];
+    Word16 i, sq, cnt;
+    Word16 cngNoiseLevelExp;
+    Word32 scale, temp;
     Word32 sqrtNoiseLevel;
+    Word32 maskingNoise[2 * L_FRAME16k];
+    Word32 *pMaskingNoise;
     Word32 *cngNoiseLevel;
-    Word32 *fftBuffer;
     Word16 *seed;
 
     // PMTE(); /*IVAS CODE need to be added */
-
     /* pointer initializations */
     cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-    fftBuffer = hFdCngCom->fftBuffer;         /*Q31 - hFdCngCom->fftBuffer_exp*/
     seed = &( hFdCngCom->seed );
 
     /* Compute additional CN level */
     cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
     move16();
 
-    IF( NE_16( core, AMR_WB_CORE ) )
-    {
-        scaleTableSize = 18;
-        move16();
-        assert( scaleTableSize == ( sizeof( scaleTable_cn_only ) / sizeof( scaleTable_cn_only[0] ) ) );
+    scale = ONE_IN_Q30;
+    move32();
 
-        scale = -1;
-        move16();
-        FOR( i = 0; i < scaleTableSize; i++ )
-        {
-            test();
-            test();
-            IF( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) ) && ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) ) && ( LT_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) ) )
+    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
 
-            {
-                scale = scaleTable_cn_only[i].scale; /*Q14*/
-                move16();
-                BREAK;
-            }
-        }
-        assert( scale >= 0 );
-    }
-    ELSE
+    /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
+    IF( hFdCngCom->likelihood_noisy_speech > 0 )
     {
-        scaleTableSize = 3;
-        move16();
-        assert( scaleTableSize == ( sizeof( scaleTable_cn_only_amrwbio ) / sizeof( scaleTable_cn_only_amrwbio[0] ) ) );
-
-        scale = 0;
-        move16();
-        FOR( i = 0; i < scaleTableSize; i++ )
+        FOR( i = 0; i < SIZE_SCALE_TABLE_CN; i++ )
         {
-            IF( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only_amrwbio[i][0] ) )
+            test();
+            test();
+            IF( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) &&
+                GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) &&
+                LE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) )
             {
-                scale = scaleTable_cn_only_amrwbio[i][1]; /*Q14*/
-                move16();
                 BREAK;
             }
         }
-    }
-
-    /* Exclude clean speech */
-
-    s1 = norm_s( scale );
-    s2 = norm_s( hFdCngCom->likelihood_noisy_speech );
-
-    /* scaleTable_cn_only[i].scale is scaled by 1 bit */
-    scaleExp = sub( 1, add( s1, s2 ) );
-    scale = mult_r( shl( scale, s1 ), shl( hFdCngCom->likelihood_noisy_speech, s2 ) ); /*Q15 - scaleExp*/
-
-    {
-        /* add exponent of scale and cngNoiseLevel */
-        fftBufferExp = add( scaleExp, cngNoiseLevelExp );
-
-        /* even scalefactor needed for sqrt calculation */
-        s = s_and( fftBufferExp, 1 );
-        fftBufferExp = add( fftBufferExp, s );
-
-        /* sqrt calculation => shift exponent */
-        fftBufferExp = shr( fftBufferExp, 1 );
 
-        /* consider scaling of random noise */
-        fftBufferExp = add( fftBufferExp, CNG_RAND_GAUSS_SHIFT );
+        /* Exclude clean speech */
+        scale = L_mult( scaleTable_cn_only[i].scale, hFdCngCom->likelihood_noisy_speech ); // Q30 (14 + 15 + 1)
 
-        cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q0*/
         /*
           Generate Gaussian random noise in real and imaginary parts of the FFT bins
           Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
         */
         IF( hFdCngCom->startBand == 0 )
         {
-            /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
+            /* *cngNoiseLevel * scale * 0.5 */
+            temp = Mpy_32_32( *cngNoiseLevel, scale ); // exp = cngNoiseLevelExp (cngNoiseLevelExp + Q30(scale) + 1(0.5f) - 31)
+            sq = cngNoiseLevelExp;
+            move16();
 
-            /* DC component in FFT */
+            sqrtNoiseLevel = Sqrt32( temp, &sq ); /*Q31 - sq*/
 
-            /* -s => consider scalefactor adaptation for sqrt calculation */
-            sq = sub( 0, s );
-            sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq );                   /*Q31 - sq*/
-            hFdCngCom->fftBuffer[0] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*q31 - hFdCngCom->fftBuffer_exp*/
+            rand_gauss_fx( &temp, seed, Q15 ); // Q15
+
+            maskingNoise[0] = L_shl( Mpy_32_32( temp, sqrtNoiseLevel ), sq ); // Q15
             move32();
-            hFdCngCom->fftBuffer[1] = 0;
+
+            pMaskingNoise = &maskingNoise[1]; /*Q15*/
+            cngNoiseLevel++;
+            cnt = sub( cnt, 1 );
+        }
+        ELSE
+        {
+            set32_fx( maskingNoise, 0, hFdCngCom->startBand );
+            pMaskingNoise = maskingNoise + hFdCngCom->startBand; /*Q15*/
+        }
+
+        FOR( i = 0; i < cnt; i++ )
+        {
+            /* MDCT bins */
+            /* *cngNoiseLevel * scale * 0.5 */
+            temp = Mpy_32_32( *cngNoiseLevel, scale ); // exp = cngNoiseLevelExp (cngNoiseLevelExp + Q30(scale) + 1(0.5f) - 31)
+            sq = cngNoiseLevelExp;
+            move16();
+
+            sqrtNoiseLevel = Sqrt32( temp, &sq ); /*Q31 - sq*/
+
+            rand_gauss_fx( &temp, seed, Q15 ); // Q15
+
+            *pMaskingNoise = L_shl( Mpy_32_32( temp, sqrtNoiseLevel ), sq ); // Q15
             move32();
 
-            fftBuffer = hFdCngCom->fftBuffer + 2;
+            pMaskingNoise++;
+            cngNoiseLevel++;
+        }
+
+        /*re-normalization of energy level: M/sqrt(2)*/
+        v_multc_fixed( maskingNoise, SQRT_NORM_MDCT_FACTOR_Q27, maskingNoise, hFdCngCom->stopFFTbin ); // Q11
+
+        scale_sig32( maskingNoise, hFdCngCom->stopFFTbin, sub( 20, *mdctBuffer_e ) ); // exp = *mdctBuffer_e
+
+        /* Add some comfort noise on top of decoded signal */
+        v_add_fixed( maskingNoise, mdctBuffer, mdctBuffer, hFdCngCom->stopFFTbin, 1 );
+        *mdctBuffer_e = sub( *mdctBuffer_e, 1 );
+        move16();
+    }
+    ELSE
+    {
+        /* very low level case - just update random seeds */
+        IF( hFdCngCom->startBand == 0 )
+        {
+            rand_gauss_fx( &maskingNoise[0], seed, Q15 ); // Q15
             cngNoiseLevel++;
-
             cnt = sub( cnt, 1 );
         }
-        ELSE
-        {
-            startBand2 = shl( hFdCngCom->startBand, 1 );
-            set32_fx( hFdCngCom->fftBuffer, 0, startBand2 );
-            fftBuffer = hFdCngCom->fftBuffer + startBand2; /*Q31 - hFdCngCom->fftBuffer_exp*/
-        }
 
         FOR( i = 0; i < cnt; i++ )
         {
-            /* -1 => weighting with 0.5, -s => consider scalefactor adaptation for sqrt calculation */
-            sq = sub( -1, s );
-            sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq ); /*Q31 - sq*/
+            rand_gauss_fx( &maskingNoise[0], seed, Q15 ); // Q15
+            move32();
+        }
+    }
 
-            /* real part in FFT bins */
+    return;
+}
 
-            /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
-            *fftBuffer = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q31 - hFdCngCom->fftBuffer_exp*/
-            move32();
-            fftBuffer++;
 
-            /* imaginary part in FFT bins */
+/*-------------------------------------------------------------------
+ * initFdCngDec()
+ *
+ * Initialize an instance of type FD_CNG
+ *-------------------------------------------------------------------*/
+void configureFdCngDec_ivas_fx(
+    HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: Contains the variables related to the FD-based CNG process */
+    const Word16 bwidth,         /*Q0*/
+    const Word32 total_brate,    /*Q0*/
+    const Word16 L_frame,        /*Q0*/
+    const Word16 last_L_frame,   /*Q0*/
+    const Word16 element_mode /*Q0*/ )
+{
+    Word16 j, stopBandFR;
+    HANDLE_FD_CNG_COM hsCom = hFdCngDec->hFdCngCom;
 
-            /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
-            *fftBuffer = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+    hsCom->CngBandwidth = bwidth; /*Q0*/
+    move16();
+    if ( EQ_16( hsCom->CngBandwidth, FB ) )
+    {
+        hsCom->CngBandwidth = SWB;
+        move16();
+    }
+    test();
+    IF( NE_32( total_brate, FRAME_NO_DATA ) && NE_32( total_brate, SID_2k40 ) )
+    {
+        hsCom->CngBitrate = total_brate; /*Q0*/
+        move32();
+    }
+    ELSE IF( EQ_32( hsCom->CngBitrate, -1 ) )
+    {
+        /* set minimum active CBR bitrate IF CngBitrate is uninitialized */
+        IF( element_mode > EVS_MONO )
+        {
+            hsCom->CngBitrate = IVAS_13k2;
             move32();
-            fftBuffer++;
-
-            cngNoiseLevel++;
         }
+        ELSE
+        {
+            hsCom->CngBitrate = ACELP_7k20;
+            move32();
+        }
+    }
 
-        /* remaining FFT bins are set to zero */
-        stopFFTbin2 = shl( hFdCngCom->stopFFTbin, 1 );
-        set32_fx( hFdCngCom->fftBuffer + stopFFTbin2, 0, sub( hFdCngCom->fftlen, stopFFTbin2 ) );
-
-
-        /* perform STFT synthesis */
-        assert( hFdCngCom->olapBufferSynth2 != NULL );
-        SynthesisSTFT( hFdCngCom->fftBuffer, fftBufferExp, maskingNoise, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn,
-                       0, hFdCngCom, 0, NULL, -1 /*st->element_mode*/, -1 /*nchan_out*/ );
-        // PMT("parameters need update")
+    /* FD-CNG config for MDCT-Stereo is always the same (since for > 48 kbps only) */
+    /* This may need adjustment in the future IF 2TC DTX for some mode uses MDCT-Stereo DTX for lower bitrates too */
+    if ( EQ_16( element_mode, IVAS_CPE_MDCT ) )
+    {
+        hsCom->CngBitrate = IVAS_48k;
+        move32();
+    }
+    hsCom->numSlots = 16;
+    move32();
 
+    /* NB configuration */
+    IF( EQ_16( bwidth, NB ) )
+    {
+        hsCom->FdCngSetup = FdCngSetup_nb;
+        hsCom->numCoreBands = 16;
+        move16();
+        hsCom->regularStopBand = 16;
+        move16();
+    }
 
-        /* add some comfort noise on top of decoded signal */
-        IF( hFdCngCom->frameSize > length )
+    /* WB configuration */
+    ELSE IF( EQ_16( bwidth, WB ) )
+    {
+        /* FFT 6.4kHz, no CLDFB */
+        test();
+        test();
+        IF( LE_32( hsCom->CngBitrate, ACELP_8k00 ) && EQ_16( L_frame, L_FRAME ) )
         {
-            FOR( i = 0; i < length; i++ )
+            hsCom->FdCngSetup = FdCngSetup_wb1;
+            hsCom->numCoreBands = 16;
+            move16();
+            hsCom->regularStopBand = 16;
+            move16();
+        }
+        /* FFT 6.4kHz, CLDFB 8.0kHz */
+        ELSE IF( LE_32( hsCom->CngBitrate, ACELP_13k20 ) || EQ_16( L_frame, L_FRAME ) )
+        {
+            hsCom->FdCngSetup = FdCngSetup_wb2;
+            hsCom->numCoreBands = 16;
+            move16();
+            hsCom->regularStopBand = 20;
+            move16();
+            IF( EQ_16( L_frame, L_FRAME16k ) )
             {
-                timeDomainBuffer[i] = add( timeDomainBuffer[i], shr_r( maskingNoise[i], -Q ) ); /*Q0*/
+                hsCom->FdCngSetup = FdCngSetup_wb2;
+                hsCom->numCoreBands = 20;
+                move16();
+                hsCom->regularStopBand = 20;
+                move16();
+                hsCom->FdCngSetup.fftlen = 640;
+                move16();
+                hsCom->FdCngSetup.stopFFTbin = 256;
                 move16();
             }
         }
+        /* FFT 8.0kHz, no CLDFB */
         ELSE
         {
-            FOR( i = 0; i < hFdCngCom->frameSize; i++ )
+            hsCom->FdCngSetup = FdCngSetup_wb3;
+            hsCom->numCoreBands = 20;
+            move16();
+            hsCom->regularStopBand = 20;
+            move16();
+        }
+    }
+
+    /* SWB/FB configuration */
+    ELSE
+    {
+        /* FFT 6.4kHz, CLDFB 14kHz */
+        IF( EQ_16( L_frame, L_FRAME ) )
+        {
+            hsCom->FdCngSetup = FdCngSetup_swb1;
+            hsCom->numCoreBands = 16;
+            move16();
+            hsCom->regularStopBand = 35;
+            move16();
+        }
+        /* FFT 8.0kHz, CLDFB 16kHz */
+        ELSE
+        {
+            hsCom->FdCngSetup = FdCngSetup_swb2;
+            hsCom->numCoreBands = 20;
+            move16();
+            hsCom->regularStopBand = 40;
+            move16();
+            test();
+            if ( EQ_16( last_L_frame, L_FRAME ) && EQ_16( element_mode, IVAS_CPE_DFT ) )
             {
-#ifdef BASOP_NOGLOB
-                timeDomainBuffer[i] = add_sat( timeDomainBuffer[i], shr_r_sat( maskingNoise[i], -Q ) ); /*Q0*/
-#else
-                timeDomainBuffer[i] = add( timeDomainBuffer[i], shr_r( maskingNoise[i], -Q ) );
-#endif
+                hsCom->regularStopBand = 35;
                 move16();
             }
         }
     }
-}
 
-/*-------------------------------------------------------------------
- * generate_masking_noise_update_seed_fx()
- *
- * Update seed for scenarios where generate_masking_noise_fx() is
- * not called based on signal statistics
- *-------------------------------------------------------------------*/
 
-void generate_masking_noise_update_seed_fx(
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o : pointer to FD_CNG_COM structure */
-)
-{
-    Word16 *seed;
-    Word16 cnt, i;
+    hsCom->fftlen = hsCom->FdCngSetup.fftlen;
+    move16();
+    hsCom->stopFFTbin = hsCom->FdCngSetup.stopFFTbin;
+    move16();
 
-    /* pointer initializations */
-    seed = &( hFdCngCom->seed );
+    /* Configure the SID quantizer and the Comfort Noise Generator */
 
-    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q0*/
+    hsCom->startBand = 2;
+    move16();
+    hsCom->stopBand = add( hsCom->FdCngSetup.sidPartitions[( hsCom->FdCngSetup.numPartitions - 1 )], 1 ); /*Q0*/
+    initPartitions( hsCom->FdCngSetup.sidPartitions, hsCom->FdCngSetup.numPartitions, hsCom->startBand, hsCom->stopBand, hsCom->part, &hsCom->npart, hsCom->midband, hsCom->psize, hsCom->psize_norm, &hsCom->psize_norm_exp, hsCom->psize_inv, 0 );
 
-    IF( hFdCngCom->startBand == 0 )
+    IF( EQ_16( hsCom->stopFFTbin, 160 ) )
     {
-        rand_gauss( seed ); /*Q15*/
-        cnt = sub( cnt, 1 );
+        hsCom->nFFTpart = 17;
+        move16();
     }
-
-    FOR( i = 0; i < cnt; i++ )
+    ELSE IF( EQ_16( hsCom->stopFFTbin, 256 ) )
     {
-        rand_gauss( seed ); /*Q15*/
-        rand_gauss( seed ); /*Q15*/
+        hsCom->nFFTpart = 20;
+        move16();
+    }
+    ELSE
+    {
+        hsCom->nFFTpart = 21;
+        move16();
+    }
+    hsCom->nCLDFBpart = sub( hsCom->npart, hsCom->nFFTpart ); /*Q0*/
+    move16();
+    FOR( j = 0; j < hsCom->nCLDFBpart; j++ )
+    {
+        hsCom->CLDFBpart[j] = sub( hsCom->part[( j + hsCom->nFFTpart )], sub( hsCom->stopFFTbin, hsCom->startBand ) ); /*Q0*/
+        move16();
+        hsCom->CLDFBpsize_inv[j] = hsCom->psize_inv[( j + hsCom->nFFTpart )];
+        move16();
     }
 
+    stopBandFR = 40; //(Word16)floor(1000.f /*Hz*/ / 25.f /*Hz/Bin*/);
+    move16();
+    if ( GT_16( stopBandFR, hsCom->stopFFTbin ) )
+    {
+        stopBandFR = hsCom->stopFFTbin; /*Q0*/
+        move16();
+    }
 
-    return;
-}
-
-/************************************************************
- * Generate additional comfort noise (kind of noise filling) *
- ************************************************************/
-void generate_masking_noise_mdct_fx(
-    Word32 *mdctBuffer,         /* i/o: time-domain signal Q31 - mdctBuffer_e*/
-    Word16 *mdctBuffer_e,       /* i/o: exponent time-domain signal */
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
-    ,
-    Word16 L_frame )
-{
-    Word16 i, s, s1, s2, sq, cnt;
-    Word16 scaleExp, maskingNoiseExp, cngNoiseLevelExp;
-    Word16 scale, scaleTableSize;
-    Word32 noise;
-    Word32 sqrtNoiseLevel;
-    Word32 maskingNoise[2 * L_FRAME16k];
-    Word32 *pMaskingNoise;
-    Word32 *cngNoiseLevel;
-    Word16 *seed;
-
-    // PMTE(); /*IVAS CODE need to be added */
-    /* pointer initializations */
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-    seed = &( hFdCngCom->seed );
+    initPartitions( hsCom->FdCngSetup.shapingPartitions, hsCom->FdCngSetup.numShapingPartitions, hsCom->startBand, hsCom->stopFFTbin, hFdCngDec->part_shaping, &hFdCngDec->npart_shaping, hFdCngDec->midband_shaping, hFdCngDec->psize_shaping, hFdCngDec->psize_shaping_norm, &hFdCngDec->psize_shaping_norm_exp, hFdCngDec->psize_inv_shaping, stopBandFR );
 
-    /* Compute additional CN level */
-    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
+    hFdCngDec->nFFTpart_shaping = hFdCngDec->npart_shaping; /*Q0*/
     move16();
 
-    /* Compute additional CN level */
-    scaleTableSize = 18;
-    move16();
-    assert( scaleTableSize == ( sizeof( scaleTable_cn_only ) / sizeof( scaleTable_cn_only[0] ) ) );
+    BASOP_getTables( &hsCom->olapWinAna, NULL, NULL, shr( hsCom->fftlen, 1 ) );
+    BASOP_getTables( &hsCom->olapWinSyn, NULL, NULL, shr( hsCom->fftlen, 2 ) );
 
-    scale = -1;
-    move16();
-    FOR( i = 0; i < scaleTableSize; i++ )
+    SWITCH( hsCom->fftlen )
     {
-        test();
-        test();
-        IF( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) ) && ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) ) && ( LT_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) ) )
-        {
-            scale = scaleTable_cn_only[i].scale; /*Q14*/
+        case 512:
+            hsCom->olapWinAna_fx = olapWinAna512_fx; /*Q30*/
+            hsCom->fftSineTab_fx = NULL;
+            hsCom->olapWinSyn_fx = olapWinSyn256_fx; /*Q15*/
+            hsCom->fftlenShift = 8;
+            move16();
+            hsCom->fftlenFac = 32767 /*1.0 Q15*/;
+            move16();
+            BREAK;
+        case 640:
+            hsCom->olapWinAna_fx = olapWinAna640_fx; /*Q30*/
+            hsCom->fftSineTab_fx = fftSineTab640_fx; /*Q15*/
+            hsCom->olapWinSyn_fx = olapWinSyn320_fx; /*Q15*/
+            hsCom->fftlenShift = 9;
+            move16();
+            hsCom->fftlenFac = 20480 /*0.625 Q15*/;
             move16();
             BREAK;
-        }
+        default:
+            assert( !"Unsupported FFT length for FD-based CNG" );
+            BREAK;
     }
-    assert( scale >= 0 );
+    BASOP_getTables( &hsCom->olapWinAna, NULL, NULL, shr( hsCom->fftlen, 1 ) );
+    BASOP_getTables( &hsCom->olapWinSyn, NULL, NULL, shr( hsCom->fftlen, 2 ) );
+    hsCom->frameSize = shr( hsCom->fftlen, 1 );
 
-    /* Exclude clean speech */
-    s1 = norm_s( scale );
-    s2 = norm_s( hFdCngCom->likelihood_noisy_speech );
+    return;
+}
 
-    /* scaleTable_cn_only[i].scale is scaled by 1 bit */
-    scaleExp = sub( 1, add( s1, s2 ) );
-    scale = mult_r( shl( scale, s1 ), shl( hFdCngCom->likelihood_noisy_speech, s2 ) ); /*Q15 - scaleExp*/
+/*-------------------------------------------------------------------
+ * FdCng_decodeSID_ivas_fx()
+ *
+ * Decode the FD-CNG bitstream
+ *-------------------------------------------------------------------*/
 
-    /* add exponent of scale and cngNoiseLevel */
-    maskingNoiseExp = add( scaleExp, cngNoiseLevelExp );
+void FdCng_decodeSID_ivas_fx(
+    Decoder_State *st /* i/o: decoder state structure */
+)
+{
+    Word16 N;
+    Word32 *sidNoiseEst;
+    Word32 gain;
+    Word16 i, index;
+    Word32 v[32];
+    Word16 indices[32];
+    HANDLE_FD_CNG_COM hFdCngCom;
+    Word32 *invTrfMatrix_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
+    Word16 tmp16;
 
-    /* even scalefactor needed for sqrt calculation */
-    s = s_and( maskingNoiseExp, 1 );
-    maskingNoiseExp = add( maskingNoiseExp, s );
+    IF( st->element_mode == EVS_MONO )
+    {
+        tmp16 = GAIN_Q_OFFSET_EVS_FX_Q0;
+        move16();
+    }
+    ELSE
+    {
+        tmp16 = GAIN_Q_OFFSET_IVAS_FX_Q0;
+        move16();
+    }
 
-    /* sqrt calculation => shift exponent */
-    maskingNoiseExp = shr( maskingNoiseExp, 1 );
+    const Word16 gain_q_offset = tmp16; /* Q0 */
+    move16();
 
-    /* consider scaling of random noise */
-    maskingNoiseExp = add( maskingNoiseExp, CNG_RAND_GAUSS_SHIFT );
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /*Q31*/
 
-    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q0*/
+    hFdCngCom = ( st->hFdCngDec )->hFdCngCom;
 
-    /*
-      Generate Gaussian random noise in real and imaginary parts of the FFT bins
-      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
-    */
-    IF( hFdCngCom->startBand == 0 )
-    {
-        /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
+    sidNoiseEst = hFdCngCom->sidNoiseEst; /*Q16*/
 
-        /* DC component in FFT */
+    N = hFdCngCom->npart; /*Q0*/
+    move16();
+    gain = 0;
+    move32();
+    hFdCngCom->sid_frame_counter = add( hFdCngCom->sid_frame_counter, 1 );
+    move16();
 
-        /* -1 => weighting with 0.5, -s => consider scalefactor adaptation for sqrt calculation */
-        sq = sub( -1, s );
-        sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq );           /*Q31 - sq*/
-        maskingNoise[0] = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q15*/
-        move32();
+    /* Read bitstream */
+    FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
+    {
+        indices[i] = get_next_indice_fx( st, bits_37bits[i] ); /*Q0*/
+        move16();
+    }
 
-        pMaskingNoise = &maskingNoise[1]; /*Q15*/
-        cngNoiseLevel++;
+    index = get_next_indice_fx( st, 7 );
 
-        cnt = sub( cnt, 1 );
+    /* MSVQ decoder */
+
+    IF( st->element_mode != EVS_MONO )
+    {
+        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );
+        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, v, NULL, 7 );
     }
     ELSE
+    { /* Legacy EVS_MONO MSVQ tables */
+        msvq_dec_fx( cdk_37bits, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v, NULL, 7 );
+    }
+
+
+    /* Decode gain */
+    // gain = ((float)index - gain_q_offset) / 1.5f;
+    gain = L_mult0( sub( index, gain_q_offset ), 21845 ); // Q15
+
+    /* Apply gain and undo log */
+    Word16 res_exp[NPART];
+    Word16 max_res_exp = 0;
+    move16();
+    FOR( i = 0; i < N; i++ )
     {
-        set32_fx( maskingNoise, 0, hFdCngCom->startBand );
-        pMaskingNoise = maskingNoise + hFdCngCom->startBand; /*Q15*/
+        sidNoiseEst[i] = BASOP_util_Pow2( Mpy_32_32( L_add( v[i], gain ), LOG_10_BASE_2_BY_10_Q31 ), Q16, &res_exp[i] ); /*Q31 - res_exp[i]*/
+        move32();
+        if ( LT_16( max_res_exp, res_exp[i] ) )
+        {
+            max_res_exp = res_exp[i];
+            move16();
+        }
     }
 
-    FOR( i = 0; i < cnt; i++ )
+    FOR( i = 0; i < N; i++ )
     {
-        /* -1 => weighting with 0.5, -s => consider scalefactor adaptation for sqrt calculation */
-        sq = sub( -1, s );
-        sqrtNoiseLevel = Sqrt32( Mpy_32_16_1( *cngNoiseLevel, scale ), &sq ); /*Q31 - sq*/
+        sidNoiseEst[i] = L_shr( sidNoiseEst[i], sub( max_res_exp, res_exp[i] ) ); /*Q31 - max_res_exp*/
+        move32();
+    }
 
-        /* real part in FFT bins */
+    hFdCngCom->sidNoiseEstExp = max_res_exp;
+    move16();
 
-        /* random noise is scaled by CNG_RAND_GAUSS_SHIFT bits */
-        *pMaskingNoise = L_shl( Mpy_32_32( rand_gauss( seed ), sqrtNoiseLevel ), sq ); /*Q15*/
+    /* NB last band energy compensation */
+
+    IF( hFdCngCom->CngBandwidth == NB )
+    {
+        sidNoiseEst[( N - 1 )] = Mpy_32_16_1( sidNoiseEst[( N - 1 )], NB_LAST_BAND_SCALE ); /*Q31 - max_res_exp*/
         move32();
-        pMaskingNoise++;
+    }
 
-        cngNoiseLevel++;
+    test();
+    IF( EQ_16( hFdCngCom->CngBandwidth, SWB ) && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
+    {
+        sidNoiseEst[( N - 1 )] = Mpy_32_16_1( sidNoiseEst[( N - 1 )], SWB_13k2_LAST_BAND_SCALE ); /*Q31 - max_res_exp*/
+        move32();
     }
 
-    /* re-normalization of energy level
-       16 * 0.79056941504 = sqrt(NORM_MDCT_FACTOR)
-    */
-    assert( NORM_MDCT_FACTOR == 160 );
+    scalebands( sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );
+    Word16 shift1 = L_norm_arr( hFdCngCom->cngNoiseLevel, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) );
+    Word16 shift2 = L_norm_arr( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ) );
+    Word16 shift = s_max( sub( hFdCngCom->sidNoiseEstExp, shift1 ), sub( hFdCngCom->cngNoiseLevelExp, shift2 ) );
 
-    /* do weighting with factor 0.79056941504 later */
-    maskingNoiseExp = add( maskingNoiseExp, 4 );
+    scale_sig32( hFdCngCom->cngNoiseLevel, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( hFdCngCom->sidNoiseEstExp, shift ) );
+    scale_sig32( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ), sub( hFdCngCom->cngNoiseLevelExp, shift ) );
 
-    s = s_max( *mdctBuffer_e, maskingNoiseExp );
-    s1 = sub( s, *mdctBuffer_e );
-    s2 = sub( s, maskingNoiseExp );
+    hFdCngCom->cngNoiseLevelExp = shift;
+    move16();
 
-    /* avoid rescaling of mdct samples if no comfort noise is added */
-    IF( scale != 0 )
+    lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, st->preemph_fac );
+
+    return;
+}
+
+/*-------------------------------------------------------------------
+ * generate_masking_noise_ivas_fx()
+ *
+ * Generate additional comfort noise (kind of noise filling)
+ *-------------------------------------------------------------------*/
+
+void generate_masking_noise_ivas_fx(
+    Word32 *timeDomainBuffer,         /* i/o: time-domain signal Q31 - *exp_out*/
+    Word16 *exp_out,                  /* o  : time-domain signal exp */
+    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables */
+    const Word16 length,              /* i  : frame size                                       Q0*/
+    const Word16 core,                /* i  : core                                             Q0*/
+    const Word16 return_noise,        /* i  : noise is returned instead of added Q0*/
+    const Word16 secondary,           /* i  : flag to indicate secondary noise generation Q0*/
+    const Word16 element_mode,        /* i  : element mode Q0*/
+    STEREO_CNG_DEC_HANDLE hStereoCng, /* i  : stereo CNG handle */
+    const Word16 nchan_out            /* i  : number of output channels Q0*/
+)
+{
+    Word32 *cngNoiseLevel_fx = hFdCngCom->cngNoiseLevel;
+    Word32 *ptr_level_fx = cngNoiseLevel_fx;
+    Word32 *fftBuffer_fx = hFdCngCom->fftBuffer;
+    Word16 i;
+    Word32 maskingNoise_fx[L_FRAME16k];
+    Word32 *ptr_r_fx;
+    Word32 *ptr_i_fx;
+    Word16 startBand;
+    Word16 *seed = &( hFdCngCom->seed );
+    Word32 scale_fx;
+    Word16 shift;
+    scale_fx = 0x40000000; // 1.0 in Q30
+    move32();
+    startBand = hFdCngCom->startBand; /*Q0*/
+    move16();
+    shift = getScaleFactor32( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
+    if ( LT_16( sub( hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
     {
-        /* Add some comfort noise on top of decoded signal */
-        IF( s1 == 0 )
+        shift = sub( hFdCngCom->cngNoiseLevelExp, 4 ); /*Q0*/
+    }
+    scale_sig32( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); /*hFdCngCom->cngNoiseLevelExp*/
+    hFdCngCom->cngNoiseLevelExp = sub( hFdCngCom->cngNoiseLevelExp, shift );
+    move16();
+
+    /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
+    *exp_out = Q15;
+    move16();
+    IF( GT_16( hFdCngCom->likelihood_noisy_speech, DELTA_MASKING_NOISE_Q15 ) )
+    {
+        IF( NE_16( core, AMR_WB_CORE ) )
         {
-            FOR( i = 0; i < hFdCngCom->stopFFTbin; i++ )
+            /* Compute additional CN level */
+            FOR( i = 0; i < SIZE_SCALE_TABLE_CN; i++ )
             {
-                /* If shifting negative noise values the lowest result is -1 but never 0.
-                   Shift positive noise values to avoid unwanted amplification of these small values later */
-                noise = L_shr( Mpy_32_16_1( L_abs( maskingNoise[i] ), 25905 /*0.79056941504 Q15*/ ), s2 ); /*Q31 - maskingNoiseExp - s2*/
-
-                if ( maskingNoise[i] < 0 )
+                test();
+                test();
+                if ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) &&
+                     GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) &&
+                     LT_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) )
                 {
-                    noise = L_negate( noise );
+                    BREAK;
                 }
-
-                mdctBuffer[i] = L_add( mdctBuffer[i], noise ); /*Q31 - s*/
-                move32();
             }
+
+            scale_fx = L_deposit_h( scaleTable_cn_only[i].scale_ivas ); /* Q30 */
         }
         ELSE
         {
-            FOR( i = 0; i < hFdCngCom->stopFFTbin; i++ )
+            /* Compute additional CN level */
+            FOR( i = 0; i < SIZE_SCALE_TABLE_CN_AMRWB; i++ )
             {
-                mdctBuffer[i] = L_add( L_shr( mdctBuffer[i], s1 ),
-                                       Mpy_32_16_1( maskingNoise[i], 25905 /*0.79056941504 Q15*/ ) ); /*Q31 - s*/
-                move32();
+                if ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only_amrwbio[i][0] ) )
+                {
+                    BREAK;
+                }
             }
-            FOR( i = hFdCngCom->stopFFTbin; i < L_frame; i++ )
+
+            IF( LT_16( i, SIZE_SCALE_TABLE_CN_AMRWB ) )
             {
-                mdctBuffer[i] = L_shr( mdctBuffer[i], s1 ); /*Q31 - s*/
-                move32();
+                scale_fx = L_deposit_h( scaleTable_cn_only_amrwbio[i][1] ); /* Q30 */
             }
-            *mdctBuffer_e = s;
-            move16();
-        }
-    }
-}
-
-void generate_masking_noise_mdct_ivas_fx(
-    Word32 *mdctBuffer,   /* i/o: time-domain signal Q31 - mdctBuffer_e*/
-    Word16 *mdctBuffer_e, /* i/o: exponent time-domain signal */
-    HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ )
-{
-    Word16 i, sq, cnt;
-    Word16 cngNoiseLevelExp;
-    Word32 scale, temp;
-    Word32 sqrtNoiseLevel;
-    Word32 maskingNoise[2 * L_FRAME16k];
-    Word32 *pMaskingNoise;
-    Word32 *cngNoiseLevel;
-    Word16 *seed;
-
-    // PMTE(); /*IVAS CODE need to be added */
-    /* pointer initializations */
-    cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
-    seed = &( hFdCngCom->seed );
-
-    /* Compute additional CN level */
-    cngNoiseLevelExp = hFdCngCom->cngNoiseLevelExp;
-    move16();
-
-    scale = ONE_IN_Q30;
-    move32();
-
-    cnt = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
-
-    /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
-    IF( hFdCngCom->likelihood_noisy_speech > 0 )
-    {
-        FOR( i = 0; i < SIZE_SCALE_TABLE_CN; i++ )
-        {
-            test();
-            test();
-            IF( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_only[i].bwmode ) &&
-                GE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateFrom ) &&
-                LE_32( hFdCngCom->CngBitrate, scaleTable_cn_only[i].bitrateTo ) )
+            ELSE
             {
-                BREAK;
+                scale_fx = 0;
+                move32();
             }
         }
 
         /* Exclude clean speech */
-        scale = L_mult( scaleTable_cn_only[i].scale, hFdCngCom->likelihood_noisy_speech ); // Q30 (14 + 15 + 1)
-
-        /*
-          Generate Gaussian random noise in real and imaginary parts of the FFT bins
-          Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin
-        */
-        IF( hFdCngCom->startBand == 0 )
-        {
-            /* *cngNoiseLevel * scale * 0.5 */
-            temp = Mpy_32_32( *cngNoiseLevel, scale ); // exp = cngNoiseLevelExp (cngNoiseLevelExp + Q30(scale) + 1(0.5f) - 31)
-            sq = cngNoiseLevelExp;
-            move16();
-
-            sqrtNoiseLevel = Sqrt32( temp, &sq ); /*Q31 - sq*/
-
-            rand_gauss_fx( &temp, seed, Q15 ); // Q15
-
-            maskingNoise[0] = L_shl( Mpy_32_32( temp, sqrtNoiseLevel ), sq ); // Q15
-            move32();
+        scale_fx = Mpy_32_16_1( scale_fx, hFdCngCom->likelihood_noisy_speech ); // Q30
 
-            pMaskingNoise = &maskingNoise[1]; /*Q15*/
-            cngNoiseLevel++;
-            cnt = sub( cnt, 1 );
-        }
-        ELSE
+        /* Generate Gaussian random noise in real and imaginary parts of the FFT bins
+          Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each bin */
+        IF( startBand == 0 )
         {
-            set32_fx( maskingNoise, 0, hFdCngCom->startBand );
-            pMaskingNoise = maskingNoise + hFdCngCom->startBand; /*Q15*/
+            rand_gauss_fx( &fftBuffer_fx[0], seed, *exp_out ); // Q15
+            ptr_r_fx = fftBuffer_fx + 2;                       /*Q31 - hFdCngCom->fftBuffer_exp*/
+            Word16 exp1;
+            exp1 = add( hFdCngCom->cngNoiseLevelExp, 1 );
+            Word32 mpy1;
+            mpy1 = Sqrt32( Mpy_32_32( scale_fx, *ptr_level_fx ), &exp1 );                   /*Q31 - exp1*/
+            mpy1 = L_shl( mpy1, exp1 );                                                     // Q31
+            fftBuffer_fx[0] = Mpy_32_32( fftBuffer_fx[0], mpy1 ); /* DC component in FFT */ // Q = Q15
+            ptr_level_fx++;
         }
-
-        FOR( i = 0; i < cnt; i++ )
-        {
-            /* MDCT bins */
-            /* *cngNoiseLevel * scale * 0.5 */
-            temp = Mpy_32_32( *cngNoiseLevel, scale ); // exp = cngNoiseLevelExp (cngNoiseLevelExp + Q30(scale) + 1(0.5f) - 31)
-            sq = cngNoiseLevelExp;
-            move16();
-
-            sqrtNoiseLevel = Sqrt32( temp, &sq ); /*Q31 - sq*/
-
-            rand_gauss_fx( &temp, seed, Q15 ); // Q15
-
-            *pMaskingNoise = L_shl( Mpy_32_32( temp, sqrtNoiseLevel ), sq ); // Q15
+        ELSE
+        {
+            fftBuffer_fx[0] = 0;
+            move32();
+            set32_fx( fftBuffer_fx + 2, 0, shl( sub( startBand, 1 ), 1 ) );
+            ptr_r_fx = fftBuffer_fx + shl( startBand, 1 ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+        }
+        ptr_i_fx = ptr_r_fx + 1;
+        FOR( ; ptr_level_fx < cngNoiseLevel_fx + hFdCngCom->stopFFTbin - startBand; ptr_level_fx++ )
+        {
+            /* Real part in FFT bins */
+            rand_gauss_fx( ptr_r_fx, seed, *exp_out ); // Q15
+            Word16 exp2;
+            exp2 = add( hFdCngCom->cngNoiseLevelExp, 1 );
+            Word32 mpy2;
+            mpy2 = Sqrt32( L_shr( Mpy_32_32( scale_fx, *ptr_level_fx ), 1 ), &exp2 ); /*Q31 - exp2*/
+            ( *ptr_r_fx ) = L_shl( Mpy_32_32( *ptr_r_fx, mpy2 ), exp2 );              // Q = Q15
             move32();
+            ptr_r_fx += 2;
 
-            pMaskingNoise++;
-            cngNoiseLevel++;
+            /* Imaginary part in FFT bins */
+            rand_gauss_fx( ptr_i_fx, seed, *exp_out );                   // Q15
+            ( *ptr_i_fx ) = L_shl( Mpy_32_32( *ptr_i_fx, mpy2 ), exp2 ); // Q = Q15
+            ptr_i_fx += 2;
         }
 
-        /*re-normalization of energy level: M/sqrt(2)*/
-        v_multc_fixed( maskingNoise, SQRT_NORM_MDCT_FACTOR_Q27, maskingNoise, hFdCngCom->stopFFTbin ); // Q11
+        /* Remaining FFT bins are set to zero */
+        set32_fx( fftBuffer_fx + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
+        /* Nyquist frequency is discarded */
+        fftBuffer_fx[1] = 0;
+        move32();
+    }
+    ELSE
+    {
+        /* very low level case - update random seeds and reset FFT buffer; don't fully skip SynthesisSTFT_flt(), because of the buffer updates done there... */
+        generate_masking_noise_update_seed_fx( hFdCngCom );
 
-        scale_sig32( maskingNoise, hFdCngCom->stopFFTbin, sub( 20, *mdctBuffer_e ) ); // exp = *mdctBuffer_e
+        set32_fx( fftBuffer_fx, 0, hFdCngCom->fftlen );
+    }
 
-        /* Add some comfort noise on top of decoded signal */
-        v_add_fixed( maskingNoise, mdctBuffer, mdctBuffer, hFdCngCom->stopFFTbin, 1 );
-        *mdctBuffer_e = sub( *mdctBuffer_e, 1 );
-        move16();
+    /* Perform STFT synthesis */
+    IF( secondary )
+    {
+        SynthesisSTFT_fx( fftBuffer_fx, maskingNoise_fx, hStereoCng->olapBufferSynth22_32fx, hFdCngCom->olapWinSyn_fx, 0, hFdCngCom, element_mode, nchan_out );
     }
     ELSE
     {
-        /* very low level case - just update random seeds */
-        IF( hFdCngCom->startBand == 0 )
-        {
-            rand_gauss_fx( &maskingNoise[0], seed, Q15 ); // Q15
-            cngNoiseLevel++;
-            cnt = sub( cnt, 1 );
-        }
+        SynthesisSTFT_fx( fftBuffer_fx, maskingNoise_fx, hFdCngCom->olapBufferSynth2_fx, hFdCngCom->olapWinSyn_fx, 0, hFdCngCom, element_mode, nchan_out );
+    }
+    *exp_out = sub( *exp_out, Q9 );
+    move16();
 
-        FOR( i = 0; i < cnt; i++ )
-        {
-            rand_gauss_fx( &maskingNoise[0], seed, Q15 ); // Q15
-            move32();
-        }
+    /* Add some comfort noise on top of decoded signal */
+    IF( return_noise )
+    {
+        Copy32( maskingNoise_fx, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ) ); /*Q31 - *exp_out*/
+    }
+    ELSE
+    {
+#ifdef VEC_ARITH_OPT_v1
+        v_add_fixed_no_hdrm( maskingNoise_fx, timeDomainBuffer, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ) ); /*Q31 - *exp_out*/
+#else                                                                                                                      /* VEC_ARITH_OPT_v1 */
+        v_add_fixed( maskingNoise_fx, timeDomainBuffer, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ), 0 ); /*Q31 - *exp_out*/
+#endif                                                                                                                     /* VEC_ARITH_OPT_v1 */
     }
 
     return;
 }
 
-#ifdef IVAS_CODE_CNG
-
 /*-------------------------------------------------------------------
- * generate_stereo_masking_noise()
+ * generate_stereo_masking_noise_fx()
  *
  * Generate additional comfort noise (kind of noise filling)
  *-------------------------------------------------------------------*/
 
-void generate_stereo_masking_noise(
-    float *syn,                          /* i/o: time-domain signal              */
+void generate_stereo_masking_noise_fx(
+    Word16 *syn, /* i/o: time-domain signal              Q_syn*/
+    Word16 Q_syn,
     Decoder_State *st,                   /* i/o: decoder state structure         */
     STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i  : TD stereo structure             */
-    const int16_t flag_sec_CNA,          /* i  : CNA flag for secondary channel  */
-    const int16_t fadeOut,               /* i  : only fade out of previous state */
+    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel  Q0*/
+    const Word16 fadeOut,                /* i  : only fade out of previous state Q0*/
     STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : Stereo CNG handle               */
-    const int16_t nchan_out              /* i  : number of output channels       */
+    const Word16 nchan_out               /* i  : number of output channels       Q0*/
 )
 {
     HANDLE_FD_CNG_COM hFdCngCom;
-    float gamma, scale, SP_ratio;
-    float Np[L_FRAME16k];
-    float Ns[L_FRAME16k];
-    float N1[L_FRAME16k];
-    float N2[L_FRAME16k];
-    int16_t i;
-
-    if ( st->idchan == 0 )
+    Word32 gamma_fx, scale_fx /*, SP_ratio_fx needs to be integrated*/;
+    Word32 Np_fx[L_FRAME16k];
+    Word32 Ns_fx[L_FRAME16k];
+    Word32 N1_fx[L_FRAME16k];
+    Word32 N2_fx[L_FRAME16k];
+    Word16 N1_fx_exp, N2_fx_exp;
+    Word16 i;
+
+    IF( st->idchan == 0 )
     {
         hFdCngCom = st->hFdCngDec->hFdCngCom;
-        mvr2r( hFdCngCom->olapBufferSynth2, Np, hFdCngCom->frameSize / 2 );
-        mvr2r( hStereoCng->olapBufferSynth22, Ns, hFdCngCom->frameSize / 2 );
-        set_f( &Np[hFdCngCom->frameSize / 2], 0.0f, hFdCngCom->frameSize / 2 );
-        set_f( &Ns[hFdCngCom->frameSize / 2], 0.0f, hFdCngCom->frameSize / 2 );
+        Copy_Scale_sig_16_32_no_sat( hStereoCng->olapBufferSynth22_fx, Ns_fx, shr( hFdCngCom->frameSize, 1 ), sub( Q6, st->Q_syn ) ); /*Q6*/
+        Copy32( hFdCngCom->olapBufferSynth2_fx, Np_fx, shr( hFdCngCom->frameSize, 1 ) );                                              /*st->Q_syn*/
+
+        set32_fx( &Np_fx[( hFdCngCom->frameSize / 2 )], 0, shr( hFdCngCom->frameSize, 1 ) );
+        set32_fx( &Ns_fx[( hFdCngCom->frameSize / 2 )], 0, shr( hFdCngCom->frameSize, 1 ) );
 
-        if ( !fadeOut )
+        IF( !fadeOut )
         {
-            generate_masking_noise_fx( N1, hFdCngCom, hFdCngCom->frameSize, 0, 1, 0, st->element_mode, hStereoCng, nchan_out );
+            Copy_Scale_sig_16_32_no_sat( hStereoCng->olapBufferSynth22_fx, hStereoCng->olapBufferSynth22_32fx, hFdCngCom->fftlen, sub( Q15, st->Q_syn ) ); /*Q15*/
+            generate_masking_noise_ivas_fx( N1_fx, &N1_fx_exp, hFdCngCom, hFdCngCom->frameSize, 0, 1, 0, st->element_mode, hStereoCng, nchan_out );        // N1_fx Q6
             /* Generate masking noise for secondary channel */
-            if ( flag_sec_CNA )
+            IF( flag_sec_CNA )
             {
-                generate_masking_noise_fx( N2, hFdCngCom, hFdCngCom->frameSize, 0, 1, 1, st->element_mode, hStereoCng, nchan_out );
-                gamma = hStereoCng->c_PS_LT * hStereoCng->c_PS_LT;
-                scale = 1.0f;
-                if ( gamma < 0.9f )
+                generate_masking_noise_ivas_fx( N2_fx, &N2_fx_exp, hFdCngCom, hFdCngCom->frameSize, 0, 1, 1, st->element_mode, hStereoCng, nchan_out ); // N2_fx Q6
+                gamma_fx = L_shr( Mpy_32_32( hStereoCng->c_PS_LT_fx, hStereoCng->c_PS_LT_fx ), 1 );                                                     /*Q30*/
+                scale_fx = ONE_IN_Q30;
+                move32();
+                IF( LT_32( gamma_fx, 966367642 /* 0.9 in Q30 */ ) )
                 {
-                    gamma = gamma / ( 1 - gamma );
-                    gamma = (float) sqrt( gamma + 1 ) - (float) sqrt( gamma );
-                    scale = 1.0f / (float) sqrt( 1 + gamma * gamma );
+                    Word16 exp_gamma;
+                    exp_gamma = 0;
+                    move16();
+                    Word16 divisor1;
+                    divisor1 = Inv16( (Word16) L_shr( L_sub( ONE_IN_Q30, gamma_fx ), Q15 ), &exp_gamma ); // Q15-exp_gamma
+                    gamma_fx = L_shl( Mpy_32_16_1( gamma_fx, divisor1 ), exp_gamma );                     // Q30
+                    Word16 exp_gamma1, exp_gamma2, exp_gamma3;
+                    exp_gamma1 = Q1;
+                    exp_gamma2 = Q1;
+                    exp_gamma3 = Q1;
+                    move16();
+                    move16();
+                    move16();
+                    gamma_fx = Sqrt32( L_add( gamma_fx, ONE_IN_Q30 ), &exp_gamma1 ); /*Q31 - exp_gamma1*/
+                    Word32 temp;
+                    temp = Sqrt32( gamma_fx, &exp_gamma2 );                                     // Q31-exp_gamma1
+                    gamma_fx = L_sub( gamma_fx, L_shl( temp, sub( exp_gamma2, exp_gamma1 ) ) ); // Q31-exp_gamma1
+                    gamma_fx = L_shl( gamma_fx, sub( exp_gamma1, Q1 ) );                        // Q30
+                    Word32 divisor2;
+                    divisor2 = Sqrt32( L_add( ONE_IN_Q30, L_shl( Mpy_32_32( gamma_fx, gamma_fx ), Q1 ) ), &exp_gamma3 ); // Q31 - exp_gamma3
+                    scale_fx = L_shl( divide3232( ONE_IN_Q30, divisor2 ), add( Q15, exp_gamma3 ) );                      // Q30
                 }
-                else
+                ELSE
                 {
-                    gamma = 0.0f;
+                    gamma_fx = 0;
+                    move16();
                 }
 
-                for ( i = 0; i < 2 * hFdCngCom->frameSize / 4; i++ )
+                FOR( i = 0; i < 2 * hFdCngCom->frameSize / 4; i++ )
                 {
-                    Np[i] += scale * ( N1[i] + gamma * N2[i] );
-                    Ns[i] += scale * sign( hStereoCng->c_PS_LT ) * ( N1[i] - gamma * N2[i] );
+                    Np_fx[i] = L_add( Np_fx[i],
+                                      Mpy_32_32( scale_fx, L_shl( L_add( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ) ); // Q6
+                    move32();
+                    Word32 add2;
+                    add2 = Mpy_32_32( scale_fx, L_shl( L_sub( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ); // Q6
+                    if ( hStereoCng->c_PS_LT_fx < 0 )
+                    {
+                        add2 = L_negate( add2 ); /*Q6*/
+                    }
+                    Ns_fx[i] = L_add( Ns_fx[i], add2 ); /*Q6*/
+                    move32();
                 }
-                for ( ; i < hFdCngCom->frameSize; i++ )
+                FOR( ; i < hFdCngCom->frameSize; i++ )
                 {
-                    Np[i] = scale * ( N1[i] + gamma * N2[i] );
-                    Ns[i] = scale * sign( hStereoCng->c_PS_LT ) * ( N1[i] - gamma * N2[i] );
+                    Np_fx[i] = Mpy_32_32( scale_fx, L_shl( L_add( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ); // Q6
+                    move32();
+                    Ns_fx[i] = Mpy_32_32( scale_fx, L_shl( L_sub( N1_fx[i], Mpy_32_32( gamma_fx, L_shl( N2_fx[i], Q1 ) ) ), Q1 ) ); // Q6
+                    move32();
+                    IF( hStereoCng->c_PS_LT_fx < 0 )
+                    {
+                        Ns_fx[i] = L_negate( Ns_fx[i] );
+                        move32();
+                    }
                 }
-                scale *= (float) ( hFdCngCom->fftlen / 2 );
-                for ( i = 0; i < hFdCngCom->frameSize / 2; i++ )
+                /* Below code to be converted */
+                Word32 scale_fx_tmp = Mpy_32_32( scale_fx, L_shl( shr( hFdCngCom->fftlen, 1 ), Q22 ) ); // Q21
+                FOR( i = 0; i < shr( hFdCngCom->frameSize, 1 ); i++ )
                 {
-                    hFdCngCom->olapBufferSynth2[i] = scale * ( hFdCngCom->olapBufferSynth2[i + 5 * hFdCngCom->frameSize / 4] + gamma * hStereoCng->olapBufferSynth22[i + 5 * hFdCngCom->frameSize / 4] );
-                    hStereoCng->olapBufferSynth22[i] = sign( hStereoCng->c_PS_LT ) * scale * ( hFdCngCom->olapBufferSynth2[i + 5 * hFdCngCom->frameSize / 4] - gamma * hStereoCng->olapBufferSynth22[i + 5 * hFdCngCom->frameSize / 4] );
+                    hFdCngCom->olapBufferSynth2[i] = (Word16) L_shr( Mpy_32_32( scale_fx_tmp,
+                                                                                L_add( L_shr( hFdCngCom->olapBufferSynth2[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )], Q15 ),
+                                                                                       Mpy_32_16_1( gamma_fx, hStereoCng->olapBufferSynth22_fx[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )] ) ) ),
+                                                                     Q14 ); // Q_olap
+                    move16();
+                    hStereoCng->olapBufferSynth22_fx[i] = (Word16) L_shr( Mpy_32_32( scale_fx_tmp,
+                                                                                     L_sub( L_shr( hFdCngCom->olapBufferSynth2[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )], Q15 ),
+                                                                                            Mpy_32_16_1( gamma_fx, hStereoCng->olapBufferSynth22_fx[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )] ) ) ),
+                                                                          Q14 ); // Q_olap
+                    move16();
                 }
             }
-            else
+            ELSE
             {
-                for ( i = 0; i < hFdCngCom->frameSize / 2; i++ )
+                FOR( i = 0; i < shr( hFdCngCom->frameSize, 1 ); i++ )
                 {
-                    Np[i] += N1[i];
+                    Np_fx[i] = L_add( Np_fx[i], N1_fx[i] ); // Q6
+                    move32();
                 }
-                mvr2r( &N1[hFdCngCom->frameSize / 2], &Np[hFdCngCom->frameSize / 2], hFdCngCom->frameSize / 2 );
-                scale = (float) ( hFdCngCom->fftlen / 2 );
-                for ( i = 0; i < hFdCngCom->frameSize; i++ )
+                Copy32( &N1_fx[( hFdCngCom->frameSize / 2 )], &Np_fx[( hFdCngCom->frameSize / 2 )], shr( hFdCngCom->frameSize, 1 ) ); /*Q6*/
+                scale_fx = L_shl( shr( hFdCngCom->fftlen, 1 ), Q22 );                                                                 // Q21
+                FOR( i = 0; i < hFdCngCom->frameSize; i++ )
                 {
-                    hFdCngCom->olapBufferSynth2[i] = scale * hFdCngCom->olapBufferSynth2[i + 5 * hFdCngCom->frameSize / 4];
+                    hFdCngCom->olapBufferSynth2[i] = (Word16) L_shr( Mpy_32_16_1( scale_fx, hFdCngCom->olapBufferSynth2[( i + ( 5 * ( hFdCngCom->frameSize / 4 ) ) )] ), Q6 ); // Q_olap
+                    move16();
                 }
             }
+
+            Copy_Scale_sig_32_16( hStereoCng->olapBufferSynth22_32fx, hStereoCng->olapBufferSynth22_fx, hFdCngCom->fftlen, sub( st->Q_syn, 15 ) ); /*st->Q_syn*/
         }
-        else
+        ELSE
         {
-            set_f( hFdCngCom->olapBufferSynth2, 0.0f, hFdCngCom->frameSize / 2 );
-            set_f( hStereoCng->olapBufferSynth22, 0.0f, hFdCngCom->frameSize / 2 );
+            set16_fx( hFdCngCom->olapBufferSynth2, 0, shr( hFdCngCom->frameSize, 1 ) );
+            set16_fx( hStereoCng->olapBufferSynth22_fx, 0, shr( hFdCngCom->frameSize, 1 ) );
         }
-        if ( flag_sec_CNA )
+        IF( flag_sec_CNA )
         {
-            mvr2r( Ns, hStereoCng->maskingNoiseS, hFdCngCom->frameSize );
+            Copy_Scale_sig_32_16( Ns_fx, hStereoCng->maskingNoiseS_fx, hFdCngCom->frameSize, 0 ); // Q6
             hStereoCng->enableSecCNA = 1;
+            move16();
         }
-        else
+        ELSE
         {
-            set_f( hStereoCng->olapBufferSynth22, 0.0f, hFdCngCom->frameSize );
+            set16_fx( hStereoCng->olapBufferSynth22_fx, 0, hFdCngCom->frameSize );
         }
 
         /* add masking noise */
-        v_add( Np, syn, syn, hFdCngCom->frameSize );
+        FOR( i = 0; i < hFdCngCom->frameSize; i++ )
+        {
+            syn[i] = add( syn[i], (Word16) L_shr( Np_fx[i], sub( Q16 + Q6, Q_syn ) ) ); // Q_syn
+            move16();
+        }
     }
-    else if ( hStereoCng->enableSecCNA )
+    ELSE IF( hStereoCng->enableSecCNA )
     {
-        SP_ratio = hStereoTD->SP_ratio_LT; /* Use long-term SP ratio based on L/R synthesis */
+        Word16 SP_ratio_fx;
+        SP_ratio_fx = extract_h( hStereoTD->SP_ratio_LT_fx ); /* Use long-term SP ratio based on L/R synthesis Q15*/
+        Word16 prevSP_ratio_fx;
+        prevSP_ratio_fx = hStereoTD->prevSP_ratio_fx; /* Use long-term SP ratio based on L/R synthesis Q15*/
+        move16();
         /* scale and add masking noise */
-        for ( i = 0; i < *hStereoCng->frameSize / 4; i++ )
+        FOR( i = 0; i < shr( *hStereoCng->frameSize, 2 ); i++ )
         {
-            scale = ( ( hStereoTD->prevSP_ratio * ( *hStereoCng->frameSize / 4 - (float) i ) + SP_ratio * (float) i ) / ( *hStereoCng->frameSize / 4 ) );
-            syn[i] += scale * hStereoCng->maskingNoiseS[i];
+            Word16 s;
+            Word16 scale_fx_tmp;
+            scale_fx_tmp = BASOP_Util_Divide3216_Scale( L_add( L_mult0( prevSP_ratio_fx, sub( shr( *hStereoCng->frameSize, 2 ), i ) ), L_mult0( SP_ratio_fx, i ) ), shr( *hStereoCng->frameSize, 2 ), &s ); // Q15
+            scale_fx_tmp = shl( scale_fx_tmp, s );
+            syn[i] = add( syn[i], mult( scale_fx_tmp, shr( hStereoCng->maskingNoiseS_fx[i], sub( Q6, Q_syn ) ) ) ); /*Q_syn*/
+            move16();
         }
-        for ( ; i < *hStereoCng->frameSize / 2; i++ )
+        FOR( ; i < *hStereoCng->frameSize / 2; i++ )
         {
-            syn[i] += SP_ratio * hStereoCng->maskingNoiseS[i];
+            syn[i] = add( syn[i], mult( SP_ratio_fx, shr( hStereoCng->maskingNoiseS_fx[i], sub( Q6, Q_syn ) ) ) ); /*Q_syn*/
+            move16();
         }
-        for ( ; i < *hStereoCng->frameSize; i++ )
+        FOR( ; i < *hStereoCng->frameSize; i++ )
         {
-            syn[i] += SP_ratio * hStereoCng->maskingNoiseS[i];
+            syn[i] = add( syn[i], mult( SP_ratio_fx, shr( hStereoCng->maskingNoiseS_fx[i], sub( Q6, Q_syn ) ) ) ); /*Q_syn*/
+            move16();
         }
-        hStereoTD->prevSP_ratio = SP_ratio;
+        hStereoTD->prevSP_ratio_fx = extract_h( hStereoTD->SP_ratio_LT_fx ); /*Q15*/
+        move16();
     }
 
     return;
 }
-
-/*-------------------------------------------------------------------
- * generate_masking_noise_hf_cldfb()
- *
- * Generate additional comfort noise (kind of noise filling)
- *-------------------------------------------------------------------*/
-
-void generate_masking_noise_dirac(
-    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables */
-    HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i  : filterbank state                                      */
-    float *tdBuffer,                  /* i/o: time-domain signal, if NULL no LB-CNA                 */
-    float *Cldfb_RealBuffer,          /* o  : CLDFD real buffer                                     */
-    float *Cldfb_ImagBuffer,          /* o  : CLDFD imaginary buffer                                */
-    const int16_t slot_index,         /* i  : CLDFB slot index                                      */
-    const int16_t cna_flag,           /* i  : CNA flag for LB and HB                                */
-    const int16_t fd_cng_flag         /* i  : FD-CNG flag for HB                                    */
+void generate_masking_noise_lb_dirac_fx(
+    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
+    Word32 *tdBuffer,            /* i/o: time-domain signal, if NULL no LB-CNA                 Q11*/
+    const Word16 nCldfbTs,       /* i  : number of CLDFB slots that will be rendered           Q0*/
+    const Word16 cna_flag        /* i  : CNA flag for LB and HB                                Q0*/
 )
 {
-    int16_t i;
-    float *cngNoiseLevel = hFdCngCom->cngNoiseLevel;
-    float *fftBuffer = hFdCngCom->fftBuffer;
-    float *ptr_r;
-    float *ptr_i;
-    float *ptr_level;
-    int16_t *seed = &( hFdCngCom->seed );
-    float scale;
+    Word16 i;
+    Word32 *cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*hFdCngCom->cngNoiseLevelExp*/
+    Word32 *fftBuffer = hFdCngCom->fftBuffer;         /*hFdCngCom->fftBuffer_exp*/
+    Word32 *ptr_r;
+    Word32 *ptr_i;
+    Word32 *ptr_level;
+    Word16 *seed = &( hFdCngCom->seed );
+    Word32 scale;
+    Word16 n_samples_out, n_samples_start, n_samples_out_loop;
 
-    wmops_sub_start( "fd_cng_dirac" );
+    push_wmops( "fd_cng_dirac" );
 
     /* Init */
-    scale = 0.f;
-
-    /* Resample CLDFB memories if necessary*/
-    if ( ( h_cldfb->no_channels * h_cldfb->no_col ) != hFdCngCom->frameSize )
-    {
-        resampleCldfb( h_cldfb, hFdCngCom->frameSize * FRAMES_PER_SEC );
-    }
-
-    set_zero( Cldfb_RealBuffer, CLDFB_NO_CHANNELS_MAX );
-    set_zero( Cldfb_ImagBuffer, CLDFB_NO_CHANNELS_MAX );
-
+    scale = 0;
+    move32();
+    n_samples_out = i_mult( shr( hFdCngCom->frameSize, 4 ), nCldfbTs );
+    n_samples_start = 0;
+    move16();
+    Word16 exp_out = Q11;
+    move16();
     /*LB CLDFB - CNA from STFT*/
-#ifdef DEBUG_MODE_DIRAC
-    {
-        int16_t tmp_s;
-        tmp_s = (int16_t) ( 32768.f * 0.5f * hFdCngCom->likelihood_noisy_speech * cna_flag + 0.5f );
-        dbgwrite( &tmp_s, sizeof( int16_t ), 1, hFdCngCom->frameSize / 16, "./res/ivas_dirac_likelihood_noisy.pcm" );
-    }
-#endif
-    if ( cna_flag )
+    IF( cna_flag )
     {
         /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
-        if ( hFdCngCom->likelihood_noisy_speech > DELTA_MASKING_NOISE )
+        IF( GT_16( hFdCngCom->likelihood_noisy_speech, DELTA_MASKING_NOISE_Q15 ) )
         {
             /* Compute additional CN level */
-            for ( i = 0; i < 15; i++ )
+            FOR( i = 0; i < 15; i++ )
             {
-                if ( ( hFdCngCom->CngBandwidth == scaleTable_cn_dirac[i].bwmode ) &&
-                     ( hFdCngCom->CngBitrate >= scaleTable_cn_dirac[i].bitrateFrom ) &&
-                     ( hFdCngCom->CngBitrate < scaleTable_cn_dirac[i].bitrateTo ) )
+                test();
+                test();
+                if ( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_dirac[i].bwmode ) ) &&
+                     GE_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateFrom ) &&
+                     LT_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateTo ) )
                 {
-                    break;
+                    BREAK;
                 }
             }
 
-            scale = (float) pow( 10.f, -scaleTable_cn_dirac[i].scale / 10.f ) - 1.f;
-            scale *= hFdCngCom->likelihood_noisy_speech;
+            scale = L_deposit_h( scaleTable_cn_dirac[i].scale_ivas );         /* Q30 */
+            scale = Mpy_32_16_1( scale, hFdCngCom->likelihood_noisy_speech ); /* Q30 */
         }
     }
 
     /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/
-    if ( cna_flag && tdBuffer != NULL )
+    test();
+    IF( cna_flag && tdBuffer != NULL )
     {
-        if ( scale != 0 )
+        WHILE( n_samples_out > 0 )
         {
-            /*Generate LF comfort noise only at first slot, for the whole frame*/
-            if ( slot_index == 0 )
+            n_samples_out_loop = s_min( hFdCngCom->frameSize, n_samples_out );
+            IF( scale != 0 )
             {
-                ptr_level = cngNoiseLevel;
+                /*Generate LF comfort noise only at first slot, for the whole frame*/
+                ptr_level = cngNoiseLevel; /*hFdCngCom->cngNoiseLevelExp*/
 
                 /* Generate Gaussian random noise in real and imaginary parts of the FFT bins
-              Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin */
-                if ( hFdCngCom->startBand == 0 )
+                   Amplitudes are adjusted to the estimated noise level cngNoiseLevel_flt in each bin */
+                IF( EQ_16( hFdCngCom->startBand, 0 ) )
                 {
-                    rand_gauss( &fftBuffer[0], seed );
-                    ptr_r = fftBuffer + 2;
-                    fftBuffer[0] *= (float) sqrt( scale * *ptr_level ); /* DC component in FFT */
+                    rand_gauss_fx( &fftBuffer[0], seed, exp_out );
+                    ptr_r = fftBuffer + 2; /*hFdCngCom->fftBuffer_exp*/
+
+                    Word16 exp2 = sub( 31, hFdCngCom->cngNoiseLevelExp );
+                    Word32 sqr = Sqrt32( L_shr( Mpy_32_32( scale, *ptr_level ), 1 ), &exp2 ); /* DC component in FFT Q31 - exp2*/
+                    sqr = L_shl( sqr, exp2 );                                                 /*Q31*/
+                    fftBuffer[0] = Mpy_32_32( fftBuffer[0], sqr );                            /* DC component in FFT Q31 - hFdCngCom->fftBuffer_exp*/
+                    move32();
                     ptr_level++;
                 }
-                else
+                ELSE
                 {
-                    fftBuffer[0] = 0.f;
-                    set_f( fftBuffer + 2, 0.0f, 2 * ( hFdCngCom->startBand - 1 ) );
-                    ptr_r = fftBuffer + 2 * hFdCngCom->startBand;
+                    fftBuffer[0] = 0;
+                    move32();
+                    set32_fx( fftBuffer + 2, 0, shl( sub( hFdCngCom->startBand, 1 ), 1 ) );
+                    ptr_r = fftBuffer + shl( hFdCngCom->startBand, 1 ); /*hFdCngCom->fftBuffer_exp*/
                 }
-                ptr_i = ptr_r + 1;
+                ptr_i = ptr_r + 1; /*hFdCngCom->fftBuffer_exp*/
 
-                for ( ; ptr_level < cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; ptr_level++ )
+                FOR( ; ptr_level < cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); ptr_level++ )
                 {
-                    /* Real part in FFT bins */
-                    rand_gauss( ptr_r, seed );
-                    ( *ptr_r ) *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
+                    rand_gauss_fx( ptr_r, seed, exp_out );
+                    Word16 exp2 = hFdCngCom->cngNoiseLevelExp;
+                    Word32 mpy2 = Sqrt32( Mpy_32_32( scale, *ptr_level ), &exp2 ); /*Q31 - exp2*/
+                    ( *ptr_r ) = L_shl( Mpy_32_32( *ptr_r, mpy2 ), exp2 );         /*Q31 - hFdCngCom->fftBuffer_exp*/
+                    move32();
                     ptr_r += 2;
+
                     /* Imaginary part in FFT bins */
-                    rand_gauss( ptr_i, seed );
-                    ( *ptr_i ) *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
+                    rand_gauss_fx( ptr_i, seed, exp_out );
+                    ( *ptr_i ) = L_shl( Mpy_32_32( *ptr_i, mpy2 ), exp2 ); /*Q31 - hFdCngCom->fftBuffer_exp*/
+                    move32();
                     ptr_i += 2;
                 }
-
                 /* Remaining FFT bins are set to zero */
-                set_f( fftBuffer + 2 * hFdCngCom->stopFFTbin, 0.0f, hFdCngCom->fftlen - 2 * hFdCngCom->stopFFTbin );
+                set32_fx( fftBuffer + shl( hFdCngCom->stopFFTbin, 1 ), 0, sub( hFdCngCom->fftlen, shl( hFdCngCom->stopFFTbin, 1 ) ) );
                 /* Nyquist frequency is discarded */
-                fftBuffer[1] = 0.f;
+                fftBuffer[1] = 0;
+                move32();
 
                 /* Perform STFT synthesis */
-                SynthesisSTFT( fftBuffer, tdBuffer, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn, 0, hFdCngCom, X, Y, -1, -1 );
-
-#ifdef DEBUG_MODE_DIRAC
-                {
-                    int16_t tmp[1000];
-
-                    for ( i = 0; i < hFdCngCom->frameSize; i++ )
-                    {
-                        tmp[i] = (int16_t) ( tdBuffer[i] + 0.5f );
-                    }
-                    dbgwrite( tmp, sizeof( int16_t ), hFdCngCom->frameSize, 1, "./res/ivas_dirac_cna_fft.pcm" );
-                }
-#endif
+                SynthesisSTFT_dirac_fx( fftBuffer, tdBuffer + n_samples_start, hFdCngCom->olapBufferSynth2_fx, hFdCngCom->olapWinSyn_fx, n_samples_out_loop, hFdCngCom );
+                scale_sig32( tdBuffer + n_samples_start, n_samples_out_loop, Q9 ); // Q2 -> Q11
             }
 
-            /* LF CLDFB*/
-            cldfbAnalysis_ts( &( tdBuffer[hFdCngCom->numCoreBands * slot_index] ), Cldfb_RealBuffer, Cldfb_ImagBuffer, hFdCngCom->numCoreBands, h_cldfb );
-        }
-        else
-        {
-            if ( slot_index == 0 )
+            ELSE
             {
                 /* very low level case - update random seeds */
                 generate_masking_noise_update_seed_fx( hFdCngCom );
 
-                set_f( fftBuffer, 0.f, hFdCngCom->fftlen );
-
+                set32_fx( fftBuffer, 0, hFdCngCom->fftlen );
                 /* Perform STFT synthesis */
-                SynthesisSTFT( fftBuffer, tdBuffer, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn, 0, hFdCngCom, X, Y, -1, -1 );
+                SynthesisSTFT_dirac_fx( fftBuffer, tdBuffer + n_samples_start, hFdCngCom->olapBufferSynth2_fx, hFdCngCom->olapWinSyn_fx, n_samples_out_loop, hFdCngCom );
+            }
+            hFdCngCom->fftBuffer_exp = 31 - 11;
+            move16();
+            n_samples_out = sub( n_samples_out, hFdCngCom->frameSize );
+            n_samples_start = add( n_samples_start, hFdCngCom->frameSize );
+        }
+    }
 
-#ifdef DEBUG_MODE_DIRAC
-                {
-                    int16_t tmp[1000];
+    pop_wmops();
 
-                    for ( i = 0; i < hFdCngCom->frameSize; i++ )
-                    {
-                        tmp[i] = (int16_t) ( tdBuffer[i] + 0.5f );
-                    }
-                    dbgwrite( tmp, sizeof( int16_t ), hFdCngCom->frameSize, 1, "./res/ivas_dirac_cna_fft.pcm" );
+    return;
+}
+void generate_masking_noise_dirac_ivas_fx(
+    HANDLE_FD_CNG_COM hFdCngCom,      /* i/o: FD_CNG structure containing all buffers and variables */
+    HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i  : filterbank state                                      */
+    Word32 *tdBuffer_fx,              /* i/o: time-domain signal, if NULL no LB-CNA                 q_input*/
+    Word32 *Cldfb_RealBuffer_fx,      /* o  : CLDFD real buffer                                     q_cldfb*/
+    Word32 *Cldfb_ImagBuffer_fx,      /* o  : CLDFD imaginary buffer                                q_cldfb*/
+    const Word16 slot_index,          /* i  : CLDFB slot index                                      Q0*/
+    const Word16 cna_flag,            /* i  : CNA flag for LB and HB                                Q0*/
+    const Word16 fd_cng_flag,         /* i  : FD-CNG flag for HB                                    Q0*/
+    Word16 q_input,
+    Word16 *q_cldfb )
+{
+    Word16 i;
+    Word32 *ptr_level_fx;
+    Word16 *seed = &( hFdCngCom->seed );
+    Word32 scale_fx;
+    Word16 q_scale, q_shift, q_ptr_level;
+
+    push_wmops( "fd_cng_dirac" );
+
+    /* Init */
+    scale_fx = 0;
+    move32();
+
+    /* Resample CLDFB memories if necessary*/
+    IF( NE_16( i_mult( h_cldfb->no_channels, h_cldfb->no_col ), hFdCngCom->frameSize ) )
+    {
+        resampleCldfb_ivas_fx( h_cldfb, hFdCngCom->frameSize * FRAMES_PER_SEC );
+    }
+
+    set32_fx( Cldfb_RealBuffer_fx, 0, CLDFB_NO_CHANNELS_MAX );
+    set32_fx( Cldfb_ImagBuffer_fx, 0, CLDFB_NO_CHANNELS_MAX );
+
+    /*LB CLDFB - CNA from STFT*/
+    IF( cna_flag != 0 )
+    {
+        /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */
+        IF( hFdCngCom->likelihood_noisy_speech > 0 )
+        {
+            /* Compute additional CN level */
+            FOR( i = 0; i < 15; i++ )
+            {
+                test();
+                test();
+                if ( ( EQ_16( hFdCngCom->CngBandwidth, scaleTable_cn_dirac[i].bwmode ) ) &&
+                     ( GE_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateFrom ) ) &&
+                     ( LT_32( hFdCngCom->CngBitrate, scaleTable_cn_dirac[i].bitrateTo ) ) )
+                {
+                    BREAK;
                 }
-#endif
             }
 
+            scale_fx = L_shr( L_deposit_h( scaleTable_cn_dirac[i].scale_ivas ), Q3 ); /* Q27 */
+            scale_fx = Mpy_32_16_1( scale_fx, hFdCngCom->likelihood_noisy_speech );
+        }
+    }
+    /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/
+    IF( cna_flag && tdBuffer_fx != NULL )
+    {
+        *q_cldfb = q_input;
+        move16();
+        IF( scale_fx != 0 )
+        {
+            /* LF CLDFB*/
+            cldfbAnalysis_ts_fx_fixed_q( &( tdBuffer_fx[( hFdCngCom->numCoreBands * slot_index )] ), Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hFdCngCom->numCoreBands, h_cldfb, q_cldfb );
+        }
+        ELSE
+        {
             /* LB ana CLDFB*/
-            cldfbAnalysis_ts( &( tdBuffer[hFdCngCom->numCoreBands * slot_index] ), Cldfb_RealBuffer, Cldfb_ImagBuffer, hFdCngCom->numCoreBands, h_cldfb );
+            cldfbAnalysis_ts_fx_fixed_q( &( tdBuffer_fx[( hFdCngCom->numCoreBands * slot_index )] ), Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hFdCngCom->numCoreBands, h_cldfb, q_cldfb );
         }
     }
 
     /*HF CLDFB - CNA and/or FD-CNG*/
     if ( fd_cng_flag )
     {
-        scale += 1.f;
+        scale_fx = L_add( scale_fx, ONE_IN_Q27 ); // 1 in Q27
     }
-    if ( scale != 0 )
+    IF( scale_fx != 0 )
     {
-        scale *= CLDFB_SCALING_FLT * ( h_cldfb->scale * h_cldfb->scale * 8.f );
-        ptr_level = hFdCngCom->cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand;
-
-        for ( i = hFdCngCom->numCoreBands; i < hFdCngCom->regularStopBand; i++ )
+        q_scale = 27;
+        move16();
+        q_shift = norm_l( scale_fx );
+        scale_fx = L_shl( scale_fx, q_shift ); /*q_scale+q_shift*/
+        q_scale = add( q_scale, q_shift );
+        scale_fx = Mpy_32_32( scale_fx, Mpy_32_16_1( L_mult( h_cldfb->scale, h_cldfb->scale ), CLDFB_SCALING ) ); // Q = q_scale + 2 * Q8 - 34
+        q_scale = sub( add( q_scale, 2 * Q8 ), 31 + 3 );
+        ptr_level_fx = hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ); /*Q31 - hFdCngCom->cngNoiseLevelExp*/
+        q_ptr_level = sub( 31, hFdCngCom->cngNoiseLevelExp );
+
+        FOR( i = hFdCngCom->numCoreBands; i < hFdCngCom->regularStopBand; i++ )
         {
+            Word32 num;
+            Word16 exp, q_num;
+            q_shift = norm_l( scale_fx );
+            scale_fx = L_shl( scale_fx, q_shift ); /*q_scale+q_shift*/
+            q_scale = add( q_scale, q_shift );
+            num = Mpy_32_32( scale_fx, *ptr_level_fx );         /*q_num*/
+            q_num = sub( add( q_scale, q_ptr_level ), 31 - 1 ); // num = ( scale * *ptr_level ) * 0.5f
+            exp = sub( 31, q_num );
+            num = Sqrt32( num, &exp ); /*Q31 - exp*/
             /* Real part in CLDFB band */
-            rand_gauss( &Cldfb_RealBuffer[i], seed );
-            Cldfb_RealBuffer[i] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
+            rand_gauss_fx( &Cldfb_RealBuffer_fx[i], seed, *q_cldfb );
+            Cldfb_RealBuffer_fx[i] = L_shl( Mpy_32_32( Cldfb_RealBuffer_fx[i], num ), exp );
+            move32();
             /* Imaginary part in CLDFB band */
-            rand_gauss( &Cldfb_ImagBuffer[i], seed );
-            Cldfb_ImagBuffer[i] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
+            rand_gauss_fx( &Cldfb_ImagBuffer_fx[i], seed, *q_cldfb );
+            Cldfb_ImagBuffer_fx[i] = L_shl( Mpy_32_32( Cldfb_ImagBuffer_fx[i], num ), exp );
+            move32();
 
-            ptr_level++;
+            ptr_level_fx++;
         }
     }
 
-    wmops_sub_end();
+    pop_wmops();
 
     return;
 }
@@ -5458,94 +5175,155 @@ void generate_masking_noise_dirac(
  *
  *-------------------------------------------------------------------*/
 
-void FdCngDecodeMDCTStereoSID(
+void FdCngDecodeMDCTStereoSID_fx(
     CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure     */
 )
 {
     DEC_CORE_HANDLE sts[CPE_CHANNELS];
     HANDLE_FD_CNG_COM hFdCngCom;
-    float *ms_ptr[CPE_CHANNELS];
-    float *lr_ptr[CPE_CHANNELS];
-    float logNoiseEst[CPE_CHANNELS][NPART];
-    float gain[CPE_CHANNELS];
-    int16_t indices[FD_CNG_stages_37bits];
-    int16_t N, i, ch, p, stages;
-    int16_t is_out_ms;
+    Word32 *ms_ptr_fx[CPE_CHANNELS];
+    Word32 *lr_ptr_fx[CPE_CHANNELS];
+    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
+    Word32 gain_fx[CPE_CHANNELS];
+    Word16 indices[FD_CNG_stages_37bits];
+    Word16 N, i, ch, p, stages;
+    Word16 is_out_ms;
+    Word32 *invTrfMatrix_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
+    Word16 shift, exp_diff, max_exp_idx;
+    Word16 exp_arr[NPART];
+    Word32 tmp32, tmp32_arr[NPART];
+
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;
+    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC ); // Q31
 
     is_out_ms = 0;
+    move16();
     if ( hCPE->hCoreCoder[0]->cng_sba_flag )
     {
         is_out_ms = 1;
+        move16();
     }
 
     N = 0; /* to avoid compilation warning */
+    move16();
 
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         sts[ch] = hCPE->hCoreCoder[ch];
-        ms_ptr[ch] = &logNoiseEst[ch][0];
-        lr_ptr[ch] = &sts[ch]->hFdCngDec->hFdCngCom->sidNoiseEst[0];
+        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];                         /*Q20*/
+        lr_ptr_fx[ch] = &sts[ch]->hFdCngDec->hFdCngCom->sidNoiseEst[0]; /*Q18*/
     }
 
     /* decode noise shapes and gains */
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         sts[ch] = hCPE->hCoreCoder[ch];
         hFdCngCom = ( sts[ch]->hFdCngDec )->hFdCngCom;
         N = hFdCngCom->npart;
-        hFdCngCom->sid_frame_counter++;
+        move16();
+        hFdCngCom->sid_frame_counter = add( hFdCngCom->sid_frame_counter, 1 ); /*Q0*/
+        move16();
 
-        if ( ch )
+        IF( ch )
         {
             stages = FD_CNG_JOINT_stages_25bits;
+            move16();
         }
-        else
+        ELSE
         {
             stages = FD_CNG_stages_37bits;
+            move16();
         }
 
         /* read bitstream */
-        for ( i = 0; i < stages; i++ )
+        FOR( i = 0; i < stages; i++ )
         {
-            indices[i] = get_next_indice( sts[ch], bits_37bits[i] );
+            indices[i] = get_next_indice_fx( sts[ch], bits_37bits[i] ); /*Q0*/
+            move16();
         }
         {
-            gain[ch] = ( (float) get_next_indice( sts[ch], 7 ) - GAIN_Q_OFFSET_IVAS ) / 1.5f;
+            gain_fx[ch] = Mpy_32_32( L_shl( L_sub( get_next_indice_fx( sts[ch], 7 ), GAIN_Q_OFFSET_IVAS_FX ), Q20 ), TWO_BY_THREE_Q31 /* 2/3 in Q31 */ ); // Q20
+            move32();
         }
 
         /* MSVQ decoder */
-        msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, ms_ptr[ch], NULL );
+        shift = find_guarded_bits_fx( N );
+        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, ms_ptr_fx[ch], NULL, 7 ); // Q20 - shift
+
+        Scale_sig32( ms_ptr_fx[ch], N, shift ); // Q20
     }
 
-    if ( sts[0]->hFdCngDec->hFdCngCom->no_side_flag )
+    dtx_read_padding_bits_fx( sts[1], mult( sub( IVAS_SID_5k2, 4400 ), ONE_BY_FRAMES_PER_SEC_Q15 ) );
+
+    IF( sts[0]->hFdCngDec->hFdCngCom->no_side_flag )
     {
-        set_zero( ms_ptr[1], NPART );
+        set32_fx( ms_ptr_fx[1], 0, NPART );
     }
 
-    if ( is_out_ms == 0 )
+    IF( EQ_16( is_out_ms, 0 ) )
     {
-        inverseMS( N, ms_ptr[0], ms_ptr[1], 1.f );
+        inverseMS_fx( N, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q31 );
     }
 
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
+        max_exp_idx = 0;
+        move16();
         hFdCngCom = sts[ch]->hFdCngDec->hFdCngCom;
-        for ( p = 0; p < N; p++ )
+        FOR( p = 0; p < N; p++ )
         {
-            lr_ptr[ch][p] = powf( 10.f, ( ms_ptr[ch][p] + gain[ch] ) / 10.f );
+            tmp32 = L_add( ms_ptr_fx[ch][p], gain_fx[ch] );                                                  // Q20
+            tmp32_arr[p] = BASOP_util_Pow2( Mpy_32_32( tmp32, LOG_10_BASE_2_BY_10_Q31 ), Q11, &exp_arr[p] ); /*Q31 - exp_arr[p]*/
+            move32();
+            if ( LT_16( exp_arr[max_exp_idx], exp_arr[p] ) )
+            {
+                max_exp_idx = p; /*Q0*/
+                move16();
+            }
+        }
+
+        // Bringing in same exponent
+        FOR( p = 0; p < N; p++ )
+        {
+            lr_ptr_fx[ch][p] = L_shl( tmp32_arr[p], sub( exp_arr[p], exp_arr[max_exp_idx] ) ); /*Q31 - exp_arr[max_exp_idx]*/
+            move32();
         }
 
-        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, hFdCngCom->stopBand - hFdCngCom->startBand, hFdCngCom->cngNoiseLevel, 1 );
+        hFdCngCom->sidNoiseEstExp = exp_arr[max_exp_idx];
+        move16();
+
+        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );
+
+        hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
+        move16();
 
         lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, sts[ch]->preemph_fac );
     }
 
-    if ( hCPE->nchan_out == 1 && hCPE->last_element_brate <= IVAS_SID_4k4 )
+    test();
+    IF( EQ_16( hCPE->nchan_out, 1 ) && LE_32( hCPE->last_element_brate, IVAS_SID_5k2 ) )
     {
         /* create proper M noise shape in channel zero after gains have been applied */
-        for ( p = 0; p < N; p++ )
+        exp_diff = sub( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, sts[1]->hFdCngDec->hFdCngCom->sidNoiseEstExp );
+        move16();
+        FOR( p = 0; p < N; p++ )
+        {
+            IF( GT_16( exp_diff, 0 ) )
+            {
+                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], add( exp_diff, 1 ) ) ); /*Q18*/
+                move32();
+            }
+            ELSE
+            {
+                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], sub( 1, exp_diff ) ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ) ); /*Q18*/
+                move32();
+            }
+        }
+        IF( LT_16( exp_diff, 0 ) )
         {
-            sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = 0.5f * ( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] + sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p] );
+            sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp = add( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, negate( exp_diff ) );
+            move16();
         }
     }
 
@@ -5554,86 +5332,141 @@ void FdCngDecodeMDCTStereoSID(
 
 
 /*-------------------------------------------------------------------
- * FdCngDecodeDiracMDCTStereoSID()
+ * FdCngDecodeDiracMDCTStereoSID_fx()
  *
- * Decode FD-Cng parameters for CNG in 2TC DirAC mode from the bitstream
+ * Decode FD-CNG parameters for CNG in 2TC DirAC mode from the bitstream
  *-------------------------------------------------------------------*/
 
-void FdCngDecodeDiracMDCTStereoSID(
+void FdCngDecodeDiracMDCTStereoSID_fx(
     CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure     */
 )
 {
     DEC_CORE_HANDLE sts[CPE_CHANNELS];
     HANDLE_FD_CNG_COM hFdCngCom;
-    float *ms_ptr[CPE_CHANNELS];
-    float *lr_ptr[CPE_CHANNELS];
-    float logNoiseEst[CPE_CHANNELS][NPART];
-    float gain[CPE_CHANNELS];
-    int16_t indices[FD_CNG_stages_37bits];
-    int16_t N, i, ch, p;
-
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    Word32 *ms_ptr_fx[CPE_CHANNELS];
+    Word32 *lr_ptr_fx[CPE_CHANNELS];
+    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
+    Word32 gain_fx[CPE_CHANNELS];
+    Word16 indices[FD_CNG_stages_37bits];
+    Word16 N, i, ch, p;
+    Word32 *invTrfMatrix_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
+    Word16 shift, exp_diff, max_exp_idx;
+    Word16 exp_arr[NPART];
+    Word32 tmp32, tmp32_arr[NPART];
+
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;                                                                                        /* dynamically filled  */
+    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC ); // Q31
+
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         sts[ch] = hCPE->hCoreCoder[ch];
-        ms_ptr[ch] = &logNoiseEst[ch][0];
-        lr_ptr[ch] = &sts[ch]->hFdCngDec->hFdCngCom->sidNoiseEst[0];
-        ( sts[ch]->hFdCngDec )->hFdCngCom->sid_frame_counter++;
+        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];                         /*Q20*/
+        lr_ptr_fx[ch] = &sts[ch]->hFdCngDec->hFdCngCom->sidNoiseEst[0]; /*Q20*/
+        ( sts[ch]->hFdCngDec )->hFdCngCom->sid_frame_counter++;         /*Q18*/
     }
 
     /* decode noise shapes and gains */
     hFdCngCom = ( sts[0]->hFdCngDec )->hFdCngCom;
-    N = hFdCngCom->npart;
+    N = hFdCngCom->npart; /*Q0*/
+    move16();
 
     /* read bitstream */
-    for ( i = 0; i < FD_CNG_stages_37bits; i++ )
+    FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
     {
-        indices[i] = get_next_indice( sts[0], bits_37bits[i] );
+        indices[i] = get_next_indice_fx( sts[0], bits_37bits[i] ); /*Q0*/
+        move16();
     }
-    gain[0] = ( (float) get_next_indice( sts[0], 7 ) - GAIN_Q_OFFSET_IVAS ) / 1.5f;
-    gain[1] = gain[0];
+    gain_fx[0] = Mpy_32_32( L_shl( L_sub( get_next_indice_fx( sts[0], 7 ), GAIN_Q_OFFSET_IVAS_FX ), Q20 ), TWO_BY_THREE_Q31 /* 2/3 in Q31 */ ); // Q20
+    move32();
+
+    gain_fx[1] = gain_fx[0]; /*Q20*/
+    move32();
 
     /* MSVQ decoder */
-    msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, ms_ptr[0], NULL );
-    mvr2r( ms_ptr[0], ms_ptr[1], N );
+    shift = find_guarded_bits_fx( N );
+    msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, ms_ptr_fx[0], NULL, 7 ); // Q20 - shift
+
+    Scale_sig32( ms_ptr_fx[0], N, shift ); // Q20
 
-    /*inverseMS( N, ms_ptr[0], ms_ptr[1], 1.f );*/
+    Copy32( ms_ptr_fx[0], ms_ptr_fx[1], N ); /*Q20*/
 
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
+        max_exp_idx = 0;
+        move16();
         hFdCngCom = sts[ch]->hFdCngDec->hFdCngCom;
-        for ( p = 0; p < N; p++ )
+
+        FOR( p = 0; p < N; p++ )
+        {
+            tmp32 = L_add( ms_ptr_fx[ch][p], gain_fx[ch] );                                                  // Q20
+            tmp32_arr[p] = BASOP_util_Pow2( Mpy_32_32( tmp32, LOG_10_BASE_2_BY_10_Q31 ), Q11, &exp_arr[p] ); /*Q31 - exp_arr[p]*/
+            move32();
+            if ( LT_16( exp_arr[max_exp_idx], exp_arr[p] ) )
+            {
+                max_exp_idx = p; /*Q0*/
+                move16();
+            }
+        }
+
+        // Bringing in same exponent
+        FOR( p = 0; p < N; p++ )
         {
-            lr_ptr[ch][p] = powf( 10.f, ( ms_ptr[ch][p] + gain[ch] ) / 10.f );
+            lr_ptr_fx[ch][p] = L_shl( tmp32_arr[p], sub( exp_arr[p], exp_arr[max_exp_idx] ) ); /*Q20*/
+            move32();
         }
 
+        hFdCngCom->sidNoiseEstExp = exp_arr[max_exp_idx]; /*Q0*/
+        move16();
+
         /* NB last band energy compensation */
-        if ( hFdCngCom->CngBandwidth == NB )
+        test();
+        IF( hFdCngCom->CngBandwidth == NB )
         {
-            lr_ptr[ch][N - 1] *= NB_LAST_BAND_SCALE;
+            lr_ptr_fx[ch][( N - 1 )] = Mpy_32_32( lr_ptr_fx[ch][( N - 1 )], NB_LAST_BAND_SCALE_Q31 ); /*Q20*/
+            move32();
         }
-        else if ( hFdCngCom->CngBandwidth == SWB && hFdCngCom->CngBitrate <= ACELP_13k20 )
+        ELSE IF( EQ_16( hFdCngCom->CngBandwidth, SWB ) && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
         {
-            lr_ptr[ch][N - 1] *= SWB_13k2_LAST_BAND_SCALE;
+            lr_ptr_fx[ch][( N - 1 )] = Mpy_32_32( lr_ptr_fx[ch][( N - 1 )], SWB_13k2_LAST_BAND_SCALE_Q31 ); /*Q20*/
+            move32();
         }
 
-        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, hFdCngCom->stopBand - hFdCngCom->startBand, hFdCngCom->cngNoiseLevel, 1 );
+        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );
+
+        hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
+        move16();
 
         lpc_from_spectrum( hFdCngCom, hFdCngCom->startBand, hFdCngCom->stopFFTbin, sts[ch]->preemph_fac );
     }
-    sts[0]->hFdCngDec->hFdCngCom->coherence = 0.0f;
-    sts[1]->hFdCngDec->hFdCngCom->coherence = 0.0f;
+    sts[0]->hFdCngDec->hFdCngCom->coherence_fx = 0;
+    move16();
+    sts[1]->hFdCngDec->hFdCngCom->coherence_fx = 0;
+    move16();
 
-    if ( hCPE->nchan_out == 1 )
+    IF( EQ_16( hCPE->nchan_out, 1 ) )
     {
         /* create proper M noise shape in channel zero after gains have been applied */
-        for ( p = 0; p < N; p++ )
+        exp_diff = sub( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, sts[1]->hFdCngDec->hFdCngCom->sidNoiseEstExp );
+        FOR( p = 0; p < N; p++ )
+        {
+            IF( exp_diff > 0 )
+            {
+                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], add( exp_diff, 1 ) ) ); /*Q18*/
+                move32();
+            }
+            ELSE
+            {
+                sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = L_add( L_shr( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p], sub( 1, exp_diff ) ), L_shr( sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p], 1 ) ); /*Q18*/
+                move32();
+            }
+        }
+        IF( exp_diff < 0 )
         {
-            sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] = 0.5f * ( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEst[p] + sts[1]->hFdCngDec->hFdCngCom->sidNoiseEst[p] );
+            sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp = add( sts[0]->hFdCngDec->hFdCngCom->sidNoiseEstExp, negate( exp_diff ) );
+            move16();
         }
-        sts[0]->hFdCngDec->hFdCngCom->coherence = 0.0f;
-        sts[1]->hFdCngDec->hFdCngCom->coherence = 0.0f;
     }
 
     return;
 }
-#endif
diff --git a/lib_dec/gain_dec.c b/lib_dec/gain_dec.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_dec/gain_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c
index 210fae39e36c330676b8d77c97dbf67bb36fed0b..db325cd80b92a8be09722e96ce43d699613736e6 100644
--- a/lib_dec/gain_dec_fx.c
+++ b/lib_dec/gain_dec_fx.c
@@ -169,11 +169,7 @@ void gain_dec_tc_fx(
     IF( GT_16( nBits, 3 ) )
     {
         wgain_code = gain_dequant_fx( index, G_CODE_MIN_TC_Q15, G_CODE_MAX_TC_Q0, nBits, &expg );
-#ifdef BASOP_NOGLOB
         wgain_code = shl_sat( wgain_code, add( expg, 13 ) ); /* wgain_code in Q13*/
-#else
-        wgain_code = shl( wgain_code, add( expg, 13 ) ); /* wgain_code in Q13*/
-#endif
     }
     ELSE /* nBits == 3 */
     {
@@ -186,12 +182,8 @@ void gain_dec_tc_fx(
      *-----------------------------------------------------------------*/
 
     /* *gain_code *= gcode0;*/
-    L_tmp = L_mult( wgain_code, gcode0_fx ); /* Q13*Q0 -> Q14 */
-#ifdef BASOP_NOGLOB
+    L_tmp = L_mult( wgain_code, gcode0_fx );                  /* Q13*Q0 -> Q14 */
     *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 2 ) ); /*Q16*/
-#else
-    *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 2 ) );
-#endif
     move32();
 
     /**norm_gain_code = *gain_code / *gain_inov;*/
@@ -461,12 +453,8 @@ void gain_dec_mless_fx(
         gain_code16 = gain_dequant_fx( index, G_CODE_MIN_TC192_Q15, G_CODE_MAX_TC192_Q0, shr( add( nBits, 1 ), 1 ), &expg );
 
         /**gain_code *= gcode0;*/
-        L_tmp = L_mult( gain_code16, gcode0_fx ); /*Q0*Q0 -> Q1*/
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( gain_code16, gcode0_fx );                               /*Q0*Q0 -> Q1*/
         *gain_code_fx = L_shl_sat( L_tmp, add( add( expg, exp_gcode0 ), 15 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) );
-#endif
         move32();
     }
     ELSE
@@ -517,22 +505,34 @@ void gain_dec_mless_fx(
 
         L_tmp = Dot_product12( code_fx, code_fx, L_SUBFR, &expg ); /*Q31 - expg*/
         expg = sub( expg, 18 + 6 );                                /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
-        expg2 = expg;
-        move16();
-        L_tmp1 = L_tmp; /* sets to 'L_tmp' in 1 clock */
-        move32();
-        L_tmp = Isqrt_lc( L_tmp, &expg ); /*Q31 - expg*/
-
-        *gain_inov_fx = extract_h( L_shl( L_tmp, sub( expg, 3 ) ) ); /* gain_inov in Q12 */
-        move16();
-
-        /*Ei = 10 * (float)log10( Ecode );*/
-        e_tmp = norm_l( L_tmp1 );
-        f_tmp = Log2_norm_lc( L_shl( L_tmp1, e_tmp ) ); /*Q15*/
-        e_tmp = sub( expg2, add( 1, e_tmp ) );
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 12330 ); /* Q13 */ /* 10*log10(2) in Q12*/
-        Ei_fx = round_fx( L_shl( L_tmp1, 11 ) );             /* Q8 */
 
+        // To avoid crash in case code value is 0
+        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_tmp, expg, 21474836, 0 ), -1 ) )
+        {
+            // setting values to avoid extra computation
+            *gain_inov_fx = 32767; /*8(max value gain_inov can hold) in Q12*/
+            Ei_fx = -9743;         /* -38 in Q8*/
+            move16();
+            move16();
+        }
+        ELSE
+        {
+            expg2 = expg;
+            move16();
+            L_tmp1 = L_tmp; /* sets to 'L_tmp' in 1 clock */
+            move32();
+            L_tmp = Isqrt_lc( L_tmp, &expg ); /*Q31 - expg*/
+
+            *gain_inov_fx = extract_h( L_shl( L_tmp, sub( expg, 3 ) ) ); /* gain_inov in Q12 */
+            move16();
+
+            /*Ei = 10 * (float)log10( Ecode );*/
+            e_tmp = norm_l( L_tmp1 );
+            f_tmp = Log2_norm_lc( L_shl( L_tmp1, e_tmp ) ); /*Q15*/
+            e_tmp = sub( expg2, add( 1, e_tmp ) );
+            L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 12330 ); /* Q13 */ /* 10*log10(2) in Q12*/
+            Ei_fx = round_fx( L_shl( L_tmp1, 11 ) );             /* Q8 */
+        }
         /*-----------------------------------------------------------------*
          * calculate the predicted gain code
          *-----------------------------------------------------------------*/
@@ -560,11 +560,7 @@ void gain_dec_mless_fx(
 
         /**gain_code = qua_table[index * 2 + 1] * gcode0;*/
         L_tmp = L_mult( qua_table_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
+        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) );         /*Q16*/
         move32();
     }
 
@@ -605,392 +601,8 @@ void gain_dec_mless_fx(
 /* RETURN ARGUMENTS :																*/
 /* _ None																			*/
 /*==================================================================================*/
-void gain_dec_lbr_fx(
-    Decoder_State *st_fx,      /* i/o: decoder state structure                                         */
-    const Word16 coder_type,   /* i  : coding type                                                     */
-    const Word16 i_subfr,      /* i  : subframe index                                                  */
-    const Word16 *code_fx,     /* i  : algebraic excitation                                         Q9 */
-    Word16 *gain_pit_fx,       /* o  : quantized pitch gain                                         Q14*/
-    Word32 *gain_code_fx,      /* o  : quantized codebook gain                                      Q16*/
-    Word16 *gain_inov_fx,      /* o  : gain of the innovation (used for normalization)              Q12*/
-    Word32 *norm_gain_code_fx, /* o  : norm. gain of the codebook excitation                        Q16*/
-    Word32 gc_mem[],           /* i/o: gain_code from previous subframes                            Q16*/
-    Word16 gp_mem[],           /* i/o: gain_pitch from previous subframes                           Q14*/
-    const Word16 L_subfr       /* i  : subfr lenght                                                    */
-)
-{
-    Word16 index, nBits, n_pred, ctype;
-    Word16 gcode0_fx, aux_fx[10];
-    Word32 L_tmp, L_tmp1, L_tmp2;
-    Word16 expg, expg2, e_tmp, exp_gcode0, f_tmp, frac, tmp_fx;
-    const Word16 *b_fx, *cdbk_fx = 0;
-    /*      Ecode = ( dotp( code, code, L_SUBFR ) + 0.01f ) / L_SUBFR;
-     *gain_inov = 1.0f / (float)sqrt(Ecode);	*/
-    Word16 shift_L_subfr;
-    shift_L_subfr = 6;
-    move16(); // for *cdbk_fx
-    move16();
-    if ( GT_16( L_subfr, L_SUBFR ) )
-    {
-        shift_L_subfr = add( shift_L_subfr, 1 );
-    }
-    L_tmp = Dot_product12( code_fx, code_fx, L_subfr, &expg ); /*Q31 - expg*/
-    expg = sub( expg, add( 18, shift_L_subfr ) );              /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
-
-    expg2 = expg;
-    move16();
-    L_tmp2 = L_tmp; /* sets to 'L_tmp' in 1 clock */
-    move32();
-    L_tmp = Isqrt_lc( L_tmp, &expg ); /*Q31 - expg*/
-
-    *gain_inov_fx = extract_h( L_shl_sat( L_tmp, sub( expg, 3 ) ) ); /* gain_inov in Q12 */
-    move16();
-
-    /*-----------------------------------------------------------------*
-     * select the codebook, size and number of bits
-     * set the gains searching range
-     *-----------------------------------------------------------------*/
-    nBits = st_fx->acelp_cfg.gains_mode[shr( i_subfr, shift_L_subfr )];
-    move16();
-
-    ctype = shl( sub( coder_type, 1 ), 1 );
-
-    /*-----------------------------------------------------------------*
-     * calculate prediction of gcode
-     * search for the best codeword
-     *-----------------------------------------------------------------*/
-    IF( i_subfr == 0 )
-    {
-        b_fx = b_1sfr_fx;
-        move16();
-        n_pred = 2;
-        move16();
-        cdbk_fx = gp_gamma_1sfr_6b_fx;
-        SWITCH( nBits )
-        {
-            case 8:
-            {
-                cdbk_fx = gp_gamma_1sfr_8b_fx; /* Q14/Q9*/
-                BREAK;
-            }
-            case 7:
-            {
-                cdbk_fx = gp_gamma_1sfr_7b_fx; /* Q14/Q9*/
-                BREAK;
-            }
-            case 6:
-            {
-                cdbk_fx = gp_gamma_1sfr_6b_fx; /* Q14/Q9*/
-                BREAK;
-            }
-        }
-
-        /* calculate predicted gain */
-        aux_fx[0] = 4096; /*Q12*/
-        move16();
-        aux_fx[1] = shl( ctype, 12 ); /*Q12*/
-        move16();
-
-        /*     gcode0 = (float)pow(10, dotp(b, aux, n_pred) - 0.5f * (float)log10(Ecode));
-               gcode0 = (float)pow(10, dotp(b, aux, n_pred) - 0.05f * 10 * (float)log10(Ecode));
-               gcode0 = (float)pow(10, 0.05(20 * dotp(b, aux, n_pred) - 10 * (float)log10(Ecode))); */
-
-        e_tmp = norm_l( L_tmp2 );
-        f_tmp = Log2_norm_lc( L_shl( L_tmp2, e_tmp ) ); /*Q15*/
-        e_tmp = sub( expg2, add( 1, e_tmp ) );
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 12330 ); /* Q13 */ /* 10*log10(2) in Q12*/
-
-        L_tmp = Dot_product( b_fx, aux_fx, n_pred ); /*Q25*/
-        L_tmp = Mult_32_16( L_tmp, 160 );            /*Q13, 20 in Q3*/
-        L_tmp = L_sub( L_tmp, L_tmp1 );              /*Q13*/
-
-        gcode0_fx = round_fx( L_shl( L_tmp, 11 ) ); /* Q8 */
-
-
-        /*-----------------------------------------------------------------*
-         * gcode0 = pow(10.0, gcode0/20)
-         * = pow(2, 3.321928*gcode0/20)
-         * = pow(2, 0.166096*gcode0)
-         *-----------------------------------------------------------------*/
-
-        L_tmp = L_mult( gcode0_fx, 21771 );        /* *0.166096 in Q17 -> Q26 */
-        L_tmp = L_shr( L_tmp, 10 );                /* From Q26 to Q16 */
-        frac = L_Extract_lc( L_tmp, &exp_gcode0 ); /* Extract exponent of gcode0 */
-
-        gcode0_fx = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
-        /* output of Pow2() will be: */
-        /* 16384 < Pow2() <= 32767 */
-        exp_gcode0 = sub( exp_gcode0, 14 );
-
-        /* retrieve the codebook index and calculate both gains */
-        /*index = (Word16)get_indice( st_fx,"gain", i_subfr, ACELP_CORE);move16();*/
-        index = (Word16) get_next_indice_fx( st_fx, nBits ); /*Q0*/
-        move16();
-
-        *gain_pit_fx = cdbk_fx[index * 2]; /*Q14*/
-        move16();
-
-        L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
-        move16();
-
-        gc_mem[0] = *gain_code_fx; /*Q16*/
-        move32();
-        gp_mem[0] = *gain_pit_fx; /*Q14*/
-        move16();
-    }
-    ELSE IF( EQ_16( i_subfr, L_SUBFR ) || EQ_16( L_subfr, 2 * L_SUBFR ) )
-    {
-        b_fx = b_2sfr_fx; /*Q12*/
-        move16();
-        n_pred = 4;
-        move16();
-
-        cdbk_fx = gp_gamma_1sfr_6b_fx; /*Q14/Q9 */
-        SWITCH( nBits )
-        {
-            case 7:
-            {
-                cdbk_fx = gp_gamma_2sfr_7b_fx; /* Q14/Q9*/
-                BREAK;
-            }
-            case 6:
-            {
-                cdbk_fx = gp_gamma_2sfr_6b_fx; /* Q14/Q9*/
-                BREAK;
-            }
-        }
-
-        /* calculate predicted gain */
-        aux_fx[0] = 4096; /*Q12*/
-        move16();
-        aux_fx[1] = shl( ctype, 12 ); /*Q12*/
-        move16();
-
-        /*aux_fx[2] = (float)log10(gc_mem[0]);
-                    = log2(gc_mem[0])*log10(2);*/
-        e_tmp = norm_l( gc_mem[0] );
-        f_tmp = Log2_norm_lc( L_shl( gc_mem[0], e_tmp ) ); /*Q15*/
-        e_tmp = sub( sub( 30, e_tmp ), 16 );               /*Q_format(gc_mem[0])=16*/
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 9864 );          /* Q16 */
-        aux_fx[2] = round_fx( L_shl( L_tmp1, 12 ) );       /* Q12 */
-        move16();
-
-        aux_fx[3] = shr( gp_mem[0], 2 ); /*Q12*/
-        move16();
-
-        /*-----------------------------------------------------------------*
-         * gcode0 = pow(10.0, dotp(b, aux, n_pred)
-         * = pow(2, 3.321928*dotp(b, aux, n_pred)
-         *-----------------------------------------------------------------*/
-        L_tmp = Dot_product( b_fx, aux_fx, n_pred ); /*Q25*/
-        L_tmp = Mult_32_16( L_tmp, 27213 );          /* *3.321928 in Q13 -> Q23 */
-        L_tmp = L_shr( L_tmp, 7 );                   /* From Q23 to Q16 */
-        frac = L_Extract_lc( L_tmp, &exp_gcode0 );   /* Extract exponent of gcode0 */
 
-        gcode0_fx = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
-        /* output of Pow2() will be: */
-        /* 16384 < Pow2() <= 32767 */
-        exp_gcode0 = sub( exp_gcode0, 14 );
-
-        /* retrieve the codebook index and calculate both gains */
-        index = (Word16) get_next_indice_fx( st_fx, nBits ); /*Q0*/
-        move16();
-
-        *gain_pit_fx = cdbk_fx[index * 2]; /*Q14*/
-        move16();
-
-        L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
-        move16();
-
-        gc_mem[1] = *gain_code_fx; /*Q16*/
-        move32();
-        gp_mem[1] = *gain_pit_fx; /*Q14*/
-        move16();
-    }
-    ELSE IF( EQ_16( i_subfr, 2 * L_SUBFR ) )
-    {
-        b_fx = b_3sfr_fx;
-        move16();
-        n_pred = 6;
-        move16();
-
-        cdbk_fx = gp_gamma_3sfr_6b_fx; /*Q14/Q9 */
-
-        if ( EQ_16( nBits, 7 ) )
-        {
-            cdbk_fx = gp_gamma_3sfr_7b_fx; /*Q14*/
-            // PMT("verify if gp_gamma_3sfr_7b_fx is correct")
-        }
-
-        /* calculate predicted gain */
-        aux_fx[0] = 4096; /*Q12*/
-        move16();
-        aux_fx[1] = shl( ctype, 12 ); /*Q12*/
-        move16();
-
-        /*aux_fx[2] = (float)log10(gc_mem[0]);
-                    = log2(gc_mem[0])*log10(2);*/
-        e_tmp = norm_l( gc_mem[0] );
-        f_tmp = Log2_norm_lc( L_shl( gc_mem[0], e_tmp ) ); /*Q15*/
-        e_tmp = sub( sub( 30, e_tmp ), 16 );               /*Q_format(gc_mem[0])=16*/
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 9864 );          /* Q16 */
-        aux_fx[2] = round_fx( L_shl( L_tmp1, 12 ) );       /* Q12 */
-        move16();
-
-        /*aux[3] = (float)log10(gc_mem[1]);
-                 =  log2(gc_mem[1])*log10(2);*/
-        e_tmp = norm_l( gc_mem[1] );
-        f_tmp = Log2_norm_lc( L_shl( gc_mem[1], e_tmp ) ); /*Q15*/
-        e_tmp = sub( sub( 30, e_tmp ), 16 );               /*Q_format(gc_mem[1])=16*/
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 9864 );          /* Q16 */
-        aux_fx[3] = round_fx( L_shl( L_tmp1, 12 ) );       /* Q12 */
-        move16();
-
-        aux_fx[4] = shr( gp_mem[0], 2 ); /*Q12*/
-        move16();
-        aux_fx[5] = shr( gp_mem[1], 2 ); /*Q12*/
-        move16();
-
-        /*-----------------------------------------------------------------*
-         * gcode0 = pow(10.0, dotp(b, aux, n_pred)
-         * = pow(2, 3.321928*dotp(b, aux, n_pred)
-         *-----------------------------------------------------------------*/
-        L_tmp = Dot_product( b_fx, aux_fx, n_pred ); /*Q25*/
-        L_tmp = Mult_32_16( L_tmp, 27213 );          /* *3.321928 in Q13 -> Q23 */
-        L_tmp = L_shr( L_tmp, 7 );                   /* From Q23 to Q16 */
-        frac = L_Extract_lc( L_tmp, &exp_gcode0 );   /* Extract exponent of gcode0 */
-
-        gcode0_fx = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
-        /* output of Pow2() will be: */
-        /* 16384 < Pow2() <= 32767 */
-        exp_gcode0 = sub( exp_gcode0, 14 );
-
-        /* retrieve the codebook index and calculate both gains */
-        index = (Word16) get_next_indice_fx( st_fx, nBits );
-        move16();
-
-        *gain_pit_fx = cdbk_fx[( index * 2 )]; /*Q14*/
-        move16();
-
-        L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16*/
-#endif
-        move32();
-        gc_mem[2] = *gain_code_fx; /*Q16*/
-        move32();
-        gp_mem[2] = *gain_pit_fx; /*Q14*/
-        move16();
-    }
-    ELSE IF( EQ_16( i_subfr, 3 * L_SUBFR ) )
-    {
-        b_fx = b_4sfr_fx; /*Q12*/
-        n_pred = 8;
-        move16();
-
-
-        cdbk_fx = gp_gamma_4sfr_6b_fx; /*Q14*/
-#ifdef IVAS_GAIN_MOD
-        IF( EQ_16( nBits, 7 ) )
-        {
-            cdbk_fx = gp_gamma_4sfr_7b_fx;
-            PMT( "verify if gp_gamma_4sfr_7b_fx is correct" )
-        }
-#endif
-
-        /* calculate predicted gain */
-        aux_fx[0] = 4096; /*Q12*/
-        move16();
-        aux_fx[1] = shl( ctype, 12 ); /*Q12*/
-        move16();
-
-        /*aux[2] = (float)log10(gc_mem[0]);
-                    = log2(gc_mem[0])*log10(2);*/
-        e_tmp = norm_l( gc_mem[0] );
-        f_tmp = Log2_norm_lc( L_shl( gc_mem[0], e_tmp ) ); /*Q15*/
-        e_tmp = sub( sub( 30, e_tmp ), 16 );               /*Q_format(gc_mem[0])=16*/
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 9864 );          /* Q16 */
-        aux_fx[2] = round_fx( L_shl( L_tmp1, 12 ) );       /* Q12 */
-        move16();
-
-        /*aux[3] = (float)log10(gc_mem[1]);
-                 =  log2(gc_mem[1])*log10(2);*/
-        e_tmp = norm_l( gc_mem[1] );
-        f_tmp = Log2_norm_lc( L_shl( gc_mem[1], e_tmp ) ); /*Q15*/
-        e_tmp = sub( sub( 30, e_tmp ), 16 );               /*Q_format(gc_mem[1])=16*/
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 9864 );          /* Q16 */
-        aux_fx[3] = round_fx( L_shl( L_tmp1, 12 ) );       /* Q12 */
-        move16();
-
-        /*aux[4] = (float)log10(gc_mem[2]);
-                 =  log2(gc_mem[2])*log10(2);*/
-        e_tmp = norm_l( gc_mem[2] );
-        f_tmp = Log2_norm_lc( L_shl( gc_mem[2], e_tmp ) ); /*Q15*/
-        e_tmp = sub( sub( 30, e_tmp ), 16 );               /*Q_format(gc_mem[2])=16*/
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 9864 );          /* Q16 */
-        aux_fx[4] = round_fx( L_shl( L_tmp1, 12 ) );       /* Q12 */
-        move16();
-
-        aux_fx[5] = shr( gp_mem[0], 2 ); /*Q12*/
-        move16();
-        aux_fx[6] = shr( gp_mem[1], 2 ); /*Q12*/
-        move16();
-        aux_fx[7] = shr( gp_mem[2], 2 ); /*Q12*/
-        move16();
-
-        /*-----------------------------------------------------------------*
-         * gcode0 = pow(10.0, dotp(b, aux, n_pred)
-         * = pow(2, 3.321928*dotp(b, aux, n_pred)
-         *-----------------------------------------------------------------*/
-        L_tmp = Dot_product( b_fx, aux_fx, n_pred ); /*Q25*/
-        L_tmp = Mult_32_16( L_tmp, 27213 );          /* *3.321928 in Q13 -> Q23 */
-        L_tmp = L_shr( L_tmp, 7 );                   /* From Q23 to Q16 */
-        frac = L_Extract_lc( L_tmp, &exp_gcode0 );   /* Extract exponent of gcode0 */
-
-        gcode0_fx = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
-        /* output of Pow2() will be: */
-        /* 16384 < Pow2() <= 32767 */
-        exp_gcode0 = sub( exp_gcode0, 14 );
-
-        /* retrieve the codebook index and calculate both gains */
-        index = (Word16) get_next_indice_fx( st_fx, nBits ); /*Q0*/
-        move16();
-        *gain_pit_fx = cdbk_fx[( index * 2 )]; /*Q14*/
-        move16();
-
-        L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
-        move32();
-    }
-
-    /* *norm_gain_code = *gain_code / *gain_inov; */
-    expg = sub( norm_s( *gain_inov_fx ), 1 );
-    expg = s_max( expg, 0 );
-
-    tmp_fx = div_s( shr( 8192, expg ), *gain_inov_fx );                                /*Q15*/
-    *norm_gain_code_fx = L_shr( Mult_32_16( *gain_code_fx, tmp_fx ), sub( 1, expg ) ); /*Q16*/
-    move32();
-
-    return;
-}
-
-void gain_dec_lbr_ivas_fx(
+void gain_dec_lbr_fx(
     Decoder_State *st_fx,      /* i/o: decoder state structure                                         */
     const Word16 coder_type,   /* i  : coding type                                                     */
     const Word16 i_subfr,      /* i  : subframe index                                                  */
@@ -1117,11 +729,7 @@ void gain_dec_lbr_ivas_fx(
         move16();
 
         L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
+        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) );    /*Q16*/
         move16();
 
         gc_mem[0] = *gain_code_fx; /*Q16*/
@@ -1191,11 +799,7 @@ void gain_dec_lbr_ivas_fx(
         move16();
 
         L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
+        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) );    /*Q16*/
         move16();
 
         gc_mem[1] = *gain_code_fx; /*Q16*/
@@ -1269,11 +873,7 @@ void gain_dec_lbr_ivas_fx(
         move16();
 
         L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16*/
-#endif
+        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) );    /* Q10 -> Q16*/
         move32();
         gc_mem[2] = *gain_code_fx; /*Q16*/
         move32();
@@ -1356,11 +956,7 @@ void gain_dec_lbr_ivas_fx(
         move16();
 
         L_tmp = L_mult( cdbk_fx[( ( index * 2 ) + 1 )], gcode0_fx ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
-        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /*Q16*/
-#else
-        *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 6 ) );
-#endif
+        *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) );    /*Q16*/
         move32();
     }
 
@@ -1414,11 +1010,7 @@ void lp_gain_updt_fx(
 {
     Word16 tmp;
 
-#ifdef BASOP_NOGLOB
     tmp = extract_h( L_shl_sat( norm_gain_code, 3 ) ); /*(16+3)-16 -> Q3*/
-#else
-    tmp = extract_h( L_shl( norm_gain_code, 3 ) ); /*(16+3)-16 -> Q3*/
-#endif
     IF( EQ_16( L_frame, L_FRAME ) )
     {
         IF( EQ_16( i_subfr, 0 ) )
@@ -1446,11 +1038,7 @@ void lp_gain_updt_fx(
         {
             *lp_gainp = add( *lp_gainp, mult( 13107, gain_pit ) );
             move16(); /*Q14  (0.4 in Q15 = 13107)*/
-#ifdef BASOP_NOGLOB
             *lp_gainc = mac_r_sat( L_deposit_h( *lp_gainc ), 13107, tmp );
-#else
-            *lp_gainc = mac_r( L_deposit_h( *lp_gainc ), 13107, tmp );
-#endif
             move16(); /*Q3*/
         }
     }
@@ -1488,11 +1076,7 @@ void lp_gain_updt_fx(
         {
             *lp_gainp = add( *lp_gainp, mult( 10923, gain_pit ) );
             move16(); /*Q14  (5.0/15.0 in Q15 = 10923)*/
-#ifdef BASOP_NOGLOB
             *lp_gainc = mac_r_sat( L_deposit_h( *lp_gainc ), 10923, tmp );
-#else
-            *lp_gainc = mac_r( L_deposit_h( *lp_gainc ), 10923, tmp );
-#endif
             move16(); /*Q3*/
         }
     }
@@ -1538,11 +1122,7 @@ void lp_gain_updt_ivas_fx(
 {
     Word16 tmp;
 
-#ifdef BASOP_NOGLOB
     tmp = extract_h( L_shl_sat( norm_gain_code, 3 ) ); /*(16+3)-16 -> Q3*/
-#else
-    tmp = extract_h( L_shl( norm_gain_code, 3 ) ); /*(16+3)-16 -> Q3*/
-#endif
     /* To handle extremely low values */
     test();
     if ( norm_gain_code != 0 && tmp == 0 )
@@ -1578,11 +1158,7 @@ void lp_gain_updt_ivas_fx(
         {
             *lp_gainp = add( *lp_gainp, mult( 13107, gain_pit ) );
             move16(); /*Q14  (0.4 in Q15 = 13107)*/
-#ifdef BASOP_NOGLOB
             *lp_gainc = mac_r_sat( L_deposit_h( *lp_gainc ), 13107, tmp );
-#else
-            *lp_gainc = mac_r( L_deposit_h( *lp_gainc ), 13107, tmp );
-#endif
             move16(); /*Q3*/
         }
     }
@@ -1620,11 +1196,7 @@ void lp_gain_updt_ivas_fx(
         {
             *lp_gainp = add( *lp_gainp, mult( 10923, gain_pit ) );
             move16(); /*Q14  (5.0/15.0 in Q15 = 10923)*/
-#ifdef BASOP_NOGLOB
             *lp_gainc = mac_r_sat( L_deposit_h( *lp_gainc ), 10923, tmp );
-#else
-            *lp_gainc = mac_r( L_deposit_h( *lp_gainc ), 10923, tmp );
-#endif
             move16(); /*Q3*/
         }
     }
@@ -1641,24 +1213,28 @@ void lp_gain_updt_ivas_fx(
 }
 
 /*-------------------------------------------------*
- *  Gain_dec_gaus_vbr
+ * gain_dec_gaus_fx()
  *
  * Decode gains of purely unvoiced sounds
  *-------------------------------------------------*/
-Word32 gain_dec_gaus_fx(                             /* o  : quantized codebook gain                Q16  */
-                         Word16 index,               /* i  : quantization index                          */
-                         const Word16 bits,          /* i  : number of bits to quantize                  */
-                         const Word16 lowBound,      /* i  : lower bound of quantizer (dB)               */
-                         const Word16 topBound,      /* i  : upper bound of quantizer (dB)               */
-                         const Word16 inv_gain_inov, /* o  : unscaled innovation gain                Q12 */
-                         Word32 *L_norm_gain_code    /* o  : gain of normalized gaussian excitation  Q16 */
+
+/*! r: quantized codebook gain  Q16  */
+Word32 gain_dec_gaus_fx(
+    Word16 index,               /* i  : quantization index                          */
+    const Word16 bits,          /* i  : number of bits to quantize                  */
+    const Word16 lowBound,      /* i  : lower bound of quantizer (dB)               */
+    const Word16 topBound,      /* i  : upper bound of quantizer (dB)               */
+    const Word16 inv_gain_inov, /* o  : unscaled innovation gain                Q12 */
+    Word32 *L_norm_gain_code    /* o  : gain of normalized gaussian excitation  Q16 */
 )
 {
     Word16 stepSize, gain, expg, frac, expi, tmp_igi;
     Word32 L_tmp, L_enr_q, L_gain;
     Word16 stepSize_Exp;
+
     stepSize_Exp = 14;
     move16();
+
     /*------------------------------------------------------------------------------------------*
      * Quantize linearly the log E
      *------------------------------------------------------------------------------------------*/
@@ -1691,24 +1267,14 @@ Word32 gain_dec_gaus_fx(                             /* o  : quantized codebook
     expg = add( expg, 16 - 30 );          /* output of Pow2() will be */
     /* Normalized, set result in Q16 */
     gain = round_fx( L_gain );
-#ifdef BASOP_NOGLOB
     L_gain = L_shl_sat( L_gain, expg ); /* In Q16*/
-#else
-    L_gain = L_shl( L_gain, expg ); /* In Q16*/
-#endif
     /* *norm_gain_code = gain / *inv_gain_inov;*/
     expi = norm_s( inv_gain_inov );
     tmp_igi = shl( inv_gain_inov, expi );
     L_tmp = div_s( shr( gain, 1 ), tmp_igi );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_sat( L_tmp, add( 1, expi ) );
     *L_norm_gain_code = L_shl_sat( L_tmp, add( expg, 13 ) ); /* Q16 */
     move32();
-#else
-    L_tmp = L_shl( L_tmp, add( 1, expi ) );
-    *L_norm_gain_code = L_shl( L_tmp, add( expg, 13 ) ); /* Q16 */
-    move32();
-#endif
 
     return L_gain;
 }
@@ -1805,11 +1371,7 @@ void gain_dec_SQ_fx(
     /**gain_code *= gcode0;*/
     L_tmp = L_mult( tmp16, gcode0 ); /* Q0*Q0 -> Q1*/
     /**gain_code = L_shl(L_tmp,add(expg,15));       Q16*/
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( L_tmp, add( add( expg, exp_gcode0 ), 15 ) ); /*Q16*/
-#else
-    *gain_code = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) );
-#endif
     move32();
 
     /**norm_gain_code = *gain_code / *gain_inov;*/
@@ -1934,11 +1496,7 @@ void gain_dec_amr_wb_fx(
 
     /* adjust gain according to energy of code */
     L_tmp = Mult_32_16( *gain_code, *gain_inov );
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_o( L_tmp, 3, &Overflow ); /* gcode_inov in Q12*/
-#else
-    *gain_code = L_shl( L_tmp, 3 );
-#endif
     move32();
 
     /*-----------------------------------------------------------------*
diff --git a/lib_dec/gaus_dec.c b/lib_dec/gaus_dec.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_dec/gaus_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/gs_dec.c b/lib_dec/gs_dec.c
deleted file mode 100644
index 79457ca5d89f27400733b171424935cf844532dd..0000000000000000000000000000000000000000
--- a/lib_dec/gs_dec.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include <math.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * decod_audio()
- *
- * Decode audio (AC) frames
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/gs_dec_amr_wb.c b/lib_dec/gs_dec_amr_wb.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_dec/gs_dec_amr_wb.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/gs_dec_amr_wb_fx.c b/lib_dec/gs_dec_amr_wb_fx.c
index a4aef88dd698f73733008dd01196d465b25b9c76..eea37431a865aba1ec1ddcc180a859525f672e45 100644
--- a/lib_dec/gs_dec_amr_wb_fx.c
+++ b/lib_dec/gs_dec_amr_wb_fx.c
@@ -24,9 +24,6 @@
 #define NORMALIZE_SPECS_Q_OUT 6
 #define ENER_FX_Q_GUARD       1
 
-#ifdef ADD_IVAS_GS_DEC_IMPR
-#define CONTR_LIMIT 3012 to be verified for fixed point /* Threshold to allow an increase in the contribution length */
-#endif
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -34,12 +31,7 @@ static void NoiseFill_fx( Word16 *exc_diffQ_fx, Word16 *seed_tcx, const Word16 M
 static void Ener_per_band_fx( const Word16 exc_diff_fx[], const Word16 exc_diff_exp, Word32 y_gain4_fx[] );
 static void Apply_gain_fx( Word16 exc_diffQ_fx[], Word32 L_Ener_per_bd_iQ[], Word32 L_Ener_per_bd_yQ[], const Word16 Q_out );
 static void normalize_spec_fx( Word16 fac_up_fx, Word16 fy_norm_fx[], const Word16 L_frame, const Word16 Q_out );
-static void gs_dec_amr_wb_fx( const long core_brate, Word16 *seed_tcx, const Word16 dct_in_fx[], const Word16 Q_dct_in, Word16 dct_out_fx[], Word16 Q_dct_out, const Word16 pitch_fx[], const Word16 voice_fac, const Word16 clas, const Word16 coder_type
-#ifdef ADD_IVAS_GS_DEC_IMPR
-                              ,
-                              const Word16 VeryLowRateSTflag
-#endif
-);
+static void gs_dec_amr_wb_fx( const long core_brate, Word16 *seed_tcx, const Word16 dct_in_fx[], const Word16 Q_dct_in, Word16 dct_out_fx[], Word16 Q_dct_out, const Word16 pitch_fx[], const Word16 voice_fac, const Word16 clas, const Word16 coder_type );
 
 /*-------------------------------------------------------------------*
  * NoiseFill_fx()
@@ -111,11 +103,7 @@ static void Ener_per_band_fx(
         IF( L_temp != 0 )             /* avoid executing sqrt of 0 (because a div_s is used to invert and then call inv_sqrt) */
         {
             L_temp2 = Sqrt_Ratio32( L_temp, exp, 1, 0, &i );
-#ifdef BASOP_NOGLOB
             L_temp2 = L_shr_sat( L_temp2, sub( 15 - ENER_FX_Q_GUARD, i ) ); /* Q16 */
-#else
-            L_temp2 = L_shr( L_temp2, sub( 15 - ENER_FX_Q_GUARD, i ) );
-#endif
         }
         y_gain4_fx[j] = L_temp2; /* Q16 */
         move32();
@@ -155,12 +143,8 @@ static void Apply_gain_fx(
     {
         EndBin = add( CurBin, crit_bins[i_band] ); /* Q0 */
         y_gain_exp = norm_l( L_Ener_per_bd_yQ[i_band] );
-        exp3 = norm_l( L_Ener_per_bd_iQ[i_band] ); /* use 'exp3' as temporary exponent of 'L_Ener_per_bd_iQ[]' */
-#ifdef BASOP_NOGLOB
+        exp3 = norm_l( L_Ener_per_bd_iQ[i_band] );                                                                                                                                    /* use 'exp3' as temporary exponent of 'L_Ener_per_bd_iQ[]' */
         y_gain_fx = round_fx_sat( Div_flt32_flt32( L_shl_sat( L_Ener_per_bd_iQ[i_band], exp3 ), exp3, L_shl_sat( L_Ener_per_bd_yQ[i_band], y_gain_exp ), y_gain_exp, &y_gain_exp ) ); /* y_gain_exp - 31 + Q_out */
-#else
-        y_gain_fx = round_fx( Div_flt32_flt32( L_shl( L_Ener_per_bd_iQ[i_band], exp3 ), exp3, L_shl( L_Ener_per_bd_yQ[i_band], y_gain_exp ), y_gain_exp, &y_gain_exp ) );
-#endif
         y_gain_exp = add( sub( y_gain_exp, 31 ), Q_out );
         exp3 = sub( y_gain_exp, 16 - 1 );
 
@@ -204,11 +188,7 @@ static void normalize_spec_fx(
     temp = Invert16( abs_s( fy_norm_fx[idx] ), &exp ); /* Q15 + exp */
     L_temp = L_mult( temp, fac_up_fx );                /* Q15 + exp + Q8 + 1 */
     exp = sub( 15, exp );
-#ifdef BASOP_NOGLOB
     L_temp = L_shl_sat( L_temp, exp ); /* Q24 + Q_out */
-#else
-    L_temp = L_shl( L_temp, exp );
-#endif
     FOR( j = 0; j < L_frame; j++ )
     {
         fy_norm_fx[j] = round_fx( Mult_32_16( L_temp, fy_norm_fx[j] ) ); /* Q_out */
@@ -235,10 +215,6 @@ static void gs_dec_amr_wb_fx(
     const Word16 voice_fac,   /* i  : gain pitch						 Q15*/
     const Word16 clas,        /* i  : signal frame class                  Q0*/
     const Word16 coder_type   /* i  : coder type                          Q0*/
-#ifdef ADD_IVAS_GS_DEC_IMPR
-    ,
-    const Word16 VeryLowRateSTflag /* i  : Enable the noise enhancement for very low rate stereo generic mode */
-#endif
 )
 {
     Word16 i, mDiff_len;
@@ -264,11 +240,7 @@ static void gs_dec_amr_wb_fx(
         move16();
         FOR( i = 0; i < CRIT_NOIS_BAND; i++ )
         {
-#ifdef BASOP_NOGLOB
             temp = s_max( round_fx_sat( Ener_per_bd_iQ_fx[i] ), temp ); /* Q0 */
-#else
-            temp = s_max( round_fx( Ener_per_bd_iQ_fx[i] ), temp );
-#endif
         }
 
         test();
@@ -296,13 +268,7 @@ static void gs_dec_amr_wb_fx(
     temp = Invert16( temp, &exp );                       /* Q15 */
     L_temp = L_mult( temp, 12800 );                      /* Q15 */
     L_temp = L_shl( L_temp, sub( 3, exp ) ); /* *8.0f */ /* Q15 */
-#ifdef ADD_IVAS_GS_DEC_IMPR
-    test();
-    test();
-    IF( L_temp <= CONTR_LIMIT && ( VeryLowRateSTflag || GE_32( core_brate, ACELP_12k65 ) ) )
-#else
     if ( GE_32( core_brate, ACELP_12k65 ) )
-#endif
     {
         L_temp = L_shl( L_temp, 1 ); /* Q16 */
     }
@@ -327,16 +293,6 @@ static void gs_dec_amr_wb_fx(
     mDiff_len = s_max( round_fx( L_temp ), BIN_1k2 ); /* Q0 */
 
 
-#ifdef ADD_IVAS_GS_DEC_IMPR
-    IF( ( VeryLowRateSTflag && ( EQ_16( clas, VOICED_CLAS ) || EQ_16( clas, AUDIO_CLAS ) ) ) ) /* Do not apply normalization on VOICED signal in case of stereo */
-    {
-        Copy( dct_in_fx, exc_diffQ, L_FRAME );
-
-        /* normalization of the spectrum and noise fill */
-        normalize_spec_fx( 1 * 256, exc_diffQ + mDiff_len, sub( L_FRAME, mDiff_len ), NORMALIZE_SPECS_Q_OUT );
-    }
-    ELSE
-#endif
     {
         Copy( dct_in_fx, exc_diffQ_fx, mDiff_len ); /* Q_dct_in */
         set16_fx( exc_diffQ_fx + mDiff_len, 0, sub( L_FRAME, mDiff_len ) );
@@ -403,10 +359,6 @@ void improv_amr_wb_gs_fx(
     const Word16 Last_ener_fx,         /* i  : Last energy (Q8)                     Q0*/
     const Word16 rate_switching_reset, /* i  : rate switching reset flag            Q0*/
     const Word16 last_coder_type       /* i  : Last coder_type                      Q0*/
-#ifdef ADD_IVAS_GS_DEC_IMPR
-    ,
-    const Word16 VeryLowRateSTflag /* i  : Enable the noise enhancement for very low rate stereo generic mode */
-#endif
 )
 {
     Word16 i, exp_a, exp_b, exp_diff, j;
@@ -429,18 +381,10 @@ void improv_amr_wb_gs_fx(
     test();
     test();
     test();
-#ifdef ADD_IVAS_GS_DEC_IMPR
-    IF( VeryLowRateSTflag ||
-        ( ( locattack == 0 && LE_32( core_brate, ACELP_12k65 ) ) &&
-          ( ( LT_32( core_brate, ACELP_8k85 ) && NE_16( clas, AUDIO_CLAS ) &&
-              ( EQ_16( clas, UNVOICED_CLAS ) || EQ_16( clas, VOICED_TRANSITION ) ) ) ||
-            EQ_16( coder_type, INACTIVE ) ) ) )
-#else
     IF( ( locattack == 0 && LE_32( core_brate, ACELP_12k65 ) ) &&
         ( ( LT_32( core_brate, ACELP_8k85 ) && NE_16( clas, AUDIO_CLAS ) &&
             ( ( clas == UNVOICED_CLAS ) || EQ_16( clas, VOICED_TRANSITION ) ) ) ||
           ( EQ_16( coder_type, INACTIVE ) ) ) )
-#endif
     {
         /*------------------------------------------------------------*
          * two differents paths:
@@ -487,11 +431,7 @@ void improv_amr_wb_gs_fx(
 
             FOR( i = 0; i < NB_SUBFR; i++ )
             {
-#ifdef BASOP_NOGLOB
                 enr_LP_new = Enr_1_Az_fx_o( Aq_fx + imult1616( i, ( M + 1 ) ), L_SUBFR, &Overflow ); /* Q3 */
-#else
-                enr_LP_new = Enr_1_Az_fx( Aq_fx + i * ( M + 1 ), L_SUBFR );
-#endif
                 test();
                 IF( GT_16( shr( enr_LP_new, 7 ), enr_LP_old ) || Overflow )
                 {
@@ -514,12 +454,7 @@ void improv_amr_wb_gs_fx(
          * Go back to time domain -> Overwrite exctiation
          *------------------------------------------------------------*/
         edct_16fx( exc2_fx, dct_exc_in_fx, L_FRAME, 6, EVS_MONO );
-        gs_dec_amr_wb_fx( core_brate, seed_tcx, dct_exc_in_fx, Q_exc2, dct_exc_out_fx, Q_exc2, pitch_buf_fx, lt_voice_fac_fx, clas, coder_type
-#ifdef ADD_IVAS_GS_DEC_IMPR
-                          ,
-                          VeryLowRateSTflag
-#endif
-        );
+        gs_dec_amr_wb_fx( core_brate, seed_tcx, dct_exc_in_fx, Q_exc2, dct_exc_out_fx, Q_exc2, pitch_buf_fx, lt_voice_fac_fx, clas, coder_type );
 
         edct_16fx( dct_exc_out_fx, exc2_fx, L_FRAME, 6, EVS_MONO );
         /*------------------------------------------------------------*
diff --git a/lib_dec/gs_dec_fx.c b/lib_dec/gs_dec_fx.c
index bbf06741957530167cd6f9a2c69a92ac3991c050..70639810c96f45a36538bd07ca0c86d911e3e6fa 100644
--- a/lib_dec/gs_dec_fx.c
+++ b/lib_dec/gs_dec_fx.c
@@ -6,7 +6,6 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_cnst.h"
 /*=========================================================================*/
@@ -24,25 +23,29 @@
 /* _ (Word16[])	voice_factors_fx: frame error rate				Q15		    */
 /*--------------------------------------------------------------------------*/
 /* INPUT/OUTPUT ARGUMENTS :  											    */
-/*  Decoder_State *st_fx     : decoder  memory structure                 */
+/*  Decoder_State *st_fx        : decoder  memory structure                 */
 /* _ (Word16[]) exc_fx			: adapt. excitation exc (Q_exc)			    */
 /* _ (Word16[]) exc2_fx			: adapt. excitation/total exc (Q_exc)       */
 /*--------------------------------------------------------------------------*/
 /* RETURN ARGUMENTS :													    */
 /* _ None																    */
 /*==========================================================================*/
+
 void decod_audio_fx(
-    Decoder_State *st_fx,  /* i/o: decoder static memory                     */
-    Word16 dct_epit[],     /* o  : GSC excitation in DCT domain              Qx*/
-    const Word16 *Aq,      /* i  : LP filter coefficient                     Q12*/
-    Word16 *pitch_buf,     /* o  : floating pitch values for each subframe   Q6*/
-    Word16 *voice_factors, /* o  : voicing factors                           Q15*/
-    Word16 *exc,           /* i/o: adapt. excitation exc                     Q_exc*/
-    Word16 *exc2,          /* i/o: adapt. excitation/total exc               Q_exc*/
-    Word16 *bwe_exc,       /* o  : excitation for SWB TBE                    Q_exc*/
-    Word16 *lsf_new        /* i  : ISFs at the end of the frame              Qx*/
-    ,
-    Word16 *gain_buf /*Q14*/
+    Decoder_State *st_fx,              /* i/o: decoder static memory						*/
+    Word16 dct_epit[],                 /* o  : GSC excitation in DCT domain              Qx*/
+    const Word16 *Aq,                  /* i  : LP filter coefficient                     Q12*/
+    Word16 *pitch_buf,                 /* o  : Word16 pitch values for each subframe      Q6*/
+    Word16 *voice_factors,             /* o  : voicing factors                           Q15*/
+    Word16 *exc,                       /* i/o: adapt. excitation exc                     Q_exc*/
+    Word16 *exc2,                      /* i/o: adapt. excitation/total exc               Q_exc*/
+    Word16 *bwe_exc,                   /* o  : excitation for SWB TBE                    Q_exc*/
+    Word16 *lsf_new,                   /* i  : ISFs at the end of the frame              Qx*/
+    Word16 *gain_buf,                  /* o  : Word16 pitch gain for each subframe		Q14*/
+    const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag                            Q0*/
+    const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag      Q0*/
+    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          Q0*/
+    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              Q6*/
 )
 {
     Word16 tmp_nb_bits_tot, pit_band_idx;
@@ -61,11 +64,11 @@ void decod_audio_fx(
     GSC_DEC_HANDLE hGSCDec;
     hGSCDec = st_fx->hGSCDec;
 
+    move16(); // Es_pred
 
     /*---------------------------------------------------------------*
      * Initialization
      *---------------------------------------------------------------*/
-    move16(); // corresponding to initialization of Es_pred
     Diff_len = 0;
     move16();
 
@@ -75,12 +78,14 @@ void decod_audio_fx(
 
     /* decode GSC SWB speech flag */
     test();
-#if !defined ADD_LRTD
-    IF( st_fx->coder_type != INACTIVE && GE_32( st_fx->total_brate, ACELP_13k20 ) )
-#else
-    if ( st_fx->GSC_IVAS_mode >= 1 || ( st_fx->coder_type != INACTIVE && ( ( st_fx->element_mode == EVS_MONO && st_fx->total_brate >= ACELP_13k20 ) ||
-                                                                           ( st_fx->element_mode > EVS_MONO && st_fx->total_brate > MIN_BRATE_GSC_NOISY_FLAG && st_fx->bwidth >= SWB && !st_fx->flag_ACELP16k ) ) ) )
-#endif
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( st_fx->coder_type != INACTIVE && ( ( st_fx->element_mode == EVS_MONO && GE_32( st_fx->total_brate, ACELP_13k20 ) ) ||
+                                                                                 ( st_fx->element_mode > EVS_MONO && GT_32( st_fx->total_brate, MIN_BRATE_GSC_NOISY_FLAG ) && GE_16( st_fx->bwidth, SWB ) && !st_fx->flag_ACELP16k ) ) ) )
     {
         st_fx->GSC_noisy_speech = (Word16) get_next_indice_fx( st_fx, 1 ); /* Q0 */
         move16();
@@ -93,25 +98,20 @@ void decod_audio_fx(
     {
         st_fx->BER_detect = 1; /* Q0 */
         move16();
-        st_fx->GSC_noisy_speech = 0; /* Q0 */
+        st_fx->GSC_noisy_speech = 0;
         move16();
     }
+
     /* set bit-allocation */
-#ifdef ADD_LRTD
-    config_acelp1( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, -1, 1, &nbits, NULL, st_fx->element_mode, &nbits /*dummy*/, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_cnt, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
-#else
-    config_acelp1( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, -1, 1, &nbits, NULL, st_fx->element_mode, &nbits /*dummy*/, 0, 0, st_fx->idchan, st_fx->active_cnt, 0, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
-#endif
+    config_acelp1_fx( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, st_fx->inactive_coder_type_flag, -1, 1, &nbits, NULL, st_fx->element_mode, &nbits /*dummy*/, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_cnt, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
+
     /*---------------------------------------------------------------*
      * Decode energy dynamics
      *---------------------------------------------------------------*/
-#if defined ADD_LRTD
+
     test();
     test();
-    IF( st_fx->GSC_IVAS_mode >= 1 || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && st_fx->GSC_IVAS_mode == 0 ) )
-#else
-    IF( EQ_16( st_fx->GSC_noisy_speech, 1 ) )
-#endif
+    IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && st_fx->GSC_IVAS_mode == 0 ) )
     {
         nb_subfr = NB_SUBFR; /* Q0 */
         move16();
@@ -119,25 +119,29 @@ void decod_audio_fx(
         move16();
         hGSCDec->noise_lev = NOISE_LEVEL_SP3; /* Q0 */
         move16();
-#ifdef ADD_LRTD
-        if ( st_fx->GSC_IVAS_mode >= 1 )
+
+        IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) )
         {
-            if ( st_fx->core_brate < GSC_L_RATE_STG && st_fx->GSC_IVAS_mode < 3 )
+            test();
+            if ( LT_32( st_fx->core_brate, GSC_L_RATE_STG ) && LT_32( st_fx->GSC_IVAS_mode, 3 ) )
             {
-                nb_subfr = 2;
+                nb_subfr = 2; /* Q0 */
+                move16();
             }
-            hGSCDec->noise_lev = NOISE_LEVEL_SP2;
+            hGSCDec->noise_lev = NOISE_LEVEL_SP2; /* Q0 */
+            move16();
 
-            if ( st_fx->GSC_IVAS_mode == 3 ) /* Music like */
+            IF( EQ_16( st_fx->GSC_IVAS_mode, 3 ) ) /* Music like */
             {
-                hGSCDec->noise_lev = NOISE_LEVEL_SP0;
+                hGSCDec->noise_lev = NOISE_LEVEL_SP0; /* Q0 */
+                move16();
             }
-            else if ( st_fx->GSC_noisy_speech == 0 ) /* speech like but not noisy */
+            ELSE IF( st_fx->GSC_noisy_speech == 0 ) /* speech like but not noisy */
             {
-                hGSCDec->noise_lev = NOISE_LEVEL_SP3;
+                hGSCDec->noise_lev = NOISE_LEVEL_SP3; /* Q0 */
+                move16();
             }
         }
-#endif
     }
     ELSE
     {
@@ -155,54 +159,67 @@ void decod_audio_fx(
         /*---------------------------------------------------------------*
          * Decode number of subframes
          *---------------------------------------------------------------*/
-#ifdef ADD_LRTD
-        if ( st_fx->L_frame == L_FRAME16k && ( st_fx->core_brate <= ACELP_13k20 || st_fx->coder_type == INACTIVE ) )
+
+        test();
+        test();
+        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && ( LE_32( st_fx->core_brate, ACELP_13k20 ) || st_fx->coder_type == INACTIVE ) )
         {
             hGSCDec->cor_strong_limit = 0;
-            nb_subfr = 1;
+            move16();
+            nb_subfr = 1; /* Q0 */
+            move16();
         }
-        else
-#endif
+        ELSE
         {
             hGSCDec->cor_strong_limit = 1; /* Q0 */
             move16();
-            nb_subfr = SWNB_SUBFR;
+            nb_subfr = SWNB_SUBFR; /* Q0 */
             move16();
 
             IF( GE_32( st_fx->core_brate, ACELP_9k60 ) )
             {
-                nbits = 1;
+                nbits = 1; /* Q0 */
                 move16();
-#ifdef ADD_LRTD
-                if ( st_fx->L_frame == L_FRAME16k && st_fx->core_brate >= MIN_RATE_4SBFR )
+
+                test();
+                if ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) )
                 {
-                    nbits = 2;
+                    nbits = 2; /* Q0 */
+                    move16();
                 }
-#endif
+
                 nb_frame_flg = (Word16) get_next_indice_fx( st_fx, nbits ); /* Q0 */
                 move16();
 
+                test();
                 IF( s_and( nb_frame_flg, 0x1 ) == 0 )
                 {
-                    nb_subfr = 2 * SWNB_SUBFR; /* Q0 */
+                    nb_subfr = 2 * SWNB_SUBFR;
                     move16();
                     hGSCDec->cor_strong_limit = 0;
                     move16();
                 }
-#ifdef ADD_LRTD
-                else if ( st_fx->L_frame == L_FRAME16k && st_fx->core_brate >= MIN_RATE_4SBFR )
+                ELSE IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) )
                 {
                     nb_subfr = 2 * SWNB_SUBFR; /* cor_strong already set to 1 */
+                    move16();
                 }
 
-                if ( ( nb_frame_flg >> 1 ) == 1 )
+                if ( EQ_16( shr( nb_frame_flg, 1 ), 1 ) )
                 {
-                    nb_subfr *= 2;
+                    nb_subfr = shl( nb_subfr, 1 ); /* Q0 */
                 }
-#endif
             }
         }
     }
+
+    test();
+    if ( EQ_16( st_fx->L_frame, L_FRAME16k ) && EQ_16( nb_subfr, NB_SUBFR ) )
+    {
+        nb_subfr = NB_SUBFR16k; /* Q0 */
+        move16();
+    }
+
     /*---------------------------------------------------------------*
      * Decode the last band where the adaptive (pitch) contribution is significant
      *---------------------------------------------------------------*/
@@ -212,7 +229,7 @@ void decod_audio_fx(
         nbits = 3; /* Q0 */
         move16();
         test();
-        if ( LT_32( st_fx->core_brate, ACELP_9k60 ) && st_fx->coder_type == INACTIVE )
+        if ( LT_32( st_fx->core_brate, ACELP_9k60 ) && ( st_fx->coder_type == INACTIVE ) )
         {
             nbits = 1; /* Q0 */
             move16();
@@ -261,7 +278,6 @@ void decod_audio_fx(
     hGSCDec->Last_GSC_pit_band_idx = pit_band_idx; /* Q0 */
     move16();
 
-
     /*--------------------------------------------------------------------------------------*
      * Decode adaptive (pitch) excitation contribution
      * Reset unvaluable part of the adaptive (pitch) excitation contribution
@@ -272,20 +288,23 @@ void decod_audio_fx(
          * Decode adaptive (pitch) excitation contribution
          *---------------------------------------------------------------*/
         test();
-#ifdef ADD_LRTD
-        if ( !( st_fx->GSC_IVAS_mode > 0 && st_fx->L_frame / nb_subfr == 2 * L_SUBFR && st_fx->GSC_IVAS_mode < 3 ) &&
-             ( ( st_fx->core_brate >= MIN_RATE_FCB || st_fx->GSC_noisy_speech ) &&
-               ( ( nb_subfr == NB_SUBFR && st_fx->L_frame == L_FRAME ) || ( nb_subfr == NB_SUBFR16k && st_fx->L_frame == L_FRAME16k ) ) ) )
-#else
-        IF( EQ_16( st_fx->GSC_noisy_speech, 1 ) && EQ_16( nb_subfr, NB_SUBFR ) )
-#endif
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( !( ( st_fx->GSC_IVAS_mode > 0 ) && EQ_16( idiv1616( st_fx->L_frame, nb_subfr ), 2 * L_SUBFR ) && LT_16( st_fx->GSC_IVAS_mode, 3 ) ) &&
+            ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || st_fx->GSC_noisy_speech ) &&
+              ( ( EQ_16( nb_subfr, NB_SUBFR ) && EQ_16( st_fx->L_frame, L_FRAME ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && EQ_16( st_fx->L_frame, L_FRAME16k ) ) ) ) )
         {
             Word16 indice;
             nbits = Es_pred_bits_tbl[BIT_ALLOC_IDX_fx( st_fx->core_brate, GENERIC, -1, -1 )]; /* Q0 */
             move16();
             if ( st_fx->element_mode > EVS_MONO )
             {
-                nbits = 5;
+                nbits = 5; /* Q0 */
                 move16();
             }
 
@@ -293,11 +312,9 @@ void decod_audio_fx(
 
             Es_pred_dec_fx( &Es_pred, indice, nbits, 0 );
         }
-#ifdef ADD_LRTD
-        dec_pit_exc_fx( st_fx, Aq, coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
-#else
-        dec_pit_exc_fx( st_fx, Aq, st_fx->coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf );
-#endif
+
+        dec_pit_exc_fx( st_fx, Aq, st_fx->coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
+
         IF( LT_32( st_fx->core_brate, ACELP_9k60 ) )
         {
             minimum_fx( pitch_buf, shr( st_fx->L_frame, 6 ), &low_pit );
@@ -355,7 +372,7 @@ void decod_audio_fx(
         }
 
         test();
-        IF( EQ_32( st_fx->core_brate, ACELP_8k00 ) && NE_16( st_fx->bwidth, NB ) )
+        IF( EQ_32( st_fx->core_brate, ACELP_8k00 ) && st_fx->bwidth != NB )
         {
             FOR( i = 0; i < max_len; i++ )
             {
@@ -390,13 +407,13 @@ void decod_audio_fx(
     ELSE
     {
         /* No adaptive (pitch) excitation contribution */
-        st_fx->bpf_off = 1; /* Q0 */
+        st_fx->bpf_off = 1;
         move16();
         set16_fx( dct_epit, 0, st_fx->L_frame );
 
         IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
         {
-            set16_fx( pitch_buf, L_SUBFR16k * 64, NB_SUBFR16k );
+            set16_fx( pitch_buf, ( L_SUBFR16k * 64 ), NB_SUBFR16k );
         }
         ELSE
         {
@@ -429,40 +446,46 @@ void decod_audio_fx(
 
     tmp_nb_bits_tot = st_fx->next_bit_pos; /* Q0 */
     move16();
-#ifdef IVAS_CODE
-    if ( st_fx->extl_brate_fx_orig > 0 )
-#else
-    if ( st_fx->extl_brate > 0 )
-#endif
+
+    if ( st_fx->extl_brate_orig > 0 )
     {
         /* subtract 1 bit for TBE/BWE BWE flag (bit counted in extl_brate) */
         tmp_nb_bits_tot = sub( tmp_nb_bits_tot, 1 ); /* Q0 */
     }
 
-
     test();
-#if defined ADD_LRTD
     test();
-    if ( EQ_16( st_fx->coder_type, INACTIVE ) && LE_32( st_fx->core_brate, ACELP_9k60 ) && st_fx->idchan == 0 )
-#else
-    test();
-    if ( st_fx->coder_type == INACTIVE && LE_32( st_fx->core_brate, ACELP_9k60 ) )
-#endif
+    if ( st_fx->coder_type == INACTIVE && LE_32( st_fx->core_brate, ACELP_9k60 ) && st_fx->idchan == 0 )
     {
         tmp_nb_bits_tot = add( tmp_nb_bits_tot, 5 ); /* Q0 */
     }
 
-#ifdef ADD_LRTD
     IF( EQ_16( st_fx->idchan, 1 ) )
     {
-        tmp_nb_bits_tot = add( tmp_nb_bits_tot, TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS );
-        IF( EQ_16( st_fx->tdm_LRTD_flag, 1 ) )
+        tmp_nb_bits_tot = add( tmp_nb_bits_tot, TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ); /* Q0 */
+        if ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) )
+        {
+            tmp_nb_bits_tot = sub( tmp_nb_bits_tot, STEREO_BITS_TCA ); /* Q0 */
+        }
+    }
+
+
+    Word16 Q_exc_old = st_fx->Q_exc;
+    move16();
+    gsc_dec_fx( st_fx, dct_epit, pit_band_idx, Diff_len, tmp_nb_bits_tot, nb_subfr, st_fx->coder_type, &last_bin, lsf_new, exc_wo_nf, &st_fx->Q_exc );
+
+    IF( NE_16( Q_exc_old, st_fx->Q_exc ) )
+    {
+        Q_exc_old = sub( Q_exc_old, st_fx->Q_exc );
+        IF( st_fx->hGSCDec )
+        {
+            Scale_sig( st_fx->hGSCDec->last_exc_dct_in_fx, L_FRAME16k, Q_exc_old ); /* Q_exc_old */
+        }
+        IF( bwe_exc )
         {
-            tmp_nb_bits_tot = sub( tmp_nb_bits_tot, STEREO_BITS_TCA );
+            Scale_sig( bwe_exc - PIT16k_MAX * 2, ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2, Q_exc_old ); /* Q_exc_old */
         }
     }
-#endif
-    gsc_dec_fx( st_fx, dct_epit, pit_band_idx, Diff_len, tmp_nb_bits_tot, nb_subfr, st_fx->coder_type, &last_bin, lsf_new, exc_wo_nf, st_fx->Q_exc );
     /*--------------------------------------------------------------------------------------*
      * iDCT transform
      *--------------------------------------------------------------------------------------*/
@@ -507,1018 +530,140 @@ void decod_audio_fx(
     return;
 }
 
-/*=========================================================================*/
-/* FUNCTION : void decod_audio_ivas_fx();								       */
-/*-------------------------------------------------------------------------*/
-/* PURPOSE :  Decode audio (AC) frames                          		   */
-/*-------------------------------------------------------------------------*/
-/*    INPUT ARGUMENTS :												       */
-/* _ (Word16[]) Aq  			: LP filter coefficient		Q12			   */
-/* _ (Word16) coder_type 		: coding type				Q0			   */
-/* _(Word16) Q_exc              :Q format of excitation                    */
-/*-------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :													   */
-/* _ (Word16[]) pitch_buf_fx	: Word16 pitch values for each subframe Q6*/
-/* _ (Word16[])	voice_factors_fx: frame error rate				Q15		    */
+/*==========================================================================*/
+/* FUNCTION : void gsc_dec_fx	()   							            */
+/*--------------------------------------------------------------------------*/
+/* PURPOSE  :  Generic audio signal decoder                                 */
+/*--------------------------------------------------------------------------*/
+/*    INPUT ARGUMENTS :												        */
+/* _ (Word16) pit_band_idx       : bin position of the cut-off frequency Q0 */
+/* _ (Word16) Diff_len 	         : Lenght of the difference signal       Q0 */
+/* _ (Word16) coder_type         : coding type				             Q0 */
+/* _ (Word16) bits_used          : Number of bit used before frequency Q Q0 */
+/* _ (Word16) nb_subfr           : Number of subframe considered         Q0 */
+/* _ (Word16)  Qexc              : Q format of exc_dct_in			        */
+/*--------------------------------------------------------------------------*/
+/* OUTPUT ARGUMENTS :													    */
+/* _ None                                                                   */
 /*--------------------------------------------------------------------------*/
 /* INPUT/OUTPUT ARGUMENTS :  											    */
-/*  Decoder_State *st_fx     : decoder  memory structure                 */
-/* _ (Word16[]) exc_fx			: adapt. excitation exc (Q_exc)			    */
-/* _ (Word16[]) exc2_fx			: adapt. excitation/total exc (Q_exc)       */
+/*   Decoder_State *st_fx:Decoder State Structure                        */
+/* _ (Word16[]) exc_dct_in : dctof pitch-only excitation / total excitation Qexc*/
 /*--------------------------------------------------------------------------*/
 /* RETURN ARGUMENTS :													    */
-/* _ None																    */
+/* _None                                                     			    */
 /*==========================================================================*/
-void decod_audio_ivas_fx(
-    Decoder_State *st_fx,  /* i/o: decoder static memory						*/
-    Word16 dct_epit[],     /* o  : GSC excitation in DCT domain              Qx*/
-    const Word16 *Aq,      /* i  : LP filter coefficient                     Q12*/
-    Word16 *pitch_buf,     /* o  : Word16 pitch values for each subframe      Q6*/
-    Word16 *voice_factors, /* o  : voicing factors                           Q15*/
-    Word16 *exc,           /* i/o: adapt. excitation exc                     Q_exc*/
-    Word16 *exc2,          /* i/o: adapt. excitation/total exc               Q_exc*/
-    Word16 *bwe_exc,       /* o  : excitation for SWB TBE                    Q_exc*/
-    Word16 *lsf_new        /* i  : ISFs at the end of the frame              Qx*/
-    ,
-    Word16 *gain_buf,                  /*Q14*/
-    const Word16 tdm_lp_reuse_flag,    /* i  : LPC reuse flag                            Q0*/
-    const Word16 tdm_low_rate_mode,    /* i  : secondary channel low rate mode flag      Q0*/
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag          Q0*/
-    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer              Q6*/
-)
-{
-    Word16 tmp_nb_bits_tot, pit_band_idx;
-    Word16 code[4 * L_SUBFR];
-    Word16 Diff_len, nb_subfr, i;
-    Word16 nb_frame_flg;
-    Word16 Es_pred = 0;
-    Word16 Len, max_len;
-    Word16 gsc_attack_flag;
-
-    Word16 low_pit;
-    Word16 last_bin;
-    Word16 nbits;
 
-    Word16 exc_wo_nf[L_FRAME16k];
+void gsc_dec_fx(
+    Decoder_State *st_fx,      /* i/o: State structure                                            */
+    Word16 exc_dct_in[],       /* i/o: dct of pitch-only excitation / total excitation       Q_exc*/
+    const Word16 pit_band_idx, /* i  : bin position of the cut-off frequency               `	Q0*/
+    const Word16 Diff_len,     /* i  : Lenght of the difference signal (before pure spectral)	Q0*/
+    const Word16 bits_used,    /* i  : Number of bit used before frequency Q					Q0*/
+    const Word16 nb_subfr,     /* i  : Number of subframe considered							Q0*/
+    const Word16 coder_type,   /* i  : coding type												Q0*/
+    Word16 *last_bin,          /* i  : last bin of bit allocation								Q0*/
+    const Word16 *lsf_new,     /* i  : ISFs at the end of the frame                             Qx*/
+    Word16 *exc_wo_nf,         /* o  : excitation (in f domain) without noisefill            Q_exc*/
+    Word16 *Q_exc )
+{
+    Word16 i, j, bit, nb_subbands, pvq_len;
+    Word16 bitallocation_band[MBANDS_GN_BITALLOC16k];
+    Word16 bitallocation_exc[2];
+    Word16 Ener_per_bd_iQ[MBANDS_GN_BITALLOC16k];
+    Word16 max_ener_band[MBANDS_GN_BITALLOC16k];
+    Word16 exc_diffQ[L_FRAME16k];
+    Word16 bits_per_bands[MBANDS_GN_BITALLOC16k];
+    Word16 concat_out[L_FRAME16k];
+    Word16 max_eq, max_eq_val;
+    Word16 inpulses_fx[NB_SFM];
+    Word16 imaxpulse_fx[NB_SFM];
+    Word16 mean_gain;
+    Word16 Mbands_gn = MBANDS_GN;
+    Word16 Qexc_diffQ = Q_PVQ_OUT;
+    Word32 L_tmp;
+    Word16 Q_tmp;
+    Word16 seed_init;
     GSC_DEC_HANDLE hGSCDec;
     hGSCDec = st_fx->hGSCDec;
 
-    move16(); // Es_pred
+    move16(); /* for Mbands_gn */
+    move16(); /* for Qexc_diffQ */
+    set16_fx( inpulses_fx, 0, NB_SFM );
+    set16_fx( imaxpulse_fx, 0, NB_SFM );
 
-    /*---------------------------------------------------------------*
+    /*--------------------------------------------------------------------------------------*
      * Initialization
-     *---------------------------------------------------------------*/
-    Diff_len = 0;
-    move16();
-
-    /* decode GSC attack flag (used to reduce possible pre-echo) */
-    gsc_attack_flag = (Word16) get_next_indice_fx( st_fx, 1 ); /* Q0 */
+     *--------------------------------------------------------------------------------------*/
+    bit = bits_used;
     move16();
 
-    /* decode GSC SWB speech flag */
-    test();
     test();
     test();
     test();
-    test();
-    test();
-    test();
-    IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( st_fx->coder_type != INACTIVE && ( ( st_fx->element_mode == EVS_MONO && GE_32( st_fx->total_brate, ACELP_13k20 ) ) ||
-                                                                                 ( st_fx->element_mode > EVS_MONO && GT_32( st_fx->total_brate, MIN_BRATE_GSC_NOISY_FLAG ) && GE_16( st_fx->bwidth, SWB ) && !st_fx->flag_ACELP16k ) ) ) )
+    if ( coder_type == INACTIVE && ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) || EQ_16( st_fx->element_mode, IVAS_SCE ) ) && LE_32( st_fx->core_brate, GSC_LRES_GAINQ_LIMIT ) )
     {
-        st_fx->GSC_noisy_speech = (Word16) get_next_indice_fx( st_fx, 1 ); /* Q0 */
-        move16();
+        bit = add( bit, GSC_LRES_NB_NITS ); /* Q0 */
     }
 
-    /* safety check in case of bit errors */
-    test();
-    test();
-    IF( st_fx->GSC_noisy_speech && LT_16( st_fx->bwidth, SWB ) && st_fx->GSC_IVAS_mode == 0 )
+    if ( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
-        st_fx->BER_detect = 1; /* Q0 */
-        move16();
-        st_fx->GSC_noisy_speech = 0;
+        Mbands_gn = MBANDS_GN16k; /* Q0 */
         move16();
     }
-    /* set bit-allocation */
-#if 1 // def ADD_LRTD
-    config_acelp1_IVAS( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, -1, 1, &nbits, NULL, st_fx->element_mode, &nbits /*dummy*/, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_cnt, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
-#else
-    config_acelp1( DEC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl_orig, st_fx->extl_brate_orig, st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), st_fx->next_bit_pos, st_fx->coder_type, -1, 1, &nbits, NULL, st_fx->element_mode, &nbits /*dummy*/, 0, 0, st_fx->idchan, st_fx->active_cnt, 0, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
-#endif
-    /*---------------------------------------------------------------*
-     * Decode energy dynamics
-     *---------------------------------------------------------------*/
-#if 1 // defined ADD_LRTD
-    test();
+
+    set16_fx( exc_diffQ, 0, st_fx->L_frame );
+
+    /*--------------------------------------------------------------------------------------*
+     * Gain decoding
+     *--------------------------------------------------------------------------------------*/
+
     test();
-    IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && st_fx->GSC_IVAS_mode == 0 ) )
-#else
-    IF( EQ_16( st_fx->GSC_noisy_speech, 1 ) )
-#endif
+    IF( st_fx->bfi || st_fx->BER_detect )
     {
-        nb_subfr = NB_SUBFR; /* Q0 */
-        move16();
-        hGSCDec->cor_strong_limit = 0;
+        /* copy old gain */
+        Copy( hGSCDec->old_y_gain_fx, Ener_per_bd_iQ, Mbands_gn ); /* Q_old_gain */
+        mean_gain = mult_r( st_fx->lp_gainc_fx, 3277 );            /*Q3*/
+        FOR( i = 0; i < Mbands_gn; i++ )
+        {
+            Ener_per_bd_iQ[i] = add( Ener_per_bd_iQ[i], shl( mean_gain, 9 ) ); /*Q12*/
+            move16();
+        }
+
+        st_fx->lp_gainc_fx = mult_r( st_fx->lp_gainc_fx, 32112 ); /*Q3*/
         move16();
-        hGSCDec->noise_lev = NOISE_LEVEL_SP3; /* Q0 */
+    }
+    ELSE
+    {
+        i = 0;
         move16();
-#if 1 // def ADD_LRTD
-        IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) )
+        WHILE( LT_16( i, SIZE_BRATE_INTERMED_TBL ) )
         {
-            test();
-            if ( LT_32( st_fx->core_brate, GSC_L_RATE_STG ) && LT_32( st_fx->GSC_IVAS_mode, 3 ) )
+            if ( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) )
             {
-                nb_subfr = 2; /* Q0 */
-                move16();
-            }
-            hGSCDec->noise_lev = NOISE_LEVEL_SP2; /* Q0 */
-            move16();
-
-            IF( EQ_16( st_fx->GSC_IVAS_mode, 3 ) ) /* Music like */
-            {
-                hGSCDec->noise_lev = NOISE_LEVEL_SP0; /* Q0 */
-                move16();
-            }
-            ELSE IF( st_fx->GSC_noisy_speech == 0 ) /* speech like but not noisy */
-            {
-                hGSCDec->noise_lev = NOISE_LEVEL_SP3; /* Q0 */
-                move16();
-            }
-        }
-#endif
-    }
-    ELSE
-    {
-        IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
-        {
-            hGSCDec->noise_lev = add( (Word16) get_next_indice_fx( st_fx, 2 ), NOISE_LEVEL_SP2 ); /* Q0 */
-            move16();
-        }
-        ELSE
-        {
-            hGSCDec->noise_lev = add( (Word16) get_next_indice_fx( st_fx, 3 ), NOISE_LEVEL_SP0 ); /* Q0 */
-            move16();
-        }
-
-        /*---------------------------------------------------------------*
-         * Decode number of subframes
-         *---------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
-        test();
-        test();
-        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && ( LE_32( st_fx->core_brate, ACELP_13k20 ) || st_fx->coder_type == INACTIVE ) )
-        {
-            hGSCDec->cor_strong_limit = 0;
-            move16();
-            nb_subfr = 1; /* Q0 */
-            move16();
-        }
-        ELSE
-#endif
-        {
-            hGSCDec->cor_strong_limit = 1; /* Q0 */
-            move16();
-            nb_subfr = SWNB_SUBFR; /* Q0 */
-            move16();
-
-            IF( GE_32( st_fx->core_brate, ACELP_9k60 ) )
-            {
-                nbits = 1; /* Q0 */
-                move16();
-#if 1 // def ADD_LRTD
-                test();
-                if ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) )
-                {
-                    nbits = 2; /* Q0 */
-                    move16();
-                }
-#endif
-                nb_frame_flg = (Word16) get_next_indice_fx( st_fx, nbits ); /* Q0 */
-                move16();
-
-                test();
-                IF( s_and( nb_frame_flg, 0x1 ) == 0 )
-                {
-                    nb_subfr = 2 * SWNB_SUBFR;
-                    move16();
-                    hGSCDec->cor_strong_limit = 0;
-                    move16();
-                }
-#if 1 // def ADD_LRTD
-                ELSE IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) )
-                {
-                    nb_subfr = 2 * SWNB_SUBFR; /* cor_strong already set to 1 */
-                    move16();
-                }
-
-                if ( EQ_16( shr( nb_frame_flg, 1 ), 1 ) )
-                {
-                    nb_subfr = shl( nb_subfr, 1 ); /* Q0 */
-                }
-#endif
-            }
-        }
-    }
-#if 1
-    test();
-    if ( EQ_16( st_fx->L_frame, L_FRAME16k ) && EQ_16( nb_subfr, NB_SUBFR ) )
-    {
-        nb_subfr = NB_SUBFR16k; /* Q0 */
-        move16();
-    }
-#endif
-    /*---------------------------------------------------------------*
-     * Decode the last band where the adaptive (pitch) contribution is significant
-     *---------------------------------------------------------------*/
-
-    IF( LT_32( st_fx->core_brate, CFREQ_BITRATE ) )
-    {
-        nbits = 3; /* Q0 */
-        move16();
-        test();
-        if ( LT_32( st_fx->core_brate, ACELP_9k60 ) && ( st_fx->coder_type == INACTIVE ) )
-        {
-            nbits = 1; /* Q0 */
-            move16();
-        }
-    }
-    ELSE
-    {
-        nbits = 4; /* Q0 */
-        move16();
-    }
-    test();
-    IF( LT_32( st_fx->core_brate, ACELP_9k60 ) && st_fx->coder_type != INACTIVE )
-    {
-        pit_band_idx = 1; /* Q0 */
-        move16();
-    }
-    ELSE
-    {
-        pit_band_idx = (Word16) get_next_indice_fx( st_fx, nbits ); /* Q0 */
-        move16();
-    }
-
-    IF( pit_band_idx != 0 )
-    {
-        IF( LT_32( st_fx->core_brate, ACELP_9k60 ) )
-        {
-            pit_band_idx = 7 + BAND1k2; /* Q0 */
-            move16();                   /* At low rate, if pitch model is chosen, then for to be use on extented and constant frequency range */
-        }
-        ELSE
-        {
-            pit_band_idx = add( pit_band_idx, BAND1k2 ); /* Q0 */
-        }
-
-        /* detect bit errors in the bitstream */
-        IF( GT_16( pit_band_idx, 13 ) ) /* The maximum decodable index is 10 + BAND1k2 (3) = 13 */
-        {
-            pit_band_idx = 13; /* Q0 */
-            move16();
-            st_fx->BER_detect = 1; /* Q0 */
-            move16();
-        }
-        Diff_len = mfreq_loc_div_25[pit_band_idx]; /* Q0 */
-        move16();
-    }
-    hGSCDec->Last_GSC_pit_band_idx = pit_band_idx; /* Q0 */
-    move16();
-
-
-    /*--------------------------------------------------------------------------------------*
-     * Decode adaptive (pitch) excitation contribution
-     * Reset unvaluable part of the adaptive (pitch) excitation contribution
-     *--------------------------------------------------------------------------------------*/
-    IF( GT_16( pit_band_idx, BAND1k2 ) )
-    {
-        /*---------------------------------------------------------------*
-         * Decode adaptive (pitch) excitation contribution
-         *---------------------------------------------------------------*/
-        test();
-#if 1 // def ADD_LRTD
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( !( ( st_fx->GSC_IVAS_mode > 0 ) && EQ_16( idiv1616( st_fx->L_frame, nb_subfr ), 2 * L_SUBFR ) && LT_16( st_fx->GSC_IVAS_mode, 3 ) ) &&
-            ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || st_fx->GSC_noisy_speech ) &&
-              ( ( EQ_16( nb_subfr, NB_SUBFR ) && EQ_16( st_fx->L_frame, L_FRAME ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && EQ_16( st_fx->L_frame, L_FRAME16k ) ) ) ) )
-#else
-        IF( EQ_16( st_fx->GSC_noisy_speech, 1 ) && EQ_16( nb_subfr, NB_SUBFR ) )
-#endif
-        {
-            Word16 indice;
-            nbits = Es_pred_bits_tbl[BIT_ALLOC_IDX_fx( st_fx->core_brate, GENERIC, -1, -1 )]; /* Q0 */
-            move16();
-            if ( st_fx->element_mode > EVS_MONO )
-            {
-                nbits = 5; /* Q0 */
-                move16();
-            }
-
-            indice = get_next_indice_fx( st_fx, nbits ); /* Q0 */
-
-            Es_pred_dec_fx( &Es_pred, indice, nbits, 0 );
-        }
-#if 1 // def ADD_LRTD
-        dec_pit_exc_ivas_fx( st_fx, Aq, st_fx->coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
-#else
-        dec_pit_exc_fx( st_fx, Aq, st_fx->coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf );
-#endif
-        IF( LT_32( st_fx->core_brate, ACELP_9k60 ) )
-        {
-            minimum_fx( pitch_buf, shr( st_fx->L_frame, 6 ), &low_pit );
-            low_pit = shr( low_pit, 6 ); /*Q6 -> Q0 */
-
-            IF( LT_16( low_pit, 64 ) )
-            {
-                pit_band_idx = 9 + BAND1k2; /* Q0 */
-                move16();
-                if ( st_fx->bwidth == NB )
-                {
-                    pit_band_idx = 7 + BAND1k2; /* Q0 */
-                    move16();
-                }
-            }
-            ELSE IF( LT_16( low_pit, 128 ) )
-            {
-                pit_band_idx = 5 + BAND1k2; /* Q0 */
-                move16();
-            }
-            ELSE
-            {
-                pit_band_idx = 3 + BAND1k2; /* Q0 */
-                move16();
-            }
-
-            Diff_len = mfreq_loc_div_25[pit_band_idx]; /* Q0 */
-            move16();
-            hGSCDec->Last_GSC_pit_band_idx = pit_band_idx; /* Q0 */
-            move16();
-        }
-
-        /*---------------------------------------------------------------*
-         * DCT transform
-         *---------------------------------------------------------------*/
-        edct_16fx( exc, dct_epit, st_fx->L_frame, 7, st_fx->element_mode );
-
-        /*---------------------------------------------------------------*
-         * Reset unvaluable part of the adaptive (pitch) excitation contribution
-         *---------------------------------------------------------------*/
-
-        max_len = sub( st_fx->L_frame, Diff_len ); /* Q0 */
-
-        if ( st_fx->bwidth == NB )
-        {
-            max_len = sub( 160, Diff_len ); /* Q0 */
-        }
-
-        Len = 80;
-        move16();
-        if ( LT_16( max_len, 80 ) )
-        {
-            Len = max_len; /* Q0 */
-            move16();
-        }
-
-        test();
-        IF( EQ_32( st_fx->core_brate, ACELP_8k00 ) && st_fx->bwidth != NB )
-        {
-            FOR( i = 0; i < max_len; i++ )
-            {
-                dct_epit[i + Diff_len] = 0;
-                move16();
-            }
-        }
-        ELSE
-        {
-            FOR( i = 0; i < Len; i++ )
-            {
-                dct_epit[i + Diff_len] = mult_r( dct_epit[i + Diff_len], sm_table_fx[i] ); /* Qx */
-                move16();
-            }
-
-            FOR( ; i < max_len; i++ )
-            {
-                dct_epit[i + Diff_len] = 0;
-                move16();
-            }
-        }
-        // PMT("in the rare case of 4 subfr, bfi_pitch_fx might be wrong")
-        st_fx->bfi_pitch_fx = mean_fx( pitch_buf, nb_subfr ); /* Q6 */
-        move16();
-        st_fx->bfi_pitch_frame = st_fx->L_frame; /* Q0 */
-        move16();
-
-        Diff_len = add( Diff_len, 1 ); /* Q0 */
-        st_fx->bpf_off = 0;
-        move16();
-    }
-    ELSE
-    {
-        /* No adaptive (pitch) excitation contribution */
-        st_fx->bpf_off = 1;
-        move16();
-        set16_fx( dct_epit, 0, st_fx->L_frame );
-
-        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-        {
-            set16_fx( pitch_buf, ( L_SUBFR16k * 64 ), NB_SUBFR16k );
-        }
-        ELSE
-        {
-            set16_fx( pitch_buf, L_SUBFR * 64, NB_SUBFR );
-        }
-
-        set16_fx( gain_buf, 0, NB_SUBFR16k );
-
-        st_fx->bfi_pitch_fx = L_SUBFR * 64;
-        move16();
-        st_fx->bfi_pitch_frame = st_fx->L_frame; /* Q0 */
-        move16();
-        st_fx->lp_gainp_fx = 0;
-        move16();
-        st_fx->lp_gainc_fx = 0;
-        move16();
-        st_fx->tilt_code_fx = 0;
-        move16();
-        pit_band_idx = 0;
-        move16();
-        Diff_len = 0;
-        move16();
-    }
-
-    /*--------------------------------------------------------------------------------------*
-     * GSC decoder
-     *--------------------------------------------------------------------------------------*/
-
-    /* find the current total number of bits used */
-
-    tmp_nb_bits_tot = st_fx->next_bit_pos; /* Q0 */
-    move16();
-#if 1 // def IVAS_CODE
-    if ( st_fx->extl_brate_orig > 0 )
-#else
-    if ( st_fx->extl_brate > 0 )
-#endif
-    {
-        /* subtract 1 bit for TBE/BWE BWE flag (bit counted in extl_brate) */
-        tmp_nb_bits_tot = sub( tmp_nb_bits_tot, 1 ); /* Q0 */
-    }
-
-
-    test();
-#if 1 // defined ADD_LRTD
-    test();
-    if ( st_fx->coder_type == INACTIVE && LE_32( st_fx->core_brate, ACELP_9k60 ) && st_fx->idchan == 0 )
-#else
-    if ( EQ_16( st_fx->coder_type, INACTIVE ) && LE_32( st_fx->core_brate, ACELP_9k60 ) )
-#endif
-    {
-        tmp_nb_bits_tot = add( tmp_nb_bits_tot, 5 ); /* Q0 */
-    }
-
-#if 1 // ydef ADD_LRTD
-    IF( EQ_16( st_fx->idchan, 1 ) )
-    {
-        tmp_nb_bits_tot = add( tmp_nb_bits_tot, TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ); /* Q0 */
-        if ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) )
-        {
-            tmp_nb_bits_tot = sub( tmp_nb_bits_tot, STEREO_BITS_TCA ); /* Q0 */
-        }
-    }
-#endif
-    Word16 Q_exc_old = st_fx->Q_exc;
-    move16();
-    gsc_dec_ivas_fx( st_fx, dct_epit, pit_band_idx, Diff_len, tmp_nb_bits_tot, nb_subfr, st_fx->coder_type, &last_bin, lsf_new, exc_wo_nf, &st_fx->Q_exc );
-    IF( NE_16( Q_exc_old, st_fx->Q_exc ) )
-    {
-        Q_exc_old = sub( Q_exc_old, st_fx->Q_exc );
-        IF( st_fx->hGSCDec )
-        {
-            Scale_sig( st_fx->hGSCDec->last_exc_dct_in_fx, L_FRAME16k, Q_exc_old ); /* Q_exc_old */
-        }
-        IF( bwe_exc )
-        {
-            Scale_sig( bwe_exc - PIT16k_MAX * 2, ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2, Q_exc_old ); /* Q_exc_old */
-        }
-    }
-    /*--------------------------------------------------------------------------------------*
-     * iDCT transform
-     *--------------------------------------------------------------------------------------*/
-
-    edct_16fx( dct_epit, exc, st_fx->L_frame, 7, st_fx->element_mode );
-    edct_16fx( exc_wo_nf, exc_wo_nf, st_fx->L_frame, 7, st_fx->element_mode );
-    /*----------------------------------------------------------------------*
-     * Remove potential pre-echo in case an onset has been detected
-     *----------------------------------------------------------------------*/
-
-    pre_echo_att_fx( &hGSCDec->Last_frame_ener_fx, exc, gsc_attack_flag, st_fx->Q_exc, st_fx->last_coder_type, st_fx->L_frame );
-
-    /*--------------------------------------------------------------------------------------*
-     * Update BWE excitation
-     *--------------------------------------------------------------------------------------*/
-
-    IF( st_fx->hBWE_TD != NULL )
-    {
-        set16_fx( voice_factors, 0, NB_SUBFR16k );
-        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-        {
-            interp_code_4over2_fx( exc, bwe_exc, st_fx->L_frame );
-        }
-        ELSE
-        {
-            interp_code_5over2_fx( exc, bwe_exc, L_FRAME );
-        }
-    }
-    /*--------------------------------------------------------------------------------------*
-     * Updates
-     *--------------------------------------------------------------------------------------*/
-
-    Copy( exc, exc2, st_fx->L_frame );      /* Q_exc */
-    Copy( exc_wo_nf, exc, st_fx->L_frame ); /* Q_exc */
-
-    /*--------------------------------------------------------------------------------------*
-     * Channel aware mode parameters
-     *--------------------------------------------------------------------------------------*/
-
-    set16_fx( st_fx->tilt_code_dec_fx, 0, NB_SUBFR16k );
-
-    return;
-}
-
-/*==========================================================================*/
-/* FUNCTION : void gsc_dec_fx	()   							            */
-/*--------------------------------------------------------------------------*/
-/* PURPOSE  :  Generic audio signal decoder                                 */
-/*--------------------------------------------------------------------------*/
-/*    INPUT ARGUMENTS :												        */
-/* _ (Word16) pit_band_idx       : bin position of the cut-off frequency Q0 */
-/* _ (Word16) Diff_len 	         : Lenght of the difference signal       Q0 */
-/* _ (Word16) coder_type         : coding type				             Q0 */
-/* _ (Word16) bits_used          : Number of bit used before frequency Q Q0 */
-/* _ (Word16) nb_subfr           : Number of subframe considered         Q0 */
-/* _ (Word16)  Qexc              : Q format of exc_dct_in			        */
-/*--------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :													    */
-/* _ None                                                                   */
-/*--------------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS :  											    */
-/*   Decoder_State *st_fx:Decoder State Structure                        */
-/* _ (Word16[]) exc_dct_in : dctof pitch-only excitation / total excitation Qexc*/
-/*--------------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :													    */
-/* _None                                                     			    */
-/*==========================================================================*/
-void gsc_dec_fx(
-    Decoder_State *st_fx,      /* i/o: State structure                                     */
-    Word16 exc_dct_in[],       /* i/o: dct of pitch-only excitation / total excitation     Q_exc*/
-    const Word16 pit_band_idx, /* i  : bin position of the cut-off frequency               Q0*/
-    const Word16 Diff_len,     /* i  : Lenght of the difference signal (before pure spectral)	Q0*/
-    const Word16 bits_used,    /* i  : Number of bit used before frequency Q               Q0*/
-    const Word16 nb_subfr,     /* i  : Number of subframe considered                       Q0*/
-    const Word16 coder_type,   /* i  : coding type                                         Q0*/
-    Word16 *last_bin,          /* i  : last bin of bit allocation                          Q0*/
-    const Word16 *lsf_new,     /* i  : ISFs at the end of the frame                        Qx*/
-    Word16 *exc_wo_nf,         /* o  : excitation (in f domain) without noisefill          Q_exc*/
-    Word16 Q_exc )
-{
-    Word16 i, j, bit, nb_subbands, pvq_len;
-#if 1 // def ADD_LRTD
-    Word16 bitallocation_band[MBANDS_GN_BITALLOC16k];
-    Word16 bitallocation_exc[2];
-    Word16 Ener_per_bd_iQ[MBANDS_GN_BITALLOC16k];
-    Word16 max_ener_band[MBANDS_GN_BITALLOC16k];
-    Word16 exc_diffQ[L_FRAME16k];
-    Word16 bits_per_bands[MBANDS_GN_BITALLOC16k];
-    Word16 concat_out[L_FRAME16k];
-#else
-    Word16 bitallocation_band[MBANDS_GN];
-    Word16 bitallocation_exc[2];
-    Word16 Ener_per_bd_iQ[MBANDS_GN];
-    Word16 max_ener_band[MBANDS_GN];
-    Word16 exc_diffQ[L_FRAME];
-    Word16 bits_per_bands[MBANDS_GN];
-    Word16 concat_out[L_FRAME];
-#endif
-    Word16 inpulses_fx[NB_SFM];
-    Word16 imaxpulse_fx[NB_SFM];
-    Word16 mean_gain;
-    Word16 Mbands_gn = 16;
-    Word16 Qexc_diffQ = Q_PVQ_OUT;
-    Word32 L_tmp;
-    Word16 Q_tmp;
-    Word16 seed_init;
-    GSC_DEC_HANDLE hGSCDec;
-    hGSCDec = st_fx->hGSCDec;
-    move16();
-    move16();
-
-    move16(); // for Mbands_gn
-    move16(); // for Qexc_diffQ
-    set16_fx( inpulses_fx, 0, NB_SFM );
-    set16_fx( imaxpulse_fx, 0, NB_SFM );
-
-    /*--------------------------------------------------------------------------------------*
-     * Initialization
-     *--------------------------------------------------------------------------------------*/
-    bit = bits_used;
-    move16();
-#ifdef ADD_LRTD
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( coder_type, INACTIVE ) && ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) || EQ_16( st_fx->element_mode, IVAS_SCE ) ) && LE_32( st_fx->core_brate, GSC_LRES_GAINQ_LIMIT ) )
-    {
-        bit = add( bit, GSC_LRES_NB_NITS );
-    }
-
-    IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-    {
-        Mbands_gn = MBANDS_GN16k;
-        move16();
-    }
-#endif
-    set16_fx( exc_diffQ, 0, st_fx->L_frame );
-
-    /*--------------------------------------------------------------------------------------*
-     * Gain decoding
-     *--------------------------------------------------------------------------------------*/
-
-    test();
-    IF( st_fx->bfi || st_fx->BER_detect )
-    {
-        /* copy old gain */
-        Copy( hGSCDec->old_y_gain_fx, Ener_per_bd_iQ, Mbands_gn ); /* Q_old_gain */
-        mean_gain = mult_r( st_fx->lp_gainc_fx, 3277 );            /*Q3*/
-        FOR( i = 0; i < Mbands_gn; i++ )
-        {
-            Ener_per_bd_iQ[i] = add( Ener_per_bd_iQ[i], shl( mean_gain, 9 ) ); /*Q12*/
-            move16();
-        }
-
-        st_fx->lp_gainc_fx = mult_r( st_fx->lp_gainc_fx, 32112 ); /*Q3*/
-        move16();
-    }
-    ELSE
-    {
-
-#ifdef ADD_LRTD
-        i = 0;
-        move16();
-        While( LT_16( i, SIZE_BRATE_INTERMED_TBL ) )
-        {
-            IF( LQ_32( st_fx->core_brate, brate_intermed_tbl[i] ) )
-            {
-                break;
-            }
-            i = add( i, 1 );
-        }
-
-        test();
-        test();
-        test();
-        test();
-        IF( GT_16( st_fx->element_mode, EVS_MONO ) > &&EQ_16( coder_type, AUDIO ) &&
-            LE_32( st_fx->core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation is mapped to 8 kb/s instead of 9.6 kb/s in this case */
-        {
-            i--;
-        }
-        mean_gain = gsc_gaindec_fx( st_fx, Ener_per_bd_iQ, brate_intermed_tbl[i], hGSCDec->old_y_gain_fx, coder_type, st_fx->bwidth );
-
-#else
-        mean_gain = gsc_gaindec_fx( st_fx, Ener_per_bd_iQ, st_fx->core_brate, hGSCDec->old_y_gain_fx, coder_type, st_fx->bwidth ); /* Q12 */
-#endif
-        st_fx->lp_gainc_fx = mult_r( 640, mean_gain ); /*10 in Q6 x Q12 -> lp_gainc in Q3 */
-        move16();
-    }
-
-    *last_bin = 0;
-    move16();
-    test();
-    IF( EQ_32( st_fx->core_brate, ACELP_8k00 ) && st_fx->bwidth != NB )
-    {
-        bitallocation_exc[0] = 0;
-        move16();
-        bitallocation_exc[1] = 0;
-        move16();
-    }
-
-    set16_fx( bitallocation_band, 0, MBANDS_GN );
-
-    test();
-    IF( ( EQ_16( st_fx->bfi, 1 ) ) || st_fx->BER_detect )
-    {
-        /*--------------------------------------------------------------------------------------*
-         * Copy old spectrum
-         * reduce spectral dynamic
-         * save spectrum
-         *--------------------------------------------------------------------------------------*/
-#ifdef ADD_LRTD
-        max_eq = 32767;
-        move16();
-#endif
-        test();
-        IF( EQ_16( st_fx->last_good, INACTIVE_CLAS ) || EQ_16( st_fx->Last_GSC_noisy_speech_flag, 1 ) )
-        {
-            FOR( i = 0; i < st_fx->L_frame; i++ )
-            {
-                L_tmp = L_shr( L_mult( Random( &hGSCDec->seed_tcx ), 26214 ), 5 ); /*Q10*/
-                L_tmp = L_mac( L_tmp, hGSCDec->Last_GSC_spectrum_fx[i], 6554 );    /* Q10 */
-                hGSCDec->Last_GSC_spectrum_fx[i] = round_fx( L_tmp );              /*Q10*/
-                move16();
-            }
-        }
-
-        Copy( hGSCDec->Last_GSC_spectrum_fx, exc_diffQ, st_fx->L_frame ); /* Q10 */
-
-        FOR( i = 0; i < st_fx->L_frame; i++ )
-        {
-            hGSCDec->Last_GSC_spectrum_fx[i] = mult_r( hGSCDec->Last_GSC_spectrum_fx[i], 24576 ); /*Q10*/
-            move16();
-        }
-    }
-    ELSE
-    {
-        /*--------------------------------------------------------------------------------------*
-         * PVQ decoder
-         *--------------------------------------------------------------------------------------*/
-
-        bands_and_bit_alloc_fx( hGSCDec->cor_strong_limit, hGSCDec->noise_lev, st_fx->core_brate, Diff_len, bit, &bit, Ener_per_bd_iQ,
-                                max_ener_band, bits_per_bands, &nb_subbands, NULL, NULL, &pvq_len, coder_type, st_fx->bwidth, st_fx->GSC_noisy_speech,
-                                st_fx->L_frame, st_fx->element_mode, st_fx->GSC_IVAS_mode );
-
-#ifdef ADD_LRTD
-        if ( bit == 0 )
-        {
-            set16_fx( concact_out, 0, L_FRAME16k );
-        }
-#endif
-        {
-            pvq_core_dec_fx( st_fx, gsc_sfm_start, gsc_sfm_end, gsc_sfm_size, concat_out, &Q_tmp, bit, nb_subbands, bits_per_bands, NULL, inpulses_fx, imaxpulse_fx, ACELP_CORE );
-            Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */
-        }
-        seed_init = 0;
-        move16();
-
-#ifdef ADD_LRTD
-        max_eq = 0.0f;
-        max_eq_val = 1.0f;
-
-        if ( ( ( st_fx->core_brate < ACELP_7k20 && st_fx->GSC_noisy_speech == 1 ) || st_fx->core_brate < 6000 ) && coder_type <= UNVOICED )
-        {
-            j = emaximum( concat_out, nb_subbands * 16, &max_eq );
-            max_eq = (float) ( max_eq_val / ( fabs( concat_out[j] ) + 0.01f ) );
-            max_eq = min( max_eq_val, max_eq );
-        }
-#endif
-        /* Reorder Q bands */
-        FOR( j = 0; j < nb_subbands; j++ )
-        {
-            Copy( concat_out + shl( j, 4 ), exc_diffQ + shl( max_ener_band[j], 4 ), 16 ); /* Q_PVQ_OUT */
-
-            *last_bin = s_max( *last_bin, max_ener_band[j] ); /* Q0 */
-            move16();
-
-            bitallocation_band[max_ener_band[j]] = 1; /* Q0 */
-            move16();
-
-            seed_init = add( seed_init, inpulses_fx[j] ); /* Q0 */
-        }
-        test();
-        IF( NE_16( st_fx->last_coder_type, AUDIO )         /* First audio frame */
-            && NE_16( st_fx->last_coder_type, UNVOICED ) ) /* last_coder_type == INACTIVE is overwritten in update_dec to UNVOICED */
-        {
-            FOR( j = 0; j < nb_subbands * 16; j++ )
-            {
-                IF( concat_out[j] > 0 )
-                {
-                    seed_init = extract_l( L_shl( seed_init, 3 ) ); /* Q0 */
-                }
-                if ( concat_out[j] < 0 )
-                {
-                    seed_init = add( seed_init, 3 ); /* Q0 */
-                    move16();
-                }
-            }
-
-            hGSCDec->seed_tcx = seed_init; /* Q0 */
-            move16();
-        }
-        test();
-        IF( EQ_32( st_fx->core_brate, ACELP_8k00 ) && st_fx->bwidth != NB )
-        {
-            if ( exc_diffQ[L_FRAME8k - 2] != 0 )
-            {
-                bitallocation_exc[0] = 1; /* Q0 */
-                move16();
-            }
-
-            if ( exc_diffQ[L_FRAME8k - 1] != 0 )
-            {
-                bitallocation_exc[1] = 1; /* Q0 */
-                move16();
+                break;
             }
+            i++;
         }
 
-        Copy( exc_diffQ, hGSCDec->Last_GSC_spectrum_fx, st_fx->L_frame ); /* Q_PVQ_OUT */
-
-        /*--------------------------------------------------------------------------------------*
-         * Skip adaptive (pitch) contribution frequency band (no noise added over the time contribution)
-         * Find x pulses between 1.6-3.2kHz to code in the spectrum of the residual signal
-         * Gain is based on the inter-correlation gain between the pulses found and residual signal
-         *--------------------------------------------------------------------------------------*/
-#ifdef ADD_LRTD
-        test();
-        test();
-        test();
         test();
         test();
         test();
-        IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) && EQ_16( st_fx->GSC_noisy_speech, 1 ) )
-        {
-            FOR( i = 64; i < st_fx->L_frame; i++ )
-            {
-                PMT( "GSC FIX point to be done here" )
-                exc_diffQ[i] *= max_eq;
-            }
-        }
-        ELSE IF( ( ( LT_32( st_fx->core_brate, ACELP_7k20 ) && EQ_16( st_fx->GSC_noisy_speech, 1 ) ) || LT_32( st_fx->core_brate, 6000 ) ) && LE_16( st_fx->coder_type, UNVOICED ) )
-        {
-            FOR( i = 0; i < L_FRAME; i++ )
-            {
-                PMT( "GSC FIX point to be done here" )
-                exc_diffQ[i] *= max_eq;
-            }
-        }
-        else
-#endif
-        {
-            freq_dnw_scaling_fx( hGSCDec->cor_strong_limit, st_fx->coder_type, hGSCDec->noise_lev, st_fx->core_brate, exc_diffQ, Qexc_diffQ, st_fx->L_frame );
-        }
-    }
-
-    /*--------------------------------------------------------------------------------------*
-     * Estimate noise level
-     *--------------------------------------------------------------------------------------*/
-
-    highband_exc_dct_in_fx( st_fx->core_brate, mfreq_bindiv_loc, *last_bin, Diff_len, hGSCDec->noise_lev, pit_band_idx, exc_diffQ,
-                            &hGSCDec->seed_tcx, Ener_per_bd_iQ, nb_subfr, exc_dct_in, st_fx->last_coder_type, bitallocation_band, lsf_new,
-                            hGSCDec->last_exc_dct_in_fx, &hGSCDec->last_ener_fx, hGSCDec->last_bitallocation_band, bitallocation_exc, st_fx->bfi, coder_type,
-                            st_fx->bwidth, exc_wo_nf, Qexc_diffQ, Q_exc, st_fx->GSC_noisy_speech, hGSCDec->lt_ener_per_band_fx, st_fx->L_frame, st_fx->element_mode, st_fx->GSC_IVAS_mode );
-
-    exc_dct_in[0] = 0;
-    move16();
-
-    return;
-}
-
-/*==========================================================================*/
-/* FUNCTION : void gsc_dec_ivas_fx	()   							            */
-/*--------------------------------------------------------------------------*/
-/* PURPOSE  :  Generic audio signal decoder                                 */
-/*--------------------------------------------------------------------------*/
-/*    INPUT ARGUMENTS :												        */
-/* _ (Word16) pit_band_idx       : bin position of the cut-off frequency Q0 */
-/* _ (Word16) Diff_len 	         : Lenght of the difference signal       Q0 */
-/* _ (Word16) coder_type         : coding type				             Q0 */
-/* _ (Word16) bits_used          : Number of bit used before frequency Q Q0 */
-/* _ (Word16) nb_subfr           : Number of subframe considered         Q0 */
-/* _ (Word16)  Qexc              : Q format of exc_dct_in			        */
-/*--------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :													    */
-/* _ None                                                                   */
-/*--------------------------------------------------------------------------*/
-/* INPUT/OUTPUT ARGUMENTS :  											    */
-/*   Decoder_State *st_fx:Decoder State Structure                        */
-/* _ (Word16[]) exc_dct_in : dctof pitch-only excitation / total excitation Qexc*/
-/*--------------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :													    */
-/* _None                                                     			    */
-/*==========================================================================*/
-void gsc_dec_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: State structure                                     */
-    Word16 exc_dct_in[],       /* i/o: dct of pitch-only excitation / total excitation     Q_exc*/
-    const Word16 pit_band_idx, /* i  : bin position of the cut-off frequency               `	Q0*/
-    const Word16 Diff_len,     /* i  : Lenght of the difference signal (before pure spectral)	Q0*/
-    const Word16 bits_used,    /* i  : Number of bit used before frequency Q					Q0*/
-    const Word16 nb_subfr,     /* i  : Number of subframe considered							Q0*/
-    const Word16 coder_type,   /* i  : coding type												Q0*/
-    Word16 *last_bin,          /* i  : last bin of bit allocation								Q0*/
-    const Word16 *lsf_new,     /* i  : ISFs at the end of the frame                        Qx*/
-    Word16 *exc_wo_nf,         /* o  : excitation (in f domain) without noisefill          Q_exc*/
-    Word16 *Q_exc )
-{
-    Word16 i, j, bit, nb_subbands, pvq_len;
-#if 1 // def ADD_LRTD
-    Word16 bitallocation_band[MBANDS_GN_BITALLOC16k];
-    Word16 bitallocation_exc[2];
-    Word16 Ener_per_bd_iQ[MBANDS_GN_BITALLOC16k];
-    Word16 max_ener_band[MBANDS_GN_BITALLOC16k];
-    Word16 exc_diffQ[L_FRAME16k];
-    Word16 bits_per_bands[MBANDS_GN_BITALLOC16k];
-    Word16 concat_out[L_FRAME16k];
-    Word16 max_eq, max_eq_val;
-#else
-    Word16 bitallocation_band[MBANDS_GN];
-    Word16 bitallocation_exc[2];
-    Word16 Ener_per_bd_iQ[MBANDS_GN];
-    Word16 max_ener_band[MBANDS_GN];
-    Word16 exc_diffQ[L_FRAME];
-    Word16 bits_per_bands[MBANDS_GN];
-    Word16 concat_out[L_FRAME];
-#endif
-    Word16 inpulses_fx[NB_SFM];
-    Word16 imaxpulse_fx[NB_SFM];
-    Word16 mean_gain;
-    Word16 Mbands_gn = 16;
-    Word16 Qexc_diffQ = Q_PVQ_OUT;
-    Word32 L_tmp;
-    Word16 Q_tmp;
-    Word16 seed_init;
-    GSC_DEC_HANDLE hGSCDec;
-    hGSCDec = st_fx->hGSCDec;
-
-    move16(); // for Mbands_gn
-    move16(); // for Qexc_diffQ
-    set16_fx( inpulses_fx, 0, NB_SFM );
-    set16_fx( imaxpulse_fx, 0, NB_SFM );
-
-    /*--------------------------------------------------------------------------------------*
-     * Initialization
-     *--------------------------------------------------------------------------------------*/
-    bit = bits_used;
-    move16();
-#if 1 // def ADD_LRTD
-    test();
-    test();
-    test();
-    if ( coder_type == INACTIVE && ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) || EQ_16( st_fx->element_mode, IVAS_SCE ) ) && LE_32( st_fx->core_brate, GSC_LRES_GAINQ_LIMIT ) )
-    {
-        bit = add( bit, GSC_LRES_NB_NITS ); /* Q0 */
-    }
-
-    if ( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-    {
-        Mbands_gn = MBANDS_GN16k; /* Q0 */
-        move16();
-    }
-#endif
-    set16_fx( exc_diffQ, 0, st_fx->L_frame );
-
-    /*--------------------------------------------------------------------------------------*
-     * Gain decoding
-     *--------------------------------------------------------------------------------------*/
-
-    test();
-    IF( st_fx->bfi || st_fx->BER_detect )
-    {
-        /* copy old gain */
-        Copy( hGSCDec->old_y_gain_fx, Ener_per_bd_iQ, Mbands_gn ); /* Q_old_gain */
-        mean_gain = mult_r( st_fx->lp_gainc_fx, 3277 );            /*Q3*/
-        FOR( i = 0; i < Mbands_gn; i++ )
+        if ( st_fx->element_mode > EVS_MONO && EQ_16( coder_type, AUDIO ) &&
+             LE_32( st_fx->core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation is mapped to 8 kb/s instead of 9.6 kb/s in this case */
         {
-            Ener_per_bd_iQ[i] = add( Ener_per_bd_iQ[i], shl( mean_gain, 9 ) ); /*Q12*/
-            move16();
+            i--;
         }
 
-        st_fx->lp_gainc_fx = mult_r( st_fx->lp_gainc_fx, 32112 ); /*Q3*/
-        move16();
-    }
-    ELSE
-    {
-
-#if 1 // def ADD_LRTD
-        i = 0;
-        move16();
-        WHILE( LT_16( i, SIZE_BRATE_INTERMED_TBL ) )
+        IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
         {
-            if ( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) )
-            {
-                break;
-            }
-            i++;
+            mean_gain = gsc_gaindec_fx( st_fx, Ener_per_bd_iQ, brate_intermed_tbl[i], hGSCDec->old_y_gain_fx, coder_type, st_fx->bwidth ); /* Q3 */
         }
-
-        test();
-        test();
-        test();
-        if ( st_fx->element_mode > EVS_MONO && EQ_16( coder_type, AUDIO ) &&
-             LE_32( st_fx->core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation is mapped to 8 kb/s instead of 9.6 kb/s in this case */
+        ELSE
         {
-            i--;
+            mean_gain = gsc_gaindec_ivas_fx( st_fx, Ener_per_bd_iQ, brate_intermed_tbl[i], hGSCDec->old_y_gain_fx, coder_type, st_fx->bwidth ); /* Q3 */
         }
-        mean_gain = gsc_gaindec_ivas_fx( st_fx, Ener_per_bd_iQ, brate_intermed_tbl[i], hGSCDec->old_y_gain_fx, coder_type, st_fx->bwidth ); /* Q3 */
 
-#else
-        mean_gain = gsc_gaindec_fx( st_fx, Ener_per_bd_iQ, st_fx->core_brate, hGSCDec->old_y_gain_fx, coder_type, st_fx->bwidth );
-#endif
         st_fx->lp_gainc_fx = mult_r( 640, mean_gain ); /*10 in Q6 x Q12 -> lp_gainc in Q3 */
         move16();
     }
@@ -1544,17 +689,17 @@ void gsc_dec_ivas_fx(
          * reduce spectral dynamic
          * save spectrum
          *--------------------------------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
+
         max_eq = 32767;
         move16();
-#endif
+
         test();
         IF( EQ_16( st_fx->last_good, INACTIVE_CLAS ) || EQ_16( st_fx->Last_GSC_noisy_speech_flag, 1 ) )
         {
             FOR( i = 0; i < st_fx->L_frame; i++ )
             {
                 L_tmp = L_shr( L_mult( Random( &hGSCDec->seed_tcx ), 26214 ), 5 ); /*Q10*/
-                L_tmp = L_mac( L_tmp, hGSCDec->Last_GSC_spectrum_fx[i], 6554 );    /* Q10 */
+                L_tmp = L_mac( L_tmp, hGSCDec->Last_GSC_spectrum_fx[i], 6554 );    /*Q10*/
                 hGSCDec->Last_GSC_spectrum_fx[i] = round_fx( L_tmp );              /*Q10*/
                 move16();
             }
@@ -1578,20 +723,20 @@ void gsc_dec_ivas_fx(
                                      max_ener_band, bits_per_bands, &nb_subbands, NULL, NULL, &pvq_len, coder_type, st_fx->bwidth, st_fx->GSC_noisy_speech,
                                      st_fx->L_frame, st_fx->element_mode, st_fx->GSC_IVAS_mode );
 
-#if 1 // def ADD_LRTD
         IF( bit == 0 )
         {
             set16_fx( concat_out, 0, L_FRAME16k );
         }
-#endif
+
+        pvq_core_dec_fx( st_fx, gsc_sfm_start, gsc_sfm_end, gsc_sfm_size, concat_out, &Q_tmp, bit, nb_subbands, bits_per_bands, NULL, inpulses_fx, imaxpulse_fx, ACELP_CORE );
+        IF( nb_subbands > 0 )
         {
-            pvq_core_dec_fx( st_fx, gsc_sfm_start, gsc_sfm_end, gsc_sfm_size, concat_out, &Q_tmp, bit, nb_subbands, bits_per_bands, NULL, inpulses_fx, imaxpulse_fx, ACELP_CORE );
             Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */
         }
+
         seed_init = 0;
         move16();
 
-#if 1 // def ADD_LRTD
         max_eq = 0;
         move16();
         max_eq_val = 32767; /* 1.0f in Q15 */
@@ -1603,7 +748,6 @@ void gsc_dec_ivas_fx(
         IF( ( ( LT_32( st_fx->core_brate, ACELP_7k20 ) && EQ_16( st_fx->GSC_noisy_speech, 1 ) ) || LT_32( st_fx->core_brate, 6000 ) ) && LE_16( coder_type, UNVOICED ) )
         {
             j = maximum_fx( concat_out, imult1616( nb_subbands, 16 ), &max_eq );
-            // max_eq = max_eq_val / (abs_s(concat_out[j]) + 328 /*0.01f*/ );
             Word16 temp_max_eq = add( abs_s( concat_out[j] ), 10 ) /*0.01f in Q10*/;
             if ( LE_16( temp_max_eq, ONE_IN_Q10 ) )
             {
@@ -1618,7 +762,7 @@ void gsc_dec_ivas_fx(
                 max_eq = shl( max_eq, exp ); /* Q15 */
             }
         }
-#endif
+
         /* Reorder Q bands */
         FOR( j = 0; j < nb_subbands; j++ )
         {
@@ -1644,11 +788,7 @@ void gsc_dec_ivas_fx(
                 }
                 if ( concat_out[j] < 0 )
                 {
-#ifdef BASOP_NOGLOB_TMP_715
                     seed_init = add_sat( seed_init, 3 ); /* Q0 */
-#else
-                    seed_init = add( seed_init, 3 );
-#endif
                 }
             }
 
@@ -1678,7 +818,7 @@ void gsc_dec_ivas_fx(
          * Find x pulses between 1.6-3.2kHz to code in the spectrum of the residual signal
          * Gain is based on the inter-correlation gain between the pulses found and residual signal
          *--------------------------------------------------------------------------------------*/
-#if 1 // def ADD_LRTD
+
         test();
         test();
         test();
@@ -1687,8 +827,6 @@ void gsc_dec_ivas_fx(
         {
             FOR( i = 64; i < st_fx->L_frame; i++ )
             {
-                // PMT("GSC FIX point to be done here")
-                // exc_diffQ[i] *= max_eq;
                 exc_diffQ[i] = mult_r( exc_diffQ[i], max_eq ); /* Q_PVQ_OUT */
                 move16();
             }
@@ -1697,14 +835,11 @@ void gsc_dec_ivas_fx(
         {
             FOR( i = 0; i < L_FRAME; i++ )
             {
-                // PMT("GSC FIX point to be done here")
-                // exc_diffQ[i] *= max_eq;
                 exc_diffQ[i] = mult_r( exc_diffQ[i], max_eq ); /* Q_PVQ_OUT */
                 move16();
             }
         }
         ELSE
-#endif
         {
             freq_dnw_scaling_fx( hGSCDec->cor_strong_limit, st_fx->coder_type, hGSCDec->noise_lev, st_fx->core_brate, exc_diffQ, Qexc_diffQ, st_fx->L_frame );
         }
@@ -1745,17 +880,11 @@ void GSC_dec_init(
     move16();
     move16();
 
-#ifdef ADD_LRTD
-    set16_fx( hGSCDec->Last_GSC_spectrum_fx, 0, L_FRAME16k );
-    set16_fx( hGSCDec->last_exc_dct_in_fx, 0, L_FRAME16k );
-    set16_fx( hGSCDec->lt_ener_per_band_fx, 4096, MBANDS_GN_BITALLOC16k );
-    set16_fx( hGSCDec->old_y_gain_fx, 0, MBANDS_GN_BITALLOC16k );
-#else
     set16_fx( hGSCDec->Last_GSC_spectrum_fx, 0, L_FRAME );
     set16_fx( hGSCDec->last_exc_dct_in_fx, 0, L_FRAME );
     set16_fx( hGSCDec->old_y_gain_fx, 0, MBANDS_GN );
     set16_fx( hGSCDec->lt_ener_per_band_fx, 4096, MBANDS_GN ); /*Q12*/
-#endif
+
     hGSCDec->last_ener_fx = 0;
     move16();
     set16_fx( hGSCDec->last_bitallocation_band, 0, 6 );
diff --git a/lib_dec/hdecnrm.c b/lib_dec/hdecnrm.c
deleted file mode 100644
index 56e7b45fee58bbf657962368390a21ea3df5f681..0000000000000000000000000000000000000000
--- a/lib_dec/hdecnrm.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_dec.h"
-#include "wmc_auto.h"
-
-
-/*--------------------------------------------------------------------------*/
-/*  Function  decode_huff_context()                                         */
-/*                                                                          */
-/*  Context based Huffman decoding for indices of quantized norms           */
-/*--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*/
-/*  Function  hdecnrm()                                                     */
-/*                                                                          */
-/*  Huffman decoding for indices of quantized norms                         */
-/*--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- *  huff_dec()
- *
- *  Huffman decoding
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- *  hdecnrm_context()
- *
- *  Huffman decoding for indices of quantized norms
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- *  hdecnrm_resize()
- *
- *
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * hdecnrm_trans()
- *
- * Huffman decoding for indices of quantized norms
- *--------------------------------------------------------------------------*/
diff --git a/lib_dec/hf_synth.c b/lib_dec/hf_synth.c
deleted file mode 100644
index 8070239de50819efd37d9572e70571081767b81a..0000000000000000000000000000000000000000
--- a/lib_dec/hf_synth.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-#include "basop32.h"
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------------------------*
- * hf_synthesis_amr_wb()
- *
- * HF noise synthesis
- * - Generate HF noise between 6 and 8 kHz, mix it with signal obtained by linear resampling.
- * - Set energy of high band
- *-----------------------------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------------------------*
- * EnhanceClass()
- *
- *
- *-----------------------------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------------------------*
- * envelope()
- *
- *
- *-----------------------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------------*
- * AdaptiveStartBand()
- *
- * adaptively select the start band of bandwidth extension
- *---------------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------------*
- * hp400_12k8()
- *
- * 2nd order Cheb2 high pass filter with cut off frequency at 400 Hz.
- * Optimized for fixed-point to get the following frequency response:
- *
- *  frequency  :   0Hz   100Hz  200Hz  300Hz  400Hz  630Hz  1.5kHz  3kHz
- *  dB loss  :   -infdB  -30dB  -20dB  -10dB  -3dB   +6dB    +1dB    0dB
- *
- * Algorithm  :
- *
- *  y[i] = b[0]*x[i] + b[1]*x[i-1] + b[2]*x[i-2]
- *                   + a[1]*y[i-1] + a[2]*y[i-2];
- *
- *  short b[3] = {3660, -7320,  3660};       in Q12
- *  short a[3] = {4096,  7320, -3540};       in Q12
- *
- *  float b[3] = {0.893554687, -1.787109375,  0.893554687};
- *  float a[3] = {1.000000000,  1.787109375, -0.864257812};
- *-----------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * filt_6k_7k()
- *
- * 15th order band pass 6kHz to 7kHz FIR filter
- *
- * frequency  :4kHz   5kHz  5.5kHz  6kHz  6.5kHz 7kHz  7.5kHz  8kHz
- * dB loss  : -60dB  -45dB  -13dB   -3dB   0dB   -3dB  -13dB  -45dB
- * (gain = 4.0)
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/hf_synth_fx.c b/lib_dec/hf_synth_fx.c
index e931ae229eafdbb14229cc16da6c2620fa4ba92e..65c2e9290ab40cbdfd90c6883b33adaaac01d0ec 100644
--- a/lib_dec/hf_synth_fx.c
+++ b/lib_dec/hf_synth_fx.c
@@ -7,7 +7,6 @@
 #include "prot_fx.h" /* Function prototypes                    */
 #include "rom_com.h" /* Static table prototypes                */
 #include "basop32.h"
-#include "prot.h"
 
 /*---------------------------------------------------------------------*
  * Local constants
@@ -21,7 +20,7 @@
  *---------------------------------------------------------------------*/
 
 static void filt_6k_7k_scale_fx( Word16 signal[], Word16 lg, Word16 mem[], Word16 fact, Word16 exp );
-static void hf_synthesis_fx( ZERO_BWE_DEC_HANDLE hBWE_zero, const Word32 core_brate, const Word16 output_subfr, const Word16 Aq[], const Word16 exc[], const Word16 Q_exc, Word16 synth[], Word16 synth16k[], const Word16 Q_syn, Word16 *delay_syn_hf, Word16 *memExp1, Word16 *mem_hp_interp, const Word16 extl, const Word16 CNG_mode );
+static void hf_synthesis_fx( ZERO_BWE_DEC_HANDLE hBWE_zero, const Word32 core_brate, const Word16 output_subfr, const Word16 Aq[], const Word16 exc[], const Word16 Q_exc, Word16 synth[], Word16 synth16k[], const Word16 Q_syn );
 static void hf_synthesis_amr_wb_fx( const Word32 core_brate, const Word16 output_subfr, const Word16 Ap[], Word16 exc16k[], Word16 synth_out[], Word16 *mem_syn_hf, Word16 *delay_syn_hf, Word16 *mem_hp_interp, Word16 p_r, Word16 HF_corr_gain, Word16 til, Word16 voice_factors, const Word16 exc[], const Word16 Q_exc, const Word16 Q_out, Word16 qhf );
 static void envelope_fx( AMRWB_IO_DEC_HANDLE hAmrwb_IO, const Word32 core_brate, const Word16 Aq[], Word16 Ap[], Word16 *r, Word16 tilt0, Word16 tilt, Word16 voice_factor );
 static void AdaptiveStartBand_fx( Word16 *start_band, const Word32 rate, const Word16 *lsf, const Word16 voicing_fac, const Word16 clas, Word16 *voicing_flag, Word16 *start_band_old, Word32 *OptCrit_old );
@@ -87,12 +86,7 @@ void hf_synth_fx(
     Word16 *synth,                 /* i  : 12.8kHz synthesis signal		 Q_syn2*/
     Word16 *synth16k,              /* o  : 16kHz synthesis signal        Q_syn2*/
     const Word16 Q_exc,            /* i  : excitation scaling             */
-    const Word16 Q_syn2,           /* i  : synthesis scaling              */
-    Word16 *delay_syn_hf,          /*i/o: HF synthesis memory            Q_syn2*/
-    Word16 *memExp1,               /* o  : HF excitation exponent         */
-    Word16 *mem_hp_interp,         /* i/o: interpol. memory               Qx*/
-    const Word16 extl,             /* i  : flag indicating BWE            Q0*/
-    const Word16 CNG_mode          /* i  : CNG_mode                       Q0*/
+    const Word16 Q_syn2            /* i  : synthesis scaling              */
 )
 {
     const Word16 *p_Aq;
@@ -104,8 +98,7 @@ void hf_synth_fx(
     p_Aq = Aq; /* Q12 */
     FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
     {
-        hf_synthesis_fx( hBWE_zero, core_brate, output_subfr, p_Aq, &exc[i_subfr], Q_exc, &synth[i_subfr], &synth16k[imult3216( (Word32) i_subfr, output_subfr ) / L_SUBFR],
-                         Q_syn2, delay_syn_hf, memExp1, mem_hp_interp, extl, CNG_mode );
+        hf_synthesis_fx( hBWE_zero, core_brate, output_subfr, p_Aq, &exc[i_subfr], Q_exc, &synth[i_subfr], &synth16k[imult3216( (Word32) i_subfr, output_subfr ) / L_SUBFR], Q_syn2 );
 
         p_Aq += ( M + 1 ); /* Q12 */
     }
@@ -133,27 +126,19 @@ static void hf_synthesis_fx(
     const Word16 Q_exc,        /* i  : excitation scaling                 		     */
     Word16 synth[],            /* i  : 12.8kHz synthesis signal					Q_syn*/
     Word16 synth16k[],         /* i/o: 16kHz synthesis signal					Q_syn*/
-    const Word16 Q_syn,        /* i  : synthesis scaling                   		     */
-    Word16 *delay_syn_hf,      /* i/o: HF synthesis memory						Q_syn*/
-    Word16 *memExp1,           /* o  : HF excitation scaling exponent				 */
-    Word16 *mem_hp_interp,     /* i/o: interpol. memory                            Qx*/
-    const Word16 extl,         /* i  : flag indicating BWE                         Q0*/
-    const Word16 CNG_mode      /* i  : CNG_mode                                    Q0*/
+    const Word16 Q_syn         /* i  : synthesis scaling                   		     */
 )
 {
-    Word16 i;
+    Word16 i, s;
     Word16 HF_syn[L_SUBFR16k], upsampled_HF_syn[L_FRAME48k / NB_SUBFR];
     Word16 HF_exc[L_SUBFR16k];
-    Word16 temp_buffer[NS2SA( 16000, DELAY_CLDFB_NS ) - L_FILT16k];
-    Word16 tmp, ener, exp1, exp2, scale, delay;
+    Word16 tmp, ener, exp1, exp2, scale;
     Word32 L_tmp;
     Word16 Ap[M16k + 1];
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
 #endif
-    (void) extl;
-    (void) CNG_mode;
 
     /*-----------------------------------------------------------------*
      * generate white noise vector
@@ -189,19 +174,15 @@ static void hf_synthesis_fx(
     L_tmp = Isqrt_lc( L_tmp, &exp1 );
     scale = round_fx( L_tmp ); /* Q18 when Q_exc=-1, HF_exc in Q-3 */
 
-    exp2 = sub( *memExp1, exp1 );
-    *memExp1 = exp1;
+    exp2 = sub( hBWE_zero->memExp1, exp1 );
+    hBWE_zero->memExp1 = exp1;
     move16();
 
     /*-----------------------------------------------------------------*
      * calculate energy scaling factor to respect tilt of synth12k8
      * (tilt: 1=voiced, -1=unvoiced)
      *-----------------------------------------------------------------*/
-#ifdef EVS_MONO
     hp400_12k8_fx( synth, L_SUBFR, hBWE_zero->mem_hp400_fx );
-#else
-    hp400_12k8_ivas_fx( synth, L_SUBFR, hBWE_zero->mem_hp400_fx );
-#endif
     /* i: mem_hp400 in Q_syn */
     /* i: synth in Q_syn */
     /* o: synth in Q_syn-3 */
@@ -209,11 +190,7 @@ static void hf_synthesis_fx(
     L_tmp = L_mac( 1L, synth[0], synth[0] ); /* 2*(Q_syn-3)+1 */
     FOR( i = 1; i < L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_sat( L_tmp, synth[i], synth[i] ); /* 2*(Q_syn-3)+1 */
-#else
-        L_tmp = L_mac( L_tmp, synth[i], synth[i] );
-#endif
     }
     tmp = norm_l( L_tmp );
     ener = extract_h( L_shl( L_tmp, tmp ) ); /* ener = r[0] */
@@ -222,11 +199,7 @@ static void hf_synthesis_fx(
     L_tmp = L_mac( 1L, synth[1], synth[0] ); /* 2*(Q_syn-3)+1 */
     FOR( i = 2; i < L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_sat( L_tmp, synth[i], synth[i - 1] ); /* 2*(Q_syn-3)+1 */
-#else
-        L_tmp = L_mac( L_tmp, synth[i], synth[i - 1] );
-#endif
     }
     tmp = extract_h( L_shl( L_tmp, tmp ) ); /* tmp = r[1] */
     /*tmp in Q = 2*(Q_syn-3)+1 = Q-5 when Q_syn=0 */
@@ -245,21 +218,13 @@ static void hf_synthesis_fx(
      *-----------------------------------------------------------------*/
 
     /* tmp = 1.0 - fac */
-#ifdef BASOP_NOGLOB
     tmp = add_o( 1, sub( 32767 /* 1 in Q15 */, tmp ), &Overflow );
-#else
-    tmp = add( 1, sub( 32767, tmp ) );
-#endif
     test();
     if ( core_brate == FRAME_NO_DATA || EQ_32( core_brate, SID_2k40 ) )
     {
         /* emphasize HF noise in CNG */
         /*fac *= 2.0f;*/
-#ifdef BASOP_NOGLOB
         tmp = add_o( tmp, tmp, &Overflow ); /* Q15 */
-#else
-        tmp = add( tmp, tmp );
-#endif
     }
     tmp = s_max( tmp, 3277 ); /* 0.1 in Q15 */
 
@@ -296,41 +261,31 @@ static void hf_synthesis_fx(
      *-----------------------------------------------------------------*/
 
     /* delay by 5 samples @16kHz to compensate CLDFB resampling delay (20samples) and HP filtering delay (roughly 15 samples) */
-    delay = NS2SA_FX2( 16000, DELAY_CLDFB_NS ) - 15;
-    Copy( HF_syn + sub( L_SUBFR16k, delay ), temp_buffer, delay ); /* Q_syn+exp1 */
-    Copy( HF_syn, HF_syn + delay, sub( L_SUBFR16k, delay ) );      /* Q_syn+exp1 */
-    Copy( delay_syn_hf, HF_syn, delay );                           /* Q_syn */
-    Copy( temp_buffer, delay_syn_hf, delay );                      /* Q_syn */
+    delay_signal_fx( HF_syn, L_SUBFR16k, hBWE_zero->delay_syn_hf_fx, NS2SA_FX2( 16000, DELAY_CLDFB_NS ) - 15 );
 
     /* interpolate the HF synthesis */
     IF( EQ_16( output_subfr, L_SUBFR48k ) ) /* 48kHz sampled output */
     {
-        {
-            Word16 s;
-            s = s_max( s_min( sub( s_min( Find_Max_Norm16( HF_syn, L_SUBFR16k ), Find_Max_Norm16( mem_hp_interp, INTERP_3_1_MEM_LEN - 3 ) ), 3 ),
-                              sub( Find_Max_Norm16( mem_hp_interp + INTERP_3_1_MEM_LEN - 3, 3 ), 1 ) ),
-                       0 );
-            Scale_sig( HF_syn, L_SUBFR16k, s );                /* Q_syn+exp1+s */
-            Scale_sig( mem_hp_interp, INTERP_3_1_MEM_LEN, s ); /* Qx + s */
-            interpolate_3_over_1_allpass_fx( HF_syn, L_SUBFR16k, upsampled_HF_syn, mem_hp_interp );
-            Scale_sig( upsampled_HF_syn, 3 * L_SUBFR16k, -s );  /* Q_syn + exp1 + s */
-            Scale_sig( mem_hp_interp, INTERP_3_1_MEM_LEN, -s ); /* Qx */
-            Scale_sig( HF_syn, L_SUBFR16k, -s );                /* Q_syn+exp1 */
-        }
+        s = s_max( s_min( sub( s_min( Find_Max_Norm16( HF_syn, L_SUBFR16k ), Find_Max_Norm16( hBWE_zero->mem_hp_interp_fx, INTERP_3_1_MEM_LEN - 3 ) ), 3 ),
+                          sub( Find_Max_Norm16( hBWE_zero->mem_hp_interp_fx + INTERP_3_1_MEM_LEN - 3, 3 ), 1 ) ),
+                   0 );
+        Scale_sig( HF_syn, L_SUBFR16k, s );                              /* Q_syn+exp1+s */
+        Scale_sig( hBWE_zero->mem_hp_interp_fx, INTERP_3_1_MEM_LEN, s ); /* Qx + s */
+        interpolate_3_over_1_allpass_fx( HF_syn, L_SUBFR16k, upsampled_HF_syn, hBWE_zero->mem_hp_interp_fx );
+        Scale_sig( upsampled_HF_syn, 3 * L_SUBFR16k, -s );                /* Q_syn + exp1 + s */
+        Scale_sig( hBWE_zero->mem_hp_interp_fx, INTERP_3_1_MEM_LEN, -s ); /* Qx */
+        Scale_sig( HF_syn, L_SUBFR16k, -s );                              /* Q_syn+exp1 */
         Scale_sig( upsampled_HF_syn, L_SUBFR48k, -1 );
     }
     ELSE IF( EQ_16( output_subfr, L_SUBFR32k ) ) /* 32kHz sampled output */
     {
-        {
-            Word16 s;
-            s = s_max( sub( s_min( Find_Max_Norm16( HF_syn, L_SUBFR16k ), Find_Max_Norm16( mem_hp_interp, 2 * ALLPASSSECTIONS_STEEP ) ), 2 ), 0 );
-            Scale_sig( HF_syn, L_SUBFR16k, s );                       /* Q_syn+exp1+s */
-            Scale_sig( mem_hp_interp, 2 * ALLPASSSECTIONS_STEEP, s ); /* Qx + s */
-            Interpolate_allpass_steep_fx( HF_syn, mem_hp_interp, L_SUBFR16k, upsampled_HF_syn );
-            Scale_sig( upsampled_HF_syn, 2 * L_SUBFR16k, -s );         /* Q_syn + exp1 */
-            Scale_sig( mem_hp_interp, 2 * ALLPASSSECTIONS_STEEP, -s ); /* Qx */
-            Scale_sig( HF_syn, L_SUBFR16k, -s );                       /* Q_syn+exp1 */
-        }
+        s = s_max( sub( s_min( Find_Max_Norm16( HF_syn, L_SUBFR16k ), Find_Max_Norm16( hBWE_zero->mem_hp_interp_fx, 2 * ALLPASSSECTIONS_STEEP ) ), 2 ), 0 );
+        Scale_sig( HF_syn, L_SUBFR16k, s );                                     /* Q_syn+exp1+s */
+        Scale_sig( hBWE_zero->mem_hp_interp_fx, 2 * ALLPASSSECTIONS_STEEP, s ); /* Qx + s */
+        Interpolate_allpass_steep_fx( HF_syn, hBWE_zero->mem_hp_interp_fx, L_SUBFR16k, upsampled_HF_syn );
+        Scale_sig( upsampled_HF_syn, 2 * L_SUBFR16k, -s );                       /* Q_syn + exp1 */
+        Scale_sig( hBWE_zero->mem_hp_interp_fx, 2 * ALLPASSSECTIONS_STEEP, -s ); /* Qx */
+        Scale_sig( HF_syn, L_SUBFR16k, -s );                                     /* Q_syn+exp1 */
     }
     ELSE /* 16kHz sampled output */
     {
@@ -380,19 +335,11 @@ static void filt_6k_7k_scale_fx(
         move32();
         FOR( j = 0; j < 31; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac_o( L_tmp, x[i + j], fir_6k_7k_fx[j], &Overflow ); /* Q16 */
-#else
-            L_tmp = L_mac( L_tmp, x[i + j], fir_6k_7k_fx[j] );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         signal[i] = round_fx_o( L_tmp, &Overflow ); /* Q0 */
         move16();
-#else
-        signal[i] = round_fx( L_tmp );
-#endif
     }
     Copy( x + lg, mem, L_FIR - 1 ); /* Qx - 2 */
 }
@@ -630,12 +577,8 @@ void hf_synth_amr_wb_fx(
         fmerit_w = shr( fmerit_w, 1 ); /* Q14 */
     }
 
-#ifdef BASOP_NOGLOB
     L_tmp = L_mult( fmerit_w, add_sat( 16384, voice_fac ) ); /* Q14 */
-#else
-    L_tmp = L_mult( fmerit_w, add( 16384, voice_fac ) );
-#endif
-    fmerit_w = extract_l( L_shr( L_tmp, 15 ) ); /*Q14 */
+    fmerit_w = extract_l( L_shr( L_tmp, 15 ) );              /*Q14 */
     /**fmerit_w_sm = add(mult_r(*fmerit_w_sm, 29491), mult_r(fmerit_w, 3277));  //Q14 */
     hAmrwb_IO->fmerit_w_sm_fx = round_fx( L_mac( L_mult( hAmrwb_IO->fmerit_w_sm_fx, 29491 ), fmerit_w, 3277 ) ); /*Q14 */
     move16();
@@ -702,7 +645,7 @@ void hf_synth_amr_wb_fx(
 
     q_tmp = Exp16Array( L_FRAME, exc );
     qdct = sub( q_tmp, 1 );
-    Copy_Scale_sig_16_32( exc, exc32, L_FRAME, qdct ); /* Qexc + qdct */
+    Copy_Scale_sig_16_32_DEPREC( exc, exc32, L_FRAME, qdct ); /* Qexc + qdct */
 
     qdct = add( qdct, Q_exc );
     edct_fx( exc32, dct_exc32, L_FRAME, &qdct );
@@ -775,11 +718,7 @@ void hf_synth_amr_wb_fx(
             pt4 = &dct_hb[240];
             FOR( j = 0; j < fn; j++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp = add_sat( tmp, shr( *pt4++, 2 ) ); /*qdct-2 */
-#else
-                tmp = add( tmp, shr( *pt4++, 2 ) ); /*qdct-2 */
-#endif
             }
             *pt1 = round_fx( L_shl( L_mult( tmp, tmp1 ), 2 ) ); /*qdct */
             move16();
@@ -802,11 +741,7 @@ void hf_synth_amr_wb_fx(
             pt4 = &dct_hb[fb + 240];
             FOR( j = fb; j < fn; j++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp = add_sat( tmp, shr( *pt4++, 2 ) ); /*qdct-2 */
-#else
-                tmp = add( tmp, shr( *pt4++, 2 ) ); /*qdct-2 */
-#endif
             }
             *pt1 = mult_r( tmp, 8738 );
             move16(); /* 8738 = 1/15 in Q17 qdct */
@@ -814,11 +749,7 @@ void hf_synth_amr_wb_fx(
             move16();
             IF( *pt2 > 0 )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_sat( L_tmp, shr( *pt2, 1 ), shr( *pt2, 1 ) ); /*2*qdct-2 */
-#else
-                L_tmp = L_mac0( L_tmp, shr( *pt2, 1 ), shr( *pt2, 1 ) );
-#endif
             }
             pt1++;
             pt2++;
@@ -834,11 +765,7 @@ void hf_synth_amr_wb_fx(
             pt4 = &dct_hb[fb + 240];
             FOR( j = fb; j < L_SUBFR16k; j++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp = add_sat( tmp, shr( *pt4++, 2 ) ); /*qdct-2 */
-#else
-                tmp = add( tmp, shr( *pt4++, 2 ) );                      /*qdct-2 */
-#endif
             }
             *pt1 = round_fx( L_shl( L_mult( tmp, tmp1 ), 2 ) ); /*qdct */
             move16();
@@ -846,11 +773,7 @@ void hf_synth_amr_wb_fx(
             move16();
             IF( *pt2 > 0 )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_sat( L_tmp, shr( *pt2, 1 ), shr( *pt2, 1 ) ); /*2*qdct-2 */
-#else
-                L_tmp = L_mac0( L_tmp, shr( *pt2, 1 ), shr( *pt2, 1 ) ); /*2*qdct-2 */
-#endif
             }
             pt1++;
             pt2++;
@@ -878,15 +801,10 @@ void hf_synth_amr_wb_fx(
                 *pt1 = mult_r( *pt1, g ); /*qdct  */
                 move16();
             }
-#ifdef BASOP_NOGLOB
             *pt2 = round_fx_sat( L_shl_sat( L_mult( *pt2, inv_g ), 3 ) ); /*qdct */
             move16();
             *pt3 = add_sat( *pt1, *pt2 );
             move16();
-#else
-            *pt2 = round_fx( L_shl( L_mult( *pt2, inv_g ), 3 ) );        /*qdct */
-            *pt3 = add( *pt1, *pt2 );
-#endif
             *pt3 = extract_l( L_mult0( *pt3, *pt4 ) ); /*qdct   */
             move16();
             pt1++;
@@ -900,11 +818,7 @@ void hf_synth_amr_wb_fx(
         L_tmp = L_mult( ener, scale );                                                       /*30-q1+q2 */
         q2 = sub( q1, q2 );                                                                  /*30-q2 */
         scale = round_fx( Isqrt( L_shl( L_tmp, sub( q2, 24 ) ) ) );                          /*Q12  */
-#ifdef BASOP_NOGLOB
-        scale = round_fx_sat( L_shl_sat( L_mult( scale, gamma ), 4 ) ); /*Q15 */
-#else
-        scale = round_fx( L_shl( L_mult( scale, gamma ), 4 ) );     /*Q15 */
-#endif
+        scale = round_fx_sat( L_shl_sat( L_mult( scale, gamma ), 4 ) );                      /*Q15 */
     }
     ELSE
     {
@@ -1017,7 +931,7 @@ void hf_synth_amr_wb_fx(
 
     q_tmp = Exp16Array( L_FRAME16k, dct_hb );
     qhf = sub( q_tmp, 1 );
-    Copy_Scale_sig_16_32( dct_hb, dct_hb32, L_FRAME16k, qhf ); /* qhf + qdct */
+    Copy_Scale_sig_16_32_DEPREC( dct_hb, dct_hb32, L_FRAME16k, qhf ); /* qhf + qdct */
     qhf = add( qhf, qdct );
     edct_fx( dct_hb32, exc16k32, L_FRAME16k, &qhf );
     q_tmp = Exp32Array( L_FRAME16k, exc16k32 );
@@ -1041,40 +955,24 @@ void hf_synth_amr_wb_fx(
         shift = norm_l( L_tmp );
         L_tmp = L_shl( L_tmp, shift ); /*Q(q3+shift); */
         q3 = add( q3, shift );
-#ifdef BASOP_NOGLOB
         scale = round_fx_sat( L_tmp ); /*Q(q3-16); */
-#else
-        scale = round_fx( L_tmp );                                  /*Q(q3-16); */
-#endif
         q3 = sub( q3, 16 );
         scale = div_s( shl( 1, 14 ), scale ); /*Q(29-q3)  */
         L_tmp = L_mult( scale, ener );        /*Q(29-q3+q1+1) */
         shift = norm_l( L_tmp );
-        L_tmp = L_shl( L_tmp, shift ); /*Q(29-q3+q1+1+shift) */
-#ifdef BASOP_NOGLOB
-        scale = round_fx_sat( L_tmp ); /*Q(29-q3+q1+1+shift-16) */
-#else
-        scale = round_fx( L_tmp );                                  /*Q(29-q3+q1+1+shift-16) */
-#endif
+        L_tmp = L_shl( L_tmp, shift );     /*Q(29-q3+q1+1+shift) */
+        scale = round_fx_sat( L_tmp );     /*Q(29-q3+q1+1+shift-16) */
         L_tmp = L_mult( scale, e_subfr2 ); /*Q(29-q3+q1+1+shift-16+q4+1)=Q(15+q1-q3+q4+shift) */
         q3 = sub( 15, q3 );
         q3 = add( q3, q1 );
         q3 = add( q3, shift );
         q3 = add( q3, q4 );
-#ifdef BASOP_NOGLOB
         scale = round_fx_sat( Isqrt( L_shl_sat( L_tmp, sub( 6, q3 ) ) ) ); /*Q12 */
-#else
-        scale = round_fx( Isqrt( L_shl( L_tmp, sub( 6, q3 ) ) ) );  /*Q12 */
-#endif
         pt6 += L_SUBFR;
         FOR( j = 0; j < L_SUBFR16k; j++ )
         {
-#ifdef BASOP_NOGLOB
             *pt2 = round_fx_sat( L_shl_sat( L_mult( *pt2, scale ), 2 ) ); /*qhf-1 */
             move16();
-#else
-            *pt2 = round_fx( L_shl( L_mult( *pt2, scale ), 2 ) );   /*qhf-1 */
-#endif
             pt2++;
         }
     }
@@ -1141,14 +1039,10 @@ static void hf_synthesis_amr_wb_fx(
         ener = extract_h( L_tmp );  /*Q(q1+q3); */
         q1 = add( q1, q3 );
 
-        scale = div_s( shl( 1, 14 ), ener ); /*Q(29-q1) */
-        L_tmp = L_mult( tmp, scale );        /*30-q1+q2 */
-        q2 = sub( q1, q2 );                  /*30-q2 */
-#ifdef BASOP_NOGLOB
+        scale = div_s( shl( 1, 14 ), ener );                                /*Q(29-q1) */
+        L_tmp = L_mult( tmp, scale );                                       /*30-q1+q2 */
+        q2 = sub( q1, q2 );                                                 /*30-q2 */
         scale = round_fx_sat( Isqrt( L_shl_sat( L_tmp, sub( q2, 24 ) ) ) ); /*Q12  */
-#else
-        scale = round_fx( Isqrt( L_shl( L_tmp, sub( q2, 24 ) ) ) ); /*Q12  */
-#endif
         pt1 = exc16k;
         pt2 = exc2385;
         FOR( i = 0; i < L_SUBFR16k; i++ )
@@ -1177,14 +1071,10 @@ static void hf_synthesis_amr_wb_fx(
         ener = extract_h( L_tmp );  /*Q(q1+q3); */
         q1 = add( q1, q3 );
 
-        scale = div_s( shl( 1, 14 ), ener ); /*Q(29-q1) */
-        L_tmp = L_mult( tmp, scale );        /*30-q1+q2 */
-        q2 = sub( q1, q2 );                  /*30-q2 */
-#ifdef BASOP_NOGLOB
+        scale = div_s( shl( 1, 14 ), ener );                                /*Q(29-q1) */
+        L_tmp = L_mult( tmp, scale );                                       /*30-q1+q2 */
+        q2 = sub( q1, q2 );                                                 /*30-q2 */
         scale = round_fx_sat( Isqrt( L_shl_sat( L_tmp, sub( q2, 24 ) ) ) ); /*Q12  */
-#else
-        scale = round_fx( Isqrt( L_shl( L_tmp, sub( q2, 24 ) ) ) ); /*Q12  */
-#endif
         flag = negate( s_and( til, -0x8000 ) );
         if ( GT_16( scale, 4096 /* 1.0f in Q12 */ ) )
         {
@@ -1232,7 +1122,8 @@ static void hf_synthesis_amr_wb_fx(
      * Synchronize LB and HB components (delay componsation)
      * Add synthesised high band to speech synthesis
      *-----------------------------------------------------------------*/
-    delay_signal( HF_syn, L_SUBFR16k, delay_syn_hf, NS2SA( 16000, DELAY_CLDFB_NS ) );
+
+    delay_signal_fx( HF_syn, L_SUBFR16k, delay_syn_hf, NS2SA( 16000, DELAY_CLDFB_NS ) );
 
     IF( EQ_16( output_subfr, L_SUBFR48k ) ) /* 48kHz sampled output */
     {
@@ -1287,9 +1178,7 @@ static Word16 EnhanceClass_fx(
     Word16 unvoicing_tmp_fx;
     Word16 tmp, tmp1;
     Word32 L_tmp;
-#ifdef BASOP_NOGLOB
     Flag Overflow;
-#endif
 
 
     /* Decide (*unvoicing_flag) to allow BWE enhancement when qq>pp */
@@ -1327,21 +1216,13 @@ static Word16 EnhanceClass_fx(
         move16();
     }
 
-#ifdef BASOP_NOGLOB
     if ( GT_16( sub_o( *unvoicing_fx, *unvoicing_sm_fx, &Overflow ), 3277 /* 0.1 in Q15 */ ) )
-#else
-    if ( GT_16( sub( *unvoicing_fx, *unvoicing_sm_fx ), 3277 ) )
-#endif
     {
         *unvoicing_flag = 1;
         move16();
     }
 
-#ifdef BASOP_NOGLOB
     if ( LT_16( sub_o( *unvoicing_fx, *unvoicing_sm_fx, &Overflow ), 1638 /* 0.05 in Q15 */ ) )
-#else
-    if ( LT_16( sub( *unvoicing_fx, *unvoicing_sm_fx ), 1638 ) )
-#endif
     {
         *unvoicing_flag = 0;
         move16();
@@ -1437,11 +1318,7 @@ static void envelope_fx(
     pt3 = exp_tab_q_fx; /* Q14 */
     FOR( i = 0; i <= M; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_sat( L_tmp, *pt2++, *pt3++ ); /* Q27 */
-#else
-        L_tmp = L_mac( L_tmp, *pt2++, *pt3++ );
-#endif
     }
     q2 = norm_l( L_tmp );
     L_tmp = L_shl( L_tmp, q2 );         /*Q(27+q2)*/
@@ -1452,11 +1329,7 @@ static void envelope_fx(
     pt3 = exp_tab_q_fx + 33; /* Q14 */
     FOR( i = 0; i <= M; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_sat( L_tmp, *pt2++, *pt3-- ); /* Q14 */
-#else
-        L_tmp = L_mac( L_tmp, *pt2++, *pt3-- );
-#endif
     }
     q3 = norm_l( L_tmp );
     shift = sub( q2, q3 );
@@ -1474,19 +1347,11 @@ static void envelope_fx(
     ry = round_fx( L_shr( L_tmp, 1 ) ); /*Q(10+q2)*/
 
     L_tmp = L_mult( px, px );
-    L_tmp = L_mac( L_tmp, py, py ); /*Q(21+2*q1)*/
-#ifdef BASOP_NOGLOB
+    L_tmp = L_mac( L_tmp, py, py );                                        /*Q(21+2*q1)*/
     pp = round_fx_sat( Isqrt( L_shr( L_tmp, add( 11, shl( q1, 1 ) ) ) ) ); /*Q10*/
-#else
-    pp = round_fx( Isqrt( L_shr( L_tmp, add( 11, shl( q1, 1 ) ) ) ) ); /*Q10*/
-#endif
     L_tmp = L_mult( rx, rx );
-    L_tmp = L_mac( L_tmp, ry, ry ); /*Q(21+2*q1)*/
-#ifdef BASOP_NOGLOB
+    L_tmp = L_mac( L_tmp, ry, ry );                                        /*Q(21+2*q1)*/
     rr = round_fx_sat( Isqrt( L_shr( L_tmp, add( 11, shl( q2, 1 ) ) ) ) ); /*Q10*/
-#else
-    rr = round_fx( Isqrt( L_shr( L_tmp, add( 11, shl( q2, 1 ) ) ) ) ); /*Q10*/
-#endif
     Copy( Aq, As, 3 );
     IF( EQ_16( shr( As[2], 1 ), -2048 /* -1.0f in Q11 */ ) )
     {
@@ -1517,11 +1382,7 @@ static void envelope_fx(
 
         L_tmp = L_mult( As[1], tmp ); /*Q(42-q1) */
         q1 = sub( q1, 14 );
-#ifdef BASOP_NOGLOB
         k1 = round_fx_sat( L_shl_sat( L_tmp, q1 ) ); /*Q12 */
-#else
-        k1 = round_fx( L_shl( L_tmp, q1 ) );                           /*Q12 */
-#endif
         k2 = As[2];
         move16(); /*Q12 */
         if ( GT_16( k2, 2458 /* 0.6f in Q12 */ ) )
@@ -1599,11 +1460,7 @@ static void envelope_fx(
     {
         IF( GT_16( rr, ( hAmrwb_IO->prev_r_fx ) ) )
         {
-#ifdef BASOP_NOGLOB
             rr = shr( add_sat( rr, ( hAmrwb_IO->prev_r_fx ) ), 1 );
-#else
-            rr = shr( add( rr, ( hAmrwb_IO->prev_r_fx ) ), 1 );
-#endif
         }
 
         hAmrwb_IO->prev_r_fx = rr;
@@ -1617,14 +1474,10 @@ static void envelope_fx(
         rr = round_fx( L_shl( L_tmp, 3 ) );                                             /*Q10*/
         L_tmp = L_mult( tilt, sub( 26214 /* 1.6f in Q14 */, shr( voice_factor, 1 ) ) ); /*Q28*/
         L_tmp = L_max( L_tmp, 268435456 /* 1 in Q28 */ );
-        L_tmp = Mult_32_16( L_tmp, qq ); /*Q23*/
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_16( L_tmp, qq );            /*Q23*/
         qq = round_fx_sat( L_shl_sat( L_tmp, 3 ) ); /*Q10*/
-#else
-        qq = round_fx( L_shl( L_tmp, 3 ) );                               /*Q10*/
-#endif
-        rr = s_min( rr, qq ); /* Q10 */
-        rr = s_max( rr, pp ); /* Q10 */
+        rr = s_min( rr, qq );                       /* Q10 */
+        rr = s_max( rr, pp );                       /* Q10 */
     }
     ELSE
     {
@@ -1637,11 +1490,7 @@ static void envelope_fx(
             alpha = round_fx( L_shl( L_tmp, 9 ) );             /*Q14*/
             L_tmp = L_mult( alpha, ( hAmrwb_IO->prev_r_fx ) ); /*Q25*/
             L_tmp = L_mac( L_tmp, tmp, rr );                   /*Q25*/
-#ifdef BASOP_NOGLOB
-            rr = round_fx_sat( L_shl_sat( L_tmp, 1 ) ); /*Q10*/
-#else
-            rr = round_fx( L_shl( L_tmp, 1 ) );                           /*Q10*/
-#endif
+            rr = round_fx_sat( L_shl_sat( L_tmp, 1 ) );        /*Q10*/
         }
 
         hAmrwb_IO->prev_r_fx = rr;
@@ -1671,12 +1520,8 @@ static void envelope_fx(
     tmp = div_s( shl( 1, sub( 14, q1 ) ), pp ); /*Q(29-q1-10) */
     L_tmp = L_mult( rr, tmp );                  /*Q(30-q1-10+10) */
 
-#ifdef BASOP_NOGLOB
     *sub_gain = s_min( 20480 /* 5.0f in Q12 */, round_fx_sat( L_shl_sat( L_tmp, sub( q1, 2 ) ) ) ); /*Q12 */
     move16();
-#else
-    *sub_gain = s_min( 20480, round_fx( L_shl( L_tmp, sub( q1, 2 ) ) ) ); /*Q12 */
-#endif
     return;
 }
 
diff --git a/lib_dec/hq_classifier_dec.c b/lib_dec/hq_classifier_dec.c
deleted file mode 100644
index 0fe8682daace6673130ca2ca05de2a188e8e2ae0..0000000000000000000000000000000000000000
--- a/lib_dec/hq_classifier_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/hq_classifier_dec_fx.c b/lib_dec/hq_classifier_dec_fx.c
index 5ff5dec58465b055c583514bb15712e079cbb800..c8dac0a0bc934199a60e6bf05c50e91235d4e3fc 100644
--- a/lib_dec/hq_classifier_dec_fx.c
+++ b/lib_dec/hq_classifier_dec_fx.c
@@ -99,17 +99,11 @@ Word16 hq_classifier_dec_fx(                          /* o  : Consumed bits
         max_brate = HQ_48k; /* Q0 */
         move32();
     }
-#ifndef SOLVED_COMP_ENC_DEC
     test();
     test();
     test();
     test();
     IF( ( EQ_16( length, L_SPEC32k ) || EQ_16( length, L_FRAME48k ) ) && LE_32( core_brate, max_brate ) )
-#else
-    /*_DIFF_FLOAT_FIX_ -> could this modification break the interoperability with EVS ?? */
-    test();
-    IF( ( EQ_16( length, L_SPEC32k ) || EQ_16( length, L_SPEC48k ) ) && LE_32( core_brate, max_brate ) )
-#endif
     {
         *hqswb_clas = get_next_indice( st_fx, 2 ); /* Q0 */
         move16();
@@ -147,11 +141,7 @@ Word16 hq_classifier_dec_fx(                          /* o  : Consumed bits
             *hqswb_clas = HQ_GEN_SWB; /* Q0 */
             move16();
         }
-#ifndef SOLVED_COMP_ENC_DEC
         ELSE IF( EQ_16( length, L_FRAME48k ) )
-#else
-        ELSE IF( EQ_16( length, L_SPEC48k ) )
-#endif
         {
             *hqswb_clas = HQ_GEN_FB; /* Q0 */
             move16();
diff --git a/lib_dec/hq_conf_fec.c b/lib_dec/hq_conf_fec.c
deleted file mode 100644
index fd4f3cb7c53af6bc1a4a149c6db6799b8f39655e..0000000000000000000000000000000000000000
--- a/lib_dec/hq_conf_fec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/hq_core_dec.c b/lib_dec/hq_core_dec.c
deleted file mode 100644
index 5a1f34a11a5ce940017243e9d78dcc4c048d33dc..0000000000000000000000000000000000000000
--- a/lib_dec/hq_core_dec.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-
-/*--------------------------------------------------------------------------
- *  hq_core_dec()
- *
- *  HQ core decoder
- *--------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * hq_core_dec_init()
- *
- * Initialize HQ core state structure
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/hq_core_dec_fx.c b/lib_dec/hq_core_dec_fx.c
index daa8804d7c15f77ac5b20c688896fa0a611d4fe4..3c2cd5a8092c7c385a6916eae760689d1996e8b8 100644
--- a/lib_dec/hq_core_dec_fx.c
+++ b/lib_dec/hq_core_dec_fx.c
@@ -6,7 +6,6 @@
 #include "cnst.h"    /* Common constants                       */
 #include "prot_fx.h" /* Function prototypes                    */
 #include "rom_com.h" /* Static table prototypes                */
-#include "prot.h"
 #include "ivas_prot_fx.h"
 /*--------------------------------------------------------------------------
  *  hq_core_dec()
@@ -79,22 +78,10 @@ void hq_core_dec_fx(
     /*num_bits = (short)(st->total_brate / 50); */
     Mpy_32_16_ss( st_fx->total_brate, 5243, &L_tmp, &lsb ); /* 5243 is 1/50 in Q18. (0+18-15=3) */
     num_bits = extract_l( L_shr( L_tmp, 3 ) );              /*Q0 */
-
-#ifdef ADD_IVAS_HQ_CODE_L_SPEC
-    /* Set default spectrum length */
-    L_spec = l_spec_tbl[st_fx->bwidth];
-#endif
     IF( !st_fx->bfi )
     {
         IF( EQ_16( core_switching_flag, 1 ) )
         {
-#ifdef ADD_IVAS_HQ_CODE_L_SPEC
-            IF( NE_16( st_fx->element_mode, EVS_MONO ) )
-            {
-                L_spec = l_spec_ext_tbl[st_fx->bwidth];
-            }
-            ELSE
-#endif
             {
                 core_switching_hq_prepare_dec_fx( st_fx, &num_bits, output_frame );
 
@@ -106,12 +93,6 @@ void hq_core_dec_fx(
                 }
             }
         }
-#ifdef ADD_IVAS_HQ_CODE
-        IF( hq_recovery_flag )
-        {
-            acelp_plc_mdct_transition( st );
-        }
-#endif
         /* subtract signalling bits */
         num_bits = sub( num_bits, st_fx->next_bit_pos ); /* Q0 */
 
@@ -146,9 +127,7 @@ void hq_core_dec_fx(
     /* set inner frame (== coded bandwidth) length */
     inner_frame = inner_frame_tbl[st_fx->bwidth]; /* Q0 */
     move16();
-#ifndef ADD_IVAS_HQ_CODE_L_SPEC
     L_spec = inner_frame; /* Q0 */
-#endif
     move16();
 
     IF( st_fx->bfi == 0 )
@@ -234,12 +213,6 @@ void hq_core_dec_fx(
             move16();
         }
 
-#ifdef ADD_IVAS_HQ_CODE
-        test();
-        test();
-        test();
-        IF( EQ_16( st_fx->element_mode, EVS_MONO ) || ( !core_switching_flag && !hq_recovery_flag ) )
-#endif
         {
             /* scaling (coefficients are in nominal level) */
             IF( NE_16( output_frame, NORM_MDCT_FACTOR ) )
@@ -257,11 +230,7 @@ void hq_core_dec_fx(
                     {
                         /*t_audio_q[i] *= ener_match;*/
                         Mpy_32_16_ss( t_audio_q[i], ener_match, &L_tmp, &lsb ); /*12+13-15=10 */
-#ifdef BASOP_NOGLOB
                         t_audio_q[i] = L_add_sat( L_shl_sat( L_tmp, 2 ), L_shr( lsb, 14 ) );
-#else
-                        t_audio_q[i] = L_add( L_shl( L_tmp, 2 ), lshr( lsb, 14 ) );
-#endif
                         move16(); /* Q12 */
                     }
                 }
@@ -327,59 +296,6 @@ void hq_core_dec_fx(
      * Overlap-add
      * Pre-echo reduction
      *--------------------------------------------------------------------------*/
-#ifdef ADD_IVAS_HQ_CODE
-    if ( st->element_mode > EVS_MONO && ( core_switching_flag || hq_recovery_flag ) )
-    {
-        /* Initializations for TCX MDCT framework, to be used for switching frame */
-        tcx_cfg = st->hTcxCfg;
-        L_frameTCX_glob = hTcxDec->L_frameTCX;
-        L_frame_glob = st->L_frame;
-        L_spec = hTcxDec->L_frameTCX;
-        st->fscale = sr2fscale( st->sr_core );
-        fscaleFB = sr2fscale( st->output_Fs );
-        encoderLookahead = ( L_LOOK_12k8 * st->fscale ) / FSCALE_DENOM;
-        encoderLookaheadFB = ( L_LOOK_12k8 * fscaleFB ) / FSCALE_DENOM;
-        mdctWindowLength = getMdctWindowLength( st->fscale );
-        mdctWindowLengthFB = (int16_t) ( mdctWindowLength * st->output_Fs / st->sr_core );
-        if ( core_switching_flag )
-        {
-            tcx_cfg->tcx_last_overlap_mode = TRANSITION_OVERLAP;
-            tcx_cfg->tcx_curr_overlap_mode = FULL_OVERLAP;
-        }
-        else
-        {
-            tcx_cfg->tcx_last_overlap_mode = ALDO_WINDOW;
-            tcx_cfg->tcx_curr_overlap_mode = ALDO_WINDOW;
-            st->last_core = HQ_CORE; /* Needed to decode non-transition frame */
-        }
-
-        init_tcx_window_cfg( tcx_cfg, st->sr_core, st->output_Fs, st->L_frame, hTcxDec->L_frameTCX, encoderLookahead, encoderLookaheadFB, mdctWindowLength, mdctWindowLengthFB, st->element_mode );
-
-        init_tcx_info( st, L_frame_glob, L_frameTCX_glob, 0, st->bfi, &tcx_offset, &tcx_offsetFB, &L_frame, &L_frameTCX, &left_rect, &L_spec );
-
-        overlap = tcx_cfg->tcx_mdct_window_length;
-        overlapFB = tcx_cfg->tcx_mdct_window_lengthFB;
-        index = tcx_cfg->tcx_last_overlap_mode;
-
-        /* LB synthesis */
-        IMDCT_fx( t_audio_q, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, wtda_audio, tcx_cfg->tcx_aldo_window_1_trunc, tcx_cfg->tcx_aldo_window_2, tcx_cfg->tcx_mdct_window_half, tcx_cfg->tcx_mdct_window_minimum, tcx_cfg->tcx_mdct_window_trans, tcx_cfg->tcx_mdct_window_half_length, tcx_cfg->tcx_mdct_window_min_length, index,
-                  MDCT_IV, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, 0, st->bfi, hHQ_core->old_outLB, 0, st, 0, acelp_zir );
-
-        mvr2r( wtda_audio + ( overlap >> 1 ) - tcx_offset, output, L_frame_glob );
-
-        /* FB synthesis */
-        IMDCT_fx( t_audio_q, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, wtda_audio, tcx_cfg->tcx_aldo_window_1_FB_trunc, tcx_cfg->tcx_aldo_window_2_FB, tcx_cfg->tcx_mdct_window_halfFB, tcx_cfg->tcx_mdct_window_minimumFB, tcx_cfg->tcx_mdct_window_transFB, tcx_cfg->tcx_mdct_window_half_lengthFB, tcx_cfg->tcx_mdct_window_min_lengthFB, index,
-                  MDCT_IV, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, 0, st->bfi, hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir );
-
-        mvr2r( wtda_audio + ( overlapFB >> 1 ) - tcx_offsetFB, synth, L_frameTCX_glob );
-
-        if ( !core_switching_flag )
-        {
-            st->last_core = ACELP_CORE; /* Restore last core */
-        }
-    }
-    else
-#endif
     {
         test();
         IF( EQ_16( output_frame, L_FRAME8k ) || st_fx->bfi == 0 )
@@ -397,24 +313,6 @@ void hq_core_dec_fx(
             move16();
         }
     }
-#ifdef ADD_IVAS_HQ_CODE
-    if ( st->element_mode > EVS_MONO )
-    {
-        if ( st->bfi )
-        {
-            /* Rough resampling, but reduces energy loss in case of switch to ACELP in first good frame */
-            lerp( t_audio_q, wtda_audio_LB, st->L_frame, inner_frame );
-            v_multc( t_audio_q, 0.5f, wtda_audio_LB, st->L_frame );
-        }
-        else
-        {
-            /* LB synthesis for potential switch to ACELP */
-            ener_match = (float) sqrt( (float) st->L_frame / (float) output_frame );
-            v_multc( t_audio_q, ener_match, t_audio_q, inner_frame );
-            inverse_transform( t_audio_q, wtda_audio_LB, is_transient, st->L_frame, inner_frame, st->element_mode );
-        }
-    }
-#endif
     IF( EQ_16( output_frame, L_FRAME8k ) )
     {
         test();
@@ -470,13 +368,6 @@ void hq_core_dec_fx(
             window_ola_fx( wtda_audio, synth, Q_synth, hHQ_core->old_out_fx, &hHQ_core->Q_old_wtda, output_frame,
                            st_fx->hTcxCfg->tcx_last_overlap_mode, st_fx->hTcxCfg->tcx_curr_overlap_mode, st_fx->prev_bfi && !hHQ_core->ph_ecu_active, hHQ_core->oldHqVoicing, hHQ_core->oldgapsynth_fx );
         }
-#ifdef ADD_IVAS_HQ_CODE
-        if ( st->element_mode > EVS_MONO )
-        {
-            /* LB synthesis for potential switch to ACELP */
-            window_ola( wtda_audio_LB, output, hHQ_core->old_outLB, L_FRAME16k, st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, st->prev_bfi && !hHQ_core->ph_ecu_active, hHQ_core->oldHqVoicing, hHQ_core->oldgapsynth );
-        }
-#endif
         test();
         test();
         IF( ( st_fx->bfi == 0 && st_fx->prev_bfi == 0 ) || !( GE_16( output_frame, L_FRAME16k ) ) )
@@ -495,35 +386,18 @@ void hq_core_dec_fx(
     test();
     test();
     test();
-    IF( !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && st_fx->plcInfo.concealment_method == TCX_NONTONAL && LT_32( st_fx->plcInfo.nbLostCmpt, 4 ) )
+    IF( !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && st_fx->hPlcInfo->concealment_method == TCX_NONTONAL && LT_32( st_fx->hPlcInfo->nbLostCmpt, 4 ) )
     {
-#ifdef BASOP_NOGLOB
-        st_fx->plcInfo.recovery_gain = shl_sat( st_fx->plcInfo.recovery_gain, *Q_synth ); /* Q14 + Q_synth */
-        move16();
-#else
-        st_fx->plcInfo.recovery_gain = shl( st_fx->plcInfo.recovery_gain, *Q_synth );
+        st_fx->hPlcInfo->recovery_gain = shl_sat( st_fx->hPlcInfo->recovery_gain, *Q_synth ); /* Q14 + Q_synth */
         move16();
-#endif
-        IF( st_fx->tonalMDCTconceal.q_lastPcmOut != 0 )
+        IF( st_fx->hTonalMDCTConc->q_lastPcmOut != 0 )
         {
-            Scale_sig( st_fx->tonalMDCTconceal.secondLastPcmOut, shr( st_fx->plcInfo.FrameSize, 1 ), negate( st_fx->tonalMDCTconceal.q_lastPcmOut ) );
-            Scale_sig( st_fx->tonalMDCTconceal.lastPcmOut, st_fx->plcInfo.FrameSize, negate( st_fx->tonalMDCTconceal.q_lastPcmOut ) );
-            st_fx->tonalMDCTconceal.q_lastPcmOut = 0;
+            Scale_sig( st_fx->hTonalMDCTConc->secondLastPcmOut, shr( st_fx->hPlcInfo->L_frameTCX, 1 ), negate( st_fx->hTonalMDCTConc->q_lastPcmOut ) );
+            Scale_sig( st_fx->hTonalMDCTConc->lastPcmOut, st_fx->hPlcInfo->L_frameTCX, negate( st_fx->hTonalMDCTConc->q_lastPcmOut ) );
+            st_fx->hTonalMDCTConc->q_lastPcmOut = 0;
             move16();
         }
-        waveform_adj2_fix( st_fx->tonalMDCTconceal.secondLastPcmOut,
-                           synth,
-                           st_fx->plcInfo.data_noise,
-                           &st_fx->plcInfo.outx_new_n1_fx,
-                           &st_fx->plcInfo.nsapp_gain_fx,
-                           &st_fx->plcInfo.nsapp_gain_n_fx,
-                           &st_fx->plcInfo.recovery_gain,
-                           st_fx->plcInfo.step_concealgain_fx,
-                           st_fx->plcInfo.Pitch_fx,
-                           st_fx->plcInfo.FrameSize,
-                           0,
-                           add( extract_l( st_fx->plcInfo.nbLostCmpt ), 1 ),
-                           st_fx->bfi );
+        waveform_adj2_fix( st_fx->hPlcInfo, st_fx->hTonalMDCTConc->secondLastPcmOut, synth, 0, add( extract_l( st_fx->hPlcInfo->nbLostCmpt ), 1 ), st_fx->bfi );
     }
 
     IF( GE_16( output_frame, L_FRAME16k ) )
@@ -583,13 +457,6 @@ void hq_core_dec_fx(
         Copy( &st_fx->mem_pitch_gain[2], &st_fx->mem_pitch_gain[nbsubfr + 2], nbsubfr ); /* Q14 */
         set16_fx( &st_fx->mem_pitch_gain[2], 0, nbsubfr );
     }
-#ifdef ADD_IVAS_HQ_CODE
-    /* Move LB excitation to old_exc memory in case of switch HQ->ACELP */
-    if ( st->element_mode > EVS_MONO )
-    {
-        mvr2r( output, st->old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );
-    }
-#endif
     return;
 }
 
@@ -649,6 +516,7 @@ void ivas_hq_core_dec_fx(
     set16_fx( gapsynth_fx, 0, L_FRAME48k );
     set16_fx( num_bands_p, 0, MAX_SB_NB );
     set16_fx( ynrm, 39, NB_SFM ); /* Initialize to the smallest value */
+    set16_fx( wtda_audio_16, 0, 2 * L_FRAME48k );
     mean_en_high_fx = 0;
     move16();
     Q_audio = 12;
@@ -856,11 +724,7 @@ void ivas_hq_core_dec_fx(
                     {
                         /*t_audio_q[i] *= ener_match;*/
                         Mpy_32_16_ss( t_audio_q[i], ener_match, &L_tmp, &lsb ); /*12+13-15=10 */
-#ifdef BASOP_NOGLOB
                         t_audio_q[i] = L_add_sat( L_shl_sat( L_tmp, 2 ), lshr( (Word16) lsb, 14 ) );
-#else
-                        t_audio_q[i] = L_add( L_shl( L_tmp, 2 ), lshr( (Word16) lsb, 14 ) );
-#endif
                         move16(); /* Q12 */
                     }
                 }
@@ -974,9 +838,6 @@ void ivas_hq_core_dec_fx(
         index = tcx_cfg->tcx_last_overlap_mode; /* Q0 */
         move16();
 
-#ifndef MSAN_FIX
-        Copy_Scale_sig_32_16( wtda_audio, wtda_audio_16, 2 * L_FRAME48k, -13 );
-#endif
 
         /* LB synthesis */
         E_audio = sub( 31, Q_audio );
@@ -998,7 +859,7 @@ void ivas_hq_core_dec_fx(
 
         Copy( wtda_audio_16 + sub( shr( overlapFB, 1 ), tcx_offsetFB ), synth, L_frameTCX_glob ); /* q_wtda */
 
-        Copy_Scale_sig_16_32( wtda_audio_16, wtda_audio, 2 * L_FRAME48k, 12 ); /* q_wtda + 12 */
+        Copy_Scale_sig_16_32_DEPREC( wtda_audio_16, wtda_audio, 2 * L_FRAME48k, 12 ); /* q_wtda + 12 */
         IF( !core_switching_flag )
         {
             st_fx->last_core = ACELP_CORE; /* Restore last core		Q0*/
@@ -1133,34 +994,18 @@ void ivas_hq_core_dec_fx(
     test();
     test();
     test();
-    IF( !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st_fx->plcInfo.concealment_method, TCX_NONTONAL ) && LT_32( st_fx->plcInfo.nbLostCmpt, 4 ) )
+    IF( !st_fx->bfi && st_fx->prev_bfi && GE_32( st_fx->last_total_brate, HQ_48k ) && EQ_16( st_fx->last_codec_mode, MODE2 ) && ( EQ_16( st_fx->last_core_bfi, TCX_20_CORE ) || EQ_16( st_fx->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st_fx->hPlcInfo->concealment_method, TCX_NONTONAL ) && LT_32( st_fx->hPlcInfo->nbLostCmpt, 4 ) )
     {
-#ifdef BASOP_NOGLOB
-        st_fx->plcInfo.recovery_gain = shl_sat( st_fx->plcInfo.recovery_gain, *Q_synth ); /* Q15 */
-#else
-        st_fx->plcInfo.recovery_gain = shl( st_fx->plcInfo.recovery_gain, *Q_synth );
-#endif
+        st_fx->hPlcInfo->recovery_gain = shl_sat( st_fx->hPlcInfo->recovery_gain, *Q_synth ); /* Q15 */
         move16();
-        IF( st_fx->tonalMDCTconceal.q_lastPcmOut != 0 )
+        IF( st_fx->hTonalMDCTConc->q_lastPcmOut != 0 )
         {
-            Scale_sig( st_fx->tonalMDCTconceal.secondLastPcmOut, shr( st_fx->plcInfo.FrameSize, 1 ), negate( st_fx->tonalMDCTconceal.q_lastPcmOut ) );
-            Scale_sig( st_fx->tonalMDCTconceal.lastPcmOut, st_fx->plcInfo.FrameSize, negate( st_fx->tonalMDCTconceal.q_lastPcmOut ) );
-            st_fx->tonalMDCTconceal.q_lastPcmOut = 0;
+            Scale_sig( st_fx->hTonalMDCTConc->secondLastPcmOut, shr( st_fx->hPlcInfo->L_frameTCX, 1 ), negate( st_fx->hTonalMDCTConc->q_lastPcmOut ) );
+            Scale_sig( st_fx->hTonalMDCTConc->lastPcmOut, st_fx->hPlcInfo->L_frameTCX, negate( st_fx->hTonalMDCTConc->q_lastPcmOut ) );
+            st_fx->hTonalMDCTConc->q_lastPcmOut = 0;
             move16();
         }
-        waveform_adj2_fix( st_fx->tonalMDCTconceal.secondLastPcmOut,
-                           synth,
-                           st_fx->plcInfo.data_noise,
-                           &st_fx->plcInfo.outx_new_n1_fx,
-                           &st_fx->plcInfo.nsapp_gain_fx,
-                           &st_fx->plcInfo.nsapp_gain_n_fx,
-                           &st_fx->plcInfo.recovery_gain,
-                           st_fx->plcInfo.step_concealgain_fx,
-                           st_fx->plcInfo.Pitch_fx,
-                           st_fx->plcInfo.FrameSize,
-                           0,
-                           add( extract_l( st_fx->plcInfo.nbLostCmpt ), 1 ),
-                           st_fx->bfi );
+        waveform_adj2_fix( st_fx->hPlcInfo, st_fx->hTonalMDCTConc->secondLastPcmOut, synth, 0, add( extract_l( st_fx->hPlcInfo->nbLostCmpt ), 1 ), st_fx->bfi );
     }
 
     IF( GE_16( output_frame, L_FRAME16k ) )
@@ -1240,17 +1085,15 @@ void HQ_core_dec_init_fx(
 )
 {
     set16_fx( hHQ_core->old_out_fx, 0, L_FRAME48k );
+    set32_fx( hHQ_core->old_out_fx32, 0, L_FRAME48k );
     set16_fx( hHQ_core->old_out_LB_fx, 0, L_FRAME32k );
-    set32_fx( hHQ_core->oldOut_fx, 0, L_FRAME48k );
-    set32_fx( hHQ_core->old_outLB_fx, 0, L_FRAME32k );
+    set32_fx( hHQ_core->old_out_LB_fx32, 0, L_FRAME32k );
     hHQ_core->Q_old_wtda = 15;
     hHQ_core->Q_old_postdec = 0;
     hHQ_core->Q_old_wtda_LB = 0;
     move16();
     move16();
     move16();
-    move16();
-    move16();
 
     hHQ_core->last_hq_core_type = -1; /* Q0 */
     move16();
diff --git a/lib_dec/hq_env_dec.c b/lib_dec/hq_env_dec.c
deleted file mode 100644
index fc894ba6cc3b0f6891e5522d7bdaa893786ada84..0000000000000000000000000000000000000000
--- a/lib_dec/hq_env_dec.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/hq_hr_dec.c b/lib_dec/hq_hr_dec.c
deleted file mode 100644
index fd4f3cb7c53af6bc1a4a149c6db6799b8f39655e..0000000000000000000000000000000000000000
--- a/lib_dec/hq_hr_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c
index 02d58f7bf5144d98500f963dd14725df4b0e8c2c..6423015bc4f8afe008e206801dc367770e8d32d8 100644
--- a/lib_dec/hq_hr_dec_fx.c
+++ b/lib_dec/hq_hr_dec_fx.c
@@ -46,7 +46,6 @@ void ivas_hq_pred_hb_bws_fx(
         }
         ELSE
         {
-            // EVS_FUNC_MODIFIED
             st_fx->prev_ener_shb_fx = 0;
             move16();
             L_tmp = L_deposit_l( 0 );
@@ -61,7 +60,7 @@ void ivas_hq_pred_hb_bws_fx(
 
     IF( GE_16( st_fx->last_inner_frame, L_FRAME32k ) && st_fx->hBWE_FD != NULL )
     {
-        set16_fx( st_fx->prev_SWB_fenv_fx, st_fx->prev_ener_shb_fx, SWB_FENV );
+        set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, st_fx->prev_ener_shb_fx, SWB_FENV );
     }
 
     return;
@@ -90,11 +89,7 @@ void hq_pred_hb_bws_fx(
             L_tmp = L_deposit_l( 0 );
             FOR( i = 25; i < SFM_N_HARM; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_add_sat( L_tmp, dicn_fx[ynrm[i]] ); /*Q14*/
-#else
-                L_tmp = L_add( L_tmp, dicn_fx[ynrm[i]] ); /*Q14*/
-#endif
             }
             L_tmp = L_min( 8191, L_shr( L_tmp, 13 ) );                       /* Q1 */
             st_fx->prev_ener_shb_fx = extract_l( L_tmp );                    /*Q1*/
@@ -104,7 +99,6 @@ void hq_pred_hb_bws_fx(
         }
         ELSE
         {
-#ifdef EVS_FUNC_MODIFIED
             st_fx->prev_ener_shb_fx = 0;
             move16();
             L_tmp = L_deposit_l( 0 );
@@ -115,21 +109,12 @@ void hq_pred_hb_bws_fx(
             L_tmp = Mpy_32_16_1( L_tmp, 2979 );           // Q1
             st_fx->prev_ener_shb_fx = extract_l( L_tmp ); /*Q1*/
             move16();
-#else
-            st_fx->prev_ener_shb_fx = 0;
-            move16();
-            FOR( i = 0; i < SWB_FENV - 3; i++ )
-            {
-                st_fx->prev_ener_shb_fx = add( st_fx->prev_ener_shb_fx, SWB_fenv[i] ); /*Q1*/
-            }
-            st_fx->prev_ener_shb_fx = mult( st_fx->prev_ener_shb_fx, 2979 ); /*Q1*/
-#endif
         }
     }
 
     IF( GE_16( st_fx->last_inner_frame, L_FRAME32k ) )
     {
-        set16_fx( st_fx->prev_SWB_fenv_fx, st_fx->prev_ener_shb_fx, SWB_FENV );
+        set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, st_fx->prev_ener_shb_fx, SWB_FENV );
     }
 
     return;
diff --git a/lib_dec/hq_lr_dec.c b/lib_dec/hq_lr_dec.c
deleted file mode 100644
index dd5876ea913249de73802cee8febd5a24948ed99..0000000000000000000000000000000000000000
--- a/lib_dec/hq_lr_dec.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "rom_dec.h"
-#include "prot.h"
-#include "stl.h"
-#include "basop_util.h"
-#include "wmc_auto.h"
-
-/*--------------------------------------------------------------------------*
- * Local function prototypes
- *--------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * hq_lr_dec()
- *
- * HQ low rate decoding routine
- *-------------------------------------------------------------------*/
-
-/*------------------------------------------------------------------------------------
- * small_symbol_dec_tran()
- *
- * Huffman decoding of differential energies
- *--------------------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * small_symbol_dec()
- *
- * Huffman decoding of differential energies (MSB and LSB)
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * large_symbol_dec()
- *
- *
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*
- * band_energy_dequant()
- *
- *
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*
- * p2a_threshold_dequant()
- *
- *
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*
- * mdct_spectrum_fine_gain_dec()
- *
- *
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*
- * spt_shorten_domain_set_dec()
- *
- * update the shorten band information based on p2a analysis
- *--------------------------------------------------------------------------*/
diff --git a/lib_dec/hq_lr_dec_fx.c b/lib_dec/hq_lr_dec_fx.c
index cf7aee8f013f179c82c0fb4c6c948b84d71981fb..7d5d6a34b907255f65e9d83ee0e0224c686ba7aa 100644
--- a/lib_dec/hq_lr_dec_fx.c
+++ b/lib_dec/hq_lr_dec_fx.c
@@ -343,12 +343,8 @@ void hq_lr_dec_fx(
         frac1 = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
         L_tmp = Pow2( 30, frac1 );
         exp = sub( exp, 30 );
-#ifdef BASOP_NOGLOB
         Ep_fx[i] = L_shl_sat( L_tmp, s_max( sub( exp, 6 ), -31 ) ); /* Q -6 */
         move32();
-#else
-        Ep_fx[i] = L_shl( L_tmp, s_max( sub( exp, 6 ), -31 ) );                                     /* Q -6 */
-#endif
     }
 
     FOR( i = 0; i < bands_fx; i++ )
@@ -428,21 +424,12 @@ void hq_lr_dec_fx(
         {
             IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 Ep_vari_fx = L_add_sat( Ep_vari_fx, L_abs( L_sub_sat( Ep_tmp_fx[i], Ep_tmp_fx[i - 1] ) ) ); /*Q15 */
                 Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] );                                         /*Q15 */
-#else
-                Ep_vari_fx = L_add( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[i - 1] ) ) ); /*Q15 */
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                     /*Q15 */
-#endif
             }
             ELSE
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, Ep_tmp_fx[i] );                                   /*Q15 */
-#endif
                 if ( GT_32( Ep_tmp_fx[i], Ep_peak_fx ) )
                 {
                     Ep_peak_fx = L_add( Ep_tmp_fx[i], 0 ); /*Q15 */
@@ -515,16 +502,11 @@ void hq_lr_dec_fx(
                 IF( EQ_16( last_bitalloc_max_band[j++], 1 ) )
                 {
                     L_tmp = Mult_32_16( Ep_tmp_fx[i], sub( bands_fx, lowband ) ); /*Q(13+0-15 = -2) */
-#ifdef BASOP_NOGLOB
                     tmp = Calc_inv( L_shl_sat( L_tmp, 14 ), &exp );
                     L_tmp = L_shl_sat( Mult_32_16( Ep_avrg_fx, tmp ), sub( 14, exp ) ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#else
-                    tmp = Calc_inv( L_shl( L_tmp, 14 ), &exp );
-                    L_tmp = L_shl( Mult_32_16( Ep_avrg_fx, tmp ), sub( 14, exp ) ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#endif
-                    L_tmp = L_max( L_tmp, 16384 );              /*14 */
-                    tmp = extract_l( L_min( L_tmp, beta_fx ) ); /*14 */
-                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 ); /*14+14-15 +1=14 */
+                    L_tmp = L_max( L_tmp, 16384 );                                      /*14 */
+                    tmp = extract_l( L_min( L_tmp, beta_fx ) );                         /*14 */
+                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 );                         /*14+14-15 +1=14 */
                 }
                 ELSE
                 {
@@ -563,11 +545,7 @@ void hq_lr_dec_fx(
         {
             IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                     /*Q15 */
-#endif
             }
             ELSE
             {
@@ -614,11 +592,7 @@ void hq_lr_dec_fx(
         }
         FOR( i = 0; i < bands_fx; i++ )
         {
-#ifdef BASOP_NOGLOB
             Ep_tmp_fx[i] = L_shl_sat( Ep_tmp_fx[i], 2 ); /* Q15 */
-#else
-            Ep_tmp_fx[i] = L_shl( Ep_tmp_fx[i], 2 );
-#endif
             move32();
         }
         IF( EQ_32( st_fx->core_brate, ACELP_13k20 ) )
@@ -649,30 +623,17 @@ void hq_lr_dec_fx(
             test();
             IF( GE_16( i, lowband ) && add( sub( i, bands_fx ), p2a_bands_fx ) < 0 )
             {
-#ifdef BASOP_NOGLOB
                 Ep_vari_fx = L_add_sat( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[i - 1] ) ) ); /*Q15 */
                 Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] );                                     /*Q15 */
-#else
-                Ep_vari_fx = L_add( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[i - 1] ) ) ); /*Q15 */
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                     /*Q15 */
-#endif
             }
 
             IF( GE_16( i, highband ) )
             {
-#ifdef BASOP_NOGLOB
                 enerH_fx = L_add_sat( enerH_fx, L_shl_sat( Ep_fx[i], 2 ) ); /*Q0 */
-#else
-                enerH_fx = L_add( enerH_fx, L_shl( Ep_fx[i], 2 ) );                                 /*Q0 */
-#endif
             }
             ELSE IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 enerL_fx = L_add_sat( enerL_fx, L_shl_sat( Ep_fx[i], 2 ) ); /*Q0 */
-#else
-                enerL_fx = L_add( enerL_fx, L_shl( Ep_fx[i], 2 ) );                                 /*Q0 */
-#endif
             }
         }
 
@@ -693,11 +654,7 @@ void hq_lr_dec_fx(
                 tmp = sub( bands_fx, p2a_bands_fx );
                 tmp = sub( tmp, lowband ); /*Q0 */
 
-#ifdef BASOP_NOGLOB
                 tmp1 = extract_h( L_shl_sat( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
-                tmp1 = extract_h( L_shl( Ep_avrg_fx, 1 ) );                                         /*Q0 */
-#endif
                 IF( tmp1 != 0 )
                 {
                     exp = norm_s( tmp1 );
@@ -738,11 +695,7 @@ void hq_lr_dec_fx(
                 {
                     tmp = sub( tmp, lowband );
                     L_tmp = Mult_32_16( Ep_tmp_fx[i], tmp ); /*Q(15+0-15 = 0) */
-#ifdef BASOP_NOGLOB
                     tmp = Calc_inv( L_shl_sat( L_tmp, 16 ), &exp );
-#else
-                    tmp = Calc_inv( L_shl( L_tmp, 16 ), &exp );
-#endif
                     L_tmp = Mult_32_16( Ep_avrg_fx, tmp );                    /*Q(15+exp-15 = exp) */
                     L_tmp = L_shl( L_tmp, sub( 14, exp ) );                   /*Q14 */
                     tmp = extract_l( L_min( L_max( L_tmp, 16384 ), 20480 ) ); /*Q14 */
@@ -753,11 +706,7 @@ void hq_lr_dec_fx(
                 {
                     tmp = sub( tmp, lowband );
 
-#ifdef BASOP_NOGLOB
                     tmp1 = extract_h( L_shl_sat( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
-                    tmp1 = extract_h( L_shl( Ep_avrg_fx, 1 ) );   /*Q0 */
-#endif
                     IF( tmp1 != 0 )
                     {
                         exp = norm_s( tmp1 );
@@ -794,19 +743,11 @@ void hq_lr_dec_fx(
         {
             IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );   /*Q15 */
-#endif
             }
             ELSE
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#endif
                 if ( GT_32( Ep_tmp_fx[i], Ep_peak_fx ) )
                 {
                     Ep_peak_fx = L_add( Ep_tmp_fx[i], 0 ); /*Q15 */
@@ -831,11 +772,7 @@ void hq_lr_dec_fx(
             move16();
             FOR( i = 0; i < lowband; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp = Calc_inv( L_shl_sat( Ep_avrgL_fx, 1 ), &exp );
-#else
-                tmp = Calc_inv( L_shl( Ep_avrgL_fx, 1 ), &exp );
-#endif
                 L_tmp = Mult_32_16( Ep_peak_fx, tmp );           /*Q(15+exp-15 = exp) */
                 L_tmp = Mult_32_16( L_tmp, lowband );            /*Q(exp+0-15 = exp-15) */
                 L_tmp = L_shl( L_tmp, sub( 28, exp ) );          /*Q14 0.5 */
@@ -956,7 +893,7 @@ void hq_lr_dec_fx(
     test();
     IF( GE_16( st_fx->last_inner_frame, L_FRAME32k ) && st_fx->hBWE_FD != NULL )
     {
-        set16_fx( st_fx->prev_SWB_fenv_fx, st_fx->prev_ener_shb_fx, SWB_FENV );
+        set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, st_fx->prev_ener_shb_fx, SWB_FENV );
     }
 
     updat_prev_frm_fx( L_y2, L_yout, L_bwe_br, length_fx, inner_frame, bands_fx, st_fx->bwidth, *is_transient_fx, hqswb_clas_fx, &hHQ_core->prev_hqswb_clas,
diff --git a/lib_dec/igf_dec.c b/lib_dec/igf_dec.c
deleted file mode 100644
index 785dc6a86aa92a9e5f4c80c8884724a2fabd3d76..0000000000000000000000000000000000000000
--- a/lib_dec/igf_dec.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "stat_dec.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-
-/*-------------------------------------------------------------------*
- * IGF_replaceTCXNoise_1_flr()
- *
- * measures TCX noise
- *-------------------------------------------------------------------*/
-
-/*! r: number of noise bands */
-
-
-/*-------------------------------------------------------------------*
- * IGF_replaceTCXNoise_2_flt()
- *
- * replaces TCX noise
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGF_replaceTCXNoise_2_new_flt()
- *
- *
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGF_decode_whitening_level_flt()
- *
- * reads whitening levels
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGF_getMDCTSquare_flt()
- *
- * square the MDCT spectrum
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGF_calcSfbEnergy_flt()
- *
- * calculate energy per SFB
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGF_setLinesToZero_flt()
- *
- * set power spectrum values to zero, needed for energy calculation
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGF_RefineGrid_flt()
- *
- * refines the IGF grid
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGFDecReadData_flt()
- *
- * reads whitening information from the bitstream
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGFDecUpdateInfo_flt()
- *
- * updates the start/stop frequency of IGF according to igfGridIdx
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * IGFDecStoreTCX10SubFrameData_flt()
- *
- * store the IGF bitstream information for TCX10 subframes
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * IGFDecRestoreTCX10SubFrameData_flt()
- *
- * restore the IGF bitstream information for TCX10 subframes
- *-------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------*
- * init_igf_dec_flt()
- *
- * Initialize IGF decoder parameters
- *-----------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------*
- * get_igf_startline_flt()
- *
- *
- *-----------------------------------------------------------------------*/
diff --git a/lib_dec/igf_dec_fx.c b/lib_dec/igf_dec_fx.c
index 7dd389164151197fe8c9a61d8fabb161354d5419..511d8a9777607d64bd9a16695bc8af931c66a99a 100644
--- a/lib_dec/igf_dec_fx.c
+++ b/lib_dec/igf_dec_fx.c
@@ -8,10 +8,8 @@
 #include <memory.h>
 #include "options.h"
 #include "stl.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
 #include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "cnst.h"
 #include "stat_dec.h"
 #include "basop_util.h"
@@ -125,8 +123,8 @@ return noise;
 }
 
 static Word16 ivas_IGF_replaceTCXNoise_1_fx(                         /**< out: Q0 | number of noise bands      */
-                                             const Word32 *in,       /**< in: Q31 | MDCT spectrum              */
-                                             Word16 s_l,             /**< in: Q0  | noise headroom             */
+                                             const Word32 *in,       /**< in: in_exp | MDCT spectrum              */
+                                             Word16 in_exp,          /**< in: Q0  | noise headroom             */
                                              const Word16 *TCXNoise, /**< in: Q0  | tcx noise indicator vector */
                                              const Word16 start,     /**< in: Q0  | start MDCT subband index   */
                                              const Word16 stop,      /**< in: Q0  | stop MDCT subband index    */
@@ -134,41 +132,44 @@ static Word16 ivas_IGF_replaceTCXNoise_1_fx(                         /**< out: Q
                                              Word16 *totalNoiseNrg_exp )
 {
     Word16 sb;
-    Word16 tmp16;
+    Word16 tmp16, shift;
     Word16 noise;
+    Word32 tmp32;
     Word64 nE;
 
 
-    tmp16 = 0;
+    shift = 2;
     move16();
     noise = 0;
     move16();
-    s_l = sub( s_l, 5 );
     nE = 0;
     move64();
 
+    *totalNoiseNrg = 0;
+    move32();
+    *totalNoiseNrg_exp = 0;
+    move16();
+
     FOR( sb = start; sb < stop; sb++ )
     {
         IF( TCXNoise[sb] )
         {
-            tmp16 = extract_h( L_shl( in[sb], s_l ) ); // Q31 + s_l
-        }
-        IF( TCXNoise[sb] )
-        {
-            nE = W_mac_16_16( nE, tmp16, tmp16 ); // Q31 + s_l
-        }
-        IF( TCXNoise[sb] )
-        {
-            noise = add( noise, 1 ); // Q0
+            tmp32 = L_shr( in[sb], shift );
+            nE = W_mac_32_32( nE, tmp32, tmp32 ); // 62 - (in_exp + shift + in_exp + shift + 1)
+            noise = add( noise, 1 );
         }
     }
 
-    tmp16 = W_norm( nE );
-    nE = W_shl( nE, tmp16 );
-    *totalNoiseNrg = W_extract_h( nE );
-    move32();
-    *totalNoiseNrg_exp = sub( tmp16, 32 );
-    move16();
+    IF( nE )
+    {
+        tmp16 = W_norm( nE );
+        nE = W_shl( nE, tmp16 );
+        *totalNoiseNrg = W_extract_h( nE );
+        move32();
+        *totalNoiseNrg_exp = sub( add( shl( shift, 1 ), shl( in_exp, 1 ) ), tmp16 );
+        move16();
+    }
+
 
     return noise;
 }
@@ -243,7 +244,7 @@ static void IGF_replaceTCXNoise_2( Word32 *in,                           /**< in
 
 
     g = getSqrtWord32( L_mult( divide3232( totalNoiseNrg, rE ), 8192 /*1.0f / 4.0f Q15*/ ) ); // ((Q15 + Q15 + Q1) / 2) -> Q15
-    g = shl( g, 1 );                                                                          // Q16
+    g = shl_sat( g, 1 );                                                                      // Q16
 
     FOR( sb = start; sb < stop; sb++ )
     {
@@ -1570,16 +1571,10 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,          /**< in
     {
         Carry = 0;
         move16();
-#ifdef BASOP_NOGLOB                                                  /* Critical Carry/Overflow*/
         L_tmp = L_add_co( L_tmp, energyTmp[tb], &Carry, &Overflow ); // Q31 - dE_e
         Overflow = 0;
         move16();
         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else
-        L_tmp = L_add_c( L_tmp, energyTmp[tb] );
-        Overflow = 0;
-        L_c = L_macNs( L_c, 0, 0 );
-#endif
     }
     L_tmp = norm_llQ31( L_c, L_tmp, &shift ); // Q31
     /* float: dE = (float)sqrt(dE / 24.f); basop: */
@@ -1679,13 +1674,8 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,          /**< in
             /* Build a threshold and compare with L_tmp.
                Build negated threshold and compare with negated L_tmp to cover also fullscale L_tmp case */
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             L_tmp2 = L_shl_sat( L_negate( Mpy_32_16_1( sNlocal, 33 /*0.001f Q15*/ ) ), sub( sNlocal_e, L_tmp_e ) );
             L_tmp2 = L_sub_sat( L_tmp2, L_negate( L_tmp ) );
-#else
-            L_tmp2 = L_shl( L_negate( Mpy_32_16_1( sNlocal, 33 /*0.001f Q15*/ ) ), sub( sNlocal_e, L_tmp_e ) );
-            L_tmp2 = L_sub( L_tmp2, L_negate( L_tmp ) );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
 
             IF( L_tmp2 < 0 )
@@ -1697,13 +1687,8 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,          /**< in
 
             /* calc square root of L_tmp and store result in dN */
             L_tmp = Sqrt32( L_tmp, &L_tmp_e );
-#ifdef BASOP_NOGLOB
             dN[sfb] = round_fx_sat( L_tmp );
             move16();
-#else
-            dN[sfb] = round_fx( L_tmp );
-            move16();
-#endif
             dN_e[sfb] = L_tmp_e;
             move16();
             dN[sfb + 1] = dN[sfb];
@@ -1759,13 +1744,8 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,          /**< in
             /* Build a threshold and compare with L_tmp.
                Build negated threshold and compare with negated L_tmp to cover also fullscale L_tmp case */
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             L_tmp2 = L_shl_sat( L_negate( Mpy_32_16_1( sNlocal, 33 /*0.001f Q15*/ ) ), sub( sNlocal_e, L_tmp_e ) );
             L_tmp2 = L_sub_sat( L_tmp2, L_negate( L_tmp ) );
-#else
-            L_tmp2 = L_shl( L_negate( Mpy_32_16_1( sNlocal, 33 /*0.001f Q15*/ ) ), sub( sNlocal_e, L_tmp_e ) );
-            L_tmp2 = L_sub( L_tmp2, L_negate( L_tmp ) );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
 
             IF( L_tmp2 < 0 )
@@ -1904,12 +1884,8 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,          /**< in
         sum = shl( sum, shift ); /* exponent of sum: sub(15, shift) */
 
         /* divide E by sum */
-#ifdef BASOP_NOGLOB                                               /* Critical Carry/Overflow*/
         tmp = div_s( shr( round_fx_o( E, &Overflow ), 1 ), sum ); /* shift E 1 bit to the right in order to make it smaller than sum */
-#else
-        tmp = div_s( shr( round_fx( E ), 1 ), sum );                /* shift E 1 bit to the right in order to make it smaller than sum */
-#endif
-        tmp_e = sub( add( E_e, 1 ), sub( 15, shift ) ); /* 15Q0 | sum is 15Q0 */
+        tmp_e = sub( add( E_e, 1 ), sub( 15, shift ) );           /* 15Q0 | sum is 15Q0 */
 
         /* multiply the result by the hopsize */
         L_tmp = L_mult( tmp, hopsize );
@@ -2040,12 +2016,8 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,          /**< in
             move16();
 
             /* gain[sfb] = min(gain[sfb], 12.f); */
-            BASOP_SATURATE_WARNING_OFF_EVS /* threshold, may overflow */
-#ifdef BASOP_NOGLOB
+            BASOP_SATURATE_WARNING_OFF_EVS                              /* threshold, may overflow */
                 tmp = shl_sat( gain[sfb], sub( gain_e[sfb], 15 - 5 ) ); /* 10Q5 | tmp is in 10Q5 */
-#else
-                tmp = shl( gain[sfb], sub( gain_e[sfb], 15 - 5 ) ); /* 10Q5 | tmp is in 10Q5 */
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
 
             IF( tmp > 384 ) /* 10Q5 | 384 = 12 in 10Q5 */
@@ -2288,15 +2260,9 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,     /**< in
     {
         Carry = 0;
         move16();
-#ifdef BASOP_NOGLOB                                                  /* Critical Carry/Overflow*/
         L_tmp = L_add_co( L_tmp, energyTmp[tb], &Carry, &Overflow ); // Q31 - dE_e
         Overflow = 0;
         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else
-        L_tmp = L_add_c( L_tmp, energyTmp[tb] );
-        Overflow = 0;
-        L_c = L_macNs( L_c, 0, 0 );
-#endif
     }
     L_tmp = norm_llQ31( L_c, L_tmp, &shift ); // Q31
     /* float: dE = (float)sqrt(dE / 24.f); basop: */
@@ -2399,13 +2365,8 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,     /**< in
             /* Build a threshold and compare with L_tmp.
                Build negated threshold and compare with negated L_tmp to cover also fullscale L_tmp case */
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             L_tmp2 = L_shl_sat( L_negate( Mpy_32_16_1( sNlocal, 33 /*0.001f Q15*/ ) ), sub( sNlocal_e, L_tmp_e ) );
             L_tmp2 = L_sub_sat( L_tmp2, L_negate( L_tmp ) );
-#else
-            L_tmp2 = L_shl( L_negate( Mpy_32_16_1( sNlocal, 33 /*0.001f Q15*/ ) ), sub( sNlocal_e, L_tmp_e ) );
-            L_tmp2 = L_sub( L_tmp2, L_negate( L_tmp ) );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
 
             IF( L_tmp2 < 0 )
@@ -2610,12 +2571,8 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,     /**< in
         sum = shl( sum, shift ); /* exponent of sum: sub(15, shift) */
 
         /* divide E by sum */
-#ifdef BASOP_NOGLOB                                               /* Critical Carry/Overflow*/
         tmp = div_s( shr( round_fx_o( E, &Overflow ), 1 ), sum ); /* shift E 1 bit to the right in order to make it smaller than sum */
-#else
-        tmp = div_s( shr( round_fx( E ), 1 ), sum );                /* shift E 1 bit to the right in order to make it smaller than sum */
-#endif
-        tmp_e = sub( add( E_e, 1 ), sub( 15, shift ) ); /* 15Q0 | sum is 15Q0 */
+        tmp_e = sub( add( E_e, 1 ), sub( 15, shift ) );           /* 15Q0 | sum is 15Q0 */
 
         /* multiply the result by the hopsize */
         L_tmp = L_mult( tmp, hopsize );
@@ -2702,12 +2659,8 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,     /**< in
             move16();
 
             /* gain[sfb] = min(gain[sfb], 12.f); */
-            BASOP_SATURATE_WARNING_OFF_EVS /* threshold, may overflow */
-#ifdef BASOP_NOGLOB
+            BASOP_SATURATE_WARNING_OFF_EVS                              /* threshold, may overflow */
                 tmp = shl_sat( gain[sfb], sub( gain_e[sfb], 15 - 5 ) ); /* 10Q5 | tmp is in 10Q5 */
-#else
-                tmp = shl( gain[sfb], sub( gain_e[sfb], 15 - 5 ) ); /* 10Q5 | tmp is in 10Q5 */
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
 
             IF( tmp > 384 ) /* 10Q5 | 384 = 12 in 10Q5 */
@@ -2933,7 +2886,6 @@ static void IGF_getWhiteSpectralData_ivas(
     Word16 j;
     Word32 ak;
     Word16 ak_e;
-    Word16 tmp_16;
     Word16 tmp_e;
     Word16 out_e_arr[IGF_START_MX + MAX_IGF_SFB_LEN];
     Word16 max_out_e;
@@ -2952,47 +2904,51 @@ static void IGF_getWhiteSpectralData_ivas(
     Word16 guard_bits = add( find_guarded_bits_fx( add( i_mult( 2, level ), 1 ) ), 1 ) / 2;
     s_l = sub( s_l, guard_bits );
 
+    Word16 shift = sub( shl( s_l, 1 ), 32 );
+    Word16 eff_e = sub( shl( sub( in_e, s_l ), 1 ), 15 );
+    Word16 diff = add( 21, in_e );
+
+    Word16 quo = BASOP_Util_Divide3216_Scale( ONE_IN_Q30, add( shl( level, 1 ), 1 ), &tmp_e );
+    tmp_e = add( tmp_e, 1 );
+
+    ak_e = add( tmp_e, sub( shl( sub( in_e, s_l ), 1 ), 15 ) ); // tmp_e + 2 * (in_e - s_l) - 15
+    ak_e = sub( ak_e, 1 );
+
     FOR( i = start; i < stop - level; i++ )
     {
-        ak = 0;
-        move32();
-        ak_e = 0;
-        move32();
+        Word64 temp = 0;
+        move64();
         FOR( j = i - level; j < i + level + 1; j++ )
         {
-            tmp_16 = extract_h( L_shl( in[j], s_l ) ); // e: in_e - s_l
-            ak = L_mac( ak, tmp_16, tmp_16 );          // e: 2 * (in_e - s_l)
+            temp = W_mac_32_32( temp, in[j], in[j] );
         }
-        ak = L_deposit_h( BASOP_Util_Divide3216_Scale( ak, add( shl( level, 1 ), 1 ), &tmp_e ) );
-        ak_e = add( tmp_e, sub( shl( sub( in_e, s_l ), 1 ), 15 ) ); // tmp_e + 2 * (in_e - s_l) - 15
+        ak = Mult_32_16( W_shl_sat_l( temp, shift ), quo ); // add( shl( level, 1 ), 1 ), &tmp_e ) );
 
-        n = sub( 30, add( norm_l( ak ), sub( 31, ak_e ) ) );
+
+        n = sub( ak_e, norm_l( ak ) );
         n = shr( n, 1 );
 
-        out_e_arr[i] = add( sub( 21, n ), in_e );
+        out_e_arr[i] = sub( diff, n );
         move16();
         max_out_e = s_max( max_out_e, out_e_arr[i] );
     }
 
     FOR( ; i < stop; i++ )
     {
-        ak = 0;
-        ak_e = 0;
-        move32();
-        move16();
+        Word64 temp = 0;
+        move64();
 
         FOR( j = i - level; j < stop; j++ )
         {
-            tmp_16 = extract_h( L_shl( in[j], s_l ) ); // e: in_e - s_l
-            ak = L_mac( ak, tmp_16, tmp_16 );          // e: 2 * (in_e - s_l)
+            temp = W_mac_32_32( temp, in[j], in[j] );
         }
-        ak = L_deposit_h( BASOP_Util_Divide3216_Scale( ak, sub( stop, sub( i, level ) ), &tmp_e ) );
-        ak_e = add( tmp_e, sub( shl( sub( in_e, s_l ), 1 ), 15 ) ); // tmp_e + 2 * (in_e - s_l) - 15
 
-        n = sub( 30, add( norm_l( ak ), sub( 31, ak_e ) ) );
+        ak = L_deposit_h( BASOP_Util_Divide3216_Scale( W_shl_sat_l( temp, shift ), sub( stop, sub( i, level ) ), &tmp_e ) );
+        ak_e = add( tmp_e, eff_e ); // tmp_e + 2 * (in_e - s_l) - 15
+        n = sub( ak_e, add( norm_l( ak ), 1 ) );
         n = shr( n, 1 );
 
-        out_e_arr[i] = add( sub( 21, n ), in_e );
+        out_e_arr[i] = sub( diff, n );
         move16();
         max_out_e = s_max( max_out_e, out_e_arr[i] );
     }
@@ -3036,11 +2992,7 @@ static void IGF_RefineGrid( H_IGF_GRID hGrid                             /**< in
         move16();
         tmp = add( tmp, 1 );
         delta = sub( hGrid->swb_offset[sfb + 1], hGrid->swb_offset[sfb] );
-#ifdef BASOP_NOGLOB /* TBV for 16 kHz, 9.6kbps dtx condition, hGrid->swb_offset[sfb+1] points to an uninit value */
         delta = mac_r( 0x00195000, 29491 /*0.45f Q16*/, shl_o( delta, 5, &Overflow ) );
-#else
-        delta = mac_r( 0x00195000, 29491 /*0.45f Q16*/, shl( delta, 5 ) );
-#endif
         a[tmp] = add( hGrid->swb_offset[sfb], shr( delta, 6 ) );
         move16();
         IF( s_and( a[tmp], 1 ) != 0 )
@@ -3088,11 +3040,7 @@ static void IGF_RefineGrid_ivas_fx( H_IGF_GRID hGrid /**< in/out: | IGF grid han
         move16();
         tmp = add( tmp, 1 );
         delta = sub( hGrid->swb_offset[sfb + 1], hGrid->swb_offset[sfb] );
-#ifdef BASOP_NOGLOB /* TBV for 16 kHz, 9.6kbps dtx condition, hGrid->swb_offset[sfb+1] points to an uninit value */
         delta = mac_r( 0x00195000, 29491 /*0.45f Q16*/, shl_o( delta, 5, &Overflow ) );
-#else
-        delta = mac_r( 0x00195000, 29491 /*0.45f Q16*/, shl( delta, 5 ) );
-#endif
         a[tmp] = add( hGrid->swb_offset[sfb], shr( delta, 6 ) );
         move16();
         // Rounding off delta values >=t+0.5 to t+1
@@ -3588,14 +3536,8 @@ void IGFDecApplyMono_ivas( const IGF_DEC_INSTANCE_HANDLE hInstance,      /**< in
                 specMed_e = igf_spec_e[i];
                 move16();
 
-                /*14 seems to be precise enough*/
-                hPrivateData->headroom_TCX_noise_white = IGF_getScaleFactor32Cond(
-                    hInstance->infoTCXNoise_ptr,
-                    igf_spec + hGrid->minSrcSubband,
-                    sub( hGrid->startLine, hGrid->minSrcSubband ) );
-                move16();
                 hPrivateData->n_noise_bands = ivas_IGF_replaceTCXNoise_1_fx( igf_spec,
-                                                                             hPrivateData->headroom_TCX_noise_white,
+                                                                             igf_spec_e[i],
                                                                              hInstance->infoTCXNoise_ptr,
                                                                              hGrid->minSrcSubband,
                                                                              hGrid->startLine,
@@ -3603,9 +3545,6 @@ void IGFDecApplyMono_ivas( const IGF_DEC_INSTANCE_HANDLE hInstance,      /**< in
                                                                              &hPrivateData->totalNoiseNrg_exp );
                 move16();
 
-                hPrivateData->totalNoiseNrg_exp = sub( shl( sub( igf_spec_e[i], sub( hPrivateData->headroom_TCX_noise_white, 5 ) ), 1 ), hPrivateData->totalNoiseNrg_exp );
-                move16();
-
                 BREAK;
             }
         }
@@ -3615,22 +3554,15 @@ void IGFDecApplyMono_ivas( const IGF_DEC_INSTANCE_HANDLE hInstance,      /**< in
         {
             IF( EQ_16( hPrivateData->currWhiteningLevel[i], IGF_WHITENING_OFF ) )
             {
-                hPrivateData->headroom_TCX_noise = IGF_getScaleFactor32Cond(
-                    hInstance->infoTCXNoise_ptr,
-                    hPrivateData->pSpecFlat + hGrid->minSrcSubband,
-                    sub( hGrid->startLine, hGrid->minSrcSubband ) );
-                move16();
 
                 hPrivateData->n_noise_bands_off = ivas_IGF_replaceTCXNoise_1_fx( hPrivateData->pSpecFlat,
-                                                                                 hPrivateData->headroom_TCX_noise,
+                                                                                 hPrivateData->pSpecFlat_exp,
                                                                                  hInstance->infoTCXNoise_ptr,
                                                                                  hGrid->minSrcSubband,
                                                                                  hGrid->startLine,
                                                                                  &hPrivateData->totalNoiseNrg_off,
                                                                                  &hPrivateData->totalNoiseNrg_off_exp );
                 move16();
-                hPrivateData->totalNoiseNrg_off_exp = sub( shl( sub( hPrivateData->pSpecFlat_exp, sub( hPrivateData->headroom_TCX_noise, 5 ) ), 1 ), hPrivateData->totalNoiseNrg_off_exp );
-                move16();
                 BREAK;
             }
         }
@@ -3815,12 +3747,9 @@ void IGFDecApplyStereo(
                     move16();
                 }
 
-                hPrivateDataL->headroom_TCX_noise_white = IGF_getScaleFactor32Cond( hIGFDecL->infoTCXNoise_ptr + hGrid->minSrcSubband,
-                                                                                    igf_specL_fx + hGrid->minSrcSubband,
-                                                                                    sub( hGrid->startLine, hGrid->minSrcSubband ) );
-                move16();
+
                 hPrivateDataL->n_noise_bands = ivas_IGF_replaceTCXNoise_1_fx( igf_specL_fx,
-                                                                              hPrivateDataL->headroom_TCX_noise_white,
+                                                                              specMedL_e,
                                                                               hIGFDecL->infoTCXNoise_ptr,
                                                                               hGrid->minSrcSubband,
                                                                               hGrid->startLine,
@@ -3828,9 +3757,6 @@ void IGFDecApplyStereo(
                                                                               &hPrivateDataL->totalNoiseNrg_exp );
                 move16();
 
-                hPrivateDataL->totalNoiseNrg_exp = sub( shl( sub( specMedL_e, sub( hPrivateDataL->headroom_TCX_noise_white, 5 ) ), 1 ), hPrivateDataL->totalNoiseNrg_exp );
-                move16();
-
                 IF( !bfi )
                 {
                     s_l = getScaleFactor32( hPrivateDataR->pSpecFlat + hGrid->minSrcSubband - whiteningLevel,
@@ -3851,21 +3777,14 @@ void IGFDecApplyStereo(
                     move16();
                 }
 
-                hPrivateDataR->headroom_TCX_noise_white = IGF_getScaleFactor32Cond( hIGFDecR->infoTCXNoise_ptr,
-                                                                                    igf_specR_fx + hGrid->minSrcSubband,
-                                                                                    sub( hGrid->startLine, hGrid->minSrcSubband ) );
-                move16();
                 hPrivateDataR->n_noise_bands = ivas_IGF_replaceTCXNoise_1_fx( igf_specR_fx,
-                                                                              hPrivateDataR->headroom_TCX_noise_white,
+                                                                              specMedR_e,
                                                                               hIGFDecR->infoTCXNoise_ptr,
                                                                               hGrid->minSrcSubband,
                                                                               hGrid->startLine,
                                                                               &hPrivateDataR->totalNoiseNrg,
                                                                               &hPrivateDataR->totalNoiseNrg_exp );
                 move16();
-                hPrivateDataR->totalNoiseNrg_exp = sub( shl( sub( specMedR_e, sub( hPrivateDataR->headroom_TCX_noise_white, 5 ) ), 1 ), hPrivateDataR->totalNoiseNrg_exp );
-                move16();
-
                 BREAK;
             }
         }
@@ -3875,37 +3794,23 @@ void IGFDecApplyStereo(
             test();
             IF( EQ_16( hPrivateDataL->currWhiteningLevel[i], IGF_WHITENING_OFF ) || EQ_16( hPrivateDataR->currWhiteningLevel[i], IGF_WHITENING_OFF ) )
             {
-                hPrivateDataL->headroom_TCX_noise_white = IGF_getScaleFactor32Cond( hIGFDecL->infoTCXNoise_ptr + hGrid->minSrcSubband,
-                                                                                    hPrivateDataL->pSpecFlat + hGrid->minSrcSubband,
-                                                                                    sub( hGrid->startLine, hGrid->minSrcSubband ) );
                 hPrivateDataL->n_noise_bands_off = ivas_IGF_replaceTCXNoise_1_fx( hPrivateDataL->pSpecFlat,
-                                                                                  hPrivateDataL->headroom_TCX_noise_white,
+                                                                                  hPrivateDataL->pSpecFlat_exp,
                                                                                   hIGFDecL->infoTCXNoise_ptr,
                                                                                   hGrid->minSrcSubband,
                                                                                   hGrid->startLine,
                                                                                   &hPrivateDataL->totalNoiseNrg_off,
                                                                                   &hPrivateDataL->totalNoiseNrg_off_exp );
-                hPrivateDataL->totalNoiseNrg_off_exp = sub( shl( sub( hPrivateDataL->pSpecFlat_exp, sub( hPrivateDataL->headroom_TCX_noise_white, 5 ) ), 1 ), hPrivateDataL->totalNoiseNrg_off_exp );
-                move16();
-                move16();
                 move16();
 
-                hPrivateDataR->headroom_TCX_noise_white = IGF_getScaleFactor32Cond( hIGFDecR->infoTCXNoise_ptr,
-                                                                                    hPrivateDataR->pSpecFlat + hGrid->minSrcSubband,
-                                                                                    sub( hGrid->startLine, hGrid->minSrcSubband ) );
                 hPrivateDataR->n_noise_bands_off = ivas_IGF_replaceTCXNoise_1_fx( hPrivateDataR->pSpecFlat,
-                                                                                  hPrivateDataR->headroom_TCX_noise_white,
+                                                                                  hPrivateDataR->pSpecFlat_exp,
                                                                                   hIGFDecR->infoTCXNoise_ptr,
                                                                                   hGrid->minSrcSubband,
                                                                                   hGrid->startLine,
                                                                                   &hPrivateDataR->totalNoiseNrg_off,
                                                                                   &hPrivateDataR->totalNoiseNrg_off_exp );
-                hPrivateDataR->totalNoiseNrg_off_exp = sub( shl( sub( hPrivateDataR->pSpecFlat_exp, sub( hPrivateDataR->headroom_TCX_noise_white, 5 ) ), 1 ), hPrivateDataR->totalNoiseNrg_off_exp );
                 move16();
-                move16();
-                move16();
-
-
                 BREAK;
             }
         }
diff --git a/lib_dec/igf_scf_dec.c b/lib_dec/igf_scf_dec.c
deleted file mode 100644
index 1c0985cf485291788276d8ca67d81b5170d79d54..0000000000000000000000000000000000000000
--- a/lib_dec/igf_scf_dec.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "stat_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c
deleted file mode 100644
index 3c20d7b2772ebb4c060c1ce80cad73b411b229d2..0000000000000000000000000000000000000000
--- a/lib_dec/init_dec.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*----------------------------------------------------------------------*
- * init_decoder()
- *
- * Initialization of static variables for the decoder
- *----------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------*
- * reset_preecho_dec()
- *
- * Initialization of static variables for pre-echo
- *----------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------*
- * destroy_cldfb_decoder_flt()
- *
- * Free memory which was allocated in init_decoder()
- *----------------------------------------------------------------------*/
-void destroy_cldfb_decoder_ivas_fx(
-    Decoder_State *st /* o  :   Decoder static variables structure */
-)
-{
-    /* CLDFB BPF & resampling tools */
-    deleteCldfb_ivas_fx( &st->cldfbAna ); /* delete analysis at max. sampling rate 48kHz */
-    deleteCldfb_ivas_fx( &st->cldfbBPF ); /* delete analysis BPF at max. internal sampling rate 16kHz */
-    deleteCldfb_ivas_fx( &st->cldfbSyn ); /* delete synthesis at output sampling rate */
-    deleteCldfb_ivas_fx( &st->cldfbSynHB );
-
-    deleteFdCngDec_fx( &st->hFdCngDec );
-
-    return;
-}
diff --git a/lib_dec/init_dec_fx.c b/lib_dec/init_dec_fx.c
index d709ff5fcfcc2a11824bc4c07aa47688b3e0f6ec..11c108380ec274e2d901fddf50bf2890f9a5fef8 100644
--- a/lib_dec/init_dec_fx.c
+++ b/lib_dec/init_dec_fx.c
@@ -8,7 +8,6 @@
 #include "rom_com.h" /* Static table prototypes                */
 #include "stl.h"     /* required for wmc_tool */
 #include "basop_util.h"
-#include "prot.h"
 #include "ivas_prot_fx.h"
 
 /*----------------------------------------------------------------------*
@@ -20,10 +19,6 @@
 ivas_error init_decoder_fx(
     Decoder_State *st_fx, /* o:   Decoder static variables structure */
     const Word16 idchan   /* i  : channel ID                          */
-#ifdef IVAS_CODE
-    ,
-    const MC_MODE mc_mode /* i  : MC mode                             */
-#endif
 )
 {
     Word16 i;
@@ -131,7 +126,7 @@ ivas_error init_decoder_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) );
         }
 
-        fd_bwe_dec_init( st_fx, st_fx->hBWE_FD );
+        fd_bwe_dec_init_fx( st_fx->hBWE_FD );
     }
     ELSE
     {
@@ -198,7 +193,6 @@ ivas_error init_decoder_fx(
     st_fx->last_voice_factor_fx = 0; // Q6
     move16();
 
-    set16_fx( st_fx->prev_lpc_wb_fx, 0, LPC_SHB_ORDER_WB );
 
     test();
     test();
@@ -321,10 +315,8 @@ ivas_error init_decoder_fx(
     move16();                    /*1; Q15*/
     st_fx->exc_pe_fx = 0;        // Q_stat_noise
     move16();
-#ifdef MSAN_FIX
     st_fx->Q_stat_noise = 31;
     move16();
-#endif // MSAN_FIX
     /*-----------------------------------------------------------------*
      * LD music post-filter
      *-----------------------------------------------------------------*/
@@ -363,23 +355,9 @@ ivas_error init_decoder_fx(
     }
     st_fx->cng_type = -1;
     move16();
-    st_fx->CNG_fx = 0;
-    move16(); /* RTXDTX handler CNG=1  nonCNG= 0,*/
-    st_fx->prev_ft_speech_fx = 1;
-    move16(); /* RXDTX handeler  previous frametype flag for  G.192 format AMRWB  SID_FIRST  detection  */
     st_fx->first_CNG = 0;
     move16();
     Copy( st_fx->lsp_old_fx, st_fx->lspCNG_fx, M ); // Q15
-    st_fx->shb_cng_ener_fx = -1541;                 // Q8
-    move16();
-    st_fx->wb_cng_ener_fx = -1541; // Q8
-    move16();
-    st_fx->last_wb_cng_ener_fx = -1541; // Q8
-    move16();
-    st_fx->last_shb_cng_ener_fx = -1541; // Q8
-    move16();
-    st_fx->swb_cng_seed = RANDOM_INITSEED;
-    move16();
 
     st_fx->CNG_mode = -1;
     move16();
@@ -388,22 +366,9 @@ ivas_error init_decoder_fx(
     st_fx->last_CNG_L_frame = L_FRAME;
     move16();
 
-    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-    {
-        st_fx->lsp_shb_prev_fx[i] = lsp_shb_prev_tbl_fx[i]; // Q15
-        move16();
-        st_fx->lsp_shb_prev_prev_fx[i] = st_fx->lsp_shb_prev_fx[i]; // Q15
-        move16();
-    }
 
-    st_fx->shb_dtx_count_fx = 0;
-    move16();
     st_fx->last_vad_fx = 0;
     move16();
-    st_fx->trans_cnt_fx = 0;
-    move16();
-    st_fx->last_shb_ener_fx = 0; // Q8
-    move16();
 
     /* HF (6-7kHz) BWE */
     move16();
@@ -483,7 +448,6 @@ ivas_error init_decoder_fx(
     }
 
     /* TCX core */
-    // VE: reduction possible for MCT_CHAN_MODE_LFE channel - see I1-172
     IF( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
     {
         IF( ( st_fx->hTcxDec = (TCX_DEC_HANDLE) malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL )
@@ -493,8 +457,8 @@ ivas_error init_decoder_fx(
 
         set16_fx( st_fx->hTcxDec->FBTCXdelayBuf, 0, 111 );
 
-        st_fx->hTcxDec->old_synthFB_fx = st_fx->hTcxDec->synth_history_fx + NS2SA( st_fx->output_Fs, PH_ECU_MEM_NS );
-        st_fx->hTcxDec->prev_good_synth_fx = st_fx->hTcxDec->old_synthFB_fx + NS2SA( st_fx->output_Fs, PH_ECU_LOOKAHEAD_NS );
+        st_fx->hTcxDec->old_synthFB_fx = st_fx->hTcxDec->synth_history_fx + NS2SA_FX2( st_fx->output_Fs, PH_ECU_MEM_NS );
+        st_fx->hTcxDec->prev_good_synth_fx = st_fx->hTcxDec->old_synthFB_fx + NS2SA_FX2( st_fx->output_Fs, PH_ECU_LOOKAHEAD_NS );
     }
     ELSE
     {
@@ -512,6 +476,14 @@ ivas_error init_decoder_fx(
     {
         st_fx->hTcxCfg = NULL;
     }
+
+    /* Tonal MDCT concealment data structure */
+
+    if ( ( st_fx->hTonalMDCTConc = (TonalMDCTConcealPtr) malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TonalMDCTConcealment\n" ) );
+    }
+
     st_fx->prev_coder_type = GENERIC;
     move16();
 
@@ -536,16 +508,10 @@ ivas_error init_decoder_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
         }
 
-        td_bwe_dec_init_fx( st_fx, st_fx->hBWE_TD,
-#ifdef ADD_IVAS_BWE
-                            st_fx->extl,
-#endif
-                            st_fx->output_Fs );
+        td_bwe_dec_init_fx( st_fx->hBWE_TD, st_fx->extl, st_fx->output_Fs );
 
-#ifdef MSAN_FIX
-        st_fx->hBWE_TD->prev_hb_synth_fx_exp = 31;
+        st_fx->prev_Q_bwe_exc = 31;
         move16();
-#endif
     }
     ELSE
     {
@@ -757,6 +723,14 @@ ivas_error init_decoder_fx(
     st_fx->last_vbr_hw_BWE_disable_dec = 0;
     move16();
 
+    /*-----------------------------------------------------------------*
+     * Mode 2 initialization
+     *-----------------------------------------------------------------*/
+
+    IF( ( st_fx->hPlcInfo = (T_PLCInfo_HANDLE) malloc( sizeof( T_PLCInfo ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for PLC handle\n" ) );
+    }
 
     st_fx->enablePlcWaveadjust = 0;
     move16();
@@ -778,11 +752,7 @@ ivas_error init_decoder_fx(
     resampleCldfb( st_fx->cldfbBPF, newCldfbBands, st_fx->L_frame, 1 );
 
     test();
-#ifdef IVAS_CODE
-    IF( ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || idchan == 0 ) && NE_16( mc_mode, MC_MODE_MCT ) && NE_16( mc_mode, MC_MODE_PARAMUPMIX ) ) // TBV Fixed point missing
-#else
     IF( ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || idchan == 0 ) /*&& mc_mode != MC_MODE_MCT && mc_mode != MC_MODE_PARAMUPMIX*/ )
-#endif
     {
         /* Create FD_CNG instance */
 
@@ -840,8 +810,6 @@ ivas_error init_decoder_fx(
     move16();
     st_fx->element_mode = EVS_MONO; /* element mode */
     move16();
-    st_fx->last_element_mode = st_fx->element_mode; /* element mode */
-    move16();
     st_fx->element_brate = -1; /* element bitrate */
     move16();
     st_fx->low_rate_mode = 0; /* low-rate mode flag */
@@ -1065,10 +1033,8 @@ ivas_error init_decoder_ivas_fx(
     move16();
     st_fx->exc_pe_fx = 0;
     move16();
-#ifdef MSAN_FIX
     st_fx->Q_stat_noise = 31;
     move16();
-#endif
     st_fx->prev_coder_type = GENERIC;
     move16();
 
@@ -1168,9 +1134,7 @@ ivas_error init_decoder_ivas_fx(
         }
 
         hf_synth_init_fx( st_fx->hBWE_zero );
-#ifdef MSAN_FIX
         set16_fx( st_fx->hBWE_zero->mem_hp400_fx, 0, 6 );
-#endif
     }
     ELSE
     {
@@ -1223,7 +1187,7 @@ ivas_error init_decoder_ivas_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) );
         }
 
-        td_cng_dec_init_ivas_fx( st_fx );
+        td_cng_dec_init_fx( st_fx );
     }
     ELSE
     {
@@ -1299,11 +1263,10 @@ ivas_error init_decoder_ivas_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
         }
 
-        td_bwe_dec_init_ivas_fx( st_fx, st_fx->hBWE_TD, st_fx->output_Fs );
-#ifdef MSAN_FIX
-        st_fx->hBWE_TD->prev_hb_synth_fx_exp = 31;
+        td_bwe_dec_init_fx( st_fx->hBWE_TD, st_fx->extl, st_fx->output_Fs );
+
+        st_fx->prev_Q_bwe_exc = 31;
         move16();
-#endif
     }
     ELSE
     {
@@ -1325,7 +1288,7 @@ ivas_error init_decoder_ivas_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) );
         }
 
-        fd_bwe_dec_init( st_fx, st_fx->hBWE_FD );
+        fd_bwe_dec_init_fx( st_fx->hBWE_FD );
     }
     ELSE
     {
@@ -1460,13 +1423,13 @@ ivas_error init_decoder_ivas_fx(
     IF( ( idchan == 0 && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
     {
         /* open analysis for max. SR 48kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
 
         /* open analysis BPF for max. SR 16kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -1478,7 +1441,7 @@ ivas_error init_decoder_ivas_fx(
     }
 
     /* open synthesis for output SR */
-    IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbSyn, CLDFB_SYNTHESIS, st_fx->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+    IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbSyn, CLDFB_SYNTHESIS, st_fx->output_Fs, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -1822,3 +1785,18 @@ void destroy_cldfb_decoder_fx(
 
     return;
 }
+
+void destroy_cldfb_decoder_ivas_fx(
+    Decoder_State *st /* o  :   Decoder static variables structure */
+)
+{
+    /* CLDFB BPF & resampling tools */
+    deleteCldfb_ivas_fx( &st->cldfbAna ); /* delete analysis at max. sampling rate 48kHz */
+    deleteCldfb_ivas_fx( &st->cldfbBPF ); /* delete analysis BPF at max. internal sampling rate 16kHz */
+    deleteCldfb_ivas_fx( &st->cldfbSyn ); /* delete synthesis at output sampling rate */
+    deleteCldfb_ivas_fx( &st->cldfbSynHB );
+
+    deleteFdCngDec_fx( &st->hFdCngDec );
+
+    return;
+}
diff --git a/lib_dec/inov_dec.c b/lib_dec/inov_dec.c
deleted file mode 100644
index 84f371717219c8610d04500e82c61a8cc6a0eca3..0000000000000000000000000000000000000000
--- a/lib_dec/inov_dec.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*----------------------------------------------------------------------*
- * inov_decode()
- *
- * Decode the algebraic innovation and do pitch sharpening
- *----------------------------------------------------------------------*/
diff --git a/lib_dec/inov_dec_fx.c b/lib_dec/inov_dec_fx.c
index ef65c4fcd20fd8f3af216ccf3b7ff5df989c275b..1ab1efe8fa8c587a2494997818d9694b6cc63a71 100644
--- a/lib_dec/inov_dec_fx.c
+++ b/lib_dec/inov_dec_fx.c
@@ -113,7 +113,7 @@ void inov_decode_fx(
                     move16();
                     bitcnt = s_and( ACELP_FIXED_CDK_BITS( st_fx->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] ), 15 ); // Q0
                     move16();
-                    // PMT("CONDITION above is missing -> idchan")
+
                     FOR( i = 0; i < wordcnt; i++ )
                     {
                         indexing_indices[i] = extract_l( get_next_indice_fx( st_fx, 16 ) ); // Q0
@@ -298,7 +298,7 @@ void inov_decode_ivas_fx(
                     move16();
                     bitcnt = s_and( ACELP_FIXED_CDK_BITS( st_fx->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] ), 15 ); // Q0
                     move16();
-                    // PMT("CONDITION above is missing -> idchan")
+
                     FOR( i = 0; i < wordcnt; i++ )
                     {
                         indexing_indices[i] = get_next_indice_fx( st_fx, 16 ); // Q0
diff --git a/lib_dec/ivas_agc_dec.c b/lib_dec/ivas_agc_dec.c
deleted file mode 100644
index 3bfbcee10de7b95c27905f12c5ab83b103a45f84..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_agc_dec.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include <math.h>
-#include <assert.h>
-#include "options.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_agc_dec_fx.c b/lib_dec/ivas_agc_dec_fx.c
index 8996f087d79a860e574d6b23a6fa30623b42bb68..a196a1abdd8a157e472fdcf21913f8367fd42e63 100644
--- a/lib_dec/ivas_agc_dec_fx.c
+++ b/lib_dec/ivas_agc_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,9 +34,7 @@
 #include <math.h>
 #include <assert.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal_fx.c
similarity index 91%
rename from lib_dec/ivas_binRenderer_internal.c
rename to lib_dec/ivas_binRenderer_internal_fx.c
index 36246f73923c7b643e2709a7b7fc6faa71ace490..c05b8beb206ec94c7d38340bc9c9c80abb1b02c1 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,9 +33,8 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_rend.h"
@@ -43,7 +42,6 @@
 #include "ivas_rom_com.h"
 #include "ivas_rom_binauralRenderer.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 #include "debug.h"
@@ -68,8 +66,11 @@ static void ivas_binRenderer_filterModule_fx(
 {
     Word16 bandIdx, k, chIdx, tapIdx;
     Word32 *filterStatesLeftRealPtr_fx, *filterStatesLeftImagPtr_fx;
-    Word16 *Q_filterStates;
+    Word16 Q_filterStates;
     const Word32 *filterTapsLeftRealPtr_fx, *filterTapsLeftImagPtr_fx, *filterTapsRightRealPtr_fx, *filterTapsRightImagPtr_fx;
+    Word16 shift_q;
+    Q_filterStates = hBinRenderer->hBinRenConvModule->Q_filterStatesLeft;
+    move16();
 
     FOR( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )
     {
@@ -77,7 +78,6 @@ static void ivas_binRenderer_filterModule_fx(
         {
             filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx][0] );
             filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx][0] );
-            Q_filterStates = (Word16 *) &( hBinRenderer->hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx][0] );
 
             filterTapsLeftRealPtr_fx = hBinRenderer->hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx];   // Q29
             filterTapsLeftImagPtr_fx = hBinRenderer->hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx];   // Q29
@@ -87,11 +87,6 @@ static void ivas_binRenderer_filterModule_fx(
             FOR( k = 0; k < numTimeSlots; k++ )
             {
                 Word64 outRealLeft_fx = 0, outRealRight_fx = 0, outImagLeft_fx = 0, outImagRight_fx = 0;
-                Word64 W_sub1 = 0, W_add1 = 0, W_sub2 = 0, W_add2 = 0;
-                move64();
-                move64();
-                move64();
-                move64();
                 move64();
                 move64();
                 move64();
@@ -104,64 +99,64 @@ static void ivas_binRenderer_filterModule_fx(
                     filterStatesLeftImagPtr_fx[tapIdx] = filterStatesLeftImagPtr_fx[tapIdx - 1];
                     move32();
 
-                    W_sub1 = W_sub( W_mult0_32_32( filterStatesLeftRealPtr_fx[tapIdx], filterTapsLeftRealPtr_fx[tapIdx] ),
-                                    W_mult0_32_32( filterStatesLeftImagPtr_fx[tapIdx], filterTapsLeftImagPtr_fx[tapIdx] ) ); // Q29 + Q_filterStates[tapIdx - 1]
-                    W_add1 = W_add( W_mult0_32_32( filterStatesLeftRealPtr_fx[tapIdx], filterTapsLeftImagPtr_fx[tapIdx] ),
-                                    W_mult0_32_32( filterStatesLeftImagPtr_fx[tapIdx], filterTapsLeftRealPtr_fx[tapIdx] ) ); // Q29 + Q_filterStates[tapIdx - 1]
-                    W_sub2 = W_sub( W_mult0_32_32( filterStatesLeftRealPtr_fx[tapIdx], filterTapsRightRealPtr_fx[tapIdx] ),
-                                    W_mult0_32_32( filterStatesLeftImagPtr_fx[tapIdx], filterTapsRightImagPtr_fx[tapIdx] ) ); // Q29 + Q_filterStates[tapIdx - 1]
-                    W_add2 = W_add( W_mult0_32_32( filterStatesLeftRealPtr_fx[tapIdx], filterTapsRightImagPtr_fx[tapIdx] ),
-                                    W_mult0_32_32( filterStatesLeftImagPtr_fx[tapIdx], filterTapsRightRealPtr_fx[tapIdx] ) ); // Q29 + Q_filterStates[tapIdx - 1]
-
-                    outRealLeft_fx = W_shr( outRealLeft_fx, sub( Q_filterStates[tapIdx], Q_filterStates[tapIdx - 1] ) );
-                    outImagLeft_fx = W_shr( outImagLeft_fx, sub( Q_filterStates[tapIdx], Q_filterStates[tapIdx - 1] ) );
-                    outRealRight_fx = W_shr( outRealRight_fx, sub( Q_filterStates[tapIdx], Q_filterStates[tapIdx - 1] ) );
-                    outImagRight_fx = W_shr( outImagRight_fx, sub( Q_filterStates[tapIdx], Q_filterStates[tapIdx - 1] ) );
-
-                    Q_filterStates[tapIdx] = Q_filterStates[tapIdx - 1];
-                    move16();
 
-                    /* Left Real and Imag */
-                    outRealLeft_fx = W_add( outRealLeft_fx, W_sub1 ); // Q29 + Q_filterStates[1]
-                    outImagLeft_fx = W_add( outImagLeft_fx, W_add1 ); // Q29 + Q_filterStates[1]
+                    outRealLeft_fx = W_mac_32_32( outRealLeft_fx, filterStatesLeftRealPtr_fx[tapIdx], filterTapsLeftRealPtr_fx[tapIdx] );             // Q30 + Q_filterStates
+                    outRealLeft_fx = W_mac_32_32( outRealLeft_fx, L_negate( filterStatesLeftImagPtr_fx[tapIdx] ), filterTapsLeftImagPtr_fx[tapIdx] ); // Q30 + Q_filterStates
+
+                    outImagLeft_fx = W_mac_32_32( outImagLeft_fx, filterStatesLeftRealPtr_fx[tapIdx], filterTapsLeftImagPtr_fx[tapIdx] ); // Q30 + Q_filterStates
+                    outImagLeft_fx = W_mac_32_32( outImagLeft_fx, filterStatesLeftImagPtr_fx[tapIdx], filterTapsLeftRealPtr_fx[tapIdx] ); // Q30 + Q_filterStates
 
-                    /* Right Real and Imag*/
-                    outRealRight_fx = W_add( outRealRight_fx, W_sub2 ); // Q29 + Q_filterStates[1]
-                    outImagRight_fx = W_add( outImagRight_fx, W_add2 ); // Q29 + Q_filterStates[1]
+                    outRealRight_fx = W_mac_32_32( outRealRight_fx, filterStatesLeftRealPtr_fx[tapIdx], filterTapsRightRealPtr_fx[tapIdx] );             // Q30 + Q_filterStates
+                    outRealRight_fx = W_mac_32_32( outRealRight_fx, L_negate( filterStatesLeftImagPtr_fx[tapIdx] ), filterTapsRightImagPtr_fx[tapIdx] ); // Q30 + Q_filterStates
+
+                    outImagRight_fx = W_mac_32_32( outImagRight_fx, filterStatesLeftRealPtr_fx[tapIdx], filterTapsRightImagPtr_fx[tapIdx] ); // Q30 + Q_filterStates
+                    outImagRight_fx = W_mac_32_32( outImagRight_fx, filterStatesLeftImagPtr_fx[tapIdx], filterTapsRightRealPtr_fx[tapIdx] ); // Q30 + Q_filterStates
+                }
+
+                shift_q = add( sub( Q_filterStates, Q_curr ), 1 );
+
+                IF( shift_q != 0 )
+                {
+                    outRealLeft_fx = W_shr( outRealLeft_fx, shift_q );   // Q_curr
+                    outImagLeft_fx = W_shr( outImagLeft_fx, shift_q );   // Q_curr
+                    outRealRight_fx = W_shr( outRealRight_fx, shift_q ); // Q_curr
+                    outImagRight_fx = W_shr( outImagRight_fx, shift_q ); // Q_curr
+                    hBinRenderer->hBinRenConvModule->Q_filterStatesLeft = Q_curr;
+                    move16();
                 }
 
                 filterStatesLeftRealPtr_fx[0] = CLDFB_real[chIdx][k][bandIdx];
                 move32();
                 filterStatesLeftImagPtr_fx[0] = CLDFB_imag[chIdx][k][bandIdx];
                 move32();
-                Q_filterStates[0] = Q_curr;
-                move16();
 
 
                 /* Left Real and Imag */
                 // Q29 + Q_curr
 
-                out_Conv_CLDFB_real[0][k][bandIdx] = W_add( out_Conv_CLDFB_real[0][k][bandIdx],
-                                                            W_add( W_shr( outRealLeft_fx, sub( Q_filterStates[1], Q_curr ) ),
-                                                                   W_sub( W_mult0_32_32( filterStatesLeftRealPtr_fx[0], filterTapsLeftRealPtr_fx[0] ),
-                                                                          W_mult0_32_32( filterStatesLeftImagPtr_fx[0], filterTapsLeftImagPtr_fx[0] ) ) ) ); // Q29
+                Word32 temp1 = L_shr( filterStatesLeftRealPtr_fx[0], 1 );
+                Word32 temp2 = L_shr( filterStatesLeftImagPtr_fx[0], 1 );
+
+
+                outRealLeft_fx = W_mac_32_32( outRealLeft_fx, temp1, filterTapsLeftRealPtr_fx[0] );
+                outRealLeft_fx = W_mac_32_32( outRealLeft_fx, L_negate( temp2 ), filterTapsLeftImagPtr_fx[0] );
+                out_Conv_CLDFB_real[0][k][bandIdx] = W_add( out_Conv_CLDFB_real[0][k][bandIdx], outRealLeft_fx ); // Q29
                 move64();
-                out_Conv_CLDFB_imag[0][k][bandIdx] = W_add( out_Conv_CLDFB_imag[0][k][bandIdx],
-                                                            W_add( W_shr( outImagLeft_fx, sub( Q_filterStates[1], Q_curr ) ),
-                                                                   W_add( W_mult0_32_32( filterStatesLeftRealPtr_fx[0], filterTapsLeftImagPtr_fx[0] ),
-                                                                          W_mult0_32_32( filterStatesLeftImagPtr_fx[0], filterTapsLeftRealPtr_fx[0] ) ) ) ); // Q29
+
+                outImagLeft_fx = W_mac_32_32( outImagLeft_fx, temp1, filterTapsLeftImagPtr_fx[0] );
+                outImagLeft_fx = W_mac_32_32( outImagLeft_fx, temp2, filterTapsLeftRealPtr_fx[0] );
+                out_Conv_CLDFB_imag[0][k][bandIdx] = W_add( out_Conv_CLDFB_imag[0][k][bandIdx], outImagLeft_fx ); // Q29
                 move64();
 
                 /* Right Real and Imag */
-                out_Conv_CLDFB_real[1][k][bandIdx] = W_add( out_Conv_CLDFB_real[1][k][bandIdx],
-                                                            W_add( W_shr( outRealRight_fx, sub( Q_filterStates[1], Q_curr ) ),
-                                                                   W_sub( W_mult0_32_32( filterStatesLeftRealPtr_fx[0], filterTapsRightRealPtr_fx[0] ),
-                                                                          W_mult0_32_32( filterStatesLeftImagPtr_fx[0], filterTapsRightImagPtr_fx[0] ) ) ) ); // Q29
+                outRealRight_fx = W_mac_32_32( outRealRight_fx, temp1, filterTapsRightRealPtr_fx[0] );
+                outRealRight_fx = W_mac_32_32( outRealRight_fx, L_negate( temp2 ), filterTapsRightImagPtr_fx[0] );
+                out_Conv_CLDFB_real[1][k][bandIdx] = W_add( out_Conv_CLDFB_real[1][k][bandIdx], outRealRight_fx ); // Q29
                 move64();
-                out_Conv_CLDFB_imag[1][k][bandIdx] = W_add( out_Conv_CLDFB_imag[1][k][bandIdx],
-                                                            W_add( W_shr( outImagRight_fx, sub( Q_filterStates[1], Q_curr ) ),
-                                                                   W_add( W_mult0_32_32( filterStatesLeftRealPtr_fx[0], filterTapsRightImagPtr_fx[0] ),
-                                                                          W_mult0_32_32( filterStatesLeftImagPtr_fx[0], filterTapsRightRealPtr_fx[0] ) ) ) ); // Q29
+
+                outImagRight_fx = W_mac_32_32( outImagRight_fx, temp1, filterTapsRightImagPtr_fx[0] );
+                outImagRight_fx = W_mac_32_32( outImagRight_fx, temp2, filterTapsRightRealPtr_fx[0] );
+                out_Conv_CLDFB_imag[1][k][bandIdx] = W_add( out_Conv_CLDFB_imag[1][k][bandIdx], outImagRight_fx ); // Q29
                 move64();
             }
         }
@@ -319,10 +314,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
     }
 
-    IF( ( hBinRenConvModule->Q_filterStatesLeft = (Word16 ***) malloc( hBinRenderer->conv_band * sizeof( Word16 ** ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
-    }
 
     FOR( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )
     {
@@ -336,10 +327,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
         }
 
-        IF( ( hBinRenConvModule->Q_filterStatesLeft[bandIdx] = (Word16 **) malloc( hBinRenderer->nInChannels * sizeof( Word16 * ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
-        }
 
         FOR( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
         {
@@ -352,11 +339,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
             }
-
-            IF( ( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx] = (Word16 *) malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( Word16 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
-            }
         }
     }
     /* set memories */
@@ -401,7 +383,8 @@ static ivas_error ivas_binRenderer_convModuleOpen(
                 /* set the memories to zero */
                 set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );
                 set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );
-                set16_fx( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx], 31, hBinRenConvModule->numTapsArray[bandIdx] );
+                hBinRenConvModule->Q_filterStatesLeft = 31;
+                move16();
                 IF( isLoudspeaker )
                 {
                     hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftBRIRReal_fx[bandIdx][tmp];
@@ -415,7 +398,8 @@ static ivas_error ivas_binRenderer_convModuleOpen(
                 /* set the memories to zero */
                 set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTaps );
                 set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTaps );
-                set16_fx( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx], 31, hBinRenConvModule->numTaps );
+                hBinRenConvModule->Q_filterStatesLeft = 31;
+                move16();
                 IF( isLoudspeaker )
                 {
                     hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftHRIRReal_fx[bandIdx][tmp];
@@ -1279,9 +1263,6 @@ static void ivas_binRenderer_convModuleClose_fx(
 
             free( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx] );
             hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx] = NULL;
-
-            free( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx] );
-            hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx] = NULL;
         }
 
         free( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx] );
@@ -1289,9 +1270,6 @@ static void ivas_binRenderer_convModuleClose_fx(
 
         free( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx] );
         hBinRenConvModule->filterStatesLeftImag_fx[bandIdx] = NULL;
-
-        free( hBinRenConvModule->Q_filterStatesLeft[bandIdx] );
-        hBinRenConvModule->Q_filterStatesLeft[bandIdx] = NULL;
     }
 
     free( hBinRenConvModule->filterStatesLeftReal_fx );
@@ -1300,8 +1278,6 @@ static void ivas_binRenderer_convModuleClose_fx(
     free( hBinRenConvModule->filterStatesLeftImag_fx );
     hBinRenConvModule->filterStatesLeftImag_fx = NULL;
 
-    free( hBinRenConvModule->Q_filterStatesLeft );
-    hBinRenConvModule->Q_filterStatesLeft = NULL;
 
     free( ( *hBinRenderer )->hBinRenConvModule );
     ( *hBinRenderer )->hBinRenConvModule = NULL;
@@ -1434,7 +1410,7 @@ void ivas_binaural_add_LFE_fx(
     Word32 *output_fx[]      /* o  : synthesized core-coder transport channels/DirAC output Q11*/
 )
 {
-    Word16 render_lfe, idx_lfe, gain_fx;
+    Word16 render_lfe, idx_lfe, gain_fx, idx;
 
     IF( st_ivas->hBinRenderer != NULL )
     {
@@ -1473,7 +1449,7 @@ void ivas_binaural_add_LFE_fx(
         {
             v_multc_fixed_16( input_fx[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain_fx, input_fx[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); // q_input_fx  - 1
             /* copy LFE to left and right channels */
-            FOR( int idx = 0; idx < output_frame; idx++ )
+            FOR( idx = 0; idx < output_frame; idx++ )
             {
                 input_fx[st_ivas->hIntSetup.index_lfe[idx_lfe]][idx] = L_shl_sat( input_fx[st_ivas->hIntSetup.index_lfe[idx_lfe]][idx], 1 ); // saturating to keep same q
                 move32();
diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec_fx.c
similarity index 78%
rename from lib_dec/ivas_core_dec.c
rename to lib_dec/ivas_core_dec_fx.c
index e7708a747520a7675af7f515f362ec4a001d0c8f..40012175640da7963da6eb8fbda62bc83507ad23 100644
--- a/lib_dec/ivas_core_dec.c
+++ b/lib_dec/ivas_core_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,12 +36,10 @@
 #include <math.h>
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -50,6 +48,7 @@
  *
  * Principal IVAS core decoder routine, where number of core channels is 1 or 2
  *-------------------------------------------------------------------*/
+
 ivas_error ivas_core_dec_fx(
     Decoder_Struct *st_ivas,                         /* i/o: IVAS decoder structure             */
     SCE_DEC_HANDLE hSCE,                             /* i/o: SCE decoder structure              */
@@ -66,15 +65,15 @@ ivas_error ivas_core_dec_fx(
     Decoder_State **sts, *st;
     STEREO_ICBWE_DEC_HANDLE hStereoICBWE;
     STEREO_TD_DEC_DATA_HANDLE hStereoTD;
+    STEREO_CNG_DEC_HANDLE hStereoCng;
+    TD_BWE_DEC_HANDLE hBWE_TD;
+    FD_BWE_DEC_HANDLE hBWE_FD;
     Word16 sharpFlag[CPE_CHANNELS];
     Word16 tmp_buffer_fx[L_FRAME48k];
-    set16_fx( tmp_buffer_fx, 0, L_FRAME48k );
     Word16 tmp16, tmp16_2, j;
-    tmp16 = 0;
-    move16();
     Word16 Q_white_exc;
-    Q_white_exc = 0;
-    move16();
+
+    set16_fx( tmp_buffer_fx, 0, L_FRAME48k );
 
     Word16 tmps, incr;
     Word32 bwe_exc_extended_fx[CPE_CHANNELS][L_FRAME32k + NL_BUFF_OFFSET];
@@ -111,18 +110,9 @@ ivas_error ivas_core_dec_fx(
     move16();
     move16();
 
-    FOR( i = 0; i < CPE_CHANNELS; i++ )
-    {
-        set16_fx( pitch_buf_fx[i], 0, NB_SUBFR16k );
-        set16_fx( output_16_fx[i], 0, L_FRAME48k );
-    }
-
     Word16 tdm_lsfQ_PCh_fx[M], tdm_lspQ_PCh_fx[M];
     Word32 conceal_eof_gain32;
-
-#ifdef BASOP_NOGLOB
     Flag Overflow;
-#endif
 
     error = IVAS_ERR_OK;
     move32();
@@ -150,9 +140,11 @@ ivas_error ivas_core_dec_fx(
         last_element_mode = IVAS_SCE;
         move16();
         hStereoTD = NULL;
+        hStereoCng = NULL;
         p_output_mem_fx = NULL;
         nchan_out = 1;
         move16();
+
         test();
         IF( st_ivas != NULL && EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
         {
@@ -174,8 +166,8 @@ ivas_error ivas_core_dec_fx(
         move16();
         hStereoICBWE = hCPE->hStereoICBWE;
         hStereoTD = hCPE->hStereoTD;
+        hStereoCng = hCPE->hStereoCng;
         p_output_mem_fx = hCPE->output_mem_fx[1];
-
         nchan_out = hCPE->nchan_out;
         move16();
 
@@ -185,19 +177,12 @@ ivas_error ivas_core_dec_fx(
             move16();
         }
 
-        IF( EQ_16( sts[0]->element_mode, IVAS_CPE_DFT ) )
+        test();
+        test();
+        IF( EQ_16( sts[0]->element_mode, IVAS_CPE_DFT ) && EQ_16( hCPE->nchan_out, 1 ) && EQ_16( hCPE->hStereoDft->hConfig->res_cod_mode, STEREO_DFT_RES_COD_OFF ) )
         {
-            test();
-            IF( EQ_16( hCPE->nchan_out, 1 ) && EQ_16( hCPE->hStereoDft->hConfig->res_cod_mode, STEREO_DFT_RES_COD_OFF ) )
-            {
-                use_cldfb_for_dft = 1;
-                move16();
-            }
-            ELSE
-            {
-                use_cldfb_for_dft = 0;
-                move16();
-            }
+            use_cldfb_for_dft = 1;
+            move16();
         }
     }
 
@@ -281,16 +266,10 @@ ivas_error ivas_core_dec_fx(
         test();
         test();
         test();
-#ifdef NONBE_MDCT_ST_PLC_DO_NOT_SCALE_OLD_OUT_IF_FIRST_GOOD_IS_SID
         IF( !st->bfi && st->prev_bfi && GT_32( st->total_brate, SID_2k40 ) && ( EQ_16( st->last_core_bfi, TCX_20_CORE ) || EQ_16( st->last_core_bfi, TCX_10_CORE ) ) && st->hTcxDec != NULL )
-#else
-        IF( !st->bfi && st->prev_bfi && ( EQ_16( st->last_core_bfi, TCX_20_CORE ) || EQ_16( st->last_core_bfi, TCX_10_CORE ) ) && st->hTcxDec != NULL )
-#endif
         {
-
             conceal_eof_gain32 = L_shr_sat( st->hTcxDec->conceal_eof_gain32, sub( 16, st->hTcxDec->conceal_eof_gain_e ) ); // e = 31 - Q , 16 - e => 16 - (31 - Q) => Q - 15,
                                                                                                                            // shr(16 -e ) = shr(Q -15) => 15 - Q ==> Q15
-
             FOR( i = 0; i < st->hTcxDec->L_frameTCX; i++ )
             {
                 L_tmp = Mpy_32_16_1( conceal_eof_gain32, st->hHQ_core->old_out_fx[i] ); // Q0 (15+1+0 - (15 + 1)
@@ -313,6 +292,7 @@ ivas_error ivas_core_dec_fx(
         set16_fx( voice_factors_fx[n], 0, NB_SUBFR16k );
         set32_fx( hb_synth_32_fx[n], 0, L_FRAME48k );
         set16_fx( hb_synth_16_fx[n], 0, L_FRAME48k );
+
         /*------------------------------------------------------------------*
          * Decision matrix (selection of technologies)
          *-----------------------------------------------------------------*/
@@ -349,15 +329,14 @@ ivas_error ivas_core_dec_fx(
 
     /* MDCT stereo -> DFT stereo switching */
     test();
-    test();
-    IF( hCPE != NULL && EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) && EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
+    IF( EQ_16( last_element_mode, IVAS_CPE_MDCT ) && EQ_16( sts[0]->element_mode, IVAS_CPE_DFT ) )
     {
         Word16 ovl, fade_len;
         IF( NE_16( sts[0]->L_frame, sts[0]->last_L_frame ) )
         {
-            Copy_Scale_sig_16_32( sts[0]->hHQ_core->old_out_LB_fx, sts[0]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, sts[0]->hHQ_core->Q_old_wtda_LB ) ); // Q11
-            L_lerp_fx_q11( sts[0]->hHQ_core->old_outLB_fx, sts[0]->hHQ_core->old_outLB_fx, sts[0]->L_frame, sts[0]->last_L_frame );
-            Copy_Scale_sig_32_16( sts[0]->hHQ_core->old_outLB_fx, sts[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( sts[0]->hHQ_core->Q_old_wtda_LB, Q11 ) ); // Q_old_wtda_LB
+            Copy_Scale_sig_16_32_no_sat( sts[0]->hHQ_core->old_out_LB_fx, sts[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, sub( Q11, sts[0]->hHQ_core->Q_old_wtda_LB ) ); // Q11
+            L_lerp_fx_q11( sts[0]->hHQ_core->old_out_LB_fx32, sts[0]->hHQ_core->old_out_LB_fx32, sts[0]->L_frame, sts[0]->last_L_frame );
+            Copy_Scale_sig_32_16( sts[0]->hHQ_core->old_out_LB_fx32, sts[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( sts[0]->hHQ_core->Q_old_wtda_LB, Q11 ) ); // Q_old_wtda_LB
         }
         IF( NE_16( sts[0]->L_frame, L_FRAME16k ) )
         {
@@ -370,9 +349,9 @@ ivas_error ivas_core_dec_fx(
     }
 
     test();
-    if ( hCPE != NULL && hCPE->hStereoCng != NULL )
+    if ( hStereoCng != NULL )
     {
-        hCPE->hStereoCng->flag_cna_fade = 0;
+        hStereoCng->flag_cna_fade = 0;
         move16();
     }
 
@@ -413,7 +392,7 @@ ivas_error ivas_core_dec_fx(
     test();
     IF( hCPE != NULL && EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) && hCPE->brate_surplus > 0 )
     {
-        ivas_combined_format_brate_sanity_fx( hCPE->element_brate, sts[0]->core, sts[0]->total_brate, &( sts[0]->core_brate ), &( sts[0]->inactive_coder_type_flag ), &tmps );
+        ivas_combined_format_brate_sanity_fx( element_brate, sts[0]->core, sts[0]->total_brate, &( sts[0]->core_brate ), &( sts[0]->inactive_coder_type_flag ), &tmps );
     }
 
     /*------------------------------------------------------------------*
@@ -467,6 +446,7 @@ ivas_error ivas_core_dec_fx(
         /*---------------------------------------------------------------------*
          * Preprocessing (preparing) for ACELP/HQ core switching
          *---------------------------------------------------------------------*/
+
         Word16 Q_olapBufferSynth, Q_olapBufferSynth2;
 
         Q_olapBufferSynth = Q15;  /*Initializing with max values to avoid warnings*/
@@ -474,7 +454,7 @@ ivas_error ivas_core_dec_fx(
         move16();
         move16();
 
-        Copy_Scale_sig_16_32( st->previoussynth_fx, st->previoussynth_fx_32, L_FRAME48k, 0 ); // Q0
+        Copy_Scale_sig_16_32_DEPREC( st->previoussynth_fx, st->previoussynth_fx_32, L_FRAME48k, 0 ); // Q0
 
         IF( NE_32( ( error = core_switching_pre_dec_ivas_fx( st, output_frame, sts[0]->last_core_brate, nchan_out, last_element_mode, last_element_brate, st->Q_syn, &Q_olapBufferSynth, &Q_olapBufferSynth2 ) ), IVAS_ERR_OK ) )
         {
@@ -495,12 +475,14 @@ ivas_error ivas_core_dec_fx(
          * HQ core decoding
          *---------------------------------------------------------------------*/
 
+        set16_fx( output_16_fx[n], 0, L_FRAME48k ); /* this is needed for instances like L_norm_arr( p_output_fx[i], L_FRAME48k ) */
+
         IF( st->core == ACELP_CORE )
         {
             /* ACELP core decoder */
             Word16 old_syn_12k8_16k_fx_16[L_FRAME16k];
-            set16_fx( output_16_fx[n], 0, L_FRAME48k );
             Word16 save_hb_synth_fx_arr[L_FRAME48k], *save_hb_synth_16_fx;
+
             IF( save_hb_synth_32_fx )
             {
                 save_hb_synth_16_fx = save_hb_synth_fx_arr;
@@ -534,23 +516,13 @@ ivas_error ivas_core_dec_fx(
                 Scale_sig( st->hFdCngDec->hFdCngCom->A_cng, add( M, 1 ), sub( norm_s( sub( st->hFdCngDec->hFdCngCom->A_cng[0], 1 ) ), 3 ) ); // Qx
             }
 
-            IF( hCPE == NULL )
-            {
-                IF( NE_32( ( error = acelp_core_dec_ivas_fx( st, output_16_fx[n], synth_16_fx[n], save_hb_synth_16_fx, bwe_exc_extended_fx[n], voice_factors_fx[n], old_syn_12k8_16k_fx_16, sharpFlag[n], pitch_buf_fx[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, NULL, read_sid_info ) ), IVAS_ERR_OK ) )
-                {
-                    return error;
-                }
-            }
-            ELSE
+            IF( NE_32( ( error = acelp_core_dec_fx( st, output_16_fx[n], synth_16_fx[n], save_hb_synth_16_fx, bwe_exc_extended_fx[n], voice_factors_fx[n], old_syn_12k8_16k_fx_16, sharpFlag[n], pitch_buf_fx[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hStereoCng, read_sid_info ) ), IVAS_ERR_OK ) )
             {
-                IF( NE_32( ( error = acelp_core_dec_ivas_fx( st, output_16_fx[n], synth_16_fx[n], save_hb_synth_16_fx, bwe_exc_extended_fx[n], voice_factors_fx[n], old_syn_12k8_16k_fx_16, sharpFlag[n], pitch_buf_fx[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hCPE->hStereoCng, read_sid_info ) ), IVAS_ERR_OK ) )
-                {
-                    return error;
-                }
+                return error;
             }
 
-            Copy_Scale_sig_16_32( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, st->Q_syn2 ) ); // Q_syn2->Q11
-            Scale_sig( output_16_fx[n], L_FRAME48k, negate( st->Q_syn2 ) );                               // Q0
+            Copy_Scale_sig_16_32_no_sat( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, st->Q_syn2 ) ); // Q_syn2->Q11
+            Scale_sig( output_16_fx[n], L_FRAME48k, negate( st->Q_syn2 ) );                                      // Q0
             IF( st->cldfbAna )
             {
                 scale_sig32( st->cldfbAna->cldfb_state_fx, st->cldfbAna->cldfb_size, Q10 - Q11 ); /* 9 * (Word16)(st->L_frame * FRAMES_PER_SEC * INV_CLDFB_BANDWIDTH + 0.5f) , Q10  */
@@ -569,17 +541,16 @@ ivas_error ivas_core_dec_fx(
                 st->cldfbSyn->Q_cldfb_state = Q11;
                 move16();
             }
-            st->prev_Q_syn = st->Q_syn;
             move16();
 
             IF( save_hb_synth_32_fx )
             {
-                Copy_Scale_sig_16_32( save_hb_synth_16_fx, save_hb_synth_32_fx, output_frame, Q11 ); // Q11
+                Copy_Scale_sig_16_32_DEPREC( save_hb_synth_16_fx, save_hb_synth_32_fx, output_frame, Q11 ); // Q11
                 hSCE->q_save_hb_synth_fx = Q11;
                 move16();
             }
 
-            Copy_Scale_sig_16_32( old_syn_12k8_16k_fx_16, old_syn_12k8_16k_fx[n], L_FRAME16k, Q11 - ( -Q1 ) ); // Q(11 - (-1))
+            Copy_Scale_sig_16_32_DEPREC( old_syn_12k8_16k_fx_16, old_syn_12k8_16k_fx[n], L_FRAME16k, Q11 - ( -Q1 ) ); // Q(11 - (-1))
         }
 
         Copy_Scale_sig_32_16( st->previoussynth_fx_32, st->previoussynth_fx, L_FRAME48k, 0 ); // Q0
@@ -589,7 +560,6 @@ ivas_error ivas_core_dec_fx(
         IF( ( EQ_16( st->core, TCX_20_CORE ) || EQ_16( st->core, TCX_10_CORE ) ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
         {
             Word16 Qsyn_temp;
-            STEREO_CNG_DEC_HANDLE hStereoCng;
             IVAS_FORMAT ivas_format;
 
             Qsyn_temp = st->Q_syn;
@@ -615,14 +585,6 @@ ivas_error ivas_core_dec_fx(
             st->hHQ_core->Q_old_wtda = 0;
             move16();
 
-            IF( hCPE == NULL )
-            {
-                hStereoCng = NULL;
-            }
-            ELSE
-            {
-                hStereoCng = hCPE->hStereoCng;
-            }
             IF( st_ivas == NULL )
             {
                 ivas_format = 0;
@@ -633,10 +595,12 @@ ivas_error ivas_core_dec_fx(
                 ivas_format = st_ivas->ivas_format;
                 move32();
             }
+
             stereo_tcx_core_dec_fx( st, frameMode[n], output_16_fx[n], synth_16_fx[n], pitch_buf_fx[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hStereoCng, nchan_out, ivas_format );
+
             st->hHQ_core->Q_old_wtda_LB = st->hHQ_core->Q_old_wtda;
             move16();
-            Copy_Scale_sig_16_32( output_16_fx[n], output_32_fx[n], L_FRAME48k, Q11 ); // Q11
+            Copy_Scale_sig_16_32_DEPREC( output_16_fx[n], output_32_fx[n], output_frame, Q11 ); // Q11
 
             IF( st->hTcxDec )
             {
@@ -663,13 +627,9 @@ ivas_error ivas_core_dec_fx(
 
             ivas_hq_core_dec_fx( st, synth_16_fx[n], &Q_synth, output_frame, NORMAL_HQ_CORE, core_switching_flag[n], output_16_fx[n], &Q_output );
 
-            Copy_Scale_sig_16_32( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_output ) ); // Q11
-#ifdef MSAN_FIX
-            Scale_sig( synth_16_fx[n], output_frame, negate( Q_synth ) ); // Q0
-#else
-            Scale_sig( synth_16_fx[n], L_FRAME48k, negate( Q_synth ) );
-#endif
-            Scale_sig( output_16_fx[n], L_FRAME48k, negate( Q_output ) ); // Q0
+            Copy_Scale_sig_16_32_DEPREC( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_output ) ); // Q11
+            Scale_sig( synth_16_fx[n], output_frame, negate( Q_synth ) );                                      // Q0
+            Scale_sig( output_16_fx[n], L_FRAME48k, negate( Q_output ) );                                      // Q0
         }
 
         /*---------------------------------------------------------------------*
@@ -683,8 +643,7 @@ ivas_error ivas_core_dec_fx(
 
             td_stereo_param_updt_fx( st->lsp_old_fx, st->lsf_old_fx, st->old_pitch_buf_16_fx + st->nb_subfr,
                                      tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, hStereoTD->tdm_Pri_pitch_buf_fx, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );
-
-            Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->old_pitch_buf_16_fx, hCPE->hCoreCoder[0]->old_pitch_buf_fx, add( imult1616( 2, NB_SUBFR16k ), 2 ), Q10 ); // Q16
+            Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->old_pitch_buf_16_fx, hCPE->hCoreCoder[0]->old_pitch_buf_fx, add( imult1616( 2, NB_SUBFR16k ), 2 ), Q10 ); // Q16
         }
 
     } /* n_channels loop */
@@ -730,6 +689,7 @@ ivas_error ivas_core_dec_fx(
                 move16();
                 move16();
                 sts = hCPE->hCoreCoder;
+
                 FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
                 {
                     st = sts[ch];
@@ -772,36 +732,43 @@ ivas_error ivas_core_dec_fx(
         /* for inactive frames with mono output, copy and (if necessary) downmix buffers */
         ELSE IF( EQ_16( hCPE->nchan_out, 1 ) )
         {
+            Word16 shift1, shift2;
+
             sts[0] = hCPE->hCoreCoder[0];
             sts[1] = hCPE->hCoreCoder[1];
 
-            IF( LE_32( hCPE->last_element_brate, IVAS_SID_5k2 ) )
+            IF( LE_32( last_element_brate, IVAS_SID_5k2 ) )
             {
                 sts[0]->hHQ_core->exp_old_out = sub( 15, sts[0]->hHQ_core->Q_old_wtda );
                 move16();
                 sts[1]->hHQ_core->exp_old_out = sub( 15, sts[1]->hHQ_core->Q_old_wtda );
                 move16();
             }
+
             updateBuffersForDmxMdctStereo_fx( hCPE, output_frame, output_32_fx[0], output_32_fx[1], synth_16_fx );
 
-            IF( LE_32( hCPE->last_element_brate, IVAS_SID_5k2 ) )
+            IF( LE_32( last_element_brate, IVAS_SID_5k2 ) )
             {
                 sts[0]->hHQ_core->Q_old_wtda = sub( 15, sts[0]->hHQ_core->exp_old_out );
                 move16();
                 sts[1]->hHQ_core->Q_old_wtda = sub( 15, sts[1]->hHQ_core->exp_old_out );
                 move16();
+
+                shift1 = norm_arr( sts[0]->hHQ_core->old_out_fx, L_FRAME48k );
+                shift2 = norm_arr( sts[1]->hHQ_core->old_out_fx, L_FRAME48k );
+                scale_sig( sts[0]->hHQ_core->old_out_fx, L_FRAME48k, shift1 );
+                scale_sig( sts[1]->hHQ_core->old_out_fx, L_FRAME48k, shift2 );
+                sts[0]->hHQ_core->Q_old_wtda = add( sts[0]->hHQ_core->Q_old_wtda, shift1 );
+                sts[1]->hHQ_core->Q_old_wtda = add( sts[1]->hHQ_core->Q_old_wtda, shift2 );
+                move16();
+                move16();
             }
         }
 
         test();
         test();
-#ifdef NONBE_MDCT_ST_DTX_SKIP_DEWHITENING_OF_NOISE_SHAPES_ON_SID_FRAMES
         /* On first good active frame after frameloss undo the whitening of the bg noise shape */
         IF( GT_32( sts[0]->core_brate, SID_2k40 ) && sts[0]->bfi == 0 && EQ_16( sts[0]->prev_bfi, 1 ) )
-#else
-        IF( sts[0]->bfi == 0 && EQ_16( sts[0]->prev_bfi, 1 ) )
-        /* On first good frame after frameloss undo the whitening of the bg noise shape */
-#endif
         {
             FOR( n = 0; n < n_channels; ++n )
             {
@@ -818,7 +785,7 @@ ivas_error ivas_core_dec_fx(
      *---------------------------------------------------------------------*/
 
     test();
-    IF( EQ_16( sts[0]->element_mode, IVAS_CPE_TD ) && hCPE->hStereoCng != NULL )
+    IF( EQ_16( sts[0]->element_mode, IVAS_CPE_TD ) && hStereoCng != NULL )
     {
         /* To be cleaned up once the caller function is converted // These changes are for system testing of fixed changes made */
         Word16 Q_c_PS_LT, Q_output;
@@ -828,13 +795,13 @@ ivas_error ivas_core_dec_fx(
         move16();
         Q_output = 11;
         move16();
-        c_PS_LT_fx = L_deposit_h( hCPE->hStereoCng->c_PS_LT_fx );
+        c_PS_LT_fx = L_deposit_h( hStereoCng->c_PS_LT_fx );
         Q_c_PS_LT = Q31;
         move16();
 
         stereo_cng_compute_PScorr_fx( output_32_fx[0], output_32_fx[1], &Q_output, &c_PS_LT_fx, Q_c_PS_LT, sts[0]->L_frame, sts[1]->L_frame );
 
-        hCPE->hStereoCng->c_PS_LT_fx = extract_h( c_PS_LT_fx );
+        hStereoCng->c_PS_LT_fx = extract_h( c_PS_LT_fx );
     }
 
     /*---------------------------------------------------------------------*
@@ -844,6 +811,8 @@ ivas_error ivas_core_dec_fx(
     FOR( n = 0; n < n_channels; n++ )
     {
         st = sts[n];
+        hBWE_TD = st->hBWE_TD;
+        hBWE_FD = st->hBWE_FD;
 
         /*---------------------------------------------------------------------*
          * TD-BWE for ACELP to TCX transitions
@@ -889,7 +858,7 @@ ivas_error ivas_core_dec_fx(
         test();
         test();
         test();
-        IF( ( st->last_core == ACELP_CORE ) && ( EQ_16( st->core, TCX_20_CORE ) || EQ_16( st->core, TCX_10_CORE ) || EQ_16( st->core, HQ_CORE ) ) && st->hBWE_TD != NULL )
+        IF( ( st->last_core == ACELP_CORE ) && ( EQ_16( st->core, TCX_20_CORE ) || EQ_16( st->core, TCX_10_CORE ) || EQ_16( st->core, HQ_CORE ) ) && hBWE_TD != NULL )
         {
             test();
             test();
@@ -897,31 +866,32 @@ ivas_error ivas_core_dec_fx(
             test();
             IF( ( EQ_16( st->bwidth, SWB ) || EQ_16( st->bwidth, FB ) ) && ( EQ_16( st->last_extl, SWB_TBE ) || EQ_16( st->last_extl, FB_TBE ) ) )
             {
-                GenTransition_fixed( st->hBWE_TD, hb_synth_32_fx[n], output_Fs, st->element_mode, st->L_frame, st->rf_flag, st->total_brate, st->prev_Qx );
+                GenTransition_fx32( hBWE_TD, hb_synth_32_fx[n], output_Fs, st->L_frame, hBWE_TD->prev_Qx );
             }
             ELSE IF( EQ_16( st->bwidth, WB ) && EQ_16( st->last_extl, WB_TBE ) )
             {
-                GenTransition_WB_fixed( st->hBWE_TD, hb_synth_32_fx[n], output_Fs );
+                GenTransition_WB_fx32( hBWE_TD, hb_synth_32_fx[n], output_Fs );
             }
 
             /* Memories  Scaling */
-            Copy_Scale_sig_32_16( st->hBWE_TD->syn_overlap_fx_32, st->hBWE_TD->syn_overlap_fx, L_SHB_LAHEAD, sub( st->prev_Q_bwe_syn2, Q11 ) );                              // prev_Q_bwe_syn2
-            Copy_Scale_sig_32_16( st->hBWE_TD->old_tbe_synth_fx_32, st->hBWE_TD->old_tbe_synth_fx, L_SHB_TRANSITION_LENGTH, sub( st->prev_Qx, Q11 ) );                       // prev_Qx
-            Copy_Scale_sig_32_16( st->hBWE_TD->state_lsyn_filt_dwn_shb_fx_32, st->hBWE_TD->state_lsyn_filt_dwn_shb_fx, ALLPASSSECTIONS_STEEP * 2, sub( st->prev_Qx, Q11 ) ); // prev_Qx
-            Copy_Scale_sig_32_16( st->hBWE_TD->state_lsyn_filt_shb_fx_32, st->hBWE_TD->state_lsyn_filt_shb_fx, ALLPASSSECTIONS_STEEP * 2, sub( st->prev_Qx, Q11 ) );         // prev_Qx
-            Copy_Scale_sig_32_16( st->hBWE_TD->mem_resamp_HB_fx_32, st->hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( st->prev_Qx, Q11 ) );                            // prev_Qx
+            Copy_Scale_sig_32_16( hBWE_TD->syn_overlap_fx_32, hBWE_TD->syn_overlap_fx, L_SHB_LAHEAD, sub( hBWE_TD->prev_Q_bwe_syn2, Q11 ) );                              // prev_Q_bwe_syn2
+            Copy_Scale_sig_32_16( hBWE_TD->old_tbe_synth_fx_32, hBWE_TD->old_tbe_synth_fx, L_SHB_TRANSITION_LENGTH, sub( hBWE_TD->prev_Qx, Q11 ) );                       // prev_Qx
+            Copy_Scale_sig_32_16( hBWE_TD->state_lsyn_filt_dwn_shb_fx_32, hBWE_TD->state_lsyn_filt_dwn_shb_fx, ALLPASSSECTIONS_STEEP * 2, sub( hBWE_TD->prev_Qx, Q11 ) ); // prev_Qx
+            Copy_Scale_sig_32_16( hBWE_TD->state_lsyn_filt_shb_fx_32, hBWE_TD->state_lsyn_filt_shb_fx, ALLPASSSECTIONS_STEEP * 2, sub( hBWE_TD->prev_Qx, Q11 ) );         // prev_Qx
+            Copy_Scale_sig_32_16( hBWE_TD->mem_resamp_HB_fx_32, hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( hBWE_TD->prev_Qx, Q11 ) );                            // prev_Qx
         }
 
         /* Memories  Re-Scaling */
-        IF( st->hBWE_TD != NULL )
+        IF( hBWE_TD != NULL )
         {
-            Copy_Scale_sig_16_32( st->hBWE_TD->syn_overlap_fx, st->hBWE_TD->syn_overlap_fx_32, L_SHB_LAHEAD, sub( Q11, st->prev_Q_bwe_syn2 ) );                              // Q11
-            Copy_Scale_sig_16_32( st->hBWE_TD->old_tbe_synth_fx, st->hBWE_TD->old_tbe_synth_fx_32, L_SHB_TRANSITION_LENGTH, sub( Q11, st->prev_Qx ) );                       // Q11
-            Copy_Scale_sig_16_32( st->hBWE_TD->state_lsyn_filt_dwn_shb_fx, st->hBWE_TD->state_lsyn_filt_dwn_shb_fx_32, ALLPASSSECTIONS_STEEP * 2, sub( Q11, st->prev_Qx ) ); // Q11
-            Copy_Scale_sig_16_32( st->hBWE_TD->state_lsyn_filt_shb_fx, st->hBWE_TD->state_lsyn_filt_shb_fx_32, ALLPASSSECTIONS_STEEP * 2, sub( Q11, st->prev_Qx ) );         // Q11
-            Copy_Scale_sig_16_32( st->hBWE_TD->mem_resamp_HB_fx, st->hBWE_TD->mem_resamp_HB_fx_32, INTERP_3_1_MEM_LEN, sub( Q11, st->prev_Qx ) );                            // Q11
-            Copy( st->hBWE_TD->mem_resamp_HB_fx, st->hBWE_TD->state_32and48k_WB_upsample_fx, ( 2 * ALLPASSSECTIONS_STEEP ) );
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->syn_overlap_fx, hBWE_TD->syn_overlap_fx_32, L_SHB_LAHEAD, sub( Q11, hBWE_TD->prev_Q_bwe_syn2 ) );                              // Q11
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->old_tbe_synth_fx, hBWE_TD->old_tbe_synth_fx_32, L_SHB_TRANSITION_LENGTH, sub( Q11, hBWE_TD->prev_Qx ) );                       // Q11
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->state_lsyn_filt_dwn_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx_32, ALLPASSSECTIONS_STEEP * 2, sub( Q11, hBWE_TD->prev_Qx ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_shb_fx_32, ALLPASSSECTIONS_STEEP * 2, sub( Q11, hBWE_TD->prev_Qx ) );         // Q11
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->mem_resamp_HB_fx, hBWE_TD->mem_resamp_HB_fx_32, INTERP_3_1_MEM_LEN, sub( Q11, hBWE_TD->prev_Qx ) );                            // Q11
+            Copy( hBWE_TD->mem_resamp_HB_fx, hBWE_TD->state_32and48k_WB_upsample_fx, ( 2 * ALLPASSSECTIONS_STEEP ) );
         }
+
         /*---------------------------------------------------------------------*
          * Postprocessing for ACELP/MDCT core switching
          *---------------------------------------------------------------------*/
@@ -932,31 +902,10 @@ ivas_error ivas_core_dec_fx(
         test();
         IF( sba_dirac_stereo_flag && NE_16( st->element_mode, IVAS_CPE_MDCT ) && !( EQ_32( st->core_brate, SID_2k40 ) && EQ_16( st->cng_type, FD_CNG ) ) )
         {
-            Copy_Scale_sig_16_32( synth_16_fx[n], hSCE->save_synth_fx, output_frame, sub( hSCE->q_save_synth_fx, Q_synth ) ); // q_save_synth_fx
+            Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], hSCE->save_synth_fx, output_frame, sub( hSCE->q_save_synth_fx, Q_synth ) ); // q_save_synth_fx
         }
 
-        IVAS_FORMAT ivas_format;
-        IF( st_ivas != NULL )
-        {
-            ivas_format = st_ivas->ivas_format;
-            move32();
-        }
-        ELSE
-        {
-            ivas_format = UNDEFINED_FORMAT;
-            move32();
-        }
-        IF( hCPE != NULL )
-        {
-            last_element_mode = hCPE->last_element_mode;
-            move16();
-        }
-        ELSE
-        {
-            last_element_mode = IVAS_SCE;
-            move16();
-        }
-        IF( NE_32( ( error = core_switching_post_dec_ivas_fx( st, synth_16_fx[n], output_32_fx[n], p_output_mem_16, ivas_format, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = core_switching_post_dec_ivas_fx( st, synth_16_fx[n], output_32_fx[n], p_output_mem_16, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -967,7 +916,7 @@ ivas_error ivas_core_dec_fx(
         test();
         IF( sba_dirac_stereo_flag && hSCE && EQ_32( st->core_brate, SID_2k40 ) && EQ_16( st->cng_type, FD_CNG ) )
         {
-            Copy_Scale_sig_16_32( synth_16_fx[n], hSCE->save_synth_fx, output_frame, sub( hSCE->q_save_synth_fx, Q_synth ) ); // q_save_synth_fx
+            Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], hSCE->save_synth_fx, output_frame, sub( hSCE->q_save_synth_fx, Q_synth ) ); // q_save_synth_fx
         }
 
         /* if we transition from inactive to active coding in MDCT-Stereo DTX and the output format is mono DMX, we need to sync the upsampled buffer between channels here */
@@ -977,10 +926,11 @@ ivas_error ivas_core_dec_fx(
         test();
         test();
         test();
-        IF( n == 0 && EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->last_core == ACELP_CORE && st->core != ACELP_CORE && ( EQ_16( nchan_out, 1 ) || ( hCPE != NULL && EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) ) ) )
+        IF( n == 0 && EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->last_core == ACELP_CORE && st->core != ACELP_CORE && ( EQ_16( nchan_out, 1 ) || EQ_16( last_element_mode, IVAS_CPE_DFT ) ) )
         {
             Copy( sts[0]->previoussynth_fx, sts[1]->previoussynth_fx, st->hTcxDec->L_frameTCX );
         }
+
         /*---------------------------------------------------------------------*
          * Pre-processing for bandwidth switching
          *---------------------------------------------------------------------*/
@@ -989,11 +939,11 @@ ivas_error ivas_core_dec_fx(
 
         IF( st->hHQ_core == NULL )
         {
-            Copy_Scale_sig_16_32( st->delay_buf_out_fx, st->delay_buf_out32_fx, ( HQ_DELTA_MAX * HQ_DELAY_COMP ), Q11 ); // Q11
+            Copy_Scale_sig_16_32_DEPREC( st->delay_buf_out_fx, st->delay_buf_out32_fx, ( HQ_DELTA_MAX * HQ_DELAY_COMP ), Q11 ); // Q11
         }
         ELSE
         {
-            Copy_Scale_sig_16_32( st->delay_buf_out_fx, st->delay_buf_out32_fx, ( HQ_DELTA_MAX * HQ_DELAY_COMP ), sub( Q11, st->hHQ_core->Q_old_postdec ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( st->delay_buf_out_fx, st->delay_buf_out32_fx, ( HQ_DELTA_MAX * HQ_DELAY_COMP ), sub( Q11, st->hHQ_core->Q_old_postdec ) ); // Q11
         }
 
         Scale_sig32( output_32_fx[n], L_FRAME48k, ( Q11 - Q4 ) ); // Q11
@@ -1007,32 +957,28 @@ ivas_error ivas_core_dec_fx(
             move16();
         }
 
-#ifdef MSAN_FIX
         IF( Q_synth > 0 )
         {
             Scale_sig( synth_16_fx[n], output_frame, negate( Q_synth ) ); // Q0
             Q_synth = 0;
             move16();
         }
-#else
-        Scale_sig( synth_16_fx[n], L_FRAME48k, negate( Q_synth ) );
-#endif
 
         /*------------------reset-code-start---------------------*/
 
         test();
         test();
-        IF( NE_16( st->last_extl, WB_BWE ) && EQ_16( st->extl, WB_BWE ) && st->hBWE_FD != NULL )
+        IF( NE_16( st->last_extl, WB_BWE ) && EQ_16( st->extl, WB_BWE ) && hBWE_FD != NULL )
         {
             test();
             if ( NE_16( st->last_extl, SWB_BWE ) && NE_16( st->last_extl, FB_BWE ) )
             {
-                st->hBWE_FD->prev_mode = st->hBWE_FD->prev_mode;
+                hBWE_FD->prev_mode = hBWE_FD->prev_mode;
                 move16();
             }
-            st->hBWE_FD->prev_L_swb_norm = st->hBWE_FD->prev_L_swb_norm;
+            hBWE_FD->prev_L_swb_norm = hBWE_FD->prev_L_swb_norm;
             move16();
-            st->hBWE_FD->prev_flag = st->hBWE_FD->prev_flag;
+            hBWE_FD->prev_flag = hBWE_FD->prev_flag;
             move16();
         }
 
@@ -1057,9 +1003,6 @@ ivas_error ivas_core_dec_fx(
         Q_synth_fx = Q_synth;
         move16();
 
-        FD_BWE_DEC_HANDLE hBWE_FD;
-        hBWE_FD = st->hBWE_FD;
-
         Copy_Scale_sig_32_16( output_32_fx[n], output_16_fx[n], L_FRAME48k, sub( Q_input, Q11 ) ); // Q_input
         Copy_Scale_sig_32_16( hb_synth_32_fx[n], hb_synth_16_fx[n], L_FRAME48k, -( Q11 ) );        // Q0
         test();
@@ -1085,23 +1028,27 @@ ivas_error ivas_core_dec_fx(
         }
 
         /* Memories  Re-Scaling */
-        Copy_Scale_sig_16_32( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, sub( Q11, Q_hb_synth_fx ) ); // Q11
-        Copy_Scale_sig_16_32( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_input ) );           // Q11
-        Copy_Scale_sig_16_32( synth_16_fx[n], synth_32_fx[n], L_FRAME48k, sub( Q11, Q_synth_fx ) );          // Q11
+        Copy_Scale_sig_16_32_no_sat( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, sub( Q11, Q_hb_synth_fx ) ); // Q11
+        Copy_Scale_sig_16_32_no_sat( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_input ) );           // Q11    // Q_input can get value <= -5
+        Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], synth_32_fx[n], output_frame, sub( Q11, Q_synth_fx ) );        // Q11
 
         IF( hBWE_FD != NULL )
         {
-            Copy_Scale_sig_16_32( hBWE_FD->L_old_wtda_swb_fx, hBWE_FD->L_old_wtda_swb_fx32, L_FRAME48k, sub( Q11, hBWE_FD->old_wtda_swb_fx_exp ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( hBWE_FD->L_old_wtda_swb_fx, hBWE_FD->L_old_wtda_swb_fx32, L_FRAME48k, sub( Q11, hBWE_FD->old_wtda_swb_fx_exp ) ); // Q11
         }
-        IF( st->hBWE_TD != NULL )
+        IF( hBWE_TD != NULL )
         {
-            Copy_Scale_sig_16_32( st->hBWE_TD->old_tbe_synth_fx, st->hBWE_TD->old_tbe_synth_fx_32, L_SHB_TRANSITION_LENGTH, sub( Q11, st->prev_Qx ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->old_tbe_synth_fx, hBWE_TD->old_tbe_synth_fx_32, L_SHB_TRANSITION_LENGTH, sub( Q11, hBWE_TD->prev_Qx ) ); // Q11
         }
 
         /*---------------------------------------------------------------------*
          * SWB(FB) TBE decoding
          * SWB(FB) BWE decoding
          *---------------------------------------------------------------------*/
+
+        Q_white_exc = 0;
+        move16();
+
         test();
         test();
         test();
@@ -1122,12 +1069,10 @@ ivas_error ivas_core_dec_fx(
         IF( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) || ( NE_16( st->coder_type, AUDIO ) && NE_16( st->coder_type, INACTIVE ) && GE_32( st->core_brate, SID_2k40 ) && EQ_16( st->core, ACELP_CORE ) && !st->con_tcx && GE_32( output_Fs, 32000 ) && GT_16( st->bwidth, NB ) && st->bws_cnt > 0 ) )
         {
             /* SWB TBE decoder */
-            Q_white_exc = 0;
-            move16();
-
             ivas_swb_tbe_dec_fx( st, hStereoICBWE, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], old_syn_12k8_16k_fx[n], tmp_buffer_fx /*fb_exc*/, hb_synth_32_fx[n], pitch_buf_fx[n], &Q_white_exc );
-            Copy_Scale_sig_16_32_no_sat( st->hBWE_TD->syn_overlap_fx, st->hBWE_TD->syn_overlap_fx_32, L_SHB_LAHEAD, sub( Q11, st->prev_Q_bwe_syn2 ) ); // Q11
-            Copy_Scale_sig_32_16( st->hBWE_TD->old_tbe_synth_fx_32, st->hBWE_TD->old_tbe_synth_fx, L_SHB_TRANSITION_LENGTH, sub( st->prev_Qx, Q11 ) ); // prev_Qx
+
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->syn_overlap_fx, hBWE_TD->syn_overlap_fx_32, L_SHB_LAHEAD, sub( Q11, hBWE_TD->prev_Q_bwe_syn2 ) ); // Q11
+            Copy_Scale_sig_32_16( hBWE_TD->old_tbe_synth_fx_32, hBWE_TD->old_tbe_synth_fx, L_SHB_TRANSITION_LENGTH, sub( hBWE_TD->prev_Qx, Q11 ) ); // prev_Qx
 
             IF( GT_16( Q_white_exc, 31 ) )
             {
@@ -1149,7 +1094,7 @@ ivas_error ivas_core_dec_fx(
 
             Scale_sig32( hb_synth_32_fx[n], output_frame, sub( Q11, Q_syn_hb ) ); // Q11
 
-            Copy_Scale_sig_32_16( st->hBWE_FD->L_old_wtda_swb_fx32, st->hBWE_FD->L_old_wtda_swb_fx, output_frame, sub( hBWE_FD->old_wtda_swb_fx_exp, Q11 ) ); // old_wtda_swb_fx_exp
+            Copy_Scale_sig_32_16( hBWE_FD->L_old_wtda_swb_fx32, hBWE_FD->L_old_wtda_swb_fx, output_frame, sub( hBWE_FD->old_wtda_swb_fx_exp, Q11 ) ); // old_wtda_swb_fx_exp
         }
 
         /*---------------------------------------------------------------------*
@@ -1175,11 +1120,7 @@ ivas_error ivas_core_dec_fx(
             {
                 hb_synth_32_fx[n][i] = Mpy_32_16_1( hb_synth_32_fx[n][i], tmp16_2 ); /* Q11 */
                 move32();
-#ifdef BASOP_NOGLOB
                 tmp16_2 = add_o( tmp16_2, tmp16, &Overflow ); /* Q15 */
-#else
-                tmp16_2 = add( tmp16_2, tmp16 );
-#endif
             }
         }
 
@@ -1199,30 +1140,27 @@ ivas_error ivas_core_dec_fx(
 
             q = 2;
             move16();
-            Copy_Scale_sig_32_16( hb_synth_32_fx[n], hb_synth_16_fx[n], L_FRAME48k, -( Q11 ) ); // Q0
-#ifdef MSAN_FIX
-            Copy_Scale_sig_32_16( synth_32_fx[n], synth_fxl, output_frame, negate( add( Q11, q ) ) ); // Q0
-#else
-            Copy_Scale_sig_32_16( synth_32_fx[n], synth_fxl, L_FRAME48k, negate( add( Q11, q ) ) );
-#endif
-            Scale_sig( st->hBWE_TD->state_lpc_syn_fx, LPC_SHB_ORDER, sub( Q8, st->prev_Q_bwe_syn ) );                                                                                                                // Q8
-            Copy_Scale_sig_32_16( st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, ( 2 * ALLPASSSECTIONS_STEEP ), sub( st->prev_Q_bwe_syn2, Q11 ) ); // prev_Q_bew_syn2
+            Copy_Scale_sig_32_16( hb_synth_32_fx[n], hb_synth_16_fx[n], L_FRAME48k, -( Q11 ) );                                                                                                                   // Q0
+            Copy_Scale_sig_32_16( synth_32_fx[n], synth_fxl, output_frame, negate( add( Q11, q ) ) );                                                                                                             // Q0
+            Scale_sig( hBWE_TD->state_lpc_syn_fx, LPC_SHB_ORDER, sub( Q8, hBWE_TD->prev_Q_bwe_syn ) );                                                                                                            // Q8
+            Copy_Scale_sig_32_16( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, ( 2 * ALLPASSSECTIONS_STEEP ), sub( hBWE_TD->prev_Q_bwe_syn2, Q11 ) ); // prev_Q_bew_syn2
 
             swb_CNG_dec_ivas_fx( st, synth_fxl, hb_synth_16_fx[n], sid_bw[n], negate( q ) );
 
             test();
             IF( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) )
             {
-                Copy_Scale_sig_16_32( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, ( Q11 ) ); // Q11
+                Copy_Scale_sig_16_32_DEPREC( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, ( Q11 ) ); // Q11
             }
 
-            Scale_sig( st->hBWE_TD->state_lpc_syn_fx, LPC_SHB_ORDER, negate( sub( Q8, st->prev_Q_bwe_syn ) ) ); // Q0
-            Copy_Scale_sig_16_32_no_sat( st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, 2 * ALLPASSSECTIONS_STEEP, negate( sub( st->prev_Q_bwe_syn2, Q11 ) ) );
+            Scale_sig( hBWE_TD->state_lpc_syn_fx, LPC_SHB_ORDER, negate( sub( Q8, hBWE_TD->prev_Q_bwe_syn ) ) ); // Q0
+            Copy_Scale_sig_16_32_no_sat( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, 2 * ALLPASSSECTIONS_STEEP, negate( sub( hBWE_TD->prev_Q_bwe_syn2, Q11 ) ) );
         }
 
         /*-------------------------------------------------------------------*
          *  Inter-channel BWE decoding
          *-------------------------------------------------------------------*/
+
         test();
         IF( n == 0 && GE_16( st->element_mode, IVAS_CPE_DFT ) )
         {
@@ -1236,7 +1174,6 @@ ivas_error ivas_core_dec_fx(
                 move32();
             }
             stereo_icBWE_dec_fx( hCPE, hb_synth_32_fx[0], hb_synth_32_fx[1], tmp_buffer_fx /*fb_synth_ref*/, voice_factors_fx[0], output_frame, &q, Q_white_exc );
-#ifdef MSAN_FIX
             test();
             test();
             test();
@@ -1248,10 +1185,6 @@ ivas_error ivas_core_dec_fx(
                 Scale_sig32( hb_synth_32_fx[0], output_frame, sub( Q11, q ) ); // Q11
                 Scale_sig32( hb_synth_32_fx[1], output_frame, sub( Q11, q ) ); // Q11
             }
-#else
-            Scale_sig32( hb_synth_32_fx[0], L_FRAME48k, sub( Q11, q ) );
-            Scale_sig32( hb_synth_32_fx[1], L_FRAME48k, sub( Q11, q ) );
-#endif
         }
 
         IF( EQ_16( st->element_mode, EVS_MONO ) )
@@ -1271,18 +1204,16 @@ ivas_error ivas_core_dec_fx(
             IF( EQ_16( st->core, ACELP_CORE ) && !st->bfi && st->prev_bfi && GE_32( st->last_total_brate, HQ_48k ) && EQ_16( st->last_codec_mode, MODE2 ) && ( EQ_16( st->last_core_bfi, TCX_20_CORE ) || EQ_16( st->last_core_bfi, TCX_10_CORE ) ) && EQ_16( st->hPlcInfo->concealment_method, TCX_NONTONAL ) && LT_16( st->hPlcInfo->nbLostCmpt, 4 ) )
             {
                 tmps = NS2SA_FX2( output_Fs, DELAY_CLDFB_NS );
-                IF( st->tonalMDCTconceal.q_lastPcmOut != 0 )
+                IF( st->hTonalMDCTConc->q_lastPcmOut != 0 )
                 {
-                    Scale_sig( st->tonalMDCTconceal.secondLastPcmOut, shr( st->plcInfo.FrameSize, 1 ), negate( st->tonalMDCTconceal.q_lastPcmOut ) );
-                    Scale_sig( st->tonalMDCTconceal.lastPcmOut, st->plcInfo.FrameSize, negate( st->tonalMDCTconceal.q_lastPcmOut ) );
-                    st->tonalMDCTconceal.q_lastPcmOut = 0;
+                    Scale_sig( st->hTonalMDCTConc->secondLastPcmOut, shr( st->hPlcInfo->L_frameTCX, 1 ), negate( st->hTonalMDCTConc->q_lastPcmOut ) );
+                    Scale_sig( st->hTonalMDCTConc->lastPcmOut, st->hPlcInfo->L_frameTCX, negate( st->hTonalMDCTConc->q_lastPcmOut ) );
+                    st->hTonalMDCTConc->q_lastPcmOut = 0;
                     move16();
                 }
-                waveform_adj2_fix( st->hTonalMDCTConc->secondLastPcmOut, synth_16_fx[n] + tmps, st->plcInfo.data_noise, &st->plcInfo.outx_new_n1_fx,
-                                   &st->plcInfo.nsapp_gain_fx, &st->plcInfo.nsapp_gain_n_fx, &st->plcInfo.recovery_gain, st->plcInfo.step_concealgain_fx,
-                                   st->plcInfo.Pitch_fx, st->plcInfo.FrameSize, tmps, add( st->hPlcInfo->nbLostCmpt, 1 ), st->bfi );
+                waveform_adj2_fix( st->hPlcInfo, st->hTonalMDCTConc->secondLastPcmOut, synth_16_fx[n] + tmps, tmps, add( st->hPlcInfo->nbLostCmpt, 1 ), st->bfi );
 
-                st->hPlcInfo->Pitch = 0;
+                st->hPlcInfo->Pitch_fx = 0;
                 move16();
             }
         }
@@ -1399,8 +1330,8 @@ ivas_error ivas_core_dec_fx(
                 /* Delay hb_synth */
                 Word32 hb_prev_synth_buffer_fx_32[111];
 
-                Copy_Scale_sig_16_32( st->hb_prev_synth_buffer_fx, hb_prev_synth_buffer_fx_32, 111, 11 ); // Q11
-                delay_signal_fx( hb_synth_32_fx[n], output_frame, hb_prev_synth_buffer_fx_32, tmps );
+                Copy_Scale_sig_16_32_DEPREC( st->hb_prev_synth_buffer_fx, hb_prev_synth_buffer_fx_32, 111, 11 ); // Q11
+                delay_signal32_fx( hb_synth_32_fx[n], output_frame, hb_prev_synth_buffer_fx_32, tmps );
                 Copy_Scale_sig_32_16( hb_prev_synth_buffer_fx_32, st->hb_prev_synth_buffer_fx, 111, -( 11 ) ); // Q0
             }
             ELSE
@@ -1419,24 +1350,13 @@ ivas_error ivas_core_dec_fx(
             {
                 Word16 exp;
                 Word32 fra;
-                SWITCH( output_frame )
+
+                tmp16 = 34; /*ouput_frame == L_FRAME 48k: Q15*/
+                move16();
+                if ( EQ_16( output_frame, L_FRAME32k ) )
                 {
-                    case L_FRAME8k:
-                        tmp16 = 205;
-                        move16();
-                        BREAK; /*Q15*/
-                    case L_FRAME16k:
-                        tmp16 = 102;
-                        move16();
-                        BREAK; /*Q15*/
-                    case L_FRAME32k:
-                        tmp16 = 51;
-                        move16();
-                        BREAK; /*Q15*/
-                    case L_FRAME48k:
-                        tmp16 = 34;
-                        move16();
-                        BREAK; /*Q15*/
+                    tmp16 = 51; /*Q15*/
+                    move16();
                 }
 
                 L_tmp = L_deposit_l( 2 ); /*0.001 in Q11*/
@@ -1456,9 +1376,9 @@ ivas_error ivas_core_dec_fx(
                 L_tmp = BASOP_Util_Add_Mant32Exp( fra, 6, L_tmp, exp, &exp );
                 L_tmp = Mpy_32_16_1( L_tmp, 24660 );
                 exp = add( exp, 2 );
-                st->last_shb_ener_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 7 ) ) ); /*Q8*/
+                st->hTdCngDec->last_shb_ener_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 7 ) ) ); /*Q8*/
                 move16();
-                st->hTdCngDec->last_shb_ener_fx = L_shl_sat( L_tmp, sub( exp, 20 ) ); /*Q11*/
+                st->hTdCngDec->last_shb_ener_fx_32 = L_shl_sat( L_tmp, sub( exp, 20 ) ); /*Q11*/
                 move32();
             }
         }
@@ -1476,37 +1396,13 @@ ivas_error ivas_core_dec_fx(
          * - core switching in DFT stereo
          * - updates for potential TD->DFT stereo switching
          *----------------------------------------------------------------*/
-        IF( hCPE != NULL )
-        {
-            FOR( Word32 ch_ind = 0; ch_ind < n_channels; ch_ind++ )
-            {
-                IF( hCPE->hCoreCoder[ch_ind] != NULL )
-                {
-                    IF( hCPE->hCoreCoder[ch_ind]->hHQ_core != NULL )
-                    {
-                        Copy_Scale_sig_16_32( hCPE->hCoreCoder[ch_ind]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[ch_ind]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hCPE->hCoreCoder[ch_ind]->hHQ_core->Q_old_wtda_LB ) ); // Q11
-                        Copy_Scale_sig_16_32( hCPE->hCoreCoder[ch_ind]->hHQ_core->old_out_fx, hCPE->hCoreCoder[ch_ind]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hCPE->hCoreCoder[ch_ind]->hHQ_core->Q_old_wtda ) );          // Q11
-                    }
-                }
-            }
-        }
-        IF( hSCE != NULL )
+
+        IF( st->hHQ_core != NULL )
         {
-            IF( hSCE->hCoreCoder[0] != NULL )
-            {
-                IF( hSCE->hCoreCoder[0]->hHQ_core != NULL )
-                {
-                    Copy_Scale_sig_16_32( hSCE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hSCE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hSCE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) ); // Q11
-                    Copy_Scale_sig_16_32( hSCE->hCoreCoder[0]->hHQ_core->old_out_fx, hSCE->hCoreCoder[0]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hSCE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) );          // Q11
-                }
-            }
+            Copy_Scale_sig_16_32_no_sat( st->hHQ_core->old_out_LB_fx, st->hHQ_core->old_out_LB_fx32, L_FRAME32k, sub( Q11, st->hHQ_core->Q_old_wtda_LB ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( st->hHQ_core->old_out_fx, st->hHQ_core->old_out_fx32, L_FRAME48k, sub( Q11, st->hHQ_core->Q_old_wtda ) );          // Q11
         }
 
-        Word16 exp_max;
-        Word32 output_fx_loc[L_FRAME48k];
-
-        exp_max = 0;
-        move16();
         IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
         {
             test();
@@ -1529,7 +1425,7 @@ ivas_error ivas_core_dec_fx(
             Word16 q;
             q = 11;
             move16();
-            IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) )
+            IF( EQ_16( last_element_mode, IVAS_CPE_MDCT ) )
             {
                 stereo_mdct2dft_update_fx( hCPE, output_32_fx[0], synth_32_fx[0] );
             }
@@ -1562,8 +1458,13 @@ ivas_error ivas_core_dec_fx(
          * Common updates
          *--------------------------------------------------------*/
 
-        /*Scale Memories*/
+        Word16 exp_max;
+        Word32 output_fx_loc[L_FRAME48k];
+
+        exp_max = 0;
+        move16();
 
+        /*Scale Memories*/
         test();
         test();
         test();
@@ -1578,15 +1479,15 @@ ivas_error ivas_core_dec_fx(
             move16();
             move16();
 
-            Copy_Scale_sig32_16( st->prev_synth_buffer32_fx, st->prev_synth_buffer_fx, NS2SA_FX2( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), -( Q11 ) ); // Q0
+            Copy_Scale_sig32_16( st->prev_synth_buffer32_fx, st->prev_synth_buffer_fx, NS2SA( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), -( Q11 ) ); // Q0
             st->q_prev_synth_buffer_fx = 0;
             move16();
 
             exp_ouput = Find_Max_Norm32( output_32_fx[n], output_frame );
             exp_ouput = add( exp_ouput, Q11 );
-            exp_prev_synth_buffer = Find_Max_Norm16( st->prev_synth_buffer_fx, NS2SA_FX2( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );
+            exp_prev_synth_buffer = Find_Max_Norm16( st->prev_synth_buffer_fx, NS2SA( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );
             exp_prev_synth_buffer = add( exp_prev_synth_buffer, st->q_prev_synth_buffer_fx );
-            exp_old_out = Find_Max_Norm16( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), sub( add( NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ), NS2SA( st->output_Fs, N_ZERO_MDCT_NS ) ) );
+            exp_old_out = Find_Max_Norm16( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), sub( add( NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ), NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ) ) );
             exp_delay_buf_out = Find_Max_Norm16( st->delay_buf_out_fx, NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );
             exp_synth_history = Find_Max_Norm16( st->hTcxDec->synth_history_fx + output_frame, sub( add( sub( imult1616( 2, output_frame ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ), output_frame ) );
             exp_max = s_min( exp_synth_history, exp_ouput );
@@ -1599,17 +1500,17 @@ ivas_error ivas_core_dec_fx(
             Scale_sig32( output_fx_loc, output_frame, sub( exp_max, Q11 ) );                                                                                                                                                                      // Q(31-exp_max)
             Scale_sig( st->delay_buf_out_fx, NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ), exp_max );                                                                                                                                               // exp_max
             Scale_sig( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), sub( NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ), NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ) ), exp_max );                                      // Q(31-exp_max)
-            Scale_sig( st->prev_synth_buffer_fx, NS2SA_FX2( 48000, L_sub( DELAY_BWE_TOTAL_NS, DELAY_CLDFB_NS ) ), sub( exp_max, st->q_prev_synth_buffer_fx ) );                                                                                   // Q(exp_max - prev_synth_buffer_fx)
+            Scale_sig( st->prev_synth_buffer_fx, NS2SA_FX2( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), sub( exp_max, st->q_prev_synth_buffer_fx ) );                                                                                           // Q(exp_max - prev_synth_buffer_fx)
             Scale_sig( st->hTcxDec->synth_history_fx + output_frame, sub( add( sub( imult1616( 2, output_frame ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ), output_frame ), sub( exp_max, 0 ) ); // Q(31-exp_max)
 
             st->q_prev_synth_buffer_fx = sub( exp_max, st->q_prev_synth_buffer_fx );
             move16();
         }
+
         /* Save synthesis for HQ FEC */
-        save_synthesis_hq_fec_fx( st, output_fx_loc, output_frame, hCPE );
+        save_synthesis_hq_fec_fx( st, NULL, output_fx_loc, output_frame, 0, hCPE );
 
         /* Updates */
-
         ivas_updt_dec_common_fx( st, NORMAL_HQ_CORE, -1, output_32_fx[n], Q11 );
 
         Scale_sig( st->delay_buf_out_fx, NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ), negate( exp_max ) ); // Q0
diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig_fx.c
similarity index 99%
rename from lib_dec/ivas_corecoder_dec_reconfig.c
rename to lib_dec/ivas_corecoder_dec_reconfig_fx.c
index 56a45ddb077dba581ccda198ec360212e4632772..8333f146f594a61de657bee9e9b066119b14e694 100644
--- a/lib_dec/ivas_corecoder_dec_reconfig.c
+++ b/lib_dec/ivas_corecoder_dec_reconfig_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,10 +32,8 @@
 
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx.h"
-#include "prot.h"
 #include <stdint.h>
 #include "wmc_auto.h"
 
@@ -604,7 +602,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
         /* create additional CLDFB synthesis instances */
         FOR( i = numCldfbAnalyses_old; i < numCldfbAnalyses; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -624,7 +622,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
         /* create additional CLDFB synthesis instances */
         FOR( i = numCldfbSyntheses_old; i < numCldfbSyntheses; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c
deleted file mode 100644
index bc61a3baa666ffbc8bee8db1abaadc283878cd21..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_cpe_dec.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "prot_fx.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
-#include <math.h>
-
-
-/*--------------------------------------------------------------------------*
- * Local function prototypes
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------*
- * ivas_cpe_dec()
- *
- * Channel Pair Element (CPE) decoding routine
- *--------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------
- * read_stereo_mode_and_bwidth()
- *
- * Read stereo technology info & audio bandwidth
- *-------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------
- * stereo_mode_combined_format_dec()
- *
- * Set stereo format in a combined format
- *-------------------------------------------------------------------------*/
diff --git a/lib_dec/ivas_cpe_dec_fx.c b/lib_dec/ivas_cpe_dec_fx.c
index d8ebe8d4b1f8bd7e306eb97b2c9e7ffab2cc82fb..c10c6beda022acd7c4dbefdb47d957741647b4c4 100644
--- a/lib_dec/ivas_cpe_dec_fx.c
+++ b/lib_dec/ivas_cpe_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,8 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
 #include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include <math.h>
@@ -126,14 +124,14 @@ ivas_error ivas_cpe_dec_fx(
         test();
         IF( hCPE->hCoreCoder[ind1] && hCPE->hCoreCoder[ind1]->hHQ_core )
         {
-            Copy_Scale_sig_16_32( hCPE->hCoreCoder[ind1]->hHQ_core->old_out_fx, hCPE->hCoreCoder[ind1]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[ind1]->hHQ_core->old_out_fx, hCPE->hCoreCoder[ind1]->hHQ_core->old_out_fx32, L_FRAME48k, sub( Q11, hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda ) ); // Q11
         }
     }
     FOR( Word16 ind1 = 0; ind1 < 2; ind1++ )
     {
         IF( hCPE->hCoreCoder[ind1]->hHQ_core )
         {
-            Copy_Scale_sig_16_32( hCPE->hCoreCoder[ind1]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[ind1]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda_LB ) ); // Q11
+            Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[ind1]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[ind1]->hHQ_core->old_out_LB_fx32, L_FRAME32k, sub( Q11, hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda_LB ) ); // Q11
             hCPE->hCoreCoder[ind1]->hHQ_core->q_old_outLB_fx = Q11;
             move16();
         }
@@ -149,7 +147,7 @@ ivas_error ivas_cpe_dec_fx(
         test();
         IF( hCPE->hCoreCoder[ind1] && hCPE->hCoreCoder[ind1]->hHQ_core )
         {
-            Copy_Scale_sig_32_16( hCPE->hCoreCoder[ind1]->hHQ_core->oldOut_fx, hCPE->hCoreCoder[ind1]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda, Q11 ) ); // Q_old_wtda
+            Copy_Scale_sig_32_16( hCPE->hCoreCoder[ind1]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[ind1]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda, Q11 ) ); // Q_old_wtda
         }
     }
     FOR( Word16 ind1 = 0; ind1 < 2; ind1++ )
@@ -157,7 +155,7 @@ ivas_error ivas_cpe_dec_fx(
         test();
         IF( hCPE->hCoreCoder[ind1] && hCPE->hCoreCoder[ind1]->hHQ_core )
         {
-            Copy_Scale_sig_32_16( hCPE->hCoreCoder[ind1]->hHQ_core->old_outLB_fx, hCPE->hCoreCoder[ind1]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda_LB, Q11 ) ); // Q_old_wtda
+            Copy_Scale_sig_32_16( hCPE->hCoreCoder[ind1]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[ind1]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[ind1]->hHQ_core->Q_old_wtda_LB, Q11 ) ); // Q_old_wtda
         }
     }
 
@@ -680,7 +678,7 @@ ivas_error ivas_cpe_dec_fx(
 
             stereo_dft_dec_res_fx( hCPE, res_buf_fx, q_res_buf, output[1] );
 
-            Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->old_pitch_buf_16_fx, hCPE->hCoreCoder[0]->old_pitch_buf_fx, ( ( 2 * NB_SUBFR16k ) + 2 ), 10 ); // Q6->Q16
+            Copy_Scale_sig_16_32_DEPREC( hCPE->hCoreCoder[0]->old_pitch_buf_16_fx, hCPE->hCoreCoder[0]->old_pitch_buf_fx, ( ( 2 * NB_SUBFR16k ) + 2 ), 10 ); // Q6->Q16
 
             Scale_sig32( output[1], L_FRAME8k, ( Q11 - Q15 ) ); // Q15 -> Q11
 
@@ -723,8 +721,8 @@ ivas_error ivas_cpe_dec_fx(
             hCPE->hStereoDft->q_res_cod_mem_fx = hCPE->hStereoDft->q_dft;
             move16();
             stereo_dft_unify_dmx_fx( hCPE->hStereoDft, sts[0], DFT_fx, hCPE->input_mem_fx[1], hCPE->hStereoCng->prev_sid_nodata );
-            scale_sig32( hCPE->hStereoDft->res_cod_mem_fx, STEREO_DFT_OVL_8k, sub( Q16, hCPE->hStereoDft->q_res_cod_mem_fx ) ); // Q16
-            hCPE->hStereoDft->q_res_cod_mem_fx = Q16;
+            scale_sig32( hCPE->hStereoDft->res_cod_mem_fx, STEREO_DFT_OVL_8k, sub( Q15, hCPE->hStereoDft->q_res_cod_mem_fx ) ); // Q15
+            hCPE->hStereoDft->q_res_cod_mem_fx = Q15;
             move16();
         }
         ELSE
@@ -748,8 +746,8 @@ ivas_error ivas_cpe_dec_fx(
                 move16();
             }
             stereo_dft_dec_fx( hCPE->hStereoDft, sts[0], DFT_fx, hCPE->input_mem_fx[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
-            scale_sig32( hCPE->hStereoDft->res_cod_mem_fx, STEREO_DFT_OVL_8k, sub( Q16, hCPE->hStereoDft->q_res_cod_mem_fx ) ); // Q16
-            hCPE->hStereoDft->q_res_cod_mem_fx = Q16;
+            scale_sig32( hCPE->hStereoDft->res_cod_mem_fx, STEREO_DFT_OVL_8k, sub( Q15, hCPE->hStereoDft->q_res_cod_mem_fx ) ); // Q15
+            hCPE->hStereoDft->q_res_cod_mem_fx = Q15;
             move16();
         }
 
@@ -1091,8 +1089,6 @@ ivas_error create_cpe_dec(
         move32();
         st->is_ism_format = 0;
         move16();
-        st->ivas_format = st_ivas->ivas_format;
-        move32();
 
         IF( NE_32( ( error = init_decoder_ivas_fx( st, n, st_ivas->mc_mode ) ), IVAS_ERR_OK ) )
         {
diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c
deleted file mode 100644
index 70d0a21a7c77e1f8eee6f84506b56355b8b88c2b..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_dec.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
-
-
-/*--------------------------------------------------------------------------*
- * ivas_dec()
- *
- * Principal IVAS decoder routine
- *--------------------------------------------------------------------------*/
diff --git a/lib_dec/ivas_decision_matrix_dec.c b/lib_dec/ivas_decision_matrix_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_decision_matrix_dec.c
rename to lib_dec/ivas_decision_matrix_dec_fx.c
index 6196d31fbe3bd9bcff5e3b21bca81b4527df4c2f..717bb3b93512bdd8818088c6a585e9a2376d71b6 100644
--- a/lib_dec/ivas_decision_matrix_dec.c
+++ b/lib_dec/ivas_decision_matrix_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,12 +34,10 @@
 #include "options.h"
 #include "stat_dec.h"
 #include "rom_com.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 /*-----------------------------------------------------------------*
  * ivas_decision_matrix_dec()
diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec_fx.c
similarity index 90%
rename from lib_dec/ivas_dirac_dec.c
rename to lib_dec/ivas_dirac_dec_fx.c
index e1d9306c5db63e218cfaed8d5c25903ee2038119..7fecb7ca7042e0d0cf4fb8ad6038c963d51f42e4 100644
--- a/lib_dec/ivas_dirac_dec.c
+++ b/lib_dec/ivas_dirac_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,13 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "ivas_rom_rend.h"
 #include "wmc_auto.h"
-#include "prot_fx.h" /* Function prototypes                    */
 #include "ivas_rom_com_fx.h"
 #include "ivas_prot_fx.h"
 
@@ -917,11 +915,7 @@ static ivas_error ivas_dirac_rend_config_fx(
             }
         }
         set32_fx( hDirACRend->buffer_energy_fx, 0, DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX );
-#ifdef FIX_867
-        set16_fx( hDirACRend->q_buffer_energy, Q31, DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX );
-#else
         set16_fx( hDirACRend->q_buffer_energy, Q31, DIRAC_NO_COL_AVG_DIFF );
-#endif
     }
     ELSE IF( ( EQ_16( flag_config, DIRAC_OPEN ) && hDirAC->hConfig->dec_param_estim == FALSE ) || ( EQ_16( flag_config, DIRAC_RECONFIGURE ) && ( ( hDirAC->hConfig->dec_param_estim == FALSE ) && EQ_16( dec_param_estim_old, TRUE ) ) ) )
     {
@@ -1452,10 +1446,27 @@ void ivas_qmetadata_to_dirac_fx(
             {
                 FOR( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
                 {
-                    hSpatParamRendCom->azimuth[meta_write_index][b] = extract_h( L_shr( q_direction->band_data[band].azimuth_fx[block], 6 ) );
+                    /* Right shifting -1 -> -1, Hence this change is done */
+                    Word32 L_tmp = L_abs( q_direction->band_data[band].azimuth_fx[block] );
+                    hSpatParamRendCom->azimuth[meta_write_index][b] = extract_h( L_shr( L_tmp, 6 ) );
                     move16();
-                    hSpatParamRendCom->elevation[meta_write_index][b] = extract_h( L_shr( q_direction->band_data[band].elevation_fx[block], 6 ) );
+
+                    IF( q_direction->band_data[band].azimuth_fx[block] < 0 )
+                    {
+                        hSpatParamRendCom->azimuth[meta_write_index][b] = negate( hSpatParamRendCom->azimuth[meta_write_index][b] );
+                        move16();
+                    }
+
+                    L_tmp = L_abs( q_direction->band_data[band].elevation_fx[block] );
+                    hSpatParamRendCom->elevation[meta_write_index][b] = extract_h( L_shr( L_tmp, 6 ) );
                     move16();
+
+                    IF( q_direction->band_data[band].elevation_fx[block] < 0 )
+                    {
+                        hSpatParamRendCom->elevation[meta_write_index][b] = negate( hSpatParamRendCom->elevation[meta_write_index][b] );
+                        move16();
+                    }
+
                     hSpatParamRendCom->energy_ratio1_fx[meta_write_index][b] = q_direction->band_data[band].energy_ratio_fx[block];
                     move32();
                     hSpatParamRendCom->diffuseness_vector_fx[meta_write_index][b] = L_sub( ONE_IN_Q30, q_direction->band_data[band].energy_ratio_fx[block] );
@@ -1500,10 +1511,25 @@ void ivas_qmetadata_to_dirac_fx(
                 {
                     FOR( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
                     {
-                        hSpatParamRendCom->azimuth2[meta_write_index][b] = extract_h( L_shr( q_direction->band_data[band].azimuth_fx[block], 6 ) );
+                        /* Right shifting -1 -> -1, Hence this change is done */
+                        Word32 L_tmp = L_abs( q_direction->band_data[band].azimuth_fx[block] );
+                        hSpatParamRendCom->azimuth2[meta_write_index][b] = extract_h( L_shr( L_tmp, 6 ) );
                         move16();
-                        hSpatParamRendCom->elevation2[meta_write_index][b] = extract_h( L_shr( q_direction->band_data[band].elevation_fx[block], 6 ) );
+                        IF( q_direction->band_data[band].azimuth_fx[block] < 0 )
+                        {
+                            hSpatParamRendCom->azimuth2[meta_write_index][b] = negate( hSpatParamRendCom->azimuth2[meta_write_index][b] );
+                            move16();
+                        }
+
+                        L_tmp = L_abs( q_direction->band_data[band].elevation_fx[block] );
+                        hSpatParamRendCom->elevation2[meta_write_index][b] = extract_h( L_shr( L_tmp, 6 ) );
                         move16();
+                        IF( q_direction->band_data[band].elevation_fx[block] < 0 )
+                        {
+                            hSpatParamRendCom->elevation2[meta_write_index][b] = negate( hSpatParamRendCom->elevation2[meta_write_index][b] );
+                            move16();
+                        }
+
                         hSpatParamRendCom->energy_ratio2_fx[meta_write_index][b] = q_direction->band_data[band].energy_ratio_fx[block];
                         move32();
                         hSpatParamRendCom->diffuseness_vector_fx[meta_write_index][b] = L_sub( hSpatParamRendCom->diffuseness_vector_fx[meta_write_index][b], q_direction->band_data[band].energy_ratio_fx[block] );
@@ -2097,7 +2123,7 @@ void ivas_dirac_dec_render_fx(
         output_f_local_fx[ch] = output_f_local_buff_fx[ch];
         set_zero_fx( output_f_local_fx[ch], nSamplesAsked );
     }
-    slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); // cL
+    slot_size = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); // cL
 
 
     /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */
@@ -2119,11 +2145,7 @@ void ivas_dirac_dec_render_fx(
 
     FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
     {
-#ifdef MSAN_FIX
         ivas_dirac_dec_render_sf_fx( st_ivas, output_f_local_fx, nchan_transport, NULL, NULL );
-#else
-        ivas_dirac_dec_render_sf_fx( st_ivas, output_f_local, nchan_transport, NULL, NULL );
-#endif // MSAN_FIX
 
         n_samples_sf = i_mult( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->slot_size );
 
@@ -2195,6 +2217,25 @@ void ivas_dirac_dec_render_sf_fx(
     move16();
     move16();
 
+
+    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+    {
+        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+        {
+            set32_fx( Cldfb_RealBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+            set32_fx( Cldfb_ImagBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+        }
+    }
+
+    FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
+    {
+        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+        {
+            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+        }
+    }
+
     /* local copies of azi, ele, diffuseness */
     Word16 azimuth[CLDFB_NO_CHANNELS_MAX];
     Word16 elevation[CLDFB_NO_CHANNELS_MAX];
@@ -2210,27 +2251,29 @@ void ivas_dirac_dec_render_sf_fx(
     Word32 Cldfb_RealBuffer_Temp_fx[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
     Word32 Cldfb_ImagBuffer_Temp_fx[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
     Word16 cldfb_buf_q;
-    Word16 offset, buff_len;
+    Word16 offset = 0, buff_len = 0;
+    move16();
+    move16();
     Word16 q_cldfb, q_temp_cldfb = 0;
     move16();
     Word16 proto_length = 0;
     move16();
-    Word16 q_proto_direct_buffer[CLDFB_SLOTS_PER_SUBFRAME];
-    Word16 q_proto_diffuse_buffer[CLDFB_SLOTS_PER_SUBFRAME];
+    Word16 q_proto_direct_buffer[CLDFB_SLOTS_PER_SUBFRAME + 1];
+    Word16 q_proto_diffuse_buffer[CLDFB_SLOTS_PER_SUBFRAME + 1];
     Word16 size, size_ho;
 
     DIRAC_DEC_STACK_MEM DirAC_mem;
     Word32 *p_onset_filter_fx = NULL;
-    uint16_t coherence_flag;
+    UWord16 coherence_flag;
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
     Word16 scale = 0;
     move16();
     DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params;
     DIRAC_OUTPUT_SYNTHESIS_STATE *h_dirac_output_synthesis_state;
     Word16 num_channels_dir, exp;
-#ifdef FIX_867
-    Word16 q_diffuseness_vector = Q31;
-    Word16 q_reference_power_smooth[CLDFB_SLOTS_PER_SUBFRAME * MAX_OUTPUT_CHANNELS];
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 q_diffuseness_vector = Q31, q_reference_power_smooth[2] = { Q31, Q31 };
+    move16();
 #else
     Word16 q_diffuseness_vector = Q31, q_reference_power_smooth = Q31;
 #endif
@@ -2241,9 +2284,6 @@ void ivas_dirac_dec_render_sf_fx(
     Word16 tmp1;
 
     push_wmops( "ivas_dirac_dec_render" );
-#ifdef FIX_867
-    set16_fx( q_reference_power_smooth, Q31, CLDFB_SLOTS_PER_SUBFRAME * MAX_OUTPUT_CHANNELS );
-#endif
 
     /* Initialize aux buffers */
     hDirAC = st_ivas->hDirAC;
@@ -2272,8 +2312,8 @@ void ivas_dirac_dec_render_sf_fx(
     }
     q_cldfb = Q11;
     move16();
-    set16_fx( q_proto_direct_buffer, hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME );
-    set16_fx( q_proto_diffuse_buffer, hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME );
+    set16_fx( q_proto_direct_buffer, hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME + 1 );
+    set16_fx( q_proto_diffuse_buffer, hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME + 1 );
     set_zero_fx( surCohRatio_fx, CLDFB_NO_CHANNELS_MAX );
 
     IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_MONO ) )
@@ -2316,47 +2356,15 @@ void ivas_dirac_dec_render_sf_fx(
     test();
     IF( h_dirac_output_synthesis_params->use_onset_filters && ( NE_16( hDirAC->hConfig->dec_param_estim, TRUE ) && NE_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) ) )
     {
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ); kk++ )
-        {
-            tmp1 = norm_l( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk] );
-            h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk] =
-                L_shl( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk], sub( tmp1, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] ) ); // tmp1
-            h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] = tmp1;
-            move16();
-        }
-#else
         tmp1 = getScaleFactor32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ) );
         scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ), sub( tmp1, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) ); // tmp1
         h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = tmp1;
         move16();
-#endif
     }
 
     test();
     IF( EQ_16( hDirAC->hConfig->dec_param_estim, TRUE ) && NE_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ); kk++ )
-        {
-            Word16 shift;
-            shift = L_norm_arr( &h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx[kk], 1 );
-
-            h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx[kk], shift ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth + shift
-            h_dirac_output_synthesis_state->q_cy_auto_dir_smooth[kk] = add( h_dirac_output_synthesis_state->q_cy_auto_dir_smooth[kk], shift );
-            move16();
-
-            shift = norm_l( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] );
-            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], 1 ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth + shift
-            h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk] = add( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk], shift );
-            move16();
-
-            tmp1 = norm_l( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk] );
-            h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk], tmp1 ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth + tmp1
-            h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk], tmp1 );
-            move16();
-        }
-#else
         Word16 shift;
         shift = L_norm_arr( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ) );
         scale_sig32( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ), shift ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth + shift
@@ -2370,7 +2378,6 @@ void ivas_dirac_dec_render_sf_fx(
         scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ), tmp1 ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth + tmp1
         h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, tmp1 );
         move16();
-#endif
     }
 
 
@@ -2466,45 +2473,13 @@ void ivas_dirac_dec_render_sf_fx(
         size_ho = size;
         move16();
     }
-#ifdef FIX_867
-    FOR( Word16 kk = 0; kk < size; kk++ )
-    {
-        hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk] ) ); // Q26
-    }
-    set16_fx( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q, Q26, size );
-#else
     scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx, size, sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q ) ); // Q26
     hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q = Q26;
     move16();
-#endif
 
     IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
         Word16 shift;
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < size_ho; kk++ )
-        {
-            shift = norm_l( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk] );
-            hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk], shift ); // Q(hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth + shift)
-            hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[kk], shift );
-            move16();
-
-            L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk] ) ); // Q26
-            hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk] = Q26;
-            move16();
-        }
-
-        FOR( Word16 kk = 0; kk < imult1616( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ); kk++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth[kk] ) ); // Q26
-            set16_fx( &hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth[kk], Q26, 1 );
-            move16();
-
-            hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk] ) ); // Q26
-            set16_fx( &hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk], Q26, 1 );
-            move16();
-        }
-#else
         shift = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx, size_ho );
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx, size_ho, shift ); // Q(hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth + shift)
         hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth = add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth, shift );
@@ -2521,42 +2496,10 @@ void ivas_dirac_dec_render_sf_fx(
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx, imult1616( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ), sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev ) ); // Q26
         hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev = Q26;
         move16();
-#endif
     }
     ELSE
     {
         Word16 shift;
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->hOutSetup.nchan_out_woLFE ); kk++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk] ) ); // Q26
-            hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk] = Q26;
-            move16();
-        }
-
-        FOR( Word16 kk = 0; kk < size_ho; kk++ )
-        {
-            shift = norm_l( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx[kk] );
-            hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx[kk], shift ); // Q( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev+ shift)
-            hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev[kk], shift );
-            move16();
-
-
-            shift = norm_l( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[kk] );
-            hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[kk], shift ); // Q(hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev + shift)
-            hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk] =
-                add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk], shift );
-            move16();
-        }
-
-        FOR( Word16 kk = 0; kk < imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->hOutSetup.nchan_out_woLFE ); kk++ )
-        {
-            tmp1 = norm_l( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk] );
-            hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk], tmp1 ); // Q(hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev+ tmp1)
-            hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk], tmp1 );
-            move16();
-        }
-#else
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->hOutSetup.nchan_out_woLFE ), sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q ) ); // Q26
         hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q = Q26;
         move16();
@@ -2573,12 +2516,37 @@ void ivas_dirac_dec_render_sf_fx(
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->hOutSetup.nchan_out_woLFE ), tmp1 ); // Q(hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev+ tmp1)
         hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev, tmp1 );
         move16();
-#endif
-
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        tmp1 = 31;
+        move16();
+        FOR( i = 0; i < i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_protos_dir ); i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            tmp1 = s_min( tmp1, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        }
+        FOR( i = 0; i < i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_protos_dir ); i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), tmp1 ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q tmp1)
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0], tmp1 );
+        move16();
+        tmp1 = 31;
+        move16();
+        FOR( i = 0; i < i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_protos_dir ); i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            tmp1 = s_min( tmp1, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF + i, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+        }
+        FOR( i = 0; i < i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_protos_dir ); i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF + i, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), tmp1 ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q tmp1)
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1], tmp1 );
+        move16();
+#else
         tmp1 = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, imult1616( hDirACRend->num_protos_dir, hSpatParamRendCom->num_freq_bands ) );
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, imult1616( hDirACRend->num_protos_dir, hSpatParamRendCom->num_freq_bands ), tmp1 ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q tmp1)
         hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q, tmp1 );
         move16();
+#endif
         IF( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx != 0 )
         {
             tmp1 = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx, imult1616( hDirACRend->h_output_synthesis_psd_params.max_band_decorr, hDirACRend->hOutSetup.nchan_out_woLFE ) );
@@ -2697,7 +2665,7 @@ void ivas_dirac_dec_render_sf_fx(
                     hDirACRend->h_output_synthesis_psd_state.direct_power_factor_fx[i] = L_add( hDirACRend->h_output_synthesis_psd_state.direct_power_factor_fx[i], surCohEner_fx ); // Q29
                     move32();
 
-                    surCohRatio_fx[i] = BASOP_Util_Divide3232_Scale_cadence( surCohEner_fx, ( L_add( EPSILLON_FX, L_add( dirEne_fx, surCohEner_fx ) ) ), &temp_q );
+                    surCohRatio_fx[i] = BASOP_Util_Divide3232_Scale_newton( surCohEner_fx, ( L_add( EPSILLON_FX, L_add( dirEne_fx, surCohEner_fx ) ) ), &temp_q );
                     move32();
                     surCohRatio_fx[i] = L_shl( surCohRatio_fx[i], sub( temp_q, 16 ) ); // Q15
                     move32();
@@ -2923,7 +2891,7 @@ void ivas_dirac_dec_render_sf_fx(
                                                &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                                hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx,
                                                &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                reference_power_fx, DirAC_mem.reference_power_q,
 #else
                                                reference_power_fx, &DirAC_mem.reference_power_q,
@@ -2940,7 +2908,7 @@ void ivas_dirac_dec_render_sf_fx(
                                                &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                                hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx,
                                                &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                reference_power_fx, DirAC_mem.reference_power_q,
 #else
                                                reference_power_fx, &DirAC_mem.reference_power_q,
@@ -2963,13 +2931,17 @@ void ivas_dirac_dec_render_sf_fx(
                                         hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                         &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                         reference_power_fx,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                         DirAC_mem.reference_power_q,
 #else
                                         &DirAC_mem.reference_power_q,
 #endif
                                         hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                                        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#else
                                         &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                         0, slot_idx, hSpatParamRendCom->num_freq_bands, hDirACRend->masa_stereo_type_detect,
                                         q_cldfb );
 
@@ -2993,13 +2965,17 @@ void ivas_dirac_dec_render_sf_fx(
                                                 hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                                 reference_power_fx,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                 DirAC_mem.reference_power_q,
 #else
                                                 &DirAC_mem.reference_power_q,
 #endif
                                                 hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#else
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                                 slot_idx, hDirACRend->num_outputs_diff,
                                                 hSpatParamRendCom->num_freq_bands,
                                                 hDirACRend->hoa_decoder,
@@ -3014,13 +2990,17 @@ void ivas_dirac_dec_render_sf_fx(
                                                 hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                                 reference_power_fx,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                 DirAC_mem.reference_power_q,
 #else
                                                 &DirAC_mem.reference_power_q,
 #endif
                                                 hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#else
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                                 hDirACRend->hOutSetup.is_loudspeaker_setup,
                                                 slot_idx,
                                                 hSpatParamRendCom->num_freq_bands,
@@ -3043,13 +3023,17 @@ void ivas_dirac_dec_render_sf_fx(
                                                 hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                                 reference_power_fx,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                 DirAC_mem.reference_power_q,
 #else
                                                 &DirAC_mem.reference_power_q,
 #endif
                                                 hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#else
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                                 slot_idx,
                                                 hDirACRend->num_protos_diff,
                                                 hSpatParamRendCom->num_freq_bands, q_cldfb );
@@ -3112,11 +3096,9 @@ void ivas_dirac_dec_render_sf_fx(
                                        num_freq_bands, azimuth, elevation );
 
             Copy32( reference_power_fx, &( hDirACRend->buffer_energy_fx[i_mult( sub( index, 1 ), num_freq_bands )] ), num_freq_bands );
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < num_freq_bands; kk++ )
-            {
-                hDirACRend->q_buffer_energy[( index - 1 ) * num_freq_bands + kk] = DirAC_mem.reference_power_q[kk];
-            }
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            Scale_sig32( &( hDirACRend->buffer_energy_fx[add( i_mult( sub( index, 1 ), num_freq_bands ), CLDFB_NO_CHANNELS_HALF )] ), s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_q[1] ) );
+            hDirACRend->q_buffer_energy[index - 1] = DirAC_mem.reference_power_q[0];
 #else
             hDirACRend->q_buffer_energy[index - 1] = DirAC_mem.reference_power_q;
 #endif
@@ -3150,7 +3132,11 @@ void ivas_dirac_dec_render_sf_fx(
 
                 v_multc_fixed( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands );
 
+#ifdef VEC_ARITH_OPT_v1
+                v_add_fixed_no_hdrm( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
+#else                                                                                                                                          /* VEC_ARITH_OPT_v1 */
                 v_add_fixed( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands, 0 ); /* Q31 */
+#endif                                                                                                                                         /* VEC_ARITH_OPT_v1 */
                 p_onset_filter_fx = onset_filter_subframe_fx;
             }
             ELSE
@@ -3244,20 +3230,10 @@ void ivas_dirac_dec_render_sf_fx(
             h_dirac_output_synthesis_state->diffuse_power_factor_q = Q31;
             move16();
 
-#ifdef FIX_867
-            FOR( Word16 l = 0; l < i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ); l++ )
-            {
-                exp = norm_l( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[l] );
-                h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[l] = L_shl( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[l], exp ); // h_dirac_output_synthesis_state->q_cy_auto_diff_smooth + exp
-                h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[l] = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[l], exp );
-                move16();
-            }
-#else
             exp = getScaleFactor32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ), exp ); // h_dirac_output_synthesis_state->q_cy_auto_diff_smooth + exp
             h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, exp );
             move16();
-#endif
         }
 
         test();
@@ -3278,25 +3254,7 @@ void ivas_dirac_dec_render_sf_fx(
             scale_sig32( h_dirac_output_synthesis_state->direct_responses_square_fx, i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ), sub( Q31, h_dirac_output_synthesis_state->direct_responses_square_q ) ); // Q31
             h_dirac_output_synthesis_state->direct_responses_square_q = Q31;
             move16();
-#ifdef FIX_867
-            FOR( Word16 l = 0; l < i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ); l++ )
-            {
-                exp = getScaleFactor32( &h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx[l], 1 );
-                scale_sig32( &h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx[l], 1, exp ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, exp
-                h_dirac_output_synthesis_state->q_cy_auto_dir_smooth[l] = add( h_dirac_output_synthesis_state->q_cy_auto_dir_smooth[l], exp );
-                move16();
 
-                exp = getScaleFactor32( &h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[l], 1 );
-                scale_sig32( &h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[l], 1, exp ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth+ exp
-                h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[l] = add( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[l], exp );
-                move16();
-
-                exp = getScaleFactor32( &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[l], 1 );
-                scale_sig32( &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[l], 1, exp ); // h_dirac_output_synthesis_state->q_cy_auto_diff_smooth+ exp
-                h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[l] = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[l], exp );
-                move16();
-            }
-#else
             exp = getScaleFactor32( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ), exp ); // h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, exp
             h_dirac_output_synthesis_state->q_cy_auto_dir_smooth = add( h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, exp );
@@ -3309,7 +3267,6 @@ void ivas_dirac_dec_render_sf_fx(
             scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, i_mult( num_channels_dir, hSpatParamRendCom->num_freq_bands ), exp ); // h_dirac_output_synthesis_state->q_cy_auto_diff_smooth+ exp
             h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, exp );
             move16();
-#endif
         }
 
         test();
@@ -3380,53 +3337,17 @@ void ivas_dirac_dec_render_sf_fx(
 
         IF( NE_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
         {
-#ifdef FIX_867
-            FOR( i = 0; i < hSpatParamRendCom->num_freq_bands; i++ )
-            {
-                IF( LT_16( q_reference_power_smooth[i], DirAC_mem.reference_power_q[i] ) )
-                {
-                    Word32 temp;
-                    temp = L_shl( reference_power_fx[i], sub( q_reference_power_smooth[i], DirAC_mem.reference_power_q[i] ) );
-                    test();
-                    IF( temp == 0 && ( reference_power_fx[i] != 0 ) )
-                    {
-                        reference_power_fx[i] = 1;
-                    }
-                    ELSE
-                    {
-                        reference_power_fx[i] = temp;
-                    }
-                    move32();
-
-                    DirAC_mem.reference_power_q[i] = q_reference_power_smooth[i];
-                    move16();
-                }
-                ELSE
-                {
-                    Word32 temp;
-                    temp = L_shl( reference_power_smooth_fx[i], sub( DirAC_mem.reference_power_q[i], q_reference_power_smooth[i] ) );
-                    test();
-                    IF( temp == 0 && ( reference_power_smooth_fx[i] != 0 ) )
-                    {
-                        reference_power_smooth_fx[i] = 1;
-                    }
-                    ELSE
-                    {
-                        reference_power_smooth_fx[i] = temp;
-                    }
-                    move32();
-                    q_reference_power_smooth[i] = DirAC_mem.reference_power_q[i];
-                    move16();
-                }
-                q_reference_power_smooth[i] = sub( q_reference_power_smooth[i], 1 );
-
-                reference_power_smooth_fx[i] = L_add( L_shr( reference_power_smooth_fx[i], 1 ),
-                                                      L_shr( reference_power_fx[i], 1 ) );
-                Word16 shift;
-                shift = norm_l( reference_power_smooth_fx[i] );
-                reference_power_smooth_fx[i] = L_shl( reference_power_smooth_fx[i], shift );
-                q_reference_power_smooth[i] = add( q_reference_power_smooth[i], shift );
-            }
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            v_add_fixed_me( reference_power_fx, sub( 31, DirAC_mem.reference_power_q[0] ),
+                            reference_power_smooth_fx, sub( 31, q_reference_power_smooth[0] ),
+                            reference_power_smooth_fx, &temp_q,
+                            s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 1 );
+            q_reference_power_smooth[0] = sub( 31, temp_q );
+            v_add_fixed_me( reference_power_fx + CLDFB_NO_CHANNELS_HALF, sub( 31, DirAC_mem.reference_power_q[1] ),
+                            reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, sub( 31, q_reference_power_smooth[1] ),
+                            reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, &temp_q,
+                            s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 );
+            q_reference_power_smooth[1] = sub( 31, temp_q );
 #else
             IF( LT_16( q_reference_power_smooth, DirAC_mem.reference_power_q ) )
             {
@@ -3474,22 +3395,21 @@ void ivas_dirac_dec_render_sf_fx(
         }
     }
 
-    minimum_s( q_proto_direct_buffer, hSpatParamRendCom->subframe_nbslots[subframe_idx], &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q );
+    minimum_s( q_proto_direct_buffer, add( hSpatParamRendCom->subframe_nbslots[subframe_idx], 1 ), &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q );
     IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
-        minimum_s( q_proto_diffuse_buffer, hSpatParamRendCom->subframe_nbslots[subframe_idx], &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q );
+        minimum_s( q_proto_diffuse_buffer, add( hSpatParamRendCom->subframe_nbslots[subframe_idx], 1 ), &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q );
     }
     FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )
     {
         IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
         {
-            offset = i_mult( i_mult( slot_idx, 2 ), i_mult( hSpatParamRendCom->num_freq_bands, nchan_transport ) );
-            buff_len = i_mult( 2, i_mult( nchan_transport, hSpatParamRendCom->num_freq_bands ) );
-            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx + offset, buff_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, q_proto_direct_buffer[slot_idx] ) ); // proto_direct_buffer_f_q
-
             offset = i_mult( i_mult( slot_idx, 2 ), i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff ) );
             buff_len = i_mult( 2, i_mult( hDirACRend->num_outputs_diff, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx + offset, buff_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, q_proto_diffuse_buffer[slot_idx] ) ); // proto_diffuse_buffer_f_q
+            offset = i_mult( i_mult( slot_idx, 2 ), i_mult( hSpatParamRendCom->num_freq_bands, nchan_transport ) );
+            buff_len = i_mult( 2, i_mult( nchan_transport, hSpatParamRendCom->num_freq_bands ) );
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx + offset, buff_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, q_proto_direct_buffer[slot_idx] ) ); // proto_direct_buffer_f_q
         }
         ELSE IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_MONO ) )
         {
@@ -3529,10 +3449,18 @@ void ivas_dirac_dec_render_sf_fx(
                     BREAK;
             }
         }
-        q_proto_direct_buffer[slot_idx] = hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q;
-        move16();
     }
-
+    test();
+    IF( EQ_16( slot_idx, hSpatParamRendCom->subframe_nbslots[subframe_idx] ) && sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len, add( offset, buff_len ) ) > 0 )
+    {
+        scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx + add( offset, buff_len ), sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len, add( offset, buff_len ) ), sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, q_proto_direct_buffer[slot_idx] ) ); // proto_direct_buffer_f_q
+        offset = i_mult( i_mult( sub( slot_idx, 1 ), 2 ), i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff ) );
+        buff_len = i_mult( 2, i_mult( hDirACRend->num_outputs_diff, hSpatParamRendCom->num_freq_bands ) );
+        IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) && sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len, add( offset, buff_len ) ) > 0 )
+        {
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx + add( offset, buff_len ), sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len, add( offset, buff_len ) ), sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, q_proto_diffuse_buffer[slot_idx] ) ); // proto_direct_buffer_f_q
+        }
+    }
     ivas_dirac_dec_output_synthesis_get_interpolator_fx( &hDirACRend->h_output_synthesis_psd_params, hSpatParamRendCom->subframe_nbslots[subframe_idx] );
 
     size = i_mult( hDirACRend->num_outputs_dir, hSpatParamRendCom->num_freq_bands );
@@ -3548,23 +3476,6 @@ void ivas_dirac_dec_render_sf_fx(
 
     IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
-#ifdef FIX_867
-        FOR( Word16 l = 0; l < 0; l++ )
-        {
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[l], Q26 ) )
-            {
-                hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[l] =
-                    L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[l], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[l] ) ); // Q26
-                hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[l] = Q26;
-            }
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[l], Q26 ) )
-            {
-                hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[l] =
-                    L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[l], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[l] ) ); // Q26
-                hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[l] = Q26;
-            }
-        }
-#else
         IF( NE_16( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth, Q26 ) )
         {
             Scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx, size_ho, sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth ) ); // Q26
@@ -3575,7 +3486,6 @@ void ivas_dirac_dec_render_sf_fx(
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx, size_ho, sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev ) ); // Q26
         }
-#endif
         IF( NE_16( hDirACRend->h_output_synthesis_psd_state.direct_power_factor_q, Q31 ) )
         {
             Scale_sig32( hDirACRend->h_output_synthesis_psd_state.direct_power_factor_fx, h_dirac_output_synthesis_state->diff_dir_power_factor_len, sub( Q31, hDirACRend->h_output_synthesis_psd_state.direct_power_factor_q ) ); // Q31
@@ -3588,20 +3498,6 @@ void ivas_dirac_dec_render_sf_fx(
         {
             Scale_sig32( hDirACRend->h_output_synthesis_psd_state.diffuse_power_factor_fx, h_dirac_output_synthesis_state->diff_dir_power_factor_len, sub( Q31, hDirACRend->h_output_synthesis_psd_state.diffuse_power_factor_q ) ); // Q31
         }
-#ifdef FIX_867
-        FOR( Word16 l = 0; l < i_mult( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ); l++ )
-        {
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth[l], Q26 ) )
-            {
-                hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx[l] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx[l], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth[l] ) ); // Q26
-            }
-
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[l], Q26 ) )
-            {
-                hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[l] = L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[l], sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[l] ) ); // Q26
-            }
-        }
-#else
         IF( NE_16( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth, Q26 ) )
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx, i_mult( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ), sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth ) ); // Q26
@@ -3610,28 +3506,10 @@ void ivas_dirac_dec_render_sf_fx(
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx, i_mult( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ), sub( Q26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev ) ); // Q26
         }
-#endif
         IF( NE_16( q_diffuseness_vector, Q30 ) )
         {
             scale_sig32( diffuseness_vector_fx, hSpatParamRendCom->num_freq_bands, sub( Q30, q_diffuseness_vector ) ); // Q30
         }
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < size; kk++ )
-        {
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk], Q26 ) )
-            {
-                hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk] ) ); // Q26
-            }
-        }
-
-        FOR( Word16 kk = 0; kk < i_mult( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ); kk++ )
-        {
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk], Q26 ) )
-            {
-                hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx[kk] = L_shl( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx[kk], sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk] ) ); // Q26
-            }
-        }
-#else
         IF( NE_16( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q, Q26 ) )
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx, size, sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q ) ); // Q26
@@ -3640,7 +3518,6 @@ void ivas_dirac_dec_render_sf_fx(
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx, i_mult( hDirACRend->num_outputs_diff, hDirACRend->h_output_synthesis_psd_params.max_band_decorr ), sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q ) ); // Q26
         }
-#endif
 
         ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx( Cldfb_RealBuffer_fx,
                                                                       Cldfb_ImagBuffer_fx,
@@ -3652,13 +3529,8 @@ void ivas_dirac_dec_render_sf_fx(
                                                                       diffuseness_vector_fx,
                                                                       hodirac_flag,
                                                                       hDirAC->hConfig->dec_param_estim,
-#ifdef FIX_867
-                                                                      hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev,
-                                                                      hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev );
-#else
                                                                       &hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev,
                                                                       &hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev );
-#endif
 
         test();
         IF( hDirACRend->hOutSetup.is_loudspeaker_setup && hDirACRend->hoa_decoder != NULL )
@@ -3667,16 +3539,8 @@ void ivas_dirac_dec_render_sf_fx(
             {
                 FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )
                 {
-#ifdef FIX_867
-                    FOR( Word16 l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
-                    {
-                        scale_sig32( &Cldfb_RealBuffer_fx[ch][slot_idx][l], 1, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[ch * hSpatParamRendCom->num_freq_bands + l], 33 ) ) ) ); // Q6
-                        scale_sig32( &Cldfb_ImagBuffer_fx[ch][slot_idx][l], 1, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[ch * hSpatParamRendCom->num_freq_bands + l], 33 ) ) ) ); // Q6
-                    }
-#else
                     scale_sig32( Cldfb_RealBuffer_fx[ch][slot_idx], hSpatParamRendCom->num_freq_bands, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev, 33 ) ) ) ); // Q6
                     scale_sig32( Cldfb_ImagBuffer_fx[ch][slot_idx], hSpatParamRendCom->num_freq_bands, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev, 33 ) ) ) ); // Q6
-#endif
                 }
             }
         }
@@ -3686,16 +3550,8 @@ void ivas_dirac_dec_render_sf_fx(
             {
                 FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )
                 {
-#ifdef FIX_867
-                    FOR( Word16 l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
-                    {
-                        scale_sig32( &Cldfb_RealBuffer_fx[ch][slot_idx][l], 1, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[ch * hSpatParamRendCom->num_freq_bands + l], 33 ) ) ) ); // Q6
-                        scale_sig32( &Cldfb_ImagBuffer_fx[ch][slot_idx][l], 1, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[ch * hSpatParamRendCom->num_freq_bands + l], 33 ) ) ) ); // Q6
-                    }
-#else
                     scale_sig32( Cldfb_RealBuffer_fx[ch][slot_idx], hSpatParamRendCom->num_freq_bands, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev, 33 ) ) ) ); // Q6
                     scale_sig32( Cldfb_ImagBuffer_fx[ch][slot_idx], hSpatParamRendCom->num_freq_bands, sub( Q6, add( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, sub( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev, 33 ) ) ) ); // Q6
-#endif
                 }
             }
         }
@@ -3734,39 +3590,49 @@ void ivas_dirac_dec_render_sf_fx(
             Scale_sig32( hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx, i_mult( hDirACRend->num_outputs_dir, hSpatParamRendCom->num_freq_bands ), sub( Q31, hDirACRend->h_output_synthesis_psd_state.direct_responses_square_q ) ); // Q31
         }
 
-#ifdef FIX_867
-        FOR( i = 0; i < hSpatParamRendCom->num_freq_bands; i++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        exp = L_norm_arr( reference_power_smooth_fx, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) );
+        scale_sig32( reference_power_smooth_fx, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), exp ); // q_reference_power_smooth[0] + exp
+        q_reference_power_smooth[0] = add( q_reference_power_smooth[0], exp );
+        IF( LT_16( q_reference_power_smooth[0], hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0] ) )
         {
-            exp = norm_l( reference_power_smooth_fx[i] );
-            reference_power_smooth_fx[i] = L_shl( reference_power_smooth_fx[i], exp ); // q_reference_power_smooth + exp
-            q_reference_power_smooth[i] = add( q_reference_power_smooth[i], exp );
-
-            IF( LT_16( q_reference_power_smooth[i], hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[i] ) )
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_reference_power_smooth[0], hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0] ) ); // q_reference_power_smooth[0]
+            hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0] = q_reference_power_smooth[0];
+            move16();
+        }
+        ELSE
+        {
+            Word32 temp;
+            FOR( i = 0; i < s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ); i++ )
             {
-                hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx[i] = L_shl( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx[i],
-                                                                                                    sub( q_reference_power_smooth[i], hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[i] ) ); // q_reference_power_smooth
-                hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[i] = q_reference_power_smooth[i];
-                move16();
+                temp = L_shl( reference_power_smooth_fx[i], sub( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0], q_reference_power_smooth[0] ) );
+                reference_power_smooth_fx[i] = L_max( temp, L_min( reference_power_smooth_fx[i], 1 ) );
+                move32();
             }
-            ELSE
+            q_reference_power_smooth[0] = hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0];
+            move16();
+        }
+
+        exp = L_norm_arr( reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        scale_sig32( reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), exp ); // q_reference_power_smooth + exp
+        q_reference_power_smooth[1] = add( q_reference_power_smooth[1], exp );
+        IF( LT_16( q_reference_power_smooth[1], hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1] ) )
+        {
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_reference_power_smooth[1], hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1] ) ); // q_reference_power_smooth
+            hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1] = q_reference_power_smooth[1];
+            move16();
+        }
+        ELSE
+        {
+            Word32 temp;
+            FOR( i = CLDFB_NO_CHANNELS_HALF; i < hSpatParamRendCom->num_freq_bands; i++ )
             {
-                Word32 temp;
-                temp = L_shl( reference_power_smooth_fx[i],
-                              sub( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[i],
-                                   q_reference_power_smooth[i] ) );
-                test();
-                IF( temp == 0 && ( reference_power_smooth_fx[i] != 0 ) )
-                {
-                    reference_power_smooth_fx[i] = 1;
-                }
-                ELSE
-                {
-                    reference_power_smooth_fx[i] = temp;
-                }
+                temp = L_shl( reference_power_smooth_fx[i], sub( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1], q_reference_power_smooth[1] ) );
+                reference_power_smooth_fx[i] = L_max( temp, L_min( reference_power_smooth_fx[i], 1 ) );
                 move32();
-                q_reference_power_smooth[i] = hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[i];
-                move16();
             }
+            q_reference_power_smooth[1] = hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1];
+            move16();
         }
 #else
         exp = L_norm_arr( reference_power_smooth_fx, hSpatParamRendCom->num_freq_bands );
@@ -3819,6 +3685,69 @@ void ivas_dirac_dec_render_sf_fx(
             }
         }
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        exp = 31;
+        move16();
+        FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            exp = s_min( exp, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + i, s_min( CLDFB_NO_CHANNELS_HALF, hSpatParamRendCom->num_freq_bands ) ) );
+        }
+        FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + i, s_min( CLDFB_NO_CHANNELS_HALF, hSpatParamRendCom->num_freq_bands ), exp ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q + exp)
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], exp );
+        move16();
+        exp = 31;
+        move16();
+        FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            exp = s_min( exp, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + i, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+        }
+        FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + i, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), exp ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q + exp)
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], exp );
+        move16();
+
+        IF( LT_16( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] ) )
+        {
+            FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + i, s_min( CLDFB_NO_CHANNELS_HALF, hSpatParamRendCom->num_freq_bands ), sub( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] ) ); // proto_power_smooth_q
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] = hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0];
+            move16();
+        }
+        ELSE
+        {
+            FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + i, s_min( CLDFB_NO_CHANNELS_HALF, hSpatParamRendCom->num_freq_bands ), sub( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] ) ); // proto_power_smooth_prev_q
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] = hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0];
+            move16();
+        }
+        IF( LT_16( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] ) )
+        {
+            FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF + i, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] ) ); // proto_power_smooth_q
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] = hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1];
+            move16();
+        }
+        ELSE
+        {
+            FOR( i = 0; proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + i, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] ) ); // proto_power_smooth_prev_q
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] = hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1];
+            move16();
+        }
+#else
         exp = getScaleFactor32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx, proto_power_smooth_len );
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx, proto_power_smooth_len, exp ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q + exp)
         hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, exp );
@@ -3835,6 +3764,7 @@ void ivas_dirac_dec_render_sf_fx(
             hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q = hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q;
             move16();
         }
+#endif
 
         exp = getScaleFactor32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx, i_mult( hDirACRend->h_output_synthesis_psd_params.max_band_decorr, hDirACRend->hOutSetup.nchan_out_woLFE ) );
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx, i_mult( hDirACRend->h_output_synthesis_psd_params.max_band_decorr, hDirACRend->hOutSetup.nchan_out_woLFE ), exp ); // Q(hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q + exp)
@@ -3855,25 +3785,7 @@ void ivas_dirac_dec_render_sf_fx(
                 move16();
             }
         }
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < size; kk++ )
-        {
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk], Q26 ) )
-            {
-                scale_sig32( &hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx[kk], 1,
-                             sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk] ) ); // Q26
-            }
-        }
 
-        FOR( Word16 kk = 0; kk < i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->hOutSetup.nchan_out_woLFE ); kk++ )
-        {
-            IF( NE_16( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk], Q26 ) )
-            {
-                scale_sig32( &hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx[kk], 1,
-                             sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk] ) ); // Q26
-            }
-        }
-#else
         IF( NE_16( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q, Q26 ) )
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx, size, sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q ) ); // Q26
@@ -3882,7 +3794,6 @@ void ivas_dirac_dec_render_sf_fx(
         {
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx, i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->hOutSetup.nchan_out_woLFE ), sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q ) ); // Q26
         }
-#endif
         IF( hDirACRend->proto_signal_decorr_on )
         {
             Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx, hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q ) ); // proto_direct_buffer_f_q
@@ -3897,7 +3808,7 @@ void ivas_dirac_dec_render_sf_fx(
                                                                     hSpatParamRendCom->subframe_nbslots[subframe_idx],
                                                                     diffuseness_vector_fx,
                                                                     reference_power_smooth_fx,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                                     q_reference_power_smooth,
 #else
                                                                     &q_reference_power_smooth,
@@ -3906,6 +3817,28 @@ void ivas_dirac_dec_render_sf_fx(
                                                                     hDirAC->hConfig->enc_param_start_band,
                                                                     &q_Cldfb );
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        Word16 allZero = 1;
+        move16();
+        FOR( i = 0; i < proto_power_smooth_len; i++ )
+        {
+            if ( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx[i] != 0 )
+            {
+                allZero = 0;
+                move16();
+            }
+        }
+        if ( allZero )
+        {
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] = 31;
+            move16();
+        }
+        if ( allZero )
+        {
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] = 31;
+            move16();
+        }
+#else
         Word16 sh = hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q;
         move16();
         hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q = 31;
@@ -3918,6 +3851,7 @@ void ivas_dirac_dec_render_sf_fx(
                 move16();
             }
         }
+#endif
 
         FOR( ch = 0; ch < hDirACRend->hOutSetup.nchan_out_woLFE; ch++ )
         {
@@ -3950,7 +3884,9 @@ void ivas_dirac_dec_render_sf_fx(
             {
                 Word16 j, k, j2, l;
                 Word16 num_objects, nchan_out_woLFE, lfe_index;
+#ifndef FIX_1379_MASA_ANGLE_ROUND
                 Word16 az1, el1;
+#endif
                 Word16 n_slots_to_render;
                 Word16 n_samples_to_render;
                 Word16 interp_offset;
@@ -3984,13 +3920,20 @@ void ivas_dirac_dec_render_sf_fx(
                         Word16 el_q0 = extract_l( L_shr( st_ivas->hIsmMetaData[i]->elevation_fx, Q22 ) );
                         Word32 az1_32, el1_32;
                         rotateAziEle_fixed( az_q0, el_q0, &az1_32, &el1_32, st_ivas->hCombinedOrientationData->Rmat_fx[0], st_ivas->hIntSetup.is_planar_setup );
+#ifndef FIX_1379_MASA_ANGLE_ROUND
                         az1 = extract_h( az1_32 );
                         el1 = extract_h( el1_32 );
+#endif
 
                         IF( st_ivas->hEFAPdata != NULL )
                         {
+#ifdef FIX_1379_MASA_ANGLE_ROUND
+                            const Word32 azi_fx = L_shl( az1_32, Q22 - Q16 ); // Q16 -> Q22
+                            const Word32 ele_fx = L_shl( el1_32, Q22 - Q16 ); // Q16 -> Q22
+#else
                             const Word32 azi_fx = L_shl( az1, Q22 ); // Q0 -> Q22
                             const Word32 ele_fx = L_shl( el1, Q22 ); // Q0 -> Q22
+#endif
                             efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azi_fx, ele_fx, EFAP_MODE_EFAP );
                         }
                     }
@@ -4091,7 +4034,11 @@ void ivas_dirac_dec_render_sf_fx(
             st_ivas->cldfbSynDec[ch]->Q_cldfb_state = ( Q6 - 1 );
             move16();
 
-            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, synth_fx, i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), st_ivas->cldfbSynDec[ch] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, synth_fx, i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), 0, 0, st_ivas->cldfbSynDec[ch] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, synth_fx, i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), 0, st_ivas->cldfbSynDec[ch] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
 
             Word16 no_col = st_ivas->cldfbSynDec[ch]->no_col;
             move16();
@@ -4194,7 +4141,11 @@ void ivas_dirac_dec_render_sf_fx(
                         ImagBuffer_fx[i] = Cldfb_ImagBuffer_fx[idx_in][i];
                         move32();
                     }
-                    cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_buf_fx[ch][subframe_start_sample] ), num_samples_subframe, st_ivas->cldfbSynDec[idx_in] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                    cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_buf_fx[ch][subframe_start_sample] ), num_samples_subframe, 0, 0, st_ivas->cldfbSynDec[idx_in] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                    cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_buf_fx[ch][subframe_start_sample] ), num_samples_subframe, 0, st_ivas->cldfbSynDec[idx_in] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE*/
 
                     IF( !st_ivas->hLsSetupCustom->separate_ch_found )
                     {
@@ -4234,7 +4185,11 @@ void ivas_dirac_dec_render_sf_fx(
                         scale_sig32( st_ivas->cldfbSynDec[cldfbSynIdx]->cldfb_state_fx, st_ivas->cldfbSynDec[cldfbSynIdx]->p_filter_length, sub( ( Q6 - 1 ), st_ivas->cldfbSynDec[cldfbSynIdx]->Q_cldfb_state ) ); // Q6-1
                         st_ivas->cldfbSynDec[cldfbSynIdx]->Q_cldfb_state = ( Q6 - 1 );
                         move16();
-                        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, p_out, samplesToProcess, st_ivas->cldfbSynDec[cldfbSynIdx] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, p_out, samplesToProcess, 0, 0, st_ivas->cldfbSynDec[cldfbSynIdx] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, p_out, samplesToProcess, 0, st_ivas->cldfbSynDec[cldfbSynIdx] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE*/
 
                         // Calculating length of output
                         Word16 no_col = st_ivas->cldfbSynDec[cldfbSynIdx]->no_col;
@@ -4302,8 +4257,11 @@ void ivas_dirac_dec_render_sf_fx(
                     scale_sig32( st_ivas->cldfbSynDec[idx_in]->cldfb_state_fx, st_ivas->cldfbSynDec[idx_in]->p_filter_length, sub( ( Q6 - 1 ), st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state ) );
                     st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state = ( Q6 - 1 );
                     move16();
-
-                    cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, p_out, samplesToProcess, st_ivas->cldfbSynDec[idx_in] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                    cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, p_out, samplesToProcess, 0, 0, st_ivas->cldfbSynDec[idx_in] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                    cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, p_out, samplesToProcess, 0, st_ivas->cldfbSynDec[idx_in] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
 
                     // Scaling output from Q6-1 to Q11
                     Scale_sig32( p_out, out_len, ( Q11 - ( Q6 - 1 ) ) );
@@ -4322,23 +4280,10 @@ void ivas_dirac_dec_render_sf_fx(
 
     IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
-#ifdef FIX_867
-        FOR( Word16 l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[l] = hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[l];
-            move16();
-        }
-        FOR( Word16 l = 0; l < hDirACRend->h_output_synthesis_psd_params.max_band_decorr; l++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[l] = hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[l];
-            move16();
-        }
-#else
         hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q = hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev;
         move16();
         hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q = hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev;
         move16();
-#endif
     }
 
     test();
diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov_fx.c
similarity index 90%
rename from lib_dec/ivas_dirac_output_synthesis_cov.c
rename to lib_dec/ivas_dirac_output_synthesis_cov_fx.c
index 5aa649ecda5e1fe8388321724dac753b47b0d351..caddb5c5cc9fe94936879def3f490ad0ae42ed6b 100644
--- a/lib_dec/ivas_dirac_output_synthesis_cov.c
+++ b/lib_dec/ivas_dirac_output_synthesis_cov_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -30,6 +30,8 @@
 
 *******************************************************************************************************/
 
+#define MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
@@ -40,15 +42,13 @@
 #include "cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_stat_dec.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "wmc_auto.h"
 #include "rom_dec.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -410,8 +410,6 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
     const Word16 nchan_in                                                           /* i  : number of input channels                              */
 )
 {
-    Word16 cx_init_e;
-    Word16 cx_init_imag_e;
     Word16 band_idx, ch_idx;
     Word16 brange[2];
     Word32 real_in_buffer_fx[PARAM_MC_MAX_BANDS_IN_PARAMETER_BAND * MAX_TRANSPORT_CHANNELS];
@@ -421,10 +419,9 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
     Word32 real_buffer_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
     Word32 imag_buffer_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
     Word16 output_e;
-    Word16 i, j, tmp1, tmp2, tmp1_e, tmp2_e, shift_imag, shift_real;
-    Word32 L_tmp;
+    Word16 tmp1_e, tmp2_e, shift_imag, shift_real;
     Word16 band, num_bands;
-
+    Word16 cx_fx_norm, cx_imag_fx_norm;
     /* estimate input covariance */
     /* Already stack here instead of in the process_subframe */
 
@@ -451,8 +448,11 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
     move16();
     imag_in_e = ImagBuffer_e;
     move16();
-    shift_real = sub( L_norm_arr( real_in_buffer_fx, imult1616( num_bands, nchan_in ) ), find_guarded_bits_fx( add( num_bands, 1 ) ) );
-    shift_imag = sub( L_norm_arr( imag_in_buffer_fx, imult1616( num_bands, nchan_in ) ), find_guarded_bits_fx( add( num_bands, 1 ) ) );
+
+    Word16 buf_len = imult1616( num_bands, nchan_in );
+
+    shift_real = sub( L_norm_arr( real_in_buffer_fx, buf_len ), find_guarded_bits_fx( add( num_bands, 1 ) ) );
+    shift_imag = sub( L_norm_arr( imag_in_buffer_fx, buf_len ), find_guarded_bits_fx( add( num_bands, 1 ) ) );
 
     real_in_e = sub( real_in_e, shift_real );
     imag_in_e = sub( imag_in_e, shift_imag );
@@ -460,50 +460,23 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
 
     output_e = s_max( real_in_e, imag_in_e );
 
-    FOR( i = 0; i < num_bands * nchan_in; ++i )
-    {
-        real_in_buffer_fx[i] = L_shr( real_in_buffer_fx[i], sub( output_e, RealBuffer_e ) ); // Q(31-output_e)
-        move32();
-        imag_in_buffer_fx[i] = L_shr( imag_in_buffer_fx[i], sub( output_e, ImagBuffer_e ) ); // Q(31-output_e)
-        move32();
-    }
+    scale_sig32( real_in_buffer_fx, buf_len, sub( RealBuffer_e, output_e ) );
+    scale_sig32( imag_in_buffer_fx, buf_len, sub( ImagBuffer_e, output_e ) );
 
     cmplx_matrix_square_fx( real_in_buffer_fx, imag_in_buffer_fx, num_bands, nchan_in, real_buffer_fx, imag_buffer_fx, output_e, &output_e );
     v_add_fixed_me( cx_fx, *cx_e, real_buffer_fx, output_e, cx_fx, &tmp1_e, imult1616( nchan_in, nchan_in ), 1 );
 
     v_add_fixed_me( cx_imag_fx, *cx_imag_e, imag_buffer_fx, output_e, cx_imag_fx, &tmp2_e, imult1616( nchan_in, nchan_in ), 1 );
-    cx_init_e = tmp1_e;
-    move16();
-    cx_init_imag_e = tmp2_e;
-    move16();
 
-    // normalizing both the matrices to a common exponent for a better precision
-    tmp1 = 0;
-    move16();
-    tmp2 = 0;
-    move16();
+    cx_fx_norm = L_norm_arr( cx_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
+    cx_imag_fx_norm = L_norm_arr( cx_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
 
-    FOR( j = 0; j < PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS; j++ )
-    {
-        L_tmp = BASOP_Util_Add_Mant32Exp( cx_fx[j], cx_init_e, 0, 0, &tmp1_e );
-        L_tmp = BASOP_Util_Add_Mant32Exp( cx_imag_fx[j], cx_init_imag_e, 0, 0, &tmp2_e );
-        tmp1 = s_max( tmp1, tmp1_e );
-        tmp2 = s_max( tmp2, tmp2_e );
-    }
+    scale_sig32( cx_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS, cx_fx_norm );
+    scale_sig32( cx_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS, cx_imag_fx_norm );
 
-    FOR( j = 0; j < PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS; j++ )
-    {
-        L_tmp = BASOP_Util_Add_Mant32Exp( cx_fx[j], cx_init_e, 0, 0, &tmp1_e );
-        cx_fx[j] = L_shr( L_tmp, sub( tmp1, tmp1_e ) ); // Q(31-tmp1)
-        move32();
-        L_tmp = BASOP_Util_Add_Mant32Exp( cx_imag_fx[j], cx_init_imag_e, 0, 0, &tmp2_e );
-        cx_imag_fx[j] = L_shr( L_tmp, sub( tmp2, tmp2_e ) ); // Q(31-tmp2)
-        move32();
-    }
-
-    *cx_e = tmp1;
+    *cx_e = sub( tmp1_e, cx_fx_norm );
     move16();
-    *cx_imag_e = tmp2;
+    *cx_imag_e = sub( tmp2_e, cx_imag_fx_norm );
     move16();
 
     return;
@@ -545,10 +518,14 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
     Word16 mixing_matrix_buffer_e;
     Word32 input_f_real_fx[PARAM_MC_MAX_TRANSPORT_CHANS];
     Word32 input_f_imag_fx[PARAM_MC_MAX_TRANSPORT_CHANS];
+#ifdef MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE
+
+#else
     Word32 output_f_real_fx[MAX_CICP_CHANNELS];
     Word32 output_f_imag_fx[MAX_CICP_CHANNELS];
     Word16 output_f_real_e;
     Word16 output_f_imag_e;
+#endif
     Word32 diff_f_real_fx[MAX_CICP_CHANNELS];
     Word32 diff_f_imag_fx[MAX_CICP_CHANNELS];
 
@@ -556,8 +533,12 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
 
     set_zero_fx( input_f_real_fx, PARAM_MC_MAX_TRANSPORT_CHANS );
     set_zero_fx( input_f_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS );
+#ifdef MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE
+
+#else
     set_zero_fx( output_f_real_fx, MAX_CICP_CHANNELS );
     set_zero_fx( output_f_imag_fx, MAX_CICP_CHANNELS );
+#endif
     set_zero_fx( diff_f_real_fx, MAX_CICP_CHANNELS );
     set_zero_fx( diff_f_imag_fx, MAX_CICP_CHANNELS );
 
@@ -621,6 +602,36 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
                 }
 
                 /* apply residual mixing */
+#ifdef MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE
+                {
+                    Word16 shifter;
+
+                    shifter = 31 - mixing_matrix_res_smooth_e;
+                    FOR( ch_idx = 0; ch_idx < nY; ch_idx++ )
+                    {
+                        int i;
+                        Word16 idx;
+                        Word64 temp_real, temp_imag;
+
+
+                        idx = ch_idx;
+                        temp_real = 0;
+                        temp_imag = 0;
+                        move64();
+                        move64();
+                        for ( i = 0; i < nY; i++ )
+                        {
+                            temp_real = W_add( temp_real, W_mult0_32_32( mixing_matrix_res_smooth_fx[idx], diff_f_real_fx[i] ) );
+                            temp_imag = W_add( temp_imag, W_mult0_32_32( mixing_matrix_res_smooth_fx[idx], diff_f_imag_fx[i] ) );
+                            idx += nY;
+                        }
+                        Cldfb_RealBuffer_fx[ch_idx][slot_idx_sfr][band] = W_extract_l( W_shr( temp_real, shifter ) );
+                        Cldfb_ImagBuffer_fx[ch_idx][slot_idx_sfr][band] = W_extract_l( W_shr( temp_imag, shifter ) );
+                    }
+                }
+
+
+#else
 
                 matrix_product_mant_exp_fx( mixing_matrix_res_smooth_fx, mixing_matrix_res_smooth_e, nY, nY, 0, diff_f_real_fx, 25, nY, 1, 0, output_f_real_fx, &output_f_real_e );
                 scale_sig32( output_f_real_fx, nY, sub( Q6, sub( Q31, output_f_real_e ) ) ); // Q6
@@ -636,6 +647,7 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
                     Cldfb_ImagBuffer_fx[ch_idx][slot_idx_sfr][band] = output_f_imag_fx[ch_idx]; // Q6
                     move32();
                 }
+#endif
             }
             ELSE
             {
@@ -659,6 +671,36 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
             }
 
             /* apply mixing matrix */
+#ifdef MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE
+            {
+                Word16 shifter;
+                shifter = 31 - mixing_matrix_smooth_e;
+
+                FOR( ch_idx = 0; ch_idx < nY; ch_idx++ )
+                {
+                    int i;
+                    Word16 idx;
+                    Word64 temp_real, temp_imag;
+
+
+                    idx = ch_idx;
+                    temp_real = 0;
+                    temp_imag = 0;
+                    move64();
+                    move64();
+                    for ( i = 0; i < nX; i++ )
+                    {
+                        temp_real = W_add( temp_real, W_mult0_32_32( mixing_matrix_smooth_fx[idx], input_f_real_fx[i] ) );
+                        temp_imag = W_add( temp_imag, W_mult0_32_32( mixing_matrix_smooth_fx[idx], input_f_imag_fx[i] ) );
+                        idx += nY;
+                    }
+                    Cldfb_RealBuffer_fx[ch_idx][slot_idx_sfr][band] = L_add( Cldfb_RealBuffer_fx[ch_idx][slot_idx_sfr][band], W_extract_l( W_shr( temp_real, shifter ) ) );
+                    move32();
+                    Cldfb_ImagBuffer_fx[ch_idx][slot_idx_sfr][band] = L_add( Cldfb_ImagBuffer_fx[ch_idx][slot_idx_sfr][band], W_extract_l( W_shr( temp_imag, shifter ) ) );
+                    move32();
+                }
+            }
+#else
 
             matrix_product_mant_exp_fx( mixing_matrix_smooth_fx, mixing_matrix_smooth_e, nY, nX, 0, input_f_real_fx, 25, nX, 1, 0, output_f_real_fx, &output_f_real_e );
             scale_sig32( output_f_real_fx, MAX_CICP_CHANNELS, sub( 6, sub( 31, output_f_real_e ) ) ); // Q6
@@ -675,6 +717,7 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
                 Cldfb_ImagBuffer_fx[ch_idx][slot_idx_sfr][band] = L_add( Cldfb_ImagBuffer_fx[ch_idx][slot_idx_sfr][band], output_f_imag_fx[ch_idx] );
                 move32();
             }
+#endif
         }
     }
 
@@ -752,7 +795,7 @@ Word16 computeMixingMatrices_fx(
     Word32 G_hat_fx[MAX_OUTPUT_CHANNELS];
     Word16 G_hat_buff_e[MAX_OUTPUT_CHANNELS];
 
-    Word16 mat_mult_buffer1_e, mat_mult_buffer2_e, mat_mult_buffer3_e;
+    Word16 mat_mult_buffer2_e, mat_mult_buffer3_e;
 
     Word32 mat_mult_buffer3_fx[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
 
@@ -802,7 +845,7 @@ Word16 computeMixingMatrices_fx(
     mat2svdMat_fx( Cy_fx, svd_in_buffer_fx, lengthCy, lengthCy, 0 );
 
     svd_fx( svd_in_buffer_fx, Cy_fx_e, svd_u_buffer_fx, svd_s_buffer_fx, svd_v_buffer_fx, svd_s_buffer_e, lengthCy, lengthCy );
-
+    Word16 max_e = -32;
     /* Computing Ky */
     FOR( i = 0; i < lengthCy; ++i )
     {
@@ -815,8 +858,16 @@ Word16 computeMixingMatrices_fx(
             move32();
             Ky_fx_e[i + ( j * lengthCy )] = tmp_e;
             move16();
+            max_e = s_max( max_e, tmp_e );
         }
     }
+    FOR( i = 0; i < lengthCy * lengthCy; ++i )
+    {
+        Ky_fx[i] = L_shr( Ky_fx[i], sub( max_e, Ky_fx_e[i] ) );
+        move32();
+        Ky_fx_e[i] = max_e;
+        move16();
+    }
 
     /*-----------------------------------------------------------------*
      * Decomposition of Cx
@@ -827,7 +878,7 @@ Word16 computeMixingMatrices_fx(
     mat2svdMat_fx( Cx_fx, svd_in_buffer_fx, lengthCx, lengthCx, 0 );
 
     svd_fx( svd_in_buffer_fx, Cx_fx_e, svd_u_buffer_fx, svd_s_buffer_fx, svd_v_buffer_fx, svd_s_buffer_e, lengthCx, lengthCx );
-
+    max_e = -32;
     FOR( i = 0; i < lengthCx; ++i )
     {
         FOR( j = 0; j < lengthCx; ++j )
@@ -839,9 +890,16 @@ Word16 computeMixingMatrices_fx(
             move32();
             Kx_fx_e[( i + ( j * lengthCx ) )] = tmp_e;
             move16();
+            max_e = s_max( max_e, tmp_e );
         }
     }
-
+    FOR( i = 0; i < lengthCx * lengthCx; ++i )
+    {
+        Kx_fx[i] = L_shr( Kx_fx[i], sub( max_e, Kx_fx_e[i] ) );
+        move32();
+        Kx_fx_e[i] = max_e;
+        move16();
+    }
 
     FOR( i = 0; i < lengthCx; ++i )
     {
@@ -965,37 +1023,15 @@ Word16 computeMixingMatrices_fx(
 
     /* Computing the input matrix Kx'*Q'*G_hat'*Ky */
 
-    Word16 mat_mult_buffer1_fx_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-    Word16 Q_e_arr[PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS];
-    set16_fx( Q_e_arr, Q_e, PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS );
-
-    matrix_product_mant_exp( Kx_fx, Kx_fx_e, lengthCx, lengthCx, 1, Q_fx, Q_e_arr, lengthCy, lengthCx, 1, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e );
+    Word16 mat_mult_buffer1_fx_e;
 
     Word16 mat_mult_buffer2_fx_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
 
-    matrix_diag_product_fx_1( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e, lengthCx, lengthCy, 0, G_hat_fx, G_hat_buff_e, lengthCy, mat_mult_buffer2_fx, mat_mult_buffer2_fx_e );
-
-    matrix_product_mant_exp( mat_mult_buffer2_fx, mat_mult_buffer2_fx_e, lengthCx, lengthCy, 0, Ky_fx, Ky_fx_e, lengthCy, lengthCy, 0, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e );
-
-    exp = mat_mult_buffer1_fx_e[0];
-    move16();
-    FOR( i = 1; i < lengthCy * lengthCx; i++ )
-    {
-        if ( LT_16( exp, mat_mult_buffer1_fx_e[i] ) )
-        {
-            exp = mat_mult_buffer1_fx_e[i];
-            move16();
-        }
-    }
+    matrix_product_mant_exp_fx( Kx_fx, Kx_fx_e[0], lengthCx, lengthCx, 1, Q_fx, Q_e, lengthCy, lengthCx, 1, mat_mult_buffer1_fx, &mat_mult_buffer1_fx_e );
 
-    FOR( i = 0; i < lengthCy * lengthCx; i++ )
-    {
-        mat_mult_buffer1_fx[i] = L_shr( mat_mult_buffer1_fx[i], sub( exp, mat_mult_buffer1_fx_e[i] ) ); // Q(31-exp)
-        move32();
-    }
+    matrix_diag_product_fx_2( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e, lengthCx, lengthCy, 0, G_hat_fx, G_hat_buff_e, lengthCy, mat_mult_buffer2_fx, mat_mult_buffer2_fx_e );
 
-    mat_mult_buffer1_e = exp;
-    move16();
+    matrix_product_mant_exp_fx( mat_mult_buffer2_fx, mat_mult_buffer2_fx_e[0], lengthCx, lengthCy, 0, Ky_fx, Ky_fx_e[0], lengthCy, lengthCy, 0, mat_mult_buffer1_fx, &mat_mult_buffer1_fx_e );
 
     IF( LT_16( lengthCx, lengthCy ) )
     {
@@ -1004,7 +1040,7 @@ Word16 computeMixingMatrices_fx(
         move16();
         nC = lengthCx;
         move16();
-        svd_fx( svd_in_buffer_fx, mat_mult_buffer1_e, svd_v_buffer_fx, svd_s_buffer_fx, svd_u_buffer_fx, svd_s_buffer_e, nL, nC );
+        svd_fx( svd_in_buffer_fx, mat_mult_buffer1_fx_e, svd_v_buffer_fx, svd_s_buffer_fx, svd_u_buffer_fx, svd_s_buffer_e, nL, nC );
     }
     ELSE
     {
@@ -1013,7 +1049,7 @@ Word16 computeMixingMatrices_fx(
         move16();
         nC = lengthCy;
         move16();
-        svd_fx( svd_in_buffer_fx, mat_mult_buffer1_e, svd_u_buffer_fx, svd_s_buffer_fx, svd_v_buffer_fx, svd_s_buffer_e, nL, nC );
+        svd_fx( svd_in_buffer_fx, mat_mult_buffer1_fx_e, svd_u_buffer_fx, svd_s_buffer_fx, svd_v_buffer_fx, svd_s_buffer_e, nL, nC );
     }
 
     /* Actually Processing P */
@@ -1024,25 +1060,25 @@ Word16 computeMixingMatrices_fx(
     svdMat2mat_fx( svd_v_buffer_fx, mat_mult_buffer1_fx, lengthCy, lengthCx );
     svdMat2mat_fx( svd_u_buffer_fx, mat_mult_buffer2_fx, lengthCx, lengthCx );
 
-    mat_mult_buffer1_e = 0;
+    mat_mult_buffer1_fx_e = 0;
     move16();
     mat_mult_buffer2_e = 0;
     move16();
 
-    matrix_product_mant_exp_fx( mat_mult_buffer1_fx, mat_mult_buffer1_e, lengthCy, lengthCx, 0,
+    matrix_product_mant_exp_fx( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e, lengthCy, lengthCx, 0,
                                 mat_mult_buffer2_fx, mat_mult_buffer2_e, lengthCx, lengthCx, 1,
                                 mat_mult_buffer3_fx, &mat_mult_buffer3_e );
 
     /************************ Formulate M **********************/
 
-    Word16 mat_mult_buffer3_fx_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-    set16_fx( mat_mult_buffer3_fx_e, mat_mult_buffer3_e, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
-
-    matrix_product_mant_exp( Ky_fx, Ky_fx_e, lengthCy, lengthCy, 0, mat_mult_buffer3_fx, mat_mult_buffer3_fx_e, lengthCy, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e );
+    matrix_product_mant_exp_fx( Ky_fx, Ky_fx_e[0], lengthCy, lengthCy, 0, mat_mult_buffer3_fx, mat_mult_buffer3_e, lengthCy, lengthCx, 0, mat_mult_buffer1_fx, &mat_mult_buffer1_fx_e );
 
     Word16 mixing_matrix_fx_e[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
 
-    matrix_product_mant_exp( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e, lengthCy, lengthCx, 0, Kx_reg_inv_fx, Kx_reg_inv_e, lengthCx, lengthCx, 0, mixing_matrix_fx, mixing_matrix_fx_e );
+    Word16 mat_mult_buffer1_fx_e1[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
+    set16_fx( mat_mult_buffer1_fx_e1, mat_mult_buffer1_fx_e, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
+
+    matrix_product_mant_exp( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e1, lengthCy, lengthCx, 0, Kx_reg_inv_fx, Kx_reg_inv_e, lengthCx, lengthCx, 0, mixing_matrix_fx, mixing_matrix_fx_e );
 
     /*-----------------------------------------------------------------*
      * Formulate Cr
@@ -1053,9 +1089,9 @@ Word16 computeMixingMatrices_fx(
 
     Word16 Cx_e_arr[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
     set16_fx( Cx_e_arr, Cx_fx_e, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-    matrix_product_mant_exp( mixing_matrix_fx, mixing_matrix_fx_e, lengthCy, lengthCx, 0, Cx_fx, Cx_e_arr, lengthCx, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e );
+    matrix_product_mant_exp( mixing_matrix_fx, mixing_matrix_fx_e, lengthCy, lengthCx, 0, Cx_fx, Cx_e_arr, lengthCx, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e1 );
 
-    matrix_product_mant_exp( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e, lengthCy, lengthCx, 0, mixing_matrix_fx, mixing_matrix_fx_e, lengthCy, lengthCx, 1, mat_mult_buffer2_fx, mat_mult_buffer2_fx_e );
+    matrix_product_mant_exp( mat_mult_buffer1_fx, mat_mult_buffer1_fx_e1, lengthCy, lengthCx, 0, mixing_matrix_fx, mixing_matrix_fx_e, lengthCy, lengthCx, 1, mat_mult_buffer2_fx, mat_mult_buffer2_fx_e );
 
     exp = mixing_matrix_fx_e[0];
     move16();
@@ -1094,7 +1130,7 @@ Word16 computeMixingMatrices_fx(
         }
 
         /* Avoid Meaningless negative main diagonal elements */
-        IF( BASOP_Util_Cmp_Mant32Exp( Cr_fx[i + ( i * lengthCy )], exp, 0, 0 ) < 0 )
+        IF( Cr_fx[i + ( i * lengthCy )] < 0 )
         {
             Cr_fx[i + ( i * lengthCy )] = 0;
             move32();
@@ -1156,7 +1192,7 @@ Word16 computeMixingMatrices_fx(
         {
             /* Avoid correction for very small energies,
                main diagonal elements of Cy_tilde_p may be negative */
-            IF( BASOP_Util_Cmp_Mant32Exp( Cy_tilde_p_fx[i + ( i * lengthCy )], mat_mult_buffer2_e, 0, 0 ) < 0 )
+            IF( Cy_tilde_p_fx[i + ( i * lengthCy )] < 0 )
             {
                 adj_fx_p[i] = 1073741824; // 1.0f in Q30
                 move32();
@@ -1175,7 +1211,8 @@ Word16 computeMixingMatrices_fx(
                 move16();
             }
 
-            IF( BASOP_Util_Cmp_Mant32Exp( adj_fx_p[i], adj_e[i], 1073741824, 3 ) > 0 )
+            Word32 temp = W_shl_sat_l( W_deposit32_l( 4 ), sub( 31, adj_e[i] ) );
+            IF( GT_32( adj_fx_p[i], temp ) )
             {
                 adj_fx_p[i] = 1073741824; // 1.0f in Q30
                 move32();
@@ -1260,11 +1297,7 @@ Word16 computeMixingMatricesResidual_fx(
     Word16 mixing_matrix_e = 0, mat_mult_buffer1_e, adj_e, mat_mult_buffer3_e, mat_mult_buffer2_e;
     move16();
 
-#ifdef MSAN_FIX
     Word32 svd_s_buffer_fx[MAX_OUTPUT_CHANNELS] = { 0 };
-#else
-    Word32 svd_s_buffer_fx[MAX_OUTPUT_CHANNELS];
-#endif
     Word16 svd_s_buffer_e[MAX_OUTPUT_CHANNELS];
     Word32 L_tmp;
     Word16 tmp_e;
@@ -1308,6 +1341,7 @@ Word16 computeMixingMatricesResidual_fx(
     svd_fx( svd_in_buffer_fx, Cy_fx_e, svd_u_buffer_fx, svd_s_buffer_fx, svd_v_buffer_fx, svd_s_buffer_e, lengthCy, lengthCy );
 
     /* Computing Ky */
+    Word16 max_e = -32;
     FOR( i = 0; i < lengthCy; ++i )
     {
         FOR( j = 0; j < lengthCy; ++j )
@@ -1319,9 +1353,18 @@ Word16 computeMixingMatricesResidual_fx(
             move32();
             Ky_fx_e[i + j * lengthCy] = tmp_e;
             move16();
+            max_e = s_max( max_e, tmp_e );
         }
     }
 
+    FOR( i = 0; i < lengthCy * lengthCy; ++i )
+    {
+        Ky_fx[i] = L_shr( Ky_fx[i], sub( max_e, Ky_fx_e[i] ) );
+        move32();
+        Ky_fx_e[i] = max_e;
+        move16();
+    }
+
     /*-----------------------------------------------------------------*
      * Decomposition of Cx
      *-----------------------------------------------------------------*/
@@ -1332,7 +1375,7 @@ Word16 computeMixingMatricesResidual_fx(
      * square root of the diagonal of Cx */
 
     /* Computing Kx */
-
+    max_e = -32;
     FOR( i = 0; i < lengthCx; ++i )
     {
         exp = Cx_e;
@@ -1341,6 +1384,15 @@ Word16 computeMixingMatricesResidual_fx(
         move32();
         Kx_fx_e[i] = exp;
         move16();
+        max_e = s_max( max_e, exp );
+    }
+
+    FOR( i = 0; i < lengthCx; ++i )
+    {
+        Kx_fx[i] = L_shr( Kx_fx[i], sub( max_e, Kx_fx_e[i] ) );
+        move32();
+        Kx_fx_e[i] = max_e;
+        move16();
     }
 
     /*-----------------------------------------------------------------*
@@ -1349,16 +1401,13 @@ Word16 computeMixingMatricesResidual_fx(
 
     limit_fx = Kx_fx[0];
     move32();
-    limit_e = Kx_fx_e[0];
-    move16();
+
     FOR( i = 1; i < lengthCx; i++ )
     {
-        IF( BASOP_Util_Cmp_Mant32Exp( Kx_fx[i], Kx_fx_e[i], limit_fx, limit_e ) > 0 )
+        IF( GT_32( Kx_fx[i], limit_fx ) )
         {
             limit_fx = Kx_fx[i];
             move32();
-            limit_e = Kx_fx_e[i];
-            move16();
         }
     }
 
@@ -1366,7 +1415,7 @@ Word16 computeMixingMatricesResidual_fx(
     L_tmp = L_add( L_tmp, EPSILLON_FX );
     limit_fx = L_tmp;
     move16();
-    limit_e = add( limit_e, reg_Sx_e );
+    limit_e = add( Kx_fx_e[0], reg_Sx_e );
 
     FOR( i = 0; i < lengthCx; ++i )
     {
@@ -1515,10 +1564,9 @@ Word16 computeMixingMatricesResidual_fx(
      * Formulate M
      *-----------------------------------------------------------------*/
 
-    Word16 mat_mult_buffer3_fx_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-    set16_fx( mat_mult_buffer3_fx_e, mat_mult_buffer3_e, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
 
-    matrix_product_mant_exp( Ky_fx, Ky_fx_e, lengthCy, lengthCy, 0, mat_mult_buffer3_fx, mat_mult_buffer3_fx_e, lengthCy, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_buff_e );
+    matrix_product_mant_exp_fx( Ky_fx, Ky_fx_e[0], lengthCy, lengthCy, 0, mat_mult_buffer3_fx, mat_mult_buffer3_e, lengthCy, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_buff_e );
+    set16_fx( mat_mult_buffer1_buff_e, mat_mult_buffer1_buff_e[0], MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
 
     Word16 mixing_matrix_fx_e[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
 
@@ -1603,7 +1651,8 @@ Word16 computeMixingMatricesResidual_fx(
         move32();
         adj_buff_e[i] = scale;
         move16();
-        IF( BASOP_Util_Cmp_Mant32Exp( adj_fx_p[i], scale, 1073741824, 3 ) > 0 ) // 1073741824 -> 1.0f in Q30
+        Word32 temp = W_shl_sat_l( W_deposit32_l( 4 ), sub( 31, scale ) );
+        IF( GT_32( adj_fx_p[i], temp ) ) // 1073741824 -> 1.0f in Q30
         {
             adj_fx_p[i] = 1073741824; // 1.0f in Q30
             move32();
@@ -1774,7 +1823,7 @@ Word16 computeMixingMatricesISM_fx(
         IF( svd_s_buffer_fx[i] )
         {
             Word32 reg_fac;
-            reg_fac = BASOP_Util_Divide3232_Scale_cadence( MAX_32, svd_s_buffer_fx[i], &temp_e[i] );
+            reg_fac = BASOP_Util_Divide3232_Scale_newton( MAX_32, svd_s_buffer_fx[i], &temp_e[i] );
             Kx_reg_inv_fx[i] = reg_fac;
             move32();
             temp_e[i] = sub( temp_e[i], svd_s_buffer_fx_e );
@@ -1783,7 +1832,7 @@ Word16 computeMixingMatricesISM_fx(
         ELSE
         {
             Word32 reg_fac;
-            reg_fac = BASOP_Util_Divide3232_Scale_cadence( MAX_32, EPSILON_FX_M, &temp_e[i] );
+            reg_fac = BASOP_Util_Divide3232_Scale_newton( MAX_32, EPSILON_FX_M, &temp_e[i] );
             Kx_reg_inv_fx[i] = reg_fac;
             move32();
             temp_e[i] = sub( temp_e[i], EPSILON_FX_E );
@@ -1860,7 +1909,7 @@ Word16 computeMixingMatricesISM_fx(
         {
             IF( Cy_hat_diag_fx[i] )
             {
-                G_hat_fx[i] = BASOP_Util_Divide3232_Scale_cadence( Cy_diag_fx[i], Cy_hat_diag_fx[i], &temp_e[i] );
+                G_hat_fx[i] = BASOP_Util_Divide3232_Scale_newton( Cy_diag_fx[i], Cy_hat_diag_fx[i], &temp_e[i] );
                 move32();
                 temp_e[i] = add( temp_e[i], sub( Cy_diag_e, Cy_hat_diag_e ) );
                 move16();
@@ -1869,7 +1918,7 @@ Word16 computeMixingMatricesISM_fx(
             }
             ELSE
             {
-                G_hat_fx[i] = BASOP_Util_Divide3232_Scale_cadence( Cy_diag_fx[i], EPSILON_FX_M, &temp_e[i] );
+                G_hat_fx[i] = BASOP_Util_Divide3232_Scale_newton( Cy_diag_fx[i], EPSILON_FX_M, &temp_e[i] );
                 move32();
                 temp_e[i] = add( temp_e[i], sub( Cy_diag_e, EPSILON_FX_E ) );
                 move16();
@@ -1972,7 +2021,7 @@ Word16 computeMixingMatricesISM_fx(
                 {
                     IF( Cy_tilde_p_fx[i + ( i * lengthCy )] )
                     {
-                        adj_fx[i] = BASOP_Util_Divide3232_Scale_cadence( Cy_diag_fx[i], Cy_tilde_p_fx[i + ( i * lengthCy )], &temp_e[i] );
+                        adj_fx[i] = BASOP_Util_Divide3232_Scale_newton( Cy_diag_fx[i], Cy_tilde_p_fx[i + ( i * lengthCy )], &temp_e[i] );
                         move32();
                         temp_e[i] = add( temp_e[i], sub( Cy_diag_e, mat_mult_buffer2_e ) );
                         move16();
@@ -1981,7 +2030,7 @@ Word16 computeMixingMatricesISM_fx(
                     }
                     ELSE
                     {
-                        adj_fx[i] = BASOP_Util_Divide3232_Scale_cadence( Cy_diag_fx[i], EPSILON_FX_M, &temp_e[i] );
+                        adj_fx[i] = BASOP_Util_Divide3232_Scale_newton( Cy_diag_fx[i], EPSILON_FX_M, &temp_e[i] );
                         move32();
                         temp_e[i] = add( temp_e[i], sub( Cy_diag_e, EPSILON_FX_E ) );
                         move16();
@@ -1998,7 +2047,8 @@ Word16 computeMixingMatricesISM_fx(
                 }
             }
 
-            IF( BASOP_Util_Cmp_Mant32Exp( adj_fx[i], temp_e[i], MAX_32, 2 ) > 0 )
+            Word32 temp = W_shl_sat_l( W_deposit32_l( 4 ), sub( 31, temp_e[i] ) );
+            IF( GT_32( adj_fx[i], temp ) )
             {
                 adj_fx[i] = MAX_32;
                 move32();
diff --git a/lib_dec/ivas_entropy_decoder.c b/lib_dec/ivas_entropy_decoder_fx.c
similarity index 99%
rename from lib_dec/ivas_entropy_decoder.c
rename to lib_dec/ivas_entropy_decoder_fx.c
index 5f64c1123903689419f91074f9b266d38ac6d501..f8bf3c0910563b96492446ff76aa581507552b77 100644
--- a/lib_dec/ivas_entropy_decoder.c
+++ b/lib_dec/ivas_entropy_decoder_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,13 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include <assert.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 35844b5e53d3dd214665bfcf932501ccb765daaf..4770d21935134204355123ad7b3105131f63fe46 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,14 +35,12 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_enc.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 
@@ -1268,9 +1266,7 @@ ivas_error ivas_init_decoder_fx(
         {
             return error;
         }
-#ifdef MSAN_FIX
         set16_fx( st_ivas->hSpar->hFbMixer->cldfb_cross_fade_fx, 0, CLDFB_NO_COL_MAX );
-#endif
         test();
         IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )
         {
@@ -2034,7 +2030,7 @@ ivas_error ivas_init_decoder_fx(
             }
         }
 
-        granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
+        granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
 
         n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
 
@@ -2266,7 +2262,7 @@ ivas_error ivas_init_decoder_fx(
 
     FOR( i = 0; i < numCldfbAnalyses; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -2278,7 +2274,7 @@ ivas_error ivas_init_decoder_fx(
 
     FOR( i = 0; i < numCldfbSyntheses; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -2333,7 +2329,7 @@ ivas_error ivas_init_decoder_fx(
         /* no module has yet open the TC buffer, open a default one */
         n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
 
-        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
diff --git a/lib_dec/ivas_init_dec_fx.c b/lib_dec/ivas_init_dec_fx.c
index b0dbe97b4234bd4e2f96ab6440d0e36bd4f2cc10..ecd38aabe5cf2884d5365bd9aa09da56f1671310 100644
--- a/lib_dec/ivas_init_dec_fx.c
+++ b/lib_dec/ivas_init_dec_fx.c
@@ -128,7 +128,7 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
             }
             ELSE
             {
-                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_ivas_fx( st_ivas );
+                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_fx( st_ivas );
                 move16();
             }
             BREAK;
@@ -210,7 +210,7 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
         case RENDERER_SBA_LINEAR_ENC:
             IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
             {
-                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_ivas_fx( st_ivas );
+                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_fx( st_ivas );
                 move16();
             }
             ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )
diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_ism_dec.c
rename to lib_dec/ivas_ism_dec_fx.c
index a5f7f7b06ff1223ef66e62eb8d8786967a715773..44b7a0bec5dfe408646524dee28080d6ea6c77c9 100644
--- a/lib_dec/ivas_ism_dec.c
+++ b/lib_dec/ivas_ism_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,13 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_prot_fx.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------------*
diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec_fx.c
similarity index 96%
rename from lib_dec/ivas_ism_dtx_dec.c
rename to lib_dec/ivas_ism_dtx_dec_fx.c
index 106653e485a1d7113d94722008e767aa97bc248f..73ea5cd1f27289546002cddce0f3de1f71654c66 100644
--- a/lib_dec/ivas_ism_dtx_dec.c
+++ b/lib_dec/ivas_ism_dtx_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,12 +33,10 @@
 #include <stdint.h>
 #include <math.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
-#include "prot_fx.h"
 
 /*-------------------------------------------------------------------*
  * ivas_ism_dtx_dec_fx()
@@ -183,7 +181,12 @@ void ivas_ism_dtx_limit_noise_energy_for_near_silence_fx(
             cng_noise_nrg_obj_fx = dotp_fixed_o( hFdCngCom->cngNoiseLevel, hFdCngCom->cngNoiseLevel, cng_noise_level_len, 9, &Q_cng_noise_nrg_obj ); /*Resultant Q_cng_noise_nrg_obj= (Q_cng_noise_nrg_obj-x)<=31*/
             IF( GT_32( cng_noise_nrg_obj_fx, cng_noise_nrg_dominant_fx ) )
             {
-                Word32 temp = divide3232( L_shr( cng_noise_nrg_dominant_fx, 1 ), cng_noise_nrg_obj_fx );   /*Stores value of cng_noise_nrg_dominant_fx/cng_noise_nrg_obj_fx*/
+                Word32 temp = 0;
+                move32();
+                IF( L_shr( cng_noise_nrg_dominant_fx, 1 ) )
+                {
+                    temp = divide3232( L_shr( cng_noise_nrg_dominant_fx, 1 ), cng_noise_nrg_obj_fx ); /*Stores value of cng_noise_nrg_dominant_fx/cng_noise_nrg_obj_fx*/
+                }
                 Word16 Q_temp = add( sub( sub( Q_cng_noise_nrg_dominant, 1 ), Q_cng_noise_nrg_obj ), 15 ); /*Stores resultant Q after divide3232 operation above*/
                 IF( EQ_16( Q_temp % 2, 1 ) )                                                               /*Making Q_temp even for sqrt function*/
                 {
diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_ism_metadata_dec.c
rename to lib_dec/ivas_ism_metadata_dec_fx.c
index ae33f2794101fa1416ca967ccf0fdf0aadae23e5..3288903ab8f43b3b9cb00c03a44abb6b904cfbcc 100644
--- a/lib_dec/ivas_ism_metadata_dec.c
+++ b/lib_dec/ivas_ism_metadata_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,9 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_stat_enc.h"
 #include <math.h>
diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_ism_param_dec.c
rename to lib_dec/ivas_ism_param_dec_fx.c
index 9514e5e2a13cf92647264eae718bfc698d9789ff..30a32c92c2aae2cb0d2aaaf7f005595a1791081d 100644
--- a/lib_dec/ivas_ism_param_dec.c
+++ b/lib_dec/ivas_ism_param_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,15 +34,13 @@
 #include <assert.h>
 #include <math.h>
 #include "options.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
-#include "prot.h"
+#include "ivas_prot_rend_fx.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "debug.h"
 #include "ivas_rom_com_fx.h"
 
@@ -176,26 +174,16 @@ static void ivas_param_ism_collect_slot_fx(
     Word32 *Cldfb_ImagBuffer_in_fx, /*Q(31-exp_imag)*/
     Word16 exp_imag,
     const Word16 ch,
-    Word32 ref_power_fx[], /*Q(31-exp_ref_power)*/
-    Word16 *exp_ref_power,
     Word32 cx_diag_fx[][PARAM_ISM_MAX_DMX], /*Q(31-exp_cx_diag)*/
-    Word16 *exp_cx_diag )
+    Word16 exp_cx_diag[][PARAM_ISM_MAX_DMX] )
 {
     Word16 band_idx, bin_idx;
     Word16 brange[2];
     Word32 tmp_fx;
     Word16 exp_tmp;
-    Word16 i, j;
 
     /* loop over parameter bands to collect transport channel energies */
 
-    Word16 exp_ref_power_buf[CLDFB_NO_CHANNELS_MAX];
-    Word16 exp_cx_diag_buf[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
-    set16_fx( exp_ref_power_buf, *exp_ref_power, CLDFB_NO_CHANNELS_MAX );
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        set16_fx( exp_cx_diag_buf[i], *exp_cx_diag, PARAM_ISM_MAX_DMX );
-    }
     FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
     {
         brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];
@@ -213,53 +201,18 @@ static void ivas_param_ism_collect_slot_fx(
             tmp_fx = BASOP_Util_Add_Mant32Exp( tmp_fx, exp_tmp, var1, add( exp_real, exp_real ), &exp_tmp );
             tmp_fx = BASOP_Util_Add_Mant32Exp( tmp_fx, exp_tmp, var2, add( exp_imag, exp_imag ), &exp_tmp );
 
-            Word16 exp_cx_diag_new = 0, exp_ref_power_new = 0;
+            Word16 exp_cx_diag_new;
             move16();
             move16();
-            cx_diag_fx[bin_idx][ch] = BASOP_Util_Add_Mant32Exp( cx_diag_fx[bin_idx][ch], exp_cx_diag_buf[bin_idx][ch], tmp_fx, exp_tmp, &exp_cx_diag_new );
-            move32();
-            ref_power_fx[bin_idx] = BASOP_Util_Add_Mant32Exp( ref_power_fx[bin_idx], exp_ref_power_buf[bin_idx], tmp_fx, exp_tmp, &exp_ref_power_new );
+            cx_diag_fx[bin_idx][ch] = BASOP_Util_Add_Mant32Exp( cx_diag_fx[bin_idx][ch], exp_cx_diag[bin_idx][ch], tmp_fx, exp_tmp, &exp_cx_diag_new );
             move32();
-            exp_cx_diag_buf[bin_idx][ch] = exp_cx_diag_new;
-            move16();
-            exp_ref_power_buf[bin_idx] = exp_ref_power_new;
+            exp_cx_diag[bin_idx][ch] = exp_cx_diag_new;
             move16();
         }
     }
-
-    /*make common exponent*/
-    Word16 max_exp_cx_diag = exp_cx_diag_buf[0][0], max_exp_ref_power = exp_ref_power_buf[0];
-    move16();
-    move16();
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        FOR( j = 0; j < PARAM_ISM_MAX_DMX; j++ )
-        {
-            max_exp_cx_diag = s_max( max_exp_cx_diag, exp_cx_diag_buf[i][j] );
-        }
-        max_exp_ref_power = s_max( max_exp_ref_power, exp_ref_power_buf[i] );
-    }
-
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        FOR( j = 0; j < PARAM_ISM_MAX_DMX; j++ )
-        {
-            cx_diag_fx[i][j] = L_shr_r( cx_diag_fx[i][j], sub( max_exp_cx_diag, exp_cx_diag_buf[i][j] ) ); // Q(31-max_exp_cx_diag)
-            move32();
-        }
-        ref_power_fx[i] = L_shr_r( ref_power_fx[i], sub( max_exp_ref_power, exp_ref_power_buf[i] ) ); // Q(31-max_exp_ref_power)
-        move16();
-    }
-
-    *exp_cx_diag = max_exp_cx_diag;
-    move16();
-    *exp_ref_power = max_exp_ref_power;
-    move16();
-
     return;
 }
 
-
 static void ivas_param_ism_compute_mixing_matrix_fx(
     const Word16 nchan_ism,                                         /* i  : number of ISM channels       */
     PARAM_ISM_DEC_HANDLE hParamIsmDec,                              /* i/o: decoder ParamISM handle */
@@ -268,9 +221,7 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
     const Word16 nchan_transport,
     const Word16 nchan_out_woLFE,
     Word32 cx_diag_fx[][PARAM_ISM_MAX_DMX], /*Q(31-cx_diag_e)*/
-    Word16 cx_diag_e,
-    Word32 ref_power_fx[], /*Q(31-ref_power_e)*/
-    Word16 ref_power_e,
+    Word16 cx_diag_e[][PARAM_ISM_MAX_DMX],
     Word32 mixing_matrix_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX], /*Q(31-mixing_matrix_e)*/
     Word16 mixing_matrix_e[CLDFB_NO_CHANNELS_MAX] )
 {
@@ -343,6 +294,27 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
 
             set32_fx( cy_diag_fx, 0, nchan_out_woLFE );
             set16_fx( cy_diag_e_arr, 0, nchan_out_woLFE );
+
+            /* equal cx diag exponents, compute ref power from cx_diag*/
+            Word16 max_exp_cx_diag;
+            Word32 cx_diag_eq_exp_fx[PARAM_ISM_MAX_DMX];
+            Word32 ref_power_fx;
+            Word16 ref_power_e, ref_power_e_new;
+            ref_power_fx = cx_diag_fx[bin_idx][0];
+            ref_power_e = cx_diag_e[bin_idx][0];
+
+            FOR( i = 1; i < PARAM_ISM_MAX_DMX; i++ )
+            {
+                ref_power_fx = BASOP_Util_Add_Mant32Exp( ref_power_fx, ref_power_e, cx_diag_fx[bin_idx][i], cx_diag_e[bin_idx][i], &ref_power_e_new );
+                ref_power_e = ref_power_e_new;
+            }
+            max_exp_cx_diag = ref_power_e;
+            FOR( i = 0; i < PARAM_ISM_MAX_DMX; i++ )
+            {
+                cx_diag_eq_exp_fx[i] = L_shr_r( cx_diag_fx[bin_idx][i], sub( max_exp_cx_diag, cx_diag_e[bin_idx][i] ) ); // Q(31-max_exp_cx_diag)
+            }
+
+
             FOR( w = 0; w < num_wave; w++ )
             {
                 test();
@@ -352,24 +324,25 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
                     SWITCH( nchan_ism )
                     {
                         case 2:
-                            direct_power_fx[w] = L_shr_r( ref_power_fx[bin_idx], 1 );
+                            direct_power_fx[w] = L_shr_r( ref_power_fx, 1 );
                             move32();
                             BREAK;
                         case 3:
-                            direct_power_fx[w] = Mpy_32_16_1( ref_power_fx[bin_idx], 10923 ); // 10923 = 1/3f in Q15
+                            direct_power_fx[w] = Mpy_32_16_1( ref_power_fx, 10923 ); // 10923 = 1/3f in Q15
                             move32();
                             BREAK;
                         case 4:
-                            direct_power_fx[w] = L_shr_r( ref_power_fx[bin_idx], 2 );
+                            direct_power_fx[w] = L_shr_r( ref_power_fx, 2 );
                             move32();
                             BREAK;
                     }
                 }
                 ELSE
                 {
-                    direct_power_fx[w] = Mpy_32_16_1( ref_power_fx[bin_idx], hParamIsmDec->power_ratios_fx[band_idx][0][w] ); // Q(31-ref_power_e)
+                    direct_power_fx[w] = Mpy_32_16_1( ref_power_fx, hParamIsmDec->power_ratios_fx[band_idx][0][w] ); // Q(31-ref_power_e[bin_idx])
                     move32();
                 }
+                // direct_power_e = ref_power_e[bin_idx];
                 direct_power_e = ref_power_e;
                 move16();
                 IF( direct_power_fx[w] != 0 )
@@ -410,7 +383,7 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
             }
 
             /* Compute mixing matrix */
-            computeMixingMatricesISM_fx( nchan_transport, num_wave, nchan_out_woLFE, response_matrix_fx, response_matrix_e, direct_power_fx, direct_power_e, cx_diag_fx[bin_idx], cx_diag_e, cy_diag_fx, cy_diag_e, proto_matrix_fx, 1,
+            computeMixingMatricesISM_fx( nchan_transport, num_wave, nchan_out_woLFE, response_matrix_fx, response_matrix_e, direct_power_fx, direct_power_e, cx_diag_eq_exp_fx, max_exp_cx_diag, cy_diag_fx, cy_diag_e, proto_matrix_fx, 1,
                                          PARAM_MC_REG_SX_FX, PARAM_MC_REG_GHAT_FX, mixing_matrix_fx[bin_idx], &mixing_matrix_e[bin_idx] );
         }
     }
@@ -538,9 +511,7 @@ static ivas_error ivas_param_ism_rendering_init_fx(
     {
         set32_fx( hParamIsmRendering->mixing_matrix_lin_old_fx[bin_idx], 0, PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX );
     }
-#ifdef MSAN_FIX
     set16_fx( hParamIsmRendering->exp_mixing_matrix_lin_old_fx, 0, CLDFB_NO_CHANNELS_MAX );
-#endif
 
     /* memory allocation for proto matrix and interpolator */
     IF( ( hParamIsmRendering->proto_matrix_fx = (Word16 *) malloc( hOutSetup.nchan_out_woLFE * nchan_transport * sizeof( Word16 ) ) ) == NULL )
@@ -822,7 +793,6 @@ ivas_error ivas_param_ism_dec_open_fx(
 
         IF( st_ivas->hTcBuffer == NULL )
         {
-            move16(); // NS2SA
             IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
 
             {
@@ -1070,14 +1040,14 @@ void ivas_param_ism_dec_digest_tc_fx(
     Word32 *transport_channels[], /* i  : synthesized core-coder transport channels/DirAC output  q_tc_in*/
     Word16 q_tc_in )
 {
-    Word16 exp_ref_power = 31, exp_cx_diag = 31;
     Word16 exp_real_tmp = 0, exp_imag_tmp = 0;
     move16();
     move16();
     move16();
     move16();
-    Word32 ref_power_fx[CLDFB_NO_CHANNELS_MAX];
     Word32 cx_diag_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
+    Word16 exp_cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
+
     Word16 q_tc = q_tc_in;
     move16();
     Word16 ch, nchan_transport, nchan_out, nchan_out_woLFE, i;
@@ -1132,15 +1102,8 @@ void ivas_param_ism_dec_digest_tc_fx(
     ivas_dirac_dec_set_md_map_fx( st_ivas, nCldfbSlots );
     /* set buffers to zero */
 
-    FOR( bin_idx = 0; bin_idx < CLDFB_NO_CHANNELS_MAX; bin_idx++ )
-    {
-        set_zero_fx( cx_diag_fx[bin_idx], PARAM_ISM_MAX_DMX );
-    }
-    exp_cx_diag = 0;
-    move16();
-    set_zero_fx( ref_power_fx, CLDFB_NO_CHANNELS_MAX );
-    exp_ref_power = 0;
-    move16();
+    set_zero_fx( &cx_diag_fx[0][0], CLDFB_NO_CHANNELS_MAX * PARAM_ISM_MAX_DMX );
+    set16_zero_fx( &exp_cx_diag[0][0], CLDFB_NO_CHANNELS_MAX * PARAM_ISM_MAX_DMX );
 
     /* Frame-level Processing */
     /* De-quantization */
@@ -1269,7 +1232,7 @@ void ivas_param_ism_dec_digest_tc_fx(
                                             &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[current_idx],
                                             exp_imag_tmp,
                                             ch,
-                                            ref_power_fx, &exp_ref_power, cx_diag_fx, &exp_cx_diag );
+                                            cx_diag_fx, exp_cx_diag );
 
             exp_real_tmp = add( exp_real_tmp, scale_factor_real );
             exp_imag_tmp = add( exp_imag_tmp, scale_factor_imag );
@@ -1284,7 +1247,7 @@ void ivas_param_ism_dec_digest_tc_fx(
     }
 
     /* Compute mixing matrix */
-    ivas_param_ism_compute_mixing_matrix_fx( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response_fx, nchan_transport, nchan_out_woLFE, cx_diag_fx, exp_cx_diag, ref_power_fx, exp_ref_power,
+    ivas_param_ism_compute_mixing_matrix_fx( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response_fx, nchan_transport, nchan_out_woLFE, cx_diag_fx, exp_cx_diag,
                                              hParamIsmDec->hParamIsmRendering->mixing_matrix_lin_fx, hParamIsmDec->hParamIsmRendering->exp_mixing_matrix_lin_fx );
 
     pop_wmops();
@@ -1462,9 +1425,9 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
 static void ivas_ism_param_dec_render_sf_fx(
     Decoder_Struct *st_ivas,
     IVAS_OUTPUT_SETUP hSetup,
-    const int16_t nchan_transport,
-    const int16_t nchan_out,
-    const int16_t nchan_out_woLFE,
+    const Word16 nchan_transport,
+    const Word16 nchan_out,
+    const Word16 nchan_out_woLFE,
     Word32 *output_f_fx[], /*Q_output*/
     Word16 Q_output[] )
 {
@@ -1570,7 +1533,11 @@ static void ivas_ism_param_dec_render_sf_fx(
             Scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->p_filter_length, sub( sub( Q_real, 1 ), Q11 ) ); // Q_real-1
             st_ivas->cldfbSynDec[ch]->Q_cldfb_state = sub( Q_real, 1 );
             move16();
-            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, output_f_fx[ch], i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), st_ivas->cldfbSynDec[ch] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, output_f_fx[ch], i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), 0, 0, st_ivas->cldfbSynDec[ch] );
+#else                                                                                                                                         /* OPT_AVOID_STATE_BUF_RESCALE */
+            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, output_f_fx[ch], i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), 0, st_ivas->cldfbSynDec[ch] );
+#endif                                                                                                                                        /* OPT_AVOID_STATE_BUF_RESCALE */
             Scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->p_filter_length, sub( Q11, sub( Q_real, 1 ) ) ); // Q11
             st_ivas->cldfbSynDec[ch]->Q_cldfb_state = Q11;
             move16();
diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer_fx.c
similarity index 98%
rename from lib_dec/ivas_ism_renderer.c
rename to lib_dec/ivas_ism_renderer_fx.c
index 2f2a0fda5803520e91a86e0b83971fff898a8256..888bfb060e9d3fe31c04eb5fcdf26b910bbd8007 100644
--- a/lib_dec/ivas_ism_renderer.c
+++ b/lib_dec/ivas_ism_renderer_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,9 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_com.h"
 #include "ivas_rom_com.h"
 #include "rom_com.h"
@@ -566,7 +564,7 @@ void ivas_omasa_separate_object_render_jbm_fx(
             Word16 tcBufferSize;
 
             tcBufferSize = i_mult( hSpatParamRendCom->num_slots, hSpatParamRendCom->slot_size );
-            delay_signal_fx( input_fx[obj], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer_fx[obj], st_ivas->hMasaIsmData->delayBuffer_size );
+            delay_signal32_fx( input_fx[obj], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer_fx[obj], st_ivas->hMasaIsmData->delayBuffer_size );
         }
         offsetSamples = 0;
         move16();
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_jbm_dec.c
rename to lib_dec/ivas_jbm_dec_fx.c
index d69fa852593acbfeb82f9af47792f4ad2fb6cd19..3f67962dc6f29e329016854e7d6b4cc09492b293 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,10 +35,9 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_prot_fx.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_com.h"
 #include <math.h>
 #include "wmc_auto.h"
@@ -46,7 +45,6 @@
 #ifdef DEBUGGING
 #include "debug.h"
 #endif
-#include "prot_fx.h"
 
 
 /*-----------------------------------------------------------------------*
@@ -84,7 +82,7 @@ ivas_error ivas_jbm_dec_tc_fx(
     Word32 *data_fx          /*Q11*/
 )
 {
-    Word16 n, output_frame, nchan_out, i;
+    Word16 n, output_frame, nchan_out, i, ii;
     Decoder_State *st;                           /* used for bitstream handling */
     Word32 *p_output_fx[MAX_TRANSPORT_CHANNELS]; /* buffer for output synthesis */
     Word16 nchan_remapped;
@@ -131,10 +129,8 @@ ivas_error ivas_jbm_dec_tc_fx(
             set_zero_fx( st_ivas->p_output_fx[n], L_FRAME48k );
             st_ivas->hTcBuffer->tc_fx[n] = st_ivas->p_output_fx[n];
         }
-#ifdef MSAN_FIX
         st_ivas->hTcBuffer->no_channels = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
         move16();
-#endif
     }
 
     Word16 ch;
@@ -411,7 +407,7 @@ ivas_error ivas_jbm_dec_tc_fx(
                 move16();
                 FOR( i = 0; i < 2; i++ )
                 {
-                    s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 ) /* Guard bits */;
+                    s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 ) /* Guard bits */; // L_frame should be used instead of L_FRAME48k */
                 }
                 FOR( i = 0; i < 2; i++ )
                 {
@@ -431,19 +427,18 @@ ivas_error ivas_jbm_dec_tc_fx(
                 scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
                 FOR( i = 0; i < CPE_CHANNELS; ++i )
                 {
-                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );                                      // q_dft
-                    scale_sig32( hCPE->input_mem_fx[i], NS2SA( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );                                          // q_dft
+                    scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
                 }
                 IF( hCPE->hCoreCoder[0] != NULL )
                 {
-                    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ); // q
-                    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, L_FRAME48k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda );          // q
+                    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ); // q
+                    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda );          // q
                     hCPE->hCoreCoder[0]->hHQ_core->q_old_outLB_fx = q;
                     move16();
                 }
                 IF( hCPE->hStereoDft != NULL )
                 {
-#ifdef MSAN_FIX
                     IF( LE_16( st_ivas->nchan_transport, 1 ) )
                     {
                         st = hCPE->hCoreCoder[0];
@@ -491,9 +486,6 @@ ivas_error ivas_jbm_dec_tc_fx(
                             }
                         }
                     }
-#else
-                    scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) );
-#endif
                     scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA_FX2( 16000, DELAY_BWE_TOTAL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // q_dft
                     hCPE->hStereoDft->q_ap_fade_mem_fx = hCPE->hStereoDft->q_dft;
                     move16();
@@ -508,20 +500,16 @@ ivas_error ivas_jbm_dec_tc_fx(
                     hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
                     move16();
                 }
-                FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
                     scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
                     hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
                     move16();
                 }
-#ifdef MSAN_FIX
-                FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
-                    Scale_sig32( &hCPE->prev_synth_fx[ii][0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), hCPE->q_prev_synth_fx - 11 ); // q_prev_synth_fx
+                    Scale_sig32( &hCPE->prev_synth_fx[ii][0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
                 }
-#else
-                Scale_sig32( &hCPE->prev_synth_fx[0][0], sizeof( hCPE->prev_synth_fx ) / sizeof( hCPE->prev_synth_fx[0][0] ), hCPE->q_prev_synth_fx - 11 );
-#endif
 
                 ivas_sba_dirac_stereo_dec_fx( st_ivas, p_output_fx, output_frame, st_ivas->ivas_format == MC_FORMAT );
 
@@ -529,14 +517,10 @@ ivas_error ivas_jbm_dec_tc_fx(
                 {
                     Scale_sig32( p_output_fx[i], L_FRAME48k, negate( s ) );
                 }
-#ifdef MSAN_FIX
-                FOR( int ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
-                    Scale_sig32( &hCPE->prev_synth_fx[ii][0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( 11, hCPE->q_prev_synth_fx ) ); // Q11
+                    Scale_sig32( &hCPE->prev_synth_fx[ii][0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->q_prev_synth_fx ) ); // Q11
                 }
-#else
-                Scale_sig32( &hCPE->prev_synth_fx[0][0], sizeof( hCPE->prev_synth_fx ) / sizeof( hCPE->prev_synth_fx[0][0] ), 11 - hCPE->q_prev_synth_fx );
-#endif
 
                 scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );
                 FOR( i = 0; i < CPE_CHANNELS; ++i )
@@ -547,12 +531,11 @@ ivas_error ivas_jbm_dec_tc_fx(
 
                 IF( hCPE->hCoreCoder[0] != NULL )
                 {
-                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB - q ); // Q_old_wtda_LB
-                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda - q );          // Q_old_wtda_LB
+                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB - q ); // Q_old_wtda_LB
+                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda - q );          // Q_old_wtda_LB
                 }
                 IF( hCPE->hStereoDft != NULL )
                 {
-#ifdef MSAN_FIX
                     IF( LE_16( st_ivas->nchan_transport, 1 ) )
                     {
                         st = hCPE->hCoreCoder[0];
@@ -600,9 +583,6 @@ ivas_error ivas_jbm_dec_tc_fx(
                             }
                         }
                     }
-#else
-                    scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
-#endif
                     scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA_FX2( 16000, DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // Q11
                     hCPE->hStereoDft->q_ap_fade_mem_fx = Q11;
                     test();
@@ -610,7 +590,7 @@ ivas_error ivas_jbm_dec_tc_fx(
 
                 st_ivas->hSpar->hMdDec->Q_mixer_mat = 30;
                 move16();
-                FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
                     scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
                     hCPE->q_output_mem_fx[ii] = Q11;
@@ -963,13 +943,13 @@ ivas_error ivas_jbm_dec_tc_fx(
                 scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );
                 FOR( i = 0; i < CPE_CHANNELS; ++i )
                 {
-                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );                                      // q_dft
-                    scale_sig32( hCPE->input_mem_fx[i], NS2SA( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );                                          // q_dft
+                    scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
                 }
                 IF( hCPE->hCoreCoder[0] != NULL )
                 {
-                    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) ); // q
-                    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, L_FRAME48k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) );          // q
+                    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) ); // q
+                    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) );          // q
                     hCPE->hCoreCoder[0]->hHQ_core->q_old_outLB_fx = q;
                     move16();
                 }
@@ -990,43 +970,35 @@ ivas_error ivas_jbm_dec_tc_fx(
                     hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
                     move16();
                 }
-                FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
                     scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
                     hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
                     move16();
                 }
-#ifdef MSAN_FIX
                 FOR( i = 0; i < CPE_CHANNELS; i++ )
-                Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, 11 ) ); // q_prev_synth_fx
-#else
-                Scale_sig32( &hCPE->prev_synth_fx[0][0], sizeof( hCPE->prev_synth_fx ) / sizeof( hCPE->prev_synth_fx[0][0] ), hCPE->q_prev_synth_fx - 11 );
-#endif
+                Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
                 ivas_sba_dirac_stereo_dec_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame, 0 );
                 FOR( i = 0; i < 2; i++ )
                 {
                     Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, negate( s ) );
                 }
 
-#ifdef MSAN_FIX
                 FOR( i = 0; i < CPE_CHANNELS; i++ )
                 Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( 11, hCPE->q_prev_synth_fx ) ); // Q11
-#else
-                Scale_sig32( &hCPE->prev_synth_fx[0][0], sizeof( hCPE->prev_synth_fx ) / sizeof( hCPE->prev_synth_fx[0][0] ), 11 - hCPE->q_prev_synth_fx );
-#endif
 
                 scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
                 FOR( i = 0; i < CPE_CHANNELS; ++i )
                 {
-                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );                                      // Q11
-                    scale_sig32( hCPE->input_mem_fx[i], NS2SA( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );                                          // Q11
+                    scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
                 }
 
                 IF( hCPE->hCoreCoder[0] != NULL )
                 {
 
-                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
-                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) );          // Q_old_wtda
+                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
+                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) );          // Q_old_wtda
                 }
                 IF( hCPE->hStereoDft != NULL )
                 {
@@ -1036,7 +1008,7 @@ ivas_error ivas_jbm_dec_tc_fx(
                     move16();
                 }
 
-                FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
                     scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
                     hCPE->q_output_mem_fx[ii] = Q11;
@@ -1280,18 +1252,7 @@ ivas_error ivas_jbm_dec_tc_fx(
             test();
             IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
             {
-                s = Q16 - Q11;
-                move16();
-                s = sub( s, find_guarded_bits_fx( st_ivas->nchan_transport ) );
-                FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )
-                {
-                    Scale_sig32( p_output_fx[i], output_frame, s );
-                }
                 ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, output_frame, p_output_fx, p_output_fx );
-                FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )
-                {
-                    Scale_sig32( p_output_fx[i], output_frame, negate( s ) );
-                }
             }
         }
         ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCMASA ) )
@@ -1353,7 +1314,7 @@ ivas_error ivas_jbm_dec_tc_fx(
                 ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe == 0 )
                 {
                     /* Delay the separated channel to sync with the DirAC rendering */
-                    delay_signal_fx( p_output_fx[n], output_frame, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_fx, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size );
+                    delay_signal32_fx( p_output_fx[n], output_frame, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_fx, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size );
                 }
             }
             ELSE
@@ -1417,14 +1378,14 @@ ivas_error ivas_jbm_dec_tc_fx(
                 scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );
                 FOR( i = 0; i < CPE_CHANNELS; ++i )
                 {
-                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );                                      // q_dft
-                    scale_sig32( hCPE->input_mem_fx[i], NS2SA( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+                    scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );                                          // q_dft
+                    scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
                 }
 
                 IF( hCPE->hCoreCoder[0] != NULL )
                 {
-                    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ); // q
-                    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, L_FRAME48k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda );          // q
+                    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ); // q
+                    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda );          // q
                     hCPE->hCoreCoder[0]->hHQ_core->q_old_outLB_fx = q;
                     move16();
                 }
@@ -1450,29 +1411,21 @@ ivas_error ivas_jbm_dec_tc_fx(
                     hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
                     move16();
                 }
-                FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                 {
                     scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->q_output_mem_fx[ii] ) ); // q_dft
                     hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
                     move16();
                 }
-#ifdef MSAN_FIX
                 FOR( i = 0; i < CPE_CHANNELS; i++ )
-                Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, 11 ) ); // q_prev_synth_fx
-#else
-                Scale_sig32( &hCPE->prev_synth_fx[0][0], sizeof( hCPE->prev_synth_fx ) / sizeof( hCPE->prev_synth_fx[0][0] ), hCPE->q_prev_synth_fx - 11 );
-#endif
+                Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
                 ivas_sba_dirac_stereo_dec_fx( st_ivas, p_output_fx, output_frame, 1 );
                 FOR( i = 0; i < 2; i++ )
                 {
                     Scale_sig32( p_output_fx[i], L_FRAME48k, negate( s ) );
                 }
-#ifdef MSAN_FIX
                 FOR( i = 0; i < CPE_CHANNELS; i++ )
-                Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( 11, hCPE->q_prev_synth_fx ) ); // Q11
-#else
-                Scale_sig32( &hCPE->prev_synth_fx[0][0], sizeof( hCPE->prev_synth_fx ) / sizeof( hCPE->prev_synth_fx[0][0] ), 11 - hCPE->q_prev_synth_fx );
-#endif // MSAN_FIX
+                Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->q_prev_synth_fx ) ); // Q11
 
                 scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );
                 FOR( i = 0; i < CPE_CHANNELS; ++i )
@@ -1483,8 +1436,8 @@ ivas_error ivas_jbm_dec_tc_fx(
 
                 IF( hCPE->hCoreCoder[0] != NULL )
                 {
-                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
-                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) );          // Q_old_wtda
+                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
+                    Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) );          // Q_old_wtda
                 }
                 IF( hCPE->hStereoDft != NULL )
                 {
@@ -1495,7 +1448,7 @@ ivas_error ivas_jbm_dec_tc_fx(
                 }
                 IF( st_ivas->hSpar != NULL )
                 {
-                    FOR( Word16 ii = 0; ii < CPE_CHANNELS; ii++ )
+                    FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
                     {
                         scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
                         hCPE->q_output_mem_fx[ii] = Q11;
@@ -1696,7 +1649,7 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
             {
                 FOR( n = 0; n < st_ivas->nchan_ism; n++ )
                 {
-                    delay_signal_fx( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hSbaIsmData->delayBuffer_fx[n], st_ivas->hSbaIsmData->delayBuffer_size );
+                    delay_signal32_fx( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hSbaIsmData->delayBuffer_fx[n], st_ivas->hSbaIsmData->delayBuffer_size );
                 }
             }
 
@@ -1773,7 +1726,7 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
         }
         ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) )
         {
-            ivas_mc_paramupmix_dec_digest_tc( st_ivas, (uint8_t) n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
+            ivas_mc_paramupmix_dec_digest_tc( st_ivas, (UWord8) n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
         }
         ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
         {
@@ -1868,7 +1821,7 @@ ivas_error ivas_jbm_dec_render_fx(
     ivas_error error;
     Word32 *p_output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];
     Word32 *p_tc_fx[MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS];
-    Word16 subframe_len, gd_bits, exp, nchan_in, i, j;
+    Word16 subframe_len, gd_bits, exp, nchan_in, i, j, ch;
     const Word16 output_q_factor = Q11;
     move16();
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
@@ -1914,10 +1867,8 @@ ivas_error ivas_jbm_dec_render_fx(
         }
     }
 
-#ifdef MSAN_FIX
     st_ivas->hTcBuffer->no_channels = st_ivas->hTcBuffer->nchan_buffer_full;
     move16();
-#endif // MSAN_FIX
     /*----------------------------------------------------------------*
      * Update combined orientation access index
      *----------------------------------------------------------------*/
@@ -2012,7 +1963,6 @@ ivas_error ivas_jbm_dec_render_fx(
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
             {
                 /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
-#ifdef MSAN_FIX
                 FOR( i = 0; i < st_ivas->nchan_transport; i++ )
                 {
                     FOR( j = 0; j < 16; j++ )
@@ -2023,16 +1973,6 @@ ivas_error ivas_jbm_dec_render_fx(
                         move32();
                     }
                 }
-#else
-                FOR( i = 0; i < 15; i++ )
-                {
-                    FOR( j = 0; j < 16; j++ )
-                    {
-                        st_ivas->hIsmRendererData->gains_fx[i][j] = L_shr( st_ivas->hIsmRendererData->gains_fx[i][j], 1 );           // Q30 -> Q29
-                        st_ivas->hIsmRendererData->prev_gains_fx[i][j] = L_shr( st_ivas->hIsmRendererData->prev_gains_fx[i][j], 1 ); // Q30 -> Q29
-                    }
-                }
-#endif
                 ivas_ism2sba_sf_fx( st_ivas->hTcBuffer->tc_fx, p_output_fx, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );
                 Word16 sba_num_chans = imult1616( add( st_ivas->hIntSetup.ambisonics_order, 1 ), add( st_ivas->hIntSetup.ambisonics_order, 1 ) );
                 FOR( j = 0; j < sba_num_chans; j++ )
@@ -2041,7 +1981,6 @@ ivas_error ivas_jbm_dec_render_fx(
                 }
 
 
-#ifdef MSAN_FIX
                 FOR( i = 0; i < st_ivas->nchan_transport; i++ )
                 {
                     FOR( j = 0; j < 16; j++ )
@@ -2052,16 +1991,6 @@ ivas_error ivas_jbm_dec_render_fx(
                         move32();
                     }
                 }
-#else
-                FOR( i = 0; i < 15; i++ )
-                {
-                    FOR( j = 0; j < 16; j++ )
-                    {
-                        st_ivas->hIsmRendererData->gains_fx[i][j] = L_shl( st_ivas->hIsmRendererData->gains_fx[i][j], 1 );           // Q29 -> Q30
-                        st_ivas->hIsmRendererData->prev_gains_fx[i][j] = L_shl( st_ivas->hIsmRendererData->prev_gains_fx[i][j], 1 ); // Q29 -> Q30
-                    }
-                }
-#endif
             }
 
             /* Binaural rendering */
@@ -2134,7 +2063,7 @@ ivas_error ivas_jbm_dec_render_fx(
         }
         ELSE
         {
-            IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -2182,7 +2111,7 @@ ivas_error ivas_jbm_dec_render_fx(
                 hSpar->hMdDec->Q_mixer_mat = 30;
                 move16();
 
-                IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -2208,7 +2137,11 @@ ivas_error ivas_jbm_dec_render_fx(
                 /* add already rendered SBA part */
                 FOR( n = 0; n < nchan_out; n++ )
                 {
+#ifdef VEC_ARITH_OPT_v1
+                    v_add_fixed_no_hdrm( p_output_fx[n], p_tc_fx[n + st_ivas->nchan_ism], p_output_fx[n], *nSamplesRendered );
+#else  /* VEC_ARITH_OPT_v1 */
                     v_add_fixed( p_output_fx[n], p_tc_fx[n + st_ivas->nchan_ism], p_output_fx[n], *nSamplesRendered, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                 }
             }
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_OSBA_AMBI ) || EQ_32( st_ivas->renderer_type, RENDERER_OSBA_LS ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
@@ -2220,7 +2153,7 @@ ivas_error ivas_jbm_dec_render_fx(
             }
             ELSE IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ) /*EXT output = individual objects + HOA3*/
             {
-                IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, &p_output_fx[st_ivas->nchan_ism], 960 ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, &p_output_fx[st_ivas->nchan_ism] ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -2232,7 +2165,7 @@ ivas_error ivas_jbm_dec_render_fx(
             }
             ELSE
             {
-                IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -2244,7 +2177,7 @@ ivas_error ivas_jbm_dec_render_fx(
         }
         ELSE
         {
-            IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -2434,7 +2367,7 @@ ivas_error ivas_jbm_dec_render_fx(
                 move16();
             }
             /* CLDFB synthesis */
-            FOR( Word16 ch = 0; ch < nchan_out_cldfb; ch++ )
+            FOR( ch = 0; ch < nchan_out_cldfb; ch++ )
             {
                 IF( st_ivas->cldfbSynDec[ch] )
                 {
@@ -2462,7 +2395,7 @@ ivas_error ivas_jbm_dec_render_fx(
 
             ivas_param_mc_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, channel_active_fx );
 
-            FOR( int ch = 0; ch < nchan_out_cldfb; ch++ )
+            FOR( ch = 0; ch < nchan_out_cldfb; ch++ )
             {
                 IF( st_ivas->cldfbSynDec[ch] )
                 {
@@ -2619,9 +2552,9 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
     Word16 n_slots_still_available;
     Word16 n_samples_to_render;
     DECODER_TC_BUFFER_HANDLE hTcBuffer;
-    Word32 output_fx[MAX_CICP_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
-    Word32 *p_output_fx[MAX_CICP_CHANNELS];
-    Word16 nchan_in, nchan_out;
+    Word32 output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
+    Word32 *p_output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];
+    Word16 nchan_in, nchan_out, gd_bits, n_chan_inp, i, shift;
     IF( !st_ivas->hDecoderConfig->Opt_tsm )
     {
         return IVAS_ERR_OK;
@@ -2708,17 +2641,44 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
                     /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */
                     set16_fx( st_ivas->hIsmRendererData->interpolator_fx, 32767, hTcBuffer->n_samples_granularity ); // 32767=1.0f in Q15
 
-                    ivas_ism_render_sf_fx( st_ivas, p_output_fx, *nSamplesRendered );
+                    ivas_ism_render_sf_fx( st_ivas, p_output_fx, hTcBuffer->n_samples_granularity );
 
                     st_ivas->hCrendWrapper->p_io_qfactor = &st_ivas->hCrendWrapper->io_qfactor;
                     *st_ivas->hCrendWrapper->p_io_qfactor = 11;
                     move16();
+
+                    shift = MAX_16;
+                    move16();
+                    n_chan_inp = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe );
+
+                    FOR( i = 0; i < n_chan_inp; i++ )
+                    {
+                        shift = s_min( shift, L_norm_arr( p_output_fx[i], hTcBuffer->n_samples_granularity ) );
+                    }
+
+                    gd_bits = sub( find_guarded_bits_fx( imult1616( hTcBuffer->subframe_nbslots[0], hTcBuffer->n_samples_granularity ) ), shift );
+
+                    *st_ivas->hCrendWrapper->p_io_qfactor = sub( *st_ivas->hCrendWrapper->p_io_qfactor, gd_bits );
+                    move16();
+
+                    FOR( i = 0; i < n_chan_inp; i++ )
+                    {
+                        scale_sig32( p_output_fx[i], hTcBuffer->n_samples_granularity, sub( *st_ivas->hCrendWrapper->p_io_qfactor, Q11 ) ); // Q(*st_ivas->hCrendWrapper->p_io_qfactor)
+                    }
+
                     IF( NE_32( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL,
                                                                          NULL, NULL, st_ivas->hTcBuffer, p_output_fx, p_output_fx, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs ) ),
                                IVAS_ERR_OK ) )
                     {
                         return error;
                     }
+
+                    FOR( i = 0; i < n_chan_inp; i++ )
+                    {
+                        scale_sig32( p_output_fx[i], hTcBuffer->n_samples_granularity, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ); // Q(11)
+                    }
+                    *st_ivas->hCrendWrapper->p_io_qfactor = Q11;
+                    move16();
                 }
             }
             ELSE
@@ -2846,7 +2806,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
             set16_fx( st_ivas->hSpatParamRendCom->render_to_md_map, last_dirac_md_idx, n_slots_still_available );
 
             /* render the last subframe */
-            IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, (UWord16) hTcBuffer->n_samples_granularity, nSamplesRendered, &nSamplesAvailableNext, p_output_fx, L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, (UWord16) hTcBuffer->n_samples_granularity, nSamplesRendered, &nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
diff --git a/lib_dec/ivas_lfe_dec.c b/lib_dec/ivas_lfe_dec.c
deleted file mode 100644
index a9ed90a8a2e7d5ac3f567208cbc2824c329d03cf..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_lfe_dec.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include <math.h>
-#include "options.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_lfe_dec_fx.c b/lib_dec/ivas_lfe_dec_fx.c
index ec58c45c0c4c5ec6446c90e2f07a7231407decb9..d73030d56af4fa7ac8ba9213c879092c6bdc7ec4 100644
--- a/lib_dec/ivas_lfe_dec_fx.c
+++ b/lib_dec/ivas_lfe_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,9 +32,7 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "rom_com.h"
@@ -394,7 +392,7 @@ void ivas_lfe_dec_fx(
     /* add delay to make overall max(block_offset, 11.5) */
     IF( hLFE->lfe_addl_delay > 0 )
     {
-        delay_signal_fx( output_lfe_ch, output_frame, hLFE->lfe_delay_buf_fx, hLFE->lfe_addl_delay );
+        delay_signal32_fx( output_lfe_ch, output_frame, hLFE->lfe_delay_buf_fx, hLFE->lfe_addl_delay );
     }
 
     return;
diff --git a/lib_dec/ivas_lfe_plc.c b/lib_dec/ivas_lfe_plc.c
deleted file mode 100644
index 8ae40e2be906937951de7741851c9baccf4370e3..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_lfe_plc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include <math.h>
-#ifdef DEBUGGING
-#include "debug.h"
-#endif
-#include "wmc_auto.h"
-
-/*------------------------------------------------------------------------------------------*
- * Local constants
- *------------------------------------------------------------------------------------------*/
diff --git a/lib_dec/ivas_lfe_plc_fx.c b/lib_dec/ivas_lfe_plc_fx.c
index 6e3969255e36c9094dcd4f8ec13cd7217c4b0308..a480ce7bebdcb58eb606d72f4f76374b1747370a 100644
--- a/lib_dec/ivas_lfe_plc_fx.c
+++ b/lib_dec/ivas_lfe_plc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,9 +32,7 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include <math.h>
 #include "wmc_auto.h"
@@ -227,7 +225,7 @@ static Word16 lfeplc_lev_dur_fx(
     a_out_q_fx[0] = 30;
     move16();
 
-    rc_fx[0] = BASOP_Util_Divide3232_Scale_cadence( -r_fx[1], r_fx[0], &temp_q2 );
+    rc_fx[0] = BASOP_Util_Divide3232_Scale_newton( -r_fx[1], r_fx[0], &temp_q2 );
     move32();
     rc_q_fx[0] = add( sub( r_q_fx[1], r_q_fx[0] ), sub( 31, temp_q2 ) );
     move16();
@@ -389,7 +387,7 @@ static Word16 lfeplc_lev_dur_fx(
         s = W_extract_h( W_shl( s_fx, exp1 ) );
         s_q_fx = sub( add( s_q_fx, exp1 ), 32 );
 
-        rc_fx[i - 1] = L_shr( BASOP_Util_Divide3232_Scale_cadence( -s, err_fx, &temp_q2 ), 1 );
+        rc_fx[i - 1] = L_shr( BASOP_Util_Divide3232_Scale_newton( L_negate( s ), err_fx, &temp_q2 ), 1 );
         move32();
         rc_q_fx[i - 1] = sub( add( sub( s_q_fx, err_q_fx ), sub( 31, temp_q2 ) ), 1 );
         move16();
@@ -397,7 +395,7 @@ static Word16 lfeplc_lev_dur_fx(
         IF( LT_16( rc_q_fx[i - 1], 31 ) )
         {
 
-            IF( GT_32( abs( rc_fx[i - 1] ), L_shr( 2146302532, sub( 31, rc_q_fx[i - 1] ) ) ) ) // 2146302532 = 0.99945f in Q31
+            IF( GT_32( L_abs( rc_fx[i - 1] ), L_shr( 2146302532, sub( 31, rc_q_fx[i - 1] ) ) ) ) // 2146302532 = 0.99945f in Q31
             {
                 return 1;
             }
@@ -414,7 +412,7 @@ static Word16 lfeplc_lev_dur_fx(
         }
         ELSE
         {
-            IF( GT_32( abs( L_shr( rc_fx[i - 1], sub( rc_q_fx[i - 1], 31 ) ) ), 2146302532 ) ) // 2146302532 = 0.00045f in Q31
+            IF( GT_32( L_abs( L_shr( rc_fx[i - 1], sub( rc_q_fx[i - 1], 31 ) ) ), 2146302532 ) ) // 2146302532 = 0.00045f in Q31
             {
                 return 1;
             }
@@ -466,7 +464,7 @@ static Word16 d_a2rc_fx(
         move32();
         km_q_fx = ff_q_fx[m];
         move16();
-        IF( GE_64( W_shr( abs( km_fx ), sub( ff_q_fx[m], Q30 ) ), W_deposit32_l( ONE_IN_Q30 ) ) )
+        IF( GE_64( W_shr( L_abs( km_fx ), sub( ff_q_fx[m], Q30 ) ), W_deposit32_l( ONE_IN_Q30 ) ) )
         {
             FOR( j = 0; j < lpcorder; j++ )
             {
@@ -827,7 +825,7 @@ static Word32 find_max_delta_fx(
 
         IF( !stable )
         {
-            temp = abs( eps_fx );
+            temp = L_abs( eps_fx );
             IF( GT_32( L_shr( temp, sub( eps_q_fx, 31 ) ), EPS_STOP_Q31 ) )
             {
                 exp1 = norm_l( -temp );
@@ -837,12 +835,12 @@ static Word32 find_max_delta_fx(
             }
             ELSE
             {
-                eps_fx = L_negate( abs( eps_fx ) );
+                eps_fx = L_negate( L_abs( eps_fx ) );
             }
         }
         ELSE
         {
-            temp = abs( eps_fx );
+            temp = L_abs( eps_fx );
             if ( LT_32( L_shr( temp, sub( eps_q_fx, 31 ) ), EPS_STOP_Q31 ) )
             {
                 BREAK;
@@ -1027,7 +1025,7 @@ void ivas_lfe_tdplc_fx(
         }
     }
 
-    Copy_Scale_sig_16_32( rec_frame_us_16_fx, rec_frame_us_fx, LFE_PLC_RECLEN_48K, 10 ); // Q10 = rec_frame_q + 5
+    Copy_Scale_sig_16_32_DEPREC( rec_frame_us_16_fx, rec_frame_us_fx, LFE_PLC_RECLEN_48K, 10 ); // Q10 = rec_frame_q + 5
 
     FOR( i = 0; i < 2; i++ )
     {
diff --git a/lib_dec/ivas_ls_custom_dec.c b/lib_dec/ivas_ls_custom_dec_fx.c
similarity index 98%
rename from lib_dec/ivas_ls_custom_dec.c
rename to lib_dec/ivas_ls_custom_dec_fx.c
index 25badc6082b4ce6a85737cdd54b2cb96bc7559e0..5ad390f9a66786ed847e1f78cc278c1fa165826c 100644
--- a/lib_dec/ivas_ls_custom_dec.c
+++ b/lib_dec/ivas_ls_custom_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,11 +31,9 @@
 *******************************************************************************************************/
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-----------------------------------------------------------------------*
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_masa_dec.c
rename to lib_dec/ivas_masa_dec_fx.c
index 983eb33095e6d03432387deede2d78b3c3a9270b..36900867e47fe247992d9177597001a1312e22e8 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,12 +35,10 @@
 #include <assert.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_dec.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
@@ -836,7 +834,7 @@ ivas_error ivas_masa_dec_open_fx(
             nchan_to_allocate = add( nchan_to_allocate, 1 );
         }
 
-        IF( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+        IF( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
         {
             return error;
         }
@@ -2574,13 +2572,9 @@ static void create_masa_ext_out_meta_fx(
             {
                 FOR( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )
                 {
-                    IF( EQ_32( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], ONE_IN_Q30 ) )
-                    {
-                        hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf]--;
-                    }
-                    UWord8 tmp = (UWord8) L_shr( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], Q30 - 8 ); // Q8
+                    UWord8 tmp = (UWord8) W_extract_h( W_mult_32_16( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], UINT8_MAX << 1 ) ); // Q0
                     move16();
-                    extOutMeta->directToTotalRatio[dir][sf][b_new] = tmp; // Q8
+                    extOutMeta->directToTotalRatio[dir][sf][b_new] = tmp; // Q0
                     move16();
                 }
             }
@@ -2639,12 +2633,8 @@ static void create_masa_ext_out_meta_fx(
                 move16();
                 FOR( dir = 0; dir < numDirections; dir++ )
                 {
-                    /* todo: not optimal, but less invasive */
-                    IF( EQ_32( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], ONE_IN_Q30 ) )
-                    {
-                        hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf]--;
-                    }
-                    UWord8 tmp = (UWord8) L_shr( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], Q30 - 8 ); // Q8
+
+                    UWord8 tmp = (UWord8) W_extract_h( W_mult_32_16( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], UINT8_MAX << 1 ) ); // Q0
                     move16();
                     extOutMeta->diffuseToTotalRatio[sf][b_new] = (UWord8) sub( extOutMeta->diffuseToTotalRatio[sf][b_new], tmp ); // Q8
                     move16();
diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c
deleted file mode 100644
index 4175d15def0080ebd3dd76978dc5135a43141db3..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_mc_param_dec.c
+++ /dev/null
@@ -1,3789 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <assert.h>
-#include "options.h"
-#include <stdint.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
-#include "ivas_cnst.h"
-#include "ivas_rom_com.h"
-#include "ivas_rom_dec.h"
-#include "math.h"
-#include "wmc_auto.h"
-#include "rom_dec.h"
-#include "prot_fx.h"
-#include "ivas_prot_fx.h"
-
-#define INV_EPSILON_MANT 214748365
-
-/*-----------------------------------------------------------------------*
- * Local constants
- *-----------------------------------------------------------------------*/
-
-#define PARAM_MC_LOCAL_SZ_LFE_MAP 5
-
-/*-----------------------------------------------------------------------*
- * Local typedefs
- *-----------------------------------------------------------------------*/
-
-typedef struct parameter_band_mapping_struct
-{
-    Word16 n_source_bands[20];
-    Word16 source_band_idx[20][4];
-    Word16 source_band_factor_fx[20][4]; /*Q15*/
-
-} PARAM_MC_PARAMETER_BAND_MAPPING;
-
-/*-----------------------------------------------------------------------*
- * Local function prototypes
- *-----------------------------------------------------------------------*/
-
-static void ivas_param_mc_dec_init_fx( PARAM_MC_DEC_HANDLE hParamMC, const Word16 nchan_in, const Word16 nchan_out );
-
-static void ivas_param_mc_dec_copy_diffuse_proto( PARAM_MC_DEC_HANDLE hParamMC, Word32 Cldfb_buffer_real_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], Word32 Cldfb_buffer_imag_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const Word16 nY, const Word16 slot_idx );
-static Word16 ivas_param_mc_range_decoder_LC_fx( UWord16 *bit_buffer, Word16 *x, Word16 *BER_detect, const Word16 sz_seq, const Word16 sz_alphabet, const UWord16 *cft, const UWord16 *sft, const Word16 tot_shift, const Word16 nbbits );
-
-
-static void ivas_param_mc_get_mixing_matrices_fx(
-    PARAM_MC_DEC_HANDLE hParamMC, /* i  : Parametric MC handle */
-    IVAS_OUTPUT_SETUP *hSynthesisOutputSetup,
-    Word32 Cx_in_fixed[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i  : input covariance for all parameter bands         */
-    Word16 Cx_in_e,
-    const Word16 param_band_idx,
-    Word32 *mixing_matrix_fx[],
-    Word16 *mixing_matrix_e,
-    Word32 *mixing_matrix_res_fx[],
-    Word16 *mixing_matrix_res_e,
-    const Word16 nY_intern,                     /* i  : number of channels in the transported format     */
-    const PARAM_MC_SYNTHESIS_CONF synth_config, /* i  : Parametric MC synthesis config                   */
-    const Word16 nX,                            /* i  : number of transport channels                     */
-    const Word16 nY_cov                         /* i  : number of covariance synthesis output channels   */
-);
-
-static Word16 ivas_param_mc_uniform_decoder_fx( Word16 *seq, const Word16 sz_seq, const Word16 *alphabet, const Word16 N, UWord16 bit_buffer[PARAM_MC_MAX_BITS] );
-static void ivas_param_mc_dec_compute_interpolator_fx( const UWord16 bAttackPresent, const UWord16 attackPos, const UWord16 interp_length, Word16 *interpolator );
-
-static void param_mc_set_num_synth_bands( const Word32 output_Fs, PARAM_MC_DEC_HANDLE hParamMC );
-
-static void ivas_param_mc_get_param_band_mapping( const Word16 n_target_bands, const Word16 *target_band_grouping, const Word16 n_source_bands, const Word16 *source_band_grouping, PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping );
-
-
-static void ivas_param_mc_bs_decode_parameter_values_fx( UWord16 bit_buffer[], Word16 *bit_pos, const Word16 max_bits, Word16 *BER_detect, HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC, HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, const Word16 map_size_wo_lfe, const Word16 map_size, const Word16 num_lfe_bands, const Word16 band_step, const Word16 num_param_bands, Word16 *value_buffer );
-static void ivas_param_mc_dequantize_cov_fx( PARAM_MC_DEC_HANDLE hParamMC, Word16 *ild_q_fx, Word16 *icc_q_fx, const Word16 param_band_index, const Word16 nY_cov, const PARAM_MC_SYNTHESIS_CONF synth_conf, const Word16 nY_int, const Word16 nX, Word32 *Cx_state_fx, Word16 Cx_state_e, Word32 *Cproto_fx, Word16 Cproto_e, Word32 *Cy_state_fx, Word16 *Cy_state_e );
-static ivas_error param_mc_get_diff_proto_info_fx( const Word32 *proto_mtx, const UWord16 nchan_transport, const UWord16 nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info, Word16 Q_proto_mtx );
-static void param_mc_update_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, Word32 *mixing_matrix[], Word16 *mixing_matrix_fx, Word32 *mixing_matrix_res[], Word16 *mixing_matrix_res_exp, const UWord16 nX, const UWord16 nY );
-
-
-static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const int16_t num_freq_bands /*, Word16 RealBuffer_fx_e, Word16 ImagBuffer_fx_e, Word16 *common_e*/ );
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_open()
- *
- * Open Parametric MC decoder handle
- *-------------------------------------------------------------------------*/
-
-ivas_error ivas_param_mc_dec_open_fx(
-    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */
-)
-{
-    Word16 k, nchan_transport;
-    PARAM_MC_DEC_HANDLE hParamMC;
-    Word16 nchan_out_transport;
-    Word16 nchan_out_cov;
-    Word32 proto_matrix_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
-    Word32 proto_mtx_norm_fx;
-    Word16 frequency_axis_fx[CLDFB_NO_CHANNELS_MAX];
-    Word16 max_param_band_residual;
-    UWord16 config_index;
-    MC_LS_SETUP mc_ls_setup;
-    AUDIO_CONFIG output_config;
-    Word32 output_Fs, ivas_total_brate;
-    ivas_error error;
-
-    error = IVAS_ERR_OK;
-    move32();
-
-    /*-----------------------------------------------------------------*
-     * prepare library opening
-     *-----------------------------------------------------------------*/
-
-    IF( ( hParamMC = (PARAM_MC_DEC_HANDLE) malloc( sizeof( PARAM_MC_DEC_DATA ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-
-    IF( ( hParamMC->hMetadataPMC = (HANDLE_IVAS_PARAM_MC_METADATA) malloc( sizeof( IVAS_PARAM_MC_METADATA ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC metadata \n" ) );
-    }
-
-    output_Fs = st_ivas->hDecoderConfig->output_Fs;
-    move32();
-    output_config = st_ivas->hDecoderConfig->output_config;
-    move32();
-    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
-    move32();
-    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup_fx( st_ivas->transport_config );
-    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-    hParamMC->hoa_encoder_fx = NULL;
-
-    /* determine the synthesis config */
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) || EQ_32( st_ivas->transport_config, output_config ) )
-    {
-        hParamMC->synthesis_conf = PARAM_MC_SYNTH_DIRECT;
-        move32();
-    }
-    ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
-    {
-        hParamMC->synthesis_conf = PARAM_MC_SYNTH_MONO_STEREO;
-        move32();
-    }
-    ELSE IF( NE_32( st_ivas->transport_config, output_config ) )
-    {
-        test();
-        test();
-        IF( ( NE_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && GT_16( nchan_out_transport, audioCfg2channels( output_config ) ) ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && GT_16( nchan_out_transport, st_ivas->hOutSetup.nchan_out_woLFE ) ) )
-        {
-            hParamMC->synthesis_conf = PARAM_MC_SYNTH_LS_CONV_COV;
-            move32();
-            /* need to reset the intern config */
-            st_ivas->intern_config = output_config;
-            move32();
-            ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config );
-            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )
-            {
-                st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hLsSetupCustom->num_spk;
-                move32();
-                st_ivas->hIntSetup.ls_azimuth_fx = st_ivas->hLsSetupCustom->ls_azimuth_fx;     // Q22
-                st_ivas->hIntSetup.ls_elevation_fx = st_ivas->hLsSetupCustom->ls_elevation_fx; // Q22
-            }
-        }
-        ELSE
-        {
-            hParamMC->synthesis_conf = PARAM_MC_SYNTH_LS_CONV_CLDFB;
-            move32();
-        }
-    }
-
-    hParamMC->ls_conv_dmx_matrix_fx = NULL;
-
-    test();
-    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-    }
-    ELSE
-    {
-        nchan_out_cov = nchan_out_transport;
-        move16();
-    }
-
-    st_ivas->nchan_transport = ivas_param_mc_getNumTransportChannels_fx( ivas_total_brate, mc_ls_setup );
-    move16();
-    config_index = ivas_param_mc_get_configuration_index_fx( mc_ls_setup, ivas_total_brate );
-    nchan_transport = st_ivas->nchan_transport;
-    move16();
-
-    SWITCH( nchan_transport )
-    {
-        case 4:
-        case 3:
-            st_ivas->nCPE = 2;
-            move16();
-            st_ivas->nSCE = 0;
-            move16();
-            st_ivas->element_mode_init = IVAS_CPE_MDCT;
-            move16();
-            BREAK;
-        case 2:
-            st_ivas->nCPE = 1;
-            move16();
-            st_ivas->nSCE = 0;
-            move16();
-            st_ivas->element_mode_init = IVAS_CPE_MDCT;
-            move16();
-
-            BREAK;
-    }
-
-    /*-----------------------------------------------------------------*
-     * set input parameters
-     *-----------------------------------------------------------------*/
-
-    // hParamMC->slot_size = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX;
-    Word16 temp_e;
-    Word16 temp = BASOP_Util_Divide3232_Scale( output_Fs, FRAMES_PER_SEC, &temp_e );
-    temp = shr( temp, sub( 15, temp_e ) ); // Going back to Q0
-    temp = BASOP_Util_Divide1616_Scale( temp, CLDFB_NO_COL_MAX, &temp_e );
-    temp = shr( temp, sub( 15, temp_e ) ); // Going back to Q0
-    hParamMC->slot_size = temp;
-    move16();
-    set16_fx( hParamMC->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS );
-    set16_fx( hParamMC->subframe_nbslots, PARAM_MC_MAX_NSLOTS_IN_SUBFRAME, DEFAULT_JBM_SUBFRAMES_5MS );
-    hParamMC->nb_subframes = DEFAULT_JBM_SUBFRAMES_5MS;
-    move16();
-
-    // hParamMC->num_freq_bands = (int16_t)(output_Fs * INV_CLDFB_BANDWIDTH + 0.5f);
-    hParamMC->num_freq_bands = extract_l( Mpy_32_32_r( output_Fs, INV_CLDFB_BANDWIDTH_Q31 ) );
-    move16();
-    hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands;
-    move16();
-    ivas_param_mc_metadata_open_fx( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );
-
-    /* init arrays for quantized parameters */
-
-    IF( ( hParamMC->icc_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-    IF( ( hParamMC->icld_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-    set16_fx( hParamMC->icld_q_fx, PARAM_MC_DEFAULT_MIN_ILD_FX, imult1616( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ) ); // Q8
-    set16_fx( hParamMC->icc_q_fx, 0, imult1616( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe ) );                            // Q15
-
-    param_mc_set_num_synth_bands( output_Fs, hParamMC );
-
-    /* Band Grouping */
-    IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 20 ) )
-    {
-        Copy( param_mc_band_grouping_20, hParamMC->band_grouping, 20 + 1 );
-    }
-    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 14 ) )
-    {
-        Copy( param_mc_band_grouping_14, hParamMC->band_grouping, 14 + 1 );
-    }
-    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 10 ) )
-    {
-        Copy( param_mc_band_grouping_10, hParamMC->band_grouping, 10 + 1 );
-    }
-    ELSE
-    {
-        assert( 0 && "nbands must be 20, 14, or 10!" );
-    }
-
-    /* set max parameter band for abs cov */
-    k = 0;
-    move16();
-    WHILE( LE_16( hParamMC->band_grouping[k], PARAM_MC_MAX_BAND_ABS_COV_DEC ) )
-    {
-        hParamMC->max_param_band_abs_cov = k;
-        move16();
-        k = add( k, 1 );
-    }
-
-    /*-----------------------------------------------------------------*
-     * open sub-modules
-     *-----------------------------------------------------------------*/
-
-    /* prototype signal computation */
-
-    test();
-    test();
-    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        IF( NE_32( ( error = ivas_ls_setup_conversion_open_fx( st_ivas ) ), IVAS_ERR_OK ) )
-        {
-            return error;
-        }
-
-        /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */
-        test();
-        IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-        {
-            IF( ( hParamMC->ls_conv_dmx_matrix_fx = (Word32 *) malloc( nchan_out_transport * nchan_out_cov * sizeof( Word32 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-            }
-
-            FOR( k = 0; k < nchan_out_transport; k++ )
-            {
-                Copy32( st_ivas->hLsSetUpConversion->dmxMtx_fx[k], &hParamMC->ls_conv_dmx_matrix_fx[k * nchan_out_cov], nchan_out_cov ); /*Q30*/
-            }
-
-            /* convert ParamMC parameter bands to SFB */
-            IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-            {
-                st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth;
-                move16();
-                FOR( k = 0; k <= hParamMC->num_param_bands_synth; k++ )
-                {
-                    st_ivas->hLsSetUpConversion->sfbOffset[k] = imult1616( PARAM_MC_BAND_TO_MDCT_BAND_RATIO, hParamMC->band_grouping[k] );
-                    move16();
-                }
-            }
-            ELSE
-            {
-                /* close the ls conversion handle immediately, it was only needed to get the DMX matrix in case of DMX in the covariance domain */
-                ivas_ls_setup_conversion_close_fx( &st_ivas->hLsSetUpConversion );
-            }
-        }
-    }
-    IF( ( hParamMC->proto_matrix_int_fx = (Word32 *) malloc( nchan_out_transport * nchan_transport * sizeof( Word32 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-    Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, hParamMC->proto_matrix_int_fx, imult1616( nchan_transport, nchan_out_transport ) ); /*Q31*/
-
-    hParamMC->proto_matrix_int_len = imult1616( nchan_out_transport, nchan_transport );
-    move16();
-
-    test();
-    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), -4 );                                                                                                /*Q.26*/
-        matrix_product_fx( hParamMC->ls_conv_dmx_matrix_fx, nchan_out_cov, nchan_out_transport, 0, ivas_param_mc_conf[config_index].dmx_fac_fx, nchan_out_transport, nchan_transport, 0, proto_matrix_fx ); /*Q.26*/
-        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), 4 );                                                                                                 /*Q.26*/
-        IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-        {
-            proto_mtx_norm_fx = ONE_IN_Q26; /*Q26*/
-            move32();
-            FOR( k = 0; k < nchan_transport * nchan_out_cov; k++ )
-            {
-                proto_mtx_norm_fx = L_max( L_abs( proto_mtx_norm_fx ), L_abs( proto_matrix_fx[k] ) ); /*Q.26*/
-            }
-            proto_mtx_norm_fx = divide3232( ONE_IN_Q26, proto_mtx_norm_fx ); /*Q15*/
-
-            /* transfer flattened proto_matrix to 2D in hLsSetupConversion->dmxMtx */
-            FOR( k = 0; k < nchan_transport; k++ )
-            {
-                FOR( Word16 i = 0; i < nchan_out_cov; i++ )
-                {
-                    st_ivas->hLsSetUpConversion->dmxMtx_fx[k][i] = L_shl( Mult_32_16( proto_matrix_fx[k * nchan_out_cov + i], extract_l( proto_mtx_norm_fx ) ), 4 ); /*Q.30*/
-                    move32();
-                }
-            }
-        }
-    }
-    ELSE
-    {
-        Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ) ); /*Q.31*/
-        Scale_sig32( proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ), -5 );                                     /*Scaling down to 26*/
-    }
-
-    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        hParamMC->num_outputs_diff = 0;
-        move16();
-        hParamMC->diff_proto_info = NULL;
-        hParamMC->h_output_synthesis_params.use_onset_filters = 0;
-        move16();
-        hParamMC->max_band_decorr = 0;
-        move16();
-        hParamMC->h_freq_domain_decorr_ap_params = NULL;
-        hParamMC->h_freq_domain_decorr_ap_state = NULL;
-    }
-    ELSE
-    {
-        hParamMC->num_outputs_diff = nchan_out_cov;
-        move16();
-        IF( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-
-        IF( NE_32( ( error = param_mc_get_diff_proto_info_fx( proto_matrix_fx, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info, Q26 ) ), IVAS_ERR_OK ) )
-        {
-            return error;
-        }
-
-        /* decorrelation */
-        hParamMC->h_freq_domain_decorr_ap_params = NULL;
-        hParamMC->h_freq_domain_decorr_ap_state = NULL;
-
-        ivas_dirac_dec_get_frequency_axis_fx( frequency_axis_fx, output_Fs, hParamMC->num_freq_bands ); // Q0
-
-        IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( hParamMC->h_freq_domain_decorr_ap_params ), &( hParamMC->h_freq_domain_decorr_ap_state ), hParamMC->num_freq_bands, hParamMC->num_outputs_diff,
-                                                            hParamMC->diff_proto_info->num_protos_diff, DIRAC_SYNTHESIS_COV_MC_LS, frequency_axis_fx, nchan_transport, output_Fs ) ),
-                   IVAS_ERR_OK ) )
-        {
-            return error;
-        }
-
-        hParamMC->h_output_synthesis_params.use_onset_filters = 0;
-        move16();
-        hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr;
-        move16();
-    }
-    hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->hMetadataPMC->nbands_coded];
-    move16();
-    max_param_band_residual = 0;
-    move16();
-
-    FOR( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- )
-    {
-        IF( LE_16( hParamMC->band_grouping[k], hParamMC->max_band_decorr ) )
-        {
-            max_param_band_residual = k;
-            move16();
-            assert( hParamMC->band_grouping[k] == hParamMC->max_band_decorr );
-            break;
-        }
-    }
-
-    /* output synthesis */
-    IF( NE_32( ( error = ivas_dirac_dec_output_synthesis_cov_open_fx( &( hParamMC->h_output_synthesis_params ), &( hParamMC->h_output_synthesis_cov_state ), hParamMC->max_band_decorr, PARAM_MC_MAX_NSLOTS, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual, nchan_transport, nchan_out_cov, proto_matrix_fx ) ), IVAS_ERR_OK ) )
-    {
-        return error;
-    }
-
-    ivas_param_mc_dec_compute_interpolator_fx( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator_fx );
-
-    /* Head or external rotation */
-    test();
-    test();
-    test();
-    IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
-    {
-        IF( ( hParamMC->hoa_encoder_fx = (Word32 *) malloc( st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        compute_hoa_encoder_mtx_fx( st_ivas->hTransSetup.ls_azimuth_fx, st_ivas->hTransSetup.ls_elevation_fx, hParamMC->hoa_encoder_fx, st_ivas->hTransSetup.nchan_out_woLFE, HEAD_ROTATION_HOA_ORDER );
-    }
-
-    /*-----------------------------------------------------------------*
-     * memory allocation
-     *-----------------------------------------------------------------*/
-
-    IF( hParamMC->max_band_decorr > 0 )
-    {
-        IF( ( hParamMC->proto_frame_f_fx = (Word32 *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        IF( ( hParamMC->proto_frame_dec_f_fx = (Word32 *) malloc( 2 * nchan_out_cov * hParamMC->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-    }
-    ELSE
-    {
-        hParamMC->proto_frame_f_fx = NULL;
-        hParamMC->proto_frame_dec_f_fx = NULL;
-    }
-
-    ivas_param_mc_dec_init_fx( hParamMC, nchan_transport, nchan_out_cov );
-
-    IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        Word16 n_cldfb_slots;
-
-        n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
-        move16();
-        IF( st_ivas->hDecoderConfig->Opt_tsm )
-        {
-            n_cldfb_slots = MAX_JBM_CLDFB_TIMESLOTS;
-            move16();
-        }
-
-        Word16 cldfb_buf_size = imult1616( imult1616( n_cldfb_slots, nchan_transport ), hParamMC->num_freq_bands );
-        IF( ( hParamMC->Cldfb_RealBuffer_tc_fx = (Word32 *) malloc( cldfb_buf_size * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
-        }
-        set32_fx( hParamMC->Cldfb_RealBuffer_tc_fx, 0, cldfb_buf_size );
-        IF( ( hParamMC->Cldfb_ImagBuffer_tc_fx = (Word32 *) malloc( cldfb_buf_size * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
-        }
-        set32_fx( hParamMC->Cldfb_ImagBuffer_tc_fx, 0, cldfb_buf_size );
-
-        hParamMC->sz = imult1616( imult1616( n_cldfb_slots, nchan_transport ), hParamMC->num_freq_bands );
-        move16();
-
-        IF( st_ivas->hTcBuffer == NULL )
-        {
-            IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
-            {
-                return error;
-            }
-        }
-    }
-    ELSE
-    {
-        hParamMC->Cldfb_RealBuffer_tc_fx = NULL;
-        hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
-    }
-
-    hParamMC->subframes_rendered = 0;
-    move16();
-    hParamMC->slots_rendered = 0;
-    move16();
-
-    st_ivas->hParamMC = hParamMC;
-    return error;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_get_param_band_mapping()
- *
- *
- *-------------------------------------------------------------------------*/
-
-static void ivas_param_mc_get_param_band_mapping(
-    const Word16 n_target_bands,
-    const Word16 *target_band_grouping,
-    const Word16 n_source_bands,
-    const Word16 *source_band_grouping,
-    PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping )
-{
-    Word16 target_band_idx;
-    Word16 source_band_idx = 0;
-    move16();
-    Word16 source_band_cnt_total;
-
-    FOR( target_band_idx = 0; target_band_idx < n_target_bands; target_band_idx++ )
-    {
-        Word16 upper = target_band_grouping[target_band_idx + 1];
-        Word16 lower = target_band_grouping[target_band_idx];
-        Word16 source_band_in_target_band_cnt = 0;
-        Word16 norm_fac_fx = 32767; // 1.Q15
-        source_band_cnt_total = 0;
-        move16();
-        move16();
-        move16();
-
-        FOR( source_band_idx = 0; source_band_idx < n_source_bands; source_band_idx++ )
-        {
-            /* find lowest corresponding source band*/
-            test();
-            IF( LE_16( source_band_grouping[source_band_idx], lower ) && GE_16( source_band_grouping[source_band_idx + 1], lower ) )
-            {
-                DO
-                {
-                    Word16 source_bands_in_target_band = sub( s_min( source_band_grouping[source_band_idx + 1], upper ), s_max( source_band_grouping[source_band_idx], lower ) );
-                    IF( source_bands_in_target_band )
-                    {
-                        source_band_cnt_total = add( source_band_cnt_total, source_bands_in_target_band );
-                        parameter_band_mapping->source_band_idx[target_band_idx][source_band_in_target_band_cnt] = source_band_idx;
-                        parameter_band_mapping->source_band_factor_fx[target_band_idx][source_band_in_target_band_cnt++] = shl( source_bands_in_target_band, 10 ); /*Q10*/
-                        move16();
-                        move16();
-                    }
-                    source_band_idx++;
-                }
-                WHILE( LE_16( source_band_grouping[source_band_idx], upper ) && LT_16( source_band_idx, n_source_bands ) );
-                BREAK;
-            }
-        }
-        norm_fac_fx = div_s( 1, source_band_cnt_total ); /*Q15*/
-        FOR( source_band_idx = 0; source_band_idx < source_band_in_target_band_cnt; source_band_idx++ )
-        {
-            parameter_band_mapping->source_band_factor_fx[target_band_idx][source_band_idx] = shl_sat( mult( parameter_band_mapping->source_band_factor_fx[target_band_idx][source_band_idx], norm_fac_fx ) /*Q10*/, 5 ); /*Q15*/
-            move16();
-        }
-        parameter_band_mapping->n_source_bands[target_band_idx] = source_band_in_target_band_cnt;
-        move16();
-    }
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_reconfig()
- *
- * Reconfiguration of ParamMC decoder
- *-------------------------------------------------------------------------*/
-
-ivas_error ivas_param_mc_dec_reconfig_fx(
-    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */
-)
-{
-    Word16 k, nchan_transport;
-    PARAM_MC_DEC_HANDLE hParamMC;
-    Word16 nchan_out_transport;
-    Word16 nchan_out_cov;
-    Word32 proto_matrix_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
-    Word32 proto_mtx_norm_fx;
-    Word16 max_param_band_residual;
-    UWord16 config_index;
-    MC_LS_SETUP mc_ls_setup;
-    Word32 output_Fs, ivas_total_brate;
-    ivas_error error;
-    Word16 nchan_transport_old;
-    Word16 num_param_bands_old;
-    PARAM_MC_PARAMETER_BAND_MAPPING parameter_band_mapping;
-    Word16 band_grouping_old[20 + 1];
-
-    hParamMC = st_ivas->hParamMC;
-    error = IVAS_ERR_OK;
-    move32();
-    /* save important config information from the previous state */
-    nchan_transport_old = st_ivas->nchan_transport;
-    move32();
-    num_param_bands_old = hParamMC->hMetadataPMC->num_parameter_bands;
-    move32();
-
-    /*-----------------------------------------------------------------*
-     * prepare library opening
-     *-----------------------------------------------------------------*/
-
-    output_Fs = st_ivas->hDecoderConfig->output_Fs;
-    move32();
-    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
-    move32();
-    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup_fx( st_ivas->transport_config );
-    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-
-    test();
-    IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-    }
-    ELSE
-    {
-        nchan_out_cov = nchan_out_transport;
-        move16();
-    }
-
-    st_ivas->nchan_transport = ivas_param_mc_getNumTransportChannels_fx( ivas_total_brate, mc_ls_setup );
-    move16();
-    config_index = ivas_param_mc_get_configuration_index_fx( mc_ls_setup, ivas_total_brate );
-    nchan_transport = st_ivas->nchan_transport;
-    move16();
-
-    SWITCH( nchan_transport )
-    {
-        case 4:
-        case 3:
-            st_ivas->nCPE = 2;
-            move16();
-            st_ivas->nSCE = 0;
-            move16();
-            st_ivas->element_mode_init = IVAS_CPE_MDCT;
-            move16();
-            BREAK;
-        case 2:
-            st_ivas->nCPE = 1;
-            move16();
-            st_ivas->nSCE = 0;
-            move16();
-            st_ivas->element_mode_init = IVAS_CPE_MDCT;
-            move16();
-
-            BREAK;
-    }
-
-    /*-----------------------------------------------------------------*
-     * set input parameters
-     *-----------------------------------------------------------------*/
-    hParamMC->num_freq_bands = shr( add( (Word16) Mpy_32_32( output_Fs, INV_CLDFB_BANDWIDTH_Q31 << 1 ), 1 ), 1 ); // Q0
-    move16();
-    hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands;
-    move16();
-
-    Copy( hParamMC->band_grouping, band_grouping_old, add( hParamMC->hMetadataPMC->num_parameter_bands, 1 ) );
-    ivas_param_mc_metadata_open_fx( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );
-    /* Band Grouping */
-    IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 20 ) )
-    {
-        Copy( param_mc_band_grouping_20, hParamMC->band_grouping, 20 + 1 );
-    }
-    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 14 ) )
-    {
-        Copy( param_mc_band_grouping_14, hParamMC->band_grouping, 14 + 1 );
-    }
-    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 10 ) )
-    {
-        Copy( param_mc_band_grouping_10, hParamMC->band_grouping, 10 + 1 );
-    }
-    ELSE
-    {
-        assert( 0 && "nbands must be 20, 14, or 10!" );
-    }
-
-    ivas_param_mc_get_param_band_mapping( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->band_grouping, num_param_bands_old, band_grouping_old, &parameter_band_mapping );
-
-    test();
-    IF( NE_16( nchan_transport_old, nchan_transport ) || NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) )
-    {
-        Word16 *ild_q_old_fx = hParamMC->icld_q_fx; // Q8
-        Word16 *icc_q_old_fx = hParamMC->icc_q_fx;  // Q15
-
-        IF( ( hParamMC->icc_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        IF( ( hParamMC->icld_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        set16_fx( hParamMC->icld_q_fx, PARAM_MC_DEFAULT_MIN_ILD_FX, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ); /*Q8*/
-        set16_fx( hParamMC->icc_q_fx, 0, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe );                            /*Q15*/
-
-        /* map old to new parameter banding, only for same number of TCs, needs some more thought for a changing number of TCs */
-        test();
-        IF( NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) && EQ_16( nchan_transport_old, nchan_transport ) )
-        {
-            Word16 new_param_band_idx, param_idx, source_param_idx;
-            Word16 num_param_lfe;
-            Word16 *p_icc_new_fx = hParamMC->icc_q_fx;  // Q15
-            Word16 *p_ild_new_fx = hParamMC->icld_q_fx; // Q8
-            Word16 p_ild_new_e = 23;
-            move16();
-            Word16 p_ild_new_tmp;
-
-            /* ICC */
-            num_param_lfe = hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe;
-            move16();
-            FOR( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ )
-            {
-                FOR( param_idx = 0; param_idx < num_param_lfe; param_idx++ )
-                {
-                    *p_icc_new_fx = 0;
-                    move16();
-                    FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
-                    {
-                        *p_icc_new_fx = add( *p_icc_new_fx, mult( icc_q_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx] * num_param_lfe + param_idx], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx] ) ); /*Q15*/
-                        move16();
-                    }
-                    p_icc_new_fx++;
-                }
-            }
-
-            /* ILD */
-            num_param_lfe = hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe;
-            move16();
-            FOR( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ )
-            {
-                FOR( param_idx = 0; param_idx < num_param_lfe; param_idx++ )
-                {
-                    *p_ild_new_fx = 0;
-                    move16();
-                    FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
-                    {
-                        p_ild_new_tmp = extract_h( BASOP_util_Pow2( L_mult0( 10885 /*log2(10)/10*2^15*/, ild_q_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx] * num_param_lfe + param_idx] ), 8, &p_ild_new_e ) ); // 31 - p_ild_new_e - 16
-                        *p_ild_new_fx = add( *p_ild_new_fx, mult( p_ild_new_tmp, parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx] ) );
-                        move16();
-                    }
-                    *p_ild_new_fx = extract_l( L_shr( Mpy_32_16_1( L_add( BASOP_Util_Log2( *p_ild_new_fx ), L_add( 16 << Q25, L_shl( p_ild_new_e, 25 ) ) ), 24660 /*3.Q13*/ ), 15 ) ); // Q8
-                    move16();
-                    p_ild_new_fx++;
-                }
-            }
-        }
-        free( ild_q_old_fx );
-        free( icc_q_old_fx );
-    }
-
-    param_mc_set_num_synth_bands( output_Fs, hParamMC );
-
-    /* set max parameter band for abs cov */
-    k = 0;
-    move16();
-    WHILE( LE_16( hParamMC->band_grouping[k], PARAM_MC_MAX_BAND_ABS_COV_DEC ) )
-    {
-        hParamMC->max_param_band_abs_cov = k;
-        move16();
-        k = add( k, 1 );
-    }
-
-    /*-----------------------------------------------------------------*
-     * open sub-modules
-     *-----------------------------------------------------------------*/
-
-    /* prototype signal computation */
-
-    IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        IF( NE_16( nchan_transport_old, nchan_transport ) )
-        {
-            IF( st_ivas->hLsSetUpConversion != NULL )
-            {
-                ivas_ls_setup_conversion_close_fx( &st_ivas->hLsSetUpConversion );
-            }
-
-            IF( NE_32( ( error = ivas_ls_setup_conversion_open_fx( st_ivas ) ), IVAS_ERR_OK ) )
-            {
-                return error;
-            }
-
-            /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */
-            free( hParamMC->ls_conv_dmx_matrix_fx );
-
-            IF( ( hParamMC->ls_conv_dmx_matrix_fx = (Word32 *) malloc( nchan_out_transport * nchan_out_cov * sizeof( Word32 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-            }
-            FOR( k = 0; k < nchan_out_transport; k++ )
-            {
-                Copy32( st_ivas->hLsSetUpConversion->dmxMtx_fx[k], &hParamMC->ls_conv_dmx_matrix_fx[k * nchan_out_cov], nchan_out_cov );
-            }
-        }
-        /* convert ParamMC parameter bands to SFB */
-
-        st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth;
-        move16();
-        FOR( k = 0; k <= hParamMC->num_param_bands_synth; k++ )
-        {
-            st_ivas->hLsSetUpConversion->sfbOffset[k] = imult1616( PARAM_MC_BAND_TO_MDCT_BAND_RATIO, hParamMC->band_grouping[k] );
-            move16();
-        }
-        FOR( ; k < MAX_SFB + 2; k++ )
-        {
-            st_ivas->hLsSetUpConversion->sfbOffset[k] = 0;
-            move16();
-        }
-    }
-
-    IF( NE_16( nchan_transport_old, nchan_transport ) )
-    {
-        free( hParamMC->proto_matrix_int_fx );
-        IF( ( hParamMC->proto_matrix_int_fx = (Word32 *) malloc( nchan_out_transport * nchan_transport * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        hParamMC->proto_matrix_int_len = imult1616( nchan_out_transport, nchan_transport );
-        move16();
-        Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, hParamMC->proto_matrix_int_fx, hParamMC->proto_matrix_int_len ); /*Q31*/
-    }
-
-    test();
-    IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), -4 ); // Q30 -> Q26
-        matrix_product_fx( hParamMC->ls_conv_dmx_matrix_fx, nchan_out_cov, nchan_out_transport, 0,
-                           ivas_param_mc_conf[config_index].dmx_fac_fx, nchan_out_transport, nchan_transport, 0,
-                           proto_matrix_fx /*Q26*/ );
-        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), 4 ); // Q26 -> Q30
-
-        IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-        {
-            proto_mtx_norm_fx = ONE_IN_Q26; // Q26
-            move32();
-            FOR( k = 0; k < nchan_transport * nchan_out_cov; k++ )
-            {
-                proto_mtx_norm_fx = L_max( L_abs( proto_mtx_norm_fx ), L_abs( proto_matrix_fx[k] ) ); // Q26
-            }
-            proto_mtx_norm_fx = divide3232( ONE_IN_Q26, proto_mtx_norm_fx ); /*Q15*/
-
-            /* transfer flattened proto_matrix to 2D in hLsSetupConversion->dmxMtx */
-            FOR( k = 0; k < nchan_transport; k++ )
-            {
-                FOR( Word16 i = 0; i < nchan_out_cov; i++ )
-                {
-                    st_ivas->hLsSetUpConversion->dmxMtx_fx[k][i] = L_shl( Mpy_32_16_1( proto_matrix_fx[k * nchan_out_cov + i], (Word16) proto_mtx_norm_fx ), 4 ); // Q26 -> Q30
-                    move32();
-                }
-            }
-        }
-    }
-    ELSE
-    {
-        Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ) ); // proto_matrix_fx -> Q31
-        Scale_sig32( proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ), -5 );                                     // proto_matrix_fx -> Q26
-    }
-
-    test();
-    IF( NE_16( nchan_transport_old, nchan_transport ) && NE_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        Word16 i;
-        Word16 len;
-
-        /* close decorrelator */
-        ivas_dirac_dec_decorr_close_fx( &hParamMC->h_freq_domain_decorr_ap_params, &hParamMC->h_freq_domain_decorr_ap_state );
-
-        /* deallocate diffuse prototype info */
-        IF( hParamMC->diff_proto_info )
-        {
-            FOR( i = 0; i < hParamMC->diff_proto_info->num_protos_diff; i++ )
-            {
-                free( hParamMC->diff_proto_info->source_chan_idx[i] );
-                hParamMC->diff_proto_info->source_chan_idx[i] = NULL;
-
-                free( hParamMC->diff_proto_info->proto_fac_fx[i] );
-                hParamMC->diff_proto_info->proto_fac_fx[i] = NULL;
-            }
-
-            free( hParamMC->diff_proto_info->source_chan_idx );
-            hParamMC->diff_proto_info->source_chan_idx = NULL;
-
-            free( hParamMC->diff_proto_info->proto_fac_fx );
-            hParamMC->diff_proto_info->proto_fac_fx = NULL;
-
-            free( hParamMC->diff_proto_info->proto_index_diff );
-            hParamMC->diff_proto_info->proto_index_diff = NULL;
-
-            free( hParamMC->diff_proto_info->num_source_chan_diff );
-            hParamMC->diff_proto_info->num_source_chan_diff = NULL;
-
-            free( hParamMC->diff_proto_info );
-            hParamMC->diff_proto_info = NULL;
-        }
-
-        hParamMC->num_outputs_diff = nchan_out_cov;
-        move16();
-        IF( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        IF( ( param_mc_get_diff_proto_info_fx( proto_matrix_fx, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info, Q26 ) ) != IVAS_ERR_OK )
-        {
-            return error;
-        }
-
-        /* decorrelation */
-        hParamMC->h_freq_domain_decorr_ap_params = NULL;
-        hParamMC->h_freq_domain_decorr_ap_state = NULL;
-
-        Word16 frequency_axis_fx[CLDFB_NO_CHANNELS_MAX];
-        ivas_dirac_dec_get_frequency_axis_fx( frequency_axis_fx, output_Fs, hParamMC->num_freq_bands ); // Q0
-
-        IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( hParamMC->h_freq_domain_decorr_ap_params ), &( hParamMC->h_freq_domain_decorr_ap_state ), hParamMC->num_freq_bands, hParamMC->num_outputs_diff,
-                                                            hParamMC->diff_proto_info->num_protos_diff, DIRAC_SYNTHESIS_COV_MC_LS, frequency_axis_fx, nchan_transport, output_Fs ) ),
-                   IVAS_ERR_OK ) )
-        {
-            return error;
-        }
-        hParamMC->h_output_synthesis_params.use_onset_filters = 0;
-        move16();
-        hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr;
-        move16();
-        /* init decorrelation */
-        IF( hParamMC->max_band_decorr > 0 )
-        {
-
-            len = imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->h_freq_domain_decorr_ap_params->h_onset_detection_power_params.max_band_decorr );
-
-            /* init onsetDetectionPower */
-            set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx, len );
-            set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx, len );
-            hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.q_onset_detector = Q31;
-            move16();
-        }
-    }
-    hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->hMetadataPMC->nbands_coded];
-    move16();
-    max_param_band_residual = 0;
-    move16();
-
-    FOR( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- )
-    {
-        IF( LE_16( hParamMC->band_grouping[k], hParamMC->max_band_decorr ) )
-        {
-            max_param_band_residual = k;
-            move16();
-            assert( hParamMC->band_grouping[k] == hParamMC->max_band_decorr );
-            BREAK;
-        }
-    }
-
-    test();
-    IF( NE_16( nchan_transport_old, nchan_transport ) || NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) )
-    {
-        DIRAC_OUTPUT_SYNTHESIS_COV_STATE cov_state_old = hParamMC->h_output_synthesis_cov_state;
-        DIRAC_OUTPUT_SYNTHESIS_PARAMS params_old = hParamMC->h_output_synthesis_params;
-
-        Word32 tmp_buf_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-
-        set_zero_fx( tmp_buf_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
-
-        /* output synthesis */
-        IF( NE_32( ( error = ivas_dirac_dec_output_synthesis_cov_open_fx( &( hParamMC->h_output_synthesis_params ), &( hParamMC->h_output_synthesis_cov_state ), hParamMC->max_band_decorr, PARAM_MC_MAX_NSLOTS,
-                                                                          hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual, nchan_transport, nchan_out_cov, proto_matrix_fx ) ),
-                   IVAS_ERR_OK ) )
-        {
-            return error;
-        }
-
-        ivas_param_mc_dec_compute_interpolator_fx( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator_fx );
-
-        ivas_dirac_dec_output_synthesis_cov_init_fx( &( hParamMC->h_output_synthesis_cov_state ), nchan_transport, nchan_out_cov, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual );
-
-        /* map old to new parameter banding, only for same number of TCs, needs some more thought for changing number of TCs */
-        test();
-        IF( NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) && EQ_16( nchan_transport_old, nchan_transport ) )
-        {
-            Word16 new_param_band_idx, source_param_idx;
-
-            FOR( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ )
-            {
-                FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
-                {
-                    /* Cx */
-                    v_multc_fixed_16( cov_state_old.cx_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_transport_old ) );                                                                                                                                                                                                    // Q(31 - cov_state_old.cx_old_e)
-                    v_add_fixed_me( tmp_buf_fx, cov_state_old.cx_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], imult1616( nchan_transport_old, nchan_transport_old ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx])
-                    /* Cy */
-                    v_multc_fixed_16( cov_state_old.cy_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) );                                                                                                                                                                                                    // Q(31 - cov_state_old.cy_old_e)
-                    v_add_fixed_me( tmp_buf_fx, cov_state_old.cy_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx])
-                    /* mixing matrix*/
-                    v_multc_fixed_16( cov_state_old.mixing_matrix_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_out_cov ) );                                                                                                                                                                                                                                                      // Q(31 - mixing_matrix_old_exp)
-                    v_add_fixed_me( tmp_buf_fx, cov_state_old.mixing_matrix_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], imult1616( nchan_transport_old, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx])
-                }
-            }
-            FOR( new_param_band_idx = 0; new_param_band_idx < max_param_band_residual; new_param_band_idx++ )
-            {
-                FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
-                {
-                    /* residual mixing matrix*/
-                    v_multc_fixed_16( cov_state_old.mixing_matrix_res_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) );                                                                                                                                                                                                                                                                      // Q(31 - mixing_matrix_res_old_exp)
-                    v_add_fixed_me( tmp_buf_fx, cov_state_old.mixing_matrix_res_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx])
-                }
-            }
-        }
-        ivas_dirac_dec_output_synthesis_cov_close_fx( &params_old, &cov_state_old );
-    }
-
-    /*-----------------------------------------------------------------*
-     * memory allocation
-     *-----------------------------------------------------------------*/
-
-    test();
-    IF( ( hParamMC->max_band_decorr > 0 ) && NE_16( nchan_transport_old, nchan_transport ) )
-    {
-        free( hParamMC->proto_frame_f_fx );
-        IF( ( hParamMC->proto_frame_f_fx = (Word32 *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-        set_zero_fx( hParamMC->proto_frame_f_fx, shl( imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->num_freq_bands ), 1 ) );
-    }
-
-
-    IF( NE_16( nchan_transport_old, nchan_transport ) )
-    {
-        IF( NE_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-        {
-            Word16 n_cldfb_slots;
-            IF( hParamMC->Cldfb_RealBuffer_tc_fx != NULL )
-            {
-                free( hParamMC->Cldfb_RealBuffer_tc_fx );
-                hParamMC->Cldfb_RealBuffer_tc_fx = NULL; // Q12
-            }
-            IF( hParamMC->Cldfb_ImagBuffer_tc_fx != NULL )
-            {
-                free( hParamMC->Cldfb_ImagBuffer_tc_fx );
-                hParamMC->Cldfb_ImagBuffer_tc_fx = NULL; // Q12
-            }
-
-            n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
-            move16();
-            IF( st_ivas->hDecoderConfig->Opt_tsm )
-            {
-                n_cldfb_slots = MAX_JBM_CLDFB_TIMESLOTS;
-                move16();
-            }
-            Word16 cldfb_size = imult1616( imult1616( n_cldfb_slots, nchan_transport ), hParamMC->num_freq_bands );
-            IF( ( hParamMC->Cldfb_RealBuffer_tc_fx = (Word32 *) malloc( cldfb_size * sizeof( Word32 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
-            }
-            set_zero_fx( hParamMC->Cldfb_RealBuffer_tc_fx, cldfb_size );
-
-            IF( ( hParamMC->Cldfb_ImagBuffer_tc_fx = (Word32 *) malloc( cldfb_size * sizeof( Word32 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
-            }
-            set_zero_fx( hParamMC->Cldfb_ImagBuffer_tc_fx, cldfb_size );
-        }
-        ELSE
-        {
-            IF( hParamMC->Cldfb_RealBuffer_tc_fx != NULL )
-            {
-                free( hParamMC->Cldfb_RealBuffer_tc_fx );
-                hParamMC->Cldfb_RealBuffer_tc_fx = NULL;
-            }
-            IF( hParamMC->Cldfb_ImagBuffer_tc_fx != NULL )
-            {
-                free( hParamMC->Cldfb_ImagBuffer_tc_fx );
-                hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
-            }
-        }
-    }
-    return error;
-}
-
-
-/*-------------------------------------------------------------------------
- * param_mc_get_num_cldfb_syntheses()
- *
- * calculate the necessary number of CLDFB synthesis instances
- *------------------------------------------------------------------------*/
-
-/*! r: number of cldfb synthesis instances */
-Word16 param_mc_get_num_cldfb_syntheses_fx(
-    Decoder_Struct *st_ivas /* i  : Parametric MC handle */
-)
-{
-    Word16 num_cldfb_syntheses;
-
-    num_cldfb_syntheses = 0;
-    move16();
-
-    /* sanity check*/
-    IF( st_ivas->hParamMC == NULL )
-    {
-        assert( 0 && "ParamMC handle does not exist!\n" );
-    }
-
-    test();
-    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
-    {
-        num_cldfb_syntheses = 2;
-        move16();
-    }
-    ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
-    {
-        num_cldfb_syntheses = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-    }
-    ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MC_PARAMMC ) )
-    {
-        num_cldfb_syntheses = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-    }
-
-    return num_cldfb_syntheses;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_close()
- *
- * Close Parametric MC memories
- *------------------------------------------------------------------------*/
-
-void ivas_param_mc_dec_close_fx(
-    PARAM_MC_DEC_HANDLE *hParamMC_out /* i/o: Parametric MC decoder handle   */
-)
-{
-    UWord16 i;
-    PARAM_MC_DEC_HANDLE hParamMC;
-
-    IF( hParamMC_out == NULL || *hParamMC_out == NULL )
-    {
-        return;
-    }
-
-    hParamMC = *hParamMC_out;
-
-    /* close sub-modules */
-    ivas_dirac_dec_output_synthesis_cov_close_fx( &hParamMC->h_output_synthesis_params, &hParamMC->h_output_synthesis_cov_state );
-
-    IF( hParamMC->h_freq_domain_decorr_ap_params != NULL || hParamMC->h_freq_domain_decorr_ap_state != NULL )
-    {
-        ivas_dirac_dec_decorr_close_fx( &hParamMC->h_freq_domain_decorr_ap_params, &hParamMC->h_freq_domain_decorr_ap_state );
-    }
-
-    /* parameter decoding */
-    IF( hParamMC->hMetadataPMC != NULL )
-    {
-        free( hParamMC->hMetadataPMC );
-        hParamMC->hMetadataPMC = NULL;
-    }
-    IF( hParamMC->icc_q_fx != NULL )
-    {
-        free( hParamMC->icc_q_fx );
-        hParamMC->icc_q_fx = NULL; // Q15
-    }
-
-    IF( hParamMC->icld_q_fx != NULL )
-    {
-        free( hParamMC->icld_q_fx );
-        hParamMC->icld_q_fx = NULL; // Q8
-    }
-    /* diffuse prototype info */
-    IF( hParamMC->diff_proto_info )
-    {
-        FOR( i = 0; i < hParamMC->diff_proto_info->num_protos_diff; i++ )
-        {
-            free( hParamMC->diff_proto_info->source_chan_idx[i] );
-            hParamMC->diff_proto_info->source_chan_idx[i] = NULL;
-
-            free( hParamMC->diff_proto_info->proto_fac_fx[i] );
-            hParamMC->diff_proto_info->proto_fac_fx[i] = NULL;
-        }
-
-        free( hParamMC->diff_proto_info->source_chan_idx );
-        hParamMC->diff_proto_info->source_chan_idx = NULL;
-
-        free( hParamMC->diff_proto_info->proto_fac_fx );
-        hParamMC->diff_proto_info->proto_fac_fx = NULL;
-
-        free( hParamMC->diff_proto_info->proto_index_diff );
-        hParamMC->diff_proto_info->proto_index_diff = NULL;
-
-        free( hParamMC->diff_proto_info->num_source_chan_diff );
-        hParamMC->diff_proto_info->num_source_chan_diff = NULL;
-
-        free( hParamMC->diff_proto_info );
-        hParamMC->diff_proto_info = NULL;
-    }
-    /* States */
-    /* free prototype signal buffers */
-    IF( hParamMC->proto_frame_f_fx != NULL )
-    {
-        free( hParamMC->proto_frame_f_fx );
-        hParamMC->proto_frame_f_fx = NULL;
-    }
-
-    IF( hParamMC->proto_frame_dec_f_fx != NULL )
-    {
-        free( hParamMC->proto_frame_dec_f_fx );
-        hParamMC->proto_frame_dec_f_fx = NULL;
-    }
-
-    IF( hParamMC->ls_conv_dmx_matrix_fx != NULL )
-    {
-        free( hParamMC->ls_conv_dmx_matrix_fx );
-        hParamMC->ls_conv_dmx_matrix_fx = NULL;
-    }
-
-    IF( hParamMC->proto_matrix_int_fx != NULL )
-    {
-        free( hParamMC->proto_matrix_int_fx );
-        hParamMC->proto_matrix_int_fx = NULL;
-    }
-
-    IF( hParamMC->hoa_encoder_fx != NULL )
-    {
-        free( hParamMC->hoa_encoder_fx );
-        hParamMC->hoa_encoder_fx = NULL;
-    }
-    IF( hParamMC->Cldfb_RealBuffer_tc_fx != NULL )
-    {
-        free( hParamMC->Cldfb_RealBuffer_tc_fx );
-        hParamMC->Cldfb_RealBuffer_tc_fx = NULL;
-    }
-    IF( hParamMC->Cldfb_ImagBuffer_tc_fx != NULL )
-    {
-        free( hParamMC->Cldfb_ImagBuffer_tc_fx );
-        hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
-    }
-
-    free( *hParamMC_out );
-    *hParamMC_out = NULL;
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_read_BS()
- *
- * Read the Parametric MC metadata
- *------------------------------------------------------------------------*/
-
-void ivas_param_mc_dec_read_BS_fx(
-    const Word32 ivas_total_brate, /* i  : IVAS total bitrate      */
-    Decoder_State *st,             /* i/o: decoder state structure */
-    PARAM_MC_DEC_HANDLE hParamMC,  /* i/o: decoder ParamMC handle  */
-    Word16 *nb_bits                /* o  : number of bits written  */
-)
-{
-    Word16 param_frame_idx;
-    Word16 band_step;
-    UWord16 bit_buffer[PARAM_MC_MAX_BITS];
-    Word16 bits_to_copy;
-    Word16 bit_pos;
-    Word16 num_lfe_bands;
-    Word16 num_param_bands;
-    Word16 metadata_bit_pos;
-    Word16 i, j, k;
-    Word16 icc_map_size;
-    Word16 icc_map_size_wo_lfe;
-    Word16 ild_map_size;
-    Word16 ild_map_size_wo_lfe;
-    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC;
-
-    push_wmops( "param_mc_read_bs" );
-
-    /* Inits */
-    *nb_bits = 0;
-    move16();
-    hMetadataPMC = hParamMC->hMetadataPMC;
-    icc_map_size = hMetadataPMC->icc_mapping_conf->icc_map_size_lfe;
-    move16();
-    icc_map_size_wo_lfe = hMetadataPMC->icc_mapping_conf->icc_map_size_wo_lfe;
-    move16();
-    ild_map_size = hMetadataPMC->ild_mapping_conf->ild_map_size_lfe;
-    move16();
-    ild_map_size_wo_lfe = hMetadataPMC->ild_mapping_conf->ild_map_size_wo_lfe;
-    move16();
-
-    IF( !st->bfi )
-    {
-        /*metadata_bit_pos = extract_l(ivas_total_brate / FRAMES_PER_SEC - 1);
-        bits_to_copy = s_min(extract_l(ivas_total_brate / FRAMES_PER_SEC), PARAM_MC_MAX_BITS);*/
-        Word16 temp = extract_l( Mpy_32_32_r( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
-        metadata_bit_pos = sub( temp, 1 );
-        bits_to_copy = s_min( temp, PARAM_MC_MAX_BITS );
-
-        /* copy and reverse metadata */
-        FOR( bit_pos = 0; bit_pos < bits_to_copy; bit_pos++ )
-        {
-            bit_buffer[bit_pos] = st->bit_stream[metadata_bit_pos];
-            move16();
-            metadata_bit_pos = sub( metadata_bit_pos, 1 );
-            move16();
-        }
-
-        bit_pos = 0;
-        move16();
-
-        /* read reserved bit */
-        hMetadataPMC->lfe_on = bit_buffer[bit_pos++];
-        move16();
-
-        /* get coded bwidth */
-        {
-            Word16 pos;
-            Word16 bw = 0;
-            move16();
-            FOR( pos = 0; pos < 2; pos++ )
-            {
-                bw = add( bw, extract_l( L_shl( bit_buffer[bit_pos++], pos ) ) );
-            }
-            hMetadataPMC->coded_bwidth = bw;
-            move16();
-        }
-
-        /* set tables if coded band width differs from last frame */
-        IF( NE_16( hMetadataPMC->coded_bwidth, hMetadataPMC->last_coded_bwidth ) )
-        {
-            ivas_param_mc_set_coded_bands_fx( hMetadataPMC );
-            param_mc_set_num_synth_bands( st->output_Fs, hParamMC );
-            hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->num_param_bands_synth];
-            move16();
-        }
-
-        param_frame_idx = bit_buffer[bit_pos++];
-        move16();
-        hMetadataPMC->param_frame_idx = param_frame_idx;
-        move16();
-        num_param_bands = hMetadataPMC->nbands_in_param_frame[param_frame_idx];
-        move16();
-
-        hMetadataPMC->bAttackPresent = bit_buffer[bit_pos++];
-        move16();
-        hMetadataPMC->attackIndex = 0;
-        move16();
-        band_step = 1;
-        move16();
-        num_lfe_bands = 0;
-        move16();
-
-        IF( hMetadataPMC->bAttackPresent )
-        {
-            FOR( i = 2; i >= 0; i-- )
-            {
-                hMetadataPMC->attackIndex = add( hMetadataPMC->attackIndex, extract_l( L_shl( bit_buffer[bit_pos++], i ) ) );
-            }
-
-            band_step = PARAM_MC_TRANSIENT_BAND_STEP;
-            move16();
-
-            /*num_lfe_bands = add(PARAM_MC_MAX_BAND_LFE / band_step, (PARAM_MC_MAX_BAND_LFE % band_step) ? 1 : 0);
-            num_param_bands = add(hMetadataPMC->nbands_coded / band_step, ((hMetadataPMC->nbands_coded % band_step) ? 1 : 0));*/
-            Word16 temp_e;
-            temp = BASOP_Util_Divide3232_Scale( PARAM_MC_MAX_BAND_LFE, band_step, &temp_e );
-            temp = shr( temp, sub( 15, temp_e ) );
-            Word16 temp1;
-            IF( PARAM_MC_MAX_BAND_LFE % band_step )
-            {
-                temp1 = 1;
-            }
-            ELSE
-            {
-                temp1 = 0;
-            }
-            move16();
-            num_lfe_bands = add( temp, temp1 );
-
-            temp = BASOP_Util_Divide3232_Scale( hMetadataPMC->nbands_coded, band_step, &temp_e );
-            temp = shr( temp, sub( 15, temp_e ) );
-            Word16 temp2;
-            IF( hMetadataPMC->nbands_coded % band_step )
-            {
-                temp2 = 1;
-            }
-            ELSE
-            {
-                temp2 = 0;
-            }
-            move16();
-            num_param_bands = add( temp, temp2 );
-        }
-        ELSE
-        {
-            FOR( j = 0; j < PARAM_MC_MAX_BAND_LFE; j += band_step )
-            {
-                IF( EQ_16( param_frame_idx, hMetadataPMC->coding_band_mapping[j] ) )
-                {
-                    /* LFE ICC is always the last ICC in coding band 0 */
-                    num_lfe_bands = add( num_lfe_bands, 1 );
-                    move16();
-                }
-            }
-        }
-
-        IF( !hMetadataPMC->lfe_on )
-        {
-            num_lfe_bands = 0;
-            move16();
-        }
-
-        ivas_param_mc_bs_decode_parameter_values_fx( bit_buffer, &bit_pos, bits_to_copy, &st->BER_detect, hMetadataPMC, &hMetadataPMC->icc_coding,
-                                                     icc_map_size_wo_lfe, icc_map_size, num_lfe_bands, band_step, num_param_bands, hParamMC->icc_q_fx );
-
-        IF( !st->BER_detect )
-        {
-            ivas_param_mc_bs_decode_parameter_values_fx( bit_buffer, &bit_pos, bits_to_copy, &st->BER_detect, hMetadataPMC, &hMetadataPMC->ild_coding,
-                                                         ild_map_size_wo_lfe, ild_map_size, num_lfe_bands, band_step, num_param_bands, hParamMC->icld_q_fx );
-        }
-        /* set LFE ILD and ICC to zero above PARAM_MC_MAX_BAND_LFE for attack frames */
-        IF( hMetadataPMC->bAttackPresent )
-        {
-            FOR( k = PARAM_MC_MAX_BAND_LFE; k < imult1616( band_step, num_lfe_bands ); k++ )
-            {
-                hParamMC->icc_q_fx[L_sub( L_mult0( add( k, 1 ), icc_map_size ), 1 )] = 32767; /* 1.0f in Q15 */
-                move16();
-                hParamMC->icld_q_fx[L_sub( L_mult0( add( k, 1 ), ild_map_size ), 1 )] = PARAM_MC_DEFAULT_MIN_ILD_FX; /* -92.0f in Q8 */
-                move16();
-            }
-        }
-
-        *nb_bits = bit_pos;
-        move16();
-
-    } /* if ( !st->bfi ) */
-
-    IF( st->bfi )
-    {
-        /* for PLC, use the saved ILDs and ICCs from the past and set the transient flag and transient position to zero */
-        hMetadataPMC->bAttackPresent = 0;
-        move16();
-        hMetadataPMC->attackIndex = 0;
-        move16();
-    }
-
-    pop_wmops();
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_digest_tc()
- *
- *
- *------------------------------------------------------------------------*/
-
-void ivas_param_mc_dec_digest_tc_fx(
-    Decoder_Struct *st_ivas,   /* i/o: IVAS decoder handle                                       */
-    const uint8_t nCldfbSlots, /* i  : number of CLFBS slots in the transport channels           */
-    Word32 *transport_channels_f_fx[],
-    Word16 transport_f_e )
-{
-    PARAM_MC_DEC_HANDLE hParamMC;
-    Word16 i, ch;
-    Word16 is_next_band, skip_next_band;
-    Word16 slot_idx, param_band_idx;
-    Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
-    Word16 nchan_out_cov;
-    /*CLDFB*/
-    /* format converter */
-    Word16 channel_active[MAX_OUTPUT_CHANNELS];
-    IVAS_OUTPUT_SETUP *hSynthesisOutputSetup;
-
-    hParamMC = st_ivas->hParamMC;
-    assert( hParamMC );
-    Word32 *pCx, *pCx_imag;
-    Word32 cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];                // Q(31 - cx_e)
-    Word32 cx_imag_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];           // Q(31 - cx_imag_e)
-    Word32 cx_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];      // Q(31 - cx_next_band_e)
-    Word32 cx_imag_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_imag_next_band_e)
-
-    Word16 cx_buff_e[2][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
-    Word16 cx_e;
-    Word16 cx_imag_e, tmp_e;
-    Word16 cx_imag_next_band_e, cx_next_band_e;
-    Word16 qout = 0;
-    move16();
-
-    Word32 real_part_fx, imag_part_fx, L_tmp1, L_tmp2;
-
-    Word16 max_e;
-
-    push_wmops( "param_mc_dec_digest_tc" );
-
-    set16_fx( channel_active, 0, MAX_CICP_CHANNELS );
-    nchan_transport = st_ivas->nchan_transport;
-    move16();
-    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-
-    test();
-    test();
-    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
-    {
-        nchan_out_cldfb = BINAURAL_CHANNELS;
-        move16();
-        set16_fx( channel_active, 1, nchan_out_cldfb );
-        nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-        hSynthesisOutputSetup = &st_ivas->hTransSetup;
-    }
-    ELSE IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
-    {
-        nchan_out_cov = nchan_out_transport;
-        move16();
-        nchan_out_cldfb = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-        hSynthesisOutputSetup = &st_ivas->hTransSetup;
-    }
-    ELSE IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-        nchan_out_cldfb = nchan_out_cov;
-        move16();
-        set16_fx( channel_active, 1, nchan_out_cov );
-        hSynthesisOutputSetup = &st_ivas->hOutSetup;
-    }
-    ELSE
-    {
-        nchan_out_cov = nchan_out_transport;
-        move16();
-        nchan_out_cldfb = nchan_out_transport;
-        move16();
-        set16_fx( channel_active, 1, nchan_out_cov );
-        hSynthesisOutputSetup = &st_ivas->hTransSetup;
-    }
-
-    /* adapt transient position */
-    IF( hParamMC->hMetadataPMC->bAttackPresent )
-    {
-        hParamMC->hMetadataPMC->attackIndex = s_max( 0, add( hParamMC->hMetadataPMC->attackIndex, shr( sub( nCldfbSlots, DEFAULT_JBM_CLDFB_TIMESLOTS ), 1 ) ) );
-        move16();
-    }
-    /* adapt subframes */
-    hParamMC->num_slots = nCldfbSlots;
-    move16();
-    hParamMC->slots_rendered = 0;
-    move16();
-    hParamMC->subframes_rendered = 0;
-    move16();
-    ivas_jbm_dec_get_adapted_subframes( nCldfbSlots, hParamMC->subframe_nbslots, &hParamMC->nb_subframes );
-    st_ivas->hTcBuffer->nb_subframes = hParamMC->nb_subframes;
-    move16();
-    Copy( hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hParamMC->nb_subframes );
-
-    ivas_param_mc_dec_compute_interpolator_fx( hParamMC->hMetadataPMC->bAttackPresent, hParamMC->hMetadataPMC->attackIndex, nCldfbSlots, hParamMC->h_output_synthesis_params.interpolator_fx );
-
-    /* loop over two bands at a time */
-    FOR( param_band_idx = 0; param_band_idx < hParamMC->num_param_bands_synth; param_band_idx += 2 )
-    {
-        /* don't process next band if it exceeds the limit */
-        skip_next_band = ( ( param_band_idx + 1 ) == hParamMC->num_param_bands_synth ) ? 1 : 0;
-
-        set_zero_fx( cx_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-        set_zero_fx( cx_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-        set_zero_fx( cx_next_band_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-        set_zero_fx( cx_imag_next_band_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-
-        cx_e = 0;
-        move16();
-        cx_imag_e = 0;
-        move16();
-        cx_next_band_e = 0;
-        move16();
-        cx_imag_next_band_e = 0;
-        move16();
-        /* slot loop for gathering the input data */
-        FOR( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )
-        {
-            IF( st_ivas->hDecoderConfig->Opt_tsm )
-            {
-                IF( param_band_idx == 0 ) /* only run cldfbAna once */
-                {
-                    Word32 RealBuffer_fx[CLDFB_NO_CHANNELS_MAX];
-                    Word32 ImagBuffer_fx[CLDFB_NO_CHANNELS_MAX];
-
-                    /* CLDFB Analysis*/
-                    FOR( ch = 0; ch < nchan_transport; ch++ )
-                    {
-                        qout = transport_f_e;
-                        move16();
-                        cldfbAnalysis_ts_fx_fixed_q( &( transport_channels_f_fx[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch], &qout );
-
-                        Copy32( RealBuffer_fx, &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
-                        Copy32( ImagBuffer_fx, &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
-                    }
-
-                    hParamMC->Cldfb_ImagBuffer_tc_e = qout;
-                    move16();
-                }
-            }
-            IF( GE_16( slot_idx, shl( hParamMC->hMetadataPMC->attackIndex, 1 ) ) )
-            {
-                FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
-                {
-                    test();
-                    IF( is_next_band && skip_next_band )
-                    {
-                        continue;
-                    }
-                    IF( is_next_band )
-                    {
-                        ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
-                                                                                      /*hParamMC->Cldfb_RealBuffer_tc_e*/ Q31 - Q6,
-                                                                                      &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
-                                                                                      /*hParamMC->Cldfb_ImagBuffer_tc_e*/ Q31 - Q6,
-                                                                                      cx_next_band_fx,
-                                                                                      &cx_next_band_e,
-                                                                                      cx_imag_next_band_fx,
-                                                                                      &cx_imag_next_band_e,
-                                                                                      hParamMC,
-                                                                                      add( param_band_idx, is_next_band ),
-                                                                                      nchan_transport );
-                    }
-                    ELSE
-                    {
-                        ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
-                                                                                      /*hParamMC->Cldfb_RealBuffer_tc_e*/ Q31 - Q6,
-                                                                                      &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
-                                                                                      /*hParamMC->Cldfb_ImagBuffer_tc_e*/ Q31 - Q6,
-                                                                                      cx_fx,
-                                                                                      &cx_e,
-                                                                                      cx_imag_fx,
-                                                                                      &cx_imag_e,
-                                                                                      hParamMC,
-                                                                                      add( param_band_idx, is_next_band ),
-                                                                                      nchan_transport );
-                    }
-                }
-            }
-        }
-
-        Word16 tmp_cx_e, tmp_cx_imag_e;
-        /* map from complex input covariance to real values */
-        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
-        {
-            test();
-            IF( is_next_band && skip_next_band )
-            {
-                continue;
-            }
-            /* Cx for transport channels */
-            IF( is_next_band )
-            {
-                pCx = &cx_next_band_fx[0];
-                pCx_imag = &cx_imag_next_band_fx[0];
-                tmp_cx_e = cx_next_band_e;
-                tmp_cx_imag_e = cx_imag_next_band_e;
-            }
-            ELSE
-            {
-                pCx = &cx_fx[0];
-                pCx_imag = &cx_imag_fx[0];
-                tmp_cx_e = cx_e;
-                tmp_cx_imag_e = cx_imag_e;
-            }
-
-            FOR( i = 0; i < nchan_transport * nchan_transport; i++ )
-            {
-                real_part_fx = pCx[i]; // Q(31 - cx_buff_e)
-                imag_part_fx = pCx_imag[i];
-                move32();
-                move32();
-                cx_buff_e[is_next_band][i] = tmp_cx_e;
-                move16();
-                /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
-                IF( LT_16( param_band_idx, hParamMC->max_param_band_abs_cov ) )
-                {
-                    L_tmp1 = Mpy_32_32( real_part_fx, real_part_fx );
-                    L_tmp2 = Mpy_32_32( imag_part_fx, imag_part_fx );
-                    L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp1, add( tmp_cx_e, tmp_cx_e ), L_tmp2, add( tmp_cx_imag_e, tmp_cx_imag_e ), &tmp_e );
-                    pCx[i] = Sqrt32( L_tmp1, &tmp_e );
-                    move32();
-                    cx_buff_e[is_next_band][i] = tmp_e;
-                    move16();
-                }
-                ELSE
-                {
-                    pCx[i] = real_part_fx;
-                    move32();
-                    cx_buff_e[is_next_band][i] = tmp_cx_e;
-                    move16();
-                }
-            }
-        }
-
-        max_e = cx_buff_e[0][0];
-        move16();
-
-        /* Cx for transport channels */
-        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
-        {
-            FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )
-            {
-
-                IF( LT_16( max_e, cx_buff_e[is_next_band][i] ) )
-                {
-                    max_e = cx_buff_e[is_next_band][i];
-                }
-            }
-        }
-        /* Cx for transport channels */
-        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
-        {
-            FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )
-            {
-                if ( is_next_band == 0 )
-                {
-                    cx_fx[i] = L_shr( cx_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );
-                }
-                else
-                {
-                    cx_next_band_fx[i] = L_shr( cx_next_band_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );
-                }
-                move32();
-            }
-        }
-        cx_e = max_e;
-        move16();
-
-
-        /* we have to do it similar to the encoder in case of attacks (i.e. accumulate two bands) to ensure correct DMX of the target covariance*/
-
-        test();
-        test();
-        IF( hParamMC->hMetadataPMC->bAttackPresent && ( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) ) )
-        {
-            v_add_fx( cx_fx, cx_next_band_fx, cx_fx, imult1616( nchan_transport, nchan_transport ) );
-            Copy32( cx_fx, cx_next_band_fx, imult1616( nchan_transport, nchan_transport ) );
-        }
-
-        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
-        {
-            test();
-            IF( is_next_band && skip_next_band )
-            {
-                continue;
-            }
-
-            IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-            {
-                IF( is_next_band )
-                {
-
-                    ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_next_band_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );
-                }
-                ELSE
-                {
-
-                    ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );
-                }
-            }
-        }
-    }
-    pop_wmops();
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec()
- *
- * Parametric MC decoding process
- *------------------------------------------------------------------------*/
-
-void ivas_param_mc_dec_render_fx(
-    Decoder_Struct *st_ivas,        /* i/o: IVAS decoder handle                                     */
-    const UWord16 nSamplesAsked,    /* i  : number of CLDFB slots requested                         */
-    UWord16 *nSamplesRendered,      /* o  : number of CLDFB slots rendered                          */
-    UWord16 *nSamplesAvailableNext, /* o  : number of CLDFB slots still to render                   */
-    Word32 *output_f_fx[],          /* o  : rendered time signal                                    Q11*/
-    Word16 channel_active_fx[MAX_OUTPUT_CHANNELS] )
-{
-    PARAM_MC_DEC_HANDLE hParamMC;
-    Word16 i, ch;
-    Word16 subframe_idx;
-    Word16 slot_idx, slot_idx_start, slot_idx_start_cldfb_synth, first_sf, last_sf, slots_to_render;
-    Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
-    Word16 nchan_out_cov;
-
-    /*CLDFB*/
-    Word32 Cldfb_RealBuffer_fx[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
-    Word32 Cldfb_ImagBuffer_fx[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
-    Word32 Cldfb_RealBuffer_Binaural_fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
-    Word32 Cldfb_ImagBuffer_Binaural_fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
-    Word32 *p_output_f_fx[MAX_OUTPUT_CHANNELS];
-    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
-    {
-        p_output_f_fx[i] = output_f_fx[i]; // Q11
-    }
-    /*Decorrelator*/
-    Word32 onset_filter_fx[MAX_CICP_CHANNELS * CLDFB_NO_CHANNELS_MAX]; // Q31
-
-    /* format converter */
-    Word16 channel_active[MAX_OUTPUT_CHANNELS];
-    UWord16 nband_synth;
-#ifndef MSAN_FIX
-    UWord16 nchan_out_init, nbands_to_zero;
-#endif
-    UWord32 output_Fs;
-    Word16 tmp_q = 0;
-    move16();
-
-    hParamMC = st_ivas->hParamMC;
-    assert( hParamMC );
-
-    push_wmops( "param_mc_dec_render" );
-
-    set16_fx( channel_active, 0, MAX_CICP_CHANNELS );
-    nchan_transport = st_ivas->nchan_transport;
-    move16();
-    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-#ifndef MSAN_FIX
-    nchan_out_init = nchan_out_transport;
-    move16();
-#endif
-    output_Fs = st_ivas->hDecoderConfig->output_Fs;
-    move32();
-
-    test();
-    test();
-    IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
-    {
-        nchan_out_cldfb = BINAURAL_CHANNELS;
-        set16_fx( channel_active, 1, nchan_out_cldfb );
-#ifndef MSAN_FIX
-        IF( st_ivas->hCombinedOrientationData )
-        {
-            nchan_out_init = MAX_INTERN_CHANNELS;
-        }
-#endif
-        nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-    }
-    ELSE IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
-    {
-        nchan_out_cov = nchan_out_transport;
-        move16();
-        nchan_out_cldfb = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-    }
-    ELSE IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
-    {
-        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
-        nchan_out_cldfb = nchan_out_cov;
-        move16();
-        set16_fx( channel_active, 1, nchan_out_cov );
-    }
-    ELSE
-    {
-        nchan_out_cov = nchan_out_transport;
-        move16();
-        nchan_out_cldfb = nchan_out_transport;
-        move16();
-        set16_fx( channel_active, 1, nchan_out_cov );
-    }
-
-    /* set everything to zero that will not be decoded */
-    nband_synth = hParamMC->band_grouping[hParamMC->num_param_bands_synth];
-    move16();
-#ifdef MSAN_FIX
-    FOR( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )
-#else
-    FOR( ch = 0; ch < nchan_out_init; ch++ )
-#endif
-    {
-        FOR( slot_idx = 0; slot_idx < JBM_CLDFB_SLOTS_IN_SUBFRAME; slot_idx++ )
-        {
-#ifdef MSAN_FIX
-            set32_fx( &( Cldfb_RealBuffer_fx[ch][slot_idx][0] ), 0, CLDFB_NO_CHANNELS_MAX );
-            set32_fx( &( Cldfb_ImagBuffer_fx[ch][slot_idx][0] ), 0, CLDFB_NO_CHANNELS_MAX );
-#else
-            set32_fx( &( Cldfb_RealBuffer_fx[ch][slot_idx][nband_synth] ), 0, nbands_to_zero );
-            set32_fx( &( Cldfb_ImagBuffer_fx[ch][slot_idx][nband_synth] ), 0, nbands_to_zero );
-#endif
-        }
-    }
-
-    /* loop FOR synthesis, assume we always have to render in multiples of 5ms subframes with spills */
-    /*slots_to_render = min(sub(hParamMC->num_slots, hParamMC->slots_rendered), nSamplesAsked / NS2SA(output_Fs, CLDFB_SLOT_NS));
-     *nSamplesRendered = slots_to_render * NS2SA(output_Fs, CLDFB_SLOT_NS);*/
-    Word16 temp_e;
-    Word16 temp = BASOP_Util_Divide1616_Scale( nSamplesAsked, NS2SA( output_Fs, CLDFB_SLOT_NS ), &temp_e );
-    temp = shr( temp, sub( 15, temp_e ) );
-    slots_to_render = s_min( sub( hParamMC->num_slots, hParamMC->slots_rendered ), temp );
-    *nSamplesRendered = imult1616( slots_to_render, NS2SA( output_Fs, CLDFB_SLOT_NS ) );
-    move16();
-    Word16 j, k;
-    first_sf = hParamMC->subframes_rendered;
-    move16();
-    last_sf = first_sf;
-    move16();
-    WHILE( slots_to_render > 0 )
-    {
-        slots_to_render = sub( slots_to_render, hParamMC->subframe_nbslots[last_sf] );
-        last_sf = add( last_sf, 1 );
-    }
-    IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
-    {
-        FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
-        {
-            slots_to_render = add( slots_to_render, hParamMC->subframe_nbslots[subframe_idx] );
-        }
-    }
-    slot_idx_start = hParamMC->slots_rendered;
-    move16();
-    slot_idx_start_cldfb_synth = 0;
-    move16();
-
-#ifndef FIX_1009_OPT_PARAMMC_RENDER
-    Flag is_zero = 1;
-    move32();
-#endif
-    FOR( j = 0; j < st_ivas->hParamMC->hMetadataPMC->nbands_coded; j++ )
-    {
-#ifndef FIX_1009_OPT_PARAMMC_RENDER
-        is_zero = 1;
-        move16();
-        FOR( i = 0; i < hParamMC->h_output_synthesis_cov_state.mixing_matrix_len; i++ )
-        {
-            IF( hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx[j][i] != 0 )
-            {
-                is_zero = 0;
-                move16();
-            }
-        }
-        IF( is_zero )
-        {
-            hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp[j] = 0;
-            move16();
-        }
-        is_zero = 1;
-        move16();
-#else
-        Flag is_zero = is_zero_arr( hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx[j], hParamMC->h_output_synthesis_cov_state.mixing_matrix_len );
-        {
-            if ( is_zero != 0 )
-            {
-                hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp[j] = 0;
-                move16();
-            }
-        }
-#endif
-        IF( LT_16( st_ivas->hParamMC->band_grouping[j], st_ivas->hParamMC->h_output_synthesis_params.max_band_decorr ) )
-        {
-#ifndef FIX_1009_OPT_PARAMMC_RENDER
-            FOR( i = 0; i < hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_len; i++ )
-            {
-                IF( NE_32( hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx[j][i], 0 ) )
-                {
-                    is_zero = 0;
-                    move16();
-                }
-            }
-            IF( is_zero )
-#else
-            is_zero = is_zero_arr( hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx[j], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_len );
-            if ( is_zero != 0 )
-#endif
-            {
-                hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp[j] = 0;
-                move16();
-            }
-        }
-    }
-    FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
-    {
-        FOR( slot_idx = 0; slot_idx < hParamMC->subframe_nbslots[subframe_idx]; ( slot_idx++, hParamMC->slots_rendered++ ) )
-        {
-            IF( hParamMC->max_band_decorr > 0 )
-            {
-                /*-----------------------------------------------------------------*
-                 * protoype signal computation
-                 *-----------------------------------------------------------------*/
-                param_mc_protoSignalComputation_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
-                                                    &hParamMC->Cldfb_ImagBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
-                                                    hParamMC->proto_frame_f_fx, hParamMC->diff_proto_info,
-                                                    hParamMC->num_freq_bands );
-                /*-----------------------------------------------------------------*
-                 * frequency domain decorrelation
-                 *-----------------------------------------------------------------*/
-                /* decorrelate prototype frame */
-
-                ivas_dirac_dec_decorr_process_fx( hParamMC->num_freq_bands,
-                                                  hParamMC->num_outputs_diff,
-                                                  hParamMC->diff_proto_info->num_protos_diff,
-                                                  DIRAC_SYNTHESIS_COV_MC_LS,
-                                                  nchan_transport,
-                                                  hParamMC->proto_frame_f_fx,
-                                                  Q5,
-                                                  hParamMC->diff_proto_info->num_protos_diff,
-                                                  hParamMC->diff_proto_info->proto_index_diff,
-                                                  hParamMC->proto_frame_dec_f_fx, // output
-                                                  &tmp_q,
-                                                  onset_filter_fx,
-                                                  hParamMC->h_freq_domain_decorr_ap_params,
-                                                  hParamMC->h_freq_domain_decorr_ap_state );
-
-                /* copy decorrelated frame directly to output CLDFB buffer, acts also as intermediate */
-                /* memory FOR the decorrelated signal                                                 */
-                ivas_param_mc_dec_copy_diffuse_proto( hParamMC, Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, nchan_out_cov, slot_idx ); // Returns Cldfb buffers in Q11(tmp_q)
-
-                FOR( k = 0; k < nchan_out_cov; k++ )
-                {
-                    FOR( Word16 l = 0; l < hParamMC->h_output_synthesis_params.max_band_decorr; l++ )
-                    {
-                        Cldfb_RealBuffer_fx[k][slot_idx][l] = L_shl( Cldfb_RealBuffer_fx[k][slot_idx][l], sub( 6, tmp_q ) ); // Q11(tmp_q) -> Q6
-                        move32();
-                        Cldfb_ImagBuffer_fx[k][slot_idx][l] = L_shl( Cldfb_ImagBuffer_fx[k][slot_idx][l], sub( 6, tmp_q ) ); // Q11(tmp_q) -> Q6
-                        move32();
-                    }
-                }
-            }
-
-            /*-----------------------------------------------------------------*
-             * output synthesis
-             *-----------------------------------------------------------------*/
-            ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
-                &hParamMC->Cldfb_RealBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
-                &hParamMC->Cldfb_ImagBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, slot_idx, add( slot_idx, slot_idx_start ),
-                nchan_transport, nchan_out_cov, hParamMC );
-
-            test();
-            IF( ( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) )
-            {
-                test();
-                IF( st_ivas->hCombinedOrientationData && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
-                {
-                    Word16 Q_Cldfb_ImagBuffer, Q_Cldfb_RealBuffer;
-                    Q_Cldfb_ImagBuffer = Q6 - 5; /*max value =MAX_INTERN_CHANNELS(=16)*Cldfb_ImagBuffer_fx*/
-                    move16();
-                    Q_Cldfb_RealBuffer = Q6 - 5;
-                    move16();
-                    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
-                    {
-                        FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
-                        {
-                            Scale_sig32( Cldfb_RealBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q_Cldfb_ImagBuffer, Q6 ) ); // Q1
-                            Scale_sig32( Cldfb_ImagBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q_Cldfb_RealBuffer, Q6 ) ); // Q1
-                        }
-                    }
-                    ivas_param_mc_mc2sba_cldfb_fx( st_ivas->hTransSetup, hParamMC->hoa_encoder_fx, slot_idx, Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, nband_synth, GAIN_LFE_FX );
-                    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
-                    {
-                        FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
-                        {
-                            Scale_sig32( Cldfb_RealBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q6, Q_Cldfb_ImagBuffer ) ); // Q6
-                            Scale_sig32( Cldfb_ImagBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q6, Q_Cldfb_RealBuffer ) ); // Q6
-                        }
-                    }
-                }
-                ELSE
-                {
-                    /* remove LFE */
-                    UWord16 idx_out;
-                    UWord16 idx_lfe;
-                    IVAS_OUTPUT_SETUP hLsSetup;
-
-                    hLsSetup = st_ivas->hTransSetup;
-                    /* If LFE should be rendered, add it to other channels before removing */
-                    IF( st_ivas->hBinRenderer->render_lfe )
-                    {
-                        Word16 tmp_exp = 0;
-                        move16();
-                        Word16 tmp = BASOP_Util_Divide1616_Scale( GAIN_LFE_FX, hLsSetup.nchan_out_woLFE, &tmp_exp );
-                        tmp_exp = add( tmp_exp, ( 1 - 15 ) );
-                        FOR( idx_lfe = 0; idx_lfe < hLsSetup.num_lfe; idx_lfe++ )
-                        {
-                            /* Copy just the first band of LFE*/
-                            v_multc_fixed_16( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
-                            v_multc_fixed_16( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
-
-                            Scale_sig32( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1, tmp_exp );
-                            Scale_sig32( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1, tmp_exp );
-                            FOR( ch = 0; ch < ( hLsSetup.nchan_out_woLFE + hLsSetup.num_lfe ); ch++ )
-                            {
-                                IF( hLsSetup.index_lfe[idx_lfe] != ch )
-                                {
-                                    v_add_fixed( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_RealBuffer_fx[ch][slot_idx], 1, 0 );
-                                    v_add_fixed( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_ImagBuffer_fx[ch][slot_idx], 1, 0 );
-                                }
-                            }
-                        }
-                    }
-
-                    idx_out = 0;
-                    move16();
-                    idx_lfe = 0;
-                    move16();
-
-                    FOR( ch = 0; ch < ( hLsSetup.nchan_out_woLFE + hLsSetup.num_lfe ); ch++ )
-                    {
-                        test();
-                        IF( ( hLsSetup.num_lfe > 0 ) && EQ_16( hLsSetup.index_lfe[idx_lfe], ch ) )
-                        {
-                            IF( LT_16( idx_lfe, ( sub( hLsSetup.num_lfe, 1 ) ) ) )
-                            {
-                                idx_lfe = add( idx_lfe, 1 );
-                            }
-                        }
-                        ELSE IF( NE_16( ch, idx_out ) )
-                        {
-                            Copy32( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[idx_out][slot_idx], nband_synth );
-                            Copy32( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[idx_out][slot_idx], nband_synth );
-                            idx_out = add( idx_out, 1 );
-                        }
-                        ELSE
-                        {
-                            idx_out = add( idx_out, 1 );
-                        }
-                    }
-                }
-            }
-        }
-
-        test();
-        IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
-        {
-            Word16 input_q = 6;
-            move16();
-            /* Implement binaural rendering */
-            ivas_binRenderer_fx( st_ivas->hBinRenderer,
-                                 st_ivas->hCombinedOrientationData,
-                                 hParamMC->subframe_nbslots[subframe_idx],
-                                 Cldfb_RealBuffer_Binaural_fx, Cldfb_ImagBuffer_Binaural_fx,
-                                 Cldfb_RealBuffer_fx,
-                                 Cldfb_ImagBuffer_fx, &input_q );
-
-            FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
-            {
-                FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
-                {
-                    FOR( k = 0; k < CLDFB_NO_CHANNELS_MAX; k++ )
-                    {
-                        Cldfb_RealBuffer_fx[i][j][k] = L_shl( Cldfb_RealBuffer_fx[i][j][k], sub( Q6, input_q ) ); // Q6
-                        Cldfb_ImagBuffer_fx[i][j][k] = L_shl( Cldfb_ImagBuffer_fx[i][j][k], sub( Q6, input_q ) ); // Q6
-                    }
-                }
-            }
-
-            FOR( Word16 idx1 = 0; idx1 < BINAURAL_CHANNELS; idx1++ )
-            {
-                FOR( Word16 idx2 = 0; idx2 < hParamMC->subframe_nbslots[subframe_idx]; idx2++ )
-                {
-                    Scale_sig32( Cldfb_RealBuffer_Binaural_fx[idx1][idx2], CLDFB_NO_CHANNELS_MAX, sub( Q6, input_q ) ); // Q6
-                    Scale_sig32( Cldfb_ImagBuffer_Binaural_fx[idx1][idx2], CLDFB_NO_CHANNELS_MAX, sub( Q6, input_q ) ); // Q6
-                }
-            }
-            /* update combined orientation access index */
-            ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, hParamMC->num_freq_bands * hParamMC->subframe_nbslots[subframe_idx] );
-        }
-        ELSE IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
-        {
-            /* format conversion*/
-            ivas_lssetupconversion_process_param_mc_fx( st_ivas, hParamMC->subframe_nbslots[subframe_idx], Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, channel_active );
-        }
-
-
-        /* CLDFB synthesis */
-        FOR( ch = 0; ch < nchan_out_cldfb; ch++ )
-        {
-            Word32 *RealBuffer_fx[16];
-            Word32 *ImagBuffer_fx[16];
-
-            IF( channel_active[ch] )
-            {
-                /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands FOR 48kHz */
-                FOR( i = 0; i < hParamMC->subframe_nbslots[subframe_idx]; i++ )
-                {
-                    IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
-                    {
-                        RealBuffer_fx[i] = Cldfb_RealBuffer_Binaural_fx[ch][i]; // Q6
-                        ImagBuffer_fx[i] = Cldfb_ImagBuffer_Binaural_fx[ch][i]; // Q6
-                    }
-                    ELSE
-                    {
-                        RealBuffer_fx[i] = Cldfb_RealBuffer_fx[ch][i]; // Q6
-                        ImagBuffer_fx[i] = Cldfb_ImagBuffer_fx[ch][i]; // Q6
-                    }
-                }
-
-                Word16 len = add( imult1616( slot_idx_start_cldfb_synth, hParamMC->num_freq_bands ), imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
-                scale_sig32( output_f_fx[ch], len, 5 - 11 );
-                cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ),
-                                        imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ), st_ivas->cldfbSynDec[ch] );
-
-                scale_sig32( output_f_fx[ch], len, 11 - 5 ); // Q11
-            }
-            ELSE
-            {
-                set32_fx( &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ), 0, imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
-            }
-        }
-        slot_idx_start = add( slot_idx_start, hParamMC->subframe_nbslots[subframe_idx] );
-        slot_idx_start_cldfb_synth = add( slot_idx_start_cldfb_synth, hParamMC->subframe_nbslots[subframe_idx] );
-    }
-    IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
-    {
-        ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_f_fx, p_output_f_fx, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0 );
-    }
-
-    /* update */
-
-    IF( EQ_16( hParamMC->slots_rendered, hParamMC->num_slots ) )
-    {
-        hParamMC->hMetadataPMC->last_coded_bwidth = hParamMC->hMetadataPMC->coded_bwidth;
-        move16();
-        param_mc_update_mixing_matrices_fx( hParamMC, hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_transport, nchan_out_cov );
-    }
-
-
-    hParamMC->subframes_rendered = last_sf;
-    move16();
-    *nSamplesAvailableNext = imult1616( sub( hParamMC->num_slots, hParamMC->slots_rendered ), NS2SA( output_Fs, CLDFB_SLOT_NS ) );
-    move16();
-
-    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
-    {
-        channel_active_fx[i] = channel_active[i];
-        move16();
-    }
-    pop_wmops();
-
-    return;
-}
-
-/*-------------------------------------------------------------------------
- * param_mc_dec_init()
- *
- * Parametric MC decoding initialization
- *------------------------------------------------------------------------*/
-
-static void ivas_param_mc_dec_init_fx(
-    PARAM_MC_DEC_HANDLE hParamMC, /* i/o: decoder DirAC handle                 */
-    const Word16 nchan_transport, /* i  : number of input (transport) channels */
-    const Word16 nchan_cov )      /* i  : number of cov synthesis channels     */
-{
-    Word16 k;
-    UWord16 max_param_band_residual;
-    Word16 len;
-
-    /*-----------------------------------------------------------------*
-     * init sub-modules
-     *-----------------------------------------------------------------*/
-
-    /* decorrelation */
-    IF( hParamMC->max_band_decorr > 0 )
-    {
-        len = imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->h_freq_domain_decorr_ap_params->h_onset_detection_power_params.max_band_decorr );
-
-        /* init onsetDetectionPower */
-        set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx, len );
-        set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx, len );
-        hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.q_onset_detector = Q31;
-        move16();
-    }
-
-    max_param_band_residual = 0;
-    move16();
-
-    /* output synthesis */
-    FOR( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- )
-    {
-        IF( LE_16( hParamMC->band_grouping[k], hParamMC->max_band_decorr ) )
-        {
-            max_param_band_residual = k;
-            move16();
-            BREAK;
-        }
-    }
-
-    ivas_dirac_dec_output_synthesis_cov_init_fx( &( hParamMC->h_output_synthesis_cov_state ), nchan_transport, nchan_cov, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual );
-
-    /*-----------------------------------------------------------------*
-     * init proto frames
-     *-----------------------------------------------------------------*/
-
-    IF( hParamMC->max_band_decorr > 0 )
-    {
-        set_zero_fx( hParamMC->proto_frame_f_fx, shl( imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->num_freq_bands ), 1 ) );
-        set32_fx( hParamMC->proto_frame_dec_f_fx, 0, shl( imult1616( nchan_cov, hParamMC->num_freq_bands ), 1 ) );
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * Local functions
- *-------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_compute_diffuse_proto()
- *
- * Compute prototypes for decorrelation
- *------------------------------------------------------------------------*/
-
-static void param_mc_protoSignalComputation_fx(
-    Word32 *RealBuffer_fx,                           /* i  : CLDFB samples of the transport channels (real part)      */
-    Word32 *ImagBuffer_fx,                           /* i  : CLDFB samples of the transport channels (imaginary part) */
-    Word32 *proto_frame_f_fx,                        /* o  : interleaved complex prototype CLDFB samples              */
-    const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, /* i  : prototype generation information                         */
-    const int16_t num_freq_bands                     /* i  : number of frequency bands for the prototypes             */
-)
-{
-    Word16 band;
-    Word16 proto_ch_idx, source_ch_cnt;
-
-    Word32 *p_proto_frame_fx;
-    Word32 *p_real_buffer_fx; // Q12
-    Word32 *p_imag_buffer_fx; // Q12
-
-    set32_fx( proto_frame_f_fx, 0, shl( imult1616( num_freq_bands, diff_proto_info->num_protos_diff ), 1 ) );
-
-
-    FOR( proto_ch_idx = 0; proto_ch_idx < diff_proto_info->num_protos_diff; proto_ch_idx++ )
-    {
-        Word16 num_source_ch = diff_proto_info->num_source_chan_diff[proto_ch_idx];
-        move16();
-
-        FOR( source_ch_cnt = 0; source_ch_cnt < num_source_ch; source_ch_cnt++ )
-        {
-
-            Word32 fac_fx = diff_proto_info->proto_fac_fx[proto_ch_idx][source_ch_cnt];
-            move32();
-
-            Word16 source_ch_idx = diff_proto_info->source_chan_idx[proto_ch_idx][source_ch_cnt];
-            move16();
-
-            p_proto_frame_fx = &proto_frame_f_fx[shl( imult1616( proto_ch_idx, num_freq_bands ), 1 )];
-            p_real_buffer_fx = &RealBuffer_fx[imult1616( source_ch_idx, num_freq_bands )];
-            p_imag_buffer_fx = &ImagBuffer_fx[imult1616( source_ch_idx, num_freq_bands )];
-
-            FOR( band = 0; band < num_freq_bands; band++ )
-            {
-
-                Word32 tmp_x = Mpy_32_32( fac_fx, ( *( p_real_buffer_fx++ ) ) ); // Q(30 + 6 - 31)  :: Q5
-
-                *( p_proto_frame_fx ) = L_add( *( p_proto_frame_fx ), tmp_x );
-                move32();
-                p_proto_frame_fx++;
-
-                tmp_x = Mpy_32_32( fac_fx, ( *( p_imag_buffer_fx++ ) ) ); // Q(30 + 6 - 31)  :: Q5
-
-                *( p_proto_frame_fx ) = L_add( *( p_proto_frame_fx ), tmp_x );
-                move32();
-                p_proto_frame_fx++;
-            }
-        }
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dec_compute_diffuse_proto()
- *
- * Transfer decorrelated signals back from the decorrelator buffer to
- * the buffers used in the final synthesis
- *------------------------------------------------------------------------*/
-
-static void ivas_param_mc_dec_copy_diffuse_proto(
-    PARAM_MC_DEC_HANDLE hParamMC,                                                                           /* i  : Parametric MC handle                                      */
-    Word32 Cldfb_buffer_real_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o  : CLDFB buffer used in the final synthesis (real part)      */
-    Word32 Cldfb_buffer_imag_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o  : CLDFB buffer used in the final synthesis (imaginary part) */
-    const Word16 nY,                                                                                        /* i  : number of decorrelated channels                           */
-    const Word16 slot_idx                                                                                   /* i  : current time slot index                                   */
-)
-{
-    Word16 k, l;
-    Word16 num_freq_bands, num_freq_bands_diff;
-    Word32 *p_proto_diff_fx;
-    num_freq_bands = hParamMC->num_freq_bands;
-    move16();
-    num_freq_bands_diff = hParamMC->h_output_synthesis_params.max_band_decorr;
-    move16();
-
-    FOR( k = 0; k < nY; k++ )
-    {
-        p_proto_diff_fx = hParamMC->proto_frame_dec_f_fx + imult1616( shl( k, 1 ), num_freq_bands ); // Q11
-
-        FOR( l = 0; l < num_freq_bands_diff; l++ )
-        {
-            Cldfb_buffer_real_fx[k][slot_idx][l] = *( p_proto_diff_fx++ ); // Q11
-            move32();
-            Cldfb_buffer_imag_fx[k][slot_idx][l] = *( p_proto_diff_fx++ ); // Q11
-            move32();
-        }
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_bin2dec()
- *
- * decode a number of bits to an integer
- *------------------------------------------------------------------------*/
-/* r : decoded integer */
-static Word16 ivas_param_mc_bin2dec_fx(
-    UWord16 bits[PARAM_MC_MAX_BITS], /* i  : bit buffer               */
-    const Word16 N                   /* i  : number of bits to decode */
-)
-{
-    Word16 i;
-    Word16 out;
-
-    assert( N <= 16 );
-    out = 0;
-    move16();
-    FOR( i = 0; i < N; i++ )
-    {
-        out = add( out, shl( bits[i], sub( sub( N, 1 ), i ) ) );
-    }
-
-    return out;
-}
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_uniform_decoder()
- *
- * decode a uniformily coded sequence of float values
- *------------------------------------------------------------------------*/
-static Word16 ivas_param_mc_uniform_decoder_fx(
-    Word16 *seq,                          /* o  : decoded sequence of float values hParamCodingInfo -> Q-quant*/
-    const Word16 sz_seq,                  /* i  : number of values to decode       */
-    const Word16 *alphabet,               /* i  : codebook                         hParamCodingInfo -> Q-quant*/
-    const Word16 N,                       /* i  : number of bits per coded index   */
-    UWord16 bit_buffer[PARAM_MC_MAX_BITS] /* i  : bit buffer to decode             */
-)
-{
-    Word16 i;
-    Word16 idx;
-    Word16 n_bits;
-
-    n_bits = 0;
-    move16();
-    assert( N * sz_seq < PARAM_MC_MAX_BITS );
-
-    FOR( i = 0; i < sz_seq; ++i )
-    {
-        idx = ivas_param_mc_bin2dec_fx( &bit_buffer[i * N], N );
-        seq[i] = alphabet[idx];
-        move16();
-    }
-
-    n_bits = imult1616( N, sz_seq );
-
-    return n_bits;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_range_decoder_LC()
- *
- * decode a sequency of inidices coded with a range coder
- *------------------------------------------------------------------------*/
-static Word16 ivas_param_mc_range_decoder_LC_fx(
-    UWord16 *bit_buffer,      /* i  : bit buffer to read from                   */
-    Word16 *x,                /* o  : decoded indices                           */
-    Word16 *BER_detect,       /* o  : flag for indicating a bit error           */
-    const Word16 sz_seq,      /* i  : size of the sequence to be decoded        */
-    const Word16 sz_alphabet, /* i  : size of the alphabet                      */
-    const UWord16 *cft,       /* i  : cumulative frequency table                */
-    const UWord16 *sft,       /* i  : symbol frequency table                    */
-    const Word16 tot_shift,   /* i  : total frequency as a power of 2           */
-    const Word16 nbbits       /* i  : maximum bit budget                        */
-)
-{
-    RangeUniDecState rc_st_dec; /* State of the range decoder */
-    Word16 cur_bit_pos;
-    Word16 k;
-    Word16 r;
-
-    /* Start Decoding */
-    /* Initialize range decoder */
-    cur_bit_pos = 0;
-    move16();
-    rc_uni_dec_init_fx( &rc_st_dec, bit_buffer, sub( nbbits, 32 ) ); /* (nbbits + 30) entries are read by the decoder */
-
-    /* Main Loop through the indices */
-    FOR( k = 0; k < sz_seq; k++ )
-    {
-        r = rc_uni_dec_read_symbol_fastS_fx( &rc_st_dec, cft, sft, sz_alphabet, tot_shift ); /*Alphabet size = 17 (2^4 = 16 MSB symbols + 1 ESC symbol) */
-                                                                                             /* r is the symbol read, the possible values are {0,1,....alphabet_size - 1}  */
-
-        /* Update bitstream pointer */
-        cur_bit_pos = rc_uni_dec_virtual_finish_fx( &rc_st_dec );
-
-        /* Confirm that there is no overflow */
-        IF( GT_16( cur_bit_pos, nbbits ) )
-        {
-            *BER_detect = s_or( *BER_detect, 1 );
-            move16();
-        }
-
-        x[k] = r;
-        move16();
-    }
-
-    /* We don't need to finish because virtual_finish() already does the same */
-    /*st->next_bit_pos = rc_uni_dec_finish(&rc_st_dec);*/
-
-    /* Check for bitstream errors */
-    IF( rc_st_dec.bit_error_detected != 0 )
-    {
-        *BER_detect = s_or( *BER_detect, 1 );
-        move16();
-    }
-
-    return cur_bit_pos;
-}
-
-/*-------------------------------------------------------------------------
- * param_mc_compute_interpolator()
- *
- * compute the interpolator used in the final synthesis
- *------------------------------------------------------------------------*/
-
-static void ivas_param_mc_dec_compute_interpolator_fx(
-    const UWord16 bAttackPresent, /* i  : flag indicating if we have a transient in the current frame */
-    const UWord16 attackPos,      /* i  : position of the transient                                   */
-    const UWord16 interp_length,  /* i  : number of interpolation values to be calculated             */
-    Word16 *interpolator          /* o  : interpolator                                                */
-)
-{
-    Word16 idx;
-
-    IF( bAttackPresent )
-    {
-        FOR( idx = 0; idx < attackPos * 2; idx++ )
-        {
-            interpolator[idx] = 0;
-            move16();
-        }
-        FOR( ; idx < interp_length; idx++ )
-        {
-            interpolator[idx] = 32767; /* 1.0f Q15 */
-            move16();
-        }
-    }
-    ELSE
-    {
-        ivas_jbm_dec_get_adapted_linear_interpolator_fx( DEFAULT_JBM_CLDFB_TIMESLOTS, interp_length, interpolator );
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * remove_lfe_from_cy()
- *
- * remove all LFE related values from a covariance matrix
- *------------------------------------------------------------------------*/
-
-static void remove_lfe_from_cy_fx(
-    const Word16 nY,                               /* i  : dimension of the covariance matrix */
-    Word16 lfe_indices[PARAM_MC_LOCAL_SZ_LFE_MAP], /* i  : LFE index                          */
-    Word16 num_lfe,                                /* i  : number of LFEs                     */
-    Word32 *cy,                                    /* i  : covariance matrix                  */
-    Word32 *cy_woLFE                               /* o  : covariance matrix with LFE removed */
-)
-{
-    Word16 ch_idx1, ch_idx2;
-    Word16 lfe_idx1, lfe_idx2;
-    Word32 *ptrCy;
-    Word32 *ptrCy_out;
-
-    ptrCy = cy;
-    ptrCy_out = cy_woLFE;
-
-    FOR( lfe_idx1 = 0; lfe_idx1 < num_lfe + 1; lfe_idx1++ )
-    {
-        FOR( ch_idx1 = lfe_indices[lfe_idx1] + 1; ch_idx1 < lfe_indices[lfe_idx1 + 1]; ch_idx1++ )
-        {
-            FOR( lfe_idx2 = 0; lfe_idx2 < num_lfe + 1; lfe_idx2++ )
-            {
-                FOR( ch_idx2 = lfe_indices[lfe_idx2] + 1; ch_idx2 < lfe_indices[lfe_idx2 + 1]; ch_idx2++ )
-                {
-                    *( ptrCy_out++ ) = *( ptrCy++ );
-                    move32();
-                }
-                ptrCy++;
-            }
-            ptrCy--;
-        }
-        ptrCy += nY;
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_get_mixing_matrices()
- *
- * calculate the direct and residual mixing matrices
- * using the covariance method
- *------------------------------------------------------------------------*/
-
-static void ivas_param_mc_get_mixing_matrices_fx(
-    PARAM_MC_DEC_HANDLE hParamMC, /* i  : Parametric MC handle */
-    IVAS_OUTPUT_SETUP *hSynthesisOutputSetup,
-    Word32 Cx_in_fixed[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i  : input covariance for all parameter bands         Q(31 - Cx_in_e)*/
-    Word16 Cx_in_e,
-    const Word16 param_band_idx, /* i  : parameter band index                             */
-    Word32 *mixing_matrix_fx[],  // Q(31 - mixing_matrix_e)
-    Word16 *mixing_matrix_e,
-    Word32 *mixing_matrix_res_fx[], // Q(31 - mixing_matrix_res_e)
-    Word16 *mixing_matrix_res_e,
-    const Word16 nY_intern,                     /* i  : number of channels in the transported format     */
-    const PARAM_MC_SYNTHESIS_CONF synth_config, /* i  : Parametric MC synthesis config                   */
-    const Word16 nX,                            /* i  : number of transport channels                     */
-    const Word16 nY_cov                         /* i  : number of covariance synthesis output channels   */
-)
-{
-    Word16 matSize = MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS;
-    Word16 nY_band;
-    Word16 num_lfe_bands;
-    Word16 brange[2];
-    uint16_t i;
-    Word16 ch_idx1, ch_idx2, lfe_idx1, lfe_idx2;
-    Word16 remove_lfe;
-    Word16 lfe_indices[PARAM_MC_LOCAL_SZ_LFE_MAP];
-
-    Word32 Cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
-    Word32 Cy_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-
-    Word32 Cy_full_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-
-    Word32 Cr_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cr_e)
-    Word16 Cr_e;
-    Word32 Cy_diag_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - Cy_diag_buff_e)
-    Word16 Cy_diag_buff_e[MAX_OUTPUT_CHANNELS];
-    Word32 mixing_matrix_local_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - mixing_matrix_local_e)
-    Word16 Cy_diag_e = 0, mixing_matrix_local_e = 0;
-    Word32 Cproto_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cproto_e)
-    Word16 Cproto_e;
-    Word32 *proto_matrix_ptr_fx; // Q(31 - proto_matrix_ptr_e)
-    Word32 *Cx_state_fx;         // Q(31 - Cx_state_e)
-    Word32 *Cx_old_state_fx;
-    Word32 Cy_state_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cy_state_e)
-    Word32 *Cy_old_state_fx;
-    Word16 Cx_state_e;
-    Word16 Cy_state_e;
-    Word32 mixing_matrix_res_local_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mixing_matrix_res_local_e)
-    Word16 mixing_matrix_res_local_e;
-    Word32 L_tmp;
-    Word16 tmp_e, tmp;
-
-    Word16 proto_matrix_e = hParamMC->h_output_synthesis_params.proto_matrix_e;
-    move16();
-    Word32 proto_matrix_noLFE_fx[PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS]; // Q(31 - proto_matrix_noLFE_e)
-
-    Word32 mat_mult_buffer1_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mat_mult_buffer1_e)
-
-    Word32 Cproto_diag_fx[MAX_CICP_CHANNELS]; // Q(31 - Cproto_diag_e)
-    Word16 mat_mult_buffer1_e, proto_matrix_ptr_e, Cproto_diag_e;
-
-    Word32 *ptrMM_fx;
-    Word32 *ptrMM_out_fx;
-
-    Word16 Cy_e, Cx_e;
-    Word16 Cy_full_e;
-    Word16 new_e = 0;
-    move16();
-
-    set_zero_fx( Cproto_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
-    set_zero_fx( mat_mult_buffer1_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
-    set_zero_fx( proto_matrix_noLFE_fx, PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS );
-    set_zero_fx( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
-#ifdef MSAN_FIX
-    set_zero_fx( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
-#endif
-    Word16 proto_matrix_noLFE_e = 0;
-    move16();
-
-    Word32 Cx_in_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
-
-    Copy32( Cx_in_fixed, Cx_in_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-
-    nY_band = nY_cov;
-    move16();
-    num_lfe_bands = 0;
-    move16();
-    remove_lfe = 0;
-    move16();
-
-    set16_fx( lfe_indices, -1, PARAM_MC_LOCAL_SZ_LFE_MAP );
-    IF( hSynthesisOutputSetup->num_lfe )
-    {
-        Word32 *proto_matrix_ptr_in_fx;
-        FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe; lfe_idx1++ )
-        {
-            lfe_indices[lfe_idx1 + 1] = hSynthesisOutputSetup->index_lfe[lfe_idx1];
-            move16();
-        }
-        lfe_indices[hSynthesisOutputSetup->num_lfe + 1] = nY_cov;
-        move16();
-        proto_matrix_ptr_fx = &proto_matrix_noLFE_fx[0];
-        proto_matrix_ptr_in_fx = &hParamMC->h_output_synthesis_params.proto_matrix_fx[0];
-        proto_matrix_noLFE_e = proto_matrix_e;
-        move16();
-
-        set_zero_fx( proto_matrix_noLFE_fx, PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS );
-
-        FOR( ch_idx1 = 0; ch_idx1 < nX; ch_idx1++ )
-        {
-            FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx1++ )
-            {
-                FOR( ch_idx2 = lfe_indices[lfe_idx1] + 1; ch_idx2 < lfe_indices[lfe_idx1 + 1]; ch_idx2++ )
-                {
-                    *( proto_matrix_ptr_fx++ ) = *( proto_matrix_ptr_in_fx++ );
-                    move32();
-                }
-                proto_matrix_ptr_in_fx++;
-            }
-            proto_matrix_ptr_in_fx--;
-        }
-
-        proto_matrix_ptr_e = proto_matrix_e;
-        move16();
-    }
-
-    if ( hParamMC->hMetadataPMC->lfe_on )
-    {
-        num_lfe_bands = PARAM_MC_MAX_BAND_LFE;
-        move16();
-    }
-    IF( hSynthesisOutputSetup->num_lfe > 0 && param_band_idx >= num_lfe_bands )
-    {
-        remove_lfe = 1;
-        move16();
-        nY_band = sub( nY_cov, hSynthesisOutputSetup->num_lfe );
-        proto_matrix_ptr_fx = proto_matrix_noLFE_fx;
-        proto_matrix_ptr_e = proto_matrix_noLFE_e;
-        move16();
-    }
-    ELSE
-    {
-        proto_matrix_ptr_fx = hParamMC->h_output_synthesis_params.proto_matrix_fx;
-        proto_matrix_ptr_e = hParamMC->h_output_synthesis_params.proto_matrix_e;
-        move16();
-    }
-
-    brange[0] = hParamMC->band_grouping[param_band_idx];
-    move16();
-    brange[1] = hParamMC->band_grouping[param_band_idx + 1];
-    move16();
-
-    Cx_state_fx = Cx_in_fx;
-    Cx_old_state_fx = hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx];
-    Cy_old_state_fx = hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx];
-
-
-    /*  Getting mixing mtx */
-    /* estimate target cov from input cov and proto_matrix */
-
-    Cx_state_e = Cx_in_e;
-    move16();
-    matrix_product_fx( hParamMC->proto_matrix_int_fx, nY_intern, nX, 0, Cx_state_fx, nX, nX, 0, mat_mult_buffer1_fx );
-    mat_mult_buffer1_e = add( hParamMC->proto_matrix_int_e, Cx_in_e );
-
-    matrix_product_fx( mat_mult_buffer1_fx, nY_intern, nX, 0, hParamMC->proto_matrix_int_fx, nY_intern, nX, 1, Cproto_fx );
-    Cproto_e = add( mat_mult_buffer1_e, hParamMC->proto_matrix_int_e );
-
-    FOR( ch_idx1 = 0; ch_idx1 < nY_intern; ch_idx1++ )
-    {
-        IF( BASOP_Util_Cmp_Mant32Exp( Cproto_fx[ch_idx1 + ( ch_idx1 * nY_intern )], Cproto_e, 0, 0 ) < 0 )
-        {
-            Cproto_fx[ch_idx1 + ( ch_idx1 * nY_intern )] = 0;
-            move32();
-        }
-    }
-
-    set_zero_fx( Cy_state_fx, matSize );
-    Cy_state_e = 0;
-    move16();
-
-    ivas_param_mc_dequantize_cov_fx( hParamMC,
-                                     hParamMC->icld_q_fx + L_mult0( param_band_idx, hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ),
-                                     hParamMC->icc_q_fx + L_mult0( param_band_idx, hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe ),
-                                     param_band_idx, nY_cov,
-                                     synth_config,
-                                     nY_intern,
-                                     nX, Cx_state_fx, Cx_state_e, Cproto_fx, Cproto_e, Cy_state_fx, &Cy_state_e );
-
-    // dbgwrite2_txt(Cy_state_fx,nY_intern*nY_intern,"../cy_state_fx.txt");
-
-    /* Smoothing: Sum over two buffers */
-    IF( hParamMC->hMetadataPMC->bAttackPresent )
-    {
-        /* no smoothing on attacks */
-        Copy32( Cx_state_fx, Cx_fx, imult1616( nX, nX ) );
-        Copy32( Cy_state_fx, Cy_full_fx, imult1616( nY_cov, nY_cov ) );
-        Cy_full_e = Cy_state_e;
-        move16();
-        Cx_e = Cx_state_e;
-        move16();
-    }
-    ELSE
-    {
-        /* smoothing gains are now identical to one, simply add up */
-        // v_add( Cy_state, Cy_old_state, Cy_full, nY_cov * nY_cov );
-
-        v_add_fixed_me( Cx_state_fx, Cx_state_e, Cx_old_state_fx, hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx], Cx_fx, &Cx_e, imult1616( nX, nX ), 1 );
-        v_add_fixed_me( Cy_state_fx, Cy_state_e, Cy_old_state_fx, hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx], Cy_full_fx, &Cy_full_e, imult1616( nY_cov, nY_cov ), 1 );
-    }
-
-    Copy32( Cx_state_fx, Cx_old_state_fx, imult1616( nX, nX ) );
-
-    Copy32( Cy_state_fx, Cy_old_state_fx, imult1616( nY_cov, nY_cov ) );
-
-    hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = Cx_state_e;
-    move16();
-    hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = Cy_state_e;
-    move16();
-
-    FOR( i = 0; i < nX * nX; i++ )
-    {
-        if ( Cx_old_state_fx[i] != 0 )
-        {
-            new_e = hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx];
-            move16();
-            BREAK;
-        }
-    }
-
-    hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = new_e;
-    move16();
-
-    new_e = 0;
-    move16();
-
-    FOR( i = 0; i < nY_cov * nY_cov; i++ )
-    {
-        if ( Cy_old_state_fx[i] != 0 )
-        {
-            new_e = hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx];
-            move16();
-            BREAK;
-        }
-    }
-
-    hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = new_e;
-    move16();
-
-    /* remove LFE IF necessary */
-    IF( remove_lfe )
-    {
-
-        Cy_e = Cy_full_e;
-        remove_lfe_from_cy_fx( nY_cov, lfe_indices, hSynthesisOutputSetup->num_lfe, Cy_full_fx, Cy_fx );
-    }
-    ELSE
-    {
-        Copy32( Cy_full_fx, Cy_fx, imult1616( nY_band, nY_band ) );
-        Cy_e = Cy_full_e;
-        move16();
-    }
-
-    matrix_product_fx( proto_matrix_ptr_fx, nY_band, nX, 0, Cx_fx, nX, nX, 0, mat_mult_buffer1_fx );
-    mat_mult_buffer1_e = add( proto_matrix_ptr_e, Cx_e );
-
-    matrix_product_diag_fx( mat_mult_buffer1_fx, mat_mult_buffer1_e, nY_band, nX, 0, proto_matrix_ptr_fx, proto_matrix_ptr_e, nY_band, nX, 1, Cproto_diag_fx, &Cproto_diag_e );
-
-    /* make sure we have no negative entries in Cproto_diag due to rounding errors */
-
-    FOR( ch_idx1 = 0; ch_idx1 < nY_band; ch_idx1++ )
-    {
-        if ( BASOP_Util_Cmp_Mant32Exp( Cproto_diag_fx[ch_idx1], Cproto_diag_e, 0, 0 ) < 0 )
-        {
-            Cproto_diag_fx[ch_idx1] = 0;
-            move16();
-        }
-    }
-
-
-    /* Computing the mixing matrices */
-
-    /* bands with decorr */
-    IF( LT_16( brange[0], hParamMC->h_output_synthesis_params.max_band_decorr ) )
-    {
-        computeMixingMatrices_fx( nX, nY_band, Cx_fx, Cx_e, Cy_fx, Cy_e, proto_matrix_ptr_fx, proto_matrix_ptr_e, 0, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e, Cr_fx, &Cr_e );
-        /* Compute mixing matrix FOR residual */
-        computeMixingMatricesResidual_fx( nY_band, Cproto_diag_fx, Cproto_diag_e, Cr_fx, Cr_e, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_res_local_fx, &mixing_matrix_res_local_e );
-
-        IF( NE_16( mixing_matrix_res_local_e, mixing_matrix_local_e ) )
-        {
-            tmp = getScaleFactor32( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
-            scale_sig32( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS, tmp );
-            mixing_matrix_local_e = sub( mixing_matrix_local_e, tmp );
-
-            tmp = getScaleFactor32( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
-            scale_sig32( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS, tmp );
-            mixing_matrix_res_local_e = sub( mixing_matrix_res_local_e, tmp );
-
-            scale_sig32( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS, sub( mixing_matrix_local_e, s_max( mixing_matrix_local_e, mixing_matrix_res_local_e ) ) );
-            scale_sig32( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS, sub( mixing_matrix_res_local_e, s_max( mixing_matrix_local_e, mixing_matrix_res_local_e ) ) );
-
-            mixing_matrix_res_local_e = mixing_matrix_local_e = s_max( mixing_matrix_local_e, mixing_matrix_res_local_e );
-            move16();
-        }
-        IF( remove_lfe )
-        {
-            set_zero_fx( mixing_matrix_res_fx[param_band_idx], imult1616( nY_cov, nY_cov ) );
-
-            ptrMM_fx = mixing_matrix_res_local_fx;
-            ptrMM_out_fx = mixing_matrix_res_fx[param_band_idx];
-            FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx1++ )
-            {
-                FOR( ch_idx1 = lfe_indices[lfe_idx1] + 1; ch_idx1 < lfe_indices[lfe_idx1 + 1]; ch_idx1++ )
-                {
-                    FOR( lfe_idx2 = 0; lfe_idx2 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx2++ )
-                    {
-                        FOR( ch_idx2 = lfe_indices[lfe_idx2] + 1; ch_idx2 < lfe_indices[lfe_idx2 + 1]; ch_idx2++ )
-                        {
-                            *( ptrMM_out_fx++ ) = *( ptrMM_fx++ );
-                            move32();
-                        }
-                        ptrMM_out_fx++;
-                    }
-                    ptrMM_out_fx--;
-                }
-                ptrMM_out_fx += nY_cov;
-            }
-            mixing_matrix_res_e[param_band_idx] = mixing_matrix_res_local_e;
-            move16();
-        }
-        ELSE
-        {
-            Copy32( mixing_matrix_res_local_fx, mixing_matrix_res_fx[param_band_idx], imult1616( nY_cov, nY_cov ) );
-            mixing_matrix_res_e[param_band_idx] = mixing_matrix_res_local_e;
-            move16();
-        }
-    }
-    ELSE IF( brange[0] < hParamMC->max_band_energy_compensation )
-    {
-        /* Compute mixing matrices (energy compensation only) */
-        computeMixingMatrices_fx( nX, nY_band, Cx_fx, Cx_e, Cy_fx, Cy_e, proto_matrix_ptr_fx, proto_matrix_ptr_e, 1, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e, Cr_fx, &Cr_e );
-    }
-    ELSE
-    {
-        /*IF neither decorrelation nor energy compensation is applied*/
-        FOR( i = 0; i < nY_band; i++ )
-        {
-            tmp = BASOP_Util_Divide3232_Scale( Cy_fx[i], L_add( Cproto_diag_fx[i], EPSILON_FX ), &tmp_e );
-            tmp_e = add( Cy_diag_e, Cproto_diag_e );
-            L_tmp = Sqrt32( L_deposit_h( tmp ), &tmp_e );
-            Cy_diag_fx[i] = L_tmp;
-            move32();
-            Cy_diag_buff_e[i] = tmp_e;
-            move16();
-        }
-
-
-        Cy_diag_e = Cy_diag_buff_e[0];
-        move16();
-
-        FOR( i = 1; i < nY_band; i++ )
-        {
-            if ( LT_16( Cy_diag_e, Cy_diag_buff_e[i] ) )
-            {
-                Cy_diag_e = Cy_diag_buff_e[i];
-                move16();
-            }
-        }
-
-        FOR( i = 0; i < nY_band; i++ )
-        {
-            Cy_diag_fx[i] = L_shr( Cy_diag_fx[i], sub( Cy_diag_e, Cy_diag_buff_e[i] ) );
-            move32();
-        }
-
-        diag_matrix_product_fx( Cy_diag_fx, Cy_diag_e, nY_band, proto_matrix_ptr_fx, proto_matrix_ptr_e, nY_band, nX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e );
-    }
-
-    IF( remove_lfe )
-    {
-        set_zero_fx( mixing_matrix_fx[param_band_idx], imult1616( nX, nY_cov ) );
-        ptrMM_fx = mixing_matrix_local_fx;
-        ptrMM_out_fx = mixing_matrix_fx[param_band_idx];
-        FOR( ch_idx1 = 0; ch_idx1 < nX; ch_idx1++ )
-        {
-            FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx1++ )
-            {
-                FOR( ch_idx2 = lfe_indices[lfe_idx1] + 1; ch_idx2 < lfe_indices[lfe_idx1 + 1]; ch_idx2++ )
-                {
-                    *( ptrMM_out_fx++ ) = *( ptrMM_fx++ );
-                    move32();
-                }
-                ptrMM_out_fx++;
-            }
-            ptrMM_out_fx--;
-        }
-
-        mixing_matrix_e[param_band_idx] = mixing_matrix_local_e;
-        move16();
-    }
-    ELSE
-    {
-        Copy32( mixing_matrix_local_fx, mixing_matrix_fx[param_band_idx], imult1616( nY_cov, nX ) );
-        mixing_matrix_e[param_band_idx] = mixing_matrix_local_e;
-        move16();
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_get_mono_stereo_mixing_matrices()
- *
- * calculate the direct and residual mixing matrices
- * for mono and stereo output
- *------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------
- * param_mc_update_mixing_matrices()
- *
- * update mixing matrix buffers
- *------------------------------------------------------------------------*/
-
-static void param_mc_update_mixing_matrices_fx(
-    PARAM_MC_DEC_HANDLE hParamMC, /* i/o: Parametric MC handle                                  */
-    Word32 *mixing_matrix[],      /* i  : direct mixing matrices for the frame just processed   */
-    Word16 *mixing_matrix_exp,
-    Word32 *mixing_matrix_res[], /* i  : residual mixing matrices for the frame just processed */
-    Word16 *mixing_matrix_res_exp,
-    const UWord16 nX,  /* i  : number of transport channels                          */
-    const UWord16 nY ) /* i  : number of synthesis channels                          */
-{
-    UWord16 param_band_idx;
-
-    FOR( param_band_idx = 0; param_band_idx < hParamMC->hMetadataPMC->nbands_coded; param_band_idx++ )
-    {
-        Word16 brange[2];
-
-        brange[0] = hParamMC->band_grouping[param_band_idx];
-        move16();
-        brange[1] = hParamMC->band_grouping[param_band_idx + 1];
-        move16();
-
-        Copy32( mixing_matrix[param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[param_band_idx], imult1616( nX, nY ) );
-        hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[param_band_idx] = mixing_matrix_exp[param_band_idx];
-        move16();
-
-        IF( LT_16( brange[0], hParamMC->h_output_synthesis_params.max_band_decorr ) )
-        {
-            Copy32( mixing_matrix_res[param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[param_band_idx], imult1616( nY, nY ) );
-            hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[param_band_idx] = mixing_matrix_res_exp[param_band_idx];
-            move16();
-        }
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dequantize_cov()
- *
- * generate the target covariance matrix
- *------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dequantize_cov_fx()
- *
- * generate the target covariance matrix
- *------------------------------------------------------------------------*/
-
-static void ivas_param_mc_dequantize_cov_fx(
-    PARAM_MC_DEC_HANDLE hParamMC,             /* i  : Parametric MC handle                                    */
-    Word16 *ild_q_fx,                         /* i  : sequence of dequantized ILD values                   Q8 */
-    Word16 *icc_q_fx,                         /* i  : sequence of dequantized ICC values                   Q15*/
-    const Word16 param_band_index,            /* i  : current parameter band                                  */
-    const Word16 nY_cov,                      /* i  : number of output channels in the covariance synthesis   */
-    const PARAM_MC_SYNTHESIS_CONF synth_conf, /* i  : Parametric MC synthesis configuration                   */
-    const Word16 nY_int,                      /* i  : number of channels in the transported format            */
-    const Word16 nX,                          /* i  : number of transport channels                            */
-    Word32 *Cx_state_fx,                      /* i  : transport channel covariance matrix                     */
-    Word16 Cx_state_e,                        /* i  : exponent for transport channel covariance matrix        */
-    Word32 *Cproto_fx,                        /* i  : prototype matrix                                        */
-    Word16 Cproto_e,                          /* i  : exponent for prototype matrix                           */
-    Word32 *Cy_state_fx,                      /* o  : target covariance matrix                                */
-    Word16 *Cy_state_e                        /* o  : exponent for target covariance matrix                   */
-)
-{
-    Word16 Cy_buf_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-    Word16 Cp_buf_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-
-    Word32 Nrqq_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - Nrqq_e)
-    Word16 Nrqq_e[MAX_OUTPUT_CHANNELS];
-    Word32 a_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - a_e)
-    Word16 a_e[MAX_OUTPUT_CHANNELS];
-    Word16 k;
-    Word16 l;
-    Word32 *Cyp_fx; // Q(31 - Cyp_e)
-    Word16 *Cyp_e;
-    Word32 ap_fx; // Q(31 - ap_e)
-    Word16 ap_e;
-    Word32 L_tmp;
-    Word16 tmp, tmp_e;
-    const PARAM_MC_ILD_MAPPING *h_ild_mapping;
-    Word32 Cy_state_int_fx[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-    Word16 Cy_state_int_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
-
-    set16_fx( Cp_buf_e, Cproto_e, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
-    set32_fx( Nrqq_fx, 0, MAX_OUTPUT_CHANNELS );
-    set16_fx( Nrqq_e, 0, MAX_OUTPUT_CHANNELS );
-    h_ild_mapping = hParamMC->hMetadataPMC->ild_mapping_conf;
-
-    /*get back Nrg*/
-    tmp = 0;
-    move16();
-
-    FOR( k = 0; k < nY_int; k++ )
-    {
-        Word32 ref_ener_fx = 0; // Q(31 - ref_ener_e)
-        move32();
-        Word16 ref_ener_e = 0;
-        move16();
-        Word16 ref_channel_cnt;
-        Word16 ref_channel_idx;
-
-        FOR( ref_channel_cnt = 0; ref_channel_cnt < h_ild_mapping->num_ref_channels[k]; ref_channel_cnt++ )
-        {
-            ref_channel_idx = h_ild_mapping->ref_channel_idx[k][ref_channel_cnt];
-            move16();
-            ref_ener_fx = BASOP_Util_Add_Mant32Exp( Cx_state_fx[ref_channel_idx + ( ref_channel_idx * nX )], Cx_state_e, ref_ener_fx, ref_ener_e, &ref_ener_e );
-            move32();
-        }
-
-        L_tmp = Mpy_32_16_1( 713378626, ild_q_fx[k] );     /*Q24 : L_tmp Q31 for log2(10)/10 -> 713378626 */
-        L_tmp = BASOP_util_Pow2( L_tmp, 31 - 24, &tmp_e ); /*powf( 10.0f, ild_q_fx[k] / 10.0f )*/
-        L_tmp = Mpy_32_32( L_tmp, Mpy_32_16_1( ref_ener_fx, hParamMC->hMetadataPMC->ild_factors_fx[k] ) );
-
-        Nrqq_fx[h_ild_mapping->ild_index[k]] = L_tmp;
-        move32();
-        Nrqq_e[h_ild_mapping->ild_index[k]] = add( tmp_e, ref_ener_e );
-        move16();
-    }
-
-    /*  estimate ICCs from estimated Cproto */
-
-    FOR( k = 0; k < nY_int; k++ )
-    {
-        // a_fx[k] = 1.f / ( sqrtf( Cproto_fx[k + nY_int * k] ) + EPSILON );
-        tmp_e = Cp_buf_e[k + ( nY_int * k )];
-        move16();
-
-        IF( Cproto_fx[k + ( nY_int * k )] != 0 )
-        {
-            L_tmp = ISqrt32( Cproto_fx[k + ( nY_int * k )], &tmp_e );
-        }
-        ELSE
-        {
-            L_tmp = INV_EPSILON_MANT;
-            move32();
-            tmp_e = 15;
-            move16();
-        }
-        a_fx[k] = L_tmp;
-        move32();
-        a_e[k] = tmp_e;
-        move16();
-
-        FOR( l = 0; l < nY_int; l++ )
-        {
-            Cy_state_int_fx[( k * nY_int ) + l] = Mpy_32_32( Cproto_fx[( k * nY_int ) + l], a_fx[k] );
-            move32();
-            Cy_state_int_e[( k * nY_int ) + l] = add( Cp_buf_e[( k * nY_int ) + l], a_e[k] );
-            move16();
-        }
-    }
-
-    FOR( k = 0; k < nY_int; k++ )
-    {
-        Cyp_fx = Cy_state_int_fx + k;
-        Cyp_e = Cy_state_int_e + k;
-        ap_fx = a_fx[k];
-        move32();
-        ap_e = a_e[k];
-        move16();
-
-        FOR( l = 0; l < nY_int; l++ )
-        {
-            ( *Cyp_fx ) = Mpy_32_32( *Cyp_fx, ap_fx );
-            move32();
-            *Cyp_e = add( *Cyp_e, ap_e );
-            move16();
-
-            Cyp_fx += nY_int;
-            Cyp_e += nY_int;
-        }
-    }
-
-    /*normalizing the Cy_state_int_fx to a common exponent*/
-
-    /* replace some estimated ICCs with transmitted values */
-    FOR( k = 0; k < hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe; k++ )
-    {
-        Cy_state_int_fx[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] )] = L_shr( L_deposit_h( icc_q_fx[k] ), tmp );
-        move32();
-        Cy_state_int_e[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] )] = tmp;
-        move16();
-        Cy_state_int_fx[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] )] = L_shr( L_deposit_h( icc_q_fx[k] ), tmp );
-        move32();
-        Cy_state_int_e[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] )] = tmp;
-        move16();
-    }
-
-    test();
-    IF( GE_16( param_band_index, PARAM_MC_MAX_BAND_LFE ) || ( hParamMC->hMetadataPMC->lfe_on == 0 ) )
-    {
-        FOR( k = 0; k < nY_int; k++ )
-        {
-            Cy_state_int_fx[k + ( 3 * nY_int )] = ONE_IN_Q31;
-            move32();
-            Cy_state_int_e[k + ( 3 * nY_int )] = 0;
-            move16();
-            Cy_state_int_fx[3 + ( k * nY_int )] = ONE_IN_Q31;
-            move32();
-            Cy_state_int_e[3 + ( k * nY_int )] = 0;
-            move16();
-        }
-        Nrqq_fx[3] = 0;
-        move32();
-    }
-
-    /* Generate back Covariance Mtx */
-    FOR( k = 0; k < nY_int; k++ )
-    {
-        tmp_e = Nrqq_e[k];
-        move16();
-        a_fx[k] = Sqrt32( Nrqq_fx[k], &tmp_e );
-        move32();
-        a_e[k] = tmp_e;
-        move16();
-
-        /* v_multc( Cy_state_int_fx + k * nY_int, a_fx[k], Cy_state_int_fx + k * nY_int, nY_int ) */
-        FOR( l = 0; l < nY_int; l++ )
-        {
-            Cy_state_int_fx[( k * nY_int ) + l] = Mpy_32_32( Cy_state_int_fx[( k * nY_int ) + l], a_fx[k] );
-            move32();
-            Cy_state_int_e[( k * nY_int ) + l] = add( Cy_state_int_e[( k * nY_int ) + l], a_e[k] );
-            move16();
-        }
-    }
-
-    FOR( k = 0; k < nY_int; k++ )
-    {
-        Cyp_fx = Cy_state_int_fx + k;
-        Cyp_e = Cy_state_int_e + k;
-        ap_fx = a_fx[k];
-        move32();
-        ap_e = a_e[k];
-        move16();
-
-        FOR( l = 0; l < nY_int; l++ )
-        {
-            ( *Cyp_fx ) = Mpy_32_32( *Cyp_fx, ap_fx );
-            move32();
-            ( *Cyp_e ) = add( *Cyp_e, ap_e );
-            move16();
-
-            Cyp_fx += nY_int;
-            Cyp_e += nY_int;
-        }
-    }
-
-    IF( EQ_32( synth_conf, PARAM_MC_SYNTH_LS_CONV_COV ) )
-    {
-        /* Cy = dmx*Cy*dmx' */
-        Word32 mat_mult_buffer1_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mat_mult_buffer1_e)
-        Word16 mat_mult_buffer1_e[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-        Word32 target_ch_ener_fx[MAX_CICP_CHANNELS]; // Q(31 - target_ch_ener_e)
-        Word16 target_ch_ener_e[MAX_CICP_CHANNELS];
-        Word32 dmx_ch_ener_fx[MAX_CICP_CHANNELS];
-
-        Word16 ls_conv_dmx_matrix_e[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-
-        set32_fx( target_ch_ener_fx, 0, MAX_CICP_CHANNELS );
-        set16_fx( target_ch_ener_e, 0, MAX_CICP_CHANNELS );
-        set32_fx( dmx_ch_ener_fx, 0, MAX_CICP_CHANNELS );
-        set16_fx( ls_conv_dmx_matrix_e, 1, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
-
-        matrix_product_mant_exp( hParamMC->ls_conv_dmx_matrix_fx, ls_conv_dmx_matrix_e, nY_cov, nY_int, 0,
-                                 Cy_state_int_fx, Cy_state_int_e, nY_int, nY_int, 0,
-                                 mat_mult_buffer1_fx, mat_mult_buffer1_e );
-
-        matrix_product_mant_exp( mat_mult_buffer1_fx, mat_mult_buffer1_e, nY_cov, nY_int, 0,
-                                 hParamMC->ls_conv_dmx_matrix_fx, ls_conv_dmx_matrix_e, nY_cov, nY_int, 1,
-                                 Cy_state_fx, Cy_buf_e );
-
-        FOR( k = 0; k < nY_cov; k++ )
-        {
-            FOR( l = 0; l < nY_int; l++ )
-            {
-                L_tmp = Mpy_32_32( hParamMC->ls_conv_dmx_matrix_fx[k + ( l * nY_cov )], Nrqq_fx[l] );
-                tmp_e = add( ls_conv_dmx_matrix_e[k + ( l + nY_cov )], Nrqq_e[l] );
-                L_tmp = BASOP_Util_Add_Mant32Exp( target_ch_ener_fx[k], target_ch_ener_e[k], L_tmp, tmp_e, &tmp_e );
-                target_ch_ener_fx[k] = L_tmp;
-                move32();
-                target_ch_ener_e[k] = tmp_e;
-                move16();
-            }
-
-            dmx_ch_ener_fx[k] = Cy_state_fx[k + ( nY_cov * k )];
-            move32();
-
-            IF( dmx_ch_ener_fx[k] < 0 )
-            {
-                Cy_state_fx[k + ( nY_cov * k )] = L_negate( Cy_state_fx[k + ( nY_cov * k )] );
-                move32();
-                dmx_ch_ener_fx[k] = L_negate( dmx_ch_ener_fx[k] );
-                move32();
-            }
-
-            IF( extract_h( dmx_ch_ener_fx[k] ) == 0 )
-            {
-                target_ch_ener_fx[k] = 0;
-                move32();
-                target_ch_ener_e[k] = 0;
-                move16();
-            }
-            ELSE
-            {
-                BASOP_Util_Divide_MantExp( extract_h( target_ch_ener_fx[k] ), target_ch_ener_e[k], extract_h( dmx_ch_ener_fx[k] ), Cy_buf_e[k + ( nY_cov * k )], &tmp, &tmp_e );
-                tmp = Sqrt16( tmp, &tmp_e );
-                target_ch_ener_fx[k] = L_deposit_h( tmp );
-                move32();
-                target_ch_ener_e[k] = tmp_e;
-                move16();
-            }
-
-            FOR( l = 0; l < nY_cov; l++ )
-            {
-                Cy_state_fx[( k * nY_cov ) + l] = Mpy_32_32( target_ch_ener_fx[k], Cy_state_fx[( k * nY_cov ) + l] );
-                move32();
-                Cy_buf_e[( k * nY_cov ) + l] = add( target_ch_ener_e[k], Cy_buf_e[( k * nY_cov ) + l] );
-                move16();
-            }
-
-            Cyp_fx = Cy_state_fx + k;
-            Cyp_e = Cy_buf_e + k;
-            ap_fx = target_ch_ener_fx[k];
-            move32();
-            ap_e = target_ch_ener_e[k];
-            move16();
-            FOR( l = 0; l < nY_cov; l++ )
-            {
-                ( *Cyp_fx ) = Mpy_32_32( *Cyp_fx, ap_fx );
-                move32();
-                *Cyp_e = add( *Cyp_e, ap_e );
-                move16();
-
-                Cyp_fx += nY_cov;
-                Cyp_e += nY_cov;
-            }
-        }
-    }
-    ELSE
-    {
-        Copy32( Cy_state_int_fx, Cy_state_fx, imult1616( nY_int, nY_int ) );
-        Copy( Cy_state_int_e, Cy_buf_e, imult1616( nY_int, nY_int ) );
-    }
-
-    /*normalize output matrix to a common exponent*/
-    tmp = 0;
-    FOR( k = 0; k < nY_int * nY_int; k++ )
-    {
-        Cy_state_fx[k] = BASOP_Util_Add_Mant32Exp( Cy_state_fx[k], Cy_buf_e[k], 0, 0, &Cy_buf_e[k] );
-        move32();
-        tmp = s_max( tmp, Cy_buf_e[k] );
-    }
-    FOR( k = 0; k < nY_int * nY_int; k++ )
-    {
-        L_tmp = L_shr( Cy_state_fx[k], sub( tmp, Cy_buf_e[k] ) );
-        Cy_state_fx[k] = L_tmp;
-        move32();
-    }
-    *Cy_state_e = tmp;
-    move16();
-
-    return;
-}
-
-/*-------------------------------------------------------------------------*
- * param_mc_set_num_synth_bands()
- *
- * set the number of frequency bands to be synthesized
- *-------------------------------------------------------------------------*/
-
-static void param_mc_set_num_synth_bands(
-    const Word32 output_Fs,      /* i  : output sampling frequency */
-    PARAM_MC_DEC_HANDLE hParamMC /* i/o: Parametric MC handle      */
-)
-{
-    UWord16 max_param_band_synth;
-    const Word16 *param_mc_bands_coded;
-
-    SWITCH( hParamMC->hMetadataPMC->num_parameter_bands )
-    {
-        case 20:
-            param_mc_bands_coded = param_mc_bands_coded_20;
-            BREAK;
-        case 10:
-            param_mc_bands_coded = param_mc_bands_coded_10;
-            BREAK;
-        case 14:
-        default:
-            param_mc_bands_coded = param_mc_bands_coded_14;
-            BREAK;
-    }
-    move16();
-    SWITCH( output_Fs )
-    {
-        case 8000:
-            max_param_band_synth = (UWord16) param_mc_bands_coded[NB];
-            BREAK;
-        case 16000:
-            max_param_band_synth = (UWord16) param_mc_bands_coded[WB];
-            BREAK;
-        case 32000:
-            max_param_band_synth = (UWord16) param_mc_bands_coded[SWB];
-            BREAK;
-        case 48000:
-        default:
-            max_param_band_synth = (UWord16) param_mc_bands_coded[FB];
-            BREAK;
-    }
-    move16();
-    hParamMC->num_param_bands_synth = s_min( hParamMC->hMetadataPMC->nbands_coded, max_param_band_synth );
-    move16();
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------------*
- * param_mc_get_diff_proto_info()
- *
- * calculated the diffuse prototype information
- *-------------------------------------------------------------------------*/
-
-
-static ivas_error param_mc_get_diff_proto_info_fx(
-    const Word32 *proto_mtx,                     /* i  : protoype matrix for the synthesis                     */
-    const UWord16 nchan_transport,               /* i  : number of transport channels                          */
-    const UWord16 nchan_out_cov,                 /* i  : number if output channels of the covariance synthesis */
-    PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info, /* o  : generated diffuse prototype info                      */
-    Word16 Q_proto_mtx )
-{
-    Word32 proto_fac_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
-    UWord16 cur_out_ch;
-    UWord16 cur_diff_proto;
-    UWord16 cur_transport_ch;
-    UWord16 max_num_src_chan;
-
-    /* Initializations */
-    max_num_src_chan = 0;
-    move16();
-
-    set_zero_fx( proto_fac_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
-    IF( ( p_diff_proto_info->proto_index_diff = (Word16 *) malloc( nchan_out_cov * sizeof( Word16 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-    set16_fx( p_diff_proto_info->proto_index_diff, 0, nchan_out_cov );
-
-    IF( ( p_diff_proto_info->num_source_chan_diff = (Word16 *) malloc( nchan_out_cov * sizeof( Word16 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-    set16_fx( p_diff_proto_info->num_source_chan_diff, 0, nchan_out_cov );
-
-    /* we have at least one prototype, copy the first one */
-    p_diff_proto_info->num_protos_diff = 1;
-    move16();
-
-    mvr2r_inc_fixed( proto_mtx, nchan_out_cov, proto_fac_fx, nchan_out_cov, nchan_transport );
-    p_diff_proto_info->proto_index_diff[0] = 0;
-    move16();
-
-    /* search for distinct prototypes */
-    FOR( cur_out_ch = 1; cur_out_ch < nchan_out_cov; cur_out_ch++ )
-    {
-        UWord16 found = 0;
-        move16();
-
-        FOR( cur_diff_proto = 0; cur_diff_proto < p_diff_proto_info->num_protos_diff; cur_diff_proto++ )
-        {
-            Word32 diff_fx = 0;
-            move32();
-            Word32 *proto_fac_ptr_fx = proto_fac_fx + cur_diff_proto;
-            const Word32 *proto_mtx_ptr = proto_mtx + cur_out_ch;
-            FOR( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
-            {
-                diff_fx = L_add( diff_fx, L_abs( L_sub( *proto_fac_ptr_fx, *proto_mtx_ptr ) ) );
-                proto_fac_ptr_fx += nchan_out_cov;
-                proto_mtx_ptr += nchan_out_cov;
-            }
-
-            /* we already have this prototype, save the index */
-            IF( LT_64( W_mult0_32_32( diff_fx, 10 ), L_shl_sat( 1, Q_proto_mtx ) ) )
-            {
-                found = 1;
-                move16();
-                p_diff_proto_info->proto_index_diff[cur_out_ch] = cur_diff_proto;
-                move16();
-                BREAK;
-            }
-        }
-
-        /* new distinct prototype, add it */
-        IF( found == 0 )
-        {
-            const Word32 *proto_mtx_ptr = proto_mtx + cur_out_ch;
-            Word16 cur_num_src_chan;
-
-            cur_num_src_chan = 0;
-            move16();
-            FOR( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
-            {
-                if ( GT_32( *proto_mtx_ptr, 0 /*EPSILON*/ ) )
-                {
-                    cur_num_src_chan = add( cur_num_src_chan, 1 );
-                }
-                proto_mtx_ptr += nchan_out_cov;
-            }
-
-            mvr2r_inc_fixed( proto_mtx + cur_out_ch, nchan_out_cov, proto_fac_fx + p_diff_proto_info->num_protos_diff, nchan_out_cov, nchan_transport );
-
-            p_diff_proto_info->proto_index_diff[cur_out_ch] = p_diff_proto_info->num_protos_diff;
-            move16();
-            p_diff_proto_info->num_protos_diff = add( p_diff_proto_info->num_protos_diff, 1 );
-            move16();
-            max_num_src_chan = s_max( max_num_src_chan, cur_num_src_chan );
-        }
-    }
-
-    /* set up the prototype info struct */
-    IF( ( p_diff_proto_info->source_chan_idx = (Word16 **) malloc( p_diff_proto_info->num_protos_diff * sizeof( Word16 * ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-
-    IF( ( p_diff_proto_info->proto_fac_fx = (Word32 **) malloc( p_diff_proto_info->num_protos_diff * sizeof( Word32 * ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-    }
-    FOR( cur_diff_proto = 0; cur_diff_proto < p_diff_proto_info->num_protos_diff; cur_diff_proto++ )
-    {
-        Word32 *proto_fac_ptr;
-
-        IF( ( p_diff_proto_info->source_chan_idx[cur_diff_proto] = (Word16 *) malloc( max_num_src_chan * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-
-        IF( ( p_diff_proto_info->proto_fac_fx[cur_diff_proto] = (Word32 *) malloc( max_num_src_chan * sizeof( Word32 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
-        }
-
-        proto_fac_ptr = proto_fac_fx + cur_diff_proto;
-        FOR( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
-        {
-            IF( GT_32( *proto_fac_ptr, EPSILON_FX_SMALL ) )
-            {
-                p_diff_proto_info->source_chan_idx[cur_diff_proto][p_diff_proto_info->num_source_chan_diff[cur_diff_proto]] = cur_transport_ch;
-                move16();
-                p_diff_proto_info->proto_fac_fx[cur_diff_proto][p_diff_proto_info->num_source_chan_diff[cur_diff_proto]] = L_shl( *proto_fac_ptr, 4 ); // (proto_fac_fx)Q26 + 4 = Q30
-                move16();
-                p_diff_proto_info->num_source_chan_diff[cur_diff_proto] = add( p_diff_proto_info->num_source_chan_diff[cur_diff_proto], 1 );
-                move16();
-            }
-            proto_fac_ptr += nchan_out_cov;
-        }
-    }
-    return IVAS_ERR_OK;
-}
-
-
-/*-------------------------------------------------------------------------*
- * ivas_param_mc_bs_decode_parameter_values()
- *
- * reads and decodes a sequence of Parametric MC parameters from the bitstream
- *-------------------------------------------------------------------------*/
-
-static void ivas_param_mc_bs_decode_parameter_values_fx(
-    UWord16 bit_buffer[],                                   /* i  : bitstream buffer                                       */
-    Word16 *bit_pos,                                        /* i/o: current bitstream buffer position                      */
-    const Word16 max_bits,                                  /* i  : maximum available bits in the buffer                   */
-    Word16 *BER_detect,                                     /* i/o: bit error detection flag                               */
-    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC,             /* i  : Parametric MC metadata information                     */
-    HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, /* i  : Parametric MC parameter quantization and coding tables */
-    const Word16 map_size_wo_lfe,                           /* i  : number of parameters per band (w/o LFEs)               */
-    const Word16 map_size,                                  /* i  : number of parameters per band (total)                  */
-    const Word16 num_lfe_bands,                             /* i  : number of parameter bands with coded LFE               */
-    const Word16 band_step,                                 /* i  : parameter band step                                    */
-    const Word16 num_param_bands,                           /* i  : number of parameter bands to decode                    */
-    Word16 *value_buffer                                    /* o  : output buffer for decoded parameter values             hParamCodingInfo -> Q-quant*/
-)
-{
-    Word16 range_coding;
-    Word16 sz_seq;
-    Word16 delta_coding;
-    Word16 delta_idx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
-    Word16 idx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
-    Word16 idx_prev;
-    Word16 idx_offset;
-    Word16 sz_alphabet;
-    Word16 i, j, k;
-    Word16 dequant_seq_fx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
-    Word16 dequant_ordered_fx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
-    Word16 n_lfe_idx;
-
-    range_coding = bit_buffer[*bit_pos];
-    move16();
-    *bit_pos = add( *bit_pos, 1 );
-    move16();
-
-    /* Decoding the sequence */
-    n_lfe_idx = sub( map_size, map_size_wo_lfe );
-    sz_seq = add( imult1616( num_param_bands, map_size_wo_lfe ), imult1616( num_lfe_bands, n_lfe_idx ) );
-
-    set16_fx( idx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
-    set16_fx( dequant_ordered_fx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
-    set16_fx( dequant_seq_fx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
-    IF( range_coding )
-    {
-        delta_coding = bit_buffer[*bit_pos];
-        move16();
-        *bit_pos = add( *bit_pos, 1 );
-        move16();
-
-        IF( delta_coding )
-        {
-            idx_prev = sub( add( shr( hParamCodingInfo->quantizer_size, 1 ), hParamCodingInfo->quantizer_size % 2 ), 1 );
-            sz_alphabet = sub( shl( hParamCodingInfo->quantizer_size, 1 ), 1 );
-            idx_offset = sub( hParamCodingInfo->quantizer_size, 1 );
-
-            /* read range coded delta ICC indices */
-            *bit_pos = add( *bit_pos, ivas_param_mc_range_decoder_LC_fx( &bit_buffer[*bit_pos], delta_idx, BER_detect, sz_seq, sz_alphabet,
-                                                                         hParamCodingInfo->cum_freq_delta, hParamCodingInfo->sym_freq_delta, PARAM_MC_RANGE_CODER_TOT_SHIFT, sub( max_bits, *bit_pos ) ) );
-            move16();
-
-            /* delta index to absolute index  */
-            FOR( j = 0; j < sz_seq; j++ )
-            {
-                idx[j] = add( idx_prev, sub( delta_idx[j], idx_offset ) );
-                idx_prev = idx[j];
-                move16();
-            }
-        }
-        ELSE
-        {
-            /* read range coded absolute ICC indices */
-            sz_alphabet = hParamCodingInfo->quantizer_size;
-            move16();
-            *bit_pos = add( *bit_pos, ivas_param_mc_range_decoder_LC_fx( &bit_buffer[*bit_pos], idx, BER_detect, sz_seq, sz_alphabet,
-                                                                         hParamCodingInfo->cum_freq, hParamCodingInfo->sym_freq, PARAM_MC_RANGE_CODER_TOT_SHIFT, sub( max_bits, *bit_pos ) ) );
-            move16();
-        }
-
-        /* dequantize */
-        FOR( j = 0; j < sz_seq; j++ )
-        {
-            dequant_seq_fx[j] = hParamCodingInfo->quantizer_fx[idx[j]]; // hParamCodingInfo -> Q-quant
-            move16();
-        }
-    }
-    ELSE
-    {
-        set16_fx( dequant_seq_fx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
-        /* read uniformly coded ICCs */
-        *bit_pos = add( *bit_pos, ivas_param_mc_uniform_decoder_fx( dequant_seq_fx, sz_seq, hParamCodingInfo->quantizer_fx, hParamCodingInfo->uni_bits, &bit_buffer[*bit_pos] ) );
-        move16();
-    }
-
-    /* reorder from sequential to parameter-band-wise */
-    k = 0;
-    FOR( j = 0; j < map_size_wo_lfe; ++j )
-    {
-        FOR( i = 0; i < num_param_bands; ++i )
-        {
-            dequant_ordered_fx[j + ( i * map_size )] = dequant_seq_fx[k]; // hParamCodingInfo -> Q-quant
-            move16();
-            k = add( k, 1 );
-        }
-    }
-
-    FOR( i = 0; i < num_lfe_bands; i++ )
-    {
-        FOR( j = 0; j < n_lfe_idx; j++ )
-        {
-            dequant_ordered_fx[map_size - n_lfe_idx + j + i * map_size] = dequant_seq_fx[k]; // hParamCodingInfo -> Q-quant
-            move16();
-            k = add( k, 1 );
-        }
-    }
-
-    IF( !( *BER_detect ) )
-    {
-        j = 0;
-        FOR( k = 0; k < hMetadataPMC->nbands_coded; k += band_step )
-        {
-            test();
-            IF( hMetadataPMC->bAttackPresent || EQ_16( hMetadataPMC->param_frame_idx, hMetadataPMC->coding_band_mapping[k] ) )
-            {
-                Copy( dequant_ordered_fx + imult1616( j, map_size ), value_buffer + imult1616( k, map_size ), map_size ); // hParamCodingInfo -> Q-quant
-                j++;
-            }
-            IF( hMetadataPMC->bAttackPresent && k + 1 < hMetadataPMC->nbands_coded )
-            {
-                Copy( value_buffer + imult1616( k, map_size ), value_buffer + imult1616( add( k, 1 ), map_size ), map_size );
-            }
-        }
-    }
-
-    return;
-}
diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c
index 0d9ee27107cedfdf97ef477e77d8c0882d2917ca..e0671eea034cb86efb7c860a5910555fbbffd545 100644
--- a/lib_dec/ivas_mc_param_dec_fx.c
+++ b/lib_dec/ivas_mc_param_dec_fx.c
@@ -1,34 +1,3744 @@
+/******************************************************************************************************
+
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+   contributors to this repository. All Rights Reserved.
+
+   This software is protected by copyright law and by international treaties.
+   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
+   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+   contributors to this repository retain full ownership rights in their respective contributions in
+   the software. This notice grants no license of any kind, including but not limited to patent
+   license, nor is any license granted by implication, estoppel or otherwise.
+
+   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
+   contributions.
+
+   This software is provided "AS IS", without any express or implied warranties. The software is in the
+   development stage. It is intended exclusively for experts who have experience with such software and
+   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
+   and fitness for a particular purpose are hereby disclaimed and excluded.
+
+   Any dispute, controversy or claim arising under or in relation to providing this software shall be
+   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
+   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
+   the United Nations Convention on Contracts on the International Sales of Goods.
+
+*******************************************************************************************************/
+
+#include <assert.h>
+#include "options.h"
+#include <stdint.h>
+#include "cnst.h"
+#include "rom_enc.h"
+#include "rom_com.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
+#include "ivas_cnst.h"
+#include "ivas_rom_com.h"
+#include "ivas_rom_dec.h"
+#include "math.h"
+#include "wmc_auto.h"
+#include "rom_dec.h"
 #include "ivas_prot_fx.h"
 
-Word16 param_mc_get_num_cldfb_syntheses_ivas_fx(
-    Decoder_Struct *st_ivas /* i  : Parametric MC handle */
+#define INV_EPSILON_MANT 214748365
+
+/*-----------------------------------------------------------------------*
+ * Local constants
+ *-----------------------------------------------------------------------*/
+
+#define PARAM_MC_LOCAL_SZ_LFE_MAP 5
+
+/*-----------------------------------------------------------------------*
+ * Local typedefs
+ *-----------------------------------------------------------------------*/
+
+typedef struct parameter_band_mapping_struct
+{
+    Word16 n_source_bands[20];
+    Word16 source_band_idx[20][4];
+    Word16 source_band_factor_fx[20][4]; /*Q15*/
+
+} PARAM_MC_PARAMETER_BAND_MAPPING;
+
+/*-----------------------------------------------------------------------*
+ * Local function prototypes
+ *-----------------------------------------------------------------------*/
+
+static void ivas_param_mc_dec_init_fx( PARAM_MC_DEC_HANDLE hParamMC, const Word16 nchan_in, const Word16 nchan_out );
+
+static void ivas_param_mc_dec_copy_diffuse_proto( PARAM_MC_DEC_HANDLE hParamMC, Word32 Cldfb_buffer_real_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], Word32 Cldfb_buffer_imag_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const Word16 nY, const Word16 slot_idx );
+static Word16 ivas_param_mc_range_decoder_LC_fx( UWord16 *bit_buffer, Word16 *x, Word16 *BER_detect, const Word16 sz_seq, const Word16 sz_alphabet, const UWord16 *cft, const UWord16 *sft, const Word16 tot_shift, const Word16 nbbits );
+
+
+static void ivas_param_mc_get_mixing_matrices_fx(
+    PARAM_MC_DEC_HANDLE hParamMC, /* i  : Parametric MC handle */
+    IVAS_OUTPUT_SETUP *hSynthesisOutputSetup,
+    Word32 Cx_in_fixed[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i  : input covariance for all parameter bands         */
+    Word16 Cx_in_e,
+    const Word16 param_band_idx,
+    Word32 *mixing_matrix_fx[],
+    Word16 *mixing_matrix_e,
+    Word32 *mixing_matrix_res_fx[],
+    Word16 *mixing_matrix_res_e,
+    const Word16 nY_intern,                     /* i  : number of channels in the transported format     */
+    const PARAM_MC_SYNTHESIS_CONF synth_config, /* i  : Parametric MC synthesis config                   */
+    const Word16 nX,                            /* i  : number of transport channels                     */
+    const Word16 nY_cov                         /* i  : number of covariance synthesis output channels   */
+);
+
+static Word16 ivas_param_mc_uniform_decoder_fx( Word16 *seq, const Word16 sz_seq, const Word16 *alphabet, const Word16 N, UWord16 bit_buffer[PARAM_MC_MAX_BITS] );
+static void ivas_param_mc_dec_compute_interpolator_fx( const UWord16 bAttackPresent, const UWord16 attackPos, const UWord16 interp_length, Word16 *interpolator );
+
+static void param_mc_set_num_synth_bands( const Word32 output_Fs, PARAM_MC_DEC_HANDLE hParamMC );
+
+static void ivas_param_mc_get_param_band_mapping( const Word16 n_target_bands, const Word16 *target_band_grouping, const Word16 n_source_bands, const Word16 *source_band_grouping, PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping );
+
+
+static void ivas_param_mc_bs_decode_parameter_values_fx( UWord16 bit_buffer[], Word16 *bit_pos, const Word16 max_bits, Word16 *BER_detect, HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC, HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, const Word16 map_size_wo_lfe, const Word16 map_size, const Word16 num_lfe_bands, const Word16 band_step, const Word16 num_param_bands, Word16 *value_buffer );
+static void ivas_param_mc_dequantize_cov_fx( PARAM_MC_DEC_HANDLE hParamMC, Word16 *ild_q_fx, Word16 *icc_q_fx, const Word16 param_band_index, const Word16 nY_cov, const PARAM_MC_SYNTHESIS_CONF synth_conf, const Word16 nY_int, const Word16 nX, Word32 *Cx_state_fx, Word16 Cx_state_e, Word32 *Cproto_fx, Word16 Cproto_e, Word32 *Cy_state_fx, Word16 *Cy_state_e );
+static ivas_error param_mc_get_diff_proto_info_fx( const Word32 *proto_mtx, const UWord16 nchan_transport, const UWord16 nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info, Word16 Q_proto_mtx );
+static void param_mc_update_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, Word32 *mixing_matrix[], Word16 *mixing_matrix_fx, Word32 *mixing_matrix_res[], Word16 *mixing_matrix_res_exp, const UWord16 nX, const UWord16 nY );
+
+
+static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const Word16 num_freq_bands /*, Word16 RealBuffer_fx_e, Word16 ImagBuffer_fx_e, Word16 *common_e*/ );
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_open()
+ *
+ * Open Parametric MC decoder handle
+ *-------------------------------------------------------------------------*/
+
+ivas_error ivas_param_mc_dec_open_fx(
+    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */
 )
 {
-    Word16 num_cldfb_syntheses;
+    Word16 k, nchan_transport;
+    PARAM_MC_DEC_HANDLE hParamMC;
+    Word16 nchan_out_transport;
+    Word16 nchan_out_cov;
+    Word32 proto_matrix_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
+    Word32 proto_mtx_norm_fx, tmp32;
+    Word16 frequency_axis_fx[CLDFB_NO_CHANNELS_MAX];
+    Word16 max_param_band_residual;
+    UWord16 config_index;
+    MC_LS_SETUP mc_ls_setup;
+    AUDIO_CONFIG output_config;
+    Word32 output_Fs, ivas_total_brate;
+    ivas_error error;
 
-    num_cldfb_syntheses = 0;
+    error = IVAS_ERR_OK;
+    move32();
+
+    /*-----------------------------------------------------------------*
+     * prepare library opening
+     *-----------------------------------------------------------------*/
+
+    IF( ( hParamMC = (PARAM_MC_DEC_HANDLE) malloc( sizeof( PARAM_MC_DEC_DATA ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+
+    IF( ( hParamMC->hMetadataPMC = (HANDLE_IVAS_PARAM_MC_METADATA) malloc( sizeof( IVAS_PARAM_MC_METADATA ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC metadata \n" ) );
+    }
+
+    output_Fs = st_ivas->hDecoderConfig->output_Fs;
+    move32();
+    output_config = st_ivas->hDecoderConfig->output_config;
+    move32();
+    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
+    move32();
+    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup_fx( st_ivas->transport_config );
+    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+    hParamMC->hoa_encoder_fx = NULL;
+
+    /* determine the synthesis config */
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) || EQ_32( st_ivas->transport_config, output_config ) )
+    {
+        hParamMC->synthesis_conf = PARAM_MC_SYNTH_DIRECT;
+        move32();
+    }
+    ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
+    {
+        hParamMC->synthesis_conf = PARAM_MC_SYNTH_MONO_STEREO;
+        move32();
+    }
+    ELSE IF( NE_32( st_ivas->transport_config, output_config ) )
+    {
+        test();
+        test();
+        IF( ( NE_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && GT_16( nchan_out_transport, audioCfg2channels( output_config ) ) ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && GT_16( nchan_out_transport, st_ivas->hOutSetup.nchan_out_woLFE ) ) )
+        {
+            hParamMC->synthesis_conf = PARAM_MC_SYNTH_LS_CONV_COV;
+            move32();
+            /* need to reset the intern config */
+            st_ivas->intern_config = output_config;
+            move32();
+            ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config );
+            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )
+            {
+                st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hLsSetupCustom->num_spk;
+                move32();
+                st_ivas->hIntSetup.ls_azimuth_fx = st_ivas->hLsSetupCustom->ls_azimuth_fx;     // Q22
+                st_ivas->hIntSetup.ls_elevation_fx = st_ivas->hLsSetupCustom->ls_elevation_fx; // Q22
+            }
+        }
+        ELSE
+        {
+            hParamMC->synthesis_conf = PARAM_MC_SYNTH_LS_CONV_CLDFB;
+            move32();
+        }
+    }
+
+    hParamMC->ls_conv_dmx_matrix_fx = NULL;
+
+    test();
+    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+    }
+    ELSE
+    {
+        nchan_out_cov = nchan_out_transport;
+        move16();
+    }
+
+    st_ivas->nchan_transport = ivas_param_mc_getNumTransportChannels_fx( ivas_total_brate, mc_ls_setup );
+    move16();
+    config_index = ivas_param_mc_get_configuration_index_fx( mc_ls_setup, ivas_total_brate );
+    nchan_transport = st_ivas->nchan_transport;
     move16();
 
-    /* sanity check*/
-    IF( st_ivas->hParamMC == NULL )
+    SWITCH( nchan_transport )
     {
-        assert( 0 && "ParamMC handle does not exist!\n" );
+        case 4:
+        case 3:
+            st_ivas->nCPE = 2;
+            move16();
+            st_ivas->nSCE = 0;
+            move16();
+            st_ivas->element_mode_init = IVAS_CPE_MDCT;
+            move16();
+            BREAK;
+        case 2:
+            st_ivas->nCPE = 1;
+            move16();
+            st_ivas->nSCE = 0;
+            move16();
+            st_ivas->element_mode_init = IVAS_CPE_MDCT;
+            move16();
+
+            BREAK;
     }
 
+    /*-----------------------------------------------------------------*
+     * set input parameters
+     *-----------------------------------------------------------------*/
+
+    // hParamMC->slot_size = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX;
+    Word16 temp_e;
+    Word16 temp = BASOP_Util_Divide3232_Scale( output_Fs, FRAMES_PER_SEC, &temp_e );
+    temp = shr( temp, sub( 15, temp_e ) ); // Going back to Q0
+    temp = BASOP_Util_Divide1616_Scale( temp, CLDFB_NO_COL_MAX, &temp_e );
+    temp = shr( temp, sub( 15, temp_e ) ); // Going back to Q0
+    hParamMC->slot_size = temp;
+    move16();
+    set16_fx( hParamMC->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS );
+    set16_fx( hParamMC->subframe_nbslots, PARAM_MC_MAX_NSLOTS_IN_SUBFRAME, DEFAULT_JBM_SUBFRAMES_5MS );
+    hParamMC->nb_subframes = DEFAULT_JBM_SUBFRAMES_5MS;
+    move16();
+
+    // hParamMC->num_freq_bands = (int16_t)(output_Fs * INV_CLDFB_BANDWIDTH + 0.5f);
+    hParamMC->num_freq_bands = extract_l( Mpy_32_32_r( output_Fs, INV_CLDFB_BANDWIDTH_Q31 ) );
+    move16();
+    hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands;
+    move16();
+    ivas_param_mc_metadata_open_fx( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );
+
+    /* init arrays for quantized parameters */
+
+    IF( ( hParamMC->icc_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+    IF( ( hParamMC->icld_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+    set16_fx( hParamMC->icld_q_fx, PARAM_MC_DEFAULT_MIN_ILD_FX, imult1616( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ) ); // Q8
+    set16_fx( hParamMC->icc_q_fx, 0, imult1616( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe ) );                            // Q15
+
+    param_mc_set_num_synth_bands( output_Fs, hParamMC );
+
+    /* Band Grouping */
+    IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 20 ) )
+    {
+        Copy( param_mc_band_grouping_20, hParamMC->band_grouping, 20 + 1 );
+    }
+    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 14 ) )
+    {
+        Copy( param_mc_band_grouping_14, hParamMC->band_grouping, 14 + 1 );
+    }
+    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 10 ) )
+    {
+        Copy( param_mc_band_grouping_10, hParamMC->band_grouping, 10 + 1 );
+    }
+    ELSE
+    {
+        assert( 0 && "nbands must be 20, 14, or 10!" );
+    }
+
+    /* set max parameter band for abs cov */
+    k = 0;
+    move16();
+    WHILE( LE_16( hParamMC->band_grouping[k], PARAM_MC_MAX_BAND_ABS_COV_DEC ) )
+    {
+        hParamMC->max_param_band_abs_cov = k;
+        move16();
+        k = add( k, 1 );
+    }
+
+    /*-----------------------------------------------------------------*
+     * open sub-modules
+     *-----------------------------------------------------------------*/
+
+    /* prototype signal computation */
+
     test();
-    IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+    test();
+    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
     {
-        num_cldfb_syntheses = 2;
+        IF( NE_32( ( error = ivas_ls_setup_conversion_open_fx( st_ivas ) ), IVAS_ERR_OK ) )
+        {
+            return error;
+        }
+
+        /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */
+        test();
+        IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+        {
+            IF( ( hParamMC->ls_conv_dmx_matrix_fx = (Word32 *) malloc( nchan_out_transport * nchan_out_cov * sizeof( Word32 ) ) ) == NULL )
+            {
+                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+            }
+
+            FOR( k = 0; k < nchan_out_transport; k++ )
+            {
+                Copy32( st_ivas->hLsSetUpConversion->dmxMtx_fx[k], &hParamMC->ls_conv_dmx_matrix_fx[k * nchan_out_cov], nchan_out_cov ); /*Q30*/
+            }
+
+            /* convert ParamMC parameter bands to SFB */
+            IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+            {
+                st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth;
+                move16();
+                FOR( k = 0; k <= hParamMC->num_param_bands_synth; k++ )
+                {
+                    st_ivas->hLsSetUpConversion->sfbOffset[k] = imult1616( PARAM_MC_BAND_TO_MDCT_BAND_RATIO, hParamMC->band_grouping[k] );
+                    move16();
+                }
+            }
+            ELSE
+            {
+                /* close the ls conversion handle immediately, it was only needed to get the DMX matrix in case of DMX in the covariance domain */
+                ivas_ls_setup_conversion_close_fx( &st_ivas->hLsSetUpConversion );
+            }
+        }
+    }
+    IF( ( hParamMC->proto_matrix_int_fx = (Word32 *) malloc( nchan_out_transport * nchan_transport * sizeof( Word32 ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+    Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, hParamMC->proto_matrix_int_fx, imult1616( nchan_transport, nchan_out_transport ) ); /*Q31*/
+
+    hParamMC->proto_matrix_int_len = imult1616( nchan_out_transport, nchan_transport );
+    move16();
+
+    test();
+    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), -4 );                                                                                                /*Q.26*/
+        matrix_product_fx( hParamMC->ls_conv_dmx_matrix_fx, nchan_out_cov, nchan_out_transport, 0, ivas_param_mc_conf[config_index].dmx_fac_fx, nchan_out_transport, nchan_transport, 0, proto_matrix_fx ); /*Q.26*/
+        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), 4 );                                                                                                 /*Q.26*/
+        IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+        {
+            tmp32 = ONE_IN_Q26; /*Q26*/
+            move32();
+            FOR( k = 0; k < nchan_transport * nchan_out_cov; k++ )
+            {
+                tmp32 = L_max( L_abs( tmp32 ), L_abs( proto_matrix_fx[k] ) ); /*Q.26*/
+            }
+            proto_mtx_norm_fx = divide3232( ONE_IN_Q26, tmp32 ); /*Q15*/
+
+            /* transfer flattened proto_matrix to 2D in hLsSetupConversion->dmxMtx */
+            FOR( k = 0; k < nchan_transport; k++ )
+            {
+                FOR( Word16 i = 0; i < nchan_out_cov; i++ )
+                {
+                    IF( EQ_32( proto_matrix_fx[k * nchan_out_cov + i], tmp32 ) )
+                    {
+                        st_ivas->hLsSetUpConversion->dmxMtx_fx[k][i] = ONE_IN_Q30; // Q30
+                    }
+                    ELSE
+                    {
+                        st_ivas->hLsSetUpConversion->dmxMtx_fx[k][i] = L_shl( Mult_32_16( proto_matrix_fx[k * nchan_out_cov + i], extract_l( proto_mtx_norm_fx ) ), 4 ); /*Q.30*/
+                    }
+                    move32();
+                }
+            }
+        }
+    }
+    ELSE
+    {
+        Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ) ); /*Q.31*/
+        Scale_sig32( proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ), -5 );                                     /*Scaling down to 26*/
+    }
+
+    IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        hParamMC->num_outputs_diff = 0;
+        move16();
+        hParamMC->diff_proto_info = NULL;
+        hParamMC->h_output_synthesis_params.use_onset_filters = 0;
+        move16();
+        hParamMC->max_band_decorr = 0;
         move16();
+        hParamMC->h_freq_domain_decorr_ap_params = NULL;
+        hParamMC->h_freq_domain_decorr_ap_state = NULL;
     }
-    ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+    ELSE
     {
-        num_cldfb_syntheses = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+        hParamMC->num_outputs_diff = nchan_out_cov;
+        move16();
+        IF( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+
+        IF( NE_32( ( error = param_mc_get_diff_proto_info_fx( proto_matrix_fx, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info, Q26 ) ), IVAS_ERR_OK ) )
+        {
+            return error;
+        }
+
+        /* decorrelation */
+        hParamMC->h_freq_domain_decorr_ap_params = NULL;
+        hParamMC->h_freq_domain_decorr_ap_state = NULL;
+
+        ivas_dirac_dec_get_frequency_axis_fx( frequency_axis_fx, output_Fs, hParamMC->num_freq_bands ); // Q0
+
+        IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( hParamMC->h_freq_domain_decorr_ap_params ), &( hParamMC->h_freq_domain_decorr_ap_state ), hParamMC->num_freq_bands, hParamMC->num_outputs_diff,
+                                                            hParamMC->diff_proto_info->num_protos_diff, DIRAC_SYNTHESIS_COV_MC_LS, frequency_axis_fx, nchan_transport, output_Fs ) ),
+                   IVAS_ERR_OK ) )
+        {
+            return error;
+        }
+
+        hParamMC->h_output_synthesis_params.use_onset_filters = 0;
+        move16();
+        hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr;
+        move16();
+    }
+    hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->hMetadataPMC->nbands_coded];
+    move16();
+    max_param_band_residual = 0;
+    move16();
+
+    FOR( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- )
+    {
+        IF( LE_16( hParamMC->band_grouping[k], hParamMC->max_band_decorr ) )
+        {
+            max_param_band_residual = k;
+            move16();
+            assert( hParamMC->band_grouping[k] == hParamMC->max_band_decorr );
+            break;
+        }
     }
-    ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_MC_PARAMMC ) )
+
+    /* output synthesis */
+    IF( NE_32( ( error = ivas_dirac_dec_output_synthesis_cov_open_fx( &( hParamMC->h_output_synthesis_params ), &( hParamMC->h_output_synthesis_cov_state ), hParamMC->max_band_decorr, PARAM_MC_MAX_NSLOTS, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual, nchan_transport, nchan_out_cov, proto_matrix_fx ) ), IVAS_ERR_OK ) )
     {
-        num_cldfb_syntheses = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+        return error;
     }
 
-    return num_cldfb_syntheses;
+    ivas_param_mc_dec_compute_interpolator_fx( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator_fx );
+
+    /* Head or external rotation */
+    test();
+    test();
+    test();
+    IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
+    {
+        IF( ( hParamMC->hoa_encoder_fx = (Word32 *) malloc( st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        compute_hoa_encoder_mtx_fx( st_ivas->hTransSetup.ls_azimuth_fx, st_ivas->hTransSetup.ls_elevation_fx, hParamMC->hoa_encoder_fx, st_ivas->hTransSetup.nchan_out_woLFE, HEAD_ROTATION_HOA_ORDER );
+    }
+
+    /*-----------------------------------------------------------------*
+     * memory allocation
+     *-----------------------------------------------------------------*/
+
+    IF( hParamMC->max_band_decorr > 0 )
+    {
+        IF( ( hParamMC->proto_frame_f_fx = (Word32 *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        IF( ( hParamMC->proto_frame_dec_f_fx = (Word32 *) malloc( 2 * nchan_out_cov * hParamMC->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+    }
+    ELSE
+    {
+        hParamMC->proto_frame_f_fx = NULL;
+        hParamMC->proto_frame_dec_f_fx = NULL;
+    }
+
+    ivas_param_mc_dec_init_fx( hParamMC, nchan_transport, nchan_out_cov );
+
+    IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        Word16 n_cldfb_slots;
+
+        n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
+        move16();
+        IF( st_ivas->hDecoderConfig->Opt_tsm )
+        {
+            n_cldfb_slots = MAX_JBM_CLDFB_TIMESLOTS;
+            move16();
+        }
+
+        Word16 cldfb_buf_size = imult1616( imult1616( n_cldfb_slots, nchan_transport ), hParamMC->num_freq_bands );
+        IF( ( hParamMC->Cldfb_RealBuffer_tc_fx = (Word32 *) malloc( cldfb_buf_size * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
+        }
+        set32_fx( hParamMC->Cldfb_RealBuffer_tc_fx, 0, cldfb_buf_size );
+        IF( ( hParamMC->Cldfb_ImagBuffer_tc_fx = (Word32 *) malloc( cldfb_buf_size * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
+        }
+        set32_fx( hParamMC->Cldfb_ImagBuffer_tc_fx, 0, cldfb_buf_size );
+
+        hParamMC->sz = imult1616( imult1616( n_cldfb_slots, nchan_transport ), hParamMC->num_freq_bands );
+        move16();
+
+        IF( st_ivas->hTcBuffer == NULL )
+        {
+            IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+            {
+                return error;
+            }
+        }
+    }
+    ELSE
+    {
+        hParamMC->Cldfb_RealBuffer_tc_fx = NULL;
+        hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
+    }
+
+    hParamMC->subframes_rendered = 0;
+    move16();
+    hParamMC->slots_rendered = 0;
+    move16();
+
+    st_ivas->hParamMC = hParamMC;
+    return error;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_get_param_band_mapping()
+ *
+ *
+ *-------------------------------------------------------------------------*/
+
+static void ivas_param_mc_get_param_band_mapping(
+    const Word16 n_target_bands,
+    const Word16 *target_band_grouping,
+    const Word16 n_source_bands,
+    const Word16 *source_band_grouping,
+    PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping )
+{
+    Word16 target_band_idx;
+    Word16 source_band_idx = 0;
+    move16();
+    Word16 source_band_cnt_total;
+
+    FOR( target_band_idx = 0; target_band_idx < n_target_bands; target_band_idx++ )
+    {
+        Word16 upper = target_band_grouping[target_band_idx + 1];
+        Word16 lower = target_band_grouping[target_band_idx];
+        Word16 source_band_in_target_band_cnt = 0;
+        Word16 norm_fac_fx = 32767; // 1.Q15
+        source_band_cnt_total = 0;
+        move16();
+        move16();
+        move16();
+
+        FOR( source_band_idx = 0; source_band_idx < n_source_bands; source_band_idx++ )
+        {
+            /* find lowest corresponding source band*/
+            test();
+            IF( LE_16( source_band_grouping[source_band_idx], lower ) && GE_16( source_band_grouping[source_band_idx + 1], lower ) )
+            {
+                DO
+                {
+                    Word16 source_bands_in_target_band = sub( s_min( source_band_grouping[source_band_idx + 1], upper ), s_max( source_band_grouping[source_band_idx], lower ) );
+                    IF( source_bands_in_target_band )
+                    {
+                        source_band_cnt_total = add( source_band_cnt_total, source_bands_in_target_band );
+                        parameter_band_mapping->source_band_idx[target_band_idx][source_band_in_target_band_cnt] = source_band_idx;
+                        parameter_band_mapping->source_band_factor_fx[target_band_idx][source_band_in_target_band_cnt++] = shl( source_bands_in_target_band, 10 ); /*Q10*/
+                        move16();
+                        move16();
+                    }
+                    source_band_idx++;
+                }
+                WHILE( LE_16( source_band_grouping[source_band_idx], upper ) && LT_16( source_band_idx, n_source_bands ) );
+                BREAK;
+            }
+        }
+        norm_fac_fx = div_s( 1, source_band_cnt_total ); /*Q15*/
+        FOR( source_band_idx = 0; source_band_idx < source_band_in_target_band_cnt; source_band_idx++ )
+        {
+            parameter_band_mapping->source_band_factor_fx[target_band_idx][source_band_idx] = shl_sat( mult( parameter_band_mapping->source_band_factor_fx[target_band_idx][source_band_idx], norm_fac_fx ) /*Q10*/, 5 ); /*Q15*/
+            move16();
+        }
+        parameter_band_mapping->n_source_bands[target_band_idx] = source_band_in_target_band_cnt;
+        move16();
+    }
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_reconfig()
+ *
+ * Reconfiguration of ParamMC decoder
+ *-------------------------------------------------------------------------*/
+
+ivas_error ivas_param_mc_dec_reconfig_fx(
+    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */
+)
+{
+    Word16 k, nchan_transport;
+    PARAM_MC_DEC_HANDLE hParamMC;
+    Word16 nchan_out_transport;
+    Word16 nchan_out_cov;
+    Word32 proto_matrix_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
+    Word32 proto_mtx_norm_fx;
+    Word16 max_param_band_residual;
+    UWord16 config_index;
+    MC_LS_SETUP mc_ls_setup;
+    Word32 output_Fs, ivas_total_brate;
+    ivas_error error;
+    Word16 nchan_transport_old;
+    Word16 num_param_bands_old;
+    PARAM_MC_PARAMETER_BAND_MAPPING parameter_band_mapping;
+    Word16 band_grouping_old[20 + 1];
+
+    hParamMC = st_ivas->hParamMC;
+    error = IVAS_ERR_OK;
+    move32();
+    /* save important config information from the previous state */
+    nchan_transport_old = st_ivas->nchan_transport;
+    move32();
+    num_param_bands_old = hParamMC->hMetadataPMC->num_parameter_bands;
+    move32();
+
+    /*-----------------------------------------------------------------*
+     * prepare library opening
+     *-----------------------------------------------------------------*/
+
+    output_Fs = st_ivas->hDecoderConfig->output_Fs;
+    move32();
+    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
+    move32();
+    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup_fx( st_ivas->transport_config );
+    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+
+    test();
+    IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+    }
+    ELSE
+    {
+        nchan_out_cov = nchan_out_transport;
+        move16();
+    }
+
+    st_ivas->nchan_transport = ivas_param_mc_getNumTransportChannels_fx( ivas_total_brate, mc_ls_setup );
+    move16();
+    config_index = ivas_param_mc_get_configuration_index_fx( mc_ls_setup, ivas_total_brate );
+    nchan_transport = st_ivas->nchan_transport;
+    move16();
+
+    SWITCH( nchan_transport )
+    {
+        case 4:
+        case 3:
+            st_ivas->nCPE = 2;
+            move16();
+            st_ivas->nSCE = 0;
+            move16();
+            st_ivas->element_mode_init = IVAS_CPE_MDCT;
+            move16();
+            BREAK;
+        case 2:
+            st_ivas->nCPE = 1;
+            move16();
+            st_ivas->nSCE = 0;
+            move16();
+            st_ivas->element_mode_init = IVAS_CPE_MDCT;
+            move16();
+
+            BREAK;
+    }
+
+    /*-----------------------------------------------------------------*
+     * set input parameters
+     *-----------------------------------------------------------------*/
+    hParamMC->num_freq_bands = shr( add( (Word16) Mpy_32_32( output_Fs, INV_CLDFB_BANDWIDTH_Q31 << 1 ), 1 ), 1 ); // Q0
+    move16();
+    hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands;
+    move16();
+
+    Copy( hParamMC->band_grouping, band_grouping_old, add( hParamMC->hMetadataPMC->num_parameter_bands, 1 ) );
+    ivas_param_mc_metadata_open_fx( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );
+    /* Band Grouping */
+    IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 20 ) )
+    {
+        Copy( param_mc_band_grouping_20, hParamMC->band_grouping, 20 + 1 );
+    }
+    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 14 ) )
+    {
+        Copy( param_mc_band_grouping_14, hParamMC->band_grouping, 14 + 1 );
+    }
+    ELSE IF( EQ_16( hParamMC->hMetadataPMC->num_parameter_bands, 10 ) )
+    {
+        Copy( param_mc_band_grouping_10, hParamMC->band_grouping, 10 + 1 );
+    }
+    ELSE
+    {
+        assert( 0 && "nbands must be 20, 14, or 10!" );
+    }
+
+    ivas_param_mc_get_param_band_mapping( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->band_grouping, num_param_bands_old, band_grouping_old, &parameter_band_mapping );
+
+    test();
+    IF( NE_16( nchan_transport_old, nchan_transport ) || NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) )
+    {
+        Word16 *ild_q_old_fx = hParamMC->icld_q_fx; // Q8
+        Word16 *icc_q_old_fx = hParamMC->icc_q_fx;  // Q15
+
+        IF( ( hParamMC->icc_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        IF( ( hParamMC->icld_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        set16_fx( hParamMC->icld_q_fx, PARAM_MC_DEFAULT_MIN_ILD_FX, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ); /*Q8*/
+        set16_fx( hParamMC->icc_q_fx, 0, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe );                            /*Q15*/
+
+        /* map old to new parameter banding, only for same number of TCs, needs some more thought for a changing number of TCs */
+        test();
+        IF( NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) && EQ_16( nchan_transport_old, nchan_transport ) )
+        {
+            Word16 new_param_band_idx, param_idx, source_param_idx;
+            Word16 num_param_lfe;
+            Word16 *p_icc_new_fx = hParamMC->icc_q_fx;  // Q15
+            Word16 *p_ild_new_fx = hParamMC->icld_q_fx; // Q8
+            Word16 p_ild_new_e = 23;
+            move16();
+            Word16 p_ild_new_tmp;
+
+            /* ICC */
+            num_param_lfe = hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe;
+            move16();
+            FOR( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ )
+            {
+                FOR( param_idx = 0; param_idx < num_param_lfe; param_idx++ )
+                {
+                    *p_icc_new_fx = 0;
+                    move16();
+                    FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
+                    {
+                        *p_icc_new_fx = add( *p_icc_new_fx, mult( icc_q_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx] * num_param_lfe + param_idx], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx] ) ); /*Q15*/
+                        move16();
+                    }
+                    p_icc_new_fx++;
+                }
+            }
+
+            /* ILD */
+            num_param_lfe = hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe;
+            move16();
+            FOR( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ )
+            {
+                FOR( param_idx = 0; param_idx < num_param_lfe; param_idx++ )
+                {
+                    *p_ild_new_fx = 0;
+                    move16();
+                    FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
+                    {
+                        p_ild_new_tmp = extract_h( BASOP_util_Pow2( L_mult0( 10885 /*log2(10)/10*2^15*/, ild_q_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx] * num_param_lfe + param_idx] ), 8, &p_ild_new_e ) ); // 31 - p_ild_new_e - 16
+                        *p_ild_new_fx = add( *p_ild_new_fx, mult( p_ild_new_tmp, parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx] ) );
+                        move16();
+                    }
+                    *p_ild_new_fx = extract_l( L_shr( Mpy_32_16_1( L_add( BASOP_Util_Log2( *p_ild_new_fx ), L_add( 16 << Q25, L_shl( p_ild_new_e, 25 ) ) ), 24660 /*3.Q13*/ ), 15 ) ); // Q8
+                    move16();
+                    p_ild_new_fx++;
+                }
+            }
+        }
+        free( ild_q_old_fx );
+        free( icc_q_old_fx );
+    }
+
+    param_mc_set_num_synth_bands( output_Fs, hParamMC );
+
+    /* set max parameter band for abs cov */
+    k = 0;
+    move16();
+    WHILE( LE_16( hParamMC->band_grouping[k], PARAM_MC_MAX_BAND_ABS_COV_DEC ) )
+    {
+        hParamMC->max_param_band_abs_cov = k;
+        move16();
+        k = add( k, 1 );
+    }
+
+    /*-----------------------------------------------------------------*
+     * open sub-modules
+     *-----------------------------------------------------------------*/
+
+    /* prototype signal computation */
+
+    IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        IF( NE_16( nchan_transport_old, nchan_transport ) )
+        {
+            IF( st_ivas->hLsSetUpConversion != NULL )
+            {
+                ivas_ls_setup_conversion_close_fx( &st_ivas->hLsSetUpConversion );
+            }
+
+            IF( NE_32( ( error = ivas_ls_setup_conversion_open_fx( st_ivas ) ), IVAS_ERR_OK ) )
+            {
+                return error;
+            }
+
+            /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */
+            free( hParamMC->ls_conv_dmx_matrix_fx );
+
+            IF( ( hParamMC->ls_conv_dmx_matrix_fx = (Word32 *) malloc( nchan_out_transport * nchan_out_cov * sizeof( Word32 ) ) ) == NULL )
+            {
+                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+            }
+            FOR( k = 0; k < nchan_out_transport; k++ )
+            {
+                Copy32( st_ivas->hLsSetUpConversion->dmxMtx_fx[k], &hParamMC->ls_conv_dmx_matrix_fx[k * nchan_out_cov], nchan_out_cov );
+            }
+        }
+        /* convert ParamMC parameter bands to SFB */
+
+        st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth;
+        move16();
+        FOR( k = 0; k <= hParamMC->num_param_bands_synth; k++ )
+        {
+            st_ivas->hLsSetUpConversion->sfbOffset[k] = imult1616( PARAM_MC_BAND_TO_MDCT_BAND_RATIO, hParamMC->band_grouping[k] );
+            move16();
+        }
+        FOR( ; k < MAX_SFB + 2; k++ )
+        {
+            st_ivas->hLsSetUpConversion->sfbOffset[k] = 0;
+            move16();
+        }
+    }
+
+    IF( NE_16( nchan_transport_old, nchan_transport ) )
+    {
+        free( hParamMC->proto_matrix_int_fx );
+        IF( ( hParamMC->proto_matrix_int_fx = (Word32 *) malloc( nchan_out_transport * nchan_transport * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        hParamMC->proto_matrix_int_len = imult1616( nchan_out_transport, nchan_transport );
+        move16();
+        Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, hParamMC->proto_matrix_int_fx, hParamMC->proto_matrix_int_len ); /*Q31*/
+    }
+
+    test();
+    IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), -4 ); // Q30 -> Q26
+        matrix_product_fx( hParamMC->ls_conv_dmx_matrix_fx, nchan_out_cov, nchan_out_transport, 0,
+                           ivas_param_mc_conf[config_index].dmx_fac_fx, nchan_out_transport, nchan_transport, 0,
+                           proto_matrix_fx /*Q26*/ );
+        Scale_sig32( hParamMC->ls_conv_dmx_matrix_fx, imult1616( nchan_out_transport, nchan_out_cov ), 4 ); // Q26 -> Q30
+
+        IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+        {
+            proto_mtx_norm_fx = ONE_IN_Q26; // Q26
+            move32();
+            FOR( k = 0; k < nchan_transport * nchan_out_cov; k++ )
+            {
+                proto_mtx_norm_fx = L_max( L_abs( proto_mtx_norm_fx ), L_abs( proto_matrix_fx[k] ) ); // Q26
+            }
+            proto_mtx_norm_fx = divide3232( ONE_IN_Q26, proto_mtx_norm_fx ); /*Q15*/
+
+            /* transfer flattened proto_matrix to 2D in hLsSetupConversion->dmxMtx */
+            FOR( k = 0; k < nchan_transport; k++ )
+            {
+                FOR( Word16 i = 0; i < nchan_out_cov; i++ )
+                {
+                    st_ivas->hLsSetUpConversion->dmxMtx_fx[k][i] = L_shl( Mpy_32_16_1( proto_matrix_fx[k * nchan_out_cov + i], (Word16) proto_mtx_norm_fx ), 4 ); // Q26 -> Q30
+                    move32();
+                }
+            }
+        }
+    }
+    ELSE
+    {
+        Copy32( ivas_param_mc_conf[config_index].dmx_fac_fx, proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ) ); // proto_matrix_fx -> Q31
+        Scale_sig32( proto_matrix_fx, imult1616( nchan_out_transport, nchan_transport ), -5 );                                     // proto_matrix_fx -> Q26
+    }
+
+    test();
+    IF( NE_16( nchan_transport_old, nchan_transport ) && NE_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        Word16 i;
+        Word16 len;
+
+        /* close decorrelator */
+        ivas_dirac_dec_decorr_close_fx( &hParamMC->h_freq_domain_decorr_ap_params, &hParamMC->h_freq_domain_decorr_ap_state );
+
+        /* deallocate diffuse prototype info */
+        IF( hParamMC->diff_proto_info )
+        {
+            FOR( i = 0; i < hParamMC->diff_proto_info->num_protos_diff; i++ )
+            {
+                free( hParamMC->diff_proto_info->source_chan_idx[i] );
+                hParamMC->diff_proto_info->source_chan_idx[i] = NULL;
+
+                free( hParamMC->diff_proto_info->proto_fac_fx[i] );
+                hParamMC->diff_proto_info->proto_fac_fx[i] = NULL;
+            }
+
+            free( hParamMC->diff_proto_info->source_chan_idx );
+            hParamMC->diff_proto_info->source_chan_idx = NULL;
+
+            free( hParamMC->diff_proto_info->proto_fac_fx );
+            hParamMC->diff_proto_info->proto_fac_fx = NULL;
+
+            free( hParamMC->diff_proto_info->proto_index_diff );
+            hParamMC->diff_proto_info->proto_index_diff = NULL;
+
+            free( hParamMC->diff_proto_info->num_source_chan_diff );
+            hParamMC->diff_proto_info->num_source_chan_diff = NULL;
+
+            free( hParamMC->diff_proto_info );
+            hParamMC->diff_proto_info = NULL;
+        }
+
+        hParamMC->num_outputs_diff = nchan_out_cov;
+        move16();
+        IF( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        IF( ( param_mc_get_diff_proto_info_fx( proto_matrix_fx, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info, Q26 ) ) != IVAS_ERR_OK )
+        {
+            return error;
+        }
+
+        /* decorrelation */
+        hParamMC->h_freq_domain_decorr_ap_params = NULL;
+        hParamMC->h_freq_domain_decorr_ap_state = NULL;
+
+        Word16 frequency_axis_fx[CLDFB_NO_CHANNELS_MAX];
+        ivas_dirac_dec_get_frequency_axis_fx( frequency_axis_fx, output_Fs, hParamMC->num_freq_bands ); // Q0
+
+        IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( hParamMC->h_freq_domain_decorr_ap_params ), &( hParamMC->h_freq_domain_decorr_ap_state ), hParamMC->num_freq_bands, hParamMC->num_outputs_diff,
+                                                            hParamMC->diff_proto_info->num_protos_diff, DIRAC_SYNTHESIS_COV_MC_LS, frequency_axis_fx, nchan_transport, output_Fs ) ),
+                   IVAS_ERR_OK ) )
+        {
+            return error;
+        }
+        hParamMC->h_output_synthesis_params.use_onset_filters = 0;
+        move16();
+        hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr;
+        move16();
+        /* init decorrelation */
+        IF( hParamMC->max_band_decorr > 0 )
+        {
+
+            len = imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->h_freq_domain_decorr_ap_params->h_onset_detection_power_params.max_band_decorr );
+
+            /* init onsetDetectionPower */
+            set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx, len );
+            set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx, len );
+            hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.q_onset_detector = Q31;
+            move16();
+        }
+    }
+    hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->hMetadataPMC->nbands_coded];
+    move16();
+    max_param_band_residual = 0;
+    move16();
+
+    FOR( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- )
+    {
+        IF( LE_16( hParamMC->band_grouping[k], hParamMC->max_band_decorr ) )
+        {
+            max_param_band_residual = k;
+            move16();
+            assert( hParamMC->band_grouping[k] == hParamMC->max_band_decorr );
+            BREAK;
+        }
+    }
+
+    test();
+    IF( NE_16( nchan_transport_old, nchan_transport ) || NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) )
+    {
+        DIRAC_OUTPUT_SYNTHESIS_COV_STATE cov_state_old = hParamMC->h_output_synthesis_cov_state;
+        DIRAC_OUTPUT_SYNTHESIS_PARAMS params_old = hParamMC->h_output_synthesis_params;
+
+        Word32 tmp_buf_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
+
+        set_zero_fx( tmp_buf_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
+
+        /* output synthesis */
+        IF( NE_32( ( error = ivas_dirac_dec_output_synthesis_cov_open_fx( &( hParamMC->h_output_synthesis_params ), &( hParamMC->h_output_synthesis_cov_state ), hParamMC->max_band_decorr, PARAM_MC_MAX_NSLOTS,
+                                                                          hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual, nchan_transport, nchan_out_cov, proto_matrix_fx ) ),
+                   IVAS_ERR_OK ) )
+        {
+            return error;
+        }
+
+        ivas_param_mc_dec_compute_interpolator_fx( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator_fx );
+
+        ivas_dirac_dec_output_synthesis_cov_init_fx( &( hParamMC->h_output_synthesis_cov_state ), nchan_transport, nchan_out_cov, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual );
+
+        /* map old to new parameter banding, only for same number of TCs, needs some more thought for changing number of TCs */
+        test();
+        IF( NE_16( num_param_bands_old, hParamMC->hMetadataPMC->num_parameter_bands ) && EQ_16( nchan_transport_old, nchan_transport ) )
+        {
+            Word16 new_param_band_idx, source_param_idx;
+
+            FOR( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ )
+            {
+                FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
+                {
+                    /* Cx */
+                    v_multc_fixed_16( cov_state_old.cx_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_transport_old ) );                                                                                                                                                                                                    // Q(31 - cov_state_old.cx_old_e)
+                    v_add_fixed_me( tmp_buf_fx, cov_state_old.cx_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], imult1616( nchan_transport_old, nchan_transport_old ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx])
+                    /* Cy */
+                    v_multc_fixed_16( cov_state_old.cy_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) );                                                                                                                                                                                                    // Q(31 - cov_state_old.cy_old_e)
+                    v_add_fixed_me( tmp_buf_fx, cov_state_old.cy_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx])
+                    /* mixing matrix*/
+                    v_multc_fixed_16( cov_state_old.mixing_matrix_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_out_cov ) );                                                                                                                                                                                                                                                      // Q(31 - mixing_matrix_old_exp)
+                    v_add_fixed_me( tmp_buf_fx, cov_state_old.mixing_matrix_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], imult1616( nchan_transport_old, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx])
+                }
+            }
+            FOR( new_param_band_idx = 0; new_param_band_idx < max_param_band_residual; new_param_band_idx++ )
+            {
+                FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
+                {
+                    /* residual mixing matrix*/
+                    v_multc_fixed_16( cov_state_old.mixing_matrix_res_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) );                                                                                                                                                                                                                                                                      // Q(31 - mixing_matrix_res_old_exp)
+                    v_add_fixed_me( tmp_buf_fx, cov_state_old.mixing_matrix_res_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx])
+                }
+            }
+        }
+        ivas_dirac_dec_output_synthesis_cov_close_fx( &params_old, &cov_state_old );
+    }
+
+    /*-----------------------------------------------------------------*
+     * memory allocation
+     *-----------------------------------------------------------------*/
+
+    test();
+    IF( ( hParamMC->max_band_decorr > 0 ) && NE_16( nchan_transport_old, nchan_transport ) )
+    {
+        free( hParamMC->proto_frame_f_fx );
+        IF( ( hParamMC->proto_frame_f_fx = (Word32 *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+        set_zero_fx( hParamMC->proto_frame_f_fx, shl( imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->num_freq_bands ), 1 ) );
+    }
+
+
+    IF( NE_16( nchan_transport_old, nchan_transport ) )
+    {
+        IF( NE_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+        {
+            Word16 n_cldfb_slots;
+            IF( hParamMC->Cldfb_RealBuffer_tc_fx != NULL )
+            {
+                free( hParamMC->Cldfb_RealBuffer_tc_fx );
+                hParamMC->Cldfb_RealBuffer_tc_fx = NULL; // Q12
+            }
+            IF( hParamMC->Cldfb_ImagBuffer_tc_fx != NULL )
+            {
+                free( hParamMC->Cldfb_ImagBuffer_tc_fx );
+                hParamMC->Cldfb_ImagBuffer_tc_fx = NULL; // Q12
+            }
+
+            n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
+            move16();
+            IF( st_ivas->hDecoderConfig->Opt_tsm )
+            {
+                n_cldfb_slots = MAX_JBM_CLDFB_TIMESLOTS;
+                move16();
+            }
+            Word16 cldfb_size = imult1616( imult1616( n_cldfb_slots, nchan_transport ), hParamMC->num_freq_bands );
+            IF( ( hParamMC->Cldfb_RealBuffer_tc_fx = (Word32 *) malloc( cldfb_size * sizeof( Word32 ) ) ) == NULL )
+            {
+                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
+            }
+            set_zero_fx( hParamMC->Cldfb_RealBuffer_tc_fx, cldfb_size );
+
+            IF( ( hParamMC->Cldfb_ImagBuffer_tc_fx = (Word32 *) malloc( cldfb_size * sizeof( Word32 ) ) ) == NULL )
+            {
+                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
+            }
+            set_zero_fx( hParamMC->Cldfb_ImagBuffer_tc_fx, cldfb_size );
+        }
+        ELSE
+        {
+            IF( hParamMC->Cldfb_RealBuffer_tc_fx != NULL )
+            {
+                free( hParamMC->Cldfb_RealBuffer_tc_fx );
+                hParamMC->Cldfb_RealBuffer_tc_fx = NULL;
+            }
+            IF( hParamMC->Cldfb_ImagBuffer_tc_fx != NULL )
+            {
+                free( hParamMC->Cldfb_ImagBuffer_tc_fx );
+                hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
+            }
+        }
+    }
+    return error;
+}
+
+
+/*-------------------------------------------------------------------------
+ * param_mc_get_num_cldfb_syntheses()
+ *
+ * calculate the necessary number of CLDFB synthesis instances
+ *------------------------------------------------------------------------*/
+
+/*! r: number of cldfb synthesis instances */
+Word16 param_mc_get_num_cldfb_syntheses_fx(
+    Decoder_Struct *st_ivas /* i  : Parametric MC handle */
+)
+{
+    Word16 num_cldfb_syntheses;
+
+    num_cldfb_syntheses = 0;
+    move16();
+
+    /* sanity check*/
+    IF( st_ivas->hParamMC == NULL )
+    {
+        assert( 0 && "ParamMC handle does not exist!\n" );
+    }
+
+    test();
+    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+    {
+        num_cldfb_syntheses = 2;
+        move16();
+    }
+    ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+    {
+        num_cldfb_syntheses = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+    }
+    ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MC_PARAMMC ) )
+    {
+        num_cldfb_syntheses = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+    }
+
+    return num_cldfb_syntheses;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_close()
+ *
+ * Close Parametric MC memories
+ *------------------------------------------------------------------------*/
+
+void ivas_param_mc_dec_close_fx(
+    PARAM_MC_DEC_HANDLE *hParamMC_out /* i/o: Parametric MC decoder handle   */
+)
+{
+    UWord16 i;
+    PARAM_MC_DEC_HANDLE hParamMC;
+
+    IF( hParamMC_out == NULL || *hParamMC_out == NULL )
+    {
+        return;
+    }
+
+    hParamMC = *hParamMC_out;
+
+    /* close sub-modules */
+    ivas_dirac_dec_output_synthesis_cov_close_fx( &hParamMC->h_output_synthesis_params, &hParamMC->h_output_synthesis_cov_state );
+
+    IF( hParamMC->h_freq_domain_decorr_ap_params != NULL || hParamMC->h_freq_domain_decorr_ap_state != NULL )
+    {
+        ivas_dirac_dec_decorr_close_fx( &hParamMC->h_freq_domain_decorr_ap_params, &hParamMC->h_freq_domain_decorr_ap_state );
+    }
+
+    /* parameter decoding */
+    IF( hParamMC->hMetadataPMC != NULL )
+    {
+        free( hParamMC->hMetadataPMC );
+        hParamMC->hMetadataPMC = NULL;
+    }
+    IF( hParamMC->icc_q_fx != NULL )
+    {
+        free( hParamMC->icc_q_fx );
+        hParamMC->icc_q_fx = NULL; // Q15
+    }
+
+    IF( hParamMC->icld_q_fx != NULL )
+    {
+        free( hParamMC->icld_q_fx );
+        hParamMC->icld_q_fx = NULL; // Q8
+    }
+    /* diffuse prototype info */
+    IF( hParamMC->diff_proto_info )
+    {
+        FOR( i = 0; i < hParamMC->diff_proto_info->num_protos_diff; i++ )
+        {
+            free( hParamMC->diff_proto_info->source_chan_idx[i] );
+            hParamMC->diff_proto_info->source_chan_idx[i] = NULL;
+
+            free( hParamMC->diff_proto_info->proto_fac_fx[i] );
+            hParamMC->diff_proto_info->proto_fac_fx[i] = NULL;
+        }
+
+        free( hParamMC->diff_proto_info->source_chan_idx );
+        hParamMC->diff_proto_info->source_chan_idx = NULL;
+
+        free( hParamMC->diff_proto_info->proto_fac_fx );
+        hParamMC->diff_proto_info->proto_fac_fx = NULL;
+
+        free( hParamMC->diff_proto_info->proto_index_diff );
+        hParamMC->diff_proto_info->proto_index_diff = NULL;
+
+        free( hParamMC->diff_proto_info->num_source_chan_diff );
+        hParamMC->diff_proto_info->num_source_chan_diff = NULL;
+
+        free( hParamMC->diff_proto_info );
+        hParamMC->diff_proto_info = NULL;
+    }
+    /* States */
+    /* free prototype signal buffers */
+    IF( hParamMC->proto_frame_f_fx != NULL )
+    {
+        free( hParamMC->proto_frame_f_fx );
+        hParamMC->proto_frame_f_fx = NULL;
+    }
+
+    IF( hParamMC->proto_frame_dec_f_fx != NULL )
+    {
+        free( hParamMC->proto_frame_dec_f_fx );
+        hParamMC->proto_frame_dec_f_fx = NULL;
+    }
+
+    IF( hParamMC->ls_conv_dmx_matrix_fx != NULL )
+    {
+        free( hParamMC->ls_conv_dmx_matrix_fx );
+        hParamMC->ls_conv_dmx_matrix_fx = NULL;
+    }
+
+    IF( hParamMC->proto_matrix_int_fx != NULL )
+    {
+        free( hParamMC->proto_matrix_int_fx );
+        hParamMC->proto_matrix_int_fx = NULL;
+    }
+
+    IF( hParamMC->hoa_encoder_fx != NULL )
+    {
+        free( hParamMC->hoa_encoder_fx );
+        hParamMC->hoa_encoder_fx = NULL;
+    }
+    IF( hParamMC->Cldfb_RealBuffer_tc_fx != NULL )
+    {
+        free( hParamMC->Cldfb_RealBuffer_tc_fx );
+        hParamMC->Cldfb_RealBuffer_tc_fx = NULL;
+    }
+    IF( hParamMC->Cldfb_ImagBuffer_tc_fx != NULL )
+    {
+        free( hParamMC->Cldfb_ImagBuffer_tc_fx );
+        hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
+    }
+
+    free( *hParamMC_out );
+    *hParamMC_out = NULL;
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_read_BS()
+ *
+ * Read the Parametric MC metadata
+ *------------------------------------------------------------------------*/
+
+void ivas_param_mc_dec_read_BS_fx(
+    const Word32 ivas_total_brate, /* i  : IVAS total bitrate      */
+    Decoder_State *st,             /* i/o: decoder state structure */
+    PARAM_MC_DEC_HANDLE hParamMC,  /* i/o: decoder ParamMC handle  */
+    Word16 *nb_bits                /* o  : number of bits written  */
+)
+{
+    Word16 param_frame_idx;
+    Word16 band_step;
+    UWord16 bit_buffer[PARAM_MC_MAX_BITS];
+    Word16 bits_to_copy;
+    Word16 bit_pos;
+    Word16 num_lfe_bands;
+    Word16 num_param_bands;
+    Word16 metadata_bit_pos;
+    Word16 i, j, k;
+    Word16 icc_map_size;
+    Word16 icc_map_size_wo_lfe;
+    Word16 ild_map_size;
+    Word16 ild_map_size_wo_lfe;
+    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC;
+
+    push_wmops( "param_mc_read_bs" );
+
+    /* Inits */
+    *nb_bits = 0;
+    move16();
+    hMetadataPMC = hParamMC->hMetadataPMC;
+    icc_map_size = hMetadataPMC->icc_mapping_conf->icc_map_size_lfe;
+    move16();
+    icc_map_size_wo_lfe = hMetadataPMC->icc_mapping_conf->icc_map_size_wo_lfe;
+    move16();
+    ild_map_size = hMetadataPMC->ild_mapping_conf->ild_map_size_lfe;
+    move16();
+    ild_map_size_wo_lfe = hMetadataPMC->ild_mapping_conf->ild_map_size_wo_lfe;
+    move16();
+
+    IF( !st->bfi )
+    {
+        /*metadata_bit_pos = extract_l(ivas_total_brate / FRAMES_PER_SEC - 1);
+        bits_to_copy = s_min(extract_l(ivas_total_brate / FRAMES_PER_SEC), PARAM_MC_MAX_BITS);*/
+        Word16 temp = extract_l( Mpy_32_32_r( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
+        metadata_bit_pos = sub( temp, 1 );
+        bits_to_copy = s_min( temp, PARAM_MC_MAX_BITS );
+
+        /* copy and reverse metadata */
+        FOR( bit_pos = 0; bit_pos < bits_to_copy; bit_pos++ )
+        {
+            bit_buffer[bit_pos] = st->bit_stream[metadata_bit_pos];
+            move16();
+            metadata_bit_pos = sub( metadata_bit_pos, 1 );
+            move16();
+        }
+
+        bit_pos = 0;
+        move16();
+
+        /* read reserved bit */
+        hMetadataPMC->lfe_on = bit_buffer[bit_pos++];
+        move16();
+
+        /* get coded bwidth */
+        {
+            Word16 pos;
+            Word16 bw = 0;
+            move16();
+            FOR( pos = 0; pos < 2; pos++ )
+            {
+                bw = add( bw, extract_l( L_shl( bit_buffer[bit_pos++], pos ) ) );
+            }
+            hMetadataPMC->coded_bwidth = bw;
+            move16();
+        }
+
+        /* set tables if coded band width differs from last frame */
+        IF( NE_16( hMetadataPMC->coded_bwidth, hMetadataPMC->last_coded_bwidth ) )
+        {
+            ivas_param_mc_set_coded_bands_fx( hMetadataPMC );
+            param_mc_set_num_synth_bands( st->output_Fs, hParamMC );
+            hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->num_param_bands_synth];
+            move16();
+        }
+
+        param_frame_idx = bit_buffer[bit_pos++];
+        move16();
+        hMetadataPMC->param_frame_idx = param_frame_idx;
+        move16();
+        num_param_bands = hMetadataPMC->nbands_in_param_frame[param_frame_idx];
+        move16();
+
+        hMetadataPMC->bAttackPresent = bit_buffer[bit_pos++];
+        move16();
+        hMetadataPMC->attackIndex = 0;
+        move16();
+        band_step = 1;
+        move16();
+        num_lfe_bands = 0;
+        move16();
+
+        IF( hMetadataPMC->bAttackPresent )
+        {
+            FOR( i = 2; i >= 0; i-- )
+            {
+                hMetadataPMC->attackIndex = add( hMetadataPMC->attackIndex, extract_l( L_shl( bit_buffer[bit_pos++], i ) ) );
+            }
+
+            band_step = PARAM_MC_TRANSIENT_BAND_STEP;
+            move16();
+
+            /*num_lfe_bands = add(PARAM_MC_MAX_BAND_LFE / band_step, (PARAM_MC_MAX_BAND_LFE % band_step) ? 1 : 0);
+            num_param_bands = add(hMetadataPMC->nbands_coded / band_step, ((hMetadataPMC->nbands_coded % band_step) ? 1 : 0));*/
+            Word16 temp_e;
+            temp = BASOP_Util_Divide3232_Scale( PARAM_MC_MAX_BAND_LFE, band_step, &temp_e );
+            temp = shr( temp, sub( 15, temp_e ) );
+            Word16 temp1;
+            IF( PARAM_MC_MAX_BAND_LFE % band_step )
+            {
+                temp1 = 1;
+            }
+            ELSE
+            {
+                temp1 = 0;
+            }
+            move16();
+            num_lfe_bands = add( temp, temp1 );
+
+            temp = BASOP_Util_Divide3232_Scale( hMetadataPMC->nbands_coded, band_step, &temp_e );
+            temp = shr( temp, sub( 15, temp_e ) );
+            Word16 temp2;
+            IF( hMetadataPMC->nbands_coded % band_step )
+            {
+                temp2 = 1;
+            }
+            ELSE
+            {
+                temp2 = 0;
+            }
+            move16();
+            num_param_bands = add( temp, temp2 );
+        }
+        ELSE
+        {
+            FOR( j = 0; j < PARAM_MC_MAX_BAND_LFE; j += band_step )
+            {
+                IF( EQ_16( param_frame_idx, hMetadataPMC->coding_band_mapping[j] ) )
+                {
+                    /* LFE ICC is always the last ICC in coding band 0 */
+                    num_lfe_bands = add( num_lfe_bands, 1 );
+                    move16();
+                }
+            }
+        }
+
+        IF( !hMetadataPMC->lfe_on )
+        {
+            num_lfe_bands = 0;
+            move16();
+        }
+
+        ivas_param_mc_bs_decode_parameter_values_fx( bit_buffer, &bit_pos, bits_to_copy, &st->BER_detect, hMetadataPMC, &hMetadataPMC->icc_coding,
+                                                     icc_map_size_wo_lfe, icc_map_size, num_lfe_bands, band_step, num_param_bands, hParamMC->icc_q_fx );
+
+        IF( !st->BER_detect )
+        {
+            ivas_param_mc_bs_decode_parameter_values_fx( bit_buffer, &bit_pos, bits_to_copy, &st->BER_detect, hMetadataPMC, &hMetadataPMC->ild_coding,
+                                                         ild_map_size_wo_lfe, ild_map_size, num_lfe_bands, band_step, num_param_bands, hParamMC->icld_q_fx );
+        }
+        /* set LFE ILD and ICC to zero above PARAM_MC_MAX_BAND_LFE for attack frames */
+        IF( hMetadataPMC->bAttackPresent )
+        {
+            FOR( k = PARAM_MC_MAX_BAND_LFE; k < imult1616( band_step, num_lfe_bands ); k++ )
+            {
+                hParamMC->icc_q_fx[L_sub( L_mult0( add( k, 1 ), icc_map_size ), 1 )] = 32767; /* 1.0f in Q15 */
+                move16();
+                hParamMC->icld_q_fx[L_sub( L_mult0( add( k, 1 ), ild_map_size ), 1 )] = PARAM_MC_DEFAULT_MIN_ILD_FX; /* -92.0f in Q8 */
+                move16();
+            }
+        }
+
+        *nb_bits = bit_pos;
+        move16();
+
+    } /* if ( !st->bfi ) */
+
+    IF( st->bfi )
+    {
+        /* for PLC, use the saved ILDs and ICCs from the past and set the transient flag and transient position to zero */
+        hMetadataPMC->bAttackPresent = 0;
+        move16();
+        hMetadataPMC->attackIndex = 0;
+        move16();
+    }
+
+    pop_wmops();
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_digest_tc()
+ *
+ *
+ *------------------------------------------------------------------------*/
+
+void ivas_param_mc_dec_digest_tc_fx(
+    Decoder_Struct *st_ivas,  /* i/o: IVAS decoder handle                                       */
+    const UWord8 nCldfbSlots, /* i  : number of CLFBS slots in the transport channels           */
+    Word32 *transport_channels_f_fx[],
+    Word16 transport_f_e )
+{
+    PARAM_MC_DEC_HANDLE hParamMC;
+    Word16 i, ch;
+    Word16 is_next_band, skip_next_band;
+    Word16 slot_idx, param_band_idx;
+    Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
+    Word16 nchan_out_cov;
+    /*CLDFB*/
+    /* format converter */
+    Word16 channel_active[MAX_OUTPUT_CHANNELS];
+    IVAS_OUTPUT_SETUP *hSynthesisOutputSetup;
+
+    hParamMC = st_ivas->hParamMC;
+    assert( hParamMC );
+    Word32 *pCx, *pCx_imag;
+    Word32 cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];                // Q(31 - cx_e)
+    Word32 cx_imag_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];           // Q(31 - cx_imag_e)
+    Word32 cx_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];      // Q(31 - cx_next_band_e)
+    Word32 cx_imag_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_imag_next_band_e)
+
+    Word16 cx_buff_e[2][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
+    Word16 cx_e;
+    Word16 cx_imag_e, tmp_e;
+    Word16 cx_imag_next_band_e, cx_next_band_e;
+    Word16 qout = 0;
+    move16();
+
+    Word32 real_part_fx, imag_part_fx, L_tmp1, L_tmp2;
+
+    Word16 max_e;
+
+    push_wmops( "param_mc_dec_digest_tc" );
+
+    set16_fx( channel_active, 0, MAX_CICP_CHANNELS );
+    nchan_transport = st_ivas->nchan_transport;
+    move16();
+    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+
+    test();
+    test();
+    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+    {
+        nchan_out_cldfb = BINAURAL_CHANNELS;
+        move16();
+        set16_fx( channel_active, 1, nchan_out_cldfb );
+        nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+        hSynthesisOutputSetup = &st_ivas->hTransSetup;
+    }
+    ELSE IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
+    {
+        nchan_out_cov = nchan_out_transport;
+        move16();
+        nchan_out_cldfb = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+        hSynthesisOutputSetup = &st_ivas->hTransSetup;
+    }
+    ELSE IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+        nchan_out_cldfb = nchan_out_cov;
+        move16();
+        set16_fx( channel_active, 1, nchan_out_cov );
+        hSynthesisOutputSetup = &st_ivas->hOutSetup;
+    }
+    ELSE
+    {
+        nchan_out_cov = nchan_out_transport;
+        move16();
+        nchan_out_cldfb = nchan_out_transport;
+        move16();
+        set16_fx( channel_active, 1, nchan_out_cov );
+        hSynthesisOutputSetup = &st_ivas->hTransSetup;
+    }
+
+    /* adapt transient position */
+    IF( hParamMC->hMetadataPMC->bAttackPresent )
+    {
+        hParamMC->hMetadataPMC->attackIndex = s_max( 0, add( hParamMC->hMetadataPMC->attackIndex, shr( sub( nCldfbSlots, DEFAULT_JBM_CLDFB_TIMESLOTS ), 1 ) ) );
+        move16();
+    }
+    /* adapt subframes */
+    hParamMC->num_slots = nCldfbSlots;
+    move16();
+    hParamMC->slots_rendered = 0;
+    move16();
+    hParamMC->subframes_rendered = 0;
+    move16();
+    ivas_jbm_dec_get_adapted_subframes( nCldfbSlots, hParamMC->subframe_nbslots, &hParamMC->nb_subframes );
+    st_ivas->hTcBuffer->nb_subframes = hParamMC->nb_subframes;
+    move16();
+    Copy( hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hParamMC->nb_subframes );
+
+    ivas_param_mc_dec_compute_interpolator_fx( hParamMC->hMetadataPMC->bAttackPresent, hParamMC->hMetadataPMC->attackIndex, nCldfbSlots, hParamMC->h_output_synthesis_params.interpolator_fx );
+
+    /* loop over two bands at a time */
+    FOR( param_band_idx = 0; param_band_idx < hParamMC->num_param_bands_synth; param_band_idx += 2 )
+    {
+        /* don't process next band if it exceeds the limit */
+        skip_next_band = ( ( param_band_idx + 1 ) == hParamMC->num_param_bands_synth ) ? 1 : 0;
+
+        set_zero_fx( cx_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
+        set_zero_fx( cx_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
+        set_zero_fx( cx_next_band_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
+        set_zero_fx( cx_imag_next_band_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
+
+        cx_e = 0;
+        move16();
+        cx_imag_e = 0;
+        move16();
+        cx_next_band_e = 0;
+        move16();
+        cx_imag_next_band_e = 0;
+        move16();
+        /* slot loop for gathering the input data */
+        FOR( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )
+        {
+            IF( st_ivas->hDecoderConfig->Opt_tsm )
+            {
+                IF( param_band_idx == 0 ) /* only run cldfbAna once */
+                {
+                    Word32 RealBuffer_fx[CLDFB_NO_CHANNELS_MAX];
+                    Word32 ImagBuffer_fx[CLDFB_NO_CHANNELS_MAX];
+
+                    /* CLDFB Analysis*/
+                    FOR( ch = 0; ch < nchan_transport; ch++ )
+                    {
+                        qout = transport_f_e;
+                        move16();
+                        cldfbAnalysis_ts_fx_fixed_q( &( transport_channels_f_fx[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch], &qout );
+
+                        Copy32( RealBuffer_fx, &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
+                        Copy32( ImagBuffer_fx, &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
+                    }
+
+                    hParamMC->Cldfb_ImagBuffer_tc_e = qout;
+                    move16();
+                }
+            }
+            IF( GE_16( slot_idx, shl( hParamMC->hMetadataPMC->attackIndex, 1 ) ) )
+            {
+                FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+                {
+                    test();
+                    IF( is_next_band && skip_next_band )
+                    {
+                        CONTINUE;
+                    }
+                    IF( is_next_band )
+                    {
+                        ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
+                                                                                      /*hParamMC->Cldfb_RealBuffer_tc_e*/ Q31 - Q6,
+                                                                                      &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
+                                                                                      /*hParamMC->Cldfb_ImagBuffer_tc_e*/ Q31 - Q6,
+                                                                                      cx_next_band_fx,
+                                                                                      &cx_next_band_e,
+                                                                                      cx_imag_next_band_fx,
+                                                                                      &cx_imag_next_band_e,
+                                                                                      hParamMC,
+                                                                                      add( param_band_idx, is_next_band ),
+                                                                                      nchan_transport );
+                    }
+                    ELSE
+                    {
+                        ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
+                                                                                      /*hParamMC->Cldfb_RealBuffer_tc_e*/ Q31 - Q6,
+                                                                                      &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
+                                                                                      /*hParamMC->Cldfb_ImagBuffer_tc_e*/ Q31 - Q6,
+                                                                                      cx_fx,
+                                                                                      &cx_e,
+                                                                                      cx_imag_fx,
+                                                                                      &cx_imag_e,
+                                                                                      hParamMC,
+                                                                                      add( param_band_idx, is_next_band ),
+                                                                                      nchan_transport );
+                    }
+                }
+            }
+        }
+
+        Word16 tmp_cx_e, tmp_cx_imag_e;
+        /* map from complex input covariance to real values */
+        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+        {
+            test();
+            IF( is_next_band && skip_next_band )
+            {
+                CONTINUE;
+            }
+            /* Cx for transport channels */
+            IF( is_next_band )
+            {
+                pCx = &cx_next_band_fx[0];
+                pCx_imag = &cx_imag_next_band_fx[0];
+                tmp_cx_e = cx_next_band_e;
+                tmp_cx_imag_e = cx_imag_next_band_e;
+            }
+            ELSE
+            {
+                pCx = &cx_fx[0];
+                pCx_imag = &cx_imag_fx[0];
+                tmp_cx_e = cx_e;
+                tmp_cx_imag_e = cx_imag_e;
+            }
+
+            FOR( i = 0; i < nchan_transport * nchan_transport; i++ )
+            {
+                real_part_fx = pCx[i]; // Q(31 - cx_buff_e)
+                imag_part_fx = pCx_imag[i];
+                move32();
+                move32();
+                cx_buff_e[is_next_band][i] = tmp_cx_e;
+                move16();
+                /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
+                IF( LT_16( param_band_idx, hParamMC->max_param_band_abs_cov ) )
+                {
+                    L_tmp1 = Mpy_32_32( real_part_fx, real_part_fx );
+                    L_tmp2 = Mpy_32_32( imag_part_fx, imag_part_fx );
+                    L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp1, add( tmp_cx_e, tmp_cx_e ), L_tmp2, add( tmp_cx_imag_e, tmp_cx_imag_e ), &tmp_e );
+                    pCx[i] = Sqrt32( L_tmp1, &tmp_e );
+                    move32();
+                    cx_buff_e[is_next_band][i] = tmp_e;
+                    move16();
+                }
+                ELSE
+                {
+                    pCx[i] = real_part_fx;
+                    move32();
+                    cx_buff_e[is_next_band][i] = tmp_cx_e;
+                    move16();
+                }
+            }
+        }
+
+        max_e = cx_buff_e[0][0];
+        move16();
+
+        /* Cx for transport channels */
+        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+        {
+            FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )
+            {
+
+                IF( LT_16( max_e, cx_buff_e[is_next_band][i] ) )
+                {
+                    max_e = cx_buff_e[is_next_band][i];
+                }
+            }
+        }
+        /* Cx for transport channels */
+        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+        {
+            FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )
+            {
+                if ( is_next_band == 0 )
+                {
+                    cx_fx[i] = L_shr( cx_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );
+                }
+                else
+                {
+                    cx_next_band_fx[i] = L_shr( cx_next_band_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );
+                }
+                move32();
+            }
+        }
+        cx_e = max_e;
+        move16();
+
+
+        /* we have to do it similar to the encoder in case of attacks (i.e. accumulate two bands) to ensure correct DMX of the target covariance*/
+
+        test();
+        test();
+        IF( hParamMC->hMetadataPMC->bAttackPresent && ( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) ) )
+        {
+            v_add_fx( cx_fx, cx_next_band_fx, cx_fx, imult1616( nchan_transport, nchan_transport ) );
+            Copy32( cx_fx, cx_next_band_fx, imult1616( nchan_transport, nchan_transport ) );
+        }
+
+        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+        {
+            test();
+            IF( is_next_band && skip_next_band )
+            {
+                CONTINUE;
+            }
+
+            IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+            {
+                IF( is_next_band )
+                {
+
+                    ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_next_band_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );
+                }
+                ELSE
+                {
+
+                    ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );
+                }
+            }
+        }
+    }
+    pop_wmops();
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec()
+ *
+ * Parametric MC decoding process
+ *------------------------------------------------------------------------*/
+
+void ivas_param_mc_dec_render_fx(
+    Decoder_Struct *st_ivas,        /* i/o: IVAS decoder handle                                     */
+    const UWord16 nSamplesAsked,    /* i  : number of CLDFB slots requested                         */
+    UWord16 *nSamplesRendered,      /* o  : number of CLDFB slots rendered                          */
+    UWord16 *nSamplesAvailableNext, /* o  : number of CLDFB slots still to render                   */
+    Word32 *output_f_fx[],          /* o  : rendered time signal                                    Q11*/
+    Word16 channel_active_fx[MAX_OUTPUT_CHANNELS] )
+{
+    PARAM_MC_DEC_HANDLE hParamMC;
+    Word16 i, ch;
+    Word16 subframe_idx;
+    Word16 slot_idx, slot_idx_start, slot_idx_start_cldfb_synth, first_sf, last_sf, slots_to_render;
+    Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
+    Word16 nchan_out_cov;
+
+    /*CLDFB*/
+    Word32 Cldfb_RealBuffer_fx[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+    Word32 Cldfb_ImagBuffer_fx[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+    Word32 Cldfb_RealBuffer_Binaural_fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+    Word32 Cldfb_ImagBuffer_Binaural_fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+    Word32 *p_output_f_fx[MAX_OUTPUT_CHANNELS];
+    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+    {
+        p_output_f_fx[i] = output_f_fx[i]; // Q11
+    }
+    /*Decorrelator*/
+    Word32 onset_filter_fx[MAX_CICP_CHANNELS * CLDFB_NO_CHANNELS_MAX]; // Q31
+
+    /* format converter */
+    Word16 channel_active[MAX_OUTPUT_CHANNELS];
+    UWord16 nband_synth;
+    UWord32 output_Fs;
+    Word16 tmp_q = 0;
+    move16();
+
+    hParamMC = st_ivas->hParamMC;
+    assert( hParamMC );
+
+    push_wmops( "param_mc_dec_render" );
+
+    set16_fx( channel_active, 0, MAX_CICP_CHANNELS );
+    nchan_transport = st_ivas->nchan_transport;
+    move16();
+    nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+    output_Fs = st_ivas->hDecoderConfig->output_Fs;
+    move32();
+
+    test();
+    test();
+    IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+    {
+        nchan_out_cldfb = BINAURAL_CHANNELS;
+        set16_fx( channel_active, 1, nchan_out_cldfb );
+        nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
+    }
+    ELSE IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
+    {
+        nchan_out_cov = nchan_out_transport;
+        move16();
+        nchan_out_cldfb = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+    }
+    ELSE IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
+    {
+        nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
+        nchan_out_cldfb = nchan_out_cov;
+        move16();
+        set16_fx( channel_active, 1, nchan_out_cov );
+    }
+    ELSE
+    {
+        nchan_out_cov = nchan_out_transport;
+        move16();
+        nchan_out_cldfb = nchan_out_transport;
+        move16();
+        set16_fx( channel_active, 1, nchan_out_cov );
+    }
+
+    /* set everything to zero that will not be decoded */
+    nband_synth = hParamMC->band_grouping[hParamMC->num_param_bands_synth];
+    move16();
+    FOR( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )
+    {
+        FOR( slot_idx = 0; slot_idx < JBM_CLDFB_SLOTS_IN_SUBFRAME; slot_idx++ )
+        {
+            set32_fx( &( Cldfb_RealBuffer_fx[ch][slot_idx][0] ), 0, CLDFB_NO_CHANNELS_MAX );
+            set32_fx( &( Cldfb_ImagBuffer_fx[ch][slot_idx][0] ), 0, CLDFB_NO_CHANNELS_MAX );
+        }
+    }
+
+    /* loop FOR synthesis, assume we always have to render in multiples of 5ms subframes with spills */
+    /*slots_to_render = min(sub(hParamMC->num_slots, hParamMC->slots_rendered), nSamplesAsked / NS2SA(output_Fs, CLDFB_SLOT_NS));
+     *nSamplesRendered = slots_to_render * NS2SA(output_Fs, CLDFB_SLOT_NS);*/
+    Word16 temp_e;
+    Word16 temp = BASOP_Util_Divide1616_Scale( nSamplesAsked, NS2SA_FX2( output_Fs, CLDFB_SLOT_NS ), &temp_e );
+    temp = shr( temp, sub( 15, temp_e ) );
+    slots_to_render = s_min( sub( hParamMC->num_slots, hParamMC->slots_rendered ), temp );
+    *nSamplesRendered = imult1616( slots_to_render, NS2SA_FX2( output_Fs, CLDFB_SLOT_NS ) );
+    move16();
+    Word16 j, k;
+    first_sf = hParamMC->subframes_rendered;
+    move16();
+    last_sf = first_sf;
+    move16();
+    WHILE( slots_to_render > 0 )
+    {
+        slots_to_render = sub( slots_to_render, hParamMC->subframe_nbslots[last_sf] );
+        last_sf = add( last_sf, 1 );
+    }
+    IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+    {
+        FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
+        {
+            slots_to_render = add( slots_to_render, hParamMC->subframe_nbslots[subframe_idx] );
+        }
+    }
+    slot_idx_start = hParamMC->slots_rendered;
+    move16();
+    slot_idx_start_cldfb_synth = 0;
+    move16();
+
+    FOR( j = 0; j < st_ivas->hParamMC->hMetadataPMC->nbands_coded; j++ )
+    {
+        Flag is_zero = is_zero_arr( hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx[j], hParamMC->h_output_synthesis_cov_state.mixing_matrix_len );
+        {
+            if ( is_zero != 0 )
+            {
+                hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp[j] = 0;
+                move16();
+            }
+        }
+        IF( LT_16( st_ivas->hParamMC->band_grouping[j], st_ivas->hParamMC->h_output_synthesis_params.max_band_decorr ) )
+        {
+            is_zero = is_zero_arr( hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx[j], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_len );
+            if ( is_zero != 0 )
+            {
+                hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp[j] = 0;
+                move16();
+            }
+        }
+    }
+    FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
+    {
+        FOR( slot_idx = 0; slot_idx < hParamMC->subframe_nbslots[subframe_idx]; ( slot_idx++, hParamMC->slots_rendered++ ) )
+        {
+            IF( hParamMC->max_band_decorr > 0 )
+            {
+                /*-----------------------------------------------------------------*
+                 * protoype signal computation
+                 *-----------------------------------------------------------------*/
+                param_mc_protoSignalComputation_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
+                                                    &hParamMC->Cldfb_ImagBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
+                                                    hParamMC->proto_frame_f_fx, hParamMC->diff_proto_info,
+                                                    hParamMC->num_freq_bands );
+                /*-----------------------------------------------------------------*
+                 * frequency domain decorrelation
+                 *-----------------------------------------------------------------*/
+                /* decorrelate prototype frame */
+
+                ivas_dirac_dec_decorr_process_fx( hParamMC->num_freq_bands,
+                                                  hParamMC->num_outputs_diff,
+                                                  hParamMC->diff_proto_info->num_protos_diff,
+                                                  DIRAC_SYNTHESIS_COV_MC_LS,
+                                                  nchan_transport,
+                                                  hParamMC->proto_frame_f_fx,
+                                                  Q5,
+                                                  hParamMC->diff_proto_info->num_protos_diff,
+                                                  hParamMC->diff_proto_info->proto_index_diff,
+                                                  hParamMC->proto_frame_dec_f_fx, // output
+                                                  &tmp_q,
+                                                  onset_filter_fx,
+                                                  hParamMC->h_freq_domain_decorr_ap_params,
+                                                  hParamMC->h_freq_domain_decorr_ap_state );
+
+                /* copy decorrelated frame directly to output CLDFB buffer, acts also as intermediate */
+                /* memory FOR the decorrelated signal                                                 */
+                ivas_param_mc_dec_copy_diffuse_proto( hParamMC, Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, nchan_out_cov, slot_idx ); // Returns Cldfb buffers in Q11(tmp_q)
+
+                FOR( k = 0; k < nchan_out_cov; k++ )
+                {
+                    FOR( Word16 l = 0; l < hParamMC->h_output_synthesis_params.max_band_decorr; l++ )
+                    {
+                        Cldfb_RealBuffer_fx[k][slot_idx][l] = L_shl( Cldfb_RealBuffer_fx[k][slot_idx][l], sub( 6, tmp_q ) ); // Q11(tmp_q) -> Q6
+                        move32();
+                        Cldfb_ImagBuffer_fx[k][slot_idx][l] = L_shl( Cldfb_ImagBuffer_fx[k][slot_idx][l], sub( 6, tmp_q ) ); // Q11(tmp_q) -> Q6
+                        move32();
+                    }
+                }
+            }
+
+            /*-----------------------------------------------------------------*
+             * output synthesis
+             *-----------------------------------------------------------------*/
+            ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
+                &hParamMC->Cldfb_RealBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
+                &hParamMC->Cldfb_ImagBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, slot_idx, add( slot_idx, slot_idx_start ),
+                nchan_transport, nchan_out_cov, hParamMC );
+
+            test();
+            IF( ( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) )
+            {
+                test();
+                IF( st_ivas->hCombinedOrientationData && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
+                {
+                    Word16 Q_Cldfb_ImagBuffer, Q_Cldfb_RealBuffer;
+                    Q_Cldfb_ImagBuffer = Q6 - 5; /*max value =MAX_INTERN_CHANNELS(=16)*Cldfb_ImagBuffer_fx*/
+                    move16();
+                    Q_Cldfb_RealBuffer = Q6 - 5;
+                    move16();
+                    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+                    {
+                        FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+                        {
+                            Scale_sig32( Cldfb_RealBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q_Cldfb_ImagBuffer, Q6 ) ); // Q1
+                            Scale_sig32( Cldfb_ImagBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q_Cldfb_RealBuffer, Q6 ) ); // Q1
+                        }
+                    }
+                    ivas_param_mc_mc2sba_cldfb_fx( st_ivas->hTransSetup, hParamMC->hoa_encoder_fx, slot_idx, Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, nband_synth, GAIN_LFE_FX );
+                    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+                    {
+                        FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+                        {
+                            Scale_sig32( Cldfb_RealBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q6, Q_Cldfb_ImagBuffer ) ); // Q6
+                            Scale_sig32( Cldfb_ImagBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q6, Q_Cldfb_RealBuffer ) ); // Q6
+                        }
+                    }
+                }
+                ELSE
+                {
+                    /* remove LFE */
+                    UWord16 idx_out;
+                    UWord16 idx_lfe;
+                    IVAS_OUTPUT_SETUP hLsSetup;
+
+                    hLsSetup = st_ivas->hTransSetup;
+                    /* If LFE should be rendered, add it to other channels before removing */
+                    IF( st_ivas->hBinRenderer->render_lfe )
+                    {
+                        Word16 tmp_exp = 0;
+                        move16();
+                        Word16 tmp = BASOP_Util_Divide1616_Scale( GAIN_LFE_FX, hLsSetup.nchan_out_woLFE, &tmp_exp );
+                        tmp_exp = add( tmp_exp, ( 1 - 15 ) );
+                        FOR( idx_lfe = 0; idx_lfe < hLsSetup.num_lfe; idx_lfe++ )
+                        {
+                            /* Copy just the first band of LFE*/
+                            v_multc_fixed_16( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
+                            v_multc_fixed_16( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
+
+                            Scale_sig32( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1, tmp_exp );
+                            Scale_sig32( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1, tmp_exp );
+                            FOR( ch = 0; ch < ( hLsSetup.nchan_out_woLFE + hLsSetup.num_lfe ); ch++ )
+                            {
+                                IF( hLsSetup.index_lfe[idx_lfe] != ch )
+                                {
+#ifdef VEC_ARITH_OPT_v1
+                                    v_add_fixed_no_hdrm( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_RealBuffer_fx[ch][slot_idx], 1 );
+                                    v_add_fixed_no_hdrm( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_ImagBuffer_fx[ch][slot_idx], 1 );
+#else  /* VEC_ARITH_OPT_v1 */
+                                    v_add_fixed( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_RealBuffer_fx[ch][slot_idx], 1, 0 );
+                                    v_add_fixed( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_ImagBuffer_fx[ch][slot_idx], 1, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
+                                }
+                            }
+                        }
+                    }
+
+                    idx_out = 0;
+                    move16();
+                    idx_lfe = 0;
+                    move16();
+
+                    FOR( ch = 0; ch < ( hLsSetup.nchan_out_woLFE + hLsSetup.num_lfe ); ch++ )
+                    {
+                        test();
+                        IF( ( hLsSetup.num_lfe > 0 ) && EQ_16( hLsSetup.index_lfe[idx_lfe], ch ) )
+                        {
+                            IF( LT_16( idx_lfe, ( sub( hLsSetup.num_lfe, 1 ) ) ) )
+                            {
+                                idx_lfe = add( idx_lfe, 1 );
+                            }
+                        }
+                        ELSE IF( NE_16( ch, idx_out ) )
+                        {
+                            Copy32( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[idx_out][slot_idx], nband_synth );
+                            Copy32( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[idx_out][slot_idx], nband_synth );
+                            idx_out = add( idx_out, 1 );
+                        }
+                        ELSE
+                        {
+                            idx_out = add( idx_out, 1 );
+                        }
+                    }
+                }
+            }
+        }
+
+        test();
+        IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+        {
+            Word16 input_q = 6;
+            move16();
+            /* Implement binaural rendering */
+            ivas_binRenderer_fx( st_ivas->hBinRenderer,
+                                 st_ivas->hCombinedOrientationData,
+                                 hParamMC->subframe_nbslots[subframe_idx],
+                                 Cldfb_RealBuffer_Binaural_fx, Cldfb_ImagBuffer_Binaural_fx,
+                                 Cldfb_RealBuffer_fx,
+                                 Cldfb_ImagBuffer_fx, &input_q );
+
+            FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+            {
+                FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+                {
+                    FOR( k = 0; k < CLDFB_NO_CHANNELS_MAX; k++ )
+                    {
+                        Cldfb_RealBuffer_fx[i][j][k] = L_shl( Cldfb_RealBuffer_fx[i][j][k], sub( Q6, input_q ) ); // Q6
+                        Cldfb_ImagBuffer_fx[i][j][k] = L_shl( Cldfb_ImagBuffer_fx[i][j][k], sub( Q6, input_q ) ); // Q6
+                    }
+                }
+            }
+
+            FOR( Word16 idx1 = 0; idx1 < BINAURAL_CHANNELS; idx1++ )
+            {
+                FOR( Word16 idx2 = 0; idx2 < hParamMC->subframe_nbslots[subframe_idx]; idx2++ )
+                {
+                    Scale_sig32( Cldfb_RealBuffer_Binaural_fx[idx1][idx2], CLDFB_NO_CHANNELS_MAX, sub( Q6, input_q ) ); // Q6
+                    Scale_sig32( Cldfb_ImagBuffer_Binaural_fx[idx1][idx2], CLDFB_NO_CHANNELS_MAX, sub( Q6, input_q ) ); // Q6
+                }
+            }
+            /* update combined orientation access index */
+            ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, hParamMC->num_freq_bands * hParamMC->subframe_nbslots[subframe_idx] );
+        }
+        ELSE IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
+        {
+            /* format conversion*/
+            ivas_lssetupconversion_process_param_mc_fx( st_ivas, hParamMC->subframe_nbslots[subframe_idx], Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, channel_active );
+        }
+
+
+        /* CLDFB synthesis */
+        FOR( ch = 0; ch < nchan_out_cldfb; ch++ )
+        {
+            Word32 *RealBuffer_fx[16];
+            Word32 *ImagBuffer_fx[16];
+
+            IF( channel_active[ch] )
+            {
+                /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands FOR 48kHz */
+                FOR( i = 0; i < hParamMC->subframe_nbslots[subframe_idx]; i++ )
+                {
+                    IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+                    {
+                        RealBuffer_fx[i] = Cldfb_RealBuffer_Binaural_fx[ch][i]; // Q6
+                        ImagBuffer_fx[i] = Cldfb_ImagBuffer_Binaural_fx[ch][i]; // Q6
+                    }
+                    ELSE
+                    {
+                        RealBuffer_fx[i] = Cldfb_RealBuffer_fx[ch][i]; // Q6
+                        ImagBuffer_fx[i] = Cldfb_ImagBuffer_fx[ch][i]; // Q6
+                    }
+                }
+
+                Word16 len = add( imult1616( slot_idx_start_cldfb_synth, hParamMC->num_freq_bands ), imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
+                scale_sig32( output_f_fx[ch], len, 5 - 11 );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ),
+                                        imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ), 0, 0, st_ivas->cldfbSynDec[ch] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ),
+                                        imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ), 0, st_ivas->cldfbSynDec[ch] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+
+                scale_sig32( output_f_fx[ch], len, 11 - 5 ); // Q11
+            }
+            ELSE
+            {
+                set32_fx( &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ), 0, imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
+            }
+        }
+        slot_idx_start = add( slot_idx_start, hParamMC->subframe_nbslots[subframe_idx] );
+        slot_idx_start_cldfb_synth = add( slot_idx_start_cldfb_synth, hParamMC->subframe_nbslots[subframe_idx] );
+    }
+    IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+    {
+        ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_f_fx, p_output_f_fx, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0 );
+    }
+
+    /* update */
+
+    IF( EQ_16( hParamMC->slots_rendered, hParamMC->num_slots ) )
+    {
+        hParamMC->hMetadataPMC->last_coded_bwidth = hParamMC->hMetadataPMC->coded_bwidth;
+        move16();
+        param_mc_update_mixing_matrices_fx( hParamMC, hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_transport, nchan_out_cov );
+    }
+
+
+    hParamMC->subframes_rendered = last_sf;
+    move16();
+    *nSamplesAvailableNext = imult1616( sub( hParamMC->num_slots, hParamMC->slots_rendered ), NS2SA_FX2( output_Fs, CLDFB_SLOT_NS ) );
+    move16();
+
+    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+    {
+        channel_active_fx[i] = channel_active[i];
+        move16();
+    }
+    pop_wmops();
+
+    return;
+}
+
+/*-------------------------------------------------------------------------
+ * param_mc_dec_init()
+ *
+ * Parametric MC decoding initialization
+ *------------------------------------------------------------------------*/
+
+static void ivas_param_mc_dec_init_fx(
+    PARAM_MC_DEC_HANDLE hParamMC, /* i/o: decoder DirAC handle                 */
+    const Word16 nchan_transport, /* i  : number of input (transport) channels */
+    const Word16 nchan_cov )      /* i  : number of cov synthesis channels     */
+{
+    Word16 k;
+    UWord16 max_param_band_residual;
+    Word16 len;
+
+    /*-----------------------------------------------------------------*
+     * init sub-modules
+     *-----------------------------------------------------------------*/
+
+    /* decorrelation */
+    IF( hParamMC->max_band_decorr > 0 )
+    {
+        len = imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->h_freq_domain_decorr_ap_params->h_onset_detection_power_params.max_band_decorr );
+
+        /* init onsetDetectionPower */
+        set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx, len );
+        set_zero_fx( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx, len );
+        hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.q_onset_detector = Q31;
+        move16();
+    }
+
+    max_param_band_residual = 0;
+    move16();
+
+    /* output synthesis */
+    FOR( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- )
+    {
+        IF( LE_16( hParamMC->band_grouping[k], hParamMC->max_band_decorr ) )
+        {
+            max_param_band_residual = k;
+            move16();
+            BREAK;
+        }
+    }
+
+    ivas_dirac_dec_output_synthesis_cov_init_fx( &( hParamMC->h_output_synthesis_cov_state ), nchan_transport, nchan_cov, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual );
+
+    /*-----------------------------------------------------------------*
+     * init proto frames
+     *-----------------------------------------------------------------*/
+
+    IF( hParamMC->max_band_decorr > 0 )
+    {
+        set_zero_fx( hParamMC->proto_frame_f_fx, shl( imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->num_freq_bands ), 1 ) );
+        set32_fx( hParamMC->proto_frame_dec_f_fx, 0, shl( imult1616( nchan_cov, hParamMC->num_freq_bands ), 1 ) );
+    }
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Local functions
+ *-------------------------------------------------------------------------*/
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_compute_diffuse_proto()
+ *
+ * Compute prototypes for decorrelation
+ *------------------------------------------------------------------------*/
+
+static void param_mc_protoSignalComputation_fx(
+    Word32 *RealBuffer_fx,                           /* i  : CLDFB samples of the transport channels (real part)      */
+    Word32 *ImagBuffer_fx,                           /* i  : CLDFB samples of the transport channels (imaginary part) */
+    Word32 *proto_frame_f_fx,                        /* o  : interleaved complex prototype CLDFB samples              */
+    const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, /* i  : prototype generation information                         */
+    const Word16 num_freq_bands                      /* i  : number of frequency bands for the prototypes             */
+)
+{
+    Word16 band;
+    Word16 proto_ch_idx, source_ch_cnt;
+
+    Word32 *p_proto_frame_fx;
+    Word32 *p_real_buffer_fx; // Q12
+    Word32 *p_imag_buffer_fx; // Q12
+
+    set32_fx( proto_frame_f_fx, 0, shl( imult1616( num_freq_bands, diff_proto_info->num_protos_diff ), 1 ) );
+
+
+    FOR( proto_ch_idx = 0; proto_ch_idx < diff_proto_info->num_protos_diff; proto_ch_idx++ )
+    {
+        Word16 num_source_ch = diff_proto_info->num_source_chan_diff[proto_ch_idx];
+        move16();
+
+        FOR( source_ch_cnt = 0; source_ch_cnt < num_source_ch; source_ch_cnt++ )
+        {
+
+            Word32 fac_fx = diff_proto_info->proto_fac_fx[proto_ch_idx][source_ch_cnt];
+            move32();
+
+            Word16 source_ch_idx = diff_proto_info->source_chan_idx[proto_ch_idx][source_ch_cnt];
+            move16();
+
+            p_proto_frame_fx = &proto_frame_f_fx[shl( imult1616( proto_ch_idx, num_freq_bands ), 1 )];
+            p_real_buffer_fx = &RealBuffer_fx[imult1616( source_ch_idx, num_freq_bands )];
+            p_imag_buffer_fx = &ImagBuffer_fx[imult1616( source_ch_idx, num_freq_bands )];
+
+            FOR( band = 0; band < num_freq_bands; band++ )
+            {
+
+                Word32 tmp_x = Mpy_32_32( fac_fx, ( *( p_real_buffer_fx++ ) ) ); // Q(30 + 6 - 31)  :: Q5
+
+                *( p_proto_frame_fx ) = L_add( *( p_proto_frame_fx ), tmp_x );
+                move32();
+                p_proto_frame_fx++;
+
+                tmp_x = Mpy_32_32( fac_fx, ( *( p_imag_buffer_fx++ ) ) ); // Q(30 + 6 - 31)  :: Q5
+
+                *( p_proto_frame_fx ) = L_add( *( p_proto_frame_fx ), tmp_x );
+                move32();
+                p_proto_frame_fx++;
+            }
+        }
+    }
+
+    return;
+}
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dec_compute_diffuse_proto()
+ *
+ * Transfer decorrelated signals back from the decorrelator buffer to
+ * the buffers used in the final synthesis
+ *------------------------------------------------------------------------*/
+
+static void ivas_param_mc_dec_copy_diffuse_proto(
+    PARAM_MC_DEC_HANDLE hParamMC,                                                                           /* i  : Parametric MC handle                                      */
+    Word32 Cldfb_buffer_real_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o  : CLDFB buffer used in the final synthesis (real part)      */
+    Word32 Cldfb_buffer_imag_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o  : CLDFB buffer used in the final synthesis (imaginary part) */
+    const Word16 nY,                                                                                        /* i  : number of decorrelated channels                           */
+    const Word16 slot_idx                                                                                   /* i  : current time slot index                                   */
+)
+{
+    Word16 k, l;
+    Word16 num_freq_bands, num_freq_bands_diff;
+    Word32 *p_proto_diff_fx;
+    num_freq_bands = hParamMC->num_freq_bands;
+    move16();
+    num_freq_bands_diff = hParamMC->h_output_synthesis_params.max_band_decorr;
+    move16();
+
+    FOR( k = 0; k < nY; k++ )
+    {
+        p_proto_diff_fx = hParamMC->proto_frame_dec_f_fx + imult1616( shl( k, 1 ), num_freq_bands ); // Q11
+
+        FOR( l = 0; l < num_freq_bands_diff; l++ )
+        {
+            Cldfb_buffer_real_fx[k][slot_idx][l] = *( p_proto_diff_fx++ ); // Q11
+            move32();
+            Cldfb_buffer_imag_fx[k][slot_idx][l] = *( p_proto_diff_fx++ ); // Q11
+            move32();
+        }
+    }
+
+    return;
+}
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_bin2dec()
+ *
+ * decode a number of bits to an integer
+ *------------------------------------------------------------------------*/
+/* r : decoded integer */
+static Word16 ivas_param_mc_bin2dec_fx(
+    UWord16 bits[PARAM_MC_MAX_BITS], /* i  : bit buffer               */
+    const Word16 N                   /* i  : number of bits to decode */
+)
+{
+    Word16 i;
+    Word16 out;
+
+    assert( N <= 16 );
+    out = 0;
+    move16();
+    FOR( i = 0; i < N; i++ )
+    {
+        out = add( out, shl( bits[i], sub( sub( N, 1 ), i ) ) );
+    }
+
+    return out;
+}
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_uniform_decoder()
+ *
+ * decode a uniformily coded sequence of float values
+ *------------------------------------------------------------------------*/
+static Word16 ivas_param_mc_uniform_decoder_fx(
+    Word16 *seq,                          /* o  : decoded sequence of float values hParamCodingInfo -> Q-quant*/
+    const Word16 sz_seq,                  /* i  : number of values to decode       */
+    const Word16 *alphabet,               /* i  : codebook                         hParamCodingInfo -> Q-quant*/
+    const Word16 N,                       /* i  : number of bits per coded index   */
+    UWord16 bit_buffer[PARAM_MC_MAX_BITS] /* i  : bit buffer to decode             */
+)
+{
+    Word16 i;
+    Word16 idx;
+    Word16 n_bits;
+
+    n_bits = 0;
+    move16();
+    assert( N * sz_seq < PARAM_MC_MAX_BITS );
+
+    FOR( i = 0; i < sz_seq; ++i )
+    {
+        idx = ivas_param_mc_bin2dec_fx( &bit_buffer[i * N], N );
+        seq[i] = alphabet[idx];
+        move16();
+    }
+
+    n_bits = imult1616( N, sz_seq );
+
+    return n_bits;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_range_decoder_LC()
+ *
+ * decode a sequency of inidices coded with a range coder
+ *------------------------------------------------------------------------*/
+static Word16 ivas_param_mc_range_decoder_LC_fx(
+    UWord16 *bit_buffer,      /* i  : bit buffer to read from                   */
+    Word16 *x,                /* o  : decoded indices                           */
+    Word16 *BER_detect,       /* o  : flag for indicating a bit error           */
+    const Word16 sz_seq,      /* i  : size of the sequence to be decoded        */
+    const Word16 sz_alphabet, /* i  : size of the alphabet                      */
+    const UWord16 *cft,       /* i  : cumulative frequency table                */
+    const UWord16 *sft,       /* i  : symbol frequency table                    */
+    const Word16 tot_shift,   /* i  : total frequency as a power of 2           */
+    const Word16 nbbits       /* i  : maximum bit budget                        */
+)
+{
+    RangeUniDecState rc_st_dec; /* State of the range decoder */
+    Word16 cur_bit_pos;
+    Word16 k;
+    Word16 r;
+
+    /* Start Decoding */
+    /* Initialize range decoder */
+    cur_bit_pos = 0;
+    move16();
+    rc_uni_dec_init_fx( &rc_st_dec, bit_buffer, sub( nbbits, 32 ) ); /* (nbbits + 30) entries are read by the decoder */
+
+    /* Main Loop through the indices */
+    FOR( k = 0; k < sz_seq; k++ )
+    {
+        r = rc_uni_dec_read_symbol_fastS_fx( &rc_st_dec, cft, sft, sz_alphabet, tot_shift ); /*Alphabet size = 17 (2^4 = 16 MSB symbols + 1 ESC symbol) */
+                                                                                             /* r is the symbol read, the possible values are {0,1,....alphabet_size - 1}  */
+
+        /* Update bitstream pointer */
+        cur_bit_pos = rc_uni_dec_virtual_finish_fx( &rc_st_dec );
+
+        /* Confirm that there is no overflow */
+        IF( GT_16( cur_bit_pos, nbbits ) )
+        {
+            *BER_detect = s_or( *BER_detect, 1 );
+            move16();
+        }
+
+        x[k] = r;
+        move16();
+    }
+
+    /* We don't need to finish because virtual_finish() already does the same */
+    /*st->next_bit_pos = rc_uni_dec_finish(&rc_st_dec);*/
+
+    /* Check for bitstream errors */
+    IF( rc_st_dec.bit_error_detected != 0 )
+    {
+        *BER_detect = s_or( *BER_detect, 1 );
+        move16();
+    }
+
+    return cur_bit_pos;
+}
+
+/*-------------------------------------------------------------------------
+ * param_mc_compute_interpolator()
+ *
+ * compute the interpolator used in the final synthesis
+ *------------------------------------------------------------------------*/
+
+static void ivas_param_mc_dec_compute_interpolator_fx(
+    const UWord16 bAttackPresent, /* i  : flag indicating if we have a transient in the current frame */
+    const UWord16 attackPos,      /* i  : position of the transient                                   */
+    const UWord16 interp_length,  /* i  : number of interpolation values to be calculated             */
+    Word16 *interpolator          /* o  : interpolator                                                */
+)
+{
+    Word16 idx;
+
+    IF( bAttackPresent )
+    {
+        FOR( idx = 0; idx < attackPos * 2; idx++ )
+        {
+            interpolator[idx] = 0;
+            move16();
+        }
+        FOR( ; idx < interp_length; idx++ )
+        {
+            interpolator[idx] = 32767; /* 1.0f Q15 */
+            move16();
+        }
+    }
+    ELSE
+    {
+        ivas_jbm_dec_get_adapted_linear_interpolator_fx( DEFAULT_JBM_CLDFB_TIMESLOTS, interp_length, interpolator );
+    }
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * remove_lfe_from_cy()
+ *
+ * remove all LFE related values from a covariance matrix
+ *------------------------------------------------------------------------*/
+
+static void remove_lfe_from_cy_fx(
+    const Word16 nY,                               /* i  : dimension of the covariance matrix */
+    Word16 lfe_indices[PARAM_MC_LOCAL_SZ_LFE_MAP], /* i  : LFE index                          */
+    Word16 num_lfe,                                /* i  : number of LFEs                     */
+    Word32 *cy,                                    /* i  : covariance matrix                  */
+    Word32 *cy_woLFE                               /* o  : covariance matrix with LFE removed */
+)
+{
+    Word16 ch_idx1, ch_idx2;
+    Word16 lfe_idx1, lfe_idx2;
+    Word32 *ptrCy;
+    Word32 *ptrCy_out;
+
+    ptrCy = cy;
+    ptrCy_out = cy_woLFE;
+
+    FOR( lfe_idx1 = 0; lfe_idx1 < num_lfe + 1; lfe_idx1++ )
+    {
+        FOR( ch_idx1 = lfe_indices[lfe_idx1] + 1; ch_idx1 < lfe_indices[lfe_idx1 + 1]; ch_idx1++ )
+        {
+            FOR( lfe_idx2 = 0; lfe_idx2 < num_lfe + 1; lfe_idx2++ )
+            {
+                FOR( ch_idx2 = lfe_indices[lfe_idx2] + 1; ch_idx2 < lfe_indices[lfe_idx2 + 1]; ch_idx2++ )
+                {
+                    *( ptrCy_out++ ) = *( ptrCy++ );
+                    move32();
+                }
+                ptrCy++;
+            }
+            ptrCy--;
+        }
+        ptrCy += nY;
+    }
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_get_mixing_matrices()
+ *
+ * calculate the direct and residual mixing matrices
+ * using the covariance method
+ *------------------------------------------------------------------------*/
+
+static void ivas_param_mc_get_mixing_matrices_fx(
+    PARAM_MC_DEC_HANDLE hParamMC, /* i  : Parametric MC handle */
+    IVAS_OUTPUT_SETUP *hSynthesisOutputSetup,
+    Word32 Cx_in_fixed[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i  : input covariance for all parameter bands         Q(31 - Cx_in_e)*/
+    Word16 Cx_in_e,
+    const Word16 param_band_idx, /* i  : parameter band index                             */
+    Word32 *mixing_matrix_fx[],  // Q(31 - mixing_matrix_e)
+    Word16 *mixing_matrix_e,
+    Word32 *mixing_matrix_res_fx[], // Q(31 - mixing_matrix_res_e)
+    Word16 *mixing_matrix_res_e,
+    const Word16 nY_intern,                     /* i  : number of channels in the transported format     */
+    const PARAM_MC_SYNTHESIS_CONF synth_config, /* i  : Parametric MC synthesis config                   */
+    const Word16 nX,                            /* i  : number of transport channels                     */
+    const Word16 nY_cov                         /* i  : number of covariance synthesis output channels   */
+)
+{
+    Word16 matSize = MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS;
+    Word16 nY_band;
+    Word16 num_lfe_bands;
+    Word16 brange[2];
+    UWord16 i;
+    Word16 ch_idx1, ch_idx2, lfe_idx1, lfe_idx2;
+    Word16 remove_lfe;
+    Word16 lfe_indices[PARAM_MC_LOCAL_SZ_LFE_MAP];
+
+    Word32 Cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
+    Word32 Cy_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
+
+    Word32 Cy_full_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
+
+    Word32 Cr_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cr_e)
+    Word16 Cr_e;
+    Word32 Cy_diag_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - Cy_diag_buff_e)
+    Word16 Cy_diag_buff_e[MAX_OUTPUT_CHANNELS];
+    Word32 mixing_matrix_local_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - mixing_matrix_local_e)
+    Word16 Cy_diag_e = 0, mixing_matrix_local_e = 0;
+    Word32 Cproto_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cproto_e)
+    Word16 Cproto_e;
+    Word32 *proto_matrix_ptr_fx; // Q(31 - proto_matrix_ptr_e)
+    Word32 *Cx_state_fx;         // Q(31 - Cx_state_e)
+    Word32 *Cx_old_state_fx;
+    Word32 Cy_state_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cy_state_e)
+    Word32 *Cy_old_state_fx;
+    Word16 Cx_state_e;
+    Word16 Cy_state_e;
+    Word32 mixing_matrix_res_local_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mixing_matrix_res_local_e)
+    Word16 mixing_matrix_res_local_e;
+    Word32 L_tmp;
+    Word16 tmp_e, tmp;
+
+    Word16 proto_matrix_e = hParamMC->h_output_synthesis_params.proto_matrix_e;
+    move16();
+    Word32 proto_matrix_noLFE_fx[PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS]; // Q(31 - proto_matrix_noLFE_e)
+
+    Word32 mat_mult_buffer1_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mat_mult_buffer1_e)
+
+    Word32 Cproto_diag_fx[MAX_CICP_CHANNELS]; // Q(31 - Cproto_diag_e)
+    Word16 mat_mult_buffer1_e, proto_matrix_ptr_e, Cproto_diag_e;
+
+    Word32 *ptrMM_fx;
+    Word32 *ptrMM_out_fx;
+
+    Word16 Cy_e, Cx_e;
+    Word16 Cy_full_e;
+    Word16 new_e = 0;
+    move16();
+
+    set_zero_fx( Cproto_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
+    set_zero_fx( mat_mult_buffer1_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
+    set_zero_fx( proto_matrix_noLFE_fx, PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS );
+    set_zero_fx( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
+    set_zero_fx( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
+    Word16 proto_matrix_noLFE_e = 0;
+    move16();
+
+    Word32 Cx_in_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
+
+    Copy32( Cx_in_fixed, Cx_in_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
+
+    nY_band = nY_cov;
+    move16();
+    num_lfe_bands = 0;
+    move16();
+    remove_lfe = 0;
+    move16();
+
+    set16_fx( lfe_indices, -1, PARAM_MC_LOCAL_SZ_LFE_MAP );
+    IF( hSynthesisOutputSetup->num_lfe )
+    {
+        Word32 *proto_matrix_ptr_in_fx;
+        FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe; lfe_idx1++ )
+        {
+            lfe_indices[lfe_idx1 + 1] = hSynthesisOutputSetup->index_lfe[lfe_idx1];
+            move16();
+        }
+        lfe_indices[hSynthesisOutputSetup->num_lfe + 1] = nY_cov;
+        move16();
+        proto_matrix_ptr_fx = &proto_matrix_noLFE_fx[0];
+        proto_matrix_ptr_in_fx = &hParamMC->h_output_synthesis_params.proto_matrix_fx[0];
+        proto_matrix_noLFE_e = proto_matrix_e;
+        move16();
+
+        set_zero_fx( proto_matrix_noLFE_fx, PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS );
+
+        FOR( ch_idx1 = 0; ch_idx1 < nX; ch_idx1++ )
+        {
+            FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx1++ )
+            {
+                FOR( ch_idx2 = lfe_indices[lfe_idx1] + 1; ch_idx2 < lfe_indices[lfe_idx1 + 1]; ch_idx2++ )
+                {
+                    *( proto_matrix_ptr_fx++ ) = *( proto_matrix_ptr_in_fx++ );
+                    move32();
+                }
+                proto_matrix_ptr_in_fx++;
+            }
+            proto_matrix_ptr_in_fx--;
+        }
+
+        proto_matrix_ptr_e = proto_matrix_e;
+        move16();
+    }
+
+    if ( hParamMC->hMetadataPMC->lfe_on )
+    {
+        num_lfe_bands = PARAM_MC_MAX_BAND_LFE;
+        move16();
+    }
+    IF( hSynthesisOutputSetup->num_lfe > 0 && param_band_idx >= num_lfe_bands )
+    {
+        remove_lfe = 1;
+        move16();
+        nY_band = sub( nY_cov, hSynthesisOutputSetup->num_lfe );
+        proto_matrix_ptr_fx = proto_matrix_noLFE_fx;
+        proto_matrix_ptr_e = proto_matrix_noLFE_e;
+        move16();
+    }
+    ELSE
+    {
+        proto_matrix_ptr_fx = hParamMC->h_output_synthesis_params.proto_matrix_fx;
+        proto_matrix_ptr_e = hParamMC->h_output_synthesis_params.proto_matrix_e;
+        move16();
+    }
+
+    brange[0] = hParamMC->band_grouping[param_band_idx];
+    move16();
+    brange[1] = hParamMC->band_grouping[param_band_idx + 1];
+    move16();
+
+    Cx_state_fx = Cx_in_fx;
+    Cx_old_state_fx = hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx];
+    Cy_old_state_fx = hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx];
+
+
+    /*  Getting mixing mtx */
+    /* estimate target cov from input cov and proto_matrix */
+
+    Cx_state_e = Cx_in_e;
+    move16();
+    matrix_product_fx( hParamMC->proto_matrix_int_fx, nY_intern, nX, 0, Cx_state_fx, nX, nX, 0, mat_mult_buffer1_fx );
+    mat_mult_buffer1_e = add( hParamMC->proto_matrix_int_e, Cx_in_e );
+
+    matrix_product_fx( mat_mult_buffer1_fx, nY_intern, nX, 0, hParamMC->proto_matrix_int_fx, nY_intern, nX, 1, Cproto_fx );
+    Cproto_e = add( mat_mult_buffer1_e, hParamMC->proto_matrix_int_e );
+
+    FOR( ch_idx1 = 0; ch_idx1 < nY_intern; ch_idx1++ )
+    {
+        IF( BASOP_Util_Cmp_Mant32Exp( Cproto_fx[ch_idx1 + ( ch_idx1 * nY_intern )], Cproto_e, 0, 0 ) < 0 )
+        {
+            Cproto_fx[ch_idx1 + ( ch_idx1 * nY_intern )] = 0;
+            move32();
+        }
+    }
+
+    set_zero_fx( Cy_state_fx, matSize );
+    Cy_state_e = 0;
+    move16();
+
+    ivas_param_mc_dequantize_cov_fx( hParamMC,
+                                     hParamMC->icld_q_fx + L_mult0( param_band_idx, hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ),
+                                     hParamMC->icc_q_fx + L_mult0( param_band_idx, hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe ),
+                                     param_band_idx, nY_cov,
+                                     synth_config,
+                                     nY_intern,
+                                     nX, Cx_state_fx, Cx_state_e, Cproto_fx, Cproto_e, Cy_state_fx, &Cy_state_e );
+
+    // dbgwrite2_txt(Cy_state_fx,nY_intern*nY_intern,"../cy_state_fx.txt");
+
+    /* Smoothing: Sum over two buffers */
+    IF( hParamMC->hMetadataPMC->bAttackPresent )
+    {
+        /* no smoothing on attacks */
+        Copy32( Cx_state_fx, Cx_fx, imult1616( nX, nX ) );
+        Copy32( Cy_state_fx, Cy_full_fx, imult1616( nY_cov, nY_cov ) );
+        Cy_full_e = Cy_state_e;
+        move16();
+        Cx_e = Cx_state_e;
+        move16();
+    }
+    ELSE
+    {
+        /* smoothing gains are now identical to one, simply add up */
+        // v_add( Cy_state, Cy_old_state, Cy_full, nY_cov * nY_cov );
+
+        v_add_fixed_me( Cx_state_fx, Cx_state_e, Cx_old_state_fx, hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx], Cx_fx, &Cx_e, imult1616( nX, nX ), 1 );
+        v_add_fixed_me( Cy_state_fx, Cy_state_e, Cy_old_state_fx, hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx], Cy_full_fx, &Cy_full_e, imult1616( nY_cov, nY_cov ), 1 );
+    }
+
+    Copy32( Cx_state_fx, Cx_old_state_fx, imult1616( nX, nX ) );
+
+    Copy32( Cy_state_fx, Cy_old_state_fx, imult1616( nY_cov, nY_cov ) );
+
+    hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = Cx_state_e;
+    move16();
+    hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = Cy_state_e;
+    move16();
+
+    FOR( i = 0; i < nX * nX; i++ )
+    {
+        if ( Cx_old_state_fx[i] != 0 )
+        {
+            new_e = hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx];
+            move16();
+            BREAK;
+        }
+    }
+
+    hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = new_e;
+    move16();
+
+    new_e = 0;
+    move16();
+
+    FOR( i = 0; i < nY_cov * nY_cov; i++ )
+    {
+        if ( Cy_old_state_fx[i] != 0 )
+        {
+            new_e = hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx];
+            move16();
+            BREAK;
+        }
+    }
+
+    hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = new_e;
+    move16();
+
+    /* remove LFE IF necessary */
+    IF( remove_lfe )
+    {
+
+        Cy_e = Cy_full_e;
+        remove_lfe_from_cy_fx( nY_cov, lfe_indices, hSynthesisOutputSetup->num_lfe, Cy_full_fx, Cy_fx );
+    }
+    ELSE
+    {
+        Copy32( Cy_full_fx, Cy_fx, imult1616( nY_band, nY_band ) );
+        Cy_e = Cy_full_e;
+        move16();
+    }
+
+    matrix_product_fx( proto_matrix_ptr_fx, nY_band, nX, 0, Cx_fx, nX, nX, 0, mat_mult_buffer1_fx );
+    mat_mult_buffer1_e = add( proto_matrix_ptr_e, Cx_e );
+
+    matrix_product_diag_fx( mat_mult_buffer1_fx, mat_mult_buffer1_e, nY_band, nX, 0, proto_matrix_ptr_fx, proto_matrix_ptr_e, nY_band, nX, 1, Cproto_diag_fx, &Cproto_diag_e );
+
+    /* make sure we have no negative entries in Cproto_diag due to rounding errors */
+
+    FOR( ch_idx1 = 0; ch_idx1 < nY_band; ch_idx1++ )
+    {
+        if ( Cproto_diag_fx[ch_idx1] < 0 )
+        {
+            Cproto_diag_fx[ch_idx1] = 0;
+            move16();
+        }
+    }
+
+
+    /* Computing the mixing matrices */
+
+    /* bands with decorr */
+    IF( LT_16( brange[0], hParamMC->h_output_synthesis_params.max_band_decorr ) )
+    {
+        computeMixingMatrices_fx( nX, nY_band, Cx_fx, Cx_e, Cy_fx, Cy_e, proto_matrix_ptr_fx, proto_matrix_ptr_e, 0, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e, Cr_fx, &Cr_e );
+        /* Compute mixing matrix FOR residual */
+        computeMixingMatricesResidual_fx( nY_band, Cproto_diag_fx, Cproto_diag_e, Cr_fx, Cr_e, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_res_local_fx, &mixing_matrix_res_local_e );
+
+        IF( NE_16( mixing_matrix_res_local_e, mixing_matrix_local_e ) )
+        {
+            tmp = getScaleFactor32( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
+            scale_sig32( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS, tmp );
+            mixing_matrix_local_e = sub( mixing_matrix_local_e, tmp );
+
+            tmp = getScaleFactor32( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
+            scale_sig32( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS, tmp );
+            mixing_matrix_res_local_e = sub( mixing_matrix_res_local_e, tmp );
+
+            scale_sig32( mixing_matrix_local_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS, sub( mixing_matrix_local_e, s_max( mixing_matrix_local_e, mixing_matrix_res_local_e ) ) );
+            scale_sig32( mixing_matrix_res_local_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS, sub( mixing_matrix_res_local_e, s_max( mixing_matrix_local_e, mixing_matrix_res_local_e ) ) );
+
+            mixing_matrix_res_local_e = mixing_matrix_local_e = s_max( mixing_matrix_local_e, mixing_matrix_res_local_e );
+            move16();
+        }
+        IF( remove_lfe )
+        {
+            set_zero_fx( mixing_matrix_res_fx[param_band_idx], imult1616( nY_cov, nY_cov ) );
+
+            ptrMM_fx = mixing_matrix_res_local_fx;
+            ptrMM_out_fx = mixing_matrix_res_fx[param_band_idx];
+            FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx1++ )
+            {
+                FOR( ch_idx1 = lfe_indices[lfe_idx1] + 1; ch_idx1 < lfe_indices[lfe_idx1 + 1]; ch_idx1++ )
+                {
+                    FOR( lfe_idx2 = 0; lfe_idx2 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx2++ )
+                    {
+                        FOR( ch_idx2 = lfe_indices[lfe_idx2] + 1; ch_idx2 < lfe_indices[lfe_idx2 + 1]; ch_idx2++ )
+                        {
+                            *( ptrMM_out_fx++ ) = *( ptrMM_fx++ );
+                            move32();
+                        }
+                        ptrMM_out_fx++;
+                    }
+                    ptrMM_out_fx--;
+                }
+                ptrMM_out_fx += nY_cov;
+            }
+            mixing_matrix_res_e[param_band_idx] = mixing_matrix_res_local_e;
+            move16();
+        }
+        ELSE
+        {
+            Copy32( mixing_matrix_res_local_fx, mixing_matrix_res_fx[param_band_idx], imult1616( nY_cov, nY_cov ) );
+            mixing_matrix_res_e[param_band_idx] = mixing_matrix_res_local_e;
+            move16();
+        }
+    }
+    ELSE IF( brange[0] < hParamMC->max_band_energy_compensation )
+    {
+        /* Compute mixing matrices (energy compensation only) */
+        computeMixingMatrices_fx( nX, nY_band, Cx_fx, Cx_e, Cy_fx, Cy_e, proto_matrix_ptr_fx, proto_matrix_ptr_e, 1, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e, Cr_fx, &Cr_e );
+    }
+    ELSE
+    {
+        /*IF neither decorrelation nor energy compensation is applied*/
+        FOR( i = 0; i < nY_band; i++ )
+        {
+            tmp = BASOP_Util_Divide3232_Scale( Cy_fx[i], L_add( Cproto_diag_fx[i], EPSILON_FX ), &tmp_e );
+            tmp_e = add( Cy_diag_e, Cproto_diag_e );
+            L_tmp = Sqrt32( L_deposit_h( tmp ), &tmp_e );
+            Cy_diag_fx[i] = L_tmp;
+            move32();
+            Cy_diag_buff_e[i] = tmp_e;
+            move16();
+        }
+
+
+        Cy_diag_e = Cy_diag_buff_e[0];
+        move16();
+
+        FOR( i = 1; i < nY_band; i++ )
+        {
+            if ( LT_16( Cy_diag_e, Cy_diag_buff_e[i] ) )
+            {
+                Cy_diag_e = Cy_diag_buff_e[i];
+                move16();
+            }
+        }
+
+        FOR( i = 0; i < nY_band; i++ )
+        {
+            Cy_diag_fx[i] = L_shr( Cy_diag_fx[i], sub( Cy_diag_e, Cy_diag_buff_e[i] ) );
+            move32();
+        }
+
+        diag_matrix_product_fx( Cy_diag_fx, Cy_diag_e, nY_band, proto_matrix_ptr_fx, proto_matrix_ptr_e, nY_band, nX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e );
+    }
+
+    IF( remove_lfe )
+    {
+        set_zero_fx( mixing_matrix_fx[param_band_idx], imult1616( nX, nY_cov ) );
+        ptrMM_fx = mixing_matrix_local_fx;
+        ptrMM_out_fx = mixing_matrix_fx[param_band_idx];
+        FOR( ch_idx1 = 0; ch_idx1 < nX; ch_idx1++ )
+        {
+            FOR( lfe_idx1 = 0; lfe_idx1 < hSynthesisOutputSetup->num_lfe + 1; lfe_idx1++ )
+            {
+                FOR( ch_idx2 = lfe_indices[lfe_idx1] + 1; ch_idx2 < lfe_indices[lfe_idx1 + 1]; ch_idx2++ )
+                {
+                    *( ptrMM_out_fx++ ) = *( ptrMM_fx++ );
+                    move32();
+                }
+                ptrMM_out_fx++;
+            }
+            ptrMM_out_fx--;
+        }
+
+        mixing_matrix_e[param_band_idx] = mixing_matrix_local_e;
+        move16();
+    }
+    ELSE
+    {
+        Copy32( mixing_matrix_local_fx, mixing_matrix_fx[param_band_idx], imult1616( nY_cov, nX ) );
+        mixing_matrix_e[param_band_idx] = mixing_matrix_local_e;
+        move16();
+    }
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_get_mono_stereo_mixing_matrices()
+ *
+ * calculate the direct and residual mixing matrices
+ * for mono and stereo output
+ *------------------------------------------------------------------------*/
+
+
+/*-------------------------------------------------------------------------
+ * param_mc_update_mixing_matrices()
+ *
+ * update mixing matrix buffers
+ *------------------------------------------------------------------------*/
+
+static void param_mc_update_mixing_matrices_fx(
+    PARAM_MC_DEC_HANDLE hParamMC, /* i/o: Parametric MC handle                                  */
+    Word32 *mixing_matrix[],      /* i  : direct mixing matrices for the frame just processed   */
+    Word16 *mixing_matrix_exp,
+    Word32 *mixing_matrix_res[], /* i  : residual mixing matrices for the frame just processed */
+    Word16 *mixing_matrix_res_exp,
+    const UWord16 nX,  /* i  : number of transport channels                          */
+    const UWord16 nY ) /* i  : number of synthesis channels                          */
+{
+    UWord16 param_band_idx;
+
+    FOR( param_band_idx = 0; param_band_idx < hParamMC->hMetadataPMC->nbands_coded; param_band_idx++ )
+    {
+        Word16 brange[2];
+
+        brange[0] = hParamMC->band_grouping[param_band_idx];
+        move16();
+        brange[1] = hParamMC->band_grouping[param_band_idx + 1];
+        move16();
+
+        Copy32( mixing_matrix[param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[param_band_idx], imult1616( nX, nY ) );
+        hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[param_band_idx] = mixing_matrix_exp[param_band_idx];
+        move16();
+
+        IF( LT_16( brange[0], hParamMC->h_output_synthesis_params.max_band_decorr ) )
+        {
+            Copy32( mixing_matrix_res[param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[param_band_idx], imult1616( nY, nY ) );
+            hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[param_band_idx] = mixing_matrix_res_exp[param_band_idx];
+            move16();
+        }
+    }
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dequantize_cov()
+ *
+ * generate the target covariance matrix
+ *------------------------------------------------------------------------*/
+
+
+/*-------------------------------------------------------------------------
+ * ivas_param_mc_dequantize_cov_fx()
+ *
+ * generate the target covariance matrix
+ *------------------------------------------------------------------------*/
+
+static void ivas_param_mc_dequantize_cov_fx(
+    PARAM_MC_DEC_HANDLE hParamMC,             /* i  : Parametric MC handle                                    */
+    Word16 *ild_q_fx,                         /* i  : sequence of dequantized ILD values                   Q8 */
+    Word16 *icc_q_fx,                         /* i  : sequence of dequantized ICC values                   Q15*/
+    const Word16 param_band_index,            /* i  : current parameter band                                  */
+    const Word16 nY_cov,                      /* i  : number of output channels in the covariance synthesis   */
+    const PARAM_MC_SYNTHESIS_CONF synth_conf, /* i  : Parametric MC synthesis configuration                   */
+    const Word16 nY_int,                      /* i  : number of channels in the transported format            */
+    const Word16 nX,                          /* i  : number of transport channels                            */
+    Word32 *Cx_state_fx,                      /* i  : transport channel covariance matrix                     */
+    Word16 Cx_state_e,                        /* i  : exponent for transport channel covariance matrix        */
+    Word32 *Cproto_fx,                        /* i  : prototype matrix                                        */
+    Word16 Cproto_e,                          /* i  : exponent for prototype matrix                           */
+    Word32 *Cy_state_fx,                      /* o  : target covariance matrix                                */
+    Word16 *Cy_state_e                        /* o  : exponent for target covariance matrix                   */
+)
+{
+    Word16 Cy_buf_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
+    Word16 Cp_buf_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
+
+    Word32 Nrqq_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - Nrqq_e)
+    Word16 Nrqq_e[MAX_OUTPUT_CHANNELS];
+    Word32 a_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - a_e)
+    Word16 a_e[MAX_OUTPUT_CHANNELS];
+    Word16 k;
+    Word16 l;
+    Word32 *Cyp_fx; // Q(31 - Cyp_e)
+    Word16 *Cyp_e;
+    Word32 ap_fx; // Q(31 - ap_e)
+    Word16 ap_e;
+    Word32 L_tmp;
+    Word16 tmp, tmp_e;
+    const PARAM_MC_ILD_MAPPING *h_ild_mapping;
+    Word32 Cy_state_int_fx[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
+    Word16 Cy_state_int_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
+
+    set16_fx( Cp_buf_e, Cproto_e, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
+    set32_fx( Nrqq_fx, 0, MAX_OUTPUT_CHANNELS );
+    set16_fx( Nrqq_e, 0, MAX_OUTPUT_CHANNELS );
+    h_ild_mapping = hParamMC->hMetadataPMC->ild_mapping_conf;
+
+    /*get back Nrg*/
+    tmp = 0;
+    move16();
+
+    FOR( k = 0; k < nY_int; k++ )
+    {
+        Word32 ref_ener_fx = 0; // Q(31 - ref_ener_e)
+        move32();
+        Word16 ref_ener_e = 0;
+        move16();
+        Word16 ref_channel_cnt;
+        Word16 ref_channel_idx;
+
+        FOR( ref_channel_cnt = 0; ref_channel_cnt < h_ild_mapping->num_ref_channels[k]; ref_channel_cnt++ )
+        {
+            ref_channel_idx = h_ild_mapping->ref_channel_idx[k][ref_channel_cnt];
+            move16();
+            ref_ener_fx = BASOP_Util_Add_Mant32Exp( Cx_state_fx[ref_channel_idx + ( ref_channel_idx * nX )], Cx_state_e, ref_ener_fx, ref_ener_e, &ref_ener_e );
+            move32();
+        }
+
+        L_tmp = Mpy_32_16_1( 713378626, ild_q_fx[k] );     /*Q24 : L_tmp Q31 for log2(10)/10 -> 713378626 */
+        L_tmp = BASOP_util_Pow2( L_tmp, 31 - 24, &tmp_e ); /*powf( 10.0f, ild_q_fx[k] / 10.0f )*/
+        L_tmp = Mpy_32_32( L_tmp, Mpy_32_16_1( ref_ener_fx, hParamMC->hMetadataPMC->ild_factors_fx[k] ) );
+
+        Nrqq_fx[h_ild_mapping->ild_index[k]] = L_tmp;
+        move32();
+        Nrqq_e[h_ild_mapping->ild_index[k]] = add( tmp_e, ref_ener_e );
+        move16();
+    }
+
+    /*  estimate ICCs from estimated Cproto */
+
+    FOR( k = 0; k < nY_int; k++ )
+    {
+        // a_fx[k] = 1.f / ( sqrtf( Cproto_fx[k + nY_int * k] ) + EPSILON );
+        tmp_e = Cp_buf_e[k + ( nY_int * k )];
+        move16();
+
+        IF( Cproto_fx[k + ( nY_int * k )] != 0 )
+        {
+            L_tmp = ISqrt32( Cproto_fx[k + ( nY_int * k )], &tmp_e );
+        }
+        ELSE
+        {
+            L_tmp = INV_EPSILON_MANT;
+            move32();
+            tmp_e = 15;
+            move16();
+        }
+        a_fx[k] = L_tmp;
+        move32();
+        a_e[k] = tmp_e;
+        move16();
+
+        FOR( l = 0; l < nY_int; l++ )
+        {
+            Cy_state_int_fx[( k * nY_int ) + l] = Mpy_32_32( Cproto_fx[( k * nY_int ) + l], a_fx[k] );
+            move32();
+            Cy_state_int_e[( k * nY_int ) + l] = add( Cp_buf_e[( k * nY_int ) + l], a_e[k] );
+            move16();
+        }
+    }
+
+    FOR( k = 0; k < nY_int; k++ )
+    {
+        Cyp_fx = Cy_state_int_fx + k;
+        Cyp_e = Cy_state_int_e + k;
+        ap_fx = a_fx[k];
+        move32();
+        ap_e = a_e[k];
+        move16();
+
+        FOR( l = 0; l < nY_int; l++ )
+        {
+            ( *Cyp_fx ) = Mpy_32_32( *Cyp_fx, ap_fx );
+            move32();
+            *Cyp_e = add( *Cyp_e, ap_e );
+            move16();
+
+            Cyp_fx += nY_int;
+            Cyp_e += nY_int;
+        }
+    }
+
+    /*normalizing the Cy_state_int_fx to a common exponent*/
+
+    /* replace some estimated ICCs with transmitted values */
+    FOR( k = 0; k < hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe; k++ )
+    {
+        Cy_state_int_fx[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] )] = L_shr( L_deposit_h( icc_q_fx[k] ), tmp );
+        move32();
+        Cy_state_int_e[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] )] = tmp;
+        move16();
+        Cy_state_int_fx[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] )] = L_shr( L_deposit_h( icc_q_fx[k] ), tmp );
+        move32();
+        Cy_state_int_e[hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][1] + ( nY_int * hParamMC->hMetadataPMC->icc_mapping_conf->icc_mapping[k][0] )] = tmp;
+        move16();
+    }
+
+    test();
+    IF( GE_16( param_band_index, PARAM_MC_MAX_BAND_LFE ) || ( hParamMC->hMetadataPMC->lfe_on == 0 ) )
+    {
+        FOR( k = 0; k < nY_int; k++ )
+        {
+            Cy_state_int_fx[k + ( 3 * nY_int )] = ONE_IN_Q31;
+            move32();
+            Cy_state_int_e[k + ( 3 * nY_int )] = 0;
+            move16();
+            Cy_state_int_fx[3 + ( k * nY_int )] = ONE_IN_Q31;
+            move32();
+            Cy_state_int_e[3 + ( k * nY_int )] = 0;
+            move16();
+        }
+        Nrqq_fx[3] = 0;
+        move32();
+    }
+
+    /* Generate back Covariance Mtx */
+    FOR( k = 0; k < nY_int; k++ )
+    {
+        tmp_e = Nrqq_e[k];
+        move16();
+        a_fx[k] = Sqrt32( Nrqq_fx[k], &tmp_e );
+        move32();
+        a_e[k] = tmp_e;
+        move16();
+
+        /* v_multc( Cy_state_int_fx + k * nY_int, a_fx[k], Cy_state_int_fx + k * nY_int, nY_int ) */
+        FOR( l = 0; l < nY_int; l++ )
+        {
+            Cy_state_int_fx[( k * nY_int ) + l] = Mpy_32_32( Cy_state_int_fx[( k * nY_int ) + l], a_fx[k] );
+            move32();
+            Cy_state_int_e[( k * nY_int ) + l] = add( Cy_state_int_e[( k * nY_int ) + l], a_e[k] );
+            move16();
+        }
+    }
+
+    FOR( k = 0; k < nY_int; k++ )
+    {
+        Cyp_fx = Cy_state_int_fx + k;
+        Cyp_e = Cy_state_int_e + k;
+        ap_fx = a_fx[k];
+        move32();
+        ap_e = a_e[k];
+        move16();
+
+        FOR( l = 0; l < nY_int; l++ )
+        {
+            ( *Cyp_fx ) = Mpy_32_32( *Cyp_fx, ap_fx );
+            move32();
+            ( *Cyp_e ) = add( *Cyp_e, ap_e );
+            move16();
+
+            Cyp_fx += nY_int;
+            Cyp_e += nY_int;
+        }
+    }
+
+    IF( EQ_32( synth_conf, PARAM_MC_SYNTH_LS_CONV_COV ) )
+    {
+        /* Cy = dmx*Cy*dmx' */
+        Word32 mat_mult_buffer1_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mat_mult_buffer1_e)
+        Word16 mat_mult_buffer1_e[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
+        Word32 target_ch_ener_fx[MAX_CICP_CHANNELS]; // Q(31 - target_ch_ener_e)
+        Word16 target_ch_ener_e[MAX_CICP_CHANNELS];
+        Word32 dmx_ch_ener_fx[MAX_CICP_CHANNELS];
+
+        Word16 ls_conv_dmx_matrix_e[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
+
+        set32_fx( target_ch_ener_fx, 0, MAX_CICP_CHANNELS );
+        set16_fx( target_ch_ener_e, 0, MAX_CICP_CHANNELS );
+        set32_fx( dmx_ch_ener_fx, 0, MAX_CICP_CHANNELS );
+        set16_fx( ls_conv_dmx_matrix_e, 1, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
+
+        matrix_product_mant_exp( hParamMC->ls_conv_dmx_matrix_fx, ls_conv_dmx_matrix_e, nY_cov, nY_int, 0,
+                                 Cy_state_int_fx, Cy_state_int_e, nY_int, nY_int, 0,
+                                 mat_mult_buffer1_fx, mat_mult_buffer1_e );
+
+        matrix_product_mant_exp( mat_mult_buffer1_fx, mat_mult_buffer1_e, nY_cov, nY_int, 0,
+                                 hParamMC->ls_conv_dmx_matrix_fx, ls_conv_dmx_matrix_e, nY_cov, nY_int, 1,
+                                 Cy_state_fx, Cy_buf_e );
+
+        FOR( k = 0; k < nY_cov; k++ )
+        {
+            FOR( l = 0; l < nY_int; l++ )
+            {
+                L_tmp = Mpy_32_32( hParamMC->ls_conv_dmx_matrix_fx[k + ( l * nY_cov )], Nrqq_fx[l] );
+                tmp_e = add( ls_conv_dmx_matrix_e[k + ( l + nY_cov )], Nrqq_e[l] );
+                L_tmp = BASOP_Util_Add_Mant32Exp( target_ch_ener_fx[k], target_ch_ener_e[k], L_tmp, tmp_e, &tmp_e );
+                target_ch_ener_fx[k] = L_tmp;
+                move32();
+                target_ch_ener_e[k] = tmp_e;
+                move16();
+            }
+
+            dmx_ch_ener_fx[k] = Cy_state_fx[k + ( nY_cov * k )];
+            move32();
+
+            IF( dmx_ch_ener_fx[k] < 0 )
+            {
+                Cy_state_fx[k + ( nY_cov * k )] = L_negate( Cy_state_fx[k + ( nY_cov * k )] );
+                move32();
+                dmx_ch_ener_fx[k] = L_negate( dmx_ch_ener_fx[k] );
+                move32();
+            }
+
+            IF( extract_h( dmx_ch_ener_fx[k] ) == 0 )
+            {
+                target_ch_ener_fx[k] = 0;
+                move32();
+                target_ch_ener_e[k] = 0;
+                move16();
+            }
+            ELSE
+            {
+                BASOP_Util_Divide_MantExp( extract_h( target_ch_ener_fx[k] ), target_ch_ener_e[k], extract_h( dmx_ch_ener_fx[k] ), Cy_buf_e[k + ( nY_cov * k )], &tmp, &tmp_e );
+                tmp = Sqrt16( tmp, &tmp_e );
+                target_ch_ener_fx[k] = L_deposit_h( tmp );
+                move32();
+                target_ch_ener_e[k] = tmp_e;
+                move16();
+            }
+
+            FOR( l = 0; l < nY_cov; l++ )
+            {
+                Cy_state_fx[( k * nY_cov ) + l] = Mpy_32_32( target_ch_ener_fx[k], Cy_state_fx[( k * nY_cov ) + l] );
+                move32();
+                Cy_buf_e[( k * nY_cov ) + l] = add( target_ch_ener_e[k], Cy_buf_e[( k * nY_cov ) + l] );
+                move16();
+            }
+
+            Cyp_fx = Cy_state_fx + k;
+            Cyp_e = Cy_buf_e + k;
+            ap_fx = target_ch_ener_fx[k];
+            move32();
+            ap_e = target_ch_ener_e[k];
+            move16();
+            FOR( l = 0; l < nY_cov; l++ )
+            {
+                ( *Cyp_fx ) = Mpy_32_32( *Cyp_fx, ap_fx );
+                move32();
+                *Cyp_e = add( *Cyp_e, ap_e );
+                move16();
+
+                Cyp_fx += nY_cov;
+                Cyp_e += nY_cov;
+            }
+        }
+    }
+    ELSE
+    {
+        Copy32( Cy_state_int_fx, Cy_state_fx, imult1616( nY_int, nY_int ) );
+        Copy( Cy_state_int_e, Cy_buf_e, imult1616( nY_int, nY_int ) );
+    }
+
+    /*normalize output matrix to a common exponent*/
+    tmp = 0;
+    FOR( k = 0; k < nY_int * nY_int; k++ )
+    {
+        Cy_state_fx[k] = BASOP_Util_Add_Mant32Exp( Cy_state_fx[k], Cy_buf_e[k], 0, 0, &Cy_buf_e[k] );
+        move32();
+        tmp = s_max( tmp, Cy_buf_e[k] );
+    }
+    FOR( k = 0; k < nY_int * nY_int; k++ )
+    {
+        L_tmp = L_shr( Cy_state_fx[k], sub( tmp, Cy_buf_e[k] ) );
+        Cy_state_fx[k] = L_tmp;
+        move32();
+    }
+    *Cy_state_e = tmp;
+    move16();
+
+    return;
+}
+
+/*-------------------------------------------------------------------------*
+ * param_mc_set_num_synth_bands()
+ *
+ * set the number of frequency bands to be synthesized
+ *-------------------------------------------------------------------------*/
+
+static void param_mc_set_num_synth_bands(
+    const Word32 output_Fs,      /* i  : output sampling frequency */
+    PARAM_MC_DEC_HANDLE hParamMC /* i/o: Parametric MC handle      */
+)
+{
+    UWord16 max_param_band_synth;
+    const Word16 *param_mc_bands_coded;
+
+    SWITCH( hParamMC->hMetadataPMC->num_parameter_bands )
+    {
+        case 20:
+            param_mc_bands_coded = param_mc_bands_coded_20;
+            BREAK;
+        case 10:
+            param_mc_bands_coded = param_mc_bands_coded_10;
+            BREAK;
+        case 14:
+        default:
+            param_mc_bands_coded = param_mc_bands_coded_14;
+            BREAK;
+    }
+    move16();
+    SWITCH( output_Fs )
+    {
+        case 8000:
+            max_param_band_synth = (UWord16) param_mc_bands_coded[NB];
+            BREAK;
+        case 16000:
+            max_param_band_synth = (UWord16) param_mc_bands_coded[WB];
+            BREAK;
+        case 32000:
+            max_param_band_synth = (UWord16) param_mc_bands_coded[SWB];
+            BREAK;
+        case 48000:
+        default:
+            max_param_band_synth = (UWord16) param_mc_bands_coded[FB];
+            BREAK;
+    }
+    move16();
+    hParamMC->num_param_bands_synth = s_min( hParamMC->hMetadataPMC->nbands_coded, max_param_band_synth );
+    move16();
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------------*
+ * param_mc_get_diff_proto_info()
+ *
+ * calculated the diffuse prototype information
+ *-------------------------------------------------------------------------*/
+
+
+static ivas_error param_mc_get_diff_proto_info_fx(
+    const Word32 *proto_mtx,                     /* i  : protoype matrix for the synthesis                     */
+    const UWord16 nchan_transport,               /* i  : number of transport channels                          */
+    const UWord16 nchan_out_cov,                 /* i  : number if output channels of the covariance synthesis */
+    PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info, /* o  : generated diffuse prototype info                      */
+    Word16 Q_proto_mtx )
+{
+    Word32 proto_fac_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
+    UWord16 cur_out_ch;
+    UWord16 cur_diff_proto;
+    UWord16 cur_transport_ch;
+    UWord16 max_num_src_chan;
+
+    /* Initializations */
+    max_num_src_chan = 0;
+    move16();
+
+    set_zero_fx( proto_fac_fx, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
+    IF( ( p_diff_proto_info->proto_index_diff = (Word16 *) malloc( nchan_out_cov * sizeof( Word16 ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+    set16_fx( p_diff_proto_info->proto_index_diff, 0, nchan_out_cov );
+
+    IF( ( p_diff_proto_info->num_source_chan_diff = (Word16 *) malloc( nchan_out_cov * sizeof( Word16 ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+    set16_fx( p_diff_proto_info->num_source_chan_diff, 0, nchan_out_cov );
+
+    /* we have at least one prototype, copy the first one */
+    p_diff_proto_info->num_protos_diff = 1;
+    move16();
+
+    mvr2r_inc_fixed( proto_mtx, nchan_out_cov, proto_fac_fx, nchan_out_cov, nchan_transport );
+    p_diff_proto_info->proto_index_diff[0] = 0;
+    move16();
+
+    /* search for distinct prototypes */
+    FOR( cur_out_ch = 1; cur_out_ch < nchan_out_cov; cur_out_ch++ )
+    {
+        UWord16 found = 0;
+        move16();
+
+        FOR( cur_diff_proto = 0; cur_diff_proto < p_diff_proto_info->num_protos_diff; cur_diff_proto++ )
+        {
+            Word32 diff_fx = 0;
+            move32();
+            Word32 *proto_fac_ptr_fx = proto_fac_fx + cur_diff_proto;
+            const Word32 *proto_mtx_ptr = proto_mtx + cur_out_ch;
+            FOR( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
+            {
+                diff_fx = L_add( diff_fx, L_abs( L_sub( *proto_fac_ptr_fx, *proto_mtx_ptr ) ) );
+                proto_fac_ptr_fx += nchan_out_cov;
+                proto_mtx_ptr += nchan_out_cov;
+            }
+
+            /* we already have this prototype, save the index */
+            IF( LT_64( W_mult0_32_32( diff_fx, 10 ), L_shl_sat( 1, Q_proto_mtx ) ) )
+            {
+                found = 1;
+                move16();
+                p_diff_proto_info->proto_index_diff[cur_out_ch] = cur_diff_proto;
+                move16();
+                BREAK;
+            }
+        }
+
+        /* new distinct prototype, add it */
+        IF( found == 0 )
+        {
+            const Word32 *proto_mtx_ptr = proto_mtx + cur_out_ch;
+            Word16 cur_num_src_chan;
+
+            cur_num_src_chan = 0;
+            move16();
+            FOR( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
+            {
+                if ( GT_32( *proto_mtx_ptr, 0 /*EPSILON*/ ) )
+                {
+                    cur_num_src_chan = add( cur_num_src_chan, 1 );
+                }
+                proto_mtx_ptr += nchan_out_cov;
+            }
+
+            mvr2r_inc_fixed( proto_mtx + cur_out_ch, nchan_out_cov, proto_fac_fx + p_diff_proto_info->num_protos_diff, nchan_out_cov, nchan_transport );
+
+            p_diff_proto_info->proto_index_diff[cur_out_ch] = p_diff_proto_info->num_protos_diff;
+            move16();
+            p_diff_proto_info->num_protos_diff = add( p_diff_proto_info->num_protos_diff, 1 );
+            move16();
+            max_num_src_chan = s_max( max_num_src_chan, cur_num_src_chan );
+        }
+    }
+
+    /* set up the prototype info struct */
+    IF( ( p_diff_proto_info->source_chan_idx = (Word16 **) malloc( p_diff_proto_info->num_protos_diff * sizeof( Word16 * ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+
+    IF( ( p_diff_proto_info->proto_fac_fx = (Word32 **) malloc( p_diff_proto_info->num_protos_diff * sizeof( Word32 * ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+    }
+    FOR( cur_diff_proto = 0; cur_diff_proto < p_diff_proto_info->num_protos_diff; cur_diff_proto++ )
+    {
+        Word32 *proto_fac_ptr;
+
+        IF( ( p_diff_proto_info->source_chan_idx[cur_diff_proto] = (Word16 *) malloc( max_num_src_chan * sizeof( Word16 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+
+        IF( ( p_diff_proto_info->proto_fac_fx[cur_diff_proto] = (Word32 *) malloc( max_num_src_chan * sizeof( Word32 ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+        }
+
+        proto_fac_ptr = proto_fac_fx + cur_diff_proto;
+        FOR( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
+        {
+            IF( GT_32( *proto_fac_ptr, EPSILON_FX_SMALL ) )
+            {
+                p_diff_proto_info->source_chan_idx[cur_diff_proto][p_diff_proto_info->num_source_chan_diff[cur_diff_proto]] = cur_transport_ch;
+                move16();
+                p_diff_proto_info->proto_fac_fx[cur_diff_proto][p_diff_proto_info->num_source_chan_diff[cur_diff_proto]] = L_shl( *proto_fac_ptr, 4 ); // (proto_fac_fx)Q26 + 4 = Q30
+                move16();
+                p_diff_proto_info->num_source_chan_diff[cur_diff_proto] = add( p_diff_proto_info->num_source_chan_diff[cur_diff_proto], 1 );
+                move16();
+            }
+            proto_fac_ptr += nchan_out_cov;
+        }
+    }
+    return IVAS_ERR_OK;
+}
+
+
+/*-------------------------------------------------------------------------*
+ * ivas_param_mc_bs_decode_parameter_values()
+ *
+ * reads and decodes a sequence of Parametric MC parameters from the bitstream
+ *-------------------------------------------------------------------------*/
+
+static void ivas_param_mc_bs_decode_parameter_values_fx(
+    UWord16 bit_buffer[],                                   /* i  : bitstream buffer                                       */
+    Word16 *bit_pos,                                        /* i/o: current bitstream buffer position                      */
+    const Word16 max_bits,                                  /* i  : maximum available bits in the buffer                   */
+    Word16 *BER_detect,                                     /* i/o: bit error detection flag                               */
+    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC,             /* i  : Parametric MC metadata information                     */
+    HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, /* i  : Parametric MC parameter quantization and coding tables */
+    const Word16 map_size_wo_lfe,                           /* i  : number of parameters per band (w/o LFEs)               */
+    const Word16 map_size,                                  /* i  : number of parameters per band (total)                  */
+    const Word16 num_lfe_bands,                             /* i  : number of parameter bands with coded LFE               */
+    const Word16 band_step,                                 /* i  : parameter band step                                    */
+    const Word16 num_param_bands,                           /* i  : number of parameter bands to decode                    */
+    Word16 *value_buffer                                    /* o  : output buffer for decoded parameter values             hParamCodingInfo -> Q-quant*/
+)
+{
+    Word16 range_coding;
+    Word16 sz_seq;
+    Word16 delta_coding;
+    Word16 delta_idx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
+    Word16 idx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
+    Word16 idx_prev;
+    Word16 idx_offset;
+    Word16 sz_alphabet;
+    Word16 i, j, k;
+    Word16 dequant_seq_fx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
+    Word16 dequant_ordered_fx[PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE];
+    Word16 n_lfe_idx;
+
+    range_coding = bit_buffer[*bit_pos];
+    move16();
+    *bit_pos = add( *bit_pos, 1 );
+    move16();
+
+    /* Decoding the sequence */
+    n_lfe_idx = sub( map_size, map_size_wo_lfe );
+    sz_seq = add( imult1616( num_param_bands, map_size_wo_lfe ), imult1616( num_lfe_bands, n_lfe_idx ) );
+
+    set16_fx( idx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
+    set16_fx( dequant_ordered_fx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
+    set16_fx( dequant_seq_fx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
+    IF( range_coding )
+    {
+        delta_coding = bit_buffer[*bit_pos];
+        move16();
+        *bit_pos = add( *bit_pos, 1 );
+        move16();
+
+        IF( delta_coding )
+        {
+            idx_prev = sub( add( shr( hParamCodingInfo->quantizer_size, 1 ), hParamCodingInfo->quantizer_size % 2 ), 1 );
+            sz_alphabet = sub( shl( hParamCodingInfo->quantizer_size, 1 ), 1 );
+            idx_offset = sub( hParamCodingInfo->quantizer_size, 1 );
+
+            /* read range coded delta ICC indices */
+            *bit_pos = add( *bit_pos, ivas_param_mc_range_decoder_LC_fx( &bit_buffer[*bit_pos], delta_idx, BER_detect, sz_seq, sz_alphabet,
+                                                                         hParamCodingInfo->cum_freq_delta, hParamCodingInfo->sym_freq_delta, PARAM_MC_RANGE_CODER_TOT_SHIFT, sub( max_bits, *bit_pos ) ) );
+            move16();
+
+            /* delta index to absolute index  */
+            FOR( j = 0; j < sz_seq; j++ )
+            {
+                idx[j] = add( idx_prev, sub( delta_idx[j], idx_offset ) );
+                idx_prev = idx[j];
+                move16();
+            }
+        }
+        ELSE
+        {
+            /* read range coded absolute ICC indices */
+            sz_alphabet = hParamCodingInfo->quantizer_size;
+            move16();
+            *bit_pos = add( *bit_pos, ivas_param_mc_range_decoder_LC_fx( &bit_buffer[*bit_pos], idx, BER_detect, sz_seq, sz_alphabet,
+                                                                         hParamCodingInfo->cum_freq, hParamCodingInfo->sym_freq, PARAM_MC_RANGE_CODER_TOT_SHIFT, sub( max_bits, *bit_pos ) ) );
+            move16();
+        }
+
+        /* dequantize */
+        FOR( j = 0; j < sz_seq; j++ )
+        {
+            dequant_seq_fx[j] = hParamCodingInfo->quantizer_fx[idx[j]]; // hParamCodingInfo -> Q-quant
+            move16();
+        }
+    }
+    ELSE
+    {
+        set16_fx( dequant_seq_fx, 0, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_MAX_VAL_MAP_SIZE );
+        /* read uniformly coded ICCs */
+        *bit_pos = add( *bit_pos, ivas_param_mc_uniform_decoder_fx( dequant_seq_fx, sz_seq, hParamCodingInfo->quantizer_fx, hParamCodingInfo->uni_bits, &bit_buffer[*bit_pos] ) );
+        move16();
+    }
+
+    /* reorder from sequential to parameter-band-wise */
+    k = 0;
+    FOR( j = 0; j < map_size_wo_lfe; ++j )
+    {
+        FOR( i = 0; i < num_param_bands; ++i )
+        {
+            dequant_ordered_fx[j + ( i * map_size )] = dequant_seq_fx[k]; // hParamCodingInfo -> Q-quant
+            move16();
+            k = add( k, 1 );
+        }
+    }
+
+    FOR( i = 0; i < num_lfe_bands; i++ )
+    {
+        FOR( j = 0; j < n_lfe_idx; j++ )
+        {
+            dequant_ordered_fx[map_size - n_lfe_idx + j + i * map_size] = dequant_seq_fx[k]; // hParamCodingInfo -> Q-quant
+            move16();
+            k = add( k, 1 );
+        }
+    }
+
+    IF( !( *BER_detect ) )
+    {
+        j = 0;
+        FOR( k = 0; k < hMetadataPMC->nbands_coded; k += band_step )
+        {
+            test();
+            IF( hMetadataPMC->bAttackPresent || EQ_16( hMetadataPMC->param_frame_idx, hMetadataPMC->coding_band_mapping[k] ) )
+            {
+                Copy( dequant_ordered_fx + imult1616( j, map_size ), value_buffer + imult1616( k, map_size ), map_size ); // hParamCodingInfo -> Q-quant
+                j++;
+            }
+            IF( hMetadataPMC->bAttackPresent && k + 1 < hMetadataPMC->nbands_coded )
+            {
+                Copy( value_buffer + imult1616( k, map_size ), value_buffer + imult1616( add( k, 1 ), map_size ), map_size );
+            }
+        }
+    }
+
+    return;
 }
diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_mc_paramupmix_dec.c
rename to lib_dec/ivas_mc_paramupmix_dec_fx.c
index c1bf455a5f60063f955fff29a969e716e2b9aba9..783b9494027c138af93c72ea4ef777b4b1494fb2 100644
--- a/lib_dec/ivas_mc_paramupmix_dec.c
+++ b/lib_dec/ivas_mc_paramupmix_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,11 +34,9 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
@@ -133,7 +131,8 @@ void ivas_mc_paramupmix_dec_read_BS(
         nb_bits_read_orig = 0;
         move16();
         last_bit_pos = sub( last_bit_pos, nb_bits_read_orig ); /* reverse the bitstream for easier reading of indices */
-        FOR( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ )
+        Word16 len = s_min( MAX_BITS_METADATA, last_bit_pos );
+        FOR( i = 0; i < len; i++ )
         {
             bstr_meta[i] = st_ivas->bit_stream[last_bit_pos - i];
             move16();
@@ -270,7 +269,8 @@ void ivas_mc_paramupmix_dec_render(
 
             ivas_mc_paramupmix_dec_sf( st_ivas, output_local_fx );
 
-            FOR( ch = 0; ch < min( MAX_OUTPUT_CHANNELS, ivas_get_nchan_buffers_dec( st_ivas, -1, -1 ) ); ch++ )
+            Word16 num_ch = s_min( MAX_OUTPUT_CHANNELS, ivas_get_nchan_buffers_dec( st_ivas, -1, -1 ) );
+            FOR( ch = 0; ch < num_ch; ch++ )
             {
                 output_local_fx[ch] += n_samples_sf;
             }
@@ -418,7 +418,7 @@ ivas_error ivas_mc_paramupmix_dec_open(
             move16();
         }
 
-        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -499,7 +499,7 @@ static void paramupmix_td_decorr_process_jbm_fx(
     FOR( k = 0; k < MC_PARAMUPMIX_COMBINATIONS; k++ )
     {
         Copy32( pcm_in[k], pp_out_pcm[k], output_frame );
-        delay_signal_fx( pp_out_pcm[k], output_frame, hTdDecorr[k]->look_ahead_buf, offset );
+        delay_signal32_fx( pp_out_pcm[k], output_frame, hTdDecorr[k]->look_ahead_buf, offset );
 
         /* In ducking gains */
         IF( hTdDecorr[k]->ducking_flag )
@@ -716,13 +716,8 @@ static void ivas_mc_paramupmix_dec_sf(
     Word16 noparamupmix_delay, n_samples_rendered;
     MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;
     Word16 subframeIdx, idx_in, maxBand;
-#ifdef MSAN_FIX
     Word32 Cldfb_RealBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX] = { 0 };
     Word32 Cldfb_ImagBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX] = { 0 };
-#else
-    Word32 Cldfb_RealBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
-    Word32 Cldfb_ImagBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
-#endif // MSAN_FIX
     Word32 Cldfb_RealBuffer_Binaural_fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
     Word32 Cldfb_ImagBuffer_Binaural_fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
 
@@ -871,18 +866,28 @@ static void ivas_mc_paramupmix_dec_sf(
                 RealBuffer_fx[slot_idx] = Cldfb_RealBuffer_Binaural_fx[ch][slot_idx]; // Q6
                 ImagBuffer_fx[slot_idx] = Cldfb_ImagBuffer_Binaural_fx[ch][slot_idx]; // Q6
             }
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
             scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->cldfb_size, Q5 - Q11 ); // Q11 -> Q5
             st_ivas->cldfbSynDec[ch]->Q_cldfb_state = Q5;
             move16();
-            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch][0] ), imult1616( maxBand, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx] ), st_ivas->cldfbSynDec[ch] ); // output_fx returned in Q5
-            scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->cldfb_size, Q11 - Q5 );                                                                          // Q5 -> Q11
+            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch][0] ), imult1616( maxBand, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx] ), 0, st_ivas->cldfbSynDec[ch] ); // output_fx returned in Q5
+#else                                                                                                                                                                                            /* OPT_AVOID_STATE_BUF_RESCALE */
+            cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch][0] ), imult1616( maxBand, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx] ), 6, 0, st_ivas->cldfbSynDec[ch] ); // output_fx returned in Q11
+#endif                                                                                                                                                                                           /* OPT_AVOID_STATE_BUF_RESCALE */
+
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
+            scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->cldfb_size, Q11 - Q5 ); // Q5 -> Q11
             st_ivas->cldfbSynDec[ch]->Q_cldfb_state = Q11;
             move16();
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
         }
+
+#ifndef OPT_AVOID_STATE_BUF_RESCALE
         FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
         {
             Scale_sig32( output_fx[ch], imult1616( maxBand, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx] ), 6 ); // Q5 -> Q11
         }
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
     }
     ELSE
     {
@@ -908,9 +913,13 @@ static void ivas_mc_paramupmix_dec_sf(
 
                 ptr_re_fx[0] = Cldfb_RealBuffer_fx[ch][slot_idx]; // Q6
                 ptr_im_fx[0] = Cldfb_ImagBuffer_fx[ch][slot_idx]; // Q6
-
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( ptr_re_fx, ptr_im_fx, &( pPcm_temp_fx[ch][L_mult0( hMCParamUpmix->num_freq_bands, slot_idx )] ),
+                                        hMCParamUpmix->num_freq_bands, 0, 0, st_ivas->cldfbSynDec[ch] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
                 cldfbSynthesis_ivas_fx( ptr_re_fx, ptr_im_fx, &( pPcm_temp_fx[ch][L_mult0( hMCParamUpmix->num_freq_bands, slot_idx )] ),
-                                        hMCParamUpmix->num_freq_bands, st_ivas->cldfbSynDec[ch] );
+                                        hMCParamUpmix->num_freq_bands, 0, st_ivas->cldfbSynDec[ch] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
             }
             scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->cldfb_size, sub( Q11, st_ivas->cldfbSynDec[ch]->Q_cldfb_state ) ); // Q6 -> Q11
             st_ivas->cldfbSynDec[ch]->Q_cldfb_state = Q11;
diff --git a/lib_dec/ivas_mcmasa_dec.c b/lib_dec/ivas_mcmasa_dec_fx.c
similarity index 97%
rename from lib_dec/ivas_mcmasa_dec.c
rename to lib_dec/ivas_mcmasa_dec_fx.c
index 3f5f1d098dbd6de796b595fa37ae5f0c1bf553f1..d12b190c640728b55825a1a5a4b948591e481b70 100644
--- a/lib_dec/ivas_mcmasa_dec.c
+++ b/lib_dec/ivas_mcmasa_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,9 +33,8 @@
 #include "options.h"
 #include <stdint.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
-#include "prot.h"
+#include "ivas_prot_rend_fx.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec_fx.c
similarity index 96%
rename from lib_dec/ivas_mct_core_dec.c
rename to lib_dec/ivas_mct_core_dec_fx.c
index 7c4c3743c3a0ebea5f91e9d9722861601c0d0d00..b42eb534b34af52b78b359306728ea7fd919f4a3 100644
--- a/lib_dec/ivas_mct_core_dec.c
+++ b/lib_dec/ivas_mct_core_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,16 +33,14 @@
 #include <assert.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
 #include "cnst.h"
 #include "basop_proto_func.h"
 #include "stat_com.h"
-#include "ivas_prot.h"
 #include "ivas_stat_dec.h"
 #include "ivas_stat_com.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-----------------------------------------------------------------*
@@ -90,9 +88,9 @@ void ivas_mct_side_bits_fx(
         FOR( ch = 0; ch < nChannels; ch++ )
         {
             st = sts[ch];
-            if ( EQ_32( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
+            IF( EQ_32( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
             {
-                continue;
+                CONTINUE;
             }
 
             mdct_read_IGF_bits_fx( st, st0 );
@@ -233,7 +231,7 @@ void ivas_mct_core_dec(
     {
         IF( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
         {
-            continue;
+            CONTINUE;
         }
         i = add( i, 1 );
     }
@@ -260,15 +258,15 @@ void ivas_mct_core_dec(
             {
                 st = sts[ch];
 
-                if ( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) ) /*indicates LFE */
+                IF( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) ) /*indicates LFE */
                 {
-                    continue;
+                    CONTINUE;
                 }
 
                 test();
-                if ( bfi && EQ_16( st->core, ACELP_CORE ) ) /*no igf processing needed*/
+                IF( bfi && EQ_16( st->core, ACELP_CORE ) ) /*no igf processing needed*/
                 {
-                    continue;
+                    CONTINUE;
                 }
 
                 IF( EQ_16( st->core, TCX_10_CORE ) )
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_mct_dec.c
rename to lib_dec/ivas_mct_dec_fx.c
index f3afead8fe1b8c7a8c86783f0c498986ebff91c5..b34ce0c56d09f1ddc1a27c93089460bf8b4243c9 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,9 +38,7 @@
 #include "ivas_cnst.h"
 #include "rom_com.h"
 #include "prot_fx.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
@@ -86,6 +84,8 @@ ivas_error ivas_mct_dec_fx(
     set16_fx( x_len[0], 0, NB_DIV );
     set16_fx( x_len[1], 0, NB_DIV );
     Decoder_State **sts;
+    Word32 *p_output_orig_fx[2];
+    Word32 synth_32_fx[CPE_CHANNELS][L_FRAME_PLUS];
     Word16 synth_fx[CPE_CHANNELS][L_FRAME_PLUS]; //(Q_synth)
     Word32 ivas_total_brate;
     ivas_error error;
@@ -162,6 +162,16 @@ ivas_error ivas_mct_dec_fx(
     /* MCT side bits decoder */
     ivas_mct_side_bits_fx( hMCT, st_ivas->hCPE, nCPE, st_ivas->hCPE[0]->hCoreCoder[0], st_ivas->bfi, st_ivas->hCPE[0]->hCoreCoder[0]->bit_stream, ivas_total_brate, nb_bits_metadata );
 
+    /* in case of switching from an SID frame (with ACELP core) to MCT, buffer of L_FRAME_PLUS samples is needed -> use synth[] as a temporary buffer */
+    IF( st_ivas->hCPE[0]->hCoreCoder[0]->last_core == ACELP_CORE )
+    {
+        FOR( n = 0; n < CPE_CHANNELS; n++ )
+        {
+            p_output_orig_fx[n] = output_fx[n];
+            output_fx[n] = synth_32_fx[n];
+        }
+    }
+
     FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
     {
         st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect = s_or( st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect, st_ivas->BER_detect );
@@ -250,9 +260,9 @@ ivas_error ivas_mct_dec_fx(
 
         FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
-            Copy_Scale_sig_16_32( Aq_fx[cpe_id][n], Aq_fx_32[cpe_id][n], 102, Q16 - Q12 ); // Q16
-            x_fx[n][0] = output_fx[n + ( cpe_id * CPE_CHANNELS )];                         // Q11
-            x_fx[n][1] = output_fx[n + ( cpe_id * CPE_CHANNELS )] + ( L_FRAME48k / 2 );    // Q11
+            Copy_Scale_sig_16_32_DEPREC( Aq_fx[cpe_id][n], Aq_fx_32[cpe_id][n], 102, Q16 - Q12 ); // Q16
+            x_fx[n][0] = output_fx[n + ( cpe_id * CPE_CHANNELS )];                                // Q11
+            x_fx[n][1] = output_fx[n + ( cpe_id * CPE_CHANNELS )] + ( L_FRAME48k / 2 );           // Q11
             x_e[n][0] = 20;
             move16();
             move16();
@@ -334,10 +344,8 @@ ivas_error ivas_mct_dec_fx(
             x_fx[n][0] = output_fx[n + ( cpe_id * CPE_CHANNELS )];                      // Q11
             x_fx[n][1] = output_fx[n + ( cpe_id * CPE_CHANNELS )] + ( L_FRAME48k / 2 ); // Q11
         }
-
-        Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->old_Aq_12_8_fx, hCPE->hCoreCoder[0]->old_Aq_12_8_fx_32, add( M, 1 ), sub( 28, norm_s( sub( hCPE->hCoreCoder[0]->old_Aq_12_8_fx[0], 1 ) ) ) );
-        Copy_Scale_sig_16_32( hCPE->hCoreCoder[1]->old_Aq_12_8_fx, hCPE->hCoreCoder[1]->old_Aq_12_8_fx_32, add( M, 1 ), sub( 28, norm_s( sub( hCPE->hCoreCoder[1]->old_Aq_12_8_fx[0], 1 ) ) ) );
-
+        Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->old_Aq_12_8_fx, hCPE->hCoreCoder[0]->old_Aq_12_8_fx_32, add( M, 1 ), sub( 28, sub( 15, norm_s( sub( hCPE->hCoreCoder[0]->old_Aq_12_8_fx[0], 1 ) ) ) ) );
+        Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[1]->old_Aq_12_8_fx, hCPE->hCoreCoder[1]->old_Aq_12_8_fx_32, add( M, 1 ), sub( 28, sub( 15, norm_s( sub( hCPE->hCoreCoder[1]->old_Aq_12_8_fx[0], 1 ) ) ) ) );
         ivas_mdct_core_reconstruct_fx( hCPE, x_fx, synth_fx, fUseTns[cpe_id], 1, q_output, e_sig );
 
         Word16 hdrm, sh;
@@ -368,6 +376,16 @@ ivas_error ivas_mct_dec_fx(
             }
         }
 
+        /* set pointers back */
+        test();
+        IF( cpe_id == 0 && st_ivas->hCPE[0]->hCoreCoder[0]->last_core == ACELP_CORE )
+        {
+            FOR( n = 0; n < CPE_CHANNELS; n++ )
+            {
+                output_fx[n] = p_output_orig_fx[n];
+            }
+        }
+
 
         /*----------------------------------------------------------------*
          * CoreCoder Post-processing and updates
@@ -380,26 +398,21 @@ ivas_error ivas_mct_dec_fx(
             test();
             IF( ( st_ivas->sba_dirac_stereo_flag != 0 ) && ( NE_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) || GE_16( cpe_id, sub( nCPE, 2 ) ) ) )
             {
-
-                Copy_Scale_sig_16_32( synth_fx[n], synth_fx_32[n], L_FRAME48k, sub( Q11, ( sub( 15, e_sig[n] ) ) ) ); // Q11
-                Copy_Scale_sig_16_32( hCPE->hCoreCoder[n]->hHQ_core->old_out_fx, hCPE->hCoreCoder[n]->hHQ_core->oldOut_fx, output_frame, sub( Q11, hCPE->hCoreCoder[n]->hHQ_core->Q_old_wtda ) );
+                Copy_Scale_sig_16_32_no_sat( synth_fx[n], synth_fx_32[n], output_frame, sub( Q11, ( sub( 15, e_sig[n] ) ) ) ); // Q11
+                Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[n]->hHQ_core->old_out_fx, hCPE->hCoreCoder[n]->hHQ_core->old_out_fx32, output_frame, sub( Q11, hCPE->hCoreCoder[n]->hHQ_core->Q_old_wtda ) );
                 ivas_post_proc_fx( NULL, hCPE, n, synth_fx_32[n], NULL, output_frame, 1, Q11 );
-#ifdef MSAN_FIX
                 Copy_Scale_sig_32_16( synth_fx_32[n], synth_fx[n], output_frame, sub( sub( 15, e_sig[n] ), Q11 ) ); // Q0
-#else
-                Copy_Scale_sig_32_16( synth_fx_32[n], synth_fx[n], L_FRAME48k, 0 - Q11 );
-#endif
             }
 
             /* Postprocessing for ACELP/MDCT core switching and synchronization */
             Word16 output_mem_fx[L_FRAME48k];
             IF( hCPE->output_mem_fx[1] != NULL )
             {
-                Copy_Scale_sig_32_16( hCPE->output_mem_fx[1], output_mem_fx, NS2SA( sts[n]->output_Fs, 3125000 ), -Q11 );
+                Copy_Scale_sig_32_16( hCPE->output_mem_fx[1], output_mem_fx, NS2SA_FX2( sts[n]->output_Fs, 3125000 ), -Q11 );
             }
             ELSE
             {
-                set16_fx( output_mem_fx, 0, NS2SA( sts[n]->output_Fs, 3125000 ) );
+                set16_fx( output_mem_fx, 0, NS2SA_FX2( sts[n]->output_Fs, 3125000 ) );
             }
 
             Word16 Q_synth = sub( 15, e_sig[n] );
@@ -415,22 +428,20 @@ ivas_error ivas_mct_dec_fx(
             {
                 dirac_stereo_flag = 0;
             }
-            IF( NE_32( ( error = core_switching_post_dec_ivas_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_mem_fx, st_ivas->ivas_format, 0, output_frame, 0 /*core_switching_flag*/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = core_switching_post_dec_ivas_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_mem_fx, 0, output_frame, 0 /*core_switching_flag*/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
-
-            Copy_Scale_sig_16_32( synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_frame, sub( Q11, Q_synth ) ); // Q11
-
+            Copy_Scale_sig_16_32_no_sat( synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_frame, sub( Q11, Q_synth ) ); // Q11
             /* Save synthesis for HQ FEC */
             Word32 output_fx_[L_FRAME48k];
-            Copy32( output_fx[( cpe_id * CPE_CHANNELS ) + n], output_fx_, L_FRAME48k );                                                                    // Q11
-            Scale_sig32( output_fx_, L_FRAME48k, Q16 - Q11 );                                                                                              // Q11 -> Q16
-            Copy_Scale_sig32_16( sts[n]->prev_synth_buffer32_fx, sts[n]->prev_synth_buffer_fx, NS2SA( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), -11 ); // Q11 -> Q0
+            Copy32( output_fx[( cpe_id * CPE_CHANNELS ) + n], output_fx_, L_FRAME48k );                                                                     // Q11
+            Scale_sig32( output_fx_, L_FRAME48k, Q16 - Q11 );                                                                                               // Q11 -> Q16
+            Copy_Scale_sig32_16( sts[n]->prev_synth_buffer32_fx, sts[n]->prev_synth_buffer_fx, NS2SA( 48000, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ), -Q11 ); // Q11 -> Q0
             sts[n]->q_prev_synth_buffer_fx = 0;
             move16();
 
-            save_synthesis_hq_fec_fx( sts[n], output_fx_, output_frame, hCPE );
+            save_synthesis_hq_fec_fx( sts[n], NULL, output_fx_, output_frame, 0, hCPE );
 
             /* CoreCoder common updates */
             ivas_updt_dec_common_fx( hCPE->hCoreCoder[n], NORMAL_HQ_CORE, -1, output_fx[( cpe_id * CPE_CHANNELS ) + n], 11 );
@@ -441,7 +452,7 @@ ivas_error ivas_mct_dec_fx(
         {
             IF( hCPE->hCoreCoder[n] )
             {
-                Copy_Scale_sig_16_32( hCPE->hCoreCoder[n]->delay_buf_out_fx, hCPE->hCoreCoder[n]->delay_buf_out32_fx, HQ_DELTA_MAX * HQ_DELAY_COMP, Q11 ); // Q0 -> Q11
+                Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[n]->delay_buf_out_fx, hCPE->hCoreCoder[n]->delay_buf_out32_fx, HQ_DELTA_MAX * HQ_DELAY_COMP, Q11 ); // Q0 -> Q11
             }
         }
 
@@ -1319,7 +1330,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
         new_brate_SCE = 0;
         move32();
         Word16 temp_e;
-        Word32 L_temp = BASOP_Util_Divide3232_Scale_cadence( ivas_total_brate, sub( st_ivas->nchan_transport, 1 ), &temp_e );
+        Word32 L_temp = BASOP_Util_Divide3232_Scale_newton( ivas_total_brate, sub( st_ivas->nchan_transport, 1 ), &temp_e );
         L_temp = L_shr( L_temp, sub( 31, temp_e ) );
         new_brate_CPE = L_shl( L_temp, 1 ) /*CPE_CHANNELS*/;
     }
@@ -1328,7 +1339,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
         new_brate_SCE = 0;
         move32();
         Word16 temp_e;
-        Word32 L_temp = BASOP_Util_Divide3232_Scale_cadence( ivas_total_brate, sub( st_ivas->nchan_transport, 1 ), &temp_e );
+        Word32 L_temp = BASOP_Util_Divide3232_Scale_newton( ivas_total_brate, sub( st_ivas->nchan_transport, 1 ), &temp_e );
         L_temp = L_shr( L_temp, sub( 31, temp_e ) );
         new_brate_CPE = L_shl( L_temp, 1 ) /*CPE_CHANNELS*/;
     }
@@ -1337,7 +1348,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
         new_brate_SCE = 0; /* ivas_total_brate / st_ivas->nchan_transport;*/
         move32();
         Word16 temp_e;
-        Word32 L_temp = BASOP_Util_Divide3232_Scale_cadence( ivas_total_brate, st_ivas->nchan_transport, &temp_e );
+        Word32 L_temp = BASOP_Util_Divide3232_Scale_newton( ivas_total_brate, st_ivas->nchan_transport, &temp_e );
         L_temp = L_shr( L_temp, sub( 31, temp_e ) );
         new_brate_CPE = L_shl( L_temp, 1 ) /*CPE_CHANNELS*/;
     }
diff --git a/lib_dec/ivas_mct_dec_mct.c b/lib_dec/ivas_mct_dec_mct.c
deleted file mode 100644
index 7ba41f344beb919d85c23047e4aaf70d31e29bd9..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_mct_dec_mct.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include "options.h"
-#include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include <assert.h>
-#include "stat_enc.h"
-#include "ivas_prot_fx.h"
diff --git a/lib_dec/ivas_mct_dec_mct_fx.c b/lib_dec/ivas_mct_dec_mct_fx_fx.c
similarity index 93%
rename from lib_dec/ivas_mct_dec_mct_fx.c
rename to lib_dec/ivas_mct_dec_mct_fx_fx.c
index 3ed0998d1642fd8e96aca435a0dfe720550df64f..0f20c1ec0fbdd12dc61b9d97a6d8bf256733fbb5 100644
--- a/lib_dec/ivas_mct_dec_mct_fx.c
+++ b/lib_dec/ivas_mct_dec_mct_fx_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,12 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include <assert.h>
 #include "stat_enc.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*----------------------------------------------------------*
@@ -315,17 +313,6 @@ void mctStereoIGF_dec_fx(
             test();
             IF( NE_16( hMCT->hBlockData[b]->hStereoMdct->IGFStereoMode[k], SMDCT_DUAL_MONO ) || NE_16( hMCT->hBlockData[b]->hStereoMdct->mdct_stereo_mode[k], SMDCT_DUAL_MONO ) )
             {
-#ifndef FIX_1109_OPTIM_MCT_STEREO_IGF_DEC
-                tmp = BASOP_Util_Divide1616_Scale( sts[0]->hTcxCfg->tcx_coded_lines, nSubframes, &tmp_e );
-                L_spec[0] = shr( tmp, add( 15, negate( tmp_e ) ) );
-                move16();
-
-                tmp = BASOP_Util_Divide1616_Scale( sts[0]->L_frame, nSubframes, &tmp_e );
-                L_frame_nSubframe = shr( tmp, add( 15, negate( tmp_e ) ) );
-
-                tmp = BASOP_Util_Divide1616_Scale( sts[0]->hTcxDec->L_frameTCX, nSubframes, &tmp_e );
-                L_frameTCX_nSubframe = shr( tmp, add( 15, negate( tmp_e ) ) );
-#else
                 Word16 shr_div, shr_k;
 
                 assert( nSubframes == 1 || nSubframes == 2 );
@@ -336,7 +323,6 @@ void mctStereoIGF_dec_fx(
                 move16();
                 L_frame_nSubframe = shr( sts[0]->L_frame, shr_div );
                 L_frameTCX_nSubframe = shr( sts[0]->hTcxDec->L_frameTCX, shr_div );
-#endif
 
                 init_tcx_info_fx( sts[0], L_frame_nSubframe, L_frameTCX_nSubframe, k, bfi, &tcx_offset[0], &tcx_offsetFB[0], &L_frame[0], &L_frameTCX[0], &left_rect[0], &L_spec[0] );
 
@@ -346,28 +332,16 @@ void mctStereoIGF_dec_fx(
                 decoder_tcx_IGF_stereo_fx( sts, hMCT->hBlockData[b]->hStereoMdct, hMCT->hBlockData[b]->mask, p_x, p_x_e, p_x_len, L_frame[0], left_rect[0], k, bfi, 1 /* MCT_flag */ );
 
                 // Shifting output with variable exponent back to Q12
-#ifdef FIX_1109_OPTIM_MCT_STEREO_IGF_DEC
                 shr_k = sub( 31 - Q12, p_x_e[0][k] );
-#endif
                 FOR( Word16 i = 0; i < p_x_len[0][k]; i++ )
                 {
-#ifndef FIX_1109_OPTIM_MCT_STEREO_IGF_DEC
-                    p_x[0][k][i] = L_shr( p_x[0][k][i], sub( 31 - Q12, p_x_e[0][k] ) );
-#else
                     p_x[0][k][i] = L_shr( p_x[0][k][i], shr_k );
-#endif
                     move32();
                 }
-#ifdef FIX_1109_OPTIM_MCT_STEREO_IGF_DEC
                 shr_k = sub( 31 - Q12, p_x_e[1][k] );
-#endif
                 FOR( Word16 i = 0; i < p_x_len[1][k]; i++ )
                 {
-#ifndef FIX_1109_OPTIM_MCT_STEREO_IGF_DEC
-                    p_x[1][k][i] = L_shr( p_x[1][k][i], sub( 31 - Q12, p_x_e[1][k] ) );
-#else
                     p_x[1][k][i] = L_shr( p_x[1][k][i], shr_k );
-#endif
                     move32();
                 }
             }
diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_mdct_core_dec.c
rename to lib_dec/ivas_mdct_core_dec_fx.c
index b80bff932e923b09a077d4bad722d61314b63c07..fabebede4e6e468526331188d065f9086d1715c9 100644
--- a/lib_dec/ivas_mdct_core_dec.c
+++ b/lib_dec/ivas_mdct_core_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,18 +33,16 @@
 #include <assert.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "cnst.h"
 #include "basop_proto_func.h"
 #include "stat_com.h"
-#include "ivas_prot.h"
 #include "ivas_stat_dec.h"
 #include "ivas_stat_com.h"
 #include <math.h>
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -686,10 +684,8 @@ void ivas_mdct_core_invQ_fx(
     {
         spectralData_tmp[k] = malloc( N_MAX * sizeof( Word32 ) );
     }
-#ifdef MSAN_FIX
     set32_fx( spectralData_tmp[0], 0, L_FRAME_MAX );
     set32_fx( spectralData_tmp[1], 0, L_FRAME_MAX );
-#endif // MSAN_FIX
 
     push_wmops( "mdct_core_invQ" );
     sts = hCPE->hCoreCoder;
@@ -730,13 +726,8 @@ void ivas_mdct_core_invQ_fx(
 
         common_exp = s_max( sts[0]->hTonalMDCTConc->lastBlockData.spectralData_exp, sts[1]->hTonalMDCTConc->lastBlockData.spectralData_exp );
 
-#ifdef MSAN_FIX
-        Copy_Scale_sig_16_32( sts[0]->hTonalMDCTConc->lastBlockData.spectralData, spectralData_tmp[0], L_frameTCX[0], sub( 15, sub( common_exp, sts[0]->hTonalMDCTConc->lastBlockData.spectralData_exp ) ) ); // 30 - spectral_exp1
-        Copy_Scale_sig_16_32( sts[1]->hTonalMDCTConc->lastBlockData.spectralData, spectralData_tmp[1], L_frameTCX[1], sub( 15, sub( common_exp, sts[1]->hTonalMDCTConc->lastBlockData.spectralData_exp ) ) ); // 30 - spectral_exp2
-#else
-        Copy_Scale_sig_16_32( sts[0]->hTonalMDCTConc->lastBlockData.spectralData, spectralData_tmp[0], L_FRAME_MAX, 15 - ( common_exp - sts[0]->hTonalMDCTConc->lastBlockData.spectralData_exp ) ); // 30 - spectral_exp1
-        Copy_Scale_sig_16_32( sts[1]->hTonalMDCTConc->lastBlockData.spectralData, spectralData_tmp[1], L_FRAME_MAX, 15 - ( common_exp - sts[1]->hTonalMDCTConc->lastBlockData.spectralData_exp ) ); // 30 - spectral_exp2
-#endif // MSAN_FIX
+        Copy_Scale_sig_16_32_no_sat( sts[0]->hTonalMDCTConc->lastBlockData.spectralData, spectralData_tmp[0], L_frameTCX[0], sub( 15, sub( common_exp, sts[0]->hTonalMDCTConc->lastBlockData.spectralData_exp ) ) ); // 30 - spectral_exp1
+        Copy_Scale_sig_16_32_no_sat( sts[1]->hTonalMDCTConc->lastBlockData.spectralData, spectralData_tmp[1], L_frameTCX[1], sub( 15, sub( common_exp, sts[1]->hTonalMDCTConc->lastBlockData.spectralData_exp ) ) ); // 30 - spectral_exp2
 
         sts[0]->hTonalMDCTConc->lastBlockData.spectralData_exp = sts[1]->hTonalMDCTConc->lastBlockData.spectralData_exp = common_exp;
         move16();
@@ -748,13 +739,8 @@ void ivas_mdct_core_invQ_fx(
         /* both input in same Q */
         stereo_decoder_tcx_fx( hCPE->hStereoMdct, ms_mask, x_0[1], &spectralData_tmp[0], &spectralData_tmp[1], &hCPE->hStereoMdct->mdct_stereo_mode[0], sts[0]->core, sts[1]->core, sts[0]->igf, L_frameTCX[0], L_frameTCX[1], 0, sts[0]->last_core, sts[1]->last_core, 1, &q_r, &q_l );
 
-#ifdef MSAN_FIX
         Copy_Scale_sig_32_16( spectralData_tmp[0], sts[0]->hTonalMDCTConc->lastBlockData.spectralData, L_frameTCX[0], -15 ); // q_l - 15
         Copy_Scale_sig_32_16( spectralData_tmp[1], sts[1]->hTonalMDCTConc->lastBlockData.spectralData, L_frameTCX[1], -15 ); // q_r - 15
-#else
-        Copy_Scale_sig_32_16( spectralData_tmp[0], sts[0]->hTonalMDCTConc->lastBlockData.spectralData, L_FRAME_MAX, -15 );
-        Copy_Scale_sig_32_16( spectralData_tmp[1], sts[1]->hTonalMDCTConc->lastBlockData.spectralData, L_FRAME_MAX, -15 );
-#endif
         sts[0]->hTonalMDCTConc->lastBlockData.spectralData_exp = sub( 30, q_l );
         sts[1]->hTonalMDCTConc->lastBlockData.spectralData_exp = sub( 30, q_r );
         move16();
@@ -1184,19 +1170,15 @@ void ivas_mdct_core_reconstruct_fx(
         {
             Scale_sig( st->hTcxDec->syn_Overl_TDACFB, L_FRAME_MAX / 2, sub( q_win, st->hTcxDec->Q_syn_Overl_TDACFB ) ); // st->hTcxDec->Q_syn_Overl_TDACFB -> q_win
             Scale_sig( st->hTcxDec->syn_Overl_TDAC, L_FRAME32k / 2, sub( q_win, st->hTcxDec->Q_syn_Overl_TDAC ) );      // st->hTcxDec->Q_syn_Overl_TDAC -> q_win
-            Scale_sig( st->hTcxDec->old_syn_Overl, L_FRAME32k / 2, sub( q_win, sub( -1, st->Q_syn ) ) );                // Q(-1 - st->Q_syn) -> q_win
-            Scale_sig( st->hTcxDec->syn_Overl, L_FRAME32k / 2, sub( q_win, st->Q_syn ) );                               // Q(st->Q_syn) -> q_win
-            Scale_sig( st->hTcxDec->syn_OverlFB, L_FRAME_MAX / 2, sub( q_win, st->Q_syn ) );                            // Q(st->Q_syn) -> q_win
-            Scale_sig( st->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( q_win, st->hHQ_core->Q_old_wtda_LB ) );            // Q(st->hHQ_core->Q_old_wtda_LB) -> q_win
-            Scale_sig( st->hHQ_core->old_out_fx, L_FRAME48k, sub( q_win, st->hHQ_core->Q_old_wtda ) );                  // Q(st->hHQ_core->Q_old_wtda) -> q_win
-#ifdef MSAN_FIX
+            Scale_sig( st->hTcxDec->old_syn_Overl, L_FRAME32k / 2, sub( q_win, st->hTcxDec->Q_old_syn_Overl ) );        // Q(-1 - st->Q_syn) -> q_win
+            st->hTcxDec->Q_old_syn_Overl = q_win;
+            Scale_sig( st->hTcxDec->syn_Overl, L_FRAME32k / 2, sub( q_win, st->Q_syn ) );                                  // Q(st->Q_syn) -> q_win
+            Scale_sig( st->hTcxDec->syn_OverlFB, L_FRAME_MAX / 2, sub( q_win, st->Q_syn ) );                               // Q(st->Q_syn) -> q_win
+            Scale_sig( st->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( q_win, st->hHQ_core->Q_old_wtda_LB ) );               // Q(st->hHQ_core->Q_old_wtda_LB) -> q_win
+            Scale_sig( st->hHQ_core->old_out_fx, L_FRAME48k, sub( q_win, st->hHQ_core->Q_old_wtda ) );                     // Q(st->hHQ_core->Q_old_wtda) -> q_win
             Scale_sig( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS ), M ), sub( q_win, q_syn ) );     // q_syn -> q_win
             Scale_sig( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ), sub( q_win, q_syn ) ); // q_syn -> q_win
-#else
-            Scale_sig( synth_buf_fx, 3136, sub( q_win, q_syn ) );
-            Scale_sig( synth_bufFB_fx, 3136, sub( q_win, q_syn ) );
-#endif
-            Scale_sig( st->syn, M + 1, sub( q_win, st->Q_syn ) ); // st->Q_syn -> q_win
+            Scale_sig( st->syn, M + 1, sub( q_win, st->Q_syn ) );                                                          // st->Q_syn -> q_win
             FOR( k = 0; k < nSubframes[ch]; k++ )
             {
                 init_tcx_info_fx( st, L_frame_global[ch], L_frame_globalTCX[ch], k, bfi, &tcx_offset[ch],
@@ -1257,14 +1239,10 @@ void ivas_mdct_core_reconstruct_fx(
             Scale_sig( st->hTcxDec->syn_Overl_TDAC, L_FRAME32k / 2, sub( sub( -1, st->Q_syn ), q_win ) ); // q_win -> Q(-1 - st->Q_syn)
             st->hTcxDec->Q_syn_Overl_TDAC = sub( -1, st->Q_syn );
             move16();
-            Scale_sig( st->hTcxDec->old_syn_Overl, L_FRAME32k / 2, sub( sub( -1, st->Q_syn ), q_win ) ); // q_win -> Q(-1 - st->Q_syn)
-#ifdef MSAN_FIX
+            Scale_sig( st->hTcxDec->old_syn_Overl, L_FRAME32k / 2, sub( sub( -1, st->Q_syn ), st->hTcxDec->Q_old_syn_Overl ) ); // q_win -> Q(-1 - st->Q_syn)
+            st->hTcxDec->Q_old_syn_Overl = sub( -1, st->Q_syn );
             Scale_sig( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS ), M ), sub( q_syn, q_win ) );     // q_win -> q_syn
             Scale_sig( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ), sub( q_syn, q_win ) ); // q_win -> q_syn
-#else
-            Scale_sig( synth_buf_fx, 3136, sub( q_syn, q_win ) );
-            Scale_sig( synth_bufFB_fx, 3136, sub( q_syn, q_win ) );
-#endif
             Scale_sig( st->syn, M + 1, add( st->Q_syn, 2 ) );
             Scale_sig( st->hTcxDec->syn_OverlFB, L_FRAME_MAX / 2, sub( st->Q_syn, q_win ) ); // q_win -> st->Q_syn
             Scale_sig( st->hTcxDec->syn_Overl, L_FRAME32k / 2, sub( st->Q_syn, q_win ) );    // q_win -> st->Q_syn
@@ -1278,11 +1256,6 @@ void ivas_mdct_core_reconstruct_fx(
         ELSE /*ACELP core for ACELP-PLC */
         {
             assert( EQ_16( st->bfi, 1 ) );
-
-            Scale_sig( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS ), M ), sub( -2, q_syn ) );     // Q0
-            Scale_sig( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ), sub( -2, q_syn ) ); // Q0
-            q_syn = -2;
-            move16();
             /* PLC: [TCX: TD PLC] */
             IF( MCT_flag != 0 )
             {
@@ -1309,14 +1282,15 @@ void ivas_mdct_core_reconstruct_fx(
             move16();
             st->Q_syn = q_syn;
             move16();
+            st->hTcxDec->Q_old_syn_Overl = add( st->hTcxDec->Q_old_syn_Overl, q_syn );
 
             IF( ( EQ_16( st->nbLostCmpt, 1 ) ) || ( st->hTcxDec->tcxConceal_recalc_exc != 0 ) )
             {
-                Scale_sig( synthFB_fx - add( add( shr( st->hTcxDec->L_frameTCX, 1 ), st->hTcxDec->pit_max_TCX ), 2 * M ), add( add( shr( st->hTcxDec->L_frameTCX, 1 ), st->hTcxDec->pit_max_TCX ), 2 * M ), sub( q_syn, sub( st->Q_exc, 1 ) ) ); // 2 * q_syn - (st->Q_exc - 1)
+                Scale_sig( synthFB_fx - add( add( shr( st->hTcxDec->L_frameTCX, 1 ), st->hTcxDec->pit_max_TCX ), 2 * M ), sub( add( add( shr( st->hTcxDec->L_frameTCX, 1 ), st->hTcxDec->pit_max_TCX ), 2 * M ), 1 ), sub( q_syn, sub( st->Q_exc, 1 ) ) ); // 2 * q_syn - (st->Q_exc - 1)
             }
             ELSE
             {
-                Scale_sig( synthFB_fx - st->hTcxDec->L_frameTCX, st->hTcxDec->L_frameTCX, sub( q_syn, sub( st->Q_exc, 1 ) ) ); // 2 * q_syn - (st->Q_exc - 1)
+                Scale_sig( synthFB_fx - st->hTcxDec->L_frameTCX, sub( st->hTcxDec->L_frameTCX, 1 ), sub( q_syn, sub( st->Q_exc, 1 ) ) ); // 2 * q_syn - (st->Q_exc - 1)
             }
 
             lerp( synthFB_fx, synth_fx, st->L_frame, st->hTcxDec->L_frameTCX );
@@ -1356,7 +1330,7 @@ void ivas_mdct_core_reconstruct_fx(
 
         /* Update */
         Copy( synth_buf_fx + st->L_frame, st->hTcxDec->old_synth, st->hTcxDec->old_synth_len );
-        Copy( st->hTcxDec->old_synthFB_fx + st->hTcxDec->L_frameTCX - NS2SA( st->output_Fs, PH_ECU_MEM_NS ), st->hTcxDec->synth_history_fx, NS2SA( st->output_Fs, PH_ECU_MEM_NS ) );
+        Copy( st->hTcxDec->old_synthFB_fx + st->hTcxDec->L_frameTCX - NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ), st->hTcxDec->synth_history_fx, NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) );
         Copy( synth_bufFB_fx + st->hTcxDec->L_frameTCX, st->hTcxDec->old_synthFB_fx, st->hTcxDec->old_synth_lenFB );
         st->hTcxDec->q_old_synth = q_syn;
         st->hTcxDec->q_synth_history_fx = st->hTcxDec->q_old_synth;
@@ -1366,7 +1340,7 @@ void ivas_mdct_core_reconstruct_fx(
 
         IF( st->hHQ_core != NULL )
         {
-            Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + st->hTcxDec->old_synth_lenFB, NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
+            Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + st->hTcxDec->old_synth_lenFB, NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );
         }
 
         Copy( st->lsp_q_cng, st->old_lsp_q_cng, M );
@@ -1399,8 +1373,7 @@ void ivas_mdct_core_reconstruct_fx(
         move16();
         st->last_coder_type = st->coder_type;
         move16();
-
-        Copy_Scale_sig_16_32( x_fx_16, x_fx[ch][0], st->L_frame, sub( q_x, q_syn ) ); // q_syn -> Q_x
+        Copy_Scale_sig_16_32_no_sat( x_fx_16, x_fx[ch][0], st->L_frame, sub( q_x, q_syn ) ); // q_syn -> Q_x
     }
 
     IF( GT_16( e_sig[0], e_sig[1] ) )
@@ -1504,6 +1477,7 @@ void ivas_mdct_core_tns_ns_fx(
     move16();
 
     set32_fx( xn_buf_fx, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
+    set32_fx( sns_int_scf_fx, 0, FDNS_NPTS );
 
 
     /* TNS, ITF, IMDCT and updates */
@@ -1545,7 +1519,7 @@ void ivas_mdct_core_tns_ns_fx(
             }
 
             /* nothing to do for missing LFE */
-            continue;
+            CONTINUE;
         }
 
         FOR( k = 0; k < nSubframes[ch]; k++ )
@@ -1649,6 +1623,8 @@ void ivas_mdct_core_tns_ns_fx(
             }
             q_2 = q_x;
             move16();
+            Word16 length2 = length;
+            move16();
             sns_shape_spectrum_fx( x_fx[ch][k], &q_x, st->hTcxCfg->psychParamsCurrent, sns_int_scf_fx, q_sns_int_scf, st->hTcxCfg->psychParamsCurrent->nBins, &length );
             IF( LT_16( q_2, add( q_x, 1 ) ) ) /*scaling to q_2*/
             {
@@ -1658,7 +1634,7 @@ void ivas_mdct_core_tns_ns_fx(
             }
             ELSE /*scaling to q_x+1*/
             {
-                Scale_sig32( &x_fx[ch][k][0] + length, sub( L_spec[ch], length ), sub( add( q_x, 1 ), q_2 ) );
+                Scale_sig32( &x_fx[ch][k][0] + length, sub( length2, length ), sub( add( q_x, 1 ), q_2 ) );
                 q_x = add( q_x, 1 );
             }
             x_e[ch][k] = sub( 31, q_x );
diff --git a/lib_dec/ivas_mono_dmx_renderer.c b/lib_dec/ivas_mono_dmx_renderer_fx.c
similarity index 99%
rename from lib_dec/ivas_mono_dmx_renderer.c
rename to lib_dec/ivas_mono_dmx_renderer_fx.c
index 6ef61560148a498f11f6552809071fe80a292d56..2eb8d84dfe6a1d93e468243d1a11353fed12e82e 100644
--- a/lib_dec/ivas_mono_dmx_renderer.c
+++ b/lib_dec/ivas_mono_dmx_renderer_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,9 +34,7 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal_fx.c
similarity index 99%
rename from lib_dec/ivas_objectRenderer_internal.c
rename to lib_dec/ivas_objectRenderer_internal_fx.c
index 256ce8f96bb845a1b711fe3cd2e8b1e3ea420d05..79683e402242b8f940058eedd22252e5fec4b9fb 100644
--- a/lib_dec/ivas_objectRenderer_internal.c
+++ b/lib_dec/ivas_objectRenderer_internal_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,14 +32,12 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include <math.h>
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "debug.h"
 
 
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec_fx.c
similarity index 98%
rename from lib_dec/ivas_omasa_dec.c
rename to lib_dec/ivas_omasa_dec_fx.c
index 50921761651bd8e790087ebe28274583bcce4826..8f7da758da7383a82977c24577fb0d370dfcd1cd 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,14 +33,12 @@
 #include "options.h"
 #include <stdlib.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------------
@@ -715,22 +713,14 @@ void ivas_omasa_dirac_rend_jbm_fx(
 
     ivas_dirac_dec_render_fx( st_ivas, nchan_transport, nSamplesAsked, nSamplesRendered, nSamplesAvailable, output_f );
 
-#ifdef MSAN_FIX
     FOR( Word16 ind1 = 0; ind1 < MAX_NUM_OBJECTS; ind1++ )
-#else
-    FOR( Word16 ind1 = 0; ind1 < MAX_CICP_CHANNELS - 1; ind1++ )
-#endif // MSAN_FIX
     {
         scale_sig32( st_ivas->hIsmRendererData->prev_gains_fx[ind1], MAX_OUTPUT_CHANNELS, -1 ); // Q30 -> Q29
     }
 
     ivas_omasa_separate_object_render_jbm_fx( st_ivas, *nSamplesRendered, data_separated_objects, output_f, subframes_rendered, slots_rendered );
 
-#ifdef MSAN_FIX
     FOR( Word16 ind1 = 0; ind1 < MAX_NUM_OBJECTS; ind1++ )
-#else
-    FOR( Word16 ind1 = 0; ind1 < MAX_CICP_CHANNELS - 1; ind1++ )
-#endif // MSAN_FIX
     {
         scale_sig32( st_ivas->hIsmRendererData->prev_gains_fx[ind1], MAX_OUTPUT_CHANNELS, 1 ); // Q29 -> Q30
     }
@@ -779,7 +769,7 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm_fx(
             tc_local_fx[n] = st_ivas->hTcBuffer->tc_fx[n + 2]; // Q11
             v_multc_fixed_16( tc_local_fx[n], gain_fx, tc_local_fx[n], tcBufferSize );
 
-            delay_signal_fx( tc_local_fx[n], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer_fx[n], st_ivas->hMasaIsmData->delayBuffer_size );
+            delay_signal32_fx( tc_local_fx[n], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer_fx[n], st_ivas->hMasaIsmData->delayBuffer_size );
         }
     }
 
diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_osba_dec.c
rename to lib_dec/ivas_osba_dec_fx.c
index f9d14c995b01d9b822957779f70aa566c90dc42a..d12bf12e9f16e360e2d4acc35484188cf57be8d9 100644
--- a/lib_dec/ivas_osba_dec.c
+++ b/lib_dec/ivas_osba_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,13 +33,11 @@
 #include "options.h"
 #include <stdlib.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------*
@@ -131,8 +129,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
     const UWord16 nSamplesAsked, /* i  : number of CLDFB slots requested           */
     UWord16 *nSamplesRendered,   /* o  : number of CLDFB slots rendered            */
     UWord16 *nSamplesAvailable,  /* o  : number of CLDFB slots still to render     */
-    Word32 *output_fx[],         /* o  : rendered time signal                      Q11*/
-    Word16 out_len               /*Store the length of values in each channel*/
+    Word32 *output_fx[]          /* o  : rendered time signal                      Q11*/
 )
 {
     Word16 n;
@@ -141,6 +138,11 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
     Word32 *p_sepobj_fx[BINAURAL_CHANNELS];
     Word16 channel_offset;
 
+    FOR( Word16 i = 0; i < BINAURAL_CHANNELS; i++ )
+    {
+        set32_fx( output_separated_objects_fx[i], 0, L_FRAME48k );
+    }
+
     FOR( n = 0; n < BINAURAL_CHANNELS; n++ )
     {
         p_sepobj_fx[n] = &output_separated_objects_fx[n][0];
@@ -149,7 +151,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
     channel_offset = st_ivas->nchan_ism;
     move16();
 
-    IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, &output_fx[channel_offset], out_len ) ), IVAS_ERR_OK ) )
+    IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, &output_fx[channel_offset] ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -235,7 +237,7 @@ ivas_error ivas_osba_render_sf_fx(
         v_shr( p_output[n], Q11 - Q11, output_ism[n], nSamplesAsked ); // Q11
     }
 
-    IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailableNext, p_output, 960 ) ), IVAS_ERR_OK ) )
+    IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailableNext, p_output ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion_fx.c
similarity index 97%
rename from lib_dec/ivas_out_setup_conversion.c
rename to lib_dec/ivas_out_setup_conversion_fx.c
index 59a560f3318c21af5da8ad9b7f2a3d90fb84e8c7..93a7c204e891f5b88d5519612e7a876a70a2a320 100644
--- a/lib_dec/ivas_out_setup_conversion.c
+++ b/lib_dec/ivas_out_setup_conversion_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,13 +34,11 @@
 #include "options.h"
 #include <math.h>
 #include <assert.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_rend.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 #include "debug.h"
@@ -481,12 +479,10 @@ ivas_error ivas_ls_setup_conversion_open_fx(
         set32_fx( hLsSetUpConversion->targetEnergyPrev_fx[0], 0, MAX_SFB + 2 );
         set32_fx( hLsSetUpConversion->dmxEnergyPrev_fx[0], 0, MAX_SFB + 2 );
 
-#ifdef MSAN_FIX
         hLsSetUpConversion->te_prev_exp[0] = 0;
         hLsSetUpConversion->dmx_prev_exp[0] = 0;
         move16();
         move16();
-#endif
     }
 
     /* Initialize the DMX conversion matrix */
@@ -588,14 +584,14 @@ void ivas_ls_setup_conversion_fx(
     Decoder_Struct *st_ivas,   /* i  : IVAS decoder structure           */
     const Word16 input_chans,  /* i  : number of input channels to the renderer        */
     const Word16 output_frame, /* i  : frame length                     */
-    Word32 *input[],           /* i  : LS input/output synthesis signal Q16*/
-    Word32 *output[]           /* i/o: LS input/output synthesis signal Q16*/
+    Word32 *input[],           /* i  : LS input/output synthesis signal Qx*/
+    Word32 *output[]           /* i/o: LS input/output synthesis signal Qx*/
 )
 {
     Word16 chInIdx, chOutIdx, idx;
     LSSETUP_CONVERSION_HANDLE hLsSetUpConversion;
     Word32 dmxCoeff, tmpVal;
-    Word32 output_tmp[MAX_OUTPUT_CHANNELS][L_FRAME48k]; // Q16
+    Word32 output_tmp[MAX_OUTPUT_CHANNELS][L_FRAME48k]; // Qx
 
     push_wmops( "LS_Renderer" );
 
@@ -661,6 +657,7 @@ void ivas_ls_setup_conversion_process_mdct_fx(
     Word16 transform_type[MAX_CICP_CHANNELS][2];
     Word16 frameSize;
     Word32 targetEnergy[MAX_SFB + 2], dmxEnergy[MAX_SFB + 2];
+    Word16 dmxEnergy_exp[MAX_SFB + 2], dmxEnergy_exp_temp;
     Word32 dmxCoeff;
     Word32 dmxSignalReal[L_FRAME48k], dmxSignalImag[L_FRAME48k];
     Word32 eqGain;
@@ -743,6 +740,9 @@ void ivas_ls_setup_conversion_process_mdct_fx(
 
     set32_fx( targetEnergy, 0, MAX_SFB + 2 );
     set32_fx( dmxEnergy, 0, MAX_SFB + 2 );
+    set16_fx( dmxEnergy_exp, 0, MAX_SFB + 2 );
+    dmxEnergy_exp_temp = 0;
+    move16();
 
     FOR( chOutIdx = 0; chOutIdx < outChannels; chOutIdx++ )
     {
@@ -833,6 +833,7 @@ void ivas_ls_setup_conversion_process_mdct_fx(
         FOR( bandIdx = 0; bandIdx < hLsSetUpConversion->sfbCnt; bandIdx++ )
         {
             Word32 tmpReal, tmpImag, DMXEne;
+            Word16 DMXEne_exp;
 
             start = hLsSetUpConversion->sfbOffset[bandIdx];
             move16();
@@ -842,6 +843,8 @@ void ivas_ls_setup_conversion_process_mdct_fx(
             /* Loop over all the bins in the band */
             DMXEne = 0;
             move32();
+            DMXEne_exp = 0;
+            move16();
             FOR( binIdx = start; binIdx < stop; binIdx++ )
             {
                 tmpReal = dmxSignalReal[binIdx];
@@ -849,13 +852,20 @@ void ivas_ls_setup_conversion_process_mdct_fx(
                 tmpImag = dmxSignalImag[binIdx];
                 move32();
 
-                DMXEne = L_add( DMXEne, L_add( Mpy_32_32( tmpReal, tmpReal ), Mpy_32_32( tmpImag, tmpImag ) ) );
+                DMXEne = BASOP_Util_Add_Mant32Exp( DMXEne, DMXEne_exp, L_add( Mpy_32_32( tmpReal, tmpReal ), Mpy_32_32( tmpImag, tmpImag ) ), sub( 40, shl( q_output, 1 ) ), &DMXEne_exp );
             }
-            dmxEnergy[bandIdx] = L_add( dmxEnergy[bandIdx], DMXEne );
+            dmxEnergy[bandIdx] = BASOP_Util_Add_Mant32Exp( dmxEnergy[bandIdx], dmxEnergy_exp[bandIdx], DMXEne, DMXEne_exp, &dmxEnergy_exp[bandIdx] );
             move32();
+            dmxEnergy_exp_temp = s_max( dmxEnergy_exp_temp, dmxEnergy_exp[bandIdx] );
         }
     } /* end of out channel loop */
 
+    /* Scaling to common exponent */
+    FOR( bandIdx = 0; bandIdx < MAX_SFB + 2; bandIdx++ )
+    {
+        dmxEnergy[bandIdx] = L_shl( dmxEnergy[bandIdx], sub( dmxEnergy_exp[bandIdx], dmxEnergy_exp_temp ) );
+        move32();
+    }
     /* Step 3: Peform energy smoothing */
 
     Word16 te_scale = getScaleFactor32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );
@@ -864,13 +874,13 @@ void ivas_ls_setup_conversion_process_mdct_fx(
     scale_sig32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, dmx_sacle );
 
     Word16 te_max_e = s_max( sub( 40, shl( q_output, 1 ) ), sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) );
-    Word16 dmx_max_e = s_max( sub( 40, shl( q_output, 1 ) ), sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) );
+    Word16 dmx_max_e = s_max( dmxEnergy_exp_temp, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) );
 
     FOR( bandIdx = 0; bandIdx < hLsSetUpConversion->sfbCnt; bandIdx++ )
     {
         targetEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( targetEnergy[bandIdx], sub( te_max_e, sub( 40, shl( q_output, 1 ) ) ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], sub( te_max_e, sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) ) ) ) );
         move32();
-        dmxEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( dmxEnergy[bandIdx], sub( dmx_max_e, sub( 40, shl( q_output, 1 ) ) ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], sub( dmx_max_e, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) ) ) ) );
+        dmxEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( dmxEnergy[bandIdx], sub( dmx_max_e, dmxEnergy_exp_temp ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], sub( dmx_max_e, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) ) ) ) );
         move32();
         hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx] = targetEnergy[bandIdx]; /* te_prev_exp = 40 - 2*q_output */
         move32();
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config_fx.c
similarity index 97%
rename from lib_dec/ivas_output_config.c
rename to lib_dec/ivas_output_config_fx.c
index 64995d8a0ac9975fc5847f762be5bac13d8ed472..17999496e39f56e8b84c60feb75495912ae60951 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,7 +33,6 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_stat_dec.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
@@ -240,16 +239,6 @@ void ivas_renderer_select(
                             move16();
                         }
 
-#if 0 // def DEBUGGING  /*temp disabling this as paramMC crashes with CREND*/
-                        IF ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
-                        {
-                            *renderer_type = RENDERER_BINAURAL_MIXER_CONV;
-                        }
-                        ELSE IF ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
-                        {
-                            *renderer_type = RENDERER_BINAURAL_FASTCONV;
-                        }
-#endif
                         test();
                         IF( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )
                         {
diff --git a/lib_dec/ivas_pca_dec.c b/lib_dec/ivas_pca_dec.c
deleted file mode 100644
index 9e3fbe939c4338e66d95957265d671b0fe345df0..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_pca_dec.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include <assert.h>
-#include "ivas_cnst.h"
-#include "wmc_auto.h"
-
-
-/*-----------------------------------------------------------------------*
- * Local function definitions
- *-----------------------------------------------------------------------*/
diff --git a/lib_dec/ivas_pca_dec_fx.c b/lib_dec/ivas_pca_dec_fx.c
index 1700c25277779bb3ff25bb9da451510e2bc491ac..98611ab7cbcf9af52799eb55c91a6353ee726624 100644
--- a/lib_dec/ivas_pca_dec_fx.c
+++ b/lib_dec/ivas_pca_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,12 +32,10 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include <assert.h>
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "math.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_dec/ivas_post_proc.c b/lib_dec/ivas_post_proc_fx.c
similarity index 90%
rename from lib_dec/ivas_post_proc.c
rename to lib_dec/ivas_post_proc_fx.c
index ce361c8944e774d6b7cb85ae67db39b31de58a8d..c0e69b91663e2275b0398e4dec3439df3baf5c1b 100644
--- a/lib_dec/ivas_post_proc.c
+++ b/lib_dec/ivas_post_proc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
@@ -94,7 +92,7 @@ void ivas_post_proc_fx(
             IF( NE_16( sts[n]->core, TCX_20_CORE ) && NE_16( sts[n]->core, TCX_10_CORE ) )
             {
                 /* TCX-LTP Postfilter: used in Mode 1 to update memories and to avoid discontinuities when the past frame was TCX */
-                tcx_ltp_post32( sts[n], hTcxLtpDec, ACELP_CORE, output_frame, 0, synth, NULL, output_q );
+                tcx_ltp_post_fx32( sts[n], hTcxLtpDec, ACELP_CORE, output_frame, 0, synth, NULL, output_q );
             }
             ELSE
             {
@@ -114,10 +112,10 @@ void ivas_post_proc_fx(
                 {
                     Word16 numZeros = (Word16) ( NS2SA_FX2( output_Fs, N_ZERO_MDCT_NS ) ); /*Q0*/
                     move16();
-                    Copy32( sts[n]->hHQ_core->oldOut_fx + numZeros, sts[n]->hTcxDec->FBTCXdelayBuf_32, delay_comp ); /*Q11*/
+                    Copy32( sts[n]->hHQ_core->old_out_fx32 + numZeros, sts[n]->hTcxDec->FBTCXdelayBuf_32, delay_comp ); /*Q11*/
                 }
 
-                tcx_ltp_post32( sts[n], hTcxLtpDec, sts[n]->core, output_frame, add( NS2SA_FX2( output_Fs, ACELP_LOOK_NS ), delay_comp ), synth, sts[n]->hTcxDec->FBTCXdelayBuf_32, output_q );
+                tcx_ltp_post_fx32( sts[n], hTcxLtpDec, sts[n]->core, output_frame, add( NS2SA_FX2( output_Fs, ACELP_LOOK_NS ), delay_comp ), synth, sts[n]->hTcxDec->FBTCXdelayBuf_32, output_q );
             }
         }
     }
@@ -154,12 +152,12 @@ void ivas_post_proc_fx(
             IF( NE_16( sts[0]->core, TCX_20_CORE ) && NE_16( sts[0]->core, TCX_10_CORE ) )
             {
                 /* update memories and to avoid discontinuities when the past frame was TCX */
-                tcx_ltp_post32( sts[0], hTcxLtpDec, ACELP_CORE, output_frame, 0, output[k], NULL, output_q );
+                tcx_ltp_post_fx32( sts[0], hTcxLtpDec, ACELP_CORE, output_frame, 0, output[k], NULL, output_q );
             }
             ELSE
             {
                 /*Use channel 0 side info.*/
-                tcx_ltp_post32( sts[0], hTcxLtpDec, TCX_20_CORE, output_frame, NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ), output[k], hCPE->output_mem_fx[k], output_q );
+                tcx_ltp_post_fx32( sts[0], hTcxLtpDec, TCX_20_CORE, output_frame, NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ), output[k], hCPE->output_mem_fx[k], output_q );
             }
         }
     }
@@ -245,12 +243,6 @@ void stereo_dft_dec_core_switching_fx(
         move16();
     }
 
-#ifndef MSAN_FIX
-    IF( st->p_bpf_noise_buf_32 )
-    {
-        Scale_sig32( st->p_bpf_noise_buf_32, L_FRAME16k, sub( *q, Q11 ) );
-    }
-#endif
 
     test();
     test();
@@ -268,16 +260,14 @@ void stereo_dft_dec_core_switching_fx(
         IF( ( ( ( st->last_core != ACELP_CORE ) || ( EQ_16( st->prev_bfi, 1 ) && EQ_16( st->last_core, ACELP_CORE ) && EQ_16( st->last_con_tcx, 1 ) ) ) && NE_16( st->last_core, AMR_WB_CORE ) ) || ( sba_dirac_stereo_dtx_flag && EQ_16( st->cng_type, FD_CNG ) ) ) /* TCX / HQ-CORE -> TCX / HQ-CORE */
         {
             /* In case of a TCX to ACELP switch next frame */
-            Copy32( &output_fx[st->L_frame - NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS )], hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /*q*/
+            Copy32( &output_fx[st->L_frame - NS2SA( ( st->L_frame * FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS )], hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /*q*/
 
             /* BPF */
             test();
             test();
             IF( st->p_bpf_noise_buf_32 && NE_16( st->core, HQ_CORE ) )
             {
-#ifdef MSAN_FIX
                 Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( *q, Q11 ) ); /*q*/
-#endif
                 stereo_dft_dec_analyze_fx( hCPE, st->p_bpf_noise_buf_32, DFT_fx, 0, st->L_frame, output_frame, DFT_STEREO_DEC_ANA_BPF, 2, 0, q, q_DFT );
             }
             /* st->p_bpf_noise_buf not updated FOR HQ core -> skip analysis and set input memory to zero */
@@ -296,7 +286,7 @@ void stereo_dft_dec_core_switching_fx(
             {
                 Word16 mem_len = NS2SA_FX2( L_mult0( L_frameTCX, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ); /*Q0*/
                 move16();
-                Word32 mem_len_inv = mem_len_inv_tbl[( mem_len / 25 )];
+                Word32 mem_len_inv = mem_len_inv_tbl[( mem_len / 25 ) - 1];
                 move32();
                 Word16 qmem_len = norm_l( mem_len );
                 Word32 mem_len_fx = L_shl( mem_len, qmem_len );
@@ -311,8 +301,8 @@ void stereo_dft_dec_core_switching_fx(
                 /* Update FB input buff with hb synth FOR last delay_tdbwe sampled */
                 FOR( i = 0; i < delay_tdbwe; i++ )
                 {
-                    hCPE->input_mem_fx[0][( ( NS2SA_FX2( L_mult0( L_frameTCX, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) - delay_tdbwe ) + i )] =
-                        L_add( hCPE->input_mem_fx[0][NS2SA_FX2( L_add( L_sub( L_mult0( L_frameTCX, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ), delay_tdbwe ), i )], hb_synth_fx[i] ); /*Q11*/
+                    hCPE->input_mem_fx[0][( ( NS2SA( L_frameTCX * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) - delay_tdbwe ) + i )] =
+                        L_add( hCPE->input_mem_fx[0][NS2SA( ( ( L_frameTCX * FRAMES_PER_SEC ) - STEREO_DFT32MS_OVL_NS ) + delay_tdbwe, i )], hb_synth_fx[i] ); /*Q11*/
                     move32();
                 }
             }
@@ -321,7 +311,7 @@ void stereo_dft_dec_core_switching_fx(
                 /* Update FB input buff with hb synth FOR last delay_tdbwe sampled */
                 FOR( i = 0; i < delay_tdbwe; i++ )
                 {
-                    hCPE->input_mem_fx[0][( ( NS2SA_FX2( L_mult0( L_frameTCX, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) - delay_tdbwe ) + i )] = hb_synth_fx[i]; /*Q11*/
+                    hCPE->input_mem_fx[0][( ( NS2SA_FX2( L_frameTCX * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) - delay_tdbwe ) + i )] = hb_synth_fx[i]; /*Q11*/
                     move32();
                 }
             }
@@ -364,7 +354,7 @@ void stereo_dft_dec_core_switching_fx(
                 /* In case of TCX frames, output LB TCX is zeroed out until the end but in case of an TCX->ACELP switch, this memory is needed, hence it is backed up */
                 /* Unlike the case when DFT32MS is disabled, there is only 1 DFT analysis window, hence in the TCX frame we don't want to do a DFT analysis FOR LB TCX
                 but in a potential ACELP frame, we want the memories of the LB TCX FOR the last OLA samples so that HB analysis can be skipped */
-                Copy32( &output_fx[st->L_frame - NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS )], hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /*q*/
+                Copy32( &output_fx[st->L_frame - NS2SA_FX2( st->L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS )], hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /*q*/
 
                 /*zero the rest FOR avoiding adding contribution except the last samples which are not considered in DFT analysis (potentially used in next ACELP frame)*/
                 IF( GT_32( st->last_core_brate, SID_2k40 ) )
@@ -414,8 +404,8 @@ void stereo_dft_dec_core_switching_fx(
                 delay_comp = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ); /*Q0*/
                 move16();
 
-                Copy32( &st->hHQ_core->oldOut_fx[( nZeros - ( delay_comp + NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ) )], hCPE->input_mem_fx[0], NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /*Q11*/
-                Copy32( synth_fx, synth_tmp_fx, output_frame );                                                                                                                                                                                                    /*q*/
+                Copy32( &st->hHQ_core->old_out_fx32[nZeros - ( delay_comp + NS2SA( output_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) )], hCPE->input_mem_fx[0], NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /*Q11*/
+                Copy32( synth_fx, synth_tmp_fx, output_frame );                                                                                                                                                                                     /*q*/
 
                 Word16 mem_len;
                 mem_len = NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ); /*Q0*/
@@ -439,9 +429,7 @@ void stereo_dft_dec_core_switching_fx(
                 /* BPF */
                 IF( st->p_bpf_noise_buf_32 )
                 {
-#ifdef MSAN_FIX
                     Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( *q, Q11 ) ); /*q*/
-#endif
                     stereo_dft_dec_analyze_fx( hCPE, st->p_bpf_noise_buf_32, DFT_fx, 0, st->L_frame, output_frame, DFT_STEREO_DEC_ANA_BPF, 0, 0, q, q_DFT );
                 }
             }
@@ -458,11 +446,11 @@ void stereo_dft_dec_core_switching_fx(
                 Word32 delay_dft_dec_lb_inv = (Word32) ( calc_inv / delay_dft_dec_lb );
                 FOR( i = 0; i < delay_dft_dec_lb; i++ )
                 {
-                    hCPE->input_mem_LB_fx[0][( ( NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )] =
-                        Mpy_32_32( hCPE->input_mem_LB_fx[0][( ( NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )], L_shl( i, qdelay_dft_dec_lb ) ); /*Q11 + qdelay_dft_dec_lb -31*/
+                    hCPE->input_mem_LB_fx[0][( ( NS2SA( st->L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )] =
+                        Mpy_32_32( hCPE->input_mem_LB_fx[0][( NS2SA( st->L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i], L_shl( i, qdelay_dft_dec_lb ) ); /*Q11 + qdelay_dft_dec_lb -31*/
                     move32();
-                    hCPE->input_mem_LB_fx[0][( ( NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )] =
-                        L_shl( Mpy_32_32( hCPE->input_mem_LB_fx[0][( ( NS2SA_FX2( L_mult0( st->L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )], delay_dft_dec_lb_inv ), sub( Q31, qdelay_dft_dec_lb ) ); /*Q11*/
+                    hCPE->input_mem_LB_fx[0][( ( NS2SA( st->L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )] =
+                        L_shl( Mpy_32_32( hCPE->input_mem_LB_fx[0][( ( NS2SA( st->L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) - delay_dft_dec_lb ) + i )], delay_dft_dec_lb_inv ), sub( Q31, qdelay_dft_dec_lb ) ); /*Q11*/
                     move32();
                 }
                 stereo_dft_dec_analyze_fx( hCPE, output_fx, DFT_fx, 0, st->L_frame, output_frame, DFT_STEREO_DEC_ANA_LB, 0, 0, q, q_DFT );
@@ -470,9 +458,7 @@ void stereo_dft_dec_core_switching_fx(
                 /* BPF */
                 IF( st->p_bpf_noise_buf_32 )
                 {
-#ifdef MSAN_FIX
                     Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( *q, Q11 ) ); /*q*/
-#endif
                     stereo_dft_dec_analyze_fx( hCPE, st->p_bpf_noise_buf_32, DFT_fx, 0, st->L_frame, output_frame, DFT_STEREO_DEC_ANA_BPF, 0, 0, q, q_DFT );
                 }
 
@@ -547,9 +533,7 @@ void stereo_dft_dec_core_switching_fx(
             /* BPF */
             IF( st->p_bpf_noise_buf_32 )
             {
-#ifdef MSAN_FIX
                 Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( *q, Q11 ) ); /*q*/
-#endif
                 stereo_dft_dec_analyze_fx( hCPE, st->p_bpf_noise_buf_32, DFT_fx, 0, st->L_frame, output_frame, DFT_STEREO_DEC_ANA_BPF, 0, 0, q, q_DFT );
             }
 
@@ -603,7 +587,7 @@ void stereo_dft_dec_core_switching_fx(
             Word16 numZeros = (Word16) ( NS2SA_FX2( st->sr_core, N_ZERO_MDCT_NS ) ); /*Q0*/
             Word32 tmp_fade_fx[max( STEREO_DFT_ALLPASS_FADELEN_12k8, STEREO_DFT_ALLPASS_FADELEN_16k )];
 
-            Copy32( st->hHQ_core->old_outLB_fx + numZeros, hCPE->hStereoDft->ap_fade_mem_fx, ap_fade_len ); /*st->hHQ_core->q_old_outLB_fx*/
+            Copy32( st->hHQ_core->old_out_LB_fx32 + numZeros, hCPE->hStereoDft->ap_fade_mem_fx, ap_fade_len ); /*st->hHQ_core->q_old_outLB_fx*/
             hCPE->hStereoDft->q_ap_fade_mem_fx = st->hHQ_core->q_old_outLB_fx;
             move16();
 
@@ -721,12 +705,6 @@ void stereo_dft_dec_core_switching_fx(
         }
     }
 
-#ifndef MSAN_FIX
-    IF( st->p_bpf_noise_buf_32 )
-    {
-        Scale_sig32( st->p_bpf_noise_buf_32, L_FRAME16k, negate( sub( *q, Q11 ) ) );
-    }
-#endif
 
     return;
 }
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_qmetadata_dec.c
rename to lib_dec/ivas_qmetadata_dec_fx.c
index 434fc958df433872148cbcdbefe70e1a152112c0..c1be6caf82100f929c75342db0b7101db89fc2b4 100644
--- a/lib_dec/ivas_qmetadata_dec.c
+++ b/lib_dec/ivas_qmetadata_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,13 +35,11 @@
 #include "options.h"
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "wmc_auto.h"
-#include "prot.h"
-
 #include "prot_fx.h"
+
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
@@ -74,8 +72,7 @@ static Word16 read_coherence_data_fx( UWord16 *bitstream, Word16 *p_bit_pos, IVA
 static Word16 ivas_qmetadata_raw_decode_dir_512_fx( IVAS_QDIRECTION *q_direction, UWord16 *bitstream, Word16 *index, const Word16 nbands, const Word16 start_band, const SPHERICAL_GRID_DATA *sph_grid16 );
 static Word16 read_surround_coherence( UWord16 *bitstream, Word16 *p_bit_pos, IVAS_QMETADATA *hQMetaData );
 static ivas_error read_huf( Word16 *num_bits_read, const UWord16 *bitstream, UWord16 *out, const Word16 start_pos, const Word16 len, const Word16 *huff_code, const Word16 max_len );
-const Word16 inv_dfRatio_qsteps[9] = { 0, 0, ONE_IN_Q14, 0, 5461, 0, 0, 0, 2341 }; // Q14
-
+const Word32 inv_dfRatio_qsteps[9] = { 0, 0, ONE_IN_Q30, 0, 357913941, 0, 0, 0, 153391689 }; // Q30
 
 /*-----------------------------------------------------------------------*
  * Global function definitions
@@ -225,7 +222,7 @@ Word16 ivas_qmetadata_dec_decode(
             IF( EQ_16( hQMetaData->twoDirBands[b], 1 ) )
             {
                 Word32 diffRatio_fx, dir1ratio_fx, dir2ratio_fx;
-                Word16 dfRatio_fx;
+                Word32 dfRatio_fx;
                 Word16 dfRatio_qsteps;
 
                 diffRatio_fx = diffuseness_reconstructions_fx[hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0]]; // Q30
@@ -235,17 +232,25 @@ Word16 ivas_qmetadata_dec_decode(
                 /* already encoded as total and ratios in HO-DirAC */
                 IF( hodirac_flag )
                 {
-
-                    dfRatio_fx = usdequant_fx( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], 0 /* Q15 */, inv_dfRatio_qsteps[dfRatio_qsteps] ); // Q15
+                    dfRatio_fx = usdequant32_fx( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], 0 /* Q15 */, inv_dfRatio_qsteps[dfRatio_qsteps] ); // Q31
                     dir1ratio_fx = L_sub( ONE_IN_Q30, diffRatio_fx );
-                    dir2ratio_fx = L_shl( (Word32) dfRatio_fx, Q15 ); /*Q30*/
+                    dir2ratio_fx = L_shr( dfRatio_fx, 1 ); /*Q30*/
                 }
                 ELSE
                 {
-                    dfRatio_fx = usdequant_fx( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], shr( MAX_16, 1 ), shr( inv_dfRatio_qsteps[dfRatio_qsteps], 1 ) ); // Q15
+                    IF( EQ_16( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], sub( dfRatio_qsteps, 1 ) ) )
+                    {
+                        dfRatio_fx = MAX_32; // Q31
+                        move16();
+                        dir1ratio_fx = L_sub( ONE_IN_Q30, diffRatio_fx ); // Q30
+                    }
+                    ELSE
+                    {
+                        dfRatio_fx = usdequant32_fx( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], L_shr( MAX_32, 1 ), L_shr( inv_dfRatio_qsteps[dfRatio_qsteps], 1 ) ); // Q31
+                        dir1ratio_fx = Mpy_32_32( L_sub( ONE_IN_Q30, diffRatio_fx ), dfRatio_fx );                                                                                               // Q30
+                    }
 
-                    dir1ratio_fx = Mpy_32_16_1( L_sub( ONE_IN_Q30, diffRatio_fx ), dfRatio_fx ); // Q30
-                    dir2ratio_fx = L_sub( L_sub( ONE_IN_Q30, diffRatio_fx ), dir1ratio_fx );     // Q30
+                    dir2ratio_fx = L_sub( L_sub( ONE_IN_Q30, diffRatio_fx ), dir1ratio_fx ); // Q30
                 }
 
                 /* Requantize the 1 - dirRatio separately for each direction to obtain inverted dirRatio index. These are used in further decoding. */
@@ -1115,7 +1120,6 @@ Word16 ivas_qmetadata_dec_decode_hr_384_512(
         }
     }
 
-#ifdef MSAN_FIX
     FOR( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ )
     {
         FOR( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ )
@@ -1124,19 +1128,8 @@ Word16 ivas_qmetadata_dec_decode_hr_384_512(
             move32();
         }
     }
-#else
-    FOR( b = 0; b < MASA_MAXIMUM_CODING_SUBBANDS; b++ )
-    {
-        FOR( m = 0; m < MAX_PARAM_SPATIAL_SUBFRAMES; m++ )
-        {
-            hQMetaData->q_direction[0].band_data[b].energy_ratio_fx[m] = W_round64_L( W_nrg_ratio[0][b][m] );
-            move32();
-        }
-    }
-#endif // MSAN_FIX
     IF( EQ_32( hQMetaData->no_directions, 2 ) )
     {
-#ifdef MSAN_FIX
         FOR( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ )
         {
             FOR( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ )
@@ -1145,16 +1138,6 @@ Word16 ivas_qmetadata_dec_decode_hr_384_512(
                 move32();
             }
         }
-#else
-        FOR( b = 0; b < MASA_MAXIMUM_CODING_SUBBANDS; b++ )
-        {
-            FOR( m = 0; m < MAX_PARAM_SPATIAL_SUBFRAMES; m++ )
-            {
-                hQMetaData->q_direction[1].band_data[b].energy_ratio_fx[m] = W_round64_L( W_nrg_ratio[1][b][m] );
-                move32();
-            }
-        }
-#endif // MSAN_FIX
     }
     /* Store status information for renderer use */
     hQMetaData->ec_flag = 0;
@@ -3258,7 +3241,8 @@ static Word16 read_truncGR_azimuth_fx(
     move16();
     IF( LE_16( allowed_bits, add( no_subframes, 1 ) ) )
     {
-        FOR( i = 0; i < min( allowed_bits, no_subframes ); i++ )
+        Word16 len = s_min( allowed_bits, no_subframes );
+        FOR( i = 0; i < len; i++ )
         {
             IF( bitstream[( *pbit_pos )--] == 0 )
             {
diff --git a/lib_dec/ivas_qspherical_dec.c b/lib_dec/ivas_qspherical_dec_fx.c
similarity index 97%
rename from lib_dec/ivas_qspherical_dec.c
rename to lib_dec/ivas_qspherical_dec_fx.c
index 446c64b6cd63c9277311d1ee9a80a9448ea56c8e..f6ac39a99f081d7fc2a3d63802bb9983abe5bc7c 100644
--- a/lib_dec/ivas_qspherical_dec.c
+++ b/lib_dec/ivas_qspherical_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_dec.h"
 #include "wmc_auto.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_dec/ivas_range_uni_dec.c b/lib_dec/ivas_range_uni_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_range_uni_dec.c
rename to lib_dec/ivas_range_uni_dec_fx.c
index 3da244dd875ca003fc9ffdfedf8c716b23b3241f..9a49680e874a2d665b7ba37e3e0c2c47334cc18a 100644
--- a/lib_dec/ivas_range_uni_dec.c
+++ b/lib_dec/ivas_range_uni_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,17 +31,15 @@
 *******************************************************************************************************/
 
 #include <assert.h>
-#include "ivas_prot.h"
 #include "ivas_cnst.h"
 #include "ivas_stat_dec.h"
 #include "cnst.h"
 #include "rom_com.h"
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*
diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c
index e7324617670fe378a713259a12a88020f3c34604..6f75230c9510b987af703f417b2b20e655e107f7 100644
--- a/lib_dec/ivas_rom_dec.c
+++ b/lib_dec/ivas_rom_dec.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -100,7 +100,7 @@ const Word32 dft_ap_gains_fx[5][3] =
     { 644245094, -644245120, 1073741824 }
 };
 
-const int16_t dft_ap_delays[3][3] =
+const Word16 dft_ap_delays[3][3] =
 {
     { 2, 47, 61},
     {29, 41, 73},
@@ -196,7 +196,7 @@ const Word16 dft_win_8k_fx[70] =
  * stereo CNA tables
  *------------------------------------------------------------------------*/
 
-const int16_t cna_init_bands[CNA_INIT_NBANDS + 1] =
+const Word16 cna_init_bands[CNA_INIT_NBANDS + 1] =
 {
     1, 4, 14, 33, 67, 171, 320
 };
@@ -235,7 +235,7 @@ const Word16 min_smooth_gains2_fx[SBA_DIRAC_STEREO_NUM_BANDS] =
  /* all the "probability" tables for the actual AC are in the reversed cumulative counts table format;
     for example, given the counts table [c0 | c1 | c2 | c3] with c0 + c1 + c2 + c3 = 2 ^ 14, the reversed cumulative
     counts table is [2 ^ 14 | 2 ^ 14 - c0 | 2 ^ 14 - c0 - c1 | 2 ^ 14 - c0 - c1 - c2 | 2 ^ 14 - c0 - c1 - c2 - c3] */
-const uint16_t cum_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][1 + ECSQ_PARAM_COUNT] =
+const UWord16 cum_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][1 + ECSQ_PARAM_COUNT] =
 {
     {0,1024,2048,3072,4096,5120,6144,7168,8192,9216,10240,11264,12288,13312,14336,15360,16384 },
     {0,9294,16019,16213,16311,16346,16363,16371,16375,16377,16378,16379,16380,16381,16382,16383,16384 },
@@ -246,7 +246,7 @@ const uint16_t cum_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][1 + ECSQ_PARAM_COUNT]
     {0,5836,14448,15610,16267,16343,16374,16375,16376,16377,16378,16379,16380,16381,16382,16383,16384 }
 };
 
-const uint16_t sym_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][ECSQ_PARAM_COUNT] =
+const UWord16 sym_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][ECSQ_PARAM_COUNT] =
 {
     {1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024 },
     {9294,6725,194,98,35,17,8,4,2,1,1,1,1,1,1,1 },
@@ -257,7 +257,7 @@ const uint16_t sym_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][ECSQ_PARAM_COUNT] =
     {5836,8612,1162,657,76,31,1,1,1,1,1,1,1,1,1,1 }
 };
 
-const uint16_t cum_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE] =
+const UWord16 cum_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE] =
 {
     {0,6445,12725,15035,15885,16198,16313,16355,16370,16376,16378,16379,16380,16381,16382,16383,16384 },
     {0,3624,8645,11690,13537,14657,15336,15748,15998,16150,16242,16298,16332,16352,16364,16372,16384 },
@@ -276,7 +276,7 @@ const uint16_t cum_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SI
     {0,3623,6446,8644,10356,11689,12727,13536,14166,14657,15039,15337,15569,15749,15890,15999,16384 },
 };
 
-const uint16_t sym_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][ECSQ_TAB_VALS_SIZE] =
+const UWord16 sym_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][ECSQ_TAB_VALS_SIZE] =
 {
     {6445,6280,2310,850,313,115,42,15,6,2,1,1,1,1,1,1 },
     {3624,5021,3045,1847,1120,679,412,250,152,92,56,34,20,12,8,12 },
@@ -295,59 +295,59 @@ const uint16_t sym_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][ECSQ_TAB_VALS_SIZE]
     {3623,2823,2198,1712,1333,1038,809,630,491,382,298,232,180,141,109,385 },
 };
 
-const uint16_t cum_freq_ECSQ_tab_abs_1bit[1 + 2] =
+const UWord16 cum_freq_ECSQ_tab_abs_1bit[1 + 2] =
 {
     0, 5462, 16384
 };
 
 /* table for uniform coding of absolute values in {0, +-1, +-2, +-3} */
-const uint16_t cum_freq_ECSQ_tab_abs_2bit[1 + 4] =
+const UWord16 cum_freq_ECSQ_tab_abs_2bit[1 + 4] =
 {
     0, 2338, 7020, 11702, 16384
 };
 
 /* table for uniform coding of absolute values in {0, +-1, ..., +-7} */
-const uint16_t cum_freq_ECSQ_tab_abs_3bit[1 + 8] =
+const UWord16 cum_freq_ECSQ_tab_abs_3bit[1 + 8] =
 {
     0, 1096, 3280, 5464, 7648, 9832, 12016, 14200, 16384
 };
 
 /* table for uniform coding of absolute values in {0, +-1, ..., +-15} */
-const uint16_t cum_freq_ECSQ_tab_abs_4bit[1 + 16] =
+const UWord16 cum_freq_ECSQ_tab_abs_4bit[1 + 16] =
 {
     0, 514, 1572, 2630, 3688, 4746, 5804, 6862, 7920, 8978, 10036, 11094, 12152, 13210, 14268, 15326, 16384
 };
 
-const uint16_t sym_freq_ECSQ_tab_abs_1bit[2] =
+const UWord16 sym_freq_ECSQ_tab_abs_1bit[2] =
 {
     5462, 10922
 };
 
 /* table for uniform coding of absolute values in {0, +-1, +-2, +-3} */
-const uint16_t sym_freq_ECSQ_tab_abs_2bit[4] =
+const UWord16 sym_freq_ECSQ_tab_abs_2bit[4] =
 {
     2338, 4682, 4682, 4682
 };
 
 /* table for uniform coding of absolute values in {0, +-1, ..., +-7} */
-const uint16_t sym_freq_ECSQ_tab_abs_3bit[8] =
+const UWord16 sym_freq_ECSQ_tab_abs_3bit[8] =
 {
     1096, 2184, 2184, 2184, 2184, 2184, 2184, 2184
 };
 
 /* table for uniform coding of absolute values in {0, +-1, ..., +-15} */
-const uint16_t sym_freq_ECSQ_tab_abs_4bit[16] =
+const UWord16 sym_freq_ECSQ_tab_abs_4bit[16] =
 {
     514, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058
 };
 
 /* array of tables for uniform coding of absolute values */
-const uint16_t * const cum_freq_ECSQ_tab_abs_lsbs[1 + 4] =
+const UWord16 * const cum_freq_ECSQ_tab_abs_lsbs[1 + 4] =
 {
     NULL, cum_freq_ECSQ_tab_abs_1bit, cum_freq_ECSQ_tab_abs_2bit, cum_freq_ECSQ_tab_abs_3bit, cum_freq_ECSQ_tab_abs_4bit
 };
 
-const uint16_t * const sym_freq_ECSQ_tab_abs_lsbs[1 + 4] =
+const UWord16 * const sym_freq_ECSQ_tab_abs_lsbs[1 + 4] =
 {
     NULL, sym_freq_ECSQ_tab_abs_1bit, sym_freq_ECSQ_tab_abs_2bit, sym_freq_ECSQ_tab_abs_3bit, sym_freq_ECSQ_tab_abs_4bit
 };
@@ -391,7 +391,7 @@ const Word32 dmxmtx_table_fx[BINAURAL_CHANNELS][11] =
  *-----------------------------------------------------------------------*/
 
 /* Alpha Fine Huffman table df0 */
-static const int16_t huff_nodes_first_band_alpha[32][2] =
+static const Word16 huff_nodes_first_band_alpha[32][2] =
 {
     { -17, 1 },
     { 3, 2 },
@@ -428,7 +428,7 @@ static const int16_t huff_nodes_first_band_alpha[32][2] =
 };
 
 /* Alpha Fine Huffman table df */
-static const int16_t huff_nodes_alpha_1D_DF[64][2] =
+static const Word16 huff_nodes_alpha_1D_DF[64][2] =
 {
     { -33, 1 },
     { 3, 2 },
@@ -497,7 +497,7 @@ static const int16_t huff_nodes_alpha_1D_DF[64][2] =
 };
 
 /* Alpha Fine Huffman table dt */
-static const int16_t huff_nodes_alpha_1D_DT[64][2] = 
+static const Word16 huff_nodes_alpha_1D_DT[64][2] = 
 {
     { -33, 1 },
     { -34, 2 },
@@ -566,19 +566,19 @@ static const int16_t huff_nodes_alpha_1D_DT[64][2] =
 };
 
 /* Beta Fine Huffman table df0 */
-static const int16_t huff_nodes_first_band_beta[8][2] =
+static const Word16 huff_nodes_first_band_beta[8][2] =
 { 
     { -1, 1 }, { -2, 2 }, { -3, 3 }, { -4, 4 }, { -5, 5 }, { -6, 6 }, { -7, 7 }, { -8, -9 } 
 };
 
 /* Beta Fine Huffman table df */
-static const int16_t huff_nodes_beta_1D_DF[16][2] =
+static const Word16 huff_nodes_beta_1D_DF[16][2] =
 { 
     { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 
 };
 
 /* Beta Fine Huffman table dt */
-static const int16_t huff_nodes_beta_1D_DT[16][2] =
+static const Word16 huff_nodes_beta_1D_DT[16][2] =
 { 
     { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 
 };
diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h
index e79c50856f2c926367dcd465e39efa88220f3b8e..84c1a94a07d72577dc9dcafdef45974da14bc540 100644
--- a/lib_dec/ivas_rom_dec.h
+++ b/lib_dec/ivas_rom_dec.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -53,7 +53,7 @@ extern const Word16 dft_alpha_s2_b2_fx[STEREO_DFT_BAND_MAX];
 extern const Word32 dft_bpf_weights_fx[];
 extern const Word32 dft_ap_gains_fx[5][3];
 
-extern const int16_t dft_ap_delays[3][3];
+extern const Word16 dft_ap_delays[3][3];
 extern const Word16 dft_win232ms_8k_fx[75];
 extern const Word16 dft_win232ms_12k8_fx[120];
 extern const Word16 dft_win232ms_16k_fx[150];
@@ -62,7 +62,7 @@ extern const Word16 dft_win232ms_48k_fx[450];
 extern const Word16 dft_res_pred_weights_fx[][STEREO_DFT_BAND_MAX];
 extern const Word16 dft_win_8k_fx[70];
 
-extern const int16_t cna_init_bands[CNA_INIT_NBANDS + 1];
+extern const Word16 cna_init_bands[CNA_INIT_NBANDS + 1];
 
 
 extern const Word16 min_smooth_gains1_fx[SBA_DIRAC_STEREO_NUM_BANDS];
@@ -74,12 +74,12 @@ extern const Word16 max_smooth_gains2_fx[SBA_DIRAC_STEREO_NUM_BANDS];
  * ECLVQ Stereo ROM tables
  *----------------------------------------------------------------------------------*/
 
-extern const uint16_t cum_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][1 + ECSQ_PARAM_COUNT];
-extern const uint16_t sym_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][ECSQ_PARAM_COUNT];
-extern const uint16_t cum_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE];
-extern const uint16_t sym_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][ECSQ_TAB_VALS_SIZE];
-extern const uint16_t *const cum_freq_ECSQ_tab_abs_lsbs[1 + 4];
-extern const uint16_t *const sym_freq_ECSQ_tab_abs_lsbs[1 + 4];
+extern const UWord16 cum_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][1 + ECSQ_PARAM_COUNT];
+extern const UWord16 sym_freq_ECSQ_tab_param[ECSQ_CONFIG_COUNT][ECSQ_PARAM_COUNT];
+extern const UWord16 cum_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE];
+extern const UWord16 sym_freq_ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][ECSQ_TAB_VALS_SIZE];
+extern const UWord16 *const cum_freq_ECSQ_tab_abs_lsbs[1 + 4];
+extern const UWord16 *const sym_freq_ECSQ_tab_abs_lsbs[1 + 4];
 
 
 /*----------------------------------------------------------------------------------*
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec_fx.c
similarity index 98%
rename from lib_dec/ivas_sba_dec.c
rename to lib_dec/ivas_sba_dec_fx.c
index e27bc063809994fe3b4b035f7e2632c97890831d..c8c3d80a533e987ba40c0a3a6047d47e130e174e 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,16 +35,14 @@
 #include "options.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include <math.h>
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 /*-------------------------------------------------------------------*
  * ivas_sba_set_cna_cng_flag()
  *
@@ -223,7 +221,7 @@ ivas_error ivas_sba_dec_reconfigure_fx(
         }
 
         /* determine new granularity */
-        granularity_new = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); /*Q0*/
+        granularity_new = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); /*Q0*/
         move16();
 
         /* this will change anyway only with binaural */
@@ -351,7 +349,8 @@ ivas_error ivas_sba_dec_reconfigure_fx(
         test();
         test();
         test();
-        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )
+        test();
+        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) )
         {
             IF( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )
             {
@@ -870,8 +869,7 @@ ivas_error ivas_sba_dec_render_fx(
     const UWord16 nSamplesAsked,    /* i  : number of CLDFB slots requested           Q0*/
     UWord16 *nSamplesRendered,      /* o  : number of CLDFB slots rendered            Q0*/
     UWord16 *nSamplesAvailableNext, /* o  : number of CLDFB slots still to render     Q0*/
-    Word32 *output_fx[],            /* o  : rendered time signal                      Q11*/
-    Word16 out_len                  /*Store the length of values in each channel*/
+    Word32 *output_fx[]             /* o  : rendered time signal                      Q11*/
 )
 {
     Word16 slots_to_render, first_sf, last_sf, subframe_idx;
@@ -880,11 +878,8 @@ ivas_error ivas_sba_dec_render_fx(
     SPAR_DEC_HANDLE hSpar;
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
     Word32 *output_f_local_fx[MAX_OUTPUT_CHANNELS];
-    Word16 output_f_local_len;
     ivas_error error;
 
-    output_f_local_len = out_len;
-    move16();
     hSpar = st_ivas->hSpar;
     hSpatParamRendCom = st_ivas->hSpatParamRendCom;
     nchan_internal = ivas_sba_get_nchan_metadata_fx( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
@@ -916,13 +911,11 @@ ivas_error ivas_sba_dec_render_fx(
     {
         Word16 n_samples_sf = imult1616( slot_size, hSpar->subframe_nbslots[subframe_idx] ); /*Q0*/
 
-        ivas_spar_dec_upmixer_sf_fx( st_ivas, output_f_local_fx, nchan_internal, output_f_local_len );
+        ivas_spar_dec_upmixer_sf_fx( st_ivas, output_f_local_fx, nchan_internal );
         FOR( ch = 0; ch < nchan_out; ch++ )
         {
             output_f_local_fx[ch] = output_f_local_fx[ch] + n_samples_sf; /*Q11*/
         }
-
-        output_f_local_len = sub( output_f_local_len, n_samples_sf );
         /* update combined orientation access index */
         ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );
     }
diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c
deleted file mode 100644
index 15a652bc12b8ff52235e2fd1b3b991bf91e0ce54..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_sba_dirac_stereo_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include <math.h>
-#include "options.h"
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
-#include "ivas_rom_com.h"
-#include "ivas_rom_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
index 216888fbe0a87dbe439801dfacb57441400b2bad..50db27aa582f0d7dec9e9b9476a4eb334160d820 100644
--- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
+++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,7 +35,6 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
@@ -726,12 +725,10 @@ static void ivas_sba_dirac_stereo_compute_td_stefi_nrgs(
     ELSE
     {
         set32_fx( hStereoDft->hb_stefi_sig_fx + hStereoDft->hb_stefi_delay, 0, output_frame );
-#ifdef MSAN_FIX
         hStereoDft->hb_nrg_subr_fx[0] = 0;
         move32();
         hStereoDft->hb_nrg_subr_fx[1] = 0;
         move32();
-#endif // MSAN_FIX
     }
     hStereoDft->hb_nrg_subr_fx[0] = hStereoDft->hb_nrg_subr_fx[0]; // imult3216(hStereoDft->hb_nrg_subr_fx[0] , shr(hStereoDft->NFFT, 1)); /*hStereoDft->q_hb_nrg_subr*/
     move32();
@@ -1241,6 +1238,11 @@ void ivas_sba_dirac_stereo_dec_fx(
     CPE_DEC_HANDLE hCPE;
     STEREO_DFT_DEC_DATA_HANDLE hStereoDft;
 
+    FOR( Word16 i = 0; i < CPE_CHANNELS; i++ )
+    {
+        set32_fx( DFT[i], 0, STEREO_DFT_BUF_MAX );
+    }
+
     hSCE = st_ivas->hSCE[0];
     hCPE = st_ivas->hCPE[0];
     hStereoDft = hCPE->hStereoDft;
@@ -1251,18 +1253,10 @@ void ivas_sba_dirac_stereo_dec_fx(
     q_dft[1] = hCPE->hStereoDft->q_dft;
     move16();
 
-#ifdef MSAN_FIX
     Scale_sig32( hCPE->prev_hb_synth_fx[0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), negate( sub( Q11, hCPE->hStereoDft->q_dft ) ) ); /*hSCE->q_prev_hb_synth_fx + hCPE->hStereoDft->q_dft - Q11*/
-#else
-    Scale_sig32( hCPE->prev_hb_synth_fx[0], NS2SA_FX2( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), -( Q11 - hCPE->hStereoDft->q_dft ) );
-#endif
     IF( hSCE != NULL )
     {
-#ifdef MSAN_FIX
         Scale_sig32( hSCE->prev_hb_synth_fx, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), negate( sub( Q11, hCPE->hStereoDft->q_dft ) ) ); /*hSCE->q_prev_hb_synth_fx + hCPE->hStereoDft->q_dft - Q11*/
-#else
-        Scale_sig32( hSCE->prev_hb_synth_fx, NS2SA_FX2( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), -( Q11 - hCPE->hStereoDft->q_dft ) );
-#endif // MSAN_FIX
         hSCE->q_prev_hb_synth_fx = hCPE->hStereoDft->q_dft;
         move16();
     }
@@ -1286,7 +1280,7 @@ void ivas_sba_dirac_stereo_dec_fx(
     sba_mono_flag = (Word16) EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 );
     move16();
 
-    memOffset = NS2SA( L_mult0( output_frame, FRAMES_PER_SEC ), IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS );
+    memOffset = NS2SA_FX2( L_mult0( output_frame, FRAMES_PER_SEC ), IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS );
     move16();
 
     ivas_sba_dirac_stereo_config( hStereoDft->hConfig );
@@ -1392,18 +1386,10 @@ void ivas_sba_dirac_stereo_dec_fx(
         set32_fx( output[ch], 0, output_frame );
     }
 
-#ifdef MSAN_FIX
     Scale_sig32( hCPE->prev_hb_synth_fx[0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); /*hSCE->q_prev_hb_synth_fx + Q11 - hCPE->hStereoDft->q_dft*/
-#else
-    Scale_sig32( hCPE->prev_hb_synth_fx[0], NS2SA_FX2( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), ( Q11 - hCPE->hStereoDft->q_dft ) );
-#endif
     IF( hSCE != NULL )
     {
-#ifdef MSAN_FIX
         Scale_sig32( hSCE->prev_hb_synth_fx, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); /*hSCE->q_prev_hb_synth_fx + Q11 - hCPE->hStereoDft->q_dft*/
-#else
-        Scale_sig32( hSCE->prev_hb_synth_fx, NS2SA_FX2( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ), ( Q11 - hCPE->hStereoDft->q_dft ) );
-#endif // MSAN_FIX
         hSCE->q_prev_hb_synth_fx = Q11;
         move16();
     }
diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal_fx.c
similarity index 99%
rename from lib_dec/ivas_sba_rendering_internal.c
rename to lib_dec/ivas_sba_rendering_internal_fx.c
index 7cc1ebbb64f5aa976d04064211d12818c4f40b21..bbe63e965c4dd80be1cedec78bd8365bdd4b3a92 100644
--- a/lib_dec/ivas_sba_rendering_internal.c
+++ b/lib_dec/ivas_sba_rendering_internal_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,15 +32,13 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_dec.h"
 #include "ivas_cnst.h"
 #include <math.h>
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #ifdef DEBUGGING
 #include "debug.h"
 #endif
@@ -321,7 +319,7 @@ Word16 ivas_sba_remapTCs_fx(
             Copy32( sba_data_fx[2], sba_data_fx[3], output_frame ); /*Q11*/
         }
     }
-    IF( GT_16( st_ivas->nchan_transport, 3 ) )
+    IF( GE_16( st_ivas->nchan_transport, 3 ) )
     {
         Word16 i = 0;
         move16();
diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c
deleted file mode 100644
index 0bee68afb331e2885b43ca4c13a5210986ee82d1..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_sce_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_sce_dec_fx.c b/lib_dec/ivas_sce_dec_fx.c
index 6c22b3a987ecbca7d83fc600b3be810cbf5bf1b6..6e1893015fec3992e084426df2874572579b5d15 100644
--- a/lib_dec/ivas_sce_dec_fx.c
+++ b/lib_dec/ivas_sce_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,9 +36,7 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
@@ -320,13 +318,13 @@ ivas_error ivas_sce_dec_fx(
          * LB synthesis synchronization between IVAS formats
          *----------------------------------------------------------------*/
 
-        delay_signal_fx( output[0], output_frame, st->prev_synth_buffer32_fx, NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS ) );
+        delay_signal32_fx( output[0], output_frame, st->prev_synth_buffer32_fx, NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS ) );
 
         /*----------------------------------------------------------------*
          * HB synthesis synchronization between IVAS formats
          *----------------------------------------------------------------*/
 
-        delay_signal_fx( outputHB[0], output_frame, hSCE->prev_hb_synth_fx, NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ) );
+        delay_signal32_fx( outputHB[0], output_frame, hSCE->prev_hb_synth_fx, NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ) );
 
         /*----------------------------------------------------------------*
          * output LB and HB mix
@@ -410,8 +408,6 @@ ivas_error create_sce_dec(
     move16();
     st->is_ism_format = 0;
     move16();
-    st->ivas_format = st_ivas->ivas_format;
-    move16();
 
     test();
     if ( EQ_16( (Word16) st_ivas->ivas_format, ISM_FORMAT ) || EQ_16( (Word16) st_ivas->ivas_format, MASA_ISM_FORMAT ) )
@@ -440,7 +436,7 @@ ivas_error create_sce_dec(
 
     IF( EQ_16( (Word16) st_ivas->ivas_format, SBA_FORMAT ) && ( EQ_16( (Word16) st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) || ( EQ_16( (Word16) st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && EQ_16( st_ivas->nchan_transport, 1 ) ) ) )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -458,7 +454,7 @@ ivas_error create_sce_dec(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) );
         }
 
-        td_cng_dec_init_ivas_fx( st );
+        td_cng_dec_init_fx( st );
     }
 
     /*-----------------------------------------------------------------*
diff --git a/lib_dec/ivas_sns_dec.c b/lib_dec/ivas_sns_dec.c
deleted file mode 100644
index 7823d2f7c8616a2abf5a3732c190876a6f32cb4b..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_sns_dec.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "ivas_rom_com.h"
-#include "ivas_cnst.h"
-#include <math.h>
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_sns_dec_fx.c b/lib_dec/ivas_sns_dec_fx.c
index 0451aad08b7a14b047d1f6f290fcbffca0f8f7e4..3bc6d337e9d57924af5fffa7957ceac12ecb2d4d 100644
--- a/lib_dec/ivas_sns_dec_fx.c
+++ b/lib_dec/ivas_sns_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten FORschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,14 +32,12 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_cnst.h"
 #include <math.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 #include "ivas_prot_fx.h"
 
@@ -374,7 +372,7 @@ void dequantize_sns_fx(
                 IF( zero_side_flag[k] )
                 {
                     set32_fx( snsQ_fx, 0, M );
-                    continue;
+                    CONTINUE;
                 }
 
                 nStages = SNS_MSVQ_NSTAGES_SIDE;
diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder_fx.c
similarity index 92%
rename from lib_dec/ivas_spar_decoder.c
rename to lib_dec/ivas_spar_decoder_fx.c
index fdace42d822ae5e85b084285873d70df63bad336..29a307425a79cc30eb962a6a5259b245e4dd6c60 100644
--- a/lib_dec/ivas_spar_decoder.c
+++ b/lib_dec/ivas_spar_decoder_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,17 +35,15 @@
 #include <assert.h>
 #include "options.h"
 #include "ivas_stat_dec.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "string.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "ivas_stat_com.h"
 #include "stat_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #ifdef DEBUGGING
 #include "debug.h"
@@ -789,8 +787,11 @@ void ivas_spar_get_cldfb_gains_fx(
 
         cldfbAnalysis_ts_fx_fixed_q( ts_inout_fx, ts_re_fx, ts_im_fx, num_cldfb_bands, cldfbAnaDec0, &q_cldfb );
         cldfb_reset_memory_fx( cldfbSynDec0 );
-        cldfbSynthesis_ivas_fx( pp_ts_re_fx, pp_ts_im_fx, ts_inout_fx, num_cldfb_bands, cldfbSynDec0 );
-
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+        cldfbSynthesis_ivas_fx( pp_ts_re_fx, pp_ts_im_fx, ts_inout_fx, num_cldfb_bands, 0, 0, cldfbSynDec0 );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+        cldfbSynthesis_ivas_fx( pp_ts_re_fx, pp_ts_im_fx, ts_inout_fx, num_cldfb_bands, 0, cldfbSynDec0 );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
         FOR( sample = 0; sample < stride; sample++ )
         {
             T_fx[( ( slot * stride ) + sample )][slot] = ts_inout_fx[sample]; /*Q21*/
@@ -1160,6 +1161,8 @@ void ivas_spar_get_parameters_fx(
 
     split_band = SPAR_DIRAC_SPLIT_START_BAND;
     move16();
+    Word16 add_weight_fx = sub( MAX_WORD16, weight_fx );
+    Word16 add_weight_20ms_fx = sub( MAX_WORD16, weight_20ms_fx );
     FOR( spar_band = 0; spar_band < num_spar_bands; spar_band++ )
     {
         FOR( out_ch = 0; out_ch < num_ch_out; out_ch++ )
@@ -1174,9 +1177,8 @@ void ivas_spar_get_parameters_fx(
                 {
                     IF( GT_16( hSpar->i_subframe, 3 ) )
                     {
-
-                        par_mat_fx[out_ch][in_ch][spar_band] = L_add_sat( Mpy_32_16_1( hSpar->hMdDec->mixer_mat_prev_fx[ts0][out_ch][in_ch][spar_band], sub( MAX_WORD16, weight_fx ) ),
-                                                                          Mpy_32_16_1( hSpar->hMdDec->mixer_mat_prev_fx[ts1][out_ch][in_ch][spar_band], weight_fx ) ); /*hSpar->hMdDec->Q_mixer_mat*/
+                        par_mat_fx[out_ch][in_ch][spar_band] = Madd_32_16( Mpy_32_16_1( hSpar->hMdDec->mixer_mat_prev_fx[ts1][out_ch][in_ch][spar_band], weight_fx ),
+                                                                           hSpar->hMdDec->mixer_mat_prev_fx[ts0][out_ch][in_ch][spar_band], add_weight_fx );
                         move32();
                     }
                     ELSE
@@ -1193,7 +1195,8 @@ void ivas_spar_get_parameters_fx(
                     /* 20ms Transport channel reconstruction with matching encoder/decoder processing */
                     Word16 prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */
                     move16();
-                    par_mat_fx[out_ch][in_ch][spar_band] = L_add_sat( Mpy_32_16_1( hSpar->hMdDec->mixer_mat_prev_fx[prev_idx][out_ch][in_ch][spar_band], sub( MAX_WORD16, weight_20ms_fx ) ), Mpy_32_16_1( hSpar->hMdDec->mixer_mat_fx[out_ch][in_ch][spar_band], weight_20ms_fx ) ); /*hSpar->hMdDec->Q_mixer_mat*/
+                    par_mat_fx[out_ch][in_ch][spar_band] = Madd_32_16( Mpy_32_16_1( hSpar->hMdDec->mixer_mat_prev_fx[prev_idx][out_ch][in_ch][spar_band], add_weight_20ms_fx ),
+                                                                       hSpar->hMdDec->mixer_mat_fx[out_ch][in_ch][spar_band], weight_20ms_fx ); /*hSpar->hMdDec->Q_mixer_mat*/
                     move32();
                 }
             }
@@ -1353,9 +1356,9 @@ static void ivas_spar_calc_smooth_facs_fx(
             smooth_long_avg_fx[b] = L_add( smooth_long_avg_fx[b], smooth_buf_fx[b][i] ); // Q0
             move32();
         }
-        smooth_short_avg_fx[b] = Mpy_32_16_1( smooth_short_avg_fx[b], 5461 /*(1/6 in Q15)*/ ); // Q0
+        smooth_short_avg_fx[b] = Mpy_32_32( smooth_short_avg_fx[b], 357913941 /*(1/6 in Q31)*/ ); // Q0
         move32();
-        smooth_long_avg_fx[b] = Mpy_32_16_1( smooth_long_avg_fx[b], 1639 /*(1/20 in Q15)*/ ); // Q0
+        smooth_long_avg_fx[b] = Mpy_32_32( smooth_long_avg_fx[b], 107374182 /*(1/20 in Q31)*/ ); // Q0
         move32();
 
         /* calculate smoothing factor based on energy averages */
@@ -1665,10 +1668,10 @@ void ivas_spar_dec_digest_tc_fx(
  *-------------------------------------------------------------------*/
 
 void ivas_spar_dec_upmixer_sf_fx(
-    Decoder_Struct *st_ivas,     /* i/o: IVAS decoder handle                     */
-    Word32 *output_fx[],         /* o  : output audio channels                   Q11*/
-    const Word16 nchan_internal, /* i  : number of internal channels             Q0*/
-    Word16 out_len )
+    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder handle                     */
+    Word32 *output_fx[],        /* o  : output audio channels                   Q11*/
+    const Word16 nchan_internal /* i  : number of internal channels             Q0*/
+)
 {
     Word16 cldfb_band, num_cldfb_bands, numch_in, numch_out;
     Word32 *cldfb_in_ts_re_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX];
@@ -1687,8 +1690,9 @@ void ivas_spar_dec_upmixer_sf_fx(
     SPAR_DEC_HANDLE hSpar;
     Word16 num_md_sub_frames;
     Word16 q1 = 30;
+    Word16 prod;
     move16();
-    push_wmops( "ivas_spar_dec_upmixer_sf" );
+    push_wmops( "ivas_spar_dec_upmixer_sf_fx" );
     hSpar = st_ivas->hSpar;
     hDecoderConfig = st_ivas->hDecoderConfig;
     nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; /*Q0*/
@@ -1706,6 +1710,8 @@ void ivas_spar_dec_upmixer_sf_fx(
     slot_idx_start = hSpar->slots_rendered; /*Q0*/
     move16();
 
+    prod = i_mult( slot_idx_start, slot_size );
+
     test();
     IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
     {
@@ -1716,7 +1722,7 @@ void ivas_spar_dec_upmixer_sf_fx(
 
         FOR( i = 0; i < nchan_internal; i++ )
         {
-            p_tc_fx[i] = st_ivas->hTcBuffer->tc_fx[( i + nchan_ism )] + i_mult( slot_idx_start, slot_size ); /*Q11*/
+            p_tc_fx[i] = st_ivas->hTcBuffer->tc_fx[( i + nchan_ism )] + prod; /*Q11*/
         }
 
         test();
@@ -1725,7 +1731,7 @@ void ivas_spar_dec_upmixer_sf_fx(
         {
             FOR( i = 0; i < nchan_ism; i++ )
             {
-                p_tc_fx[( i + nchan_internal )] = st_ivas->hTcBuffer->tc_fx[i] + i_mult( slot_idx_start, slot_size ); /*Q11*/
+                p_tc_fx[( i + nchan_internal )] = st_ivas->hTcBuffer->tc_fx[i] + prod; /*Q11*/
             }
         }
     }
@@ -1733,7 +1739,7 @@ void ivas_spar_dec_upmixer_sf_fx(
     {
         FOR( i = 0; i < nchan_internal; i++ )
         {
-            p_tc_fx[i] = st_ivas->hTcBuffer->tc_fx[i] + i_mult( slot_idx_start, slot_size ); /*Q11*/
+            p_tc_fx[i] = st_ivas->hTcBuffer->tc_fx[i] + prod; /*Q11*/
         }
     }
 
@@ -1765,9 +1771,7 @@ void ivas_spar_dec_upmixer_sf_fx(
      * Prepare CLDFB buffers
      *---------------------------------------------------------------------*/
 
-#ifdef MSAN_FIX
     set_zero_fx( &Pcm_tmp_fx[0][0], ( MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS ) * L_FRAME48k );
-#endif // MSAN_FIX
     /* set-up pointers */
     IF( NE_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) )
     {
@@ -1843,6 +1847,7 @@ void ivas_spar_dec_upmixer_sf_fx(
         ivas_spar_calc_smooth_facs_fx( cldfb_in_ts_re_fx[0], cldfb_in_ts_im_fx[0], q_cldfb, num_spar_bands, hSpar->subframe_nbslots[hSpar->subframes_rendered],
                                        hSpar->subframes_rendered == 0, &hSpar->hFbMixer->pFb->fb_bin_to_band, hSpar->hMdDec->smooth_fac_fx, hSpar->hMdDec->smooth_buf_fx );
     }
+    Word16 sh_l = sub( 31, q1 );
     FOR( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ )
     {
         md_idx = hSpar->render_to_md_map[( ts + slot_idx_start )]; /*Q0*/
@@ -1858,11 +1863,12 @@ void ivas_spar_dec_upmixer_sf_fx(
         {
             FOR( spar_band = 0; spar_band < num_spar_bands; spar_band++ )
             {
+                Word16 diff = sub( 32767, hSpar->hMdDec->smooth_fac_fx[spar_band] );
                 FOR( out_ch = 0; out_ch < numch_out; out_ch++ )
                 {
                     FOR( in_ch = 0; in_ch < numch_in; in_ch++ )
                     {
-                        mixer_mat_fx[out_ch][in_ch][spar_band] = Madd_32_16( Mpy_32_16_1( mixer_mat_fx[out_ch][in_ch][spar_band], sub( 32767, hSpar->hMdDec->smooth_fac_fx[spar_band] ) ), hSpar->hMdDec->mixer_mat_prev2_fx[out_ch][in_ch][spar_band], hSpar->hMdDec->smooth_fac_fx[spar_band] ); /*q1*/
+                        mixer_mat_fx[out_ch][in_ch][spar_band] = Madd_32_16( Mpy_32_16_1( mixer_mat_fx[out_ch][in_ch][spar_band], diff ), hSpar->hMdDec->mixer_mat_prev2_fx[out_ch][in_ch][spar_band], hSpar->hMdDec->smooth_fac_fx[spar_band] ); /*q1*/
                         move32();
                         hSpar->hMdDec->mixer_mat_prev2_fx[out_ch][in_ch][spar_band] = mixer_mat_fx[out_ch][in_ch][spar_band]; /*q1*/
                         move32();
@@ -1870,14 +1876,18 @@ void ivas_spar_dec_upmixer_sf_fx(
                 }
             }
         }
-
-        FOR( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ )
+        /* Note: This version splits the cldfb band loop into 2 loops, removing some inner-loop IF_statements */
+        Word16 min_cldf_band = s_min( CLDFB_PAR_WEIGHT_START_BAND, num_cldfb_bands );
+        Word32 out_re_fx[IVAS_SPAR_MAX_CH];
+        Word32 out_im_fx[IVAS_SPAR_MAX_CH];
+        Word32 cldfb_par_fx; /*q1*/
+        ivas_fb_bin_to_band_data_t *bin2band = &hSpar->hFbMixer->pFb->fb_bin_to_band;
+
+        /* First loop from cldfb_band=0 till min_cldf_band (CLDFB_PAR_WEIGHT_START_BAND) */
+        FOR( cldfb_band = 0; cldfb_band < min_cldf_band; cldfb_band++ )
         {
-            Word32 out_re_fx[IVAS_SPAR_MAX_CH];
-            Word32 out_im_fx[IVAS_SPAR_MAX_CH];
-            Word32 cldfb_par_fx; /*q1*/
-            ivas_fb_bin_to_band_data_t *bin2band = &hSpar->hFbMixer->pFb->fb_bin_to_band;
-
+            spar_band = bin2band->p_cldfb_map_to_spar_band[cldfb_band]; /*Q0*/
+            move16();
             FOR( out_ch = 0; out_ch < numch_out; out_ch++ )
             {
                 out_re_fx[out_ch] = 0;
@@ -1888,25 +1898,8 @@ void ivas_spar_dec_upmixer_sf_fx(
                 {
                     IF( b_skip_mat[out_ch][in_ch] == 0 )
                     {
-                        IF( LT_16( cldfb_band, CLDFB_PAR_WEIGHT_START_BAND ) ) /* tuning parameter, depends on how much SPAR Filters overlap for the CLDFB bands */
-                        {
-                            spar_band = bin2band->p_cldfb_map_to_spar_band[cldfb_band]; /*Q0*/
-                            move16();
-                            cldfb_par_fx = mixer_mat_fx[out_ch][in_ch][spar_band]; /*q1*/
-                            move32();
-                        }
-                        ELSE
-                        {
-                            cldfb_par_fx = 0;
-                            move32();
-                            FOR( spar_band = bin2band->p_spar_start_bands[cldfb_band]; spar_band < num_spar_bands; spar_band++ )
-                            {
-                                /* accumulate contributions from all SPAR bands */
-                                Word16 tmp = extract_l( L_shr( bin2band->pp_cldfb_weights_per_spar_band_fx[cldfb_band][spar_band], 7 ) ); /*Q15*/
-                                cldfb_par_fx = L_add_sat( cldfb_par_fx, Mpy_32_16_1( mixer_mat_fx[out_ch][in_ch][spar_band], tmp ) );     /*q1*/
-                            }
-                        }
-
+                        cldfb_par_fx = mixer_mat_fx[out_ch][in_ch][spar_band]; /*q1*/
+                        move32();
                         out_re_fx[out_ch] = Madd_32_32( out_re_fx[out_ch], cldfb_in_ts_re_fx[in_ch][ts][cldfb_band], cldfb_par_fx ); /*q1-25*/
                         move32();
                         out_im_fx[out_ch] = Madd_32_32( out_im_fx[out_ch], cldfb_in_ts_im_fx[in_ch][ts][cldfb_band], cldfb_par_fx ); /*q1-25*/
@@ -1914,17 +1907,56 @@ void ivas_spar_dec_upmixer_sf_fx(
                     }
                 }
             }
-
             /*update CLDFB data with the parameter-modified data*/
             FOR( out_ch = 0; out_ch < numch_out; out_ch++ )
             {
-                cldfb_in_ts_re_fx[out_ch][ts][cldfb_band] = L_shl( out_re_fx[out_ch], sub( 31, q1 ) ); /*Q=6*/
+                cldfb_in_ts_re_fx[out_ch][ts][cldfb_band] = L_shl( out_re_fx[out_ch], sh_l ); /*Q=6*/
                 move32();
-                cldfb_in_ts_im_fx[out_ch][ts][cldfb_band] = L_shl( out_im_fx[out_ch], sub( 31, q1 ) ); /*Q=6*/
+                cldfb_in_ts_im_fx[out_ch][ts][cldfb_band] = L_shl( out_im_fx[out_ch], sh_l ); /*Q=6*/
                 move32();
             }
         }
 
+
+        /* Second loop from min_cldf_band (CLDFB_PAR_WEIGHT_START_BAND) till num_cldfb_bands */
+        FOR( ; cldfb_band < num_cldfb_bands; cldfb_band++ )
+        {
+            FOR( out_ch = 0; out_ch < numch_out; out_ch++ )
+            {
+                Word32 Out_re_fx = L_add( 0, 0 );
+                Word32 Out_im_fx = L_add( 0, 0 );
+                FOR( in_ch = 0; in_ch < numch_in; in_ch++ )
+                {
+                    IF( b_skip_mat[out_ch][in_ch] == 0 )
+                    {
+                        Word64 acc = 0;
+                        move64();
+
+                        cldfb_par_fx = 0;
+                        move32();
+                        FOR( spar_band = bin2band->p_spar_start_bands[cldfb_band]; spar_band < num_spar_bands; spar_band++ )
+                        {
+                            /* accumulate contributions from all SPAR bands */
+                            acc = W_mac_32_32( acc, mixer_mat_fx[out_ch][in_ch][spar_band], bin2band->pp_cldfb_weights_per_spar_band_fx[cldfb_band][spar_band] ); // q1+ Q23
+                        }
+                        cldfb_par_fx = W_shl_sat_l( acc, -23 );                                                      // q1
+                        Out_re_fx = Madd_32_32( Out_re_fx, cldfb_in_ts_re_fx[in_ch][ts][cldfb_band], cldfb_par_fx ); /*q1-25*/
+                        Out_im_fx = Madd_32_32( Out_im_fx, cldfb_in_ts_im_fx[in_ch][ts][cldfb_band], cldfb_par_fx ); /*q1-25*/
+                    }
+                }
+                out_re_fx[out_ch] = Out_re_fx;
+                out_im_fx[out_ch] = Out_im_fx;
+            }
+
+            /*update CLDFB data with the parameter-modified data*/
+            FOR( out_ch = 0; out_ch < numch_out; out_ch++ )
+            {
+                cldfb_in_ts_re_fx[out_ch][ts][cldfb_band] = L_shl( out_re_fx[out_ch], sh_l ); /*Q=6*/
+                move32();
+                cldfb_in_ts_im_fx[out_ch][ts][cldfb_band] = L_shl( out_im_fx[out_ch], sh_l ); /*Q=6*/
+                move32();
+            }
+        }
         test();
         IF( ( EQ_16( ( add( add( slot_idx_start, ts ), 1 ) ), hSpar->num_slots ) ) || ( NE_16( ( shr( md_idx, 2 ) /* md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME */ ), ( hSpar->render_to_md_map[( ( slot_idx_start + ts ) + 1 )] / JBM_CLDFB_SLOTS_IN_SUBFRAME /*It's value is 4*/ ) ) ) )
         {
@@ -1939,10 +1971,6 @@ void ivas_spar_dec_upmixer_sf_fx(
             }
             IF( LT_16( split_band, IVAS_MAX_NUM_BANDS ) )
             {
-                Copy32( hSpar->hMdDec->mixer_mat_prev_fx[1][0][0], hSpar->hMdDec->mixer_mat_prev_fx[0][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); /*hSpar->hMdDec->Q_mixer_mat*/
-                Copy32( hSpar->hMdDec->mixer_mat_prev_fx[2][0][0], hSpar->hMdDec->mixer_mat_prev_fx[1][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); /*hSpar->hMdDec->Q_mixer_mat*/
-                Copy32( hSpar->hMdDec->mixer_mat_prev_fx[3][0][0], hSpar->hMdDec->mixer_mat_prev_fx[2][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); /*hSpar->hMdDec->Q_mixer_mat*/
-                Copy32( hSpar->hMdDec->mixer_mat_prev_fx[4][0][0], hSpar->hMdDec->mixer_mat_prev_fx[3][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); /*hSpar->hMdDec->Q_mixer_mat*/
 
                 FOR( out_ch = 0; out_ch < numch_out; out_ch++ )
                 {
@@ -1950,6 +1978,15 @@ void ivas_spar_dec_upmixer_sf_fx(
                     {
                         FOR( b = 0; b < num_spar_bands; b++ )
                         {
+                            hSpar->hMdDec->mixer_mat_prev_fx[0][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat_prev_fx[1][out_ch][in_ch][b];
+                            hSpar->hMdDec->mixer_mat_prev_fx[1][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat_prev_fx[2][out_ch][in_ch][b];
+                            hSpar->hMdDec->mixer_mat_prev_fx[2][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat_prev_fx[3][out_ch][in_ch][b];
+                            hSpar->hMdDec->mixer_mat_prev_fx[3][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat_prev_fx[4][out_ch][in_ch][b];
+                            move32();
+                            move32();
+                            move32();
+                            move32();
+
                             hSpar->hMdDec->mixer_mat_prev_fx[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat_fx[out_ch][in_ch][( b + ( md_sf * IVAS_MAX_NUM_BANDS ) )]; /*hSpar->hMdDec->Q_mixer_mat*/
                             move32();
                         }
@@ -2002,18 +2039,14 @@ void ivas_spar_dec_upmixer_sf_fx(
                 IF( ( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) || !( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) ) &&
                     !( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) )
                 {
-                    Scale_sig32( st_ivas->cldfbSynDec[idx_in]->cldfb_state_fx, st_ivas->cldfbSynDec[idx_in]->p_filter_length, -6 ); /*st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state-6*/
-                    st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state = sub( st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state, 6 );
-                    move16();
-                    Scale_sig32( output_fx[ch], out_len, -6 ); /*Q5*/
                     FOR( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ )
                     {
-                        cldfbSynthesis_ivas_fx( &cldfb_in_ts_re_fx[idx_in][ts], &cldfb_in_ts_im_fx[idx_in][ts], &output_fx[ch][i_mult( ts, num_cldfb_bands )], num_cldfb_bands, st_ivas->cldfbSynDec[idx_in] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                        cldfbSynthesis_ivas_fx( &cldfb_in_ts_re_fx[idx_in][ts], &cldfb_in_ts_im_fx[idx_in][ts], &output_fx[ch][i_mult( ts, num_cldfb_bands )], num_cldfb_bands, 6, 0, st_ivas->cldfbSynDec[idx_in] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                        cldfbSynthesis_ivas_fx( &cldfb_in_ts_re_fx[idx_in][ts], &cldfb_in_ts_im_fx[idx_in][ts], &output_fx[ch][i_mult( ts, num_cldfb_bands )], num_cldfb_bands, 6, st_ivas->cldfbSynDec[idx_in] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
                     }
-                    Scale_sig32( output_fx[ch], out_len, 6 );                                                                      /*Q11*/
-                    Scale_sig32( st_ivas->cldfbSynDec[idx_in]->cldfb_state_fx, st_ivas->cldfbSynDec[idx_in]->p_filter_length, 6 ); /*st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state+6*/
-                    st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state = add( st_ivas->cldfbSynDec[idx_in]->Q_cldfb_state, 6 );
-                    move16();
                 }
 
                 idx_in = add( idx_in, 1 );
@@ -2025,18 +2058,14 @@ void ivas_spar_dec_upmixer_sf_fx(
         /* CLDFB to time synthesis (overwrite mixer output) */
         FOR( out_ch = 0; out_ch < numch_out_dirac; out_ch++ )
         {
-            Scale_sig32( st_ivas->cldfbSynDec[out_ch]->cldfb_state_fx, st_ivas->cldfbSynDec[out_ch]->p_filter_length, -6 ); /*st_ivas->cldfbSynDec[out_ch]->Q_cldfb_state-6*/
-            st_ivas->cldfbSynDec[out_ch]->Q_cldfb_state = sub( st_ivas->cldfbSynDec[out_ch]->Q_cldfb_state, 6 );
-            move16();
-            Scale_sig32( output_fx[out_ch], out_len, -6 ); /*Q5*/
             FOR( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ )
             {
-                cldfbSynthesis_ivas_fx( &cldfb_in_ts_re_fx[out_ch][ts], &cldfb_in_ts_im_fx[out_ch][ts], &output_fx[out_ch][i_mult( ts, num_cldfb_bands )], num_cldfb_bands, st_ivas->cldfbSynDec[out_ch] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( &cldfb_in_ts_re_fx[out_ch][ts], &cldfb_in_ts_im_fx[out_ch][ts], &output_fx[out_ch][i_mult( ts, num_cldfb_bands )], num_cldfb_bands, 6, 0, st_ivas->cldfbSynDec[out_ch] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( &cldfb_in_ts_re_fx[out_ch][ts], &cldfb_in_ts_im_fx[out_ch][ts], &output_fx[out_ch][i_mult( ts, num_cldfb_bands )], num_cldfb_bands, 6, st_ivas->cldfbSynDec[out_ch] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
             }
-            Scale_sig32( output_fx[out_ch], out_len, 6 );                                                                  /*Q11*/
-            Scale_sig32( st_ivas->cldfbSynDec[out_ch]->cldfb_state_fx, st_ivas->cldfbSynDec[out_ch]->p_filter_length, 6 ); /*st_ivas->cldfbSynDec[out_ch]->Q_cldfb_state+6*/
-            st_ivas->cldfbSynDec[out_ch]->Q_cldfb_state = add( st_ivas->cldfbSynDec[out_ch]->Q_cldfb_state, 6 );
-            move16();
         }
     }
 
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_spar_md_dec.c
rename to lib_dec/ivas_spar_md_dec_fx.c
index c33c5da630e365fdd3971deec0be2392dd53f249..7f487a75c272279cbc0ab168f8116743069db676 100644
--- a/lib_dec/ivas_spar_md_dec.c
+++ b/lib_dec/ivas_spar_md_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,13 +33,11 @@
 #include <stdint.h>
 #include "options.h"
 #include "math.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include <assert.h>
 #include "wmc_auto.h"
 #include "ivas_stat_dec.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
@@ -50,11 +48,11 @@
 #define IVAS_DEFAULT_DTX_CNG_RAMP ( 8 )
 
 /* PLC constants */
-static const int16_t ivas_spar_dec_plc_num_frames_keep = 9;
-// static const int16_t ivas_spar_dec_plc_num_frames_fade_out = 9;
-static const int16_t ivas_spar_dec_plc_per_frame_ramp_down_gain_dB = 3;
-static const int16_t ivas_spar_dec_plc_max_num_frames_ramp_down = 33;
-static const int16_t ivas_spar_dec_plc_spatial_target[IVAS_SPAR_MAX_CH] = { 1, 0, 0, 0, 0, 0, 0, 0 };
+static const Word16 ivas_spar_dec_plc_num_frames_keep = 9;
+// static const Word16 ivas_spar_dec_plc_num_frames_fade_out = 9;
+static const Word16 ivas_spar_dec_plc_per_frame_ramp_down_gain_dB = 3;
+static const Word16 ivas_spar_dec_plc_max_num_frames_ramp_down = 33;
+static const Word16 ivas_spar_dec_plc_spatial_target[IVAS_SPAR_MAX_CH] = { 1, 0, 0, 0, 0, 0, 0, 0 };
 
 
 /*------------------------------------------------------------------------------------------*
@@ -937,9 +935,10 @@ Word16 ivas_spar_chk_zero_coefs_fx(
     ndm = hMdDec->spar_md_cfg.num_dmx_chans_per_band[0]; /*Q0*/
     move16();
 
-    FOR( b = 0; b < min( hMdDec->spar_md.num_bands, SPAR_DIRAC_SPLIT_START_BAND ); b++ )
+    Word16 min_bands = s_min( hMdDec->spar_md.num_bands, SPAR_DIRAC_SPLIT_START_BAND );
+    FOR( b = 0; b < min_bands; b++ )
     {
-        FOR( j = 0; j < sub( add( ndm, ndec ), 1 ); j++ )
+        FOR( j = 0; j < ( ( ndm + ndec ) - 1 ); j++ )
         {
             if ( hMdDec->spar_md.band_coeffs[b].pred_re_fx[j] != 0 )
             {
@@ -949,7 +948,7 @@ Word16 ivas_spar_chk_zero_coefs_fx(
         }
         FOR( j = 0; j < ndec; j++ )
         {
-            FOR( k = 0; k < sub( ndm, 1 ); k++ )
+            FOR( k = 0; k < ( ndm - 1 ); k++ )
             {
                 if ( hMdDec->spar_md.band_coeffs[b].C_re_fx[j][k] != 0 )
                 {
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index cf01ce54fcb68678e8891aec18b491652f22bd0d..891be05be14fd4ac5fa6f6ad7804fc53d73dac77 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -49,14 +49,14 @@
 /* State of the range decoder */
 typedef struct
 {
-    uint32_t rc_low;
-    uint32_t rc_range;
+    UWord32 rc_low;
+    UWord32 rc_range;
 
-    uint16_t *bit_buffer;
-    int16_t bit_count;
-    int16_t max_allowable_bit_count;
+    UWord16 *bit_buffer;
+    Word16 bit_count;
+    Word16 max_allowable_bit_count;
 
-    int16_t bit_error_detected;
+    Word16 bit_error_detected;
 
 } RangeUniDecState;
 
@@ -78,11 +78,11 @@ typedef struct stereo_dft_dec_data_struct
     STEREO_DFT_CONFIG_DATA_HANDLE hConfig;
 
     /*Sizes*/
-    int16_t N;    /* Size of DFT hop size */
-    int16_t NFFT; /* Size of DFT */
+    Word16 N;    /* Size of DFT hop size */
+    Word16 NFFT; /* Size of DFT */
 
     /*FFT*/
-    int16_t dft_trigo_step;
+    Word16 dft_trigo_step;
 
     const Word16 *dft_trigo_fx;      /* Q15 */
     const Word16 *dft_trigo_12k8_fx; /* Q15 */
@@ -90,13 +90,13 @@ typedef struct stereo_dft_dec_data_struct
     const Word16 *dft_trigo_8k_fx;   /* Q15 */
 
 
-    int16_t dft32ms_ovl;                            /* Overlap size */
+    Word16 dft32ms_ovl;                             /* Overlap size */
     const Word16 *win32ms_fx; /* DFT window */      /* Q15 */
     const Word16 *win32ms_12k8_fx; /* DFT window */ /* Q15 */
     const Word16 *win32ms_16k_fx; /* DFT window */  /* Q15 */
     const Word16 *win32ms_8k_fx; /* DFT window */   /* Q15 */
 
-    int16_t dft32ms_ovl2;                              /* Overlap2 size */
+    Word16 dft32ms_ovl2;                               /* Overlap2 size */
     const Word16 *win232ms_fx; /* DFT window */        /* Q15 */
     const Word16 *win232ms_12k8_fx; /* DFT window */   /* Q15 */
     const Word16 *win232ms_16k_fx; /* DFT window */    /* Q15 */
@@ -105,31 +105,31 @@ typedef struct stereo_dft_dec_data_struct
 
 
     /*Bands*/
-    int16_t band_res[STEREO_DFT_DEC_DFT_NB];
-    int16_t band_limits[STEREO_DFT_BAND_MAX + 1];
-    int16_t nbands;
+    Word16 band_res[STEREO_DFT_DEC_DFT_NB];
+    Word16 band_limits[STEREO_DFT_BAND_MAX + 1];
+    Word16 nbands;
 
     /*Configuration*/
-    int16_t prm_res[STEREO_DFT_DEC_DFT_NB];
+    Word16 prm_res[STEREO_DFT_DEC_DFT_NB];
 
     /*Stereo parameters*/
     Word32 side_gain_fx[STEREO_DFT_DEC_DFT_NB * STEREO_DFT_BAND_MAX]; /* Q31 */
-    int16_t side_gain_flag_1;
-    int16_t side_gain_flag_2;
-    int16_t side_gain_index_previous[STEREO_DFT_BAND_MAX];
-    int16_t side_gain_index[STEREO_DFT_BAND_MAX];
+    Word16 side_gain_flag_1;
+    Word16 side_gain_flag_2;
+    Word16 side_gain_index_previous[STEREO_DFT_BAND_MAX];
+    Word16 side_gain_index[STEREO_DFT_BAND_MAX];
 
     Word32 gipd_fx[STEREO_DFT_DEC_DFT_NB]; /* Q27 */
-    int16_t no_ipd_flag;                   /* flag to indicate when no IPD gets used */
+    Word16 no_ipd_flag;                    /* flag to indicate when no IPD gets used */
 
 
-    int16_t itd_xfade_counter;
-    int32_t last_active_element_brate;
-    int16_t ipd_xfade_counter;
+    Word16 itd_xfade_counter;
+    Word32 last_active_element_brate;
+    Word16 ipd_xfade_counter;
 
     /*residual prediction*/
-    int16_t res_pred_mode[STEREO_DFT_DEC_DFT_NB]; /* residual prediction mode: 0(off), 1(stereo filling only), 2(enhanced stereo filling) */
-    Word32 itd_fx[STEREO_DFT_DEC_DFT_NB];         /* Q15 */
+    Word16 res_pred_mode[STEREO_DFT_DEC_DFT_NB]; /* residual prediction mode: 0(off), 1(stereo filling only), 2(enhanced stereo filling) */
+    Word32 itd_fx[STEREO_DFT_DEC_DFT_NB];        /* Q15 */
 
     Word32 itd_xfade_step_fx;   /* Q15 */
     Word32 itd_xfade_target_fx; /* Q15 */
@@ -139,19 +139,19 @@ typedef struct stereo_dft_dec_data_struct
     Word32 ipd_xfade_step_fx;                                                                                        /* Q27 */
     Word32 ipd_xfade_prev_fx;                                                                                        /* Q27 */
     Word32 res_pred_gain_fx[STEREO_DFT_DEC_DFT_NB * STEREO_DFT_BAND_MAX]; /* prediction gain for the residual HFs */ /* Q31 */
-    int16_t res_pred_band_min;                                                                                       /* Band min for prediction of residual */
-    int16_t past_DMX_pos;
-    int16_t res_pred_flag_0;
-    int16_t res_pred_flag_1;
-    int16_t res_pred_index_previous[STEREO_DFT_BAND_MAX];
+    Word16 res_pred_band_min;                                                                                        /* Band min for prediction of residual */
+    Word16 past_DMX_pos;
+    Word16 res_pred_flag_0;
+    Word16 res_pred_flag_1;
+    Word16 res_pred_index_previous[STEREO_DFT_BAND_MAX];
 
-    int16_t reverb_flag;
-    int16_t nbands_respred;
+    Word16 reverb_flag;
+    Word16 nbands_respred;
 
     /*residual coding*/
-    int16_t res_cod_mode[STEREO_DFT_DEC_DFT_NB]; /* mode from 0 (off) to 3 */
-    int16_t res_cod_band_max;                    /* Band max for coding of residual */
-    int16_t res_cod_line_max;
+    Word16 res_cod_mode[STEREO_DFT_DEC_DFT_NB]; /* mode from 0 (off) to 3 */
+    Word16 res_cod_band_max;                    /* Band max for coding of residual */
+    Word16 res_cod_line_max;
     Word32 DFT_past_DMX_fx[STEREO_DFT_PAST_MAX][STEREO_DFT32MS_N_32k]; /* Past DMX for residual prediction */ /* Q(q_DFT_past_DMX_fx) */
     Word32 past_res_pred_gain_fx[STEREO_DFT_PAST_MAX][STEREO_DFT_BAND_MAX];                                   /* Q31 */
     Word32 res_gains_ind_fx[2][2 * STEREO_DFT_BAND_MAX];                                                      /* Q26 */
@@ -171,9 +171,9 @@ typedef struct stereo_dft_dec_data_struct
     BPF_DEC_HANDLE hBpf;
     TCX_LTP_DEC_HANDLE hTcxLtpDec;
 
-    int16_t trans;
-    int16_t attackPresent;
-    int16_t wasTransient;
+    Word16 trans;
+    Word16 attackPresent;
+    Word16 wasTransient;
 
 
     basic_allpass_t ap1, ap2, ap3;
@@ -188,9 +188,9 @@ typedef struct stereo_dft_dec_data_struct
     Word32 ap_fade_mem_fx[STEREO_DFT_ALLPASS_FADELEN_16k];      /* Q(q_ap_fade_mem_fx) */
     Word16 q_ap_fade_mem_fx;
 
-    int16_t ap_wasTransient;
-    int16_t core_hist[STEREO_DFT_CORE_HIST_MAX];
-    int16_t hb_stefi_delay;
+    Word16 ap_wasTransient;
+    Word16 core_hist[STEREO_DFT_CORE_HIST_MAX];
+    Word16 hb_stefi_delay;
     Word32 smooth_dmx_nrg_fx[STEREO_DFT_BAND_MAX]; /* Q(q_smoothed_nrg) */
     Word32 smooth_res_nrg_fx[STEREO_DFT_BAND_MAX]; /* Q(q_smoothed_nrg) */
     Word32 td_gain_fx[STEREO_DFT_CORE_HIST_MAX];   /* Q(q_td_gain) */
@@ -206,16 +206,16 @@ typedef struct stereo_dft_dec_data_struct
 
     /* stereo DTX */
     Word16 g_state_fx[STEREO_DFT_BAND_MAX]; /* Q15 */
-    int16_t frame_sid_nodata;
-    int16_t frame_nodata;
-    int16_t frame_sid;
+    Word16 frame_sid_nodata;
+    Word16 frame_nodata;
+    Word16 frame_sid;
 
     Word16 scale_fx; /* Q15 */
 
     /* PLC on residual signal */
-    int16_t time_offs;
-    int16_t sg_mem_corrupt;
-    int16_t recovery_flg;
+    Word16 time_offs;
+    Word16 sg_mem_corrupt;
+    Word16 recovery_flg;
 
     /* PLC on residual signal */
     Word32 sg_mean_fx;                                                               /* Q31 */
@@ -228,7 +228,7 @@ typedef struct stereo_dft_dec_data_struct
     Word16 q_hb_nrg_subr;
     Word16 q_res_mem;
 
-    int16_t first_frame;
+    Word16 first_frame;
     Word32 mixer_mat_smooth_fx[2][4][2 * IVAS_MAX_NUM_BANDS]; /* Q31 */
     Word32 g_L_prev_fx;                                       /* Q31 */
     Word32 g_R_prev_fx;                                       /* Q31 */
@@ -257,26 +257,26 @@ typedef struct stereo_dec_cng
 {
     Word16 cm_fx[STEREO_DFT_BAND_MAX]; /* cm                                                                */      /* Q15 */
     Word16 coh_fx[STEREO_DFT_BAND_MAX + 1]; /* coherence                                                         */ /* Q15 */
-    int16_t first_SID;                                                                                              /* first SID indicator                                               */
-    int16_t first_SID_after_TD;                                                                                     /* first SID after TD-stereo indicator                               */
-    int16_t prev_sid_nodata;                                                                                        /* previous frame SID/FRAME_NO_DATA indicator                        */
-    int16_t last_tdm_idx;                                                                                           /* last tdm index                                                    */
+    Word16 first_SID;                                                                                               /* first SID indicator                                               */
+    Word16 first_SID_after_TD;                                                                                      /* first SID after TD-stereo indicator                               */
+    Word16 prev_sid_nodata;                                                                                         /* previous frame SID/FRAME_NO_DATA indicator                        */
+    Word16 last_tdm_idx;                                                                                            /* last tdm index                                                    */
     Word32 c_LR_LT_fx; /* left right cross correlation                                      */                      /* Q31 */
-    int16_t active_frame_counter;                                                                                   /* counter for active frames                                         */
-    int16_t xfade_frame_counter;                                                                                    /* xfade counter                                                     */
-    int16_t xfade_length;                                                                                           /* number of frames to perform xfade                                 */
-    int16_t nr_dft_frames;                                                                                          /* dft frame counter                                                 */
-    int16_t nr_corr_frames;                                                                                         /* correlation frame counter                                         */
-    int16_t nr_sid_frames;                                                                                          /* SID frame counter                                                 */
-    int16_t last_act_element_mode;                                                                                  /* Element mode of last active frame                                 */
+    Word16 active_frame_counter;                                                                                    /* counter for active frames                                         */
+    Word16 xfade_frame_counter;                                                                                     /* xfade counter                                                     */
+    Word16 xfade_length;                                                                                            /* number of frames to perform xfade                                 */
+    Word16 nr_dft_frames;                                                                                           /* dft frame counter                                                 */
+    Word16 nr_corr_frames;                                                                                          /* correlation frame counter                                         */
+    Word16 nr_sid_frames;                                                                                           /* SID frame counter                                                 */
+    Word16 last_act_element_mode;                                                                                   /* Element mode of last active frame                                 */
     Word16 olapBufferSynth22_fx[FFTLEN];                                                                            /* overlap buffer for secondary channel CNA                          */
     Word32 olapBufferSynth22_32fx[FFTLEN];                                                                          /* overlap buffer for secondary channel CNA                          */
-    int16_t flag_cna_fade;                                                                                          /* flag enabling CNA fade out                                        */
+    Word16 flag_cna_fade;                                                                                           /* flag enabling CNA fade out                                        */
     Word16 maskingNoiseS_fx[L_FRAME16k];                                                                            /* masking noise (CNA) for secondary channel                         */
-    int16_t enableSecCNA;                                                                                           /* flag enabling secondary channel CNA                               */
+    Word16 enableSecCNA;                                                                                            /* flag enabling secondary channel CNA                               */
     Word16 c_PS_LT_fx; /* long term cross-correlation between primary and secondary channel */                      // Assumed Q15 for initialization. Can be modified later if reqd.
-    const int16_t *frameSize;                                                                                       /* Frame size in samples                                             */
-    const int16_t *fftlen;                                                                                          /* FFT length used for the decomposition                             */
+    const Word16 *frameSize;                                                                                        /* Frame size in samples                                             */
+    const Word16 *fftlen;                                                                                           /* FFT length used for the decomposition                             */
 
 } STEREO_CNG_DEC, *STEREO_CNG_DEC_HANDLE;
 
@@ -287,18 +287,18 @@ typedef struct stereo_dec_cng
 
 typedef struct stereo_td_dec_data_structure
 {
-    int16_t tdm_last_ratio_idx;    /* last TDM ratio index */
-    int16_t tdm_last_SM_flag;      /* last channel combination scheme flag */
-    int16_t tdm_prev_last_SM_flag; /* channel combination scheme flag before last frame */
-    int16_t tdm_SM_flag;           /* current channel combination scheme flag */
-    int16_t tdm_use_IAWB_Ave_lpc;  /* Flag to indicate the usage of mean inactive LP coefficients */
-
-    int16_t tdm_lp_reuse_flag; /* Flag that indicate if it is possible to reuse the LP coefficient from the primary channel or not */
-    int16_t tdm_low_rate_mode; /* secondary channel low rate mode flag */
+    Word16 tdm_last_ratio_idx;    /* last TDM ratio index */
+    Word16 tdm_last_SM_flag;      /* last channel combination scheme flag */
+    Word16 tdm_prev_last_SM_flag; /* channel combination scheme flag before last frame */
+    Word16 tdm_SM_flag;           /* current channel combination scheme flag */
+    Word16 tdm_use_IAWB_Ave_lpc;  /* Flag to indicate the usage of mean inactive LP coefficients */
+
+    Word16 tdm_lp_reuse_flag; /* Flag that indicate if it is possible to reuse the LP coefficient from the primary channel or not */
+    Word16 tdm_low_rate_mode; /* secondary channel low rate mode flag */
     Word16 tdm_Pri_pitch_buf_fx[NB_SUBFR];
-    int16_t tdm_Pitch_reuse_flag;
-    int16_t tdm_LRTD_flag;
-    int16_t flag_skip_DMX; /* flag that indicates whether the TD downmixing is skipped */
+    Word16 tdm_Pitch_reuse_flag;
+    Word16 tdm_LRTD_flag;
+    Word16 flag_skip_DMX; /* flag that indicates whether the TD downmixing is skipped */
 
     Word32 TCX_old_syn_Overl_fx[L_FRAME16k / 2]; /* past ovrl buffer for possible switching from TD stereo ACELP to MDCT stereo TCX frame */ /* Q11 */
     Word16 prevSP_ratio_fx;                                                                                                                  /* previous SP ratio            */
@@ -320,24 +320,24 @@ typedef struct stereo_mdct_dec_data_structure
     STEREO_MDCT_BAND_PARAMETERS stbParamsTCX20afterACELP; /* stereo frequency band parameters for transition frame */
 
     /* only intraframe */
-    int16_t mdct_stereo_mode[2]; /* mdct stereo mode: LR, MS, band-wise MS */
-    int16_t global_ild[2];       /* Quantized ILD for the whole spectrum */
-    int16_t split_ratio;         /* Ratio of bitrate (1 to 7), split_ratio = 8 * 1st chn bitrate / (1st + 2nd chn bitrate) */
+    Word16 mdct_stereo_mode[2]; /* mdct stereo mode: LR, MS, band-wise MS */
+    Word16 global_ild[2];       /* Quantized ILD for the whole spectrum */
+    Word16 split_ratio;         /* Ratio of bitrate (1 to 7), split_ratio = 8 * 1st chn bitrate / (1st + 2nd chn bitrate) */
 
-    int16_t IGFStereoMode[2]; /* MDCT stereo mode for IGF */
+    Word16 IGFStereoMode[2]; /* MDCT stereo mode for IGF */
 
-    int16_t use_itd;
-    int16_t itd_mode; /*0/1*/
-    Word32 itd_fx;    /* Q15 */
+    Word16 use_itd;
+    Word16 itd_mode; /*0/1*/
+    Word32 itd_fx;   /* Q15 */
 
-    int16_t reverse_dmx;
+    Word16 reverse_dmx;
     Word32 smooth_ratio_fx; /* Q26 */
 
-    int16_t prev_ms_mask[NB_DIV][MAX_SFB];
+    Word16 prev_ms_mask[NB_DIV][MAX_SFB];
     Word16 lastCoh_fx; /* Q14 */
-    int16_t noise_seeds_channels[CPE_CHANNELS];
-    int16_t noise_seed_common;
-    int16_t isSBAStereoMode;
+    Word16 noise_seeds_channels[CPE_CHANNELS];
+    Word16 noise_seed_common;
+    Word16 isSBAStereoMode;
 
 } STEREO_MDCT_DEC_DATA, *STEREO_MDCT_DEC_DATA_HANDLE;
 
@@ -348,18 +348,18 @@ typedef struct stereo_mdct_dec_data_structure
 
 typedef struct stereo_tca_dec_data_structure
 {
-    int16_t refChanIndx;                                                                             /* reference channel index in current frame */
-    int16_t prevRefChanIndx;                                                                         /* reference channel index in previous frame */
-    int16_t indx_ica_NCShift;                                                                        /* ICA target channel inter-channel corrstats */
-    int16_t indx_ica_gD;                                                                             /* ICA target gain */
+    Word16 refChanIndx;                                                                              /* reference channel index in current frame */
+    Word16 prevRefChanIndx;                                                                          /* reference channel index in previous frame */
+    Word16 indx_ica_NCShift;                                                                         /* ICA target channel inter-channel corrstats */
+    Word16 indx_ica_gD;                                                                              /* ICA target gain */
     Word32 targetGain_fx; /* gain norm applied on target (or right) channel in current frame */      // Q29
     Word32 prevTargetGain_fx; /* gain norm applied on target (or right) channel in previous frame */ // Q29
 
-    int16_t corrLagStats;     /* corr lag stats in current frame */
-    int16_t prevCorrLagStats; /* corr lag stats in previous frame */
+    Word16 corrLagStats;     /* corr lag stats in current frame */
+    Word16 prevCorrLagStats; /* corr lag stats in previous frame */
 
-    int16_t interp_dec_prevNCShift;         /* NC Shift in previous frame */
-    int16_t interp_dec_switch_to_zero_diff; /* switch flag for interpolation */
+    Word16 interp_dec_prevNCShift;         /* NC Shift in previous frame */
+    Word16 interp_dec_switch_to_zero_diff; /* switch flag for interpolation */
 
 
     Word32 memChanL_fx[L_DEC_MEM_LEN_ICA]; /* left channel input to correct at the cross-over for Fixed */
@@ -428,10 +428,10 @@ typedef struct stereo_icbwe_dec_data_structure
 
 typedef struct
 {
-    int16_t dtx_flag;
-    int16_t sce_id_dtx;
+    Word16 dtx_flag;
+    Word16 sce_id_dtx;
 
-    int16_t ism_dtx_hangover_cnt; /* hangover counter for ISM DTX decoder */
+    Word16 ism_dtx_hangover_cnt; /* hangover counter for ISM DTX decoder */
 
 } ISM_DTX_DATA_DEC;
 
@@ -478,9 +478,9 @@ typedef struct ivas_dirac_dec_data_structure
 {
     DIRAC_CONFIG_DATA_HANDLE hConfig;
 
-    int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1];
-    int16_t dithering_seed;
-    int16_t spar_to_dirac_write_idx;
+    Word16 band_grouping[IVAS_MAX_NUM_BANDS + 1];
+    Word16 dithering_seed;
+    Word16 spar_to_dirac_write_idx;
 
     IVAS_FB_MIXER_HANDLE hFbMdft;
 
@@ -521,10 +521,10 @@ typedef struct dirac_output_synthesis_cov_state_structure
 
 typedef struct ivas_param_mc_diff_proto_info_structure
 {
-    int16_t num_protos_diff;
-    int16_t *proto_index_diff;
-    int16_t *num_source_chan_diff;
-    int16_t **source_chan_idx;
+    Word16 num_protos_diff;
+    Word16 *proto_index_diff;
+    Word16 *num_source_chan_diff;
+    Word16 **source_chan_idx;
     Word32 **proto_fac_fx;
 
 } PARAM_MC_DIFF_PROTO_INFO;
@@ -532,42 +532,42 @@ typedef struct ivas_param_mc_diff_proto_info_structure
 
 typedef struct ivas_param_mc_dec_data_structure
 {
-    int16_t slot_size;
+    Word16 slot_size;
     Word32 *Cldfb_RealBuffer_tc_fx; // Q12
     Word16 Cldfb_RealBuffer_tc_e;
     Word32 *Cldfb_ImagBuffer_tc_fx; // Q12
     Word16 Cldfb_ImagBuffer_tc_e;
     Word16 sz;
-    int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
-    int16_t nb_subframes;
-    int16_t subframes_rendered;
-    int16_t slots_rendered;
-    int16_t num_slots;
-    int16_t num_freq_bands;
-    int16_t num_param_bands_synth;
+    Word16 subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
+    Word16 nb_subframes;
+    Word16 subframes_rendered;
+    Word16 slots_rendered;
+    Word16 num_slots;
+    Word16 num_freq_bands;
+    Word16 num_param_bands_synth;
 
-    int16_t band_grouping[PARAM_MC_MAX_PARAMETER_BANDS + 1];
+    Word16 band_grouping[PARAM_MC_MAX_PARAMETER_BANDS + 1];
 
     /*Decoder parameters */
     /*Prototypes*/
-    int16_t num_outputs_diff;
+    Word16 num_outputs_diff;
     PARAM_MC_DIFF_PROTO_INFO *diff_proto_info;
     PARAM_MC_SYNTHESIS_CONF synthesis_conf;
 
     /*Options*/
     /* Decorrelator options */
-    int16_t max_band_decorr;
+    Word16 max_band_decorr;
     /*Decoder states=memories*/
     Word32 *proto_frame_f_fx;     /* Q11 */
     Word32 *proto_frame_dec_f_fx; /* Q11 */
 
     DIRAC_OUTPUT_SYNTHESIS_COV_STATE h_output_synthesis_cov_state;
     DIRAC_OUTPUT_SYNTHESIS_PARAMS h_output_synthesis_params;
-    int16_t max_band_energy_compensation;
+    Word16 max_band_energy_compensation;
     HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC;
     Word16 *icc_q_fx; /* ICC parameters*/ /* Q15 */
     Word16 *icld_q_fx;                    /* Q8 */
-    int16_t max_param_band_abs_cov;
+    Word16 max_param_band_abs_cov;
     Word16 q_proto_frame_f;
     Word32 *ls_conv_dmx_matrix_fx; /* Q30 */
     Word32 *proto_matrix_int_fx;
@@ -588,12 +588,12 @@ typedef struct ivas_param_mc_dec_data_structure
 
 typedef struct ivas_mc_paramupmix_dec_data_structure
 {
-    int16_t num_freq_bands;
+    Word16 num_freq_bands;
     ivas_td_decorr_state_t *hTdDecorr[MC_PARAMUPMIX_COMBINATIONS];
-    int32_t alpha_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];
-    int32_t beta_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];
-    int16_t first_frame;
-    int16_t free_param_interpolator;
+    Word32 alpha_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];
+    Word32 beta_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];
+    Word16 first_frame;
+    Word16 free_param_interpolator;
 
 
     Word32 alphas_fx[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];     // Q28
@@ -627,30 +627,30 @@ typedef struct ivas_spar_md_dec_state_t
     ivas_spar_dec_matrices_t spar_coeffs;
     ivas_spar_dec_matrices_t spar_coeffs_prev;
     ivas_spar_dec_matrices_t spar_coeffs_tar;
-    int16_t dtx_md_smoothing_cntr;
-    int16_t valid_bands[IVAS_MAX_NUM_BANDS];
-    int16_t base_band_age[IVAS_MAX_NUM_BANDS];
-    int16_t spar_plc_num_lost_frames;
-    int16_t num_decorr;
-    int16_t td_decorr_flag;
-    int16_t spar_plc_enable_fadeout_flag;
+    Word16 dtx_md_smoothing_cntr;
+    Word16 valid_bands[IVAS_MAX_NUM_BANDS];
+    Word16 base_band_age[IVAS_MAX_NUM_BANDS];
+    Word16 spar_plc_num_lost_frames;
+    Word16 num_decorr;
+    Word16 td_decorr_flag;
+    Word16 spar_plc_enable_fadeout_flag;
     Word32 ***mixer_mat_fx;                                                                                                                /* Q(Q_mixer_mat) */
     Word32 mixer_mat_prev_fx[MAX_PARAM_SPATIAL_SUBFRAMES + 1][IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH][IVAS_MAX_NUM_BANDS]; /* Q(Q_mixer_mat) */
     Word16 Q_mixer_mat;
     ivas_spar_md_com_cfg spar_md_cfg;
     ivas_arith_coeffs_t arith_coeffs;
     ivas_huff_coeffs_t huff_coeffs;
-    int16_t table_idx;
-    int16_t dtx_vad;
-    int16_t spar_hoa_md_flag;
-    int16_t spar_hoa_dirac2spar_md_flag;
-    int16_t HOA_md_ind[IVAS_SPAR_MAX_CH];
+    Word16 table_idx;
+    Word16 dtx_vad;
+    Word16 spar_hoa_md_flag;
+    Word16 spar_hoa_dirac2spar_md_flag;
+    Word16 HOA_md_ind[IVAS_SPAR_MAX_CH];
     Word32 smooth_buf_fx[IVAS_MAX_NUM_BANDS][2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1];       /* Q0 */
     Word16 smooth_fac_fx[IVAS_MAX_NUM_BANDS];                                          /* Q15 */
     Word32 mixer_mat_prev2_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; /* Q(Q_mixer_mat) */
-    int16_t first_valid_frame;
+    Word16 first_valid_frame;
     ivas_band_coeffs_t *band_coeffs_prev;
-    int16_t base_band_coeffs_age[IVAS_MAX_NUM_BANDS];
+    Word16 base_band_coeffs_age[IVAS_MAX_NUM_BANDS];
 } ivas_spar_md_dec_state_t;
 
 
@@ -676,11 +676,11 @@ typedef struct
 {
     Word16 prev_ql_fx[IVAS_PCA_INTERP];
     Word16 prev_qr_fx[IVAS_PCA_INTERP];
-    int16_t prev_pca_bypass;
+    Word16 prev_pca_bypass;
     Word16 mem_eigVec_interp_fx[IVAS_PCA_LEN_INTERP_EIG_DEC];
     /* parser output: */
-    int16_t pca_bypass;
-    int32_t index[2];
+    Word16 pca_bypass;
+    Word32 index[2];
 } PCA_DEC_STATE;
 
 
@@ -690,20 +690,20 @@ typedef struct ivas_spar_dec_lib_t
     ivas_td_decorr_state_t *hTdDecorr;
     ivas_spar_md_dec_state_t *hMdDec;
     IVAS_FB_MIXER_HANDLE hFbMixer;
-    int16_t AGC_flag;
+    Word16 AGC_flag;
     ivas_agc_dec_state_t *hAgcDec;
     PCA_DEC_STATE *hPCA;
-    int16_t dirac_to_spar_md_bands[DIRAC_MAX_NBANDS];
-    int16_t enc_param_start_band;
-    int32_t core_nominal_brate; /* Nominal bitrate for core coding  */
-    int16_t i_subframe;
-
-    int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
-    int16_t render_to_md_map[MAX_JBM_CLDFB_TIMESLOTS];
-    int16_t nb_subframes;
-    int16_t subframes_rendered;
-    int16_t slots_rendered;
-    int16_t num_slots;
+    Word16 dirac_to_spar_md_bands[DIRAC_MAX_NBANDS];
+    Word16 enc_param_start_band;
+    Word32 core_nominal_brate; /* Nominal bitrate for core coding  */
+    Word16 i_subframe;
+
+    Word16 subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
+    Word16 render_to_md_map[MAX_JBM_CLDFB_TIMESLOTS];
+    Word16 nb_subframes;
+    Word16 subframes_rendered;
+    Word16 slots_rendered;
+    Word16 num_slots;
 
 } SPAR_DEC_DATA, *SPAR_DEC_HANDLE;
 
@@ -712,8 +712,8 @@ typedef struct ivas_spar_dec_lib_t
 typedef struct ivas_osba_data
 {
     Word32 **delayBuffer_fx;
-    int16_t delayBuffer_size;
-    int16_t delayBuffer_nchan;
+    Word16 delayBuffer_size;
+    Word16 delayBuffer_nchan;
 
 } SBA_ISM_DATA, *SBA_ISM_DATA_HANDLE;
 
@@ -724,9 +724,9 @@ typedef struct ivas_osba_data
 
 typedef struct sce_dec_data_structure
 {
-    int16_t sce_id;             /* SCE # identifier */
-    int32_t element_brate;      /* SCE total bitrate in bps */
-    int32_t last_element_brate; /* SCE last total bitrate in bps */
+    Word16 sce_id;             /* SCE # identifier */
+    Word32 element_brate;      /* SCE total bitrate in bps */
+    Word32 last_element_brate; /* SCE last total bitrate in bps */
 
     /* core coder handle */
     DEC_CORE_HANDLE hCoreCoder[1];
@@ -747,15 +747,15 @@ typedef struct sce_dec_data_structure
 
 typedef struct cpe_dec_data_structure
 {
-    int16_t cpe_id;             /* CPE # identifier */
-    int32_t element_brate;      /* CPE element total bitrate in bps */
-    int32_t last_element_brate; /* last CPE element total bitrate in bps */
+    Word16 cpe_id;             /* CPE # identifier */
+    Word32 element_brate;      /* CPE element total bitrate in bps */
+    Word32 last_element_brate; /* last CPE element total bitrate in bps */
 
-    int16_t element_mode;      /* element mode, in CPE it can be IVAS_CPE_DFT, IVAS_CPE_TD or IVAS_CPE_MDCT */
-    int16_t last_element_mode; /* last element mode */
+    Word16 element_mode;      /* element mode, in CPE it can be IVAS_CPE_DFT, IVAS_CPE_TD or IVAS_CPE_MDCT */
+    Word16 last_element_mode; /* last element mode */
 
-    int16_t stereo_switching_counter;
-    int16_t NbFrameMod;
+    Word16 stereo_switching_counter;
+    Word16 NbFrameMod;
     /* core coder handle */
     DEC_CORE_HANDLE hCoreCoder[CPE_CHANNELS];
 
@@ -768,7 +768,7 @@ typedef struct cpe_dec_data_structure
     STEREO_ICBWE_DEC_HANDLE hStereoICBWE;     /* Stereo inter-channel BWE data handle */
     STEREO_CNG_DEC_HANDLE hStereoCng;         /* Stereo CNG data structure */
 
-    int16_t nchan_out; /* number of output channels (1: mono dmx, 2: default stereo) */
+    Word16 nchan_out; /* number of output channels (1: mono dmx, 2: default stereo) */
 
     /* DFT stereo I/O channel buffer memories that need to be updated for TD->DFT stereo switching */
 
@@ -792,7 +792,7 @@ typedef struct cpe_dec_data_structure
 
     /* buffers used for fading between MDCT and DFT Stereo */
 
-    int32_t brate_surplus; /* bitrate surplus for bitrate adaptation in combined format coding */
+    Word32 brate_surplus; /* bitrate surplus for bitrate adaptation in combined format coding */
 
 } CPE_DEC_DATA, *CPE_DEC_HANDLE;
 
@@ -803,8 +803,8 @@ typedef struct cpe_dec_data_structure
 
 typedef struct mct_dec_block_data_struct
 {
-    int16_t ch1, ch2;
-    int16_t mask[2][MAX_SFB];
+    Word16 ch1, ch2;
+    Word16 mask[2][MAX_SFB];
     STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct; /* MDCT stereo data handle */
 
 } MCT_DEC_BLOCK_DATA, *MCT_DEC_BLOCK_DATA_HANDLE;
@@ -812,14 +812,14 @@ typedef struct mct_dec_block_data_struct
 
 typedef struct mct_dec_data_structure
 {
-    int16_t nchan_out_woLFE; /* number of active channels within multi-channel configuration */
-    int16_t currBlockDataCnt;
-    int16_t bitsChannelPairIndex; /* bits needed to code channel pair index, depends on number of active channels */
+    Word16 nchan_out_woLFE; /* number of active channels within multi-channel configuration */
+    Word16 currBlockDataCnt;
+    Word16 bitsChannelPairIndex; /* bits needed to code channel pair index, depends on number of active channels */
     MCT_DEC_BLOCK_DATA_HANDLE hBlockData[MCT_MAX_BLOCKS];
 
-    int16_t chBitRatios[MCT_MAX_CHANNELS];
-    int16_t lowE_ch[MCT_MAX_CHANNELS];        /* note: pointer to local parameter */
-    uint16_t mc_global_ild[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */
+    Word16 chBitRatios[MCT_MAX_CHANNELS];
+    Word16 lowE_ch[MCT_MAX_CHANNELS];        /* note: pointer to local parameter */
+    UWord16 mc_global_ild[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */
 
 } MCT_DEC_DATA, *MCT_DEC_HANDLE;
 
@@ -866,12 +866,12 @@ typedef struct ivas_binaural_rendering_struct
     IVAS_OUTPUT_SETUP_HANDLE hInputSetup;                 /* pointer to input spatial format for binaural renderer*/
     EFAP_HANDLE hEFAPdata;                                /* EFAP structure*/
     Word32 *hoa_dec_mtx; /* pointer to HOA decoder mtx */ /*Q29*/
-    int8_t rotInCldfb;                                    /* Flag to enable rotation within bin Renderer in CLDFB*/
-    int16_t max_band;                                     /* band upto which rendering is performed */
-    int16_t conv_band;                                    /* band upto which convolution in cldfb domain is performed */
-    int16_t timeSlots;                                    /* number of time slots of binaural renderer */
-    int16_t nInChannels;                                  /* number input channels */
-    int8_t render_lfe;                                    /* Flag to render LFE in binaural rendering*/
+    Word8 rotInCldfb;                                     /* Flag to enable rotation within bin Renderer in CLDFB*/
+    Word16 max_band;                                      /* band upto which rendering is performed */
+    Word16 conv_band;                                     /* band upto which convolution in cldfb domain is performed */
+    Word16 timeSlots;                                     /* number of time slots of binaural renderer */
+    Word16 nInChannels;                                   /* number input channels */
+    Word8 render_lfe;                                     /* Flag to render LFE in binaural rendering*/
     IVAS_FORMAT ivas_format;                              /* format; corresponds to st_ivas->ivas_format, unless the signal gets transormed to a different domain for rendering */
 
     /* Convolution module structure */
@@ -892,18 +892,18 @@ typedef struct ivas_masa_decoder_ext_out_meta_struct
 {
     MASA_DECRIPTIVE_META descriptiveMeta;
 
-    uint16_t directionIndex[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t directToTotalRatio[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t spreadCoherence[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+    UWord16 directionIndex[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 directToTotalRatio[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 spreadCoherence[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
 
-    uint8_t surroundCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t diffuseToTotalRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 surroundCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 diffuseToTotalRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
 
 } MASA_DECODER_EXT_OUT_META;
 
 typedef struct ivas_masa_decoder_data_struct
 {
-    int16_t band_mapping[MASA_FREQUENCY_BANDS + 1];
+    Word16 band_mapping[MASA_FREQUENCY_BANDS + 1];
     SPHERICAL_GRID_DATA *sph_grid16;
 
     MASA_DECODER_EXT_OUT_META *extOutMeta;
@@ -922,32 +922,32 @@ typedef struct ivas_masa_decoder_struct
 /* Data structure for MASA_ISM rendering */
 typedef struct ivas_masa_ism_data_structure
 {
-    int16_t azimuth_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
-    int16_t elevation_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+    Word16 azimuth_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+    Word16 elevation_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
     Word32 energy_ratio_ism_fx[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR][CLDFB_NO_CHANNELS_MAX]; /* Q30 */
     Word32 masa_to_total_energy_ratio_fx[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];                                    /* Q30 */
 
-    int16_t azimuth_ism_edited[MAX_NUM_OBJECTS];
-    int16_t elevation_ism_edited[MAX_NUM_OBJECTS];
-    uint8_t ism_is_edited[MAX_NUM_OBJECTS];
+    Word16 azimuth_ism_edited[MAX_NUM_OBJECTS];
+    Word16 elevation_ism_edited[MAX_NUM_OBJECTS];
+    UWord8 ism_is_edited[MAX_NUM_OBJECTS];
 
-    int16_t idx_separated_ism;
-    int16_t azimuth_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
-    int16_t elevation_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+    Word16 idx_separated_ism;
+    Word16 azimuth_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+    Word16 elevation_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
 
     Word32 q_azimuth_old_fx[MAX_NUM_OBJECTS];   /* Q22 */
     Word32 q_elevation_old_fx[MAX_NUM_OBJECTS]; /* Q22 */
 
     Word16 ismPreprocMatrix_fx[2][2][CLDFB_NO_CHANNELS_MAX]; /* Q15 */
-    uint8_t objectsMoved;
+    UWord8 objectsMoved;
     Word32 eneMoveIIR_fx[2][CLDFB_NO_CHANNELS_MAX];      /*Q-22*/
     Word32 enePreserveIIR_fx[2][CLDFB_NO_CHANNELS_MAX];  /*Q-22*/
     Word32 preprocEneTarget_fx[CLDFB_NO_CHANNELS_MAX];   /*Q-19*/
     Word32 preprocEneRealized_fx[CLDFB_NO_CHANNELS_MAX]; /*Q-19*/
 
     Word32 **delayBuffer_fx; /* Q11 */
-    int16_t delayBuffer_size;
-    int16_t delayBuffer_nchan;
+    Word16 delayBuffer_size;
+    Word16 delayBuffer_nchan;
 
 } MASA_ISM_DATA, *MASA_ISM_DATA_HANDLE;
 
@@ -961,45 +961,43 @@ typedef struct decoder_tc_buffer_structure
     Word32 *tc_buffer_fx;                                                                                                               /* the buffer itself                                                        */
     Word16 tc_buff_len;                                                                                                                 /*stores memory length of tc buffer*/
     Word32 *tc_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc  Q11 for ivas      */ // VE2SB: TBV
-#ifdef MSAN_FIX
-    Word16 no_channels; /*Stores no of channels in tc_fx with values*/
-#endif
+    Word16 no_channels;                                                                                                                 /*Stores no of channels in tc_fx with values*/
     Word16 q_tc_fx;
-    TC_BUFFER_MODE tc_buffer_mode;    /* mode of the buffer (no buffering, render buffering, out buffering)       */
-    int16_t nchan_transport_jbm;      /* number of TCs after TC decoding                                          */
-    int16_t nchan_transport_internal; /* total number of TC buffer channels, can include e.g. TD decorr data      */
-    int16_t nchan_buffer_full;        /* number of channels to be fully buffered                                  */
-    int16_t n_samples_available;      /* samples still available for rendering in the current frame               */
-    int16_t n_samples_buffered;       /* full number of samples in the buffer (including spill to next frame)     */
-    int16_t n_samples_rendered;       /* samples already rendered in the current frame                            */
-    int16_t n_samples_granularity;    /* render granularity                                                       */
-    int16_t n_samples_flushed;
-    int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
-    int16_t nb_subframes;
-    int16_t subframes_rendered;
-    int16_t slots_rendered;
-    int16_t num_slots;
-    int16_t n_samples_discard; /* number of samples to discard from the beginning of the output */
+    TC_BUFFER_MODE tc_buffer_mode;   /* mode of the buffer (no buffering, render buffering, out buffering)       */
+    Word16 nchan_transport_jbm;      /* number of TCs after TC decoding                                          */
+    Word16 nchan_transport_internal; /* total number of TC buffer channels, can include e.g. TD decorr data      */
+    Word16 nchan_buffer_full;        /* number of channels to be fully buffered                                  */
+    Word16 n_samples_available;      /* samples still available for rendering in the current frame               */
+    Word16 n_samples_buffered;       /* full number of samples in the buffer (including spill to next frame)     */
+    Word16 n_samples_rendered;       /* samples already rendered in the current frame                            */
+    Word16 n_samples_granularity;    /* render granularity                                                       */
+    Word16 n_samples_flushed;
+    Word16 subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
+    Word16 nb_subframes;
+    Word16 subframes_rendered;
+    Word16 slots_rendered;
+    Word16 num_slots;
+    Word16 n_samples_discard; /* number of samples to discard from the beginning of the output */
 
 } DECODER_TC_BUFFER, *DECODER_TC_BUFFER_HANDLE;
 
 typedef struct jbm_metadata_structure
 {
-    int16_t sf_write_idx;
-    int16_t sf_md_buffer_length;
+    Word16 sf_write_idx;
+    Word16 sf_md_buffer_length;
 
-    uint16_t directionIndexBuffer[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t directToTotalRatioBuffer[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t spreadCoherenceBuffer[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t surroundCoherenceBuffer[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t diffuseToTotalRatioBuffer[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
-    uint8_t numberOfDirections[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES]; /* Descriptive metadata, value is 0 or 1 */
+    UWord16 directionIndexBuffer[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 directToTotalRatioBuffer[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 spreadCoherenceBuffer[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 surroundCoherenceBuffer[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 diffuseToTotalRatioBuffer[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES][MASA_FREQUENCY_BANDS];
+    UWord8 numberOfDirections[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_JBM_RINGBUFFER_FRAMES]; /* Descriptive metadata, value is 0 or 1 */
 
-    int16_t slot_read_idx;
-    int16_t slot_write_idx;
-    int16_t slot_md_buffer_length;
+    Word16 slot_read_idx;
+    Word16 slot_write_idx;
+    Word16 slot_md_buffer_length;
 
-    int16_t sf_to_slot_map[MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME * MASA_JBM_RINGBUFFER_FRAMES];
+    Word16 sf_to_slot_map[MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME * MASA_JBM_RINGBUFFER_FRAMES];
 
 } JBM_METADATA, *JBM_METADATA_HANDLE;
 
@@ -1010,25 +1008,25 @@ typedef struct jbm_metadata_structure
 
 typedef struct decoder_config_structure
 {
-    int32_t ivas_total_brate;                                       /* IVAS total bitrate in bps */
-    int32_t last_ivas_total_brate;                                  /* last IVAS total bitrate in bps */
-    int32_t output_Fs;                                              /* output signal sampling frequency in Hz */
-    int16_t nchan_out;                                              /* number of output audio channels */
+    Word32 ivas_total_brate;                                        /* IVAS total bitrate in bps */
+    Word32 last_ivas_total_brate;                                   /* last IVAS total bitrate in bps */
+    Word32 output_Fs;                                               /* output signal sampling frequency in Hz */
+    Word16 nchan_out;                                               /* number of output audio channels */
     AUDIO_CONFIG output_config;                                     /* output audio configuration */
-    int16_t Opt_LsCustom;                                           /* indicates whether loudspeaker custom setup is used */
-    int16_t Opt_HRTF_binary;                                        /* indicates whether HRTF binary file is used */
-    int16_t Opt_Headrotation;                                       /* indicates whether head-rotation is used */
-    int16_t Opt_RendConfigCustom;                                   /* indicates whether Renderer configuration custom setup is used */
+    Word16 Opt_LsCustom;                                            /* indicates whether loudspeaker custom setup is used */
+    Word16 Opt_HRTF_binary;                                         /* indicates whether HRTF binary file is used */
+    Word16 Opt_Headrotation;                                        /* indicates whether head-rotation is used */
+    Word16 Opt_RendConfigCustom;                                    /* indicates whether Renderer configuration custom setup is used */
     IVAS_HEAD_ORIENT_TRK_T orientation_tracking;                    /* indicates orientation tracking type */
-    int16_t Opt_non_diegetic_pan;                                   /* indicates diegetic or not */
+    Word16 Opt_non_diegetic_pan;                                    /* indicates diegetic or not */
     Word16 non_diegetic_pan_gain_fx; /* non diegetic panning gain*/ /* Q15 */
-    int16_t Opt_AMR_WB;                                             /* flag indicating AMR-WB IO mode */
-    int16_t Opt_ExternalOrientation;                                /* indiates whether external orientations are used */
-    int16_t Opt_dpid_on;                                            /* indicates whether Directivity pattern option is used */
-    int16_t Opt_aeid_on;                                            /* indicates whether Acoustic environment option is used */
-    int16_t Opt_tsm;                                                /* indicates whether time scaling modification is activated */
+    Word16 Opt_AMR_WB;                                              /* flag indicating AMR-WB IO mode */
+    Word16 Opt_ExternalOrientation;                                 /* indiates whether external orientations are used */
+    Word16 Opt_dpid_on;                                             /* indicates whether Directivity pattern option is used */
+    Word16 Opt_aeid_on;                                             /* indicates whether Acoustic environment option is used */
+    Word16 Opt_tsm;                                                 /* indicates whether time scaling modification is activated */
     IVAS_RENDER_FRAMESIZE render_framesize;
-    int16_t Opt_delay_comp; /* flag indicating delay compensation active */
+    Word16 Opt_delay_comp; /* flag indicating delay compensation active */
 
 } DECODER_CONFIG, *DECODER_CONFIG_HANDLE;
 
@@ -1047,8 +1045,8 @@ typedef struct Decoder_Struct
 
     IVAS_FORMAT ivas_format;                                /* IVAS format */
     IVAS_FORMAT last_ivas_format;                           /* last frame IVAS format */
-    int16_t sid_format;                                     /* IVAS format indicator from SID frame */
-    int16_t nchan_transport;                                /* number of transport channels */
+    Word16 sid_format;                                     /* IVAS format indicator from SID frame */
+    Word16 nchan_transport;                                /* number of transport channels */
     IVAS_OUTPUT_SETUP hOutSetup;                            /* output setup structure */
     AUDIO_CONFIG intern_config;                             /* internal audio configuration */
     IVAS_OUTPUT_SETUP hIntSetup;                            /* internal setup structure */
@@ -1056,24 +1054,24 @@ typedef struct Decoder_Struct
     AUDIO_CONFIG transport_config;                          /* transport audio configuration */
     IVAS_OUTPUT_SETUP hTransSetup;                          /* transport setup structure */
 
-    int16_t element_mode_init;                              /* element mode used at initialization */
-    int16_t codec_mode;                                     /* Mode 1 or 2 */
-    int16_t ini_frame;                                      /* initialization frames counter */
-    int16_t ini_active_frame;                               /* initialization active frames counter */
+    Word16 element_mode_init;                              /* element mode used at initialization */
+    Word16 codec_mode;                                     /* Mode 1 or 2 */
+    Word16 ini_frame;                                      /* initialization frames counter */
+    Word16 ini_active_frame;                               /* initialization active frames counter */
 
-    int16_t bfi;                                            /* FEC - bad frame indicator */
-    int16_t BER_detect;                                     /* BER detect flag */
-    int16_t num_bits;                                     /* BER detect flag */
+    Word16 bfi;                                            /* FEC - bad frame indicator */
+    Word16 BER_detect;                                     /* BER detect flag */
+    Word16 num_bits;                                     /* BER detect flag */
 
-    uint16_t *bit_stream;                                   /* Pointer to bitstream buffer */
-    int16_t writeFECoffset;                                 /* parameter for debugging JBM stuff */
+    UWord16 *bit_stream;                                   /* Pointer to bitstream buffer */
+    Word16 writeFECoffset;                                 /* parameter for debugging JBM stuff */
     IVAS_LIMITER_HANDLE hLimiter;                           /* Limiter handle */
 
 
     /* core-decoder modules */
-    int16_t nSCE;                                           /* number of total SCEs */
-    int16_t nCPE;                                           /* number of total CPEs */
-    int16_t nCPE_old;                                       /* number of total CPEs available in the last frame before bitrate switching */
+    Word16 nSCE;                                           /* number of total SCEs */
+    Word16 nCPE;                                           /* number of total CPEs */
+    Word16 nCPE_old;                                       /* number of total CPEs available in the last frame before bitrate switching */
     SCE_DEC_HANDLE hSCE[MAX_SCE];                           /* SCE handles */
     CPE_DEC_HANDLE hCPE[MCT_MAX_BLOCKS];                    /* CPE handles */
 
@@ -1092,12 +1090,12 @@ typedef struct Decoder_Struct
     LFE_DEC_HANDLE hLFE;                                    /* LFE handle */
 
     ISM_MODE ism_mode;                                      /* ISM format mode */
-    int16_t nchan_ism;                                      /* number of ISM channels */
+    Word16 nchan_ism;                                      /* number of ISM channels */
     MC_MODE mc_mode;                                        /* MC format mode */
-    int16_t sba_order;                                      /* Ambisonic (SBA) order */
-    int16_t sba_planar;                                     /* Ambisonic (SBA) planar flag */
-    int16_t sba_analysis_order;                             /* Ambisonic (SBA) order used for analysis and coding */
-    int16_t sba_dirac_stereo_flag;                          /* flag indicating stereo output for SBA DirAC modes with 1 TC */
+    Word16 sba_order;                                      /* Ambisonic (SBA) order */
+    Word16 sba_planar;                                     /* Ambisonic (SBA) planar flag */
+    Word16 sba_analysis_order;                             /* Ambisonic (SBA) order used for analysis and coding */
+    Word16 sba_dirac_stereo_flag;                          /* flag indicating stereo output for SBA DirAC modes with 1 TC */
 
     /* rendering modules */
     RENDERER_TYPE renderer_type;                               /* renderer type */
@@ -1120,7 +1118,7 @@ typedef struct Decoder_Struct
     Word32 *hoa_dec_mtx;                                        /* Pointer to decoder matrix for SBA */
     HEAD_TRACK_DATA_HANDLE hHeadTrackData;                     /* Head tracking data structure */
     RENDER_CONFIG_DATA *hRenderConfig;                         /* Renderer config pointer */
-    int32_t binaural_latency_ns;                               /* Binauralization latency in ns */
+    Word32 binaural_latency_ns;                               /* Binauralization latency in ns */
     EXTERNAL_ORIENTATION_HANDLE hExtOrientationData;           /* External orientation data structure */
     COMBINED_ORIENTATION_HANDLE hCombinedOrientationData;      /* Combined external and head orientation data structure */
     DIRAC_REND_HANDLE hDirACRend;                              /* DirAC renderer handle */
@@ -1128,16 +1126,16 @@ typedef struct Decoder_Struct
     MASA_ISM_DATA_HANDLE hMasaIsmData;                         /* OMASA rendering handle */
     SBA_ISM_DATA_HANDLE hSbaIsmData;                           /* OSBA rendering handle */
 
-    int16_t flag_omasa_brate;
+    Word16 flag_omasa_brate;
 
 
     /* JBM module */
     DECODER_TC_BUFFER_HANDLE hTcBuffer;                        /* JBM structure */
     JBM_METADATA_HANDLE hJbmMetadata;                          /* Structure for metadata buffering in JBM */
 
-    int32_t last_active_ivas_total_brate;
-    int16_t ism_extmeta_active;                                /* Extended metadata active in decoder */
-    int16_t ism_extmeta_cnt;                                   /* Change frame counter for extended metadata */
+    Word32 last_active_ivas_total_brate;
+    Word16 ism_extmeta_active;                                /* Extended metadata active in decoder */
+    Word16 ism_extmeta_cnt;                                   /* Change frame counter for extended metadata */
     Word32 **mem_hp20_out_fx;
     Word32 *p_output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* Word32-output audio buffers */
     Word16 p_out_len;/*Stores the total no of channels for which memory is allocated to p_output_fx*/
diff --git a/lib_dec/ivas_stereo_adapt_GR_dec.c b/lib_dec/ivas_stereo_adapt_GR_dec_fx.c
similarity index 99%
rename from lib_dec/ivas_stereo_adapt_GR_dec.c
rename to lib_dec/ivas_stereo_adapt_GR_dec_fx.c
index fbaa98534e6baf399a929bf42bfa9700c361b9a0..2bade4786e8c8fde9f33e95ff0cbdeaaedc95ffb 100644
--- a/lib_dec/ivas_stereo_adapt_GR_dec.c
+++ b/lib_dec/ivas_stereo_adapt_GR_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,12 +32,10 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "rom_dec.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*---------------------------------------------------------------------*
diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c
index f8d6f6086edf0308a7d11134905dfccbc6700c5b..8ec147ff7edf274f9e776c99924c186ac0e6a6c3 100644
--- a/lib_dec/ivas_stereo_cng_dec.c
+++ b/lib_dec/ivas_stereo_cng_dec.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,13 +34,11 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 /*-------------------------------------------------------------------
@@ -318,7 +316,7 @@ static void stereo_dft_generate_comfort_noise_fx(
 
         // lp_ener_fx will be in Q6 at this point.
         // So applying appropriate left shift on the denominator.
-        factor = L_shr( BASOP_Util_Divide3232_Scale_cadence( st->lp_ener_fx, L_shl( st->L_frame, Q6 ), &q_div ), 1 ); /* fixed factor  in the loop below */ /* q_div */
+        factor = L_shr( BASOP_Util_Divide3232_Scale_newton( st->lp_ener_fx, L_shl( st->L_frame, Q6 ), &q_div ), 1 ); /* fixed factor  in the loop below */ /* q_div */
         factor = Sqrt32( factor, &q_div );
         q_div = add( q_div, 1 );
 
@@ -357,7 +355,7 @@ static void stereo_dft_generate_comfort_noise_fx(
         {
             /* Transform shb LP spectrum */
             set32_fx( shb_shape, 0, L_FRAME16k );
-            Copy_Scale_sig_16_32( st->hTdCngDec->shb_lpcCNG_fx, shb_shape, LPC_SHB_ORDER + 1, Q15 ); // Q30
+            Copy_Scale_sig_16_32_DEPREC( st->hTdCngDec->shb_lpcCNG_fx, shb_shape, LPC_SHB_ORDER + 1, Q15 ); // Q30
 
             IF( NE_16( st->L_frame, L_FRAME16k ) )
             {
@@ -401,7 +399,7 @@ static void stereo_dft_generate_comfort_noise_fx(
                 assert( ftmp > 0 );
                 q_div = 0;
                 move16();
-                ftmp = BASOP_Util_Divide3232_Scale_cadence( L_shl( 1, q_tmp ), ftmp, &q_div ); /* q_div */
+                ftmp = BASOP_Util_Divide3232_Scale_newton( L_shl( 1, q_tmp ), ftmp, &q_div ); /* q_div */
                 /* in float:
                 both a = "div"=(1/(x^2+y^2) and sqrt(a)  is used and summed up in the same loop.
 
@@ -586,7 +584,8 @@ static void stereo_dft_generate_comfort_noise_fx(
                 ptr_r = DFT[chan] + add( hFdCngCom->stopFFTbin, i_mult( k, STEREO_DFT32MS_N_MAX ) ); /* q_dft */
                 ptr_i = ptr_r + 1;
 
-                FOR( i = 0; i < ( min( output_frame, hFdCngCom->regularStopBand * 16 ) - hFdCngCom->stopFFTbin ) / 2; i++ )
+                Word16 len = shr( ( sub( s_min( output_frame, i_mult( hFdCngCom->regularStopBand, 16 ) ), hFdCngCom->stopFFTbin ) ), 1 );
+                FOR( i = 0; i < len; i++ )
                 {
                     /* Real part in FFT bins */
                     rand_gauss_fx( ptr_r, &st->hTdCngDec->cng_seed, q_dft );
@@ -623,7 +622,8 @@ static void stereo_dft_generate_comfort_noise_fx(
 
                 ptr_r = DFT[chan] + add( hFdCngCom->stopFFTbin, i_mult( k, STEREO_DFT32MS_N_MAX ) ); /* q_dft */
                 ptr_i = ptr_r + 1;
-                FOR( i = 0; i < ( min( output_frame, hFdCngCom->regularStopBand * 16 ) - hFdCngCom->stopFFTbin ) / 2; i++ )
+                tmp = shr( sub( s_min( output_frame, i_mult( hFdCngCom->regularStopBand, 16 ) ), hFdCngCom->stopFFTbin ), 1 );
+                FOR( i = 0; i < tmp; i++ )
                 {
                     ( *ptr_r ) = L_shl( Mpy_32_32( ( *ptr_r ), tmp32_1 ), q_shift ); /* q_dft + q_shift */
                     move32();
@@ -672,7 +672,7 @@ static void stereo_dft_generate_comfort_noise_fx(
                 move16();
                 FOR( k = 0; k < ( hFdCngCom->nFFTpart - 2 ); k++ )
                 {
-                    factor = BASOP_Util_Divide3232_Scale_cadence( L_add( hFdCngCom->sidNoiseEstLp[k], DELTA_FX ), L_add( st->hFdCngDec->partNoiseShape[k], DELTA_FX ), &q_div ); /* q_div */
+                    factor = BASOP_Util_Divide3232_Scale_newton( L_add( hFdCngCom->sidNoiseEstLp[k], DELTA_FX ), L_add( st->hFdCngDec->partNoiseShape[k], DELTA_FX ), &q_div ); /* q_div */
                     q_div = add( q_div, sub( hFdCngCom->sidNoiseEstExp, st->hFdCngDec->partNoiseShape_exp ) );
                     IF( q_div < 0 )
                     {
@@ -683,7 +683,8 @@ static void stereo_dft_generate_comfort_noise_fx(
                     factor = L_min( L_add( L_shl( hStereoDft->scale_fx, sub( 16, q_div ) ), W_extract_l( W_mult0_32_32( Mpy_32_16_1( L_sub( factor, L_shl( hStereoDft->scale_fx, sub( 16, q_div ) ) ), ONE_BY_MAX_K ), hStereoCng->xfade_frame_counter ) ) ), factor ); /* q_div */
                     FOR( ; j <= hFdCngCom->part[k]; j++ )
                     {
-                        hFdCngCom->cngNoiseLevel[j] = L_shl( Mpy_32_32( st->hFdCngDec->bandNoiseShape[j], factor ), q_div ); /* exp(st->hFdCngDec->bandNoiseShape_exp)  */
+                        /* NOTE: saturation is added here as part of issue 1218 fix. After rescaling the fdcng noise estimation buffers, due to slight precision loss, values may slightly overflow */
+                        hFdCngCom->cngNoiseLevel[j] = L_shl_sat( Mpy_32_32( st->hFdCngDec->bandNoiseShape[j], factor ), q_div ); /* exp(st->hFdCngDec->bandNoiseShape_exp)  */
                         move32();
                     }
                 }
@@ -1367,8 +1368,8 @@ static void FindEmEs_fx(
         temp_q = 0;
         move16();
     }
-    log_res = BASOP_Util_Log2( square_res );
-    es_em_fx = Mpy_32_32( log_res, 1616107501 ); // 25+30-31
+    log_res = L_add( BASOP_Util_Log2( square_res ), L_shl( temp_q, Q25 ) );
+    es_em_fx = Mpy_32_32( log_res, 1616107501 /* 5 * (ln(2)/ln(10)) */ ); // 25+30-31
     /* long-term estimate */
     *lt_es_em_fx = L_add( Mpy_32_32( 858993459, *lt_es_em_fx ), Mpy_32_32( 1288490188, es_em_fx ) ); /* Q24 */
     move32();
@@ -1445,7 +1446,11 @@ void stereo_cna_update_params_fx(
     {
         IF( EQ_16( hCPE->nchan_out, 1 ) )
         {
+#ifdef OPT_STEREO_32KBPS_V1
+            c_LR_fx = MAX_32;
+#else  /* OPT_STEREO_32KBPS_V1 */
             c_LR_fx = MAX_WORD16;
+#endif /* OPT_STEREO_32KBPS_V1 */
             move32();
             c_ILD_fx = 0;
             move32();
@@ -1507,8 +1512,12 @@ void stereo_cna_update_params_fx(
             dotLR_fx = Mpy_32_32( W_extract_l( dotLR_fx ), energy_xy_fx ); /* dotLR_fx_q + ((31 - temp_res_q) - 31)) */
             dotLR_fx_q = add( dotLR_fx_q, sub( sub( 31, temp_res_q ), 31 ) );
             dotLR_fx = W_deposit32_l( L_shl_sat( W_extract_l( dotLR_fx ), sub( 31, dotLR_fx_q ) ) ); /* Q31 */
-            /* estimate L/R correlation factor and ILD in time domain */
+                                                                                                     /* estimate L/R correlation factor and ILD in time domain */
+#ifdef OPT_STEREO_32KBPS_V1
+            c_LR_fx = W_extract_l( dotLR_fx ); /* Q31 */
+#else                                          /* OPT_STEREO_32KBPS_V1 */
             c_LR_fx = extract_h( W_extract_l( dotLR_fx ) ); /* Q15 */
+#endif                                         /* OPT_STEREO_32KBPS_V1 */
 
             temp_res_q = 0;
             move16();
@@ -1547,15 +1556,24 @@ void stereo_cna_update_params_fx(
         /* update of long-term ILD and LR correlation factors for stereo CNA */
         IF( !hFdCngDec->first_cna_noise_updated )
         {
+#ifdef OPT_STEREO_32KBPS_V1
+            hFdCngDec->cna_LR_LT_fx = extract_h( c_LR_fx );
+#else  /* OPT_STEREO_32KBPS_V1 */
             hFdCngDec->cna_LR_LT_fx = extract_l( c_LR_fx );
+#endif /* OPT_STEREO_32KBPS_V1 */
             move16();
             hFdCngDec->cna_ILD_LT_fx = extract_l( c_ILD_fx );
             move16();
         }
         ELSE
         {
+#ifdef OPT_STEREO_32KBPS_V1
+            hFdCngDec->cna_LR_LT_fx = extract_h( L_add_sat( Mpy_32_16_1( STEREO_CNA_LR_CORR_LT_FILT_FX, hFdCngDec->cna_LR_LT_fx ),
+                                                            Mpy_32_32( ONE_IN_Q31 - STEREO_CNA_LR_CORR_LT_FILT_FX, c_LR_fx ) ) ); /* Q31 */
+#else                                                                                                                             /* OPT_STEREO_32KBPS_V1 */
             hFdCngDec->cna_LR_LT_fx = extract_h( L_add_sat( Mpy_32_16_1( STEREO_CNA_LR_CORR_LT_FILT_FX, hFdCngDec->cna_LR_LT_fx ),
                                                             Mpy_32_16_1( L_sub( ONE_IN_Q31, STEREO_CNA_LR_CORR_LT_FILT_FX ), extract_l( c_LR_fx ) ) ) ); /* Q31 */
+#endif                                                                                                                            /* OPT_STEREO_32KBPS_V1 */
             move16();
 
             hFdCngDec->cna_ILD_LT_fx = extract_h( L_add_sat( Mpy_32_16_1( STEREO_CNA_ILD_LT_FILT_FX, hFdCngDec->cna_ILD_LT_fx ),
diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c
index 94234a1e12b14523fc1485106a6683a6181f05b4..92ae9159cd99b32fcbf18839bed6508bc7bcbe70 100644
--- a/lib_dec/ivas_stereo_dft_dec.c
+++ b/lib_dec/ivas_stereo_dft_dec.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,9 +37,7 @@
 #include "cnst.h"
 #include "rom_com.h"
 #include "rom_dec.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
@@ -283,13 +281,13 @@ void stereo_dft_dec_analyze_fx(
     move16();
     NFFT = NS2SA_FX2( inputFs, STEREO_DFT32MS_N_NS );
     Word16 qfac_fx;
-    fac_fx = BASOP_Util_Divide3232_Scale_cadence( hStereoDft->NFFT, NFFT, &qfac_fx ); /* qfac_fx */
+    fac_fx = BASOP_Util_Divide3232_Scale_newton( hStereoDft->NFFT, NFFT, &qfac_fx ); /* qfac_fx */
     qfac_fx = sub( 31, qfac_fx );
     ovl2 = NS2SA_FX2( inputFs, STEREO_DFT32MS_OVL2_NS );
     move16();
 
     /* Offset FOR the time buffers */
-    assert( ( delay >= -NS2SA_FX2( ( input_frame * FRAMES_PER_SEC ), STEREO_DFT_DELAY_DEC_BWE_NS + STEREO_DFT_OVL_NS / 2 ) ) && ( delay <= NS2SA_FX2( ( input_frame * FRAMES_PER_SEC ), STEREO_DFT_OVL_NS ) ) );
+    assert( ( delay >= -NS2SA( input_frame * FRAMES_PER_SEC, STEREO_DFT_DELAY_DEC_BWE_NS + STEREO_DFT_OVL_NS / 2 ) ) && ( delay <= NS2SA( input_frame * FRAMES_PER_SEC, STEREO_DFT_OVL_NS ) ) );
     mem_size = add( delay_dec, delay );
 
     /* Update buffers */
diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx_fx.c
similarity index 98%
rename from lib_dec/ivas_stereo_dft_dec_dmx.c
rename to lib_dec/ivas_stereo_dft_dec_dmx_fx.c
index e97ba23de18a04f2fae1f611dc632222ccc802a5..cdb64e46c62c5c73343b11c8a202d9623923088b 100644
--- a/lib_dec/ivas_stereo_dft_dec_dmx.c
+++ b/lib_dec/ivas_stereo_dft_dec_dmx_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,13 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------------
@@ -61,8 +59,8 @@ void stereo_dft_dmx_out_reset_fx(
     hStereoDftDmx->prevTargetGain_fx = ONE_IN_Q29; /* Q29 */
     move32();
 
-    set32_fx( hStereoDftDmx->memOutHB_fx, 0, NS2SA_FX2( 48000, STEREO_DFT32MS_OVL_NS ) );
-    set32_fx( hStereoDftDmx->memTransitionHB_fx, 0, NS2SA_FX2( 48000, STEREO_DFT32MS_OVL_NS ) );
+    set32_fx( hStereoDftDmx->memOutHB_fx, 0, NS2SA( 48000, STEREO_DFT32MS_OVL_NS ) );
+    set32_fx( hStereoDftDmx->memTransitionHB_fx, 0, NS2SA( 48000, STEREO_DFT32MS_OVL_NS ) );
 
     return;
 }
@@ -104,6 +102,8 @@ void stereo_dft_unify_dmx_fx(
     Word16 num_plocs;
     Word32 plocsi[STEREO_DFT_RES_N_PEAKS_MAX];
 
+    set32_fx( DFT_PRED_RES, 0, STEREO_DFT32MS_N_32k );
+
     output_frame = extract_l( Mult_32_16( st0->output_Fs, INV_FRAME_PER_SEC_Q15 ) ); /* Q0 */
     samp_ratio = BASOP_Util_Divide3232_Scale( st0->sr_core, st0->output_Fs, &q_samp_ratio );
     samp_ratio = shr( samp_ratio, sub( Q15 - Q12, q_samp_ratio ) );
diff --git a/lib_dec/ivas_stereo_dft_dec_fx.c b/lib_dec/ivas_stereo_dft_dec_fx.c
index 3ee0f8e8c7a041648d0ade0266b758032e78a0d1..f1ccc1d7fa81481b32a5fc30eba536694d6ade93 100644
--- a/lib_dec/ivas_stereo_dft_dec_fx.c
+++ b/lib_dec/ivas_stereo_dft_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,9 +37,7 @@
 #include "cnst.h"
 #include "rom_com.h"
 #include "rom_dec.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
@@ -98,9 +96,7 @@ void stereo_dft_dec_reset_fx(
 {
     Word16 i;
     Word16 j, b;
-#ifdef MSAN_FIX
-    set_zero_fx( hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( 16000, STEREO_DFT32MS_OVL_NS ) );
-#endif
+    set_zero_fx( hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ) );
 
     /*Configuration*/
     set16_fx( hStereoDft->prm_res, hStereoDft->hConfig->prm_res, STEREO_DFT_DEC_DFT_NB );
@@ -124,19 +120,19 @@ void stereo_dft_dec_reset_fx(
 
     set16_fx( hStereoDft->res_pred_index_previous, 0, STEREO_DFT_BAND_MAX );
 
-    FOR( i = 0; i < STEREO_DFT_BAND_MAX; i++ )
+    FOR( i = 0; i < STEREO_DFT_BAND_MAX * 2; i++ )
     {
         hStereoDft->res_gains_ind_fx[0][i] = 1006632960; /* 15.0f in Q26 */
         move32();
     }
 
-    set32_fx( hStereoDft->res_gains_ind_fx[1], 0, STEREO_DFT_BAND_MAX );
+    set32_fx( hStereoDft->res_gains_ind_fx[1], 0, STEREO_DFT_BAND_MAX * 2 );
 
     /*residual coding*/
     set16_fx( hStereoDft->res_cod_mode, hStereoDft->hConfig->res_cod_mode, STEREO_DFT_DEC_DFT_NB );
     hStereoDft->res_cod_band_max = dft_band_res_cod[hStereoDft->hConfig->band_res][hStereoDft->hConfig->res_cod_mode];
     set32_fx( hStereoDft->res_cod_mem_fx, 0, STEREO_DFT_OVL_8k );
-    hStereoDft->q_res_cod_mem_fx = Q16;
+    hStereoDft->q_res_cod_mem_fx = Q15;
     move16();
 
     hStereoDft->res_pred_band_min = s_max( STEREO_DFT_RES_PRED_BAND_MIN, hStereoDft->res_cod_band_max );
@@ -248,8 +244,9 @@ void stereo_dft_dec_reset_fx(
     move16();
     hStereoDft->ipd_xfade_prev_fx = 0;
     move32();
-
-    FOR( b = 0; b < hStereoDft->nbands; b++ )
+    hStereoDft->frame_sid_nodata = 0;
+    move16();
+    FOR( b = 0; b < 2 * IVAS_MAX_NUM_BANDS; b++ )
     {
         FOR( i = 0; i < 2; i++ )
         {
@@ -404,9 +401,9 @@ ivas_error stereo_dft_dec_create_fx(
     {
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TCX-LTP handle\n" ) );
     }
-#ifdef MSAN_FIX
     set_zero_fx( hStereoDft_loc->hb_nrg_subr_fx, STEREO_DFT_NBDIV ); /*Setting hb_nrg_subr_fx to zero*/
-#endif                                                               // MSAN_FIX
+    hStereoDft_loc->q_hb_nrg_subr = Q31;
+    move16();
 
     hStereoDft_loc->hConfig->force_mono_transmission = 0;
     move16();
@@ -1332,9 +1329,9 @@ void stereo_dft_dec_res_fx(
     IF( EQ_16( hCPE->hStereoDft->res_cod_mode[STEREO_DFT_OFFSET - 1], STEREO_DFT_RES_COD_OFF ) )
     {
         set32_fx( hCPE->hStereoDft->res_cod_mem_fx, 0, STEREO_DFT_OVL_8k );
-        hCPE->hStereoDft->q_res_cod_mem_fx = Q16;
+        hCPE->hStereoDft->q_res_cod_mem_fx = Q15;
         move16();
-        set32_fx( hCPE->input_mem_fx[1], 0, NS2SA_FX2( 8000, STEREO_DFT32MS_OVL_NS ) );
+        set32_fx( hCPE->input_mem_fx[1], 0, NS2SA( 8000, STEREO_DFT32MS_OVL_NS ) );
         set16_fx( hCPE->hStereoDft->hBpf->pst_old_syn_fx, 0, STEREO_DFT_NBPSF_PIT_MAX_8k );
         hCPE->hStereoDft->hBpf->pst_mem_deemp_err_fx = 0;
         move16();
@@ -1343,23 +1340,23 @@ void stereo_dft_dec_res_fx(
     /*Inverse MDCT*/
     TCX_MDCT_Inverse( res_buf, q_res, win, STEREO_DFT_OVL_8k, L_FRAME8k - STEREO_DFT_OVL_8k, STEREO_DFT_OVL_8k, IVAS_CPE_DFT );
 
+    scale_sig( win, L_FRAME8k + STEREO_DFT_OVL_8k, -1 );
+
+    Word16 q_shift = sub( hCPE->hStereoDft->q_res_cod_mem_fx, Q15 );
     IF( !prev_bfi )
     {
         /*OLA*/
         /*overlapping parts*/
-        Word16 q_shift = sub( hCPE->hStereoDft->q_res_cod_mem_fx, Q16 );
+
         FOR( i = 0; i < STEREO_DFT_OVL_8k; i++ )
         {
-            win[i] = extract_h( L_add( hCPE->hStereoDft->res_cod_mem_fx[i], L_shl( L_mult( win[i], hCPE->hStereoDft->win_8k_fx[i] ), q_shift ) ) ); /* q_res_cod_mem_fx */
+            win[i] = extract_h( L_add( hCPE->hStereoDft->res_cod_mem_fx[i], L_shl( L_mult( win[i], hCPE->hStereoDft->win_8k_fx[i] ), q_shift ) ) ); /* q_res_cod_mem_fx -17 (q_shift -1)*/
             move16();
-            hCPE->hStereoDft->res_cod_mem_fx[i] = L_mult( win[L_FRAME8k + i], hCPE->hStereoDft->win_8k_fx[STEREO_DFT_OVL_8k - 1 - i] ); /* q_res_cod_mem_fx */
+            hCPE->hStereoDft->res_cod_mem_fx[i] = L_mult( win[L_FRAME8k + i], hCPE->hStereoDft->win_8k_fx[STEREO_DFT_OVL_8k - 1 - i] ); /* -1 +15 +1 */
             move32();
         }
-        IF( q_shift != 0 )
-        {
-            v_shr_16( &win[STEREO_DFT_OVL_8k], negate( q_shift ), &win[STEREO_DFT_OVL_8k], L_FRAME8k );
-        }
-        hCPE->hStereoDft->q_res_cod_mem_fx = Q16;
+
+
         move16();
     }
     ELSE
@@ -1372,23 +1369,30 @@ void stereo_dft_dec_res_fx(
         FOR( i = 0; i < STEREO_DFT_OVL_8k; i++ )
         {
             win[i] = extract_h( Madd_32_16( Mpy_32_16_1( hCPE->hStereoDft->res_cod_mem_fx[i], sub( MAX_16, mult( fac, fac ) ) ),
-                                            L_mult( hCPE->hStereoDft->win_8k_fx[i], win[i] ),
-                                            sub( MAX_16, mult( sub( MAX_16, fac ), sub( MAX_16, fac ) ) ) ) ); /* Q0 */
+                                            L_shl( L_mult( hCPE->hStereoDft->win_8k_fx[i], win[i] ), q_shift ),
+                                            sub( MAX_16, mult( sub( MAX_16, fac ), sub( MAX_16, fac ) ) ) ) ); /* Q(q_shift -1) */
             move16();
-            hCPE->hStereoDft->res_cod_mem_fx[i] = L_mult( win[L_FRAME8k + i], hCPE->hStereoDft->win_8k_fx[STEREO_DFT_OVL_8k - 1 - i] ); /* Q16 */
+            hCPE->hStereoDft->res_cod_mem_fx[i] = L_mult( win[L_FRAME8k + i], hCPE->hStereoDft->win_8k_fx[STEREO_DFT_OVL_8k - 1 - i] ); /* Q15 */
             move32();
             fac = add( fac, step );
         }
     }
 
-    Copy( win, out_16, L_FRAME8k ); /* Q0 */
+    IF( q_shift != 0 )
+    {
+        v_shr_16( &win[STEREO_DFT_OVL_8k], negate( q_shift ), &win[STEREO_DFT_OVL_8k], L_FRAME8k );
+    }
+
+    hCPE->hStereoDft->q_res_cod_mem_fx = Q15;
+
+    Copy( win, out_16, L_FRAME8k ); /* Q(q_shift -1 ) */
 
     IF( hCPE->hCoreCoder[0]->core == ACELP_CORE )
     {
         /* bass post-filter */
         bass_psfilter_fx( hCPE->hStereoDft->hBpf, hCPE->hCoreCoder[0]->Opt_AMR_WB, out_16, L_FRAME8k, hCPE->hCoreCoder[0]->old_pitch_buf_16_fx + ( L_FRAME8k / STEREO_DFT_L_SUBFR_8k ), hCPE->hCoreCoder[0]->bpf_off,
-                          hCPE->hCoreCoder[0]->stab_fac_fx, &hCPE->hStereoDft->stab_fac_smooth_res_fx, hCPE->hCoreCoder[0]->last_coder_type, 0, bpf_error_signal_8k_16 );
-        Copy_Scale_sig_16_32( bpf_error_signal_8k_16, bpf_error_signal_8k, L_FRAME8k, Q15 ); /* Q15 */
+                          hCPE->hCoreCoder[0]->stab_fac_fx, &hCPE->hStereoDft->stab_fac_smooth_res_fx, hCPE->hCoreCoder[0]->last_coder_type, sub( q_shift, 1 ), bpf_error_signal_8k_16 );
+        Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_8k_16, bpf_error_signal_8k, L_FRAME8k, Q15 ); /* Q15 */
         res_bpf_flag = res_bpf_adapt_ivas_fx( hCPE->hStereoDft, bpf_error_signal_8k, res_buf, q_res );
 
         IF( prev_bfi )
@@ -1404,7 +1408,7 @@ void stereo_dft_dec_res_fx(
                 move32();
             }
         }
-        Copy_Scale_sig_16_32( out_16, output, L_FRAME8k, 16 ); /* Q16 */
+        Copy_Scale_sig_16_32_no_sat( out_16, output, L_FRAME8k, sub( 15, sub( q_shift, 1 ) ) ); /* Q15 */
         IF( res_bpf_flag )
         {
             v_sub_32( output, bpf_error_signal_8k, output, L_FRAME8k );
@@ -1415,12 +1419,12 @@ void stereo_dft_dec_res_fx(
         set16_fx( hCPE->hStereoDft->hBpf->pst_old_syn_fx, 0, STEREO_DFT_NBPSF_PIT_MAX_8k );
         hCPE->hStereoDft->hBpf->pst_mem_deemp_err_fx = 0;
         move16();
-        Copy_Scale_sig_16_32( out_16, output, L_FRAME8k, 16 ); /* Q16 */
+        Copy_Scale_sig_16_32_no_sat( out_16, output, L_FRAME8k, sub( 15, sub( q_shift, 1 ) ) ); /* Q15 */
     }
     ELSE
     {
         /* This step is needed to ensure output is properly populated with scaled values in all cases*/
-        Copy_Scale_sig_16_32( out_16, output, L_FRAME8k, 16 ); /* Q16 */
+        Copy_Scale_sig_16_32_no_sat( out_16, output, L_FRAME8k, sub( 15, sub( q_shift, 1 ) ) ); /* Q15 */
     }
 
     return;
@@ -1481,8 +1485,11 @@ void stereo_dft_dec_fx(
     HANDLE_FD_CNG_COM hFdCngCom = hFdCngDec->hFdCngCom;
     Word16 *cna_seed = &( hFdCngCom->seed );
     Word32 DFT_W, DFT_Y;
+#ifndef OPT_STEREO_32KBPS_V1
     Word16 q_samp_ratio = Q15;
     move16();
+#endif /* OPT_STEREO_32KBPS_V1 */
+    Word16 len;
 
     output_frame = (Word16) Mpy_32_32( L_add( st0->output_Fs, FRAMES_PER_SEC_BY_2 ), ONE_BY_FRAMES_PER_SEC_Q31 ); /* Q0 */
 
@@ -1490,8 +1497,12 @@ void stereo_dft_dec_fx(
      * Initialization
      *-----------------------------------------------------------------*/
 
+#ifdef OPT_STEREO_32KBPS_V1
+    samp_ratio = divide3232( st0->sr_core, st0->output_Fs ); // Q15
+#else                                                        /* OPT_STEREO_32KBPS_V1 */
     samp_ratio = (Word16) BASOP_Util_Divide3232_Scale( st0->sr_core, st0->output_Fs, &q_samp_ratio );
     samp_ratio = shr( samp_ratio, sub( Q15 - Q12, q_samp_ratio ) );
+#endif                                                       /* OPT_STEREO_32KBPS_V1 */
 
 
     stop = shr( STEREO_DFT32MS_N_32k, 1 );
@@ -1847,7 +1858,8 @@ void stereo_dft_dec_fx(
                                 DFT_R[2 * i + 1] = L_sub( DFT_W, DFT_Y ); /* qDFT */
                                 move32();
                             }
-                            FOR( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ )
+                            len = s_min( stop, hStereoDft->band_limits[b + 1] );
+                            FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
                             {
                                 DFT_W = Madd_32_32( Mpy_32_32( hStereoDft->mixer_mat_smooth_fx[0][0][b + k * IVAS_MAX_NUM_BANDS], pDFT_DMX[2 * i] ),
                                                     L_add( hStereoDft->mixer_mat_smooth_fx[0][1][b + k * IVAS_MAX_NUM_BANDS],
@@ -1954,7 +1966,8 @@ void stereo_dft_dec_fx(
                 }
                 ELSE
                 {
-                    FOR( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ )
+                    len = s_min( stop, hStereoDft->band_limits[b + 1] );
+                    FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
                     {
                         tmp = L_add( Madd_32_16( pDFT_RES[2 * i], pDFT_DMX[2 * i], g ), DFT_PRED_RES[2 * i] ); /* qDFT */
 
@@ -2064,10 +2077,17 @@ void stereo_dft_dec_fx(
             /*Nyquist Freq.*/
             IF( EQ_16( hStereoDft->band_limits[b], shr( hStereoDft->NFFT, 1 ) ) )
             {
+#ifdef OPT_STEREO_32KBPS_V1
+                DFT_L[1] = Madd_32_16( pDFT_DMX[1], pDFT_DMX[1], g ); /* qDFT */
+                move32();
+                DFT_R[1] = Msub_32_16( pDFT_DMX[1], pDFT_DMX[1], g ); /* qDFT */
+                move32();
+#else                                                                 /* OPT_STEREO_32KBPS_V1 */
                 DFT_L[1] = L_add( pDFT_DMX[1], Mpy_32_16_1( pDFT_DMX[1], g ) ); /* qDFT */
                 move32();
                 DFT_R[1] = L_sub( pDFT_DMX[1], Mpy_32_16_1( pDFT_DMX[1], g ) ); /* qDFT */
                 move32();
+#endif                                                                /* OPT_STEREO_32KBPS_V1 */
                 DFT_L[1] = Mpy_32_16_1( DFT_L[1], INV_SQRT2_FX_Q15 ); /* qDFT */
                 move32();
                 DFT_R[1] = Mpy_32_16_1( DFT_R[1], INV_SQRT2_FX_Q15 ); /* qDFT */
@@ -2168,8 +2188,8 @@ void stereo_dft_dec_fx(
                     gamma = 0;
                     move16();
                 }
-
-                FOR( i = max( hFdCngDec->cna_band_limits[b], ( hFdCngCom->startBand / 2 ) ); i < min( hFdCngDec->cna_band_limits[b + 1], ( L_FRAME16k ) >> 1 ); i++ )
+                len = s_min( hFdCngDec->cna_band_limits[b + 1], ( L_FRAME16k ) >> 1 );
+                FOR( i = s_max( hFdCngDec->cna_band_limits[b], ( hFdCngCom->startBand >> 1 ) ); i < len; i++ ) // i < min( hFdCngDec->cna_band_limits[b + 1], ( L_FRAME16k ) >> 1 );
                 {
                     Word32 l_tmp;
                     lev1 = *ptr_per++;
@@ -2200,27 +2220,52 @@ void stereo_dft_dec_fx(
                     q_cna_level = sub( Q31, add( q_cna_level, Q16 ) );
 
                     /* generate comfort noise from gaussian noise and add to the decoded DFT spectrum */
+#ifdef OPT_STEREO_32KBPS_V1
+                    Word16 shift = sub( q_cna_level, hStereoDft->q_dft );
+#endif                                                                                              /* OPT_STEREO_32KBPS_V1 */
                     N1 = L_shl( Mpy_32_16_1( scale_fact, rand_gauss_fix( &ftmp, cna_seed ) ), Q2 ); /* q_cna_level */
                     N2 = L_shl( Mpy_32_16_1( scale_fact, rand_gauss_fix( &ftmp, cna_seed ) ), Q2 ); /* q_cna_level */
-                    l_tmp = L_add( Madd_32_16( N1, N1, g ), Mpy_32_16_1( N2, gamma ) );             /* q_cna_level */
-                    l_tmp = L_shr( l_tmp, sub( q_cna_level, hStereoDft->q_dft ) );                  /* q_dft */
-                    DFT_L[2 * i] = L_add( DFT_L[2 * i], l_tmp );                                    /* q_dft */
+#ifdef OPT_STEREO_32KBPS_V1
+                    l_tmp = Madd_32_16( Madd_32_16( N1, N1, g ), N2, gamma ); /* q_cna_level */
+                    l_tmp = L_shr( l_tmp, shift );                            /* q_dft */
+#else                                                                         /* OPT_STEREO_32KBPS_V1 */
+                    l_tmp = L_add( Madd_32_16( N1, N1, g ), Mpy_32_16_1( N2, gamma ) ); /* q_cna_level */
+                    l_tmp = L_shr( l_tmp, sub( q_cna_level, hStereoDft->q_dft ) );      /* q_dft */
+#endif                                                                        /* OPT_STEREO_32KBPS_V1 */
+                    DFT_L[2 * i] = L_add( DFT_L[2 * i], l_tmp );              /* q_dft */
                     move32();
+#ifdef OPT_STEREO_32KBPS_V1
+                    l_tmp = Msub_32_16( Msub_32_16( N1, N1, g ), N2, gamma ); /* q_cna_level */
+                    l_tmp = L_shr( l_tmp, shift );                            /* q_dft */
+                    DFT_R[2 * i] = L_add( DFT_R[2 * i], l_tmp );              /* q_dft */
+#else                                                                         /* OPT_STEREO_32KBPS_V1 */
                     l_tmp = L_sub( Msub_32_16( N1, N1, g ), Mpy_32_16_1( N2, gamma ) ); /* q_cna_level */
                     l_tmp = L_shr( l_tmp, sub( q_cna_level, hStereoDft->q_dft ) );      /* q_dft */
                     DFT_R[2 * i] = L_add( DFT_R[2 * i], l_tmp );                        /* q_dft */
+#endif                                                                        /* OPT_STEREO_32KBPS_V1 */
                     move32();
 
                     N1 = L_shl( Mpy_32_16_1( scale_fact, rand_gauss_fix( &ftmp, cna_seed ) ), Q2 ); /* q_cna_level */
                     N2 = L_shl( Mpy_32_16_1( scale_fact, rand_gauss_fix( &ftmp, cna_seed ) ), Q2 ); /* q_cna_level */
-                    l_tmp = L_add( Madd_32_16( N1, N1, g ), Mpy_32_16_1( N2, gamma ) );             /* q_cna_level */
-                    l_tmp = L_shr( l_tmp, sub( q_cna_level, hStereoDft->q_dft ) );                  /* q_dft */
-                    DFT_L[2 * i + 1] = L_add( DFT_L[2 * i + 1], l_tmp );                            /* q_dft */
+#ifdef OPT_STEREO_32KBPS_V1
+                    l_tmp = Madd_32_16( Madd_32_16( N1, N1, g ), N2, gamma ); /* q_cna_level */
+                    l_tmp = L_shr( l_tmp, shift );                            /* q_dft */
+                    DFT_L[2 * i + 1] = L_add( DFT_L[2 * i + 1], l_tmp );      /* q_dft */
+                    move32();
+                    l_tmp = Msub_32_16( Msub_32_16( N1, N1, g ), N2, gamma ); /* q_cna_level */
+                    l_tmp = L_shr( l_tmp, shift );                            /* q_dft */
+                    DFT_R[2 * i + 1] = L_add( DFT_R[2 * i + 1], l_tmp );      /* q_dft */
+                    move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
+                    l_tmp = L_add( Madd_32_16( N1, N1, g ), Mpy_32_16_1( N2, gamma ) ); /* q_cna_level */
+                    l_tmp = L_shr( l_tmp, sub( q_cna_level, hStereoDft->q_dft ) );      /* q_dft */
+                    DFT_L[2 * i + 1] = L_add( DFT_L[2 * i + 1], l_tmp );                /* q_dft */
                     move32();
                     l_tmp = L_sub( Msub_32_16( N1, N1, g ), Mpy_32_16_1( N2, gamma ) ); /* q_cna_level */
                     l_tmp = L_shr( l_tmp, sub( q_cna_level, hStereoDft->q_dft ) );      /* q_dft */
                     DFT_R[2 * i + 1] = L_add( DFT_R[2 * i + 1], l_tmp );                /* q_dft */
                     move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
                 }
             }
 
@@ -2308,8 +2353,12 @@ static void stereo_dft_compute_td_stefi_params_fx(
         return;
     }
 
+#ifdef OPT_STEREO_32KBPS_V1
+    bin0 = round_fx( L_mult0( hStereoDft->NFFT, samp_ratio ) );
+#else                                                                  /* OPT_STEREO_32KBPS_V1 */
     bin0 = extract_l( L_shr_r( Mpy_32_16_1( (Word32) hStereoDft->NFFT, samp_ratio ), 1 ) ); /* Q0 */
     bin0 = shl( bin0, Q3 );
+#endif                                                                 /* OPT_STEREO_32KBPS_V1 */
     bin0 = s_min( bin0, hStereoDft->band_limits[hStereoDft->nbands] ); /* Q0 */
     b = hStereoDft->nbands;                                            /* Q0 */
     move16();
@@ -2474,14 +2523,18 @@ static void stereo_dft_dequantize_ipd_fx(
  *-------------------------------------------------------------------------*/
 void stereo_dft_generate_res_pred_fx(
     STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle		    */
-    const Word16 samp_ratio,               /* i  : sampling ratio                    Q13*/
-    Word32 *pDFT_DMX,                      /* i  : downmix signal                   qDFT*/
-    Word32 *DFT_PRED_RES,                  /* o  : residual prediction signal       qDFT*/
-    Word32 *pPredGain,                     /* i  : residual prediction gains         Q31*/
-    const Word16 k,                        /* i  : subframe index					  Q0*/
-    Word32 *ap_filt_DMX,                   /* i  : enhanced stereo filling signal	qDFT*/
-    Word16 *stop,                          /* o  : last FD stereo filling bin         Q0*/
-    const Word16 bfi                       /* i  : BFI flag                           Q0*/
+#ifdef OPT_STEREO_32KBPS_V1
+    const Word16 samp_ratio, /* i  : sampling ratio                    Q15*/
+#else                        /* OPT_STEREO_32KBPS_V1 */
+    const Word16 samp_ratio, /* i  : sampling ratio                    Q13*/
+#endif                       /* OPT_STEREO_32KBPS_V1 */
+    Word32 *pDFT_DMX,        /* i  : downmix signal                   qDFT*/
+    Word32 *DFT_PRED_RES,    /* o  : residual prediction signal       qDFT*/
+    Word32 *pPredGain,       /* i  : residual prediction gains         Q31*/
+    const Word16 k,          /* i  : subframe index					  Q0*/
+    Word32 *ap_filt_DMX,     /* i  : enhanced stereo filling signal	qDFT*/
+    Word16 *stop,            /* o  : last FD stereo filling bin         Q0*/
+    const Word16 bfi         /* i  : BFI flag                           Q0*/
 )
 {
     /* general variables */
@@ -2491,7 +2544,10 @@ void stereo_dft_generate_res_pred_fx(
     Word16 lb_stefi_start_band;
 
     /* variables for enhanced stereo filling */
-    Word16 norm_fac, q_norm_fac, lim_norm_fac;
+    Word16 norm_fac, q_norm_fac;
+#ifndef OPT_STEREO_32KBPS_V1
+    Word16 lim_norm_fac;
+#endif /* OPT_STEREO_32KBPS_V1 */
     Word16 q_sqrt;
     Word16 alpha; // gain_limit;
 
@@ -2505,8 +2561,13 @@ void stereo_dft_generate_res_pred_fx(
     Word32 pred_gain_avg;
     Word32 g2;
     Word16 nbands_respred;
+#ifdef OPT_STEREO_32KBPS_V1
+    Word16 q_new, diff;
+#else  /* OPT_STEREO_32KBPS_V1 */
     q_norm_fac = 0;
     move16();
+#endif /* OPT_STEREO_32KBPS_V1 */
+    Word16 len;
     push_wmops( "gen_respred" );
 
     /* smoothing and limiting parameters */
@@ -2528,8 +2589,12 @@ void stereo_dft_generate_res_pred_fx(
 
     /* In ACELP mode the downmix signal is not available in bandwidth extension area. *
      * Therefore, the downmix energy in the corresponding subbands is estimated.      */
+#ifdef OPT_STEREO_32KBPS_V1
+    bin0 = round_fx( L_mult0( hStereoDft->NFFT, samp_ratio ) );
+#else                                                                  /* OPT_STEREO_32KBPS_V1 */
     bin0 = (Word16) ( L_shr( L_add( L_mult0( hStereoDft->NFFT, samp_ratio ), ONE_IN_Q12 ), Q12 + 1 ) ); /* Q0 */
     move16();
+#endif                                                                 /* OPT_STEREO_32KBPS_V1 */
     bin0 = s_min( bin0, hStereoDft->band_limits[hStereoDft->nbands] ); /* Q0 */
     b = hStereoDft->nbands;
     move16();
@@ -2571,39 +2636,81 @@ void stereo_dft_generate_res_pred_fx(
             move64();
 
             /* calculate band energies (low band only in case of ACELP) */
-            FOR( i = hStereoDft->band_limits[b]; i < min( hStereoDft->band_limits[b + 1], bin0 ); i++ )
+            len = s_min( hStereoDft->band_limits[b + 1], bin0 );
+            FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
             {
+#ifdef OPT_STEREO_32KBPS_V1
+                dmx_nrg_64bit = W_mac_32_32( W_mac_32_32( dmx_nrg_64bit, pDFT_DMX[2 * i], pDFT_DMX[2 * i] ),
+                                             pDFT_DMX[2 * i + 1], pDFT_DMX[2 * i + 1] ); /* 2 * q_dft + 1 */
+                rev_nrg_64bit = W_mac_32_32( W_mac_32_32( rev_nrg_64bit, ap_filt_DMX[2 * i], ap_filt_DMX[2 * i] ),
+                                             ap_filt_DMX[2 * i + 1], ap_filt_DMX[2 * i + 1] ); /* 2 * q_dft + 1 */
+#else                                                                                          /* OPT_STEREO_32KBPS_V1 */
                 dmx_nrg_64bit = W_add( dmx_nrg_64bit,
                                        W_add( W_mult0_32_32( pDFT_DMX[2 * i], pDFT_DMX[2 * i] ),
                                               W_mult0_32_32( pDFT_DMX[2 * i + 1], pDFT_DMX[2 * i + 1] ) ) ); /* 2 * q_dft */
                 rev_nrg_64bit = W_add( rev_nrg_64bit,
                                        W_add( W_mult0_32_32( ap_filt_DMX[2 * i], ap_filt_DMX[2 * i] ),
                                               W_mult0_32_32( ap_filt_DMX[2 * i + 1], ap_filt_DMX[2 * i + 1] ) ) ); /* 2 * q_dft */
+#endif                                                                                         /* OPT_STEREO_32KBPS_V1 */
             }
+
+#ifdef OPT_STEREO_32KBPS_V1
+            q_new = add( shl( hStereoDft->q_dft, 1 ), 1 );
+            q_shift = W_norm( dmx_nrg_64bit );
+            dmx_nrg = W_shl_sat_l( dmx_nrg_64bit, sub( q_shift, 32 ) ); // 2 * hStereoDft->q_dft + 1 - (q_shift - 32)
+            dmx_nrg_q = add( q_new, sub( q_shift, 32 ) );
+            q_shift = W_norm( rev_nrg_64bit );
+            rev_nrg = W_shl_sat_l( rev_nrg_64bit, sub( q_shift, 32 ) ); // 2 * hStereoDft->q_dft + 1 - (q_shift - 32)
+            rev_nrg_q = add( q_new, sub( q_shift, 32 ) );
+            move16();
+#else  /* OPT_STEREO_32KBPS_V1 */
             q_shift = W_norm( dmx_nrg_64bit );
             dmx_nrg = W_extract_l( W_shl( dmx_nrg_64bit, sub( q_shift, 32 ) ) ); // 2 * hStereoDft->q_dft + (q_shift - 32)
             dmx_nrg_q = add( imult1616( 2, hStereoDft->q_dft ), sub( q_shift, 32 ) );
             q_shift = W_norm( rev_nrg_64bit );
             rev_nrg = W_extract_l( W_shl( rev_nrg_64bit, sub( q_shift, 32 ) ) ); // 2 * hStereoDft->q_dft + (q_shift - 32)
             rev_nrg_q = add( imult1616( 2, hStereoDft->q_dft ), sub( q_shift, 32 ) );
+#endif /* OPT_STEREO_32KBPS_V1 */
 
             /* Reach a common Q for dmx_nrg and rev_nrg */
             q_com = s_min( dmx_nrg_q, rev_nrg_q );
             dmx_nrg = L_shl( dmx_nrg, sub( q_com, dmx_nrg_q ) ); /* q_com */
             rev_nrg = L_shl( rev_nrg, sub( q_com, rev_nrg_q ) ); /* q_com */
+
+#ifdef OPT_STEREO_32KBPS_V1
+            diff = sub( hStereoDft->q_smoothed_nrg, q_com );
+            IF( diff < 0 )
+#else  /* OPT_STEREO_32KBPS_V1 */
             IF( LT_16( hStereoDft->q_smoothed_nrg, q_com ) )
+#endif /* OPT_STEREO_32KBPS_V1 */
             {
+#ifdef OPT_STEREO_32KBPS_V1
+                rev_nrg = L_shl( rev_nrg, shl( diff, 1 ) );
+                dmx_nrg = L_shl( dmx_nrg, shl( diff, 1 ) );
+#else  /* OPT_STEREO_32KBPS_V1 */
                 rev_nrg = L_shr( rev_nrg, shl( sub( q_com, hStereoDft->q_smoothed_nrg ), 1 ) );
                 dmx_nrg = L_shr( dmx_nrg, shl( sub( q_com, hStereoDft->q_smoothed_nrg ), 1 ) );
+#endif /* OPT_STEREO_32KBPS_V1 */
                 q_com = hStereoDft->q_smoothed_nrg;
                 move16();
             }
+#ifdef OPT_STEREO_32KBPS_V1
+            ELSE
+#else  /* OPT_STEREO_32KBPS_V1 */
             ELSE IF( GT_16( hStereoDft->q_smoothed_nrg, q_com ) )
+#endif /* OPT_STEREO_32KBPS_V1 */
             {
+#ifdef OPT_STEREO_32KBPS_V1
+                hStereoDft->smooth_res_nrg_fx[b] = L_shr( hStereoDft->smooth_res_nrg_fx[b], shl( diff, 1 ) ); /* hStereoDft->q_smoothed_nrg */
+                move32();
+                hStereoDft->smooth_dmx_nrg_fx[b] = L_shr( hStereoDft->smooth_dmx_nrg_fx[b], shl( diff, 1 ) ); /* hStereoDft->q_smoothed_nrg */
+                move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
                 hStereoDft->smooth_res_nrg_fx[b] = L_shr( hStereoDft->smooth_res_nrg_fx[b], shl( sub( hStereoDft->q_smoothed_nrg, q_com ), 1 ) ); /* hStereoDft->q_smoothed_nrg */
                 move32();
                 hStereoDft->smooth_dmx_nrg_fx[b] = L_shr( hStereoDft->smooth_dmx_nrg_fx[b], shl( sub( hStereoDft->q_smoothed_nrg, q_com ), 1 ) ); /* hStereoDft->q_smoothed_nrg */
                 move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
                 q_smoothed_nrg_local[b] = q_com;
                 move16();
             }
@@ -2613,9 +2720,38 @@ void stereo_dft_generate_res_pred_fx(
             hStereoDft->smooth_dmx_nrg_fx[b] = Madd_32_16( Mpy_32_16_1( hStereoDft->smooth_dmx_nrg_fx[b], alpha ), dmx_nrg, sub( (Word16) ( 0x7FFF ), alpha ) ); /* hStereoDft->q_smoothed_nrg */
             move32();
 
+#ifdef OPT_STEREO_32KBPS_V1
+            // Compute norm_fac in Q14
+            norm_fac = MAX_16;
+            move16();
+#endif /* OPT_STEREO_32KBPS_V1 */
             /* normalization factor */
             IF( hStereoDft->smooth_res_nrg_fx[b] != 0 )
             {
+#ifdef OPT_STEREO_32KBPS_V1
+                norm_fac = 0;
+                move16();
+                IF( hStereoDft->smooth_dmx_nrg_fx[b] != 0 )
+                {
+                    Word16 quo, quo_e;
+                    Word32 prod;
+
+                    norm_fac = BASOP_Util_Divide3232_Scale( hStereoDft->smooth_dmx_nrg_fx[b], hStereoDft->smooth_res_nrg_fx[b], &q_norm_fac ); /* q_norm_fac */
+                    norm_fac = Sqrt16( norm_fac, &q_norm_fac );
+
+                    quo = BASOP_Util_Divide1616_Scale( 32767, norm_fac, &quo_e ); /* q_norm_fac */
+                    quo_e = sub( quo_e, q_norm_fac );
+                    quo = shl_sat( quo, sub( quo_e, 1 ) ); // Q14
+                    quo = s_max( 13107 /*0.8 in Q14 */, quo );
+                    quo = s_min( quo, 20480 /* 1.25 in Q14*/ );
+
+                    prod = L_mult( norm_fac, quo ); // exp:q_norm_fac+1
+                    // Bring to Q30
+                    prod = L_shl_sat( prod, q_norm_fac );
+
+                    norm_fac = extract_h( prod );
+                }
+#else  /* OPT_STEREO_32KBPS_V1 */
                 norm_fac = BASOP_Util_Divide3232_Scale( hStereoDft->smooth_dmx_nrg_fx[b], hStereoDft->smooth_res_nrg_fx[b], &q_norm_fac ); /* q_norm_fac */
                 norm_fac = Sqrt16( norm_fac, &q_norm_fac );
                 IF( norm_fac != 0 )
@@ -2671,7 +2807,9 @@ void stereo_dft_generate_res_pred_fx(
                         }
                     }
                 }
+#endif /* OPT_STEREO_32KBPS_V1 */
             }
+#ifndef OPT_STEREO_32KBPS_V1
             ELSE
             {
                 norm_fac = MAX_16;
@@ -2679,13 +2817,22 @@ void stereo_dft_generate_res_pred_fx(
                 q_norm_fac = Q1;
                 move16();
             }
+#endif /* OPT_STEREO_32KBPS_V1 */
 
-            FOR( i = hStereoDft->band_limits[b]; i < min( hStereoDft->band_limits[b + 1], bin0 ); i++ )
+            len = s_min( hStereoDft->band_limits[b + 1], bin0 );
+            FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
             {
+#ifdef OPT_STEREO_32KBPS_V1
+                DFT_PRED_RES[2 * i] = L_shl( Mpy_32_32( Mpy_32_16_1( pPredGain[b], norm_fac ), ap_filt_DMX[2 * i] ), 1 ); /* q_dft */
+                move32();
+                DFT_PRED_RES[2 * i + 1] = L_shl( Mpy_32_32( Mpy_32_16_1( pPredGain[b], norm_fac ), ap_filt_DMX[2 * i + 1] ), 1 ); /* q_dft */
+                move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
                 DFT_PRED_RES[2 * i] = L_shl( Mpy_32_32( Mpy_32_16_1( pPredGain[b], norm_fac ), ap_filt_DMX[2 * i] ), q_norm_fac ); /* q_dft */
                 move32();
                 DFT_PRED_RES[2 * i + 1] = L_shl( Mpy_32_32( Mpy_32_16_1( pPredGain[b], norm_fac ), ap_filt_DMX[2 * i + 1] ), q_norm_fac ); /* q_dft */
                 move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
             }
         }
 
@@ -2795,7 +2942,8 @@ void stereo_dft_generate_res_pred_fx(
                 move32();
                 dmx_nrg = EPSILON_FIX;
                 move32();
-                FOR( i = hStereoDft->band_limits[b]; i < min( bin0, hStereoDft->band_limits[b + 1] ); i++ )
+                len = s_min( bin0, hStereoDft->band_limits[b + 1] );
+                FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
                 {
                     dmx_nrg = Madd_32_32( Madd_32_32( dmx_nrg, pDFT_DMX[2 * i], pDFT_DMX[2 * i] ), pDFT_DMX[2 * i + 1], pDFT_DMX[2 * i + 1] ); /* 2 * q_dft - 31 */
 
@@ -2836,8 +2984,8 @@ void stereo_dft_generate_res_pred_fx(
                         q_sqrt = 0;
                         move16();
                     }
-
-                    FOR( i = hStereoDft->band_limits[b]; i < min( bin0, hStereoDft->band_limits[b + 1] ); i++ )
+                    len = s_min( bin0, hStereoDft->band_limits[b + 1] );
+                    FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
                     {
                         DFT_PRED_RES[2 * i] = L_shl( Mpy_32_32( g2, DFT_PRED_RES[2 * i] ), q_sqrt ); /* q_dft */
                         move32();
@@ -2894,7 +3042,8 @@ void stereo_dft_generate_res_pred_fx(
             // past_dmx_nrg = EPSILON_FIX;
             past_dmx_nrg = 0;
             move32();
-            FOR( i = bin0; i < min( ( hStereoDft->NFFT / 2 ), ( STEREO_DFT32MS_N_32k / 2 ) ); i++ )
+            len = s_min( shr( hStereoDft->NFFT, 1 ), ( STEREO_DFT32MS_N_32k >> 1 ) );
+            FOR( i = bin0; i < len; i++ ) // i < min( ( hStereoDft->NFFT / 2 ), ( hStereoDft->NFFT / 2 ) )
             {
                 past_dmx_nrg = L_add( past_dmx_nrg, Madd_32_32( Mpy_32_32( hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i], hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i] ), hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i + 1], hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i + 1] ) ); /* 2 * hStereoDft->q_DFT_past_DMX_fx[d_short_ind] - 31 */
             }
@@ -2955,7 +3104,8 @@ void stereo_dft_generate_res_pred_fx(
                     }
                     q_shift = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[d_short_ind] );
                     move16();
-                    FOR( i = max( hStereoDft->band_limits[b], bin0 ); i < min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k / 2 ); i++ )
+                    len = s_min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k >> 1 );
+                    FOR( i = s_max( hStereoDft->band_limits[b], bin0 ); i < len; i++ ) // i < min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k / 2 )
                     {
                         DFT_PRED_RES[2 * i] = L_shl( Mpy_32_32( g2, hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i] ), q_shift ); /* q_dft */
                         move32();
@@ -3069,7 +3219,8 @@ void stereo_dft_generate_res_pred_fx(
                     move32();
                     dmx_nrg = EPSILON_FIX;
                     move32();
-                    FOR( i = max( hStereoDft->band_limits[b], bin0 ); i < min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k / 2 ); i++ )
+                    len = s_min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k >> 1 );
+                    FOR( i = s_max( hStereoDft->band_limits[b], bin0 ); i < len; i++ ) // i < min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k / 2 )
                     {
                         dmx_nrg = L_add( dmx_nrg, L_shr( Madd_32_32( Mpy_32_32( pDFT_DMX[2 * i], pDFT_DMX[2 * i] ), pDFT_DMX[2 * i + 1], pDFT_DMX[2 * i + 1] ), 1 ) ); /* 2 * q_dft - 31 - 1 */
 
@@ -3095,8 +3246,8 @@ void stereo_dft_generate_res_pred_fx(
 
                     g2 = L_min( Mpy_32_16_1( pred_gain_avg, STEREO_DFT_STEFFI_GAIN_AMP_FX ),
                                 Madd_32_16( Mpy_32_16_1( pred_gain_avg, sub( (Word16) ( 0x7FFF ), STEREO_DFT_STEFFI_GAIN_REST_AMT_FX ) ), g2, STEREO_DFT_STEFFI_GAIN_REST_AMT_FX ) ); /* Q31 */
-
-                    FOR( i = max( hStereoDft->band_limits[b], bin0 ); i < min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k / 2 ); i++ )
+                    len = s_min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k >> 1 );
+                    FOR( i = s_max( hStereoDft->band_limits[b], bin0 ); i < len; i++ ) // i < min( hStereoDft->band_limits[b + 1], STEREO_DFT32MS_N_32k / 2 )
                     {
                         DFT_PRED_RES[2 * i] = Mpy_32_32( g2, DFT_PRED_RES[2 * i] ); /* Q31 */
                         move32();
diff --git a/lib_dec/ivas_stereo_dft_plc.c b/lib_dec/ivas_stereo_dft_plc.c
deleted file mode 100644
index 3988b275ab72e96c190c47bfb82a17d72f87812a..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_stereo_dft_plc.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "math.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_stereo_dft_plc_fx.c b/lib_dec/ivas_stereo_dft_plc_fx.c
index ded3b48f450be00dc719a5359a488c15a96afc74..3fed308b21c3368cd93ec8880bc612d2a9bfde60 100644
--- a/lib_dec/ivas_stereo_dft_plc_fx.c
+++ b/lib_dec/ivas_stereo_dft_plc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,10 +33,8 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "math.h"
 #include "wmc_auto.h"
@@ -190,6 +188,8 @@ Word32 imax_pos_fx(
     Word32 posi, y1, y2, y3, y3_y1, y2i;
     Word32 ftmp_den1, ftmp_den2;
     Word16 q_div_2i, q_div_posi;
+    Word64 W_tmp;
+    Word16 shift1, shift2;
     /* Seek the extrema of the parabola P(x) defined by 3 consecutive points so that P([-1 0 1]) = [y1 y2 y3] */
     y1 = y[0]; /* Qx */
     move32();
@@ -197,9 +197,13 @@ Word32 imax_pos_fx(
     move32();
     y3 = y[2]; /* Qx */
     move32();
-    y3_y1 = L_sub( y3, y1 );                                          /* Qx */
-    ftmp_den1 = L_sub( L_add( y1, y3 ), L_shl( y2, 1 ) );             /* Qx */
-    ftmp_den2 = L_shl( L_sub( L_sub( L_shl( y2, 1 ), y1 ), y3 ), 1 ); /* Qx */
+    y3_y1 = L_sub( y3, y1 );                          /* Qx */
+    W_tmp = W_sub( W_add( y1, y3 ), W_shl( y2, 1 ) ); /* Qx */
+    shift1 = W_norm( W_tmp );
+    ftmp_den1 = W_extract_h( W_shl( W_tmp, shift1 ) );            /* Qx + shift1 - 32 */
+    W_tmp = W_shl( W_sub( W_sub( W_shl( y2, 1 ), y1 ), y3 ), 1 ); /* Qx */
+    shift2 = W_norm( W_tmp );
+    ftmp_den2 = W_extract_h( W_shl( W_tmp, shift2 ) ); /* Qx + shift2 - 32 */
 
     test();
     IF( ( ftmp_den2 == 0 ) || ( ftmp_den1 == 0 ) )
@@ -208,6 +212,7 @@ Word32 imax_pos_fx(
     }
 
     y2i = Mpy_32_16_1( Mpy_32_16_1( y3_y1, BASOP_Util_Divide3232_Scale( y3_y1, ftmp_den1, &q_div_2i ) ), (Word16) ( 0xF000 ) ); /* q_div_2i */
+    q_div_2i = sub( add( q_div_2i, shift1 ), 32 );
     IF( q_div_2i < 0 )
     {
         y2i = L_shl( y2i, q_div_2i );
@@ -221,6 +226,7 @@ Word32 imax_pos_fx(
     }
     /* their corresponding normalized locations */
     posi = BASOP_Util_Divide3232_Scale( y3_y1, ( ftmp_den2 ), &q_div_posi ); /* q_div_posi */
+    q_div_posi = sub( add( q_div_posi, shift2 ), 32 );
     IF( ( q_div_posi != 0 ) )
     {
         posi = L_shl( posi, q_div_posi );
diff --git a/lib_dec/ivas_stereo_eclvq_dec.c b/lib_dec/ivas_stereo_eclvq_dec_fx.c
similarity index 98%
rename from lib_dec/ivas_stereo_eclvq_dec.c
rename to lib_dec/ivas_stereo_eclvq_dec_fx.c
index c74649d9087f7beef67e4203ea79cb1718302929..dfa411145fc3ce2930203029047d821a1d37e45d 100644
--- a/lib_dec/ivas_stereo_eclvq_dec.c
+++ b/lib_dec/ivas_stereo_eclvq_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,12 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include <assert.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
diff --git a/lib_dec/ivas_stereo_esf_dec.c b/lib_dec/ivas_stereo_esf_dec_fx.c
similarity index 98%
rename from lib_dec/ivas_stereo_esf_dec.c
rename to lib_dec/ivas_stereo_esf_dec_fx.c
index e5252804402b411549f6169046b1b81851da3179..d4219f1e60464e7dbaf87c7effb4c814e18bc0ae 100644
--- a/lib_dec/ivas_stereo_esf_dec.c
+++ b/lib_dec/ivas_stereo_esf_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,7 +32,6 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_stat_dec.h"
 #include "ivas_cnst.h"
diff --git a/lib_dec/ivas_stereo_ica_dec.c b/lib_dec/ivas_stereo_ica_dec_fx.c
similarity index 96%
rename from lib_dec/ivas_stereo_ica_dec.c
rename to lib_dec/ivas_stereo_ica_dec_fx.c
index a28afdad9386436838774d62669350813caf43a0..73cf9ccd0c779ab296f375a180d893068f3020a2 100644
--- a/lib_dec/ivas_stereo_ica_dec.c
+++ b/lib_dec/ivas_stereo_ica_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,12 +36,10 @@
 #include <math.h>
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "basop32.h"
 #include "ivas_stat_dec.h"
@@ -61,13 +59,8 @@ void stereo_tca_dec_fx(
 )
 {
     /* Buffers, input Left and right channels  @ input_Fs*/
-#ifdef MSAN_FIX
     Word32 bufChanL_fx[L_DEC_MEM_LEN_ICA + L_FRAME48k] = { 0 };
     Word32 bufChanR_fx[L_DEC_MEM_LEN_ICA + L_FRAME48k] = { 0 };
-#else
-    Word32 bufChanL_fx[L_DEC_MEM_LEN_ICA + L_FRAME48k];
-    Word32 bufChanR_fx[L_DEC_MEM_LEN_ICA + L_FRAME48k];
-#endif
     Word32 *ptrChanL_fx, *ptrChanR_fx;
     Word32 *target_fx;
     Word16 target_idx, prevNCShift, currentNCShift, l_shift_adapt;
@@ -126,7 +119,7 @@ void stereo_tca_dec_fx(
     dsFactor = BASOP_Util_Divide3232_Scale( output_Fs, 8000, &exp_ds );
     dsFactor = shr( dsFactor, sub( 15, exp_ds ) ); /* Q0 */
 
-    tempMax = NS2SA( output_Fs, L_NCSHIFT_NS );                                           /* Q0 */
+    tempMax = NS2SA_FX2( output_Fs, L_NCSHIFT_NS );                                       /* Q0 */
     hStereoTCA->corrLagStats = s_min( hStereoTCA->indx_ica_NCShift * dsFactor, tempMax ); /* Q0 */
 
     bothChannelShift = 0;
@@ -343,14 +336,14 @@ void stereo_tca_scale_R_channel_fx(
         return;
     }
     /* Scale the Right channel with the gain */
-    l_ica_ovl = NS2SA( output_Fs, STEREO_L_TCA_OVLP_NS ); /* Q0 */
+    l_ica_ovl = NS2SA_FX2( output_Fs, STEREO_L_TCA_OVLP_NS ); /* Q0 */
     move16();
 
     test();
     IF( EQ_16( hCPE->nchan_out, 1 ) )
     {
         /* in mono DMX, the scaling is done before synchro_synthesis() */
-        flat_old = NS2SA( output_Fs, ACELP_LOOK_NS + IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS ); /* Q0 */
+        flat_old = NS2SA_FX2( output_Fs, ACELP_LOOK_NS + IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS ); /* Q0 */
         move16();
 
         test();
@@ -365,18 +358,18 @@ void stereo_tca_scale_R_channel_fx(
             hCPE->hStereoDftDmx->targetGain_fx = ONE_IN_Q29;                                           /* Q29 */
             move32();
 
-            flat_old = NS2SA( output_Fs, IVAS_DEC_DELAY_NS ); /* Q0 */
+            flat_old = NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS ); /* Q0 */
             move16();
         }
     }
     ELSE IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_TD ) && EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
     {
-        flat_old = NS2SA( output_Fs, IVAS_DEC_DELAY_NS ); /* Q0 */
+        flat_old = NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS ); /* Q0 */
         move16();
     }
     ELSE
     {
-        flat_old = NS2SA( output_Fs, ACELP_LOOK_NS + IVAS_DEC_DELAY_NS ); /* Q0 */
+        flat_old = NS2SA_FX2( output_Fs, ACELP_LOOK_NS + IVAS_DEC_DELAY_NS ); /* Q0 */
         move16();
     }
 
diff --git a/lib_dec/ivas_stereo_icbwe_dec.c b/lib_dec/ivas_stereo_icbwe_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_stereo_icbwe_dec.c
rename to lib_dec/ivas_stereo_icbwe_dec_fx.c
index 8b8887c9c09a44a09b6fc11ceeab4c190811c18e..772eb2d7d218c7061e3fd9208ac65f818c0ad218 100644
--- a/lib_dec/ivas_stereo_icbwe_dec.c
+++ b/lib_dec/ivas_stereo_icbwe_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,9 +36,7 @@
 #include <math.h>
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "wmc_auto.h"
 #include "rom_com.h"
@@ -236,12 +234,10 @@ void stereo_icBWE_dec_fx(
         ELSE
         {
             set32_fx( hCPE->hStereoDft->hb_stefi_sig_fx + hCPE->hStereoDft->hb_stefi_delay, 0, output_frame );
-#ifdef MSAN_FIX
             hCPE->hStereoDft->hb_nrg_subr_fx[0] = 0;
             move32();
             hCPE->hStereoDft->hb_nrg_subr_fx[1] = 0;
             move32();
-#endif // MSAN_FIX
         }
         hCPE->hStereoDft->hb_nrg_subr_fx[0] = ( Mpy_32_16_1( hCPE->hStereoDft->hb_nrg_subr_fx[0], shl( shr( hCPE->hStereoDft->NFFT, 1 ), 6 ) ) ); // 2 * (Qsynth + SynthRef_shift) - 40                                       // 2 * (Qx + SynthRef_shift) - 31 - 15
         move32();
@@ -339,7 +335,7 @@ void stereo_icBWE_dec_fx(
                     move32();
                     alpha_fx = add_sat( alpha_fx, winSlope_fx ); /* Q15 */
                 }
-                FOR( ; i < NS2SA( st->output_Fs, FRAME_SIZE_NS ); i++ )
+                FOR( ; i < NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS ); i++ )
                 {
                     synthRef_fx[i] = Mpy_32_16_1( synthRef_fx[i], icbweM2Ref_fx ); // Qsyth - 1
                     move32();
@@ -615,7 +611,7 @@ void stereo_icBWE_dec_fx(
         Q_syn_shb = tmp;
         move16();
 
-        deemph_fx_32( 0, shb_synth_nonref_fx + L_SHB_LAHEAD, specMapping_fx, L_FRAME16k, &( hStereoICBWE->memShbSpecMapping_fx ) );
+        deemph_fx_32( shb_synth_nonref_fx + L_SHB_LAHEAD, specMapping_fx, L_FRAME16k, &( hStereoICBWE->memShbSpecMapping_fx ) );
         hStereoICBWE->prev_Q_memshbspec = Q_syn_shb;
         move16();
         Copy32( shb_synth_nonref_fx + L_FRAME16k, hStereoICBWE->mem_syn_shb_nonref_fx, L_SHB_LAHEAD ); /* Q_syn_shb */
@@ -632,7 +628,7 @@ void stereo_icBWE_dec_fx(
         Scale_sig32( shb_synth_nonref_fx, L_FRAME16k + L_SHB_LAHEAD, sub( tmp, Q_syn_shb ) );                                      /* tmp */
         Scale_sig32( hStereoICBWE->mem_syn_shb_ola_nonref_fx, L_SHB_LAHEAD, sub( tmp, hStereoICBWE->prev_Q_syn_shb_ola_nonref ) ); /* tmp */
 
-        ScaleShapedSHB_32( SHB_OVERLAP_LEN, shb_synth_nonref_fx, hStereoICBWE->mem_syn_shb_ola_nonref_fx, hStereoICBWE->gshapeRef_fx, ( Mpy_32_16_1( L_shl( hStereoICBWE->gFrameRef_fx, 1 ), mult_r( gsMapping_fx, 29492 /* 0.9 in Q15 */ ) ) ), window_shb_fx, subwin_shb_fx, &tmp, &temp1_fx );
+        ScaleShapedSHB_fx32( SHB_OVERLAP_LEN, shb_synth_nonref_fx, hStereoICBWE->mem_syn_shb_ola_nonref_fx, hStereoICBWE->gshapeRef_fx, ( Mpy_32_16_1( L_shl( hStereoICBWE->gFrameRef_fx, 1 ), mult_r( gsMapping_fx, 29492 /* 0.9 in Q15 */ ) ) ), window_shb_fx, subwin_shb_fx, &tmp, &temp1_fx );
 
         hStereoICBWE->prev_Q_syn_shb_ola_nonref = tmp;
         move16();
@@ -666,7 +662,7 @@ void stereo_icBWE_dec_fx(
         Q_syn_shb = tmp;
         move16();
 
-        GenSHBSynth_fx_32( shb_synth_nonref_fx, error_fx, hStereoICBWE->memShbHilbert_nonref_fx, hStereoICBWE->memShbInterp_nonref_fx, st->L_frame, &( hStereoICBWE->syn_dm_phase_nonref ) );
+        GenSHBSynth_fx32( shb_synth_nonref_fx, error_fx, hStereoICBWE->memShbHilbert_nonref_fx, hStereoICBWE->memShbInterp_nonref_fx, st->L_frame, &( hStereoICBWE->syn_dm_phase_nonref ) );
     }
     ELSE
     {
@@ -721,13 +717,9 @@ void stereo_icBWE_dec_fx(
         {
             IF( LE_16( ratio_L_fx, 29490 /* 0.9 in Q15*/ ) )
             {
-#ifdef FIX_TMP_714
                 tmp = mult_r( ratio_L_fx, ratio_L_fx ); // Q15
-#else
-                tmp = mult_r( sub( 32767, ratio_L_fx ), sub( 32767, ratio_L_fx ) ); // Q15
-#endif
-                tmp = mult_r( tmp, gsMapping_fx ); // Q14
-                tmp = mult_r( tmp, gsMapping_fx ); // Q13
+                tmp = mult_r( tmp, gsMapping_fx );      // Q14
+                tmp = mult_r( tmp, gsMapping_fx );      // Q13
                 IF( LT_16( tmp, 4096 /* 0.5 in Q13*/ ) )
                 {
                     temp1_fx = 0;
@@ -766,7 +758,7 @@ void stereo_icBWE_dec_fx(
                 alpha_fx = add( alpha_fx, winSlope_fx ); /* Q15 */
             }
         }
-        FOR( ; i < NS2SA( st->output_Fs, FRAME_SIZE_NS ); i++ )
+        FOR( ; i < NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS ); i++ )
         {
             synthRef_fx[i] = Mpy_32_16_1( synthRef_fx[i], icbweM2Ref_fx ); /* Qsyn - 1 */
             move32();
@@ -799,7 +791,7 @@ void stereo_icBWE_dec_fx(
 
         Scale_sig32( error_fx, L_FRAME32k, sub( tmp, Q_syn_shb ) );                                                      /* tmp */
         Scale_sig32( hStereoICBWE->memShb_fsout_nonref_fx, INTERP_3_2_MEM_LEN, sub( tmp, hStereoICBWE->prev_Q_fsout ) ); /* tmp */
-        interpolate_3_over_2_allpass_32( error_fx, L_FRAME32k, synth_fx, hStereoICBWE->memShb_fsout_nonref_fx );
+        interpolate_3_over_2_allpass_fx32( error_fx, L_FRAME32k, synth_fx, hStereoICBWE->memShb_fsout_nonref_fx );
         hStereoICBWE->prev_Q_fsout = tmp;
         move16();
     }
@@ -821,11 +813,7 @@ void stereo_icBWE_dec_fx(
         hStereoICBWE->prev_Q_fsout = tmp;
         move16();
     }
-#ifndef MSAN_FIX
-    Scale_sig32( synth_fx, L_FRAME48k, sub( *Q_syn, add( 1, tmp ) ) );
-#else
-    Scale_sig32( synth_fx, output_frame, sub( *Q_syn, add( 1, tmp ) ) );            /* Qsyn - 1 */
-#endif
+    Scale_sig32( synth_fx, output_frame, sub( *Q_syn, add( 1, tmp ) ) ); /* Qsyn - 1 */
 
     *Q_syn = sub( *Q_syn, 1 );
 
@@ -888,13 +876,9 @@ void stereo_icBWE_dec_fx(
     {
         IF( LE_16( ratio_L_fx, 29490 /* 0.9 in Q15*/ ) )
         {
-#ifdef FIX_TMP_714
             tmp = mult_r( ratio_L_fx, ratio_L_fx ); // Q15
-#else
-            tmp = mult_r( sub( 32767, ratio_L_fx ), sub( 32767, ratio_L_fx ) );     // Q15
-#endif
-            tmp = mult_r( tmp, gsMapping_fx ); // Q14
-            tmp = mult_r( tmp, gsMapping_fx ); // Q13
+            tmp = mult_r( tmp, gsMapping_fx );      // Q14
+            tmp = mult_r( tmp, gsMapping_fx );      // Q13
             IF( LT_16( tmp, 4096 /* 0.5 in Q13*/ ) )
             {
                 temp1_fx = 0;
@@ -920,6 +904,9 @@ void stereo_icBWE_dec_fx(
     winSlope_fx = div_s( 1, winLen_fx );                       /* Q15 */
     alpha_fx = winSlope_fx;                                    /* Q15 */
     move16();
+#ifdef FIX_1439_SPEEDUP_stereo_icBWE_dec_fx
+    Word16 winSlope_fx_ = sub( 32767 /* 1.0 in Q15*/, winSlope_fx );
+#endif
     FOR( i = 0; i < winLen_fx; i++ )
     {
         L_tmp = L_mult0( alpha_fx, icbweM2Ref_fx );                                                        /* Q29 */
@@ -927,13 +914,20 @@ void stereo_icBWE_dec_fx(
         tmp = shl( round_fx( L_tmp ), 1 );                                                                 /* Q14 */
         synthRef_fx[i] = Mpy_32_16_1( synthRef_fx[i], tmp );                                               /* Qsyn - 1 */
         move32();
+#ifdef FIX_1439_SPEEDUP_stereo_icBWE_dec_fx
+        if ( LE_16( alpha_fx, winSlope_fx_ ) )
+        {
+            alpha_fx = add( alpha_fx, winSlope_fx ); /* Q15 */
+        }
+#else
         IF( LE_16( alpha_fx, sub( 32767 /* 1.0 in Q15*/, winSlope_fx ) ) )
         {
             alpha_fx = add( alpha_fx, winSlope_fx ); /* Q15 */
         }
+#endif
     }
 
-    FOR( ; i < NS2SA( st->output_Fs, FRAME_SIZE_NS ); i++ )
+    FOR( ; i < NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS ); i++ )
     {
         synthRef_fx[i] = Mpy_32_16_1( synthRef_fx[i], icbweM2Ref_fx ); /* Qsyn - 1 */
         move32();
@@ -1015,7 +1009,7 @@ void stereo_icBWE_decproc_fx(
     output_Fs = hCPE->hCoreCoder[0]->output_Fs; /* Q0 */
     move32();
 
-    memOffset = NS2SA( output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ); /* Q0 */
+    memOffset = NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ); /* Q0 */
 
     /* LRTD stereo mode - 2xBWEs used */
     test();
@@ -1070,8 +1064,8 @@ void stereo_icBWE_decproc_fx(
             set32_fx( hStereoICBWE->memOutHB_fx[0], 0, memOffset );
             set32_fx( hStereoICBWE->memOutHB_fx[1], 0, memOffset );
 
-            set32_fx( hStereoICBWE->memTransitionHB_fx[0], 0, NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) );
-            set32_fx( hStereoICBWE->memTransitionHB_fx[1], 0, NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) );
+            set32_fx( hStereoICBWE->memTransitionHB_fx[0], 0, NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) );
+            set32_fx( hStereoICBWE->memTransitionHB_fx[1], 0, NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) );
         }
 
         test();
@@ -1123,13 +1117,13 @@ void stereo_icBWE_decproc_fx(
             Copy32( outputHB[refChanIndx_bwe], temp0_fx + memOffset, sub( output_frame, memOffset ) );  /* Q11 */
             Copy32( outputHB[!refChanIndx_bwe], temp1_fx + memOffset, sub( output_frame, memOffset ) ); /* Q11 */
 
-            decoderDelay = NS2SA( output_Fs, IVAS_DEC_DELAY_NS ); /* Q0 */
+            decoderDelay = NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS ); /* Q0 */
 
             test();
             IF( last_core != ACELP_CORE && EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
             {
                 /* hb_synth of mid band is faded out in the 1.25 ms prior to DFT analysis and the icbwe is faded in time domain */
-                icbweOLASize = NS2SA( output_Fs, STEREO_DFT_DELAY_DEC_BWE_NS ); /* Q0 */
+                icbweOLASize = NS2SA_FX2( output_Fs, STEREO_DFT_DELAY_DEC_BWE_NS ); /* Q0 */
 
                 FOR( i = 0; i < decoderDelay; i++ )
                 {
@@ -1286,15 +1280,15 @@ void stereo_icBWE_decproc_fx(
                 ELSE
                 {
                     /* This is generated in the ACELP frame and windowed. This process is akin to GenTransition for IC-BWE */
-                    v_add_32( output[0], hStereoICBWE->memTransitionHB_fx[hStereoICBWE->prev_refChanIndx_bwe], output[0], NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) );
-                    v_add_32( output[1], hStereoICBWE->memTransitionHB_fx[!hStereoICBWE->prev_refChanIndx_bwe], output[1], NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) );
+                    v_add_32( output[0], hStereoICBWE->memTransitionHB_fx[hStereoICBWE->prev_refChanIndx_bwe], output[0], NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) );
+                    v_add_32( output[1], hStereoICBWE->memTransitionHB_fx[!hStereoICBWE->prev_refChanIndx_bwe], output[1], NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) );
                 }
 
                 set32_fx( hStereoICBWE->memOutHB_fx[0], 0, memOffset );
                 set32_fx( hStereoICBWE->memOutHB_fx[1], 0, memOffset );
 
-                set32_fx( hStereoICBWE->memTransitionHB_fx[0], 0, NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) );
-                set32_fx( hStereoICBWE->memTransitionHB_fx[1], 0, NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) );
+                set32_fx( hStereoICBWE->memTransitionHB_fx[0], 0, NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) );
+                set32_fx( hStereoICBWE->memTransitionHB_fx[1], 0, NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) );
             }
         }
     }
@@ -1304,19 +1298,23 @@ void stereo_icBWE_decproc_fx(
     }
     ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) && EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) && EQ_16( last_core, ACELP_CORE ) )
     {
-        Word16 delay_tdbwe = NS2SA( output_Fs, DELAY_BWE_TOTAL_NS );
+        Word16 delay_tdbwe = NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS );
 
         FOR( n = 0; n < hCPE->nchan_out; n++ )
         {
             FOR( i = 0; i < delay_tdbwe; i++ )
             {
-                output[n][NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) - delay_tdbwe + i] = L_add_sat( output[n][NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) - delay_tdbwe + i], outputHB[0][i] );
+                output[n][NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) - delay_tdbwe + i] = L_add_sat( output[n][NS2SA_FX2( output_Fs, STEREO_DFT32MS_OVL_NS ) - delay_tdbwe + i], outputHB[0][i] );
                 move32();
             }
         }
+
         /* reset BWE structs as they are only needed in the transition frame in MDCT Stereo */
-        td_bwe_dec_init_ivas_fx( hCPE->hCoreCoder[0], hCPE->hCoreCoder[0]->hBWE_TD, output_Fs );
-        fd_bwe_dec_init( hCPE->hCoreCoder[0], hCPE->hCoreCoder[0]->hBWE_FD );
+        td_bwe_dec_init_fx( hCPE->hCoreCoder[0]->hBWE_TD, -1, output_Fs );
+        fd_bwe_dec_init_fx( hCPE->hCoreCoder[0]->hBWE_FD );
+
+        hCPE->hCoreCoder[0]->prev_Q_bwe_exc = 31;
+        move16();
     }
 
     test();
diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c
deleted file mode 100644
index 233dcc22521cad85b355f588b8bd4c85411feefd..0000000000000000000000000000000000000000
--- a/lib_dec/ivas_stereo_mdct_core_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "stat_com.h"
-#include "ivas_prot.h"
-#include "ivas_stat_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ivas_stereo_mdct_core_dec_fx.c b/lib_dec/ivas_stereo_mdct_core_dec_fx.c
index 79b88b88c159b8abd89d124905291c75ed722512..89cb92a4d08c1b9f834610892fdd5ce2dc73c68c 100644
--- a/lib_dec/ivas_stereo_mdct_core_dec_fx.c
+++ b/lib_dec/ivas_stereo_mdct_core_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,13 +34,11 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "stat_com.h"
-#include "ivas_prot.h"
 #include "ivas_stat_dec.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -403,7 +401,7 @@ void stereo_mdct_core_dec_fx(
 
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
-        Copy_Scale_sig_16_32( Aq_fx[ch], Aq_fx_32[ch], ( NB_SUBFR16k + 1 ) * ( M + 1 ), sub( Q16, Q12 ) ); /* Q16 */
+        Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], ( NB_SUBFR16k + 1 ) * ( M + 1 ), sub( Q16, Q12 ) ); /* Q16 */
     }
 
     /*--------------------------------------------------------------------------------*
@@ -471,6 +469,14 @@ void stereo_mdct_core_dec_fx(
         move16();
         move16();
 
+        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+        {
+            if ( NE_16( hCPE->hCoreCoder[ch]->core, TCX_20_CORE ) )
+            {
+                x_e[ch][1] = x_e[ch][0];
+                move16();
+            }
+        }
         stereo_decoder_tcx_fx( hCPE->hStereoMdct, ms_mask, x_0_fx[1], x_fx[0], x_fx[1], &hCPE->hStereoMdct->mdct_stereo_mode[0], sts[0]->core, sts[1]->core, sts[0]->igf, L_frameTCX[0], L_frameTCX[1], 0, sts[0]->last_core, sts[1]->last_core, 0, &q_x_1, &q_x_0 );
     }
 
@@ -542,10 +548,8 @@ void stereo_mdct_core_dec_fx(
             move16();
         }
     }
-
-    Copy_Scale_sig_16_32( hCPE->hCoreCoder[0]->old_Aq_12_8_fx, hCPE->hCoreCoder[0]->old_Aq_12_8_fx_32, M + 1, ( 28 - norm_s( hCPE->hCoreCoder[0]->old_Aq_12_8_fx[0] - 1 ) ) ); /* Q28 */
-    Copy_Scale_sig_16_32( hCPE->hCoreCoder[1]->old_Aq_12_8_fx, hCPE->hCoreCoder[1]->old_Aq_12_8_fx_32, M + 1, ( 28 - norm_s( hCPE->hCoreCoder[1]->old_Aq_12_8_fx[0] - 1 ) ) ); /* Q28 */
-
+    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->old_Aq_12_8_fx, hCPE->hCoreCoder[0]->old_Aq_12_8_fx_32, M + 1, sub( 28, sub( 15, norm_s( sub( hCPE->hCoreCoder[0]->old_Aq_12_8_fx[0], 1 ) ) ) ) ); /* Q28 */
+    Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[1]->old_Aq_12_8_fx, hCPE->hCoreCoder[1]->old_Aq_12_8_fx_32, M + 1, sub( 28, sub( 15, norm_s( sub( hCPE->hCoreCoder[1]->old_Aq_12_8_fx[0], 1 ) ) ) ) ); /* Q28 */
     ivas_mdct_core_reconstruct_fx( hCPE, x_fx, signal_outFB_tmp_fx, fUseTns, 0, Q11, e_sigFB );
 
     Copy32( signal_out_tmp_fx[0], signal_out_fx[0], L_FRAME48k ); /* Q11 */
@@ -987,7 +991,7 @@ static void run_min_stats_fx(
 {
     Word16 ch, will_estimate_noise_on_channel[CPE_CHANNELS], save_VAD[CPE_CHANNELS];
     Word32 power_spec[L_FRAME16k];
-    Word16 power_spec_e = 0;
+    Word16 power_spec_q = 0;
     move16();
     Word32 *spec_in;
     Word16 spec_e;
@@ -1043,25 +1047,27 @@ static void run_min_stats_fx(
             IF( ( EQ_16( will_estimate_noise_on_channel[0], will_estimate_noise_on_channel[1] ) ) || EQ_16( ch, 0 ) )
             {
                 Word16 tmp16 = getScaleFactor32( spec_in, L_FRAME16k );
-
+                Word64 spec_power;
                 Word32 power_spec_scale_fac;
 
                 /* calculate power spectrum from MDCT coefficients and estimated MDST coeffs */
                 power_spec_scale_fac = 20792; // 1.f / ( L_FRAME16k * L_FRAME16k ) in Q31
                 move32();
-                power_spec[0] = Mpy_32_32( W_extract_h( W_shl( W_mult_32_32( spec_in[0], spec_in[0] ), sub( tmp16, 4 ) ) ), power_spec_scale_fac ); /* 2 * (Q31 - x_e) + tmp16 - Q4 - Q31 */
+                spec_power = W_shl( W_mult_32_32( spec_in[0], spec_in[0] ), shl( tmp16, 1 ) );
+                power_spec[0] = W_extract_l( W_shr( W_mult_32_32( W_extract_h( spec_power ), power_spec_scale_fac ), 16 ) ); /* 2 * (Q31 - x_e + tmp16) + 1 - Q16 */
                 move32();
-                power_spec[L_FRAME16k - 1] = Mpy_32_32( W_extract_h( W_shl( W_mult_32_32( spec_in[L_FRAME16k - 1], spec_in[L_FRAME16k - 1] ), sub( tmp16, 4 ) ) ), power_spec_scale_fac ); /* 2 * (Q31 - x_e) + tmp16 - Q4 - Q31 */
+                spec_power = W_shl( W_mult_32_32( spec_in[L_FRAME16k - 1], spec_in[L_FRAME16k - 1] ), shl( tmp16, 1 ) );
+                power_spec[L_FRAME16k - 1] = W_extract_l( W_shr( W_mult_32_32( W_extract_h( spec_power ), power_spec_scale_fac ), 16 ) ); /* 2 * (Q31 - x_e + tmp16) + 1 - Q16 */
                 move32();
                 FOR( Word16 i = 1; i < L_FRAME16k - 1; i++ )
                 {
                     Word32 mdst;
                     mdst = L_sub( spec_in[i + 1], spec_in[i - 1] ); /* Q31 - x_e */
-
-                    power_spec[i] = Mpy_32_32( L_add( W_extract_h( W_shl( W_mult_32_32( spec_in[i], spec_in[i] ), sub( tmp16, 4 ) ) ), W_extract_h( W_shl( W_mult_32_32( mdst, mdst ), sub( tmp16, 4 ) ) ) ), power_spec_scale_fac ); /* 2 * (Q31 - x_e) + tmp16 - Q4 - Q31*/
+                    spec_power = W_shl( W_add( W_mult_32_32( spec_in[i], spec_in[i] ), W_mult_32_32( mdst, mdst ) ), shl( tmp16, 1 ) );
+                    power_spec[i] = W_extract_l( W_shr( W_mult_32_32( W_extract_h( spec_power ), power_spec_scale_fac ), 16 ) ); /* 2 * (Q31 - x_e + tmp16) + 1 - Q16 */
                     move32();
                 }
-                power_spec_e = sub( add( 4, shl( spec_e, 1 ) ), tmp16 );
+                power_spec_q = add( shl( add( sub( 31, spec_e ), tmp16 ), 1 ), 1 - 16 );
             }
         }
 
@@ -1091,8 +1097,8 @@ static void run_min_stats_fx(
             {
                 arr_tmp = power_spec;
             }
-            ApplyFdCng_ivas_fx( NULL, 0, arr_tmp, sub( 31, power_spec_e ), NULL, NULL, NULL, st, st->bfi, 0 );
-            /*=================================================*/
+
+            ApplyFdCng_fx( NULL, 0, arr_tmp, power_spec_q, NULL, NULL, NULL, st, st->bfi, 0 );
         }
 
         /* restore VAD (see above) */
diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
similarity index 97%
rename from lib_dec/ivas_stereo_mdct_stereo_dec.c
rename to lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
index 44dcda09b00bfe421e5ea67b352ccd6dec1363d3..8842a6792a8c866cbcc17e6b0b0a9f1a32f7392d 100644
--- a/lib_dec/ivas_stereo_mdct_stereo_dec.c
+++ b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,11 +35,9 @@
 #include <math.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -435,7 +433,7 @@ void stereo_decoder_tcx_fx(
 
         IF( !mct_on )
         {
-            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( SMDCT_ILD_RANGE << 16, L_deposit_h( hStereoMdct->global_ild[k] ), &tmp_e );
+            tmp_32 = BASOP_Util_Divide3232_Scale_newton( SMDCT_ILD_RANGE << 16, L_deposit_h( hStereoMdct->global_ild[k] ), &tmp_e );
             tmp_32 = L_shr( tmp_32, sub( 5, tmp_e ) ); /* nrgRatio = nrg[1]/nrg[0] */ // Q26
             nrgRatio = L_sub( tmp_32, ONE_IN_Q26 );                                   // Q26
 
@@ -490,7 +488,7 @@ void stereo_decoder_tcx_fx(
             }
             ELSE IF( ( LT_32( nrgRatio, ONE_IN_Q26 ) ) && ( LT_16( k, tmp2 ) ) )
             {
-                inv_nrgRatio = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q26, nrgRatio, &tmp_e );
+                inv_nrgRatio = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q26, nrgRatio, &tmp_e );
                 shift = sub( 5, tmp_e );
                 v_multc_fixed( spec_l[k], inv_nrgRatio, spec_l[k], L_frameTCX_l ); /* spec_r will be in Qx - tmp_e */
                 Scale_sig32( spec_l[k], L_frameTCX_l, sub( 5, shift ) );           /* Qx */
@@ -603,7 +601,7 @@ ivas_error initMdctStereoDtxData_fx(
         IF( st->cldfbAna == NULL )
         {
             /* open analysis for max. sampling rate 48kHz */
-            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -612,7 +610,7 @@ ivas_error initMdctStereoDtxData_fx(
         IF( st->cldfbBPF == NULL )
         {
             /* open analysis BPF for max. internal sampling rate 16kHz */
-            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -906,9 +904,8 @@ void updateBuffersForDmxMdctStereo_fx(
         move16();
         sts[0]->hTcxLtpDec->exp_tcxltp_mem_out = add( sts[0]->hTcxLtpDec->exp_tcxltp_mem_out, 1 );
         move16();
-
-        Copy_Scale_sig_16_32( &sts[0]->hTcxLtpDec->tcxltp_mem_in[0], &sts[0]->hTcxLtpDec->tcxltp_mem_in_32[0], TCXLTP_MAX_DELAY, sub( 11, sub( 15, sts[0]->hTcxLtpDec->exp_tcxltp_mem_in ) ) );    // Q11
-        Copy_Scale_sig_16_32( &sts[0]->hTcxLtpDec->tcxltp_mem_out[0], &sts[0]->hTcxLtpDec->tcxltp_mem_out_32[0], TCXLTP_MAX_DELAY, sub( 11, sub( 15, sts[0]->hTcxLtpDec->exp_tcxltp_mem_out ) ) ); // Q11
+        Copy_Scale_sig_16_32_no_sat( &sts[0]->hTcxLtpDec->tcxltp_mem_in[0], &sts[0]->hTcxLtpDec->tcxltp_mem_in_32[0], TCXLTP_MAX_DELAY, sub( 11, sub( 15, sts[0]->hTcxLtpDec->exp_tcxltp_mem_in ) ) );    // Q11
+        Copy_Scale_sig_16_32_no_sat( &sts[0]->hTcxLtpDec->tcxltp_mem_out[0], &sts[0]->hTcxLtpDec->tcxltp_mem_out_32[0], TCXLTP_MAX_DELAY, sub( 11, sub( 15, sts[0]->hTcxLtpDec->exp_tcxltp_mem_out ) ) ); // Q11
     }
 
     return;
@@ -943,7 +940,7 @@ void applyDmxMdctStereo_fx(
     test();
     IF( LE_32( hCPE->last_element_brate, IVAS_SID_5k2 ) )
     {
-        crossfade_len = NS2SA( hCPE->hCoreCoder[0]->output_Fs, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS );
+        crossfade_len = NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS );
         move16();
         SWITCH( hCPE->hCoreCoder[0]->output_Fs )
         {
@@ -990,7 +987,7 @@ void applyDmxMdctStereo_fx(
     }
     ELSE IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) && LE_32( hCPE->last_element_brate, IVAS_32k ) )
     {
-        crossfade_len = NS2SA( hCPE->hCoreCoder[0]->output_Fs, DELAY_CLDFB_NS ); /* Q0 */
+        crossfade_len = NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, DELAY_CLDFB_NS ); /* Q0 */
         move16();
         SWITCH( hCPE->hCoreCoder[0]->output_Fs )
         {
diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec_fx.c
similarity index 94%
rename from lib_dec/ivas_stereo_switching_dec.c
rename to lib_dec/ivas_stereo_switching_dec_fx.c
index 5d5b38d4dfdc1cb85b342be846f66093d087bf84..677c91ef02395a546bc5d4c4a0f9043174e28175 100644
--- a/lib_dec/ivas_stereo_switching_dec.c
+++ b/lib_dec/ivas_stereo_switching_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,15 +34,13 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "assert.h"
 #include "wmc_auto.h"
 #include <math.h>
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 /*-------------------------------------------------------------------*
@@ -199,15 +197,13 @@ static ivas_error allocate_CoreCoder_fx(
         }
 
         hf_synth_init_fx( st->hBWE_zero );
-#ifdef MSAN_FIX
         set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
-#endif
     }
 
     IF( st->cldfbAna == NULL )
     {
         /* open analysis for max. sampling rate 48kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -216,7 +212,7 @@ static ivas_error allocate_CoreCoder_fx(
     IF( st->cldfbBPF == NULL )
     {
         /* open analysis BPF for max. internal sampling rate 16kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -415,18 +411,18 @@ ivas_error stereo_memory_dec_fx(
 
         IF( hCPE->hCoreCoder[0]->last_core != ACELP_CORE )
         {
-            Copy32( hCPE->hStereoDft->buff_LBTCX_mem_fx, hCPE->input_mem_LB_fx[0], NS2SA( i_mult( hCPE->hCoreCoder[0]->last_L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /* Q11 */
+            Copy32( hCPE->hStereoDft->buff_LBTCX_mem_fx, hCPE->input_mem_LB_fx[0], NS2SA_FX2( i_mult( hCPE->hCoreCoder[0]->last_L_frame, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ) ); /* Q11 */
         }
     }
 
     test();
     IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) && EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
     {
-        v_add_32( hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, hCPE->hCoreCoder[1]->hHQ_core->oldOut_fx, hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) ); /* exp(exp_old_out) */
-        v_multc_fixed_16( hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->oldOut_fx, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) );           /* exp(exp_old_out) */
+        v_add_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[1]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) ); /* exp(exp_old_out) */
+        v_multc_fixed_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) );              /* exp(exp_old_out) */
 
-        v_add_32( hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, hCPE->hCoreCoder[1]->hHQ_core->old_outLB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k ); /* q_old_outLB_fx */
-        v_multc_fixed_16( hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k );              /* exp(exp_old_out) */
+        v_add_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[1]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k ); /* q_old_outLB_fx */
+        v_multc_fixed_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k );                 /* exp(exp_old_out) */
     }
 
     /*--------------------------------------------------------------*
@@ -470,7 +466,7 @@ ivas_error stereo_memory_dec_fx(
             }
 
             /* memory update - needed in TD stereo, TCX/HQ frame -> DFT stereo, ACELP frame switching */
-            Copy32( hCPE->input_mem_LB_fx[0], hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( s_min( i_mult( hCPE->hCoreCoder[0]->last_L_frame, FRAMES_PER_SEC ), 16000 ), STEREO_DFT32MS_OVL_NS ) ); /* Q11 */
+            Copy32( hCPE->input_mem_LB_fx[0], hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( s_min( i_mult( hCPE->hCoreCoder[0]->last_L_frame, FRAMES_PER_SEC ), 16000 ), STEREO_DFT32MS_OVL_NS ) ); /* Q11 */
 
             /* allocate ICBWE structure */
             IF( hCPE->hStereoICBWE == NULL )
@@ -578,7 +574,7 @@ ivas_error stereo_memory_dec_fx(
                 move16();
                 len = NS2SA_FX2( st->output_Fs, 3000000 ); /* Q0 */
                 move16();
-                Copy32( st->hHQ_core->oldOut_fx + nZeros, hCPE->output_mem_fx[1], len ); /* exp(exp_old_out) */
+                Copy32( st->hHQ_core->old_out_fx32 + nZeros, hCPE->output_mem_fx[1], len ); /* exp(exp_old_out) */
             }
 
             /* deallocated HQ-core for second channel */
@@ -628,16 +624,10 @@ ivas_error stereo_memory_dec_fx(
                     return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
                 }
 
-                td_bwe_dec_init_ivas_fx( st, st->hBWE_TD, st->output_Fs );
+                td_bwe_dec_init_fx( st->hBWE_TD, -1, st->output_Fs );
 
                 st->prev_Q_bwe_exc = 31;
                 move16();
-                st->prev_Qx = 0;
-                move16();
-                st->prev_ener_fx_Q = 31;
-                move16();
-                st->prev_frame_pow_exp = 0;
-                move16();
 
                 IF( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL )
                 {
@@ -645,19 +635,6 @@ ivas_error stereo_memory_dec_fx(
                 }
 
                 fd_bwe_dec_init_fx( st->hBWE_FD );
-                set16_fx( st->prev_SWB_fenv_fx, 0, SWB_FENV );
-                st->last_wb_bwe_ener_fx = 0;
-                move16();
-                st->prev_fb_ener_adjust_fx = 0;
-                move16();
-
-                fd_bwe_dec_init( st, st->hBWE_FD );
-                st->hBWE_FD->old_wtda_swb_fx_exp = 0;
-                move16();
-                st->hBWE_FD->mem_imdct_exp_fx = 0;
-                move16();
-                st->prev_Q_synth = 0;
-                move16();
             }
 
             /* Allocated FD_CNG instance for primary channel*/
@@ -754,7 +731,7 @@ ivas_error stereo_memory_dec_fx(
 
             IF( st->cldfbAna == NULL )
             {
-                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -763,7 +740,7 @@ ivas_error stereo_memory_dec_fx(
             IF( st->cldfbBPF == NULL )
             {
                 /* open analysis BPF for max. internal sampling rate 16kHz */
-                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -806,6 +783,7 @@ ivas_error stereo_memory_dec_fx(
             {
                 Copy32( tmpF_buff, st->hTcxDec->old_syn_Overl_32, L_FRAME16k / 2 );                                                    /* Q11 */
                 Copy_Scale_sig32_16( st->hTcxDec->old_syn_Overl_32, st->hTcxDec->old_syn_Overl, L_FRAME16k / 2, add( st->Q_syn, 5 ) ); //(st->Qsyn - (11 - 16))
+                st->hTcxDec->Q_old_syn_Overl = st->Q_syn;
             }
             st->hTcxDec->q_old_synth = st->Q_syn;
             move16();
@@ -874,16 +852,10 @@ ivas_error stereo_memory_dec_fx(
                         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
                     }
 
-                    td_bwe_dec_init_ivas_fx( st, st->hBWE_TD, st->output_Fs );
+                    td_bwe_dec_init_fx( st->hBWE_TD, -1, st->output_Fs );
 
                     st->prev_Q_bwe_exc = 31;
                     move16();
-                    st->prev_Qx = 0;
-                    move16();
-                    st->prev_ener_fx_Q = 31;
-                    move16();
-                    st->prev_frame_pow_exp = 0;
-                    move16();
 
                     IF( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL )
                     {
@@ -891,19 +863,6 @@ ivas_error stereo_memory_dec_fx(
                     }
 
                     fd_bwe_dec_init_fx( st->hBWE_FD );
-                    set16_fx( st->prev_SWB_fenv_fx, 0, SWB_FENV );
-                    st->last_wb_bwe_ener_fx = 0;
-                    move16();
-                    st->prev_fb_ener_adjust_fx = 0;
-                    move16();
-
-                    fd_bwe_dec_init( st, st->hBWE_FD );
-                    st->hBWE_FD->old_wtda_swb_fx_exp = 0;
-                    move16();
-                    st->hBWE_FD->mem_imdct_exp_fx = 0;
-                    move16();
-                    st->prev_Q_synth = 0;
-                    move16();
                 }
             }
             ELSE /* tdm_LRTD_flag  == 0 */
@@ -1034,11 +993,11 @@ ivas_error stereo_memory_dec_fx(
             IF( hCPE->prev_synth_chs_fx[1] == NULL )
             {
                 st = hCPE->hCoreCoder[1];
-                IF( ( hCPE->prev_synth_chs_fx[1] = (Word32 *) malloc( sizeof( Word32 ) * NS2SA( st->output_Fs, FRAME_SIZE_NS ) ) ) == NULL )
+                IF( ( hCPE->prev_synth_chs_fx[1] = (Word32 *) malloc( sizeof( Word32 ) * NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS ) ) ) == NULL )
                 {
                     return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) );
                 }
-                set32_fx( hCPE->prev_synth_chs_fx[1], 0, NS2SA( st->output_Fs, FRAME_SIZE_NS ) );
+                set32_fx( hCPE->prev_synth_chs_fx[1], 0, NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS ) );
             }
 
             IF( hCPE->hStereoICBWE == NULL && EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
@@ -1102,7 +1061,7 @@ ivas_error stereo_memory_dec_fx(
             {
                 IF( hCPE->hCoreCoder[i]->cldfbSyn == NULL ) /* could be NULL when we had the MCT LFE channel */
                 {
-                    IF( NE_32( ( error = openCldfb_ivas_fx( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                    IF( NE_32( ( error = openCldfb_ivas_fx( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
                     {
                         return error;
                     }
@@ -1265,7 +1224,7 @@ void synchro_synthesis_fx(
         {
             /* delay CLDFB-based mono output (<= 24.4 kbps) to be aligned with DFT-based mono output (32 kbps), needed to avoid discontinuities with TCX-LTP. */
             Copy32( sts[0]->prev_synth_buffer32_fx + delay_comp_DFT, hCPE->hCoreCoder[0]->hTcxDec->FBTCXdelayBuf_32, delay_diff ); /* Q11 */
-            delay_signal_fx( output_fx[0], output_frame, hCPE->hCoreCoder[0]->hTcxDec->FBTCXdelayBuf_32, delay_diff );
+            delay_signal32_fx( output_fx[0], output_frame, hCPE->hCoreCoder[0]->hTcxDec->FBTCXdelayBuf_32, delay_diff );
         }
 
         IF( NE_16( hCPE->element_mode, IVAS_CPE_MDCT ) )
@@ -1282,7 +1241,7 @@ void synchro_synthesis_fx(
             }
             ELSE
             {
-                delay_signal_fx( output_fx[n], output_frame, sts[n]->prev_synth_buffer32_fx, delay_comp_DFT );
+                delay_signal32_fx( output_fx[n], output_frame, sts[n]->prev_synth_buffer32_fx, delay_comp_DFT );
             }
         }
         if ( sba_dirac_stereo_flag )
@@ -1603,15 +1562,15 @@ void synchro_synthesis_fx(
             IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) )
             {
                 Copy32( sts[n]->prev_synth_buffer32_fx + delay_comp_DFT, hCPE->hCoreCoder[n]->hTcxDec->FBTCXdelayBuf_32, delay_diff ); /* Q11 */
-                delay_signal_fx( output_fx[n], output_frame, hCPE->hCoreCoder[n]->hTcxDec->FBTCXdelayBuf_32, delay_diff );             /* Q11 */
+                delay_signal32_fx( output_fx[n], output_frame, hCPE->hCoreCoder[n]->hTcxDec->FBTCXdelayBuf_32, delay_diff );           /* Q11 */
                 ivas_post_proc_fx( NULL, hCPE, n, output_fx[n], output_fx, output_frame, 0, output_fx_q );
 
-                delay_signal_fx( output_fx[n], output_frame, sts[n]->prev_synth_buffer32_fx, delay_comp_DFT );
+                delay_signal32_fx( output_fx[n], output_frame, sts[n]->prev_synth_buffer32_fx, delay_comp_DFT );
                 Copy32( hCPE->hCoreCoder[n]->hTcxDec->FBTCXdelayBuf_32, sts[n]->prev_synth_buffer32_fx + delay_comp_DFT, delay_diff ); /* Q11 */
             }
             ELSE
             {
-                delay_signal_fx( output_fx[n], output_frame, sts[n]->prev_synth_buffer32_fx, delay_comp_TD );
+                delay_signal32_fx( output_fx[n], output_frame, sts[n]->prev_synth_buffer32_fx, delay_comp_TD );
             }
         }
 
@@ -1880,7 +1839,7 @@ void stereo_switching_dec(
 
         /* reset residual coding / ESF (secondary channel) */
         set32_fx( hCPE->hStereoDft->res_cod_mem_fx, 0, STEREO_DFT_OVL_8k );
-        hCPE->hStereoDft->q_res_cod_mem_fx = Q16;
+        hCPE->hStereoDft->q_res_cod_mem_fx = Q15;
         move16();
 
         set32_fx( hCPE->input_mem_fx[1], 0, NS2SA_FX2( sts[0]->output_Fs, STEREO_DFT32MS_OVL_NS ) );
@@ -1986,19 +1945,29 @@ void stereo_switching_dec(
         move16();
         Copy( sts[0]->Q_subfr, sts[1]->Q_subfr, L_Q_MEM );
 
-        sts[1]->prev_Q_bwe_syn = sts[0]->prev_Q_bwe_syn;
-        move16();
-        sts[1]->prev_Q_bwe_syn2 = sts[0]->prev_Q_bwe_syn2;
-        move16();
+        test();
+        IF( sts[0]->hBWE_TD != NULL && sts[1]->hBWE_TD != NULL )
+        {
+            sts[1]->hBWE_TD->prev_Q_bwe_syn = sts[0]->hBWE_TD->prev_Q_bwe_syn;
+            move16();
+            sts[1]->hBWE_TD->prev_Q_bwe_syn2 = sts[0]->hBWE_TD->prev_Q_bwe_syn2;
+            move16();
+
+            sts[1]->hBWE_TD->prev_Q_bwe_exc_fb = sts[0]->hBWE_TD->prev_Q_bwe_exc_fb;
+            move16();
+            sts[1]->hBWE_TD->prev_Qx = sts[0]->hBWE_TD->prev_Qx;
+            move16();
+        }
+
+        test();
+        IF( sts[0]->hBWE_FD != NULL && sts[1]->hBWE_FD != NULL )
+        {
+            sts[1]->hBWE_FD->prev_Q_synth = sts[0]->hBWE_FD->prev_Q_synth;
+            move16();
+        }
 
-        sts[1]->prev_Q_bwe_exc_fb = sts[0]->prev_Q_bwe_exc_fb;
-        move16();
-        sts[1]->prev_Qx = sts[0]->prev_Qx;
-        move16();
         sts[1]->prev_Q_bwe_exc = sts[0]->prev_Q_bwe_exc;
         move16();
-        sts[1]->prev_Q_synth = sts[0]->prev_Q_synth;
-        move16();
         sts[1]->Q_syn = sts[0]->Q_syn;
         move16();
         sts[1]->Q_syn2 = sts[0]->Q_syn2;
@@ -2019,7 +1988,7 @@ void stereo_switching_dec(
 
 
             // 32bit buffer
-            Copy32( sts[0]->hHQ_core->oldOut_fx, sts[1]->hHQ_core->oldOut_fx, L_FRAME48k );                 /* exp(exp_old_out) */
+            Copy32( sts[0]->hHQ_core->old_out_fx32, sts[1]->hHQ_core->old_out_fx32, L_FRAME48k );           /* exp(exp_old_out) */
             Copy32( sts[0]->delay_buf_out32_fx, sts[1]->delay_buf_out32_fx, HQ_DELTA_MAX * HQ_DELAY_COMP ); /* Q11 */
             Copy32( sts[0]->hTcxDec->old_syn_Overl_32, sts[1]->hTcxDec->old_syn_Overl_32, 256 );            /* Q_old_syn_Overl*/
             // 16 bit buffer
@@ -2029,6 +1998,7 @@ void stereo_switching_dec(
             move16();
             Copy( sts[0]->delay_buf_out_fx, sts[1]->delay_buf_out_fx, HQ_DELTA_MAX * HQ_DELAY_COMP ); /* Q0 */
             Copy( sts[0]->hTcxDec->old_syn_Overl, sts[1]->hTcxDec->old_syn_Overl, 256 );              /* Q_old_syn_Overl*/
+            sts[1]->hTcxDec->Q_old_syn_Overl = sts[0]->hTcxDec->Q_old_syn_Overl;
         }
     }
     ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_TD ) && EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) )
@@ -2079,7 +2049,7 @@ void stereo_td2dft_update_fx(
 )
 {
     Word16 ovl, ovl_TCX, dft32ms_ovl, hq_delay_comp;
-    Word16 ns, nsLB;
+    Word16 ns, nsLB, i;
     Word16 old_out_len, old_outLB_len;
     Decoder_State **sts;
 
@@ -2143,7 +2113,7 @@ void stereo_td2dft_update_fx(
             /* TCX synthesis (it was already delayed in TD stereo in core_switching_post_dec()) */
             IF( sts[n]->hTcxDec != NULL )
             {
-                ovl_TCX = NS2SA_FX2( sts[n]->hTcxDec->L_frameTCX * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ); /* Q0 */
+                ovl_TCX = NS2SA_FX2( L_mult0( sts[n]->hTcxDec->L_frameTCX, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ); /* Q0 */
                 move16();
                 Copy32( synth_fx + sts[n]->hTcxDec->L_frameTCX + hq_delay_comp - ovl_TCX, hCPE->input_mem_fx[n], sub( ovl_TCX, hq_delay_comp ) ); /* Q11 */
                 Copy32( sts[n]->delay_buf_out32_fx, hCPE->input_mem_fx[n] + ovl_TCX - hq_delay_comp, hq_delay_comp );                             /* Q11 */
@@ -2161,7 +2131,7 @@ void stereo_td2dft_update_fx(
         /* TCX synthesis (it was already delayed in TD stereo in core_switching_post_dec()) */
         IF( sts[n]->hTcxDec != NULL )
         {
-            ovl_TCX = NS2SA_FX2( sts[n]->hTcxDec->L_frameTCX * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ); /* Q0 */
+            ovl_TCX = NS2SA_FX2( L_mult0( sts[n]->hTcxDec->L_frameTCX, FRAMES_PER_SEC ), STEREO_DFT32MS_OVL_NS ); /* Q0 */
             move16();
             Copy32( synth_fx + add( sts[n]->hTcxDec->L_frameTCX, sub( hq_delay_comp, ovl_TCX ) ), hCPE->input_mem_fx[n], sub( ovl_TCX, hq_delay_comp ) ); /* Q11 */
             Copy32( sts[n]->delay_buf_out32_fx, hCPE->input_mem_fx[n] + sub( ovl_TCX, hq_delay_comp ), hq_delay_comp );                                   /* Q11 */
@@ -2179,23 +2149,15 @@ void stereo_td2dft_update_fx(
             move16();
 
             /* update buffers used for fading when switching to DFT Stereo */
-            v_add_fx( sts[0]->hHQ_core->old_outLB_fx + nsLB, sts[1]->hHQ_core->old_outLB_fx + nsLB, hCPE->old_outLB_mdct_fx, old_outLB_len );
+            v_add_fx( sts[0]->hHQ_core->old_out_LB_fx32 + nsLB, sts[1]->hHQ_core->old_out_LB_fx32 + nsLB, hCPE->old_outLB_mdct_fx, old_outLB_len );
             L_lerp_fx_q11( hCPE->old_outLB_mdct_fx, hCPE->old_outLB_mdct_fx, STEREO_MDCT2DFT_FADE_LEN_48k, old_outLB_len );
-#ifndef MSAN_FIX
-            for ( int i = 0; i < STEREO_MDCT2DFT_FADE_LEN_48k; i++ )
-#else
-            FOR( Word32 i = 0; i < old_outLB_len; i++ )
-#endif
+            FOR( i = 0; i < old_outLB_len; i++ )
             {
                 hCPE->old_outLB_mdct_fx[i] = L_shr( hCPE->old_outLB_mdct_fx[i], 1 ); /* Q11 */
                 move32();
             }
-            v_add_fx( sts[0]->hHQ_core->oldOut_fx + ns, sts[1]->hHQ_core->oldOut_fx + ns, hCPE->old_out_mdct_fx, old_out_len ); /* exp(exp_old_out) */
-#ifndef MSAN_FIX
-            for ( int i = 0; i < STEREO_MDCT2DFT_FADE_LEN_48k; i++ )
-#else
-            FOR( Word32 i = 0; i < old_out_len; i++ )
-#endif
+            v_add_fx( sts[0]->hHQ_core->old_out_fx32 + ns, sts[1]->hHQ_core->old_out_fx32 + ns, hCPE->old_out_mdct_fx, old_out_len ); /* exp(exp_old_out) */
+            FOR( i = 0; i < old_out_len; i++ )
             {
                 hCPE->old_out_mdct_fx[i] = L_shr( hCPE->old_out_mdct_fx[i], 1 ); /* q_old_out_mdct */
                 move32();
@@ -2343,15 +2305,20 @@ static Word32 ncross_corr_self_fx(
 {
     Word64 c_c_fx;
     Word32 c_c_fx_return;
+    Word64 energy_x_fx, energy_y_fx;
+#ifndef OPT_STEREO_32KBPS_V1
     Word16 c_c_fx_q;
-    Word64 energy_xy_fx, energy_x_fx, energy_y_fx;
+    Word64 energy_xy_fx;
+#endif /* OPT_STEREO_32KBPS_V1 */
     UWord16 j;
     Word32 *signal_a_fx, *signal_b_fx;
     Word32 temp_x, temp_y;
     Word16 headroom_left_x, headroom_left_y;
+#ifndef OPT_STEREO_32KBPS_V1
     Word16 x_inv_q, y_inv_q;
     Word16 x_q, y_q;
     Word16 res_q;
+#endif /* OPT_STEREO_32KBPS_V1 */
     c_c_fx = 0;
     move64();
     energy_x_fx = 0;
@@ -2362,13 +2329,43 @@ static Word32 ncross_corr_self_fx(
     signal_b_fx = &signal_fx[y]; /* Q11 */
     FOR( j = 0; j < corr_len; j += subsampling )
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        c_c_fx = W_mac_32_32( c_c_fx, signal_a_fx[j], signal_b_fx[j] );           /* 2 * Q11 + 1*/
+        energy_x_fx = W_mac_32_32( energy_x_fx, signal_a_fx[j], signal_a_fx[j] ); /* 2 * Q11+ 1 */
+        energy_y_fx = W_mac_32_32( energy_y_fx, signal_b_fx[j], signal_b_fx[j] ); /* 2 * Q11+ 1 */
+#else                                                                             /* OPT_STEREO_32KBPS_V1 */
         c_c_fx = W_add( c_c_fx, W_mult0_32_32( ( signal_a_fx[j] ), ( signal_b_fx[j] ) ) );           /* 2 * Q11 */
         energy_x_fx = W_add( energy_x_fx, W_mult0_32_32( ( signal_a_fx[j] ), ( signal_a_fx[j] ) ) ); /* 2 * Q11 */
         energy_y_fx = W_add( energy_y_fx, W_mult0_32_32( ( signal_b_fx[j] ), ( signal_b_fx[j] ) ) ); /* 2 * Q11 */
+#endif                                                                            /* OPT_STEREO_32KBPS_V1 */
     }
 
     headroom_left_x = W_norm( energy_x_fx );
     headroom_left_y = W_norm( energy_y_fx );
+#ifdef OPT_STEREO_32KBPS_V1
+    temp_x = W_extract_h( W_shl( energy_x_fx, headroom_left_x ) ); // Q23 + headroom_left_x -32
+    temp_y = W_extract_h( W_shl( energy_y_fx, headroom_left_y ) ); // Q23 + headroom_left_y -32
+    Word64 prod = W_mult0_32_32( temp_x, temp_y );                 // Q(headroom_left_x + headroom_left_y - 18)
+    Word16 q_prod = W_norm( prod );
+    Word32 energy = W_extract_h( W_shl( prod, q_prod ) ); // Q(headroom_left_x + headroom_left_y + q_prod - 18) - 32
+    q_prod = sub( 81, add( add( headroom_left_x, headroom_left_y ), q_prod ) );
+    energy = Sqrt32( energy, &q_prod );
+
+    IF( LE_32( energy, L_shl_sat( 1, sub( 31, q_prod ) ) ) )
+    {
+        c_c_fx_return = W_shl_sat_l( c_c_fx, 31 - ( 2 * OUTPUT_Q + 1 ) ); // Q31
+    }
+    ELSE
+    {
+        // Maximize c_c_fx
+        Word16 q_cc = W_norm( c_c_fx );
+        Word32 num = W_extract_h( W_shl( c_c_fx, q_cc ) ); // Q(23 + q_cc - 32) -> e(40 - q_cc)
+        Word16 quo_e;
+        num = BASOP_Util_Divide3232_Scale_newton( num, energy, &quo_e );
+        quo_e = add( sub( sub( 40, q_cc ), q_prod ), quo_e );
+        c_c_fx_return = L_shl_sat( num, quo_e ); // Q31
+    }
+#else  /* OPT_STEREO_32KBPS_V1 */
     IF( LT_16( headroom_left_x, 32 ) )
     {
         energy_x_fx = W_shr( energy_x_fx, sub( 32, headroom_left_x ) ); /* 2 * Q11 - (32 -headroom_left_x)  */
@@ -2440,6 +2437,7 @@ static Word32 ncross_corr_self_fx(
 
     c_c_fx_return = W_extract_l( c_c_fx ); /* Q31 */
     move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
     return c_c_fx_return;
 }
 
diff --git a/lib_dec/ivas_stereo_td_dec.c b/lib_dec/ivas_stereo_td_dec_fx.c
similarity index 95%
rename from lib_dec/ivas_stereo_td_dec.c
rename to lib_dec/ivas_stereo_td_dec_fx.c
index c53135f0a3b493fa021415330d0478b9d7dd4b4f..023c9a2e5e3a1fc4dd97ded44e0ac846508e84ed 100644
--- a/lib_dec/ivas_stereo_td_dec.c
+++ b/lib_dec/ivas_stereo_td_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include <math.h>
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
@@ -339,52 +337,13 @@ void tdm_configure_dec_fx(
     return;
 }
 
-/*-------------------------------------------------------------------*
- * Function tdm_downmix_plain()
- *
- * downmix Left+Right to Primary+Secondary channel
- *-------------------------------------------------------------------*/
-
-void tdm_upmix_plain(
-    float Left[],                 /* o  : left channel            */
-    float Right[],                /* o  : right channel           */
-    const float PCh_2_L[],        /* i  : primary channel         */
-    const float SCh_2_R[],        /* i  : secondary channel       */
-    const float LR_ratio,         /* i  : mixing ratio            */
-    const float inv_den_LR_ratio, /* i  : inverse mixing ration   */
-    const int16_t start_index,    /* i  : start index             */
-    const int16_t end_index,      /* i  : end index               */
-    const int16_t plus_minus_flag /* i  : plus/minus flag         */
-)
-{
-    int16_t i;
-
-    if ( plus_minus_flag == 1 )
-    {
-        for ( i = start_index; i < end_index; i++ )
-        {
-            Left[i] = ( LR_ratio * ( PCh_2_L[i] - SCh_2_R[i] ) + SCh_2_R[i] ) * inv_den_LR_ratio;
-            Right[i] = ( -LR_ratio * ( PCh_2_L[i] + SCh_2_R[i] ) + PCh_2_L[i] ) * inv_den_LR_ratio;
-        }
-    }
-    else
-    {
-        for ( i = start_index; i < end_index; i++ )
-        {
-            Left[i] = ( LR_ratio * ( PCh_2_L[i] + SCh_2_R[i] ) - SCh_2_R[i] ) * inv_den_LR_ratio;
-            Right[i] = ( LR_ratio * ( PCh_2_L[i] - SCh_2_R[i] ) - PCh_2_L[i] ) * inv_den_LR_ratio;
-        }
-    }
-
-    return;
-}
 void tdm_upmix_plain_fx(
     Word32 Left_fx[],                 /* o  : left channel            Qx*/
     Word32 Right_fx[],                /* o  : right channel           Qx*/
     const Word32 PCh_2_L_fx[],        /* i  : primary channel         Qx*/
     const Word32 SCh_2_R_fx[],        /* i  : secondary channel       Qx*/
     const Word32 LR_ratio_fx,         /* i  : mixing ratio            Q31*/
-    const Word32 inv_den_LR_ratio_fx, /* i  : inverse mixing ration   Q31*/
+    const Word32 inv_den_LR_ratio_fx, /* i  : inverse mixing ration   Q30*/
     const Word16 start_index,         /* i  : start index             Q0*/
     const Word16 end_index,           /* i  : end index               Q0*/
     const Word16 plus_minus_flag      /* i  : plus/minus flag         Q0*/
@@ -396,16 +355,37 @@ void tdm_upmix_plain_fx(
     {
         FOR( i = start_index; i < end_index; i++ )
         {
+#ifdef OPT_STEREO_32KBPS_V1
+            Word32 temp_left = Madd_32_32( SCh_2_R_fx[i], L_sub( PCh_2_L_fx[i], SCh_2_R_fx[i] ), LR_ratio_fx ); /* Qx */
+            Left_fx[i] = W_shl_sat_l( W_mult0_32_32( temp_left, inv_den_LR_ratio_fx ), -30 );                   /* Qx */
+            move32();
+            Word32 temp_right = Msub_32_32( PCh_2_L_fx[i], L_add( PCh_2_L_fx[i], SCh_2_R_fx[i] ), LR_ratio_fx ); /* Qx */
+            Right_fx[i] = W_shl_sat_l( W_mult0_32_32( temp_right, inv_den_LR_ratio_fx ), -30 );                  /* Qx */
+            move32();
+#else  /* OPT_STEREO_32KBPS_V1 */
             Word32 temp_left = L_add( Mpy_32_32( L_sub( PCh_2_L_fx[i], SCh_2_R_fx[i] ), LR_ratio_fx ), SCh_2_R_fx[i] ); /* Qx */
             Left_fx[i] = L_shl_sat( Mpy_32_32( temp_left, inv_den_LR_ratio_fx ), 1 );                                   /* Qx + 1 */
             move32();
             Word32 temp_right = L_add( Mpy_32_32( L_add( PCh_2_L_fx[i], SCh_2_R_fx[i] ), L_negate( LR_ratio_fx ) ), PCh_2_L_fx[i] ); /* Qx */
             Right_fx[i] = L_shl_sat( Mpy_32_32( temp_right, inv_den_LR_ratio_fx ), 1 );                                              /* Qx + 1 */
             move32();
+#endif /* OPT_STEREO_32KBPS_V1 */
         }
     }
     ELSE
     {
+#ifdef OPT_STEREO_32KBPS_V1
+        Word32 inv_den_LR_ratio_fx_neg = L_negate( inv_den_LR_ratio_fx );
+        FOR( i = start_index; i < end_index; i++ )
+        {
+            Word32 temp_left = Msub_32_32( SCh_2_R_fx[i], L_add( PCh_2_L_fx[i], SCh_2_R_fx[i] ), LR_ratio_fx ); /* Qx */
+            Left_fx[i] = W_shl_sat_l( W_mult0_32_32( temp_left, inv_den_LR_ratio_fx_neg ), -30 );               /* Qx */
+            move32();
+            Word32 temp_right = Msub_32_32( PCh_2_L_fx[i], L_sub( PCh_2_L_fx[i], SCh_2_R_fx[i] ), LR_ratio_fx ); /* Qx */
+            Right_fx[i] = W_shl_sat_l( W_mult0_32_32( temp_right, inv_den_LR_ratio_fx_neg ), -30 );              /* Qx */
+            move32();
+        }
+#else  /* OPT_STEREO_32KBPS_V1 */
         FOR( i = start_index; i < end_index; i++ )
         {
             Word32 temp_left = L_sub( Mpy_32_32( L_add( PCh_2_L_fx[i], SCh_2_R_fx[i] ), LR_ratio_fx ), SCh_2_R_fx[i] ); /* Qx */
@@ -415,6 +395,7 @@ void tdm_upmix_plain_fx(
             Right_fx[i] = L_shl_sat( Mpy_32_32( temp_right, inv_den_LR_ratio_fx ), 1 );                                  /* Qx + 1 */
             move32();
         }
+#endif /* OPT_STEREO_32KBPS_V1 */
     }
 
     return;
@@ -680,17 +661,17 @@ void stereo_tdm_combine_fx(
 
     output_Fs = hCPE->hCoreCoder[0]->output_Fs; /* Q0 */
     move32();
-    tdm_n_OVA = NS2SA( output_Fs, TDM_L_NOVA_NS ); /* Q0 */
+    tdm_n_OVA = NS2SA_FX2( output_Fs, TDM_L_NOVA_NS ); /* Q0 */
     move16();
 
     IF( flag_HB )
     {
-        upmixing_delay = NS2SA( output_Fs, ACELP_LOOK_NS + DELAY_BWE_TOTAL_NS ); /* Q0 */
+        upmixing_delay = NS2SA_FX2( output_Fs, ACELP_LOOK_NS + DELAY_BWE_TOTAL_NS ); /* Q0 */
         move16();
     }
     ELSE
     {
-        upmixing_delay = NS2SA( output_Fs, ACELP_LOOK_NS + DELAY_CLDFB_NS ); /* Q0 */
+        upmixing_delay = NS2SA_FX2( output_Fs, ACELP_LOOK_NS + DELAY_CLDFB_NS ); /* Q0 */
         move16();
     }
 
@@ -845,7 +826,7 @@ void stereo_tdm_combine_fx(
             }
             incr_fx = Mpy_32_32( L_sub( ONE_IN_Q29, fac_fx ), step ); /* Q29 */
 
-            FOR( i = 0; i < NS2SA( output_Fs, ACELP_LOOK_NS ); i++ )
+            FOR( i = 0; i < NS2SA_FX2( output_Fs, ACELP_LOOK_NS ); i++ )
             {
                 PCh_2_L_fx[i] = L_shl_sat( Mpy_32_32( PCh_2_L_fx[i], fac_fx ), 2 ); /* Qx */
                 move32();
diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec_fx.c
similarity index 72%
rename from lib_dec/ivas_svd_dec.c
rename to lib_dec/ivas_svd_dec_fx.c
index 3b8a90a4c87bd969a3359b24a3ee577266a1b55e..4b052288430d888a2b29857d24ec105999397042 100644
--- a/lib_dec/ivas_svd_dec.c
+++ b/lib_dec/ivas_svd_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,13 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_stat_dec.h"
 #include "ivas_cnst.h"
 #include <math.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-----------------------------------------------------------------------*
@@ -50,6 +48,7 @@
 #define SVD_MINIMUM_VALUE_FX        ( 2 ) /* minimum value                                                   */
 #define SVD_ZERO_FLUSH_THRESHOLD_FX ( 0 )
 #define CONVERGENCE_FACTOR_FX       214748 /* factor for SVD convergence (as per latest float code: 1.0e-04f) */
+
 /*-----------------------------------------------------------------------*
  * Local function prototypes
  *-----------------------------------------------------------------------*/
@@ -71,7 +70,7 @@ static void biDiagonalReductionLeft_fx(
     Word32 singularVectors[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) */
     Word32 singularValues[MAX_OUTPUT_CHANNELS],    /* exp(singularValues_e) */
     Word32 secDiag[MAX_OUTPUT_CHANNELS],           /* exp(secDiag_e) */
-    Word16 *singularVectors_e,
+    Word16 singularVectors2_e[][MAX_OUTPUT_CHANNELS],
     Word16 singularValues_e[MAX_OUTPUT_CHANNELS],
     Word16 *secDiag_e,
     const Word16 nChannelsL,  /* Q0 */
@@ -85,7 +84,7 @@ static void biDiagonalReductionLeft_fx(
 static void biDiagonalReductionRight_fx(
     Word32 singularVectors[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) */
     Word32 secDiag[MAX_OUTPUT_CHANNELS],           /* exp(secDiag_e) */
-    Word16 *singularVectors_e,
+    Word16 singularVectors2_e[][MAX_OUTPUT_CHANNELS],
     Word16 *secDiag_e,
     const Word16 nChannelsL,  /* Q0 */
     const Word16 nChannelsC,  /* Q0 */
@@ -98,7 +97,7 @@ static void biDiagonalReductionRight_fx(
 static void singularVectorsAccumulationLeft_fx(
     Word32 singularVectors_Left[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) as Input, Q31 as output */
     Word32 singularValues[MAX_OUTPUT_CHANNELS],         /* exp(singularValues_e) */
-    Word16 singularVectors_e,
+    Word16 singularVectors_Left_e[][MAX_OUTPUT_CHANNELS],
     Word16 singularValues_e[MAX_OUTPUT_CHANNELS],
     const Word16 nChannelsL, /* Q0 */
     const Word16 nChannelsC  /* Q0 */
@@ -108,8 +107,8 @@ static void singularVectorsAccumulationRight_fx(
     Word32 singularVectors_Left[][MAX_OUTPUT_CHANNELS],  /* singularVectors_e */
     Word32 singularVectors_Right[][MAX_OUTPUT_CHANNELS], /* singularVectors_e */
     Word32 secDiag[MAX_OUTPUT_CHANNELS],                 /* exp(secDiag_e) */
-    Word16 singularVectors_e,
-    Word16 secDiag_e,
+    Word16 singularVectors_Left_e[][MAX_OUTPUT_CHANNELS],
+    Word16 *secDiag_e,
     const Word16 nChannelsC /* Q0 */
 );
 
@@ -149,6 +148,16 @@ static void ApplyRotation_fx(
     const Word16 nChannels      /* Q0 */
 );
 
+static void GivensRotation2_fx(
+    const Word32 x, /* exp(x_e) */
+    const Word16 x_e,
+    const Word32 z, /* exp(z_e) */
+    const Word16 z_e,
+    Word32 *result,
+    Word32 *resultInv,
+    Word16 *out_e,
+    Word16 *outInv_e );
+
 static Word32 GivensRotation_fx(
     const Word32 x, /* exp(x_e) */
     const Word16 x_e,
@@ -274,9 +283,8 @@ Word16 svd_fx(
     Word16 iCh, jCh;
     Word16 lengthSingularValues;
     Word16 errorMessage, condition;
-    // int16_t max_length = ((nChannelsL > nChannelsC) ? nChannelsL : nChannelsC);
     Word32 secDiag_fx[MAX_OUTPUT_CHANNELS];
-    Word16 secDiag_fx_e = 0;
+    Word16 secDiag_fx_e[MAX_OUTPUT_CHANNELS];
     move16();
     Word32 eps_x_fx = 0, temp_fx;
     move16();
@@ -285,7 +293,6 @@ Word16 svd_fx(
     Word16 temp_fx_e;
     push_wmops( "svd_fx" );
 
-    set32_fx( secDiag_fx, 0, MAX_OUTPUT_CHANNELS );
 
     /* Collecting Values */
     FOR( iCh = 0; iCh < nChannelsL; iCh++ )
@@ -297,19 +304,15 @@ Word16 svd_fx(
         }
     }
 
-    set16_fx( singularValues_fx_e, 0, MAX_OUTPUT_CHANNELS );
-
     /* Householder reduction */
-    HouseholderReduction_fx( singularVectors_Left_fx, singularValues_fx, singularVectors_Right_fx, secDiag_fx, InputMatrix_e, singularValues_fx_e, &secDiag_fx_e, nChannelsL, nChannelsC, &eps_x_fx, &eps_x_fx_e );
-
+    HouseholderReduction_fx( singularVectors_Left_fx, singularValues_fx, singularVectors_Right_fx, secDiag_fx, InputMatrix_e, singularValues_fx_e, secDiag_fx_e, nChannelsL, nChannelsC, &eps_x_fx, &eps_x_fx_e );
     /* Set extremely small values to zero if needed */
     // flushToZeroArray(singularValues, max_length);
     // flushToZeroMat(singularVectors_Left, nChannelsL, nChannelsL);
     // flushToZeroMat(singularVectors_Right, nChannelsC, nChannelsC);
 
     /* BidagonalDiagonalisation */
-    errorMessage = BidagonalDiagonalisation_fx( singularVectors_Left_fx, singularValues_fx, singularVectors_Right_fx, secDiag_fx, singularValues_fx_e, &secDiag_fx_e, nChannelsL, nChannelsC, eps_x_fx, eps_x_fx_e ); /* Q0 */
-
+    errorMessage = BidagonalDiagonalisation_fx( singularVectors_Left_fx, singularValues_fx, singularVectors_Right_fx, secDiag_fx, singularValues_fx_e, secDiag_fx_e, nChannelsL, nChannelsC, eps_x_fx, eps_x_fx_e ); /* Q0 */
     /* Sort the singular values descending order */
     lengthSingularValues = s_min( nChannelsL, nChannelsC ); /* Q0 */
 
@@ -381,7 +384,7 @@ static Word16 BidagonalDiagonalisation_fx(
     Word32 singularVectors_Right_fx[][MAX_OUTPUT_CHANNELS], /* i/o: right singular vectors (V)		   singularValues_fx_e*/
     Word32 secDiag_fx[MAX_OUTPUT_CHANNELS],                 /* i/o:                                           secDiag_fx_e*/
     Word16 singularValues_fx_e[MAX_OUTPUT_CHANNELS],        /* i/o: singular values vector (S)							  */
-    Word16 *secDiag_fx_e,                                   /* i/o:														  */
+    Word16 *secDiag_new_e,                                  /* i/o:														  */
     const Word16 nChannelsL,                                /* i  : number of rows in the matrix to be decomposed		Q0*/
     const Word16 nChannelsC,                                /* i  : number of columns in the matrix to be decomposed	Q0*/
     const Word32 eps_x,                                     /* i  :                                                eps_x_e*/
@@ -395,6 +398,7 @@ static Word16 BidagonalDiagonalisation_fx(
     move16();
     move16();
     Word16 temp_exp;
+    Word16 temp_exp2;
     Word32 g = 0;
     move16();
     Word16 g_e = 0;
@@ -402,9 +406,9 @@ static Word16 BidagonalDiagonalisation_fx(
     Word16 convergence, iteration, found_split;
     Word16 error = 0;
     move16();
-    Word16 singularValues_new_e[MAX_OUTPUT_CHANNELS], secDiag_new_e[MAX_OUTPUT_CHANNELS];
+    Word32 temp;
+    Word16 singularValues_new_e[MAX_OUTPUT_CHANNELS];
     Copy( singularValues_fx_e, singularValues_new_e, MAX_OUTPUT_CHANNELS );
-    set16_fx( secDiag_new_e, *secDiag_fx_e, MAX_OUTPUT_CHANNELS );
 
     FOR( iCh = nChannelsC - 1; iCh >= 0; iCh-- ) /* nChannelsC */
     {
@@ -472,24 +476,17 @@ static Word16 BidagonalDiagonalisation_fx(
 
                     c = singularValues_fx[kCh]; /* exp(singularValues_new_e) */
                     c_e = singularValues_new_e[kCh];
-                    singularValues_fx[kCh] = GivensRotation_fx( g, g_e, singularValues_fx[kCh], singularValues_new_e[kCh], &singularValues_new_e[kCh] ); /* exp(singularValues_new_e) */
-                    c = BASOP_Util_Divide3232_Scale_cadence( c, maxWithSign_fx( singularValues_fx[kCh] ), &temp_exp );                                   /* exp(temp_exp + (c_e - singularValues_new_e)) */
-                    c_e = add( temp_exp, sub( c_e, singularValues_new_e[kCh] ) );
-                    IF( c_e > 0 )
-                    {
-                        c = L_shl_sat( c, c_e ); // Q31
-                        c_e = 0;
-                        move16();
-                    }
-                    s = BASOP_Util_Divide3232_Scale_cadence( -g, maxWithSign_fx( singularValues_fx[kCh] ), &temp_exp ); /* exp(temp_exp + (g_e - singularValues_new_e))*/
-                    s_e = add( temp_exp, sub( g_e, singularValues_new_e[kCh] ) );
-                    IF( s_e > 0 )
-                    {
-                        s = L_shl_sat( s, s_e ); // Q31
-                        s_e = 0;
-                        move16();
-                    }
-
+                    GivensRotation2_fx( g, g_e, singularValues_fx[kCh], singularValues_new_e[kCh], &singularValues_fx[kCh], &temp, &singularValues_new_e[kCh], &temp_exp ); /* exp(singularValues_new_e) */
+                    c = Mpy_32_32( c, temp );
+                    c_e = add( c_e, temp_exp );
+                    temp_exp2 = norm_l( c );
+                    c = L_shl( c, temp_exp2 );
+                    c_e = sub( c_e, temp_exp2 );
+                    s = Mpy_32_32( -g, temp );
+                    s_e = add( g_e, temp_exp );
+                    temp_exp2 = norm_l( s );
+                    s = L_shl( s, temp_exp2 );
+                    s_e = sub( s_e, temp_exp2 );
                     ApplyRotation_fx( singularVectors_Left_fx, c, c_e, s, s_e, 0, x11_e, 0, x12_e, &f1, &f1_e, &f2, &f2_e, kCh, split, nChannelsL ); /* nChannelsL */
                 }
             }
@@ -540,22 +537,6 @@ static Word16 BidagonalDiagonalisation_fx(
     // rescaling block
     Copy( singularValues_new_e, singularValues_fx_e, MAX_OUTPUT_CHANNELS );
 
-    Word16 max_exp = -31;
-    move16();
-    FOR( iCh = 0; iCh < nChannelsC; iCh++ )
-    {
-        if ( secDiag_fx[iCh] )
-        {
-            max_exp = s_max( max_exp, secDiag_new_e[iCh] );
-        }
-    }
-    *secDiag_fx_e = max_exp;
-    move16();
-    FOR( iCh = 0; iCh < nChannelsC; iCh++ )
-    {
-        secDiag_fx[iCh] = L_shr_r( secDiag_fx[iCh], sub( *secDiag_fx_e, secDiag_new_e[iCh] ) ); /* exp(secDiag_fx_e) */
-        move32();
-    }
 
     return ( error );
 }
@@ -579,6 +560,9 @@ static void ApplyQRTransform_fx(
     const Word16 nChannelsC    /* i  : number of columns in the matrix to be decomposed			Q0*/
 )
 {
+    Word32 temp;
+    Word16 temp_e;
+    Word16 temp_norm_e;
     Word16 ch, split;
     Word32 d = 0, g = 0, r = 0, x_ii = 0, x_split = 0, x_kk = 0, mu = 0, aux = 0;
     move32();
@@ -644,7 +628,7 @@ static void ApplyQRTransform_fx(
     L_temp1 = BASOP_Util_Add_Mant32Exp( r, r_e, r, r_e, &L_temp1_e ); /* exp(L_temp1_e) */
     L_temp1 = maxWithSign_fx( Mpy_32_32( L_temp1, x_split ) );        /* exp(L_temp1_e + x_split_e) */
     L_temp1_e = add( L_temp1_e, x_split_e );
-    d = BASOP_Util_Divide3232_Scale_cadence( d, L_temp1, &temp_exp ); /* temp_exp + d_e - L_temp1_e */
+    d = BASOP_Util_Divide3232_Scale_newton( d, L_temp1, &temp_exp ); /* temp_exp + d_e - L_temp1_e */
     d_e = add( temp_exp, sub( d_e, L_temp1_e ) );
 
     g = GivensRotation_fx( MAX_32, 0, d, d_e, &g_e );
@@ -662,7 +646,7 @@ static void ApplyQRTransform_fx(
     L_temp1_e = g_e;
     move16();
     L_temp2 = maxWithSign_fx( BASOP_Util_Add_Mant32Exp( d, d_e, L_temp1, L_temp1_e, &L_temp2_e ) ); /* exp(L_temp2_e) */
-    mu = BASOP_Util_Divide3232_Scale_cadence( x_split, L_temp2, &mu_e );                            /* exp(mu_e + (x-plit_e - L_temp2_e)) */
+    mu = BASOP_Util_Divide3232_Scale_newton( x_split, L_temp2, &mu_e );                             /* exp(mu_e + (x-plit_e - L_temp2_e)) */
     mu_e = add( mu_e, sub( x_split_e, L_temp2_e ) );
     mu = BASOP_Util_Add_Mant32Exp( mu, mu_e, L_negate( r ), r_e, &mu_e ); /* exp(mu_e) */
 
@@ -670,7 +654,7 @@ static void ApplyQRTransform_fx(
     L_temp1 = BASOP_Util_Add_Mant32Exp( x_ii, x_ii_e, x_kk, x_kk_e, &L_temp1_e );                                                           /* exp(L_temp1_e) */
     L_temp2 = BASOP_Util_Add_Mant32Exp( x_ii, x_ii_e, L_negate( x_kk ), x_kk_e, &L_temp2_e );                                               /* exp(L_temp2_e) */
     d = BASOP_Util_Add_Mant32Exp( Mpy_32_32( L_temp1, L_temp2 ), add( L_temp1_e, L_temp2_e ), Mpy_32_32( r, mu ), add( r_e, mu_e ), &d_e ); /* exp(d_e) */
-    d = BASOP_Util_Divide3232_Scale_cadence( d, maxWithSign_fx( x_ii ), &temp_exp );                                                        /* exp(temp_exp + (d_e - x_ii_e) */
+    d = BASOP_Util_Divide3232_Scale_newton( d, maxWithSign_fx( x_ii ), &temp_exp );                                                         /* exp(temp_exp + (d_e - x_ii_e) */
     d_e = add( temp_exp, sub( d_e, x_ii_e ) );
 
     /*QR transformation*/
@@ -681,25 +665,17 @@ static void ApplyQRTransform_fx(
         g = Mpy_32_32( c, secDiag[ch + 1] ); /* exp(c_e + secDiag_e) */
         g_e = add( c_e, secDiag_e[ch + 1] );
 
-        secDiag[ch] = GivensRotation_fx( d, d_e, r, r_e, &secDiag_e[ch] ); /* exp(secDiag_e) */
-        move32();
-        c = BASOP_Util_Divide3232_Scale_cadence( d, maxWithSign_fx( secDiag[ch] ), &c_e ); /* exp(c_e + (d_e + secDiag_e)) */
-        c_e = add( c_e, sub( d_e, secDiag_e[ch] ) );
-        IF( c_e > 0 )
-        {
-            c = L_shl_sat( c, c_e ); // Q31
-            c_e = 0;
-            move16();
-        }
-        s = BASOP_Util_Divide3232_Scale_cadence( r, maxWithSign_fx( secDiag[ch] ), &s_e ); /* exp(s_e + (r_e - sec_Diag_e))*/
-        s_e = add( s_e, sub( r_e, secDiag_e[ch] ) );
-        IF( s_e > 0 )
-        {
-            s = L_shl_sat( s, s_e ); // Q31
-            s_e = 0;
-            move16();
-        }
-
+        GivensRotation2_fx( d, d_e, r, r_e, &secDiag[ch], &temp, &secDiag_e[ch], &temp_e ); /* exp(secDiag_e) */
+        c = Mpy_32_32( d, temp );
+        c_e = add( temp_e, d_e );
+        temp_norm_e = norm_l( c );
+        c = L_shl( c, temp_norm_e );
+        c_e = sub( c_e, temp_norm_e );
+        s = Mpy_32_32( r, temp );
+        s_e = add( r_e, temp_e );
+        temp_norm_e = norm_l( s );
+        s = L_shl( s, temp_norm_e );
+        s_e = sub( s_e, temp_norm_e );
         r = Mpy_32_32( s, singularValues[ch + 1] ); /* exp(r_e + secDiag_e) */
         r_e = add( s_e, singularValues_e[ch + 1] );
         x_split = Mpy_32_32( c, singularValues[ch + 1] ); /* exp(c_e + secDiag_e) */
@@ -713,30 +689,21 @@ static void ApplyQRTransform_fx(
         // ApplyRotation(singularVectors_Right, c, s, x_ii, aux, &d, &g, ch + 1, ch, nChannelsC);
         ApplyRotation_fx( singularVectors_Right, c, c_e, s, s_e, x_ii, x_ii_e, aux, aux_e, &d, &d_e, &g, &g_e, ch + 1, ch, nChannelsC );
 
-        singularValues[ch] = GivensRotation_fx( d, d_e, r, r_e, &singularValues_e[ch] ); /* exp(singularValues_e) */
-        move32();
-        IF( GT_32( L_abs( singularValues[ch] ), Mpy_32_32( CONVERGENCE_FACTOR_FX, L_abs( singularValues[ch] ) ) ) )
+        GivensRotation2_fx( d, d_e, r, r_e, &singularValues[ch], &aux, &singularValues_e[ch], &aux_e ); /* exp(singularValues_e) */
+        IF( singularValues[ch] != 0 )
         {
-            aux = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, singularValues[ch], &aux_e ); /* exp(aux_e + (1 - singularValues_e)) */
-            aux_e = add( aux_e, sub( 1, singularValues_e[ch] ) );
 
             c = Mpy_32_32( d, aux ); /* exp(d_e + aux_e) */
             c_e = add( d_e, aux_e );
-            IF( c_e > 0 )
-            {
-                c = L_shl_sat( c, c_e ); // Q31
-                c_e = 0;
-                move16();
-            }
+            temp_norm_e = norm_l( c );
+            c = L_shl( c, temp_norm_e );
+            c_e = sub( c_e, temp_norm_e );
 
             s = Mpy_32_32( r, aux ); /* exp(r_e + aux_e) */
             s_e = add( r_e, aux_e );
-            IF( s_e > 0 )
-            {
-                s = L_shl_sat( s, s_e ); // Q31
-                s_e = 0;
-                move16();
-            }
+            temp_norm_e = norm_l( s );
+            s = L_shl( s, temp_norm_e );
+            s_e = sub( s_e, temp_norm_e );
         }
 
         // ApplyRotation(singularVectors_Left, c, s, g, x_split, &d, &x_ii, ch + 1, ch, nChannelsL);
@@ -783,26 +750,51 @@ static void ApplyRotation_fx(
 )
 {
     Word16 ch;
-    Word16 temp_exp;
 
     *d = BASOP_Util_Add_Mant32Exp( Mpy_32_32( c, x11 ), add( c_e, x11_e ), Mpy_32_32( s, x12 ), add( s_e, x12_e ), d_e ); /* exp(d_e) */
     move32();
     *g = BASOP_Util_Add_Mant32Exp( Mpy_32_32( c, x12 ), add( c_e, x12_e ), Mpy_32_32( L_negate( s ), x11 ), add( s_e, x11_e ), g_e ); /* exp(g_e) */
     move32();
 
+    Word16 c_q = sub( 31, c_e );
+    Word16 s_q = sub( 31, s_e );
+    Word32 op1, op2;
+    Word16 op_e;
+
+    // Bring c and s to same Q
+    IF( GT_16( c_q, s_q ) )
+    {
+        op1 = L_shr( c, sub( c_q, s_q ) );
+        op2 = s;
+        move32();
+        op_e = s_q;
+        move16();
+    }
+    ELSE
+    {
+        op1 = c;
+        move32();
+        op2 = L_shr( s, sub( s_q, c_q ) );
+        op_e = c_q;
+        move16();
+    }
+    op_e = add( op_e, 1 ); // 64 bit mac -> +1
+
     FOR( ch = 0; ch < nChannels; ch++ )
     {
         x11 = singularVector[ch][currentIndex2];
         move32();
         x12 = singularVector[ch][currentIndex1];
         move32();
-        singularVector[ch][currentIndex2] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( c, x11 ), c_e, Mpy_32_32( s, x12 ), s_e, &temp_exp ); /* exp(temp_exp) */
-        move32();
-        singularVector[ch][currentIndex2] = L_shl_sat( singularVector[ch][currentIndex2], temp_exp ); /* exp(temp_exp) */
-        move32();
-        singularVector[ch][currentIndex1] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( c, x12 ), c_e, Mpy_32_32( L_negate( s ), x11 ), s_e, &temp_exp ); /* exp(temp_exp) */
+
+        Word64 temp = W_mac_32_32( W_mult_32_32( op1, x11 ), op2, x12 ); // Q(singularVector) + op_e
+        temp = W_shr( temp, op_e );                                      // Q(singularVector)
+        singularVector[ch][currentIndex2] = W_sat_l( temp );             // Q(singularVector)
         move32();
-        singularVector[ch][currentIndex1] = L_shl_sat( singularVector[ch][currentIndex1], temp_exp ); /* exp(temp_exp) */
+
+        temp = W_mac_32_32( W_mult_32_32( op1, x12 ), L_negate( op2 ), x11 ); // Q(singularVector) + op_e
+        temp = W_shr( temp, op_e );                                           // Q(singularVector)
+        singularVector[ch][currentIndex1] = W_sat_l( temp );                  // Q(singularVector)
         move32();
     }
 
@@ -836,14 +828,25 @@ static void HouseholderReduction_fx(
     Word16 sig_x_fx_e = 0;
     move16();
 
+    Word16 iCh, jCh;
+    Word16 singularVectors_Left_fx_e[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS];
+    FOR( jCh = 0; jCh < nChannelsL; jCh++ )
+    {
+        FOR( iCh = 0; iCh < nChannelsC; iCh++ )
+        {
+            singularVectors_Left_fx_e[jCh][iCh] = singularVectors_Left_e;
+            move16();
+        }
+    }
+
     /* Bidiagonal Reduction for every channel */
     FOR( nCh = 0; nCh < nChannelsC; nCh++ ) /* nChannelsC */
     {
-        biDiagonalReductionLeft_fx( singularVectors_Left_fx, singularValues_fx, secDiag_fx, &singularVectors_Left_e, singularValues_fx_e, secDiag_fx_e, nChannelsL, nChannelsC, nCh, &sig_x_fx, &sig_x_fx_e, &g_fx );
-        biDiagonalReductionRight_fx( singularVectors_Left_fx, secDiag_fx, &singularVectors_Left_e, secDiag_fx_e, nChannelsL, nChannelsC, nCh, &sig_x_fx, &sig_x_fx_e, &g_fx );
+        biDiagonalReductionLeft_fx( singularVectors_Left_fx, singularValues_fx, secDiag_fx, singularVectors_Left_fx_e, singularValues_fx_e, secDiag_fx_e, nChannelsL, nChannelsC, nCh, &sig_x_fx, &sig_x_fx_e, &g_fx );
+        biDiagonalReductionRight_fx( singularVectors_Left_fx, secDiag_fx, singularVectors_Left_fx_e, secDiag_fx_e, nChannelsL, nChannelsC, nCh, &sig_x_fx, &sig_x_fx_e, &g_fx );
 
         Word16 L_temp_e;
-        Word32 L_temp = BASOP_Util_Add_Mant32Exp( L_abs( singularValues_fx[nCh] ), singularValues_fx_e[nCh], L_abs( secDiag_fx[nCh] ), *secDiag_fx_e, &L_temp_e ); /* exp(L_temp_e) */
+        Word32 L_temp = BASOP_Util_Add_Mant32Exp( L_abs( singularValues_fx[nCh] ), singularValues_fx_e[nCh], L_abs( secDiag_fx[nCh] ), secDiag_fx_e[nCh], &L_temp_e ); /* exp(L_temp_e) */
         IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_temp, L_temp_e, *eps_x_fx, *eps_x_fx_e ), 1 ) )
         {
             *eps_x_fx = L_temp; /* exp(L_temp_e) */
@@ -854,9 +857,10 @@ static void HouseholderReduction_fx(
     }
 
     /* SingularVecotr Accumulation */
-    singularVectorsAccumulationRight_fx( singularVectors_Left_fx, singularVectors_Right_fx, secDiag_fx, singularVectors_Left_e, *secDiag_fx_e, nChannelsC );
+    singularVectorsAccumulationRight_fx( singularVectors_Left_fx, singularVectors_Right_fx, secDiag_fx, singularVectors_Left_fx_e, secDiag_fx_e, nChannelsC );
 
-    singularVectorsAccumulationLeft_fx( singularVectors_Left_fx, singularValues_fx, singularVectors_Left_e, singularValues_fx_e, nChannelsL, nChannelsC );
+
+    singularVectorsAccumulationLeft_fx( singularVectors_Left_fx, singularValues_fx, singularVectors_Left_fx_e, singularValues_fx_e, nChannelsL, nChannelsC );
 
     return;
 }
@@ -871,7 +875,7 @@ static void biDiagonalReductionLeft_fx(
     Word32 singularVectors[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) */
     Word32 singularValues[MAX_OUTPUT_CHANNELS],    /* exp(singularValues_e) */
     Word32 secDiag[MAX_OUTPUT_CHANNELS],           /* exp(secDiag_e) */
-    Word16 *singularVectors_e,
+    Word16 singularVectors2_e[][MAX_OUTPUT_CHANNELS],
     Word16 singularValues_e[MAX_OUTPUT_CHANNELS],
     Word16 *secDiag_e,
     const Word16 nChannelsL,  /* Q0 */
@@ -885,153 +889,112 @@ static void biDiagonalReductionLeft_fx(
     Word16 iCh, jCh, idx;
     Word32 norm_x, f, r;
     Word16 norm_x_e, f_e, r_e;
-    Word16 sing_exp[MAX_OUTPUT_CHANNELS];
-    Word16 sing_exp2[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS] = { 0 };
     Word32 L_temp;
     Word16 L_temp_e;
-    FOR( jCh = 0; jCh < MAX_OUTPUT_CHANNELS; jCh++ )
-    {
-        set16_fx( sing_exp2[jCh], *singularVectors_e, MAX_OUTPUT_CHANNELS );
-    }
 
     secDiag[currChannel] = Mpy_32_32( *sig_x, *g ); /* exp(sig_x_e) */
     move32();
-    // rescaling block
-    IF( GT_16( *sig_x_e, *secDiag_e ) )
-    {
-        FOR( Word16 i = 0; i < MAX_OUTPUT_CHANNELS; i++ ){
-            IF( NE_16( i, currChannel ) ){
-                secDiag[i] = L_shl( secDiag[i], sub( *secDiag_e, *sig_x_e ) ); /* sig_x_e */
-        move32();
-    }
-}
-*secDiag_e = *sig_x_e;
-move16();
-}
-ELSE IF( LT_16( *sig_x_e, *secDiag_e ) )
-{
-    secDiag[currChannel] = L_shr_r( secDiag[currChannel], sub( *secDiag_e, *sig_x_e ) ); /* exp(secDiag_e) */
-    move32();
-}
-
-/* Setting values to 0 */
-( *sig_x ) = 0;
-move32();
-( *g ) = 0;
-move32();
-
-IF( LT_16( currChannel, nChannelsL ) ) /* i <= m */
-{
-    idx = currChannel;
+    secDiag_e[currChannel] = *sig_x_e;
     move16();
 
-    FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
-    {
-        ( *sig_x ) = BASOP_Util_Add_Mant32Exp( *sig_x, *sig_x_e, L_abs( singularVectors[jCh][currChannel] ), *singularVectors_e, sig_x_e ); /* exp(sig_x_e) */
-    }
+    /* Setting values to 0 */
+    ( *sig_x ) = 0;
+    move32();
+    ( *g ) = 0;
+    move32();
 
-    IF( ( *sig_x ) ) /*(fabsf(*sig_x) > EPSILON * fabsf(*sig_x)) { */
+    IF( LT_16( currChannel, nChannelsL ) ) /* i <= m */
     {
-        norm_x = 0;
-        move32();
-        norm_x_e = 0;
+        idx = currChannel;
         move16();
+
         FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
         {
-            singularVectors[jCh][currChannel] = BASOP_Util_Divide3232_Scale_cadence( singularVectors[jCh][currChannel], maxWithSign_fx( *sig_x ), &sing_exp[jCh] ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */
-            move32();
-            sing_exp[jCh] = add( sing_exp[jCh], sub( *singularVectors_e, *sig_x_e ) );
-            move16();
-            norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][currChannel] ), shl( sing_exp[jCh], 1 ), &norm_x_e ); /* exp(norm_x_e) */
-        }
-        IF( GT_16( norm_x_e, 0 ) )
-        {
-            norm_x = MAX_32;
-            move32();
-            norm_x_e = 0;
-            move16();
-        }
-        L_temp_e = norm_x_e;
-        move16();
-        L_temp = Sqrt32( norm_x, &L_temp_e );
-        L_temp = L_shl_r( L_temp, L_temp_e ); // Q31
-        //( *g ) = L_negate( GE_32( singularVectors[currChannel][idx], 0 ) ? L_temp : L_negate( L_temp ) );
-        IF( singularVectors[currChannel][idx] >= 0 )
-        {
-            ( *g ) = L_negate( L_temp );
-            move32();
-        }
-        ELSE
-        {
-            ( *g ) = L_negate( L_negate( L_temp ) );
-            move32();
+            ( *sig_x ) = BASOP_Util_Add_Mant32Exp( *sig_x, *sig_x_e, L_abs( singularVectors[jCh][currChannel] ), singularVectors2_e[jCh][currChannel], sig_x_e ); /* exp(sig_x_e) */
         }
 
-        r = BASOP_Util_Add_Mant32Exp( Mpy_32_32( ( *g ), singularVectors[currChannel][idx] ), sing_exp[currChannel], -norm_x, norm_x_e, &r_e );                       /* exp(r_e) */
-        singularVectors[currChannel][idx] = BASOP_Util_Add_Mant32Exp( singularVectors[currChannel][idx], sing_exp[currChannel], -( *g ), 0, &sing_exp[currChannel] ); /* sing_exp */
-        move32();
-
-        FOR( iCh = currChannel + 1; iCh < nChannelsC; iCh++ ) /* nChannelsC */
+        IF( ( *sig_x ) ) /*(fabsf(*sig_x) > EPSILON * fabsf(*sig_x)) { */
         {
+            Word16 invVal_e;
+            Word32 invVal;
+            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( *sig_x ), &invVal_e );
             norm_x = 0;
             move32();
             norm_x_e = 0;
             move16();
             FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
             {
-                norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][iCh] ), add( sing_exp[jCh], *singularVectors_e ), &norm_x_e ); /* exp(norm_x_e) */
+                Word16 temp_e = norm_l( singularVectors[jCh][currChannel] );
+                singularVectors[jCh][currChannel] = Mpy_32_32( L_shl( singularVectors[jCh][currChannel], temp_e ), invVal ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */
+                move32();
+                singularVectors2_e[jCh][currChannel] = sub( add( invVal_e, sub( singularVectors2_e[jCh][currChannel], *sig_x_e ) ), temp_e );
+                move16();
+                norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][currChannel] ), shl( singularVectors2_e[jCh][currChannel], 1 ), &norm_x_e ); /* exp(norm_x_e) */
             }
-
-            f = BASOP_Util_Divide3232_Scale_cadence( norm_x, maxWithSign_fx( r ), &f_e ); /* f_e + (norm_x_e - r_e) */
-            f_e = add( f_e, sub( norm_x_e, r_e ) );
-
-            FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
+            IF( GT_16( norm_x_e, 0 ) )
             {
-                singularVectors[jCh][iCh] = BASOP_Util_Add_Mant32Exp( singularVectors[jCh][iCh], *singularVectors_e, Mpy_32_32( f, singularVectors[jCh][currChannel] ), add( f_e, sing_exp[jCh] ), &sing_exp2[jCh][iCh] ); /* exp( sing_exp2) */
+                norm_x = MAX_32;
                 move32();
+                norm_x_e = 0;
+                move16();
             }
-        }
-
+            L_temp_e = norm_x_e;
+            move16();
+            L_temp = Sqrt32( norm_x, &L_temp_e );
+            L_temp = L_shl_r( L_temp, L_temp_e ); // Q31
+                                                  //( *g ) = L_negate( GE_32( singularVectors[currChannel][idx], 0 ) ? L_temp : L_negate( L_temp ) );
+            if ( singularVectors[currChannel][idx] >= 0 )
+            {
+                L_temp = L_negate( L_temp );
+            }
+            ( *g ) = L_temp;
+            move32();
 
-        FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
-        {
-            singularVectors[jCh][currChannel] = Mpy_32_32( singularVectors[jCh][currChannel], ( *sig_x ) ); /* sing_exp + sig_x_e */
+            r = BASOP_Util_Add_Mant32Exp( Mpy_32_32( ( *g ), singularVectors[currChannel][idx] ), singularVectors2_e[currChannel][idx], -norm_x, norm_x_e, &r_e );                                      /* exp(r_e) */
+            singularVectors[currChannel][idx] = BASOP_Util_Add_Mant32Exp( singularVectors[currChannel][idx], singularVectors2_e[currChannel][idx], -( *g ), 0, &singularVectors2_e[currChannel][idx] ); /* sing_exp */
             move32();
-            sing_exp2[jCh][currChannel] = add( sing_exp[jCh], *sig_x_e );
-            move16();
-        }
 
-        // rescaling block
-        Word16 exp_max = *singularVectors_e;
-        move16();
-        FOR( iCh = 0; iCh < nChannelsC; iCh++ )
-        {
-            FOR( jCh = 0; jCh < nChannelsL; jCh++ )
+            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( r ), &invVal_e );
+
+            FOR( iCh = currChannel + 1; iCh < nChannelsC; iCh++ ) /* nChannelsC */
             {
-                exp_max = s_max( exp_max, sing_exp2[jCh][iCh] );
+                norm_x = 0;
+                move32();
+                norm_x_e = 0;
+                move16();
+                FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
+                {
+                    norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][iCh] ), add( singularVectors2_e[jCh][currChannel], singularVectors2_e[jCh][iCh] ), &norm_x_e ); /* exp(norm_x_e) */
+                }
+
+                f = Mpy_32_32( norm_x, invVal ); /* invVal_e + (norm_x_e - r_e) */
+                f_e = add( invVal_e, sub( norm_x_e, r_e ) );
+
+                FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
+                {
+                    singularVectors[jCh][iCh] = BASOP_Util_Add_Mant32Exp( singularVectors[jCh][iCh], singularVectors2_e[jCh][iCh], Mpy_32_32( f, singularVectors[jCh][currChannel] ), add( f_e, singularVectors2_e[jCh][currChannel] ), &singularVectors2_e[jCh][iCh] );
+                    move32();
+                }
             }
-        }
 
-        FOR( iCh = 0; iCh < nChannelsC; iCh++ )
-        {
-            FOR( jCh = 0; jCh < nChannelsL; jCh++ )
+
+            FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
             {
-                singularVectors[jCh][iCh] = L_shr_r( singularVectors[jCh][iCh], sub( exp_max, sing_exp2[jCh][iCh] ) ); /* exp(exp_max) */
+                singularVectors[jCh][currChannel] = Mpy_32_32( singularVectors[jCh][currChannel], ( *sig_x ) ); /* sing_exp + sig_x_e */
                 move32();
+                singularVectors2_e[jCh][currChannel] = add( singularVectors2_e[jCh][currChannel], *sig_x_e );
+                move16();
             }
         }
-        *singularVectors_e = exp_max;
+
+        // rescaling block
+        singularValues[currChannel] = Mpy_32_32( ( *sig_x ), ( *g ) ); /* sig_x_e */
+        move32();
+        singularValues_e[currChannel] = *sig_x_e;
         move16();
     }
 
-    // rescaling block
-    singularValues[currChannel] = Mpy_32_32( ( *sig_x ), ( *g ) ); /* sig_x_e */
-    move32();
-    singularValues_e[currChannel] = *sig_x_e;
-    move16();
-}
-
-return;
+    return;
 }
 
 /*-------------------------------------------------------------------------
@@ -1042,9 +1005,9 @@ return;
 
 static void biDiagonalReductionRight_fx(
     Word32 singularVectors[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) */
-    Word32 secDiag[MAX_OUTPUT_CHANNELS],           /* exp(secDiag_e) */
-    Word16 *singularVectors_e,
-    Word16 *secDiag_e,
+    Word32 secDiag[MAX_OUTPUT_CHANNELS],           /* exp(secDiag_exp[]) */
+    Word16 singularVectors2_e[][MAX_OUTPUT_CHANNELS],
+    Word16 *secDiag_exp,
     const Word16 nChannelsL,  /* Q0 */
     const Word16 nChannelsC,  /* Q0 */
     const Word16 currChannel, /* Q0 */
@@ -1056,16 +1019,8 @@ static void biDiagonalReductionRight_fx(
     Word16 iCh, jCh, idx;
     Word32 norm_x, r;
     Word16 norm_x_e, r_e;
-    Word16 sing_exp[MAX_OUTPUT_CHANNELS];
-    Word16 secDiag_exp[MAX_OUTPUT_CHANNELS];
-    Word16 sing_exp2[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS] = { 0 };
     Word32 L_temp;
     Word16 L_temp_e;
-    FOR( jCh = 0; jCh < MAX_OUTPUT_CHANNELS; jCh++ )
-    {
-        set16_fx( sing_exp2[jCh], *singularVectors_e, MAX_OUTPUT_CHANNELS );
-    }
-    set16_fx( secDiag_exp, *secDiag_e, MAX_OUTPUT_CHANNELS );
 
     /* Setting values to 0 */
     ( *sig_x ) = 0;
@@ -1079,7 +1034,7 @@ static void biDiagonalReductionRight_fx(
 
         FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /* nChannelsC */
         {
-            ( *sig_x ) = BASOP_Util_Add_Mant32Exp( *sig_x, *sig_x_e, L_abs( singularVectors[currChannel][jCh] ), *singularVectors_e, sig_x_e ); /* exp(sig_x_e) */
+            ( *sig_x ) = BASOP_Util_Add_Mant32Exp( *sig_x, *sig_x_e, L_abs( singularVectors[currChannel][jCh] ), singularVectors2_e[currChannel][jCh], sig_x_e ); /* exp(sig_x_e) */
         }
 
         IF( ( *sig_x ) ) /*(fabsf(*sig_x) > EPSILON * fabsf(*sig_x)) { */
@@ -1089,13 +1044,17 @@ static void biDiagonalReductionRight_fx(
             norm_x_e = 0;
             move16();
 
+            Word16 invVal_e, temp_e;
+            Word32 invVal;
+            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( *sig_x ), &invVal_e );
             FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /*nChannelsC */
             {
-                singularVectors[currChannel][jCh] = BASOP_Util_Divide3232_Scale_cadence( singularVectors[currChannel][jCh], maxWithSign_fx( *sig_x ), &sing_exp[jCh] ); /* exp(sing_exp + (singularVectors_e - sig_x_e))  */
+                temp_e = norm_l( singularVectors[currChannel][jCh] );
+                singularVectors[currChannel][jCh] = Mpy_32_32( L_shl( singularVectors[currChannel][jCh], temp_e ), invVal ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */
                 move32();
-                sing_exp[jCh] = add( sing_exp[jCh], sub( *singularVectors_e, *sig_x_e ) );
+                singularVectors2_e[currChannel][jCh] = add( sub( invVal_e, temp_e ), sub( singularVectors2_e[currChannel][jCh], *sig_x_e ) );
                 move16();
-                norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[currChannel][jCh], singularVectors[currChannel][jCh] ), shl( sing_exp[jCh], 1 ), &norm_x_e ); /* exp(norm_x_e) */
+                norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[currChannel][jCh], singularVectors[currChannel][jCh] ), shl( singularVectors2_e[currChannel][jCh], 1 ), &norm_x_e ); /* exp(norm_x_e) */
             }
             IF( GT_16( norm_x_e, 0 ) )
             {
@@ -1119,16 +1078,19 @@ static void biDiagonalReductionRight_fx(
                 move32();
             }
 
-            r = BASOP_Util_Add_Mant32Exp( Mpy_32_32( ( *g ), singularVectors[currChannel][idx] ), sing_exp[idx], -norm_x, norm_x_e, &r_e );               /* exp(r_e) */
-            singularVectors[currChannel][idx] = BASOP_Util_Add_Mant32Exp( singularVectors[currChannel][idx], sing_exp[idx], -( *g ), 0, &sing_exp[idx] ); /* exp(sing_exp) */
+            r = BASOP_Util_Add_Mant32Exp( Mpy_32_32( ( *g ), singularVectors[currChannel][idx] ), singularVectors2_e[currChannel][idx], -norm_x, norm_x_e, &r_e );                                      /* exp(r_e) */
+            singularVectors[currChannel][idx] = BASOP_Util_Add_Mant32Exp( singularVectors[currChannel][idx], singularVectors2_e[currChannel][idx], -( *g ), 0, &singularVectors2_e[currChannel][idx] ); /* exp(sing_exp) */
             move32();
 
+            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( r ), &invVal_e );
+
             FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /* nChannelsC */
             {
-                secDiag[jCh] = BASOP_Util_Divide3232_Scale_cadence( singularVectors[currChannel][jCh], maxWithSign_fx( r ), &secDiag_exp[jCh] ); /* exp(secDiag_exp + (sing_exp - r_e) */
-                move32();
-                secDiag_exp[jCh] = add( secDiag_exp[jCh], sub( sing_exp[jCh], r_e ) );
+                temp_e = norm_l( singularVectors[currChannel][jCh] );
+                secDiag[jCh] = Mpy_32_32( L_shl( singularVectors[currChannel][jCh], temp_e ), invVal ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */
                 move32();
+                secDiag_exp[jCh] = add( sub( invVal_e, temp_e ), sub( singularVectors2_e[currChannel][jCh], r_e ) );
+                move16();
             }
 
             FOR( iCh = currChannel + 1; iCh < nChannelsL; iCh++ ) /*  nChannelsL */
@@ -1139,12 +1101,12 @@ static void biDiagonalReductionRight_fx(
                 move16();
                 FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /* nChannelsC */
                 {
-                    norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[iCh][jCh], singularVectors[currChannel][jCh] ), add( *singularVectors_e, sing_exp[jCh] ), &norm_x_e ); /* exp(norm_x_e) */
+                    norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[iCh][jCh], singularVectors[currChannel][jCh] ), add( singularVectors2_e[iCh][jCh], singularVectors2_e[currChannel][jCh] ), &norm_x_e ); /* exp(norm_x_e) */
                 }
 
                 FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /*  nChannelsC */
                 {
-                    singularVectors[iCh][jCh] = BASOP_Util_Add_Mant32Exp( singularVectors[iCh][jCh], *singularVectors_e, Mpy_32_32( norm_x, secDiag[jCh] ), add( norm_x_e, secDiag_exp[jCh] ), &sing_exp2[iCh][jCh] ); /* exp(sing_exp2) */
+                    singularVectors[iCh][jCh] = BASOP_Util_Add_Mant32Exp( singularVectors[iCh][jCh], singularVectors2_e[iCh][jCh], Mpy_32_32( norm_x, secDiag[jCh] ), add( norm_x_e, secDiag_exp[jCh] ), &singularVectors2_e[iCh][jCh] ); /* exp(sing_exp2) */
                     move32();
                 }
             }
@@ -1153,44 +1115,9 @@ static void biDiagonalReductionRight_fx(
             {
                 singularVectors[currChannel][jCh] = Mpy_32_32( singularVectors[currChannel][jCh], ( *sig_x ) ); /* exp(sing_exp + sig_x_e) */
                 move32();
-                sing_exp2[currChannel][jCh] = add( sing_exp[jCh], *sig_x_e );
+                singularVectors2_e[currChannel][jCh] = add( singularVectors2_e[currChannel][jCh], *sig_x_e );
                 move16();
             }
-
-            /*rescaling block*/
-            Word16 exp_max = *secDiag_e;
-            move16();
-            FOR( jCh = 0; jCh < nChannelsC; jCh++ )
-            {
-                exp_max = s_max( exp_max, secDiag_exp[jCh] );
-            }
-            FOR( jCh = 0; jCh < nChannelsC; jCh++ )
-            {
-                secDiag[jCh] = L_shr_r( secDiag[jCh], sub( exp_max, secDiag_exp[jCh] ) ); /* exp(exp_max) */
-                move32();
-            }
-
-
-            exp_max = *singularVectors_e;
-            move16();
-            FOR( iCh = 0; iCh < nChannelsL; iCh++ )
-            {
-                FOR( jCh = 0; jCh < nChannelsC; jCh++ )
-                {
-                    exp_max = s_max( exp_max, sing_exp2[iCh][jCh] );
-                }
-            }
-
-            FOR( iCh = 0; iCh < nChannelsL; iCh++ )
-            {
-                FOR( jCh = 0; jCh < nChannelsC; jCh++ )
-                {
-                    singularVectors[iCh][jCh] = L_shr_r( singularVectors[iCh][jCh], sub( exp_max, sing_exp2[iCh][jCh] ) ); /* exp(exp_max) */
-                    move32();
-                }
-            }
-            *singularVectors_e = exp_max;
-            move16();
         }
     }
 
@@ -1204,9 +1131,9 @@ static void biDiagonalReductionRight_fx(
  *-------------------------------------------------------------------------*/
 
 static void singularVectorsAccumulationLeft_fx(
-    Word32 singularVectors_Left[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) as Input, Q31 as output */
+    Word32 singularVectors_Left[][MAX_OUTPUT_CHANNELS], /* input exp(singularVectors_Left_e), output Q31 */
     Word32 singularValues[MAX_OUTPUT_CHANNELS],         /* exp(singularValues_e) */
-    Word16 singularVectors_e,
+    Word16 singularVectors_Left_e[][MAX_OUTPUT_CHANNELS],
     Word16 singularValues_e[MAX_OUTPUT_CHANNELS],
     const Word16 nChannelsL, /* Q0 */
     const Word16 nChannelsC  /* Q0 */
@@ -1216,11 +1143,6 @@ static void singularVectorsAccumulationLeft_fx(
     Word16 nChannels;
     Word32 norm_y, t_jj, t_ii;
     Word16 norm_y_e, t_jj_e, t_ii_e, temp_exp;
-    Word16 sing_exp2[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS] = { 0 };
-    FOR( nCh = 0; nCh < MAX_OUTPUT_CHANNELS; nCh++ )
-    {
-        set16_fx( sing_exp2[nCh], singularVectors_e, MAX_OUTPUT_CHANNELS );
-    }
 
     /* Processing */
     nChannels = s_min( nChannelsL, nChannelsC ); /* min(nChannelsL,ChannelsC) Q0*/
@@ -1240,25 +1162,41 @@ static void singularVectorsAccumulationLeft_fx(
 
         IF( t_ii ) /*if (fabsf(t_ii) > EPSILON *fabsf(t_ii)) {*/
         {
-            t_ii = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, maxWithSign_fx( t_ii ), &temp_exp ); /* exp(1 + (temp_exp + tii_e)) */
-            t_ii_e = add( 1, sub( temp_exp, t_ii_e ) );
+            t_ii = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( t_ii ), &temp_exp );
+            t_ii_e = sub( temp_exp, t_ii_e );
+            Word16 tempe;
+            Word32 temp = BASOP_Util_Divide3232_Scale_newton( t_ii, maxWithSign_fx( singularVectors_Left[nCh][nCh] ), &tempe );
+            tempe = add( tempe, sub( t_ii_e, singularVectors_Left_e[nCh][nCh] ) );
             // fprintf( fp, "%e\n", me2f( t_ii, t_ii_e ) );
             FOR( iCh = nCh + 1; iCh < nChannelsC; iCh++ ) /* nChannelsC */
             {
-                norm_y = 0;
-                move32();
-                norm_y_e = 0;
+                Word64 acc = 0;
+                move64();
+                Word64 prod[16];
+                Word16 prod_e[16];
+                Word16 max_e = -31;
                 move16();
                 FOR( k = nCh + 1; k < nChannelsL; k++ ) /* nChannelsL */
                 {
-                    norm_y = BASOP_Util_Add_Mant32Exp( norm_y, norm_y_e, Mpy_32_32( singularVectors_Left[k][nCh], singularVectors_Left[k][iCh] ), add( sing_exp2[k][nCh], sing_exp2[k][iCh] ), &norm_y_e ); /* exp(norm_y_e) */
+                    prod[k] = W_mult0_32_32( singularVectors_Left[k][nCh], singularVectors_Left[k][iCh] );
+                    prod_e[k] = add( singularVectors_Left_e[k][nCh], singularVectors_Left_e[k][iCh] );
+                    max_e = s_max( max_e, prod_e[k] );
+                }
+
+                FOR( k = nCh + 1; k < nChannelsL; k++ ) /* nChannelsL */
+                {
+                    acc = W_add( acc, W_shr( prod[k], sub( max_e, prod_e[k] ) ) );
                 }
-                t_jj = BASOP_Util_Divide3232_Scale_cadence( Mpy_32_32( t_ii, norm_y ), maxWithSign_fx( singularVectors_Left[nCh][nCh] ), &temp_exp ); // t_ii_e+norm_y_e-*singularVectors_e,
-                t_jj_e = add( temp_exp, sub( add( t_ii_e, norm_y_e ), sing_exp2[nCh][nCh] ) );
+                Word16 acc_e = W_norm( acc );
+                acc = W_shl( acc, acc_e );
 
+                norm_y = W_extract_h( acc );
+                norm_y_e = add( sub( max_e, acc_e ), 1 );
+                t_jj = Mpy_32_32( temp, norm_y );
+                t_jj_e = add( tempe, norm_y_e );
                 FOR( k = nCh; k < nChannelsL; k++ ) /* nChannelsL */
                 {
-                    singularVectors_Left[k][iCh] = BASOP_Util_Add_Mant32Exp( singularVectors_Left[k][iCh], sing_exp2[k][iCh], Mpy_32_32( t_jj, singularVectors_Left[k][nCh] ), add( t_jj_e, sing_exp2[k][nCh] ), &sing_exp2[k][iCh] ); /* exp(sing_exp2) */
+                    singularVectors_Left[k][iCh] = BASOP_Util_Add_Mant32Exp( singularVectors_Left[k][iCh], singularVectors_Left_e[k][iCh], Mpy_32_32( t_jj, singularVectors_Left[k][nCh] ), add( t_jj_e, singularVectors_Left_e[k][nCh] ), &singularVectors_Left_e[k][iCh] ); /* exp(sing_exp2) */
                     move32();
                 }
             }
@@ -1267,7 +1205,7 @@ static void singularVectorsAccumulationLeft_fx(
             {
                 singularVectors_Left[iCh][nCh] = Mpy_32_32( singularVectors_Left[iCh][nCh], t_ii ); /* exp(sing_exp2 + t_ii_e) */
                 move32();
-                sing_exp2[iCh][nCh] = add( sing_exp2[iCh][nCh], t_ii_e );
+                singularVectors_Left_e[iCh][nCh] = add( singularVectors_Left_e[iCh][nCh], t_ii_e );
                 move16();
             }
         }
@@ -1279,8 +1217,7 @@ static void singularVectorsAccumulationLeft_fx(
                 move32();
             }
         }
-
-        singularVectors_Left[nCh][nCh] = BASOP_Util_Add_Mant32Exp( singularVectors_Left[nCh][nCh], sing_exp2[nCh][nCh], ONE_IN_Q30, 1, &sing_exp2[nCh][nCh] ); /* exp(sing_exp2) */
+        singularVectors_Left[nCh][nCh] = BASOP_Util_Add_Mant32Exp( singularVectors_Left[nCh][nCh], singularVectors_Left_e[nCh][nCh], ONE_IN_Q30, 1, &singularVectors_Left_e[nCh][nCh] ); /* exp(sing_exp2) */
         move32();
     }
     // fclose(fp);
@@ -1288,7 +1225,7 @@ static void singularVectorsAccumulationLeft_fx(
     {
         FOR( iCh = 0; iCh < nChannelsC; iCh++ )
         {
-            singularVectors_Left[nCh][iCh] = L_shl_sat( singularVectors_Left[nCh][iCh], sing_exp2[nCh][iCh] ); /* Q31 */
+            singularVectors_Left[nCh][iCh] = L_shl_sat( singularVectors_Left[nCh][iCh], singularVectors_Left_e[nCh][iCh] ); /* Q31 */
             move32();
         }
     }
@@ -1303,11 +1240,11 @@ static void singularVectorsAccumulationLeft_fx(
  *-------------------------------------------------------------------------*/
 
 static void singularVectorsAccumulationRight_fx(
-    Word32 singularVectors_Left[][MAX_OUTPUT_CHANNELS],  /* exp(singularVectors_e) */
-    Word32 singularVectors_Right[][MAX_OUTPUT_CHANNELS], /* exp(singularVectors_e) */
+    Word32 singularVectors_Left[][MAX_OUTPUT_CHANNELS],  /* exp(singularVectors_Left_e) */
+    Word32 singularVectors_Right[][MAX_OUTPUT_CHANNELS], /* input exp(singularVectors_Left_e), output Q31 */
     Word32 secDiag[MAX_OUTPUT_CHANNELS],                 /* exp(secDiag_e) */
-    Word16 singularVectors_e,
-    Word16 secDiag_e,
+    Word16 singularVectors_Left_e[][MAX_OUTPUT_CHANNELS],
+    Word16 *secDiag_e,
     const Word16 nChannelsC /* Q0 */
 )
 {
@@ -1320,7 +1257,7 @@ static void singularVectorsAccumulationRight_fx(
     nChannels = nChannelsC; /* nChannelsC	Q0*/
 
     /* avoid compiler warning */
-    t_ii = secDiag[nChannels - 1]; /* exp(secDiag_e) */
+    t_ii = secDiag[nChannels - 1]; /* exp(secDiag_e[nChannels - 1]) */
     move32();
 
     FOR( nCh = nChannels - 1; nCh >= 0; nCh-- ) /* nChannelsC, min(nChannelsLmnChannelsC) otherwise */
@@ -1333,10 +1270,11 @@ static void singularVectorsAccumulationRight_fx(
 
                 FOR( iCh = nCh + 1; iCh < nChannelsC; iCh++ ) /* nChannelsC*/
                 {
-                    ratio_float = BASOP_Util_Divide3232_Scale_cadence( singularVectors_Left[nCh][iCh], maxWithSign_fx( singularVectors_Left[nCh][nCh + 1] ), &temp_exp1 ); /* exp(temp_exp1) */
-                    singularVectors_Right[iCh][nCh] = BASOP_Util_Divide3232_Scale_cadence( ratio_float, maxWithSign_fx( t_ii ), &sing_right_exp[iCh][nCh] );               /* exp(sing_right_exp + (temp_exp1 - secDiag_e) */
+                    ratio_float = L_deposit_h( BASOP_Util_Divide3232_Scale( singularVectors_Left[nCh][iCh], maxWithSign_fx( singularVectors_Left[nCh][nCh + 1] ), &temp_exp1 ) ); /* exp(temp_exp1) */
+                    singularVectors_Right[iCh][nCh] = L_deposit_h( BASOP_Util_Divide3232_Scale( ratio_float, maxWithSign_fx( t_ii ), &sing_right_exp[iCh][nCh] ) );               /* exp(sing_right_exp + (temp_exp1 - secDiag_e) */
+                    temp_exp1 = add( temp_exp1, sub( singularVectors_Left_e[nCh][iCh], singularVectors_Left_e[nCh][nCh + 1] ) );
                     move32();
-                    sing_right_exp[iCh][nCh] = add( sing_right_exp[iCh][nCh], sub( temp_exp1, secDiag_e ) );
+                    sing_right_exp[iCh][nCh] = add( sing_right_exp[iCh][nCh], sub( temp_exp1, secDiag_e[nCh + 1] ) );
                     move16();
                     // singularVectors_Right[iCh][nCh] = L_shl_sat( singularVectors_Right[iCh][nCh], temp_exp2 );
                 }
@@ -1350,7 +1288,7 @@ static void singularVectorsAccumulationRight_fx(
 
                     FOR( k = nCh + 1; k < nChannelsC; k++ ) /* nChannelsC */
                     {
-                        norm_y = BASOP_Util_Add_Mant32Exp( norm_y, norm_y_e, Mpy_32_32( singularVectors_Left[nCh][k], singularVectors_Right[k][iCh] ), add( singularVectors_e, sing_right_exp[k][iCh] ), &norm_y_e ); /* exp(norm_y_e) */
+                        norm_y = BASOP_Util_Add_Mant32Exp( norm_y, norm_y_e, Mpy_32_32( singularVectors_Left[nCh][k], singularVectors_Right[k][iCh] ), add( singularVectors_Left_e[nCh][k], sing_right_exp[k][iCh] ), &norm_y_e ); /* exp(norm_y_e) */
                     }
 
                     FOR( k = nCh + 1; k < nChannelsC; k++ ) /* nChannelsC */
@@ -1374,7 +1312,7 @@ static void singularVectorsAccumulationRight_fx(
         }
         singularVectors_Right[nCh][nCh] = MAX_32;
         move32();
-        t_ii = secDiag[nCh]; /* exp(secDiag_e) */
+        t_ii = secDiag[nCh]; /* exp(secDiag_e[nCh]) */
         move32();
     }
     return;
@@ -1386,6 +1324,29 @@ static void singularVectorsAccumulationRight_fx(
  *
  *-------------------------------------------------------------------------*/
 
+
+static void GivensRotation2_fx(
+    const Word32 x, /* exp(x_e) */
+    const Word16 x_e,
+    const Word32 z, /* exp(z_e) */
+    const Word16 z_e,
+    Word32 *result,
+    Word32 *resultInv,
+    Word16 *out_e,
+    Word16 *outInv_e )
+{
+    Word32 r;
+    r = BASOP_Util_Add_Mant32Exp( Mpy_32_32( z, z ), shl( z_e, 1 ), Mpy_32_32( x, x ), shl( x_e, 1 ), out_e );
+    r = L_max( r, 1 );
+    *outInv_e = *out_e;
+    move16();
+    *result = Sqrt32( r, out_e );
+    move32();
+
+    *resultInv = ISqrt32( r, outInv_e );
+    move32();
+}
+
 static Word32 GivensRotation_fx(
     const Word32 x, /* exp(x_e) */
     const Word16 x_e,
@@ -1393,53 +1354,10 @@ static Word32 GivensRotation_fx(
     const Word16 z_e,
     Word16 *out_e )
 {
-    Word32 x_abs, z_abs;
-    Word32 cotan, tan, r;
-    Word16 temp_exp;
-    Word32 L_temp;
-    x_abs = L_abs( x );
-    z_abs = L_abs( z );
-    test();
-    IF( LE_32( x_abs, Mpy_32_32( CONVERGENCE_FACTOR_FX, x_abs ) ) && LE_32( z_abs, Mpy_32_32( CONVERGENCE_FACTOR_FX, z_abs ) ) )
-    {
-        r = 0;
-        move32();
-    }
-    ELSE IF( BASOP_Util_Cmp_Mant32Exp( x_abs, x_e, z_abs, z_e ) >= 0 )
-    {
-        IF( LE_32( x_abs, SVD_MINIMUM_VALUE_FX ) )
-        {
-            r = 0;
-            move32();
-        }
-        ELSE
-        {
-            cotan = BASOP_Util_Divide3232_Scale_cadence( z_abs, x_abs, &temp_exp ); /* exp(temp_exp + (z_e - x_e) */
-            temp_exp = add( temp_exp, sub( z_e, x_e ) );
-            L_temp = BASOP_Util_Add_Mant32Exp( ONE_IN_Q30, 1, Mpy_32_32( cotan, cotan ), 2 * temp_exp, &temp_exp ); /* exp(temp_exp) */
-            L_temp = Sqrt32( L_temp, &temp_exp );
-            r = Mpy_32_32( x_abs, L_temp ); /* exp(x_e + temp_exp) */
-            *out_e = add( x_e, temp_exp );
-        }
-    }
-    ELSE
-    {
-        IF( LE_32( z_abs, SVD_MINIMUM_VALUE_FX ) )
-        {
-            r = 0;
-            move32();
-        }
-        ELSE
-        {
-            tan = BASOP_Util_Divide3232_Scale_cadence( x_abs, z_abs, &temp_exp ); /* exp(temp_exp + (x_e - z_e) */
-            temp_exp = add( temp_exp, sub( x_e, z_e ) );
-            L_temp = BASOP_Util_Add_Mant32Exp( ONE_IN_Q30, 1, Mpy_32_32( tan, tan ), shl( temp_exp, 1 ), &temp_exp ); /* exp(temp_exp) */
-            L_temp = Sqrt32( L_temp, &temp_exp );
-            r = Mpy_32_32( z_abs, L_temp ); /* exp(z_e + temp_exp) */
-            *out_e = add( z_e, temp_exp );
-        }
-    }
+    Word32 r;
 
+    r = BASOP_Util_Add_Mant32Exp( Mpy_32_32( z, z ), shl( z_e, 1 ), Mpy_32_32( x, x ), shl( x_e, 1 ), out_e );
+    r = Sqrt32( r, out_e );
     return ( r );
 }
 
@@ -1453,18 +1371,16 @@ static Word32 maxWithSign_fx(
     const Word32 a /* Qx */
 )
 {
-    IF( GT_32( L_abs( a ), SVD_MINIMUM_VALUE_FX ) )
-    {
-        return a;
-    }
-    ELSE IF( a < 0 )
+    Word32 result;
+    IF( a >= 0 )
     {
-        return -SVD_MINIMUM_VALUE_FX;
+        result = L_max( a, SVD_MINIMUM_VALUE_FX );
     }
     ELSE
     {
-        return SVD_MINIMUM_VALUE_FX;
+        result = L_min( a, -SVD_MINIMUM_VALUE_FX );
     }
+    return result;
 }
 
 /*-------------------------------------------------------------------------
diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec_fx.c
similarity index 97%
rename from lib_dec/ivas_tcx_core_dec.c
rename to lib_dec/ivas_tcx_core_dec_fx.c
index d3a3d7bc60a9141b2b105b634ca0958528f44a38..0be01f7b88612b359fb0b5b88b1fda3028fdeceb 100644
--- a/lib_dec/ivas_tcx_core_dec.c
+++ b/lib_dec/ivas_tcx_core_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,14 +34,12 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "stat_dec.h"
 #include "wmc_auto.h"
 #include "basop_proto_func.h"
 #include "stat_com.h"
-#include "ivas_prot.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------*
@@ -641,18 +639,18 @@ void stereo_tcx_core_dec_fx(
                 move16();
             }
             /* waveform adjustment */
-            concealment_signal_tuning_fx( bfi, st->core, synthFB_fx, &st->plcInfo, st->nbLostCmpt, st->prev_bfi, st->hTonalMDCTConc->secondLastPcmOut, st->last_core_bfi, st->hTonalMDCTConc->lastPcmOut, st );
+            concealment_signal_tuning_fx( st, bfi, synthFB_fx, st->last_core_bfi );
 
             test();
             test();
             test();
-            IF( ( bfi || st->prev_bfi ) && st->hPlcInfo->Pitch && EQ_16( st->hPlcInfo->concealment_method, TCX_NONTONAL ) )
+            IF( ( bfi || st->prev_bfi ) && st->hPlcInfo->Pitch_fx && EQ_16( st->hPlcInfo->concealment_method, TCX_NONTONAL ) )
             {
                 lerp( synthFB_fx, synth_fx, st->L_frame, hTcxDec->L_frameTCX );
 
                 if ( !bfi && st->prev_bfi )
                 {
-                    st->hPlcInfo->Pitch = 0;
+                    st->hPlcInfo->Pitch_fx = 0;
                     move16();
                 }
             }
@@ -810,21 +808,11 @@ void stereo_tcx_core_dec_fx(
     move16();
 
     /* Postfiltering */
-#ifndef MSAN_FIX
-    IF( st->p_bpf_noise_buf_32 )
-    {
-        Copy_Scale_sig_32_16( st->p_bpf_noise_buf_32, st->p_bpf_noise_buf, st->L_frame, negate( Q11 ) );
-    }
-#endif
 
     post_decoder( st, synth_buf_fx, pit_gain_fx, pitch, signal_out_fx, st->p_bpf_noise_buf );
 
     test();
-#ifdef MSAN_FIX
     IF( st->p_bpf_noise_buf_32 && st->tcxonly == 0 )
-#else
-    IF( st->p_bpf_noise_buf_32 )
-#endif // MSAN_FIX
     {
         Copy_Scale_sig_16_32_no_sat( st->p_bpf_noise_buf, st->p_bpf_noise_buf_32, st->L_frame, Q11 ); /* q_p_bpf + Q11 */
     }
@@ -887,11 +875,11 @@ void stereo_tcx_core_dec_fx(
             {
                 Word16 buffer[L_FRAME16k];
                 lerp( signal_outFB_fx, buffer, st->L_frame, hTcxDec->L_frameTCX );
-                ApplyFdCng_ivas_fx( buffer, 0 /* Q of buffer */, NULL, 0, NULL, NULL, NULL, st, st->bfi, 0 );
+                ApplyFdCng_fx( buffer, 0 /* Q of buffer */, NULL, 0, NULL, NULL, NULL, st, st->bfi, 0 );
             }
             ELSE
             {
-                ApplyFdCng_ivas_fx( signal_out_fx, 0, NULL, 0, NULL, NULL, NULL, st, st->bfi, 0 );
+                ApplyFdCng_fx( signal_out_fx, 0, NULL, 0, NULL, NULL, NULL, st, st->bfi, 0 );
             }
         }
 
@@ -927,7 +915,7 @@ void stereo_tcx_core_dec_fx(
         test();
         IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && st->idchan == 0 )
         {
-            ApplyFdCng_ivas_fx( signal_out_fx, 0, NULL, 0, NULL, NULL, NULL, st, st->bfi, 0 );
+            ApplyFdCng_fx( signal_out_fx, 0, NULL, 0, NULL, NULL, NULL, st, st->bfi, 0 );
         }
     }
 
@@ -935,6 +923,7 @@ void stereo_tcx_core_dec_fx(
     return;
 }
 
+
 static void stereo_tcx_dec_mode_switch_reconf_ivas_fx(
     Decoder_State *st,              /* i/o: decoder state structure					  */
     const Word16 MCT_flag,          /* i  : hMCT handle allocated (1) or not (0)	Q0*/
diff --git a/lib_dec/ivas_td_low_rate_dec.c b/lib_dec/ivas_td_low_rate_dec_fx.c
similarity index 90%
rename from lib_dec/ivas_td_low_rate_dec.c
rename to lib_dec/ivas_td_low_rate_dec_fx.c
index 7df267b1d648efc5ceb1e6bc86247b0cc403ef35..6419f851707619786e1b829b5736688777677897 100644
--- a/lib_dec/ivas_td_low_rate_dec.c
+++ b/lib_dec/ivas_td_low_rate_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,11 +37,16 @@
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
+
+/*-------------------------------------------------------------------*
+ * tdm_low_rate_dec_fx()
+ *
+ * Low-bitrate decoder
+ *-------------------------------------------------------------------*/
+
 void tdm_low_rate_dec_fx(
     Decoder_State *st,     /* i/o: decoder static memory							 */
     Word16 dct_epit[],     /* o  : GSC excitation in DCT domain					Q_exc*/
@@ -129,7 +134,7 @@ void tdm_low_rate_dec_fx(
         tmp_nb_bits_tot = sub( tmp_nb_bits_tot, 1 ); /* Q0 */
     }
 
-    gsc_dec_ivas_fx( st, dct_epit, pit_band_idx, Diff_len, tmp_nb_bits_tot, nb_subfr, st->coder_type, &last_bin, lsf_new, exc_wo_nf_fx, &st->Q_exc );
+    gsc_dec_fx( st, dct_epit, pit_band_idx, Diff_len, tmp_nb_bits_tot, nb_subfr, st->coder_type, &last_bin, lsf_new, exc_wo_nf_fx, &st->Q_exc );
 
     /*--------------------------------------------------------------------------------------*
      * iDCT transform
@@ -139,8 +144,16 @@ void tdm_low_rate_dec_fx(
 
     edct_16fx( exc_wo_nf_fx, exc_wo_nf_fx, L_FRAME, find_guarded_bits_fx( L_FRAME ), IVAS_CPE_TD );
 
-    Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, &exc[0], &bwe_exc[0], st->hGSCDec->last_exc_dct_in_fx,
-                 L_FRAME, L_FRAME * HIBND_ACB_L_FAC, L_shl( st->lp_gainc_fx, 13 /* Q3 -> Q16*/ ), &( st->Q_exc ), st->Q_subfr, NULL, 0, st->coder_type );
+    IF( bwe_exc != NULL )
+    {
+        Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, &exc[0], &bwe_exc[0], st->hGSCDec->last_exc_dct_in_fx,
+                     L_FRAME, L_FRAME * HIBND_ACB_L_FAC, L_shl( st->lp_gainc_fx, 13 /* Q3 -> Q16*/ ), &( st->Q_exc ), st->Q_subfr, NULL, 0, st->coder_type );
+    }
+    ELSE
+    {
+        Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, &exc[0], NULL, st->hGSCDec->last_exc_dct_in_fx,
+                     L_FRAME, L_FRAME * HIBND_ACB_L_FAC, L_shl( st->lp_gainc_fx, 13 /* Q3 -> Q16*/ ), &( st->Q_exc ), st->Q_subfr, NULL, 0, st->coder_type );
+    }
     /*----------------------------------------------------------------------*
      * Remove potential pre-echo in case an onset has been detected
      *----------------------------------------------------------------------*/
@@ -182,19 +195,15 @@ void tdm_low_rate_dec_fx(
     return;
 }
 
+
 /*---------------------------------------------------------------------*
  * decod_gen_2sbfr()
  *
  * Decode generic (GC), 2 subframes mode
  *---------------------------------------------------------------------*/
-/*---------------------------------------------------------------------*
- * decod_gen_2sbfr_ivas_fx()
- *
- * Decode generic (GC), 2 subframes mode
- *---------------------------------------------------------------------*/
 
-void decod_gen_2sbfr_ivas_fx(
-    Decoder_State *st,                 /* i/o: decoder static memory                     */
+void decod_gen_2sbfr_fx(
+    Decoder_State *st,                 /* i/o: decoder static memory                        */
     const Word16 sharpFlag,            /* i  : formant sharpening flag                   `Q0*/
     const Word16 *Aq,                  /* i  : LP filter coefficient					 Q12*/
     Word16 *pitch_buf,                 /* o  : Word16 pitch values for each subframe	  Q6*/
@@ -216,12 +225,12 @@ void decod_gen_2sbfr_ivas_fx(
     move32();
     Word16 gain_inov = 0; /* Innovation gain                                  */
     move16();
-    Word32 gc_mem[NB_SUBFR - 1]; /* gain_code from previous subframes                    */
-    Word16 gp_mem[NB_SUBFR - 1]; /* gain_pitch from previous subframes                   */
+    Word32 gc_mem[NB_SUBFR - 1]; /* gain_code from previous subframes                */
+    Word16 gp_mem[NB_SUBFR - 1]; /* gain_pitch from previous subframes               */
     Word16 voice_fac;            /* voicing factor                                   */
     Word16 code[2 * L_SUBFR];    /* algebraic codevector                             */
     const Word16 *p_Aq;          /* Pointer to frame LP coefficient                  */
-    Word16 *pt_pitch;            /* pointer to Word16 pitch                        */
+    Word16 *pt_pitch;            /* pointer to Word16 pitch                          */
     Word16 i_subfr;              /* tmp variables                                    */
     Word16 L_frame;
     Word16 pitch_limit_flag;
@@ -257,7 +266,7 @@ void decod_gen_2sbfr_ivas_fx(
          * Decode pitch lag
          *----------------------------------------------------------------------*/
 
-        *pt_pitch = pit_decode_ivas_fx( st, st->core_brate, 0, L_frame, i_subfr, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, 2 * L_SUBFR, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf ); /* Q6 */
+        *pt_pitch = pit_decode_fx( st, st->core_brate, 0, L_frame, i_subfr, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, 2 * L_SUBFR, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf ); /* Q6 */
 
         test();
         test();
@@ -289,7 +298,7 @@ void decod_gen_2sbfr_ivas_fx(
          * Estimate spectrum tilt and voicing
          *--------------------------------------------------------------*/
 
-        gain_dec_lbr_ivas_fx( st, GENERIC, i_subfr, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, gc_mem, gp_mem, 2 * L_SUBFR );
+        gain_dec_lbr_fx( st, GENERIC, i_subfr, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, gc_mem, gp_mem, 2 * L_SUBFR );
         st->tilt_code_fx = est_tilt_ivas_fx( exc + i_subfr, gain_pit, code, gain_code, &voice_fac, st->Q_exc, 2 * L_SUBFR, 0 ); /* Q15 */
         move16();
 
@@ -306,10 +315,12 @@ void decod_gen_2sbfr_ivas_fx(
 
         Word16 gain_code16 = round_fx( L_shl( gain_code, st->Q_exc ) ); /*Q_exc*/
         Acelp_dec_total_exc( exc, exc2, gain_code16, gain_pit, i_subfr, code, 2 * L_SUBFR );
+
         /*-----------------------------------------------------------------*
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
-        prep_tbe_exc_ivas_fx( L_frame, 2 * L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR /*i_subfr / L_SUBFR*/], bwe_exc, 0, NULL, st->Q_exc, T0, T0_frac, GENERIC, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
+
+        prep_tbe_exc_fx( L_frame, 2 * L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR /*i_subfr / L_SUBFR*/], bwe_exc, 0, NULL, st->Q_exc, T0, T0_frac, GENERIC, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
         voice_factors[i_subfr / L_SUBFR + 1] = voice_factors[i_subfr / L_SUBFR /*i_subfr / L_SUBFR*/]; /* Q15 */
         move16();
 
@@ -317,6 +328,7 @@ void decod_gen_2sbfr_ivas_fx(
          * Excitation enhancements (update of total excitation signal)
          * called twice because adapting it to double the subfr length would need lot of modifications
          *----------------------------------------------------------------*/
+
         enhancer_ivas_fx2( st->core_brate, 0, GENERIC, i_subfr, L_frame, voice_fac, st->stab_fac_fx, norm_gain_code, gain_inov, &st->gc_threshold_fx, code, exc2, gain_pit, &st->dm_fx, st->Q_exc );
 
         enhancer_ivas_fx2( st->core_brate, 0, GENERIC, i_subfr, L_frame, voice_fac, st->stab_fac_fx, norm_gain_code, gain_inov, &st->gc_threshold_fx, code + L_SUBFR, exc2 + L_SUBFR, gain_pit, &st->dm_fx, st->Q_exc );
diff --git a/lib_dec/jbm_jb4_circularbuffer.c b/lib_dec/jbm_jb4_circularbuffer.c
index bc12026c9520a90fc69c64e830efb4d89787fec1..f9d6d1ca148c39a2c2891ace4451261d119a2458 100644
--- a/lib_dec/jbm_jb4_circularbuffer.c
+++ b/lib_dec/jbm_jb4_circularbuffer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,7 +38,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "string.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 /* local includes */
 #include "jbm_jb4_circularbuffer.h"
diff --git a/lib_dec/jbm_jb4_circularbuffer.h b/lib_dec/jbm_jb4_circularbuffer.h
index ec6a5c7becc4f0e347f2a7ee2ee3fe08b9c9badb..9e3102feba4dee6b3812f2aca4cdd5c6b7461c20 100644
--- a/lib_dec/jbm_jb4_circularbuffer.h
+++ b/lib_dec/jbm_jb4_circularbuffer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,7 +37,7 @@
 #ifndef JBM_JB4_CIRCULARBUFFER_H
 #define JBM_JB4_CIRCULARBUFFER_H JBM_JB4_CIRCULARBUFFER_H
 
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 
 /** handle for circular buffer (FIFO) with fixed capacity */
diff --git a/lib_dec/jbm_jb4_inputbuffer.c b/lib_dec/jbm_jb4_inputbuffer.c
index 27a1d6ff1f49c1e4cddba644eafe622c1f791692..5497a437126a701eccbc82e1aad6bf352a654f06 100644
--- a/lib_dec/jbm_jb4_inputbuffer.c
+++ b/lib_dec/jbm_jb4_inputbuffer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,7 +39,7 @@
 #include <assert.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "string.h"
 #include "jbm_jb4_inputbuffer.h"
 #include "wmc_auto.h"
diff --git a/lib_dec/jbm_jb4_inputbuffer.h b/lib_dec/jbm_jb4_inputbuffer.h
index b9c9c5ef6e79e367822266096229c19d428468e0..769cccba68424358d328d32f01c540de96d5904d 100644
--- a/lib_dec/jbm_jb4_inputbuffer.h
+++ b/lib_dec/jbm_jb4_inputbuffer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/jbm_jb4_jmf.c b/lib_dec/jbm_jb4_jmf.c
index 8e5215dae2b3aad8fa6fff643f5bbe8c79742c0f..5ab8242c75bbbd078d3fbc6ddc30ee102bf1b224 100644
--- a/lib_dec/jbm_jb4_jmf.c
+++ b/lib_dec/jbm_jb4_jmf.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
 /* local includes */
diff --git a/lib_dec/jbm_jb4_jmf.h b/lib_dec/jbm_jb4_jmf.h
index b08f5502cfbacc72343c1ec4c3369becb5222e62..6b5a004348d06f61385b761e1fc1e454d84041c8 100644
--- a/lib_dec/jbm_jb4_jmf.h
+++ b/lib_dec/jbm_jb4_jmf.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c
index a19f8bfd7275aeef05bafa9b191a20b0868c4495..d1f782b55c18b79990c3ea00b920f1cda41a6f13 100644
--- a/lib_dec/jbm_jb4sb.c
+++ b/lib_dec/jbm_jb4sb.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -48,7 +48,6 @@
 #include "jbm_jb4_inputbuffer.h"
 #include "jbm_jb4_jmf.h"
 #include "jbm_jb4sb.h"
-#include "prot.h"
 #include "prot_fx.h"
 #define WMC_TOOL_SKIP
 
@@ -912,7 +911,7 @@ static void JB4_adaptActivePlayout(
             ELSE
             {
                 Word16 exp;
-                Word32 temp = BASOP_Util_Divide3232_Scale_cadence( W_extract_l( W_sub( dropRateMax, dropRateMin ) ), W_extract_l( dropGapMax ), &exp );
+                Word32 temp = BASOP_Util_Divide3232_Scale_newton( W_extract_l( W_sub( dropRateMax, dropRateMin ) ), W_extract_l( dropGapMax ), &exp );
                 /* limit gap to [gapMin,gapMax] and calculate current drop rate from gap */
                 Word64 temp2 = W_mult0_32_32( W_extract_l( JB4_MIN( gap, dropGapMax ) ), temp );
                 Word64 temp3 = W_shr( temp2, sub( 31, exp ) );
diff --git a/lib_dec/jbm_jb4sb.h b/lib_dec/jbm_jb4sb.h
index 55565be4aaf9cbcce1936d748a37aeae180f3706..5b5ff16c5f2a19c2e06b74cf8bd1e456feeb8545 100644
--- a/lib_dec/jbm_jb4sb.h
+++ b/lib_dec/jbm_jb4sb.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -67,7 +67,7 @@ struct JB4_DATAUNIT
     Word16 qBit;
 
     /** the binary encoded access unit */
-    uint8_t *data;
+    UWord8 *data;
     /** the size of the binary encoded access unit [bits] */
     UWord16 dataSize;
 
diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c
index 92aee035eb8f5e99de09856e6572b41d7ceabe8a..e2528e619eb9ab631ad0ced53399220cba4a2702 100644
--- a/lib_dec/jbm_pcmdsp_apa.c
+++ b/lib_dec/jbm_pcmdsp_apa.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -44,7 +44,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 /* local headers */
 #include "jbm_pcmdsp_apa.h"
@@ -54,7 +54,6 @@
 #include "rom_dec.h"
 
 
-#include "prot_fx.h"
 #define INV_100_Q15 328
 #define INV_400_Q15 82
 #define INV_80_Q15  410
@@ -271,9 +270,7 @@ UWord8 apa_reconfigure(
 
     free( ps->buf_out_fx );
     ps->buf_out_fx = (Word16 *) malloc( sizeof( Word16 ) * ps->buf_out_capacity );
-#ifdef MSAN_FIX
     memset( ps->buf_out_fx, 0, ( sizeof( Word16 ) * ps->buf_out_capacity ) );
-#endif
     ps->Q_buf_out = Q15;
     move16();
     IF( !ps->buf_out_fx )
@@ -901,7 +898,7 @@ UWord8 apa_exec_ivas_fx(
     UWord32 statsResetThreshold, statsResetShift;
     Word16 Q_a_out;
 
-    Q_a_out = add( getScaleFactor32_copy( a_in, L_mult0( ps->num_channels, APA_BUF_PER_CHANNEL ) ), Q11 - Q16 );
+    Q_a_out = add( getScaleFactor32_copy( a_in, L_mult0( ps->num_channels, APA_BUF_PER_CHANNEL ) ), Q11 - Q16 - Q1 );
     statsResetThreshold = 1637;
     move32();
     statsResetShift = 2;
diff --git a/lib_dec/jbm_pcmdsp_apa.h b/lib_dec/jbm_pcmdsp_apa.h
index 7acdf599cf5158690e64726af6ab091a7f4c891d..7955d0ea6e1b86aa6be7d6dcab90b331ef7c463f 100644
--- a/lib_dec/jbm_pcmdsp_apa.h
+++ b/lib_dec/jbm_pcmdsp_apa.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -92,7 +92,7 @@ typedef struct apa_state_t *PCMDSP_APA_HANDLE;
 /*! Allocates memory for state struct and initializes elements.
  *  @return 0 on success, 1 on failure */
 ivas_error apa_init( apa_state_t **s,
-                     const int32_t num_channels );
+                     const Word32 num_channels );
 
 /*! Sets state variables to initial value. */
 void apa_reset( apa_state_t *s );
@@ -106,7 +106,7 @@ void apa_reset( apa_state_t *s );
  *  @param[in] output_Fs sample rate [Hz]
  *  @param[in] num_channels number of channels
  *  @return 0 on success, 1 on failure */
-bool apa_set_rate( apa_state_t *ps, const int32_t output_Fs );
+bool apa_set_rate( apa_state_t *ps, const Word32 output_Fs );
 
 /*! Set scaling.
  *  The scale is given in % and will be valid until changed again.
@@ -120,7 +120,7 @@ bool apa_set_renderer_residual_samples( apa_state_t *ps, UWord16 l_r_buf );
 
 bool apa_set_evs_compat_mode( apa_state_t *ps, bool mode );
 
-uint8_t apa_reconfigure( apa_state_t *ps, uint16_t num_channels, uint16_t l_ts );
+UWord8 apa_reconfigure( apa_state_t *ps, UWord16 num_channels, UWord16 l_ts );
 
 bool apa_set_complexity_options( apa_state_t *s, UWord16 wss, UWord16 css );
 
@@ -129,5 +129,5 @@ bool apa_set_quality( apa_state_t *s, Word32 quality, UWord16 qualityred, UWord1
 bool apa_exit( apa_state_t **s );
 
 UWord8 apa_exec_ivas_fx( apa_state_t *s, const Word32 a_in[], UWord16 l_in, UWord16 maxScaling, Word32 a_out[], UWord16 *l_out );
-uint8_t apa_exec_fx( apa_state_t *s, const Word16 a_in[], UWord16 l_in, UWord16 maxScaling, Word16 a_out[], UWord16 *l_out );
+UWord8 apa_exec_fx( apa_state_t *s, const Word16 a_in[], UWord16 l_in, UWord16 maxScaling, Word16 a_out[], UWord16 *l_out );
 #endif /* JBM_PCMDSP_APA_H */
diff --git a/lib_dec/jbm_pcmdsp_fifo.c b/lib_dec/jbm_pcmdsp_fifo.c
deleted file mode 100644
index 35a08b2de5c6d62f795c7da74b428dd579740388..0000000000000000000000000000000000000000
--- a/lib_dec/jbm_pcmdsp_fifo.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-/*! @file jbm_pcmdsp_fifo.c Ringbuffer (FIFO) with fixed capacity for audio samples */
-
-#include <stdint.h>
-#include "options.h"
diff --git a/lib_dec/jbm_pcmdsp_fifo.h b/lib_dec/jbm_pcmdsp_fifo.h
index 12b7f5b141af74256dddcc640eec36f06e5f57ef..1375c5713eba5c5cb67d29f43bfb546d59bc3527 100644
--- a/lib_dec/jbm_pcmdsp_fifo.h
+++ b/lib_dec/jbm_pcmdsp_fifo.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/jbm_pcmdsp_similarityestimation.c b/lib_dec/jbm_pcmdsp_similarityestimation.c
index b6eeaf0e1856fe28e137b3ae6a02871179854dca..cc13c0148d23a45b7a154bb93fc2ce91fa1ccc10 100644
--- a/lib_dec/jbm_pcmdsp_similarityestimation.c
+++ b/lib_dec/jbm_pcmdsp_similarityestimation.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/jbm_pcmdsp_similarityestimation.h b/lib_dec/jbm_pcmdsp_similarityestimation.h
index 123d0c3c1590adfb82cc47189362d74d27ed54b2..086f881814e1583db970c97716bb09955f988e32 100644
--- a/lib_dec/jbm_pcmdsp_similarityestimation.h
+++ b/lib_dec/jbm_pcmdsp_similarityestimation.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/jbm_pcmdsp_window.c b/lib_dec/jbm_pcmdsp_window.c
index ea15ab7a1f62ff8357cc4eae0284c88a7cd45632..eba40ec988241af9b0b4385df9b56e935053ab17 100644
--- a/lib_dec/jbm_pcmdsp_window.c
+++ b/lib_dec/jbm_pcmdsp_window.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/jbm_pcmdsp_window.h b/lib_dec/jbm_pcmdsp_window.h
index 9102e027fdd819941da2769ee5b017737f957389..1d193433e7b90f55d7a22902932a7bdaf19f17c2 100644
--- a/lib_dec/jbm_pcmdsp_window.h
+++ b/lib_dec/jbm_pcmdsp_window.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -52,7 +52,7 @@
  *                         <------>
  *                            n
  */
-void hannWindow( uint16_t n, float *w );
+void hannWindow( UWord16 n, float *w );
 
 /** Overlap/Add of two signal with a given window. */
 /** @param[in] fadeOut signal to fade out
diff --git a/lib_dec/lead_deindexing.c b/lib_dec/lead_deindexing.c
deleted file mode 100644
index dbe4a43e8d21c2682e0669da08da8c5369da002b..0000000000000000000000000000000000000000
--- a/lib_dec/lead_deindexing.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_dec.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * Local function prototypes
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/lead_deindexing_fx.c b/lib_dec/lead_deindexing_fx.c
index 786e0c276956fcb209bed3bc2c814b69c2b6f828..ecc5f6fe01a50d55b5156784ae951993658b3092 100644
--- a/lib_dec/lead_deindexing_fx.c
+++ b/lib_dec/lead_deindexing_fx.c
@@ -192,7 +192,6 @@ void re8_decode_base_index_fx(
         m1 = sub( k1, 1 );
         m2 = 8;
         move16();
-#ifdef CR_2109_to_2112_cd0_ce0
         l = 1;
         move16();
         FOR( i = 0; i < 8; i++ )
@@ -206,9 +205,6 @@ void re8_decode_base_index_fx(
         test();
         /* if the signs are constrained and all components are non-zero  */
         IF( EQ_16( k1, 7 ) && ( l > 0 ) )
-#else
-        IF( k1 == 7 )
-#endif
         {
             m2 = 7;
             move16();
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
deleted file mode 100644
index 8e228facb113dd5ca182532f116487e21d51ef8c..0000000000000000000000000000000000000000
--- a/lib_dec/lib_dec.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-#include <math.h>
-#include <assert.h>
-#include <string.h>
-#include "lib_dec.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h
index 28fbe71b965eed19a235fc4fafbec512d504dacb..0c4d54db8bcde6d8889b50d9a1b2966209740fb4 100644
--- a/lib_dec/lib_dec.h
+++ b/lib_dec/lib_dec.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c
index b63668b3874d3c812333b36f1af70fcba5691a06..42113763118800738c172c5045d6d58cd27c872a 100644
--- a/lib_dec/lib_dec_fx.c
+++ b/lib_dec/lib_dec_fx.c
@@ -1,6 +1,6 @@
-/******************************************************************************************************
+/******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,15 @@
 #include <assert.h>
 #include <string.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
-#include "prot.h"
-#include "ivas_prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "prot_fx.h"
+#include "ivas_prot_fx.h"
 
 #include "jbm_jb4sb.h"
 #include "jbm_pcmdsp_apa.h"
 #include "jbm_pcmdsp_fifo.h"
+#include <math.h>
+#include <assert.h>
 #include "wmc_auto.h"
 
 #define INV_1000_Q31 2147484 /*1/1000 IN Q31*/
@@ -920,7 +920,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
         }
     }
 
-    IF( NE_32( ( error = read_indices( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ) ), IVAS_ERR_OK ) )
+    IF( NE_32( ( error = read_indices_fx( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -3059,85 +3059,6 @@ const char *IVAS_DEC_GetErrorMessage(
 }
 
 
-/*---------------------------------------------------------------------*
- * get_channel_config()
- *
- * Gets a str related to input config
- *---------------------------------------------------------------------*/
-
-static ivas_error get_channel_config(
-    AUDIO_CONFIG config,
-    Word8 *str )
-{
-    IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_MONO ) )
-    {
-        strcpy( (char *) str, "Mono" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_STEREO ) )
-    {
-        strcpy( (char *) str, "Stereo" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_5_1 ) )
-    {
-        strcpy( (char *) str, "Multichannel 5.1 (CICP6)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_7_1 ) )
-    {
-        strcpy( (char *) str, "Multichannel 7.1 (CICP12)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_5_1_2 ) )
-    {
-        strcpy( (char *) str, "Multichannel 5.1+2 (CICP14)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_5_1_4 ) )
-    {
-        strcpy( (char *) str, "Multichannel 5.1+4 (CICP16)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_7_1_4 ) )
-    {
-        strcpy( (char *) str, "Multichannel 7.1+4 (CICP19)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )
-    {
-        strcpy( (char *) str, "Multichannel (custom loudspeaker layout)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_FOA ) )
-    {
-        strcpy( (char *) str, "Ambisonics: First Order (FOA)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_HOA2 ) )
-    {
-        strcpy( (char *) str, "Ambisonics: Second Order (HOA2)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_HOA3 ) )
-    {
-        strcpy( (char *) str, "Ambisonics: Third Order (HOA3)" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL ) )
-    {
-        strcpy( (char *) str, "Binaural: no room" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
-    {
-        strcpy( (char *) str, "Binaural: room with impulse responses" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
-    {
-        strcpy( (char *) str, "Binaural: room with reverb" );
-    }
-    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
-    {
-        strcpy( (char *) str, "External renderer" );
-    }
-    ELSE
-    {
-        return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Error: Incorrect Input/Output Configuration" );
-    }
-
-    return IVAS_ERR_OK;
-}
-
-
 /*---------------------------------------------------------------------*
  * printConfigInfo_dec( )
  *
@@ -3393,7 +3314,7 @@ static ivas_error evs_dec_main_fx(
     move32();
     hCoreCoder[0]->output_frame_fx = extract_l( Mult_32_16( hCoreCoder[0]->output_Fs, 0x0290 /*Q0*/ ) ); // Q0
     move16();
-    mdct_switching_dec( hCoreCoder[0] );
+    mdct_switching_dec_fx( hCoreCoder[0] );
 
     FOR( ch = 0; ch < MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN; ch++ )
     {
diff --git a/lib_dec/lp_exc_d.c b/lib_dec/lp_exc_d.c
deleted file mode 100644
index e7a8ca967132cf8896fc4a231dbaf74eed596840..0000000000000000000000000000000000000000
--- a/lib_dec/lp_exc_d.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/lsf_dec.c b/lib_dec/lsf_dec.c
deleted file mode 100644
index f963d7317917e3d87f50bd29ba50206654daa998..0000000000000000000000000000000000000000
--- a/lib_dec/lsf_dec.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "basop_proto_func.h"
-#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
-
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------------*
- * lsf_dec()
- *
- * LSF decoder
- *---------------------------------------------------------------------*/
diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c
index 50b5ec34131966f34314a4cf6e45dd344127e03a..913543db8c6b90d0f51beb13a097845f34b0b746 100644
--- a/lib_dec/lsf_dec_fx.c
+++ b/lib_dec/lsf_dec_fx.c
@@ -7,11 +7,12 @@
 #include "cnst.h"    /* Common constants                       */
 #include "rom_com.h" /* Static table prototypes                */
 #include "prot_fx.h" /* Function prototypes                    */
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
+
 static void dqlsf_CNG_fx( Decoder_State *st_fx, Word16 *lsf_q );
 
 /*--------------------------------------------------------------------------------------*
@@ -89,7 +90,6 @@ static void dqlsf_CNG_fx(
 /* _ (Word16*) lsp_new      : LP filter coefficient    Q15                   */
 /* _ (Word16*) lsp_mid      : LP filter coefficient    Q15                   */
 /*---------------------------------------------------------------------------*/
-
 /* _ (Word16[]) st_fx->lsf_adaptive_mean_fx  : FEC - adaptive mean LSF       */
 /*                        vector for FEC  Q(x2.56)                           */
 /* _ (Word16[]) st_fx->mem_AR_fx : AR memory of LSF quantizer                */
@@ -101,16 +101,15 @@ static void dqlsf_CNG_fx(
 /*===========================================================================*/
 
 void lsf_dec_fx(
-    Decoder_State *st_fx,          /* i/o: State structure                               */
-    const Word16 tc_subfr,         /* i  : TC subframe index                           Q0*/
-    Word16 *Aq,                    /* o  : quantized A(z) for 4 subframes             Q12*/
-    Word16 *LSF_Q_prediction,      /* o  : LSF prediction mode                         Q0*/
-    Word16 *lsf_new,               /* o  : de-quantized LSF vector               Q(x2.56)*/
-    Word16 *lsp_new,               /* o  : de-quantized LSP vector                    Q15*/
-    Word16 *lsp_mid,               /* o  : de-quantized mid-frame LSP vector          Q15*/
-    const Word16 tdm_low_rate_mode /* i  : secondary channel low rate mode flag		   Q0*/
-    ,
-    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel				Qx*/
+    Decoder_State *st_fx,           /* i/o: State structure                               */
+    const Word16 tc_subfr,          /* i  : TC subframe index                           Q0*/
+    Word16 *Aq,                     /* o  : quantized A(z) for 4 subframes             Q12*/
+    Word16 *LSF_Q_prediction,       /* o  : LSF prediction mode                         Q0*/
+    Word16 *lsf_new,                /* o  : de-quantized LSF vector               Q(x2.56)*/
+    Word16 *lsp_new,                /* o  : de-quantized LSP vector                    Q15*/
+    Word16 *lsp_mid,                /* o  : de-quantized mid-frame LSP vector          Q15*/
+    const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag	   Q0*/
+    const Word16 tdm_lsfQ_PCh[M]    /* i  : Q LSFs for primary channel				       Qx*/
 )
 {
     Word16 i;
@@ -195,261 +194,6 @@ void lsf_dec_fx(
             /* rightshift before *seed_acelp+param_lpc[i] to avoid overflows*/
             st_fx->seed_acelp = extract_l( L_add( imult3216( 31821L /* Q0 */, add( shr( ( st_fx->seed_acelp ), 1 ), param_lpc[i] ) ), 13849L /* Q0 */ ) ); /* Q0 */
             move16();
-            // PMTE()   /*IVAS_CODE to be completed */
-        }
-    }
-    IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
-    {
-        /* return if SID frame (conversion to A(z) done in the calling function) */
-        return;
-    }
-
-    /*-------------------------------------------------------------------------------------*
-     * FEC - update adaptive LSF mean vector
-     *-------------------------------------------------------------------------------------*/
-
-    FOR( i = 0; i < M; i++ )
-    {
-        L_tmp = L_mult( lsf_new[i], 10922 );                    /*Q(x2.56+16)*/
-        L_tmp = L_mac( L_tmp, st_fx->lsfoldbfi1_fx[i], 10922 ); /*Q(x2.56+16)*/
-        L_tmp = L_mac( L_tmp, st_fx->lsfoldbfi0_fx[i], 10922 ); /*Q(x2.56+16)*/
-        st_fx->lsf_adaptive_mean_fx[i] = round_fx( L_tmp );     /*Q(x2.56)*/
-        move16();
-    }
-
-    test();
-    test();
-    IF( ( st_fx->prev_bfi && ( EQ_16( coder_type, TRANSITION ) ) && ( EQ_16( tc_subfr, sub( st_fx->L_frame, L_SUBFR ) ) ) ) )
-    {
-        lsf_diff = 1205;
-        move16(); /*int_fs / (float)(2*(M+1)); = 470.588 -> 1205 in Q2.56 */
-        if ( EQ_16( st_fx->L_frame, L_FRAME ) )
-        {
-            lsf_diff = 964;
-            move16(); /*int_fs / (float)(2*(M+1)); = 376.47 -> 964 in Q2.56 */
-        }
-        st_fx->lsf_old_fx[0] = lsf_diff;
-        move16();
-
-        FOR( i = 1; i < M; i++ )
-        {
-            st_fx->lsf_old_fx[i] = add( st_fx->lsf_old_fx[i - 1], lsf_diff ); /* Q2.56 */
-            move16();
-        }
-        lsf2lsp_fx( st_fx->lsf_old_fx, st_fx->lsp_old_fx, M, st_fx->sr_core );
-    }
-    /*-------------------------------------------------------------------------------------*
-     * Mid-frame LSF decoding
-     * LSP interpolation and conversion of LSPs to A(z)
-     *-------------------------------------------------------------------------------------*/
-    IF( st_fx->rate_switching_reset )
-    {
-        /*extrapolation in case of unstable LSF convert*/
-        Copy( lsp_new, st_fx->lsp_old_fx, M ); /* Q15 */
-        Copy( lsf_new, st_fx->lsf_old_fx, M ); /* Q2.56 */
-    }
-    {
-        /* Mid-frame LSF decoding */
-        lsf_mid_dec_fx( st_fx, lsp_new, coder_type, lsp_mid );
-    }
-    test();
-    test();
-    IF( !( st_fx->prev_bfi && ( EQ_16( coder_type, TRANSITION ) ) && ( EQ_16( tc_subfr, sub( st_fx->L_frame, L_SUBFR ) ) ) ) )
-    {
-        IF( st_fx->prev_bfi )
-        {
-            /* check, if LSP interpolation can be relaxed */
-            E_LPC_f_lsp_a_conversion( st_fx->lsp_old_fx, tmp_old, M );
-            enr_old = Enr_1_Az_fx( tmp_old, 2 * L_SUBFR ); /* Q3 */
-
-            E_LPC_f_lsp_a_conversion( lsp_new, tmp_new, M );
-            enr_new = Enr_1_Az_fx( tmp_new, 2 * L_SUBFR ); /* Q3 */
-
-            IF( LT_16( enr_new, mult_r( 9830 /*0.3 Q15*/, enr_old ) ) )
-            {
-                /* OLD CODE : if( st->safety_net == 1), replaced with a decision similar to MODE2 */
-                st_fx->relax_prev_lsf_interp = -1;
-                move16();
-                test();
-                test();
-                test();
-                test();
-                if ( st_fx->clas_dec == UNVOICED_CLAS || EQ_16( st_fx->clas_dec, SIN_ONSET ) || st_fx->clas_dec == INACTIVE_CLAS || EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) )
-                {
-                    st_fx->relax_prev_lsf_interp = 1;
-                    move16();
-                }
-            }
-        }
-    }
-    test();
-    IF( EQ_16( st_fx->last_core, HQ_CORE ) && st_fx->core == ACELP_CORE )
-    {
-        /* update old LSPs/LSFs in case of HQ->ACELP core switching */
-        Copy( lsp_mid, st_fx->lsp_old_fx, M );                       /* Q15 */
-        lsp2lsf_fx( lsp_mid, st_fx->lsf_old_fx, M, st_fx->sr_core ); /* Q15 */
-    }
-    test();
-    IF( EQ_16( tdm_low_rate_mode, 1 ) && GT_16( coder_type, UNVOICED ) )
-    {
-        // PMT("To be verified")
-        IF( EQ_16( st_fx->active_cnt, 1 ) )
-        {
-            Copy( lsp_mid, st_fx->lsp_old_fx, M );                       /* Q15 */
-            lsp2lsf_fx( lsp_mid, st_fx->lsf_old_fx, M, st_fx->sr_core ); /* Q15 */
-            Copy( lsp_new, lsp_mid, M );                                 /* Q15 */
-        }
-
-        /* LSP interpolation and conversion of LSPs to A(z) - two-subframe mode */
-        int_lsp4_fx( st_fx->L_frame, st_fx->lsp_old_fx, lsp_mid, lsp_new, Aq, M, -2 );
-    }
-    ELSE
-    {
-        /* LSP interpolation and conversion of LSPs to A(z) */
-        int_lsp4_fx( st_fx->L_frame, st_fx->lsp_old_fx, lsp_mid, lsp_new, Aq, M, st_fx->relax_prev_lsf_interp );
-    }
-    /*------------------------------------------------------------------*
-     * Check LSF stability (distance between old LSFs and current LSFs)
-     *------------------------------------------------------------------*/
-
-    IF( st_fx->element_mode == EVS_MONO )
-    {
-        st_fx->stab_fac_fx = lsf_stab_fx( lsf_new, st_fx->lsf_old_fx, 0, st_fx->L_frame ); /*Q15*/
-        move16();
-    }
-    ELSE
-    {
-        st_fx->stab_fac_fx = lsf_stab_ivas_fx( lsf_new, st_fx->lsf_old_fx, 0, st_fx->L_frame ); /* Q15 */
-        move16();
-    }
-
-    return;
-}
-
-/*===========================================================================*/
-/* FUNCTION : lsf_dec_ivas_fx()                                              */
-/*---------------------------------------------------------------------------*/
-/* PURPOSE : LSF decoder                                                     */
-/*---------------------------------------------------------------------------*/
-/* INPUT ARGUMENTS :                                                         */
-/* _ (Struct) st_fx       : decoder static memory                            */
-/* _ (Word16) L_frame     : length of the frame                              */
-/* _ (Word16) coder_type  : coding type                                      */
-/* _ (Word16) bwidth      : input signal bandwidth                           */
-/*---------------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :                                                        */
-/* _ (Word16*) Aq          : LP filter coefficient    Q12                    */
-/* _ (Word16*) lsf_new      : LP filter coefficient    Q(x2.56)              */
-/* _ (Word16*) lsp_new      : LP filter coefficient    Q15                   */
-/* _ (Word16*) lsp_mid      : LP filter coefficient    Q15                   */
-/*---------------------------------------------------------------------------*/
-
-/* _ (Word16[]) st_fx->lsf_adaptive_mean_fx  : FEC - adaptive mean LSF       */
-/*                        vector for FEC  Q(x2.56)                           */
-/* _ (Word16[]) st_fx->mem_AR_fx : AR memory of LSF quantizer                */
-/*                  (past quantized LSFs without mean) Q(x2.56)              */
-/* _ (Word16) st_fx->stab_fac_fx : LSF stability factor    Q15               */
-/*---------------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :                                                        */
-/* _ None                                                                    */
-/*===========================================================================*/
-
-void lsf_dec_ivas_fx(
-    Decoder_State *st_fx,          /* i/o: State structure                               */
-    const Word16 tc_subfr,         /* i  : TC subframe index                           Q0*/
-    Word16 *Aq,                    /* o  : quantized A(z) for 4 subframes             Q12*/
-    Word16 *LSF_Q_prediction,      /* o  : LSF prediction mode                         Q0*/
-    Word16 *lsf_new,               /* o  : de-quantized LSF vector               Q(x2.56)*/
-    Word16 *lsp_new,               /* o  : de-quantized LSP vector                    Q15*/
-    Word16 *lsp_mid,               /* o  : de-quantized mid-frame LSP vector          Q15*/
-    const Word16 tdm_low_rate_mode /* i  : secondary channel low rate mode flag		   Q0*/
-    ,
-    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel				Qx*/
-)
-{
-    Word16 i;
-    Word16 no_param_lpc;
-    Word16 param_lpc[NPRM_LPC_NEW];
-    Word32 L_tmp;
-    Word16 nBits = 0;
-    move16();
-    Word16 tmp_old[M + 1], tmp_new[M + 1];
-    Word16 enr_old = 0, enr_new = 0;
-    move16();
-    move16();
-    Word16 lsf_diff, coder_type;
-
-    /* initialize */
-    coder_type = st_fx->coder_type;
-    if ( EQ_32( st_fx->core_brate, SID_2k40 ) )
-    {
-        coder_type = INACTIVE; /* Q0 */
-        move16();
-    }
-    test();
-    if ( EQ_16( coder_type, AUDIO ) && st_fx->GSC_IVAS_mode > 0 )
-    {
-        coder_type = GENERIC; /* Q0 */
-        move16();
-    }
-    no_param_lpc = 0;
-    nBits = 0;
-    move16();
-    move16();
-
-    /* Find the number of bits for LSF quantization */
-    IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
-    {
-        nBits = LSF_BITS_CNG; /* Q0 */
-        move16();
-    }
-    ELSE
-    {
-        test();
-        IF( st_fx->nelp_mode_dec == 0 && st_fx->ppp_mode_dec == 0 )
-        {
-            nBits = st_fx->acelp_cfg.lsf_bits; /* Q0 */
-            move16();
-        }
-        ELSE IF( EQ_16( st_fx->nelp_mode_dec, 1 ) )
-        {
-            IF( EQ_16( coder_type, UNVOICED ) )
-            {
-                nBits = 30; /* Q0 */
-                move16();
-                if ( st_fx->bwidth == NB )
-                {
-                    nBits = 32; /* Q0 */
-                    move16();
-                }
-            }
-        }
-        ELSE IF( EQ_16( st_fx->ppp_mode_dec, 1 ) )
-        {
-            nBits = 26; /* Q0 */
-            move16();
-        }
-    }
-
-    /* LSF de-quantization */
-    lsf_end_dec_fx( st_fx, 0, coder_type, st_fx->bwidth, nBits, lsf_new, param_lpc, LSF_Q_prediction, &no_param_lpc,
-                    tdm_lsfQ_PCh );
-
-    /* convert quantized LSFs to LSPs */
-
-    lsf2lsp_fx( lsf_new, lsp_new, M, st_fx->sr_core );
-    /* set seed_acelp used in UC mode */
-    test();
-    IF( EQ_16( coder_type, UNVOICED ) && GT_16( st_fx->element_mode, EVS_MONO ) )
-    {
-        st_fx->seed_acelp = 0;
-        move16();
-        FOR( i = no_param_lpc - 1; i >= 0; i-- )
-        {
-            /* rightshift before *seed_acelp+param_lpc[i] to avoid overflows*/
-            st_fx->seed_acelp = extract_l( L_add( imult3216( 31821L /* Q0 */, add( shr( ( st_fx->seed_acelp ), 1 ), param_lpc[i] ) ), 13849L /* Q0 */ ) ); /* Q0 */
-            move16();
-            // PMTE()   /*IVAS_CODE to be completed */
         }
     }
     IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
@@ -664,12 +408,7 @@ void lsf_end_dec_fx(
 
     test();
     test();
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    test();
-    IF( ( EQ_16( coder_type_org, GENERIC ) ) && ( EQ_32( st->sr_core, INT_FS_16k ) ) && ( mode2_flag == 0 ) && ( st->idchan == 0 ) )
-#else
     IF( ( EQ_16( coder_type_org, GENERIC ) ) && ( EQ_32( st->sr_core, INT_FS_16k ) ) && ( mode2_flag == 0 ) )
-#endif
     {
         /* this bit is used only for primary channel or mono */
         coder_type = (Word16) get_next_indice_fx( st, 1 ); /* Q0 */
diff --git a/lib_dec/lsf_msvq_ma_dec.c b/lib_dec/lsf_msvq_ma_dec.c
deleted file mode 100644
index 313c2798e72af1d464783e1a91d5332b57966f1d..0000000000000000000000000000000000000000
--- a/lib_dec/lsf_msvq_ma_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/lsf_msvq_ma_dec_fx.c b/lib_dec/lsf_msvq_ma_dec_fx.c
index 61e338c9c52451d70dec2d2a8f5656b29c664682..1b5d79c6824596fad3684066b2e2f67ebca9a257 100644
--- a/lib_dec/lsf_msvq_ma_dec_fx.c
+++ b/lib_dec/lsf_msvq_ma_dec_fx.c
@@ -185,9 +185,6 @@ Word16 D_lsf_tcxlpc(
         M,
         M,
         indices + NumIndices,
-#ifdef IVAS_MSVQ
-        0, NULL,
-#endif
         lsf_q );
 
     NumIndices = add( NumIndices, TCXLPC_NUMSTAGES ); /* Q0 */
@@ -208,9 +205,6 @@ Word16 D_lsf_tcxlpc(
             M,
             M,
             indices + NumIndices,
-#ifdef IVAS_MSVQ
-            0, NULL,
-#endif
             lsf_rem_q_ind );
         NumIndices = add( NumIndices, TCXLPC_IND_NUMSTAGES ); /* Q0 */
 
@@ -287,9 +281,6 @@ Word16 dec_lsf_tcxlpc(
         M,
         M,
         flag + 1,
-#ifdef IVAS_MSVQ
-        0, NULL,
-#endif
         lsf_q_ind );
 
     /* Update flag */
diff --git a/lib_dec/nelp_dec.c b/lib_dec/nelp_dec.c
deleted file mode 100644
index 895fdaae2f764e88b23432ee1d3538c8b13f4715..0000000000000000000000000000000000000000
--- a/lib_dec/nelp_dec.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * nelp_decoder()
- *
- * NELP decoder
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/nelp_dec_fx.c b/lib_dec/nelp_dec_fx.c
index 9eb7ab2031758be2a889c082213e64889fde0498..c088dd82663b8faa30514363b931ccd27ba39001 100644
--- a/lib_dec/nelp_dec_fx.c
+++ b/lib_dec/nelp_dec_fx.c
@@ -336,11 +336,7 @@ void nelp_decoder_fx(
     E3 = L_deposit_l( 1 );
     FOR( i = 0; i < L_FRAME; i++ )
     {
-#ifdef BASOP_NOGLOB
         E3 = L_mac0_sat( E3, ptr[i], ptr[i] ); /*2*Q_exc */
-#else
-        E3 = L_mac0( E3, ptr[i], ptr[i] );     /*2*Q_exc */
-#endif
     }
 
 
@@ -391,11 +387,7 @@ void nelp_decoder_fx(
         E2 = L_deposit_l( 1 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             E2 = L_mac0_sat( E2, ptr[i], ptr[i] ); /*2*Q_exc */
-#else
-            E2 = L_mac0( E2, ptr[i], ptr[i] ); /*2*Q_exc */
-#endif
         }
 
         exp_E3 = norm_l( E3 );
@@ -403,11 +395,7 @@ void nelp_decoder_fx(
         exp_E3 = sub( 30, add( exp_E3, 2 * ( *Q_exc ) ) );
 
         exp_E2 = norm_l( E2 );
-#ifdef BASOP_NOGLOB
         frac_E2 = round_fx_sat( L_shl_sat( E2, exp_E2 ) );
-#else
-        frac_E2 = round_fx( L_shl( E2, exp_E2 ) );
-#endif
         exp_E2 = sub( 30, add( exp_E2, shl( ( *Q_exc ), 1 ) ) );
 
         scale = shr( sub( frac_E3, frac_E2 ), 15 );
diff --git a/lib_dec/peak_vq_dec.c b/lib_dec/peak_vq_dec.c
deleted file mode 100644
index 7b039f26f64469656acd050fba743ef13c496c80..0000000000000000000000000000000000000000
--- a/lib_dec/peak_vq_dec.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-
-/*------------------------------------------------------------------------*
- * Local function prototypes
- *------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * hvq_dec()
- *
- * HVQ decoder
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * peak_vq_dec()
- *
- * Vector de-quantization of MDCT peaks
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * dequant_peaks()
- *
- * Reads codebook vector and scales peak
- *--------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------------
- * hvq_dec_pos()
- *
- * HVQ decode peak positions
- *--------------------------------------------------------------------------*/
diff --git a/lib_dec/pit_dec.c b/lib_dec/pit_dec.c
deleted file mode 100644
index 7d906b12ed9cb0216cb37fa9612a63684e9fe937..0000000000000000000000000000000000000000
--- a/lib_dec/pit_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/pit_dec_fx.c b/lib_dec/pit_dec_fx.c
index b72c2bae16296e0d49371ce46b16907438c3ba4f..38ec41cb209c196f3333a972a2195ff8f4c0aa46 100644
--- a/lib_dec/pit_dec_fx.c
+++ b/lib_dec/pit_dec_fx.c
@@ -319,302 +319,22 @@ void Mode2_delta_pit_dec(
 /* _ (Word16 ) pitch : close loop integer pitch  Q6                      */
 /*=======================================================================*/
 
-
-Word16 pit_decode_fx(                          /* o  : floating pitch value                    */
-                      Decoder_State *st_fx,    /* i/o: decoder state structure                 */
-                      const Word32 core_brate, /* i  : core bitrate                            */
-                      const Word16 Opt_AMR_WB, /* i  : flag indicating AMR-WB IO mode          */
-                      const Word16 L_frame,    /* i  : length of the frame                     */
-                      Word16 i_subfr,          /* i  : subframe index                          */
-                      const Word16 coder_type, /* i  : coding type                             */
-                      Word16 *limit_flag,      /* i/o: restrained(0) or extended(1) Q limits   */
-                      Word16 *T0,              /* o  : close loop integer pitch                */
-                      Word16 *T0_frac,         /* o  : close loop fractional part of the pitch */
-                      Word16 *T0_min,          /* i/o: delta search min for sf 2 & 4           */
-                      Word16 *T0_max,          /* i/o: delta search max for sf 2 & 4           */
-                      const Word16 L_subfr     /* i  : subframe length                         */
-#ifdef ADD_LRTD
-                      ,
-                      const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag                */
-                      const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer                    */
-#endif
-)
-{
-    Word16 pitch; /*Q2*/
-    Word16 pitch_index, nBits, pit_flag;
-
-    pitch_index = 0;
-    move16();
-
-    /*----------------------------------------------------------------*
-     * Set pit_flag = 0 for every subframe with absolute pitch search
-     *----------------------------------------------------------------*/
-    pit_flag = i_subfr;
-    move16();
-
-    if ( EQ_16( i_subfr, PIT_DECODE_2XL_SUBFR ) )
-    {
-        pit_flag = 0;
-        move16();
-    }
-
-    /*-------------------------------------------------------*
-     * Retrieve the pitch index
-     *-------------------------------------------------------*/
-    IF( !Opt_AMR_WB )
-    {
-        /*----------------------------------------------------------------*
-         * pitch Q: Set limit_flag to 0 for restrained limits, and 1 for extended limits
-         *----------------------------------------------------------------*/
-        test();
-        test();
-        IF( i_subfr == 0 )
-        {
-            *limit_flag = 1;
-            move16();
-
-            if ( EQ_16( coder_type, VOICED ) )
-            {
-                *limit_flag = 2;
-                move16(); /* double-extended limits */
-            }
-            test();
-            if ( EQ_16( coder_type, GENERIC ) && EQ_32( core_brate, ACELP_7k20 ) )
-            {
-                *limit_flag = 0;
-                move16();
-            }
-        }
-        ELSE IF( EQ_16( i_subfr, 2 * L_SUBFR ) && EQ_32( coder_type, GENERIC ) && LE_32( core_brate, ACELP_13k20 ) )
-        {
-            if ( GT_16( *T0, shr( add( PIT_FR1_EXTEND_8b, PIT_MIN ), 1 ) ) )
-            {
-                *limit_flag = 0;
-                move16();
-            }
-        }
-
-        /*-------------------------------------------------------*
-         *  Retrieve the number of Q bits
-         *-------------------------------------------------------*/
-
-        nBits = 0;
-        move16();
-        IF( NE_16( coder_type, AUDIO ) )
-        {
-            /* find the number of bits */
-            nBits = st_fx->acelp_cfg.pitch_bits[shr( i_subfr, 6 )];
-            move16();
-            pitch_index = (Word16) get_next_indice_fx( st_fx, nBits );
-        }
-
-        /*-------------------------------------------------------*
-         * Pitch decoding in AUDIO mode
-         * (both ACELP@12k8 and ACELP@16k cores)
-         *-------------------------------------------------------*/
-        IF( EQ_16( coder_type, AUDIO ) )
-        {
-            test();
-            if ( EQ_16( L_subfr, L_FRAME / 2 ) && i_subfr != 0 )
-            {
-                pit_flag = L_SUBFR;
-                move16();
-            }
-            if ( pit_flag == 0 )
-            {
-                nBits = 10;
-                move16();
-            }
-            if ( pit_flag != 0 )
-            {
-                nBits = 6;
-                move16();
-            }
-
-            pitch_index = (Word16) get_next_indice_fx( st_fx, nBits );
-
-            test();
-            test();
-            IF( EQ_16( L_subfr, L_FRAME / 2 ) && i_subfr != 0 && GE_16( pitch_index, 32 ) ) /* safety check in case of bit errors */
-            {
-                pitch_index = shr( pitch_index, 1 );
-                st_fx->BER_detect = 1;
-                move16();
-            }
-
-            pit_Q_dec_fx( 0, pitch_index, nBits, 4, pit_flag, *limit_flag, T0, T0_frac, T0_min, T0_max, &st_fx->BER_detect );
-        }
-        ELSE IF( EQ_16( coder_type, VOICED ) )
-        {
-            /*-------------------------------------------------------*
-             * Pitch decoding in VOICED mode
-             * (ACELP@12k8 core only)
-             *-------------------------------------------------------*/
-            if ( EQ_16( i_subfr, 2 * L_SUBFR ) )
-            {
-                pit_flag = i_subfr;
-                move16();
-            }
-
-            pit_Q_dec_fx( 0, pitch_index, nBits, 4, pit_flag, *limit_flag, T0, T0_frac, T0_min, T0_max, &st_fx->BER_detect );
-        }
-#ifdef ADD_LRTD
-        ELSE IF( EQ_16( st_fx->idchan, 1 ) && ( EQ_16( tdm_Pitch_reuse_flag, 1 ) || EQ_16( nBits, 4 ) ) )
-        {
-            test();
-            test();
-            /*-------------------------------------------------------*
-             *  Pitch decoding with reusing of primary channel information
-             *-------------------------------------------------------*/
-            Word16 loc_T0, loc_frac, delta, pit_tmp1, pit_tmp2, isubfridx;
-
-            delta = 4;
-            pit_flag = L_SUBFR;
-            move16();
-            move16();
-            isubfridx = shr( i_subfr, 6 );
-            IF( EQ_16( L_subfr, 2 * L_SUBFR ) )
-            {
-                move16();
-                move16();
-                pit_tmp1 = tdm_Pri_pitch_buf[isubfridx]; /*tdm_Pri_pitch_buf in Q6 ->pit_tmp1 and 2 in Q6 too */
-                pit_tmp2 = tdm_Pri_pitch_buf[shr( add( i_subfr, 1 ), 6 )];
-                /*loc_T0 = (int16_t)(0.5f * tdm_Pri_pitch_buf[i_subfr / L_SUBFR] + 0.5f * tdm_Pri_pitch_buf[(i_subfr + L_SUBFR) / L_SUBFR]);*/
-                loc_T0 = mac_r( L_mult( 16384, pit_tmp1, 16384, pit_tmp2 ) );
-                /*loc_frac = (int16_t)(((0.5f * tdm_Pri_pitch_buf[i_subfr / L_SUBFR] + 0.5f * tdm_Pri_pitch_buf[(i_subfr + L_SUBFR) / L_SUBFR]) - loc_T0) * 4.0f);*/
-            }
-            ELSE
-            {
-                /*loc_T0 = (int16_t)tdm_Pri_pitch_buf[i_subfr / L_SUBFR];*/
-                loc_T0 = tdm_Pri_pitch_buf[isubfridx]; /*Q6*/
-                /*loc_frac = (int16_t)((tdm_Pri_pitch_buf[i_subfr / L_SUBFR] - loc_T0) * 4.0f);*/
-            }
-            loc_frac = shr(sub(loc_T0, shl(shr(loc_T0, 6), 6)), 4)); /* Final result in Q 2*/
-            loc_T0 = shr( loc_T0, 6 );                               /*Q6 -> Q0*/
-
-
-            limit_T0_fx( L_FRAME, delta, pit_flag, *limit_flag, loc_T0, loc_frac, T0_min, T0_max );
-
-            IF( nBits > 0 )
-            {
-                pit_Q_dec_fx( 0, pitch_index, nBits, delta, pit_flag, *limit_flag, T0, T0_frac, T0_min, T0_max, &st_fx->BER_detect );
-            }
-            ELSE
-            {
-                *T0 = loc_T0;
-                *T0_frac = loc_frac;
-                move16();
-                move16();
-            }
-            printf( "function not tested yet\n" );
-        }
-#endif
-        ELSE
-        {
-            /*-------------------------------------------------------*
-             *  Pitch decoding in GENERIC mode
-             * (both ACELP@12k8 and ACELP@16k cores)
-             *-------------------------------------------------------*/
-            IF( EQ_16( L_frame, L_FRAME ) )
-            {
-                pit_Q_dec_fx( 0, pitch_index, nBits, 8, pit_flag, *limit_flag, T0, T0_frac, T0_min, T0_max, &st_fx->BER_detect );
-            }
-            ELSE
-            {
-                pit16k_Q_dec_fx( pitch_index, nBits, *limit_flag, T0, T0_frac, T0_min, T0_max, &st_fx->BER_detect );
-            }
-        }
-    }
-
-    /*-------------------------------------------------------*
-     *  Pitch decoding in AMR-WB IO mode
-     *-------------------------------------------------------*/
-
-    ELSE
-    {
-        *limit_flag = 0;
-        move16();
-        test();
-        test();
-        IF( i_subfr == 0 || ( EQ_16( i_subfr, 2 * L_SUBFR ) && EQ_32( core_brate, ACELP_8k85 ) ) )
-        {
-            nBits = 8;
-            move16();
-        }
-        ELSE
-        {
-            nBits = 5;
-            move16();
-        }
-        IF( GT_32( core_brate, ACELP_8k85 ) )
-        {
-            nBits = 6;
-            move16();
-            test();
-            if ( i_subfr == 0 || EQ_16( i_subfr, 2 * L_SUBFR ) )
-            {
-                nBits = 9;
-                move16();
-            }
-        }
-
-        pitch_index = (Word16) get_next_indice_fx( st_fx, nBits );
-
-        pit_Q_dec_fx( 1, pitch_index, nBits, 8, pit_flag, *limit_flag, T0, T0_frac, T0_min, T0_max, &st_fx->BER_detect );
-    }
-
-    /*-------------------------------------------------------*
-     * Compute floating pitch output
-     *-------------------------------------------------------*/
-
-    pitch = shl( add( shl( *T0, 2 ), *T0_frac ), 4 ); /* save subframe pitch values Q6 */
-
-    return pitch;
-}
-
-/*======================================================================*/
-/* FUNCTION : pit_decode_ivas_fx() */
-/*-----------------------------------------------------------------------*/
-/* PURPOSE :  calculate pitch value                                      */
-/*                                                                       */
-/*-----------------------------------------------------------------------*/
-/*  INPUT ARGUMENTS :													 */
-/* _ (Word32) core_brate : Core bitrate                    Q0            */
-/* _ (Word16) Opt_AMR_WB : flag indicating AMR-WB IO mode  Q0            */
-/* _ (Word16) L_frame : length of the frame                Q0            */
-/* _ (Word16) i_subfr : length of the frame                Q0            */
-/* _ (Word16) coder_type :  coding type                    Q0            */
-/* _ (Word16) L_subfr : subframe length                                  */
-/*-----------------------------------------------------------------------*/
-/* OUTPUT ARGUMENTS :                                                    */
-/* _ (Word16 *) T0 : close loop integer pitch                            */
-/* _ (Word16 *) T0_frac : close loop fractional part of the pitch        */
-/* _ (Word16 ) pitch : pitch value                         Q6            */
-/*-----------------------------------------------------------------------*/
-/* INPUT OUTPUT ARGUMENTS                                                */
-/* _ (Word16 *) T0_min : delta search min for sf 2 & 4                   */
-/* _ (Word16 *) T0_max : delta search max for sf 2 & 4                   */
-/*-----------------------------------------------------------------------*/
-/* RETURN ARGUMENTS :                                                    */
-/* _ (Word16 ) pitch : close loop integer pitch  Q6                      */
-/*=======================================================================*/
-
-
-Word16 pit_decode_ivas_fx(                                    /* o  : floating pitch value                    */
-                           Decoder_State *st_fx,              /* i/o: decoder state structure                 */
-                           const Word32 core_brate,           /* i  : core bitrate                            */
-                           const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode          */
-                           const Word16 L_frame,              /* i  : length of the frame                     */
-                           Word16 i_subfr,                    /* i  : subframe index                          */
-                           const Word16 coder_type,           /* i  : coding type                             */
-                           Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits   */
-                           Word16 *T0,                        /* o  : close loop integer pitch                */
-                           Word16 *T0_frac,                   /* o  : close loop fractional part of the pitch */
-                           Word16 *T0_min,                    /* i/o: delta search min for sf 2 & 4           */
-                           Word16 *T0_max,                    /* i/o: delta search max for sf 2 & 4           */
-                           const Word16 L_subfr,              /* i  : subframe length                         */
-                           const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag        */
-                           const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer        Q6  */
+/*! r: floating pitch value   */
+Word16 pit_decode_fx(
+    Decoder_State *st_fx,              /* i/o: decoder state structure                 */
+    const Word32 core_brate,           /* i  : core bitrate                            */
+    const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode          */
+    const Word16 L_frame,              /* i  : length of the frame                     */
+    Word16 i_subfr,                    /* i  : subframe index                          */
+    const Word16 coder_type,           /* i  : coding type                             */
+    Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits   */
+    Word16 *T0,                        /* o  : close loop integer pitch                */
+    Word16 *T0_frac,                   /* o  : close loop fractional part of the pitch */
+    Word16 *T0_min,                    /* i/o: delta search min for sf 2 & 4           */
+    Word16 *T0_max,                    /* i/o: delta search max for sf 2 & 4           */
+    const Word16 L_subfr,              /* i  : subframe length                         */
+    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag        */
+    const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer        Q6  */
 )
 {
     Word16 pitch; /*Q2*/
diff --git a/lib_dec/pitch_extr.c b/lib_dec/pitch_extr.c
deleted file mode 100644
index 53a6b154af24122c24d7aa40ca5c8b16c2a6265b..0000000000000000000000000000000000000000
--- a/lib_dec/pitch_extr.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "basop_util.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/pitch_extr_fx.c b/lib_dec/pitch_extr_fx.c
index 6f5bcc535237e6140c40ed310ecf9c52870c3de2..73e9623f5da99fc082caae28ff4ce9c12a27bd20 100644
--- a/lib_dec/pitch_extr_fx.c
+++ b/lib_dec/pitch_extr_fx.c
@@ -157,9 +157,7 @@ void pitch_pred_linear_fit(
             {
                 Word32 t1, t2, t3, t4, t5, t6, t7;
                 Word16 e1, e2, e3, e4, e5, e6, e7;
-#ifdef BASOP_NOGLOB
                 Flag Overflow;
-#endif
                 t1 = L_mult0( pg[4], pg[3] ); /*Q24*/ /* t1 = pg[4]*pg[3] */
                 e1 = 7;
                 move16();
@@ -182,12 +180,8 @@ void pitch_pred_linear_fit(
                 t6 = BASOP_Util_Add_Mant32Exp( t3, e3, t4, e4, &e6 );
                 t7 = BASOP_Util_Add_Mant32Exp( t5, e5, t6, e6, &e7 ); /*Q31,e7*/
                 sum0_q = norm_l( t7 );
-#ifdef BASOP_NOGLOB
                 sum0 = round_fx_o( L_shl( t7, sum0_q ), &Overflow ); /*Q15,e7-sum0_q*/
-#else
-                sum0 = round_fx( L_shl( t7, sum0_q ) ); /*Q15,e7-sum0_q*/
-#endif
-                sum0_q = add( 15, sub( sum0_q, e7 ) ); /* sum0 is now Qsum0_q*/
+                sum0_q = add( 15, sub( sum0_q, e7 ) );               /* sum0 is now Qsum0_q*/
             }
 
             pit = 0;
diff --git a/lib_dec/post_dec.c b/lib_dec/post_dec.c
deleted file mode 100644
index 3643a2810dea05d3a7a95c663eadd41f61e5b2f7..0000000000000000000000000000000000000000
--- a/lib_dec/post_dec.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Function prototypes
- *---------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------------*
- * post_decoder_flt()
- *
- * Perform post-processing
- *---------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------*
- * bass_pf_1sf_delay()
- *
- * Perform low-frequency postfiltering
- *---------------------------------------------------------------------*/
diff --git a/lib_dec/post_dec_fx.c b/lib_dec/post_dec_fx.c
index 8d3e03321b4d3b9082ba36fcb9cb2c138bcbb17a..cbcb225bc1c845d937119028fb6fcc025a19cfeb 100644
--- a/lib_dec/post_dec_fx.c
+++ b/lib_dec/post_dec_fx.c
@@ -168,10 +168,10 @@ void post_decoder(
     /* Update synth2 memory */
     Copy( synth_buf2 + L_frame, hBPF->pst_old_syn_fx, NBPSF_PIT_MAX );
 
-
     return;
 }
 
+
 void post_decoder_ivas_fx(
     Decoder_State *st,
     Word16 synth_buf[],   // Q0
@@ -439,11 +439,7 @@ static void bass_pf_1sf_delay(
             /* gain = tmp/nrg; */
             gain = BASOP_Util_Divide3232_Scale( tmp, nrg, &tmp16 );
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             gain = shl_sat( gain, tmp16 ); /* Q15 */
-#else
-            gain = shl( gain, tmp16 );                                  /* Q15 */
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             if ( gain < 0 )
@@ -471,20 +467,10 @@ static void bass_pf_1sf_delay(
                     {
                         tmp32 = L_msu0( 0, gain, syn[( i + i_subfr ) - T] );
                         tmp32 = L_msu0( tmp32, gain, syn[( i + i_subfr ) + T] );
-#ifdef BASOP_NOGLOB
                         tmp16 = mac_r_sat( tmp32, gain, syn[i + i_subfr] ); /* Q0 */
-#else
-                        tmp16 = mac_r( tmp32, gain, syn[i + i_subfr] ); /* Q0 */
-#endif
                         lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
-#ifdef BASOP_NOGLOB
                         lp_error = L_mac_sat( lp_error, tmp16, 0x1000 );   /* Q13 */
                         tmp16 = round_fx_sat( L_shl_sat( lp_error, s1 ) ); /* Q0+s1-3 */
-#else
-                        lp_error = L_mac( lp_error, tmp16, 0x1000 );    /* Q13 */
-
-                        tmp16 = round_fx( L_shl( lp_error, s1 ) ); /* Q0+s1-3 */
-#endif
                         ener2_64 = W_mac0_16_16( ener2_64, tmp16, tmp16 ); /* Q0+(s1-3)*2 */
                     }
                     ener2 = W_sat_l( ener2_64 );
@@ -498,7 +484,6 @@ static void bass_pf_1sf_delay(
                     Word64 ener2_64 = W_deposit32_l( ener2 );
                     FOR( i = lg; i < l_subfr; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         tmp32 = L_mult0( gain, syn[i + i_subfr] );
                         tmp32 = L_msu0_sat( tmp32, gain, syn[( i + i_subfr ) - T] ); /* Q0 */
                         tmp16 = round_fx_sat( tmp32 );
@@ -507,16 +492,6 @@ static void bass_pf_1sf_delay(
                         lp_error = L_mac_sat( lp_error, tmp16, 0x1000 ); /* Q13 */
 
                         tmp16 = round_fx_sat( L_shl_sat( lp_error, s1 ) ); /* Q0+s1-3 */
-#else
-                        tmp32 = L_mult0( gain, syn[i + i_subfr] );
-                        tmp32 = L_msu0( tmp32, gain, syn[i + i_subfr - T] ); /* Q0 */
-                        tmp16 = round_fx( tmp32 );
-
-                        lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
-                        lp_error = L_mac( lp_error, tmp16, 0x1000 ); /* Q13 */
-
-                        tmp16 = round_fx( L_shl( lp_error, s1 ) ); /* Q0+s1-3 */
-#endif
                         ener2_64 = W_mac0_16_16( ener2_64, tmp16, tmp16 ); /* Q0+(s1-3)*2 */
                     }
                     ener2 = W_sat_l( ener2_64 );
@@ -554,11 +529,7 @@ static void bass_pf_1sf_delay(
                 tmp32 = L_deposit_l( 1 );
             tmp16 = BASOP_Util_Divide3232_Scale( tmp, tmp32, &st );
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             tmp16 = shl_sat( tmp16, sub( st, 2 ) ); /* Q15 */
-#else
-            tmp16 = shl( tmp16, sub( st, 2 ) );                    /* Q15 */
-#endif
 
             if ( GT_16( tmp16, 16384 /*0.5f Q15*/ ) )
             {
@@ -584,16 +555,10 @@ static void bass_pf_1sf_delay(
                 FOR( i = 0; i < lg; i++ )
                 {
                     tmp32 = L_msu0( 0, tmp16, syn[( i + i_subfr ) - T] );
-#ifdef BASOP_NOGLOB
                     tmp32 = L_msu0_sat( tmp32, tmp16, syn[( i + i_subfr ) + T] );
                     tmp32 = L_mac_sat( tmp32, tmp16, syn[i + i_subfr] );
                     bpf_noise_buf[i + i_subfr] = round_fx_sat( tmp32 ); /* Q0 */
                     move16();
-#else
-                    tmp32 = L_msu0( tmp32, tmp16, syn[i + i_subfr + T] );
-                    tmp32 = L_mac( tmp32, tmp16, syn[i + i_subfr] );
-                    bpf_noise_buf[i + i_subfr] = round_fx( tmp32 ); /* Q0 */
-#endif
                 }
             }
 
@@ -602,14 +567,9 @@ static void bass_pf_1sf_delay(
                 FOR( i = lg; i < l_subfr; i++ )
                 {
                     tmp32 = L_mult0( tmp16, syn[i + i_subfr] );
-#ifdef BASOP_NOGLOB
                     tmp32 = L_msu0_sat( tmp32, tmp16, syn[i + i_subfr - T] );
                     bpf_noise_buf[i + i_subfr] = round_fx_sat( tmp32 ); /* Q0 */
                     move16();
-#else
-                    tmp32 = L_msu0( tmp32, tmp16, syn[i + i_subfr - T] );
-                    bpf_noise_buf[i + i_subfr] = round_fx( tmp32 ); /* Q0 */
-#endif
                 }
             }
         }
@@ -696,13 +656,8 @@ void cldfb_synth_set_bandsToZero(
                 /* use 16-bit precision of real and imag buffers */
                 realQ1 = extract_l( L_shr( rAnalysis[k][i], sub( 31 + 3 - 15, scaleFactor.lb_scale ) ) ); /*31 - (15 + scaleFactor.lb_scale) + 3 )*/
                 imagQ1 = extract_l( L_shr( iAnalysis[k][i], sub( 31 + 3 - 15, scaleFactor.lb_scale ) ) ); /* Q(-3), headroom */
-#ifdef BASOP_NOGLOB
                 nrgQ31 = L_mac0_o( nrgQ31, realQ1, realQ1, &Overflow );
                 nrgQ31 = L_mac0_o( nrgQ31, imagQ1, imagQ1, &Overflow ); /* keep in Q(-6) */
-#else
-                nrgQ31 = L_mac0( nrgQ31, realQ1, realQ1 );
-                nrgQ31 = L_mac0( nrgQ31, imagQ1, imagQ1 ); /* keep in Q(-6) */
-#endif
             }
             nrg_band[i] = ( nrgQ31 );
             move16();
diff --git a/lib_dec/ppp_dec.c b/lib_dec/ppp_dec.c
deleted file mode 100644
index d1de09bc73bcde0f9193c0b1d468183cb122cda9..0000000000000000000000000000000000000000
--- a/lib_dec/ppp_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/ppp_dec_fx.c b/lib_dec/ppp_dec_fx.c
index 201d2cce6442081c47869f8514409c71720eef4a..00a333798ef26d9645b5c3a480cbe7c0dc267443 100644
--- a/lib_dec/ppp_dec_fx.c
+++ b/lib_dec/ppp_dec_fx.c
@@ -113,14 +113,9 @@ static void DTFS_dequant_cw_fx(
 
     /* Power Dequantization */
 
-    tmp_fx = shl( POWER_IDX_fx, 1 ); /*  tmp=2*POWER_IDX */
-#ifdef BASOP_NOGLOB
+    tmp_fx = shl( POWER_IDX_fx, 1 );                                    /*  tmp=2*POWER_IDX */
     *lastLgainD_fx = add_sat( *lastLgainD_fx, PowerCB_fx[tmp_fx] );     /*  Q11 */
     *lastHgainD_fx = add_sat( *lastHgainD_fx, PowerCB_fx[tmp_fx + 1] ); /*  Q11 */
-#else
-    *lastLgainD_fx = add( *lastLgainD_fx, PowerCB_fx[tmp_fx] );     /*  Q11 */
-    *lastHgainD_fx = add( *lastHgainD_fx, PowerCB_fx[tmp_fx + 1] ); /*  Q11 */
-#endif
     move16();
     move16();
     L_tmp = L_deposit_h( X_fx->lag_fx ); /* Q16 */
@@ -143,11 +138,7 @@ static void DTFS_dequant_cw_fx(
     frac = L_Extract_lc( L_tmp, &exp1 );   /* Extract exponent  */
     L_tmp = Pow2( 14, frac );
     exp1 = sub( exp1, 14 );
-#ifdef BASOP_NOGLOB
     L_temp = L_shl_sat( L_tmp, add( exp1, 15 ) ); /* Q15 */
-#else
-    L_temp = L_shl( L_tmp, add( exp1, 15 ) );                       /* Q15 */
-#endif
     L_tmp2 = L_temp;
     if ( GE_32( L_temp, 2147483647 ) )
     {
@@ -173,11 +164,7 @@ static void DTFS_dequant_cw_fx(
     frac = L_Extract_lc( L_tmp, &exp1 );                         /* Extract exponent  */
     L_tmp = Pow2( 14, frac );
     exp1 = sub( exp1, 14 );
-#ifdef BASOP_NOGLOB
     L_temp = L_shl_sat( L_tmp, exp1 + 15 ); /* Q15 */
-#else
-    L_temp = L_shl( L_tmp, exp1 + 15 );                             /* Q15 */
-#endif
     L_tmp2 = L_temp;
     move32();
     if ( GE_32( L_temp, 2147483647 ) )
diff --git a/lib_dec/pvq_core_dec.c b/lib_dec/pvq_core_dec.c
deleted file mode 100644
index 936720d061915787d11511b5707d8c616feba14a..0000000000000000000000000000000000000000
--- a/lib_dec/pvq_core_dec.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "stl.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/pvq_core_dec_fx.c b/lib_dec/pvq_core_dec_fx.c
index 6d3e24dadf3721f07adf9324312813d940d2d8ca..93da9c77a8a0ec9dc80d47a98cd2b5910c1b67e4 100644
--- a/lib_dec/pvq_core_dec_fx.c
+++ b/lib_dec/pvq_core_dec_fx.c
@@ -492,11 +492,7 @@ static void densitySymbolIndexDecode_fx(
     sym_freq = L_deposit_l( 1 );
 
     angle = atan2_fx( SQRT_DIM_fx[opp_sz], SQRT_DIM_fx[near_sz] ); // Q13
-#ifdef BASOP_NOGLOB
     angle = shl_o( angle, 1, &Overflow );
-#else
-    angle = shl( angle, 1 );
-#endif
     angle = mult_r( angle, 20861 );
     c = mult_r( density, angle );
     density_c = sub( density, c );
diff --git a/lib_dec/pvq_decode.c b/lib_dec/pvq_decode.c
deleted file mode 100644
index 8e752f0ac516550ba25f4c9dcce588dfd9e16b42..0000000000000000000000000000000000000000
--- a/lib_dec/pvq_decode.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/pvq_decode_fx.c b/lib_dec/pvq_decode_fx.c
index 870ea25a900519019a0398f9fa36ef920748932f..649840f55ce2f942b1a2a5acfbfe16c21a456f4c 100644
--- a/lib_dec/pvq_decode_fx.c
+++ b/lib_dec/pvq_decode_fx.c
@@ -103,14 +103,9 @@ void pvq_decode_fx(
 
             Mpy_32_16_ss( L_isqrt, shl( y[i], shift_num ), &L_tmp, &u16_tmp ); /*  Q31*Q(0+x)  *2*/
             Mpy_32_16_ss( L_tmp, neg_gain_norm, &L_tmp, &u16_tmp );            /*  Q31*Q(0+x) *Q15 *2*/
-#ifdef BASOP_NOGLOB
             L_tmp = L_shr_o( L_tmp, shift_tot, &Overflow );
             xq[i] = round_fx_o( L_tmp, &Overflow ); /* Q15 , array move   */
             move16();
-#else
-            L_tmp = L_shr( L_tmp, shift_tot );
-            xq[i] = round_fx( L_tmp ); /* Q15 , array move   */
-#endif
         }
     }
 
diff --git a/lib_dec/range_dec.c b/lib_dec/range_dec.c
deleted file mode 100644
index fd4f3cb7c53af6bc1a4a149c6db6799b8f39655e..0000000000000000000000000000000000000000
--- a/lib_dec/range_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/re8_dec.c b/lib_dec/re8_dec.c
deleted file mode 100644
index e748899a9667996f0776eb65127752b66796a660..0000000000000000000000000000000000000000
--- a/lib_dec/re8_dec.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/rom_dec.c b/lib_dec/rom_dec.c
index 787966f729af56f474673502dad9aecaff4fbaf1..3f5243286c21707d6fc854775d9f0830af13d6b6 100644
--- a/lib_dec/rom_dec.c
+++ b/lib_dec/rom_dec.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/rom_dec.h b/lib_dec/rom_dec.h
index f057b804a6080d3830eee5c671cab44a4453aa66..8c1021682a5494198dc376249596b674a7041475 100644
--- a/lib_dec/rom_dec.h
+++ b/lib_dec/rom_dec.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_dec/rst_dec.c b/lib_dec/rst_dec.c
deleted file mode 100644
index 3b7436831d27db557be8e9ddea093277fe3a5564..0000000000000000000000000000000000000000
--- a/lib_dec/rst_dec.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*----------------------------------------------------------------------------------*
- * CNG_reset_dec()
- *
- * Reset decoder static variables in case of CNG frame
- *----------------------------------------------------------------------------------*/
diff --git a/lib_dec/rst_dec_fx.c b/lib_dec/rst_dec_fx.c
index 339d828544de63bd55a07f2e493322c3469b012d..c226d8b9a68830300eec9c433d781875fde11569 100644
--- a/lib_dec/rst_dec_fx.c
+++ b/lib_dec/rst_dec_fx.c
@@ -61,11 +61,7 @@ void CNG_reset_dec_fx(
         L_tmp = L_deposit_h( tmp );
         L_tmp = Isqrt_lc( L_tmp, &exp );
 
-#ifdef BASOP_NOGLOB
         st_fx->lp_gainc_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /* In Q3 */
-#else
-        st_fx->lp_gainc_fx = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) ); /* In Q3 */
-#endif
         move16();
     }
     /* reset the pitch buffer in case of FRAME_NO_DATA or SID frames */
diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h
index 5c7f894b9023e647248b2175daa811f60a210092..fcd5142a4c11b824f0a9638e8ca0d1209ae58b37 100644
--- a/lib_dec/stat_dec.h
+++ b/lib_dec/stat_dec.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -58,21 +58,7 @@ typedef enum
     FRAMEMODE_NORMAL = 0x0,  /* frame available            */
     FRAMEMODE_MISSING = 0x1, /* frame missing => conceal   */
     FRAMEMODE_FUTURE = 0x2
-} FRAME_MODE,
-    frameMode_fx;
-
-typedef enum
-{
-    TONALMDCTCONCEAL_OK = 0,
-
-    __error_codes_start = -100,
-
-    TONALMDCTCONCEAL_NSAMPLES_LARGER_THAN_MAXBLOCKSIZE,
-    TONALMDCTCONCEAL_INVALIDPOINTER,
-    TONALMDCTCONCEAL_UNEXPECTED_ERROR,
-
-    __error_codes_end
-} TONALMDCTCONCEAL_ERROR;
+} FRAME_MODE;
 
 
 /*---------------------------------------------------------------*
@@ -174,12 +160,8 @@ typedef struct
 typedef struct
 {
     Word16 L_frameTCX;
-    Word16 FrameSize;
 
-    Word16 Pitch;
     Word16 Pitch_fx;
-
-    Word16 T_bfi;
     Word8 T_bfi_fx;
 
     Word16 Transient[MAX_POST_LEN];
@@ -194,18 +176,13 @@ typedef struct
     Word32 ener_mean_fx;
     Word32 ener_fx;
 
-    Word16 zp;
     Word16 zp_fx;
     Word16 recovery_gain; /*outside waveformadjustment: Q14 - insinde waveformadjustment: Q15*/
     Word16 step_concealgain_fx;
 
     Word16 concealment_method;
-
-    Word16 subframe;
     Word16 subframe_fx;
-
     Word16 nbLostCmpt;
-
     Word16 seed;
 
 } T_PLCInfo, *T_PLCInfo_HANDLE;
@@ -219,17 +196,12 @@ typedef struct
 {
     UWord16 nSamples;
     UWord16 nSamplesCore;
-
-    Float32 *spectralData_float;
     Word16 *spectralData;
-
     Word16 spectralData_exp;
     Word16 *scaleFactors;
-
     Word16 *scaleFactors_exp;
     Word16 scaleFactors_max_e;
     Word16 gain_tcx_exp;
-
     Word16 blockIsValid;
     Word16 blockIsConcealed;
     Word16 tonalConcealmentActive;
@@ -241,9 +213,7 @@ typedef struct
     UWord16 indexOfTonalPeak[MAX_NUMBER_OF_IDX];
     UWord16 lowerIndex[MAX_NUMBER_OF_IDX];
     UWord16 upperIndex[MAX_NUMBER_OF_IDX];
-
-    Word16 phaseDiff[MAX_NUMBER_OF_IDX]; // Q12 /* This one can be stored with 16 bits in range 0..2*PI */
-
+    Word16 phaseDiff[MAX_NUMBER_OF_IDX];                                  // Q12 /* This one can be stored with 16 bits in range 0..2*PI */
     Word16 phase_currentFramePredicted[MAX_NUMBER_OF_IDX * GROUP_LENGTH]; // Q13 /* This one can be stored with 16 bits in range  [-pi;pi] 2Q13, but the code has to be adapted to use moduo(2*PI) after adding */
 } TonalComponentsInfo;
 
@@ -262,21 +232,13 @@ typedef struct tonalmdctconceal
     blockData secondLastBlockData;
 
     Word16 scaleFactorsBuffers[2][FDNS_NPTS]; /* Contains also global gain. */
-
     Word16 scaleFactorsBuffers_exp[2][FDNS_NPTS];
-
-    Word16 spectralDataBuffers[2][L_FRAME_MAX]; /* 16 bits is enough, because it is stored before applying scale factors. Take care that power spectrum is also stored here. */
-
+    Word16 spectralDataBuffers[2][L_FRAME_MAX];     /* 16 bits is enough, because it is stored before applying scale factors. Take care that power spectrum is also stored here. */
     Word16 timeDataBuffer[( 3 * L_FRAME_MAX ) / 2]; /* 16 bits are enough for the TD signal */
-
     Word16 *lastPcmOut;
-
     Word16 *secondLastPcmOut;
-
     Word16 q_lastPcmOut;
-
     Word16 *secondLastPowerSpectrum;
-
     Word16 secondLastPowerSpectrum_exp;
 
     Word32 scaleFactorsBackground_fx[FDNS_NPTS];
@@ -292,6 +254,7 @@ typedef struct tonalmdctconceal
     Word16 faded_signal_nrg_exp;
     Word16 nFramesLost;
     TonalComponentsInfo *pTCI;
+
 } TonalMDCTConceal_INSTANCE, *TonalMDCTConcealPtr;
 
 
@@ -396,8 +359,6 @@ typedef struct igfdec_instance_struct
 
 typedef struct tec_dec_structure
 {
-
-    // fixed variable
     Word16 pGainTemp_m[CLDFB_NO_COL_MAX];
     Word16 pGainTemp_e[CLDFB_NO_COL_MAX];
     Word16 loBuffer[CLDFB_NO_COL_MAX + MAX_TEC_SMOOTHING_DEG];
@@ -426,12 +387,9 @@ typedef struct tcx_ltp_dec_structure
     Word32 tcxltp_mem_out_32[L_FRAME48k];
     Word16 exp_tcxltp_mem_out;
 
-
     Word16 tcxltp_pitch_int_post_prev;
     Word16 tcxltp_pitch_fr_post_prev;
-
     Word16 tcxltp_gain_post_prev;
-
     Word16 tcxltp_filt_idx_prev;
 
 } TCX_LTP_DEC_DATA, *TCX_LTP_DEC_HANDLE;
@@ -483,7 +441,6 @@ typedef struct tcx_dec_structure
     Word16 FBTCXdelayBuf[111];    /* 2.3125ms at 48kHz -> 111 samples */
     Word32 FBTCXdelayBuf_32[111]; /* 2.3125ms at 48kHz -> 111 samples */
 
-
     /*TCX resisual Q*/
     Word16 resQBits[NB_DIV]; /* number of bits read for the residual Quantization in TCX*/
 
@@ -519,7 +476,6 @@ typedef struct tcx_dec_structure
     Word16 tcxConceal_recalc_exc;
     Word16 cummulative_damping_tcx; // Q15
 
-
 } TCX_DEC_DATA, *TCX_DEC_HANDLE;
 
 
@@ -529,32 +485,17 @@ typedef struct tcx_dec_structure
 
 typedef struct gsc_dec_structure
 {
-    Word16 seed_tcx; /* AC mode (GSC) - seed for noise fill                      */
-
-    Word16 cor_strong_limit; /* AC mode (GSC) - Indicator about high spectral correlation per band */
-                             // Word16 cor_strong_limit;                         /* AC mode (GSC) - Indicator about high spectral correlation per band */
-
-    Word16 old_y_gain_fx[MBANDS_GN16k]; /* AC mode (GSC) - AR mem for low rate gain quantization  */
-
-    Word16 noise_lev; /* AC mode (GSC) - noise level                              */
-                      // Word16 noise_lev;                                /* AC mode (GSC) - noise level Q0*/
-
+    Word16 seed_tcx;                          /* AC mode (GSC) - seed for noise fill                      */
+    Word16 cor_strong_limit;                  /* AC mode (GSC) - Indicator about high spectral correlation per band */
+    Word16 old_y_gain_fx[MBANDS_GN16k];       /* AC mode (GSC) - AR mem for low rate gain quantization  */
+    Word16 noise_lev;                         /* AC mode (GSC) - noise level                              */
     Word16 lt_ener_per_band_fx[MBANDS_GN16k]; /* Q12 */
-
-    Word32 Last_frame_ener_fx; /* AC mode (GSC) - last frame energy  */
-
-    Word16 Last_GSC_spectrum_fx[L_FRAME16k]; /* AC mode (GSC) - Last good GSC spectrum */
-
-    Word16 Last_GSC_pit_band_idx; /* AC mode (GSC) - Last pitch band index                    */
-                                  // Word16 Last_GSC_pit_band_idx;                    /* AC mode (GSC) - Last pitch band index Q0*/
-
-    Word16 last_exc_dct_in_fx[L_FRAME16k]; /* AC mode (GSC) - previous excitation                       */
-
-    Word16 last_ener_fx; /* AC mode (GSC) - previous energy                           */
-
-    Word16 last_bitallocation_band[6]; /* AC mode (GSC) - previous bit allocation of each band     */
-                                       // Word16 last_bitallocation_band[6];               /* AC mode (GSC) - previous bit allocation of each band      */
-
+    Word32 Last_frame_ener_fx;                /* AC mode (GSC) - last frame energy  */
+    Word16 Last_GSC_spectrum_fx[L_FRAME16k];  /* AC mode (GSC) - Last good GSC spectrum */
+    Word16 Last_GSC_pit_band_idx;             /* AC mode (GSC) - Last pitch band index                    */
+    Word16 last_exc_dct_in_fx[L_FRAME16k];    /* AC mode (GSC) - previous excitation                       */
+    Word16 last_ener_fx;                      /* AC mode (GSC) - previous energy                           */
+    Word16 last_bitallocation_band[6];        /* AC mode (GSC) - previous bit allocation of each band     */
 
 } GSC_DEC_DATA, *GSC_DEC_HANDLE;
 
@@ -566,47 +507,49 @@ typedef struct gsc_dec_structure
 typedef struct WI_dec_structure
 {
     Word16 old_exc2_fx[L_EXC_MEM]; /* FEC - old excitation2 used in fast recovery */
-
     Word16 old_syn2_fx[L_EXC_MEM]; /* FEC - old syn speech used in fast recovery */
 
-
 } WI_DEC_DATA, *WI_DEC_HANDLE;
 
 
 /*----------------------------------------------------------------------------------*
- * LD music post-filter
+ * NB postfilter / formant postfilter static variables
  *----------------------------------------------------------------------------------*/
 
-typedef struct ld_music_postfilt_structure
+typedef struct pfstat_structure
 {
-    Word16 LDm_mem_etot_fx; /* LD music post-filter - total energy memory  */
+    Word16 on;                    /* On/off flag           */
+    Word16 reset;                 /* reset flag           */
+    Word16 mem_pf_in[L_SUBFR];    /* Input memory        Qqmem_pf_in  */
+    Word16 mem_stp[L_SUBFR];      /*  1/A(gamma1) memory   Qqmem_stp*/
+    Word16 mem_res2[DECMEM_RES2]; /* A(gamma2) residual    Q_syn*/
+    Word16 mem_zero[M];           /* null memory to compute i.r. of A(gamma2)/A(gamma1) Q_qmem_zero*/
+    Word16 gain_prec; /*Q14*/     /* for gain adjustment   */
 
-    Word16 LDm_last_music_flag; /* LD music post-filter - last music flag */
+} PFSTAT, *PFSTAT_HANDLE;
 
-    Word16 LDm_nb_thr_1; /* LD music post-filter - number of consecutive frames of level 1 */
 
-    Word16 LDm_nb_thr_3;
+/*----------------------------------------------------------------------------------*
+ * LD music post-filter
+ *----------------------------------------------------------------------------------*/
 
+typedef struct ld_music_postfilt_structure
+{
+    Word16 LDm_mem_etot_fx;     /* LD music post-filter - total energy memory  */
+    Word16 LDm_last_music_flag; /* LD music post-filter - last music flag */
+    Word16 LDm_nb_thr_1;        /* LD music post-filter - number of consecutive frames of level 1 */
+    Word16 LDm_nb_thr_3;
     Word16 dct_post_old_exc_fx[DCT_L_POST - OFFSET2];
-
-    Word16 LDm_thres_fx[4]; /* LD music post-filter - Classification threshold */
-
-    Word16 LDm_lt_diff_etot_fx[MAX_LT]; /* LD music post-filter - long-term total energy variation */
-
+    Word16 LDm_thres_fx[4];                  /* LD music post-filter - Classification threshold */
+    Word16 LDm_lt_diff_etot_fx[MAX_LT];      /* LD music post-filter - long-term total energy variation */
     Word16 LDm_enh_lp_gbin_fx[VOIC_BINS_HR]; /* LD music post-filter - smoothed suppression gain, per bin FFT */
-
-    Word32 LDm_enh_lf_EO_fx[VOIC_BINS_HR]; /* LD music post-filter - old per bin E for previous half frame */
-
-    Word16 LDm_enh_min_ns_gain_fx; /* LD music post-filter - minimum suppression gain */
-
-    Word32 LDm_bckr_noise_fx[MBANDS_GN_LD]; /* LD music post-filter - background noise estimation per critical band */
+    Word32 LDm_enh_lf_EO_fx[VOIC_BINS_HR];   /* LD music post-filter - old per bin E for previous half frame */
+    Word16 LDm_enh_min_ns_gain_fx;           /* LD music post-filter - minimum suppression gain */
+    Word32 LDm_bckr_noise_fx[MBANDS_GN_LD];  /* LD music post-filter - background noise estimation per critical band */
     Word16 filt_lfE_fx[DCT_L_POST];
-
     Word16 last_nonfull_music;
-
     Word16 Old_ener_Q; /* Old energy scaling factor */
 
-
 } MUSIC_POSTFILT_DATA, *MUSIC_POSTFILT_HANDLE;
 
 /*----------------------------------------------------------------------------------*
@@ -617,18 +560,13 @@ typedef struct bass_postfilt_structure
 {
     Word16 pst_old_syn_fx[NBPSF_PIT_MAX]; /* Bass post-filter - old synthesis buffer 1 Q_syn2-1*/
     Word16 q_pst_old_syn;
-    Word16 pst_mem_deemp_err_fx; /* Bass post-filter - filter memory of noise LP filter Q_syn2-1*/
-
-    Word16 pst_lp_ener_fx; /* Bass post-filter - long-term energy Q8*/
-
-    Word16 Track_on_hist[L_TRACK_HIST]; /* Bass post-filter - History of half frame usage */
-
+    Word16 pst_mem_deemp_err_fx;          /* Bass post-filter - filter memory of noise LP filter Q_syn2-1*/
+    Word16 pst_lp_ener_fx;                /* Bass post-filter - long-term energy Q8*/
+    Word16 Track_on_hist[L_TRACK_HIST];   /* Bass post-filter - History of half frame usage */
     Word16 vibrato_hist[L_TRACK_HIST];    /* Bass post-filter - History of frames declared as vibrato */
-                                          // Word16 vibrato_hist[L_TRACK_HIST];                   /* Bass post-filter - History of frames declared as vibrato */
     Word16 psf_att_fx;                    /* Bass post-filter - post filter attenuation factor */
     Word16 mem_mean_pit_fx[L_TRACK_HIST]; /* Bass post-filter - average pitch memory */
 
-
 } BPF_DEC_DATA, *BPF_DEC_HANDLE;
 
 /*------------------------------------------------------------------------------------------*
@@ -637,75 +575,54 @@ typedef struct bass_postfilt_structure
 
 typedef struct td_cng_dec_structure
 {
-    Word16 cng_seed; /* DTX/CNG - seed for white noise random generator */
-                     // Word16 cng_seed;                    /*CNG and DTX - seed for white noise random generator*/
-    Word32 Enew_fx;  /* CNG and DTX - decoded residual energy Q6*/
-
+    Word16 cng_seed;      /* DTX/CNG - seed for white noise random generator */
+    Word32 Enew_fx;       /* CNG and DTX - decoded residual energy Q6*/
     Word16 old_enr_index; /* DTX/CNG - index of last encoded CNG energy */
-
     Word16 cng_ener_seed; /* DTX/CNG - seed for random generator for variation of excitation energy */
-
     Word16 cng_ener_seed1;
-
     Word16 last_allow_cn_step;
-
-    Word16 ho_hist_size; /* DTX/CNG - size of DTX hangover history buffer for averaging, <0,HO_HIST_SIZE> */
-
-    Word16 ho_hist_ptr; /* DTX/CNG - pointer for averaging buffers */
-
+    Word16 ho_hist_size;                                                                  /* DTX/CNG - size of DTX hangover history buffer for averaging, <0,HO_HIST_SIZE> */
+    Word16 ho_hist_ptr;                                                                   /* DTX/CNG - pointer for averaging buffers */
     Word32 ho_sid_bw;                                                                     /* DTX/CNG - SID bandwidth flags */
-                                                                                          // Word32 ho_sid_bw;                                    /* CNG and DTX - SID bandwidth flags */
     Word16 ho_lsp_hist_fx[HO_HIST_SIZE * M];                                              /* CNG and DTX - old LSP buffer for averaging */
     Word32 ho_ener_hist_fx[HO_HIST_SIZE]; /* CNG and DTX - energy buffer for averaging */ /*Q6 */
     Word32 ho_env_hist_fx[HO_HIST_SIZE * NUM_ENV_CNG];
-
-
-    Word16 act_cnt; /* DTX/CNG - counter of active frames */
-
-    Word16 ho_circ_size; /* DTX/CNG - size of DTX hangover history buffer for averaging, <0,HO_HIST_SIZE> */
-
-    Word16 ho_circ_ptr; /* DTX/CNG - pointer for averaging buffers */
-                        // Word16 ho_circ_ptr;                                  /* CNG and DTX - pointer for averaging buffers */
-
+    Word16 act_cnt;                                                                       /* DTX/CNG - counter of active frames */
+    Word16 ho_circ_size;                                                                  /* DTX/CNG - size of DTX hangover history buffer for averaging, <0,HO_HIST_SIZE> */
+    Word16 ho_circ_ptr;                                                                   /* DTX/CNG - pointer for averaging buffers */
     Word16 ho_lsp_circ_fx[HO_HIST_SIZE * M];                                              /* CNG and DTX - old LSP buffer for averaging */
     Word32 ho_ener_circ_fx[HO_HIST_SIZE]; /* CNG and DTX - energy buffer for averaging */ /* Q6 */
     Word32 ho_env_circ_fx[HO_HIST_SIZE * NUM_ENV_CNG];
-
-
-    Word16 num_ho; /* DTX/CNG - number of selected hangover frames */
-
+    Word16 num_ho;                   /* DTX/CNG - number of selected hangover frames */
     Word16 ho_16k_lsp[HO_HIST_SIZE]; /* DTX/CNG - 16k LSPs flags */
-                                     // Word16 ho_16k_lsp[HO_HIST_SIZE];                     /* DTX/CNG - 16k LSPs flags */
-
-
-    Word16 act_cnt2; /* DTX/CNG - counter of active frames for CNG_mode switching */
-                     // Word16 act_cnt2;                                     /* DTX/CNG - counter of active frames for CNG_mode switching */
+    Word16 act_cnt2;                 /* DTX/CNG - counter of active frames for CNG_mode switching */
     Word32 old_env_fx[20];
     Word32 lp_env_fx[20];
     Word16 exc_mem_fx[24];
     Word16 exc_mem1_fx[30];
 
+    Word16 interpol_3_2_cng_dec_fx[INTERP_3_2_MEM_LEN];
+
+    /* SWB DTX/CNG parameters */
+    Word16 shb_cng_ener_fx;
+    Word32 shb_cng_ener_fx_32;               // Q(11)
     Word16 shb_lpcCNG_fx[LPC_SHB_ORDER + 1]; /* Assumed in Q12 */
     Word16 shb_cng_gain_fx;                  /* Assumed in Q8 */
+    Word32 shb_cng_gain_fx_32;               // Q(11)
+    Word16 wb_cng_ener_fx;
+    Word32 wb_cng_ener_fx_32; // Q(11)
+    Word16 last_wb_cng_ener_fx;
+    Word32 last_wb_cng_ener_fx_32; // Q(11)
+    Word16 last_shb_cng_ener_fx;
+    Word32 last_shb_cng_ener_fx_32; // Q(11)
     Word16 swb_cng_seed;
-    Word16 shb_dtx_count;
-    Word16 trans_cnt;
-
-    Word16 interpol_3_2_cng_dec_fx[INTERP_3_2_MEM_LEN];
-
-    Word32 shb_cng_ener_fx_32;                  // Q(11)
-    Word32 shb_cng_gain_fx_32;                  // Q(11)
-    Word32 wb_cng_ener_fx_32;                   // Q(11)
-    Word32 last_wb_cng_ener_fx_32;              // Q(11)
-    Word32 last_shb_cng_ener_fx_32;             // Q(11)
     Word16 lsp_shb_prev_fx[LPC_SHB_ORDER];      // Q(14)
     Word16 lsp_shb_prev_prev_fx[LPC_SHB_ORDER]; // Q(14)
-
-    Word16 burst_cnt;
-    Word32 last_shb_ener_fx; // Q(11)
-
-    Word16 last_cng_type_fx; /* DTX/CNG - flag indicating last frame LP or CLDFB based SID/CNG */
-
+    Word16 shb_dtx_count_fx;
+    Word16 trans_cnt_fx;
+    Word16 burst_cnt_fx;
+    Word16 last_shb_ener_fx;
+    Word32 last_shb_ener_fx_32; // Q(11)
 
 } TD_CNG_DEC_DATA, *TD_CNG_DEC_HANDLE;
 
@@ -721,36 +638,27 @@ typedef struct sc_vbr_dec_structure
     /* DTFS variables */
     Word16 dtfs_dec_a_fx[MAXLAG_WI]; /*Variable Q format in dtfs_dec_Q*/
     Word16 dtfs_dec_b_fx[MAXLAG_WI]; /*Variable Q format in dtfs_dec_Q*/
-
     Word16 dtfs_dec_lag;
-
     Word16 dtfs_dec_nH;
-
     Word16 dtfs_dec_nH_4kHz;
-
     Word16 dtfs_dec_upper_cut_off_freq_of_interest_fx; /*Q0*/
     Word16 dtfs_dec_upper_cut_off_freq_fx;             /*Q0*/
     Word16 ph_offset_D_fx;                             /* normalized by 2Pi Q15*/
     Word16 lastLgainD_fx;                              /* previous gain value for the low band Q11*/
     Word16 lastHgainD_fx;                              /* previous gain value for the high band Q11 */
     Word16 lasterbD_fx[NUM_ERB_WB];                    /* previous amplitude spectrum (ERB) Q13*/
-
-    Word16 dtfs_dec_Q; /*Q0*/
+    Word16 dtfs_dec_Q;                                 /*Q0*/
 
     /* NELP decoder variables */
     Word32 bp1_filt_mem_nb_dec_fx[14]; /* qfm currently Q0*/
     Word16 bp1_filt_mem_wb_dec_fx[8];  /* qfm currently Q0*/
     Word16 shape1_filt_mem_dec_fx[10]; /* qfm currently Q0*/
     Word16 shape2_filt_mem_dec_fx[10]; /* qfm currently Q0*/
-
     Word16 shape3_filt_mem_dec_fx[10]; /* qfm currently Q0*/
 
-
     Word16 nelp_dec_seed;
-
     Word16 FadeScale_fx; /*Q15*/
 
-
 } SC_VBR_DEC_DATA, *SC_VBR_DEC_HANDLE;
 
 /*----------------------------------------------------------------------------------*
@@ -760,46 +668,24 @@ typedef struct sc_vbr_dec_structure
 typedef struct hq_nbfec_structure
 {
     Word16 prev_last_core; /* !!! note: the parameter is identical to last_core in IVAS */
-                           // Word16 prev_last_core; /* !!! note: the parameter is identical to last_core in IVAS */
 
     Word16 diff_energy_fx;
-
     Word16 stat_mode_out;
-
     Word16 stat_mode_old;
-
-
     Word16 phase_mat_flag;
-
     Word16 phase_mat_next;
-
     Word16 old_Min_ind;
-
     Word16 old_auOut_2fr_fx[L_FRAME8k * 2];
-
     Word16 old_out_pha_fx[2][N_LEAD_NB]; /* FEC for HQ Core, 0-phase matching old_out, 1-overlapping original old_out and  phase matching old_out*/
-
     Word32 ynrm_values_fx[MAX_SB_NB][MAX_PGF];
-
     Word32 r_p_values_fx[MAX_SB_NB][MAX_ROW];
-
     Word16 Norm_gain_fx[SFM_N_NB];
-
-    /*Word16 old_hqswb_clas;*/ /* only used in inactive code, where it might probably be replaced by old_hqswb_clas_fx */
-
-
     Word16 HQ_FEC_seed;
-
     Word16 energy_MA_Curr_fx[2];
-
     Word16 prev_sign_switch[HQ_FEC_SIGN_SFM];
-
     Word16 prev_sign_switch_2[HQ_FEC_SIGN_SFM];
-
     Word32 old_coeffs_fx[L_FRAME8k]; /* HQ core - old coefficients (for FEC) */
-
     Word32 oldIMDCTout_fx[L_FRAME8k / 2];
-
     Word16 prev_oldauOut_fx[L_FRAME8k];
 
 
@@ -811,86 +697,52 @@ typedef struct hq_nbfec_structure
 
 typedef struct hq_dec_structure
 {
-
-    Word32 oldOut_fx[L_FRAME48k];  /* HQ core - previous synthesis for OLA */
-    Word16 old_out_fx[L_FRAME48k]; /* HQ core - previous synthesis for OLA */
+    Word32 old_out_fx32[L_FRAME48k]; /* HQ core - previous synthesis for OLA */
+    Word16 old_out_fx[L_FRAME48k];   /* HQ core - previous synthesis for OLA */
     Word16 exp_old_out;
-
     Word16 old_out_LB_fx[L_FRAME32k]; /* HQ core - previous synthesis for OLA for Low Band */
-    Word32 old_outLB_fx[L_FRAME32k];
+    Word32 old_out_LB_fx32[L_FRAME32k];
     Word16 q_old_outLB_fx;
-
     Word16 Q_old_wtda_LB;
     Word16 Q_old_wtda;
     Word16 Q_old_postdec; /*scaling of the output of core_switching_post_dec_fx() */
-
     Word16 last_hq_core_type;
-
     Word16 old_is_transient[3]; /* HQ core - previous transient flag (for FEC)  */
 
     Word16 mem_norm[SFM_N_ENV_STAB]; /* Q0 */
-
-    Word16 mem_env_delta; /* Q11 */
-
-    Word16 no_att_hangover; /* Q0 */
-
-    Word32 energy_lt_fx; /* Q13 */
-
+    Word16 mem_env_delta;            /* Q11 */
+    Word16 no_att_hangover;          /* Q0 */
+    Word32 energy_lt_fx;             /* Q13 */
     Word16 hq_generic_seed;
-
     Word16 prev_noise_level_fx[2]; /* Q15 */
-
     Word16 prev_hqswb_clas;
-
-    Word16 prev_R; /* the table of bit allocation of last frame  */
-
-    Word16 prev_SWB_peak_pos[SPT_SHORTEN_SBNUM];
-
+    Word16 prev_R;                                   /* the table of bit allocation of last frame  */
     Word32 prev_coeff_out_fx[L_HQ_WB_BWE]; /* Q12 */ /* the coefficients of last frame             */
     Word16 prev_SWB_peak_pos_fx[SPT_SHORTEN_SBNUM];
 
-
     Word16 HqVoicing;
     Word16 fer_samples_fx[L_FRAME48k];
     Word16 Q_fer_samples;
     Word32 prev_normq_fx[SFM_N_WB]; /* Q14 */ /* previous norms                             */
-
-
-    Word32 prev_env_fx[SFM_N_WB]; /* previous noise envelopes                   */
-
+    Word32 prev_env_fx[SFM_N_WB];             /* previous noise envelopes                   */
     Word16 prev_env_Q[SFM_N_WB];
 
-
     Word32 last_ni_gain_fx[BANDS_MAX];
-
     Word16 last_env_fx[BANDS_MAX];
-
     Word16 last_max_pos_pulse;
 
     /* pre-echo reduction */
-    Word16 memfilt_lb_fx; /* Q0 */
-
+    Word16 memfilt_lb_fx;   /* Q0 */
     Word32 mean_prev_hb_fx; /* Q0 */
-
-    Word16 smoothmem_fx; /* Q15 */
-
-    Word32 mean_prev_fx; /* Q0 */
-
+    Word16 smoothmem_fx;    /* Q15 */
+    Word32 mean_prev_fx;    /* Q0 */
     Word32 mean_prev_nc_fx; /* Q0 */
-
-    Word16 wmold_hb_fx; /* Q15 */
-
+    Word16 wmold_hb_fx;     /* Q15 */
     Word16 prevflag;
-
     Word16 pastpre;
-
-
     Word16 prev_frm_hfe2;
-
     Word16 prev_stab_hfe2;
-
-    Word16 prev_ni_ratio_fx; /* 15 */
-
+    Word16 prev_ni_ratio_fx;               /* 15 */
     Word16 prev_En_sb_fx[NB_SWB_SUBBANDS]; /* QsEn(4) */
 
     /*----------------------------------------------------------------------------------*
@@ -899,50 +751,30 @@ typedef struct hq_dec_structure
 
     /* HQ PHASE ECU internal state */
     Word16 time_offs;
-
     Word16 X_sav_fx[PH_ECU_SPEC_SIZE];
-
     Word16 Q_X_sav;
-
     Word16 num_p;
-
     Word16 plocs[MAX_PLOCS];
-
     Word32 plocsi_fx[MAX_PLOCS];
-
     Word16 env_stab_fx;
-
     Word16 mem_norm_hqfec[SFM_N_ENV_STAB];
-
     Word16 mem_env_delta_hqfec;
-
     Word16 env_stab_plc_fx;
-
     Word16 env_stab_state_p_fx[NUM_ENV_STAB_PLC_STATES];
-
     Word16 envstabplc_hocnt;
 
     Word16 mag_chg_1st_fx[LGW_MAX]; /* i/o: per band magnitude modifier for transients*/
-
-    Word16 Xavg_fx[LGW_MAX]; /* Frequency group average gain to fade to   */
-
-    Word16 beta_mute_fx; /* Factor for long-term mute            */
+    Word16 Xavg_fx[LGW_MAX];        /* Frequency group average gain to fade to   */
+    Word16 beta_mute_fx;            /* Factor for long-term mute            */
 
     Word16 last_fec;
-
     Word16 ph_ecu_HqVoicing;
-
     Word16 oldHqVoicing;
-
     Word16 oldgapsynth_fx[L_FRAME48k];
-
     Word16 ph_ecu_active; /* Set if Phase ECU was used in last bad frame */
-
     Word16 ni_seed_forfec;
-
     Word16 ber_occured_in_pvq; /* flag for BER detection from PVQ routines */
 
-
 } HQ_DEC_DATA, *HQ_DEC_HANDLE;
 
 
@@ -952,20 +784,15 @@ typedef struct hq_dec_structure
 
 typedef struct zero_bwe_dec_structure
 {
-    Word16 seed2; /* HF (6-7kHz) BWE - seed for random signal generator */
-
-
-    Word16 mem_hp400_fx[6]; /* HF (6-7kHz) BWE - hp400 filter memory */
-    Word16 q_mem_hp400_fx;
-
-    Word16 mem_hf_fx[2 * L_FILT16k]; /* HF (6-7kHz) BWE - band-pass filter memory Q(-2-memExp1)*/
-
-    Word16 mem_syn_hf_fx[M]; /* HF (6-7kHz) BWE - synthesis filter memory Q0*/
-
+    Word16 seed2;                                           /* HF (6-7kHz) BWE - seed for random signal generator */
+    Word16 mem_hp400_fx[6];                                 /* HF (6-7kHz) BWE - hp400 filter memory */
+    Word16 q_mem_hp400_fx;                                  /* Exponent for mem_hp400_fx[] scaling */
+    Word16 mem_hf_fx[2 * L_FILT16k];                        /* HF (6-7kHz) BWE - band-pass filter memory Q(-2-memExp1)*/
+    Word16 mem_syn_hf_fx[M];                                /* HF (6-7kHz) BWE - synthesis filter memory Q0 */
     Word16 delay_syn_hf_fx[NS2SA( 16000, DELAY_CLDFB_NS )]; /* HF (6-7kHz) BWE - To synchronise BWE content with postfiltered synthesis Q0*/
+    Word16 mem_hp_interp_fx[INTERP_3_1_MEM_LEN];            /* HF (6-7 kHz) BWE - interp. memory */
+    Word16 memExp1;                                         /* Exponent for mem_hf_fx scaling */
 
-    Word16 mem_hp_interp_fx[INTERP_3_1_MEM_LEN]; /* HF (6-7 kHz) BWE - interp. memory */
-    Word16 memExp1;                              /* Exponent for mem_hf_fx scaling*/
 } ZERO_BWE_DEC_DATA, *ZERO_BWE_DEC_HANDLE;
 
 
@@ -977,147 +804,104 @@ typedef struct td_bwe_dec_structure
 {
     /* states for the filters used in generating SHB excitation from WB excitation */
     Word16 state_lpc_syn_fx[LPC_SHB_ORDER];
-
     Word32 mem_csfilt_fx[2];
 
     /* states for the filters used in generating SHB signal from SHB excitation*/
     Word16 state_syn_shbexc_fx[L_SHB_LAHEAD];
-
     Word16 syn_overlap_fx[L_SHB_LAHEAD];    /* overlap buffer used to Adjust SHB Frame Gain*/
-    Word32 syn_overlap_fx_32[L_SHB_LAHEAD]; /* overlap buffer used to Adjust SHB Frame Gain*/
+    Word32 syn_overlap_fx_32[L_SHB_LAHEAD]; /* overlap buffer used to Adjust SHB Frame Gain, IVAS 32-bit variant */
 
     /* previous frame parameters for frame error concealment */
     Word16 lsp_prevfrm_fx[LPC_SHB_ORDER];
-
     Word32 GainFrame_prevfrm_fx;
-
     Word16 GainShape_Delay_fx[NUM_SHB_SUBFR / 2];
-
     Word16 GainAttn_fx;
 
-
     Word16 old_bwe_exc_fx[PIT16k_MAX * 2]; /*Q_exc*/
-
     Word16 bwe_seed[2];
-
     Word32 bwe_non_lin_prev_scale_fx;
-
     Word16 old_bwe_exc_extended_fx[NL_BUFF_OFFSET];
 
-
     Word32 genSHBsynth_Hilbert_Mem_fx[HILBERT_MEM_SIZE];
 
     Word16 mem_genSHBexc_filt_down_shb_fx[2 * ALLPASSSECTIONS_STEEP + 1];
-
     Word16 mem_genSHBexc_filt_down_wb2_fx[2 * ALLPASSSECTIONS_STEEP + 1];
-
     Word16 mem_genSHBexc_filt_down_wb3_fx[2 * ALLPASSSECTIONS_STEEP + 1];
-
     Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[2 * ALLPASSSECTIONS_STEEP];
-    Word32 genSHBsynth_state_lsyn_filt_shb_local_fx_32[2 * ALLPASSSECTIONS_STEEP];
-
+    Word32 genSHBsynth_state_lsyn_filt_shb_local_fx_32[2 * ALLPASSSECTIONS_STEEP]; /* IVAS 32-bit variant */
     Word16 state_lsyn_filt_shb_fx[2 * ALLPASSSECTIONS_STEEP];
-    Word32 state_lsyn_filt_shb_fx_32[2 * ALLPASSSECTIONS_STEEP];
-
+    Word32 state_lsyn_filt_shb_fx_32[2 * ALLPASSSECTIONS_STEEP]; /* IVAS 32-bit variant */
     Word16 state_lsyn_filt_dwn_shb_fx[2 * ALLPASSSECTIONS_STEEP];
-    Word32 state_lsyn_filt_dwn_shb_fx_32[2 * ALLPASSSECTIONS_STEEP];
-
+    Word32 state_lsyn_filt_dwn_shb_fx_32[2 * ALLPASSSECTIONS_STEEP]; /* IVAS 32-bit variant */
     Word16 mem_resamp_HB_fx[INTERP_3_1_MEM_LEN];
-    Word32 mem_resamp_HB_fx_32[INTERP_3_1_MEM_LEN];
-
+    Word32 mem_resamp_HB_fx_32[INTERP_3_1_MEM_LEN]; /* IVAS 32-bit variant */
     Word16 mem_resamp_HB_32k_fx[2 * ALLPASSSECTIONS_STEEP + 1];
-    Word32 mem_resamp_HB_32k_fx_32[2 * ALLPASSSECTIONS_STEEP + 1];
+    Word32 mem_resamp_HB_32k_fx_32[2 * ALLPASSSECTIONS_STEEP + 1]; /* IVAS 32-bit variant */
+    Word32 prev_pow_exc16kWhtnd_fx32;                              /* power of the LB excitation signal in the previous frame */
+    Word16 prev_mix_factor_fx;                                     /* mixing factor in the previous frame */
 
     Word16 state_32and48k_WB_upsample_fx[2 * ALLPASSSECTIONS_STEEP]; /* !!! this memory in FLP is called mem_resamp_HB */
 
-    Word32 prev_pow_exc16kWhtnd_fx32; /* power of the LB excitation signal in the previous frame */
-    Word16 prev_mix_factor_fx;        /* mixing factor in the previous frame */
-
     Word16 syn_dm_phase;
-
     Word32 fbbwe_hpf_mem_fx[4][4];
-
     Word16 fbbwe_hpf_mem_fx_Q[4];
-
     Word32 prev_wb_bwe_frame_pow_fx;
-
     Word32 prev_swb_bwe_frame_pow_fx;
-
     Word32 prev_ener_fx;
-
     Word16 prev_GainShape_fx;
-
     Word16 fb_state_lpc_syn_fx[LPC_SHB_ORDER];
-
     Word16 fb_tbe_demph_fx;
-
     Word16 prev_fbbwe_ratio_fx;
 
-
     Word16 tbe_demph_fx;
-
     Word16 tbe_premph_fx;
-
     Word16 mem_stp_swb_fx[LPC_SHB_ORDER];
-
     Word16 *ptr_mem_stp_swb_fx;
-
     Word16 gain_prec_swb_fx;
-
     Word16 mem_zero_swb_fx[LPC_SHB_ORDER];
 
     Word16 swb_lsp_prev_interp_fx[LPC_SHB_ORDER];
-
     Word32 prev1_shb_ener_sf_fx, prev2_shb_ener_sf_fx, prev3_shb_ener_sf_fx;
-
     Word16 prev_res_shb_gshape_fx, prev_mixFactors_fx;
-
     Word16 tilt_mem_fx;
-
     Word16 prev_lsf_diff_fx[LPC_SHB_ORDER - 2]; /*Q15*/
-
-    Word16 prev_tilt_para_fx; /*Q10*/
-
-    Word16 cur_sub_Aq_fx[M + 1]; /*Q12*/
-
+    Word16 prev_tilt_para_fx;                   /*Q10*/
+    Word16 cur_sub_Aq_fx[M + 1];                /*Q12*/
 
     /* quantized data */
     Word16 lsf_idx[NUM_Q_LSF];
-
     Word16 m_idx;
-
     Word16 grid_idx;
-
     Word16 idxSubGains;
-
     Word16 idxFrameGain;
-
     Word16 idx_shb_fr_gain;
-
     Word16 idx_res_gs[NB_SUBFR16k];
-
     Word16 idx_mixFac;
 
     Word16 lsf_WB;
-
     Word16 gFrame_WB;
 
     Word16 idxGain;
 
     Word16 old_core_synth_fx[L_FRAME16k];
-
     Word16 old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH];
-    Word32 old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH];
+    Word32 old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH]; /* IVAS 32-bit variant */
 
     Word16 int_3_over_2_tbemem_dec_fx[INTERP_3_2_MEM_LEN];
-    Word32 int_3_over_2_tbemem_dec_fx_32[INTERP_3_2_MEM_LEN];
+    Word32 int_3_over_2_tbemem_dec_fx_32[INTERP_3_2_MEM_LEN]; /* IVAS 32-bit variant */
 
     Word16 old_hb_synth_fx[L_FRAME48k];
 
     Word16 tilt_swb_fec_fx; /* FEC - SWB TBE TILT */
 
     Word16 prev_hb_synth_fx_exp;
-
+    Word16 prev_frame_pow_exp;
+    Word16 prev_ener_fx_Q;
+    Word16 prev_lpc_wb_fx[LPC_SHB_ORDER_WB];
+    Word16 prev_Q_bwe_syn;
+    Word16 prev_Q_bwe_syn2;
+    Word16 prev_Q_bwe_exc_fb;
+    Word16 prev_Qx;
 
 } TD_BWE_DEC_DATA, *TD_BWE_DEC_HANDLE;
 
@@ -1127,42 +911,27 @@ typedef struct td_bwe_dec_structure
 
 typedef struct fd_bwe_dec_structure
 {
-    Word16 old_wtda_wb_fx_exp;
-
     Word16 L_old_wtda_swb_fx[L_FRAME48k];
     Word32 L_old_wtda_swb_fx32[L_FRAME48k];
-
     Word16 old_wtda_swb_fx_exp;
-
     Word16 old_syn_12k8_16k_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS )]; /*Q_syn2-1*/
-
     Word16 mem_deemph_old_syn_fx;
-
     Word16 prev_mode;
-
-
+    Word16 prev_SWB_fenv_fx[SWB_FENV];
     Word16 prev_Energy_fx;
-
     Word32 prev_Energy_wb_fx;
-
     Word16 prev_L_swb_norm;
-
     Word16 Seed;
-
     Word16 memExp1;
-
     Word16 prev_frica_flag;
-
     Word16 mem_imdct_fx[L_FRAME48k];
-
     Word16 mem_imdct_exp_fx;
-
     Word16 prev_td_energy_fx;
-
     Word16 prev_weight_fx;
-
     Word16 prev_flag;
-
+    Word16 last_wb_bwe_ener_fx;
+    Word16 prev_Q_synth;
+    Word16 prev_fb_ener_adjust_fx;
 
 } FD_BWE_DEC_DATA, *FD_BWE_DEC_HANDLE;
 
@@ -1173,22 +942,13 @@ typedef struct fd_bwe_dec_structure
 
 typedef struct hr_swb_bwe_dec_structure
 {
-
-    Word16 bwe_highrate_seed;
     Word16 bwe_highrate_seed_fx;
-
     Word16 t_audio_prev_fx[2 * END_FREQ_BWE_FULL_FB / 50 - NUM_NONTRANS_START_FREQ_COEF];
-
     Word16 t_audio_prev_fx_exp[NUM_TIME_SWITCHING_BLOCKS];
-
-    Word16 old_is_transient_hr_bwe;
     Word16 old_is_transient_hr_bwe_fx;
-
     Word32 L_mem_EnergyLT_fx;
-
     Word16 mem_EnergyLT_fx_exp;
 
-
 } HR_BWE_DEC_DATA, *HR_BWE_DEC_HANDLE;
 
 
@@ -1216,54 +976,29 @@ typedef struct amrwb_io_dec_structure
 {
     Word16 past_qua_en_fx[GAIN_PRED_ORDER]; /* gain quantization memory (used also in AMR-WB IO mode) */
 
-    Word16 prev_r_fx; /* HF BWE - previous sub-frame gain                */
-
-    Word16 fmerit_w_sm_fx; /* HF BWE - fmerit parameter memory */
-
-    Word16 frame_count;    /* HF BWE - frame count                            */
-    Word16 frame_count_fx; /* HF BWE - frame count             */
-    Word16 ne_min_fx;      /* HF BWE - minimum Noise gate - short-term energy */
-
-    Word16 fmerit_m_sm_fx; /* HF BWE - memory of fmerit_m param               */
-
+    Word16 prev_r_fx;           /* HF BWE - previous sub-frame gain                */
+    Word16 fmerit_w_sm_fx;      /* HF BWE - fmerit parameter memory                */
+    Word16 frame_count_fx;      /* HF BWE - frame count                            */
+    Word16 ne_min_fx;           /* HF BWE - minimum Noise gate - short-term energy */
+    Word16 fmerit_m_sm_fx;      /* HF BWE - memory of fmerit_m param               */
     Word16 voice_fac_amr_wb_hf; /* HF BWE - voice factor                           */
-
-    Word16 unvoicing_fx; /* HF BWE - unvoiced parameter                     */
-
-    Word16 unvoicing_sm_fx; /* HF BWE - smoothed unvoiced parameter            */
-
-    Word16 unvoicing_flag;    /* HF BWE - unvoiced flag                          */
-    Word16 unvoicing_flag_fx; /* HF BWE - unvoiced flag                          */
-
-    Word16 voicing_flag;    /* HF BWE - voiced flag                            */
-    Word16 voicing_flag_fx; /* HF BWE - voiced flag                            */
-
-    Word16 start_band_old;    /* HF BWE - previous start point for copying frequency band */
-    Word16 start_band_old_fx; /* HF BWE - previous start point for copying frequency band */
-    Word32 OptCrit_old_fx;    /* HF BWE - previous criterion value for deciding the start point */
+    Word16 unvoicing_fx;        /* HF BWE - unvoiced parameter                     */
+    Word16 unvoicing_sm_fx;     /* HF BWE - smoothed unvoiced parameter            */
+    Word16 unvoicing_flag_fx;   /* HF BWE - unvoiced flag                          */
+    Word16 voicing_flag_fx;     /* HF BWE - voiced flag                            */
+    Word16 start_band_old_fx;   /* HF BWE - previous start point for copying frequency band */
+    Word32 OptCrit_old_fx;      /* HF BWE - previous criterion value for deciding the start point */
 
     /* Improvement of unvoiced and audio signals in AMR-WB IO mode */
-    Word16 UV_cnt;       /* number of consecutives frames classified as UV */
-    Word16 UV_cnt_fx;    /* number of consecutives frames classified as UV */
-    Word16 LT_UV_cnt_fx; /* long-term consecutives frames classified as UV */
-
-    Word16 Last_ener_fx; /* last_energy frame                              */
-
+    Word16 UV_cnt_fx;               /* number of consecutives frames classified as UV */
+    Word16 LT_UV_cnt_fx;            /* long-term consecutives frames classified as UV */
+    Word16 Last_ener_fx;            /* last_energy frame                              */
     Word16 lt_diff_etot_fx[MAX_LT]; /* stability estimation - long-term total energy variation */
-
-    Word16 old_Aq_fx[68]; /* old LPC filter coefficient                     */
-
-    Word16 lt_voice_fac_fx; /* average voice factor over 4 sub-frames         */
-
+    Word16 old_Aq_fx[68];           /* old LPC filter coefficient                     */
+    Word16 lt_voice_fac_fx;         /* average voice factor over 4 sub-frames         */
 
 } AMRWB_IO_DEC_DATA, *AMRWB_IO_DEC_HANDLE;
 
-struct dispMem_fx
-{
-    Word16 prev_state;       /*Q0 */
-    Word32 prev_gain_code;   /*Q16 */
-    Word16 prev_gain_pit[6]; /*Q14 */
-};
 
 /*----------------------------------------------------------------------------------*
  *
@@ -1278,115 +1013,74 @@ typedef struct Decoder_State
      * Common parameters
      *----------------------------------------------------------------------------------*/
 
-    Word16 idchan;          /* channel ID (audio channel number) */
-    Word16 element_mode;    /* element mode */
+    Word16 idchan;       /* channel ID (audio channel number) */
+    Word16 element_mode; /* element mode */
+#ifdef DEBUGGING
+    Word16 id_element; /* element ID */
+#endif
     Word32 element_brate;   /* element bitrate */
     Word16 codec_mode;      /* Mode 1 or 2 */
     Word16 mdct_sw_enable;  /* MDCT switching enable flag */
     Word16 mdct_sw;         /* MDCT switching indicator */
     Word16 last_codec_mode; /* last used codec mode */
 
-    UWord16 *bit_stream; /* pointer to bitstream buffer */
-
-    Word16 next_bit_pos; /* position of the next bit to be read from the bitstream */
-
-    Word16 bitstreamformat;    /* Bitstream format flag (G.192/MIME/VOIP_G192_RTP/VOIP_RTPDUMP) */
-    Word16 sdp_hf_only;        /* RTP payload format parameter: only Header-Full format without zero padding for size collision avoidance */
-    Word16 amrwb_rfc4867_flag; /* MIME from rfc4867 is used */
-    Word16 total_num_bits;     /* == st->total_brate / 50 */
-
-    Word16 BER_detect; /* flag to signal detected bit error in the bitstream */
-
-    Word32 output_Fs; /* output sampling rate */
-
-    Word16 output_frame_fx; /* Output frame length Q0*/
-
-    Word32 total_brate; /* total bitrate in kbps of the codec */
-
-    Word32 last_total_brate; /* last total bitrate in kbps of the codec */
-                             // Word32 last_total_brate_fx;                         /* last total bitrate in kbps of the codec Q0*/
-
-    Word32 last_total_brate_ber; /* last total bitrate in kbps of the codec - used only when first frame is lost and BER is detected afterwards */
-
-    Word16 bits_frame_nominal;      /* avg bits per frame on active frame */
-    Word32 last_bits_frame_nominal; /* last avg bits per frame on active frame */
-    Word16 flag_ACELP16k;           /* flag indicating use of ACELP core at 16kHz internal sampling rate */
-    Word16 bits_frame_channel;      /* bits frame channel */
-    Word16 side_bits_frame_channel; /* bits frame channel */
-
-    Word16 core; /* core (ACELP_CORE, TCX_20_CORE, TCX_10_CORE, HQ_CORE, AMR_WB_CORE) */
-
-    Word16 coder_type;        /* coder type */
-    Word16 transform_type[2]; /* TCX20/10/5 mode in each subframe */
-
-    Word32 core_brate; /* core bitrate */
-
-    Word32 last_core_brate; /* previous frame core bitrate */
-
-    Word16 extl; /* extension layer */
-
-    Word16 extl_orig; /* extension layer */
-
-    Word16 last_extl; /* previous extension layer */
-
-    Word32 extl_brate; /* extension layer bitrate */
-
-    Word32 extl_brate_orig; /* extension layer bitrate */
-
-    Word16 L_frame; /* ACELP core internal frame length */
-
-    Word16 bwidth; /* encoded signal bandwidth */
-
-    Word16 Opt_AMR_WB; /* flag indicating AMR-WB IO mode */
-
-    Word16 Opt_VOIP_fx; /* flag indicating VOIP mode with JBM */
-
-    Word16 ini_frame; /* initialization frames counter */
-
+    UWord16 *bit_stream;             /* pointer to bitstream buffer */
+    Word16 next_bit_pos;             /* position of the next bit to be read from the bitstream */
+    Word16 bitstreamformat;          /* Bitstream format flag (G.192/MIME/VOIP_G192_RTP/VOIP_RTPDUMP) */
+    Word16 sdp_hf_only;              /* RTP payload format parameter: only Header-Full format without zero padding for size collision avoidance */
+    Word16 amrwb_rfc4867_flag;       /* MIME from rfc4867 is used */
+    Word16 total_num_bits;           /* == st->total_brate / 50 */
+    Word16 BER_detect;               /* flag to signal detected bit error in the bitstream */
+    Word32 output_Fs;                /* output sampling rate */
+    Word16 output_frame_fx;          /* Output frame length Q0*/
+    Word32 total_brate;              /* total bitrate in kbps of the codec */
+    Word32 last_total_brate;         /* last total bitrate in kbps of the codec */
+    Word32 last_total_brate_ber;     /* last total bitrate in kbps of the codec - used only when first frame is lost and BER is detected afterwards */
+    Word16 bits_frame_nominal;       /* avg bits per frame on active frame */
+    Word32 last_bits_frame_nominal;  /* last avg bits per frame on active frame */
+    Word16 flag_ACELP16k;            /* flag indicating use of ACELP core at 16kHz internal sampling rate */
+    Word16 bits_frame_channel;       /* bits frame channel */
+    Word16 side_bits_frame_channel;  /* bits frame channel */
+    Word16 core;                     /* core (ACELP_CORE, TCX_20_CORE, TCX_10_CORE, HQ_CORE, AMR_WB_CORE) */
+    Word16 coder_type;               /* coder type */
+    Word16 transform_type[2];        /* TCX20/10/5 mode in each subframe */
+    Word32 core_brate;               /* core bitrate */
+    Word32 last_core_brate;          /* previous frame core bitrate */
+    Word16 extl;                     /* extension layer */
+    Word16 extl_orig;                /* extension layer */
+    Word16 last_extl;                /* previous extension layer */
+    Word32 extl_brate;               /* extension layer bitrate */
+    Word32 extl_brate_orig;          /* extension layer bitrate */
+    Word16 L_frame;                  /* ACELP core internal frame length */
+    Word16 bwidth;                   /* encoded signal bandwidth */
+    Word16 Opt_AMR_WB;               /* flag indicating AMR-WB IO mode */
+    Word16 Opt_VOIP_fx;              /* flag indicating VOIP mode with JBM */
+    Word16 ini_frame;                /* initialization frames counter */
     Word16 prev_coder_type;          /* coding type of last frame */
     Word16 low_rate_mode;            /* low-rate mode flag */
     Word16 last_low_rate_mode;       /* previous frame low-rate mode flag */
     Word16 inactive_coder_type_flag; /* inactive coder type flag (0 = AVQ / 1 = GSC) */
 
-    Word16 CNG_fx;            /* RXDTX handler: CNG=1, nonCNG=0 */
-    Word16 prev_ft_speech_fx; /* RXDTX handler:  previous frametype flag for  G.192 format AMRWB SID_FIRST detection */
-
-
-    // note_ : produces failures if added below their float parts
-    Word16 old_exc_fx[L_EXC_MEM_DEC]; /* old excitation Q_exc*/
-    Word16 lsf_old_fx[M];             /* old LSF vector at the end of the frame Q2.56*/
-    Word16 lsp_old_fx[M];             /* old LSP vector at the end of the frame Q15*/
-
     /*----------------------------------------------------------------------------------*
      * ACELP core parameters
      *----------------------------------------------------------------------------------*/
 
-
-    Word16 tilt_code_fx; /* tilt of code Q15*/
-
-
-    Word16 mem_syn1_fx[M]; /* synthesis filter memory (for core switching and FD BWE) */
-    Word16 mem_syn2_fx[M]; /* synthesis filter memory Q_syn*/
+    Word16 old_exc_fx[L_EXC_MEM_DEC]; /* old excitation Q_exc*/
+    Word16 lsf_old_fx[M];             /* old LSF vector at the end of the frame Q2.56*/
+    Word16 lsp_old_fx[M];             /* old LSP vector at the end of the frame Q15*/
+    Word16 tilt_code_fx;              /* tilt of code Q15*/
+    Word16 mem_syn1_fx[M];            /* synthesis filter memory (for core switching and FD BWE) */
+    Word16 mem_syn2_fx[M];            /* synthesis filter memory Q_syn*/
     Word16 mem_syn3_fx[M];
-
-    Word16 mem_deemph_fx; /* deemphasis filter memory Q_syn*/
-
-    Word16 mem_AR_fx[M]; /* AR memory of LSF quantizer (past quantized LSFs without mean)(Qx2.56) */
-
-    Word16 mem_MA_fx[M]; /* MA memory of LSF quantizer (past quantized residual)(Qx2.56)*/
-
-    Word16 stab_fac_fx; /* LSF stability factor Q15*/
-
+    Word16 mem_deemph_fx;      /* deemphasis filter memory Q_syn*/
+    Word16 mem_AR_fx[M];       /* AR memory of LSF quantizer (past quantized LSFs without mean)(Qx2.56) */
+    Word16 mem_MA_fx[M];       /* MA memory of LSF quantizer (past quantized residual)(Qx2.56)*/
+    Word16 stab_fac_fx;        /* LSF stability factor Q15*/
     Word16 stab_fac_smooth_fx; /* low-pass filtered stability factor Q15*/
-
-    Word16 last_coder_type; /* previous coder type */
-
-    Word16 agc_mem_fx[2]; /* memory of AGC for saturation control Q0*/
-
+    Word16 last_coder_type;    /* previous coder type */
+    Word16 agc_mem_fx[2];      /* memory of AGC for saturation control Q0*/
     Word16 mid_lsf_int;
-
     Word16 safety_net;
-
     Word32 log_energy_diff_lt_fx; /*In range of word16*/ /*Q-15*/
     Word16 stab_fac_smooth_lt_fx; /*In range of word16*/ /*Q-15*/
     Word32 log_energy_old_fx;
@@ -1399,145 +1093,88 @@ typedef struct Decoder_State
     Word16 no_scales_p_fx[MAX_NO_MODES_p][2];                         /* LSF LVQ structure Q0*/
     Word32 L_mem_hp_out_fx[5];                                        /* hp filter memory for synthesis */
 
-
-    Word16 GSC_noisy_speech; /* AC mode (GSC) - flag to indicate GSC on SWB noisy speech */
-
-    Word16 GSC_IVAS_mode; /* AC mode (GSC) - GSC IVAS mode */
-
+    Word16 GSC_noisy_speech;           /* AC mode (GSC) - flag to indicate GSC on SWB noisy speech */
+    Word16 GSC_IVAS_mode;              /* AC mode (GSC) - GSC IVAS mode */
     Word16 Last_GSC_noisy_speech_flag; /* AC mode (GSC) - mem of the past flag to indicate GSC osn SWB noisy speech */
-
     GSC_DEC_HANDLE hGSCDec;
 
-
-    Word32 gc_threshold_fx; /* Noise enhancer - threshold for gain_code Q16*/
-
+    Word32 gc_threshold_fx;  /* Noise enhancer - threshold for gain_code Q16*/
     struct dispMem_fx dm_fx; /* Noise enhancer - phase dispersion algorithm memory */
 
     ZERO_BWE_DEC_HANDLE hBWE_zero; /* HF (6-7kHz) BWE */
 
-    Word16 unv_cnt; /* Stationary noise UV modification - unvoiced frame counter */
-
-    Word16 uv_count; /* Stationary noise UV modification - unvoiced counter */
-
-    Word16 act_count; /* Stationary noise UV modification - activation counter */
-
-    Word32 ge_sm_fx; /* Stationary noise UV modification - smoothed excitation gain Q(GE_SHIFT)*/
-
-    Word16 lspold_s_fx[M]; /* Stationary noise UV modification - old LSP vector Q15*/
-
-    Word16 noimix_seed; /* Stationary noise UV modification - mixture seed */
-
-    Word16 min_alpha_fx; /* Stationary noise UV modification - minimum alpha Q15*/
-
-    Word16 Q_stat_noise; /* Q of  Exc_pe                         */
-
-    Word16 exc_pe_fx; /* Stationary noise UV modification - scale (Q_stat_noise) */
-
+    Word16 unv_cnt;         /* Stationary noise UV modification - unvoiced frame counter */
+    Word16 uv_count;        /* Stationary noise UV modification - unvoiced counter */
+    Word16 act_count;       /* Stationary noise UV modification - activation counter */
+    Word32 ge_sm_fx;        /* Stationary noise UV modification - smoothed excitation gain Q(GE_SHIFT)*/
+    Word16 lspold_s_fx[M];  /* Stationary noise UV modification - old LSP vector Q15*/
+    Word16 noimix_seed;     /* Stationary noise UV modification - mixture seed */
+    Word16 min_alpha_fx;    /* Stationary noise UV modification - minimum alpha Q15*/
+    Word16 Q_stat_noise;    /* Q of  Exc_pe                         */
+    Word16 exc_pe_fx;       /* Stationary noise UV modification - scale (Q_stat_noise) */
     Word16 Q_stat_noise_ge; /* Q of  ge_sm_fx                        */
 
-
-    Word16 bfi; /* FEC - bad frame indicator */
-
-    Word16 prev_bfi; /* FEC - previous bad frame indicator */
-
-    Word16 prev_old_bfi; /* FEC - previous old bad frame indicator */
-
-    Word16 seed; /* FEC - seed for random generator for excitation */
-                 // Word16 seed_fx;                                      /* FEC - seed for random generator for excitation Q0*/
-
-
-    Word16 last_good; /* FEC - clas of last good received */
-
-    Word16 lp_gainp_fx; /* FEC - low-pass filtered pitch gain Q14 */
-
-    Word16 lp_gainc_fx; /* FEC - low-pass filtered code gain Q3*/
-
-    Word32 lp_ener_fx; /* FEC - low-pass filtered energy Q6*/
-
-    Word32 enr_old_fx; /* FEC - energy of the concealed frame Q0*/
-
-    Word16 bfi_pitch_fx; /* FEC - pitch for FEC */
-
-    Word16 bfi_pitch_frame; /* FEC - frame length when pitch for FEC is saved */
-
+    Word16 bfi;                                      /* FEC - bad frame indicator */
+    Word16 prev_bfi;                                 /* FEC - previous bad frame indicator */
+    Word16 prev_old_bfi;                             /* FEC - previous old bad frame indicator */
+    Word16 seed;                                     /* FEC - seed for random generator for excitation */
+    Word16 last_good;                                /* FEC - clas of last good received */
+    Word16 lp_gainp_fx;                              /* FEC - low-pass filtered pitch gain Q14 */
+    Word16 lp_gainc_fx;                              /* FEC - low-pass filtered code gain Q3*/
+    Word32 lp_ener_fx;                               /* FEC - low-pass filtered energy Q6*/
+    Word32 enr_old_fx;                               /* FEC - energy of the concealed frame Q0*/
+    Word16 bfi_pitch_fx;                             /* FEC - pitch for FEC */
+    Word16 bfi_pitch_frame;                          /* FEC - frame length when pitch for FEC is saved */
     Word16 old_pitch_buf_16_fx[2 * NB_SUBFR16k + 2]; /* FEC - buffer of old subframe pitch values Q6 */
     Word32 old_pitch_buf_fx[2 * NB_SUBFR16k + 2];    /* FEC - buffer of old subframe pitch values 15Q16 */
-
-    Word16 upd_cnt; /* FEC - counter of frames since last update */
-
-    Word16 scaling_flag; /* FEC - flag to indicate energy control of syn  */
-
-    Word32 lp_ener_FEC_av; /* FEC - averaged voiced signal energy Q0          */
-
-    Word32 lp_ener_FEC_max; /* FEC - averaged voiced signal energy Q0          */
-
-    Word16 old_enr_LP; /* FEC - LP filter gain Q5*/
-
-    Word16 prev_nbLostCmpt; /* FEC - compt for number of consecutive lost frame at the previous frame*/
-    Word16 mode_lvq;        /* FEC - index for LSF mean vector*/
-
-
-    Word16 lsfoldbfi0_fx[M]; /* FEC - LSF vector of the previous frame (Qx2.56)*/
-
-    Word16 lsfoldbfi1_fx[M]; /* FEC - LSF vector of the past previous frame (Qx2.56) */
-
-    Word16 lsf_adaptive_mean_fx[M]; /* FEC - adaptive mean LSF vector for FEC (Qx2.56)*/
-
-    Word16 decision_hyst; /* FEC - hysteresis of the music/speech decision */
-
-    Word16 lp_ener_FER_fx; /* FEC - long-term active-signal average energy Q8*/
-
-
+    Word16 upd_cnt;                                  /* FEC - counter of frames since last update */
+    Word16 scaling_flag;                             /* FEC - flag to indicate energy control of syn  */
+    Word32 lp_ener_FEC_av;                           /* FEC - averaged voiced signal energy Q0          */
+    Word32 lp_ener_FEC_max;                          /* FEC - averaged voiced signal energy Q0          */
+    Word16 old_enr_LP;                               /* FEC - LP filter gain Q5*/
+    Word16 prev_nbLostCmpt;                          /* FEC - compt for number of consecutive lost frame at the previous frame*/
+    Word16 mode_lvq;                                 /* FEC - index for LSF mean vector*/
+    Word16 lsfoldbfi0_fx[M];                         /* FEC - LSF vector of the previous frame (Qx2.56)*/
+    Word16 lsfoldbfi1_fx[M];                         /* FEC - LSF vector of the past previous frame (Qx2.56) */
+    Word16 lsf_adaptive_mean_fx[M];                  /* FEC - adaptive mean LSF vector for FEC (Qx2.56)*/
+    Word16 decision_hyst;                            /* FEC - hysteresis of the music/speech decision */
+    Word16 lp_ener_FER_fx;                           /* FEC - long-term active-signal average energy Q8*/
     WI_DEC_HANDLE hWIDec;
-
     Word16 relax_prev_lsf_interp;
-
     Word16 mem_syn_clas_estim_fx[L_SYN_MEM_CLAS_ESTIM]; /* FEC - memory of the synthesis signal for frame class estimation */
 
-    Word16 bpf_off; /* Bass post-filter - do not use BPF when this flag is set to 1 */
-
+    Word16 bpf_off;      /* Bass post-filter - do not use BPF when this flag is set to 1 */
     BPF_DEC_HANDLE hBPF; /* Bass post-filter handle */
 
-    HANDLE_CLDFB_FILTER_BANK cldfbAna; /* main analysis filter bank handle */
-
-    HANDLE_CLDFB_FILTER_BANK cldfbBPF; /* BPF analysis filter bank handle */
-
-    HANDLE_CLDFB_FILTER_BANK cldfbSyn; /* main synthesis  filter bank handle */
-
+    HANDLE_CLDFB_FILTER_BANK cldfbAna;   /* main analysis filter bank handle */
+    HANDLE_CLDFB_FILTER_BANK cldfbBPF;   /* BPF analysis filter bank handle */
+    HANDLE_CLDFB_FILTER_BANK cldfbSyn;   /* main synthesis  filter bank handle */
     HANDLE_CLDFB_FILTER_BANK cldfbSynHB; /* high band synthesis filter bank needed in SBA2Stereo DTX handling */
 
-
     Word16 last_active_bandsToZero_bwdec;
     Word16 last_flag_filter_NB;
-
     Word16 perc_bwddec; /*Q14*/
-
     Word16 active_frame_cnt_bwddec;
     Word16 flag_buffer[20];
     Word16 total_frame_cnt_bwddec;
-
     Word32 avg_nrg_LT;
-
     Word16 Ng_ener_ST_fx; /* Noise gate - short-term energy Q8*/
 
-    Word16 last_L_frame; /* ACELP@16kHz - last value of st->L_frame */
-
+    Word16 last_L_frame;       /* ACELP@16kHz - last value of st->L_frame */
     Word16 mem_preemp_preQ_fx; /* ACELP@16kHz - prequantizer preemhasis memory */
-
-    Word16 last_nq_preQ; /* ACELP@16kHz - AVQ subquantizer number of the last sub-band of the last subframe  */
-
-    Word16 last_code_preq; /* ACELP@16kHz - last coefficient of the pre-quantizer contribution */
-
-    Word16 use_acelp_preq; /* ACELP@16kHz - flag of prequantizer usage */
-
+    Word16 last_nq_preQ;       /* ACELP@16kHz - AVQ subquantizer number of the last sub-band of the last subframe  */
+    Word16 last_code_preq;     /* ACELP@16kHz - last coefficient of the pre-quantizer contribution */
+    Word16 use_acelp_preq;     /* ACELP@16kHz - flag of prequantizer usage */
 
     /* NB and formant post-filter */
     PFSTAT_HANDLE hPFstat; /* NB and formant post-filter states    */
-
     Word16 psf_lp_noise_fx;
 
-    Word16 last_voice_factor_fx; /* Q6*/
-
+    Word16 last_voice_factor_fx;                                                     /* Q6*/
+    Word16 prev_synth_buffer_fx[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS )]; /*Updated IVAS size is 96*/
+    Word32 prev_synth_buffer32_fx[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS )];
+    Word16 q_prev_synth_buffer_fx;
+    Word16 Qprev_synth_buffer_fx;
 
     Word16 old_bfi_cnt; /* HQ core - # of bfi until previous frame(for FEC)  */
 
@@ -1546,23 +1183,16 @@ typedef struct Decoder_State
      *----------------------------------------------------------------------------------*/
 
     Word16 first_CNG; /* DTX/CNG - first CNG frame flag */
-
-    Word16 cng_type; /* DTX/CNG - flag indicating LP or CLDFB based SID/CNG */
-
-    Word16 last_vad;
-
+    Word16 cng_type;  /* DTX/CNG - flag indicating LP or CLDFB based SID/CNG */
+    Word16 last_vad_fx;
     Word32 last_active_brate; /* DTX/CNG - last active frame bitrate used for CNG_mode control */
+    Word16 last_CNG_L_frame;  /* DTX/CNG - last CNG frame length */
 
-    Word16 last_CNG_L_frame; /* DTX/CNG - last CNG frame length */
-                             // Word16 last_CNG_L_frame_fx;                             /* DTX/CNG - last CNG frame length */
-
-    Word16 CNG_mode; /* DTX/CNG - mode for DTX configuration */
-                     // Word16 CNG_mode_fx;                                     /* DTX/CNG - mode for DTX configuration */
+    Word16 active_cnt;
 
+    Word16 CNG_mode;     /* DTX/CNG - mode for DTX configuration */
     Word16 lspCNG_fx[M]; /* CNG and DTX - LP filtered ISPs Q15*/
 
-    Word16 active_cnt;
-
     TD_CNG_DEC_HANDLE hTdCngDec;
     Word16 masa_sid_format;
 
@@ -1579,20 +1209,12 @@ typedef struct Decoder_State
     SC_VBR_DEC_HANDLE hSC_VBR;
 
     Word16 last_ppp_mode_dec;
-
     Word16 ppp_mode_dec;
-
     Word16 last_nelp_mode_dec;
-
     Word16 nelp_mode_dec;
-
-    Word16 prev_gain_pit_dec_fx; /*Q14*/
-
-
+    Word16 prev_gain_pit_dec_fx;  /*Q14*/
     Word16 prev_tilt_code_dec_fx; /*Q15*/
-
     Word16 vbr_hw_BWE_disable_dec;
-
     Word16 last_vbr_hw_BWE_disable_dec;
 
     /*----------------------------------------------------------------------------------*
@@ -1622,7 +1244,6 @@ typedef struct Decoder_State
      *----------------------------------------------------------------------------------*/
 
     HR_BWE_DEC_HANDLE hBWE_FD_HR;
-    Word16 Qprev_synth_buffer_fx;
 
     /*----------------------------------------------------------------------------------*
      * HQ core parameters
@@ -1631,26 +1252,18 @@ typedef struct Decoder_State
     HQ_DEC_HANDLE hHQ_core;
 
     Word16 last_core;
-
     Word16 last_core_from_bs; /* last frame core as coded in TCX bitstream */
-                              // Word16 last_core_bs_fx;
 
     Word16 last_L_frame_ori;
-
     Word16 previoussynth_fx[L_FRAME48k];
     Word32 previoussynth_fx_32[L_FRAME48k];
-
-
     Word16 old_synth_sw_fx[NS2SA( 48000, FRAME_SIZE_NS - ACELP_LOOK_NS - DELAY_BWE_TOTAL_NS )];
-
     Word16 delay_buf_out_fx[HQ_DELTA_MAX * HQ_DELAY_COMP];   /*Q0*/
     Word32 delay_buf_out32_fx[HQ_DELTA_MAX * HQ_DELAY_COMP]; /*Q11*/
 
-
     Word16 old_Aq_12_8_fx[M + 1];    /* Q12 old Aq[] for core switching */
     Word32 old_Aq_12_8_fx_32[M + 1]; /* Q28 old Aq[] for core switching */
-
-    Word16 old_Es_pred_fx; /* old Es_pred for core switching */
+    Word16 old_Es_pred_fx;           /* old Es_pred for core switching */
 
     HQ_NBFEC_HANDLE hHQ_nbfec;
 
@@ -1661,74 +1274,41 @@ typedef struct Decoder_State
     TD_BWE_DEC_HANDLE hBWE_TD;
 
     Word16 old_bwe_delay;
-
     Word16 hb_prev_synth_buffer_fx[NS2SA( 48000, DELAY_BWE_TOTAL_NS )];
 
     /* WB/SWB bandwidth switching */
-    Word16 tilt_wb_fx; // Q11
-
-    Word16 tilt_swb_fx; // Q24
-
+    Word16 tilt_wb_fx;       // Q11
+    Word16 tilt_swb_fx;      // Q24
     Word16 prev_ener_shb_fx; // Q1
-
     Word32 enerLH_fx;
     Word16 enerLH_fx_Q;
-
     Word32 prev_enerLH_fx; // Q1
-
     Word32 enerLL_fx;
     Word16 enerLL_fx_Q;
-
     Word32 prev_enerLL_fx; // Q1
-
     Word16 prev_fractive;
-
     Word16 prev_bws_cnt;
-
     Word16 bws_cnt;
-
     Word16 bws_cnt1;
-
     Word16 attenu_fx;
-
     Word16 last_inner_frame;
-
     Word16 last_bwidth;
-
     Word16 t_audio_q_fx[L_FRAME];
 
-    Word16 interpol_3_2_cng_dec_fx[INTERP_3_2_MEM_LEN];
-
     /*----------------------------------------------------------------------------------*
      * Fixed point only
      *----------------------------------------------------------------------------------*/
+
     Word16 Q_exc;
     Word16 Q_exc_cng;
     Word16 prev_Q_exc;
     Word16 Q_subfr[L_Q_MEM];
 
-    Word16 prev_Q_bwe_syn;
-    Word16 prev_Q_bwe_syn2;
-
-    Word16 prev_Q_bwe_exc_fb;
-    Word16 prev_Qx;
-    Word16 prev_Q_bwe_exc;
-    Word16 prev_Q_synth;
-    Word16 prev_SWB_fenv_fx[SWB_FENV];
-
     Word16 Q_syn;
     Word16 Q_syn2;
     Word16 Q_syn_cng;
     Word16 prev_Q_syn;
-    Word16 prev_frame_pow_exp;
-    Word16 prev_ener_fx_Q;
-    Word16 last_wb_bwe_ener_fx;
-    Word16 prev_fb_ener_adjust_fx;
-
-    Word16 prev_synth_buffer_fx[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS )]; /*Updated IVAS size is 96*/
-    Word16 q_prev_synth_buffer_fx;
-    Word16 GainShape_Delay[NUM_SHB_SUBFR / 2];
-    Word16 prev_lpc_wb_fx[LPC_SHB_ORDER_WB];
+    Word16 prev_Q_bwe_exc;
 
     /*----------------------------------------------------------------------------------*
      * SWB BWE structure
@@ -1736,22 +1316,6 @@ typedef struct Decoder_State
 
     FD_BWE_DEC_HANDLE hBWE_FD;
 
-    /*----------------------------------------------------------------------------------*
-     * SWB DTX/CNG parameters
-     *----------------------------------------------------------------------------------*/
-
-    Word16 shb_cng_ener_fx;
-    Word16 wb_cng_ener_fx;
-    Word16 last_wb_cng_ener_fx;
-    Word16 last_shb_cng_ener_fx;
-    Word16 swb_cng_seed;
-    Word16 lsp_shb_prev_prev_fx[LPC_SHB_ORDER];
-    Word16 lsp_shb_prev_fx[LPC_SHB_ORDER];
-    Word16 shb_dtx_count_fx;
-    Word16 last_vad_fx;
-    Word16 trans_cnt_fx;
-    Word16 last_shb_ener_fx;
-
     /*----------------------------------------------------------------------------------*
      * LD music post-filter
      *----------------------------------------------------------------------------------*/
@@ -1761,6 +1325,7 @@ typedef struct Decoder_State
     /*----------------------------------------------------------------------------------*
      * TCX LTP decoder handle
      *----------------------------------------------------------------------------------*/
+
     TCX_LTP_DEC_HANDLE hTcxLtpDec;
 
     /*----------------------------------------------------------------------------------*
@@ -1769,6 +1334,7 @@ typedef struct Decoder_State
 
     TCX_DEC_HANDLE hTcxDec;
 
+    /* in floating point implementation, different buffers are used: lp_error_ener <-> pst_lp_ener, mem_error <-> pst_mem_deemp_err */
     Word32 lp_error_ener;
     Word32 mem_error;
 
@@ -1797,43 +1363,25 @@ typedef struct Decoder_State
     Word16 L_frame_past;
     Word16 L_frameTCX_past;
 
-    Word16 lsfold_uw[M]; /* old lsf (unweighted) */
-
-    Word16 lspold_uw[M]; /* old lsp (unweighted) */
-
-    Word16 seed_tcx_plc; /* seed memory (for random function in TCX PLC) */
-
-
+    Word16 lsfold_uw[M];                                                   /* old lsf (unweighted) */
+    Word16 lspold_uw[M];                                                   /* old lsp (unweighted) */
+    Word16 seed_tcx_plc;                                                   /* seed memory (for random function in TCX PLC) */
     Word16 past_gpit;                                                      /* past gain of pitch (for frame recovery) */
     Word32 past_gcode; /* past energy (!) of code  (for frame recovery) */ /*15Q16*/
-
-    Word16 lsf_cng[M]; /* xSF coefficients used for CNG generation (long term) */
-
-    Word16 lspold_cng[M]; /* xSP coefficients used for CNG generation (long term) */
-
-    Word16 lsp_q_cng[M]; /* xSP coefficients used for CNG generation (short term interpolated) */
-
-    Word16 old_lsp_q_cng[M]; /* xSP coefficients used for CNG generation (short term interpolated) */
-
-    Word16 lsf_q_cng[M]; /* xSF coefficients used for CNG generation (short term interpolated) */
-
-    Word16 old_lsf_q_cng[M]; /* xSF: old quantized lsfs for background noise */
-
-    Word16 Aq_cng[( NB_SUBFR16k + 1 ) * ( M + 1 )]; /* LPC coefficients derived from CNG estimate  */
-
-    Word16 mem_syn_unv_back[M]; /* filter memory for unvoiced synth */
-
-    Word16 plcBackgroundNoiseUpdated; /* flag: Is background noise estimate updated? */
-
-    Word16 last_gain_syn_deemph; /*Q15*/
-
+    Word16 lsf_cng[M];                                                     /* xSF coefficients used for CNG generation (long term) */
+    Word16 lspold_cng[M];                                                  /* xSP coefficients used for CNG generation (long term) */
+    Word16 lsp_q_cng[M];                                                   /* xSP coefficients used for CNG generation (short term interpolated) */
+    Word16 old_lsp_q_cng[M];                                               /* xSP coefficients used for CNG generation (short term interpolated) */
+    Word16 lsf_q_cng[M];                                                   /* xSF coefficients used for CNG generation (short term interpolated) */
+    Word16 old_lsf_q_cng[M];                                               /* xSF: old quantized lsfs for background noise */
+    Word16 Aq_cng[( NB_SUBFR16k + 1 ) * ( M + 1 )];                        /* LPC coefficients derived from CNG estimate  */
+    Word16 mem_syn_unv_back[M];                                            /* filter memory for unvoiced synth */
+    Word16 plcBackgroundNoiseUpdated;                                      /* flag: Is background noise estimate updated? */
+    Word16 last_gain_syn_deemph;                                           /*Q15*/
     Word16 last_gain_syn_deemph_e;
-
     Word16 last_concealed_gain_syn_deemph; /*Q15*/
-
     Word16 last_concealed_gain_syn_deemph_e;
 
-
     /* variables for framing */
     Word16 nb_subfr;
 
@@ -1851,10 +1399,7 @@ typedef struct Decoder_State
 
     /*Preemphasis factor*/
     Word16 preemph_fac; /*0Q15*/
-
-
     Word16 gamma;
-
     Word16 inv_gamma;
 
     /*for AMR-WB like 6.4 to 7 kHz upsampling and noise filling*/
@@ -1864,34 +1409,22 @@ typedef struct Decoder_State
     Word16 last_core_bfi; /* PLC - mode in previous frame                                 */
     Word16 nbLostCmpt;    /* PLC - compt for number of consecutive lost frame             */
 
-    Word32 old_fpitch; /* last pitch of previous frame  */ /*15Q16*/
-
+    Word32 old_fpitch; /* last pitch of previous frame  */                                  /*15Q16*/
     Word32 old_fpitchFB; /* PLC - last pitch of previous FB frame (depends on output sr) */ /*15Q16*/
-
-    Word16 clas_dec; /* PLC - frame class at the decoder                             */
-
-    Word16 mem_pitch_gain[2 * NB_SUBFR16k + 2]; /* Pitch gain memory     Q14                   */
-
-    Word16 plc_use_future_lag; /* PLC - flag indicating if info (pitch lag / pitch gain) about future frame is usable */
+    Word16 clas_dec;                                                                        /* PLC - frame class at the decoder                             */
+    Word16 mem_pitch_gain[2 * NB_SUBFR16k + 2];                                             /* Pitch gain memory     Q14                   */
+    Word16 plc_use_future_lag;                                                              /* PLC - flag indicating if info (pitch lag / pitch gain) about future frame is usable */
 
     Word32 Mode2_lp_gainc; /* 15Q16  low passed code gain used for concealment*/
     Word32 Mode2_lp_gainp; /* 15Q16 low passed pitch gain used for concealment*/
 
-
     Word16 cummulative_damping; /*Q15*/
-
     Word16 cngTDLevel;
     Word16 cngTDLevel_e;
-
-    Word16 prev_widow_left_rect;
-
     Word16 reset_mem_AR;
-
     Word16 classifier_Q_mem_syn; /*scalingfactor of mem_syn_clas_estim_fx in MODE2 */
-
     Word16 rate_switching_init;
 
-
     /* LPC quantization */
     Word16 lpcQuantization;
     Word16 numlpc;
@@ -1905,8 +1438,6 @@ typedef struct Decoder_State
 
     Word16 last_ctx_hm_enabled;
 
-    struct tonalmdctconceal tonalMDCTconceal;
-
     TonalMDCTConcealPtr hTonalMDCTConc;
     Word16 tonal_mdct_plc_active;
     Word16 last_tns_active;
@@ -1931,7 +1462,6 @@ typedef struct Decoder_State
     Word16 enablePlcWaveadjust;
     Word16 tonality_flag;
     T_PLCInfo_HANDLE hPlcInfo;
-    T_PLCInfo plcInfo;
 
     Word16 VAD;
     Word16 flag_cna;
@@ -1982,6 +1512,7 @@ typedef struct Decoder_State
     Word16 tec_flag;
     Word16 tfa_flag;
     TEC_DEC_HANDLE hTECDec;
+
     /*----------------------------------------------------------------------------------*
      * IVAS parameters
      *----------------------------------------------------------------------------------*/
@@ -1991,21 +1522,11 @@ typedef struct Decoder_State
     Word16 cng_sba_flag;   /* CNG in SBA flag */
 
     /* MCT Channel mode indication: LFE, ignore channel? */
-    // note_ : one extra value in evs ivas macro code
     MCT_CHAN_MODE mct_chan_mode;
 
     Word16 cng_ism_flag;  /* CNG in ISM format flag */
     Word16 is_ism_format; /* Indication whether the codec operates in ISM format */
 
-    Word16 last_element_mode; /* element mode */
-                              // Word16  coder_type;           /* low-rate mode flag */
-    Word32 prev_synth_buffer32_fx[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_CLDFB_NS )];
-
-#ifdef DEBUGGING
-    Word16 id_element; /* element ID */
-#endif
-    IVAS_FORMAT ivas_format; /* format; corresponds to st_ivas->ivas_format, unless the signal gets transormed to a different domain for rendering */
-
 } Decoder_State, *DEC_CORE_HANDLE;
 
 #endif
diff --git a/lib_dec/stat_noise_uv_dec.c b/lib_dec/stat_noise_uv_dec.c
deleted file mode 100644
index e748899a9667996f0776eb65127752b66796a660..0000000000000000000000000000000000000000
--- a/lib_dec/stat_noise_uv_dec.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/stat_noise_uv_dec_fx.c b/lib_dec/stat_noise_uv_dec_fx.c
index d2fa36b9b17a86f29e402983d364f6a9db1e6dd5..c87e30ffec5f0f1cd5c6cb17b5562769100885bd 100644
--- a/lib_dec/stat_noise_uv_dec_fx.c
+++ b/lib_dec/stat_noise_uv_dec_fx.c
@@ -76,10 +76,20 @@ void stat_noise_uv_dec_fx(
 
     IF( !st_fx->Opt_AMR_WB )
     {
-        stat_noise_uv_mod_fx( coder_type, noisiness, st_fx->lsp_old_fx, lsp_new, lsp_mid, Aq, exc2, st_fx->Q_exc, 0, &st_fx->ge_sm_fx, &st_fx->uv_count, &st_fx->act_count,
-                              st_fx->lspold_s_fx, &st_fx->noimix_seed, &st_fx->min_alpha_fx,
-                              &st_fx->exc_pe_fx, st_fx->core_brate, st_fx->bwidth,
-                              &st_fx->Q_stat_noise, &st_fx->Q_stat_noise_ge );
+        IF( st_fx->element_mode > EVS_MONO )
+        {
+            stat_noise_uv_mod_ivas_fx( coder_type, noisiness, st_fx->lsp_old_fx, lsp_new, lsp_mid, Aq, exc2, &st_fx->Q_exc, 0, &st_fx->ge_sm_fx, &st_fx->uv_count, &st_fx->act_count,
+                                       st_fx->lspold_s_fx, &st_fx->noimix_seed, &st_fx->min_alpha_fx,
+                                       &st_fx->exc_pe_fx, st_fx->core_brate, st_fx->bwidth,
+                                       &st_fx->Q_stat_noise, &st_fx->Q_stat_noise_ge );
+        }
+        ELSE
+        {
+            stat_noise_uv_mod_fx( coder_type, noisiness, st_fx->lsp_old_fx, lsp_new, lsp_mid, Aq, exc2, st_fx->Q_exc, 0, &st_fx->ge_sm_fx, &st_fx->uv_count, &st_fx->act_count,
+                                  st_fx->lspold_s_fx, &st_fx->noimix_seed, &st_fx->min_alpha_fx,
+                                  &st_fx->exc_pe_fx, st_fx->core_brate, st_fx->bwidth,
+                                  &st_fx->Q_stat_noise, &st_fx->Q_stat_noise_ge );
+        }
     }
 
 
diff --git a/lib_dec/swb_bwe_dec.c b/lib_dec/swb_bwe_dec.c
deleted file mode 100644
index 0f9863bdfc2bc874bbb7f9618a01d84365d71819..0000000000000000000000000000000000000000
--- a/lib_dec/swb_bwe_dec.c
+++ /dev/null
@@ -1,681 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "rom_com.h"
-#include "basop_util.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-
-
-static Word16 para_pred_bws_fx(
-    Decoder_State *st_fx, /* i/o: decoder state structure               */
-    Word16 *signal_wb_fx, /* i  : wideband frequency signal       Q_syn */
-    Word16 *SWB_fenv_fx,  /* o  : frequency-domain BWE envelope   Q1    */
-    Word16 Q_syn )
-{
-    Word16 i, j, k;
-    Word16 mode;
-    Word16 tmp, tmp_den, tmp_num;
-    Word32 L_tmp, L_tmp_max;
-    Word16 exp;
-    Word16 *input_hi_fx;
-    Word32 *mea;
-    Word16 peak_fx, mag_fx;
-    Word32 mean_fx[7], peak_32_fx;
-    Word32 avrg1_fx, avrg2_fx, min_fx;
-    Word16 att_fx;
-    Word16 coder_type = st_fx->coder_type;
-    move16();
-
-    mode = NORMAL;
-    move16();
-
-    k = 0;
-    move16();
-    input_hi_fx = &signal_wb_fx[SHARP_WIDTH]; /*Q_syn*/
-    FOR( i = 0; i < 7; i++ )
-    {
-        peak_fx = 0;
-        move16();
-        mean_fx[i] = 0;
-        move16();
-        FOR( j = 0; j < SHARP_WIDTH; j++ )
-        {
-            mag_fx = abs_s( *input_hi_fx );                          /*Q_syn*/
-            peak_fx = s_max( peak_fx, mag_fx );                      /*Q_syn*/
-            mean_fx[i] = L_add( mean_fx[i], L_deposit_l( mag_fx ) ); /*Q_syn*/
-            move32();
-            input_hi_fx++;
-        }
-
-        IF( LT_16( Q_syn, 11 ) )
-        {
-            tmp = 1;
-            move16();
-        }
-        ELSE
-        {
-            tmp = 0;
-            move16();
-            if ( GT_16( shr( peak_fx, 3 ), shl( 1, Q_syn ) ) )
-            {
-                tmp = 1;
-                move16();
-            }
-        }
-        IF( tmp > 0 )
-        {
-            L_tmp = L_msu0( Mult_32_16( L_shl( mean_fx[i], 10 ) /*Q_syn + 10*/, 18432 /*4.5f Q12*/ ), peak_fx /*Q_syn*/, 4544 /*35.5 (SHARP_WIDTH + 3.5f)Q7*/ );
-            if ( L_tmp < 0 )
-            {
-                k = add( k, 1 );
-            }
-        }
-    }
-
-    avrg1_fx = L_deposit_l( 0 );
-    avrg2_fx = L_deposit_l( 0 );
-    FOR( i = 1; i < 4; i++ )
-    {
-        avrg1_fx = L_add( avrg1_fx, mean_fx[i] );     /*Q_syn*/
-        avrg2_fx = L_add( avrg2_fx, mean_fx[i + 3] ); /*Q_syn*/
-    }
-    avrg1_fx = Mult_32_16( avrg1_fx, 10923 /* 1/3 -> Q15 -> 10923 */ ); /*Q_syn + Q15 - 15*/
-    avrg2_fx = Mult_32_16( avrg2_fx, 10923 /* 1/3 -> Q15 -> 10923 */ ); /*Q_syn + Q15 - 15*/
-
-    min_fx = L_add( 2147483647, 0 ); /*2^31 */
-    peak_32_fx = L_deposit_l( 0 );
-    FOR( i = 4; i < 7; i++ )
-    {
-        IF( GT_32( mean_fx[i], L_shl( avrg2_fx, 1 ) ) )
-        {
-            exp = norm_l( mean_fx[i] );
-            IF( LT_16( exp, 16 ) )
-            {
-                tmp_den = extract_l( L_shr( mean_fx[i], sub( 16, exp ) ) ); /*Qsyn - 16 + exp */
-                tmp_num = extract_l( L_shr( avrg2_fx, sub( 15, exp ) ) );   /*Qsyn - 16 + exp */
-            }
-            ELSE
-            {
-                tmp_den = extract_l( mean_fx[i] );
-                tmp_num = extract_l( L_shl( avrg2_fx, 1 ) );
-            }
-
-            tmp_den = div_s( 1, tmp_den );
-
-            tmp = i_mult( tmp_num, tmp_den ); /*Q15 */
-
-            mean_fx[i] = Mult_32_16( mean_fx[i], tmp ); /*Q_syn + Q15 - 15*/
-            move32();
-        }
-        min_fx = L_min( min_fx, mean_fx[i] );
-        peak_32_fx = L_max( peak_32_fx, mean_fx[i] );
-    }
-
-    IF( GT_16( st_fx->tilt_wb_fx, 16384 /*8 in Q11*/ ) )
-    {
-        IF( GT_16( st_fx->tilt_wb_fx, 30720 /*15.0f in Q11*/ ) )
-        {
-            min_fx = peak_32_fx;
-            move32();
-        }
-        ELSE
-        {
-            tmp = extract_l( L_shr( L_mult0( st_fx->tilt_wb_fx, 17476 ), 14 ) ); /*Q15 */
-            min_fx = Mult_32_16( peak_32_fx, tmp );
-        }
-    }
-
-    test();
-    IF( peak_32_fx == 0 || min_fx == 0 )
-    {
-        set16_fx( SWB_fenv_fx, 0, SWB_FENV );
-    }
-    ELSE
-    {
-        exp = norm_l( peak_32_fx );
-        IF( LT_16( exp, 16 ) )
-        {
-            tmp_den = extract_l( L_shr( peak_32_fx, sub( 16, exp ) ) ); /*Qsyn - 16 + exp */
-            tmp = div_s( 16384, tmp_den );                              /*Q15+14 - (Qsyn - 16 + exp) */
-            tmp_num = extract_l( L_shr( min_fx, sub( 16, exp ) ) );     /*Qsyn - 16 + exp  */
-            tmp = extract_l( L_shr( L_mult0( tmp_num, tmp ), 14 ) );    /*Q15 */
-        }
-        ELSE
-        {
-            tmp_den = extract_l( peak_32_fx ); /*Qsyn  */
-            exp = norm_s( tmp_den );
-            tmp = div_s( shl( 1, sub( 14, exp ) ), tmp_den );                    /*Q 29-exp - Qsyn */
-            tmp_num = extract_l( min_fx );                                       /*Qsyn  */
-            tmp = extract_l( L_shr( L_mult0( tmp_num, tmp ), sub( 14, exp ) ) ); /*Q15 */
-        }
-
-        j = 0;
-        move16();
-        mea = &mean_fx[4];
-        L_tmp_max = L_shl( 32767, add( Q_syn, 5 ) );
-        FOR( i = 0; i < SWB_FENV; i++ )
-        {
-            if ( EQ_16( j, 5 ) )
-            {
-                mea++;
-                j = 0;
-                move16();
-            }
-            j = add( j, 1 );
-            L_tmp = L_min( Mult_32_16( *mea, tmp ), L_tmp_max );
-            SWB_fenv_fx[i] = extract_l( L_shr( L_tmp, add( Q_syn, 5 ) ) );
-            move16();
-        }
-    }
-
-    j = 0;
-    move16();
-    FOR( i = SWB_FENV / 2; i < SWB_FENV; i++ )
-    {
-        tmp = sub( 32767, i_mult( j, 2341 ) );
-        SWB_fenv_fx[i] = mult_r( SWB_fenv_fx[i], tmp );
-        move16();
-        j = add( j, 1 );
-    }
-
-    IF( GT_32( avrg1_fx, L_shl( avrg2_fx, 3 ) ) )
-    {
-        FOR( i = 0; i < SWB_FENV; i++ )
-        {
-            SWB_fenv_fx[i] = shr( SWB_fenv_fx[i], 1 );
-            move16();
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( NE_16( st_fx->last_core, HQ_CORE ) && EQ_16( st_fx->last_codec_mode, MODE1 ) &&
-        ( GT_32( st_fx->enerLH_fx, L_shr( st_fx->prev_enerLH_fx, 1 ) ) && LT_32( L_shr( st_fx->enerLH_fx, 1 ), st_fx->prev_enerLH_fx ) ) &&
-        ( GT_32( st_fx->enerLL_fx, L_shr( st_fx->prev_enerLL_fx, 1 ) ) && LT_32( L_shr( st_fx->enerLL_fx, 1 ), st_fx->prev_enerLL_fx ) ) )
-    {
-        FOR( i = 0; i < SWB_FENV; i++ )
-        {
-            test();
-            IF( NE_16( st_fx->prev_coder_type, coder_type ) && GT_16( mult_r( SWB_fenv_fx[i], 16384 /*1/2.0f in Q15*/ ), st_fx->prev_SWB_fenv_fx[i] ) )
-            {
-                SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], 3277 /*0.1f in Q15*/ ), st_fx->prev_SWB_fenv_fx[i], 29491 /*0.9f in Q15*/ ) );
-                move16();
-            }
-            ELSE
-            {
-                SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], st_fx->attenu_fx ), st_fx->prev_SWB_fenv_fx[i], sub( 32767 /*1.0f in Q15*/, st_fx->attenu_fx ) ) );
-                move16();
-            }
-        }
-
-        IF( LT_16( st_fx->attenu_fx, 29491 /*0.9f in Q15*/ ) )
-        {
-            st_fx->attenu_fx = add( st_fx->attenu_fx, 1638 /*0.05f in Q15*/ );
-            move16();
-        }
-    }
-    ELSE
-    {
-        test();
-        test();
-        test();
-        test();
-        IF( NE_32( st_fx->core_brate, st_fx->last_core_brate ) || ( GT_32( st_fx->enerLH_fx, L_shr( st_fx->prev_enerLH_fx, 1 ) ) && LT_32( L_shr( st_fx->enerLH_fx, 1 ), st_fx->prev_enerLH_fx ) ) ||
-            ( GT_32( st_fx->enerLL_fx, L_shr( st_fx->prev_enerLL_fx, 1 ) ) && LT_32( L_shr( st_fx->enerLL_fx, 1 ), st_fx->prev_enerLL_fx ) ) )
-        {
-            FOR( i = 0; i < SWB_FENV; i++ )
-            {
-                if ( GT_16( mult_r( SWB_fenv_fx[i], 16384 /*0.5f in Q15*/ ), st_fx->prev_SWB_fenv_fx[i] ) )
-                {
-                    SWB_fenv_fx[i] = st_fx->prev_SWB_fenv_fx[i];
-                    move16();
-                }
-            }
-        }
-
-        FOR( i = 0; i < SWB_FENV; i++ )
-        {
-            SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], 29491 /*0.9f in Q15*/ ), st_fx->prev_SWB_fenv_fx[i], 3277 /*0.1f in Q15*/ ) );
-            move16();
-        }
-        st_fx->attenu_fx = 3277; /*Q15*/
-        move16();
-    }
-
-    if ( GT_16( k, 3 ) )
-    {
-        mode = HARMONIC;
-        move16();
-    }
-
-
-    att_fx = i_mult( sub( N_WS2N_FRAMES, st_fx->bws_cnt ), 819 ); /*15 */
-    IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-    {
-        FOR( i = 0; i < 4; i++ )
-        {
-            SWB_fenv_fx[i] = mult_r( SWB_fenv_fx[i], att_fx );
-            move16(); /*Q1 */
-        }
-    }
-
-    FOR( i = 4; i < SWB_FENV; i++ )
-    {
-        SWB_fenv_fx[i] = mult_r( SWB_fenv_fx[i], att_fx );
-        move16(); /*Q1 */
-    }
-
-    return mode;
-}
-
-
-/*-------------------------------------------------------------------*
- * WB_BWE_gain_deq()
- *
- * Decoding of WB parameters
- *-------------------------------------------------------------------*/
-
-
-Word16 swb_bwe_dec_fx32(
-    Decoder_State *st_fx,     /* i/o: decoder state structure                             */
-    Word32 output_fx[],       /* i  : synthesis @internal Fs                : Q11         */
-    Word32 *synth_fx,         /* i  : ACELP core synthesis/final synthesis  : Q11         */
-    Word32 *hb_synth_fx,      /* o  : SHB synthesis/final synthesis         : Q_syn_hb    */
-    Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo                 */
-    Word16 output_frame       /* i  : frame length                                        */
-)
-{
-    Word16 L;
-    Word16 mode;
-    Word16 idxGain;
-    Word16 i, j, l_subfr;
-    Word16 fb_band_begin;
-    Word16 frica_flag = 0;
-    move16();
-    Word16 ener_adjust_quan_fx;
-    Word16 fb_ener_adjust_fx = 0;
-    move16();
-    Word16 scl, new_input_fx_exp, ysynth_frame_size;
-    Word16 Q_syn, Q_syn_hb, tmp, tmp2, q_tmp, Qsynth_fx16;
-
-    Word16 ysynth_fx[L_FRAME48k];
-    Word16 SWB_fenv_fx[SWB_FENV];
-    Word16 SWB_tenv_fx[SWB_TENV];
-    Word16 synth_fx16[L_FRAME48k];
-    Word16 hb_synth_fx16[L_FRAME48k];
-
-    Word32 L_tmp;
-    Word32 yerror_fx[L_FRAME48k];
-    Word32 ysynth_fx32[L_FRAME48k];
-    Word32 SWB_tenv_tmp_fx[SWB_TENV];
-    Word32 wtda_synth_fx[2 * L_FRAME48k];
-
-    FD_BWE_DEC_HANDLE hBWE_FD;
-    hBWE_FD = st_fx->hBWE_FD;
-
-    /*---------------------------------------------------------------------*
-     * SWB BWE decoding
-     *---------------------------------------------------------------------*/
-    test();
-    IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && !use_cldfb_for_dft )
-    {
-        /* todo - wtda() does not support L_FRAME length; thus temporarily resample the signal */
-        /* todo - delay output[] by 1.25ms ? */
-        L_lerp_fx_q11( output_fx, ysynth_fx32, L_FRAME16k, st_fx->L_frame );
-
-        /* windowing of the ACELP core synthesis */
-        wtda_fx32( ysynth_fx32, wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx32, ALDO_WINDOW, ALDO_WINDOW, /*st_fx->L_frame*/ L_FRAME16k );
-
-        /* DCT of the ACELP core synthesis */
-        new_input_fx_exp = 11;
-        move16();
-        direct_transform_fx( wtda_synth_fx, ysynth_fx32, 0, /*st_fx->L_frame*/ L_FRAME16k, &new_input_fx_exp, st_fx->element_mode );
-        ysynth_frame_size = L_FRAME16k;
-        move16();
-    }
-    ELSE
-    {
-        /* windowing of the ACELP core synthesis */
-        wtda_fx32( synth_fx, wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx32, ALDO_WINDOW, ALDO_WINDOW, output_frame );
-
-        /* DCT of the ACELP core synthesis */
-        new_input_fx_exp = 11;
-        move16();
-        direct_transform_fx( wtda_synth_fx, ysynth_fx32, 0, output_frame, &new_input_fx_exp, st_fx->element_mode );
-        ysynth_frame_size = output_frame;
-        move16();
-    }
-
-    /* Convert to 16 Bits (Calc Shift Required to Stay within MAX_Q_NEW_INPUT) */
-    scl = sub( 16 + 11, new_input_fx_exp );
-    /* Possible to Upscale? */
-    IF( scl > 0 )
-    {
-        /* Yes */
-        /* Calc Room to Upscale */
-        Q_syn = sub( Find_Max_Norm32( ysynth_fx32, ysynth_frame_size ), 3 );
-        /* Stay within MAX_Q_NEW_INPUT */
-        scl = s_min( Q_syn, scl );
-    }
-    /*Don't upscale if already in 15 bits*/
-    IF( GT_16( scl, 15 ) )
-    {
-        FOR( i = 0; i < ysynth_frame_size; i++ )
-        {
-            ysynth_fx[i] = extract_l( ysynth_fx32[i] );
-            move16();
-        }
-        Q_syn = new_input_fx_exp;
-        move16();
-    }
-    ELSE
-    {
-        Copy_Scale_sig32_16( ysynth_fx32, ysynth_fx, ysynth_frame_size, scl );
-        Q_syn = add( sub( new_input_fx_exp, 16 ), scl );
-    }
-
-    IF( !st_fx->bfi )
-    {
-        IF( st_fx->bws_cnt > 0 )
-        {
-            /* estimate parameters */
-            mode = para_pred_bws_fx( st_fx, ysynth_fx, SWB_fenv_fx, Q_syn );
-        }
-        ELSE
-        {
-            /* de-quantization */
-            mode = swb_bwe_gain_deq_fx( st_fx, ACELP_CORE, SWB_tenv_fx, SWB_fenv_fx, 0, -1 );
-        }
-
-        L = SWB_FENV;
-        move16();
-        if ( EQ_16( mode, TRANSIENT ) )
-        {
-            L = SWB_FENV_TRANS;
-            move16();
-        }
-
-        L_tmp = 0;
-        move32();
-        FOR( i = 0; i < L; i++ )
-        {
-            L_tmp = L_add( L_tmp, L_deposit_l( SWB_fenv_fx[i] ) );
-        }
-        q_tmp = norm_s( L );
-        tmp = div_s( shl( 1, sub( 14, q_tmp ) ), L );                          /*Q(29-q_tmp) */
-        L_tmp = Mpy_32_16_1( L_tmp, tmp );                                     /*Q(1+29-q_tmp+1-16)->Q(15-q_tmp) */
-        st_fx->prev_ener_shb_fx = round_fx( L_shl( L_tmp, add( q_tmp, 2 ) ) ); /*Q1 */
-        move16();
-    }
-    ELSE
-    {
-        /* SHB FEC */
-
-        IF( NE_16( hBWE_FD->prev_mode, TRANSIENT ) )
-        {
-            mode = hBWE_FD->prev_mode;
-            move16();
-        }
-        ELSE
-        {
-            mode = NORMAL;
-            move16();
-        }
-
-        Copy( st_fx->prev_SWB_fenv_fx, SWB_fenv_fx, SWB_FENV );
-    }
-
-    /* reconstruction of MDCT spectrum of the error signal */
-    set32_fx( yerror_fx, 0, output_frame );
-
-    IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-    {
-        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
-    }
-    ELSE
-    {
-        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
-    }
-
-    test();
-    IF( EQ_16( hBWE_FD->prev_frica_flag, 1 ) && frica_flag == 0 )
-    {
-        FOR( i = 0; i < L_SUBFR; i++ )
-        {
-            tmp = sub( 32767, extract_l( L_mult0( i, 512 ) ) ); /*Q15 */
-            hBWE_FD->mem_imdct_fx[i] = mult_r( hBWE_FD->mem_imdct_fx[i], tmp );
-            move16();
-        }
-
-        FOR( ; i < output_frame; i++ )
-        {
-            hBWE_FD->mem_imdct_fx[i] = 0;
-            move16();
-        }
-    }
-
-    /* decode information */
-    IF( EQ_16( st_fx->extl, FB_BWE ) )
-    {
-        IF( !st_fx->bfi )
-        {
-            idxGain = (Word16) get_next_indice_fx( st_fx, NUM_BITS_FB_FRAMEGAIN );
-            fb_ener_adjust_fx = usdequant_fx( idxGain, FB_GAIN_QLOW_FX, FB_GAIN_QDELTA_FX ); /*Q15 */
-        }
-        ELSE IF( st_fx->bfi )
-        {
-            fb_ener_adjust_fx = st_fx->prev_fb_ener_adjust_fx;
-            move16();
-        }
-
-        st_fx->prev_fb_ener_adjust_fx = fb_ener_adjust_fx;
-        move16();
-        IF( EQ_16( mode, TRANSIENT ) )
-        {
-            ener_adjust_quan_fx = shr( fb_ener_adjust_fx, 2 );
-        }
-        ELSE
-        {
-            IF( SWB_fenv_fx[7] != 0 )
-            {
-                tmp = div_s( 1, SWB_fenv_fx[7] );
-                ener_adjust_quan_fx = s_min( shr( i_mult_sat( SWB_fenv_fx[13], tmp ), 2 ), 32767 );
-            }
-            ELSE
-            {
-                ener_adjust_quan_fx = 0;
-                move16();
-            }
-        }
-
-        fb_band_begin = FB_BAND_BEGIN;
-        move16();
-        if ( EQ_16( st_fx->L_frame, L_FRAME ) )
-        {
-            fb_band_begin = FB_BAND_BEGIN_12k8;
-            move16();
-        }
-
-        j = 0;
-        move16();
-        FOR( i = fb_band_begin; i < add( fb_band_begin, DE_OFFSET1 ); i++ )
-        {
-            tmp = sub( 32767, i_mult( j, 1024 ) );
-            tmp = mult_r( tmp, ener_adjust_quan_fx ); /*Q13*/
-
-            tmp2 = i_mult( j, 256 );                  /*Q13*/
-            tmp2 = mult_r( tmp2, fb_ener_adjust_fx ); /*Q13*/
-
-            tmp = add( tmp, tmp2 );                                                      /*Q13*/
-            yerror_fx[i] = L_shl( Mpy_32_16_1( yerror_fx[i - FB_BAND_WIDTH], tmp ), 2 ); /*15+Q_syn */
-            move32();
-            j = add( j, 1 );
-        }
-        FOR( ; i < FB_BAND_END; i++ )
-        {
-            yerror_fx[i] = Mpy_32_16_1( yerror_fx[i - FB_BAND_WIDTH], fb_ener_adjust_fx ); /*15+Q_syn */
-            move32();
-        }
-    }
-
-    /* iDCT of the error signal */
-    Q_syn_hb = add( Q_syn, 15 );
-    Inverse_Transform( yerror_fx, &Q_syn_hb, wtda_synth_fx, 0, output_frame, -1, st_fx->element_mode );
-
-    /* inverse windowing of the error signal */
-    window_ola_fx( wtda_synth_fx, hb_synth_fx16, &Q_syn_hb, hBWE_FD->mem_imdct_fx, &hBWE_FD->mem_imdct_exp_fx, output_frame, ALDO_WINDOW, ALDO_WINDOW, 0, 0, 0 );
-    l_subfr = mult( output_frame, 8192 );
-
-    test();
-    IF( EQ_16( mode, TRANSIENT ) )
-    {
-        FOR( i = 0; i < SWB_TENV; i++ )
-        {
-            SWB_tenv_tmp_fx[i] = L_mult0( SWB_tenv_fx[i] /*Q0*/, 26214 /*0.8f Q15*/ ); // Q15
-            move32();
-        }
-
-        /* time envelope shaping when the current frame is TRANSIENT frame */
-        time_envelop_shaping_ivas_fx( hb_synth_fx16, SWB_tenv_tmp_fx, output_frame, &Q_syn_hb );
-
-        Q_syn_hb = sub( Q_syn_hb, 3 );
-
-        hBWE_FD->prev_td_energy_fx = SWB_tenv_fx[3];
-        move16();
-    }
-    ELSE IF( EQ_16( frica_flag, 1 ) && hBWE_FD->prev_frica_flag == 0 )
-    {
-        Qsynth_fx16 = Find_Max_Norm32( synth_fx, output_frame );
-        Qsynth_fx16 = sub( Qsynth_fx16, shr( add( sub( 15, norm_s( l_subfr ) ), 1 ), 1 ) );
-        Copy_Scale_sig32_16( synth_fx, synth_fx16, output_frame, Qsynth_fx16 );
-        Qsynth_fx16 = add( 11 - 16, Qsynth_fx16 );
-
-        /* IVAS_fmToDo: synth[] is @internal_Fs!!! */
-        time_reduce_pre_echo_fx( synth_fx16, hb_synth_fx16, hBWE_FD->prev_td_energy_fx, l_subfr, Qsynth_fx16, Q_syn_hb );
-    }
-    ELSE
-    {
-        tmp = i_mult2( 3, l_subfr );
-        L_tmp = L_deposit_l( 0 );
-
-        FOR( i = 0; i < l_subfr; i++ )
-        {
-            L_tmp = L_mac0_sat( L_tmp, hb_synth_fx16[add( tmp, i )], hb_synth_fx16[add( tmp, i )] ); /*(2*Q_syn_hb) */
-        }
-
-        L_tmp = Mult_32_16( L_tmp, div_s( 1, l_subfr ) ); /*(2*Q_syn_hb) */
-        hBWE_FD->prev_td_energy_fx = 0;
-        move16();
-
-        IF( L_tmp != 0 )
-        {
-            q_tmp = norm_l( L_tmp );
-            tmp = extract_h( L_shl( L_tmp, q_tmp ) );
-            q_tmp = sub( q_tmp, sub( 30, shl( Q_syn_hb, 1 ) ) );
-
-            tmp = div_s( 16384, tmp );
-            L_tmp = L_deposit_h( tmp );
-            L_tmp = Isqrt_lc( L_tmp, &q_tmp );                                         /*Q(31-exp) */
-            hBWE_FD->prev_td_energy_fx = round_fx( L_shl( L_tmp, sub( q_tmp, 15 ) ) ); /*Q0 */
-            move16();
-        }
-    }
-
-    test();
-    IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && !use_cldfb_for_dft )
-    {
-        Qsynth_fx16 = add( 16 - 11, Q_syn_hb );
-        Copy_Scale_sig32_16( synth_fx, synth_fx16, output_frame, Qsynth_fx16 );
-
-        /* add HB synth from hf_synth() */
-        v_add_16( hb_synth_fx16, synth_fx16, hb_synth_fx16, output_frame );
-    }
-
-    hBWE_FD->prev_mode = mode;
-    move16();
-    hBWE_FD->prev_frica_flag = frica_flag;
-    move16();
-
-    FOR( i = 0; i < output_frame; i++ )
-    {
-        hb_synth_fx[i] = L_deposit_l( hb_synth_fx16[i] ); // Q_syn_hb
-        move32();
-    }
-
-    return Q_syn_hb;
-}
-
-
-void fd_bwe_dec_init_fx(
-    FD_BWE_DEC_HANDLE hBWE_FD /* i/o: FD BWE data handle  */
-)
-{
-    set16_fx( hBWE_FD->L_old_wtda_swb_fx, 0, L_FRAME48k );
-    set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_NS ) );
-    hBWE_FD->prev_mode = NORMAL;
-    move16();
-    hBWE_FD->prev_Energy_fx = 0;
-    move16();
-    hBWE_FD->prev_L_swb_norm = 8;
-    move16();
-    hBWE_FD->Seed = 21211;
-    move16();
-    hBWE_FD->prev_frica_flag = 0;
-    move16();
-    set16_fx( hBWE_FD->mem_imdct_fx, 0, L_FRAME48k );
-    hBWE_FD->prev_td_energy_fx = 0;
-    move16();
-    hBWE_FD->prev_weight_fx = 0;
-    move16();
-    hBWE_FD->prev_flag = 0;
-    move16();
-    hBWE_FD->prev_Energy_wb_fx = 0;
-    move32();
-    hBWE_FD->mem_deemph_old_syn_fx = 0;
-    move16();
-
-    return;
-}
diff --git a/lib_dec/swb_bwe_dec_fx.c b/lib_dec/swb_bwe_dec_fx.c
index cd30df7c3fdb908afabc134c83b9814da2cfaabf..42d2a9cc4a2e8015773e402e81b9751400538e11 100644
--- a/lib_dec/swb_bwe_dec_fx.c
+++ b/lib_dec/swb_bwe_dec_fx.c
@@ -19,6 +19,7 @@
  *
  * predict SWB parameters for bandwidth switching
  *-------------------------------------------------------------------*/
+
 static Word16 para_pred_bws_fx(
     Decoder_State *st_fx, /* i/o: decoder state structure              */
     Word16 *signal_wb_fx, /* i  : wideband frequency signal       Q_syn*/
@@ -27,6 +28,7 @@ static Word16 para_pred_bws_fx(
 {
     Word16 i, j, k;
     Word16 mode;
+    FD_BWE_DEC_HANDLE hBWE_FD;
     Word16 tmp, tmp_den, tmp_num;
     Word32 L_tmp, L_tmp_max;
     Word16 exp;
@@ -39,6 +41,7 @@ static Word16 para_pred_bws_fx(
     Word16 coder_type = st_fx->coder_type;
     move16();
 
+    hBWE_FD = st_fx->hBWE_FD;
     mode = NORMAL;
     move16();
 
@@ -226,16 +229,16 @@ static Word16 para_pred_bws_fx(
         FOR( i = 0; i < SWB_FENV; i++ )
         {
             test();
-            IF( NE_16( st_fx->prev_coder_type, coder_type ) && GT_16( mult_r( SWB_fenv_fx[i], 16384 ), st_fx->prev_SWB_fenv_fx[i] ) )
+            IF( NE_16( st_fx->prev_coder_type, coder_type ) && GT_16( mult_r( SWB_fenv_fx[i], 16384 ), hBWE_FD->prev_SWB_fenv_fx[i] ) )
             {
                 /*SWB_fenv_fx[i] = add(mult_r(SWB_fenv_fx[i], 3277), mult_r(st_fx->prev_SWB_fenv_fx[i], 29491)); */
-                SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], 3277 ), st_fx->prev_SWB_fenv_fx[i], 29491 ) );
+                SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], 3277 ), hBWE_FD->prev_SWB_fenv_fx[i], 29491 ) );
                 move16();
             }
             ELSE
             {
                 /*SWB_fenv_fx[i] = add(mult_r(SWB_fenv_fx[i], st_fx->attenu_fx), mult_r(st_fx->prev_SWB_fenv_fx[i], sub(32767, st_fx->attenu_fx)));                     */
-                SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], st_fx->attenu_fx ), st_fx->prev_SWB_fenv_fx[i], sub( 32767, st_fx->attenu_fx ) ) );
+                SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], st_fx->attenu_fx ), hBWE_FD->prev_SWB_fenv_fx[i], sub( 32767, st_fx->attenu_fx ) ) );
                 move16();
             }
         }
@@ -257,9 +260,9 @@ static Word16 para_pred_bws_fx(
         {
             FOR( i = 0; i < SWB_FENV; i++ )
             {
-                if ( GT_16( mult_r( SWB_fenv_fx[i], 16384 ), st_fx->prev_SWB_fenv_fx[i] ) )
+                if ( GT_16( mult_r( SWB_fenv_fx[i], 16384 ), hBWE_FD->prev_SWB_fenv_fx[i] ) )
                 {
-                    SWB_fenv_fx[i] = st_fx->prev_SWB_fenv_fx[i];
+                    SWB_fenv_fx[i] = hBWE_FD->prev_SWB_fenv_fx[i];
                     move16();
                 }
             }
@@ -268,7 +271,7 @@ static Word16 para_pred_bws_fx(
         FOR( i = 0; i < SWB_FENV; i++ )
         {
             /*SWB_fenv_fx[i] = add(mult_r(SWB_fenv_fx[i], 29491), mult_r(st_fx->prev_SWB_fenv_fx[i], 3277)); */
-            SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], 29491 ), st_fx->prev_SWB_fenv_fx[i], 3277 ) );
+            SWB_fenv_fx[i] = round_fx( L_mac( L_mult( SWB_fenv_fx[i], 29491 ), hBWE_FD->prev_SWB_fenv_fx[i], 3277 ) );
             move16();
         }
         st_fx->attenu_fx = 3277; /*Q15*/
@@ -349,16 +352,18 @@ Word16 WB_BWE_gain_deq_fx(
  *
  * WB BWE decoder (only for 16kHz signals)
  *-------------------------------------------------------------------*/
-Word16 ivas_wb_bwe_dec_fx(                                 /* o :                                         Q_syn_hb  */
-                           Decoder_State *st_fx,           /* i/o: decoder state structure                          */
-                           const Word16 output[],          /* i  : suntehsis @ internal Fs                Q_input   */
-                           Word16 *synth_fx,               /* i/o: ACELP core synthesis/final synthesis   Q0/Qpost  */
-                           Word16 *hb_synth_fx,            /* o  : SHB synthesis/final synthesis          Q_syn_hb  */
-                           const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo              */
-                           const Word16 output_frame,      /* i  : frame length                                     */
-                           Word16 *voice_factors_fx,       /* i  : voicing factors                        Q15       */
-                           const Word16 pitch_buf_fx[],    /* i  : pitch buffer                           Q6        */
-                           Word16 *Qpost )
+
+/* o : Q_syn_hb  */
+Word16 ivas_wb_bwe_dec_fx(
+    Decoder_State *st_fx,           /* i/o: decoder state structure                          */
+    const Word16 output[],          /* i  : suntehsis @ internal Fs                Q_input   */
+    Word16 *synth_fx,               /* i/o: ACELP core synthesis/final synthesis   Q0/Qpost  */
+    Word16 *hb_synth_fx,            /* o  : SHB synthesis/final synthesis          Q_syn_hb  */
+    const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo              */
+    const Word16 output_frame,      /* i  : frame length                                     */
+    Word16 *voice_factors_fx,       /* i  : voicing factors                        Q15       */
+    const Word16 pitch_buf_fx[],    /* i  : pitch buffer                           Q6        */
+    Word16 *Qpost )
 {
     Word16 mode;
     Word16 WB_fenv_fx[SWB_FENV];
@@ -421,7 +426,7 @@ Word16 ivas_wb_bwe_dec_fx(                                 /* o :
         {
             /* de-quantization */
             mode = WB_BWE_gain_deq_fx( st_fx, WB_fenv_fx );
-            st_fx->last_wb_bwe_ener_fx = extract_l( Mpy_32_16_r( L_add( WB_fenv_fx[0], WB_fenv_fx[1] ), 16384 /*0.5f in Q15*/ ) );
+            st_fx->hBWE_FD->last_wb_bwe_ener_fx = extract_l( Mpy_32_16_r( L_add( WB_fenv_fx[0], WB_fenv_fx[1] ), 16384 /*0.5f in Q15*/ ) );
             move16();
         }
         ELSE
@@ -438,12 +443,12 @@ Word16 ivas_wb_bwe_dec_fx(                                 /* o :
             }
             if ( NE_16( st_fx->last_extl, WB_BWE ) )
             {
-                st_fx->prev_SWB_fenv_fx[0] = 0;
+                hBWE_FD->prev_SWB_fenv_fx[0] = 0;
                 move16();
             }
 
-            mode = WB_BWE_gain_pred_fx( WB_fenv_fx, ysynth_fx, coder_type, st_fx->prev_coder_type, st_fx->prev_SWB_fenv_fx[0],
-                                        voice_factors_fx, pitch_buf_fx, tmp_brate, st_fx->last_wb_bwe_ener_fx, Q_syn, st_fx->last_extl, st_fx->tilt_wb_fx );
+            mode = WB_BWE_gain_pred_fx( WB_fenv_fx, ysynth_fx, coder_type, st_fx->prev_coder_type, hBWE_FD->prev_SWB_fenv_fx[0],
+                                        voice_factors_fx, pitch_buf_fx, tmp_brate, st_fx->hBWE_FD->last_wb_bwe_ener_fx, Q_syn, st_fx->last_extl, st_fx->tilt_wb_fx );
         }
     }
     ELSE
@@ -453,32 +458,34 @@ Word16 ivas_wb_bwe_dec_fx(                                 /* o :
         move16();
         FOR( i = 0; i < 2; i++ )
         {
-            WB_fenv_fx[i] = mult_r( st_fx->prev_SWB_fenv_fx[i], 24576 );
+            WB_fenv_fx[i] = mult_r( hBWE_FD->prev_SWB_fenv_fx[i], 24576 );
             move16();
         }
     }
     test();
     IF( NE_16( st_fx->last_extl, WB_BWE ) || st_fx->bfi )
     {
-        Copy( WB_fenv_fx, st_fx->prev_SWB_fenv_fx, 2 );
+        Copy( WB_fenv_fx, hBWE_FD->prev_SWB_fenv_fx, 2 );
     }
 
     exp = norm_l( hBWE_FD->prev_Energy_wb_fx );
-    IF( GT_16( add( st_fx->prev_Q_synth, exp ), Q_syn ) )
+    IF( GT_16( add( hBWE_FD->prev_Q_synth, exp ), Q_syn ) )
     {
-        hBWE_FD->prev_Energy_wb_fx = L_shr( hBWE_FD->prev_Energy_wb_fx, sub( st_fx->prev_Q_synth, Q_syn ) );
+        hBWE_FD->prev_Energy_wb_fx = L_shr( hBWE_FD->prev_Energy_wb_fx, sub( hBWE_FD->prev_Q_synth, Q_syn ) );
         move32();
     }
     ELSE
     {
-        Q_syn = add( st_fx->prev_Q_synth, exp );
+        Q_syn = add( hBWE_FD->prev_Q_synth, exp );
         hBWE_FD->prev_Energy_wb_fx = L_shl( hBWE_FD->prev_Energy_wb_fx, exp );
         move32();
     }
+
     WB_BWE_decoding_fx( ysynth_fx, WB_fenv_fx, ysynth_32, L_FRAME16k, mode,
-                        st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm,
+                        st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm,
                         st_fx->extl, coder_type, st_fx->total_brate, &hBWE_FD->Seed, &hBWE_FD->prev_flag,
                         st_fx->prev_coder_type, Q_syn, &Q_syn_hb );
+
     IF( EQ_32( st_fx->output_Fs, 32000 ) )
     {
         set32_fx( &ysynth_32[L_FRAME16k], 0, L_FRAME16k );
@@ -487,7 +494,9 @@ Word16 ivas_wb_bwe_dec_fx(                                 /* o :
     {
         set32_fx( &ysynth_32[L_FRAME16k], 0, L_FRAME32k );
     }
+
     Inverse_Transform( ysynth_32, &Q_syn_hb, t_audio32_tmp, 0, output_frame, output_frame, st_fx->element_mode );
+
     window_ola_fx( t_audio32_tmp, hb_synth_fx, &Q_syn_hb, hBWE_FD->mem_imdct_fx, &hBWE_FD->mem_imdct_exp_fx, output_frame,
                    ALDO_WINDOW, ALDO_WINDOW, 0, 0, 0 );
 
@@ -497,27 +506,23 @@ Word16 ivas_wb_bwe_dec_fx(                                 /* o :
         /* add HB synth from hf_synth() */
         v_add_16( hb_synth_fx, synth_fx, hb_synth_fx, output_frame );
     }
+
     hBWE_FD->prev_mode = mode;
     move16();
-    st_fx->prev_Q_synth = Q_syn;
+    hBWE_FD->prev_Q_synth = Q_syn;
     move16();
+
     return Q_syn_hb;
 }
 
+
 Word16 wb_bwe_dec_fx(
-#ifdef ADD_IVAS_BWE
-    const Word16 output[], /* i  : suntehsis @ internal Fs */
-#endif
-    Word16 *synth_fx,    /* i/o: ACELP core synthesis/final synthesis       Q0/Qpost */
-    Word16 *hb_synth_fx, /* o  : SHB synthesis/final synthesis              Q_syn_hb */
-#ifdef ADD_IVAS_BWE
-    const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo      */
-#endif
+    Word16 *synth_fx,            /* i/o: ACELP core synthesis/final synthesis       Q0/Qpost */
+    Word16 *hb_synth_fx,         /* o  : SHB synthesis/final synthesis              Q_syn_hb */
     const Word16 output_frame,   /* i  : frame length                                */
     Word16 *voice_factors_fx,    /* i  : voicing factors                   Q15       */
     const Word16 pitch_buf_fx[], /* i  : pitch buffer                      Q6        */
-    Decoder_State *st_fx         /* i/o: decoder state structure                     */
-    ,
+    Decoder_State *st_fx,        /* i/o: decoder state structure                     */
     Word16 *Qpost )
 {
     Word16 mode;
@@ -538,18 +543,7 @@ Word16 wb_bwe_dec_fx(
 
     new_input_fx_exp = *Qpost;
     move16();
-#ifdef ADD_IVAS_BWE
-    if ( st->element_mode == IVAS_CPE_DFT && !use_cldfb_for_dft )
-    {
-        /* IVAS_fmToDo: wtda() does not support L_FRAME length; thus temporarily resample the signal */
-        /* IVAS_fmToDo: delay output[] by 1.25ms ? */
-        lerp( output, ysynth, L_FRAME16k, st->L_frame );
 
-        wtda( ysynth, wtda_synth, hBWE_FD->old_wtda_swb, ALDO_WINDOW, ALDO_WINDOW, /*st->L_frame*/ L_FRAME16k );
-        direct_transform( wtda_synth, ysynth, 0, /*st->L_frame*/ L_FRAME16k, st->element_mode );
-    }
-    else
-#endif
     {
         wtda_fx( synth_fx, &new_input_fx_exp, L_wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx,
                  &hBWE_FD->old_wtda_swb_fx_exp, ALDO_WINDOW, ALDO_WINDOW, /* window overlap of current frame (0: full, 2: none, or 3: half) */
@@ -574,19 +568,11 @@ Word16 wb_bwe_dec_fx(
     Q_syn = add( sub( new_input_fx_exp, 16 ), scl );
     IF( !st_fx->bfi )
     {
-#ifdef ADD_IVAS_BWE
-        IF( st_fx->extl_brate > 0 )
-#else
         IF( EQ_32( st_fx->total_brate, ACELP_13k20 ) )
-#endif
         {
             /* de-quantization */
             mode = WB_BWE_gain_deq_fx( st_fx, WB_fenv_fx );
-#ifdef BASOP_NOGLOB
-            st_fx->last_wb_bwe_ener_fx = mult_r( add_sat( WB_fenv_fx[0], WB_fenv_fx[1] ), 16384 ); // this would not saturate if written like : rounf_fx(L_mac(L_mult(WB_fenv_fx[0], 16384), WB_fenv_fx[1], 16384))
-#else
-            st_fx->last_wb_bwe_ener_fx = mult_r( add( WB_fenv_fx[0], WB_fenv_fx[1] ), 16384 );
-#endif
+            hBWE_FD->last_wb_bwe_ener_fx = mult_r( add_sat( WB_fenv_fx[0], WB_fenv_fx[1] ), 16384 ); // this would not saturate if written like : rounf_fx(L_mac(L_mult(WB_fenv_fx[0], 16384), WB_fenv_fx[1], 16384))
             move16();
         }
         ELSE
@@ -605,12 +591,12 @@ Word16 wb_bwe_dec_fx(
 
             if ( NE_16( st_fx->last_extl, WB_BWE ) )
             {
-                st_fx->prev_SWB_fenv_fx[0] = 0;
+                hBWE_FD->prev_SWB_fenv_fx[0] = 0;
                 move16();
             }
 
-            mode = WB_BWE_gain_pred_fx( WB_fenv_fx, ysynth_fx, coder_type, st_fx->prev_coder_type, st_fx->prev_SWB_fenv_fx[0],
-                                        voice_factors_fx, pitch_buf_fx, tmp_brate, st_fx->last_wb_bwe_ener_fx, Q_syn, st_fx->last_extl, st_fx->tilt_wb_fx );
+            mode = WB_BWE_gain_pred_fx( WB_fenv_fx, ysynth_fx, coder_type, st_fx->prev_coder_type, hBWE_FD->prev_SWB_fenv_fx[0],
+                                        voice_factors_fx, pitch_buf_fx, tmp_brate, hBWE_FD->last_wb_bwe_ener_fx, Q_syn, st_fx->last_extl, st_fx->tilt_wb_fx );
         }
     }
     ELSE
@@ -620,32 +606,34 @@ Word16 wb_bwe_dec_fx(
         move16();
         FOR( i = 0; i < 2; i++ )
         {
-            WB_fenv_fx[i] = mult_r( st_fx->prev_SWB_fenv_fx[i], 24576 );
+            WB_fenv_fx[i] = mult_r( hBWE_FD->prev_SWB_fenv_fx[i], 24576 );
             move16();
         }
     }
     test();
     IF( NE_16( st_fx->last_extl, WB_BWE ) || st_fx->bfi )
     {
-        Copy( WB_fenv_fx, st_fx->prev_SWB_fenv_fx, 2 );
+        Copy( WB_fenv_fx, hBWE_FD->prev_SWB_fenv_fx, 2 );
     }
 
     exp = norm_l( hBWE_FD->prev_Energy_wb_fx );
-    IF( GT_16( add( st_fx->prev_Q_synth, exp ), Q_syn ) )
+    IF( GT_16( add( hBWE_FD->prev_Q_synth, exp ), Q_syn ) )
     {
-        hBWE_FD->prev_Energy_wb_fx = L_shr( hBWE_FD->prev_Energy_wb_fx, sub( st_fx->prev_Q_synth, Q_syn ) );
+        hBWE_FD->prev_Energy_wb_fx = L_shr( hBWE_FD->prev_Energy_wb_fx, sub( hBWE_FD->prev_Q_synth, Q_syn ) );
         move32();
     }
     ELSE
     {
-        Q_syn = add( st_fx->prev_Q_synth, exp );
+        Q_syn = add( hBWE_FD->prev_Q_synth, exp );
         hBWE_FD->prev_Energy_wb_fx = L_shl( hBWE_FD->prev_Energy_wb_fx, exp );
         move32();
     }
+
     WB_BWE_decoding_fx( ysynth_fx, WB_fenv_fx, ysynth_32, L_FRAME16k, mode,
-                        st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm,
+                        st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm,
                         st_fx->extl, coder_type, st_fx->total_brate, &hBWE_FD->Seed, &hBWE_FD->prev_flag,
                         st_fx->prev_coder_type, Q_syn, &Q_syn_hb );
+
     IF( EQ_32( st_fx->output_Fs, 32000 ) )
     {
         set32_fx( &ysynth_32[L_FRAME16k], 0, L_FRAME16k );
@@ -654,36 +642,35 @@ Word16 wb_bwe_dec_fx(
     {
         set32_fx( &ysynth_32[L_FRAME16k], 0, L_FRAME32k );
     }
+
     Inverse_Transform( ysynth_32, &Q_syn_hb, t_audio32_tmp, 0, output_frame, output_frame, st_fx->element_mode );
+
     window_ola_fx( t_audio32_tmp, hb_synth_fx, &Q_syn_hb, hBWE_FD->mem_imdct_fx, &hBWE_FD->mem_imdct_exp_fx, output_frame,
                    ALDO_WINDOW, ALDO_WINDOW, 0, 0, 0 );
 
-#ifdef ADD_IVAS_BWE
-    test();
-    IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && !use_cldfb_for_dft )
-    {
-        /* add HB synth from hf_synth() */
-        v_add( hb_synth, synth, hb_synth, output_frame );
-    }
-#endif
     hBWE_FD->prev_mode = mode;
     move16();
-    st_fx->prev_Q_synth = Q_syn;
+    hBWE_FD->prev_Q_synth = Q_syn;
     move16();
+
     return Q_syn_hb;
 }
+
+
 /*-------------------------------------------------------------------*
  * swb_bwe_gain_deq()
  *
  * Decoding of SWB parameters
  *-------------------------------------------------------------------*/
-Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class                           */
-                            Decoder_State *st_fx,   /* i/o: decoder state structure             */
-                            const Word16 core,      /* i  : core                           : Q0 */
-                            Word16 *SWB_tenv,       /* o  :  time-domain BWE envelope      : Q0 */
-                            Word16 *SWB_fenv,       /* o  :  frequency-domain BWE envelope : Q1 */
-                            const Word16 hr_flag,   /* i  : high rate flag                 : Q0 */
-                            const Word16 hqswb_clas /* i  : HQ BWE class                   : Q0 */
+
+/* o  : BWE class                           */
+Word16 swb_bwe_gain_deq_fx(
+    Decoder_State *st_fx,   /* i/o: decoder state structure             */
+    const Word16 core,      /* i  : core                           : Q0 */
+    Word16 *SWB_tenv,       /* o  :  time-domain BWE envelope      : Q0 */
+    Word16 *SWB_fenv,       /* o  :  frequency-domain BWE envelope : Q1 */
+    const Word16 hr_flag,   /* i  : high rate flag                 : Q0 */
+    const Word16 hqswb_clas /* i  : HQ BWE class                   : Q0 */
 )
 {
     Word16 index, mode, n_band;
@@ -737,13 +724,9 @@ Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class
 
         /*tmp = indice[1]*DIM_TR2*/
         tmp = shl( indice[1], 1 );
-#ifdef BASOP_NOGLOB
         quant_tmp[1] = add_sat( shr( add_sat( quant_tmp[0], quant_tmp[2] ), 1 ), Env_TR_Cdbk2_fx[tmp] );
         /* To prevent an unnecessary saturation, it would be better to write the code as below, but might have an impact on EVS bit exactness */
         /* quant_tmp[1] = add( extract_h( L_mac( L_mult( quant_tmp[0], 16384 ), quant_tmp[2], 16384 ) ), Env_TR_Cdbk2_fx[tmp] ); */
-#else
-        quant_tmp[1] = add( shr( add( quant_tmp[0], quant_tmp[2] ), 1 ), Env_TR_Cdbk2_fx[tmp] );
-#endif
         move16(); /*Q8 */
         quant_tmp[3] = add( quant_tmp[2], Env_TR_Cdbk2_fx[tmp + 1] );
         move16(); /*Q8 */
@@ -844,11 +827,7 @@ Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class
 
             FOR( n_band = 0; n_band < 5; n_band++ )
             {
-#ifdef BASOP_NOGLOB
                 SWB_fenv[n_band * 2 + 1] = add_sat( shr( add_sat( quant_tmp[n_band], quant_tmp[n_band + 1] ), 1 ), quant_tmp2[n_band + 1] );
-#else
-                SWB_fenv[add( shl( n_band, 1 ), 1 )] = add( shr( add( quant_tmp[n_band], quant_tmp[n_band + 1] ), 1 ), quant_tmp2[n_band + 1] );
-#endif
                 move16(); /*Q8 */
             }
 
@@ -867,11 +846,7 @@ Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class
 
             FOR( n_band = 0; n_band < DIM12 - 1; n_band++ )
             {
-#ifdef BASOP_NOGLOB
                 SWB_fenv[n_band * 2 + 1] = add_sat( shr( add_sat( quant_tmp[n_band], quant_tmp[n_band + 1] ), 1 ), quant_tmp2[n_band] );
-#else
-                SWB_fenv[add( shl( n_band, 1 ), 1 )] = add( shr( add( quant_tmp[n_band], quant_tmp[n_band + 1] ), 1 ), quant_tmp2[n_band] );
-#endif
                 move16(); /*Q8 */
             }
 
@@ -891,11 +866,7 @@ Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class
             /* output of Pow2() will be: */
             /* 16384 < Pow2() <= 32767 */
             exp = sub( exp, 13 );
-#ifdef BASOP_NOGLOB
             SWB_fenv[n_band] = shl_sat( tmp, add( exp, 1 ) );
-#else
-            SWB_fenv[n_band] = shl( tmp, add( exp, 1 ) );
-#endif
             move16(); /*Q1 */
         }
 
@@ -930,19 +901,14 @@ Word16 swb_bwe_gain_deq_fx(                         /* o  : BWE class
  *
  * SWB BWE decoder
  *-------------------------------------------------------------------*/
-Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
-#ifdef ADD_IVAS_BWE
-                       const Word16 output[], /* i  : suntehsis @ internal Fs                                                           */
-#endif
-                       Decoder_State *st_fx, /* i/o: decoder state structure                                                            */
-                       Word16 *synth_fx,     /* i/o: ACELP core synthesis/final synthesis (might be rescaled inside wtda() )   Q0/Qpost */
-                       Word16 *hb_synth_fx,  /* o  : SHB synthesis/final synthesis                                             Q_syn_hb */
-#ifdef ADD_IVAS_BWE
-                       const Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo                                      */
-#endif
-                       const Word16 output_frame /* i  : frame length                                                                   */
-                       ,
-                       Word16 *Qpost )
+
+/*o : Q_syn_hb */
+Word16 swb_bwe_dec_fx(
+    Decoder_State *st_fx,      /* i/o: decoder state structure                                                            */
+    Word16 *synth_fx,          /* i/o: ACELP core synthesis/final synthesis (might be rescaled inside wtda() )   Q0/Qpost */
+    Word16 *hb_synth_fx,       /* o  : SHB synthesis/final synthesis                                             Q_syn_hb */
+    const Word16 output_frame, /* i  : frame length                                                                   */
+    Word16 *Qpost )
 {
     Word16 i, l_subfr;
     Word16 mode;
@@ -977,19 +943,7 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
     /* windowing of the ACELP core synthesis */
     new_input_fx_exp = *Qpost;
     move16();
-#ifdef ADD_IVAS_BWE
-    if ( st->element_mode == IVAS_CPE_DFT && !use_cldfb_for_dft )
-    {
-        /* IVAS_fmToDo: wtda() does not support L_FRAME length; thus temporarily resample the signal */
-        /* IVAS_fmToDo: delay output[] by 1.25ms ? */
-        lerp( output, ysynthIfx, L_FRAME16k, st_fx->L_frame );
 
-        wtda_fx( ysynth_fx, &new_input_fx_exp, L_wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx,
-                 &hBWE_FD->old_wtda_swb_fx_exp, ALDO_WINDOW, ALDO_WINDOW, /*st->L_frame*/ L_FRAME16k );
-        direct_transform_fx( L_wtda_synth_fx, ysynth_32, 0, /*st->L_frame*/ L_FRAME16k, &new_input_fx_exp, st_fx->element_mode );
-    }
-    else
-#endif
     {
         wtda_fx( synth_fx, &new_input_fx_exp, L_wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx,
                  &hBWE_FD->old_wtda_swb_fx_exp,
@@ -1063,19 +1017,19 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
             move16();
         }
 
-        Copy( st_fx->prev_SWB_fenv_fx, SWB_fenv_fx, SWB_FENV );
+        Copy( hBWE_FD->prev_SWB_fenv_fx, SWB_fenv_fx, SWB_FENV );
     }
 
     /* reconstruction of MDCT spectrum of the error signal */
     set32_fx( ysynth_32, 0, output_frame );
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
-        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx,
+        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx,
                              &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
     }
     ELSE
     {
-        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx,
+        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx,
                              &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
     }
 
@@ -1106,11 +1060,11 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
         }
         ELSE IF( st_fx->bfi )
         {
-            fb_ener_adjust_fx = st_fx->prev_fb_ener_adjust_fx;
+            fb_ener_adjust_fx = hBWE_FD->prev_fb_ener_adjust_fx;
             move16();
         }
 
-        st_fx->prev_fb_ener_adjust_fx = fb_ener_adjust_fx;
+        hBWE_FD->prev_fb_ener_adjust_fx = fb_ener_adjust_fx;
         move16();
         IF( EQ_16( mode, TRANSIENT ) )
         {
@@ -1121,12 +1075,8 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
             IF( SWB_fenv_fx[7] != 0 )
             {
                 tmp = div_s( 1, SWB_fenv_fx[7] );
-                move16(); /*Q14*/
-#ifdef BASOP_NOGLOB
+                move16();                                                                           /*Q14*/
                 ener_adjust_quan_fx = s_min( shr( i_mult_sat( SWB_fenv_fx[13], tmp ), 2 ), 32767 ); /*Q13*/
-#else
-                ener_adjust_quan_fx = s_min( shr( i_mult( SWB_fenv_fx[13], tmp ), 2 ), 32767 );
-#endif
             }
             ELSE
             {
@@ -1136,12 +1086,7 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
         }
         fb_band_begin = FB_BAND_BEGIN;
         move16();
-#ifdef ADD_IVAS_BWE
-        IF( st_fx->L_frame == L_FRAME )
-        {
-            fb_band_begin = FB_BAND_BEGIN_12k8;
-        }
-#endif
+
         FOR( i = fb_band_begin; i < add( fb_band_begin, DE_OFFSET1 ); i++ )
         {
             tmp = sub( 32767, i_mult( j, 1024 ) );
@@ -1198,11 +1143,7 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
         L_tmp = L_deposit_l( 0 );
         FOR( i = 0; i < l_subfr; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_sat( L_tmp, hb_synth_fx[add( tmp, i )], hb_synth_fx[add( tmp, i )] ); /*(2*Q_syn_hb) */
-#else
-            L_tmp = L_mac0( L_tmp, hb_synth_fx[tmp + i], hb_synth_fx[tmp + i] ); /*(2*Q_syn_hb) */
-#endif
         }
         L_tmp = Mult_32_16( L_tmp, div_s( 1, l_subfr ) ); /*(2*Q_syn_hb) */
 
@@ -1221,14 +1162,7 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
             move16();
         }
     }
-#ifdef ADD_IVAS_BWE
-    test();
-    IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && !use_cldfb_for_dft )
-    {
-        /* add HB synth from hf_synth() */
-        v_add( hb_synth, synth, hb_synth, output_frame );
-    }
-#endif
+
     hBWE_FD->prev_frica_flag = frica_flag;
     move16();
     hBWE_FD->prev_mode = mode;
@@ -1244,23 +1178,18 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
  * Initialize FD BWE state structure at the decoder
  *-------------------------------------------------------------------*/
 
-void fd_bwe_dec_init(
-    Decoder_State *st_fx,     /* i/o: decoder state structure                 */
+void fd_bwe_dec_init_fx(
     FD_BWE_DEC_HANDLE hBWE_FD /* i/o: FD BWE data handle  */
 )
 {
-    hBWE_FD->old_wtda_wb_fx_exp = 0;
-    move16();
-    set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_NS ) );
+    set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
     set16_fx( hBWE_FD->L_old_wtda_swb_fx, 0, L_FRAME48k );
     hBWE_FD->old_wtda_swb_fx_exp = 0;
     move16();
-    hBWE_FD->mem_imdct_exp_fx = 0;
-    move16();
 
     hBWE_FD->prev_mode = NORMAL;
     move16();
-    set16_fx( st_fx->prev_SWB_fenv_fx, 0, SWB_FENV );
+    set16_fx( hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );
     hBWE_FD->prev_Energy_fx = 0;
     move16();
     hBWE_FD->prev_L_swb_norm = 8;
@@ -1270,13 +1199,15 @@ void fd_bwe_dec_init(
     hBWE_FD->prev_frica_flag = 0;
     move16();
     set16_fx( hBWE_FD->mem_imdct_fx, 0, L_FRAME48k );
+    hBWE_FD->mem_imdct_exp_fx = 0;
+    move16();
     hBWE_FD->prev_td_energy_fx = 0;
     move16();
     hBWE_FD->prev_weight_fx = 6554; /*0.2 in Q15*/
     move16();
     hBWE_FD->prev_flag = 0;
     move16();
-    st_fx->last_wb_bwe_ener_fx = 0;
+    hBWE_FD->last_wb_bwe_ener_fx = 0;
     move16();
     hBWE_FD->prev_Energy_wb_fx = L_deposit_l( 0 );
     move32();
@@ -1284,13 +1215,349 @@ void fd_bwe_dec_init(
     move16();
 
     /* Previous frame LPC initialization for PPP */
-    st_fx->prev_Q_synth = 0;
+    hBWE_FD->prev_Q_synth = 0;
     move16();
 
     hBWE_FD->mem_deemph_old_syn_fx = 0;
     move16();
-    st_fx->prev_fb_ener_adjust_fx = 0;
+    hBWE_FD->prev_fb_ener_adjust_fx = 0;
     move16();
 
     return;
 }
+
+/*-------------------------------------------------------------------*
+ * WB_BWE_gain_deq()
+ *
+ * Decoding of WB parameters
+ *-------------------------------------------------------------------*/
+
+
+Word16 swb_bwe_dec_fx32(
+    Decoder_State *st_fx,     /* i/o: decoder state structure                             */
+    Word32 output_fx[],       /* i  : synthesis @internal Fs                : Q11         */
+    Word32 *synth_fx,         /* i  : ACELP core synthesis/final synthesis  : Q11         */
+    Word32 *hb_synth_fx,      /* o  : SHB synthesis/final synthesis         : Q_syn_hb    */
+    Word16 use_cldfb_for_dft, /* i  : flag to use of CLDFB for DFT Stereo                 */
+    Word16 output_frame       /* i  : frame length                                        */
+)
+{
+    Word16 L;
+    Word16 mode;
+    Word16 idxGain;
+    Word16 i, j, l_subfr;
+    Word16 fb_band_begin;
+    Word16 frica_flag = 0;
+    move16();
+    Word16 ener_adjust_quan_fx;
+    Word16 fb_ener_adjust_fx = 0;
+    move16();
+    Word16 scl, new_input_fx_exp, ysynth_frame_size;
+    Word16 Q_syn, Q_syn_hb, tmp, tmp2, q_tmp, Qsynth_fx16;
+
+    Word16 ysynth_fx[L_FRAME48k];
+    Word16 SWB_fenv_fx[SWB_FENV];
+    Word16 SWB_tenv_fx[SWB_TENV];
+    Word16 synth_fx16[L_FRAME48k];
+    Word16 hb_synth_fx16[L_FRAME48k];
+
+    Word32 L_tmp;
+    Word32 yerror_fx[L_FRAME48k];
+    Word32 ysynth_fx32[L_FRAME48k];
+    Word32 SWB_tenv_tmp_fx[SWB_TENV];
+    Word32 wtda_synth_fx[2 * L_FRAME48k];
+
+    FD_BWE_DEC_HANDLE hBWE_FD;
+    hBWE_FD = st_fx->hBWE_FD;
+
+    /*---------------------------------------------------------------------*
+     * SWB BWE decoding
+     *---------------------------------------------------------------------*/
+    test();
+    IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && !use_cldfb_for_dft )
+    {
+        /* todo - wtda() does not support L_FRAME length; thus temporarily resample the signal */
+        /* todo - delay output[] by 1.25ms ? */
+        L_lerp_fx_q11( output_fx, ysynth_fx32, L_FRAME16k, st_fx->L_frame );
+
+        /* windowing of the ACELP core synthesis */
+        wtda_fx32( ysynth_fx32, wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx32, ALDO_WINDOW, ALDO_WINDOW, /*st_fx->L_frame*/ L_FRAME16k );
+
+        /* DCT of the ACELP core synthesis */
+        new_input_fx_exp = 11;
+        move16();
+        direct_transform_fx( wtda_synth_fx, ysynth_fx32, 0, /*st_fx->L_frame*/ L_FRAME16k, &new_input_fx_exp, st_fx->element_mode );
+        ysynth_frame_size = L_FRAME16k;
+        move16();
+    }
+    ELSE
+    {
+        /* windowing of the ACELP core synthesis */
+        wtda_fx32( synth_fx, wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx32, ALDO_WINDOW, ALDO_WINDOW, output_frame );
+
+        /* DCT of the ACELP core synthesis */
+        new_input_fx_exp = 11;
+        move16();
+        direct_transform_fx( wtda_synth_fx, ysynth_fx32, 0, output_frame, &new_input_fx_exp, st_fx->element_mode );
+        ysynth_frame_size = output_frame;
+        move16();
+    }
+
+    /* Convert to 16 Bits (Calc Shift Required to Stay within MAX_Q_NEW_INPUT) */
+    scl = sub( 16 + 11, new_input_fx_exp );
+    /* Possible to Upscale? */
+    IF( scl > 0 )
+    {
+        /* Yes */
+        /* Calc Room to Upscale */
+        Q_syn = sub( Find_Max_Norm32( ysynth_fx32, ysynth_frame_size ), 3 );
+        /* Stay within MAX_Q_NEW_INPUT */
+        scl = s_min( Q_syn, scl );
+    }
+    /*Don't upscale if already in 15 bits*/
+    IF( GT_16( scl, 15 ) )
+    {
+        FOR( i = 0; i < ysynth_frame_size; i++ )
+        {
+            ysynth_fx[i] = extract_l( ysynth_fx32[i] );
+            move16();
+        }
+        Q_syn = new_input_fx_exp;
+        move16();
+    }
+    ELSE
+    {
+        Copy_Scale_sig32_16( ysynth_fx32, ysynth_fx, ysynth_frame_size, scl );
+        Q_syn = add( sub( new_input_fx_exp, 16 ), scl );
+    }
+
+    IF( !st_fx->bfi )
+    {
+        IF( st_fx->bws_cnt > 0 )
+        {
+            /* estimate parameters */
+            mode = para_pred_bws_fx( st_fx, ysynth_fx, SWB_fenv_fx, Q_syn );
+        }
+        ELSE
+        {
+            /* de-quantization */
+            mode = swb_bwe_gain_deq_fx( st_fx, ACELP_CORE, SWB_tenv_fx, SWB_fenv_fx, 0, -1 );
+        }
+
+        L = SWB_FENV;
+        move16();
+        if ( EQ_16( mode, TRANSIENT ) )
+        {
+            L = SWB_FENV_TRANS;
+            move16();
+        }
+
+        L_tmp = 0;
+        move32();
+        FOR( i = 0; i < L; i++ )
+        {
+            L_tmp = L_add( L_tmp, L_deposit_l( SWB_fenv_fx[i] ) );
+        }
+        q_tmp = norm_s( L );
+        tmp = div_s( shl( 1, sub( 14, q_tmp ) ), L );                          /*Q(29-q_tmp) */
+        L_tmp = Mpy_32_16_1( L_tmp, tmp );                                     /*Q(1+29-q_tmp+1-16)->Q(15-q_tmp) */
+        st_fx->prev_ener_shb_fx = round_fx( L_shl( L_tmp, add( q_tmp, 2 ) ) ); /*Q1 */
+        move16();
+    }
+    ELSE
+    {
+        /* SHB FEC */
+
+        IF( NE_16( hBWE_FD->prev_mode, TRANSIENT ) )
+        {
+            mode = hBWE_FD->prev_mode;
+            move16();
+        }
+        ELSE
+        {
+            mode = NORMAL;
+            move16();
+        }
+
+        Copy( hBWE_FD->prev_SWB_fenv_fx, SWB_fenv_fx, SWB_FENV );
+    }
+
+    /* reconstruction of MDCT spectrum of the error signal */
+    set32_fx( yerror_fx, 0, output_frame );
+
+    IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
+    {
+        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
+    }
+    ELSE
+    {
+        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
+    }
+
+    test();
+    IF( EQ_16( hBWE_FD->prev_frica_flag, 1 ) && frica_flag == 0 )
+    {
+        FOR( i = 0; i < L_SUBFR; i++ )
+        {
+            tmp = sub( 32767, extract_l( L_mult0( i, 512 ) ) ); /*Q15 */
+            hBWE_FD->mem_imdct_fx[i] = mult_r( hBWE_FD->mem_imdct_fx[i], tmp );
+            move16();
+        }
+
+        FOR( ; i < output_frame; i++ )
+        {
+            hBWE_FD->mem_imdct_fx[i] = 0;
+            move16();
+        }
+    }
+
+    /* decode information */
+    IF( EQ_16( st_fx->extl, FB_BWE ) )
+    {
+        IF( !st_fx->bfi )
+        {
+            idxGain = (Word16) get_next_indice_fx( st_fx, NUM_BITS_FB_FRAMEGAIN );
+            fb_ener_adjust_fx = usdequant_fx( idxGain, FB_GAIN_QLOW_FX, FB_GAIN_QDELTA_FX ); /*Q15 */
+        }
+        ELSE IF( st_fx->bfi )
+        {
+            fb_ener_adjust_fx = hBWE_FD->prev_fb_ener_adjust_fx;
+            move16();
+        }
+
+        hBWE_FD->prev_fb_ener_adjust_fx = fb_ener_adjust_fx;
+        move16();
+        IF( EQ_16( mode, TRANSIENT ) )
+        {
+            ener_adjust_quan_fx = shr( fb_ener_adjust_fx, 2 );
+        }
+        ELSE
+        {
+            IF( SWB_fenv_fx[7] != 0 )
+            {
+                tmp = div_s( 1, SWB_fenv_fx[7] );
+                ener_adjust_quan_fx = s_min( shr( i_mult_sat( SWB_fenv_fx[13], tmp ), 2 ), 32767 );
+            }
+            ELSE
+            {
+                ener_adjust_quan_fx = 0;
+                move16();
+            }
+        }
+
+        fb_band_begin = FB_BAND_BEGIN;
+        move16();
+        if ( EQ_16( st_fx->L_frame, L_FRAME ) )
+        {
+            fb_band_begin = FB_BAND_BEGIN_12k8;
+            move16();
+        }
+
+        j = 0;
+        move16();
+        FOR( i = fb_band_begin; i < add( fb_band_begin, DE_OFFSET1 ); i++ )
+        {
+            tmp = sub( 32767, i_mult( j, 1024 ) );
+            tmp = mult_r( tmp, ener_adjust_quan_fx ); /*Q13*/
+
+            tmp2 = i_mult( j, 256 );                  /*Q13*/
+            tmp2 = mult_r( tmp2, fb_ener_adjust_fx ); /*Q13*/
+
+            tmp = add( tmp, tmp2 );                                                      /*Q13*/
+            yerror_fx[i] = L_shl( Mpy_32_16_1( yerror_fx[i - FB_BAND_WIDTH], tmp ), 2 ); /*15+Q_syn */
+            move32();
+            j = add( j, 1 );
+        }
+        FOR( ; i < FB_BAND_END; i++ )
+        {
+            yerror_fx[i] = Mpy_32_16_1( yerror_fx[i - FB_BAND_WIDTH], fb_ener_adjust_fx ); /*15+Q_syn */
+            move32();
+        }
+    }
+
+    /* iDCT of the error signal */
+    Q_syn_hb = add( Q_syn, 15 );
+    Inverse_Transform( yerror_fx, &Q_syn_hb, wtda_synth_fx, 0, output_frame, -1, st_fx->element_mode );
+
+    /* inverse windowing of the error signal */
+    window_ola_fx( wtda_synth_fx, hb_synth_fx16, &Q_syn_hb, hBWE_FD->mem_imdct_fx, &hBWE_FD->mem_imdct_exp_fx, output_frame, ALDO_WINDOW, ALDO_WINDOW, 0, 0, 0 );
+    l_subfr = mult( output_frame, 8192 );
+
+    test();
+    IF( EQ_16( mode, TRANSIENT ) )
+    {
+        FOR( i = 0; i < SWB_TENV; i++ )
+        {
+            SWB_tenv_tmp_fx[i] = L_mult0( SWB_tenv_fx[i] /*Q0*/, 26214 /*0.8f Q15*/ ); // Q15
+            move32();
+        }
+
+        /* time envelope shaping when the current frame is TRANSIENT frame */
+        time_envelop_shaping_ivas_fx( hb_synth_fx16, SWB_tenv_tmp_fx, output_frame, &Q_syn_hb );
+
+        Q_syn_hb = sub( Q_syn_hb, 3 );
+
+        hBWE_FD->prev_td_energy_fx = SWB_tenv_fx[3];
+        move16();
+    }
+    ELSE IF( EQ_16( frica_flag, 1 ) && hBWE_FD->prev_frica_flag == 0 )
+    {
+        Qsynth_fx16 = Find_Max_Norm32( synth_fx, output_frame );
+        Qsynth_fx16 = sub( Qsynth_fx16, shr( add( sub( 15, norm_s( l_subfr ) ), 1 ), 1 ) );
+        Copy_Scale_sig32_16( synth_fx, synth_fx16, output_frame, Qsynth_fx16 );
+        Qsynth_fx16 = add( 11 - 16, Qsynth_fx16 );
+
+        /* IVAS_fmToDo: synth[] is @internal_Fs!!! */
+        time_reduce_pre_echo_fx( synth_fx16, hb_synth_fx16, hBWE_FD->prev_td_energy_fx, l_subfr, Qsynth_fx16, Q_syn_hb );
+    }
+    ELSE
+    {
+        tmp = i_mult2( 3, l_subfr );
+        L_tmp = L_deposit_l( 0 );
+
+        FOR( i = 0; i < l_subfr; i++ )
+        {
+            L_tmp = L_mac0_sat( L_tmp, hb_synth_fx16[add( tmp, i )], hb_synth_fx16[add( tmp, i )] ); /*(2*Q_syn_hb) */
+        }
+
+        L_tmp = Mult_32_16( L_tmp, div_s( 1, l_subfr ) ); /*(2*Q_syn_hb) */
+        hBWE_FD->prev_td_energy_fx = 0;
+        move16();
+
+        IF( L_tmp != 0 )
+        {
+            q_tmp = norm_l( L_tmp );
+            tmp = extract_h( L_shl( L_tmp, q_tmp ) );
+            q_tmp = sub( q_tmp, sub( 30, shl( Q_syn_hb, 1 ) ) );
+
+            tmp = div_s( 16384, tmp );
+            L_tmp = L_deposit_h( tmp );
+            L_tmp = Isqrt_lc( L_tmp, &q_tmp );                                         /*Q(31-exp) */
+            hBWE_FD->prev_td_energy_fx = round_fx( L_shl( L_tmp, sub( q_tmp, 15 ) ) ); /*Q0 */
+            move16();
+        }
+    }
+
+    test();
+    IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && !use_cldfb_for_dft )
+    {
+        Qsynth_fx16 = add( 16 - 11, Q_syn_hb );
+        Copy_Scale_sig32_16( synth_fx, synth_fx16, output_frame, Qsynth_fx16 );
+
+        /* add HB synth from hf_synth() */
+        v_add_16( hb_synth_fx16, synth_fx16, hb_synth_fx16, output_frame );
+    }
+
+    hBWE_FD->prev_mode = mode;
+    move16();
+    hBWE_FD->prev_frica_flag = frica_flag;
+    move16();
+
+    FOR( i = 0; i < output_frame; i++ )
+    {
+        hb_synth_fx[i] = L_deposit_l( hb_synth_fx16[i] ); // Q_syn_hb
+        move32();
+    }
+
+    return Q_syn_hb;
+}
diff --git a/lib_dec/swb_bwe_dec_hr.c b/lib_dec/swb_bwe_dec_hr.c
deleted file mode 100644
index e2be97ae4b8288ea63cc27a6bd828a9518e7aa43..0000000000000000000000000000000000000000
--- a/lib_dec/swb_bwe_dec_hr.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * swb_bwe_dec_hr()
- *
- * HR SWB BWE decoder
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/swb_bwe_dec_hr_fx.c b/lib_dec/swb_bwe_dec_hr_fx.c
index b5f8641dc0525f609a90b9f37735f19c16e5d82e..ff4d8bee65b694e9b56f26b48f8324857768f25f 100644
--- a/lib_dec/swb_bwe_dec_hr_fx.c
+++ b/lib_dec/swb_bwe_dec_hr_fx.c
@@ -11,7 +11,6 @@
 #define Q_GUARD                 1
 #define Q_32_BITS               14 /* scaling of 't_audio32' */
 #define MAKE_PSEUDO_FLT( v, e ) ( ( ( (Word32) ( v ) ) << 16 ) + ( e ) )
-#define AVQ_DEMUX
 /*-----------------------------------------------------------*
  * Gain_Dequant_HR()
  *
@@ -185,13 +184,8 @@ static Word16 TD_Postprocess(                               /* o  : gain in Q15
     L_Energy = Sqrt_Ratio32( L_Energy, temp1, L_Energy2, temp2, &temp );
 
     /* Put Back to Q31 (Let it saturate to 0.99999 in fx because we wanted to limit the gain to 1.0 anyways) */
-#ifdef BASOP_NOGLOB
     L_Energy = L_shl_sat( L_Energy, temp );
     temp = round_fx_sat( L_Energy );
-#else
-    L_Energy = L_shl( L_Energy, temp );
-    temp = round_fx( L_Energy );
-#endif
 
     test();
     IF( EQ_16( last_extl, SWB_BWE ) || EQ_16( last_extl, FB_BWE ) )
@@ -229,15 +223,9 @@ static Word16 TD_Postprocess(                               /* o  : gain in Q15
 
             FOR( i = ind2; i < input_frame; i++ )
             {
-#ifdef BASOP_NOGLOB
                 hb_synth_fx[i] = mult_r_sat( round_fx_sat( L_Energy ), hb_synth_fx[i] );
                 move16();
                 L_Energy = L_add_sat( L_Energy, L_Energy2 );
-#else
-                hb_synth_fx[i] = mult_r( round_fx( L_Energy ), hb_synth_fx[i] );
-                move16();
-                L_Energy = L_add( L_Energy, L_Energy2 );
-#endif
             }
         }
     }
@@ -489,11 +477,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
             temp = div_s( 16384, frac );
             L_temp = L_deposit_h( temp );
             L_temp = Isqrt_lc( L_temp, &exp1 );
-#ifdef BASOP_NOGLOB
             gain_fx = extract_l( L_shl_sat( L_temp, sub( exp1, 2 ) ) ); /*Q(31-exp + (exp-3)) -> Q13*/
-#else
-            gain_fx = extract_l( L_shl( L_temp, sub( exp1, 2 ) ) ); /*Q(31-exp + (exp-3)) -> Q13*/
-#endif
         }
 
         env = 512;
@@ -610,11 +594,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
 
                 Nsv = ( NUM_TRANS_END_FREQ_COEF - NUM_TRANS_START_FREQ_COEF ) / WIDTH_BAND;
                 move16();
-#ifdef AVQ_DEMUX
                 AVQ_demuxdec_fx( st_fx, x_norm, &nBits, Nsv, nq, 0, sub( Nsv, 1 ) );
-#else
-                AVQ_demuxdec_fx( st_fx, x_norm, &nBits, Nsv, nq );
-#endif
                 temp = add( len, NUM_TRANS_START_FREQ_COEF );
                 /* 't_audio' in Q8 */
                 t_audio_exp = 8;
@@ -626,13 +606,8 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
                 }
 
                 /* apply noise-fill */
-#ifdef BASOP_NOGLOB
                 swb_hr_noise_fill_fx( is_transient, NUM_TRANS_START_FREQ_COEF, NUM_TRANS_END_FREQ_COEF, round_fx_sat( L_shl_sat( L_tilt_wb, 3 ) ), /* Q(24+3-16) -> Q11 */
                                       pitch, nq, Nsv, &hBWE_FD_HR->bwe_highrate_seed_fx, t_audio + temp, t_audio_exp );
-#else
-                swb_hr_noise_fill_fx( is_transient, NUM_TRANS_START_FREQ_COEF, NUM_TRANS_END_FREQ_COEF, round_fx( L_shl( L_tilt_wb, 3 ) ), /* Q(24+3-16) -> Q11 */
-                                      pitch, nq, Nsv, &hBWE_FD_HR->bwe_highrate_seed_fx, t_audio + temp, t_audio_exp );
-#endif
                 /* Go from Q't_audio_exp' on 16 Bits to 'Q_32_BITS' on 32 bits */
                 temp2 = i_mult2( WIDTH_BAND, Nsv );
                 ptr16 = &t_audio[temp];
@@ -868,11 +843,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
 
             /* Nsv = i / WIDTH_BAND */
             Nsv = shr( i, 3 );
-#ifdef AVQ_DEMUX
             AVQ_demuxdec_fx( st_fx, x_norm, &nBits, Nsv, nq, 0, sub( Nsv, 1 ) );
-#else
-            AVQ_demuxdec_fx( st_fx, x_norm, &nBits, Nsv, nq );
-#endif
             /*---------------------------------------------------------------------*
              * second stage decoding
              *---------------------------------------------------------------------*/
@@ -909,11 +880,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
                 }
 
                 nBits = sub( nBits, NBITS_GLOB_GAIN_BWE_HR );
-#ifdef AVQ_DEMUX
                 AVQ_demuxdec_fx( st_fx, x_norm1, &nBits, Nsv2, nq2, 0, sub( Nsv2, 1 ) );
-#else
-                AVQ_demuxdec_fx( st_fx, x_norm1, &nBits, Nsv2, nq2 );
-#endif
             }
 
             /*---------------------------------------------------------------------*
@@ -925,11 +892,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
             move16();
             FOR( i = 0; i < i_mult( Nsv, WIDTH_BAND ); i++ )
             {
-#ifdef BASOP_NOGLOB
                 t_audio_tmp[i] = shl_sat( x_norm[i], t_audio_exp );
-#else
-                t_audio_tmp[i] = shl( x_norm[i], t_audio_exp );
-#endif
                 move16();
             }
 
@@ -1054,11 +1017,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
             IF( LT_16( nBits, 200 ) )
             {
                 swb_hr_noise_fill_fx( is_transient, NUM_NONTRANS_START_FREQ_COEF, NUM_NONTRANS_END_FREQ_COEF,
-#ifdef BASOP_NOGLOB
                                       round_fx_sat( L_shl_sat( L_tilt_wb, 3 ) ), /* Q(24+3-16) -> Q11 */
-#else
-                                      round_fx( L_shl( L_tilt_wb, 3 ) ),                                       /* Q(24+3-16) -> Q11 */
-#endif
                                       pitch, nq, Nsv, &hBWE_FD_HR->bwe_highrate_seed_fx, t_audio + NUM_NONTRANS_START_FREQ_COEF, t_audio_exp );
             }
 
@@ -1185,11 +1144,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
             /* tmpF = max_env / min_env; */
             temp = BASOP_Util_Divide1616_Scale( max_env, min_env, &temp2 );
             test();
-#ifdef BASOP_NOGLOB
             IF( EQ_16( st_fx->extl, SWB_BWE_HIGHRATE ) || LT_16( temp, shl_sat( 18022, sub( 15 - 13, temp2 ) ) ) ) /* 2.2 in Q13 == 18022 */
-#else
-            IF( EQ_16( st_fx->extl, SWB_BWE_HIGHRATE ) || LT_16( temp, shl( 18022, sub( 15 - 13, temp2 ) ) ) ) /* 2.2 in Q13 == 18022 */
-#endif
             {
 
                 /* (en_band_flt[3] - j*(en_band_flt[3]/WIDTH_BAND - en_noncoded_flt/WIDTH_BAND)) */
@@ -1281,11 +1236,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
             FOR( i = 0; i < temp2; i++ )
             {
                 L_temp = Mult_32_16( *ptr32, gain_fx );
-#ifdef BASOP_NOGLOB
                 L_temp = L_shl_sat( L_temp, temp );
-#else
-                L_temp = L_shl( L_temp, temp );
-#endif
                 *ptr32++ = L_temp;
                 move32();
             }
@@ -1342,7 +1293,7 @@ Word16 swb_bwe_dec_hr_fx(                                /* o  : Exponent of SHB
     }
     FOR( i = 0; i < SWB_FENV; i++ )
     {
-        st_fx->prev_SWB_fenv_fx[i] = st_fx->prev_ener_shb_fx; /*gain_e + 15*/
+        st_fx->hBWE_FD->prev_SWB_fenv_fx[i] = st_fx->prev_ener_shb_fx; /*gain_e + 15*/
         move16();
     }
 
diff --git a/lib_dec/swb_bwe_dec_lr.c b/lib_dec/swb_bwe_dec_lr.c
deleted file mode 100644
index ff2af374eb0aeca1689c4e78b0fc985f8e8a0785..0000000000000000000000000000000000000000
--- a/lib_dec/swb_bwe_dec_lr.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "stat_com.h"
-#include "wmc_auto.h"
-
-
-/*-------------------------------------------------------------------*
- * DecodeSWBGenericParameters()
- *
- * Decoding of generic subband coding parameters
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/swb_tbe_dec.c b/lib_dec/swb_tbe_dec.c
deleted file mode 100644
index 8c2387e53497fe35ad9061d5a68c03210e98c75d..0000000000000000000000000000000000000000
--- a/lib_dec/swb_tbe_dec.c
+++ /dev/null
@@ -1,2560 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "rom_com.h"
-#include "rom_dec.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
-
-/*-----------------------------------------------------------------*
- * Local function prototypes
- *-----------------------------------------------------------------*/
-
-
-void find_max_mem_dec_m3(
-    Decoder_State *st,
-    Word16 *n_mem3 );
-
-/*-------------------------------------------------------------------*
- * ResetSHBbuffer_Dec()
- *
- *
- *-------------------------------------------------------------------*/
-
-static void calc_tilt_bwe_fx_loc(
-    const Word32 *sp_fx, /* i  : input signal   : Q11       */
-    Word32 *tilt_fx,     /* o  : signal tilt    : tilt_fx_q */
-    Word16 *tilt_fx_q,   /* o  : signal tilt                */
-    const Word16 N       /* i  : signal length  : Q0        */
-)
-{
-    Word16 i;
-    Word64 r0_fx, r1_fx;
-
-    r0_fx = EPSILON_FX_SMALL;
-    move64();
-    FOR( i = 0; i < N; i++ )
-    {
-        r0_fx = W_add( r0_fx, W_shr( W_mult_32_32( sp_fx[i], sp_fx[i] ), 1 ) ); /*Q11*2 - 1*/
-    }
-    r1_fx = W_deposit32_l( abs( L_sub( sp_fx[1], sp_fx[0] ) ) ); /*Q11*/
-    FOR( i = 2; i < N; i++ )
-    {
-        IF( W_mult_32_32( L_sub( sp_fx[i], sp_fx[i - 1] ) /*Q11*/, L_sub( sp_fx[i - 1], sp_fx[i - 2] ) /*Q11*/ ) /*Q11 * 2 - 1*/ < 0 )
-        {
-            r1_fx = W_add( r1_fx, W_deposit32_l( abs( L_sub( sp_fx[i], sp_fx[i - 1] ) ) ) ); /*Q11*/
-        }
-    }
-    Word16 headroom_left_r0 = W_norm( r0_fx );
-    Word16 headroom_left_r1 = W_norm( r1_fx );
-    Word16 r0_q = 0, r1_q = 0;
-    move16();
-    move16();
-    IF( LT_16( headroom_left_r0, 32 ) )
-    {
-        r0_fx = W_shr( r0_fx, sub( 32, headroom_left_r0 ) );
-        r0_q = sub( 31, sub( ( 2 * OUTPUT_Q ), sub( 32, headroom_left_r0 ) ) );
-    }
-    ELSE
-    {
-        r0_q = 31 - ( 2 * OUTPUT_Q );
-        move16();
-    }
-
-    IF( LT_16( headroom_left_r1, 32 ) )
-    {
-        r1_fx = W_shr( r1_fx, sub( 32, headroom_left_r1 ) );
-        r1_q = sub( OUTPUT_Q, sub( 32, headroom_left_r1 ) );
-    }
-    ELSE
-    {
-        r1_q = OUTPUT_Q;
-        move16();
-    }
-    Word32 temp_r0_inv = ISqrt32( W_extract_l( r0_fx ), &r0_q );
-    Word32 res = Mpy_32_32( W_extract_l( r1_fx ), temp_r0_inv );
-    // Word16 res_q = r1_q + ( r0_q < 0 ? ( 31 + ( -1 * r0_q ) ) : r0_q ) - 31;
-    Word16 res_q;
-    IF( r0_q < 0 )
-    {
-        res_q = add( r1_q, sub( add( 31, -r0_q ), 31 ) );
-    }
-    ELSE
-    {
-        res_q = add( r1_q, sub( r0_q, 31 ) );
-    }
-    Word16 norm_res = norm_l( res );
-    IF( norm_res > 0 )
-    {
-        *tilt_fx = L_shl_sat( res, norm_res );
-        move32();
-        *tilt_fx_q = add( res_q, norm_res );
-        move16();
-    }
-    ELSE
-    {
-        *tilt_fx = res;
-        move32();
-        *tilt_fx_q = res_q;
-        move16();
-    }
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * swb_tbe_dec()
- *
- * SWB TBE decoder, 6 - 14 kHz (or 7.5 - 15.5 kHz) band decoding module
- *-------------------------------------------------------------------*/
-static void rescale_genSHB_mem_dec(
-    Decoder_State *st_fx,
-    Word16 sf /*Q0*/
-)
-{
-    Word16 i;
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
-
-    FOR( i = 0; i < NL_BUFF_OFFSET; i++ )
-    {
-        hBWE_TD->old_bwe_exc_extended_fx[i] = shl( hBWE_TD->old_bwe_exc_extended_fx[i], sf );
-        move16();
-    }
-
-    FOR( i = 0; i < 7; i++ )
-    {
-        hBWE_TD->mem_genSHBexc_filt_down_shb_fx[i] = shl( hBWE_TD->mem_genSHBexc_filt_down_shb_fx[i], sf );
-        move16();
-    }
-
-    /*  -- Apply memory scaling for 13.2 and 16.4k bps using sf ----*/
-    IF( LT_32( st_fx->total_brate, ACELP_24k40 ) )
-    {
-        FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-        {
-            hBWE_TD->state_lpc_syn_fx[i] = shl_sat( hBWE_TD->state_lpc_syn_fx[i], sf );
-            move16();
-        }
-
-        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-        {
-            hBWE_TD->state_syn_shbexc_fx[i] = shl_sat( hBWE_TD->state_syn_shbexc_fx[i], sf );
-            move16();
-        }
-    }
-
-    hBWE_TD->mem_csfilt_fx[0] = L_shl( hBWE_TD->mem_csfilt_fx[0], sf );
-    move32();
-
-    hBWE_TD->tbe_demph_fx = shl_r( hBWE_TD->tbe_demph_fx, sf );
-    move16();
-    hBWE_TD->tbe_premph_fx = shl_r( hBWE_TD->tbe_premph_fx, sf );
-    move16();
-}
-
-static void gradientGainShape(
-    Decoder_State *st_fx,
-    Word16 *GainShape_fx, /*Q15*/
-    Word32 *GainFrame_fx /* Q18 */ )
-{
-    Word16 i, j, tmp;
-    Word16 GainShapeTemp[NUM_SHB_SUBFR / 4];
-    Word16 GainGrad0[3];
-    Word16 GainGrad1[3];
-    Word16 GainGradFEC[4];
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
-
-
-    /* the previous frame gainshape gradient and the gainshape gradient pattern for the current frame */
-    FOR( j = 0; j < 3; j++ )
-    {
-        GainGrad0[j] = sub( shr( st_fx->GainShape_Delay[j + 1], 1 ), shr( st_fx->GainShape_Delay[j], 1 ) );
-        move16(); /* Q14 */
-        GainGrad1[j] = sub( shr( st_fx->GainShape_Delay[j + 5], 1 ), shr( st_fx->GainShape_Delay[j + 4], 1 ) );
-        move16(); /* Q14 */
-        GainGradFEC[j + 1] = add( mult_r( GainGrad0[j], 13107 /*0.4f in Q15*/ ), mult_r( GainGrad1[j], 19660 /*0.6f in Q15*/ ) );
-        move16(); /* Q14 */
-    }
-
-    /* gradient for the first gainshape */
-    test();
-    test();
-    test();
-    IF( ( ( GT_16( shr( GainGrad1[2], 1 ), GainGrad1[1] ) ) && ( GT_16( shr( GainGrad1[1], 1 ), GainGrad1[0] ) ) ) ||
-        ( ( LT_16( shr( GainGrad1[2], 1 ), GainGrad1[1] ) ) && ( LT_16( shr( GainGrad1[1], 1 ), GainGrad1[0] ) ) ) )
-    {
-        GainGradFEC[0] = add( mult_r( GainGrad1[1], 3277 /*0.1f in Q15*/ ), mult_r( GainGrad1[2], 29490 /*0.9f in Q15*/ ) );
-        move16(); /* Q14 */
-    }
-    ELSE
-    {
-        GainGradFEC[0] = add( mult_r( GainGrad1[0], 6553 /*0.2f in Q15*/ ), mult_r( GainGrad1[1], 9830 /*0.3f in Q15*/ ) );
-        move16();
-        GainGradFEC[0] = add( GainGradFEC[0], mult_r( GainGrad1[2], 16384 /*0.5f in Q15*/ ) );
-        move16(); /* Q14 */
-    }
-
-    /* get the first gainshape template */
-    test();
-    test();
-    IF( ( EQ_16( st_fx->prev_coder_type, UNVOICED ) || ( st_fx->last_good == UNVOICED_CLAS ) ) && ( GainGradFEC[0] > 0 ) )
-    {
-        GainShapeTemp[0] = add( shr( st_fx->GainShape_Delay[7], 1 ), GainGradFEC[0] );
-        move16();
-    }
-    ELSE IF( GainGradFEC[0] > 0 )
-    {
-        GainShapeTemp[0] = add( shr( st_fx->GainShape_Delay[7], 1 ), mult_r( GainGradFEC[0], 16384 /*0.5f in Q15*/ ) );
-        move16(); /* Q14 */
-    }
-    ELSE
-    {
-        GainShapeTemp[0] = shr( st_fx->GainShape_Delay[7], 1 );
-        move16(); /* Q14 */
-    }
-
-    /*Get the second the third and the fourth gainshape template*/
-
-    tmp = shr( GainGrad1[2], 3 ); /* GainGrad1[2]/8 */
-    tmp = mult_r( tmp, 26214 );   /* 0.8 in Q15 tmp*(8/10) */
-
-    test();
-    IF( ( GT_16( tmp, GainGrad1[1] ) ) && ( GainGrad1[1] > 0 ) )
-    {
-        FOR( i = 1; i < NUM_SHB_SUBFR / 4; i++ )
-        {
-            GainShapeTemp[i] = add( GainShapeTemp[i - 1], mult_r( GainGradFEC[i], 26214 /*0.8f in Q15*/ ) );
-            move16(); /* GainShapeTemp[i-1] + 0.8* GainShapeTemp[i] */
-            GainShapeTemp[i] = s_max( GainShapeTemp[i], 328 /*0.01f Q15*/ );
-            move16();
-        }
-    }
-    ELSE
-    {
-        test();
-        IF( ( GT_16( tmp, GainGrad1[1] ) ) && ( GainGrad1[1] < 0 ) )
-        {
-            FOR( i = 1; i < NUM_SHB_SUBFR / 4; i++ )
-            {
-                GainShapeTemp[i] = add( GainShapeTemp[i - 1], mult_r( GainGradFEC[i], 6553 /*0.2f in Q15*/ ) );
-                move16(); /* GainShapeTemp[i-1] + 0.8* GainShapeTemp[i] */
-                GainShapeTemp[i] = s_max( GainShapeTemp[i], 328 /*0.01f Q15*/ );
-                move16(); /* Q14 */
-            }
-        }
-        ELSE
-        {
-            FOR( i = 1; i < NUM_SHB_SUBFR / 4; i++ )
-            {
-                GainShapeTemp[i] = add( GainShapeTemp[i - 1], GainGradFEC[i] );
-                move16();
-                GainShapeTemp[i] = s_max( GainShapeTemp[i], 328 /*0.01f Q15*/ );
-                move16();
-            }
-        }
-    }
-
-    /* Get the gainshape and gain frame for the current frame*/
-    test();
-    test();
-    test();
-    IF( ( EQ_16( st_fx->prev_coder_type, UNVOICED ) || ( st_fx->last_good == UNVOICED_CLAS ) ) && EQ_16( st_fx->nbLostCmpt, 1 ) )
-    {
-        FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
-        {
-            FOR( j = 0; j < 4; j++ )
-            {
-                tmp = mult_r( GainShapeTemp[i], 19660 /*0.6f Q15*/ ); /* GainShapeTemp[i]*0.6 */
-
-                IF( GT_16( 8192, tmp ) )
-                {
-                    GainShape_fx[i * 4 + j] = shl( tmp, 2 ); /*Q15*/
-                    move16();                                /* (GainShapeTemp[i]*0.6)>>1 */
-                }
-                ELSE
-                {
-                    GainShape_fx[i * 4 + j] = 32767; /*Q15*/
-                    move16();                        /* Clipping here to avoid the a huge change of the code due to gain shape change */
-                }
-            }
-        }
-        hBWE_TD->GainAttn_fx = mult_r( hBWE_TD->GainAttn_fx, 31129 );
-        move16();
-    }
-    ELSE IF( EQ_16( st_fx->prev_coder_type, UNVOICED ) || ( st_fx->last_good == UNVOICED_CLAS ) )
-    {
-        FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
-        {
-            FOR( j = 0; j < 4; j++ )
-            {
-                IF( LT_16( GainShapeTemp[i], 16384 ) )
-                {
-                    GainShape_fx[i * 4 + j] = shl( GainShapeTemp[i], 1 ); /*Q15*/
-                    move16();
-                }
-                ELSE
-                {
-                    GainShape_fx[i * 4 + j] = 32767; // 1.0f in Q15
-                    move16();
-                }
-            }
-        }
-        hBWE_TD->GainAttn_fx = mult_r( hBWE_TD->GainAttn_fx, 31129 /*0.95f in Q15*/ ); /*Q15*/
-        move16();
-    }
-    ELSE IF( GT_16( st_fx->nbLostCmpt, 1 ) )
-    {
-        FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
-        {
-            FOR( j = 0; j < 4; j++ )
-            {
-                GainShape_fx[i * 4 + j] = GainShapeTemp[i]; /*Q15*/
-                move16();
-            }
-        }
-        hBWE_TD->GainAttn_fx = mult_r( hBWE_TD->GainAttn_fx, 16384 /*0.5f in Q15*/ ); /*Q15*/
-        move16();
-    }
-    ELSE
-    {
-        FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
-        {
-            FOR( j = 0; j < 4; j++ )
-            {
-                IF( LT_16( GainShapeTemp[i], 16384 ) )
-                {
-                    GainShape_fx[i * 4 + j] = shl( GainShapeTemp[i], 1 ); /*Q15*/
-                    move16();
-                }
-                ELSE
-                {
-                    GainShape_fx[i * 4 + j] = 32767; /*Q15*/
-                    move16();
-                }
-            }
-        }
-        hBWE_TD->GainAttn_fx = mult_r( hBWE_TD->GainAttn_fx, 27852 /*0.85f in Q15*/ ); /*Q15*/
-        move16();
-    }
-
-    *GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, hBWE_TD->GainAttn_fx ); /* Q18 */
-    move32();
-}
-
-static void find_max_mem_dec(
-    Decoder_State *st_fx,
-    Word16 *n_mem,
-    Word16 *n_mem2,
-    Word16 *n_mem3 )
-{
-    Word16 i;
-    Word16 n_mem_32;
-    Word16 max = 0;
-    move16();
-    Word32 Lmax = 0;
-    move32();
-    Word16 tempQ15, max2 = 0;
-    move16();
-    Word16 max3;
-    Word32 tempQ32, Lmax3;
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
-
-    /* old BWE exc max */
-    FOR( i = 0; i < NL_BUFF_OFFSET; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->old_bwe_exc_extended_fx[i] );
-        max = s_max( max, tempQ15 );
-    }
-
-    /* decimate all-pass steep memory */
-    FOR( i = 0; i < 7; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->mem_genSHBexc_filt_down_shb_fx[i] );
-        max = s_max( max, tempQ15 );
-    }
-
-    /*  -- keep norm of state_lpc_syn_fx, state_syn_shbexc_fx,
-           and mem_stp_swb_fx separately for 24.4 and 32kbps ----*/
-    /* findMaxMem2() inside tbe com */
-    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->state_lpc_syn_fx[i] );
-        max2 = s_max( max2, tempQ15 );
-    }
-
-    /* findMaxMem2() inside tbe com */
-    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->state_syn_shbexc_fx[i] );
-        max2 = s_max( max2, tempQ15 );
-    }
-
-    /* findMaxMem2() inside tbe com */
-    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->mem_stp_swb_fx[i] );
-        max2 = s_max( max2, tempQ15 );
-    }
-
-    /* for total_brate > 16.4kbps, use n_mem2; else account for the max2 for n_mem calculation */
-    *n_mem2 = norm_s( max2 );
-    move16();
-    if ( max2 == 0 )
-    {
-        *n_mem2 = 15;
-        move16();
-    }
-
-    if ( LT_32( st_fx->total_brate, ACELP_24k40 ) )
-    {
-        max = s_max( max, max2 );
-    }
-
-    /* de-emph and pre-emph memory */
-    tempQ15 = abs_s( hBWE_TD->tbe_demph_fx );
-    max = s_max( max, tempQ15 );
-
-    tempQ15 = abs_s( hBWE_TD->tbe_premph_fx );
-    max = s_max( max, tempQ15 );
-
-    IF( EQ_16( st_fx->extl, FB_TBE ) )
-    {
-        FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-        {
-            tempQ15 = abs_s( hBWE_TD->fb_state_lpc_syn_fx[i] );
-            max = s_max( max, tempQ15 );
-        }
-        /* FB de-emph memory */
-        tempQ15 = abs_s( hBWE_TD->fb_tbe_demph_fx );
-        max = s_max( max, tempQ15 );
-    }
-    /* estimate the norm for 16-bit memories  */
-    *n_mem = norm_s( max );
-    move16();
-    if ( max == 0 )
-    {
-        *n_mem = 15;
-        move16();
-    }
-
-    /* estimate the norm for 32-bit memories */
-    Lmax = L_abs( hBWE_TD->mem_csfilt_fx[0] ); /* only element [0] is used in env. shaping */
-
-    n_mem_32 = norm_l( Lmax );
-    if ( Lmax == 0 )
-    {
-        n_mem_32 = 31;
-        move16();
-    }
-
-    tempQ15 = sub( s_min( *n_mem, n_mem_32 ), 1 );
-    *n_mem = s_max( tempQ15, 0 );
-    move16();
-
-    /* --------------------------------------------------------------*/
-    /* Find headroom for synthesis stage associated with these memories:
-          1. st_fx->syn_overlap_fx
-          2. st_fx->genSHBsynth_state_lsyn_filt_shb_local
-          3. st_fx->genSHBsynth_Hilbert_Mem_fx (32-bit) */
-    max3 = 0;
-    move16();
-    /* find max in prev overlapSyn */
-    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->syn_overlap_fx[i] );
-        max3 = s_max( max3, tempQ15 );
-    }
-    /* find max in prev genSHBsynth_state_lsyn_filt_shb_local_fx */
-    FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] );
-        max3 = s_max( max3, tempQ15 );
-    }
-    /* find max in prev int_3_over_2_tbemem_dec_fx */
-    IF( EQ_32( st_fx->output_Fs, 48000 ) )
-    {
-        FOR( i = 0; i < INTERP_3_2_MEM_LEN; i++ )
-        {
-            tempQ15 = abs_s( hBWE_TD->int_3_over_2_tbemem_dec_fx[i] );
-            max3 = s_max( max3, tempQ15 );
-        }
-    }
-    IF( EQ_32( st_fx->output_Fs, 16000 ) )
-    {
-        FOR( i = 0; i < ( 2 * ALLPASSSECTIONS_STEEP + 1 ); i++ )
-        {
-            tempQ15 = abs_s( hBWE_TD->mem_resamp_HB_32k_fx[i] );
-            max3 = s_max( max3, tempQ15 );
-        }
-    }
-    /* estimate the norm for 16-bit memories  */
-    *n_mem3 = norm_s( max3 );
-    move16();
-    if ( max3 == 0 )
-    {
-        *n_mem3 = 15;
-        move16();
-    }
-
-    Lmax3 = 0;
-    move32();
-    IF( EQ_16( st_fx->L_frame, L_FRAME ) )
-    {
-        /* find max in prev genSHBsynth_Hilbert_Mem_fx */
-        FOR( i = 0; i < HILBERT_MEM_SIZE; i++ )
-        {
-            tempQ32 = L_abs( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] );
-            Lmax3 = L_max( Lmax3, tempQ32 );
-        }
-    }
-
-    /* estimate the norm for 32-bit memories  */
-    n_mem_32 = norm_l( Lmax3 );
-    if ( Lmax3 == 0 )
-    {
-        n_mem_32 = 31;
-        move16();
-    }
-
-    tempQ15 = sub( s_min( *n_mem3, n_mem_32 ), 2 ); /* very important leave at least 2 bit head room
-                                                       because of the Hilber transform and Q14 coeffs */
-    *n_mem3 = s_max( tempQ15, 0 );
-    move16();
-    /* --------------------------------------------------------------*/
-}
-
-void find_max_mem_dec_m3(
-    Decoder_State *st,
-    Word16 *n_mem3 )
-{
-    Word16 i;
-    // Word16 n_mem_32;
-    Word16 tempQ15;
-    Word16 max3;
-    // Word32 tempQ32, Lmax3;
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st->hBWE_TD;
-
-    /* --------------------------------------------------------------*/
-    /* Find headroom for synthesis stage associated with these memories:
-          1. st->syn_overlap_fx*/
-    max3 = 0;
-    move16();
-    /* find max in prev overlapSyn */
-    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-    {
-        tempQ15 = abs_s( hBWE_TD->syn_overlap_fx[i] );
-        max3 = s_max( max3, tempQ15 );
-    }
-    /* find max in prev genSHBsynth_state_lsyn_filt_shb_local_fx */
-
-    /* estimate the norm for 16-bit memories  */
-    *n_mem3 = norm_s( max3 );
-    move16();
-    if ( max3 == 0 )
-    {
-        *n_mem3 = 15;
-        move16();
-    }
-}
-
-/*-------------------------------------------------------------------*
- * ivas_swb_tbe_dec_fx()
- *
- * SWB TBE decoder, 6 - 14 kHz (or 7.5 - 15.5 kHz) band decoding module
- *-------------------------------------------------------------------*/
-void ivas_swb_tbe_dec_fx(
-    Decoder_State *st,                    /* i/o: decoder state structure                           */
-    STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure                            */
-    const Word32 *bwe_exc_extended_fx,    /* i  : bandwidth extended excitation : Q_exc             */
-    Word16 Q_exc,
-    const Word16 voice_factors_fx[],    /* i  : voicing factors  : Q15                              */
-    const Word32 old_syn_12k8_16k_fx[], /* i  : low band synthesis : old_syn_fx                     */
-    Word16 *White_exc16k_fx,            /* o  : shaped white excitation for the FB TBE : Q_white_exc*/
-    Word32 *synth_fx,                   /* o  : SHB synthesis/final synthesis  : Qx                 */
-    Word16 *pitch_buf_fx,               /* i  : Q6                                                  */
-    Word16 *Q_white_exc )
-{
-    Word16 i, j, cnt, n;
-    Word16 stemp;
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    Word32 shaped_shb_excitation_fx_32[L_FRAME16k + L_SHB_LAHEAD];
-    Word16 bwe_exc_extended_16[L_FRAME32k + NL_BUFF_OFFSET];
-    Word16 shaped_shb_excitation_fx[L_FRAME16k + L_SHB_LAHEAD];
-    Word16 lsf_shb_fx[LPC_SHB_ORDER], lpc_shb_fx[LPC_SHB_ORDER + 1], GainShape_fx[NUM_SHB_SUBFR]; // Q12,Q12,Q15
-    Word32 GainFrame_fx;                                                                          // Q18
-    Word32 error_fx[L_FRAME32k];
-    Word16 ener_fx;
-    Word32 L_ener;
-    Word16 is_fractive;
-    Word32 prev_pow_fx, curr_pow_fx, Lscale;
-    Word16 scale_fx;
-    Word16 max_val, temp_fx, shaped_shb_excitation_frac[L_FRAME16k + L_SHB_LAHEAD];
-    Word32 curr_frame_pow_fx;
-    Word16 curr_frame_pow_exp;
-    Word32 L_prev_ener_shb;
-    Word16 vf_modified_fx[NB_SUBFR16k];
-    Word16 f_fx, inc_fx;
-    Word32 GainFrame_prevfrm_fx;
-    Word32 tilt_swb_fec_32_fx;
-    Word16 tilt_swb_fec_fx_q;
-    Word16 tilt_swb_fec_fx;
-    Word32 prev_ener_ratio_fx = 0; /* initialize just to avoid compiler warning */
-    Word16 lsp_shb_1_fx[LPC_SHB_ORDER], lsp_shb_2_fx[LPC_SHB_ORDER], lsp_temp_fx[LPC_SHB_ORDER];
-    Word16 lpc_shb_sf_fx[4 * ( LPC_SHB_ORDER + 1 )];
-    const Word16 *ptr_lsp_interp_coef_fx;
-    Word32 shb_ener_sf_32;
-    Word16 shb_res_gshape_fx[NB_SUBFR16k];
-    Word16 mixFactors_fx;
-    Word16 vind;
-    Word16 shb_res_dummy_fx[L_FRAME16k];
-    Word16 shaped_shb_excitationTemp_fx[L_FRAME16k];
-    Word32 ener_tmp_fx[NUM_SHB_SUBGAINS];
-    Word16 GainShape_tmp_fx[NUM_SHB_SUBGAINS];
-    Word16 pitch_fx;
-    Word16 l_subframe;
-    Word16 formant_fac_fx;
-    Word16 synth_scale_fx;
-    Word16 lsf_diff_fx[LPC_SHB_ORDER], w_fx[LPC_SHB_ORDER];
-    Word16 refl_fx[M];
-    Word16 tilt_para_fx;
-    Word16 *nlExc16k_fx, *mixExc16k_fx;
-    Word16 MSFlag;
-    Word16 feedback_fx;
-    Word16 GainShape_tilt_fx;
-
-    // scaling
-    Word16 exp, tmp;
-    Word16 tmp1, tmp2;
-    Word16 mean_vf;
-    Word32 Lmax, L_tmp;
-    Word16 frac;
-    Word32 L_tmp1, L_tmp2;
-    Word16 Q_bwe_exc;
-    Word16 Q_bwe_exc_fb;
-    Word16 Q_shb;
-    Word16 n_mem, n_mem2, n_mem3, Qx, sc;
-    Word16 expa, expb;
-    Word16 fraca, fracb;
-    Word16 exp_ener, inv_ener;
-
-    hBWE_TD = st->hBWE_TD;
-
-    /* initializations */
-    GainFrame_fx = 0;
-    move32();
-    mixFactors_fx = 0;
-    move16();
-    shb_ener_sf_32 = 0;
-    move32();
-    set16_fx( shaped_shb_excitationTemp_fx, 0, L_FRAME16k );
-    if ( st->hTdCngDec != NULL )
-    {
-        st->hTdCngDec->shb_dtx_count = 0;
-        move16();
-    }
-    is_fractive = 0;
-    move16();
-
-    IF( hStereoICBWE != NULL )
-    {
-        nlExc16k_fx = hStereoICBWE->nlExc16k_fx;
-        mixExc16k_fx = hStereoICBWE->mixExc16k_fx;
-        MSFlag = hStereoICBWE->MSFlag;
-        move16();
-    }
-    ELSE
-    {
-        nlExc16k_fx = NULL;
-        mixExc16k_fx = NULL;
-        MSFlag = 0;
-        move16();
-    }
-
-    /* find tilt */
-    calc_tilt_bwe_fx_loc( old_syn_12k8_16k_fx, &tilt_swb_fec_32_fx, &tilt_swb_fec_fx_q, L_FRAME );
-    tilt_swb_fec_fx = round_fx_sat( L_shl_sat( tilt_swb_fec_32_fx, sub( 11 + 16, tilt_swb_fec_fx_q ) ) );
-    test();
-    if ( st->bfi && st->clas_dec != UNVOICED_CLAS )
-    {
-        tilt_swb_fec_fx = hBWE_TD->tilt_swb_fec_fx;
-        move16();
-    }
-
-    /* WB/SWB bandwidth switching */
-    test();
-    test();
-    IF( ( GT_16( st->tilt_wb_fx, 10240 /*5 in Q11*/ ) && ( EQ_16( st->clas_dec, UNVOICED_CLAS ) ) ) || GT_16( st->tilt_wb_fx, 20480 /*10 in Q11*/ ) )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( ( st->prev_fractive == 0 ) &&
-              ( LT_32( st->prev_enerLH_fx, L_shl( st->enerLH_fx, 1 ) ) && GT_32( st->prev_enerLH_fx, L_shr( st->enerLH_fx, 1 ) ) && LT_32( st->prev_enerLL_fx, L_shl( st->enerLL_fx, 1 ) ) && GT_32( st->prev_enerLL_fx, L_shr( st->enerLL_fx, 1 ) ) ) ) ||
-            ( EQ_16( st->prev_fractive, 1 ) &&
-              GT_32( L_shr( st->prev_enerLH_fx, 2 ), Mult_32_16( st->enerLH_fx, 24576 ) ) ) /* 24576 in Q13*/
-            || ( GT_32( L_shr( st->enerLL_fx, 1 ), Mult_32_16( st->enerLH_fx, 24576 ) ) &&  /*24576 = 1.5 in Q14*/
-                 LT_16( st->tilt_wb_fx, 20480 ) )                                           /* 20480 = 10 in Q11*/
-        )
-        {
-            is_fractive = 0;
-        }
-        ELSE
-        {
-            is_fractive = 1;
-        }
-        move16();
-    }
-
-    /* WB/SWB bandwidth switching */
-    IF( st->bws_cnt > 0 )
-    {
-        f_fx = 1489; /*1.0f / 22.0f in Q15*/
-        move16();
-        inc_fx = 1489; /*1.0f / 22.0f in Q15*/
-        move16();
-
-        IF( EQ_16( is_fractive, 1 ) )
-        {
-            Copy( lsf_tab_fx, hBWE_TD->lsp_prevfrm_fx, LPC_SHB_ORDER );
-        }
-        ELSE
-        {
-            FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-            {
-                hBWE_TD->lsp_prevfrm_fx[i] = f_fx; /*Q15*/
-                move16();
-                f_fx = add( f_fx, inc_fx ); /*Q15*/
-            }
-        }
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) && !( ( L_sub( L_shr( st->prev_enerLH_fx, 1 ), st->enerLH_fx ) < 0 ) && L_sub( st->prev_enerLH_fx, ( L_shr( st->enerLH_fx, 1 ) > 0 ) ) ) ) || st->last_core != ACELP_CORE || ( ( st->last_core == ACELP_CORE ) && GT_32( abs( L_sub( st->last_core_brate, st->core_brate ) ), 3600 ) ) || EQ_16( s_xor( is_fractive, st->prev_fractive ), 1 ) )
-        {
-            set16_fx( GainShape_fx, 11587, NUM_SHB_SUBFR ); /*0.3536f in Q15*/
-        }
-        ELSE
-        {
-            if ( GT_16( hBWE_TD->prev_GainShape_fx, 11587 ) ) /*0.3536f in Q15*/
-            {
-                hBWE_TD->prev_GainShape_fx = 11587; /*0.3536f in Q15*/
-                move16();
-            }
-            set16_fx( GainShape_fx, hBWE_TD->prev_GainShape_fx, NUM_SHB_SUBFR );
-        }
-
-        Copy( hBWE_TD->lsp_prevfrm_fx, lsf_shb_fx, LPC_SHB_ORDER );
-        set16_fx( shb_res_gshape_fx, 3277 /*0.2f Q14*/, NB_SUBFR16k ); /* Q14 */
-    }
-    ELSE
-    {
-        test();
-        IF( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) )
-        {
-            f_fx = 1489; /*Q15*/
-            move16();
-            inc_fx = 1489; /*Q15*/
-            move16();
-            FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-            {
-                hBWE_TD->lsp_prevfrm_fx[i] = f_fx; /*Q15*/
-                move16();
-                f_fx = add( f_fx, inc_fx );
-            }
-        }
-
-        IF( !st->bfi )
-        {
-            IF( st->use_partial_copy )
-            {
-                IF( NE_16( st->last_extl, SWB_TBE ) )
-                {
-                    hBWE_TD->GainFrame_prevfrm_fx = 0;
-                    move32();
-                    f_fx = 1489 /*0.045454f Q15*/;
-                    move16();
-                    inc_fx = 1489 /*0.045454f Q15*/;
-                    move16();
-                    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-                    {
-                        hBWE_TD->lsp_prevfrm_fx[i] = f_fx; /*Q15*/
-                        move16();
-                        f_fx = add( f_fx, inc_fx ); /*Q15*/
-                    }
-                }
-                Copy( hBWE_TD->lsp_prevfrm_fx, lsf_shb_fx, LPC_SHB_ORDER );
-                set16_fx( GainShape_fx, RECIP_ROOT_EIGHT_FX, NUM_SHB_SUBFR );
-
-                IF( EQ_16( st->rf_frame_type, RF_NELP ) )
-                {
-                    /* Frame gain */
-
-                    GainFrame_fx = L_mac( SHB_GAIN_QLOW_FX, st->rf_indx_tbeGainFr, SHB_GAIN_QDELTA_FX );
-                    L_tmp = Mult_32_16( GainFrame_fx, 27213 ); /*Q16*/ /* 3.321928 in Q13 */
-
-                    frac = L_Extract_lc( L_tmp, &exp );
-                    L_tmp = Pow2( 30, frac );
-                    GainFrame_fx = L_shl( L_tmp, sub( exp, 12 ) ); /*Q18*/
-
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    test();
-                    IF( ( st->core == ACELP_CORE ) && ( st->last_core == ACELP_CORE ) && !st->prev_use_partial_copy && EQ_16( st->prev_coder_type, UNVOICED ) && NE_32( GainFrame_fx, hBWE_TD->GainFrame_prevfrm_fx ) && NE_16( st->next_coder_type, GENERIC ) && EQ_16( st->last_extl, SWB_TBE ) )
-                    {
-                        GainFrame_fx = L_add( Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 26214 /*0.8f in Q15*/ ), Mult_32_16( GainFrame_fx, 6553 /*0.2f in Q15*/ ) );
-                    }
-                }
-                ELSE
-                {
-                    temp_fx = 0;
-                    move16();
-                    /* Frame gain */
-                    SWITCH( st->rf_indx_tbeGainFr )
-                    {
-                        case 0:
-                            GainFrame_fx = 131072; /* 0.5f in Q18 */
-                            move32();
-                            if ( LE_32( hBWE_TD->GainFrame_prevfrm_fx, 327680l /*1.25 Q18*/ ) )
-                            {
-                                temp_fx = 26214 /*0.8 Q15*/;
-                                move16();
-                            }
-                            BREAK;
-                        case 1:
-                            GainFrame_fx = 524288; /* 2.0f in Q18 */
-                            move32();
-                            test();
-                            if ( GT_32( hBWE_TD->GainFrame_prevfrm_fx, 327680l /*1.25 Q18*/ ) && LE_32( hBWE_TD->GainFrame_prevfrm_fx, 786432l /*3 Q18*/ ) )
-                            {
-                                temp_fx = 26214 /*0.8 Q15*/;
-                                move16();
-                            }
-                            BREAK;
-                        case 2:
-                            GainFrame_fx = 1048576; /* 4.0f in Q18 */
-                            move32();
-                            test();
-                            if ( GT_32( hBWE_TD->GainFrame_prevfrm_fx, 786432l /*3 Q18*/ ) && LE_32( hBWE_TD->GainFrame_prevfrm_fx, 1572864l /*6 Q18*/ ) )
-                            {
-                                temp_fx = 26214 /*0.8 Q15*/;
-                                move16();
-                            }
-                            BREAK;
-                        case 3:
-                            GainFrame_fx = 2097152; /* 8.0f in Q18 */
-                            move32();
-                            test();
-                            if ( GT_32( hBWE_TD->GainFrame_prevfrm_fx, 1572864l /*6 Q18*/ ) && LE_32( hBWE_TD->GainFrame_prevfrm_fx, 4194304l /*16Q18*/ ) )
-                            {
-                                temp_fx = 26214 /*0.8 Q15*/;
-                                move16();
-                            }
-                            BREAK;
-                        default:
-                            fprintf( stderr, "RF SWB-TBE gain bits not supported." );
-                    }
-
-                    IF( EQ_16( st->last_extl, SWB_TBE ) )
-                    {
-                        GainFrame_fx = L_add( Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, temp_fx ), Mult_32_16( GainFrame_fx, sub( 32767, temp_fx ) ) );
-                        /*Q18*/
-                    }
-
-                    IF( ( st->core == ACELP_CORE ) && ( st->last_core == ACELP_CORE ) )
-                    {
-                        if ( !st->prev_use_partial_copy && EQ_16( st->last_coder_type, VOICED ) && EQ_16( st->rf_frame_type, RF_GENPRED ) && GT_32( GainFrame_fx, 2097152 /*8.0f in Q18*/ ) && LT_32( GainFrame_fx, 3059606 /*11.67f in Q18*/ ) )
-                        {
-                            GainFrame_fx = Mult_32_16( GainFrame_fx, 9830 /*0.3f in Q15*/ ); // Q18
-                        }
-                    }
-                }
-            }
-            ELSE
-            {
-                /* de-quantization */
-                ivas_dequantizeSHBparams_fx_9_1( st, st->extl, st->extl_brate, lsf_shb_fx, GainShape_fx, &GainFrame_fx, &stemp,
-                                                 &shb_ener_sf_32, shb_res_gshape_fx, &mixFactors_fx, &MSFlag );
-                if ( hStereoICBWE != NULL )
-                {
-                    hStereoICBWE->MSFlag = MSFlag;
-                    move16();
-                }
-            }
-        }
-        ELSE
-        {
-            Copy( hBWE_TD->lsp_prevfrm_fx, lsf_shb_fx, LPC_SHB_ORDER );
-            test();
-            IF( EQ_16( st->codec_mode, MODE1 ) && ( st->element_mode == EVS_MONO ) )
-            {
-                gradientGainShape( st, GainShape_fx, &GainFrame_fx );
-            }
-            ELSE
-            {
-                FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
-                {
-                    FOR( j = 0; j < 4; j++ )
-                    {
-                        GainShape_fx[i * 4 + j] = mult_r( st->cummulative_damping, st->GainShape_Delay[4 + i] );
-                        move16();
-                    }
-                }
-                IF( GT_16( tilt_swb_fec_fx, ( 8 << 11 ) ) ) /* tilt_swb_fec_fx in Q11 */
-                {
-                    IF( EQ_16( st->nbLostCmpt, 1 ) )
-                    {
-                        GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 19661 /*0.6f Q15*/ );
-                    }
-                    ELSE IF( EQ_16( st->nbLostCmpt, 2 ) )
-                    {
-                        GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 11469 /*0.35f Q15*/ );
-                    }
-                    ELSE
-                    {
-                        GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 6554 /*0.2f Q15*/ );
-                    }
-                    GainFrame_fx = Mult_32_16( GainFrame_fx, st->cummulative_damping );
-                }
-                ELSE
-                {
-                    GainFrame_fx = hBWE_TD->GainFrame_prevfrm_fx;
-                    move32(); /* gain locking */
-                }
-            }
-
-            IF( GE_32( st->extl_brate, SWB_TBE_2k8 ) )
-            {
-                test();
-                IF( EQ_16( st->codec_mode, MODE1 ) && ( st->element_mode == EVS_MONO ) )
-                {
-                    L_tmp = L_mult( extract_l( hBWE_TD->prev2_shb_ener_sf_fx ), extract_l( hBWE_TD->prev3_shb_ener_sf_fx ) ); /*Q1*/
-                    tmp = round_fx( root_a_fx( L_tmp, 1, &exp ) );                                                            /* Q = 15-exp */
-                    tmp1 = extract_l( hBWE_TD->prev1_shb_ener_sf_fx );                                                        /*Q0*/
-                    i = sub( norm_s( tmp1 ), 1 );
-                    tmp1 = shl( tmp1, i ); /* Qi */
-                    IF( tmp == 0 )
-                    {
-                        tmp = 32767 /*1.0f Q15*/;
-                        move16(); /*Q15*/
-                    }
-                    ELSE
-                    {
-                        scale_fx = div_s( tmp1, tmp ); /* Q15 - Q(15-exp) + Qi  = Qexp+i */
-                        scale_fx = s_max( scale_fx, 0 );
-#ifdef BASOP_NOGLOB
-                        tmp = shl_sat( scale_fx, sub( sub( 15, exp ), i ) ); /*Q15*/
-#else
-                        tmp = shl( scale, 15 - exp - i ); /*Q15*/
-#endif
-                    }
-                    scale_fx = mult_r( hBWE_TD->prev_res_shb_gshape_fx, tmp ); /* Q14 */
-                    test();
-                    IF( GT_32( L_shr( hBWE_TD->prev2_shb_ener_sf_fx, 1 ), hBWE_TD->prev1_shb_ener_sf_fx ) ||
-                        GT_32( L_shr( hBWE_TD->prev3_shb_ener_sf_fx, 1 ), hBWE_TD->prev2_shb_ener_sf_fx ) )
-                    {
-                        shb_ener_sf_32 = Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, scale_fx );
-
-                        if ( GT_16( st->nbLostCmpt, 1 ) )
-                        {
-                            shb_ener_sf_32 = L_shr( shb_ener_sf_32, 1 );
-                        }
-                    }
-                    ELSE
-                    {
-                        L_tmp = L_mult( scale_fx, scale_fx ); /* Q29 */
-                        shb_ener_sf_32 = L_shl( Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, round_fx( L_tmp ) ), 2 );
-                    }
-                }
-                ELSE
-                {
-                    test();
-                    IF( GT_32( L_shr( hBWE_TD->prev2_shb_ener_sf_fx, 1 ), hBWE_TD->prev1_shb_ener_sf_fx ) ||
-                        GT_32( L_shr( hBWE_TD->prev3_shb_ener_sf_fx, 1 ), hBWE_TD->prev2_shb_ener_sf_fx ) )
-                    {
-                        shb_ener_sf_32 = L_shr( Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, st->cummulative_damping ), 1 );
-                    }
-                    ELSE
-                    {
-                        shb_ener_sf_32 = Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, st->cummulative_damping );
-                    }
-                }
-            }
-
-            shb_ener_sf_32 = L_max( shb_ener_sf_32, 1l /*1.0f Q0*/ );
-            mixFactors_fx = hBWE_TD->prev_mixFactors_fx;
-            move16();
-
-            IF( EQ_16( st->codec_mode, MODE1 ) )
-            {
-                set16_fx( shb_res_gshape_fx, 3277 /*0.2f Q14*/, 5 ); /* Q14 */
-            }
-            ELSE
-            {
-                set16_fx( shb_res_gshape_fx, 16384 /*1.0f Q14*/, 5 ); /* Q14 */
-            }
-        }
-    }
-
-    /* get the gainshape delay */
-    Copy( &st->GainShape_Delay[4], &st->GainShape_Delay[0], NUM_SHB_SUBFR / 4 );
-    FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
-    {
-        st->GainShape_Delay[i + 4] = GainShape_fx[i * 4]; /*Q15*/
-        move16();
-    }
-
-    L_tmp = L_mult( voice_factors_fx[0], 8192 );
-    L_tmp = L_mac( L_tmp, voice_factors_fx[1], 8192 );
-    L_tmp = L_mac( L_tmp, voice_factors_fx[2], 8192 );
-    mean_vf = mac_r( L_tmp, voice_factors_fx[3], 8192 );
-
-    Copy( voice_factors_fx, vf_modified_fx, NB_SUBFR16k );
-
-    test();
-    IF( EQ_16( st->coder_type, VOICED ) || GT_16( mean_vf, 13107 /*0.4f Q15*/ ) )
-    {
-        FOR( i = 1; i < NB_SUBFR; i++ )
-        {
-            L_tmp = L_mult( voice_factors_fx[i], 26214 /*0.8f Q15*/ );
-            vf_modified_fx[i] = mac_r( L_tmp, voice_factors_fx[i - 1], 6554 /*0.2f Q15*/ );
-            move16();
-        }
-
-        IF( st->L_frame != L_FRAME )
-        {
-            L_tmp = L_mult( voice_factors_fx[4], 26214 /*0.8f Q15*/ );
-            vf_modified_fx[4] = mac_r( L_tmp, voice_factors_fx[3], 6554 /*0.2f Q15*/ );
-            move16();
-        }
-    }
-
-    test();
-    IF( st->use_partial_copy && st->nelp_mode_dec )
-    {
-        set16_fx( vf_modified_fx, 0, NB_SUBFR16k );
-    }
-
-    /* SHB LSF from current frame; and convert to LSP for interpolation */
-    E_LPC_lsf_lsp_conversion( lsf_shb_fx, lsp_shb_2_fx, LPC_SHB_ORDER );
-
-    test();
-    IF( EQ_16( st->last_extl, SWB_TBE ) || EQ_16( st->last_extl, FB_TBE ) )
-    {
-        /* SHB LSP values from prev. frame for interpolation */
-        Copy( hBWE_TD->swb_lsp_prev_interp_fx, lsp_shb_1_fx, LPC_SHB_ORDER );
-    }
-    ELSE
-    {
-        /* Use current frame's LSPs; in effect no interpolation */
-        Copy( lsp_shb_2_fx, lsp_shb_1_fx, LPC_SHB_ORDER );
-    }
-
-    test();
-    test();
-    test();
-    IF( ( st->bws_cnt == 0 ) && ( st->bws_cnt1 == 0 ) && ( st->prev_use_partial_copy == 0 ) && ( st->use_partial_copy == 0 ) )
-    {
-        lsf_diff_fx[0] = 16384;
-        move16(); /*Q15*/
-        lsf_diff_fx[LPC_SHB_ORDER - 1] = 16384;
-        move16(); /*Q15*/
-        FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
-        {
-            lsf_diff_fx[i] = sub( lsf_shb_fx[i], lsf_shb_fx[i - 1] );
-            move16();
-        }
-
-        a2rc_fx( hBWE_TD->cur_sub_Aq_fx + 1, refl_fx, M );
-        tmp = add( 16384, shr( refl_fx[0], 1 ) ); /*Q14*/
-        tmp1 = mult( 27425, tmp );
-        tmp1 = mult( tmp1, tmp );                      /*Q10*/
-        tmp2 = shr( mult( 31715, tmp ), 2 );           /*Q10*/
-        tilt_para_fx = add( sub( tmp1, tmp2 ), 1335 ); /*Q10*/
-
-        test();
-        IF( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) )
-        {
-            FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
-            {
-                hBWE_TD->prev_lsf_diff_fx[i - 1] = shr( lsf_diff_fx[i], 1 );
-                move16();
-            }
-        }
-
-        IF( LE_32( st->extl_brate, FB_TBE_1k8 ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( !( GT_16( hBWE_TD->prev_tilt_para_fx, 5120 ) && ( EQ_16( st->coder_type, TRANSITION ) || LT_16( tilt_para_fx, 1024 ) ) ) &&
-                !( ( ( LT_16( hBWE_TD->prev_tilt_para_fx, 3072 ) && GE_16( st->prev_coder_type, VOICED ) ) ) && GT_16( tilt_para_fx, 5120 ) ) )
-            {
-                FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
-                {
-                    IF( LT_16( lsf_diff_fx[i], hBWE_TD->prev_lsf_diff_fx[i - 1] ) )
-                    {
-                        tmp = mult( 26214, lsf_diff_fx[i] );
-
-                        test();
-                        IF( ( hBWE_TD->prev_lsf_diff_fx[i - 1] <= 0 ) || ( tmp < 0 ) ) /* safety check in case of bit errors */
-                        {
-                            st->BER_detect = 1;
-                            move16();
-                            tmp = 0;
-                            move16();
-                        }
-                        ELSE
-                        {
-                            tmp = div_s( tmp, hBWE_TD->prev_lsf_diff_fx[i - 1] );
-                        }
-
-                        tmp = s_max( tmp, 16384 );
-                        w_fx[i] = s_min( tmp, 32767 );
-                        move16();
-                    }
-                    ELSE
-                    {
-                        tmp = mult( 26214, hBWE_TD->prev_lsf_diff_fx[i - 1] );
-
-                        test();
-                        IF( ( lsf_diff_fx[i] <= 0 ) || ( tmp < 0 ) ) /* safety check in case of bit errors */
-                        {
-                            st->BER_detect = 1;
-                            move16();
-                            tmp = 0;
-                            move16();
-                        }
-                        ELSE
-                        {
-                            tmp = div_s( tmp, lsf_diff_fx[i] );
-                        }
-
-                        tmp = s_max( tmp, 16384 );
-                        w_fx[i] = s_min( tmp, 32767 );
-                        move16();
-                    }
-                }
-                w_fx[0] = w_fx[1];
-                move16();
-                w_fx[LPC_SHB_ORDER - 1] = w_fx[LPC_SHB_ORDER - 2];
-                move16();
-
-                FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-                {
-                    tmp1 = mult( lsp_shb_1_fx[i], sub( 32767, w_fx[i] ) );
-                    tmp2 = mult( lsp_shb_2_fx[i], w_fx[i] );
-                    lsp_temp_fx[i] = add( tmp1, tmp2 );
-                    move16();
-                }
-            }
-            ELSE
-            {
-                Copy( lsp_shb_2_fx, lsp_temp_fx, LPC_SHB_ORDER );
-            }
-
-            /* convert from lsp to lsf */
-            lsp2lsf_fx( lsp_temp_fx, lsf_shb_fx, LPC_SHB_ORDER, 1 );
-        }
-
-        Copy( lsf_diff_fx + 1, hBWE_TD->prev_lsf_diff_fx, LPC_SHB_ORDER - 2 );
-        hBWE_TD->prev_tilt_para_fx = tilt_para_fx;
-        move16();
-    }
-    ELSE
-    {
-        Copy( lsp_shb_2_fx, lsp_temp_fx, LPC_SHB_ORDER );
-    }
-
-    IF( GE_32( st->extl_brate, SWB_TBE_2k8 ) )
-    {
-        /* SHB LSP interpolation */
-        ptr_lsp_interp_coef_fx = interpol_frac_shb; /*Q15*/
-        FOR( j = 0; j < 4; j++ )
-        {
-            FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-            {
-                L_tmp = L_mult( lsp_shb_1_fx[i], ( *ptr_lsp_interp_coef_fx ) );
-                lsp_temp_fx[i] = mac_r( L_tmp, lsp_shb_2_fx[i], ( *( ptr_lsp_interp_coef_fx + 1 ) ) );
-                move16();
-            }
-            ptr_lsp_interp_coef_fx += 2;
-
-            tmp = i_mult( j, ( LPC_SHB_ORDER + 1 ) );
-            /* convert LSPs to LP coefficients */
-            E_LPC_f_lsp_a_conversion( lsp_temp_fx, lpc_shb_sf_fx + tmp, LPC_SHB_ORDER );
-#ifndef FIX_1100_REMOVE_LPC_RESCALING
-            /* Bring the LPCs to Q12 */
-            Copy_Scale_sig( lpc_shb_sf_fx + tmp, lpc_shb_sf_fx + tmp, LPC_SHB_ORDER + 1, sub( norm_s( lpc_shb_sf_fx[tmp] ), 2 ) );
-            lpc_shb_sf_fx[i_mult( j, ( LPC_SHB_ORDER + 1 ) )] = ONE_IN_Q12; // recheck this
-            move16();
-#endif
-        }
-    }
-
-    /* Save the SWB LSP values from current frame for interpolation */
-    Copy( lsp_shb_2_fx, hBWE_TD->swb_lsp_prev_interp_fx, LPC_SHB_ORDER );
-
-    /* save the shb_ener and mixFactor values */
-    hBWE_TD->prev3_shb_ener_sf_fx = hBWE_TD->prev2_shb_ener_sf_fx;
-    move32();
-    hBWE_TD->prev2_shb_ener_sf_fx = hBWE_TD->prev1_shb_ener_sf_fx;
-    move32();
-    hBWE_TD->prev1_shb_ener_sf_fx = shb_ener_sf_32;
-    move32();
-    hBWE_TD->prev_res_shb_gshape_fx = shb_res_gshape_fx[4];
-    move16();
-    hBWE_TD->prev_mixFactors_fx = mixFactors_fx;
-    move16();
-
-    /* SWB CNG/DTX - update memories */
-    IF( st->hTdCngDec != NULL )
-    {
-        Copy( st->hTdCngDec->lsp_shb_prev_fx, st->hTdCngDec->lsp_shb_prev_prev_fx, LPC_SHB_ORDER );
-        Copy( lsf_shb_fx, st->hTdCngDec->lsp_shb_prev_fx, LPC_SHB_ORDER );
-    }
-
-    /* convert LSPs back into LP coeffs */
-    E_LPC_f_lsp_a_conversion( lsp_temp_fx, lpc_shb_fx, LPC_SHB_ORDER );
-    Copy_Scale_sig( lpc_shb_fx, lpc_shb_fx, LPC_SHB_ORDER + 1, sub( norm_s( lpc_shb_fx[0] ), 2 ) ); /* Q12 */
-    lpc_shb_fx[0] = ONE_IN_Q12;
-    move16();
-
-    test();
-    IF( EQ_32( st->extl_brate, SWB_TBE_1k10 ) || EQ_32( st->extl_brate, SWB_TBE_1k75 ) )
-    {
-        Word32 vind_temp = Mpy_32_32( L_shl( L_add( L_deposit_l( mixFactors_fx ), 1 ), 15 ), ( ( ( 1 << NUM_BITS_SHB_VF ) - 1 ) << 16 ) ); // check addition of 1
-        vind = extract_l( L_shr( vind_temp, 15 ) ); /* 3 for mpy by 8.0f, -15 to bring it to Q0 */                                         /*mixFactors*7*/
-        /* i: mixFactors_fx in Q15 */
-        /* o: vind in Q0        */
-    }
-    ELSE
-    {
-        vind = shl( mixFactors_fx, 3 - 15 ); /* 3 for mpy by 8.0f, -15 to bring it to Q0 */ /*mixFactors*8*/
-        /* i: mixFactors_fx in Q15 */
-        /* o: vind in Q0        */
-    }
-
-    /* Determine formant PF strength */
-    formant_fac_fx = swb_formant_fac_fx( lpc_shb_fx[1], &hBWE_TD->tilt_mem_fx );
-    /* i:lpc_shb_fx Q12, o:formant_fac_fx Q15 */
-    IF( GT_32( st->total_brate, ACELP_32k ) )
-    {
-        FOR( j = 0; j < 4; j++ )
-        {
-            Copy( lpc_shb_fx, &lpc_shb_sf_fx[i_mult( j, ( LPC_SHB_ORDER + 1 ) )], LPC_SHB_ORDER + 1 );
-        }
-    }
-
-    /* From low band excitation, generate highband excitation */
-
-    /* -------- start of  memory rescaling  -------- */
-    /* ----- calculate optimum Q_bwe_exc and rescale memories accordingly ----- */
-    Lmax = 0;
-    move32();
-    FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
-    {
-        Lmax = L_max( Lmax, L_abs( bwe_exc_extended_fx[cnt] ) );
-    }
-    Q_bwe_exc = norm_l( Lmax );
-    if ( Lmax == 0 )
-    {
-        Q_bwe_exc = 31;
-        move16();
-    }
-    Q_bwe_exc = add( Q_bwe_exc, add( Q_exc, Q_exc ) );
-    find_max_mem_dec( st, &n_mem, &n_mem2, &n_mem3 ); /* for >=24.4, use n_mem2 lpc_syn, shb_20sample, and mem_stp_swb_fx memory */
-
-    tmp = add( st->prev_Q_bwe_exc, n_mem );
-    if ( GT_16( Q_bwe_exc, tmp ) )
-    {
-        Q_bwe_exc = tmp;
-        move16();
-    }
-
-    /* rescale the memories if Q_bwe_exc is different from previous frame */
-    sc = sub( Q_bwe_exc, st->prev_Q_bwe_exc );
-    IF( sc != 0 )
-    {
-        rescale_genSHB_mem_dec( st, sc );
-    }
-
-    /* rescale the bwe_exc_extended and bring it to 16-bit single precision with dynamic norm  */
-    sc = sub( Q_bwe_exc, add( Q_exc, Q_exc ) );
-
-    FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
-    {
-#ifdef BASOP_NOGLOB
-        bwe_exc_extended_16[cnt] = round_fx_sat( L_shl_sat( bwe_exc_extended_fx[cnt], sc ) );
-#else
-        bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx( L_shl( bwe_exc_extended[cnt], sc ) );
-#endif
-        move16();
-    }
-
-    /* state_syn_shbexc_fx is kept at (st_fx->prev_Q_bwe_syn) for 24.4/32kbps or is kept at Q_bwe_exc for 13.2/16.4kbps */
-
-    /* save the previous Q factor (32-bit) of the buffer */
-    st->prev_Q_bwe_exc = Q_bwe_exc;
-    move16();
-
-    Q_bwe_exc = sub( Q_bwe_exc, 16 ); /* Q_bwe_exc reflecting the single precision dynamic norm-ed buffers from here */
-
-    /* -------- end of rescaling memories -------- */
-
-    Q_bwe_exc_fb = st->prev_Q_bwe_exc_fb;
-    move16();
-
-    Q_shb = 0;
-    move16();
-
-    Copy( hBWE_TD->state_syn_shbexc_fx, shaped_shb_excitation_fx, L_SHB_LAHEAD );
-    GenShapedSHBExcitation_ivas_dec_fx( shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx,
-                                        hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
-                                        st->coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed, vf_modified_fx, st->extl,
-                                        &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf_fx, shb_ener_sf_32,
-                                        shb_res_gshape_fx, shb_res_dummy_fx, &vind, formant_fac_fx, hBWE_TD->fb_state_lpc_syn_fx,
-                                        &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, st->prev_Q_bwe_syn, st->total_brate, st->prev_bfi,
-                                        st->element_mode, st->flag_ACELP16k, nlExc16k_fx, mixExc16k_fx, st->extl_brate, MSFlag,
-                                        NULL, &( hBWE_TD->prev_pow_exc16kWhtnd_fx32 ), &( hBWE_TD->prev_mix_factor_fx ), NULL, NULL );
-
-    *Q_white_exc = Q_bwe_exc_fb;
-    move16();
-    IF( EQ_16( st->extl, FB_TBE ) )
-    {
-        st->prev_Q_bwe_exc_fb = Q_bwe_exc_fb;
-        move16();
-    }
-    ELSE
-    {
-        /*Indirectly a memory reset of FB memories for next frame such that rescaling of memories would lead to 0 due to such high prev. Q value.
-        51 because of 31 + 20(shift of Q_bwe_exc_fb before de-emphasis)*/
-        st->prev_Q_bwe_exc_fb = 51;
-        move16();
-    }
-
-    /* rescale the TBE post proc memory */
-    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
-    {
-        hBWE_TD->mem_stp_swb_fx[i] = shl_sat( hBWE_TD->mem_stp_swb_fx[i], sub( Q_bwe_exc, st->prev_Q_bwe_syn ) );
-        move16();
-    }
-    /* fill-in missing SHB excitation */
-    test();
-    test();
-    IF( ( EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) ) && LE_32( st->last_core_brate, SID_2k40 ) )
-    {
-        Copy( shaped_shb_excitation_fx + L_SHB_LAHEAD, shaped_shb_excitation_fx, L_SHB_LAHEAD );
-    }
-
-    IF( hStereoICBWE != NULL )
-    {
-        Copy( shaped_shb_excitation_fx + L_SHB_LAHEAD, hStereoICBWE->shbSynthRef_fx, L_FRAME16k );
-    }
-
-    test();
-    IF( NE_32( st->extl_brate, SWB_TBE_1k10 ) && NE_32( st->extl_brate, SWB_TBE_1k75 ) )
-    {
-        FOR( i = 0; i < L_FRAME16k; i += L_SUBFR16k )
-        {
-            /* TD BWE post-processing */
-            PostShortTerm_ivas_dec_fx( &shaped_shb_excitation_fx[L_SHB_LAHEAD + i], lpc_shb_fx, &shaped_shb_excitationTemp_fx[i], hBWE_TD->mem_stp_swb_fx,
-                                       hBWE_TD->ptr_mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ), hBWE_TD->mem_zero_swb_fx, formant_fac_fx );
-        }
-
-        Copy( shaped_shb_excitationTemp_fx, &shaped_shb_excitation_fx[L_SHB_LAHEAD], L_FRAME16k ); /* Q_bwe_exc */
-
-        tmp = sub( shl( Q_bwe_exc, 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
-        prev_pow_fx = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /* 2*(Q_bwe_exc) */
-        curr_pow_fx = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /* 2*(Q_bwe_exc) */
-#else
-        prev_pow_fx = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                                  /* 2*(Q_bwe_exc) */
-        curr_pow_fx = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                                  /* 2*(Q_bwe_exc) */
-#endif
-        FOR( i = 0; i < L_SHB_LAHEAD + 10; i++ )
-        {
-#ifdef BASOP_NOGLOB
-            prev_pow_fx = L_mac0_sat( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] );                                         /*2*Q_bwe_exc*/
-            curr_pow_fx = L_mac0_sat( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
-#else
-            prev_pow_fx = L_mac0( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] );                                         /*2*Q_bwe_exc*/
-            curr_pow_fx = L_mac0( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
-#endif
-        }
-
-        if ( GT_16( voice_factors_fx[0], 24576 /*0.75f Q15*/ ) )
-        {
-            curr_pow_fx = L_shr( curr_pow_fx, 2 ); /* Q(2*Q_bwe_exc) */
-        }
-
-        Lscale = root_a_over_b_fx( curr_pow_fx,
-                                   shl( Q_bwe_exc, 1 ),
-                                   prev_pow_fx,
-                                   shl( Q_bwe_exc, 1 ),
-                                   &exp );
-
-        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-        {
-            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );             /* Q_bwe_exc + (31-exp) - 15 */
-            shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-            move16();
-        }
-        IF( exp < 0 )
-        {
-            Lscale = L_shl( Lscale, exp );
-            exp = 0;
-            move16();
-        }
-        FOR( ; i < L_SHB_LAHEAD + 10; i++ )
-        {
-#ifdef BASOP_NOGLOB
-            temp_fx = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ );        /* Q15 */
-            L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp_fx ); /* Q31-exp */
-#else
-            temp_fx = i_mult( sub( i, 19 ), 3277 /*0.1f Q15*/ );                                                                                   /* Q15 */
-            L_tmp1 = Mult_32_16( L_shl( 1, sub( 31, exp ) ), temp_fx );                                                                            /* Q31-exp */
-#endif
-            temp_fx = sub( 32767 /*1.0f Q15*/, temp_fx );
-            Lscale = L_add( Mult_32_16( Lscale, temp_fx ), L_tmp1 );
-            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );             /* Q_bwe_exc + (31-exp) - 15 */
-            shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-            move16();
-        }
-    }
-    ELSE
-    {
-        /* reset the PF memories if the PF is not running */
-        set16_fx( hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
-        hBWE_TD->gain_prec_swb_fx = ONE_IN_Q14;
-        move16();
-        set16_fx( hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
-    }
-
-    /* Update SHB excitation */
-    Copy( shaped_shb_excitation_fx + L_FRAME16k, hBWE_TD->state_syn_shbexc_fx, L_SHB_LAHEAD ); /* Q_bwe_exc */
-    l_subframe = L_FRAME16k / NUM_SHB_SUBGAINS;
-    move16();
-    L_ener = EPSILON_FX_SMALL;
-    move32();
-
-    FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-    {
-        L_tmp = 0;
-        move32();
-        ener_tmp_fx[i] = EPSILON_FX_SMALL;
-        move32();
-
-        Word64 tmp64 = 0;
-        move64();
-        FOR( j = 0; j < l_subframe; j++ )
-        {
-            tmp64 = W_mac0_16_16( tmp64, shaped_shb_excitation_fx[add( i_mult( i, l_subframe ), j )], shaped_shb_excitation_fx[add( i_mult( i, l_subframe ), j )] ); /* 2*Q_bwe_exc */
-        }
-        L_tmp = W_sat_l( tmp64 );
-
-        L_tmp = Mult_32_16( L_tmp, 410 /*0.0125 Q15*/ ); /* 2*Q_bwe_exc: ener_tmp_fx in (2*Q_bwe_exc) */
-        IF( L_tmp != 0 )
-        {
-            exp = norm_l( L_tmp );
-            tmp = extract_h( L_shl( L_tmp, exp ) );
-            exp = sub( exp, sub( 30, i_mult( 2, Q_bwe_exc ) ) );
-
-            tmp = div_s( 16384, tmp );
-            L_tmp = L_deposit_h( tmp );
-            L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB
-            ener_tmp_fx[i] = L_shl_sat( L_tmp, sub( add( exp, shl( Q_bwe_exc, 1 ) ), 31 ) ); /*2 * Q_bwe_exc: Q31 -exp +exp +2 * Q_bwe_exc -31  */
-            move32();
-            L_ener = L_add_sat( L_ener, L_shr( ener_tmp_fx[i], 2 ) ); /* 2*Q_bwe_exc */
-#else
-            ener_tmp_fx[i] = L_shl( L_tmp, sub( add( exp, shl( Q_bwe_exc, 1 ) ), 31 ) );                                                           /*2 * Q_bwe_exc: Q31 -exp +exp +2 * Q_bwe_exc -31  */
-            move32();
-            L_ener = L_add( L_ener, L_shr( ener_tmp_fx[i], 2 ) );                                                                     /* 2*Q_bwe_exc */
-#endif
-        }
-    }
-#ifdef BASOP_NOGLOB                                                                            /* Saturation fix taken from EVS*/
-    ener_fx = s_max( 1, round_fx_sat( L_shl_sat( L_ener, sub( 18, shl( Q_bwe_exc, 1 ) ) ) ) ); /* Q2: 2*Q_bwe_exc+18-2*Q_bwe_exc-16 */
-#else
-    ener_fx = s_max( 1, round_fx( L_shl( L_ener, sub( 18, shl( Q_bwe_exc, 1 ) ) ) ) );                                                /* Q2: 2*Q_bwe_exc+18-2*Q_bwe_exc-16 */
-#endif
-    /* WB/SWB bandwidth switching */
-    IF( st->bws_cnt > 0 )
-    {
-        IF( is_fractive == 0 )
-        {
-            IF( GT_16( st->tilt_wb_fx, 2048 ) ) /*assuming st->tilt_wb_fx in Q11*/
-            {
-                st->tilt_wb_fx = 2048;
-                move16();
-            }
-            ELSE IF( LT_16( st->tilt_wb_fx, 1024 ) )
-            {
-                st->tilt_wb_fx = 1024;
-                move16();
-            }
-            test();
-            if ( EQ_16( st->prev_fractive, 1 ) && GT_16( st->tilt_wb_fx, 1024 ) )
-            {
-                st->tilt_wb_fx = 1024;
-                move16();
-            }
-        }
-        ELSE
-        {
-            IF( GT_16( st->tilt_wb_fx, 8192 ) )
-            {
-                IF( st->prev_fractive == 0 )
-                {
-                    st->tilt_wb_fx = 8192;
-                    move16();
-                }
-                ELSE
-                {
-                    st->tilt_wb_fx = 16384;
-                    move16();
-                }
-            }
-            ELSE
-            {
-                st->tilt_wb_fx = shl( st->tilt_wb_fx, 2 );
-                move16();
-            }
-        }
-
-        IF( ener_fx != 0 )
-        {
-            L_tmp = L_shl( L_mult0( ener_fx, st->tilt_wb_fx ), sub( st->Q_syn2, 13 ) ); /* 2+11 +st->Q_syn2 -13 = st->Q_syn2*/
-            exp_ener = norm_s( ener_fx );
-            tmp = shl( ener_fx, exp_ener );           /*Q(2+exp)*/
-            inv_ener = shr( div_s( 16384, tmp ), 1 ); /*Q(15+14-2-exp-1) = 26 - exp*/
-
-            test();
-            IF( GT_32( L_tmp, st->enerLH_fx ) ) /*st->Q_syn2*/
-            {
-#ifdef BASOP_NOGLOB
-                st->tilt_wb_fx = extract_h( L_shr_sat( Mult_32_16( st->enerLH_fx, inv_ener ), sub( sub( st->Q_syn2, exp_ener ), 16 ) ) ); /*Q11*/
-#else
-                st->tilt_wb_fx = extract_h( L_shr( Mult_32_16( st->enerLH_fx, inv_ener ), sub( sub( st->Q_syn2, exp_ener ), 16 ) ) ); /*Q11*/
-#endif
-                move16();
-                /*st->Q_syn2 -1 + 26- exp_ener -15 -(st->Q_syn2 -exp_ener -16 ) -16    +1 -1 = (11) *0.5*/
-            }
-            ELSE IF( LT_32( L_tmp, Mult_32_16( st->enerLH_fx, 1638 ) ) && EQ_16( is_fractive, 1 ) )
-            {
-#ifdef BASOP_NOGLOB
-                st->tilt_wb_fx = extract_h( L_shr_sat( Mult_32_16( st->enerLH_fx, inv_ener ), sub( sub( st->Q_syn2, exp_ener ), 15 ) ) ); /*Q11*/
-#else
-                st->tilt_wb_fx = extract_h( L_shr( Mult_32_16( st->enerLH_fx, inv_ener ), sub( sub( st->Q_syn2, exp_ener ), 15 ) ) ); /*Q11*/
-#endif
-                move16();
-                /*st->Q_syn2 -1 + 26- exp_ener -15 -(st->Q_syn2 -exp_ener -15 ) -16 = (11) 0.25*/
-            }
-            L_tmp = L_mult0( st->prev_ener_shb_fx, inv_ener );         /*Q(1+15+14-3-exp_ener) = 27 -exp_ener*/
-            GainFrame_prevfrm_fx = L_shr( L_tmp, sub( 9, exp_ener ) ); /*27 -exp_ener -(9-exp_ener )= Q18*/
-        }
-        ELSE
-        {
-            GainFrame_prevfrm_fx = 0;
-            move32();
-        }
-
-        IF( EQ_16( is_fractive, 1 ) )
-        {
-            GainFrame_fx = L_shl( L_deposit_l( st->tilt_wb_fx ), 10 );
-        }
-        ELSE
-        {
-            GainFrame_fx = L_shl( L_deposit_l( st->tilt_wb_fx ), 8 );
-        }
-
-        test();
-        IF( EQ_16( ( is_fractive & st->prev_fractive ), 1 ) && GT_32( GainFrame_fx, GainFrame_prevfrm_fx ) )
-        {
-            GainFrame_fx = L_add( Mult_32_16( GainFrame_prevfrm_fx, 26214 ), Mult_32_16( GainFrame_fx, 6554 ) ); /* 18 +15 -15 = 18*/
-        }
-        ELSE
-        {
-            test();
-            test();
-            test();
-            test();
-            IF( ( LT_32( L_shr( st->prev_enerLH_fx, 1 ), st->enerLH_fx ) && GT_32( st->prev_enerLH_fx, L_shr( st->enerLH_fx, 1 ) ) ) && ( LT_32( L_shr( st->prev_enerLL_fx, 1 ), st->enerLL_fx ) && GT_32( st->prev_enerLL_fx, L_shr( st->enerLL_fx, 1 ) ) ) && ( s_xor( is_fractive, st->prev_fractive ) == 0 ) )
-            {
-                GainFrame_fx = L_add( L_shr( GainFrame_fx, 1 ), L_shr( GainFrame_prevfrm_fx, 1 ) );
-            }
-            ELSE
-            {
-                test();
-                IF( ( is_fractive == 0 ) && EQ_16( st->prev_fractive, 1 ) )
-                {
-                    L_tmp1 = L_shl( Mult_32_16( GainFrame_fx, 3277 ), 13 );                                                /* 31 */
-                    L_tmp = L_sub( 2147483647, L_tmp1 );                                                                   /* 31 */
-                    GainFrame_fx = L_add( Mult_32_32( GainFrame_fx, L_tmp ), Mult_32_32( GainFrame_prevfrm_fx, L_tmp1 ) ); /* 18 */
-                }
-                ELSE
-                {
-                    GainFrame_fx = L_add( L_shr( GainFrame_fx, 1 ), L_shr( L_min( GainFrame_prevfrm_fx, GainFrame_fx ), 1 ) ); /* 18 */
-                }
-            }
-        }
-
-        GainFrame_fx = Mult_32_16( GainFrame_fx, i_mult( sub( N_WS2N_FRAMES, st->bws_cnt ), 819 ) ); /*Q18*/
-    }
-    ELSE
-    {
-        IF( st->bws_cnt1 > 0 )
-        {
-            GainFrame_fx = Mult_32_16( GainFrame_fx, i_mult( st->bws_cnt1, 819 ) ); /*Q18*/
-        }
-        IF( GE_16( st->nbLostCmpt, 1 ) )
-        {
-            ener_fx = s_max( 1, ener_fx );
-            exp_ener = norm_s( ener_fx );
-            tmp = shl( ener_fx, exp_ener );                                                                        /*Q(2+exp)*/
-            inv_ener = div_s( 16384, tmp );                                                                        /*Q(15+14-2-exp)*/
-            prev_ener_ratio_fx = L_shr( L_mult0( st->prev_ener_shb_fx, inv_ener ), add( sub( 9, exp_ener ), 1 ) ); /*Q: 1+27-exp-9+exp-1 = 18 */
-        }
-
-        IF( EQ_16( st->nbLostCmpt, 1 ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( ( st->clas_dec != UNVOICED_CLAS ) && NE_16( st->clas_dec, UNVOICED_TRANSITION ) && LT_16( hBWE_TD->tilt_swb_fec_fx, 16384 ) &&
-                ( ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) && LT_32( L_shr( st->enerLL_fx, 1 ), st->prev_enerLL_fx ) ) || ( GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) && LT_32( L_shr( st->enerLH_fx, 1 ), st->prev_enerLH_fx ) ) ) )
-            {
-                IF( GT_32( L_shr( prev_ener_ratio_fx, 2 ), GainFrame_fx ) ) /*18*/
-                {
-                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 13107 ), Mult_32_16( GainFrame_fx, 19661 ) ); /*18*/
-                }
-                ELSE IF( GT_32( L_shr( prev_ener_ratio_fx, 1 ), GainFrame_fx ) )
-                {
-                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 26214 ), Mult_32_16( GainFrame_fx, 6554 ) );
-                }
-                ELSE
-                {
-                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 6554 ), Mult_32_16( GainFrame_fx, 26214 ) );
-                }
-
-                test();
-                IF( GT_16( tilt_swb_fec_fx, hBWE_TD->tilt_swb_fec_fx ) && ( hBWE_TD->tilt_swb_fec_fx > 0 ) )
-                {
-                    exp = norm_s( hBWE_TD->tilt_swb_fec_fx );
-                    tmp = shl( hBWE_TD->tilt_swb_fec_fx, exp );                                 /*Q(11+exp)*/
-                    tmp = div_s( 16384, tmp );                                                  /*Q(15+14-11-exp)*/
-                    tmp = extract_h( L_shl( L_mult0( tmp, st->tilt_wb_fx ), sub( exp, 1 ) ) );  /*18 -exp +11  + exp -1 -16  =12;          */
-                    GainFrame_fx = L_shl( Mult_32_16( GainFrame_fx, s_min( tmp, 20480 ) ), 3 ); /*Q18 = 18 +12 -15 +3 */
-                }
-            }
-            ELSE IF( ( ( st->clas_dec != UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 4096 ) ) && GT_32( L_shr( prev_ener_ratio_fx, 2 ), GainFrame_fx ) &&
-                     ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) || GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) ) )
-            {
-                GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 6554 ), Mult_32_16( GainFrame_fx, 26214 ) );
-            }
-        }
-        ELSE IF( GT_16( st->nbLostCmpt, 1 ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( GT_32( L_shr( prev_ener_ratio_fx, 2 ), GainFrame_fx ) && ( ( EQ_16( st->codec_mode, MODE1 ) && GT_32( st->enerLL_fx, st->prev_enerLL_fx ) && GT_32( st->enerLH_fx, st->prev_enerLH_fx ) ) || EQ_16( st->codec_mode, MODE2 ) ) )
-            {
-                test();
-                IF( GT_16( tilt_swb_fec_fx, 20480 /*10.0f in Q11*/ ) && GT_16( hBWE_TD->tilt_swb_fec_fx, 20480 /*10.0f in Q11*/ ) )
-                {
-                    GainFrame_fx = L_min( L_add( Mult_32_16( prev_ener_ratio_fx, 26214 /*0.8f in Q15*/ ), Mult_32_16( GainFrame_fx, 6554 /*0.2f in Q15*/ ) ), L_shl( Mult_32_16( GainFrame_fx, 16384 /*4.0f in Q12*/ ), 3 ) ); /*Q18*/
-                }
-                ELSE
-                {
-                    GainFrame_fx = L_min( L_add( Mult_32_16( prev_ener_ratio_fx, 16384 ), Mult_32_16( GainFrame_fx, 16384 ) ), L_shl( Mult_32_16( GainFrame_fx, 16384 ), 3 ) ); /*Q18*/
-                }
-            }
-            ELSE IF( GT_32( prev_ener_ratio_fx, GainFrame_fx ) && ( ( EQ_16( st->codec_mode, MODE1 ) && GT_32( st->enerLL_fx, st->prev_enerLL_fx ) && GT_32( st->enerLH_fx, st->prev_enerLH_fx ) ) || EQ_16( st->codec_mode, MODE2 ) ) )
-            {
-                test();
-                IF( GT_16( tilt_swb_fec_fx, 20480 ) && GT_16( hBWE_TD->tilt_swb_fec_fx, 20480 ) )
-                {
-                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 16384 /*0.5f in Q15*/ ), Mult_32_16( GainFrame_fx, 16384 /*0.5f in Q15*/ ) ); /* Q18  */
-                }
-                ELSE
-                {
-                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 6554 /*0.2f in Q15*/ ), Mult_32_16( GainFrame_fx, 26214 /*0.8f in Q15*/ ) ); /* Q18  */
-                }
-            }
-        }
-    }
-
-    st->prev_fractive = is_fractive;
-    move16();
-
-    /* Adjust the subframe and frame gain of the synthesized shb signal */
-    /* Scale the shaped excitation */
-    IF( EQ_16( st->L_frame, L_FRAME ) )
-    {
-        L_tmp = L_mult( pitch_buf_fx[0], 8192 );
-        FOR( i = 1; i < NB_SUBFR; i++ )
-        {
-            L_tmp = L_mac( L_tmp, pitch_buf_fx[i], 8192 ); /* pitch_buf in Q6 x 0.25 in Q15 */
-        }
-        pitch_fx = round_fx( L_tmp ); /* Q6 */
-    }
-    ELSE
-    {
-        L_tmp = L_mult( pitch_buf_fx[0], 6554 );
-        FOR( i = 1; i < NB_SUBFR16k; i++ )
-        {
-            L_tmp = L_mac( L_tmp, pitch_buf_fx[i], 6554 ); /* pitch_buf in Q6 x 0.2 in Q15 */
-        }
-        pitch_fx = round_fx( L_tmp ); /* Q6 */
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( GE_32( st->extl_brate, SWB_TBE_2k8 ) && EQ_16( st->prev_coder_type, st->coder_type ) && NE_16( st->coder_type, UNVOICED ) ) || ( LT_32( st->extl_brate, SWB_TBE_2k8 ) && ( EQ_16( st->prev_coder_type, st->coder_type ) || ( EQ_16( st->prev_coder_type, VOICED ) && EQ_16( st->coder_type, GENERIC ) ) || ( EQ_16( st->prev_coder_type, GENERIC ) && EQ_16( st->coder_type, VOICED ) ) ) ) ) && GT_16( pitch_fx, 4480 /*70 in Q6*/ ) && LT_16( st->extl, FB_TBE ) && NE_32( st->extl_brate, SWB_TBE_1k10 ) && NE_32( st->extl_brate, SWB_TBE_1k75 ) )
-    {
-        FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-        {
-            GainShape_tmp_fx[i] = GainShape_fx[i * 4]; /* Q15 */
-            move16();
-        }
-
-        FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-        {
-            L_tmp1 = Mult_32_16( ener_tmp_fx[i], GainShape_tmp_fx[i] );               /* (2*Q_bwe_exc) */
-            L_tmp2 = Mult_32_16( hBWE_TD->prev_ener_fx, hBWE_TD->prev_GainShape_fx ); /* (2*st->prev_ener_fx_Q) */
-            tmp = sub( shl( Q_bwe_exc, 1 ), shl( st->prev_ener_fx_Q, 1 ) );
-#ifdef BASOP_NOGLOB
-            L_tmp2 = L_shl_sat( L_tmp2, tmp ); /* new Q = (2*Q_bwe_exc) */
-#else
-            L_tmp2 = L_shl( L_tmp2, tmp );                                                                                            /* new Q = (2*Q_bwe_exc) */
-#endif
-            IF( GT_32( L_tmp1, L_tmp2 ) )
-            {
-                L_tmp = L_tmp2;
-                move32();
-                if ( L_tmp2 < 0 )
-                {
-                    L_tmp = L_negate( L_tmp2 );
-                }
-
-                expb = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
-                fracb = round_fx_sat( L_shl_sat( L_tmp, expb ) );
-#else
-                fracb = round_fx( L_shl( L_tmp, expb ) );
-#endif
-                expb = sub( 30, expb ); /* - (2*Q_bwe_exc_ext);                    */
-
-                expa = norm_l( ener_tmp_fx[i] );
-                fraca = extract_h( L_shl( ener_tmp_fx[i], expa ) );
-                expa = sub( 30, expa );
-
-                scale_fx = shr( sub( fraca, fracb ), 15 );
-                fracb = shl( fracb, scale_fx );
-                expb = sub( expb, scale_fx );
-
-                tmp = div_s( fracb, fraca );
-                exp = sub( sub( expb, expa ), 1 );
-                tmp = shl( tmp, exp );
-                GainShape_tmp_fx[i] = add( tmp, shr( GainShape_tmp_fx[i], 1 ) ); /* Q15 */
-                move16();
-            }
-
-            hBWE_TD->prev_ener_fx = ener_tmp_fx[i];
-            move32();
-            hBWE_TD->prev_GainShape_fx = GainShape_tmp_fx[i];
-            move16();
-            st->prev_ener_fx_Q = Q_bwe_exc;
-            move16();
-        }
-
-        FOR( i = 0; i < NUM_SHB_SUBFR; i++ )
-        {
-            Word16 idx = 0;
-            move16();
-            IF( i != 0 )
-            {
-                idx = idiv1616( i_mult( i, NUM_SHB_SUBGAINS ), NUM_SHB_SUBFR );
-            }
-            GainShape_fx[i] = GainShape_tmp_fx[idx];
-            move16();
-        }
-    }
-    ELSE
-    {
-        st->prev_ener_fx_Q = Q_bwe_exc;
-        move16();
-    }
-    st->prev_Q_bwe_syn = Q_bwe_exc;
-    move16();
-
-
-    /* Gain shape smoothing after quantization */
-    test();
-    IF( EQ_32( st->extl_brate, SWB_TBE_1k10 ) || EQ_32( st->extl_brate, SWB_TBE_1k75 ) )
-    {
-        FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-        {
-            GainShape_tmp_fx[i] = GainShape_fx[i * NUM_SHB_SUBGAINS];
-            move16();
-        }
-
-        lls_interp_n_fx( GainShape_tmp_fx, NUM_SHB_SUBGAINS, &GainShape_tilt_fx, &temp_fx, 1 );
-
-        test();
-        IF( GE_16( vind, 6 ) && LT_16( abs_s( GainShape_tilt_fx ), 3932 ) )
-        {
-            feedback_fx = 9830;
-            move16();
-            FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
-            {
-                GainShape_fx[i] = add_sat( mult( sub( 32767, feedback_fx ), GainShape_fx[i * NUM_SHB_SUBGAINS] ), mult( feedback_fx, GainShape_tmp_fx[i] ) );
-                move16();
-            }
-
-            FOR( i = NUM_SHB_SUBFR - 1; i > 0; i-- )
-            {
-                Word16 idx = 0;
-                move16();
-                IF( i != 0 )
-                {
-                    idx = idiv1616( i_mult( i, NUM_SHB_SUBGAINS ), NUM_SHB_SUBFR );
-                }
-                GainShape_fx[i] = GainShape_fx[idx];
-                move16();
-            }
-        }
-    }
-
-    /* fil-in missing memory */
-    test();
-    test();
-    IF( ( EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) ) && LE_32( st->last_core_brate, SID_2k40 ) )
-    {
-        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-        {
-            Word16 intermediate = mult( shaped_shb_excitation_fx[i], subwin_shb_fx[L_SHB_LAHEAD - i] );
-            Word32 intermediate_32 = Mpy_32_16_1( Mpy_32_16_1( GainFrame_fx, window_shb_fx[L_SHB_LAHEAD - 1 - i] ), intermediate );
-            hBWE_TD->syn_overlap_fx[i] = round_fx( L_shl_sat( intermediate_32, sub( 16, ( add( Q_bwe_exc, 18 - 15 ) ) ) ) );
-            move16();
-        }
-    }
-
-    Word16 n_mem3_new = 0;
-    move16();
-    find_max_mem_dec_m3( st, &n_mem3_new );
-
-    ScaleShapedSHB_fx( SHB_OVERLAP_LEN,
-                       shaped_shb_excitation_fx, /* i/o: Q_bwe_exc */
-                       hBWE_TD->syn_overlap_fx,
-                       GainShape_fx, /* Q15  */
-                       GainFrame_fx, /* Q18  */
-                       window_shb_fx,
-                       subwin_shb_fx,
-                       &Q_bwe_exc, &Qx, n_mem3_new, st->prev_Q_bwe_syn2 );
-
-    IF( hStereoICBWE != NULL )
-    {
-        Copy_Scale_sig_16_32( lpc_shb_fx, hStereoICBWE->lpSHBRef_fx, LPC_SHB_ORDER + 1, 0 );
-        Copy( GainShape_fx, hStereoICBWE->gshapeRef_fx, NUM_SHB_SUBFR );
-        hStereoICBWE->gFrameRef_fx = GainFrame_fx;
-        move32();
-
-        Copy( shaped_shb_excitation_fx, hStereoICBWE->shbSynthRef_fx, L_FRAME16k );
-    }
-
-    max_val = 0;
-    move16();
-    FOR( i = 0; i < L_FRAME16k; i++ )
-    {
-        max_val = s_max( max_val, abs_s( shaped_shb_excitation_fx[i] ) ); /* Q0 */
-    }
-    IF( max_val == 0 )
-    {
-        curr_frame_pow_fx = 0;
-        move32();
-        n = 0;
-        move16();
-    }
-    ELSE
-    {
-        n = norm_s( max_val );
-        max_val = 0;
-        move16();
-        FOR( i = 0; i < L_FRAME16k; i++ )
-        {
-#ifdef BASOP_NOGLOB
-            shaped_shb_excitation_frac[i] = shl_sat( shaped_shb_excitation_fx[i], n ); /*Q_bwe_exc+n*/
-            move16();
-#else
-            shaped_shb_excitation_frac[i] = shl( shaped_shb_excitation_fx[i], n ); /*Q_bwe_exc+n*/
-            move16();
-#endif
-        }
-
-        curr_frame_pow_fx = 0;
-        move32();
-        FOR( i = 0; i < L_FRAME16k; i++ )
-        {
-            L_tmp = L_mult0( shaped_shb_excitation_frac[i], shaped_shb_excitation_frac[i] ); /*2*(Q_bwe_exc+n)*/
-            curr_frame_pow_fx = L_add( curr_frame_pow_fx, L_shr( L_tmp, 9 ) );               /*2*(Q_bwe_exc+n)-9*/
-        }
-    }
-    curr_frame_pow_exp = sub( shl( add( Q_bwe_exc, n ), 1 ), 9 );
-    tmp = sub( st->prev_frame_pow_exp, curr_frame_pow_exp );
-    IF( tmp > 0 ) /* shifting prev */
-    {
-        IF( GT_16( tmp, 32 ) )
-        {
-            st->prev_frame_pow_exp = add( curr_frame_pow_exp, 32 );
-            move16();
-            tmp = 32;
-            move16();
-        }
-        hBWE_TD->prev_swb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, tmp );
-        move32();
-        st->prev_frame_pow_exp = curr_frame_pow_exp;
-        move16();
-    }
-    ELSE /* shifting curr */
-    {
-        IF( LT_16( tmp, -32 ) )
-        {
-            curr_frame_pow_exp = sub( st->prev_frame_pow_exp, 32 );
-            tmp = -32;
-            move16();
-        }
-        curr_frame_pow_fx = L_shr( curr_frame_pow_fx, -tmp );
-        curr_frame_pow_exp = st->prev_frame_pow_exp;
-        move16();
-    }
-    test();
-    test();
-    IF( !st->bfi && ( st->prev_bfi || st->prev_use_partial_copy ) )
-    {
-        test();
-        test();
-        IF( ( GT_32( L_shr( curr_frame_pow_fx, 1 ), hBWE_TD->prev_swb_bwe_frame_pow_fx ) ) &&
-            ( GT_32( hBWE_TD->prev_swb_bwe_frame_pow_fx, L_tmp ) ) && EQ_16( st->prev_coder_type, UNVOICED ) )
-        {
-            L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
-            scale_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q15*/
-
-            L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-            L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-            L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-            temp_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q15*/
-        }
-        ELSE
-        {
-            scale_fx = temp_fx = 32767;
-            move16(); /*Q15*/
-            move16(); /*Q15*/
-        }
-
-        FOR( j = 0; j < 8; j++ )
-        {
-            GainShape_fx[2 * j] = mult_r( GainShape_fx[2 * j], scale_fx );
-            move16();
-            GainShape_fx[2 * j + 1] = mult_r( GainShape_fx[2 * j + 1], scale_fx );
-            move16();
-            FOR( i = 0; i < L_FRAME16k / 8; i++ )
-            {
-                shaped_shb_excitation_fx[add( i, j * ( L_FRAME16k / 8 ) )] = mult_r( shaped_shb_excitation_fx[add( i, j * ( L_FRAME16k / 8 ) )], scale_fx );
-                move16();
-            }
-
-            IF( temp_fx > 0 )
-            {
-                /* scale_fx <= temp_fx, due to scale_fx = sqrt( st->prev_swb_bwe_frame_pow_fx/curr_frame_pow_fx ), temp_fx = sqrt( scale_fx, 1.f/8.f )
-                   and curr_frame_pow_fx > st->prev_swb_bwe_frame_pow_fx -> scale_fx <= 1.0, sqrt(scale_fx, 1.f/8.f) >= scale_fx  */
-                IF( LT_16( scale_fx, temp_fx ) )
-                {
-                    scale_fx = div_s( scale_fx, temp_fx );
-                }
-                ELSE
-                {
-                    scale_fx = 32767;
-                    move16();
-                }
-            }
-            ELSE
-            {
-                scale_fx = 0;
-                move16();
-            }
-        }
-    }
-
-    /* adjust the FEC frame energy */
-    IF( st->bfi )
-    {
-        scale_fx = temp_fx = 4096;
-        move16(); /*Q12*/
-        move16();
-        IF( EQ_16( st->nbLostCmpt, 1 ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( GT_32( curr_frame_pow_fx, hBWE_TD->prev_swb_bwe_frame_pow_fx ) &&
-                NE_16( st->prev_coder_type, UNVOICED ) &&
-                ( st->last_good != UNVOICED_CLAS ) )
-            {
-                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp ); /*31 - exp*/
-                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) );                                                                            /*Q12*/
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-            }
-            ELSE IF( LT_32( curr_frame_pow_fx, L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, 1 ) ) && EQ_16( st->nbLostCmpt, 1 ) &&
-                     ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) || GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) ) &&
-                     ( EQ_16( st->prev_coder_type, UNVOICED ) || ( st->last_good == UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 10240 ) ) )
-            {
-                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
-#ifdef BASOP_NOGLOB
-                scale_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-#else
-                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-#endif
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-            }
-        }
-        ELSE IF( GT_16( st->nbLostCmpt, 1 ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( GT_32( curr_frame_pow_fx, hBWE_TD->prev_swb_bwe_frame_pow_fx ) )
-            {
-                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
-                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-#ifdef BASOP_NOGLOB
-                temp_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-#else
-                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) );  /*Q12*/
-#endif
-            }
-            ELSE IF( LT_32( curr_frame_pow_fx, L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, 1 ) ) &&
-                     ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) || GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) ) &&
-                     ( EQ_16( st->prev_coder_type, UNVOICED ) || ( st->last_good == UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 10240 ) ) )
-            {
-                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
-#ifdef BASOP_NOGLOB
-                L_tmp = L_min( L_tmp, L_shl_sat( 2, sub( 31, exp ) ) ); /*31 - exp*/
-#else
-                L_tmp = L_min( L_tmp, L_shl( 2, ( 31 - exp ) ) );     /*31 - exp*/
-#endif
-                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-            }
-        }
-
-        FOR( j = 0; j < 8; j++ )
-        {
-#ifdef BASOP_NOGLOB
-            GainShape_fx[2 * j] = shl_sat( mult_r( GainShape_fx[2 * j], scale_fx ), 3 );
-#else
-            GainShape_fx[2 * j] = shl( mult_r( GainShape_fx[2 * j], scale_fx ), 3 );
-#endif
-            move16(); /* 15 +12 +3-15 =15*/
-#ifdef BASOP_NOGLOB
-            GainShape_fx[add( 2 * j, 1 )] = shl_sat( mult_r( GainShape_fx[add( 2 * j, 1 )], scale_fx ), 3 );
-#else
-            GainShape_fx[2 * j + 1] = shl( mult_r( GainShape_fx[2 * j + 1], scale_fx ), 3 );
-#endif
-            move16();
-            FOR( i = 0; i < 40; i++ )
-            {
-                shaped_shb_excitation_fx[i + j * L_FRAME16k / 8] = shl( mult_r( shaped_shb_excitation_fx[i + j * L_FRAME16k / 8], scale_fx ), 3 );
-                move16(); /* Q_bwe_exc +12+3 -15  =Q_bwe_exc*/
-            }
-
-            IF( temp_fx > 0 )
-            {
-                IF( LT_16( scale_fx, temp_fx ) )
-                {
-                    scale_fx = shr( div_s( scale_fx, temp_fx ), 3 );
-                }
-                ELSE
-                {
-                    tmp1 = sub( norm_s( scale_fx ), 1 );
-                    tmp2 = norm_s( temp_fx );
-                    scale_fx = div_s( shl( scale_fx, tmp1 ), shl( temp_fx, tmp2 ) );
-                    scale_fx = shr( scale_fx, add( sub( tmp1, tmp2 ), 3 ) );
-                }
-            }
-            ELSE
-            {
-                scale_fx = 0;
-                move16();
-            }
-        }
-    }
-
-    hBWE_TD->prev_swb_bwe_frame_pow_fx = curr_frame_pow_fx;
-    move32();
-    st->prev_frame_pow_exp = curr_frame_pow_exp;
-    move16();
-
-    Word64 prev_ener_shb64 = 0;
-    move64();
-    FOR( i = 0; i < L_FRAME16k; i++ )
-    {
-        prev_ener_shb64 = W_mac0_16_16( prev_ener_shb64, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] ); /* Q0 */
-    }
-    L_prev_ener_shb = W_sat_l( prev_ener_shb64 );
-
-    L_prev_ener_shb = Mult_32_16( L_prev_ener_shb, 26214 ); /* 2*Q_bwe_exc_mod+8; 26214=(1/L_FRAME16k) in Q23 */
-    st->prev_ener_shb_fx = 0;
-    move16();
-    IF( L_prev_ener_shb != 0 )
-    {
-        exp = norm_l( L_prev_ener_shb );
-        tmp = extract_h( L_shl( L_prev_ener_shb, exp ) );
-        exp = sub( exp, sub( 30, ( add( i_mult( 2, Q_bwe_exc ), 8 ) ) ) );
-
-        tmp = div_s( 16384, tmp );
-        L_tmp = L_deposit_h( tmp );
-        L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB                                                                /* Saturation fix taken from EVS*/
-        st->prev_ener_shb_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
-#else
-        st->prev_ener_shb_fx = round_fx( L_shl( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
-#endif
-        move16();
-    }
-
-    IF( st->hBWE_FD != NULL )
-    {
-        L_tmp = Mult_32_16( curr_frame_pow_fx, 26214 ); /* curr_frame_pow_exp+8; 26214=(1/L_FRAME16k) in Q23 */
-        tmp = 0;
-        move16();
-        IF( L_tmp != 0 )
-        {
-            exp = norm_l( L_tmp );
-            tmp = extract_h( L_shl( L_tmp, exp ) );
-            exp = sub( exp, sub( 30, add( curr_frame_pow_exp, 8 ) ) );
-
-            tmp = div_s( 16384, tmp );
-            L_tmp = L_deposit_h( tmp );
-            L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB                                                   /* Saturation fix taken from EVS*/
-            tmp = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
-#else
-            tmp = round_fx( L_shl( L_tmp, sub( exp, 14 ) ) );              /* Q1 */
-#endif
-        }
-        set16_fx( st->prev_SWB_fenv_fx, tmp, SWB_FENV ); /* Q1 */
-    }
-
-    FOR( i = 0; i < L_FRAME16k; i++ )
-    {
-        shaped_shb_excitation_fx_32[i] = L_shl( shaped_shb_excitation_fx[i], sub( Q11, Q_bwe_exc ) );
-        move32();
-    }
-
-    /* generate 32kHz SHB synthesis from 12.8(16)kHz signal */
-    GenSHBSynth_fx_32( shaped_shb_excitation_fx_32, error_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, st->L_frame, &( hBWE_TD->syn_dm_phase ) );
-    Copy_Scale_sig_32_16( st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, 2 * ALLPASSSECTIONS_STEEP, -( Q11 - Q_bwe_exc ) );
-    Copy32( error_fx + L_FRAME32k - L_SHB_TRANSITION_LENGTH, hBWE_TD->old_tbe_synth_fx_32, L_SHB_TRANSITION_LENGTH );
-
-    /* resample SHB synthesis (if needed) and scale down */
-    synth_scale_fx = 32767;
-    move16(); /* 1.0 in Q15 */
-    if ( EQ_16( st->codec_mode, MODE1 ) )
-    {
-        synth_scale_fx = 29491;
-        move16(); /* 0.9 in Q15 */
-    }
-
-    IF( EQ_32( st->output_Fs, 48000 ) )
-    {
-        IF( EQ_16( st->extl, FB_TBE ) )
-        {
-            tmp = norm_l( GainFrame_fx );
-            if ( GainFrame_fx == 0 )
-            {
-                tmp = 31;
-                move16();
-            }
-            L_tmp = L_shl( GainFrame_fx, tmp ); /* 18 + tmp */
-
-            tmp1 = 0;
-            move16();
-            FOR( i = 0; i < L_FRAME16k; i++ )
-            {
-                Word16 idx = 0;
-                move16();
-                IF( i != 0 )
-                {
-                    idx = idiv1616( i_mult( NUM_SHB_SUBFR, i ), L_FRAME16k );
-                }
-                L_tmp1 = Mult_32_16( L_tmp, GainShape_fx[idx] );                           /* Q : 18 + tmp +15 -15*/
-                White_exc16k_fx[i] = round_fx( Mult_32_16( L_tmp1, White_exc16k_fx[i] ) ); /* 18 + tmp +*Q_white_exc -15 -16 */
-                move16();
-                tmp1 = s_max( tmp1, abs_s( White_exc16k_fx[i] ) );
-            }
-
-            *Q_white_exc = sub( add( *Q_white_exc, tmp ), 13 ); /* *Q_white_exc + 18 + tmp -15 -16 */
-            move16();
-            tmp = norm_s( tmp1 );
-            if ( tmp1 == 0 )
-            {
-                tmp = 15;
-                move16();
-            }
-
-            FOR( i = 0; i < L_FRAME16k; i++ )
-            {
-                White_exc16k_fx[i] = shl( White_exc16k_fx[i], sub( tmp, 1 ) );
-                move16();
-            }
-            *Q_white_exc = sub( add( *Q_white_exc, tmp ), 1 );
-            move16();
-        }
-
-        IF( NE_16( synth_scale_fx, 32767 ) ) /* 1.0 in Q15 */
-        {
-            FOR( i = 0; i < L_FRAME32k; i++ )
-            {
-                error_fx[i] = Mpy_32_16_1( error_fx[i], synth_scale_fx );
-                move32();
-            }
-        }
-        interpolate_3_over_2_allpass_32( error_fx, L_FRAME32k, synth_fx, hBWE_TD->int_3_over_2_tbemem_dec_fx_32 );
-    }
-    ELSE IF( EQ_32( st->output_Fs, 32000 ) )
-    {
-        IF( NE_16( synth_scale_fx, 32767 ) ) /* 1.0 in Q15 */
-        {
-            FOR( i = 0; i < L_FRAME32k; i++ )
-            {
-                synth_fx[i] = Mpy_32_16_1( error_fx[i], synth_scale_fx );
-                move32(); /*Qx*/
-            }
-        }
-        ELSE
-        {
-            Copy32( error_fx, synth_fx, L_FRAME32k );
-        }
-    }
-    ELSE IF( EQ_32( st->output_Fs, 16000 ) )
-    {
-        IF( NE_16( synth_scale_fx, 32767 ) ) /* 1.0 in Q15 */
-        {
-            FOR( i = 0; i < L_FRAME32k; i++ )
-            {
-                error_fx[i] = Mpy_32_16_1( error_fx[i], synth_scale_fx );
-                move32();
-            }
-        }
-
-        Decimate_allpass_steep_fx32( error_fx, hBWE_TD->mem_resamp_HB_32k_fx_32, L_FRAME32k, synth_fx );
-    }
-
-
-    /* Update previous frame parameters for FEC */
-    Copy( lsf_shb_fx, hBWE_TD->lsp_prevfrm_fx, LPC_SHB_ORDER );
-    IF( EQ_16( st->codec_mode, MODE1 ) )
-    {
-        hBWE_TD->GainFrame_prevfrm_fx = GainFrame_fx;
-        move32(); /*Q18*/
-        hBWE_TD->tilt_swb_fec_fx = tilt_swb_fec_fx;
-        move16();
-
-        if ( !st->bfi )
-        {
-            hBWE_TD->GainAttn_fx = 32767; /*1.0f in Q15*/
-            move16();
-        }
-    }
-    ELSE
-    {
-        IF( !st->bfi )
-        {
-            hBWE_TD->GainFrame_prevfrm_fx = GainFrame_fx;
-            move32(); /*Q18*/
-            hBWE_TD->tilt_swb_fec_fx = tilt_swb_fec_fx;
-            move16();
-            hBWE_TD->GainAttn_fx = 32767; /*1.0f in Q15*/
-            move16();
-        }
-    }
-
-    hBWE_TD->prev_ener_fx = ener_tmp_fx[NUM_SHB_SUBGAINS - 1];
-    move32();
-    hBWE_TD->prev_GainShape_fx = GainShape_fx[NUM_SHB_SUBFR - 1];
-    move16();
-    st->prev_Q_bwe_syn2 = Q_bwe_exc;
-    move16();
-    st->prev_Qx = Q_bwe_exc;
-    move16();
-
-    return;
-}
-/*-------------------------------------------------------------------*
- * Dequant_lower_LSF()
- *
- * Dequantized the lower LSFs
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * Map_higher_LSF()
- *
- * Map the higher LSFs from the lower LSFs
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * Map_higher_LSF()
- *
- * Map the higher LSFs from the lower LSFs
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * dequantizeSHBparams()
- *
- * Dequantize super highband spectral envolope, temporal gains and frame gain
- *-------------------------------------------------------------------*/
-
-
-void GenTransition_fixed(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                   */
-    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal : Q11 */
-    const Word32 output_Fs,    /* i  : output sampling rate              : Q0  */
-    const Word16 element_mode, /* i  : element mode                      : Q0  */
-    const Word16 L_frame,      /* i  : ACELP frame length                : Q0  */
-    const Word16 rf_flag,      /* i  : RF flag                           : Q0  */
-    const Word32 total_brate,  /* i  : total bitrate                     : Q0  */
-    const Word16 prev_Qx )
-{
-    Word16 i, length;
-
-    Word32 syn_overlap_32k_fx[2 * SHB_OVERLAP_LEN];
-
-    /* set targeted length of transition signal */
-    length = i_mult( 2, NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS ) );
-
-    /* upsample overlap snippet */
-    Interpolate_allpass_steep_32( hBWE_TD->syn_overlap_fx_32, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, SHB_OVERLAP_LEN, syn_overlap_32k_fx );
-
-    /* perFORm spectral flip and downmix with overlap snippet to match HB synth  */
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( element_mode == EVS_MONO ) && ( rf_flag || EQ_32( total_brate, ACELP_9k60 ) ) ) || ( ( element_mode > EVS_MONO ) && EQ_16( L_frame, L_FRAME ) ) )
-    {
-        flip_and_downmix_generic_fx_32( syn_overlap_32k_fx, syn_overlap_32k_fx, 2 * SHB_OVERLAP_LEN, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx + HILBERT_ORDER1, hBWE_TD->genSHBsynth_Hilbert_Mem_fx + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ), &( hBWE_TD->syn_dm_phase ) );
-    }
-    ELSE
-    {
-        FOR( i = 0; i < 2 * SHB_OVERLAP_LEN; i++ )
-        {
-            IF( i % 2 == 0 )
-            {
-                syn_overlap_32k_fx[i] = L_negate( syn_overlap_32k_fx[i] );
-            }
-            ELSE
-            {
-                syn_overlap_32k_fx[i] = syn_overlap_32k_fx[i];
-            }
-            move32();
-        }
-    }
-
-    /* cross fade of overlap snippet and mirrored HB synth from previous frame */
-    FOR( i = 0; i < 2 * L_SHB_LAHEAD; i++ )
-    {
-        outputHB_fx[i] = L_add_sat( Mpy_32_16_1( hBWE_TD->old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH - 1 - i], window_shb_32k_fx[i] ), Mpy_32_16_1( syn_overlap_32k_fx[i], window_shb_32k_fx[2 * L_SHB_LAHEAD - 1 - i] ) );
-        move32();
-    }
-
-    /* fill transition signal with mirrored HB synth from previous frame to fully fill delay alignment buffer gap */
-    FOR( ; i < length; i++ )
-    {
-        outputHB_fx[i] = L_shl( hBWE_TD->old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH - 1 - i], sub( Q11, prev_Qx ) );
-        move32();
-    }
-
-    IF( EQ_32( output_Fs, 48000 ) )
-    {
-        interpolate_3_over_2_allpass_32( outputHB_fx, length, outputHB_fx, hBWE_TD->int_3_over_2_tbemem_dec_fx_32 );
-    }
-    ELSE IF( EQ_32( output_Fs, 16000 ) )
-    {
-        Decimate_allpass_steep_fx32( outputHB_fx, hBWE_TD->mem_resamp_HB_32k_fx_32, L_FRAME32k, outputHB_fx );
-    }
-
-    return;
-}
-void GenTransition_WB_fixed(
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                  */
-    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal  : Q11  */
-    const Word32 output_Fs     /* i  : output sampling rate                */
-)
-{
-    Word16 i, length;
-    Word32 speech_buf_16k1_fx[SHB_OVERLAP_LEN], speech_buf_16k2_fx[2 * SHB_OVERLAP_LEN];
-    Word32 upsampled_synth_fx[L_FRAME48k];
-
-    /* set targeted length of transition signal */
-    length = i_mult( 2, NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS ) );
-
-    /* upsample overlap snippet */
-    Interpolate_allpass_steep_32( hBWE_TD->syn_overlap_fx_32, hBWE_TD->state_lsyn_filt_shb_fx_32, SHB_OVERLAP_LEN / 2, speech_buf_16k1_fx );
-    Interpolate_allpass_steep_32( speech_buf_16k1_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx_32, SHB_OVERLAP_LEN, speech_buf_16k2_fx );
-
-    /* perform spectral flip and downmix with overlap snippet to match HB synth  */
-    FOR( i = 0; i < SHB_OVERLAP_LEN; i++ )
-    {
-        IF( i % 2 == 0 )
-        {
-            speech_buf_16k2_fx[i] = L_negate( speech_buf_16k2_fx[i] );
-            move32();
-        }
-        ELSE
-        {
-            speech_buf_16k2_fx[i] = speech_buf_16k2_fx[i];
-            move32();
-        }
-    }
-
-    /* cross fade of overlap snippet and mirrored HB synth from previous frame */
-    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
-    {
-        outputHB_fx[i] = L_add( Mpy_32_16_1( hBWE_TD->old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH - 1 - i], window_shb_fx[i] ), Mpy_32_16_1( speech_buf_16k2_fx[i], window_shb_fx[L_SHB_LAHEAD - 1 - i] ) );
-        move32();
-        outputHB_fx[i] = Mpy_32_16_1( outputHB_fx[i], 21299 );
-        move32();
-    }
-
-    /* fill transition signal with mirrored HB synth from previous frame to fully fill delay alignment buffer gap */
-    FOR( ; i < length; i++ )
-    {
-        outputHB_fx[i] = hBWE_TD->old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH - 1 - i];
-        move32();
-        outputHB_fx[i] = Mpy_32_16_1( outputHB_fx[i], 21299 );
-        move32();
-    }
-
-    /* upsampling if necessary */
-    IF( EQ_32( output_Fs, 32000 ) )
-    {
-        Interpolate_allpass_steep_32( outputHB_fx, hBWE_TD->mem_resamp_HB_fx_32, L_FRAME16k, upsampled_synth_fx );
-        Copy32( upsampled_synth_fx, outputHB_fx, L_FRAME32k );
-    }
-    ELSE IF( EQ_32( output_Fs, 48000 ) )
-    {
-        interpolate_3_over_1_allpass_32( outputHB_fx, L_FRAME16k, upsampled_synth_fx, hBWE_TD->mem_resamp_HB_fx_32 );
-        Copy32( upsampled_synth_fx, outputHB_fx, L_FRAME48k );
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * td_bwe_dec_init()
- *
- * Initialize TD BWE state structure at the decoder
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c
index 54a8127c97ff8ac7c5152e7c96dfcff8a9d16136..bd8700063219b0729e0b9e8448d42aa98512e6c0 100644
--- a/lib_dec/swb_tbe_dec_fx.c
+++ b/lib_dec/swb_tbe_dec_fx.c
@@ -25,11 +25,8 @@ static void rescale_genWB_mem( Decoder_State *st_fx, Word16 sf );
 static void Dequant_lower_LSF_fx( const Word16 lsf_idx[], Word16 lsf_q[] );
 static void Map_higher_LSF_fx( Word16 lsf_q[], const Word16 m, const Word16 grid_in[] );
 static void Dequant_mirror_point_fx( const Word16 lsf_q[], const Word16 m_idx, Word16 *m );
-Word16 dotp_loc(
-    const Word16 x[], /* i  : vector x[]                    */
-    const Word32 y[], /* i  : vector y[]                    */
-    const Word16 n    /* i  : vector length                 */
-);
+static Word16 dotp_loc( const Word16 x[], const Word32 y[], const Word16 n );
+static void find_max_mem_dec_m3( Decoder_State *st, Word16 *n_mem3 );
 
 /* gain shape concealment code */
 static void gradientGainShape( Decoder_State *st_fx, Word16 *GainShape, Word32 *GainFrame );
@@ -406,62 +403,14 @@ void rescale_genWB_mem( Decoder_State *st_fx, Word16 sf )
         hBWE_TD->mem_csfilt_fx[i] = L_shl( hBWE_TD->mem_csfilt_fx[i], sf );
         move32();
     }
-}
-
-void InitSWBdecBuffer_ivas_fx(
-    Decoder_State *st_fx /* i/o: SHB decoder structure */
-)
-{
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
-
-    set16_fx( hBWE_TD->old_bwe_exc_fx, 0, ( PIT16k_MAX * 2 ) );
-    hBWE_TD->bwe_seed[0] = 23;
-    move16();
-    hBWE_TD->bwe_seed[1] = 59;
-    move16();
-
-    set16_fx( hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET );
-    hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-    move16();
-
-    set32_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, 0, HILBERT_MEM_SIZE );
-    set16_fx( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, 0, 2 * ALLPASSSECTIONS_STEEP );    /* Interp all pass memory */
-    set32_fx( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, 0, 2 * ALLPASSSECTIONS_STEEP ); /* Interp all pass memory */
-
-    hBWE_TD->syn_dm_phase = 0;
-    move16();
-    hBWE_TD->prev_fbbwe_ratio_fx = 32767 /*1.0f Q15*/;
-    move16();
 
-    /* these are fd-bwe constants */
-    hBWE_TD->prev_wb_bwe_frame_pow_fx = 4194l /*0.001f Q22*/; /* Q22 */
-    move32();
-    hBWE_TD->prev_swb_bwe_frame_pow_fx = 4194l /*0.001f Q22*/; /* Q22 */
-    move32();
-    st_fx->prev_Q_bwe_exc = 31;
-    move16();
-    st_fx->prev_ener_fx_Q = 31;
-    move16();
-    st_fx->prev_Qx = 0;
-    move16();
-    st_fx->prev_frame_pow_exp = 0;
-    move16();
-    st_fx->prev_Q_bwe_syn = 0;
-    move16();
-    st_fx->prev_Q_bwe_syn2 = 0;
-    move16();
     return;
 }
 
 
-void InitSWBdecBuffer_fx(
-    Decoder_State *st_fx /* i/o: SHB decoder structure */
-)
+static void InitSWBdecBuffer_fx(
+    TD_BWE_DEC_HANDLE hBWE_TD /* TD BWE data handle */ )
 {
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
-
     set16_fx( hBWE_TD->old_bwe_exc_fx, 0, ( PIT16k_MAX * 2 ) );
     hBWE_TD->bwe_seed[0] = 23;
     move16();
@@ -473,7 +422,8 @@ void InitSWBdecBuffer_fx(
     move16();
 
     set32_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, 0, HILBERT_MEM_SIZE );
-    set16_fx( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, 0, 2 * ALLPASSSECTIONS_STEEP ); /* Interp all pass memory */
+    set16_fx( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, 0, 2 * ALLPASSSECTIONS_STEEP );    /* Interp all pass memory */
+    set32_fx( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, 0, 2 * ALLPASSSECTIONS_STEEP ); /* Interp all pass memory */
 
     hBWE_TD->syn_dm_phase = 0;
     move16();
@@ -485,31 +435,33 @@ void InitSWBdecBuffer_fx(
     move32();
     hBWE_TD->prev_swb_bwe_frame_pow_fx = 4194l /*0.001f Q22*/; /* Q22 */
     move32();
-    st_fx->prev_Q_bwe_exc = 31;
+    hBWE_TD->prev_ener_fx_Q = 31;
     move16();
-    st_fx->prev_ener_fx_Q = 31;
+    hBWE_TD->prev_Qx = 0;
     move16();
-    st_fx->prev_Qx = 0;
+    hBWE_TD->prev_frame_pow_exp = 0;
     move16();
-    st_fx->prev_frame_pow_exp = 0;
+    hBWE_TD->prev_Q_bwe_syn = 0;
     move16();
-    st_fx->prev_Q_bwe_syn = 0;
+    hBWE_TD->prev_Q_bwe_syn2 = 0;
     move16();
-    st_fx->prev_Q_bwe_syn2 = 0;
+    hBWE_TD->prev_hb_synth_fx_exp = 31;
     move16();
+
     return;
 }
 
 
-void ResetSHBbuffer_Dec_fx( Decoder_State *st_fx /* i/o: SHB encoder structure */ )
+void ResetSHBbuffer_Dec_fx(
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */
+    const Word16 extl          /* i  : BWE extension layer     */
+)
 {
     Word16 i;
     Word16 f;
     Word16 inc;
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
 
-    IF( NE_16( st_fx->extl, WB_TBE ) )
+    IF( NE_16( extl, WB_TBE ) )
     {
         f = 1489;
         move16(); /* Q15 */
@@ -531,7 +483,7 @@ void ResetSHBbuffer_Dec_fx( Decoder_State *st_fx /* i/o: SHB encoder structure *
     set16_fx( hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD );
     set16_fx( hBWE_TD->state_lpc_syn_fx, 0, LPC_SHB_ORDER );
 
-    IF( EQ_16( st_fx->extl, FB_TBE ) )
+    IF( EQ_16( extl, FB_TBE ) )
     {
         set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
         hBWE_TD->fb_tbe_demph_fx = 0;
@@ -554,7 +506,7 @@ void ResetSHBbuffer_Dec_fx( Decoder_State *st_fx /* i/o: SHB encoder structure *
 
     /* States for FEC */
 
-    IF( NE_16( st_fx->extl, WB_TBE ) )
+    IF( NE_16( extl, WB_TBE ) )
     {
         FOR( i = 0; i < LPC_SHB_ORDER; i++ )
         {
@@ -590,7 +542,7 @@ void ResetSHBbuffer_Dec_fx( Decoder_State *st_fx /* i/o: SHB encoder structure *
     set16_fx( hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
     hBWE_TD->gain_prec_swb_fx = 16384; /*Q14 =1*/
     move16();
-    set16_fx( &st_fx->GainShape_Delay[0], 0, NUM_SHB_SUBFR / 2 );
+    set16_fx( hBWE_TD->GainShape_Delay_fx, 0, NUM_SHB_SUBFR / 2 );
     hBWE_TD->prev_pow_exc16kWhtnd_fx32 = 1; /* Q0 1.f */
     move32();
     hBWE_TD->prev_mix_factor_fx = 32767; /*Q15 1.f*/
@@ -666,6 +618,7 @@ void ivas_wb_tbe_dec_fx(
     move16();
     Word32 dummy2[HILBERT_MEM_SIZE];
     Word16 f, inc;
+    Word64 W_tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -820,11 +773,11 @@ void ivas_wb_tbe_dec_fx(
         IF( EQ_32( st_fx->extl_brate, WB_TBE_0k35 ) )
         {
             /* convert LSPs back into LP coeffs */
-            lsp2lpc_fx( lpc_wb + 1, lsf_wb, st_fx->prev_lpc_wb_fx, LPC_SHB_ORDER_LBR_WB );
+            lsp2lpc_fx( lpc_wb + 1, lsf_wb, hBWE_TD->prev_lpc_wb_fx, LPC_SHB_ORDER_LBR_WB );
             set16_fx( lpc_wb + LPC_SHB_ORDER_LBR_WB + 1, 0, ( LPC_SHB_ORDER_WB - LPC_SHB_ORDER_LBR_WB ) );
             FOR( i = 0; i < LPC_SHB_ORDER_WB; i++ )
             {
-                st_fx->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
+                hBWE_TD->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
                 move16();
             }
             FOR( i = 1; i < LPC_SHB_ORDER_LBR_WB + 1; i++ )
@@ -838,10 +791,10 @@ void ivas_wb_tbe_dec_fx(
         ELSE
         {
             /* convert LSPs back into LP coeffs */
-            lsp2lpc_fx( lpc_wb + 1, lsf_wb, st_fx->prev_lpc_wb_fx, LPC_SHB_ORDER_WB );
+            lsp2lpc_fx( lpc_wb + 1, lsf_wb, hBWE_TD->prev_lpc_wb_fx, LPC_SHB_ORDER_WB );
             FOR( i = 0; i < LPC_SHB_ORDER_WB; i++ )
             {
-                st_fx->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
+                hBWE_TD->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
                 move16();
             }
             FOR( i = 1; i < LPC_SHB_ORDER_WB + 1; i++ )
@@ -901,21 +854,20 @@ void ivas_wb_tbe_dec_fx(
             move16(); /* restrict this to 21 due to the Q factor requireemnt of the random number generator (keep 1 bit headroom) */
         }
 
-        prev_pow = 0;
-        move32();
+        W_tmp = 0;
+        move64();
         IF( st_fx->element_mode > EVS_MONO )
         {
             tmp = sub( shl( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
-            prev_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#else
-            prev_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                 /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#endif
+            W_tmp = L_shl( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
         }
         FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
         {
-            prev_pow = L_mac0( prev_pow, hBWE_TD->state_syn_shbexc_fx[i], hBWE_TD->state_syn_shbexc_fx[i] ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
+            W_tmp = W_mac_16_16( W_tmp, hBWE_TD->state_syn_shbexc_fx[i], hBWE_TD->state_syn_shbexc_fx[i] ); /*Q(2*(st_fx->prev_Q_bwe_exc-16 + 1))*/
         }
+        exp = W_norm( W_tmp );
+        prev_pow = W_extract_h( W_shl( W_tmp, exp ) );
+        exp = sub( add( add( shl( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), 1 ), exp ), 32 );
 
         rescale_genWB_mem( st_fx, sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ) );
 
@@ -930,7 +882,7 @@ void ivas_wb_tbe_dec_fx(
 
         Q_bwe_exc_ext = sub( Q_bwe_exc, 16 );
 
-        ivas_GenShapedWBExcitation_fx( shaped_wb_excitation + L_SHB_LAHEAD / 4, lpc_wb, exc4kWhtnd, hBWE_TD->mem_csfilt_fx,
+        GenShapedWBExcitation_ivas_fx( shaped_wb_excitation + L_SHB_LAHEAD / 4, lpc_wb, exc4kWhtnd, hBWE_TD->mem_csfilt_fx,
                                        hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->mem_genSHBexc_filt_down_wb2_fx,
                                        hBWE_TD->mem_genSHBexc_filt_down_wb3_fx, hBWE_TD->state_lpc_syn_fx, coder_type,
                                        bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed, vf_modified, uv_flag, st_fx->igf );
@@ -940,19 +892,11 @@ void ivas_wb_tbe_dec_fx(
         IF( st_fx->element_mode > EVS_MONO )
         {
             tmp = sub( shl( Q_bwe_exc_ext, 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
             curr_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(Q_bwe_exc_ext))*/
-#else
-            curr_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                 /* 2*(Q_bwe_exc_ext) */
-#endif
         }
         FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
         {
-#ifdef BASOP_NOGLOB
             curr_pow = L_mac0_sat( curr_pow, shaped_wb_excitation[i + L_SHB_LAHEAD / 4], shaped_wb_excitation[i + L_SHB_LAHEAD / 4] ); /* Q(2*Q_bwe_exc_ext) */
-#else
-            curr_pow = L_mac0( curr_pow, shaped_wb_excitation[i + L_SHB_LAHEAD / 4], shaped_wb_excitation[i + L_SHB_LAHEAD / 4] ); /* Q(2*Q_bwe_exc_ext) */
-#endif
         }
 
         if ( GT_16( voice_factors[0], 24576 ) )
@@ -961,16 +905,12 @@ void ivas_wb_tbe_dec_fx(
         }
 
         Lscale = root_a_over_b_fx( curr_pow, shl_r( Q_bwe_exc_ext, 1 ), prev_pow,
-                                   shl_r( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), &exp );
+                                   exp, &exp );
 
         FOR( i = 0; i < L_SHB_LAHEAD / 4 - 1; i++ )
         {
-            L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[i] ); /* Q(16-exp+Q_bwe_exc_ext) */
-#ifdef BASOP_NOGLOB
+            L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[i] );             /* Q(16-exp+Q_bwe_exc_ext) */
             shaped_wb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-#else
-            shaped_wb_excitation[i] = round_fx( L_shl( L_tmp, exp ) );                                                             /* Q_bwe_exc_ext */
-#endif
             move16();
         }
         Lscale = root_a_fx( Lscale, sub( 31, exp ), &exp );
@@ -1007,39 +947,29 @@ void ivas_wb_tbe_dec_fx(
             n = norm_s( max );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 shaped_wb_excitation_frac[i] = shl_o( shaped_wb_excitation[i], n, &Overflow ); /*Q14*/
                 move16();
-#else
-                shaped_wb_excitation_frac[i] = shl( shaped_wb_excitation[i], n );                                                  /*Q14*/
-                move16();
-#endif
             }
             n = sub( 14, n );
             curr_frame_pow = 1;
             move32();
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_o( shaped_wb_excitation_frac[i], shaped_wb_excitation_frac[i], &Overflow ); /*Q29*/
                 curr_frame_pow = L_add_o( curr_frame_pow, L_shr( L_tmp, 7 ), &Overflow );                  /*Q22*/
-#else
-                L_tmp = L_mult( shaped_wb_excitation_frac[i], shaped_wb_excitation_frac[i] ); /*Q29*/
-                curr_frame_pow = L_add( curr_frame_pow, L_shr( L_tmp, 7 ) );                  /*Q22*/
-#endif
             }
         }
         curr_frame_pow_exp = add( n, n );
 
-        IF( GT_16( st_fx->prev_frame_pow_exp, curr_frame_pow_exp ) )
+        IF( GT_16( hBWE_TD->prev_frame_pow_exp, curr_frame_pow_exp ) )
         {
-            curr_frame_pow = L_shr( curr_frame_pow, sub( st_fx->prev_frame_pow_exp, curr_frame_pow_exp ) );
-            curr_frame_pow_exp = st_fx->prev_frame_pow_exp;
+            curr_frame_pow = L_shr( curr_frame_pow, sub( hBWE_TD->prev_frame_pow_exp, curr_frame_pow_exp ) );
+            curr_frame_pow_exp = hBWE_TD->prev_frame_pow_exp;
             move16();
         }
         ELSE
         {
-            hBWE_TD->prev_wb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_wb_bwe_frame_pow_fx, sub( curr_frame_pow_exp, st_fx->prev_frame_pow_exp ) );
+            hBWE_TD->prev_wb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_wb_bwe_frame_pow_fx, sub( curr_frame_pow_exp, hBWE_TD->prev_frame_pow_exp ) );
             move32();
         }
 
@@ -1095,7 +1025,7 @@ void ivas_wb_tbe_dec_fx(
 
         hBWE_TD->prev_wb_bwe_frame_pow_fx = curr_frame_pow;
         move32();
-        st_fx->prev_frame_pow_exp = curr_frame_pow_exp;
+        hBWE_TD->prev_frame_pow_exp = curr_frame_pow_exp;
         move16();
 
         /* generate 16kHz SHB signal (6 - 8 kHz) from 2kHz signal */
@@ -1153,8 +1083,10 @@ void ivas_wb_tbe_dec_fx(
         }
         n_mem = s_max( n_mem, 0 );
 
-        if ( GT_16( sub( Qx, st_fx->prev_Qx ), n_mem ) )
-            Qx = add( st_fx->prev_Qx, n_mem );
+        if ( GT_16( sub( Qx, hBWE_TD->prev_Qx ), n_mem ) )
+        {
+            Qx = add( hBWE_TD->prev_Qx, n_mem );
+        }
 
         FOR( i = 0; i < ( L_FRAME16k + L_SHB_LAHEAD ) / 4; i++ )
         {
@@ -1164,13 +1096,13 @@ void ivas_wb_tbe_dec_fx(
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
-            hBWE_TD->state_lsyn_filt_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_shb_fx[i], sub( Qx, st_fx->prev_Qx ) );
+            hBWE_TD->state_lsyn_filt_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_shb_fx[i], sub( Qx, hBWE_TD->prev_Qx ) );
             move16();
         }
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
-            hBWE_TD->state_lsyn_filt_dwn_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_dwn_shb_fx[i], sub( Qx, st_fx->prev_Qx ) );
+            hBWE_TD->state_lsyn_filt_dwn_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_dwn_shb_fx[i], sub( Qx, hBWE_TD->prev_Qx ) );
             move16();
         }
 
@@ -1184,64 +1116,58 @@ void ivas_wb_tbe_dec_fx(
             move16();
         }
 
-        max = 0;
-        move16();
-        FOR( cnt = 0; cnt < L_FRAME16k; cnt++ )
-        {
-            max = s_max( max, abs_s( synth[cnt] ) );
-        }
-
-        IF( max == 0 )
+        IF( st_fx->hBWE_FD != NULL )
         {
-            st_fx->last_wb_bwe_ener_fx = 0;
+            max = 0;
             move16();
-        }
-        ELSE
-        {
-            n = norm_s( max );
             FOR( cnt = 0; cnt < L_FRAME16k; cnt++ )
             {
-                synth_frac[cnt] = shl( synth[cnt], n ); /*Q14*/
-                move16();
+                max = s_max( max, abs_s( synth[cnt] ) );
             }
-            n = sub( sub( 14, n ), Qx );
 
-            Lacc = 0;
-            move32();
-            FOR( i = 0; i < L_FRAME16k; i++ )
+            IF( max == 0 )
             {
-                L_tmp = L_mult( synth_frac[i], synth_frac[i] ); /* Q29 */
-                Lacc = L_add( Lacc, L_shr( L_tmp, 7 ) );        /* Q22 */
+                st_fx->hBWE_FD->last_wb_bwe_ener_fx = 0;
+                move16();
             }
+            ELSE
+            {
+                n = norm_s( max );
+                FOR( cnt = 0; cnt < L_FRAME16k; cnt++ )
+                {
+                    synth_frac[cnt] = shl( synth[cnt], n ); /*Q14*/
+                    move16();
+                }
+                n = sub( sub( 14, n ), Qx );
 
-            L_tmp = Mult_32_16( Lacc, 102 ); /* Q22 */
-            exp = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
-            tmp = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow );
-#else
-            tmp = round_fx( L_shl( L_tmp, exp ) );
-#endif
-            exp = sub( add( exp, 22 ), 30 );
-            tmp = div_s( 16384, tmp );
-            L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp ); /* Q(31-exp) */
-#ifdef BASOP_NOGLOB
-            st_fx->last_wb_bwe_ener_fx = round_fx_sat( L_shl_sat( L_tmp, add( exp, sub( n, 12 ) ) ) ); /*  Q3 */
-#else
-            st_fx->last_wb_bwe_ener_fx = round_fx( L_shl( L_tmp, add( exp, sub( n, 12 ) ) ) ); /*  Q3 */
-#endif
-            move16();
-        }
+                Lacc = 0;
+                move32();
+                FOR( i = 0; i < L_FRAME16k; i++ )
+                {
+                    L_tmp = L_mult( synth_frac[i], synth_frac[i] ); /* Q29 */
+                    Lacc = L_add( Lacc, L_shr( L_tmp, 7 ) );        /* Q22 */
+                }
 
+                L_tmp = Mult_32_16( Lacc, 102 ); /* Q22 */
+                exp = norm_l( L_tmp );
+                tmp = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow );
+                exp = sub( add( exp, 22 ), 30 );
+                tmp = div_s( 16384, tmp );
+                L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp );                                                       /* Q(31-exp) */
+                st_fx->hBWE_FD->last_wb_bwe_ener_fx = round_fx_sat( L_shl_sat( L_tmp, add( exp, sub( n, 12 ) ) ) ); /*  Q3 */
+                move16();
+            }
+        }
 
         IF( EQ_32( st_fx->output_Fs, 32000 ) ) /* 32kHz sampling rate, but only WB output - interpolate */
         {
-            Scale_sig( hBWE_TD->state_32and48k_WB_upsample_fx, 2 * ALLPASSSECTIONS_STEEP, sub( Qx, st_fx->prev_Qx ) );
+            Scale_sig( hBWE_TD->state_32and48k_WB_upsample_fx, 2 * ALLPASSSECTIONS_STEEP, sub( Qx, hBWE_TD->prev_Qx ) );
             Interpolate_allpass_steep_fx( synth, hBWE_TD->state_32and48k_WB_upsample_fx, L_FRAME16k, upsampled_synth );
             Copy( upsampled_synth, synth, L_FRAME32k );
         }
         ELSE IF( EQ_32( st_fx->output_Fs, 48000 ) )
         {
-            Scale_sig( hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( Qx, st_fx->prev_Qx ) );
+            Scale_sig( hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( Qx, hBWE_TD->prev_Qx ) );
             ivas_interpolate_3_over_1_allpass_fx( synth, L_FRAME16k, upsampled_synth, hBWE_TD->mem_resamp_HB_fx );
             Copy( upsampled_synth, synth, L_FRAME48k );
         }
@@ -1256,11 +1182,7 @@ void ivas_wb_tbe_dec_fx(
         {
             lsf_wb[i] = f;
             move16(); /*Q15*/
-#ifdef BASOP_NOGLOB
             f = add_sat( f, inc );
-#else
-            f = add( f, inc );
-#endif
             move16();
         }
         GainFrame = 0; /* Q18 */
@@ -1271,7 +1193,7 @@ void ivas_wb_tbe_dec_fx(
         move16();
         hBWE_TD->prev_wb_bwe_frame_pow_fx = 4194l /*0.001f Q22*/; /* Q22 */
         move32();
-        st_fx->prev_frame_pow_exp = 0;
+        hBWE_TD->prev_frame_pow_exp = 0;
         move16();
     }
 
@@ -1298,7 +1220,7 @@ void ivas_wb_tbe_dec_fx(
 
     st_fx->prev_Q_bwe_exc = Q_bwe_exc;
     move16();
-    st_fx->prev_Qx = Qx;
+    hBWE_TD->prev_Qx = Qx;
     move16();
 
     return;
@@ -1496,11 +1418,11 @@ void wb_tbe_dec_fx(
         IF( EQ_32( st_fx->extl_brate, WB_TBE_0k35 ) )
         {
             /* convert LSPs back into LP coeffs */
-            lsp2lpc_fx( lpc_wb + 1, lsf_wb, st_fx->prev_lpc_wb_fx, LPC_SHB_ORDER_LBR_WB );
+            lsp2lpc_fx( lpc_wb + 1, lsf_wb, hBWE_TD->prev_lpc_wb_fx, LPC_SHB_ORDER_LBR_WB );
             set16_fx( lpc_wb + LPC_SHB_ORDER_LBR_WB + 1, 0, LPC_SHB_ORDER_WB - LPC_SHB_ORDER_LBR_WB );
             FOR( i = 0; i < LPC_SHB_ORDER_WB; i++ )
             {
-                st_fx->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
+                hBWE_TD->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
                 move16();
             }
             FOR( i = 1; i < LPC_SHB_ORDER_LBR_WB + 1; i++ )
@@ -1514,10 +1436,10 @@ void wb_tbe_dec_fx(
         ELSE
         {
             /* convert LSPs back into LP coeffs */
-            lsp2lpc_fx( lpc_wb + 1, lsf_wb, st_fx->prev_lpc_wb_fx, LPC_SHB_ORDER_WB );
+            lsp2lpc_fx( lpc_wb + 1, lsf_wb, hBWE_TD->prev_lpc_wb_fx, LPC_SHB_ORDER_WB );
             FOR( i = 0; i < LPC_SHB_ORDER_WB; i++ )
             {
-                st_fx->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
+                hBWE_TD->prev_lpc_wb_fx[i] = lpc_wb[i + 1];
                 move16();
             }
             FOR( i = 1; i < LPC_SHB_ORDER_WB + 1; i++ )
@@ -1582,19 +1504,11 @@ void wb_tbe_dec_fx(
         IF( st_fx->element_mode > EVS_MONO )
         {
             tmp = sub( shl( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
             prev_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#else
-            prev_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                           /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#endif
         }
         FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
         {
-#ifdef BASOP_NOGLOB
             prev_pow = L_mac0_sat( prev_pow, hBWE_TD->state_syn_shbexc_fx[i], hBWE_TD->state_syn_shbexc_fx[i] ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#else
-            prev_pow = L_mac0( prev_pow, hBWE_TD->state_syn_shbexc_fx[i], hBWE_TD->state_syn_shbexc_fx[i] ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#endif
         }
 
         rescale_genWB_mem( st_fx, sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ) );
@@ -1603,11 +1517,7 @@ void wb_tbe_dec_fx(
         sc = sub( Q_bwe_exc, add( Q_exc, Q_exc ) );
         FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
         {
-#ifdef BASOP_NOGLOB
             bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx_sat( L_shl_sat( bwe_exc_extended[cnt], sc ) );
-#else
-            bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx( L_shl( bwe_exc_extended[cnt], sc ) );
-#endif
         }
         Copy( bwe_exc_extended_16 + L_FRAME32k, hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET );
 
@@ -1625,19 +1535,11 @@ void wb_tbe_dec_fx(
         IF( st_fx->element_mode > EVS_MONO )
         {
             tmp = sub( shl( Q_bwe_exc_ext, 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
             curr_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(Q_bwe_exc_ext))*/
-#else
-            curr_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                 /* 2*(Q_bwe_exc_ext) */
-#endif
         }
         FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
         {
-#ifdef BASOP_NOGLOB
             curr_pow = L_mac0_sat( curr_pow, shaped_wb_excitation[i + L_SHB_LAHEAD / 4], shaped_wb_excitation[i + L_SHB_LAHEAD / 4] ); /* Q(2*Q_bwe_exc_ext) */
-#else
-            curr_pow = L_mac0( curr_pow, shaped_wb_excitation[i + L_SHB_LAHEAD / 4], shaped_wb_excitation[i + L_SHB_LAHEAD / 4] ); /* Q(2*Q_bwe_exc_ext) */
-#endif
         }
 
         if ( GT_16( voice_factors[0], 24576 ) )
@@ -1650,12 +1552,8 @@ void wb_tbe_dec_fx(
 
         FOR( i = 0; i < L_SHB_LAHEAD / 4 - 1; i++ )
         {
-            L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[i] ); /* Q(16-exp+Q_bwe_exc_ext) */
-#ifdef BASOP_NOGLOB
+            L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[i] );             /* Q(16-exp+Q_bwe_exc_ext) */
             shaped_wb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-#else
-            shaped_wb_excitation[i] = round_fx( L_shl( L_tmp, exp ) );                                                             /* Q_bwe_exc_ext */
-#endif
             move16();
         }
         Lscale = root_a_fx( Lscale, sub( 31, exp ), &exp );
@@ -1691,39 +1589,29 @@ void wb_tbe_dec_fx(
             n = norm_s( max );
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 shaped_wb_excitation_frac[i] = shl_o( shaped_wb_excitation[i], n, &Overflow ); /*Q14*/
                 move16();
-#else
-                shaped_wb_excitation_frac[i] = shl( shaped_wb_excitation[i], n );                                                  /*Q14*/
-                move16();
-#endif
             }
             n = sub( 14, n );
             curr_frame_pow = 1;
             move32();
             FOR( i = 0; i < L_FRAME16k / 4; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mult_o( shaped_wb_excitation_frac[i], shaped_wb_excitation_frac[i], &Overflow ); /*Q29*/
                 curr_frame_pow = L_add_o( curr_frame_pow, L_shr( L_tmp, 7 ), &Overflow );                  /*Q22*/
-#else
-                L_tmp = L_mult( shaped_wb_excitation_frac[i], shaped_wb_excitation_frac[i] ); /*Q29*/
-                curr_frame_pow = L_add( curr_frame_pow, L_shr( L_tmp, 7 ) );                  /*Q22*/
-#endif
             }
         }
         curr_frame_pow_exp = add( n, n );
 
-        IF( GT_16( st_fx->prev_frame_pow_exp, curr_frame_pow_exp ) )
+        IF( GT_16( hBWE_TD->prev_frame_pow_exp, curr_frame_pow_exp ) )
         {
-            curr_frame_pow = L_shr( curr_frame_pow, sub( st_fx->prev_frame_pow_exp, curr_frame_pow_exp ) );
-            curr_frame_pow_exp = st_fx->prev_frame_pow_exp;
+            curr_frame_pow = L_shr( curr_frame_pow, sub( hBWE_TD->prev_frame_pow_exp, curr_frame_pow_exp ) );
+            curr_frame_pow_exp = hBWE_TD->prev_frame_pow_exp;
             move16();
         }
         ELSE
         {
-            hBWE_TD->prev_wb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_wb_bwe_frame_pow_fx, sub( curr_frame_pow_exp, st_fx->prev_frame_pow_exp ) );
+            hBWE_TD->prev_wb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_wb_bwe_frame_pow_fx, sub( curr_frame_pow_exp, hBWE_TD->prev_frame_pow_exp ) );
             move32();
         }
 
@@ -1777,7 +1665,7 @@ void wb_tbe_dec_fx(
 
         hBWE_TD->prev_wb_bwe_frame_pow_fx = curr_frame_pow;
         move32();
-        st_fx->prev_frame_pow_exp = curr_frame_pow_exp;
+        hBWE_TD->prev_frame_pow_exp = curr_frame_pow_exp;
         move16();
 
         /* generate 16kHz SHB signal (6 - 8 kHz) from 2kHz signal */
@@ -1804,13 +1692,17 @@ void wb_tbe_dec_fx(
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
             if ( GT_16( abs_s( hBWE_TD->state_lsyn_filt_shb_fx[i] ), max ) )
+            {
                 max = abs_s( hBWE_TD->state_lsyn_filt_shb_fx[i] );
+            }
         }
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
             if ( GT_16( abs_s( hBWE_TD->state_lsyn_filt_dwn_shb_fx[i] ), max ) )
+            {
                 max = abs_s( hBWE_TD->state_lsyn_filt_dwn_shb_fx[i] );
+            }
         }
 
         IF( EQ_32( st_fx->output_Fs, 32000 ) )
@@ -1835,8 +1727,10 @@ void wb_tbe_dec_fx(
         }
         n_mem = s_max( n_mem, 0 );
 
-        if ( GT_16( sub( Qx, st_fx->prev_Qx ), n_mem ) )
-            Qx = add( st_fx->prev_Qx, n_mem );
+        if ( GT_16( sub( Qx, hBWE_TD->prev_Qx ), n_mem ) )
+        {
+            Qx = add( hBWE_TD->prev_Qx, n_mem );
+        }
 
         FOR( i = 0; i < ( L_FRAME16k + L_SHB_LAHEAD ) / 4; i++ )
         {
@@ -1846,13 +1740,13 @@ void wb_tbe_dec_fx(
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
-            hBWE_TD->state_lsyn_filt_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_shb_fx[i], sub( Qx, st_fx->prev_Qx ) );
+            hBWE_TD->state_lsyn_filt_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_shb_fx[i], sub( Qx, hBWE_TD->prev_Qx ) );
             move16();
         }
 
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
         {
-            hBWE_TD->state_lsyn_filt_dwn_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_dwn_shb_fx[i], sub( Qx, st_fx->prev_Qx ) );
+            hBWE_TD->state_lsyn_filt_dwn_shb_fx[i] = shl( hBWE_TD->state_lsyn_filt_dwn_shb_fx[i], sub( Qx, hBWE_TD->prev_Qx ) );
             move16();
         }
 
@@ -1866,64 +1760,58 @@ void wb_tbe_dec_fx(
             move16();
         }
 
-        max = 0;
-        move16();
-        FOR( cnt = 0; cnt < L_FRAME16k; cnt++ )
-        {
-            max = s_max( max, abs_s( synth[cnt] ) );
-        }
-
-        IF( max == 0 )
+        IF( st_fx->hBWE_FD != NULL )
         {
-            st_fx->last_wb_bwe_ener_fx = 0;
+            max = 0;
             move16();
-        }
-        ELSE
-        {
-            n = norm_s( max );
             FOR( cnt = 0; cnt < L_FRAME16k; cnt++ )
             {
-                synth_frac[cnt] = shl( synth[cnt], n ); /*Q14*/
-                move16();
+                max = s_max( max, abs_s( synth[cnt] ) );
             }
-            n = sub( sub( 14, n ), Qx );
 
-            Lacc = 0;
-            move32();
-            FOR( i = 0; i < L_FRAME16k; i++ )
+            IF( max == 0 )
             {
-                L_tmp = L_mult( synth_frac[i], synth_frac[i] ); /* Q29 */
-                Lacc = L_add( Lacc, L_shr( L_tmp, 7 ) );        /* Q22 */
+                st_fx->hBWE_FD->last_wb_bwe_ener_fx = 0;
+                move16();
             }
+            ELSE
+            {
+                n = norm_s( max );
+                FOR( cnt = 0; cnt < L_FRAME16k; cnt++ )
+                {
+                    synth_frac[cnt] = shl( synth[cnt], n ); /*Q14*/
+                    move16();
+                }
+                n = sub( sub( 14, n ), Qx );
 
-            L_tmp = Mult_32_16( Lacc, 102 ); /* Q22 */
-            exp = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
-            tmp = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow );
-#else
-            tmp = round_fx( L_shl( L_tmp, exp ) );
-#endif
-            exp = sub( add( exp, 22 ), 30 );
-            tmp = div_s( 16384, tmp );
-            L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp ); /* Q(31-exp) */
-#ifdef BASOP_NOGLOB
-            st_fx->last_wb_bwe_ener_fx = round_fx_sat( L_shl_sat( L_tmp, add( exp, sub( n, 12 ) ) ) ); /*  Q3 */
-#else
-            st_fx->last_wb_bwe_ener_fx = round_fx( L_shl( L_tmp, add( exp, n - 12 ) ) ); /*  Q3 */
-#endif
-            move16();
-        }
+                Lacc = 0;
+                move32();
+                FOR( i = 0; i < L_FRAME16k; i++ )
+                {
+                    L_tmp = L_mult( synth_frac[i], synth_frac[i] ); /* Q29 */
+                    Lacc = L_add( Lacc, L_shr( L_tmp, 7 ) );        /* Q22 */
+                }
 
+                L_tmp = Mult_32_16( Lacc, 102 ); /* Q22 */
+                exp = norm_l( L_tmp );
+                tmp = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow );
+                exp = sub( add( exp, 22 ), 30 );
+                tmp = div_s( 16384, tmp );
+                L_tmp = Isqrt_lc( L_deposit_h( tmp ), &exp );                                                       /* Q(31-exp) */
+                st_fx->hBWE_FD->last_wb_bwe_ener_fx = round_fx_sat( L_shl_sat( L_tmp, add( exp, sub( n, 12 ) ) ) ); /*  Q3 */
+                move16();
+            }
+        }
 
         IF( EQ_32( st_fx->output_Fs, 32000 ) ) /* 32kHz sampling rate, but only WB output - interpolate */
         {
-            Scale_sig( hBWE_TD->state_32and48k_WB_upsample_fx, 2 * ALLPASSSECTIONS_STEEP, sub( Qx, st_fx->prev_Qx ) );
+            Scale_sig( hBWE_TD->state_32and48k_WB_upsample_fx, 2 * ALLPASSSECTIONS_STEEP, sub( Qx, hBWE_TD->prev_Qx ) );
             Interpolate_allpass_steep_fx( synth, hBWE_TD->state_32and48k_WB_upsample_fx, L_FRAME16k, upsampled_synth );
             Copy( upsampled_synth, synth, L_FRAME32k );
         }
         ELSE IF( EQ_32( st_fx->output_Fs, 48000 ) )
         {
-            Scale_sig( hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( Qx, st_fx->prev_Qx ) );
+            Scale_sig( hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( Qx, hBWE_TD->prev_Qx ) );
             interpolate_3_over_1_allpass_fx( synth, L_FRAME16k, upsampled_synth, hBWE_TD->mem_resamp_HB_fx );
             Copy( upsampled_synth, synth, L_FRAME48k );
         }
@@ -1938,11 +1826,7 @@ void wb_tbe_dec_fx(
         {
             lsf_wb[i] = f;
             move16(); /*Q15*/
-#ifdef BASOP_NOGLOB
             f = add_sat( f, inc );
-#else
-            f = add( f, inc );
-#endif
             move16();
         }
         GainFrame = 0; /* Q18 */
@@ -1953,7 +1837,7 @@ void wb_tbe_dec_fx(
         move16();
         hBWE_TD->prev_wb_bwe_frame_pow_fx = 4194l /*0.001f Q22*/; /* Q22 */
         move32();
-        st_fx->prev_frame_pow_exp = 0;
+        hBWE_TD->prev_frame_pow_exp = 0;
         move16();
     }
 
@@ -1980,7 +1864,7 @@ void wb_tbe_dec_fx(
 
     st_fx->prev_Q_bwe_exc = Q_bwe_exc;
     move16();
-    st_fx->prev_Qx = Qx;
+    hBWE_TD->prev_Qx = Qx;
     move16();
 
     return;
@@ -2093,7 +1977,7 @@ void swb_tbe_dec_fx(
     move16();
     shb_ener_sf_32 = L_deposit_l( 0 );
     set16_fx( shaped_shb_excitationTemp, 0, L_FRAME16k );
-    st_fx->shb_dtx_count_fx = 0;
+    st_fx->hTdCngDec->shb_dtx_count_fx = 0;
     move16();
     is_fractive = 0;
     move16();
@@ -2101,11 +1985,7 @@ void swb_tbe_dec_fx(
     Q_shb = 0;                                                  /* high band target Q factor set to zero */
     move16();
     L_tmp = calc_tilt_bwe_fx( old_syn_12k8_16k, st_fx->Q_syn2, st_fx->L_frame );
-#ifdef BASOP_NOGLOB
     tilt_swb_fec = round_fx_sat( L_shl_sat( L_tmp, 3 ) );
-#else
-    tilt_swb_fec = round_fx( L_shl( L_tmp, 3 ) );
-#endif
     /* i: old_syn_12k8_16k in st_fx->Q_syn2 */
     /* o: tilt_swb_fec in Q11 */
     test();
@@ -2352,7 +2232,7 @@ void swb_tbe_dec_fx(
                 {
                     FOR( j = 0; j < 4; j++ )
                     {
-                        GainShape[add( i * 4, j )] = mult_r( st_fx->cummulative_damping, st_fx->GainShape_Delay[4 + i] );
+                        GainShape[add( i * 4, j )] = mult_r( st_fx->cummulative_damping, hBWE_TD->GainShape_Delay_fx[4 + i] );
                         move16();
                     }
                 }
@@ -2401,11 +2281,7 @@ void swb_tbe_dec_fx(
                         scale = div_s( tmp1, tmp ); /* Q15 - Q(15-exp) + Qi  = Qexp+i */
                         scale = s_max( scale, 0 );
                         /*scale = st->prev_res_shb_gshape * min(scale, 1.0f); */
-#ifdef BASOP_NOGLOB
                         tmp = shl_sat( scale, sub( sub( 15, exp ), i ) ); /*Q15*/
-#else
-                        tmp = shl( scale, 15 - exp - i ); /*Q15*/
-#endif
                     }
                     scale = mult_r( hBWE_TD->prev_res_shb_gshape_fx, tmp ); /* Q14 */
 
@@ -2461,13 +2337,13 @@ void swb_tbe_dec_fx(
     }
 
     /* get the gainshape delay */
-    Copy( &st_fx->GainShape_Delay[4], &st_fx->GainShape_Delay[0], NUM_SHB_SUBFR / 4 );
+    Copy( &hBWE_TD->GainShape_Delay_fx[4], &hBWE_TD->GainShape_Delay_fx[0], NUM_SHB_SUBFR / 4 );
     test();
     IF( ( st_fx->rf_flag != 0 ) || EQ_32( st_fx->total_brate, ACELP_9k60 ) )
     {
         FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
         {
-            st_fx->GainShape_Delay[i + 4] = s_min( s_max( GainShape[i * 4], 3277 /*0.1f Q15*/ ), 16384 /*0.5f Q15*/ );
+            hBWE_TD->GainShape_Delay_fx[i + 4] = s_min( s_max( GainShape[i * 4], 3277 /*0.1f Q15*/ ), 16384 /*0.5f Q15*/ );
             move16();
         }
     }
@@ -2475,7 +2351,7 @@ void swb_tbe_dec_fx(
     {
         FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
         {
-            st_fx->GainShape_Delay[i + 4] = GainShape[i * 4];
+            hBWE_TD->GainShape_Delay_fx[i + 4] = GainShape[i * 4];
             move16();
         }
     }
@@ -2687,8 +2563,11 @@ void swb_tbe_dec_fx(
     move16();
 
     /* SWB CNG/DTX - update memories */
-    Copy( st_fx->lsp_shb_prev_fx, st_fx->lsp_shb_prev_prev_fx, LPC_SHB_ORDER ); /* Q15 */
-    Copy( lsf_shb, st_fx->lsp_shb_prev_fx, LPC_SHB_ORDER );                     /* Q15 */
+    if ( st_fx->hTdCngDec != NULL )
+    {
+        Copy( st_fx->hTdCngDec->lsp_shb_prev_fx, st_fx->hTdCngDec->lsp_shb_prev_prev_fx, LPC_SHB_ORDER ); /* Q15 */
+        Copy( lsf_shb, st_fx->hTdCngDec->lsp_shb_prev_fx, LPC_SHB_ORDER );                                /* Q15 */
+    }
 
     /* vind = (short)(mixFactors*8.0f); */
     vind = shl( mixFactors, 3 - 15 ); /* 3 for mpy by 8.0f, -15 to bring it to Q0 */
@@ -2738,11 +2617,7 @@ void swb_tbe_dec_fx(
 
     FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
     {
-#ifdef BASOP_NOGLOB
         bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx_sat( L_shl_sat( bwe_exc_extended[cnt], sc ) );
-#else
-        bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx( L_shl( bwe_exc_extended[cnt], sc ) );
-#endif
     }
     Copy( bwe_exc_extended_16 + L_FRAME32k, hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET );
 
@@ -2756,7 +2631,7 @@ void swb_tbe_dec_fx(
     Q_bwe_exc = sub( Q_bwe_exc, 16 ); /* Q_bwe_exc reflecting the single precision dynamic norm-ed buffers from here */
 
     /* -------- end of rescaling memories -------- */
-    Q_bwe_exc_fb = st_fx->prev_Q_bwe_exc_fb;
+    Q_bwe_exc_fb = hBWE_TD->prev_Q_bwe_exc_fb;
     move16();
 
     IF( GT_32( st_fx->total_brate, ACELP_32k ) )
@@ -2773,26 +2648,26 @@ void swb_tbe_dec_fx(
                                coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed, vf_modified, st_fx->extl,
                                &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf, shb_ener_sf_32,
                                shb_res_gshape, shb_res_dummy, &vind, formant_fac, hBWE_TD->fb_state_lpc_syn_fx,
-                               &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, st_fx->prev_Q_bwe_syn, st_fx->total_brate, st_fx->prev_bfi );
+                               &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, hBWE_TD->prev_Q_bwe_syn, st_fx->total_brate, st_fx->prev_bfi );
 
     *Q_white_exc = Q_bwe_exc_fb;
     move16();
     IF( EQ_16( st_fx->extl, FB_TBE ) )
     {
-        st_fx->prev_Q_bwe_exc_fb = Q_bwe_exc_fb;
+        hBWE_TD->prev_Q_bwe_exc_fb = Q_bwe_exc_fb;
         move16();
     }
     ELSE
     {
         /*Indirectly a memory reset of FB memories for next frame such that rescaling of memories would lead to 0 due to such high prev. Q value.
         51 because of 31 + 20(shift of Q_bwe_exc_fb before de-emphasis)*/
-        st_fx->prev_Q_bwe_exc_fb = 51;
+        hBWE_TD->prev_Q_bwe_exc_fb = 51;
         move16();
     }
     /* rescale the TBE post proc memory */
     FOR( i = 0; i < LPC_SHB_ORDER; i++ )
     {
-        hBWE_TD->mem_stp_swb_fx[i] = shl( hBWE_TD->mem_stp_swb_fx[i], sub( Q_bwe_exc, st_fx->prev_Q_bwe_syn ) );
+        hBWE_TD->mem_stp_swb_fx[i] = shl( hBWE_TD->mem_stp_swb_fx[i], sub( Q_bwe_exc, hBWE_TD->prev_Q_bwe_syn ) );
         move16();
     }
 
@@ -2805,22 +2680,12 @@ void swb_tbe_dec_fx(
     Copy( shaped_shb_excitationTemp, &shaped_shb_excitation[L_SHB_LAHEAD], L_FRAME16k ); /* Q_bwe_exc */
 
     tmp = sub( shl( Q_bwe_exc, 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
     prev_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /* 2*(Q_bwe_exc) */
     curr_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /* 2*(Q_bwe_exc) */
-#else
-    prev_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                         /* 2*(Q_bwe_exc) */
-    curr_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );                                                                         /* 2*(Q_bwe_exc) */
-#endif
     FOR( i = 0; i < L_SHB_LAHEAD + 10; i++ )
     {
-#ifdef BASOP_NOGLOB
         prev_pow = L_mac0_sat( prev_pow, shaped_shb_excitation[i], shaped_shb_excitation[i] );                                         /*2*Q_bwe_exc*/
         curr_pow = L_mac0_sat( curr_pow, shaped_shb_excitation[i + L_SHB_LAHEAD + 10], shaped_shb_excitation[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
-#else
-        prev_pow = L_mac0( prev_pow, shaped_shb_excitation[i], shaped_shb_excitation[i] );                                         /*2*Q_bwe_exc*/
-        curr_pow = L_mac0( curr_pow, shaped_shb_excitation[i + L_SHB_LAHEAD + 10], shaped_shb_excitation[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
-#endif
     }
 
     if ( GT_16( voice_factors[0], 24576 /*0.75f Q15*/ ) )
@@ -2828,11 +2693,7 @@ void swb_tbe_dec_fx(
         curr_pow = L_shr( curr_pow, 2 ); /* Q(2*Q_bwe_exc) */
     }
 
-    Lscale = root_a_over_b_fx( curr_pow,
-                               shl( Q_bwe_exc, 1 ),
-                               prev_pow,
-                               shl( Q_bwe_exc, 1 ),
-                               &exp );
+    Lscale = root_a_over_b_fx( curr_pow, shl( Q_bwe_exc, 1 ), prev_pow, shl( Q_bwe_exc, 1 ), &exp );
 
     FOR( i = 0; i < L_SHB_LAHEAD; i++ )
     {
@@ -2848,13 +2709,8 @@ void swb_tbe_dec_fx(
     }
     FOR( ; i < L_SHB_LAHEAD + 10; i++ )
     {
-#ifdef BASOP_NOGLOB
         temp = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ );        /* Q15 */
         L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp ); /* Q31-exp */
-#else
-        temp = i_mult( sub( i, 19 ), 3277 /*0.1f Q15*/ );                                                                          /* Q15 */
-        L_tmp1 = Mult_32_16( L_shl( 1, sub( 31, exp ) ), temp );                                                                   /* Q31-exp */
-#endif
         temp = sub( 32767 /*1.0f Q15*/, temp );
         Lscale = L_add( Mult_32_16( Lscale, temp ), L_tmp1 );
         L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] );     /* Q_bwe_exc + (31-exp) - 15 */
@@ -2894,22 +2750,12 @@ void swb_tbe_dec_fx(
             tmp = div_s( 16384, tmp );
             L_tmp = L_deposit_h( tmp );
             L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB
             ener_tmp[i] = L_shl_sat( L_tmp, sub( add( exp, shl( Q_bwe_exc, 1 ) ), 31 ) ); /*2 * Q_bwe_exc: Q31 -exp +exp +2 * Q_bwe_exc -31  */
             move32();
             L_ener = L_add_sat( L_ener, L_shr( ener_tmp[i], 2 ) ); /* 2*Q_bwe_exc */
-#else
-            ener_tmp[i] = L_shl( L_tmp, sub( add( exp, shl( Q_bwe_exc, 1 ) ), 31 ) );                                              /*2 * Q_bwe_exc: Q31 -exp +exp +2 * Q_bwe_exc -31  */
-            move32();
-            L_ener = L_add( L_ener, L_shr( ener_tmp[i], 2 ) );                                                                                 /* 2*Q_bwe_exc */
-#endif
         }
     }
-#ifdef BASOP_NOGLOB
     ener = s_max( 1, round_fx_sat( L_shl_sat( L_ener, sub( 19, shl( Q_bwe_exc, 1 ) ) ) ) ); /* Q3: 2*Q_bwe_exc+19-2*Q_bwe_exc-16 */
-#else
-    ener = s_max( 1, round_fx( L_shl( L_ener, sub( 19, shl( Q_bwe_exc, 1 ) ) ) ) );                                                            /* Q3: 2*Q_bwe_exc+19-2*Q_bwe_exc-16 */
-#endif
     /* WB/SWB bandwidth switching */
     IF( st_fx->bws_cnt > 0 )
     {
@@ -2972,30 +2818,18 @@ void swb_tbe_dec_fx(
             test();
             IF( GT_32( L_tmp, st_fx->enerLH_fx ) ) /*st_fx->Q_syn2*/
             {
-#ifdef BASOP_NOGLOB
                 st_fx->tilt_wb_fx = extract_h( L_shr_sat( Mult_32_16( st_fx->enerLH_fx, inv_ener ), sub( sub( st_fx->Q_syn2, exp_ener ), 16 ) ) ); /*Q11*/
-#else
-                st_fx->tilt_wb_fx = extract_h( L_shr( Mult_32_16( st_fx->enerLH_fx, inv_ener ), sub( sub( st_fx->Q_syn2, exp_ener ), 16 ) ) ); /*Q11*/
-#endif
                 move16();
                 /*st_fx->Q_syn2 -1 + 26- exp_ener -15 -(st_fx->Q_syn2 -exp_ener -16 ) -16    +1 -1 = (11) *0.5*/
             }
             ELSE IF( LT_32( L_tmp, Mult_32_16( st_fx->enerLH_fx, 1638 ) ) && EQ_16( is_fractive, 1 ) )
             {
-#ifdef BASOP_NOGLOB
                 st_fx->tilt_wb_fx = extract_h( L_shr_sat( Mult_32_16( st_fx->enerLH_fx, inv_ener ), sub( sub( st_fx->Q_syn2, exp_ener ), 15 ) ) ); /*Q11*/
-#else
-                st_fx->tilt_wb_fx = extract_h( L_shr( Mult_32_16( st_fx->enerLH_fx, inv_ener ), sub( sub( st_fx->Q_syn2, exp_ener ), 15 ) ) ); /*Q11*/
-#endif
                 move16();
                 /*st_fx->Q_syn2 -1 + 26- exp_ener -15 -(st_fx->Q_syn2 -exp_ener -15 ) -16 = (11) 0.25*/
             }
-            L_tmp = L_mult0( st_fx->prev_ener_shb_fx, inv_ener ); /*Q(1+15+14-3-exp_ener) = 27 -exp_ener*/
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult0( st_fx->prev_ener_shb_fx, inv_ener );          /*Q(1+15+14-3-exp_ener) = 27 -exp_ener*/
             GainFrame_prevfrm_fx = L_shr_sat( L_tmp, sub( 9, exp_ener ) ); /*27 -exp_ener -(9-exp_ener )= Q18*/
-#else
-            GainFrame_prevfrm_fx = L_shr( L_tmp, sub( 9, exp_ener ) );                                                                         /*27 -exp_ener -(9-exp_ener )= Q18*/
-#endif
         }
         ELSE
         {
@@ -3055,13 +2889,9 @@ void swb_tbe_dec_fx(
         {
             ener = s_max( 1, ener );
             exp_ener = norm_s( ener );
-            tmp = shl( ener, exp_ener );    /*Q(3+exp)*/
-            inv_ener = div_s( 16384, tmp ); /*Q(15+14-3-exp)*/
-#ifdef BASOP_NOGLOB
+            tmp = shl( ener, exp_ener );                                                                        /*Q(3+exp)*/
+            inv_ener = div_s( 16384, tmp );                                                                     /*Q(15+14-3-exp)*/
             prev_ener_ratio_fx = L_shr_sat( L_mult0( st_fx->prev_ener_shb_fx, inv_ener ), sub( 9, exp_ener ) ); /*Q: 1+26-exp-9+exp = 18 */
-#else
-            prev_ener_ratio_fx = L_shr( L_mult0( st_fx->prev_ener_shb_fx, inv_ener ), sub( 9, exp_ener ) );                                    /*Q: 1+26-exp-9+exp = 18 */
-#endif
         }
 
         IF( EQ_16( st_fx->nbLostCmpt, 1 ) )
@@ -3192,12 +3022,8 @@ void swb_tbe_dec_fx(
             /* if( ener_tmp_fx[i]*GainShape_tmp_fx[i] > st_fx->prev_ener_fx*st_fx->prev_GainShape_fx ) */
             L_tmp1 = Mult_32_16( ener_tmp[i], GainShape_tmp[i] );                     /* (2*Q_bwe_exc) */
             L_tmp2 = Mult_32_16( hBWE_TD->prev_ener_fx, hBWE_TD->prev_GainShape_fx ); /* (2*st_fx->prev_ener_fx_Q) */
-            tmp = sub( shl( Q_bwe_exc, 1 ), shl( st_fx->prev_ener_fx_Q, 1 ) );
-#ifdef BASOP_NOGLOB
+            tmp = sub( shl( Q_bwe_exc, 1 ), shl( hBWE_TD->prev_ener_fx_Q, 1 ) );
             L_tmp2 = L_shl_sat( L_tmp2, tmp ); /* new Q = (2*Q_bwe_exc) */
-#else
-            L_tmp2 = L_shl( L_tmp2, tmp );                                                                                                     /* new Q = (2*Q_bwe_exc) */
-#endif
             IF( GT_32( L_tmp1, L_tmp2 ) )
             {
                 /*GainShape_tmp_fx[i] = 0.5f*(L_tmp2/ener_tmp_fx[i] + GainShape_tmp_fx[i]);*/
@@ -3210,11 +3036,7 @@ void swb_tbe_dec_fx(
                 }
 
                 expb = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
                 fracb = round_fx_sat( L_shl_sat( L_tmp, expb ) );
-#else
-                fracb = round_fx( L_shl( L_tmp, expb ) );
-#endif
                 expb = sub( 30, expb ); /* - (2*Q_bwe_exc_ext);                    */
 
                 expa = norm_l( ener_tmp[i] );
@@ -3236,7 +3058,7 @@ void swb_tbe_dec_fx(
             move32();
             hBWE_TD->prev_GainShape_fx = GainShape_tmp[i];
             move16();
-            st_fx->prev_ener_fx_Q = Q_bwe_exc;
+            hBWE_TD->prev_ener_fx_Q = Q_bwe_exc;
             move16();
         }
         FOR( i = 0; i < NUM_SHB_SUBFR; i++ )
@@ -3253,13 +3075,13 @@ void swb_tbe_dec_fx(
     }
     ELSE
     {
-        st_fx->prev_ener_fx_Q = Q_bwe_exc;
+        hBWE_TD->prev_ener_fx_Q = Q_bwe_exc;
         move16();
     }
 
 
     /* Back up the Q_bwe_exc associated with shaped_shb_excitation for the next frame*/
-    st_fx->prev_Q_bwe_syn = Q_bwe_exc;
+    hBWE_TD->prev_Q_bwe_syn = Q_bwe_exc;
     move16();
 
     /* Scale the shaped excitation */
@@ -3270,13 +3092,7 @@ void swb_tbe_dec_fx(
                        GainFrame, /* Q18  */
                        window_shb_fx,
                        subwin_shb_fx,
-                       &Q_bwe_exc, &Qx, n_mem3, st_fx->prev_Q_bwe_syn2 );
-    /* i: GainShape Q15                         */
-    /* i: GainFrame Q18                         */
-    /* i: shaped_shb_excitation Q_bwe_exc       */
-    /* o: shaped_shb_excitation Q_bwe_exc       */
-    /* o: st_fx->syn_overlap_fx Q_bwe_exc       */
-
+                       &Q_bwe_exc, &Qx, n_mem3, hBWE_TD->prev_Q_bwe_syn2 );
 
     max = 0;
     move16();
@@ -3299,13 +3115,8 @@ void swb_tbe_dec_fx(
         move16();
         FOR( i = 0; i < L_FRAME16k; i++ )
         {
-#ifdef BASOP_NOGLOB
             shaped_shb_excitation_frac[i] = shl_sat( shaped_shb_excitation[i], n ); /*Q_bwe_exc+n*/
             move16();
-#else
-            shaped_shb_excitation_frac[i] = shl( shaped_shb_excitation[i], n ); /*Q_bwe_exc+n*/
-            move16();
-#endif
         }
 
         curr_frame_pow = 0;
@@ -3319,31 +3130,31 @@ void swb_tbe_dec_fx(
     curr_frame_pow_exp = sub( shl( add( Q_bwe_exc, n ), 1 ), 9 );
 
 
-    tmp = sub( st_fx->prev_frame_pow_exp, curr_frame_pow_exp );
+    tmp = sub( hBWE_TD->prev_frame_pow_exp, curr_frame_pow_exp );
     IF( tmp > 0 ) /* shifting prev */
     {
         IF( GT_16( tmp, 32 ) )
         {
-            st_fx->prev_frame_pow_exp = add( curr_frame_pow_exp, 32 );
+            hBWE_TD->prev_frame_pow_exp = add( curr_frame_pow_exp, 32 );
             move16();
             tmp = 32;
             move16();
         }
         hBWE_TD->prev_swb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, tmp );
         move32();
-        st_fx->prev_frame_pow_exp = curr_frame_pow_exp;
+        hBWE_TD->prev_frame_pow_exp = curr_frame_pow_exp;
         move16();
     }
     ELSE /* shifting curr */
     {
         IF( LT_16( tmp, -32 ) )
         {
-            curr_frame_pow_exp = sub( st_fx->prev_frame_pow_exp, 32 );
+            curr_frame_pow_exp = sub( hBWE_TD->prev_frame_pow_exp, 32 );
             tmp = -32;
             move16();
         }
         curr_frame_pow = L_shr( curr_frame_pow, -tmp );
-        curr_frame_pow_exp = st_fx->prev_frame_pow_exp;
+        curr_frame_pow_exp = hBWE_TD->prev_frame_pow_exp;
         move16();
     }
     test();
@@ -3436,11 +3247,7 @@ void swb_tbe_dec_fx(
                      ( EQ_16( st_fx->prev_coder_type, UNVOICED ) || ( st_fx->last_good == UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 10240 ) ) )
             {
                 L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow, curr_frame_pow_exp, &exp );
-#ifdef BASOP_NOGLOB
                 scale = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-#else
-                scale = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-#endif
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
@@ -3461,23 +3268,15 @@ void swb_tbe_dec_fx(
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
-#ifdef BASOP_NOGLOB
                 temp = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
-#else
-                temp = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) );  /*Q12*/
-#endif
             }
             ELSE IF( LT_32( curr_frame_pow, L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, 1 ) ) &&
                      ( GT_32( st_fx->enerLL_fx, L_shr( st_fx->prev_enerLL_fx, 1 ) ) || GT_32( st_fx->enerLH_fx, L_shr( st_fx->prev_enerLH_fx, 1 ) ) ) &&
                      ( EQ_16( st_fx->prev_coder_type, UNVOICED ) || ( st_fx->last_good == UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 10240 ) ) )
             {
                 L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow, curr_frame_pow_exp, &exp );
-#ifdef BASOP_NOGLOB
                 L_tmp = L_min( L_tmp, L_shl_sat( 2, sub( 31, exp ) ) ); /*31 - exp*/
-#else
-                L_tmp = L_min( L_tmp, L_shl( 2, ( 31 - exp ) ) );  /*31 - exp*/
-#endif
-                scale = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+                scale = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) );      /*Q12*/
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
                 L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
@@ -3486,25 +3285,13 @@ void swb_tbe_dec_fx(
         }
         FOR( j = 0; j < 8; j++ )
         {
-#ifdef BASOP_NOGLOB
             GainShape[2 * j] = shl_sat( mult_r( GainShape[2 * j], scale ), 3 );
-#else
-            GainShape[2 * j] = shl( mult_r( GainShape[2 * j], scale ), 3 );
-#endif
             move16(); /* 15 +12 +3-15 =15*/
-#ifdef BASOP_NOGLOB
             GainShape[add( 2 * j, 1 )] = shl_sat( mult_r( GainShape[add( 2 * j, 1 )], scale ), 3 );
-#else
-            GainShape[2 * j + 1] = shl( mult_r( GainShape[2 * j + 1], scale ), 3 );
-#endif
             move16();
             FOR( i = 0; i < 40; i++ )
             {
-#ifdef BASOP_NOGLOB
                 shaped_shb_excitation[add( i, j * 40 )] = shl_sat( mult_r( shaped_shb_excitation[add( i, j * 40 )], scale ), 3 );
-#else
-                shaped_shb_excitation[add( i, i_mult( j, 40 ) )] = shl( mult_r( shaped_shb_excitation[add( i, i_mult( j, 40 ) )], scale ), 3 );
-#endif
                 move16(); /* Q_bwe_exc +12+3 -15  =Q_bwe_exc*/
             }
 
@@ -3532,10 +3319,9 @@ void swb_tbe_dec_fx(
 
     hBWE_TD->prev_swb_bwe_frame_pow_fx = curr_frame_pow;
     move32();
-    st_fx->prev_frame_pow_exp = curr_frame_pow_exp;
+    hBWE_TD->prev_frame_pow_exp = curr_frame_pow_exp;
     move16();
 
-
     {
         Word64 prev_ener_shb64 = 0;
         move64();
@@ -3546,7 +3332,6 @@ void swb_tbe_dec_fx(
         L_prev_ener_shb = W_sat_l( prev_ener_shb64 );
     }
 
-
     /* st->prev_ener_shb = sqrt(st->prev_ener_shb/L_FRAME16k) */
     L_prev_ener_shb = Mult_32_16( L_prev_ener_shb, 26214 ); /* 2*Q_bwe_exc_mod+8; 26214=(1/L_FRAME16k) in Q23 */
     st_fx->prev_ener_shb_fx = 0;
@@ -3561,11 +3346,7 @@ void swb_tbe_dec_fx(
         tmp = div_s( 16384, tmp );
         L_tmp = L_deposit_h( tmp );
         L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB
         st_fx->prev_ener_shb_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
-#else
-        st_fx->prev_ener_shb_fx = round_fx( L_shl( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
-#endif
         move16();
     }
     /* st->prev_SWB_fenv[i] = sqrt(curr_frame_pow/L_FRAME16k); */
@@ -3581,17 +3362,12 @@ void swb_tbe_dec_fx(
         tmp = div_s( 16384, tmp );
         L_tmp = L_deposit_h( tmp );
         L_tmp = Isqrt_lc( L_tmp, &exp );
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
-#else
-        tmp = round_fx( L_shl( L_tmp, sub( exp, 14 ) ) );                     /* Q1 */
-#endif
     }
-    set16_fx( st_fx->prev_SWB_fenv_fx, tmp, SWB_FENV ); /* Q1 */
-
+    set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, tmp, SWB_FENV ); /* Q1 */
 
     /* rescale the memories if Q_bwe_exc is different from previous frame */
-    sc = sub( Q_bwe_exc, st_fx->prev_Q_bwe_syn2 );
+    sc = sub( Q_bwe_exc, hBWE_TD->prev_Q_bwe_syn2 );
     IF( sc != 0 )
     {
         FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
@@ -3754,10 +3530,11 @@ void swb_tbe_dec_fx(
     move32();
     *Q_synth = Q_bwe_exc;
     move16();
-    st_fx->prev_Q_bwe_syn2 = Q_bwe_exc;
+    hBWE_TD->prev_Q_bwe_syn2 = Q_bwe_exc;
     move16();
-    st_fx->prev_Qx = Q_bwe_exc;
+    hBWE_TD->prev_Qx = Q_bwe_exc;
     move16();
+
     return;
 }
 
@@ -3777,9 +3554,9 @@ static void gradientGainShape(
     /* the previous frame gainshape gradient and the gainshape gradient pattern for the current frame */
     FOR( j = 0; j < 3; j++ )
     {
-        GainGrad0[j] = sub( shr( st_fx->GainShape_Delay[j + 1], 1 ), shr( st_fx->GainShape_Delay[j], 1 ) );
+        GainGrad0[j] = sub( shr( hBWE_TD->GainShape_Delay_fx[j + 1], 1 ), shr( hBWE_TD->GainShape_Delay_fx[j], 1 ) );
         move16(); /* Q14 */
-        GainGrad1[j] = sub( shr( st_fx->GainShape_Delay[j + 5], 1 ), shr( st_fx->GainShape_Delay[j + 4], 1 ) );
+        GainGrad1[j] = sub( shr( hBWE_TD->GainShape_Delay_fx[j + 5], 1 ), shr( hBWE_TD->GainShape_Delay_fx[j + 4], 1 ) );
         move16(); /* Q14 */
         GainGradFEC[j + 1] = add( mult_r( GainGrad0[j], 13107 ), mult_r( GainGrad1[j], 19660 ) );
         move16(); /* Q14 */
@@ -3808,17 +3585,17 @@ static void gradientGainShape(
     test();
     IF( ( EQ_16( st_fx->prev_coder_type, UNVOICED ) || ( st_fx->last_good == UNVOICED_CLAS ) ) && ( GainGradFEC[0] > 0 ) )
     {
-        GainShapeTemp[0] = add( shr( st_fx->GainShape_Delay[7], 1 ), GainGradFEC[0] );
+        GainShapeTemp[0] = add( shr( hBWE_TD->GainShape_Delay_fx[7], 1 ), GainGradFEC[0] );
         move16();
     }
     ELSE IF( GainGradFEC[0] > 0 )
     {
-        GainShapeTemp[0] = add( shr( st_fx->GainShape_Delay[7], 1 ), mult_r( GainGradFEC[0], 16384 ) );
+        GainShapeTemp[0] = add( shr( hBWE_TD->GainShape_Delay_fx[7], 1 ), mult_r( GainGradFEC[0], 16384 ) );
         move16(); /* Q14 */
     }
     ELSE
     {
-        GainShapeTemp[0] = shr( st_fx->GainShape_Delay[7], 1 );
+        GainShapeTemp[0] = shr( hBWE_TD->GainShape_Delay_fx[7], 1 );
         move16(); /* Q14 */
     }
 
@@ -3877,12 +3654,12 @@ static void gradientGainShape(
 
                 IF( GT_16( 8192, tmp ) )
                 {
-                    GainShape[add( i * 4, j )] = shl( tmp, 2 );
+                    GainShape[i * 4 + j] = shl( tmp, 2 );
                     move16(); /* (GainShapeTemp[i]*0.6)>>1 */
                 }
                 ELSE
                 {
-                    GainShape[add( i * 4, j )] = 32767;
+                    GainShape[i * 4 + j] = 32767;
                     move16(); /* Clipping here to avoid the a huge change of the code due to gain shape change */
                 }
             }
@@ -3898,12 +3675,12 @@ static void gradientGainShape(
             {
                 IF( LT_16( GainShapeTemp[i], 16384 ) )
                 {
-                    GainShape[add( i * 4, j )] = shl( GainShapeTemp[i], 1 );
+                    GainShape[i * 4 + j] = shl( GainShapeTemp[i], 1 );
                     move16();
                 }
                 ELSE
                 {
-                    GainShape[add( i * 4, j )] = 32767;
+                    GainShape[i * 4 + j] = 32767;
                     move16();
                 }
             }
@@ -3932,12 +3709,12 @@ static void gradientGainShape(
             {
                 IF( LT_16( GainShapeTemp[i], 16384 ) )
                 {
-                    GainShape[add( i * 4, j )] = shl( GainShapeTemp[i], 1 );
+                    GainShape[i * 4 + j] = shl( GainShapeTemp[i], 1 );
                     move16();
                 }
                 ELSE
                 {
-                    GainShape[add( i * 4, j )] = 32767;
+                    GainShape[i * 4 + j] = 32767;
                     move16();
                 }
             }
@@ -4051,7 +3828,9 @@ static void Dequant_mirror_point_fx(
 
     return;
 }
-Word16 dotp_loc(
+
+
+static Word16 dotp_loc(
     const Word16 x[], /* i  : vector x[]                   Qx */
     const Word32 y[], /* i  : vector y[]                   Qy */
     const Word16 n    /* i  : vector length                 */
@@ -4859,11 +4638,7 @@ void fb_tbe_dec_fx(
         {
             i = (Word16) get_next_indice_fx( st, 4 );
         }
-#ifdef BASOP_NOGLOB
         ratio = shl_sat( 1, i );
-#else
-        ratio = shl( 1, i );
-#endif
     }
     ELSE IF( EQ_16( st->extl, FB_TBE ) && st->bfi )
     {
@@ -4873,17 +4648,18 @@ void fb_tbe_dec_fx(
     fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k );
 
     /* FB TBE synthesis */
-    synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp );
+    synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+                                ,
+                                st->element_mode
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+    );
 
     /* add the fb_synth component to the hb_synth component */
     /*  v_add_fx( hb_synth, fb_synth, hb_synth, L_FRAME48k );*/
     FOR( i = 0; i < L_FRAME48k; i++ )
     {
-#ifdef BASOP_NOGLOB
         hb_synth[i] = add_sat( hb_synth[i], fb_synth[i] );
-#else
-        hb_synth[i] = add( hb_synth[i], fb_synth[i] );
-#endif
         move16();
     }
     return;
@@ -4925,11 +4701,7 @@ void fb_tbe_dec_ivas_fx(
             {
                 i = (Word16) get_next_indice_fx( st, 4 );
             }
-#ifdef BASOP_NOGLOB
             ratio = shl_sat( 1, i );
-#else
-            ratio = shl( 1, i );
-#endif
         }
         ELSE IF( EQ_16( st->extl, FB_TBE ) && st->bfi )
         {
@@ -4950,7 +4722,12 @@ void fb_tbe_dec_ivas_fx(
     fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k );
 
     /* FB TBE synthesis */
-    synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp );
+    synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+                                ,
+                                st->element_mode
+#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+    );
 
     test();
     IF( GE_16( st->element_mode, IVAS_CPE_DFT ) && ( st->idchan == 0 ) )
@@ -5082,35 +4859,33 @@ void tbe_read_bitstream_fx(
  * buffer to fill the gap caused by the delay alignment buffer when
  * switching from TBE to IGF
  *---------------------------------------------------------------------*/
+
 void GenTransition_fx(
-    const Word16 *input,                /* i  : gain shape overlap buffer              Q11                    */
-    const Word16 *old_hb_synth,         /* i  : synthesized HB from previous frame     Q(15 - hb_synth_fx_exp)*/
-    Word16 length,                      /* i  : targeted length of transition signal                          */
-    Word16 *output,                     /* o  : synthesized transitions signal         st_fx->prev_Q_bwe_syn2 */
-    Word32 Hilbert_Mem[],               /* i/o: memory                                 st_fx->prev_Q_bwe_syn2 */
-    Word16 state_lsyn_filt_shb_local[], /* i/o: memory                                 st_fx->prev_Q_bwe_syn2*/
-    Word16 mem_resamp_HB_32k[],         /* i/o: memory                                 */
-    Word16 *syn_dm_phase,
-    Word32 target_fs,
-    Word16 *up_mem,
-    Word16 rf_flag,
-    Word32 bitrate )
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                                        */
+    Word16 *output_HB,         /* o  : synthesized HB transitions signal  st_fx->prev_Q_bwe_syn2 */
+    const Word32 output_Fs,    /* i  : output sampling rate                                      */
+    Word16 rf_flag,            /* i  : RF flag                                                   */
+    Word32 total_bitrate       /* i  : total bitrate                                             */
+)
 {
-    Word16 i;
+    Word16 i, length;
     Word16 syn_overlap_32k[L_FRAME32k];
     Word32 L_tmp;
     Word16 ol_len = 2 * SHB_OVERLAP_LEN;
 
+    /* set targeted length of transition signal */
+    length = shl( NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS ), 1 );
+
     /* upsample overlap snippet */
-    Interpolate_allpass_steep_fx( input, state_lsyn_filt_shb_local, SHB_OVERLAP_LEN, syn_overlap_32k );
+    Interpolate_allpass_steep_fx( hBWE_TD->syn_overlap_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, SHB_OVERLAP_LEN, syn_overlap_32k );
 
     /* perform spectral flip and downmix with overlap snippet to match HB synth  */
     test();
-    IF( ( rf_flag != 0 ) || EQ_32( bitrate, ACELP_9k60 ) )
+    IF( ( rf_flag != 0 ) || EQ_32( total_bitrate, ACELP_9k60 ) )
     {
-        flip_and_downmix_generic_fx( syn_overlap_32k, syn_overlap_32k, 2 * SHB_OVERLAP_LEN, Hilbert_Mem,
-                                     Hilbert_Mem + HILBERT_ORDER1, Hilbert_Mem + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ),
-                                     syn_dm_phase );
+        flip_and_downmix_generic_fx( syn_overlap_32k, syn_overlap_32k, 2 * SHB_OVERLAP_LEN, hBWE_TD->genSHBsynth_Hilbert_Mem_fx,
+                                     hBWE_TD->genSHBsynth_Hilbert_Mem_fx + HILBERT_ORDER1, hBWE_TD->genSHBsynth_Hilbert_Mem_fx + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ),
+                                     &( hBWE_TD->syn_dm_phase ) );
     }
     ELSE
     {
@@ -5126,71 +4901,134 @@ void GenTransition_fx(
     /* cross fade of overlap snippet and mirrored HB synth from previous frame */
     FOR( i = 0; i < ol_len; i++ )
     {
-        L_tmp = L_mult( window_shb_32k_fx[i], old_hb_synth[L_SHB_TRANSITION_LENGTH - 1 - i] );
-        output[i] = mac_r( L_tmp, window_shb_32k_fx[2 * L_SHB_LAHEAD - 1 - i], syn_overlap_32k[i] );
+        L_tmp = L_mult( window_shb_32k_fx[i], hBWE_TD->old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH - 1 - i] );
+        output_HB[i] = mac_r( L_tmp, window_shb_32k_fx[2 * L_SHB_LAHEAD - 1 - i], syn_overlap_32k[i] );
         move16();
     }
 
     /* fill transition signal with mirrored HB synth from previous frame to fully fill delay alignment buffer gap */
     FOR( ; i < length; i++ )
     {
-        output[i] = old_hb_synth[L_SHB_TRANSITION_LENGTH - 1 - i];
+        output_HB[i] = hBWE_TD->old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH - 1 - i];
         move16();
     }
 
-    IF( EQ_32( target_fs, 48000 ) )
+    IF( EQ_32( output_Fs, 48000 ) )
     {
-        interpolate_3_over_2_allpass_fx( output, length, output, up_mem, allpass_poles_3_ov_2 );
+        interpolate_3_over_2_allpass_fx( output_HB, length, output_HB, hBWE_TD->int_3_over_2_tbemem_dec_fx, allpass_poles_3_ov_2 );
     }
-    ELSE IF( EQ_32( target_fs, 16000 ) )
+    ELSE IF( EQ_32( output_Fs, 16000 ) )
     {
-        Decimate_allpass_steep_fx( output, mem_resamp_HB_32k, L_FRAME32k, output );
+        Decimate_allpass_steep_fx( output_HB, hBWE_TD->mem_resamp_HB_32k_fx, L_FRAME32k, output_HB );
     }
 
     return;
 }
 
+/* IVAS 32-bit variant */
+void GenTransition_fx32(
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                      */
+    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal : Q11 */
+    const Word32 output_Fs,    /* i  : output sampling rate              : Q0  */
+    const Word16 L_frame,      /* i  : ACELP frame length                : Q0  */
+    const Word16 prev_Qx )
+{
+    Word16 i, length;
 
-/*---------------------------------------------------------------------*
- * GenTransition_WB_fx()
- *
- *---------------------------------------------------------------------*/
+    Word32 syn_overlap_32k_fx[2 * SHB_OVERLAP_LEN];
 
-void GenTransition_WB_fx(
-    const Word16 *input,        /* i  : gain shape overlap buffer            */
-    const Word16 *old_hb_synth, /* i  : synthesized HB from previous frame   */
-    const Word16 prev_Qx,       /* i  : scaling of old_hb_synth              */
-    Word16 length,              /* i  : targeted length of transition signal */
-    Word16 *output,             /* o  : synthesized transitions signal       */
-    Word16 state_lsyn_filt_shb1[],
-    Word16 state_lsyn_filt_shb2[],
-    Word32 output_Fs,
-    Word16 *up_mem )
-{
-    Word16 i;
-    Word32 L_tmp;
-    Word16 speech_buf_16k1[L_FRAME16k], speech_buf_16k2[L_FRAME16k];
-    Word16 upsampled_synth[L_FRAME48k];
-    Word16 input_scaled[SHB_OVERLAP_LEN / 2];
+    /* set targeted length of transition signal */
+    length = i_mult( 2, NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS ) );
 
     /* upsample overlap snippet */
-    Copy_Scale_sig( input, input_scaled, SHB_OVERLAP_LEN / 2, prev_Qx );
-    Interpolate_allpass_steep_fx( input_scaled, state_lsyn_filt_shb1, SHB_OVERLAP_LEN / 2, speech_buf_16k1 );
-    Interpolate_allpass_steep_fx( speech_buf_16k1, state_lsyn_filt_shb2, SHB_OVERLAP_LEN, speech_buf_16k2 );
-
+    Interpolate_allpass_steep_fx32( hBWE_TD->syn_overlap_fx_32, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, SHB_OVERLAP_LEN, syn_overlap_32k_fx );
 
     /* perform spectral flip and downmix with overlap snippet to match HB synth  */
-    FOR( i = 0; i < SHB_OVERLAP_LEN; i += 2 )
+    test();
+    IF( EQ_16( L_frame, L_FRAME ) )
     {
-        speech_buf_16k2[i] = negate( speech_buf_16k2[i] );
-        speech_buf_16k2[i + 1] = speech_buf_16k2[i + 1];
+        flip_and_downmix_generic_fx32( syn_overlap_32k_fx, syn_overlap_32k_fx, 2 * SHB_OVERLAP_LEN, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx + HILBERT_ORDER1, hBWE_TD->genSHBsynth_Hilbert_Mem_fx + ( HILBERT_ORDER1 + 2 * HILBERT_ORDER2 ), &( hBWE_TD->syn_dm_phase ) );
     }
-
-    /* cross fade of overlap snippet and mirrored HB synth from previous frame */
-    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+    ELSE
     {
-        L_tmp = L_mult( window_shb_fx[i], old_hb_synth[L_SHB_TRANSITION_LENGTH - 1 - i] );
-        output[i] = mac_r( L_tmp, window_shb_fx[L_SHB_LAHEAD - 1 - i], speech_buf_16k2[i] );
+        FOR( i = 0; i < 2 * SHB_OVERLAP_LEN; i++ )
+        {
+            IF( i % 2 == 0 )
+            {
+                syn_overlap_32k_fx[i] = L_negate( syn_overlap_32k_fx[i] );
+            }
+            ELSE
+            {
+                syn_overlap_32k_fx[i] = syn_overlap_32k_fx[i];
+            }
+            move32();
+        }
+    }
+
+    /* cross fade of overlap snippet and mirrored HB synth from previous frame */
+    FOR( i = 0; i < 2 * L_SHB_LAHEAD; i++ )
+    {
+        outputHB_fx[i] = L_add_sat( Mpy_32_16_1( hBWE_TD->old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH - 1 - i], window_shb_32k_fx[i] ), Mpy_32_16_1( syn_overlap_32k_fx[i], window_shb_32k_fx[2 * L_SHB_LAHEAD - 1 - i] ) );
+        move32();
+    }
+
+    /* fill transition signal with mirrored HB synth from previous frame to fully fill delay alignment buffer gap */
+    FOR( ; i < length; i++ )
+    {
+        outputHB_fx[i] = L_shl( hBWE_TD->old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH - 1 - i], sub( Q11, prev_Qx ) );
+        move32();
+    }
+
+    IF( EQ_32( output_Fs, 48000 ) )
+    {
+        interpolate_3_over_2_allpass_fx32( outputHB_fx, length, outputHB_fx, hBWE_TD->int_3_over_2_tbemem_dec_fx_32 );
+    }
+    ELSE IF( EQ_32( output_Fs, 16000 ) )
+    {
+        Decimate_allpass_steep_fx32( outputHB_fx, hBWE_TD->mem_resamp_HB_32k_fx_32, L_FRAME32k, outputHB_fx );
+    }
+
+    return;
+}
+
+
+/*---------------------------------------------------------------------*
+ * GenTransition_WB()
+ *
+ *---------------------------------------------------------------------*/
+
+void GenTransition_WB_fx(
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                   */
+    Word16 *output,            /* o  : synthesized transitions signal       */
+    const Word32 output_Fs     /* i  : output sampling rate                 */
+)
+{
+    Word16 i, length;
+    Word32 L_tmp;
+    Word16 speech_buf_16k1[L_FRAME16k], speech_buf_16k2[L_FRAME16k];
+    Word16 upsampled_synth[L_FRAME48k];
+    Word16 input_scaled[SHB_OVERLAP_LEN / 2];
+
+    /* set targeted length of transition signal */
+    length = shl( NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS ), 1 );
+
+    /* upsample overlap snippet */
+    Copy_Scale_sig( hBWE_TD->syn_overlap_fx, input_scaled, SHB_OVERLAP_LEN / 2, hBWE_TD->prev_Qx );
+    Interpolate_allpass_steep_fx( input_scaled, hBWE_TD->state_lsyn_filt_shb_fx, SHB_OVERLAP_LEN / 2, speech_buf_16k1 );
+    Interpolate_allpass_steep_fx( speech_buf_16k1, hBWE_TD->state_lsyn_filt_dwn_shb_fx, SHB_OVERLAP_LEN, speech_buf_16k2 );
+
+    /* perform spectral flip and downmix with overlap snippet to match HB synth  */
+    FOR( i = 0; i < SHB_OVERLAP_LEN; i += 2 )
+    {
+        speech_buf_16k2[i] = negate( speech_buf_16k2[i] );
+        speech_buf_16k2[i + 1] = speech_buf_16k2[i + 1];
+    }
+
+    /* cross fade of overlap snippet and mirrored HB synth from previous frame */
+    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+    {
+        L_tmp = L_mult( window_shb_fx[i], hBWE_TD->old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH - 1 - i] );
+        output[i] = mac_r( L_tmp, window_shb_fx[L_SHB_LAHEAD - 1 - i], speech_buf_16k2[i] );
         move16();
         output[i] = mult_r( output[i], 21299 );
         move16();
@@ -5199,105 +5037,116 @@ void GenTransition_WB_fx(
     /* fill transition signal with mirrored HB synth from previous frame to fully fill delay alignment buffer gap */
     FOR( ; i < length; i++ )
     {
-        output[i] = mult_r( old_hb_synth[L_SHB_TRANSITION_LENGTH - 1 - i], 21299 );
+        output[i] = mult_r( hBWE_TD->old_tbe_synth_fx[L_SHB_TRANSITION_LENGTH - 1 - i], 21299 );
         move16();
     }
 
     /* upsampling if necessary */
     IF( EQ_32( output_Fs, 32000 ) )
     {
-        Interpolate_allpass_steep_fx( output, up_mem, L_FRAME16k, upsampled_synth );
+        Interpolate_allpass_steep_fx( output, hBWE_TD->mem_resamp_HB_fx, L_FRAME16k, upsampled_synth );
         Copy( upsampled_synth, output, L_FRAME32k );
     }
     ELSE IF( EQ_32( output_Fs, 48000 ) )
     {
-        interpolate_3_over_1_allpass_fx( output, L_FRAME16k, upsampled_synth, up_mem );
+        interpolate_3_over_1_allpass_fx( output, L_FRAME16k, upsampled_synth, hBWE_TD->mem_resamp_HB_fx );
         Copy( upsampled_synth, output, L_FRAME48k );
     }
 
     return;
 }
 
-/*---------------------------------------------------------------------*
- * TBEreset_dec_fx()
- *
- *---------------------------------------------------------------------*/
 
-void TBEreset_dec_fx(
-    Decoder_State *st_fx, /* i/o: decoder state structure                 */
-    Word16 bandwidth      /* i  : bandwidth mode                          */
+/* IVAS 32-bit variant */
+void GenTransition_WB_fx32(
+    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle                       */
+    Word32 *outputHB_fx,       /* o  : synthesized HB transitions signal  : Q11 */
+    const Word32 output_Fs     /* i  : output sampling rate                     */
 )
 {
-    TD_BWE_DEC_HANDLE hBWE_TD;
-    hBWE_TD = st_fx->hBWE_TD;
+    Word16 i, length;
+    Word32 speech_buf_16k1_fx[SHB_OVERLAP_LEN], speech_buf_16k2_fx[2 * SHB_OVERLAP_LEN];
+    Word32 upsampled_synth_fx[L_FRAME48k];
 
-    IF( NE_16( st_fx->last_core, ACELP_CORE ) )
+    /* set targeted length of transition signal */
+    length = i_mult( 2, NS2SA_FX2( output_Fs, DELAY_BWE_TOTAL_NS ) );
+
+    /* upsample overlap snippet */
+    Interpolate_allpass_steep_fx32( hBWE_TD->syn_overlap_fx_32, hBWE_TD->state_lsyn_filt_shb_fx_32, SHB_OVERLAP_LEN / 2, speech_buf_16k1_fx );
+    Interpolate_allpass_steep_fx32( speech_buf_16k1_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx_32, SHB_OVERLAP_LEN, speech_buf_16k2_fx );
+
+    /* perform spectral flip and downmix with overlap snippet to match HB synth  */
+    FOR( i = 0; i < SHB_OVERLAP_LEN; i++ )
     {
-        set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-        hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
+        IF( i % 2 == 0 )
+        {
+            speech_buf_16k2_fx[i] = L_negate( speech_buf_16k2_fx[i] );
+            move32();
+        }
+        ELSE
+        {
+            speech_buf_16k2_fx[i] = speech_buf_16k2_fx[i];
+            move32();
+        }
+    }
+
+    /* cross fade of overlap snippet and mirrored HB synth from previous frame */
+    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+    {
+        outputHB_fx[i] = L_add( Mpy_32_16_1( hBWE_TD->old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH - 1 - i], window_shb_fx[i] ), Mpy_32_16_1( speech_buf_16k2_fx[i], window_shb_fx[L_SHB_LAHEAD - 1 - i] ) );
+        move32();
+        outputHB_fx[i] = Mpy_32_16_1( outputHB_fx[i], 21299 );
         move32();
-        st_fx->prev_Q_bwe_exc = 31;
-        move16();
     }
 
-    test();
-    IF( EQ_16( bandwidth, WB ) )
+    /* fill transition signal with mirrored HB synth from previous frame to fully fill delay alignment buffer gap */
+    FOR( ; i < length; i++ )
     {
-        wb_tbe_extras_reset_fx( hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );
-        wb_tbe_extras_reset_synth_fx( hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx, hBWE_TD->state_32and48k_WB_upsample_fx, hBWE_TD->mem_resamp_HB_fx );
+        outputHB_fx[i] = hBWE_TD->old_tbe_synth_fx_32[L_SHB_TRANSITION_LENGTH - 1 - i];
+        move32();
+        outputHB_fx[i] = Mpy_32_16_1( outputHB_fx[i], 21299 );
+        move32();
+    }
 
-        set16_fx( hBWE_TD->mem_genSHBexc_filt_down_shb_fx, 0, 7 );
-        set16_fx( hBWE_TD->state_lpc_syn_fx, 0, 10 );
-        set16_fx( hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD / 4 );
-        set16_fx( hBWE_TD->syn_overlap_fx, 0, L_SHB_LAHEAD );
-        set32_fx( hBWE_TD->mem_csfilt_fx, 0, 2 );
+    /* upsampling if necessary */
+    IF( EQ_32( output_Fs, 32000 ) )
+    {
+        Interpolate_allpass_steep_fx32( outputHB_fx, hBWE_TD->mem_resamp_HB_fx_32, L_FRAME16k, upsampled_synth_fx );
+        Copy32( upsampled_synth_fx, outputHB_fx, L_FRAME32k );
     }
-    ELSE IF( EQ_16( bandwidth, SWB ) || EQ_16( bandwidth, FB ) )
+    ELSE IF( EQ_32( output_Fs, 48000 ) )
     {
-        swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
-                          hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ),
-                          &( hBWE_TD->tbe_premph_fx ), hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
-
-        swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx );
-
-        set16_fx( st_fx->GainShape_Delay, 0, NUM_SHB_SUBFR / 2 );
-        set16_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx, 0, INTERP_3_2_MEM_LEN );
-        set32_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx_32, 0, INTERP_3_2_MEM_LEN );
-        set16_fx( hBWE_TD->mem_resamp_HB_32k_fx, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
-        set32_fx( hBWE_TD->mem_resamp_HB_32k_fx_32, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
-
-        IF( EQ_16( bandwidth, FB ) )
-        {
-            st_fx->prev_fb_ener_adjust_fx = 0;
-            move16();
-            set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
-            hBWE_TD->fb_tbe_demph_fx = 0;
-            move16();
-            fb_tbe_reset_synth_fx( hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, &hBWE_TD->prev_fbbwe_ratio_fx );
-        }
+        interpolate_3_over_1_allpass_fx32( outputHB_fx, L_FRAME16k, upsampled_synth_fx, hBWE_TD->mem_resamp_HB_fx_32 );
+        Copy32( upsampled_synth_fx, outputHB_fx, L_FRAME48k );
     }
 
     return;
 }
 
-void TBEreset_dec_ivas_fx(
-    Decoder_State *st /* i/o: decoder state structure     */
+
+/*---------------------------------------------------------------------*
+ * TBEreset_dec()
+ *
+ *---------------------------------------------------------------------*/
+
+void TBEreset_dec_fx(
+    Decoder_State *st_fx /* i/o: decoder state structure                 */
 )
 {
     TD_BWE_DEC_HANDLE hBWE_TD;
+    hBWE_TD = st_fx->hBWE_TD;
 
-    hBWE_TD = st->hBWE_TD;
-
-    IF( st->last_core != ACELP_CORE )
+    IF( NE_16( st_fx->last_core, ACELP_CORE ) )
     {
         set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
         hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
         move32();
-        st->prev_Q_bwe_exc = 31;
+        st_fx->prev_Q_bwe_exc = 31;
         move16();
     }
+
     test();
-    IF( EQ_16( st->bwidth, WB ) )
+    IF( EQ_16( st_fx->bwidth, WB ) )
     {
         wb_tbe_extras_reset_fx( hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );
         wb_tbe_extras_reset_synth_fx( hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx, hBWE_TD->state_32and48k_WB_upsample_fx, hBWE_TD->mem_resamp_HB_fx );
@@ -5309,11 +5158,15 @@ void TBEreset_dec_ivas_fx(
         set32_fx( hBWE_TD->syn_overlap_fx_32, 0, L_SHB_LAHEAD );
         set32_fx( hBWE_TD->mem_csfilt_fx, 0, 2 );
     }
-    ELSE IF( EQ_16( st->bwidth, SWB ) || EQ_16( st->bwidth, FB ) )
+    ELSE IF( EQ_16( st_fx->bwidth, SWB ) || EQ_16( st_fx->bwidth, FB ) )
     {
-        swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx, hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
+        swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
+                          hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ),
+                          &( hBWE_TD->tbe_premph_fx ), hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
 
-        set16_fx( st->GainShape_Delay, 0, NUM_SHB_SUBFR / 2 );
+        swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
+
+        set16_fx( hBWE_TD->GainShape_Delay_fx, 0, NUM_SHB_SUBFR / 2 );
         set16_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx, 0, INTERP_3_2_MEM_LEN );
         set32_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx_32, 0, INTERP_3_2_MEM_LEN );
         set16_fx( hBWE_TD->mem_resamp_HB_32k_fx, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
@@ -5322,15 +5175,12 @@ void TBEreset_dec_ivas_fx(
         move32();
         hBWE_TD->prev_mix_factor_fx = 32767; /* Q15 1.f */
         move16();
-        // swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx );
-        swb_tbe_reset_synth_ivas_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
-
 
-        IF( EQ_16( st->bwidth, FB ) )
+        IF( EQ_16( st_fx->bwidth, FB ) )
         {
-            if ( st->hBWE_FD != NULL )
+            if ( st_fx->hBWE_FD != NULL )
             {
-                st->prev_fb_ener_adjust_fx = 0;
+                st_fx->hBWE_FD->prev_fb_ener_adjust_fx = 0;
                 move16();
             }
             set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
@@ -5343,25 +5193,27 @@ void TBEreset_dec_ivas_fx(
     return;
 }
 
+
 /*-------------------------------------------------------------------*
  * td_bwe_dec_init()
  *
  * Initialize TD BWE state structure at the decoder
  *-------------------------------------------------------------------*/
 
-void td_bwe_dec_init_ivas_fx(
-    Decoder_State *st_fx,      /* i/o: SHB decoder structure */
+void td_bwe_dec_init_fx(
     TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */
+    const Word16 extl,         /* i  :  BWE extension layer    */
     const Word32 output_Fs     /* i  : output sampling rate    */
 )
 {
     Word16 i;
 
     /* init. SHB buffers */;
-    InitSWBdecBuffer_ivas_fx( st_fx );
+    InitSWBdecBuffer_fx( hBWE_TD );
 
     /* reset SHB buffers */
-    ResetSHBbuffer_Dec_fx( st_fx );
+    ResetSHBbuffer_Dec_fx( hBWE_TD, extl );
+
     IF( EQ_32( output_Fs, 48000 ) )
     {
         set32_fx( hBWE_TD->fbbwe_hpf_mem_fx[0], 0, 4 );
@@ -5378,12 +5230,13 @@ void td_bwe_dec_init_ivas_fx(
 
     hBWE_TD->tilt_mem_fx = 0;
     move16();
-    set16_fx( hBWE_TD->prev_lsf_diff_fx, 16384, LPC_SHB_ORDER - 2 );
+    set16_fx( hBWE_TD->prev_lsf_diff_fx, 16384 /*0.5f in Q15*/, LPC_SHB_ORDER - 2 );
     hBWE_TD->prev_tilt_para_fx = 0;
     move16();
     set16_fx( hBWE_TD->cur_sub_Aq_fx, 0, M + 1 );
     set16_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx, 0, INTERP_3_2_MEM_LEN );
     set32_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx_32, 0, INTERP_3_2_MEM_LEN );
+
     /* TD BWE post-processing */
     hBWE_TD->ptr_mem_stp_swb_fx = hBWE_TD->mem_stp_swb_fx + LPC_SHB_ORDER - 1;
     set16_fx( hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
@@ -5406,7 +5259,7 @@ void td_bwe_dec_init_ivas_fx(
     move16();
     hBWE_TD->prev_GainShape_fx = 0;
     move16();
-    st_fx->prev_Q_bwe_exc_fb = 51;
+    hBWE_TD->prev_Q_bwe_exc_fb = 51;
     move16();
     set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
     hBWE_TD->fb_tbe_demph_fx = 0;
@@ -5417,80 +5270,1889 @@ void td_bwe_dec_init_ivas_fx(
     hBWE_TD->prev_ener_fx = L_deposit_l( 0 );
     move32();
 
+    set16_fx( hBWE_TD->prev_lpc_wb_fx, 0, LPC_SHB_ORDER_WB );
+
     return;
 }
 
+/*-------------------------------------------------------------------*
+ * ResetSHBbuffer_Dec()
+ *
+ *
+ *-------------------------------------------------------------------*/
 
-void td_bwe_dec_init_fx(
-    Decoder_State *st_fx,      /* i/o: SHB decoder structure */
-    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */
-#ifdef ADD_IVAS_BWE
-    const Word16 extl, /* i  : BWE extension layer     */
-#endif
-    const Word32 output_Fs /* i  : output sampling rate    */
+static void calc_tilt_bwe_fx_loc(
+    const Word32 *sp_fx, /* i  : input signal   : Q11       */
+    Word32 *tilt_fx,     /* o  : signal tilt    : tilt_fx_q */
+    Word16 *tilt_fx_q,   /* o  : signal tilt                */
+    const Word16 N       /* i  : signal length  : Q0        */
 )
 {
     Word16 i;
+    Word64 r0_fx, r1_fx;
 
-    /* init. SHB buffers */;
-    InitSWBdecBuffer_fx( st_fx );
-
-    /* reset SHB buffers */
-    ResetSHBbuffer_Dec_fx( st_fx );
-    IF( EQ_32( output_Fs, 48000 ) )
+    r0_fx = EPSILON_FX_SMALL;
+    move64();
+    FOR( i = 0; i < N; i++ )
     {
-        set32_fx( hBWE_TD->fbbwe_hpf_mem_fx[0], 0, 4 );
-        set32_fx( hBWE_TD->fbbwe_hpf_mem_fx[1], 0, 4 );
-        set32_fx( hBWE_TD->fbbwe_hpf_mem_fx[2], 0, 4 );
-        set32_fx( hBWE_TD->fbbwe_hpf_mem_fx[3], 0, 4 );
-        set16_fx( hBWE_TD->fbbwe_hpf_mem_fx_Q, 0, 4 );
+        r0_fx = W_add( r0_fx, W_shr( W_mult_32_32( sp_fx[i], sp_fx[i] ), 1 ) ); /*Q11*2 - 1*/
+    }
+    r1_fx = W_deposit32_l( abs( L_sub( sp_fx[1], sp_fx[0] ) ) ); /*Q11*/
+    FOR( i = 2; i < N; i++ )
+    {
+        IF( W_mult_32_32( L_sub( sp_fx[i], sp_fx[i - 1] ) /*Q11*/, L_sub( sp_fx[i - 1], sp_fx[i - 2] ) /*Q11*/ ) /*Q11 * 2 - 1*/ < 0 )
+        {
+            r1_fx = W_add( r1_fx, W_deposit32_l( abs( L_sub( sp_fx[i], sp_fx[i - 1] ) ) ) ); /*Q11*/
+        }
+    }
+    Word16 headroom_left_r0 = W_norm( r0_fx );
+    Word16 headroom_left_r1 = W_norm( r1_fx );
+    Word16 r0_q = 0, r1_q = 0;
+    move16();
+    move16();
+    IF( LT_16( headroom_left_r0, 32 ) )
+    {
+        r0_fx = W_shr( r0_fx, sub( 32, headroom_left_r0 ) );
+        r0_q = sub( 31, sub( ( 2 * OUTPUT_Q ), sub( 32, headroom_left_r0 ) ) );
+    }
+    ELSE
+    {
+        r0_q = 31 - ( 2 * OUTPUT_Q );
+        move16();
     }
 
-    set16_fx( hBWE_TD->mem_resamp_HB_fx, 0, INTERP_3_1_MEM_LEN );
+    IF( LT_16( headroom_left_r1, 32 ) )
+    {
+        r1_fx = W_shr( r1_fx, sub( 32, headroom_left_r1 ) );
+        r1_q = sub( OUTPUT_Q, sub( 32, headroom_left_r1 ) );
+    }
+    ELSE
+    {
+        r1_q = OUTPUT_Q;
+        move16();
+    }
+    Word32 temp_r0_inv = ISqrt32( W_extract_l( r0_fx ), &r0_q );
+    Word32 res = Mpy_32_32( W_extract_l( r1_fx ), temp_r0_inv );
+    // Word16 res_q = r1_q + ( r0_q < 0 ? ( 31 + ( -1 * r0_q ) ) : r0_q ) - 31;
+    Word16 res_q;
+    IF( r0_q < 0 )
+    {
+        res_q = add( r1_q, sub( add( 31, -r0_q ), 31 ) );
+    }
+    ELSE
+    {
+        res_q = add( r1_q, sub( r0_q, 31 ) );
+    }
+    Word16 norm_res = norm_l( res );
+    IF( norm_res > 0 )
+    {
+        *tilt_fx = L_shl_sat( res, norm_res );
+        move32();
+        *tilt_fx_q = add( res_q, norm_res );
+        move16();
+    }
+    ELSE
+    {
+        *tilt_fx = res;
+        move32();
+        *tilt_fx_q = res_q;
+        move16();
+    }
+    return;
+}
 
-    set16_fx( hBWE_TD->mem_resamp_HB_32k_fx, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
-    set32_fx( hBWE_TD->mem_resamp_HB_32k_fx_32, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
+/*-------------------------------------------------------------------*
+ * swb_tbe_dec()
+ *
+ * SWB TBE decoder, 6 - 14 kHz (or 7.5 - 15.5 kHz) band decoding module
+ *-------------------------------------------------------------------*/
+static void rescale_genSHB_mem_dec_ivas(
+    Decoder_State *st_fx,
+    Word16 sf /*Q0*/
+)
+{
+    Word16 i;
+    TD_BWE_DEC_HANDLE hBWE_TD;
+    hBWE_TD = st_fx->hBWE_TD;
 
-    hBWE_TD->tilt_mem_fx = 0;
-    move16();
-    set16_fx( hBWE_TD->prev_lsf_diff_fx, 16384 /*0.5f in Q15*/, LPC_SHB_ORDER - 2 );
-    hBWE_TD->prev_tilt_para_fx = 0;
-    move16();
-    set16_fx( hBWE_TD->cur_sub_Aq_fx, 0, M + 1 );
-    set16_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx, 0, INTERP_3_2_MEM_LEN );
-    set32_fx( hBWE_TD->int_3_over_2_tbemem_dec_fx_32, 0, INTERP_3_2_MEM_LEN );
-    /* TD BWE post-processing */
-    hBWE_TD->ptr_mem_stp_swb_fx = hBWE_TD->mem_stp_swb_fx + LPC_SHB_ORDER - 1;
-    set16_fx( hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
+    FOR( i = 0; i < NL_BUFF_OFFSET; i++ )
+    {
+        hBWE_TD->old_bwe_exc_extended_fx[i] = shl( hBWE_TD->old_bwe_exc_extended_fx[i], sf );
+        move16();
+    }
 
-    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+    FOR( i = 0; i < 7; i++ )
     {
-        hBWE_TD->swb_lsp_prev_interp_fx[i] = swb_lsp_prev_interp_init[i];
+        hBWE_TD->mem_genSHBexc_filt_down_shb_fx[i] = shl( hBWE_TD->mem_genSHBexc_filt_down_shb_fx[i], sf );
         move16();
     }
 
-    hBWE_TD->prev1_shb_ener_sf_fx = 32767; /* Q15*/
-    move16();
-    hBWE_TD->prev2_shb_ener_sf_fx = 32767; /* Q15*/
-    move16();
-    hBWE_TD->prev3_shb_ener_sf_fx = 32767; /* Q15*/
-    move16();
-    hBWE_TD->prev_res_shb_gshape_fx = 8192; /* 0.125 in Q14*/
-    move16();
-    hBWE_TD->prev_mixFactors_fx = 16384; /* 0.5 in Q15*/
-    move16();
-    hBWE_TD->prev_GainShape_fx = 0;
-    move16();
-    st_fx->prev_Q_bwe_exc_fb = 51;
-    move16();
-    set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
-    hBWE_TD->fb_tbe_demph_fx = 0;
-    move16();
+    /*  -- Apply memory scaling for 13.2 and 16.4k bps using sf ----*/
+    IF( LT_32( st_fx->total_brate, ACELP_24k40 ) )
+    {
+        FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+        {
+            hBWE_TD->state_lpc_syn_fx[i] = shl_sat( hBWE_TD->state_lpc_syn_fx[i], sf );
+            move16();
+        }
 
-    set16_fx( hBWE_TD->old_hb_synth_fx, 0, L_FRAME48k );
+        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+        {
+            hBWE_TD->state_syn_shbexc_fx[i] = shl_sat( hBWE_TD->state_syn_shbexc_fx[i], sf );
+            move16();
+        }
+    }
 
-    hBWE_TD->prev_ener_fx = L_deposit_l( 0 );
+    hBWE_TD->mem_csfilt_fx[0] = L_shl( hBWE_TD->mem_csfilt_fx[0], sf );
     move32();
 
+    hBWE_TD->tbe_demph_fx = shl_r( hBWE_TD->tbe_demph_fx, sf );
+    move16();
+    hBWE_TD->tbe_premph_fx = shl_r( hBWE_TD->tbe_premph_fx, sf );
+    move16();
+
+    return;
+}
+
+static void find_max_mem_dec_m3(
+    Decoder_State *st,
+    Word16 *n_mem3 )
+{
+    Word16 i;
+    // Word16 n_mem_32;
+    Word16 tempQ15;
+    Word16 max3;
+    // Word32 tempQ32, Lmax3;
+    TD_BWE_DEC_HANDLE hBWE_TD;
+    hBWE_TD = st->hBWE_TD;
+
+    /* --------------------------------------------------------------*/
+    /* Find headroom for synthesis stage associated with these memories:
+          1. st->syn_overlap_fx*/
+    max3 = 0;
+    move16();
+    /* find max in prev overlapSyn */
+    FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+    {
+        tempQ15 = abs_s( hBWE_TD->syn_overlap_fx[i] );
+        max3 = s_max( max3, tempQ15 );
+    }
+    /* find max in prev genSHBsynth_state_lsyn_filt_shb_local_fx */
+
+    /* estimate the norm for 16-bit memories  */
+    *n_mem3 = norm_s( max3 );
+    move16();
+    if ( max3 == 0 )
+    {
+        *n_mem3 = 15;
+        move16();
+    }
+}
+
+/*-------------------------------------------------------------------*
+ * ivas_swb_tbe_dec_fx()
+ *
+ * SWB TBE decoder, 6 - 14 kHz (or 7.5 - 15.5 kHz) band decoding module
+ *-------------------------------------------------------------------*/
+void ivas_swb_tbe_dec_fx(
+    Decoder_State *st,                    /* i/o: decoder state structure                           */
+    STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure                            */
+    const Word32 *bwe_exc_extended_fx,    /* i  : bandwidth extended excitation : Q_exc             */
+    Word16 Q_exc,
+    const Word16 voice_factors_fx[],    /* i  : voicing factors  : Q15                              */
+    const Word32 old_syn_12k8_16k_fx[], /* i  : low band synthesis : old_syn_fx                     */
+    Word16 *White_exc16k_fx,            /* o  : shaped white excitation for the FB TBE : Q_white_exc*/
+    Word32 *synth_fx,                   /* o  : SHB synthesis/final synthesis  : Qx                 */
+    Word16 *pitch_buf_fx,               /* i  : Q6                                                  */
+    Word16 *Q_white_exc )
+{
+    Word16 i, j, cnt, n;
+    Word16 stemp;
+    TD_BWE_DEC_HANDLE hBWE_TD;
+    Word32 shaped_shb_excitation_fx_32[L_FRAME16k + L_SHB_LAHEAD];
+    Word16 bwe_exc_extended_16[L_FRAME32k + NL_BUFF_OFFSET];
+    Word16 shaped_shb_excitation_fx[L_FRAME16k + L_SHB_LAHEAD];
+    Word16 lsf_shb_fx[LPC_SHB_ORDER], lpc_shb_fx[LPC_SHB_ORDER + 1], GainShape_fx[NUM_SHB_SUBFR]; // Q12,Q12,Q15
+    Word32 GainFrame_fx;                                                                          // Q18
+    Word32 error_fx[L_FRAME32k];
+    Word16 ener_fx;
+    Word32 L_ener;
+    Word16 is_fractive;
+    Word32 prev_pow_fx, curr_pow_fx, Lscale;
+    Word16 scale_fx;
+    Word16 max_val, temp_fx, shaped_shb_excitation_frac[L_FRAME16k + L_SHB_LAHEAD];
+    Word32 curr_frame_pow_fx;
+    Word16 curr_frame_pow_exp;
+    Word32 L_prev_ener_shb;
+    Word16 vf_modified_fx[NB_SUBFR16k];
+    Word16 f_fx, inc_fx;
+    Word32 GainFrame_prevfrm_fx;
+    Word32 tilt_swb_fec_32_fx;
+    Word16 tilt_swb_fec_fx_q;
+    Word16 tilt_swb_fec_fx;
+    Word32 prev_ener_ratio_fx = 0; /* initialize just to avoid compiler warning */
+    Word16 lsp_shb_1_fx[LPC_SHB_ORDER], lsp_shb_2_fx[LPC_SHB_ORDER], lsp_temp_fx[LPC_SHB_ORDER];
+    Word16 lpc_shb_sf_fx[4 * ( LPC_SHB_ORDER + 1 )];
+    const Word16 *ptr_lsp_interp_coef_fx;
+    Word32 shb_ener_sf_32;
+    Word16 shb_res_gshape_fx[NB_SUBFR16k];
+    Word16 mixFactors_fx;
+    Word16 vind;
+    Word16 shb_res_dummy_fx[L_FRAME16k];
+    Word16 shaped_shb_excitationTemp_fx[L_FRAME16k];
+    Word32 ener_tmp_fx[NUM_SHB_SUBGAINS];
+    Word16 GainShape_tmp_fx[NUM_SHB_SUBGAINS];
+    Word16 pitch_fx;
+    Word16 l_subframe;
+    Word16 formant_fac_fx;
+    Word16 synth_scale_fx;
+    Word16 lsf_diff_fx[LPC_SHB_ORDER], w_fx[LPC_SHB_ORDER];
+    Word16 refl_fx[M];
+    Word16 tilt_para_fx;
+    Word16 *nlExc16k_fx, *mixExc16k_fx;
+    Word16 MSFlag;
+    Word16 feedback_fx;
+    Word16 GainShape_tilt_fx;
+
+    // scaling
+    Word16 exp, tmp;
+    Word16 tmp1, tmp2;
+    Word16 mean_vf;
+    Word32 Lmax, L_tmp;
+    Word16 frac;
+    Word32 L_tmp1, L_tmp2;
+    Word16 Q_bwe_exc;
+    Word16 Q_bwe_exc_fb;
+    Word16 Q_shb;
+    Word16 n_mem, n_mem2, n_mem3, Qx, sc;
+    Word16 expa, expb;
+    Word16 fraca, fracb;
+    Word16 exp_ener, inv_ener;
+
+    hBWE_TD = st->hBWE_TD;
+
+    /* initializations */
+    GainFrame_fx = 0;
+    move32();
+    mixFactors_fx = 0;
+    move16();
+    shb_ener_sf_32 = 0;
+    move32();
+    set16_fx( shaped_shb_excitationTemp_fx, 0, L_FRAME16k );
+    if ( st->hTdCngDec != NULL )
+    {
+        st->hTdCngDec->shb_dtx_count_fx = 0;
+        move16();
+    }
+    is_fractive = 0;
+    move16();
+
+    IF( hStereoICBWE != NULL )
+    {
+        nlExc16k_fx = hStereoICBWE->nlExc16k_fx;
+        mixExc16k_fx = hStereoICBWE->mixExc16k_fx;
+        MSFlag = hStereoICBWE->MSFlag;
+        move16();
+    }
+    ELSE
+    {
+        nlExc16k_fx = NULL;
+        mixExc16k_fx = NULL;
+        MSFlag = 0;
+        move16();
+    }
+
+    /* find tilt */
+    calc_tilt_bwe_fx_loc( old_syn_12k8_16k_fx, &tilt_swb_fec_32_fx, &tilt_swb_fec_fx_q, L_FRAME );
+    tilt_swb_fec_fx = round_fx_sat( L_shl_sat( tilt_swb_fec_32_fx, sub( 11 + 16, tilt_swb_fec_fx_q ) ) );
+    test();
+    if ( st->bfi && st->clas_dec != UNVOICED_CLAS )
+    {
+        tilt_swb_fec_fx = hBWE_TD->tilt_swb_fec_fx;
+        move16();
+    }
+
+    /* WB/SWB bandwidth switching */
+    test();
+    test();
+    IF( ( GT_16( st->tilt_wb_fx, 10240 /*5 in Q11*/ ) && ( EQ_16( st->clas_dec, UNVOICED_CLAS ) ) ) || GT_16( st->tilt_wb_fx, 20480 /*10 in Q11*/ ) )
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( ( st->prev_fractive == 0 ) &&
+              ( LT_32( st->prev_enerLH_fx, L_shl( st->enerLH_fx, 1 ) ) && GT_32( st->prev_enerLH_fx, L_shr( st->enerLH_fx, 1 ) ) && LT_32( st->prev_enerLL_fx, L_shl( st->enerLL_fx, 1 ) ) && GT_32( st->prev_enerLL_fx, L_shr( st->enerLL_fx, 1 ) ) ) ) ||
+            ( EQ_16( st->prev_fractive, 1 ) &&
+              GT_32( L_shr( st->prev_enerLH_fx, 2 ), Mult_32_16( st->enerLH_fx, 24576 ) ) ) /* 24576 in Q13*/
+            || ( GT_32( L_shr( st->enerLL_fx, 1 ), Mult_32_16( st->enerLH_fx, 24576 ) ) &&  /*24576 = 1.5 in Q14*/
+                 LT_16( st->tilt_wb_fx, 20480 ) )                                           /* 20480 = 10 in Q11*/
+        )
+        {
+            is_fractive = 0;
+        }
+        ELSE
+        {
+            is_fractive = 1;
+        }
+        move16();
+    }
+
+    /* WB/SWB bandwidth switching */
+    IF( st->bws_cnt > 0 )
+    {
+        f_fx = 1489; /*1.0f / 22.0f in Q15*/
+        move16();
+        inc_fx = 1489; /*1.0f / 22.0f in Q15*/
+        move16();
+
+        IF( EQ_16( is_fractive, 1 ) )
+        {
+            Copy( lsf_tab_fx, hBWE_TD->lsp_prevfrm_fx, LPC_SHB_ORDER );
+        }
+        ELSE
+        {
+            FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+            {
+                hBWE_TD->lsp_prevfrm_fx[i] = f_fx; /*Q15*/
+                move16();
+                f_fx = add( f_fx, inc_fx ); /*Q15*/
+            }
+        }
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) && !( ( L_sub( L_shr( st->prev_enerLH_fx, 1 ), st->enerLH_fx ) < 0 ) && L_sub( st->prev_enerLH_fx, ( L_shr( st->enerLH_fx, 1 ) > 0 ) ) ) ) || st->last_core != ACELP_CORE || ( ( st->last_core == ACELP_CORE ) && GT_32( abs( L_sub( st->last_core_brate, st->core_brate ) ), 3600 ) ) || EQ_16( s_xor( is_fractive, st->prev_fractive ), 1 ) )
+        {
+            set16_fx( GainShape_fx, 11587, NUM_SHB_SUBFR ); /*0.3536f in Q15*/
+        }
+        ELSE
+        {
+            if ( GT_16( hBWE_TD->prev_GainShape_fx, 11587 ) ) /*0.3536f in Q15*/
+            {
+                hBWE_TD->prev_GainShape_fx = 11587; /*0.3536f in Q15*/
+                move16();
+            }
+            set16_fx( GainShape_fx, hBWE_TD->prev_GainShape_fx, NUM_SHB_SUBFR );
+        }
+
+        Copy( hBWE_TD->lsp_prevfrm_fx, lsf_shb_fx, LPC_SHB_ORDER );
+        set16_fx( shb_res_gshape_fx, 3277 /*0.2f Q14*/, NB_SUBFR16k ); /* Q14 */
+    }
+    ELSE
+    {
+        test();
+        IF( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) )
+        {
+            f_fx = 1489; /*Q15*/
+            move16();
+            inc_fx = 1489; /*Q15*/
+            move16();
+            FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+            {
+                hBWE_TD->lsp_prevfrm_fx[i] = f_fx; /*Q15*/
+                move16();
+                f_fx = add( f_fx, inc_fx );
+            }
+        }
+
+        IF( !st->bfi )
+        {
+            IF( st->use_partial_copy )
+            {
+                IF( NE_16( st->last_extl, SWB_TBE ) )
+                {
+                    hBWE_TD->GainFrame_prevfrm_fx = 0;
+                    move32();
+                    f_fx = 1489 /*0.045454f Q15*/;
+                    move16();
+                    inc_fx = 1489 /*0.045454f Q15*/;
+                    move16();
+                    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+                    {
+                        hBWE_TD->lsp_prevfrm_fx[i] = f_fx; /*Q15*/
+                        move16();
+                        f_fx = add( f_fx, inc_fx ); /*Q15*/
+                    }
+                }
+                Copy( hBWE_TD->lsp_prevfrm_fx, lsf_shb_fx, LPC_SHB_ORDER );
+                set16_fx( GainShape_fx, RECIP_ROOT_EIGHT_FX, NUM_SHB_SUBFR );
+
+                IF( EQ_16( st->rf_frame_type, RF_NELP ) )
+                {
+                    /* Frame gain */
+
+                    GainFrame_fx = L_mac( SHB_GAIN_QLOW_FX, st->rf_indx_tbeGainFr, SHB_GAIN_QDELTA_FX );
+                    L_tmp = Mult_32_16( GainFrame_fx, 27213 ); /*Q16*/ /* 3.321928 in Q13 */
+
+                    frac = L_Extract_lc( L_tmp, &exp );
+                    L_tmp = Pow2( 30, frac );
+                    GainFrame_fx = L_shl( L_tmp, sub( exp, 12 ) ); /*Q18*/
+
+                    test();
+                    test();
+                    test();
+                    test();
+                    test();
+                    test();
+                    IF( ( st->core == ACELP_CORE ) && ( st->last_core == ACELP_CORE ) && !st->prev_use_partial_copy && EQ_16( st->prev_coder_type, UNVOICED ) && NE_32( GainFrame_fx, hBWE_TD->GainFrame_prevfrm_fx ) && NE_16( st->next_coder_type, GENERIC ) && EQ_16( st->last_extl, SWB_TBE ) )
+                    {
+                        GainFrame_fx = L_add( Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 26214 /*0.8f in Q15*/ ), Mult_32_16( GainFrame_fx, 6553 /*0.2f in Q15*/ ) );
+                    }
+                }
+                ELSE
+                {
+                    temp_fx = 0;
+                    move16();
+                    /* Frame gain */
+                    SWITCH( st->rf_indx_tbeGainFr )
+                    {
+                        case 0:
+                            GainFrame_fx = 131072; /* 0.5f in Q18 */
+                            move32();
+                            if ( LE_32( hBWE_TD->GainFrame_prevfrm_fx, 327680l /*1.25 Q18*/ ) )
+                            {
+                                temp_fx = 26214 /*0.8 Q15*/;
+                                move16();
+                            }
+                            BREAK;
+                        case 1:
+                            GainFrame_fx = 524288; /* 2.0f in Q18 */
+                            move32();
+                            test();
+                            if ( GT_32( hBWE_TD->GainFrame_prevfrm_fx, 327680l /*1.25 Q18*/ ) && LE_32( hBWE_TD->GainFrame_prevfrm_fx, 786432l /*3 Q18*/ ) )
+                            {
+                                temp_fx = 26214 /*0.8 Q15*/;
+                                move16();
+                            }
+                            BREAK;
+                        case 2:
+                            GainFrame_fx = 1048576; /* 4.0f in Q18 */
+                            move32();
+                            test();
+                            if ( GT_32( hBWE_TD->GainFrame_prevfrm_fx, 786432l /*3 Q18*/ ) && LE_32( hBWE_TD->GainFrame_prevfrm_fx, 1572864l /*6 Q18*/ ) )
+                            {
+                                temp_fx = 26214 /*0.8 Q15*/;
+                                move16();
+                            }
+                            BREAK;
+                        case 3:
+                            GainFrame_fx = 2097152; /* 8.0f in Q18 */
+                            move32();
+                            test();
+                            if ( GT_32( hBWE_TD->GainFrame_prevfrm_fx, 1572864l /*6 Q18*/ ) && LE_32( hBWE_TD->GainFrame_prevfrm_fx, 4194304l /*16Q18*/ ) )
+                            {
+                                temp_fx = 26214 /*0.8 Q15*/;
+                                move16();
+                            }
+                            BREAK;
+                        default:
+                            fprintf( stderr, "RF SWB-TBE gain bits not supported." );
+                    }
+
+                    IF( EQ_16( st->last_extl, SWB_TBE ) )
+                    {
+                        GainFrame_fx = L_add( Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, temp_fx ), Mult_32_16( GainFrame_fx, sub( 32767, temp_fx ) ) );
+                        /*Q18*/
+                    }
+
+                    IF( ( st->core == ACELP_CORE ) && ( st->last_core == ACELP_CORE ) )
+                    {
+                        if ( !st->prev_use_partial_copy && EQ_16( st->last_coder_type, VOICED ) && EQ_16( st->rf_frame_type, RF_GENPRED ) && GT_32( GainFrame_fx, 2097152 /*8.0f in Q18*/ ) && LT_32( GainFrame_fx, 3059606 /*11.67f in Q18*/ ) )
+                        {
+                            GainFrame_fx = Mult_32_16( GainFrame_fx, 9830 /*0.3f in Q15*/ ); // Q18
+                        }
+                    }
+                }
+            }
+            ELSE
+            {
+                /* de-quantization */
+                ivas_dequantizeSHBparams_fx_9_1( st, st->extl, st->extl_brate, lsf_shb_fx, GainShape_fx, &GainFrame_fx, &stemp,
+                                                 &shb_ener_sf_32, shb_res_gshape_fx, &mixFactors_fx, &MSFlag );
+                if ( hStereoICBWE != NULL )
+                {
+                    hStereoICBWE->MSFlag = MSFlag;
+                    move16();
+                }
+            }
+        }
+        ELSE
+        {
+            Copy( hBWE_TD->lsp_prevfrm_fx, lsf_shb_fx, LPC_SHB_ORDER );
+            test();
+            IF( EQ_16( st->codec_mode, MODE1 ) && ( st->element_mode == EVS_MONO ) )
+            {
+                gradientGainShape( st, GainShape_fx, &GainFrame_fx );
+            }
+            ELSE
+            {
+                FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
+                {
+                    FOR( j = 0; j < 4; j++ )
+                    {
+                        GainShape_fx[i * 4 + j] = mult_r( st->cummulative_damping, hBWE_TD->GainShape_Delay_fx[4 + i] );
+                        move16();
+                    }
+                }
+                IF( GT_16( tilt_swb_fec_fx, ( 8 << 11 ) ) ) /* tilt_swb_fec_fx in Q11 */
+                {
+                    IF( EQ_16( st->nbLostCmpt, 1 ) )
+                    {
+                        GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 19661 /*0.6f Q15*/ );
+                    }
+                    ELSE IF( EQ_16( st->nbLostCmpt, 2 ) )
+                    {
+                        GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 11469 /*0.35f Q15*/ );
+                    }
+                    ELSE
+                    {
+                        GainFrame_fx = Mult_32_16( hBWE_TD->GainFrame_prevfrm_fx, 6554 /*0.2f Q15*/ );
+                    }
+                    GainFrame_fx = Mult_32_16( GainFrame_fx, st->cummulative_damping );
+                }
+                ELSE
+                {
+                    GainFrame_fx = hBWE_TD->GainFrame_prevfrm_fx;
+                    move32(); /* gain locking */
+                }
+            }
+
+            IF( GE_32( st->extl_brate, SWB_TBE_2k8 ) )
+            {
+                test();
+                IF( EQ_16( st->codec_mode, MODE1 ) && ( st->element_mode == EVS_MONO ) )
+                {
+                    L_tmp = L_mult( extract_l( hBWE_TD->prev2_shb_ener_sf_fx ), extract_l( hBWE_TD->prev3_shb_ener_sf_fx ) ); /*Q1*/
+                    tmp = round_fx( root_a_fx( L_tmp, 1, &exp ) );                                                            /* Q = 15-exp */
+                    tmp1 = extract_l( hBWE_TD->prev1_shb_ener_sf_fx );                                                        /*Q0*/
+                    i = sub( norm_s( tmp1 ), 1 );
+                    tmp1 = shl( tmp1, i ); /* Qi */
+                    IF( tmp == 0 )
+                    {
+                        tmp = 32767 /*1.0f Q15*/;
+                        move16(); /*Q15*/
+                    }
+                    ELSE
+                    {
+                        scale_fx = div_s( tmp1, tmp ); /* Q15 - Q(15-exp) + Qi  = Qexp+i */
+                        scale_fx = s_max( scale_fx, 0 );
+                        tmp = shl_sat( scale_fx, sub( sub( 15, exp ), i ) ); /*Q15*/
+                    }
+                    scale_fx = mult_r( hBWE_TD->prev_res_shb_gshape_fx, tmp ); /* Q14 */
+                    test();
+                    IF( GT_32( L_shr( hBWE_TD->prev2_shb_ener_sf_fx, 1 ), hBWE_TD->prev1_shb_ener_sf_fx ) ||
+                        GT_32( L_shr( hBWE_TD->prev3_shb_ener_sf_fx, 1 ), hBWE_TD->prev2_shb_ener_sf_fx ) )
+                    {
+                        shb_ener_sf_32 = Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, scale_fx );
+
+                        if ( GT_16( st->nbLostCmpt, 1 ) )
+                        {
+                            shb_ener_sf_32 = L_shr( shb_ener_sf_32, 1 );
+                        }
+                    }
+                    ELSE
+                    {
+                        L_tmp = L_mult( scale_fx, scale_fx ); /* Q29 */
+                        shb_ener_sf_32 = L_shl( Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, round_fx( L_tmp ) ), 2 );
+                    }
+                }
+                ELSE
+                {
+                    test();
+                    IF( GT_32( L_shr( hBWE_TD->prev2_shb_ener_sf_fx, 1 ), hBWE_TD->prev1_shb_ener_sf_fx ) ||
+                        GT_32( L_shr( hBWE_TD->prev3_shb_ener_sf_fx, 1 ), hBWE_TD->prev2_shb_ener_sf_fx ) )
+                    {
+                        shb_ener_sf_32 = L_shr( Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, st->cummulative_damping ), 1 );
+                    }
+                    ELSE
+                    {
+                        shb_ener_sf_32 = Mult_32_16( hBWE_TD->prev1_shb_ener_sf_fx, st->cummulative_damping );
+                    }
+                }
+            }
+
+            shb_ener_sf_32 = L_max( shb_ener_sf_32, 1l /*1.0f Q0*/ );
+            mixFactors_fx = hBWE_TD->prev_mixFactors_fx;
+            move16();
+
+            IF( EQ_16( st->codec_mode, MODE1 ) )
+            {
+                set16_fx( shb_res_gshape_fx, 3277 /*0.2f Q14*/, 5 ); /* Q14 */
+            }
+            ELSE
+            {
+                set16_fx( shb_res_gshape_fx, 16384 /*1.0f Q14*/, 5 ); /* Q14 */
+            }
+        }
+    }
+
+    /* get the gainshape delay */
+    Copy( &hBWE_TD->GainShape_Delay_fx[4], &hBWE_TD->GainShape_Delay_fx[0], NUM_SHB_SUBFR / 4 );
+    FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
+    {
+        hBWE_TD->GainShape_Delay_fx[i + 4] = GainShape_fx[i * 4]; /*Q15*/
+        move16();
+    }
+
+    L_tmp = L_mult( voice_factors_fx[0], 8192 );
+    L_tmp = L_mac( L_tmp, voice_factors_fx[1], 8192 );
+    L_tmp = L_mac( L_tmp, voice_factors_fx[2], 8192 );
+    mean_vf = mac_r( L_tmp, voice_factors_fx[3], 8192 );
+
+    Copy( voice_factors_fx, vf_modified_fx, NB_SUBFR16k );
+
+    test();
+    IF( EQ_16( st->coder_type, VOICED ) || GT_16( mean_vf, 13107 /*0.4f Q15*/ ) )
+    {
+        FOR( i = 1; i < NB_SUBFR; i++ )
+        {
+            L_tmp = L_mult( voice_factors_fx[i], 26214 /*0.8f Q15*/ );
+            vf_modified_fx[i] = mac_r( L_tmp, voice_factors_fx[i - 1], 6554 /*0.2f Q15*/ );
+            move16();
+        }
+
+        IF( st->L_frame != L_FRAME )
+        {
+            L_tmp = L_mult( voice_factors_fx[4], 26214 /*0.8f Q15*/ );
+            vf_modified_fx[4] = mac_r( L_tmp, voice_factors_fx[3], 6554 /*0.2f Q15*/ );
+            move16();
+        }
+    }
+
+    test();
+    IF( st->use_partial_copy && st->nelp_mode_dec )
+    {
+        set16_fx( vf_modified_fx, 0, NB_SUBFR16k );
+    }
+
+    /* SHB LSF from current frame; and convert to LSP for interpolation */
+    E_LPC_lsf_lsp_conversion( lsf_shb_fx, lsp_shb_2_fx, LPC_SHB_ORDER );
+
+    test();
+    IF( EQ_16( st->last_extl, SWB_TBE ) || EQ_16( st->last_extl, FB_TBE ) )
+    {
+        /* SHB LSP values from prev. frame for interpolation */
+        Copy( hBWE_TD->swb_lsp_prev_interp_fx, lsp_shb_1_fx, LPC_SHB_ORDER );
+    }
+    ELSE
+    {
+        /* Use current frame's LSPs; in effect no interpolation */
+        Copy( lsp_shb_2_fx, lsp_shb_1_fx, LPC_SHB_ORDER );
+    }
+
+    test();
+    test();
+    test();
+    IF( ( st->bws_cnt == 0 ) && ( st->bws_cnt1 == 0 ) && ( st->prev_use_partial_copy == 0 ) && ( st->use_partial_copy == 0 ) )
+    {
+        lsf_diff_fx[0] = 16384;
+        move16(); /*Q15*/
+        lsf_diff_fx[LPC_SHB_ORDER - 1] = 16384;
+        move16(); /*Q15*/
+        FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
+        {
+            lsf_diff_fx[i] = sub( lsf_shb_fx[i], lsf_shb_fx[i - 1] );
+            move16();
+        }
+
+        a2rc_fx( hBWE_TD->cur_sub_Aq_fx + 1, refl_fx, M );
+        tmp = add( 16384, shr( refl_fx[0], 1 ) ); /*Q14*/
+        tmp1 = mult( 27425, tmp );
+        tmp1 = mult( tmp1, tmp );                      /*Q10*/
+        tmp2 = shr( mult( 31715, tmp ), 2 );           /*Q10*/
+        tilt_para_fx = add( sub( tmp1, tmp2 ), 1335 ); /*Q10*/
+
+        test();
+        IF( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) )
+        {
+            FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
+            {
+                hBWE_TD->prev_lsf_diff_fx[i - 1] = shr( lsf_diff_fx[i], 1 );
+                move16();
+            }
+        }
+
+        IF( LE_32( st->extl_brate, FB_TBE_1k8 ) )
+        {
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( !( GT_16( hBWE_TD->prev_tilt_para_fx, 5120 ) && ( EQ_16( st->coder_type, TRANSITION ) || LT_16( tilt_para_fx, 1024 ) ) ) &&
+                !( ( ( LT_16( hBWE_TD->prev_tilt_para_fx, 3072 ) && GE_16( st->prev_coder_type, VOICED ) ) ) && GT_16( tilt_para_fx, 5120 ) ) )
+            {
+                FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
+                {
+                    IF( LT_16( lsf_diff_fx[i], hBWE_TD->prev_lsf_diff_fx[i - 1] ) )
+                    {
+                        tmp = mult( 26214, lsf_diff_fx[i] );
+
+                        test();
+                        IF( ( hBWE_TD->prev_lsf_diff_fx[i - 1] <= 0 ) || ( tmp < 0 ) ) /* safety check in case of bit errors */
+                        {
+                            st->BER_detect = 1;
+                            move16();
+                            tmp = 0;
+                            move16();
+                        }
+                        ELSE
+                        {
+                            tmp = div_s( tmp, hBWE_TD->prev_lsf_diff_fx[i - 1] );
+                        }
+
+                        tmp = s_max( tmp, 16384 );
+                        w_fx[i] = s_min( tmp, 32767 );
+                        move16();
+                    }
+                    ELSE
+                    {
+                        tmp = mult( 26214, hBWE_TD->prev_lsf_diff_fx[i - 1] );
+
+                        test();
+                        IF( ( lsf_diff_fx[i] <= 0 ) || ( tmp < 0 ) ) /* safety check in case of bit errors */
+                        {
+                            st->BER_detect = 1;
+                            move16();
+                            tmp = 0;
+                            move16();
+                        }
+                        ELSE
+                        {
+                            tmp = div_s( tmp, lsf_diff_fx[i] );
+                        }
+
+                        tmp = s_max( tmp, 16384 );
+                        w_fx[i] = s_min( tmp, 32767 );
+                        move16();
+                    }
+                }
+                w_fx[0] = w_fx[1];
+                move16();
+                w_fx[LPC_SHB_ORDER - 1] = w_fx[LPC_SHB_ORDER - 2];
+                move16();
+
+                FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+                {
+                    tmp1 = mult( lsp_shb_1_fx[i], sub( 32767, w_fx[i] ) );
+                    tmp2 = mult( lsp_shb_2_fx[i], w_fx[i] );
+                    lsp_temp_fx[i] = add( tmp1, tmp2 );
+                    move16();
+                }
+            }
+            ELSE
+            {
+                Copy( lsp_shb_2_fx, lsp_temp_fx, LPC_SHB_ORDER );
+            }
+
+            /* convert from lsp to lsf */
+            lsp2lsf_fx( lsp_temp_fx, lsf_shb_fx, LPC_SHB_ORDER, 1 );
+        }
+
+        Copy( lsf_diff_fx + 1, hBWE_TD->prev_lsf_diff_fx, LPC_SHB_ORDER - 2 );
+        hBWE_TD->prev_tilt_para_fx = tilt_para_fx;
+        move16();
+    }
+    ELSE
+    {
+        Copy( lsp_shb_2_fx, lsp_temp_fx, LPC_SHB_ORDER );
+    }
+
+    IF( GE_32( st->extl_brate, SWB_TBE_2k8 ) )
+    {
+        /* SHB LSP interpolation */
+        ptr_lsp_interp_coef_fx = interpol_frac_shb; /*Q15*/
+        FOR( j = 0; j < 4; j++ )
+        {
+            FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+            {
+                L_tmp = L_mult( lsp_shb_1_fx[i], ( *ptr_lsp_interp_coef_fx ) );
+                lsp_temp_fx[i] = mac_r( L_tmp, lsp_shb_2_fx[i], ( *( ptr_lsp_interp_coef_fx + 1 ) ) );
+                move16();
+            }
+            ptr_lsp_interp_coef_fx += 2;
+
+            tmp = i_mult( j, ( LPC_SHB_ORDER + 1 ) );
+            /* convert LSPs to LP coefficients */
+            E_LPC_f_lsp_a_conversion( lsp_temp_fx, lpc_shb_sf_fx + tmp, LPC_SHB_ORDER );
+        }
+    }
+
+    /* Save the SWB LSP values from current frame for interpolation */
+    Copy( lsp_shb_2_fx, hBWE_TD->swb_lsp_prev_interp_fx, LPC_SHB_ORDER );
+
+    /* save the shb_ener and mixFactor values */
+    hBWE_TD->prev3_shb_ener_sf_fx = hBWE_TD->prev2_shb_ener_sf_fx;
+    move32();
+    hBWE_TD->prev2_shb_ener_sf_fx = hBWE_TD->prev1_shb_ener_sf_fx;
+    move32();
+    hBWE_TD->prev1_shb_ener_sf_fx = shb_ener_sf_32;
+    move32();
+    hBWE_TD->prev_res_shb_gshape_fx = shb_res_gshape_fx[4];
+    move16();
+    hBWE_TD->prev_mixFactors_fx = mixFactors_fx;
+    move16();
+
+    /* SWB CNG/DTX - update memories */
+    IF( st->hTdCngDec != NULL )
+    {
+        Copy( st->hTdCngDec->lsp_shb_prev_fx, st->hTdCngDec->lsp_shb_prev_prev_fx, LPC_SHB_ORDER );
+        Copy( lsf_shb_fx, st->hTdCngDec->lsp_shb_prev_fx, LPC_SHB_ORDER );
+    }
+
+    /* convert LSPs back into LP coeffs */
+    E_LPC_f_lsp_a_conversion( lsp_temp_fx, lpc_shb_fx, LPC_SHB_ORDER );
+    Copy_Scale_sig( lpc_shb_fx, lpc_shb_fx, LPC_SHB_ORDER + 1, sub( norm_s( lpc_shb_fx[0] ), 2 ) ); /* Q12 */
+    lpc_shb_fx[0] = ONE_IN_Q12;
+    move16();
+
+    test();
+    IF( EQ_32( st->extl_brate, SWB_TBE_1k10 ) || EQ_32( st->extl_brate, SWB_TBE_1k75 ) )
+    {
+        Word32 vind_temp = Mpy_32_32( L_shl( L_add( L_deposit_l( mixFactors_fx ), 1 ), 15 ), ( ( ( 1 << NUM_BITS_SHB_VF ) - 1 ) << 16 ) ); // check addition of 1
+        vind = extract_l( L_shr( vind_temp, 15 ) ); /* 3 for mpy by 8.0f, -15 to bring it to Q0 */                                         /*mixFactors*7*/
+        /* i: mixFactors_fx in Q15 */
+        /* o: vind in Q0        */
+    }
+    ELSE
+    {
+        vind = shl( mixFactors_fx, 3 - 15 ); /* 3 for mpy by 8.0f, -15 to bring it to Q0 */ /*mixFactors*8*/
+        /* i: mixFactors_fx in Q15 */
+        /* o: vind in Q0        */
+    }
+
+    /* Determine formant PF strength */
+    formant_fac_fx = swb_formant_fac_fx( lpc_shb_fx[1], &hBWE_TD->tilt_mem_fx );
+    /* i:lpc_shb_fx Q12, o:formant_fac_fx Q15 */
+    IF( GT_32( st->total_brate, ACELP_32k ) )
+    {
+        FOR( j = 0; j < 4; j++ )
+        {
+            Copy( lpc_shb_fx, &lpc_shb_sf_fx[i_mult( j, ( LPC_SHB_ORDER + 1 ) )], LPC_SHB_ORDER + 1 );
+        }
+    }
+
+    /* From low band excitation, generate highband excitation */
+
+    /* -------- start of  memory rescaling  -------- */
+    /* ----- calculate optimum Q_bwe_exc and rescale memories accordingly ----- */
+    Lmax = 0;
+    move32();
+    FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
+    {
+        Lmax = L_max( Lmax, L_abs( bwe_exc_extended_fx[cnt] ) );
+    }
+    Q_bwe_exc = norm_l( Lmax );
+    if ( Lmax == 0 )
+    {
+        Q_bwe_exc = 31;
+        move16();
+    }
+    Q_bwe_exc = add( Q_bwe_exc, add( Q_exc, Q_exc ) );
+    find_max_mem_dec( st, &n_mem, &n_mem2, &n_mem3 ); /* for >=24.4, use n_mem2 lpc_syn, shb_20sample, and mem_stp_swb_fx memory */
+
+    tmp = add( st->prev_Q_bwe_exc, n_mem );
+    if ( GT_16( Q_bwe_exc, tmp ) )
+    {
+        Q_bwe_exc = tmp;
+        move16();
+    }
+
+    /* rescale the memories if Q_bwe_exc is different from previous frame */
+    sc = sub( Q_bwe_exc, st->prev_Q_bwe_exc );
+    IF( sc != 0 )
+    {
+        rescale_genSHB_mem_dec_ivas( st, sc );
+    }
+
+    /* rescale the bwe_exc_extended and bring it to 16-bit single precision with dynamic norm  */
+    sc = sub( Q_bwe_exc, add( Q_exc, Q_exc ) );
+
+    FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
+    {
+        bwe_exc_extended_16[cnt] = round_fx_sat( L_shl_sat( bwe_exc_extended_fx[cnt], sc ) );
+        move16();
+    }
+
+    /* state_syn_shbexc_fx is kept at (st_fx->prev_Q_bwe_syn) for 24.4/32kbps or is kept at Q_bwe_exc for 13.2/16.4kbps */
+
+    /* save the previous Q factor (32-bit) of the buffer */
+    st->prev_Q_bwe_exc = Q_bwe_exc;
+    move16();
+
+    Q_bwe_exc = sub( Q_bwe_exc, 16 ); /* Q_bwe_exc reflecting the single precision dynamic norm-ed buffers from here */
+
+    /* -------- end of rescaling memories -------- */
+
+    Q_bwe_exc_fb = hBWE_TD->prev_Q_bwe_exc_fb;
+    move16();
+
+    Q_shb = 0;
+    move16();
+
+    Copy( hBWE_TD->state_syn_shbexc_fx, shaped_shb_excitation_fx, L_SHB_LAHEAD );
+    GenShapedSHBExcitation_ivas_dec_fx( shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx,
+                                        hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
+                                        st->coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed, vf_modified_fx, st->extl,
+                                        &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf_fx, shb_ener_sf_32,
+                                        shb_res_gshape_fx, shb_res_dummy_fx, &vind, formant_fac_fx, hBWE_TD->fb_state_lpc_syn_fx,
+                                        &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, hBWE_TD->prev_Q_bwe_syn, st->total_brate, st->prev_bfi,
+                                        st->element_mode, st->flag_ACELP16k, nlExc16k_fx, mixExc16k_fx, st->extl_brate, MSFlag,
+                                        NULL, &( hBWE_TD->prev_pow_exc16kWhtnd_fx32 ), &( hBWE_TD->prev_mix_factor_fx ), NULL, NULL );
+
+    *Q_white_exc = Q_bwe_exc_fb;
+    move16();
+    IF( EQ_16( st->extl, FB_TBE ) )
+    {
+        hBWE_TD->prev_Q_bwe_exc_fb = Q_bwe_exc_fb;
+        move16();
+    }
+    ELSE
+    {
+        /*Indirectly a memory reset of FB memories for next frame such that rescaling of memories would lead to 0 due to such high prev. Q value.
+        51 because of 31 + 20(shift of Q_bwe_exc_fb before de-emphasis)*/
+        hBWE_TD->prev_Q_bwe_exc_fb = 51;
+        move16();
+    }
+
+    /* rescale the TBE post proc memory */
+    FOR( i = 0; i < LPC_SHB_ORDER; i++ )
+    {
+        hBWE_TD->mem_stp_swb_fx[i] = shl_sat( hBWE_TD->mem_stp_swb_fx[i], sub( Q_bwe_exc, hBWE_TD->prev_Q_bwe_syn ) );
+        move16();
+    }
+    /* fill-in missing SHB excitation */
+    test();
+    test();
+    IF( ( EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) ) && LE_32( st->last_core_brate, SID_2k40 ) )
+    {
+        Copy( shaped_shb_excitation_fx + L_SHB_LAHEAD, shaped_shb_excitation_fx, L_SHB_LAHEAD );
+    }
+
+    IF( hStereoICBWE != NULL )
+    {
+        Copy( shaped_shb_excitation_fx + L_SHB_LAHEAD, hStereoICBWE->shbSynthRef_fx, L_FRAME16k );
+    }
+
+    test();
+    IF( NE_32( st->extl_brate, SWB_TBE_1k10 ) && NE_32( st->extl_brate, SWB_TBE_1k75 ) )
+    {
+        FOR( i = 0; i < L_FRAME16k; i += L_SUBFR16k )
+        {
+            /* TD BWE post-processing */
+            PostShortTerm_ivas_dec_fx( &shaped_shb_excitation_fx[L_SHB_LAHEAD + i], lpc_shb_fx, &shaped_shb_excitationTemp_fx[i], hBWE_TD->mem_stp_swb_fx,
+                                       hBWE_TD->ptr_mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ), hBWE_TD->mem_zero_swb_fx, formant_fac_fx );
+        }
+
+        Copy( shaped_shb_excitationTemp_fx, &shaped_shb_excitation_fx[L_SHB_LAHEAD], L_FRAME16k ); /* Q_bwe_exc */
+
+        tmp = sub( shl( Q_bwe_exc, 1 ), 31 + 16 );
+        prev_pow_fx = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /* 2*(Q_bwe_exc) */
+        curr_pow_fx = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /* 2*(Q_bwe_exc) */
+        FOR( i = 0; i < L_SHB_LAHEAD + 10; i++ )
+        {
+            prev_pow_fx = L_mac0_sat( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] );                                         /*2*Q_bwe_exc*/
+            curr_pow_fx = L_mac0_sat( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
+        }
+
+        if ( GT_16( voice_factors_fx[0], 24576 /*0.75f Q15*/ ) )
+        {
+            curr_pow_fx = L_shr( curr_pow_fx, 2 ); /* Q(2*Q_bwe_exc) */
+        }
+
+        Lscale = root_a_over_b_fx( curr_pow_fx, shl( Q_bwe_exc, 1 ), prev_pow_fx, shl( Q_bwe_exc, 1 ), &exp );
+
+        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+        {
+            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );             /* Q_bwe_exc + (31-exp) - 15 */
+            shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
+            move16();
+        }
+        IF( exp < 0 )
+        {
+            Lscale = L_shl( Lscale, exp );
+            exp = 0;
+            move16();
+        }
+        FOR( ; i < L_SHB_LAHEAD + 10; i++ )
+        {
+            temp_fx = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ );        /* Q15 */
+            L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp_fx ); /* Q31-exp */
+            temp_fx = sub( 32767 /*1.0f Q15*/, temp_fx );
+            Lscale = L_add( Mult_32_16( Lscale, temp_fx ), L_tmp1 );
+            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );             /* Q_bwe_exc + (31-exp) - 15 */
+            shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
+            move16();
+        }
+    }
+    ELSE
+    {
+        /* reset the PF memories if the PF is not running */
+        set16_fx( hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
+        hBWE_TD->gain_prec_swb_fx = ONE_IN_Q14;
+        move16();
+        set16_fx( hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
+    }
+
+    /* Update SHB excitation */
+    Copy( shaped_shb_excitation_fx + L_FRAME16k, hBWE_TD->state_syn_shbexc_fx, L_SHB_LAHEAD ); /* Q_bwe_exc */
+    l_subframe = L_FRAME16k / NUM_SHB_SUBGAINS;
+    move16();
+    L_ener = EPSILON_FX_SMALL;
+    move32();
+
+    FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
+    {
+        L_tmp = 0;
+        move32();
+        ener_tmp_fx[i] = EPSILON_FX_SMALL;
+        move32();
+
+        Word64 tmp64 = 0;
+        move64();
+        FOR( j = 0; j < l_subframe; j++ )
+        {
+            tmp64 = W_mac0_16_16( tmp64, shaped_shb_excitation_fx[add( i_mult( i, l_subframe ), j )], shaped_shb_excitation_fx[add( i_mult( i, l_subframe ), j )] ); /* 2*Q_bwe_exc */
+        }
+        L_tmp = W_sat_l( tmp64 );
+
+        L_tmp = Mult_32_16( L_tmp, 410 /*0.0125 Q15*/ ); /* 2*Q_bwe_exc: ener_tmp_fx in (2*Q_bwe_exc) */
+        IF( L_tmp != 0 )
+        {
+            exp = norm_l( L_tmp );
+            tmp = extract_h( L_shl( L_tmp, exp ) );
+            exp = sub( exp, sub( 30, i_mult( 2, Q_bwe_exc ) ) );
+
+            tmp = div_s( 16384, tmp );
+            L_tmp = L_deposit_h( tmp );
+            L_tmp = Isqrt_lc( L_tmp, &exp );
+            ener_tmp_fx[i] = L_shl_sat( L_tmp, sub( add( exp, shl( Q_bwe_exc, 1 ) ), 31 ) ); /*2 * Q_bwe_exc: Q31 -exp +exp +2 * Q_bwe_exc -31  */
+            move32();
+            L_ener = L_add_sat( L_ener, L_shr( ener_tmp_fx[i], 2 ) ); /* 2*Q_bwe_exc */
+        }
+    }
+    ener_fx = s_max( 1, round_fx_sat( L_shl_sat( L_ener, sub( 18, shl( Q_bwe_exc, 1 ) ) ) ) ); /* Q2: 2*Q_bwe_exc+18-2*Q_bwe_exc-16 */
+    /* WB/SWB bandwidth switching */
+    IF( st->bws_cnt > 0 )
+    {
+        IF( is_fractive == 0 )
+        {
+            IF( GT_16( st->tilt_wb_fx, 2048 ) ) /*assuming st->tilt_wb_fx in Q11*/
+            {
+                st->tilt_wb_fx = 2048;
+                move16();
+            }
+            ELSE IF( LT_16( st->tilt_wb_fx, 1024 ) )
+            {
+                st->tilt_wb_fx = 1024;
+                move16();
+            }
+            test();
+            if ( EQ_16( st->prev_fractive, 1 ) && GT_16( st->tilt_wb_fx, 1024 ) )
+            {
+                st->tilt_wb_fx = 1024;
+                move16();
+            }
+        }
+        ELSE
+        {
+            IF( GT_16( st->tilt_wb_fx, 8192 ) )
+            {
+                IF( st->prev_fractive == 0 )
+                {
+                    st->tilt_wb_fx = 8192;
+                    move16();
+                }
+                ELSE
+                {
+                    st->tilt_wb_fx = 16384;
+                    move16();
+                }
+            }
+            ELSE
+            {
+                st->tilt_wb_fx = shl( st->tilt_wb_fx, 2 );
+                move16();
+            }
+        }
+
+        IF( ener_fx != 0 )
+        {
+            L_tmp = L_shl( L_mult0( ener_fx, st->tilt_wb_fx ), sub( st->Q_syn2, 13 ) ); /* 2+11 +st->Q_syn2 -13 = st->Q_syn2*/
+            exp_ener = norm_s( ener_fx );
+            tmp = shl( ener_fx, exp_ener );           /*Q(2+exp)*/
+            inv_ener = shr( div_s( 16384, tmp ), 1 ); /*Q(15+14-2-exp-1) = 26 - exp*/
+
+            test();
+            IF( GT_32( L_tmp, st->enerLH_fx ) ) /*st->Q_syn2*/
+            {
+                st->tilt_wb_fx = extract_h( L_shr_sat( Mult_32_16( st->enerLH_fx, inv_ener ), sub( sub( st->Q_syn2, exp_ener ), 16 ) ) ); /*Q11*/
+                move16();
+                /*st->Q_syn2 -1 + 26- exp_ener -15 -(st->Q_syn2 -exp_ener -16 ) -16    +1 -1 = (11) *0.5*/
+            }
+            ELSE IF( LT_32( L_tmp, Mult_32_16( st->enerLH_fx, 1638 ) ) && EQ_16( is_fractive, 1 ) )
+            {
+                st->tilt_wb_fx = extract_h( L_shr_sat( Mult_32_16( st->enerLH_fx, inv_ener ), sub( sub( st->Q_syn2, exp_ener ), 15 ) ) ); /*Q11*/
+                move16();
+                /*st->Q_syn2 -1 + 26- exp_ener -15 -(st->Q_syn2 -exp_ener -15 ) -16 = (11) 0.25*/
+            }
+            L_tmp = L_mult0( st->prev_ener_shb_fx, inv_ener );         /*Q(1+15+14-3-exp_ener) = 27 -exp_ener*/
+            GainFrame_prevfrm_fx = L_shr( L_tmp, sub( 9, exp_ener ) ); /*27 -exp_ener -(9-exp_ener )= Q18*/
+        }
+        ELSE
+        {
+            GainFrame_prevfrm_fx = 0;
+            move32();
+        }
+
+        IF( EQ_16( is_fractive, 1 ) )
+        {
+            GainFrame_fx = L_shl( L_deposit_l( st->tilt_wb_fx ), 10 );
+        }
+        ELSE
+        {
+            GainFrame_fx = L_shl( L_deposit_l( st->tilt_wb_fx ), 8 );
+        }
+
+        test();
+        IF( EQ_16( ( is_fractive & st->prev_fractive ), 1 ) && GT_32( GainFrame_fx, GainFrame_prevfrm_fx ) )
+        {
+            GainFrame_fx = L_add( Mult_32_16( GainFrame_prevfrm_fx, 26214 ), Mult_32_16( GainFrame_fx, 6554 ) ); /* 18 +15 -15 = 18*/
+        }
+        ELSE
+        {
+            test();
+            test();
+            test();
+            test();
+            IF( ( LT_32( L_shr( st->prev_enerLH_fx, 1 ), st->enerLH_fx ) && GT_32( st->prev_enerLH_fx, L_shr( st->enerLH_fx, 1 ) ) ) && ( LT_32( L_shr( st->prev_enerLL_fx, 1 ), st->enerLL_fx ) && GT_32( st->prev_enerLL_fx, L_shr( st->enerLL_fx, 1 ) ) ) && ( s_xor( is_fractive, st->prev_fractive ) == 0 ) )
+            {
+                GainFrame_fx = L_add( L_shr( GainFrame_fx, 1 ), L_shr( GainFrame_prevfrm_fx, 1 ) );
+            }
+            ELSE
+            {
+                test();
+                IF( ( is_fractive == 0 ) && EQ_16( st->prev_fractive, 1 ) )
+                {
+                    L_tmp1 = L_shl( Mult_32_16( GainFrame_fx, 3277 ), 13 );                                                /* 31 */
+                    L_tmp = L_sub( 2147483647, L_tmp1 );                                                                   /* 31 */
+                    GainFrame_fx = L_add( Mult_32_32( GainFrame_fx, L_tmp ), Mult_32_32( GainFrame_prevfrm_fx, L_tmp1 ) ); /* 18 */
+                }
+                ELSE
+                {
+                    GainFrame_fx = L_add( L_shr( GainFrame_fx, 1 ), L_shr( L_min( GainFrame_prevfrm_fx, GainFrame_fx ), 1 ) ); /* 18 */
+                }
+            }
+        }
+
+        GainFrame_fx = Mult_32_16( GainFrame_fx, i_mult( sub( N_WS2N_FRAMES, st->bws_cnt ), 819 ) ); /*Q18*/
+    }
+    ELSE
+    {
+        IF( st->bws_cnt1 > 0 )
+        {
+            GainFrame_fx = Mult_32_16( GainFrame_fx, i_mult( st->bws_cnt1, 819 ) ); /*Q18*/
+        }
+        IF( GE_16( st->nbLostCmpt, 1 ) )
+        {
+            ener_fx = s_max( 1, ener_fx );
+            exp_ener = norm_s( ener_fx );
+            tmp = shl( ener_fx, exp_ener );                                                                            /*Q(2+exp)*/
+            inv_ener = div_s( 16384, tmp );                                                                            /*Q(15+14-2-exp)*/
+            prev_ener_ratio_fx = L_shr_sat( L_mult0( st->prev_ener_shb_fx, inv_ener ), add( sub( 9, exp_ener ), 1 ) ); /*Q: 1+27-exp-9+exp-1 = 18 */
+        }
+
+        IF( EQ_16( st->nbLostCmpt, 1 ) )
+        {
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( ( st->clas_dec != UNVOICED_CLAS ) && NE_16( st->clas_dec, UNVOICED_TRANSITION ) && LT_16( hBWE_TD->tilt_swb_fec_fx, 16384 ) &&
+                ( ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) && LT_32( L_shr( st->enerLL_fx, 1 ), st->prev_enerLL_fx ) ) || ( GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) && LT_32( L_shr( st->enerLH_fx, 1 ), st->prev_enerLH_fx ) ) ) )
+            {
+                IF( GT_32( L_shr( prev_ener_ratio_fx, 2 ), GainFrame_fx ) ) /*18*/
+                {
+                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 13107 ), Mult_32_16( GainFrame_fx, 19661 ) ); /*18*/
+                }
+                ELSE IF( GT_32( L_shr( prev_ener_ratio_fx, 1 ), GainFrame_fx ) )
+                {
+                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 26214 ), Mult_32_16( GainFrame_fx, 6554 ) );
+                }
+                ELSE
+                {
+                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 6554 ), Mult_32_16( GainFrame_fx, 26214 ) );
+                }
+
+                test();
+                IF( GT_16( tilt_swb_fec_fx, hBWE_TD->tilt_swb_fec_fx ) && ( hBWE_TD->tilt_swb_fec_fx > 0 ) )
+                {
+                    exp = norm_s( hBWE_TD->tilt_swb_fec_fx );
+                    tmp = shl( hBWE_TD->tilt_swb_fec_fx, exp );                                 /*Q(11+exp)*/
+                    tmp = div_s( 16384, tmp );                                                  /*Q(15+14-11-exp)*/
+                    tmp = extract_h( L_shl( L_mult0( tmp, st->tilt_wb_fx ), sub( exp, 1 ) ) );  /*18 -exp +11  + exp -1 -16  =12;          */
+                    GainFrame_fx = L_shl( Mult_32_16( GainFrame_fx, s_min( tmp, 20480 ) ), 3 ); /*Q18 = 18 +12 -15 +3 */
+                }
+            }
+            ELSE IF( ( ( st->clas_dec != UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 4096 ) ) && GT_32( L_shr( prev_ener_ratio_fx, 2 ), GainFrame_fx ) &&
+                     ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) || GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) ) )
+            {
+                GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 6554 ), Mult_32_16( GainFrame_fx, 26214 ) );
+            }
+        }
+        ELSE IF( GT_16( st->nbLostCmpt, 1 ) )
+        {
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( GT_32( L_shr( prev_ener_ratio_fx, 2 ), GainFrame_fx ) && ( ( EQ_16( st->codec_mode, MODE1 ) && GT_32( st->enerLL_fx, st->prev_enerLL_fx ) && GT_32( st->enerLH_fx, st->prev_enerLH_fx ) ) || EQ_16( st->codec_mode, MODE2 ) ) )
+            {
+                test();
+                IF( GT_16( tilt_swb_fec_fx, 20480 /*10.0f in Q11*/ ) && GT_16( hBWE_TD->tilt_swb_fec_fx, 20480 /*10.0f in Q11*/ ) )
+                {
+                    GainFrame_fx = L_min( L_add( Mult_32_16( prev_ener_ratio_fx, 26214 /*0.8f in Q15*/ ), Mult_32_16( GainFrame_fx, 6554 /*0.2f in Q15*/ ) ), L_shl( Mult_32_16( GainFrame_fx, 16384 /*4.0f in Q12*/ ), 3 ) ); /*Q18*/
+                }
+                ELSE
+                {
+                    GainFrame_fx = L_min( L_add( Mult_32_16( prev_ener_ratio_fx, 16384 ), Mult_32_16( GainFrame_fx, 16384 ) ), L_shl( Mult_32_16( GainFrame_fx, 16384 ), 3 ) ); /*Q18*/
+                }
+            }
+            ELSE IF( GT_32( prev_ener_ratio_fx, GainFrame_fx ) && ( ( EQ_16( st->codec_mode, MODE1 ) && GT_32( st->enerLL_fx, st->prev_enerLL_fx ) && GT_32( st->enerLH_fx, st->prev_enerLH_fx ) ) || EQ_16( st->codec_mode, MODE2 ) ) )
+            {
+                test();
+                IF( GT_16( tilt_swb_fec_fx, 20480 ) && GT_16( hBWE_TD->tilt_swb_fec_fx, 20480 ) )
+                {
+                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 16384 /*0.5f in Q15*/ ), Mult_32_16( GainFrame_fx, 16384 /*0.5f in Q15*/ ) ); /* Q18  */
+                }
+                ELSE
+                {
+                    GainFrame_fx = L_add( Mult_32_16( prev_ener_ratio_fx, 6554 /*0.2f in Q15*/ ), Mult_32_16( GainFrame_fx, 26214 /*0.8f in Q15*/ ) ); /* Q18  */
+                }
+            }
+        }
+    }
+
+    st->prev_fractive = is_fractive;
+    move16();
+
+    /* Adjust the subframe and frame gain of the synthesized shb signal */
+    /* Scale the shaped excitation */
+    IF( EQ_16( st->L_frame, L_FRAME ) )
+    {
+        L_tmp = L_mult( pitch_buf_fx[0], 8192 );
+        FOR( i = 1; i < NB_SUBFR; i++ )
+        {
+            L_tmp = L_mac( L_tmp, pitch_buf_fx[i], 8192 ); /* pitch_buf in Q6 x 0.25 in Q15 */
+        }
+        pitch_fx = round_fx( L_tmp ); /* Q6 */
+    }
+    ELSE
+    {
+        L_tmp = L_mult( pitch_buf_fx[0], 6554 );
+        FOR( i = 1; i < NB_SUBFR16k; i++ )
+        {
+            L_tmp = L_mac( L_tmp, pitch_buf_fx[i], 6554 ); /* pitch_buf in Q6 x 0.2 in Q15 */
+        }
+        pitch_fx = round_fx( L_tmp ); /* Q6 */
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( ( GE_32( st->extl_brate, SWB_TBE_2k8 ) && EQ_16( st->prev_coder_type, st->coder_type ) && NE_16( st->coder_type, UNVOICED ) ) || ( LT_32( st->extl_brate, SWB_TBE_2k8 ) && ( EQ_16( st->prev_coder_type, st->coder_type ) || ( EQ_16( st->prev_coder_type, VOICED ) && EQ_16( st->coder_type, GENERIC ) ) || ( EQ_16( st->prev_coder_type, GENERIC ) && EQ_16( st->coder_type, VOICED ) ) ) ) ) && GT_16( pitch_fx, 4480 /*70 in Q6*/ ) && LT_16( st->extl, FB_TBE ) && NE_32( st->extl_brate, SWB_TBE_1k10 ) && NE_32( st->extl_brate, SWB_TBE_1k75 ) )
+    {
+        FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
+        {
+            GainShape_tmp_fx[i] = GainShape_fx[i * 4]; /* Q15 */
+            move16();
+        }
+
+        FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
+        {
+            L_tmp1 = Mult_32_16( ener_tmp_fx[i], GainShape_tmp_fx[i] );               /* (2*Q_bwe_exc) */
+            L_tmp2 = Mult_32_16( hBWE_TD->prev_ener_fx, hBWE_TD->prev_GainShape_fx ); /* (2*st->prev_ener_fx_Q) */
+            tmp = sub( shl( Q_bwe_exc, 1 ), shl( hBWE_TD->prev_ener_fx_Q, 1 ) );
+            L_tmp2 = L_shl_sat( L_tmp2, tmp ); /* new Q = (2*Q_bwe_exc) */
+            IF( GT_32( L_tmp1, L_tmp2 ) )
+            {
+                L_tmp = L_tmp2;
+                move32();
+                if ( L_tmp2 < 0 )
+                {
+                    L_tmp = L_negate( L_tmp2 );
+                }
+
+                expb = norm_l( L_tmp );
+                fracb = round_fx_sat( L_shl_sat( L_tmp, expb ) );
+                expb = sub( 30, expb ); /* - (2*Q_bwe_exc_ext);                    */
+
+                expa = norm_l( ener_tmp_fx[i] );
+                fraca = extract_h( L_shl( ener_tmp_fx[i], expa ) );
+                expa = sub( 30, expa );
+
+                scale_fx = shr( sub( fraca, fracb ), 15 );
+                fracb = shl( fracb, scale_fx );
+                expb = sub( expb, scale_fx );
+
+                tmp = div_s( fracb, fraca );
+                exp = sub( sub( expb, expa ), 1 );
+                tmp = shl( tmp, exp );
+                GainShape_tmp_fx[i] = add( tmp, shr( GainShape_tmp_fx[i], 1 ) ); /* Q15 */
+                move16();
+            }
+
+            hBWE_TD->prev_ener_fx = ener_tmp_fx[i];
+            move32();
+            hBWE_TD->prev_GainShape_fx = GainShape_tmp_fx[i];
+            move16();
+            hBWE_TD->prev_ener_fx_Q = Q_bwe_exc;
+            move16();
+        }
+
+        FOR( i = 0; i < NUM_SHB_SUBFR; i++ )
+        {
+            Word16 idx = 0;
+            move16();
+            IF( i != 0 )
+            {
+                idx = idiv1616( i_mult( i, NUM_SHB_SUBGAINS ), NUM_SHB_SUBFR );
+            }
+            GainShape_fx[i] = GainShape_tmp_fx[idx];
+            move16();
+        }
+    }
+    ELSE
+    {
+        hBWE_TD->prev_ener_fx_Q = Q_bwe_exc;
+        move16();
+    }
+    hBWE_TD->prev_Q_bwe_syn = Q_bwe_exc;
+    move16();
+
+
+    /* Gain shape smoothing after quantization */
+    test();
+    IF( EQ_32( st->extl_brate, SWB_TBE_1k10 ) || EQ_32( st->extl_brate, SWB_TBE_1k75 ) )
+    {
+        FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
+        {
+            GainShape_tmp_fx[i] = GainShape_fx[i * NUM_SHB_SUBGAINS];
+            move16();
+        }
+
+        lls_interp_n_fx( GainShape_tmp_fx, NUM_SHB_SUBGAINS, &GainShape_tilt_fx, &temp_fx, 1 );
+
+        test();
+        IF( GE_16( vind, 6 ) && LT_16( abs_s( GainShape_tilt_fx ), 3932 ) )
+        {
+            feedback_fx = 9830;
+            move16();
+            FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
+            {
+                GainShape_fx[i] = add_sat( mult( sub( 32767, feedback_fx ), GainShape_fx[i * NUM_SHB_SUBGAINS] ), mult( feedback_fx, GainShape_tmp_fx[i] ) );
+                move16();
+            }
+
+            FOR( i = NUM_SHB_SUBFR - 1; i > 0; i-- )
+            {
+                Word16 idx = 0;
+                move16();
+                IF( i != 0 )
+                {
+                    idx = idiv1616( i_mult( i, NUM_SHB_SUBGAINS ), NUM_SHB_SUBFR );
+                }
+                GainShape_fx[i] = GainShape_fx[idx];
+                move16();
+            }
+        }
+    }
+
+    /* fil-in missing memory */
+    test();
+    test();
+    IF( ( EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) ) && LE_32( st->last_core_brate, SID_2k40 ) )
+    {
+        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
+        {
+            Word16 intermediate = mult( shaped_shb_excitation_fx[i], subwin_shb_fx[L_SHB_LAHEAD - i] );
+            Word32 intermediate_32 = Mpy_32_16_1( Mpy_32_16_1( GainFrame_fx, window_shb_fx[L_SHB_LAHEAD - 1 - i] ), intermediate );
+            hBWE_TD->syn_overlap_fx[i] = round_fx( L_shl_sat( intermediate_32, sub( 16, ( add( Q_bwe_exc, 18 - 15 ) ) ) ) );
+            move16();
+        }
+    }
+
+    Word16 n_mem3_new = 0;
+    move16();
+    find_max_mem_dec_m3( st, &n_mem3_new );
+
+    ScaleShapedSHB_fx( SHB_OVERLAP_LEN,
+                       shaped_shb_excitation_fx, /* i/o: Q_bwe_exc */
+                       hBWE_TD->syn_overlap_fx,
+                       GainShape_fx, /* Q15  */
+                       GainFrame_fx, /* Q18  */
+                       window_shb_fx,
+                       subwin_shb_fx,
+                       &Q_bwe_exc, &Qx, n_mem3_new, hBWE_TD->prev_Q_bwe_syn2 );
+
+    IF( hStereoICBWE != NULL )
+    {
+        Copy_Scale_sig_16_32_DEPREC( lpc_shb_fx, hStereoICBWE->lpSHBRef_fx, LPC_SHB_ORDER + 1, 0 );
+        Copy( GainShape_fx, hStereoICBWE->gshapeRef_fx, NUM_SHB_SUBFR );
+        hStereoICBWE->gFrameRef_fx = GainFrame_fx;
+        move32();
+
+        Copy( shaped_shb_excitation_fx, hStereoICBWE->shbSynthRef_fx, L_FRAME16k );
+    }
+
+    max_val = 0;
+    move16();
+    FOR( i = 0; i < L_FRAME16k; i++ )
+    {
+        max_val = s_max( max_val, abs_s( shaped_shb_excitation_fx[i] ) ); /* Q0 */
+    }
+    IF( max_val == 0 )
+    {
+        curr_frame_pow_fx = 0;
+        move32();
+        n = 0;
+        move16();
+    }
+    ELSE
+    {
+        n = norm_s( max_val );
+        max_val = 0;
+        move16();
+        FOR( i = 0; i < L_FRAME16k; i++ )
+        {
+            shaped_shb_excitation_frac[i] = shl_sat( shaped_shb_excitation_fx[i], n ); /*Q_bwe_exc+n*/
+            move16();
+        }
+
+        curr_frame_pow_fx = 0;
+        move32();
+        FOR( i = 0; i < L_FRAME16k; i++ )
+        {
+            L_tmp = L_mult0( shaped_shb_excitation_frac[i], shaped_shb_excitation_frac[i] ); /*2*(Q_bwe_exc+n)*/
+            curr_frame_pow_fx = L_add( curr_frame_pow_fx, L_shr( L_tmp, 9 ) );               /*2*(Q_bwe_exc+n)-9*/
+        }
+    }
+    curr_frame_pow_exp = sub( shl( add( Q_bwe_exc, n ), 1 ), 9 );
+    tmp = sub( hBWE_TD->prev_frame_pow_exp, curr_frame_pow_exp );
+    IF( tmp > 0 ) /* shifting prev */
+    {
+        IF( GT_16( tmp, 32 ) )
+        {
+            hBWE_TD->prev_frame_pow_exp = add( curr_frame_pow_exp, 32 );
+            move16();
+            tmp = 32;
+            move16();
+        }
+        hBWE_TD->prev_swb_bwe_frame_pow_fx = L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, tmp );
+        move32();
+        hBWE_TD->prev_frame_pow_exp = curr_frame_pow_exp;
+        move16();
+    }
+    ELSE /* shifting curr */
+    {
+        IF( LT_16( tmp, -32 ) )
+        {
+            curr_frame_pow_exp = sub( hBWE_TD->prev_frame_pow_exp, 32 );
+            tmp = -32;
+            move16();
+        }
+        curr_frame_pow_fx = L_shr( curr_frame_pow_fx, -tmp );
+        curr_frame_pow_exp = hBWE_TD->prev_frame_pow_exp;
+        move16();
+    }
+    test();
+    test();
+    IF( !st->bfi && ( st->prev_bfi || st->prev_use_partial_copy ) )
+    {
+        test();
+        test();
+        IF( ( GT_32( L_shr( curr_frame_pow_fx, 1 ), hBWE_TD->prev_swb_bwe_frame_pow_fx ) ) &&
+            ( GT_32( hBWE_TD->prev_swb_bwe_frame_pow_fx, L_tmp ) ) && EQ_16( st->prev_coder_type, UNVOICED ) )
+        {
+            L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
+            scale_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q15*/
+
+            L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+            L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+            L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+            temp_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q15*/
+        }
+        ELSE
+        {
+            scale_fx = temp_fx = 32767;
+            move16(); /*Q15*/
+            move16(); /*Q15*/
+        }
+
+        FOR( j = 0; j < 8; j++ )
+        {
+            GainShape_fx[2 * j] = mult_r( GainShape_fx[2 * j], scale_fx );
+            move16();
+            GainShape_fx[2 * j + 1] = mult_r( GainShape_fx[2 * j + 1], scale_fx );
+            move16();
+            FOR( i = 0; i < L_FRAME16k / 8; i++ )
+            {
+                shaped_shb_excitation_fx[add( i, j * ( L_FRAME16k / 8 ) )] = mult_r( shaped_shb_excitation_fx[add( i, j * ( L_FRAME16k / 8 ) )], scale_fx );
+                move16();
+            }
+
+            IF( temp_fx > 0 )
+            {
+                /* scale_fx <= temp_fx, due to scale_fx = sqrt( st->prev_swb_bwe_frame_pow_fx/curr_frame_pow_fx ), temp_fx = sqrt( scale_fx, 1.f/8.f )
+                   and curr_frame_pow_fx > st->prev_swb_bwe_frame_pow_fx -> scale_fx <= 1.0, sqrt(scale_fx, 1.f/8.f) >= scale_fx  */
+                IF( LT_16( scale_fx, temp_fx ) )
+                {
+                    scale_fx = div_s( scale_fx, temp_fx );
+                }
+                ELSE
+                {
+                    scale_fx = 32767;
+                    move16();
+                }
+            }
+            ELSE
+            {
+                scale_fx = 0;
+                move16();
+            }
+        }
+    }
+
+    /* adjust the FEC frame energy */
+    IF( st->bfi )
+    {
+        scale_fx = temp_fx = 4096;
+        move16(); /*Q12*/
+        move16();
+        IF( EQ_16( st->nbLostCmpt, 1 ) )
+        {
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( GT_32( curr_frame_pow_fx, hBWE_TD->prev_swb_bwe_frame_pow_fx ) &&
+                NE_16( st->prev_coder_type, UNVOICED ) &&
+                ( st->last_good != UNVOICED_CLAS ) )
+            {
+                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp ); /*31 - exp*/
+                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) );                                                                            /*Q12*/
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+            }
+            ELSE IF( LT_32( curr_frame_pow_fx, L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, 1 ) ) && EQ_16( st->nbLostCmpt, 1 ) &&
+                     ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) || GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) ) &&
+                     ( EQ_16( st->prev_coder_type, UNVOICED ) || ( st->last_good == UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 10240 ) ) )
+            {
+                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
+                scale_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+            }
+        }
+        ELSE IF( GT_16( st->nbLostCmpt, 1 ) )
+        {
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( GT_32( curr_frame_pow_fx, hBWE_TD->prev_swb_bwe_frame_pow_fx ) )
+            {
+                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
+                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                temp_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+            }
+            ELSE IF( LT_32( curr_frame_pow_fx, L_shr( hBWE_TD->prev_swb_bwe_frame_pow_fx, 1 ) ) &&
+                     ( GT_32( st->enerLL_fx, L_shr( st->prev_enerLL_fx, 1 ) ) || GT_32( st->enerLH_fx, L_shr( st->prev_enerLH_fx, 1 ) ) ) &&
+                     ( EQ_16( st->prev_coder_type, UNVOICED ) || ( st->last_good == UNVOICED_CLAS ) || GT_16( hBWE_TD->tilt_swb_fec_fx, 10240 ) ) )
+            {
+                L_tmp = root_a_over_b_fx( hBWE_TD->prev_swb_bwe_frame_pow_fx, curr_frame_pow_exp, curr_frame_pow_fx, curr_frame_pow_exp, &exp );
+                L_tmp = L_min( L_tmp, L_shl_sat( 2, sub( 31, exp ) ) ); /*31 - exp*/
+                scale_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) );   /*Q12*/
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                L_tmp = root_a_fx( L_tmp, sub( 31, exp ), &exp );
+                temp_fx = round_fx( L_shl( L_tmp, sub( exp, 3 ) ) ); /*Q12*/
+            }
+        }
+
+        FOR( j = 0; j < 8; j++ )
+        {
+            GainShape_fx[2 * j] = shl_sat( mult_r( GainShape_fx[2 * j], scale_fx ), 3 );
+            move16(); /* 15 +12 +3-15 =15*/
+            GainShape_fx[add( 2 * j, 1 )] = shl_sat( mult_r( GainShape_fx[add( 2 * j, 1 )], scale_fx ), 3 );
+            move16();
+            FOR( i = 0; i < 40; i++ )
+            {
+                shaped_shb_excitation_fx[i + j * L_FRAME16k / 8] = shl( mult_r( shaped_shb_excitation_fx[i + j * L_FRAME16k / 8], scale_fx ), 3 );
+                move16(); /* Q_bwe_exc +12+3 -15  =Q_bwe_exc*/
+            }
+
+            IF( temp_fx > 0 )
+            {
+                IF( LT_16( scale_fx, temp_fx ) )
+                {
+                    scale_fx = shr( div_s( scale_fx, temp_fx ), 3 );
+                }
+                ELSE
+                {
+                    tmp1 = sub( norm_s( scale_fx ), 1 );
+                    tmp2 = norm_s( temp_fx );
+                    scale_fx = div_s( shl( scale_fx, tmp1 ), shl( temp_fx, tmp2 ) );
+                    scale_fx = shr( scale_fx, add( sub( tmp1, tmp2 ), 3 ) );
+                }
+            }
+            ELSE
+            {
+                scale_fx = 0;
+                move16();
+            }
+        }
+    }
+
+    hBWE_TD->prev_swb_bwe_frame_pow_fx = curr_frame_pow_fx;
+    move32();
+    hBWE_TD->prev_frame_pow_exp = curr_frame_pow_exp;
+    move16();
+
+    Word64 prev_ener_shb64 = 0;
+    move64();
+    FOR( i = 0; i < L_FRAME16k; i++ )
+    {
+        prev_ener_shb64 = W_mac0_16_16( prev_ener_shb64, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] ); /* Q0 */
+    }
+    L_prev_ener_shb = W_sat_l( prev_ener_shb64 );
+
+    L_prev_ener_shb = Mult_32_16( L_prev_ener_shb, 26214 ); /* 2*Q_bwe_exc_mod+8; 26214=(1/L_FRAME16k) in Q23 */
+    st->prev_ener_shb_fx = 0;
+    move16();
+    IF( L_prev_ener_shb != 0 )
+    {
+        exp = norm_l( L_prev_ener_shb );
+        tmp = extract_h( L_shl( L_prev_ener_shb, exp ) );
+        exp = sub( exp, sub( 30, ( add( i_mult( 2, Q_bwe_exc ), 8 ) ) ) );
+
+        tmp = div_s( 16384, tmp );
+        L_tmp = L_deposit_h( tmp );
+        L_tmp = Isqrt_lc( L_tmp, &exp );
+        st->prev_ener_shb_fx = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
+        move16();
+    }
+
+    IF( st->hBWE_FD != NULL )
+    {
+        L_tmp = Mult_32_16( curr_frame_pow_fx, 26214 ); /* curr_frame_pow_exp+8; 26214=(1/L_FRAME16k) in Q23 */
+        tmp = 0;
+        move16();
+        IF( L_tmp != 0 )
+        {
+            exp = norm_l( L_tmp );
+            tmp = extract_h( L_shl( L_tmp, exp ) );
+            exp = sub( exp, sub( 30, add( curr_frame_pow_exp, 8 ) ) );
+
+            tmp = div_s( 16384, tmp );
+            L_tmp = L_deposit_h( tmp );
+            L_tmp = Isqrt_lc( L_tmp, &exp );
+            tmp = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 14 ) ) ); /* Q1 */
+        }
+        set16_fx( st->hBWE_FD->prev_SWB_fenv_fx, tmp, SWB_FENV ); /* Q1 */
+    }
+
+    FOR( i = 0; i < L_FRAME16k; i++ )
+    {
+        shaped_shb_excitation_fx_32[i] = L_shl( shaped_shb_excitation_fx[i], sub( Q11, Q_bwe_exc ) );
+        move32();
+    }
+
+    /* generate 32kHz SHB synthesis from 12.8(16)kHz signal */
+    GenSHBSynth_fx32( shaped_shb_excitation_fx_32, error_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, st->L_frame, &( hBWE_TD->syn_dm_phase ) );
+    Copy_Scale_sig_32_16( st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, st->hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, 2 * ALLPASSSECTIONS_STEEP, -( Q11 - Q_bwe_exc ) );
+    Copy32( error_fx + L_FRAME32k - L_SHB_TRANSITION_LENGTH, hBWE_TD->old_tbe_synth_fx_32, L_SHB_TRANSITION_LENGTH );
+
+    /* resample SHB synthesis (if needed) and scale down */
+    synth_scale_fx = 32767;
+    move16(); /* 1.0 in Q15 */
+    if ( EQ_16( st->codec_mode, MODE1 ) )
+    {
+        synth_scale_fx = 29491;
+        move16(); /* 0.9 in Q15 */
+    }
+
+    IF( EQ_32( st->output_Fs, 48000 ) )
+    {
+        IF( EQ_16( st->extl, FB_TBE ) )
+        {
+            tmp = norm_l( GainFrame_fx );
+            if ( GainFrame_fx == 0 )
+            {
+                tmp = 31;
+                move16();
+            }
+            L_tmp = L_shl( GainFrame_fx, tmp ); /* 18 + tmp */
+
+            tmp1 = 0;
+            move16();
+
+#ifdef FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx
+            Word32 idx32 = L_shr_r( 0x00333333, 10 ); /*NUM_SHB_SUBFR/L_FRAME16k*/ // Q16
+#endif
+
+            FOR( i = 0; i < L_FRAME16k; i++ )
+            {
+#ifndef FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx
+                Word16 idx = 0;
+                move16();
+                IF( i != 0 )
+                {
+                    idx = idiv1616( i_mult( NUM_SHB_SUBFR, i ), L_FRAME16k );
+                }
+#else
+                Word16 idx;
+                idx = extract_h( imult3216( idx32, i ) ); /*Q0*/
+#endif
+                L_tmp1 = Mult_32_16( L_tmp, GainShape_fx[idx] );                           /* Q : 18 + tmp +15 -15*/
+                White_exc16k_fx[i] = round_fx( Mult_32_16( L_tmp1, White_exc16k_fx[i] ) ); /* 18 + tmp +*Q_white_exc -15 -16 */
+                move16();
+                tmp1 = s_max( tmp1, abs_s( White_exc16k_fx[i] ) );
+            }
+
+            *Q_white_exc = sub( add( *Q_white_exc, tmp ), 13 ); /* *Q_white_exc + 18 + tmp -15 -16 */
+            move16();
+            tmp = norm_s( tmp1 );
+            if ( tmp1 == 0 )
+            {
+                tmp = 15;
+                move16();
+            }
+
+            FOR( i = 0; i < L_FRAME16k; i++ )
+            {
+                White_exc16k_fx[i] = shl( White_exc16k_fx[i], sub( tmp, 1 ) );
+                move16();
+            }
+            *Q_white_exc = sub( add( *Q_white_exc, tmp ), 1 );
+            move16();
+        }
+
+        IF( NE_16( synth_scale_fx, 32767 ) ) /* 1.0 in Q15 */
+        {
+            FOR( i = 0; i < L_FRAME32k; i++ )
+            {
+                error_fx[i] = Mpy_32_16_1( error_fx[i], synth_scale_fx );
+                move32();
+            }
+        }
+        interpolate_3_over_2_allpass_fx32( error_fx, L_FRAME32k, synth_fx, hBWE_TD->int_3_over_2_tbemem_dec_fx_32 );
+    }
+    ELSE IF( EQ_32( st->output_Fs, 32000 ) )
+    {
+        IF( NE_16( synth_scale_fx, 32767 ) ) /* 1.0 in Q15 */
+        {
+            FOR( i = 0; i < L_FRAME32k; i++ )
+            {
+                synth_fx[i] = Mpy_32_16_1( error_fx[i], synth_scale_fx );
+                move32(); /*Qx*/
+            }
+        }
+        ELSE
+        {
+            Copy32( error_fx, synth_fx, L_FRAME32k );
+        }
+    }
+    ELSE IF( EQ_32( st->output_Fs, 16000 ) )
+    {
+        IF( NE_16( synth_scale_fx, 32767 ) ) /* 1.0 in Q15 */
+        {
+            FOR( i = 0; i < L_FRAME32k; i++ )
+            {
+                error_fx[i] = Mpy_32_16_1( error_fx[i], synth_scale_fx );
+                move32();
+            }
+        }
+
+        Decimate_allpass_steep_fx32( error_fx, hBWE_TD->mem_resamp_HB_32k_fx_32, L_FRAME32k, synth_fx );
+    }
+
+    /* Update previous frame parameters for FEC */
+    Copy( lsf_shb_fx, hBWE_TD->lsp_prevfrm_fx, LPC_SHB_ORDER );
+    IF( EQ_16( st->codec_mode, MODE1 ) )
+    {
+        hBWE_TD->GainFrame_prevfrm_fx = GainFrame_fx;
+        move32(); /*Q18*/
+        hBWE_TD->tilt_swb_fec_fx = tilt_swb_fec_fx;
+        move16();
+
+        if ( !st->bfi )
+        {
+            hBWE_TD->GainAttn_fx = 32767; /*1.0f in Q15*/
+            move16();
+        }
+    }
+    ELSE
+    {
+        IF( !st->bfi )
+        {
+            hBWE_TD->GainFrame_prevfrm_fx = GainFrame_fx;
+            move32(); /*Q18*/
+            hBWE_TD->tilt_swb_fec_fx = tilt_swb_fec_fx;
+            move16();
+            hBWE_TD->GainAttn_fx = 32767; /*1.0f in Q15*/
+            move16();
+        }
+    }
+
+    hBWE_TD->prev_ener_fx = ener_tmp_fx[NUM_SHB_SUBGAINS - 1];
+    move32();
+    hBWE_TD->prev_GainShape_fx = GainShape_fx[NUM_SHB_SUBFR - 1];
+    move16();
+    hBWE_TD->prev_Q_bwe_syn2 = Q_bwe_exc;
+    move16();
+    hBWE_TD->prev_Qx = Q_bwe_exc;
+    move16();
+
     return;
 }
diff --git a/lib_dec/syn_outp.c b/lib_dec/syn_outp.c
deleted file mode 100644
index 96ac16dbadfe6ace2cb07d1ed022dbc673e7e97a..0000000000000000000000000000000000000000
--- a/lib_dec/syn_outp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * syn_output()
- *
- * Output synthesis signal with compensation for saturation
- * returns number of clipped samples
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/syn_outp_fx.c b/lib_dec/syn_outp_fx.c
index 0d70524bedab22da24bf6cfda428734479423843..133ff17b44e2f40ac846c88353ebfb4d97092a56 100644
--- a/lib_dec/syn_outp_fx.c
+++ b/lib_dec/syn_outp_fx.c
@@ -40,11 +40,7 @@ void syn_output_fx(
         FOR( i = 0; i < output_frame; i++ )
         {
             L_tmp = L_deposit_h( synth[i] );
-#ifdef BASOP_NOGLOB
             synth_out[i] = round_fx_sat( L_shr_sat( L_tmp, tmp ) );
-#else
-            synth_out[i] = round_fx( L_shr( L_tmp, tmp ) );
-#endif
             move16();
         }
     }
@@ -86,11 +82,7 @@ void unscale_AGC(
         max_val = s_max( max_val, abs_s( x[i] ) );
     }
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     tmp = shl_o( 30000, Qx, &Overflow ); /* saturation can occur here */
-#else
-    tmp = shl( 30000, Qx ); /* saturation can occurs here */
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     frame_fac = 0;
     move16();
diff --git a/lib_dec/tcq_core_dec.c b/lib_dec/tcq_core_dec.c
deleted file mode 100644
index 403c5db5b04dcd5b2ea7a107b520257dc152e832..0000000000000000000000000000000000000000
--- a/lib_dec/tcq_core_dec.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "basop_util.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/tcx_utils_dec.c b/lib_dec/tcx_utils_dec.c
deleted file mode 100644
index efee08d61ff7a04b17812a2ec03793f68585587e..0000000000000000000000000000000000000000
--- a/lib_dec/tcx_utils_dec.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------
- * tcx_decoder_memory_update_flt()
- *
- *
- *--------------------------------------------------------------*/
diff --git a/lib_dec/tns_base_dec.c b/lib_dec/tns_base_dec.c
deleted file mode 100644
index 68e2e313cbfcfa5ee46120f98faf3938b409a40d..0000000000000000000000000000000000000000
--- a/lib_dec/tns_base_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "stat_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/tns_base_dec_fx.c b/lib_dec/tns_base_dec_fx.c
index 13f6ca461baaf7179c0019945c0757445019bdb0..a5df034908245daa19050eef823a8701900c0bfc 100644
--- a/lib_dec/tns_base_dec_fx.c
+++ b/lib_dec/tns_base_dec_fx.c
@@ -26,11 +26,8 @@ typedef Word32 ( *TLinearPredictionFilter )( Word16 order, Word16 const parCoeff
  *
  *
  *---------------------------------------------------------------------*/
-#ifdef IVAS_CODE
-void
-#else
+
 Word16
-#endif
 ReadTnsData(
     STnsConfig const *pTnsConfig,
     Decoder_State *st,
@@ -47,20 +44,6 @@ ReadTnsData(
 
     IF( GT_16( pTnsConfig->nMaxFilters, 1 ) )
     {
-#ifdef IVAS_CODE
-        IF( pTnsConfig->allowTnsOnWhite )
-        {
-            IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) )
-            {
-                ReadFromBitstream( &tnsEnabledOnWhiteSWBTCX10BitMap, 1, st, &stream, pnSize );
-            }
-            ELSE
-            {
-                ReadFromBitstream( &tnsEnabledOnWhiteSWBTCX20BitMap, 1, st, &stream, pnSize );
-            }
-        }
-        ELSE
-#endif
         {
 
             IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) )
@@ -81,20 +64,10 @@ ReadTnsData(
     move16();
     *pnBits = sub( st->next_bit_pos, start_bit_pos );
 
-
-#ifdef IVAS_CODE
-    return;
-#else
     return TNS_NO_ERROR;
-#endif
 }
-#define IVAS_CODE
-#ifdef IVAS_CODE
-void
-#else
-Word16
-#endif
-ReadTnsData_ivas_fx(
+
+void ReadTnsData_ivas_fx(
     STnsConfig const *pTnsConfig,
     Decoder_State *st,
     Word16 *pnBits, /*Q0*/
@@ -109,7 +82,6 @@ ReadTnsData_ivas_fx(
 
     IF( GT_16( pTnsConfig->nMaxFilters, 1 ) )
     {
-#ifdef IVAS_CODE
         IF( pTnsConfig->allowTnsOnWhite )
         {
             IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) )
@@ -122,7 +94,6 @@ ReadTnsData_ivas_fx(
             }
         }
         ELSE
-#endif
         {
 
             IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) )
@@ -143,13 +114,9 @@ ReadTnsData_ivas_fx(
     move16();
     *pnBits = sub( st->next_bit_pos, start_bit_pos );
 
-#ifdef IVAS_CODE
     return;
-#else
-    return TNS_NO_ERROR;
-#endif
 }
-#undef IVAS_CODE
+
 /*---------------------------------------------------------------------*
  * DecodeTnsData()
  *
@@ -169,21 +136,6 @@ Word16 DecodeTnsData(
 
     IF( GT_16( pTnsConfig->nMaxFilters, 1 ) )
     {
-
-#ifdef IVAS_CODE
-        IF( pTnsConfig->allowTnsOnWhite )
-        {
-            IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) )
-            {
-                SetParameters( &tnsEnabledOnWhiteSWBTCX10BitMap, 1, pTnsData, &stream, pnSize );
-            }
-            ELSE
-            {
-                SetParameters( &tnsEnabledOnWhiteSWBTCX20BitMap, 1, pTnsData, &stream, pnSize );
-            }
-        }
-        ELSE
-#endif
         {
             IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) )
             {
diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c
deleted file mode 100644
index c865dbe745ffc54da6b4c0908544a85ce25e5727..0000000000000000000000000000000000000000
--- a/lib_dec/tonalMDCTconcealment.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#define _USE_MATH_DEFINES
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
-#include "ivas_prot_fx.h"
-#include "prot_fx.h"
-
-
-/*******************************************************/
-/*-------------- public functions -------------------- */
-/*******************************************************/
-
-void TonalMdctConceal_create_concealment_noise_ivas_fx(
-    Word32 concealment_noise[L_FRAME48k], // Q31-concealment_noise_exp
-    Word16 *concealment_noise_exp,
-    CPE_DEC_HANDLE hCPE,
-    const Word16 L_frameTCX,     // Q0
-    const Word16 L_frame,        // Q0
-    const Word16 idchan,         // Q0
-    const Word16 subframe_idx,   // Q0
-    const Word16 core,           // Q0
-    const Word16 crossfade_gain, // Q15
-    const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode )
-{
-    STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct;
-    TonalMDCTConcealPtr hTonalMDCTConc;
-    Decoder_State *st;
-    HANDLE_FD_CNG_COM hFdCngCom;
-    Word16 *rnd_c, *rnd;
-    Word16 crossOverFreq, i, save_rnd_c, max_noise_line;
-    Word16 c, c_inv, inc;
-    Word32 noise_shape_buffer[L_FRAME48k];
-    Word16 noise_shape_buffer_e[L_FRAME48k];
-    Word16 start_idx, stop_idx, noise_shape_buffer_common_exp = MIN16B_FLT_FX, last_scf_e, temp_e;
-    move16();
-    Word32 *cngNoiseLevelPtr;
-    Word32 last_scf;
-
-    Word16 c_e, c_inv_e;
-
-    push_wmops( "create_conc_noise" );
-
-    hStereoMdct = hCPE->hStereoMdct;
-    st = hCPE->hCoreCoder[idchan];
-    hTonalMDCTConc = st->hTonalMDCTConc;
-    hFdCngCom = st->hFdCngDec->hFdCngCom;
-    rnd = &hStereoMdct->noise_seeds_channels[idchan];
-    rnd_c = &hStereoMdct->noise_seed_common;
-
-    /* determine start bin for IGF */
-    IF( st->igf == 0 )
-    {
-        IF( st->narrowBand == 0 )
-        {
-            /* minimum needed for output with sampling rates lower then the
-               nominal sampling rate */
-            crossOverFreq = s_min( L_frameTCX, L_frame );
-        }
-        ELSE
-        {
-            crossOverFreq = L_frameTCX;
-            move16();
-        }
-    }
-    ELSE
-    {
-        crossOverFreq = s_min( st->hIGFDec->infoIGFStartLine, L_frameTCX );
-    }
-
-    /* for tonal mdct concealment with tonal components above the crossover frequency, conditionally raise the frequency index until which noise is generated */
-    max_noise_line = crossOverFreq;
-    move16();
-    IF( st->tonal_mdct_plc_active )
-    {
-        max_noise_line = s_max( max_noise_line, extract_l( L_add( hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1], 1 ) ) );
-    }
-
-    /* first lost frame is handled separately */
-    IF( !hTonalMDCTConc->lastBlockData.blockIsConcealed )
-    {
-        *rnd = add( 1977, idchan ); // Q0
-        move16();
-        /* will be set twice when looping over two channels, but does not matter */
-        *rnd_c = 1979; // Q0
-        move16();
-    }
-
-    IF( GT_16( crossfade_gain, 32734 ) )
-    /* Due to precision loss */ /* 0.999 in Q15*/
-    {
-        /* In first frame, noise is weighted with zero anyway, we only need the random numbers for the sign scrambling */
-        FOR( i = 0; i < max_noise_line; i++ )
-        {
-            *rnd = own_random( rnd );
-            move16();
-            concealment_noise[i] = *rnd; // Q31-concealment_noise_exp
-            move32();
-        }
-        *concealment_noise_exp = 31;
-        move16();
-        pop_wmops();
-
-        return;
-    }
-
-    save_rnd_c = *rnd_c; // Q0
-    move16();
-
-    c_e = 1;
-    move16();
-    c_inv_e = 1;
-    move16();
-
-    c = Sqrt16( hStereoMdct->lastCoh_fx, &c_e );                            // Q1 = 15 - c_e
-    c_inv = Sqrt16( sub( ONE_IN_Q14, hStereoMdct->lastCoh_fx ), &c_inv_e ); // Q2 = 15 - c_inv_e
-
-    IF( NE_16( c_e, c_inv_e ) )
-    {
-        IF( LT_16( c_e, c_inv_e ) )
-        {
-            c = shr( c, sub( c_inv_e, c_e ) ); // Q0
-            c_e = c_inv_e;
-            move16();
-        }
-        ELSE
-        {
-            c_inv = shr( c_inv, sub( c_e, c_inv_e ) ); // Q0
-        }
-    }
-
-    /* pre-compute the noise shape for later weighting of the noise spectra */
-    cngNoiseLevelPtr = &hFdCngCom->cngNoiseLevel[0];
-    last_scf_e = hFdCngCom->cngNoiseLevelExp;
-    move16();
-
-    IF( GT_16( st->core, TCX_20_CORE ) )
-    {
-        inc = 2;
-    }
-    ELSE
-    {
-        inc = 1;
-    }
-    move16();
-    start_idx = idiv1616( hFdCngCom->startBand, inc );
-    stop_idx = idiv1616( hFdCngCom->stopFFTbin, inc );
-
-    FOR( i = 0; i < start_idx; i++ )
-    {
-        noise_shape_buffer[i] = 0;
-        move32();
-        noise_shape_buffer_e[i] = 0;
-        move16();
-    }
-    FOR( ; i < stop_idx; ( i++, cngNoiseLevelPtr += inc ) )
-    {
-        noise_shape_buffer_e[i] = hFdCngCom->cngNoiseLevelExp;
-        move16();
-        noise_shape_buffer[i] = Sqrt32( *( cngNoiseLevelPtr ), &noise_shape_buffer_e[i] ); // Q31-noise_shape_buffer_e[i]
-        move32();
-        noise_shape_buffer_common_exp = s_max( noise_shape_buffer_e[i], noise_shape_buffer_common_exp );
-    }
-
-    FOR( i = 0; i < stop_idx; i++ )
-    {
-        IF( NE_16( noise_shape_buffer_common_exp, noise_shape_buffer_e[i] ) )
-        {
-
-            noise_shape_buffer[i] = L_shr( noise_shape_buffer[i], sub( noise_shape_buffer_common_exp, noise_shape_buffer_e[i] ) ); // Q31- (noise_shape_buffer_common_exp-noise_shape_buffer_e[i])
-            move32();
-        }
-    }
-
-    last_scf = Sqrt32( *( cngNoiseLevelPtr - inc ), &last_scf_e ); // Q31-last_scf_e
-
-    IF( LT_16( noise_shape_buffer_common_exp, last_scf_e ) )
-    {
-        Scale_sig32( noise_shape_buffer, stop_idx, sub( noise_shape_buffer_common_exp, last_scf_e ) ); // Q31- (noise_shape_buffer_common_exp-last_scf_e)
-
-        noise_shape_buffer_common_exp = last_scf_e;
-        move16();
-    }
-    ELSE
-    {
-        last_scf = L_shl( last_scf, sub( last_scf_e, noise_shape_buffer_common_exp ) ); // Q31-(last_scf_e-noise_shape_buffer_common_exp)
-    }
-
-    FOR( ; i < max_noise_line; i++ )
-    {
-        noise_shape_buffer[i] = last_scf; // Q31 - noise_shape_buffer_common_exp
-        move32();
-    }
-
-    /* fill the noise vector */
-    hTonalMDCTConc->curr_noise_nrg = MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG_Q31; // Q31
-    move32();
-    hTonalMDCTConc->curr_noise_nrg_exp = 0;
-    move16();
-    *concealment_noise_exp = add( 16, add( noise_shape_buffer_common_exp, c_e ) );
-    move16();
-    temp_e = hTonalMDCTConc->curr_noise_nrg_exp;
-    move16();
-
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( noise_gen_mode, EQUAL_CORES ) || ( ( EQ_16( noise_gen_mode, TCX20_IN_0_TCX10_IN_1 ) && EQ_16( idchan, 0 ) ) || ( EQ_16( noise_gen_mode, TCX10_IN_0_TCX20_IN_1 ) && EQ_16( idchan, 1 ) ) ) )
-    {
-        /* current channel is TCX20 -> generate noise for "full-length" spectrum */
-
-        FOR( i = 0; i < max_noise_line; i++ )
-        {
-            *rnd = own_random( rnd ); // Q0
-            *rnd_c = own_random( rnd_c );
-
-            move16();
-            move16();
-
-            concealment_noise[i] = Mpy_32_32( L_add( L_shr( L_mult( c_inv, *rnd ), 1 ), L_shr( L_mult( c, *rnd_c ), 1 ) ), noise_shape_buffer[i] ); // Q31 - *concealment_noise_exp
-            move32();
-            IF( concealment_noise[i] != 0 )
-            {
-                hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, Mpy_32_32( concealment_noise[i], concealment_noise[i] ), shl( *concealment_noise_exp, 1 ), &temp_e ); // Q31-temp_e
-            }
-            hTonalMDCTConc->curr_noise_nrg_exp = temp_e;
-            move16();
-        }
-    }
-    ELSE /* ( ( noise_gen_mode == TCX10_IN_0_TCX20_IN_1 && idchan == 0 ) || ( noise_gen_mode == TCX20_IN_0_TCX10_IN_1 && idchan == 1 ) )  */
-    {
-        /* current channel is TCX10 and the other is TCX20 -> generate noise for "half-length" spectrum, but "increment" mid seed twice, to have the same seed in mid as the other (TCX20) channel for next frame */
-        FOR( i = 0; i < max_noise_line; i++ )
-        {
-            *rnd = own_random( rnd );     // Q0
-            *rnd_c = own_random( rnd_c ); // Q0
-            move16();
-            move16();
-
-            concealment_noise[i] = Mpy_32_32( L_add( L_shr( L_mult( c_inv, *rnd ), 1 ), L_shr( L_mult( c, *rnd_c ), 1 ) ), noise_shape_buffer[i] );
-            move32();
-            IF( concealment_noise[i] != 0 )
-            {
-                hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, Mpy_32_32( concealment_noise[i], concealment_noise[i] ), shl( *concealment_noise_exp, 1 ), &temp_e ); // Q31-temp_e
-            }
-            hTonalMDCTConc->curr_noise_nrg_exp = temp_e;
-            move16();
-
-            *rnd_c = own_random( rnd_c );
-            move16();
-        }
-    }
-
-    IF( st->tonal_mdct_plc_active )
-    {
-        FOR( i = crossOverFreq; i < s_max( crossOverFreq, hTonalMDCTConc->pTCI->lowerIndex[hTonalMDCTConc->pTCI->numIndexes - 1] ); ++i )
-        {
-            concealment_noise[i] = 0;
-            move32();
-        }
-    }
-
-    /* restore common seed
-         - after finishing the first channel
-         - after a first subframe if the current channel is TCX10 */
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( EQ_16( idchan, 0 ) && ( EQ_16( core, TCX_20 ) || ( EQ_16( core, TCX_10 ) && EQ_16( subframe_idx, 1 ) ) ) ) || ( EQ_16( core, TCX_10 ) && EQ_16( subframe_idx, 0 ) ) )
-    {
-        *rnd_c = save_rnd_c;
-        move16();
-    }
-
-    st->seed_tcx_plc = *rnd;
-    move16();
-
-    pop_wmops();
-
-    return;
-}
-
-
-void TonalMdctConceal_whiten_noise_shape_ivas_fx(
-    Decoder_State *st,
-    const Word16 L_frame,
-    const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE whitening_mode )
-{
-    Word16 inc, start_idx, stop_idx, i;
-    Word32 *noiseLevelPtr, *scfs_bg, *scfs_for_shaping;
-    Word16 noiseLevelPtr_exp;
-    HANDLE_FD_CNG_COM hFdCngCom;
-    Word32 whitenend_noise_shape[L_FRAME16k];
-    Word16 q_wns;
-    Word32 scfs_int[FDNS_NPTS];
-    const PsychoacousticParameters *psychParams;
-
-    push_wmops( "apply_sns_on_noise_shape" );
-
-    scfs_bg = &st->hTonalMDCTConc->scaleFactorsBackground_fx[0];
-    psychParams = st->hTonalMDCTConc->psychParams;
-    hFdCngCom = st->hFdCngDec->hFdCngCom;
-
-    IF( EQ_32( whitening_mode, ON_FIRST_LOST_FRAME ) )
-    {
-        IF( GT_16( st->core, TCX_20_CORE ) )
-        {
-            inc = 2;
-            move16();
-        }
-        ELSE
-        {
-            inc = 1;
-            move16();
-        }
-    }
-    ELSE
-    {
-        IF( GT_16( st->last_core, TCX_20_CORE ) )
-        {
-            inc = 2;
-            move16();
-        }
-        ELSE
-        {
-            inc = 1;
-            move16();
-        }
-    }
-    start_idx = shr( hFdCngCom->startBand, sub( inc, 1 ) );
-    stop_idx = shr( L_frame, sub( inc, 1 ) );
-    noiseLevelPtr = hFdCngCom->cngNoiseLevel;
-    noiseLevelPtr_exp = hFdCngCom->cngNoiseLevelExp;
-    move16();
-
-    set32_fx( whitenend_noise_shape, 0, start_idx );
-    FOR( Word16 j = start_idx; j < stop_idx; j++ )
-    {
-        whitenend_noise_shape[j] = L_shr( *noiseLevelPtr, 3 );
-        move32();
-        noiseLevelPtr += inc;
-    }
-
-    IF( EQ_32( whitening_mode, ON_FIRST_LOST_FRAME ) )
-    {
-        Word32 scf[SNS_NPTS];
-
-        sns_compute_scf_fx( whitenend_noise_shape, psychParams, L_frame, scf, sub( sub( 31, noiseLevelPtr_exp ), 3 ) );
-
-        sns_interpolate_scalefactors_fx( scfs_int, scf, ENC );
-        sns_interpolate_scalefactors_fx( scfs_bg, scf, DEC );
-
-        scfs_for_shaping = &scfs_int[0]; // Q16
-    }
-    ELSE /* whitening_mode == ON_FIRST_GOOD_FRAME */
-    {
-        scfs_for_shaping = &scfs_bg[0]; // Q16
-    }
-
-    IF( sum32_sat( scfs_for_shaping, FDNS_NPTS ) > 0 )
-    {
-        q_wns = sub( sub( 31, noiseLevelPtr_exp ), 3 );
-        sns_shape_spectrum_fx( whitenend_noise_shape, &q_wns, psychParams, scfs_for_shaping, Q16, L_frame, NULL );
-
-        IF( GT_16( add( q_wns, 1 ), sub( 31, hFdCngCom->cngNoiseLevelExp ) ) )
-        {
-            FOR( i = 0; i < sub( stop_idx, start_idx ); i++ )
-            {
-                hFdCngCom->cngNoiseLevel[i] = L_shr( whitenend_noise_shape[start_idx + i], sub( add( q_wns, hFdCngCom->cngNoiseLevelExp ), 30 ) ); //(q_wns + 1)
-                move32();
-            }
-        }
-        ELSE
-        {
-            Copy32( whitenend_noise_shape + start_idx, hFdCngCom->cngNoiseLevel, sub( stop_idx, start_idx ) );
-
-            scale_sig32( hFdCngCom->cngNoiseLevel + sub( stop_idx, start_idx ), sub( FFTCLDFBLEN, sub( stop_idx, start_idx ) ), sub( add( q_wns, hFdCngCom->cngNoiseLevelExp ), 30 ) );
-
-            hFdCngCom->cngNoiseLevelExp = sub( Q30, q_wns ); // Exponent = 31 - (q_wns + 1)
-            move16();
-        }
-    }
-    ELSE
-    {
-        set32_fx( hFdCngCom->cngNoiseLevel, 0, sub( stop_idx, start_idx ) );
-    }
-
-    pop_wmops();
-}
diff --git a/lib_dec/tonalMDCTconcealment_fx.c b/lib_dec/tonalMDCTconcealment_fx.c
index 15ce08803e3f53618cab0aee33dc4fd515293403..fd6cf7835e410e763405e49170ac72cb81337ee2 100644
--- a/lib_dec/tonalMDCTconcealment_fx.c
+++ b/lib_dec/tonalMDCTconcealment_fx.c
@@ -14,7 +14,6 @@
 #include "cnst.h"
 #include "prot_fx.h"
 #include "stat_com.h"
-#include "prot.h"
 #include "ivas_prot_fx.h"
 
 #define CROSSFADE_THRESHOLD ( 32762 ) // close to 1.0f in Q15 such that (x == 1.0f) is true
@@ -104,18 +103,6 @@ ivas_error TonalMDCTConceal_Init(
 
     hTonalMDCTConc->nScaleFactors = nScaleFactors;
     move16();
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    PMTE()
-    set_zero( hTonalMDCTConc->scaleFactorsBackground, FDNS_NPTS );
-    PsychoacousticParameters_Init( INT_FS_16k, L_FRAME16k, 64, 1, 1, &hTonalMDCTConc->psychParamsTCX20 );
-    PsychoacousticParameters_Init( INT_FS_16k, L_FRAME16k / 2, 64, 0, 1, &hTonalMDCTConc->psychParamsTCX10 );
-    hTonalMDCTConc->psychParams = NULL;
-    hTonalMDCTConc->scf_fadeout = 1.0f;
-    hTonalMDCTConc->last_block_nrg = 0.0f;
-    hTonalMDCTConc->curr_noise_nrg = 0.0f;
-    hTonalMDCTConc->faded_signal_nrg = 0.0f;
-
-#endif
     /* Offset the pointer to the end of buffer, so that pTCI is not destroyed when
        new time samples are stored in lastPcmOut */
     move16();
@@ -147,28 +134,20 @@ ivas_error TonalMDCTConceal_Init_ivas_fx(
 
     hTonalMDCTConc->tcx_cfg = hTcxCfg;
     hTonalMDCTConc->lastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[0];
-#ifdef MSAN_FIX
     set16_fx( hTonalMDCTConc->lastBlockData.spectralData, 0, L_FRAME_MAX );
-#endif
     move16();
     hTonalMDCTConc->secondLastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[1];
-#ifdef MSAN_FIX
     set16_fx( hTonalMDCTConc->secondLastBlockData.spectralData, 0, L_FRAME_MAX );
-#endif
     move16();
     hTonalMDCTConc->secondLastPowerSpectrum = hTonalMDCTConc->secondLastBlockData.spectralData;
     move16();
     hTonalMDCTConc->secondLastPowerSpectrum_exp = hTonalMDCTConc->secondLastBlockData.spectralData_exp;
     move16();
     hTonalMDCTConc->lastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[0];
-#ifdef MSAN_FIX
     set16_fx( hTonalMDCTConc->lastBlockData.scaleFactors, 0, FDNS_NPTS );
-#endif
     move16();
     hTonalMDCTConc->secondLastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[1];
-#ifdef MSAN_FIX
     set16_fx( hTonalMDCTConc->secondLastBlockData.scaleFactors, 0, FDNS_NPTS );
-#endif
     move16();
     hTonalMDCTConc->lastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[0];
     move16();
@@ -207,9 +186,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx(
     hTonalMDCTConc->nScaleFactors = nScaleFactors;
     move16();
 
-    //#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    // PMTE()
-    // To be uncommented when field of fixed type is added for scaleFactorsBackground
     set32_fx( hTonalMDCTConc->scaleFactorsBackground_fx, 0, FDNS_NPTS );
     hTonalMDCTConc->scf_fadeout = 16384 /*1.000000 Q14*/;
     PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k, 64, 1, 1, &hTonalMDCTConc->psychParamsTCX20 );
@@ -235,9 +211,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx(
     move16();
     /* just the second half of the second last pcm output is needed */
 
-#ifdef MSAN_FIX
     set16_fx( hTonalMDCTConc->timeDataBuffer, 0, ( 3 * L_FRAME_MAX ) / 2 );
-#endif
     hTonalMDCTConc->secondLastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - ( 3 * min( L_FRAME_MAX, nSamples ) / 2 )];
     hTonalMDCTConc->lastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - min( L_FRAME_MAX, nSamples )];
     /* If the second last frame was lost, we reuse saved TonalComponentsInfo and don't update pcm buffers */
@@ -253,12 +227,7 @@ void TonalMDCTConceal_SaveFreqSignal(
     Word16 nNewSamplesCore,     // Q0
     const Word16 *scaleFactors, // Q31-scaleFactors_exp
     const Word16 *scaleFactors_exp,
-    const Word16 gain_tcx_exp
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    ,
-    const int16_t infoIGFStartLine
-#endif
-)
+    const Word16 gain_tcx_exp )
 {
     Word16 *temp;
     Word16 nOldSamples, tmp_exp, s, i, max_exp;
@@ -351,20 +320,6 @@ void TonalMDCTConceal_SaveFreqSignal(
     test();
     IF( ( nNewSamples > 0 ) && ( LE_16( nNewSamples, 2 * L_FRAME_MAX ) ) )
     {
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-        int16_t i;
-        PMTE()
-        hTonalMDCTConc->last_block_nrg_flt = 0.0f;
-        for ( i = 0; i < infoIGFStartLine; i++ )
-        {
-            hTonalMDCTConc->lastBlockData.spectralData[i] = mdctSpectrum[i];
-            hTonalMDCTConc->last_block_nrg_flt += mdctSpectrum[i] * mdctSpectrum[i];
-        }
-        for ( ; i < nNewSamples; i++ )
-        {
-            hTonalMDCTConc->lastBlockData.spectralData[i] = mdctSpectrum[i];
-        }
-#else
         /* Store new data */
         s = getScaleFactor32( mdctSpectrum, nNewSamples );
 
@@ -386,7 +341,6 @@ void TonalMDCTConceal_SaveFreqSignal(
             move16();
         }
         hTonalMDCTConc->lastBlockData.spectralData_exp = sub( mdctSpectrum_exp, s );
-#endif
         move16();
         hTonalMDCTConc->lastBlockData.gain_tcx_exp = gain_tcx_exp;
 
@@ -496,17 +450,16 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
     IF( ( nNewSamples > 0 ) && ( LE_16( nNewSamples, 2 * L_FRAME_MAX ) ) )
     {
         /* Store new data */
-        hTonalMDCTConc->last_block_nrg = 0;
-        move32();
-
+        Word64 W_tmp = 0;
+        move64();
         FOR( i = 0; i < infoIGFStartLine; i++ )
         {
-            Word16 tmp = extract_h( mdctSpectrum[i] );
-            hTonalMDCTConc->last_block_nrg = L_add( hTonalMDCTConc->last_block_nrg,
-                                                    L_shr( L_mult0( tmp, tmp ), 16 ) ); // Q31-last_block_nrg_exp
-            move32();
+            W_tmp = W_mac_32_16( W_tmp, Mpy_32_32( mdctSpectrum[i], mdctSpectrum[i] ), 1 ); // exp: mdctSpectrum_exp + mdctSpectrum_exp - 1
         }
-        hTonalMDCTConc->last_block_nrg_exp = sub( 31, sub( shl( sub( 15, mdctSpectrum_exp ), 1 ), 16 ) );
+        s = W_norm( W_tmp );
+        hTonalMDCTConc->last_block_nrg = W_extract_h( W_shl( W_tmp, s ) ); // exp:add( sub( shl( mdctSpectrum_exp, 1 ), s ), 31 )
+        move32();
+        hTonalMDCTConc->last_block_nrg_exp = add( sub( shl( mdctSpectrum_exp, 1 ), s ), 31 );
         move16();
 
         /* Store new data */
@@ -555,11 +508,12 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
 }
 
 
-TONALMDCTCONCEAL_ERROR TonalMDCTConceal_UpdateState( TonalMDCTConcealPtr hTonalMDCTConc,
-                                                     Word16 nNewSamples, // Q0
-                                                     Word32 pitchLag,    // Qx
-                                                     Word16 badBlock,    // Q0
-                                                     Word8 tonalConcealmentActive )
+void TonalMDCTConceal_UpdateState(
+    TonalMDCTConcealPtr hTonalMDCTConc,
+    Word16 nNewSamples, // Q0
+    Word32 pitchLag,    // Qx
+    Word16 badBlock,    // Q0
+    Word8 tonalConcealmentActive )
 {
     Word8 newBlockIsValid;
 
@@ -599,13 +553,16 @@ TONALMDCTCONCEAL_ERROR TonalMDCTConceal_UpdateState( TonalMDCTConcealPtr hTonalM
     hTonalMDCTConc->lastPitchLag = pitchLag;
     move32();
 
-    return TONALMDCTCONCEAL_OK;
+    return;
 }
-static void FindPhases(                                           /* o: currenc phase   [-pi;pi]        2Q13 */
-                        TonalMDCTConcealPtr const hTonalMDCTConc, /* i: pointer to internal structure        */
-                        Word32 secondLastMDCT[],                  /* i: MDST spectrum data             Qx +31 -diff_exp     */
-                        Word32 secondLastMDST[],                  /* i: MDCT spectrum data             Qx      */
-                        Word16 diff_exp )                         /* i: exp_MDST - exp_MDCT                  */
+
+
+/* o: currenc phase   [-pi;pi]        2Q13 */
+static void FindPhases(
+    TonalMDCTConcealPtr const hTonalMDCTConc, /* i: pointer to internal structure        */
+    Word32 secondLastMDCT[],                  /* i: MDST spectrum data             Qx +31 -diff_exp     */
+    Word32 secondLastMDST[],                  /* i: MDCT spectrum data             Qx      */
+    Word16 diff_exp )                         /* i: exp_MDST - exp_MDCT                  */
 {
     Word16 i;
     Word16 l;
@@ -625,6 +582,8 @@ static void FindPhases(                                           /* o: currenc
             move16();
         }
     }
+
+    return;
 }
 
 #define BANDWIDTH 7.0f
@@ -635,9 +594,10 @@ static void FindPhases(                                           /* o: currenc
 #define N         931758243          /* FL2WORD32(sin(EVS_PI/BANDWIDTH)); */
 #define J         31946              /* FL2WORD16(sin((3*EVS_PI)/BANDWIDTH)); */
 
-static void FindPhaseDifferences(                                           /* o: Phase difference [-pi;pi]         2Q13*/
-                                  TonalMDCTConcealPtr const hTonalMDCTConc, /* i: Pointer to internal structure        */
-                                  Word32 powerSpectrum[] )                  /* i: Power spectrum data Qx                 */
+/* o: Phase difference [-pi;pi]         2Q13*/
+static void FindPhaseDifferences(
+    TonalMDCTConcealPtr const hTonalMDCTConc, /* i: Pointer to internal structure        */
+    Word32 powerSpectrum[] )                  /* i: Power spectrum data Qx                 */
 {
     Word16 i, k;
     Word16 *phaseDiff;
@@ -815,6 +775,7 @@ static void ivas_CalcPowerSpecAndDetectTonalComponents_fx(
                                    hTonalMDCTConc->lastBlockData.scaleFactors_exp,
                                    hTonalMDCTConc->lastBlockData.scaleFactors_max_e,
                                    powerSpectrum,
+                                   powerSpectrum_exp,
                                    nSamples,
                                    hTonalMDCTConc->nSamplesCore,
                                    floorPowerSpectrum, psychParamsCurrent, element_mode );
@@ -885,11 +846,7 @@ static void ivas_CalcPowerSpecAndDetectTonalComponents_fx(
         powerSpectrum_exp = add( powerSpectrum_exp, 3 );
         FOR( i = hTonalMDCTConc->nSamplesCore; i < nSamples; i++ )
         {
-#ifdef BASOP_NOGLOB
             powerSpectrum[i] = L_shl_sat( Mpy_32_16_1( powerSpectrum[i], invScaleFactors[nBands - 1] ), invScaleFactors_exp[nBands - 1] ); // Q(31 - powerSpectrum_exp)
-#else
-            powerSpectrum[i] = L_shl( Mpy_32_16_1( powerSpectrum[i], invScaleFactors[nBands - 1] ), invScaleFactors_exp[nBands - 1] );
-#endif
             move32();
         }
 
@@ -900,11 +857,7 @@ static void ivas_CalcPowerSpecAndDetectTonalComponents_fx(
         /* 16 bits are now enough for storing the power spectrum */
         FOR( i = 0; i < nSamples; i++ )
         {
-#ifdef BASOP_NOGLOB
             hTonalMDCTConc->secondLastPowerSpectrum[i] = round_fx_o( powerSpectrum[i], &Overflow ); // Q31 - powerSpectrum_exp
-#else
-            hTonalMDCTConc->secondLastPowerSpectrum[i] = round_fx( powerSpectrum[i] );
-#endif
             move32();
         }
 
@@ -920,12 +873,7 @@ static void CalcPowerSpecAndDetectTonalComponents(
     Word32 secondLastMDCT[], // Q31-secondLastMDCT_exp
     Word16 secondLastMDCT_exp,
     Word32 const pitchLag, /*15Q16*/
-    Word16 element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
-)
+    Word16 element_mode )
 {
     Word16 nSamples;
     Word16 i;
@@ -1015,38 +963,19 @@ static void CalcPowerSpecAndDetectTonalComponents(
 
 
         /* here mdct_shaping() is intentionally used rather then mdct_shaping_16() */
-#ifdef IVAS_CODE_MDCT_GSHAPE
-        IF( psychParamsCurrent == NULL )
-#endif
         {
             mdct_shaping( powerSpectrum, hTonalMDCTConc->nSamplesCore, invScaleFactors, invScaleFactors_exp );
         }
-#ifdef IVAS_CODE_MDCT_GSHAPE
-        ELSE
-        {
-            PMTE()
-            sns_shape_spectrum( powerSpectrum, psychParamsCurrent, invScaleFactors, hTonalMDCTConc->nSamplesCore );
-            nBands = psychParamsCurrent->nBands;
-        }
-#endif
         FOR( i = hTonalMDCTConc->nSamplesCore; i < nSamples; i++ )
         {
-#ifdef BASOP_NOGLOB
             powerSpectrum[i] = L_shl_sat( Mpy_32_16_1( powerSpectrum[i], invScaleFactors[FDNS_NPTS - 1] ), invScaleFactors_exp[FDNS_NPTS - 1] ); // powerSpectrum_exp+ 2*invScaleFactors_exp -15
-#else
-            powerSpectrum[i] = L_shl( Mpy_32_16_1( powerSpectrum[i], invScaleFactors[FDNS_NPTS - 1] ), invScaleFactors_exp[FDNS_NPTS - 1] );
-#endif
             move32();
         }
 
         /* 16 bits are now enough for storing the power spectrum */
         FOR( i = 0; i < nSamples; i++ )
         {
-#ifdef BASOP_NOGLOB
             hTonalMDCTConc->secondLastPowerSpectrum[i] = round_fx_o( powerSpectrum[i], &Overflow ); // Q31-powerSpectrum_exp
-#else
-            hTonalMDCTConc->secondLastPowerSpectrum[i] = round_fx( powerSpectrum[i] );
-#endif
             move32();
         }
 
@@ -1089,12 +1018,7 @@ void TonalMDCTConceal_Detect(
     const TonalMDCTConcealPtr hTonalMDCTConc,
     const Word32 pitchLag, /*15Q16*/
     Word16 *numIndices,
-    Word16 element_mode
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
-)
+    Word16 element_mode )
 {
     Word32 secondLastMDST[L_FRAME_MAX];
     Word32 secondLastMDCT[L_FRAME_MAX];
@@ -1166,9 +1090,6 @@ void TonalMDCTConceal_Detect(
             {
                 /* If the second last frame was also lost, it is expected that pastTimeSignal could hold a bit different signal (e.g. including fade-out) from the one stored in TonalMDCTConceal_SaveTimeSignal. */
                 /* That is why we reuse the already stored information about the concealed spectrum in the second last frame */
-#ifdef IVAS_CODE_MDCT_GSHAPE
-                IF( psychParamsCurrent == NULL )
-#endif
                 {
                     nSamples = hTonalMDCTConc->nNonZeroSamples;
                     move16();
@@ -1176,13 +1097,6 @@ void TonalMDCTConceal_Detect(
                                      hTonalMDCTConc->secondLastBlockData.scaleFactors, hTonalMDCTConc->secondLastBlockData.scaleFactors_exp,
                                      hTonalMDCTConc->secondLastBlockData.scaleFactors_max_e, powerSpectrum );
                 }
-#ifdef IVAS_CODE_MDCT_GSHAPE
-                ELSE
-                {
-                    sns_shape_spectrum( powerSpectrum, psychParamsCurrent, hTonalMDCTConc->secondLastBlockData.scaleFactors, hTonalMDCTConc->nSamplesCore );
-                    nBands = psychParamsCurrent->nBands;
-                }
-#endif
                 powerSpectrum_exp = getScaleFactor32( powerSpectrum, nSamples );
                 powerSpectrum_exp = sub( powerSpectrum_exp, 3 ); /*extra 3 bits of headroom for MA filter in getEnvelope*/
 
@@ -1235,9 +1149,7 @@ void TonalMDCTConceal_Detect_ivas_fx(
     Word16 element_mode )
 {
     Word32 secondLastMDST[L_FRAME_MAX];
-#ifdef MSAN_FIX
     set32_fx( secondLastMDST, 0, L_FRAME_MAX );
-#endif
     Word32 secondLastMDCT[L_FRAME_MAX];
     Word16 secondLastMDCT_exp;
     Word32 *powerSpectrum = secondLastMDST;
@@ -1245,9 +1157,7 @@ void TonalMDCTConceal_Detect_ivas_fx(
     Word16 nSamples;
     // Word16 nBands;
     Word32 sns_int_scf_fx[FDNS_NPTS];
-#ifdef MSAN_FIX
     set32_fx( sns_int_scf_fx, 0, FDNS_NPTS );
-#endif
 
     nSamples = hTonalMDCTConc->nSamples;
     move16();
@@ -1311,14 +1221,10 @@ void TonalMDCTConceal_Detect_ivas_fx(
             {
                 /* If the second last frame was also lost, it is expected that pastTimeSignal could hold a bit different signal (e.g. including fade-out) from the one stored in TonalMDCTConceal_SaveTimeSignal. */
                 /* That is why we reuse the already stored information about the concealed spectrum in the second last frame */
-#ifdef MSAN_FIX
                 Word16 temp_power_spectrum_q = 0;
-#else
-                Word16 power_spectrum_q;
-#endif
                 nSamples = hTonalMDCTConc->nNonZeroSamples;
                 move16();
-                Copy_Scale_sig_16_32( hTonalMDCTConc->secondLastPowerSpectrum, powerSpectrum, nSamples, Q15 );
+                Copy_Scale_sig_16_32_DEPREC( hTonalMDCTConc->secondLastPowerSpectrum, powerSpectrum, nSamples, Q15 );
                 temp_power_spectrum_q = add( Q15, sub( 15, hTonalMDCTConc->secondLastPowerSpectrum_exp ) );
                 IF( psychParamsCurrent == NULL )
                 {
@@ -1336,6 +1242,8 @@ void TonalMDCTConceal_Detect_ivas_fx(
                         powerSpectrum[i] = Mpy_32_32( t, t );                          // Q(31-secondLastMDST_exp+powerSpectrum_exp)
                         move32();
                     }
+                    powerSpectrum_exp = 0;
+                    move16();
                 }
                 ELSE
                 {
@@ -1353,6 +1261,7 @@ void TonalMDCTConceal_Detect_ivas_fx(
                         powerSpectrum[i] = Mpy_32_32( t, t );           // 2*(Q31 - powerSpectrum_exp -3)-31
                         move32();
                     }
+                    powerSpectrum_exp = sub( 31, sub( shl( sub( Q31 - 3, powerSpectrum_exp ), 1 ), 31 ) );
                 }
 
                 ivas_RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak,
@@ -1369,6 +1278,7 @@ void TonalMDCTConceal_Detect_ivas_fx(
                                                hTonalMDCTConc->lastBlockData.scaleFactors_exp,
                                                hTonalMDCTConc->lastBlockData.scaleFactors_max_e,
                                                powerSpectrum,
+                                               powerSpectrum_exp,
                                                nSamples,
                                                hTonalMDCTConc->nSamplesCore,
                                                extract_l( Mpy_32_16_1( L_mult0( hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples ), 82 ) ), element_mode, psychParamsCurrent ); /* floorPowerSpectrum */
@@ -1406,12 +1316,15 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
     Word16 rnd;
 
     Word16 tmp, g, tilt, exp_last, exp_noise, tiltFactor, crossfadeGain, e_crossfadeGain;
-    Word32 L_tmp, L_tmp2, nrgNoiseInLastFrame, nrgWhiteNoise;
+    Word32 L_tmp, L_tmp1, L_tmp2, nrgNoiseInLastFrame, nrgWhiteNoise;
     Word16 inv_exp, inv_samples, exp;
     Word32 last_block_nrg_correct;
     Word16 last_block_nrg_correct_e;
     Word32 max_concealment_value;
     Word16 max_spectral_value;
+    Word64 sum1, sum2;
+    Word16 num16, den16, exp1, exp2;
+    Word16 shift1, shift2;
 
     crossfadeGain = crossfadeGain_const;
     move16();
@@ -1444,11 +1357,7 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
     inv_samples = Inv16( hTonalMDCTConc->lastBlockData.nSamples, &inv_exp );                                                                 // Q31-inv_exp
     tiltFactor = round_fx( BASOP_Util_fPow( L_max( L_tmp, L_deposit_h( tiltCompFactor ) ), 0, L_deposit_h( inv_samples ), inv_exp, &exp ) ); // Q15 - exp
     BASOP_SATURATE_WARNING_OFF_EVS                                                                                                           /*next op may result in 32768*/
-#ifdef BASOP_NOGLOB
-        tiltFactor = shl_sat( tiltFactor, exp ); // Q15
-#else
-        tiltFactor = shl( tiltFactor, exp );
-#endif
+        tiltFactor = shl_sat( tiltFactor, exp );                                                                                             // Q15
     BASOP_SATURATE_WARNING_ON_EVS
     tilt = MAX16B;
     move16();
@@ -1521,11 +1430,7 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
                     num = L_shr( num, 1 ); // Q31-exp -1
                     exp = add( exp, 1 );
                 }
-#ifdef BASOP_NOGLOB
                 tmp = div_l( num, round_fx_sat( den ) );
-#else
-                tmp = div_l( num, round_fx( den ) );
-#endif
                 tmp = Sqrt16( tmp, &exp );
                 g = mult_r( g, tmp ); // exponent of g = exp
 
@@ -1626,9 +1531,12 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
                         move16();
                         Word32 y = concealment_noise[l]; // concealment_noise_e
                         move32();
-                        last_block_nrg_correct = L_add( last_block_nrg_correct, Mpy_32_16_1( L_msu( 0, x, fac ), x ) );                                                                                                   // exp = 2 * x_exp + ld
-                        y = L_negate( Mpy_32_32( y, y ) );                                                                                                                                                                // Q31-2* concealment_noise_e
-                        hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, y, 2 * concealment_noise_e, &hTonalMDCTConc->curr_noise_nrg_exp ); // Q31- hTonalMDCTConc->curr_noise_nrg_exp
+                        shift1 = norm_l( y );
+                        y = L_shl( y, shift1 );
+
+                        last_block_nrg_correct = L_add( last_block_nrg_correct, Mpy_32_16_1( L_msu( 0, x, fac ), x ) );                                                                                                                        // exp = 2 * x_exp + ld
+                        y = L_negate( Mpy_32_32( y, y ) );                                                                                                                                                                                     // Q31-(2* concealment_noise_e + shift1)
+                        hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, y, shl( sub( concealment_noise_e, shift1 ), 1 ), &hTonalMDCTConc->curr_noise_nrg_exp ); // Q31- hTonalMDCTConc->curr_noise_nrg_exp
                         move32();
                     }
                 }
@@ -1694,29 +1602,9 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
             /* actual fadeout is done in this case */
             ELSE
             {
-                Word32 num, den;
-                Word16 exp_num, exp_den;
-
-                exp_num = cngLevelBackgroundTrace_bfi_e;
-                move16();
-                exp_den = hTonalMDCTConc->curr_noise_nrg_exp;
-                move16();
-
-                ld = norm_l( cngLevelBackgroundTrace_bfi );
-                num = L_shl( cngLevelBackgroundTrace_bfi, ld ); // Q15 - exp_num + ld
-                exp_num = sub( exp_num, ld );
-                ld = norm_l( hTonalMDCTConc->curr_noise_nrg );
-                den = L_shl( hTonalMDCTConc->curr_noise_nrg, ld ); // Q15 - exp_den + ld
-                exp_den = sub( exp_den, ld );
-
-                exp = sub( exp_num, exp_den );
+                tmp = BASOP_Util_Divide3232_Scale( cngLevelBackgroundTrace_bfi, hTonalMDCTConc->curr_noise_nrg, &exp );
+                exp = add( exp, sub( cngLevelBackgroundTrace_bfi_e, hTonalMDCTConc->curr_noise_nrg_exp ) );
 
-                IF( GT_32( num, den ) )
-                {
-                    num = L_shr( num, 1 ); // Q31- exp -1
-                    exp = add( exp, 1 );
-                }
-                tmp = div_l( num, round_fx( den ) );
                 tmp = Sqrt16( tmp, &exp );
                 g = mult_r( g, tmp ); // exponent of g = exp
 
@@ -1845,32 +1733,12 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
         test();
         IF( GT_32( hTonalMDCTConc->faded_signal_nrg, 0 ) && flag )
         {
-            Word16 num_exp, den_exp;
-            Word32 num, den;
+            Word16 num_exp;
+            Word32 num;
 
             num = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->last_block_nrg, hTonalMDCTConc->last_block_nrg_exp, L_negate( last_block_nrg_correct ), last_block_nrg_correct_e, &num_exp ); // Q31-num_exp
-
-            den = hTonalMDCTConc->faded_signal_nrg; // Q31 - hTonalMDCTConc->faded_signal_nrg_exp
-            move32();
-            den_exp = hTonalMDCTConc->faded_signal_nrg_exp;
-            move16();
-
-            ld = norm_l( num );
-            num = L_shl( num, ld ); // Q31-num_exp + ld
-            num_exp = sub( num_exp, ld );
-
-            ld = norm_l( den );
-            den = L_shl( den, ld ); // Q31-den_exp + ld
-            den_exp = sub( den_exp, ld );
-
-            exp = sub( num_exp, den_exp );
-
-            IF( GT_32( num, den ) )
-            {
-                num = L_shr( num, 1 ); // Q31- exp -1
-                exp = add( exp, 1 );
-            }
-            tmp = div_l( num, extract_h( den ) );
+            tmp = BASOP_Util_Divide3232_Scale( num, hTonalMDCTConc->faded_signal_nrg, &exp );
+            exp = add( exp, sub( num_exp, hTonalMDCTConc->faded_signal_nrg_exp ) );
             tmp = Sqrt16( tmp, &exp );
 
             FOR( i = 0; i < crossOverFreq; i++ )
@@ -1882,28 +1750,36 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
         }
     }
     ELSE{
-        IF( !tonalConcealmentActive ){
-            ld = sub( 14, norm_s( hTonalMDCTConc->lastBlockData.nSamples ) );
-    fac = shr( -32768, ld );
-
+        IF( tonalConcealmentActive == 0 ){
+            sum1 = 0;
+    sum2 = 0;
+    move64();
+    move64();
     FOR( i = 0; i < crossOverFreq; i++ )
     {
-        Word16 x = hTonalMDCTConc->lastBlockData.spectralData[i];
-        Word32 y;
-        rnd = extract_l( L_mac0( 13849, rnd, 31821 ) ); /* Q0 */
-        y = L_mult( tilt, rnd );                        /*  15Q16 */
+        Word16 x;
+        /*x = hTonalMDCTConc->lastBlockData.spectralData[i];
+        nrgNoiseInLastFrame += x * x;*/
+        sum1 = W_mac0_16_16( sum1, hTonalMDCTConc->lastBlockData.spectralData[i], hTonalMDCTConc->lastBlockData.spectralData[i] ); // Q: 2*(15-hTonalMDCTConc->lastBlockData.spectralData_exp)
 
-        nrgNoiseInLastFrame = L_add( nrgNoiseInLastFrame, Mpy_32_16_1( L_msu( 0, x, fac ), x ) ); // Q(31 - x_exp - ld) + Q(15 - x_exp) - 15 = Q(31 - x_exp * 2 - ld)
-        x = round_fx( y );                                                                        /* 15Q16 -> 15Q0 */
-        nrgWhiteNoise = L_add( nrgWhiteNoise, Mpy_32_16_1( L_msu( 0, x, fac ), x ) );             // Q(31 - (15 - 0) - ld) + Q(0) - 15 = Q(1 - ld)
+        /* rnd = own_random(&rnd); */
+        rnd = extract_l( L_mac0( 13849, rnd, 31821 ) ); /* Q0 */
 
-        mdctSpectrum[i] = y; /*  15Q16 */
+        /* mdctSpectrum[i] = tilt * rnd; */
+        mdctSpectrum[i] = L_mult( tilt, rnd ); // Q16
         move32();
 
+        /* tilt *= tiltFactor; */
         tilt = mult_r( tilt, tiltFactor ); /* Q15 */
+
+        /* nrgWhiteNoise += mdctSpectrum[i] * mdctSpectrum[i]; */
+        x = round_fx( mdctSpectrum[i] );   // Q0
+        sum2 = W_mac0_16_16( sum2, x, x ); // Q0
     }
+    *mdctSpectrum_exp = 15;
+    move16();
 
-    IF( nrgNoiseInLastFrame == 0 )
+    IF( sum1 /* nrgNoiseInLastFrame */ == 0 )
     {
         set32_fx( mdctSpectrum, 0, crossOverFreq );
         *mdctSpectrum_exp = SPEC_EXP_DEC;
@@ -1911,85 +1787,70 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
     }
     ELSE
     {
-        exp_last = add( ld, shl( hTonalMDCTConc->lastBlockData.spectralData_exp, 1 ) );
-        exp_noise = add( ld, 30 );
-
-        IF( nrgWhiteNoise > 0 )
+        IF( g == 0 )
         {
-            ld = norm_l( nrgNoiseInLastFrame );
-            nrgNoiseInLastFrame = L_shl( nrgNoiseInLastFrame, ld ); // Q31- exp_last + ld
-            exp_last = sub( exp_last, ld );
-            ld = norm_l( nrgWhiteNoise );
-            nrgWhiteNoise = L_shl( nrgWhiteNoise, ld ); // Q31 - exp_noise + ld
-            exp_noise = sub( exp_noise, ld );
-
-            exp = sub( exp_last, exp_noise );
-
-            IF( GT_32( nrgNoiseInLastFrame, nrgWhiteNoise ) )
-            {
-                nrgNoiseInLastFrame = L_shr( nrgNoiseInLastFrame, 1 ); // Q31-exp -1
-                exp = add( exp, 1 );
-            }
-            tmp = div_l( nrgNoiseInLastFrame, round_fx( nrgWhiteNoise ) ); // Q15
-            tmp = Sqrt16( tmp, &exp );
-            g = mult_r( g, tmp ); // exponent of g = exp
-
-            L_tmp = L_deposit_h( 0 );
-            ld = sub( hTonalMDCTConc->lastBlockData.spectralData_exp, 15 );
-            exp = sub( ld, exp );
-
-            IF( exp > 0 )
-            {
-                g = shr( g, exp ); // Q15 - exp
-                *mdctSpectrum_exp = hTonalMDCTConc->lastBlockData.spectralData_exp;
-                move16();
-            }
-            ELSE
-            {
-                crossfadeGain = shl( crossfadeGain, exp ); // Q15-e_crossfadeGain+ exp
-                e_crossfadeGain = sub( e_crossfadeGain, exp );
-                *mdctSpectrum_exp = add( e_crossfadeGain, hTonalMDCTConc->lastBlockData.spectralData_exp );
-                move16();
-            }
-            /*make a headroom for mdct_shaping*/
-            exp = sub( *mdctSpectrum_exp, SPEC_EXP_DEC );
-            /* assert(exp < 0);*/
-            IF( exp < 0 )
-            {
-                *mdctSpectrum_exp = SPEC_EXP_DEC;
-                move16();
-            }
-            ELSE
+            *mdctSpectrum_exp = add( add( hTonalMDCTConc->lastBlockData.spectralData_exp, e_crossfadeGain ), 31 - SPEC_EXP_DEC );
+            move16();
+            FOR( i = 0; i < crossOverFreq; i++ )
             {
-                exp = 0;
-                move16();
+                /* mdctSpectrum[i] = g * mdctSpectrum[i] + crossfadeGain * hTonalMDCTConc->lastBlockData.spectralData[i]; */
+                L_tmp = L_mult( crossfadeGain, hTonalMDCTConc->lastBlockData.spectralData[i] ); // exp: hTonalMDCTConc->lastBlockData.spectralData_exp+e_crossfadeGain
+                if ( mdctSpectrum[i] <= 0 )
+                {
+                    /* mdctSpectrum[i] = g * mdctSpectrum[i] - crossfadeGain * hTonalMDCTConc->lastBlockData.spectralData[i]; */
+                    L_tmp = L_negate( L_tmp ); // exp: hTonalMDCTConc->lastBlockData.spectralData_exp+e_crossfadeGain
+                }
+                /* headroom for mdct_shaping */
+                mdctSpectrum[i] = L_shr( L_tmp, 31 - SPEC_EXP_DEC ); // *mdctSpectrum_exp
+                move32();
             }
         }
-        FOR( i = 0; i < crossOverFreq; i++ )
+        ELSE
         {
-            Word16 const x = hTonalMDCTConc->lastBlockData.spectralData[i]; // Q15 - spectralData_exp
-            move16();
-            Word32 const y = mdctSpectrum[i]; // Q31-mdctSpectrum_exp
-            move32();
-
-            IF( g > 0 )
+            IF( sum2 /* nrgWhiteNoise */ > 0 )
             {
-                L_tmp = Mpy_32_16_1( y, g ); // Q31-mdctSpectrum_exp- spectralData_exp
+                exp1 = sub( W_norm( sum1 ), 1 );
+                num16 = extract_h( W_extract_h( W_shl( sum1, exp1 ) ) ); // nrgNoiseInLastFrame -> Q: 2*(15-hTonalMDCTConc->lastBlockData.spectralData_exp)+exp1-48
+                exp2 = W_norm( sum2 );
+                den16 = extract_h( W_extract_h( W_shl( sum2, exp2 ) ) ); // nrgWhiteNoise -> Q: exp2-48
+
+                /* sqrt( nrgNoiseInLastFrame / nrgWhiteNoise ) */
+                tmp = div_s( num16, den16 );                                                                         // Q: 15+(2*(15-hTonalMDCTConc->lastBlockData.spectralData_exp)+exp1-48)-(exp2-48)
+                exp = sub( sub( shl( hTonalMDCTConc->lastBlockData.spectralData_exp, 1 ), 30 ), sub( exp1, exp2 ) ); // exp of tmp
+                tmp = Sqrt16( tmp, &exp );
+                g = mult_r( g, tmp ); // exponent of g = exp
             }
 
-            L_tmp2 = L_msu( L_tmp, crossfadeGain, x ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp
-            IF( GT_32( y, 0 ) )
+            exp1 = add( *mdctSpectrum_exp, exp );
+            exp2 = add( hTonalMDCTConc->lastBlockData.spectralData_exp, e_crossfadeGain );
+            exp = add( s_max( exp1, exp2 ), 1 );
+            shift1 = sub( exp1, exp );
+            shift2 = sub( exp2, exp );
+
+            FOR( i = 0; i < crossOverFreq; i++ )
             {
-                L_tmp2 = L_mac( L_tmp, crossfadeGain, x ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp
+                L_tmp1 = L_shl( Mpy_32_16_1( mdctSpectrum[i], g ), shift1 );                                      // g * mdctSpectrum[i]
+                L_tmp2 = L_shl( L_mult( crossfadeGain, hTonalMDCTConc->lastBlockData.spectralData[i] ), shift2 ); // exp
+
+                /* mdctSpectrum[i] = g * mdctSpectrum[i] - crossfadeGain * hTonalMDCTConc->lastBlockData.spectralData[i]; */
+                L_tmp = L_sub( L_tmp1, L_tmp2 ); // exp
+                if ( mdctSpectrum[i] > 0 )
+                {
+                    /* mdctSpectrum[i] = g * mdctSpectrum[i] + crossfadeGain * hTonalMDCTConc->lastBlockData.spectralData[i]; */
+                    L_tmp = L_add( L_tmp1, L_tmp2 ); // exp
+                }
+                mdctSpectrum[i] = L_shr( L_tmp, 31 - SPEC_EXP_DEC ); // exp+31-SPEC_EXP_DEC
+                move32();
             }
-            mdctSpectrum[i] = L_shl( L_tmp2, exp ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp + exp
-            move32();
+            /* headroom for mdct_shaping */
+            *mdctSpectrum_exp = add( exp, 31 - SPEC_EXP_DEC );
+            move16();
         }
     }
-    exp = sub( hTonalMDCTConc->lastBlockData.spectralData_exp, sub( *mdctSpectrum_exp, 16 ) );
+    exp = sub( hTonalMDCTConc->lastBlockData.spectralData_exp, *mdctSpectrum_exp );
     FOR( i = crossOverFreq; i < hTonalMDCTConc->lastBlockData.nSamples; i++ )
     {
-        mdctSpectrum[i] = L_shl( L_deposit_l( hTonalMDCTConc->lastBlockData.spectralData[i] ), exp ); // Q15 - spectralData_exp + exp
+        mdctSpectrum[i] = L_shl( L_deposit_h( hTonalMDCTConc->lastBlockData.spectralData[i] ), exp ); // mdctSpectrum_exp
         move32();
     }
 }
@@ -2056,11 +1917,7 @@ ELSE
     tmp = round_fx( BASOP_Util_fPow( L_deposit_h( tiltFactor ), 0,
                                      L_deposit_h( extract_l( L_add( L_sub( hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1], hTonalMDCTConc->pTCI->lowerIndex[hTonalMDCTConc->pTCI->numIndexes - 1] ), 1 ) ) ), 15, &exp ) );
     BASOP_SATURATE_WARNING_OFF_EVS /*next op may result in 32768*/
-#ifdef BASOP_NOGLOB
         tmp = shl_sat( tmp, exp );
-#else
-        tmp = shl( tmp, exp );
-#endif
     BASOP_SATURATE_WARNING_ON_EVS
     tilt = mult_r( tilt, tmp );
 
@@ -2246,19 +2103,12 @@ void TonalMDCTConceal_InsertNoise(
     Word16 *pSeed,               /*IN/OUT*/
     const Word16 tiltCompFactor, // Q15
     Word16 crossfadeGain,        // Q15
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    const Word16concealment_noise[L_FRAME48k],
-    const float cngLevelBackgroundTrace_bfi,
-#endif
     const Word16 crossOverFreq )
 {
     Word16 i, ld, fac;
     Word16 rnd, exp, exp_last, exp_noise, inv_samples, inv_exp;
     Word16 g, tiltFactor, tilt, tmp;
     Word32 nrgNoiseInLastFrame, nrgWhiteNoise, L_tmp, L_tmp2;
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    float last_block_nrg_correct;
-#endif
 
     g = sub( 32767 /*1.0f Q15*/, crossfadeGain );
 
@@ -2269,16 +2119,6 @@ void TonalMDCTConceal_InsertNoise(
         rnd = *pSeed;
         move16();
     }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    /* based on what is done in tcx_noise_filling() */
-    /* always initialize these to avoid compiler warnings */
-    tiltFactor = (float) pow( max( 0.375f, tiltCompFactor ), 1.0f / hTonalMDCTConc->lastBlockData.nSamples );
-    tilt = 1.0f;
-    nrgNoiseInLastFrame = 0.0f;
-    nrgWhiteNoise = 0.0f;
-    hTonalMDCTConc->faded_signal_nrg_flt = 0.0f;
-    last_block_nrg_correct = 0.0f;
-#endif
     IF( hTonalMDCTConc->lastBlockData.blockIsValid == 0 )
     {
         /* may just become active if the very first frame is lost */
@@ -2286,211 +2126,16 @@ void TonalMDCTConceal_InsertNoise(
         *mdctSpectrum_exp = SPEC_EXP_DEC;
         move16();
     }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-    else if ( concealment_noise != NULL )
-    {
-        if ( !tonalConcealmentActive )
-        {
-            /* if fadeout has not started yet, only apply sign scrambling */
-            if ( crossfadeGain == 1.0f )
-            {
-                for ( i = 0; i < crossOverFreq; i++ )
-                {
-                    if ( concealment_noise[i] > 0 )
-                    {
-                        mdctSpectrum[i] = hTonalMDCTConc->lastBlockData.spectralData[i];
-                    }
-                    else
-                    {
-                        mdctSpectrum[i] = -hTonalMDCTConc->lastBlockData.spectralData[i];
-                    }
-                }
-
-                for ( l = crossOverFreq; l < hTonalMDCTConc->lastBlockData.nSamples; l++ )
-                {
-                    mdctSpectrum[l] = hTonalMDCTConc->lastBlockData.spectralData[l];
-                }
-            }
-            /* actual fadeout is done in this case */
-            else
-            {
-                g *= (float) sqrt( cngLevelBackgroundTrace_bfi / hTonalMDCTConc->curr_noise_nrg_flt );
-
-                for ( i = 0; i < crossOverFreq; i++ )
-                {
-                    x = hTonalMDCTConc->lastBlockData.spectralData[i];
-                    y = concealment_noise[i];
-
-                    if ( y > 0 )
-                    {
-                        mdctSpectrum[i] = g * y + crossfadeGain * x;
-                    }
-                    else
-                    {
-                        mdctSpectrum[i] = g * y - crossfadeGain * x;
-                    }
-
-                    hTonalMDCTConc->faded_signal_nrg_flt += mdctSpectrum[i] * mdctSpectrum[i];
-                }
-                for ( l = crossOverFreq; l < hTonalMDCTConc->lastBlockData.nSamples; l++ )
-                {
-                    mdctSpectrum[l] = 0.0f;
-                }
-            }
-        }
-        else
-        {
-            assert( hTonalMDCTConc->pTCI->numIndexes > 0 );
-
-            /* initialize bins of tonal components with zero: basically not
-            necessary, but currently the whole spectrum is rescaled in
-            mdct_noiseShaping() and then there would be a processing of
-            uninitialized values */
-            for ( i = 0; i < hTonalMDCTConc->pTCI->numIndexes; i++ )
-            {
-                for ( l = hTonalMDCTConc->pTCI->lowerIndex[i]; l <= hTonalMDCTConc->pTCI->upperIndex[i]; l++ )
-                {
-                    mdctSpectrum[l] = 0;
-                    if ( l < crossOverFreq )
-                    {
-                        last_block_nrg_correct += hTonalMDCTConc->lastBlockData.spectralData[l] * hTonalMDCTConc->lastBlockData.spectralData[l];
-                        hTonalMDCTConc->curr_noise_nrg_flt -= concealment_noise[l] * concealment_noise[l];
-                    }
-                }
-            }
-
-            /* if fadeout has not started yet, only apply sign scrambling */
-            if ( crossfadeGain == 1.0f )
-            {
-                for ( l = 0; l < hTonalMDCTConc->pTCI->lowerIndex[0]; l++ )
-                {
-                    if ( concealment_noise[l] > 0 )
-                    {
-                        mdctSpectrum[l] = hTonalMDCTConc->lastBlockData.spectralData[l];
-                    }
-                    else
-                    {
-                        mdctSpectrum[l] = -hTonalMDCTConc->lastBlockData.spectralData[l];
-                    }
-                }
-                for ( i = 1; i < hTonalMDCTConc->pTCI->numIndexes; i++ )
-                {
-                    for ( l = hTonalMDCTConc->pTCI->upperIndex[i - 1] + 1; l < hTonalMDCTConc->pTCI->lowerIndex[i]; l++ )
-                    {
-                        if ( concealment_noise[l] > 0 )
-                        {
-                            mdctSpectrum[l] = hTonalMDCTConc->lastBlockData.spectralData[l];
-                        }
-                        else
-                        {
-                            mdctSpectrum[l] = -hTonalMDCTConc->lastBlockData.spectralData[l];
-                        }
-                    }
-                }
-
-                for ( l = hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1] + 1; l < crossOverFreq; l++ )
-                {
-                    if ( concealment_noise[l] > 0 )
-                    {
-                        mdctSpectrum[l] = hTonalMDCTConc->lastBlockData.spectralData[l];
-                    }
-                    else
-                    {
-                        mdctSpectrum[l] = -hTonalMDCTConc->lastBlockData.spectralData[l];
-                    }
-                }
-
-                for ( l = crossOverFreq; l < hTonalMDCTConc->lastBlockData.nSamples; l++ )
-                {
-                    mdctSpectrum[l] = hTonalMDCTConc->lastBlockData.spectralData[l];
-                }
-            }
-            /* actual fadeout is done in this case */
-            else
-            {
-                g *= (float) sqrt( cngLevelBackgroundTrace_bfi / hTonalMDCTConc->curr_noise_nrg_flt );
-
-                for ( l = 0; l < hTonalMDCTConc->pTCI->lowerIndex[0]; l++ )
-                {
-                    x = hTonalMDCTConc->lastBlockData.spectralData[l];
-                    y = concealment_noise[l];
-
-                    if ( y > 0 )
-                    {
-                        mdctSpectrum[l] = g * y + crossfadeGain * x;
-                    }
-                    else
-                    {
-                        mdctSpectrum[l] = g * y - crossfadeGain * x;
-                    }
-                    hTonalMDCTConc->faded_signal_nrg_flt += mdctSpectrum[l] * mdctSpectrum[l];
-                }
-                for ( i = 1; i < hTonalMDCTConc->pTCI->numIndexes; i++ )
-                {
-                    for ( l = hTonalMDCTConc->pTCI->upperIndex[i - 1] + 1; l < hTonalMDCTConc->pTCI->lowerIndex[i]; l++ )
-                    {
-                        x = hTonalMDCTConc->lastBlockData.spectralData[l];
-                        y = concealment_noise[l];
-
-                        if ( y > 0 )
-                        {
-                            mdctSpectrum[l] = g * y + crossfadeGain * x;
-                        }
-                        else
-                        {
-                            mdctSpectrum[l] = g * y - crossfadeGain * x;
-                        }
-                        hTonalMDCTConc->faded_signal_nrg_flt += mdctSpectrum[l] * mdctSpectrum[l];
-                    }
-                }
-
-                for ( l = hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1] + 1; l < crossOverFreq; l++ )
-                {
-                    x = hTonalMDCTConc->lastBlockData.spectralData[l];
-                    y = concealment_noise[l];
-
-                    if ( y > 0 )
-                    {
-                        mdctSpectrum[l] = g * y + crossfadeGain * x;
-                    }
-                    else
-                    {
-                        mdctSpectrum[l] = g * y - crossfadeGain * x;
-                    }
-                    hTonalMDCTConc->faded_signal_nrg_flt += mdctSpectrum[l] * mdctSpectrum[l];
-                }
-
-                for ( l = crossOverFreq; l < hTonalMDCTConc->lastBlockData.nSamples; l++ )
-                {
-                    mdctSpectrum[l] = 0.0f;
-                }
-            }
-        }
-
-        if ( hTonalMDCTConc->faded_signal_nrg_flt > 0.0f && hTonalMDCTConc->curr_noise_nrg_flt > MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG )
-        {
-            float nrg_corr_factor;
-
-            nrg_corr_factor = sqrtf( ( hTonalMDCTConc->last_block_nrg_flt - last_block_nrg_correct ) / hTonalMDCTConc->faded_signal_nrg_flt );
-            v_multc( mdctSpectrum, nrg_corr_factor, mdctSpectrum, crossOverFreq );
-        }
-    }
-#endif
     ELSE
     {
-#ifndef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
         L_tmp = 805306368l /*0.375f Q31*/;
         move32();
         inv_exp = 15;
         move16();
         inv_samples = Inv16( hTonalMDCTConc->lastBlockData.nSamples, &inv_exp );
         tiltFactor = round_fx( BASOP_Util_fPow( L_max( L_tmp, L_deposit_h( tiltCompFactor ) ), 0, L_deposit_h( inv_samples ), inv_exp, &exp ) );
-        BASOP_SATURATE_WARNING_OFF_EVS /*next op may result in 32768*/
-#ifdef BASOP_NOGLOB
+        BASOP_SATURATE_WARNING_OFF_EVS               /*next op may result in 32768*/
             tiltFactor = shl_sat( tiltFactor, exp ); // Q15- 2*exp
-#else
-            tiltFactor = shl( tiltFactor, exp );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
 
         tilt = 32767 /*1.0f Q15*/;
@@ -2499,7 +2144,6 @@ void TonalMDCTConceal_InsertNoise(
         nrgNoiseInLastFrame = L_deposit_h( 0 );
         nrgWhiteNoise = L_deposit_h( 0 );
         exp_last = exp_noise = 0;
-#endif
         move16();
         move16();
         IF( !tonalConcealmentActive )
@@ -2679,11 +2323,7 @@ void TonalMDCTConceal_InsertNoise(
 
             tmp = round_fx( BASOP_Util_fPow( L_deposit_h( tiltFactor ), 0, L_deposit_h( (UWord16) L_add( L_sub( hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1], hTonalMDCTConc->pTCI->lowerIndex[hTonalMDCTConc->pTCI->numIndexes - 1] ), 1 ) ), 15, &exp ) );
             BASOP_SATURATE_WARNING_OFF_EVS /*next op may result in 32768*/
-#ifdef BASOP_NOGLOB
                 tmp = shl_sat( tmp, exp ); // Q15 - 2*exp
-#else
-                tmp = shl( tmp, exp );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS
             tilt = mult_r( tilt, tmp );
 
@@ -2861,10 +2501,6 @@ void TonalMDCTConceal_Apply(
     const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
     Word32 *mdctSpectrum,                     // Q31-*mdctSpectrum_exp                 /*IN/OUT*/
     Word16 *mdctSpectrum_exp                  /*IN */
-#ifdef IVAS_CODE_MDCT_GSHAPE
-    ,
-    const PsychoacousticParameters *psychParamsCurrent
-#endif
 )
 {
     Word16 i, l, exp;
@@ -2882,22 +2518,12 @@ void TonalMDCTConceal_Apply(
         move16();
         assert( hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1] < nSamples );
 
-#ifdef IVAS_CODE_MDCT_GSHAPE
-        IF( psychParamsCurrent == NULL )
-#endif
         {
 
             mdct_shaping_16( hTonalMDCTConc->secondLastPowerSpectrum, hTonalMDCTConc->nSamplesCore, nSamples,
                              hTonalMDCTConc->secondLastBlockData.scaleFactors, hTonalMDCTConc->secondLastBlockData.scaleFactors_exp,
                              hTonalMDCTConc->secondLastBlockData.scaleFactors_max_e, powerSpectrum );
         }
-#ifdef IVAS_CODE_MDCT_GSHAPE
-        ELSE
-        {
-            sns_shape_spectrum( powerSpectrum, psychParamsCurrent, hTonalMDCTConc->secondLastBlockData.scaleFactors, hTonalMDCTConc->nSamplesCore );
-            nBands = psychParamsCurrent->nBands;
-        }
-#endif
         phaseDiff = hTonalMDCTConc->pTCI->phaseDiff; /* if multiple frame loss occurs use the phase from the last frame and continue rotating */
         pCurrentPhase = hTonalMDCTConc->pTCI->phase_currentFramePredicted;
 
@@ -3236,31 +2862,41 @@ static void CalcPowerSpec(
     powerSpec[nSamples - 1] = L_shr( powerSpec[nSamples - 2], 1 );
     move32();
 }
-#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
-void TonalMdctConceal_create_concealment_noise(
-    float concealment_noise[L_FRAME48k],
+
+
+/*******************************************************/
+/*-------------- public functions -------------------- */
+/*******************************************************/
+
+void TonalMdctConceal_create_concealment_noise_ivas_fx(
+    Word32 concealment_noise[L_FRAME48k], // Q31-concealment_noise_exp
+    Word16 *concealment_noise_exp,
     CPE_DEC_HANDLE hCPE,
-    const int16_t L_frameTCX,
-    const int16_t L_frame,
-    const int16_t idchan,
-    const int16_t subframe_idx,
-    const int16_t core,
-    const int16_t crossfade_gain,
+    const Word16 L_frameTCX,     // Q0
+    const Word16 L_frame,        // Q0
+    const Word16 idchan,         // Q0
+    const Word16 subframe_idx,   // Q0
+    const Word16 core,           // Q0
+    const Word16 crossfade_gain, // Q15
     const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode )
 {
     STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct;
     TonalMDCTConcealPtr hTonalMDCTConc;
     Decoder_State *st;
     HANDLE_FD_CNG_COM hFdCngCom;
-    int16_t *rnd_c, *rnd;
-    int16_t crossOverFreq, i, save_rnd_c, max_noise_line;
-    float c, c_inv;
-    float noise_shape_buffer[L_FRAME48k];
-    int16_t inc, start_idx, stop_idx;
-    float *cngNoiseLevelPtr;
-    float last_scf;
+    Word16 *rnd_c, *rnd;
+    Word16 crossOverFreq, i, save_rnd_c, max_noise_line;
+    Word16 c, c_inv, inc;
+    Word32 noise_shape_buffer[L_FRAME48k];
+    Word16 noise_shape_buffer_e[L_FRAME48k];
+    Word16 start_idx, stop_idx, noise_shape_buffer_common_exp = MIN16B_FLT_FX, last_scf_e, temp_e;
+    move16();
+    Word32 *cngNoiseLevelPtr;
+    Word32 last_scf;
+
+    Word16 c_e, c_inv_e;
 
-    wmops_sub_start( "create_conc_noise" );
+    push_wmops( "create_conc_noise" );
 
     hStereoMdct = hCPE->hStereoMdct;
     st = hCPE->hCoreCoder[idchan];
@@ -3270,180 +2906,346 @@ void TonalMdctConceal_create_concealment_noise(
     rnd_c = &hStereoMdct->noise_seed_common;
 
     /* determine start bin for IGF */
-    if ( st->igf == 0 )
+    IF( st->igf == 0 )
     {
-        if ( st->narrowBand == 0 )
+        IF( st->narrowBand == 0 )
         {
             /* minimum needed for output with sampling rates lower then the
                nominal sampling rate */
-            crossOverFreq = min( L_frameTCX, L_frame );
+            crossOverFreq = s_min( L_frameTCX, L_frame );
         }
-        else
+        ELSE
         {
             crossOverFreq = L_frameTCX;
+            move16();
         }
     }
-    else
+    ELSE
     {
-        crossOverFreq = min( st->hIGFDec->infoIGFStartLine, L_frameTCX );
+        crossOverFreq = s_min( st->hIGFDec->infoIGFStartLine, L_frameTCX );
     }
 
     /* for tonal mdct concealment with tonal components above the crossover frequency, conditionally raise the frequency index until which noise is generated */
     max_noise_line = crossOverFreq;
-    if ( st->tonal_mdct_plc_active )
+    move16();
+    IF( st->tonal_mdct_plc_active )
     {
-        max_noise_line = max( max_noise_line, hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1] + 1 );
+        max_noise_line = s_max( max_noise_line, extract_l( L_add( hTonalMDCTConc->pTCI->upperIndex[hTonalMDCTConc->pTCI->numIndexes - 1], 1 ) ) );
     }
 
     /* first lost frame is handled separately */
-    if ( !hTonalMDCTConc->lastBlockData.blockIsConcealed )
+    IF( !hTonalMDCTConc->lastBlockData.blockIsConcealed )
     {
-        *rnd = 1977 + idchan;
+        *rnd = add( 1977, idchan ); // Q0
+        move16();
         /* will be set twice when looping over two channels, but does not matter */
-        *rnd_c = 1979;
+        *rnd_c = 1979; // Q0
+        move16();
     }
 
-    if ( crossfade_gain == 1.0f )
+    IF( GT_16( crossfade_gain, 32734 ) )
+    /* Due to precision loss */ /* 0.999 in Q15*/
     {
         /* In first frame, noise is weighted with zero anyway, we only need the random numbers for the sign scrambling */
-        for ( i = 0; i < max_noise_line; i++ )
+        FOR( i = 0; i < max_noise_line; i++ )
         {
             *rnd = own_random( rnd );
-            concealment_noise[i] = *rnd;
+            move16();
+            concealment_noise[i] = *rnd; // Q31-concealment_noise_exp
+            move32();
         }
-
-        wmops_sub_end();
+        *concealment_noise_exp = 31;
+        move16();
+        pop_wmops();
 
         return;
     }
 
-    save_rnd_c = *rnd_c;
+    save_rnd_c = *rnd_c; // Q0
+    move16();
 
-    c = sqrtf( hStereoMdct->lastCoh );
-    c_inv = sqrtf( 1 - hStereoMdct->lastCoh );
+    c_e = 1;
+    move16();
+    c_inv_e = 1;
+    move16();
+
+    c = Sqrt16( hStereoMdct->lastCoh_fx, &c_e );                            // Q1 = 15 - c_e
+    c_inv = Sqrt16( sub( ONE_IN_Q14, hStereoMdct->lastCoh_fx ), &c_inv_e ); // Q2 = 15 - c_inv_e
+
+    IF( NE_16( c_e, c_inv_e ) )
+    {
+        IF( LT_16( c_e, c_inv_e ) )
+        {
+            c = shr( c, sub( c_inv_e, c_e ) ); // Q0
+            c_e = c_inv_e;
+            move16();
+        }
+        ELSE
+        {
+            c_inv = shr( c_inv, sub( c_e, c_inv_e ) ); // Q0
+        }
+    }
 
     /* pre-compute the noise shape for later weighting of the noise spectra */
-    cngNoiseLevelPtr = &hFdCngCom->cngNoiseLevel_flt[0];
-    inc = ( st->core > TCX_20_CORE ) ? 2 : 1;
-    start_idx = hFdCngCom->startBand / inc;
-    stop_idx = hFdCngCom->stopFFTbin / inc;
+    cngNoiseLevelPtr = &hFdCngCom->cngNoiseLevel[0];
+    last_scf_e = hFdCngCom->cngNoiseLevelExp;
+    move16();
+
+    IF( GT_16( st->core, TCX_20_CORE ) )
+    {
+        inc = 2;
+    }
+    ELSE
+    {
+        inc = 1;
+    }
+    move16();
+    start_idx = idiv1616( hFdCngCom->startBand, inc );
+    stop_idx = idiv1616( hFdCngCom->stopFFTbin, inc );
 
-    for ( i = 0; i < start_idx; i++ )
+    FOR( i = 0; i < start_idx; i++ )
     {
-        noise_shape_buffer[i] = 0.0f;
+        noise_shape_buffer[i] = 0;
+        move32();
+        noise_shape_buffer_e[i] = 0;
+        move16();
     }
-    for ( ; i < stop_idx; i++, cngNoiseLevelPtr += inc )
+    FOR( ; i < stop_idx; ( i++, cngNoiseLevelPtr += inc ) )
     {
-        noise_shape_buffer[i] = sqrtf( *( cngNoiseLevelPtr ) );
+        noise_shape_buffer_e[i] = hFdCngCom->cngNoiseLevelExp;
+        move16();
+        noise_shape_buffer[i] = Sqrt32( *( cngNoiseLevelPtr ), &noise_shape_buffer_e[i] ); // Q31-noise_shape_buffer_e[i]
+        move32();
+        noise_shape_buffer_common_exp = s_max( noise_shape_buffer_e[i], noise_shape_buffer_common_exp );
     }
 
-    last_scf = sqrtf( *( cngNoiseLevelPtr - inc ) );
+    FOR( i = 0; i < stop_idx; i++ )
+    {
+        IF( NE_16( noise_shape_buffer_common_exp, noise_shape_buffer_e[i] ) )
+        {
+
+            noise_shape_buffer[i] = L_shr( noise_shape_buffer[i], sub( noise_shape_buffer_common_exp, noise_shape_buffer_e[i] ) ); // Q31- (noise_shape_buffer_common_exp-noise_shape_buffer_e[i])
+            move32();
+        }
+    }
+
+    last_scf = Sqrt32( *( cngNoiseLevelPtr - inc ), &last_scf_e ); // Q31-last_scf_e
+
+    IF( LT_16( noise_shape_buffer_common_exp, last_scf_e ) )
+    {
+        Scale_sig32( noise_shape_buffer, stop_idx, sub( noise_shape_buffer_common_exp, last_scf_e ) ); // Q31- (noise_shape_buffer_common_exp-last_scf_e)
 
-    for ( ; i < max_noise_line; i++ )
+        noise_shape_buffer_common_exp = last_scf_e;
+        move16();
+    }
+    ELSE
     {
-        noise_shape_buffer[i] = last_scf;
+        last_scf = L_shl( last_scf, sub( last_scf_e, noise_shape_buffer_common_exp ) ); // Q31-(last_scf_e-noise_shape_buffer_common_exp)
+    }
+
+    FOR( ; i < max_noise_line; i++ )
+    {
+        noise_shape_buffer[i] = last_scf; // Q31 - noise_shape_buffer_common_exp
+        move32();
     }
 
     /* fill the noise vector */
-    hTonalMDCTConc->curr_noise_nrg_flt = MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG;
-    if ( noise_gen_mode == EQUAL_CORES || ( ( noise_gen_mode == TCX20_IN_0_TCX10_IN_1 && idchan == 0 ) || ( noise_gen_mode == TCX10_IN_0_TCX20_IN_1 && idchan == 1 ) ) )
+    hTonalMDCTConc->curr_noise_nrg = MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG_Q31; // Q31
+    move32();
+    hTonalMDCTConc->curr_noise_nrg_exp = 0;
+    move16();
+    *concealment_noise_exp = add( 16, add( noise_shape_buffer_common_exp, c_e ) );
+    move16();
+    temp_e = hTonalMDCTConc->curr_noise_nrg_exp;
+    move16();
+
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_16( noise_gen_mode, EQUAL_CORES ) || ( ( EQ_16( noise_gen_mode, TCX20_IN_0_TCX10_IN_1 ) && EQ_16( idchan, 0 ) ) || ( EQ_16( noise_gen_mode, TCX10_IN_0_TCX20_IN_1 ) && EQ_16( idchan, 1 ) ) ) )
     {
         /* current channel is TCX20 -> generate noise for "full-length" spectrum */
-        for ( i = 0; i < max_noise_line; i++ )
+
+        FOR( i = 0; i < max_noise_line; i++ )
         {
-            *rnd = own_random( rnd );
+            *rnd = own_random( rnd ); // Q0
             *rnd_c = own_random( rnd_c );
 
-            concealment_noise[i] = ( c_inv * *rnd + c * *rnd_c ) * noise_shape_buffer[i];
-            hTonalMDCTConc->curr_noise_nrg_flt += concealment_noise[i] * concealment_noise[i];
+            move16();
+            move16();
+
+            concealment_noise[i] = Mpy_32_32( L_add( L_shr( L_mult( c_inv, *rnd ), 1 ), L_shr( L_mult( c, *rnd_c ), 1 ) ), noise_shape_buffer[i] ); // Q31 - *concealment_noise_exp
+            move32();
+            IF( concealment_noise[i] != 0 )
+            {
+                hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, Mpy_32_32( concealment_noise[i], concealment_noise[i] ), shl( *concealment_noise_exp, 1 ), &temp_e ); // Q31-temp_e
+            }
+            hTonalMDCTConc->curr_noise_nrg_exp = temp_e;
+            move16();
         }
     }
-    else /* ( ( noise_gen_mode == TCX10_IN_0_TCX20_IN_1 && idchan == 0 ) || ( noise_gen_mode == TCX20_IN_0_TCX10_IN_1 && idchan == 1 ) )  */
+    ELSE /* ( ( noise_gen_mode == TCX10_IN_0_TCX20_IN_1 && idchan == 0 ) || ( noise_gen_mode == TCX20_IN_0_TCX10_IN_1 && idchan == 1 ) )  */
     {
         /* current channel is TCX10 and the other is TCX20 -> generate noise for "half-length" spectrum, but "increment" mid seed twice, to have the same seed in mid as the other (TCX20) channel for next frame */
-        for ( i = 0; i < max_noise_line; i++ )
+        FOR( i = 0; i < max_noise_line; i++ )
         {
-            *rnd = own_random( rnd );
-            *rnd_c = own_random( rnd_c );
+            *rnd = own_random( rnd );     // Q0
+            *rnd_c = own_random( rnd_c ); // Q0
+            move16();
+            move16();
 
-            concealment_noise[i] = ( c_inv * *rnd + c * *rnd_c ) * noise_shape_buffer[i];
-            hTonalMDCTConc->curr_noise_nrg_flt += concealment_noise[i] * concealment_noise[i];
+            concealment_noise[i] = Mpy_32_32( L_add( L_shr( L_mult( c_inv, *rnd ), 1 ), L_shr( L_mult( c, *rnd_c ), 1 ) ), noise_shape_buffer[i] );
+            move32();
+            IF( concealment_noise[i] != 0 )
+            {
+                hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, Mpy_32_32( concealment_noise[i], concealment_noise[i] ), shl( *concealment_noise_exp, 1 ), &temp_e ); // Q31-temp_e
+            }
+            hTonalMDCTConc->curr_noise_nrg_exp = temp_e;
+            move16();
 
             *rnd_c = own_random( rnd_c );
+            move16();
         }
     }
-    if ( st->tonal_mdct_plc_active )
+
+    IF( st->tonal_mdct_plc_active )
     {
-        for ( i = crossOverFreq; i < max( crossOverFreq, hTonalMDCTConc->pTCI->lowerIndex[hTonalMDCTConc->pTCI->numIndexes - 1] ); ++i )
+        FOR( i = crossOverFreq; i < s_max( crossOverFreq, hTonalMDCTConc->pTCI->lowerIndex[hTonalMDCTConc->pTCI->numIndexes - 1] ); ++i )
         {
-            concealment_noise[i] *= 0.0f;
+            concealment_noise[i] = 0;
+            move32();
         }
     }
+
     /* restore common seed
          - after finishing the first channel
          - after a first subframe if the current channel is TCX10 */
-    if ( ( idchan == 0 && ( core == TCX_20 || ( core == TCX_10 && subframe_idx == 1 ) ) ) || ( core == TCX_10 && subframe_idx == 0 ) )
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( EQ_16( idchan, 0 ) && ( EQ_16( core, TCX_20 ) || ( EQ_16( core, TCX_10 ) && EQ_16( subframe_idx, 1 ) ) ) ) || ( EQ_16( core, TCX_10 ) && EQ_16( subframe_idx, 0 ) ) )
     {
         *rnd_c = save_rnd_c;
+        move16();
     }
+
     st->seed_tcx_plc = *rnd;
-    wmops_sub_end();
+    move16();
+
+    pop_wmops();
 
     return;
 }
-void TonalMdctConceal_whiten_noise_shape(
+
+
+void TonalMdctConceal_whiten_noise_shape_ivas_fx(
     Decoder_State *st,
-    const int16_t L_frame,
+    const Word16 L_frame,
     const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE whitening_mode )
 {
-    int16_t inc, start_idx, stop_idx;
-    float *noiseLevelPtr, *scfs_bg, *scfs_for_shaping;
+    Word16 inc, start_idx, stop_idx, i;
+    Word32 *noiseLevelPtr, *scfs_bg, *scfs_for_shaping;
+    Word16 noiseLevelPtr_exp;
     HANDLE_FD_CNG_COM hFdCngCom;
-    float whitenend_noise_shape[L_FRAME16k];
-    float scfs_int[FDNS_NPTS];
+    Word32 whitenend_noise_shape[L_FRAME16k];
+    Word16 q_wns;
+    Word32 scfs_int[FDNS_NPTS];
     const PsychoacousticParameters *psychParams;
 
     push_wmops( "apply_sns_on_noise_shape" );
 
-    scfs_bg = &st->hTonalMDCTConc->scaleFactorsBackground_flt[0];
+    scfs_bg = &st->hTonalMDCTConc->scaleFactorsBackground_fx[0];
     psychParams = st->hTonalMDCTConc->psychParams;
     hFdCngCom = st->hFdCngDec->hFdCngCom;
 
-    inc = ( ( whitening_mode == ON_FIRST_LOST_FRAME ? st->core : st->last_core ) > TCX_20_CORE ) ? 2 : 1;
-    start_idx = hFdCngCom->startBand / inc;
-    stop_idx = L_frame / inc;
-    noiseLevelPtr = hFdCngCom->cngNoiseLevel_flt;
+    set32_fx( whitenend_noise_shape, 0, L_FRAME16k );
 
-    set_zero( whitenend_noise_shape, start_idx );
-    for ( int16_t j = start_idx; j < stop_idx; j++, noiseLevelPtr += inc )
+    IF( EQ_32( whitening_mode, ON_FIRST_LOST_FRAME ) )
     {
-        whitenend_noise_shape[j] = *noiseLevelPtr;
+        IF( GT_16( st->core, TCX_20_CORE ) )
+        {
+            inc = 2;
+            move16();
+        }
+        ELSE
+        {
+            inc = 1;
+            move16();
+        }
     }
+    ELSE
+    {
+        IF( GT_16( st->last_core, TCX_20_CORE ) )
+        {
+            inc = 2;
+            move16();
+        }
+        ELSE
+        {
+            inc = 1;
+            move16();
+        }
+    }
+    start_idx = shr( hFdCngCom->startBand, sub( inc, 1 ) );
+    stop_idx = shr( L_frame, sub( inc, 1 ) );
+    noiseLevelPtr = hFdCngCom->cngNoiseLevel;
+    noiseLevelPtr_exp = hFdCngCom->cngNoiseLevelExp;
+    move16();
 
-    if ( whitening_mode == ON_FIRST_LOST_FRAME )
+    FOR( Word16 j = start_idx; j < stop_idx; j++ )
     {
-        float scf[SNS_NPTS];
+        whitenend_noise_shape[j] = L_shr( *noiseLevelPtr, 3 );
+        move32();
+        noiseLevelPtr += inc;
+    }
 
-        sns_compute_scf( whitenend_noise_shape, psychParams, L_frame, scf );
-        sns_interpolate_scalefactors( scfs_int, scf, ENC );
-        sns_interpolate_scalefactors( scfs_bg, scf, DEC );
-        scfs_for_shaping = &scfs_int[0];
+    IF( EQ_32( whitening_mode, ON_FIRST_LOST_FRAME ) )
+    {
+        Word32 scf[SNS_NPTS];
+
+        sns_compute_scf_fx( whitenend_noise_shape, psychParams, L_frame, scf, sub( sub( 31, noiseLevelPtr_exp ), 3 ) );
+
+        sns_interpolate_scalefactors_fx( scfs_int, scf, ENC );
+        sns_interpolate_scalefactors_fx( scfs_bg, scf, DEC );
+
+        scfs_for_shaping = &scfs_int[0]; // Q16
     }
-    else /* whitening_mode == ON_FIRST_GOOD_FRAME */
+    ELSE /* whitening_mode == ON_FIRST_GOOD_FRAME */
     {
-        scfs_for_shaping = &scfs_bg[0];
+        scfs_for_shaping = &scfs_bg[0]; // Q16
     }
 
-    if ( sum_f( scfs_for_shaping, FDNS_NPTS ) > 0.0f )
+    IF( sum32_sat( scfs_for_shaping, FDNS_NPTS ) > 0 )
     {
-        sns_shape_spectrum( whitenend_noise_shape, psychParams, scfs_for_shaping, L_frame );
-        mvr2r( whitenend_noise_shape + start_idx, hFdCngCom->cngNoiseLevel_flt, stop_idx - start_idx );
+        q_wns = sub( sub( 31, noiseLevelPtr_exp ), 3 );
+        sns_shape_spectrum_fx( whitenend_noise_shape, &q_wns, psychParams, scfs_for_shaping, Q16, L_frame, NULL );
+
+        IF( GT_16( add( q_wns, 1 ), sub( 31, hFdCngCom->cngNoiseLevelExp ) ) )
+        {
+            FOR( i = 0; i < sub( stop_idx, start_idx ); i++ )
+            {
+                hFdCngCom->cngNoiseLevel[i] = L_shr( whitenend_noise_shape[start_idx + i], sub( add( q_wns, hFdCngCom->cngNoiseLevelExp ), 30 ) ); //(q_wns + 1)
+                move32();
+            }
+        }
+        ELSE
+        {
+            Copy32( whitenend_noise_shape + start_idx, hFdCngCom->cngNoiseLevel, sub( stop_idx, start_idx ) );
+
+            scale_sig32( hFdCngCom->cngNoiseLevel + sub( stop_idx, start_idx ), sub( FFTCLDFBLEN, sub( stop_idx, start_idx ) ), sub( add( q_wns, hFdCngCom->cngNoiseLevelExp ), 30 ) );
+
+            hFdCngCom->cngNoiseLevelExp = sub( Q30, q_wns ); // Exponent = 31 - (q_wns + 1)
+            move16();
+        }
     }
-    else
+    ELSE
     {
-        set_zero( hFdCngCom->cngNoiseLevel_flt, stop_idx - start_idx );
+        set32_fx( hFdCngCom->cngNoiseLevel, 0, sub( stop_idx, start_idx ) );
     }
 
     pop_wmops();
 }
-#endif
diff --git a/lib_dec/transition_dec.c b/lib_dec/transition_dec.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_dec/transition_dec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/transition_dec_fx.c b/lib_dec/transition_dec_fx.c
index c7c5b5ab81a540568170bc6fa4da59957abfede2..b9ad17fcfedb094ff24ca64463b55580d1315305 100644
--- a/lib_dec/transition_dec_fx.c
+++ b/lib_dec/transition_dec_fx.c
@@ -56,9 +56,7 @@ void transition_dec_fx(
     Word16 i, offset, temp, tmp;
     Word16 limit_flag;
     Word16 i_subfridx;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) ( Opt_AMR_WB );
-#endif
 
     i_subfridx = i_subfr / L_SUBFR; /*i_subfr / L_SUBFR*/
     /* Set limit_flag to 0 for restrained limits, and 1 for extended limits */
@@ -789,11 +787,7 @@ static void tc_dec_fx(
     j = s_min( L_SUBFR, add( imp_pos, L_IMPULSE2 ) );
     FOR( ; i <= j; i++ )
     {
-#ifdef BASOP_NOGLOB
         exc[i + i_subfr] = round_fx_o( L_shl_o( L_mult_o( pt_shape[i], gain_trans, &Overflow ), sc, &Overflow ), &Overflow ); /* (Qx * Q14 ) */
-#else
-        exc[i + i_subfr] = round_fx( L_shl( L_mult( pt_shape[i], gain_trans ), sc ) ); /* (Qx * Q14 ) */
-#endif
         move16();
     }
     FOR( ; i < L_SUBFR; i++ )
@@ -834,9 +828,7 @@ Word16 tc_classif_fx(                       /*o: Q0*/
 )
 {
     Word16 tc_subfr, indice;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) ( L_frame );
-#endif
     IF( EQ_16( st_fx->L_frame, L_FRAME ) )
     {
         IF( get_next_indice_fx( st_fx, 1 ) )
diff --git a/lib_dec/updt_dec.c b/lib_dec/updt_dec.c
deleted file mode 100644
index 2b370b05d8e9277dcc06bd7527fdc8260ce9ec57..0000000000000000000000000000000000000000
--- a/lib_dec/updt_dec.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "cnst.h"
-#include <math.h>
-#include "wmc_auto.h"
diff --git a/lib_dec/updt_dec_fx.c b/lib_dec/updt_dec_fx.c
index a7341ddc9f79a13c1b32f605697c32edfe1a216d..81046fb19c71b0ceef898d08f1e36163f092644a 100644
--- a/lib_dec/updt_dec_fx.c
+++ b/lib_dec/updt_dec_fx.c
@@ -249,17 +249,17 @@ void updt_IO_switch_dec_fx(
             {
                 swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
                                   hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &hBWE_TD->tbe_demph_fx, &hBWE_TD->tbe_premph_fx, hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
-                set16_fx( st_fx->GainShape_Delay, 0, NUM_SHB_SUBFR / 2 );
+                set16_fx( hBWE_TD->GainShape_Delay_fx, 0, NUM_SHB_SUBFR / 2 );
                 hBWE_TD->prev_pow_exc16kWhtnd_fx32 = 1; /*Q0 1.f*/
                 move32();
                 hBWE_TD->prev_mix_factor_fx = 32767; /*Q15 1.f*/
                 move16();
-                swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx );
+                swb_tbe_reset_synth_fx( hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32 );
             }
 
             IF( EQ_16( output_frame, L_FRAME48k ) )
             {
-                st_fx->prev_fb_ener_adjust_fx = 0;
+                hBWE_FD->prev_fb_ener_adjust_fx = 0;
                 move16();
                 set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
                 hBWE_TD->fb_tbe_demph_fx = 0;
@@ -401,11 +401,7 @@ void updt_bw_switching_fx(
     test();
     IF( EQ_32( st_fx->output_Fs, 32000 ) && EQ_16( st_fx->bwidth, SWB ) )
     {
-#ifdef BASOP_NOGLOB
         st_fx->tilt_swb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( synth, Qpost, L_FRAME32k ), 3 ) ); // Q27 - 16 = Q11
-#else
-        st_fx->tilt_swb_fx = round_fx( L_shl( calc_tilt_bwe_fx( synth, Qpost, L_FRAME32k ), 3 ) );
-#endif
     }
 
     st_fx->prev_enerLH_fx = st_fx->enerLH_fx; // enerLH_fx_Q
@@ -580,23 +576,6 @@ void updt_dec_common_fx(
     test();
     test();
     test();
-#ifdef IVAS_CODE
-    /* Store long-term estimates of stab_fac and log energy diff to estimate env_stab in case of core switch ACELP/TCX->HQ */
-    if ( st->element_mode != EVS_MONO )
-    {
-        output_frame = NS2SA( st->output_Fs, FRAME_SIZE_NS );
-        log_energy = log2f( ( sum2_f( synth, output_frame ) / output_frame ) + 1.0f );
-        log_energy_diff = fabsf( st->log_energy_old - log_energy );
-        st->log_energy_old = log_energy;
-        st->log_energy_diff_lt = ENV_SMOOTH_FAC * log_energy_diff + ( 1.0f - ENV_SMOOTH_FAC ) * st->log_energy_diff_lt;
-        if ( st->core == HQ_CORE )
-        {
-            st->stab_fac = min( 1, ( STAB_FAC_EST1 + ( STAB_FAC_EST2 * st->hHQ_core->mem_env_delta ) + ( STAB_FAC_EST3 * st->log_energy_diff_lt ) ) );
-            st->stab_fac = max( 0, st->stab_fac );
-        }
-        st->stab_fac_smooth_lt = ENV_SMOOTH_FAC * st->stab_fac + ( 1.0f - ENV_SMOOTH_FAC ) * st->stab_fac_smooth_lt;
-    }
-#endif
     IF( ( ( LE_32( st_fx->core_brate, SID_2k40 ) ) && EQ_16( st_fx->cng_type, FD_CNG ) ) || ( st_fx->tcxonly && EQ_16( st_fx->codec_mode, MODE2 ) ) )
 
     {
@@ -744,7 +723,7 @@ void updt_dec_common_fx(
     IF( st_fx->hTcxDec != NULL && st_fx->enablePlcWaveadjust && !concealWholeFrameTmp && NE_16( st_fx->core, AMR_WB_CORE ) )
     {
         /* update the parameters used in waveform adjustment */
-        concealment_update2_x( (const Word16 *) synth, &st_fx->plcInfo, hTcxDec->L_frameTCX );
+        concealment_update2_x( (const Word16 *) synth, st_fx->hPlcInfo, hTcxDec->L_frameTCX );
     }
 
     st_fx->last_total_brate_ber = st_fx->total_brate;
@@ -775,11 +754,7 @@ static void ivas_updt_bw_switching_fx(
     test();
     IF( EQ_32( st_fx->output_Fs, 32000 ) && EQ_16( st_fx->bwidth, SWB ) )
     {
-#ifdef BASOP_NOGLOB
         st_fx->tilt_swb_fx = ivas_calc_tilt_bwe_fx( synth, Qpost, L_FRAME32k );
-#else
-        st_fx->tilt_swb_fx = round_fx( L_shl( calc_tilt_bwe_fx( synth, Qpost, L_FRAME32k ), 3 ) );
-#endif
     }
 
     st_fx->prev_enerLH_fx = st_fx->enerLH_fx; // enerLH_fx_Q
@@ -972,23 +947,6 @@ void ivas_updt_dec_common_fx(
     test();
     test();
     test();
-#ifdef IVAS_CODE
-    /* Store long-term estimates of stab_fac and log energy diff to estimate env_stab in case of core switch ACELP/TCX->HQ */
-    if ( st->element_mode != EVS_MONO )
-    {
-        output_frame = NS2SA( st->output_Fs, FRAME_SIZE_NS );
-        log_energy = log2f( ( sum2_f( synth, output_frame ) / output_frame ) + 1.0f );
-        log_energy_diff = fabsf( st->log_energy_old - log_energy );
-        st->log_energy_old = log_energy;
-        st->log_energy_diff_lt = ENV_SMOOTH_FAC * log_energy_diff + ( 1.0f - ENV_SMOOTH_FAC ) * st->log_energy_diff_lt;
-        if ( st->core == HQ_CORE )
-        {
-            st->stab_fac = min( 1, ( STAB_FAC_EST1 + ( STAB_FAC_EST2 * st->hHQ_core->mem_env_delta ) + ( STAB_FAC_EST3 * st->log_energy_diff_lt ) ) );
-            st->stab_fac = max( 0, st->stab_fac );
-        }
-        st->stab_fac_smooth_lt = ENV_SMOOTH_FAC * st->stab_fac + ( 1.0f - ENV_SMOOTH_FAC ) * st->stab_fac_smooth_lt;
-    }
-#else
     IF( st_fx->element_mode != EVS_MONO )
     {
         Word16 q_div = sub( Q31, shl( Qpostd, 1 ) );
@@ -1011,7 +969,6 @@ void ivas_updt_dec_common_fx(
         st_fx->stab_fac_smooth_lt_fx = extract_h( L_add( L_mult( ENV_SMOOTH_FAC_FX, st_fx->stab_fac_fx ),
                                                          L_mult( sub( MAX_16, ENV_SMOOTH_FAC_FX ), st_fx->stab_fac_smooth_lt_fx ) ) ); // Q15
     }
-#endif
 
     test();
     test();
@@ -1171,7 +1128,7 @@ void ivas_updt_dec_common_fx(
     IF( st_fx->hTcxDec != NULL && st_fx->enablePlcWaveadjust && !concealWholeFrameTmp && NE_16( st_fx->core, AMR_WB_CORE ) )
     {
         /* update the parameters used in waveform adjustment */
-        concealment_update2_x( (const Word16 *) synth, &st_fx->plcInfo, hTcxDec->L_frameTCX );
+        concealment_update2_x( (const Word16 *) synth, st_fx->hPlcInfo, hTcxDec->L_frameTCX );
     }
 
     st_fx->last_total_brate_ber = st_fx->total_brate;
diff --git a/lib_dec/vlpc_1st_dec.c b/lib_dec/vlpc_1st_dec.c
deleted file mode 100644
index 97a511fb6147d83e4e1ad4814d4e5e7162d51f90..0000000000000000000000000000000000000000
--- a/lib_dec/vlpc_1st_dec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/vlpc_2st_dec.c b/lib_dec/vlpc_2st_dec.c
deleted file mode 100644
index e748899a9667996f0776eb65127752b66796a660..0000000000000000000000000000000000000000
--- a/lib_dec/vlpc_2st_dec.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_dec/voiced_dec.c b/lib_dec/voiced_dec.c
deleted file mode 100644
index 87f19fd33ef8183ad36f00fa878ea9f11a28379e..0000000000000000000000000000000000000000
--- a/lib_dec/voiced_dec.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * ppp_voiced_decoder()
- *
- * Voiced decoder for SC-VBR
- *-------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------*
- * sc_vbr_dec_init_flt()
- *
- * Initialize SC-VBR decoder
- *---------------------------------------------------------------------*/
diff --git a/lib_dec/voiced_dec_fx.c b/lib_dec/voiced_dec_fx.c
index d7ec44e9267ac3e488f3e3ba8fb531c567f21f8e..c937a3b2b6c032bb139c98919a65ae6af4f29f9f 100644
--- a/lib_dec/voiced_dec_fx.c
+++ b/lib_dec/voiced_dec_fx.c
@@ -242,30 +242,20 @@ ivas_error ppp_voiced_decoder_fx(
         /* Compensate for Q factor of energy to get log10(lag*eng)  */
 
 
-        Ltemp = log10_fx( Ltemp ); /* Ltemp=10log10(eng), Q23 */
-#ifdef BASOP_NOGLOB
+        Ltemp = log10_fx( Ltemp );                                                                                                     /* Ltemp=10log10(eng), Q23 */
         Ltemp = L_add_sat( L_sub_sat( Ltemp, Ltemp_q ), logLag );                                                                      /* Ltemp=10*log10(lag*eng), Q23 */
         hSC_VBR->lastLgainD_fx = round_fx_sat( L_shl_sat( (Word32) Mpy_32_16( extract_h( Ltemp ), extract_l( Ltemp ), 0x6666 ), 1 ) ); /* Q11 */
         move16();
-#else
-        Ltemp = L_add( L_sub( Ltemp, Ltemp_q ), logLag );                                                                      /* Ltemp=10*log10(lag*eng), Q23 */
-        hSC_VBR->lastLgainD_fx = round_fx( L_shl( (Word32) Mpy_32_16( extract_h( Ltemp ), extract_l( Ltemp ), 0x6666 ), 1 ) ); /* Q11 */
-#endif
 
 
         /* Process high band */
         Ltemp = DTFS_setEngyHarm_fx( 2828, upper_cut_off_freq_of_interest, 2828, upper_cut_off_freq, 1, 0, &Qh, TMPDTFS_FX );
 
 
-        Ltemp = log10_fx( Ltemp ); // Q23
-#ifdef BASOP_NOGLOB
+        Ltemp = log10_fx( Ltemp );                                                                                                     // Q23
         Ltemp = L_add_sat( L_sub_sat( Ltemp, Ltemp_q ), logLag );                                                                      /* Ltemp=10*log10(lag*eng), Q23 */
         hSC_VBR->lastHgainD_fx = round_fx_sat( L_shl_sat( (Word32) Mpy_32_16( extract_h( Ltemp ), extract_l( Ltemp ), 0x6666 ), 1 ) ); /* Q11 */
         move16();
-#else
-        Ltemp = L_add( L_sub( Ltemp, Ltemp_q ), logLag );                                                                      /* Ltemp=10*log10(lag*eng), Q23 */
-        hSC_VBR->lastHgainD_fx = round_fx( L_shl( (Word32) Mpy_32_16( extract_h( Ltemp ), extract_l( Ltemp ), 0x6666 ), 1 ) ); /* Q11 */
-#endif
 
 
         /* Need to unify the Q factors of both bands */
@@ -324,13 +314,8 @@ ivas_error ppp_voiced_decoder_fx(
     /*    temp32_fx = (Word32)divide_dp((Word40)819200,(Word40)L_shl((Word32)CURRP_Q_D_FX->lag_fx,6),-23,1);//Q6 */
     exp = norm_s( CURRP_Q_D_FX->lag_fx );
     tmp = div_s( shl( 1, sub( 14, exp ) ), CURRP_Q_D_FX->lag_fx ); /*29-exp */
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_sat( L_mult0( tmp, 12800 ), sub( exp, 7 ) );
     temp32_fx = round_fx_sat( L_tmp );
-#else
-    L_tmp = L_shl( L_mult0( tmp, 12800 ), sub( exp, 7 ) );
-    temp32_fx = round_fx( L_tmp );
-#endif
     diff = round_fx( L_shl( temp32_fx, 16 - 6 ) ); /*Q0 */
 
     CURRP_Q_D_FX->nH_fx = find_rem( upper_cut_off_freq, diff, &rem_fx ); /*Q0 */
diff --git a/lib_dec/waveadjust_fec_dec.c b/lib_dec/waveadjust_fec_dec.c
deleted file mode 100644
index b573d3d7f8811e0014f216673ff2a11499026890..0000000000000000000000000000000000000000
--- a/lib_dec/waveadjust_fec_dec.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
-
-
-/*-------------------------------------------------------------------*
- * Local functions
- *
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * waveform_adj2()
- *
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * concealment_decode()
- *
- *
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * concealment_update()
- *
- *
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * concealment_update2()
- *
- *
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * concealment_signal_tuning()
- *
- *
- *-------------------------------------------------------------------*/
diff --git a/lib_dec/waveadjust_fec_dec_fx.c b/lib_dec/waveadjust_fec_dec_fx.c
index 0f7a45eb04d4cc5be0c54b7bf25ce2bbac0cb85e..75a514cc21c2fb99f546ae3ff75358544c97b3bc 100644
--- a/lib_dec/waveadjust_fec_dec_fx.c
+++ b/lib_dec/waveadjust_fec_dec_fx.c
@@ -35,28 +35,36 @@ void set_state( Word16 *state, Word16 num, Word16 N ) /*i/o: Qx */
     }
     state[tmp] = num;
     move16();
+
+    return;
 }
 
-void concealment_update_x( Word16 bfi, Word16 curr_mode, Word16 tonality, Word32 *invkoef /*Qinvkoef_scale*/, Word16 *invkoef_scale, void *_plcInfo )
+void concealment_update_x(
+    const Word16 bfi,
+    const Word16 core,
+    const Word16 tonality,
+    Word32 *invkoef /*Qinvkoef_scale*/,
+    Word16 *invkoef_scale,
+    T_PLCInfo_HANDLE hPlcInfo )
 {
-    T_PLCInfo *plcInfo = (T_PLCInfo *) _plcInfo;
-    Word32 *data_reci2 = plcInfo->data_reci2_fx;
-    Word16 *tcx_tonality = plcInfo->TCX_Tonality;
-    Word16 FrameSize = plcInfo->FrameSize;
-    Word16 subframe = plcInfo->subframe_fx;
+    Word32 *data_reci2 = hPlcInfo->data_reci2_fx;
+    Word16 *tcx_tonality = hPlcInfo->TCX_Tonality;
+    Word16 L_frameTCX = hPlcInfo->L_frameTCX;
+    Word16 subframe = hPlcInfo->subframe_fx;
     Word16 i;
     move16();
     move16();
-    IF( EQ_16( curr_mode, 1 ) )
+
+    IF( EQ_16( core, TCX_20_CORE ) )
     {
-        set_state( plcInfo->Transient, curr_mode, MAX_POST_LEN );
+        set_state( hPlcInfo->Transient, core, MAX_POST_LEN );
 
-        FOR( i = 0; i < FrameSize; i++ )
+        FOR( i = 0; i < L_frameTCX; i++ )
         {
             data_reci2[i] = invkoef[i];
             move32();
         }
-        plcInfo->data_reci2_scale = *invkoef_scale;
+        hPlcInfo->data_reci2_scale = *invkoef_scale;
         move16();
         IF( !bfi )
         {
@@ -68,7 +76,7 @@ void concealment_update_x( Word16 bfi, Word16 curr_mode, Word16 tonality, Word32
 
         IF( subframe == 0 )
         {
-            set_state( plcInfo->Transient, curr_mode, MAX_POST_LEN );
+            set_state( hPlcInfo->Transient, core, MAX_POST_LEN );
 
             IF( !bfi )
             {
@@ -83,7 +91,7 @@ void concealment_update_x( Word16 bfi, Word16 curr_mode, Word16 tonality, Word32
         {
 
             Word32 *ptr = data_reci2 + subframe;
-            Word16 FrameSize2 = shr( FrameSize, 1 );
+            Word16 FrameSize2 = shr( L_frameTCX, 1 );
 
             FOR( i = 0; i < FrameSize2; i++ )
             {
@@ -91,13 +99,15 @@ void concealment_update_x( Word16 bfi, Word16 curr_mode, Word16 tonality, Word32
                 move32();
             }
 
-            plcInfo->data_reci2_scale = *invkoef_scale;
+            hPlcInfo->data_reci2_scale = *invkoef_scale;
             move16();
         }
     }
+
     return;
 }
 
+
 static Word16 zero_pass_w32_x( const Word16 *s, const Word16 N ) /* i: Qx*/ /* o: 2*Qx-31*/
 {
     Word16 i;
@@ -476,13 +486,8 @@ void pitch_modify_x( Word16 *s_LP /*Qx*/, Word16 *voicing /*Q15*/, Word16 *pitch
     eng1 = L_mult0( eng1_w, eng2_w );
 
     norm = norm_l( eng1 );
-#ifdef BASOP_NOGLOB
     eng1_w = extract_h( L_shl_sat( eng1, norm ) );
     eng2_w = extract_h( L_shl_sat( eng3, norm ) );
-#else
-    eng1_w = extract_h( L_shl( eng1, norm ) );
-    eng2_w = extract_h( L_shl( eng3, norm ) );
-#endif
 
     IF( GE_32( eng3, eng1 ) )
     {
@@ -606,15 +611,17 @@ Word16 get_conv_relation_x( Word16 *s_LP /*Qx*/, Word16 shIFt, Word16 N ) /*o :Q
     return tmp;
 }
 
-static Word16 pitch_search_fx( Word16 *s /*Qs*/, /* lastPcmOut */
-                               Word16 *outx_new /*Qoutx_new*/,
-                               Word16 Framesize,
-                               Word16 *voicing /*Q15*/,
-                               Word16 zp, /*Q0*/
-                               Word32 ener /*Q8*/,
-                               Word32 ener_mean /*Q8*/,
-                               Word32 *mdct_data /*Qmdct*/,
-                               Word16 curr_mode )
+
+static Word16 pitch_search_fx(
+    Word16 *s /*Qs*/, /* lastPcmOut */
+    Word16 *outx_new /*Qoutx_new*/,
+    Word16 Framesize,
+    Word16 *voicing /*Q15*/,
+    Word16 zp, /*Q0*/
+    Word32 ener /*Q8*/,
+    Word32 ener_mean /*Q8*/,
+    Word32 *mdct_data /*Qmdct*/,
+    Word16 curr_mode )
 {
     Word16 pitch = 0;
     Word32 cov_max = L_deposit_l( 0 ), tilt_enr1, tilt_enr2;
@@ -772,78 +779,77 @@ static Word16 pitch_search_fx( Word16 *s /*Qs*/, /* lastPcmOut */
     return pitch;
 }
 
-void concealment_init_x( Word16 N, void *_plcInfo )
+void concealment_init_x(
+    const Word16 L_frameTCX,
+    T_PLCInfo_HANDLE hPlcInfo )
 {
-    T_PLCInfo *plcInfo = (T_PLCInfo *) _plcInfo;
     Word16 i;
 
-    plcInfo->FrameSize = N;
+    hPlcInfo->L_frameTCX = L_frameTCX;
     move16();
-    plcInfo->Pitch_fx = 0;
+    hPlcInfo->Pitch_fx = 0;
     move16();
-    plcInfo->T_bfi_fx = 0;
+    hPlcInfo->T_bfi_fx = 0;
     move16();
-    plcInfo->outx_new_n1_fx = 0;
+    hPlcInfo->outx_new_n1_fx = 0;
     move16();
-    plcInfo->nsapp_gain_fx = 0;
+    hPlcInfo->nsapp_gain_fx = 0;
     move16();
-    plcInfo->nsapp_gain_n_fx = 0;
+    hPlcInfo->nsapp_gain_n_fx = 0;
     move16();
-    plcInfo->ener_mean_fx = L_deposit_l( 15213 ); /*Q8 59.4260f*256*/
-    plcInfo->ener_fx = L_deposit_l( 0 );
-    plcInfo->zp_fx = N;
+    hPlcInfo->ener_mean_fx = L_deposit_l( 15213 ); /*Q8 59.4260f*256*/
+    hPlcInfo->ener_fx = L_deposit_l( 0 );
+    hPlcInfo->zp_fx = L_frameTCX;
     move16();
-    plcInfo->recovery_gain = 0;
+    hPlcInfo->recovery_gain = 0;
     move16();
-    plcInfo->step_concealgain_fx = 0;
+    hPlcInfo->step_concealgain_fx = 0;
     move16();
-    plcInfo->concealment_method = TCX_NONTONAL;
+    hPlcInfo->concealment_method = TCX_NONTONAL;
     move16();
-    plcInfo->subframe_fx = 0;
+    hPlcInfo->subframe_fx = 0;
     move16();
-    plcInfo->nbLostCmpt = (Word16) L_deposit_l( 0 );
+    hPlcInfo->nbLostCmpt = (Word16) L_deposit_l( 0 );
     move16();
-    plcInfo->seed = 21845;
+    hPlcInfo->seed = 21845;
     move16();
 
     FOR( i = 0; i < TCX_TONALITY_INIT_CNT; i++ )
     {
-        plcInfo->TCX_Tonality[i] = 1;
+        hPlcInfo->TCX_Tonality[i] = 1;
         move16();
     }
     FOR( i = TCX_TONALITY_INIT_CNT; i < DEC_STATE_LEN; i++ )
     {
-        plcInfo->TCX_Tonality[i] = 0;
+        hPlcInfo->TCX_Tonality[i] = 0;
         move16();
     }
 
     FOR( i = 0; i < MAX_POST_LEN; i++ )
     {
-        plcInfo->Transient[i] = 1;
+        hPlcInfo->Transient[i] = 1;
         move16();
     }
 
     FOR( i = 0; i < L_FRAME_MAX; i++ )
     {
-        plcInfo->data_reci2_fx[i] = L_deposit_l( 0 );
+        hPlcInfo->data_reci2_fx[i] = L_deposit_l( 0 );
     }
+
     return;
 }
+
+
 void concealment_init_ivas_fx(
     const Word16 L_frameTCX,
     T_PLCInfo_HANDLE hPlcInfo )
 {
     Word16 i;
+
     hPlcInfo->L_frameTCX = L_frameTCX;
     move16();
-    hPlcInfo->FrameSize = L_frameTCX;
-    move16();
-    hPlcInfo->Pitch = 0;
-    move16();
     hPlcInfo->Pitch_fx = 0;
     move16();
-    hPlcInfo->T_bfi = 0;
-    move16();
     hPlcInfo->T_bfi_fx = 0;
     move16();
     hPlcInfo->outx_new_n1_fx = 0;
@@ -854,8 +860,6 @@ void concealment_init_ivas_fx(
     move16();
     hPlcInfo->ener_mean_fx = L_deposit_l( 15213 );
     hPlcInfo->ener_fx = L_deposit_l( 0 );
-    hPlcInfo->zp = L_frameTCX;
-    move16();
     hPlcInfo->zp_fx = L_frameTCX;
     move16();
     hPlcInfo->recovery_gain = 0;
@@ -864,8 +868,6 @@ void concealment_init_ivas_fx(
     move16();
     hPlcInfo->concealment_method = TCX_NONTONAL;
     move16();
-    hPlcInfo->subframe = 0;
-    move16();
     hPlcInfo->subframe_fx = 0;
     move16();
     hPlcInfo->nbLostCmpt = (Word16) L_deposit_l( 0 );
@@ -905,21 +907,25 @@ static Word16 own_random_fix(              /* o  : output random value */
     return ( *seed );
 }
 
-void concealment_decode_fix( Word16 curr_mode, Word32 *invkoef /*Qinvkoef_scale*/, Word16 *invkoef_scale, void *_plcInfo )
+void concealment_decode_fix(
+    Word16 curr_mode,
+    Word32 *invkoef /*Qinvkoef_scale*/,
+    Word16 *invkoef_scale,
+    T_PLCInfo_HANDLE hPlcInfo )
 {
-    T_PLCInfo *plcInfo = (T_PLCInfo *) _plcInfo;
     Word16 i;
-    Word16 N = plcInfo->FrameSize;
-    Word16 *seed = &( plcInfo->seed );
+    Word16 N = hPlcInfo->L_frameTCX;
+    Word16 *seed = &( hPlcInfo->seed );
     Word16 sign;
     move16();
-    IF( plcInfo->concealment_method == TCX_NONTONAL ) /* #define TCX_NONTONAL 0 */
+
+    IF( hPlcInfo->concealment_method == TCX_NONTONAL ) /* #define TCX_NONTONAL 0 */
     {
         IF( EQ_16( curr_mode, 1 ) )
         {
             /* copy the data of the last frame */
-            MVR2R_WORD32( plcInfo->data_reci2_fx, invkoef, N );
-            *invkoef_scale = plcInfo->data_reci2_scale;
+            MVR2R_WORD32( hPlcInfo->data_reci2_fx, invkoef, N );
+            *invkoef_scale = hPlcInfo->data_reci2_scale;
             move16();
             /* sign randomization */
             FOR( i = 0; i < N; i++ )
@@ -933,6 +939,7 @@ void concealment_decode_fix( Word16 curr_mode, Word32 *invkoef /*Qinvkoef_scale*
             }
         }
     }
+
     return;
 }
 
@@ -1108,25 +1115,29 @@ Word32 con_Log10( Word32 i_s32Val /*Qi_s32Val*/, Word16 i_s16Q /*Q0*/ ) /*o; Q26
     return s32Out;
 }
 
-void concealment_update2_x( const Word16 *outx_new /*Qoutx_new*/, void *_plcInfo, const Word16 FrameSize )
+void concealment_update2_x(
+    const Word16 *outx_new /*Qoutx_new*/,
+    T_PLCInfo_HANDLE hPlcInfo,
+    const Word16 FrameSize )
 {
-    T_PLCInfo *plcInfo = (T_PLCInfo *) _plcInfo;
-
-    plcInfo->zp_fx = zero_pass_w32_x( outx_new, FrameSize );
+    hPlcInfo->zp_fx = zero_pass_w32_x( outx_new, FrameSize );
     move16();
 
-    Log10OfEnergy_x( outx_new, &plcInfo->ener_fx, FrameSize ); /* Q8 */
+    Log10OfEnergy_x( outx_new, &hPlcInfo->ener_fx, FrameSize ); /* Q8 */
     test();
-    IF( LT_16( plcInfo->zp_fx, 100 ) && GT_32( plcInfo->ener_fx, L_shl( 50, 8 ) ) )
+    IF( LT_16( hPlcInfo->zp_fx, 100 ) && GT_32( hPlcInfo->ener_fx, L_shl( 50, 8 ) ) )
     {
-        plcInfo->ener_mean_fx = L_add( Mpy_32_16_1( plcInfo->ener_mean_fx, 32112 /* 0.98 Q15 */ ),
-                                       Mpy_32_16_1( plcInfo->ener_fx, 655 /* 0.02 Q15 */ ) );
+        hPlcInfo->ener_mean_fx = L_add( Mpy_32_16_1( hPlcInfo->ener_mean_fx, 32112 /* 0.98 Q15 */ ),
+                                        Mpy_32_16_1( hPlcInfo->ener_fx, 655 /* 0.02 Q15 */ ) );
         move32();
     }
+
     return;
 }
 
-static Word16 array_max_indx_fx( Word16 *s /*Qs*/, Word16 N )
+static Word16 array_max_indx_fx(
+    Word16 *s /*Qs*/,
+    Word16 N )
 {
     Word16 i, indx = 0;
     move16();
@@ -1246,32 +1257,18 @@ static void add_noise( Word16 *const sbuf,            /*Qsbuf*/
 
     IF( !firstFrame )
     {
-#ifdef BASOP_NOGLOB
         temp_OUT = sub_sat( noise_seg[0], mult( ( *outx_new_n1 ), 22282 /* 0.68 Q15 */ ) );
         sbuf[0] = add_sat( sbuf[0], mult( ( temp_OUT ), *gain ) );
         move16();
         *gain = mac_r_sat( L_mult_sat( 32439 /* 0.99 Q15 */, *gain ), 328 /* 0.01 Q15 */, *gain_n );
-#else
-        temp_OUT = sub( noise_seg[0], mult( ( *outx_new_n1 ), 22282 /* 0.68 Q15 */ ) );
-        sbuf[0] = add( sbuf[0], mult( ( temp_OUT ), *gain ) );
-        move16();
-        *gain = mac_r( L_mult( 32439 /* 0.99 Q15 */, *gain ), 328 /* 0.01 Q15 */, *gain_n );
-#endif
     }
 
     FOR( i = 1; i < Len; i++ )
     {
-#ifdef BASOP_NOGLOB
         temp_OUT = sub_sat( noise_seg[i], mult( ( noise_seg[i - 1] ), 22282 /* 0.68 Q15 */ ) );
         sbuf[i] = add_sat( sbuf[i], mult( ( temp_OUT ), *gain ) );
         move16();
         *gain = mac_r_sat( L_mult( 32439 /* 0.99 Q15 */, *gain ), 328 /* 0.01 Q15 */, *gain_n );
-#else
-        temp_OUT = sub( noise_seg[i], mult( ( noise_seg[i - 1] ), 22282 /* 0.68 Q15 */ ) );
-        sbuf[i] = add( sbuf[i], mult( ( temp_OUT ), *gain ) );
-        move16();
-        *gain = mac_r( L_mult( 32439 /* 0.99 Q15 */, *gain ), 328 /* 0.01 Q15 */, *gain_n );
-#endif
     }
 
     *outx_new_n1 = noise_seg[i - 1]; /*q0*/
@@ -1280,20 +1277,16 @@ static void add_noise( Word16 *const sbuf,            /*Qsbuf*/
     return;
 }
 
-static Word16 waveform_adj_fix( Word16 *overlapbuf,   /*Qoverlapbuf*/
-                                Word16 *outdata2,     /*Qoutdata2*/
-                                Word16 *outx_new,     /*Qoutx_new*/
-                                Word16 *data_noise,   /*Qoutx_new*/
-                                Word16 *outx_new_n1,  /*Q0*/
-                                Word16 *nsapp_gain,   /*Q15*/
-                                Word16 *nsapp_gain_n, /*Q15*/
-                                Word16 Framesize,
-                                Word8 T_bfi,
-                                Word16 voicing, /*Q15*/
-                                Word16 curr_mode,
-                                Word16 pitch /*Q0*/ )
+static Word16 waveform_adj_fix(
+    T_PLCInfo_HANDLE hPlcInfo,
+    Word16 *overlapbuf, /*Qoverlapbuf*/
+    Word16 *outdata2,   /*Qoutdata2*/
+    Word16 *outx_new,   /*Qoutx_new*/
+    const Word16 Framesize,
+    const Word16 voicing, /*Q15*/
+    const Word16 core )
 {
-    Word16 i, zp1, zp2, Framesizediv2, s16MaxCoefNorm;
+    Word16 i, zp1, zp2, Framesizediv2, s16MaxCoefNorm, pitch;
     Word16 sbuf[L_FRAME_MAX];
     Word16 tmp;
 
@@ -1301,6 +1294,8 @@ static Word16 waveform_adj_fix( Word16 *overlapbuf,   /*Qoverlapbuf*/
     zp1 = zero_pass_w32_x( outdata2, Framesizediv2 );
     zp2 = zero_pass_w32_x( outdata2 + Framesizediv2, Framesizediv2 );
 
+    pitch = hPlcInfo->Pitch_fx;
+
     /* judge if the pitch is usable */
     tmp = 1;
     move16();
@@ -1319,7 +1314,7 @@ static Word16 waveform_adj_fix( Word16 *overlapbuf,   /*Qoverlapbuf*/
     test();
     test();
     test();
-    IF( T_bfi && ( LE_16( pitch, Framesizediv2 ) ) && ( GT_16( Framesize, 256 ) ) && ( EQ_16( curr_mode, 1 ) ) )
+    IF( hPlcInfo->T_bfi_fx && ( LE_16( pitch, Framesizediv2 ) ) && ( GT_16( Framesize, 256 ) ) && ( EQ_16( core, 1 ) ) )
     {
         Word16 i1 = 0, i2 = 0;
         Word16 pos1, pos2, pos3;
@@ -1387,11 +1382,7 @@ static Word16 waveform_adj_fix( Word16 *overlapbuf,   /*Qoverlapbuf*/
             }
             FOR( i = 0; i < pitch125; i++ )
             {
-#ifdef BASOP_NOGLOB
                 pitch125_data[i] = round_fx_sat( L_shr_sat( L_add_sat( ( L_mult( p_tmp[i], 20972 ) ), L_mac_sat( L_mult( p_tmp[i - 1], 5898 ), p_tmp[i + 1], 5898 ) ), s16MaxCoefNorm ) );
-#else
-                pitch125_data[i] = round_fx( L_shr( L_add( ( L_mult( p_tmp[i], 20972 ) ), L_mac( L_mult( p_tmp[i - 1], 5898 ), p_tmp[i + 1], 5898 ) ), s16MaxCoefNorm ) );
-#endif
                 move16();
             }
         }
@@ -1406,15 +1397,18 @@ static Word16 waveform_adj_fix( Word16 *overlapbuf,   /*Qoverlapbuf*/
            last good frame) is still needed and overlapbuf overlaps outdata2 */
         Copy( &sbuf[Framesize / 4], pitch125_data, shr( imult1616( 3, Framesize ), 2 ) );
 
-        *nsapp_gain = 0;
+        hPlcInfo->nsapp_gain_fx = 0;
         move16();
-        *nsapp_gain_n = sub( 32767, shr( voicing, 1 ) ); /* q15 */
+        hPlcInfo->nsapp_gain_n_fx = sub( 32767, shr( voicing, 1 ) ); /* q15 */
         tmp = Framesize;
         move16();
+
         /* use last good signal for noise generation */
-        add_noise( sbuf, outx_new_n1, outdata2, tmp, nsapp_gain, nsapp_gain_n, 1 );
+        add_noise( sbuf, &( hPlcInfo->outx_new_n1_fx ), outdata2, tmp, &( hPlcInfo->nsapp_gain_fx ), &( hPlcInfo->nsapp_gain_n_fx ), 1 );
+
         /* save current (noisy) output from IMDCT */
-        MVR2R_WORD16( outx_new, data_noise, tmp );
+        MVR2R_WORD16( outx_new, hPlcInfo->data_noise, tmp );
+
         /* overlapbuf can now be filled with sbuf, needed for subsequently lost frames */
         Copy( pitch125_data, &overlapbuf[Framesize / 4], shr( imult1616( 3, Framesize ), 2 ) );
     }
@@ -1423,31 +1417,31 @@ static Word16 waveform_adj_fix( Word16 *overlapbuf,   /*Qoverlapbuf*/
         outx_new[i] = sbuf[i];
         move16();
     }
+
     return pitch;
 }
 
-void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
-                        Word16 *outx_new,        /*Qoutx_new*/
-                        Word16 *data_noise,      /*Qoutx_new*/
-                        Word16 *outx_new_n1,     /*Q0*/
-                        Word16 *nsapp_gain,      /*Q15*/
-                        Word16 *nsapp_gain_n,    /*Q15*/
-                        Word16 *recovery_gain,   /*Q14*/
-                        Word16 step_concealgain, /*Q15*/
-                        Word16 pitch,            /*Q0*/
-                        Word16 Framesize,
-                        Word16 delay,
-                        Word16 bfi_cnt,
-                        Word16 bfi )
+
+void waveform_adj2_fix(
+    T_PLCInfo_HANDLE hPlcInfo,
+    Word16 *overlapbuf, /*Qoverlapbuf*/
+    Word16 *outx_new,   /*Qoutx_new*/
+    const Word16 delay,
+    const Word16 bfi_cnt,
+    const Word16 bfi )
 {
-    Word16 i, n, tablescale, ratio,
-        dat, Framesizesubn, Framesizesubp, tmp16, s, ptable, temp_OUT, s16MaxCoefNorm, s16MaxCoefNorm2;
+    Word16 i, n, tablescale, ratio, dat, Framesizesubn, Framesizesubp, tmp16, s, ptable, temp_OUT, s16MaxCoefNorm, s16MaxCoefNorm2;
     Word16 sbuf[L_FRAME_MAX];
+    Word16 pitch, L_frameTCX;
 
+    pitch = hPlcInfo->Pitch_fx;
+    move16();
+    L_frameTCX = hPlcInfo->L_frameTCX;
+    move16();
     n = 0;
     move16();
-    Framesizesubn = sub( Framesize, n );
-    Framesizesubp = sub( Framesize, pitch );
+    Framesizesubn = sub( L_frameTCX, n );
+    Framesizesubp = sub( L_frameTCX, pitch );
     IF( pitch > 0 )
     {
         WHILE( Framesizesubn > 0 )
@@ -1460,21 +1454,21 @@ void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
                 move16();
             }
             n = add( n, pitch );
-            Framesizesubn = sub( Framesize, n );
+            Framesizesubn = sub( L_frameTCX, n );
         }
 
-        FOR( i = 0; i < Framesize; i++ )
+        FOR( i = 0; i < L_frameTCX; i++ )
         {
             overlapbuf[i] = sbuf[i];
             move16();
         }
 
         {
-            Word16 size = Framesize;
-            Word16 *noise_ptr = data_noise;
+            Word16 size = L_frameTCX;
+            Word16 *noise_ptr = hPlcInfo->data_noise;
             move16();
             /* use last (noisy) output from IMDCT for noise generation */
-            add_noise( sbuf, outx_new_n1, noise_ptr, size, nsapp_gain, nsapp_gain_n, 0 );
+            add_noise( sbuf, &( hPlcInfo->outx_new_n1_fx ), noise_ptr, size, &( hPlcInfo->nsapp_gain_fx ), &( hPlcInfo->nsapp_gain_n_fx ), 0 );
 
             /* save current (noisy) output from IMDCT */
             IF( bfi )
@@ -1485,7 +1479,7 @@ void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
         test();
         IF( EQ_16( bfi_cnt, 4 ) || bfi == 0 )
         {
-            SWITCH( Framesize )
+            SWITCH( L_frameTCX )
             {
                 case 160:
                 {
@@ -1533,52 +1527,40 @@ void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
                 Word16 gain_zero_start = 10000;
                 move16();
 
-                IF( step_concealgain > 0 )
+                IF( hPlcInfo->step_concealgain_fx > 0 )
                 {
-                    gain_zero_start = BASOP_Util_Divide1616_Scale( *recovery_gain, step_concealgain, &s );
+                    gain_zero_start = BASOP_Util_Divide1616_Scale( hPlcInfo->recovery_gain, hPlcInfo->step_concealgain_fx, &s );
                     gain_zero_start = shl( gain_zero_start, sub( s, 14 ) ); /* q0 */
                     gain_zero_start = add( gain_zero_start, 1 );
                 }
 
                 if ( delay > 0 )
                 {
-                    Framesize = sub( Framesize, delay );
+                    L_frameTCX = sub( L_frameTCX, delay );
                 }
 
-                s16MaxCoefNorm = sub( ffr_getSfWord16( sbuf, Framesize ), 1 );
-                s16MaxCoefNorm2 = ffr_getSfWord16( outx_new, Framesize );
-                tmp16 = vadmin( gain_zero_start, Framesize );
+                s16MaxCoefNorm = sub( ffr_getSfWord16( sbuf, L_frameTCX ), 1 );
+                s16MaxCoefNorm2 = ffr_getSfWord16( outx_new, L_frameTCX );
+                tmp16 = vadmin( gain_zero_start, L_frameTCX );
                 FOR( i = 0; i < tmp16; i++ )
                 {
                     ratio = extract_l( L_shr( L_mult( i, ptable ), tablescale ) );
                     dat = shl( sbuf[i], s16MaxCoefNorm );
-                    temp_OUT = mult( *recovery_gain, sub( 32767, ratio ) );
-#ifdef BASOP_NOGLOB
+                    temp_OUT = mult( hPlcInfo->recovery_gain, sub( 32767, ratio ) );
                     outx_new[i] = round_fx_sat( L_add_sat( L_shr_sat( L_mult( temp_OUT, dat ), sub( s16MaxCoefNorm, 1 ) ), L_shr_sat( L_mult( shl( outx_new[i], s16MaxCoefNorm2 ), ratio ), s16MaxCoefNorm2 ) ) );
-#else
-                    outx_new[i] = round_fx( L_add( L_shr( L_mult( temp_OUT, dat ), sub( s16MaxCoefNorm, 1 ) ), L_shr( L_mult( shl( outx_new[i], s16MaxCoefNorm2 ), ratio ), s16MaxCoefNorm2 ) ) );
-#endif
                     move16();
-#ifdef BASOP_NOGLOB
-                    *recovery_gain = sub_sat( *recovery_gain, shr_r( step_concealgain, 1 ) ); /* q14 */
-#else
-                    *recovery_gain = sub( *recovery_gain, shr_r( step_concealgain, 1 ) ); /* q14 */
-#endif
+                    hPlcInfo->recovery_gain = sub_sat( hPlcInfo->recovery_gain, shr_r( hPlcInfo->step_concealgain_fx, 1 ) ); /* q14 */
                 }
-                FOR( i = gain_zero_start; i < Framesize; i++ )
+                FOR( i = gain_zero_start; i < L_frameTCX; i++ )
                 {
                     ratio = extract_l( L_shr( L_mult( i, ptable ), tablescale ) );
-#ifdef BASOP_NOGLOB
                     outx_new[i] = round_fx_sat( L_shr_sat( L_mult( shl( outx_new[i], s16MaxCoefNorm2 ), ratio ), s16MaxCoefNorm2 ) );
-#else
-                    outx_new[i] = round_fx( L_shr( L_mult( shl( outx_new[i], s16MaxCoefNorm2 ), ratio ), s16MaxCoefNorm2 ) );
-#endif
                     move16();
                 }
 
-                if ( *recovery_gain < 0 )
+                if ( hPlcInfo->recovery_gain < 0 )
                 {
-                    *recovery_gain = 0;
+                    hPlcInfo->recovery_gain = 0;
                     move16();
                 }
             }
@@ -1586,9 +1568,9 @@ void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
             {
                 /* overlap-and-add */
                 Word16 tmp;
-                s16MaxCoefNorm = sub( ffr_getSfWord16( sbuf, Framesize ), 1 );
-                s16MaxCoefNorm2 = ffr_getSfWord16( outx_new, Framesize );
-                FOR( i = 0; i < Framesize; i++ )
+                s16MaxCoefNorm = sub( ffr_getSfWord16( sbuf, L_frameTCX ), 1 );
+                s16MaxCoefNorm2 = ffr_getSfWord16( outx_new, L_frameTCX );
+                FOR( i = 0; i < L_frameTCX; i++ )
                 {
                     dat = shl( sbuf[i], s16MaxCoefNorm );
                     tmp = extract_l( L_shr( L_mult( i, ptable ), tablescale ) );
@@ -1599,7 +1581,7 @@ void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
         }
         ELSE
         {
-            FOR( i = 0; i < Framesize; i++ )
+            FOR( i = 0; i < L_frameTCX; i++ )
             {
                 outx_new[i] = sbuf[i];
                 move16();
@@ -1609,71 +1591,44 @@ void waveform_adj2_fix( Word16 *overlapbuf,      /*Qoverlapbuf*/
     return;
 }
 
-void concealment_signal_tuning_fx( Word16 bfi, Word16 curr_mode, Word16 *outx_new_fx /*Qoutx_new_fx*/, void *_plcInfo, Word16 nbLostCmpt, Word16 pre_bfi, Word16 *OverlapBuf_fx /*QOverlapBuf_fx*/, Word16 past_core_mode, Word16 *outdata2_fx /*Qoutdata2_fx*/, Decoder_State *st )
+void concealment_signal_tuning_fx(
+    Decoder_State *st,
+    const Word16 bfi,
+    Word16 *outx_new_fx /*Qoutx_new_fx*/,
+    const Word16 past_core )
 {
-    T_PLCInfo *plcInfo = (T_PLCInfo *) _plcInfo;
-    Word16 FrameSize = plcInfo->FrameSize;
-    Word16 Pitch = plcInfo->Pitch_fx;
+    T_PLCInfo_HANDLE hPlcInfo = st->hPlcInfo;
+    Word16 L_frameTCX = hPlcInfo->L_frameTCX;
     Word16 voicing_fx = 0;
+    Word16 *OverlapBuf_fx = st->hTonalMDCTConc->secondLastPcmOut;
+    Word16 *outdata2_fx = st->hTonalMDCTConc->lastPcmOut;
     move16();
     move16();
     move16();
     move16();
+
     IF( bfi )
     {
-
         test();
-        IF( st->enablePlcWaveadjust && plcInfo->concealment_method == TCX_NONTONAL ) /* #define TCX_NONTONAL 0 */
+        IF( st->enablePlcWaveadjust && hPlcInfo->concealment_method == TCX_NONTONAL ) /* #define TCX_NONTONAL 0 */
         {
-
-            IF( EQ_16( nbLostCmpt, 1 ) )
+            IF( EQ_16( st->nbLostCmpt, 1 ) )
             {
-                plcInfo->Pitch_fx = pitch_search_fx( outdata2_fx,
-                                                     outx_new_fx,
-                                                     FrameSize,
-                                                     &voicing_fx,
-                                                     plcInfo->zp_fx,
-                                                     ( plcInfo->ener_fx ),
-                                                     ( plcInfo->ener_mean_fx ),
-                                                     plcInfo->data_reci2_fx,
-                                                     curr_mode );
+                hPlcInfo->Pitch_fx = pitch_search_fx( outdata2_fx, outx_new_fx, L_frameTCX, &voicing_fx, hPlcInfo->zp_fx, ( hPlcInfo->ener_fx ), ( hPlcInfo->ener_mean_fx ), hPlcInfo->data_reci2_fx, st->core );
                 move16();
 
-                IF( plcInfo->Pitch_fx ) /* waveform adjustment for the first lost frame */
+                IF( hPlcInfo->Pitch_fx ) /* waveform adjustment for the first lost frame */
                 {
-                    plcInfo->Pitch_fx = waveform_adj_fix( OverlapBuf_fx,
-                                                          outdata2_fx,
-                                                          outx_new_fx,
-                                                          plcInfo->data_noise,
-                                                          &plcInfo->outx_new_n1_fx,
-                                                          &plcInfo->nsapp_gain_fx,
-                                                          &plcInfo->nsapp_gain_n_fx,
-                                                          FrameSize,
-                                                          plcInfo->T_bfi_fx,
-                                                          voicing_fx,
-                                                          curr_mode,
-                                                          plcInfo->Pitch_fx );
+                    hPlcInfo->Pitch_fx = waveform_adj_fix( hPlcInfo, OverlapBuf_fx, outdata2_fx, outx_new_fx, L_frameTCX, voicing_fx, st->core );
                     move16();
                 }
             }
-            ELSE IF( LT_16( nbLostCmpt, 5 ) ) /* waveform adjustment for the 2nd~4th lost frame */
+            ELSE IF( LT_16( st->nbLostCmpt, 5 ) ) /* waveform adjustment for the 2nd~4th lost frame */
             {
-                waveform_adj2_fix( OverlapBuf_fx,
-                                   outx_new_fx,
-                                   plcInfo->data_noise,
-                                   &plcInfo->outx_new_n1_fx,
-                                   &plcInfo->nsapp_gain_fx,
-                                   &plcInfo->nsapp_gain_n_fx,
-                                   &plcInfo->recovery_gain,
-                                   plcInfo->step_concealgain_fx,
-                                   Pitch,
-                                   FrameSize,
-                                   0,
-                                   nbLostCmpt,
-                                   bfi );
+                waveform_adj2_fix( hPlcInfo, OverlapBuf_fx, outx_new_fx, 0, st->nbLostCmpt, bfi );
             }
         }
-        plcInfo->T_bfi_fx = 1;
+        hPlcInfo->T_bfi_fx = 1;
         move16();
     }
     ELSE
@@ -1681,34 +1636,22 @@ void concealment_signal_tuning_fx( Word16 bfi, Word16 curr_mode, Word16 *outx_ne
         test();
         test();
         test();
-        IF( pre_bfi &&
-            past_core_mode != 0 &&
+        IF( st->prev_bfi &&
+            past_core != ACELP_CORE &&
             GE_32( st->last_total_brate, 48000 ) &&
             EQ_16( st->last_codec_mode, MODE2 ) )
         {
-            IF( plcInfo->concealment_method == TCX_NONTONAL ) /* #define TCX_NONTONAL 0 */
+            IF( hPlcInfo->concealment_method == TCX_NONTONAL ) /* #define TCX_NONTONAL 0 */
             {
-                IF( LT_32( plcInfo->nbLostCmpt, 4 ) ) /* smoothing of the concealed signal with the good signal */
+                IF( LT_32( hPlcInfo->nbLostCmpt, 4 ) ) /* smoothing of the concealed signal with the good signal */
                 {
-                    waveform_adj2_fix( OverlapBuf_fx,
-                                       outx_new_fx,
-                                       plcInfo->data_noise,
-                                       &plcInfo->outx_new_n1_fx,
-                                       &plcInfo->nsapp_gain_fx,
-                                       &plcInfo->nsapp_gain_n_fx,
-                                       &plcInfo->recovery_gain,
-                                       plcInfo->step_concealgain_fx,
-                                       Pitch,
-                                       FrameSize,
-                                       0,
-                                       add( extract_l( plcInfo->nbLostCmpt ), 1 ),
-                                       bfi );
+                    waveform_adj2_fix( hPlcInfo, OverlapBuf_fx, outx_new_fx, 0, add( extract_l( hPlcInfo->nbLostCmpt ), 1 ), bfi );
                 }
             }
         }
         ELSE
         {
-            plcInfo->T_bfi_fx = 0;
+            hPlcInfo->T_bfi_fx = 0;
             move16();
         }
     }
diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c
index bae26790190447ebef64e2a6b592056991fff8d6..5003712b7ceda9821bc022dd7e0275be48282386 100644
--- a/lib_enc/ACcontextMapping_enc_fx.c
+++ b/lib_enc/ACcontextMapping_enc_fx.c
@@ -7,14 +7,15 @@
 #include "options.h"
 #include "basop_util.h"
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_enc.h"
 #include "prot_fx_enc.h"
-#include "ivas_prot.h" /* Range coder header file */
+
+#define MAKE_NUMBER_QX( number, QX )     ( ( number ) << ( QX ) )                                      /* evaulated at compile time */
+#define MAKE_VARIABLE_QX( variable, QX ) W_shl( W_deposit32_l( L_deposit_l( ( variable ) ) ), ( QX ) ) /* evaluated at run time */
 
 /*-------------------------------------------------------------------*
  * ACcontextMapping_encode2_no_mem_s17_LC_fx()
@@ -342,13 +343,13 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx(
 
     /* Push number of encoded tuples */
     value = sub( shr( lastnz, 1 ), 1 ); /* Q0 */
-    push_next_indice_fx( hBstr, value, nbbits_ntuples );
+    push_next_indice( hBstr, value, nbbits_ntuples );
 
     /* Push arithmetic coded bits */
-    push_next_bits_fx( hBstr, &ptr[nbbits_ntuples], sub( bp, nbbits_ntuples ) );
+    push_next_bits( hBstr, (UWord16 *) &ptr[nbbits_ntuples], sub( bp, nbbits_ntuples ) );
 
     /* Push sign bits */
-    push_next_bits_fx( hBstr, signs, nbbits_signs );
+    push_next_bits( hBstr, (UWord16 *) signs, nbbits_signs );
     bp = add( bp, nbbits_signs ); /* Q0 */
 
     /*write residual Quantization bits*/
@@ -371,7 +372,7 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx(
     assert( bp + k <= nbbits );
 
     /* Push the rest of the buffer */
-    push_next_bits_fx( hBstr, &ptr[bp], sub( nbbits, bp ) );
+    push_next_bits( hBstr, (UWord16 *) &ptr[bp], sub( nbbits, bp ) );
 
     return /*(bp+nbbits_lsbs)*/; /*return only for debug plot*/
 }
@@ -841,7 +842,7 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
 
         /*Start Encoding*/
         /* Initialize range encoder */
-        rc_uni_enc_init( &rc_st_enc );
+        rc_uni_enc_init_fx( &rc_st_enc );
 
         /*Main Loop through the 2-tuples*/
         b1_i = -1;
@@ -909,7 +910,7 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
             {
                 pki = ari_lookup_s17_LC[t + ( ( lev1 + 1 ) << ( NBITS_CONTEXT + NBITS_RATEQ ) )]; /* Q0 */
                 move16();
-                rc_uni_enc_encode_symbol_fastS( &rc_st_enc, VAL_ESC, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode ESC symbol */
+                rc_uni_enc_encode_symbol_fastS_fx( &rc_st_enc, VAL_ESC, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode ESC symbol */
 
                 *lsbs_bits-- = s_and( a1, 1 );
                 *lsbs_bits-- = s_and( b1, 1 );
@@ -927,7 +928,7 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
 
             pki = ari_lookup_s17_LC[t + ( ( lev1 + 1 ) << ( NBITS_CONTEXT + NBITS_RATEQ ) )]; /* Q0 */
             move16();
-            rc_uni_enc_encode_symbol_fastS( &rc_st_enc, a1 + A_THRES * b1, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode MSB symbol */
+            rc_uni_enc_encode_symbol_fastS_fx( &rc_st_enc, a1 + A_THRES * b1, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode MSB symbol */
 
             /*Confirm that there is no overflow, i.e. bit-budget has not exceeded */
 
@@ -1009,7 +1010,7 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
 
         /*Start Encoding*/
         /* Initialize range encoder */
-        rc_uni_enc_init( &rc_st_enc );
+        rc_uni_enc_init_fx( &rc_st_enc );
 
         /*Main Loop through the 2-tuples*/
         FOR( k = 0; k < lastnz; k += 2 )
@@ -1064,7 +1065,7 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
             {
                 pki = ari_lookup_s17_LC[t + ( ( rateQ ) << NBITS_CONTEXT ) + ( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )];
                 move16();
-                rc_uni_enc_encode_symbol_fastS( &rc_st_enc, VAL_ESC, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode ESC symbol */
+                rc_uni_enc_encode_symbol_fastS_fx( &rc_st_enc, VAL_ESC, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode ESC symbol */
 
                 *lsbs_bits-- = s_and( a1, 1 );
                 *lsbs_bits-- = s_and( b1, 1 );
@@ -1082,8 +1083,9 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
             }
 
             move16();
-            pki = ari_lookup_s17_LC[t + ( ( rateQ ) << NBITS_CONTEXT ) + ( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )];                           /* Q0 */
-            rc_uni_enc_encode_symbol_fastS( &rc_st_enc, a1 + A_THRES * b1, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode MSB symbol */
+
+            pki = ari_lookup_s17_LC[t + ( ( rateQ ) << NBITS_CONTEXT ) + ( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )];                              /* Q0 */
+            rc_uni_enc_encode_symbol_fastS_fx( &rc_st_enc, a1 + A_THRES * b1, cum_freq_ari_pk_s17_LC_ext[pki], sym_freq_ari_pk_s17_LC_ext[pki], 14 ); /* Encode MSB symbol */
 
             /*Confirm that there is no overflow, i.e. bit-budget has not exceeded */
 
@@ -1105,8 +1107,8 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
     }
 
     /* Finish range encoder */
-    rc_tot_bits = rc_uni_enc_finish( &rc_st_enc ); /* No. of bits consumed by range coder	Q0*/
-    bp = add( rc_tot_bits, nbbits_ntuples );       /* Update bitstream pointer	Q0*/
+    rc_tot_bits = rc_uni_enc_finish_fx( &rc_st_enc ); /* No. of bits consumed by range coder    Q0*/
+    bp = add( rc_tot_bits, nbbits_ntuples );          /* Update bitstream pointer    Q0*/
 
     /* Cross-check that there is no overflow */
 
@@ -1214,11 +1216,11 @@ static Word16 find_last_nz_pair_fx(
  *-------------------------------------------------------------------*/
 
 Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
-    Word16 *x,                /* Spectral coefficients	Q0*/
-    const Word16 nt,          /* L - size of spectrum (no. of spectral coefficients)		Q0*/
+    Word16 *x,                /* Spectral coefficients    Q0*/
+    const Word16 nt,          /* L - size of spectrum (no. of spectral coefficients)        Q0*/
     Word16 *lastnz_out,       /* Q0 */
-    Word16 *nEncoded,         /* No. of spectral coefficients that can be coded without an overflow occuring		Q0*/
-    const Word16 target,      /* Target bits		Q0*/
+    Word16 *nEncoded,         /* No. of spectral coefficients that can be coded without an overflow occuring        Q0*/
+    const Word16 target,      /* Target bits        Q0*/
     Word16 *stop,             /* Q0 */
     Word16 mode,              /* Q0 */
     CONTEXT_HM_CONFIG *hm_cfg /* context-based harmonic model configuration */
@@ -1230,23 +1232,18 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
     UWord16 t;
     Word16 lastnz, lastnz2;
     Word16 rateFlag;
-    Word32 bit_estimate_fx;
-    Word16 bit_estimate_e;
+    Word64 bit_estimate_fx; /* Q23 */
+
     Word16 symbol;
     const UWord8 *lookup;
-    Word32 nbits2_fx; // Q23
-    Word16 nbits2_e;
+    Word64 nbits2_fx;
 
     /* Initialization */
-    bit_estimate_fx = 2 * ONE_IN_Q29;
-    bit_estimate_e = 2;
-    move32();
-    move16();
+    bit_estimate_fx = MAKE_NUMBER_QX( 2, Q23 );
+    move64();
 
     nbits2_fx = 0;
-    nbits2_e = 0;
-    move32();
-    move16();
+    move64();
 
     /* bits to encode lastnz */
     k = 1;
@@ -1254,15 +1251,13 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
     WHILE( LT_16( k, nt / 2 ) )
     {
-        bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ONE_IN_Q30, 1, &bit_estimate_e );
-        k = k << 1;
+        bit_estimate_fx = W_add( bit_estimate_fx, MAKE_NUMBER_QX( 1, Q23 ) );
+        k = shl( k, 1 );
         /* check while condition */
     }
 
-    nbits2_fx = bit_estimate_fx; /* exp(bit_estimate_e) */
-    nbits2_e = bit_estimate_e;
-    move32();
-    move16();
+    nbits2_fx = bit_estimate_fx;
+    move64();
 
     IF( hm_cfg )
     {
@@ -1345,13 +1340,12 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             }
 
             /* Init current 2-tuple encoding */
-            a1 = (Word16) abs( x[a1_i] );
-            b1 = (Word16) abs( x[b1_i] );
+            a1 = abs_s( x[a1_i] );
+            b1 = abs_s( x[b1_i] );
             lev1 = -( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
 
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( a1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( b1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
-
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( a1, 1 ), Q23 ) );
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( b1, 1 ), Q23 ) );
             /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
             lookup = &ari_lookup_s17_LC[t] + ( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
 
@@ -1361,9 +1355,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             {
                 pki = lookup[lev1]; /* ESC symbol */
 
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, 2 * ONE_IN_Q29, 2, &bit_estimate_e );                           /* Add 2 LSB bits corresponding to the bit-plane		exp(bit_estimate_e) */
-
+                bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC] );
+                bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( 2, Q23 ) );
                 a1 = shr( a1, 1 );
                 b1 = shr( b1, 1 );
 
@@ -1374,11 +1367,11 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
             pki = lookup[lev1];
 
-            symbol = add( a1, i_mult( A_THRES, b1 ) );                                                                                                  /* Q0 */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][symbol], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
+            symbol = add( a1, i_mult( A_THRES, b1 ) ); /* Q0 */
+            bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][symbol] );
 
             /* Should we truncate? */
-            IF( GT_32( L_shr( bit_estimate_fx, sub( Q16, bit_estimate_e ) ), L_shl( target, Q15 ) ) )
+            IF( GT_32( W_extract_l( W_shr( bit_estimate_fx, Q8 ) ), L_shl( target, Q15 ) ) )
             {
                 stop2 = 1;
                 move16();
@@ -1392,9 +1385,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             {
                 lastnz2 = add( b1_i, 1 );
                 nbits2_fx = bit_estimate_fx;
-                move32();
-                nbits2_e = bit_estimate_e;
-                move16();
+                move64();
             }
 
             /* Update context for next 2-tuple */
@@ -1435,11 +1426,11 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
         } /*end of the 2-tuples loop*/
 
-        total_output_bits = round_fx( L_shr( bit_estimate_fx, sub( Q15, bit_estimate_e ) ) ); /* Q0 */
+        total_output_bits = round_fx( W_extract_l( W_shr( bit_estimate_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
 
         IF( *stop )
         {
-            total_output_bits = round_fx( L_shr( nbits2_fx, sub( Q15, nbits2_e ) ) ); /* Q0 */
+            total_output_bits = round_fx( W_extract_l( W_shr( nbits2_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
         }
 
         IF( stop2 )
@@ -1450,7 +1441,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
         *nEncoded = lastnz2; /* Q0 */
         move16();
-        *stop = stop2; /* If zero, it means no overflow occured during bit-estimation	Q0*/
+        *stop = stop2; /* If zero, it means no overflow occured during bit-estimation    Q0*/
         move16();
         *lastnz_out = lastnz; /* Q0 */
         move16();
@@ -1464,7 +1455,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
         hm_cfg->numPeakIndices = numPeakIndicesOrig; /* Q0 */
         move16();
 
-        return round_fx( L_add( L_shr( nbits2_fx, sub( Q15, nbits2_e ) ), ONE_IN_Q14 ) ); /* Q0 */
+
+        return round_fx( L_add( W_extract_l( W_shr( nbits2_fx, Q7 ) ), ONE_IN_Q14 ) ); /* Q0 */
     }
     ELSE /* if (!hm_cfg) */
     {
@@ -1511,7 +1503,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
         lastnz = add( lastnz, 2 ); /* Q0 */
         IF( LT_16( lastnz, 2 ) )
         {
-            lastnz = 2; /* At least one tuple is coded	Q0*/
+            lastnz = 2; /* At least one tuple is coded    Q0*/
             move16();
         }
 
@@ -1530,8 +1522,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             move16();
             rateQ = add( rateFlag, extract_l( GT_16( k, shr( nt, 1 ) ) ) ); /* Q0 */
 
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( a1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( b1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( a1, 1 ), Q23 ) );
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( b1, 1 ), Q23 ) );
 
             /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
             lookup = &ari_lookup_s17_LC[t + shl( rateQ, NBITS_CONTEXT )]; /* Q0 */
@@ -1543,8 +1535,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
                 pki = lookup[( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )]; /* Q0 */
                 move16();
 
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, 2 * ONE_IN_Q29, 2, &bit_estimate_e );                           /* Add 2 LSB bits corresponding to the bit-plane  exp(bit_estimate_e) */
+                bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC] );
+                bit_estimate_fx = W_add( bit_estimate_fx, MAKE_NUMBER_QX( 2, Q23 ) );
 
                 a1 = shr( a1, 1 );
                 b1 = shr( b1, 1 );
@@ -1558,11 +1550,11 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             pki = lookup[( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )]; /* Q0 */
             move16();
 
-            symbol = add( a1, i_mult( A_THRES, b1 ) );                                                                                                  /* Q0 */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][symbol], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
+            symbol = add( a1, i_mult( A_THRES, b1 ) ); /* Q0 */
+            bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][symbol] );
 
             /* Should we truncate? */
-            IF( GT_32( L_shr( bit_estimate_fx, sub( Q16, bit_estimate_e ) ), L_shl( target, Q15 ) ) ) /* Overflow occured */
+            IF( GT_32( W_extract_l( W_shr( bit_estimate_fx, Q8 ) ), L_shl( target, Q15 ) ) )
             {
                 overflow_flag = 1;
                 move16();
@@ -1572,9 +1564,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
                 IF( abs_s( x[k] ) || abs_s( x[k + 1] ) ) /* No overflow & non-zero tuple */
                 {
                     nbits2_fx = bit_estimate_fx; /* exp(bit_estimate_e) */
-                    nbits2_e = bit_estimate_e;
-                    move32();
-                    move16();
+                    move64();
+
                     lastnz2 = add( k, 2 );
                 }
             }
@@ -1594,15 +1585,15 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
         } /*end of the 2-tuples loop*/
 
-        tot_bits2 = round_fx( L_shr( nbits2_fx, sub( Q15, nbits2_e ) ) );
-        IF( LT_16( lastnz2, lastnz ) ) /* Overflow occured because unable to code all tuples */
+        tot_bits2 = round_fx( W_extract_l( W_shr( nbits2_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
+        IF( LT_16( lastnz2, lastnz ) )                                 /* Overflow occured because unable to code all tuples */
         {
             overflow_flag = 1;
             move16();
         }
         IF( EQ_16( mode, -1 ) )
         {
-            tot_bits2 = round_fx( L_shr( bit_estimate_fx, sub( Q15, bit_estimate_e ) ) ); /* Q0 */
+            tot_bits2 = round_fx( W_extract_l( W_shr( bit_estimate_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
         }
         IF( overflow_flag == 0 ) /* No overflow */
         {
@@ -1617,7 +1608,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
     }
     ELSE
     {
-        *stop = round_fx( L_shr( bit_estimate_fx, sub( Q15, bit_estimate_e ) ) ); /* Q0 */
+        *stop = round_fx( W_extract_l( W_shr( bit_estimate_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
         move16();
     }
 }
@@ -1668,10 +1659,8 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
         move16();
     }
 
-    hContextMem->bit_estimate_fx = 2; /* Q0 */
-    move32();
-    hContextMem->bit_estimate_e = Q31;
-    move16();
+    hContextMem->bit_estimate_fx = MAKE_NUMBER_QX( 2, Q23 );
+    move64();
 
 
     /* Init */
@@ -1684,15 +1673,15 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
 
     WHILE( LT_16( k, hContextMem->nt_half ) )
     {
-        hContextMem->bit_estimate_fx = L_add( hContextMem->bit_estimate_fx, 1 ); /* exp(bit_estimate_e) */
-        move32();
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_NUMBER_QX( 1, Q23 ) );
+        move64();
 
         k = shl( k, 1 );
         /* check while condition */
     }
 
     /* bits to encode lastnz */
-    hContextMem->nbits_old = extract_l( hContextMem->bit_estimate_fx ); /* Q0 */
+    hContextMem->nbits_old = round_fx( W_extract_l( W_shr( hContextMem->bit_estimate_fx, Q7 ) ) ); /* Q0 */
     move16();
 
     hContextMem->ctx = 0;
@@ -1712,14 +1701,8 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
             BREAK;
         }
     }
-    Word16 tmp2 = extract_l( hContextMem->bit_estimate_fx );
-    Word16 tmp = norm_l( hContextMem->bit_estimate_fx );
-    hContextMem->bit_estimate_e = sub( Q31, tmp );
-    move16();
-    hContextMem->bit_estimate_fx = L_shl( hContextMem->bit_estimate_fx, tmp ); /* exp(bit_estimate_e) */
-    move32();
 
-    return tmp2;
+    return hContextMem->nbits_old;
 }
 
 /*-------------------------------------------------------------------*
@@ -1747,7 +1730,8 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
 
     /* Main Loop through the 2-tuples */
     /*hContextMem->nt_half = end_line >> 1;*/
-    FOR( k = start_line; k < min( hContextMem->lastnz, end_line ); k += 2 )
+    Word16 len = s_min( hContextMem->lastnz, end_line );
+    FOR( k = start_line; k < len; k += 2 )
     {
         a1_i = k; /* Q0 */
         move16();
@@ -1776,8 +1760,9 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
         lev1 = -( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) ); /* Q0 */
 
         /* Signs Bits */
-        hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, imult3216( ONE_IN_Q30, s_min( a1, 1 ) ), Q1, &hContextMem->bit_estimate_e ); /* exp(hContextMem->bit_estimate_e) */
-        hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, imult3216( ONE_IN_Q30, s_min( b1, 1 ) ), Q1, &hContextMem->bit_estimate_e ); /* exp(hContextMem->bit_estimate_e) */
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_VARIABLE_QX( s_min( a1, 1 ), Q23 ) );
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_VARIABLE_QX( s_min( b1, 1 ), Q23 ) );
+
         move32();
         move32();
 
@@ -1791,11 +1776,12 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
             pki = lookup[lev1]; /* Q0 */
             move16();
 
-            hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC], Q8, &hContextMem->bit_estimate_e ); /* exp(hContextMem->bit_estimate_e) */
-            hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, 2 * ONE_IN_Q29, Q2, &hContextMem->bit_estimate_e );                           /* Add the 2 LSB bits that were shifted out	exp(hContextMem->bit_estimate_e) */
+            hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC] );
+            hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_NUMBER_QX( 2, Q23 ) );
             move32();
             move32();
 
+
             // hContextMem->bit_estimate = hContextMem->bit_estimate + ari_bit_estimate_s17_LC[pki][VAL_ESC];
             // hContextMem->bit_estimate += 2; /* Add the 2 LSB bits that were shifted out */
 
@@ -1808,8 +1794,9 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
 
         pki = lookup[lev1]; /* Q0 */
         move16();
-        symbol = add( a1, i_mult( A_THRES, b1 ) );                                                                                                                                                       /* MSB symbol	Q0*/
-        hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][symbol], Q8, &hContextMem->bit_estimate_e ); /* exp(bit_estimate_e) */
+        symbol = add( a1, i_mult( A_THRES, b1 ) ); /* MSB symbol    Q0*/
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][symbol] );
+
         move32();
         // hContextMem->bit_estimate = hContextMem->bit_estimate + ari_bit_estimate_s17_LC[pki][symbol];
 
@@ -1828,529 +1815,14 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
         hContextMem->ctx = add( i_mult( s_and( hContextMem->ctx, 0xf ), 16 ), t ); /* Q0 */
         move16();
 
-    }                                                                                                               /*end of the 2-tuples loop*/
-    total_output_bits = round_fx( L_shr( hContextMem->bit_estimate_fx, sub( Q15, hContextMem->bit_estimate_e ) ) ); /* Q0 */
+    }                                                                                         /*end of the 2-tuples loop*/
+    total_output_bits = round_fx( W_extract_l( W_shr( hContextMem->bit_estimate_fx, Q7 ) ) ); /* Q0 */
     // total_output_bits = (Word16) ( hContextMem->bit_estimate + 0.5f );
 
+
     bandBits = sub( total_output_bits, hContextMem->nbits_old ); /* Q0 */
     hContextMem->nbits_old = total_output_bits;                  /* Q0 */
     move16();
 
     return bandBits;
 }
-
-
-#ifdef IVAS_CODE_RANGE_CODER
-
-/*-------------------------------------------------------------------*
- * RCcontextMapping_encode2_estimate_no_mem_s17_LCS()
- *
- * Range coder bit-estimation
- *-------------------------------------------------------------------*/
-
-int16_t RCcontextMapping_encode2_estimate_no_mem_s17_LCS(
-    int16_t *x,       /* Spectral coefficients */
-    const int16_t nt, /* L - size of spectrum (no. of spectral coefficients) */
-    int16_t *lastnz_out,
-    int16_t *nEncoded,    /* No. of spectral coefficients that can be coded without an overflow occuring */
-    const int16_t target, /* Target bits */
-    int16_t *stop,
-    int16_t mode,
-    CONTEXT_HM_CONFIG *hm_cfg /* context-based harmonic model configuration */
-)
-{
-    /* Common variables */
-    int16_t a1, b1;
-    int16_t k, pki, lev1;
-    uint16_t t;
-    int16_t lastnz, lastnz2;
-    int16_t rateFlag;
-    float bit_estimate;
-    int16_t symbol;
-    const uint8_t *lookup;
-    float nbits2;
-
-    /* Initialization */
-    bit_estimate = 2.0f;
-    nbits2 = 0.f;
-
-    /* bits to encode lastnz */
-    k = 1;
-
-    while ( k < nt / 2 )
-    {
-        bit_estimate++;
-        k = k << 1;
-        /* check while condition */
-    }
-
-    nbits2 = bit_estimate;
-
-    if ( hm_cfg )
-    {
-        int16_t a1_i, b1_i;
-        int16_t stop2;
-        int16_t total_output_bits;
-        int16_t nt_half;
-        int32_t c[2], *ctx;
-        int32_t p1, p2;
-        int16_t ii[2];
-        int16_t idx1, idx2, idx;
-        int16_t numPeakIndicesOrig = 0, numHoleIndices = 0; /* only to avoid compiler warning */
-
-        /* Rate flag */
-        if ( target > 400 )
-        {
-            rateFlag = 2 << NBITS_CONTEXT; /* Select context-A for higher bitrates */
-        }
-        else
-        {
-            rateFlag = 0; /* Select context-B for lower bitrates */
-        }
-
-        nt_half = nt >> 1;
-        stop2 = 0;
-        c[0] = c[1] = 0;
-
-        /* Find last non-zero tuple in the mapped domain signal */
-        lastnz = find_last_nz_pair( x, nt, hm_cfg );
-
-        lastnz2 = 2;
-
-        /* mapped domain */
-        numPeakIndicesOrig = hm_cfg->numPeakIndices;
-        hm_cfg->numPeakIndices = min( hm_cfg->numPeakIndices, lastnz );
-        numHoleIndices = lastnz - hm_cfg->numPeakIndices;
-
-        /* Mark hole indices beyond lastnz as pruned */
-        for ( k = numHoleIndices; k < hm_cfg->numHoleIndices; ++k )
-        {
-            hm_cfg->holeIndices[k] = hm_cfg->holeIndices[k] + nt;
-        }
-
-        ii[0] = numPeakIndicesOrig;
-        ii[1] = 0;
-
-        p1 = p2 = 0; /* to avoid compilation warnings */
-
-        /* Main Loop through the 2-tuples */
-        for ( k = 0; k < lastnz; k += 2 )
-        {
-            a1_i = get_next_coeff_mapped( ii, &p1, &idx1, hm_cfg );
-            b1_i = get_next_coeff_mapped( ii, &p2, &idx2, hm_cfg );
-
-            idx = min( idx1, idx2 );
-
-            /* Get context */
-            ctx = &c[p1 | p2];
-
-            t = (uint16_t) ( *ctx + rateFlag );
-            t += ( nt_half >= idx ) ? 0 : ( 1 << NBITS_CONTEXT );
-
-            /* Init current 2-tuple encoding */
-            a1 = (int16_t) abs( x[a1_i] );
-            b1 = (int16_t) abs( x[b1_i] );
-            lev1 = -( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
-
-            /* Signs Bits */
-            bit_estimate += min( a1, 1 );
-            bit_estimate += min( b1, 1 );
-
-            /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
-            lookup = &ari_lookup_s17_LC[t] + ( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
-
-            /* check while condition */
-            /* MSBs coding */
-            while ( max( a1, b1 ) >= A_THRES )
-            {
-                pki = lookup[lev1]; /* ESC symbol */
-
-                bit_estimate = bit_estimate + ari_bit_estimate_s17_LC[pki][VAL_ESC];
-                bit_estimate += 2; /* Add 2 LSB bits corresponding to the bit-plane */
-
-                ( a1 ) >>= 1;
-                ( b1 ) >>= 1;
-
-                lev1 = min( lev1 + ( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) ), 2 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
-
-                /* check while condition */
-            }
-
-            pki = lookup[lev1];
-
-            symbol = a1 + A_THRES * b1;
-            bit_estimate = bit_estimate + ari_bit_estimate_s17_LC[pki][symbol];
-
-            /* Should we truncate? */
-            if ( bit_estimate > target )
-            {
-                stop2 = 1;
-
-                if ( *stop )
-                {
-                    break;
-                }
-            }
-            else
-            {
-                lastnz2 = b1_i + 1;
-                nbits2 = bit_estimate;
-            }
-
-            /* Update context for next 2-tuple */
-            if ( p1 == p2 ) /* peak-peak or hole-hole context */
-            {
-                lev1 >>= NBITS_CONTEXT + NBITS_RATEQ;
-
-                if ( lev1 <= 0 )
-                {
-                    t = 1 + ( a1 + b1 ) * ( lev1 + 2 );
-                }
-                else
-                {
-                    t = 13 + lev1;
-                }
-
-                *ctx = ( *ctx & 0xf ) * 16 + t;
-            }
-            else
-            {
-                /* mixed context */
-
-                if ( idx1 & 1 )
-                {
-                    /* update first context */
-                    c[p1] = update_mixed_context( c[p1], (int16_t) abs( x[a1_i] ) );
-                }
-
-                if ( idx2 & 1 )
-                {
-                    /* update second context */
-                    c[p2] = update_mixed_context( c[p2], (int16_t) abs( x[b1_i] ) );
-                }
-            }
-
-        } /*end of the 2-tuples loop*/
-
-        total_output_bits = (int16_t) ( bit_estimate + 0.5f );
-        if ( *stop )
-        {
-            total_output_bits = (int16_t) ( nbits2 + 0.5f );
-        }
-
-        if ( stop2 )
-        {
-            stop2 = total_output_bits;
-        }
-        *nEncoded = lastnz2;
-        *stop = stop2; /* If zero, it means no overflow occured during bit-estimation */
-        *lastnz_out = lastnz;
-
-        /* Restore hole indices beyond lastnz */
-        for ( k = numHoleIndices; k < hm_cfg->numHoleIndices; ++k )
-        {
-            hm_cfg->holeIndices[k] = hm_cfg->holeIndices[k] - nt;
-        }
-        hm_cfg->numPeakIndices = numPeakIndicesOrig;
-
-        return (int16_t) ( nbits2 + 0.5f );
-    }
-    else /* if (!hm_cfg) */
-    {
-        int16_t esc_nb, cp, rateQ;
-        uint16_t s;
-        int16_t tot_bits2;
-        int16_t overflow_flag = 0;
-
-        /* Rate flag */
-        if ( target > 400 )
-        {
-            rateFlag = 2;
-        }
-        else
-        {
-            rateFlag = 0; /* Select context-B for lower bitrates */
-        }
-
-        t = 0;
-        s = 0;
-        cp = 0;
-        lastnz = 1;
-        lastnz2 = 0;
-        tot_bits2 = 0;
-
-        /* Find last non-zero tuple in the mapped domain signal */
-        for ( lastnz = ( nt - 2 ); lastnz >= 0; lastnz -= 2 )
-        {
-            if ( ( x[lastnz] != 0 ) || ( x[lastnz + 1] != 0 ) )
-            {
-                break;
-            }
-        }
-        lastnz += 2;
-        if ( lastnz < 2 )
-        {
-            lastnz = 2; /* At least one tuple is coded */
-        }
-
-        lastnz2 = 2;
-
-        /* Main Loop through the 2-tuples */
-        for ( k = 0; k < lastnz; k += 2 )
-        {
-            /* Init current 2-tuple encoding */
-            a1 = (int16_t) abs( x[k] );
-            b1 = (int16_t) abs( x[k + 1] );
-            lev1 = 0;
-            esc_nb = 0;
-            rateQ = rateFlag + ( k > ( nt >> 1 ) );
-
-            /* Signs Bits */
-            bit_estimate += min( a1, 1 );
-            bit_estimate += min( b1, 1 );
-
-            /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
-            lookup = &ari_lookup_s17_LC[t + ( rateQ << NBITS_CONTEXT )];
-
-            /* check while condition */
-            /* MSBs coding */
-            while ( max( a1, b1 ) >= A_THRES )
-            {
-                pki = lookup[( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )];
-
-                bit_estimate = bit_estimate + ari_bit_estimate_s17_LC[pki][VAL_ESC];
-                bit_estimate += 2; /* Add 2 LSB bits corresponding to the bit-plane */
-
-                ( a1 ) >>= 1;
-                ( b1 ) >>= 1;
-
-                lev1++;
-                esc_nb = min( lev1, 3 );
-
-                /* check while condition */
-            }
-
-            pki = lookup[( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )];
-
-            symbol = a1 + A_THRES * b1;
-            bit_estimate = bit_estimate + ari_bit_estimate_s17_LC[pki][symbol];
-
-            /* Should we truncate? */
-            if ( bit_estimate > target ) /* Overflow occured */
-            {
-                overflow_flag = 1;
-            }
-            else
-            {
-                if ( abs( x[k] ) || abs( x[k + 1] ) ) /* No overflow & non-zero tuple */
-                {
-                    nbits2 = bit_estimate;
-                    lastnz2 = k + 2;
-                }
-            }
-
-            /* Update context for next 2-tuple */
-            if ( esc_nb < 2 )
-            {
-                cp = 1 + ( a1 + b1 ) * ( esc_nb + 1 );
-            }
-            else
-            {
-                cp = 12 + esc_nb;
-            }
-            /*shift old bits and replace last 4 bits*/
-            s = ( s << 4 ) + cp;
-            t = s & 0xFF;
-
-        } /*end of the 2-tuples loop*/
-
-        tot_bits2 = (int16_t) ( nbits2 + 0.5f );
-        if ( lastnz2 < lastnz ) /* Overflow occured because unable to code all tuples */
-        {
-            overflow_flag = 1;
-        }
-        if ( mode == -1 )
-        {
-            tot_bits2 = (int16_t) ( bit_estimate + 0.5f );
-        }
-        if ( overflow_flag == 0 ) /* No overflow */
-        {
-            *stop = 0;
-        }
-        else /* Overflow */
-        {
-            if ( *stop )
-            {
-                *stop = tot_bits2;
-            }
-            else
-            {
-                *stop = (int16_t) ( bit_estimate + 0.5f );
-            }
-        }
-
-        *lastnz_out = lastnz;
-        *nEncoded = lastnz2;
-        /* Safety mechanism to avoid overflow */
-        if ( lastnz2 == 2 && overflow_flag == 1 )
-        {
-            for ( k = 0; k < lastnz2; k++ )
-            {
-                x[k] = 0;
-            }
-        }
-
-        return tot_bits2;
-    }
-}
-
-/*-------------------------------------------------------------------*
- * RCcontextMapping_encode2_estimate_bandWise_start()
- *
- * Range coder - start bandwise bit-estimation
- *-------------------------------------------------------------------*/
-
-int16_t RCcontextMapping_encode2_estimate_bandWise_start(
-    int16_t *x,
-    const int16_t nt,
-    const int16_t target,
-    HANDLE_RC_CONTEXT_MEM hContextMem )
-{
-    int16_t i, k;
-
-    /* Rate flag */
-    if ( target > 400 )
-    {
-        hContextMem->rateFlag = 2 << NBITS_CONTEXT;
-    }
-    else
-    {
-        hContextMem->rateFlag = 0;
-    }
-
-    hContextMem->bit_estimate = 2.0f;
-
-    /* Init */
-    hContextMem->nt_half = nt >> 1;
-
-    /* bits to encode lastnz */
-    k = 1;
-
-    while ( k < hContextMem->nt_half )
-    {
-        hContextMem->bit_estimate++;
-
-        k = k << 1;
-        /* check while condition */
-    }
-
-    /* bits to encode lastnz */
-    hContextMem->nbits_old = (int16_t) hContextMem->bit_estimate;
-
-    hContextMem->ctx = 0;
-    hContextMem->lastnz = 2;
-
-    /* Find last non-zero tuple  */
-
-    for ( i = nt; i >= 4; i -= 2 )
-    {
-
-        if ( x[i - 2] != 0 || x[i - 1] != 0 )
-        {
-            hContextMem->lastnz = i;
-            break;
-        }
-    }
-
-    return (int16_t) hContextMem->bit_estimate;
-}
-
-/*-------------------------------------------------------------------*
- * RCcontextMapping_encode2_estimate_bandWise()
- *
- * Range coder - bandwise bit-estimation
- *-------------------------------------------------------------------*/
-
-int16_t RCcontextMapping_encode2_estimate_bandWise(
-    int16_t *x,
-    const int16_t start_line,
-    const int16_t end_line,
-    HANDLE_RC_CONTEXT_MEM hContextMem )
-{
-    int16_t a1, b1, a1_i, b1_i;
-    int16_t k, pki, lev1;
-    uint16_t t;
-    int16_t bandBits = 0;
-    int16_t total_output_bits; /* No. of bits after finalization */
-    int16_t symbol;
-    const uint8_t *lookup;
-    int16_t idx;
-
-    /* Main Loop through the 2-tuples */
-    /*hContextMem->nt_half = end_line >> 1;*/
-    for ( k = start_line; k < min( hContextMem->lastnz, end_line ); k += 2 )
-    {
-        a1_i = k;
-        b1_i = k + 1;
-
-        idx = k;
-
-        /* Get context */
-        t = hContextMem->ctx + hContextMem->rateFlag;
-        t += ( hContextMem->nt_half >= idx ) ? 0 : ( 1 << NBITS_CONTEXT );
-
-        /* Init current 2-tuple encoding */
-        a1 = (int16_t) abs( x[a1_i] );
-        b1 = (int16_t) abs( x[b1_i] );
-        lev1 = -( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
-
-        /* Signs Bits */
-        hContextMem->bit_estimate += min( a1, 1 );
-        hContextMem->bit_estimate += min( b1, 1 );
-
-        /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
-        lookup = &ari_lookup_s17_LC[t] + ( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
-
-        /* check while condition */
-        /* MSBs coding */
-        while ( max( a1, b1 ) >= A_THRES )
-        {
-            pki = lookup[lev1];
-            hContextMem->bit_estimate = hContextMem->bit_estimate + ari_bit_estimate_s17_LC[pki][VAL_ESC];
-            hContextMem->bit_estimate += 2; /* Add the 2 LSB bits that were shifted out */
-
-            ( a1 ) >>= 1;
-            ( b1 ) >>= 1;
-
-            lev1 = min( lev1 + ( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) ), 2 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
-            /* check while condition */
-        }
-
-        pki = lookup[lev1];
-        symbol = a1 + A_THRES * b1; /* MSB symbol */
-        hContextMem->bit_estimate = hContextMem->bit_estimate + ari_bit_estimate_s17_LC[pki][symbol];
-
-        /* Update context */
-        lev1 >>= NBITS_CONTEXT + NBITS_RATEQ;
-
-        if ( lev1 <= 0 )
-        {
-            t = 1 + ( a1 + b1 ) * ( lev1 + 2 );
-        }
-        else
-        {
-            t = 13 + lev1;
-        }
-
-        hContextMem->ctx = ( hContextMem->ctx & 0xf ) * 16 + t;
-
-    } /*end of the 2-tuples loop*/
-    total_output_bits = (int16_t) ( hContextMem->bit_estimate + 0.5f );
-
-    bandBits = total_output_bits - hContextMem->nbits_old;
-    hContextMem->nbits_old = total_output_bits;
-
-    return bandBits;
-}
-
-#endif
diff --git a/lib_enc/FEC_enc_fx.c b/lib_enc/FEC_enc_fx.c
index 20dced8d7f939e6fed40a47960b823873307fd2e..69b14eb9b65dcbc5422bd658464249a3967b882b 100644
--- a/lib_enc/FEC_enc_fx.c
+++ b/lib_enc/FEC_enc_fx.c
@@ -9,7 +9,6 @@
 #include "rom_com.h"      /* Static table prototypes                */
 #include "prot_fx.h"      /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                    */
-#include "prot.h"         /* Function prototypes					*/
 #include "ivas_prot_fx.h" /* Function prototypes				*/
 
 
@@ -95,7 +94,7 @@ void FEC_encode_fx(
                 index = 3;
                 move16();
             }
-            push_indice_fx( hBstr, IND_FEC_CLAS, index, FEC_BITS_CLS );
+            push_indice( hBstr, IND_FEC_CLAS, index, FEC_BITS_CLS );
         }
 
         /*-----------------------------------------------------------------*
@@ -118,7 +117,7 @@ void FEC_encode_fx(
             tmpS = s_min( tmpS, 31 );
             tmpS = s_max( tmpS, 0 );
 
-            push_indice_fx( hBstr, IND_FEC_ENR, tmpS, FEC_BITS_ENR );
+            push_indice( hBstr, IND_FEC_ENR, tmpS, FEC_BITS_ENR );
         }
         /*-----------------------------------------------------------------*
          * Encode last glottal pulse position (8 bits)
@@ -158,7 +157,7 @@ void FEC_encode_fx(
                 maxi = add( maxi, 128 ); /* use 8 bits (MSB represent the sign of the pulse)	Q0*/
             }
 
-            push_indice_fx( hBstr, IND_FEC_POS, maxi, FEC_BITS_POS );
+            push_indice( hBstr, IND_FEC_POS, maxi, FEC_BITS_POS );
         }
         maxi = 0;
         move16();
@@ -367,7 +366,7 @@ void FEC_encode_ivas_fx(
             /* frame energy (maximum energy per pitch period for voiced frames or mean energy per sample over 2nd halframe for unvoiced frames) */
             /*frame_ener( L_frame, clas, synth, fpit[(L_frame>>6)-1], &enr_q, 0 );*/
             Word32 synth32[L_FRAME16k];
-            Copy_Scale_sig_16_32( synth, synth32, L_FRAME16k, 0 ); /* Qsynth */
+            Copy_Scale_sig_16_32_DEPREC( synth, synth32, L_FRAME16k, 0 ); /* Qsynth */
             fer_energy_fx( L_frame, clas, synth32, Q_synth, shr_r( fpit[( L_frame >> 6 ) - 1], 6 ), &enr_q, L_frame );
             exp_enrq = sub( 31, shl( Q_synth, 1 ) );
 
diff --git a/lib_enc/SNR_calc_fx.c b/lib_enc/SNR_calc_fx.c
index 1213a6b320fbd2ea3ee38d2096fb8d866ecb7b89..09acfd5dca1bb7bde7ab0896faee5ba2148c79d1 100644
--- a/lib_enc/SNR_calc_fx.c
+++ b/lib_enc/SNR_calc_fx.c
@@ -10,7 +10,6 @@
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
 
 
 /*-------------------------------------------------------------------*
@@ -325,11 +324,7 @@ void snr_calc(
         }
         *tsnr = VAD_Log2( tmp, minscale2 );
         move32();
-#ifdef BASOP_NOGLOB
         *tsnr = L_add_sat( *tsnr, MUL_F( *tsnr, 6226 ) ); /* *tsnr *= 1.2;   Q25*/
-#else
-        *tsnr = L_add( *tsnr, MUL_F( *tsnr, 6226 ) ); /* *tsnr *= 1.2;   */
-#endif
         move32();
     }
     ELSE
diff --git a/lib_enc/acelp_core_enc_fx.c b/lib_enc/acelp_core_enc_fx.c
index 55d440912ec0d92fa4e384fcfe6e1a91b8a70979..f942a19ffd8db288686cc7642b6d994b245bef14 100644
--- a/lib_enc/acelp_core_enc_fx.c
+++ b/lib_enc/acelp_core_enc_fx.c
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "stat_enc.h"
 #include "rom_com.h"
@@ -14,7 +13,6 @@
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------*
@@ -39,14 +37,9 @@ ivas_error acelp_core_enc_fx(
     Word16 old_syn_12k8_16k_fx[],          /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE q_old_syn*/
     Word16 pitch_buf_fx[NB_SUBFR16k],      /* o  : floating pitch for each subframe    Q6*/
     Word16 *unbits_fx,                     /* o  : number of unused bits               Q0*/
+    STEREO_TD_ENC_DATA_HANDLE hStereoTD,   /* i/o: TD stereo encoder handle            */
     const Word16 Q_new,
-    const Word16 shift
-#ifdef ADD_LRTD
-    ,
-    STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle            */
-    const float tdm_lsfQ_PCh[M]          /* i  : Q LSFs for primary channel          */
-#endif
-)
+    const Word16 shift )
 {
     Word16 nBits; /* reserved bits                        */
     Word16 i;
@@ -156,7 +149,7 @@ ivas_error acelp_core_enc_fx(
         st_fx->Nb_ACELP_frames = 0;
         move16();
     }
-    st_fx->Nb_ACELP_frames = add( st_fx->Nb_ACELP_frames, 1 ); // Q0
+    st_fx->Nb_ACELP_frames = add_sat( st_fx->Nb_ACELP_frames, 1 ); // Q0
     move16();
 
     int_fs_fx = INT_FS_16k_FX;
@@ -206,16 +199,14 @@ ivas_error acelp_core_enc_fx(
 
     /* TD stereo */
     test();
-#ifdef ADD_LRTD
     IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && EQ_16( st_fx->idchan, 1 ) )
     {
         tdm_lp_reuse_flag = hStereoTD->tdm_lp_reuse_flag;
         tdm_low_rate_mode = hStereoTD->tdm_low_rate_mode;
         tdm_Pitch_reuse_flag = hStereoTD->tdm_Pitch_reuse_flag;
-        tdm_Pri_pitch_buf = hStereoTD->tdm_Pri_pitch_buf;
+        tdm_Pri_pitch_buf = hStereoTD->tdm_Pri_pitch_buf_fx;
     }
     ELSE
-#endif
     {
         tdm_lp_reuse_flag = 0;
         tdm_low_rate_mode = 0;
@@ -333,7 +324,6 @@ ivas_error acelp_core_enc_fx(
             {
                 IF( hTdCngEnc != NULL )
                 {
-                    /*IVAS_CODE CNG_att is missing */
                     enr = cng_energy_fx( st_fx->element_mode, st_fx->bwidth, hDtxEnc->CNG_mode, /*st_fx->hTdCngEnc->CNG_att*/ 0, exc_fx, st_fx->L_frame, Q_new ); // Q8
 
                     /* calculate the energy quantization index */
@@ -401,10 +391,10 @@ ivas_error acelp_core_enc_fx(
         test();
         IF( !nelp_mode && !ppp_mode )
         {
-            config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
-                           st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, st_fx->coder_type,
-                           tc_subfr_fx, 0, &nb_bits, unbits_fx, st_fx->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_fr_cnt_fx,
-                           tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
+            config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
+                              st_fx->L_frame, st_fx->GSC_noisy_speech, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, st_fx->coder_type, st_fx->inactive_coder_type_flag,
+                              tc_subfr_fx, 0, &nb_bits, unbits_fx, st_fx->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_fr_cnt_fx,
+                              tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
         }
 
         /*-----------------------------------------------------------------*
@@ -449,78 +439,8 @@ ivas_error acelp_core_enc_fx(
 
         if ( !tdm_lp_reuse_flag )
         {
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-            lsf_enc_fx( st_fx, lsf_new_fx, lsp_new_fx, lsp_mid_fx, Aq_fx, st_fx->Nb_ACELP_frames, tdm_low_rate_mode, st_fx->GSC_IVAS_mode, tdm_lsfQ_PCh, Q_new );
-#else
             lsf_enc_fx( st_fx, lsf_new_fx, lsp_new_fx, lsp_mid_fx, Aq_fx, st_fx->Nb_ACELP_frames, tdm_low_rate_mode, st_fx->GSC_IVAS_mode, Q_new );
-#endif
         }
-#ifdef ADD_LRTD
-        else
-        {
-            const float *pt_interp_2;
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-            if ( st->active_cnt != 1 )
-            {
-                int16_t beta_index;
-                float lsf_wgts[M];
-
-                /* intra_frame prediction for the LSFs */
-                lsp2lsf( lsp_new, lsf_new, M, 12800 );
-
-                Unified_weighting( &st->Bin_E[L_FFT / 2], lsf_new, lsf_wgts, st->bwidth == NB, st->coder_type == UNVOICED, st->sr_core, M );
-
-                tdm_SCh_lsf_reuse( ENC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, lsf_wgts, &beta_index );
-
-                push_indice( hBstr, IND_IC_LSF_PRED, beta_index, TDM_IC_LSF_PRED_BITS );
-            }
-#endif
-            pt_interp_2 = interpol_frac_12k8;
-            if ( tdm_low_rate_mode == 1 && st->coder_type > UNVOICED )
-            {
-                pt_interp_2 = interpol_frac2;
-            }
-#ifndef LSF_RE_USE_SECONDARY_CHANNEL
-            if ( st->active_cnt == 1 )
-            {
-                mvr2r( lsp_new, st->lsp_old, M );
-                lsp2lsf( lsp_new, st->lsf_old, M, st->sr_core );
-                lsp2lsf( lsp_new, lsf_new, M, st->sr_core );
-            }
-#endif
-            /* LSP interpolation and conversion of LSPs to A(z) */
-            int_lsp( st->L_frame, st->lsp_old, lsp_new, Aq, M, pt_interp_2, 0 );
-
-            /* Check LSF stability (distance between old LSFs and current LSFs) */
-            st->stab_fac = lsf_stab( lsf_new, st->lsf_old, 0, st->L_frame );
-        }
-        if ( st->last_core == HQ_CORE && st->element_mode > EVS_MONO )
-        {
-            /* Prepare ACB memory from last HQ frame */
-            tmpF = hLPDmem->old_exc[0];
-            preemph( hLPDmem->old_exc, st->preemph_fac, st->L_frame, &tmpF );
-            mvr2r( hLPDmem->old_exc + st->L_frame - M, hLPDmem->mem_syn, M );
-            residu( Aq, M, hLPDmem->old_exc, old_exc, st->L_frame );
-        }
-
-        if ( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )
-        {
-            /* Prepare ACB memory of old_bwe_exc */
-#ifdef CR_FIX_639_HQ_ACELP_TRANSITION
-            if ( st->L_frame == L_FRAME )
-            {
-                lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );
-            }
-            else
-            {
-                lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * 2, L_EXC_MEM_DEC );
-            }
-#else
-            lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );
-#endif
-        }
-#endif
-
 
         /*---------------------------------------------------------------*
          * Calculation of LP residual (filtering through A[z] filter)
@@ -537,19 +457,20 @@ ivas_error acelp_core_enc_fx(
         {
             tc_classif_enc_fx( Q_new, st_fx->L_frame, &tc_subfr_fx, &position, attack_flag, st_fx->pitch[0], res_fx );
 
-            config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate, st_fx->L_frame,
-                           -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, st_fx->coder_type, tc_subfr_fx, 1, NULL, unbits_fx, st_fx->element_mode, &uc_two_stage_flag,
-                           tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_fr_cnt_fx, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
+            config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate, st_fx->L_frame,
+                              -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, tc_subfr_fx, 1, NULL, unbits_fx, st_fx->element_mode, &uc_two_stage_flag,
+                              tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, st_fx->active_fr_cnt_fx, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
         }
 
         /*---------------------------------------------------------------*
          * Calculation of prediction for scaled innovation energy
          * (for memory-less gain quantizer)
          *---------------------------------------------------------------*/
+
         IF( nb_bits > 0 )
         {
             Es_pred_enc_fx( &Es_pred_fx, &indice, st_fx->L_frame, res_fx, st_fx->voicing_fx, nb_bits, 0, Q_new );
-            push_indice_fx( st_fx->hBstr, IND_ES_PRED, indice, nb_bits );
+            push_indice( st_fx->hBstr, IND_ES_PRED, indice, nb_bits );
         }
 
 
@@ -558,26 +479,12 @@ ivas_error acelp_core_enc_fx(
          *------------------------------------------------------------*/
         test();
         test();
-#ifdef ADD_LRTD
-        if ( tdm_low_rate_mode ) /* tdm stereo low rate mode */
+        IF( hSC_VBR->nelp_mode )
         {
-            if ( st->coder_type <= UNVOICED )
-            {
-                tdm_low_rate_enc( st, Aq, res, syn, exc, pitch_buf, voice_factors, bwe_exc, 0 /*attack_flag*/, lsf_new, &tmp_noise );
-            }
-            else /* GENERIC */
-            {
-                encod_gen_2sbfr( st, inp, Aw, Aq, res, syn, exc, exc2, pitch_buf, voice_factors, bwe_exc, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
-            }
+            /* SC-VBR - NELP frames */
+            encod_nelp_fx( st_fx, inp_fx, Aw_fx, Aq_fx, res_fx, syn_fx, &tmp_noise_fx, exc_fx, exc2_fx, pitch_buf_fx,
+                           voice_factors_fx, bwe_exc_fx, Q_new, shift );
         }
-        else
-#endif
-            IF( hSC_VBR->nelp_mode )
-            {
-                /* SC-VBR - NELP frames */
-                encod_nelp_fx( st_fx, inp_fx, Aw_fx, Aq_fx, res_fx, syn_fx, &tmp_noise_fx, exc_fx, exc2_fx, pitch_buf_fx,
-                               voice_factors_fx, bwe_exc_fx, Q_new, shift );
-            }
         ELSE IF( EQ_16( coder_type, UNVOICED ) )
         {
             /* UNVOICED frames (Gauss. excitation) */
@@ -604,16 +511,13 @@ ivas_error acelp_core_enc_fx(
                                         lsp_mid_bck_fx, mCb1_fx, Bin_E_fx, Bin_E_old_fx, mem_syn_bck_fx, mem_w0_bck_fx, streaklimit_fx, pstreaklen_fx );
 
                 /* Configure ACELP bit allocation */
-                config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate, st_fx->L_frame,
-                               -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, st_fx->coder_type, tc_subfr_fx, 0, &nb_bits, unbits_fx, 0, &uc_two_stage_flag, 0, 0,
-                               st_fx->idchan, st_fx->active_fr_cnt_fx, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
+                config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate, st_fx->L_frame,
+                                  -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, st_fx->coder_type, st_fx->inactive_coder_type_flag, tc_subfr_fx, 0, &nb_bits, unbits_fx, 0, &uc_two_stage_flag, 0, 0,
+                                  st_fx->idchan, st_fx->active_fr_cnt_fx, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );
 
                 /* redo LSF quantization */
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-                lsf_enc_fx( st_fx, lsf_new_fx, lsp_new_fx, lsp_mid_fx, Aq_fx, st_fx->Nb_ACELP_frames, tdm_low_rate_mode, st_fx->GSC_IVAS_mode, tdm_lsfQ_PCh, Q_new );
-#else
                 lsf_enc_fx( st_fx, lsf_new_fx, lsp_new_fx, lsp_mid_fx, Aq_fx, st_fx->Nb_ACELP_frames, tdm_low_rate_mode, st_fx->GSC_IVAS_mode, Q_new );
-#endif
+
                 /* recalculation of LP residual (filtering through A[z] filter) */
                 calc_residu_fx( st_fx, inp_fx, res_fx, Aq_fx );
 
@@ -713,7 +617,7 @@ ivas_error acelp_core_enc_fx(
         WHILE( nBits > 0 )
         {
             i = s_min( nBits, 16 ); // Q0
-            push_indice_fx( st_fx->hBstr, IND_UNUSED, 0, i );
+            push_indice( st_fx->hBstr, IND_UNUSED, 0, i );
             nBits = sub( nBits, i ); // Q0
         }
     }
@@ -854,20 +758,17 @@ ivas_error acelp_core_enc_ivas_fx(
     Word32 Bin_E_fx[L_FFT], Bin_E_old_fx[L_FFT / 2];
     Word16 clip_var_fx, mem_w0_bck_fx, streaklimit_fx;
 
-#ifdef MSAN_FIX
     set16_fx( old_bwe_exc_fx, 0, ( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2 );
     set16_fx( old_exc_fx, 0, L_EXC );
     set16_fx( Aq, 0, NB_SUBFR16k * ( M + 1 ) );
     set16_fx( syn_fx, 0, L_FRAME16k );
-#endif
 
     Word16 tilt_code_bck_fx;
     Word32 gc_threshold_bck_fx;
     Word16 clip_var_bck_fx[6];
     Word32 q_env_fx[NUM_ENV_CNG];
-#ifdef MSAN_FIX
     set32_fx( q_env_fx, 0, NUM_ENV_CNG );
-#endif
+    set16_fx( exc2_fx, 0, L_FRAME16k );
     Word16 exc3_fx[L_FRAME16k];
     Word16 syn1_fx[L_FRAME16k];
     Word16 *tdm_Pri_pitch_buf_fx;
@@ -966,7 +867,7 @@ ivas_error acelp_core_enc_ivas_fx(
         st->Nb_ACELP_frames = 0;
         move16();
     }
-    st->Nb_ACELP_frames = add( st->Nb_ACELP_frames, 1 );
+    st->Nb_ACELP_frames = add_sat( st->Nb_ACELP_frames, 1 );
     move16();
 
     IF( EQ_16( st->L_frame, L_FRAME ) )
@@ -1101,15 +1002,6 @@ ivas_error acelp_core_enc_ivas_fx(
         /* update Aw[] coefficients */
         weight_a_subfr_fx( shr( st->L_frame, 6 ), A, Aw, st->gamma, M );
     }
-    IF( st->hLPDmem )
-    {
-        st->hLPDmem->q_mem_syn = sub( Q_new, 1 );
-        move16();
-        st->hLPDmem->q_lpd_old_exc = Q_new;
-        move16();
-        st->hLPDmem->q_lpd_syn = Q_new;
-        move16();
-    }
 
     test();
     test();
@@ -1213,7 +1105,11 @@ ivas_error acelp_core_enc_ivas_fx(
         move16();
         st->hLPDmem->q_mem_syn = st->Q_syn;
         move16();
-
+        // Scaling Aq to Q12
+        FOR( Word16 k = 0; k < NB_SUBFR16k; k++ )
+        {
+            Scale_sig( &Aq[( M + 1 ) * k], M + 1, sub( norm_s( Aq[( M + 1 ) * k] ), 2 ) );
+        }
         /* synthesis at 12.8kHz sampling rate */
         syn_12k8_fx( st->L_frame, Aq, exc3_fx, syn1_fx, hLPDmem->mem_syn3, 1, sub( Q_new, 1 ), st->Q_syn );
 
@@ -1275,7 +1171,7 @@ ivas_error acelp_core_enc_ivas_fx(
         test();
         IF( !nelp_mode && !ppp_mode )
         {
-            config_acelp1_IVAS( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 0, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
+            config_acelp1_fx( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, st->inactive_coder_type_flag, tc_subfr, 0, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
         }
 
         /*-----------------------------------------------------------------*
@@ -1361,6 +1257,11 @@ ivas_error acelp_core_enc_ivas_fx(
             st->stab_fac_fx = lsf_stab_fx( lsf_new_fx, st->lsf_old_fx, 0, st->L_frame ); // Q15
             move16();
         }
+        // Scaling Aq to Q12
+        FOR( Word16 k = 0; k < NB_SUBFR16k; k++ )
+        {
+            Scale_sig( &Aq[( M + 1 ) * k], M + 1, sub( norm_s( Aq[( M + 1 ) * k] ), 2 ) );
+        }
         test();
         IF( EQ_16( st->last_core, HQ_CORE ) && st->element_mode > EVS_MONO )
         {
@@ -1369,6 +1270,7 @@ ivas_error acelp_core_enc_ivas_fx(
             move16();
             PREEMPH_FX( hLPDmem->old_exc, st->preemph_fac, st->L_frame, &tmpF_fx );
             Copy( hLPDmem->old_exc + sub( st->L_frame, M ), hLPDmem->mem_syn, M ); /* Q_new */
+            Scale_sig( st->hLPDmem->mem_syn, M, sub( st->hLPDmem->q_mem_syn, Q_new ) );
             Residu3_fx( Aq, hLPDmem->old_exc, old_exc_fx, st->L_frame, 0 );
         }
 
@@ -1406,7 +1308,7 @@ ivas_error acelp_core_enc_ivas_fx(
         {
             tc_classif_enc_fx( Q_new, st->L_frame, &tc_subfr, &position, attack_flag, st->pitch[0], res_fx );
 
-            config_acelp1_IVAS( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 1, NULL, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
+            config_acelp1_fx( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, tc_subfr, 1, NULL, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
         }
 
         /*---------------------------------------------------------------*
@@ -1463,8 +1365,9 @@ ivas_error acelp_core_enc_ivas_fx(
             {
                 /* restore memories of LSF quantizer and synthesis filter */
                 lsf_syn_mem_restore_ivas_fx( st, tilt_code_bck_fx, gc_threshold_bck_fx, clip_var_bck_fx, next_force_sf_bck, lsp_new, lsp_mid, clip_var_fx, mem_AR_fx, mem_MA_fx, lsp_new_bck_fx, lsp_mid_bck_fx, Bin_E_fx, Bin_E_old_fx, mem_syn_bck_fx, mem_w0_bck_fx, streaklimit_fx, pstreaklen );
+
                 /* Configure ACELP bit allocation */
-                config_acelp1_IVAS( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 0, &nb_bits, unbits, 0, &uc_two_stage_flag, 0, 0, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
+                config_acelp1_fx( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, st->inactive_coder_type_flag, tc_subfr, 0, &nb_bits, unbits, 0, &uc_two_stage_flag, 0, 0, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode );
 
                 /* redo LSF quantization */
                 lsf_enc_ivas_fx( st, lsf_new_fx, lsp_new, lsp_mid, Aq, tdm_low_rate_mode, 0, NULL, Q_new );
@@ -1473,6 +1376,7 @@ ivas_error acelp_core_enc_ivas_fx(
                 calc_residu_fx( st, inp, res_fx, Aq );
                 st->hTdCngEnc->burst_ho_cnt = 0;
                 move16();
+
                 /* VOICED frames in SC-VBR */
                 encod_gen_voic_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, 0, Q_new );
             }
@@ -1488,17 +1392,12 @@ ivas_error acelp_core_enc_ivas_fx(
             encod_gen_voic_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, 0, Q_new );
         }
 
-        FOR( i = 0; i < NB_SUBFR16k; i++ )
-        {
-            Scale_sig( &Aq[i * ( M + 1 )], ( M + 1 ), sub( Q12, sub( Q14, norm_s( Aq[i * ( M + 1 )] ) ) ) ); // Q12
-        }
-
         /* update mem_syn1_flt for ACELP core switching */
         Copy( hLPDmem->mem_syn, hLPDmem->mem_syn1_fx, M ); // Q_syn
 
         /* update old synthesis buffer - needed for ACELP internal sampling rate switching */
-        Copy( syn_fx + sub( st->L_frame, L_SYN_MEM ), hLPDmem->mem_syn_r, L_SYN_MEM ); // st->Q_syn
-
+        Copy( syn_fx + sub( st->L_frame, L_SYN_MEM ), hLPDmem->mem_syn_r, L_SYN_MEM ); // hLPDmem->q_mem_syn
+        // st->Q_syn = Q_new - 1;
         Scale_sig( syn_fx, L_FRAME16k, sub( st->Q_syn, Q_new - 1 ) ); // Q_syn
         /* save and delay synthesis to be used by SWB BWE */
         IF( st->hBWE_FD != NULL )
@@ -1530,12 +1429,8 @@ ivas_error acelp_core_enc_ivas_fx(
         test();
         IF( st->element_mode > EVS_MONO && st->hTcxEnc != NULL )
         {
-            Copy( syn1_fx + shr( st->L_frame, 1 ), st->hTcxEnc->Txnq, shr( st->L_frame, 1 ) ); // st->Q_syn
-#ifdef MSAN_FIX
+            Copy( syn1_fx + shr( st->L_frame, 1 ), st->hTcxEnc->Txnq, shr( st->L_frame, 1 ) );                                                                // st->Q_syn
             Scale_sig( st->hTcxEnc->Txnq + shr( st->L_frame, 1 ), sub( L_FRAME32k / 2 + 64, shr( st->L_frame, 1 ) ), sub( st->Q_syn, st->hTcxEnc->q_Txnq ) ); // st->Q_syn
-#else
-            Scale_sig( st->hTcxEnc->Txnq + shr( st->L_frame, 1 ), sub( L_FRAME32k / 2 + 64, shr( st->L_frame, 2 ) ), sub( st->Q_syn, st->hTcxEnc->q_Txnq ) );
-#endif
             st->hTcxEnc->q_Txnq = st->Q_syn;
             move16();
         }
@@ -1551,8 +1446,9 @@ ivas_error acelp_core_enc_ivas_fx(
         {
             /* exc2 buffer is needed only for updating of Aq[] which is needed for core switching */
             Copy( exc_fx, exc2_fx, st->L_frame ); // Q_new
-
-            stat_noise_uv_enc_ivas_fx( st, epsP, lsp_new, lsp_mid, Aq, exc2_fx, uc_two_stage_flag, Q_new );
+            Word16 q_exc2 = Q_new;
+            move16();
+            stat_noise_uv_enc_ivas_fx( st, epsP, lsp_new, lsp_mid, Aq, exc2_fx, uc_two_stage_flag, &q_exc2 );
         }
 
         /*-----------------------------------------------------------------*
@@ -1560,11 +1456,7 @@ ivas_error acelp_core_enc_ivas_fx(
          *-----------------------------------------------------------------*/
 
         Scale_sig( syn_fx, L_FRAME, sub( s_min( st->Q_syn, Q_new ), st->Q_syn ) ); // min( st->Q_syn, Q_new )
-#ifdef MSAN_FIX
         Scale_sig( res_fx, st->L_frame, sub( s_min( st->Q_syn, Q_new ), Q_new ) ); // min( st->Q_syn, Q_new )
-#else
-        Scale_sig( res_fx, L_FRAME16k, sub( s_min( st->Q_syn, Q_new ), Q_new ) );
-#endif
         FEC_encode_ivas_fx( hBstr, st->acelp_cfg, syn_fx, st->coder_type, st->clas, pitch_buf, res_fx, &st->Last_pulse_pos, st->L_frame, st->total_brate, s_min( st->Q_syn, Q_new ) );
         IF( st->hBWE_TD != NULL )
         {
@@ -1629,7 +1521,7 @@ ivas_error acelp_core_enc_ivas_fx(
         IF( !st->Opt_SC_VBR && ( st->idchan == 0 || NE_16( st->element_mode, IVAS_CPE_TD ) || ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && st->tdm_LRTD_flag ) ) )
         {
             /* Apply a non linearity to the SHB excitation */
-            Copy_Scale_sig_16_32( st->hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_fx, NL_BUFF_OFFSET, ( sub( shl( Q_new, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
+            Copy_Scale_sig_16_32_no_sat( st->hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_fx, NL_BUFF_OFFSET, ( sub( shl( Q_new, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
             non_linearity_ivas_fx( bwe_exc_fx, bwe_exc_extended_fx + NL_BUFF_OFFSET, L_FRAME32k, &st->hBWE_TD->bwe_non_lin_prev_scale_fx, Q_new, st->coder_type, voice_factors_fx, st->L_frame );
             Copy_Scale_sig_32_16( bwe_exc_extended_fx + L_FRAME32k, st->hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET, negate( sub( shl( Q_new, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
         }
diff --git a/lib_enc/acelp_core_switch_enc_fx.c b/lib_enc/acelp_core_switch_enc_fx.c
index b09f2396642259fa5a12b049819003c2491b40e4..76fa6f151d2f431e7062f1a41b00a099016082d7 100644
--- a/lib_enc/acelp_core_switch_enc_fx.c
+++ b/lib_enc/acelp_core_switch_enc_fx.c
@@ -6,38 +6,21 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com_fx.h"
-//#include "prot_fx.h"
 #include "rom_com.h"     /* Common constants                       */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "basop_util.h"  /* Function prototypes                    */
-#include "prot.h"
+
 /*---------------------------------------------------------------------*
  * Local function prototypes
  *---------------------------------------------------------------------*/
 
-static void encod_gen_voic_core_switch_fx( Encoder_State *st_fx,
-                                           const Word16 L_frame_fx,
-                                           const Word16 inp_fx[],
-                                           const Word16 Aq_fx[],
-                                           const Word16 A_fx[],
-                                           const Word16 T_op[],
-                                           Word16 *exc_fx,
-                                           const Word32 core_bitrate_fx,
-                                           Word16 shift,
-                                           Word16 Q_new );
-static void encod_gen_voic_core_switch_ivas_fx( Encoder_State *st_fx,
-                                                const Word16 L_frame_fx,
-                                                const Word16 inp_fx[],
-                                                const Word16 Aq_fx[],
-                                                const Word16 A_fx[],
-                                                const Word16 T_op[],
-                                                Word16 *exc_fx,
-                                                const Word32 core_bitrate_fx,
-                                                Word16 shift,
-                                                Word16 Q_new );
+static void encod_gen_voic_core_switch_fx( Encoder_State *st_fx, const Word16 L_frame_fx, const Word16 inp_fx[], const Word16 Aq_fx[], const Word16 A_fx[], const Word16 T_op[], Word16 *exc_fx, const Word32 core_bitrate_fx, Word16 shift, Word16 Q_new );
+
+static void encod_gen_voic_core_switch_ivas_fx( Encoder_State *st_fx, const Word16 L_frame_fx, const Word16 inp_fx[], const Word16 Aq_fx[], const Word16 A_fx[], const Word16 T_op[], Word16 *exc_fx, const Word32 core_bitrate_fx, Word16 shift, Word16 Q_new );
 
 static void bwe_switch_enc_fx( Encoder_State *st_fx, const Word16 *new_speech );
+
 static void bwe_switch_enc_ivas_fx( Encoder_State *st_fx, const Word16 *new_speech );
 
 static Word16 dotprod_satcont( const Word16 *x, const Word16 *y, Word16 qx, Word16 qy, Word16 *qo, Word16 len, Word16 delta );
@@ -63,7 +46,10 @@ void acelp_core_switch_enc_fx(
     Word16 Aq[2 * ( M + 1 )];
     LPD_state_HANDLE hLPDmem; /* ACELP LPDmem memories */
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
-
+#ifdef HARM_PUSH_BIT
+    UWord16 value;
+    Word16 nb_bits;
+#endif
     hLPDmem = st_fx->hLPDmem;
 
     /* initializations */
@@ -148,15 +134,13 @@ void acelp_core_switch_enc_fx(
     /*----------------------------------------------------------------*
      * Excitation encoding
      *----------------------------------------------------------------*/
-    config_acelp1( ENC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot,
-                   GENERIC, -1, -1, &j, &i, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ );
+
+    config_acelp1_fx( ENC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot,
+                      GENERIC, st_fx->inactive_coder_type_flag, -1, -1, &j, &i, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ );
 
     encod_gen_voic_core_switch_fx( st_fx, st_fx->last_L_frame, inp, Aq, A, T_op, exc, cbrate, shift, Q_new );
 
-    /*----------------------------------------------------------------*
-     * bit-stream: modify the layer of sub frame CELP
-     *----------------------------------------------------------------*/
-#ifdef IVAS_CODE_BITSTREAM
+#ifdef HARM_PUSH_BIT
     i = find_indice( hBstr, TAG_ACELP_SUBFR_LOOP_START, &value, &nb_bits );
 #ifdef DEBUGGING
     assert( i >= 0 && "Internal error in ACELP core switching - unable to find ACELP subframe indices!" );
@@ -168,6 +152,9 @@ void acelp_core_switch_enc_fx(
     }
     delete_indice( hBstr, TAG_ACELP_SUBFR_LOOP_START );
 #else
+    /*----------------------------------------------------------------*
+     * bit-stream: modify the layer of sub frame CELP
+     *----------------------------------------------------------------*/
     FOR( i = 0; i < 20; i++ )
     {
         hBstr->ind_list[IND_CORE_SWITCHING_CELP_SUBFRAME + i].value = hBstr->ind_list[TAG_ACELP_SUBFR_LOOP_START + i].value; /* Q0 */
@@ -271,8 +258,9 @@ void acelp_core_switch_enc_ivas_fx(
     /*----------------------------------------------------------------*
      * Excitation encoding
      *----------------------------------------------------------------*/
-    config_acelp1_IVAS( ENC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot,
-                        GENERIC, -1, -1, &j, &i, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ );
+
+    config_acelp1_fx( ENC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot,
+                      GENERIC, st_fx->inactive_coder_type_flag, -1, -1, &j, &i, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ );
 
     encod_gen_voic_core_switch_ivas_fx( st_fx, st_fx->last_L_frame, inp, Aq, A, T_op, exc, cbrate, shift, Q_new );
 
@@ -453,7 +441,7 @@ static void encod_gen_voic_core_switch_fx(
 
     IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
     {
-        push_indice_fx( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
+        push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
     }
 
     /*-----------------------------------------------------------------*
@@ -492,23 +480,16 @@ static void encod_gen_voic_core_switch_fx(
     {
         /* code in Q9, gain_pit in Q14 */
         L_tmp = L_mult( gcode16, code[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shl_sat( L_tmp, 5 ); /* Q15 */
+        L_tmp = L_shl_sat( L_tmp, 5 );      /* Q15 */
         L_tmp = L_mac_sat( L_tmp, exc[i], gain_pit );
         L_tmp = L_shl_sat( L_tmp, 1 );  /* saturation can occur here */
         exc[i] = round_fx_sat( L_tmp ); /* Q_exc */
-#else
-        L_tmp = L_shl( L_tmp, 5 );
-        L_tmp = L_mac( L_tmp, exc[i], gain_pit );
-        L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-        exc[i] = round_fx( L_tmp );
-#endif
     }
 
     /* write reserved bits */
     IF( unbits )
     {
-        push_indice_fx( hBstr, IND_UNUSED, 0, unbits );
+        push_indice( hBstr, IND_UNUSED, 0, unbits );
     }
 
     /*-----------------------------------------------------------------*
@@ -519,11 +500,7 @@ static void encod_gen_voic_core_switch_fx(
 
     FOR( i = L_SUBFR; i < 2 * L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         exc[i] = round_fx_sat( L_shl_sat( L_mult_sat( exc[i], gain_pit ), 1 ) ); /* Q_exc */
-#else
-        exc[i] = round_fx( L_shl( L_mult( exc[i], gain_pit ), 1 ) );
-#endif
     }
 
     return;
@@ -571,6 +548,7 @@ static void encod_gen_voic_core_switch_ivas_fx(
     Word16 h2[L_SUBFR + ( M + 1 )];
     Word16 dummyF[NB_SUBFR16k];
     Word16 lp_select, lp_flag;
+    Word16 q_h1;
     LPD_state_HANDLE hLPDmem; /* ACELP LPDmem memories */
     BSTR_ENC_HANDLE hBstr;
 
@@ -635,9 +613,8 @@ static void encod_gen_voic_core_switch_ivas_fx(
         find_targets_ivas_fx( inp, hLPDmem->mem_syn, 0, &( hLPDmem->mem_w0 ), Aq, res, L_SUBFR, Ap, TILT_FAC_FX, xn, cn, h1 );
     }
 
-    /*Scale_sig(h1, L_SUBFR, shift);  */ /*Q14-shift */
-    Copy_Scale_sig( h1, h2, L_SUBFR, -2 );
-    Scale_sig( h1, L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
+    q_h1 = sub( 14, norm_s( h1[0] ) );
+    Copy_Scale_sig( h1, h2, L_SUBFR, sub( 11, q_h1 ) ); /*Q11*/
 
     /* scaling of xn[] to limit dynamic at 12 bits */
     Scale_sig( xn, L_SUBFR, shift ); /* Q_new */
@@ -647,8 +624,9 @@ static void encod_gen_voic_core_switch_ivas_fx(
      * Adaptive exc. construction
      *----------------------------------------------------------------*/
     set16_fx( dummyF, -1, NB_SUBFR16k ); /* hack to signal ACELP->HQ switching frame */
+
     pitch = pit_encode_ivas_fx( hBstr,
-                                st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /*hStereoTD->tdm_Pitch_reuse_flag*/, dummyF /*hStereoTD->tdm_Pri_pitch_buf*/ ); /* Q6 */
+                                st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /*hStereoTD->tdm_Pitch_reuse_flag*/, dummyF /*hStereoTD->tdm_Pri_pitch_buf*/, Q_new ); /* Q6 */
 
     /*-----------------------------------------------------------------*
      * Find adaptive exitation
@@ -667,6 +645,7 @@ static void encod_gen_voic_core_switch_ivas_fx(
      * LP filtering of the adaptive excitation, codebook target computation
      *-----------------------------------------------------------------*/
     lp_flag = st_fx->acelp_cfg.ltf_mode;                                                                                                      /* Q0 */
+    Scale_sig( h1, L_SUBFR, sub( 14, q_h1 ) );                                                                                                /* set h1[] in Q14 with scaling for convolution Q14+shift*/
     lp_select = lp_filt_exc_enc_ivas_fx( MODE1, GENERIC, 0, exc, h1, xn, y1, xn2, L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
 
     IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
@@ -712,17 +691,10 @@ static void encod_gen_voic_core_switch_ivas_fx(
     {
         /* code in Q9, gain_pit in Q14 */
         L_tmp = L_mult( gcode16, code[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shl_sat( L_tmp, 5 ); /* Q15 */
+        L_tmp = L_shl_sat( L_tmp, 5 );      /* Q15 */
         L_tmp = L_mac_sat( L_tmp, exc[i], gain_pit );
         L_tmp = L_shl_sat( L_tmp, 1 );  /* saturation can occur here */
         exc[i] = round_fx_sat( L_tmp ); /* Q_exc */
-#else
-        L_tmp = L_shl( L_tmp, 5 );
-        L_tmp = L_mac( L_tmp, exc[i], gain_pit );
-        L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-        exc[i] = round_fx( L_tmp );
-#endif
         move16();
     }
 
@@ -740,11 +712,7 @@ static void encod_gen_voic_core_switch_ivas_fx(
 
     FOR( i = L_SUBFR; i < 2 * L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         exc[i] = round_fx_sat( L_shl_sat( L_mult_sat( exc[i], gain_pit ), 1 ) ); /* Q_exc */
-#else
-        exc[i] = round_fx( L_shl( L_mult( exc[i], gain_pit ), 1 ) );
-#endif
         move16();
     }
 
@@ -870,7 +838,7 @@ static void bwe_switch_enc_fx(
         }
     }
 
-    push_indice_fx( hBstr, IND_CORE_SWITCHING_AUDIO_DELAY, d1m_fx, AUDIODELAYBITS );
+    push_indice( hBstr, IND_CORE_SWITCHING_AUDIO_DELAY, d1m_fx, AUDIODELAYBITS );
 
     tmp = add( i_mult2( d1m_fx, delta_fx ), fdelay_fx ); /* Q0 */
     ptmp = &hb_synth_tmp_fx[tmp];                        /* Q0 */
@@ -897,13 +865,9 @@ static void bwe_switch_enc_fx(
     L_tmp1 = L_mult( tmp, E2_fx );      /*30-q_tmp1+q_tmp2 */
     q_tmp2 = sub( q_tmp1, q_tmp2 );     /*30-q_tmp2 */
     L_tmp1 = L_shl( L_tmp1, sub( q_tmp2, 24 ) );
-#ifdef BASOP_NOGLOB
-    gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow ); /*Q12  */
-#else
-    gain_fx = round_fx( Isqrt( L_tmp1 ) );                     /*Q12  */
-#endif
+    gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow );                                                                                 /*Q12  */
     ind1_fx = usquant_fx( gain_fx, &gain_fx, shr( MINVALUEOFFIRSTGAIN_FX, 1 ), shr( DELTAOFFIRSTGAIN_FX, 4 ), ( 1 << NOOFGAINBITS1 ) ); /* Q0 */
-    push_indice_fx( hBstr, IND_CORE_SWITCHING_AUDIO_GAIN, ind1_fx, NOOFGAINBITS1 );
+    push_indice( hBstr, IND_CORE_SWITCHING_AUDIO_GAIN, ind1_fx, NOOFGAINBITS1 );
 
     return;
 }
@@ -1044,11 +1008,7 @@ static void bwe_switch_enc_ivas_fx(
     L_tmp1 = L_mult( tmp, E2_fx );      /*30-q_tmp1+q_tmp2 */
     q_tmp2 = sub( q_tmp1, q_tmp2 );     /*30-q_tmp2 */
     L_tmp1 = L_shl( L_tmp1, sub( q_tmp2, 24 ) );
-#ifdef BASOP_NOGLOB
     gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow ); /*Q12  */
-#else
-    gain_fx = round_fx( Isqrt( L_tmp1 ) );                     /*Q12  */
-#endif
     ind1_fx = usquant_fx( gain_fx, &gain_fx, shr( MINVALUEOFFIRSTGAIN_FX, 1 ), shr( DELTAOFFIRSTGAIN_FX, 4 ), ( 1 << NOOFGAINBITS1 ) );
     push_indice( hBstr, IND_CORE_SWITCHING_AUDIO_GAIN, ind1_fx, NOOFGAINBITS1 );
 
@@ -1084,11 +1044,7 @@ static Word16 dotprod_satcont(
         move16();
         FOR( i = 0; i < len; i += delta )
         {
-#ifdef BASOP_NOGLOB                                                         /* Critical Overflow*/
             L_tmp = L_mac0_o( L_tmp, tmp_tabx[i], tmp_taby[i], &Overflow ); /*Q(qx+qy-shift) */
-#else                                                                       /* BASOP_NOGLOB */
-            L_tmp = L_mac0( L_tmp, tmp_tabx[i], tmp_taby[i] ); /*Q(qx+qy-shift) */
-#endif
         }
 
         IF( Overflow != 0 )
diff --git a/lib_enc/acelp_enc_util_fx.c b/lib_enc/acelp_enc_util_fx.c
index 9992ce6ad1a3b10d6524f2e4219b29da9238b935..7f57b55da9f685b3d5800308105bf66c623742fe 100644
--- a/lib_enc/acelp_enc_util_fx.c
+++ b/lib_enc/acelp_enc_util_fx.c
@@ -77,7 +77,6 @@ Word16 E_ACELP_toeplitz_mul_fx(
         L_maxloc = L_shr( L_maxloc, 2 );
         /* Do not warn saturation of L_tot, since its for headroom estimation. */
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */
         L_maxloc = L_shr( L_maxloc, 1 );
         L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/8 */
@@ -90,20 +89,6 @@ Word16 E_ACELP_toeplitz_mul_fx(
         {
             L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/16 */
         }
-#else
-        L_tot = L_add( L_tot, L_maxloc ); /* +max/4 */
-        L_maxloc = L_shr( L_maxloc, 1 );
-        L_tot = L_add( L_tot, L_maxloc ); /* +max/8 */
-        if ( highrate )
-        {
-            L_tot = L_add( L_tot, L_maxloc ); /* +max/8 */
-        }
-        L_maxloc = L_shr( L_maxloc, 1 );
-        if ( highrate )
-        {
-            L_tot = L_add( L_tot, L_maxloc ); /* +max/16 */
-        }
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
     }
 
@@ -189,19 +174,15 @@ void E_ACELP_conv(
             /*cn2[k]-=cn2[i]*h2[k-i];*/
             L_tmp_64 = W_msu0_16_16( L_tmp_64, cn2[i], h2[k - i] ); /*h2 4Q11*/
         }
-        L_tmp = W_sat_l( L_tmp_64 ); /* 4Q11 */
-#ifdef BASOP_NOGLOB
+        L_tmp = W_sat_l( L_tmp_64 );                                      /* 4Q11 */
         cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Q0 */
-#else
-        cn2[k] = round_fx( L_shl( L_tmp, 5 ) );
-#endif
     }
 }
 
 void E_ACELP_conv_ivas_fx(
-    const Word16 xn2[], /* i	Qx*/
+    const Word16 xn2[], /* i	Qnew - 1*/
     const Word16 h2[],  /* i	Q12*/
-    Word16 cn2[]        /* o	Q0*/
+    Word16 cn2[]        /* o	Qnew*/
 )
 {
     Word16 i, k;
@@ -213,18 +194,14 @@ void E_ACELP_conv_ivas_fx(
     {
         /*cn2[k] = xn2[k];     */
         Word64 L_tmp_64;
-        L_tmp_64 = W_deposit32_l( L_mult0( xn2[k], 0x800 ) ); /* 4Q11 */
+        L_tmp_64 = W_deposit32_l( L_mult0( xn2[k], 0x800 ) ); /* Qnew -1 + 12  */
         FOR( i = 0; i < k; i++ )
         {
             /*cn2[k]-=cn2[i]*h2[k-i];*/
-            L_tmp_64 = W_msu0_16_16( L_tmp_64, cn2[i], h2[k - i] ); /*h2 4Q11*/
+            L_tmp_64 = W_msu0_16_16( L_tmp_64, cn2[i], h2[k - i] ); /*Qnew + 11*/
         }
-        L_tmp = W_sat_l( L_tmp_64 ); /* 4Q11 */
-#ifdef BASOP_NOGLOB
-        cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Q0*/
-#else
-        cn2[k] = round_fx( L_shl( L_tmp, 5 ) );
-#endif
+        L_tmp = W_sat_l( L_tmp_64 );                                      /* Qnew + 11 */
+        cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Qnew*/
         move16();
     }
 }
diff --git a/lib_enc/amr_wb_enc_fx.c b/lib_enc/amr_wb_enc_fx.c
index 69c356b5ddb3e9055f0384bf43cdc91174a83ae6..1580a78186f071f46a99e4bdb4e5154f1d1f9fa3 100644
--- a/lib_enc/amr_wb_enc_fx.c
+++ b/lib_enc/amr_wb_enc_fx.c
@@ -262,8 +262,7 @@ void amr_wb_enc_fx(
     /*----------------------------------------------------------------*
      * Change the sampling frequency to 12.8 kHz
      *----------------------------------------------------------------*/
-    Word16 Q_new_inp, mem_decim_size; // TO be removed
-    modify_Fs_fx( st->input_fx, input_frame, st->input_Fs, new_inp, 12800, st->mem_decim_fx, 0, &Q_new_inp, &mem_decim_size );
+    modify_Fs_fx( st->input_fx, input_frame, st->input_Fs, new_inp, 12800, st->mem_decim_fx, 0 );
 
     /* update signal buffer */
     Copy( new_inp, st->buf_speech_enc + L_FRAME, L_FRAME ); /* Q0 */
@@ -292,11 +291,7 @@ void amr_wb_enc_fx(
      * Detect NB spectrum in a 16kHz-sampled input
      *----------------------------------------------------------------*/
 
-    analy_sp_fx( st->element_mode,
-#ifdef IVAS_CODE_CPE
-                 hCPE,
-#endif
-                 st->input_Fs, inp, Q_new, fr_bands, lf_E, &Etot, st->min_band, st->max_band, Le_min_scaled, Scale_fac, st->Bin_E_fx,
+    analy_sp_fx( st->element_mode, inp, Q_new, fr_bands, lf_E, &Etot, st->min_band, st->max_band, Le_min_scaled, Scale_fac, st->Bin_E_fx,
                  st->Bin_E_old_fx, PS, st->lgBin_E_fx, st->band_energies, fft_buff );
 
     noise_est_pre_fx( Etot, st->ini_frame, hNoiseEst, 0, EVS_MONO, EVS_MONO );
@@ -351,12 +346,7 @@ void amr_wb_enc_fx(
 
     high_lpn_flag = 0;
     move16(); /* Q0 flag  */
-    long_enr_fx( st, Etot, localVAD_HE_SAD, high_lpn_flag
-#ifdef IVAS_CODE
-                 ,
-                 NULL, 1, NULL, NULL
-#endif
-    );
+    long_enr_fx( st, Etot, localVAD_HE_SAD, high_lpn_flag );
     relE = sub( Etot, st->lp_speech_fx ); /* Q8 */
 
     IF( NE_16( st->bwidth, NB ) )
@@ -367,12 +357,8 @@ void amr_wb_enc_fx(
     {
         lp_bckr = Mean32( hNoiseEst->bckr_fx + 1, 9 ); /* q_bckr */
     }
-#ifdef BASOP_NOGLOB
     hp_bckr = L_shr( L_add_sat( hNoiseEst->bckr_fx[st->max_band - 1], hNoiseEst->bckr_fx[st->max_band] ), 1 ); /* q_bckr */
-#else
-    hp_bckr = L_shr( L_add( hNoiseEst->bckr_fx[st->max_band - 1], hNoiseEst->bckr_fx[st->max_band] ), 1 );
-#endif
-    if ( hp_bckr == 0 ) /* Avoid division by zero. */
+    if ( hp_bckr == 0 )                                                                                        /* Avoid division by zero. */
     {
         hp_bckr = L_deposit_l( 1 );
     }
@@ -386,7 +372,7 @@ void amr_wb_enc_fx(
      * WB, SWB and FB bandwidth detector
      *----------------------------------------------------------------*/
 
-    bw_detect_fx( st, st->input_fx, NULL, NULL, NULL, MONO_FORMAT, 0 );
+    bw_detect_fx( st, st->input_fx, NULL, NULL, NULL, MONO_FORMAT, 0, 0 );
 
     /* in AMR_WB IO, limit the maximum band-width to WB */
     if ( GT_16( st->bwidth, WB ) )
@@ -445,9 +431,6 @@ void amr_wb_enc_fx(
     noise_est_fx( st, old_pitch1, tmpN, epsP_h, epsP_l, Etot, relE, corr_shift, tmpE, fr_bands, &cor_map_sum,
                   NULL, &sp_div, &Q_sp_div, &non_staX, &harm_flag,
                   lf_E, &hNoiseEst->harm_cor_cnt, hNoiseEst->Etot_l_lp_fx, hNoiseEst->Etot_v_h2_fx, &hNoiseEst->bg_cnt, st->lgBin_E_fx, Q_new, Le_min_scaled, &sp_floor, NULL,
-#ifdef IVAS_CODE
-                  NULL, NULL,
-#endif
                   st->ini_frame );
 
     /*----------------------------------------------------------------*
@@ -459,14 +442,14 @@ void amr_wb_enc_fx(
     IF( EQ_32( st->input_Fs, 16000 ) )
     {
         /* no resampling needed, only delay adjustement to account for the FIR resampling delay */
-        tmps = NS2SA_FX2( 16000, DELAY_FIR_RESAMPL_NS );
+        tmps = NS2SA( 16000, DELAY_FIR_RESAMPL_NS );
         Copy_Scale_sig( &st->mem_decim16k_fx[tmps], new_inp_16k, tmps, -1 );                      /* Input in Q0 -> Output in Q-1 to mimic the resampling filter */
         Copy_Scale_sig( st->input_fx, new_inp_16k + tmps, sub( input_frame, tmps ), -1 );         /* Input in Q0 -> Output in Q-1 to mimic the resampling filter */
         Copy( st->input_fx + input_frame - shl( tmps, 1 ), st->mem_decim16k_fx, shl( tmps, 1 ) ); /* memory still in Q0 */
     }
     ELSE IF( EQ_32( st->input_Fs, 32000 ) || EQ_32( st->input_Fs, 48000 ) )
     {
-        modify_Fs_fx( st->input_fx, input_frame, st->input_Fs, new_inp_16k, 16000, st->mem_decim16k_fx, 0, &Q_new_inp, &mem_decim_size );
+        modify_Fs_fx( st->input_fx, input_frame, st->input_Fs, new_inp_16k, 16000, st->mem_decim16k_fx, 0 );
     }
 
     /*----------------------------------------------------------------*
@@ -565,7 +548,7 @@ void amr_wb_enc_fx(
          * Write VAD information into the bitstream in AMR-WB IO mode
          *--------------------------------------------------------------------------------------*/
 
-        push_indice_fx( st->hBstr, IND_VAD_FLAG, st->vad_flag, 1 );
+        push_indice( st->hBstr, IND_VAD_FLAG, st->vad_flag, 1 );
     }
 
     /*-----------------------------------------------------------------*
@@ -628,7 +611,7 @@ void amr_wb_enc_init_fx(
     AMRWB_IO_ENC_HANDLE hAmrwb_IO /* i/o: AMR-WB IO encoder handle    */
 )
 {
-    int16_t i;
+    Word16 i;
 
     /* HF (6-7kHz) BWE */
     hAmrwb_IO->seed2_enc = RANDOM_INITSEED;
diff --git a/lib_enc/analy_lp_fx.c b/lib_enc/analy_lp_fx.c
index c2f9d0585d356c513226ee2059d219e835976724..9b6ff2108359dcb6242fd83232ab5972e2236e01 100644
--- a/lib_enc/analy_lp_fx.c
+++ b/lib_enc/analy_lp_fx.c
@@ -3,17 +3,16 @@
   ====================================================================================*/
 
 #include <stdint.h>
-#include "options.h"    /* Compilation switches                   */
-#include "cnst.h"       /* Common constants                       */
-#include "rom_com_fx.h" /* Static table prototypes                */
-#include "rom_com.h"    /* Static table prototypes                */
-#include "rom_enc.h"    /* Static table prototypes                */
-//#include "prot_fx.h"       /* Function prototypes                    */
+#include "options.h"     /* Compilation switches                   */
+#include "cnst.h"        /* Common constants                       */
+#include "rom_com_fx.h"  /* Static table prototypes                */
+#include "rom_com.h"     /* Static table prototypes                */
+#include "rom_enc.h"     /* Static table prototypes                */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*-------------------------------------------------------------------*
- * analy_lp()
+ * analy_lp_fx()
  *
  * Perform LP analysis
  *
@@ -23,23 +22,26 @@
  * - find interpolated LSPs and convert back to A(z) for all subframes
  * - update LSPs for the next frame
  *-------------------------------------------------------------------*/
-void analy_lp_ivas_fx(
-    const Word16 speech[],          /* i  :(Q_new) pointer to the speech frame                      */
-    const Word16 L_frame,           /* i  :(q0) length of the frame                              */
-    const Word16 L_look,            /* i  :(q0) look-ahead                                       */
-    Word32 *ener,                   /* o  :(Q_r) residual energy from Levinson-Durbin             */
-    Word16 A[],                     /* o  :(q14) A(z) filter coefficients                         */
+
+void analy_lp_fx(
+    const Word16 speech[],          /* i  :(Q_new) pointer to the speech frame                                       */
+    const Word16 L_frame,           /* i  :(q0) length of the frame                                                  */
+    const Word16 L_look,            /* i  :(q0) look-ahead                                                           */
+    Word32 *ener,                   /* o  :(Q_r) residual energy from Levinson-Durbin                                */
+    Word16 A[],                     /* o  :(q14) A(z) filter coefficients                                            */
     Word16 epsP_h[],                /* o  :(high part of epsP(Q_r)) LP analysis residual energies for each iteration */
-    Word16 epsP_l[],                /* o  :(low part of epsP(Q_r)) LP analysis residual energies for each iteration */
-    Word16 lsp_new[],               /* o  :(q15) current frame LSPs                               */
-    Word16 lsp_mid[],               /* o  :(q15) current mid-frame LSPs                           */
-    Word16 lsp_old[],               /* i/o:(q15) previous frame unquantized LSPs                  */
-    const Word16 Top[2],            /* i  :(q0) open loop pitch lag                              */
-    const Word16 Tnc[2],            /* i  :(q15) open loop pitch gain                             */
-    const Word32 Core_sr,           /* i  :(q0) Internal core sampling rate                      */
-    const Word16 sec_chan_low_rate, /* i  :(q0) flag to signal second channel        */
-    Word16 Q_new,                   /*i: stores Q for speech*/
-    Word16 *Q_r /*stores q for ener*/ )
+    Word16 epsP_l[],                /* o  :(low part of epsP(Q_r)) LP analysis residual energies for each iteration  */
+    Word16 lsp_new[],               /* o  :(q15) current frame LSPs                                                  */
+    Word16 lsp_mid[],               /* o  :(q15) current mid-frame LSPs                                              */
+    Word16 lsp_old[],               /* i/o:(q15) previous frame unquantized LSPs                                     */
+    const Word16 Top[2],            /* i  :(q0) open loop pitch lag                                                  */
+    const Word16 Tnc[2],            /* i  :(q15) open loop pitch gain                                                */
+    const Word32 Core_sr,           /* i  :(q0) Internal core sampling rate                                          */
+    const Word16 element_mode,      /* i  : element mode                                                             */
+    const Word16 sec_chan_low_rate, /* i  :(q0) flag to signal second channel                                        */
+    Word16 Q_new,                   /* i  : stores Q for speech                                                      */
+    Word16 *Q_r                     /*stores q for ener*/
+)
 {
     Word16 r_h[M + 1]; /* Autocorrelations of windowed speech MSB */
     Word16 r_l[M + 1]; /* Autocorrelations of windowed speech LSB */
@@ -74,19 +76,22 @@ void analy_lp_ivas_fx(
         /* Autocorrelations */
         autocorr_fx( pt, M, r_h, r_l, &Q_r[1 - i_subfr], wind_length, wind, 0, 0 );
 
-        /*if ( r[0] < 100.0f && no_thr == 0 )*/
-        /*r[0] = 100.0f*/
-        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_Comp( r_h[0], r_l[0] ) /* Q_r[1 - i_subfr]*/, sub( 31, add( Q_r[1 - i_subfr], shl( Q_new, 1 ) ) ), 100 /*q0*/, 31 ), -1 ) )
+        IF( NE_16( element_mode, EVS_MONO ) )
         {
-            /*Q_min stores min of 24 and the actual Q for r*/
-            Word16 Q_min = s_min( add( Q_r[1 - i_subfr], shl( Q_new, 1 ) ), 24 ); /* comparing q with 24 because exponent of 100 is 7 so max q should be 24*/
-            L_Extract( L_shl( 100, Q_min ), &r_h[0], &r_l[0] );                   /*extracting high and low components of r[0]*/
-            FOR( i = 1; i < 17; i++ )
+            /*if ( r[0] < 100.0f && no_thr == 0 )*/
+            /*r[0] = 100.0f*/
+            IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_Comp( r_h[0], r_l[0] ) /* Q_r[1 - i_subfr]*/, sub( 31, add( Q_r[1 - i_subfr], shl( Q_new, 1 ) ) ), 100 /*q0*/, 31 ), -1 ) )
             {
-                L_Extract( L_shr( L_Comp( r_h[i], r_l[i] ), sub( add( Q_r[1 - i_subfr], shl( Q_new, 1 ) ), Q_min ) ), &r_h[i], &r_l[i] ); /*scaling all the values to q24*/
+                /*Q_min stores min of 24 and the actual Q for r*/
+                Word16 Q_min = s_min( add( Q_r[1 - i_subfr], shl( Q_new, 1 ) ), 24 ); /* comparing q with 24 because exponent of 100 is 7 so max q should be 24*/
+                L_Extract( L_shl( 100, Q_min ), &r_h[0], &r_l[0] );                   /*extracting high and low components of r[0]*/
+                FOR( i = 1; i < 17; i++ )
+                {
+                    L_Extract( L_shr( L_Comp( r_h[i], r_l[i] ), sub( add( Q_r[1 - i_subfr], shl( Q_new, 1 ) ), Q_min ) ), &r_h[i], &r_l[i] ); /*scaling all the values to q24*/
+                }
+                Q_r[1 - i_subfr] = sub( Q_min, shl( Q_new, 1 ) ); /*updating the q (subtracting shl( Q_new, 1 ) as in later part it is being added-> to maintain q24 )*/
+                move16();
             }
-            Q_r[1 - i_subfr] = sub( Q_min, shl( Q_new, 1 ) ); /*updating the q (subtracting shl( Q_new, 1 ) as in later part it is being added-> to maintain q24 )*/
-            move16();
         }
 
         /* Lag windowing */
@@ -124,92 +129,6 @@ void analy_lp_ivas_fx(
     return;
 }
 
-void analy_lp_fx(
-    const Word16 speech[],          /* i  : pointer to the speech frame                      Q_new*/
-    const Word16 L_frame,           /* i  : length of the frame                              Q0*/
-    const Word16 L_look,            /* i  : look-ahead                                       Q0*/
-    Word32 *ener,                   /* o  : residual energy from Levinson-Durbin             Q_r*/
-    Word16 A[],                     /* o  : A(z) filter coefficients                         Q14*/
-    Word16 epsP_h[],                /* o  : LP analysis residual energies for each iteration Q_r*/
-    Word16 epsP_l[],                /* o  : LP analysis residual energies for each iteration Q_r*/
-    Word16 lsp_new[],               /* o  : current frame LSPs                               Q15*/
-    Word16 lsp_mid[],               /* o  : current mid-frame LSPs                           Q15*/
-    Word16 lsp_old[],               /* i/o: previous frame unquantized LSPs                  Q15*/
-    const Word16 Top[2],            /* i  : open loop pitch lag                              Q0*/
-    const Word16 Tnc[2],            /* i  : open loop pitch gain                             Q15*/
-    const Word32 Core_sr,           /* i  : Internal core sampling rate                      Q0*/
-    const Word16 sec_chan_low_rate, /* i  : flag to signal second channel					 Q0*/
-    Word16 Q_new,
-    Word16 *Q_r )
-{
-    Word16 r_h[M + 1]; /* Autocorrelations of windowed speech MSB */
-    Word16 r_l[M + 1]; /* Autocorrelations of windowed speech LSB */
-    Word32 LepsP[M + 1];
-    Word16 i, i_subfr, wind_length = 0;
-    Word16 *lsp;
-    const Word16 *wind = NULL;
-    const Word16 *pt;
-    Word16 half_frame;
-
-    IF( EQ_16( L_frame, L_FRAME ) )
-    {
-        wind_length = L_LP;
-        move16();
-        wind = Assym_window_W16fx; /* Q15 */
-    }
-    ELSE /* L_frame == L_FRAME16k */
-    {
-        wind_length = L_LP_16k;
-        move16();
-        wind = assym_window_16k_fx; /* Q15 */
-    }
-    lsp = lsp_mid; /* Q15 */
-    half_frame = shr( L_frame, 1 );
-
-    FOR( i_subfr = 0; i_subfr <= 1; i_subfr++ )
-    {
-        pt = speech + sub( add( half_frame, L_look ), wind_length );
-        half_frame = shl( half_frame, 1 );
-
-        /* Autocorrelations */
-        autocorr_fx( pt, M, r_h, r_l, &Q_r[1 - i_subfr], wind_length, wind, 0, 0 );
-
-        /* Lag windowing */
-        adapt_lag_wind( r_h, r_l, M, Top[i_subfr], Tnc[i_subfr], Core_sr );
-
-        /* Levinson-Durbin */
-        E_LPC_lev_dur( r_h, r_l, A, LepsP, M, NULL );
-        FOR( i = 0; i <= M; i++ )
-        {
-            L_Extract( LepsP[i], &epsP_h[i], &epsP_l[i] );
-        }
-        /*Q_r[... might not be needed from external...*/
-        Q_r[1 - i_subfr] = add( Q_r[1 - i_subfr], shl( Q_new, 1 ) );
-        move16();
-
-        /* Conversion of A(z) to LSPs */
-        E_LPC_a_lsp_conversion( A, lsp, lsp_old, M );
-
-        lsp = lsp_new; /* Q15 */
-    }
-    IF( EQ_16( sec_chan_low_rate, 1 ) )
-    {
-        /* LSP interpolation */
-        int_lsp4_fx( L_frame, lsp_old, lsp_mid, lsp_new, A, M, -2 );
-    }
-    ELSE
-    {
-        /* LSP interpolation */
-        int_lsp4_fx( L_frame, lsp_old, lsp_mid, lsp_new, A, M, 0 );
-    }
-    Copy( lsp_new, lsp_old, M );            /* Q15 */
-    *ener = L_Comp( epsP_h[M], epsP_l[M] ); /* Q_r */
-    move32();
-
-    return;
-}
-
-
 /*-------------------------------------------------------------------*
  * analy_lp_AMR_WB()
  *
diff --git a/lib_enc/analy_sp_fx.c b/lib_enc/analy_sp_fx.c
index 594bcfbabaa51d6368676e33ad6a9d94287873ab..dc59ec752986a0750a75777d68d3aedf254b2414 100644
--- a/lib_enc/analy_sp_fx.c
+++ b/lib_enc/analy_sp_fx.c
@@ -19,9 +19,7 @@
 
 static void find_enr( Word16 data[], Word32 band[], Word32 *ptE, Word32 *LEtot, const Word16 min_band, const Word16 max_band, const Word16 Q_new2, const Word32 e_min, Word32 *Bin_E, Word16 BIN_FREQ_FX, Word32 *band_energies );
 static void ivas_find_enr( Word16 *data, Word16 q_data, Word32 *band, Word16 *q_band, Word32 *ptE, Word16 *q_ptE, Word64 *LEtot, const Word16 min_band, const Word16 max_band, Word32 *Bin_E, Word16 BIN_FREQ_FX, Word32 *band_energies );
-#ifdef IVAS_CODE_CPE
-static void find_enr_dft( CPE_ENC_HANDLE hCPE, const int32_t input_Fs, float DFT_past_DMX[], float band[], float *ptE, float *Etot, const int16_t min_band, const int16_t max_band, float *Bin_E, float *band_ener );
-#endif
+
 
 /*-------------------------------------------------------------------*
  * analy_sp_fx()
@@ -31,10 +29,6 @@ static void find_enr_dft( CPE_ENC_HANDLE hCPE, const int32_t input_Fs, float DFT
 
 void analy_sp_fx(
     const Word16 element_mode, /* i  : element mode                                    */
-#ifdef IVAS_CODE_CPE
-    CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure                           */
-#endif
-    const Word32 input_Fs,     /* i  : input sampling rate                             */
     Word16 *speech,            /* i  : speech buffer                          Q_new - preemph_bits */
     const Word16 Q_new,        /* i  : current scaling exp                    Q0                 */
     Word32 *fr_bands,          /* o  : energy in critical frequency bands     Q_new + QSCALE    */
@@ -60,9 +54,7 @@ void analy_sp_fx(
     Word16 Min_val, Max_val;
     Word16 Scale_fac2;
     Word16 fft_temp[L_FFT];
-#ifndef IVAS_CODE_CPE
-    (void) input_Fs;
-#endif
+
     /*-----------------------------------------------------------------*
      * Compute spectrum
      * find energy per critical frequency band and total energy in dB
@@ -134,18 +126,6 @@ void analy_sp_fx(
             pt_fft += L_FFT;
         }
     }
-#ifdef IVAS_CODE_CPE
-    ELSE
-    {
-        /* find energy per critical band */
-        find_enr_dft( hCPE, input_Fs, hCPE->hStereoDft->DFT[0], pt_bands, lf_E, Etot, min_band, max_band, Bin_E, band_ener );
-        mvr2r( lf_E, lf_E + VOIC_BINS, VOIC_BINS );
-        mvr2r( Bin_E, Bin_E + ( L_FFT / 2 ), L_FFT / 2 );
-        mvr2r( band_ener, band_ener + NB_BANDS, NB_BANDS );
-        mvr2r( pt_bands, pt_bands + NB_BANDS, NB_BANDS );
-        *Etot *= 2.f;
-    }
-#endif
 
     /* Average total log energy over both half-frames */
     frac_etot = 0;
@@ -419,6 +399,10 @@ static void find_enr_dft_ivas_fx(
     BinE_fx[STEREO_DFT_N_12k8_ENC / 2 - 1] = BinE_fx[STEREO_DFT_N_12k8_ENC / 2 - 2]; // // *q_Bin_E
     move32();
 
+    Word16 norm = getScaleFactor32( BinE_fx, L_FFT );
+    scale_sig32( BinE_fx, L_FFT, norm );
+    *q_Bin_E = add( *q_Bin_E, norm );
+    move16();
     L_lerp_fx( BinE_fx, Bin_E_fx, L_FFT / 2, STEREO_DFT_N_12k8_ENC / 2, q_Bin_E );
 
     MVR2R_WORD32( Bin_E_fx, ptE_fx, VOIC_BINS ); // *q_Bin_E
@@ -445,29 +429,29 @@ static void find_enr_dft_ivas_fx(
  * Spectral analysis of 12.8kHz input
  *-------------------------------------------------------------------*/
 void ivas_analy_sp_fx(
-    const Word16 element_mode, /* i  : element mode                                    Q0*/
-    CPE_ENC_HANDLE hCPE,       /* i/o: CPE encoder structure                           */
-    const Word32 input_Fs,     /* i  : input sampling rate                             Q0*/
-    Word16 *speech,            /* i  : speech buffer                          Q_new - preemph_bits */
-    const Word16 Q_new,        /* i  : current scaling exp                    Q0                 */
-    Word32 *fr_bands,          /* o  : energy in critical frequency bands     q_fr_bands */
-    Word16 *q_fr_bands,        /* o  : energy in critical frequency bands     Q0 */
-    Word32 *lf_E,              /* o  : per bin E for first...                 q_lf_E */
-    Word16 *q_lf_E,            /* o  : per bin E for first...                 Q0 */
-    Word16 *Etot,              /* o  : total input energy                     Q8                 */
-    const Word16 min_band,     /* i  : minimum critical band                  Q0                 */
-    const Word16 max_band,     /* i  : maximum critical band                  Q0                 */
-    Word32 *Bin_E,             /* o  : per-bin energy spectrum                  Q7                */
-    Word16 *q_Bin_E,           /* o  : per-bin energy spectrum                  Q7                */
-    Word32 *Bin_E_old,         /* o  : per-bin energy spectrum of the previous frame      Q7      */
-    Word16 *q_Bin_E_old,       /* o  : per-bin energy spectrum of the previous frame      Q7      */
-    Word32 *PS,                /* o  : per-bin energy spectrum                   Q_new + QSCALE - 2               */
-    Word16 *q_PS,              /* o  : per-bin energy spectrum                   Q_new + QSCALE - 2               */
-    Word16 *EspecdB,           /* o  : per-bin log energy spectrum (with f=0) Q7                */
-    Word32 *band_energies,     /* o  : energy in critical frequency bands without minimum noise floor MODE2_E_MIN (q_band_energies)*/
-    Word16 *q_band_energies,   /* o  : Q of energy in critical frequency bands without minimum noise floor MODE2_E_MIN */
-    Word16 *fft_buff,          /* o  : FFT coefficients                                   (q_fft_buff)      */
-    Word16 *q_fft_buff         /* o  : Q of FFT coefficients                                   Q0     */
+    const Word16 element_mode, /* i  : element mode                                    Q0                 */
+    CPE_ENC_HANDLE hCPE,       /* i/o: CPE encoder structure                                              */
+    const Word32 input_Fs,     /* i  : input sampling rate                             Q0                 */
+    Word16 *speech,            /* i  : speech buffer                                   Q_new              */
+    const Word16 Q_new,        /* i  : current scaling exp                             Q0                 */
+    Word32 *fr_bands,          /* o  : energy in critical frequency bands              q_fr_bands         */
+    Word16 *q_fr_bands,        /* o  : energy in critical frequency bands              Q0                 */
+    Word32 *lf_E,              /* o  : per bin E for first...                          q_lf_E             */
+    Word16 *q_lf_E,            /* o  : per bin E for first...                          Q0                 */
+    Word32 *Etot,              /* o  : total input energy                              Q24                 */
+    const Word16 min_band,     /* i  : minimum critical band                           Q0                 */
+    const Word16 max_band,     /* i  : maximum critical band                           Q0                 */
+    Word32 *Bin_E,             /* o  : per-bin energy spectrum                         q_Bin_E            */
+    Word16 *q_Bin_E,           /* o  : per-bin energy spectrum                         Q0                 */
+    Word32 *Bin_E_old,         /* o  : per-bin energy spectrum of the previous frame   q_Bin_E_old        */
+    Word16 *q_Bin_E_old,       /* o  : per-bin energy spectrum of the previous frame   Q0                 */
+    Word32 *PS,                /* o  : per-bin energy spectrum                         q_PS               */
+    Word16 *q_PS,              /* o  : per-bin energy spectrum                         Q0                 */
+    Word16 *EspecdB,           /* o  : per-bin log energy spectrum (with f=0)          Q7                 */
+    Word32 *band_energies,     /* o  : energy in critical frequency bands without minimum noise floor MODE2_E_MIN (q_band_energies) */
+    Word16 *q_band_energies,   /* o  : Q of energy in critical frequency bands without minimum noise floor MODE2_E_MIN              */
+    Word16 *fft_buff,          /* o  : FFT coefficients                                (q_fft_buff)       */
+    Word16 *q_fft_buff         /* o  : Q of FFT coefficients                           Q0                 */
 )
 {
     Word16 *pt;
@@ -476,6 +460,8 @@ void ivas_analy_sp_fx(
     Word32 Ltmp;
     Word16 *pt_fft;
     Word16 exp, tmp;
+    Word16 resultant_q;
+    Word16 exp2;
     Word64 LEtot;
     LEtot = 0;
     move64();
@@ -508,11 +494,9 @@ void ivas_analy_sp_fx(
         }
         ELSE
         {
-            Word16 scale = norm_arr( speech + 3 * ( L_SUBFR / 2 ) - L_FFT / 2, L_FFT + 4 * ( L_SUBFR / 2 ) );
-            scale = sub( scale, LOG2_L_FFT ); // guard_bits
-            *q_fft_buff = add( Q_new, scale );
+            Word16 scale = 0, shift;
             move16();
-
+            shift = s_min( norm_arr( speech + 3 * ( L_SUBFR / 2 ) - L_FFT / 2, L_FFT ), norm_arr( speech + 7 * ( L_SUBFR / 2 ) - L_FFT / 2, L_FFT ) );
             FOR( i_subfr = 0; i_subfr <= 1; i_subfr++ )
             {
                 /* set pointer to the beginning of the signal for spectral analysis */
@@ -523,29 +507,42 @@ void ivas_analy_sp_fx(
                     /* set the pointer for second analysis window */
                     pt = speech + 7 * ( L_SUBFR / 2 ) - L_FFT / 2;
                 }
-
                 /* Clear 1st value of 1st part, copy 1st value of 2nd part */
                 pt_fft[0] = 0;
                 move16();
-                pt_fft[L_FFT / 2] = pt[L_FFT / 2]; // Q_new - preemph_bits
+                pt_fft[L_FFT / 2] = shl( pt[L_FFT / 2], shift ); // (Q_new + shift) - preemph_bits
                 move16();
 
                 FOR( i = 1; i < L_FFT / 2; i++ )
                 {
                     /* 1st windowed part */
-                    pt_fft[i] = mult_r( pt[i], sqrt_han_window_fx[i] ); // Q_new - preemph_bits
+                    pt_fft[i] = mult_r( shl( pt[i], shift ), sqrt_han_window_fx[i] ); // (Q_new + shift) - preemph_bits
                     move16();
 
                     /* 2nd windowed part  */
-                    pt_fft[L_FFT - i] = mult_r( pt[L_FFT - i], sqrt_han_window_fx[i] ); // Q_new - preemph_bits
+                    pt_fft[L_FFT - i] = mult_r( shl( pt[L_FFT - i], shift ), sqrt_han_window_fx[i] ); // (Q_new + shift) - preemph_bits
                     move16();
                 }
 
-                scale_sig( pt_fft, L_FFT, scale );
-
                 /* compute the spectrum */
-                fft_rel_fx( pt_fft, L_FFT, LOG2_L_FFT );
-
+                fft_rel_16_32fx( pt_fft, &scale, i_subfr, L_FFT, LOG2_L_FFT );
+                *q_fft_buff = add( add( Q_new, shift ), scale ); // resultant q for fft_buff
+                move16();
+                IF( EQ_16( i_subfr, 1 ) )
+                {
+                    Word16 new_q_lf_E = add( shl( *q_fft_buff, 1 ), 14 );
+                    Word16 new_q_bands = new_q_lf_E;
+                    IF( GT_16( new_q_bands, 39 ) )
+                    {
+                        new_q_bands = 39;
+                        move16();
+                    }
+                    scale_sig32( fr_bands, NB_BANDS, sub( new_q_bands, *q_fr_bands ) );
+                    scale_sig32( lf_E, VOIC_BINS, sub( new_q_lf_E, *q_lf_E ) );
+                    LEtot = W_shl( LEtot, sub( new_q_bands, *q_fr_bands ) );
+                    scale_sig32( Bin_E, L_FFT / 2, sub( new_q_lf_E, *q_lf_E ) );
+                    scale_sig32( band_energies, NB_BANDS, sub( new_q_bands, *q_fr_bands ) );
+                }
                 /* find energy per critical band */
                 ivas_find_enr( pt_fft, *q_fft_buff, pt_bands, q_fr_bands, lf_E + i_subfr * VOIC_BINS, q_lf_E, &LEtot, min_band, max_band,
                                &Bin_E[i_subfr * L_FFT / 2], BIN, band_energies + i_subfr * NB_BANDS );
@@ -560,7 +557,7 @@ void ivas_analy_sp_fx(
 
         /* Average total log energy over both half-frames */
         /* *Etot = 10.0f * (float)log10(0.5f * *Etot); */
-        *Etot = -12800 /* 10.f * logf(0.00001f) in Q8 */;
+        *Etot = -838860800 /* 10.f * log10f(0.00001f) in Q24 : This is when LEtot is 0*/;
         move16();
         IF( LEtot != 0 )
         {
@@ -569,7 +566,7 @@ void ivas_analy_sp_fx(
             LEtot = W_shl( LEtot, exp );                                                                                        // q_fr_bands+2+exp
             Ltmp = BASOP_Util_Log10( W_extract_h( LEtot ), sub( 61, add( *q_fr_bands, exp ) ) /* 31-(q_fr_bands+2+exp-32) */ ); // Q25
             Ltmp = Mpy_32_32( Ltmp, 1342177280 /* 10.f in Q27 */ );                                                             // (Q25, Q27) -> Q21
-            *Etot = extract_h( L_shl( Ltmp, Q24 - Q21 ) );                                                                      // Q8
+            *Etot = L_shl( Ltmp, Q24 - Q21 );                                                                                   // Q24
             move16();
         }
     }
@@ -602,7 +599,7 @@ void ivas_analy_sp_fx(
         }
 
         /* Average total log energy over both half-frames */
-        *Etot = -12800 /* 10.f * logf(0.00001f) in Q8 */;
+        *Etot = -838860800 /* 10.f * log10f(0.00001f) in Q24 : This is when LEtot is 0*/;
         move16();
         IF( LEtot != 0 )
         {
@@ -610,7 +607,7 @@ void ivas_analy_sp_fx(
             LEtot = W_shl( LEtot, exp );                                                                                        // q_fr_bands+exp
             Ltmp = BASOP_Util_Log10( W_extract_h( LEtot ), sub( 62, add( *q_fr_bands, exp ) ) /* 31-(q_fr_bands+1+exp-32) */ ); // Q25
             Ltmp = Mpy_32_32( Ltmp, 1342177280 /* 10.f in Q27 */ );                                                             // (Q25, Q27) -> Q21
-            *Etot = extract_h( L_shl( Ltmp, Q24 - Q21 ) );                                                                      // Q8
+            *Etot = L_shl( Ltmp, Q24 - Q21 );                                                                                   // Q24
             move16();
         }
     }
@@ -623,7 +620,7 @@ void ivas_analy_sp_fx(
     *q_fr_bands = add( *q_fr_bands, exp );
     move16();
 
-    exp = sub( getScaleFactor32( band_energies, 2 * NB_BANDS ), 1 );
+    exp = getScaleFactor32( band_energies, 2 * NB_BANDS );
     scale_sig32( band_energies, 2 * NB_BANDS, exp ); /* q_band_energies + exp */
     *q_band_energies = add( *q_band_energies, exp );
     move16();
@@ -637,14 +634,14 @@ void ivas_analy_sp_fx(
     move32();
     Bin_E[L_FFT - 1] = Bin_E[L_FFT - 2]; // *q_Bin_E
     move32();
-
+    Word32 add_const = 21475; // 1e-5 in Q31
     FOR( i = 0; i < L_FFT / 2; i++ )
     {
         Bin_E_old[i] = Bin_E[i]; // *q_Bin_E
         move32();
 
         /* PS[i] = ( Bin_E[i] + 1e-5f + Bin_E[i + L_FFT / 2] + 1e-5f ) / 2.0f; */
-        PS[i] = W_extract_h( W_mac_32_32( W_mult_32_32( Bin_E[i], ONE_IN_Q30 ), Bin_E[i + L_FFT / 2], ONE_IN_Q30 ) ); // *q_Bin_E
+        PS[i] = W_extract_h( W_add( W_mac_32_32( W_mult_32_32( Bin_E[i], ONE_IN_Q30 ), Bin_E[i + L_FFT / 2], ONE_IN_Q30 ), W_shr( W_shl( add_const, 32 ), sub( 31, *q_Bin_E ) ) ) ); // *q_Bin_E
         move32();
 
         /* Bin_E[i] = (float) ( 10.0f * log( PS[i] ) ); */
@@ -679,16 +676,12 @@ void ivas_analy_sp_fx(
     }
 
     exp = L_norm_arr( Bin_E, L_FFT / 2 );
-    IF( GE_16( exp, sub( *q_Bin_E, Q22 ) ) )
-    {
-        scale_sig32( Bin_E, L_FFT / 2, sub( *q_Bin_E, Q22 ) ); // *q_Bin_E
-    }
-    ELSE
-    {
-        scale_sig32( Bin_E + L_FFT / 2, L_FFT / 2, sub( Q22, *q_Bin_E ) ); // Q22
-        *q_Bin_E = Q22;
-        move16();
-    }
+    exp2 = L_norm_arr( Bin_E + L_FFT / 2, L_FFT / 2 );
+    resultant_q = s_min( Q22, s_min( add( *q_Bin_E, exp2 ), add( exp, Q22 ) ) ); // calculating resultant q after scaling
+    scale_sig32( Bin_E, L_FFT / 2, sub( resultant_q, Q22 ) );                    // Q22=>resultant_q
+    scale_sig32( Bin_E + L_FFT / 2, L_FFT / 2, sub( resultant_q, *q_Bin_E ) );   // q_Bin_E=>resultant_q
+    *q_Bin_E = resultant_q;
+    move16();
 
     return;
 }
@@ -952,12 +945,8 @@ static void find_enr(
 
             /* *ptE *= 4.0 / (L_FFT*L_FFT) */
             /* normalization - corresponds to FFT normalization by 2/L_FFT */
-            BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef BASOP_NOGLOB
+            BASOP_SATURATE_WARNING_OFF_EVS;                  /* saturation seems to have no effect (tested by simulation) */
             *ptE = L_shl_o( Ltmp, diff_scaleM2, &Overflow ); /* Q_new + QSCALE - 2 */
-#else                                                        /* BASOP_NOGLOB */
-            *ptE = L_shl( Ltmp, diff_scaleM2 );
-#endif                                                       /* BASOP_NOGLOB */
             move32();                                        /* scaled by Q_new + QSCALE - 2 */
             BASOP_SATURATE_WARNING_ON_EVS;
             /*band[i] += *ptE++;*/
@@ -982,12 +971,8 @@ static void find_enr(
 
         exp_band = sub( exp_band, shift_to_norm );
         exp_band = sub( diff_scaleP1, exp_band );
-        BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef BASOP_NOGLOB
+        BASOP_SATURATE_WARNING_OFF_EVS;                  /* saturation seems to have no effect (tested by simulation) */
         band[i] = L_shl_o( Ltmp1, exp_band, &Overflow ); /* Q15 + exp_band */
-#else                                                    /* BASOP_NOGLOB */
-        band[i] = L_shl( Ltmp1, exp_band );
-#endif                                                   /* BASOP_NOGLOB */
         move32();                                        /* band scaled by Q_new + QSCALE */
         BASOP_SATURATE_WARNING_ON_EVS;
 
@@ -1037,12 +1022,8 @@ static void find_enr(
 
                 /* *ptE *= 4.0 / (L_FFT*L_FFT) */
                 /* normalization - corresponds to FFT normalization by 2/L_FFT  */
-                BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef BASOP_NOGLOB
+                BASOP_SATURATE_WARNING_OFF_EVS;                    /* saturation seems to have no effect (tested by simulation) */
                 *Bin_E = L_shl_o( Ltmp, diff_scaleM2, &Overflow ); /* Q_new + QSCALE */
-#else                                                              /* BASOP_NOGLOB */
-                *Bin_E = L_shl( Ltmp, diff_scaleM2 );
-#endif                                                             /* BASOP_NOGLOB */
                 move32();                                          /* scaled by Q_new + QSCALE - 2 */
                 BASOP_SATURATE_WARNING_ON_EVS;
                 Bin_E++;
@@ -1064,11 +1045,7 @@ static void find_enr(
             exp_band = sub( exp_band, shift_to_norm );
             exp_band = sub( diff_scaleP1, exp_band );
             BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef BASOP_NOGLOB
             band[i] = L_shl_o( Ltmp1, exp_band, &Overflow );
-#else /* BASOP_NOGLOB */
-            band[i] = L_shl( Ltmp1, exp_band );
-#endif
             move32(); /* band scaled by Q_new + QSCALE */
             BASOP_SATURATE_WARNING_ON_EVS;
 
@@ -1104,11 +1081,7 @@ static void find_enr(
      * Find the total energy over the input bandwidth
      *-----------------------------------------------------------------*/
 
-#ifdef BASOP_NOGLOB
     etot = L_add_sat( *LEtot, L_shl_sat( etot, sub( exp_etot, 4 ) ) );
-#else
-    etot = L_add( *LEtot, L_shl( etot, sub( exp_etot, 4 ) ) );
-#endif
     *LEtot = etot;
     move32();
 
diff --git a/lib_enc/ari_enc.c b/lib_enc/ari_enc.c
deleted file mode 100644
index cda9d3c8270527bb9da7675dff645599620770bd..0000000000000000000000000000000000000000
--- a/lib_enc/ari_enc.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "stat_com.h"
-#include "basop_util.h"
-#include "wmc_auto.h"
-#include "prot_fx_enc.h"
-
-
-/*---------------------------------------------------------------
- * ari_copy_states()
- *
- * Copy state
- *-------------------------------------------------------------*/
-
-void ari_copy_states(
-    Tastat *source,
-    Tastat *dest )
-{
-    dest->low = source->low;
-    dest->high = source->high;
-    dest->bits_to_follow = source->bits_to_follow;
-
-    return;
-}
-
-/*---------------------------------------------------------------
-  Ari encoder 14 bits routines
-  -------------------------------------------------------------*/
-
-/*---------------------------------------------------------------
- * ari_start_encoding_14bits()
- *
- * Start ArCo encoding
- *-------------------------------------------------------------*/
-
-void ari_start_encoding_14bits(
-    Tastat *s )
-{
-    /* : addressing is made with walking pointer s */
-    s->low = 0;
-    s->high = ari_q4new;
-    s->bits_to_follow = 0;
-    move32();
-    move32();
-    move32();
-
-    return;
-}
-void ari_start_encoding_14bits_ivas_fx(
-    Tastat *s )
-{
-    /* : addressing is made with walking pointer s */
-    s->low = 0;
-    s->high = ari_q4new;
-    s->bits_to_follow = 0;
-    move32();
-    move32();
-    move32();
-
-    return;
-}
-
-/*---------------------------------------------------------------
- * ari_done_encoding_14bits_ivas_fx()
- *
- * Finish ArCo encoding
- *-------------------------------------------------------------*/
-
-Word16 ari_done_encoding_14bits_ivas_fx(
-    Word16 *ptr, /* Q0 */
-    Word16 bp,   /* Q0 */
-    Tastat *s )
-{
-    Word16 bit;
-
-    bit = 0;
-    move16();
-    IF( GE_32( s->low, ari_q1new ) )
-    {
-        bit = s_xor( bit, 1 );
-    }
-    return ari_put_bit_plus_follow( ptr, bp, add( extract_l( s->bits_to_follow ), 1 ), bit );
-}
-
-
-/*---------------------------------------------------------------
- * ari_encode_14bits_ext_ivas_fx()
- *
- * encode function for extended proba tables: less branches needed for coding
- *
- *-------------------------------------------------------------*/
-Word16 ari_encode_14bits_ext_ivas_fx(
-    Word16 *ptr, /* Q0 */
-    Word16 bp,   /* Q0 */
-    Tastat *s,
-    Word32 symbol,          /* Q0 */
-    UWord16 const *cum_freq /* Q0 */
-)
-{
-    Word32 low;
-    Word32 high;
-    Word32 range;
-    Word16 bits_to_follow;
-    Word16 i;
-    UWord16 temp;
-    Word32 L_temp1, L_temp2;
-
-    high = L_add( s->high, 0 );
-    low = L_add( s->low, 0 );
-    range = L_add( L_sub( high, low ), 1 ); /* Q0 */
-
-    L_temp1 = L_shl( range, 15 - stat_bitsnew /*both are constants*/ );
-    Mpy_32_16_ss( L_temp1, cum_freq[symbol + 1], &L_temp2, &temp );
-    IF( symbol != 0 ) /* when symbol is 0, range remains unchanged */
-    {
-        Mpy_32_16_ss( L_temp1, cum_freq[symbol], &range, &temp );
-    }
-    high = L_sub( L_add( low, range ), 1 ); /* Q0 */
-    low = L_add( low, L_temp2 );            /* Q0 */
-
-    assert( s->bits_to_follow <= MAX_16 );
-    bits_to_follow = extract_l( s->bits_to_follow ); /* Q0 */
-
-    FOR( i = 0; i < 0x7FFF; i++ )
-    {
-        IF( LT_32( high, ari_q2new ) )
-        {
-            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 0 ); /* Q0 */
-            bits_to_follow = 0;
-            move16();
-        }
-        ELSE IF( GE_32( low, ari_q2new ) )
-        {
-            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 1 ); /* Q0 */
-            bits_to_follow = 0;
-            move16();
-            low = L_sub( low, ari_q2new );
-            high = L_sub( high, ari_q2new ); /* Subtract offset to top.  */
-        }
-        ELSE
-        {
-            test();
-            IF( GE_32( low, ari_q1new ) && LT_32( high, ari_q3new ) )
-            {
-                /* Output an opposite bit   */
-                /* later if in middle half. */
-                bits_to_follow = add( bits_to_follow, 1 ); /* Q0 */
-                low = L_sub( low, ari_q1new );             /* Subtract offset to middle*/
-                high = L_sub( high, ari_q1new );
-            }
-            ELSE
-            {
-                BREAK; /* Otherwise exit loop.     */
-            }
-        }
-        low = L_add( low, low );                /* Q0 */
-        high = L_add( L_add( high, high ), 1 ); /* Scale up code range.     Q0*/
-    }
-
-    s->low = low; /* Q0 */
-    move32();
-    s->high = high; /* Q0 */
-    move32();
-    s->bits_to_follow = bits_to_follow; /* Q0 */
-    move32();
-
-    return bp;
-}
-
-
-/*------------------------------------------------------------------------
- * Function: ari_encode_14bits_high_low_fx()
- *
- *-------------------------------------------------------------------------*/
-
-static Word16 ari_encode_14bits_high_low_fx(
-    Word16 *ptr, /* Q0 */
-    Word16 bp,   /* Q0 */
-    Word16 bits, /* Q0 */
-    Tastat *s,
-    Word32 high, /* Q0 */
-    Word32 low   /* Q0 */
-)
-{
-    Word16 bits_to_follow, tmp;
-
-    bits_to_follow = extract_l( s->bits_to_follow ); /* Q0 */
-    move16();
-
-    /* while there are more than 16 bits left */
-    tmp = sub( 16, bits ); /* Q0 */
-    WHILE( add( add( bp, bits_to_follow ), tmp ) < 0 )
-    {
-        IF( LE_32( high, ari_q2new ) )
-        {
-            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 0 ); /* Q0 */
-            bits_to_follow = 0;
-            move16();
-        }
-        ELSE IF( GE_32( low, ari_q2new ) )
-        {
-            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 1 ); /* Q0 */
-            bits_to_follow = 0;
-            move16();
-            low = L_sub( low, ari_q2new );   /* Q0 */
-            high = L_sub( high, ari_q2new ); /* Subtract offset to top.  Q0*/
-        }
-        ELSE
-        {
-            test();
-            IF( GE_32( low, ari_q1new ) && LE_32( high, ari_q3new ) )
-            {
-                /* Output an opposite bit   */
-                /* later if in middle half. */
-                bits_to_follow = add( bits_to_follow, 1 ); /* Q0 */
-                low = L_sub( low, ari_q1new );             /* Subtract offset to middle	Q0*/
-                high = L_sub( high, ari_q1new );           /* Q0 */
-            }
-            ELSE
-            {
-                BREAK; /* Otherwise exit loop.     */
-            }
-        }
-
-        low = L_add( low, low );
-        high = L_add( high, high ); /* Scale up code range.     */
-    }
-
-    s->low = low; /* Q0 */
-    move32();
-    s->high = L_sub( high, 1 ); /* Q0 */
-    move32();
-    s->bits_to_follow = bits_to_follow; /* Q0 */
-    move16();
-
-    return bp;
-}
-
-/*------------------------------------------------------------------------
- * Function: ari_encode_14bits_sign_ivas_fx()
- *
- * Encode a sign with equal probabilities.
- *-------------------------------------------------------------------------*/
-Word16 ari_encode_14bits_sign_ivas_fx(
-    Word16 *ptr, /* Q0 */
-    Word16 bp,   /* Q0 */
-    Word32 bits, /* Q0 */
-    Tastat *s,
-    Word16 sign /* Q0 */
-)
-{
-    Word32 low, high, range;
-    Word32 L_tmp;
-
-    high = L_add( s->high, 1 );
-    low = L_add( s->low, 0 );
-    range = L_sub( high, low ); /* Q0 */
-
-    L_tmp = L_shr( range, 1 );
-    if ( sign != 0 )
-    {
-        high = L_add( low, L_tmp ); /* Q0 */
-    }
-    if ( sign == 0 )
-    {
-        low = L_add( low, L_tmp ); /* Q0 */
-    }
-
-    return ari_encode_14bits_high_low_fx( ptr, bp, extract_l( bits ), s, high, low );
-}
-
-/*------------------------------------------------------------------------
- * Function: ari_done_cbr_encoding_14bits()
- *
- * Finish up encoding in CBR mode.
- *-------------------------------------------------------------------------*/
diff --git a/lib_enc/ari_enc_fx.c b/lib_enc/ari_enc_fx.c
index 0ef053edd75ef58434abdc6fab944cb0851964de..29ddd838c69cfb2be54ccfd8d304168190e848bf 100644
--- a/lib_enc/ari_enc_fx.c
+++ b/lib_enc/ari_enc_fx.c
@@ -364,3 +364,226 @@ Word16 ari_done_cbr_encoding_14bits_fx(
 
     return bp;
 }
+
+void ari_start_encoding_14bits_ivas_fx(
+    Tastat *s )
+{
+    /* : addressing is made with walking pointer s */
+    s->low = 0;
+    s->high = ari_q4new;
+    s->bits_to_follow = 0;
+    move32();
+    move32();
+    move32();
+
+    return;
+}
+
+/*---------------------------------------------------------------
+ * ari_done_encoding_14bits_ivas_fx()
+ *
+ * Finish ArCo encoding
+ *-------------------------------------------------------------*/
+
+Word16 ari_done_encoding_14bits_ivas_fx(
+    Word16 *ptr, /* Q0 */
+    Word16 bp,   /* Q0 */
+    Tastat *s )
+{
+    Word16 bit;
+
+    bit = 0;
+    move16();
+    IF( GE_32( s->low, ari_q1new ) )
+    {
+        bit = s_xor( bit, 1 );
+    }
+    return ari_put_bit_plus_follow( ptr, bp, add( extract_l( s->bits_to_follow ), 1 ), bit );
+}
+
+
+/*---------------------------------------------------------------
+ * ari_encode_14bits_ext_ivas_fx()
+ *
+ * encode function for extended proba tables: less branches needed for coding
+ *
+ *-------------------------------------------------------------*/
+Word16 ari_encode_14bits_ext_ivas_fx(
+    Word16 *ptr, /* Q0 */
+    Word16 bp,   /* Q0 */
+    Tastat *s,
+    Word32 symbol,          /* Q0 */
+    UWord16 const *cum_freq /* Q0 */
+)
+{
+    Word32 low;
+    Word32 high;
+    Word32 range;
+    Word16 bits_to_follow;
+    Word16 i;
+    UWord16 temp;
+    Word32 L_temp1, L_temp2;
+
+    high = L_add( s->high, 0 );
+    low = L_add( s->low, 0 );
+    range = L_add( L_sub( high, low ), 1 ); /* Q0 */
+
+    L_temp1 = L_shl( range, 15 - stat_bitsnew /*both are constants*/ );
+    Mpy_32_16_ss( L_temp1, cum_freq[symbol + 1], &L_temp2, &temp );
+    IF( symbol != 0 ) /* when symbol is 0, range remains unchanged */
+    {
+        Mpy_32_16_ss( L_temp1, cum_freq[symbol], &range, &temp );
+    }
+    high = L_sub( L_add( low, range ), 1 ); /* Q0 */
+    low = L_add( low, L_temp2 );            /* Q0 */
+
+    assert( s->bits_to_follow <= MAX_16 );
+    bits_to_follow = extract_l( s->bits_to_follow ); /* Q0 */
+
+    FOR( i = 0; i < 0x7FFF; i++ )
+    {
+        IF( LT_32( high, ari_q2new ) )
+        {
+            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 0 ); /* Q0 */
+            bits_to_follow = 0;
+            move16();
+        }
+        ELSE IF( GE_32( low, ari_q2new ) )
+        {
+            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 1 ); /* Q0 */
+            bits_to_follow = 0;
+            move16();
+            low = L_sub( low, ari_q2new );
+            high = L_sub( high, ari_q2new ); /* Subtract offset to top.  */
+        }
+        ELSE
+        {
+            test();
+            IF( GE_32( low, ari_q1new ) && LT_32( high, ari_q3new ) )
+            {
+                /* Output an opposite bit   */
+                /* later if in middle half. */
+                bits_to_follow = add( bits_to_follow, 1 ); /* Q0 */
+                low = L_sub( low, ari_q1new );             /* Subtract offset to middle*/
+                high = L_sub( high, ari_q1new );
+            }
+            ELSE
+            {
+                BREAK; /* Otherwise exit loop.     */
+            }
+        }
+        low = L_add( low, low );                /* Q0 */
+        high = L_add( L_add( high, high ), 1 ); /* Scale up code range.     Q0*/
+    }
+
+    s->low = low; /* Q0 */
+    move32();
+    s->high = high; /* Q0 */
+    move32();
+    s->bits_to_follow = bits_to_follow; /* Q0 */
+    move32();
+
+    return bp;
+}
+
+
+/*------------------------------------------------------------------------
+ * Function: ari_encode_14bits_high_low_fx()
+ *
+ *-------------------------------------------------------------------------*/
+
+static Word16 ari_encode_14bits_high_low_ivas_fx(
+    Word16 *ptr, /* Q0 */
+    Word16 bp,   /* Q0 */
+    Word16 bits, /* Q0 */
+    Tastat *s,
+    Word32 high, /* Q0 */
+    Word32 low   /* Q0 */
+)
+{
+    Word16 bits_to_follow, tmp;
+
+    bits_to_follow = extract_l( s->bits_to_follow ); /* Q0 */
+    move16();
+
+    /* while there are more than 16 bits left */
+    tmp = sub( 16, bits ); /* Q0 */
+    WHILE( add( add( bp, bits_to_follow ), tmp ) < 0 )
+    {
+        IF( LE_32( high, ari_q2new ) )
+        {
+            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 0 ); /* Q0 */
+            bits_to_follow = 0;
+            move16();
+        }
+        ELSE IF( GE_32( low, ari_q2new ) )
+        {
+            bp = ari_put_bit_plus_follow( ptr, bp, bits_to_follow, 1 ); /* Q0 */
+            bits_to_follow = 0;
+            move16();
+            low = L_sub( low, ari_q2new );   /* Q0 */
+            high = L_sub( high, ari_q2new ); /* Subtract offset to top.  Q0*/
+        }
+        ELSE
+        {
+            test();
+            IF( GE_32( low, ari_q1new ) && LE_32( high, ari_q3new ) )
+            {
+                /* Output an opposite bit   */
+                /* later if in middle half. */
+                bits_to_follow = add( bits_to_follow, 1 ); /* Q0 */
+                low = L_sub( low, ari_q1new );             /* Subtract offset to middle	Q0*/
+                high = L_sub( high, ari_q1new );           /* Q0 */
+            }
+            ELSE
+            {
+                BREAK; /* Otherwise exit loop.     */
+            }
+        }
+
+        low = L_add( low, low );
+        high = L_add( high, high ); /* Scale up code range.     */
+    }
+
+    s->low = low; /* Q0 */
+    move32();
+    s->high = L_sub( high, 1 ); /* Q0 */
+    move32();
+    s->bits_to_follow = bits_to_follow; /* Q0 */
+    move16();
+
+    return bp;
+}
+
+/*------------------------------------------------------------------------
+ * Function: ari_encode_14bits_sign_ivas_fx()
+ *
+ * Encode a sign with equal probabilities.
+ *-------------------------------------------------------------------------*/
+Word16 ari_encode_14bits_sign_ivas_fx(
+    Word16 *ptr, /* Q0 */
+    Word16 bp,   /* Q0 */
+    Word32 bits, /* Q0 */
+    Tastat *s,
+    Word16 sign /* Q0 */
+)
+{
+    Word32 low, high, range;
+    Word32 L_tmp;
+
+    high = L_add( s->high, 1 );
+    low = L_add( s->low, 0 );
+    range = L_sub( high, low ); /* Q0 */
+
+    L_tmp = L_shr( range, 1 );
+    if ( sign != 0 )
+    {
+        high = L_add( low, L_tmp ); /* Q0 */
+    }
+    if ( sign == 0 )
+    {
+        low = L_add( low, L_tmp ); /* Q0 */
+    }
+
+    return ari_encode_14bits_high_low_ivas_fx( ptr, bp, extract_l( bits ), s, high, low );
+}
diff --git a/lib_enc/ari_hm_enc.c b/lib_enc/ari_hm_enc.c
deleted file mode 100644
index a227784dc30e0652485647f39060944aeb5d5d0c..0000000000000000000000000000000000000000
--- a/lib_enc/ari_hm_enc.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "stl.h"
-#include "basop_util.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * EncodeIndex()
- *
- *
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/ari_hm_enc_fx.c b/lib_enc/ari_hm_enc_fx.c
index 66b53bc6de886a29c6408454101990cdea9d85ac..343f1890fd01b79e821a02184d77e8383bc8d3fd 100644
--- a/lib_enc/ari_hm_enc_fx.c
+++ b/lib_enc/ari_hm_enc_fx.c
@@ -10,9 +10,7 @@
 #include "basop_util.h"
 #include "rom_com.h"
 #include "rom_enc.h"
-#include "prot.h"
-//#include "prot_fx.h"
-#include "prot_fx.h"     /* Function prototypes                    */
+#include "prot_fx.h"
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*-------------------------------------------------------------------*
@@ -44,12 +42,12 @@ Word16 EncodeIndex_fx(
         NumRatioBitsBwLtpIndx = NumRatioBits[Bandwidth][LtpPitchIndex];
         move16();
 
-        push_next_indice_fx( hBst, s_and( PeriodicityIndex, 0xff ), NumRatioBitsBwLtpIndx );
+        push_next_indice( hBst, s_and( PeriodicityIndex, 0xff ), NumRatioBitsBwLtpIndx );
         return NumRatioBitsBwLtpIndx;
     }
     ELSE
     {
-        push_next_indice_fx( hBst, PeriodicityIndex, 8 );
+        push_next_indice( hBst, PeriodicityIndex, 8 );
         return 8;
     }
 }
@@ -459,17 +457,9 @@ Word16 SearchPeriodicityIndex_fx(
         tmp32 = L_mult0( Score, NumToConsider ); /* -> 16Q15 */
         tmp = sub( norm_l( tmp32 ), 1 );
         tmp2 = norm_l( AbsTotal );
-#ifdef BASOP_NOGLOB
         tmp3 = div_s( round_fx_o( L_shl_o( tmp32, tmp, &Overflow ), &Overflow ), round_fx_o( L_shl_o( AbsTotal, tmp2, &Overflow ), &Overflow ) );
         *RelativeScore = shr_o( tmp3, add( sub( tmp, tmp2 ), 2 ), &Overflow ); /* -> 2Q13 */
         move16();
-#else
-        tmp3 = div_s( round_fx( L_shl( tmp32, tmp ) ), round_fx( L_shl( AbsTotal, tmp2 ) ) );
-        BASOP_SATURATE_WARNING_OFF_EVS
-        *RelativeScore = shr( tmp3, add( sub( tmp, tmp2 ), 2 ) ); /* -> 2Q13 */
-        move16();
-        BASOP_SATURATE_WARNING_ON_EVS
-#endif
     }
     ELSE
     {
diff --git a/lib_enc/arith_coder_enc.c b/lib_enc/arith_coder_enc.c
deleted file mode 100644
index 5680feed42ee0e30f885765fcede5cc00420d9fa..0000000000000000000000000000000000000000
--- a/lib_enc/arith_coder_enc.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "basop_util.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/arith_coder_enc_fx.c b/lib_enc/arith_coder_enc_fx.c
index 40c1c6b7b73893959e64e400f7325072f4534f47..98a5173f592f6f5c41fd26316bd5ec30b4d72ede 100644
--- a/lib_enc/arith_coder_enc_fx.c
+++ b/lib_enc/arith_coder_enc_fx.c
@@ -72,11 +72,7 @@ static Word16 tcx_arith_estimate_scale(
             s1 = norm_l( abs_spectrum[k] );
         }
 
-#ifdef BASOP_NOGLOB
         tmp = mult_r( round_fx_o( L_shl( abs_spectrum[k], s1 ), &Overflow ), envelope[k] );
-#else  /* BASOP_NOGLOB */
-        tmp = mult_r( round_fx( L_shl( abs_spectrum[k], s1 ) ), envelope[k] );
-#endif /* BASOP_NOGLOB */
         L_tmp = L_mult0( tmp, tmp );
         tmp = sub( shl( s1, 1 ), 1 );
 
@@ -93,11 +89,7 @@ static Word16 tcx_arith_estimate_scale(
 
         /* scale and accumulate */
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         accu = L_add_sat( accu, L_shr( L_tmp, sub( tmp, s ) ) );
-#else
-        accu = L_add( accu, L_shr( L_tmp, sub( tmp, s ) ) );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
     s = sub( shl( add( abs_spectrum_e, envelope_e ), 1 ), s );
@@ -387,13 +379,7 @@ static Word16 tcx_arith_rateloop(
 
     scale_max = tcx_arith_find_max_scale( abs_spectrum, abs_spectrum_e, L_frame, envelope, envelope_e, exps, deadzone, scale_e );
 
-#ifdef BASOP_NOGLOB
     scale = shl_o( scale, sub( tmp, *scale_e ), &Overflow );
-#else
-    BASOP_SATURATE_WARNING_OFF_EVS;
-    scale = shl( scale, sub( tmp, *scale_e ) );
-    BASOP_SATURATE_WARNING_ON_EVS;
-#endif
     scale = s_min( scale, scale_max );
 
     scale_best = scale;
@@ -454,13 +440,7 @@ static Word16 tcx_arith_rateloop(
             {
                 /* Update estimator temporal compensation factor */
                 tmp = BASOP_Util_Divide3232_Scale( L_mult0( target_bits, 1 << 9 ), bits, &s );
-#ifdef BASOP_NOGLOB
                 tmp = shl_o( mult_r( *target_bits_fac, tmp ), s, &Overflow );
-#else
-                BASOP_SATURATE_WARNING_OFF_EVS;
-                tmp = shl( mult_r( *target_bits_fac, tmp ), s );
-                BASOP_SATURATE_WARNING_ON_EVS;
-#endif
                 tmp = s_min( tmp, 20480 /*1.25f Q14*/ );
                 tmp = s_max( tmp, 12288 /*0.75f Q14*/ );
                 *target_bits_fac = tmp;
@@ -490,15 +470,8 @@ static Word16 tcx_arith_rateloop(
             {
                 /* adjust = 1.25f * target_bits / (float)bits; */
                 tmp = BASOP_Util_Divide3232_Scale( L_mult0( target_bits, 0x280 ), bits, &s );
-#ifdef BASOP_NOGLOB
                 adjust = shl_o( tmp, sub( s, 1 ), &Overflow ); /* Q14 */
                 scale = shl_o( mult_r( scale, adjust ), 1, &Overflow );
-#else
-                BASOP_SATURATE_WARNING_OFF_EVS;   /* adjust limited to <= 2.0, scale to <= scale_max */
-                adjust = shl( tmp, sub( s, 1 ) ); /* Q14 */
-                scale = shl( mult_r( scale, adjust ), 1 );
-                BASOP_SATURATE_WARNING_ON_EVS;
-#endif
                 scale = s_min( scale, scale_max );
             }
         }
@@ -802,11 +775,7 @@ void tcx_arith_encode_envelope_fx(
     L_tmp2 = L_deposit_l( 0 );
     FOR( k = 0; k <= kMax; k++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp2 = L_macNs_co( L_tmp2, q_spectrum[k], k, &Carry, &Overflow );
-#else /* BASOP_NOGLOB */
-        L_tmp2 = L_macNs( L_tmp2, q_spectrum[k], k );
-#endif
 
         if ( signs[k] != 0 )
             L_tmp = L_mult( q_spectrum[k], -( 1 << ( 30 - SPEC_EXP_DEC ) ) );
@@ -823,3 +792,134 @@ void tcx_arith_encode_envelope_fx(
     *nf_seed = extract_l( L_tmp2 );
     move16();
 }
+
+void tcx_arith_encode_envelope_ivas_fx(
+    Word32 spectrum[],          /* i/o: MDCT coefficients           Q31-e */
+    Word16 *spectrum_e,         /* i/o: MDCT exponent               Q0 */
+    Word16 signs[],             /* o: signs (spectrum[.]<0)         Q0 */
+    const Word16 L_frame,       /* i: frame or MDCT length          Q0 */
+    const Word16 L_spec,        /* i: frame or MDCT length          Q0 */
+    Encoder_State *st,          /* i/o: coder state                 */
+    const Word16 A_ind[],       /* i: quantised LPC coefficients    Q12 */
+    Word16 target_bits,         /* i: number of available bits      Q0 */
+    Word16 prm[],               /* o: bitstream parameters          Q0 */
+    const Word8 use_hm,         /* i: use HM in current frame?      */
+    Word16 prm_hm[],            /* o: HM parameter area             Q0 */
+    const Word16 tcxltp_pitch,  /* i: TCX LTP pitch in FD, -1 if n/a  Q0*/
+    Word16 *arith_bits,         /* o: bits used for ari. coding     Q0 */
+    Word16 *signaling_bits,     /* o: bits used for signaling       Q0 */
+    const Word16 low_complexity /* i: low-complexity flag           Q0 */
+)
+{
+    Word32 env[N_MAX_ARI]; /* unscaled envelope (Q16) */
+    Word16 *envelope;      /* scaled envelope (Q15-e) */
+    Word16 envelope_e;
+    Word16 exponents[N_MAX_ARI]; /* Q15 */
+    Word16 L_spec_core;
+    Word16 *q_spectrum;
+    TCX_CONFIG_HANDLE hTcxCfg;
+    Word16 scale, scale_e;
+    Word16 k, kMax;
+    Word16 deadzone;
+    const Word8 *deadzone_flags;
+    Word16 gamma_w, gamma_uw;
+    Word16 hm_bits;
+    Word32 L_tmp;
+    Word16 tmp;
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+
+    assert( L_spec <= N_MAX_ARI );
+
+    hTcxCfg = st->hTcxCfg;
+    deadzone = hTcxCfg->sq_rounding;
+    move16();
+    deadzone_flags = hTcxEnc->memQuantZeros;
+    *signaling_bits = 0;
+    move16();
+
+    assert( st->enableTcxLpc );
+    gamma_w = 32767 /*1.0f Q15*/;
+    move16();
+    gamma_uw = st->inv_gamma;
+    move16();
+
+    tcx_arith_render_envelope( A_ind, L_frame, L_spec, hTcxCfg->preemph_fac, gamma_w, gamma_uw, env );
+
+    FOR( k = 0; k < L_spec; k++ )
+    {
+        signs[k] = extract_l( L_lshr( spectrum[k], 31 ) );
+        move16();
+        if ( spectrum[k] < 0 )
+        {
+            spectrum[k] = L_abs( spectrum[k] );
+            move32();
+        }
+    }
+
+    IF( use_hm != 0 )
+    {
+        tcx_hm_analyse_fx( spectrum, spectrum_e, L_spec, env, target_bits, hTcxCfg->coder_type, prm_hm, tcxltp_pitch, hTcxEnc->tcxltp_gain, &hm_bits );
+
+        target_bits = sub( target_bits, hm_bits );
+        *signaling_bits = add( *signaling_bits, hm_bits );
+        move16();
+    }
+    ELSE
+    {
+        prm_hm[0] = 0; /* just to be sure */
+        move16();
+        hm_bits = 0;
+        move16();
+    }
+
+    L_spec_core = L_spec;
+    move16();
+    if ( st->igf )
+    {
+        L_spec_core = s_min( L_spec_core, st->hIGFEnc->infoStartLine );
+    }
+    envelope = (Word16 *) env;
+
+    tcx_arith_scale_envelope( L_spec, L_spec_core, env, target_bits, low_complexity, envelope, &envelope_e );
+
+    tmp = sub( envelope_e, 1 + 15 );
+    FOR( k = 0; k < L_spec; k++ )
+    {
+        exponents[k] = round_fx( expfp( envelope[k], tmp ) );
+        move16();
+    }
+
+    scale = tcx_arith_rateloop( spectrum, *spectrum_e, L_spec, envelope, envelope_e, exponents, target_bits, deadzone, deadzone_flags, &( hTcxEnc->tcx_target_bits_fac ), &scale_e );
+
+    /* Final quantization */
+    kMax = tcx_arith_find_kMax( spectrum, *spectrum_e, L_spec, scale, scale_e, deadzone, deadzone_flags );
+
+    q_spectrum = (Word16 *) env; /* Reuse buffer */
+
+    L_tmp = L_mult( deadzone, 1 ); /* Q16 */
+    tmp = add( sub( *spectrum_e, 15 ), scale_e );
+    FOR( k = 0; k <= kMax; k++ )
+    {
+        /* quantise using dead-zone */
+        q_spectrum[k] = extract_h( L_add( L_shl( Mpy_32_16_1( spectrum[k], scale ), tmp ), L_tmp ) );
+        move16();
+    }
+
+    /* Final encoding */
+    *arith_bits = tcx_arith_encode( q_spectrum, signs, kMax, L_spec, exponents, target_bits, prm );
+    move16();
+
+    /* Multiply back the signs */
+    FOR( k = 0; k <= kMax; k++ )
+    {
+        if ( signs[k] != 0 )
+            L_tmp = L_mult( q_spectrum[k], -( 1 << ( 30 - SPEC_EXP_DEC ) ) );
+        if ( signs[k] == 0 )
+            L_tmp = L_mult( q_spectrum[k], 1 << ( 30 - SPEC_EXP_DEC ) );
+        spectrum[k] = L_tmp;
+        move32();
+    }
+    *spectrum_e = SPEC_EXP_DEC;
+    move16();
+    set32_fx( spectrum + k, 0, sub( s_max( L_frame, L_spec ), k ) );
+}
diff --git a/lib_enc/avq_cod.c b/lib_enc/avq_cod.c
deleted file mode 100644
index 8e752f0ac516550ba25f4c9dcce588dfd9e16b42..0000000000000000000000000000000000000000
--- a/lib_enc/avq_cod.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/avq_cod_fx.c b/lib_enc/avq_cod_fx.c
index c5a10198185b879db16dbafdbf9168682e7e173f..b3a49c59ef44f47907cd76b13c71eb34b8156521 100644
--- a/lib_enc/avq_cod_fx.c
+++ b/lib_enc/avq_cod_fx.c
@@ -5,9 +5,7 @@
 #include <math.h>
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"
-#include <assert.h> /* Compilation switches                   */
-#include "prot.h"   /* Function prototypes                    */
-//#include "prot_fx.h"        /* Function prototypes                    */
+#include <assert.h>      /* Compilation switches                   */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "rom_com.h"     /* Static table prototypes                */
@@ -55,11 +53,7 @@ void AVQ_cod_fx(                       /* o:   comfort noise gain factor
             Lener = L_shl( 4, shl( Q_in, 1 ) ); /* to set ebits >= 0 */
             FOR( i = 0; i < 8; i++ )
             {
-#ifdef BASOP_NOGLOB
                 Lener = L_mac_o( Lener, xri[l * 8 + i], xri[l * 8 + i], &Overflow );
-#else
-                Lener = L_mac( Lener, xri[l * 8 + i], xri[l * 8 + i] );
-#endif
             }
             /* estimated bit consumption when gain=1 */
             /* ebits[l] = 5.0 * FAC_LOG2 * (Word16)log10(ener * 0.5) */
@@ -124,11 +118,7 @@ void AVQ_cod_fx(                       /* o:   comfort noise gain factor
     /* estimated gain (when offset=0, estimated gain=1) */
     f_tmp = L_Extract_lc( Ltmp, &e_tmp );
     tmp16 = extract_l( Pow2( 14, f_tmp ) );
-#ifdef BASOP_NOGLOB
     Lgain = L_shl_sat( tmp16, e_tmp );
-#else
-    Lgain = L_shl( tmp16, e_tmp );
-#endif
     /* gain_inv = 1.0f / gain */
     e_tmp = norm_l( Lgain );
     tmp16 = extract_h( L_shl( Lgain, e_tmp ) );
@@ -394,20 +384,20 @@ void AVQ_encmux_fx(
                 /* write the unary code */
                 FOR( ; j > 16; j -= 16 )
                 {
-                    push_indice_fx( hBstr, nq_ind, 65535, 16 );
+                    push_indice( hBstr, nq_ind, 65535, 16 );
                     bits = sub( bits, 16 );
                 }
 
                 IF( j > 0 )
                 {
-                    push_indice_fx( hBstr, nq_ind, extract_l( L_sub( L_shl( 1L, j ), 1L ) ), j );
+                    push_indice( hBstr, nq_ind, extract_l( L_sub( L_shl( 1L, j ), 1L ) ), j );
                     bits = sub( bits, j );
                 }
             }
             IF( !overflow )
             {
                 /* write the stop bit */
-                push_indice_fx( hBstr, nq_ind, 0, 1 );
+                push_indice( hBstr, nq_ind, 0, 1 );
                 bits = sub( bits, 1 );
             }
 
@@ -516,20 +506,20 @@ void AVQ_encmux_fx(
         IF( j > 0 )
         {
             /* write the unary code */
-            push_indice_fx( hBstr, nq_ind, sub( shl( 1, j ), 1 ), j );
+            push_indice( hBstr, nq_ind, sub( shl( 1, j ), 1 ), j );
         }
 
         IF( nq[i] != 0 )
         {
             /* write the stop bit */
-            push_indice_fx( hBstr, nq_ind, 0, 1 );
+            push_indice( hBstr, nq_ind, 0, 1 );
         }
 
         /*Compute AVQ code book number from unused Bits */
         bit_tmp = add( unusedbitsFlag, unused_bits_idx );
         /*nq_est = (int16_t)ceil(0.2f * (bits - 5 * (unusedbitsFlag + unused_bits_idx)));*/
         nq_est = mult( 6554, sub( bits, add( shl( bit_tmp, 2 ), bit_tmp ) ) );
-        assert( (int16_t) ceil( 0.2f * ( bits - 5 * ( unusedbitsFlag + unused_bits_idx ) ) ) == nq_est );
+        assert( (Word16) ceil( 0.2f * ( bits - 5 * ( unusedbitsFlag + unused_bits_idx ) ) ) == nq_est );
 
         if ( EQ_16( nq_est, 1 ) )
         {
@@ -956,7 +946,7 @@ void AVQ_encmux_ivas_fx(
         bit_tmp = add( unusedbitsFlag, unused_bits_idx );
         /*nq_est = (int16_t)ceil(0.2f * (bits - 5 * (unusedbitsFlag + unused_bits_idx)));*/
         nq_est = mult( 6554 /*.2 in Q15*/, sub( bits, add( shl( bit_tmp, 2 ), bit_tmp ) ) );
-        assert( (int16_t) ceil( 0.2f * ( bits - 5 * ( unusedbitsFlag + unused_bits_idx ) ) ) == nq_est );
+        assert( (Word16) ceil( 0.2f * ( bits - 5 * ( unusedbitsFlag + unused_bits_idx ) ) ) == nq_est );
 
         if ( EQ_16( nq_est, 1 ) )
         {
@@ -1095,8 +1085,8 @@ static void wrte_cv(
     Word16 *nbits          /* i/o: bits                             */
 )
 {
-    int16_t pos, j;
-    int16_t bits, nq4;
+    Word16 pos, j;
+    Word16 bits, nq4;
 
     bits = *nbits;
     move16();
@@ -1109,32 +1099,32 @@ static void wrte_cv(
     ELSE IF( LT_16( nq, 5 ) ) /* Q2, Q3, Q4 */
     {
         nq4 = shl( nq, 2 );
-        push_indice_fx( hBstr, i_ind, I, nq4 );
+        push_indice( hBstr, i_ind, I, nq4 );
         bits = sub( bits, nq4 );
     }
     ELSE IF( EQ_16( s_and( nq, 1 ), 0 ) ) /* Q4 + Voronoi extensions r=1,2,3,... */
     {
-        push_indice_fx( hBstr, i_ind, I, 4 * 4 );
+        push_indice( hBstr, i_ind, I, 4 * 4 );
         bits = sub( bits, 4 * 4 );
         /*pos = (int16_t)(nq / 2 - 2);*/ /* Voronoi order determination */
         pos = sub( shr( nq, 1 ), 2 );
         FOR( j = 0; j < 8; j++ )
         {
-            push_indice_fx( hBstr, kv_ind, kv[j], pos );
+            push_indice( hBstr, kv_ind, kv[j], pos );
         }
 
         bits = sub( bits, shl( pos, 3 ) );
     }
     ELSE /* Q3 + Voronoi extensions r=1,2,3,... */
     {
-        push_indice_fx( hBstr, i_ind, I, 4 * 3 );
+        push_indice( hBstr, i_ind, I, 4 * 3 );
         bits = sub( bits, 4 * 3 );
 
         /*pos = (int16_t)(nq / 2 - 1);*/ /* Voronoi order determination */
         pos = sub( shr( nq, 1 ), 1 );
         FOR( j = 0; j < 8; j++ )
         {
-            push_indice_fx( hBstr, kv_ind, kv[j], pos );
+            push_indice( hBstr, kv_ind, kv[j], pos );
         }
 
         bits = sub( bits, shl( pos, 3 ) );
@@ -1155,8 +1145,8 @@ static void wrte_cv_ivas_fx(
     Word16 *nbits          /* i/o: bits                             */
 )
 {
-    int16_t pos, j;
-    int16_t bits, nq4;
+    Word16 pos, j;
+    Word16 bits, nq4;
 
     bits = *nbits;
     move16();
diff --git a/lib_enc/bass_psfilter_enc.c b/lib_enc/bass_psfilter_enc.c
deleted file mode 100644
index 8e752f0ac516550ba25f4c9dcce588dfd9e16b42..0000000000000000000000000000000000000000
--- a/lib_enc/bass_psfilter_enc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/bass_psfilter_enc_fx.c b/lib_enc/bass_psfilter_enc_fx.c
index e43fa6bc6354df3ea507a887d5e635d903dbf21e..a241101ba1f9b869a6b22df58d3b7aea1461e7c5 100644
--- a/lib_enc/bass_psfilter_enc_fx.c
+++ b/lib_enc/bass_psfilter_enc_fx.c
@@ -129,11 +129,7 @@ Word16 bass_pf_enc_fx(
             /* gain = tmp/nrg; */
             gain = BASOP_Util_Divide3232_Scale( tmp, nrg, &tmp16 );
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             gain = shl_o( gain, tmp16, &Overflow ); /* Q15 */
-#else                                               /* BASOP_NOGLOB */
-            gain = shl( gain, tmp16 ); /* Q15 */
-#endif                                              /* BASOP_NOGLOB */
             BASOP_SATURATE_WARNING_ON_EVS;
 
             if ( gain < 0 )
@@ -157,26 +153,14 @@ Word16 bass_pf_enc_fx(
                 FOR( i = 0; i < lg; i++ )
                 {
                     tmp32 = L_msu0( 0, gain, syn[i + i_subfr - T] );
-#ifdef BASOP_NOGLOB
                     tmp32 = L_msu0_o( tmp32, gain, syn[i + i_subfr + T], &Overflow );
                     tmp16 = mac_ro( tmp32, gain, syn[i + i_subfr], &Overflow ); /* Q0 */
-#else
-                    tmp32 = L_msu0( tmp32, gain, syn[i + i_subfr + T] );
-                    tmp16 = mac_r( tmp32, gain, syn[i + i_subfr] ); /* Q0 */
-#endif
 
                     lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
-#ifdef BASOP_NOGLOB
                     lp_error = L_mac_o( lp_error, tmp16, 0x1000, &Overflow ); /* Q13 */
 
                     tmp16 = round_fx_o( L_shl_o( lp_error, s1, &Overflow ), &Overflow ); /* Q0+s1-3 */
                     ener2 = L_mac0_o( ener2, tmp16, tmp16, &Overflow );                  /* Q0+(s1-3)*2 */
-#else
-                    lp_error = L_mac( lp_error, tmp16, 0x1000 );    /* Q13 */
-
-                    tmp16 = round_fx( L_shl( lp_error, s1 ) );           /* Q0+s1-3 */
-                    ener2 = L_mac0( ener2, tmp16, tmp16 );               /* Q0+(s1-3)*2 */
-#endif
                 }
             }
 
@@ -185,25 +169,13 @@ Word16 bass_pf_enc_fx(
                 FOR( i = lg; i < l_subfr; i++ )
                 {
                     tmp32 = L_mult0( gain, syn[i + i_subfr] );
-#ifdef BASOP_NOGLOB
                     tmp32 = L_msu0_o( tmp32, gain, syn[i + i_subfr - T], &Overflow ); /* Q0 */
                     tmp16 = round_fx_o( tmp32, &Overflow );
-#else
-                    tmp32 = L_msu0( tmp32, gain, syn[i + i_subfr - T] ); /* Q0 */
-                    tmp16 = round_fx( tmp32 );
-#endif
                     lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
-#ifdef BASOP_NOGLOB
                     lp_error = L_mac_o( lp_error, tmp16, 0x1000, &Overflow ); /* Q13 */
 
                     tmp16 = round_fx_o( L_shl_o( lp_error, s1, &Overflow ), &Overflow ); /* Q0+s1-3 */
                     ener2 = L_mac0_o( ener2, tmp16, tmp16, &Overflow );                  /* Q0+(s1-3)*2 */
-#else
-                    lp_error = L_mac( lp_error, tmp16, 0x1000 ); /* Q13 */
-
-                    tmp16 = round_fx( L_shl( lp_error, s1 ) );                /* Q0+s1-3 */
-                    ener2 = L_mac0( ener2, tmp16, tmp16 );                    /* Q0+(s1-3)*2 */
-#endif
                 }
             }
 
@@ -238,11 +210,7 @@ Word16 bass_pf_enc_fx(
                 tmp32 = L_deposit_l( 1 );
             tmp16 = BASOP_Util_Divide3232_Scale( tmp, tmp32, &st );
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             tmp16 = shl_o( tmp16, sub( st, 2 ), &Overflow ); /* Q15 */
-#else                                                        /* BASOP_NOGLOB */
-            tmp16 = shl( tmp16, sub( st, 2 ) );                               /* Q15 */
-#endif                                                       /* BASOP_NOGLOB */
 
             if ( GT_16( tmp16, 16384 /*0.5f Q15*/ ) )
             {
@@ -268,13 +236,8 @@ Word16 bass_pf_enc_fx(
                     tmp32 = L_mac( tmp32, tmp16, syn[i + i_subfr] );
                     noise_in[i] = round_fx( L_shl( tmp32, s2 ) ); /* Q0+s2 */
 
-#ifdef BASOP_NOGLOB
                     error_in[i] = sub_o( orig[i + i_subfr], syn[i + i_subfr], &Overflow ); /*Q0*/
                     move16();
-#else
-                    error_in[i] = sub( orig[i + i_subfr], syn[i + i_subfr] ); /*Q0*/
-                    move16();
-#endif
                 }
             }
 
@@ -287,13 +250,8 @@ Word16 bass_pf_enc_fx(
                     noise_in[i] = round_fx( L_shl( tmp32, s2 ) ); /* Q0+s2 */
                     move16();
 
-#ifdef BASOP_NOGLOB
                     error_in[i] = sub_o( orig[i + i_subfr], syn[i + i_subfr], &Overflow ); /*Q0*/
                     move16();
-#else
-                    error_in[i] = sub( orig[i + i_subfr], syn[i + i_subfr] ); /*Q0*/
-                    move16();
-#endif
                 }
             }
         }
@@ -311,7 +269,7 @@ Word16 bass_pf_enc_fx(
         st = sub( s2, s2_old );
         FOR( i = 0; i < tmp16; i++ )
         {
-            noise_buf[i] = shl( mem_bpf->noise_buf[i], st );
+            noise_buf[i] = shl_sat( mem_bpf->noise_buf[i], st );
             move16();
         }
         Copy( noise_buf + l_subfr, mem_bpf->noise_buf, tmp16 );
@@ -407,13 +365,8 @@ Word16 bass_pf_enc_fx(
         /* *gain_factor_param = (int)(-2.f*(cross_n_d/nrg_n)+0.5f); */
         tmp16 = BASOP_Util_Divide3232_Scale( cross_n_d, nrg_n, &st ); /* Q15-st-s3+s4 */
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         tmp16 = shl_sat( negate( tmp16 ), add( sub( add( st, s3 ), s4 ), 1 - 14 ) ); /* Q1 */
         tmp16 = shr( add_sat( tmp16, 1 ), 1 );                                       /* Q0 */
-#else
-        tmp16 = shl( negate( tmp16 ), add( sub( add( st, s3 ), s4 ), 1 - 14 ) ); /* Q1 */
-        tmp16 = shr( add( tmp16, 1 ), 1 );                                       /* Q0 */
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
 
         *gain_factor_param = tmp16;
diff --git a/lib_enc/bw_detect.c b/lib_enc/bw_detect.c
deleted file mode 100644
index 2cba6f3283c2d99f57ad08f54ccbc75d283cfc11..0000000000000000000000000000000000000000
--- a/lib_enc/bw_detect.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
-
-#define BWD_MIN_BRATE_WIDER_BW_MDCT IVAS_48k
-#define BWD_MIN_BRATE_WIDER_BW_ISM  IVAS_32k
-#define BWD_MAX_BRATE_WIDER_BW_MDCT IVAS_80k
-#define BWD_MAX_BRATE_WIDER_BW_ISM  IVAS_64k
-
-#define ALPHA_BWD     0.75f
-#define BWD_LT_THRESH 0.6f
-
-#define BWD_COUNT_MAX           100
-#define BWD_COUNT_WIDER_BW      10
-#define BWD_COUNT_WIDER_BW_MDCT 0
-
-#define CLDFB_ENER_OFFSET 1.6f
diff --git a/lib_enc/bw_detect_fx.c b/lib_enc/bw_detect_fx.c
index 6d2df38cdc103623c8e4da59ad49a61738b8fe81..050adbf01b0bf0adf22621c85d3fae5fa0974647 100644
--- a/lib_enc/bw_detect_fx.c
+++ b/lib_enc/bw_detect_fx.c
@@ -41,14 +41,14 @@
 void bw_detect_fx(
     Encoder_State *st,               /* i/o: Encoder State           */
     const Word16 signal_in[],        /* i  : input signal           */
-    Word16 *spectrum,                /* i  : MDCT spectrum          */
+    Word16 *spectrum,                /* i  : MDCT spectrum       Q_spec   */
     const Word32 *enerBuffer,        /* i  : CLDFB Energy   Q31      */
     const Word16 *cldfbBuf_Ener_Exp, /* i  : CLDFB Energy Exponent   */
     const IVAS_FORMAT ivas_format,   /* i  : IVAS format             */
-    const Word16 mct_on              /* i  : flag MCT mode           */
-)
+    const Word16 mct_on,             /* i  : flag MCT mode           */
+    const Word16 Q_spec )
 {
-    Word16 Q_dct;
+    Word16 Q_dct, E_spect_bin, tmp_1;
     Word16 i, j, k, bw_max, bin_width, n_bins;
     Word16 max_NB, max_WB, max_SWB, max_FB, mean_NB, mean_WB, mean_SWB, mean_FB; /* Q11*/
     const Word16 *pt, *pt1;
@@ -67,12 +67,6 @@ void bw_detect_fx(
     const Word32 *pt32;
     Word32 max_NB32, max_WB32, max_SWB32, max_FB32, mean_NB32, mean_WB32, mean_SWB32, mean_FB32; /* Q11*/ /* we need Word32 for the new cldfb energy vectors */
     Word16 bwd_count_wider_bw;
-#ifdef IVAS_CODE_DFT
-    Word16 l_frame;
-#endif
-#ifndef IVAS_CODE_BWD
-    (void) spectrum;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -132,12 +126,8 @@ void bw_detect_fx(
                 cldfb_bin[i] = L_deposit_l( 1 );
                 move32();
             }
-            L_tmp = BASOP_Util_Log2( cldfb_bin[0] ); /*(log2(660423549*2^(-31))/64)*2^31*/
-#ifdef BASOP_NOGLOB
+            L_tmp = BASOP_Util_Log2( cldfb_bin[0] );                                                           /*(log2(660423549*2^(-31))/64)*2^31*/
             L_tmp = L_add_o( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[0] ), 31 - LD_DATA_SCALE ), &Overflow ); /* Q25 */
-#else                                                                                                          /* BASOP_NOGLOB */
-            L_tmp = L_add( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[0] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
-#endif                                                                                                         /* BASOP_NOGLOB */
             cldfb_bin[0] = Mpy_32_16_1( L_tmp, 9864 /*1.0f/3.3219280948873623478703194294894f Q15*/ );
             move32(); /* 1/log2(10) */ /* Q25 */
 
@@ -306,11 +296,7 @@ void bw_detect_fx(
 
                 FOR( i = 0; i < BWD_TOTAL_WIDTH; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     spect[i] = round_fx_o( L_shr_o( spect32[i], Q_dct, &Overflow ), &Overflow );
-#else /* BASOP_NOGLOB */
-                    spect[i] = round_fx( L_shr( spect32[i], Q_dct ) );
-#endif
                     move16();
                 }
                 Q_dct = -2;
@@ -326,6 +312,11 @@ void bw_detect_fx(
 
                 bin_width = i_mult( bin_width, l_frame / BWD_TOTAL_WIDTH );
                 Copy( spectrum, spect, l_frame );
+                if ( st->element_mode != EVS_MONO )
+                {
+                    Q_dct = Q_spec;
+                    move16();
+                }
             }
             /*---------------------------------------------------------------------*
              * compute energy per spectral bins
@@ -333,6 +324,7 @@ void bw_detect_fx(
 
             set16_fx( spect_bin, 1, n_bins );
             Q_dct = shl( Q_dct, 1 );
+            E_spect_bin = sub( Q31, Q_dct );
 
             FOR( k = 0; k <= bw_max; k++ )
             {
@@ -342,31 +334,36 @@ void bw_detect_fx(
                     pt1 = &spect[i_mult2( i, bin_width )];
                     FOR( j = 0; j < bin_width; j++ )
                     {
-#ifdef BASOP_NOGLOB
                         sum32 = L_mac0_o( sum32, *pt1, *pt1, &Overflow );
-#else
-                        sum32 = L_mac0( sum32, *pt1, *pt1 );
-#endif
                         pt1++;
                     }
-
-                    IF( LE_32( sum32, 1 ) )
+                    tmp_1 = BASOP_Util_Cmp_Mant32Exp( sum32, E_spect_bin, MAX_32, Q31 - 41 ); /* Any sum32 in Q_dct if it is less than MAX_32 in Q41 will be less than 0.001 */
+                    test();
+                    IF( st->element_mode != EVS_MONO && tmp_1 < 0 )
                     {
-                        /*deal with zero spectrum*/
-                        spect_bin[i] = -1;
+                        spect_bin[i] = -6144; /* log10f( 0.00100000005 ) in Q11 */
                         move16();
                     }
                     ELSE
                     {
-                        /* spect_bin[i] = (float)log10(spect_bin[i]);
-                                                = log2(spect_bin[i])*log10(2);  */
-                        e_tmp = norm_l( sum32 );
-                        L_tmp = L_shl( sum32, e_tmp );
-                        f_tmp = Log2_norm_lc( L_tmp );
-                        e_tmp = sub( sub( 30, e_tmp ), Q_dct );
-                        L_tmp = Mpy_32_16( e_tmp, f_tmp, 9864 );       /* Q16 */
-                        spect_bin[i] = round_fx( L_shl( L_tmp, 11 ) ); /* Q11 */
-                        move16();
+                        IF( LE_32( sum32, 1 ) )
+                        {
+                            /*deal with zero spectrum*/
+                            spect_bin[i] = -1;
+                            move16();
+                        }
+                        ELSE
+                        {
+                            /* spect_bin[i] = (float)log10(spect_bin[i]);
+                                                    = log2(spect_bin[i])*log10(2);  */
+                            e_tmp = norm_l( sum32 );
+                            L_tmp = L_shl( sum32, e_tmp );
+                            f_tmp = Log2_norm_lc( L_tmp );
+                            e_tmp = sub( sub( 30, e_tmp ), Q_dct );
+                            L_tmp = Mpy_32_16( e_tmp, f_tmp, 9864 );       /* Q16 */
+                            spect_bin[i] = round_fx( L_shl( L_tmp, 11 ) ); /* Q11 */
+                            move16();
+                        }
                     }
                 }
             }
@@ -921,6 +918,7 @@ void bw_detect_fx(
 
     return;
 }
+
 /*-------------------------------------------------------------------*
  * set_bw_fx()
  *
@@ -1058,7 +1056,7 @@ void set_bw_fx(
         move16();
     }
 }
-//#ifdef IVAS_CODE_BWD
+
 
 /*-------------------------------------------------------------------*
  * set_bw_stereo()
@@ -1105,7 +1103,8 @@ void set_bw_stereo_fx(
 
     return;
 }
-//#endif
+
+
 /*-------------------------------------------------------------------*
  * set_bw_mct()
  *
diff --git a/lib_enc/cng_enc.c b/lib_enc/cng_enc.c
deleted file mode 100644
index ea957da8c51d3508ab6446de4df77ebbc2867ff9..0000000000000000000000000000000000000000
--- a/lib_enc/cng_enc.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-#include "prot_fx_enc.h"
-#include "prot_fx.h"
-#include "ivas_rom_com_fx.h"
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
-
-static Word16 shb_DTX_ivas_fx( Encoder_State *st, const Word16 *shb_speech_fx, const Word16 *syn_12k8_16k_fx );
-
-static void shb_CNG_encod_ivas_fx( Encoder_State *st, const Word16 update );
-
-
-void swb_CNG_enc_ivas_fx(
-    Encoder_State *st,            /* i/o: State structure                                 */
-    const Word16 *shb_speech_fx,  /* i  : SHB target signal (6-14kHz) at 16kHz            Q0 */
-    const Word16 *syn_12k8_16k_fx /* i  : ACELP core synthesis at 12.8kHz or 16kHz        Q0 */
-)
-{
-    Word16 shb_SID_updt;
-
-    test();
-    IF( EQ_32( st->core_brate, SID_2k40 ) || st->core_brate == FRAME_NO_DATA )
-    {
-        IF( st->cng_type == LP_CNG )
-        {
-            test();
-            IF( GE_32( st->input_Fs, L_FRAME32k * FRAMES_PER_SEC ) )
-            {
-                /* decide if SHB SID encoding or not */
-                shb_SID_updt = shb_DTX_ivas_fx( st, shb_speech_fx, syn_12k8_16k_fx );
-
-                /* SHB CNG encoding */
-                shb_CNG_encod_ivas_fx( st, shb_SID_updt );
-            }
-            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && EQ_32( st->core_brate, SID_2k40 ) )
-            {
-                /* LF-boost not used in DFT-stereo, instead the bandwidth is transmitted */
-                delete_indice( st->hBstr, IND_CNG_ENV1 );
-                push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 );
-                push_indice( st->hBstr, IND_UNUSED, 0, 4 );
-                push_indice( st->hBstr, IND_SID_BW, 1, 1 );
-            }
-        }
-        st->hTdCngEnc->last_vad = 0;
-        move16();
-    }
-    ELSE
-    {
-        st->hTdCngEnc->last_vad = 1;
-        move16();
-    }
-
-    return;
-}
-
-
-/*---------------------------------------------------------------------*
- * shb_CNG_encod()
- *
- * SID parameters encoding for SHB signal
- *---------------------------------------------------------------------*/
-
-static void shb_CNG_encod_ivas_fx(
-    Encoder_State *st,  /* i/o: State structure             */
-    const Word16 update /* i  : SID update flag             */
-)
-{
-    Word16 idx_ener = 0;
-    move16();
-    BSTR_ENC_HANDLE hBstr = st->hBstr;
-
-    Word16 ener_mid_dec_thr_fx;
-
-    IF( EQ_16( update, 1 ) )
-    {
-        IF( st->element_mode == EVS_MONO )
-        {
-            /* 6.0 in Q8 -> 1510 */
-            /* 0.9 in Q15 29491 */
-            /* ( 1 / log10(2.0) ) * 0.1 in Q15 ->10886 */
-            idx_ener = shr( mult( add( mult( st->hTdCngEnc->mov_shb_cng_ener_fx, 10886 ), 1510 ), 29491 ), 8 ); /* Q0 */
-        }
-        ELSE
-        {
-            /*idx_ener = (int16_t)(0.7f * (0.1f * st->hTdCngEnc->mov_shb_cng_ener / (float)log10(2.0f) + 6.0f) + 0.5f);*/
-            // PMT("shb_CNG_encod_fx quantization in missing")
-            /* 6.0 in Q8 -> 1510 */
-            /* 0.7 in Q15 22938 */
-            /* ( 1 / log10(2.0) ) * 0.1 in Q15 -> 10886 */
-            idx_ener = shr( mult( add( mult( st->hTdCngEnc->mov_shb_cng_ener_fx, 10886 ), 1510 ), 22938 ), 8 ); /* Q0 */
-        }
-
-
-        if ( LT_16( st->bwidth, SWB ) )
-        {
-            idx_ener = 0;
-            move16();
-        }
-
-        IF( GT_16( idx_ener, 15 ) )
-        {
-            idx_ener = 15;
-            move16();
-        }
-        ELSE IF( idx_ener < 0 )
-        {
-            idx_ener = 0;
-            move16();
-        }
-
-        /* prevent toggling of idx_ener by adding small dead-zone interval around decision thresholds */
-        IF( st->element_mode != EVS_MONO )
-        {
-            IF( EQ_16( abs_s( sub( idx_ener, st->hTdCngEnc->last_idx_ener ) ), 1 ) )
-            {
-
-                Word16 tmp, tmp1, tmp2, scale, exp1, exp2, ener_mid_dec_thr_e;
-                tmp = BASOP_Util_Divide1616_Scale( st->hTdCngEnc->last_idx_ener, 22938, &scale ); // 0.7 in Q15 ->exp 0
-                scale = add( scale, ( 15 - 0 ) );
-                tmp = sub( tmp, shl( 6, sub( Q15, scale ) ) );
-                tmp1 = BASOP_Util_Divide1616_Scale( tmp, 3277, &exp1 );
-                exp1 = add( exp1, ( scale - 0 ) );
-
-                ener_mid_dec_thr_fx = shr( mult( tmp1, 9864 ), 1 ); // exp = exp
-
-                tmp = BASOP_Util_Divide1616_Scale( idx_ener, 22938, &scale ); // 0.7 in Q15 ->exp 0
-                scale = add( scale, ( 15 - 0 ) );
-                tmp = sub( tmp, shl( 6, sub( Q15, scale ) ) );
-                tmp1 = BASOP_Util_Divide1616_Scale( tmp, 3277, &exp2 );
-                exp2 = add( exp2, ( scale - 0 ) );
-
-                tmp2 = shr( mult( tmp1, 9864 ), 1 ); // exp = exp
-
-                ener_mid_dec_thr_e = BASOP_Util_Add_MantExp( tmp2, exp2, ener_mid_dec_thr_fx, exp1, &ener_mid_dec_thr_fx );
-
-
-                scale = BASOP_Util_Add_MantExp( st->hTdCngEnc->mov_shb_cng_ener_fx, 7, negate( ener_mid_dec_thr_fx ), ener_mid_dec_thr_e, &tmp );
-                tmp1 = BASOP_Util_Divide1616_Scale( tmp, ener_mid_dec_thr_fx, &exp1 );
-                exp1 = add( exp1, sub( scale, ener_mid_dec_thr_e ) );
-                IF( LT_16( abs_s( tmp1 ), shr( 328, sub( 15, exp1 ) ) ) )
-                {
-                    idx_ener = st->hTdCngEnc->last_idx_ener;
-                    move16();
-                }
-            }
-        }
-
-        st->hTdCngEnc->last_idx_ener = idx_ener;
-        move16();
-
-        push_indice( hBstr, IND_SHB_CNG_GAIN, idx_ener, 4 );
-        push_indice( hBstr, IND_SID_BW, 1, 1 );
-        delete_indice( hBstr, IND_CNG_ENV1 );
-        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-        {
-            push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 );
-        }
-        ELSE
-        {
-            push_indice( hBstr, IND_UNUSED, 0, 2 );
-        }
-        st->hTdCngEnc->ho_sid_bw = L_shl( L_and( st->hTdCngEnc->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
-        st->hTdCngEnc->ho_sid_bw = L_or( st->hTdCngEnc->ho_sid_bw, 0x1L );
-        move32();
-        move32();
-    }
-    ELSE IF( EQ_32( st->core_brate, SID_2k40 ) )
-    {
-        st->hTdCngEnc->ho_sid_bw = L_shl( L_and( st->hTdCngEnc->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
-        move32();
-        push_indice( hBstr, IND_SID_BW, 0, 1 );
-    }
-
-    return;
-}
-
-/*---------------------------------------------------------------------*
- * shb_DTX()
- *
- * Decide if encoding SHB SID or not
- *---------------------------------------------------------------------*/
-
-static Word16 shb_DTX_ivas_fx(
-    Encoder_State *st,            /* i/o: State structure                                 */
-    const Word16 *shb_speech_fx,  /* i  : SHB target signal (6-14kHz) at 16kHz            Q0 */
-    const Word16 *syn_12k8_16k_fx /* i  : ACELP core synthesis at 12.8kHz or 16kHz        Q0 */
-)
-{
-    Word16 i;
-    Word16 update;
-
-    Word16 allow_cn_step = 0;
-    move16();
-    Word16 shb_old_speech_fx[( ACELP_LOOK_12k8 + L_SUBFR + L_FRAME ) * 5 / 4];
-    Word16 *shb_new_speech_fx;
-    Word32 wb_ener_fx;
-    Word32 shb_ener_fx;
-    Word16 log_wb_ener_fx;
-    Word16 log_shb_ener_fx;
-    Word16 tmp;
-    Word16 exp;
-    Word16 fra;
-    Word16 att_fx; /*Q8*/
-
-    TD_CNG_ENC_HANDLE hTdCngEnc = st->hTdCngEnc;
-    TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
-
-
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move16();
-#endif
-
-    shb_new_speech_fx = shb_old_speech_fx + ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4;
-    Copy( hBWE_TD->old_speech_shb_fx, shb_old_speech_fx, ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4 );              // old_speech_shb_fx -> Q0
-    Copy( shb_speech_fx, shb_new_speech_fx, L_FRAME16k );                                                      // Q0
-    Copy( shb_old_speech_fx + L_FRAME16k, hBWE_TD->old_speech_shb_fx, ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4 ); // Q0
-
-    shb_ener_fx = L_deposit_l( 0 );
-    FOR( i = 0; i < L_FRAME16k; i++ )
-    {
-#ifdef BASOP_NOGLOB
-        shb_ener_fx = L_mac_sat( shb_ener_fx, shb_old_speech_fx[i], shb_old_speech_fx[i] ); // ( Q0 + Q0 + Q1 ) --> Q1 due to left shift in L_mac
-#else
-        shb_ener_fx = L_mac( shb_ener_fx, shb_old_speech_fx[i], shb_old_speech_fx[i] );
-#endif
-    }
-
-    shb_ener_fx = L_add( Mpy_32_16_1( shb_ener_fx, 102 ), 1 ); /* ( 1 / L_FRAME16K ) -> 102 in Q15, shb_ener_fx in Q1 */
-
-    wb_ener_fx = L_deposit_l( 0 );
-    FOR( i = 0; i < st->L_frame; i++ )
-    {
-#ifdef BASOP_NOGLOB
-        wb_ener_fx = L_mac_o( wb_ener_fx, syn_12k8_16k_fx[i], syn_12k8_16k_fx[i], &Overflow ); // ( Q0 + Q0 + Q1 ) --> Q1 due to left shift in L_mac
-#else
-        wb_ener_fx = L_mac( wb_ener_fx, syn_12k8_16k[i], syn_12k8_16k[i] );
-#endif
-    }
-
-    wb_ener_fx = L_add( Mpy_32_16_1( wb_ener_fx, 128 ), 1 ); /* 128 in Q15, wb_ener_fx in Q1 */
-
-    exp = norm_l( wb_ener_fx );
-    fra = Log2_norm_lc( L_shl( wb_ener_fx, exp ) );
-    exp = sub( 30 - 1, exp );
-    wb_ener_fx = Mpy_32_16( exp, fra, LG10 );
-
-#ifdef BASOP_NOGLOB
-    log_wb_ener_fx = round_fx_o( L_shl_o( wb_ener_fx, 10, &Overflow ), &Overflow ); /* log_wb_ener_fx in Q8 */
-#else
-    log_wb_ener_fx = round_fx( L_shl( wb_ener_fx, 10 ) );                  /* log_wb_ener_fx in Q8 */
-#endif
-    exp = norm_l( shb_ener_fx );
-    fra = Log2_norm_lc( L_shl( shb_ener_fx, exp ) );
-    exp = sub( 30 - 1, exp );
-    shb_ener_fx = Mpy_32_16( exp, fra, LG10 );
-
-
-    test();
-    IF( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-    {
-        Word32 att_fx32 = 0;
-        move32();
-        Word16 index;
-
-        apply_scale_ivas_fx( &att_fx32, st->hFdCngEnc->hFdCngCom->CngBandwidth, st->hFdCngEnc->hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO, &index ); // Q23;
-
-        att_fx = extract_l( L_shr( att_fx32, 15 ) ); // Q8
-    }
-    ELSE
-    {
-        att_fx = -1664; // Q8
-        move16();
-    }
-
-
-#ifdef BASOP_NOGLOB
-    log_shb_ener_fx = sub_o( round_fx_o( L_shl_o( shb_ener_fx, 10, &Overflow ), &Overflow ), att_fx, &Overflow ); /* log_shb_ener_fx in Q8 */
-#else
-    log_shb_ener_fx = sub( round_fx( L_shl( shb_ener_fx, 10 ) ), att_fx ); /* log_shb_ener_fx in Q8 */
-#endif
-
-    IF( st->hDtxEnc->first_CNG == 0 )
-    {
-
-
-        hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;    // Q8
-        hTdCngEnc->mov_shb_cng_ener_fx = log_shb_ener_fx;  // Q8
-        hTdCngEnc->last_wb_cng_ener_fx = log_wb_ener_fx;   // Q8
-        hTdCngEnc->last_shb_cng_ener_fx = log_shb_ener_fx; // Q8
-        move16();
-        move16();
-        move16();
-        move16();
-    }
-    IF( GT_16( abs_s( sub( log_wb_ener_fx, hTdCngEnc->mov_wb_cng_ener_fx ) ), 3072 /*12 in Q8*/ ) )
-    {
-        allow_cn_step = 1;
-        move16();
-    }
-
-    /* Also allow step if shb energy has dropped 12 dB */
-    test();
-    test();
-    IF( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && GT_16( sub( hTdCngEnc->mov_shb_cng_ener_fx, log_shb_ener_fx ), 3072 /*12 in Q8*/ ) )
-    {
-        allow_cn_step = 1;
-        move16();
-    }
-
-    IF( EQ_16( allow_cn_step, 1 ) )
-    {
-        hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;
-        hTdCngEnc->mov_shb_cng_ener_fx = log_shb_ener_fx;
-        move16();
-        move16();
-    }
-    ELSE
-    {
-        tmp = sub( log_wb_ener_fx, hTdCngEnc->mov_wb_cng_ener_fx );                /* Q8 */
-        tmp = mult( tmp, 29491 /* .9f in Q15*/ );                                  /* Q8 */
-        hTdCngEnc->mov_wb_cng_ener_fx = add( hTdCngEnc->mov_wb_cng_ener_fx, tmp ); /* Q8 */
-        move16();
-
-        tmp = sub( log_shb_ener_fx, hTdCngEnc->mov_shb_cng_ener_fx );
-        tmp = mult( tmp, 8192 /* .25f in Q15*/ );                                    /* Q8 */
-        hTdCngEnc->mov_shb_cng_ener_fx = add( hTdCngEnc->mov_shb_cng_ener_fx, tmp ); /* Q8 */
-        move16();
-    }
-
-    hTdCngEnc->shb_NO_DATA_cnt = add( hTdCngEnc->shb_NO_DATA_cnt, 1 );
-    update = 0;
-
-    move16();
-    move16();
-
-    IF( EQ_32( st->core_brate, SID_2k40 ) )
-    {
-        test();
-        test();
-        test();
-        IF( st->hDtxEnc->first_CNG == 0 )
-        {
-            update = 1;
-            move16();
-        }
-        ELSE IF( hTdCngEnc->shb_cng_ini_cnt > 0 )
-        {
-            hTdCngEnc->shb_cng_ini_cnt = sub( hTdCngEnc->shb_cng_ini_cnt, 1 );
-            update = 1;
-            move16();
-            move16();
-        }
-        ELSE IF( EQ_16( hTdCngEnc->last_vad, 1 ) )
-        {
-            update = 1;
-            move16();
-        }
-        ELSE IF( GE_16( hTdCngEnc->shb_NO_DATA_cnt, 100 ) )
-        {
-            update = 1;
-            move16();
-        }
-        ELSE IF( GT_16( abs_s( sub( sub( hTdCngEnc->mov_wb_cng_ener_fx, hTdCngEnc->mov_shb_cng_ener_fx ), sub( hTdCngEnc->last_wb_cng_ener_fx, hTdCngEnc->last_shb_cng_ener_fx ) ) ), 768 ) )
-        {
-            update = 1;
-            move16();
-        }
-        ELSE IF( ( GE_16( st->bwidth, SWB ) && LT_16( hTdCngEnc->last_SID_bwidth, SWB ) ) || ( LT_16( st->bwidth, SWB ) && GE_16( hTdCngEnc->last_SID_bwidth, SWB ) ) )
-        {
-            update = 1;
-            move16();
-        }
-
-        hTdCngEnc->last_SID_bwidth = st->bwidth;
-        move16();
-    }
-
-    /* LF-boost not yet implemented in decoder which means that the specific wb_sid information is not used */
-    test();
-    test();
-    if ( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && EQ_32( st->core_brate, SID_2k40 ) )
-    {
-        update = 1;
-        move16();
-    }
-
-    IF( EQ_16( update, 1 ) )
-    {
-        hTdCngEnc->last_wb_cng_ener_fx = hTdCngEnc->mov_wb_cng_ener_fx;
-        hTdCngEnc->last_shb_cng_ener_fx = hTdCngEnc->mov_shb_cng_ener_fx;
-        hTdCngEnc->shb_NO_DATA_cnt = 0;
-        move16();
-        move16();
-        move16();
-    }
-
-    return ( update );
-}
diff --git a/lib_enc/cng_enc_fx.c b/lib_enc/cng_enc_fx.c
index e2c81a8d11eb1f4bc9eb3d13c786d5a02d515829..9dea812a6d01a5f464a9fb622dda064334c62c27 100644
--- a/lib_enc/cng_enc_fx.c
+++ b/lib_enc/cng_enc_fx.c
@@ -2,12 +2,10 @@
     EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
   ====================================================================================*/
 #include <stdint.h>
-#include "options.h" /* Compilation switches                   */
-#include "cnst.h"    /* Common constants                       */
-#include "rom_enc.h" /* Encoder static table prototypes        */
-#include "rom_com.h" /* Static table prototypes                */
-//#include "prot_fx.h"       /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
+#include "options.h"     /* Compilation switches                   */
+#include "cnst.h"        /* Common constants                       */
+#include "rom_enc.h"     /* Encoder static table prototypes        */
+#include "rom_com.h"     /* Static table prototypes                */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 //#include "basop_mpy.h"
@@ -27,6 +25,8 @@
  *---------------------------------------------------------------------*/
 static void shb_CNG_encod_fx( Encoder_State *st_fx, const Word16 update_fx );
 static Word16 shb_DTX_fx( Encoder_State *st_fx, const Word16 *shb_speech_fx, const Word16 *syn_12k8_16k );
+static Word16 shb_DTX_ivas_fx( Encoder_State *st, const Word16 *shb_speech_fx, const Word16 *syn_12k8_16k_fx );
+static void shb_CNG_encod_ivas_fx( Encoder_State *st, const Word16 update );
 /*---------------------------------------------------------------------*
  * CNG_enc()
  *
@@ -336,11 +336,7 @@ void CNG_enc_fx(
         }
         ELSE
         {
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-            lsf_enc_fx( st_fx, lsf_new, lsp_new, NULL, NULL, 100, 0, 0, NULL, Q_new );
-#else
             lsf_enc_fx( st_fx, lsf_new, lsp_new, NULL, NULL, 100, 0, 0, Q_new );
-#endif
         }
         /* Reset CNG history if CNG frame length is changed */
         test();
@@ -466,7 +462,6 @@ void CNG_enc_fx(
         IF( hTdCngEnc->burst_ho_cnt > 0 )
         {
             /**allow_cn_step |= ( hTdCngEnc->ho_ener_hist_fx[hTdCngEnc->ho_hist_ptr] > 4 * hTdCngEnc->lp_ener_fx ); */
-#if 1
             /*allow_cn_step |= (hDtxEnc->first_CNG || st->element_mode == EVS_MONO) && (hTdCngEnc->ho_ener_hist[hTdCngEnc->ho_hist_ptr] > lp_ener_thr_scale * hTdCngEnc->lp_ener);*/
             /* (hTdCngEnc->ho_ener_hist[hTdCngEnc->ho_hist_ptr] > lp_ener_thr_scale * hTdCngEnc->lp_ener); */
             L_tmp1 = L_shr( hTdCngEnc->ho_ener_hist_fx[hTdCngEnc->ho_hist_ptr], 2 );
@@ -475,10 +470,6 @@ void CNG_enc_fx(
                 L_tmp1 = L_add( L_tmp1, L_shr( hTdCngEnc->lp_ener_fx, 8 ) );
             }
             L_tmp1 = L_sub( L_tmp1, hTdCngEnc->lp_ener_fx );
-#else
-            L_tmp1 = L_shr( hTdCngEnc->ho_ener_hist_fx[hTdCngEnc->ho_hist_ptr], 2 );
-            L_tmp1 = L_sub( L_tmp1, hTdCngEnc->lp_ener_fx );
-#endif
             test();
             test();
             IF( ( hDtxEnc->first_CNG > 0 || st_fx->element_mode == EVS_MONO ) && L_tmp1 > 0 )
@@ -644,11 +635,7 @@ void CNG_enc_fx(
             FOR( i = 0; i < M; i++ )
             {
                 dev = abs_s( sub( lsp_tmp[i], lsp_new[i] ) ); /*Q15 */
-#ifdef BASOP_NOGLOB
-                dist = add_o( dist, dev, &Overflow ); /*Q15 */
-#else
-                dist = add( dist, dev ); /*Q15 */
-#endif
+                dist = add_o( dist, dev, &Overflow );         /*Q15 */
                 if ( GT_16( dev, max_dev ) )
                 {
                     max_dev = dev;
@@ -682,31 +669,19 @@ void CNG_enc_fx(
                     FOR( j = 0; j < m1; j++ )
                     {
                         /* env[i] += tmp_env[j*NUM_ENV_CNG+i]; */
-#ifdef BASOP_NOGLOB
                         L_tmp = L_add_sat( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#else
-                        L_tmp = L_add( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#endif
                     }
                     /*    env[i] /= (float)m1;  */
                     /*    env[i] = env[i] - 2*hTdCngEnc->lp_ener_fx; */
                     IF( EQ_16( m1, 1 ) )
                     {
-#ifdef BASOP_NOGLOB
                         L_tmp = L_sub_sat( L_tmp, L_add_sat( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#else
-                        L_tmp = L_sub( L_tmp, L_add( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#endif
                     }
                     ELSE
                     {
                         tmp1 = div_s( 1, m1 );
                         L_tmp = Mult_32_16( L_tmp, tmp1 );
-#ifdef BASOP_NOGLOB
                         L_tmp = L_sub_sat( L_tmp, L_add_sat( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#else
-                        L_tmp = L_sub( L_tmp, L_add( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#endif
                     }
 
                     env[i] = L_tmp;
@@ -745,11 +720,6 @@ void CNG_enc_fx(
     test();
     IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
     {
-        // PMT("Code to be completed")
-#ifdef IVAS_CODE
-        att = powf( 10.0f, hTdCngEnc->CNG_att / 20.0f );
-        v_multc( res1, att, res1, st->L_frame );
-#endif
     }
     ELSE IF( NE_16( st_fx->bwidth, NB ) )
     {
@@ -786,8 +756,7 @@ void CNG_enc_fx(
 
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
-        Word16 Q_new_inp, mem_decim_size; // TO be removed
-        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, hTdCngEnc->exc_mem2_fx, 0, &Q_new_inp, &mem_decim_size );
+        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, hTdCngEnc->exc_mem2_fx, 0 );
     }
 
     fft_rel_fx( fft_io, L_FFT, LOG2_L_FFT );
@@ -796,15 +765,9 @@ void CNG_enc_fx(
     FOR( i = 0; i < NUM_ENV_CNG; i++ )
     {
         /* env[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef BASOP_NOGLOB
         L_tmp = L_mult_o( *ptR, *ptR, &Overflow );                              /* 2*Q_new+1 */
         L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_new+1 */
         L_tmp = L_add_o( L_tmp, L_tmp, &Overflow );                             /* 2*Q_new+1 */
-#else                                                                           /* BASOP_NOGLOB */
-        L_tmp = L_mult( *ptR, *ptR );                 /* 2*Q_new+1 */
-        L_tmp = L_add( L_tmp, L_mult( *ptI, *ptI ) ); /* 2*Q_new+1 */
-        L_tmp = L_add( L_tmp, L_tmp );                /* 2*Q_new+1 */
-#endif                                                                          /* BASOP_NOGLOB */
         L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_new+1 */
         tmp1 = add( add( Q_new, Q_new ), 1 );
         env[i] = L_shr( L_tmp, sub( tmp1, 6 ) );
@@ -834,15 +797,9 @@ void CNG_enc_fx(
             L_tmp = L_mult0( tmpv, tmpv );
             pt_res++;
             tmpv = shl( *pt_res, scale );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_sat( L_tmp, tmpv, tmpv ); /* 2*(Q_new+scale) */
             pt_res++;
             L_ener = L_add_sat( L_ener, L_shr( L_tmp, 7 ) ); /* 2*(Q_new+scale)+1, divide by L_frame done here */
-#else
-            L_tmp = L_mac0( L_tmp, tmpv, tmpv );      /* 2*(Q_new+scale) */
-            pt_res++;
-            L_ener = L_add( L_ener, L_shr( L_tmp, 7 ) ); /* 2*(Q_new+scale)+1, divide by L_frame done here */
-#endif
         }
     }
     ELSE /* L_FRAME16k */
@@ -853,15 +810,9 @@ void CNG_enc_fx(
             L_tmp = L_mult0( tmpv, tmpv );
             pt_res++;
             tmpv = shl( *pt_res, scale );
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_sat( L_tmp, tmpv, tmpv ); /* 2*(Q_new+scale) */
             pt_res++;
             L_ener = L_add_sat( L_ener, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */
-#else
-            L_tmp = L_mac0( L_tmp, tmpv, tmpv );         /* 2*(Q_new+scale) */
-            pt_res++;
-            L_ener = L_add( L_ener, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */
-#endif
         }
     }
     /* convert log2 of residual signal energy */
@@ -891,11 +842,7 @@ void CNG_enc_fx(
                 L_tmp1 = L_add( env[i], 0 );
                 FOR( j = 0; j < hDtxEnc->cng_hist_size; j++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp1 = L_add_sat( L_tmp1, hTdCngEnc->cng_res_env_fx[j * NUM_ENV_CNG + i] );
-#else
-                    L_tmp1 = L_add( L_tmp1, hTdCngEnc->cng_res_env_fx[j * NUM_ENV_CNG + i] );
-#endif
                 }
                 L_tmp = L_add( hTdCngEnc->cng_res_env_fx[max_idx1[0] * NUM_ENV_CNG + i], hTdCngEnc->cng_res_env_fx[max_idx1[1] * NUM_ENV_CNG + i] );
                 L_tmp1 = L_sub( L_tmp1, L_tmp );
@@ -949,9 +896,6 @@ void CNG_enc_fx(
         test();
         IF( EQ_16( st_fx->element_mode, IVAS_SCE ) || EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) )
         {
-            // PMT("CNG IVAS_SCE and IVAS_CPE_DFT code missing")
-            // IVAS_CODE
-            // enr += hTdCngEnc->CNG_att * FAC_LOG2 / 10.0f;
         }
         ELSE IF( NE_16( st_fx->bwidth, NB ) )
         {
@@ -1026,7 +970,7 @@ void CNG_enc_fx(
         hTdCngEnc->old_enr_index = enr_index;
         move16();
 
-        push_indice_fx( hBstr, IND_ENERGY, enr_index, num_bits );
+        push_indice( hBstr, IND_ENERGY, enr_index, num_bits );
         if ( enr_index == 0 )
         {
             enr_index = -5;
@@ -1047,11 +991,7 @@ void CNG_enc_fx(
             L_tmp = L_shl( hTdCngEnc->Enew_fx, exp );              /*Q(exp+6) */
             L_tmp = Mult_32_16( L_tmp, shl( st_fx->L_frame, 5 ) ); /* Q(exp+6+5-15=exp-4) */
 
-#ifdef BASOP_NOGLOB
             L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) ); /* Q6 */
-#else
-            L_tmp = L_shr( L_tmp, sub( exp, 10 ) ); /* Q6 */
-#endif
 
             exp = norm_l( L_tmp );
             fra = Log2_norm_lc( L_shl( L_tmp, exp ) );
@@ -1104,13 +1044,9 @@ void CNG_enc_fx(
                     /* d += (env[j] - CNG_details_codebook_fx[i][j]) * (env[j] - CNG_details_codebook_fx[i][j]);*/
                     L_tmp = L_sub( env[j], L_deposit_l( CNG_details_codebook_fx[i][j] ) ); /* Q6 */
                     exp = norm_l( L_tmp );
-                    L_tmp = L_shl( L_tmp, exp ); /*Q(exp+6)*/
-                    tmp1 = extract_h( L_tmp );   /*Q(exp+6-16)=exp-10*/
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_mult_o( tmp1, tmp1, &Overflow ); /*Q(2*exp - 19)*/
-#else                                                          /* BASOP_NOGLOB */
-                    L_tmp = L_mult( tmp1, tmp1 );   /*Q(2*exp - 19)*/
-#endif
+                    L_tmp = L_shl( L_tmp, exp );                        /*Q(exp+6)*/
+                    tmp1 = extract_h( L_tmp );                          /*Q(exp+6-16)=exp-10*/
+                    L_tmp = L_mult_o( tmp1, tmp1, &Overflow );          /*Q(2*exp - 19)*/
                     L_tmp = L_shr( L_tmp, sub( add( exp, exp ), 36 ) ); /* Q17 */
                     d = L_add( d, L_tmp );
                 }
@@ -1122,7 +1058,7 @@ void CNG_enc_fx(
                     move16();
                 }
             }
-            push_indice_fx( hBstr, IND_CNG_ENV1, min1_idx, 6 );
+            push_indice( hBstr, IND_CNG_ENV1, min1_idx, 6 );
             /* get quantized res_env_details */
             FOR( i = 0; i < NUM_ENV_CNG; i++ )
             {
@@ -1181,28 +1117,28 @@ void CNG_enc_fx(
     /* dithering bit for AMR-WB IO mode is always set to 0 */
     IF( EQ_32( st_fx->core_brate, SID_1k75 ) )
     {
-        push_indice_fx( hBstr, IND_DITHERING, 0, 1 );
+        push_indice( hBstr, IND_DITHERING, 0, 1 );
     }
     IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
     {
         IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
         {
-            push_indice_fx( hBstr, IND_ACELP_16KHZ, 1, 1 );
+            push_indice( hBstr, IND_ACELP_16KHZ, 1, 1 );
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_ACELP_16KHZ, 0, 1 );
+            push_indice( hBstr, IND_ACELP_16KHZ, 0, 1 );
         }
 
-        push_indice_fx( hBstr, IND_CNG_HO, s_min( hTdCngEnc->burst_ho_cnt, 7 ), 3 );
+        push_indice( hBstr, IND_CNG_HO, s_min( hTdCngEnc->burst_ho_cnt, 7 ), 3 );
         hTdCngEnc->num_ho = m;
         move16();
-        push_indice_fx( hBstr, IND_SID_TYPE, 0, 1 );
+        push_indice( hBstr, IND_SID_TYPE, 0, 1 );
 
         test();
         IF( LT_32( st_fx->input_Fs, 32000 ) && NE_16( st_fx->element_mode, IVAS_CPE_DFT ) )
         {
-            push_indice_fx( hBstr, IND_SID_BW, 0, 1 );
+            push_indice( hBstr, IND_SID_BW, 0, 1 );
             *sid_bw = 0;
             move16();
         }
@@ -1364,19 +1300,19 @@ void CNG_enc_ivas_fx(
             move16();
             BREAK;
         case L_FRAME32k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME32k_Q31;
             move16();
             BREAK;
         case L_FRAME16k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME16k_Q31;
             move16();
             BREAK;
         case L_FRAME8k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME8k_Q31;
             move16();
             BREAK;
         case L_FRAME4k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME4k_Q31;
             move16();
             BREAK;
         default:
@@ -1901,31 +1837,19 @@ void CNG_enc_ivas_fx(
                     FOR( j = 0; j < m1; j++ )
                     {
                         /* env[i] += tmp_env[j*NUM_ENV_CNG+i]; */
-#ifdef BASOP_NOGLOB
                         L_tmp = L_add_sat( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#else
-                        L_tmp = L_add( L_tmp, tmp_env[j * NUM_ENV_CNG + i] );
-#endif
                     }
                     /*    env[i] /= (float)m1;  */
                     /*    env[i] = env[i] - 2*hTdCngEnc->lp_ener_fx; */
                     IF( EQ_16( m1, 1 ) )
                     {
-#ifdef BASOP_NOGLOB
                         L_tmp = L_sub_sat( L_tmp, L_add_sat( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#else
-                        L_tmp = L_sub( L_tmp, L_add( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#endif
                     }
                     ELSE
                     {
                         tmp1 = div_s( 1, m1 );
                         L_tmp = Mult_32_16( L_tmp, tmp1 );
-#ifdef BASOP_NOGLOB
                         L_tmp = L_sub_sat( L_tmp, L_add_sat( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#else
-                        L_tmp = L_sub( L_tmp, L_add( hTdCngEnc->lp_ener_fx, hTdCngEnc->lp_ener_fx ) );
-#endif
                     }
 
                     env[i] = L_tmp; /* Q6*/
@@ -1947,7 +1871,7 @@ void CNG_enc_ivas_fx(
     {
         E_LPC_f_lsp_a_conversion( hDtxEnc->lspCNG_fx, Aq, M );
         exp = sub( Q14, norm_s( Aq[0] ) );
-        Scale_sig( Aq, M, sub( Q12, exp ) ); // Q12
+        Scale_sig( Aq, M + 1, sub( Q12, exp ) ); // Q12
     }
 
     tmp_loop = shr( st_fx->L_frame, 6 );
@@ -2006,8 +1930,7 @@ void CNG_enc_ivas_fx(
 
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
-        Word16 Q_new_inp, mem_decim_size; // TO be removed
-        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, hTdCngEnc->exc_mem2_fx, 0, &Q_new_inp, &mem_decim_size );
+        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, hTdCngEnc->exc_mem2_fx, 0 );
     }
 
     fft_rel_fx( fft_io, L_FFT, LOG2_L_FFT );
@@ -2016,15 +1939,9 @@ void CNG_enc_ivas_fx(
     FOR( i = 0; i < NUM_ENV_CNG; i++ )
     {
         /* env[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef BASOP_NOGLOB
         L_tmp = L_mult_o( *ptR, *ptR, &Overflow );                              /* 2*Q_new+1 */
         L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_new+1 */
         L_tmp = L_add_o( L_tmp, L_tmp, &Overflow );                             /* 2*Q_new+1 */
-#else                                                                           /* BASOP_NOGLOB */
-        L_tmp = L_mult( *ptR, *ptR );                 /* 2*Q_new+1 */
-        L_tmp = L_add( L_tmp, L_mult( *ptI, *ptI ) ); /* 2*Q_new+1 */
-        L_tmp = L_add( L_tmp, L_tmp );                /* 2*Q_new+1 */
-#endif                                                                          /* BASOP_NOGLOB */
         L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_new+1 */
         tmp1 = add( add( Q_new, Q_new ), 1 );
         env[i] = L_shr( L_tmp, sub( tmp1, 6 ) );
@@ -2064,19 +1981,19 @@ void CNG_enc_ivas_fx(
             move16();
             BREAK;
         case L_FRAME32k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME32k_Q31;
             move16();
             BREAK;
         case L_FRAME16k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME16k_Q31;
             move16();
             BREAK;
         case L_FRAME8k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME8k_Q31;
             move16();
             BREAK;
         case L_FRAME4k:
-            inv_frame_len = ONE_BY_L_FRAME48k_Q31;
+            inv_frame_len = ONE_BY_L_FRAME4k_Q31;
             move16();
             BREAK;
         default:
@@ -2088,13 +2005,21 @@ void CNG_enc_ivas_fx(
 
     /* convert log2 of residual signal energy */
     /*enr = (float)log10( enr + 0.1f ) / (float)log10( 2.0f ); */
-    hi = norm_l( L_ener );
-    lo = Log2_norm_lc( L_shl( L_ener, hi ) );
-    hi = sub( 29, hi );                  /* log2 exp in Q2*Q_new */
-    hi = sub( hi, shl( Q_new, 1 ) );     /* Q0 */
-    L_tmp = L_Comp( hi, lo );            /* Q16 */
-    enr = round_fx( L_shl( L_tmp, 8 ) ); /* Q8 (16+8-16) */
 
+    IF( L_ener == 0 )
+    {
+        enr = -850; /*log(0.1) base 2 in Q8*/
+        move16();
+    }
+    ELSE
+    {
+        hi = norm_l( L_ener );
+        lo = Log2_norm_lc( L_shl( L_ener, hi ) );
+        hi = sub( 29, hi );                  /* log2 exp in Q2*Q_new */
+        hi = sub( hi, shl( Q_new, 1 ) );     /* Q0 */
+        L_tmp = L_Comp( hi, lo );            /* Q16 */
+        enr = round_fx( L_shl( L_tmp, 8 ) ); /* Q8 (16+8-16) */
+    }
     /* update the circular buffer of old energies */
     hTdCngEnc->cng_ener_hist_fx[hTdCngEnc->cng_hist_ptr] = enr;
     move16(); /* Q8 */
@@ -2113,11 +2038,7 @@ void CNG_enc_ivas_fx(
                 L_tmp1 = L_add( env[i], 0 );
                 FOR( j = 0; j < hDtxEnc->cng_hist_size; j++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp1 = L_add_sat( L_tmp1, hTdCngEnc->cng_res_env_fx[j * NUM_ENV_CNG + i] );
-#else
-                    L_tmp1 = L_add( L_tmp1, hTdCngEnc->cng_res_env_fx[j * NUM_ENV_CNG + i] );
-#endif
                 }
                 L_tmp = L_add( hTdCngEnc->cng_res_env_fx[max_idx1[0] * NUM_ENV_CNG + i], hTdCngEnc->cng_res_env_fx[max_idx1[1] * NUM_ENV_CNG + i] );
                 L_tmp1 = L_sub( L_tmp1, L_tmp );
@@ -2267,11 +2188,7 @@ void CNG_enc_ivas_fx(
             L_tmp = L_shl( hTdCngEnc->Enew_fx, exp );              /*Q(exp+6) */
             L_tmp = Mult_32_16( L_tmp, shl( st_fx->L_frame, 5 ) ); /* Q(exp+6+5-15=exp-4) */
 
-#ifdef BASOP_NOGLOB
             L_tmp = L_shr_sat( L_tmp, sub( exp, 10 ) ); /* Q6 */
-#else
-            L_tmp = L_shr( L_tmp, sub( exp, 10 ) ); /* Q6 */
-#endif
 
             exp = norm_l( L_tmp );
             fra = Log2_norm_lc( L_shl( L_tmp, exp ) );
@@ -2325,13 +2242,9 @@ void CNG_enc_ivas_fx(
                     /* d += (env[j] - CNG_details_codebook_fx[i][j]) * (env[j] - CNG_details_codebook_fx[i][j]);*/
                     L_tmp = L_sub( env[j], L_deposit_l( CNG_details_codebook_fx[i][j] ) ); /* Q6 */
                     exp = norm_l( L_tmp );
-                    L_tmp = L_shl( L_tmp, exp ); /*Q(exp+6)*/
-                    tmp1 = extract_h( L_tmp );   /*Q(exp+6-16)=exp-10*/
-#ifdef BASOP_NOGLOB
-                    L_tmp = L_mult_o( tmp1, tmp1, &Overflow ); /*Q(2*exp - 19)*/
-#else                                                          /* BASOP_NOGLOB */
-                    L_tmp = L_mult( tmp1, tmp1 );   /*Q(2*exp - 19)*/
-#endif
+                    L_tmp = L_shl( L_tmp, exp );                        /*Q(exp+6)*/
+                    tmp1 = extract_h( L_tmp );                          /*Q(exp+6-16)=exp-10*/
+                    L_tmp = L_mult_o( tmp1, tmp1, &Overflow );          /*Q(2*exp - 19)*/
                     L_tmp = L_shr( L_tmp, sub( add( exp, exp ), 36 ) ); /* Q17 */
                     d = L_add( d, L_tmp );                              /* Q17 */
                 }
@@ -2483,14 +2396,6 @@ void swb_CNG_enc_fx(
             }
             ELSE IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) && EQ_32( st_fx->core_brate, SID_2k40 ) )
             {
-                // PMT("CNG IVAS_CPE_DFT code not implemented")
-#ifdef IVAS_CODE
-                /* LF-boost not used in DFT-stereo, instead the bandwidth is transmitted */
-                delete_indice( st->hBstr, IND_CNG_ENV1 );
-                push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 );
-                push_indice( st->hBstr, IND_UNUSED, 0, 4 );
-                push_indice( st->hBstr, IND_SID_BW, 1, 1 );
-#endif
             }
         }
         hTdCngEnc->last_vad = 0;
@@ -2518,9 +2423,6 @@ static void shb_CNG_encod_fx(
     Word16 idx_ener_fx;
     TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
-#ifdef IVAS_CODE
-    Word16 ener_mid_dec_thr;
-#endif
 
     idx_ener_fx = 0;
     move16();
@@ -2533,8 +2435,6 @@ static void shb_CNG_encod_fx(
         }
         ELSE
         {
-            /*idx_ener = (int16_t)(0.7f * (0.1f * st->hTdCngEnc->mov_shb_cng_ener / (float)log10(2.0f) + 6.0f) + 0.5f);*/
-            // PMT("shb_CNG_encod_fx quantization in missing")
         }
 
         if ( LT_16( st_fx->bwidth, SWB ) )
@@ -2552,43 +2452,24 @@ static void shb_CNG_encod_fx(
         {
             idx_ener_fx = s_max( idx_ener_fx, 0 );
         }
-#ifdef IVAS_CODE
-        /* prevent toggling of idx_ener by adding small dead-zone interval around decision thresholds */
-        if ( st->element_mode != EVS_MONO )
-        {
-            if ( abs( idx_ener - st->hTdCngEnc->last_idx_ener ) == 1 )
-            {
-                ener_mid_dec_thr = 0.5f * ( ( st->hTdCngEnc->last_idx_ener / 0.7f - 6.0f ) / 0.1f ) * (float) log10( 2.0f );
-                ener_mid_dec_thr += 0.5f * ( ( idx_ener / 0.7f - 6.0f ) / 0.1f ) * (float) log10( 2.0f );
 
-                if ( fabs( st->hTdCngEnc->mov_shb_cng_ener - ener_mid_dec_thr ) / ener_mid_dec_thr < ENER_MID_DEAD_ZONE )
-                {
-                    idx_ener = st->hTdCngEnc->last_idx_ener;
-                }
-            }
-        }
-
-        st->hTdCngEnc->last_idx_ener = idx_ener;
-#endif
-        push_indice_fx( hBstr, IND_SHB_CNG_GAIN, idx_ener_fx, 4 );
-        push_indice_fx( hBstr, IND_SID_BW, 1, 1 );
-#ifndef IVAS_CODE
+        push_indice( hBstr, IND_SHB_CNG_GAIN, idx_ener_fx, 4 );
+        push_indice( hBstr, IND_SID_BW, 1, 1 );
+#ifdef HARM_PUSH_BIT
+        delete_indice( hBstr, IND_CNG_ENV1 );
+#else
         hBstr->nb_bits_tot = sub( hBstr->nb_bits_tot, hBstr->ind_list[IND_CNG_ENV1].nb_bits );
         hBstr->ind_list[IND_CNG_ENV1].nb_bits = -1;
+#endif
         move16();
         move16();
-#else
-        delete_indice( hBstr, IND_CNG_ENV1 );
-#endif
-#ifdef IVAS_CODE
-        if ( st->element_mode == IVAS_CPE_DFT )
+
+        if ( st_fx->element_mode == IVAS_CPE_DFT )
         {
-            push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 );
         }
         else
-#endif
         {
-            push_indice_fx( hBstr, IND_UNUSED, 0, 2 );
+            push_indice( hBstr, IND_UNUSED, 0, 2 );
         }
         hTdCngEnc->ho_sid_bw = L_shl( L_and( hTdCngEnc->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
         hTdCngEnc->ho_sid_bw = L_or( hTdCngEnc->ho_sid_bw, 0x1L );
@@ -2600,7 +2481,7 @@ static void shb_CNG_encod_fx(
         IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
         {
             hTdCngEnc->ho_sid_bw = L_shl( L_and( hTdCngEnc->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
-            push_indice_fx( hBstr, IND_SID_BW, 0, 1 );
+            push_indice( hBstr, IND_SID_BW, 0, 1 );
         }
     }
 
@@ -2647,11 +2528,7 @@ static Word16 shb_DTX_fx(
     shb_ener_fx = L_deposit_l( 0 );
     FOR( i = 0; i < L_FRAME16k; i++ )
     {
-#ifdef BASOP_NOGLOB
         shb_ener_fx = L_mac_sat( shb_ener_fx, shb_old_speech_fx[i], shb_old_speech_fx[i] );
-#else
-        shb_ener_fx = L_mac( shb_ener_fx, shb_old_speech_fx[i], shb_old_speech_fx[i] );
-#endif
     }
 
     shb_ener_fx = L_add( Mpy_32_16_1( shb_ener_fx, 102 ), 1 ); /* 102 in Q15, shb_ener_fx in Q1 */
@@ -2659,11 +2536,7 @@ static Word16 shb_DTX_fx(
     wb_ener_fx = L_deposit_l( 0 );
     FOR( i = 0; i < st_fx->L_frame; i++ )
     {
-#ifdef BASOP_NOGLOB
         wb_ener_fx = L_mac_o( wb_ener_fx, syn_12k8_16k[i], syn_12k8_16k[i], &Overflow );
-#else
-        wb_ener_fx = L_mac( wb_ener_fx, syn_12k8_16k[i], syn_12k8_16k[i] );
-#endif
     }
 
     wb_ener_fx = L_add( Mpy_32_16_1( wb_ener_fx, 128 ), 1 ); /* 128 in Q15, wb_ener_fx in Q1 */
@@ -2672,11 +2545,7 @@ static Word16 shb_DTX_fx(
     fra = Log2_norm_lc( L_shl( wb_ener_fx, exp ) );
     exp = sub( 30 - 1, exp );
     wb_ener_fx = Mpy_32_16( exp, fra, LG10 );
-#ifdef BASOP_NOGLOB
     log_wb_ener_fx = round_fx_o( L_shl_o( wb_ener_fx, 10, &Overflow ), &Overflow ); /* log_wb_ener_fx in Q8 */
-#else
-    log_wb_ener_fx = round_fx( L_shl( wb_ener_fx, 10 ) );               /* log_wb_ener_fx in Q8 */
-#endif
     exp = norm_l( shb_ener_fx );
     fra = Log2_norm_lc( L_shl( shb_ener_fx, exp ) );
     exp = sub( 30 - 1, exp );
@@ -2695,11 +2564,7 @@ static Word16 shb_DTX_fx(
         move16();
     }
 
-#ifdef BASOP_NOGLOB
     log_shb_ener_fx = sub_o( round_fx_o( L_shl_o( shb_ener_fx, 10, &Overflow ), &Overflow ), att, &Overflow ); /* log_shb_ener_fx in Q8 */
-#else
-    log_shb_ener_fx = sub( round_fx( L_shl( shb_ener_fx, 10 ) ), att ); /* log_shb_ener_fx in Q8 */
-#endif
     IF( hDtxEnc->first_CNG == 0 )
     {
         hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;
@@ -2717,13 +2582,7 @@ static Word16 shb_DTX_fx(
         allow_cn_step_fx = 1;
         move16();
     }
-#ifdef IVAS_CODE
-    /* Also allow step if shb energy has dropped 12 dB */
-    if ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) && ( ( hTdCngEnc->mov_shb_cng_ener - log_shb_ener ) > 12.0f ) )
-    {
-        allow_cn_step = 1;
-    }
-#endif
+
     IF( EQ_16( allow_cn_step_fx, 1 ) )
     {
         hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;
@@ -2843,13 +2702,10 @@ void calculate_hangover_attenuation_gain_fx(
         test();
         IF( hTdCngEnc->burst_ho_cnt > 0 && ( vad_hover_flag != 0 ) && ( NE_16( st->bwidth, NB ) || st->element_mode > EVS_MONO ) ) /* corresponds to line 504 in FLT acelp_core_enc.c */
         {
-#ifdef IVAS_CODE
             if ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD )
             {
-                *att = powf( 10.0f, ( st->hTdCngEnc->CNG_att / 160.0f ) * st->hTdCngEnc->burst_ho_cnt );
             }
             else
-#endif
             {
                 offset = 5;
                 move16();
@@ -2921,3 +2777,375 @@ void calculate_hangover_attenuation_gain_ivas_fx(
 
     return;
 }
+
+void swb_CNG_enc_ivas_fx(
+    Encoder_State *st,            /* i/o: State structure                                 */
+    const Word16 *shb_speech_fx,  /* i  : SHB target signal (6-14kHz) at 16kHz            Q0 */
+    const Word16 *syn_12k8_16k_fx /* i  : ACELP core synthesis at 12.8kHz or 16kHz        Q0 */
+)
+{
+    Word16 shb_SID_updt;
+
+    test();
+    IF( EQ_32( st->core_brate, SID_2k40 ) || st->core_brate == FRAME_NO_DATA )
+    {
+        IF( st->cng_type == LP_CNG )
+        {
+            test();
+            IF( GE_32( st->input_Fs, L_FRAME32k * FRAMES_PER_SEC ) )
+            {
+                /* decide if SHB SID encoding or not */
+                shb_SID_updt = shb_DTX_ivas_fx( st, shb_speech_fx, syn_12k8_16k_fx );
+
+                /* SHB CNG encoding */
+                shb_CNG_encod_ivas_fx( st, shb_SID_updt );
+            }
+            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && EQ_32( st->core_brate, SID_2k40 ) )
+            {
+                /* LF-boost not used in DFT-stereo, instead the bandwidth is transmitted */
+                delete_indice( st->hBstr, IND_CNG_ENV1 );
+                push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 );
+                push_indice( st->hBstr, IND_UNUSED, 0, 4 );
+                push_indice( st->hBstr, IND_SID_BW, 1, 1 );
+            }
+        }
+        st->hTdCngEnc->last_vad = 0;
+        move16();
+    }
+    ELSE
+    {
+        st->hTdCngEnc->last_vad = 1;
+        move16();
+    }
+
+    return;
+}
+
+
+/*---------------------------------------------------------------------*
+ * shb_CNG_encod()
+ *
+ * SID parameters encoding for SHB signal
+ *---------------------------------------------------------------------*/
+
+static void shb_CNG_encod_ivas_fx(
+    Encoder_State *st,  /* i/o: State structure             */
+    const Word16 update /* i  : SID update flag             */
+)
+{
+    Word16 idx_ener = 0;
+    move16();
+    BSTR_ENC_HANDLE hBstr = st->hBstr;
+
+    Word16 ener_mid_dec_thr_fx;
+
+    IF( EQ_16( update, 1 ) )
+    {
+        IF( st->element_mode == EVS_MONO )
+        {
+            /* 6.0 in Q8 -> 1510 */
+            /* 0.9 in Q15 29491 */
+            /* ( 1 / log10(2.0) ) * 0.1 in Q15 ->10886 */
+            idx_ener = shr( mult( add( mult( st->hTdCngEnc->mov_shb_cng_ener_fx, 10886 ), 1510 ), 29491 ), 8 ); /* Q0 */
+        }
+        ELSE
+        {
+            /*idx_ener = (int16_t)(0.7f * (0.1f * st->hTdCngEnc->mov_shb_cng_ener / (float)log10(2.0f) + 6.0f) + 0.5f);*/
+            // PMT("shb_CNG_encod_fx quantization in missing")
+            /* 6.0 in Q8 -> 1510 */
+            /* 0.7 in Q15 22938 */
+            /* ( 1 / log10(2.0) ) * 0.1 in Q15 -> 10886 */
+            idx_ener = shr( mult( add( mult( st->hTdCngEnc->mov_shb_cng_ener_fx, 10886 ), 1510 ), 22938 ), 8 ); /* Q0 */
+        }
+
+
+        if ( LT_16( st->bwidth, SWB ) )
+        {
+            idx_ener = 0;
+            move16();
+        }
+
+        IF( GT_16( idx_ener, 15 ) )
+        {
+            idx_ener = 15;
+            move16();
+        }
+        ELSE IF( idx_ener < 0 )
+        {
+            idx_ener = 0;
+            move16();
+        }
+
+        /* prevent toggling of idx_ener by adding small dead-zone interval around decision thresholds */
+        IF( st->element_mode != EVS_MONO )
+        {
+            IF( EQ_16( abs_s( sub( idx_ener, st->hTdCngEnc->last_idx_ener ) ), 1 ) )
+            {
+
+                Word16 tmp, tmp1, tmp2, scale, exp1, exp2, ener_mid_dec_thr_e;
+                tmp = BASOP_Util_Divide1616_Scale( st->hTdCngEnc->last_idx_ener, 22938, &scale ); // 0.7 in Q15 ->exp 0
+                scale = add( scale, ( 15 - 0 ) );
+                tmp = sub( tmp, shl( 6, sub( Q15, scale ) ) );
+                tmp1 = BASOP_Util_Divide1616_Scale( tmp, 3277, &exp1 );
+                exp1 = add( exp1, ( scale - 0 ) );
+
+                ener_mid_dec_thr_fx = shr( mult( tmp1, 9864 ), 1 ); // exp = exp
+
+                tmp = BASOP_Util_Divide1616_Scale( idx_ener, 22938, &scale ); // 0.7 in Q15 ->exp 0
+                scale = add( scale, ( 15 - 0 ) );
+                tmp = sub( tmp, shl( 6, sub( Q15, scale ) ) );
+                tmp1 = BASOP_Util_Divide1616_Scale( tmp, 3277, &exp2 );
+                exp2 = add( exp2, ( scale - 0 ) );
+
+                tmp2 = shr( mult( tmp1, 9864 ), 1 ); // exp = exp
+
+                ener_mid_dec_thr_e = BASOP_Util_Add_MantExp( tmp2, exp2, ener_mid_dec_thr_fx, exp1, &ener_mid_dec_thr_fx );
+
+
+                scale = BASOP_Util_Add_MantExp( st->hTdCngEnc->mov_shb_cng_ener_fx, 7, negate( ener_mid_dec_thr_fx ), ener_mid_dec_thr_e, &tmp );
+                tmp1 = BASOP_Util_Divide1616_Scale( tmp, ener_mid_dec_thr_fx, &exp1 );
+                exp1 = add( exp1, sub( scale, ener_mid_dec_thr_e ) );
+                IF( LT_16( abs_s( tmp1 ), shr( 328, sub( 15, exp1 ) ) ) )
+                {
+                    idx_ener = st->hTdCngEnc->last_idx_ener;
+                    move16();
+                }
+            }
+        }
+
+        st->hTdCngEnc->last_idx_ener = idx_ener;
+        move16();
+
+        push_indice( hBstr, IND_SHB_CNG_GAIN, idx_ener, 4 );
+        push_indice( hBstr, IND_SID_BW, 1, 1 );
+        delete_indice( hBstr, IND_CNG_ENV1 );
+        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
+        {
+            push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 );
+        }
+        ELSE
+        {
+            push_indice( hBstr, IND_UNUSED, 0, 2 );
+        }
+        st->hTdCngEnc->ho_sid_bw = L_shl( L_and( st->hTdCngEnc->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
+        st->hTdCngEnc->ho_sid_bw = L_or( st->hTdCngEnc->ho_sid_bw, 0x1L );
+        move32();
+        move32();
+    }
+    ELSE IF( EQ_32( st->core_brate, SID_2k40 ) )
+    {
+        st->hTdCngEnc->ho_sid_bw = L_shl( L_and( st->hTdCngEnc->ho_sid_bw, (Word32) 0x3fffffffL ), 1 );
+        move32();
+        push_indice( hBstr, IND_SID_BW, 0, 1 );
+    }
+
+    return;
+}
+
+/*---------------------------------------------------------------------*
+ * shb_DTX()
+ *
+ * Decide if encoding SHB SID or not
+ *---------------------------------------------------------------------*/
+
+static Word16 shb_DTX_ivas_fx(
+    Encoder_State *st,            /* i/o: State structure                                 */
+    const Word16 *shb_speech_fx,  /* i  : SHB target signal (6-14kHz) at 16kHz            Q0 */
+    const Word16 *syn_12k8_16k_fx /* i  : ACELP core synthesis at 12.8kHz or 16kHz        Q0 */
+)
+{
+    Word16 i;
+    Word16 update;
+
+    Word16 allow_cn_step = 0;
+    move16();
+    Word16 shb_old_speech_fx[( ACELP_LOOK_12k8 + L_SUBFR + L_FRAME ) * 5 / 4];
+    Word16 *shb_new_speech_fx;
+    Word32 wb_ener_fx;
+    Word32 shb_ener_fx;
+    Word16 log_wb_ener_fx;
+    Word16 log_shb_ener_fx;
+    Word16 tmp;
+    Word16 exp;
+    Word16 fra;
+    Word16 att_fx; /*Q8*/
+
+    TD_CNG_ENC_HANDLE hTdCngEnc = st->hTdCngEnc;
+    TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
+
+
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move16();
+#endif
+
+    shb_new_speech_fx = shb_old_speech_fx + ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4;
+    Copy( hBWE_TD->old_speech_shb_fx, shb_old_speech_fx, ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4 );              // old_speech_shb_fx -> Q0
+    Copy( shb_speech_fx, shb_new_speech_fx, L_FRAME16k );                                                      // Q0
+    Copy( shb_old_speech_fx + L_FRAME16k, hBWE_TD->old_speech_shb_fx, ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4 ); // Q0
+
+    shb_ener_fx = L_deposit_l( 0 );
+    FOR( i = 0; i < L_FRAME16k; i++ )
+    {
+        shb_ener_fx = L_mac_sat( shb_ener_fx, shb_old_speech_fx[i], shb_old_speech_fx[i] ); // ( Q0 + Q0 + Q1 ) --> Q1 due to left shift in L_mac
+    }
+
+    shb_ener_fx = L_add( Mpy_32_16_1( shb_ener_fx, 102 ), 1 ); /* ( 1 / L_FRAME16K ) -> 102 in Q15, shb_ener_fx in Q1 */
+
+    wb_ener_fx = L_deposit_l( 0 );
+    FOR( i = 0; i < st->L_frame; i++ )
+    {
+        wb_ener_fx = L_mac_o( wb_ener_fx, syn_12k8_16k_fx[i], syn_12k8_16k_fx[i], &Overflow ); // ( Q0 + Q0 + Q1 ) --> Q1 due to left shift in L_mac
+    }
+
+    wb_ener_fx = L_add( Mpy_32_16_1( wb_ener_fx, 128 ), 1 ); /* 128 in Q15, wb_ener_fx in Q1 */
+
+    exp = norm_l( wb_ener_fx );
+    fra = Log2_norm_lc( L_shl( wb_ener_fx, exp ) );
+    exp = sub( 30 - 1, exp );
+    wb_ener_fx = Mpy_32_16( exp, fra, LG10 );
+
+    log_wb_ener_fx = round_fx_o( L_shl_o( wb_ener_fx, 10, &Overflow ), &Overflow ); /* log_wb_ener_fx in Q8 */
+    exp = norm_l( shb_ener_fx );
+    fra = Log2_norm_lc( L_shl( shb_ener_fx, exp ) );
+    exp = sub( 30 - 1, exp );
+    shb_ener_fx = Mpy_32_16( exp, fra, LG10 );
+
+
+    test();
+    IF( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) )
+    {
+        Word32 att_fx32 = 0;
+        move32();
+        Word16 index;
+
+        apply_scale_ivas_fx( &att_fx32, st->hFdCngEnc->hFdCngCom->CngBandwidth, st->hFdCngEnc->hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO, &index ); // Q23;
+
+        att_fx = extract_l( L_shr( att_fx32, 15 ) ); // Q8
+    }
+    ELSE
+    {
+        att_fx = -1664; // Q8
+        move16();
+    }
+
+
+    log_shb_ener_fx = sub_o( round_fx_o( L_shl_o( shb_ener_fx, 10, &Overflow ), &Overflow ), att_fx, &Overflow ); /* log_shb_ener_fx in Q8 */
+
+    IF( st->hDtxEnc->first_CNG == 0 )
+    {
+
+
+        hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;    // Q8
+        hTdCngEnc->mov_shb_cng_ener_fx = log_shb_ener_fx;  // Q8
+        hTdCngEnc->last_wb_cng_ener_fx = log_wb_ener_fx;   // Q8
+        hTdCngEnc->last_shb_cng_ener_fx = log_shb_ener_fx; // Q8
+        move16();
+        move16();
+        move16();
+        move16();
+    }
+    IF( GT_16( abs_s( sub( log_wb_ener_fx, hTdCngEnc->mov_wb_cng_ener_fx ) ), 3072 /*12 in Q8*/ ) )
+    {
+        allow_cn_step = 1;
+        move16();
+    }
+
+    /* Also allow step if shb energy has dropped 12 dB */
+    test();
+    test();
+    IF( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && GT_16( sub( hTdCngEnc->mov_shb_cng_ener_fx, log_shb_ener_fx ), 3072 /*12 in Q8*/ ) )
+    {
+        allow_cn_step = 1;
+        move16();
+    }
+
+    IF( EQ_16( allow_cn_step, 1 ) )
+    {
+        hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;
+        hTdCngEnc->mov_shb_cng_ener_fx = log_shb_ener_fx;
+        move16();
+        move16();
+    }
+    ELSE
+    {
+        tmp = sub( log_wb_ener_fx, hTdCngEnc->mov_wb_cng_ener_fx );                /* Q8 */
+        tmp = mult( tmp, 29491 /* .9f in Q15*/ );                                  /* Q8 */
+        hTdCngEnc->mov_wb_cng_ener_fx = add( hTdCngEnc->mov_wb_cng_ener_fx, tmp ); /* Q8 */
+        move16();
+
+        tmp = sub( log_shb_ener_fx, hTdCngEnc->mov_shb_cng_ener_fx );
+        tmp = mult( tmp, 8192 /* .25f in Q15*/ );                                    /* Q8 */
+        hTdCngEnc->mov_shb_cng_ener_fx = add( hTdCngEnc->mov_shb_cng_ener_fx, tmp ); /* Q8 */
+        move16();
+    }
+
+    hTdCngEnc->shb_NO_DATA_cnt = add( hTdCngEnc->shb_NO_DATA_cnt, 1 );
+    update = 0;
+
+    move16();
+    move16();
+
+    IF( EQ_32( st->core_brate, SID_2k40 ) )
+    {
+        test();
+        test();
+        test();
+        IF( st->hDtxEnc->first_CNG == 0 )
+        {
+            update = 1;
+            move16();
+        }
+        ELSE IF( hTdCngEnc->shb_cng_ini_cnt > 0 )
+        {
+            hTdCngEnc->shb_cng_ini_cnt = sub( hTdCngEnc->shb_cng_ini_cnt, 1 );
+            update = 1;
+            move16();
+            move16();
+        }
+        ELSE IF( EQ_16( hTdCngEnc->last_vad, 1 ) )
+        {
+            update = 1;
+            move16();
+        }
+        ELSE IF( GE_16( hTdCngEnc->shb_NO_DATA_cnt, 100 ) )
+        {
+            update = 1;
+            move16();
+        }
+        ELSE IF( GT_16( abs_s( sub( sub( hTdCngEnc->mov_wb_cng_ener_fx, hTdCngEnc->mov_shb_cng_ener_fx ), sub( hTdCngEnc->last_wb_cng_ener_fx, hTdCngEnc->last_shb_cng_ener_fx ) ) ), 768 ) )
+        {
+            update = 1;
+            move16();
+        }
+        ELSE IF( ( GE_16( st->bwidth, SWB ) && LT_16( hTdCngEnc->last_SID_bwidth, SWB ) ) || ( LT_16( st->bwidth, SWB ) && GE_16( hTdCngEnc->last_SID_bwidth, SWB ) ) )
+        {
+            update = 1;
+            move16();
+        }
+
+        hTdCngEnc->last_SID_bwidth = st->bwidth;
+        move16();
+    }
+
+    /* LF-boost not yet implemented in decoder which means that the specific wb_sid information is not used */
+    test();
+    test();
+    if ( ( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && EQ_32( st->core_brate, SID_2k40 ) )
+    {
+        update = 1;
+        move16();
+    }
+
+    IF( EQ_16( update, 1 ) )
+    {
+        hTdCngEnc->last_wb_cng_ener_fx = hTdCngEnc->mov_wb_cng_ener_fx;
+        hTdCngEnc->last_shb_cng_ener_fx = hTdCngEnc->mov_shb_cng_ener_fx;
+        hTdCngEnc->shb_NO_DATA_cnt = 0;
+        move16();
+        move16();
+        move16();
+    }
+
+    return ( update );
+}
diff --git a/lib_enc/cod2t32.c b/lib_enc/cod2t32.c
deleted file mode 100644
index e7a8ca967132cf8896fc4a231dbaf74eed596840..0000000000000000000000000000000000000000
--- a/lib_enc/cod2t32.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/cod2t32_fx.c b/lib_enc/cod2t32_fx.c
index cbe006f5360f7186fdc9750cbb41ce72978ff63d..dc967e656015c19b31d029321709cc01eef3608d 100644
--- a/lib_enc/cod2t32_fx.c
+++ b/lib_enc/cod2t32_fx.c
@@ -5,7 +5,6 @@
 #include "options.h"     /* Compilation switches                   */
 #include "cnst.h"        /* Common constants                       */
 #include "rom_com.h"     /* Common constants                       */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -64,19 +63,11 @@ void acelp_2t32_fx(
     L_cor = L_deposit_h( 1 );
     FOR( i = 0; i < NB_POS_FCB_2T; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_cor = L_mac_o( L_cor, *ptr_h1, *ptr_h1, &Overflow );
-#else
-        L_cor = L_mac( L_cor, *ptr_h1, *ptr_h1 );
-#endif
         ptr_h1++;
         *p1-- = extract_h( L_cor );
         move16(); /*Q9 Q7*/
-#ifdef BASOP_NOGLOB
         L_cor = L_mac_o( L_cor, *ptr_h1, *ptr_h1, &Overflow );
-#else
-        L_cor = L_mac( L_cor, *ptr_h1, *ptr_h1 );
-#endif
         ptr_h1++;
         *p0-- = extract_h( L_cor );
         move16(); /*Q9 Q7*/
@@ -117,31 +108,17 @@ void acelp_2t32_fx(
         L_cor = L_mult( *ptr_h1++, *ptr_h2++ ); // Q(12+12+1)
         FOR( i = k; i < NB_POS_FCB_2T - 1; i++ )
         {
-#ifdef BASOP_NOGLOB
             *p1 = round_fx_o( L_cor, &Overflow ); // Q(25-16)
             L_cor = L_mac_o( L_cor, *ptr_h1++, *ptr_h2++, &Overflow );
-#else
-            *p1 = round_fx( L_cor );
-            L_cor = L_mac( L_cor, *ptr_h1++, *ptr_h2++ );
-#endif
-#ifdef BASOP_NOGLOB
             *p0 = round_fx_o( L_cor, &Overflow ); // Q(9)
             L_cor = L_mac_o( L_cor, *ptr_h1++, *ptr_h2++, &Overflow );
-#else
-            *p0 = round_fx( L_cor );
-            L_cor = L_mac( L_cor, *ptr_h1++, *ptr_h2++ );
-#endif
             move16();
             move16();
             p1 -= ( NB_POS_FCB_2T + 1 );
             p0 -= ( NB_POS_FCB_2T + 1 );
         }
 
-#ifdef BASOP_NOGLOB
         *p1 = round_fx_o( L_cor, &Overflow ); // Q9
-#else
-        *p1 = round_fx( L_cor );
-#endif
         pos -= NB_POS_FCB_2T;
         move16();
         pos2--;
@@ -244,17 +221,9 @@ void acelp_2t32_fx(
         FOR( i1 = 1; i1 < L_SUBFR; i1 += STEP )
         {
             ps2 = add( ps1, dn_p[i1] );
-#ifdef BASOP_NOGLOB
             alp2 = add_o( alp1, add_o( *p1++, *p2++, &Overflow ), &Overflow );
-#else
-            alp2 = add( alp1, add( *p1++, *p2++ ) );
-#endif
             sq = mult( ps2, ps2 );
-#ifdef BASOP_NOGLOB
             s = L_msu_o( L_mult( alpk, sq ), psk, alp2, &Overflow );
-#else
-            s = L_msu( L_mult( alpk, sq ), psk, alp2 );
-#endif
             IF( s > 0 )
             {
                 psk = sq;
@@ -323,7 +292,7 @@ void acelp_2t32_fx(
     }
     {
         /* write index to array of indices */
-        push_indice_fx( hBstr, IND_ALG_CDBK_2T32, index, 12 );
+        push_indice( hBstr, IND_ALG_CDBK_2T32, index, 12 );
     }
     return;
 }
@@ -365,19 +334,11 @@ void acelp_2t32_ivas_fx(
     L_cor = L_deposit_h( 1 );
     FOR( i = 0; i < NB_POS_FCB_2T; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_cor = L_mac_o( L_cor, *ptr_h1, *ptr_h1, &Overflow );
-#else
-        L_cor = L_mac( L_cor, *ptr_h1, *ptr_h1 );
-#endif
         ptr_h1++;
         *p1-- = extract_h( L_cor );
         move16(); /*Q9 Q7*/
-#ifdef BASOP_NOGLOB
         L_cor = L_mac_o( L_cor, *ptr_h1, *ptr_h1, &Overflow );
-#else
-        L_cor = L_mac( L_cor, *ptr_h1, *ptr_h1 );
-#endif
         ptr_h1++;
         *p0-- = extract_h( L_cor );
         move16(); /*Q9 Q7*/
@@ -418,31 +379,17 @@ void acelp_2t32_ivas_fx(
         L_cor = L_mult( *ptr_h1++, *ptr_h2++ ); // Q25
         FOR( i = k; i < NB_POS_FCB_2T - 1; i++ )
         {
-#ifdef BASOP_NOGLOB
             *p1 = round_fx_o( L_cor, &Overflow ); // Q9
             L_cor = L_mac_o( L_cor, *ptr_h1++, *ptr_h2++, &Overflow );
-#else
-            *p1 = round_fx( L_cor );
-            L_cor = L_mac( L_cor, *ptr_h1++, *ptr_h2++ );
-#endif
-#ifdef BASOP_NOGLOB
             *p0 = round_fx_o( L_cor, &Overflow ); // Q9
             L_cor = L_mac_o( L_cor, *ptr_h1++, *ptr_h2++, &Overflow );
-#else
-            *p0 = round_fx( L_cor );
-            L_cor = L_mac( L_cor, *ptr_h1++, *ptr_h2++ );
-#endif
             move16();
             move16();
             p1 -= ( NB_POS_FCB_2T + 1 );
             p0 -= ( NB_POS_FCB_2T + 1 );
         }
 
-#ifdef BASOP_NOGLOB
         *p1 = round_fx_o( L_cor, &Overflow );
-#else
-        *p1 = round_fx( L_cor );
-#endif
         pos -= NB_POS_FCB_2T;
         move16();
         pos2 = sub( pos2, 1 );
@@ -546,17 +493,9 @@ void acelp_2t32_ivas_fx(
         FOR( i1 = 1; i1 < L_SUBFR; i1 += STEP )
         {
             ps2 = add( ps1, dn_p[i1] );
-#ifdef BASOP_NOGLOB
             alp2 = add_o( alp1, add_o( *p1++, *p2++, &Overflow ), &Overflow );
-#else
-            alp2 = add( alp1, add( *p1++, *p2++ ) );
-#endif
             sq = mult( ps2, ps2 );
-#ifdef BASOP_NOGLOB
             s = L_msu_o( L_mult( alpk, sq ), psk, alp2, &Overflow );
-#else
-            s = L_msu( L_mult( alpk, sq ), psk, alp2 );
-#endif
             IF( s > 0 )
             {
                 psk = sq;
@@ -697,11 +636,11 @@ void acelp_1t64_fx(
     }
     IF( EQ_16( L_subfr, L_SUBFR ) )
     {
-        push_indice_fx( hBstr, IND_ALG_CDBK_1T64, index, 7 );
+        push_indice( hBstr, IND_ALG_CDBK_1T64, index, 7 );
     }
     ELSE /* L_subfr == 2*L_SUBFR */
     {
-        push_indice_fx( hBstr, IND_ALG_CDBK_1T64, index, 8 );
+        push_indice( hBstr, IND_ALG_CDBK_1T64, index, 8 );
     }
 
     return;
diff --git a/lib_enc/cod4t64.c b/lib_enc/cod4t64.c
deleted file mode 100644
index b4081d00ffcfc5033234c111840eb5e62b62aa26..0000000000000000000000000000000000000000
--- a/lib_enc/cod4t64.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------------*/
diff --git a/lib_enc/cod4t64_fast.c b/lib_enc/cod4t64_fast.c
index 93bcc1ce3ffe44ca66128e467dbf5cf03d4c98ac..e24f3b678add290844dd03df2a523248c5a3d169 100644
--- a/lib_enc/cod4t64_fast.c
+++ b/lib_enc/cod4t64_fast.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,9 +34,7 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
@@ -125,10 +123,11 @@ void acelp_fast_fx(
     BSTR_ENC_HANDLE hBstr,  /* i/o: encoder bitstream handle                      */
     const Word16 cdk_index, /* i  : codebook index                                */
     const Word16 dn_orig[L_SUBFR],
-    /* i  : corr. between target and h[].                 */ // Q_new + 1
+    /* i  : corr. between target and h[].                 */ // Q_dn
     Word16 Q_dn,
     const Word16 cn[L_SUBFR],
-    /* i  : residual after long term prediction           */ // Q_new + 1
+    /* i  : residual after long term prediction           */ // q_cn
+    const Word16 q_cn,
     const Word16 H[L_SUBFR],
     /* i  : impulse response of weighted synthesis filter */ // e(norm_s(H[0])+1)
     Word16 code[L_SUBFR],
@@ -163,7 +162,9 @@ void acelp_fast_fx(
     Word64 s64;
     Word16 flag = 0;
     move16();
-
+    Word32 temp1, temp2, temp3, temp4, temp5, temp6;
+    Word16 q_temp1, q_temp2;
+    Word16 scale_temp1, scale_temp2;
     /*-----------------------------------------------------------------*
      * Initialization
      *-----------------------------------------------------------------*/
@@ -296,16 +297,23 @@ void acelp_fast_fx(
 
     exp = sub( Q31, shl( Q_dn, 1 ) );
 
+    s64 = 0;
+    move64();
+    FOR( i = 0; i < L_subfr; i++ )
+    {
+        s64 = W_mac_16_16( s64, dn_orig[i], dn_orig[i] ); // 2 * Q_dn + 1
+    }
     dndn_fx = 21474836 /*0.01f in Q31 */;
     move32();
     dndn_e = 0;
     move16();
-    FOR( i = 0; i < L_subfr; i++ )
+    IF( s64 )
     {
-        dndn_fx = BASOP_Util_Add_Mant32Exp( dndn_fx, dndn_e, L_mult0( dn_orig[i], dn_orig[i] ), exp, &dndn_e ); // Q(dndn_e)
+        Word16 new_exp1 = W_norm( s64 );
+        dndn_fx = W_extract_h( W_shl( s64, new_exp1 ) ); // 2 * Q_dyn + exp1 - 31
+        dndn_e = sub( 31, sub( add( add( shl( Q_dn, 1 ), 1 ), new_exp1 ), 32 ) );
     }
 
-    exp1 = sub( Q31, shl( sub( Q_dn, 1 ), 1 ) );
 
     cncn_fx = 214748365 /* 0.1f in Q31 */;
     move32();
@@ -314,31 +322,42 @@ void acelp_fast_fx(
 
     FOR( q = 0; q < nb_tracks; q++ )
     {
+        s64 = 0;
+        move64();
+        FOR( i = 0; i < L_subfr; i += nb_tracks )
+        {
+            s64 = W_mac_16_16( s64, cn[i + q], cn[i + q] ); // 2 * q_cn + 1
+        }
+
         cncn_track[q] = 214748365 /* 0.1f in Q31 */;
         move32();
         cncn_track_e[q] = 0;
         move16();
-
-        FOR( i = 0; i < L_subfr; i += nb_tracks )
+        IF( s64 )
         {
-            Word32 L_tmp = L_mult0( cn[i + q], cn[i + q] );
-            shift = norm_l( L_tmp );
-            L_tmp = L_shl( L_tmp, shift );
-            cncn_track[q] = BASOP_Util_Add_Mant32Exp( cncn_track[q], cncn_track_e[q], L_tmp, sub( exp1, shift ), &cncn_track_e[q] ); // Q(cncn_track_e[q])
-            move32();
+            Word16 new_exp1 = W_norm( s64 );
+            cncn_track[q] = W_extract_h( W_shl( s64, new_exp1 ) ); // 2 * Q_dyn + exp1 - 31
+            cncn_track_e[q] = sub( 31, sub( add( add( shl( q_cn, 1 ), 1 ), new_exp1 ), 32 ) );
         }
         cncn_fx = BASOP_Util_Add_Mant32Exp( cncn_fx, cncn_e, cncn_track[q], cncn_track_e[q], &cncn_e ); // Q(cncn_e)
     }
 
-    Word16 tmp;
+    Word16 tmp = 0;
+    move16();
     s_coef_fx = BASOP_Util_Divide3232_Scale( dndn_fx, cncn_fx, &tmp );
     tmp = add( tmp, sub( dndn_e, cncn_e ) );
     s_coef_fx = Sqrt16( s_coef_fx, &tmp ); // Q(15 - tmp)
 
-
+    q_temp1 = add( add( sub( Q15, tmp ), q_cn ), Q1 );
+    scale_temp1 = sub( q_temp1, Q_dn );
     FOR( i = 0; i < L_subfr; i++ )
     {
-        bn_orig_fx[i] = L_mac0( L_shr( L_mult( s_coef_fx, cn[i] ), sub( 15, tmp ) ), beta1_fx, dn_orig[i] ); // Q_dn
+        temp1 = L_mult( s_coef_fx, cn[i] );     // Q(15 - tmp)+q_cn+1
+        temp2 = L_mult( beta1_fx, dn_orig[i] ); // 1+Q_dn+1
+        /* bn_orig_fx[i] is being used in Q_dn */
+        temp2 = L_shr( temp2, 1 );
+        temp1 = L_shr( temp1, scale_temp1 );
+        bn_orig_fx[i] = L_add( temp1, temp2 ); // Q_dn
         move32();
 
         IF( bn_orig_fx[i] >= 0 )
@@ -578,12 +597,12 @@ void acelp_fast_fx(
         }
         ELSE
         {
-            Gn = i_mult( s[0], shr( dn_orig[m[0]], 1 ) ); // Q_dn - 1
-            Gd = alp[0];                                  // Q6
+            Gn = i_mult( s[0], dn_orig[m[0]] ); // Q_dn
+            Gd = alp[0];                        // Q6
             move16();
-            G = Gn; // Q_dn - 1
+            G = Gn; // Q_dn
             move16();
-            G = i_mult( G, s[0] ); // Q_dn - 1
+            G = i_mult( G, s[0] ); // Q_dn
 
             track = track_order[q * nb_tracks + 1]; // Q0
             move16();
@@ -598,14 +617,17 @@ void acelp_fast_fx(
             move64();
             FOR( i = track; i < L_subfr; i += nb_tracks )
             {
-                dn[i] = L_shr( L_msu( L_mult0( Gd, dn_orig[i] ), G, *alp_pos0 ), 6 ); // Q_dn
+                temp1 = L_mult0( Gd, dn_orig[i] );
+                temp2 = L_mult0( G, *alp_pos0 );
+                temp3 = L_sub( temp1, temp2 );
+                dn[i] = L_shr( temp3, 6 );
                 move32();
                 alp_pos0 += nb_tracks;
                 s64 = W_mac_32_32( s64, dn[i], dn[i] ); // 2 * Q_dn + 1
             }
             exp1 = W_norm( s64 );
             dndn_fx = W_extract_h( W_shl( s64, exp1 ) ); // 2 * Q_dyn + exp1 - 31
-            dndn_e = sub( 31, sub( add( shl( Q_dn, 1 ), exp ), 31 ) );
+            dndn_e = sub( 31, sub( add( add( shl( Q_dn, 1 ), 1 ), exp1 ), 32 ) );
 
             IF( dndn_fx == 0 )
             {
@@ -614,17 +636,28 @@ void acelp_fast_fx(
                 dndn_e = 0;
                 move16();
             }
+            exp1 = 0;
+            move16();
             s_coef_fx = BASOP_Util_Divide3232_Scale( dndn_fx, cncn_track[track], &exp1 );
             exp1 = add( exp1, sub( dndn_e, cncn_track_e[track] ) );
             s_coef_fx = Sqrt16( s_coef_fx, &exp1 );
-            exp1 = sub( exp1, shift );
             max_val_fx = EPSILLON_FX;
             move16();
             m[1] = track; // Q0
             move16();
+            q_temp1 = add( add( sub( Q15, exp1 ), q_cn ), 1 );
+            q_temp2 = add( Q_dn, Q2 );
+            scale_temp1 = sub( q_temp1, Q_dn );
+            scale_temp2 = sub( q_temp2, Q_dn );
             FOR( i = track; i < L_subfr; i += nb_tracks )
             {
-                dn[i] = L_add( L_shr( L_mult( s_coef_fx, cn[i] ), sub( 15, exp1 ) ), L_shr( imult3216( dn[i], beta2_fx ), 2 ) ); // Q_dn
+                temp1 = L_mult( s_coef_fx, cn[i] );   // Q(15 - tmp)+q_cn+1
+                temp2 = imult3216( dn[i], beta2_fx ); // Q_dn + 2
+
+                /* bn_orig_fx[i] is being used in Q_dn */
+                temp2 = L_shr( temp2, scale_temp2 );
+                temp1 = L_shr( temp1, scale_temp1 );
+                dn[i] = L_add( temp1, temp2 ); // Q_dn
                 move32();
                 temp_fx = imult3216( dn[i], sign_fx[i] ); // Q_dn
 
@@ -647,14 +680,14 @@ void acelp_fast_fx(
 
         IF( GE_16( nb_pulse, 3 ) )
         {
-            Gn = add( Gn, i_mult( s[1], shr( dn_orig[m[1]], 1 ) ) ); // Q_dn -1
+            Gn = add( Gn, i_mult( s[1], dn_orig[m[1]] ) ); // Q_dn
             Gd32 = Gd;
             move16();
             Gd32 = L_add( Gd32, L_add( alp[0], L_mult0( i_mult( shl( s[0], 1 ), s[1] ), alp[m[0] - m[1]] ) ) ); // Q6
-            G = Gn;                                                                                             // Q_dn - 1
+            G = Gn;                                                                                             // Q_dn
             move16();
-            G1 = i_mult( G, s[1] ); // Q_dn-1
-            G = i_mult( G, s[0] );  // Q_dn-1
+            G1 = i_mult( G, s[1] ); // Q_dn
+            G = i_mult( G, s[0] );  // Q_dn
 
             track = track_order[q * nb_tracks + 2]; // Q0
             move16();
@@ -663,7 +696,12 @@ void acelp_fast_fx(
 
             FOR( i = track; i < L_subfr; i += nb_tracks )
             {
-                dn[i] = L_shr( L_msu( L_msu0( imult3216( Gd32, dn_orig[i] ), G, *alp_pos0 ), G1, *alp_pos1 ), 6 ); // Q_dn
+                temp1 = imult3216( Gd32, dn_orig[i] );
+                temp2 = L_mult0( G, *alp_pos0 );
+                temp3 = L_mult0( G1, *alp_pos1 );
+                temp4 = L_sub( temp1, temp2 );
+                temp4 = L_sub( temp4, temp3 );
+                dn[i] = L_shr( temp4, 6 );
                 move32();
                 alp_pos0 += nb_tracks;
                 alp_pos1 += nb_tracks;
@@ -679,15 +717,19 @@ void acelp_fast_fx(
 
         IF( GE_16( nb_pulse, 4 ) )
         {
-            Gn = add( Gn, i_mult( s[2], shr( dn_orig[m[2]], 1 ) ) ); // Q_dn-1
+            Gn = add( Gn, i_mult( s[2], dn_orig[m[2]] ) ); // Q_dn
             Gd32 = Gd;
             move16();
-            Gd32 = L_add( Gd32, L_add( L_add( alp[0], L_mult0( i_mult( shl( s[0], 1 ), s[2] ), alp[m[0] - m[2]] ) ), L_mult0( i_mult( shl( s[1], 1 ), s[2] ), alp[m[1] - m[2]] ) ) ); // Q6
-            G = Gn;                                                                                                                                                                   // Q_dn-1
+            temp1 = alp[0];
+            move32();
+            temp2 = L_mult0( i_mult( shl( s[0], 1 ), s[2] ), alp[m[0] - m[2]] );
+            temp3 = L_mult0( i_mult( shl( s[1], 1 ), s[2] ), alp[m[1] - m[2]] );
+            Gd32 = L_add( Gd32, L_add( L_add( temp1, temp2 ), temp3 ) ); // Q6
+            G = Gn;                                                      // Q_dn
             move16();
-            G1 = i_mult( G, s[1] ); // Q_dn-1
-            G2 = i_mult( G, s[2] ); // Q_dn-1
-            G = i_mult( G, s[0] );  // Q_dn-1
+            G1 = i_mult( G, s[1] ); // Q_dn
+            G2 = i_mult( G, s[2] ); // Q_dn
+            G = i_mult( G, s[0] );  // Q_dn
 
             track = track_order[q * nb_tracks + 3];
             move16();
@@ -697,7 +739,15 @@ void acelp_fast_fx(
 
             FOR( i = track; i < L_subfr; i += nb_tracks )
             {
-                dn[i] = L_shr( L_msu( L_msu( L_msu( imult3216( Gd32, dn_orig[i] ), G, *alp_pos0 ), G1, *alp_pos1 ), G2, *alp_pos2 ), 6 ); // Q_dn
+
+                temp1 = imult3216( Gd32, dn_orig[i] );
+                temp2 = L_mult0( G, *alp_pos0 );
+                temp3 = L_mult0( G1, *alp_pos1 );
+                temp4 = L_mult0( G2, *alp_pos2 );
+                temp5 = L_sub( temp1, temp2 );
+                temp5 = L_sub( temp5, temp3 );
+                temp5 = L_sub( temp5, temp4 );
+                dn[i] = L_shr( temp5, 6 );
                 move32();
                 alp_pos0 += nb_tracks;
                 alp_pos1 += nb_tracks;
@@ -719,16 +769,22 @@ void acelp_fast_fx(
 
         IF( GE_16( nb_pulse, 5 ) )
         {
-            Gn = add( Gn, i_mult( s[3], shr( dn_orig[m[3]], 1 ) ) ); // Q_dn-1
+            Gn = add( Gn, i_mult( s[3], dn_orig[m[3]] ) ); // Q_dn
             Gd32 = Gd;
             move16();
-            Gd32 = L_add( Gd32, L_add( L_add( L_add( alp[0], L_mult0( i_mult( shl( s[0], 1 ), s[3] ), alp[m[0] - m[3]] ) ), L_mult0( i_mult( shl( s[1], 1 ), s[3] ), alp[m[1] - m[3]] ) ), L_mult0( i_mult( shl( s[2], 1 ), s[3] ), alp[m[2] - m[3]] ) ) ); // Q6
+            temp1 = alp[0];
+            move32();
+            temp2 = L_mult0( i_mult( shl( s[0], 1 ), s[3] ), alp[m[0] - m[3]] );
+            temp3 = L_mult0( i_mult( shl( s[1], 1 ), s[3] ), alp[m[1] - m[3]] );
+            temp4 = L_mult0( i_mult( shl( s[2], 1 ), s[3] ), alp[m[2] - m[3]] );
+
+            Gd32 = L_add( Gd32, L_add( L_add( L_add( temp1, temp2 ), temp3 ), temp4 ) ); // Q6
             G = Gn;
-            move16();               // Q_dn-1
-            G1 = i_mult( G, s[1] ); // Q_dn-1
-            G2 = i_mult( G, s[2] ); // Q_dn-1
-            G3 = i_mult( G, s[3] ); // Q_dn-1
-            G = i_mult( G, s[0] );  // Q_dn-1
+            move16();               // Q_dn
+            G1 = i_mult( G, s[1] ); // Q_dn
+            G2 = i_mult( G, s[2] ); // Q_dn
+            G3 = i_mult( G, s[3] ); // Q_dn
+            G = i_mult( G, s[0] );  // Q_dn
 
             IF( EQ_16( cdk_index, 6 ) )
             {
@@ -742,7 +798,16 @@ void acelp_fast_fx(
 
                 FOR( i = track; i < L_subfr; i += nb_tracks )
                 {
-                    dn[i] = L_shr( L_msu( L_msu( L_msu( L_msu( imult3216( Gd32, dn_orig[i] ), G, *alp_pos0 ), G1, *alp_pos1 ), G2, *alp_pos2 ), G3, *alp_pos3 ), 6 ); // Q_dn
+                    temp1 = imult3216( Gd32, dn_orig[i] );
+                    temp2 = L_mult0( G, *alp_pos0 );
+                    temp3 = L_mult0( G1, *alp_pos1 );
+                    temp4 = L_mult0( G2, *alp_pos2 );
+                    temp5 = L_mult0( G3, *alp_pos3 );
+                    temp6 = L_sub( temp1, temp2 );
+                    temp6 = L_sub( temp6, temp3 );
+                    temp6 = L_sub( temp6, temp4 );
+                    temp6 = L_sub( temp6, temp5 );
+                    dn[i] = L_shr( temp6, 6 );
                     move32();
                     alp_pos0 += nb_tracks;
                     alp_pos1 += nb_tracks;
@@ -762,7 +827,16 @@ void acelp_fast_fx(
 
                 FOR( i = 0; i < L_subfr; i++ )
                 {
-                    dn[i] = L_shr( L_msu( L_msu( L_msu( L_msu( imult3216( Gd32, dn_orig[i] ), G, *alp_pos0 ), G1, *alp_pos1 ), G2, *alp_pos2 ), G3, *alp_pos3 ), 6 ); /*Q_dn*/
+                    temp1 = imult3216( Gd32, dn_orig[i] );
+                    temp2 = L_mult0( G, *alp_pos0 );
+                    temp3 = L_mult0( G1, *alp_pos1 );
+                    temp4 = L_mult0( G2, *alp_pos2 );
+                    temp5 = L_mult0( G3, *alp_pos3 );
+                    temp6 = L_sub( temp1, temp2 );
+                    temp6 = L_sub( temp6, temp3 );
+                    temp6 = L_sub( temp6, temp4 );
+                    temp6 = L_sub( temp6, temp5 );
+                    dn[i] = L_shr( temp6, 6 );
                     move16();
                     alp_pos0++;
                     alp_pos1++;
@@ -901,7 +975,7 @@ void acelp_fast_fx(
                 move16();
             }
 
-            Copy( y_tmp, y, L_subfr ); // q_H
+            Copy_Scale_sig( y_tmp, y, L_subfr, sub( 9, q_H ) ); // y in Q9
             skip_track_max = skip_track[q];
             move16();
         }
diff --git a/lib_enc/cod4t64_fx.c b/lib_enc/cod4t64_fx.c
index 44cde6f27d8488be31521c55cd81eb875d3a196d..457a129b839cc96400674fb882c3fd05b6e07616 100644
--- a/lib_enc/cod4t64_fx.c
+++ b/lib_enc/cod4t64_fx.c
@@ -5,10 +5,9 @@
 #include "options.h"     /* VMR-WB compilation switches            */
 #include "cnst.h"        /* Common constants                       */
 #include "rom_enc.h"     /* Encoder static table prototypes        */
-#include "prot.h"        /* Function prototypes                    */
+#include "prot_fx.h"     /* Function prototypes                    */
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
-#include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 
@@ -331,11 +330,11 @@ Word16 acelp_4t64_fx(
         bitcnt = s_and( nbbits, 15 );
         FOR( i = 0; i < wordcnt; i++ )
         {
-            push_indice_fx( hBstr, IND_ALG_CDBK_4T64, indexing_indices[i], 16 );
+            push_indice( hBstr, IND_ALG_CDBK_4T64, indexing_indices[i], 16 );
         }
         IF( bitcnt )
         {
-            push_indice_fx( hBstr, IND_ALG_CDBK_4T64, indexing_indices[i], bitcnt );
+            push_indice( hBstr, IND_ALG_CDBK_4T64, indexing_indices[i], bitcnt );
         }
     }
     ELSE
@@ -348,7 +347,7 @@ Word16 acelp_4t64_fx(
             {
                 k = i_mult2( track, NPMAXPT );
                 index = quant_1p_N1_fx( ind[k], 4 );
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64, index, 5 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64, index, 5 );
             }
         }
         ELSE IF( EQ_16( nbbits, 36 ) )
@@ -358,7 +357,7 @@ Word16 acelp_4t64_fx(
 
                 k = i_mult2( track, NPMAXPT ); /* k = track * NPMAXPT;*/
                 index = quant_2p_2N1_fx( ind[k], ind[k + 1], 4 );
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64, index, 9 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64, index, 9 );
             }
         }
         ELSE IF( EQ_16( nbbits, 44 ) ) /* AMR-WB pulse indexing */
@@ -367,14 +366,14 @@ Word16 acelp_4t64_fx(
             {
                 k = i_mult2( track, NPMAXPT );
                 index = quant_3p_3N1_fx( ind[k], ind[k + 1], ind[k + 2], 4 );
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64, index, 13 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64, index, 13 );
             }
 
             FOR( track = 2; track < NB_TRACK_FCB_4T; track++ )
             {
                 k = i_mult2( track, NPMAXPT );
                 index = quant_2p_2N1_fx( ind[k], ind[k + 1], 4 );
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64, index, 9 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64, index, 9 );
             }
         }
         ELSE IF( EQ_16( nbbits, 52 ) ) /* AMR-WB pulse indexing */
@@ -383,7 +382,7 @@ Word16 acelp_4t64_fx(
             {
                 k = i_mult2( track, NPMAXPT );
                 index = quant_3p_3N1_fx( ind[k], ind[k + 1], ind[k + 2], 4 );
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64, index, 13 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64, index, 13 );
             }
         }
         ELSE IF( EQ_16( nbbits, 64 ) ) /* AMR-WB pulse indexing */
@@ -394,7 +393,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_4p_4N_fx( &ind[k], 4 );
                 index = extract_l( L_shr( L_index, 14 ) & 3 );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_1, index, 2 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_1, index, 2 );
             }
 
             FOR( track = 0; track < NB_TRACK_FCB_4T; track++ )
@@ -403,7 +402,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_4p_4N_fx( &ind[k], 4 );
                 index = extract_l( L_index & 0x3FFF );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_2, index, 14 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_2, index, 14 );
             }
         }
         ELSE IF( EQ_16( nbbits, 72 ) )
@@ -414,7 +413,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_5p_5N_fx( &ind[k], 4 );
                 index = extract_l( L_shr( L_index, 10 ) & 0x03FF );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_1, index, 10 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_1, index, 10 );
             }
 
             FOR( track = 2; track < NB_TRACK_FCB_4T; track++ )
@@ -423,7 +422,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_4p_4N_fx( &ind[k], 4 );
                 index = extract_l( L_shr( L_index, 14 ) & 3 );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_1, index, 2 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_1, index, 2 );
             }
 
             FOR( track = 0; track < ( NB_TRACK_FCB_4T - 2 ); track++ )
@@ -432,7 +431,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_5p_5N_fx( &ind[k], 4 );
                 index = extract_l( L_index & 0x03FF );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_2, index, 10 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_2, index, 10 );
             }
 
             FOR( track = 2; track < NB_TRACK_FCB_4T; track++ )
@@ -441,7 +440,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_4p_4N_fx( &ind[k], 4 );
                 index = extract_l( L_index & 0x3FFF );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_2, index, 14 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_2, index, 14 );
             }
         }
         ELSE IF( EQ_16( nbbits, 88 ) )
@@ -452,7 +451,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_6p_6N_2_fx( &ind[k], 4 );
                 index = extract_l( L_shr( L_index, 11 ) & 0x07FF );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_1, index, 11 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_1, index, 11 );
             }
 
             FOR( track = 0; track < NB_TRACK_FCB_4T; track++ )
@@ -461,7 +460,7 @@ Word16 acelp_4t64_fx(
                 L_index = quant_6p_6N_2_fx( &ind[k], 4 );
                 index = extract_l( L_index & 0x07FF );
                 logic16();
-                push_indice_fx( hBstr, IND_ALG_CDBK_4T64_2, index, 11 );
+                push_indice( hBstr, IND_ALG_CDBK_4T64_2, index, 11 );
             }
         }
     }
diff --git a/lib_enc/cod_ace.c b/lib_enc/cod_ace.c
deleted file mode 100644
index 3ee7cc7b2d7534bb92818b41e1cdef4341d0f9ec..0000000000000000000000000000000000000000
--- a/lib_enc/cod_ace.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include "prot.h"
-#include <stdint.h>
-#include "options.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/cod_ace_fx.c b/lib_enc/cod_ace_fx.c
index bea89f5116e8d52f17b82f8a096f21f546042360..e1914aeb5bb7b2e51f123b8f0ca042512c174644 100644
--- a/lib_enc/cod_ace_fx.c
+++ b/lib_enc/cod_ace_fx.c
@@ -37,14 +37,8 @@ Word16 coder_acelp_fx(                        /* o  : SEGSNR for CL decision   *
                        Word16 *bwe_exc        /* o  : excitation for SWB TBE     Qx */
 )
 {
-#ifndef SIMPLIFY_CODE_BE
-    Word16 i, j, i_subfr, j_subfr;
-    Word16 tmp, tmp2, Es_pred;
-    Word32 gain_code_vect[2];
-#else
     Word16 i, i_subfr, j_subfr;
     Word16 tmp, Es_pred;
-#endif
     Word16 T0, T0_min, T0_min_frac, T0_max, T0_max_frac, T0_res;
     Word16 T0_frac;
     Word16 gain_pit, voice_fac;
@@ -103,11 +97,7 @@ Word16 coder_acelp_fx(                        /* o  : SEGSNR for CL decision   *
 
     /* Configure ACELP */
 
-#ifndef MSAN_FIX
-    hLPDmem->nbits = BITS_ALLOC_config_acelp( target_bits, st->coder_type, acelp_cfg, st->narrowBand, st->nb_subfr );
-#else
     BITS_ALLOC_config_acelp( target_bits, st->coder_type, acelp_cfg, st->narrowBand, st->nb_subfr );
-#endif
 
     /* Init Framing parameters */
     move16();
@@ -324,12 +314,6 @@ Word16 coder_acelp_fx(                        /* o  : SEGSNR for CL decision   *
 
         gp_clip_test_gain_pit_fx( st->element_mode, st->core_brate, gain_pit, st->clip_var_fx );
 
-#ifndef SIMPLIFY_CODE_BE
-        gain_code_vect[0] = gain_code;
-        move32();
-        gain_code_vect[1] = gain_code;
-        move32();
-#endif
         /*----------------------------------------------------------*
          * - voice factor (for pitch enhancement)                   *
          *----------------------------------------------------------*/
@@ -354,85 +338,37 @@ Word16 coder_acelp_fx(                        /* o  : SEGSNR for CL decision   *
         hLPDmem->mem_w0 = sub( xn[L_SUBFR - 1], round_fx( L_shl( Ltmp, 1 ) ) );
         move16();
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         hLPDmem->mem_w0 = shr_sat( hLPDmem->mem_w0, shift ); /*Qnew-1*/
-#else
-        hLPDmem->mem_w0 = shr( hLPDmem->mem_w0, shift ); /*Qnew-1*/
-#endif
         move16();
         BASOP_SATURATE_WARNING_ON_EVS;
 
         /*-------------------------------------------------------*
          * - Find the total excitation.                          *
          *-------------------------------------------------------*/
-#ifndef SIMPLIFY_CODE_BE
-        tmp2 = shr( L_SUBFR, 1 );
-        FOR( j = 0; j < 2; j++ )
-        {
-            FOR( i = sub( tmp2, shr( L_SUBFR, 1 ) ); i < tmp2; i++ )
-            {
-                /* code in Q9, gain_pit in Q14; exc Q_new */
-                Ltmp = Mpy_32_16_1( gain_code2, code2[i] );
-                Ltmp = L_shl( Ltmp, Q_new_p5 );
-                Ltmp = L_mac( Ltmp, gain_pit, exc[i + i_subfr] );
-                BASOP_SATURATE_WARNING_OFF_EVS
-                exc2[i] = round_fx( L_shl( Ltmp, 1 ) );
-                BASOP_SATURATE_WARNING_ON_EVS
-
-                Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code[i] );
-                Ltmp2 = L_shl( Ltmp2, Q_new_p5 );
-                Ltmp = L_add( Ltmp, Ltmp2 );
-                BASOP_SATURATE_WARNING_OFF_EVS
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                BASOP_SATURATE_WARNING_ON_EVS
-                exc[i + i_subfr] = round_fx( Ltmp );
-            }
-            tmp2 = L_SUBFR;
-            move16();
-        }
-#else
         FOR( i = 0; i < L_SUBFR; i++ )
         {
             /* code in Q9, gain_pit in Q14; exc Q_new */
             Ltmp = Mpy_32_16_1( gain_code2, code2[i] );
             Ltmp = L_shl( Ltmp, Q_new_p5 );
             Ltmp = L_mac( Ltmp, gain_pit, exc[i + i_subfr] );
-#ifdef BASOP_NOGLOB
             exc2[i] = round_fx_sat( L_shl_o( Ltmp, 1, &Overflow ) );
-#else
-            BASOP_SATURATE_WARNING_OFF_EVS
-            exc2[i] = round_fx( L_shl( Ltmp, 1 ) );
-            BASOP_SATURATE_WARNING_ON_EVS
-#endif
             move16();
             Ltmp2 = Mpy_32_16_1( gain_code, code[i] );
-#ifdef BASOP_NOGLOB
             Ltmp2 = L_shl_sat( Ltmp2, Q_new_p5 );
             Ltmp = L_add_sat( Ltmp, Ltmp2 );
-#else
-            Ltmp2 = L_shl( Ltmp2, Q_new_p5 );
-            Ltmp = L_add( Ltmp, Ltmp2 );
-#endif
-#ifdef BASOP_NOGLOB
             Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here */
             exc[i + i_subfr] = round_fx_o( Ltmp, &Overflow );
-#else
-            BASOP_SATURATE_WARNING_OFF_EVS
-            Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-            BASOP_SATURATE_WARNING_ON_EVS
-            exc[i + i_subfr] = round_fx( Ltmp );
-#endif
             move16();
         }
-#endif
         /*-----------------------------------------------------------------*
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
         IF( st->igf != 0 )
         {
-            prep_tbe_exc_fx( L_frame, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
-                             bwe_exc, gain_preQ, code_preQ, Q_new, T0, T0_frac, st->coder_type, st->core_brate );
+            prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
+                             bwe_exc, gain_preQ, code_preQ, Q_new, T0, T0_frac, st->coder_type, st->core_brate,
+                             st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
         }
 
         /*---------------------------------------------------------*
diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c
deleted file mode 100644
index aaa7e4e2e13f01ee0207daa1bad4b3d412ba7824..0000000000000000000000000000000000000000
--- a/lib_enc/cod_tcx.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include "ivas_rom_com_fx.h"
-#include "prot_fx_enc.h"
-#include "prot_fx.h"
-#include "ivas_prot_fx.h"
-
-
-/*-------------------------------------------------------------------*
- * TNSAnalysisStereo()
- *
- *
- *-------------------------------------------------------------------*/
-
-#define SIMILAR_TNS_THRESHOLD_FX_IN_Q15       ( 1311 )
-#define TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q7 ( 384 )
-void TNSAnalysisStereo_fx(
-    Encoder_State **sts,                            /* i  : encoder state handle                    */
-    Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* o  : MDST spectrum                       Qx*/
-    const Word16 bWhitenedDomain,                   /* i  : whitened domain flag                    Q0*/
-    Word16 tnsSize[CPE_CHANNELS][NB_DIV],           /* i  : number of tns parameters put into prm   Q0*/
-    Word16 tnsBits[CPE_CHANNELS][NB_DIV],           /* i  : number of tns bits in the frame         Q0*/
-    Word16 param_core[][NB_DIV * NPRM_DIV],         /* o  : TNS parameters                          Q0*/
-    const Word16 mct_on                             /* i  : flag mct block (1) or stereo (0)        Q0*/
-)
-{
-    Word16 ch, k, L_spec, L_frame, nSubframes, iFilter;
-    Word32 *spectrum_fx;
-    Encoder_State *st = NULL;
-    TCX_ENC_HANDLE hTcxEnc = NULL;
-    Word16 individual_decision[NB_DIV];
-    Word16 maxPredictionGain_fx = 0, meanPredictionGain_fx;
-    move16();
-
-    individual_decision[0] = 0;
-    move16();
-    individual_decision[1] = 0;
-    move16();
-    L_spec = -1;
-    move16();
-    L_frame = -1;
-    move16();
-
-    /* TNS filter analysis, loop over channels */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        st = sts[ch];
-        IF( EQ_16( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
-        {
-            continue;
-        }
-
-        hTcxEnc = st->hTcxEnc;
-
-        IF( EQ_16( hTcxEnc->tcxMode, TCX_20 ) )
-        {
-            nSubframes = 1;
-        }
-        ELSE
-        {
-            nSubframes = NB_DIV;
-        }
-        move16();
-
-        FOR( k = 0; k < nSubframes; k++ )
-        {
-            /* reset tns on whitened domain flag */
-            IF( !bWhitenedDomain )
-            {
-                hTcxEnc->bTnsOnWhithenedSpectra[k] = 0;
-                move16();
-                hTcxEnc->fUseTns[k] = 0;
-                move16();
-            }
-            test();
-            test();
-            IF( st->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-            {
-                spectrum_fx = hTcxEnc->spectrum_fx[k];
-
-                L_frame = hTcxEnc->L_frameTCX;
-                move16();
-                st->hTcxCfg->pCurrentTnsConfig = &st->hTcxCfg->tnsConfig[hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( st->last_core == ACELP_CORE )];
-                L_spec = st->hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
-                move16();
-                /*-----------------------------------------------------------*
-                 * Temporal Noise Shaping analysis                           *
-                 *-----------------------------------------------------------*/
-
-                IF( EQ_16( hTcxEnc->transform_type[k], TCX_5 ) )
-                {
-                    /* rearrange LF sub-window lines prior to TNS analysis & filtering */
-                    tcx5TnsGrouping_fx( shr( L_frame, 2 ), shr( L_spec, 1 ), spectrum_fx );
-                }
-
-                /* WMOPS: All initializations are either for safety or static (tables) and thus not to be counted */
-
-                ResetTnsData( &hTcxEnc->tnsData[k] );
-                IF( st->hTcxCfg->pCurrentTnsConfig->maxOrder <= 0 )
-                {
-                    BREAK;
-                }
-
-                CalculateTnsFilt_fx( st->hTcxCfg->pCurrentTnsConfig, spectrum_fx, hTcxEnc->spectrum_e[k], &hTcxEnc->tnsData[k], NULL );
-            }
-        }
-    }
-
-    IF( !mct_on )
-    {
-        /* TNS decision */
-        /* if framing differs between channels, keep the filter decision per channel */
-        test();
-        test();
-        IF( ( NE_16( sts[0]->hTcxEnc->transform_type[0], sts[1]->hTcxEnc->transform_type[0] ) &&
-              NE_16( sts[0]->hTcxEnc->transform_type[1], sts[1]->hTcxEnc->transform_type[1] ) ) ||
-            NE_16( sts[0]->hTcxCfg->fIsTNSAllowed, sts[1]->hTcxCfg->fIsTNSAllowed ) )
-        {
-            individual_decision[0] = individual_decision[1] = 1;
-            move16();
-            move16();
-        }
-        ELSE IF( bWhitenedDomain )
-        {
-            IF( EQ_16( sts[0]->hTcxEnc->tcxMode, TCX_20 ) )
-            {
-                nSubframes = 1;
-            }
-            ELSE
-            {
-                nSubframes = NB_DIV;
-            }
-            move16();
-            FOR( k = 0; k < nSubframes; k++ )
-            {
-                IF( NE_16( sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k], sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-                {
-                    individual_decision[k] = 1;
-                    move16();
-                }
-            }
-        }
-
-        /* framing equal, check for similar filters, if very similar (also indicator for and M signal),
-         * use at least the same decision, maybe use the same filter
-         */
-        {
-            Word8 isTCX10;
-
-            IF( EQ_16( sts[0]->hTcxEnc->tcxMode, TCX_20 ) )
-            {
-                nSubframes = 1;
-                isTCX10 = 0;
-            }
-            ELSE
-            {
-                nSubframes = NB_DIV;
-                isTCX10 = 1;
-            }
-            move16();
-            move16();
-            FOR( k = 0; k < nSubframes; k++ )
-            {
-                test();
-                test();
-                test();
-                IF( sts[0]->hTcxCfg->fIsTNSAllowed && NE_16( individual_decision[k], 1 ) && ( !bWhitenedDomain || sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-                {
-                    Word16 maxPredGain_fx = -ONE_IN_Q7;
-                    move16();
-                    sts[0]->hTcxCfg->pCurrentTnsConfig = &sts[0]->hTcxCfg->tnsConfig[sts[0]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[0]->last_core == ACELP_CORE )];
-                    sts[1]->hTcxCfg->pCurrentTnsConfig = &sts[1]->hTcxCfg->tnsConfig[sts[1]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[1]->last_core == ACELP_CORE )];
-
-                    FOR( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                    {
-                        STnsFilter *pFilter[2];
-                        struct TnsParameters const *pTnsParameters[2];
-                        pFilter[0] = sts[0]->hTcxEnc->tnsData[k].filter + iFilter;
-                        pTnsParameters[0] = sts[0]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
-                        pFilter[1] = sts[1]->hTcxEnc->tnsData[k].filter + iFilter;
-                        pTnsParameters[1] = sts[1]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
-
-                        /* if prediction gain and avgSqrCoef are both close we are pretty sure the filters are quite similar, use the avg of
-                         * both filters for the decision
-                         */
-
-                        meanPredictionGain_fx = mac_r( L_mult( pFilter[0]->predictionGain, 16384 /*0.5f Q15*/ ), pFilter[1]->predictionGain, 16384 /*0.5f Q15*/ ); // Q7
-                        maxPredictionGain_fx = s_max( maxPredictionGain_fx, meanPredictionGain_fx );                                                               // Q7
-
-                        test();
-                        test();
-                        test();
-                        IF( GT_16( pFilter[0]->predictionGain, pTnsParameters[0]->minPredictionGain ) && LT_32( sts[0]->element_brate, IVAS_80k ) &&
-                            GT_16( pFilter[1]->predictionGain, pTnsParameters[1]->minPredictionGain ) && EQ_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) )
-                        {
-                            pFilter[0]->predictionGain = pFilter[1]->predictionGain = meanPredictionGain_fx; /* more TNS filter sync at 48kbps */
-                            move16();
-                            move16();
-                        }
-                        test();
-                        IF( LT_16( abs_s( sub( pFilter[0]->predictionGain, pFilter[1]->predictionGain ) ), mult( SIMILAR_TNS_THRESHOLD_FX_IN_Q15, meanPredictionGain_fx ) ) &&
-                            ( EQ_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) ) )
-                        {
-
-                            Word16 maxAvgSqrCoef_fx = s_max( pFilter[0]->avgSqrCoef, pFilter[1]->avgSqrCoef ); // Q15
-                            Word16 meanLtpGain_fx = add( shr( sts[0]->hTcxEnc->tcxltp_gain, 1 ), shr( sts[1]->hTcxEnc->tcxltp_gain, 1 ) );
-                            maxPredGain_fx = s_max( maxPredGain_fx, meanPredictionGain_fx );
-                            test();
-                            test();
-                            IF( GT_16( meanPredictionGain_fx, pTnsParameters[0]->minPredictionGain ) || GT_16( maxAvgSqrCoef_fx, pTnsParameters[0]->minAvgSqrCoef ) )
-                            {
-                                test();
-                                test();
-                                test();
-                                IF( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 || sts[1]->hTcxEnc->tnsData[k].nFilters > 0 || isTCX10 || LT_16( meanLtpGain_fx, 19660 /* 0.6 in Q15*/ ) )
-                                {
-
-                                    sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                    move16();
-                                    /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
-                                    this may result in crash later. Changing the filter type here so the order is taken here in further section */
-                                    IF( pFilter[0]->order != 0 )
-                                    {
-                                        pFilter[0]->filterType = TNS_FILTER_ON;
-                                        move16();
-                                    }
-                                    ELSE
-                                    {
-                                        pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
-                                        move16();
-                                    }
-                                    sts[1]->hTcxEnc->tnsData[k].nFilters = add( sts[1]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                    move16();
-                                    IF( pFilter[1]->order != 0 )
-                                    {
-                                        pFilter[1]->filterType = TNS_FILTER_ON;
-                                        move16();
-                                    }
-                                    ELSE
-                                    {
-                                        pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
-                                        move16();
-                                    }
-                                }
-                                ELSE
-                                {
-                                    Word16 maxEnergyChange_fx;
-                                    maxEnergyChange_fx = mac_r( L_mult( GetTCXMaxenergyChange_ivas_fx( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 ), GetTCXMaxenergyChange_ivas_fx( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 );
-
-                                    IF( GE_16( maxEnergyChange_fx, pTnsParameters[0]->minEnergyChange ) )
-                                    {
-                                        sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                        move16();
-                                        /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
-                                        this may result in crash later. Changing the filter type here so the order is taken here in further section */
-                                        IF( pFilter[0]->order != 0 )
-                                        {
-                                            pFilter[0]->filterType = TNS_FILTER_ON;
-                                            move16();
-                                        }
-                                        ELSE
-                                        {
-                                            pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
-                                            move16();
-                                        }
-                                        sts[1]->hTcxEnc->tnsData[k].nFilters = add( sts[1]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                        move16();
-                                        IF( pFilter[1]->order != 0 )
-                                        {
-                                            pFilter[1]->filterType = TNS_FILTER_ON;
-                                            move16();
-                                        }
-                                        ELSE
-                                        {
-                                            pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
-                                            move16();
-                                        }
-                                    }
-                                    ELSE
-                                    {
-                                        pFilter[0]->filterType = TNS_FILTER_OFF;
-                                        move16();
-                                        pFilter[1]->filterType = TNS_FILTER_OFF;
-                                        move16();
-                                    }
-                                }
-                            }
-                            ELSE IF( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 && sts[1]->hTcxEnc->tnsData[k].nFilters > 0 ) /* If a previous filter is turned on */
-                            {
-                                pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
-                                pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
-                                move16();
-                                move16();
-                                sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                move16();
-                                sts[1]->hTcxEnc->tnsData[k].nFilters = add( sts[1]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                move16();
-                            }
-                            ELSE IF( NE_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) ) /* sanity check */
-                            {
-                                assert( 0 );
-                            }
-                            ELSE
-                            {
-                                pFilter[0]->filterType = TNS_FILTER_OFF;
-                                move16();
-                                pFilter[1]->filterType = TNS_FILTER_OFF;
-                                move16();
-                            }
-
-                            test();
-                            test();
-                            IF( EQ_16( pFilter[0]->filterType, TNS_FILTER_ON ) && EQ_16( pFilter[1]->filterType, TNS_FILTER_ON ) && LT_32( sts[0]->element_brate, IVAS_80k ) )
-                            {
-                                Word16 tmpIntValue = 0;
-                                move16();
-                                Word16 tmpCoeff[TNS_MAX_FILTER_ORDER];
-                                Word16 i, maxOrder = s_max( pFilter[0]->order, pFilter[1]->order );
-
-                                set16_fx( tmpCoeff, 0, TNS_MAX_FILTER_ORDER );
-                                FOR( i = 0; i < maxOrder; i++ )
-                                {
-                                    tmpIntValue = s_max( tmpIntValue, abs_s( sub( pFilter[0]->coefIndex[i], pFilter[1]->coefIndex[i] ) ) );
-                                }
-
-                                IF( EQ_16( tmpIntValue, 1 ) ) /* the TNS coefficients are sufficiently similar to equalize the two filters */
-                                {
-                                    FOR( i = maxOrder - 1; i >= 0; i-- )
-                                    {
-                                        IF( LT_16( abs_s( pFilter[0]->coefIndex[i] ), abs_s( pFilter[1]->coefIndex[i] ) ) )
-                                        {
-                                            tmpCoeff[i] = pFilter[0]->coefIndex[i];
-                                        }
-                                        ELSE
-                                        {
-                                            tmpCoeff[i] = pFilter[1]->coefIndex[i];
-                                        }
-                                        move16();
-                                        IF( ( tmpIntValue > 0 ) && ( tmpCoeff[i] == 0 ) )
-                                        {
-                                            maxOrder = sub( maxOrder, 1 );
-                                        }
-                                        ELSE
-                                        {
-                                            tmpIntValue = 0;
-                                            move16();
-                                        }
-                                    }
-                                    /* make sure that maxOrder is non zero and not all coefficients are zero (could happen in rare cases) */
-                                    IF( maxOrder > 0 )
-                                    {
-                                        FOR( i = TNS_MAX_FILTER_ORDER - 1; i >= 0; i-- )
-                                        {
-                                            pFilter[0]->coefIndex[i] = pFilter[1]->coefIndex[i] = tmpCoeff[i];
-                                            move16();
-                                            move16();
-                                        }
-
-                                        pFilter[0]->order = pFilter[1]->order = maxOrder;
-                                        move16();
-                                        move16();
-                                    }
-                                }
-                            }
-                        }
-                        ELSE
-                        {
-                            individual_decision[k] = 1;
-                            move16();
-                        }
-                    }
-
-                    IF( individual_decision[k] == 0 )
-                    {
-                        IF( ( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 ) )
-                        {
-                            sts[0]->hTcxEnc->fUseTns[k] = 1;
-                        }
-                        ELSE
-                        {
-                            sts[0]->hTcxEnc->fUseTns[k] = 0;
-                        }
-                        move16();
-
-                        IF( ( sts[1]->hTcxEnc->tnsData[k].nFilters > 0 ) )
-                        {
-                            sts[1]->hTcxEnc->fUseTns[k] = 1;
-                        }
-                        ELSE
-                        {
-                            sts[1]->hTcxEnc->fUseTns[k] = 0;
-                        }
-                        move16();
-                    }
-                    ELSE
-                    {
-                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;
-                        move16();
-                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;
-                        move16();
-                        sts[0]->hTcxEnc->fUseTns[k] = 0;
-                        move16();
-                        sts[1]->hTcxEnc->fUseTns[k] = 0;
-                        move16();
-                        FOR( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                        {
-                            sts[0]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
-                            move16();
-                            sts[1]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
-                            move16();
-                        }
-                    }
-                    test();
-                    test();
-                    test();
-                    IF( !bWhitenedDomain && individual_decision[k] == 0 && LT_16( maxPredGain_fx, TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q7 ) && NE_16( sts[0]->hTcxEnc->transform_type[k], TCX_5 ) )
-                    {
-                        sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
-                        move16();
-                        sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
-                        move16();
-                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;
-                        move16();
-                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;
-                        move16();
-                        sts[0]->hTcxEnc->fUseTns[k] = 0;
-                        move16();
-                        sts[1]->hTcxEnc->fUseTns[k] = 0;
-                        move16();
-                        FOR( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                        {
-                            ClearTnsFilterCoefficients( sts[0]->hTcxEnc->tnsData[k].filter + iFilter );
-                            ClearTnsFilterCoefficients( sts[1]->hTcxEnc->tnsData[k].filter + iFilter );
-                        }
-                    }
-                    maxPredictionGain_fx = s_max( maxPredictionGain_fx, maxPredGain_fx );
-                }
-            }
-        }
-    }
-
-    /* individual decision for each channel */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        IF( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
-        {
-            CONTINUE;
-        }
-
-        Word8 isTCX10;
-
-        IF( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
-        {
-            nSubframes = 1;
-            isTCX10 = 0;
-        }
-        ELSE
-        {
-            nSubframes = NB_DIV;
-            isTCX10 = 1;
-        }
-        move16();
-        move16();
-
-        FOR( k = 0; k < nSubframes; k++ )
-        {
-            test();
-            test();
-            test();
-            test();
-            IF( sts[ch]->hTcxCfg->fIsTNSAllowed && ( individual_decision[k] || mct_on ) &&
-                ( !bWhitenedDomain || sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-            {
-                Word16 maxPredGain_fx = -ONE_IN_Q7; // Q7
-                move16();
-                sts[ch]->hTcxCfg->pCurrentTnsConfig = &sts[ch]->hTcxCfg->tnsConfig[sts[ch]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[ch]->last_core == ACELP_CORE )];
-
-                FOR( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                {
-                    STnsFilter *pFilter;
-                    struct TnsParameters const *pTnsParameters;
-                    pFilter = sts[ch]->hTcxEnc->tnsData[k].filter + iFilter;
-                    pTnsParameters = sts[ch]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
-
-                    maxPredGain_fx = s_max( maxPredGain_fx, pFilter->predictionGain );
-                    test();
-                    IF( GT_16( pFilter->predictionGain, pTnsParameters->minPredictionGain ) || GT_16( pFilter->avgSqrCoef, pTnsParameters->minAvgSqrCoef ) )
-                    {
-                        test();
-                        test();
-                        IF( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 || isTCX10 || LT_16( sts[ch]->hTcxEnc->tcxltp_gain, 19660 /*.6f in Q15*/ ) )
-                        {
-                            sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
-                            move16();
-                            /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
-                            this may result in crash later. Changing the filter type here so the order is taken here in further section */
-                            IF( pFilter->order != 0 )
-                            {
-                                pFilter->filterType = TNS_FILTER_ON;
-                                move16();
-                            }
-                            ELSE
-                            {
-                                pFilter->filterType = TNS_FILTER_ON_ZERO;
-                                move16();
-                            }
-                        }
-                        ELSE
-                        {
-                            Word16 maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3 );
-
-                            IF( GE_16( maxEnergyChange_fx, pTnsParameters->minEnergyChange ) )
-                            {
-                                sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
-                                move16();
-                                /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
-                                this may result in crash later. Changing the filter type here so the order is taken here in further section */
-                                IF( pFilter->order != 0 )
-                                {
-                                    pFilter->filterType = TNS_FILTER_ON;
-                                    move16();
-                                }
-                                ELSE
-                                {
-                                    pFilter->filterType = TNS_FILTER_ON_ZERO;
-                                    move16();
-                                }
-                            }
-                            ELSE
-                            {
-                                pFilter->filterType = TNS_FILTER_OFF;
-                                move16();
-                            }
-                        }
-                    }
-                    ELSE IF( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 ) /* If a previous filter is turned on */
-                    {
-                        pFilter->filterType = TNS_FILTER_ON_ZERO;
-                        move16();
-                        sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
-                        move16();
-                    }
-                    ELSE
-                    {
-                        pFilter->filterType = TNS_FILTER_OFF;
-                        move16();
-                    }
-                }
-
-                IF( ( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 ) )
-                {
-                    sts[ch]->hTcxEnc->fUseTns[k] = 1;
-                }
-                ELSE
-                {
-                    sts[ch]->hTcxEnc->fUseTns[k] = 0;
-                }
-                move16();
-                test();
-                test();
-                IF( !bWhitenedDomain && LT_16( maxPredGain_fx, TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q7 ) && NE_16( sts[ch]->hTcxEnc->transform_type[k], TCX_5 ) )
-                {
-                    sts[ch]->hTcxEnc->fUseTns[k] = 0;
-                    move16();
-                    sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
-                    move16();
-                    sts[ch]->hTcxEnc->tnsData[k].nFilters = 0;
-                    move16();
-                    FOR( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                    {
-                        ClearTnsFilterCoefficients( sts[ch]->hTcxEnc->tnsData[k].filter + iFilter );
-                        sts[ch]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
-                        move16();
-                    }
-                }
-                maxPredictionGain_fx = s_max( maxPredictionGain_fx, maxPredGain_fx );
-            }
-        }
-    }
-
-
-    /* we have the decision, set filter data accordingly */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        IF( EQ_16( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
-        {
-            CONTINUE;
-        }
-
-        IF( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
-        {
-            nSubframes = 1;
-        }
-        ELSE
-        {
-            nSubframes = NB_DIV;
-        }
-        move16();
-        FOR( k = 0; k < nSubframes; k++ )
-        {
-            test();
-            test();
-            IF( sts[ch]->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-            {
-                sts[ch]->hTcxCfg->pCurrentTnsConfig = &sts[ch]->hTcxCfg->tnsConfig[sts[ch]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[ch]->last_core == ACELP_CORE )];
-
-                FOR( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                {
-                    STnsFilter *pFilter;
-                    pFilter = sts[ch]->hTcxEnc->tnsData[k].filter + iFilter;
-                    SWITCH( pFilter->filterType )
-                    {
-                        case TNS_FILTER_OFF:
-                            ClearTnsFilterCoefficients( sts[ch]->hTcxEnc->tnsData[k].filter + iFilter );
-                            BREAK;
-                        case TNS_FILTER_ON_ZERO:
-                            /* Since TNS filter of order 0 is not allowed we have to signal in the stream filter of order 1 with the 0th coefficient equal to 0 */
-                            ClearTnsFilterCoefficients( pFilter );
-                            pFilter->order = 1;
-                            move16();
-                            BREAK;
-                    }
-                }
-            }
-        }
-    }
-
-    /* Apply filters, loop over channels */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        st = sts[ch];
-        IF( EQ_32( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
-        {
-            CONTINUE;
-        }
-
-        IF( EQ_16( st->hTcxEnc->tcxMode, TCX_20 ) )
-        {
-            nSubframes = 1;
-        }
-        ELSE
-        {
-            nSubframes = NB_DIV;
-        }
-        move16();
-
-        FOR( k = 0; k < nSubframes; k++ )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( bWhitenedDomain && ( ch > 0 ) && /* test for identical TNS filter data in both channels */
-                sts[0]->hTcxCfg->fIsTNSAllowed && sts[0]->hTcxEnc->fUseTns[k] &&
-                sts[1]->hTcxCfg->fIsTNSAllowed && sts[1]->hTcxEnc->fUseTns[k] )
-            {
-                Word16 equalFilterData = 0;
-                move16();
-                test();
-                test();
-                if ( EQ_16( sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters, sts[1]->hTcxCfg->pCurrentTnsConfig->nMaxFilters ) &&
-                     EQ_16( sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k], sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) &&
-                     EQ_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) )
-                {
-                    equalFilterData = 1;
-                    move16();
-                }
-
-                IF( equalFilterData )
-                {
-                    FOR( iFilter = st->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                    {
-                        const Word16 *pDataCh0 = (const Word16 *) &sts[0]->hTcxEnc->tnsData[k].filter[iFilter];
-                        const Word16 *pDataCh1 = (const Word16 *) &sts[1]->hTcxEnc->tnsData[k].filter[iFilter];
-                        Word16 i = 2 + TNS_MAX_FILTER_ORDER; /* excl. informative float data. Portable? */
-
-                        move16();
-                        test();
-                        WHILE( ( i >= 0 ) && EQ_16( pDataCh0[i], pDataCh1[i] ) )
-                        {
-                            test();
-                            i = sub( i, 1 );
-                        }
-                        IF( i >= 0 )
-                        {
-                            equalFilterData = 0;
-                            move16();
-                            BREAK;
-                        }
-                    }
-                    IF( equalFilterData )
-                    {
-                        st->hTcxEnc->tnsData[k].nFilters = i_mult( st->hTcxEnc->tnsData[k].nFilters, -1 ); /* signals common TNS */
-                        move16();
-                    }
-                }
-            }
-            test();
-            test();
-            IF( st->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || st->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-            {
-                L_spec = st->hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
-                move16();
-                spectrum_fx = st->hTcxEnc->spectrum_fx[k];
-                /* If TNS should be used then get the residual after applying it inplace in the spectrum */
-                IF( st->hTcxEnc->fUseTns[k] )
-                {
-                    st->hTcxCfg->pCurrentTnsConfig = &st->hTcxCfg->tnsConfig[st->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( st->last_core == ACELP_CORE )];
-
-                    ApplyTnsFilter( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], spectrum_fx, 1 );
-                }
-
-                IF( EQ_16( st->hTcxEnc->transform_type[k], TCX_5 ) )
-                {
-                    tcx5TnsUngrouping_fx( shr( L_frame, 2 ), shr( L_spec, 1 ), st->hTcxEnc->spectrum_fx[k], ENC );
-                }
-
-                st->hTcxEnc->tnsData[k].tnsOnWhitenedSpectra = st->hTcxEnc->bTnsOnWhithenedSpectra[k];
-                move16();
-                EncodeTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );
-            }
-
-            IF( EQ_16( st->hTcxEnc->transform_type[k], TCX_5 ) )
-            {
-                tcx5SpectrumInterleaving_fx( st->hTcxCfg->tcx5SizeFB, st->hTcxEnc->spectrum_fx[k] );
-                tcx5SpectrumInterleaving_fx( st->hTcxCfg->tcx5SizeFB, mdst_spectrum_fx[ch][k] );
-            }
-        }
-    }
-    return;
-}
diff --git a/lib_enc/cod_tcx_fx.c b/lib_enc/cod_tcx_fx.c
index ea0468587fe90c936f4a5f3acc203d2befc2b087..c40db66789c9f646ee7fb3a82c6ef5e8e6cdc0a5 100644
--- a/lib_enc/cod_tcx_fx.c
+++ b/lib_enc/cod_tcx_fx.c
@@ -14,18 +14,16 @@
 #include "stl.h"
 // #include "basop_mpy.h"
 #include "prot_fx_enc.h"
-#ifdef IVAS_FLOAT_FIXED_CONVERSIONS
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
-#include "prot.h"
-#endif
 #ifdef DEBUGGING
 #include "debug.h"
 #endif
 
+#define SIMILAR_TNS_THRESHOLD_FX_IN_Q15        ( 1311 )
+#define TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q7  ( 384 )
+#define TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q23 ( 25165824 )
 
 /* Up to the Autocorrelation it is the same code as in GetMDCT, with the difference in the parameters in the call to tcx_windowing_analysis */
 void HBAutocorrelation_fx(
@@ -69,11 +67,7 @@ void HBAutocorrelation_fx(
     FOR( i = 0; i < len; i += 1 )
     {
         /* Test Addition */
-#ifdef BASOP_NOGLOB /* Critical Overflow, all operations below needs to check for Overflow if we want to ensure bit exactness */
         L_mac0_o( L_sum, y[i], y[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-        L_mac0( L_sum, y[i], y[i] );
-#endif /* BASOP_NOGLOB */
         IF( Overflow )
         {
             Overflow = 0;
@@ -82,53 +76,29 @@ void HBAutocorrelation_fx(
             move16();
             L_tmp = L_msu0( 0, y[i], y[i] );
             L_tmp = L_shr( L_tmp, 1 );
-#ifdef BASOP_NOGLOB /* Only the sub can overflow if the current L_sum is negative and already close to MIN */
             L_sum = L_add( L_shr( L_sub_o( L_sum, 1, &Overflow ), 1 ), 1 );
-#else
-            L_sum = L_add( L_shr( L_sub( L_sum, 1 ), 1 ), 1 );
-#endif
-#ifdef BASOP_NOGLOB /* Critical Overflow */
             L_sum = L_sub_o( L_sum, L_tmp, &Overflow );
-#else
-            L_sum = L_sub( L_sum, L_tmp );
-#endif
             FOR( j = i + 1; j < len; j++ )
             {
                 L_tmp = L_msu0( 0, y[j], y[j] );
                 L_tmp = L_shr( L_tmp, shift );
 
                 /* Test Addition */
-#ifdef BASOP_NOGLOB /* Critical Overflow */
                 L_sub_o( L_sum, L_tmp, &Overflow );
-#else  /* BASOP_NOGLOB */
-                L_sub( L_sum, L_tmp );
-#endif /* BASOP_NOGLOB */
                 IF( Overflow )
                 {
                     Overflow = 0;
                     move32();
                     shift = add( shift, 1 );
                     L_tmp = L_shr( L_tmp, 1 );
-#ifdef BASOP_NOGLOB /* Critical Overflow */
                     L_sum = L_add( L_shr( L_sub_o( L_sum, 1, &Overflow ), 1 ), 1 );
-#else
-                    L_sum = L_add( L_shr( L_sub( L_sum, 1 ), 1 ), 1 );
-#endif
                 }
-#ifdef BASOP_NOGLOB /* Critical Overflow */
                 L_sum = L_sub_o( L_sum, L_tmp, &Overflow );
-#else
-                L_sum = L_sub( L_sum, L_tmp );
-#endif
             }
             BREAK;
         }
         /* Perform Addition */
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         L_sum = L_mac0_o( L_sum, y[i], y[i], &Overflow );
-#else
-        L_sum = L_mac0( L_sum, y[i], y[i] );
-#endif
     }
 
     /* scale signal to avoid overflow in autocorrelation */
@@ -168,676 +138,447 @@ void HBAutocorrelation_fx(
         move32();
     }
 }
-#ifdef ADD_IVAS_TNS
-
-/*-------------------------------------------------------------------*
- * TNSAnalysisStereo()
- *
- *
- *-------------------------------------------------------------------*/
 
-#define SIMILAR_TNS_THRESHOLD        ( 0.04f )
-#define TNS_GAIN_THRESHOLD_FOR_WHITE ( 3.0f )
-
-void TNSAnalysisStereo(
-    Encoder_State **sts,                            /* i  : encoder state handle                    */
-    float *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* o  : MDST spectrum                           */
-    const int16_t bWhitenedDomain,                  /* i  : whitened domain flag                    */
-    int16_t tnsSize[MCT_MAX_CHANNELS][NB_DIV],      /* i  : number of tns parameters put into prm   */
-    int16_t tnsBits[MCT_MAX_CHANNELS][NB_DIV],      /* i  : number of tns bits in the frame         */
-    int16_t param_core[][NB_DIV * NPRM_DIV],        /* o  : TNS parameters                          */
-    const int16_t mct_on                            /* i  : flag mct block (1) or stereo (0)          */
+void TNSAnalysis_fx(
+    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
+    Word16 L_frame,            /* input: frame length */
+    Word16 L_spec,
+    Word16 tcxMode,        /* input: TCX mode for the frame/subframe - TCX20 | TCX10 | TCX 5 (meaning 2 x TCX 5) */
+    Word8 isAfterACELP,    /* input: Flag indicating if the last frame was ACELP. For the second TCX subframe it should be 0  */
+    Word32 spectrum[],     /* input: MDCT spectrum  Qx*/
+    STnsData *pTnsData,    /* output: Tns data */
+    Word8 *pfUseTns,       /* output: Flag indicating if TNS is used */
+    Word16 *predictionGain /*Q7*/
 )
 {
-    int16_t ch, k, L_spec, L_frame, nSubframes, iFilter;
-    float *spectrum;
-    Encoder_State *st = NULL;
-    TCX_ENC_HANDLE hTcxEnc = NULL;
-    int16_t individual_decision[NB_DIV];
-    float maxPredictionGain = 0.f, meanPredictionGain;
+    Word32 buff[8];
+    Word16 tmp = 0;  /* initialization only to avoid compiler warning, not counted */
+    Word16 tmp2 = 0; /* initialization only to avoid compiler warning, not counted */
+    move16();
+    move16();
 
-    individual_decision[0] = 0;
-    individual_decision[1] = 0;
-    L_spec = -1;
-    L_frame = -1;
+    /* Init TNS */
+    *pfUseTns = 0;
+    move16();
 
-    /* TNS filter analysis, loop over channels */
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    IF( hTcxCfg->fIsTNSAllowed != 0 )
     {
-        st = sts[ch];
-        if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+        hTcxCfg->pCurrentTnsConfig = &hTcxCfg->tnsConfig[( tcxMode - TCX_20 ) == 0][isAfterACELP];
+        L_spec = hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
+        move16();
+
+        /*-----------------------------------------------------------*
+         * Temporal Noise Shaping analysis                           *
+         *-----------------------------------------------------------*/
+
+        IF( EQ_16( tcxMode, TCX_5 ) )
         {
-            continue;
+            tmp = shr( L_frame, 2 );
+
+            /* rearrange LF sub-window lines prior to TNS analysis & filtering */
+            tmp2 = shr( L_spec, 1 );
+
+            IF( LT_16( tmp2, tmp ) )
+            {
+                Copy32( spectrum + 8, spectrum + 16, sub( tmp2, 8 ) );
+                Copy32( spectrum + tmp, spectrum + 8, 8 );
+                Copy32( spectrum + tmp + 8, spectrum + tmp2 + 8, sub( tmp2, 8 ) );
+            }
+            ELSE
+            {
+                Copy32( spectrum + tmp, buff, 8 );
+                Copy32( spectrum + 8, spectrum + 16, sub( tmp, 8 ) );
+                Copy32( buff, spectrum + 8, 8 );
+            }
         }
 
-        hTcxEnc = st->hTcxEnc;
+        move16();
+        *pfUseTns = (Word8) DetectTnsFilt_fx( hTcxCfg->pCurrentTnsConfig, spectrum, pTnsData, predictionGain );
 
-        nSubframes = ( hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
+        /* If TNS should be used then get the residual after applying it inplace in spectrum */
+        IF( *pfUseTns != 0 )
+        {
+            ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, pTnsData, spectrum, 1 );
+        }
 
-        for ( k = 0; k < nSubframes; k++ )
+        IF( EQ_16( tcxMode, TCX_5 ) )
         {
-            /* reset tns on whitened domain flag */
-            if ( !bWhitenedDomain )
+            /* undo rearrangement of LF sub-window lines prior to TNS analysis */
+            IF( LT_16( tmp2, tmp ) )
             {
-                hTcxEnc->bTnsOnWhithenedSpectra[k] = 0;
-                hTcxEnc->fUseTns[k] = 0;
+                Copy32( spectrum + tmp2 + 8, spectrum + tmp + 8, sub( tmp2, 8 ) );
+                Copy32( spectrum + 8, spectrum + tmp, 8 );
+                Copy32( spectrum + 16, spectrum + 8, sub( tmp2, 8 ) );
+                set32_fx( spectrum + tmp2, 0, sub( tmp, tmp2 ) );
+                set32_fx( spectrum + tmp + tmp2, 0, sub( tmp, tmp2 ) );
             }
-
-            if ( st->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+            ELSE
             {
+                Copy32( spectrum + 8, buff, 8 );
+                Copy32( spectrum + 16, spectrum + 8, sub( tmp, 8 ) );
+                Copy32( buff, spectrum + tmp, 8 );
+            }
+        }
+    }
+}
 
-                spectrum = hTcxEnc->spectrum[k];
-                L_frame = hTcxEnc->L_frameTCX;
-                st->hTcxCfg->pCurrentTnsConfig = &st->hTcxCfg->tnsConfig[hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( st->last_core == ACELP_CORE )];
-                L_spec = st->hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
+void TNSAnalysis_ivas_fx(
+    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
+    Word16 L_frame,            /* i  : frame length */
+    Word16 L_spec,             /* i  : length of the spectrum                                                                  */
+    Word16 transform_type,     /* i  : transform type for the frame/subframe - TCX20 | TCX10 | TCX 5 (meaning 2 x TCX 5)	*/
+    Word8 isAfterACELP,        /* i  : Flag indicating if the last frame was ACELP. For the second TCX subframe it should be 0  */
+    Word32 spectrum[],         /* i  : MDCT spectrum  Q=Qx*/
+    TRAN_DET_HANDLE hTranDet,  /* i  : handle transient detection                                                              */
+    Word16 ltp_gain,           /* i  : ltp gain  Q=15*/
+    STnsData *pTnsData,        /* o  : Tns data */
+    Word8 *pfUseTns,           /* o  : Flag indicating if TNS is used */
+    Word16 *predictionGain     /* o  : TNS prediction gain	Q=7	 */
+)
+{
+    Word32 buff[8];
+    Word16 tmp = 0;  /* initialization only to avoid compiler warning, not counted */
+    Word16 tmp2 = 0; /* initialization only to avoid compiler warning, not counted */
+    move16();
+    move16();
 
-                /*-----------------------------------------------------------*
-                 * Temporal Noise Shaping analysis                           *
-                 *-----------------------------------------------------------*/
+    /* Init TNS */
+    *pfUseTns = 0;
+    move16();
 
-                if ( hTcxEnc->transform_type[k] == TCX_5 )
-                {
-                    /* rearrange LF sub-window lines prior to TNS analysis & filtering */
-                    tcx5TnsGrouping( L_frame >> 2, L_spec >> 1, spectrum );
-                }
+    IF( hTcxCfg->fIsTNSAllowed != 0 )
+    {
+        hTcxCfg->pCurrentTnsConfig = &hTcxCfg->tnsConfig[( transform_type - TCX_20 ) == 0][isAfterACELP];
+        L_spec = hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
+        move16();
 
-                /* WMOPS: All initializations are either for safety or static (tables) and thus not to be counted */
-                ResetTnsData( &hTcxEnc->tnsData[k] );
-                if ( st->hTcxCfg->pCurrentTnsConfig->maxOrder <= 0 )
-                {
-                    break;
-                }
+        /*-----------------------------------------------------------*
+         * Temporal Noise Shaping analysis                           *
+         *-----------------------------------------------------------*/
+
+        IF( EQ_16( transform_type, TCX_5 ) )
+        {
+            tmp = shr( L_frame, 2 );
+
+            /* rearrange LF sub-window lines prior to TNS analysis & filtering */
+            tmp2 = shr( L_spec, 1 );
 
-                CalculateTnsFilt( st->hTcxCfg->pCurrentTnsConfig, spectrum, &hTcxEnc->tnsData[k], NULL );
+            IF( LT_16( tmp2, tmp ) )
+            {
+                Copy32( spectrum + 8, spectrum + 16, sub( tmp2, 8 ) );
+                Copy32( spectrum + tmp, spectrum + 8, 8 );
+                Copy32( spectrum + tmp + 8, spectrum + tmp2 + 8, sub( tmp2, 8 ) );
+            }
+            ELSE
+            {
+                Copy32( spectrum + tmp, buff, 8 );
+                Copy32( spectrum + 8, spectrum + 16, sub( tmp, 8 ) );
+                Copy32( buff, spectrum + 8, 8 );
             }
         }
-    }
 
-    if ( !mct_on )
-    {
-        /* TNS decision */
-        /* if framing differs between channels, keep the filter decision per channel */
-        if ( ( sts[0]->hTcxEnc->transform_type[0] != sts[1]->hTcxEnc->transform_type[0] &&
-               sts[0]->hTcxEnc->transform_type[1] != sts[1]->hTcxEnc->transform_type[1] ) ||
-             sts[0]->hTcxCfg->fIsTNSAllowed != sts[1]->hTcxCfg->fIsTNSAllowed )
+        move16();
+        *pfUseTns = (Word8) DetectTnsFilt_ivas_fx( hTcxCfg->pCurrentTnsConfig, spectrum, pTnsData, hTranDet, (Word8) NE_16( transform_type, TCX_20 ), ltp_gain, predictionGain );
+
+        /* If TNS should be used then get the residual after applying it inplace in spectrum */
+        IF( *pfUseTns != 0 )
         {
-            individual_decision[0] = individual_decision[1] = 1;
+            ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, pTnsData, spectrum, 1 );
         }
-        else if ( bWhitenedDomain )
+
+        IF( EQ_16( transform_type, TCX_5 ) )
         {
-            nSubframes = ( sts[0]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
-            for ( k = 0; k < nSubframes; k++ )
+            /* undo rearrangement of LF sub-window lines prior to TNS analysis */
+            IF( LT_16( tmp2, tmp ) )
             {
-                if ( sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] != sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] )
-                {
-                    individual_decision[k] = 1;
-                }
+                Copy32( spectrum + tmp2 + 8, spectrum + tmp + 8, sub( tmp2, 8 ) );
+                Copy32( spectrum + 8, spectrum + tmp, 8 );
+                Copy32( spectrum + 16, spectrum + 8, sub( tmp2, 8 ) );
+                set32_fx( spectrum + tmp2, 0, sub( tmp, tmp2 ) );
+                set32_fx( spectrum + tmp + tmp2, 0, sub( tmp, tmp2 ) );
+            }
+            ELSE
+            {
+                Copy32( spectrum + 8, buff, 8 );
+                Copy32( spectrum + 16, spectrum + 8, sub( tmp, 8 ) );
+                Copy32( buff, spectrum + tmp, 8 );
             }
         }
+    }
+}
 
-        /* framing equal, check for similar filters, if very similar (also indicator for and M signal),
-         * use at least the same decision, maybe use the same filter
-         */
-        {
-            int16_t isTCX10;
-            isTCX10 = ( sts[0]->hTcxEnc->tcxMode == TCX_20 ) ? 0 : 1;
+void ShapeSpectrum_fx(
+    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
+    Word16 A[],                /* input: quantized coefficients NxAz_q[M+1]  Q = 14 - norm(A[0])*/
+    Word16 gainlpc[],          /* output: MDCT gains for the previous frame Q(15-gainlpc_e)*/
+    Word16 gainlpc_e[],        /* output: MDCT gains exponents */
+    Word16 L_frame_glob,       /* input: frame length             */
+    Word16 L_spec,
+    Word32 spectrum[], /* i/o: MDCT spectrum */
+    Word8 pfUseTns,    /* output: Flag indicating if TNS is used */
+    Encoder_State *st )
+{
+    Word16 L_frame;
+    Word16 Ap[M + 2];
+    Word16 gamma1;
+    Word16 gainlpc_noinv[FDNS_NPTS];
+    Word16 gainlpc_noinv_e[FDNS_NPTS];
+    Word16 i;
+    Word32 max_low_pre = 0, max_high_pre = 0;
+    move32();
+    move32();
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
 
-            nSubframes = ( sts[0]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
+    /*-----------------------------------------------------------*
+     * Init                                                      *
+     *-----------------------------------------------------------*/
 
-            for ( k = 0; k < nSubframes; k++ )
-            {
-                if ( sts[0]->hTcxCfg->fIsTNSAllowed && individual_decision[k] != 1 && ( !bWhitenedDomain || sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-                {
-                    float maxPredGain = -1.0f;
-                    sts[0]->hTcxCfg->pCurrentTnsConfig = &sts[0]->hTcxCfg->tnsConfig[sts[0]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[0]->last_core == ACELP_CORE )];
-                    sts[1]->hTcxCfg->pCurrentTnsConfig = &sts[1]->hTcxCfg->tnsConfig[sts[1]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[1]->last_core == ACELP_CORE )];
+    /* Init lengths */
+    L_frame = L_frame_glob;
+    move16();
+    gamma1 = st->gamma;
+    move16();
+    if ( st->enableTcxLpc != 0 )
+    {
+        gamma1 = 0x7FFF;
+        move16();
+    }
 
-#ifdef DEBUGGING
-                    assert( sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters == sts[1]->hTcxCfg->pCurrentTnsConfig->nMaxFilters );
-#endif
-                    for ( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                    {
-                        STnsFilter *pFilter[2];
-                        struct TnsParameters const *pTnsParameters[2];
-                        pFilter[0] = sts[0]->hTcxEnc->tnsData[k].filter + iFilter;
-                        pTnsParameters[0] = sts[0]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
-                        pFilter[1] = sts[1]->hTcxEnc->tnsData[k].filter + iFilter;
-                        pTnsParameters[1] = sts[1]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
+    /* if past frame is ACELP */
 
-#ifdef DEBUGGING
-                        assert( pTnsParameters[0]->startLineFrequency == pTnsParameters[1]->startLineFrequency );
-                        assert( pTnsParameters[0]->nSubdivisions == pTnsParameters[1]->nSubdivisions );
-#endif
-                        /* if prediction gain and avgSqrCoef are both close we are pretty sure the filters are quite similar, use the avg of
-                         * both filters for the decision
-                         */
-                        meanPredictionGain = ( pFilter[0]->predictionGain + pFilter[1]->predictionGain ) * 0.5f;
-                        maxPredictionGain = max( maxPredictionGain, meanPredictionGain );
+    IF( st->last_core == ACELP_CORE )
+    {
+        L_frame = add( L_frame, hTcxCfg->tcx_offset );
+        L_spec = add( L_spec, shr( hTcxCfg->tcx_coded_lines, 2 ) );
+        if ( hTcxCfg->lfacNext < 0 )
+        {
+            L_frame = sub( L_frame, hTcxCfg->lfacNext );
+            move16();
+        }
+    }
 
-                        if ( ( pFilter[0]->predictionGain > pTnsParameters[0]->minPredictionGain ) && ( sts[0]->element_brate < IVAS_80k ) &&
-                             ( pFilter[1]->predictionGain > pTnsParameters[1]->minPredictionGain ) && ( sts[0]->hTcxEnc->tnsData[k].nFilters == sts[1]->hTcxEnc->tnsData[k].nFilters ) )
-                        {
-                            pFilter[0]->predictionGain = pFilter[1]->predictionGain = meanPredictionGain; /* more TNS filter sync at 48kbps */
-                        }
-                        if ( ( fabs( pFilter[0]->predictionGain - pFilter[1]->predictionGain ) < SIMILAR_TNS_THRESHOLD * meanPredictionGain ) &&
-                             ( sts[0]->hTcxEnc->tnsData[k].nFilters == sts[1]->hTcxEnc->tnsData[k].nFilters ) )
-                        {
-                            float maxAvgSqrCoef = max( pFilter[0]->avgSqrCoef, pFilter[1]->avgSqrCoef );
-                            float meanLtpGain = ( sts[0]->hTcxEnc->tcxltp_gain + sts[1]->hTcxEnc->tcxltp_gain ) * 0.5f;
-                            maxPredGain = max( maxPredGain, meanPredictionGain );
-                            if ( ( meanPredictionGain > pTnsParameters[0]->minPredictionGain ) || ( maxAvgSqrCoef > pTnsParameters[0]->minAvgSqrCoef ) )
-                            {
-                                if ( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 || sts[1]->hTcxEnc->tnsData[k].nFilters > 0 || isTCX10 || meanLtpGain < 0.6f )
-                                {
-                                    ++sts[0]->hTcxEnc->tnsData[k].nFilters;
-                                    pFilter[0]->filterType = TNS_FILTER_ON;
-                                    ++sts[1]->hTcxEnc->tnsData[k].nFilters;
-                                    pFilter[1]->filterType = TNS_FILTER_ON;
-                                }
-                                else
-                                {
-                                    const float maxEnergyChange = ( GetTCXMaxenergyChange( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3 ) + GetTCXMaxenergyChange( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3 ) ) * 0.5f;
-
-                                    if ( maxEnergyChange >= pTnsParameters[0]->minEnergyChange )
-                                    {
-                                        ++sts[0]->hTcxEnc->tnsData[k].nFilters;
-                                        pFilter[0]->filterType = TNS_FILTER_ON;
-                                        ++sts[1]->hTcxEnc->tnsData[k].nFilters;
-                                        pFilter[1]->filterType = TNS_FILTER_ON;
-                                    }
-                                    else
-                                    {
-                                        pFilter[0]->filterType = TNS_FILTER_OFF;
-                                        pFilter[1]->filterType = TNS_FILTER_OFF;
-                                    }
-                                }
-                            }
-                            else if ( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 && sts[1]->hTcxEnc->tnsData[k].nFilters > 0 ) /* If a previous filter is turned on */
-                            {
-                                pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
-                                pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
-                                ++sts[0]->hTcxEnc->tnsData[k].nFilters;
-                                ++sts[1]->hTcxEnc->tnsData[k].nFilters;
-                            }
-                            else if ( sts[0]->hTcxEnc->tnsData[k].nFilters != sts[1]->hTcxEnc->tnsData[k].nFilters ) /* sanity check */
-                            {
-                                assert( 0 );
-                            }
-                            else
-                            {
-                                pFilter[0]->filterType = TNS_FILTER_OFF;
-                                pFilter[1]->filterType = TNS_FILTER_OFF;
-                            }
-                            if ( ( pFilter[0]->filterType == TNS_FILTER_ON ) && ( pFilter[1]->filterType == TNS_FILTER_ON ) && ( sts[0]->element_brate < IVAS_80k ) )
-                            {
-                                int16_t tmpIntValue = 0;
-                                int16_t tmpCoeff[TNS_MAX_FILTER_ORDER];
-                                int16_t i, maxOrder = max( pFilter[0]->order, pFilter[1]->order );
-
-                                set_s( tmpCoeff, 0, TNS_MAX_FILTER_ORDER );
-                                for ( i = 0; i < maxOrder; i++ )
-                                {
-                                    tmpIntValue = (int16_t) max( tmpIntValue, abs( pFilter[0]->coefIndex[i] - pFilter[1]->coefIndex[i] ) );
-                                }
-                                if ( tmpIntValue == 1 ) /* the TNS coefficients are sufficiently similar to equalize the two filters */
-                                {
-                                    for ( i = maxOrder - 1; i >= 0; i-- )
-                                    {
-                                        tmpCoeff[i] = ( abs( pFilter[0]->coefIndex[i] ) < abs( pFilter[1]->coefIndex[i] ) ? pFilter[0]->coefIndex[i] : pFilter[1]->coefIndex[i] );
-                                        if ( ( tmpIntValue > 0 ) && ( tmpCoeff[i] == 0 ) )
-                                        {
-                                            maxOrder--;
-                                        }
-                                        else
-                                        {
-                                            tmpIntValue = 0;
-                                        }
-                                    }
-                                    /* make sure that maxOrder is non zero and not all coefficients are zero (could happen in rare cases) */
-                                    if ( maxOrder > 0 )
-                                    {
-                                        for ( i = TNS_MAX_FILTER_ORDER - 1; i >= 0; i-- )
-                                        {
-                                            pFilter[0]->coefIndex[i] = pFilter[1]->coefIndex[i] = tmpCoeff[i];
-                                        }
-
-                                        pFilter[0]->order = pFilter[1]->order = maxOrder;
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            individual_decision[k] = 1;
-                        }
-                    }
-
-                    if ( individual_decision[k] == 0 )
-                    {
-                        sts[0]->hTcxEnc->fUseTns[k] = ( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 ) ? 1 : 0;
-                        sts[1]->hTcxEnc->fUseTns[k] = ( sts[1]->hTcxEnc->tnsData[k].nFilters > 0 ) ? 1 : 0;
-                    }
-                    else
-                    {
-                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;
-                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;
-                        sts[0]->hTcxEnc->fUseTns[k] = 0;
-                        sts[1]->hTcxEnc->fUseTns[k] = 0;
-                        for ( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                        {
-                            sts[0]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
-                            sts[1]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
-                        }
-                    }
+    test();
+    tcxGetNoiseFillingTilt( A,
+                            M,
+                            L_frame,
+                            ( GE_32( st->total_brate, ACELP_13k20 ) && st->rf_mode == 0 ),
+                            &hTcxEnc->noiseTiltFactor );
 
-                    if ( !bWhitenedDomain && individual_decision[k] == 0 && maxPredGain < TNS_GAIN_THRESHOLD_FOR_WHITE && sts[0]->hTcxEnc->transform_type[k] != TCX_5 )
-                    {
-                        sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
-                        sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
-                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;
-                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;
-                        sts[0]->hTcxEnc->fUseTns[k] = 0;
-                        sts[1]->hTcxEnc->fUseTns[k] = 0;
-                        for ( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                        {
-                            ClearTnsFilterCoefficients( sts[0]->hTcxEnc->tnsData[k].filter + iFilter );
-                            ClearTnsFilterCoefficients( sts[1]->hTcxEnc->tnsData[k].filter + iFilter );
-                        }
-                    }
-                    maxPredictionGain = max( maxPredictionGain, maxPredGain );
-                }
-            }
-        }
+    /* Calculate Spectrum Flatness Measure for the TCX Concealment */
+    IF( st->enablePlcWaveadjust )
+    {
+        hTcxCfg->SFM2 = SFM_Cal_fx( spectrum, s_min( 200, L_frame ) );
+        move32();
     }
 
-    /* individual decision for each channel */
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    test();
+    test();
+    test();
+    IF( ( EQ_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->bwidth, SWB ) ) ||
+        ( EQ_32( st->total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) ) )
     {
-        if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+        max_low_pre = 0;
+        move32();
+        FOR( i = 0; i < L_frame; i++ )
         {
-            continue;
+            Word32 tmp = L_abs( spectrum[i] );
+            if ( GT_32( tmp, max_low_pre ) )
+            {
+                max_low_pre = tmp;
+                move32();
+            }
         }
 
-        int16_t isTCX10;
-        isTCX10 = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 0 : 1;
-
-        nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
-
-        for ( k = 0; k < nSubframes; k++ )
+        max_high_pre = 0;
+        move32();
+        FOR( i = 0; i < L_spec - L_frame; i++ )
         {
-            if ( sts[ch]->hTcxCfg->fIsTNSAllowed && ( individual_decision[k] || mct_on ) &&
-                 ( !bWhitenedDomain || sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+            Word32 tmp = L_abs( spectrum[L_frame + i] );
+            if ( GT_32( tmp, max_high_pre ) )
             {
-                float maxPredGain = -1.0f;
-
-                sts[ch]->hTcxCfg->pCurrentTnsConfig = &sts[ch]->hTcxCfg->tnsConfig[sts[ch]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[ch]->last_core == ACELP_CORE )];
-
-                for ( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                {
-                    STnsFilter *pFilter;
-                    const struct TnsParameters *pTnsParameters;
-                    pFilter = sts[ch]->hTcxEnc->tnsData[k].filter + iFilter;
-                    pTnsParameters = sts[ch]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
-                    maxPredGain = max( maxPredGain, pFilter->predictionGain );
+                max_high_pre = tmp;
+                move32();
+            }
+        }
+    }
 
-                    if ( ( pFilter->predictionGain > pTnsParameters->minPredictionGain ) || ( pFilter->avgSqrCoef > pTnsParameters->minAvgSqrCoef ) )
-                    {
-                        if ( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 || isTCX10 || sts[ch]->hTcxEnc->tcxltp_gain < 0.6f )
-                        {
-                            ++sts[ch]->hTcxEnc->tnsData[k].nFilters;
-                            pFilter->filterType = TNS_FILTER_ON;
-                        }
-                        else
-                        {
-                            const float maxEnergyChange = GetTCXMaxenergyChange( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3 );
+    /*-----------------------------------------------------------*
+     * Pre-shaping in frequency domain using weighted LPC (Wz)   *
+     *-----------------------------------------------------------*/
 
-                            if ( maxEnergyChange >= pTnsParameters->minEnergyChange )
-                            {
-                                ++sts[ch]->hTcxEnc->tnsData[k].nFilters;
-                                pFilter->filterType = TNS_FILTER_ON;
-                            }
-                            else
-                            {
-                                pFilter->filterType = TNS_FILTER_OFF;
-                            }
-                        }
-                    }
-                    else if ( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 ) /* If a previous filter is turned on */
-                    {
-                        pFilter->filterType = TNS_FILTER_ON_ZERO;
-                        ++sts[ch]->hTcxEnc->tnsData[k].nFilters;
-                    }
-                    else
-                    {
-                        pFilter->filterType = TNS_FILTER_OFF;
-                    }
-                }
+    weight_a_fx( A, Ap, gamma1, M );
 
-                sts[ch]->hTcxEnc->fUseTns[k] = ( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 ) ? 1 : 0;
+    lpc2mdct( Ap, M, gainlpc_noinv, gainlpc_noinv_e, gainlpc, gainlpc_e, FDNS_NPTS, 0 );
 
-                if ( !bWhitenedDomain && maxPredGain < TNS_GAIN_THRESHOLD_FOR_WHITE && sts[ch]->hTcxEnc->transform_type[k] != TCX_5 )
-                {
-                    sts[ch]->hTcxEnc->fUseTns[k] = 0;
-                    sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
-                    sts[ch]->hTcxEnc->tnsData[k].nFilters = 0;
-                    for ( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                    {
-                        ClearTnsFilterCoefficients( sts[ch]->hTcxEnc->tnsData[k].filter + iFilter );
-                        sts[ch]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
-                    }
-                }
-                maxPredictionGain = max( maxPredictionGain, maxPredGain );
-            }
-        }
+    mdct_shaping( spectrum, L_frame, gainlpc_noinv, gainlpc_noinv_e );
+    FOR( i = L_frame; i < L_spec; i++ )
+    {
+        spectrum[i] = L_shl( Mpy_32_16_1( spectrum[i], gainlpc_noinv[FDNS_NPTS - 1] ), gainlpc_noinv_e[FDNS_NPTS - 1] );
+        move32();
     }
 
-
-    /* we have the decision, set filter data accordingly */
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+    /* reduce the peaks in the IGF region, to make life of the core-coder easier... */
+    test();
+    test();
+    test();
+    IF( ( EQ_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->bwidth, SWB ) ) ||
+        ( EQ_32( st->total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) ) )
     {
-        if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+        Word16 sf_width;
+        Word16 dist_low, dist_high;
+        Word16 max_fac_s, max_fac_m;
+        Word32 max_low, max_low1, max_low2, max_high;
+        Word16 headroom, shift, tmp16;
+
+
+        max_fac_m = 24576;
+        move16();
+        /* max_fac = 3 */
+        max_fac_s = 2;
+        move16();
+        if ( hTcxEnc->tcx_lpc_shaped_ari )
         {
-            continue;
+            /* max_fac = 1.5 */
+            max_fac_s = 1;
+            move16();
         }
 
-        nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
+        sf_width = shr( L_frame, 1 );
 
-        for ( k = 0; k < nSubframes; k++ )
+        max_low2 = 0;
+        move32();
+        dist_low = 0;
+        move16();
+        FOR( i = 0; i < sf_width; i++ )
         {
-            if ( sts[ch]->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+            Word32 tmp = L_abs( spectrum[L_frame - 1 - i] );
+            IF( GT_32( tmp, max_low2 ) )
             {
-                sts[ch]->hTcxCfg->pCurrentTnsConfig = &sts[ch]->hTcxCfg->tnsConfig[sts[ch]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[ch]->last_core == ACELP_CORE )];
-
-                for ( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                {
-                    STnsFilter *pFilter;
-                    pFilter = sts[ch]->hTcxEnc->tnsData[k].filter + iFilter;
-                    switch ( pFilter->filterType )
-                    {
-                        case TNS_FILTER_OFF:
-                            ClearTnsFilterCoefficients( sts[ch]->hTcxEnc->tnsData[k].filter + iFilter );
-                            break;
-                        case TNS_FILTER_ON_ZERO:
-                            /* Since TNS filter of order 0 is not allowed we have to signal in the stream filter of order 1 with the 0th coefficient equal to 0 */
-                            ClearTnsFilterCoefficients( pFilter );
-                            pFilter->order = 1;
-                            break;
-                    }
-                }
+                max_low2 = tmp;
+                move32();
+                dist_low = i;
+                move16();
             }
         }
-    }
 
-    /* Apply filters, loop over channels */
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        st = sts[ch];
-        if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+        max_low1 = 0;
+        move32();
+        FOR( i = 0; i < ( L_frame - sf_width ); i++ )
         {
-            continue;
+            Word32 tmp = L_abs( spectrum[L_frame - sf_width - 1 - i] );
+            if ( GT_32( tmp, max_low1 ) )
+            {
+                max_low1 = tmp;
+                move32();
+            }
+            if ( GT_32( tmp, max_low2 ) )
+            {
+                dist_low = add( sf_width, i );
+            }
         }
 
-        nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
+        max_low = L_max( max_low1, max_low2 );
 
-        for ( k = 0; k < nSubframes; k++ )
+        max_high = 0;
+        move32();
+        dist_high = 0;
+        move16();
+        FOR( i = 0; i < ( L_spec - L_frame ); i++ )
         {
-            if ( bWhitenedDomain && ( ch > 0 ) && /* test for identical TNS filter data in both channels */
-                 sts[0]->hTcxCfg->fIsTNSAllowed && sts[0]->hTcxEnc->fUseTns[k] &&
-                 sts[1]->hTcxCfg->fIsTNSAllowed && sts[1]->hTcxEnc->fUseTns[k] )
+            Word32 tmp = L_abs( spectrum[L_frame + i] );
+            IF( GT_32( tmp, max_high ) )
             {
-                int16_t equalFilterData = ( sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters == sts[1]->hTcxCfg->pCurrentTnsConfig->nMaxFilters &&
-                                            sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] == sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] &&
-                                            sts[0]->hTcxEnc->tnsData[k].nFilters == sts[1]->hTcxEnc->tnsData[k].nFilters )
-                                              ? 1
-                                              : 0;
-                if ( equalFilterData )
-                {
-                    for ( iFilter = st->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
-                    {
-                        const int16_t *pDataCh0 = (const int16_t *) &sts[0]->hTcxEnc->tnsData[k].filter[iFilter];
-                        const int16_t *pDataCh1 = (const int16_t *) &sts[1]->hTcxEnc->tnsData[k].filter[iFilter];
-                        int16_t i = 2 + TNS_MAX_FILTER_ORDER; /* excl. informative float data. Portable? */
+                max_high = tmp;
+                move32();
+                dist_high = i;
+                move16();
+            }
+        }
 
-                        while ( ( i >= 0 ) && ( pDataCh0[i] == pDataCh1[i] ) )
-                        {
-                            i--;
-                        }
-                        if ( i >= 0 )
-                        {
-                            equalFilterData = 0;
-                            break;
-                        }
-                    }
-                    if ( equalFilterData )
-                    {
-                        st->hTcxEnc->tnsData[k].nFilters *= -1; /* signals common TNS */
-                    }
-                }
-            }
-            if ( st->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || st->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
-            {
-                L_spec = st->hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
-                spectrum = st->hTcxEnc->spectrum[k];
-                /* If TNS should be used then get the residual after applying it inplace in the spectrum */
-                if ( st->hTcxEnc->fUseTns[k] )
-                {
-                    st->hTcxCfg->pCurrentTnsConfig = &st->hTcxCfg->tnsConfig[st->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( st->last_core == ACELP_CORE )];
-
-                    ApplyTnsFilter( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], spectrum, 1 );
-                }
-
-                if ( st->hTcxEnc->transform_type[k] == TCX_5 )
-                {
-                    tcx5TnsUngrouping( L_frame >> 2, L_spec >> 1, st->hTcxEnc->spectrum[k], ENC );
-                }
-
-                st->hTcxEnc->tnsData[k].tnsOnWhitenedSpectra = st->hTcxEnc->bTnsOnWhithenedSpectra[k];
-
-                EncodeTnsData( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );
-            }
-
-            if ( st->hTcxEnc->transform_type[k] == TCX_5 )
-            {
-                tcx5SpectrumInterleaving( st->hTcxCfg->tcx5SizeFB, st->hTcxEnc->spectrum[k] );
-                tcx5SpectrumInterleaving( st->hTcxCfg->tcx5SizeFB, mdst_spectrum[ch][k] );
-            }
-        }
-    }
-
-    return;
-}
-
-
-#endif
-void TNSAnalysis_fx(
-    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
-    Word16 L_frame,            /* input: frame length */
-    Word16 L_spec,
-    Word16 tcxMode,        /* input: TCX mode for the frame/subframe - TCX20 | TCX10 | TCX 5 (meaning 2 x TCX 5) */
-    Word8 isAfterACELP,    /* input: Flag indicating if the last frame was ACELP. For the second TCX subframe it should be 0  */
-    Word32 spectrum[],     /* input: MDCT spectrum  Qx*/
-    STnsData *pTnsData,    /* output: Tns data */
-    Word8 *pfUseTns,       /* output: Flag indicating if TNS is used */
-    Word16 *predictionGain /*Q7*/
-)
-{
-    Word32 buff[8];
-    Word16 tmp = 0;  /* initialization only to avoid compiler warning, not counted */
-    Word16 tmp2 = 0; /* initialization only to avoid compiler warning, not counted */
-    move16();
-    move16();
-
-    /* Init TNS */
-    *pfUseTns = 0;
-    move16();
-
-    IF( hTcxCfg->fIsTNSAllowed != 0 )
-    {
-        hTcxCfg->pCurrentTnsConfig = &hTcxCfg->tnsConfig[( tcxMode - TCX_20 ) == 0][isAfterACELP];
-        L_spec = hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
+        /* at least 9 bits headroom are needed for below multiplicitions */
+        shift = 0;
+        move16();
+        headroom = 31;
         move16();
 
-        /*-----------------------------------------------------------*
-         * Temporal Noise Shaping analysis                           *
-         *-----------------------------------------------------------*/
-
-        IF( EQ_16( tcxMode, TCX_5 ) )
-        {
-            tmp = shr( L_frame, 2 );
-
-            /* rearrange LF sub-window lines prior to TNS analysis & filtering */
-            tmp2 = shr( L_spec, 1 );
+        tmp16 = norm_l( max_low );
+        if ( max_low != 0 )
+            headroom = s_min( headroom, tmp16 );
 
-            IF( LT_16( tmp2, tmp ) )
-            {
-                Copy32( spectrum + 8, spectrum + 16, sub( tmp2, 8 ) );
-                Copy32( spectrum + tmp, spectrum + 8, 8 );
-                Copy32( spectrum + tmp + 8, spectrum + tmp2 + 8, sub( tmp2, 8 ) );
-            }
-            ELSE
-            {
-                Copy32( spectrum + tmp, buff, 8 );
-                Copy32( spectrum + 8, spectrum + 16, sub( tmp, 8 ) );
-                Copy32( buff, spectrum + 8, 8 );
-            }
-        }
+        tmp16 = norm_l( max_low2 );
+        if ( max_low2 != 0 )
+            headroom = s_min( headroom, tmp16 );
 
-        move16();
-        *pfUseTns = (Word8) DetectTnsFilt_fx( hTcxCfg->pCurrentTnsConfig, spectrum, pTnsData, predictionGain );
+        tmp16 = norm_l( max_high );
+        if ( max_high != 0 )
+            headroom = s_min( headroom, tmp16 );
 
-        /* If TNS should be used then get the residual after applying it inplace in spectrum */
-        IF( *pfUseTns != 0 )
+        if ( LT_16( headroom, 9 ) )
         {
-            ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, pTnsData, spectrum, 1 );
+            shift = sub( 9, headroom );
         }
+        max_low = L_shr( max_low, shift );
+        max_low2 = L_shr( max_low2, shift );
+        max_high = L_shr( max_high, shift );
 
-        IF( EQ_16( tcxMode, TCX_5 ) )
+        test();
+        test();
+        IF( GT_32( imult3216( max_high, dist_high ), imult3216( L_shr( max_low, 2 ), dist_low ) ) && ( GT_32( max_low_pre, L_shr( max_high_pre, 4 ) ) ) && ( GT_32( max_high, L_shl( Mpy_32_16_r( max_low2, max_fac_m ), max_fac_s ) ) ) )
         {
-            /* undo rearrangement of LF sub-window lines prior to TNS analysis */
-            IF( LT_16( tmp2, tmp ) )
-            {
-                Copy32( spectrum + tmp2 + 8, spectrum + tmp + 8, sub( tmp2, 8 ) );
-                Copy32( spectrum + 8, spectrum + tmp, 8 );
-                Copy32( spectrum + 16, spectrum + 8, sub( tmp2, 8 ) );
-                set32_fx( spectrum + tmp2, 0, sub( tmp, tmp2 ) );
-                set32_fx( spectrum + tmp + tmp2, 0, sub( tmp, tmp2 ) );
-            }
-            ELSE
+            Word16 fac;
+            fac = divide3232( max_low2, max_high );
+            fac = shl( mult_r( fac, max_fac_m ), max_fac_s );
+
+            FOR( i = 0; i < sub( L_spec, L_frame ); i++ )
             {
-                Copy32( spectrum + 8, buff, 8 );
-                Copy32( spectrum + 16, spectrum + 8, sub( tmp, 8 ) );
-                Copy32( buff, spectrum + tmp, 8 );
+                spectrum[L_frame + i] = Mpy_32_16_1( spectrum[L_frame + i], fac );
+                move32();
             }
         }
     }
-}
-
-void TNSAnalysis_ivas_fx(
-    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
-    Word16 L_frame,            /* i  : frame length */
-    Word16 L_spec,             /* i  : length of the spectrum                                                                  */
-    Word16 transform_type,     /* i  : transform type for the frame/subframe - TCX20 | TCX10 | TCX 5 (meaning 2 x TCX 5)	*/
-    Word8 isAfterACELP,        /* i  : Flag indicating if the last frame was ACELP. For the second TCX subframe it should be 0  */
-    Word32 spectrum[],         /* i  : MDCT spectrum  Q=Qx*/
-    TRAN_DET_HANDLE hTranDet,  /* i  : handle transient detection                                                              */
-    Word16 ltp_gain,           /* i  : ltp gain  Q=15*/
-    STnsData *pTnsData,        /* o  : Tns data */
-    Word8 *pfUseTns,           /* o  : Flag indicating if TNS is used */
-    Word16 *predictionGain     /* o  : TNS prediction gain	Q=7	 */
-)
-{
-    Word32 buff[8];
-    Word16 tmp = 0;  /* initialization only to avoid compiler warning, not counted */
-    Word16 tmp2 = 0; /* initialization only to avoid compiler warning, not counted */
-    move16();
-    move16();
 
-    /* Init TNS */
-    *pfUseTns = 0;
-    move16();
 
-    IF( hTcxCfg->fIsTNSAllowed != 0 )
+    test();
+    test();
+    test();
+    IF( st->tcxonly && hTcxEnc->tcxltp && ( hTcxEnc->tcxltp_gain > 0 ) && !pfUseTns )
     {
-        hTcxCfg->pCurrentTnsConfig = &hTcxCfg->tnsConfig[( transform_type - TCX_20 ) == 0][isAfterACELP];
-        L_spec = hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
-        move16();
-
-        /*-----------------------------------------------------------*
-         * Temporal Noise Shaping analysis                           *
-         *-----------------------------------------------------------*/
-
-        IF( EQ_16( transform_type, TCX_5 ) )
-        {
-            tmp = shr( L_frame, 2 );
-
-            /* rearrange LF sub-window lines prior to TNS analysis & filtering */
-            tmp2 = shr( L_spec, 1 );
-
-            IF( LT_16( tmp2, tmp ) )
-            {
-                Copy32( spectrum + 8, spectrum + 16, sub( tmp2, 8 ) );
-                Copy32( spectrum + tmp, spectrum + 8, 8 );
-                Copy32( spectrum + tmp + 8, spectrum + tmp2 + 8, sub( tmp2, 8 ) );
-            }
-            ELSE
-            {
-                Copy32( spectrum + tmp, buff, 8 );
-                Copy32( spectrum + 8, spectrum + 16, sub( tmp, 8 ) );
-                Copy32( buff, spectrum + 8, 8 );
-            }
-        }
-
-        move16();
-        *pfUseTns = (Word8) DetectTnsFilt_ivas_fx( hTcxCfg->pCurrentTnsConfig, spectrum, pTnsData, hTranDet, (Word8) NE_16( transform_type, TCX_20 ), ltp_gain, predictionGain );
-
-        /* If TNS should be used then get the residual after applying it inplace in spectrum */
-        IF( *pfUseTns != 0 )
-        {
-            ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, pTnsData, spectrum, 1 );
-        }
-
-        IF( EQ_16( transform_type, TCX_5 ) )
-        {
-            /* undo rearrangement of LF sub-window lines prior to TNS analysis */
-            IF( LT_16( tmp2, tmp ) )
-            {
-                Copy32( spectrum + tmp2 + 8, spectrum + tmp + 8, sub( tmp2, 8 ) );
-                Copy32( spectrum + 8, spectrum + tmp, 8 );
-                Copy32( spectrum + 16, spectrum + 8, sub( tmp2, 8 ) );
-                set32_fx( spectrum + tmp2, 0, sub( tmp, tmp2 ) );
-                set32_fx( spectrum + tmp + tmp2, 0, sub( tmp, tmp2 ) );
-            }
-            ELSE
-            {
-                Copy32( spectrum + 8, buff, 8 );
-                Copy32( spectrum + 16, spectrum + 8, sub( tmp, 8 ) );
-                Copy32( buff, spectrum + tmp, 8 );
-            }
-        }
+        PsychAdaptLowFreqEmph_fx( spectrum, gainlpc, gainlpc_e );
     }
 }
-
-void ShapeSpectrum_fx(
+void ShapeSpectrum_ivas_fx(
     TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
-    Word16 A[],                /* input: quantized coefficients NxAz_q[M+1]  Q = 14 - norm(A[0])*/
+    Word16 A[],                /* input: quantized coefficients NxAz_q[M+1], Q = 14 - norm(A[0]) */
     Word16 gainlpc[],          /* output: MDCT gains for the previous frame Q(15-gainlpc_e)*/
     Word16 gainlpc_e[],        /* output: MDCT gains exponents */
     Word16 L_frame_glob,       /* input: frame length             */
     Word16 L_spec,
-    Word32 spectrum[], /* i/o: MDCT spectrum */
-    Word8 pfUseTns,    /* output: Flag indicating if TNS is used */
-    Encoder_State *st )
+    Word32 spectrum[],  /* i/o: MDCT spectrum Q(31-spectrum_e) */
+    Word16 *spectrum_e, /* i/o: MDCT spectrum exponent */
+    Word8 pfUseTns,     /* output: Flag indicating if TNS is used */
+    Encoder_State *st,
+    Word32 *scf /* Q16 */
+)
 {
     Word16 L_frame;
     Word16 Ap[M + 2];
     Word16 gamma1;
     Word16 gainlpc_noinv[FDNS_NPTS];
     Word16 gainlpc_noinv_e[FDNS_NPTS];
+    Word32 sns_int_scf[FDNS_NPTS];
     Word16 i;
+    Word16 q_spectrum;
     Word32 max_low_pre = 0, max_high_pre = 0;
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
     move32();
     move32();
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+    Word32 total_brate = st->total_brate;
+    move32();
+    if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        total_brate = st->element_brate;
+        move32();
+    }
 
     /*-----------------------------------------------------------*
      * Init                                                      *
@@ -855,15 +596,17 @@ void ShapeSpectrum_fx(
     }
 
     /* if past frame is ACELP */
-
-    IF( st->last_core == ACELP_CORE )
+    IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) ) /* in MDCT, this is already done outside the function */
     {
-        L_frame = add( L_frame, hTcxCfg->tcx_offset );
-        L_spec = add( L_spec, shr( hTcxCfg->tcx_coded_lines, 2 ) );
-        if ( hTcxCfg->lfacNext < 0 )
+        IF( st->last_core == ACELP_CORE )
         {
-            L_frame = sub( L_frame, hTcxCfg->lfacNext );
-            move16();
+            L_frame = add( L_frame, hTcxCfg->tcx_offset );
+            L_spec = add( L_spec, shr( hTcxCfg->tcx_coded_lines, 2 ) );
+            if ( hTcxCfg->lfacNext < 0 )
+            {
+                L_frame = sub( L_frame, hTcxCfg->lfacNext );
+                move16();
+            }
         }
     }
 
@@ -871,260 +614,7 @@ void ShapeSpectrum_fx(
     tcxGetNoiseFillingTilt( A,
                             M,
                             L_frame,
-                            ( GE_32( st->total_brate, ACELP_13k20 ) && st->rf_mode == 0 ),
-                            &hTcxEnc->noiseTiltFactor );
-
-    /* Calculate Spectrum Flatness Measure for the TCX Concealment */
-    IF( st->enablePlcWaveadjust )
-    {
-        hTcxCfg->SFM2 = SFM_Cal_fx( spectrum, s_min( 200, L_frame ) );
-        move32();
-    }
-
-    test();
-    test();
-    test();
-    IF( ( EQ_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->bwidth, SWB ) ) ||
-        ( EQ_32( st->total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) ) )
-    {
-        max_low_pre = 0;
-        move32();
-        FOR( i = 0; i < L_frame; i++ )
-        {
-            Word32 tmp = L_abs( spectrum[i] );
-            if ( GT_32( tmp, max_low_pre ) )
-            {
-                max_low_pre = tmp;
-                move32();
-            }
-        }
-
-        max_high_pre = 0;
-        move32();
-        FOR( i = 0; i < L_spec - L_frame; i++ )
-        {
-            Word32 tmp = L_abs( spectrum[L_frame + i] );
-            if ( GT_32( tmp, max_high_pre ) )
-            {
-                max_high_pre = tmp;
-                move32();
-            }
-        }
-    }
-
-    /*-----------------------------------------------------------*
-     * Pre-shaping in frequency domain using weighted LPC (Wz)   *
-     *-----------------------------------------------------------*/
-
-    weight_a_fx( A, Ap, gamma1, M );
-
-    lpc2mdct( Ap, M, gainlpc_noinv, gainlpc_noinv_e, gainlpc, gainlpc_e, FDNS_NPTS, 0 );
-
-    mdct_shaping( spectrum, L_frame, gainlpc_noinv, gainlpc_noinv_e );
-    FOR( i = L_frame; i < L_spec; i++ )
-    {
-        spectrum[i] = L_shl( Mpy_32_16_1( spectrum[i], gainlpc_noinv[FDNS_NPTS - 1] ), gainlpc_noinv_e[FDNS_NPTS - 1] );
-        move32();
-    }
-
-    /* reduce the peaks in the IGF region, to make life of the core-coder easier... */
-    test();
-    test();
-    test();
-    IF( ( EQ_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->bwidth, SWB ) ) ||
-        ( EQ_32( st->total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) ) )
-    {
-        Word16 sf_width;
-        Word16 dist_low, dist_high;
-        Word16 max_fac_s, max_fac_m;
-        Word32 max_low, max_low1, max_low2, max_high;
-        Word16 headroom, shift, tmp16;
-
-
-        max_fac_m = 24576;
-        move16();
-        /* max_fac = 3 */
-        max_fac_s = 2;
-        move16();
-        if ( hTcxEnc->tcx_lpc_shaped_ari )
-        {
-            /* max_fac = 1.5 */
-            max_fac_s = 1;
-            move16();
-        }
-
-        sf_width = shr( L_frame, 1 );
-
-        max_low2 = 0;
-        move32();
-        dist_low = 0;
-        move16();
-        FOR( i = 0; i < sf_width; i++ )
-        {
-            Word32 tmp = L_abs( spectrum[L_frame - 1 - i] );
-            IF( GT_32( tmp, max_low2 ) )
-            {
-                max_low2 = tmp;
-                move32();
-                dist_low = i;
-                move16();
-            }
-        }
-
-        max_low1 = 0;
-        move32();
-        FOR( i = 0; i < ( L_frame - sf_width ); i++ )
-        {
-            Word32 tmp = L_abs( spectrum[L_frame - sf_width - 1 - i] );
-            if ( GT_32( tmp, max_low1 ) )
-            {
-                max_low1 = tmp;
-                move32();
-            }
-            if ( GT_32( tmp, max_low2 ) )
-            {
-                dist_low = add( sf_width, i );
-            }
-        }
-
-        max_low = L_max( max_low1, max_low2 );
-
-        max_high = 0;
-        move32();
-        dist_high = 0;
-        move16();
-        FOR( i = 0; i < ( L_spec - L_frame ); i++ )
-        {
-            Word32 tmp = L_abs( spectrum[L_frame + i] );
-            IF( GT_32( tmp, max_high ) )
-            {
-                max_high = tmp;
-                move32();
-                dist_high = i;
-                move16();
-            }
-        }
-
-        /* at least 9 bits headroom are needed for below multiplicitions */
-        shift = 0;
-        move16();
-        headroom = 31;
-        move16();
-
-        tmp16 = norm_l( max_low );
-        if ( max_low != 0 )
-            headroom = s_min( headroom, tmp16 );
-
-        tmp16 = norm_l( max_low2 );
-        if ( max_low2 != 0 )
-            headroom = s_min( headroom, tmp16 );
-
-        tmp16 = norm_l( max_high );
-        if ( max_high != 0 )
-            headroom = s_min( headroom, tmp16 );
-
-        if ( LT_16( headroom, 9 ) )
-        {
-            shift = sub( 9, headroom );
-        }
-        max_low = L_shr( max_low, shift );
-        max_low2 = L_shr( max_low2, shift );
-        max_high = L_shr( max_high, shift );
-
-        test();
-        test();
-        IF( GT_32( imult3216( max_high, dist_high ), imult3216( L_shr( max_low, 2 ), dist_low ) ) && ( GT_32( max_low_pre, L_shr( max_high_pre, 4 ) ) ) && ( GT_32( max_high, L_shl( Mpy_32_16_r( max_low2, max_fac_m ), max_fac_s ) ) ) )
-        {
-            Word16 fac;
-            fac = divide3232( max_low2, max_high );
-            fac = shl( mult_r( fac, max_fac_m ), max_fac_s );
-
-            FOR( i = 0; i < sub( L_spec, L_frame ); i++ )
-            {
-                spectrum[L_frame + i] = Mpy_32_16_1( spectrum[L_frame + i], fac );
-                move32();
-            }
-        }
-    }
-
-
-    test();
-    test();
-    test();
-    IF( st->tcxonly && hTcxEnc->tcxltp && ( hTcxEnc->tcxltp_gain > 0 ) && !pfUseTns )
-    {
-        PsychAdaptLowFreqEmph_fx( spectrum, gainlpc, gainlpc_e );
-    }
-}
-void ShapeSpectrum_ivas_fx(
-    TCX_CONFIG_HANDLE hTcxCfg, /* i  : configuration of TCX               */
-    Word16 A[],                /* input: quantized coefficients NxAz_q[M+1], Q = 14 - norm(A[0]) */
-    Word16 gainlpc[],          /* output: MDCT gains for the previous frame Q(15-gainlpc_e)*/
-    Word16 gainlpc_e[],        /* output: MDCT gains exponents */
-    Word16 L_frame_glob,       /* input: frame length             */
-    Word16 L_spec,
-    Word32 spectrum[],  /* i/o: MDCT spectrum Q(31-spectrum_e) */
-    Word16 *spectrum_e, /* i/o: MDCT spectrum exponent */
-    Word8 pfUseTns,     /* output: Flag indicating if TNS is used */
-    Encoder_State *st,
-    Word32 *scf /* Q16 */
-)
-{
-    Word16 L_frame;
-    Word16 Ap[M + 2];
-    Word16 gamma1;
-    Word16 gainlpc_noinv[FDNS_NPTS];
-    Word16 gainlpc_noinv_e[FDNS_NPTS];
-    Word32 sns_int_scf[FDNS_NPTS];
-    Word16 i;
-    Word16 q_spectrum;
-    Word32 max_low_pre = 0, max_high_pre = 0;
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    move32();
-    move32();
-    Word32 total_brate = st->total_brate;
-    move32();
-    if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        total_brate = st->element_brate;
-        move32();
-    }
-
-    /*-----------------------------------------------------------*
-     * Init                                                      *
-     *-----------------------------------------------------------*/
-
-    /* Init lengths */
-    L_frame = L_frame_glob;
-    move16();
-    gamma1 = st->gamma;
-    move16();
-    if ( st->enableTcxLpc != 0 )
-    {
-        gamma1 = 0x7FFF;
-        move16();
-    }
-
-    /* if past frame is ACELP */
-    IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) ) /* in MDCT, this is already done outside the function */
-    {
-        IF( st->last_core == ACELP_CORE )
-        {
-            L_frame = add( L_frame, hTcxCfg->tcx_offset );
-            L_spec = add( L_spec, shr( hTcxCfg->tcx_coded_lines, 2 ) );
-            if ( hTcxCfg->lfacNext < 0 )
-            {
-                L_frame = sub( L_frame, hTcxCfg->lfacNext );
-                move16();
-            }
-        }
-    }
-
-    test();
-    tcxGetNoiseFillingTilt( A,
-                            M,
-                            L_frame,
-                            ( GE_32( total_brate, ACELP_13k20 ) && st->rf_mode == 0 ),
+                            ( GE_32( total_brate, ACELP_13k20 ) && st->rf_mode == 0 ),
                             &hTcxEnc->noiseTiltFactor );
 
     /* Calculate Spectrum Flatness Measure for the TCX Concealment */
@@ -1347,156 +837,8 @@ void ShapeSpectrum_ivas_fx(
     }
 }
 
-#ifdef ADD_IVAS_TNS
-/*-----------------------------------------------------------*
- * EstimateStereoTCXNoiseLevel()
- *
- * Estimate and quantize stereo noise factors
- *-----------------------------------------------------------*/
-
-void EstimateStereoTCXNoiseLevel(
-    Encoder_State **sts,                     /* i  : state handle                                    */
-    float *q_spectrum[CPE_CHANNELS][NB_DIV], /* i  : quantized MDCT spectrum                         */
-    float gain_tcx[][NB_DIV],                /* i  : global gain                                     */
-    int16_t L_frame[][NB_DIV],               /* i  : frame length                                    */
-    int16_t noiseFillingBorder[][NB_DIV],    /* i  : noise filling border                            */
-    int16_t hm_active[][NB_DIV],             /* i  : flag indicating if the harmonic model is active */
-    const int16_t ignore_chan[],             /* i  : flag indicating whether the channel should be ignored */
-    float fac_ns[][NB_DIV],                  /* o  : noise filling level                             */
-    int16_t param_core[][NB_DIV * NPRM_DIV], /* o  : quantized noise filling level                   */
-    const int16_t MCT_flag                   /* i  : hMCT handle allocated (1) or not (0)            */
-)
-{
-    int16_t ch, n;
-    int16_t nSubframes, maxNfCalcBw, iStart, noiseTransWidth;
-    float smooth_gain;
-    float combined_q_spectrum[N_MAX];
-    int16_t *fac_ns_q;
-    int32_t total_brate;
-
-    for ( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        Encoder_State *st = sts[ch];
-        TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-
-        nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
-
-        if ( ignore_chan[ch] )
-        {
-            continue;
-        }
-        total_brate = ( st->element_mode == IVAS_CPE_MDCT && !MCT_flag ) ? st->element_brate : st->total_brate;
-
-        for ( n = 0; n < nSubframes; n++ )
-        {
-            fac_ns_q = param_core[ch] + n * NPRM_DIV + 1;
-            maxNfCalcBw = min( noiseFillingBorder[ch][n], (int16_t) ( hTcxEnc->measuredBwRatio * (float) L_frame[ch][n] + 0.5f ) );
-            if ( ( total_brate >= HQ_96k && ( st->element_mode <= IVAS_SCE || st->bwidth < SWB ) ) || total_brate > IVAS_192k )
-            {
-                fac_ns[ch][n] = 0.0f;
-                *fac_ns_q = 0;
-            }
-            else
-            {
-                iStart = L_frame[ch][n] / ( ( total_brate >= ACELP_13k20 && !st->rf_mode ) ? 6 : 8 ); /* noise filling start bin*/
-
-                if ( n == 0 )
-                {
-                    mvr2r( hTcxEnc->ltpGainMemory, &hTcxEnc->ltpGainMemory[1], N_LTP_GAIN_MEMS - 1 );
-                    hTcxEnc->ltpGainMemory[0] = st->hTcxEnc->tcxltp_gain;
-                }
-
-                smooth_gain = dotp( hTcxEnc->ltpGainMemory, nf_tw_smoothing_coeffs, N_LTP_GAIN_MEMS );
-
-                noiseTransWidth = GetTransWidth( st->tcxonly, ( L_frame[ch][n] == st->L_frame >> 1 ), smooth_gain, ( st->hTcxCfg->ctx_hm && st->last_core != ACELP_CORE && hm_active[ch][n] ) );
-
-                mvr2r( q_spectrum[ch][n], combined_q_spectrum, L_frame[ch][n] );
-                tcx_noise_factor( hTcxEnc->spectrum[n], combined_q_spectrum, iStart, maxNfCalcBw, noiseTransWidth, L_frame[ch][n], gain_tcx[ch][n], hTcxEnc->noiseTiltFactor, &fac_ns[ch][n], fac_ns_q, st->element_mode );
-
-                /* hysteresis for very tonal passages (more stationary noise filling level) */
-                if ( *fac_ns_q == 1 )
-                {
-                    hTcxEnc->noiseLevelMemory_cnt = (int16_t) min( INT16_MAX, 1 + abs( hTcxEnc->noiseLevelMemory_cnt ) ); /* update counter */
-                }
-                else
-                {
-                    if ( ( *fac_ns_q == 2 ) && ( abs( hTcxEnc->noiseLevelMemory_cnt ) > 5 ) )
-                    {
-                        *fac_ns_q = 1; /* reduce noise filling level by one step */
-                        fac_ns[ch][n] = 0.75f / ( 1 << NBITS_NOISE_FILL_LEVEL );
-
-                        /* signal that noise level is changed by inverting sign of level memory */
-                        hTcxEnc->noiseLevelMemory_cnt = ( hTcxEnc->noiseLevelMemory_cnt < 0 ) ? 5 : -1 - hTcxEnc->noiseLevelMemory_cnt;
-                    }
-                    else
-                    {
-                        hTcxEnc->noiseLevelMemory_cnt = 0; /* reset memory since level is too different */
-                    }
-                }
-            } /* bitrate */
-        }
-#ifdef DEBUG_MODE_MDCT
-        dbgwrite( &smooth_gain, sizeof( float ), 1, 1, "./res/smooth_gain" );
-        dbgwrite( &st->hTcxEnc->tcxltp_gain, sizeof( float ), 1, 1, "./res/tcxltp_gain" );
-        dbgwrite( &noiseTransWidth, sizeof( int16_t ), 1, 1, "./res/noiseTrans" );
-        dbgwrite( &fac_ns[ch][0], sizeof( float ), 2, 1, "./res/fac_ns" );
-#endif
-    }
-
-    return;
-}
-
-
-/*-----------------------------------------------------------*
- * DecideTonalSideInfo()
- *
- *
- *-----------------------------------------------------------*/
-
-static int16_t DecideTonalSideInfo(
-    const float spectrum[],
-    const int16_t L_frame_glob,
-    float SFM2 )
-{
-    float SFM, K, K2;
-    int16_t Tonal_SideInfo;
-
-    SFM = SFM_Cal( spectrum, min( 200, L_frame_glob ) );
-
-    if ( L_frame_glob <= 256 )
-    {
-        K = 0.4f;
-        K2 = 0.1f;
-    }
-    else if ( L_frame_glob == 320 || L_frame_glob == 512 )
-    {
-        K = 0.4f;
-        K2 = 0.1f;
-    }
-    else /*FrameSize_Core == 640*/
-    {
-        K = 0.35f;
-        K2 = 0.04f;
-    }
-
-
-    Tonal_SideInfo = 0;
-    if ( SFM < K )
-    {
-        Tonal_SideInfo = 1;
-    }
-
-    if ( SFM2 < K2 )
-    {
-        Tonal_SideInfo = 1;
-    }
-
-    return Tonal_SideInfo;
-}
-#endif
-
-/*-------------------------------------------------------------------*
- * GetTransWidth()
+/*-------------------------------------------------------------------*
+ * GetTransWidth()
  *
  *
  *-------------------------------------------------------------------*/
@@ -1745,6 +1087,8 @@ void EstimateStereoTCXNoiseLevel_fx(
     Word16 *fac_ns_q;
     Word32 total_brate;
 
+    set32_fx( combined_q_spectrum, 0, N_MAX );
+
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         Encoder_State *st = sts[ch];
@@ -2313,11 +1657,7 @@ void QuantizeSpectrum_fx(
 
             tmp1 = BASOP_Util_Divide1616_Scale( sqTargetBits, tmp1, &tmp2 );
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             hTcxEnc->tcx_target_bits_fac = shl_o( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2, &Overflow );
-#else  /* BASOP_NOGLOB */
-            hTcxEnc->tcx_target_bits_fac = shl( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2 );
-#endif /* BASOP_NOGLOB */
             move16();
             BASOP_SATURATE_WARNING_ON_EVS
 
@@ -2437,11 +1777,7 @@ void QuantizeSpectrum_fx(
             }
 
             /* Limit low sqGain for avoiding saturation of the gain quantizer*/
-#ifdef BASOP_NOGLOB
             tmp1 = mult_r( shl_o( L_spec, 5, &Overflow ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#else
-            tmp1 = mult_r( shl( L_spec, 5 ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#endif
             s = 15 - 5 - 7;
             IF( L_spec >= 1024 )
             {
@@ -2455,11 +1791,7 @@ void QuantizeSpectrum_fx(
             IF( tmp2 >= 0 )
             {
                 BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
                 tmp2 = sub_sat( sqGain, shr_sat( tmp1, tmp2 ) );
-#else
-                tmp2 = sub( sqGain, shr( tmp1, tmp2 ) );
-#endif
                 BASOP_SATURATE_WARNING_ON_EVS;
             }
             ELSE
@@ -2512,11 +1844,7 @@ void QuantizeSpectrum_fx(
                 spectrum[i] = L_mult( sqQ[i], 1 << ( 30 - SPEC_EXP_DEC ) );
                 move32();
                 /* noise filling seed */
-#ifdef BASOP_NOGLOB
                 tmp32 = L_macNs_co( tmp32, abs_s( sqQ[i] ), i, &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-                tmp32 = L_macNs( tmp32, abs_s( sqQ[i] ), i );
-#endif /* BASOP_NOGLOB */
             }
             *spectrum_e = SPEC_EXP_DEC;
             move16();
@@ -3072,11 +2400,7 @@ void QuantizeSpectrum_fx(
                         /* add part of current sub-window overlapping with previous window */
                         FOR( i = 0; i < L_ola; i++ )
                         {
-#ifdef BASOP_NOGLOB
                             tmpP16[i] = add_sat( tmpP16[i], win[i] );
-#else
-                            tmpP16[i] = add( tmpP16[i], win[i] );
-#endif
                             move16();
                         }
                         /* copy new sub-window region not overlapping with previous window */
@@ -3154,11 +2478,7 @@ void QuantizeSpectrum_fx(
                     /* add part of current sub-window overlapping with previous window */
                     FOR( i = 0; i < L_ola; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         tmpP16[i] = add_sat( tmpP16[i], win[i] );
-#else
-                        tmpP16[i] = add( tmpP16[i], win[i] );
-#endif
                         move16();
                     }
 
@@ -3284,11 +2604,7 @@ void QuantizeSpectrum_fx(
                     /* scale output */
                     FOR( i = 0; i < L_frame; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shr_o( xn_buf16[i], Q, &Overflow );
-#else  /* BASOP_NOGLOB */
-                        xn_buf16[i] = shr( xn_buf16[i], Q );
-#endif /* BASOP_NOGLOB */
                         move16();
                     }
 
@@ -3348,11 +2664,7 @@ void QuantizeSpectrum_fx(
                     tmp1 = sub( overlap, hTcxCfg->tcx_mdct_window_min_length );
                     FOR( i = 0; i < tmp1; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shl_sat( add_sat( xn_buf16[i], shr_sat( hTcxEnc->old_out_fx[i + nz], tmp2 ) ), TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf16[i] = shl( add( xn_buf16[i], shr( hTcxEnc->old_out_fx[i + nz], tmp2 ) ), TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
 
@@ -3361,31 +2673,19 @@ void QuantizeSpectrum_fx(
                     FOR( ; i < tmp1; i++ )
                     {
                         tmp3 = mult_r( shr( hTcxEnc->old_out_fx[i + nz], tmp2 ), hTcxCfg->tcx_mdct_window_minimum[i - overlap + hTcxCfg->tcx_mdct_window_min_length].v.re );
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shl_sat( add_sat( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf16[i] = shl( add( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
                     FOR( ; i < overlap; i++ )
                     {
                         tmp3 = mult_r( shr( hTcxEnc->old_out_fx[i + nz], tmp2 ), hTcxCfg->tcx_mdct_window_minimum[overlap - 1 - i].v.im );
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shl_sat( add_sat( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf16[i] = shl( add( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
 
                     FOR( ; i < L_frame; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf16[i] = shl( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
                 }
@@ -3415,11 +2715,7 @@ void QuantizeSpectrum_fx(
                     BASOP_SATURATE_WARNING_OFF_EVS;
                     FOR( i = 0; i < overlap; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shl_sat( add( xn_buf16[i], hTcxEnc->Txnq[i] ), TCX_IMDCT_HEADROOM );
-#else
-                        xn_buf16[i] = shl( add( xn_buf16[i], hTcxEnc->Txnq[i] ), TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
 
@@ -3427,11 +2723,7 @@ void QuantizeSpectrum_fx(
                     {
                         FOR( ; i < L_frame; i++ )
                         {
-#ifdef BASOP_NOGLOB
                             xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#else
-                            xn_buf16[i] = shl( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#endif
                             move16();
                         }
                     }
@@ -3445,11 +2737,7 @@ void QuantizeSpectrum_fx(
                     BASOP_SATURATE_WARNING_OFF_EVS;
                     FOR( i = 0; i < L_frame; i++ )
                     {
-#ifdef BASOP_NOGLOB
                         xn_buf16[i] = shl_o( xn_buf16[i], TCX_IMDCT_HEADROOM, &Overflow );
-#else /* BASOP_NOGLOB */
-                        xn_buf16[i] = shl( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#endif
                         move16();
                     }
                     BASOP_SATURATE_WARNING_ON_EVS;
@@ -3827,7 +3115,7 @@ void QuantizeTCXSpectrum_fx(
             }
 
             /* Quantize original spectrum */
-            sqGain_fx = SQ_gain_ivas_fx( spectrum_fx, *spectrum_e, shl( mult( hTcxEnc->tcx_target_bits_fac, sqTargetBits ), 1 ), L_spec, &sqGain_e );
+            sqGain_fx = SQ_gain_ivas_fx( spectrum_fx, *spectrum_e, ( mult( hTcxEnc->tcx_target_bits_fac, shl( sqTargetBits, 1 ) ) ), L_spec, &sqGain_e );
 
             tcx_scalar_quantization_ivas_fx( spectrum_fx, *spectrum_e, sqQ, L_spec, sqGain_fx, sqGain_e, st->hTcxCfg->sq_rounding, hTcxEnc->memQuantZeros, st->tcxonly );
 
@@ -3953,11 +3241,7 @@ void QuantizeTCXSpectrum_fx(
 
         tmp1 = BASOP_Util_Divide1616_Scale( sqTargetBits, tmp1, &tmp2 );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         hTcxEnc->tcx_target_bits_fac = shl_o( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2, &Overflow );
-#else  /* BASOP_NOGLOB */
-        hTcxEnc->tcx_target_bits_fac = shl( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2 );
-#endif /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
 
         if ( GT_16( hTcxEnc->tcx_target_bits_fac, 20480 /*1.25 in Q14*/ ) )
@@ -4240,11 +3524,7 @@ void QuantizeTCXSpectrum_fx(
             spectrum_fx[i] = L_mult( sqQ[i], 1 << ( 30 - SPEC_EXP_DEC ) );
             move32();
             /* noise filling seed */
-#ifdef BASOP_NOGLOB
             tmp32 = L_macNs_co( tmp32, abs_s( sqQ[i] ), i, &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-            tmp32 = L_macNs( tmp32, abs_s( sqQ[i] ), i );
-#endif /* BASOP_NOGLOB */
         }
         *spectrum_e = SPEC_EXP_DEC;
         move16();
@@ -4284,13 +3564,22 @@ void QuantizeTCXSpectrum_fx(
             low_complexiety = 1;
             move16();
         }
-        tcx_arith_encode_envelope_fx( spectrum_fx, spectrum_e, hm_cfg->indexBuffer, L_frame, L_spec, st, Aqind, sqTargetBits, sqQ, tmp8, prm_hm, /* HM parameter area */ LtpPitchLag, &sqBits, &signaling_bits, nf_seed, low_complexiety );
+        tcx_arith_encode_envelope_ivas_fx( spectrum_fx, spectrum_e, hm_cfg->indexBuffer, L_frame, L_spec, st, Aqind, sqTargetBits, sqQ, tmp8, prm_hm, /* HM parameter area */ LtpPitchLag, &sqBits, &signaling_bits, low_complexiety );
 
         sqTargetBits = sub( sqTargetBits, signaling_bits );
         *prm_target = sqTargetBits;
         move16();
 
         /* Noise filling seed */
+        Word64 seed = 0;
+        move64();
+        FOR( i = 0; i < noiseFillingBorder; ++i )
+        {
+            /* *nf_seed += (int16_t) ( abs( (int16_t) spectrum[i] ) * i * 2 ); */
+            seed = W_mac_32_32( seed, L_abs( spectrum_fx[i] ), i ); // exp: spectrum_e
+        }
+        *nf_seed = extract_l( W_extract_l( W_shr( seed, sub( 31, *spectrum_e ) ) ) ); // Q0
+        move16();
     }
 
     *hm_active = prm_hm[0];
@@ -4444,9 +3733,6 @@ void coder_tcx_fx(
     Word16 winMDST[N_MAX + L_MDCT_OVLP_MAX];
     Word16 *pWinMDST;
     Word16 left_overlap_mode, right_overlap_mode;
-#ifndef MSAN_FIX
-    LPD_state_HANDLE hLPDmem = st->hLPDmem;
-#endif
     TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
 
     left_overlap = right_overlap = -1;
@@ -4611,11 +3897,6 @@ void coder_tcx_fx(
                          n,
                          st,
                          hm_cfg );
-
-#ifndef MSAN_FIX
-    hLPDmem->nbits = add( hLPDmem->nbits, add( tnsBits, ltpBits ) );
-    move16();
-#endif
 }
 
 
@@ -4799,7 +4080,7 @@ void InternalTCXDecoder_fx(
 
     IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
     {
-        Copy_Scale_sig_16_32( A_fx, A_fx32, M + 1, add( norm_s( A_fx[0] ), 2 ) ); // Copying the Word16 A_fx buffer to a temporary Word32 buffer in Q16
+        Copy_Scale_sig_16_32_DEPREC( A_fx, A_fx32, M + 1, add( norm_s( A_fx[0] ), 2 ) ); // Copying the Word16 A_fx buffer to a temporary Word32 buffer in Q16
 
         q_spec = sub( 31, *spectrum_e );
         sns_interpolate_scalefactors_fx( sns_interpolated_scalefactors_fx, A_fx32, DEC );
@@ -4821,7 +4102,7 @@ void InternalTCXDecoder_fx(
     }
     ELSE
     {
-        mdct_shaping( spectrum_fx, L_frame, gainlpc_fx, gainlpc_e );
+        mdct_noiseShaping_ivas_fx( spectrum_fx, spectrum_e, L_frame, gainlpc_fx, gainlpc_e );
     }
     /*-----------------------------------------------------------*
      * Apply gain                                                *
@@ -5038,11 +4319,7 @@ void InternalTCXDecoder_fx(
                 /* add part of current sub-window overlapping with previous window */
                 FOR( i = 0; i < L_ola; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     tmpP16[i] = add_sat( tmpP16[i], win[i] );
-#else
-                    tmpP16[i] = add( tmpP16[i], win[i] );
-#endif
                     move16();
                 }
                 /* copy new sub-window region not overlapping with previous window */
@@ -5120,11 +4397,7 @@ void InternalTCXDecoder_fx(
             /* add part of current sub-window overlapping with previous window */
             FOR( i = 0; i < L_ola; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tmpP16[i] = add_sat( tmpP16[i], win[i] );
-#else
-                tmpP16[i] = add( tmpP16[i], win[i] );
-#endif
                 move16();
             }
 
@@ -5250,11 +4523,7 @@ void InternalTCXDecoder_fx(
             /* scale output */
             FOR( i = 0; i < L_frame; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf16[i] = shr_o( xn_buf16[i], Q, &Overflow );
-#else  /* BASOP_NOGLOB */
-                xn_buf16[i] = shr( xn_buf16[i], Q );
-#endif /* BASOP_NOGLOB */
                 move16();
             }
 
@@ -5314,11 +4583,7 @@ void InternalTCXDecoder_fx(
             tmp1 = sub( overlap, st->hTcxCfg->tcx_mdct_window_min_length );
             FOR( i = 0; i < tmp1; i++ )
             {
-#ifdef BASOP_NOGLOB
                 xn_buf16[i] = shl_sat( add_sat( xn_buf16[i], shr_sat( hTcxEnc->old_out_fx[i + nz], tmp2 ) ), TCX_IMDCT_HEADROOM );
-#else
-                xn_buf16[i] = shl( add( xn_buf16[i], shr( hTcxEnc->old_out_fx[i + nz], tmp2 ) ), TCX_IMDCT_HEADROOM );
-#endif
                 move16();
             }
 
@@ -5327,158 +4592,909 @@ void InternalTCXDecoder_fx(
             FOR( ; i < tmp1; i++ )
             {
                 tmp3 = mult_r( shr( hTcxEnc->old_out_fx[i + nz], tmp2 ), st->hTcxCfg->tcx_mdct_window_minimum[i - overlap + st->hTcxCfg->tcx_mdct_window_min_length].v.re );
-#ifdef BASOP_NOGLOB
                 xn_buf16[i] = shl_sat( add_sat( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#else
-                xn_buf16[i] = shl( add( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#endif
                 move16();
             }
             FOR( ; i < overlap; i++ )
             {
                 tmp3 = mult_r( shr( hTcxEnc->old_out_fx[i + nz], tmp2 ), st->hTcxCfg->tcx_mdct_window_minimum[overlap - 1 - i].v.im );
-#ifdef BASOP_NOGLOB
                 xn_buf16[i] = shl_sat( add_sat( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#else
-                xn_buf16[i] = shl( add( xn_buf16[i], tmp3 ), TCX_IMDCT_HEADROOM );
-#endif
                 move16();
             }
 
-            FOR( ; i < L_frame; i++ )
-            {
-#ifdef BASOP_NOGLOB
-                xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#else
-                xn_buf16[i] = shl( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#endif
-                move16();
-            }
+            FOR( ; i < L_frame; i++ )
+            {
+                xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM );
+                move16();
+            }
+        }
+        ELSE
+        {
+            test();
+            test();
+            test();
+            if ( ( frame_cnt > 0 ) && ( tcx_last_overlap_mode == 0 ) && ( st->hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( st->last_core != ACELP_CORE ) )
+            {
+                tcx_last_overlap_mode = 2; /* use minimum overlap between the two TCX-10 windows */
+                move16();
+            }
+
+            tmp1 = tcx_last_overlap_mode;
+            move16();
+            test();
+            if ( ( tcx_last_overlap_mode == 0 ) || ( EQ_16( st->hTcxCfg->tcx_last_overlap_mode, MIN_OVERLAP ) ) )
+            {
+                tmp1 = st->hTcxCfg->tcx_last_overlap_mode;
+                move16();
+            }
+
+            tcx_windowing_synthesis_past_frame( hTcxEnc->Txnq, st->hTcxCfg->tcx_aldo_window_1_trunc, st->hTcxCfg->tcx_mdct_window_half,
+                                                st->hTcxCfg->tcx_mdct_window_minimum, overlap, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, tmp1 );
+
+            BASOP_SATURATE_WARNING_OFF_EVS;
+            FOR( i = 0; i < overlap; i++ )
+            {
+                xn_buf16[i] = shl_sat( add( xn_buf16[i], hTcxEnc->Txnq[i] ), TCX_IMDCT_HEADROOM );
+                move16();
+            }
+
+            IF( LT_16( i, L_frame ) )
+            {
+                FOR( ; i < L_frame; i++ )
+                {
+                    xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM );
+                    move16();
+                }
+            }
+            BASOP_SATURATE_WARNING_ON_EVS;
+        }
+    }
+    ELSE
+    {
+        IF( aldo == 0 )
+        {
+            BASOP_SATURATE_WARNING_OFF_EVS;
+            FOR( i = 0; i < L_frame; i++ )
+            {
+                xn_buf16[i] = shl_o( xn_buf16[i], TCX_IMDCT_HEADROOM, &Overflow );
+                move16();
+            }
+            BASOP_SATURATE_WARNING_ON_EVS;
+        }
+    }
+
+    test();
+    test();
+    test();
+    IF( ( aldo == 0 ) &&
+        ( ( EQ_16( L_frameTCX, shr( hTcxEnc->L_frameTCX, 1 ) ) && frame_cnt > 0 ) ||
+          NE_16( L_frameTCX, shr( hTcxEnc->L_frameTCX, 1 ) ) ) )
+    {
+        /*Compute windowed synthesis in case of switching to ALDO windows in next frame*/
+        FOR( i = 0; i < nz; i++ )
+        {
+            hTcxEnc->old_out_fx[i] = shr( xn_buf16[L_frame - nz + i], TCX_IMDCT_HEADROOM );
+            move16();
+        }
+        Copy( xn_buf16 + L_frame, hTcxEnc->old_out_fx + nz, overlap );
+        set16_fx( hTcxEnc->old_out_fx + nz + overlap, 0, nz );
+
+        tcx_windowing_synthesis_past_frame( hTcxEnc->old_out_fx + nz,
+                                            st->hTcxCfg->tcx_aldo_window_1_trunc,
+                                            st->hTcxCfg->tcx_mdct_window_half,
+                                            st->hTcxCfg->tcx_mdct_window_minimum,
+                                            overlap,
+                                            st->hTcxCfg->tcx_mdct_window_half_length,
+                                            st->hTcxCfg->tcx_mdct_window_min_length,
+                                            st->hTcxCfg->tcx_curr_overlap_mode );
+
+        /* If current overlap mode = FULL_OVERLAP -> ALDO_WINDOW */
+        IF( st->hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP )
+        {
+            FOR( i = 0; i < nz; i++ )
+            {
+                hTcxEnc->old_out_fx[nz + overlap + i] = shr( mult_r( xn_buf16[L_frame - 1 - i], st->hTcxCfg->tcx_aldo_window_1[nz - 1 - i] ), TCX_IMDCT_HEADROOM );
+                move16();
+            }
+        }
+
+        hTcxEnc->Q_old_out = -TCX_IMDCT_HEADROOM;
+        move16();
+    }
+    st->hTcxCfg->last_aldo = aldo;
+    move16();
+
+    /* Update Txnq */
+    IF( st->hTcxCfg->last_aldo == 0 )
+    {
+        Copy( xn_buf16 + L_frame, hTcxEnc->Txnq, overlap );
+    }
+
+    tmp1 = L_frame;
+    move16();
+    if ( EQ_16( st->core, TCX_20_CORE ) )
+    {
+        tmp1 = st->L_frame;
+        move16();
+    }
+
+    /* Output */
+    Copy( xn_buf16 + shr( overlap, 1 ) - tcx_offset, synth, tmp1 );
+
+    return;
+}
+
+
+void TNSAnalysisStereo_fx(
+    Encoder_State **sts,                            /* i  : encoder state handle                    */
+    Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* o  : MDST spectrum                       Qx*/
+    const Word16 bWhitenedDomain,                   /* i  : whitened domain flag                    Q0*/
+    Word16 tnsSize[CPE_CHANNELS][NB_DIV],           /* i  : number of tns parameters put into prm   Q0*/
+    Word16 tnsBits[CPE_CHANNELS][NB_DIV],           /* i  : number of tns bits in the frame         Q0*/
+    Word16 param_core[][NB_DIV * NPRM_DIV],         /* o  : TNS parameters                          Q0*/
+    const Word16 mct_on                             /* i  : flag mct block (1) or stereo (0)        Q0*/
+)
+{
+    Word16 ch, k, L_spec, L_frame, nSubframes, iFilter;
+    Word32 *spectrum_fx, sum;
+    Encoder_State *st = NULL;
+    TCX_ENC_HANDLE hTcxEnc = NULL;
+    Word16 individual_decision[NB_DIV];
+    Word32 maxPredictionGain_fx = 0, meanPredictionGain_fx;
+    move32();
+    Word16 maxPredictionGain_e = 0, meanPredictionGain_e;
+    move16();
+    Word16 sum_e = 0;
+    move16();
+    individual_decision[0] = 0;
+    move16();
+    individual_decision[1] = 0;
+    move16();
+    L_spec = -1;
+    move16();
+    L_frame = -1;
+    move16();
+
+    /* TNS filter analysis, loop over channels */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        st = sts[ch];
+        IF( EQ_16( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
+        {
+            CONTINUE;
+        }
+
+        hTcxEnc = st->hTcxEnc;
+
+        IF( EQ_16( hTcxEnc->tcxMode, TCX_20 ) )
+        {
+            nSubframes = 1;
+        }
+        ELSE
+        {
+            nSubframes = NB_DIV;
+        }
+        move16();
+
+        FOR( k = 0; k < nSubframes; k++ )
+        {
+            /* reset tns on whitened domain flag */
+            IF( !bWhitenedDomain )
+            {
+                hTcxEnc->bTnsOnWhithenedSpectra[k] = 0;
+                move16();
+                hTcxEnc->fUseTns[k] = 0;
+                move16();
+            }
+            test();
+            test();
+            IF( st->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+            {
+                spectrum_fx = hTcxEnc->spectrum_fx[k];
+
+                L_frame = hTcxEnc->L_frameTCX;
+                move16();
+                st->hTcxCfg->pCurrentTnsConfig = &st->hTcxCfg->tnsConfig[hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( st->last_core == ACELP_CORE )];
+                L_spec = st->hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
+                move16();
+                /*-----------------------------------------------------------*
+                 * Temporal Noise Shaping analysis                           *
+                 *-----------------------------------------------------------*/
+
+                IF( EQ_16( hTcxEnc->transform_type[k], TCX_5 ) )
+                {
+                    /* rearrange LF sub-window lines prior to TNS analysis & filtering */
+                    tcx5TnsGrouping_fx( shr( L_frame, 2 ), shr( L_spec, 1 ), spectrum_fx );
+                }
+
+                /* WMOPS: All initializations are either for safety or static (tables) and thus not to be counted */
+
+                ResetTnsData( &hTcxEnc->tnsData[k] );
+                IF( st->hTcxCfg->pCurrentTnsConfig->maxOrder <= 0 )
+                {
+                    BREAK;
+                }
+
+                CalculateTnsFilt_fx( st->hTcxCfg->pCurrentTnsConfig, spectrum_fx, hTcxEnc->spectrum_e[k], &hTcxEnc->tnsData[k] );
+            }
+        }
+    }
+
+    IF( !mct_on )
+    {
+        /* TNS decision */
+        /* if framing differs between channels, keep the filter decision per channel */
+        test();
+        test();
+        IF( ( NE_16( sts[0]->hTcxEnc->transform_type[0], sts[1]->hTcxEnc->transform_type[0] ) &&
+              NE_16( sts[0]->hTcxEnc->transform_type[1], sts[1]->hTcxEnc->transform_type[1] ) ) ||
+            NE_16( sts[0]->hTcxCfg->fIsTNSAllowed, sts[1]->hTcxCfg->fIsTNSAllowed ) )
+        {
+            individual_decision[0] = individual_decision[1] = 1;
+            move16();
+            move16();
+        }
+        ELSE IF( bWhitenedDomain )
+        {
+            IF( EQ_16( sts[0]->hTcxEnc->tcxMode, TCX_20 ) )
+            {
+                nSubframes = 1;
+            }
+            ELSE
+            {
+                nSubframes = NB_DIV;
+            }
+            move16();
+            FOR( k = 0; k < nSubframes; k++ )
+            {
+                IF( NE_16( sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k], sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+                {
+                    individual_decision[k] = 1;
+                    move16();
+                }
+            }
+        }
+
+        /* framing equal, check for similar filters, if very similar (also indicator for and M signal),
+         * use at least the same decision, maybe use the same filter
+         */
+        {
+            Word8 isTCX10;
+
+            IF( EQ_16( sts[0]->hTcxEnc->tcxMode, TCX_20 ) )
+            {
+                nSubframes = 1;
+                isTCX10 = 0;
+            }
+            ELSE
+            {
+                nSubframes = NB_DIV;
+                isTCX10 = 1;
+            }
+            move16();
+            move16();
+            FOR( k = 0; k < nSubframes; k++ )
+            {
+                test();
+                test();
+                test();
+                IF( sts[0]->hTcxCfg->fIsTNSAllowed && NE_16( individual_decision[k], 1 ) && ( !bWhitenedDomain || sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+                {
+                    Word32 maxPredGain_fx = -ONE_IN_Q31;
+                    move32();
+                    Word16 maxPredGain_e = 0;
+                    move16();
+                    sts[0]->hTcxCfg->pCurrentTnsConfig = &sts[0]->hTcxCfg->tnsConfig[sts[0]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[0]->last_core == ACELP_CORE )];
+                    sts[1]->hTcxCfg->pCurrentTnsConfig = &sts[1]->hTcxCfg->tnsConfig[sts[1]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[1]->last_core == ACELP_CORE )];
+
+                    FOR( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                    {
+                        STnsFilter *pFilter[2];
+                        struct TnsParameters const *pTnsParameters[2];
+                        pFilter[0] = sts[0]->hTcxEnc->tnsData[k].filter + iFilter;
+                        pTnsParameters[0] = sts[0]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
+                        pFilter[1] = sts[1]->hTcxEnc->tnsData[k].filter + iFilter;
+                        pTnsParameters[1] = sts[1]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
+
+                        /* if prediction gain and avgSqrCoef are both close we are pretty sure the filters are quite similar, use the avg of
+                         * both filters for the decision
+                         */
+
+                        meanPredictionGain_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( pFilter[0]->predictionGain32, 16384 /*0.5f Q15*/ ), pFilter[0]->predictionGain_e, Mpy_32_16_1( pFilter[1]->predictionGain32, 16384 /*0.5f Q15*/ ), pFilter[1]->predictionGain_e, &meanPredictionGain_e ); // meanPredictionGain_e
+
+                        /* maxPredictionGain = max( maxPredictionGain, meanPredictionGain );*/
+                        IF( GT_32( meanPredictionGain_fx, L_shl_sat( maxPredictionGain_fx, sub( maxPredictionGain_e, meanPredictionGain_e ) ) ) ) /* exp: meanPredictionGain_e */
+                        {
+                            maxPredictionGain_fx = meanPredictionGain_fx;
+                            maxPredictionGain_e = meanPredictionGain_e;
+                            move32();
+                            move16();
+                        }
+
+                        test();
+                        test();
+                        test();
+                        IF( GT_32( pFilter[0]->predictionGain32, L_shl_sat( L_deposit_h( pTnsParameters[0]->minPredictionGain ), sub( PRED_GAIN_E, pFilter[0]->predictionGain_e ) ) ) && LT_32( sts[0]->element_brate, IVAS_80k ) &&
+                            GT_32( pFilter[1]->predictionGain32, L_shl_sat( L_deposit_h( pTnsParameters[1]->minPredictionGain ), sub( PRED_GAIN_E, pFilter[1]->predictionGain_e ) ) ) && EQ_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) )
+                        {
+                            pFilter[0]->predictionGain32 = pFilter[1]->predictionGain32 = meanPredictionGain_fx; /* more TNS filter sync at 48kbps */
+                            move32();
+                            move32();
+                            pFilter[0]->predictionGain_e = pFilter[1]->predictionGain_e = meanPredictionGain_e; /* more TNS filter sync at 48kbps */
+                            move16();
+                            move16();
+                            pFilter[0]->predictionGain = pFilter[1]->predictionGain = shl_sat( extract_h( meanPredictionGain_fx ), sub( meanPredictionGain_e, PRED_GAIN_E ) ); /* Q7 */
+                            move16();
+                        }
+                        sum_e = s_max( pFilter[0]->predictionGain_e, pFilter[1]->predictionGain_e );
+                        sum = L_abs( L_sub_sat( L_shl( pFilter[0]->predictionGain32, sub( pFilter[0]->predictionGain_e, sum_e ) ), L_shl( pFilter[1]->predictionGain32, sub( pFilter[1]->predictionGain_e, sum_e ) ) ) ); // sum_e
+
+                        IF( LT_32( L_shl_sat( sum, sub( sum_e, meanPredictionGain_e ) ), Mpy_32_16_1( meanPredictionGain_fx, SIMILAR_TNS_THRESHOLD_FX_IN_Q15 ) ) &&
+                            ( EQ_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) ) )
+                        {
+
+                            Word16 maxAvgSqrCoef_fx = s_max( pFilter[0]->avgSqrCoef, pFilter[1]->avgSqrCoef ); // Q15
+                            Word16 meanLtpGain_fx = add( shr( sts[0]->hTcxEnc->tcxltp_gain, 1 ), shr( sts[1]->hTcxEnc->tcxltp_gain, 1 ) );
+
+                            /* maxPredGain_fx = L_max( maxPredGain_fx, meanPredictionGain_fx ); */
+                            IF( GT_32( meanPredictionGain_fx, L_shl_sat( maxPredGain_fx, sub( maxPredGain_e, maxPredictionGain_e ) ) ) ) /* exp: meanPredictionGain_e */
+                            {
+                                maxPredGain_fx = meanPredictionGain_fx;
+                                maxPredGain_e = meanPredictionGain_e;
+                                move32();
+                                move16();
+                            }
+
+                            test();
+                            test();
+                            IF( GT_32( meanPredictionGain_fx, L_shl_sat( L_deposit_h( pTnsParameters[0]->minPredictionGain ), sub( PRED_GAIN_E, meanPredictionGain_e ) ) ) || GT_16( maxAvgSqrCoef_fx, pTnsParameters[0]->minAvgSqrCoef ) )
+                            {
+                                test();
+                                test();
+                                test();
+                                IF( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 || sts[1]->hTcxEnc->tnsData[k].nFilters > 0 || isTCX10 || LT_16( meanLtpGain_fx, 19660 /* 0.6 in Q15*/ ) )
+                                {
+
+                                    sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                    move16();
+                                    /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
+                                    this may result in crash later. Changing the filter type here so the order is taken here in further section */
+                                    IF( pFilter[0]->order != 0 )
+                                    {
+                                        pFilter[0]->filterType = TNS_FILTER_ON;
+                                        move16();
+                                    }
+                                    ELSE
+                                    {
+                                        pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
+                                        move16();
+                                    }
+                                    sts[1]->hTcxEnc->tnsData[k].nFilters = add( sts[1]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                    move16();
+                                    IF( pFilter[1]->order != 0 )
+                                    {
+                                        pFilter[1]->filterType = TNS_FILTER_ON;
+                                        move16();
+                                    }
+                                    ELSE
+                                    {
+                                        pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
+                                        move16();
+                                    }
+                                }
+                                ELSE
+                                {
+                                    Word16 maxEnergyChange_fx;
+                                    maxEnergyChange_fx = mac_r( L_mult( GetTCXMaxenergyChange_ivas_fx( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 ), GetTCXMaxenergyChange_ivas_fx( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 );
+
+                                    IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters[0]->minEnergyChange, Q3 - Q7 ) ) )
+                                    {
+                                        sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                        move16();
+                                        /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
+                                        this may result in crash later. Changing the filter type here so the order is taken here in further section */
+                                        IF( pFilter[0]->order != 0 )
+                                        {
+                                            pFilter[0]->filterType = TNS_FILTER_ON;
+                                            move16();
+                                        }
+                                        ELSE
+                                        {
+                                            pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
+                                            move16();
+                                        }
+                                        sts[1]->hTcxEnc->tnsData[k].nFilters = add( sts[1]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                        move16();
+                                        IF( pFilter[1]->order != 0 )
+                                        {
+                                            pFilter[1]->filterType = TNS_FILTER_ON;
+                                            move16();
+                                        }
+                                        ELSE
+                                        {
+                                            pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
+                                            move16();
+                                        }
+                                    }
+                                    ELSE
+                                    {
+                                        pFilter[0]->filterType = TNS_FILTER_OFF;
+                                        move16();
+                                        pFilter[1]->filterType = TNS_FILTER_OFF;
+                                        move16();
+                                    }
+                                }
+                            }
+                            ELSE IF( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 && sts[1]->hTcxEnc->tnsData[k].nFilters > 0 ) /* If a previous filter is turned on */
+                            {
+                                pFilter[0]->filterType = TNS_FILTER_ON_ZERO;
+                                pFilter[1]->filterType = TNS_FILTER_ON_ZERO;
+                                move16();
+                                move16();
+                                sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                move16();
+                                sts[1]->hTcxEnc->tnsData[k].nFilters = add( sts[1]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                move16();
+                            }
+                            ELSE IF( NE_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) ) /* sanity check */
+                            {
+                                assert( 0 );
+                            }
+                            ELSE
+                            {
+                                pFilter[0]->filterType = TNS_FILTER_OFF;
+                                move16();
+                                pFilter[1]->filterType = TNS_FILTER_OFF;
+                                move16();
+                            }
+
+                            test();
+                            test();
+                            IF( EQ_16( pFilter[0]->filterType, TNS_FILTER_ON ) && EQ_16( pFilter[1]->filterType, TNS_FILTER_ON ) && LT_32( sts[0]->element_brate, IVAS_80k ) )
+                            {
+                                Word16 tmpIntValue = 0;
+                                move16();
+                                Word16 tmpCoeff[TNS_MAX_FILTER_ORDER];
+                                Word16 i, maxOrder = s_max( pFilter[0]->order, pFilter[1]->order );
+
+                                set16_fx( tmpCoeff, 0, TNS_MAX_FILTER_ORDER );
+                                FOR( i = 0; i < maxOrder; i++ )
+                                {
+                                    tmpIntValue = s_max( tmpIntValue, abs_s( sub( pFilter[0]->coefIndex[i], pFilter[1]->coefIndex[i] ) ) );
+                                }
+
+                                IF( EQ_16( tmpIntValue, 1 ) ) /* the TNS coefficients are sufficiently similar to equalize the two filters */
+                                {
+                                    FOR( i = maxOrder - 1; i >= 0; i-- )
+                                    {
+                                        IF( LT_16( abs_s( pFilter[0]->coefIndex[i] ), abs_s( pFilter[1]->coefIndex[i] ) ) )
+                                        {
+                                            tmpCoeff[i] = pFilter[0]->coefIndex[i];
+                                        }
+                                        ELSE
+                                        {
+                                            tmpCoeff[i] = pFilter[1]->coefIndex[i];
+                                        }
+                                        move16();
+                                        IF( ( tmpIntValue > 0 ) && ( tmpCoeff[i] == 0 ) )
+                                        {
+                                            maxOrder = sub( maxOrder, 1 );
+                                        }
+                                        ELSE
+                                        {
+                                            tmpIntValue = 0;
+                                            move16();
+                                        }
+                                    }
+                                    /* make sure that maxOrder is non zero and not all coefficients are zero (could happen in rare cases) */
+                                    IF( maxOrder > 0 )
+                                    {
+                                        FOR( i = TNS_MAX_FILTER_ORDER - 1; i >= 0; i-- )
+                                        {
+                                            pFilter[0]->coefIndex[i] = pFilter[1]->coefIndex[i] = tmpCoeff[i];
+                                            move16();
+                                            move16();
+                                        }
+
+                                        pFilter[0]->order = pFilter[1]->order = maxOrder;
+                                        move16();
+                                        move16();
+                                    }
+                                }
+                            }
+                        }
+                        ELSE
+                        {
+                            individual_decision[k] = 1;
+                            move16();
+                        }
+                    }
+
+                    IF( individual_decision[k] == 0 )
+                    {
+                        IF( ( sts[0]->hTcxEnc->tnsData[k].nFilters > 0 ) )
+                        {
+                            sts[0]->hTcxEnc->fUseTns[k] = 1;
+                        }
+                        ELSE
+                        {
+                            sts[0]->hTcxEnc->fUseTns[k] = 0;
+                        }
+                        move16();
+
+                        IF( ( sts[1]->hTcxEnc->tnsData[k].nFilters > 0 ) )
+                        {
+                            sts[1]->hTcxEnc->fUseTns[k] = 1;
+                        }
+                        ELSE
+                        {
+                            sts[1]->hTcxEnc->fUseTns[k] = 0;
+                        }
+                        move16();
+                    }
+                    ELSE
+                    {
+                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;
+                        move16();
+                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;
+                        move16();
+                        sts[0]->hTcxEnc->fUseTns[k] = 0;
+                        move16();
+                        sts[1]->hTcxEnc->fUseTns[k] = 0;
+                        move16();
+                        FOR( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                        {
+                            sts[0]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
+                            move16();
+                            sts[1]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
+                            move16();
+                        }
+                    }
+
+                    test();
+                    test();
+                    test();
+                    IF( !bWhitenedDomain && individual_decision[k] == 0 &&
+                        LT_32( L_shl_sat( maxPredGain_fx, sub( maxPredGain_e, PRED_GAIN_E ) ), TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q23 ) &&
+                        NE_16( sts[0]->hTcxEnc->transform_type[k], TCX_5 ) )
+                    {
+                        sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
+                        move16();
+                        sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
+                        move16();
+                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;
+                        move16();
+                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;
+                        move16();
+                        sts[0]->hTcxEnc->fUseTns[k] = 0;
+                        move16();
+                        sts[1]->hTcxEnc->fUseTns[k] = 0;
+                        move16();
+                        FOR( iFilter = sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                        {
+                            ClearTnsFilterCoefficients( sts[0]->hTcxEnc->tnsData[k].filter + iFilter );
+                            ClearTnsFilterCoefficients( sts[1]->hTcxEnc->tnsData[k].filter + iFilter );
+                        }
+                    }
+
+                    /* maxPredictionGain_fx = L_max( maxPredictionGain_fx, maxPredGain_fx ); */
+                    IF( GT_32( maxPredGain_fx, L_shl_sat( maxPredictionGain_fx, sub( maxPredictionGain_e, maxPredGain_e ) ) ) ) /* exp: maxPredGain_e */
+                    {
+                        maxPredictionGain_fx = maxPredGain_fx;
+                        maxPredictionGain_e = maxPredGain_e;
+                        move32();
+                        move16();
+                    }
+                }
+            }
+        }
+    }
+
+    /* individual decision for each channel */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        IF( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
+        {
+            CONTINUE;
+        }
+
+        Word8 isTCX10;
+
+        IF( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+        {
+            nSubframes = 1;
+            isTCX10 = 0;
         }
         ELSE
+        {
+            nSubframes = NB_DIV;
+            isTCX10 = 1;
+        }
+        move16();
+        move16();
+
+        FOR( k = 0; k < nSubframes; k++ )
         {
             test();
             test();
             test();
-            if ( ( frame_cnt > 0 ) && ( tcx_last_overlap_mode == 0 ) && ( st->hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( st->last_core != ACELP_CORE ) )
-            {
-                tcx_last_overlap_mode = 2; /* use minimum overlap between the two TCX-10 windows */
-                move16();
-            }
-
-            tmp1 = tcx_last_overlap_mode;
-            move16();
             test();
-            if ( ( tcx_last_overlap_mode == 0 ) || ( EQ_16( st->hTcxCfg->tcx_last_overlap_mode, MIN_OVERLAP ) ) )
+            IF( sts[ch]->hTcxCfg->fIsTNSAllowed && ( individual_decision[k] || mct_on ) &&
+                ( !bWhitenedDomain || sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
             {
-                tmp1 = st->hTcxCfg->tcx_last_overlap_mode;
+                Word32 maxPredGain_fx = -ONE_IN_Q31; // Q31
+                move32();
+                Word16 maxPredGain_e = 0;
                 move16();
-            }
+                sts[ch]->hTcxCfg->pCurrentTnsConfig = &sts[ch]->hTcxCfg->tnsConfig[sts[ch]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[ch]->last_core == ACELP_CORE )];
 
-            tcx_windowing_synthesis_past_frame( hTcxEnc->Txnq, st->hTcxCfg->tcx_aldo_window_1_trunc, st->hTcxCfg->tcx_mdct_window_half,
-                                                st->hTcxCfg->tcx_mdct_window_minimum, overlap, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, tmp1 );
+                FOR( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                {
+                    STnsFilter *pFilter;
+                    struct TnsParameters const *pTnsParameters;
+                    pFilter = sts[ch]->hTcxEnc->tnsData[k].filter + iFilter;
+                    pTnsParameters = sts[ch]->hTcxCfg->pCurrentTnsConfig->pTnsParameters + iFilter;
 
-            BASOP_SATURATE_WARNING_OFF_EVS;
-            FOR( i = 0; i < overlap; i++ )
-            {
-#ifdef BASOP_NOGLOB
-                xn_buf16[i] = shl_sat( add( xn_buf16[i], hTcxEnc->Txnq[i] ), TCX_IMDCT_HEADROOM );
-#else
-                xn_buf16[i] = shl( add( xn_buf16[i], hTcxEnc->Txnq[i] ), TCX_IMDCT_HEADROOM );
-#endif
+                    // maxPredGain_fx = L_max( maxPredGain_fx, pFilter->predictionGain32 );
+                    IF( GT_32( pFilter->predictionGain32, L_shl_sat( maxPredGain_fx, sub( maxPredGain_e, pFilter->predictionGain_e ) ) ) ) /* pFilter->predictionGain_e */
+                    {
+                        maxPredGain_fx = pFilter->predictionGain32;
+                        maxPredGain_e = pFilter->predictionGain_e;
+                        move32();
+                        move16();
+                    }
+
+                    test();
+                    IF( GT_32( pFilter->predictionGain32, L_shl_sat( L_deposit_h( pTnsParameters->minPredictionGain ), sub( PRED_GAIN_E, pFilter->predictionGain_e ) ) ) || GT_16( pFilter->avgSqrCoef, pTnsParameters->minAvgSqrCoef ) )
+                    {
+                        test();
+                        test();
+                        IF( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 || isTCX10 || LT_16( sts[ch]->hTcxEnc->tcxltp_gain, 19660 /*.6f in Q15*/ ) )
+                        {
+                            sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
+                            move16();
+                            /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
+                            this may result in crash later. Changing the filter type here so the order is taken here in further section */
+                            IF( pFilter->order != 0 )
+                            {
+                                pFilter->filterType = TNS_FILTER_ON;
+                                move16();
+                            }
+                            ELSE
+                            {
+                                pFilter->filterType = TNS_FILTER_ON_ZERO;
+                                move16();
+                            }
+                        }
+                        ELSE
+                        {
+                            Word16 maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3 );
+
+                            IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) )
+                            {
+                                sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
+                                move16();
+                                /* When order parameter is evaluated as 0 and change in precision causes the flow to reach here,
+                                this may result in crash later. Changing the filter type here so the order is taken here in further section */
+                                IF( pFilter->order != 0 )
+                                {
+                                    pFilter->filterType = TNS_FILTER_ON;
+                                    move16();
+                                }
+                                ELSE
+                                {
+                                    pFilter->filterType = TNS_FILTER_ON_ZERO;
+                                    move16();
+                                }
+                            }
+                            ELSE
+                            {
+                                pFilter->filterType = TNS_FILTER_OFF;
+                                move16();
+                            }
+                        }
+                    }
+                    ELSE IF( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 ) /* If a previous filter is turned on */
+                    {
+                        pFilter->filterType = TNS_FILTER_ON_ZERO;
+                        move16();
+                        sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
+                        move16();
+                    }
+                    ELSE
+                    {
+                        pFilter->filterType = TNS_FILTER_OFF;
+                        move16();
+                    }
+                }
+
+                sts[ch]->hTcxEnc->fUseTns[k] = 0;
                 move16();
-            }
+                if ( sts[ch]->hTcxEnc->tnsData[k].nFilters > 0 )
+                {
+                    sts[ch]->hTcxEnc->fUseTns[k] = 1;
+                    move16();
+                }
 
-            IF( LT_16( i, L_frame ) )
-            {
-                FOR( ; i < L_frame; i++ )
+                test();
+                test();
+                IF( !bWhitenedDomain && LT_32( L_shl_sat( maxPredGain_fx, sub( maxPredGain_e, PRED_GAIN_E ) ), TNS_GAIN_THRESHOLD_FOR_WHITE_FX_IN_Q23 ) && NE_16( sts[ch]->hTcxEnc->transform_type[k], TCX_5 ) )
                 {
-#ifdef BASOP_NOGLOB
-                    xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#else
-                    xn_buf16[i] = shl( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#endif
+                    sts[ch]->hTcxEnc->fUseTns[k] = 0;
+                    move16();
+                    sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] = 1;
+                    move16();
+                    sts[ch]->hTcxEnc->tnsData[k].nFilters = 0;
+                    move16();
+                    FOR( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                    {
+                        ClearTnsFilterCoefficients( sts[ch]->hTcxEnc->tnsData[k].filter + iFilter );
+                        sts[ch]->hTcxEnc->tnsData[k].filter[iFilter].filterType = TNS_FILTER_OFF;
+                        move16();
+                    }
+                }
+
+                // maxPredictionGain_fx = L_max( maxPredictionGain_fx, maxPredGain_fx );
+                IF( GT_32( maxPredGain_fx, L_shl_sat( maxPredictionGain_fx, sub( maxPredictionGain_e, maxPredGain_e ) ) ) ) /* maxPredGain_e */
+                {
+                    maxPredictionGain_fx = maxPredGain_fx;
+                    maxPredictionGain_e = maxPredGain_e;
+                    move32();
                     move16();
                 }
             }
-            BASOP_SATURATE_WARNING_ON_EVS;
         }
     }
-    ELSE
+
+
+    /* we have the decision, set filter data accordingly */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
-        IF( aldo == 0 )
+        IF( EQ_16( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
         {
-            BASOP_SATURATE_WARNING_OFF_EVS;
-            FOR( i = 0; i < L_frame; i++ )
+            CONTINUE;
+        }
+
+        IF( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+        {
+            nSubframes = 1;
+        }
+        ELSE
+        {
+            nSubframes = NB_DIV;
+        }
+        move16();
+        FOR( k = 0; k < nSubframes; k++ )
+        {
+            test();
+            test();
+            IF( sts[ch]->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || sts[ch]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
             {
-#ifdef BASOP_NOGLOB
-                xn_buf16[i] = shl_o( xn_buf16[i], TCX_IMDCT_HEADROOM, &Overflow );
-#else /* BASOP_NOGLOB */
-                xn_buf16[i] = shl( xn_buf16[i], TCX_IMDCT_HEADROOM );
-#endif
-                move16();
+                sts[ch]->hTcxCfg->pCurrentTnsConfig = &sts[ch]->hTcxCfg->tnsConfig[sts[ch]->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( sts[ch]->last_core == ACELP_CORE )];
+
+                FOR( iFilter = sts[ch]->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                {
+                    STnsFilter *pFilter;
+                    pFilter = sts[ch]->hTcxEnc->tnsData[k].filter + iFilter;
+                    SWITCH( pFilter->filterType )
+                    {
+                        case TNS_FILTER_OFF:
+                            ClearTnsFilterCoefficients( sts[ch]->hTcxEnc->tnsData[k].filter + iFilter );
+                            BREAK;
+                        case TNS_FILTER_ON_ZERO:
+                            /* Since TNS filter of order 0 is not allowed we have to signal in the stream filter of order 1 with the 0th coefficient equal to 0 */
+                            ClearTnsFilterCoefficients( pFilter );
+                            pFilter->order = 1;
+                            move16();
+                            BREAK;
+                    }
+                }
             }
-            BASOP_SATURATE_WARNING_ON_EVS;
         }
     }
 
-    test();
-    test();
-    test();
-    IF( ( aldo == 0 ) &&
-        ( ( EQ_16( L_frameTCX, shr( hTcxEnc->L_frameTCX, 1 ) ) && frame_cnt > 0 ) ||
-          NE_16( L_frameTCX, shr( hTcxEnc->L_frameTCX, 1 ) ) ) )
+    /* Apply filters, loop over channels */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
-        /*Compute windowed synthesis in case of switching to ALDO windows in next frame*/
-        FOR( i = 0; i < nz; i++ )
+        st = sts[ch];
+        IF( EQ_32( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
         {
-            hTcxEnc->old_out_fx[i] = shr( xn_buf16[L_frame - nz + i], TCX_IMDCT_HEADROOM );
-            move16();
+            CONTINUE;
         }
-        Copy( xn_buf16 + L_frame, hTcxEnc->old_out_fx + nz, overlap );
-        set16_fx( hTcxEnc->old_out_fx + nz + overlap, 0, nz );
 
-        tcx_windowing_synthesis_past_frame( hTcxEnc->old_out_fx + nz,
-                                            st->hTcxCfg->tcx_aldo_window_1_trunc,
-                                            st->hTcxCfg->tcx_mdct_window_half,
-                                            st->hTcxCfg->tcx_mdct_window_minimum,
-                                            overlap,
-                                            st->hTcxCfg->tcx_mdct_window_half_length,
-                                            st->hTcxCfg->tcx_mdct_window_min_length,
-                                            st->hTcxCfg->tcx_curr_overlap_mode );
+        IF( EQ_16( st->hTcxEnc->tcxMode, TCX_20 ) )
+        {
+            nSubframes = 1;
+        }
+        ELSE
+        {
+            nSubframes = NB_DIV;
+        }
+        move16();
 
-        /* If current overlap mode = FULL_OVERLAP -> ALDO_WINDOW */
-        IF( st->hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP )
+        FOR( k = 0; k < nSubframes; k++ )
         {
-            FOR( i = 0; i < nz; i++ )
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( bWhitenedDomain && ( ch > 0 ) && /* test for identical TNS filter data in both channels */
+                sts[0]->hTcxCfg->fIsTNSAllowed && sts[0]->hTcxEnc->fUseTns[k] &&
+                sts[1]->hTcxCfg->fIsTNSAllowed && sts[1]->hTcxEnc->fUseTns[k] )
             {
-                hTcxEnc->old_out_fx[nz + overlap + i] = shr( mult_r( xn_buf16[L_frame - 1 - i], st->hTcxCfg->tcx_aldo_window_1[nz - 1 - i] ), TCX_IMDCT_HEADROOM );
+                Word16 equalFilterData = 0;
                 move16();
-            }
-        }
+                test();
+                test();
+                if ( EQ_16( sts[0]->hTcxCfg->pCurrentTnsConfig->nMaxFilters, sts[1]->hTcxCfg->pCurrentTnsConfig->nMaxFilters ) &&
+                     EQ_16( sts[0]->hTcxEnc->bTnsOnWhithenedSpectra[k], sts[1]->hTcxEnc->bTnsOnWhithenedSpectra[k] ) &&
+                     EQ_16( sts[0]->hTcxEnc->tnsData[k].nFilters, sts[1]->hTcxEnc->tnsData[k].nFilters ) )
+                {
+                    equalFilterData = 1;
+                    move16();
+                }
 
-        hTcxEnc->Q_old_out = -TCX_IMDCT_HEADROOM;
-        move16();
-    }
-    st->hTcxCfg->last_aldo = aldo;
-    move16();
+                IF( equalFilterData )
+                {
+                    FOR( iFilter = st->hTcxCfg->pCurrentTnsConfig->nMaxFilters - 1; iFilter >= 0; iFilter-- )
+                    {
+                        const Word16 *pDataCh0 = (const Word16 *) &sts[0]->hTcxEnc->tnsData[k].filter[iFilter];
+                        const Word16 *pDataCh1 = (const Word16 *) &sts[1]->hTcxEnc->tnsData[k].filter[iFilter];
+                        Word16 i = 2 + TNS_MAX_FILTER_ORDER; /* excl. informative float data. Portable? */
 
-    /* Update Txnq */
-    IF( st->hTcxCfg->last_aldo == 0 )
-    {
-        Copy( xn_buf16 + L_frame, hTcxEnc->Txnq, overlap );
-    }
+                        move16();
+                        test();
+                        WHILE( ( i >= 0 ) && EQ_16( pDataCh0[i], pDataCh1[i] ) )
+                        {
+                            test();
+                            i = sub( i, 1 );
+                        }
+                        IF( i >= 0 )
+                        {
+                            equalFilterData = 0;
+                            move16();
+                            BREAK;
+                        }
+                    }
+                    IF( equalFilterData )
+                    {
+                        st->hTcxEnc->tnsData[k].nFilters = i_mult( st->hTcxEnc->tnsData[k].nFilters, -1 ); /* signals common TNS */
+                        move16();
+                    }
+                }
+            }
+            test();
+            test();
+            IF( st->hTcxCfg->fIsTNSAllowed && ( !bWhitenedDomain || st->hTcxEnc->bTnsOnWhithenedSpectra[k] ) )
+            {
+                L_spec = st->hTcxCfg->pCurrentTnsConfig->iFilterBorders[0];
+                move16();
+                spectrum_fx = st->hTcxEnc->spectrum_fx[k];
+                /* If TNS should be used then get the residual after applying it inplace in the spectrum */
+                IF( st->hTcxEnc->fUseTns[k] )
+                {
+                    st->hTcxCfg->pCurrentTnsConfig = &st->hTcxCfg->tnsConfig[st->hTcxEnc->transform_type[k] == TCX_20][( k == 0 ) && ( st->last_core == ACELP_CORE )];
 
-    tmp1 = L_frame;
-    move16();
-    if ( EQ_16( st->core, TCX_20_CORE ) )
-    {
-        tmp1 = st->L_frame;
-        move16();
-    }
+                    ApplyTnsFilter( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], spectrum_fx, 1 );
+                }
 
-    /* Output */
-    Copy( xn_buf16 + shr( overlap, 1 ) - tcx_offset, synth, tmp1 );
+                IF( EQ_16( st->hTcxEnc->transform_type[k], TCX_5 ) )
+                {
+                    tcx5TnsUngrouping_fx( shr( L_frame, 2 ), shr( L_spec, 1 ), st->hTcxEnc->spectrum_fx[k], ENC );
+                }
 
+                st->hTcxEnc->tnsData[k].tnsOnWhitenedSpectra = st->hTcxEnc->bTnsOnWhithenedSpectra[k];
+                move16();
+                EncodeTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );
+            }
+
+            IF( EQ_16( st->hTcxEnc->transform_type[k], TCX_5 ) )
+            {
+                tcx5SpectrumInterleaving_fx( st->hTcxCfg->tcx5SizeFB, st->hTcxEnc->spectrum_fx[k] );
+                tcx5SpectrumInterleaving_fx( st->hTcxCfg->tcx5SizeFB, mdst_spectrum_fx[ch][k] );
+            }
+        }
+    }
     return;
 }
diff --git a/lib_enc/cod_uv.c b/lib_enc/cod_uv.c
deleted file mode 100644
index e748899a9667996f0776eb65127752b66796a660..0000000000000000000000000000000000000000
--- a/lib_enc/cod_uv.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/cod_uv_fx.c b/lib_enc/cod_uv_fx.c
index 22b51541755628ab629d9f73f3ca25292aa64637..8b1e8a1446925ded36467c3c76af609ce3066edf 100644
--- a/lib_enc/cod_uv_fx.c
+++ b/lib_enc/cod_uv_fx.c
@@ -76,21 +76,13 @@ void gauss_L2_fx(
     }
 
     tmp16 = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
     g_corr->y1y1 = round_fx_sat( L_shl( tmp32, tmp16 ) );
-#else
-    g_corr->y1y1 = round_fx( L_shl( tmp32, tmp16 ) );
-#endif
     g_corr->y1y1_e = sub( 31 - 18, tmp16 );
     move16();
     move16();
 
     tmp16 = norm_l( tmp32_2 );
-#ifdef BASOP_NOGLOB
     g_corr->y1y2 = round_fx_sat( L_shl( tmp32_2, tmp16 ) );
-#else
-    g_corr->y1y2 = round_fx( L_shl( tmp32_2, tmp16 ) );
-#endif
     g_corr->y1y2_e = sub( 31 - 18, tmp16 );
     move16();
     move16();
@@ -143,29 +135,25 @@ void gauss_L2_ivas_fx(
     *gain = L_deposit_l( 0 );
     move32();
     /*Update correlations for gains coding */
-    tmp32 = L_shr( 21474836l /*0.01f Q31*/, 31 - 18 );   /* Q18 */
-    tmp32_2 = L_shr( 21474836l /*0.01f Q31*/, 31 - 18 ); /* Q18 */
-
+    tmp32 = L_shr( 21474836l /*0.01f Q31*/, 31 - 16 );   /* Q16 */
+    tmp32_2 = L_shr( 21474836l /*0.01f Q31*/, 31 - 16 ); /* Q16 */
     FOR( i = 0; i < L_SUBFR; i++ )
     {
-        tmp32 = L_mac0( tmp32, y11[i], y11[i] );    /* Q18 */
-        tmp32_2 = L_mac0( tmp32_2, y11[i], y2[i] ); /* Q18 */
+        tmp16 = shr( y11[i], 1 );
+        tmp32 = L_mac0( tmp32, tmp16, tmp16 );               /* Q16 */
+        tmp32_2 = L_mac0( tmp32_2, tmp16, shr( y2[i], 1 ) ); /* Q16 */
     }
 
     tmp16 = norm_l( tmp32 );
     // To be checked
-#ifdef BASOP_NOGLOB
     g_corr->y1y1 = round_fx_sat( L_shl( tmp32, tmp16 ) );
-#else
-    g_corr->y1y1 = round_fx( L_shl( tmp32, tmp16 ) );
-#endif
-    g_corr->y1y1_e = sub( 31 - 18, tmp16 );
+    g_corr->y1y1_e = sub( 31 - 16, tmp16 );
     move16();
     move16();
 
     tmp16 = norm_l( tmp32_2 );
     g_corr->y1y2 = round_fx_sat( L_shl( tmp32_2, tmp16 ) );
-    g_corr->y1y2_e = sub( 31 - 18, tmp16 );
+    g_corr->y1y2_e = sub( 31 - 16, tmp16 );
     move16();
     move16();
 }
diff --git a/lib_enc/comvad_decision.c b/lib_enc/comvad_decision.c
deleted file mode 100644
index f6ca036b27f7e95c3f6ba78df12466fae5467faa..0000000000000000000000000000000000000000
--- a/lib_enc/comvad_decision.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/cor_shif.c b/lib_enc/cor_shif.c
deleted file mode 100644
index 825401325748d89d4db5894372ff8dd2e53d76ec..0000000000000000000000000000000000000000
--- a/lib_enc/cor_shif.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/cor_shif_fx.c b/lib_enc/cor_shif_fx.c
index 1120235052e6863cee83f1794f0cc5697929428a..28e837f486cc10b95f9852599f2b98002369c087 100644
--- a/lib_enc/cor_shif_fx.c
+++ b/lib_enc/cor_shif_fx.c
@@ -40,13 +40,9 @@ Word16 correlation_shift_fx(                            /* o  : noise dependent
         f_Noise = L_Extract_lc( Ltmp, &e_Noise );
         wtmp = extract_l( Pow2( 14, f_Noise ) ); /* Put 14 as exponent */
 
-        e_Noise = sub( e_Noise, 14 );     /* Retreive exponent of wtmp */
-        Ltmp = Mpy_32_16( 8, 837, wtmp ); /* 2.4492e-4(Q31) * exp(0.1596*totalNoise) */
-#ifdef BASOP_NOGLOB
-        Ltmp = L_shl_sat( Ltmp, add( e_Noise, 15 ) ); /* Result in Q31 */
-#else
-        Ltmp = L_shl( Ltmp, add( e_Noise, 15 ) ); /* Result in Q31 */
-#endif
+        e_Noise = sub( e_Noise, 14 );                        /* Retreive exponent of wtmp */
+        Ltmp = Mpy_32_16( 8, 837, wtmp );                    /* 2.4492e-4(Q31) * exp(0.1596*totalNoise) */
+        Ltmp = L_shl_sat( Ltmp, add( e_Noise, 15 ) );        /* Result in Q31 */
         corr_shift_fx = round_fx( L_sub( Ltmp, 47244640 ) ); /* Represents corr_shift in Q15 */
     }
     corr_shift_fx = s_min( corr_shift_fx, 16384 ); /* limit to 0.5 */
diff --git a/lib_enc/core_enc_2div.c b/lib_enc/core_enc_2div.c
deleted file mode 100644
index 0fe8682daace6673130ca2ca05de2a188e8e2ae0..0000000000000000000000000000000000000000
--- a/lib_enc/core_enc_2div.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c
deleted file mode 100644
index e09166f8a2f6ec504872d09f44fce67d336c3608..0000000000000000000000000000000000000000
--- a/lib_enc/core_enc_init.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "options_warnings.h"
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-
-#include "prot_fx.h"
-
-/*-----------------------------------------------------------------------*
- * Local function prototypes
- *-----------------------------------------------------------------------*/
-static void init_tcx_ivas_fx( Encoder_State *st, const Word16 L_frame_old, const Word32 total_brate, const Word32 last_total_brate, const Word16 MCT_flag );
-static void init_core_sig_ana_ivas_fx( Encoder_State *st );
-static void init_modes_ivas_fx( Encoder_State *st, const Word32 last_total_brate );
-static void init_sig_buffers_ivas_fx( Encoder_State *st, const Word16 L_frame_old, const Word16 L_subfr );
-static void init_acelp_ivas_fx( Encoder_State *st, Word16 L_frame_old, Word16 shift );
-/*-----------------------------------------------------------------------*
- * init_coder_ace_plus()
- *
- * Initialization of state variables
- *-----------------------------------------------------------------------*/
-void init_coder_ace_plus_ivas_fx(
-    Encoder_State *st,             /* i  : Encoder state                          */
-    const Word32 last_total_brate, /* i  : last total bitrate                     */
-    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */
-)
-{
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    Word16 L_frame_old; /*keep old frame size for switching */
-    Word16 L_subfr;
-
-    /* Bitrate */
-    st->tcxonly = getTcxonly_ivas_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
-    move16();
-
-    /* Core Sampling Rate */
-    st->sr_core = getCoreSamplerateMode2( st->element_mode, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, st->is_ism_format );
-    st->fscale = sr2fscale_fx( st->sr_core );
-    move32();
-    move16();
-
-    /* Narrowband? */
-    IF( EQ_16( st->bwidth, NB ) )
-    {
-        st->narrowBand = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->narrowBand = 0;
-        move16();
-    }
-
-    /* Core Framing */
-    L_frame_old = st->last_L_frame;
-    move16();
-    st->L_frame = extract_l( Mult_32_16( st->sr_core, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
-    move16();
-    st->L_frame_past = -1;
-    move16();
-
-    IF( hTcxEnc != NULL )
-    {
-        hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
-        move16();
-
-        IF( st->ini_frame == 0 )
-        {
-            set16_fx( hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );
-            hTcxEnc->acelp_zir = hTcxEnc->Txnq + L_FRAME / 2;
-            hTcxEnc->q_Txnq = Q15;
-            move16();
-            hTcxEnc->tcx_target_bits_fac = ONE_IN_Q14;
-            move16();
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( st->element_mode == EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->element_mode > EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, MAX_ACELP_BRATE ) ) )
-    {
-        st->nb_subfr = NB_SUBFR16k;
-        move16();
-    }
-    ELSE
-    {
-        st->nb_subfr = NB_SUBFR;
-        move16();
-    }
-    L_subfr = idiv1616( st->L_frame, st->nb_subfr );
-
-    /* Core Lookahead */
-    st->encoderLookahead_enc = NS2SA_FX2( st->sr_core, ACELP_LOOK_NS );
-    st->encoderLookahead_FB = NS2SA_FX2( st->input_Fs, ACELP_LOOK_NS );
-    move16();
-    move16();
-
-    IF( st->ini_frame == 0 )
-    {
-        st->acelpFramesCount = 0;
-        move16();
-        st->prevTempFlatness_fx = 128 /*1.0f Q7*/;
-        move16();
-    }
-
-    /* Initialize TBE */
-    IF( st->hBWE_TD != NULL )
-    {
-        st->hBWE_TD->prev_coder_type = GENERIC;
-        move16();
-        set16_fx( st->hBWE_TD->prev_lsf_diff_fx, 16384, LPC_SHB_ORDER - 2 );
-        st->hBWE_TD->prev_tilt_para_fx = 0;
-        move16();
-        set16_fx( st->hBWE_TD->cur_sub_Aq_fx, 0, M + 1 );
-    }
-
-    st->currEnergyHF_fx = 0;
-    move32();
-    st->currEnergyHF_e_fx = 0;
-    move16();
-    test();
-    /* Initialize LPC analysis/quantization */
-    IF( LE_32( st->sr_core, INT_FS_16k ) && st->tcxonly == 0 )
-    {
-        st->lpcQuantization = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->lpcQuantization = 0;
-        move16();
-    }
-
-    st->next_force_safety_net = 0;
-    move16();
-    test();
-    test();
-    IF( ( NE_16( st->last_L_frame, st->L_frame ) ) || ( EQ_16( st->last_core, AMR_WB_CORE ) ) || ( EQ_16( st->last_core, HQ_CORE ) ) )
-    {
-        set16_fx( st->mem_MA_fx, 0, M );
-        Copy( GEWB_Ave_fx, st->mem_AR_fx, M );
-    }
-
-    /* Initialize IGF */
-    if ( st->hIGFEnc != NULL )
-    {
-        st->hIGFEnc->infoStopFrequency = -1;
-        move16();
-    }
-
-    test();
-    IF( st->igf && st->hIGFEnc != NULL )
-    {
-        IGFEncSetMode_ivas_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );
-    }
-    ELSE IF( st->hIGFEnc != NULL )
-    {
-        st->hIGFEnc->infoTotalBitsWritten = 0;
-        move16();
-        st->hIGFEnc->infoTotalBitsPerFrameWritten = 0;
-        move16();
-    }
-
-    /* Initialize Core Signal Analysis Module */
-    init_core_sig_ana_ivas_fx( st );
-
-
-    /* Initialize TCX */
-    IF( hTcxEnc != NULL )
-    {
-        init_tcx_ivas_fx( st, L_frame_old, st->total_brate, last_total_brate, MCT_flag );
-    }
-
-    /* Initialize Signal Buffers */
-    init_sig_buffers_ivas_fx( st, L_frame_old, L_subfr );
-
-    /* Initialize ACELP */
-
-    init_acelp_ivas_fx( st, L_frame_old, 0 );
-
-    if ( st->ini_frame == 0 )
-    {
-        st->tec_tfa = 0;
-        move16();
-    }
-
-    IF( st->hTECEnc != NULL )
-    {
-        resetTecEnc_Fx( st->hTECEnc, st->tec_tfa );
-    }
-
-    test();
-    test();
-    test();
-    IF( EQ_16( st->bwidth, SWB ) && ( EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )
-    {
-        st->tec_tfa = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->tec_tfa = 0;
-        move16();
-    }
-
-    st->tec_flag = 0;
-    move16();
-    st->tfa_flag = 0;
-    move16();
-
-    test();
-    test();
-    test();
-    IF( ( EQ_32( st->total_brate, ACELP_9k60 ) || EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )
-    {
-        st->glr = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->glr = 0;
-        move16();
-    }
-
-    st->glr_reset = 0;
-    move16();
-
-    /* Initialize ACELP/TCX Modes */
-    init_modes_ivas_fx( st, last_total_brate );
-
-    /* Adaptive BPF */
-    set32_fx( st->mem_bpf_fx1, 0, 2 * L_FILT16k );
-    set32_fx( st->mem_error_bpf_fx, 0, 2 * L_FILT16k );
-
-    IF( st->ini_frame == 0 )
-    {
-        st->Q_max_enc[0] = 15;
-        move16();
-        st->Q_max_enc[1] = 15;
-        move16();
-    }
-
-    IF( GE_32( st->total_brate, HQ_48k ) )
-    {
-        st->enablePlcWaveadjust = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->enablePlcWaveadjust = 0;
-        move16();
-    }
-
-    IF( st->hPlcExt )
-    {
-        init_PLC_enc_fx( st->hPlcExt, st->sr_core );
-    }
-
-    st->glr_idx[0] = 0;
-    move16();
-    st->glr_idx[1] = 0;
-    move16();
-    st->mean_gc[0] = 0;
-    move16();
-    st->mean_gc[1] = 0;
-    move16();
-    st->prev_lsf4_mean = 0;
-    move16();
-    st->last_stab_fac = 0;
-    move16();
-
-    return;
-}
-
-/*-----------------------------------------------------------------------*
- * init_tcx()
- *
- * Initialization of TCX
- *-----------------------------------------------------------------------*/
-
-
-static void init_tcx_ivas_fx(
-    Encoder_State *st,
-    const Word16 L_frame_old,
-    const Word32 total_brate,
-    const Word32 last_total_brate,
-    const Word16 MCT_flag )
-{
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-
-    /* Share the memories for 2xTCX10/4xTCX5 and for TCX20 */
-    hTcxEnc->spectrum_fx[0] = hTcxEnc->spectrum_long_fx;
-    hTcxEnc->spectrum_fx[1] = hTcxEnc->spectrum_long_fx + N_TCX10_MAX;
-    st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;
-    move16();
-    move16();
-
-    init_tcx_cfg_ivas_fx( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX,
-                          st->fscale, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf,
-                          st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag );
-
-    /* Init TCX target bits correction factor */
-    hTcxEnc->tcx_target_bits_fac = 0x4000; /*1.0f in 1Q14*/
-    move16();
-    hTcxEnc->measuredBwRatio = 0x4000; /*1.0f in 1Q14*/
-    move16();
-    hTcxEnc->noiseTiltFactor = 9216; /*0.5625f in 1Q14*/
-    move16();
-    hTcxEnc->noiseLevelMemory_cnt = 0;
-    move16();
-
-    set16_fx( hTcxEnc->ltpGainMemory_fx, 0, N_LTP_GAIN_MEMS );
-    set8_fx( hTcxEnc->memQuantZeros, 0, L_FRAME_PLUS );
-
-    /* TCX-LTP */
-    hTcxEnc->tcxltp = getTcxLtp( st->sr_core );
-    move16();
-
-    test();
-    test();
-    test();
-    test();
-    IF( st->ini_frame == 0 )
-    {
-        hTcxEnc->tcxltp_pitch_int_past = st->L_frame;
-        hTcxEnc->tcxltp_pitch_fr_past = 0;
-        hTcxEnc->tcxltp_gain_past = 0;
-        hTcxEnc->tcxltp_norm_corr_past = 0;
-        hTcxEnc->tcxltp_norm_corr_mem = 0;
-        hTcxEnc->kernel_switch_corr_past = 0;
-        hTcxEnc->kernel_symmetry_past = 0; /* MDCT_IV & 1 */
-        hTcxEnc->enc_ste_pre_corr_past = 0;
-        hTcxEnc->tfm_mem_fx = 1610612736; /* 0.75 in Q31 */
-        hTcxEnc->tcxltp_on_mem = 0;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-    }
-    ELSE IF( NE_16( st->L_frame, L_frame_old ) && !( ( GE_32( total_brate, ACELP_16k40 ) && LE_32( total_brate, ACELP_24k40 ) ) &&
-                                                     ( EQ_32( total_brate, last_total_brate ) ) && ( EQ_16( st->last_bwidth, st->bwidth ) ) ) )
-    {
-        Word16 pitres, pitres_old;
-        Word16 pit, pit_old;
-
-        pitres_old = 4;
-        move16();
-        if ( EQ_16( 160, shr( L_frame_old, sub( 7, norm_s( L_frame_old ) ) ) ) ) /*if ( L_frame_old%160==0 )*/
-        {
-            pitres_old = 6;
-            move16();
-        }
-
-        /*pit_old = (float)st->tcxltp_pitch_int_past + (float)st->tcxltp_pitch_fr_past/(float)pitres_old;*/
-        pit_old = add( hTcxEnc->tcxltp_pitch_int_past, mult_r( hTcxEnc->tcxltp_pitch_fr_past, div_s( 1, pitres_old ) ) );
-
-        pitres = 4;
-        move16();
-        if ( EQ_16( 160, shr( st->L_frame, sub( 7, norm_s( st->L_frame ) ) ) ) ) /*if ( st->L_frame%160==0 )*/
-        {
-            pitres = 6;
-            move16();
-        }
-
-#ifdef BASOP_NOGLOB
-        /*pit = pit_old * (float)st->L_frame/(float)L_frame_old;*/
-        pit = shl_sat( mult_r( pit_old, div_s( st->L_frame, shl( L_frame_old, 2 ) ) ), 2 );
-        /* Note : the saturation here that can happens when FS == 32kHz*/
-#else
-        pit = shl( mult_r( pit_old, div_s( st->L_frame, shl( L_frame_old, 2 ) ) ), 2 );
-#endif
-        /*    assert(pit <= st->L_frame);*/
-
-        hTcxEnc->tcxltp_pitch_int_past = pit;
-        move16();
-        hTcxEnc->tcxltp_pitch_fr_past = i_mult2( sub( pit, hTcxEnc->tcxltp_pitch_int_past ), pitres );
-        move16();
-    }
-
-    hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode );
-    move16();
-
-    return;
-}
-
-/*-----------------------------------------------------------------------*
- * init_sig_buffers()
- *
- * Initialization of signal buffers
- *-----------------------------------------------------------------------*/
-/*copy of evs function since it was static */
-static void init_sig_buffers_ivas_fx( Encoder_State *st, const Word16 L_frame_old, const Word16 L_subfr )
-{
-
-    LPD_state_HANDLE hLPDmem = st->hLPDmem;
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-
-    /* Encoder Past Samples at encoder-sampling-rate */
-    st->encoderPastSamples_enc = shr( imult1616( st->L_frame, 9 ), 4 );
-    move16();
-
-    /* Initialize Signal Buffers and Pointers at encoder-sampling-rate */
-    IF( st->ini_frame == 0 )
-    {
-        set16_fx( st->buf_speech_enc, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
-        st->exp_buf_speech_enc = 0;
-        move16();
-        set16_fx( st->buf_speech_enc_pe, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
-        st->exp_buf_speech_enc_pe = 0;
-        move16();
-        if ( hTcxEnc != NULL )
-        {
-            set16_fx( hTcxEnc->buf_speech_ltp, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
-            hTcxEnc->exp_buf_speech_ltp = 0;
-            move16();
-        }
-        set16_fx( st->buf_wspeech_enc, 0, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 ); /* increased by 320 to avoid memory overlap in ivas_find_wsp_fx() and also to accomodate for the wspeech_enc */
-        st->exp_buf_wspeech_enc = 0;
-        move16();
-    }
-    ELSE
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( NE_16( st->L_frame, L_frame_old ) && !( ( EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && ( EQ_32( st->total_brate, st->last_total_brate ) ) && ( EQ_16( st->last_bwidth, st->bwidth ) ) ) )
-        {
-            lerp( st->buf_speech_enc, st->buf_speech_enc, st->L_frame, L_frame_old );
-            test();
-            IF( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) /* condition should be checked again */
-            {
-                Copy( st->buf_speech_enc, hTcxEnc->buf_speech_ltp, st->L_frame );
-                Scale_sig( hTcxEnc->buf_speech_ltp, st->L_frame, sub( st->exp_buf_speech_enc, s_max( st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp ) ) );                                                                         // Q(15-max(st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp))
-                Scale_sig( hTcxEnc->buf_speech_ltp + st->L_frame, sub( L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, st->L_frame ), sub( hTcxEnc->exp_buf_speech_ltp, s_max( st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp ) ) ); // Q(15-max(st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp))
-                hTcxEnc->exp_buf_speech_ltp = s_max( hTcxEnc->exp_buf_speech_ltp, st->exp_buf_speech_enc );
-                move16();
-            }
-
-            // Copy_Scale_sig( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM, sub( st->prev_Q_new, st->prev_Q_old ) );
-            Copy( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM );
-            st->exp_buf_wspeech_enc = st->exp_old_wsp;
-            move16();
-
-            /*Resamp buffers needed only for ACELP*/
-            test();
-            test();
-            IF( EQ_16( st->L_frame, L_FRAME ) && !st->tcxonly )
-            {
-                // Copy_Scale_sig( st->old_inp_12k8_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM, sub( st->prev_Q_new, st->prev_Q_old ) );
-                Copy( st->old_inp_12k8_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM );
-                /* SCaling to common exponent*/
-                Scale_sig( st->buf_speech_enc_pe + sub( st->L_frame, L_INP_MEM ), L_INP_MEM, sub( st->exp_old_inp_12k8, s_max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ) ) );                                           // Q(15-max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ))
-                Scale_sig( st->buf_speech_enc_pe, sub( st->L_frame, L_INP_MEM ), sub( st->exp_buf_speech_enc_pe, s_max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ) ) );                                                  // Q(15-max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ))
-                Scale_sig( st->buf_speech_enc_pe + st->L_frame, sub( L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, st->L_frame ), sub( st->exp_buf_speech_enc_pe, s_max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ) ) ); // Q(15-max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ))
-                st->exp_buf_speech_enc_pe = s_max( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe );
-                move16();
-            }
-            ELSE IF( EQ_16( st->L_frame, L_FRAME16k ) && !st->tcxonly )
-            {
-                lerp( st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, st->buf_wspeech_enc + st->L_frame + L_SUBFR - 310, 310, L_WSP_MEM );
-                Copy( st->old_inp_16k_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM );
-                /* SCaling to common exponent*/
-                Scale_sig( st->buf_speech_enc_pe + sub( st->L_frame, L_INP_MEM ), L_INP_MEM, sub( st->exp_old_inp_16k, s_max( st->exp_old_inp_16k, st->exp_buf_speech_enc_pe ) ) );
-                Scale_sig( st->buf_speech_enc_pe, sub( st->L_frame, L_INP_MEM ), sub( st->exp_buf_speech_enc_pe, s_max( st->exp_old_inp_16k, st->exp_buf_speech_enc_pe ) ) );
-                Scale_sig( st->buf_speech_enc_pe + st->L_frame, sub( L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, st->L_frame ), sub( st->exp_buf_speech_enc_pe, s_max( st->exp_old_inp_16k, st->exp_buf_speech_enc_pe ) ) );
-                st->exp_buf_speech_enc_pe = s_max( st->exp_old_inp_16k, st->exp_buf_speech_enc_pe );
-                move16();
-            }
-
-            st->mem_preemph_enc = st->buf_speech_enc[st->encoderPastSamples_enc + st->encoderLookahead_enc - 1];
-            move16();
-            st->exp_mem_preemph_enc = st->exp_buf_speech_enc;
-            move16();
-            st->mem_wsp_enc = shr( st->buf_wspeech_enc[st->L_frame + L_SUBFR - 1], sub( Q16, st->exp_buf_wspeech_enc ) ); // Q-1
-            move16();
-        }
-        /*coming from TCXonly modes*/
-        ELSE IF( !st->tcxonly && GE_32( st->last_total_brate, ACELP_32k ) )
-        {
-
-            Copy( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM );
-            // Copy_Scale_sig( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM, sub( st->prev_Q_new, st->prev_Q_old ) );
-
-            /*Resamp buffers needed only for ACELP*/
-            IF( EQ_16( st->L_frame, L_FRAME16k ) )
-            {
-                lerp( st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, st->buf_wspeech_enc + st->L_frame + L_SUBFR - 310, 310, L_WSP_MEM );
-            }
-            hLPDmem->mem_w0 = 0;
-            move16();
-            st->mem_wsp_enc = shr( st->buf_wspeech_enc[st->L_frame + L_SUBFR - 1], sub( Q16, st->exp_buf_wspeech_enc ) ); // Q-1
-            move16();
-        }
-    }
-
-    st->new_speech_enc = st->buf_speech_enc + st->encoderPastSamples_enc + st->encoderLookahead_enc;
-    st->new_speech_enc_pe = st->buf_speech_enc_pe + st->encoderPastSamples_enc + st->encoderLookahead_enc;
-    if ( hTcxEnc != NULL )
-    {
-        hTcxEnc->new_speech_ltp = hTcxEnc->buf_speech_ltp + st->encoderPastSamples_enc + st->encoderLookahead_enc;
-    }
-
-    IF( st->hTcxEnc != NULL )
-    {
-        st->hTcxEnc->new_speech_TCX = st->input_buff_fx + Mpy_32_32( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 );
-        st->hTcxEnc->speech_TCX = st->hTcxEnc->new_speech_TCX - st->encoderLookahead_FB;
-    }
-    st->speech_enc = st->buf_speech_enc + st->encoderPastSamples_enc;
-    st->speech_enc_pe = st->buf_speech_enc_pe + st->encoderPastSamples_enc;
-
-    if ( hTcxEnc != NULL )
-    {
-        hTcxEnc->speech_ltp = hTcxEnc->buf_speech_ltp + st->encoderPastSamples_enc;
-    }
-
-    IF( st->element_mode > EVS_MONO )
-    {
-        st->wspeech_enc = st->buf_wspeech_enc + st->L_frame + L_SUBFR;
-    }
-    ELSE
-    {
-        st->wspeech_enc = st->buf_wspeech_enc + st->L_frame + L_subfr;
-    }
-
-    test();
-    test();
-    IF( st->ini_frame == 0 || NE_16( st->L_frame, L_frame_old ) || EQ_16( st->last_codec_mode, MODE1 ) )
-    {
-        set16_fx( st->buf_synth, 0, OLD_SYNTH_SIZE_ENC + L_FRAME32k );
-    }
-
-    st->synth = st->buf_synth + st->L_frame + L_subfr;
-
-
-    return;
-}
-
-/*-----------------------------------------------------------------------*
- * init_core_sig_ana()
- *
- *
- *-----------------------------------------------------------------------*/
-static void init_core_sig_ana_ivas_fx( Encoder_State *st )
-{
-
-    /* Pre-emphasis factor and memory */
-
-    st->preemph_fac = PREEMPH_FAC_SWB; /*SWB*/
-    move16();
-    IF( LT_16( st->fscale, ( 16000 * FSCALE_DENOM ) / 12800 ) )
-    {
-        st->preemph_fac = PREEMPH_FAC; /*WB*/
-        move16();
-    }
-    ELSE IF( LT_16( st->fscale, ( 24000 * FSCALE_DENOM ) / 12800 ) )
-    {
-        st->preemph_fac = PREEMPH_FAC_16k; /*WB*/
-        move16();
-    }
-
-    st->gamma = GAMMA1;
-    move16();
-    st->inv_gamma = GAMMA1_INV;
-    move16();
-    IF( EQ_32( st->sr_core, 16000 ) )
-    {
-        st->gamma = GAMMA16k;
-        move16();
-        st->inv_gamma = GAMMA16k_INV;
-        move16();
-    }
-
-
-    st->min_band = 1;
-    move16();
-    st->max_band = 16;
-    move16();
-
-    IF( st->narrowBand == 0 )
-    {
-        st->min_band = 0;
-        move16();
-        st->max_band = 19;
-        move16();
-    }
-
-
-    return;
-}
-/*-----------------------------------------------------------------------*
- * init_acelp()
- *
- *
- *-----------------------------------------------------------------------*/
-static void init_acelp_ivas_fx( Encoder_State *st, Word16 L_frame_old, Word16 shift )
-{
-    Word16 mem_syn_r_size_old;
-    Word16 mem_syn_r_size_new;
-    LPD_state_HANDLE hLPDmem = st->hLPDmem;
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-
-    /* Init pitch lag */
-    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        /* TCX LTP ana always runs @12.8kHz */
-        st->pit_res_max = initPitchLagParameters( 12800, &st->pit_min, &st->pit_fr1, &st->pit_fr1b, &st->pit_fr2, &st->pit_max );
-        move16();
-    }
-    ELSE
-    {
-        st->pit_res_max = initPitchLagParameters( st->sr_core, &st->pit_min, &st->pit_fr1, &st->pit_fr1b, &st->pit_fr2, &st->pit_max );
-        move16();
-    }
-
-    /* Init LPDmem */
-    IF( st->ini_frame == 0 )
-    {
-        IF( hLPDmem != NULL )
-        {
-            set16_fx( hLPDmem->syn, 0, 1 + M );
-            set16_fx( hLPDmem->mem_syn_r, 0, L_SYN_MEM );
-        }
-
-        IF( st->hTcxEnc != NULL )
-        {
-            set16_fx( st->hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );
-            st->hTcxEnc->q_Txnq = Q15;
-            move16();
-            st->hTcxEnc->acelp_zir = st->hTcxEnc->Txnq + shr( st->L_frame, 1 );
-        }
-    }
-    ELSE /*Rate switching*/
-    {
-        IF( st->last_core == ACELP_CORE )
-        {
-            lerp( hTcxEnc->Txnq, hTcxEnc->Txnq, shr( st->L_frame, 1 ), shr( L_frame_old, 1 ) );
-        }
-        ELSE
-        {
-            lerp( hTcxEnc->Txnq, hTcxEnc->Txnq, st->hTcxCfg->tcx_mdct_window_length, st->hTcxCfg->tcx_mdct_window_length_old );
-        }
-        hTcxEnc->acelp_zir = hTcxEnc->Txnq + shr( st->L_frame, 1 );
-
-        /* Rate switching */
-        IF( EQ_16( st->last_codec_mode, MODE1 ) && st->element_mode == EVS_MONO )
-        {
-            IF( hLPDmem != NULL )
-            {
-                Copy( hLPDmem->mem_syn1_fx, hLPDmem->mem_syn2, M );
-                set16_fx( hLPDmem->syn, 0, M );
-                hLPDmem->q_lpd_syn = Q15;
-                move16();
-            }
-            IF( st->hTcxEnc != NULL )
-            {
-                set16_fx( hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );
-                st->hTcxEnc->q_Txnq = Q15;
-                move16();
-            }
-        }
-
-        /*AMR-WBIO->MODE2*/
-        IF( EQ_16( st->last_core, AMR_WB_CORE ) )
-        {
-            st->next_force_safety_net = 1;
-            move16();
-            st->last_core = ACELP_CORE;
-            move16();
-        }
-        /*HQ-CORE->MODE2*/
-        test();
-        IF( EQ_16( st->last_codec_mode, MODE1 ) && EQ_16( st->last_core, HQ_CORE ) )
-        {
-            /*Reset of ACELP memories*/
-            st->next_force_safety_net = 1;
-            move16();
-            st->rate_switching_reset = 1;
-            move16();
-            IF( hLPDmem != NULL )
-            {
-                hLPDmem->tilt_code = TILT_CODE;
-                move16();
-                set16_fx( hLPDmem->old_exc, 0, L_EXC_MEM );
-                set16_fx( hLPDmem->syn, 0, 1 + M );
-                hLPDmem->q_lpd_syn = Q15;
-                move16();
-                hLPDmem->q_lpd_old_exc = Q15;
-                move16();
-                hLPDmem->mem_w0 = 0;
-                move16();
-                set16_fx( hLPDmem->mem_syn, 0, M );
-                set16_fx( hLPDmem->mem_syn2, 0, M );
-                hLPDmem->q_mem_syn = Q15;
-                move16();
-            }
-
-            /* unquantized LPC*/
-            test();
-            test();
-            test();
-            IF( !( ( GE_32( st->total_brate, ACELP_16k40 ) && LE_32( st->total_brate, ACELP_24k40 ) ) && ( EQ_32( st->total_brate, st->last_total_brate ) ) && ( EQ_16( st->last_bwidth, st->bwidth ) ) ) )
-            {
-                Copy( st->lsp_old1_fx, st->lspold_enc_fx, M ); /*lsp old @12.8kHz*/
-                IF( EQ_16( st->L_frame, L_FRAME16k ) )
-                {
-                    lsp_convert_poly_fx( st->lspold_enc_fx, st->L_frame, 0 );
-                }
-            }
-            Copy( st->lspold_enc_fx, st->lsp_old_fx, M ); /*used unquantized values for mid-LSF Q*/
-            IF( st->tcxonly == 0 )
-            {
-                lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
-            }
-            ELSE
-            {
-                E_LPC_lsp_lsf_conversion( st->lsp_old_fx, st->lsf_old_fx, M );
-            }
-            st->last_core = TCX_20_CORE;
-            move16();
-
-            st->hTcxCfg->last_aldo = 1; /*It was previously ALDO*/
-            st->hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
-            move16();
-            move16();
-            /*ALDO overlap windowed past: also used in MODE1 but for other MDCT-FB*/
-            set16_fx( hTcxEnc->old_out_fx, 0, st->L_frame );
-        }
-        ELSE
-        {
-            test();
-            test();
-            test();
-            test();
-            IF( ( NE_16( st->L_frame, L_frame_old ) ) && ( LE_16( st->L_frame, L_FRAME16k ) ) && ( LE_16( L_frame_old, L_FRAME16k ) ) )
-            {
-                /* convert quantized LSP vector */
-                st->rate_switching_reset = lsp_convert_poly_fx( st->lsp_old_fx, st->L_frame, 0 );
-                move16();
-                IF( st->tcxonly == 0 )
-                {
-                    lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
-                }
-                ELSE
-                {
-                    E_LPC_lsp_lsf_conversion( st->lsp_old_fx, st->lsf_old_fx, M );
-                }
-                IF( EQ_16( st->L_frame, L_FRAME16k ) )
-                {
-                    Copy( st->lsp_old_fx, st->lspold_enc_fx, M );
-                }
-                ELSE
-                {
-                    Copy( st->lsp_old1_fx, st->lspold_enc_fx, M );
-                }
-
-
-                /*Mem of deemphasis stay unchanged : hLPDmem->syn*/
-                IF( hLPDmem != NULL )
-                {
-                    synth_mem_updt2( st->L_frame, st->last_L_frame, hLPDmem->old_exc, hLPDmem->mem_syn_r, hLPDmem->mem_syn2, hLPDmem->mem_syn, ENC );
-                    Word16 tmp, A[M + 1], Ap[M + 1], tmp_buf[M + 1];
-                    /* Update wsyn */
-                    /* lsp2a_stab( st->lsp_old, A, M ); */
-                    E_LPC_f_lsp_a_conversion( st->lsp_old_fx, A, M );
-                    weight_a_fx( A, Ap, GAMMA1, M );
-                    tmp = 0;
-                    move16();
-                    tmp_buf[0] = 0;
-                    move16();
-                    Copy( hLPDmem->mem_syn2, tmp_buf + 1, M );
-                    deemph_fx( tmp_buf + 1, st->preemph_fac, M, &tmp );
-                    Residu3_fx( Ap, tmp_buf + M, &tmp, 1, 1 );
-#ifdef BASOP_NOGLOB
-                    hLPDmem->mem_w0 = sub_sat( shr_sat( st->wspeech_enc[-1], shift ), tmp );
-                    move16();
-#else
-                    hLPDmem->mem_w0 = sub( shr( st->wspeech_enc[-1], shift ), tmp );
-#endif
-                }
-            }
-            ELSE IF( ( NE_16( st->L_frame, L_frame_old ) ) )
-            {
-                /*Partial reset of ACELP memories*/
-                st->next_force_safety_net = 1;
-                move16();
-                st->rate_switching_reset = 1;
-                move16();
-
-                /*reset partly some memories*/
-                IF( hLPDmem != NULL )
-                {
-                    hLPDmem->tilt_code = TILT_CODE;
-                    move16();
-                    set16_fx( hLPDmem->old_exc, 0, L_EXC_MEM );
-                    move16();
-                    hLPDmem->q_lpd_old_exc = Q15;
-                    move16();
-                    /*Resamp others memories*/
-                    /*Size of LPC syn memory*/
-                    /* 1.25/20.0 = 1.0/16.0 -> shift 4 to the right. */
-                    mem_syn_r_size_old = shr( L_frame_old, 4 );
-                    mem_syn_r_size_new = shr( st->L_frame, 4 );
-
-                    lerp( hLPDmem->mem_syn_r + L_SYN_MEM - mem_syn_r_size_old, hLPDmem->mem_syn_r + L_SYN_MEM - mem_syn_r_size_new, mem_syn_r_size_new, mem_syn_r_size_old );
-                    Copy( hLPDmem->mem_syn_r + L_SYN_MEM - M, hLPDmem->mem_syn, M );
-                    Copy( hLPDmem->mem_syn, hLPDmem->mem_syn2, M );
-
-                    /*Untouched memories : hLPDmem->syn & hLPDmem->mem_w0*/
-                    hLPDmem->mem_w0 = 0;
-                    move16();
-                }
-                /* unquantized LPC*/
-                Copy( st->lsp_old1_fx, st->lspold_enc_fx, M ); /*lsp old @12.8kHz*/
-                IF( EQ_16( st->L_frame, L_FRAME16k ) )
-                {
-                    lsp_convert_poly_fx( st->lspold_enc_fx, st->L_frame, 0 );
-                }
-                Copy( st->lspold_enc_fx, st->lsp_old_fx, M ); /*used unquantized values for mid-LSF Q*/
-                IF( st->tcxonly == 0 )
-                {
-                    lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
-                }
-                ELSE
-                {
-                    E_LPC_lsp_lsf_conversion( st->lsp_old_fx, st->lsf_old_fx, M );
-                }
-            }
-            ELSE IF( !st->tcxonly && EQ_16( st->L_frame, L_FRAME16k ) && GT_32( st->last_total_brate, ACELP_32k ) )
-            {
-                lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
-            }
-        }
-    }
-
-    test();
-    test();
-    if ( EQ_16( st->last_bwidth, NB ) && NE_16( st->bwidth, NB ) && st->ini_frame != 0 )
-    {
-        st->rate_switching_reset = 1;
-        move16();
-    }
-
-    /* Post-processing */
-    /*EVS specific*/
-    /* hLPDmem->dm_fx.prev_gain_code = L_deposit_l( 0 );
-     set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
-     hLPDmem->dm_fx.prev_state = 0;*/
-    /*------------*/
-
-    if ( hLPDmem != NULL )
-    {
-        hLPDmem->dm_fx.prev_state = 0;
-        move16(); /* This corresponds to st_fx->dispMem in FLP */
-        hLPDmem->dm_fx.prev_gain_code = 0;
-        move32();
-
-        FOR( Word16 i = 2; i < 8; i++ )
-        {
-            hLPDmem->dm_fx.prev_gain_pit[i - 2] = 0;
-            move16();
-        }
-        hLPDmem->gc_threshold = 0;
-        move16();
-    }
-
-    /* Pulse Search configuration */
-    st->acelp_autocorr = 1;
-    move16();
-
-    /*Use for 12.8 kHz sampling rate and low bitrates, the conventional pulse search->better SNR*/
-    test();
-    test();
-    if ( ( LE_32( st->total_brate, ACELP_9k60 ) || EQ_16( st->rf_mode, 1 ) ) && ( EQ_32( st->sr_core, 12800 ) ) )
-    {
-        st->acelp_autocorr = 0;
-        move16();
-    }
-
-
-    /*BPF parameters for adjusting gain in function of background noise*/
-    IF( EQ_16( st->codec_mode, MODE2 ) )
-    {
-        st->mem_bpf_fx.lp_error_ener = L_deposit_l( 0 );
-        move32();
-        st->pst_lp_ener_fx = 0;
-        move16();
-        IF( EQ_16( st->last_codec_mode, MODE1 ) )
-        {
-            st->mem_bpf_fx.lp_error = 0;
-            move32();
-            st->pst_mem_deemp_err_fx = 0;
-            move16();
-        }
-    }
-
-    return;
-}
-/*-----------------------------------------------------------------------*
- * init_modes()
- *
- *
- *-----------------------------------------------------------------------*/
-
-static void init_modes_ivas_fx(
-    Encoder_State *st,
-    const Word32 last_total_brate )
-{
-    Word8 n;
-    Word32 tmp32;
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    (void) last_total_brate;
-
-
-    /* Restrict ACE/TCX20/TCX10 mode */
-    move16();
-    st->restrictedMode = getRestrictedMode( st->element_mode, st->total_brate, st->Opt_AMR_WB );
-    move16();
-    st->acelpEnabled = 0;
-    move16();
-    st->tcx20Enabled = 0;
-    move16();
-    st->tcx10Enabled = 0;
-
-    if ( EQ_16( s_and( st->restrictedMode, 1 ), 1 ) )
-    {
-        st->acelpEnabled = 1;
-        move16();
-    }
-    if ( EQ_16( s_and( st->restrictedMode, 2 ), 2 ) )
-    {
-        st->tcx20Enabled = 1;
-        move16();
-    }
-    if ( EQ_16( s_and( st->restrictedMode, 4 ), 4 ) )
-    {
-        st->tcx10Enabled = 1;
-        move16();
-    }
-
-
-    /* TCX mode (TCX20 TCX10_10 or NO_TCX) */
-    if ( st->hTcxEnc != NULL )
-    {
-        hTcxEnc->tcxMode = NO_TCX;
-        move16();
-    }
-
-    /* Bits Budget */
-    /*st->bits_frame_nominal = (int)( (float)st->L_frame * (float)FSCALE_DENOM * (float)st->bitrate / ( (float)st->fscale * 12800.0f ) );*/
-    /*st->bits_frame_nominal = (int)( (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate/100.0f + 0.49f );*/
-    /*328 = 0.010009765625 in 0Q15*/
-    /* st->bits_frame_nominal = extract_h(L_add(L_mult(div_l(L_mult(shl(st->L_frame,2),st->bitrate),st->fscale),328),16056)); */
-
-    /* st->bits_frame_nominal = (int)( (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate/100.0f + 0.49f ); */
-    tmp32 = L_shl( st->total_brate, 1 );                                           /* (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate */
-    st->bits_frame_nominal = extract_l( L_shr( Mpy_32_16_1( tmp32, 20972 ), 6 ) ); /* 20972 = 0.01 * 64 * 32768 */
-    move16();
-
-    IF( st->Opt_AMR_WB )
-    {
-        st->bits_frame = st->bits_frame_nominal;
-        move16();
-        st->bits_frame_core = st->bits_frame_nominal;
-        move16();
-        st->frame_size_index = 0;
-        move16();
-    }
-    ELSE
-    {
-        FOR( n = 0; n < FRAME_SIZE_NB; n++ )
-        {
-            IF( LT_32( n, FRAME_SIZE_NB - 1 ) )
-            {
-                test();
-                IF( LE_32( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) && GT_32( FrameSizeConfig[n + 1].frame_bits, st->bits_frame_nominal ) )
-                {
-                    st->frame_size_index = n;
-                    move16();
-                    st->bits_frame = st->bits_frame_nominal;
-                    move16();
-                    st->bits_frame_core = sub( sub( sub( st->bits_frame_nominal, FrameSizeConfig[n].transmission_bits ), FrameSizeConfig[n].bandwidth_bits ), FrameSizeConfig[n].reserved_bits );
-                    move16();
-                    BREAK;
-                }
-            }
-            ELSE
-            {
-                IF( LE_32( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) )
-                {
-                    st->frame_size_index = n;
-                    move16();
-                    st->bits_frame = st->bits_frame_nominal;
-                    move16();
-                    st->bits_frame_core = sub( sub( sub( st->bits_frame_nominal, FrameSizeConfig[n].transmission_bits ), FrameSizeConfig[n].bandwidth_bits ), FrameSizeConfig[n].reserved_bits );
-                    move16();
-                    BREAK;
-                }
-            }
-        }
-    }
-
-    /* Reconfigure core */
-    core_coder_reconfig_ivas_fx( st );
-
-
-    return;
-}
diff --git a/lib_enc/core_enc_init_fx.c b/lib_enc/core_enc_init_fx.c
index 6638b4c338510d41eb2d2c62333841d05413fb79..2f7870ab6e066e873ef432c68027ae6a763cffe3 100644
--- a/lib_enc/core_enc_init_fx.c
+++ b/lib_enc/core_enc_init_fx.c
@@ -3,8 +3,8 @@
   ====================================================================================*/
 
 #include <assert.h>
-//#include "prot_fx.h"
-//#include "basop_mpy.h"
+// #include "prot_fx.h"
+// #include "basop_mpy.h"
 #include "options.h"
 #include "cnst.h"
 #include "stl.h"
@@ -13,7 +13,6 @@
 #include "ivas_cnst.h"
 #include <string.h>
 #include "rom_com.h"     /* Common constants                       */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "basop_util.h"  /* Function prototypes                    */
@@ -28,6 +27,11 @@ static void init_core_sig_ana_fx( Encoder_State *st );
 static void init_acelp_fx( Encoder_State *st, Word16 L_frame_old, const Word16 shift );
 static void init_modes_fx( Encoder_State *st, const Word32 Last_total_brate );
 static void init_sig_buffers_fx( Encoder_State *st, const Word16 L_frame_old, const Word16 L_subfr );
+static void init_tcx_ivas_fx( Encoder_State *st, const Word16 L_frame_old, const Word32 total_brate, const Word32 last_total_brate, const Word16 MCT_flag );
+static void init_core_sig_ana_ivas_fx( Encoder_State *st );
+static void init_modes_ivas_fx( Encoder_State *st, const Word32 last_total_brate );
+static void init_sig_buffers_ivas_fx( Encoder_State *st, const Word16 L_frame_old, const Word16 L_subfr, const Word32 last_total_brate );
+static void init_acelp_ivas_fx( Encoder_State *st, Word16 L_frame_old, Word16 shift, const Word32 last_total_brate );
 
 /*-----------------------------------------------------------------------*
  * init_coder_ace_plus_fx()
@@ -49,15 +53,7 @@ void init_coder_ace_plus_fx(
 
     /* Bitrate */
     st->tcxonly = (Word8) getTcxonly(
-#ifdef IVAS_CODE_SWITCHING
-        st->element_mode,
-#endif
-        st->total_brate
-#ifdef IVAS_CODE_SWITCHING
-        ,
-        MCT_flag, st->is_ism_format
-#endif
-    );
+        st->total_brate );
     move16();
 
     /* Core Sampling Rate */
@@ -295,11 +291,9 @@ static void init_tcx_fx(
     Word16 i;
     Word16 fscaleFB;
     TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) MCT_flag;
     (void) total_brate;
     (void) last_total_brate;
-#endif
     // PMT("init_tcx_fx needs an entire review to adapt to IVAS")
     fscaleFB = div_l( L_shl( st->input_Fs, LD_FSCALE_DENOM + 1 ), 12800 );
 
@@ -420,13 +414,9 @@ static void init_tcx_fx(
             move16();
         }
 
-#ifdef BASOP_NOGLOB
         /*pit = pit_old * (float)st->L_frame/(float)L_frame_old;*/
         pit = shl_sat( mult_r( pit_old, div_s( st->L_frame, shl( L_frame_old, 2 ) ) ), 2 );
-/* Note : the saturation here that can happens when FS == 32kHz*/
-#else
-        pit = shl( mult_r( pit_old, div_s( st->L_frame, shl( L_frame_old, 2 ) ) ), 2 );
-#endif
+        /* Note : the saturation here that can happens when FS == 32kHz*/
         /*    assert(pit <= st->L_frame);*/
 
         hTcxEnc->tcxltp_pitch_int_past = pit;
@@ -530,7 +520,7 @@ void init_sig_buffers_fx( Encoder_State *st, const Word16 L_frame_old, const Wor
     st->new_speech_enc = st->buf_speech_enc + st->encoderPastSamples_enc + st->encoderLookahead_enc;
     st->new_speech_enc_pe = st->buf_speech_enc_pe + st->encoderPastSamples_enc + st->encoderLookahead_enc;
     hTcxEnc->new_speech_ltp = hTcxEnc->buf_speech_ltp + st->encoderPastSamples_enc + st->encoderLookahead_enc;
-    hTcxEnc->new_speech_TCX = st->input_buff_fx + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) - NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS );
+    hTcxEnc->new_speech_TCX = st->input_buff_fx + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) - NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS );
 
     st->speech_enc = st->buf_speech_enc + st->encoderPastSamples_enc;
     st->speech_enc_pe = st->buf_speech_enc_pe + st->encoderPastSamples_enc;
@@ -746,11 +736,7 @@ static void init_acelp_fx( Encoder_State *st, Word16 L_frame_old, const Word16 s
                     Copy( hLPDmem->mem_syn2, tmp_buf + 1, M );
                     deemph_fx( tmp_buf + 1, st->preemph_fac, M, &tmp );
                     Residu3_fx( Ap, tmp_buf + M, &tmp, 1, 1 );
-#ifdef BASOP_NOGLOB
                     hLPDmem->mem_w0 = sub_sat( shr_sat( st->wspeech_enc[-1], shift ), tmp );
-#else
-                    hLPDmem->mem_w0 = sub( shr( st->wspeech_enc[-1], shift ), tmp );
-#endif
                     move16();
                 }
             }
@@ -938,5 +924,1017 @@ static void init_modes_fx(
     core_coder_reconfig_fx( st, last_total_brate );
 
 
+    return;
+}
+
+/*-----------------------------------------------------------------------*
+ * init_coder_ace_plus()
+ *
+ * Initialization of state variables
+ *-----------------------------------------------------------------------*/
+void init_coder_ace_plus_ivas_fx(
+    Encoder_State *st,             /* i  : Encoder state                          */
+    const Word32 last_total_brate, /* i  : last total bitrate                     */
+    const Word32 igf_brate,        /* i  : IGF configuration bitrate           */
+    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */
+)
+{
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+    Word16 L_frame_old; /*keep old frame size for switching */
+    Word16 L_subfr;
+
+    /* Bitrate */
+    st->tcxonly = getTcxonly_ivas_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
+    move16();
+
+    /* Core Sampling Rate */
+    st->sr_core = getCoreSamplerateMode2( st->element_mode, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, st->is_ism_format );
+    st->fscale = sr2fscale_fx( st->sr_core );
+    move32();
+    move16();
+
+    /* Narrowband? */
+    IF( EQ_16( st->bwidth, NB ) )
+    {
+        st->narrowBand = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->narrowBand = 0;
+        move16();
+    }
+
+    /* Core Framing */
+    L_frame_old = st->last_L_frame;
+    move16();
+    st->L_frame = extract_l( Mult_32_16( st->sr_core, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
+    move16();
+    st->L_frame_past = -1;
+    move16();
+
+    IF( hTcxEnc != NULL )
+    {
+        hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
+        move16();
+
+        IF( st->ini_frame == 0 )
+        {
+            set16_fx( hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );
+            hTcxEnc->acelp_zir = hTcxEnc->Txnq + L_FRAME / 2;
+            hTcxEnc->q_Txnq = Q15;
+            move16();
+            hTcxEnc->tcx_target_bits_fac = ONE_IN_Q14;
+            move16();
+        }
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( st->element_mode == EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->element_mode > EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, MAX_ACELP_BRATE ) ) )
+    {
+        st->nb_subfr = NB_SUBFR16k;
+        move16();
+    }
+    ELSE
+    {
+        st->nb_subfr = NB_SUBFR;
+        move16();
+    }
+    L_subfr = idiv1616( st->L_frame, st->nb_subfr );
+
+    /* Core Lookahead */
+    st->encoderLookahead_enc = NS2SA_FX2( st->sr_core, ACELP_LOOK_NS );
+    st->encoderLookahead_FB = NS2SA_FX2( st->input_Fs, ACELP_LOOK_NS );
+    move16();
+    move16();
+
+    IF( st->ini_frame == 0 )
+    {
+        st->acelpFramesCount = 0;
+        move16();
+        st->prevTempFlatness_32fx = ONE_IN_Q21 /*1.0f Q21*/;
+        move32();
+    }
+
+    /* Initialize TBE */
+    IF( st->hBWE_TD != NULL )
+    {
+        st->hBWE_TD->prev_coder_type = GENERIC;
+        move16();
+        set16_fx( st->hBWE_TD->prev_lsf_diff_fx, 16384, LPC_SHB_ORDER - 2 );
+        st->hBWE_TD->prev_tilt_para_fx = 0;
+        move16();
+        set16_fx( st->hBWE_TD->cur_sub_Aq_fx, 0, M + 1 );
+    }
+
+    st->currEnergyHF_fx = 0;
+    move32();
+    st->currEnergyHF_e_fx = 0;
+    move16();
+    test();
+    /* Initialize LPC analysis/quantization */
+    IF( LE_32( st->sr_core, INT_FS_16k ) && st->tcxonly == 0 )
+    {
+        st->lpcQuantization = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->lpcQuantization = 0;
+        move16();
+    }
+
+    st->next_force_safety_net = 0;
+    move16();
+    test();
+    test();
+    IF( ( NE_16( st->last_L_frame, st->L_frame ) ) || ( EQ_16( st->last_core, AMR_WB_CORE ) ) || ( EQ_16( st->last_core, HQ_CORE ) ) )
+    {
+        set16_fx( st->mem_MA_fx, 0, M );
+        Copy( GEWB_Ave_fx, st->mem_AR_fx, M );
+    }
+
+    /* Initialize IGF */
+    if ( st->hIGFEnc != NULL )
+    {
+        st->hIGFEnc->infoStopFrequency = -1;
+        move16();
+    }
+
+    test();
+    IF( st->igf && st->hIGFEnc != NULL )
+    {
+        IGFEncSetMode_ivas_fx( st->hIGFEnc, igf_brate, st->bwidth, st->element_mode, st->rf_mode );
+    }
+    ELSE IF( st->hIGFEnc != NULL )
+    {
+        st->hIGFEnc->infoTotalBitsWritten = 0;
+        move16();
+        st->hIGFEnc->infoTotalBitsPerFrameWritten = 0;
+        move16();
+    }
+
+    /* Initialize Core Signal Analysis Module */
+    init_core_sig_ana_ivas_fx( st );
+
+
+    /* Initialize TCX */
+    IF( hTcxEnc != NULL )
+    {
+        init_tcx_ivas_fx( st, L_frame_old, st->total_brate, last_total_brate, MCT_flag );
+    }
+
+    /* Initialize Signal Buffers */
+    init_sig_buffers_ivas_fx( st, L_frame_old, L_subfr, last_total_brate );
+
+    /* Initialize ACELP */
+
+    init_acelp_ivas_fx( st, L_frame_old, 0, last_total_brate );
+
+    if ( st->ini_frame == 0 )
+    {
+        st->tec_tfa = 0;
+        move16();
+    }
+
+    IF( st->hTECEnc != NULL )
+    {
+        resetTecEnc_Fx( st->hTECEnc, st->tec_tfa );
+    }
+
+    test();
+    test();
+    test();
+    IF( EQ_16( st->bwidth, SWB ) && ( EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )
+    {
+        st->tec_tfa = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->tec_tfa = 0;
+        move16();
+    }
+
+    st->tec_flag = 0;
+    move16();
+    st->tfa_flag = 0;
+    move16();
+
+    test();
+    test();
+    test();
+    IF( ( EQ_32( st->total_brate, ACELP_9k60 ) || EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )
+    {
+        st->glr = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->glr = 0;
+        move16();
+    }
+
+    st->glr_reset = 0;
+    move16();
+
+    /* Initialize ACELP/TCX Modes */
+    init_modes_ivas_fx( st, last_total_brate );
+
+    /* Adaptive BPF */
+    set32_fx( st->mem_bpf_fx1, 0, 2 * L_FILT16k );
+    set32_fx( st->mem_error_bpf_fx, 0, 2 * L_FILT16k );
+
+    IF( st->ini_frame == 0 )
+    {
+        st->Q_max_enc[0] = 15;
+        move16();
+        st->Q_max_enc[1] = 15;
+        move16();
+    }
+
+    IF( GE_32( st->total_brate, HQ_48k ) )
+    {
+        st->enablePlcWaveadjust = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->enablePlcWaveadjust = 0;
+        move16();
+    }
+
+    IF( st->hPlcExt )
+    {
+        init_PLC_enc_fx( st->hPlcExt, st->sr_core );
+    }
+
+    st->glr_idx[0] = 0;
+    move16();
+    st->glr_idx[1] = 0;
+    move16();
+    st->mean_gc[0] = 0;
+    move16();
+    st->mean_gc[1] = 0;
+    move16();
+    st->prev_lsf4_mean = 0;
+    move16();
+    st->last_stab_fac = 0;
+    move16();
+
+    return;
+}
+
+/*-----------------------------------------------------------------------*
+ * init_tcx()
+ *
+ * Initialization of TCX
+ *-----------------------------------------------------------------------*/
+
+
+static void init_tcx_ivas_fx(
+    Encoder_State *st,
+    const Word16 L_frame_old,
+    const Word32 total_brate,
+    const Word32 last_total_brate,
+    const Word16 MCT_flag )
+{
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+
+    /* Share the memories for 2xTCX10/4xTCX5 and for TCX20 */
+    hTcxEnc->spectrum_fx[0] = hTcxEnc->spectrum_long_fx;
+    hTcxEnc->spectrum_fx[1] = hTcxEnc->spectrum_long_fx + N_TCX10_MAX;
+    st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;
+    move16();
+    move16();
+
+    init_tcx_cfg_ivas_fx( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX,
+                          st->fscale, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf,
+                          st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag );
+
+    /* Init TCX target bits correction factor */
+    hTcxEnc->tcx_target_bits_fac = 0x4000; /*1.0f in 1Q14*/
+    move16();
+    hTcxEnc->measuredBwRatio = 0x4000; /*1.0f in 1Q14*/
+    move16();
+    hTcxEnc->noiseTiltFactor = 9216; /*0.5625f in 1Q14*/
+    move16();
+    hTcxEnc->noiseLevelMemory_cnt = 0;
+    move16();
+
+    set16_fx( hTcxEnc->ltpGainMemory_fx, 0, N_LTP_GAIN_MEMS );
+    set8_fx( hTcxEnc->memQuantZeros, 0, L_FRAME_PLUS );
+
+    /* TCX-LTP */
+    hTcxEnc->tcxltp = getTcxLtp( st->sr_core );
+    move16();
+
+    test();
+    test();
+    test();
+    test();
+    IF( st->ini_frame == 0 )
+    {
+        hTcxEnc->tcxltp_pitch_int_past = st->L_frame;
+        hTcxEnc->tcxltp_pitch_fr_past = 0;
+        hTcxEnc->tcxltp_gain_past = 0;
+        hTcxEnc->tcxltp_norm_corr_past = 0;
+        hTcxEnc->tcxltp_norm_corr_mem = 0;
+        hTcxEnc->kernel_switch_corr_past = 0;
+        hTcxEnc->kernel_symmetry_past = 0; /* MDCT_IV & 1 */
+        hTcxEnc->enc_ste_pre_corr_past = 0;
+        hTcxEnc->tfm_mem_fx = 1610612736; /* 0.75 in Q31 */
+        hTcxEnc->tcxltp_on_mem = 0;
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+    }
+    ELSE IF( NE_16( st->L_frame, L_frame_old ) && !( ( GE_32( total_brate, ACELP_16k40 ) && LE_32( total_brate, ACELP_24k40 ) ) &&
+                                                     ( EQ_32( total_brate, last_total_brate ) ) && ( EQ_16( st->last_bwidth, st->bwidth ) ) ) )
+    {
+        Word16 pitres, pitres_old;
+        Word16 pit, pit_old;
+
+        pitres_old = 4;
+        move16();
+        if ( EQ_16( 160, shr( L_frame_old, sub( 7, norm_s( L_frame_old ) ) ) ) ) /*if ( L_frame_old%160==0 )*/
+        {
+            pitres_old = 6;
+            move16();
+        }
+
+        /*pit_old = (float)st->tcxltp_pitch_int_past + (float)st->tcxltp_pitch_fr_past/(float)pitres_old;*/
+        pit_old = add( hTcxEnc->tcxltp_pitch_int_past, mult_r( hTcxEnc->tcxltp_pitch_fr_past, div_s( 1, pitres_old ) ) );
+
+        pitres = 4;
+        move16();
+        if ( EQ_16( 160, shr( st->L_frame, sub( 7, norm_s( st->L_frame ) ) ) ) ) /*if ( st->L_frame%160==0 )*/
+        {
+            pitres = 6;
+            move16();
+        }
+
+        /*pit = pit_old * (float)st->L_frame/(float)L_frame_old;*/
+        pit = shl_sat( mult_r( pit_old, div_s( st->L_frame, shl( L_frame_old, 2 ) ) ), 2 );
+        /* Note : the saturation here that can happens when FS == 32kHz*/
+        /*    assert(pit <= st->L_frame);*/
+
+        hTcxEnc->tcxltp_pitch_int_past = pit;
+        move16();
+        hTcxEnc->tcxltp_pitch_fr_past = i_mult2( sub( pit, hTcxEnc->tcxltp_pitch_int_past ), pitres );
+        move16();
+    }
+
+    hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode );
+    move16();
+
+    return;
+}
+
+/*-----------------------------------------------------------------------*
+ * init_sig_buffers()
+ *
+ * Initialization of signal buffers
+ *-----------------------------------------------------------------------*/
+/*copy of evs function since it was static */
+static void init_sig_buffers_ivas_fx( Encoder_State *st, const Word16 L_frame_old, const Word16 L_subfr, const Word32 last_total_brate )
+{
+
+    LPD_state_HANDLE hLPDmem = st->hLPDmem;
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+
+    /* Encoder Past Samples at encoder-sampling-rate */
+    st->encoderPastSamples_enc = shr( imult1616( st->L_frame, 9 ), 4 );
+    move16();
+
+    /* Initialize Signal Buffers and Pointers at encoder-sampling-rate */
+    IF( st->ini_frame == 0 )
+    {
+        set16_fx( st->buf_speech_enc, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
+        st->exp_buf_speech_enc = 0;
+        move16();
+        set16_fx( st->buf_speech_enc_pe, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
+        st->exp_buf_speech_enc_pe = 0;
+        move16();
+        if ( hTcxEnc != NULL )
+        {
+            set16_fx( hTcxEnc->buf_speech_ltp, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
+            hTcxEnc->exp_buf_speech_ltp = 0;
+            move16();
+        }
+        set16_fx( st->buf_wspeech_enc, 0, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 ); /* increased by 320 to avoid memory overlap in ivas_find_wsp_fx() and also to accomodate for the wspeech_enc */
+        st->exp_buf_wspeech_enc = 0;
+        move16();
+    }
+    ELSE
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( NE_16( st->L_frame, L_frame_old ) && !( ( EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && ( EQ_32( st->total_brate, last_total_brate ) ) && ( EQ_16( st->last_bwidth, st->bwidth ) ) ) )
+        {
+            lerp( st->buf_speech_enc, st->buf_speech_enc, st->L_frame, L_frame_old );
+            test();
+            IF( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) /* condition should be checked again */
+            {
+                Copy( st->buf_speech_enc, hTcxEnc->buf_speech_ltp, st->L_frame );
+                Scale_sig( hTcxEnc->buf_speech_ltp, st->L_frame, sub( st->exp_buf_speech_enc, s_max( st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp ) ) );                                                                         // Q(15-max(st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp))
+                Scale_sig( hTcxEnc->buf_speech_ltp + st->L_frame, sub( L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, st->L_frame ), sub( hTcxEnc->exp_buf_speech_ltp, s_max( st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp ) ) ); // Q(15-max(st->exp_buf_speech_enc, hTcxEnc->exp_buf_speech_ltp))
+                hTcxEnc->exp_buf_speech_ltp = s_max( hTcxEnc->exp_buf_speech_ltp, st->exp_buf_speech_enc );
+                move16();
+            }
+
+            // Copy_Scale_sig( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM, sub( st->prev_Q_new, st->prev_Q_old ) );
+            Scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, sub( 0, sub( st->exp_old_wsp, st->exp_buf_wspeech_enc ) ) );
+            Copy( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM );
+            st->exp_buf_wspeech_enc = st->exp_old_wsp;
+            move16();
+
+            /*Resamp buffers needed only for ACELP*/
+            test();
+            test();
+            IF( EQ_16( st->L_frame, L_FRAME ) && !st->tcxonly )
+            {
+                if ( st->exp_buf_speech_enc_pe >= st->exp_old_inp_12k8 )
+                {
+                    Copy_Scale_sig( st->old_inp_12k8_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM, sub( st->exp_old_inp_12k8, st->exp_buf_speech_enc_pe ) ); // Scaling to common Q
+                    // st->buf_speech_enc_pe is in st->exp_buf_speech_enc_pe
+                }
+                else
+                {
+                    Scale_sig( st->buf_speech_enc_pe, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( st->exp_buf_speech_enc_pe, st->exp_old_inp_12k8 ) ); // Scaling to common Q
+                    Copy( st->old_inp_12k8_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM );
+                    st->exp_buf_speech_enc_pe = st->exp_old_inp_12k8;
+                    // st->buf_speech_enc_pe is in st->exp_buf_speech_enc_pe
+                    move16();
+                }
+            }
+            ELSE IF( EQ_16( st->L_frame, L_FRAME16k ) && !st->tcxonly )
+            {
+                lerp( st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, st->buf_wspeech_enc + st->L_frame + L_SUBFR - 310, 310, L_WSP_MEM );
+                if ( st->exp_buf_speech_enc_pe >= st->exp_old_inp_16k )
+                {
+                    Copy_Scale_sig( st->old_inp_16k_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM, sub( st->exp_old_inp_16k, st->exp_buf_speech_enc_pe ) ); // Scaling to common Q
+                    // st->buf_speech_enc_pe is in st->exp_buf_speech_enc_pe
+                }
+                else
+                {
+                    Scale_sig( st->buf_speech_enc_pe, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( st->exp_buf_speech_enc_pe, st->exp_old_inp_16k ) ); // Scaling to common Q
+                    Copy( st->old_inp_16k_fx, st->buf_speech_enc_pe + st->L_frame - L_INP_MEM, L_INP_MEM );
+                    st->exp_buf_speech_enc_pe = st->exp_old_inp_16k;
+                    // st->buf_speech_enc_pe is in st->exp_buf_speech_enc_pe
+                    move16();
+                }
+            }
+
+            st->mem_preemph_enc = st->buf_speech_enc[st->encoderPastSamples_enc + st->encoderLookahead_enc - 1];
+            move16();
+            st->exp_mem_preemph_enc = st->exp_buf_speech_enc;
+            move16();
+            st->mem_wsp_enc = shr( st->buf_wspeech_enc[st->L_frame + L_SUBFR - 1], sub( Q16, st->exp_buf_wspeech_enc ) ); // Q-1
+            move16();
+        }
+        /*coming from TCXonly modes*/
+        ELSE IF( !st->tcxonly && GE_32( last_total_brate, ACELP_32k ) )
+        {
+
+            Scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, sub( 0, sub( st->exp_old_wsp, st->exp_buf_wspeech_enc ) ) );
+            Copy( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM );
+            // Copy_Scale_sig( st->old_wsp_fx, st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, L_WSP_MEM, sub( st->prev_Q_new, st->prev_Q_old ) );
+            st->exp_buf_wspeech_enc = st->exp_old_wsp;
+            move16(); /*Resamp buffers needed only for ACELP*/
+            IF( EQ_16( st->L_frame, L_FRAME16k ) )
+            {
+                lerp( st->buf_wspeech_enc + st->L_frame + L_SUBFR - L_WSP_MEM, st->buf_wspeech_enc + st->L_frame + L_SUBFR - 310, 310, L_WSP_MEM );
+            }
+            hLPDmem->mem_w0 = 0;
+            move16();
+            st->mem_wsp_enc = shr( st->buf_wspeech_enc[st->L_frame + L_SUBFR - 1], sub( Q16, st->exp_buf_wspeech_enc ) ); // Q-1
+            move16();
+        }
+    }
+
+    st->new_speech_enc = st->buf_speech_enc + st->encoderPastSamples_enc + st->encoderLookahead_enc;
+    st->new_speech_enc_pe = st->buf_speech_enc_pe + st->encoderPastSamples_enc + st->encoderLookahead_enc;
+    if ( hTcxEnc != NULL )
+    {
+        hTcxEnc->new_speech_ltp = hTcxEnc->buf_speech_ltp + st->encoderPastSamples_enc + st->encoderLookahead_enc;
+    }
+
+    IF( st->hTcxEnc != NULL )
+    {
+        st->hTcxEnc->new_speech_TCX = st->input_buff_fx + Mpy_32_32( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 );
+        st->hTcxEnc->speech_TCX = st->hTcxEnc->new_speech_TCX - st->encoderLookahead_FB;
+    }
+    st->speech_enc = st->buf_speech_enc + st->encoderPastSamples_enc;
+    st->speech_enc_pe = st->buf_speech_enc_pe + st->encoderPastSamples_enc;
+
+    if ( hTcxEnc != NULL )
+    {
+        hTcxEnc->speech_ltp = hTcxEnc->buf_speech_ltp + st->encoderPastSamples_enc;
+    }
+
+    IF( st->element_mode > EVS_MONO )
+    {
+        st->wspeech_enc = st->buf_wspeech_enc + st->L_frame + L_SUBFR;
+    }
+    ELSE
+    {
+        st->wspeech_enc = st->buf_wspeech_enc + st->L_frame + L_subfr;
+    }
+
+    test();
+    test();
+    IF( st->ini_frame == 0 || NE_16( st->L_frame, L_frame_old ) || EQ_16( st->last_codec_mode, MODE1 ) )
+    {
+        set16_fx( st->buf_synth, 0, OLD_SYNTH_SIZE_ENC + L_FRAME32k );
+    }
+
+    st->synth = st->buf_synth + st->L_frame + L_subfr;
+
+
+    return;
+}
+
+/*-----------------------------------------------------------------------*
+ * init_core_sig_ana()
+ *
+ *
+ *-----------------------------------------------------------------------*/
+static void init_core_sig_ana_ivas_fx( Encoder_State *st )
+{
+
+    /* Pre-emphasis factor and memory */
+
+    st->preemph_fac = PREEMPH_FAC_SWB; /*SWB*/
+    move16();
+    IF( LT_16( st->fscale, ( 16000 * FSCALE_DENOM ) / 12800 ) )
+    {
+        st->preemph_fac = PREEMPH_FAC; /*WB*/
+        move16();
+    }
+    ELSE IF( LT_16( st->fscale, ( 24000 * FSCALE_DENOM ) / 12800 ) )
+    {
+        st->preemph_fac = PREEMPH_FAC_16k; /*WB*/
+        move16();
+    }
+
+    st->gamma = GAMMA1;
+    move16();
+    st->inv_gamma = GAMMA1_INV;
+    move16();
+    IF( EQ_32( st->sr_core, 16000 ) )
+    {
+        st->gamma = GAMMA16k;
+        move16();
+        st->inv_gamma = GAMMA16k_INV;
+        move16();
+    }
+
+
+    st->min_band = 1;
+    move16();
+    st->max_band = 16;
+    move16();
+
+    IF( st->narrowBand == 0 )
+    {
+        st->min_band = 0;
+        move16();
+        st->max_band = 19;
+        move16();
+    }
+
+
+    return;
+}
+/*-----------------------------------------------------------------------*
+ * init_acelp()
+ *
+ *
+ *-----------------------------------------------------------------------*/
+static void init_acelp_ivas_fx( Encoder_State *st, Word16 L_frame_old, Word16 shift, const Word32 last_total_brate )
+{
+    Word16 mem_syn_r_size_old;
+    Word16 mem_syn_r_size_new;
+    LPD_state_HANDLE hLPDmem = st->hLPDmem;
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+
+    /* Init pitch lag */
+    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        /* TCX LTP ana always runs @12.8kHz */
+        st->pit_res_max = initPitchLagParameters( 12800, &st->pit_min, &st->pit_fr1, &st->pit_fr1b, &st->pit_fr2, &st->pit_max );
+        move16();
+    }
+    ELSE
+    {
+        st->pit_res_max = initPitchLagParameters( st->sr_core, &st->pit_min, &st->pit_fr1, &st->pit_fr1b, &st->pit_fr2, &st->pit_max );
+        move16();
+    }
+
+    /* Init LPDmem */
+    IF( st->ini_frame == 0 )
+    {
+        IF( hLPDmem != NULL )
+        {
+            set16_fx( hLPDmem->syn, 0, 1 + M );
+            set16_fx( hLPDmem->mem_syn_r, 0, L_SYN_MEM );
+            hLPDmem->q_lpd_syn = Q15;
+            hLPDmem->q_mem_syn = Q15;
+            move16();
+            move16();
+        }
+
+        IF( st->hTcxEnc != NULL )
+        {
+            set16_fx( st->hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );
+            st->hTcxEnc->q_Txnq = Q15;
+            move16();
+            st->hTcxEnc->acelp_zir = st->hTcxEnc->Txnq + shr( st->L_frame, 1 );
+        }
+    }
+    ELSE /*Rate switching*/
+    {
+        IF( st->last_core == ACELP_CORE )
+        {
+            lerp( hTcxEnc->Txnq, hTcxEnc->Txnq, shr( st->L_frame, 1 ), shr( L_frame_old, 1 ) );
+        }
+        ELSE
+        {
+            lerp( hTcxEnc->Txnq, hTcxEnc->Txnq, st->hTcxCfg->tcx_mdct_window_length, st->hTcxCfg->tcx_mdct_window_length_old );
+        }
+        hTcxEnc->acelp_zir = hTcxEnc->Txnq + shr( st->L_frame, 1 );
+
+        /* Rate switching */
+        IF( EQ_16( st->last_codec_mode, MODE1 ) && st->element_mode == EVS_MONO )
+        {
+            IF( hLPDmem != NULL )
+            {
+                Copy( hLPDmem->mem_syn1_fx, hLPDmem->mem_syn2, M );
+                set16_fx( hLPDmem->syn, 0, M );
+                hLPDmem->q_lpd_syn = Q15;
+                hLPDmem->q_mem_syn = Q15;
+                move16();
+                move16();
+            }
+            IF( st->hTcxEnc != NULL )
+            {
+                set16_fx( hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );
+                st->hTcxEnc->q_Txnq = Q15;
+                move16();
+            }
+        }
+
+        /*AMR-WBIO->MODE2*/
+        IF( EQ_16( st->last_core, AMR_WB_CORE ) )
+        {
+            st->next_force_safety_net = 1;
+            move16();
+            st->last_core = ACELP_CORE;
+            move16();
+        }
+        /*HQ-CORE->MODE2*/
+        test();
+        IF( EQ_16( st->last_codec_mode, MODE1 ) && EQ_16( st->last_core, HQ_CORE ) )
+        {
+            /*Reset of ACELP memories*/
+            st->next_force_safety_net = 1;
+            move16();
+            st->rate_switching_reset = 1;
+            move16();
+            IF( hLPDmem != NULL )
+            {
+                hLPDmem->tilt_code = TILT_CODE;
+                move16();
+                set16_fx( hLPDmem->old_exc, 0, L_EXC_MEM );
+                set16_fx( hLPDmem->syn, 0, 1 + M );
+                hLPDmem->q_lpd_syn = Q15;
+                move16();
+                hLPDmem->q_lpd_old_exc = Q15;
+                move16();
+                hLPDmem->mem_w0 = 0;
+                move16();
+                set16_fx( hLPDmem->mem_syn, 0, M );
+                set16_fx( hLPDmem->mem_syn2, 0, M );
+                hLPDmem->q_mem_syn = Q15;
+                move16();
+            }
+
+            /* unquantized LPC*/
+            test();
+            test();
+            test();
+            IF( !( ( GE_32( st->total_brate, ACELP_16k40 ) && LE_32( st->total_brate, ACELP_24k40 ) ) && ( EQ_32( st->total_brate, last_total_brate ) ) && ( EQ_16( st->last_bwidth, st->bwidth ) ) ) )
+            {
+                Copy( st->lsp_old1_fx, st->lspold_enc_fx, M ); /*lsp old @12.8kHz*/
+                IF( EQ_16( st->L_frame, L_FRAME16k ) )
+                {
+                    lsp_convert_poly_fx( st->lspold_enc_fx, st->L_frame, 0 );
+                }
+            }
+            Copy( st->lspold_enc_fx, st->lsp_old_fx, M ); /*used unquantized values for mid-LSF Q*/
+            IF( st->tcxonly == 0 )
+            {
+                lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
+            }
+            ELSE
+            {
+                E_LPC_lsp_lsf_conversion( st->lsp_old_fx, st->lsf_old_fx, M );
+            }
+            st->last_core = TCX_20_CORE;
+            move16();
+
+            st->hTcxCfg->last_aldo = 1; /*It was previously ALDO*/
+            st->hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
+            move16();
+            move16();
+            /*ALDO overlap windowed past: also used in MODE1 but for other MDCT-FB*/
+            set16_fx( hTcxEnc->old_out_fx, 0, st->L_frame );
+        }
+        ELSE
+        {
+            test();
+            test();
+            test();
+            test();
+            IF( ( NE_16( st->L_frame, L_frame_old ) ) && ( LE_16( st->L_frame, L_FRAME16k ) ) && ( LE_16( L_frame_old, L_FRAME16k ) ) )
+            {
+                /* convert quantized LSP vector */
+                st->rate_switching_reset = lsp_convert_poly_fx( st->lsp_old_fx, st->L_frame, 0 );
+                move16();
+                IF( st->tcxonly == 0 )
+                {
+                    lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
+                }
+                ELSE
+                {
+                    E_LPC_lsp_lsf_conversion( st->lsp_old_fx, st->lsf_old_fx, M );
+                }
+                IF( EQ_16( st->L_frame, L_FRAME16k ) )
+                {
+                    Copy( st->lsp_old_fx, st->lspold_enc_fx, M );
+                }
+                ELSE
+                {
+                    Copy( st->lsp_old1_fx, st->lspold_enc_fx, M );
+                }
+
+
+                /*Mem of deemphasis stay unchanged : hLPDmem->syn*/
+                IF( hLPDmem != NULL )
+                {
+                    synth_mem_updt2( st->L_frame, st->last_L_frame, hLPDmem->old_exc, hLPDmem->mem_syn_r, hLPDmem->mem_syn2, hLPDmem->mem_syn, ENC );
+                    Word16 tmp, A[M + 1], Ap[M + 1], tmp_buf[M + 1];
+                    /* Update wsyn */
+                    /* lsp2a_stab( st->lsp_old, A, M ); */
+                    E_LPC_f_lsp_a_conversion( st->lsp_old_fx, A, M );
+                    weight_a_fx( A, Ap, GAMMA1, M );
+                    tmp = 0;
+                    move16();
+                    tmp_buf[0] = 0;
+                    move16();
+                    Copy( hLPDmem->mem_syn2, tmp_buf + 1, M );
+                    deemph_fx( tmp_buf + 1, st->preemph_fac, M, &tmp );
+                    Residu3_fx( Ap, tmp_buf + M, &tmp, 1, 1 );
+                    hLPDmem->mem_w0 = sub_sat( shr_sat( st->wspeech_enc[-1], shift ), tmp );
+                    move16();
+                }
+            }
+            ELSE IF( ( NE_16( st->L_frame, L_frame_old ) ) )
+            {
+                /*Partial reset of ACELP memories*/
+                st->next_force_safety_net = 1;
+                move16();
+                st->rate_switching_reset = 1;
+                move16();
+
+                /*reset partly some memories*/
+                IF( hLPDmem != NULL )
+                {
+                    hLPDmem->tilt_code = TILT_CODE;
+                    move16();
+                    set16_fx( hLPDmem->old_exc, 0, L_EXC_MEM );
+                    move16();
+                    hLPDmem->q_lpd_old_exc = Q15;
+                    move16();
+                    /*Resamp others memories*/
+                    /*Size of LPC syn memory*/
+                    /* 1.25/20.0 = 1.0/16.0 -> shift 4 to the right. */
+                    mem_syn_r_size_old = shr( L_frame_old, 4 );
+                    mem_syn_r_size_new = shr( st->L_frame, 4 );
+
+                    lerp( hLPDmem->mem_syn_r + L_SYN_MEM - mem_syn_r_size_old, hLPDmem->mem_syn_r + L_SYN_MEM - mem_syn_r_size_new, mem_syn_r_size_new, mem_syn_r_size_old );
+                    Copy( hLPDmem->mem_syn_r + L_SYN_MEM - M, hLPDmem->mem_syn, M );
+                    Copy( hLPDmem->mem_syn, hLPDmem->mem_syn2, M );
+
+                    /*Untouched memories : hLPDmem->syn & hLPDmem->mem_w0*/
+                    hLPDmem->mem_w0 = 0;
+                    move16();
+                }
+                /* unquantized LPC*/
+                Copy( st->lsp_old1_fx, st->lspold_enc_fx, M ); /*lsp old @12.8kHz*/
+                IF( EQ_16( st->L_frame, L_FRAME16k ) )
+                {
+                    lsp_convert_poly_fx( st->lspold_enc_fx, st->L_frame, 0 );
+                }
+                Copy( st->lspold_enc_fx, st->lsp_old_fx, M ); /*used unquantized values for mid-LSF Q*/
+                IF( st->tcxonly == 0 )
+                {
+                    lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
+                }
+                ELSE
+                {
+                    E_LPC_lsp_lsf_conversion( st->lsp_old_fx, st->lsf_old_fx, M );
+                }
+            }
+            ELSE IF( !st->tcxonly && EQ_16( st->L_frame, L_FRAME16k ) && GT_32( st->last_total_brate, ACELP_32k ) )
+            {
+                lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
+            }
+        }
+    }
+
+    test();
+    test();
+    if ( EQ_16( st->last_bwidth, NB ) && NE_16( st->bwidth, NB ) && st->ini_frame != 0 )
+    {
+        st->rate_switching_reset = 1;
+        move16();
+    }
+
+    /* Post-processing */
+    /*EVS specific*/
+    /* hLPDmem->dm_fx.prev_gain_code = L_deposit_l( 0 );
+     set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
+     hLPDmem->dm_fx.prev_state = 0;*/
+    /*------------*/
+
+    if ( hLPDmem != NULL )
+    {
+        hLPDmem->dm_fx.prev_state = 0;
+        move16(); /* This corresponds to st_fx->dispMem in FLP */
+        hLPDmem->dm_fx.prev_gain_code = 0;
+        move32();
+
+        FOR( Word16 i = 2; i < 8; i++ )
+        {
+            hLPDmem->dm_fx.prev_gain_pit[i - 2] = 0;
+            move16();
+        }
+        hLPDmem->gc_threshold = 0;
+        move16();
+    }
+
+    /* Pulse Search configuration */
+    st->acelp_autocorr = 1;
+    move16();
+
+    /*Use for 12.8 kHz sampling rate and low bitrates, the conventional pulse search->better SNR*/
+    test();
+    test();
+    if ( ( LE_32( st->total_brate, ACELP_9k60 ) || EQ_16( st->rf_mode, 1 ) ) && ( EQ_32( st->sr_core, 12800 ) ) )
+    {
+        st->acelp_autocorr = 0;
+        move16();
+    }
+
+
+    /*BPF parameters for adjusting gain in function of background noise*/
+    IF( EQ_16( st->codec_mode, MODE2 ) )
+    {
+        st->mem_bpf_fx.lp_error_ener = L_deposit_l( 0 );
+        move32();
+        st->pst_lp_ener_fx = 0;
+        move16();
+        IF( EQ_16( st->last_codec_mode, MODE1 ) )
+        {
+            st->mem_bpf_fx.lp_error = 0;
+            move32();
+            st->pst_mem_deemp_err_fx = 0;
+            move16();
+        }
+    }
+
+    return;
+}
+/*-----------------------------------------------------------------------*
+ * init_modes()
+ *
+ *
+ *-----------------------------------------------------------------------*/
+
+static void init_modes_ivas_fx(
+    Encoder_State *st,
+    const Word32 last_total_brate )
+{
+    Word8 n;
+    Word32 tmp32;
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+
+    /* Restrict ACE/TCX20/TCX10 mode */
+    move16();
+    st->restrictedMode = getRestrictedMode( st->element_mode, st->total_brate, st->Opt_AMR_WB );
+    move16();
+    st->acelpEnabled = 0;
+    move16();
+    st->tcx20Enabled = 0;
+    move16();
+    st->tcx10Enabled = 0;
+
+    if ( EQ_16( s_and( st->restrictedMode, 1 ), 1 ) )
+    {
+        st->acelpEnabled = 1;
+        move16();
+    }
+    if ( EQ_16( s_and( st->restrictedMode, 2 ), 2 ) )
+    {
+        st->tcx20Enabled = 1;
+        move16();
+    }
+    if ( EQ_16( s_and( st->restrictedMode, 4 ), 4 ) )
+    {
+        st->tcx10Enabled = 1;
+        move16();
+    }
+
+    /* TCX mode (TCX20 TCX10_10 or NO_TCX) */
+    if ( st->hTcxEnc != NULL )
+    {
+        hTcxEnc->tcxMode = NO_TCX;
+        move16();
+    }
+
+    /* Bits Budget */
+    /*st->bits_frame_nominal = (int)( (float)st->L_frame * (float)FSCALE_DENOM * (float)st->bitrate / ( (float)st->fscale * 12800.0f ) );*/
+    /*st->bits_frame_nominal = (int)( (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate/100.0f + 0.49f );*/
+    /*328 = 0.010009765625 in 0Q15*/
+    /* st->bits_frame_nominal = extract_h(L_add(L_mult(div_l(L_mult(shl(st->L_frame,2),st->bitrate),st->fscale),328),16056)); */
+
+    /* st->bits_frame_nominal = (int)( (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate/100.0f + 0.49f ); */
+    tmp32 = L_shl( st->total_brate, 1 );                                           /* (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate */
+    st->bits_frame_nominal = extract_l( L_shr( Mpy_32_16_1( tmp32, 20972 ), 6 ) ); /* 20972 = 0.01 * 64 * 32768 */
+    move16();
+
+    IF( st->Opt_AMR_WB )
+    {
+        st->bits_frame = st->bits_frame_nominal;
+        move16();
+        st->bits_frame_core = st->bits_frame_nominal;
+        move16();
+        st->frame_size_index = 0;
+        move16();
+    }
+    ELSE
+    {
+        FOR( n = 0; n < FRAME_SIZE_NB; n++ )
+        {
+            IF( LT_32( n, FRAME_SIZE_NB - 1 ) )
+            {
+                test();
+                IF( LE_32( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) && GT_32( FrameSizeConfig[n + 1].frame_bits, st->bits_frame_nominal ) )
+                {
+                    st->frame_size_index = n;
+                    move16();
+                    st->bits_frame = st->bits_frame_nominal;
+                    move16();
+                    st->bits_frame_core = sub( sub( sub( st->bits_frame_nominal, FrameSizeConfig[n].transmission_bits ), FrameSizeConfig[n].bandwidth_bits ), FrameSizeConfig[n].reserved_bits );
+                    move16();
+                    BREAK;
+                }
+            }
+            ELSE
+            {
+                IF( LE_32( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) )
+                {
+                    st->frame_size_index = n;
+                    move16();
+                    st->bits_frame = st->bits_frame_nominal;
+                    move16();
+                    st->bits_frame_core = sub( sub( sub( st->bits_frame_nominal, FrameSizeConfig[n].transmission_bits ), FrameSizeConfig[n].bandwidth_bits ), FrameSizeConfig[n].reserved_bits );
+                    move16();
+                    BREAK;
+                }
+            }
+        }
+    }
+
+    /* Reconfigure core */
+    core_coder_reconfig_ivas_fx( st, last_total_brate );
+
+
     return;
 }
diff --git a/lib_enc/core_enc_ol.c b/lib_enc/core_enc_ol.c
deleted file mode 100644
index d86e50ff19101cd541acce3b29d693c0dddde5b4..0000000000000000000000000000000000000000
--- a/lib_enc/core_enc_ol.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
diff --git a/lib_enc/core_enc_ol_fx.c b/lib_enc/core_enc_ol_fx.c
index ee347543b87cf940ce5ed8b04041e788558d1f91..18f48e904671c41127b9f6d0c7d3bf801dcd555e 100644
--- a/lib_enc/core_enc_ol_fx.c
+++ b/lib_enc/core_enc_ol_fx.c
@@ -80,10 +80,8 @@ void core_encode_openloop_fx(
     Word16 w_rf[M + 1], lsf_uq_rf[M + 1];
     Word16 lsf_q_1st_rf[M + 1], lsf_q_d_rf[M + 1], lsf_q_rf[M + 1];
     Word16 lsp_old_q_rf[M + 1], lsf_old_q_rf[M + 1];
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) vad_hover_flag;
     (void) vad_flag_dtx;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -554,11 +552,7 @@ void core_encode_openloop_fx(
             /*v_sub(lsf_uq_rf, lsf_q_1st_rf, lsf_q_d_rf, M);*/
             FOR( i = 0; i < M; i++ )
             {
-#ifdef BASOP_NOGLOB
                 lsf_q_d_rf[i] = shl_o( mult_r( sub_o( lsf_uq_rf[i], lsf_q_1st_rf[i], &Overflow ), 25600 ), 5, &Overflow );
-#else
-                lsf_q_d_rf[i] = shl( mult_r( sub( lsf_uq_rf[i], lsf_q_1st_rf[i] ), 25600 ), 5 );
-#endif
                 move16();
                 /*input value is in Qx2.56, convert to Q6 to match table, quantizer table kept at Q6 to avoid losing precision */
                 /*Assume this difference data max range can be represented by Q6*/
@@ -777,13 +771,8 @@ static void closest_centroid_rf(
         tmpL = i_mult2( i, length );
         FOR( j = 0; j < length; j++ )
         {
-#ifdef BASOP_NOGLOB
             tmp = sub_o( data[j], quantizer[tmpL + j], &Overflow );
             L_tmp = L_mult_o( tmp, tmp, &Overflow );
-#else
-            tmp = sub( data[j], quantizer[tmpL + j] );
-            L_tmp = L_mult( tmp, tmp );
-#endif
             werr_64 = W_mac_32_16( werr_64, L_tmp, weights[j] );
         }
         werr = W_sat_m( werr_64 );
@@ -1114,11 +1103,7 @@ void core_acelp_tcx20_switching_fx(
 
             FOR( j = 0; j < L_SUBFR; j++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp32 = L_mac0_o( tmp32, st->wspeech_enc[i + j], st->wspeech_enc[i + j], &Overflow );
-#else
-                tmp32 = L_mac0( tmp32, st->wspeech_enc[i + j], st->wspeech_enc[i + j] );
-#endif
             }
             tmp32 = L_shr( BASOP_Util_Log2( tmp32 ), 9 );                                                        /* 15Q16 */
             tmp32 = L_add( tmp32, L_sub( 0x1F0000, L_shl( L_deposit_h( add( Q_new, sub( shift, 1 ) ) ), 1 ) ) ); /* wspeech_enc scaling */
@@ -1136,11 +1121,7 @@ void core_acelp_tcx20_switching_fx(
         tcx_snr = L_shl( Mpy_32_16_1( tcx_snr, 0x6054 ), 2 ); /* 0x6054 -> 10/log2(10) (2Q13) */
 
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         snr_tcx = round_fx_o( L_shl_o( tcx_snr, 8, &Overflow ), &Overflow ); /* 7Q8 */
-#else                                                                        /* BASOP_NOGLOB */
-        snr_tcx = round_fx( L_shl( tcx_snr, 8 ) ); /* 7Q8 */
-#endif                                                                       /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
 
         /*--------------------------------------------------------------*
@@ -1174,19 +1155,11 @@ void core_acelp_tcx20_switching_fx(
 
             FOR( j = 0; j < L_SUBFR; j++ )
             {
-#ifdef BASOP_NOGLOB
                 signal = L_mac0_o( signal, st->wspeech_enc[i + j], st->wspeech_enc[i + j], &Overflow );
 
                 tmp16 = round_fx_o( L_shl_o( Mpy_32_16_r( gain, st->wspeech_enc[i + j - T0] ), 15, &Overflow ), &Overflow );
                 tmp16 = sub_o( st->wspeech_enc[i + j], tmp16, &Overflow );
                 noise = L_mac0_o( noise, tmp16, tmp16, &Overflow );
-#else
-                signal = L_mac0( signal, st->wspeech_enc[i + j], st->wspeech_enc[i + j] );
-
-                tmp16 = round_fx( L_shl( Mpy_32_16_r( gain, st->wspeech_enc[i + j - T0] ), 15 ) );
-                tmp16 = sub( st->wspeech_enc[i + j], tmp16 );
-                noise = L_mac0( noise, tmp16, tmp16 );
-#endif
             }
             /* Assume always 4 sub frames. */
             /*assert( (st->L_frame /  L_SUBFR) == 4);*/
@@ -1239,16 +1212,8 @@ void core_acelp_tcx20_switching_fx(
         test();
         if ( ( GT_16( snr_acelp, snr_tcx ) ) &&
              ( LT_16( snr_acelp, add( snr_tcx, 512 /*2.0f Q8*/ ) ) ) &&
-#ifdef BASOP_NOGLOB
              ( LT_16( add_o( st->prevTempFlatness_fx, currFlatness, &Overflow ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff /*1 Q15*/ ) ||
-#else /* BASOP_NOGLOB */
-             ( LT_16( add( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff ) ||
-#endif
-#ifdef BASOP_NOGLOB
                ( EQ_32( st->sr_core, INT_FS_12k8 ) && EQ_16( st->sp_aud_decision0, 1 ) && LT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 2560 /*20.f Q7*/ ) ) ) &&
-#else
-               ( EQ_32( st->sr_core, INT_FS_12k8 ) && EQ_16( st->sp_aud_decision0, 1 ) && LT_16( add( st->prevTempFlatness_fx, currFlatness ), 2560 /*20.f Q7*/ ) ) ) &&
-#endif
              ( LE_16( st->acelpFramesCount, 6 ) ) )
         {
             dsnr = -512 /*-2.0f Q8*/;
@@ -1261,11 +1226,7 @@ void core_acelp_tcx20_switching_fx(
         test();
         if ( ( LT_16( snr_acelp, snr_tcx ) ) &&
              ( GT_16( snr_acelp, sub( snr_tcx, 512 /*2.0f Q8*/ ) ) ) &&
-#ifdef BASOP_NOGLOB
              ( GT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) ) &&
-#else
-             ( GT_16( add( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) ) &&
-#endif
              ( GE_16( st->acelpFramesCount, 6 ) ) )
         {
             dsnr = 512 /*2.0f Q8*/;
diff --git a/lib_enc/core_enc_reconf.c b/lib_enc/core_enc_reconf.c
deleted file mode 100644
index 24729c1241da0adae89e9cbe65962bb739122ed3..0000000000000000000000000000000000000000
--- a/lib_enc/core_enc_reconf.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-----------------------------------------------------------------*
- * Funtion  core_coder_reconfig                                    *
- *          ~~~~~~~~~~~~~~~~~~~                                    *
- * - reconfig core coder when switching to another frame type      *
- *-----------------------------------------------------------------*/
-
-void core_coder_reconfig_ivas_fx(
-    Encoder_State *st )
-{
-    Word16 i, bwidth, index;
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    /*Configuration of ACELP*/
-    BITS_ALLOC_init_config_acelp( st->total_brate, st->narrowBand, st->nb_subfr, &( st->acelp_cfg ) );
-
-    /*Configuration of partial copy*/
-    IF( st->Opt_RF_ON )
-    {
-        st->hRF->acelp_cfg_rf.mode_index = 1;
-        st->hRF->acelp_cfg_rf.midLpc = 0;
-        st->hRF->acelp_cfg_rf.midLpc_enable = 0;
-        st->hRF->acelp_cfg_rf.pre_emphasis = 0;
-        st->hRF->acelp_cfg_rf.formant_enh = 1;
-        st->hRF->acelp_cfg_rf.formant_tilt = 1;
-        st->hRF->acelp_cfg_rf.voice_tilt = 1;
-        st->hRF->acelp_cfg_rf.formant_enh_num = FORMANT_SHARPENING_G1;
-        st->hRF->acelp_cfg_rf.formant_enh_den = FORMANT_SHARPENING_G2;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-    }
-
-    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        st->nb_bits_header_tcx = 2; /* signal class */
-        move16();
-    }
-    ELSE IF( st->tcxonly )
-    {
-        st->nb_bits_header_tcx = 1 + 1;                            /*TCX20/TCX10 + last_core*/
-        st->nb_bits_header_tcx = add( st->nb_bits_header_tcx, 2 ); /* Siganl class*/
-        move16();
-        move16();
-    }
-    ELSE
-    {
-        st->nb_bits_header_ace = 1 + 2 + 1; /*TCX/ACELP+coder_type + last_core*/
-        st->nb_bits_header_tcx = st->nb_bits_header_ace;
-        move16();
-        move16();
-
-        IF( st->hTcxCfg != NULL )
-        {
-            IF( st->hTcxCfg->lfacNext <= 0 )
-            {
-                st->nb_bits_header_ace = sub( st->nb_bits_header_ace, 1 ); /*No last_core*/
-                move16();
-            }
-        }
-    }
-
-
-    /*Switch off  TCX or ACELP?*/
-    IF( EQ_32( st->sr_core, INT_FS_12k8 ) )
-    {
-        st->acelpEnabled = extract_l( EQ_16( ( s_and( st->restrictedMode, 1 ) ), 1 ) );
-        st->tcx20Enabled = extract_l( EQ_16( ( s_and( st->restrictedMode, 2 ) ), 2 ) );
-        move16();
-        move16();
-    }
-    st->prevEnergyHF_fx = st->currEnergyHF_fx = 1073725440l /*65535.0f Q14*/; /* prevent block switch */
-    st->currEnergyHF_e_fx = 17;
-    move32();
-    move16();
-
-    /*Sanity check : don't need to be instrumented*/
-    IF( st->tcxonly == 0 )
-    {
-        assert( st->acelpEnabled || st->tcx20Enabled || st->frame_size_index == 0 );
-    }
-    ELSE
-    {
-        assert( st->tcx10Enabled || st->tcx20Enabled || st->frame_size_index == 0 );
-    }
-
-    /* TCX-LTP */
-    IF( st->hTcxEnc != NULL )
-    {
-        hTcxEnc->tcxltp = getTcxLtp( st->sr_core );
-        move16();
-    }
-
-    /*Use for 12.8 kHz sampling rate and low bitrates, the conventional pulse search->better SNR*/
-
-    st->acelp_autocorr = 1;
-    move16();
-
-    test();
-    if ( ( LE_32( st->total_brate, ACELP_9k60 ) ) && ( EQ_32( st->sr_core, INT_FS_12k8 ) ) )
-    {
-        st->acelp_autocorr = 0;
-        move16();
-    }
-
-    /*Get bandwidth mode*/
-    IF( st->narrowBand )
-    {
-        move16();
-        bwidth = NB;
-    }
-    ELSE IF( LE_32( st->sr_core, INT_FS_16k ) )
-    {
-        move16();
-        bwidth = WB;
-    }
-    ELSE
-    {
-        move16();
-        bwidth = SWB;
-    }
-
-    /*Scale TCX for non-active frames to adjust loudness with ACELP*/
-    IF( st->hTcxCfg != NULL )
-    {
-        st->hTcxCfg->na_scale = 32767 /*1.0f Q15*/;
-        move16();
-
-        test();
-        IF( LT_16( bwidth, 2 ) && ( st->tcxonly == 0 ) )
-        {
-            /*const Word16 scaleTableSize = sizeof(scaleTcxTable) / sizeof(scaleTcxTable[0]);*/
-
-            FOR( i = 0; i < SIZE_SCALE_TABLE_TCX; i++ )
-            {
-
-                test();
-                test();
-                IF( EQ_16( bwidth, scaleTcxTable[i].bwmode ) &&
-                    GE_32( st->total_brate, scaleTcxTable[i].bitrateFrom ) &&
-                    LT_32( st->total_brate, scaleTcxTable[i].bitrateTo ) )
-                {
-                    if ( st->rf_mode )
-                    {
-                        i = sub( i, 1 );
-                    }
-                    move16();
-                    st->hTcxCfg->na_scale = scaleTcxTable[i].scale;
-                    BREAK;
-                }
-            }
-        }
-    }
-    st->enableTcxLpc = 0;
-    move16();
-    IF( GT_16( st->element_mode, IVAS_SCE ) )
-    {
-        test();
-        test();
-        st->enableTcxLpc = ( EQ_16( st->lpcQuantization, 1 ) && ( LE_32( st->total_brate, LOWRATE_TCXLPC_MAX_BR_CPE ) || st->rf_mode ) );
-        move16();
-    }
-    ELSE
-    {
-        test();
-        test();
-        if ( EQ_16( st->lpcQuantization, 1 ) && ( LE_32( st->total_brate, LOWRATE_TCXLPC_MAX_BR ) || st->rf_mode != 0 ) )
-        {
-            st->enableTcxLpc = 1;
-            move16();
-        }
-    }
-    test();
-    IF( st->ini_frame == 0 || EQ_16( st->last_codec_mode, MODE1 ) )
-    {
-        st->envWeighted = 0;
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    IF( EQ_16( st->bwidth, SWB ) &&
-        ( EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )
-    {
-        IF( st->tec_tfa == 0 )
-        {
-            FOR( i = 0; i < MAX_TEC_SMOOTHING_DEG; i++ )
-            {
-                st->hTECEnc->loBuffer[i] = 0;
-                move16();
-            }
-        }
-        st->tec_tfa = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->tec_tfa = 0;
-        move16();
-    }
-
-    st->enablePlcWaveadjust = 0;
-    move16();
-    if ( GE_32( st->total_brate, HQ_48k ) )
-    {
-        st->enablePlcWaveadjust = 1;
-        move16();
-    }
-
-
-    move16();
-    st->glr = 0;
-    test();
-    test();
-    test();
-    if ( ( EQ_32( st->total_brate, ACELP_9k60 ) || EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && ( st->element_mode == EVS_MONO ) )
-    {
-        move16();
-        st->glr = 1;
-    }
-
-    IF( st->glr )
-    {
-        move16();
-        st->nb_bits_header_ace = add( st->nb_bits_header_ace, G_LPC_RECOVERY_BITS );
-    }
-    IF( hTcxEnc != NULL )
-    {
-        test();
-        IF( EQ_16( st->bwidth, NB ) || EQ_16( st->bwidth, WB ) )
-        {
-            IF( st->rf_mode == 0 )
-            {
-                index = s_min( N_TCX_STARTLINE_NOISE_WB - 1, s_max( 3, st->frame_size_index ) );
-            }
-            ELSE
-            {
-                index = s_min( N_TCX_STARTLINE_NOISE_WB - 1, s_max( 3, st->frame_size_index - 1 ) );
-            }
-            hTcxEnc->nmStartLine = startLineWB[index];
-            move16();
-        }
-        ELSE /* (st->bwidth == SWB || st->bwidth == FB) */
-        {
-            IF( st->rf_mode == 0 )
-            {
-                index = s_min( N_TCX_STARTLINE_NOISE_SWB - 1, sub( s_max( 3, st->frame_size_index ), 3 ) );
-            }
-            ELSE
-            {
-                index = s_min( N_TCX_STARTLINE_NOISE_SWB - 1, sub( s_max( 3, st->frame_size_index - 1 ), 3 ) );
-            }
-            test();
-            test();
-            if ( GE_32( st->total_brate, IVAS_96k ) && LE_32( st->total_brate, IVAS_192k ) && GT_16( st->element_mode, IVAS_SCE ) )
-            {
-                index = sub( index, 1 );
-            }
-            hTcxEnc->nmStartLine = startLineSWB[index];
-            move16();
-            test();
-            test();
-            IF( EQ_32( st->total_brate, IVAS_48k ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) && LT_16( add( hTcxEnc->nmStartLine, shl( hTcxEnc->nmStartLine, 2 ) ), shl( st->L_frame, 2 ) ) )
-            {
-                hTcxEnc->nmStartLine = shr( add( hTcxEnc->nmStartLine, shl( hTcxEnc->nmStartLine, 2 ) ), 2 ); /* low-rate stereo is more efficient than dual-mono due to stereo processing */
-                move16();
-            }
-        }
-    }
-
-    IF( hTcxEnc != NULL )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( LT_32( st->total_brate, ACELP_24k40 ) ) && ( ( GT_32( st->total_brate, st->last_total_brate ) ) || ( EQ_16( st->last_codec_mode, MODE1 ) ) ) )
-        {
-            /* low-freq memQuantZeros_fx must be reset partially if bitrate increased */
-            FOR( i = 0; i < hTcxEnc->nmStartLine; i++ )
-            {
-                hTcxEnc->memQuantZeros[i] = 0;
-                move16();
-            }
-        }
-        ELSE IF( ( GE_32( st->total_brate, ACELP_24k40 ) ) && ( LE_32( st->total_brate, ACELP_32k ) ) && ( GE_32( st->last_total_brate, ACELP_13k20 ) ) && ( LT_32( st->last_total_brate, ACELP_24k40 ) ) )
-        {
-            FOR( i = 0; i < st->L_frame; i++ ) /* memQuantZeros_fx won't be updated */
-            {
-                hTcxEnc->memQuantZeros[i] = 0;
-                move16();
-            }
-        }
-    }
-}
diff --git a/lib_enc/core_enc_reconf_fx.c b/lib_enc/core_enc_reconf_fx.c
index 3140422be5d88531fba60b90693049aa84388a8b..9e7380aaa8329662fb6ef5546e90a51b6a0f2c7b 100644
--- a/lib_enc/core_enc_reconf_fx.c
+++ b/lib_enc/core_enc_reconf_fx.c
@@ -24,9 +24,7 @@ void core_coder_reconfig_fx(
 {
     Word16 i, bwidth, index;
     TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) last_total_brate;
-#endif
     /*Configuration of ACELP*/
     BITS_ALLOC_init_config_acelp( st->total_brate, st->narrowBand, st->nb_subfr, &( st->acelp_cfg ) );
 
@@ -334,3 +332,307 @@ void core_coder_reconfig_fx(
         }
     }
 }
+
+
+/*-----------------------------------------------------------------*
+ * Funtion  core_coder_reconfig                                    *
+ *          ~~~~~~~~~~~~~~~~~~~                                    *
+ * - reconfig core coder when switching to another frame type      *
+ *-----------------------------------------------------------------*/
+
+void core_coder_reconfig_ivas_fx(
+    Encoder_State *st,
+    const Word32 last_total_brate )
+{
+    Word16 i, bwidth, index;
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+    /*Configuration of ACELP*/
+    BITS_ALLOC_init_config_acelp( st->total_brate, st->narrowBand, st->nb_subfr, &( st->acelp_cfg ) );
+
+    /*Configuration of partial copy*/
+    IF( st->Opt_RF_ON )
+    {
+        st->hRF->acelp_cfg_rf.mode_index = 1;
+        st->hRF->acelp_cfg_rf.midLpc = 0;
+        st->hRF->acelp_cfg_rf.midLpc_enable = 0;
+        st->hRF->acelp_cfg_rf.pre_emphasis = 0;
+        st->hRF->acelp_cfg_rf.formant_enh = 1;
+        st->hRF->acelp_cfg_rf.formant_tilt = 1;
+        st->hRF->acelp_cfg_rf.voice_tilt = 1;
+        st->hRF->acelp_cfg_rf.formant_enh_num = FORMANT_SHARPENING_G1;
+        st->hRF->acelp_cfg_rf.formant_enh_den = FORMANT_SHARPENING_G2;
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+    }
+
+    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        st->nb_bits_header_tcx = 2; /* signal class */
+        move16();
+    }
+    ELSE IF( st->tcxonly )
+    {
+        st->nb_bits_header_tcx = 1 + 1;                            /*TCX20/TCX10 + last_core*/
+        st->nb_bits_header_tcx = add( st->nb_bits_header_tcx, 2 ); /* Siganl class*/
+        move16();
+        move16();
+    }
+    ELSE
+    {
+        st->nb_bits_header_ace = 1 + 2 + 1; /*TCX/ACELP+coder_type + last_core*/
+        st->nb_bits_header_tcx = st->nb_bits_header_ace;
+        move16();
+        move16();
+
+        IF( st->hTcxCfg != NULL )
+        {
+            IF( st->hTcxCfg->lfacNext <= 0 )
+            {
+                st->nb_bits_header_ace = sub( st->nb_bits_header_ace, 1 ); /*No last_core*/
+                move16();
+            }
+        }
+    }
+
+
+    /*Switch off  TCX or ACELP?*/
+    IF( EQ_32( st->sr_core, INT_FS_12k8 ) )
+    {
+        st->acelpEnabled = extract_l( EQ_16( ( s_and( st->restrictedMode, 1 ) ), 1 ) );
+        st->tcx20Enabled = extract_l( EQ_16( ( s_and( st->restrictedMode, 2 ) ), 2 ) );
+        move16();
+        move16();
+    }
+    st->prevEnergyHF_fx = st->currEnergyHF_fx = 1073725440l /*65535.0f Q14*/; /* prevent block switch */
+    st->currEnergyHF_e_fx = 17;
+    move32();
+    move16();
+
+    /*Sanity check : don't need to be instrumented*/
+    IF( st->tcxonly == 0 )
+    {
+        assert( st->acelpEnabled || st->tcx20Enabled || st->frame_size_index == 0 );
+    }
+    ELSE
+    {
+        assert( st->tcx10Enabled || st->tcx20Enabled || st->frame_size_index == 0 );
+    }
+
+    /* TCX-LTP */
+    IF( st->hTcxEnc != NULL )
+    {
+        hTcxEnc->tcxltp = getTcxLtp( st->sr_core );
+        move16();
+    }
+
+    /*Use for 12.8 kHz sampling rate and low bitrates, the conventional pulse search->better SNR*/
+
+    st->acelp_autocorr = 1;
+    move16();
+
+    test();
+    if ( ( LE_32( st->total_brate, ACELP_9k60 ) ) && ( EQ_32( st->sr_core, INT_FS_12k8 ) ) )
+    {
+        st->acelp_autocorr = 0;
+        move16();
+    }
+
+    /*Get bandwidth mode*/
+    IF( st->narrowBand )
+    {
+        move16();
+        bwidth = NB;
+    }
+    ELSE IF( LE_32( st->sr_core, INT_FS_16k ) )
+    {
+        move16();
+        bwidth = WB;
+    }
+    ELSE
+    {
+        move16();
+        bwidth = SWB;
+    }
+
+    /*Scale TCX for non-active frames to adjust loudness with ACELP*/
+    IF( st->hTcxCfg != NULL )
+    {
+        st->hTcxCfg->na_scale = 32767 /*1.0f Q15*/;
+        move16();
+
+        test();
+        IF( LT_16( bwidth, 2 ) && ( st->tcxonly == 0 ) )
+        {
+            /*const Word16 scaleTableSize = sizeof(scaleTcxTable) / sizeof(scaleTcxTable[0]);*/
+
+            FOR( i = 0; i < SIZE_SCALE_TABLE_TCX; i++ )
+            {
+
+                test();
+                test();
+                IF( EQ_16( bwidth, scaleTcxTable[i].bwmode ) &&
+                    GE_32( st->total_brate, scaleTcxTable[i].bitrateFrom ) &&
+                    LT_32( st->total_brate, scaleTcxTable[i].bitrateTo ) )
+                {
+                    if ( st->rf_mode )
+                    {
+                        i = sub( i, 1 );
+                    }
+                    move16();
+                    st->hTcxCfg->na_scale = scaleTcxTable[i].scale;
+                    BREAK;
+                }
+            }
+        }
+    }
+    st->enableTcxLpc = 0;
+    move16();
+    IF( GT_16( st->element_mode, IVAS_SCE ) )
+    {
+        test();
+        test();
+        st->enableTcxLpc = ( EQ_16( st->lpcQuantization, 1 ) && ( LE_32( st->total_brate, LOWRATE_TCXLPC_MAX_BR_CPE ) || st->rf_mode ) );
+        move16();
+    }
+    ELSE
+    {
+        test();
+        test();
+        if ( EQ_16( st->lpcQuantization, 1 ) && ( LE_32( st->total_brate, LOWRATE_TCXLPC_MAX_BR ) || st->rf_mode != 0 ) )
+        {
+            st->enableTcxLpc = 1;
+            move16();
+        }
+    }
+    test();
+    IF( st->ini_frame == 0 || EQ_16( st->last_codec_mode, MODE1 ) )
+    {
+        st->envWeighted = 0;
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    IF( EQ_16( st->bwidth, SWB ) &&
+        ( EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )
+    {
+        IF( st->tec_tfa == 0 )
+        {
+            FOR( i = 0; i < MAX_TEC_SMOOTHING_DEG; i++ )
+            {
+                st->hTECEnc->loBuffer[i] = 0;
+                move16();
+            }
+        }
+        st->tec_tfa = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->tec_tfa = 0;
+        move16();
+    }
+
+    st->enablePlcWaveadjust = 0;
+    move16();
+    if ( GE_32( st->total_brate, HQ_48k ) )
+    {
+        st->enablePlcWaveadjust = 1;
+        move16();
+    }
+
+
+    move16();
+    st->glr = 0;
+    test();
+    test();
+    test();
+    if ( ( EQ_32( st->total_brate, ACELP_9k60 ) || EQ_32( st->total_brate, ACELP_16k40 ) || EQ_32( st->total_brate, ACELP_24k40 ) ) && ( st->element_mode == EVS_MONO ) )
+    {
+        move16();
+        st->glr = 1;
+    }
+
+    IF( st->glr )
+    {
+        move16();
+        st->nb_bits_header_ace = add( st->nb_bits_header_ace, G_LPC_RECOVERY_BITS );
+    }
+    IF( hTcxEnc != NULL )
+    {
+        test();
+        IF( EQ_16( st->bwidth, NB ) || EQ_16( st->bwidth, WB ) )
+        {
+            IF( st->rf_mode == 0 )
+            {
+                index = s_min( N_TCX_STARTLINE_NOISE_WB - 1, s_max( 3, st->frame_size_index ) );
+            }
+            ELSE
+            {
+                index = s_min( N_TCX_STARTLINE_NOISE_WB - 1, s_max( 3, st->frame_size_index - 1 ) );
+            }
+            hTcxEnc->nmStartLine = startLineWB[index];
+            move16();
+        }
+        ELSE /* (st->bwidth == SWB || st->bwidth == FB) */
+        {
+            IF( st->rf_mode == 0 )
+            {
+                index = s_min( N_TCX_STARTLINE_NOISE_SWB - 1, sub( s_max( 3, st->frame_size_index ), 3 ) );
+            }
+            ELSE
+            {
+                index = s_min( N_TCX_STARTLINE_NOISE_SWB - 1, sub( s_max( 3, st->frame_size_index - 1 ), 3 ) );
+            }
+            test();
+            test();
+            if ( GE_32( st->total_brate, IVAS_96k ) && LE_32( st->total_brate, IVAS_192k ) && GT_16( st->element_mode, IVAS_SCE ) )
+            {
+                index = sub( index, 1 );
+            }
+            hTcxEnc->nmStartLine = startLineSWB[index];
+            move16();
+            test();
+            test();
+            IF( EQ_32( st->total_brate, IVAS_48k ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) && LT_16( add( hTcxEnc->nmStartLine, shl( hTcxEnc->nmStartLine, 2 ) ), shl( st->L_frame, 2 ) ) )
+            {
+                hTcxEnc->nmStartLine = shr( add( hTcxEnc->nmStartLine, shl( hTcxEnc->nmStartLine, 2 ) ), 2 ); /* low-rate stereo is more efficient than dual-mono due to stereo processing */
+                move16();
+            }
+        }
+    }
+
+    IF( hTcxEnc != NULL )
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( LT_32( st->total_brate, ACELP_24k40 ) ) && ( ( GT_32( st->total_brate, last_total_brate ) ) || ( EQ_16( st->last_codec_mode, MODE1 ) ) ) )
+        {
+            /* low-freq memQuantZeros_fx must be reset partially if bitrate increased */
+            FOR( i = 0; i < hTcxEnc->nmStartLine; i++ )
+            {
+                hTcxEnc->memQuantZeros[i] = 0;
+                move16();
+            }
+        }
+        ELSE IF( ( GE_32( st->total_brate, ACELP_24k40 ) ) && ( LE_32( st->total_brate, ACELP_32k ) ) && ( GE_32( last_total_brate, ACELP_13k20 ) ) && ( LT_32( last_total_brate, ACELP_24k40 ) ) )
+        {
+            FOR( i = 0; i < st->L_frame; i++ ) /* memQuantZeros_fx won't be updated */
+            {
+                hTcxEnc->memQuantZeros[i] = 0;
+                move16();
+            }
+        }
+    }
+}
diff --git a/lib_enc/core_enc_switch.c b/lib_enc/core_enc_switch.c
deleted file mode 100644
index e5c3903a1789031ba9481c8f483235735965d117..0000000000000000000000000000000000000000
--- a/lib_enc/core_enc_switch.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-
-
-/*-------------------------------------------------------------------*
- * core_coder_mode_switch()
- *
- *
- *-------------------------------------------------------------------*/
-void core_coder_mode_switch_ivas_fx(
-    Encoder_State *st,             /* i/o: encoder state structure             */
-    const Word32 last_total_brate, /* i  : last bitrate                        */
-    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)*/
-)
-{
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    Word16 i, fscale, switchWB;
-    Word32 sr_core;
-    Word16 bSwitchFromAmrwbIO;
-    Word16 tcxonly_tmp, exp_res;
-
-    switchWB = 0;
-    move16();
-    bSwitchFromAmrwbIO = 0;
-    move16();
-    exp_res = 0;
-    move16();
-
-
-    if ( EQ_16( st->last_core, AMR_WB_CORE ) )
-    {
-        bSwitchFromAmrwbIO = 1;
-        move16();
-    }
-
-    /* force active frame for the first frame when switching from high bitrates when DTX is enabled*/
-    sr_core = getCoreSamplerateMode2( st->element_mode, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, st->is_ism_format );
-
-    fscale = sr2fscale_fx( sr_core );
-    if ( EQ_16( st->last_codec_mode, MODE1 ) )
-    {
-        switchWB = 1; /*force init when coming from MODE1*/
-        move16();
-    }
-
-    tcxonly_tmp = getTcxonly_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
-
-    if ( NE_32( tcxonly_tmp, st->tcxonly ) )
-    {
-        switchWB = 1; /*force init when coming from MODE1*/
-        move16();
-    }
-
-    test();
-    test();
-    IF( EQ_32( fscale, st->fscale ) && !bSwitchFromAmrwbIO && !switchWB )
-    {
-        st->sr_core = sr_core;
-        move16();
-        Word16 tmp = BASOP_Util_Divide3232_Scale( sr_core, FRAMES_PER_SEC, &exp_res );
-        st->L_frame = shr( tmp, sub( 15, exp_res ) ); // Q0
-        move16();
-
-        st->tcxonly = getTcxonly_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
-        move16();
-
-        Word16 exp_tmp1 = 0;
-        move16();
-        Word16 tmp1 = BASOP_Util_Divide1616_Scale( ONE_IN_Q9, 128, &exp_tmp1 );
-
-        Word16 exp_tmp2 = 0;
-        move16();
-        Word16 tmp2 = BASOP_Util_Divide3232_Scale( st->total_brate, 100, &exp_tmp2 );
-
-        Word16 exp_tmp3 = 0;
-        move16();
-        Word16 tmp3 = BASOP_Util_Divide3232_Scale( st->L_frame, st->fscale, &exp_tmp3 );
-
-        Word32 tmp4 = L_mult0( tmp1, tmp2 );                 // exp_tmp1 + exp_tmp2
-        Word32 tmp5 = L_shl( Mpy_32_16_1( tmp4, tmp3 ), 1 ); // exp_tmp1 + exp_tmp2 + exp_tmp3
-        st->bits_frame_nominal = extract_l( L_shr( tmp5, sub( 31, ( add( add( exp_tmp1, exp_tmp2 ), exp_tmp3 ) ) ) ) );
-        move16();
-        st->igf = getIgfPresent_fx( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );
-        move16();
-        /* switch IGF configuration */
-        IF( st->igf )
-        {
-            IGFEncSetMode_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );
-        }
-        st->hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( st->bwidth );
-        move16();
-
-        st->hTcxCfg->bandwidth = getTcxBandwidth( st->bwidth );
-        move16();
-        if ( st->tcxonly )
-        {
-            st->hTcxCfg->tcxRateLoopOpt = 2;
-            move16();
-        }
-        else
-        {
-            st->hTcxCfg->tcxRateLoopOpt = 0;
-            move16();
-        }
-        if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-        {
-            st->hTcxCfg->tcxRateLoopOpt = 3;
-            move16();
-        }
-        st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, st->total_brate, st->rf_mode );
-        st->hTcxCfg->resq = getResq( st->total_brate );
-        hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode );
-        test();
-        if ( st->hTcxCfg->resq && !st->tcxonly )
-        {
-            st->hTcxCfg->tcxRateLoopOpt = 1;
-            move16();
-        }
-        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode );
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-
-        IF( st->hTcxCfg->fIsTNSAllowed )
-        {
-            InitTnsConfigs_ivas_fx( st->bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFEnc->infoStopFrequency, st->total_brate, st->element_mode, MCT_flag );
-
-            SetAllowTnsOnWhite( st->hTcxCfg->tnsConfig, st->element_mode == IVAS_CPE_MDCT );
-        }
-
-        IF( EQ_16( st->bwidth, NB ) )
-        {
-            st->narrowBand = 1;
-            st->min_band = 1;
-            st->max_band = 16;
-        }
-        ELSE
-        {
-            st->narrowBand = 0;
-            st->min_band = 0;
-            st->max_band = 19;
-        }
-
-        move16();
-        move16();
-        move16();
-
-        FOR( i = 0; i < FRAME_SIZE_NB; i++ )
-        {
-            IF( EQ_32( FrameSizeConfig[i].frame_bits, st->bits_frame_nominal ) )
-            {
-                st->frame_size_index = i;
-                st->bits_frame = FrameSizeConfig[i].frame_bits;
-                st->bits_frame_core = FrameSizeConfig[i].frame_net_bits;
-                move16();
-                move16();
-                move16();
-                BREAK;
-            }
-        }
-
-        st->restrictedMode = getRestrictedMode( st->element_mode, st->total_brate, 0 );
-        move16();
-        core_coder_reconfig_ivas_fx( st );
-    }
-    ELSE
-    {
-        st->igf = getIgfPresent_fx( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );
-        move16();
-        IF( hTcxEnc != NULL )
-        {
-            hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
-            move16();
-        }
-        st->currEnergyHF_fx = 0;
-        move32();
-        st->currEnergyHF_e_fx = 0;
-        move16();
-        Word16 shift = getScaleFactor16( st->old_inp_16k_fx, L_INP_MEM );
-        Scale_sig( st->old_inp_16k_fx, L_INP_MEM, shift );
-        st->exp_old_inp_16k = sub( st->exp_old_inp_16k, shift );
-        move16();
-        shift = getScaleFactor16( st->old_inp_12k8_fx, L_INP_MEM );
-        Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );
-        st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );
-        move16();
-        init_coder_ace_plus_ivas_fx( st, last_total_brate, MCT_flag );
-        if ( st->hLPDmem != NULL )
-        {
-            st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;
-            move16();
-        }
-    }
-
-    test();
-    IF( st->igf && st->hBWE_TD != NULL )
-    {
-        /* reset TBE */
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( EQ_16( st->bwidth, WB ) && NE_16( st->last_extl, WB_TBE ) ) ||
-            ( EQ_16( st->bwidth, SWB ) && NE_16( st->last_extl, SWB_TBE ) ) ||
-            ( EQ_16( st->bwidth, FB ) && NE_16( st->last_extl, FB_TBE ) ) )
-        {
-            TBEreset_enc_fx( st, st->bwidth );
-        }
-        ELSE
-        {
-            set16_fx( st->hBWE_TD->state_lpc_syn_fx, 0, LPC_SHB_ORDER );
-            set16_fx( st->hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD );
-            set16_fx( st->hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
-            set16_fx( st->hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
-            st->hBWE_TD->gain_prec_swb_fx = ONE_IN_Q14;
-            move16();
-        }
-    }
-    test();
-    IF( st->envWeighted && !st->enableTcxLpc )
-    {
-        /* Unweight the envelope */
-        st->inv_gamma = BASOP_Util_Divide1616_Scale( MAX16B, st->gamma, &exp_res );
-        move16();
-        st->inv_gamma = shr( st->inv_gamma, sub( Q1, exp_res ) ); /* Q14 */
-        move16();
-        E_LPC_lsp_unweight( st->lsp_old_fx, st->lsp_old_fx, st->lsf_old_fx, st->inv_gamma, M );
-        st->envWeighted = 0;
-        move16();
-    }
-
-    IF( GE_32( st->total_brate, HQ_48k ) )
-    {
-        st->enablePlcWaveadjust = 1;
-        move16();
-    }
-    ELSE
-    {
-        st->enablePlcWaveadjust = 0;
-        move16();
-    }
-
-    test();
-    test();
-    if ( ( GT_32( last_total_brate, HQ_32k ) || EQ_16( st->last_codec_mode, MODE1 ) ) && ( st->element_mode == EVS_MONO ) )
-    {
-        st->glr_reset = 1;
-        move16();
-    }
-
-    return;
-}
diff --git a/lib_enc/core_enc_switch_fx.c b/lib_enc/core_enc_switch_fx.c
index 1096cfb492cb75edc8ad6ba65069ae4690ec5ef6..fb5fd037a51694a3422381d0784d3368ed1f37e3 100644
--- a/lib_enc/core_enc_switch_fx.c
+++ b/lib_enc/core_enc_switch_fx.c
@@ -4,14 +4,11 @@
 #include <stdint.h>
 #include <assert.h>
 #include "options.h"
-#include "prot.h"
-//#include "prot_fx.h"
-//#include "basop_mpy.h"
+#include "prot_fx.h"
 #include "cnst.h" /* Common constants                     */
 #include "ivas_cnst.h"
 #include "rom_com_fx.h"
 #include "rom_com.h"     /* Common constants                       */
-#include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "basop_util.h"  /* Function prototypes                    */
 
@@ -52,11 +49,7 @@ void core_coder_mode_switch_fx(
         switchWB = 1; /*force init when coming from MODE1*/
     }
 
-#ifdef IVAS_CODE_SWITCHING
-    tcxonly_tmp = getTcxonly( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
-#else
     tcxonly_tmp = getTcxonly( st->total_brate );
-#endif
 
     if ( NE_16( tcxonly_tmp, st->tcxonly ) )
     {
@@ -74,11 +67,7 @@ void core_coder_mode_switch_fx(
         move32();
         st->L_frame = extract_l( Mult_32_16( st->sr_core, 0x0290 ) );
         assert( st->L_frame == st->sr_core / 50 );
-#ifdef IVAS_CODE_SWITCHING
-        st->tcxonly = getTcxonly( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
-#else
         st->tcxonly = (Word8) getTcxonly( st->total_brate );
-#endif
         /* st->bits_frame_nominal = (int)( (float)st->L_frame/(float)st->fscale ) * (float)FSCALE_DENOM/128.0f * (float)st->bitrate/100.0f + 0.49f ; */
         /* st->bits_frame_nominal = extract_l(L_shr(Mpy_32_16_1( L_shl(st->bitrate,8), mult_r(div_s(st->fscale, shl(st->L_frame,4)), FL2WORD16(FSCALE_DENOM/12800.f))), 6)); */
         tmp32 = L_shl( st->total_brate, 1 );                                           /* (float)st->L_frame/(float)st->fscale * (float)FSCALE_DENOM/128.0f * (float)st->bitrate */
@@ -121,9 +110,6 @@ void core_coder_mode_switch_fx(
         IF( st->hTcxCfg->fIsTNSAllowed != 0 )
         {
             InitTnsConfigs( st->bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFEnc->infoStopFrequency, st->total_brate, st->element_mode, MCT_flag );
-#ifdef IVAS_CODE
-            SetAllowTnsOnWhite( st->hTcxCfg->tnsConfig, EQ_16( st->element_mode, IVAS_CPE_MDCT ) );
-#endif
         }
 
         st->narrowBand = 0;
@@ -223,3 +209,258 @@ void core_coder_mode_switch_fx(
         st->glr_reset = 1;
     }
 }
+
+
+/*-------------------------------------------------------------------*
+ * core_coder_mode_switch()
+ *
+ *
+ *-------------------------------------------------------------------*/
+void core_coder_mode_switch_ivas_fx(
+    Encoder_State *st,             /* i/o: encoder state structure             */
+    const Word32 last_total_brate, /* i  : last bitrate                        */
+    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)*/
+)
+{
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+    Word16 i, fscale, switchWB;
+    Word32 sr_core;
+    Word16 bSwitchFromAmrwbIO;
+    Word16 tcxonly_tmp, exp_res;
+
+    switchWB = 0;
+    move16();
+    bSwitchFromAmrwbIO = 0;
+    move16();
+    exp_res = 0;
+    move16();
+
+
+    if ( EQ_16( st->last_core, AMR_WB_CORE ) )
+    {
+        bSwitchFromAmrwbIO = 1;
+        move16();
+    }
+
+    /* force active frame for the first frame when switching from high bitrates when DTX is enabled*/
+    sr_core = getCoreSamplerateMode2( st->element_mode, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, st->is_ism_format );
+
+    fscale = sr2fscale_fx( sr_core );
+    if ( EQ_16( st->last_codec_mode, MODE1 ) )
+    {
+        switchWB = 1; /*force init when coming from MODE1*/
+        move16();
+    }
+
+    tcxonly_tmp = getTcxonly_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
+
+    if ( NE_32( tcxonly_tmp, st->tcxonly ) )
+    {
+        switchWB = 1; /*force init when coming from MODE1*/
+        move16();
+    }
+
+    test();
+    test();
+    IF( EQ_32( fscale, st->fscale ) && !bSwitchFromAmrwbIO && !switchWB )
+    {
+        st->sr_core = sr_core;
+        move16();
+        Word16 tmp = BASOP_Util_Divide3232_Scale( sr_core, FRAMES_PER_SEC, &exp_res );
+        st->L_frame = shr( tmp, sub( 15, exp_res ) ); // Q0
+        move16();
+
+        st->tcxonly = getTcxonly_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );
+        move16();
+
+        Word16 exp_tmp1 = 0;
+        move16();
+        Word16 tmp1 = BASOP_Util_Divide1616_Scale( ONE_IN_Q9, 128, &exp_tmp1 );
+
+        Word16 exp_tmp2 = 0;
+        move16();
+        Word16 tmp2 = BASOP_Util_Divide3232_Scale( st->total_brate, 100, &exp_tmp2 );
+
+        Word16 exp_tmp3 = 0;
+        move16();
+        Word16 tmp3 = BASOP_Util_Divide3232_Scale( st->L_frame, st->fscale, &exp_tmp3 );
+
+        Word32 tmp4 = L_mult0( tmp1, tmp2 );                 // exp_tmp1 + exp_tmp2
+        Word32 tmp5 = L_shl( Mpy_32_16_1( tmp4, tmp3 ), 1 ); // exp_tmp1 + exp_tmp2 + exp_tmp3
+        st->bits_frame_nominal = extract_l( L_shr( tmp5, sub( 31, ( add( add( exp_tmp1, exp_tmp2 ), exp_tmp3 ) ) ) ) );
+        move16();
+        st->igf = getIgfPresent_fx( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );
+        move16();
+        /* switch IGF configuration */
+        IF( st->igf )
+        {
+            IGFEncSetMode_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );
+        }
+        st->hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( st->bwidth );
+        move16();
+
+        st->hTcxCfg->bandwidth = getTcxBandwidth( st->bwidth );
+        move16();
+        if ( st->tcxonly )
+        {
+            st->hTcxCfg->tcxRateLoopOpt = 2;
+            move16();
+        }
+        else
+        {
+            st->hTcxCfg->tcxRateLoopOpt = 0;
+            move16();
+        }
+        if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+        {
+            st->hTcxCfg->tcxRateLoopOpt = 3;
+            move16();
+        }
+        st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, st->total_brate, st->rf_mode );
+        st->hTcxCfg->resq = getResq( st->total_brate );
+        hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode );
+        test();
+        if ( st->hTcxCfg->resq && !st->tcxonly )
+        {
+            st->hTcxCfg->tcxRateLoopOpt = 1;
+            move16();
+        }
+        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode );
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+        move16();
+
+        IF( st->hTcxCfg->fIsTNSAllowed )
+        {
+            InitTnsConfigs_ivas_fx( st->bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFEnc->infoStopFrequency, st->total_brate, st->element_mode, MCT_flag );
+
+            SetAllowTnsOnWhite( st->hTcxCfg->tnsConfig, st->element_mode == IVAS_CPE_MDCT );
+        }
+
+        IF( EQ_16( st->bwidth, NB ) )
+        {
+            st->narrowBand = 1;
+            st->min_band = 1;
+            st->max_band = 16;
+        }
+        ELSE
+        {
+            st->narrowBand = 0;
+            st->min_band = 0;
+            st->max_band = 19;
+        }
+
+        move16();
+        move16();
+        move16();
+
+        FOR( i = 0; i < FRAME_SIZE_NB; i++ )
+        {
+            IF( EQ_32( FrameSizeConfig[i].frame_bits, st->bits_frame_nominal ) )
+            {
+                st->frame_size_index = i;
+                st->bits_frame = FrameSizeConfig[i].frame_bits;
+                st->bits_frame_core = FrameSizeConfig[i].frame_net_bits;
+                move16();
+                move16();
+                move16();
+                BREAK;
+            }
+        }
+
+        st->restrictedMode = getRestrictedMode( st->element_mode, st->total_brate, 0 );
+        move16();
+        core_coder_reconfig_ivas_fx( st, last_total_brate );
+    }
+    ELSE
+    {
+        st->igf = getIgfPresent_fx( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );
+        move16();
+        IF( hTcxEnc != NULL )
+        {
+            hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
+            move16();
+        }
+        st->currEnergyHF_fx = 0;
+        move32();
+        st->currEnergyHF_e_fx = 0;
+        move16();
+        Word16 shift = getScaleFactor16( st->old_inp_16k_fx, L_INP_MEM );
+        Scale_sig( st->old_inp_16k_fx, L_INP_MEM, shift );
+        st->exp_old_inp_16k = sub( st->exp_old_inp_16k, shift );
+        move16();
+        shift = getScaleFactor16( st->old_inp_12k8_fx, L_INP_MEM );
+        Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );
+        st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );
+        move16();
+        init_coder_ace_plus_ivas_fx( st, last_total_brate, st->total_brate, MCT_flag );
+        if ( st->hLPDmem != NULL )
+        {
+            st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;
+            move16();
+        }
+    }
+
+    test();
+    IF( st->igf && st->hBWE_TD != NULL )
+    {
+        /* reset TBE */
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( EQ_16( st->bwidth, WB ) && NE_16( st->last_extl, WB_TBE ) ) ||
+            ( EQ_16( st->bwidth, SWB ) && NE_16( st->last_extl, SWB_TBE ) ) ||
+            ( EQ_16( st->bwidth, FB ) && NE_16( st->last_extl, FB_TBE ) ) )
+        {
+            TBEreset_enc_fx( st, st->bwidth );
+        }
+        ELSE
+        {
+            set16_fx( st->hBWE_TD->state_lpc_syn_fx, 0, LPC_SHB_ORDER );
+            set16_fx( st->hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD );
+            set16_fx( st->hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
+            set16_fx( st->hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
+            st->hBWE_TD->gain_prec_swb_fx = ONE_IN_Q14;
+            move16();
+        }
+    }
+    test();
+    IF( st->envWeighted && !st->enableTcxLpc )
+    {
+        /* Unweight the envelope */
+        st->inv_gamma = BASOP_Util_Divide1616_Scale( MAX16B, st->gamma, &exp_res );
+        move16();
+        st->inv_gamma = shr( st->inv_gamma, sub( Q1, exp_res ) ); /* Q14 */
+        move16();
+        E_LPC_lsp_unweight( st->lsp_old_fx, st->lsp_old_fx, st->lsf_old_fx, st->inv_gamma, M );
+        st->envWeighted = 0;
+        move16();
+    }
+
+    IF( GE_32( st->total_brate, HQ_48k ) )
+    {
+        st->enablePlcWaveadjust = 1;
+        move16();
+    }
+    ELSE
+    {
+        st->enablePlcWaveadjust = 0;
+        move16();
+    }
+
+    test();
+    test();
+    if ( ( GT_32( last_total_brate, HQ_32k ) || EQ_16( st->last_codec_mode, MODE1 ) ) && ( st->element_mode == EVS_MONO ) )
+    {
+        st->glr_reset = 1;
+        move16();
+    }
+
+    return;
+}
diff --git a/lib_enc/core_enc_updt.c b/lib_enc/core_enc_updt.c
deleted file mode 100644
index 95f1c67b6cf9ded0a25f18b7436bb3b776894959..0000000000000000000000000000000000000000
--- a/lib_enc/core_enc_updt.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "cnst.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * core_encode_update()
- *
- * Common updates of buffers
- *-------------------------------------------------------------------*/
-
-void core_encode_update_ivas_fx(
-    Encoder_State *st /* i/o: Encoder state structure     */
-)
-{
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    Word16 n;
-
-    /* Update Input Signal Buffers */
-    n = add( st->encoderPastSamples_enc, st->encoderLookahead_enc );
-
-    Copy( st->buf_speech_enc_pe + st->L_frame, st->buf_speech_enc_pe, n );
-    Copy( st->buf_speech_enc + st->L_frame, st->buf_speech_enc, n );
-
-    IF( !st->tcxonly )
-    {
-        n = add( st->L_frame, shr( st->L_frame, 2 ) );
-        Copy( st->buf_wspeech_enc + st->L_frame, st->buf_wspeech_enc, n );
-    }
-
-    IF( hTcxEnc != NULL )
-    {
-        test();
-        test();
-        test();
-        IF( ( st->core == ACELP_CORE ) || EQ_16( st->core, AMR_WB_CORE ) || EQ_32( st->core_brate, SID_2k40 ) || ( st->core_brate == FRAME_NO_DATA ) )
-        {
-            Word16 max_e = s_max( st->hTcxEnc->exp_buf_speech_ltp, st->exp_buf_speech_enc );
-            Scale_sig( hTcxEnc->buf_speech_ltp, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, negate( sub( max_e, st->hTcxEnc->exp_buf_speech_ltp ) ) );            // Q(31-max_e)
-            Copy_Scale_sig( st->buf_speech_enc + st->L_frame, hTcxEnc->buf_speech_ltp + st->L_frame, st->L_frame, negate( sub( max_e, st->exp_buf_speech_enc ) ) ); // Q(31-max_e)
-            st->hTcxEnc->exp_buf_speech_ltp = max_e;
-            move16();
-        }
-    }
-
-    n = add( st->encoderPastSamples_enc, st->encoderLookahead_enc );
-    Copy( st->buf_synth + st->L_frame, st->buf_synth, add( st->L_frame, L_SUBFR ) );
-    IF( hTcxEnc != NULL )
-    {
-        Copy( hTcxEnc->buf_speech_ltp + st->L_frame, hTcxEnc->buf_speech_ltp, n );
-
-        IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
-        {
-            st->hTcxEnc->kernel_switch_corr_past = 0;
-            st->hTcxEnc->kernel_type[0] = MDCT_IV;
-            st->hTcxEnc->kernel_symmetry_past = 0;
-            st->hTcxEnc->enc_ste_pre_corr_past = 0;
-
-            move16();
-            move16();
-            move16();
-            move16();
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( st->Opt_DTX_ON && LE_32( st->core_brate, SID_2k40 ) && EQ_16( st->cng_type, FD_CNG ) ) || ( st->tcxonly && ( EQ_16( st->codec_mode, MODE2 ) || ( st->element_mode > EVS_MONO ) ) ) )
-    {
-        /* reset LP memories */
-        set16_fx( st->mem_MA_fx, 0, M );
-        Copy( GEWB_Ave_fx, st->mem_AR_fx, M ); // 2.56 scaling
-    }
-    return;
-}
diff --git a/lib_enc/core_enc_updt_fx.c b/lib_enc/core_enc_updt_fx.c
index 125f0cd524c024eacb7ba95c1e8df1394853be01..dcf57738a2e71e29ffe3746110370d1aa4dbc5fa 100644
--- a/lib_enc/core_enc_updt_fx.c
+++ b/lib_enc/core_enc_updt_fx.c
@@ -48,20 +48,6 @@ void core_encode_update_fx( Encoder_State *st )
     if ( hTcxEnc != NULL )
     {
         Copy( hTcxEnc->buf_speech_ltp + st->L_frame, hTcxEnc->buf_speech_ltp, n );
-
-#ifdef IVAS_CODE
-        IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
-        {
-            st->hTcxEnc->kernel_switch_corr_past = 0.f;
-            st->hTcxEnc->kernel_type[0] = MDCT_IV;
-            st->hTcxEnc->kernel_symmetry_past = 0;
-            st->hTcxEnc->enc_ste_pre_corr_past = 0;
-            move16();
-            move16();
-            move16();
-            move16();
-        }
-#endif
     }
     /* Update previous mode */
 
@@ -171,8 +157,8 @@ void core_encode_update_cng_fx(
 
     tmp = sub( st->wspeech_enc[-1], shl( hLPDmem->mem_w0, shift ) );
     E_UTIL_deemph2( negate( shift ), wsyn, st->preemph_fac, st->L_frame, &tmp );
-    hLPDmem->mem_w0 = sub( st->wspeech_enc[st->L_frame - 1], tmp );
-    hLPDmem->mem_w0 = shr( hLPDmem->mem_w0, shift );
+    hLPDmem->mem_w0 = sub_sat( st->wspeech_enc[st->L_frame - 1], tmp );
+    hLPDmem->mem_w0 = shr_sat( hLPDmem->mem_w0, shift );
     move16();
     move16();
     /* Update LPC-related memories */
@@ -211,3 +197,77 @@ void core_encode_update_cng_fx(
 
     return;
 }
+
+/*-------------------------------------------------------------------*
+ * core_encode_update()
+ *
+ * Common updates of buffers
+ *-------------------------------------------------------------------*/
+
+void core_encode_update_ivas_fx(
+    Encoder_State *st /* i/o: Encoder state structure     */
+)
+{
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+    Word16 n;
+
+    /* Update Input Signal Buffers */
+    n = add( st->encoderPastSamples_enc, st->encoderLookahead_enc );
+
+    Copy( st->buf_speech_enc_pe + st->L_frame, st->buf_speech_enc_pe, n );
+    Copy( st->buf_speech_enc + st->L_frame, st->buf_speech_enc, n );
+
+    IF( !st->tcxonly )
+    {
+        n = add( st->L_frame, shr( st->L_frame, 2 ) );
+        Copy( st->buf_wspeech_enc + st->L_frame, st->buf_wspeech_enc, n );
+    }
+
+    IF( hTcxEnc != NULL )
+    {
+        test();
+        test();
+        test();
+        IF( ( st->core == ACELP_CORE ) || EQ_16( st->core, AMR_WB_CORE ) || EQ_32( st->core_brate, SID_2k40 ) || ( st->core_brate == FRAME_NO_DATA ) )
+        {
+            Word16 max_e = s_max( st->hTcxEnc->exp_buf_speech_ltp, st->exp_buf_speech_enc );
+            Scale_sig( hTcxEnc->buf_speech_ltp, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, negate( sub( max_e, st->hTcxEnc->exp_buf_speech_ltp ) ) );            // Q(31-max_e)
+            Copy_Scale_sig( st->buf_speech_enc + st->L_frame, hTcxEnc->buf_speech_ltp + st->L_frame, st->L_frame, negate( sub( max_e, st->exp_buf_speech_enc ) ) ); // Q(31-max_e)
+            st->hTcxEnc->exp_buf_speech_ltp = max_e;
+            move16();
+        }
+    }
+
+    n = add( st->encoderPastSamples_enc, st->encoderLookahead_enc );
+    Copy( st->buf_synth + st->L_frame, st->buf_synth, add( st->L_frame, L_SUBFR ) );
+    IF( hTcxEnc != NULL )
+    {
+        Copy( hTcxEnc->buf_speech_ltp + st->L_frame, hTcxEnc->buf_speech_ltp, n );
+
+        IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
+        {
+            st->hTcxEnc->kernel_switch_corr_past = 0;
+            st->hTcxEnc->kernel_type[0] = MDCT_IV;
+            st->hTcxEnc->kernel_symmetry_past = 0;
+            st->hTcxEnc->enc_ste_pre_corr_past = 0;
+
+            move16();
+            move16();
+            move16();
+            move16();
+        }
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( st->Opt_DTX_ON && LE_32( st->core_brate, SID_2k40 ) && EQ_16( st->cng_type, FD_CNG ) ) || ( st->tcxonly && ( EQ_16( st->codec_mode, MODE2 ) || ( st->element_mode > EVS_MONO ) ) ) )
+    {
+        /* reset LP memories */
+        set16_fx( st->mem_MA_fx, 0, M );
+        Copy( GEWB_Ave_fx, st->mem_AR_fx, M ); // 2.56 scaling
+    }
+    return;
+}
diff --git a/lib_enc/core_switching_enc.c b/lib_enc/core_switching_enc.c
deleted file mode 100644
index 1b69de26d8a6fcfbcc65d8b07999bf079d6e867d..0000000000000000000000000000000000000000
--- a/lib_enc/core_switching_enc.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-#include "ivas_prot_fx.h"
-
-void core_switching_pre_enc_ivas_fx(
-    Encoder_State *st_fx,          /* i/o: encoder state structure           */
-    const Word16 *old_inp_12k8,    /* i  : old input signal @12.8kHz      q_old_inp_12k8   */
-    const Word16 q_old_inp_12k8,   /* i  : Q old input signal @12.8kHz       */
-    const Word16 *old_inp_16k,     /* i  : old input signal @16kHz         q_old_inp_16k  */
-    const Word16 q_old_inp_16k,    /* i  : Q old input signal @16kHz         */
-    const Word16 active_cnt,       /* i  : active frame counter              */
-    const Word16 last_element_mode /* i  : last_element_mode                 */
-)
-{
-    Word16 Sample_Delay_HP, Sample_Delay_LP;
-    Word16 tmp16;
-    Word16 tmp;
-    SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
-    LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
-    HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
-    TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
-    TCX_ENC_HANDLE hTcxEnc = st_fx->hTcxEnc;
-    FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
-
-    /* Mode switching */
-    test();
-    test();
-    test();
-    IF( EQ_16( st_fx->last_codec_mode, MODE2 ) || ( ( ( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) ) && ( st_fx->element_mode > EVS_MONO ) ) ) )
-    {
-        IF( hLPDmem != NULL )
-        {
-            st_fx->mem_deemph_fx = hLPDmem->syn[M];
-            move16();
-            Copy( hLPDmem->mem_syn2, hLPDmem->mem_syn1_fx, M );
-        }
-
-        if ( NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
-        {
-            st_fx->igf = 0;
-            move16();
-        }
-
-        IF( hBWE_TD != NULL )
-        {
-            IF( st_fx->last_core != ACELP_CORE )
-            {
-                /* reset BWE memories */
-                set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-                hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
-                move32();
-            }
-
-            set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
-        }
-        test();
-        IF( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) )
-        {
-            if ( st_fx->element_mode == EVS_MONO )
-            {
-                st_fx->last_core = HQ_CORE;
-                move16();
-            }
-            IF( hHQ_core != NULL )
-            {
-                set32_fx( hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
-                set16_fx( hHQ_core->last_env_fx, 0, BANDS_MAX );
-                hHQ_core->last_max_pos_pulse = 0;
-                move16();
-
-                hHQ_core->mode_count = 0;
-                move16();
-                hHQ_core->mode_count1 = 0;
-                move16();
-
-                set16_fx( hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
-                hHQ_core->prev_frm_hfe2 = 0;
-                move16();
-                hHQ_core->prev_stab_hfe2 = 0;
-                move16();
-            }
-            test();
-            /*ALDO overlap windowed past: also used in MODE2 but for other MDCT-LB*/
-            IF( ( st_fx->element_mode == EVS_MONO ) && hTcxEnc != NULL )
-            {
-                set16_fx( hTcxEnc->old_out_fx, 0, L_FRAME32k );
-            }
-        }
-
-        test();
-        IF( ( EQ_16( st_fx->L_frame, L_FRAME16k ) ) && ( EQ_16( st_fx->last_L_frame, L_FRAME ) ) )
-        {
-            Copy( st_fx->lsp_old_fx, st_fx->lsp_old16k_fx, M );
-
-            st_fx->rate_switching_reset_16kHz = lsp_convert_poly_fx( st_fx->lsp_old16k_fx, st_fx->L_frame, 0 );
-            move16();
-        }
-
-        st_fx->use_acelp_preq = 0;
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    if ( EQ_16( st_fx->last_core, -1 ) && ( EQ_16( st_fx->core, HQ_CORE ) || EQ_16( st_fx->core, TCX_20_CORE ) || EQ_16( st_fx->core, TCX_10_CORE ) ) )
-    {
-        /* very first frame is HQ_CORE */
-        st_fx->last_core = HQ_CORE;
-        move16();
-    }
-
-    test();
-    test();
-    IF( EQ_16( st_fx->core, HQ_CORE ) && ( ( st_fx->last_core == ACELP_CORE ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) ) ) /* HQ init */
-    {
-        set32_fx( hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
-        set16_fx( hHQ_core->last_env_fx, 0, BANDS_MAX );
-        hHQ_core->last_max_pos_pulse = 0;
-        move16();
-
-        hHQ_core->mode_count = 0;
-        move16();
-        hHQ_core->mode_count1 = 0;
-        move16();
-
-        set16_fx( hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
-        hHQ_core->prev_frm_hfe2 = 0;
-        move16();
-        hHQ_core->prev_stab_hfe2 = 0;
-        move16();
-
-        IF( hTcxEnc != NULL )
-        {
-            set16_fx( hTcxEnc->old_out_fx, 0, L_FRAME32k );
-        }
-    }
-
-    /* Here we only handle cases where last_ppp and last_nelp not updated when coming from CodecB or other cores
-       within ACELP_CORE if switching from another bitarate to vbr, last_ppp and last_nelp is always updated in the previous frame */
-    test();
-    test();
-    IF( ( st_fx->core == ACELP_CORE ) && ( ( st_fx->last_core != ACELP_CORE ) || EQ_16( st_fx->last_codec_mode, MODE2 ) ) )
-    {
-        IF( hSC_VBR != NULL )
-        {
-            hSC_VBR->last_last_ppp_mode = 0;
-            move16();
-            hSC_VBR->last_ppp_mode = 0;
-            move16();
-            hSC_VBR->last_nelp_mode = 0;
-            move16();
-        }
-    }
-
-    test();
-    test();
-    test();
-    IF( ( st_fx->core == ACELP_CORE ) && ( ( st_fx->last_core != ACELP_CORE ) || EQ_16( st_fx->last_codec_mode, MODE2 ) || LE_32( st_fx->last_total_brate, PPP_NELP_2k80 ) ) )
-    {
-        st_fx->act_count = 3;
-        move16();
-        st_fx->uv_count = 0;
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( ( st_fx->core == ACELP_CORE ) || EQ_16( st_fx->core, AMR_WB_CORE ) ) && EQ_16( st_fx->last_core, HQ_CORE ) ) ||
-        ( ( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && EQ_16( last_element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( active_cnt, 1 ) ) )
-    {
-        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
-        {
-            Copy( TRWB2_Ave_fx, st_fx->lsf_old_fx, M ); /* init of LSP */
-            lsf2lsp_fx( st_fx->lsf_old_fx, st_fx->lsp_old_fx, M, INT_FS_16k );
-        }
-        ELSE
-        {
-            Copy( TRWB_Ave_fx, st_fx->lsf_old_fx, M ); /* init of LSP */
-            lsf2lsp_fx( st_fx->lsf_old_fx, st_fx->lsp_old_fx, M, INT_FS_FX );
-        }
-
-        st_fx->mem_deemph_fx = 0;
-        move16();
-        /* Reset ACELP parameters */
-        IF( hLPDmem != NULL )
-        {
-            move16();
-            hLPDmem->syn[M] = 0;
-            move16();
-            set16_fx( hLPDmem->mem_syn2, 0, M );
-            set16_fx( hLPDmem->mem_syn, 0, M );
-            set16_fx( hLPDmem->mem_syn1_fx, 0, M );
-            hLPDmem->q_mem_syn = Q15;
-            move16();
-            hLPDmem->mem_w0 = 0;
-            move16();
-            hLPDmem->tilt_code = 0;
-            move16();
-            hLPDmem->gc_threshold = 0;
-            move32();
-            /* set16_fx( st_fx->dispMem, 0, 8 ); */
-            set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
-            hLPDmem->dm_fx.prev_state = 0;
-            move16();
-            hLPDmem->dm_fx.prev_gain_code = L_deposit_l( 0 );
-        }
-        st_fx->Nb_ACELP_frames = 0;
-        move16();
-
-        set16_fx( st_fx->mem_MA_fx, 0, M );
-        Copy( GEWB_Ave_fx, st_fx->mem_AR_fx, M );
-        init_gp_clip_fx( st_fx->clip_var_fx );
-        st_fx->last_coder_type = GENERIC;
-        move16();
-
-        tmp16 = add( NB_SUBFR, 1 );
-
-        if ( EQ_16( st_fx->L_frame, L_FRAME ) )
-        {
-            tmp16 = NB_SUBFR;
-            move16();
-        }
-
-        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 );
-        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );
-
-        /* Reset old ACELP buffers */
-        test();
-        IF( ( st_fx->element_mode == EVS_MONO ) && hLPDmem != NULL )
-        {
-            set16_fx( hLPDmem->old_exc, 0, L_EXC_MEM );
-        }
-        IF( hBWE_TD != NULL )
-        {
-            set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-
-            /* reset BWE memories */
-            hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-        }
-        IF( hBWE_FD != NULL )
-        {
-            set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
-        }
-    }
-    test();
-    test();
-    test();
-    IF( ( ( st_fx->core == ACELP_CORE ) || EQ_16( st_fx->core, AMR_WB_CORE ) ) && ( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) ) )
-    {
-        /* Reset the ACELP core in case of TCX->ACELP core switching */
-        st_fx->Nb_ACELP_frames = 0;
-        move16();
-
-        IF( hLPDmem != NULL )
-        {
-            hLPDmem->mem_w0 = 0;
-            move16();
-            hLPDmem->tilt_code = 0;
-            move16();
-            hLPDmem->gc_threshold = 0;
-            move32();
-            init_gp_clip_fx( st_fx->clip_var_fx );
-            set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
-            hLPDmem->dm_fx.prev_state = 0;
-            move16();
-            hLPDmem->dm_fx.prev_gain_code = 0;
-            move32();
-        }
-
-        st_fx->last_coder_type = GENERIC;
-        move16();
-
-        tmp16 = shr( st_fx->L_frame, 6 );
-        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 );
-        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );
-
-        /* Reset old TD BWE buffers */
-        IF( hBWE_TD != NULL )
-        {
-            set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
-            hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-            move32();
-        }
-
-        /* reset BWE memories */
-        IF( hBWE_FD != NULL )
-        {
-            set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) ); /* TODO : this might not be needed */
-        }
-    }
-    test();
-    test();
-    test();
-    IF( GE_32( st_fx->input_Fs, 16000 ) && NE_16( st_fx->last_extl, WB_BWE ) && EQ_16( st_fx->extl, WB_BWE ) && hBWE_FD != NULL )
-    {
-        test();
-        IF( NE_16( st_fx->last_extl, SWB_BWE ) && NE_16( st_fx->last_extl, FB_BWE ) )
-        {
-            hBWE_FD->prev_mode = NORMAL;
-            move16();
-            hBWE_FD->modeCount = 0;
-            move16();
-        }
-
-        hBWE_FD->prev_L_swb_norm1 = 8;
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( GE_32( st_fx->input_Fs, 32000 ) && NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) ||
-        ( GE_32( st_fx->input_Fs, 48000 ) && NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) )
-    {
-        /* we are switching to SWB BWE - reset SWB BWE buffers */
-
-        IF( EQ_16( st_fx->L_frame, L_FRAME ) )
-        {
-            Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
-            Sample_Delay_LP = NS2SA( 12800, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS );
-            IF( ( st_fx->element_mode > EVS_MONO ) )
-            {
-                IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
-                {
-                    Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS - L_MEM_RECALC_TBE_NS );
-                }
-                Sample_Delay_HP = sub( Sample_Delay_HP, NS2SA( 16000, DELAY_FIR_RESAMPL_NS ) );
-            }
-            IF( GT_16( q_old_inp_12k8, hBWE_FD->prev_Q_input_lp ) )
-            {
-                Copy_Scale_sig( old_inp_12k8 + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP, sub( hBWE_FD->prev_Q_input_lp, q_old_inp_12k8 ) ); // prev_Q_input_lp
-            }
-            ELSE
-            {
-                Scale_sig( hBWE_FD->old_input_lp_fx, NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS ), sub( q_old_inp_12k8, hBWE_FD->prev_Q_input_lp ) ); // q_old_inp_12k8
-                hBWE_FD->prev_Q_input_lp = q_old_inp_12k8;
-                move16();
-                Copy( old_inp_12k8 + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP );
-            }
-        }
-        ELSE
-        {
-            Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
-            Sample_Delay_LP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS );
-            IF( GT_16( st_fx->element_mode, EVS_MONO ) )
-            {
-                IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
-                {
-                    Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS - L_MEM_RECALC_TBE_NS );
-                }
-                Sample_Delay_HP = sub( Sample_Delay_HP, NS2SA( 16000, DELAY_FIR_RESAMPL_NS ) );
-            }
-            IF( GT_16( q_old_inp_16k, hBWE_FD->prev_Q_input_lp ) )
-            {
-                Copy_Scale_sig( old_inp_16k + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP, sub( hBWE_FD->prev_Q_input_lp, q_old_inp_16k ) ); // prev_Q_input_lp
-            }
-            ELSE
-            {
-                Scale_sig( hBWE_FD->old_input_lp_fx, NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS ), sub( q_old_inp_16k, hBWE_FD->prev_Q_input_lp ) ); // q_old_inp_16k
-                hBWE_FD->prev_Q_input_lp = q_old_inp_16k;
-                move16();
-                Copy( old_inp_16k + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP );
-            }
-        }
-
-        tmp = sub( L_LOOK_16k + L_SUBFR16k, Sample_Delay_HP );
-        Copy( &hBWE_TD->old_speech_shb_fx[tmp], hBWE_FD->new_input_hp_fx, Sample_Delay_HP );
-
-        IF( NE_16( st_fx->last_extl, WB_BWE ) )
-        {
-            hBWE_FD->prev_mode = NORMAL;
-            move16();
-            hBWE_FD->modeCount = 0;
-            move16();
-        }
-        hBWE_FD->EnergyLF_fx = 0;
-        move32();
-        hBWE_FD->prev_L_swb_norm1 = 8;
-        move16(); /*8.0 in Q0 */
-        st_fx->EnergyLT_fx_exp = 30;
-        move16(); /* Set to a High Exponent so it is 1^-30 */
-    }
-    /*---------------------------------------------------------------------*
-     * band-width switching from WB -> SWB/FB
-     *---------------------------------------------------------------------*/
-    IF( st_fx->element_mode > EVS_MONO )
-    {
-        IF( st_fx->bwidth_sw_cnt == 0 )
-        {
-            test();
-            IF( GE_16( st_fx->bwidth, SWB ) && EQ_16( st_fx->last_bwidth, WB ) )
-            {
-                st_fx->bwidth_sw_cnt = add( st_fx->bwidth_sw_cnt, 1 );
-                move16();
-            }
-        }
-        ELSE
-        {
-            st_fx->bwidth_sw_cnt = add( st_fx->bwidth_sw_cnt, 1 );
-            move16();
-            IF( EQ_16( st_fx->bwidth_sw_cnt, BWS_TRAN_PERIOD ) )
-            {
-                st_fx->bwidth_sw_cnt = 0;
-                move16();
-            }
-        }
-    }
-
-    return;
-}
-
-/*---------------------------------------------------------------------*
- * core_switching_post_enc()
- *
- * Postprocessing for ACELP/HQ core switching
- *---------------------------------------------------------------------*/
-
-void core_switching_post_enc_ivas_fx(
-    Encoder_State *st,       /* i/o: encoder state structure             */
-    Word16 *old_inp_12k8_fx, /* i  : old input signal @12.8kHz   Q_new-1 */
-    Word16 *old_inp_16k_fx,  /* i  : old input signal @16kHz     Q_new-1 */
-    Word16 A_fx[],           /* i  : unquant. LP filter coefs.       Q12 */
-    Word16 Q_new )
-{
-    IF( EQ_16( st->core, HQ_CORE ) )
-    {
-        st->use_acelp_preq = 0;
-        move16();
-        test();
-        test();
-        IF( ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) && st->element_mode == EVS_MONO ) /* core switching ==> ACELP subframe encoding */
-        {
-            /* Memory scaling to keep everything in common q */
-            Scale_sig( st->hLPDmem->mem_syn, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );             /* Q_new-1 */
-            Scale_sig( st->hLPDmem->mem_syn1_fx, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );         /* Q_new-1 */
-            Scale_sig( st->hLPDmem->mem_syn2, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );            /* Q_new-1 */
-            Scale_sig( st->hLPDmem->mem_syn3, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );            /* Q_new-1 */
-            Scale_sig( st->hLPDmem->mem_syn_r, L_SYN_MEM, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );   /* Q_new-1 */
-            st->hLPDmem->mem_w0 = shl( st->hLPDmem->mem_w0, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) ); /* Q_new-1 */
-            move16();
-            st->hLPDmem->q_mem_syn = sub( Q_new, 1 );
-            move16();
-
-            acelp_core_switch_enc_ivas_fx( st, old_inp_12k8_fx + L_INP_MEM - NS2SA( INT_FS_12k8, ACELP_LOOK_NS ), old_inp_16k_fx + L_INP_MEM - NS2SA( INT_FS_16k, ACELP_LOOK_NS ), A_fx, 0, sub( Q_new, 1 ) );
-        }
-
-        st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
-        move32();
-        st->hBWE_FD->mem_deemph_old_syn_fx = 0;
-        move16();
-        st->hBWE_FD->q_mem_deemph_old_syn = 0;
-        move16();
-    }
-    ELSE
-    {
-        IF( st->hBWE_TD == NULL )
-        {
-            return;
-        }
-
-        test();
-        /* reset SWB TBE buffers */
-        IF( EQ_16( st->extl, WB_TBE ) && NE_16( st->last_extl, WB_TBE ) )
-        {
-            wb_tbe_extras_reset_fx( st->hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, st->hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );
-
-            IF( NE_16( st->last_extl, WB_BWE ) )
-            {
-                set16_fx( st->hBWE_TD->decim_state1_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
-                set16_fx( st->hBWE_TD->decim_state2_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
-            }
-
-            set16_fx( st->hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD / 4 );
-            set16_fx( st->hBWE_TD->syn_overlap_fx, 0, L_SHB_LAHEAD );
-            set32_fx( st->hBWE_TD->mem_csfilt_fx, 0, 2 );
-        }
-
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-
-        IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) ) &&
-            ( EQ_16( st->last_core, HQ_CORE ) || NE_16( st->L_frame, st->last_L_frame ) || ( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) && NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) ) )
-        {
-            set16_fx( st->hBWE_TD->state_ana_filt_shb_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
-
-            InitSWBencBufferStates_fx( st->hBWE_TD, NULL );
-            swb_tbe_reset_fx( st->hBWE_TD->mem_csfilt_fx, st->hBWE_TD->mem_genSHBexc_filt_down_shb_fx, st->hBWE_TD->state_lpc_syn_fx, st->hBWE_TD->syn_overlap_fx, st->hBWE_TD->state_syn_shbexc_fx, &( st->hBWE_TD->tbe_demph_fx ), &( st->hBWE_TD->tbe_premph_fx ), st->hBWE_TD->mem_stp_swb_fx, &( st->hBWE_TD->gain_prec_swb_fx ) );
-
-            set16_fx( st->hBWE_TD->dec_2_over_3_mem_fx, 0, L_FILT_2OVER3 );
-            set16_fx( st->hBWE_TD->dec_2_over_3_mem_lp_fx, 0, L_FILT_2OVER3_LP );
-        }
-        ELSE IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && ( ( EQ_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) ) || ( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_32( st->last_total_brate, st->total_brate ) ) || ( NE_16( st->last_bwidth, st->bwidth ) ) || ( NE_16( st->last_codec_mode, MODE1 ) ) || ( NE_16( st->rf_mode_last, st->rf_mode ) ) ) )
-        {
-            set16_fx( st->hBWE_TD->state_lpc_syn_fx, 0, LPC_SHB_ORDER );
-            set16_fx( st->hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD );
-            set16_fx( st->hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
-            set16_fx( st->hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
-            st->hBWE_TD->gain_prec_swb_fx = ONE_IN_Q14;
-            move16();
-        }
-        ELSE IF( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) )
-        {
-            TBEreset_enc_fx( st, st->bwidth );
-        }
-
-        test();
-        test();
-        test();
-        test();
-        /* Interp_3_2 CNG buffers reset */
-        IF( EQ_16( st->extl, FB_TBE ) && ( ( NE_16( st->last_extl, FB_TBE ) && NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) || NE_16( st->L_frame, st->last_L_frame ) ) )
-        {
-            set16_fx( st->hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
-            st->hBWE_TD->fb_tbe_demph_fx = 0;
-            move16();
-            fb_tbe_reset_enc_fx( st->hBWE_TD->elliptic_bpf_2_48k_mem_fx, &st->hBWE_TD->prev_fb_energy_fx, st->hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, &st->hBWE_TD->prev_fb_energy_fx_Q );
-        }
-        /* Fade towards init value for non HQ_CORE */
-        IF( st->hHQ_core != NULL )
-        {
-            st->hHQ_core->crest_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), L_shr( HQ_CREST_THRESHOLD_FX, sub( Q28, st->hHQ_core->crest_lp_q ) ) ) ); /*crest_lp_q*/
-            move32();
-            st->hHQ_core->crest_mod_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_mod_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), L_shr( HQ_CREST_MOD_THRESHOLD_FX, sub( Q29, st->hHQ_core->crest_mod_lp_q ) ) ) ); /*crest_mod_lp_q*/
-            move32();
-        }
-    }
-
-    return;
-}
diff --git a/lib_enc/core_switching_enc_fx.c b/lib_enc/core_switching_enc_fx.c
index 07468363f7f5f2e537499e8ebf549bbd6d09fef8..5290509cd32d8a7909d6c9af75ee51fabda55fdd 100644
--- a/lib_enc/core_switching_enc_fx.c
+++ b/lib_enc/core_switching_enc_fx.c
@@ -8,8 +8,9 @@
 #include "rom_com_fx.h" /* Static table prototypes                */
 #include "rom_com.h"    /* Static table prototypes                */
 //#include "prot_fx.h"             /* Function prototypes                    */
-#include "prot_fx.h"     /* Function prototypes                    */
-#include "prot_fx_enc.h" /* Function prototypes                    */
+#include "prot_fx.h"      /* Function prototypes                    */
+#include "ivas_prot_fx.h" /* Function prototypes                    */
+#include "prot_fx_enc.h"  /* Function prototypes                    */
 
 
 /*---------------------------------------------------------------------*
@@ -372,31 +373,6 @@ void core_switching_pre_enc_fx(
         st_fx->EnergyLT_fx_exp = 30;
         move16(); /* Set to a High Exponent so it is 1^-30 */
     }
-    /*---------------------------------------------------------------------*
-     * band-width switching from WB -> SWB/FB
-     *---------------------------------------------------------------------*/
-#ifdef IVAS_CODE
-    IF( GT_16( st_fx->element_mode, EVS_MONO ) )
-    {
-        IF( st_fx->bwidth_sw_cnt_fx == 0 )
-        {
-            IF( GE_16( st_fx->bwidth, SWB ) && EQ_16( st_fx->last_bwidth, WB ) )
-            {
-                st_fx->bwidth_sw_cnt_fx = add( st_fx->bwidth_sw_cnt_fx, 1 );
-            }
-        }
-        ELSE
-        {
-            st_fx->bwidth_sw_cnt_fx = add( st_fx->bwidth_sw_cnt_fx, 1 );
-
-            IF( EQ_16( st_fx->bwidth_sw_cnt_fx, BWS_TRAN_PERIOD ) )
-            {
-                st_fx->bwidth_sw_cnt_fx = 0;
-                move16();
-            }
-        }
-    }
-#endif
 
     return;
 }
@@ -430,8 +406,8 @@ void core_switching_post_enc_fx(
         test();
         IF( ( ( st_fx->last_core == ACELP_CORE ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) ) && EQ_16( st_fx->element_mode, EVS_MONO ) ) /* core switching ==> CELP subframe encoding */
         {
-            acelp_core_switch_enc_fx( st_fx, old_inp_12k8 + L_INP_MEM - NS2SA_FX2( INT_FS_FX, ACELP_LOOK_NS ),
-                                      old_inp_16k + L_INP_MEM - NS2SA_FX2( INT_FS_16k, ACELP_LOOK_NS ), A, Qshift, Q_new );
+            acelp_core_switch_enc_fx( st_fx, old_inp_12k8 + L_INP_MEM - NS2SA( INT_FS_FX, ACELP_LOOK_NS ),
+                                      old_inp_16k + L_INP_MEM - NS2SA( INT_FS_16k, ACELP_LOOK_NS ), A, Qshift, Q_new );
         }
 
         hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
@@ -482,22 +458,6 @@ void core_switching_post_enc_fx(
             set16_fx( hBWE_TD->state_ana_filt_shb_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
             set16_fx( hBWE_TD->old_speech_shb_fx, 0, L_LOOK_16k + L_SUBFR16k );
 
-#ifdef IVAS_CODE
-            set16_fx( hBWE_TD->mem_shb_res_fx, 0, MAX_LEN_MA_FILTER );
-            set16_fx( hBWE_TD->old_EnvSHBres_fx, 0, L_FRAME4k );
-            hBWE_TD->old_mean_EnvSHBres_fx = 0;
-            hBWE_TD->prev_enr_EnvSHBres_fx = 32767; /*Q15 ??? */
-            hBWE_TD->prev_shb_env_tilt_fx = 0;
-            hBWE_TD->prev_pow_exc16kWhtnd_fx = 32767; /*Q15 ??? */
-            hBWE_TD->prev_mix_factor_fx = 32767;      /*Q15 ??? */
-            hBWE_TD->prev_Env_error_fx = 0;
-            move16();
-            move16();
-            move16();
-            move16();
-            move16();
-            move16();
-#endif
             swb_tbe_reset_fx( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
                               hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ),
                               hBWE_TD->mem_stp_swb_fx, &( hBWE_TD->gain_prec_swb_fx ) );
@@ -530,14 +490,6 @@ void core_switching_post_enc_fx(
             hBWE_TD->fb_tbe_demph_fx = 0;
             fb_tbe_reset_enc_fx( hBWE_TD->elliptic_bpf_2_48k_mem_fx, &hBWE_TD->prev_fb_energy_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, &hBWE_TD->prev_fb_energy_fx_Q );
         }
-        /* Fade towards init value for non HQ_CORE */
-        IF( st_fx->hHQ_core != NULL )
-        {
-#ifdef IVAS_CODE
-            st_fx->hHQ_core->crest_lp = HQ_CREST_FAC_SM * ( st_fx->hHQ_core->crest_lp ) + ( 1.0f - HQ_CREST_FAC_SM ) * HQ_CREST_THRESHOLD;
-            st_fx->hHQ_core->crest_mod_lp = HQ_CREST_FAC_SM * ( st_fx->hHQ_core->crest_mod_lp ) + ( 1.0f - HQ_CREST_FAC_SM ) * HQ_CREST_MOD_THRESHOLD;
-#endif
-        }
     }
 
     return;
@@ -672,3 +624,557 @@ void core_switching_hq_prepare_enc_fx(
     }
     return;
 }
+
+void core_switching_pre_enc_ivas_fx(
+    Encoder_State *st_fx,          /* i/o: encoder state structure           */
+    const Word16 *old_inp_12k8,    /* i  : old input signal @12.8kHz      q_old_inp_12k8   */
+    const Word16 q_old_inp_12k8,   /* i  : Q old input signal @12.8kHz       */
+    const Word16 *old_inp_16k,     /* i  : old input signal @16kHz         q_old_inp_16k  */
+    const Word16 q_old_inp_16k,    /* i  : Q old input signal @16kHz         */
+    const Word16 active_cnt,       /* i  : active frame counter              */
+    const Word16 last_element_mode /* i  : last_element_mode                 */
+)
+{
+    Word16 Sample_Delay_HP, Sample_Delay_LP;
+    Word16 tmp16;
+    Word16 tmp;
+    SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
+    LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
+    HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
+    TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
+    TCX_ENC_HANDLE hTcxEnc = st_fx->hTcxEnc;
+    FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
+
+    /* Mode switching */
+    test();
+    test();
+    test();
+    IF( EQ_16( st_fx->last_codec_mode, MODE2 ) || ( ( ( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) ) && ( st_fx->element_mode > EVS_MONO ) ) ) )
+    {
+        IF( hLPDmem != NULL )
+        {
+            st_fx->mem_deemph_fx = hLPDmem->syn[M];
+            move16();
+            Copy( hLPDmem->mem_syn2, hLPDmem->mem_syn1_fx, M );
+        }
+
+        if ( NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
+        {
+            st_fx->igf = 0;
+            move16();
+        }
+
+        IF( hBWE_TD != NULL )
+        {
+            IF( st_fx->last_core != ACELP_CORE )
+            {
+                /* reset BWE memories */
+                set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
+                hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
+                move32();
+            }
+
+            set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
+        }
+        test();
+        IF( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) )
+        {
+            if ( st_fx->element_mode == EVS_MONO )
+            {
+                st_fx->last_core = HQ_CORE;
+                move16();
+            }
+            IF( hHQ_core != NULL )
+            {
+                set32_fx( hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
+                set16_fx( hHQ_core->last_env_fx, 0, BANDS_MAX );
+                hHQ_core->last_max_pos_pulse = 0;
+                move16();
+
+                hHQ_core->mode_count = 0;
+                move16();
+                hHQ_core->mode_count1 = 0;
+                move16();
+
+                set16_fx( hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
+                hHQ_core->prev_frm_hfe2 = 0;
+                move16();
+                hHQ_core->prev_stab_hfe2 = 0;
+                move16();
+            }
+            test();
+            /*ALDO overlap windowed past: also used in MODE2 but for other MDCT-LB*/
+            IF( ( st_fx->element_mode == EVS_MONO ) && hTcxEnc != NULL )
+            {
+                set16_fx( hTcxEnc->old_out_fx, 0, L_FRAME32k );
+            }
+        }
+
+        test();
+        IF( ( EQ_16( st_fx->L_frame, L_FRAME16k ) ) && ( EQ_16( st_fx->last_L_frame, L_FRAME ) ) )
+        {
+            Copy( st_fx->lsp_old_fx, st_fx->lsp_old16k_fx, M );
+
+            st_fx->rate_switching_reset_16kHz = lsp_convert_poly_fx( st_fx->lsp_old16k_fx, st_fx->L_frame, 0 );
+            move16();
+        }
+
+        st_fx->use_acelp_preq = 0;
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    if ( EQ_16( st_fx->last_core, -1 ) && ( EQ_16( st_fx->core, HQ_CORE ) || EQ_16( st_fx->core, TCX_20_CORE ) || EQ_16( st_fx->core, TCX_10_CORE ) ) )
+    {
+        /* very first frame is HQ_CORE */
+        st_fx->last_core = HQ_CORE;
+        move16();
+    }
+
+    test();
+    test();
+    IF( EQ_16( st_fx->core, HQ_CORE ) && ( ( st_fx->last_core == ACELP_CORE ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) ) ) /* HQ init */
+    {
+        set32_fx( hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
+        set16_fx( hHQ_core->last_env_fx, 0, BANDS_MAX );
+        hHQ_core->last_max_pos_pulse = 0;
+        move16();
+
+        hHQ_core->mode_count = 0;
+        move16();
+        hHQ_core->mode_count1 = 0;
+        move16();
+
+        set16_fx( hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
+        hHQ_core->prev_frm_hfe2 = 0;
+        move16();
+        hHQ_core->prev_stab_hfe2 = 0;
+        move16();
+
+        IF( hTcxEnc != NULL )
+        {
+            set16_fx( hTcxEnc->old_out_fx, 0, L_FRAME32k );
+        }
+    }
+
+    /* Here we only handle cases where last_ppp and last_nelp not updated when coming from CodecB or other cores
+       within ACELP_CORE if switching from another bitarate to vbr, last_ppp and last_nelp is always updated in the previous frame */
+    test();
+    test();
+    IF( ( st_fx->core == ACELP_CORE ) && ( ( st_fx->last_core != ACELP_CORE ) || EQ_16( st_fx->last_codec_mode, MODE2 ) ) )
+    {
+        IF( hSC_VBR != NULL )
+        {
+            hSC_VBR->last_last_ppp_mode = 0;
+            move16();
+            hSC_VBR->last_ppp_mode = 0;
+            move16();
+            hSC_VBR->last_nelp_mode = 0;
+            move16();
+        }
+    }
+
+    test();
+    test();
+    test();
+    IF( ( st_fx->core == ACELP_CORE ) && ( ( st_fx->last_core != ACELP_CORE ) || EQ_16( st_fx->last_codec_mode, MODE2 ) || LE_32( st_fx->last_total_brate, PPP_NELP_2k80 ) ) )
+    {
+        st_fx->act_count = 3;
+        move16();
+        st_fx->uv_count = 0;
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( ( ( st_fx->core == ACELP_CORE ) || EQ_16( st_fx->core, AMR_WB_CORE ) ) && EQ_16( st_fx->last_core, HQ_CORE ) ) ||
+        ( ( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && EQ_16( last_element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( active_cnt, 1 ) ) )
+    {
+        IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
+        {
+            Copy( TRWB2_Ave_fx, st_fx->lsf_old_fx, M ); /* init of LSP */
+            lsf2lsp_fx( st_fx->lsf_old_fx, st_fx->lsp_old_fx, M, INT_FS_16k );
+        }
+        ELSE
+        {
+            Copy( TRWB_Ave_fx, st_fx->lsf_old_fx, M ); /* init of LSP */
+            lsf2lsp_fx( st_fx->lsf_old_fx, st_fx->lsp_old_fx, M, INT_FS_FX );
+        }
+
+        st_fx->mem_deemph_fx = 0;
+        move16();
+        /* Reset ACELP parameters */
+        IF( hLPDmem != NULL )
+        {
+            move16();
+            hLPDmem->syn[M] = 0;
+            move16();
+            set16_fx( hLPDmem->mem_syn2, 0, M );
+            set16_fx( hLPDmem->mem_syn, 0, M );
+            set16_fx( hLPDmem->mem_syn1_fx, 0, M );
+            hLPDmem->q_mem_syn = Q15;
+            move16();
+            hLPDmem->mem_w0 = 0;
+            move16();
+            hLPDmem->tilt_code = 0;
+            move16();
+            hLPDmem->gc_threshold = 0;
+            move32();
+            /* set16_fx( st_fx->dispMem, 0, 8 ); */
+            set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
+            hLPDmem->dm_fx.prev_state = 0;
+            move16();
+            hLPDmem->dm_fx.prev_gain_code = L_deposit_l( 0 );
+        }
+        st_fx->Nb_ACELP_frames = 0;
+        move16();
+
+        set16_fx( st_fx->mem_MA_fx, 0, M );
+        Copy( GEWB_Ave_fx, st_fx->mem_AR_fx, M );
+        init_gp_clip_fx( st_fx->clip_var_fx );
+        st_fx->last_coder_type = GENERIC;
+        move16();
+
+        tmp16 = add( NB_SUBFR, 1 );
+
+        if ( EQ_16( st_fx->L_frame, L_FRAME ) )
+        {
+            tmp16 = NB_SUBFR;
+            move16();
+        }
+
+        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 );
+        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );
+
+        /* Reset old ACELP buffers */
+        test();
+        IF( ( st_fx->element_mode == EVS_MONO ) && hLPDmem != NULL )
+        {
+            set16_fx( hLPDmem->old_exc, 0, L_EXC_MEM );
+        }
+        IF( hBWE_TD != NULL )
+        {
+            set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
+
+            /* reset BWE memories */
+            hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
+            move32();
+        }
+        IF( hBWE_FD != NULL )
+        {
+            set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
+        }
+    }
+    test();
+    test();
+    test();
+    IF( ( ( st_fx->core == ACELP_CORE ) || EQ_16( st_fx->core, AMR_WB_CORE ) ) && ( EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) ) )
+    {
+        /* Reset the ACELP core in case of TCX->ACELP core switching */
+        st_fx->Nb_ACELP_frames = 0;
+        move16();
+
+        IF( hLPDmem != NULL )
+        {
+            hLPDmem->mem_w0 = 0;
+            move16();
+            hLPDmem->tilt_code = 0;
+            move16();
+            hLPDmem->gc_threshold = 0;
+            move32();
+            init_gp_clip_fx( st_fx->clip_var_fx );
+            set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
+            hLPDmem->dm_fx.prev_state = 0;
+            move16();
+            hLPDmem->dm_fx.prev_gain_code = 0;
+            move32();
+        }
+
+        st_fx->last_coder_type = GENERIC;
+        move16();
+
+        tmp16 = shr( st_fx->L_frame, 6 );
+        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 );
+        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );
+
+        /* Reset old TD BWE buffers */
+        IF( hBWE_TD != NULL )
+        {
+            set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
+            hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
+            move32();
+        }
+
+        /* reset BWE memories */
+        IF( hBWE_FD != NULL )
+        {
+            set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) ); /* TODO : this might not be needed */
+        }
+    }
+    test();
+    test();
+    test();
+    IF( GE_32( st_fx->input_Fs, 16000 ) && NE_16( st_fx->last_extl, WB_BWE ) && EQ_16( st_fx->extl, WB_BWE ) && hBWE_FD != NULL )
+    {
+        test();
+        IF( NE_16( st_fx->last_extl, SWB_BWE ) && NE_16( st_fx->last_extl, FB_BWE ) )
+        {
+            hBWE_FD->prev_mode = NORMAL;
+            move16();
+            hBWE_FD->modeCount = 0;
+            move16();
+        }
+
+        hBWE_FD->prev_L_swb_norm1 = 8;
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( GE_32( st_fx->input_Fs, 32000 ) && NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) ||
+        ( GE_32( st_fx->input_Fs, 48000 ) && NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) )
+    {
+        /* we are switching to SWB BWE - reset SWB BWE buffers */
+
+        IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+        {
+            Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
+            Sample_Delay_LP = NS2SA( 12800, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS );
+            IF( ( st_fx->element_mode > EVS_MONO ) )
+            {
+                IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
+                {
+                    Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS - L_MEM_RECALC_TBE_NS );
+                }
+                Sample_Delay_HP = sub( Sample_Delay_HP, NS2SA( 16000, DELAY_FIR_RESAMPL_NS ) );
+            }
+            IF( GT_16( q_old_inp_12k8, hBWE_FD->prev_Q_input_lp ) )
+            {
+                Copy_Scale_sig( old_inp_12k8 + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP, sub( hBWE_FD->prev_Q_input_lp, q_old_inp_12k8 ) ); // prev_Q_input_lp
+            }
+            ELSE
+            {
+                Scale_sig( hBWE_FD->old_input_lp_fx, NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS ), sub( q_old_inp_12k8, hBWE_FD->prev_Q_input_lp ) ); // q_old_inp_12k8
+                hBWE_FD->prev_Q_input_lp = q_old_inp_12k8;
+                move16();
+                Copy( old_inp_12k8 + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP );
+            }
+        }
+        ELSE
+        {
+            Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
+            Sample_Delay_LP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS );
+            IF( GT_16( st_fx->element_mode, EVS_MONO ) )
+            {
+                IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
+                {
+                    Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS - L_MEM_RECALC_TBE_NS );
+                }
+                Sample_Delay_HP = sub( Sample_Delay_HP, NS2SA( 16000, DELAY_FIR_RESAMPL_NS ) );
+            }
+            IF( GT_16( q_old_inp_16k, hBWE_FD->prev_Q_input_lp ) )
+            {
+                Copy_Scale_sig( old_inp_16k + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP, sub( hBWE_FD->prev_Q_input_lp, q_old_inp_16k ) ); // prev_Q_input_lp
+            }
+            ELSE
+            {
+                Scale_sig( hBWE_FD->old_input_lp_fx, NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS ), sub( q_old_inp_16k, hBWE_FD->prev_Q_input_lp ) ); // q_old_inp_16k
+                hBWE_FD->prev_Q_input_lp = q_old_inp_16k;
+                move16();
+                Copy( old_inp_16k + sub( L_INP_MEM + L_FRAME, Sample_Delay_LP ), hBWE_FD->old_input_lp_fx, Sample_Delay_LP );
+            }
+        }
+
+        tmp = sub( L_LOOK_16k + L_SUBFR16k, Sample_Delay_HP );
+        Copy( &hBWE_TD->old_speech_shb_fx[tmp], hBWE_FD->new_input_hp_fx, Sample_Delay_HP );
+        hBWE_FD->Q_new_input_hp = 0;
+        move16();
+
+        IF( NE_16( st_fx->last_extl, WB_BWE ) )
+        {
+            hBWE_FD->prev_mode = NORMAL;
+            move16();
+            hBWE_FD->modeCount = 0;
+            move16();
+        }
+        hBWE_FD->EnergyLF_fx = 0;
+        hBWE_FD->EnergyLF_exp = 0;
+        move32();
+        move16();
+        hBWE_FD->prev_L_swb_norm1 = 8;
+        move16(); /*8.0 in Q0 */
+        st_fx->EnergyLT_fx_exp = 30;
+        move16(); /* Set to a High Exponent so it is 1^-30 */
+    }
+    /*---------------------------------------------------------------------*
+     * band-width switching from WB -> SWB/FB
+     *---------------------------------------------------------------------*/
+    IF( st_fx->element_mode > EVS_MONO )
+    {
+        IF( st_fx->bwidth_sw_cnt == 0 )
+        {
+            test();
+            IF( GE_16( st_fx->bwidth, SWB ) && EQ_16( st_fx->last_bwidth, WB ) )
+            {
+                st_fx->bwidth_sw_cnt = add( st_fx->bwidth_sw_cnt, 1 );
+                move16();
+            }
+        }
+        ELSE
+        {
+            st_fx->bwidth_sw_cnt = add( st_fx->bwidth_sw_cnt, 1 );
+            move16();
+            IF( EQ_16( st_fx->bwidth_sw_cnt, BWS_TRAN_PERIOD ) )
+            {
+                st_fx->bwidth_sw_cnt = 0;
+                move16();
+            }
+        }
+    }
+
+    return;
+}
+
+/*---------------------------------------------------------------------*
+ * core_switching_post_enc()
+ *
+ * Postprocessing for ACELP/HQ core switching
+ *---------------------------------------------------------------------*/
+
+void core_switching_post_enc_ivas_fx(
+    Encoder_State *st,       /* i/o: encoder state structure             */
+    Word16 *old_inp_12k8_fx, /* i  : old input signal @12.8kHz   Q_new-1 */
+    Word16 *old_inp_16k_fx,  /* i  : old input signal @16kHz     Q_new-1 */
+    Word16 A_fx[],           /* i  : unquant. LP filter coefs.       Q12 */
+    Word16 Q_new )
+{
+    IF( EQ_16( st->core, HQ_CORE ) )
+    {
+        st->use_acelp_preq = 0;
+        move16();
+        test();
+        test();
+        IF( ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) && st->element_mode == EVS_MONO ) /* core switching ==> ACELP subframe encoding */
+        {
+            /* Memory scaling to keep everything in common q */
+            Scale_sig( st->hLPDmem->mem_syn, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );             /* Q_new-1 */
+            Scale_sig( st->hLPDmem->mem_syn1_fx, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );         /* Q_new-1 */
+            Scale_sig( st->hLPDmem->mem_syn2, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );            /* Q_new-1 */
+            Scale_sig( st->hLPDmem->mem_syn3, M, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );            /* Q_new-1 */
+            Scale_sig( st->hLPDmem->mem_syn_r, L_SYN_MEM, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) );   /* Q_new-1 */
+            st->hLPDmem->mem_w0 = shl( st->hLPDmem->mem_w0, sub( sub( Q_new, 1 ), st->hLPDmem->q_mem_syn ) ); /* Q_new-1 */
+            move16();
+            st->hLPDmem->q_mem_syn = sub( Q_new, 1 );
+            move16();
+
+            acelp_core_switch_enc_ivas_fx( st, old_inp_12k8_fx + L_INP_MEM - NS2SA( INT_FS_12k8, ACELP_LOOK_NS ), old_inp_16k_fx + L_INP_MEM - NS2SA( INT_FS_16k, ACELP_LOOK_NS ), A_fx, 0, sub( Q_new, 1 ) );
+        }
+
+        st->hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
+        move32();
+        st->hBWE_FD->mem_deemph_old_syn_fx = 0;
+        move16();
+        st->hBWE_FD->q_mem_deemph_old_syn = 0;
+        move16();
+    }
+    ELSE
+    {
+        IF( st->hBWE_TD == NULL )
+        {
+            return;
+        }
+
+        test();
+        /* reset SWB TBE buffers */
+        IF( EQ_16( st->extl, WB_TBE ) && NE_16( st->last_extl, WB_TBE ) )
+        {
+            wb_tbe_extras_reset_fx( st->hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, st->hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );
+
+            IF( NE_16( st->last_extl, WB_BWE ) )
+            {
+                set16_fx( st->hBWE_TD->decim_state1_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
+                set16_fx( st->hBWE_TD->decim_state2_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
+            }
+
+            set16_fx( st->hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD / 4 );
+            set16_fx( st->hBWE_TD->syn_overlap_fx, 0, L_SHB_LAHEAD );
+            set32_fx( st->hBWE_TD->mem_csfilt_fx, 0, 2 );
+        }
+
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+
+        IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) ) &&
+            ( EQ_16( st->last_core, HQ_CORE ) || NE_16( st->L_frame, st->last_L_frame ) || ( NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) && NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) ) )
+        {
+            set16_fx( st->hBWE_TD->state_ana_filt_shb_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
+
+            InitSWBencBufferStates_fx( st->hBWE_TD, NULL );
+            swb_tbe_reset_fx( st->hBWE_TD->mem_csfilt_fx, st->hBWE_TD->mem_genSHBexc_filt_down_shb_fx, st->hBWE_TD->state_lpc_syn_fx, st->hBWE_TD->syn_overlap_fx, st->hBWE_TD->state_syn_shbexc_fx, &( st->hBWE_TD->tbe_demph_fx ), &( st->hBWE_TD->tbe_premph_fx ), st->hBWE_TD->mem_stp_swb_fx, &( st->hBWE_TD->gain_prec_swb_fx ) );
+
+            set16_fx( st->hBWE_TD->dec_2_over_3_mem_fx, 0, L_FILT_2OVER3 );
+            set16_fx( st->hBWE_TD->dec_2_over_3_mem_lp_fx, 0, L_FILT_2OVER3_LP );
+        }
+        ELSE IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && ( ( EQ_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->last_extl, SWB_TBE ) && NE_16( st->last_extl, FB_TBE ) ) || ( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_32( st->last_total_brate, st->total_brate ) ) || ( NE_16( st->last_bwidth, st->bwidth ) ) || ( NE_16( st->last_codec_mode, MODE1 ) ) || ( NE_16( st->rf_mode_last, st->rf_mode ) ) ) )
+        {
+            set16_fx( st->hBWE_TD->state_lpc_syn_fx, 0, LPC_SHB_ORDER );
+            set16_fx( st->hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD );
+            set16_fx( st->hBWE_TD->mem_stp_swb_fx, 0, LPC_SHB_ORDER );
+            set16_fx( st->hBWE_TD->mem_zero_swb_fx, 0, LPC_SHB_ORDER );
+            st->hBWE_TD->gain_prec_swb_fx = ONE_IN_Q14;
+            move16();
+        }
+        ELSE IF( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) )
+        {
+            TBEreset_enc_fx( st, st->bwidth );
+        }
+
+        test();
+        test();
+        test();
+        test();
+        /* Interp_3_2 CNG buffers reset */
+        IF( EQ_16( st->extl, FB_TBE ) && ( ( NE_16( st->last_extl, FB_TBE ) && NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) || NE_16( st->L_frame, st->last_L_frame ) ) )
+        {
+            set16_fx( st->hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
+            st->hBWE_TD->fb_tbe_demph_fx = 0;
+            move16();
+            fb_tbe_reset_enc_fx( st->hBWE_TD->elliptic_bpf_2_48k_mem_fx, &st->hBWE_TD->prev_fb_energy_fx, st->hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, &st->hBWE_TD->prev_fb_energy_fx_Q );
+        }
+        /* Fade towards init value for non HQ_CORE */
+        IF( st->hHQ_core != NULL )
+        {
+            st->hHQ_core->crest_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), L_shr( HQ_CREST_THRESHOLD_FX, sub( Q28, st->hHQ_core->crest_lp_q ) ) ) ); /*crest_lp_q*/
+            move32();
+            st->hHQ_core->crest_mod_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_mod_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), L_shr( HQ_CREST_MOD_THRESHOLD_FX, sub( Q29, st->hHQ_core->crest_mod_lp_q ) ) ) ); /*crest_mod_lp_q*/
+            move32();
+        }
+    }
+
+    return;
+}
diff --git a/lib_enc/corr_xh.c b/lib_enc/corr_xh.c
deleted file mode 100644
index 68195a7eccbfde1ac6b60711878e1ad2fca7bf66..0000000000000000000000000000000000000000
--- a/lib_enc/corr_xh.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "cnst.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/corr_xh_fx.c b/lib_enc/corr_xh_fx.c
index 8a1c8c483903fcce7a46e09de2ab947077822b88..56b22c2069b96dd3ce2e6b283ebd2c5e7ccfb8ca 100644
--- a/lib_enc/corr_xh_fx.c
+++ b/lib_enc/corr_xh_fx.c
@@ -47,11 +47,7 @@ void corr_xh_fx(
             L_tmp = L_mac( 1L, x[i], h[0] ); /* 1 -> to avoid null dn[] Qx+15*/
             FOR( j = i; j < L_SUBFR - 1; j++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow ); /*Qx+15*/
-#else
-                L_tmp = L_mac( L_tmp, x[j + 1], h[j + 1 - i] );
-#endif
             }
 
             y32[i] = L_tmp; /*Qx+15*/
@@ -61,13 +57,8 @@ void corr_xh_fx(
         }
         /* tot += 3*max / 8 */
         L_maxloc = L_shr( L_maxloc, 2 );
-#ifdef BASOP_NOGLOB
         L_tot = L_add_o( L_tot, L_maxloc, &Overflow );             /* +max/4 */
         L_tot = L_add_o( L_tot, L_shr( L_maxloc, 1 ), &Overflow ); /* +max/8 */
-#else
-        L_tot = L_add( L_tot, L_maxloc );             /* +max/4 */
-        L_tot = L_add( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#endif
     }
 
     /* Find the number of right shifts to do on y32[] so that    */
@@ -107,11 +98,7 @@ void corr_hh_ivas_fx(
             L_tmp = L_mac( 1L, shr( h[i], 3 ), shr( h[0], 3 ) ); /* 1 -> to avoid null dn[] */ // 2*(15 - norm_s(h[0]) -3) - 1
             FOR( j = i; j < L_subfr - 1; j++ )
             {
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac_o( L_tmp, shr( h[j + 1], 3 ), shr( h[j + 1 - i], 3 ), &Overflow ); // 2*(15 - norm_s(h[0]) -3) - 1
-#else
-                L_tmp = L_mac( L_tmp, x[j + 1], h[j + 1 - i] );
-#endif
             }
 
             y32[i] = L_tmp; // 2*(15 - norm_s(h[0]) -3) - 1
@@ -121,13 +108,8 @@ void corr_hh_ivas_fx(
         }
         /* tot += 3*max / 8 */
         L_maxloc = L_shr( L_maxloc, 2 );
-#ifdef BASOP_NOGLOB
         L_tot = L_add_o( L_tot, L_maxloc, &Overflow );             /* +max/4 */
         L_tot = L_add_o( L_tot, L_shr( L_maxloc, 1 ), &Overflow ); /* +max/8 */
-#else
-        L_tot = L_add( L_tot, L_maxloc );             /* +max/4 */
-        L_tot = L_add( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#endif
     }
 
     /* Find the number of right shifts to do on y32[] so that    */
@@ -151,7 +133,7 @@ void corr_xh_ivas_fx(
     const Word16 Qx,
     Word16 dn[], /* o  : correlation between x[] and h[]                 Qdn*/
     Word16 *Qdn,
-    const Word16 h[],    /* i  : impulse response (of weighted synthesis filter) (Q15 - norm_s(h[0]))*/
+    const Word16 h[],    /* i  : impulse response (of weighted synthesis filter) (Q14 - norm_s(h[0]))*/
     const Word16 L_subfr /* i  : length of the subframe                          Q0*/
 )
 {
@@ -170,30 +152,21 @@ void corr_xh_ivas_fx(
         L_maxloc = L_deposit_l( 0 );
         FOR( i = k; i < L_subfr; i += STEP )
         {
-            L_tmp = L_mac( 0, x[i], h[0] ); // Qx+(15 - norm_s(h[0]))
+            L_tmp = L_mac( 0, x[i], h[0] ); // Qx+(14 - norm_s(h[0])) + 1
             FOR( j = i; j < L_subfr - 1; j++ )
             {
-#ifdef BASOP_NOGLOB
-                L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow ); // Qx+(15 - norm_s(h[0]))
-#else
-                L_tmp = L_mac( L_tmp, x[j + 1], h[j + 1 - i] );
-#endif
+                L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow ); // Qx+(14 - norm_s(h[0])) + 1
             }
 
-            y32[i] = L_tmp; // Qx+(15 - norm_s(h[0]))
+            y32[i] = L_tmp; // Qx+(14 - norm_s(h[0])) + 1
             move32();
             L_tmp = L_abs( L_tmp );
-            L_maxloc = L_max( L_tmp, L_maxloc ); // Qx+(15 - norm_s(h[0]))
+            L_maxloc = L_max( L_tmp, L_maxloc ); // Qx+(14 - norm_s(h[0])) +1
         }
         /* tot += 3*max / 8 */
         L_maxloc = L_shr( L_maxloc, 2 );
-#ifdef BASOP_NOGLOB
         L_tot = L_add_o( L_tot, L_maxloc, &Overflow );             /* +max/4 */
         L_tot = L_add_o( L_tot, L_shr( L_maxloc, 1 ), &Overflow ); /* +max/8 */
-#else
-        L_tot = L_add( L_tot, L_maxloc );             /* +max/4 */
-        L_tot = L_add( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#endif
     }
 
     /* Find the number of right shifts to do on y32[] so that    */
@@ -203,11 +176,11 @@ void corr_xh_ivas_fx(
 
     FOR( i = 0; i < L_subfr; i++ )
     {
-        dn[i] = round_fx( L_shl( y32[i], j ) ); // Qx+(15 - norm_s(h[0])) +j - 16
+        dn[i] = round_fx( L_shl( y32[i], j ) ); // Qx+(14 - norm_s(h[0])) + 1 +j - 16
         move16();
     }
 
-    *Qdn = sub( add( add( Qx, sub( 15, norm_s( h[0] ) ) ), j ), 16 );
+    *Qdn = sub( add( add( Qx, add( sub( 14, norm_s( h[0] ) ), 1 ) ), j ), 16 );
     move16();
     return;
 }
diff --git a/lib_enc/decision_matrix_enc.c b/lib_enc/decision_matrix_enc.c
deleted file mode 100644
index 34d9fd39d4606f13573a7956c1a6b9ae26a016f5..0000000000000000000000000000000000000000
--- a/lib_enc/decision_matrix_enc.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "prot_fx_enc.h"
-#include "stat_enc.h"
-#include "stat_dec.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/decision_matrix_enc_fx.c b/lib_enc/decision_matrix_enc_fx.c
index 2ebb7289a2196a79839f2a2021cec8d13b32f608..bc5feeb6be1d1e6855a7758070709130ae0d6f7b 100644
--- a/lib_enc/decision_matrix_enc_fx.c
+++ b/lib_enc/decision_matrix_enc_fx.c
@@ -386,6 +386,19 @@ void decision_matrix_enc_fx(
         move16();
     }
 
+    /*-----------------------------------------------------------------*
+     * set inactive coder_type flag in ACELP core
+     *-----------------------------------------------------------------*/
+
+    st_fx->inactive_coder_type_flag = 0; /* AVQ by default */
+    move16();
+
+    if ( LE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) )
+    {
+        st_fx->inactive_coder_type_flag = 1; /* GSC */
+        move16();
+    }
+
     return;
 }
 
@@ -436,14 +449,14 @@ Word16 signalling_mode1_tcx20_enc_fx(
         num_bits = add( num_bits, nBits );
         IF( push != 0 )
         {
-            push_indice_fx( hBstr, IND_ACELP_SIGNALLING, sub( idx, start_idx ), nBits );
+            push_indice( hBstr, IND_ACELP_SIGNALLING, sub( idx, start_idx ), nBits );
         }
 
         /* HQ/TCX core switching flag */
         num_bits = add( num_bits, 1 );
         IF( push != 0 )
         {
-            push_indice_fx( hBstr, IND_MDCT_CORE, 1, 1 );
+            push_indice( hBstr, IND_MDCT_CORE, 1, 1 );
         }
     }
     ELSE
@@ -454,7 +467,7 @@ Word16 signalling_mode1_tcx20_enc_fx(
             num_bits = add( num_bits, 1 );
             IF( push != 0 )
             {
-                push_indice_fx( hBstr, IND_CORE, 1, 1 );
+                push_indice( hBstr, IND_CORE, 1, 1 );
             }
         }
 
@@ -462,7 +475,7 @@ Word16 signalling_mode1_tcx20_enc_fx(
         num_bits = add( num_bits, 1 );
         IF( push != 0 )
         {
-            push_indice_fx( hBstr, IND_MDCT_CORE, 1, 1 );
+            push_indice( hBstr, IND_MDCT_CORE, 1, 1 );
         }
 
         num_bits = add( num_bits, 2 );
@@ -471,19 +484,19 @@ Word16 signalling_mode1_tcx20_enc_fx(
             /* write band-width (needed for different I/O sampling rate support) */
             IF( EQ_16( st->bwidth, NB ) )
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 0, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 0, 2 );
             }
             ELSE IF( EQ_16( st->bwidth, WB ) )
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 1, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 1, 2 );
             }
             ELSE IF( EQ_16( st->bwidth, SWB ) )
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 2, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 2, 2 );
             }
             ELSE /* st->bwidth == FB */
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 3, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 3, 2 );
             }
         }
     }
@@ -514,28 +527,28 @@ void signalling_enc_fx(
         assert( !st_fx->tcxonly );
         assert( st_fx->core == HQ_CORE );
 
-        push_next_indice_fx( hBstr, 1, 1 ); /* TCX */
-        push_next_indice_fx( hBstr, 1, 1 ); /* HQ_CORE */
+        push_next_indice( hBstr, 1, 1 ); /* TCX */
+        push_next_indice( hBstr, 1, 1 ); /* HQ_CORE */
 
         /* write ACELP->HQ core switching flag */
         test();
         IF( ( st_fx->last_core == ACELP_CORE ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) )
         {
-            push_indice_fx( hBstr, IND_HQ_SWITCHING_FLG, 1, 1 );
+            push_indice( hBstr, IND_HQ_SWITCHING_FLG, 1, 1 );
 
             /* write ACELP L_frame info */
             IF( EQ_16( st_fx->last_L_frame, L_FRAME ) )
             {
-                push_indice_fx( hBstr, IND_LAST_L_FRAME, 0, 1 );
+                push_indice( hBstr, IND_LAST_L_FRAME, 0, 1 );
             }
             ELSE
             {
-                push_indice_fx( hBstr, IND_LAST_L_FRAME, 1, 1 );
+                push_indice( hBstr, IND_LAST_L_FRAME, 1, 1 );
             }
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_HQ_SWITCHING_FLG, 0, 1 );
+            push_indice( hBstr, IND_HQ_SWITCHING_FLG, 0, 1 );
         }
 
         return;
@@ -561,7 +574,7 @@ void signalling_enc_fx(
         IF( EQ_16( ppp_mode, 1 ) || EQ_16( nelp_mode, 1 ) )
         {
             /* 1 bit to distinguish between 2.8kbps PPP/NELP frame and SID frame */
-            push_indice_fx( hBstr, IND_CORE, 0, 1 );
+            push_indice( hBstr, IND_CORE, 0, 1 );
             /* SC-VBR: 0 - PPP_NB, 1 - PPP_WB, 2 - NELP_NB, 3 - NELP_WB */
             test();
             test();
@@ -573,19 +586,19 @@ void signalling_enc_fx(
             test();
             IF( EQ_16( st_fx->coder_type, VOICED ) && EQ_16( st_fx->bwidth, NB ) && EQ_16( ppp_mode, 1 ) )
             {
-                push_indice_fx( hBstr, IND_PPP_NELP_MODE, 0, 2 );
+                push_indice( hBstr, IND_PPP_NELP_MODE, 0, 2 );
             }
             ELSE IF( EQ_16( st_fx->coder_type, VOICED ) && NE_16( st_fx->bwidth, NB ) && EQ_16( ppp_mode, 1 ) )
             {
-                push_indice_fx( hBstr, IND_PPP_NELP_MODE, 1, 2 );
+                push_indice( hBstr, IND_PPP_NELP_MODE, 1, 2 );
             }
             ELSE IF( EQ_16( st_fx->coder_type, UNVOICED ) && EQ_16( st_fx->bwidth, NB ) && EQ_16( nelp_mode, 1 ) )
             {
-                push_indice_fx( hBstr, IND_PPP_NELP_MODE, 2, 2 );
+                push_indice( hBstr, IND_PPP_NELP_MODE, 2, 2 );
             }
             ELSE IF( EQ_16( st_fx->coder_type, UNVOICED ) && NE_16( st_fx->bwidth, NB ) && EQ_16( nelp_mode, 1 ) )
             {
-                push_indice_fx( hBstr, IND_PPP_NELP_MODE, 3, 2 );
+                push_indice( hBstr, IND_PPP_NELP_MODE, 3, 2 );
             }
         }
         ELSE IF( NE_32( st_fx->core_brate, SID_2k40 ) && ( st_fx->core_brate != FRAME_NO_DATA ) )
@@ -593,7 +606,7 @@ void signalling_enc_fx(
             /* write the ACELP/HQ core selection bit */
             IF( GE_32( st_fx->total_brate, ACELP_24k40 ) )
             {
-                push_indice_fx( hBstr, IND_CORE, 0, 1 );
+                push_indice( hBstr, IND_CORE, 0, 1 );
             }
 
             /* find the section in the ACELP signalling table corresponding to bitrate */
@@ -639,7 +652,7 @@ void signalling_enc_fx(
                 idx++;
             }
 
-            push_indice_fx( hBstr, IND_ACELP_SIGNALLING, idx - start_idx, nBits );
+            push_indice( hBstr, IND_ACELP_SIGNALLING, idx - start_idx, nBits );
         }
 
         /* write extension layer flag to distinguish between TBE (0) and BWE (1) */
@@ -651,11 +664,11 @@ void signalling_enc_fx(
             test();
             IF( EQ_16( st_fx->extl, WB_TBE ) || EQ_16( st_fx->extl, SWB_TBE ) || EQ_16( st_fx->extl, FB_TBE ) )
             {
-                push_indice_fx( hBstr, IND_BWE_FLAG, 0, 1 );
+                push_indice( hBstr, IND_BWE_FLAG, 0, 1 );
             }
             ELSE IF( EQ_16( st_fx->extl, WB_BWE ) || EQ_16( st_fx->extl, SWB_BWE ) || EQ_16( st_fx->extl, FB_BWE ) )
             {
-                push_indice_fx( hBstr, IND_BWE_FLAG, 1, 1 );
+                push_indice( hBstr, IND_BWE_FLAG, 1, 1 );
             }
         }
     }
@@ -665,24 +678,24 @@ void signalling_enc_fx(
         test();
         IF( ( st_fx->last_core == ACELP_CORE ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) )
         {
-            push_indice_fx( hBstr, IND_HQ_SWITCHING_FLG, 1, 1 );
+            push_indice( hBstr, IND_HQ_SWITCHING_FLG, 1, 1 );
             /* write ACELP L_frame info */
             IF( EQ_16( st_fx->last_L_frame, L_FRAME ) )
             {
-                push_indice_fx( hBstr, IND_LAST_L_FRAME, 0, 1 );
+                push_indice( hBstr, IND_LAST_L_FRAME, 0, 1 );
             }
             ELSE
             {
-                push_indice_fx( hBstr, IND_LAST_L_FRAME, 1, 1 );
+                push_indice( hBstr, IND_LAST_L_FRAME, 1, 1 );
             }
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_HQ_SWITCHING_FLG, 0, 1 );
+            push_indice( hBstr, IND_HQ_SWITCHING_FLG, 0, 1 );
         }
 
         /* HQ/TCX core switching flag */
-        push_indice_fx( hBstr, IND_MDCT_CORE, 0, 1 );
+        push_indice( hBstr, IND_MDCT_CORE, 0, 1 );
 
         /* Use ACELP signaling for LR MDCT */
         IF( LE_32( st_fx->total_brate, ACELP_16k40 ) )
@@ -706,7 +719,7 @@ void signalling_enc_fx(
                 idx++;
             }
 
-            push_indice_fx( hBstr, IND_ACELP_SIGNALLING, idx - start_idx, nBits );
+            push_indice( hBstr, IND_ACELP_SIGNALLING, idx - start_idx, nBits );
         }
         ELSE
         {
@@ -714,25 +727,25 @@ void signalling_enc_fx(
             IF( LE_32( st_fx->core_brate, ACELP_64k ) )
             {
                 /* write ACELP/HQ core indication flag */
-                push_indice_fx( hBstr, IND_CORE, 1, 1 );
+                push_indice( hBstr, IND_CORE, 1, 1 );
             }
 
             /* write band-width (needed for different I/O sampling rate support) */
             IF( EQ_16( st_fx->bwidth, NB ) )
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 0, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 0, 2 );
             }
             ELSE IF( EQ_16( st_fx->bwidth, WB ) )
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 1, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 1, 2 );
             }
             ELSE IF( EQ_16( st_fx->bwidth, SWB ) )
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 2, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 2, 2 );
             }
             ELSE /* st_fx->bwidth == FB */
             {
-                push_indice_fx( hBstr, IND_HQ_BWIDTH, 3, 2 );
+                push_indice( hBstr, IND_HQ_BWIDTH, 3, 2 );
             }
         }
     }
diff --git a/lib_enc/detect_transient.c b/lib_enc/detect_transient.c
deleted file mode 100644
index 4922b9e4cac63a8b7e0bad323eeb65ac2b6706ba..0000000000000000000000000000000000000000
--- a/lib_enc/detect_transient.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/detect_transient_fx.c b/lib_enc/detect_transient_fx.c
index c4dbc6fe71357024ffcb49b4659f0b10cee8c14c..51f1cb47692fb74518524ee8f876adfb4082a58e 100644
--- a/lib_enc/detect_transient_fx.c
+++ b/lib_enc/detect_transient_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -69,30 +69,15 @@ static void hp_filter_fx(
 
 
     /*y[0] = 0.4931f * *oldy + 0.7466f*(x[0] - *oldx); */
-#ifdef BASOP_NOGLOB
     L_tmp = L_mult( sub_o( x[0], *oldx, &Overflow ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */
-#else                                                                            /* BASOP_NOGLOB */
-    L_tmp = L_mult( sub( x[0], *oldx ), 24465 );                           /*Q_new+16 */
-#endif                                                                           /* BASOP_NOGLOB */
-#ifdef BASOP_NOGLOB
-    L_tmp = L_mac_sat( L_tmp, *oldy, 16158 /*0.4931f in Q15*/ ); /*Q_new+16 */
-    y[0] = round_fx_sat( L_tmp );                                /*Q_new */
-#else
-    L_tmp = L_mac( L_tmp, *oldy, 16158 );                                  /*Q_new+16 */
-    y[0] = round_fx( L_tmp );                                              /*Q_new */
-#endif
+    L_tmp = L_mac_sat( L_tmp, *oldy, 16158 /*0.4931f in Q15*/ );                 /*Q_new+16 */
+    y[0] = round_fx_sat( L_tmp );                                                /*Q_new */
     FOR( i = 1; i < L; i++ )
     {
         /*y[i] = 0.4931f*y[i-1] + 0.7466f*(x[i] - x[i-1]); */
-#ifdef BASOP_NOGLOB
         L_tmp = L_mult( sub_o( x[i], x[i - 1], &Overflow ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */
         L_tmp = L_mac_o( L_tmp, y[i - 1], 16158 /*0.4931f in Q15*/, &Overflow );        /*Q_new+16 */
         y[i] = round_fx_o( L_tmp, &Overflow );                                          /*Q_new */
-#else                                                                                   /* BASOP_NOGLOB */
-        L_tmp = L_mult( sub( x[i], x[i - 1] ), 24465 );                    /*Q_new+16 */
-        L_tmp = L_mac( L_tmp, y[i - 1], 16158 );                           /*Q_new+16 */
-        y[i] = round_fx( L_tmp );                                          /*Q_new */
-#endif                                                                                  /* BASOP_NOGLOB */
     }
 
     *oldx = x[L - 1];
@@ -166,11 +151,7 @@ Word16 detect_transient_fx(
         FOR( i = 0; i < L / 4; i++ )
         {
             /*EnergyLT += out_filt[i] * out_filt[i]; */
-#ifdef BASOP_NOGLOB
             EnergyLT = L_mac0_o( EnergyLT, out_filt_fx[i], out_filt_fx[i], &Overflow ); /*2Q_new */
-#else
-            EnergyLT = L_mac0( EnergyLT, out_filt_fx[i], out_filt_fx[i] ); /*2Q_new */
-#endif
         }
     }
     ELSE
@@ -189,27 +170,14 @@ Word16 detect_transient_fx(
             FOR( i = 0; i < L / 4; i++ )
             {
                 temp16 = extract_l( L_shr( out_filt_fx[i + blk * ( L / 4 )], 12 ) );
-#ifdef BASOP_NOGLOB
                 Energy_fx = L_add_o( Energy_fx, L_mult0( temp16, temp16 ), &Overflow );
-#else
-                Energy_fx = L_add( Energy_fx, L_mult0( temp16, temp16 ) );
-#endif
-                temp16 = shr( in_fx[i + blk * ( L / 4 )], Q_new ); /*Q0*/
-#ifdef BASOP_NOGLOB
+                temp16 = shr( in_fx[i + blk * ( L / 4 )], Q_new );                                              /*Q0*/
                 Energy_in_fx[blk + 1] = L_add_o( Energy_in_fx[blk + 1], L_mult0( temp16, temp16 ), &Overflow ); /*Q0*/
-#else
-                Energy_in_fx[blk + 1] = L_add( Energy_in_fx[blk + 1], L_mult0( temp16, temp16 ) );
-#endif
                 move32();
             }
 
-#ifdef BASOP_NOGLOB
             E_in_fx = L_add_o( E_in_fx, Energy_in_fx[blk + 1], &Overflow ); /*Q0*/
             E_out_fx = L_add_o( E_out_fx, Energy_fx, &Overflow );           /*Q0*/
-#else
-            E_in_fx = L_add( E_in_fx, Energy_in_fx[blk + 1] );
-            E_out_fx = L_add( E_out_fx, Energy_fx );
-#endif
 
             Thres_fx = 2185; /*1 /15	 Q15*/
             move16();
@@ -233,29 +201,17 @@ Word16 detect_transient_fx(
             FOR( i = 0; i < L / 8; i++ )
             {
                 /*Energy += out_filt_fx[i + blk*(L/4)] * out_filt_fx[i + blk*(L/4)]; */
-#ifdef BASOP_NOGLOB
                 L_tmp = L_mac0_o( L_tmp, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow ); /*2Q_new */
-#else
-                L_tmp = L_mac0( L_tmp, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] );   /*2Q_new */
-#endif
             }
             L_tmp2 = L_deposit_l( 0 );
             FOR( ; i < L / 4; i++ )
             {
                 /*Energy += out_filt_fx[i + blk*(L/4)] * out_filt_fx[i + blk*(L/4)]; */
-#ifdef BASOP_NOGLOB
                 L_tmp2 = L_mac0_o( L_tmp2, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow ); /*2Q_new */
-#else
-                L_tmp2 = L_mac0( L_tmp2, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] ); /*2Q_new */
-#endif
             }
             Overflow = 0;
             move16();
-#ifdef BASOP_NOGLOB                                       /* Critical Overflow */
             Energy = L_add_o( L_tmp, L_tmp2, &Overflow ); /*2Q_new */
-#else
-            Energy = L_add( L_tmp, L_tmp2 );
-#endif
             shift = 0;
             if ( Overflow != 0 )
             {
@@ -265,11 +221,7 @@ Word16 detect_transient_fx(
             Overflow = 0;
             move16();
 
-#ifdef BASOP_NOGLOB                                                                       /* shift is >= 0, not overflow possible for shr */
             Energy = L_add_o( L_shr( L_tmp, shift ), L_shr( L_tmp2, shift ), &Overflow ); /*2Q_new - shift*/
-#else
-            Energy = L_add( L_shr( L_tmp, shift ), L_shr( L_tmp2, shift ) );
-#endif
             test();
             IF( EQ_16( st_fx->extl, SWB_BWE ) || EQ_16( st_fx->extl, FB_BWE ) )
             {
@@ -310,11 +262,7 @@ Word16 detect_transient_fx(
             }
             /*EnergyLT = 0.75f*EnergyLT + 0.25f*Energy;				 */
             /*0.75f*EnergyLT in Q0                         //0.25f*Energy in Q0			 */
-#ifdef BASOP_NOGLOB
             EnergyLT = L_add_o( Mult_32_16( EnergyLT, 24576 /*0.75f in Q15*/ ), Mult_32_16( Energy, shl( 8192 /*0.25 in Q15*/, shift ) ), &Overflow ); /*2Q_new */
-#else                                                                                                                                                  /* BASOP_NOGLOB */
-            EnergyLT = L_add( Mult_32_16( EnergyLT, 24576 ), Mult_32_16( Energy, shl( 8192, shift ) ) ); /*2Q_new */
-#endif
         }
     }
     st_fx->EnergyLT_fx = EnergyLT;
@@ -342,11 +290,7 @@ Word16 detect_transient_fx(
         {
             /*blk++;	 */
             blk = add( blk, 1 );
-#ifdef BASOP_NOGLOB
             E_low_fx = L_add_sat( E_low_fx, Energy_in_fx[i] ); /*Q0*/
-#else
-            E_low_fx = L_add( E_low_fx, Energy_in_fx[i] );
-#endif
         }
 
         exp = norm_s( blk );
@@ -362,11 +306,7 @@ Word16 detect_transient_fx(
         {
             /*blk++; */
             blk = add( blk, 1 );
-#ifdef BASOP_NOGLOB
             E_high_fx = L_add_sat( E_high_fx, Energy_in_fx[i] ); /*Q0*/
-#else
-            E_high_fx = L_add( E_high_fx, Energy_in_fx[i] );
-#endif
         }
 
         exp = norm_s( blk );
diff --git a/lib_enc/diffcod.c b/lib_enc/diffcod.c
deleted file mode 100644
index 3c07227e236a7fc455636c9c30dba4bdae0b83d8..0000000000000000000000000000000000000000
--- a/lib_enc/diffcod.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*--------------------------------------------------------------------------*/
-/*  Function  diffcod()                                                     */
-/*                                                                          */
-/*  Differential coding for indices of quantized norms                      */
-/*--------------------------------------------------------------------------*/
-
-void diffcod(
-    const int16_t N, /* i  : number of sub-vectors       */
-    int16_t *y,      /* i/o: indices of quantized norms  */
-    int16_t *difidx  /* o  : differential code           */
-)
-{
-    int16_t i, k, r;
-
-    for ( i = N - 1; i > 0; i-- )
-    {
-        r = i - 1;
-        k = y[i] - y[r];
-        if ( k < ( -15 ) )
-        {
-            y[r] = y[i] + 15;
-        }
-    }
-
-    for ( i = 1; i < N; i++ )
-    {
-        r = i - 1;
-        k = y[i] - y[r];
-        if ( k > 16 )
-        {
-            k = 16;
-            y[i] = y[r] + 16;
-        }
-        difidx[r] = k + 15;
-    }
-
-    return;
-}
-
-
-/*--------------------------------------------------------------------------
- * diffcod_lrmdct()
- *
- * Differential coding for indices of quantized norms
- *--------------------------------------------------------------------------*/
-
-void diffcod_lrmdct(
-    const int16_t N,           /* i  : number of sub-vectors       */
-    const int16_t be_ref,      /* i  : band energy reference       */
-    int16_t *y,                /* i/o: indices of quantized norms  */
-    int16_t *difidx,           /* o  : differential code           */
-    const int16_t is_transient /* i  : transient flag              */
-)
-{
-    int16_t i, m, r;
-    int16_t k;
-    int16_t thr_l, thr_h;
-
-    if ( is_transient )
-    {
-        thr_l = -15;
-        thr_h = 16;
-    }
-    else
-    {
-        thr_l = -32;
-        thr_h = 31;
-    }
-
-    difidx[0] = y[0] - be_ref;
-    if ( difidx[0] > thr_h )
-    {
-        difidx[0] = thr_h;
-        y[0] = be_ref + thr_h;
-    }
-
-    if ( difidx[0] < thr_l )
-    {
-        difidx[0] = thr_l;
-        y[0] = be_ref + thr_l;
-    }
-
-    m = N - 1;
-    for ( i = m; i > 0; i-- )
-    {
-        r = i - 1;
-        k = y[i] - y[r];
-        if ( k < thr_l )
-        {
-            y[r] = y[i] - thr_l;
-        }
-    }
-
-    for ( i = 1; i < N; i++ )
-    {
-        r = i - 1;
-        k = y[i] - y[r];
-        if ( k > thr_h )
-        {
-            k = thr_h;
-            y[i] = y[r] + thr_h;
-        }
-        difidx[i] = k;
-    }
-
-    return;
-}
diff --git a/lib_enc/dtx.c b/lib_enc/dtx.c
deleted file mode 100644
index fd519a119104aa9247c536bd421877d8753ce465..0000000000000000000000000000000000000000
--- a/lib_enc/dtx.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/dtx_fx.c b/lib_enc/dtx_fx.c
index a8978c49717a631fe207a39ac9cbf7eab95126b6..6d8a297958fd614b8e44672ef8f64317dfb8ee45 100644
--- a/lib_enc/dtx_fx.c
+++ b/lib_enc/dtx_fx.c
@@ -10,7 +10,6 @@
 #include <assert.h>
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
-#include "prot.h"
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -30,12 +29,9 @@
 
 #define CNG_TYPE_HO 20 /* hangover for switching between CNG types */
 
-/* _DIFF_FLOAT_FIX_ : lp_noise_fx threshold is different between float (15) and fix (5*256) */
-#define LP_NOISE_LV 5 /* LP_NOISE level */
-
 
 #define MAX_BRATE_DTX_EVS  ACELP_24k40 /* maximum bitrate to which the default DTX is applied in EVS; otherwise DTX is applied only in silence */
-#define MAX_BRATE_DTX_IVAS IVAS_64k    /* maximum bitrate to which the default DTX is applied in IVAS; otherwise DTX is applied only in silence */
+#define MAX_BRATE_DTX_IVAS IVAS_80k    /* maximum bitrate to which the default DTX is applied in IVAS; otherwise DTX is applied only in silence */
 
 /*-------------------------------------------------------------------*
  * Local function prototypes
@@ -64,11 +60,12 @@ static void update_SID_cnt_fx( DTX_ENC_HANDLE hDtxEnc, const Word32 core_brate,
 /* _ None                                                                           */
 /*==================================================================================*/
 void dtx_ivas_fx(
-    Encoder_State *st_fx,          /* i/o: encoder state structure                  */
-    const Word32 ivas_total_brate, /* i  : IVAS total bitrate                       Q0*/
-    const Word16 vad,              /* i  : vad flag for DTX                         Q0*/
-    const Word16 speech[],         /* i  : Pointer to the speech frame              Q_speech*/
-    Word16 Q_speech                /* i  : Q factor for speech                      */
+    Encoder_State *st_fx,               /* i/o: encoder state structure                  */
+    const Word32 last_ivas_total_brate, /* i  : last IVAS total bitrate                  Q0*/
+    const Word32 ivas_total_brate,      /* i  : IVAS total bitrate                       Q0*/
+    const Word16 vad,                   /* i  : vad flag for DTX                         Q0*/
+    const Word16 speech[],              /* i  : Pointer to the speech frame              Q_speech*/
+    Word16 Q_speech                     /* i  : Q factor for speech                      */
 )
 {
     Word16 alpha, i, j, Q_speech2;
@@ -81,31 +78,34 @@ void dtx_ivas_fx(
     Flag Overflow = 0;
     move32();
 #endif
+    Word32 total_brate_ref;
+
+    total_brate_ref = st_fx->total_brate;
+    move32();
 
     IF( st_fx->dtx_sce_sba != 0 )
     {
         last_br_cng_flag = 1;
         last_br_flag = 1;
-        br_dtx_flag = 1;
-        move16();
         move16();
         move16();
     }
     ELSE
     {
-        /* _DIFF_FLOAT_FIX_ : lp_noise_fx threshold is different between float (15) and fix (5*256) */
         test();
         test();
         test();
-        last_br_cng_flag = LE_32( st_fx->last_total_brate_cng, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, LP_NOISE_LV * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate_cng, ACELP_32k ) );
+        last_br_cng_flag = LE_32( st_fx->last_total_brate_cng, MAX_BRATE_DTX_EVS ) || LT_16( st_fx->lp_noise_fx, DTX_THR * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate_cng, MAX_BRATE_DTX_IVAS ) );
 
         test();
         test();
         test();
-        last_br_flag = LE_32( st_fx->last_total_brate, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, LP_NOISE_LV * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate, ACELP_32k ) );
-        br_dtx_flag = 0;
-        move16();
+
+        last_br_flag = ( st_fx->element_mode == EVS_MONO && LE_32( st_fx->last_total_brate, MAX_BRATE_DTX_EVS ) ) ||
+                       ( st_fx->element_mode != EVS_MONO && LE_32( last_ivas_total_brate, MAX_BRATE_DTX_IVAS ) ) ||
+                       LT_16( st_fx->lp_noise_fx, DTX_THR * 256 );
     }
+
     /* Initialization */
     IF( st_fx->ini_frame == 0 )
     {
@@ -117,7 +117,7 @@ void dtx_ivas_fx(
         test();
         test();
         test();
-        if ( ( EQ_16( st_fx->codec_mode, MODE1 ) || st_fx->Opt_AMR_WB ) && EQ_16( st_fx->element_mode, IVAS_SCE ) && EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
+        if ( ( EQ_16( st_fx->codec_mode, MODE1 ) || st_fx->Opt_AMR_WB ) && NE_16( st_fx->element_mode, IVAS_SCE ) && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
         {
             st_fx->cng_type = LP_CNG;
             move16();
@@ -199,6 +199,10 @@ void dtx_ivas_fx(
     /*------------------------------------------------------------------------*
      * Select SID or FRAME_NO_DATA frame if DTX is enabled
      *------------------------------------------------------------------------*/
+
+    br_dtx_flag = 1;
+    move16();
+
     IF( st_fx->dtx_sce_sba == 0 )
     {
         test();
@@ -207,7 +211,7 @@ void dtx_ivas_fx(
         test();
         br_dtx_flag = ( ( st_fx->element_mode == EVS_MONO ) && LE_32( st_fx->total_brate, MAX_BRATE_DTX_EVS ) ) ||
                       ( ( st_fx->element_mode != EVS_MONO ) && LE_32( ivas_total_brate, MAX_BRATE_DTX_IVAS ) ) ||
-                      LT_16( st_fx->lp_noise_fx, 3840 /*15 in Q8*/ );
+                      LT_16( st_fx->lp_noise_fx, DTX_THR * 256 );
     }
     test();
     test();
@@ -226,8 +230,6 @@ void dtx_ivas_fx(
         {
             st_fx->last_total_brate_cng = -1;
             move16();
-            st_fx->last_rf_mode_cng = st_fx->rf_mode;
-            move16();
         }
         ELSE
         {
@@ -237,6 +239,8 @@ void dtx_ivas_fx(
             move16();
             st_fx->last_codec_mode_cng = st_fx->codec_mode;
             move16();
+            st_fx->last_rf_mode_cng = st_fx->rf_mode;
+            move16();
         }
 
         IF( hDtxEnc->cnt_SID == 0 )
@@ -293,7 +297,7 @@ void dtx_ivas_fx(
             test();
             test();
             test();
-            IF( ( EQ_16( st_fx->cng_type, FD_CNG ) && ( LE_32( st_fx->total_brate, ACELP_24k40 ) || ( ( st_fx->element_mode != EVS_MONO ) && LE_32( st_fx->total_brate, ACELP_32k ) ) ) ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) ) ) /* at highest bitrates, use exclusively LP_CNG */
+            IF( ( EQ_16( st_fx->cng_type, FD_CNG ) && ( LE_32( st_fx->total_brate, MAX_BRATE_DTX_EVS ) || ( ( st_fx->element_mode != EVS_MONO ) && LE_32( ivas_total_brate, MAX_BRATE_DTX_IVAS ) ) ) ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) ) ) /* at highest bitrates, use exclusively LP_CNG */
             {
                 test();
                 test();
@@ -322,9 +326,14 @@ void dtx_ivas_fx(
         IF( NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) && st_fx->hBstr != NULL )
         {
 
-            reset_indices_enc( st_fx->hBstr, st_fx->hBstr->nb_ind_tot );
+            reset_indices_enc_fx( st_fx->hBstr, st_fx->hBstr->nb_ind_tot );
         }
     }
+    ELSE IF( st_fx->element_mode != EVS_MONO )
+    {
+        st_fx->total_brate = total_brate_ref;
+        move32();
+    }
 
     /*------------------------------------------------------------------------*
      * Reset counters when in active frame (not in SID or FRAME_NO_DATA frame)
@@ -452,11 +461,7 @@ void dtx_ivas_fx(
                 speech++;
                 FOR( i = 1; i < L_FRAME / 16; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp = L_mac0_o( L_tmp, *speech, *speech, &Overflow ); /*2*Q_speech*/
-#else                                                                       /* BASOP_NOGLOB */
-                    L_tmp = L_mac0( L_tmp, *speech, *speech );
-#endif                                                                      /* BASOP_NOGLOB */
                     speech++;
                 }
                 hDtxEnc->frame_ener_fx = L_add( hDtxEnc->frame_ener_fx, L_shr( L_tmp, Q_speech2 ) ); /* Q(-7) */
@@ -631,11 +636,7 @@ void dtx_fx(
     move32();
 #endif
 
-#ifdef IVAS_CODE
     IF( st_fx->dtx_sce_sba != 0 )
-#else
-    if ( 0 )
-#endif
     {
         last_br_cng_flag = 1;
         last_br_flag = 1;
@@ -646,10 +647,9 @@ void dtx_fx(
     }
     ELSE
     {
-        /* _DIFF_FLOAT_FIX_ : lp_noise_fx threshold is different between float (15) and fix (5*256) */
-        last_br_cng_flag = LE_32( st_fx->last_total_brate_cng, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, LP_NOISE_LV * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate_cng, ACELP_32k ) );
+        last_br_cng_flag = LE_32( st_fx->last_total_brate_cng, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, DTX_THR * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate_cng, ACELP_32k ) );
 
-        last_br_flag = LE_32( st_fx->last_total_brate, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, LP_NOISE_LV * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate, ACELP_32k ) );
+        last_br_flag = LE_32( st_fx->last_total_brate, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, DTX_THR * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->last_total_brate, ACELP_32k ) );
         br_dtx_flag = 0;
         move16();
     }
@@ -740,12 +740,11 @@ void dtx_fx(
     /*------------------------------------------------------------------------*
      * Select SID or FRAME_NO_DATA frame if DTX is enabled
      *------------------------------------------------------------------------*/
-#ifdef IVAS_CODE
+
     if ( st_fx->dtx_sce_sba == 0 )
-#endif
     {
-        br_dtx_flag = LE_32( st_fx->total_brate, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, LP_NOISE_LV * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->total_brate, ACELP_32k ) ) ||
-                      EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && ( LE_32( st_fx->element_brate, IVAS_64k ) || LT_16( st_fx->lp_noise_fx, LP_NOISE_LV * 256 ) ) );
+        br_dtx_flag = LE_32( st_fx->total_brate, ACELP_24k40 ) || LT_16( st_fx->lp_noise_fx, DTX_THR * 256 ) || ( EQ_16( st_fx->element_mode, IVAS_SCE ) && LE_32( st_fx->total_brate, ACELP_32k ) ) ||
+                      EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && ( LE_32( st_fx->element_brate, IVAS_64k ) || LT_16( st_fx->lp_noise_fx, DTX_THR * 256 ) ) );
     }
     test();
     test();
@@ -806,20 +805,7 @@ void dtx_fx(
             st_fx->core_brate = SID_2k40;
             move32();
         }
-        // PMT("dtx_sce_sba code is missing")
-#ifdef IVAS_CODE
-        IF( ( NE_16( st_fx->last_core, ACELP_CORE ) || EQ_16( st_fx->cng_type, FD_CNG ) ) && EQ_16( st_fx->dtx_sce_sba, 1 ) )
-        {
-            st_fx->cng_type = FD_CNG;
-            move16();
-            if ( EQ_16( st_fx->element_mode, EVS_MONO ) && ( EQ_32( st_fx->total_brate, ACELP_9k60 ) || EQ_32( st_fx->total_brate, ACELP_16k40 ) || EQ_32( st_fx->total_brate, ACELP_24k40 ) || EQ_32( st_fx->total_brate, ACELP_48k ) || EQ_32( st_fx->total_brate, HQ_96k ) || EQ_32( st_fx->total_brate, HQ_128k ) ) )
-            {
-                st_fx->codec_mode = MODE2;
-                move16();
-            }
-        }
-        ELSE
-#endif
+
         {
             test();
             test();
@@ -849,17 +835,15 @@ void dtx_fx(
             }
         }
 
-#if 1 // def IVAS_CODE
         /* reset the bitstream (IVAS format signalling was already written) */
         IF( NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) && st_fx->hBstr != NULL )
         {
-#ifndef IVAS_CODE_BITSTREAM
-            reset_indices_enc_fx( st_fx->hBstr );
+#ifdef HARM_PUSH_BIT
+            reset_indices_enc_fx( st_fx->hBstr, st_fx->hBstr->nb_ind_tot );
 #else
-            reset_indices_enc( st_fx->hBstr, st_fx->hBstr->nb_ind_tot );
+            reset_indices_enc_fx( st_fx->hBstr, MAX_NUM_INDICES );
 #endif
         }
-#endif
     }
 
     /*------------------------------------------------------------------------*
@@ -902,32 +886,6 @@ void dtx_fx(
         {
             IF( EQ_16( st_fx->element_mode, IVAS_SCE ) )
             {
-#ifdef IVAS_CODE
-                Word16 lp_thresh, fd_thresh;
-                PMT( "lp_thresh scaling is to be found" )
-                test();
-                IF( st_fx->Opt_DTX_ON && EQ_16( st_fx->dtx_sce_sba, 1 ) )
-                {
-                    lp_thresh = 5.f;
-                    fd_thresh = 2.f;
-                }
-                ELSE
-
-                {
-                    lp_thresh = 10.f;
-                    fd_thresh = 5.f;
-                }
-
-                /*More conservative selection of LP-CNG for SCE*/
-                if ( st->cng_type == LP_CNG && ( st->bckr_tilt_lt > lp_thresh ) )
-                {
-                    st->cng_type = FD_CNG;
-                }
-                else if ( st->cng_type == FD_CNG && ( st->bckr_tilt_lt < fd_thresh ) && ( st->lp_noise > 2.f ) )
-                {
-                    st->cng_type = LP_CNG;
-                }
-#endif
             }
             ELSE
             {
@@ -977,11 +935,7 @@ void dtx_fx(
                 speech++;
                 FOR( i = 1; i < L_FRAME / 16; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp = L_mac0_o( L_tmp, *speech, *speech, &Overflow ); /*2*Q_speech*/
-#else                                                                       /* BASOP_NOGLOB */
-                    L_tmp = L_mac0( L_tmp, *speech, *speech );
-#endif                                                                      /* BASOP_NOGLOB */
                     speech++;
                 }
                 hDtxEnc->frame_ener_fx = L_add( hDtxEnc->frame_ener_fx, L_shr( L_tmp, Q_speech2 ) ); /*Q(-7) */
@@ -1347,11 +1301,7 @@ void dtx_hangover_control_fx(
     }
 
     exp = norm_l( enr_est );
-#ifdef BASOP_NOGLOB
     fra = round_fx_sat( L_shl_sat( enr_est, exp ) ); /*Q6+exp-16*/
-#else
-    fra = round_fx( L_shl( enr_est, exp ) );
-#endif
     exp2 = norm_s( weights );
     fra2 = shl( weights, exp2 ); /*Q15+exp2*/
     exp = sub( sub( exp, 16 ), exp2 );
@@ -1461,11 +1411,7 @@ void dtx_hangover_control_fx(
             move16();
             FOR( j = 0; j < m; j++ )
             {
-#ifdef BASOP_NOGLOB
                 lsp_est[i] = add_o( lsp_est[i], tmp[j * M + i], &Overflow ); /*Q15 */
-#else                                                                        /* BASOP_NOGLOB */
-                lsp_est[i] = add( lsp_est[i], tmp[j * M + i] );                                      /*Q15 */
-#endif                                                                       /* BASOP_NOGLOB */
             }
 
             lsp_est[i] = sub( lsp_est[i], tmp[max_idx[0] * M + i] ); /*Q15 */
@@ -1481,20 +1427,12 @@ void dtx_hangover_control_fx(
             move16();
             FOR( j = 0; j < m; j++ )
             {
-#ifdef BASOP_NOGLOB
                 lsp_est[i] = add_o( lsp_est[i], tmp[j * M + i], &Overflow ); /*Q15 */
-#else
-                lsp_est[i] = add( lsp_est[i], tmp[j * M + i] );                                      /*Q15 */
-#endif
             }
 
-#ifdef BASOP_NOGLOB
             lsp_est[i] = sub_o( lsp_est[i], add_o( tmp[max_idx[0] * M + i], tmp[max_idx[1] * M + i], &Overflow ), &Overflow ); /*Q15 */
-#else
-            lsp_est[i] = sub( lsp_est[i], add( tmp[max_idx[0] * M + i], tmp[max_idx[1] * M + i] ) ); /*Q15 */
-#endif
-            S_tmp = div_s( 1, sub( m, 2 ) );          /*Q15 */
-            lsp_est[i] = mult_r( lsp_est[i], S_tmp ); /*Q15 */
+            S_tmp = div_s( 1, sub( m, 2 ) );                                                                                   /*Q15 */
+            lsp_est[i] = mult_r( lsp_est[i], S_tmp );                                                                          /*Q15 */
         }
     }
 
@@ -1502,11 +1440,7 @@ void dtx_hangover_control_fx(
     move16();
     FOR( i = 0; i < M; i++ )
     {
-#ifdef BASOP_NOGLOB
         Dlsp_n2e = add_o( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ), &Overflow ); /*Q15 */
-#else                                                                                       /* BASOP_NOGLOB */
-        Dlsp_n2e = add( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ) );                       /*Q15 */
-#endif                                                                                      /* BASOP_NOGLOB */
         lsp_est[i] = add( mult_r( 26214, lsp_est[i] ), mult_r( 6554, lsp_new_fx[i] ) );     /*Q15 */
     }
 
@@ -1519,11 +1453,7 @@ void dtx_hangover_control_fx(
     FOR( i = 0; i < M; i++ )
     {
         S_tmp = abs_s( sub( hDtxEnc->lspCNG_fx[i], lsp_est[i] ) ); /*Q15 */
-#ifdef BASOP_NOGLOB
-        Dlsp = add_o( Dlsp, S_tmp, &Overflow ); /*Q15 */
-#else                                           /* BASOP_NOGLOB */
-        Dlsp = add( Dlsp, S_tmp );                                                                   /*Q15 */
-#endif
+        Dlsp = add_o( Dlsp, S_tmp, &Overflow );                    /*Q15 */
         IF( GT_16( S_tmp, S_max ) )
         {
             S_max = S_tmp; /*Q15 */
@@ -1628,11 +1558,6 @@ void td_cng_enc_init_fx(
     move16();
     move16();
 
-#ifdef IVAS_CODE
-    hTdCngEnc->CNG_att_fx = 0;
-    hTdCngEnc->last_idx_ener_fx = 0;
-#endif
-
     hTdCngEnc->cng_buf_cnt = 0;
 
 
diff --git a/lib_enc/enc_acelp.c b/lib_enc/enc_acelp.c
deleted file mode 100644
index e1517cb69321e96a0bf5f99655fc3566320fe29d..0000000000000000000000000000000000000000
--- a/lib_enc/enc_acelp.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
-
-
-/*
- * acelp_2pulse_search
- *
- * Parameters:
- *    nb_pos_ix      I: nb of pos for pulse 1 (1..8)
- *    track_x        I: track of pulse 1
- *    track_y        I: track of pulse 2
- *    ps           I/O: correlation of all fixed pulses
- *    alp          I/O: energy of all fixed pulses
- *    ix             O: position of pulse 1
- *    iy             O: position of pulse 2
- *    dn             I: corr. between target and h[]
- *    dn2            I: vector of selected positions
- *    cor_x          I: corr. of pulse 1 with fixed pulses
- *    cor_y          I: corr. of pulse 2 with fixed pulses
- *    rrixiy         I: corr. of pulse 1 with pulse 2
- *
- * Function:
- *    Find the best positions of 2 pulses in a subframe
- *
- * Returns:
- *    void
- */
-
-
-/*
- * E_ACELP_1pulse_search
- *
- * Parameters:
- *    track_x        I: track of pulse 1
- *    track_y        I: track of pulse 2
- *    ps           I/O: correlation of all fixed pulses
- *    alp          I/O: energy of all fixed pulses
- *    ix             O: position of pulse 1
- *    dn             I: corr. between target and h[]
- *    cor_x          I: corr. of pulse 1 with fixed pulses
- *    cor_y          I: corr. of pulse 2 with fixed pulses
- *
- * Function:
- *    Find the best positions of 1 pulse in a subframe
- *
- * Returns:
- *    void
- */
diff --git a/lib_enc/enc_acelp_fx.c b/lib_enc/enc_acelp_fx.c
index 0826880458f9a802528c4cdb2843932f7fa204a7..4317bdbb339419e21de8d9d597255c2083a32b4c 100644
--- a/lib_enc/enc_acelp_fx.c
+++ b/lib_enc/enc_acelp_fx.c
@@ -75,36 +75,20 @@ void E_ACELP_h_vec_corr1_fx( Word16 h[] /*Qx*/, Word16 vec[] /*Qx*/, UWord8 trac
         p2 = &vec[dn]; /*Qx*/
         FOR( j = dn; j < L_SUBFR - 1; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_sum = L_mac_o( L_sum, *p1++, *p2++, &Overflow ); /*2*Qx+1*/
-#else
-            L_sum = L_mac( L_sum, *p1++, *p2++ );
-#endif
         }
 
-#ifdef BASOP_NOGLOB
         corr = mac_ro( L_sum, *p1++, *p2++, &Overflow ); /*Q9*/
-#else                                                    /* BASOP_NOGLOB */
-        corr = mac_r( L_sum, *p1++, *p2++ ); /*Q9*/
-#endif                                                   /* BASOP_NOGLOB */
 
         /*cor[dn >> 2] = sign[dn] * s + p0[dn >> 2];*/
         j = shr( dn, 2 );
         if ( sign[dn] > 0 )
         {
-#ifdef BASOP_NOGLOB
             corr = add_o( p0[j], corr, &Overflow ); /*Q9*/
-#else
-            corr = add( p0[j], corr );
-#endif
         }
         if ( sign[dn] < 0 )
         {
-#ifdef BASOP_NOGLOB
             corr = sub_o( p0[j], corr, &Overflow ); /*Q9*/
-#else                                               /* BASOP_NOGLOB */
-            corr = sub( p0[j], corr );
-#endif                                              /* BASOP_NOGLOB */
         }
 
         cor[j] = corr; /*Q9*/
@@ -134,35 +118,19 @@ void E_ACELP_h_vec_corr2_fx( Word16 h[] /*Qx*/, Word16 vec[] /*Qx*/, UWord8 trac
         p2 = &vec[pos]; /*Qx*/
         FOR( j = pos; j < L_SUBFR - 1; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_sum = L_mac_o( L_sum, *p1++, *p2++, &Overflow ); /* 2*Qx+1 */
-#else
-            L_sum = L_mac( L_sum, *p1++, *p2++ );
-#endif
         }
-#ifdef BASOP_NOGLOB
         corr = mac_ro( L_sum, *p1++, *p2++, &Overflow ); /*Q9*/
-#else                                                    /* BASOP_NOGLOB */
-        corr = mac_r( L_sum, *p1++, *p2++ ); /*Q9*/
-#endif                                                   /* BASOP_NOGLOB */
 
         /*cor[i] = s * sign[track] + p0[i];*/
 
         if ( sign[pos] > 0 )
         {
-#ifdef BASOP_NOGLOB
             corr = add_o( *p0++, corr, &Overflow ); /*Q9*/
-#else
-            corr = add( *p0++, corr );
-#endif
         }
         if ( sign[pos] < 0 )
         {
-#ifdef BASOP_NOGLOB
             corr = sub_o( *p0++, corr, &Overflow ); /*Q9*/
-#else
-            corr = sub( *p0++, corr );
-#endif
         }
         cor[i] = corr; /*Q9*/
         move16();
@@ -227,11 +195,7 @@ static void E_ACELP_2pulse_search( Word16 nb_pos_ix /*Q0*/, UWord8 track_x /*Q0*
     sqk[0] = -1;
     move16();
     x2 = shr( pos_x[0], 2 ); /*Qdn*/
-#ifdef BASOP_NOGLOB
     if ( mac_ro( L_mac_o( L_mac_o( alp0, cor_x[x2], _1_, &Overflow ), cor_y[0], _1_, &Overflow ), rrixiy[track_x][( x2 * 16 )], _1_, &Overflow ) < 0 )
-#else  /* BASOP_NOGLOB */
-    if ( mac_r( L_mac( L_mac( alp0, cor_x[x2], _1_ ), cor_y[0], _1_ ), rrixiy[track_x][shl( x2, 4 )], _1_ ) < 0 )
-#endif /* BASOP_NOGLOB */
     {
         sqk[0] = 1;
         move16();
@@ -251,11 +215,7 @@ static void E_ACELP_2pulse_search( Word16 nb_pos_ix /*Q0*/, UWord8 track_x /*Q0*
         ps1 = add( ps0, dn[x] ); /*Qdn*/
 
         /*alp1 = alp0 + cor_x[x2];*/
-#ifdef BASOP_NOGLOB
         alp1 = L_mac_o( alp0, cor_x[x2], _1_, &Overflow ); /*Q22*/
-#else                                                      /* BASOP_NOGLOB */
-        alp1 = L_mac( alp0, cor_x[x2], _1_ ); /*Q22*/
-#endif                                                     /* BASOP_NOGLOB */
 
         p1 = cor_y;                         /*Qx*/
         p2 = &rrixiy[track_x][( x2 * 16 )]; /*Q9*/
@@ -267,13 +227,8 @@ static void E_ACELP_2pulse_search( Word16 nb_pos_ix /*Q0*/, UWord8 track_x /*Q0*
             move16();
 
             /*alp2 = alp1 + (*p1++) + (*p2++);*/
-#ifdef BASOP_NOGLOB
             alp2 = L_mac_o( alp1, *p1++, _1_, &Overflow );   /*Qx+12+1*/
             alp2_16 = mac_ro( alp2, *p2++, _1_, &Overflow ); /*Q6*/
-#else                                                        /* BASOP_NOGLOB */
-            alp2 = L_mac( alp1, *p1++, _1_ );
-            alp2_16 = mac_r( alp2, *p2++, _1_ );      /*Q6*/
-#endif                                                       /* BASOP_NOGLOB */
             alpk[1 - ik] = alp2_16;                          /*Q6*/
             move16();
 
@@ -475,13 +430,8 @@ static void E_ACELP_xh_corr( Word16 *x /*Qx*/, Word16 *y /*Qy*/, Word16 *h /*Q12
         L_maxloc = L_shr( L_maxloc, 2 );
         /* Do not warn saturation of L_tot, since its for headroom estimation. */
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         L_tot = L_add_sat( L_tot, L_maxloc );             /* +max/4 */
         L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#else
-        L_tot = L_add( L_tot, L_maxloc );             /* +max/4 */
-        L_tot = L_add( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
     }
 
@@ -581,19 +531,11 @@ Word16 E_ACELP_xy1_corr_fx( Word16 xn[] /*Q15-exp_xn*/, Word16 y1[] /*Q15-exp_xn
     L_off = L_shr( 10737418l /*0.01f/2.0f Q31*/, s_min( add( exp_xn, exp_xn ), 31 ) );
     L_off = L_max( 1, L_off ); /* ensure at least a '1' */
 
-#ifdef BASOP_NOGLOB
     /* Compute scalar product t1: <y1[] * y1[]> */
     yy = round_fx_o( Dot_product15_offs( y1, y1, L_subfr, &exp_yy, L_off ), &Overflow ); /*Q15 - exp_yy*/
 
     /* Compute scalar product t0: <xn[] * y1[]> */
     xy = round_fx_o( Dot_product12_offs( xn, y1, L_subfr, &exp_xy, L_off ), &Overflow ); /*Q15 - exp_xy*/
-#else
-    /* Compute scalar product t1: <y1[] * y1[]> */
-    yy = round_fx( Dot_product15_offs( y1, y1, L_subfr, &exp_yy, L_off ) );
-
-    /* Compute scalar product t0: <xn[] * y1[]> */
-    xy = round_fx( Dot_product12_offs( xn, y1, L_subfr, &exp_xy, L_off ) );
-#endif
     /* Compute doubled format out of the exponent */
     Q_xn = shl( sub( 15, exp_xn ), 1 );
     g_corr->y1y1 = yy;
@@ -621,11 +563,7 @@ Word16 E_ACELP_xy1_corr_fx( Word16 xn[] /*Q15-exp_xn*/, Word16 y1[] /*Q15-exp_xn
     i = add( exp_xy, 1 - 1 ); /* -1 -> gain in Q14 */
     i = sub( i, exp_yy );
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     gain = shl_o( gain, i, &Overflow ); /* saturation can occur here */
-#else                                   /* BASOP_NOGLOB */
-    gain = shl( gain, i ); /* saturation can occur here */
-#endif                                  /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
     /* gain = s_max(0, gain); */ /* see above xy < 0. */
 
@@ -639,11 +577,7 @@ Word16 E_ACELP_xy1_corr_fx( Word16 xn[] /*Q15-exp_xn*/, Word16 y1[] /*Q15-exp_xn
         Word16 tmp, exp_tmp, exp_div;
 
         /* Compute scalar product <xn[],xn[]> */
-#ifdef BASOP_NOGLOB
         tmp = round_fx_o( Dot_product12_offs( xn, xn, L_subfr, &exp_tmp, 1 ), &Overflow ); /*Q15 - exp_tmp*/
-#else
-        tmp = round_fx( Dot_product12_offs( xn, xn, L_subfr, &exp_tmp, 1 ) );
-#endif
         /* gain_p_snr = sqrt(<xn,xn>/<y1,y1>) */
         tmp = BASOP_Util_Divide1616_Scale( tmp, yy, &exp_div );
         exp_tmp = add( sub( exp_tmp, exp_yy ), exp_div );
@@ -653,11 +587,7 @@ Word16 E_ACELP_xy1_corr_fx( Word16 xn[] /*Q15-exp_xn*/, Word16 y1[] /*Q15-exp_xn
         /* Note: shl works as shl or shr. */
         exp_tmp = sub( exp_tmp, 1 );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmp = round_fx_o( L_shl_o( Mpy_32_16_1( 1717986944l /*ACELP_GAINS_CONST Q31*/, tmp ), exp_tmp, &Overflow ), &Overflow ); /*Q14*/
-#else                                                                                                                            /* BASOP_NOGLOB */
-        tmp = round_fx( L_shl( Mpy_32_16_1( 1717986944l /*ACELP_GAINS_CONST Q31*/, tmp ), exp_tmp ) );
-#endif                                                                                                                           /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
 
         gain = s_min( gain, tmp ); /*Q14*/
@@ -774,17 +704,9 @@ void E_ACELP_codebook_target_update_fx( Word16 *x /*Q_xn*/, Word16 *x2 /*Q_xn*/,
         L_tmp = L_deposit_h( x[i] ); /*Q_xn+16*/
         if ( Q15_flag == 0 )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( L_tmp, y[i], gain, &Overflow ); /*Q_xn+15*/
-#else
-            L_tmp = L_msu( L_tmp, y[i], gain );
-#endif
         }
-#ifdef BASOP_NOGLOB
         x2[i] = msu_ro( L_tmp, y[i], gain, &Overflow ); /*Q_xn*/
-#else
-        x2[i] = msu_r( L_tmp, y[i], gain );
-#endif
         move16();
     }
 }
@@ -830,11 +752,7 @@ void E_ACELP_pulsesign( const Word16 cn[] /*Q_xn*/, Word16 dn[] /*Qdn*/, Word16
 
     FOR( i = 1; i < L_subfr; i++ )
     {
-#ifdef BASOP_NOGLOB
         Lval = L_mac0_o( Lval, cn[i], cn[i], &Overflow ); /*2*Q_xn*/
-#else                                                     /* BASOP_NOGLOB */
-        Lval = L_mac0( Lval, cn[i], cn[i] );
-#endif                                                    /* BASOP_NOGLOB */
         Lcor = L_mac0( Lcor, dn[i], dn[i] );              /*2*Qdn*/
     }
 
@@ -851,13 +769,8 @@ void E_ACELP_pulsesign( const Word16 cn[] /*Q_xn*/, Word16 dn[] /*Qdn*/, Word16
     if ( i > 0 )
         Lcor = L_shr( Lcor, i );
 
-#ifdef BASOP_NOGLOB
     k_dn = round_fx_o( Lval, &Overflow ); /*Q15 - e_dn*/
     k_cn = round_fx_o( Lcor, &Overflow ); /*Q15 - e_cn*/
-#else                                     /* BASOP_NOGLOB */
-    k_dn = round_fx( Lval );
-    k_cn = round_fx( Lcor );
-#endif                                    /* BASOP_NOGLOB */
 
     k_cn = mult_r( 0x2000, k_cn ); /* 1 in Q13 */
     k_dn = mult_r( alp, k_dn );    /* alp in Q13 */
@@ -875,13 +788,9 @@ void E_ACELP_pulsesign( const Word16 cn[] /*Q_xn*/, Word16 dn[] /*Qdn*/, Word16
     FOR( i = 0; i < L_subfr; i++ )
     {
         /*cor = (s * cn[i]) + (alp * dn[i]);                        MULT(1);MAC(1);*/
-        Lcor = L_mult( cn[i], k_cn );      /*Q_xn + Q15 - e_cn + 1*/
-        Lcor = L_mac( Lcor, dn[i], k_dn ); /*Qdn + Q15 - e_dn + 1*/
-#ifdef BASOP_NOGLOB
+        Lcor = L_mult( cn[i], k_cn );                                 /*Q_xn + Q15 - e_cn + 1*/
+        Lcor = L_mac( Lcor, dn[i], k_dn );                            /*Qdn + Q15 - e_dn + 1*/
         val = round_fx_o( L_shl_o( Lcor, 4, &Overflow ), &Overflow ); /*shifting by 4 may overflow but improves accuracy Qdn + 4 - e_dn*/
-#else
-        val = round_fx( L_shl( Lcor, 4 ) ); /*shifting by 4 may overflow but improves accuracy*/
-#endif
 
         index = shr( val, 15 );
         sign[i] = ptr16[index];    /*Q15*/
@@ -1219,11 +1128,7 @@ void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const
     BASOP_SATURATE_WARNING_OFF_EVS
     FOR( i = 0; i < L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_o( L_tmp, H[i], H[i], &Overflow ); /*Q25*/
-#else
-        L_tmp = L_mac( L_tmp, H[i], H[i] );
-#endif
     }
     val = extract_h( L_tmp ); /*Q9*/
     BASOP_SATURATE_WARNING_ON_EVS
@@ -1368,11 +1273,7 @@ void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const
 
             L_tmp = L_mult( vec[0], vec[0] ); /*Q25+2*scale*/
             FOR( i = 1; i < L_SUBFR; i++ )
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac_o( L_tmp, vec[i], vec[i], &Overflow ); /*Q25+2*scale*/
-#else
-            L_tmp = L_mac( L_tmp, vec[i], vec[i] );
-#endif
 
             alp = round_fx( L_shr( L_tmp, 3 ) ); /*Q6+2*scale*/
 
@@ -1429,13 +1330,8 @@ void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const
                 FOR( i = 0; i < L_SUBFR; i++ )
                 {
                     tmp = add( *p0++, *p1++ );
-#ifdef BASOP_NOGLOB
                     vec[i] = add_o( vec[i], tmp, &Overflow ); /* can saturate here. */
                     move16();
-#else
-                    vec[i] = add( vec[i], tmp ); /* can saturate here. */
-                    move16();
-#endif
                 }
             }
             st = add( st, 1 );
@@ -1484,17 +1380,337 @@ void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const
         }
         FOR( i = 0; i < L_SUBFR; i++ )
         {
-#ifdef BASOP_NOGLOB
             y[i] = add_o( y[i], *p0++, &Overflow ); /*Q12+scale*/
-#else
-            y[i] = add( y[i], *p0++ );
-#endif
             move16();
         }
     }
     return;
 }
 
+void E_ACELP_4tsearch_ivas_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ )
+{
+    Word16 sign[L_SUBFR], vec[L_SUBFR];
+    Word16 cor_x[16], cor_y[16], h_buf[4 * L_SUBFR];
+    Word16 rrixix[4][16];
+    Word16 rrixiy[4][256];
+    Word16 dn2[L_SUBFR];
+    Word16 psk, ps, alpk, alp = 0;
+    Word16 codvec[NB_PULSE_MAX];
+    Word16 pos_max[4];
+    Word16 dn2_pos[8 * 4];
+    UWord8 ipos[NB_PULSE_MAX];
+    Word16 *p0, *p1, *p2, *p3;
+    Word16 *h, *h_inv;
+    Word16 i, j, k, l, st, pos;
+    Word16 val, tmp, scale;
+    Word32 s, L_tmp;
+    Word16 nb_pulse, nb_pulse_m2;
+    Word16 check = 0; /* debug code not instrumented */
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
+#endif
+
+
+    alp = config->alp; /* Q13 */ /* initial value for energy of all fixed pulses */
+    move16();
+    nb_pulse = config->nb_pulse;
+    move16();
+    nb_pulse_m2 = sub( nb_pulse, 2 );
+
+    set16_fx( codvec, 0, nb_pulse );
+
+    /*
+     * Find sign for each pulse position.
+     */
+
+    E_ACELP_pulsesign( cn, dn, dn2, sign, vec, alp, 0x7fff, L_SUBFR );
+
+    /*
+     * Select the most important 8 position per track according to dn2[].
+     */
+    E_ACELP_findcandidates( dn2, dn2_pos, pos_max );
+
+    /*
+     * Compute h_inv[i].
+     */
+    set16_fx( h_buf, 0, L_SUBFR );
+
+    set16_fx( h_buf + ( 2 * L_SUBFR ), 0, L_SUBFR );
+
+    h = h_buf + L_SUBFR;
+    h_inv = h_buf + ( 3 * L_SUBFR );
+
+    /*Check the energy if it is too high then scale to prevent an overflow*/
+    scale = 0;
+    move16();
+    L_tmp = L_deposit_l( 0 );
+    BASOP_SATURATE_WARNING_OFF_EVS
+    FOR( i = 0; i < L_SUBFR; i++ )
+    {
+        L_tmp = L_mac_o( L_tmp, H[i], H[i], &Overflow ); /*Q25*/
+    }
+    val = extract_h( L_tmp ); /*Q9*/
+    BASOP_SATURATE_WARNING_ON_EVS
+
+    if ( GT_16( val, 0x2000 ) )
+    {
+        scale = -1;
+        move16();
+    }
+    if ( GT_16( val, 0x7000 ) )
+    {
+        scale = -2;
+        move16();
+    }
+    if ( EQ_16( val, 32767 ) )
+    {
+        scale = -3;
+        move16();
+    }
+
+    Copy_Scale_sig( H, h, L_SUBFR, scale ); /*Q12+scale*/
+
+    E_ACELP_vec_neg_fx( h, h_inv, L_SUBFR );
+
+
+    /*
+     * Compute correlation matrices needed for the codebook search.
+     */
+    E_ACELP_corrmatrix_fx( h, sign, vec, rrixix, rrixiy );
+
+
+    /*
+     * Deep first search:
+     * ------------------
+     * 20 bits (4p):  4 iter x ((4x16)+(8x16))              = 768 tests
+     * 36 bits (8p):  4 iter x ((1x1)+(4x16)+(8x16)+(8x16)) = 1280 tests
+     * 52 bits (12p): 3 iter x ((1x1)+(1x1)+(4x16)+(6x16)
+     *                                      +(8x16)+(8x16)) = 1248 tests
+     * 64 bits (16p): 2 iter x ((1x1)+(1x1)+(4x16)+(6x16)
+     *                        +(6x16)+(8x16)+(8x16)+(8x16)) = 1280 tests
+     */
+    psk = -1;
+    move16();
+    alpk = 1;
+    move16();
+
+    /*Number of iterations*/
+    FOR( k = 0; k < config->nbiter; k++ )
+    {
+        E_ACELP_setup_pulse_search_pos( config, k, ipos );
+
+        /* format of alp changes to Q(15-ALP2_E) */
+
+        pos = config->fixedpulses;
+        move16();
+
+        IF( config->fixedpulses == 0 ) /* 1100, 11, 1110, 1111, 2211 */
+        {
+            ps = 0;
+            move16();
+            alp = 0;
+            move16();
+            set16_fx( vec, 0, L_SUBFR );
+        }
+        ELSE IF( EQ_16( config->fixedpulses, 2 ) ) /* 2222 and 3322 */
+        {
+            /* first stage: fix 2 pulses */
+            ind[0] = pos_max[ipos[0]];
+            move16();
+            ind[1] = pos_max[ipos[1]];
+            move16();
+            ps = add( dn[ind[0]], dn[ind[1]] );
+
+            /*alp = rrixix[ipos[0]][ind[0] >> 2] + rrixix[ipos[1]][ind[1] >> 2] +
+                    rrixiy[ipos[0]][((ind[0] >> 2) << 4) + (ind[1] >> 2)];*/
+
+            i = shr( ind[0], 2 );
+            j = shr( ind[1], 2 );
+            l = add( shl( i, 4 ), j );
+            s = L_mult( rrixix[ipos[0]][i], _1_ );     /* Q9+Q12+1 */
+            s = L_mac( s, rrixix[ipos[1]][j], _1_ );   /* Q9+Q12+1 */
+            alp = mac_r( s, rrixiy[ipos[0]][l], _1_ ); /* Q9+Q12+1-16 */
+
+            p0 = h - ind[0]; /*Q12+scale*/
+            IF( sign[ind[0]] < 0 )
+            {
+                p0 = h_inv - ind[0]; /*Q12+scale*/
+            }
+
+            p1 = h - ind[1]; /*Q12+scale*/
+            IF( sign[ind[1]] < 0 )
+            {
+                p1 = h_inv - ind[1]; /*Q12+scale*/
+            }
+
+            FOR( i = 0; i < L_SUBFR; i++ )
+            {
+                vec[i] = add( *p0++, *p1++ ); /*Q12+scale*/
+                move16();
+            }
+        }
+        ELSE /* 3333 and above */
+        {
+            /* first stage: fix 4 pulses */
+
+            ind[0] = pos_max[ipos[0]]; /*Q0*/
+            move16();
+            ind[1] = pos_max[ipos[1]]; /*Q0*/
+            move16();
+            ind[2] = pos_max[ipos[2]]; /*Q0*/
+            move16();
+            ind[3] = pos_max[ipos[3]]; /*Q0*/
+            move16();
+
+            /*ps = dn[ind[0]] + dn[ind[1]] + dn[ind[2]] + dn[ind[3]];*/
+            ps = add( add( add( dn[ind[0]], dn[ind[1]] ), dn[ind[2]] ), dn[ind[3]] );
+
+            p0 = h - ind[0]; /*Q12+scale*/
+            IF( sign[ind[0]] < 0 )
+            {
+                p0 = h_inv - ind[0]; /*Q12+scale*/
+            }
+
+            p1 = h - ind[1]; /*Q12+scale*/
+            IF( sign[ind[1]] < 0 )
+            {
+                p1 = h_inv - ind[1]; /*Q12+scale*/
+            }
+
+            p2 = h - ind[2]; /*Q12+scale*/
+            IF( sign[ind[2]] < 0 )
+            {
+                p2 = h_inv - ind[2]; /*Q12+scale*/
+            }
+
+            p3 = h - ind[3]; /*Q12+scale*/
+            IF( sign[ind[3]] < 0 )
+            {
+                p3 = h_inv - ind[3]; /*Q12+scale*/
+            }
+
+            FOR( i = 0; i < L_SUBFR; i++ )
+            {
+                vec[i] = add( add( add( *p0++, *p1++ ), *p2++ ), *p3++ ); /*Q12+scale*/
+                move16();
+            }
+
+            L_tmp = L_mult( vec[0], vec[0] ); /*Q25+2*scale*/
+            FOR( i = 1; i < L_SUBFR; i++ )
+            L_tmp = L_mac_o( L_tmp, vec[i], vec[i], &Overflow ); /*Q25+2*scale*/
+
+            alp = round_fx( L_shr( L_tmp, 3 ) ); /*Q6+2*scale*/
+
+            /*alp *= 0.5F;      */
+        }
+
+        /* other stages of 2 pulses */
+        st = 0;
+        move16();
+        FOR( j = pos; j < nb_pulse; j += 2 )
+        {
+            IF( GE_16( nb_pulse_m2, j ) ) /* pair-wise search */
+            {
+                /*
+                 * Calculate correlation of all possible positions
+                 * of the next 2 pulses with previous fixed pulses.
+                 * Each pulse can have 16 possible positions.
+                 */
+                E_ACELP_h_vec_corr1_fx( h, vec, ipos[j], sign, rrixix, cor_x, dn2_pos, config->nbpos[st] );
+
+                E_ACELP_h_vec_corr2_fx( h, vec, ipos[j + 1], sign, rrixix, cor_y );
+
+                /*
+                 * Find best positions of 2 pulses.
+                 */
+                E_ACELP_2pulse_search( config->nbpos[st], ipos[j], ipos[j + 1], &ps, &alp,
+                                       &ind[j], &ind[j + 1], dn, dn2_pos, cor_x, cor_y, rrixiy );
+            }
+            ELSE /* single pulse search */
+            {
+                E_ACELP_h_vec_corr2_fx( h, vec, ipos[j], sign, rrixix, cor_x );
+
+                E_ACELP_h_vec_corr2_fx( h, vec, ipos[j + 1], sign, rrixix, cor_y );
+
+                E_ACELP_1pulse_search( &ipos[j], &ps, &alp,
+                                       &ind[j], dn, cor_x, cor_y );
+            }
+
+            IF( GT_16( nb_pulse_m2, j ) )
+            {
+                p0 = h - ind[j]; /*Q12+scale*/
+                IF( sign[ind[j]] < 0 )
+                {
+                    p0 = h_inv - ind[j]; /*Q12+scale*/
+                }
+
+                p1 = h - ind[j + 1]; /*Q12+scale*/
+                IF( sign[ind[j + 1]] < 0 )
+                {
+                    p1 = h_inv - ind[j + 1]; /*Q12+scale*/
+                }
+
+
+                FOR( i = 0; i < L_SUBFR; i++ )
+                {
+                    tmp = add( *p0++, *p1++ );
+                    vec[i] = add_o( vec[i], tmp, &Overflow ); /* can saturate here. */
+                    move16();
+                }
+            }
+            st = add( st, 1 );
+        }
+
+        /* memorise the best codevector */
+
+        /*ps = ps * ps;                                            MULT(1);*/
+        ps = mult( ps, ps );
+        /*s = (alpk * ps) - (psk * alp);                            MULT(2);ADD(1);*/
+        s = L_msu( L_mult( alpk, ps ), psk, alp ); /*Q9+Q6+1=Q16*/
+
+        if ( psk < 0 )
+        {
+            s = 1;
+            move32();
+        }
+        IF( s > 0 )
+        {
+            psk = ps;
+            move16();
+            alpk = alp;
+            move16();
+            Copy( ind, codvec, nb_pulse ); /*Q0*/
+            check = 1;                     /* debug code not instrumented */
+        }
+    }
+
+    assert( check ); /* debug code not instrumented */
+
+    /*
+     * Build the codeword, the filtered codeword and index of codevector, as well as store weighted correlations.
+     */
+
+    E_ACELP_build_code( nb_pulse, codvec, sign, code, ind );
+
+    set16_fx( y, 0, L_SUBFR );
+    FOR( k = 0; k < nb_pulse; ++k )
+    {
+        i = codvec[k]; /*Q0*/
+        move16();
+        p0 = h_inv - i; /*Q12+scale*/
+        IF( sign[i] > 0 )
+        {
+            p0 -= 2 * L_SUBFR;
+        }
+        FOR( i = 0; i < L_SUBFR; i++ )
+        {
+            y[i] = add_o( y[i], *p0++, &Overflow ); /*Q12+scale*/
+            move16();
+        }
+    }
+    return;
+}
 
 /*
  * E_ACELP_4t_fx
@@ -1543,7 +1759,7 @@ void E_ACELP_4t_fx(
     const Word16 last_L_frame, /*Q0*/
     const Word32 total_brate,  /*Q0*/
     const Word16 i_subfr,      /*Q0*/
-    const int16_t cmpl_flag /*Q0*/ )
+    const Word16 cmpl_flag /*Q0*/ )
 {
     PulseConfig config;
     Word16 ind[NPMAXPT * 4];
@@ -1606,7 +1822,7 @@ void E_ACELP_4t_ivas_fx(
     const Word16 last_L_frame, /*Q0*/
     const Word32 total_brate,  /*Q0*/
     const Word16 i_subfr,      /*Q0*/
-    const int16_t cmpl_flag,   /*Q0*/
+    const Word16 cmpl_flag,    /*Q0*/
     Word16 element_mode /*Q0*/ )
 {
     PulseConfig config;
@@ -1651,7 +1867,7 @@ void E_ACELP_4t_ivas_fx(
     }
     ELSE
     {
-        E_ACELP_4tsearch_fx( dn, cn, H, code, &config, ind, y );
+        E_ACELP_4tsearch_ivas_fx( dn, cn, H, code, &config, ind, y );
     }
     E_ACELP_indexing_fx( code, &config, NB_TRACK_FCB_4T, _index );
     return;
@@ -2155,11 +2371,7 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U
         {
             Carry = 0;
             move32();
-#ifdef BASOP_NOGLOB
             s = L_add_co( s, pulsestostates[pos[k]][t], &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-            s = L_add_c( s, pulsestostates[pos[k]][t] );
-#endif /* BASOP_NOGLOB */
             t = add( t, 1 );
             if ( sub( t, NPMAXPT ) > 0 )
             {
@@ -2175,21 +2387,13 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U
         s = L_lshl( s, 1 );
         if ( sign < 0 )
         {
-#ifdef BASOP_NOGLOB
             s = L_add_co( s, 1, &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-            s = L_add_c( s, 1 );
-#endif /* BASOP_NOGLOB */
         }
 
         /* Code last pulse */
         Carry = 0;
         move32();
-#ifdef BASOP_NOGLOB
         s = L_add_co( s, pulsestostates[pos[k]][t], &Carry, &Overflow );
-#else /* BASOP_NOGLOB */
-        s = L_add_c( s, pulsestostates[pos[k]][t] );
-#endif
         t = add( t, 1 );
     }
 
diff --git a/lib_enc/enc_acelp_tcx_main.c b/lib_enc/enc_acelp_tcx_main.c
deleted file mode 100644
index fc894ba6cc3b0f6891e5522d7bdaa893786ada84..0000000000000000000000000000000000000000
--- a/lib_enc/enc_acelp_tcx_main.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/enc_acelpx.c b/lib_enc/enc_acelpx.c
deleted file mode 100644
index 661cc4b7b44a35c09c0ee29a47f1b5d01df6c3fe..0000000000000000000000000000000000000000
--- a/lib_enc/enc_acelpx.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/enc_acelpx_fx.c b/lib_enc/enc_acelpx_fx.c
index 99c9568ebfc47d055d81a3d9444bf5b7a4d30321..240f9859c84f2748e544432bf47a9ff619bfae59 100644
--- a/lib_enc/enc_acelpx_fx.c
+++ b/lib_enc/enc_acelpx_fx.c
@@ -151,12 +151,8 @@ static void E_ACELP_2pulse_searchx_fx(
     ps0 = *ps; /*Qdn*/
     move16();
     /*alp0 = *alp + 2.0f*R[0];                         move16();*/
-    alp0 = L_deposit_h( *alp ); /* Qalp = Q_R*Q_signval */
-#ifdef BASOP_NOGLOB
+    alp0 = L_deposit_h( *alp );                 /* Qalp = Q_R*Q_signval */
     alp0 = L_mac_sat( alp0, R[0], sign_val_2 ); /*Q9+scale+Q15*/
-#else
-    alp0 = L_mac( alp0, R[0], sign_val_2 );
-#endif
 
     /* Ensure that in the loop below s > 0 in the first iteration, the actual values do not matter. */
     sqk[0] = -1;
@@ -171,11 +167,7 @@ static void E_ACELP_2pulse_searchx_fx(
     {
         sgnx = negate( sgnx );
     }
-#ifdef BASOP_NOGLOB
     if ( mac_ro( L_mac_o( L_mac_o( alp0, cor[x], sign[x], &Overflow ), cor[track_y], sign[track_y], &Overflow ), R[track_y - x], sgnx, &Overflow ) < 0 )
-#else
-    if ( mac_r( L_mac( L_mac( alp0, cor[x], sign[x] ), cor[track_y], sign[track_y] ), R[track_y - x], sgnx ) < 0 )
-#endif
 
     {
         sqk[0] = 1;
@@ -195,27 +187,15 @@ static void E_ACELP_2pulse_searchx_fx(
         move16();
         /* dn[x] has only nb_pos_ix positions saved */
         /*ps1 = ps0 + dn[x];                            INDIRECT(1);ADD(1);*/
-#ifdef BASOP_NOGLOB
         ps1 = add_sat( ps0, dn[x] ); /*Qdn*/
-#else
-        ps1 = add( ps0, dn[x] );
-#endif
         /*alp1 = alp0 + 2*sgnx*cor[x];                  INDIRECT(1);MULT(1); MAC(1);*/
-#ifdef BASOP_NOGLOB
         alp1 = L_mac_o( alp0, cor[x], sgnx, &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
-        alp1 = L_mac( alp0, cor[x], sgnx ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
-        pR = R - x; /*Q9+scale*/
+        pR = R - x;                                      /*Q9+scale*/
 
         FOR( y = track_y; y < L_SUBFR; y += 4 )
         {
             /*ps2 = ps1 + dn[y];                         ADD(1);*/
-#ifdef BASOP_NOGLOB
             ps2 = add_sat( ps1, dn[y] ); /*Qdn*/
-#else
-            ps2 = add( ps1, dn[y] );
-#endif
             /*alp2 = alp1 + 2.0f*sign[y]*(cor[y] + sgnx*pR[y]);   MULT(1); MAC(2);*/
             /*alp2 = alp1 + 2.0f*sign[y]*cor[y] + 2.0f*sign[y]*sgnx*pR[y];   MULT(1); MAC(2);*/
             assert( sign[y] == sign_val_2 || sign[y] == -sign_val_2 );
@@ -224,26 +204,14 @@ static void E_ACELP_2pulse_searchx_fx(
             assert( sgnx != 0 );
             alp2_16 = 0;
 
-#ifdef BASOP_NOGLOB
             alp2 = L_mac_o( alp1, cor[y], sign[y], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
-            alp2 = L_mac( alp1, cor[y], sign[y] );                 /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
             if ( sgnx > 0 )
             {
-#ifdef BASOP_NOGLOB
                 alp2_16 = mac_ro( alp2, pR[y], sign[y], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
-                alp2_16 = mac_r( alp2, pR[y], sign[y] );           /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
             }
             if ( sgnx < 0 )
             {
-#ifdef BASOP_NOGLOB
                 alp2_16 = msu_ro( alp2, pR[y], sign[y], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
-                alp2_16 = msu_r( alp2, pR[y], sign[y] );           /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
             }
             alpk[1 - ik] = alp2_16; /* Qalp */
             move16();
@@ -255,11 +223,7 @@ static void E_ACELP_2pulse_searchx_fx(
 
 
             /*s = (alpk * sq) - (sqk * alp2);            MULT(1);MAC(1);*/
-#ifdef BASOP_NOGLOB
             s = L_msu_o( L_mult( alpk[ik], sq ), sqk[ik], alp2_16, &Overflow ); /* Q_sq = Q_sqk, Q_alpk = Q_alp */
-#else
-            s = L_msu( L_mult( alpk[ik], sq ), sqk[ik], alp2_16 ); /* Q_sq = Q_sqk, Q_alpk = Q_alp */
-#endif
             if ( s > 0 )
             {
                 ik = sub( 1, ik );
@@ -335,11 +299,7 @@ static void E_ACELP_1pulse_searchx_fx(
     sqk[0] = -1;
     ik = 0;
     move16();
-#ifdef BASOP_NOGLOB
     if ( mac_ro( alp0, cor[tracks[0]], sign[tracks[0]], &Overflow ) < 0 )
-#else
-    if ( mac_r( alp0, cor[tracks[0]], sign[tracks[0]] ) < 0 )
-#endif
     {
         sqk[0] = 1;
         move16();
@@ -363,12 +323,8 @@ static void E_ACELP_1pulse_searchx_fx(
             ps1 = add( ps0, dn[x] );
             /* alp1 = alp0 + 2*sign[x]*cor[x];                MAC(1); MULT(1);*/
             assert( sign[x] == sign_val_1 << 1 || sign[x] == -( sign_val_1 << 1 ) );
-#ifdef BASOP_NOGLOB
             alp1 = mac_ro( alp0, cor[x], sign[x], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
-            alp1 = mac_r( alp0, cor[x], sign[x] ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
-            alpk[1 - ik] = alp1; /* Qalp */
+            alpk[1 - ik] = alp1;                               /* Qalp */
             move16();
 
 
@@ -378,11 +334,7 @@ static void E_ACELP_1pulse_searchx_fx(
             move16();
 
             /*s = (alpk[ik] * sq) - (sqk[ik] * alp1);                MULT(1);MAC(1);*/
-#ifdef BASOP_NOGLOB
             s = L_msu_o( L_mult_o( alpk[ik], sq, &Overflow ), sqk[ik], alp1, &Overflow ); /* Q9+Qalp+1 */
-#else
-            s = L_msu( L_mult( alpk[ik], sq ), sqk[ik], alp1 );
-#endif
             if ( s > 0 )
             {
                 ik = sub( 1, ik );
@@ -829,11 +781,7 @@ void E_ACELP_4tsearchx_ivas_fx(
                 alp = shr( alp, 1 );
                 Scale_sig( cor, L_SUBFR, -1 );           /*Q8*/
                 Scale_sig( R_buf, 2 * L_SUBFR - 1, -1 ); /*Q8+scale*/
-#ifndef MSAN_FIX
-                Scale_sig( dn, 2 * L_SUBFR, -1 );
-#else
-                Scale_sig( dn, L_SUBFR, -1 ); /*Qdn-1*/
-#endif
+                Scale_sig( dn, L_SUBFR, -1 );            /*Qdn-1*/
             }
 
 
diff --git a/lib_enc/enc_amr_wb.c b/lib_enc/enc_amr_wb.c
deleted file mode 100644
index 0fe8682daace6673130ca2ca05de2a188e8e2ae0..0000000000000000000000000000000000000000
--- a/lib_enc/enc_amr_wb.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/enc_amr_wb_fx.c b/lib_enc/enc_amr_wb_fx.c
index edc04bc832fa4f64ef737883f5d9c6ed83b0e5ef..4c5268017f3c99d751c86272f368064d3209adc2 100644
--- a/lib_enc/enc_amr_wb_fx.c
+++ b/lib_enc/enc_amr_wb_fx.c
@@ -170,7 +170,7 @@ void encod_amr_wb_fx(
 
         IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
         {
-            push_indice_fx( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
+            push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
         }
 
         /*-----------------------------------------------------------------*
@@ -187,24 +187,15 @@ void encod_amr_wb_fx(
                             &gain_inov, &norm_gain_code, g_corr, clip_gain, hAmrwb_IO->past_qua_en_fx );
 
         gp_clip_test_gain_pit_fx( st->element_mode, st->core_brate, gain_pit, st->clip_var_fx );
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_o( gain_code, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
         gcode16 = round_fx_o( Lgcode, &Overflow );       /*Q0*/
-#else                                                    /* BASOP_NOGLOB */
-        Lgcode = L_shl( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif                                                   /* BASOP_NOGLOB */
 
         hLPDmem->tilt_code = Est_tilt2( exc + i_subfr, gain_pit, code, Lgcode, &voice_fac, shift ); /*Q15*/
 
         FOR( i = 0; i < L_SUBFR; i++ )
         {
-#ifdef BASOP_NOGLOB
             exc2[i + i_subfr] = round_fx_o( L_shl_o( L_mult( gain_pit, exc[i + i_subfr] ), 1, &Overflow ), &Overflow ); /*Q_new*/
             move16();
-#else  /* BASOP_NOGLOB */
-            exc2[i + i_subfr] = round_fx( L_shl( L_mult( gain_pit, exc[i + i_subfr] ), 1 ) );
-#endif /* BASOP_NOGLOB */
         }
 
         /*-----------------------------------------------------------------*
@@ -217,35 +208,20 @@ void encod_amr_wb_fx(
         Ltmp = L_negate( Ltmp );
         Ltmp = L_mac( Ltmp, xn[L_SUBFR - 1], 16384 /*Q14*/ );    /* Q_new-1+shift+14+1 */
         Ltmp = L_msu( Ltmp, y1[L_SUBFR - 1], gain_pit /*Q14*/ ); /* Q_new-1+shift+14+1 */
-#ifdef BASOP_NOGLOB
-        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* Q_new+15 */
-        hLPDmem->mem_w0 = round_fx_sat( Ltmp );    /*Q_new-1        */
+        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );               /* Q_new+15 */
+        hLPDmem->mem_w0 = round_fx_sat( Ltmp );                  /*Q_new-1        */
         move16();
-#else
-        Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-        hLPDmem->mem_w0 = round_fx( Ltmp ); /*Q_new-1        */
-#endif
         /*-----------------------------------------------------------------*
          * Find the total excitation
          *-----------------------------------------------------------------*/
         FOR( i = 0; i < L_SUBFR; i++ )
         {
-            L_tmp = L_mult( gcode16, code[i] ); /*Q10*/
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( gcode16, code[i] );                     /*Q10*/
             L_tmp = L_shl_sat( L_tmp, 5 );                          /*Q15*/
             L_tmp = L_mac_sat( L_tmp, exc[i + i_subfr], gain_pit ); /* Q_new+15 */
-#else
-            L_tmp = L_shl( L_tmp, 5 );
-            L_tmp = L_mac( L_tmp, exc[i + i_subfr], gain_pit );
-#endif
-#ifdef BASOP_NOGLOB
-            L_tmp = L_shl_o( L_tmp, 1, &Overflow );            /* saturation can occur here Q_new+15*/
-            exc[i + i_subfr] = round_fx_o( L_tmp, &Overflow ); /*Q_new*/
+            L_tmp = L_shl_o( L_tmp, 1, &Overflow );                 /* saturation can occur here Q_new+15*/
+            exc[i + i_subfr] = round_fx_o( L_tmp, &Overflow );      /*Q_new*/
             move16();
-#else /* BASOP_NOGLOB */
-            L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-            exc[i + i_subfr] = round_fx( L_tmp );
-#endif
         }
 
         /*-----------------------------------------------------------------*
@@ -267,7 +243,7 @@ void encod_amr_wb_fx(
                            hVAD->hangover_cnt, &hAmrwb_IO->gain_alpha_fx, &hf_gain_fx[i_subfr / L_SUBFR], add( Q_new, 1 ), st->Q_syn );
             }
 
-            push_indice_fx( hBstr, IND_HF_GAIN_MODIFICATION, hf_gain_fx[i_subfr / L_SUBFR], 4 );
+            push_indice( hBstr, IND_HF_GAIN_MODIFICATION, hf_gain_fx[i_subfr / L_SUBFR], 4 );
         }
 
         p_Aw += ( M + 1 );
diff --git a/lib_enc/enc_gain.c b/lib_enc/enc_gain.c
deleted file mode 100644
index a82d2075a76f57609097ce569d3cdc6d524f64e8..0000000000000000000000000000000000000000
--- a/lib_enc/enc_gain.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/enc_gen_voic.c b/lib_enc/enc_gen_voic.c
deleted file mode 100644
index 0fe8682daace6673130ca2ca05de2a188e8e2ae0..0000000000000000000000000000000000000000
--- a/lib_enc/enc_gen_voic.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/enc_gen_voic_fx.c b/lib_enc/enc_gen_voic_fx.c
index 243b9f0490e6d58847c2b4b4de4daf7f46733798..a485a1bf39cca3e3b503ba25c80494a3c8d25231 100644
--- a/lib_enc/enc_gen_voic_fx.c
+++ b/lib_enc/enc_gen_voic_fx.c
@@ -4,10 +4,9 @@
 #include <stdint.h>
 #include "options.h"     /* Compilation switches                   */
 #include "cnst.h"        /* Common constants                       */
-#include "prot.h"        /* Function prototypes                    */
+#include "prot_fx.h"     /* Function prototypes                    */
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
-#include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*======================================================================*/
@@ -180,7 +179,7 @@ void encod_gen_voic_fx(
             move16();
         }
 
-        push_indice_fx( hBstr, IND_HARM_FLAG_ACELP, harm_flag_acelp, 1 );
+        push_indice( hBstr, IND_HARM_FLAG_ACELP, harm_flag_acelp, 1 );
     }
 
     /*------------------------------------------------------------------*
@@ -240,15 +239,11 @@ void encod_gen_voic_fx(
 
         IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
         {
-            push_indice_fx( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
+            push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
         }
 
         /*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit_fx;*/
-#ifdef BASOP_NOGLOB
         hSpMusClas->lowrate_pitchGain = round_fx_o( L_mac_o( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx, &Overflow ), &Overflow ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#else
-        hSpMusClas->lowrate_pitchGain = round_fx( L_mac( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#endif
 
         /*-----------------------------------------------------------------*
          * Transform domain contribution encoding - active frames
@@ -299,13 +294,8 @@ void encod_gen_voic_fx(
         }
         gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit_fx, st_fx->clip_var_fx );
 
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_o( gain_code_fx, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
         gcode16 = round_fx_o( Lgcode, &Overflow );          /*Q0*/
-#else
-        Lgcode = L_shl( gain_code_fx, Q_new );                                                                                  /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif
 
         hLPDmem->tilt_code = Est_tilt2( &exc_fx[i_subfr_fx], gain_pit_fx, code_fx, Lgcode, &voice_fac_fx, shift ); /* Q15 */
         move16();
@@ -331,21 +321,15 @@ void encod_gen_voic_fx(
         Ltmp = L_negate( Ltmp );
         Ltmp = L_mac( Ltmp, xn_fx[L_SUBFR - 1], 16384 /*Q14*/ );       /* Q_new-1+shift+14+1 */
         Ltmp = L_msu( Ltmp, y1_fx[L_SUBFR - 1], gain_pit_fx /*Q14*/ ); /* Q_new-1+shift+14+1 */
-#ifdef BASOP_NOGLOB
-        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* 15 + Q_new */
-        hLPDmem->mem_w0 = round_fx_sat( Ltmp );    /*Q_new-1        */
+        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );                     /* 15 + Q_new */
+        hLPDmem->mem_w0 = round_fx_sat( Ltmp );                        /*Q_new-1        */
         move16();
-#else
-        Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-        hLPDmem->mem_w0 = round_fx( Ltmp ); /*Q_new-1        */
-#endif
         IF( gain_preQ_fx != 0 )
         {
             tmp1_fx = add( 16 - ( 2 + Q_AVQ_OUT_DEC + 1 ), Q_new );
 
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-#ifdef BASOP_NOGLOB
                 /* Contribution from AVQ layer */
                 Ltmp1 = L_mult_o( gain_preQ_fx, code_preQ_fx[i], &Overflow ); /* Q2 + Q6 -> Q9*/
                 Ltmp1 = L_shl_o( Ltmp1, tmp1_fx, &Overflow );                 /* Q16 + Q_exc */
@@ -354,28 +338,13 @@ void encod_gen_voic_fx(
                 Ltmp = L_shl_o( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1, &Overflow );        /* Q16 */
                 exc2_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow ); /* Q0 */
                 move16();
-#else
-                /* Contribution from AVQ layer */
-                Ltmp1 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q6 -> Q9*/
-                Ltmp1 = L_shl( Ltmp1, tmp1_fx );                 /* Q16 + Q_exc */
-
-                /* Compute exc2 */
-                Ltmp = L_shl( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );
-                exc2_fx[i + i_subfr_fx] = round_fx( L_add( Ltmp, Ltmp1 ) );
-#endif
 
                 /* code in Q9, gain_pit in Q14 */
-                Ltmp = L_mult( gcode16, code_fx[i] );                      /* Q10 */
-                Ltmp = L_shl( Ltmp, 5 );                                   /* Q15 */
-                Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /* Q15 */
-#ifdef BASOP_NOGLOB
+                Ltmp = L_mult( gcode16, code_fx[i] );                                                /* Q10 */
+                Ltmp = L_shl( Ltmp, 5 );                                                             /* Q15 */
+                Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx );                           /* Q15 */
                 Ltmp = L_shl_o( Ltmp, 1, &Overflow );                                                /* saturation can occur here Q16*/
                 exc_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow ); /* Q0 */
-#else
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-
-                exc_fx[i + i_subfr_fx] = round_fx( L_add( Ltmp, Ltmp1 ) );
-#endif
             }
         }
         ELSE
@@ -387,27 +356,22 @@ void encod_gen_voic_fx(
             FOR( i = 0; i < L_SUBFR; i++ )
             {
                 /* code in Q9, gain_pit in Q14 */
-                Ltmp = L_mult( gcode16, code_fx[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
+                Ltmp = L_mult( gcode16, code_fx[i] );                                   /* Q10 */
                 Ltmp = L_shl_o( Ltmp, 5, &Overflow );                                   /* Q15 */
                 Ltmp = L_mac_o( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx, &Overflow ); /* Q15 */
                 Ltmp = L_shl_o( Ltmp, 1, &Overflow );                                   /* saturation can occur here Q16*/
                 exc_fx[i + i_subfr_fx] = round_fx_o( Ltmp, &Overflow );                 /* Q0 */
-#else
-                Ltmp = L_shl( Ltmp, 5 );
-                Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx );
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                exc_fx[i + i_subfr_fx] = round_fx( Ltmp );
-#endif
             }
         }
+
         /*-----------------------------------------------------------------*
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
-        prep_tbe_exc_fx( L_frame, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
+        prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
                          &voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_new,
-                         T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate );
+                         T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
+                         st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
 
         /*-----------------------------------------------------------------*
          * Synthesize speech to update mem_syn[].
@@ -425,7 +389,7 @@ void encod_gen_voic_fx(
     WHILE( unbits_PI_fx > 0 )
     {
         i = s_min( unbits_PI_fx, 16 );
-        push_indice_fx( hBstr, IND_UNUSED, 0, i );
+        push_indice( hBstr, IND_UNUSED, 0, i );
         unbits_PI_fx -= i;
     }
     IF( st_fx->Opt_SC_VBR )
@@ -436,19 +400,21 @@ void encod_gen_voic_fx(
         hSC_VBR->prev_tilt_code_fx = hLPDmem->tilt_code; /* Q15 */
         move16();
     }
+
     return;
 }
 
+
 void encod_gen_voic_ivas_fx(
     Encoder_State *st_fx,              /* i/o: state structure                                  */
-    const Word16 speech_fx[],          /* i  : input speech                                     Q0*/
+    const Word16 speech_fx[],          /* i  : input speech                                     Qnew -1 */
     const Word16 Aw_fx[],              /* i  : weighted A(z) unquantized for subframes          Q12*/
     const Word16 Aq_fx[],              /* i  : 12k8 Lp coefficient                              Q12*/
     const Word16 Es_pred_fx,           /* i  : predicted scaled innov. energy                   Q8*/
     const Word16 *res_fx,              /* i  : residual signal                                  Q_new*/
-    Word16 *syn_fx,                    /* i/o: core synthesis                                   Q_new*/
-    Word16 *exc_fx,                    /* i/o: current non-enhanced excitation                  Q0*/
-    Word16 *exc2_fx,                   /* i/o: current enhanced excitation                      Q0*/
+    Word16 *syn_fx,                    /* i/o: core synthesis                                   Q_new - 1*/
+    Word16 *exc_fx,                    /* i/o: current non-enhanced excitation                  Q_new*/
+    Word16 *exc2_fx,                   /* i/o: current enhanced excitation                      Q_new*/
     Word16 *pitch_buf_fx,              /* i/o: floating pitch values for each subframe          Q6*/
     Word16 *voice_factors_fx,          /* o  : voicing factors                                  Q15*/
     Word16 *bwe_exc_fx,                /* o  : excitation for SWB TBE                           Q0*/
@@ -502,13 +468,13 @@ void encod_gen_voic_ivas_fx(
     Word16 shift_wsp;
     Word16 harm_flag_acelp;
     Word16 lp_select, lp_flag, L_frame;
+    Word16 q_h1;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
 #endif
     SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
-    SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
     LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
 
     /*------------------------------------------------------------------*
@@ -556,7 +522,12 @@ void encod_gen_voic_ivas_fx(
     set16_fx( code_preQ_fx, 0, L_SUBFR );
 
     shift_wsp = add( Q_new, shift );
-
+#ifdef TEST_HR
+    if ( LT_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) )
+    {
+        shift_wsp = sub( shift_wsp, 1 );
+    }
+#endif
     /* set and write harmonicity flag */
     harm_flag_acelp = 0;
     move16();
@@ -591,16 +562,16 @@ void encod_gen_voic_ivas_fx(
         find_targets_ivas_fx( speech_fx, hLPDmem->mem_syn, i_subfr_fx, &hLPDmem->mem_w0, p_Aq_fx,
                               res_fx, L_SUBFR, p_Aw_fx, st_fx->preemph_fac, xn_fx, cn_fx, h1_fx );
 
-        Copy_Scale_sig( h1_fx, h2_fx, L_SUBFR, -2 );  /*Q11*/
-        Scale_sig( h1_fx, L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution Q14+shift*/
-
+        q_h1 = sub( 14, norm_s( h1_fx[0] ) );
+        Copy_Scale_sig( h1_fx, h2_fx, L_SUBFR, sub( 11, q_h1 ) ); /*Q11*/
+        Scale_sig( h1_fx, L_SUBFR, sub( 14, q_h1 ) );             /* set h1[] in Q14 with scaling for convolution Q14*/
         /* scaling of xn[] to limit dynamic at 12 bits */
         Scale_sig( xn_fx, L_SUBFR, shift );
 
         *pt_pitch_fx = pit_encode_ivas_fx( hBstr, st_fx->acelp_cfg.pitch_bits, st_fx->core_brate, 0, L_frame, st_fx->coder_type, &pitch_limit_flag, i_subfr_fx, exc_fx,
-                                           L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf ); /* Q6 */
+                                           L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf, Q_new ); /* Q6 */
+        move16();
 
-        // tbe_celp_exc(L_frame, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx);
         tbe_celp_exc_ivas( st_fx->element_mode, st_fx->idchan, L_frame, L_SUBFR, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx, st_fx->tdm_LRTD_flag );
 
         /*-----------------------------------------------------------------*
@@ -634,14 +605,6 @@ void encod_gen_voic_ivas_fx(
             push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
         }
 
-        /*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit_fx;*/
-#ifdef BASOP_NOGLOB
-        hSpMusClas->lowrate_pitchGain = round_fx_o( L_mac_o( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx, &Overflow ), &Overflow ); /* Q14 */
-        move16();
-#else
-        hSpMusClas->lowrate_pitchGain = round_fx( L_mac( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#endif
-
         /*-----------------------------------------------------------------*
          * Transform domain contribution encoding - active frames
          *-----------------------------------------------------------------*/
@@ -667,18 +630,33 @@ void encod_gen_voic_ivas_fx(
 
         IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
         {
+#ifdef TEST_HR
+            gain_enc_lbr_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->coder_type, i_subfr_fx, xn_fx, y1_fx, shift_wsp, y2_fx, code_fx,
+                                  &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR );
+#else
             gain_enc_lbr_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->coder_type, i_subfr_fx, xn_fx, y1_fx, sub( shift_wsp, 1 ), y2_fx, code_fx,
                                   &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR );
+#endif
         }
         ELSE IF( GT_32( st_fx->core_brate, ACELP_32k ) )
         {
+#ifdef TEST_HR
+            gain_enc_SQ_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, i_subfr_fx, xn_fx, y1_fx, y2_fx, code_fx, Es_pred_fx,
+                                 &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, clip_gain_fx, shift_wsp );
+#else
             gain_enc_SQ_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, i_subfr_fx, xn_fx, y1_fx, y2_fx, code_fx, Es_pred_fx,
                                  &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, clip_gain_fx, sub( shift_wsp, 1 ) );
+#endif
         }
         ELSE
         {
+#ifdef TEST_HR
+            gain_enc_mless_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->element_mode, L_frame, i_subfr_fx, -1, xn_fx, y1_fx, shift_wsp, y2_fx, code_fx, Es_pred_fx,
+                                    &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, clip_gain_fx );
+#else
             gain_enc_mless_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->element_mode, L_frame, i_subfr_fx, -1, xn_fx, y1_fx, sub( shift_wsp, 1 ), y2_fx, code_fx, Es_pred_fx,
                                     &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, clip_gain_fx );
+#endif
         }
         IF( st_fx->Opt_SC_VBR )
         {
@@ -691,13 +669,8 @@ void encod_gen_voic_ivas_fx(
         }
         gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit_fx, st_fx->clip_var_fx );
 
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_o( gain_code_fx, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx_o( Lgcode, &Overflow );          /* Q0 */
-#else
-        Lgcode = L_shl( gain_code_fx, Q_new );                                                                                  /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif
+        gcode16 = round_fx_o( Lgcode, &Overflow );
 
         hLPDmem->tilt_code = est_tilt_ivas_fx( &exc_fx[i_subfr_fx], gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, Q_new, L_SUBFR, 0 ); /* Q15 */
         move16();
@@ -707,7 +680,7 @@ void encod_gen_voic_ivas_fx(
          *-----------------------------------------------------------------*/
 
         test();
-        IF( GE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) && EQ_16( st_fx->coder_type, INACTIVE ) )
+        IF( !st_fx->inactive_coder_type_flag && EQ_16( st_fx->coder_type, INACTIVE ) )
         {
             transf_cdbk_enc_ivas_fx( st_fx, 0, i_subfr_fx, cn_fx, exc_fx, p_Aq_fx, p_Aw_fx, h1_fx, xn_fx, xn2_fx, y1_fx, y2_fx,
                                      Es_pred_fx, &gain_pit_fx, gain_code_fx, g_corr_fx, clip_gain_fx, &gain_preQ_fx, code_preQ_fx, unbits_fx, Q_new, shift );
@@ -717,58 +690,53 @@ void encod_gen_voic_ivas_fx(
          * Update memory of the weighting filter
          *-----------------------------------------------------------------*/
 
+
+        /*At this point
+        xn has to be in Qnew
+        yn has to be in Qnew
+        y2_fx has to be in Q9
+        gcode16 in Q_new
+        gain_pit_fx in Q14
+        */
+        Scale_sig( xn_fx, L_SUBFR, 1 );
+        Scale_sig( y1_fx, L_SUBFR, 1 );
         /* st_fx->mem_w0 = xn[L_SUBFR-1] - (gain_pit*y1[L_SUBFR-1]) - (gain_code*y2[L_SUBFR-1]); */
-        Ltmp = L_mult0( gcode16, y2_fx[L_SUBFR - 1] ); /* Q9 */
-        Ltmp = L_shl( Ltmp, add( 5, shift ) );         // Q_new+14+shift
+        Ltmp = L_mult0( gcode16, y2_fx[L_SUBFR - 1] );
+        Ltmp = L_shl( Ltmp, add( 5, shift ) );
         Ltmp = L_negate( Ltmp );
-        Ltmp = L_mac( Ltmp, xn_fx[L_SUBFR - 1], 16384 /*Q14*/ );       // Q_new-1+15+shift
-        Ltmp = L_msu( Ltmp, y1_fx[L_SUBFR - 1], gain_pit_fx /*Q14*/ ); // Q_new-1+15+shift
-#ifdef BASOP_NOGLOB
-        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); // Q_new+15
-        hLPDmem->mem_w0 = round_fx_sat( Ltmp );    /*Q_new-1        */
+        Word32 Ltmp2 = L_mult0( xn_fx[L_SUBFR - 1], 16384 );
+        Ltmp = L_add( Ltmp, Ltmp2 );
+        Word32 Ltmp3 = L_mult0( y1_fx[L_SUBFR - 1], gain_pit_fx );
+        Ltmp = L_sub( Ltmp, Ltmp3 );
+
+        /*Ltmp is in Q14 + Qnew here
+        We need memWo in Qnew -1 */
+
+        Ltmp = L_shl( Ltmp, sub( 1, shift ) );  // Q14 + Qnew + 1
+        hLPDmem->mem_w0 = round_fx_sat( Ltmp ); /*Q_new-1        */
         move16();
-#else
-        Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-        hLPDmem->mem_w0 = round_fx( Ltmp ); /*Q_new-1        */
-#endif
         IF( gain_preQ_fx != 0 )
         {
             tmp1_fx = add( 16 - ( 2 + Q_AVQ_OUT_DEC + 1 ), Q_new );
 
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-#ifdef BASOP_NOGLOB
                 /* Contribution from AVQ layer */
-                Ltmp1 = L_mult_o( gain_preQ_fx, code_preQ_fx[i], &Overflow ); /* Q2 + Q6 -> Q9*/
-                Ltmp1 = L_shl_o( Ltmp1, tmp1_fx, &Overflow );                 /* Q16 + Q_exc */
+                Ltmp1 = L_mult_o( gain_preQ_fx, code_preQ_fx[i], &Overflow );
+                Ltmp1 = L_shl_o( Ltmp1, tmp1_fx, &Overflow );
 
                 /* Compute exc2 */
-                Ltmp = L_shl_o( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1, &Overflow );        /* Q0 */
-                exc2_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow ); /* Q0 */
+                Ltmp = L_shl_o( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1, &Overflow );
+                exc2_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow );
                 move16();
-#else
-                /* Contribution from AVQ layer */
-                Ltmp1 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q6 -> Q9*/
-                Ltmp1 = L_shl( Ltmp1, tmp1_fx );                 /* Q16 + Q_exc */
-
-                /* Compute exc2 */
-                Ltmp = L_shl( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );
-                exc2_fx[i + i_subfr_fx] = round_fx( L_add( Ltmp, Ltmp1 ) );
-#endif
 
                 /* code in Q9, gain_pit in Q14 */
-                Ltmp = L_mult( gcode16, code_fx[i] );                      /* Q10 */
-                Ltmp = L_shl( Ltmp, 5 );                                   /* Q15 */
-                Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /* Q15 */
-#ifdef BASOP_NOGLOB
-                Ltmp = L_shl_o( Ltmp, 1, &Overflow );                                                /* saturation can occur here Q16*/
-                exc_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow ); /* Q0 */
+                Ltmp = L_mult( gcode16, code_fx[i] );                        /*Qnew + 9 + 1 */
+                Ltmp = L_shl( Ltmp, 5 );                                     /*Qnew + 9+ 1+5 */
+                Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx );   /*Qnew + 14 + 1*/
+                Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /*Qnew + 14 + 1 +1  */ /* saturation can occur here Q16*/
+                exc_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow );
                 move16();
-#else
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-
-                exc_fx[i + i_subfr_fx] = round_fx( L_add( Ltmp, Ltmp1 ) );
-#endif
             }
         }
         ELSE
@@ -780,35 +748,29 @@ void encod_gen_voic_ivas_fx(
             FOR( i = 0; i < L_SUBFR; i++ )
             {
                 /* code in Q9, gain_pit in Q14 */
-                Ltmp = L_mult( gcode16, code_fx[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
-                Ltmp = L_shl_o( Ltmp, 5, &Overflow );                                   /* Q15 */
-                Ltmp = L_mac_o( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx, &Overflow ); /* Q15 */
-                Ltmp = L_shl_o( Ltmp, 1, &Overflow );                                   /* saturation can occur here Q16*/
-                exc_fx[i + i_subfr_fx] = round_fx_o( Ltmp, &Overflow );                 /* Q0 */
-#else
-                Ltmp = L_shl( Ltmp, 5 );
-                Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx );
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                exc_fx[i + i_subfr_fx] = round_fx( Ltmp );
-#endif
+                /*gcode16 in Qnew*/
+                Ltmp = L_mult( gcode16, code_fx[i] );                                   /*Qnew + 9 + 1 */
+                Ltmp = L_shl_o( Ltmp, 5, &Overflow );                                   /*Qnew + 9+ 1+5 */
+                Ltmp = L_mac_o( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx, &Overflow ); /*Qnew + 14 + 1*/
+                Ltmp = L_shl_o( Ltmp, 1, &Overflow );                                   /*Qnew + 14 + 1 +1  */
+                exc_fx[i + i_subfr_fx] = round_fx_o( Ltmp, &Overflow );
             }
         }
         /*-----------------------------------------------------------------*
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
-        prep_tbe_exc_ivas_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
-                              &voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_new,
-                              T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
-                              st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
+        prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
+                         &voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_new,
+                         T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
+                         st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
 
         /*-----------------------------------------------------------------*
          * Synthesize speech to update mem_syn[].
          * Update A(z) filters
          *-----------------------------------------------------------------*/
 
-        Syn_filt_s( 1, p_Aq_fx, M, &exc_fx[i_subfr_fx], &syn_fx[i_subfr_fx], L_SUBFR, hLPDmem->mem_syn, 1 );
+        syn_filt_fx( 1, p_Aq_fx, M, &exc_fx[i_subfr_fx], &syn_fx[i_subfr_fx], L_SUBFR, hLPDmem->mem_syn, 1 );
 
         p_Aw_fx += ( M + 1 );
         p_Aq_fx += ( M + 1 );
diff --git a/lib_enc/enc_gen_voic_rf_fx.c b/lib_enc/enc_gen_voic_rf_fx.c
index 7d1aac5af606d013baa03454f41609eb5e4d025b..e9c9d87f74bfa057d719079170b1496c85b61887 100644
--- a/lib_enc/enc_gen_voic_rf_fx.c
+++ b/lib_enc/enc_gen_voic_rf_fx.c
@@ -440,31 +440,16 @@ void coder_acelp_rf_fx(
                  * Update memory of the weighting filter
                  *-----------------------------------------------------------------*/
                 /* st_fx->_rf_mem_w0 = xn[L_SUBFR-1] - (gain_pit*y1[L_SUBFR-1]) - (gain_code*y2[L_SUBFR-1]); */
-                Ltmp = Mpy_32_16_1( gain_code, y2[L_SUBFR - 1] ); /* Q10 */
-#ifdef BASOP_NOGLOB
+                Ltmp = Mpy_32_16_1( gain_code, y2[L_SUBFR - 1] );             /* Q10 */
                 Ltmp = L_shl_o( Ltmp, add( 5, Q_xn ), &Overflow );            /* Q15 + Q_xn */
                 Ltmp = L_mac_o( Ltmp, y1[L_SUBFR - 1], gain_pit, &Overflow ); /* Q15 + Q_xn */
-#else
-                Ltmp = L_shl( Ltmp, add( 5, Q_xn ) );
-                Ltmp = L_mac( Ltmp, y1[L_SUBFR - 1], gain_pit );
-#endif
                 /* Add Gaussian contribution*/
-                Ltmp2 = Mpy_32_16_1( gain_code2, y22[L_SUBFR - 1] ); /* Q10 */
-#ifdef BASOP_NOGLOB
+                Ltmp2 = Mpy_32_16_1( gain_code2, y22[L_SUBFR - 1] );                                                          /* Q10 */
                 Ltmp2 = L_shl_o( Ltmp2, add( 5, Q_xn ), &Overflow );                                                          /* Q15 + Q_xn */
                 Ltmp = L_add_o( Ltmp, Ltmp2, &Overflow );                                                                     /* Q15 + Q_xn */
                 hRF->rf_mem_w0 = sub_o( xn[L_SUBFR - 1], round_fx_o( L_shl_o( Ltmp, 1, &Overflow ), &Overflow ), &Overflow ); /* Q_xn */
                 move16();
                 hRF->rf_mem_w0 = shr_o( hRF->rf_mem_w0, shift, &Overflow ); /*Qnew-1*/
-#else
-                Ltmp2 = L_shl( Ltmp2, add( 5, Q_xn ) );
-                Ltmp = L_add( Ltmp, Ltmp2 );
-                hRF->rf_mem_w0 = sub( xn[L_SUBFR - 1], round_fx( L_shl( Ltmp, 1 ) ) );
-                move16();
-                BASOP_SATURATE_WARNING_OFF_EVS;
-                hRF->rf_mem_w0 = shr( hRF->rf_mem_w0, shift ); /*Qnew-1*/
-                BASOP_SATURATE_WARNING_ON_EVS;
-#endif
 
 
                 /*-------------------------------------------------------*
@@ -477,34 +462,17 @@ void coder_acelp_rf_fx(
                     FOR( i = sub( tmp2, shr( L_SUBFR, 1 ) ); i < tmp2; i++ )
                     {
                         /* code in Q9, gain_pit in Q14; exc Q_new */
-                        Ltmp = Mpy_32_16_1( gain_code2, code2[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
+                        Ltmp = Mpy_32_16_1( gain_code2, code2[i] );                       /* Q10 */
                         Ltmp = L_shl_o( Ltmp, Q_new_p5, &Overflow );                      /* Q15 + Q_new */
                         Ltmp = L_mac_o( Ltmp, gain_pit, exc_rf[i + i_subfr], &Overflow ); /* Q15 + Q_new */
                         exc2[i] = round_fx_o( L_shl_o( Ltmp, 1, &Overflow ), &Overflow ); /* Q_new */
                         move16();
-#else
-                        Ltmp = L_shl( Ltmp, Q_new_p5 );
-                        Ltmp = L_mac( Ltmp, gain_pit, exc_rf[i + i_subfr] );
-                        BASOP_SATURATE_WARNING_OFF_EVS
-                        exc2[i] = round_fx( L_shl( Ltmp, 1 ) );
-                        BASOP_SATURATE_WARNING_ON_EVS
-#endif
-                        Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
+                        Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code[i] );   /* Q10 */
                         Ltmp2 = L_shl_o( Ltmp2, Q_new_p5, &Overflow );       /* Q15 + Q_new */
                         Ltmp = L_add_o( Ltmp, Ltmp2, &Overflow );            /* Q15 + Q_new */
                         Ltmp = L_shl_o( Ltmp, 1, &Overflow );                /* saturation can occur here	Q16 + Q_new*/
                         exc_rf[i + i_subfr] = round_fx_o( Ltmp, &Overflow ); /* Q_new */
                         move16();
-#else
-                        Ltmp2 = L_shl( Ltmp2, Q_new_p5 );
-                        Ltmp = L_add( Ltmp, Ltmp2 );
-                        BASOP_SATURATE_WARNING_OFF_EVS
-                        Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                        BASOP_SATURATE_WARNING_ON_EVS
-                        exc_rf[i + i_subfr] = round_fx( Ltmp );
-#endif
                     }
                     tmp2 = L_SUBFR;
                     move16();
diff --git a/lib_enc/enc_higher_acelp_fx.c b/lib_enc/enc_higher_acelp_fx.c
index 3630be38e58ed97d2c08a750cdab36562b500cf2..bf248bb5a3c0e5235e4e8f428535fac2daa6b53a 100644
--- a/lib_enc/enc_higher_acelp_fx.c
+++ b/lib_enc/enc_higher_acelp_fx.c
@@ -4,10 +4,9 @@
 #include <stdint.h>
 #include "options.h"    /* Compilation switches                   */
 #include "cnst.h"       /* Common constants                       */
-#include "prot.h"       /* Function prototypes                    */
+#include "prot_fx.h"    /* Function prototypes                    */
 #include "rom_com_fx.h" /* Static table prototypes                */
 #include "rom_com.h"    /* Static table prototypes                */
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 
 /*---------------------------------------------------------------------*
@@ -86,11 +85,7 @@ void transf_cdbk_enc_fx(
      *--------------------------------------------------------------*/
     IF( EQ_16( st_fx->coder_type, INACTIVE ) )
     {
-#ifdef BASOP_NOGLOB
         gcode16 = round_fx_o( L_shl_o( gain_code, Q_new, &Overflow ), &Overflow );
-#else
-        gcode16 = round_fx( L_shl( gain_code, Q_new ) );
-#endif
         FOR( i = 0; i < L_SUBFR; i++ )
         {
             /*x_tran[i] = xn[i] - *gain_pit * y1[i] - gain_code * y2[i];*/
@@ -98,15 +93,10 @@ void transf_cdbk_enc_fx(
             Ltmp = L_shl( Ltmp, add( 5, shift ) );
             Ltmp = L_negate( Ltmp );
             Ltmp = L_mac( Ltmp, xn[i], 16384 );
-            Ltmp = L_msu( Ltmp, y1[i], *gain_pit ); /* Q_new + 14 + shift */
-#ifdef BASOP_NOGLOB
+            Ltmp = L_msu( Ltmp, y1[i], *gain_pit );    /* Q_new + 14 + shift */
             Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* Q_new + 15 */
             x_tran[i] = round_fx_sat( Ltmp );          /*Q_new-1  */
             move16();
-#else
-            Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-            x_tran[i] = round_fx( Ltmp ); /*Q_new-1  */
-#endif
         }
         find_cn_fx( x_tran, Ap, p_Aq, x_in );
     }
@@ -154,15 +144,9 @@ void transf_cdbk_enc_fx(
     {
         /*fcorr += fx_tran[i]*(float)ix_norm[i];*/
         /*fener += (float)ix_norm[i]*(float)ix_norm[i];*/
-#ifdef BASOP_NOGLOB
         stmp = shl_sat( x_norm[i], Q_AVQ_OUT );
         L_corr = L_mac_sat( L_corr, x_tran[i], stmp );
         L_ener = L_mac_sat( L_ener, stmp, stmp );
-#else
-        stmp = shl( x_norm[i], Q_AVQ_OUT );
-        L_corr = L_mac( L_corr, x_tran[i], stmp );
-        L_ener = L_mac( L_ener, stmp, stmp );
-#endif
     }
     L_ener = L_max( L_ener, 1 );
 
@@ -183,32 +167,20 @@ void transf_cdbk_enc_fx(
     }
     m_corr = div_s( m_corr, m_ener ); /* e_corr - e_ener */
     e_corr = sub( e_corr, e_ener );
-#ifdef BASOP_NOGLOB
     Ltmp = L_shl_sat( m_corr, s_min( add( e_corr, 1 ), 31 ) ); /* Lgain in Q16 */
-#else
-    Ltmp = L_shl( m_corr, s_min( add( e_corr, 1 ), 31 ) ); /* Lgain in Q16 */
-#endif
     IF( EQ_16( st_fx->coder_type, INACTIVE ) )
     {
         Ltmp1 = L_max( gain_code, 1 );
         e_den = norm_l( Ltmp1 );
-#ifdef BASOP_NOGLOB
         m_den = extract_h( L_shl_sat( Ltmp1, e_den ) );
-#else
-        m_den = extract_h( L_shl( Ltmp1, e_den ) );
-#endif
         /* ensure m_corr < m_den */
         test();
         IF( m_corr > 0 && m_den > 0 )
         {
             m_corr = div_s( 16384, m_den );
             e_corr = sub( 14 + 4, e_den );
-            Ltmp = L_shr( Mult_32_16( Ltmp, m_corr ), e_corr ); /*Q12*/
-#ifdef BASOP_NOGLOB
+            Ltmp = L_shr( Mult_32_16( Ltmp, m_corr ), e_corr );             /*Q12*/
             stmp = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12 */
-#else
-            stmp = round_fx( L_shl( Ltmp, 16 ) );
-#endif
         }
         ELSE
         {
@@ -228,13 +200,8 @@ void transf_cdbk_enc_fx(
             index = usquant_fx( stmp, &stmp, G_AVQ_MIN_INACT_Q12, G_AVQ_DELTA_INACT_Q12 >> 1, ( 1 << G_AVQ_BITS ) ); /* Q0 */
         }
         Ltmp = Mult_32_16( gain_code, stmp ); /* Q16 * Q12 - 15 -> Q13*/
-#ifdef BASOP_NOGLOB
-        Ltmp = L_shl_sat( Ltmp, 5 );       /* Q13 -> Q18*/
-        *gain_preQ = round_fx_sat( Ltmp ); /* Q2*/
-#else
-        Ltmp = L_shl( Ltmp, 5 );       /* Q13 -> Q18*/
-        *gain_preQ = round_fx( Ltmp ); /* Q2*/
-#endif
+        Ltmp = L_shl_sat( Ltmp, 5 );          /* Q13 -> Q18*/
+        *gain_preQ = round_fx_sat( Ltmp );    /* Q2*/
     }
     ELSE
     {
@@ -275,7 +242,7 @@ void transf_cdbk_enc_fx(
         Ltmp = L_shl( Ltmp, add( e_den, 9 ) ); /* Q18*/
         *gain_preQ = round_fx( Ltmp );         /* Q2*/
     }
-    push_indice_fx( st_fx->hBstr, IND_AVQ_GAIN, index, G_AVQ_BITS );
+    push_indice( st_fx->hBstr, IND_AVQ_GAIN, index, G_AVQ_BITS );
 
     /*--------------------------------------------------------------*
      * Encode and multiplex subvectors into bit-stream
@@ -309,7 +276,7 @@ void transf_cdbk_enc_fx(
         WHILE( *unbits > 0 )
         {
             i = s_min( *unbits, 16 );
-            push_indice_fx( st_fx->hBstr, IND_UNUSED, 0, i );
+            push_indice( st_fx->hBstr, IND_UNUSED, 0, i );
             *unbits -= i;
         }
     }
@@ -320,11 +287,7 @@ void transf_cdbk_enc_fx(
 
     FOR( i = 0; i < Nsv * WIDTH_BAND; i++ )
     {
-#ifdef BASOP_NOGLOB
         x_tran[i] = shl_o( x_norm[i], Q_AVQ_OUT_DEC, &Overflow );
-#else
-        x_tran[i] = shl( x_norm[i], Q_AVQ_OUT_DEC );
-#endif
         move16();
     }
     set16_fx( x_tran + Nsv * WIDTH_BAND, 0, sub( L_SUBFR, i_mult2( WIDTH_BAND, Nsv ) ) );
@@ -360,22 +323,7 @@ void transf_cdbk_enc_fx(
     }
     st_fx->last_nq_preQ = nq[7];
     move16();
-#ifdef IVAS_CODE
-    /* TD pre-quantizer: in extreme cases at subframe boundaries, lower the preemphasis memory to avoid a saturation */
-    if ( st->element_mode > EVS_MONO && st->coder_type != INACTIVE && st->core_brate >= MIN_BRATE_AVQ_EXC && st->core_brate <= MAX_BRATE_AVQ_EXC_TD && !harm_flag_acelp && code_preQ[0] != 0 )
-    {
-        if ( (float) abs( st->last_code_preq ) > 16.0f * (float) fabs( code_preQ[0] ) )
-        {
-            st->mem_preemp_preQ /= 16;
-        }
-        else if ( (float) abs( st->last_code_preq ) > 8.0f * (float) fabs( code_preQ[0] ) )
-        {
-            st->mem_preemp_preQ /= 8;
-        }
-    }
 
-    st->last_code_preq = (int16_t) code_preQ[L_SUBFR - 1];
-#endif
     PREEMPH_FX( code_preQ, FAC_PRE_AVQ_FX, L_SUBFR, &( st_fx->mem_preemp_preQ_fx ) );
 
     /*--------------------------------------------------------------*
@@ -405,11 +353,7 @@ void transf_cdbk_enc_fx(
         updt_tar_HR_fx( cn, cn, code_preQ, *gain_preQ, sub( Q_new, add( -15 + 2, Q_AVQ_OUT_DEC ) ), L_SUBFR );
 
         updt_tar_HR_fx( xn, xn, x_tran, *gain_preQ, sub( Q_new, add( -15 + 2, Q_AVQ_OUT_DEC ) ), L_SUBFR );
-#ifdef BASOP_NOGLOB
         *gain_pit = corr_xy1_fx( xn, y1, g_corr, L_SUBFR, 0, &Overflow ); /* Q14 */
-#else
-        *gain_pit = corr_xy1_fx( xn, y1, g_corr, L_SUBFR, 0 );
-#endif
         /* clip gain if necessary to avoid problems at decoder */
         test();
         if ( EQ_16( clip_gain, 1 ) && GT_16( *gain_pit, 15565 ) )
@@ -492,11 +436,7 @@ void transf_cdbk_enc_ivas_fx(
      *--------------------------------------------------------------*/
     IF( EQ_16( st_fx->coder_type, INACTIVE ) )
     {
-#ifdef BASOP_NOGLOB
         gcode16 = round_fx_o( L_shl_o( gain_code, Q_new, &Overflow ), &Overflow );
-#else
-        gcode16 = round_fx( L_shl( gain_code, Q_new ) );
-#endif
         FOR( i = 0; i < L_SUBFR; i++ )
         {
             /*x_tran[i] = xn[i] - *gain_pit * y1[i] - gain_code * y2[i];*/
@@ -504,14 +444,9 @@ void transf_cdbk_enc_ivas_fx(
             Ltmp = L_shl( Ltmp, add( 5, shift ) );
             Ltmp = L_negate( Ltmp );
             Ltmp = L_mac( Ltmp, xn[i], 16384 );
-            Ltmp = L_msu( Ltmp, y1[i], *gain_pit ); /* Q_new + 14 + shift */
-#ifdef BASOP_NOGLOB
+            Ltmp = L_msu( Ltmp, y1[i], *gain_pit );    /* Q_new + 14 + shift */
             Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* Q_new + 15 */
             x_tran[i] = round_fx_sat( Ltmp );          /*Q_new-1  */
-#else
-            Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-            x_tran[i] = round_fx( Ltmp ); /*Q_new-1  */
-#endif
         }
         find_cn_fx( x_tran, Ap, p_Aq, x_in );
     }
@@ -559,15 +494,9 @@ void transf_cdbk_enc_ivas_fx(
     {
         /*fcorr += fx_tran[i]*(float)ix_norm[i];*/
         /*fener += (float)ix_norm[i]*(float)ix_norm[i];*/
-#ifdef BASOP_NOGLOB
         stmp = shl_sat( x_norm[i], Q_AVQ_OUT );
         L_corr = L_mac_sat( L_corr, x_tran[i], stmp );
         L_ener = L_mac_sat( L_ener, stmp, stmp );
-#else
-        stmp = shl( x_norm[i], Q_AVQ_OUT );
-        L_corr = L_mac( L_corr, x_tran[i], stmp );
-        L_ener = L_mac( L_ener, stmp, stmp );
-#endif
     }
     L_ener = L_max( L_ener, 1 );
 
@@ -588,32 +517,20 @@ void transf_cdbk_enc_ivas_fx(
     }
     m_corr = div_s( m_corr, m_ener ); /* e_corr - e_ener */
     e_corr = sub( e_corr, e_ener );
-#ifdef BASOP_NOGLOB
     Ltmp = L_shl_sat( m_corr, s_min( add( e_corr, 1 ), 31 ) ); /* Lgain in Q16 */
-#else
-    Ltmp = L_shl( m_corr, s_min( add( e_corr, 1 ), 31 ) ); /* Lgain in Q16 */
-#endif
     IF( EQ_16( st_fx->coder_type, INACTIVE ) )
     {
         Ltmp1 = L_max( gain_code, 1 );
         e_den = norm_l( Ltmp1 );
-#ifdef BASOP_NOGLOB
         m_den = extract_h( L_shl_sat( Ltmp1, e_den ) );
-#else
-        m_den = extract_h( L_shl( Ltmp1, e_den ) );
-#endif
         /* ensure m_corr < m_den */
         test();
         IF( m_corr > 0 && m_den > 0 )
         {
             m_corr = div_s( 16384, m_den );
             e_corr = sub( 14 + 4, e_den );
-            Ltmp = L_shr( Mult_32_16( Ltmp, m_corr ), e_corr ); /*Q12*/
-#ifdef BASOP_NOGLOB
+            Ltmp = L_shr( Mult_32_16( Ltmp, m_corr ), e_corr );             /*Q12*/
             stmp = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12 */
-#else
-            stmp = round_fx( L_shl( Ltmp, 16 ) );
-#endif
         }
         ELSE
         {
@@ -633,14 +550,9 @@ void transf_cdbk_enc_ivas_fx(
             index = usquant_fx( stmp, &stmp, G_AVQ_MIN_INACT_Q12, G_AVQ_DELTA_INACT_Q12 >> 1, ( 1 << G_AVQ_BITS ) ); /* Q0 */
         }
         Ltmp = Mult_32_16( gain_code, stmp ); /* Q16 * Q12 - 15 -> Q13*/
-#ifdef BASOP_NOGLOB
-        Ltmp = L_shl_sat( Ltmp, 5 );       /* Q13 -> Q18*/
-        *gain_preQ = round_fx_sat( Ltmp ); /* Q2*/
+        Ltmp = L_shl_sat( Ltmp, 5 );          /* Q13 -> Q18*/
+        *gain_preQ = round_fx_sat( Ltmp );    /* Q2*/
         move16();
-#else
-        Ltmp = L_shl( Ltmp, 5 );       /* Q13 -> Q18*/
-        *gain_preQ = round_fx( Ltmp ); /* Q2*/
-#endif
     }
     ELSE
     {
@@ -728,11 +640,7 @@ void transf_cdbk_enc_ivas_fx(
 
     FOR( i = 0; i < Nsv * WIDTH_BAND; i++ )
     {
-#ifdef BASOP_NOGLOB
         x_tran[i] = shl_o( x_norm[i], Q_AVQ_OUT_DEC, &Overflow );
-#else
-        x_tran[i] = shl( x_norm[i], Q_AVQ_OUT_DEC );
-#endif
         move16();
     }
     set16_fx( x_tran + Nsv * WIDTH_BAND, 0, sub( L_SUBFR, i_mult2( WIDTH_BAND, Nsv ) ) );
@@ -821,12 +729,8 @@ void transf_cdbk_enc_ivas_fx(
         updt_tar_HR_fx( cn, cn, code_preQ, *gain_preQ, sub( Q_new, add( -15 + 2, Q_AVQ_OUT_DEC ) ), L_SUBFR );
 
         updt_tar_HR_fx( xn, xn, x_tran, *gain_preQ, sub( Q_new, add( -15 + 2, Q_AVQ_OUT_DEC ) ), L_SUBFR );
-#ifdef BASOP_NOGLOB
         *gain_pit = corr_xy1_fx( xn, y1, g_corr, L_SUBFR, 0, &Overflow ); /* Q14 */
         move16();
-#else
-        *gain_pit = corr_xy1_fx( xn, y1, g_corr, L_SUBFR, 0 );
-#endif
         /* clip gain if necessary to avoid problems at decoder */
         test();
         if ( EQ_16( clip_gain, 1 ) && GT_16( *gain_pit, 15565 ) )
@@ -908,13 +812,8 @@ Word16 gain_quant_fx(                     /* o:  quantization index				Q0*/
     /*tmp1 = sub(c_max,c_min); Q14*/
     /*tmp2 = sub(c_gain,c_min); Q14*/
 
-#ifdef BASOP_NOGLOB
     tmp1 = msu_r_sat( L_deposit_h( c_max /*in Q13 already*/ ), c_min, 16384 );  /*Q13*/
     tmp2 = msu_r_sat( L_deposit_h( c_gain /*in Q13 already*/ ), c_min, 16384 ); /*Q13*/
-#else
-    tmp1 = msu_r( L_deposit_h( c_max /*in Q13 already*/ ), c_min, 16384 );  /*Q13*/
-    tmp2 = msu_r( L_deposit_h( c_gain /*in Q13 already*/ ), c_min, 16384 ); /*Q13*/
-#endif
     IF( tmp1 != 0 )
     {
         exp = norm_s( tmp1 );
diff --git a/lib_enc/enc_nelp_fx.c b/lib_enc/enc_nelp_fx.c
index aedb1d2c2efda7795e84356d24d205564498b5e4..c3eb2ae189911eb524d0ed32b015b0a58959554d 100644
--- a/lib_enc/enc_nelp_fx.c
+++ b/lib_enc/enc_nelp_fx.c
@@ -145,11 +145,7 @@ void encod_nelp_fx(
      * Updates: last value of new target is stored in mem_w0
      *-----------------------------------------------------------------*/
 
-#ifdef BASOP_NOGLOB
     hLPDmem->mem_w0 = sub_sat( shr_sat( xn_fx[L_SUBFR - 1], shift ), shr( exc_fx[L_FRAME - 1], 1 ) );
-#else
-    hLPDmem->mem_w0 = sub( shr( xn_fx[L_SUBFR - 1], shift ), shr( exc_fx[L_FRAME - 1], 1 ) );
-#endif
     move16(); /*Q_new-1 */
     hLPDmem->tilt_code = 0;
     move16();                                        /* purely unvoiced */
@@ -289,11 +285,7 @@ void encod_nelp_ivas_fx(
      * Updates: last value of new target is stored in mem_w0
      *-----------------------------------------------------------------*/
 
-#ifdef BASOP_NOGLOB
     hLPDmem->mem_w0 = sub_sat( shr_sat( xn_fx[L_SUBFR - 1], shift ), shr( exc_fx[L_FRAME - 1], 1 ) );
-#else
-    hLPDmem->mem_w0 = sub( shr( xn_fx[L_SUBFR - 1], shift ), shr( exc_fx[L_FRAME - 1], 1 ) );
-#endif
     move16(); /*Q_new-1 */
     hLPDmem->tilt_code = 0;
     move16(); /* purely unvoiced */
diff --git a/lib_enc/enc_pit_exc_fx.c b/lib_enc/enc_pit_exc_fx.c
index 54674da1e884ace3f39577d89a47d6c2a62cb795..bfdf46ea07a7db5a2b3c6db64020d48167b02455 100644
--- a/lib_enc/enc_pit_exc_fx.c
+++ b/lib_enc/enc_pit_exc_fx.c
@@ -6,7 +6,6 @@
 #include "cnst.h"        /* Common constants                       */
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -251,13 +250,8 @@ void enc_pit_exc_fx(
          *----------------------------------------------------------------*/
         Copy( &res[i_subfr], &exc[i_subfr], L_subfr ); /* Q_new */
                                                        /* condition on target (compared to float) has been put outside the loop */
-#if 1                                                  // ndef BUG_FIX
         find_targets_fx( speech, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq,
                          res, L_subfr, p_Aw, st_fx->preemph_fac, xn, cn, h1 );
-#else
-        find_targets_fx( speech, hGSCEnc->mem_syn_tmp_fx, i_subfr, &hLPDmem->mem_w0, p_Aq, /*_DIFF_FLOAT_FIX_  --> Here I think mem_syn_tmp_fx should be used  */
-                         res, L_subfr, p_Aw, st_fx->preemph_fac, xn, cn, h1 );
-#endif
         Copy_Scale_sig( h1, h2, L_subfr, -2 );     /* Q13 */
         Scale_sig( h1, L_subfr, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
 
@@ -292,15 +286,11 @@ void enc_pit_exc_fx(
 
         IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
         {
-            push_indice_fx( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
+            push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
         }
 
         /*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit;*/
-#ifdef BASOP_NOGLOB
         hSpMusClas->lowrate_pitchGain = round_fx_o( L_mac_o( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit, &Overflow ), &Overflow ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#else
-        hSpMusClas->lowrate_pitchGain = round_fx( L_mac( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#endif
 
         gpit_tmp = gain_pit;
         move16(); /*Q14*/
@@ -317,12 +307,12 @@ void enc_pit_exc_fx(
             IF( GE_32( st_fx->core_brate, MIN_RATE_FCB ) )
             {
                 pit_idx = vquant_fx( &gain_pit, mean_gp_fx, &gain_pit, dic_gp_fx, 1, 32 ); /* Q0 */
-                push_indice_fx( hBstr, IND_PIT_IDX, pit_idx, 5 );
+                push_indice( hBstr, IND_PIT_IDX, pit_idx, 5 );
             }
             ELSE
             {
                 pit_idx = vquant_fx( &gain_pit, mean_gp_fx, &gain_pit, dic_gp_fx, 1, 16 ); /* Q0 */
-                push_indice_fx( hBstr, IND_PIT_IDX, pit_idx, 4 );
+                push_indice( hBstr, IND_PIT_IDX, pit_idx, 4 );
             }
         }
         else if ( use_fcb == 2 )
@@ -333,7 +323,7 @@ void enc_pit_exc_fx(
 
             inov_encode_fx( st_fx, st_fx->core_brate, 0, st_fx->L_frame, st_fx->last_L_frame, GENERIC, st_fx->bwidth, 0, i_subfr, -1, p_Aq,
                             gain_pit, cn, exc, h2, st_fx->hLPDmem->tilt_code, *pt_pitch, xn2, code, y2, &unbits_PI, 2 * L_SUBFR, shift );
-            // PMT("code to be validated")
+
             /*-----------------------------------------------------------------*
              * Gain encoding
              *-----------------------------------------------------------------*/
@@ -356,13 +346,8 @@ void enc_pit_exc_fx(
         }
         gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
 
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
         gcode16 = round_fx_sat( Lgcode );
-#else
-        Lgcode = L_shl( gain_code, Q_new );                                                                                  /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif
         IF( use_fcb != 0 )
         {
             hLPDmem->tilt_code = Est_tilt2( &exc[i_subfr], gain_pit, code, Lgcode, &voice_fac, shift ); /* Q15 */
@@ -378,8 +363,7 @@ void enc_pit_exc_fx(
          *-----------------------------------------------------------------*/
         IF( use_fcb != 0 )
         {
-            Ltmp = L_mult( gcode16, y2[L_subfr - 1] ); /* Q10 + Q_new */
-#ifdef BASOP_NOGLOB
+            Ltmp = L_mult( gcode16, y2[L_subfr - 1] );          /* Q10 + Q_new */
             Ltmp = L_shl_o( Ltmp, add( 5, shift ), &Overflow ); /* Q15 + Q_new + shift */
             Ltmp = L_negate( Ltmp );
             Ltmp = L_mac_o( Ltmp, xn[L_subfr - 1], 16384, &Overflow );    /* Q_new + Q15 + shift */
@@ -387,29 +371,14 @@ void enc_pit_exc_fx(
             Ltmp = L_shl_o( Ltmp, sub( 1, shift ), &Overflow );           /* Q_new + 15 */
             hLPDmem->mem_w0 = round_fx_o( Ltmp, &Overflow );              /*Q_new-1         */
             move16();
-#else
-            Ltmp = L_mult( gcode16, y2[L_subfr - 1] );
-            Ltmp = L_shl( Ltmp, add( 5, shift ) );
-            Ltmp = L_negate( Ltmp );
-            Ltmp = L_mac( Ltmp, xn[L_subfr - 1], 16384 );
-            Ltmp = L_msu( Ltmp, y1[L_subfr - 1], gain_pit );
-            Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-            hLPDmem->mem_w0 = round_fx( Ltmp ); /*Q_new-1         */
-#endif
         }
         ELSE
         {
-            Ltmp = L_mult( xn[L_subfr - 1], 16384 ); /* Q_new + 14 -shift */
-#ifdef BASOP_NOGLOB
+            Ltmp = L_mult( xn[L_subfr - 1], 16384 );             /* Q_new + 14 -shift */
             Ltmp = L_msu_sat( Ltmp, y1[L_subfr - 1], gain_pit ); /* Q_new + 14 -shift */
             Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );           /* Q_new + 15 */
             hLPDmem->mem_w0 = round_fx_sat( Ltmp );              /*Q_new-1         */
             move16();
-#else
-            Ltmp = L_msu( Ltmp, y1[L_subfr - 1], gain_pit );
-            Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-            hLPDmem->mem_w0 = round_fx( Ltmp ); /*Q_new-1         */
-#endif
         }
 
         /*-----------------------------------------------------------------*
@@ -421,20 +390,12 @@ void enc_pit_exc_fx(
             FOR( i = 0; i < L_subfr; i++ )
             {
                 /* code in Q9, gain_pit in Q14 */
-                Ltmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef BASOP_NOGLOB
+                Ltmp = L_mult( gcode16, code[i] );                             /* Q10 + Q_new */
                 Ltmp = L_shl_o( Ltmp, 5, &Overflow );                          /* Q15 + Q_new */
                 Ltmp = L_mac_o( Ltmp, exc[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
                 Ltmp = L_shl_o( Ltmp, 1, &Overflow );                          /* saturation can occur here		Q_new + Q16*/
                 exc[i + i_subfr] = round_fx_o( Ltmp, &Overflow );              /* Q_new */
                 move16();
-#else
-                Ltmp = L_mult( gcode16, code[i] );
-                Ltmp = L_shl( Ltmp, 5 );
-                Ltmp = L_mac( Ltmp, exc[i + i_subfr], gain_pit );
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                exc[i + i_subfr] = round_fx( Ltmp );
-#endif
             }
         }
         ELSE
@@ -443,13 +404,8 @@ void enc_pit_exc_fx(
             {
 
                 Ltmp = L_mult( exc[i + i_subfr], gain_pit ); /* Q15 + Q_new */
-#ifdef BASOP_NOGLOB
-                Ltmp = L_shl_sat( Ltmp, 1 );             /* saturation can occur here	Q16 + Q_new */
-                exc[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
-#else
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                exc[i + i_subfr] = round_fx( Ltmp );
-#endif
+                Ltmp = L_shl_sat( Ltmp, 1 );                 /* saturation can occur here	Q16 + Q_new */
+                exc[i + i_subfr] = round_fx_sat( Ltmp );     /* Q_new */
             }
         }
 
@@ -561,11 +517,7 @@ void enc_pit_exc_fx(
         }
     }
 
-#ifdef BASOP_NOGLOB
-    cum_gpit = shl_o( cum_gpit, 1, &Overflow ); /*Q15*/
-#else                                           /* BASOP_NOGLOB */
-    cum_gpit = shl( cum_gpit, 1 );                                                                                           /*Q15*/
-#endif
+    cum_gpit = shl_o( cum_gpit, 1, &Overflow );                          /*Q15*/
     *gpit = round_fx( L_mac( L_mult( 3277, *gpit ), 29491, cum_gpit ) ); /*Q15*/
 }
 
@@ -592,20 +544,20 @@ void enc_pit_exc_ivas_fx(
     Word16 xn[PIT_EXC_L_SUBFR];             /* Target vector for pitch search    */
     Word16 xn2[PIT_EXC_L_SUBFR];            /* Target vector for codebook search */
     Word16 h1[PIT_EXC_L_SUBFR + ( M + 1 )]; /* Impulse response vector           */
-    Word16 y1[PIT_EXC_L_SUBFR];             /* Filtered adaptive excitation      */
-    Word16 code[2 * L_SUBFR];               /* Fixed codebook excitation         */
-    Word16 y2[2 * L_SUBFR];                 /* Filtered algebraic excitation     */
-    Word16 voice_fac;                       /* Voicing factor                    */
-    Word32 gain_code;                       /* Gain of code                      */
-    Word16 gain_inov;                       /* inovation gain                    */
-    Word16 gain_pit;                        /* Pitch gain                        */
-    Word16 pit_idx, i_subfr;                /* tmp variables                     */
-    Word16 T0_min, T0_max;                  /* pitch variables                   */
-    Word16 g_corr[10];                      /* ACELP correlation values + gain pitch */
-    Word16 clip_gain, i;                    /* LSF clip gain and LP flag         */
-    const Word16 *p_Aw, *p_Aq;              /* pointer to LP filter coefficient vector */
-    Word16 cn1[PIT_EXC_L_SUBFR], *cn;       /* (Used only when L_subfr == L_SUBFR) Target vector in residual domain  */
-    Word16 *pt_pitch;                       /* pointer to floating pitch         */
+    Word16 cn[PIT_EXC_L_SUBFR];
+    Word16 y1[PIT_EXC_L_SUBFR]; /* Filtered adaptive excitation      */
+    Word16 code[2 * L_SUBFR];   /* Fixed codebook excitation         */
+    Word16 y2[2 * L_SUBFR];     /* Filtered algebraic excitation     */
+    Word16 voice_fac;           /* Voicing factor                    */
+    Word32 gain_code;           /* Gain of code                      */
+    Word16 gain_inov;           /* inovation gain                    */
+    Word16 gain_pit;            /* Pitch gain                        */
+    Word16 pit_idx, i_subfr;    /* tmp variables                     */
+    Word16 T0_min, T0_max;      /* pitch variables                   */
+    Word16 g_corr[10];          /* ACELP correlation values + gain pitch */
+    Word16 clip_gain, i;        /* LSF clip gain and LP flag         */
+    const Word16 *p_Aw, *p_Aq;  /* pointer to LP filter coefficient vector */
+    Word16 *pt_pitch;           /* pointer to floating pitch         */
     Word16 L_subfr;
     Word16 cum_gpit, gpit_tmp;
     Word32 Local_BR, Pitch_BR;
@@ -621,7 +573,7 @@ void enc_pit_exc_ivas_fx(
     Word16 use_fcb;
     Word32 gc_mem[NB_SUBFR - 1]; /* gain_code from previous subframes */
     Word16 gp_mem[NB_SUBFR - 1]; /* gain_pitch from previous subframes*/
-    SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
+    Word16 q_h1;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
     GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
     LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
@@ -642,9 +594,7 @@ void enc_pit_exc_ivas_fx(
     move16();
     Pitch_CT = GENERIC;
     move16();
-#ifdef MSAN_FIX
-    set16_fx( cn1, 0, PIT_EXC_L_SUBFR );
-#endif
+    set16_fx( cn, 0, PIT_EXC_L_SUBFR );
     test();
     test();
     IF( st_fx->GSC_IVAS_mode > 0 && ( st_fx->GSC_noisy_speech || GT_32( st_fx->core_brate, GSC_H_RATE_STG ) ) )
@@ -754,13 +704,6 @@ void enc_pit_exc_ivas_fx(
     /*------------------------------------------------------------------*
      * ACELP subframe loop
      *------------------------------------------------------------------*/
-    cn = NULL;
-    test();
-    if ( EQ_16( L_subfr, L_SUBFR ) || EQ_16( L_subfr, L_SUBFR * 2 ) )
-    {
-        cn = cn1;
-        move16();
-    }
     p_Aw = Aw;
 
     p_Aq = Aq;
@@ -781,8 +724,8 @@ void enc_pit_exc_ivas_fx(
         find_targets_ivas_fx( speech, hGSCEnc->mem_syn_tmp_fx, i_subfr, &hGSCEnc->mem_w0_tmp_fx, p_Aq,
                               res, L_subfr, p_Aw, st_fx->preemph_fac, xn, cn, h1 );
 
-        Copy_Scale_sig( h1, h2, L_subfr, -2 );     /* Q13 */
-        Scale_sig( h1, L_subfr, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
+        q_h1 = sub( 14, norm_s( h1[0] ) );
+        Copy_Scale_sig( h1, h2, L_subfr, sub( 11, q_h1 ) ); /*Q11*/
 
         /* scaling of xn[] to limit dynamic at 12 bits */
         Scale_sig( xn, L_subfr, shift ); /* Q_new - 1 + shift */
@@ -791,9 +734,12 @@ void enc_pit_exc_ivas_fx(
          * Close-loop pitch search and quantization
          * Adaptive exc. construction
          *----------------------------------------------------------------*/
+
         *pt_pitch = pit_encode_ivas_fx( hBstr, st_fx->acelp_cfg.pitch_bits, Pitch_BR, 0, st_fx->L_frame, Pitch_CT, &pitch_limit_flag, i_subfr, exc,
-                                        L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf ); /* Q6 */
+                                        L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf, Q_new ); /* Q6 */
         move16();
+        Scale_sig( h1, L_subfr, sub( 14, q_h1 ) ); /* set h1[] in Q14 with scaling for convolution Q14*/
+
         /*-----------------------------------------------------------------*
          * Find adaptive exitation
          *-----------------------------------------------------------------*/
@@ -810,21 +756,14 @@ void enc_pit_exc_ivas_fx(
          * Codebook target computation
          * (No LP filtering of the adaptive excitation)
          *-----------------------------------------------------------------*/
-
         lp_select = lp_filt_exc_enc_ivas_fx( MODE1, AUDIO, i_subfr, exc, h1,
                                              xn, y1, xn2, L_subfr, st_fx->L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
-
         IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
         {
             push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
         }
 
-        /*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit;*/
-#ifdef BASOP_NOGLOB
-        hSpMusClas->lowrate_pitchGain = round_fx_o( L_mac_o( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit, &Overflow ), &Overflow ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#else
-        hSpMusClas->lowrate_pitchGain = round_fx( L_mac( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#endif
+        st_fx->hSpMusClas->lowrate_pitchGain = mac_r( L_mult( 29491 /* 0.9 in Q15 */, st_fx->hSpMusClas->lowrate_pitchGain ), 3277 /* 0.1 in Q15 */, gain_pit ); /* Q14 */
 
         gpit_tmp = gain_pit;
         move16(); /*Q14*/
@@ -855,10 +794,9 @@ void enc_pit_exc_ivas_fx(
              * Innovation encoding
              *-----------------------------------------------------------------*/
 
-
             inov_encode_ivas_fx( st_fx, st_fx->core_brate, 0, st_fx->L_frame, st_fx->last_L_frame, GENERIC, st_fx->bwidth, 0, i_subfr, -1, p_Aq,
                                  gain_pit, cn, exc, h2, st_fx->hLPDmem->tilt_code, *pt_pitch, xn2, code, y2, &unbits_PI, 2 * L_SUBFR, shift, Q_new );
-            // PMT("code to be validated")
+
             /*-----------------------------------------------------------------*
              * Gain encoding
              *-----------------------------------------------------------------*/
@@ -881,13 +819,8 @@ void enc_pit_exc_ivas_fx(
         }
         gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
 
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
         gcode16 = round_fx_sat( Lgcode );
-#else
-        Lgcode = L_shl( gain_code, Q_new );                                                                                  /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif
         IF( use_fcb != 0 )
         {
             hLPDmem->tilt_code = est_tilt_ivas_fx( &exc[i_subfr], gain_pit, code, gain_code, &voice_fac, Q_new, L_SUBFR, 0 ); // Q15
@@ -904,35 +837,19 @@ void enc_pit_exc_ivas_fx(
         IF( use_fcb != 0 )
         {
             Ltmp = L_mult0( gcode16, y2[L_subfr - 1] );
-#ifdef BASOP_NOGLOB
             Ltmp = L_shl_o( Ltmp, add( 5, shift ), &Overflow ); // Q_new+14+shift
             Ltmp = L_negate( Ltmp );
             Ltmp = L_mac_o( Ltmp, xn[L_subfr - 1], 16384, &Overflow );    // Q_new-1+15+shift
             Ltmp = L_msu_o( Ltmp, y1[L_subfr - 1], gain_pit, &Overflow ); // Q_new-1+15+shift
             Ltmp = L_shl_o( Ltmp, sub( 1, shift ), &Overflow );           // Q_new+15
             hGSCEnc->mem_w0_tmp_fx = round_fx_o( Ltmp, &Overflow );       /*Q_new-1         */
-#else
-            Ltmp = L_mult( gcode16, y2[L_subfr - 1] );
-            Ltmp = L_shl( Ltmp, add( 5, shift ) );
-            Ltmp = L_negate( Ltmp );
-            Ltmp = L_mac( Ltmp, xn[L_subfr - 1], 16384 );
-            Ltmp = L_msu( Ltmp, y1[L_subfr - 1], gain_pit );
-            Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-            hGSCEnc->mem_w0_tmp_fx = round_fx( Ltmp ); /*Q_new-1         */
-#endif
         }
         ELSE
         {
-            Ltmp = L_mult( xn[L_subfr - 1], 16384 ); // Q_new-1+15+shift
-#ifdef BASOP_NOGLOB
+            Ltmp = L_mult( xn[L_subfr - 1], 16384 );             // Q_new-1+15+shift
             Ltmp = L_msu_sat( Ltmp, y1[L_subfr - 1], gain_pit ); // Q_new-1+15+shift
             Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );           // Q_new+15
             hGSCEnc->mem_w0_tmp_fx = round_fx_sat( Ltmp );       /*Q_new-1         */
-#else
-            Ltmp = L_msu( Ltmp, y1[L_subfr - 1], gain_pit );
-            Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-            hGSCEnc->mem_w0_tmp_fx = round_fx( Ltmp ); /*Q_new-1         */
-#endif
         }
 
         /*-----------------------------------------------------------------*
@@ -944,20 +861,12 @@ void enc_pit_exc_ivas_fx(
             FOR( i = 0; i < L_subfr; i++ )
             {
                 /* code in Q9, gain_pit in Q14 */
-                Ltmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef BASOP_NOGLOB
+                Ltmp = L_mult( gcode16, code[i] );                             /* Q10 + Q_new */
                 Ltmp = L_shl_o( Ltmp, 5, &Overflow );                          /* Q15 + Q_new */
                 Ltmp = L_mac_o( Ltmp, exc[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
                 Ltmp = L_shl_o( Ltmp, 1, &Overflow );                          /* saturation can occur here Q16 + Q_new */
                 exc[i + i_subfr] = round_fx_o( Ltmp, &Overflow );              /* Q_new */
                 move16();
-#else
-                Ltmp = L_mult( gcode16, code[i] );
-                Ltmp = L_shl( Ltmp, 5 );
-                Ltmp = L_mac( Ltmp, exc[i + i_subfr], gain_pit );
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                exc[i + i_subfr] = round_fx( Ltmp );
-#endif
             }
         }
         ELSE
@@ -966,14 +875,9 @@ void enc_pit_exc_ivas_fx(
             {
 
                 Ltmp = L_mult( exc[i + i_subfr], gain_pit ); /* Q15 + Q_new */
-#ifdef BASOP_NOGLOB
-                Ltmp = L_shl_sat( Ltmp, 1 );             /* saturation can occur here	Q16 + Q_new */
-                exc[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
+                Ltmp = L_shl_sat( Ltmp, 1 );                 /* saturation can occur here	Q16 + Q_new */
+                exc[i + i_subfr] = round_fx_sat( Ltmp );     /* Q_new */
                 move16();
-#else
-                Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                exc[i + i_subfr] = round_fx( Ltmp );
-#endif
             }
         }
 
@@ -1085,10 +989,6 @@ void enc_pit_exc_ivas_fx(
         }
     }
 
-#ifdef BASOP_NOGLOB
-    cum_gpit = shl_o( cum_gpit, 1, &Overflow ); /*Q15*/
-#else                                           /* BASOP_NOGLOB */
-    cum_gpit = shl( cum_gpit, 1 ); /*Q15*/
-#endif
+    cum_gpit = shl_o( cum_gpit, 1, &Overflow );                          /*Q15*/
     *gpit = round_fx( L_mac( L_mult( 3277, *gpit ), 29491, cum_gpit ) ); /*Q15*/
 }
diff --git a/lib_enc/enc_ppp_fx.c b/lib_enc/enc_ppp_fx.c
index f1a87d2d296ec128e7aa823519ec942206c2f42e..9d1ffad606de1ad414a8a6249fef35c5763a38b1 100644
--- a/lib_enc/enc_ppp_fx.c
+++ b/lib_enc/enc_ppp_fx.c
@@ -189,12 +189,11 @@ ivas_error encod_ppp_fx(
 
         /* We write signalling indices again only in case of bump_up */
         /* delete previous indices */
-#ifndef IVAS_CODE_BITSTREAM
-        reset_indices_enc_fx( hBstr );
-#else
+#ifdef HARM_PUSH_BIT
         reset_indices_enc_fx( hBstr, hBstr->nb_ind_tot );
+#else
+        reset_indices_enc_fx( hBstr, MAX_NUM_INDICES );
 #endif
-
         /* signalling matrix (writing of signalling bits) */
         signalling_enc_fx( st_fx );
     }
@@ -377,12 +376,11 @@ ivas_error encod_ppp_ivas_fx(
 
         /* We write signalling indices again only in case of bump_up */
         /* delete previous indices */
-#ifndef IVAS_CODE_BITSTREAM
-        reset_indices_enc_fx( hBstr );
-#else
+#ifdef HARM_PUSH_BIT
         reset_indices_enc_fx( hBstr, hBstr->nb_ind_tot );
+#else
+        reset_indices_enc_fx( hBstr, MAX_NUM_INDICES );
 #endif
-
         /* signalling matrix (writing of signalling bits) */
         signalling_enc_fx( st_fx );
     }
diff --git a/lib_enc/enc_prm.c b/lib_enc/enc_prm.c
deleted file mode 100644
index 6c6ade036529b72b8094b3e06bc1ccb654ef6094..0000000000000000000000000000000000000000
--- a/lib_enc/enc_prm.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-
-/*-------------------------------------------------------------------*
- * writeTCXMode_fx()
- *
- * write TCX mode
- *--------------------------------------------------------------------*/
-
-void writeTCXMode_fx(
-    Encoder_State *st,     /* i/o: encoder state structure					*/
-    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle							*/
-    const Word16 MCT_flag, /* i  : hMCT handle allocated (1) or not (0)		Q0*/
-    Word16 *nbits_start    /* o  : nbits start								Q0*/
-)
-{
-    UWord16 index;
-    Word16 idx, start_idx;
-    Word16 nBits;
-
-    IF( st->tcxonly )
-    {
-        push_next_indice( hBstr, (UWord16) EQ_16( st->core, TCX_10_CORE ), 1 );
-
-        test();
-        IF( EQ_16( st->clas, UNVOICED_CLAS ) )
-        {
-            index = 0;
-            move16();
-        }
-        ELSE IF( EQ_16( st->clas, VOICED_TRANSITION ) || EQ_16( st->clas, UNVOICED_TRANSITION ) )
-        {
-            index = 1;
-            move16();
-        }
-        ELSE IF( EQ_16( st->clas, VOICED_CLAS ) )
-        {
-            index = 2;
-            move16();
-        }
-        ELSE
-        {
-            index = 3;
-            move16();
-        }
-
-        push_next_indice( hBstr, index, 2 );
-
-        test();
-        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && !MCT_flag )
-        {
-            push_next_indice( hBstr, st->vad_flag, 1 );
-        }
-    }
-    ELSE
-    {
-        IF( EQ_16( st->core, ACELP_CORE ) )
-        {
-            /* write the RF signaling information */
-            IF( EQ_16( st->rf_mode, 1 ) )
-            {
-                /* find the section in the ACELP signaling table corresponding to bitrate */
-                idx = 0;
-                move16();
-                WHILE( NE_32( acelp_sig_tbl[idx], st->total_brate ) ) /* total bitrate is kept at 13.2kbps */
-                {
-                    idx = add( idx, 1 );
-                }
-
-                /* retrieve the number of bits for signaling */
-                idx = add( idx, 1 );                     /* Q0 */
-                nBits = extract_l( acelp_sig_tbl[idx] ); /* Q0 */
-
-                /* retrieve the signaling index */
-                idx = add( idx, 1 );
-                start_idx = idx;
-                move16();
-                WHILE( NE_32( acelp_sig_tbl[idx], SIG2IND( st->coder_type, st->bwidth, st->sharpFlag, st->rf_mode ) ) )
-                {
-                    idx = add( idx, 1 );
-                }
-                push_next_indice( hBstr, sub( idx, start_idx ), nBits );
-                push_next_indice( hBstr, 0, 1 ); /* Indicate to the decoder that the core is ACELP*/
-                *nbits_start = 3;
-                move16();
-            }
-            ELSE
-            {
-                push_next_indice( hBstr, st->coder_type, 3 );
-            }
-        }
-        ELSE
-        {
-            IF( EQ_16( st->mdct_sw, MODE1 ) )
-            {
-                /* 2 bits instead of 3 as TCX is already signaled */
-                push_next_indice( hBstr, st->hTcxCfg->coder_type, 2 );
-            }
-            ELSE
-            {
-                IF( EQ_16( st->mdct_sw_enable, MODE2 ) )
-                {
-                    push_next_indice( hBstr, 1, 1 ); /* TCX */
-                    push_next_indice( hBstr, 0, 1 ); /* not HQ_CORE */
-                    push_next_indice( hBstr, st->hTcxCfg->coder_type, 2 );
-                }
-                ELSE
-                {
-                    /*write the RF signaling information*/
-                    IF( EQ_16( st->rf_mode, 1 ) )
-                    {
-                        /* find the section in the ACELP signaling table corresponding to bitrate */
-                        idx = 0;
-                        move16();
-                        WHILE( NE_32( acelp_sig_tbl[idx], st->total_brate ) )
-                        {
-                            idx = add( idx, 1 );
-                        }
-
-                        /* retrieve the number of bits for signaling */
-                        idx = add( idx, 1 );
-                        nBits = extract_l( acelp_sig_tbl[idx] );
-
-                        test();
-                        test();
-                        IF( EQ_16( st->hTcxCfg->coder_type, VOICED ) || EQ_16( st->hTcxCfg->coder_type, GENERIC ) || EQ_16( st->hTcxCfg->coder_type, TRANSITION ) )
-                        {
-                            st->sharpFlag = 1;
-                            move16();
-                        }
-                        ELSE
-                        {
-                            st->sharpFlag = 0;
-                            move16();
-                        }
-
-                        /* retrieve the signaling index */
-                        idx = add( idx, 1 );
-                        start_idx = idx;
-                        move16();
-                        WHILE( NE_32( acelp_sig_tbl[idx], SIG2IND( st->hTcxCfg->coder_type, st->bwidth, st->sharpFlag, st->rf_mode ) ) )
-                        {
-                            idx = add( idx, 1 );
-                        }
-                        push_next_indice( hBstr, sub( idx, start_idx ), nBits );
-                        push_next_indice( hBstr, 1, 1 ); /* Indicate to the decoder that the core is TCX*/
-                        *nbits_start = 3;
-                        move16();
-                    }
-                    ELSE
-                    {
-                        push_next_indice( hBstr, add( ACELP_MODE_MAX, st->hTcxCfg->coder_type ), 3 );
-                    }
-                }
-            }
-        }
-    }
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * writeTCXWindowing_fx()
- *
- * write TCX transform type
- *-------------------------------------------------------------------*/
-
-void writeTCXWindowing_fx(
-    BSTR_ENC_HANDLE hBstr,    /* i/o: bitstream handle        */
-    const Word16 overlap_mode /* i  : overlap mode            Q0*/
-)
-{
-
-    IF( EQ_16( overlap_mode, MIN_OVERLAP ) )
-    {
-        push_next_indice( hBstr, 2, 2 );
-    }
-    ELSE IF( EQ_16( overlap_mode, HALF_OVERLAP ) )
-    {
-        push_next_indice( hBstr, 3, 2 );
-    }
-    ELSE
-    {
-        push_next_indice( hBstr, 0, 1 );
-    }
-
-    return;
-}
diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c
index d394fa2d3acbf5703f33934fcbf011e214f0b7a7..6d6a2d575ac9f262d0817f60ef4cfa4232a5b9d4 100644
--- a/lib_enc/enc_prm_fx.c
+++ b/lib_enc/enc_prm_fx.c
@@ -11,8 +11,7 @@
 #include "rom_com_fx.h"
 #include "rom_com.h"
 #include "stl.h"
-//#include "prot_fx.h"
-#include "prot_fx.h"     /* Function prototypes                    */
+#include "prot_fx.h"
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 
@@ -34,7 +33,7 @@ static void enc_prm_hm(
     }
 
     /* Flag */
-    push_next_indice_fx( hBstr, prm_hm[0], 1 );
+    push_next_indice( hBstr, prm_hm[0], 1 );
 
     IF( prm_hm[0] )
     {
@@ -51,7 +50,7 @@ static void enc_prm_hm(
         IF( EQ_16( st->hTcxCfg->coder_type, VOICED ) )
         {
             /* Gain index */
-            push_next_indice_fx( hBstr, prm_hm[2], kTcxHmNumGainBits );
+            push_next_indice( hBstr, prm_hm[2], kTcxHmNumGainBits );
         }
     }
 }
@@ -153,7 +152,7 @@ void enc_prm_rf_ivas_fx(
             index = 3;
             move16();
         }
-        push_next_indice_fx( hBstr, index, 2 );
+        push_next_indice( hBstr, index, 2 );
 
         IF( EQ_16( rf_frame_type, RF_TCXFD ) )
         {
@@ -297,9 +296,9 @@ void enc_prm_rf_fx(
         /* LSF indices */
         IF( EQ_16( rf_frame_type, RF_TCXFD ) )
         {
-            push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][0], lsf_numbits[0] ); /* VQ 1 */
-            push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][1], lsf_numbits[1] ); /* VQ 2 */
-            push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][2], lsf_numbits[2] ); /* VQ 3 */
+            push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][0], lsf_numbits[0] ); /* VQ 1 */
+            push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][1], lsf_numbits[1] ); /* VQ 2 */
+            push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][2], lsf_numbits[2] ); /* VQ 3 */
         }
 
         /* classification */
@@ -325,12 +324,12 @@ void enc_prm_rf_fx(
             index = 3;
             move16();
         }
-        push_next_indice_fx( hBstr, index, 2 );
+        push_next_indice( hBstr, index, 2 );
 
         IF( EQ_16( rf_frame_type, RF_TCXFD ) )
         {
             /* TCX global gain  = 7 bits */
-            push_next_indice_fx( hBstr, hRF->rf_gain_tcx[fec_offset], 7 );
+            push_next_indice( hBstr, hRF->rf_gain_tcx[fec_offset], 7 );
             /*window info
             1 bit for long overlap
             2 if minimum or half overlap*/
@@ -346,35 +345,35 @@ void enc_prm_rf_fx(
             test();
             IF( ( EQ_16( rf_frame_type, RF_TCXTD1 ) || EQ_16( rf_frame_type, RF_TCXTD2 ) ) && hTcxEnc->tcxltp != 0 )
             {
-                push_next_indice_fx( hBstr, hRF->rf_tcxltp_param[fec_offset], 9 );
+                push_next_indice( hBstr, hRF->rf_tcxltp_param[fec_offset], 9 );
             }
         }
     }
     ELSE IF( EQ_16( rf_frame_type, 7 ) ) /* NELP bitstream writing */
     {
         /* LSF indices */
-        push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][0], 8 ); /* VQ 1 */
-        push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][1], 8 ); /* VQ 2 */
+        push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][0], 8 ); /* VQ 1 */
+        push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][1], 8 ); /* VQ 2 */
 
         /* NELP gain indices */
-        push_next_indice_fx( hBstr, hRF->rf_indx_nelp_iG1[fec_offset], 5 );
-        push_next_indice_fx( hBstr, hRF->rf_indx_nelp_iG2[fec_offset][0], 6 );
-        push_next_indice_fx( hBstr, hRF->rf_indx_nelp_iG2[fec_offset][1], 6 );
+        push_next_indice( hBstr, hRF->rf_indx_nelp_iG1[fec_offset], 5 );
+        push_next_indice( hBstr, hRF->rf_indx_nelp_iG2[fec_offset][0], 6 );
+        push_next_indice( hBstr, hRF->rf_indx_nelp_iG2[fec_offset][1], 6 );
 
         /* NELP filter selection index */
-        push_next_indice_fx( hBstr, hRF->rf_indx_nelp_fid[fec_offset], 2 );
+        push_next_indice( hBstr, hRF->rf_indx_nelp_fid[fec_offset], 2 );
 
         /* tbe gainFr */
-        push_next_indice_fx( hBstr, hRF->rf_indx_tbeGainFr[fec_offset], 5 );
+        push_next_indice( hBstr, hRF->rf_indx_tbeGainFr[fec_offset], 5 );
     }
     ELSE IF( GE_16( rf_frame_type, 4 ) ) /* rf_frame_type ALL_PRED: 4, NO_PRED: 5, GEN_PRED: 6 */
     {
         /* LSF indices */
-        push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][0], 8 ); /* VQ 1 */
-        push_next_indice_fx( hBstr, hRF->rf_indx_lsf[fec_offset][1], 8 ); /* VQ 2 */
+        push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][0], 8 ); /* VQ 1 */
+        push_next_indice( hBstr, hRF->rf_indx_lsf[fec_offset][1], 8 ); /* VQ 2 */
 
         /* ES pred */
-        push_next_indice_fx( hBstr, hRF->rf_indx_EsPred[fec_offset], 3 );
+        push_next_indice( hBstr, hRF->rf_indx_EsPred[fec_offset], 3 );
 
         ltp_mode = ACELP_LTP_MODE[1][1][rf_frame_type];     /* Q0 */
         ltf_mode = ACELP_LTF_MODE[1][1][rf_frame_type];     /* Q0 */
@@ -387,13 +386,13 @@ void enc_prm_rf_fx(
             n = ACELP_LTP_BITS_SFR[ltp_mode][sfr];
             IF( n != 0 )
             {
-                push_next_indice_fx( hBstr, hRF->rf_indx_pitch[fec_offset][sfr], n );
+                push_next_indice( hBstr, hRF->rf_indx_pitch[fec_offset][sfr], n );
             }
 
             /* Adaptive codebook filtering (1 bit) */
             IF( EQ_16( ltf_mode, 2 ) )
             {
-                push_next_indice_fx( hBstr, hRF->rf_indx_ltfMode[fec_offset][sfr], 1 );
+                push_next_indice( hBstr, hRF->rf_indx_ltfMode[fec_offset][sfr], 1 );
             }
 
             /*Innovative codebook*/
@@ -404,7 +403,7 @@ void enc_prm_rf_fx(
                 ( EQ_16( rf_frame_type, RF_GENPRED ) &&
                   ( sfr == 0 || EQ_16( sfr, 2 ) ) ) )
             {
-                push_next_indice_fx( hBstr, hRF->rf_indx_fcb[fec_offset][sfr], 7 );
+                push_next_indice( hBstr, hRF->rf_indx_fcb[fec_offset][sfr], 7 );
             }
 
             /* Gains (5b, 6b or 7b / subfr) */
@@ -412,11 +411,11 @@ void enc_prm_rf_fx(
             IF( sfr == 0 || EQ_16( sfr, 2 ) )
             {
                 n = ACELP_GAINS_BITS[gains_mode];
-                push_next_indice_fx( hBstr, hRF->rf_indx_gain[fec_offset][sfr], n );
+                push_next_indice( hBstr, hRF->rf_indx_gain[fec_offset][sfr], n );
             }
         }
         /* tbe gainFr */
-        push_next_indice_fx( hBstr, hRF->rf_indx_tbeGainFr[fec_offset], 2 );
+        push_next_indice( hBstr, hRF->rf_indx_tbeGainFr[fec_offset], 2 );
     }
 
     /***************/
@@ -430,15 +429,15 @@ void enc_prm_rf_fx(
     test();
     IF( EQ_16( fec_offset, 2 ) )
     {
-        push_next_indice_fx( hBstr, 0, 2 );
+        push_next_indice( hBstr, 0, 2 );
     }
     ELSE IF( EQ_16( fec_offset, 3 ) || EQ_16( fec_offset, 5 ) || EQ_16( fec_offset, 7 ) )
     {
-        push_next_indice_fx( hBstr, ( fec_offset - 1 ) / 2, 2 );
+        push_next_indice( hBstr, ( fec_offset - 1 ) / 2, 2 );
     }
 
     /* write RF frame type last in the bitstream */
-    push_next_indice_fx( hBstr, rf_frame_type, 3 );
+    push_next_indice( hBstr, rf_frame_type, 3 );
 }
 
 
@@ -534,7 +533,7 @@ void enc_prm_fx(
 
     IF( st->tcxonly )
     {
-        push_next_indice_fx( hBstr, core == TCX_10_CORE, 1 );
+        push_next_indice( hBstr, core == TCX_10_CORE, 1 );
         {
             index = 3;
             move16();
@@ -554,7 +553,7 @@ void enc_prm_fx(
                 index = 2;
                 move16();
             }
-            push_next_indice_fx( hBstr, index, 2 );
+            push_next_indice( hBstr, index, 2 );
         }
     }
     ELSE
@@ -582,13 +581,13 @@ void enc_prm_fx(
                 {
                     idx = add( idx, 1 ); /* Q0 */
                 }
-                push_next_indice_fx( hBstr, idx - start_idx, nBits );
-                push_next_indice_fx( hBstr, 0, 1 ); /* Indicate to the decoder that the core is ACELP*/
-                nbits_start = 3;                    /* Q0 */
+                push_next_indice( hBstr, idx - start_idx, nBits );
+                push_next_indice( hBstr, 0, 1 ); /* Indicate to the decoder that the core is ACELP*/
+                nbits_start = 3;                 /* Q0 */
             }
             ELSE
             {
-                push_next_indice_fx( hBstr, coder_type, 3 );
+                push_next_indice( hBstr, coder_type, 3 );
             }
         }
         ELSE
@@ -596,15 +595,15 @@ void enc_prm_fx(
             IF( EQ_16( st->mdct_sw, MODE1 ) )
             {
                 /* 2 bits instead of 3 as TCX is already signaled */
-                push_next_indice_fx( hBstr, st->hTcxCfg->coder_type, 2 );
+                push_next_indice( hBstr, st->hTcxCfg->coder_type, 2 );
             }
             ELSE
             {
                 IF( EQ_16( st->mdct_sw_enable, MODE2 ) )
                 {
-                    push_next_indice_fx( hBstr, 1, 1 ); /* TCX */
-                    push_next_indice_fx( hBstr, 0, 1 ); /* not HQ_CORE */
-                    push_next_indice_fx( hBstr, st->hTcxCfg->coder_type, 2 );
+                    push_next_indice( hBstr, 1, 1 ); /* TCX */
+                    push_next_indice( hBstr, 0, 1 ); /* not HQ_CORE */
+                    push_next_indice( hBstr, st->hTcxCfg->coder_type, 2 );
                 }
                 ELSE
                 {
@@ -642,13 +641,13 @@ void enc_prm_fx(
                         {
                             idx = add( idx, 1 );
                         }
-                        push_next_indice_fx( hBstr, idx - start_idx, nBits );
-                        push_next_indice_fx( hBstr, 1, 1 ); /* Indicate to the decoder that the core is TCX*/
+                        push_next_indice( hBstr, idx - start_idx, nBits );
+                        push_next_indice( hBstr, 1, 1 ); /* Indicate to the decoder that the core is TCX*/
                         nbits_start = 3;
                     }
                     ELSE
                     {
-                        push_next_indice_fx( hBstr, 4 + st->hTcxCfg->coder_type, 3 );
+                        push_next_indice( hBstr, 4 + st->hTcxCfg->coder_type, 3 );
                     }
                 }
             }
@@ -668,7 +667,7 @@ void enc_prm_fx(
             tmp = TCX_20_CORE;
             move16();
         }
-        push_next_indice_fx( hBstr, tmp, 1 );
+        push_next_indice( hBstr, tmp, 1 );
     }
 
     /* write TCX overlap mode (1 bit: full, 2 bits: half or no overlap) */
@@ -697,7 +696,7 @@ void enc_prm_fx(
             overlap_code = 0;
             move16();
         }
-        push_next_indice_fx( hBstr, overlap_code, nbits_tcx );
+        push_next_indice( hBstr, overlap_code, nbits_tcx );
     }
 
     IF( st->hPlcExt->enableGplc )
@@ -720,7 +719,7 @@ void enc_prm_fx(
 
         IF( EQ_16( core, ACELP_CORE ) )
         {
-            push_next_indice_fx( hBstr, st->glr_idx[0], G_LPC_RECOVERY_BITS );
+            push_next_indice( hBstr, st->glr_idx[0], G_LPC_RECOVERY_BITS );
         }
     }
 
@@ -790,7 +789,7 @@ void enc_prm_fx(
 
         IF( n != 0 )
         {
-            push_next_indice_fx( hBstr, st->bpf_gain_param, n );
+            push_next_indice( hBstr, st->bpf_gain_param, n );
         }
 
         /* Mean energy (2 or 3 bits) */
@@ -798,7 +797,7 @@ void enc_prm_fx(
 
         IF( n != 0 )
         {
-            push_next_indice_fx( hBstr, prm[j++], n );
+            push_next_indice( hBstr, prm[j++], n );
         }
 
         /* Subframe parameters */
@@ -811,14 +810,14 @@ void enc_prm_fx(
 
             IF( n != 0 )
             {
-                push_next_indice_fx( hBstr, prm[j++], n );
+                push_next_indice( hBstr, prm[j++], n );
             }
 
             /* Adaptive codebook filtering (1 bit) */
 
             IF( EQ_16( st->acelp_cfg.ltf_mode, 2 ) )
             {
-                push_next_indice_fx( hBstr, prm[j++], 1 );
+                push_next_indice( hBstr, prm[j++], 1 );
             }
 
             /*Innovative codebook*/
@@ -840,12 +839,12 @@ void enc_prm_fx(
 
                 FOR( ix = 0; ix < wordcnt; ix++ )
                 {
-                    push_next_indice_fx( hBstr, prm[j++], 16 );
+                    push_next_indice( hBstr, prm[j++], 16 );
                 }
 
                 IF( bitcnt )
                 {
-                    push_next_indice_fx( hBstr, prm[j++], bitcnt );
+                    push_next_indice( hBstr, prm[j++], bitcnt );
                 }
 
                 j = add( j_old, 8 ); /* Q0 */
@@ -853,7 +852,7 @@ void enc_prm_fx(
 
             /* Gains (5b, 6b or 7b / subfr) */
             n = ACELP_GAINS_BITS[st->acelp_cfg.gains_mode[sfr]];
-            push_next_indice_fx( hBstr, prm[j++], n );
+            push_next_indice( hBstr, prm[j++], n );
         } /*end of for(sfr)*/
     }     /*end of mode[0]==0*/
 
@@ -867,14 +866,14 @@ void enc_prm_fx(
         move16();
         IF( st->enablePlcWaveadjust )
         {
-            push_next_indice_fx( hBstr, st->Tonal_SideInfo, 1 );
+            push_next_indice( hBstr, st->Tonal_SideInfo, 1 );
         }
 
         /* TCX Gain = 7 bits */
-        push_next_indice_fx( hBstr, prm[j++], 7 );
+        push_next_indice( hBstr, prm[j++], 7 );
 
         /* TCX Noise Filling = NBITS_NOISE_FILL_LEVEL bits */
-        push_next_indice_fx( hBstr, prm[j++], NBITS_NOISE_FILL_LEVEL );
+        push_next_indice( hBstr, prm[j++], NBITS_NOISE_FILL_LEVEL );
 
         /* LTP data */
         test();
@@ -882,13 +881,13 @@ void enc_prm_fx(
         {
             IF( prm[j] )
             {
-                push_next_indice_fx( hBstr, 1, 1 );
-                push_next_indice_fx( hBstr, prm[j + 1], 9 );
-                push_next_indice_fx( hBstr, prm[j + 2], 2 );
+                push_next_indice( hBstr, 1, 1 );
+                push_next_indice( hBstr, prm[j + 1], 9 );
+                push_next_indice( hBstr, prm[j + 2], 2 );
             }
             ELSE
             {
-                push_next_indice_fx( hBstr, 0, 1 );
+                push_next_indice( hBstr, 0, 1 );
             }
         }
         j = add( j, 3 );
@@ -933,7 +932,7 @@ void enc_prm_fx(
         test();
         IF( st->hTcxCfg->ctx_hm && NE_16( last_core, ACELP_CORE ) )
         {
-            push_next_indice_fx( hBstr, prm[j], 1 );
+            push_next_indice( hBstr, prm[j], 1 );
 
             IF( prm[j] )
             {
@@ -966,7 +965,7 @@ void enc_prm_fx(
 
         IF( hTcxEnc->tcx_lpc_shaped_ari != 0 )
         {
-            push_next_bits_fx( hBstr, &prm[++j], nbits_tcx );
+            push_next_bits( hBstr, (UWord16 *) &prm[++j], nbits_tcx );
             j = add( j, nbits_tcx ); /* Q0 */
         }
         ELSE
@@ -1016,14 +1015,14 @@ void enc_prm_fx(
             test();
             IF( st->enablePlcWaveadjust && k )
             {
-                push_next_indice_fx( hBstr, st->Tonal_SideInfo, 1 );
+                push_next_indice( hBstr, st->Tonal_SideInfo, 1 );
             }
 
             /* TCX Gain = 7 bits */
-            push_next_indice_fx( hBstr, prm[j++], 7 );
+            push_next_indice( hBstr, prm[j++], 7 );
 
             /* TCX Noise Filling = NBITS_NOISE_FILL_LEVEL bits */
-            push_next_indice_fx( hBstr, prm[j++], NBITS_NOISE_FILL_LEVEL );
+            push_next_indice( hBstr, prm[j++], NBITS_NOISE_FILL_LEVEL );
 
             /* LTP data */
             test();
@@ -1032,13 +1031,13 @@ void enc_prm_fx(
             {
                 IF( prm[j] )
                 {
-                    push_next_indice_fx( hBstr, 1, 1 );
-                    push_next_indice_fx( hBstr, prm[j + 1], 9 );
-                    push_next_indice_fx( hBstr, prm[j + 2], 2 );
+                    push_next_indice( hBstr, 1, 1 );
+                    push_next_indice( hBstr, prm[j + 1], 9 );
+                    push_next_indice( hBstr, prm[j + 2], 2 );
                 }
                 ELSE
                 {
-                    push_next_indice_fx( hBstr, 0, 1 );
+                    push_next_indice( hBstr, 0, 1 );
                 }
             }
             j = add( j, 3 );
@@ -1080,7 +1079,7 @@ void enc_prm_fx(
             test();
             IF( st->hTcxCfg->ctx_hm && !( last_core == ACELP_CORE && k == 0 ) )
             {
-                push_next_indice_fx( hBstr, prm[j], 1 );
+                push_next_indice( hBstr, prm[j], 1 );
 
                 IF( prm[j] )
                 {
@@ -1512,3 +1511,190 @@ void writeTCXparam_fx(
 
     return;
 }
+
+/*-------------------------------------------------------------------*
+ * writeTCXMode_fx()
+ *
+ * write TCX mode
+ *--------------------------------------------------------------------*/
+
+void writeTCXMode_fx(
+    Encoder_State *st,     /* i/o: encoder state structure					*/
+    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle							*/
+    const Word16 MCT_flag, /* i  : hMCT handle allocated (1) or not (0)		Q0*/
+    Word16 *nbits_start    /* o  : nbits start								Q0*/
+)
+{
+    UWord16 index;
+    Word16 idx, start_idx;
+    Word16 nBits;
+
+    IF( st->tcxonly )
+    {
+        push_next_indice( hBstr, (UWord16) EQ_16( st->core, TCX_10_CORE ), 1 );
+
+        test();
+        IF( EQ_16( st->clas, UNVOICED_CLAS ) )
+        {
+            index = 0;
+            move16();
+        }
+        ELSE IF( EQ_16( st->clas, VOICED_TRANSITION ) || EQ_16( st->clas, UNVOICED_TRANSITION ) )
+        {
+            index = 1;
+            move16();
+        }
+        ELSE IF( EQ_16( st->clas, VOICED_CLAS ) )
+        {
+            index = 2;
+            move16();
+        }
+        ELSE
+        {
+            index = 3;
+            move16();
+        }
+
+        push_next_indice( hBstr, index, 2 );
+
+        test();
+        IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && !MCT_flag )
+        {
+            push_next_indice( hBstr, st->vad_flag, 1 );
+        }
+    }
+    ELSE
+    {
+        IF( EQ_16( st->core, ACELP_CORE ) )
+        {
+            /* write the RF signaling information */
+            IF( EQ_16( st->rf_mode, 1 ) )
+            {
+                /* find the section in the ACELP signaling table corresponding to bitrate */
+                idx = 0;
+                move16();
+                WHILE( NE_32( acelp_sig_tbl[idx], st->total_brate ) ) /* total bitrate is kept at 13.2kbps */
+                {
+                    idx = add( idx, 1 );
+                }
+
+                /* retrieve the number of bits for signaling */
+                idx = add( idx, 1 );                     /* Q0 */
+                nBits = extract_l( acelp_sig_tbl[idx] ); /* Q0 */
+
+                /* retrieve the signaling index */
+                idx = add( idx, 1 );
+                start_idx = idx;
+                move16();
+                WHILE( NE_32( acelp_sig_tbl[idx], SIG2IND( st->coder_type, st->bwidth, st->sharpFlag, st->rf_mode ) ) )
+                {
+                    idx = add( idx, 1 );
+                }
+                push_next_indice( hBstr, sub( idx, start_idx ), nBits );
+                push_next_indice( hBstr, 0, 1 ); /* Indicate to the decoder that the core is ACELP*/
+                *nbits_start = 3;
+                move16();
+            }
+            ELSE
+            {
+                push_next_indice( hBstr, st->coder_type, 3 );
+            }
+        }
+        ELSE
+        {
+            IF( EQ_16( st->mdct_sw, MODE1 ) )
+            {
+                /* 2 bits instead of 3 as TCX is already signaled */
+                push_next_indice( hBstr, st->hTcxCfg->coder_type, 2 );
+            }
+            ELSE
+            {
+                IF( EQ_16( st->mdct_sw_enable, MODE2 ) )
+                {
+                    push_next_indice( hBstr, 1, 1 ); /* TCX */
+                    push_next_indice( hBstr, 0, 1 ); /* not HQ_CORE */
+                    push_next_indice( hBstr, st->hTcxCfg->coder_type, 2 );
+                }
+                ELSE
+                {
+                    /*write the RF signaling information*/
+                    IF( EQ_16( st->rf_mode, 1 ) )
+                    {
+                        /* find the section in the ACELP signaling table corresponding to bitrate */
+                        idx = 0;
+                        move16();
+                        WHILE( NE_32( acelp_sig_tbl[idx], st->total_brate ) )
+                        {
+                            idx = add( idx, 1 );
+                        }
+
+                        /* retrieve the number of bits for signaling */
+                        idx = add( idx, 1 );
+                        nBits = extract_l( acelp_sig_tbl[idx] );
+
+                        test();
+                        test();
+                        IF( EQ_16( st->hTcxCfg->coder_type, VOICED ) || EQ_16( st->hTcxCfg->coder_type, GENERIC ) || EQ_16( st->hTcxCfg->coder_type, TRANSITION ) )
+                        {
+                            st->sharpFlag = 1;
+                            move16();
+                        }
+                        ELSE
+                        {
+                            st->sharpFlag = 0;
+                            move16();
+                        }
+
+                        /* retrieve the signaling index */
+                        idx = add( idx, 1 );
+                        start_idx = idx;
+                        move16();
+                        WHILE( NE_32( acelp_sig_tbl[idx], SIG2IND( st->hTcxCfg->coder_type, st->bwidth, st->sharpFlag, st->rf_mode ) ) )
+                        {
+                            idx = add( idx, 1 );
+                        }
+                        push_next_indice( hBstr, sub( idx, start_idx ), nBits );
+                        push_next_indice( hBstr, 1, 1 ); /* Indicate to the decoder that the core is TCX*/
+                        *nbits_start = 3;
+                        move16();
+                    }
+                    ELSE
+                    {
+                        push_next_indice( hBstr, add( ACELP_MODE_MAX, st->hTcxCfg->coder_type ), 3 );
+                    }
+                }
+            }
+        }
+    }
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------*
+ * writeTCXWindowing_fx()
+ *
+ * write TCX transform type
+ *-------------------------------------------------------------------*/
+
+void writeTCXWindowing_fx(
+    BSTR_ENC_HANDLE hBstr,    /* i/o: bitstream handle        */
+    const Word16 overlap_mode /* i  : overlap mode            Q0*/
+)
+{
+
+    IF( EQ_16( overlap_mode, MIN_OVERLAP ) )
+    {
+        push_next_indice( hBstr, 2, 2 );
+    }
+    ELSE IF( EQ_16( overlap_mode, HALF_OVERLAP ) )
+    {
+        push_next_indice( hBstr, 3, 2 );
+    }
+    ELSE
+    {
+        push_next_indice( hBstr, 0, 1 );
+    }
+
+    return;
+}
diff --git a/lib_enc/enc_tran_fx.c b/lib_enc/enc_tran_fx.c
index 71e8b9e3b3253f984c4b6825d838e148c8c3624c..9802dc15b82071197c49514f3cfd2167ca4d2698 100644
--- a/lib_enc/enc_tran_fx.c
+++ b/lib_enc/enc_tran_fx.c
@@ -4,10 +4,9 @@
 #include <stdint.h>
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"    /* Compilation switches                   */
-//#include "prot_fx.h"    /* Function prototypes                    */
+// #include "prot_fx.h"    /* Function prototypes                    */
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -229,13 +228,8 @@ Word16 encod_tran_fx(
         }
         gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
 
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_o( gain_code, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
         gcode16 = round_fx_o( Lgcode, &Overflow );
-#else
-        Lgcode = L_shl( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif
         hLPDmem->tilt_code = Est_tilt2( &exc_fx[i_subfr], gain_pit, code, Lgcode, &voice_fac, shift ); /* Q15  */
         /*-----------------------------------------------------------------*
          * Update memory of the weighting filter
@@ -247,13 +241,8 @@ Word16 encod_tran_fx(
         L_tmp = L_negate( L_tmp );
         L_tmp = L_mac( L_tmp, xn[L_SUBFR - 1], 16384 );
         L_tmp = L_msu( L_tmp, y1[L_SUBFR - 1], gain_pit );
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_tmp, sub( 1, shift ) ); /* Q_new + 15 */
         hLPDmem->mem_w0 = round_fx_sat( L_tmp );     /*Q_new-1*/
-#else
-        L_tmp = L_shl( L_tmp, sub( 1, shift ) );
-        hLPDmem->mem_w0 = round_fx( L_tmp ); /*Q_new-1*/
-#endif
         /*-----------------------------------------------------------------*
          * Construct adaptive part of the excitation
          * Save the non-enhanced excitation for FEC_exc
@@ -269,11 +258,7 @@ Word16 encod_tran_fx(
         {
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-#ifdef BASOP_NOGLOB
                 exc2_fx[i + i_subfr] = round_fx_sat( L_shl_sat( L_mult_sat( gain_pit, exc_fx[i + i_subfr] ), 1 ) ); /* Q_new */
-#else
-                exc2_fx[i + i_subfr] = round_fx( L_shl( L_mult( gain_pit, exc_fx[i + i_subfr] ), 1 ) );
-#endif
             }
         }
         ELSE
@@ -292,18 +277,11 @@ Word16 encod_tran_fx(
         FOR( i = 0; i < L_SUBFR; i++ )
         {
             /* code in Q9, gain_pit in Q14 */
-            L_tmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new  */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( gcode16, code[i] );                                 /* Q10 + Q_new  */
             L_tmp = L_shl_o( L_tmp, 5, &Overflow );                             /* Q15 + Q_new */
             L_tmp = L_mac_o( L_tmp, exc_fx[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
             L_tmp = L_shl_o( L_tmp, 1, &Overflow );                             /* saturation can occur here Q16 + Q_new */
             exc_fx[i + i_subfr] = round_fx_o( L_tmp, &Overflow );               /* Q_new */
-#else
-            L_tmp = L_shl( L_tmp, 5 );
-            L_tmp = L_mac( L_tmp, exc_fx[i + i_subfr], gain_pit );
-            L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-            exc_fx[i + i_subfr] = round_fx( L_tmp );
-#endif
         }
 
         /*-----------------------------------------------------------------*
@@ -315,8 +293,7 @@ Word16 encod_tran_fx(
             tmp1_fx = add( 16 - ( 2 + Q_AVQ_OUT_DEC + 1 ), Q_new );
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-                L_tmp = L_mult( gain_preQ, code_preQ[i] ); /* Q2 + Q10 -> Q13*/
-#ifdef BASOP_NOGLOB
+                L_tmp = L_mult( gain_preQ, code_preQ[i] );    /* Q2 + Q10 -> Q13*/
                 L_tmp = L_shl_o( L_tmp, tmp1_fx, &Overflow ); /* Q16 + Q_exc    */
                 tmp_fx = round_fx_o( L_tmp, &Overflow );
 
@@ -324,15 +301,6 @@ Word16 encod_tran_fx(
                 move16();
                 exc_fx[i + i_subfr] = add_o( exc_fx[i + i_subfr], tmp_fx, &Overflow ); /* Q_exc */
                 move16();
-#else
-                L_tmp = L_shl( L_tmp, tmp1_fx ); /* Q16 + Q_exc    */
-                tmp_fx = round_fx( L_tmp );
-
-                exc2_fx[i + i_subfr] = add( exc2_fx[i + i_subfr], tmp_fx );
-                move16();
-                exc_fx[i + i_subfr] = add( exc_fx[i + i_subfr], tmp_fx );
-                move16();
-#endif
             }
         }
 
@@ -340,8 +308,8 @@ Word16 encod_tran_fx(
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
-        prep_tbe_exc_fx( L_frame_fx, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
-                         bwe_exc_fx, gain_preQ, code_preQ, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate );
+        prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
+                         bwe_exc_fx, gain_preQ, code_preQ, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate, st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
 
         /*-----------------------------------------------------------------*
          * Synthesize speech to update mem_syn[].
@@ -359,7 +327,7 @@ Word16 encod_tran_fx(
     WHILE( unbits_PI > 0 )
     {
         i = s_min( unbits_PI, 16 );
-        push_indice_fx( hBstr, IND_UNUSED, 0, i );
+        push_indice( hBstr, IND_UNUSED, 0, i );
         unbits_PI -= i;
     }
 
@@ -368,72 +336,72 @@ Word16 encod_tran_fx(
     {
         IF( EQ_16( tc_subfr, TC_0_0 ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, TC_0_64 ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, TC_0_128 ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, TC_0_192 ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, 2 * L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, 3 * L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
         }
     }
     ELSE /* L_frame == L_FRAME16k */
     {
         IF( tc_subfr == 0 )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 2 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 2 );
         }
         ELSE IF( EQ_16( tc_subfr, L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 2 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 2 );
         }
         ELSE IF( EQ_16( tc_subfr, 2 * L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 2, 2 );
+            push_indice( hBstr, IND_TC_SUBFR, 2, 2 );
         }
         ELSE IF( EQ_16( tc_subfr, 3 * L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 3, 2 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 0, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 3, 2 );
+            push_indice( hBstr, IND_TC_SUBFR, 0, 1 );
         }
         ELSE IF( EQ_16( tc_subfr, 4 * L_SUBFR ) )
         {
-            push_indice_fx( hBstr, IND_TC_SUBFR, 3, 2 );
-            push_indice_fx( hBstr, IND_TC_SUBFR, 1, 1 );
+            push_indice( hBstr, IND_TC_SUBFR, 3, 2 );
+            push_indice( hBstr, IND_TC_SUBFR, 1, 1 );
         }
     }
 
@@ -498,6 +466,7 @@ Word16 encod_tran_ivas_fx(
     Word16 L_frame_fx;
     Word16 shift_wsp;
     Word32 L_tmp;
+    Word16 q_h1;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
@@ -508,6 +477,9 @@ Word16 encod_tran_ivas_fx(
 
     L_frame_fx = st_fx->L_frame;
     move16();
+
+    set16_fx( h1, 0, L_SUBFR + ( M + 1 ) );
+
     /*------------------------------------------------------------------*
      * Initializations
      *------------------------------------------------------------------*/
@@ -548,7 +520,12 @@ Word16 encod_tran_ivas_fx(
     move16();
     set16_fx( code_preQ, 0, L_SUBFR );
     shift_wsp = add( Q_new, shift );
-
+#ifdef TEST_HR
+    if ( LT_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) )
+    {
+        shift_wsp = sub( shift_wsp, 1 );
+    }
+#endif
     /*----------------------------------------------------------------*
      * ACELP subframe loop
      *----------------------------------------------------------------*/
@@ -563,11 +540,17 @@ Word16 encod_tran_ivas_fx(
 
         Copy( &res_fx[i_subfr], &exc_fx[i_subfr], L_SUBFR ); /* Q_new */
 
+
         find_targets_ivas_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq,
                               res_fx, L_SUBFR, p_Aw, st_fx->preemph_fac, xn, cn, h1 );
 
-        Copy_Scale_sig( h1, h2_fx, L_SUBFR, -2 );
-        Scale_sig( h1, L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
+        q_h1 = sub( 14, norm_s( h1[0] ) );
+        Copy_Scale_sig( h1, h2_fx, L_SUBFR, sub( 11, q_h1 ) ); /*Q11*/
+#ifdef TEST_HR
+        Scale_sig( h1, L_SUBFR, sub( 14, q_h1 ) );
+#else
+        Scale_sig( h1, L_SUBFR, sub( 13, q_h1 ) );
+#endif
 
         /* scaling of xn[] to limit dynamic at 12 bits */
         Scale_sig( xn, L_SUBFR, shift );
@@ -586,6 +569,9 @@ Word16 encod_tran_ivas_fx(
 
         IF( GE_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) )
         {
+#ifndef TEST_HR
+            Scale_sig( h1, L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
+#endif
             transf_cdbk_enc_ivas_fx( st_fx, 0, i_subfr, cn, exc_fx, p_Aq, Aw_fx, h1, xn, xn2, y1, y2, Es_pred_fx,
                                      &gain_pit, gain_code, g_corr, clip_gain, &gain_preQ, code_preQ, unbits, Q_new, shift );
         }
@@ -613,33 +599,43 @@ Word16 encod_tran_ivas_fx(
         IF( Jopt_flag == 0 )
         {
             /* SQ gain_code */
+#ifdef TEST_HR
+            gain_enc_tc_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, i_subfr, xn, y2, code, Es_pred_fx,
+                                 &gain_pit, &gain_code, &gain_inov, &norm_gain_code, shift_wsp );
+#else
             gain_enc_tc_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, i_subfr, xn, y2, code, Es_pred_fx,
                                  &gain_pit, &gain_code, &gain_inov, &norm_gain_code, sub( shift_wsp, 1 ) );
+#endif
         }
         ELSE
         {
             IF( GT_32( st_fx->core_brate, ACELP_32k ) )
             {
                 /* SQ gain_pit and gain_code */
+#ifdef TEST_HR
+                gain_enc_SQ_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, i_subfr, xn, y1, y2, code, Es_pred_fx,
+                                     &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, clip_gain, shift_wsp );
+#else
                 gain_enc_SQ_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, i_subfr, xn, y1, y2, code, Es_pred_fx,
                                      &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, clip_gain, sub( shift_wsp, 1 ) );
+#endif
             }
             ELSE
             {
                 /* VQ gain_pit and gain_code */
+#ifdef TEST_HR
+                gain_enc_mless_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->element_mode, L_frame_fx, i_subfr, tc_subfr, xn, y1, shift_wsp, y2, code, Es_pred_fx,
+                                        &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, clip_gain );
+#else
                 gain_enc_mless_ivas_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->element_mode, L_frame_fx, i_subfr, tc_subfr, xn, y1, sub( shift_wsp, 1 ), y2, code, Es_pred_fx,
                                         &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, clip_gain );
+#endif
             }
         }
         gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
 
-#ifdef BASOP_NOGLOB
         Lgcode = L_shl_o( gain_code, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
         gcode16 = round_fx_o( Lgcode, &Overflow );
-#else
-        Lgcode = L_shl( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
-        gcode16 = round_fx( Lgcode );
-#endif
         hLPDmem->tilt_code = est_tilt_ivas_fx( &exc_fx[i_subfr], gain_pit, code, gain_code, &voice_fac, Q_new, L_SUBFR, 0 ); // Q15
         /*-----------------------------------------------------------------*
          * Update memory of the weighting filter
@@ -651,13 +647,8 @@ Word16 encod_tran_ivas_fx(
         L_tmp = L_negate( L_tmp );
         L_tmp = L_mac( L_tmp, xn[L_SUBFR - 1], 16384 );    // Q_new-1+15+shift
         L_tmp = L_msu( L_tmp, y1[L_SUBFR - 1], gain_pit ); // Q_new-1+15+shift
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shl_sat( L_tmp, sub( 1, shift ) ); // Q_new+15
-        hLPDmem->mem_w0 = round_fx_sat( L_tmp );     /*Q_new-1*/
-#else
-        L_tmp = L_shl( L_tmp, sub( 1, shift ) );
-        hLPDmem->mem_w0 = round_fx( L_tmp ); /*Q_new-1*/
-#endif
+        L_tmp = L_shl_sat( L_tmp, sub( 1, shift ) );       // Q_new+15
+        hLPDmem->mem_w0 = round_fx_sat( L_tmp );           /*Q_new-1*/
         /*-----------------------------------------------------------------*
          * Construct adaptive part of the excitation
          * Save the non-enhanced excitation for FEC_exc
@@ -673,11 +664,7 @@ Word16 encod_tran_ivas_fx(
         {
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-#ifdef BASOP_NOGLOB
                 exc2_fx[i + i_subfr] = round_fx_sat( L_shl_sat( L_mult_sat( gain_pit, exc_fx[i + i_subfr] ), 1 ) ); /* Q_exc */
-#else
-                exc2_fx[i + i_subfr] = round_fx( L_shl( L_mult( gain_pit, exc_fx[i + i_subfr] ), 1 ) );
-#endif
             }
         }
         ELSE
@@ -696,18 +683,11 @@ Word16 encod_tran_ivas_fx(
         FOR( i = 0; i < L_SUBFR; i++ )
         {
             /* code in Q9, gain_pit in Q14 */
-            L_tmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( gcode16, code[i] );                                 /* Q10 + Q_new */
             L_tmp = L_shl_o( L_tmp, 5, &Overflow );                             /* Q15 + Q_new */
             L_tmp = L_mac_o( L_tmp, exc_fx[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
             L_tmp = L_shl_o( L_tmp, 1, &Overflow );                             /* saturation can occur here Q16 + Q_new */
             exc_fx[i + i_subfr] = round_fx_o( L_tmp, &Overflow );               /* Q_new */
-#else
-            L_tmp = L_shl( L_tmp, 5 );
-            L_tmp = L_mac( L_tmp, exc_fx[i + i_subfr], gain_pit );
-            L_tmp = L_shl( L_tmp, 1 ); /* saturation can occur here */
-            exc_fx[i + i_subfr] = round_fx( L_tmp );
-#endif
         }
 
         /*-----------------------------------------------------------------*
@@ -719,8 +699,7 @@ Word16 encod_tran_ivas_fx(
             tmp1_fx = add( 16 - ( 2 + Q_AVQ_OUT_DEC + 1 ), Q_new );
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-                L_tmp = L_mult( gain_preQ, code_preQ[i] ); /* Q2 + Q10 -> Q13*/
-#ifdef BASOP_NOGLOB
+                L_tmp = L_mult( gain_preQ, code_preQ[i] );    /* Q2 + Q10 -> Q13*/
                 L_tmp = L_shl_o( L_tmp, tmp1_fx, &Overflow ); /* Q16 + Q_exc    */
                 tmp_fx = round_fx_o( L_tmp, &Overflow );
 
@@ -728,15 +707,6 @@ Word16 encod_tran_ivas_fx(
                 move16();
                 exc_fx[i + i_subfr] = add_o( exc_fx[i + i_subfr], tmp_fx, &Overflow ); /* Q_exc */
                 move16();
-#else
-                L_tmp = L_shl( L_tmp, tmp1_fx ); /* Q16 + Q_exc    */
-                tmp_fx = round_fx( L_tmp );
-
-                exc2_fx[i + i_subfr] = add( exc2_fx[i + i_subfr], tmp_fx );
-                move16();
-                exc_fx[i + i_subfr] = add( exc_fx[i + i_subfr], tmp_fx );
-                move16();
-#endif
             }
         }
 
@@ -744,9 +714,9 @@ Word16 encod_tran_ivas_fx(
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
-        prep_tbe_exc_ivas_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
-                              bwe_exc_fx, gain_preQ, code_preQ, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
-                              st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
+        prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
+                         bwe_exc_fx, gain_preQ, code_preQ, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
+                         st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
 
         /*-----------------------------------------------------------------*
          * Synthesize speech to update mem_syn[].
diff --git a/lib_enc/enc_uv_fx.c b/lib_enc/enc_uv_fx.c
index cd147c6ce20bb60ae4e67cff1c902e6513884707..a8612725b3a71575342f9197aeda467f235b75ad 100644
--- a/lib_enc/enc_uv_fx.c
+++ b/lib_enc/enc_uv_fx.c
@@ -5,9 +5,8 @@
 #include <stdint.h>
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"    /* Common constants                       */
-#include "prot.h"    /* Function prototypes                    */
+#include "prot_fx.h" /* Function prototypes                    */
 #include "rom_com.h"
-#include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*-------------------------------------------------------------------*
@@ -24,7 +23,7 @@ void encod_unvoiced_fx(
     const Word16 Es_pred,           /* i  : predicted scaled innov. energy          Q8*/
     const Word16 uc_two_stage_flag, /* i  : flag indicating two-stage UC            Q0*/
     const Word16 *res_fx,           /* i  : residual signal                         Q_new*/
-    Word16 *syn_fx,                 /* o  : core synthesis                          Q_new*/
+    Word16 *syn_fx,                 /* o  : core synthesis                          Q_new -1 */
     Word16 *tmp_noise_fx,           /* o  : long-term noise energy                  Q0*/
     Word16 *exc_fx,                 /* i/o: current non-enhanced excitation         Q_new*/
     Word16 *pitch_buf_fx,           /* o  : floating pitch values for each subframe Q6*/
@@ -93,8 +92,8 @@ void encod_unvoiced_fx(
         i_subfr_idx = shr( i_subfr, 6 );
         Copy( &res_fx[i_subfr], &exc_fx[i_subfr], L_SUBFR ); /* Q_new */
 
-        find_targets_ivas_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq_fx,
-                              res_fx, L_SUBFR, p_Aw_fx, st_fx->preemph_fac, xn_fx, cn_fx, h1_fx );
+        find_targets_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq_fx,
+                         res_fx, L_SUBFR, p_Aw_fx, st_fx->preemph_fac, xn_fx, cn_fx, h1_fx );
 
         /*Copy_Scale_sig(h1_fx, h2_fx, L_SUBFR, -2);*/
         Scale_sig( h1_fx, L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
@@ -115,10 +114,11 @@ void encod_unvoiced_fx(
             /*----------------------------------------------------------------*
              * Unvoiced subframe processing in two stages
              *----------------------------------------------------------------*/
-            // PMT("The code below needs validation, never been tested")
+
             /* No adaptive codebook (UC) */
             set16_fx( y1, 0, L_SUBFR );
             set16_fx( exc_fx + i_subfr, 0, L_SUBFR );
+
             /*-----------------------------------------------------------------*
              * Gain clipping test to avoid unstable synthesis on frame erasure
              * or in case of floating point encoder & fixed p. decoder
@@ -153,7 +153,7 @@ void encod_unvoiced_fx(
 #ifdef DEBUGGING
             assert( st_fx->acelp_cfg.gains_mode[i_subfr_idx] == 7 && "Error: UC two-stage, only 5+2 gain Q is supported" );
 #endif
-            push_indice_fx( st_fx->hBstr, IND_GAIN, index, st_fx->acelp_cfg.gains_mode[i_subfr_idx] );
+            push_indice( st_fx->hBstr, IND_GAIN, index, st_fx->acelp_cfg.gains_mode[i_subfr_idx] );
 
             gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit_fx, st_fx->clip_var_fx );
 
@@ -185,11 +185,7 @@ void encod_unvoiced_fx(
             hLPDmem->mem_w0 = sub( xn_fx[L_SUBFR - 1], round_fx( L_shl( Ltmp, 1 ) ) ); /* Q_xn */
             move16();
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             hLPDmem->mem_w0 = shr_sat( hLPDmem->mem_w0, shift ); /*Qnew-1*/
-#else
-            hLPDmem->mem_w0 = shr( hLPDmem->mem_w0, shift ); /*Qnew-1*/
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             /*-------------------------------------------------------*
@@ -208,15 +204,8 @@ void encod_unvoiced_fx(
                     Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code_fx[i] );   /* Q10 */
                     Ltmp2 = L_shl( Ltmp2, Q_new_p5 );                       /* Q15 + Q_new */
                     Ltmp = L_add( Ltmp, Ltmp2 );                            /* Q15 + Q_new */
-#ifdef BASOP_NOGLOB
-                    Ltmp = L_shl_sat( Ltmp, 1 );                /* saturation can occur here	Q16 + Q_new */
-                    exc_fx[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
-#else
-                    BASOP_SATURATE_WARNING_OFF_EVS
-                    Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                    BASOP_SATURATE_WARNING_ON_EVS
-                    exc_fx[i + i_subfr] = round_fx( Ltmp );
-#endif
+                    Ltmp = L_shl_sat( Ltmp, 1 );                            /* saturation can occur here	Q16 + Q_new */
+                    exc_fx[i + i_subfr] = round_fx_sat( Ltmp );             /* Q_new */
                 }
                 tmp2 = L_SUBFR;
                 move16();
@@ -290,6 +279,7 @@ void encod_unvoiced_ivas_fx(
     Word16 i_subfr, Q_xn, Q_new_p5, tmp2, j, i;
     Word16 index, i_subfr_idx;
     Word16 unbits_PI;
+    Word16 q_h1;
     acelp_cfg = &( st_fx->acelp_cfg );
     SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
     LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
@@ -330,8 +320,9 @@ void encod_unvoiced_ivas_fx(
         find_targets_ivas_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq_fx,
                               res_fx, L_SUBFR, p_Aw_fx, st_fx->preemph_fac, xn_fx, cn_fx, h1_fx );
 
-        Copy_Scale_sig( h1_fx, h2_fx, L_SUBFR, -2 );
-        Scale_sig( h1_fx, L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
+        q_h1 = sub( 14, norm_s( h1_fx[0] ) );
+        Copy_Scale_sig( h1_fx, h2_fx, L_SUBFR, sub( 11, q_h1 ) );
+        Scale_sig( h1_fx, L_SUBFR, sub( 14, q_h1 ) );
 
         /* scaling of xn[] to limit dynamic at 12 bits */
         Scale_sig( xn_fx, L_SUBFR, shift ); // Q_new - 1 + shift
@@ -428,11 +419,7 @@ void encod_unvoiced_ivas_fx(
             hLPDmem->mem_w0 = sub( xn_fx[L_SUBFR - 1], round_fx( L_shl( Ltmp, 1 ) ) ); // Q_xn
             move16();
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             hLPDmem->mem_w0 = shr_sat( hLPDmem->mem_w0, shift ); /*Qnew-1*/
-#else
-            hLPDmem->mem_w0 = shr( hLPDmem->mem_w0, shift ); /*Qnew-1*/
-#endif
             move16();
             BASOP_SATURATE_WARNING_ON_EVS;
 
@@ -446,28 +433,14 @@ void encod_unvoiced_ivas_fx(
                 FOR( i = sub( tmp2, shr( L_SUBFR, 1 ) ); i < tmp2; i++ )
                 {
                     /* code in Q9, gain_pit in Q14; exc Q_new */
-                    Ltmp = Mpy_32_16_1( gain_code2, code2[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
+                    Ltmp = Mpy_32_16_1( gain_code2, code2[i] );                 /* Q10 */
                     Ltmp = L_shl_sat( Ltmp, Q_new_p5 );                         /* Q15 + Q_new */
                     Ltmp = L_mac_sat( Ltmp, gain_pit_fx, exc_fx[i + i_subfr] ); /* Q15 + Q_new */
-#else
-                    Ltmp = L_shl( Ltmp, Q_new_p5 );
-                    Ltmp = L_mac( Ltmp, gain_pit_fx, exc_fx[i + i_subfr] );
-#endif
-                    Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code_fx[i] ); /* Q10 */
-#ifdef BASOP_NOGLOB
-                    Ltmp2 = L_shl_sat( Ltmp2, Q_new_p5 );       /* Q15 + Q_new */
-                    Ltmp = L_add_sat( Ltmp, Ltmp2 );            /* Q15 + Q_new */
-                    Ltmp = L_shl_sat( Ltmp, 1 );                /* saturation can occur here	Q16 + Q_new */
-                    exc_fx[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
-#else
-                    BASOP_SATURATE_WARNING_OFF_EVS
-                    Ltmp2 = L_shl( Ltmp2, Q_new_p5 );
-                    Ltmp = L_add( Ltmp, Ltmp2 );
-                    Ltmp = L_shl( Ltmp, 1 ); /* saturation can occur here */
-                    BASOP_SATURATE_WARNING_ON_EVS
-                    exc_fx[i + i_subfr] = round_fx( Ltmp );
-#endif
+                    Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code_fx[i] );       /* Q10 */
+                    Ltmp2 = L_shl_sat( Ltmp2, Q_new_p5 );                       /* Q15 + Q_new */
+                    Ltmp = L_add_sat( Ltmp, Ltmp2 );                            /* Q15 + Q_new */
+                    Ltmp = L_shl_sat( Ltmp, 1 );                                /* saturation can occur here	Q16 + Q_new */
+                    exc_fx[i + i_subfr] = round_fx_sat( Ltmp );                 /* Q_new */
                     move16();
                 }
                 tmp2 = L_SUBFR;
@@ -480,14 +453,10 @@ void encod_unvoiced_ivas_fx(
         voice_factors_fx[i_subfr / L_SUBFR] = 0;
         move16();
 
-#ifdef FIX_ISSUE_1148
         if ( st_fx->hBWE_TD != NULL )
         {
             interp_code_5over2_fx( &exc_fx[i_subfr], &bwe_exc_fx[i_subfr * HIBND_ACB_L_FAC], L_SUBFR );
         }
-#else
-        interp_code_5over2_fx( &exc_fx[i_subfr], &bwe_exc_fx[i_subfr * HIBND_ACB_L_FAC], L_SUBFR );
-#endif
 
         /*-----------------------------------------------------------------*
          * Synthesize speech to update mem_syn[].
diff --git a/lib_enc/energy_fx.c b/lib_enc/energy_fx.c
index e645395f1aabcce56c261b367d4be78c82e7204a..0168e52b11bbbd0c077eeb15366ba2ea3059130b 100644
--- a/lib_enc/energy_fx.c
+++ b/lib_enc/energy_fx.c
@@ -60,16 +60,10 @@ void est_energy_fx(
     HB_Power = L_shr( sb_power[6], shr_tmp );      /* 31 - enerBuffer_exp - shr_tmp */
     FOR( i = 2; i < BandNum; i++ )
     {
-        Ltmp32 = L_shr( sb_power[i], shr_tmp ); /* 31 - enerBuffer_exp - shr_tmp */
-#ifdef BASOP_NOGLOB
+        Ltmp32 = L_shr( sb_power[i], shr_tmp );             /* 31 - enerBuffer_exp - shr_tmp */
         frame_energy2 = L_add_sat( frame_energy2, Ltmp32 ); /* 31 - enerBuffer_exp - shr_tmp */
         if ( i > 6 )
             HB_Power = L_add_sat( HB_Power, Ltmp32 );
-#else
-        frame_energy2 = L_add( frame_energy2, Ltmp32 );
-        if ( i > 6 )
-            HB_Power = L_add( HB_Power, Ltmp32 );
-#endif
     }
     frame_energy2 = L_sub( frame_energy2, Ltmp32 ); /* 31 - enerBuffer_exp - shr_tmp */
 
@@ -131,11 +125,7 @@ void est_energy_fx(
             tmpspec_amp = L_shl( sb_power[j], s16MaxCoefNorm ); /* sb_power_Q + s16MaxCoefNorm */
             s32CopyPower = L_add( s32CopyPower, tmpspec_amp );
         }
-#ifdef BASOP_NOGLOB
         frame_sb_energy[i] = L_shr_o( s32CopyPower, s16MaxCoefNorm, &Overflow ); /* sb_power_Q */
-#else                                                                            /* BASOP_NOGLOB */
-        frame_sb_energy[i] = L_shr( s32CopyPower, s16MaxCoefNorm );
-#endif
         move32();
     }
 
@@ -194,7 +184,7 @@ static void update_sb_bg_energy(
     Word32 sb_bg_energy_ti, tmp;
     Word16 tmpQ, i;
 
-    *tbg_energy_count = add( *tbg_energy_count, 1 ); /* Q0 */
+    *tbg_energy_count = add_sat( *tbg_energy_count, 1 ); /* Q0 */
     move16();
     tmpQ = add( tmp_Q_add, frame_sb_energy_scale );
 
@@ -461,7 +451,7 @@ void background_update_fx(
             tmp = L_shr( 2147 /* 0.000001 Q31 */, sub( 31, scale_sb_energy ) ); /* scale_sb_energy */
             FOR( i = 0; i < SNR_sb_num; i++ )
             {
-                sb_bg_energy[i] = L_add( MUL_F( sb_bg_energy[i], 32112 /* 0.98 Q15 */ ), tmp ); /* scale_sb_energy */
+                sb_bg_energy[i] = L_add_sat( MUL_F( sb_bg_energy[i], 32112 /* 0.98 Q15 */ ), tmp ); /* scale_sb_energy */
                 move32();
             }
         }
diff --git a/lib_enc/eval_pit_contr_fx.c b/lib_enc/eval_pit_contr_fx.c
index e49463a5cf1a9eccf19b817a54d636bf68ca46c3..5e1c8dfe32dffa97ff711e152ddc3b37b3c89478 100644
--- a/lib_enc/eval_pit_contr_fx.c
+++ b/lib_enc/eval_pit_contr_fx.c
@@ -6,7 +6,6 @@
 #include "cnst.h"        /* Common constants                       */
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -183,7 +182,7 @@ Word16 Pit_exc_contribution_len_fx(                        /* o  : bin where pit
     test();
     if ( GE_16( st_fx->GSC_IVAS_mode, 1 ) || LT_32( st_fx->core_brate, ACELP_9k60 ) )
     {
-        av_corr = shl( av_corr, 1 ); /*Q2 Correlation really poor at low rate, time domain still valide*/
+        av_corr = shl_sat( av_corr, 1 ); /*Q2 Correlation really poor at low rate, time domain still valide*/
     }
     min_corr = abs_s( sub( mfreq_loc_Q2fx[0], av_corr ) ); /*Q2*/
 
@@ -379,22 +378,27 @@ Word16 Pit_exc_contribution_len_fx(                        /* o  : bin where pit
         move16();
 
         set16_fx( pitch_buf, shl( L_SUBFR, 6 ), NB_SUBFR16k );
+
+#ifdef HARM_PUSH_BIT
+        /* pitch contribution useless - delete all previously written indices belonging to pitch contribution */
+        for ( i = TAG_ACELP_SUBFR_LOOP_START; i < TAG_ACELP_SUBFR_LOOP_END; i++ )
+        {
+            delete_indice( hBstr, i );
+        }
+
+        delete_indice( hBstr, IND_ES_PRED );
+#else
         /* pitch contribution useless - delete all previously written indices belonging to pitch contribution */
         FOR( i = TAG_ACELP_SUBFR_LOOP_START; i < TAG_ACELP_SUBFR_LOOP_END; i++ )
         {
-#ifndef IVAS_CODE_BITSTREAM
             IF( hBstr->ind_list[i].nb_bits != -1 )
             {
                 hBstr->nb_bits_tot = sub( hBstr->nb_bits_tot, hBstr->ind_list[i].nb_bits ); /* Q0 */
                 hBstr->ind_list[i].nb_bits = -1;
                 move16();
             }
-#else
-            delete_indice( hBstr, i );
-#endif
         }
 
-#ifndef IVAS_CODE_BITSTREAM
         IF( hBstr->ind_list[IND_ES_PRED].nb_bits != -1 )
         {
             hBstr->nb_bits_tot = sub( hBstr->nb_bits_tot, hBstr->ind_list[IND_ES_PRED].nb_bits ); /* Q0 */
@@ -402,8 +406,6 @@ Word16 Pit_exc_contribution_len_fx(                        /* o  : bin where pit
             hBstr->ind_list[IND_ES_PRED].nb_bits = -1;
             move16();
         }
-#else
-        delete_indice( hBstr, i );
 #endif
     }
     IF( LT_32( st_fx->core_brate, CFREQ_BITRATE ) )
@@ -418,17 +420,17 @@ Word16 Pit_exc_contribution_len_fx(                        /* o  : bin where pit
 
             IF( EQ_16( st_fx->coder_type, INACTIVE ) )
             {
-                push_indice_fx( hBstr, IND_PIT_CONTR_IDX, pit_contr_idx, 1 );
+                push_indice( hBstr, IND_PIT_CONTR_IDX, pit_contr_idx, 1 );
             }
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_PIT_CONTR_IDX, pit_contr_idx, 3 );
+            push_indice( hBstr, IND_PIT_CONTR_IDX, pit_contr_idx, 3 );
         }
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_PIT_CONTR_IDX, pit_contr_idx, 4 );
+        push_indice( hBstr, IND_PIT_CONTR_IDX, pit_contr_idx, 4 );
     }
 
     return last_pit_bin;
diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c
index 3005edd6e61cd9f11d47b5f0a858a4a02377daad..8e9a82378ad94cb3d5046e9e4943f57a63ef1be7 100644
--- a/lib_enc/evs_enc_fx.c
+++ b/lib_enc/evs_enc_fx.c
@@ -5,10 +5,9 @@
 #include <stdint.h>
 #include <assert.h>
 #include "options.h" /* Compilation switches                   */
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"       /* Common constants                       */
 #include "rom_com.h"    /* Common constants                       */
-#include "prot_fx.h"    /* Function prototypes                    */
 #include "basop_util.h" /* Function prototypes                    */
 #include "prot_fx_enc.h"
 #ifdef DEBUGGING
@@ -170,18 +169,6 @@ ivas_error evs_enc_fx(
     {
         updt_IO_switch_enc_fx( st, input_frame );
         set16_fx( hBWE_TD->old_speech_shb_fx, 0, L_LOOK_16k + L_SUBFR16k );
-#if defined IVAS_CODE
-        PMT( "find scaling factor for prev_enr_EnvSHBres, prev_pow_exc16kWhtnd and prev_mix_factor " )
-        set16_fx( st->hBWE_TD->old_speech_shb, 0, L_LOOK_16k + L_SUBFR16k );
-        set16_fx( st->hBWE_TD->mem_shb_res, 0, MAX_LEN_MA_FILTER );
-        set16_fx( st->hBWE_TD->old_EnvSHBres, 0, L_FRAME4k );
-        st->hBWE_TD->old_mean_EnvSHBres = 0;
-        st->hBWE_TD->prev_enr_EnvSHBres = 1.0f;
-        st->hBWE_TD->prev_shb_env_tilt = 0;
-        st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f;
-        st->hBWE_TD->prev_mix_factor = 1.0f;
-        st->hBWE_TD->prev_Env_error = 0;
-#endif
         cldfb_reset_memory( st->cldfbAnaEnc );
         cldfb_reset_memory( st->cldfbSynTd );
     }
@@ -282,12 +269,7 @@ ivas_error evs_enc_fx(
         IF( EQ_16( st->core, ACELP_CORE ) )
         {
             acelp_core_enc_fx( st, inp, ener, A, Aw, epsP_h, epsP_l, lsp_new, lsp_mid, vad_hover_flag,
-                               attack_flag, bwe_exc_extended, voice_factors, old_syn_12k8_16k, pitch_buf, &unbits, Q_new, shift
-#ifdef ADD_LRTD
-                               ,
-                               NULL, NULL
-#endif
-            );
+                               attack_flag, bwe_exc_extended, voice_factors, old_syn_12k8_16k, pitch_buf, &unbits, NULL, Q_new, shift );
         }
         /*---------------------------------------------------------------------*
          * HQ core encoding
@@ -425,7 +407,7 @@ ivas_error evs_enc_fx(
 
         FOR( i = 0; i < padBits; i++ )
         {
-            push_next_indice_fx( hBstr, 0, 1 );
+            push_next_indice( hBstr, 0, 1 );
         }
     }
 
@@ -472,16 +454,6 @@ ivas_error evs_enc_fx(
     {
         set16_fx( hBWE_TD->old_speech_shb_fx, 0, L_LOOK_16k + L_SUBFR16k );
         set16_fx( shb_speech, 0, L_FRAME16k );
-#if defined IVAS_CODE
-        set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER );
-        set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k );
-        st->hBWE_TD->old_mean_EnvSHBres = 0.0f;
-        st->hBWE_TD->prev_enr_EnvSHBres = 1.0f;
-        st->hBWE_TD->prev_shb_env_tilt = 0.0f;
-        st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f;
-        st->hBWE_TD->prev_mix_factor = 1.0f;
-        st->hBWE_TD->prev_Env_error = 0.0f;
-#endif
     }
 
     /* SWB TBE encoder */
@@ -684,19 +656,19 @@ static void writeFrameHeader_loc( Encoder_State *st )
             IF( EQ_16( st->cng_type, FD_CNG ) )
             {
                 /* write SID/CNG type flag */
-                push_next_indice_fx( hBstr, 1, 1 );
+                push_next_indice( hBstr, 1, 1 );
 
                 /* write bandwidth mode */
-                push_next_indice_fx( hBstr, st->bwidth, 2 );
+                push_next_indice( hBstr, st->bwidth, 2 );
 
                 /* write L_frame */
                 IF( EQ_16( st->L_frame, L_FRAME ) )
                 {
-                    push_next_indice_fx( hBstr, 0, 1 );
+                    push_next_indice( hBstr, 0, 1 );
                 }
                 ELSE
                 {
-                    push_next_indice_fx( hBstr, 1, 1 );
+                    push_next_indice( hBstr, 1, 1 );
                 }
             }
         }
@@ -704,7 +676,7 @@ static void writeFrameHeader_loc( Encoder_State *st )
         {
             IF( st->rf_mode == 0 )
             {
-                push_next_indice_fx( hBstr, sub( st->bwidth, FrameSizeConfig[st->frame_size_index].bandwidth_min ), FrameSizeConfig[st->frame_size_index].bandwidth_bits );
+                push_next_indice( hBstr, sub( st->bwidth, FrameSizeConfig[st->frame_size_index].bandwidth_min ), FrameSizeConfig[st->frame_size_index].bandwidth_bits );
             }
         }
 
@@ -712,7 +684,7 @@ static void writeFrameHeader_loc( Encoder_State *st )
         test();
         IF( FrameSizeConfig[st->frame_size_index].reserved_bits && st->rf_mode == 0 )
         {
-            push_next_indice_fx( hBstr, 0, FrameSizeConfig[st->frame_size_index].reserved_bits );
+            push_next_indice( hBstr, 0, FrameSizeConfig[st->frame_size_index].reserved_bits );
         }
     }
 
diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c
index af9c2dbc4e01340ab6a85d450b1cbefed000fce3..49d757be3054aaa7a7b2b829c14c21553ba46a77 100644
--- a/lib_enc/ext_sig_ana_fx.c
+++ b/lib_enc/ext_sig_ana_fx.c
@@ -70,24 +70,12 @@ void core_signal_analysis_high_bitrate_fx(
     Word32 *tmpP32;
     Word16 Q_exp;
 
-#ifdef IVAS_CODE
-    int16_t disable_ltp = 0;
-#endif
     TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
 
-#ifndef IVAS_CODE
     /* dummy */
     (void) vad_hover_flag;
     (void) last_element_mode;
-#endif
 
-#ifdef IVAS_CODE
-    if ( NE_16( last_element_mode, st->element_mode ) )
-    {
-        disable_ltp = 1; /* disable TCX-LTP in stereo switching to avoid discontinuities in synthesis */
-        move16();
-    }
-#endif
     left_overlap = -1;
     move16();
     right_overlap = -1;
@@ -300,15 +288,6 @@ void core_signal_analysis_high_bitrate_fx(
             WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno],
                           overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB],
                           &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT /* truncate_aldo */, 1 );
-#ifdef IVAS_CODE
-            if ( windowed_samples != NULL ) /* save windowed speech_TCX samples */
-            {
-                assert( L_subframe + ( left_overlap + right_overlap ) / 2 < 2 * L_FRAME_MAX / nSubframes - L_FRAME_MAX / 8 );
-                windowed_samples[frameno * L_FRAME_MAX + 0] = (float) overlap_mode[frameno];
-                windowed_samples[frameno * L_FRAME_MAX + 1] = (float) overlap_mode[frameno + 1];
-                mvr2r( tcx20Win, windowed_samples + frameno * L_FRAME_MAX + 2, L_subframe + ( left_overlap + right_overlap ) / 2 );
-            }
-#endif
         }
 
         IF( EQ_16( transform_type[frameno], TCX_5 ) )
@@ -318,31 +297,14 @@ void core_signal_analysis_high_bitrate_fx(
             /* Outter left folding */
             FOR( i = 0; i < folding_offset; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tcx20Win[folding_offset + i] = sub_sat( tcx20Win[folding_offset + i], tcx20Win[folding_offset - 1 - i] ); // Q0
-#else
-                tcx20Win[folding_offset + i] = sub( tcx20Win[folding_offset + i], tcx20Win[folding_offset - 1 - i] );
-#endif
                 move16();
             }
-#ifdef IVAS_CODE
-            if ( st->element_mode == IVAS_CPE_MDCT && frameno == 0 && overlap_mode[0] == FULL_OVERLAP && L_subframe - left_overlap > minWindowLen )
-            {
-                for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
-                {
-                    tcx20Win[left_overlap + i] -= hTcxEnc->speech_TCX[-1 - i] * st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] * st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i];
-                }
-            }
-#endif
             /* Outter right folding */
             tmp = shr( right_overlap, 1 );
             FOR( i = 0; i < tmp; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tcx20Win[L_subframe + folding_offset - 1 - i] = add_sat( tcx20Win[L_subframe + folding_offset - 1 - i], tcx20Win[L_subframe + folding_offset + i] ); // Q0
-#else
-                tcx20Win[L_subframe + folding_offset - 1 - i] = add( tcx20Win[L_subframe + folding_offset - 1 - i], tcx20Win[L_subframe + folding_offset + i] );
-#endif
                 move16();
             }
             /* 2xTCX5 */
@@ -373,13 +335,6 @@ void core_signal_analysis_high_bitrate_fx(
 
                 tmpP16 += tcx5SizeFB;
                 tmpP32 += tcx5SizeFB;
-#ifdef IVAS_CODE
-                /* high-band gain control in case of BWS */
-                if ( st->bwidth_sw_cnt > 0 )
-                {
-                    v_multc( hTcxEnc->spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ), (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, hTcxEnc->spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ), L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
-                }
-#endif
             }
         }
         ELSE /* transform_type[frameno] != TCX_5 */
@@ -422,33 +377,12 @@ void core_signal_analysis_high_bitrate_fx(
             }
             ELSE
             {
-#ifdef IVAS_CODE
-                if ( st->element_mode == IVAS_CPE_MDCT && frameno == 0 && transform_type[0] == TCX_10 && overlap_mode[0] == FULL_OVERLAP && L_subframe - left_overlap > minWindowLen )
-                {
-                    for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
-                    {
-                        tcx20Win[left_overlap + i] -= hTcxEnc->speech_TCX[-1 - i] * st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] * st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i];
-                    }
-                }
-#endif
                 TCX_MDCT( tcx20Win, spectrum[frameno], &spectrum_e[frameno], left_overlap, sub( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ), right_overlap, st->element_mode );
             }
 
             /* For TCX20 at bitrates up to 64 kbps we need the power spectrum */
 
             /* high-band gain control in case of BWS */
-#ifdef IVAS_CODE
-            if ( st->bwidth_sw_cnt > 0 )
-            {
-                v_multc( hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes );
-            }
-
-            if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
-            {
-                set_f( &hTcxEnc->spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE );
-                st->hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE;
-            }
-#endif
             IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
             {
                 test();
@@ -469,94 +403,6 @@ void core_signal_analysis_high_bitrate_fx(
                                              pMdstWin, powerSpec, &powerSpec_e );
                 }
             }
-#ifdef IVAS_CODE
-            if ( st->element_mode == IVAS_CPE_MDCT )
-            {
-                L_subframe = L_frameTCX / nSubframes;
-
-                if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
-                {
-                    wtda_ext( hTcxEnc->new_speech_TCX, mdstWin, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX, 3 );
-                }
-                else
-                {
-                    /* Windowing for the MDST */
-                    WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1 );
-                }
-
-                if ( transform_type[frameno] == TCX_5 )
-                {
-                    /* Outer left folding */
-                    for ( i = 0; i < left_overlap / 2; i++ )
-                    {
-                        mdstWin[left_overlap / 2 + i] += mdstWin[left_overlap / 2 - 1 - i];
-                    }
-
-                    if ( frameno == 0 && overlap_mode[0] == FULL_OVERLAP && L_subframe - left_overlap > minWindowLen )
-                    {
-                        for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
-                        {
-                            mdstWin[left_overlap + i] += hTcxEnc->speech_TCX[-1 - i] * st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] * st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i];
-                        }
-                    }
-
-                    /* Outer right folding */
-                    for ( i = 0; i < right_overlap / 2; i++ )
-                    {
-                        mdstWin[L_subframe + left_overlap / 2 - 1 - i] -= mdstWin[L_subframe + left_overlap / 2 + i];
-                    }
-
-                    /* 2xTCX5 */
-                    L_subframe = tcx5SizeFB;
-                    folding_offset = left_overlap / 2;
-
-                    for ( i = 0; i < 2; i++ )
-                    {
-                        assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE );
-                        WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1 );
-
-                        TCX_MDST( tcx5Win, mdst_spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
-                        /* high-band gain control in case of BWS */
-                        if ( st->bwidth_sw_cnt > 0 )
-                        {
-                            v_multc( mdst_spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ), (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, mdst_spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ), L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
-                        }
-                    }
-                }
-                else /* transform_type[frameno] != TCX_5 */
-                {
-                    if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
-                    {
-                        edst( mdstWin, mdst_spectrum[frameno], L_subframe, st->element_mode );
-
-                        v_multc( mdst_spectrum[frameno], (float) sqrt( (float) NORM_MDCT_FACTOR / L_subframe ), mdst_spectrum[frameno], L_subframe );
-                    }
-                    else
-                    {
-                        if ( frameno == 0 && transform_type[0] == TCX_10 && overlap_mode[0] == FULL_OVERLAP && L_subframe - left_overlap > minWindowLen )
-                        {
-                            for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
-                            {
-                                mdstWin[left_overlap + i] += hTcxEnc->speech_TCX[-1 - i] * st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] * st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i];
-                            }
-                        }
-
-                        TCX_MDST( mdstWin, mdst_spectrum[frameno], left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
-                    }
-
-                    /* high-band gain control in case of BWS */
-                    if ( st->bwidth_sw_cnt > 0 )
-                    {
-                        v_multc( mdst_spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, mdst_spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes );
-                    }
-                }
-
-                if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
-                {
-                    set_f( &mdst_spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE );
-                }
-            }
-#endif
         }
 
         IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
@@ -567,9 +413,6 @@ void core_signal_analysis_high_bitrate_fx(
                             st->hTcxCfg->tcx_coded_lines,
                             transform_type[frameno], ( frameno == 0 ) && ( st->last_core == ACELP_CORE ),
                             spectrum[frameno], &hTcxEnc->tnsData[frameno], &hTcxEnc->fUseTns[frameno], NULL );
-#ifdef IVAS_CODE
-            IF( st->hTcxCfg->fIsTNSAllowed )
-#endif
             {
                 EncodeTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, &hTcxEnc->tnsData[frameno],
                                   param_core + frameno * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, pTnsSize + frameno, pTnsBits + frameno );
@@ -591,9 +434,6 @@ void core_signal_analysis_high_bitrate_fx(
              * LPC analysis
              *---------------------------------------------------------------*/
 
-#ifdef IVAS_CODE
-            IF( st->tcxonly )
-#endif
             {
                 HBAutocorrelation_fx( st->hTcxCfg, lpc_left_overlap_mode, lpc_right_overlap_mode, &st->speech_enc_pe[frameno * tcx10Size],
                                       shr( L_frame, sub( nSubframes, 1 ) ), r, M );
@@ -683,6 +523,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
     Word16 alw_voicing[2], alw_voicing_wc = -1;
     Word16 disable_ltp = 0;
     Word16 tmp, *tmpP16;
+    Word16 q_mdstWin = st->q_inp, q_tcx20Win = st->q_inp;
     Word32 *tmpP32;
     Word16 Q_exp;
     Word32 L_tmpbuf[N_MAX + L_MDCT_OVLP_MAX];
@@ -692,15 +533,18 @@ void core_signal_analysis_high_bitrate_ivas_fx(
     move16();
     move16();
     move16();
+    move16();
+    move16();
     (void) vad_hover_flag;
-
+    Word16 Q_win_temp[2];
     Word16 *speech_ltp_fx = NULL;
     Word16 *wspeech_fx = NULL;
     Word16 *speech_fx = NULL;
-    Word16 q_out_wtda = 0;
+    Word16 q_out_wtda = st->q_inp;
     move16();
-    Word16 win_len = 0;
+    Word16 win_len[2];
     move16();
+    Word16 shift;
     set32_fx( buf_powerSPec, 0, N_MAX + L_MDCT_OVLP_MAX );
     set16_fx( buf_powerSPec_exp, 0, N_MAX + L_MDCT_OVLP_MAX );
 
@@ -718,8 +562,9 @@ void core_signal_analysis_high_bitrate_ivas_fx(
     test();
     IF( st->tcxonly && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
     {
-        Copy( new_samples, st->new_speech_enc, L_frame ); /* Q0 */
-        Scale_sig( st->new_speech_enc, L_frame, 1 );      // Q1
+        Copy_Scale_sig( new_samples, st->new_speech_enc, L_frame, sub( 15, st->exp_buf_speech_enc ) );
+        /* st->new_speech_enc copied from new_samples in Q  st->exp_buf_speech_enc
+        This is considering new_samples is in q 0 in current code*/
     }
 
     /*--------------------------------------------------------------*
@@ -755,10 +600,9 @@ void core_signal_analysis_high_bitrate_ivas_fx(
     test();
     IF( st->tcxonly && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
     {
-        Copy( st->speech_enc + st->encoderLookahead_enc, st->new_speech_enc_pe, L_frame );
+        Copy( st->speech_enc + st->encoderLookahead_enc, st->new_speech_enc_pe, L_frame ); // Assuming both exp_buf_speech_enc_pe and exp_buf_speech_enc are same
 
-        Preemph_scaled( st->new_speech_enc_pe, Q_new, &( st->mem_preemph_enc ),
-                        st->Q_max_enc, st->preemph_fac, 1, 0, 2, L_frame, st->coder_type_raw, 1 );
+        PREEMPH_FX( st->new_speech_enc_pe, st->preemph_fac, L_frame, &( st->mem_preemph_enc ) ); // using this to keep values alligned in Q-1
     }
 
     /* Rescale Memory */
@@ -926,6 +770,8 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                 assert( frameno == 0 );
                 windowed_samples[0] = L_deposit_l( overlap_mode[frameno] );     // Q0
                 windowed_samples[1] = L_deposit_l( overlap_mode[frameno + 1] ); // Q0
+                *q_win = 0;
+                move16();
             }
             IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
             {
@@ -961,15 +807,24 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             IF( windowed_samples != NULL ) /* save windowed speech_TCX samples */
             {
                 assert( L_subframe + ( left_overlap + right_overlap ) / 2 < 2 * L_FRAME_MAX / nSubframes - L_FRAME_MAX / 8 );
-                win_len = add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) );
-                windowed_samples[frameno * L_FRAME_MAX + 0] = L_deposit_l( overlap_mode[frameno] );     // Q0
+                win_len[frameno] = add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) );
+                move16();
+                windowed_samples[frameno * L_FRAME_MAX + 0] = L_deposit_l( overlap_mode[frameno] ); // Q0
+                move32();
                 windowed_samples[frameno * L_FRAME_MAX + 1] = L_deposit_l( overlap_mode[frameno + 1] ); // Q0
-                Copy_Scale_sig_16_32( tcx20Win, windowed_samples + add( imult1616( frameno, L_FRAME_MAX ), 2 ), add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ), 0 );
+                move32();
+                Copy_Scale_sig_16_32_DEPREC( tcx20Win, windowed_samples + add( imult1616( frameno, L_FRAME_MAX ), 2 ), add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ), negate( q_tcx20Win ) );
                 *q_win = s_min( *q_win, sub( L_norm_arr( windowed_samples + add( imult1616( frameno, L_FRAME_MAX ), 2 ), add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ) ), 1 ) );
                 move16();
-#ifdef MSAN_FIX
-                Scale_sig32( windowed_samples + frameno * L_FRAME_MAX + 2, win_len, *q_win ); // q_win
-#endif
+                Q_win_temp[frameno] = *q_win;
+                move16();
+
+                Scale_sig32( windowed_samples + frameno * L_FRAME_MAX + 2, win_len[frameno], *q_win ); // q_win
+
+                IF( EQ_16( frameno, 1 ) )
+                {
+                    Scale_sig32( windowed_samples + 2, win_len[0], sub( *q_win, Q_win_temp[0] ) ); // q_win
+                }
             }
         }
 
@@ -980,11 +835,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             /* Outter left folding */
             FOR( i = 0; i < folding_offset; i++ )
             {
-#ifdef BASOP_NOGLOB
-                tcx20Win[folding_offset + i] = sub_sat( tcx20Win[folding_offset + i], tcx20Win[folding_offset - 1 - i] ); // Q0
-#else
-                tcx20Win[folding_offset + i] = sub( tcx20Win[folding_offset + i], tcx20Win[folding_offset - 1 - i] );
-#endif
+                tcx20Win[folding_offset + i] = sub_sat( tcx20Win[folding_offset + i], tcx20Win[folding_offset - 1 - i] ); // q_tcx20Win
                 move16();
             }
 
@@ -997,26 +848,16 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                 Word32 L_tmp;
                 FOR( i = minWindowLen; i >= tmp; i-- ) /* outer left folding of shortened long ALDO slope */
                 {
-                    L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                    L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16, Q15) -> Q16
-                    L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                    tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                    tcx20Win[left_overlap + i] = sub( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                    L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                    L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16 + q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                    tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_h( L_tmp ) );                                // q_tcx20Win
                     move32();
                 }
                 FOR( i = tmp - 1; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
                 {
-                    L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                    L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16, Q15) -> Q16
-                    L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                    tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                    tcx20Win[left_overlap + i] = sub( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                    L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                    L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16 + q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                    tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_h( L_tmp ) );                                // q_tcx20Win
                     move32();
                 }
             }
@@ -1025,11 +866,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             tmp = shr( right_overlap, 1 );
             FOR( i = 0; i < tmp; i++ )
             {
-#ifdef BASOP_NOGLOB
-                tcx20Win[L_subframe + folding_offset - 1 - i] = add_sat( tcx20Win[L_subframe + folding_offset - 1 - i], tcx20Win[L_subframe + folding_offset + i] ); // Q0
-#else
-                tcx20Win[L_subframe + folding_offset - 1 - i] = add( tcx20Win[L_subframe + folding_offset - 1 - i], tcx20Win[L_subframe + folding_offset + i] );
-#endif
+                tcx20Win[L_subframe + folding_offset - 1 - i] = add_sat( tcx20Win[L_subframe + folding_offset - 1 - i], tcx20Win[L_subframe + folding_offset + i] ); // q_tcx20Win
                 move16();
             }
 
@@ -1040,6 +877,12 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             tmpP16 = tcx20Win;
             tmpP32 = hTcxEnc->spectrum_fx[frameno];
             assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE );
+            Word16 len[2], exp[2];
+            hTcxEnc->spectrum_e[frameno] = sub( 16, q_tcx20Win );
+            exp[0] = exp[1] = hTcxEnc->spectrum_e[frameno];
+            move16();
+            move16();
+            move16();
             FOR( i = 0; i < 2; i++ )
             {
                 test();
@@ -1050,17 +893,17 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                               mac_r( 2 << 16, -( 3 << 8 ), shl( i, 7 ) ), /* equivalent to: sub(i, 1) == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP */
                               &left_overlap, &right_overlap, tmpP16, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1 );
 
-                hTcxEnc->spectrum_e[frameno] = 16;
-                move16();
                 TCX_MDCT( tcx5Win,
                           tmpP32,
-                          &hTcxEnc->spectrum_e[frameno],
+                          &exp[i],
                           left_overlap,
                           sub( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ),
                           right_overlap, st->element_mode );
 
                 tmpP16 += tcx5SizeFB;
                 tmpP32 += tcx5SizeFB;
+                len[i] = L_subframe;
+                move16();
 
                 /* high-band gain control in case of BWS */
                 IF( st->bwidth_sw_cnt > 0 )
@@ -1077,6 +920,13 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                                    L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
                 }
             }
+            hTcxEnc->spectrum_e[frameno] = s_max( exp[0], exp[1] );
+            move16();
+
+            FOR( i = 0; i < 2; i++ )
+            {
+                scale_sig32( hTcxEnc->spectrum_fx[frameno] + i * L_subframe, len[i], sub( exp[i], hTcxEnc->spectrum_e[frameno] ) );
+            }
         }
         ELSE /* transform_type[frameno] != TCX_5 */
         {
@@ -1118,31 +968,23 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                     Word32 L_tmp;
                     FOR( i = minWindowLen; i >= tmp; i-- ) /* outer left folding of shortened long ALDO slope */
                     {
-                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16, Q15) -> Q16
-                        L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                        tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                        tcx20Win[left_overlap + i] = sub( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16, Q15) -> Q16 + q_tcx20Win
+                        tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_h( L_tmp ) );                                // q_tcx20Win
                         move32();
                     }
                     FOR( i = tmp - 1; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
                     {
-                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16, Q15) -> Q16
-                        L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                        tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                        tcx20Win[left_overlap + i] = sub( tcx20Win[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16 + q_tcx20Win, Q15) -> Q16 + q_tcx20Win
+                        tcx20Win[left_overlap + i] = sub_sat( tcx20Win[left_overlap + i], extract_h( L_tmp ) );                                // q_tcx20Win
                         move32();
                     }
                 }
 
                 TCX_MDCT( tcx20Win, hTcxEnc->spectrum_fx[frameno], &hTcxEnc->spectrum_e[frameno], left_overlap, sub( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ), right_overlap, st->element_mode );
+                hTcxEnc->spectrum_e[frameno] = sub( hTcxEnc->spectrum_e[frameno], q_tcx20Win );
+                move16();
             }
 
             /* high-band gain control in case of BWS */
@@ -1168,34 +1010,48 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                 IF( EQ_16( hTcxEnc->tcxMode, TCX_20 ) && ( ( LT_32( st->total_brate, HQ_96k ) ) || st->igf ) )
                 {
                     pMdstWin = tcx20Win;
+                    Word16 q_pmdstWin = q_tcx20Win;
+                    move16();
                     test();
                     if ( ( ( EQ_16( hTcxEnc->tcxMode, TCX_20 ) ) && ( NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) ) ) )
                     {
                         pMdstWin = mdstWin;
+                        q_pmdstWin = q_mdstWin;
+                        move16();
                     }
 
                     /* Compute noise-measure flags for spectrum filling and quantization */
                     AnalyzePowerSpectrum_ivas_fx( st, div_l( L_mult( L_subframe, st->L_frame ), hTcxEnc->L_frameTCX ),
                                                   L_subframe, left_overlap, right_overlap, hTcxEnc->spectrum_fx[frameno], hTcxEnc->spectrum_e[frameno],
-                                                  pMdstWin, powerSpec, powerSpec_e );
+                                                  pMdstWin, q_pmdstWin, powerSpec, powerSpec_e );
                 }
             }
         }
 
         IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
         {
+            Word16 scale;
             L_subframe = idiv1616( L_frameTCX, nSubframes ); /* Q0 */
 
             test();
             IF( EQ_16( transform_type[frameno], TCX_20 ) && NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) )
             {
                 wtda_ext_fx( hTcxEnc->new_speech_TCX, mdstWin, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX, 3 );
-                Scale_sig( mdstWin, L_frameTCX, 1 );
+                scale = sub( norm_arr( mdstWin, L_frameTCX ), 1 );
+                scale = s_min( 1, scale ); // restricting the Q to zero or less
+                scale_sig( mdstWin, L_frameTCX, scale );
+                q_mdstWin = add( add( st->q_inp, -1 ), scale );
             }
             ELSE
             {
+                Word16 sig_len;
                 /* Windowing for the MDST */
                 WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1 );
+                sig_len = add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) );
+                scale = sub( norm_arr( mdstWin, sig_len ), 1 );
+                scale = s_min( 0, scale ); // restricting the Q to zero or less
+                scale_sig( mdstWin, sig_len, scale );
+                q_mdstWin = add( scale, st->q_inp );
             }
 
             IF( EQ_16( transform_type[frameno], TCX_5 ) )
@@ -1203,11 +1059,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                 /* Outer left folding */
                 FOR( i = 0; i < left_overlap / 2; i++ )
                 {
-#ifdef BASOP_NOGLOB
-                    mdstWin[left_overlap / 2 + i] = add_sat( mdstWin[left_overlap / 2 + i], mdstWin[left_overlap / 2 - 1 - i] ); // Q0
-#else
-                    mdstWin[left_overlap / 2 + i] = add( mdstWin[left_overlap / 2 + i], mdstWin[left_overlap / 2 - 1 - i] );
-#endif
+                    mdstWin[left_overlap / 2 + i] = add( mdstWin[left_overlap / 2 + i], mdstWin[left_overlap / 2 - 1 - i] ); // q_mdstWin
                 }
 
                 test();
@@ -1215,29 +1067,22 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                 IF( frameno == 0 && overlap_mode[0] == FULL_OVERLAP && GT_16( sub( L_subframe, left_overlap ), minWindowLen ) )
                 {
                     tmp = shr( st->hTcxCfg->tcx_mdct_window_min_lengthFB, 1 );
+                    shift = sub( q_mdstWin, add( Q16, st->q_inp ) );
                     Word32 L_tmp;
                     FOR( i = minWindowLen; i >= tmp; i-- ) /* outer left folding of shortened long ALDO slope */
                     {
-                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16, Q15) -> Q16
-                        L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                        mdstWin[left_overlap + i] = add_sat( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                        mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_inp, Q15) -> Q16 + q_inp
+                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16 + q_inp, Q15) -> Q16 + q_inp
+                        L_tmp = L_shl( L_tmp, shift );                                                                                         // q_mdstWin
+                        mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) );                                      // q_mdstWin
                         move32();
                     }
                     FOR( i = tmp - 1; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
                     {
-                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16, Q15) -> Q16
-                        L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                        mdstWin[left_overlap + i] = add_sat( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                        mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                        L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_inp, Q15) -> Q16 + q_inp
+                        L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16 + q_inp, Q15) -> Q16 + q_inp
+                        L_tmp = L_shl( L_tmp, shift );                                                                                         // q_mdstWin
+                        mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) );                                      // q_mdstWin
                         move32();
                     }
                 }
@@ -1245,11 +1090,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                 /* Outer right folding */
                 FOR( i = 0; i < right_overlap / 2; i++ )
                 {
-#ifdef BASOP_NOGLOB
-                    mdstWin[L_subframe + left_overlap / 2 - 1 - i] = sub_sat( mdstWin[L_subframe + left_overlap / 2 - 1 - i], mdstWin[L_subframe + left_overlap / 2 + i] ); // Q0
-#else
-                    mdstWin[L_subframe + left_overlap / 2 - 1 - i] = sub( mdstWin[L_subframe + left_overlap / 2 - 1 - i], mdstWin[L_subframe + left_overlap / 2 + i] );
-#endif
+                    mdstWin[L_subframe + left_overlap / 2 - 1 - i] = sub( mdstWin[L_subframe + left_overlap / 2 - 1 - i], mdstWin[L_subframe + left_overlap / 2 + i] ); // q_mdstWin
                     move16();
                 }
 
@@ -1264,7 +1105,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                     assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE );
                     WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1 );
 
-                    spectrum_e[frameno] = 16;
+                    spectrum_e[frameno] = sub( 16, q_mdstWin );
                     move16();
                     TCX_MDST( tcx5Win, spectrum[frameno] + i * tcx5SizeFB, &spectrum_e[frameno], left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
                     /* high-band gain control in case of BWS */
@@ -1285,14 +1126,14 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             }
             ELSE /* transform_type[frameno] != TCX_5 */
             {
-                spectrum_e[frameno] = 16;
+                spectrum_e[frameno] = sub( 16, q_mdstWin );
                 test();
                 IF( EQ_16( transform_type[frameno], TCX_20 ) && NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) )
                 {
                     Word16 Q;
                     Copy_Scale_sig_16_32_no_sat( mdstWin, L_tmpbuf, N_MAX + L_MDCT_OVLP_MAX, 16 );
 
-                    Q = 16;
+                    Q = add( q_mdstWin, 16 );
                     move16();
                     edst_fx( L_tmpbuf, spectrum[frameno], L_subframe, &Q );
                     spectrum_e[frameno] = 31 - Q;
@@ -1315,28 +1156,21 @@ void core_signal_analysis_high_bitrate_ivas_fx(
                     {
                         tmp = shr( st->hTcxCfg->tcx_mdct_window_min_lengthFB, 1 );
                         Word32 L_tmp;
+                        shift = sub( q_mdstWin, add( Q16, st->q_inp ) );
                         FOR( i = minWindowLen; i >= tmp; i-- ) /* outer left folding of shortened long ALDO slope */
                         {
-                            L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                            L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16, Q15) -> Q16
-                            L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                            mdstWin[left_overlap + i] = add_sat( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                            mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                            L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_inp, Q15) -> Q16 + q_inp
+                            L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16 + q_inp, Q15) -> Q16 + q_inp
+                            L_tmp = L_shl( L_tmp, shift );                                                                                         // q_mdstWin
+                            mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) );                                      // q_mdstWin
                             move32();
                         }
                         FOR( i = tmp - 1; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
                         {
-                            L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                            L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16, Q15) -> Q16
-                            L_tmp = L_shl( L_tmp, sub( 0, Q16 ) );                                                                                 // Q0
-#ifdef BASOP_NOGLOB
-                            mdstWin[left_overlap + i] = add_sat( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#else
-                            mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) ); // Q0
-#endif
+                            L_tmp = L_mult( hTcxEnc->speech_TCX[-1 - i], st->hTcxCfg->tcx_aldo_window_1_FB[left_overlap / 2 + minWindowLen - i] ); // (q_inp, Q15) -> Q16 + q_inp
+                            L_tmp = Mpy_32_16_1( L_tmp, st->hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16 + q_inp, Q15) -> Q16 + q_inp
+                            L_tmp = L_shl( L_tmp, shift );                                                                                         // q_mdstWin
+                            mdstWin[left_overlap + i] = add( mdstWin[left_overlap + i], extract_l( L_tmp ) );                                      // q_mdstWin
                             move32();
                         }
                     }
@@ -1415,23 +1249,11 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             IF( st->igf )
             {
                 Word16 q_spectrum = sub( Q31, hTcxEnc->spectrum_e[frameno] );
-                ProcessIGF_ivas_fx( st, hTcxEnc->spectrum_fx[frameno], hTcxEnc->spectrum_fx[frameno], &q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
+                ProcessIGF_ivas_fx( st, N_MAX + L_MDCT_OVLP_MAX, hTcxEnc->spectrum_fx[frameno], &q_spectrum, hTcxEnc->spectrum_fx[frameno], q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
             }
         }
     }
 
-#ifndef MSAN_FIX
-    IF( windowed_samples != NULL )
-    {
-        FOR( frameno = 0; frameno < nSubframes; frameno++ )
-        {
-            IF( !( ( EQ_16( transform_type[frameno], TCX_20 ) ) && ( NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) ) ) )
-            {
-                Scale_sig32( windowed_samples + frameno * L_FRAME_MAX + 2, win_len, *q_win );
-            }
-        }
-    }
-#endif
 
     IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
     {
diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c
deleted file mode 100644
index 5c493876bab2caeb84ae0a6f9db36e2bcd1c5371..0000000000000000000000000000000000000000
--- a/lib_enc/fd_cng_enc.c
+++ /dev/null
@@ -1,1154 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
-#include "stat_enc.h"
-#include "wmc_auto.h"
-
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * initFdCngEnc()
- *
- * Initialize FD_CNG
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * deleteFdCngEnc()
- *
- * Delete the instance of type FD_CNG
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * resetFdCngEnc()
- *
- * Reset the instance of type FD_CNG
- *-------------------------------------------------------------------*/
-/*-------------------------------------------------------------------*
- * perform_noise_estimation_enc()
- *
- * Perform noise estimation
- *-------------------------------------------------------------------*/
-void perform_noise_estimation_enc_ivas_fx(
-    Word32 *band_energies, /* i: energy in critical bands without minimum noise floor MODE2_E_MIN	band_energies_exp*/
-    Word16 band_energies_exp,
-    Word32 *enerBuffer, /* enerBuffer_exp */
-    Word16 enerBuffer_exp,
-    HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: CNG structure containing all buffers and variables        */
-    const Word32 input_Fs,       /* i  : input sampling rate                                       Q0*/
-    CPE_ENC_HANDLE hCPE          /* i  : CPE encoder structure                                     */
-)
-{
-    Word16 i, j, s, s1, s2;
-    Word16 numBands;
-    Word16 numCoreBands = hFdCngEnc->hFdCngCom->numCoreBands; /* Q0 */
-    move16();
-    Word16 regularStopBand = hFdCngEnc->hFdCngCom->regularStopBand; /* Q0 */
-    move16();
-    Word16 numSlots = hFdCngEnc->hFdCngCom->numSlots; /* Q0 */
-    move16();
-    assert( numSlots == 16 );
-
-    Word32 numSlots_inv_fx = 134217728;
-    move32();
-    Word32 *periodog = hFdCngEnc->hFdCngCom->periodog; /* exp(peridog_exp) */
-    Word32 *ptr_per_fx = periodog;
-    Word16 npart = hFdCngEnc->hFdCngCom->npart; /* Q0 */
-    move16();
-    Word16 nFFTpart = hFdCngEnc->hFdCngCom->nFFTpart; /* Q0 */
-    move16();
-    Word16 nCLDFBpart = hFdCngEnc->hFdCngCom->nCLDFBpart; /* Q0 */
-    move16();
-
-    Word16 *psize = hFdCngEnc->hFdCngCom->psize; // 6Q9
-    Word32 *msPeriodog_fx = hFdCngEnc->msPeriodog_fx;
-    Word32 *msNoiseEst_fx = hFdCngEnc->msNoiseEst_fx; /* exp(msNoiseEst_fx_exp) */
-
-    Word16 *msLogPeriodog_fx = hFdCngEnc->msLogPeriodog_fx;
-    Word16 *msLogNoiseEst_fx = hFdCngEnc->msLogNoiseEst_fx;
-
-    Word32 scaleEB_fx = 0;
-    move32();
-    Word32 tmp;
-
-    test();
-    IF( hCPE != NULL && hCPE->hStereoDft != NULL )
-    {
-        // band_res_dft = ( (float) input_Fs ) / hCPE->hStereoDft->NFFT;
-        // chan_width_f = 24000.f / CLDFB_NO_CHANNELS_MAX;
-        // chan_width_bins = chan_width_f / band_res_dft;
-
-        ///* Scaling of Energy buffer to get energy per sample, same scaling as for band_energies, 3 is to compensate for the 1/3 scaling in calculate_energy_buffer */
-        // scaleEB = 3 * 4.0f / ( hCPE->hStereoDft->NFFT * hCPE->hStereoDft->NFFT );
-
-        ///* Scale with number of bins in one band */
-        // scaleEB = scaleEB / chan_width_bins;
-
-        SWITCH( input_Fs )
-        {
-            case 8000:
-                scaleEB_fx = 62912;
-                move32();
-                BREAK;
-            case 16000:
-                scaleEB_fx = 15728;
-                move32();
-                BREAK;
-            case 32000:
-                scaleEB_fx = 3928;
-                move32();
-                BREAK;
-            case 48000:
-                scaleEB_fx = 1744;
-                move32();
-                BREAK;
-            default:
-                assert( 0 && "invalid sample rate" );
-        }
-    }
-    ELSE
-    {
-        scaleEB_fx = Mpy_32_16_1( numSlots_inv_fx, hFdCngEnc->hFdCngCom->scalingFactor );
-        scaleEB_fx = L_shl( scaleEB_fx, 4 );
-    }
-
-    /* preemphasis compensation and grouping of per bin energies into msPeriodog */
-    FOR( i = 0; i < nFFTpart; i++ )
-    {
-        tmp = L_add( L_shr( band_energies[i], 1 ), L_shr( band_energies[i + NB_BANDS], 1 ) );
-        msPeriodog_fx[i] = Mpy_32_16_1( tmp, preemphCompensation_fx[i] );
-        move32();
-    }
-
-    /* exponent for fft part of msPeriodog */
-    hFdCngEnc->msPeriodog_fx_exp_fft = add( band_energies_exp, PREEMPH_COMPENSATION_EXP );
-    move16();
-
-    /* Adjust to the desired time resolution by averaging the periodograms over the time slots */
-    FOR( j = numCoreBands; j < regularStopBand; j++ )
-    {
-        *ptr_per_fx = Mpy_32_32( enerBuffer[j], scaleEB_fx ); /* exp(enerBuffer_exp) */
-        move32();
-
-        ptr_per_fx++;
-        move16();
-    }
-
-    /* exponent for cldfb part of msPeriodog */
-    hFdCngEnc->hFdCngCom->exp_cldfb_periodog = add( sub( enerBuffer_exp, 4 ), CLDFBscalingFactor_EXP );
-    move16();
-
-    numBands = sub( regularStopBand, numCoreBands ); /* Q0 */
-
-    IF( numBands > 0 )
-    {
-        ///* Adjust CLDFB filterbank to the desired frequency resolution by averaging over spectral partitions for SID transmission */
-        bandcombinepow(
-            periodog,
-            hFdCngEnc->hFdCngCom->exp_cldfb_periodog,
-            numBands,
-            hFdCngEnc->hFdCngCom->CLDFBpart,
-            nCLDFBpart,
-            hFdCngEnc->hFdCngCom->CLDFBpsize_inv,
-            &msPeriodog_fx[nFFTpart],
-            &hFdCngEnc->msPeriodog_fx_exp_cldfb );
-
-        ///* find common exponent for fft part and cldfb part of msperiodog */
-        s1 = getScaleFactor32( msPeriodog_fx, nFFTpart );
-        s2 = getScaleFactor32( &msPeriodog_fx[nFFTpart], nCLDFBpart );
-
-        s = s_max( sub( hFdCngEnc->msPeriodog_fx_exp_fft, s1 ), sub( hFdCngEnc->msPeriodog_fx_exp_cldfb, s2 ) );
-        s1 = sub( s, hFdCngEnc->msPeriodog_fx_exp_fft );
-        s2 = sub( s, hFdCngEnc->msPeriodog_fx_exp_cldfb );
-
-        hFdCngEnc->msPeriodog_fx_exp_fft = s;
-        move16();
-        hFdCngEnc->msPeriodog_fx_exp_cldfb = s;
-        move16();
-
-        FOR( i = 0; i < nFFTpart; i++ )
-        {
-            msPeriodog_fx[i] = L_shr( msPeriodog_fx[i], s1 ); /*  hFdCngEnc->msPeriodog_fx_exp_fft */
-            move32();
-        }
-
-        FOR( i = 0; i < nCLDFBpart; i++ )
-        {
-            msPeriodog_fx[nFFTpart + i] = L_shr( msPeriodog_fx[nFFTpart + i], s_min( 31, s2 ) ); /*  hFdCngEnc->msPeriodog_fx_exp_fft */
-            move32();
-        }
-    }
-    /* exponent for entire msPeriodog vector */
-    hFdCngEnc->msPeriodog_fx_exp = hFdCngEnc->msPeriodog_fx_exp_fft;
-    move16();
-
-    /* Compress MS inputs */
-    // compress_range_flt( msPeriodog, msLogPeriodog, npart );
-    compress_range( msPeriodog_fx, hFdCngEnc->msPeriodog_fx_exp, msLogPeriodog_fx, npart );
-
-
-    /* Call the minimum statistics routine for noise estimation */
-
-    minimum_statistics_fx( npart, nFFTpart, psize, msLogPeriodog_fx, hFdCngEnc->msNoiseFloor_fx, msLogNoiseEst_fx, hFdCngEnc->msAlpha_fx, hFdCngEnc->msPsd_fx, hFdCngEnc->msPsdFirstMoment_fx,
-                           hFdCngEnc->msPsdSecondMoment_fx, hFdCngEnc->msMinBuf_fx, hFdCngEnc->msBminWin_fx, hFdCngEnc->msBminSubWin_fx, hFdCngEnc->msCurrentMin_fx, hFdCngEnc->msCurrentMinOut_fx, hFdCngEnc->msCurrentMinSubWindow_fx, hFdCngEnc->msLocalMinFlag, hFdCngEnc->msNewMinFlag, hFdCngEnc->msPeriodogBuf_fx, &( hFdCngEnc->msPeriodogBufPtr ), hFdCngEnc->hFdCngCom,
-                           ENC, ( hCPE == NULL ) ? 0 : hCPE->element_mode );
-
-    /* Expand MS outputs */
-    expand_range( msLogNoiseEst_fx, msNoiseEst_fx, &hFdCngEnc->msNoiseEst_fx_exp, hFdCngEnc->hFdCngCom->npart );
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * FdCng_encodeSID()
- *
- * Generate a bitstream out of the partition levels
- *-------------------------------------------------------------------*/
-void FdCng_encodeSID_ivas_fx(
-    Encoder_State *st /* i/o: encoder state structure     */
-)
-{
-    Word16 N;
-    HANDLE_FD_CNG_ENC hFdCngEnc = st->hFdCngEnc;
-    HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom;
-    BSTR_ENC_HANDLE hBstr = st->hBstr;
-
-    Word32 *invTrfMatrix_fx, *E_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    Word32 v_fx[32], gain_fx, e_fx, temp;
-    Word16 w_fx[32], indices[32], exp[32];
-    Word32 dct_target_fx[FDCNG_VQ_DCT_MAXTRUNC];
-    Word32 tot_sig_ext_fx[FDCNG_VQ_MAX_LEN];
-    Word16 v_e, gain_q_offset, preemph_fac;
-    Word16 i, index;
-
-    gain_q_offset = GAIN_Q_OFFSET_IVAS_FX_Q0;
-    move16();
-
-    if ( st->element_mode == EVS_MONO )
-    {
-        gain_q_offset = GAIN_Q_OFFSET_EVS_FX_Q0;
-        move16();
-    }
-
-    preemph_fac = st->preemph_fac; // Q15
-    move16();
-
-    /* Init */
-    N = hFdCngEnc->npartDec;
-    move16();
-
-    E_fx = hFdCngEnc->msNoiseEst_fx;
-
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /* dynamically filled  */
-
-    set_zero_fx( v_fx, FDCNG_VQ_MAX_LEN );
-
-    /* Convert to LOG */
-    e_fx = 0;
-    move32();
-    FOR( i = 0; i < N; i++ )
-    {
-        IF( E_fx[i] == 0 )
-        {
-            /* 10 * log(1e-4) = 10 * (-4) = -40 */
-            v_fx[i] = -41943040; // -40.0 in Q20
-            move32();
-        }
-        ELSE
-        {
-            v_fx[i] = Mpy_32_32( 671088640 /*10 in Q26*/, BASOP_Util_Log10( E_fx[i], hFdCngEnc->msNoiseEst_fx_exp ) ); // Q20 = 26+25-31
-            move32();
-        }
-        e_fx = L_add( e_fx, v_fx[i] ); // Q20
-    }
-
-    /* Normalize MSVQ input */
-    gain_fx = 0;
-    move32();
-    FOR( i = N_GAIN_MIN; i < N_GAIN_MAX; i++ )
-    {
-        gain_fx = L_add( gain_fx, v_fx[i] ); // Q20
-    }
-
-    /*gain /= (float) ( N_GAIN_MAX - N_GAIN_MIN );*/
-    gain_fx = Mpy_32_32( gain_fx, 165191050 /* 1/13 in Q31*/ ); // Q20
-
-    FOR( i = 0; i < N; i++ )
-    {
-        v_fx[i] = L_sub( v_fx[i], gain_fx ); // Q20
-        move32();
-    }
-
-    v_e = 11; // Q20
-    move16();
-
-    /* MSVQ encoder */
-    set_val_Word16( w_fx, ONE_IN_Q8, N );
-
-    IF( st->element_mode != EVS_MONO )
-    {
-        /* DCT domain compressed/truncated indices used for first stage  */
-        /*  quantization with stage1 stored in DCT24 domain,   stages 2 through 6 directly dearched
-           in FDCNG band domain
-        */
-        IF( EQ_16( N, FDCNG_VQ_MAX_LEN_WB ) )
-        {
-            /* truncated DCT21 analysis */
-            create_IDCT_N_Matrix_fx( invTrfMatrix_fx, N, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) ); // Q31
-
-            dctT2_N_apply_matrix_fx( v_fx /*Q20*/, dct_target_fx, FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX ); // Q20
-
-            /* truncated IDCT21 extension to 24 bands  */
-            extend_dctN_input_fx( v_fx, dct_target_fx, N, tot_sig_ext_fx, FDCNG_VQ_MAX_LEN, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); // Q20
-
-            Copy32( tot_sig_ext_fx, v_fx, FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ stage #1 */ // Q20
-        }
-
-        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) ); // Q31
-
-        msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, v_fx, v_e, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w_fx, N, FD_CNG_maxN_37bits, 1, invTrfMatrix_fx, indices );
-
-        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, v_fx, NULL, 7 );
-
-        v_e = sub( 31, sub( 20, find_guarded_bits_fx( N ) ) );
-    }
-    ELSE
-    { /* EVS_MONO tables */
-        msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, v_fx, v_e, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w_fx, N, FD_CNG_maxN_37bits, 0, NULL, indices );
-
-        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v_fx, NULL, 7 );
-
-        v_e = sub( 31, sub( 20, find_guarded_bits_fx( N ) ) );
-    }
-
-    /* Compute gain */
-    gain_fx = 0;
-    move32();
-    FOR( i = 0; i < N; i++ )
-    {
-        gain_fx = L_add( gain_fx, v_fx[i] ); // Q = 31 - v_e
-    }
-
-    e_fx = L_shl( e_fx, sub( 11, v_e ) );                           // Q = 31 - v_e
-    gain_fx = Mpy_32_16_1( L_sub( e_fx, gain_fx ), div_s( 1, N ) ); // Q = 31 - v_e
-    gain_fx = L_shl( gain_fx, sub( v_e, 8 ) );                      // Q23
-
-    /* Apply bitrate-dependant scale */
-    IF( st->element_mode > EVS_MONO )
-    {
-        apply_scale( &gain_fx, hFdCngCom->CngBandwidth, hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-    }
-    ELSE
-    {
-        apply_scale( &gain_fx, hFdCngCom->CngBandwidth, hFdCngCom->CngBitrate, scaleTableMono, SIZE_SCALE_TABLE_MONO );
-    }
-
-    /* Quantize gain */
-    temp = Madd_32_32( L_shl( gain_q_offset, 22 ), gain_fx, 1610612736 /*1.5 in Q30*/ ); // Q22
-    index = extract_l( L_shr( L_add( temp, ONE_IN_Q21 ), 22 ) );                         // Q0
-
-    if ( index < 0 )
-    {
-        index = 0;
-        move16();
-    }
-
-    if ( GT_16( index, 127 ) )
-    {
-        index = 127;
-        move16();
-    }
-
-    gain_fx = L_shl( L_mult0( sub( index, gain_q_offset ), 21845 /*1.5 in Q15*/ ), sub( 16, v_e ) ); // Q = 31-v_e
-
-    /* Apply gain and undo log */
-    FOR( i = 0; i < N; i++ )
-    {
-        temp = Mpy_32_32( L_add( v_fx[i], gain_fx ), 214748365 /* 0.1 in Q31*/ ); // Q = 31-v_e
-        hFdCngCom->sidNoiseEst[i] = BASOP_Util_fPow( 10, 31, temp, v_e, &exp[i] );
-        move32();
-    }
-
-    maximum_s( exp, N, &hFdCngCom->sidNoiseEstExp );
-
-    FOR( i = 0; i < N; i++ )
-    {
-        hFdCngCom->sidNoiseEst[i] = L_shr( hFdCngCom->sidNoiseEst[i], sub( hFdCngCom->sidNoiseEstExp, exp[i] ) ); // exp = hFdCngCom->sidNoiseEstExp
-        move32();
-    }
-
-    /* NB last band energy compensation */
-    IF( hFdCngCom->CngBandwidth == NB )
-    {
-        hFdCngCom->sidNoiseEst[N - 1] = Mpy_32_16_1( hFdCngCom->sidNoiseEst[N - 1], NB_LAST_BAND_SCALE ); // exp(hFdCngCom->sidNoiseEstExp)
-        move32();
-    }
-
-    test();
-    IF( EQ_16( hFdCngCom->CngBandwidth, SWB ) && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
-    {
-        hFdCngCom->sidNoiseEst[N - 1] = Mpy_32_16_1( hFdCngCom->sidNoiseEst[N - 1], SWB_13k2_LAST_BAND_SCALE ); // exp(hFdCngCom->sidNoiseEstExp)
-        move32();
-    }
-
-    /* Write bitstream */
-    IF( EQ_16( st->codec_mode, MODE2 ) )
-    {
-        FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
-        {
-            push_next_indice( hBstr, indices[i], bits_37bits[i] );
-        }
-
-        push_next_indice( hBstr, index, 7 );
-    }
-    ELSE
-    {
-        Word16 is_frame_len_16k = 0;
-        move16();
-        if ( EQ_16( st->L_frame, L_FRAME16k ) )
-        {
-            is_frame_len_16k = 1;
-            move16();
-        }
-        push_indice( hBstr, IND_SID_TYPE, 1, 1 );
-        push_indice( hBstr, IND_BWIDTH, st->bwidth, 2 );
-        push_indice( hBstr, IND_ACELP_16KHZ, is_frame_len_16k, 1 );
-
-        FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
-        {
-            push_indice( hBstr, IND_LSF, indices[i], bits_37bits[i] );
-        }
-
-        push_indice( hBstr, IND_ENERGY, index, 7 );
-    }
-
-    /* Interpolate the bin/band-wise levels from the partition levels */
-    scalebands( hFdCngCom->sidNoiseEst, hFdCngEnc->partDec, hFdCngEnc->npartDec, hFdCngEnc->midbandDec, hFdCngEnc->nFFTpartDec, sub( hFdCngEnc->stopBandDec, hFdCngEnc->startBandDec ), hFdCngCom->cngNoiseLevel, 1 );
-    hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
-    move16();
-
-    lpc_from_spectrum( hFdCngCom, hFdCngEnc->startBandDec, hFdCngEnc->stopFFTbinDec, preemph_fac );
-
-    return;
-}
-
-
-/*-------------------------------------------------------------------*
- * stereoFdCngCoherence()
- *
- * compute coherence of channels for use in FD-CNG
- *-------------------------------------------------------------------*/
-void stereoFdCngCoherence_fx(
-    Encoder_State **sts,                        /* i/o: core encoder structures          */
-    const Word16 last_element_mode,             /* i  : last element mode                Q0*/
-    Word16 fft_buf_fx[CPE_CHANNELS][2 * L_FFT], /* i  : fft buffers for L and R channels fft_exp*/
-    Word16 fft_exp )
-{
-    const Word16 *pt_fftL, *pt_fftR;
-    Word16 i_subfr, i;
-    Word32 cr, ci, eL, eR;
-    Word16 cr_exp, ci_exp, eL_exp, eR_exp;
-    Word32 *mem;
-    Word16 *mem_exp;
-
-    IF( NE_16( last_element_mode, IVAS_CPE_MDCT ) )
-    {
-        set32_fx( sts[0]->hFdCngEnc->mem_coherence_fx, EPSILON_FX, 4 );
-        set16_fx( sts[0]->hFdCngEnc->mem_coherence_exp, 0, 4 );
-    }
-    test();
-    test();
-    IF( EQ_32( sts[0]->core_brate, -1 ) || EQ_32( sts[1]->core_brate, -1 ) )
-    {
-        /* case: at least one channel has triggered VAD -> ACTIVE FRAME */
-        IF( EQ_32( sts[0]->core_brate, -1 ) )
-        {
-            sts[1]->total_brate = sts[0]->total_brate; /* Q0 */
-            move32();
-            sts[1]->active_cnt = sts[0]->active_cnt; /* Q0 */
-            move16();
-            if ( GE_32( sts[1]->active_cnt, CNG_TYPE_HO ) )
-            {
-                sts[1]->last_total_brate_cng = -1;
-                move16();
-            }
-        }
-        IF( EQ_32( sts[1]->core_brate, -1 ) )
-        {
-            sts[0]->total_brate = sts[1]->total_brate; /* Q0 */
-            move32();
-            sts[0]->active_cnt = sts[1]->active_cnt; /* Q0 */
-            move16();
-            if ( GE_16( sts[0]->active_cnt, CNG_TYPE_HO ) )
-            {
-                sts[0]->last_total_brate_cng = -1;
-                move16();
-            }
-        }
-        sts[0]->core_brate = -1;
-        move32();
-        sts[1]->core_brate = -1;
-        move32();
-        sts[0]->hDtxEnc->cnt_SID = 0;
-        move16();
-        sts[1]->hDtxEnc->cnt_SID = 0;
-        move16();
-    }
-    ELSE IF( LE_32( sts[0]->core_brate, SID_2k40 ) && LE_32( sts[1]->core_brate, SID_2k40 ) )
-    {
-        /* case: no VAD for both channels -> INACTIVE FRAME */
-        reset_indices_enc( sts[0]->hBstr, sts[0]->hBstr->nb_ind_tot );
-
-        reset_indices_enc( sts[1]->hBstr, sts[1]->hBstr->nb_ind_tot );
-
-        /* synchronize SID sending for variable SID rate */
-        IF( EQ_32( sts[0]->core_brate, sts[1]->core_brate ) )
-        {
-            sts[0]->core_brate = SID_2k40;
-            move32();
-            sts[1]->core_brate = SID_2k40;
-            move32();
-        }
-
-        /* synchronize SID counters */
-        sts[0]->hDtxEnc->cnt_SID = s_min( sts[0]->hDtxEnc->cnt_SID, sts[1]->hDtxEnc->cnt_SID ); /* Q0 */
-        sts[1]->hDtxEnc->cnt_SID = sts[0]->hDtxEnc->cnt_SID;                                    /* Q0 */
-        move16();
-        move16();
-    }
-
-    pt_fftL = fft_buf_fx[0];
-    pt_fftR = fft_buf_fx[1];
-    mem = sts[0]->hFdCngEnc->mem_coherence_fx; /* exp(sts[0]->hFdCngEnc->mem_coherence_exp) */
-    mem_exp = sts[0]->hFdCngEnc->mem_coherence_exp;
-    FOR( i_subfr = 0; i_subfr < 2; i_subfr++ )
-    {
-        cr = ci = eL = eR = EPSILON_FX;
-        move32();
-        move32();
-        move32();
-        move32();
-        cr_exp = ci_exp = eL_exp = eR_exp = 0;
-        move16();
-        move16();
-        move16();
-        move16();
-
-        cr = BASOP_Util_Add_Mant32Exp( cr, cr_exp, L_add( L_mult( pt_fftL[0], pt_fftR[0] ), L_mult( pt_fftL[L_FFT / 2], pt_fftR[L_FFT / 2] ) ), shl( fft_exp, 1 ), &cr_exp ); /* exp(cr_exp) */
-        eL = BASOP_Util_Add_Mant32Exp( eL, eL_exp, L_add( L_mult( pt_fftL[0], pt_fftL[0] ), L_mult( pt_fftL[L_FFT / 2], pt_fftL[L_FFT / 2] ) ), shl( fft_exp, 1 ), &eL_exp ); /* exp(eL_exp) */
-        eR = BASOP_Util_Add_Mant32Exp( eR, eR_exp, L_add( L_mult( pt_fftR[0], pt_fftR[0] ), L_mult( pt_fftR[L_FFT / 2], pt_fftR[L_FFT / 2] ) ), shl( fft_exp, 1 ), &eR_exp ); /* exp(eR_exp) */
-
-        FOR( i = 1; i < L_FFT / 2; i++ )
-        {
-            cr = BASOP_Util_Add_Mant32Exp( cr, cr_exp, L_add( L_mult( pt_fftL[i], pt_fftR[i] ), L_mult( pt_fftL[L_FFT - i], pt_fftR[L_FFT - i] ) ), shl( fft_exp, 1 ), &cr_exp );  /* exp(cr_exp) */
-            ci = BASOP_Util_Add_Mant32Exp( ci, ci_exp, L_add( L_mult( -pt_fftL[i], pt_fftR[L_FFT - i] ), L_mult( pt_fftL[L_FFT - i], pt_fftR[i] ) ), shl( fft_exp, 1 ), &ci_exp ); /* exp(ci_exp) */
-            eL = BASOP_Util_Add_Mant32Exp( eL, eL_exp, L_add( L_mult( pt_fftL[i], pt_fftL[i] ), L_mult( pt_fftL[L_FFT - i], pt_fftL[L_FFT - i] ) ), shl( fft_exp, 1 ), &eL_exp );  /* exp(eL_exp) */
-            eR = BASOP_Util_Add_Mant32Exp( eR, eR_exp, L_add( L_mult( pt_fftR[i], pt_fftR[i] ), L_mult( pt_fftR[L_FFT - i], pt_fftR[L_FFT - i] ) ), shl( fft_exp, 1 ), &eR_exp );  /* exp(eR_exp) */
-        }
-        test();
-        test();
-        IF( LE_32( sts[0]->ini_frame, 50 ) || ( sts[0]->vad_flag == 0 && sts[1]->vad_flag == 0 ) )
-        {
-            mem[0] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[0], 31129 /*0.95f*/ ), mem_exp[0], Mpy_32_16_1( cr, 1638 /*0.05f*/ ), cr_exp, &mem_exp[0] ); /* exp(mem_exp[0]) */
-            move32();
-            mem[1] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[1], 31129 /*0.95f*/ ), mem_exp[1], Mpy_32_16_1( ci, 1638 /*0.05f*/ ), ci_exp, &mem_exp[1] ); /* exp(mem_exp[1]) */
-            move32();
-            mem[2] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[2], 31129 /*0.95f*/ ), mem_exp[2], Mpy_32_16_1( eL, 1638 /*0.05f*/ ), eL_exp, &mem_exp[2] ); /* exp(mem_exp[2]) */
-            move32();
-            mem[3] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[3], 31129 /*0.95f*/ ), mem_exp[3], Mpy_32_16_1( eR, 1638 /*0.05f*/ ), eR_exp, &mem_exp[3] ); /* exp(mem_exp[3]) */
-            move32();
-        }
-
-        pt_fftL += L_FFT;
-        pt_fftR += L_FFT;
-    }
-
-    Word16 sqr_inp, temp, sqr_out, sqr_inp_exp;
-    Word32 sqr_inp32 = BASOP_Util_Add_Mant32Exp( Mpy_32_32( mem[0], mem[0] ), shl( mem_exp[0], 1 ), Mpy_32_32( mem[1], mem[1] ), shl( mem_exp[1], 1 ), &sqr_inp_exp ); /* exp(sqr_inp_exp) */
-    sqr_inp = BASOP_Util_Divide3232_Scale( sqr_inp32, Mpy_32_32( mem[2], mem[3] ), &temp );
-    sqr_inp_exp = add( temp, sub( sqr_inp_exp, add( mem_exp[2], mem_exp[3] ) ) );
-    sqr_out = Sqrt16( sqr_inp, &sqr_inp_exp );
-    sts[0]->hFdCngEnc->hFdCngCom->coherence_fx = shl_sat( sqr_out, sqr_inp_exp ); // Q15 expected.
-    move16();
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * FdCngEncodeMDCTStereoSID()
- *
- * Encode DTX parameters and noise shapes into SID for MDCT-Stereo DTX
- *-------------------------------------------------------------------*/
-
-void FdCngEncodeMDCTStereoSID_fx(
-    CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure     */
-)
-{
-    ENC_CORE_HANDLE sts[CPE_CHANNELS];
-    Word16 indices[CPE_CHANNELS][FD_CNG_stages_37bits];
-    Word16 gain_idx[CPE_CHANNELS];
-    Word16 N, stages, ch, p, coh_idx;
-    Word32 *lr_in_ptr_fx[CPE_CHANNELS];
-    Word16 lr_in_ptr_e[CPE_CHANNELS];
-    Word32 *ms_ptr_fx[CPE_CHANNELS];
-    Word16 ms_ptr_e;
-    Word32 *lr_out_ptr_fx[CPE_CHANNELS];
-    Word16 lr_out_ptr_e[CPE_CHANNELS];
-    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
-    Word32 E_fx[CPE_CHANNELS];
-    Word32 gain_fx[CPE_CHANNELS];
-    Word16 weights_fx[NPART];
-    Word32 side_energy_fx;
-    Word16 Qside_energy;
-    Word32 *invTrfMatrix_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];                                   /*24*18*/
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;                                                      /* dynamically filled  */
-    Word32 tot_sig_ext_fx[FDCNG_VQ_MAX_LEN], dct_target_fx[CPE_CHANNELS][FDCNG_VQ_DCT_MAXTRUNC]; /* 24 +2*18*/
-    Word16 tmp, tmp_e;
-    Word16 no_side_flag;
-    Word16 is_inp_ms;
-    Word16 size_value, temp_e, gb, shift;
-    Word32 tmp32, t1, t2;
-
-    is_inp_ms = 0;
-    move16();
-    IF( EQ_16( hCPE->hCoreCoder[0]->cng_sba_flag, 1 ) )
-    {
-        is_inp_ms = 1;
-        move16();
-    }
-
-    /* set pointers and initialize */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        sts[ch] = hCPE->hCoreCoder[ch];
-        lr_in_ptr_fx[ch] = &sts[ch]->hFdCngEnc->msNoiseEst_fx[0]; /* exp(sts[ch]->hFdCngEnc->msNoiseEst_fx_exp) */
-        lr_in_ptr_e[ch] = sts[ch]->hFdCngEnc->msNoiseEst_fx_exp;
-        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];
-        lr_out_ptr_fx[ch] = &sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEst[0]; /* exp(sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp) */
-        lr_out_ptr_e[ch] = sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp;
-    }
-    N = sts[0]->hFdCngEnc->npartDec; /* Q0 */
-    move16();
-    set16_fx( weights_fx, ONE_IN_Q8, NPART );
-
-    /* apply log and save energy of original left and right channels */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        // E[ch] = 0.0f;
-        E_fx[ch] = 0;
-        move32();
-        FOR( p = 0; p < N; p++ )
-        {
-            IF( lr_in_ptr_fx[ch][p] )
-            {
-                t1 = BASOP_Util_Log2( lr_in_ptr_fx[ch][p] );     // Q25
-                t2 = L_add( t1, L_shl( lr_in_ptr_e[ch], Q25 ) ); // Q25
-            }
-            ELSE
-            {
-                t2 = 0;
-                move32();
-            }
-            ms_ptr_fx[ch][p] = Mpy_32_32( t2, TEN_MULT_LOG10_2_IN_Q29 ); // Q23
-            move32();
-            E_fx[ch] = L_add( E_fx[ch], L_shr( ms_ptr_fx[ch][p], 4 ) ); // Q19
-            move32();
-        }
-    }
-    ms_ptr_e = Q31 - Q23;
-    move16();
-
-    /* M/S transform on log envelopes */
-    IF( is_inp_ms == 0 )
-    {
-        convertToMS_fx( N, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q30 ); // ms_ptr_e = Q23;
-    }
-
-    gb = find_guarded_bits_fx( N );
-    side_energy_fx = sum2_f_32_fx( ms_ptr_fx[1], N, gb );
-    Qside_energy = sub( sub( shl( sub( 31, ms_ptr_e ), 1 ), 31 ), gb );
-
-    /* do not transmit side shape if initial noise shapes are very similar */
-    IF( LE_32( side_energy_fx, L_shl( 214748365, sub( Qside_energy, Q31 ) ) ) )
-    {
-        no_side_flag = 1;
-        move16();
-    }
-    ELSE
-    {
-        no_side_flag = 0;
-        move16();
-    }
-
-    /* Quantize noise shapes */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        /* Normalize MSVQ input */
-        gain_fx[ch] = 0;
-        move32();
-        FOR( p = N_GAIN_MIN; p < N_GAIN_MAX; p++ )
-        {
-            tmp32 = Mpy_32_32( ms_ptr_fx[ch][p], 165191050 /* 0.07 in Q31*/ ); // Q23
-            gain_fx[ch] = L_add( gain_fx[ch], tmp32 );                         // Q23
-            move32();
-        }
-
-        FOR( p = 0; p < N; p++ )
-        {
-            ms_ptr_fx[ch][p] = L_sub( ms_ptr_fx[ch][p], gain_fx[ch] ); // Q23
-            move32();
-        }
-    }
-
-    /* always split channel targetloop */
-
-    /* extend fdcng envelope from length 21 to a 24 length fdncg domain envelope signal */
-    /* High quality cosine smooth basis extension used  to not introduce noise in stage#1  DCT24 analysis and subsequent VQ-steps */
-    IF( EQ_16( N, FDCNG_VQ_MAX_LEN_WB ) )
-    {
-        size_value = BASOP_Util_Divide1616_Scale( sizeof( tmpRAM_fx ), ( sizeof( Word32 ) ), &temp_e ); /*Q15*/
-        size_value = shr( size_value, sub( 15, temp_e ) );
-        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, N, FDCNG_VQ_DCT_MAXTRUNC, size_value ); // Q31 /*WB: create truncated IDCT21 matrix */
-        for ( ch = 0; ch < CPE_CHANNELS; ch++ )
-        {
-            /* run DCT_N N==21 , truncated at 18/21 ~= 86% , i.e use a bit better better quality in extrapolation , than subsequent DCT24 analysis which is truncated at 75%*/
-            /* truncated DCT 21 analysis */
-            dctT2_N_apply_matrix_fx( (const Word32 *) ms_ptr_fx[ch], dct_target_fx[ch], FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX );
-            /* extrapolate extend fdcng envelope signal in the fdncg ienvelope/"time" domain using DCT21 basis vectors,
-                estimated DCT21 coeffs scaling extended basis vectors are used to create extrapolated   length 24 input target envelope signal */
-            /* this DCT21 extension does not introduce DCT24 coefficient noise for  the subsequent dct24 target analysis, and later in IDCT24 synthesis  */
-
-            /* truncated IDCT 21 extension synthesis  */
-            extend_dctN_input_fx( ms_ptr_fx[ch], dct_target_fx[ch], N, tot_sig_ext_fx, FDCNG_VQ_MAX_LEN, invTrfMatrix_fx /* DCT_N basis vectors */, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); /* use 18 basis vectors*/
-
-            Copy32( tot_sig_ext_fx, ms_ptr_fx[ch], FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ */
-        }
-    }
-
-    size_value = BASOP_Util_Divide1616_Scale( sizeof( tmpRAM_fx ), ( sizeof( Word32 ) ), &temp_e ); /*Q15*/
-    size_value = shr( size_value, sub( 15, temp_e ) );
-    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, size_value ); /*always create/set up  IDCT24 matrix in RAM */
-
-    /* end split */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        /* MSVQ */
-        IF( ch )
-        {
-            stages = FD_CNG_JOINT_stages_25bits;
-            move16();
-        }
-        ELSE
-        {
-            stages = FD_CNG_stages_37bits;
-            move16();
-        }
-
-        /* DCT24 domain compressed/truncated indices used for first stage  */
-        /*             mid  channel quantization using stages 1 through 6 */
-        /*           & side channel quantization using stages 1 through 4 */
-
-        {
-            msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, ms_ptr_fx[ch], ms_ptr_e, levels_37bits, FD_CNG_maxC_37bits, stages, weights_fx, N, FD_CNG_maxN_37bits, 1, invTrfMatrix_fx, indices[ch] );
-            msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices[ch], 1, invTrfMatrix_fx, ms_ptr_fx[ch], NULL, 7 );
-        }
-    }
-    shift = find_guarded_bits_fx( N );
-    ms_ptr_e = sub( 31, sub( 20, shift ) );
-
-    IF( no_side_flag )
-    {
-        set32_fx( ms_ptr_fx[1], 0, N );
-    }
-
-    /* undo M/S */
-    IF( is_inp_ms == 0 )
-    {
-        convertToMS_fx( N, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q31 );
-    }
-
-    /* Compute gain against original left and right channels */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        gain_fx[ch] = 0;
-        move32();
-
-        tmp_e = 15;
-        move16();
-        tmp = Inv16( N, &tmp_e );
-        FOR( p = 0; p < N; p++ )
-        {
-            gain_fx[ch] = L_add( gain_fx[ch], Mpy_32_16_1( ms_ptr_fx[ch][p], shl( tmp, tmp_e ) ) ); // Q23
-            move32();
-        }
-        gain_fx[ch] = L_sub( L_shl( Mpy_32_16_1( E_fx[ch], shl( tmp, tmp_e ) ), Q23 - Q19 ), L_shl( gain_fx[ch], sub( ms_ptr_e, 8 ) ) ); // Q23
-        move32();
-
-        apply_scale( &gain_fx[ch], sts[ch]->hFdCngEnc->hFdCngCom->CngBandwidth, sts[ch]->element_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-
-        /* quantize gain */
-        gain_idx[ch] = (Word16) Mpy_32_32_r( L_add( gain_fx[ch], 251658240 ), 384 ); // Q23
-        move16();
-        gain_idx[ch] = s_max( 0, s_min( 127, gain_idx[ch] ) );
-        move16();
-
-        gain_fx[ch] = Mpy_32_16_1( L_shl( sub( gain_idx[ch], GAIN_Q_OFFSET_IVAS_FX_Q0 ), 23 ), 21845 ); // Q23
-        move32();
-    }
-
-    /* restore channel noise envelopes */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        HANDLE_FD_CNG_ENC hFdCngEnc = sts[ch]->hFdCngEnc;
-        HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom;
-
-        tmp_e = 0;
-        move16();
-        Word32 pow;
-
-        Word16 e_lr_out[NPART];
-
-        FOR( p = 0; p < N; p++ )
-        {
-            pow = L_shl( gain_fx[ch], 8 - ms_ptr_e );
-            pow = L_add( ms_ptr_fx[ch][p], pow );
-            pow = Mpy_32_32( pow, 214748365 ); /*pow = 0.1*/
-            lr_out_ptr_fx[ch][p] = BASOP_Util_fPow( 10, 31, pow, ms_ptr_e, &e_lr_out[p] );
-            move32();
-            tmp_e = s_max( tmp_e, e_lr_out[p] );
-        }
-
-        FOR( p = 0; p < N; p++ )
-        {
-            lr_out_ptr_fx[ch][p] = L_shl( lr_out_ptr_fx[ch][p], e_lr_out[p] - tmp_e );
-            move32();
-        }
-        lr_out_ptr_e[ch] = tmp_e;
-        move32();
-
-        sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp = tmp_e;
-        move16();
-
-        /* scale bands and get scalefactors */
-        scalebands( lr_out_ptr_fx[ch], hFdCngEnc->partDec, N, hFdCngEnc->midbandDec, hFdCngEnc->nFFTpartDec, sub( hFdCngEnc->stopBandDec, hFdCngEnc->startBandDec ), hFdCngCom->cngNoiseLevel, 1 );
-        hFdCngCom->cngNoiseLevelExp = lr_out_ptr_e[ch];
-        move16();
-
-        lpc_from_spectrum( hFdCngCom, hFdCngEnc->startBandDec, hFdCngEnc->stopFFTbinDec, sts[ch]->preemph_fac );
-
-        sts[ch]->hDtxEnc->last_CNG_L_frame = sts[ch]->L_frame;
-    }
-
-    /* quantize channel coherence */
-    coh_idx = mult_r( sts[0]->hFdCngEnc->hFdCngCom->coherence_fx, 15 );
-    coh_idx = max( 0, min( coh_idx, 15 ) );
-
-    /* ---- Write SID bitstream ---- */
-
-
-    /* noise shapes and channel gains */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        IF( ch )
-        {
-            stages = FD_CNG_JOINT_stages_25bits;
-            sts[ch]->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot;
-
-            /* side info */
-            push_indice( sts[ch]->hBstr, IND_SID_TYPE, coh_idx, 4 );
-            push_indice( sts[ch]->hBstr, IND_SID_TYPE, no_side_flag, 1 );
-        }
-        ELSE
-        {
-            stages = FD_CNG_stages_37bits;
-            /* side info */
-            push_indice( sts[ch]->hBstr, IND_SID_TYPE, 1, 1 );
-            push_indice( sts[ch]->hBstr, IND_BWIDTH, sts[0]->bwidth, 2 );
-            push_indice( sts[ch]->hBstr, IND_ACELP_16KHZ, sts[0]->L_frame == L_FRAME16k ? 1 : 0, 1 );
-        }
-
-        FOR( Word16 i = 0; i < stages; i++ )
-        {
-            push_indice( sts[ch]->hBstr, IND_LSF, indices[ch][i], bits_37bits[i] );
-        }
-        push_indice( sts[ch]->hBstr, IND_ENERGY, gain_idx[ch], 7 );
-    }
-
-    /* pad with zeros to reach common SID frame size */
-    push_indice( sts[1]->hBstr, IND_ENERGY, 0, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC );
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * FdCngEncodeDiracMDCTStereoSID()
- *
- * Encode DTX parameters and noise shapes into SID for MDCT-Stereo DTX
- * together with Dirac
- *-------------------------------------------------------------------*/
-
-void FdCngEncodeDiracMDCTStereoSID_fx(
-    CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure     */
-)
-{
-    ENC_CORE_HANDLE sts[CPE_CHANNELS];
-    Word32 *lr_in_ptr_fx[CPE_CHANNELS];
-    Word16 lr_in_ptr_e[CPE_CHANNELS];
-    Word32 *ms_ptr_fx[CPE_CHANNELS];
-    Word16 ms_ptr_e;
-    Word32 *lr_out_ptr_fx[CPE_CHANNELS];
-    Word16 lr_out_ptr_e[CPE_CHANNELS];
-    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
-    Word32 E_fx[CPE_CHANNELS];
-    Word32 gain_fx[CPE_CHANNELS];
-    Word16 weights_fx[NPART];
-    Word16 N[CPE_CHANNELS];
-    Word16 indices[CPE_CHANNELS][FD_CNG_stages_37bits];
-    Word16 gain_idx[CPE_CHANNELS];
-    Word16 ch, p;
-    Word16 tmp, tmp_e, shift;
-    Word32 *invTrfMatrix_fx;
-    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    Word32 dct_target_fx[FDCNG_VQ_DCT_MAXTRUNC];
-    Word32 tot_sig_ext_fx[FDCNG_VQ_MAX_LEN];
-    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /* dynamically filled  */
-    Word32 t1, t2, tmp32;
-    /* set pointers and initialize */
-
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        sts[ch] = hCPE->hCoreCoder[ch];
-        N[ch] = sts[ch]->hFdCngEnc->npartDec;
-        lr_in_ptr_fx[ch] = &sts[ch]->hFdCngEnc->msNoiseEst_fx[0];
-        lr_in_ptr_e[ch] = sts[ch]->hFdCngEnc->msNoiseEst_fx_exp;
-        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];
-        lr_out_ptr_fx[ch] = &sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEst[0];
-        lr_out_ptr_e[ch] = sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp;
-        move16();
-    }
-    set16_fx( weights_fx, ONE_IN_Q8, NPART );
-
-    /* apply log and save energy of original left and right channels */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        // E[ch] = 0.0f;
-        E_fx[ch] = 0;
-        move32();
-        FOR( p = 0; p < N[ch]; p++ )
-        {
-            t1 = BASOP_Util_Log2( lr_in_ptr_fx[ch][p] + EPSILLON_FX );   // Q25
-            t2 = L_add( t1, L_shl( lr_in_ptr_e[ch], Q25 ) );             // Q25
-            ms_ptr_fx[ch][p] = Mpy_32_32( t2, TEN_MULT_LOG10_2_IN_Q29 ); // Q23
-            move32();
-            E_fx[ch] = L_add( E_fx[ch], L_shr( ms_ptr_fx[ch][p], 5 ) ); // Q18
-            move32();
-        }
-    }
-    ms_ptr_e = Q31 - Q23;
-    move16();
-
-    /* M/S transform on log envelopes */
-    convertToMS_fx( N[0], ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q30 );
-    E_fx[0] = 0;
-    move32();
-    FOR( p = 0; p < N[0]; p++ )
-    {
-        E_fx[0] = L_add( E_fx[0], L_shr( ms_ptr_fx[0][p], 5 ) ); // Q18
-        move32();
-    }
-
-    /* Quantize M noise shape */
-    /* Normalize MSVQ input */
-    gain_fx[0] = 0;
-    move16();
-    FOR( p = N_GAIN_MIN; p < N_GAIN_MAX; p++ )
-    {
-        tmp32 = Mpy_32_32( ms_ptr_fx[0][p], 165191050 /* 0.07 in Q31 */ ); // Q23
-        gain_fx[0] = L_add( gain_fx[0], tmp32 );                           // Q23
-        move32();
-    }
-
-    FOR( p = 0; p < N[0]; p++ )
-    {
-        ms_ptr_fx[0][p] = L_sub( ms_ptr_fx[0][p], gain_fx[0] ); // Q23
-        move32();
-    }
-
-
-    /* MSVQ */
-    /* DCT domain compressed/truncated indices used for first stage  */
-    /*  mid quantization using stages #1 through 6 */
-    scale_sig32( ms_ptr_fx[0], N[0], -6 );
-    ms_ptr_e = add( ms_ptr_e, 6 );
-    move16();
-    IF( EQ_16( N[0], FDCNG_VQ_MAX_LEN_WB ) )
-    {
-        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, N[0], FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) );
-        /* truncated DCT 21 analysis */
-        dctT2_N_apply_matrix_fx( (const Word32 *) ms_ptr_fx[0], dct_target_fx, FDCNG_VQ_DCT_MAXTRUNC, N[0], invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX );
-        /* truncated IDCT21 extension to 24 synthesis  */
-
-        extend_dctN_input_fx( ms_ptr_fx[0], dct_target_fx, N[0], tot_sig_ext_fx, FDCNG_VQ_MAX_LEN, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); /* use 18 basis vectors*/
-
-        Copy32( tot_sig_ext_fx, ms_ptr_fx[0], FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ stage #1	Q23*/
-    }
-    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) );
-
-    msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, ms_ptr_fx[0], ms_ptr_e, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, weights_fx, N[0], FD_CNG_maxN_37bits, 1, invTrfMatrix_fx, indices[0] );
-    msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N[0], FD_CNG_maxN_37bits, indices[0], 1, invTrfMatrix_fx, ms_ptr_fx[0], NULL, 7 );
-    shift = find_guarded_bits_fx( N[0] );
-    ms_ptr_e = sub( 31, sub( 20, shift ) );
-    scale_sig32( ms_ptr_fx[1], N[1], sub( 8, ms_ptr_e ) ); /* Q31 - ms_ptr_e */
-
-    /* set S to zero */
-    set32_fx( ms_ptr_fx[1], 0, NPART );
-
-    /* compute M gain */
-    gain_fx[0] = 0;
-    move32();
-    tmp_e = 15;
-    move16();
-    tmp = Inv16( N[0], &tmp_e );
-    FOR( p = 0; p < N[0]; p++ )
-    {
-        gain_fx[0] = L_add( gain_fx[0], Mpy_32_16_1( ms_ptr_fx[0][p], shl( tmp, tmp_e ) ) ); // Q23
-        move32();
-    }
-    gain_fx[0] = L_sub( L_shl( Mpy_32_16_1( E_fx[0], shl( tmp, tmp_e ) ), Q23 - Q18 ), L_shl( gain_fx[0], ms_ptr_e - 8 ) ); // Q23
-    move32();
-
-    apply_scale( &gain_fx[0], sts[0]->hFdCngEnc->hFdCngCom->CngBandwidth, sts[0]->hDtxEnc->last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-
-    /* quantize gain */
-    gain_idx[0] = extract_l( Mpy_32_32_r( L_add( gain_fx[0], 251658240 ), 384 ) );
-    move16();
-    gain_idx[0] = s_max( 0, s_min( 127, gain_idx[0] ) );
-    move16();
-
-    gain_fx[0] = Mpy_32_16_1( L_shl( sub( gain_idx[0], GAIN_Q_OFFSET_IVAS_FX_Q0 ), 23 ), 21845 /* 0.66 in Q15 */ ); // Q23
-    move32();
-    gain_fx[1] = gain_fx[0]; // Q23
-    move32();
-
-    /* undo M/S */
-    convertToMS_fx( NPART, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q31 );
-
-    /* restore channel noise envelopes */
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        HANDLE_FD_CNG_ENC hFdCngEnc = sts[ch]->hFdCngEnc;
-        HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom;
-
-        Word32 pow;
-        Word16 e_lr_out[NPART];
-        tmp_e = -MAX_16;
-        FOR( p = 0; p < N[ch]; p++ )
-        {
-            pow = L_shl( gain_fx[ch], sub( 8, ms_ptr_e ) );     /* Q31 - ms_ptr_e */
-            pow = L_add( ms_ptr_fx[ch][p], pow );               /* Q31 - ms_ptr_e */
-            pow = Mpy_32_32( pow, 214748365 /* 0.1 in Q31 */ ); /*pow = 0.1		Q31 - ms_ptr_e*/
-            lr_out_ptr_fx[ch][p] = BASOP_Util_fPow( 10, 31, pow, ms_ptr_e, &e_lr_out[p] );
-            tmp_e = s_max( tmp_e, e_lr_out[p] );
-        }
-
-        FOR( p = 0; p < N[ch]; p++ )
-        {
-            lr_out_ptr_fx[ch][p] = L_shl( lr_out_ptr_fx[ch][p], sub( e_lr_out[p], tmp_e ) ); // Q(31 - tmp_e)
-        }
-
-        sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp = tmp_e;
-        move16();
-        lr_out_ptr_e[ch] = tmp_e;
-        move16();
-
-        /* NB last band energy compensation */
-        IF( hFdCngCom->CngBandwidth == NB )
-        {
-            lr_out_ptr_fx[ch][N[ch] - 1] = Mpy_32_16_1( lr_out_ptr_fx[ch][N[ch] - 1], NB_LAST_BAND_SCALE ); // Q(31 - tmp_e)
-            move32();
-        }
-        ELSE IF( hFdCngCom->CngBandwidth == SWB && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
-        {
-            lr_out_ptr_fx[ch][N[ch] - 1] = Mpy_32_16_1( lr_out_ptr_fx[ch][N[ch] - 1], SWB_13k2_LAST_BAND_SCALE ); // Q(31 - tmp_e)
-            move32();
-        }
-        /* scale bands and get scalefactors */
-        scalebands( lr_out_ptr_fx[ch], hFdCngEnc->partDec, N[ch], hFdCngEnc->midbandDec, hFdCngEnc->nFFTpartDec, sub( hFdCngEnc->stopBandDec, hFdCngEnc->startBandDec ), hFdCngCom->cngNoiseLevel, 1 );
-        hFdCngCom->cngNoiseLevelExp = lr_out_ptr_e[ch];
-        move16();
-        lpc_from_spectrum( hFdCngCom, hFdCngEnc->startBandDec, hFdCngEnc->stopFFTbinDec, sts[ch]->preemph_fac );
-        sts[ch]->hDtxEnc->last_CNG_L_frame = sts[ch]->L_frame;
-    }
-    sts[0]->hFdCngEnc->hFdCngCom->coherence_fx = 0;
-    move16();
-    sts[1]->hFdCngEnc->hFdCngCom->coherence_fx = 0;
-    move16();
-
-    /* ---- Write SID bitstream ---- */
-
-    /* side info */
-    push_indice( sts[0]->hBstr, IND_SID_TYPE, 1, 1 );
-    push_indice( sts[0]->hBstr, IND_BWIDTH, sts[0]->bwidth, 2 );
-    IF( EQ_16( sts[0]->L_frame, L_FRAME16k ) )
-    {
-        push_indice( sts[0]->hBstr, IND_ACELP_16KHZ, 1, 1 );
-    }
-    ELSE
-    {
-        push_indice( sts[0]->hBstr, IND_ACELP_16KHZ, 0, 1 );
-    }
-
-    /* noise shapes and channel gains */
-    FOR( Word16 i = 0; i < FD_CNG_stages_37bits; i++ )
-    {
-        push_indice( sts[0]->hBstr, IND_LSF, indices[0][i], bits_37bits[i] );
-    }
-    push_indice( sts[0]->hBstr, IND_ENERGY, gain_idx[0], 7 );
-
-    return;
-}
diff --git a/lib_enc/fd_cng_enc_fx.c b/lib_enc/fd_cng_enc_fx.c
index 8591f2627520c77121199284c3c78f349c58c059..a7339e65334a0964eaeecdfd2a4fa1c3c9a35a9a 100644
--- a/lib_enc/fd_cng_enc_fx.c
+++ b/lib_enc/fd_cng_enc_fx.c
@@ -11,9 +11,9 @@
 #include "rom_com_fx.h"
 #include "rom_com.h"
 #include "rom_enc.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
+#include "ivas_prot_fx.h"
 #include "basop_util.h"
 #include "rom_basop_util.h"
 
@@ -951,11 +951,7 @@ static void msvq_encoder( const Word16 *const cb[], /* i  : Codebook (indexed cb
                 tmp = L_add( dist[0][c], L_sub( en, L_shl( t1, 1 ) ) );
 
                 BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
                 t1 = L_sub_sat( tmp, dist[1][p_max] );
-#else
-                t1 = L_sub( tmp, dist[1][p_max] );
-#endif
                 BASOP_SATURATE_WARNING_ON_EVS
                 IF( t1 <= 0 )
                 /* IF (L_sub(L_shr(tmp,1), L_shr(dist[1][p_max],1) ) <= 0 ) */
@@ -1061,19 +1057,6 @@ void FdCng_encodeSID_fx( HANDLE_FD_CNG_ENC stenc, /* i/o: pointer to FD_CNG stru
     BSTR_ENC_HANDLE hBstr = corest->hBstr;
     HANDLE_FD_CNG_COM st;
     Word16 maxC_37bits = FD_CNG_maxC_37bits, stages_37bits = FD_CNG_stages_37bits, maxN_37bits = FD_CNG_maxN_37bits;
-#ifdef IVAS_CODE_CNG
-    float *invTrfMatrix;
-    float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
-    float dct_target[FDCNG_VQ_DCT_MAXTRUNC];
-    float tot_sig_ext[FDCNG_VQ_MAX_LEN];
-    const float gain_q_offset = ( st->element_mode == EVS_MONO ) ? GAIN_Q_OFFSET_EVS : GAIN_Q_OFFSET_IVAS;
-    /* Init */
-    N = hFdCngEnc->npartDec;
-
-    invTrfMatrix = (float *) tmpRAM; /* dynamically filled  */
-    set_zero( v, FDCNG_VQ_MAX_LEN );
-#endif
-
 
     /* Init */
     st = stenc->hFdCngCom;
@@ -1123,29 +1106,6 @@ void FdCng_encodeSID_fx( HANDLE_FD_CNG_ENC stenc, /* i/o: pointer to FD_CNG stru
         v16[i] = extract_h( L_sub( v[i], gain ) );
     }
 
-#ifdef IVAS_CODE_CNG
-    IF( st->element_mode != EVS_MONO )
-    {
-        /* DCT domain compressed/truncated indices used for first stage  */
-        /*  quantization with stage1 stored in DCT24 domain,   stages 2 through 6 directly dearched
-           in FDCNG band domain
-        */
-        if ( N == FDCNG_VQ_MAX_LEN_WB )
-        {
-            create_IDCT_N_Matrix( invTrfMatrix, N, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) );
-            /* truncated DCT21 analysis */
-            dctT2_N_apply_matrix( (const float *) v, dct_target, FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX );
-            /* truncated IDCT21 extension to 24 bands  */
-            extend_dctN_input( v, dct_target, N, tot_sig_ext, FDCNG_VQ_MAX_LEN, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 );
-
-            mvr2r( tot_sig_ext, v, FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ stage #1 */
-        }
-        create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) );
-        msvq_enc_fx( cdk_37bits_ivas, NULL, NULL, v, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w, N, FD_CNG_maxN_37bits, 1, invTrfMatrix, indices );
-        msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, v, NULL );
-    }
-    ELSE
-#endif
     {
         /* MSVQ encoder */
         msvq_encoder( cdk_37bits, v16, levels_37bits, maxC_37bits, stages_37bits, N, maxN_37bits, indices );
@@ -1169,28 +1129,14 @@ void FdCng_encodeSID_fx( HANDLE_FD_CNG_ENC stenc, /* i/o: pointer to FD_CNG stru
 
 
     /* Apply bitrate-dependant scale */
-#ifdef IVAS_CODE_CNG
-    if ( st->element_mode > EVS_MONO )
-    {
-        apply_scale( &gain, hFdCngCom->CngBandwidth, hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-    }
-    else
-#endif
     {
         apply_scale( &gain, st->CngBandwidth, st->CngBitrate, scaleTableMono, SIZE_SCALE_TABLE_MONO );
     }
 
-#ifdef IVAS_CODE_CNG
-    /* Quantize gain, Q14.23 format */
-    gain = L_add( gain, L_shr( gain, 1 ) );
-    gain = L_add( gain, gain_q_offset /*gain_q_offset+.5 Q23*/ );
-    index = extract_l( L_shr( gain, WORD32_BITS - 1 - 8 ) );
-#else
     /* Quantize gain, Q14.23 format */
     gain = L_add( gain, L_shr( gain, 1 ) );
     gain = L_add( gain, 507510784l /*60.5 Q23*/ );
     index = extract_l( L_shr( gain, WORD32_BITS - 1 - 8 ) );
-#endif
 
     if ( index < 0 )
     {
@@ -1203,17 +1149,11 @@ void FdCng_encodeSID_fx( HANDLE_FD_CNG_ENC stenc, /* i/o: pointer to FD_CNG stru
         index = 127;
         move16();
     }
-#ifndef IVAS_CODE_CNG
+
     /* gain Q14.23 format */
     gain = L_shl( L_deposit_l( index ), WORD32_BITS - 1 - 8 );
     gain = L_sub( gain, 503316480l /*60.0 Q23*/ );
     gain = Mpy_32_16_1( gain, 21845 /*2.0f/3.0f Q15*/ );
-#else
-    /* gain Q14.23 format */
-    gain = L_shl( L_deposit_l( index ), WORD32_BITS - 1 - 8 );
-    gain = L_sub( gain, gain_q_offset /*60.0 Q23*/ );
-    gain = Mpy_32_16_1( gain, 21845 /*2.0f/3.0f Q15*/ );
-#endif
 
     /* Apply gain and undo log */
 
@@ -1271,27 +1211,27 @@ void FdCng_encodeSID_fx( HANDLE_FD_CNG_ENC stenc, /* i/o: pointer to FD_CNG stru
     {
         FOR( i = 0; i < stages_37bits; i++ )
         {
-            push_next_indice_fx( hBstr, indices[i], bits_37bits[i] );
+            push_next_indice( hBstr, indices[i], bits_37bits[i] );
         }
-        push_next_indice_fx( hBstr, index, 7 );
+        push_next_indice( hBstr, index, 7 );
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_SID_TYPE, 1, 1 );
-        push_indice_fx( hBstr, IND_ACELP_16KHZ, corest->bwidth, 2 );
+        push_indice( hBstr, IND_SID_TYPE, 1, 1 );
+        push_indice( hBstr, IND_ACELP_16KHZ, corest->bwidth, 2 );
         IF( EQ_16( corest->L_frame, L_FRAME16k ) )
         {
-            push_indice_fx( hBstr, IND_ACELP_16KHZ, 1, 1 );
+            push_indice( hBstr, IND_ACELP_16KHZ, 1, 1 );
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_ACELP_16KHZ, 0, 1 );
+            push_indice( hBstr, IND_ACELP_16KHZ, 0, 1 );
         }
         FOR( i = 0; i < stages_37bits; i++ )
         {
-            push_indice_fx( hBstr, IND_LSF, indices[i], bits_37bits[i] );
+            push_indice( hBstr, IND_LSF, indices[i], bits_37bits[i] );
         }
-        push_indice_fx( hBstr, IND_ENERGY, index, 7 );
+        push_indice( hBstr, IND_ENERGY, index, 7 );
     }
 
     /* Interpolate the bin/band-wise levels from the partition levels */
@@ -1535,7 +1475,7 @@ void generate_comfort_noise_enc_fx( Encoder_State *stcod,
             {
                 FOR( i = 0; i < st->frameSize; i++ )
                 {
-                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( hTcxEnc->old_out_fx[i + NS2SA( stcod->sr_core, N_ZERO_MDCT_NS )], hTcxEnc->Q_old_out ) );
+                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( hTcxEnc->old_out_fx[i + NS2SA_FX2( stcod->sr_core, N_ZERO_MDCT_NS )], hTcxEnc->Q_old_out ) );
                     move16();
                 }
             }
@@ -1638,11 +1578,7 @@ void generate_comfort_noise_enc_fx( Encoder_State *stcod,
             s = sub( 15 - NOISE_HEADROOM, noiseExp );
             FOR( i = 0; i < N; i++ )
             {
-#ifdef BASOP_NOGLOB
                 noise[i] = shr_sat( mult( noise[i], gain16 ), s );
-#else
-                noise[i] = shr( mult( noise[i], gain16 ), s );
-#endif
                 move16();
             }
 
@@ -1651,11 +1587,7 @@ void generate_comfort_noise_enc_fx( Encoder_State *stcod,
             s = sub( 15 - NOISE_HEADROOM, ( sub( 15, Q_syn ) ) );
             FOR( i = 0; i < lpcorder; i++ )
             {
-#ifdef BASOP_NOGLOB
                 old_syn_pe_tmp[i] = shr_sat( old_syn_pe[i], s );
-#else
-                old_syn_pe_tmp[i] = shr( old_syn_pe[i], s );
-#endif
                 move16();
             }
 
@@ -1929,7 +1861,7 @@ void generate_comfort_noise_enc_ivas_fx( Encoder_State *stcod,
             {
                 FOR( i = 0; i < st->frameSize; i++ )
                 {
-                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( hTcxEnc->old_out_fx[i + NS2SA( stcod->sr_core, N_ZERO_MDCT_NS )], hTcxEnc->Q_old_out ) );
+                    timeDomainOutput[i] = add( timeDomainOutput[i], shr_r( hTcxEnc->old_out_fx[i + NS2SA_FX2( stcod->sr_core, N_ZERO_MDCT_NS )], hTcxEnc->Q_old_out ) );
                     move16();
                 }
             }
@@ -2034,11 +1966,7 @@ void generate_comfort_noise_enc_ivas_fx( Encoder_State *stcod,
             s = sub( 15 - NOISE_HEADROOM, noiseExp );
             FOR( i = 0; i < N; i++ )
             {
-#ifdef BASOP_NOGLOB
                 noise[i] = shr_sat( mult( noise[i], gain16 ), s );
-#else
-                noise[i] = shr( mult( noise[i], gain16 ), s );
-#endif
                 move16();
             }
 
@@ -2047,11 +1975,7 @@ void generate_comfort_noise_enc_ivas_fx( Encoder_State *stcod,
             s = sub( 15 - NOISE_HEADROOM, ( sub( 15, Q_syn ) ) );
             FOR( i = 0; i < lpcorder; i++ )
             {
-#ifdef BASOP_NOGLOB
                 old_syn_pe_tmp[i] = shr_sat( old_syn_pe[i], s );
-#else
-                old_syn_pe_tmp[i] = shr( old_syn_pe[i], s );
-#endif
                 move16();
             }
 
@@ -2142,7 +2066,7 @@ Word16 cng_energy_fx(
             L_tmp = L_mult0( tmp16, tmp16 );
             pt_res++;
             tmp16 = shl( *pt_res, scale );
-            L_tmp = L_mac0( L_tmp, tmp16, tmp16 ); /* 2*(Q_new+scale) */
+            L_tmp = L_mac0_sat( L_tmp, tmp16, tmp16 ); /* 2*(Q_new+scale) */
             pt_res++;
             L_ener = L_add( L_ener, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */
         }
@@ -2158,12 +2082,7 @@ Word16 cng_energy_fx(
     test();
     IF( EQ_16( element_mode, IVAS_CPE_DFT ) || EQ_16( element_mode, IVAS_CPE_TD ) )
     {
-        // PMT(" IVAS CNG ener computing is missing")
-#ifdef IVAS_CODE
-        enr += CNG_att * FAC_LOG2 / 10.0f;
-#else
         (void) CNG_att;
-#endif
     }
     ELSE IF( NE_16( bwidth, NB ) )
     {
@@ -2287,3 +2206,1107 @@ Word16 cng_energy_ivas_fx(
     }
     return enr;
 }
+
+void perform_noise_estimation_enc_ivas_fx(
+    Word32 *band_energies, /* i: energy in critical bands without minimum noise floor MODE2_E_MIN	band_energies_exp*/
+    Word16 band_energies_exp,
+    Word32 *enerBuffer, /* enerBuffer_exp */
+    Word16 enerBuffer_exp,
+    HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: CNG structure containing all buffers and variables        */
+    const Word32 input_Fs,       /* i  : input sampling rate                                       Q0*/
+    CPE_ENC_HANDLE hCPE          /* i  : CPE encoder structure                                     */
+)
+{
+    Word16 i, j, s, s1, s2;
+    Word16 numBands;
+    Word16 numCoreBands = hFdCngEnc->hFdCngCom->numCoreBands; /* Q0 */
+    move16();
+    Word16 regularStopBand = hFdCngEnc->hFdCngCom->regularStopBand; /* Q0 */
+    move16();
+    Word16 numSlots = hFdCngEnc->hFdCngCom->numSlots; /* Q0 */
+    move16();
+    assert( numSlots == 16 );
+
+    Word32 numSlots_inv_fx = 1073741824; // Q34 of .0625
+    move32();
+    Word32 *periodog = hFdCngEnc->hFdCngCom->periodog; /* exp(peridog_exp) */
+    Word32 *ptr_per_fx = periodog;
+    Word64 periodog_64;
+    Word16 periodog_exp[PERIODOGLEN];
+    Word16 npart = hFdCngEnc->hFdCngCom->npart; /* Q0 */
+    move16();
+    Word16 nFFTpart = hFdCngEnc->hFdCngCom->nFFTpart; /* Q0 */
+    move16();
+    Word16 nCLDFBpart = hFdCngEnc->hFdCngCom->nCLDFBpart; /* Q0 */
+    move16();
+
+    Word16 *psize = hFdCngEnc->hFdCngCom->psize; // 6Q9
+    Word32 *msPeriodog_fx = hFdCngEnc->msPeriodog_fx;
+    Word32 *msNoiseEst_fx = hFdCngEnc->msNoiseEst_fx; /* exp(msNoiseEst_fx_exp) */
+
+    Word16 *msLogPeriodog_fx = hFdCngEnc->msLogPeriodog_fx;
+    Word16 *msLogNoiseEst_fx = hFdCngEnc->msLogNoiseEst_fx;
+
+    Word32 scaleEB_fx = 0;
+    move32();
+    Word32 tmp;
+
+    test();
+    IF( hCPE != NULL && hCPE->hStereoDft != NULL )
+    {
+        // band_res_dft = ( (float) input_Fs ) / hCPE->hStereoDft->NFFT;
+        // chan_width_f = 24000.f / CLDFB_NO_CHANNELS_MAX;
+        // chan_width_bins = chan_width_f / band_res_dft;
+
+        ///* Scaling of Energy buffer to get energy per sample, same scaling as for band_energies, 3 is to compensate for the 1/3 scaling in calculate_energy_buffer */
+        // scaleEB = 3 * 4.0f / ( hCPE->hStereoDft->NFFT * hCPE->hStereoDft->NFFT );
+
+        ///* Scale with number of bins in one band */
+        // scaleEB = scaleEB / chan_width_bins;
+
+        SWITCH( input_Fs )
+        {
+            case 8000:
+                scaleEB_fx = 251648; // Q35
+                move32();
+                BREAK;
+            case 16000:
+                scaleEB_fx = 62912; // Q35
+                move32();
+                BREAK;
+            case 32000:
+                scaleEB_fx = 15728; // Q35
+                move32();
+                BREAK;
+            case 48000:
+                scaleEB_fx = 6991; // Q35
+                move32();
+                BREAK;
+            default:
+                assert( 0 && "invalid sample rate" );
+        }
+    }
+    ELSE
+    {
+        scaleEB_fx = Mpy_32_32( numSlots_inv_fx, L_deposit_l( hFdCngEnc->hFdCngCom->scalingFactor ) ); // Q34 + Q30 - Q31 = Q33
+        scaleEB_fx = L_shl( scaleEB_fx, 2 );                                                           // Q35
+    }
+
+    /* preemphasis compensation and grouping of per bin energies into msPeriodog */
+    FOR( i = 0; i < nFFTpart; i++ )
+    {
+        tmp = L_add( L_shr( band_energies[i], 1 ), L_shr( band_energies[i + NB_BANDS], 1 ) );
+        msPeriodog_fx[i] = Mpy_32_16_1( tmp, preemphCompensation_fx[i] );
+        move32();
+    }
+
+    /* exponent for fft part of msPeriodog */
+    hFdCngEnc->msPeriodog_fx_exp_fft = add( band_energies_exp, PREEMPH_COMPENSATION_EXP );
+    move16();
+
+    Word16 max_exp = -31;
+    move16();
+    i = 0;
+    move16();
+    /* Adjust to the desired time resolution by averaging the periodograms over the time slots */
+    FOR( j = numCoreBands; j < regularStopBand; j++ )
+    {
+        periodog_64 = W_mult_32_32( enerBuffer[j], scaleEB_fx );
+        Word16 scale = W_norm( periodog_64 );
+        *ptr_per_fx = W_extract_h( W_shl( periodog_64, scale ) );
+        move32();
+        periodog_exp[i] = sub( Q31, add( add( sub( Q31, enerBuffer_exp ), 35 - 31 ), scale ) );
+        move16();
+        if ( *ptr_per_fx )
+        {
+            max_exp = s_max( max_exp, periodog_exp[i] );
+        }
+        ptr_per_fx++;
+        i++;
+    }
+    /* exponent for cldfb part of msPeriodog */
+    // hFdCngEnc->hFdCngCom->exp_cldfb_periodog = add( sub( enerBuffer_exp, 4 ), CLDFBscalingFactor_EXP );
+    //  move16();
+
+    numBands = sub( regularStopBand, numCoreBands ); /* Q0 */
+    FOR( i = 0; i < numBands; i++ )
+    {
+
+        periodog[i] = L_shr( periodog[i], sub( max_exp, periodog_exp[i] ) );
+
+        move16();
+    }
+    hFdCngEnc->hFdCngCom->exp_cldfb_periodog = max_exp;
+    move16();
+    IF( numBands > 0 )
+    {
+        ///* Adjust CLDFB filterbank to the desired frequency resolution by averaging over spectral partitions for SID transmission */
+        bandcombinepow(
+            periodog,
+            hFdCngEnc->hFdCngCom->exp_cldfb_periodog,
+            numBands,
+            hFdCngEnc->hFdCngCom->CLDFBpart,
+            nCLDFBpart,
+            hFdCngEnc->hFdCngCom->CLDFBpsize_inv,
+            &msPeriodog_fx[nFFTpart],
+            &hFdCngEnc->msPeriodog_fx_exp_cldfb );
+
+        ///* find common exponent for fft part and cldfb part of msperiodog */
+        s1 = L_norm_arr( msPeriodog_fx, nFFTpart );
+        s2 = L_norm_arr( &msPeriodog_fx[nFFTpart], nCLDFBpart );
+
+        s = s_max( sub( hFdCngEnc->msPeriodog_fx_exp_fft, s1 ), sub( hFdCngEnc->msPeriodog_fx_exp_cldfb, s2 ) );
+        s1 = sub( s, hFdCngEnc->msPeriodog_fx_exp_fft );
+        s2 = sub( s, hFdCngEnc->msPeriodog_fx_exp_cldfb );
+
+        hFdCngEnc->msPeriodog_fx_exp_fft = s;
+        move16();
+        hFdCngEnc->msPeriodog_fx_exp_cldfb = s;
+        move16();
+
+        FOR( i = 0; i < nFFTpart; i++ )
+        {
+            msPeriodog_fx[i] = L_shr( msPeriodog_fx[i], s1 ); /*  hFdCngEnc->msPeriodog_fx_exp_fft */
+            move32();
+        }
+
+        FOR( i = 0; i < nCLDFBpart; i++ )
+        {
+            msPeriodog_fx[nFFTpart + i] = L_shr( msPeriodog_fx[nFFTpart + i], s2 ); /*  hFdCngEnc->msPeriodog_fx_exp_fft */
+            move32();
+        }
+    }
+    /* exponent for entire msPeriodog vector */
+    hFdCngEnc->msPeriodog_fx_exp = hFdCngEnc->msPeriodog_fx_exp_fft;
+    move16();
+
+    /* Compress MS inputs */
+    // compress_range_flt( msPeriodog, msLogPeriodog, npart );
+    compress_range( msPeriodog_fx, hFdCngEnc->msPeriodog_fx_exp, msLogPeriodog_fx, npart );
+
+
+    /* Call the minimum statistics routine for noise estimation */
+
+    minimum_statistics_fx( npart, nFFTpart, psize, msLogPeriodog_fx, hFdCngEnc->msNoiseFloor_fx, msLogNoiseEst_fx, hFdCngEnc->msAlpha_fx, hFdCngEnc->msPsd_fx, hFdCngEnc->msPsdFirstMoment_fx,
+                           hFdCngEnc->msPsdSecondMoment_fx, hFdCngEnc->msMinBuf_fx, hFdCngEnc->msBminWin_fx, hFdCngEnc->msBminSubWin_fx, hFdCngEnc->msCurrentMin_fx, hFdCngEnc->msCurrentMinOut_fx, hFdCngEnc->msCurrentMinSubWindow_fx, hFdCngEnc->msLocalMinFlag, hFdCngEnc->msNewMinFlag, hFdCngEnc->msPeriodogBuf_fx, &( hFdCngEnc->msPeriodogBufPtr ), hFdCngEnc->hFdCngCom,
+                           ENC, ( hCPE == NULL ) ? 0 : hCPE->element_mode );
+
+    /* Expand MS outputs */
+    expand_range( msLogNoiseEst_fx, msNoiseEst_fx, &hFdCngEnc->msNoiseEst_fx_exp, hFdCngEnc->hFdCngCom->npart );
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------*
+ * FdCng_encodeSID()
+ *
+ * Generate a bitstream out of the partition levels
+ *-------------------------------------------------------------------*/
+void FdCng_encodeSID_ivas_fx(
+    Encoder_State *st /* i/o: encoder state structure     */
+)
+{
+    Word16 N;
+    HANDLE_FD_CNG_ENC hFdCngEnc = st->hFdCngEnc;
+    HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom;
+    BSTR_ENC_HANDLE hBstr = st->hBstr;
+
+    Word32 *invTrfMatrix_fx, *E_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
+    Word32 v_fx[32], gain_fx, e_fx, temp;
+    Word16 w_fx[32], indices[32], exp[32];
+    Word32 dct_target_fx[FDCNG_VQ_DCT_MAXTRUNC];
+    Word32 tot_sig_ext_fx[FDCNG_VQ_MAX_LEN];
+    Word16 v_e, gain_q_offset, preemph_fac;
+    Word16 i, index;
+
+    gain_q_offset = GAIN_Q_OFFSET_IVAS_FX_Q0;
+    move16();
+
+    if ( st->element_mode == EVS_MONO )
+    {
+        gain_q_offset = GAIN_Q_OFFSET_EVS_FX_Q0;
+        move16();
+    }
+
+    preemph_fac = st->preemph_fac; // Q15
+    move16();
+
+    /* Init */
+    N = hFdCngEnc->npartDec;
+    move16();
+
+    E_fx = hFdCngEnc->msNoiseEst_fx;
+
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /* dynamically filled  */
+
+    set_zero_fx( v_fx, FDCNG_VQ_MAX_LEN );
+
+    /* Convert to LOG */
+    e_fx = 0;
+    move32();
+    FOR( i = 0; i < N; i++ )
+    {
+        IF( E_fx[i] == 0 )
+        {
+            /* 10 * log(1e-4) = 10 * (-4) = -40 */
+            v_fx[i] = -41943040; // -40.0 in Q20
+            move32();
+        }
+        ELSE
+        {
+            v_fx[i] = Mpy_32_32( 671088640 /*10 in Q26*/, BASOP_Util_Log10( E_fx[i], hFdCngEnc->msNoiseEst_fx_exp ) ); // Q20 = 26+25-31
+            move32();
+        }
+        e_fx = L_add( e_fx, v_fx[i] ); // Q20
+    }
+
+    /* Normalize MSVQ input */
+    gain_fx = 0;
+    move32();
+    FOR( i = N_GAIN_MIN; i < N_GAIN_MAX; i++ )
+    {
+        gain_fx = L_add( gain_fx, v_fx[i] ); // Q20
+    }
+
+    /*gain /= (float) ( N_GAIN_MAX - N_GAIN_MIN );*/
+    gain_fx = Mpy_32_32( gain_fx, 165191050 /* 1/13 in Q31*/ ); // Q20
+
+    FOR( i = 0; i < N; i++ )
+    {
+        v_fx[i] = L_sub( v_fx[i], gain_fx ); // Q20
+        move32();
+    }
+
+    v_e = 11; // Q20
+    move16();
+
+    /* MSVQ encoder */
+    set_val_Word16( w_fx, ONE_IN_Q8, N );
+
+    IF( st->element_mode != EVS_MONO )
+    {
+        /* DCT domain compressed/truncated indices used for first stage  */
+        /*  quantization with stage1 stored in DCT24 domain,   stages 2 through 6 directly dearched
+           in FDCNG band domain
+        */
+        IF( EQ_16( N, FDCNG_VQ_MAX_LEN_WB ) )
+        {
+            /* truncated DCT21 analysis */
+            create_IDCT_N_Matrix_fx( invTrfMatrix_fx, N, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) ); // Q31
+
+            dctT2_N_apply_matrix_fx( v_fx /*Q20*/, dct_target_fx, FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX ); // Q20
+
+            /* truncated IDCT21 extension to 24 bands  */
+            extend_dctN_input_fx( v_fx, dct_target_fx, N, tot_sig_ext_fx, FDCNG_VQ_MAX_LEN, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); // Q20
+
+            Copy32( tot_sig_ext_fx, v_fx, FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ stage #1 */ // Q20
+        }
+
+        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) ); // Q31
+
+        msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, v_fx, v_e, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w_fx, N, FD_CNG_maxN_37bits, 1, invTrfMatrix_fx, indices );
+
+        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, v_fx, NULL, 7 );
+
+        v_e = sub( 31, sub( 20, find_guarded_bits_fx( N ) ) );
+    }
+    ELSE
+    { /* EVS_MONO tables */
+        msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, v_fx, v_e, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w_fx, N, FD_CNG_maxN_37bits, 0, NULL, indices );
+
+        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v_fx, NULL, 7 );
+
+        v_e = sub( 31, sub( 20, find_guarded_bits_fx( N ) ) );
+    }
+
+    /* Compute gain */
+    gain_fx = 0;
+    move32();
+    FOR( i = 0; i < N; i++ )
+    {
+        gain_fx = L_add( gain_fx, v_fx[i] ); // Q = 31 - v_e
+    }
+
+    e_fx = L_shl( e_fx, sub( 11, v_e ) );                           // Q = 31 - v_e
+    gain_fx = Mpy_32_16_1( L_sub( e_fx, gain_fx ), div_s( 1, N ) ); // Q = 31 - v_e
+    gain_fx = L_shl( gain_fx, sub( v_e, 8 ) );                      // Q23
+
+    /* Apply bitrate-dependant scale */
+    IF( st->element_mode > EVS_MONO )
+    {
+        apply_scale( &gain_fx, hFdCngCom->CngBandwidth, hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
+    }
+    ELSE
+    {
+        apply_scale( &gain_fx, hFdCngCom->CngBandwidth, hFdCngCom->CngBitrate, scaleTableMono, SIZE_SCALE_TABLE_MONO );
+    }
+
+    /* Quantize gain */
+    temp = Madd_32_32( L_shl( gain_q_offset, 22 ), gain_fx, 1610612736 /*1.5 in Q30*/ ); // Q22
+    index = extract_l( L_shr( L_add( temp, ONE_IN_Q21 ), 22 ) );                         // Q0
+
+    if ( index < 0 )
+    {
+        index = 0;
+        move16();
+    }
+
+    if ( GT_16( index, 127 ) )
+    {
+        index = 127;
+        move16();
+    }
+
+    gain_fx = L_shl( L_mult0( sub( index, gain_q_offset ), 21845 /*1.5 in Q15*/ ), sub( 16, v_e ) ); // Q = 31-v_e
+
+    /* Apply gain and undo log */
+    FOR( i = 0; i < N; i++ )
+    {
+        temp = Mpy_32_32( L_add( v_fx[i], gain_fx ), 214748365 /* 0.1 in Q31*/ ); // Q = 31-v_e
+        hFdCngCom->sidNoiseEst[i] = BASOP_Util_fPow( 10, 31, temp, v_e, &exp[i] );
+        move32();
+    }
+
+    maximum_s( exp, N, &hFdCngCom->sidNoiseEstExp );
+
+    FOR( i = 0; i < N; i++ )
+    {
+        hFdCngCom->sidNoiseEst[i] = L_shr( hFdCngCom->sidNoiseEst[i], sub( hFdCngCom->sidNoiseEstExp, exp[i] ) ); // exp = hFdCngCom->sidNoiseEstExp
+        move32();
+    }
+
+    /* NB last band energy compensation */
+    IF( hFdCngCom->CngBandwidth == NB )
+    {
+        hFdCngCom->sidNoiseEst[N - 1] = Mpy_32_16_1( hFdCngCom->sidNoiseEst[N - 1], NB_LAST_BAND_SCALE ); // exp(hFdCngCom->sidNoiseEstExp)
+        move32();
+    }
+
+    test();
+    IF( EQ_16( hFdCngCom->CngBandwidth, SWB ) && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
+    {
+        hFdCngCom->sidNoiseEst[N - 1] = Mpy_32_16_1( hFdCngCom->sidNoiseEst[N - 1], SWB_13k2_LAST_BAND_SCALE ); // exp(hFdCngCom->sidNoiseEstExp)
+        move32();
+    }
+
+    /* Write bitstream */
+    IF( EQ_16( st->codec_mode, MODE2 ) )
+    {
+        FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
+        {
+            push_next_indice( hBstr, indices[i], bits_37bits[i] );
+        }
+
+        push_next_indice( hBstr, index, 7 );
+    }
+    ELSE
+    {
+        Word16 is_frame_len_16k = 0;
+        move16();
+        if ( EQ_16( st->L_frame, L_FRAME16k ) )
+        {
+            is_frame_len_16k = 1;
+            move16();
+        }
+        push_indice( hBstr, IND_SID_TYPE, 1, 1 );
+        push_indice( hBstr, IND_BWIDTH, st->bwidth, 2 );
+        push_indice( hBstr, IND_ACELP_16KHZ, is_frame_len_16k, 1 );
+
+        FOR( i = 0; i < FD_CNG_stages_37bits; i++ )
+        {
+            push_indice( hBstr, IND_LSF, indices[i], bits_37bits[i] );
+        }
+
+        push_indice( hBstr, IND_ENERGY, index, 7 );
+    }
+
+    /* Interpolate the bin/band-wise levels from the partition levels */
+    scalebands( hFdCngCom->sidNoiseEst, hFdCngEnc->partDec, hFdCngEnc->npartDec, hFdCngEnc->midbandDec, hFdCngEnc->nFFTpartDec, sub( hFdCngEnc->stopBandDec, hFdCngEnc->startBandDec ), hFdCngCom->cngNoiseLevel, 1 );
+    hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;
+    move16();
+
+    lpc_from_spectrum( hFdCngCom, hFdCngEnc->startBandDec, hFdCngEnc->stopFFTbinDec, preemph_fac );
+
+    return;
+}
+
+
+/*-------------------------------------------------------------------*
+ * stereoFdCngCoherence()
+ *
+ * compute coherence of channels for use in FD-CNG
+ *-------------------------------------------------------------------*/
+void stereoFdCngCoherence_fx(
+    Encoder_State **sts,                        /* i/o: core encoder structures          */
+    const Word16 last_element_mode,             /* i  : last element mode                Q0*/
+    Word16 fft_buf_fx[CPE_CHANNELS][2 * L_FFT], /* i  : fft buffers for L and R channels fft_exp*/
+    Word16 fft_exp )
+{
+    const Word16 *pt_fftL, *pt_fftR;
+    Word16 i_subfr, i;
+    Word32 cr, ci, eL, eR;
+    Word16 cr_exp, ci_exp, eL_exp, eR_exp;
+    Word32 *mem;
+    Word16 *mem_exp;
+
+    IF( NE_16( last_element_mode, IVAS_CPE_MDCT ) )
+    {
+        set32_fx( sts[0]->hFdCngEnc->mem_coherence_fx, EPSILON_FX, 4 );
+        set16_fx( sts[0]->hFdCngEnc->mem_coherence_exp, 0, 4 );
+    }
+    test();
+    test();
+    IF( EQ_32( sts[0]->core_brate, -1 ) || EQ_32( sts[1]->core_brate, -1 ) )
+    {
+        /* case: at least one channel has triggered VAD -> ACTIVE FRAME */
+        IF( EQ_32( sts[0]->core_brate, -1 ) )
+        {
+            sts[1]->total_brate = sts[0]->total_brate; /* Q0 */
+            move32();
+            sts[1]->active_cnt = sts[0]->active_cnt; /* Q0 */
+            move16();
+            if ( GE_32( sts[1]->active_cnt, CNG_TYPE_HO ) )
+            {
+                sts[1]->last_total_brate_cng = -1;
+                move16();
+            }
+        }
+        IF( EQ_32( sts[1]->core_brate, -1 ) )
+        {
+            sts[0]->total_brate = sts[1]->total_brate; /* Q0 */
+            move32();
+            sts[0]->active_cnt = sts[1]->active_cnt; /* Q0 */
+            move16();
+            if ( GE_16( sts[0]->active_cnt, CNG_TYPE_HO ) )
+            {
+                sts[0]->last_total_brate_cng = -1;
+                move16();
+            }
+        }
+        sts[0]->core_brate = -1;
+        move32();
+        sts[1]->core_brate = -1;
+        move32();
+        sts[0]->hDtxEnc->cnt_SID = 0;
+        move16();
+        sts[1]->hDtxEnc->cnt_SID = 0;
+        move16();
+    }
+    ELSE IF( LE_32( sts[0]->core_brate, SID_2k40 ) && LE_32( sts[1]->core_brate, SID_2k40 ) )
+    {
+        /* case: no VAD for both channels -> INACTIVE FRAME */
+        reset_indices_enc_fx( sts[0]->hBstr, sts[0]->hBstr->nb_ind_tot );
+
+        reset_indices_enc_fx( sts[1]->hBstr, sts[1]->hBstr->nb_ind_tot );
+
+        /* synchronize SID sending for variable SID rate */
+        IF( NE_32( sts[0]->core_brate, sts[1]->core_brate ) )
+        {
+            sts[0]->core_brate = SID_2k40;
+            move32();
+            sts[1]->core_brate = SID_2k40;
+            move32();
+        }
+
+        /* synchronize SID counters */
+        sts[0]->hDtxEnc->cnt_SID = s_min( sts[0]->hDtxEnc->cnt_SID, sts[1]->hDtxEnc->cnt_SID ); /* Q0 */
+        sts[1]->hDtxEnc->cnt_SID = sts[0]->hDtxEnc->cnt_SID;                                    /* Q0 */
+        move16();
+        move16();
+    }
+
+    pt_fftL = fft_buf_fx[0];
+    pt_fftR = fft_buf_fx[1];
+    mem = sts[0]->hFdCngEnc->mem_coherence_fx; /* exp(sts[0]->hFdCngEnc->mem_coherence_exp) */
+    mem_exp = sts[0]->hFdCngEnc->mem_coherence_exp;
+    FOR( i_subfr = 0; i_subfr < 2; i_subfr++ )
+    {
+        cr = ci = eL = eR = EPSILON_FX;
+        move32();
+        move32();
+        move32();
+        move32();
+        cr_exp = ci_exp = eL_exp = eR_exp = 0;
+        move16();
+        move16();
+        move16();
+        move16();
+
+        cr = BASOP_Util_Add_Mant32Exp( cr, cr_exp, L_add( L_mult( pt_fftL[0], pt_fftR[0] ), L_mult( pt_fftL[L_FFT / 2], pt_fftR[L_FFT / 2] ) ), shl( fft_exp, 1 ), &cr_exp ); /* exp(cr_exp) */
+        eL = BASOP_Util_Add_Mant32Exp( eL, eL_exp, L_add( L_mult( pt_fftL[0], pt_fftL[0] ), L_mult( pt_fftL[L_FFT / 2], pt_fftL[L_FFT / 2] ) ), shl( fft_exp, 1 ), &eL_exp ); /* exp(eL_exp) */
+        eR = BASOP_Util_Add_Mant32Exp( eR, eR_exp, L_add( L_mult( pt_fftR[0], pt_fftR[0] ), L_mult( pt_fftR[L_FFT / 2], pt_fftR[L_FFT / 2] ) ), shl( fft_exp, 1 ), &eR_exp ); /* exp(eR_exp) */
+
+        FOR( i = 1; i < L_FFT / 2; i++ )
+        {
+            cr = BASOP_Util_Add_Mant32Exp( cr, cr_exp, L_add( L_mult( pt_fftL[i], pt_fftR[i] ), L_mult( pt_fftL[L_FFT - i], pt_fftR[L_FFT - i] ) ), shl( fft_exp, 1 ), &cr_exp );  /* exp(cr_exp) */
+            ci = BASOP_Util_Add_Mant32Exp( ci, ci_exp, L_add( L_mult( -pt_fftL[i], pt_fftR[L_FFT - i] ), L_mult( pt_fftL[L_FFT - i], pt_fftR[i] ) ), shl( fft_exp, 1 ), &ci_exp ); /* exp(ci_exp) */
+            eL = BASOP_Util_Add_Mant32Exp( eL, eL_exp, L_add( L_mult( pt_fftL[i], pt_fftL[i] ), L_mult( pt_fftL[L_FFT - i], pt_fftL[L_FFT - i] ) ), shl( fft_exp, 1 ), &eL_exp );  /* exp(eL_exp) */
+            eR = BASOP_Util_Add_Mant32Exp( eR, eR_exp, L_add( L_mult( pt_fftR[i], pt_fftR[i] ), L_mult( pt_fftR[L_FFT - i], pt_fftR[L_FFT - i] ) ), shl( fft_exp, 1 ), &eR_exp );  /* exp(eR_exp) */
+        }
+        test();
+        test();
+        IF( LE_32( sts[0]->ini_frame, 50 ) || ( sts[0]->vad_flag == 0 && sts[1]->vad_flag == 0 ) )
+        {
+            mem[0] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[0], 31129 /*0.95f*/ ), mem_exp[0], Mpy_32_16_1( cr, 1638 /*0.05f*/ ), cr_exp, &mem_exp[0] ); /* exp(mem_exp[0]) */
+            move32();
+            mem[1] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[1], 31129 /*0.95f*/ ), mem_exp[1], Mpy_32_16_1( ci, 1638 /*0.05f*/ ), ci_exp, &mem_exp[1] ); /* exp(mem_exp[1]) */
+            move32();
+            mem[2] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[2], 31129 /*0.95f*/ ), mem_exp[2], Mpy_32_16_1( eL, 1638 /*0.05f*/ ), eL_exp, &mem_exp[2] ); /* exp(mem_exp[2]) */
+            move32();
+            mem[3] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( mem[3], 31129 /*0.95f*/ ), mem_exp[3], Mpy_32_16_1( eR, 1638 /*0.05f*/ ), eR_exp, &mem_exp[3] ); /* exp(mem_exp[3]) */
+            move32();
+        }
+
+        pt_fftL += L_FFT;
+        pt_fftR += L_FFT;
+    }
+
+    Word16 sqr_inp, temp, sqr_out, sqr_inp_exp;
+    Word32 sqr_inp32 = BASOP_Util_Add_Mant32Exp( Mpy_32_32( mem[0], mem[0] ), shl( mem_exp[0], 1 ), Mpy_32_32( mem[1], mem[1] ), shl( mem_exp[1], 1 ), &sqr_inp_exp ); /* exp(sqr_inp_exp) */
+    sqr_inp = BASOP_Util_Divide3232_Scale( sqr_inp32, Mpy_32_32( mem[2], mem[3] ), &temp );
+    sqr_inp_exp = add( temp, sub( sqr_inp_exp, add( mem_exp[2], mem_exp[3] ) ) );
+    sqr_out = Sqrt16( sqr_inp, &sqr_inp_exp );
+    sts[0]->hFdCngEnc->hFdCngCom->coherence_fx = shl_sat( sqr_out, sqr_inp_exp ); // Q15 expected.
+    move16();
+    return;
+}
+
+/*-------------------------------------------------------------------*
+ * FdCngEncodeMDCTStereoSID()
+ *
+ * Encode DTX parameters and noise shapes into SID for MDCT-Stereo DTX
+ *-------------------------------------------------------------------*/
+
+void FdCngEncodeMDCTStereoSID_fx(
+    CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure     */
+)
+{
+    ENC_CORE_HANDLE sts[CPE_CHANNELS];
+    Word16 indices[CPE_CHANNELS][FD_CNG_stages_37bits];
+    Word16 gain_idx[CPE_CHANNELS];
+    Word16 N, stages, ch, p, coh_idx;
+    Word32 *lr_in_ptr_fx[CPE_CHANNELS];
+    Word16 lr_in_ptr_e[CPE_CHANNELS];
+    Word32 *ms_ptr_fx[CPE_CHANNELS];
+    Word16 ms_ptr_e;
+    Word32 *lr_out_ptr_fx[CPE_CHANNELS];
+    Word16 lr_out_ptr_e[CPE_CHANNELS];
+    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
+    Word32 E_fx[CPE_CHANNELS];
+    Word32 gain_fx[CPE_CHANNELS];
+    Word16 weights_fx[NPART];
+    Word32 side_energy_fx;
+    Word16 Qside_energy;
+    Word32 *invTrfMatrix_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];                                   /*24*18*/
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx;                                                      /* dynamically filled  */
+    Word32 tot_sig_ext_fx[FDCNG_VQ_MAX_LEN], dct_target_fx[CPE_CHANNELS][FDCNG_VQ_DCT_MAXTRUNC]; /* 24 +2*18*/
+    Word16 tmp, tmp_e;
+    Word16 no_side_flag;
+    Word16 is_inp_ms;
+    Word16 size_value, temp_e, gb, shift;
+    Word32 tmp32, t1, t2;
+
+    is_inp_ms = 0;
+    move16();
+    IF( EQ_16( hCPE->hCoreCoder[0]->cng_sba_flag, 1 ) )
+    {
+        is_inp_ms = 1;
+        move16();
+    }
+
+    /* set pointers and initialize */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        sts[ch] = hCPE->hCoreCoder[ch];
+        lr_in_ptr_fx[ch] = &sts[ch]->hFdCngEnc->msNoiseEst_fx[0]; /* exp(sts[ch]->hFdCngEnc->msNoiseEst_fx_exp) */
+        lr_in_ptr_e[ch] = sts[ch]->hFdCngEnc->msNoiseEst_fx_exp;
+        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];
+        lr_out_ptr_fx[ch] = &sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEst[0]; /* exp(sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp) */
+        lr_out_ptr_e[ch] = sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp;
+    }
+    N = sts[0]->hFdCngEnc->npartDec; /* Q0 */
+    move16();
+    set16_fx( weights_fx, ONE_IN_Q8, NPART );
+
+    /* apply log and save energy of original left and right channels */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        // E[ch] = 0.0f;
+        E_fx[ch] = 0;
+        move32();
+        FOR( p = 0; p < N; p++ )
+        {
+            IF( lr_in_ptr_fx[ch][p] )
+            {
+                t1 = BASOP_Util_Log2( lr_in_ptr_fx[ch][p] );                 // Q25
+                t2 = L_add( t1, L_shl( lr_in_ptr_e[ch], Q25 ) );             // Q25
+                ms_ptr_fx[ch][p] = Mpy_32_32( t2, TEN_MULT_LOG10_2_IN_Q29 ); // Q23
+                move32();
+            }
+            ELSE
+            {
+                // 10.f * log10f( EPSILON ) --> -150.0f
+                // Subsequent additions / subtractions happen on these numbers, so to avoid saturations
+                // this value is set to -128.0f in Q23
+                ms_ptr_fx[ch][p] = -ONE_IN_Q30; // Q23
+                move32();
+            }
+            E_fx[ch] = L_add( E_fx[ch], L_shr( ms_ptr_fx[ch][p], 4 ) ); // Q19
+            move32();
+        }
+    }
+    ms_ptr_e = Q31 - Q23;
+    move16();
+
+    /* M/S transform on log envelopes */
+    IF( is_inp_ms == 0 )
+    {
+        convertToMS_fx( N, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q30 ); // ms_ptr_e = Q23;
+    }
+
+    gb = find_guarded_bits_fx( N );
+    side_energy_fx = sum2_f_32_fx( ms_ptr_fx[1], N, gb );
+    Qside_energy = sub( sub( shl( sub( 31, ms_ptr_e ), 1 ), 31 ), gb );
+
+    /* do not transmit side shape if initial noise shapes are very similar */
+    IF( LE_32( side_energy_fx, L_shl( 214748365, sub( Qside_energy, Q31 ) ) ) )
+    {
+        no_side_flag = 1;
+        move16();
+    }
+    ELSE
+    {
+        no_side_flag = 0;
+        move16();
+    }
+
+    /* Quantize noise shapes */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        /* Normalize MSVQ input */
+        gain_fx[ch] = 0;
+        move32();
+        FOR( p = N_GAIN_MIN; p < N_GAIN_MAX; p++ )
+        {
+            tmp32 = Mpy_32_32( ms_ptr_fx[ch][p], 165191050 /* 0.07 in Q31*/ ); // Q23
+            gain_fx[ch] = L_add( gain_fx[ch], tmp32 );                         // Q23
+            move32();
+        }
+
+        FOR( p = 0; p < N; p++ )
+        {
+            ms_ptr_fx[ch][p] = L_sub( ms_ptr_fx[ch][p], gain_fx[ch] ); // Q23
+            move32();
+        }
+    }
+
+    /* always split channel targetloop */
+
+    /* extend fdcng envelope from length 21 to a 24 length fdncg domain envelope signal */
+    /* High quality cosine smooth basis extension used  to not introduce noise in stage#1  DCT24 analysis and subsequent VQ-steps */
+    IF( EQ_16( N, FDCNG_VQ_MAX_LEN_WB ) )
+    {
+        size_value = BASOP_Util_Divide1616_Scale( sizeof( tmpRAM_fx ), ( sizeof( Word32 ) ), &temp_e ); /*Q15*/
+        size_value = shr( size_value, sub( 15, temp_e ) );
+        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, N, FDCNG_VQ_DCT_MAXTRUNC, size_value ); // Q31 /*WB: create truncated IDCT21 matrix */
+        for ( ch = 0; ch < CPE_CHANNELS; ch++ )
+        {
+            /* run DCT_N N==21 , truncated at 18/21 ~= 86% , i.e use a bit better better quality in extrapolation , than subsequent DCT24 analysis which is truncated at 75%*/
+            /* truncated DCT 21 analysis */
+            dctT2_N_apply_matrix_fx( (const Word32 *) ms_ptr_fx[ch], dct_target_fx[ch], FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX );
+            /* extrapolate extend fdcng envelope signal in the fdncg ienvelope/"time" domain using DCT21 basis vectors,
+                estimated DCT21 coeffs scaling extended basis vectors are used to create extrapolated   length 24 input target envelope signal */
+            /* this DCT21 extension does not introduce DCT24 coefficient noise for  the subsequent dct24 target analysis, and later in IDCT24 synthesis  */
+
+            /* truncated IDCT 21 extension synthesis  */
+            extend_dctN_input_fx( ms_ptr_fx[ch], dct_target_fx[ch], N, tot_sig_ext_fx, FDCNG_VQ_MAX_LEN, invTrfMatrix_fx /* DCT_N basis vectors */, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); /* use 18 basis vectors*/
+
+            Copy32( tot_sig_ext_fx, ms_ptr_fx[ch], FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ */
+        }
+    }
+
+    size_value = BASOP_Util_Divide1616_Scale( sizeof( tmpRAM_fx ), ( sizeof( Word32 ) ), &temp_e ); /*Q15*/
+    size_value = shr( size_value, sub( 15, temp_e ) );
+    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, size_value ); /*always create/set up  IDCT24 matrix in RAM */
+
+    /* end split */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        /* MSVQ */
+        IF( ch )
+        {
+            stages = FD_CNG_JOINT_stages_25bits;
+            move16();
+        }
+        ELSE
+        {
+            stages = FD_CNG_stages_37bits;
+            move16();
+        }
+
+        /* DCT24 domain compressed/truncated indices used for first stage  */
+        /*             mid  channel quantization using stages 1 through 6 */
+        /*           & side channel quantization using stages 1 through 4 */
+
+        {
+            msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, ms_ptr_fx[ch], ms_ptr_e, levels_37bits, FD_CNG_maxC_37bits, stages, weights_fx, N, FD_CNG_maxN_37bits, 1, invTrfMatrix_fx, indices[ch] );
+            msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices[ch], 1, invTrfMatrix_fx, ms_ptr_fx[ch], NULL, 7 );
+        }
+    }
+    shift = find_guarded_bits_fx( N );
+    ms_ptr_e = sub( 31, sub( 20, shift ) );
+
+    IF( no_side_flag )
+    {
+        set32_fx( ms_ptr_fx[1], 0, N );
+    }
+
+    /* undo M/S */
+    IF( is_inp_ms == 0 )
+    {
+        convertToMS_fx( N, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q31 );
+    }
+
+    /* Compute gain against original left and right channels */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        gain_fx[ch] = 0;
+        move32();
+
+        tmp_e = 15;
+        move16();
+        tmp = Inv16( N, &tmp_e );
+        FOR( p = 0; p < N; p++ )
+        {
+            gain_fx[ch] = L_add( gain_fx[ch], Mpy_32_16_1( ms_ptr_fx[ch][p], shl( tmp, tmp_e ) ) ); // Q23
+            move32();
+        }
+        gain_fx[ch] = L_sub( L_shl( Mpy_32_16_1( E_fx[ch], shl( tmp, tmp_e ) ), Q23 - Q19 ), L_shl( gain_fx[ch], sub( ms_ptr_e, 8 ) ) ); // Q23
+        move32();
+
+        apply_scale( &gain_fx[ch], sts[ch]->hFdCngEnc->hFdCngCom->CngBandwidth, sts[ch]->element_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
+
+        /* quantize gain */
+        gain_idx[ch] = (Word16) Mpy_32_32_r( L_add( gain_fx[ch], 251658240 ), 384 ); // Q23
+        move16();
+        gain_idx[ch] = s_max( 0, s_min( 127, gain_idx[ch] ) );
+        move16();
+
+        gain_fx[ch] = Mpy_32_16_1( L_shl( sub( gain_idx[ch], GAIN_Q_OFFSET_IVAS_FX_Q0 ), 23 ), 21845 ); // Q23
+        move32();
+    }
+
+    /* restore channel noise envelopes */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        HANDLE_FD_CNG_ENC hFdCngEnc = sts[ch]->hFdCngEnc;
+        HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom;
+
+        tmp_e = 0;
+        move16();
+        Word32 pow;
+
+        Word16 e_lr_out[NPART];
+
+        FOR( p = 0; p < N; p++ )
+        {
+            pow = L_shl( gain_fx[ch], 8 - ms_ptr_e );
+            pow = L_add( ms_ptr_fx[ch][p], pow );
+            pow = Mpy_32_32( pow, 214748365 ); /*pow = 0.1*/
+            lr_out_ptr_fx[ch][p] = BASOP_Util_fPow( 10, 31, pow, ms_ptr_e, &e_lr_out[p] );
+            move32();
+            tmp_e = s_max( tmp_e, e_lr_out[p] );
+        }
+
+        FOR( p = 0; p < N; p++ )
+        {
+            lr_out_ptr_fx[ch][p] = L_shl( lr_out_ptr_fx[ch][p], e_lr_out[p] - tmp_e );
+            move32();
+        }
+        lr_out_ptr_e[ch] = tmp_e;
+        move32();
+
+        sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp = tmp_e;
+        move16();
+
+        /* scale bands and get scalefactors */
+        scalebands( lr_out_ptr_fx[ch], hFdCngEnc->partDec, N, hFdCngEnc->midbandDec, hFdCngEnc->nFFTpartDec, sub( hFdCngEnc->stopBandDec, hFdCngEnc->startBandDec ), hFdCngCom->cngNoiseLevel, 1 );
+        hFdCngCom->cngNoiseLevelExp = lr_out_ptr_e[ch];
+        move16();
+
+        lpc_from_spectrum( hFdCngCom, hFdCngEnc->startBandDec, hFdCngEnc->stopFFTbinDec, sts[ch]->preemph_fac );
+
+        sts[ch]->hDtxEnc->last_CNG_L_frame = sts[ch]->L_frame;
+    }
+
+    /* quantize channel coherence */
+    coh_idx = mult_r( sts[0]->hFdCngEnc->hFdCngCom->coherence_fx, 15 );
+    coh_idx = s_max( 0, s_min( coh_idx, 15 ) );
+
+    /* ---- Write SID bitstream ---- */
+
+
+    /* noise shapes and channel gains */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        IF( ch )
+        {
+            stages = FD_CNG_JOINT_stages_25bits;
+            sts[ch]->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot;
+
+            /* side info */
+            push_indice( sts[ch]->hBstr, IND_SID_TYPE, coh_idx, 4 );
+            push_indice( sts[ch]->hBstr, IND_SID_TYPE, no_side_flag, 1 );
+        }
+        ELSE
+        {
+            stages = FD_CNG_stages_37bits;
+            /* side info */
+            push_indice( sts[ch]->hBstr, IND_SID_TYPE, 1, 1 );
+            push_indice( sts[ch]->hBstr, IND_BWIDTH, sts[0]->bwidth, 2 );
+            push_indice( sts[ch]->hBstr, IND_ACELP_16KHZ, sts[0]->L_frame == L_FRAME16k ? 1 : 0, 1 );
+        }
+
+        FOR( Word16 i = 0; i < stages; i++ )
+        {
+            push_indice( sts[ch]->hBstr, IND_LSF, indices[ch][i], bits_37bits[i] );
+        }
+        push_indice( sts[ch]->hBstr, IND_ENERGY, gain_idx[ch], 7 );
+    }
+
+    /* pad with zeros to reach common SID frame size */
+    push_indice( sts[1]->hBstr, IND_ENERGY, 0, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC );
+
+    return;
+}
+
+/*-------------------------------------------------------------------*
+ * FdCngEncodeDiracMDCTStereoSID()
+ *
+ * Encode DTX parameters and noise shapes into SID for MDCT-Stereo DTX
+ * together with Dirac
+ *-------------------------------------------------------------------*/
+
+void FdCngEncodeDiracMDCTStereoSID_fx(
+    CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure     */
+)
+{
+    ENC_CORE_HANDLE sts[CPE_CHANNELS];
+    Word32 *lr_in_ptr_fx[CPE_CHANNELS];
+    Word16 lr_in_ptr_e[CPE_CHANNELS];
+    Word32 *ms_ptr_fx[CPE_CHANNELS];
+    Word16 ms_ptr_e;
+    Word32 *lr_out_ptr_fx[CPE_CHANNELS];
+    Word16 lr_out_ptr_e[CPE_CHANNELS];
+    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];
+    Word32 E_fx[CPE_CHANNELS];
+    Word32 gain_fx[CPE_CHANNELS];
+    Word16 weights_fx[NPART];
+    Word16 N[CPE_CHANNELS];
+    Word16 indices[CPE_CHANNELS][FD_CNG_stages_37bits];
+    Word16 gain_idx[CPE_CHANNELS];
+    Word16 ch, p;
+    Word16 tmp, tmp_e, shift;
+    Word32 *invTrfMatrix_fx;
+    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];
+    Word32 dct_target_fx[FDCNG_VQ_DCT_MAXTRUNC];
+    Word32 tot_sig_ext_fx[FDCNG_VQ_MAX_LEN];
+    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /* dynamically filled  */
+    Word32 t1, t2, tmp32;
+    /* set pointers and initialize */
+
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        sts[ch] = hCPE->hCoreCoder[ch];
+        N[ch] = sts[ch]->hFdCngEnc->npartDec;
+        lr_in_ptr_fx[ch] = &sts[ch]->hFdCngEnc->msNoiseEst_fx[0];
+        lr_in_ptr_e[ch] = sts[ch]->hFdCngEnc->msNoiseEst_fx_exp;
+        ms_ptr_fx[ch] = &logNoiseEst_fx[ch][0];
+        lr_out_ptr_fx[ch] = &sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEst[0];
+        lr_out_ptr_e[ch] = sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp;
+        move16();
+    }
+    set16_fx( weights_fx, ONE_IN_Q8, NPART );
+
+    /* apply log and save energy of original left and right channels */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        // E[ch] = 0.0f;
+        E_fx[ch] = 0;
+        move32();
+        FOR( p = 0; p < N[ch]; p++ )
+        {
+            t1 = BASOP_Util_Log2( lr_in_ptr_fx[ch][p] + EPSILLON_FX );   // Q25
+            t2 = L_add( t1, L_shl( lr_in_ptr_e[ch], Q25 ) );             // Q25
+            ms_ptr_fx[ch][p] = Mpy_32_32( t2, TEN_MULT_LOG10_2_IN_Q29 ); // Q23
+            move32();
+            E_fx[ch] = L_add( E_fx[ch], L_shr( ms_ptr_fx[ch][p], 5 ) ); // Q18
+            move32();
+        }
+    }
+    ms_ptr_e = Q31 - Q23;
+    move16();
+
+    /* M/S transform on log envelopes */
+    convertToMS_fx( N[0], ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q30 );
+    E_fx[0] = 0;
+    move32();
+    FOR( p = 0; p < N[0]; p++ )
+    {
+        E_fx[0] = L_add( E_fx[0], L_shr( ms_ptr_fx[0][p], 5 ) ); // Q18
+        move32();
+    }
+
+    /* Quantize M noise shape */
+    /* Normalize MSVQ input */
+    gain_fx[0] = 0;
+    move16();
+    FOR( p = N_GAIN_MIN; p < N_GAIN_MAX; p++ )
+    {
+        tmp32 = Mpy_32_32( ms_ptr_fx[0][p], 165191050 /* 0.07 in Q31 */ ); // Q23
+        gain_fx[0] = L_add( gain_fx[0], tmp32 );                           // Q23
+        move32();
+    }
+
+    FOR( p = 0; p < N[0]; p++ )
+    {
+        ms_ptr_fx[0][p] = L_sub( ms_ptr_fx[0][p], gain_fx[0] ); // Q23
+        move32();
+    }
+
+
+    /* MSVQ */
+    /* DCT domain compressed/truncated indices used for first stage  */
+    /*  mid quantization using stages #1 through 6 */
+    scale_sig32( ms_ptr_fx[0], N[0], -6 );
+    ms_ptr_e = add( ms_ptr_e, 6 );
+    move16();
+    IF( EQ_16( N[0], FDCNG_VQ_MAX_LEN_WB ) )
+    {
+        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, N[0], FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) );
+        /* truncated DCT 21 analysis */
+        dctT2_N_apply_matrix_fx( (const Word32 *) ms_ptr_fx[0], dct_target_fx, FDCNG_VQ_DCT_MAXTRUNC, N[0], invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX );
+        /* truncated IDCT21 extension to 24 synthesis  */
+
+        extend_dctN_input_fx( ms_ptr_fx[0], dct_target_fx, N[0], tot_sig_ext_fx, FDCNG_VQ_MAX_LEN, invTrfMatrix_fx, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); /* use 18 basis vectors*/
+
+        Copy32( tot_sig_ext_fx, ms_ptr_fx[0], FDCNG_VQ_MAX_LEN ); /*  write  extended result as input to  VQ stage #1	Q23*/
+    }
+    create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM_fx ) / ( sizeof( Word32 ) ) );
+
+    msvq_enc_ivas_fx( ivas_cdk_37bits_fx, Q7, NULL, NULL, ms_ptr_fx[0], ms_ptr_e, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, weights_fx, N[0], FD_CNG_maxN_37bits, 1, invTrfMatrix_fx, indices[0] );
+    msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N[0], FD_CNG_maxN_37bits, indices[0], 1, invTrfMatrix_fx, ms_ptr_fx[0], NULL, 7 );
+    shift = find_guarded_bits_fx( N[0] );
+    ms_ptr_e = sub( 31, sub( 20, shift ) );
+    scale_sig32( ms_ptr_fx[1], N[1], sub( 8, ms_ptr_e ) ); /* Q31 - ms_ptr_e */
+
+    /* set S to zero */
+    set32_fx( ms_ptr_fx[1], 0, NPART );
+
+    /* compute M gain */
+    gain_fx[0] = 0;
+    move32();
+    tmp_e = 15;
+    move16();
+    tmp = Inv16( N[0], &tmp_e );
+    FOR( p = 0; p < N[0]; p++ )
+    {
+        gain_fx[0] = L_add( gain_fx[0], Mpy_32_16_1( ms_ptr_fx[0][p], shl( tmp, tmp_e ) ) ); // Q23
+        move32();
+    }
+    gain_fx[0] = L_sub( L_shl( Mpy_32_16_1( E_fx[0], shl( tmp, tmp_e ) ), Q23 - Q18 ), L_shl( gain_fx[0], ms_ptr_e - 8 ) ); // Q23
+    move32();
+
+    apply_scale( &gain_fx[0], sts[0]->hFdCngEnc->hFdCngCom->CngBandwidth, sts[0]->hDtxEnc->last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
+
+    /* quantize gain */
+    gain_idx[0] = extract_l( Mpy_32_32_r( L_add( gain_fx[0], 251658240 ), 384 ) );
+    move16();
+    gain_idx[0] = s_max( 0, s_min( 127, gain_idx[0] ) );
+    move16();
+
+    gain_fx[0] = Mpy_32_16_1( L_shl( sub( gain_idx[0], GAIN_Q_OFFSET_IVAS_FX_Q0 ), 23 ), 21845 /* 0.66 in Q15 */ ); // Q23
+    move32();
+    gain_fx[1] = gain_fx[0]; // Q23
+    move32();
+
+    /* undo M/S */
+    convertToMS_fx( NPART, ms_ptr_fx[0], ms_ptr_fx[1], ONE_IN_Q31 );
+
+    /* restore channel noise envelopes */
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        HANDLE_FD_CNG_ENC hFdCngEnc = sts[ch]->hFdCngEnc;
+        HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom;
+
+        Word32 pow;
+        Word16 e_lr_out[NPART];
+        tmp_e = -MAX_16;
+        FOR( p = 0; p < N[ch]; p++ )
+        {
+            pow = L_shl( gain_fx[ch], sub( 8, ms_ptr_e ) );     /* Q31 - ms_ptr_e */
+            pow = L_add( ms_ptr_fx[ch][p], pow );               /* Q31 - ms_ptr_e */
+            pow = Mpy_32_32( pow, 214748365 /* 0.1 in Q31 */ ); /*pow = 0.1		Q31 - ms_ptr_e*/
+            lr_out_ptr_fx[ch][p] = BASOP_Util_fPow( 10, 31, pow, ms_ptr_e, &e_lr_out[p] );
+            tmp_e = s_max( tmp_e, e_lr_out[p] );
+        }
+
+        FOR( p = 0; p < N[ch]; p++ )
+        {
+            lr_out_ptr_fx[ch][p] = L_shl( lr_out_ptr_fx[ch][p], sub( e_lr_out[p], tmp_e ) ); // Q(31 - tmp_e)
+        }
+
+        sts[ch]->hFdCngEnc->hFdCngCom->sidNoiseEstExp = tmp_e;
+        move16();
+        lr_out_ptr_e[ch] = tmp_e;
+        move16();
+
+        /* NB last band energy compensation */
+        IF( hFdCngCom->CngBandwidth == NB )
+        {
+            lr_out_ptr_fx[ch][N[ch] - 1] = Mpy_32_16_1( lr_out_ptr_fx[ch][N[ch] - 1], NB_LAST_BAND_SCALE ); // Q(31 - tmp_e)
+            move32();
+        }
+        ELSE IF( hFdCngCom->CngBandwidth == SWB && LE_32( hFdCngCom->CngBitrate, ACELP_13k20 ) )
+        {
+            lr_out_ptr_fx[ch][N[ch] - 1] = Mpy_32_16_1( lr_out_ptr_fx[ch][N[ch] - 1], SWB_13k2_LAST_BAND_SCALE ); // Q(31 - tmp_e)
+            move32();
+        }
+        /* scale bands and get scalefactors */
+        scalebands( lr_out_ptr_fx[ch], hFdCngEnc->partDec, N[ch], hFdCngEnc->midbandDec, hFdCngEnc->nFFTpartDec, sub( hFdCngEnc->stopBandDec, hFdCngEnc->startBandDec ), hFdCngCom->cngNoiseLevel, 1 );
+        hFdCngCom->cngNoiseLevelExp = lr_out_ptr_e[ch];
+        move16();
+        lpc_from_spectrum( hFdCngCom, hFdCngEnc->startBandDec, hFdCngEnc->stopFFTbinDec, sts[ch]->preemph_fac );
+        sts[ch]->hDtxEnc->last_CNG_L_frame = sts[ch]->L_frame;
+    }
+    sts[0]->hFdCngEnc->hFdCngCom->coherence_fx = 0;
+    move16();
+    sts[1]->hFdCngEnc->hFdCngCom->coherence_fx = 0;
+    move16();
+
+    /* ---- Write SID bitstream ---- */
+
+    /* side info */
+    push_indice( sts[0]->hBstr, IND_SID_TYPE, 1, 1 );
+    push_indice( sts[0]->hBstr, IND_BWIDTH, sts[0]->bwidth, 2 );
+    IF( EQ_16( sts[0]->L_frame, L_FRAME16k ) )
+    {
+        push_indice( sts[0]->hBstr, IND_ACELP_16KHZ, 1, 1 );
+    }
+    ELSE
+    {
+        push_indice( sts[0]->hBstr, IND_ACELP_16KHZ, 0, 1 );
+    }
+
+    /* noise shapes and channel gains */
+    FOR( Word16 i = 0; i < FD_CNG_stages_37bits; i++ )
+    {
+        push_indice( sts[0]->hBstr, IND_LSF, indices[0][i], bits_37bits[i] );
+    }
+    push_indice( sts[0]->hBstr, IND_ENERGY, gain_idx[0], 7 );
+
+    return;
+}
diff --git a/lib_enc/find_tar_fx.c b/lib_enc/find_tar_fx.c
index 0c138308b5e25c0edc71f12620c0a543ac76d921..989f309d2f2a5ee0305103ec476bc9ca9416ba80 100644
--- a/lib_enc/find_tar_fx.c
+++ b/lib_enc/find_tar_fx.c
@@ -3,7 +3,7 @@
   ====================================================================================*/
 #include <stdint.h>
 #include "options.h" /* Compilation switches                   */
-//#include "prot_fx.h"       /* Function prototypes                    */
+// #include "prot_fx.h"       /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "cnst.h"        /* Common constants                       */
@@ -50,11 +50,7 @@ void find_targets_fx(
      *-----------------------------------------------------------------------*/
     FOR( i = 0; i < M; i++ )
     {
-#ifdef BASOP_NOGLOB
         temp[i] = sub_sat( speech[i + i_subfr - M], mem_syn[i] ); /* Q_new - 1 */
-#else
-        temp[i] = sub( speech[i + i_subfr - M], mem_syn[i] );
-#endif
         move16();
     }
     Syn_filt_s( 1, p_Aq, M, &res[i_subfr], temp + M, L_subfr, temp, 0 ); /* error in Q_new -1 */
@@ -107,32 +103,16 @@ void find_targets_fx(
         Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
         FOR( j = 1; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB                                               /* Critical Overflow , as well as those below*/
             Ltmp = L_msu_o( Ltmp, Aqs[j], h1[i - j], &Overflow ); /* Q27 */
-#else
-            Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] );
-#endif
         }
-#ifdef BASOP_NOGLOB                                                     /* Critical Overflow */
         h1[i] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
-#else
-        h1[i] = round_fx( L_shl( Ltmp, s ) );
-#endif
     }
     Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
     FOR( j = 1; j <= M; j++ )
     {
-#ifdef BASOP_NOGLOB                                           /* Critical Overflow */
         Ltmp = L_msu_o( Ltmp, Aqs[j], h1[i - j], &Overflow ); /* Q27 */
-#else
-        Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] );
-#endif
     }
-#ifdef BASOP_NOGLOB                                                 /* Critical Overflow */
     h1[M] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
-#else
-    h1[M] = round_fx( L_shl( Ltmp, s ) );
-#endif
 
     // PMT("should we used extended basop here for when the L_subfr > L_SUBFR, to prevent saturation/overflow and the subsequent loop\n")
     FOR( i = M + 1; i < L_subfr; i++ )
@@ -140,17 +120,9 @@ void find_targets_fx(
         Ltmp = L_msu( 0, Aqs[1], h1[i - 1] ); /* Q27 */
         FOR( j = 2; j <= M; j++ )
         {
-#ifdef BASOP_NOGLOB                                               /* Critical Overflow */
             Ltmp = L_msu_o( Ltmp, Aqs[j], h1[i - j], &Overflow ); /* Q27 */
-#else
-            Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] );
-#endif
         }
-#ifdef BASOP_NOGLOB                                                     /* Critical Overflow */
         h1[i] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
-#else
-        h1[i] = round_fx( L_shl( Ltmp, s ) );
-#endif
     }
     IF( Overflow )
     {
@@ -162,11 +134,7 @@ void find_targets_fx(
             {
                 Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] ); /* Q27 */
             }
-#ifdef BASOP_NOGLOB
             h1[i] = round_fx( L_shl_o( Ltmp, s, &Overflow ) ); /* Q11 + s */
-#else
-            h1[i] = round_fx( L_shl( Ltmp, s ) );
-#endif
         }
         Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
         FOR( j = 1; j <= M; j++ )
@@ -203,16 +171,19 @@ void find_targets_ivas_fx(
     Word16 tilt_fac,       /* i  : tilt factor										Q15*/
     Word16 *xn,            /* o  : Close-loop Pitch search target vector            Q_new-1*/
     Word16 *cn,            /* o  : target vector in residual domain                 Q_new*/
-    Word16 *h1             /* o  : impulse response of weighted synthesis filter    Q14*/
+    Word16 *h1             /* o  : impulse response of weighted synthesis filter    Q(14 - norm_s(h1[0]))*/
 )
 {
     Word16 i;
     Word16 temp[M + 6 * L_SUBFR]; /* error of quantization */
     Word16 scale, scaleq, j, d, s, s2, tmp;
     Word16 Aqs[M + 1];
-    Word32 Ltmp;
+    Word32 h1_32[6 * L_SUBFR];
+    Word16 sf;
+    Word64 Ltmp64;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     /*------------------------------------------------------------------------*
      * Find the target vector for excitation search:
@@ -229,18 +200,15 @@ void find_targets_ivas_fx(
      *-----------------------------------------------------------------------*/
     FOR( i = 0; i < M; i++ )
     {
-#ifdef BASOP_NOGLOB
         temp[i] = sub_sat( speech[i + i_subfr - M], mem_syn[i] ); /* Q_new - 1 */
-#else
-        temp[i] = sub( speech[i + i_subfr - M], mem_syn[i] );
-#endif
         move16();
     }
-    Syn_filt_s( 1, p_Aq, M, &res[i_subfr], temp + M, L_subfr, temp, 0 );
 
-    Residu3_fx( Ap, temp + M, xn, L_subfr, 0 ); /* xn in Q_new -1*/
+    syn_filt_fx( 1, p_Aq, M, &res[i_subfr], temp + M, L_subfr, temp, 0 );
 
-    deemph_fx( xn, tilt_fac, L_subfr, mem_w0 ); /* xn in Q_new -1 */
+    Residu3_fx( Ap, temp + M, xn, L_subfr, 0 ); /* xn in Q_new - 1 */
+
+    deemph_fx( xn, tilt_fac, L_subfr, mem_w0 ); /* xn in Q_new - 1 */
 
 
     /*-----------------------------------------------------------------*
@@ -251,13 +219,13 @@ void find_targets_ivas_fx(
         /* first half: xn[] --> cn[] */
         temp[0] = 0;
         move16();
-        preemph_copy_fx( xn, cn, tilt_fac, shr( L_subfr, 1 ), temp );
-        syn_filt_s_lc_fx( 1, Ap, cn, temp, shr( L_subfr, 1 ) );   /* Q-1 -> Q-2 */
-        Residu3_lc_fx( p_Aq, M, temp, cn, shr( L_subfr, 1 ), 1 ); /* Q-2 -> Q-1 */
-        Scale_sig( cn, shr( L_subfr, 1 ), 1 );                    /* Q_new */
+        preemph_copy_fx( xn, cn, tilt_fac, L_subfr / 2, temp );
+        syn_filt_s_lc_fx( 1, Ap, cn, temp, L_subfr / 2 );   /* Q-1 -> Q-2 */
+        Residu3_lc_fx( p_Aq, M, temp, cn, L_subfr / 2, 1 ); /* Q-2 -> Q-1 */
+        Scale_sig( cn, L_subfr / 2, 1 );
 
         /* second half: res[] --> cn[] (approximated and faster) */
-        Copy( &res[i_subfr + shr( L_subfr, 1 )], cn + shr( L_subfr, 1 ), shr( L_subfr, 1 ) ); /* Q_new */
+        Copy( &res[i_subfr + ( L_subfr / 2 )], cn + ( L_subfr / 2 ), L_subfr / 2 );
     }
 
     /*---------------------------------------------------------------*
@@ -278,95 +246,48 @@ void find_targets_ivas_fx(
         Copy_Scale_sig( p_Aq, Aqs, M + 1, d ); /* Q12 */
         s = add( scale, 1 );
         s2 = 16384;
+        move16();
     }
-    set16_fx( h1, 0, L_subfr );
+
+    set32_fx( h1_32, 0, L_subfr );
     Overflow = 0;
     move16();
     FOR( i = 0; i < M; i++ )
     {
-        Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
+        Ltmp64 = W_mult_16_16( Ap[i], s2 ); /* Q27 */
         FOR( j = 1; j <= i; j++ )
         {
-#ifdef BASOP_NOGLOB                                               /* Critical Overflow , as well as those below*/
-            Ltmp = L_msu_o( Ltmp, Aqs[j], h1[i - j], &Overflow ); /* Q27 */
-#else
-            Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] );
-#endif
+            Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_o( h1_32[i - j], s, &Overflow ) ) ); /* Q27 */
         }
-#ifdef BASOP_NOGLOB                                                     /* Critical Overflow */
-        h1[i] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
-#else
-        h1[i] = round_fx( L_shl( Ltmp, s ) );
-#endif
+        h1_32[i] = W_extract_l( Ltmp64 ); /* Q27 */
+        move32();
     }
-    Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
+
+    Ltmp64 = W_mult_16_16( Ap[i], s2 ); /* Q27 */
     FOR( j = 1; j <= M; j++ )
     {
-#ifdef BASOP_NOGLOB                                           /* Critical Overflow */
-        Ltmp = L_msu_o( Ltmp, Aqs[j], h1[i - j], &Overflow ); /* Q27 */
-#else
-        Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] );
-#endif
+        Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_o( h1_32[i - j], s, &Overflow ) ) ); /* Q27 */
     }
-#ifdef BASOP_NOGLOB                                                 /* Critical Overflow */
-    h1[M] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
-#else
-    h1[M] = round_fx( L_shl( Ltmp, s ) );
-#endif
+    h1_32[M] = W_extract_l( Ltmp64 ); /* Q27 */
+    move32();
 
-    // PMT("should we used extended basop here for when the L_subfr > L_SUBFR, to prevent saturation/overflow and the subsequent loop\n")
     FOR( i = M + 1; i < L_subfr; i++ )
     {
-        Ltmp = L_msu( 0, Aqs[1], h1[i - 1] ); /* Q27 */
+        Ltmp64 = W_msu_16_16( 0, Aqs[1], extract_h( L_shl_o( h1_32[i - 1], s, &Overflow ) ) ); /* Q27 */
         FOR( j = 2; j <= M; j++ )
         {
-#ifdef BASOP_NOGLOB                                               /* Critical Overflow */
-            Ltmp = L_msu_o( Ltmp, Aqs[j], h1[i - j], &Overflow ); /* Q27 */
-#else
-            Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] );
-#endif
-        }
-#ifdef BASOP_NOGLOB                                                     /* Critical Overflow */
-        h1[i] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
-#else
-        h1[i] = round_fx( L_shl( Ltmp, s ) );
-#endif
-    }
-    IF( Overflow )
-    {
-        s2 = shr( s2, 1 );
-        FOR( i = 0; i < M; i++ )
-        {
-            Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
-            FOR( j = 1; j <= i; j++ )
-            {
-                Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] ); /* Q27 */
-            }
-#ifdef BASOP_NOGLOB
-            h1[i] = round_fx( L_shl_o( Ltmp, s, &Overflow ) ); /* Q11 + s */
-#else
-            h1[i] = round_fx( L_shl( Ltmp, s ) );
-#endif
-        }
-        Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
-        FOR( j = 1; j <= M; j++ )
-        {
-            Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] ); /* Q27 */
-        }
-        h1[M] = round_fx( L_shl( Ltmp, s ) ); /* Q11 + s */
-        FOR( i = M + 1; i < L_subfr; i++ )
-        {
-            Ltmp = L_msu( 0, Aqs[1], h1[i - 1] ); /* Q27 */
-            FOR( j = 2; j <= M; j++ )
-            {
-                Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] ); /* Q27 */
-            }
-            h1[i] = round_fx( L_shl( Ltmp, s ) ); /* Q11 + s */
+            Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_o( h1_32[i - j], s, &Overflow ) ) ); /* Q27 */
         }
+        h1_32[i] = W_extract_l( Ltmp64 ); /* Q27 */
+        move32();
     }
 
+    sf = sub( L_norm_arr( h1_32, L_subfr ), 1 );
+    Copy_Scale_sig32_16( h1_32, h1, L_subfr, sf ); // Q11 + sf
+
     tmp = 0;
-    Deemph2( h1, tilt_fac, L_subfr, &tmp );
+    move16();
+    Deemph2( h1, tilt_fac, L_subfr, &tmp ); // Q11 + sf - 1
 
     return;
 }
diff --git a/lib_enc/find_tilt.c b/lib_enc/find_tilt.c
deleted file mode 100644
index 0c07d03a12d5419a992f0e39693b45bb27cea13e..0000000000000000000000000000000000000000
--- a/lib_enc/find_tilt.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-#include "prot_fx.h"     /* Function prototypes                    */
-#include "prot_fx_enc.h" /* Function prototypes                    */
-
-
-/*---------------------------------------------------------------------*
- * Local constants
- *---------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * find_tilt()
- *
- * Find LF/HF energy ratio
- *-------------------------------------------------------------------*/
-void find_tilt_ivas_fx(
-    const Word32 fr_bands[], /* i  : energy in frequency bands						q_fr_bands*/
-    const Word16 q_fr_bands, /* i  : Q of fr_bands						Q0*/
-    const Word32 bckr[],     /* i  : per band background noise energy estimate    q_bckr*/
-    const Word16 q_bckr,     /* i  : Q of bckr    Q0*/
-    Word32 ee[2],            /* o  : lf/hf E ration for present frame							 Q6*/
-    const Word16 pitch[3],   /* i  : open loop pitch values for 3 half-frames					 Q0*/
-    const Word16 voicing[3], /* i  : normalized correlation for 3 half-frames					Q15*/
-    const Word32 *lf_E,      /* i  : per bin energy  for low frequencies         q_lf_E*/
-    const Word16 q_lf_E,     /* i  : Q of lf_E         */
-    const Word16 corr_shift, /* i  : normalized correlation correction							Q15*/
-    const Word16 bwidth,     /* i  : input signal bandwidth                                         */
-    const Word16 max_band,   /* i  : maximum critical band                                          */
-    Word32 hp_E[],           /* o  : energy in HF                                    Q_new*/
-    const Word16 codec_mode, /* i  : MODE1 or MODE2                                      */
-    Word32 *bckr_tilt_lt,    /* i/o: lf/hf E ratio of background noise  Q16                        */
-    Word16 Opt_vbr_mode )
-{
-    Word32 lp_bckr = 0, hp_bckr = 0, lp_E, Ltmp;
-    const Word32 *pt_E, *pt_bands, *pt_bckr, *hf_bands, *tmp_E;
-    Word16 tmp, freq, f0, f1, f2, mean_voi, bin;
-    Word16 i, nb_bands;
-    Word16 e_tmp, m_tmp;
-    Word16 m_Fs, e_Fs;
-    Word16 m_cnt, e_cnt;
-    Word16 m_hpE, e_hpE;
-    Word64 sum;
-    Word16 inv_bands, q_lp_E;
-    Word32 Le_min_scaled, Ltmp2;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-    move32();
-    move32();
-    /*-----------------------------------------------------------------*
-     * Initializations
-     *-----------------------------------------------------------------*/
-
-    IF( ( bwidth != NB ) )
-    {
-        /* WB processing */
-        bin = BIN4_FX;
-        move16();            /* First useful frequency bin ~ 50 Hz     */
-        pt_bands = fr_bands; /* Q_new */
-        tmp_E = lf_E;        /* Q_new - 2 */
-        pt_bckr = bckr;      /* Q_new */
-        nb_bands = 10;
-        inv_bands = 3277 /* 1/10 in Q15 */;
-        move16();
-        move16();
-    }
-    ELSE
-    {
-        /* NB processing */
-        bin = 3 * BIN4_FX;       /* First useful frequency bin ~ 150 Hz    */
-        pt_bands = fr_bands + 1; /* Exlcude 1st critical band              */
-        tmp_E = lf_E + 2;        /* Start at the 3rd bin (150 Hz)          */
-        pt_bckr = bckr + 1;      /* Exlcude 1st critical band              */
-        nb_bands = 9;
-        inv_bands = 3641; /* 1/9 in Q15 */
-        move16();
-        move16(); /* Nb. of "low" frequency bands taken into account in NB processing      */
-    }
-
-    /*-----------------------------------------------------------------*
-     * Find spectrum tilt
-     *-----------------------------------------------------------------*/
-
-    pt_E = tmp_E; /* Point at the 1st useful element of the per-bin energy vector  */
-    hf_bands = fr_bands;
-
-    /* bckr + voicing */
-    /*lp_bckr = mean( pt_bckr, nb_bands );*/ /* estimated noise E in first critical bands, up to 1270 Hz */
-    sum = 0;
-    move64();
-    FOR( i = 0; i < nb_bands; i++ )
-    {
-        sum = W_mac_32_16( sum, pt_bckr[i], inv_bands ); // q_bckr+16
-    }
-    lp_bckr = W_shl_sat_l( sum, -16 );                                                                                  // q_bckr
-    /*hp_bckr = 0.5f * (bckr[max_band-1] + bckr[max_band]);*/                                                           /* estimated noise E in last 2 critical bands */
-    hp_bckr = W_extract_h( W_mac_32_32( W_mult_32_32( bckr[max_band - 1], ONE_IN_Q30 ), bckr[max_band], ONE_IN_Q30 ) ); // q_bckr
-    if ( hp_bckr == 0 )                                                                                                 /* Avoid division by zero. */
-    {
-        hp_bckr = L_deposit_l( 1 );
-    }
-    Ltmp = BASOP_Util_Divide3232_Scale_cadence( lp_bckr, hp_bckr, &e_tmp );
-    Ltmp = Mpy_32_16_r( Ltmp, 3277 /* 0.1f in Q15 */ );
-    Ltmp = L_shr_sat( Ltmp, sub( 15, e_tmp ) );
-    *bckr_tilt_lt = L_add_sat( Mpy_32_16_r( *bckr_tilt_lt, 29491 /* 0.9f in Q15 */ ), Ltmp ); // Q16
-    move32();
-
-    test();
-    IF( EQ_16( codec_mode, MODE2 ) || EQ_16( Opt_vbr_mode, 1 ) )
-    {
-        /*lp_bckr *= FACT;*/
-        /*hp_bckr *= FACT;*/
-#ifdef BASOP_NOGLOB
-        lp_bckr = L_add_sat( L_shl_sat( lp_bckr, 1 ), lp_bckr ); /* Q_new */
-        hp_bckr = L_add_sat( L_shl_sat( hp_bckr, 1 ), hp_bckr ); /* Q_new */
-#else
-        lp_bckr = L_add( L_shl( lp_bckr, 1 ), lp_bckr );
-        hp_bckr = L_add( L_shl( hp_bckr, 1 ), hp_bckr );
-#endif
-    }
-    /*mean_voi = 0.5f * (voicing[1] + voicing[2]) + corr_shift;*/
-    Ltmp = L_mult( voicing[1], 16384 /* 0.5 in Q15 */ );      // Q31
-    Ltmp = L_mac( Ltmp, voicing[2], 16384 /* 0.5 in Q15 */ ); // Q31
-#ifdef BASOP_NOGLOB
-    Ltmp = L_mac_o( Ltmp, corr_shift, 32767 /* 1.0f in Q15 */, &Overflow ); // Q31
-    mean_voi = round_fx_o( Ltmp, &Overflow );                               // Q15
-#else
-    Ltmp = L_mac( Ltmp, corr_shift, 32767 );
-    mean_voi = round_fx( Ltmp );
-#endif
-
-    /*f0 = INT_FS_FX / pitch[2];*/
-    e_tmp = norm_s( pitch[2] );
-    m_tmp = shl( pitch[2], e_tmp );
-
-    m_Fs = div_s( INT_FS_FX, m_tmp ); /* exp(e_tmp) */
-    e_Fs = sub( 15, e_tmp );
-    f0 = shr( m_Fs, sub( e_Fs, 4 ) ); /* Q4 */
-
-    Le_min_scaled = L_shl( E_MIN_FXQ31, sub( q_fr_bands, Q31 ) ); // q_fr_bands=q_bckr
-
-    FOR( i = 0; i < 2; i++ )
-    {
-        /*hp_E[i] = 0.5f * (hf_bands[max_band-1] + hf_bands[max_band]) - hp_bckr; */                                             /* averaged E in last 2 critical bands */
-        Ltmp = W_extract_h( W_mac_32_32( W_mult_32_32( hf_bands[max_band - 1], ONE_IN_Q30 ), hf_bands[max_band], ONE_IN_Q30 ) ); // q_fr_bands
-        Ltmp = L_sub( Ltmp, hp_bckr );                                                                                           // q_fr_bands
-
-        Ltmp2 = L_max( Ltmp, L_shl_sat( 1, q_fr_bands ) ); // q_fr_bands, saturation is added because q_fr_bands is limited to 31
-        if ( Opt_vbr_mode == 0 )
-        {
-            Ltmp2 = L_max( Ltmp, Le_min_scaled ); // q_fr_bands
-        }
-        hp_E[i] = L_max( Ltmp2, 1 ); // to prevent division by zero
-        move32();
-
-        test();
-        IF( GT_16( mean_voi, TH_COR_FX ) && LT_16( pitch[2], TH_PIT_FX ) ) /* High-pitched voiced frames */
-        {
-            freq = bin; // Q4
-            move16();   /* 1st useful frequency bin */
-            m_cnt = 0;
-            move16();
-            sum = 0;
-            move64();
-
-            f1 = add( shr( f0, 1 ), f0 ); /* Middle between 2 harmonics */
-            f2 = f0;
-            move16();
-            WHILE( LE_16( freq, 20320 /* 1270.0f in Q4 */ ) ) /* End frequency of 10th critical band */
-            {
-                FOR( ; freq <= f1; freq += BIN4_FX )
-                {
-                    /* include only bins sufficiently close to harmonics */
-                    tmp = sub( freq, f2 );
-                    IF( L_mac0( -TH_D_FX * TH_D_FX, tmp, tmp ) < 0 )
-                    {
-                        sum = W_mac_32_16( sum, *pt_E, 1 ); // q_lf_E+1
-                        m_cnt = add( m_cnt, 1 );
-                    }
-                    pt_E++;
-                }
-#ifdef BASOP_NOGLOB
-                f1 = add_o( f1, f0, &Overflow );
-                f2 = add_o( f2, f0, &Overflow );
-#else
-                f1 = add( f1, f0 );
-                f2 = add( f2, f0 );
-#endif
-            }
-            /*lp_E = lp_E / (float)cnt - lp_bckr;*/
-            e_tmp = sub( W_norm( sum ), 1 );
-            m_tmp = extract_h( W_extract_h( W_shl( sum, e_tmp ) ) ); // q_lf_E+1+e_tmp-32-16
-            e_tmp = sub( add( q_lf_E, e_tmp ), 47 );
-
-            e_cnt = norm_s( m_cnt );
-            m_cnt = shl( m_cnt, e_cnt ); // e_cnt
-
-            m_tmp = div_s( m_tmp, m_cnt ); // Q15+e_tmp-e_cnt
-            e_tmp = add( Q15, sub( e_tmp, e_cnt ) );
-            sum = W_shl( m_tmp, sub( add( q_bckr, 1 ), e_tmp ) ); // q_bckr+1
-            sum = W_msu_32_16( sum, lp_bckr, 1 );                 // q_bckr+1
-            q_lp_E = W_norm( sum );
-            lp_E = W_extract_h( W_shl( sum, q_lp_E ) ); // q_bckr+1+q_lp_E-32
-            q_lp_E = sub( add( q_lp_E, q_bckr ), Q31 );
-
-            pt_E = tmp_E + VOIC_BINS; /* Update for next half-frame		Q_new - 1 */
-        }
-        ELSE /* Other than high-pitched voiced frames */
-        {
-            /*lp_E = mean( pt_bands, nb_bands ) - lp_bckr;*/ /* averaged E in first critical bands, up to 1270 Hz */
-            sum = 0;
-            move64();
-            FOR( Word16 j = 0; j < nb_bands; j++ )
-            {
-                sum = W_mac_32_16( sum, pt_bands[j], inv_bands ); // q_fr_bands+16
-            }
-            sum = W_mac_32_16( sum, lp_bckr, -ONE_IN_Q15 ); // q_fr_bands+16
-            lp_E = W_round48_L( sum );                      // q_fr_bands=q_bckr
-            q_lp_E = q_bckr;                                // q_fr_bands=q_bckr
-            move16();
-        }
-        test();
-        IF( Opt_vbr_mode == 0 && GT_32( L_shl_sat( Le_min_scaled, sub( q_lp_E, q_bckr ) ), lp_E ) )
-        {
-            lp_E = E_MIN_FXQ31;
-            q_lp_E = Q31;
-            move32();
-            move16();
-        }
-        if ( Opt_vbr_mode != 0 )
-        {
-            lp_E = L_max( lp_E, 0 ); // q_lp_E
-        }
-        /*ee[i] = lp_E / hp_E[i];*/ /* LF/HF ratio */
-
-        if ( lp_E == 0 )
-        {
-            ee[i] = 0;
-            move32();
-        }
-        test();
-        IF( lp_E != 0 )
-        {
-            e_tmp = sub( norm_l( lp_E ), 1 );
-            m_tmp = extract_h( L_shl( lp_E, e_tmp ) ); // e_tmp+q_lp_E-16
-            e_hpE = norm_l( hp_E[i] );
-            m_hpE = extract_h( L_shl( hp_E[i], e_hpE ) ); // e_hpE+q_bckr-16
-            m_tmp = div_s( m_tmp, m_hpE );                // Q15+(e_tmp+q_lp_E)-(e_hpE+q_bckr)
-            e_tmp = sub( add( e_tmp, q_lp_E ), add( e_hpE, q_bckr ) );
-#ifdef BASOP_NOGLOB
-            ee[i] = L_shr_o( m_tmp, add( e_tmp, 15 - 6 ), &Overflow ); /* ee in Q6 */
-#else                                                                  /* BASOP_NOGLOB */
-            ee[i] = L_shr( m_tmp, add( e_tmp, 15 - 6 ) ); /* ee in Q6 */
-#endif
-            move32();
-        }
-
-        IF( bwidth == NB ) /* For NB input, compensate for the missing bands */
-        {
-#ifdef BASOP_NOGLOB
-            Ltmp = L_shl_o( ee[i], 3, &Overflow ); /* Q6 */
-#else
-            Ltmp = L_shl( ee[i], 3 );
-#endif
-            IF( EQ_32( Ltmp, MAX_32 ) ) /* if Overflow: Compute with less precision */
-            {
-                Ltmp = Mult_32_16( ee[i], 24576 /* 0.75 in Q15 */ ); /* 6/8	Q6*/
-#ifdef BASOP_NOGLOB
-                ee[i] = L_shl_sat( Ltmp, 3 ); /* Q6 */
-#else
-                ee[i] = L_shl( Ltmp, 3 );
-#endif
-                move32(); /* x8  */
-            }
-            ELSE
-            {
-                ee[i] = Mult_32_16( Ltmp, 24576 /* 0.75 in Q15 */ );
-                move32(); /* 6/8  */
-            }
-        }
-
-        pt_bands += NB_BANDS; /* Update for next half-frame */
-        hf_bands += NB_BANDS;
-    }
-
-    return;
-}
diff --git a/lib_enc/find_tilt_fx.c b/lib_enc/find_tilt_fx.c
index d63585a398f97002aa6e340320efbb21dbe36b5b..dc78719d2b6cbcf57c535a7f86b0fb0e229e00b9 100644
--- a/lib_enc/find_tilt_fx.c
+++ b/lib_enc/find_tilt_fx.c
@@ -85,27 +85,15 @@ void find_tilt_fx(
     /* bckr + voicing */
     /*lp_bckr = mean( pt_bckr, nb_bands );*/ /* estimated noise E in first critical bands, up to 1270 Hz */
     lp_bckr = Mean32( pt_bckr, nb_bands );
-    /*hp_bckr = 0.5f * (bckr[max_band-1] + bckr[max_band]);*/ /* estimated noise E in last 2 critical bands */
-#ifdef BASOP_NOGLOB
+    /*hp_bckr = 0.5f * (bckr[max_band-1] + bckr[max_band]);*/              /* estimated noise E in last 2 critical bands */
     hp_bckr = L_shr( L_add_sat( bckr[max_band - 1], bckr[max_band] ), 1 ); /* Q_new + QSCALE - 1 */
-#else
-    hp_bckr = L_shr( L_add( bckr[max_band - 1], bckr[max_band] ), 1 );
-#endif
-    if ( hp_bckr == 0 ) /* Avoid division by zero. */
+    if ( hp_bckr == 0 )                                                    /* Avoid division by zero. */
     {
         hp_bckr = L_deposit_l( 1 );
     }
     tmp = BASOP_Util_Divide3232_Scale( lp_bckr, hp_bckr, &e_tmp );
 
-#ifdef FIX_ISSUE_1152
-#ifdef BASOP_NOGLOB
     Ltmp = L_shr_r_sat( L_deposit_h( tmp ), sub( 15, e_tmp ) );
-#else
-    Ltmp = L_shr_r( L_deposit_h( tmp ), sub( 15, e_tmp ) );
-#endif
-#else
-    Ltmp = L_shr_r( L_deposit_h( tmp ), sub( 15, e_tmp ) );
-#endif
 
     *bckr_tilt_lt = L_add( Mpy_32_16_r( *bckr_tilt_lt, 29491 ), Mpy_32_16_r( Ltmp, 3277 ) ); /* Q16 */
 
@@ -114,24 +102,14 @@ void find_tilt_fx(
     {
         /*lp_bckr *= FACT;*/
         /*hp_bckr *= FACT;*/
-#ifdef BASOP_NOGLOB
         lp_bckr = L_add_sat( L_shl_sat( lp_bckr, 1 ), lp_bckr ); /* Q_new + QSCALE */
         hp_bckr = L_add_sat( L_shl_sat( hp_bckr, 1 ), hp_bckr );
-#else
-        lp_bckr = L_add( L_shl( lp_bckr, 1 ), lp_bckr );
-        hp_bckr = L_add( L_shl( hp_bckr, 1 ), hp_bckr );
-#endif
     }
     /*mean_voi = 0.5f * (voicing[1] + voicing[2]) + corr_shift;*/
     Ltmp = L_mult( voicing[1], 16384 /* 0.5 in Q15 */ );      /* Q31 */
     Ltmp = L_mac( Ltmp, voicing[2], 16384 /* 0.5 in Q15 */ ); /* Q31 */
-#ifdef BASOP_NOGLOB
-    Ltmp = L_mac_o( Ltmp, corr_shift, 32767, &Overflow ); /* Q31 */
-    mean_voi = round_fx_o( Ltmp, &Overflow );             /* Q15 */
-#else
-    Ltmp = L_mac( Ltmp, corr_shift, 32767 );
-    mean_voi = round_fx( Ltmp );
-#endif
+    Ltmp = L_mac_o( Ltmp, corr_shift, 32767, &Overflow );     /* Q31 */
+    mean_voi = round_fx_o( Ltmp, &Overflow );                 /* Q15 */
 
     /*f0 = INT_FS_FX / pitch[2];*/
     e_tmp = norm_s( pitch[2] );
@@ -177,22 +155,13 @@ void find_tilt_fx(
                     tmp = sub( freq, f2 );
                     IF( L_mac0( -(Word32) TH_D_FX * TH_D_FX, tmp, tmp ) < 0 )
                     {
-#ifdef BASOP_NOGLOB
                         lp_E = L_add_o( *pt_E, lp_E, &Overflow ); /* Q_new + QSCALE - 2 */
-#else
-                        lp_E = L_add( *pt_E, lp_E );
-#endif
-                        m_cnt = add( m_cnt, 1 ); /* Q0 */
+                        m_cnt = add( m_cnt, 1 );                  /* Q0 */
                     }
                     pt_E++;
                 }
-#ifdef BASOP_NOGLOB
                 f1 = add_o( f1, f0, &Overflow );
                 f2 = add_o( f2, f0, &Overflow );
-#else
-                f1 = add( f1, f0 );
-                f2 = add( f2, f0 );
-#endif
             }
             /*lp_E = lp_E / (float)cnt - lp_bckr;*/
             e_tmp = sub( norm_l( lp_E ), 1 );
@@ -206,11 +175,7 @@ void find_tilt_fx(
             m_tmp = div_s( m_tmp, m_cnt ); /* exp(e_tmp + e_cnt) */
             e_tmp = sub( e_tmp, e_cnt );
 
-#ifdef BASOP_NOGLOB
             lp_E = L_sub_o( L_shr_o( m_tmp, sub( e_tmp, 1 ), &Overflow ), lp_bckr, &Overflow ); /* Q_new + QSCALE */
-#else
-            lp_E = L_sub( L_shr( m_tmp, sub( e_tmp, 1 ) ), lp_bckr );
-#endif
 
             pt_E = tmp_E + VOIC_BINS; /* Update for next half-frame */
         }
@@ -238,11 +203,7 @@ void find_tilt_fx(
             m_tmp = div_s( m_tmp, m_hpE ); /* exp(e_tmp + e_hpE) */
             e_tmp = sub( e_tmp, e_hpE );
 
-#ifdef BASOP_NOGLOB
             ee[i] = L_shr_o( m_tmp, add( e_tmp, 15 - 6 ), &Overflow ); /* ee in Q6 */
-#else                                                                  /* BASOP_NOGLOB */
-            ee[i] = L_shr( m_tmp, add( e_tmp, 15 - 6 ) ); /* ee in Q6 */
-#endif
         }
         ELSE IF( lp_E == 0 )
         {
@@ -255,19 +216,11 @@ void find_tilt_fx(
 
         IF( EQ_16( bwidth, NB ) ) /* For NB input, compensate for the missing bands */
         {
-#ifdef BASOP_NOGLOB
             Ltmp = L_shl_o( ee[i], 3, &Overflow );
-#else
-            Ltmp = L_shl( ee[i], 3 );
-#endif
             IF( EQ_32( Ltmp, MAX_32 ) ) /* if Overflow: Compute with less precision */
             {
                 Ltmp = Mult_32_16( ee[i], 24576 /* 0.75 in Q15 */ ); /* 6/8		Q6*/
-#ifdef BASOP_NOGLOB
                 ee[i] = L_shl_sat( Ltmp, 3 );
-#else
-                ee[i] = L_shl( Ltmp, 3 );
-#endif
                 move32(); /* x8  */
             }
             ELSE
@@ -283,3 +236,255 @@ void find_tilt_fx(
 
     return;
 }
+
+/*-------------------------------------------------------------------*
+ * find_tilt()
+ *
+ * Find LF/HF energy ratio
+ *-------------------------------------------------------------------*/
+void find_tilt_ivas_fx(
+    const Word32 fr_bands[], /* i  : energy in frequency bands						q_fr_bands*/
+    const Word16 q_fr_bands, /* i  : Q of fr_bands						Q0*/
+    const Word32 bckr[],     /* i  : per band background noise energy estimate    q_bckr*/
+    const Word16 q_bckr,     /* i  : Q of bckr    Q0*/
+    Word32 ee[2],            /* o  : lf/hf E ration for present frame							 Q6*/
+    const Word16 pitch[3],   /* i  : open loop pitch values for 3 half-frames					 Q0*/
+    const Word16 voicing[3], /* i  : normalized correlation for 3 half-frames					Q15*/
+    const Word32 *lf_E,      /* i  : per bin energy  for low frequencies         q_lf_E*/
+    const Word16 q_lf_E,     /* i  : Q of lf_E         */
+    const Word16 corr_shift, /* i  : normalized correlation correction							Q15*/
+    const Word16 bwidth,     /* i  : input signal bandwidth                                         */
+    const Word16 max_band,   /* i  : maximum critical band                                          */
+    Word32 hp_E[],           /* o  : energy in HF                                    Q_new*/
+    const Word16 codec_mode, /* i  : MODE1 or MODE2                                      */
+    Word32 *bckr_tilt_lt,    /* i/o: lf/hf E ratio of background noise  Q16                        */
+    Word16 Opt_vbr_mode )
+{
+    Word32 lp_bckr = 0, hp_bckr = 0, lp_E, Ltmp;
+    const Word32 *pt_E, *pt_bands, *pt_bckr, *hf_bands, *tmp_E;
+    Word16 tmp, freq, f0, f1, f2, mean_voi, bin;
+    Word16 i, nb_bands;
+    Word16 e_tmp, m_tmp;
+    Word16 m_Fs, e_Fs;
+    Word16 m_cnt, e_cnt;
+    Word16 m_hpE, e_hpE;
+    Word64 sum;
+    Word16 inv_bands, q_lp_E;
+    Word32 Le_min_scaled, Ltmp2;
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
+#endif
+    move32();
+    move32();
+    /*-----------------------------------------------------------------*
+     * Initializations
+     *-----------------------------------------------------------------*/
+
+    IF( ( bwidth != NB ) )
+    {
+        /* WB processing */
+        bin = BIN4_FX;
+        move16();            /* First useful frequency bin ~ 50 Hz     */
+        pt_bands = fr_bands; /* Q_new */
+        tmp_E = lf_E;        /* Q_new - 2 */
+        pt_bckr = bckr;      /* Q_new */
+        nb_bands = 10;
+        inv_bands = 3277 /* 1/10 in Q15 */;
+        move16();
+        move16();
+    }
+    ELSE
+    {
+        /* NB processing */
+        bin = 3 * BIN4_FX;       /* First useful frequency bin ~ 150 Hz    */
+        pt_bands = fr_bands + 1; /* Exlcude 1st critical band              */
+        tmp_E = lf_E + 2;        /* Start at the 3rd bin (150 Hz)          */
+        pt_bckr = bckr + 1;      /* Exlcude 1st critical band              */
+        nb_bands = 9;
+        inv_bands = 3641; /* 1/9 in Q15 */
+        move16();
+        move16(); /* Nb. of "low" frequency bands taken into account in NB processing      */
+    }
+
+    /*-----------------------------------------------------------------*
+     * Find spectrum tilt
+     *-----------------------------------------------------------------*/
+
+    pt_E = tmp_E; /* Point at the 1st useful element of the per-bin energy vector  */
+    hf_bands = fr_bands;
+
+    /* bckr + voicing */
+    /*lp_bckr = mean( pt_bckr, nb_bands );*/ /* estimated noise E in first critical bands, up to 1270 Hz */
+    sum = 0;
+    move64();
+    FOR( i = 0; i < nb_bands; i++ )
+    {
+        sum = W_mac_32_16( sum, pt_bckr[i], inv_bands ); // q_bckr+16
+    }
+    lp_bckr = W_shl_sat_l( sum, -16 );                                                                                  // q_bckr
+    /*hp_bckr = 0.5f * (bckr[max_band-1] + bckr[max_band]);*/                                                           /* estimated noise E in last 2 critical bands */
+    hp_bckr = W_extract_h( W_mac_32_32( W_mult_32_32( bckr[max_band - 1], ONE_IN_Q30 ), bckr[max_band], ONE_IN_Q30 ) ); // q_bckr
+    if ( hp_bckr == 0 )                                                                                                 /* Avoid division by zero. */
+    {
+        hp_bckr = L_deposit_l( 1 );
+    }
+    Ltmp = BASOP_Util_Divide3232_Scale_newton( lp_bckr, hp_bckr, &e_tmp );
+    Ltmp = Mpy_32_16_r( Ltmp, 3277 /* 0.1f in Q15 */ );
+    Ltmp = L_shr_sat( Ltmp, sub( 15, e_tmp ) );
+    *bckr_tilt_lt = L_add_sat( Mpy_32_16_r( *bckr_tilt_lt, 29491 /* 0.9f in Q15 */ ), Ltmp ); // Q16
+    move32();
+
+    test();
+    IF( EQ_16( codec_mode, MODE2 ) || EQ_16( Opt_vbr_mode, 1 ) )
+    {
+        /*lp_bckr *= FACT;*/
+        /*hp_bckr *= FACT;*/
+        lp_bckr = L_add_sat( L_shl_sat( lp_bckr, 1 ), lp_bckr ); /* Q_new */
+        hp_bckr = L_add_sat( L_shl_sat( hp_bckr, 1 ), hp_bckr ); /* Q_new */
+    }
+    /*mean_voi = 0.5f * (voicing[1] + voicing[2]) + corr_shift;*/
+    Ltmp = L_mult( voicing[1], 16384 /* 0.5 in Q15 */ );                    // Q31
+    Ltmp = L_mac( Ltmp, voicing[2], 16384 /* 0.5 in Q15 */ );               // Q31
+    Ltmp = L_mac_o( Ltmp, corr_shift, 32767 /* 1.0f in Q15 */, &Overflow ); // Q31
+    mean_voi = round_fx_o( Ltmp, &Overflow );                               // Q15
+
+    /*f0 = INT_FS_FX / pitch[2];*/
+    e_tmp = norm_s( pitch[2] );
+    m_tmp = shl( pitch[2], e_tmp );
+
+    m_Fs = div_s( INT_FS_FX, m_tmp ); /* exp(e_tmp) */
+    e_Fs = sub( 15, e_tmp );
+    f0 = shr( m_Fs, sub( e_Fs, 4 ) ); /* Q4 */
+
+    Le_min_scaled = L_shl( E_MIN_FXQ31, sub( q_fr_bands, Q31 ) ); // q_fr_bands=q_bckr
+
+    FOR( i = 0; i < 2; i++ )
+    {
+        /*hp_E[i] = 0.5f * (hf_bands[max_band-1] + hf_bands[max_band]) - hp_bckr; */                                             /* averaged E in last 2 critical bands */
+        Ltmp = W_extract_h( W_mac_32_32( W_mult_32_32( hf_bands[max_band - 1], ONE_IN_Q30 ), hf_bands[max_band], ONE_IN_Q30 ) ); // q_fr_bands
+        Ltmp = L_sub( Ltmp, hp_bckr );                                                                                           // q_fr_bands
+
+        Ltmp2 = L_max( Ltmp, L_shl_sat( 1, q_fr_bands ) ); // q_fr_bands, saturation is added because q_fr_bands is limited to 31
+        if ( Opt_vbr_mode == 0 )
+        {
+            Ltmp2 = L_max( Ltmp, Le_min_scaled ); // q_fr_bands
+        }
+        hp_E[i] = L_max( Ltmp2, 1 ); // to prevent division by zero
+        move32();
+
+        test();
+        IF( GT_16( mean_voi, TH_COR_FX ) && LT_16( pitch[2], TH_PIT_FX ) ) /* High-pitched voiced frames */
+        {
+            freq = bin; // Q4
+            move16();   /* 1st useful frequency bin */
+            m_cnt = 0;
+            move16();
+            sum = 0;
+            move64();
+
+            f1 = add( shr( f0, 1 ), f0 ); /* Middle between 2 harmonics */
+            f2 = f0;
+            move16();
+            WHILE( LE_16( freq, 20320 /* 1270.0f in Q4 */ ) ) /* End frequency of 10th critical band */
+            {
+                FOR( ; freq <= f1; freq += BIN4_FX )
+                {
+                    /* include only bins sufficiently close to harmonics */
+                    tmp = sub( freq, f2 );
+                    IF( L_mac0( -TH_D_FX * TH_D_FX, tmp, tmp ) < 0 )
+                    {
+                        sum = W_mac_32_16( sum, *pt_E, 1 ); // q_lf_E+1
+                        m_cnt = add( m_cnt, 1 );
+                    }
+                    pt_E++;
+                }
+                f1 = add_o( f1, f0, &Overflow );
+                f2 = add_o( f2, f0, &Overflow );
+            }
+            /*lp_E = lp_E / (float)cnt - lp_bckr;*/
+            e_tmp = sub( W_norm( sum ), 1 );
+            m_tmp = extract_h( W_extract_h( W_shl( sum, e_tmp ) ) ); // q_lf_E+1+e_tmp-32-16
+            e_tmp = sub( add( q_lf_E, e_tmp ), 47 );
+
+            e_cnt = norm_s( m_cnt );
+            m_cnt = shl( m_cnt, e_cnt ); // e_cnt
+
+            m_tmp = div_s( m_tmp, m_cnt ); // Q15+e_tmp-e_cnt
+            e_tmp = add( Q15, sub( e_tmp, e_cnt ) );
+            sum = W_shl( m_tmp, sub( add( q_bckr, 1 ), e_tmp ) ); // q_bckr+1
+            sum = W_msu_32_16( sum, lp_bckr, 1 );                 // q_bckr+1
+            q_lp_E = W_norm( sum );
+            lp_E = W_extract_h( W_shl( sum, q_lp_E ) ); // q_bckr+1+q_lp_E-32
+            q_lp_E = sub( add( q_lp_E, q_bckr ), Q31 );
+
+            pt_E = tmp_E + VOIC_BINS; /* Update for next half-frame		Q_new - 1 */
+        }
+        ELSE /* Other than high-pitched voiced frames */
+        {
+            /*lp_E = mean( pt_bands, nb_bands ) - lp_bckr;*/ /* averaged E in first critical bands, up to 1270 Hz */
+            sum = 0;
+            move64();
+            FOR( Word16 j = 0; j < nb_bands; j++ )
+            {
+                sum = W_mac_32_16( sum, pt_bands[j], inv_bands ); // q_fr_bands+16
+            }
+            sum = W_mac_32_16( sum, lp_bckr, -ONE_IN_Q15 ); // q_fr_bands+16
+            lp_E = W_round48_L( sum );                      // q_fr_bands=q_bckr
+            q_lp_E = q_bckr;                                // q_fr_bands=q_bckr
+            move16();
+        }
+        test();
+        IF( Opt_vbr_mode == 0 && GT_32( L_shl_sat( Le_min_scaled, sub( q_lp_E, q_bckr ) ), lp_E ) )
+        {
+            lp_E = E_MIN_FXQ31;
+            q_lp_E = Q31;
+            move32();
+            move16();
+        }
+        if ( Opt_vbr_mode != 0 )
+        {
+            lp_E = L_max( lp_E, 0 ); // q_lp_E
+        }
+        /*ee[i] = lp_E / hp_E[i];*/ /* LF/HF ratio */
+
+        if ( lp_E == 0 )
+        {
+            ee[i] = 0;
+            move32();
+        }
+        test();
+        IF( lp_E != 0 )
+        {
+            e_tmp = sub( norm_l( lp_E ), 1 );
+            m_tmp = extract_h( L_shl( lp_E, e_tmp ) ); // e_tmp+q_lp_E-16
+            e_hpE = norm_l( hp_E[i] );
+            m_hpE = extract_h( L_shl( hp_E[i], e_hpE ) ); // e_hpE+q_bckr-16
+            m_tmp = div_s( m_tmp, m_hpE );                // Q15+(e_tmp+q_lp_E)-(e_hpE+q_bckr)
+            e_tmp = sub( add( e_tmp, q_lp_E ), add( e_hpE, q_bckr ) );
+            ee[i] = L_shr_o( m_tmp, add( e_tmp, 15 - 6 ), &Overflow ); /* ee in Q6 */
+            move32();
+        }
+
+        IF( bwidth == NB ) /* For NB input, compensate for the missing bands */
+        {
+            Ltmp = L_shl_o( ee[i], 3, &Overflow ); /* Q6 */
+            IF( EQ_32( Ltmp, MAX_32 ) )            /* if Overflow: Compute with less precision */
+            {
+                Ltmp = Mult_32_16( ee[i], 24576 /* 0.75 in Q15 */ ); /* 6/8	Q6*/
+                ee[i] = L_shl_sat( Ltmp, 3 );                        /* Q6 */
+                move32();                                            /* x8  */
+            }
+            ELSE
+            {
+                ee[i] = Mult_32_16( Ltmp, 24576 /* 0.75 in Q15 */ );
+                move32(); /* 6/8  */
+            }
+        }
+
+        pt_bands += NB_BANDS; /* Update for next half-frame */
+        hf_bands += NB_BANDS;
+    }
+
+    return;
+}
diff --git a/lib_enc/find_uv.c b/lib_enc/find_uv.c
deleted file mode 100644
index 4196b9cb63f8ff3e0acf25bac42e2d71c9646549..0000000000000000000000000000000000000000
--- a/lib_enc/find_uv.c
+++ /dev/null
@@ -1,720 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-#include "prot_fx.h"     /* Function prototypes                    */
-#include "prot_fx_enc.h" /* Function prototypes                    */
-
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
-
-#define L_ENR ( NB_SSF + 2 )
-
-/*-------------------------------------------------------------------*
- * find_ener_decrease()
- *
- * Find maximum energy ratio between short sub-subframes in case
- * energy is trailing off after a spike
- *-------------------------------------------------------------------*/
-
-/*! r: maximum energy ratio */
-static Word16 find_ener_decrease_fx(                            /* o  : maximum energy ratio								Q10*/
-                                     const Word16 ind_deltaMax, /* i  : index of the beginning of maximum energy search		Q0*/
-                                     const Word32 *pt_enr_ssf   /* i  : Pointer to the energy buffer						Qx*/
-)
-{
-    Word16 i, j, end, flag;
-    Word16 wtmp0, wtmp1;
-    Word32 maxEnr, minEnr;
-    Word16 dE2, exp0, exp1;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-    dE2 = 0;
-    move16();
-
-    j = add( ind_deltaMax, 2 ); /* Q0 */
-    move16();
-    end = add( j, L_ENR );
-    move16();
-    maxEnr = L_add( pt_enr_ssf[j], 0 );
-    j = add( j, 1 );
-    flag = 0;
-    move16();
-    FOR( i = j; i < end; i++ )
-    {
-        test();
-        IF( ( GT_32( pt_enr_ssf[i], maxEnr ) ) && ( flag == 0 ) )
-        {
-            maxEnr = pt_enr_ssf[i]; /* Qx */
-            j = add( j, 1 );
-        }
-        ELSE
-        {
-            flag = 1;
-            move16();
-        }
-    }
-
-    minEnr = L_add( maxEnr, 0 );
-    FOR( i = j; i < end; i++ )
-    {
-        minEnr = L_min( minEnr, pt_enr_ssf[i] ); /* Qx */
-    }
-
-
-#ifdef BASOP_NOGLOB
-    minEnr = L_add_sat( minEnr, 100000 );
-#else
-    minEnr = L_add( minEnr, 100000 );
-#endif
-    exp0 = norm_l( minEnr );
-    wtmp0 = extract_h( L_shl( minEnr, exp0 ) );
-    exp1 = sub( norm_l( maxEnr ), 1 );
-    wtmp1 = extract_h( L_shl( maxEnr, exp1 ) );
-    wtmp1 = div_s( wtmp1, wtmp0 );
-#ifdef BASOP_NOGLOB
-    dE2 = shr_ro( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ), &Overflow ); /*Q10*/
-#else
-    dE2 = shr_r( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ) );                     /*Q10*/
-#endif
-
-    return dE2;
-}
-
-/*-------------------------------------------------------------------*
- * find_uv()
- *
- * Decision about coder type
- *-------------------------------------------------------------------*/
-Word16 find_uv_ivas_fx(                                       /* o  : coding type                                                   */
-                        Encoder_State *st_fx,                 /* i/o: encoder state structure                                       */
-                        const Word16 *T_op_fr,                /* i  : pointer to adjusted fractional pitch (4 val.)					Q6*/
-                        const Word16 *voicing_fr,             /* i  : refined correlation for each subframes						Q15*/
-                        const Word16 *speech,                 /* i  : pointer to speech signal for E computation					Q_new*/
-                        const Word32 *ee,                     /* i  : lf/hf Energy ratio for present frame							Q6*/
-                        Word32 *dE1X,                         /* o  : sudden energy increase for S/M classifier                     Q13*/
-                        const Word16 corr_shift,              /* i  : normalized correlation correction in noise					Q15*/
-                        const Word16 relE,                    /* i  : relative frame energy											Q8*/
-                        const Word16 Etot,                    /* i  : total energy													Q8*/
-                        const Word32 hp_E[],                  /* i  : energy in HF													q_hp_E*/
-                        Word16 *flag_spitch,                  /* i/o: flag to indicate very short stable pitch and high correlation Q0*/
-                        const Word16 last_core_orig,          /* i  : original last core                                            Q0*/
-                        STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                   */
-                        const Word16 Q_new,
-                        const Word16 q_hp_E )
-{
-    Word16 coder_type, i;
-    Word32 mean_ee, dE1, fac_32;
-    const Word16 *pt_speech;
-    Word32 L_tmp, enr_ssf[2 * NB_SSF + 2 * NB_SSF + 2], E_min_th;
-    Word16 dE2;
-    Word16 ind_deltaMax, tmp_offset_flag;
-    Word32 Ltmp0, *pt_enr_ssf, *pt_enr_ssf1, dE2_th;
-    Word16 exp0, exp1;
-    Word16 wtmp0, wtmp1;
-    Word16 fac, mean_voi3, dE3;
-    Word16 relE_thres;
-    Word16 mean_voi3_offset;
-    Word16 voicing_m, dpit1, dpit2, dpit3;
-    Word16 ee0_th, ee1_th, voi_th, nb_cond, flag_low_relE;
-    NOISE_EST_HANDLE hNoiseEst = st_fx->hNoiseEst;
-    SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-    Word16 Last_Resort;
-    Word16 vadnoise;
-
-    IF( hSC_VBR != NULL )
-    {
-        Last_Resort = hSC_VBR->Last_Resort; /* Q0 */
-        move16();
-        vadnoise = hSC_VBR->vadnoise_fx; /* Q8 */
-        move16();
-    }
-    ELSE
-    {
-        Last_Resort = 0;
-        move16();
-        vadnoise = 0;
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Detect sudden energy increases to catch voice and music
-     * temporal events (dE1)
-     *
-     * - Find maximum energy per short subblocks.
-     *   Two subblock sets are used shifted by half the subblock length
-     * - Find maximum energy ratio between adjacent subblocks
-     *-----------------------------------------------------------------*/
-
-    /* Find maximum energy per short subblocks  */
-    pt_speech = speech - SSF;
-    pt_enr_ssf = enr_ssf + 2 * NB_SSF;
-    FOR( i = 0; i < 2 * ( NB_SSF + 1 ); i++ )
-    {
-        emaximum_fx( Q_new, pt_speech, SSF, pt_enr_ssf );
-        pt_speech += ( SSF / 2 );
-        pt_enr_ssf++;
-    }
-
-    dE1 = 0;
-    move16();
-    ind_deltaMax = 0;
-    move16();
-    pt_enr_ssf = enr_ssf + 2 * NB_SSF;
-    pt_enr_ssf1 = pt_enr_ssf + 2;
-
-    /* Test on energy increase between adjacent sub-subframes */
-    exp1 = 0;
-    move16();
-    FOR( i = 0; i < 2 * NB_SSF; i++ )
-    {
-        /*fac = *pt_enr_ssf1 / (*pt_enr_ssf + 1);*/
-        Ltmp0 = L_max( *pt_enr_ssf, 1 );
-        exp0 = norm_l( Ltmp0 );
-        wtmp0 = extract_h( L_shl( Ltmp0, exp0 ) );
-        exp1 = sub( norm_l( *pt_enr_ssf1 ), 1 );
-        wtmp1 = extract_h( L_shl( *pt_enr_ssf1, exp1 ) );
-        fac = div_s( wtmp1, wtmp0 );
-#ifdef BASOP_NOGLOB
-        fac_32 = L_shr_o( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ), &Overflow ); /* fac32 in Q13*/
-#else                                                                                         /* BASOP_NOGLOB */
-        fac_32 = L_shr( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ) ); /* fac32 in Q13*/
-#endif                                                                                        /* BASOP_NOGLOB */
-
-        if ( GT_32( fac_32, dE1 ) )
-        {
-            ind_deltaMax = i;
-            move16();
-        }
-
-        dE1 = L_max( dE1, fac_32 ); /* Q13 */
-
-        pt_enr_ssf++;
-        pt_enr_ssf1++;
-    }
-
-    IF( hStereoClassif != NULL )
-    {
-        IF( st_fx->idchan == 0 )
-        {
-            hStereoClassif->dE1_ch1_fx = dE1; /* Q13 */
-            move32();
-            hStereoClassif->dE1_ch1_e = 31 - Q13;
-            move16();
-        }
-        ELSE
-        {
-            hStereoClassif->dE1_ch2_fx = dE1; /* Q13 */
-            move32();
-            hStereoClassif->dE1_ch2_e = 31 - Q13;
-            move16();
-        }
-    }
-
-    if ( dE1X != NULL )
-    {
-        *dE1X = dE1; /* Q13 */
-        move32();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Average spectral tilt
-     * Average voicing (normalized correlation)
-     *-----------------------------------------------------------------*/
-
-    /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */ /* coefficients take into account the position of the window */
-#ifdef BASOP_NOGLOB
-    mean_ee = L_add_o( L_add_o( st_fx->ee_old_fx, ee[0], &Overflow ), ee[1], &Overflow ); /* Q6 */
-#else                                                                                     /* BASOP_NOGLOB */
-    mean_ee = L_add( L_add( st_fx->ee_old_fx, ee[0] ), ee[1] );
-#endif                                                                                    /* BASOP_NOGLOB */
-    mean_ee = Mult_32_16( mean_ee, 10923 );                                               /*Q6*/
-
-    /* mean_voi3 = 1.0f/3.0f * (voicing[0] + voicing[1] + voicing[2]);*/
-    Ltmp0 = L_mult( st_fx->voicing_fx[0], 10923 /* 1/3 in Q15 */ );               /* Q31 */
-    Ltmp0 = L_mac( Ltmp0, st_fx->voicing_fx[1], 10923 /* 1/3 in Q15 */ );         /* Q31 */
-#ifdef BASOP_NOGLOB                                                               // -dtx 12650 amrwb\Dtx3.INP
-    mean_voi3 = mac_r_sat( Ltmp0, st_fx->voicing_fx[2], 10923 /* 1/3 in Q15 */ ); /*Q15*/
-#else
-    mean_voi3 = mac_r( Ltmp0, st_fx->voicing_fx[2], 10923 );                                /*Q15*/
-#endif
-    /*-----------------------------------------------------------------*
-     * Total frame energy difference (dE3)
-     *-----------------------------------------------------------------*/
-
-    dE3 = sub( Etot, hNoiseEst->Etot_last_fx ); /*Q8*/
-
-    /*-----------------------------------------------------------------*
-     * Energy decrease after spike (dE2)
-     *-----------------------------------------------------------------*/
-
-    /* set different thresholds and conditions for NB and WB input */
-    dE2_th = 30 << 10;
-    move32();
-    nb_cond = 1;
-    move16(); /* no additional condition for WB input */
-    IF( st_fx->input_bwidth == NB )
-    {
-        dE2_th = 21 << 10;
-        move32();
-#ifdef BASOP_NOGLOB
-        if ( GE_16( add_o( mean_voi3, corr_shift, &Overflow ), 22282 ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#else
-        if ( GE_16( add( mean_voi3, corr_shift ), 22282 ) )                                 /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#endif
-        {
-            nb_cond = 0;
-            move16();
-        }
-    }
-
-    /* calcualte maximum energy decrease */
-    dE2 = 0;
-    move16(); /* Test on energy decrease after an energy spike  */
-    pt_enr_ssf = enr_ssf + 2 * NB_SSF;
-
-    test();
-    IF( GT_32( dE1, 30 << 13 ) && nb_cond ) /*>30 Q13*/
-    {
-        IF( LT_16( sub( shl( NB_SSF, 1 ), ind_deltaMax ), L_ENR ) )
-        {
-            st_fx->old_ind_deltaMax = ind_deltaMax; /* Q0 */
-            move16();
-            Copy32( pt_enr_ssf, st_fx->old_enr_ssf_fx, 2 * NB_SSF ); /* Qx */
-        }
-        ELSE
-        {
-            st_fx->old_ind_deltaMax = -1;
-            move16();
-            dE2 = find_ener_decrease_fx( ind_deltaMax, pt_enr_ssf ); /*Q10*/
-
-            if ( GT_32( dE2, dE2_th ) )
-            {
-                st_fx->spike_hyst = 0;
-                move16();
-            }
-        }
-    }
-    ELSE
-    {
-        IF( st_fx->old_ind_deltaMax >= 0 )
-        {
-            Copy32( st_fx->old_enr_ssf_fx, enr_ssf, 2 * NB_SSF );            /* Qx */
-            dE2 = find_ener_decrease_fx( st_fx->old_ind_deltaMax, enr_ssf ); /* Q10 */
-
-            if ( GT_32( dE2, dE2_th ) )
-            {
-                st_fx->spike_hyst = 1;
-                move16();
-            }
-        }
-
-        st_fx->old_ind_deltaMax = -1;
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Detection of voiced offsets (tmp_offset_flag)
-     *-----------------------------------------------------------------*/
-
-    tmp_offset_flag = 1;
-    move16();
-
-    IF( st_fx->input_bwidth != NB )
-    {
-        ee0_th = 154; /*2.4 in Q6 */
-        move16();
-        voi_th = 24248; /*0.74f Q15 */
-        move16();
-    }
-    ELSE
-    {
-        ee0_th = 627; /*9.8f Q6 */
-        move16();
-        voi_th = 24904; /*0.76f Q15*/
-        move16();
-    }
-
-    E_min_th = L_shl( E_MIN_IVAS_FX, sub( q_hp_E, Q19 ) );
-
-    test();
-    test();
-    test();
-#ifdef BASOP_NOGLOB
-    IF( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) ||                            /* previous frame was unvoiced  */
-        ( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&               /* energy is concentrated in high frequencies provided that some energy is present in HF */
-          ( LT_16( add_o( st_fx->voicing_fx[0], corr_shift, &Overflow ), voi_th ) ) ) ) /* normalized correlation is low */
-#else                                                                                   /* BASOP_NOGLOB */
-    if ( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) ||                               /* previous frame was unvoiced  */
-         ( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                  /* energy is concentrated in high frequencies provided that some energy is present in HF */
-           ( LT_16( add( st_fx->voicing_fx[0], corr_shift ), voi_th ) ) ) )                 /* normalized correlation is low */
-#endif                                                                                  /* BASOP_NOGLOB */
-    {
-        tmp_offset_flag = 0;
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Decision about UC
-     *-----------------------------------------------------------------*/
-
-    /* SC-VBR - set additional parameters and thresholds for SC-VBR */
-    mean_voi3_offset = 0;
-    move16();
-    flag_low_relE = 0;
-    move16();
-    ee1_th = 608; /*9.5 Q6*/
-    move16();
-    test();
-    test();
-    IF( st_fx->Opt_SC_VBR || ( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) ) ) /* Allow the low energy flag for the secondary channel */
-    {
-        ee1_th = 544; /*8.5f Q6*/
-        move16();
-
-        /* SC-VBR - determine the threshold on relative energy as a function of lp_noise */
-        IF( st_fx->input_bwidth != NB )
-        {
-            /*relE_thres = 0.700f * st->lp_noise - 33.5f; (lp_noise in Q8, constant Q8<<16) */
-            L_tmp = L_mac( -562036736 /* 33.5f in Q24 */, 22938 /* 0.7 in Q15 */, st_fx->lp_noise_fx ); // Q24
-            IF( Last_Resort == 0 )
-            {
-                /*relE_thres = 0.650f * st->lp_noise - 33.5f; (lp_noise in Q8, constant Q8<<16)*/
-                L_tmp = L_mac( -562036736 /* 33.5f in Q24 */, 21299 /* 0.650f in Q15 */, st_fx->lp_noise_fx ); // Q24
-            }
-            relE_thres = round_fx( L_tmp );
-        }
-        ELSE
-        {
-
-            /*relE_thres = 0.60f * st->lp_noise - 28.2f; (lp_noise in Q8, constant Q8<<16)*/
-            L_tmp = L_mac( -473117491 /* 28.2f in Q24 */, 19661 /* 0.6f in Q15 */, st_fx->lp_noise_fx ); // Q24
-            relE_thres = round_fx( L_tmp );
-        }
-        relE_thres = s_max( relE_thres, -6400 /* -25.0f in Q8 */ ); /* Q8 */
-
-        /* SC-VBR = set flag on low relative energy */
-        if ( LT_16( relE, relE_thres ) )
-        {
-            flag_low_relE = 1;
-            move16();
-        }
-
-        /* SC-VBR - correction of voicing threshold for NB inputs (important only in noisy conditions) */
-        test();
-        if ( st_fx->input_bwidth == NB && LT_16( vadnoise, 20 << 8 ) ) /* vadnoise in Q8, constant Q0<<8 */
-        {
-            mean_voi3_offset = 1638; /*0.05f Q15*/
-            move16();
-        }
-    }
-
-    /* make decision whether frame is unvoiced */
-    coder_type = GENERIC;
-    move16();
-    IF( st_fx->input_bwidth == NB )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-#ifdef BASOP_NOGLOB
-        IF( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low  */
-              ( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 /* 0.79 in Q15 */ ) ) &&               /* normalized correlation low on look-ahead - onset detection */
-              ( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                              /* energy concentrated in high frequencies provided that some energy is present in HF...  */
-              ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&                                             /* ... biased towards look-ahead to detect onsets  */
-              ( tmp_offset_flag == 0 ) &&                                                                                 /* Take care of voiced offsets */
-              /*( st_fx->music_hysteresis_fx == 0 ) &&*/                                                                  /*  ... and in segment after AUDIO frames   */
-              ( LE_32( dE1, 237568 /* 29.0f in Q13 */ ) ) &&                                                              /* Avoid on sharp energy spikes  */
-              ( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) &&                                                /*   + one frame hysteresis   */
-              ( st_fx->spike_hyst < 0 ) ) ||                                                                              /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
-            flag_low_relE )                                                                                               /* low relative frame energy (only for SC-VBR) */
-#else
-        if ( ( ( LT_16( add( mean_voi3, corr_shift ), add( 22282, mean_voi3_offset ) ) ) && /* normalized correlation low  */
-               ( LT_16( add( st_fx->voicing_fx[2], corr_shift ), 25887 ) ) &&               /* normalized correlation low on look-ahead - onset detection */
-               ( LT_32( ee[0], 640 ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
-               ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&              /* ... biased towards look-ahead to detect onsets  */
-               ( tmp_offset_flag == 0 ) &&                                                  /* Take care of voiced offsets */
-               /*( st_fx->music_hysteresis_fx == 0 ) &&*/                                   /*  ... and in segment after AUDIO frames   */
-               ( LE_32( dE1, 237568 ) ) &&                                                  /* Avoid on sharp energy spikes  */
-               ( LE_32( st_fx->old_dE1_fx, 237568 ) ) &&                                    /*   + one frame hysteresis   */
-               ( st_fx->spike_hyst < 0 ) ) ||                                               /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
-             flag_low_relE )                                                                /* low relative frame energy (only for SC-VBR) */
-#endif
-        {
-            coder_type = UNVOICED;
-            move16();
-        }
-    }
-    ELSE
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-#ifdef BASOP_NOGLOB
-        if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low  */
-               /*( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 ) ) && */                              /* normalized correlation low on look-ahead - onset detection */
-               ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
-               ( LT_32( ee[1], 397 /* 6.2f in Q16 */ ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&                                /* ... biased towards look-ahead to detect onsets  */
-               ( tmp_offset_flag == 0 ) &&                                                                                   /* Take care of voiced offsets */
-               /*( st_fx->music_hysteresis_fx == 0 ) &&  */                                                                  /*  ... and in segment after AUDIO frames   */
-               ( LE_32( dE1, 245760 /* 30.0f in Q13 */ ) ) &&                                                                /* Avoid on sharp energy spikes  */
-               ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) &&                                                  /*   + one frame hysteresis   */
-               ( st_fx->spike_hyst < 0 ) )                                                                                   /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
-             || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) )                             /* low relative frame energy (only for SC-VBR) */
-#else
-        if ( ( ( LT_16( add( mean_voi3, corr_shift ), add( 22774, mean_voi3_offset ) ) ) && /* normalized correlation low  */
-               /* ( LT_16( add( st_fx->voicing_fx[2], corr_shift ), 25887 ) ) && */         /* normalized correlation low on look-ahead - onset detection */
-               ( LT_32( ee[0], 397 ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
-               ( LT_32( ee[1], 397 ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&                 /* ... biased towards look-ahead to detect onsets  */
-               ( tmp_offset_flag == 0 ) &&                                                  /* Take care of voiced offsets */
-               /*( st_fx->music_hysteresis_fx == 0 ) &&  */                                 /*  ... and in segment after AUDIO frames   */
-               ( LE_32( dE1, 245760 ) ) &&                                                  /* Avoid on sharp energy spikes  */
-               ( LE_32( st_fx->old_dE1_fx, 245760 ) ) &&                                    /*   + one frame hysteresis   */
-               ( st_fx->spike_hyst < 0 ) )                                                  /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
-             || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 ) ) ) )               /* low relative frame energy (only for SC-VBR) */
-#endif
-        {
-            coder_type = UNVOICED;
-            move16();
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Decision about VC
-     *-----------------------------------------------------------------*/
-    if ( st_fx->Opt_SC_VBR )
-    {
-        hSC_VBR->set_ppp_generic = 0;
-    }
-    move16();
-
-    test();
-    test();
-    IF( EQ_16( st_fx->localVAD, 1 ) && EQ_16( coder_type, GENERIC ) && NE_16( last_core_orig, AMR_WB_CORE ) )
-    {
-        dpit1 = abs_s( sub( T_op_fr[1], T_op_fr[0] ) ); /* Q6 */
-        dpit2 = abs_s( sub( T_op_fr[2], T_op_fr[1] ) ); /* Q6 */
-        dpit3 = abs_s( sub( T_op_fr[3], T_op_fr[2] ) ); /* Q6 */
-
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( ( GT_16( voicing_fr[0], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 1st sf.  */
-            ( GT_16( voicing_fr[1], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
-            ( GT_16( voicing_fr[2], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 3st sf.  */
-            ( GT_16( voicing_fr[3], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 4st sf.  */
-            ( GT_32( mean_ee, 256 /* 4.0f in Q6 */ ) ) &&           /* energy concentrated in low frequencies  */
-            ( LT_16( dpit1, 3 << 6 ) ) &&
-            ( LT_16( dpit2, 3 << 6 ) ) &&
-            ( LT_16( dpit3, 3 << 6 ) ) )
-        {
-            coder_type = VOICED;
-            move16();
-        }
-        ELSE IF( st_fx->Opt_SC_VBR && st_fx->input_bwidth == NB && LT_16( vadnoise, 20 << 8 ) )
-        {
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            test();
-            IF( GT_16( voicing_fr[0], 8192 /* 0.25 in Q15 */ ) &&     /* normalized correlation high in 1st sf.  */
-                ( GT_16( voicing_fr[1], 8192 /* 0.25 in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
-                ( GT_16( voicing_fr[2], 8192 /* 0.25 in Q15 */ ) ) && /* normalized correlation high in 3st sf.  */
-                ( GT_16( voicing_fr[3], 8192 /* 0.25 in Q15 */ ) ) && /* normalized correlation high in 4st sf.  */
-                ( GT_32( mean_ee, 64 /* 1.0f in Q6 */ ) ) &&          /* energy concentrated in low frequencies  */
-                ( LT_16( dpit1, 5 << 6 ) ) &&
-                ( LT_16( dpit2, 5 << 6 ) ) &&
-                ( LT_16( dpit3, 5 << 6 ) ) )
-            {
-                hSC_VBR->set_ppp_generic = 1;
-                move16();
-                coder_type = VOICED;
-                move16();
-            }
-        }
-
-        /* set VOICED mode for frames with very stable pitch and high correlation
-           and avoid to switch to AUDIO/MUSIC later                              */
-        voicing_m = mac_r( L_mac( L_mac( L_mult( voicing_fr[3], 8192 /* 0.25 in Q15 */ ), voicing_fr[2], 8192 /* 0.25 in Q15 */ ), voicing_fr[1], 8192 /* 0.25 in Q15 */ ), voicing_fr[0], 8192 /* 0.25 in Q15 */ ); /* Q15 */
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( *flag_spitch || ( LE_16( dpit1, 3 << 6 ) && LE_16( dpit2, 3 << 6 ) && LE_16( dpit3, 3 << 6 ) &&
-                              GT_16( voicing_m, 31130 /* 0.95f in Q15 */ ) && GT_16( st_fx->voicing_sm_fx, 31785 /* 0.97f in Q15 */ ) ) )
-        {
-            coder_type = VOICED;
-            move16();
-            *flag_spitch = 1;
-            move16(); /*to avoid switch to AUDIO/MUSIC later*/
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Channel-aware mode - set RF mode and total bitrate
-     *-----------------------------------------------------------------*/
-
-    st_fx->rf_mode = st_fx->Opt_RF_ON; /* Q0 */
-    move16();
-
-    IF( EQ_16( coder_type, GENERIC ) )
-    {
-        test();
-        test();
-        test();
-        test();
-        IF( ( LT_16( voicing_fr[0], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
-            ( LT_16( voicing_fr[1], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
-            ( LT_16( voicing_fr[2], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 3rd sf.  */
-            ( LT_16( voicing_fr[3], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 4th sf.  */
-            ( GT_16( vadnoise, 25 << 8 ) ) )                      /* when speech is clean */
-
-        {
-            st_fx->rf_mode = 0;
-            move16();
-            /* Current frame cannot be compressed to pack the partial redundancy;*/
-
-            IF( NE_16( st_fx->rf_mode, st_fx->Opt_RF_ON ) )
-            {
-                core_coder_mode_switch_ivas_fx( st_fx, st_fx->last_total_brate, 0 );
-            }
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * UNCLR classifier
-     *-----------------------------------------------------------------*/
-
-    IF( hStereoClassif != NULL )
-    {
-        test();
-        test();
-        test();
-        test();
-        test();
-        IF( st_fx->element_mode > EVS_MONO && ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, UNVOICED ) || coder_type == INACTIVE || st_fx->localVAD == 0 ) && LT_16( hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan], MAX_UV_CNT ) )
-        {
-            hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan] = add( hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan], 1 );
-            move16();
-        }
-        ELSE
-        {
-            hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan] = 0;
-            move16();
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Updates
-     *-----------------------------------------------------------------*/
-
-    /* update spike hysteresis parameters */
-    test();
-    if ( st_fx->spike_hyst >= 0 && LT_16( st_fx->spike_hyst, 2 ) )
-    {
-        st_fx->spike_hyst = add( st_fx->spike_hyst, 1 ); /* Q0 */
-        move16();
-    }
-
-    /* reset spike hysteresis */
-    test();
-    test();
-    test();
-    if ( ( GT_16( st_fx->spike_hyst, 1 ) ) &&
-         ( GT_16( dE3, 5 << 8 ) || /* energy increases               */
-#ifdef BASOP_NOGLOB
-           ( GT_16( relE, -3328 /* 13 in Q8 */ ) && ( GT_16( add_sat( mean_voi3, corr_shift ), 22774 /* 0.695 in Q15 */ ) ) ) ) ) /* normalized correlation is high */
-#else
-           ( GT_16( relE, -3328 ) && ( GT_16( add( mean_voi3, corr_shift ), 22774 ) ) ) ) ) /* normalized correlation is high */
-#endif
-    {
-        st_fx->spike_hyst = -1;
-        move16();
-    }
-
-    /* update tilt parameters */
-    st_fx->ee_old_fx = ee[1];
-    move32(); /*Q6*/
-    st_fx->old_dE1_fx = dE1;
-    move32(); /*Q13*/
-
-    /* save the raw coder_type for various modules later in the codec (the reason is that e.g. UNVOICED is lost at higher rates) */
-    st_fx->coder_type_raw = coder_type; /* Q0 */
-    move16();
-
-    return coder_type;
-}
-/*-------------------------------------------------------------------*
- * find_uv()
- *
- * Decision about coder type
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/find_uv_fx.c b/lib_enc/find_uv_fx.c
index 5cd9db2797f8e7b8da3f9a2f3326c8056ac8967e..c4fe2e895db461d4cfc4a15ff6aaad577c146168 100644
--- a/lib_enc/find_uv_fx.c
+++ b/lib_enc/find_uv_fx.c
@@ -70,21 +70,13 @@ static Word16 find_ener_decrease_fx(                            /* o  : maximum
     }
 
 
-#ifdef BASOP_NOGLOB
     minEnr = L_add_sat( minEnr, 100000 );
-#else
-    minEnr = L_add( minEnr, 100000 );
-#endif
     exp0 = norm_l( minEnr );
     wtmp0 = extract_h( L_shl( minEnr, exp0 ) );
     exp1 = sub( norm_l( maxEnr ), 1 );
     wtmp1 = extract_h( L_shl( maxEnr, exp1 ) );
     wtmp1 = div_s( wtmp1, wtmp0 );
-#ifdef BASOP_NOGLOB
     dE2 = shr_ro( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ), &Overflow ); /*Q10*/
-#else
-    dE2 = shr_r( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ) );                     /*Q10*/
-#endif
 
     return dE2;
 }
@@ -101,21 +93,14 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
                    const Word16 *voicing_fr, /* i  : refined correlation for each subframes							Q15*/
                    const Word16 *speech,     /* i  : pointer to speech signal for E computation						Q_new*/
                    const Word32 *ee,         /* i  : lf/hf Energy ratio for present frame							Q6*/
-#ifdef IVAS_CODE
-                   Word32 *dE1X, /* o  : sudden energy increase for S/M classifier     */
-#endif
-                   const Word16 corr_shift, /* i  : normalized correlation correction in noise						Q15*/
-                   const Word16 relE,       /* i  : relative frame energy											Q8*/
-                   const Word16 Etot,       /* i  : total energy													Q8*/
-                   const Word32 hp_E[],     /* i  : energy in HF													Q_new + Q_SCALE*/
+                   const Word16 corr_shift,  /* i  : normalized correlation correction in noise						Q15*/
+                   const Word16 relE,        /* i  : relative frame energy											Q8*/
+                   const Word16 Etot,        /* i  : total energy													Q8*/
+                   const Word32 hp_E[],      /* i  : energy in HF													Q_new + Q_SCALE*/
                    const Word16 Q_new,
                    Word16 *flag_spitch, /* i/o: flag to indicate very short stable pitch and high correlation		Q0*/
                    const Word16 shift,
                    const Word16 last_core_orig /* i  : original last core											Q0*/
-#ifdef IVAS_CODE
-                   ,
-                   STEREO_CLASSIF_HANDLE hStereoClassif /* i/o: stereo classifier structure                   */
-#endif
 )
 {
     Word16 coder_type, i;
@@ -197,11 +182,7 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
         exp1 = sub( norm_l( *pt_enr_ssf1 ), 1 );
         wtmp1 = extract_h( L_shl( *pt_enr_ssf1, exp1 ) );
         fac = div_s( wtmp1, wtmp0 );
-#ifdef BASOP_NOGLOB
         fac_32 = L_shr_o( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ), &Overflow ); /* fac32 in Q13*/
-#else                                                                                         /* BASOP_NOGLOB */
-        fac_32 = L_shr( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ) ); /* fac32 in Q13*/
-#endif                                                                                        /* BASOP_NOGLOB */
 
         if ( GT_32( fac_32, dE1 ) )
         {
@@ -214,46 +195,20 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
         pt_enr_ssf++;
         pt_enr_ssf1++;
     }
-#ifdef IVAS_CODE
-    IF( hStereoClassif != NULL )
-    {
-        IF( st_fx->idchan == 0 )
-        {
-            hStereoClassif->dE1_ch1 = dE1;
-        }
-        ELSE
-        {
-            hStereoClassif->dE1_ch2 = dE1;
-        }
-    }
 
-    if ( dE1X != NULL )
-    {
-        *dE1X = dE1;
-        move32();
-    }
-#endif
     /*-----------------------------------------------------------------*
      * Average spectral tilt
      * Average voicing (normalized correlation)
      *-----------------------------------------------------------------*/
 
-    /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */ /* coefficients take into account the position of the window */
-#ifdef BASOP_NOGLOB
+    /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */                              /* coefficients take into account the position of the window */
     mean_ee = L_add_o( L_add_o( st_fx->ee_old_fx, ee[0], &Overflow ), ee[1], &Overflow ); /* Q6 */
-#else                                                                                     /* BASOP_NOGLOB */
-    mean_ee = L_add( L_add( st_fx->ee_old_fx, ee[0] ), ee[1] );
-#endif                                                                                    /* BASOP_NOGLOB */
     mean_ee = Mult_32_16( mean_ee, 10923 /* 1/3 in Q15 */ );                              /*Q6*/
 
     /* mean_voi3 = 1.0f/3.0f * (voicing[0] + voicing[1] + voicing[2]);*/
     Ltmp0 = L_mult( st_fx->voicing_fx[0], 10923 /* 1/3 in Q15 */ );               /* Q31 */
     Ltmp0 = L_mac( Ltmp0, st_fx->voicing_fx[1], 10923 /* 1/3 in Q15 */ );         /* Q31 */
-#ifdef BASOP_NOGLOB                                                               // -dtx 12650 amrwb\Dtx3.INP
     mean_voi3 = mac_r_sat( Ltmp0, st_fx->voicing_fx[2], 10923 /* 1/3 in Q15 */ ); /*Q15*/
-#else
-    mean_voi3 = mac_r( Ltmp0, st_fx->voicing_fx[2], 10923 );                                /*Q15*/
-#endif
     /*-----------------------------------------------------------------*
      * Total frame energy difference (dE3)
      *-----------------------------------------------------------------*/
@@ -273,11 +228,7 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
     {
         dE2_th = 21 << 10;
         move32();
-#ifdef BASOP_NOGLOB
         if ( GE_16( add_o( mean_voi3, corr_shift, &Overflow ), 22282 /* 0.68 in Q15 */ ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#else
-        if ( GE_16( add( mean_voi3, corr_shift ), 22282 ) )                                 /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#endif
         {
             nb_cond = 0;
             move16();
@@ -354,15 +305,9 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
     test();
     test();
     test();
-#ifdef BASOP_NOGLOB
     if ( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) ||                              /* previous frame was unvoiced  */
          ( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], L_shl( E_MIN_FX, Q_new ) ) ) && /* energy is concentrated in high frequencies provided that some energy is present in HF */
            ( LT_16( add_o( st_fx->voicing_fx[0], corr_shift, &Overflow ), voi_th ) ) ) )   /* normalized correlation is low */
-#else                                                                                      /* BASOP_NOGLOB */
-    if ( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) ||                               /* previous frame was unvoiced  */
-         ( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], L_shl( E_MIN_FX, Q_new ) ) ) &&  /* energy is concentrated in high frequencies provided that some energy is present in HF */
-           ( LT_16( add( st_fx->voicing_fx[0], corr_shift ), voi_th ) ) ) )                 /* normalized correlation is low */
-#endif                                                                                     /* BASOP_NOGLOB */
     {
         tmp_offset_flag = 0;
         move16();
@@ -438,7 +383,6 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
         test();
         test();
         test();
-#ifdef BASOP_NOGLOB
         if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low  */
                ( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 /* 0.79 in Q15 */ ) ) &&               /* normalized correlation low on look-ahead - onset detection */
                ( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                              /* energy concentrated in high frequencies provided that some energy is present in HF...  */
@@ -449,18 +393,6 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
                ( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) &&                                                /*   + one frame hysteresis   */
                ( st_fx->spike_hyst < 0 ) ) ||                                                                              /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
              flag_low_relE )                                                                                               /* low relative frame energy (only for SC-VBR) */
-#else
-        if ( ( ( LT_16( add( mean_voi3, corr_shift ), add( 22282, mean_voi3_offset ) ) ) && /* normalized correlation low  */
-               ( LT_16( add( st_fx->voicing_fx[2], corr_shift ), 25887 ) ) &&               /* normalized correlation low on look-ahead - onset detection */
-               ( LT_32( ee[0], 640 ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
-               ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&              /* ... biased towards look-ahead to detect onsets  */
-               ( tmp_offset_flag == 0 ) &&                                                  /* Take care of voiced offsets */
-               /*( st_fx->music_hysteresis_fx == 0 ) &&*/                                   /*  ... and in segment after AUDIO frames   */
-               ( LE_32( dE1, 237568 ) ) &&                                                  /* Avoid on sharp energy spikes  */
-               ( LE_32( st_fx->old_dE1_fx, 237568 ) ) &&                                    /*   + one frame hysteresis   */
-               ( st_fx->spike_hyst < 0 ) ) ||                                               /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
-             flag_low_relE )                                                                /* low relative frame energy (only for SC-VBR) */
-#endif
         {
             coder_type = UNVOICED;
             move16();
@@ -480,7 +412,6 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
         test();
         test();
         test();
-#ifdef BASOP_NOGLOB
         if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low  */
                ( LT_16( add_sat( st_fx->voicing_fx[2], corr_shift ), 25887 /* 0.8 in Q15 */ ) ) &&                           /* normalized correlation low on look-ahead - onset detection */
                ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
@@ -491,18 +422,6 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
                ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) &&                                                  /*   + one frame hysteresis   */
                ( st_fx->spike_hyst < 0 ) )                                                                                   /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
              || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) )                             /* low relative frame energy (only for SC-VBR) */
-#else
-        if ( ( ( LT_16( add( mean_voi3, corr_shift ), add( 22774, mean_voi3_offset ) ) ) && /* normalized correlation low  */
-               ( LT_16( add( st_fx->voicing_fx[2], corr_shift ), 25887 ) ) &&               /* normalized correlation low on look-ahead - onset detection */
-               ( LT_32( ee[0], 397 ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
-               ( LT_32( ee[1], 397 ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&                 /* ... biased towards look-ahead to detect onsets  */
-               ( tmp_offset_flag == 0 ) &&                                                  /* Take care of voiced offsets */
-               /*( st_fx->music_hysteresis_fx == 0 ) &&  */                                 /*  ... and in segment after AUDIO frames   */
-               ( LE_32( dE1, 245760 ) ) &&                                                  /* Avoid on sharp energy spikes  */
-               ( LE_32( st_fx->old_dE1_fx, 245760 ) ) &&                                    /*   + one frame hysteresis   */
-               ( st_fx->spike_hyst < 0 ) )                                                  /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
-             || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 ) ) ) )               /* low relative frame energy (only for SC-VBR) */
-#endif
         {
             coder_type = UNVOICED;
             move16();
@@ -620,24 +539,544 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
             }
         }
     }
-#ifdef IVAS_CODE
+
     /*-----------------------------------------------------------------*
-     * UNCLR classifier
+     * Updates
      *-----------------------------------------------------------------*/
 
-    if ( hStereoClassif != NULL )
+    /* update spike hysteresis parameters */
+    test();
+    if ( st_fx->spike_hyst >= 0 && LT_16( st_fx->spike_hyst, 2 ) )
+    {
+        st_fx->spike_hyst = add( st_fx->spike_hyst, 1 ); /* Q0 */
+    }
+
+    /* reset spike hysteresis */
+    test();
+    test();
+    test();
+    if ( ( GT_16( st_fx->spike_hyst, 1 ) ) &&
+         ( GT_16( dE3, 5 << 8 ) ||                                                              /* energy increases               */
+           ( GT_16( relE, -3328 ) && ( GT_16( add_sat( mean_voi3, corr_shift ), 22774 ) ) ) ) ) /* normalized correlation is high */
     {
-        if ( st->element_mode > EVS_MONO && ( coder_type == GENERIC || coder_type == UNVOICED || coder_type == INACTIVE || st->localVAD == 0 ) && hStereoClassif->unclr_sw_enable_cnt[st->idchan] < MAX_UV_CNT )
+        st_fx->spike_hyst = -1;
+        move16();
+    }
+
+    /* update tilt parameters */
+    st_fx->ee_old_fx = ee[1];
+    move32(); /*Q6*/
+    st_fx->old_dE1_fx = dE1;
+    move32(); /*Q13*/
+
+    /* save the raw coder_type for various modules later in the codec (the reason is that e.g. UNVOICED is lost at higher rates) */
+    st_fx->coder_type_raw = coder_type;
+    move16();
+
+    return coder_type;
+}
+
+/*-------------------------------------------------------------------*
+ * find_uv()
+ *
+ * Decision about coder type
+ *-------------------------------------------------------------------*/
+Word16 find_uv_ivas_fx(                                       /* o  : coding type                                                   */
+                        Encoder_State *st_fx,                 /* i/o: encoder state structure                                       */
+                        const Word16 *T_op_fr,                /* i  : pointer to adjusted fractional pitch (4 val.)					Q6*/
+                        const Word16 *voicing_fr,             /* i  : refined correlation for each subframes						Q15*/
+                        const Word16 *speech,                 /* i  : pointer to speech signal for E computation					Q_new*/
+                        const Word32 *ee,                     /* i  : lf/hf Energy ratio for present frame							Q6*/
+                        Word32 *dE1X,                         /* o  : sudden energy increase for S/M classifier                     Q13*/
+                        const Word16 corr_shift,              /* i  : normalized correlation correction in noise					Q15*/
+                        const Word16 relE,                    /* i  : relative frame energy											Q8*/
+                        const Word16 Etot,                    /* i  : total energy													Q8*/
+                        const Word32 hp_E[],                  /* i  : energy in HF													q_hp_E*/
+                        Word16 *flag_spitch,                  /* i/o: flag to indicate very short stable pitch and high correlation Q0*/
+                        const Word16 last_core_orig,          /* i  : original last core                                            Q0*/
+                        STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                   */
+                        const Word16 Q_new,
+                        const Word16 q_hp_E )
+{
+    Word16 coder_type, i;
+    Word32 mean_ee, dE1, fac_32;
+    const Word16 *pt_speech;
+    Word32 L_tmp, enr_ssf[2 * NB_SSF + 2 * NB_SSF + 2], E_min_th;
+    Word16 dE2;
+    Word16 ind_deltaMax, tmp_offset_flag;
+    Word32 Ltmp0, *pt_enr_ssf, *pt_enr_ssf1, dE2_th;
+    Word16 exp0, exp1;
+    Word16 wtmp0, wtmp1;
+    Word16 fac, mean_voi3, dE3;
+    Word16 relE_thres;
+    Word16 mean_voi3_offset;
+    Word16 voicing_m, dpit1, dpit2, dpit3;
+    Word16 ee0_th, ee1_th, voi_th, nb_cond, flag_low_relE;
+    NOISE_EST_HANDLE hNoiseEst = st_fx->hNoiseEst;
+    SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
+#endif
+    Word16 Last_Resort;
+    Word16 vadnoise;
+
+    IF( hSC_VBR != NULL )
+    {
+        Last_Resort = hSC_VBR->Last_Resort; /* Q0 */
+        move16();
+        vadnoise = hSC_VBR->vadnoise_fx; /* Q8 */
+        move16();
+    }
+    ELSE
+    {
+        Last_Resort = 0;
+        move16();
+        vadnoise = 0;
+        move16();
+    }
+
+    /*-----------------------------------------------------------------*
+     * Detect sudden energy increases to catch voice and music
+     * temporal events (dE1)
+     *
+     * - Find maximum energy per short subblocks.
+     *   Two subblock sets are used shifted by half the subblock length
+     * - Find maximum energy ratio between adjacent subblocks
+     *-----------------------------------------------------------------*/
+
+    /* Find maximum energy per short subblocks  */
+    pt_speech = speech - SSF;
+    pt_enr_ssf = enr_ssf + 2 * NB_SSF;
+    FOR( i = 0; i < 2 * ( NB_SSF + 1 ); i++ )
+    {
+        emaximum_fx( Q_new, pt_speech, SSF, pt_enr_ssf );
+        pt_speech += ( SSF / 2 );
+        pt_enr_ssf++;
+    }
+
+    dE1 = 0;
+    move16();
+    ind_deltaMax = 0;
+    move16();
+    pt_enr_ssf = enr_ssf + 2 * NB_SSF;
+    pt_enr_ssf1 = pt_enr_ssf + 2;
+
+    /* Test on energy increase between adjacent sub-subframes */
+    exp1 = 0;
+    move16();
+    FOR( i = 0; i < 2 * NB_SSF; i++ )
+    {
+        /*fac = *pt_enr_ssf1 / (*pt_enr_ssf + 1);*/
+        Ltmp0 = L_max( *pt_enr_ssf, 1 );
+        exp0 = norm_l( Ltmp0 );
+        wtmp0 = extract_h( L_shl( Ltmp0, exp0 ) );
+        exp1 = sub( norm_l( *pt_enr_ssf1 ), 1 );
+        wtmp1 = extract_h( L_shl( *pt_enr_ssf1, exp1 ) );
+        fac = div_s( wtmp1, wtmp0 );
+        fac_32 = L_shr_o( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ), &Overflow ); /* fac32 in Q13*/
+
+        if ( GT_32( fac_32, dE1 ) )
         {
-            hStereoClassif->unclr_sw_enable_cnt[st->idchan]++;
+            ind_deltaMax = i;
+            move16();
         }
-        else
+
+        dE1 = L_max( dE1, fac_32 ); /* Q13 */
+
+        pt_enr_ssf++;
+        pt_enr_ssf1++;
+    }
+
+    IF( hStereoClassif != NULL )
+    {
+        IF( st_fx->idchan == 0 )
         {
-            hStereoClassif->unclr_sw_enable_cnt[st->idchan] = 0;
+            hStereoClassif->dE1_ch1_fx = dE1; /* Q13 */
+            move32();
+            hStereoClassif->dE1_ch1_e = 31 - Q13;
+            move16();
+        }
+        ELSE
+        {
+            hStereoClassif->dE1_ch2_fx = dE1; /* Q13 */
+            move32();
+            hStereoClassif->dE1_ch2_e = 31 - Q13;
+            move16();
         }
     }
-#endif
 
+    if ( dE1X != NULL )
+    {
+        *dE1X = dE1; /* Q13 */
+        move32();
+    }
+
+    /*-----------------------------------------------------------------*
+     * Average spectral tilt
+     * Average voicing (normalized correlation)
+     *-----------------------------------------------------------------*/
+
+    /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */                              /* coefficients take into account the position of the window */
+    mean_ee = L_add_o( L_add_o( st_fx->ee_old_fx, ee[0], &Overflow ), ee[1], &Overflow ); /* Q6 */
+    mean_ee = Mult_32_16( mean_ee, 10923 );                                               /*Q6*/
+
+    /* mean_voi3 = 1.0f/3.0f * (voicing[0] + voicing[1] + voicing[2]);*/
+    Ltmp0 = L_mult( st_fx->voicing_fx[0], 10923 /* 1/3 in Q15 */ );               /* Q31 */
+    Ltmp0 = L_mac( Ltmp0, st_fx->voicing_fx[1], 10923 /* 1/3 in Q15 */ );         /* Q31 */
+    mean_voi3 = mac_r_sat( Ltmp0, st_fx->voicing_fx[2], 10923 /* 1/3 in Q15 */ ); /*Q15*/
+    /*-----------------------------------------------------------------*
+     * Total frame energy difference (dE3)
+     *-----------------------------------------------------------------*/
+
+    dE3 = sub( Etot, extract_h( hNoiseEst->Etot_last_32fx ) ); /*Q8*/
+
+    /*-----------------------------------------------------------------*
+     * Energy decrease after spike (dE2)
+     *-----------------------------------------------------------------*/
+
+    /* set different thresholds and conditions for NB and WB input */
+    dE2_th = 30 << 10;
+    move32();
+    nb_cond = 1;
+    move16(); /* no additional condition for WB input */
+    IF( st_fx->input_bwidth == NB )
+    {
+        dE2_th = 21 << 10;
+        move32();
+        if ( GE_16( add_o( mean_voi3, corr_shift, &Overflow ), 22282 ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
+        {
+            nb_cond = 0;
+            move16();
+        }
+    }
+
+    /* calcualte maximum energy decrease */
+    dE2 = 0;
+    move16(); /* Test on energy decrease after an energy spike  */
+    pt_enr_ssf = enr_ssf + 2 * NB_SSF;
+
+    test();
+    IF( GT_32( dE1, 30 << 13 ) && nb_cond ) /*>30 Q13*/
+    {
+        IF( LT_16( sub( shl( NB_SSF, 1 ), ind_deltaMax ), L_ENR ) )
+        {
+            st_fx->old_ind_deltaMax = ind_deltaMax; /* Q0 */
+            move16();
+            Copy32( pt_enr_ssf, st_fx->old_enr_ssf_fx, 2 * NB_SSF ); /* Qx */
+        }
+        ELSE
+        {
+            st_fx->old_ind_deltaMax = -1;
+            move16();
+            dE2 = find_ener_decrease_fx( ind_deltaMax, pt_enr_ssf ); /*Q10*/
+
+            if ( GT_32( dE2, dE2_th ) )
+            {
+                st_fx->spike_hyst = 0;
+                move16();
+            }
+        }
+    }
+    ELSE
+    {
+        IF( st_fx->old_ind_deltaMax >= 0 )
+        {
+            Copy32( st_fx->old_enr_ssf_fx, enr_ssf, 2 * NB_SSF );            /* Qx */
+            dE2 = find_ener_decrease_fx( st_fx->old_ind_deltaMax, enr_ssf ); /* Q10 */
+
+            if ( GT_32( dE2, dE2_th ) )
+            {
+                st_fx->spike_hyst = 1;
+                move16();
+            }
+        }
+
+        st_fx->old_ind_deltaMax = -1;
+        move16();
+    }
+
+    /*-----------------------------------------------------------------*
+     * Detection of voiced offsets (tmp_offset_flag)
+     *-----------------------------------------------------------------*/
+
+    tmp_offset_flag = 1;
+    move16();
+
+    IF( st_fx->input_bwidth != NB )
+    {
+        ee0_th = 154; /*2.4 in Q6 */
+        move16();
+        voi_th = 24248; /*0.74f Q15 */
+        move16();
+    }
+    ELSE
+    {
+        ee0_th = 627; /*9.8f Q6 */
+        move16();
+        voi_th = 24904; /*0.76f Q15*/
+        move16();
+    }
+
+    E_min_th = L_shl( E_MIN_IVAS_FX_Q31, sub( q_hp_E, Q31 ) );
+
+    test();
+    test();
+    test();
+    IF( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) ||                            /* previous frame was unvoiced  */
+        ( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&               /* energy is concentrated in high frequencies provided that some energy is present in HF */
+          ( LT_16( add_o( st_fx->voicing_fx[0], corr_shift, &Overflow ), voi_th ) ) ) ) /* normalized correlation is low */
+    {
+        tmp_offset_flag = 0;
+        move16();
+    }
+
+    /*-----------------------------------------------------------------*
+     * Decision about UC
+     *-----------------------------------------------------------------*/
+
+    /* SC-VBR - set additional parameters and thresholds for SC-VBR */
+    mean_voi3_offset = 0;
+    move16();
+    flag_low_relE = 0;
+    move16();
+    ee1_th = 608; /*9.5 Q6*/
+    move16();
+    test();
+    test();
+    IF( st_fx->Opt_SC_VBR || ( EQ_16( st_fx->idchan, 1 ) && EQ_16( st_fx->element_mode, IVAS_CPE_TD ) ) ) /* Allow the low energy flag for the secondary channel */
+    {
+        ee1_th = 544; /*8.5f Q6*/
+        move16();
+
+        /* SC-VBR - determine the threshold on relative energy as a function of lp_noise */
+        IF( st_fx->input_bwidth != NB )
+        {
+            /*relE_thres = 0.700f * st->lp_noise - 33.5f; (lp_noise in Q8, constant Q8<<16) */
+            L_tmp = L_mac( -562036736 /* 33.5f in Q24 */, 22938 /* 0.7 in Q15 */, st_fx->lp_noise_fx ); // Q24
+            IF( Last_Resort == 0 )
+            {
+                /*relE_thres = 0.650f * st->lp_noise - 33.5f; (lp_noise in Q8, constant Q8<<16)*/
+                L_tmp = L_mac( -562036736 /* 33.5f in Q24 */, 21299 /* 0.650f in Q15 */, st_fx->lp_noise_fx ); // Q24
+            }
+            relE_thres = round_fx( L_tmp );
+        }
+        ELSE
+        {
+
+            /*relE_thres = 0.60f * st->lp_noise - 28.2f; (lp_noise in Q8, constant Q8<<16)*/
+            L_tmp = L_mac( -473117491 /* 28.2f in Q24 */, 19661 /* 0.6f in Q15 */, st_fx->lp_noise_fx ); // Q24
+            relE_thres = round_fx( L_tmp );
+        }
+        relE_thres = s_max( relE_thres, -6400 /* -25.0f in Q8 */ ); /* Q8 */
+
+        /* SC-VBR = set flag on low relative energy */
+        if ( LT_16( relE, relE_thres ) )
+        {
+            flag_low_relE = 1;
+            move16();
+        }
+
+        /* SC-VBR - correction of voicing threshold for NB inputs (important only in noisy conditions) */
+        test();
+        if ( st_fx->input_bwidth == NB && LT_16( vadnoise, 20 << 8 ) ) /* vadnoise in Q8, constant Q0<<8 */
+        {
+            mean_voi3_offset = 1638; /*0.05f Q15*/
+            move16();
+        }
+    }
+
+    /* make decision whether frame is unvoiced */
+    coder_type = GENERIC;
+    move16();
+    IF( st_fx->input_bwidth == NB )
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low  */
+              ( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 /* 0.79 in Q15 */ ) ) &&               /* normalized correlation low on look-ahead - onset detection */
+              ( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                              /* energy concentrated in high frequencies provided that some energy is present in HF...  */
+              ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&                                             /* ... biased towards look-ahead to detect onsets  */
+              ( tmp_offset_flag == 0 ) &&                                                                                 /* Take care of voiced offsets */
+              /*( st_fx->music_hysteresis_fx == 0 ) &&*/                                                                  /*  ... and in segment after AUDIO frames   */
+              ( LE_32( dE1, 237568 /* 29.0f in Q13 */ ) ) &&                                                              /* Avoid on sharp energy spikes  */
+              ( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) &&                                                /*   + one frame hysteresis   */
+              ( st_fx->spike_hyst < 0 ) ) ||                                                                              /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
+            flag_low_relE )                                                                                               /* low relative frame energy (only for SC-VBR) */
+        {
+            coder_type = UNVOICED;
+            move16();
+        }
+    }
+    ELSE
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low  */
+               /*( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 ) ) && */                              /* normalized correlation low on look-ahead - onset detection */
+               ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) &&                                 /* energy concentrated in high frequencies provided that some energy is present in HF...  */
+               ( LT_32( ee[1], 397 /* 6.2f in Q16 */ ) ) && ( GT_32( hp_E[1], E_min_th ) ) &&                                /* ... biased towards look-ahead to detect onsets  */
+               ( tmp_offset_flag == 0 ) &&                                                                                   /* Take care of voiced offsets */
+               /*( st_fx->music_hysteresis_fx == 0 ) &&  */                                                                  /*  ... and in segment after AUDIO frames   */
+               ( LE_32( dE1, 245760 /* 30.0f in Q13 */ ) ) &&                                                                /* Avoid on sharp energy spikes  */
+               ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) &&                                                  /*   + one frame hysteresis   */
+               ( st_fx->spike_hyst < 0 ) )                                                                                   /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
+             || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) )                             /* low relative frame energy (only for SC-VBR) */
+        {
+            coder_type = UNVOICED;
+            move16();
+        }
+    }
+
+    /*-----------------------------------------------------------------*
+     * Decision about VC
+     *-----------------------------------------------------------------*/
+    if ( st_fx->Opt_SC_VBR )
+    {
+        hSC_VBR->set_ppp_generic = 0;
+    }
+    move16();
+
+    test();
+    test();
+    IF( EQ_16( st_fx->localVAD, 1 ) && EQ_16( coder_type, GENERIC ) && NE_16( last_core_orig, AMR_WB_CORE ) )
+    {
+        dpit1 = abs_s( sub( T_op_fr[1], T_op_fr[0] ) ); /* Q6 */
+        dpit2 = abs_s( sub( T_op_fr[2], T_op_fr[1] ) ); /* Q6 */
+        dpit3 = abs_s( sub( T_op_fr[3], T_op_fr[2] ) ); /* Q6 */
+
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( ( GT_16( voicing_fr[0], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 1st sf.  */
+            ( GT_16( voicing_fr[1], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
+            ( GT_16( voicing_fr[2], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 3st sf.  */
+            ( GT_16( voicing_fr[3], 19825 /* 0.605 in Q15 */ ) ) && /* normalized correlation high in 4st sf.  */
+            ( GT_32( mean_ee, 256 /* 4.0f in Q6 */ ) ) &&           /* energy concentrated in low frequencies  */
+            ( LT_16( dpit1, 3 << 6 ) ) &&
+            ( LT_16( dpit2, 3 << 6 ) ) &&
+            ( LT_16( dpit3, 3 << 6 ) ) )
+        {
+            coder_type = VOICED;
+            move16();
+        }
+        ELSE IF( st_fx->Opt_SC_VBR && st_fx->input_bwidth == NB && LT_16( vadnoise, 20 << 8 ) )
+        {
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            test();
+            IF( GT_16( voicing_fr[0], 8192 /* 0.25 in Q15 */ ) &&     /* normalized correlation high in 1st sf.  */
+                ( GT_16( voicing_fr[1], 8192 /* 0.25 in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
+                ( GT_16( voicing_fr[2], 8192 /* 0.25 in Q15 */ ) ) && /* normalized correlation high in 3st sf.  */
+                ( GT_16( voicing_fr[3], 8192 /* 0.25 in Q15 */ ) ) && /* normalized correlation high in 4st sf.  */
+                ( GT_32( mean_ee, 64 /* 1.0f in Q6 */ ) ) &&          /* energy concentrated in low frequencies  */
+                ( LT_16( dpit1, 5 << 6 ) ) &&
+                ( LT_16( dpit2, 5 << 6 ) ) &&
+                ( LT_16( dpit3, 5 << 6 ) ) )
+            {
+                hSC_VBR->set_ppp_generic = 1;
+                move16();
+                coder_type = VOICED;
+                move16();
+            }
+        }
+
+        /* set VOICED mode for frames with very stable pitch and high correlation
+           and avoid to switch to AUDIO/MUSIC later                              */
+        voicing_m = mac_r( L_mac( L_mac( L_mult( voicing_fr[3], 8192 /* 0.25 in Q15 */ ), voicing_fr[2], 8192 /* 0.25 in Q15 */ ), voicing_fr[1], 8192 /* 0.25 in Q15 */ ), voicing_fr[0], 8192 /* 0.25 in Q15 */ ); /* Q15 */
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( *flag_spitch || ( LE_16( dpit1, 3 << 6 ) && LE_16( dpit2, 3 << 6 ) && LE_16( dpit3, 3 << 6 ) &&
+                              GT_16( voicing_m, 31130 /* 0.95f in Q15 */ ) && GT_16( st_fx->voicing_sm_fx, 31785 /* 0.97f in Q15 */ ) ) )
+        {
+            coder_type = VOICED;
+            move16();
+            *flag_spitch = 1;
+            move16(); /*to avoid switch to AUDIO/MUSIC later*/
+        }
+    }
+
+    /*-----------------------------------------------------------------*
+     * Channel-aware mode - set RF mode and total bitrate
+     *-----------------------------------------------------------------*/
+
+    st_fx->rf_mode = st_fx->Opt_RF_ON; /* Q0 */
+    move16();
+
+    IF( EQ_16( coder_type, GENERIC ) )
+    {
+        test();
+        test();
+        test();
+        test();
+        IF( ( LT_16( voicing_fr[0], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
+            ( LT_16( voicing_fr[1], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 2st sf.  */
+            ( LT_16( voicing_fr[2], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 3rd sf.  */
+            ( LT_16( voicing_fr[3], 6554 /* 0.2f in Q15 */ ) ) && /* normalized correlation high in 4th sf.  */
+            ( GT_16( vadnoise, 25 << 8 ) ) )                      /* when speech is clean */
+
+        {
+            st_fx->rf_mode = 0;
+            move16();
+            /* Current frame cannot be compressed to pack the partial redundancy;*/
+
+            IF( NE_16( st_fx->rf_mode, st_fx->Opt_RF_ON ) )
+            {
+                core_coder_mode_switch_ivas_fx( st_fx, st_fx->last_total_brate, 0 );
+            }
+        }
+    }
+
+    /*-----------------------------------------------------------------*
+     * UNCLR classifier
+     *-----------------------------------------------------------------*/
+
+    IF( hStereoClassif != NULL )
+    {
+        test();
+        test();
+        test();
+        test();
+        test();
+        IF( st_fx->element_mode > EVS_MONO && ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, UNVOICED ) || coder_type == INACTIVE || st_fx->localVAD == 0 ) && LT_16( hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan], MAX_UV_CNT ) )
+        {
+            hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan] = add( hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan], 1 );
+            move16();
+        }
+        ELSE
+        {
+            hStereoClassif->unclr_sw_enable_cnt[st_fx->idchan] = 0;
+            move16();
+        }
+    }
 
     /*-----------------------------------------------------------------*
      * Updates
@@ -648,6 +1087,7 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
     if ( st_fx->spike_hyst >= 0 && LT_16( st_fx->spike_hyst, 2 ) )
     {
         st_fx->spike_hyst = add( st_fx->spike_hyst, 1 ); /* Q0 */
+        move16();
     }
 
     /* reset spike hysteresis */
@@ -655,12 +1095,8 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
     test();
     test();
     if ( ( GT_16( st_fx->spike_hyst, 1 ) ) &&
-         ( GT_16( dE3, 5 << 8 ) || /* energy increases               */
-#ifdef BASOP_NOGLOB
-           ( GT_16( relE, -3328 ) && ( GT_16( add_sat( mean_voi3, corr_shift ), 22774 ) ) ) ) ) /* normalized correlation is high */
-#else
-           ( GT_16( relE, -3328 ) && ( GT_16( add( mean_voi3, corr_shift ), 22774 ) ) ) ) ) /* normalized correlation is high */
-#endif
+         ( GT_16( dE3, 5 << 8 ) ||                                                                                                /* energy increases               */
+           ( GT_16( relE, -3328 /* 13 in Q8 */ ) && ( GT_16( add_sat( mean_voi3, corr_shift ), 22774 /* 0.695 in Q15 */ ) ) ) ) ) /* normalized correlation is high */
     {
         st_fx->spike_hyst = -1;
         move16();
@@ -673,7 +1109,7 @@ Word16 find_uv_fx(                           /* o  : coding type													*/
     move32(); /*Q13*/
 
     /* save the raw coder_type for various modules later in the codec (the reason is that e.g. UNVOICED is lost at higher rates) */
-    st_fx->coder_type_raw = coder_type;
+    st_fx->coder_type_raw = coder_type; /* Q0 */
     move16();
 
     return coder_type;
diff --git a/lib_enc/find_wsp.c b/lib_enc/find_wsp.c
deleted file mode 100644
index 00729bde0ca3e5ac6d67d4ebf4fe522f504bb94e..0000000000000000000000000000000000000000
--- a/lib_enc/find_wsp.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-/*-------------------------------------------------------------------*
- * ivas_find_wsp_fx()
- *
- * Compute weighted speech used in open-loop pitch search
- *-------------------------------------------------------------------*/
-void ivas_find_wsp_fx(
-    const Word16 L_frame,  /* i  : length of the frame                   Q0*/
-    const Word16 L_subfr,  /* i  : length of subframe                    Q0*/
-    const Word16 nb_subfr, /* i  : number of subframes                   Q0*/
-    const Word16 *A_fx,
-    /* i  : A(z) filter coefficients              */ // Q12
-    Word16 *Aw_fx,
-    /* o  : weighted A(z) filter coefficients     */ // Q12
-    const Word16 *speech_fx,
-    /* i  : pointer to the denoised speech frame  */ // Q_new
-    const Word16 tilt_fact,
-    /* i  : tilt factor                           */ // Q15
-    Word16 *wsp_fx,
-    /* o  : poitnter to the weighted speech frame */ // Q_new
-    Word16 *mem_wsp_fx,
-    /* i/o: W(Z) denominator memory               */ // Q_new
-    const Word16 gamma,
-    /* i  : weighting factor                      */ // Q15
-    const Word16 L_look                              /* i  : look-ahead                            Q0*/
-)
-{
-    Word16 *p_Aw_fx, tmp_fx;
-    Word16 i_subfr;
-
-
-    /*-----------------------------------------------------------------*
-     *  Compute weighted A(z) unquantized for subframes
-     *-----------------------------------------------------------------*/
-    weight_a_subfr_fx( nb_subfr, A_fx, Aw_fx, gamma, M );
-
-    /*-----------------------------------------------------------------*
-     *  Compute weighted speech for all subframes
-     *-----------------------------------------------------------------*/
-    p_Aw_fx = Aw_fx;
-    FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_subfr )
-    {
-        Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr, 0 );
-        p_Aw_fx += ( M + 1 );
-    }
-    p_Aw_fx -= ( M + 1 );
-
-    /*-----------------------------------------------------------------*
-     *  Weighted speech computation is extended on look-ahead
-     *-----------------------------------------------------------------*/
-
-    deemph_fx( wsp_fx, tilt_fact, L_frame, mem_wsp_fx );
-    Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look, 0 );
-    tmp_fx = *mem_wsp_fx;
-    deemph_fx( &wsp_fx[L_frame], tilt_fact, L_look, &tmp_fx );
-    return;
-}
diff --git a/lib_enc/find_wsp_fx.c b/lib_enc/find_wsp_fx.c
index 7468c3dc77c5fd6064b8665f05a46dbb5e6c806b..155e499046dd1ead55fbc5fc7bf4f87eb4edd434 100644
--- a/lib_enc/find_wsp_fx.c
+++ b/lib_enc/find_wsp_fx.c
@@ -6,8 +6,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-//#include "prot_fx.h"
-#include "prot_fx.h"     /* Function prototypes                    */
+#include "prot_fx.h"
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 
@@ -78,3 +77,60 @@ void find_wsp_fx(
         deemph_fx( &wsp[L_frame], preemph_fac, lookahead, &wtmp );
     }
 }
+
+/*-------------------------------------------------------------------*
+ * ivas_find_wsp_fx()
+ *
+ * Compute weighted speech used in open-loop pitch search
+ *-------------------------------------------------------------------*/
+void ivas_find_wsp_fx(
+    const Word16 L_frame,  /* i  : length of the frame                   Q0*/
+    const Word16 L_subfr,  /* i  : length of subframe                    Q0*/
+    const Word16 nb_subfr, /* i  : number of subframes                   Q0*/
+    const Word16 *A_fx,
+    /* i  : A(z) filter coefficients              */ // Q12
+    Word16 *Aw_fx,
+    /* o  : weighted A(z) filter coefficients     */ // Q12
+    const Word16 *speech_fx,
+    /* i  : pointer to the denoised speech frame  */ // Q_new
+    const Word16 tilt_fact,
+    /* i  : tilt factor                           */ // Q15
+    Word16 *wsp_fx,
+    /* o  : poitnter to the weighted speech frame */ // Q_new
+    Word16 *mem_wsp_fx,
+    /* i/o: W(Z) denominator memory               */ // Q_new
+    const Word16 gamma,
+    /* i  : weighting factor                      */ // Q15
+    const Word16 L_look                              /* i  : look-ahead                            Q0*/
+)
+{
+    Word16 *p_Aw_fx, tmp_fx;
+    Word16 i_subfr;
+
+
+    /*-----------------------------------------------------------------*
+     *  Compute weighted A(z) unquantized for subframes
+     *-----------------------------------------------------------------*/
+    weight_a_subfr_fx( nb_subfr, A_fx, Aw_fx, gamma, M );
+
+    /*-----------------------------------------------------------------*
+     *  Compute weighted speech for all subframes
+     *-----------------------------------------------------------------*/
+    p_Aw_fx = Aw_fx;
+    FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_subfr )
+    {
+        Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr, 0 );
+        p_Aw_fx += ( M + 1 );
+    }
+    p_Aw_fx -= ( M + 1 );
+
+    /*-----------------------------------------------------------------*
+     *  Weighted speech computation is extended on look-ahead
+     *-----------------------------------------------------------------*/
+
+    deemph_fx( wsp_fx, tilt_fact, L_frame, mem_wsp_fx );
+    Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look, 0 );
+    tmp_fx = *mem_wsp_fx;
+    deemph_fx( &wsp_fx[L_frame], tilt_fact, L_look, &tmp_fx );
+    return;
+}
diff --git a/lib_enc/frame_spec_dif_cor_rate.c b/lib_enc/frame_spec_dif_cor_rate.c
deleted file mode 100644
index 09ecb0cc8da1fd61600761850fcaf7872e0239fa..0000000000000000000000000000000000000000
--- a/lib_enc/frame_spec_dif_cor_rate.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * frame_spec_dif_cor_rate()
- *
- *
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/gain_enc.c b/lib_enc/gain_enc.c
deleted file mode 100644
index bd3da322af1606439586ba9acb92de4c09a4158e..0000000000000000000000000000000000000000
--- a/lib_enc/gain_enc.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
-
-#define RANGE 64
-
-/*---------------------------------------------------------------------*
- * Es_pred_enc()
- *
- * Calculation and quantization of average predicted innovation energy to be
- *---------------------------------------------------------------------*/
diff --git a/lib_enc/gain_enc_fx.c b/lib_enc/gain_enc_fx.c
index 1d330ac49a8a08bbdbad58155b603f78d4caa5c6..0ccb31ccfcf7e1eeb00cecab9149fa111b45bc8b 100644
--- a/lib_enc/gain_enc_fx.c
+++ b/lib_enc/gain_enc_fx.c
@@ -7,7 +7,6 @@
 #include "rom_com_fx.h" /* Static table prototypes                */
 #include "rom_com.h"    /* Static table prototypes                */
 //#include "prot_fx.h"       /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -96,11 +95,7 @@ void Es_pred_enc_fx(
         FOR( i = 1; i < L_SUBFR; i++ )
         {
             tmp16 = mult_r( res[i_subfr + i], 8192 /* 1 in Q13 */ ); /* remove 2bits	Q_new - 2*/
-#ifdef BASOP_NOGLOB
             ener_fx = L_mac_o( ener_fx, tmp16, tmp16, &Overflow );
-#else
-            ener_fx = L_mac( ener_fx, tmp16, tmp16 );
-#endif
         }
 
         /* ener = 10 * (float)log10(ener / (float)L_SUBFR) */
@@ -182,11 +177,7 @@ void Es_pred_enc_fx(
 
     FOR( i = 1; i < size; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp16_2 = abs_s( sub_o( mean_ener_code16, qua_table[i], &Overflow ) );
-#else  /* BASOP_NOGLOB */
-        tmp16_2 = abs_s( sub( mean_ener_code16, qua_table[i] ) );
-#endif /* BASOP_NOGLOB */
         IF( LT_16( tmp16_2, tmp16 ) )
         {
             tmp16 = tmp16_2;
@@ -397,11 +388,7 @@ void gain_enc_mless_fx(
         L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
         exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
         *gain_pit = round_fx_o( L_shl_o( L_div, add( exp, exp_div ), &Overflow ), &Overflow ); /*Q14*/
-#else
-        *gain_pit = round_fx( L_shl( L_div, add( exp, exp_div ) ) ); /*Q14*/
-#endif
 
         L_tmp1 = L_shr( L_mult( coeff[1], coeff[4] ), 2 ); /*Q31*/
         exp1 = add( exp_coeff[1], exp_coeff[4] );
@@ -426,11 +413,7 @@ void gain_enc_mless_fx(
         L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
         exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
         *gain_code = L_shl_o( L_div, sub( add( exp, exp_div ), 14 ), &Overflow );
-#else
-        *gain_code = L_shl( L_div, sub( add( exp, exp_div ), 14 ) );
-#endif
         move32(); /*Q16*/
 
         *gain_pit = s_max( G_PITCH_MIN_TC192_Q14, s_min( *gain_pit, G_PITCH_MAX_TC192_Q14 ) );
@@ -445,7 +428,7 @@ void gain_enc_mless_fx(
         tmp1 = mult_r( G_PITCH_MAX_MINUS_MIN_TC192_Q13, div_s( 1, sub( shl( 1, nBits ), 1 ) ) ); /*Q13*/ /* set quantization step */
         index = usquant_fx( *gain_pit, gain_pit, G_PITCH_MIN_TC192_Q14, tmp1, shl( 1, nBits ) );
         move16();
-        push_indice_fx( hBstr, IND_GAIN_PIT, index, nBits );
+        push_indice( hBstr, IND_GAIN_PIT, index, nBits );
 
         /* gain_code Q */
         /**gain_code /= gcode0;*/
@@ -458,13 +441,9 @@ void gain_enc_mless_fx(
         }
 
         index = gain_quant_fx( gain_code, &gain_code16, LG10_G_CODE_MIN_TC192_Q14, LG10_G_CODE_MAX_TC192_Q13, nBits2, &expg );
-        push_indice_fx( hBstr, IND_GAIN_CODE, index, nBits2 );
-        L_tmp = L_mult( gain_code16, gcode0 ); /*Q0*Q0 -> Q1*/
-#ifdef BASOP_NOGLOB
+        push_indice( hBstr, IND_GAIN_CODE, index, nBits2 );
+        L_tmp = L_mult( gain_code16, gcode0 );                                        /*Q0*Q0 -> Q1*/
         *gain_code = L_shl_o( L_tmp, add( add( expg, exp_gcode0 ), 15 ), &Overflow ); /*Q16*/
-#else
-        *gain_code = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) ); /*Q16*/
-#endif
     }
     ELSE
     {
@@ -487,11 +466,6 @@ void gain_enc_mless_fx(
                 qua_table = gain_qua_mless_6b_fx;
                 if ( element_mode > EVS_MONO )
                 {
-#ifdef IVAS_CODE
-                    qua_table = gain_qua_mless_6b_stereo;
-#else
-                                                                         // PMTE()
-#endif
                 }
                 move16();
                 if ( EQ_16( clip_gain, 1 ) )
@@ -534,7 +508,7 @@ void gain_enc_mless_fx(
          * search for the best quantizer
          *-----------------------------------------------------------------*/
         index = Find_Opt_gainQ_fx( coeff, exp_coeff, gain_pit, gain_code, gcode0, exp_gcode0, qua_table, size ); // Q0
-        push_indice_fx( hBstr, IND_GAIN, index, nBits );
+        push_indice( hBstr, IND_GAIN, index, nBits );
     }
 
     /* *norm_gain_code = *gain_code / *gain_inov; */
@@ -623,40 +597,43 @@ void gain_enc_mless_ivas_fx(
     L_tmp = Dot_product12( code, code, L_SUBFR, &exp_code );
     exp_inov = sub( exp_code, 18 + 6 );
 
-    // To avoid crash in case code value is 0
+    // To avoid crash in case code value is 0,
     IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_tmp, exp_inov, 21474836, 0 ), -1 ) )
     {
-        L_tmp = 21474836;
-        exp_inov = 0;
-        move32();
+        // setting values to avoid extra computation
+        *gain_inov = 32767; /*8(max value gain_inov can hold) in Q12*/
+        Ei = -9743;         /* -38 in Q8*/
+        move16();
         move16();
     }
+    ELSE
+    {
+        exp_code = sub( exp_code, 30 );
 
-    exp_code = sub( exp_code, 30 );
-
-    /*Ei = 10 * log10((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
+        /*Ei = 10 * log10((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
 
-    /*----------------------------------------------------------------*
-     * calculate the predicted gain code
-     *----------------------------------------------------------------*/
-    tmp = norm_l( L_tmp );
-    frac = Log2_norm_lc( L_shl( L_tmp, tmp ) );
-    tmp = add( 30 - 18 - 6 - 1, sub( exp_code, tmp ) ); /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
-    L_tmp1 = Mpy_32_16( tmp, frac, 12330 );             /* Q13 */
-    Ei = round_fx( L_shl( L_tmp1, 11 ) );               /* Q8 */
+        /*----------------------------------------------------------------*
+         * calculate the predicted gain code
+         *----------------------------------------------------------------*/
+        tmp = norm_l( L_tmp );
+        frac = Log2_norm_lc( L_shl( L_tmp, tmp ) );
+        tmp = add( 30 - 18 - 6 - 1, sub( exp_code, tmp ) ); /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
+        L_tmp1 = Mpy_32_16( tmp, frac, 12330 );             /* Q13 */
+        Ei = round_fx( L_shl( L_tmp1, 11 ) );               /* Q8 */
+
+        /*---------------------------------------------------------------*
+         * Decode codebook gain and the adaptive excitation low-pass
+         * filtering factor (Finalize computation )
+         *---------------------------------------------------------------*/
+        /* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
+        L_tmp = Isqrt_lc( L_tmp, &exp_inov );
+        *gain_inov = extract_h( L_shl( L_tmp, sub( exp_inov, 3 ) ) ); /* gain_inov in Q12 */
+        move16();
+    }
 
     /* predicted codebook gain */
     gcode0 = sub( Es_pred, Ei ); /* Q8 */
 
-    /*---------------------------------------------------------------*
-     * Decode codebook gain and the adaptive excitation low-pass
-     * filtering factor (Finalize computation )
-     *---------------------------------------------------------------*/
-    /* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
-    L_tmp = Isqrt_lc( L_tmp, &exp_inov );
-    *gain_inov = extract_h( L_shl( L_tmp, sub( exp_inov, 3 ) ) ); /* gain_inov in Q12 */
-    move16();
-
     /* gcode0 = pow(10, 0.05 * (Es_pred - Ei)) */
     /*----------------------------------------------------------------*
      * gcode0 = pow(10.0, gcode0/20)
@@ -745,11 +722,7 @@ void gain_enc_mless_ivas_fx(
         L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
         exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
         *gain_pit = round_fx_o( L_shl_o( L_div, add( exp, exp_div ), &Overflow ), &Overflow ); /*Q14*/
-#else
-        *gain_pit = round_fx( L_shl( L_div, add( exp, exp_div ) ) );     /*Q14*/
-#endif
 
         L_tmp1 = L_shr( L_mult( coeff[1], coeff[4] ), 2 ); /*Q31*/
         exp1 = add( exp_coeff[1], exp_coeff[4] );
@@ -774,11 +747,7 @@ void gain_enc_mless_ivas_fx(
         L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
         exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
         *gain_code = L_shl_o( L_div, sub( add( exp, exp_div ), 14 ), &Overflow );
-#else
-        *gain_code = L_shl( L_div, sub( add( exp, exp_div ), 14 ) );
-#endif
         move32(); /*Q16*/
 
         *gain_pit = s_max( G_PITCH_MIN_TC192_Q14, s_min( *gain_pit, G_PITCH_MAX_TC192_Q14 ) );
@@ -806,12 +775,8 @@ void gain_enc_mless_ivas_fx(
 
         index = gain_quant_fx( gain_code, &gain_code16, LG10_G_CODE_MIN_TC192_Q14, LG10_G_CODE_MAX_TC192_Q13, nBits2, &expg );
         push_indice( hBstr, IND_GAIN_CODE, index, nBits2 );
-        L_tmp = L_mult( gain_code16, gcode0 ); /*Q0*Q0 -> Q1*/
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( gain_code16, gcode0 );                                        /*Q0*Q0 -> Q1*/
         *gain_code = L_shl_o( L_tmp, add( add( expg, exp_gcode0 ), 15 ), &Overflow ); /*Q16*/
-#else
-        *gain_code = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) ); /*Q16*/
-#endif
     }
     ELSE
     {
@@ -1033,11 +998,7 @@ void gain_enc_SQ_fx(
     L_tmp1 = L_mult( coeff[0], coeff[2] ); /*Q31*/
     exp1 = add( exp_coeff[0], exp_coeff[2] );
 
-#ifdef BASOP_NOGLOB
     L_tmp2 = L_mult_o( coeff[4], coeff[4], &Overflow ); /*Q31*/
-#else
-    L_tmp2 = L_mult( coeff[4], coeff[4] );                               /*Q31*/
-#endif
     exp2 = add( exp_coeff[4], exp_coeff[4] );
 
     IF( GT_16( exp1, exp2 ) )
@@ -1079,20 +1040,12 @@ void gain_enc_SQ_fx(
         exp_num = exp2;
         move16();
     }
-#ifdef BASOP_NOGLOB
     L_frac_num = L_sub_o( L_tmp2, L_tmp1, &Overflow ); /*Q31*/
-#else                                                  /* BASOP_NOGLOB */
-    L_frac_num = L_sub( L_tmp2, L_tmp1 );                                /*Q31*/
-#endif                                                 /* BASOP_NOGLOB */
 
     L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
     exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
     *gain_pit = round_fx_o( L_shl_o( L_div, add( exp, exp_div ), &Overflow ), &Overflow ); /*Q14*/
-#else                                                                                      /* BASOP_NOGLOB */
-    *gain_pit = round_fx( L_shl( L_div, add( exp, exp_div ) ) );         /*Q14*/
-#endif                                                                                     /* BASOP_NOGLOB */
 
     L_tmp1 = L_mult( coeff[1], coeff[4] ); /*Q31*/
     exp1 = add( exp_coeff[1], exp_coeff[4] );
@@ -1112,20 +1065,12 @@ void gain_enc_SQ_fx(
         exp_num = exp2;
         move16();
     }
-#ifdef BASOP_NOGLOB
     L_frac_num = L_sub_o( L_tmp2, L_tmp1, &Overflow ); /*Q31*/
-#else                                                  /* BASOP_NOGLOB */
-    L_frac_num = L_sub( L_tmp2, L_tmp1 );                                /*Q31*/
-#endif                                                 /* BASOP_NOGLOB */
 
     L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
     exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( L_div, s_max( -31, sub( add( exp, exp_div ), 14 ) ) );
-#else
-    *gain_code = L_shl( L_div, s_max( -31, sub( add( exp, exp_div ), 14 ) ) );
-#endif
     move32(); /*Q16*/
 
     *gain_pit = s_max( G_PITCH_MIN_Q14, s_min( *gain_pit, G_PITCH_MAX_Q14 ) );
@@ -1163,7 +1108,7 @@ void gain_enc_SQ_fx(
     tmp1 = mult_r( G_PITCH_MAX_Q13, div_s( 1, sub( shl( 1, nBits_pitch ), 1 ) ) ); /*Q13*/ /* set quantization step */
 
     index = usquant_fx( *gain_pit, gain_pit, G_PITCH_MIN_Q14, tmp1, shl( 1, nBits_pitch ) ); // Q0
-    push_indice_fx( hBstr, IND_GAIN_PIT, index, nBits_pitch );
+    push_indice( hBstr, IND_GAIN_PIT, index, nBits_pitch );
 
     /* gain_code Q */
     /* *gain_code /= gcode0; */
@@ -1176,13 +1121,9 @@ void gain_enc_SQ_fx(
     }
 
     index = gain_quant_fx( gain_code, &gain_code16, LG10_G_CODE_MIN_Q14, LG10_G_CODE_MAX_Q13, nBits_code, &expg );
-    push_indice_fx( hBstr, IND_GAIN_CODE, index, nBits_code );
+    push_indice( hBstr, IND_GAIN_CODE, index, nBits_code );
     L_tmp = L_mult( gain_code16, gcode0 ); /*Q0*Q0 -> Q1*/
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( L_tmp, add( add( expg, exp_gcode0 ), 15 ) );
-#else
-    *gain_code = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) );
-#endif
     move32(); /*Q16*/
 
     /* *norm_gain_code = *gain_code / *gain_inov; */
@@ -1331,11 +1272,7 @@ void gain_enc_SQ_ivas_fx(
     L_tmp1 = L_mult( coeff[0], coeff[2] ); /*Q31*/
     exp1 = add( exp_coeff[0], exp_coeff[2] );
 
-#ifdef BASOP_NOGLOB
     L_tmp2 = L_mult_o( coeff[4], coeff[4], &Overflow ); /*Q31*/
-#else
-    L_tmp2 = L_mult( coeff[4], coeff[4] );                       /*Q31*/
-#endif
     exp2 = add( exp_coeff[4], exp_coeff[4] );
 
     IF( GT_16( exp1, exp2 ) )
@@ -1377,29 +1314,16 @@ void gain_enc_SQ_ivas_fx(
         exp_num = exp2;
         move16();
     }
-#ifdef BASOP_NOGLOB
     L_frac_num = L_sub_o( L_tmp2, L_tmp1, &Overflow ); /*Q31*/
-#else                                                  /* BASOP_NOGLOB */
-    L_frac_num = L_sub( L_tmp2, L_tmp1 );                        /*Q31*/
-#endif                                                 /* BASOP_NOGLOB */
 
     L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
     exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
     *gain_pit = round_fx_o( L_shl_o( L_div, add( exp, exp_div ), &Overflow ), &Overflow ); /*Q14*/
     move16();
-#else  /* BASOP_NOGLOB */
-    *gain_pit = round_fx( L_shl( L_div, add( exp, exp_div ) ) ); /*Q14*/
-    move16();
-#endif /* BASOP_NOGLOB */
 
     // To be checked
-#ifdef BASOP_NOGLOB
     L_tmp1 = L_mult_o( coeff[1], coeff[4], &Overflow ); /*Q31*/
-#else                                                   /* BASOP_NOGLOB */
-    L_tmp1 = L_mult( coeff[1], coeff[4] ); /*Q31*/
-#endif                                                  /* BASOP_NOGLOB */
     exp1 = add( exp_coeff[1], exp_coeff[4] );
 
     L_tmp2 = L_mult( coeff[0], coeff[3] ); /*Q31*/
@@ -1417,20 +1341,12 @@ void gain_enc_SQ_ivas_fx(
         exp_num = exp2;
         move16();
     }
-#ifdef BASOP_NOGLOB
     L_frac_num = L_sub_o( L_tmp2, L_tmp1, &Overflow ); /*Q31*/
-#else                                                  /* BASOP_NOGLOB */
-    L_frac_num = L_sub( L_tmp2, L_tmp1 );  /*Q31*/
-#endif                                                 /* BASOP_NOGLOB */
 
     L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
     exp_div = sub( exp_num, exp_den );
 
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( L_div, s_max( -31, sub( add( exp, exp_div ), 14 ) ) );
-#else
-    *gain_code = L_shl( L_div, s_max( -31, sub( add( exp, exp_div ), 14 ) ) );
-#endif
     move32(); /*Q16*/
 
     *gain_pit = s_max( G_PITCH_MIN_Q14, s_min( *gain_pit, G_PITCH_MAX_Q14 ) );
@@ -1483,11 +1399,7 @@ void gain_enc_SQ_ivas_fx(
     index = gain_quant_fx( gain_code, &gain_code16, LG10_G_CODE_MIN_Q14, LG10_G_CODE_MAX_Q13, nBits_code, &expg );
     push_indice( hBstr, IND_GAIN_CODE, index, nBits_code );
     L_tmp = L_mult( gain_code16, gcode0 ); /*Q0*Q0 -> Q1*/
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( L_tmp, add( add( expg, exp_gcode0 ), 15 ) );
-#else
-    *gain_code = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) );
-#endif
     move32(); /*Q16*/
 
     /* *norm_gain_code = *gain_code / *gain_inov; */
@@ -1551,11 +1463,7 @@ Word16 gain_enc_gaus_fx(                           /* o  : Return index of quant
 
     Ltmp = Pow2( 14, frac_gain );   /* Put 14 as exponent */
     exp_gain = sub( exp_gain, 14 ); /* Retreive exponent of wtmp */
-#ifdef BASOP_NOGLOB
     *gain = L_shl_o( Ltmp, add( 16, exp_gain ), &Overflow );
-#else
-    *gain = L_shl( Ltmp, add( 16, exp_gain ) );
-#endif
     move32(); /*Q16*/
 
     return index;
@@ -1626,11 +1534,7 @@ void gain_enc_tc_fx(
 
     i = sub( exp_num, exp_den );             /* Gain_trans in Q7 */
     g_code_fx = i_mult2( g_code_fx, tmp16 ); /* apply sign */
-#ifdef BASOP_NOGLOB
     *gain_code_fx = L_shr_sat( L_deposit_l( g_code_fx ), i );
-#else
-    *gain_code_fx = L_shr( L_deposit_l( g_code_fx ), i );
-#endif
     move32();
 
     /*----------------------------------------------------------------*
@@ -1697,7 +1601,7 @@ void gain_enc_tc_fx(
         *gain_code_fx = L_shl( L_tmp, add( add( expg, exp_gcode0 ), 15 ) ); /*Q16*/
         move32();
 
-        push_indice_fx( hBstr, IND_GAIN_CODE, index, nBits );
+        push_indice( hBstr, IND_GAIN_CODE, index, nBits );
     }
     ELSE
     {
@@ -1728,7 +1632,7 @@ void gain_enc_tc_fx(
             L_tmp = L_mult( wgain_code, gcode0_fx ); /* Q13*Q0 -> Q14 */
             *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 2 ) );
             move32(); /* Q14 -> Q16 */
-            push_indice_fx( hBstr, IND_GAIN_CODE, index, nBits );
+            push_indice( hBstr, IND_GAIN_CODE, index, nBits );
         }
         ELSE /* nBits == 3 */
         {
@@ -1736,13 +1640,9 @@ void gain_enc_tc_fx(
             move16();
             /**gain_code *= gcode0;*/
             L_tmp = L_mult( wgain_code, gcode0_fx ); /* Q13*Q0 -> Q14 */
-#ifdef BASOP_NOGLOB
             *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 2 ) );
-#else
-            *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 2 ) );
-#endif
             move32(); /* Q14 -> Q16 */
-            push_indice_fx( hBstr, IND_GAIN_CODE, index, nBits );
+            push_indice( hBstr, IND_GAIN_CODE, index, nBits );
         }
     }
 
@@ -1815,13 +1715,9 @@ void gain_enc_tc_ivas_fx(
      *----------------------------------------------------------------*/
     g_code_fx = div_s( num, den );
 
-    i = sub( exp_num, exp_den );             /* Gain_trans in Q7 */
-    g_code_fx = i_mult2( g_code_fx, tmp16 ); /* apply sign */
-#ifdef BASOP_NOGLOB
+    i = sub( exp_num, exp_den );                              /* Gain_trans in Q7 */
+    g_code_fx = i_mult2( g_code_fx, tmp16 );                  /* apply sign */
     *gain_code_fx = L_shr_sat( L_deposit_l( g_code_fx ), i ); /* Q16 */
-#else
-    *gain_code_fx = L_shr( L_deposit_l( g_code_fx ), i );
-#endif
     move32();
 
     /*----------------------------------------------------------------*
@@ -1927,11 +1823,7 @@ void gain_enc_tc_ivas_fx(
             move16();
             /**gain_code *= gcode0;*/
             L_tmp = L_mult( wgain_code, gcode0_fx ); /* Q13*Q0 -> Q14 */
-#ifdef BASOP_NOGLOB
             *gain_code_fx = L_shl_sat( L_tmp, add( exp_gcode0, 2 ) );
-#else
-            *gain_code_fx = L_shl( L_tmp, add( exp_gcode0, 2 ) );
-#endif
             move32(); /* Q14 -> Q16 */
             push_indice( hBstr, IND_GAIN_CODE, index, nBits );
         }
@@ -2071,11 +1963,7 @@ static Word16 Find_Opt_gainQ_fx(
         L_tmp = L_mac( L_tmp, coeff[3], g_code );    /* 15 - coeff_exp + 13 - 1 */
         L_tmp = L_mac( L_tmp, coeff[4], g_pit_cod ); /* 15 - coeff_exp + 13 - 1 */
 
-#ifdef BASOP_NOGLOB
         L_tmp1 = L_sub_o( L_tmp, dist_min, &Overflow );
-#else  /* BASOP_NOGLOB */
-        L_tmp1 = L_sub( L_tmp, dist_min );
-#endif /* BASOP_NOGLOB */
         if ( L_tmp1 < 0 )
         {
             index = i;
@@ -2092,13 +1980,9 @@ static Word16 Find_Opt_gainQ_fx(
     g_code = *p++; /* selected  code gain in Q9 */
     move16();
 
-    L_tmp = L_mult( g_code, gcode0 ); /* Q9*Q0 -> Q10 */
-#ifdef BASOP_NOGLOB
+    L_tmp = L_mult( g_code, gcode0 );                 /* Q9*Q0 -> Q10 */
     L_tmp = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16 */
-#else
-    L_tmp = L_shl( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16 */
-#endif
-    *gain_code = L_tmp; /* gain of code in Q16 */
+    *gain_code = L_tmp;                               /* gain of code in Q16 */
     move16();
     return index;
 }
@@ -2169,12 +2053,6 @@ void gain_enc_lbr_fx(
     move16();
 
     /* Compute scalar product <y2[],y2[]> */
-#ifdef DEBUG
-    if ( L_subfr != L_SUBFR )
-    {
-        PMT( "Entire function needs review to accommode for L_subfr > L_SUBFR" );
-    }
-#endif
     coeff[2] = extract_h( Dot_product12( y2, y2, L_subfr, &exp ) );
     move16();
     exp_coeff[2] = add( sub( exp, 18 ), shl( Q_xn, 1 ) ); /* -18 (y2 Q9) */
@@ -2382,15 +2260,11 @@ void gain_enc_lbr_fx(
         move16();
         IF( EQ_16( nBits, 7 ) )
         {
-#ifdef IVAS_CODE
             cdbk = gp_gamma_3sfr_7b_fx;
             if ( clip_gain == 1 )
             {
                 size -= 28;
             }
-#else
-            // PMT("gp_gamma_3sfr_7b_fx is missing")
-#endif
         }
         ELSE
         {
@@ -2485,15 +2359,11 @@ void gain_enc_lbr_fx(
         move16();
         IF( EQ_16( nBits, 7 ) )
         {
-#ifdef IVAS_CODE
             cdbk = gp_gamma_4sfr_7b_fx;
             if ( clip_gain == 1 )
             {
                 size -= 25;
             }
-#else
-            // PMT("gp_gamma_4sfr_7b_fx is missing")
-#endif
         }
         ELSE
         {
@@ -2568,7 +2438,7 @@ void gain_enc_lbr_fx(
     *norm_gain_code = L_shr( Mult_32_16( *gain_code, tmp ), sub( 1, exp ) ); // Q16
     move32();
     {
-        push_indice_fx( hBstr, IND_GAIN, index, nBits );
+        push_indice( hBstr, IND_GAIN, index, nBits );
     }
     return;
 }
@@ -3292,11 +3162,7 @@ void gain_enc_amr_wb_fx(
         L_tmp = L_mac( L_tmp, coeff[3], g_code );    /* 15 - coeff_exp + 13 - 1 */
         L_tmp = L_mac( L_tmp, coeff[4], g_pit_cod ); /* 15 - coeff_exp + 13 - 1 */
 
-#ifdef BASOP_NOGLOB
         L_tmp1 = L_sub_o( L_tmp, dist_min, &Overflow );
-#else  /* BASOP_NOGLOB */
-        L_tmp1 = L_sub( L_tmp, dist_min );
-#endif /* BASOP_NOGLOB */
         /* splitting the if cost half the complexity of using IF macro */
         if ( L_tmp1 < 0 )
         {
@@ -3318,12 +3184,8 @@ void gain_enc_amr_wb_fx(
     g_code = *p++; /* selected  code gain in Q11 */
     move16();
 
-    L_tmp = L_mult( g_code, gcode0 ); /* Q11*Q0 -> Q12 */
-#ifdef BASOP_NOGLOB
+    L_tmp = L_mult( g_code, gcode0 );                          /* Q11*Q0 -> Q12 */
     L_tmp = L_shl_o( L_tmp, add( exp_gcode0, 4 ), &Overflow ); /* Q12 -> Q16 */
-#else                                                          /* BASOP_NOGLOB */
-    L_tmp = L_shl( L_tmp, add( exp_gcode0, 4 ) ); /* Q12 -> Q16 */
-#endif
 
     *gain_code = L_tmp; /* gain of code in Q16 */
     move16();
@@ -3361,7 +3223,7 @@ void gain_enc_amr_wb_fx(
     *norm_gain_code = L_shr( Mult_32_16( *gain_code, tmp ), sub( 1, exp ) ); // Q16
     move32();
 
-    push_indice_fx( hBstr, IND_GAIN, index, nBits );
+    push_indice( hBstr, IND_GAIN, index, nBits );
 
     return;
 }
diff --git a/lib_enc/gaus_enc_fx.c b/lib_enc/gaus_enc_fx.c
index 1f91a5d95c4936688f898ecefaf3d362d5259b08..2aa9a5dfff887f9e1fd502971505046bb588201e 100644
--- a/lib_enc/gaus_enc_fx.c
+++ b/lib_enc/gaus_enc_fx.c
@@ -7,7 +7,6 @@
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
 #include "rom_enc.h"     /* Static table prototypes                */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 //#include "basop_mpy.h"
@@ -91,22 +90,18 @@ Word16 gaus_encode_fx(
 
     exp_code = sub( exp_code, 18 + 6 ); /* exp: -18 (code in Q9), -6 (L_subfr = 64) */
     Ltmp = Isqrt_lc( Ltmp, &exp_code );
-    *gain_inov = extract_h( L_shl( Ltmp, sub( exp_code, 3 ) ) ); /* g_code_inov in Q12 */
+    *gain_inov = extract_h( L_shl_sat( Ltmp, sub( exp_code, 3 ) ) ); /* g_code_inov in Q12 */
 
     nb_bits = st_fx->acelp_cfg.gains_mode[tmp_idx]; /* Q0 */
     move16();
     /* low bound = -30; stepSize  = 1.71875; inv_stepSize  = 0.5818181 */
     idx = gain_enc_gaus_fx( gain_code, nb_bits, -7680, 28160, 19065 ); /* Q0 */
-    push_indice_fx( st_fx->hBstr, IND_GAIN, idx, nb_bits );
+    push_indice( st_fx->hBstr, IND_GAIN, idx, nb_bits );
 
     /*----------------------------------------------------------------*
      * Total excitation for Unvoiced coders
      *----------------------------------------------------------------*/
-#ifdef BASOP_NOGLOB
     gcode = round_fx_o( L_shl_o( *gain_code, Q_new, &Overflow ), &Overflow ); /* scaled gain_code with Qnew */
-#else                                                                         /* BASOP_NOGLOB */
-    gcode = round_fx( L_shl( *gain_code, Q_new ) ); /* scaled gain_code with Qnew */
-#endif                                                                        /* BASOP_NOGLOB */
     FOR( i = 0; i < L_SUBFR; i++ )
     {
         exc[i + i_subfr] = round_fx( L_shl( L_mult( gcode, code[i] ), 15 - 9 ) ); /* Q_new */
@@ -120,14 +115,9 @@ Word16 gaus_encode_fx(
     Ltmp = L_shl( Ltmp, add( 5, shift ) );   /* Q_new + 15 + shift */
     Ltmp = L_negate( Ltmp );
     Ltmp = L_mac( Ltmp, xn[L_SUBFR - 1], 16384 ); /* Q_new + 15 + shift */
-#ifdef BASOP_NOGLOB
-    Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* Q_new + 16 */
-    *mem_w0 = round_fx_sat( Ltmp );            /* Q_new */
+    Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );    /* Q_new + 16 */
+    *mem_w0 = round_fx_sat( Ltmp );               /* Q_new */
     move16();
-#else
-    Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-    *mem_w0 = round_fx( Ltmp );
-#endif
     init_gp_clip_fx( clip_gain ); /* reset pitch clipping parameters  */
 
     *gain_pit = 0;
@@ -209,11 +199,7 @@ Word16 gaus_encode_ivas_fx(
     /*----------------------------------------------------------------*
      * Total excitation for Unvoiced coders
      *----------------------------------------------------------------*/
-#ifdef BASOP_NOGLOB
     gcode = round_fx_o( L_shl_o( *gain_code, Q_new, &Overflow ), &Overflow ); /* scaled gain_code with Qnew */
-#else                                                                         /* BASOP_NOGLOB */
-    gcode = round_fx( L_shl( *gain_code, Q_new ) ); /* scaled gain_code with Qnew */
-#endif                                                                        /* BASOP_NOGLOB */
     FOR( i = 0; i < L_SUBFR; i++ )
     {
         exc[i + i_subfr] = round_fx( L_shl( L_mult( gcode, code[i] ), 15 - 9 ) ); /* Q_new */
@@ -227,14 +213,9 @@ Word16 gaus_encode_ivas_fx(
     Ltmp = L_shl( Ltmp, add( 5, shift ) );   /* Q_new + 15 + shift */
     Ltmp = L_negate( Ltmp );
     Ltmp = L_mac( Ltmp, xn[L_SUBFR - 1], 16384 ); /* Q_new + 15 + shift */
-#ifdef BASOP_NOGLOB
-    Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* Q_new + 16 */
-    *mem_w0 = round_fx_sat( Ltmp );            /* Q_new */
+    Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );    /* Q_new + 16 */
+    *mem_w0 = round_fx_sat( Ltmp );               /* Q_new */
     move16();
-#else
-    Ltmp = L_shl( Ltmp, sub( 1, shift ) );
-    *mem_w0 = round_fx( Ltmp );
-#endif
     init_gp_clip_fx( clip_gain ); /* reset pitch clipping parameters  */
 
     *gain_pit = 0;
@@ -327,13 +308,8 @@ void gauss2v_fx(
     {
         /* fc0 += xn[i]*xn[i]   */
         /* fc1 += xn[i]*xn[i-1] */
-#ifdef BASOP_NOGLOB
         Lc0 = L_mac_sat( Lc0, xn[i], xn[i] );     /* Q25 */
         Lc1 = L_mac_sat( Lc1, xn[i], xn[i - 1] ); /* Q25 */
-#else
-        Lc0 = L_mac( Lc0, xn[i], xn[i] );
-        Lc1 = L_mac( Lc1, xn[i], xn[i - 1] );
-#endif
     }
     /* fgxx = fc1/fc0 */
     exp_num = sub( norm_l( Lc1 ), 1 );
@@ -386,12 +362,8 @@ void gauss2v_fx(
     exp_den = norm_l( Lden );
     Den = extract_h( L_shl( Lden, exp_den ) );
 
-#ifdef BASOP_NOGLOB
     delta = shr_o( div_s( Num, Den ), sub( exp_num, exp_den ), &Overflow ); /* Q15 */
-#else                                                                       /* BASOP_NOGLOB */
-    delta = shr( div_s( Num, Den ), sub( exp_num, exp_den ) ); /* Q15 */
-#endif
-    delta = i_mult2( delta, m_sign ); /* Apply sign		Q0*/
+    delta = i_mult2( delta, m_sign );                                       /* Apply sign		Q0*/
     /* index_delta = (short)(FAC_DELTA * fdelta) */
     index_delta = shr( delta, SFAC_DELTA );
 
@@ -553,13 +525,8 @@ void gauss2v_fx(
 
             cor2_norm = norm_l( cor2 );
             eneri_norm = norm_l( eneri );
-#ifdef BASOP_NOGLOB
             cor2_mantissa = round_fx_o( L_shl_o( cor2, cor2_norm, &Overflow ), &Overflow );
             eneri_mantissa = round_fx_o( L_shl_o( eneri, eneri_norm, &Overflow ), &Overflow );
-#else
-            cor2_mantissa = round_fx( L_shl( cor2, cor2_norm ) );
-            eneri_mantissa = round_fx( L_shl( eneri, eneri_norm ) );
-#endif
             difference_norm = sub( add( cor2_norm, enerw_norm ), add( cor2w_norm, eneri_norm ) );
 
             update_best = 0;
@@ -671,8 +638,8 @@ void gauss2v_fx(
     idx = cod_2pos_fx( i, j, sign1, sign2, nvec ); /* Q0 */
     move16();
 
-    push_indice_fx( hBstr, IND_GAUS_CDBK_INDEX, idx, 2 * nb_bits + 1 );
-    push_indice_fx( hBstr, IND_TILT_FACTOR, index_delta, 3 );
+    push_indice( hBstr, IND_GAUS_CDBK_INDEX, idx, 2 * nb_bits + 1 );
+    push_indice( hBstr, IND_TILT_FACTOR, index_delta, 3 );
 
     /*----------------------------------------------------------------*
      * Find quantized gain
@@ -710,41 +677,25 @@ void gauss2v_fx(
     exp_num = sub( norm_s( enerw ), 1 );
     exp_den = norm_l( ener1 );
     Num = shl( enerw, exp_num );
-#ifdef BASOP_NOGLOB
     Den = round_fx_sat( L_shl_sat( ener1, exp_den ) );
-#else
-    Den = round_fx( L_shl( ener1, exp_den ) );
-#endif
     GainPortion2 = L_deposit_l( 0 ); /* Unexpected division by zero. Eliminate this gain contribution */
     IF( Den != 0 )                   /* Protection against division by zero */
     {
         div_result = div_s( Num, Den ); /* Q15 */
 
         /* Re-scale to compensate for normalization*/
-#ifdef BASOP_NOGLOB
         GainPortion2 = L_shr_sat( L_deposit_l( div_result ), sub( exp_num, exp_den ) );
-#else
-        GainPortion2 = L_shr( L_deposit_l( div_result ), sub( exp_num, exp_den ) );
-#endif
     }
 
-#ifdef BASOP_NOGLOB
     ener_sqrt = Isqrt( L_shl_sat( GainPortion2, 1 ) ); /* Make value a Q16 prior to division (align on power of 4) */
-#else
-    ener_sqrt = Isqrt( L_shl( GainPortion2, 1 ) ); /* Make value a Q16 prior to division (align on power of 4) */
-#endif
-    ener_sqrt = L_shr( ener_sqrt, 8 ); /* Left-shift Q23 result to make a Q15 result */
+    ener_sqrt = L_shr( ener_sqrt, 8 );                 /* Left-shift Q23 result to make a Q15 result */
 
     Portion = Mult_32_16( GainPortion1, 19661 );       /* Performs GainPortion1*.6 */
     Portion = Madd_32_16( Portion, ener_sqrt, 13107 ); /* Performs ener_sqrt*.4 */
 
     /* Gain must be output in a 32-bit variable as a Q16 */
     /* Compensate for Q_new */
-#ifdef BASOP_NOGLOB
     *gain = L_shl_o( Portion, sub( 13, Q_new ), &Overflow ); /* Q16 */
-#else
-    *gain = L_shl( Portion, sub( 13, Q_new ) );
-#endif
     move32();
 
     return;
@@ -818,13 +769,8 @@ void gauss2v_ivas_fx(
     {
         /* fc0 += xn[i]*xn[i]   */
         /* fc1 += xn[i]*xn[i-1] */
-#ifdef BASOP_NOGLOB
         Lc0 = L_mac_sat( Lc0, xn[i], xn[i] );
         Lc1 = L_mac_sat( Lc1, xn[i], xn[i - 1] );
-#else
-        Lc0 = L_mac( Lc0, xn[i], xn[i] );
-        Lc1 = L_mac( Lc1, xn[i], xn[i - 1] );
-#endif
     }
     /* fgxx = fc1/fc0 */
     exp_num = sub( norm_l( Lc1 ), 1 );
@@ -877,12 +823,8 @@ void gauss2v_ivas_fx(
     exp_den = norm_l( Lden );
     Den = extract_h( L_shl( Lden, exp_den ) );
 
-#ifdef BASOP_NOGLOB
     delta = shr_o( div_s( Num, Den ), sub( exp_num, exp_den ), &Overflow ); /* Q15 */
-#else                                                                       /* BASOP_NOGLOB */
-    delta = shr( div_s( Num, Den ), sub( exp_num, exp_den ) ); /* Q15 */
-#endif
-    delta = i_mult2( delta, m_sign ); /* Apply sign */
+    delta = i_mult2( delta, m_sign );                                       /* Apply sign */
     /* index_delta = (short)(FAC_DELTA * fdelta) */
     index_delta = shr( delta, SFAC_DELTA );
 
@@ -1037,21 +979,15 @@ void gauss2v_ivas_fx(
             /* eneri = round_fx(ener[i]) + round_fx(ener[j]) + 2*round_fx(dotprod) */
             /* Use ScalingShift to stay aligned with ener[] */
             eneri = L_shl( dotprod, 1 ); /* One left shift added for factor of 2 */
-            eneri = L_add( ener[i], eneri );
-            eneri = L_add( ener[j], eneri ); /* Q31 */
-
+            eneri = L_add_sat( ener[i], eneri );
+            eneri = L_add_sat( ener[j], eneri ); /* Q31 */
             lo1 = L_Extract_lc( cor32, &hi1 );
             cor2 = Sad_32( 0, hi1, lo1 ); /* Square + Add */
 
             cor2_norm = norm_l( cor2 );
             eneri_norm = norm_l( eneri );
-#ifdef BASOP_NOGLOB
             cor2_mantissa = round_fx_o( L_shl_o( cor2, cor2_norm, &Overflow ), &Overflow );
             eneri_mantissa = round_fx_o( L_shl_o( eneri, eneri_norm, &Overflow ), &Overflow );
-#else
-            cor2_mantissa = round_fx( L_shl( cor2, cor2_norm ) );
-            eneri_mantissa = round_fx( L_shl( eneri, eneri_norm ) );
-#endif
             difference_norm = sub( add( cor2_norm, enerw_norm ), add( cor2w_norm, eneri_norm ) );
 
             update_best = 0;
@@ -1202,41 +1138,25 @@ void gauss2v_ivas_fx(
     exp_num = sub( norm_s( enerw ), 1 );
     exp_den = norm_l( ener1 );
     Num = shl( enerw, exp_num );
-#ifdef BASOP_NOGLOB
     Den = round_fx_sat( L_shl_sat( ener1, exp_den ) );
-#else
-    Den = round_fx( L_shl( ener1, exp_den ) );
-#endif
     GainPortion2 = L_deposit_l( 0 ); /* Unexpected division by zero. Eliminate this gain contribution */
     IF( Den != 0 )                   /* Protection against division by zero */
     {
         div_result = div_s( Num, Den ); /* Q15 */
 
         /* Re-scale to compensate for normalization*/
-#ifdef BASOP_NOGLOB
         GainPortion2 = L_shr_sat( L_deposit_l( div_result ), sub( exp_num, exp_den ) );
-#else
-        GainPortion2 = L_shr( L_deposit_l( div_result ), sub( exp_num, exp_den ) );
-#endif
     }
 
-#ifdef BASOP_NOGLOB
     ener_sqrt = Isqrt( L_shl_sat( GainPortion2, 1 ) ); /* Make value a Q16 prior to division (align on power of 4) */
-#else
-    ener_sqrt = Isqrt( L_shl( GainPortion2, 1 ) ); /* Make value a Q16 prior to division (align on power of 4) */
-#endif
-    ener_sqrt = L_shr( ener_sqrt, 8 ); /* Left-shift Q23 result to make a Q15 result */
+    ener_sqrt = L_shr( ener_sqrt, 8 );                 /* Left-shift Q23 result to make a Q15 result */
 
     Portion = Mult_32_16( GainPortion1, 19661 );       /* Performs GainPortion1*.6 */
     Portion = Madd_32_16( Portion, ener_sqrt, 13107 ); /* Performs ener_sqrt*.4 */
 
     /* Gain must be output in a 32-bit variable as a Q16 */
     /* Compensate for Q_new */
-#ifdef BASOP_NOGLOB
     *gain = L_shl_o( Portion, sub( 13, Q_new ), &Overflow );
-#else
-    *gain = L_shl( Portion, sub( 13, Q_new ) );
-#endif
     move32();
 
     return;
diff --git a/lib_enc/gp_clip_fx.c b/lib_enc/gp_clip_fx.c
index 4ca86a09cbd191637cf4340ec52a0a8bb5dd75d2..d7614473b32a086f9d0171d2ae510f9d5f941316 100644
--- a/lib_enc/gp_clip_fx.c
+++ b/lib_enc/gp_clip_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -142,18 +142,10 @@ Word16 gp_clip_fx(
         }
     }
 
-#ifdef BASOP_NOGLOB
     ener = L_mac_o( 1L, xn[0], xn[0], &Overflow );
-#else
-    ener = L_mac( 1L, xn[0], xn[0] );
-#endif
     FOR( i = 1; i < L_SUBFR; i++ )
     {
-#ifdef BASOP_NOGLOB
         ener = L_mac_o( ener, xn[i], xn[i], &Overflow );
-#else /* BASOP_NOGLOB */
-        ener = L_mac( ener, xn[i], xn[i] );
-#endif
     }
 
     /* ener = 10.0f*(float)log10(ener) */
@@ -363,11 +355,7 @@ Word16 Mode2_gp_clip_fx(
 
     FOR( i = 0; i < L_subfr; i++ )
     {
-#ifdef BASOP_NOGLOB
         wener = L_mac0_o( wener, xn[i], xn[i], &Overflow );
-#else
-        wener = L_mac0( wener, xn[i], xn[i] );
-#endif
     }
 
     /*wener = 10.0f*(float)log10(wener);*/
diff --git a/lib_enc/gs_enc.c b/lib_enc/gs_enc.c
deleted file mode 100644
index 4468194bed6aad608dafe247b2c6535e8bbd4593..0000000000000000000000000000000000000000
--- a/lib_enc/gs_enc.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*-------------------------------------------------------------------*
- * Local function prototypes
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * GSC_enc_init()
- *
- * Initialize GSC encoder state structure
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/gs_enc_fx.c b/lib_enc/gs_enc_fx.c
index bc2e2a09108b62e5bfc391af6cc99c5f14dd5ffe..7bf52970d7ff5f02edcaa6417a2b8b3d89cdf2c4 100644
--- a/lib_enc/gs_enc_fx.c
+++ b/lib_enc/gs_enc_fx.c
@@ -6,8 +6,6 @@
 #include "cnst.h"
 #include "rom_com_fx.h"
 #include "rom_com.h"
-//#include "prot_fx.h"
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -25,8 +23,8 @@ static Word16 edyn_fx( const Word16 *vec, const Word16 lvec, Word16 Qnew );
 void encod_audio_fx(
     Encoder_State *st_fx,              /* i/o: State structure                                  	*/
     const Word16 speech[],             /* i  : input speech                                Q_new   */
-    const Word16 Aw[],                 /* i  : weighted A(z) unquantized for subframes             */
-    const Word16 Aq[],                 /* i  : 12k8 Lp coefficient                                 */
+    const Word16 Aw[],                 /* i  : weighted A(z) unquantized for subframes       Q12      */
+    const Word16 Aq[],                 /* i  : 12k8 Lp coefficient                           Q12      */
     const Word16 *res,                 /* i  : residual signal                             Q_new   */
     Word16 *synth,                     /* i/o: core synthesis                              Q-1     */
     Word16 *exc,                       /* i/o: current non-enhanced excitation             Q_new   */
@@ -34,10 +32,10 @@ void encod_audio_fx(
     Word16 *voice_factors,             /* o  : voicing factors                             Q15   	*/
     Word16 *bwe_exc,                   /* o  : excitation for SWB TBE						Q0		*/
     const Word16 attack_flag,          /* i  : Flag that point to an attack coded with AC mode (GSC)	*/
-    Word16 *lsf_new,                   /* i  : current frame ISF vector 							*/
-    Word16 *tmp_noise,                 /* o  : noise energy   */
-    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag             */
-    const Word16 tdm_Pri_pitch_buf[],  /* i  : primary channel pitch buffer                 */
+    Word16 *lsf_new,                   /* i  : current frame ISF vector 					Qx2.56		*/
+    Word16 *tmp_noise,                 /* o  : noise energy   Q2*/
+    const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag             Q0*/
+    const Word16 tdm_Pri_pitch_buf[],  /* i  : primary channel pitch buffer                 Q6*/
     Word16 Q_new,
     Word16 shift )
 {
@@ -45,9 +43,11 @@ void encod_audio_fx(
     Word16 i, i_subfr, nb_subfr, last_pit_bin;
     Word16 T0_tmp, T0_frac_tmp, nb_subfr_flag;
     Word16 tmp_nb_bits_tot = 0;
+    move16();
     Word16 Es_pred;
     Word16 dct_res[L_FRAME16k], dct_epit[L_FRAME16k];
     Word16 m_mean = 0;
+    move16();
     Word16 saved_bit_pos;
     Word16 exc_wo_nf[L_FRAME16k];
     Word32 Lm_mean;
@@ -67,7 +67,7 @@ void encod_audio_fx(
     move16();
     T0_frac_tmp = 0;
     move16();
-    Copy( hLPDmem->mem_syn, hGSCEnc->mem_syn_tmp_fx, M );
+    Copy( hLPDmem->mem_syn, hGSCEnc->mem_syn_tmp_fx, M ); /* hLPDmem->q_mem_syn */
     hGSCEnc->mem_w0_tmp_fx = hLPDmem->mem_w0;
     move16();
     Es_pred = 0;
@@ -78,20 +78,14 @@ void encod_audio_fx(
      * Encode GSC attack flag (used to reduce possible pre-echo)
      * Encode GSC SWB speech flag
      *---------------------------------------------------------------*/
-#ifdef GSC_IVAS // TVB -->>>>>>
-    test();
-    if ( GT_16( st_fx->element_mode, EVS_MONO ) && st_fx->idchan == 0 )
-    {
-        push_indice_fx( hBstr, IND_GSC_IVAS_SP, st_fx->GSC_IVAS_mode, 2 );
-    }
-#endif
+
     IF( attack_flag > 0 )
     {
-        push_indice_fx( hBstr, IND_GSC_ATTACK, 1, 1 );
+        push_indice( hBstr, IND_GSC_ATTACK, 1, 1 );
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_GSC_ATTACK, 0, 1 );
+        push_indice( hBstr, IND_GSC_ATTACK, 0, 1 );
     }
 
 
@@ -101,10 +95,11 @@ void encod_audio_fx(
     test();
     test();
     test();
+    test();
     IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( NE_16( st_fx->coder_type, INACTIVE ) && ( ( EQ_16( st_fx->element_mode, EVS_MONO ) && GE_32( st_fx->total_brate, ACELP_13k20 ) ) ||
                                                                                         ( GT_16( st_fx->element_mode, EVS_MONO ) && GT_32( st_fx->total_brate, MIN_BRATE_GSC_NOISY_FLAG ) && GE_16( st_fx->bwidth, SWB ) && !st_fx->flag_ACELP16k ) ) ) )
     {
-        push_indice_fx( hBstr, IND_GSC_SWB_SPEECH, st_fx->GSC_noisy_speech, 1 );
+        push_indice( hBstr, IND_GSC_SWB_SPEECH, st_fx->GSC_noisy_speech, 1 );
     }
     /*---------------------------------------------------------------*
      * Find and encode the number of subframes
@@ -115,7 +110,7 @@ void encod_audio_fx(
         FOR( i = 0; i < 5; i++ )
         {
             test();
-            if ( GT_16( abs_s( hSpMusClas->gsc_lt_diff_etot_fx[MAX_LT - i - 1] ), 1536 ) && EQ_16( hGSCEnc->cor_strong_limit, 1 ) )
+            if ( GT_16( abs_s( hSpMusClas->gsc_lt_diff_etot_fx[MAX_LT - i - 1] ), 1536 /*6.0 in Q8*/ ) && EQ_16( hGSCEnc->cor_strong_limit, 1 ) )
             {
                 hGSCEnc->cor_strong_limit = 0;
                 move16();
@@ -123,6 +118,9 @@ void encod_audio_fx(
         }
     }
     test();
+    test();
+    test();
+    test();
     IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( st_fx->GSC_noisy_speech && st_fx->GSC_IVAS_mode == 0 ) )
     {
         nb_subfr = NB_SUBFR;
@@ -168,21 +166,25 @@ void encod_audio_fx(
             nb_subfr_flag = 1;
             move16();
         }
+
+        test();
+        test();
+        test();
         IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && ( GT_16( hSpMusClas->mold_corr_fx, 26214 ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) && NE_16( st_fx->coder_type, INACTIVE ) ) )
         {
             nb_subfr = shl( nb_subfr, 1 );
-            nb_subfr_flag |= 0x2;
+            nb_subfr_flag = s_or( nb_subfr_flag, 0x2 );
             logic16();
         }
 
         IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) )
         {
-            push_indice_fx( hBstr, IND_HF_NOISE, nb_subfr_flag, 2 );
+            push_indice( hBstr, IND_HF_NOISE, nb_subfr_flag, 2 );
         }
         ELSE IF( GE_32( st_fx->core_brate, ACELP_9k60 ) )
         {
             /* nb_subfr_flag can only have the value 0 or 1 */
-            push_indice_fx( hBstr, IND_HF_NOISE, nb_subfr_flag, 1 );
+            push_indice( hBstr, IND_HF_NOISE, nb_subfr_flag, 1 );
         }
     }
     test();
@@ -196,14 +198,22 @@ void encod_audio_fx(
      * Compute adaptive (pitch) excitation contribution
      *---------------------------------------------------------------*/
 
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
     test();
     IF( !( st_fx->GSC_IVAS_mode > 0 && EQ_16( st_fx->L_frame, i_mult( nb_subfr, 2 * L_SUBFR ) ) && LT_16( st_fx->GSC_IVAS_mode, 3 ) ) &&
         ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || st_fx->GSC_noisy_speech ) &&
           ( ( EQ_16( nb_subfr, NB_SUBFR ) && EQ_16( st_fx->L_frame, L_FRAME ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && EQ_16( st_fx->L_frame, L_FRAME16k ) ) ) ) )
     {
-        IF( GT_16( st_fx->element_mode, EVS_MONO ) )
+        IF( ( st_fx->element_mode > EVS_MONO ) )
         {
             nb_bits = 5;
+            move16();
         }
         ELSE
         {
@@ -211,7 +221,7 @@ void encod_audio_fx(
             move16();
         }
         Es_pred_enc_fx( &Es_pred, &indice, st_fx->L_frame, res, st_fx->voicing_fx, nb_bits, 0, Q_new );
-        push_indice_fx( hBstr, IND_ES_PRED, indice, nb_bits );
+        push_indice( hBstr, IND_ES_PRED, indice, nb_bits );
     }
 
     enc_pit_exc_fx( st_fx, speech, Aw, Aq, Es_pred, res, synth, exc, &T0_tmp,
@@ -237,17 +247,20 @@ void encod_audio_fx(
     {
         /*st_fx->mid_dyn_fx = 0.2f * st_fx->mid_dyn_fx + 0.8f * m_mean;*/
         hGSCEnc->mid_dyn_fx = round_fx( L_mac( L_mult( 26214, m_mean ), 6554, hGSCEnc->mid_dyn_fx ) ); /*Q7*/
+        move16();
     }
     ELSE
     {
         /*st_fx->mid_dyn_fx = 0.6f * st_fx->mid_dyn_fx + 0.4f * m_mean;*/
         hGSCEnc->mid_dyn_fx = round_fx( L_mac( L_mult( 13107, m_mean ), 19661, hGSCEnc->mid_dyn_fx ) ); /*Q7*/
+        move16();
     }
     IF( NE_16( st_fx->coder_type, INACTIVE ) )
     {
         hGSCEnc->noise_lev = sub( ( NOISE_LEVEL_SP3 + 1 ), usquant_fx( hGSCEnc->mid_dyn_fx, &m_mean, MIN_DYNAMIC_FX, shr( GSF_NF_DELTA_FX, 1 ), GSC_NF_STEPS ) );
-
+        move16();
         hGSCEnc->noise_lev = s_min( hGSCEnc->noise_lev, NOISE_LEVEL_SP3 );
+        move16();
     }
 
     hGSCEnc->past_dyn_dec = hGSCEnc->noise_lev;
@@ -255,6 +268,7 @@ void encod_audio_fx(
     IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) )
     {
         hGSCEnc->noise_lev = NOISE_LEVEL_SP2;
+        move16();
         IF( EQ_16( st_fx->GSC_IVAS_mode, 3 ) ) /* Music like */
         {
             hGSCEnc->noise_lev = NOISE_LEVEL_SP0;
@@ -269,16 +283,18 @@ void encod_audio_fx(
     ELSE IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
     {
         hGSCEnc->noise_lev = s_max( hGSCEnc->noise_lev, NOISE_LEVEL_SP2 );
-        push_indice_fx( hBstr, IND_NOISE_LEVEL, sub( hGSCEnc->noise_lev, NOISE_LEVEL_SP2 ), 2 );
+        move16();
+        push_indice( hBstr, IND_NOISE_LEVEL, sub( hGSCEnc->noise_lev, NOISE_LEVEL_SP2 ), 2 );
     }
     ELSE IF( st_fx->GSC_noisy_speech )
     {
         hGSCEnc->noise_lev = NOISE_LEVEL_SP3;
         move16();
+        move16();
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_NOISE_LEVEL, sub( hGSCEnc->noise_lev, NOISE_LEVEL_SP0 ), 3 );
+        push_indice( hBstr, IND_NOISE_LEVEL, sub( hGSCEnc->noise_lev, NOISE_LEVEL_SP0 ), 3 );
     }
 
     /*---------------------------------------------------------------*
@@ -375,8 +391,8 @@ void encod_audio_fx(
 void encod_audio_ivas_fx(
     Encoder_State *st_fx,              /* i/o: State structure                                  	*/
     const Word16 speech[],             /* i  : input speech                                Q_new   */
-    const Word16 Aw[],                 /* i  : weighted A(z) unquantized for subframes             */
-    const Word16 Aq[],                 /* i  : 12k8 Lp coefficient                                 */
+    const Word16 Aw[],                 /* i  : weighted A(z) unquantized for subframes      Q12       */
+    const Word16 Aq[],                 /* i  : 12k8 Lp coefficient                           Q12      */
     const Word16 *res,                 /* i  : residual signal                             Q_new   */
     Word16 *synth,                     /* i/o: core synthesis                              Q-1     */
     Word16 *exc,                       /* i/o: current non-enhanced excitation             Q_new   */
@@ -384,8 +400,8 @@ void encod_audio_ivas_fx(
     Word16 *voice_factors,             /* o  : voicing factors                             Q15   	*/
     Word16 *bwe_exc,                   /* o  : excitation for SWB TBE						Q0		*/
     const Word16 attack_flag,          /* i  : Flag that point to an attack coded with AC mode (GSC)	*/
-    Word16 *lsf_new,                   /* i  : current frame ISF vector 							*/
-    Word16 *tmp_noise,                 /* o  : noise energy   */
+    Word16 *lsf_new,                   /* i  : current frame ISF vector 						Qx2.56	*/
+    Word16 *tmp_noise,                 /* o  : noise energy   Q8*/
     const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag             */
     const Word16 tdm_Pri_pitch_buf[],  /* i  : primary channel pitch buffer                 */
     Word16 Q_new,
@@ -417,8 +433,8 @@ void encod_audio_ivas_fx(
     move16();
     T0_frac_tmp = 0;
     move16();
-    Copy( hLPDmem->mem_syn, hGSCEnc->mem_syn_tmp_fx, M );
-    hGSCEnc->mem_w0_tmp_fx = hLPDmem->mem_w0;
+    Copy_Scale_sig( hLPDmem->mem_syn, hGSCEnc->mem_syn_tmp_fx, M, sub( sub( Q_new, 1 ), hLPDmem->q_mem_syn ) );
+    Copy_Scale_sig( &hLPDmem->mem_w0, &hGSCEnc->mem_w0_tmp_fx, 1, sub( sub( Q_new, 1 ), hLPDmem->q_mem_syn ) );
     move16();
     Es_pred = 0;
     move16();
@@ -430,7 +446,7 @@ void encod_audio_ivas_fx(
      *---------------------------------------------------------------*/
 
     test();
-    if ( GT_16( st_fx->element_mode, EVS_MONO ) && st_fx->idchan == 0 )
+    if ( ( st_fx->element_mode > EVS_MONO ) && st_fx->idchan == 0 )
     {
         push_indice( hBstr, IND_GSC_IVAS_SP, st_fx->GSC_IVAS_mode, 2 );
     }
@@ -451,6 +467,7 @@ void encod_audio_ivas_fx(
     test();
     test();
     test();
+    test();
     IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( NE_16( st_fx->coder_type, INACTIVE ) && ( ( EQ_16( st_fx->element_mode, EVS_MONO ) && GE_32( st_fx->total_brate, ACELP_13k20 ) ) ||
                                                                                         ( GT_16( st_fx->element_mode, EVS_MONO ) && GT_32( st_fx->total_brate, MIN_BRATE_GSC_NOISY_FLAG ) && GE_16( st_fx->bwidth, SWB ) && !st_fx->flag_ACELP16k ) ) ) )
     {
@@ -473,6 +490,9 @@ void encod_audio_ivas_fx(
         }
     }
     test();
+    test();
+    test();
+    test();
     IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) || ( st_fx->GSC_noisy_speech && st_fx->GSC_IVAS_mode == 0 ) )
     {
         nb_subfr = NB_SUBFR;
@@ -518,6 +538,10 @@ void encod_audio_ivas_fx(
             nb_subfr_flag = 1;
             move16();
         }
+
+        test();
+        test();
+        test();
         IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && ( GT_16( hSpMusClas->mold_corr_fx, 26214 ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) && NE_16( st_fx->coder_type, INACTIVE ) ) )
         {
             nb_subfr = shl( nb_subfr, 1 );
@@ -525,6 +549,7 @@ void encod_audio_ivas_fx(
             logic16();
         }
 
+        test();
         IF( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, MIN_RATE_4SBFR ) )
         {
             push_indice( hBstr, IND_HF_NOISE, nb_subfr_flag, 2 );
@@ -546,14 +571,22 @@ void encod_audio_ivas_fx(
      * Compute adaptive (pitch) excitation contribution
      *---------------------------------------------------------------*/
 
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
     test();
     IF( !( st_fx->GSC_IVAS_mode > 0 && EQ_16( st_fx->L_frame, i_mult( nb_subfr, 2 * L_SUBFR ) ) && LT_16( st_fx->GSC_IVAS_mode, 3 ) ) &&
         ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || st_fx->GSC_noisy_speech ) &&
           ( ( EQ_16( nb_subfr, NB_SUBFR ) && EQ_16( st_fx->L_frame, L_FRAME ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && EQ_16( st_fx->L_frame, L_FRAME16k ) ) ) ) )
     {
-        IF( GT_16( st_fx->element_mode, EVS_MONO ) )
+        IF( ( st_fx->element_mode > EVS_MONO ) )
         {
             nb_bits = 5;
+            move16();
         }
         ELSE
         {
@@ -587,17 +620,20 @@ void encod_audio_ivas_fx(
     {
         /*st_fx->mid_dyn_fx = 0.2f * st_fx->mid_dyn_fx + 0.8f * m_mean;*/
         hGSCEnc->mid_dyn_fx = round_fx( L_mac( L_mult( 26214, m_mean ), 6554, hGSCEnc->mid_dyn_fx ) ); /*Q7*/
+        move16();
     }
     ELSE
     {
         /*st_fx->mid_dyn_fx = 0.6f * st_fx->mid_dyn_fx + 0.4f * m_mean;*/
         hGSCEnc->mid_dyn_fx = round_fx( L_mac( L_mult( 13107, m_mean ), 19661, hGSCEnc->mid_dyn_fx ) ); /*Q7*/
+        move16();
     }
     IF( NE_16( st_fx->coder_type, INACTIVE ) )
     {
         hGSCEnc->noise_lev = sub( ( NOISE_LEVEL_SP3 + 1 ), usquant_fx( hGSCEnc->mid_dyn_fx, &m_mean, MIN_DYNAMIC_FX, shr( GSF_NF_DELTA_FX, 1 ), GSC_NF_STEPS ) );
-
+        move16();
         hGSCEnc->noise_lev = s_min( hGSCEnc->noise_lev, NOISE_LEVEL_SP3 );
+        move16();
     }
 
     hGSCEnc->past_dyn_dec = hGSCEnc->noise_lev;
@@ -605,6 +641,7 @@ void encod_audio_ivas_fx(
     IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) )
     {
         hGSCEnc->noise_lev = NOISE_LEVEL_SP2;
+        move16();
         IF( EQ_16( st_fx->GSC_IVAS_mode, 3 ) ) /* Music like */
         {
             hGSCEnc->noise_lev = NOISE_LEVEL_SP0;
@@ -679,7 +716,11 @@ void encod_audio_ivas_fx(
      *--------------------------------------------------------------------------------------*/
 
     edct_16fx( dct_epit, exc, st_fx->L_frame, 7, st_fx->element_mode );
+    Scale_sig( exc, st_fx->L_frame, sub( Q_new, Q_exc ) );
     edct_16fx( exc_wo_nf, exc_wo_nf, st_fx->L_frame, 7, st_fx->element_mode );
+    Scale_sig( exc_wo_nf, st_fx->L_frame, sub( Q_new, Q_exc ) );
+    Q_exc = Q_new;
+    move16();
     /*--------------------------------------------------------------------------------------*
      * Remove potential pre-echo in case an onset has been detected
      *--------------------------------------------------------------------------------------*/
@@ -706,7 +747,7 @@ void encod_audio_ivas_fx(
      * Synthesis
      *--------------------------------------------------------------------------------------*/
 
-    p_Aq = Aq;
+    p_Aq = Aq; /* Q12 */
     FOR( i_subfr = 0; i_subfr < st_fx->L_frame; i_subfr += L_SUBFR )
     {
         Syn_filt_s( 1, p_Aq, M, &exc_wo_nf[i_subfr], &synth[i_subfr], L_SUBFR, hLPDmem->mem_syn, 1 );
@@ -716,10 +757,10 @@ void encod_audio_ivas_fx(
     /*--------------------------------------------------------------------------------------*
      * Updates
      *--------------------------------------------------------------------------------------*/
-
-    hLPDmem->mem_w0 = hGSCEnc->mem_w0_tmp_fx; /*_DIFF_FLOAT_FIX_  The way it is written in the original fix point is that at this point mem_w0 falls back to its original value (before enc_pit_exc, seems not the case in float */
+    Copy_Scale_sig( &hGSCEnc->mem_w0_tmp_fx, &hLPDmem->mem_w0, 1, sub( hLPDmem->q_mem_syn, sub( Q_new, 1 ) ) );
+    /*_DIFF_FLOAT_FIX_  The way it is written in the original fix point is that at this point mem_w0 falls back to its original value (before enc_pit_exc, seems not the case in float */
     move16();
-    Copy( exc_wo_nf, exc, st_fx->L_frame );
+    Copy( exc_wo_nf, exc, st_fx->L_frame ); /* Q_new */
 
     return;
 }
@@ -751,14 +792,14 @@ void encod_audio_ivas_fx(
 
 void gsc_enc_fx(
     Encoder_State *st_fx, /* i/o: State structure                               */
-    Word16 res_dct_in[],  /* i  : dct of residual signal                        */
-    Word16 exc_dct_in[],  /* i/o: dct of pitch-only excitation / total excitation */
+    Word16 res_dct_in[],  /* i  : dct of residual signal                        Q_exc*/
+    Word16 exc_dct_in[],  /* i/o: dct of pitch-only excitation / total excitation Q_exc*/
     const Word16 Diff_len,
     const Word16 bits_used,
     const Word16 nb_subfr,
-    Word16 *lsf_new,   /* i  : ISFs at the end of the frame                  */
-    Word16 *exc_wo_nf, /* o  : excitation (in f domain) without noisefill    */
-    Word16 *tmp_noise, /* o  : noise energy                                  */
+    Word16 *lsf_new,   /* i  : ISFs at the end of the frame                  Qx2.56*/
+    Word16 *exc_wo_nf, /* o  : excitation (in f domain) without noisefill    Q_exc*/
+    Word16 *tmp_noise, /* o  : noise energy                                  Q2*/
     Word16 Q_exc )
 {
     Word16 y2_filt[L_FRAME16k];
@@ -781,10 +822,6 @@ void gsc_enc_fx(
     Word16 imaxpulse_fx[NB_SFM];
     Word16 Q_tmp;
     Word16 seed_init;
-#ifdef ADD_LRTD
-    Word16 max_eq_val;
-    Word32 max_eq;
-#endif
     GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
 
@@ -796,6 +833,7 @@ void gsc_enc_fx(
      *--------------------------------------------------------------------------------------*/
 
     bit = bits_used;
+    move16();
     test();
     test();
     test();
@@ -843,10 +881,14 @@ void gsc_enc_fx(
     {
         IF( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) )
         {
-            break;
+            BREAK;
         }
         i++;
     }
+
+    test();
+    test();
+    test();
     if ( GT_16( st_fx->element_mode, EVS_MONO ) && EQ_16( st_fx->coder_type, AUDIO ) &&
          LE_32( st_fx->core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation should be mapped to 8 kb/s instead of 9.6 kb/s in this case */
     {
@@ -856,6 +898,7 @@ void gsc_enc_fx(
     mean_gain = gsc_gainQ_fx( hBstr, /*st_fX->element_mode, st_fx->idchan,IVAS_CODE*/ Ener_per_bd_iQ, Ener_per_bd_iQ, brate_intermed_tbl[i], st_fx->coder_type, st_fx->bwidth /*, st_fx->L_frame, st_fx->tdm_LRTD_flag, st_fx->core_brate*/ );
 
     *tmp_noise = mult_r( 320, mean_gain ); /*10 in Q5  lp_gainc in Q3 */
+    move16();
 
     /*--------------------------------------------------------------------------------------*
      * Frequency encoder
@@ -875,14 +918,14 @@ void gsc_enc_fx(
     {
         tmp = pvq_core_enc_fx( hBstr, concat_in, concat_out, &Q_tmp, bit, nb_subbands, gsc_sfm_start, gsc_sfm_end,
                                gsc_sfm_size, bits_per_bands, NULL, inpulses_fx, imaxpulse_fx, ACELP_CORE );
-        Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) );
+        Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */
         bit = sub( bit, tmp );
     }
     /* write unused bits */
     WHILE( bit > 0 )
     {
         i = s_min( bit, 16 );
-        push_indice_fx( hBstr, IND_UNUSED, 0, i );
+        push_indice( hBstr, IND_UNUSED, 0, i );
         bit = sub( bit, i );
     }
     /* Reorder Q bands */
@@ -892,18 +935,6 @@ void gsc_enc_fx(
     move16();
     set16_fx( bitallocation_band, 0, MBANDS_GN_BITALLOC16k );
 
-#ifdef ADD_LRTD
-    max_eq = 0;
-    max_eq_val = 1.0f;
-
-    IF( ( ( ( LT_32( st_fx->core_brate, ACELP_7k20 ) && EQ_16( st_fx->GSC_noisy_speech, 1 ) ) || LT_32( st_fx->core_brate, 6000 ) ) && LE_16( st_fx->coder_type, UNVOICED ) ) || GE_16( st_fx->GSC_IVAS_mode, 1 ) )
-    {
-        j = emaximum( concat_out, nb_subbands * 16, &max_eq );
-        max_eq = max_eq_val / ( fabsf( concat_out[j] ) + 0.01f );
-        max_eq = min( max_eq_val, max_eq );
-    }
-#endif
-
     FOR( j = 0; j < nb_subbands; j++ )
     {
         Copy( concat_out + j * 16, exc_diffQ + max_ener_band[j] * 16, 16 ); /*Q12*/
@@ -959,26 +990,7 @@ void gsc_enc_fx(
      * Find x pulses between 1.6-3.2kHz to code in the spectrum of the residual signal
      * Gain is based on the inter-correlation gain between the pulses found and residual signal
      *--------------------------------------------------------------------------------------*/
-#ifdef ADD_LRTD
-    test();
-    test();
-    test();
-    IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) && EQ_16( st_fx->GSC_noisy_speech, 1 ) )
-    {
-        FOR( i = 64; i < st->L_frame; i++ )
-        {
-            exc_diffQ[i] *= max_eq;
-        }
-    }
-    ELSE IF( LT_32( st_fx->core_brate, ACELP_7k20 ) && EQ_16( st_fx->GSC_noisy_speech, 1 ) && LE_16( st_fx->coder_type, UNVOICED ) )
-    {
-        FOR( i = 0; i < L_FRAME; i++ )
-        {
-            exc_diffQ[i] *= max_eq;
-        }
-    }
-    else
-#endif
+
     {
         freq_dnw_scaling_fx( hGSCEnc->cor_strong_limit, st_fx->coder_type, hGSCEnc->noise_lev, st_fx->core_brate, exc_diffQ, Q_PVQ_OUT, st_fx->L_frame );
     }
@@ -1007,11 +1019,11 @@ void gsc_enc_ivas_fx(
     const Word16 Diff_len,                                           /* i  : Lenght of the difference signal (before pure spectral)*/
     const Word16 bits_used,                                          /* i  : Number of bit used before frequency Q                 */
     const Word16 nb_subfr,                                           /* i  : Number of subframe considered                         */
-    const Word16 *lsf_new_fx,
+    const Word16 *lsf_new_fx,                                        /* Qx2.56 */
     /* i  : ISFs at the end of the frame                          */ // Q15
     Word16 *exc_wo_nf_fx,
     /* o  : excitation (in f domain) without noisefill            */ // Q_exc
-    Word16 *tmp_noise_fx,                                            /* o  : long-term noise energy                                */
+    Word16 *tmp_noise_fx,                                            /* o  : long-term noise energy                                Q8*/
     Word16 *Q_exc )
 {
     Word16 i;
@@ -1064,7 +1076,7 @@ void gsc_enc_ivas_fx(
      * (non valuable temporal content present in exc_dct_in is already zeroed)
      *--------------------------------------------------------------------------------------*/
 
-    v_sub_16( res_dct_in_fx, exc_dct_in_fx, exc_diff_fx, st->L_frame );
+    v_sub_16( res_dct_in_fx, exc_dct_in_fx, exc_diff_fx, st->L_frame ); /* Q_exc */
     exc_diff_fx[0] = 0;
     move16();
 
@@ -1097,18 +1109,18 @@ void gsc_enc_ivas_fx(
     {
         IF( LE_32( st->core_brate, brate_intermed_tbl[i] ) )
         {
-            break;
+            BREAK;
         }
-        i = add( i, 1 );
+        i++;
     }
 
     test();
     test();
     test();
-    IF( st->element_mode > EVS_MONO && EQ_16( st->coder_type, AUDIO ) &&
-        LE_32( st->core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation should be mapped to 8 kb/s instead of 9.6 kb/s in this case */
+    if ( st->element_mode > EVS_MONO && EQ_16( st->coder_type, AUDIO ) &&
+         LE_32( st->core_brate, STEREO_GSC_BIT_RATE_ALLOC ) && EQ_32( brate_intermed_tbl[i], ACELP_9k60 ) ) /* Bit allocation should be mapped to 8 kb/s instead of 9.6 kb/s in this case */
     {
-        i = sub( i, 1 );
+        i--;
     }
 
     mean_gain_fx = gsc_gainQ_ivas_fx( hBstr, st->element_mode, st->idchan, Ener_per_bd_iQ_fx, Ener_per_bd_iQ_fx, brate_intermed_tbl[i], st->coder_type, st->bwidth, st->L_frame, st->tdm_LRTD_flag, st->core_brate );
@@ -1162,18 +1174,18 @@ void gsc_enc_ivas_fx(
         j = emaximum_fx( Q12, concat_out_fx, shl( nb_subbands, 4 ), &L_tmp );
         IF( LE_16( add( abs_s( concat_out_fx[j] ), 41 /* 0.01f in Q12 */ ), ONE_IN_Q12 ) )
         {
-            max_eq = 32767;
+            max_eq = 32767; /* Q15 */
             move16();
         }
         ELSE
         {
-            max_eq = div_s( ONE_IN_Q12, add( abs_s( concat_out_fx[j] ), 41 /* 0.01f in Q12 */ ) );
+            max_eq = div_s( ONE_IN_Q12, add( abs_s( concat_out_fx[j] ), 41 /* 0.01f in Q12 */ ) ); /* Q15 */
         }
     }
 
     FOR( j = 0; j < nb_subbands; j++ )
     {
-        Copy( concat_out_fx + i_mult( j, 16 ), exc_diffQ_fx + i_mult( max_ener_band[j], 16 ), 16 );
+        Copy( concat_out_fx + i_mult( j, 16 ), exc_diffQ_fx + i_mult( max_ener_band[j], 16 ), 16 ); /* Q12 */
 
         IF( GT_16( max_ener_band[j], last_bin ) )
         {
@@ -1242,7 +1254,7 @@ void gsc_enc_ivas_fx(
     {
         FOR( i = 64; i < st->L_frame; i++ )
         {
-            exc_diffQ_fx[i] = mult( exc_diffQ_fx[i], max_eq );
+            exc_diffQ_fx[i] = mult( exc_diffQ_fx[i], max_eq ); /* Q12 */
             move16();
         }
     }
@@ -1250,7 +1262,7 @@ void gsc_enc_ivas_fx(
     {
         FOR( i = 0; i < L_FRAME; i++ )
         {
-            exc_diffQ_fx[i] = mult( exc_diffQ_fx[i], max_eq );
+            exc_diffQ_fx[i] = mult( exc_diffQ_fx[i], max_eq ); /* Q12 */
             move16();
         }
     }
@@ -1262,13 +1274,13 @@ void gsc_enc_ivas_fx(
     Word16 Q_exc_new = s_min( *Q_exc, hGSCEnc->Q_last_exc_dct_in );
     IF( NE_16( Q_exc_new, hGSCEnc->Q_last_exc_dct_in ) )
     {
-        Scale_sig( hGSCEnc->last_exc_dct_in_fx, st->L_frame, sub( Q_exc_new, hGSCEnc->Q_last_exc_dct_in ) );
+        Scale_sig( hGSCEnc->last_exc_dct_in_fx, st->L_frame, sub( Q_exc_new, hGSCEnc->Q_last_exc_dct_in ) ); /* Q_exc_new */
         hGSCEnc->Q_last_exc_dct_in = Q_exc_new;
         move16();
     }
     ELSE
     {
-        Scale_sig( exc_dct_in_fx, st->L_frame, sub( Q_exc_new, *Q_exc ) );
+        Scale_sig( exc_dct_in_fx, st->L_frame, sub( Q_exc_new, *Q_exc ) ); /* Q_exc_new */
         *Q_exc = Q_exc_new;
         move16();
     }
@@ -1308,7 +1320,7 @@ void gsc_enc_ivas_fx(
 /*=======================================================================*/
 
 static Word16 edyn_fx(                    /* o  : ratio of max to mean    */
-                       const Word16 *vec, /* i  : input vector            */
+                       const Word16 *vec, /* i  : input vector            Qnew*/
                        const Word16 lvec, /* i  : length of input vector  */
                        Word16 Qnew )
 {
@@ -1319,6 +1331,7 @@ static Word16 edyn_fx(                    /* o  : ratio of max to mean    */
     Word16 scale;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     ener_mean = L_shl( 1, shl( Qnew, 1 ) ); /*2*Qnew*/
@@ -1328,11 +1341,7 @@ static Word16 edyn_fx(                    /* o  : ratio of max to mean    */
     {
         L_tmp = L_mult0( vec[j], vec[j] ); /*2*Qnew*/
         ener_max = L_max( ener_max, L_tmp );
-#ifdef BASOP_NOGLOB
         ener_mean = L_add_o( ener_mean, L_tmp, &Overflow );
-#else  /* BASOP_NOGLOB */
-        ener_mean = L_add( ener_mean, L_tmp );
-#endif /* BASOP_NOGLOB */
     }
     /*dyn = 10.0f * (ener_max / ener_mean);*/
     ener_mean = Mult_32_16( ener_mean, div_s( 1, lvec ) ); /*2*Qnew*/
@@ -1340,11 +1349,7 @@ static Word16 edyn_fx(                    /* o  : ratio of max to mean    */
     IF( ener_mean > 0 )
     {
         exp1 = norm_l( ener_mean );
-#ifdef BASOP_NOGLOB
         tmp1 = round_fx_o( L_shl( ener_mean, exp1 ), &Overflow );
-#else /* BASOP_NOGLOB */
-        tmp1 = round_fx( L_shl( ener_mean, exp1 ) );
-#endif
         exp1 = sub( 30, exp1 );
 
         exp2 = norm_l( ener_max );
@@ -1364,10 +1369,10 @@ static Word16 edyn_fx(                    /* o  : ratio of max to mean    */
     }
     ELSE
     {
-        dyn = 1280;
+        dyn = 1280; /* 10.0f in Q7 */
         move16();
     }
-    return dyn;
+    return dyn; /* Q7 */
 }
 
 
@@ -1382,7 +1387,7 @@ void GSC_enc_init_fx(
 )
 {
     /* AC mode */
-    hGSCEnc->seed_tcx = 15687;
+    hGSCEnc->seed_tcx = 15687; /* Q0 */
     move16();
     hGSCEnc->cor_strong_limit = 1;
     move16();
@@ -1392,6 +1397,7 @@ void GSC_enc_init_fx(
     set16_fx( hGSCEnc->last_bitallocation_band, 0, 6 );
 
     hGSCEnc->mem_last_pit_band = BAND1k2 + 1;
+    move16();
     hGSCEnc->Last_frame_ener_fx = MAX_32;
     move32();
     hGSCEnc->lt_gpitch_fx = 0;
@@ -1404,8 +1410,8 @@ void GSC_enc_init_fx(
     move16();
 
     set16_fx( hGSCEnc->mem_syn_tmp_fx, 0, M );
-    hGSCEnc->mid_dyn_fx = 5120;
-    move16(); /*40 -> Q7 */
+    hGSCEnc->mid_dyn_fx = 5120; /*40 -> Q7 */
+    move16();
     hGSCEnc->noise_lev = NOISE_LEVEL_SP0;
     move16();
     hGSCEnc->past_dyn_dec = 0;
diff --git a/lib_enc/guided_plc_enc.c b/lib_enc/guided_plc_enc.c
deleted file mode 100644
index c10866a4954c952ac75b79ee1c5b5e68842161ae..0000000000000000000000000000000000000000
--- a/lib_enc/guided_plc_enc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "stat_enc.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/guided_plc_enc_fx.c b/lib_enc/guided_plc_enc_fx.c
index 6470e0a3c88fa8bcf420af79d496ecb0f73d570b..81e50d099bc1149557b3ae1395749726e41d0ea5 100644
--- a/lib_enc/guided_plc_enc_fx.c
+++ b/lib_enc/guided_plc_enc_fx.c
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-//#include "prot_fx.h"
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "stat_enc.h"
@@ -19,8 +18,8 @@
  *
  *-------------------------------------------------------------------*/
 static void coderLookAheadInnovation(
-    Word16 A_3Q12[],            /* input: coefficients NxAz[M+1]    */
-    Word16 *pT,                 /* out:   pitch                     */
+    Word16 A_3Q12[],            /* input: coefficients NxAz[M+1]    Q12*/
+    Word16 *pT,                 /* out:   pitch                     Q0*/
     PLC_ENC_EVS_HANDLE st,      /* i/o:   coder memory state        */
     Word16 *speechLookAhead_Qx, /* i:   input speech in Q(st->Qold) */
     Word16 *old_exc,            /* i:   input excitation in Q(st->Qold) */
@@ -41,13 +40,18 @@ static void coderLookAheadInnovation(
     Word32 max_ps, max_ps_tmp;
     Word16 max_ps_e;
     Word16 tmp_loop;
+    move32();
+    move16();
+    move16();
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
     /* Debug init (not instrumented) */
     T0_fx = -3000;
+    move16();
     subfr_len = shl( L_SUBFR, 1 ); /* 2*L_SUBFR */
     if ( GT_16( L_FRAME16k, L_frame ) )
     {
@@ -59,10 +63,10 @@ static void coderLookAheadInnovation(
      * - BASOP specific initialization.                                       *
      *------------------------------------------------------------------------*/
     /* initialization */
-    exc_Qx = exc_buf_Qx + L_EXC_MEM + 8;
+    exc_Qx = exc_buf_Qx + L_EXC_MEM + 8; /* Q(st->Qold) */
     FOR( i = 0; i < L_EXC_MEM + 8; i++ )
     {
-        exc_buf_Qx[i] = old_exc[i];
+        exc_buf_Qx[i] = old_exc[i]; /* Q(st->Qold) */
         move16();
     }
 
@@ -72,17 +76,17 @@ static void coderLookAheadInnovation(
      *------------------------------------------------------------------------*/
     /* find LP residual signal for look-ahead part */
     getLookAheadResSig( speechLookAhead_Qx, A_3Q12, exc_Qx, L_frame, 2 );
-    Scale_sig( exc_Qx, subfr_len, 1 );
+    Scale_sig( exc_Qx, subfr_len, 1 ); /* Q(st->Qold) + 1 */
 
     /* find target signals */
-    prev_pitch = st->T0_4th;
+    prev_pitch = st->T0_4th; /* Q0 */
     move16();
     /* find best candidate of pitch lag */
-    T0_fx = st->T0_4th;
+    T0_fx = st->T0_4th; /* Q0 */
     move16();
-    mantissa_max = -0x7fffffffL;
+    mantissa_max = -0x7fffffffL; /* Q15 */
     move32();
-    max_ps = -0x7fffffffL;
+    max_ps = -0x7fffffffL; /* Q15 */
     move32();
     max_ps_e = 16;
     move16();
@@ -90,14 +94,14 @@ static void coderLookAheadInnovation(
     /*find maximum*/
     exc_max = 0;
     move16();
-    tmp_loop = s_min( -prev_pitch + search_range + subfr_len, 0 );
+    tmp_loop = s_min( -prev_pitch + search_range + subfr_len, 0 ); /* Q0 */
     FOR( i = -prev_pitch - search_range; i < tmp_loop; i++ )
     {
-        exc_max = s_max( exc_Qx[i], exc_max );
+        exc_max = s_max( exc_Qx[i], exc_max ); /* Q(st->Qold) + 1 */
     }
     FOR( i = 0; i < subfr_len; i++ )
     {
-        exc_max = s_max( exc_max, exc_Qx[i] );
+        exc_max = s_max( exc_max, exc_Qx[i] ); /* Q(st->Qold) + 1 */
     }
     /*calculate scaling factor for optimal precision and assure no overflow in dotproduct*/
     exc_sh = sub( 15, norm_s( sub( subfr_len, 1 ) ) ); /*ceil(ld(subfr_len))*/
@@ -105,15 +109,15 @@ static void coderLookAheadInnovation(
     exc_sh = shr( add( exc_sh, 1 ), 1 );
 
     /*scale buffer only where its needed*/
-    tmp_loop = s_min( -prev_pitch + search_range + subfr_len, 0 );
+    tmp_loop = s_min( -prev_pitch + search_range + subfr_len, 0 ); /* Q0 */
     FOR( i = -prev_pitch - search_range; i < tmp_loop; i++ )
     {
-        exc_Qx[i] = shr( exc_Qx[i], exc_sh );
+        exc_Qx[i] = shr( exc_Qx[i], exc_sh ); /* Q(st->Qold) + 1 */
         move16();
     }
     FOR( i = 0; i < subfr_len; i++ )
     {
-        exc_Qx[i] = shr( exc_Qx[i], exc_sh );
+        exc_Qx[i] = shr( exc_Qx[i], exc_sh ); /* Q(st->Qold) + 1 */
         move16();
     }
 
@@ -122,7 +126,7 @@ static void coderLookAheadInnovation(
     move16();
     FOR( i = -prev_pitch - search_range; i < -prev_pitch + search_range + subfr_len; i++ )
     {
-        alp_ini = L_mac( alp_ini, exc_Qx[i], exc_Qx[i] );
+        alp_ini = L_mac( alp_ini, exc_Qx[i], exc_Qx[i] ); /* 2*(Q(st->Qold) + 1) + 1 */
     }
 
     FOR( i = -search_range; i < search_range; i++ )
@@ -138,34 +142,30 @@ static void coderLookAheadInnovation(
 
         FOR( k = 0; k < subfr_len; k++ )
         {
-            ps = L_mac( ps, exc_Qx[k], exc_Qx[k - prev_pitch - i] );
+            ps = L_mac( ps, exc_Qx[k], exc_Qx[k - prev_pitch - i] ); /* 2*(Q(st->Qold) + 1) + 1 */
         }
 
         /*calculate "small" dotproducts in order to subtract them from the "bigger" one*/
-        FOR( k = negate( add( prev_pitch, search_range ) ); k < -prev_pitch - i; k++ )
+        FOR( k = -( ( prev_pitch + search_range ) ); k < -prev_pitch - i; k++ )
         {
-            alp_s1 = L_mac( alp_s1, exc_Qx[k], exc_Qx[k] );
+            alp_s1 = L_mac( alp_s1, exc_Qx[k], exc_Qx[k] ); /* 2*(Q(st->Qold) + 1) + 1 */
         }
         tmp_loop = sub( add( search_range, subfr_len ), prev_pitch );
         FOR( k = +subfr_len - i - prev_pitch; k < tmp_loop; k++ )
         {
-            alp_s2 = L_mac( alp_s2, exc_Qx[k], exc_Qx[k] );
+            alp_s2 = L_mac( alp_s2, exc_Qx[k], exc_Qx[k] ); /* 2*(Q(st->Qold) + 1) + 1 */
         }
         alp = L_sub( alp_ini, L_add( alp_s1, alp_s2 ) );
         alp = L_max( alp, 1 ); /* alp must not be 0 */
         alp_e = shl( exc_sh, 1 );
         ps_e = shl( exc_sh, 1 );
-        alp = ISqrt32( alp, &alp_e );
+        alp = ISqrt32( alp, &alp_e );            /* Q31-alp_e */
         ps = Mpy_32_16_1( ps, round_fx( alp ) ); /*alp_e+ps_e*/
 
         ps_e = add( alp_e, ps_e );
 
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         max_ps_tmp = L_shl_o( max_ps, sub( max_ps_e, ps_e ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        max_ps_tmp = L_shl( max_ps, sub( max_ps_e, ps_e ) );
-#endif /* BASOP_NOGLOB */
         BASOP_SATURATE_WARNING_ON_EVS
 
 
@@ -177,7 +177,7 @@ static void coderLookAheadInnovation(
             T0_fx = add( prev_pitch, i );
         }
     }
-    mantissa_max = max_ps;
+    mantissa_max = max_ps; /* Q31-ps_e */
     move32();
     if ( mantissa_max < 0 )
     {
@@ -215,7 +215,7 @@ void enc_prm_side_Info_fx(
     IF( GT_16( hPlc_Ext->nBits, 1 ) )
     {
 
-        push_next_indice_fx( st->hBstr, 1, 1 );
+        push_next_indice( st->hBstr, 1, 1 );
 
         diff_pitch = sub( hPlc_Ext->T0, hPlc_Ext->T0_4th );
         test();
@@ -225,11 +225,11 @@ void enc_prm_side_Info_fx(
             move16();
         }
 
-        push_next_indice_fx( st->hBstr, add( diff_pitch, search_range ), bits_per_subfr );
+        push_next_indice( st->hBstr, add( diff_pitch, search_range ), bits_per_subfr );
     }
     ELSE
     {
-        push_next_indice_fx( st->hBstr, 0, 1 );
+        push_next_indice( st->hBstr, 0, 1 );
     }
 
     return;
@@ -243,9 +243,9 @@ void enc_prm_side_Info_fx(
 void encoderSideLossSimulation_fx(
     Encoder_State *st,
     PLC_ENC_EVS_HANDLE hPlc_Ext,
-    Word16 *lsf_q,         /* Q1*1.28 */
-    const Word16 stab_fac, /* Q15 */
-    const Word16 calcOnlyISF,
+    Word16 *lsf_q,            /* Qx2.56 */
+    const Word16 stab_fac,    /* Q15 */
+    const Word16 calcOnlyISF, /* Q0 */
     const Word16 L_frame )
 {
     Word16 lspLocal_Q15[M];
@@ -255,11 +255,11 @@ void encoderSideLossSimulation_fx(
     /* Decoder State Update */
     IF( EQ_16( L_frame, L_FRAME_16k ) )
     {
-        lsf2lsp_fx( lsf_q, lspLocal_Q15, M, INT_FS_16k_FX );
+        lsf2lsp_fx( lsf_q, lspLocal_Q15, M, INT_FS_16k_FX ); /* Q15 */
     }
     ELSE
     {
-        lsf2lsp_fx( lsf_q, lspLocal_Q15, M, INT_FS_FX );
+        lsf2lsp_fx( lsf_q, lspLocal_Q15, M, INT_FS_FX ); /* Q15 */
     }
 
 
@@ -267,8 +267,8 @@ void encoderSideLossSimulation_fx(
                              st->narrowBand,
                              st->sr_core );
 
-    Copy( st->mem_MA_fx, hPlc_Ext->mem_MA_14Q1, M );
-    Copy( st->mem_AR_fx, hPlc_Ext->mem_AR, M );
+    Copy( st->mem_MA_fx, hPlc_Ext->mem_MA_14Q1, M ); /* Qx2.56 */
+    Copy( st->mem_AR_fx, hPlc_Ext->mem_AR, M );      /* Qx2.56 */
 
 
     /* ISF parameter processing for concealment */
@@ -276,15 +276,15 @@ void encoderSideLossSimulation_fx(
     hPlc_Ext->stab_fac_Q15 = stab_fac;
     move16();
 
-    Copy( lsf_q, hPlc_Ext->lsfold_14Q1, M );
-    Copy( lspLocal_Q15, hPlc_Ext->lspold_Q15, M );
+    Copy( lsf_q, hPlc_Ext->lsfold_14Q1, M );       /* Qx2.56 */
+    Copy( lspLocal_Q15, hPlc_Ext->lspold_Q15, M ); /* Q15 */
 
 
     IF( calcOnlyISF != 0 )
     {
         /* ISF concealment simulation */
         getConcealedLSF( hPlc_Ext, xsfBase, st->clas, L_frame );
-        hPlc_Ext->T0 = hPlc_Ext->T0_4th;
+        hPlc_Ext->T0 = hPlc_Ext->T0_4th; /* Q0 */
         move16();
     }
     ELSE
@@ -304,9 +304,9 @@ void encoderSideLossSimulation_fx(
         getConcealedLP( hPlc_Ext, A_3Q12, xsfBase, st->clas, L_frame );
 
         /* apply encoder side PLC simulation */
-        hPlc_Ext->pit_min = st->pit_min;
+        hPlc_Ext->pit_min = st->pit_min; /* Q0 */
         move16();
-        hPlc_Ext->pit_max = st->pit_max;
+        hPlc_Ext->pit_max = st->pit_max; /* Q0 */
         move16();
         coderLookAheadInnovation( A_3Q12, &( hPlc_Ext->T0 ), hPlc_Ext, speechLookAhead_Qx, old_exc_Qx, L_frame );
     }
@@ -340,11 +340,11 @@ void GplcTcxEncSetup_fx(
  *
  *-------------------------------------------------------------------*/
 Word16 encSideSpecPowDiffuseDetector_fx(
-    Word16 *lsf_ref,
-    Word16 *lsf_con,
-    const Word32 sr_core,
-    Word16 *prev_lsf4_mean,
-    const Word8 sw,
+    Word16 *lsf_ref,        /* Qx2.56 */
+    Word16 *lsf_con,        /* Qx2.56 */
+    const Word32 sr_core,   /* Q0 */
+    Word16 *prev_lsf4_mean, /* Qx2.56 */
+    const Word8 sw,         /* Q0 */
     const Word16 coder_type )
 {
     Word16 tmp;
@@ -359,14 +359,14 @@ Word16 encSideSpecPowDiffuseDetector_fx(
 
     /* calculate the mean of the lowest 4 LSFs */
 
-    L_tmp = L_mult( lsf_ref[0], 8192 /*1.0/4.0 Q15*/ );
-    L_tmp = L_mac( L_tmp, lsf_ref[1], 8192 /*1.0/4.0 Q15*/ );
-    L_tmp = L_mac( L_tmp, lsf_ref[2], 8192 /*1.0/4.0 Q15*/ );
-    lsf4_mean = mac_r( L_tmp, lsf_ref[3], 8192 /*1.0/4.0 Q15*/ );
+    L_tmp = L_mult( lsf_ref[0], 8192 /*1.0/4.0 Q15*/ );           /* Qx2.56 */
+    L_tmp = L_mac( L_tmp, lsf_ref[1], 8192 /*1.0/4.0 Q15*/ );     /* Qx2.56 */
+    L_tmp = L_mac( L_tmp, lsf_ref[2], 8192 /*1.0/4.0 Q15*/ );     /* Qx2.56 */
+    lsf4_mean = mac_r( L_tmp, lsf_ref[3], 8192 /*1.0/4.0 Q15*/ ); /* Qx2.56 */
 
     IF( sw )
     {
-        Copy( lsf_con, lsf_mod, M );
+        Copy( lsf_con, lsf_mod, M ); /* Qx2.56 */
 
         modify_lsf( lsf_mod, M, sr_core, 1 );
 
@@ -376,28 +376,29 @@ Word16 encSideSpecPowDiffuseDetector_fx(
         cum_dist2 = 0;
 
         cnt_imprv = 0;
+        move16();
 
         IF( EQ_32( sr_core, INT_FS_16k ) )
         {
-            th = 2560;
-            move16(); /* LSF */
-            th_dif = 288;
-            move16(); /* LSF */
+            th = 2560;    /* Qx2.56 */
+            move16();     /* LSF */
+            th_dif = 288; /* Qx2.56 */
+            move16();     /* LSF */
         }
         ELSE
         {
-            th = 2048;
-            move16(); /* LSF */
-            th_dif = 230;
-            move16(); /* LSF */
+            th = 2048;    /* Qx2.56 */
+            move16();     /* LSF */
+            th_dif = 230; /* Qx2.56 */
+            move16();     /* LSF */
         }
 
         FOR( i = 0; i < M; i++ )
         {
             tmp = sub( lsf_con[i], lsf_ref[i] );
-            dist1 = L_mult( tmp, tmp );
+            dist1 = L_mult( tmp, tmp ); /* 2*(Qx2.56)+1 */
             tmp = sub( lsf_mod[i], lsf_ref[i] );
-            dist2 = L_mult( tmp, tmp );
+            dist2 = L_mult( tmp, tmp ); /* 2*(Qx2.56)+1 */
 
             if ( GT_32( dist1, dist2 ) )
             {
@@ -413,6 +414,7 @@ Word16 encSideSpecPowDiffuseDetector_fx(
         test();
         test();
         test();
+        test();
         if ( GT_32( cum_dist1, L_add( cum_dist2, Mpy_32_16_1( cum_dist2, 4915 ) ) ) && GT_16( sub( lsf4_mean, *prev_lsf4_mean ), th_dif ) && LT_16( *prev_lsf4_mean, th ) && GT_16( cnt_imprv, 2 ) && EQ_16( coder_type, GENERIC ) )
         {
             idx = 1;
@@ -442,35 +444,29 @@ void updateSpecPowDiffuseIdx_fx(
     Word16 k;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
     move32();
     move16();
-    st->mean_gc[1] = st->gain_code[0];
-    min_gp = st->bpf_gainT[0];
+    st->mean_gc[1] = st->gain_code[0]; /* Q15 */
+    min_gp = st->bpf_gainT[0];         /* Q15 */
 
     FOR( k = 1; k < 4; k++ )
     {
-#ifdef BASOP_NOGLOB
         st->mean_gc[1] = L_add_o( st->mean_gc[1], st->gain_code[k], &Overflow );
-#else /* BASOP_NOGLOB */
-        st->mean_gc[1] = L_add( st->mean_gc[1], st->gain_code[k] );
-#endif
+        move32();
         min_gp = s_min( min_gp, st->bpf_gainT[k] );
     }
 
     /* Suppress saturation warning in threshold comparison. */
     test();
-#ifdef BASOP_NOGLOB
     if ( LT_32( st->mean_gc[1], L_add_o( st->mean_gc[0], Mpy_32_16_r( st->mean_gc[0], 3211 /*0.098 Q15*/ ), &Overflow ) ) || GT_16( min_gp, 13435 /*0.82 Q14*/ ) )
-#else
-    if ( LT_32( st->mean_gc[1], L_add( st->mean_gc[0], Mpy_32_16_r( st->mean_gc[0], 3211 /*0.098 Q15*/ ) ) ) || GT_16( min_gp, 13435 /*0.82 Q14*/ ) )
-#endif
     {
         move16();
         st->glr_idx[0] = 0;
     }
     move16();
-    st->mean_gc[0] = st->mean_gc[1];
+    st->mean_gc[0] = st->mean_gc[1]; /* Q15 */
 }
diff --git a/lib_enc/hf_cod_amrwb.c b/lib_enc/hf_cod_amrwb.c
deleted file mode 100644
index d1de09bc73bcde0f9193c0b1d468183cb122cda9..0000000000000000000000000000000000000000
--- a/lib_enc/hf_cod_amrwb.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/hf_cod_amrwb_fx.c b/lib_enc/hf_cod_amrwb_fx.c
index 7c2060fa8663df927207db78e0a59227df997424..e21a8bd677e665f1e9d36c61d1311074ee56c165 100644
--- a/lib_enc/hf_cod_amrwb_fx.c
+++ b/lib_enc/hf_cod_amrwb_fx.c
@@ -107,14 +107,10 @@ void hf_cod_fx(
     ener_exc_fx = dot_prod_satcontr( exc_fx, exc_fx, Q_exc, Q_exc, &q1, L_SUBFR );
     ener_hf_fx = dot_prod_satcontr( HF_fx, HF_fx, -3, -3, &q2, L_SUBFR16k );
 
-    scale_fx = div_s( shl( 1, 14 ), ener_exc_fx ); /*Q(29-q1) */
-    L_tmp = L_mult( ener_hf_fx, scale_fx );        /*30-q1+q2 */
-    q2 = sub( q1, q2 );                            /*30-q2 */
-#ifdef BASOP_NOGLOB
+    scale_fx = div_s( shl( 1, 14 ), ener_exc_fx );                              /*Q(29-q1) */
+    L_tmp = L_mult( ener_hf_fx, scale_fx );                                     /*30-q1+q2 */
+    q2 = sub( q1, q2 );                                                         /*30-q2 */
     scale_fx = round_fx( Isqrt( L_shl_o( L_tmp, sub( q2, 26 ), &Overflow ) ) ); /*Q13 */
-#else                                                                           /* BASOP_NOGLOB */
-    scale_fx = round_fx( Isqrt( L_shl( L_tmp, sub( q2, 26 ) ) ) );        /*Q13 */
-#endif                                                                          /* BASOP_NOGLOB */
 
 
     pt1 = HF_fx;
@@ -187,14 +183,10 @@ void hf_cod_fx(
     ener_hf_fx = dot_prod_satcontr( HF_syn_fx, HF_syn_fx, 0, 0, &q2, L_SUBFR16k );
     ener_input_fx = dot_prod_satcontr( HF_SP_fx, HF_SP_fx, 0, 0, &q1, L_SUBFR16k );
 
-    HF_calc_gain_fx = div_s( shl( 1, 14 ), ener_input_fx ); /*Q(29-q1) */
-    L_tmp = L_mult( ener_hf_fx, HF_calc_gain_fx );          /*30-q1+q2 */
-    q2 = sub( q1, q2 );                                     /*30-q2 */
-#ifdef BASOP_NOGLOB
+    HF_calc_gain_fx = div_s( shl( 1, 14 ), ener_input_fx );                                /*Q(29-q1) */
+    L_tmp = L_mult( ener_hf_fx, HF_calc_gain_fx );                                         /*30-q1+q2 */
+    q2 = sub( q1, q2 );                                                                    /*30-q2 */
     HF_calc_gain_fx = round_fx_o( Isqrt( L_shl_sat( L_tmp, sub( q2, 20 ) ) ), &Overflow ); /*Q10  */
-#else                                                                                      /* BASOP_NOGLOB */
-    HF_calc_gain_fx = round_fx( Isqrt( L_shl( L_tmp, sub( q2, 20 ) ) ) ); /*Q10  */
-#endif
 
 
     /* set energy of HF synthesis to energy of original HF:
diff --git a/lib_enc/hq_classifier_enc.c b/lib_enc/hq_classifier_enc.c
deleted file mode 100644
index 273cba75c8c048ceec04ae71f9440227c1995d90..0000000000000000000000000000000000000000
--- a/lib_enc/hq_classifier_enc.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-/*-----------------------------------------------------------------*
- * Local constants
- *-----------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------*
- * Local function prototypes
- *-----------------------------------------------------------------*/
diff --git a/lib_enc/hq_classifier_enc_fx.c b/lib_enc/hq_classifier_enc_fx.c
index 0259ef9ffdbe151f2896304f54cfedd2e2dafcff..aa2c319f1e9a936c00473a70f6caae499410ee37 100644
--- a/lib_enc/hq_classifier_enc_fx.c
+++ b/lib_enc/hq_classifier_enc_fx.c
@@ -8,7 +8,6 @@
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
 #include "prot_fx.h"     /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*-----------------------------------------------------------------*
@@ -84,7 +83,6 @@ static Word16 hf_spectrum_sparseness_fx(
         crest_mod_fx = 0;
         move32();
         maximum_l( A_fx, L_SPEC_HB, &Amax_fx );
-#ifdef NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO
         IF( Amax_fx == 0 )
         {
             /* For all-zero input the crest is 1.0 */
@@ -95,7 +93,6 @@ static Word16 hf_spectrum_sparseness_fx(
         }
         ELSE
         {
-#endif
             thr_fx = Mpy_32_32( Amax_fx, PEAK_THRESHOLD_FX ); /* Q12 */
             movmean_fx = 0;                                   /* avoid uninitialized warning */
             move32();
@@ -144,9 +141,9 @@ static Word16 hf_spectrum_sparseness_fx(
                 }
             }
             Word16 l_shift = W_norm( inv_rms_fx );
-            inv_rms32_fx = W_extract_h( W_shl( inv_rms_fx, l_shift ) );                                      // Q15+l_shift-32
-            Word16 q_rms = sub( add( Q15, l_shift ), 32 );                                                   // q_rms
-            inv_rms32_div_fx = BASOP_Util_Divide3232_Scale_cadence( inv_rms32_fx, L_SPEC_HB, &inv_rms32_e ); /* Q31-inv_rms32_e */
+            inv_rms32_fx = W_extract_h( W_shl( inv_rms_fx, l_shift ) );                                     // Q15+l_shift-32
+            Word16 q_rms = sub( add( Q15, l_shift ), 32 );                                                  // q_rms
+            inv_rms32_div_fx = BASOP_Util_Divide3232_Scale_newton( inv_rms32_fx, L_SPEC_HB, &inv_rms32_e ); /* Q31-inv_rms32_e */
             inv_rms32_e = sub( 31, add( sub( Q31, inv_rms32_e ), q_rms ) );
             // inv_rms = 1.0f / (float) sqrtf( inv_rms / L_SPEC_HB );
             inv_rms32_fx = ISqrt32( inv_rms32_div_fx, &inv_rms32_e ); /* Q31-inv_rms32_e */
@@ -161,9 +158,7 @@ static Word16 hf_spectrum_sparseness_fx(
             move32();
             st->hHQ_core->crest_mod_lp_q = sub( Q12, inv_rms32_e );
             move16();
-#ifdef NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO
         }
-#endif
         *crest_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, ( *crest_lp_fx ) ), Mpy_32_32( ONE_IN_Q31 - HQ_CREST_FAC_SM_FX, crest_fx ) ); /* Q(st->hHQ_core->crest_lp_q) */
         move32();
         *crest_mod_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, ( *crest_mod_lp_fx ) ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), crest_mod_fx ) ); /* Q(st->hHQ_core->crest_mod_lp_q) */
@@ -199,7 +194,6 @@ Word16 hq_classifier_enc_fx(                            /* o  : Consumed bits
                              Word16 *hqswb_clas         /* o  : HQ class                        Q0  */
 )
 {
-#ifndef SOLVED_COMP_ENC_DEC
     Word16 bits;
     HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
 
@@ -263,16 +257,16 @@ Word16 hq_classifier_enc_fx(                            /* o  : Consumed bits
     {
         IF( GE_16( *hqswb_clas, HQ_GEN_SWB ) )
         {
-            push_indice_fx( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas - 5, bits );
+            push_indice( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas - 5, bits );
         }
         ELSE
         {
-            push_indice_fx( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas, bits );
+            push_indice( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas, bits );
         }
     }
     ELSE
     {
-        push_indice_fx( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas, bits );
+        push_indice( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas, bits );
     }
 
     test();
@@ -282,88 +276,7 @@ Word16 hq_classifier_enc_fx(                            /* o  : Consumed bits
         *hqswb_clas = HQ_GEN_SWB; /* Q0 */
         move16();
     }
-#else
-
-    Word16 bits;
-    HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
-    Word32 max_brate;
-    Word16 harmonic_decision;
-
-
-    max_brate = HQ_32k;
-    move32();
-    if ( st_fx->element_mode > EVS_MONO )
-    {
-        max_brate = HQ_48k;
-        move32();
-    }
 
-    *hqswb_clas = HQ_NORMAL;
-    bits = 1;
-    move16();
-    IF( EQ_16( is_transient, 1 ) )
-    {
-        *hqswb_clas = HQ_TRANSIENT;
-        move16();
-    }
-
-    /* classification and limit bandwidth for bit allocation */
-    test();
-    IF( EQ_16( length, L_SPEC32k ) || EQ_16( length, L_SPEC48k ) )
-    {
-        IF( LE_32( st_fx->core_brate, max_brate ) )
-        {
-            test();
-            IF( !is_transient && EQ_16( st_fx->bwidth, st_fx->last_bwidth ) )
-            {
-                /* Detect HQ_HARMONIC mode */
-                *hqswb_clas = peak_avrg_ratio_fx( st_fx->total_brate, coefs, NUMC_N + 96, &hHQ_core->mode_count, &hHQ_core->mode_count1, 12 );
-
-#if 0
-                harmonic_decision = hf_spectrum_sparseness( st, coefs );
-#else
-                harmonic_decision = 0;
-                move16();
-#endif
-                test();
-                IF( EQ_16( *hqswb_clas, HQ_HARMONIC ) && !harmonic_decision )
-                {
-                    *hqswb_clas = HQ_NORMAL;
-                    move16();
-                }
-                ELSE
-                {
-                    /* Detect harmonic VQ mode HQ_HVQ */
-                    hvq_classifier_fx( coefs, &hHQ_core->prev_Npeaks, hHQ_core->prev_peaks, hqswb_clas, Npeaks, peaks, st_fx->core_brate, st_fx->last_core,
-                                       nf_gains, &hHQ_core->hvq_hangover, pe_gains );
-                }
-            }
-            bits = 2;
-            move16();
-        }
-    }
-    ELSE IF( EQ_16( length, L_SPEC16k_EXT ) || EQ_16( length, L_SPEC48k_EXT ) )
-    {
-        bits = 0; /* HQ_NORMAL only -- no signalling needed */
-        move16();
-    }
-    /* write signalling info to the bitstream */
-    push_indice_fx( st_fx->hBstr, IND_HQ_SWB_CLAS, *hqswb_clas, bits );
-
-    IF( LE_32( st_fx->core_brate, HQ_32k ) && EQ_16( *hqswb_clas, HQ_NORMAL ) )
-    {
-        IF( EQ_16( length, L_SPEC32k ) )
-        {
-            *hqswb_clas = HQ_GEN_SWB;
-            move16();
-        }
-        ELSE IF( EQ_16( length, L_SPEC48k ) )
-        {
-            *hqswb_clas = HQ_GEN_FB;
-            move16();
-        }
-    }
-#endif
     return bits;
 }
 Word16 hq_classifier_enc_ivas_fx(                            /* o  : Consumed bits                   Q0  */
@@ -682,11 +595,8 @@ Word16 peak_avrg_ratio_fx(
     test();
     test();
     test();
-#ifndef SOLVED_COMP_ENC_DEC /*This affect BE even if it shouldn't*/
+
     IF( ( GE_16( add( k, k1 ), 5 ) && GT_16( k1, 2 ) && EQ_32( total_brate, HQ_24k40 ) ) || ( ( ( GE_16( add( k, k1 ), 10 ) && GT_16( k1, 5 ) ) || GE_16( *mode_count, 5 ) ) && LT_16( *mode_count1, 5 ) ) )
-#else
-    if ( ( GE_16( add( k, k1 ), 5 ) && GT_16( k1, 2 ) && LT_32( total_brate, HQ_BWE_CROSSOVER_BRATE ) ) || ( ( ( GE_16( add( k, k1 ), 10 ) && GT_16( k1, 5 ) ) || GE_16( *mode_count, 5 ) ) && LT_16( *mode_count1, 5 ) ) )
-#endif
     {
         hqswb_clas = HQ_HARMONIC;
         move16();
@@ -847,13 +757,8 @@ void hvq_classifier_ivas_fx(
                     L_pe = L_add( L_pe, L_tmp );                          /*Q12 */
                 }
 
-#ifdef BASOP_NOGLOB
                 L_nf_mean[i] = L_add_sat( L_nf_mean[i], L_nf ); /*Q12 */
                 L_pe_mean[i] = L_add_sat( L_pe_mean[i], L_pe ); /*Q12 */
-#else
-                L_nf_mean[i] = L_add( L_nf_mean[i], L_nf );
-                L_pe_mean[i] = L_add( L_pe_mean[i], L_pe );
-#endif
                 move32();
                 move32();
                 IF( GT_32( L_d, L_peak ) )
@@ -903,11 +808,7 @@ void hvq_classifier_ivas_fx(
             sharp[i] = extract_h( L_shl( L_tmp, shift ) ); /* 30-s+s-8-16 -> Q6 */
             move16();
             /*sharp_dist += (sharp[i]-HVQ_SHARP_THRES); */
-#ifdef BASOP_NOGLOB
             sharp_dist = add_o( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ), &Overflow ); /* Q6 */
-#else
-            sharp_dist = add( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ) );
-#endif
             if ( GT_16( sharp[i], HVQ_SHARP_THRES_FX ) )
             {
                 num_sharp_bands = add( num_sharp_bands, 1 );
@@ -1191,11 +1092,7 @@ void hvq_classifier_fx(
     L_input_max = L_deposit_l( 0 );
     set32_fx( L_thr, 0, L_FRAME16k );
 
-#ifndef SOLVED_COMP_ENC_DEC
     IF( EQ_32( L_core_brate, HQ_24k40 ) )
-#else
-    IF( LT_32( L_core_brate, HQ_BWE_CROSSOVER_BRATE ) )
-#endif
     {
         nsub = HVQ_NSUB_24k;
         move16();
@@ -1290,15 +1187,10 @@ void hvq_classifier_fx(
                     L_pe = L_add( L_pe, L_tmp );                          /*Q12 */
                 }
 
-#ifdef BASOP_NOGLOB
                 L_nf_mean[i] = L_add_sat( L_nf_mean[i], L_nf ); /*Q12 */
                 L_pe_mean[i] = L_add_sat( L_pe_mean[i], L_pe ); /*Q12 */
                 move32();
                 move32();
-#else
-                L_nf_mean[i] = L_add( L_nf_mean[i], L_nf );
-                L_pe_mean[i] = L_add( L_pe_mean[i], L_pe );
-#endif
                 IF( GT_32( L_d, L_peak ) )
                 {
                     L_peak = L_add( L_d, 0 );
@@ -1348,11 +1240,7 @@ void hvq_classifier_fx(
             move16();
 
             /*sharp_dist += (sharp[i]-HVQ_SHARP_THRES); */
-#ifdef BASOP_NOGLOB
             sharp_dist = add_o( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ), &Overflow );
-#else
-            sharp_dist = add( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ) );
-#endif
             IF( GT_16( sharp[i], HVQ_SHARP_THRES_FX ) )
             {
                 num_sharp_bands = add( num_sharp_bands, 1 );
@@ -1443,7 +1331,6 @@ void hvq_classifier_fx(
                 num_peak_cands = add( num_peak_cands, 1 );
             }
         }
-#ifndef ADD_IVAS_HQ_CODE
         IF( EQ_32( L_core_brate, HQ_24k40 ) )
         {
             peak_th = HVQ_MAX_PEAKS_24k_CLAS;
@@ -1454,9 +1341,6 @@ void hvq_classifier_fx(
             peak_th = HVQ_MAX_PEAKS_32k;
             move16();
         }
-#else
-        peak_th = (int16_t) ( ( core_brate * HVQ_PEAKS_PER_DELTA_THR + HVQ_PEAKS_PER_DELTA_THR_OFFS ) / HVQ_PEAKS_BPS_DELTA );
-#endif
         /* Find peaks */
         pindx = maximum_32_fx( L_input_abs, num_peak_cands, &L_m );
         i = 0;
@@ -1578,7 +1462,6 @@ void hvq_classifier_fx(
             move16();
         }
 
-#ifndef ADD_IVAS_HQ_CODE
         IF( EQ_32( L_core_brate, HQ_24k40 ) )
         {
             *Npeaks = s_min( HVQ_MAX_PEAKS_24k, *Npeaks ); /* Q0 */
@@ -1589,9 +1472,6 @@ void hvq_classifier_fx(
             *Npeaks = s_min( HVQ_MAX_PEAKS_32k, *Npeaks ); /* Q0 */
             move16();
         }
-#else
-        *Npeaks = (int16_t) ( min( ( core_brate * HVQ_PEAKS_PER_DELTA + HVQ_PEAKS_PER_DELTA_OFFS ) / HVQ_PEAKS_BPS_DELTA, *Npeaks ) );
-#endif
     }
     ELSE
     {
@@ -1604,99 +1484,3 @@ void hvq_classifier_fx(
 
     return;
 }
-
-#ifdef ADD_IVAS_HQ_CODE
-/*--------------------------------------------------------------------------*
- * hf_spectrum_sparseness()
- *
- * Detection of sparse spectrum in high band for activation of harmonic
- * modes HQ_HARMONIC and HQ_HVQ
- *--------------------------------------------------------------------------*/
-/*! r: Harmonic decision for high band */
-static int16_t hf_spectrum_sparseness(
-    Encoder_State *st, /* i/o: encoder state structure         */
-    const float *coefs /* i  : MDCT spectrum                   */
-)
-{
-    int16_t i;
-    float thr;
-    int16_t low_count;
-    float A[L_SPEC_HB];
-    float Amax;
-    float movmean;
-    float inv_rms;
-    float crest;
-    float crest_mod;
-    const float *p_num;
-    float *crest_lp;
-    float *crest_mod_lp;
-    int16_t result;
-
-    crest_lp = &st->hHQ_core->crest_lp;
-    crest_mod_lp = &st->hHQ_core->crest_mod_lp;
-
-    result = TRUE;
-    if ( st->element_mode != EVS_MONO )
-    {
-        for ( i = 0; i < L_SPEC_HB; i++ )
-        {
-            A[i] = (float) fabsf( coefs[i + L_SPEC_HB] );
-        }
-        low_count = 0;
-        inv_rms = 0.0f;
-        crest_mod = 0.0f;
-        maximum( A, L_SPEC_HB, &Amax );
-        thr = Amax * PEAK_THRESHOLD;
-        movmean = 0.0f;                        /* avoid uninitialized warning */
-        p_num = &inv_tbl[HALF_WIN_LENGTH + 1]; /* Table for division 1./(11:21) */
-        for ( i = 0; i < L_SPEC_HB; i++ )
-        {
-            inv_rms += A[i] * A[i];
-            if ( A[i] < thr )
-            {
-                low_count += 1;
-            }
-            if ( i <= HALF_WIN_LENGTH )
-            {
-                if ( i == 0 )
-                {
-                    movmean = sum_f( &A[0], i + HALF_WIN_LENGTH + 1 ) * ( *p_num );
-                }
-                else
-                {
-                    p_num++;
-                    movmean = movmean + ( A[i + HALF_WIN_LENGTH] - movmean ) * ( *p_num );
-                }
-            }
-            else
-            {
-                if ( L_SPEC_HB <= i + HALF_WIN_LENGTH )
-                {
-                    p_num--;
-                    movmean = movmean + ( movmean - A[i - HALF_WIN_LENGTH - 1] ) * ( *p_num );
-                }
-                else
-                {
-                    movmean = movmean + ( A[i + HALF_WIN_LENGTH] - A[i - HALF_WIN_LENGTH - 1] ) * ( *p_num );
-                }
-            }
-            if ( crest_mod < movmean )
-            {
-                crest_mod = movmean;
-            }
-        }
-        inv_rms = 1.0f / (float) sqrtf( inv_rms / L_SPEC_HB );
-        crest = Amax * inv_rms;
-        crest_mod = crest_mod * inv_rms;
-        *crest_lp = HQ_CREST_FAC_SM * ( *crest_lp ) + ( 1.0f - HQ_CREST_FAC_SM ) * crest;
-        *crest_mod_lp = HQ_CREST_FAC_SM * ( *crest_mod_lp ) + ( 1.0f - HQ_CREST_FAC_SM ) * crest_mod;
-
-        if ( ( ( *crest_lp ) > HQ_CREST_THRESHOLD ) && ( ( *crest_mod_lp ) > HQ_CREST_MOD_THRESHOLD ) && ( low_count > LOW_COUNT_THRESHOLD ) )
-        {
-            result = FALSE;
-        }
-    }
-
-    return result;
-}
-#endif
diff --git a/lib_enc/hq_core_enc.c b/lib_enc/hq_core_enc.c
deleted file mode 100644
index 07928e84dfd0a15b495d02e44f2505086504b9ec..0000000000000000000000000000000000000000
--- a/lib_enc/hq_core_enc.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-
-/*--------------------------------------------------------------------------
- * hq_core_enc()
- *
- * HQ core encoder
- *--------------------------------------------------------------------------*/
-
-void hq_core_enc_ivas_fx(
-    Encoder_State *st,             /* i/o: encoder state structure */
-    const Word16 *audio_fx,        /* i  : input audio signal      Q0 */
-    const Word16 input_frame_orig, /* i  : frame length            Q0*/
-    const Word16 hq_core_type,     /* i  : HQ core type            Q0*/
-    const Word16 Voicing_flag,     /* i  : Voicing flag for FER method selection     Q0*/
-    const Word16 vad_hover_flag    /* i  : VAD hangover flag                 Q0*/
-)
-{
-    Word16 i, is_transient, num_bits, extra_unused;
-
-    Word32 t_audio_fx[L_FRAME48k_EXT];
-    Word16 wtda_audio_fx16[2 * L_FRAME48k];
-    Word32 wtda_audio_fx32[2 * L_FRAME48k];
-    Word16 two_frames_buffer[2 * L_FRAME48k];
-    Word16 tmp;
-    Word16 Aq_old_fx[M + 1];
-    Word16 output_fx[L_FRAME48k];
-    Word16 Q_audio;
-    Word16 out_q = 0, old_q = 0;
-    move16();
-    move16();
-    Word16 inner_frame, input_frame, L_frame;
-    Word16 L_spec, overlap, nz, tcx_offset;
-    Word16 left_overlap, right_overlap;
-    BSTR_ENC_HANDLE hBstr = st->hBstr;
-    Word16 q = 0;
-    Word16 exp;
-    move16();
-
-    push_wmops( "hq_core_enc" );
-
-    set16_fx( wtda_audio_fx16, 0, 2 * L_FRAME48k );
-    set32_fx( wtda_audio_fx32, 0, 2 * L_FRAME48k );
-    st->Nb_ACELP_frames = 0;
-    move16();
-    set_zero_fx( t_audio_fx, L_FRAME48k_EXT );
-    /* set input_frame length */
-    input_frame = input_frame_orig; /* Q0 */
-
-    /* Sanity check, it should never happen at the encoder side (no BFI) */
-    IF( st->hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP )
-    {
-        st->hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW;
-        move16();
-    }
-    ELSE
-    {
-        st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode;
-        move16();
-    }
-    st->hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
-    move16();
-
-    /*--------------------------------------------------------------------------
-     * Preprocessing in the first HQ frame after ACELP frame
-     * Find the number of bits for PVQ coding
-     * Write signaling information
-     *--------------------------------------------------------------------------*/
-
-    num_bits = BASOP_Util_Divide3232_Scale( st->total_brate, FRAMES_PER_SEC, &exp ); /* Q15-exp */
-    num_bits = shr( num_bits, sub( 15, exp ) );                                      /* Q0 */
-    extra_unused = 0;
-    move16();
-
-    /*--------------------------------------------------------------------------
-     * Detect signal transition
-     *--------------------------------------------------------------------------*/
-
-    is_transient = detect_transient_fx( audio_fx, input_frame, 0, st ); /* Q0 */
-    move16();
-
-    test();
-    test();
-    IF( st->element_mode > EVS_MONO && ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) )
-    {
-        /*--------------------------------------------------------------------------
-         * IVAS switching frame
-         *--------------------------------------------------------------------------*/
-
-        L_spec = input_frame;
-        left_overlap = -1;
-        right_overlap = -1;
-        move16();
-        move16();
-        move16();
-
-        WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio_fx16, 1, 1 );
-
-        q = 0;
-        move16();
-        Q_audio = sub( Q16, q );
-        TCX_MDCT( wtda_audio_fx16, t_audio_fx, &Q_audio, left_overlap, sub( L_spec, shr( add( left_overlap, right_overlap ), 1 ) ), right_overlap, st->element_mode );
-        Q_audio = sub( Q31, Q_audio );
-        Copy_Scale_sig_16_32( wtda_audio_fx16, wtda_audio_fx32, 2 * L_FRAME48k, sub( Q_audio, q ) ); /* Q_audio */
-
-        inner_frame = inner_frame_tbl[st->bwidth]; /* Q0 */
-        L_spec = l_spec_ext_tbl[st->bwidth];       /* Q0 */
-        is_transient = 0;
-        move16();
-        move16();
-        move16();
-    }
-    ELSE
-    {
-        /*--------------------------------------------------------------------------
-         * Windowing and time-domain aliasing
-         * DCT transform
-         *--------------------------------------------------------------------------*/
-        Q_audio = 0;
-        move16();
-        Scale_sig( st->old_input_signal_fx, input_frame, negate( st->q_old_inp ) );                               /* Q0 */
-        Scale_sig( st->input_fx, add( input_frame, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), negate( st->q_inp ) ); /* Q0 */
-        st->q_old_inp = 0;
-        move16();
-        st->q_inp = 0;
-        move16();
-        Copy( st->old_input_signal_fx, two_frames_buffer, input_frame ); /* Q0 */
-        Copy( audio_fx, two_frames_buffer + input_frame, input_frame );  /* Q0 */
-
-        wtda_fx( two_frames_buffer + input_frame, &Q_audio, wtda_audio_fx32, NULL, 0,
-                 st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, input_frame );
-
-        test();
-        IF( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) )
-        {
-            /* Preprocessing in the first HQ frame after ACELP frame */
-            core_switching_hq_prepare_enc_fx( st, &num_bits, input_frame, wtda_audio_fx32, two_frames_buffer + input_frame );
-
-            /* During ACELP->HQ core switching, limit the HQ core bitrate to 48kbps */
-            IF( GT_16( num_bits, ACELP_48k_BITS ) )
-            {
-                extra_unused = sub( num_bits, ACELP_48k_BITS );
-                num_bits = ACELP_48k_BITS;
-                move16();
-            }
-        }
-
-        Word16 tmp_q = Q_audio;
-        move16();
-        direct_transform_fx( wtda_audio_fx32, t_audio_fx, is_transient, input_frame, &Q_audio, st->element_mode );
-        scale_sig32( wtda_audio_fx32, L_FRAME48k_EXT, sub( Q_audio, tmp_q ) ); /* Q_audio */
-
-        /* scale coefficients to their nominal level (8kHz) */
-        IF( NE_16( input_frame, NORM_MDCT_FACTOR ) )
-        {
-            UWord16 lsb;
-            tmp = mult_r( input_frame, 410 / 2 ); /* 1/8000 in Q15 */
-            Word16 ener_match_fx = hq_nominal_scaling[tmp];
-            move16();
-            FOR( i = 0; i < input_frame; i++ )
-            {
-                /*t_audio_q[i] *= ener_match; */
-                Mpy_32_16_ss( t_audio_fx[i], ener_match_fx, &t_audio_fx[i], &lsb ); /* Q12 */
-                move16();
-            }
-        }
-
-        /* limit encoded band-width according to the command-line OR BWD limitation */
-        inner_frame = inner_frame_tbl[st->bwidth]; /* Q0 */
-        L_spec = l_spec_tbl[st->bwidth];           /* Q0 */
-
-        move16();
-        move16();
-
-
-        IF( GT_16( input_frame, inner_frame ) )
-        {
-            IF( EQ_16( is_transient, 1 ) )
-            {
-                FOR( i = 1; i < NUM_TIME_SWITCHING_BLOCKS; i++ )
-                {
-                    tmp = shr( inner_frame, 2 );
-                    Copy32( t_audio_fx + i_mult2( i, shr( input_frame, 2 ) ), t_audio_fx + i_mult2( i, tmp ), tmp ); /* Q_audio */
-                }
-            }
-
-            set32_fx( t_audio_fx + inner_frame, 0, sub( input_frame, inner_frame ) );
-        }
-    }
-
-
-    /* subtract signaling bits */
-    num_bits = sub( num_bits, hBstr->nb_bits_tot ); /* Q0 */
-
-    /*--------------------------------------------------------------------------
-     * High-band gain control in case of BWS
-     *--------------------------------------------------------------------------*/
-
-    IF( st->bwidth_sw_cnt > 0 )
-    {
-        Word32 L_tmp;
-        tmp = BASOP_Util_Divide1616_Scale( 3, BWS_TRAN_PERIOD, &exp ); /* Q15-exp */
-        shr( tmp, exp );
-        L_tmp = L_deposit_h( tmp ); /* Q31-exp */
-        IF( is_transient )
-        {
-            FOR( i = 0; i < NUM_TIME_SWITCHING_BLOCKS; i++ )
-            {
-                v_multc_fixed( t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), L_tmp, t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), sub( shr( inner_frame, 2 ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ) ); // Q_audio + Q31 - Q31 -> Q_audio
-            }
-        }
-        ELSE
-        {
-            v_multc_fixed( t_audio_fx + L_FRAME16k, L_tmp, t_audio_fx + L_FRAME16k, L_spec - L_FRAME16k ); // Q_audio + Q31 - Q31 -> Q_audio
-        }
-    }
-
-    /*--------------------------------------------------------------------------
-     * Classify whether to put extra bits for FER mitigation
-     *--------------------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    IF( ( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) || EQ_16( st->last_core, HQ_CORE ) ) && GT_32( st->core_brate, MINIMUM_RATE_TO_ENCODE_VOICING_FLAG ) )
-    {
-        IF( Voicing_flag > 0 )
-        {
-            push_indice( hBstr, IND_HQ_VOICING_FLAG, 1, 1 );
-            num_bits = sub( num_bits, 1 );
-        }
-        ELSE
-        {
-            push_indice( hBstr, IND_HQ_VOICING_FLAG, 0, 1 );
-            num_bits = sub( num_bits, 1 );
-        }
-    }
-
-    /*--------------------------------------------------------------------------
-     * Transform-domain encoding
-     *--------------------------------------------------------------------------*/
-
-    scale_sig32( t_audio_fx, L_FRAME48k_EXT, sub( Q12, Q_audio ) );
-    scale_sig32( wtda_audio_fx32, 2 * L_FRAME48k, sub( Q12, Q_audio ) );
-    Q_audio = 12;
-    move16();
-    IF( EQ_16( hq_core_type, LOW_RATE_HQ_CORE ) )
-    {
-
-        hq_lr_enc_ivas_fx( st, t_audio_fx, inner_frame, &num_bits, is_transient );
-    }
-    ELSE
-    {
-        /* HQ high rate encoder */
-        hq_hr_enc_ivas_fx( st, t_audio_fx, L_spec, &num_bits, is_transient, vad_hover_flag );
-    }
-
-    /* write all unused bits to the bitstream */
-    num_bits = add( num_bits, extra_unused );
-
-    WHILE( GT_16( num_bits, 16 ) )
-    {
-        push_indice( hBstr, IND_UNUSED, 0, 16 );
-        num_bits = sub( num_bits, 16 );
-    }
-
-    IF( num_bits != 0 )
-    {
-        push_indice( hBstr, IND_UNUSED, 0, num_bits );
-    }
-
-    test();
-    test();
-    IF( st->element_mode > EVS_MONO && ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) )
-    {
-        overlap = st->hTcxCfg->tcx_mdct_window_length; /* Q0 */
-        move16();
-
-        nz = NS2SA( st->sr_core, N_ZERO_MDCT_NS );
-        move16();
-        L_frame = sub( st->L_frame + st->hTcxCfg->tcx_offset, st->hTcxCfg->lfacNext );
-        tcx_offset = st->hTcxCfg->lfacNext;
-        move16();
-
-        set16_fx( Aq_old_fx, 0, M + 1 ); /* Dummy filter */
-        Aq_old_fx[0] = 1;
-        move16();
-
-        /* Code taken from InternalTCXDecoder() */
-        Copy_Scale_sig_32_16( wtda_audio_fx32, wtda_audio_fx16, 2 * L_FRAME48k, negate( Q_audio ) ); // Q0
-        TCX_MDCT_Inverse( t_audio_fx, sub( sub( 31, Q_audio ), 15 ), wtda_audio_fx16, overlap, sub( L_frame, overlap ), overlap, st->element_mode );
-
-
-        /* Window current frame */
-        Word16 tcx_offset_tmp;
-
-        IF( tcx_offset < 0 )
-        {
-            tcx_offset_tmp = negate( tcx_offset );
-        }
-        ELSE
-        {
-            tcx_offset_tmp = 0;
-            move16();
-        }
-        tcx_windowing_synthesis_current_frame( wtda_audio_fx16, st->hTcxCfg->tcx_aldo_window_2, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, /*st->hTcxCfg->tcx_mdct_window_length*/ st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, st->last_core == ACELP_CORE, st->hTcxCfg->tcx_last_overlap_mode, /*left mode*/ st->hTcxEnc->acelp_zir, st->hTcxEnc->Txnq, NULL, Aq_old_fx, st->hTcxCfg->tcx_mdct_window_trans, shr( st->L_frame, 1 ), tcx_offset_tmp, st->last_core, 0, 0 );
-
-
-        /*Compute windowed synthesis in case of switching to ALDO windows in next frame*/
-        Copy( wtda_audio_fx16 + sub( L_frame, nz ), st->hTcxEnc->old_out_fx, nz + overlap ); /* Q0 */
-        set16_fx( st->hTcxEnc->old_out_fx + add( nz, overlap ), 0, nz );
-
-        tcx_windowing_synthesis_past_frame( st->hTcxEnc->old_out_fx + nz, st->hTcxCfg->tcx_aldo_window_1_trunc, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, FULL_OVERLAP );
-
-        FOR( i = 0; i < nz / 2; i++ )
-        {
-            // This implementation is diffrent in float code need to revisit to check its correctness.
-            st->hTcxEnc->old_out_fx[nz + overlap + i] = mult( wtda_audio_fx16[L_frame - 1 - i], st->hTcxCfg->tcx_aldo_window_1_trunc[i].v.re );                                        // Q0 + Q15 - Q15 -> Q0;
-            st->hTcxEnc->old_out_fx[nz / 2 + ( nz + overlap + i )] = mult( wtda_audio_fx16[nz / 2 + ( L_frame - 1 - i )], st->hTcxCfg->tcx_aldo_window_1_trunc[nz / 2 - 1 - i].v.im ); // Q0 + Q15 - Q15 -> Q0;
-            move16();
-            move16();
-        }
-
-        Copy( wtda_audio_fx16 + sub( shr( overlap, 1 ), tcx_offset ), output_fx, st->L_frame ); /* Q0 */
-    }
-    ELSE
-    {
-        Word16 tmp_q = Q_audio;
-        move16();
-        Word32 ener_match_fx = SQRT2_FIXED;
-        move32();
-        FOR( i = 0; i < input_frame; i++ )
-        {
-            t_audio_fx[i] = Mpy_32_32( t_audio_fx[i], ener_match_fx ); /* Q12 - 1 -> Q11 */
-            move32();
-        }
-
-        Q_audio = sub( Q_audio, 1 );
-        scale_sig32( wtda_audio_fx32, 2 * L_FRAME48k, sub( Q_audio, tmp_q ) ); /* Q_audio */
-        Inverse_Transform( t_audio_fx, &Q_audio, wtda_audio_fx32, is_transient, L_FRAME16k, inner_frame, st->element_mode );
-
-
-        out_q = Q_audio;
-        move16();
-        window_ola_fx( wtda_audio_fx32, output_fx, &out_q, st->hTcxEnc->old_out_fx, &old_q, L_FRAME16k, st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );
-
-        Scale_sig( output_fx, L_FRAME16k, negate( out_q ) );               /* Q0 */
-        Scale_sig( st->hTcxEnc->old_out_fx, L_FRAME32k, negate( old_q ) ); /* Q0 */
-        st->hTcxEnc->Q_old_out = 0;
-        move16();
-    }
-
-    IF( st->element_mode > EVS_MONO )
-    {
-        /* Store LB synthesis in case of switch to ACELP */
-        Copy( output_fx, st->hLPDmem->old_exc, L_FRAME16k );
-        st->hLPDmem->q_lpd_old_exc = 0;
-        move16();
-    }
-    pop_wmops();
-
-    return;
-}
diff --git a/lib_enc/hq_core_enc_fx.c b/lib_enc/hq_core_enc_fx.c
index 6dc7bb5b95f981002a28f310591ca9e2393384cb..b5e1abbca2d5383df9a9a9538635b2e2cad57058 100644
--- a/lib_enc/hq_core_enc_fx.c
+++ b/lib_enc/hq_core_enc_fx.c
@@ -2,11 +2,10 @@
     EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
   ====================================================================================*/
 #include <stdint.h>
-#include "options.h"    /* Compilation switches                   */
-#include "cnst.h"       /* Common constants                       */
-#include "rom_com_fx.h" /* Static table prototypes                */
-#include "rom_com.h"    /* Static table prototypes                */
-//#include "prot_fx.h"       /* Function prototypes                    */
+#include "options.h"     /* Compilation switches                   */
+#include "cnst.h"        /* Common constants                       */
+#include "rom_com_fx.h"  /* Static table prototypes                */
+#include "rom_com.h"     /* Static table prototypes                */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -36,15 +35,6 @@ void hq_core_enc_fx(
     Word16 tmp;
     Word32 L_tmp;
     UWord16 lsb;
-#ifdef ADD_IVAS_HQ_CODE_L_SPEC
-    Word16 L_spec;
-#endif
-#ifdef ADD_IVAS_HQ_CODE
-    Word16 left_overlap, right_overlap;
-    Word16 overlap, nz, tcx_offset, L_frame;
-    Word16 Aq_old[M + 1];
-    Word16 output[L_FRAME16k];
-#endif
     Word16 two_frames_buffer[2 * L_FRAME48k];
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
 
@@ -88,37 +78,6 @@ void hq_core_enc_fx(
 
     is_transient = detect_transient_fx( audio, input_frame, 0, st_fx ); /* Q0 */
 
-#ifdef ADD_IVAS_HQ_CODE
-    test();
-    test();
-    test();
-    IF( ( st_fx->element_mode > EVS_MONO ) && ( ( st_fx->last_core == ACELP_CORE ) || EQ_16( st_fx->last_core, AMR_WB_CORE ) ) )
-    {
-        /*--------------------------------------------------------------------------
-         * IVAS switching frame
-         *--------------------------------------------------------------------------*/
-
-        L_spec = input_frame;
-        left_overlap = -1;
-        right_overlap = -1;
-        move16();
-        move16();
-        move16();
-
-        WindowSignal( &( st_fx->tcx_cfg ), st_fx->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st_fx->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1 );
-        Q_audio = 16;
-        move16(); /*tbv inspired from core_enc_ol*/
-        TCX_MDCT( wtda_audio, t_audio, &Q_audio, left_overlap, sub( L_spec, shr( add( left_overlap, right_overlap ), 1 ) ), right_overlap, st_fx->element_mode );
-
-        inner_frame = inner_frame_tbl[st_fx->bwidth];
-        L_spec = l_spec_ext_tbl[st_fx->bwidth];
-        is_transient = 0;
-        move16();
-        move16();
-        move16();
-    }
-    ELSE
-#endif
     {
         /*--------------------------------------------------------------------------
          * Windowing and time-domain aliasing
@@ -145,10 +104,8 @@ void hq_core_enc_fx(
                 move16();
             }
         }
-#ifndef ADD_IVAS_HQ_CODE
         /* subtract signalling bits */
         num_bits = sub( num_bits, hBstr->nb_bits_tot ); /* Q0 */
-#endif
         direct_transform_fx( wtda_audio, t_audio, is_transient, input_frame, &Q_audio, st_fx->element_mode );
 
         /* scale coefficients to their nominal level (8kHz) */
@@ -175,10 +132,6 @@ void hq_core_enc_fx(
         /* limit encoded band-width according to the command-line OR BWD limitation */
         inner_frame = inner_frame_tbl[st_fx->bwidth]; /* Q0 */
         move16();
-#ifdef ADD_IVAS_HQ_CODE_L_SPEC
-        L_spec = l_spec_tbl[st_fx->bwidth];
-        move16();
-#endif
         IF( GT_16( input_frame, inner_frame ) )
         {
             IF( EQ_16( is_transient, 1 ) )
@@ -194,31 +147,10 @@ void hq_core_enc_fx(
             set32_fx( t_audio + inner_frame, 0, sub( input_frame, inner_frame ) );
         }
     }
-#ifdef ADD_IVAS_HQ_CODE_L_SPEC
-    /* subtract signalling bits */
-    num_bits = sub( num_bits, hBstr->nb_bits_tot_fx );
-#endif
-
     /*--------------------------------------------------------------------------
      * High-band gain control in case of BWS
      *--------------------------------------------------------------------------*/
-#ifdef ADD_IVAS_HQ_CODE
 
-    IF( st_fx->bwidth_sw_cnt > 0 )
-    {
-        IF( is_transient )
-        {
-            FOR( i = 0; i < NUM_TIME_SWITCHING_BLOCKS; i++ )
-            {
-                v_multc( t_audio + i * inner_frame / NUM_TIME_SWITCHING_BLOCKS + L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, t_audio + i * inner_frame / NUM_TIME_SWITCHING_BLOCKS + L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS, inner_frame / NUM_TIME_SWITCHING_BLOCKS - L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS );
-            }
-        }
-        ELSE
-        {
-            v_multc( t_audio + L_FRAME16k, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, t_audio + L_FRAME16k, L_spec - L_FRAME16k );
-        }
-    }
-#endif
     /*--------------------------------------------------------------------------
      * Classify whether to put extra bits for FER mitigation
      *--------------------------------------------------------------------------*/
@@ -230,12 +162,12 @@ void hq_core_enc_fx(
     {
         IF( Voicing_flag > 0 )
         {
-            push_indice_fx( hBstr, IND_HQ_VOICING_FLAG, 1, 1 );
+            push_indice( hBstr, IND_HQ_VOICING_FLAG, 1, 1 );
             num_bits = sub( num_bits, 1 );
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_HQ_VOICING_FLAG, 0, 1 );
+            push_indice( hBstr, IND_HQ_VOICING_FLAG, 0, 1 );
             num_bits = sub( num_bits, 1 );
         }
     }
@@ -264,12 +196,7 @@ void hq_core_enc_fx(
             t_audio[i] = L_shr( t_audio[i], sub( Q_audio, 12 ) ); /* Q12 */
             move32();
         }
-
-#ifdef ADD_IVAS_HQ_CODE_L_SPEC
-        hq_hr_enc_fx( st_fx, t_audio, L_spec, &num_bits, is_transient, vad_hover_flag );
-#else
         hq_hr_enc_fx( st_fx, t_audio, inner_frame, &num_bits, is_transient, vad_hover_flag );
-#endif
         Q_audio = 12;
         move16();
     }
@@ -279,59 +206,14 @@ void hq_core_enc_fx(
 
     WHILE( num_bits >= 16 )
     {
-        push_indice_fx( hBstr, IND_UNUSED, 0, 16 );
+        push_indice( hBstr, IND_UNUSED, 0, 16 );
         num_bits = sub( num_bits, 16 );
     }
 
     IF( num_bits != 0 )
     {
-        push_indice_fx( hBstr, IND_UNUSED, 0, num_bits );
+        push_indice( hBstr, IND_UNUSED, 0, num_bits );
     }
-#ifdef ADD_IVAS_HQ_CODE
-    if ( st->element_mode > EVS_MONO && ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE ) )
-    {
-        overlap = st->hTcxCfg->tcx_mdct_window_length;
-        nz = NS2SA( st->sr_core, N_ZERO_MDCT_NS );
-        L_frame = (int16_t) ( st->L_frame + st->hTcxCfg->tcx_offset - st->hTcxCfg->lfacNext );
-        tcx_offset = st->hTcxCfg->lfacNext;
-        set_f( Aq_old, 0, M + 1 ); /* Dummy filter */
-        Aq_old[0] = 1;
-
-        /* Code taken from InternalTCXDecoder() */
-        TCX_MDCT_Inverse( t_audio, wtda_audio, overlap, L_frame - overlap, overlap, st->element_mode );
-
-        /* Window current frame */
-        tcx_windowing_synthesis_current_frame( wtda_audio, st->hTcxCfg->tcx_aldo_window_2, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, /*st->hTcxCfg->tcx_mdct_window_length*/ st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, st->last_core == ACELP_CORE, st->hTcxCfg->tcx_last_overlap_mode, /*left mode*/ st->hTcxEnc->acelp_zir, st->hTcxEnc->Txnq, NULL, Aq_old, st->hTcxCfg->tcx_mdct_window_trans, st->L_frame >> 1, tcx_offset < 0 ? -tcx_offset : 0, st->last_core, 0, 0 );
-
-        /*Compute windowed synthesis in case of switching to ALDO windows in next frame*/
-        mvr2r( wtda_audio + L_frame - nz, st->hTcxEnc->old_out, nz + overlap );
-        set_zero( st->hTcxEnc->old_out + nz + overlap, nz );
-
-        tcx_windowing_synthesis_past_frame( st->hTcxEnc->old_out + nz, st->hTcxCfg->tcx_aldo_window_1_trunc, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, FULL_OVERLAP );
-
-        for ( i = 0; i < nz; i++ )
-        {
-            st->hTcxEnc->old_out[nz + overlap + i] = wtda_audio[L_frame - 1 - i] * st->hTcxCfg->tcx_aldo_window_1_trunc[-1 - i];
-        }
-        mvr2r( wtda_audio + ( overlap >> 1 ) - tcx_offset, output, st->L_frame );
-    }
-    else
-    {
-        ener_match = (float) sqrt( (float) L_FRAME16k / (float) NORM_MDCT_FACTOR );
-        v_multc( t_audio, ener_match, t_audio, inner_frame );
-
-        inverse_transform( t_audio, wtda_audio, is_transient, L_FRAME16k, inner_frame, st->element_mode );
-
-        window_ola( wtda_audio, output, st->hTcxEnc->old_out, L_FRAME16k, st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );
-    }
-
-    if ( st->element_mode > EVS_MONO )
-    {
-        /* Store LB synthesis in case of switch to ACELP */
-        mvr2r( output, st->hLPDmem->old_exc, L_FRAME16k );
-    }
-#endif
-
     return;
 }
 
@@ -375,7 +257,6 @@ void HQ_core_enc_init_fx(
     hHQ_core->last_max_pos_pulse = 0;
     move16();
 
-#ifdef MSAN_FIX
     hHQ_core->crest_lp_fx = HQ_CREST_THRESHOLD_FX; /* Q28 */
     move32();
     hHQ_core->crest_lp_q = Q28;
@@ -384,7 +265,360 @@ void HQ_core_enc_init_fx(
     move32();
     hHQ_core->crest_mod_lp_q = Q29;
     move16();
-#endif
+
+    return;
+}
+
+void hq_core_enc_ivas_fx(
+    Encoder_State *st,             /* i/o: encoder state structure */
+    const Word16 *audio_fx,        /* i  : input audio signal      Q0 */
+    const Word16 input_frame_orig, /* i  : frame length            Q0*/
+    const Word16 hq_core_type,     /* i  : HQ core type            Q0*/
+    const Word16 Voicing_flag,     /* i  : Voicing flag for FER method selection     Q0*/
+    const Word16 vad_hover_flag    /* i  : VAD hangover flag                 Q0*/
+)
+{
+    Word16 i, is_transient, num_bits, extra_unused;
+
+    Word32 t_audio_fx[L_FRAME48k_EXT];
+    Word16 wtda_audio_fx16[2 * L_FRAME48k];
+    Word32 wtda_audio_fx32[2 * L_FRAME48k];
+    Word16 two_frames_buffer[2 * L_FRAME48k];
+    Word16 tmp;
+    Word16 Aq_old_fx[M + 1];
+    Word16 output_fx[L_FRAME48k];
+    Word16 Q_audio;
+    Word16 out_q = 0, old_q = 0;
+    move16();
+    move16();
+    Word16 inner_frame, input_frame, L_frame;
+    Word16 L_spec, overlap, nz, tcx_offset;
+    Word16 left_overlap, right_overlap;
+    BSTR_ENC_HANDLE hBstr = st->hBstr;
+    Word16 q = 0;
+    Word16 exp;
+    move16();
+
+    push_wmops( "hq_core_enc" );
+
+    set16_fx( wtda_audio_fx16, 0, 2 * L_FRAME48k );
+    set32_fx( wtda_audio_fx32, 0, 2 * L_FRAME48k );
+    st->Nb_ACELP_frames = 0;
+    move16();
+    set_zero_fx( t_audio_fx, L_FRAME48k_EXT );
+    /* set input_frame length */
+    input_frame = input_frame_orig; /* Q0 */
+
+    /* Sanity check, it should never happen at the encoder side (no BFI) */
+    IF( st->hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP )
+    {
+        st->hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW;
+        move16();
+    }
+    ELSE
+    {
+        st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode;
+        move16();
+    }
+    st->hTcxCfg->tcx_curr_overlap_mode = ALDO_WINDOW;
+    move16();
+
+    /*--------------------------------------------------------------------------
+     * Preprocessing in the first HQ frame after ACELP frame
+     * Find the number of bits for PVQ coding
+     * Write signaling information
+     *--------------------------------------------------------------------------*/
+
+    num_bits = BASOP_Util_Divide3232_Scale( st->total_brate, FRAMES_PER_SEC, &exp ); /* Q15-exp */
+    num_bits = shr( num_bits, sub( 15, exp ) );                                      /* Q0 */
+    extra_unused = 0;
+    move16();
+
+    /*--------------------------------------------------------------------------
+     * Detect signal transition
+     *--------------------------------------------------------------------------*/
+
+    is_transient = detect_transient_fx( audio_fx, input_frame, 0, st ); /* Q0 */
+    move16();
+
+    test();
+    test();
+    IF( st->element_mode > EVS_MONO && ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) )
+    {
+        /*--------------------------------------------------------------------------
+         * IVAS switching frame
+         *--------------------------------------------------------------------------*/
+
+        L_spec = input_frame;
+        left_overlap = -1;
+        right_overlap = -1;
+        move16();
+        move16();
+        move16();
+
+        WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio_fx16, 1, 1 );
+
+        q = 0;
+        move16();
+        Q_audio = sub( Q16, q );
+        TCX_MDCT( wtda_audio_fx16, t_audio_fx, &Q_audio, left_overlap, sub( L_spec, shr( add( left_overlap, right_overlap ), 1 ) ), right_overlap, st->element_mode );
+        Q_audio = sub( Q31, Q_audio );
+        Copy_Scale_sig_16_32_no_sat( wtda_audio_fx16, wtda_audio_fx32, 2 * L_FRAME48k, sub( Q_audio, q ) ); /* Q_audio */
+        inner_frame = inner_frame_tbl[st->bwidth];                                                          /* Q0 */
+        L_spec = l_spec_ext_tbl[st->bwidth];                                                                /* Q0 */
+        is_transient = 0;
+        move16();
+        move16();
+        move16();
+    }
+    ELSE
+    {
+        /*--------------------------------------------------------------------------
+         * Windowing and time-domain aliasing
+         * DCT transform
+         *--------------------------------------------------------------------------*/
+        Q_audio = 0;
+        move16();
+        Scale_sig( st->old_input_signal_fx, input_frame, negate( st->q_old_inp ) );                               /* Q0 */
+        Scale_sig( st->input_fx, add( input_frame, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), negate( st->q_inp ) ); /* Q0 */
+        st->q_old_inp = 0;
+        move16();
+        st->q_inp = 0;
+        move16();
+        Copy( st->old_input_signal_fx, two_frames_buffer, input_frame ); /* Q0 */
+        Copy( audio_fx, two_frames_buffer + input_frame, input_frame );  /* Q0 */
+
+        wtda_fx( two_frames_buffer + input_frame, &Q_audio, wtda_audio_fx32, NULL, 0,
+                 st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, input_frame );
+
+        test();
+        IF( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) )
+        {
+            /* Preprocessing in the first HQ frame after ACELP frame */
+            core_switching_hq_prepare_enc_fx( st, &num_bits, input_frame, wtda_audio_fx32, two_frames_buffer + input_frame );
+
+            /* During ACELP->HQ core switching, limit the HQ core bitrate to 48kbps */
+            IF( GT_16( num_bits, ACELP_48k_BITS ) )
+            {
+                extra_unused = sub( num_bits, ACELP_48k_BITS );
+                num_bits = ACELP_48k_BITS;
+                move16();
+            }
+        }
+
+        Word16 tmp_q = Q_audio;
+        move16();
+        direct_transform_fx( wtda_audio_fx32, t_audio_fx, is_transient, input_frame, &Q_audio, st->element_mode );
+        scale_sig32( wtda_audio_fx32, L_FRAME48k_EXT, sub( Q_audio, tmp_q ) ); /* Q_audio */
+
+        /* scale coefficients to their nominal level (8kHz) */
+        IF( NE_16( input_frame, NORM_MDCT_FACTOR ) )
+        {
+            UWord16 lsb;
+            tmp = mult_r( input_frame, 410 / 2 ); /* 1/8000 in Q15 */
+            Word16 ener_match_fx = hq_nominal_scaling[tmp];
+            move16();
+            FOR( i = 0; i < input_frame; i++ )
+            {
+                /*t_audio_q[i] *= ener_match; */
+                Mpy_32_16_ss( t_audio_fx[i], ener_match_fx, &t_audio_fx[i], &lsb ); /* Q12 */
+                move16();
+            }
+        }
+
+        /* limit encoded band-width according to the command-line OR BWD limitation */
+        inner_frame = inner_frame_tbl[st->bwidth]; /* Q0 */
+        L_spec = l_spec_tbl[st->bwidth];           /* Q0 */
+
+        move16();
+        move16();
+
+
+        IF( GT_16( input_frame, inner_frame ) )
+        {
+            IF( EQ_16( is_transient, 1 ) )
+            {
+                FOR( i = 1; i < NUM_TIME_SWITCHING_BLOCKS; i++ )
+                {
+                    tmp = shr( inner_frame, 2 );
+                    Copy32( t_audio_fx + i_mult2( i, shr( input_frame, 2 ) ), t_audio_fx + i_mult2( i, tmp ), tmp ); /* Q_audio */
+                }
+            }
+
+            set32_fx( t_audio_fx + inner_frame, 0, sub( input_frame, inner_frame ) );
+        }
+    }
+
+
+    /* subtract signaling bits */
+    num_bits = sub( num_bits, hBstr->nb_bits_tot ); /* Q0 */
+
+    /*--------------------------------------------------------------------------
+     * High-band gain control in case of BWS
+     *--------------------------------------------------------------------------*/
+
+    IF( st->bwidth_sw_cnt > 0 )
+    {
+        Word32 L_tmp;
+        tmp = BASOP_Util_Divide1616_Scale( 3, BWS_TRAN_PERIOD, &exp ); /* Q15-exp */
+        shr( tmp, exp );
+        L_tmp = L_deposit_h( tmp ); /* Q31-exp */
+        IF( is_transient )
+        {
+            FOR( i = 0; i < NUM_TIME_SWITCHING_BLOCKS; i++ )
+            {
+                v_multc_fixed( t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), L_tmp, t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), sub( shr( inner_frame, 2 ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ) ); // Q_audio + Q31 - Q31 -> Q_audio
+            }
+        }
+        ELSE
+        {
+            v_multc_fixed( t_audio_fx + L_FRAME16k, L_tmp, t_audio_fx + L_FRAME16k, L_spec - L_FRAME16k ); // Q_audio + Q31 - Q31 -> Q_audio
+        }
+    }
+
+    /*--------------------------------------------------------------------------
+     * Classify whether to put extra bits for FER mitigation
+     *--------------------------------------------------------------------------*/
+
+    test();
+    test();
+    test();
+    IF( ( EQ_16( st->last_core, TCX_20_CORE ) || EQ_16( st->last_core, TCX_10_CORE ) || EQ_16( st->last_core, HQ_CORE ) ) && GT_32( st->core_brate, MINIMUM_RATE_TO_ENCODE_VOICING_FLAG ) )
+    {
+        IF( Voicing_flag > 0 )
+        {
+            push_indice( hBstr, IND_HQ_VOICING_FLAG, 1, 1 );
+            num_bits = sub( num_bits, 1 );
+        }
+        ELSE
+        {
+            push_indice( hBstr, IND_HQ_VOICING_FLAG, 0, 1 );
+            num_bits = sub( num_bits, 1 );
+        }
+    }
+
+    /*--------------------------------------------------------------------------
+     * Transform-domain encoding
+     *--------------------------------------------------------------------------*/
+
+    scale_sig32( t_audio_fx, L_FRAME48k_EXT, sub( Q12, Q_audio ) );
+    scale_sig32( wtda_audio_fx32, 2 * L_FRAME48k, sub( Q12, Q_audio ) );
+    Q_audio = 12;
+    move16();
+    IF( EQ_16( hq_core_type, LOW_RATE_HQ_CORE ) )
+    {
+
+        hq_lr_enc_ivas_fx( st, t_audio_fx, inner_frame, &num_bits, is_transient );
+    }
+    ELSE
+    {
+        /* HQ high rate encoder */
+        hq_hr_enc_ivas_fx( st, t_audio_fx, L_spec, &num_bits, is_transient, vad_hover_flag );
+    }
+
+    /* write all unused bits to the bitstream */
+    num_bits = add( num_bits, extra_unused );
+
+    WHILE( GT_16( num_bits, 16 ) )
+    {
+        push_indice( hBstr, IND_UNUSED, 0, 16 );
+        num_bits = sub( num_bits, 16 );
+    }
+
+    IF( num_bits != 0 )
+    {
+        push_indice( hBstr, IND_UNUSED, 0, num_bits );
+    }
+
+    test();
+    test();
+    IF( st->element_mode > EVS_MONO && ( st->last_core == ACELP_CORE || EQ_16( st->last_core, AMR_WB_CORE ) ) )
+    {
+        overlap = st->hTcxCfg->tcx_mdct_window_length; /* Q0 */
+        move16();
+
+        nz = NS2SA( st->sr_core, N_ZERO_MDCT_NS );
+        move16();
+        L_frame = sub( st->L_frame + st->hTcxCfg->tcx_offset, st->hTcxCfg->lfacNext );
+        tcx_offset = st->hTcxCfg->lfacNext;
+        move16();
+
+        set16_fx( Aq_old_fx, 0, M + 1 ); /* Dummy filter */
+        Aq_old_fx[0] = 1;
+        move16();
+
+        /* Code taken from InternalTCXDecoder() */
+        Copy_Scale_sig_32_16( wtda_audio_fx32, wtda_audio_fx16, 2 * L_FRAME48k, negate( Q_audio ) ); // Q0
+        TCX_MDCT_Inverse( t_audio_fx, sub( sub( 31, Q_audio ), 15 ), wtda_audio_fx16, overlap, sub( L_frame, overlap ), overlap, st->element_mode );
+
+
+        /* Window current frame */
+        Word16 tcx_offset_tmp;
+
+        IF( tcx_offset < 0 )
+        {
+            tcx_offset_tmp = negate( tcx_offset );
+        }
+        ELSE
+        {
+            tcx_offset_tmp = 0;
+            move16();
+        }
+        tcx_windowing_synthesis_current_frame( wtda_audio_fx16, st->hTcxCfg->tcx_aldo_window_2, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, /*st->hTcxCfg->tcx_mdct_window_length*/ st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, st->last_core == ACELP_CORE, st->hTcxCfg->tcx_last_overlap_mode, /*left mode*/ st->hTcxEnc->acelp_zir, st->hTcxEnc->Txnq, NULL, Aq_old_fx, st->hTcxCfg->tcx_mdct_window_trans, shr( st->L_frame, 1 ), tcx_offset_tmp, st->last_core, 0, 0 );
+
+
+        /*Compute windowed synthesis in case of switching to ALDO windows in next frame*/
+        Copy( wtda_audio_fx16 + sub( L_frame, nz ), st->hTcxEnc->old_out_fx, nz + overlap ); /* Q0 */
+        set16_fx( st->hTcxEnc->old_out_fx + add( nz, overlap ), 0, nz );
+
+        tcx_windowing_synthesis_past_frame( st->hTcxEnc->old_out_fx + nz, st->hTcxCfg->tcx_aldo_window_1_trunc, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, FULL_OVERLAP );
+
+        FOR( i = 0; i < nz / 2; i++ )
+        {
+            // This implementation is diffrent in float code need to revisit to check its correctness.
+            st->hTcxEnc->old_out_fx[nz + overlap + i] = mult( wtda_audio_fx16[L_frame - 1 - i], st->hTcxCfg->tcx_aldo_window_1_trunc[i].v.re );                                        // Q0 + Q15 - Q15 -> Q0;
+            st->hTcxEnc->old_out_fx[nz / 2 + ( nz + overlap + i )] = mult( wtda_audio_fx16[nz / 2 + ( L_frame - 1 - i )], st->hTcxCfg->tcx_aldo_window_1_trunc[nz / 2 - 1 - i].v.im ); // Q0 + Q15 - Q15 -> Q0;
+            move16();
+            move16();
+        }
+
+        Copy( wtda_audio_fx16 + sub( shr( overlap, 1 ), tcx_offset ), output_fx, st->L_frame ); /* Q0 */
+    }
+    ELSE
+    {
+        Word16 tmp_q = Q_audio;
+        move16();
+        Word32 ener_match_fx = SQRT2_FIXED;
+        move32();
+        FOR( i = 0; i < input_frame; i++ )
+        {
+            t_audio_fx[i] = Mpy_32_32( t_audio_fx[i], ener_match_fx ); /* Q12 - 1 -> Q11 */
+            move32();
+        }
+
+        Q_audio = sub( Q_audio, 1 );
+        scale_sig32( wtda_audio_fx32, 2 * L_FRAME48k, sub( Q_audio, tmp_q ) ); /* Q_audio */
+        Inverse_Transform( t_audio_fx, &Q_audio, wtda_audio_fx32, is_transient, L_FRAME16k, inner_frame, st->element_mode );
+
+
+        out_q = Q_audio;
+        move16();
+        window_ola_fx( wtda_audio_fx32, output_fx, &out_q, st->hTcxEnc->old_out_fx, &old_q, L_FRAME16k, st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );
+
+        Scale_sig( output_fx, L_FRAME16k, negate( out_q ) );               /* Q0 */
+        Scale_sig( st->hTcxEnc->old_out_fx, L_FRAME32k, negate( old_q ) ); /* Q0 */
+        st->hTcxEnc->Q_old_out = 0;
+        move16();
+    }
+
+    IF( st->element_mode > EVS_MONO )
+    {
+        /* Store LB synthesis in case of switch to ACELP */
+        Copy( output_fx, st->hLPDmem->old_exc, L_FRAME16k );
+        st->hLPDmem->q_lpd_old_exc = 0;
+        move16();
+    }
+    pop_wmops();
 
     return;
 }
diff --git a/lib_enc/hq_env_enc.c b/lib_enc/hq_env_enc.c
deleted file mode 100644
index 4e446e1c5a57ada7a8af2fc99cc725b46226a312..0000000000000000000000000000000000000000
--- a/lib_enc/hq_env_enc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/hq_env_enc_fx.c b/lib_enc/hq_env_enc_fx.c
index b0875968e2c2ede803105d6d7fae94bea062f55e..f033bd685b8e5c1c48bd3485a23bf2b82b560411 100644
--- a/lib_enc/hq_env_enc_fx.c
+++ b/lib_enc/hq_env_enc_fx.c
@@ -10,7 +10,6 @@
 #include "stl.h"
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
 
 /*--------------------------------------------------------------------------------------*
  * encode_envelope_indices_fx()
@@ -296,13 +295,13 @@ Word16 encode_envelope_indices_fx(                           /* o  : Number of b
         test();
         IF( EQ_16( flag_HQ2, LOW_RATE_HQ_CORE_TRAN ) || EQ_16( flag_HQ2, LOW_RATE_HQ_CORE ) )
         {
-            push_indice_fx( hBstr, IND_HQ2_DENG_HMODE, *LCmode, BITS_DE_HMODE );
-            push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, difidx[0], BITS_DE_FCOMP );
+            push_indice( hBstr, IND_HQ2_DENG_HMODE, *LCmode, BITS_DE_HMODE );
+            push_indice( hBstr, IND_HQ2_DIFF_ENERGY, difidx[0], BITS_DE_FCOMP );
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_LC_MODE, *LCmode, 2 );
-            push_indice_fx( hBstr, IND_YNRM, difidx[0], NORM0_BITS );
+            push_indice( hBstr, IND_LC_MODE, *LCmode, 2 );
+            push_indice( hBstr, IND_YNRM, difidx[0], NORM0_BITS );
         }
 
         test();
@@ -332,7 +331,7 @@ Word16 encode_envelope_indices_fx(                           /* o  : Number of b
                         m = lshr( m, 1 );             /* Q0 */
                     }
 
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, v, r );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, v, r );
                 }
             }
             ELSE
@@ -371,7 +370,7 @@ Word16 encode_envelope_indices_fx(                           /* o  : Number of b
                             move16();
                         }
                     }
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, m, r );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, m, r );
                     prevj = j;
                     move16();
                 }
@@ -420,11 +419,11 @@ Word16 encode_envelope_indices_fx(                           /* o  : Number of b
 
                     IF( EQ_16( flag_HQ2, LOW_RATE_HQ_CORE ) )
                     {
-                        push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, m, r );
+                        push_indice( hBstr, IND_HQ2_DIFF_ENERGY, m, r );
                     }
                     ELSE
                     {
-                        push_indice_fx( hBstr, IND_YNRM, m, r );
+                        push_indice( hBstr, IND_YNRM, m, r );
                     }
 
                     prevj = j;
@@ -516,11 +515,11 @@ Word16 encode_envelope_indices_fx(                           /* o  : Number of b
 
                     IF( flag_HQ2 == 0 )
                     {
-                        push_indice_fx( hBstr, IND_YNRM, v, r );
+                        push_indice( hBstr, IND_YNRM, v, r );
                     }
                     ELSE
                     {
-                        push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, v, r );
+                        push_indice( hBstr, IND_HQ2_DIFF_ENERGY, v, r );
                     }
                 }
             }
@@ -537,14 +536,14 @@ Word16 encode_envelope_indices_fx(                           /* o  : Number of b
                     r = huffsizn[j]; /* Q0 */
                     move16();
 
-                    push_indice_fx( hBstr, IND_YNRM, m, r );
+                    push_indice( hBstr, IND_YNRM, m, r );
                 }
             }
             ELSE
             {
                 FOR( i = 1; i < num_sfm; i++ )
                 {
-                    push_indice_fx( hBstr, IND_YNRM, difidx[i], NORMI_BITS );
+                    push_indice( hBstr, IND_YNRM, difidx[i], NORMI_BITS );
                 }
             }
         }
diff --git a/lib_enc/hq_hr_enc.c b/lib_enc/hq_hr_enc.c
deleted file mode 100644
index f73925978f0f7f80cdad30357bf272f047979f7d..0000000000000000000000000000000000000000
--- a/lib_enc/hq_hr_enc.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "ivas_prot_fx.h"
-#include "prot_fx_enc.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*--------------------------------------------------------------------------*
- * hq_hr_enc()
- *
- * HQ high rate encoding routine
- *--------------------------------------------------------------------------*/
-
-void hq_hr_enc_ivas_fx(
-    Encoder_State *st,          /* i/o: encoder state structure             */
-    Word32 *t_audio_fx,         /* i/o: transform-domain coefficients       Q12*/
-    const Word16 length,        /* i  : length of spectrum                  Q0*/
-    Word16 *num_bits,           /* i/o: number of available bits            Q0*/
-    const Word16 is_transient,  /* i  : transient flag                      Q0*/
-    const Word16 vad_hover_flag /* i  : VAD hangover flag                   Q0*/
-)
-{
-    Word16 nb_sfm;
-    Word16 sum, hcode_l;
-    Word16 difidx[NB_SFM];
-    Word16 normqlg2[NB_SFM], ynrm[NB_SFM];
-    Word16 nf_idx;
-    Word16 bits;
-    Word16 LCmode;
-    Word16 shape_bits, num_sfm, numnrmibits;
-    Word16 hqswb_clas;
-    Word16 num_env_bands;
-    Word16 Npeaks, start_norm;
-    Word16 difidx_org[NB_SFM];
-    Word16 R[NB_SFM];
-    Word16 peaks[HVQ_MAX_PEAKS];
-    Word16 sfmsize[NB_SFM], sfm_start[NB_SFM], sfm_end[NB_SFM];
-    Word16 npulses[NB_SFM], maxpulse[NB_SFM];
-    Word16 Rsubband[NB_SFM]; /* Q3 */
-    Word32 t_audio_q_fx[L_SPEC48k_EXT];
-    Word16 noise_level_fx[HVQ_BWE_NOISE_BANDS];
-    Word16 hq_generic_offset;
-    Word16 hq_generic_exc_clas = 0;
-    move16();
-    Word16 core_sfm;
-    Word16 har_freq_est1 = 0, har_freq_est2 = 0;
-    move16();
-    move16();
-    Word16 flag_dis = 1;
-    move16();
-    const Word16 *subband_search_offset;
-    Word16 wBands[2];
-    Word16 b_delta_env;
-    HQ_ENC_HANDLE hHQ_core = st->hHQ_core;
-    BSTR_ENC_HANDLE hBstr = st->hBstr;
-    Word16 att_fx;
-    Word16 t_audio_norm[L_FRAME48k_EXT];
-    Word16 t_audio_q_norm[L_FRAME48k_EXT];
-    Word32 nf_gains_fx[HVQ_NF_GROUPS], pe_gains_fx[HVQ_NF_GROUPS];
-    Word16 hq_generic_fenv_fx[HQ_FB_FENV];
-    /*------------------------------------------------------------------*
-     * Initializations
-     *------------------------------------------------------------------*/
-
-    Npeaks = 0;
-    move16();
-    set16_fx( npulses, 0, NB_SFM );
-    set16_fx( maxpulse, 0, NB_SFM );
-    set16_fx( difidx_org, 0, NB_SFM );
-    set32_fx( t_audio_q_fx, 0, L_FRAME48k );
-    set32_fx( nf_gains_fx, 0, HVQ_NF_GROUPS );
-    set32_fx( pe_gains_fx, 0, HVQ_NF_GROUPS );
-    /*------------------------------------------------------------------*
-     * Classification
-     *------------------------------------------------------------------*/
-    bits = hq_classifier_enc_ivas_fx( st, length, t_audio_fx, is_transient, &Npeaks, peaks, pe_gains_fx, nf_gains_fx, &hqswb_clas ); /* Q0 */
-    *num_bits = sub( *num_bits, bits );
-    move16();
-
-    /*------------------------------------------------------------------*
-     * Set quantization parameters
-     *------------------------------------------------------------------*/
-
-    hq_configure_fx( length, hqswb_clas, st->core_brate, &num_sfm, &nb_sfm, &start_norm, &num_env_bands, &numnrmibits, &hq_generic_offset, sfmsize, sfm_start, sfm_end );
-
-    /*------------------------------------------------------------------*
-     * Transient frame handling
-     *------------------------------------------------------------------*/
-    /* Interleave MLT coefficients of 4 sub-vectors in case of transient frame */
-    IF( is_transient )
-    {
-        interleave_spectrum_ivas_fx( t_audio_fx, length );
-    }
-    test();
-    IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
-    {
-        calculate_hangover_attenuation_gain_ivas_fx( st, &att_fx, vad_hover_flag );
-        v_multc_att32( t_audio_fx, att_fx, t_audio_fx, sfm_end[( num_sfm - 1 )] ); /* Q12 */
-    }
-
-    /*------------------------------------------------------------------*
-     * Scalar quantization of norms
-     * Encode norm indices
-     *------------------------------------------------------------------*/
-
-    /* calculate and quantize norms */
-    calc_norm_ivas_fx( t_audio_fx, ynrm, normqlg2, start_norm, num_env_bands, sfmsize, sfm_start );
-    /* create differential code of quantized norm indices */
-    diff_envelope_coding_fx( is_transient, num_env_bands, start_norm, ynrm, normqlg2, difidx );
-
-    /* Find norm coding mode and calculate number of bits */
-    hcode_l = encode_envelope_indices_ivas_fx( hBstr, num_env_bands, numnrmibits, difidx, &LCmode, 0, NORMAL_HQ_CORE, is_transient ); /* Q0 */
-
-    *num_bits = sub( *num_bits, add( hcode_l, NORM0_BITS + FLAGS_BITS ) );
-    move16();
-    /* Encode norm indices */
-    encode_envelope_indices_ivas_fx( hBstr, num_env_bands, numnrmibits, difidx, &LCmode, 1, NORMAL_HQ_CORE, is_transient );
-
-    /*------------------------------------------------------------------*
-     * HQ GENERIC BWE encoding
-     *------------------------------------------------------------------*/
-
-    test();
-    IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
-    {
-        hq_generic_hf_encoding_fx( t_audio_fx, hq_generic_fenv_fx, hq_generic_offset, st, &hq_generic_exc_clas, length );
-
-        IF( EQ_16( hq_generic_exc_clas, HQ_GENERIC_SP_EXC ) )
-        {
-            *num_bits = add( *num_bits, 1 ); /* conditional 1 bit saving for representing FD3 BWE excitation class */
-            move16();
-        }
-        map_hq_generic_fenv_norm_fx( hqswb_clas, hq_generic_fenv_fx, ynrm, normqlg2, num_env_bands, nb_sfm, hq_generic_offset );
-    }
-
-    /*------------------------------------------------------------------*
-     * Bit allocation
-     *------------------------------------------------------------------*/
-
-    ivas_hq_bit_allocation_fx( st->core_brate, length, hqswb_clas, num_bits, normqlg2, nb_sfm, sfmsize, noise_level_fx, R, Rsubband, &sum, &core_sfm, num_env_bands );
-
-    /*------------------------------------------------------------------*
-     * Normalize coefficients with quantized norms
-     *------------------------------------------------------------------*/
-    IF( NE_16( hqswb_clas, HQ_HVQ ) )
-    {
-        test();
-        IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
-        {
-            b_delta_env = calc_nor_delta_hf_ivas_fx( hBstr, t_audio_fx, ynrm, Rsubband, num_env_bands, nb_sfm, sfmsize, sfm_start, core_sfm ); /* Q0 */
-            sum = sub( sum, b_delta_env );
-        }
-        normalizecoefs_fx( t_audio_fx, ynrm, nb_sfm, sfm_start, sfm_end, t_audio_norm );
-    }
-    Word16 Q_audio = 12, Q_shift;
-    move16();
-    /*------------------------------------------------------------------*
-     * Quantize/code spectral fine structure using PVQ or HVQ
-     *------------------------------------------------------------------*/
-    IF( EQ_16( hqswb_clas, HQ_HVQ ) )
-    {
-        sum = hvq_enc_ivas_fx( st, st->core_brate, *num_bits, Npeaks, ynrm, R, peaks, nf_gains_fx, noise_level_fx, pe_gains_fx, t_audio_fx, t_audio_q_fx );
-        *num_bits = sub( *num_bits, sum );
-        move16();
-    }
-    ELSE
-    {
-        shape_bits = pvq_core_enc_ivas_fx( hBstr, t_audio_norm, t_audio_q_norm, &Q_audio, sum, nb_sfm, sfm_start, sfm_end, sfmsize, Rsubband, R, npulses, maxpulse, HQ_CORE ); /* Q0 */
-        *num_bits = add( *num_bits, sub( sum, shape_bits ) );
-        move16();
-    }
-
-    test();
-    IF( EQ_16( hqswb_clas, HQ_HVQ ) || EQ_16( hqswb_clas, HQ_HARMONIC ) )
-    {
-        subband_search_offset = subband_search_offsets_13p2kbps_Har; /* Q0 */
-        wBands[0] = SWB_SB_BW_LEN0_16KBPS_HAR;                       /* Q0 */
-        wBands[1] = SWB_SB_BW_LEN1_16KBPS_HAR;                       /* Q0 */
-        move16();
-        move16();
-        IF( EQ_16( hqswb_clas, HQ_HARMONIC ) )
-        {
-            Q_shift = sub( SWB_BWE_LR_Qs, Q_audio );
-            FOR( Word16 i = 0; i < 300; i++ )
-            {
-                t_audio_q_fx[i] = L_shl( L_deposit_l( t_audio_q_norm[i] ), Q_shift ); /* Q12 */
-                move32();
-            }
-        }
-        har_est_fx( t_audio_q_fx, 300, &har_freq_est1, &har_freq_est2, &flag_dis, &hHQ_core->prev_frm_hfe2, subband_search_offset, wBands, &hHQ_core->prev_stab_hfe2 );
-
-        hHQ_core->prev_frm_hfe2 = har_freq_est2;
-        move16();
-    }
-
-    /* reset LR-HQ memories */
-    hHQ_core->prev_frm_hfe2 = 0; /*reset*/
-    hHQ_core->prev_stab_hfe2 = 0;
-    move16();
-    move16();
-    nf_idx = 0;
-    move16();
-    test();
-    test();
-    test();
-    IF( NE_16( is_transient, 1 ) && NE_16( hqswb_clas, HQ_HVQ ) && !( EQ_16( length, L_FRAME16k ) && LE_32( st->core_brate, HQ_32k ) ) )
-    {
-        test();
-        IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
-        {
-            nf_idx = noise_adjust_fx( t_audio_norm, 12, R, sfm_start, sfm_end, s_max( core_sfm, sub( num_env_bands, 1 ) ) ); /* Q0 */
-            push_indice( hBstr, IND_NF_IDX, nf_idx, 2 );
-        }
-        ELSE
-        {
-            nf_idx = noise_adjust_fx( t_audio_norm, 12, R, sfm_start, sfm_end, core_sfm ); /* Q0 */
-            push_indice( hBstr, IND_NF_IDX, nf_idx, 2 );
-        }
-    }
-
-
-    /* updates */
-    hHQ_core->prev_hqswb_clas = hqswb_clas; /* Q0 */
-    move16();
-    /* Prepare synthesis for LB generation in case of switch to ACELP */
-    IF( NE_16( hqswb_clas, HQ_HVQ ) )
-    {
-        apply_envelope_enc_ivas_fx( t_audio_q_norm, ynrm, num_sfm, sfm_start, sfm_end, t_audio_q_fx );
-        scale_sig32( t_audio_q_fx, length, sub( Q12, Q_audio ) ); // Q12
-    }
-
-    IF( is_transient )
-    {
-        ivas_de_interleave_spectrum_fx( t_audio_q_fx, length );
-    }
-
-    MVR2R_WORD32( t_audio_q_fx, t_audio_fx, length );
-
-    return;
-}
diff --git a/lib_enc/hq_hr_enc_fx.c b/lib_enc/hq_hr_enc_fx.c
index f73a926dc5177ed57cbbcfaeeec3c93b77eb3512..05654e775965c7471130beb49e398018b3df01ef 100644
--- a/lib_enc/hq_hr_enc_fx.c
+++ b/lib_enc/hq_hr_enc_fx.c
@@ -5,9 +5,10 @@
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"    /* Common constants                       */
 //#include "prot_fx.h"    /* Function prototypes                    */
-#include "rom_com_fx.h"  /* Static table prototypes                */
-#include "rom_com.h"     /* Static table prototypes                */
-#include "prot_fx.h"     /* Function prototypes                    */
+#include "rom_com_fx.h" /* Static table prototypes                */
+#include "rom_com.h"    /* Static table prototypes                */
+#include "prot_fx.h"    /* Function prototypes                    */
+#include "ivas_prot_fx.h"
 #include "prot_fx_enc.h" /* Function prototypes                    */
 /*--------------------------------------------------------------------------*
  * hq_hr_enc_fx()
@@ -235,12 +236,12 @@ void hq_hr_enc_fx(
         IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
         {
             nf_idx = noise_adjust_fx( t_audio_norm, 12, R, sfm_start, sfm_end, s_max( core_sfm, sub( num_env_bands, 1 ) ) ); /* Q0 */
-            push_indice_fx( st_fx->hBstr, IND_NF_IDX, nf_idx, 2 );
+            push_indice( st_fx->hBstr, IND_NF_IDX, nf_idx, 2 );
         }
         ELSE
         {
             nf_idx = noise_adjust_fx( t_audio_norm, 12, R, sfm_start, sfm_end, core_sfm ); /* Q0 */
-            push_indice_fx( st_fx->hBstr, IND_NF_IDX, nf_idx, 2 );
+            push_indice( st_fx->hBstr, IND_NF_IDX, nf_idx, 2 );
         }
     }
     /* updates */
@@ -248,19 +249,233 @@ void hq_hr_enc_fx(
     move16();
 
     /* Prepare synthesis for LB generation in case of switch to ACELP */
-#ifdef ADD_IVAS_HQ_CODE
+    return;
+}
+
+void hq_hr_enc_ivas_fx(
+    Encoder_State *st,          /* i/o: encoder state structure             */
+    Word32 *t_audio_fx,         /* i/o: transform-domain coefficients       Q12*/
+    const Word16 length,        /* i  : length of spectrum                  Q0*/
+    Word16 *num_bits,           /* i/o: number of available bits            Q0*/
+    const Word16 is_transient,  /* i  : transient flag                      Q0*/
+    const Word16 vad_hover_flag /* i  : VAD hangover flag                   Q0*/
+)
+{
+    Word16 nb_sfm;
+    Word16 sum, hcode_l;
+    Word16 difidx[NB_SFM];
+    Word16 normqlg2[NB_SFM], ynrm[NB_SFM];
+    Word16 nf_idx;
+    Word16 bits;
+    Word16 LCmode;
+    Word16 shape_bits, num_sfm, numnrmibits;
+    Word16 hqswb_clas;
+    Word16 num_env_bands;
+    Word16 Npeaks, start_norm;
+    Word16 difidx_org[NB_SFM];
+    Word16 R[NB_SFM];
+    Word16 peaks[HVQ_MAX_PEAKS];
+    Word16 sfmsize[NB_SFM], sfm_start[NB_SFM], sfm_end[NB_SFM];
+    Word16 npulses[NB_SFM], maxpulse[NB_SFM];
+    Word16 Rsubband[NB_SFM]; /* Q3 */
+    Word32 t_audio_q_fx[L_SPEC48k_EXT];
+    Word16 noise_level_fx[HVQ_BWE_NOISE_BANDS];
+    Word16 hq_generic_offset;
+    Word16 hq_generic_exc_clas = 0;
+    move16();
+    Word16 core_sfm;
+    Word16 har_freq_est1 = 0, har_freq_est2 = 0;
+    move16();
+    move16();
+    Word16 flag_dis = 1;
+    move16();
+    const Word16 *subband_search_offset;
+    Word16 wBands[2];
+    Word16 b_delta_env;
+    HQ_ENC_HANDLE hHQ_core = st->hHQ_core;
+    BSTR_ENC_HANDLE hBstr = st->hBstr;
+    Word16 att_fx;
+    Word16 t_audio_norm[L_FRAME48k_EXT];
+    Word16 t_audio_q_norm[L_FRAME48k_EXT];
+    Word32 nf_gains_fx[HVQ_NF_GROUPS], pe_gains_fx[HVQ_NF_GROUPS];
+    Word16 hq_generic_fenv_fx[HQ_FB_FENV];
+    /*------------------------------------------------------------------*
+     * Initializations
+     *------------------------------------------------------------------*/
+
+    Npeaks = 0;
+    move16();
+    set16_fx( npulses, 0, NB_SFM );
+    set16_fx( maxpulse, 0, NB_SFM );
+    set16_fx( difidx_org, 0, NB_SFM );
+    set32_fx( t_audio_q_fx, 0, L_FRAME48k );
+    set32_fx( nf_gains_fx, 0, HVQ_NF_GROUPS );
+    set32_fx( pe_gains_fx, 0, HVQ_NF_GROUPS );
+    /*------------------------------------------------------------------*
+     * Classification
+     *------------------------------------------------------------------*/
+    bits = hq_classifier_enc_ivas_fx( st, length, t_audio_fx, is_transient, &Npeaks, peaks, pe_gains_fx, nf_gains_fx, &hqswb_clas ); /* Q0 */
+    *num_bits = sub( *num_bits, bits );
+    move16();
+
+    /*------------------------------------------------------------------*
+     * Set quantization parameters
+     *------------------------------------------------------------------*/
+
+    hq_configure_fx( length, hqswb_clas, st->core_brate, &num_sfm, &nb_sfm, &start_norm, &num_env_bands, &numnrmibits, &hq_generic_offset, sfmsize, sfm_start, sfm_end );
+
+    /*------------------------------------------------------------------*
+     * Transient frame handling
+     *------------------------------------------------------------------*/
+    /* Interleave MLT coefficients of 4 sub-vectors in case of transient frame */
+    IF( is_transient )
+    {
+        interleave_spectrum_ivas_fx( t_audio_fx, length );
+    }
+    test();
+    IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
+    {
+        calculate_hangover_attenuation_gain_ivas_fx( st, &att_fx, vad_hover_flag );
+        v_multc_att32( t_audio_fx, att_fx, t_audio_fx, sfm_end[( num_sfm - 1 )] ); /* Q12 */
+    }
+
+    /*------------------------------------------------------------------*
+     * Scalar quantization of norms
+     * Encode norm indices
+     *------------------------------------------------------------------*/
+
+    /* calculate and quantize norms */
+    calc_norm_ivas_fx( t_audio_fx, ynrm, normqlg2, start_norm, num_env_bands, sfmsize, sfm_start );
+    /* create differential code of quantized norm indices */
+    diff_envelope_coding_fx( is_transient, num_env_bands, start_norm, ynrm, normqlg2, difidx );
+
+    /* Find norm coding mode and calculate number of bits */
+    hcode_l = encode_envelope_indices_ivas_fx( hBstr, num_env_bands, numnrmibits, difidx, &LCmode, 0, NORMAL_HQ_CORE, is_transient ); /* Q0 */
+
+    *num_bits = sub( *num_bits, add( hcode_l, NORM0_BITS + FLAGS_BITS ) );
+    move16();
+    /* Encode norm indices */
+    encode_envelope_indices_ivas_fx( hBstr, num_env_bands, numnrmibits, difidx, &LCmode, 1, NORMAL_HQ_CORE, is_transient );
+
+    /*------------------------------------------------------------------*
+     * HQ GENERIC BWE encoding
+     *------------------------------------------------------------------*/
+
+    test();
+    IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
+    {
+        hq_generic_hf_encoding_fx( t_audio_fx, hq_generic_fenv_fx, hq_generic_offset, st, &hq_generic_exc_clas, length );
+
+        IF( EQ_16( hq_generic_exc_clas, HQ_GENERIC_SP_EXC ) )
+        {
+            *num_bits = add( *num_bits, 1 ); /* conditional 1 bit saving for representing FD3 BWE excitation class */
+            move16();
+        }
+        map_hq_generic_fenv_norm_fx( hqswb_clas, hq_generic_fenv_fx, ynrm, normqlg2, num_env_bands, nb_sfm, hq_generic_offset );
+    }
+
+    /*------------------------------------------------------------------*
+     * Bit allocation
+     *------------------------------------------------------------------*/
+
+    ivas_hq_bit_allocation_fx( st->core_brate, length, hqswb_clas, num_bits, normqlg2, nb_sfm, sfmsize, noise_level_fx, R, Rsubband, &sum, &core_sfm, num_env_bands );
+
+    /*------------------------------------------------------------------*
+     * Normalize coefficients with quantized norms
+     *------------------------------------------------------------------*/
+    IF( NE_16( hqswb_clas, HQ_HVQ ) )
+    {
+        test();
+        IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
+        {
+            b_delta_env = calc_nor_delta_hf_ivas_fx( hBstr, t_audio_fx, ynrm, Rsubband, num_env_bands, nb_sfm, sfmsize, sfm_start, core_sfm ); /* Q0 */
+            sum = sub( sum, b_delta_env );
+        }
+        normalizecoefs_fx( t_audio_fx, ynrm, nb_sfm, sfm_start, sfm_end, t_audio_norm );
+    }
+    Word16 Q_audio = 12, Q_shift;
+    move16();
+    /*------------------------------------------------------------------*
+     * Quantize/code spectral fine structure using PVQ or HVQ
+     *------------------------------------------------------------------*/
+    IF( EQ_16( hqswb_clas, HQ_HVQ ) )
+    {
+        sum = hvq_enc_ivas_fx( st, st->core_brate, *num_bits, Npeaks, ynrm, R, peaks, nf_gains_fx, noise_level_fx, pe_gains_fx, t_audio_fx, t_audio_q_fx );
+        *num_bits = sub( *num_bits, sum );
+        move16();
+    }
+    ELSE
+    {
+        shape_bits = pvq_core_enc_ivas_fx( hBstr, t_audio_norm, t_audio_q_norm, &Q_audio, sum, nb_sfm, sfm_start, sfm_end, sfmsize, Rsubband, R, npulses, maxpulse, HQ_CORE ); /* Q0 */
+        *num_bits = add( *num_bits, sub( sum, shape_bits ) );
+        move16();
+    }
+
+    test();
+    IF( EQ_16( hqswb_clas, HQ_HVQ ) || EQ_16( hqswb_clas, HQ_HARMONIC ) )
+    {
+        subband_search_offset = subband_search_offsets_13p2kbps_Har; /* Q0 */
+        wBands[0] = SWB_SB_BW_LEN0_16KBPS_HAR;                       /* Q0 */
+        wBands[1] = SWB_SB_BW_LEN1_16KBPS_HAR;                       /* Q0 */
+        move16();
+        move16();
+        IF( EQ_16( hqswb_clas, HQ_HARMONIC ) )
+        {
+            Q_shift = sub( SWB_BWE_LR_Qs, Q_audio );
+            FOR( Word16 i = 0; i < 300; i++ )
+            {
+                t_audio_q_fx[i] = L_shl( L_deposit_l( t_audio_q_norm[i] ), Q_shift ); /* Q12 */
+                move32();
+            }
+        }
+        har_est_fx( t_audio_q_fx, 300, &har_freq_est1, &har_freq_est2, &flag_dis, &hHQ_core->prev_frm_hfe2, subband_search_offset, wBands, &hHQ_core->prev_stab_hfe2 );
+
+        hHQ_core->prev_frm_hfe2 = har_freq_est2;
+        move16();
+    }
+
+    /* reset LR-HQ memories */
+    hHQ_core->prev_frm_hfe2 = 0; /*reset*/
+    hHQ_core->prev_stab_hfe2 = 0;
+    move16();
+    move16();
+    nf_idx = 0;
+    move16();
+    test();
+    test();
+    test();
+    IF( NE_16( is_transient, 1 ) && NE_16( hqswb_clas, HQ_HVQ ) && !( EQ_16( length, L_FRAME16k ) && LE_32( st->core_brate, HQ_32k ) ) )
+    {
+        test();
+        IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) || EQ_16( hqswb_clas, HQ_GEN_FB ) )
+        {
+            nf_idx = noise_adjust_fx( t_audio_norm, 12, R, sfm_start, sfm_end, s_max( core_sfm, sub( num_env_bands, 1 ) ) ); /* Q0 */
+            push_indice( hBstr, IND_NF_IDX, nf_idx, 2 );
+        }
+        ELSE
+        {
+            nf_idx = noise_adjust_fx( t_audio_norm, 12, R, sfm_start, sfm_end, core_sfm ); /* Q0 */
+            push_indice( hBstr, IND_NF_IDX, nf_idx, 2 );
+        }
+    }
+
+
+    /* updates */
+    hHQ_core->prev_hqswb_clas = hqswb_clas; /* Q0 */
+    move16();
+    /* Prepare synthesis for LB generation in case of switch to ACELP */
     IF( NE_16( hqswb_clas, HQ_HVQ ) )
     {
-        apply_envelope_enc( t_audio_q, ynrm, num_sfm, sfm_start, sfm_end );
+        apply_envelope_enc_ivas_fx( t_audio_q_norm, ynrm, num_sfm, sfm_start, sfm_end, t_audio_q_fx );
+        scale_sig32( t_audio_q_fx, length, sub( Q12, Q_audio ) ); // Q12
     }
 
     IF( is_transient )
     {
-        de_interleave_spectrum( t_audio_q, length );
+        ivas_de_interleave_spectrum_fx( t_audio_q_fx, length );
     }
-    Copy32( t_audio_q, t_audio, length );
-#endif
 
+    MVR2R_WORD32( t_audio_q_fx, t_audio_fx, length );
 
     return;
 }
diff --git a/lib_enc/hq_lr_enc.c b/lib_enc/hq_lr_enc.c
deleted file mode 100644
index b184c5ac6e19640a4c4dbf55a212d7de805f866f..0000000000000000000000000000000000000000
--- a/lib_enc/hq_lr_enc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "stl.h"
-#include "basop_util.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/hq_lr_enc_fx.c b/lib_enc/hq_lr_enc_fx.c
index 3e70bc42ec238369b5561cdc95af18c60f5f8738..af27806820f6ba1cf295ffb130523b8cbaa3a377 100644
--- a/lib_enc/hq_lr_enc_fx.c
+++ b/lib_enc/hq_lr_enc_fx.c
@@ -12,7 +12,6 @@
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "basop_util.h"  /* Function prototypes                    */
-#include "prot.h"
 
 /*--------------------------------------------------------------------------*
  * Local function prototypes
@@ -116,7 +115,7 @@ static void spt_shorten_domain_set_fx(
                     move16();
                 }
             }
-            push_indice_fx( st_fx->hBstr, IND_HQ2_SPT_SHORTEN, spt_shorten_flag[j], 1 );
+            push_indice( st_fx->hBstr, IND_HQ2_SPT_SHORTEN, spt_shorten_flag[j], 1 );
             *bit_budget = sub( *bit_budget, 1 ); /* Q0 */
             move16();
         }
@@ -314,7 +313,7 @@ void hq_lr_enc_fx(
         }
 
         /* write the classification information into the bitstream */
-        push_indice_fx( hBstr, IND_HQ2_SWB_CLAS, hqswb_clas_fx, 2 );
+        push_indice( hBstr, IND_HQ2_SWB_CLAS, hqswb_clas_fx, 2 );
         ( *num_bits_fx ) = sub( *num_bits_fx, 2 );
         move16();
         IF( EQ_16( hqswb_clas_fx, HQ_NORMAL ) )
@@ -326,7 +325,7 @@ void hq_lr_enc_fx(
     ELSE
     {
         /* write the transient bit into the bitstream */
-        push_indice_fx( st_fx->hBstr, IND_HQ2_SWB_CLAS, is_transient_fx, 1 );
+        push_indice( st_fx->hBstr, IND_HQ2_SWB_CLAS, is_transient_fx, 1 );
 
         /* subtract one bit for the transient flag */
         ( *num_bits_fx ) = sub( ( *num_bits_fx ), 1 );
@@ -455,11 +454,7 @@ void hq_lr_enc_fx(
         frac1 = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
         L_tmp = Pow2( 30, frac1 );
         exp = sub( exp, 30 );
-#ifdef BASOP_NOGLOB
         Ep_fx[i] = L_shl_sat( L_tmp, s_max( sub( exp, 6 ), -31 ) ); /* Q -6 */
-#else
-        Ep_fx[i] = L_shl( L_tmp, s_max( sub( exp, 6 ), -31 ) );                                           /* Q -6 */
-#endif
     }
 
     FOR( i = 0; i < bands_fx; i++ )
@@ -528,22 +523,13 @@ void hq_lr_enc_fx(
         {
             IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 Ep_vari_fx = L_add_sat( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[sub( i, 1 )] ) ) ); /*Q15 */
                 Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] );                                           /*Q15 */
                 move32();
-#else
-                Ep_vari_fx = L_add( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[sub( i, 1 )] ) ) ); /*Q15 */
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                           /*Q15 */
-#endif
             }
             ELSE
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, Ep_tmp_fx[i] );                                         /*Q15 */
-#endif
                 IF( GT_32( Ep_tmp_fx[i], Ep_peak_fx ) )
                 {
                     Ep_peak_fx = L_add( Ep_tmp_fx[i], 0 ); /*Q15 */
@@ -620,13 +606,9 @@ void hq_lr_enc_fx(
                         exp = 0;
                         move16();
                     }
-                    L_tmp = Mult_32_16( Ep_vari_fx, 3277 ); /*13+15-15=13 */
-#ifdef BASOP_NOGLOB
+                    L_tmp = Mult_32_16( Ep_vari_fx, 3277 );                                 /*13+15-15=13 */
                     L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( 12, exp ), &Overflow ); /*Q(13+exp-15 +12-exp +4 = 14) */
-#else
-                    L_tmp = L_shl( Mult_32_16( L_tmp, tmp ), sub( 12, exp ) );                            /*Q(13+exp-15 +12-exp +4 = 14) */
-#endif
-                    tmp2 = extract_h( Ep_avrg_fx ); /*Q13-16=-3 */
+                    tmp2 = extract_h( Ep_avrg_fx );                                         /*Q13-16=-3 */
                     IF( tmp2 != 0 )
                     {
                         exp = norm_s( tmp2 );
@@ -641,24 +623,16 @@ void hq_lr_enc_fx(
                         exp = 0;
                         move16();
                     }
-                    L_tmp2 = Mult_32_16( Ep_vari_fx, 6554 ); /*13+15-15=13 */
-#ifdef BASOP_NOGLOB
+                    L_tmp2 = Mult_32_16( Ep_vari_fx, 6554 );                                   /*13+15-15=13 */
                     L_tmp2 = L_shl_o( Mult_32_16( L_tmp2, tmp2 ), sub( 13, exp ), &Overflow ); /*Q(13+exp-15 +13-exp +3 = 14) */
-#else
-                    L_tmp2 = L_shl( Mult_32_16( L_tmp2, tmp2 ), sub( 13, exp ) );                         /*Q(13+exp-15 +13-exp +3 = 14) */
-#endif
-                    L_tmp = L_min( L_tmp, L_tmp2 );           /*Q14 */
-                    tmp = extract_l( L_min( L_tmp, 13107 ) ); /*Q14 */
+                    L_tmp = L_min( L_tmp, L_tmp2 );                                            /*Q14 */
+                    tmp = extract_l( L_min( L_tmp, 13107 ) );                                  /*Q14 */
                     alpha_fx = add( 16384, tmp );
                 }
                 IF( EQ_16( hHQ_core->last_bitalloc_max_band[j++], 1 ) )
                 {
                     L_tmp = Mult_32_16( Ep_tmp_fx[i], sub( bands_fx, lowband ) ); /*Q(13+0-15 = -2) */
-#ifdef BASOP_NOGLOB
-                    tmp = extract_h( L_shl_sat( L_tmp, 14 ) ); /*Q-4 */
-#else
-                    tmp = extract_h( L_shl( L_tmp, 14 ) );                                                /*Q-2 */
-#endif
+                    tmp = extract_h( L_shl_sat( L_tmp, 14 ) );                    /*Q-4 */
                     IF( tmp != 0 )
                     {
                         exp = norm_s( tmp );
@@ -673,14 +647,10 @@ void hq_lr_enc_fx(
                         exp = 0;
                         move16();
                     }
-#ifdef BASOP_NOGLOB
                     L_tmp = L_shl_o( Mult_32_16( Ep_avrg_fx, tmp ), sub( 14, exp ), &Overflow ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#else
-                    L_tmp = L_shl( Mult_32_16( Ep_avrg_fx, tmp ), sub( 14, exp ) );                       /*Q(13+exp-15 +14-exp+2 = 14) */
-#endif
-                    L_tmp = L_max( L_tmp, 16384 );              /*Q14 */
-                    tmp = extract_l( L_min( L_tmp, beta_fx ) ); /*Q14 */
-                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 ); /*14+14-15 +1=Q14 */
+                    L_tmp = L_max( L_tmp, 16384 );                                               /*Q14 */
+                    tmp = extract_l( L_min( L_tmp, beta_fx ) );                                  /*Q14 */
+                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 );                                  /*14+14-15 +1=Q14 */
                 }
                 ELSE
                 {
@@ -700,15 +670,11 @@ void hq_lr_enc_fx(
                         exp = 0;
                         move16();
                     }
-#ifdef BASOP_NOGLOB
                     L_tmp = L_shl_o( Mult_32_16( Ep_tmp_fx[i], tmp2 ), sub( 19, exp ), &Overflow ); /*Q(13+exp-15 +19-exp +3 = 20) */
-#else
-                    L_tmp = L_shl( Mult_32_16( Ep_tmp_fx[i], tmp2 ), sub( 19, exp ) );                    /*Q(13+exp-15 +19-exp +3 = 20) */
-#endif
-                    L_tmp = Mult_32_16( L_tmp, shl( sub( bands_fx, lowband ), 9 ) ); /*20 +9 -15 =Q14 */
-                    L_tmp = L_max( L_tmp, 13926 );                                   /*Q14 */
-                    tmp2 = extract_l( L_min( L_tmp, 16384 ) );                       /*Q14 */
-                    alpha_fx = shl( mult( alpha_fx, tmp2 ), 1 );                     /*14+14-15+1 =Q14 */
+                    L_tmp = Mult_32_16( L_tmp, shl( sub( bands_fx, lowband ), 9 ) );                /*20 +9 -15 =Q14 */
+                    L_tmp = L_max( L_tmp, 13926 );                                                  /*Q14 */
+                    tmp2 = extract_l( L_min( L_tmp, 16384 ) );                                      /*Q14 */
+                    alpha_fx = shl( mult( alpha_fx, tmp2 ), 1 );                                    /*14+14-15+1 =Q14 */
                 }
                 L_band_energy_tmp[i] = L_shl( Mult_32_16( L_band_energy_tmp[i], alpha_fx ), 1 ); /*Q(Q_band_energy+14-15 +1= Q_band_energy) */
                 move32();
@@ -723,19 +689,11 @@ void hq_lr_enc_fx(
         {
             IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                           /*Q15 */
-#endif
             }
             ELSE
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, L_shr( Ep_tmp_fx[i], 1 ) ); /*Q12 */
-#else
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, L_shr( Ep_tmp_fx[i], 1 ) );                             /*Q12 */
-#endif
                 IF( GT_32( Ep_tmp_fx[i], Ep_peak_fx ) )
                 {
                     Ep_peak_fx = L_add( Ep_tmp_fx[i], 0 ); /*Q13 */
@@ -783,7 +741,7 @@ void hq_lr_enc_fx(
         /* encode the last p2a_bands-1 subbands bit-allocation index of the previous frame */
         FOR( i = 0; i < 2; i++ )
         {
-            push_indice_fx( st_fx->hBstr, IND_HQ2_LAST_BA_MAX_BAND, hHQ_core->last_bitalloc_max_band[i], 1 );
+            push_indice( st_fx->hBstr, IND_HQ2_LAST_BA_MAX_BAND, hHQ_core->last_bitalloc_max_band[i], 1 );
         }
     }
     ELSE IF( is_transient_fx == 0 && EQ_16( inner_frame_fx, L_FRAME16k ) )
@@ -791,12 +749,8 @@ void hq_lr_enc_fx(
         bit_budget_fx = sub( bit_budget_fx, 2 ); /* bits in high bands to indicate the last 2 subbands is allocated bits or not Q0*/
         FOR( i = 0; i < bands_fx; i++ )
         {
-#ifdef BASOP_NOGLOB
             Ep_tmp_fx[i] = L_shl_o( Ep_tmp_fx[i], 2, &Overflow ); /* Q15 */
             move32();
-#else  /* BASOP_NOGLOB */
-            Ep_tmp_fx[i] = L_shl( Ep_tmp_fx[i], 2 );
-#endif /* BASOP_NOGLOB */
         }
         IF( EQ_32( st_fx->core_brate, ACELP_13k20 ) )
         {
@@ -826,33 +780,17 @@ void hq_lr_enc_fx(
             test();
             IF( GE_16( i, lowband ) && add( sub( i, bands_fx ), p2a_bands_fx ) < 0 )
             {
-#ifdef BASOP_NOGLOB
                 Ep_vari_fx = L_add_sat( Ep_vari_fx, L_abs( L_sub_sat( Ep_tmp_fx[i], Ep_tmp_fx[( i - 1 )] ) ) ); /*Q15 */
-#else
-                Ep_vari_fx = L_add( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[sub( i, 1 )] ) ) ); /*Q15 */
-#endif
-#ifdef BASOP_NOGLOB
-                Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#else                                                                        /* BASOP_NOGLOB */
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                           /*Q15 */
-#endif                                                                       /* BASOP_NOGLOB */
+                Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow );                                    /*Q15 */
             }
 
             IF( GE_16( i, highband ) )
             {
-#ifdef BASOP_NOGLOB
                 enerH_fx = L_add_sat( enerH_fx, L_shl_sat( Ep_fx[i], 2 ) ); /*Q0 */
-#else
-                enerH_fx = L_add( enerH_fx, L_shl( Ep_fx[i], 2 ) );                                       /*Q0 */
-#endif
             }
             ELSE IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 enerL_fx = L_add_sat( enerL_fx, L_shl_sat( Ep_fx[i], 2 ) ); /*Q0 */
-#else
-                enerL_fx = L_add( enerL_fx, L_shl( Ep_fx[i], 2 ) );                                       /*Q0 */
-#endif
             }
         }
 
@@ -873,11 +811,7 @@ void hq_lr_enc_fx(
                 tmp = sub( bands_fx, p2a_bands_fx );
                 tmp = sub( tmp, lowband ); /*Q0 */
 
-#ifdef BASOP_NOGLOB
                 tmp1 = extract_h( L_shl_sat( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
-                tmp1 = extract_h( L_shl( Ep_avrg_fx, 1 ) );                                               /*Q0 */
-#endif
                 IF( tmp1 != 0 )
                 {
                     exp = norm_s( tmp1 );
@@ -915,12 +849,8 @@ void hq_lr_enc_fx(
                 IF( EQ_16( hHQ_core->last_bitalloc_max_band[sub( i, add( tmp, 1 ) )], 1 ) )
                 {
                     tmp = sub( tmp, lowband );
-                    L_tmp = Mult_32_16( Ep_tmp_fx[i], tmp ); /*Q(15+0-15 = 0) */
-#ifdef BASOP_NOGLOB
+                    L_tmp = Mult_32_16( Ep_tmp_fx[i], tmp );            /*Q(15+0-15 = 0) */
                     tmp = extract_h( L_shl_o( L_tmp, 16, &Overflow ) ); /*Q0 */
-#else                                                                   /* BASOP_NOGLOB */
-                    tmp = extract_h( L_shl( L_tmp, 16 ) );                                                /*Q0 */
-#endif                                                                  /* BASOP_NOGLOB */
                     IF( tmp != 0 )
                     {
                         exp = norm_s( tmp );
@@ -945,11 +875,7 @@ void hq_lr_enc_fx(
                 {
                     tmp = sub( tmp, lowband );
 
-#ifdef BASOP_NOGLOB
                     tmp1 = extract_h( L_shl_sat( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
-                    tmp1 = extract_h( L_shl( Ep_avrg_fx, 1 ) );                                           /*Q0 */
-#endif
                     IF( tmp1 != 0 )
                     {
                         exp = norm_s( tmp1 );
@@ -985,19 +911,11 @@ void hq_lr_enc_fx(
         {
             IF( GE_16( i, lowband ) )
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#else                                                                        /* BASOP_NOGLOB */
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                           /*Q15 */
-#endif                                                                       /* BASOP_NOGLOB */
             }
             ELSE
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrgL_fx = L_add_o( Ep_avrgL_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#else                                                                          /* BASOP_NOGLOB */
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, Ep_tmp_fx[i] );                                         /*Q15 */
-#endif
                 IF( GT_32( Ep_tmp_fx[i], Ep_peak_fx ) )
                 {
                     Ep_peak_fx = L_add( Ep_tmp_fx[i], 0 ); /*Q15 */
@@ -1021,11 +939,7 @@ void hq_lr_enc_fx(
             move16();
             FOR( i = 0; i < lowband; i++ )
             {
-#ifdef BASOP_NOGLOB
                 tmp = extract_h( L_shl_sat( Ep_avrgL_fx, 1 ) ); /*Q0 */
-#else
-                tmp = extract_h( L_shl( Ep_avrgL_fx, 1 ) );                                               /*Q0 */
-#endif
                 IF( tmp != 0 )
                 {
                     exp = norm_s( tmp );
@@ -1056,7 +970,7 @@ void hq_lr_enc_fx(
         /* encode the last p2a_bands-1 subbands bit-allocation index of the previous frame */
         FOR( i = 0; i < 2; i++ )
         {
-            push_indice_fx( st_fx->hBstr, IND_HQ2_LAST_BA_MAX_BAND, hHQ_core->last_bitalloc_max_band[i], 1 );
+            push_indice( st_fx->hBstr, IND_HQ2_LAST_BA_MAX_BAND, hHQ_core->last_bitalloc_max_band[i], 1 );
         }
     }
     ELSE IF( EQ_16( st_fx->bwidth, SWB ) && EQ_16( hqswb_clas_fx, HQ_HARMONIC ) && ( EQ_32( L_bwe_br, HQ_16k40 ) || EQ_32( L_bwe_br, HQ_13k20 ) ) )
@@ -1265,10 +1179,8 @@ void hq_lr_enc_ivas_fx(
     Word32 L_band_energy_tmp[BANDS_MAX];
     UWord16 lo;
     Word16 Q_band_energy;
-#ifdef BASOP_NOGLOB
     Flag Overflow;
     move32();
-#endif /* BASOP_NOGLOB */
 
     BSTR_ENC_HANDLE hBstr = st->hBstr;
     HQ_ENC_HANDLE hHQ_core = st->hHQ_core;
@@ -1536,11 +1448,7 @@ void hq_lr_enc_ivas_fx(
             }
             ELSE
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrgL_fx = L_add_o( Ep_avrgL_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#else
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, Ep_tmp_fx[i] );                                         /*Q15 */
-#endif
                 IF( L_sub( Ep_tmp_fx[i], Ep_peak_fx ) > 0 )
                 {
                     Ep_peak_fx = Ep_tmp_fx[i]; /*Q15 */
@@ -1664,17 +1572,10 @@ void hq_lr_enc_ivas_fx(
                         move16();
                     }
                     Mpy_32_16_ss( Ep_avrg_fx, tmp, &L_tmp, &lo );
-#ifndef BASOP_NOGLOB
-                    L_tmp = L_shl( L_tmp, sub( 14, exp ) );     /*Q(13+exp-15 +14-exp+2 = 14) */
-                    L_tmp = L_max( L_tmp, 16384 );              /*14 */
-                    tmp = extract_l( L_min( L_tmp, beta_fx ) ); /*14 */
-                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 ); /*14+14-15 +1=14 */
-#else                                                           /* BASOP_NOGLOB */
-                    L_tmp = L_shl_o( L_tmp, sub( 14, exp ), &Overflow );                                  /*Q(13+exp-15 +14-exp+2 = 14) */
-                    L_tmp = L_max( L_tmp, 16384 );                                                        /*14 */
-                    tmp = extract_l( L_min( L_tmp, beta_fx ) );                                           /*14 */
-                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 );                                           /*14+14-15 +1=14 */
-#endif                                                          /* BASOP_NOGLOB */
+                    L_tmp = L_shl_o( L_tmp, sub( 14, exp ), &Overflow ); /*Q(13+exp-15 +14-exp+2 = 14) */
+                    L_tmp = L_max( L_tmp, 16384 );                       /*14 */
+                    tmp = extract_l( L_min( L_tmp, beta_fx ) );          /*14 */
+                    alpha_fx = shl( mult( alpha_fx, tmp ), 1 );          /*14+14-15 +1=14 */
                 }
                 ELSE
                 {
@@ -1718,11 +1619,7 @@ void hq_lr_enc_ivas_fx(
         {
             IF( sub( i, lowband ) >= 0 )
             {
-#ifdef BASOP_NOGLOB
                 Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#else
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] );                                           /*Q15 */
-#endif
             }
             ELSE
             {
@@ -1764,13 +1661,8 @@ void hq_lr_enc_ivas_fx(
                 Mpy_32_16_ss( Ep_peak_fx, tmp, &L_tmp, &lo );
                 Mpy_32_16_ss( L_tmp, lowband, &L_tmp, &lo );
                 Mpy_32_16_ss( L_tmp, 18842, &L_tmp, &lo );
-#ifndef BASOP_NOGLOB
-                L_tmp = L_shl( L_tmp, sub( 27, exp ) );    /*Q14 0.5 */
-                tmp2 = extract_l( L_min( L_tmp, 19661 ) ); /*14 */
-#else                                                      /* BASOP_NOGLOB */
-                L_tmp = L_shl_o( L_tmp, sub( 27, exp ), &Overflow );                                      /*Q14 0.5 */
-                tmp2 = extract_l( L_min( L_tmp, 19661 ) );                                                /*14 */
-#endif                                                     /* BASOP_NOGLOB */
+                L_tmp = L_shl_o( L_tmp, sub( 27, exp ), &Overflow ); /*Q14 0.5 */
+                tmp2 = extract_l( L_min( L_tmp, 19661 ) );           /*14 */
                 Mpy_32_16_ss( L_band_energy_tmp[i], tmp2, &L_tmp, &lo );
                 L_band_energy_tmp[i] = L_shl( L_tmp, 1 ); /*Q_band_energy  */
                 move32();
@@ -1793,12 +1685,8 @@ void hq_lr_enc_ivas_fx(
         bit_budget = sub( bit_budget, 2 ); /* bits in high bands to indicate the last 2 subbands is allocated bits or not */
         FOR( i = 0; i < bands; i++ )
         {
-#ifndef BASOP_NOGLOB
-            Ep_tmp_fx[i] = L_shl( Ep_tmp_fx[i], 2 );
-#else  /* BASOP_NOGLOB */
-            Ep_tmp_fx[i] = L_shl_o( Ep_tmp_fx[i], 2, &Overflow );                                         /* Q15 */
+            Ep_tmp_fx[i] = L_shl_o( Ep_tmp_fx[i], 2, &Overflow ); /* Q15 */
             move32();
-#endif /* BASOP_NOGLOB */
         }
         IF( EQ_32( st->core_brate, ACELP_13k20 ) )
         {
@@ -1833,11 +1721,7 @@ void hq_lr_enc_ivas_fx(
             IF( sub( i, lowband ) >= 0 && add( sub( i, bands ), p2a_bands ) < 0 )
             {
                 Ep_vari_fx = L_add( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[sub( i, 1 )] ) ) ); /*Q15 */
-#ifndef BASOP_NOGLOB
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else                                                           /* BASOP_NOGLOB */
-                Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow );   /*Q15 */
-#endif                                                          /* BASOP_NOGLOB */
+                Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow );                              /*Q15 */
             }
 
             IF( sub( i, highband ) >= 0 )
@@ -1870,11 +1754,7 @@ void hq_lr_enc_ivas_fx(
                 tmp = sub( bands, p2a_bands );
                 tmp = sub( tmp, lowband ); /*Q0 */
 
-#ifndef BASOP_NOGLOB
-                tmp1 = extract_h( L_shl( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
-                tmp1 = extract_h( L_shl_o( Ep_avrg_fx, 1, &Overflow ) );       /*Q0 */
-#endif
+                tmp1 = extract_h( L_shl_o( Ep_avrg_fx, 1, &Overflow ) ); /*Q0 */
                 IF( tmp1 != 0 )
                 {
                     exp = norm_s( tmp1 );
@@ -1913,11 +1793,7 @@ void hq_lr_enc_ivas_fx(
                 {
                     tmp = sub( tmp, lowband );
                     Mpy_32_16_ss( Ep_tmp_fx[i], tmp, &L_tmp, &lo );
-#ifndef BASOP_NOGLOB
-                    tmp = extract_h( L_shl( L_tmp, 16 ) ); /*Q0 */
-#else                                                      /* BASOP_NOGLOB */
-                    tmp = extract_h( L_shl_o( L_tmp, 16, &Overflow ) );        /*Q0 */
-#endif                                                     /* BASOP_NOGLOB */
+                    tmp = extract_h( L_shl_o( L_tmp, 16, &Overflow ) ); /*Q0 */
                     IF( tmp != 0 )
                     {
                         exp = norm_s( tmp );
@@ -1942,11 +1818,7 @@ void hq_lr_enc_ivas_fx(
                 {
                     tmp = sub( tmp, lowband );
 
-#ifndef BASOP_NOGLOB
-                    tmp1 = extract_h( L_shl( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
-                    tmp1 = extract_h( L_shl_o( Ep_avrg_fx, 1, &Overflow ) );   /*Q0 */
-#endif
+                    tmp1 = extract_h( L_shl_o( Ep_avrg_fx, 1, &Overflow ) ); /*Q0 */
                     IF( tmp1 != 0 )
                     {
                         exp = norm_s( tmp1 );
@@ -1985,19 +1857,11 @@ void hq_lr_enc_ivas_fx(
         {
             IF( sub( i, lowband ) >= 0 )
             {
-#ifndef BASOP_NOGLOB
-                Ep_avrg_fx = L_add( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else                                                           /* BASOP_NOGLOB */
-                Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow );   /*Q15 */
-#endif                                                          /* BASOP_NOGLOB */
+                Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
             }
             ELSE
             {
-#ifndef BASOP_NOGLOB
-                Ep_avrgL_fx = L_add( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else                                                             /* BASOP_NOGLOB */
                 Ep_avrgL_fx = L_add_o( Ep_avrgL_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif                                                            /* BASOP_NOGLOB */
                 IF( L_sub( Ep_tmp_fx[i], Ep_peak_fx ) > 0 )
                 {
                     Ep_peak_fx = Ep_tmp_fx[i]; /* Q15 */
@@ -2022,11 +1886,7 @@ void hq_lr_enc_ivas_fx(
             move16();
             FOR( i = 0; i < lowband; i++ )
             {
-#ifndef BASOP_NOGLOB
-                tmp = extract_h( L_shl( Ep_avrgL_fx, 1 ) ); /*Q0 */
-#else
-                tmp = extract_h( L_shl_o( Ep_avrgL_fx, 1, &Overflow ) );       /*Q0 */
-#endif
+                tmp = extract_h( L_shl_o( Ep_avrgL_fx, 1, &Overflow ) ); /*Q0 */
                 IF( tmp != 0 )
                 {
                     exp = norm_s( tmp );
@@ -2353,7 +2213,7 @@ static Word16 small_symbol_enc_fx(                        /* o  : bits
         /* Encoding LSB bit packing */
         FOR( i = 0; i < BANDS; ++i )
         {
-            push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, LSB[i], BITS_DE_LSB );
+            push_indice( hBstr, IND_HQ2_DIFF_ENERGY, LSB[i], BITS_DE_LSB );
         }
     }
 
@@ -2666,74 +2526,74 @@ static Word16 large_symbol_enc_fx(                        /* o  : bits
         /* Encoding MSB bits */
         IF( *hLCmode0 == 0 )
         {
-            push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE, 0, BITS_DE_8SMODE );
+            push_indice( hBstr, IND_HQ2_DENG_8SMODE, 0, BITS_DE_8SMODE );
             bits = BITS_DE_8SMODE;
             move16();
             IF( cnt_outlyer0 == 0 )
             {
-                push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE_N0, 0, BITS_DE_8SMODE_N0 );
+                push_indice( hBstr, IND_HQ2_DENG_8SMODE_N0, 0, BITS_DE_8SMODE_N0 );
                 bits = add( bits, BITS_DE_8SMODE_N0 );
                 IF( EQ_16( cnt_outlyer, 1 ) )
                 {
                     /* 01 */
-                    push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE_N1, 1, BITS_DE_8SMODE_N1 );
+                    push_indice( hBstr, IND_HQ2_DENG_8SMODE_N1, 1, BITS_DE_8SMODE_N1 );
                     bits = add( bits, BITS_DE_8SMODE_N1 ); /* Q0 */
-                    push_indice_fx( hBstr, IND_HQ2_DENG_8SPOS, pos_outlyer, BITS_DE_8SPOS );
+                    push_indice( hBstr, IND_HQ2_DENG_8SPOS, pos_outlyer, BITS_DE_8SPOS );
                     bits = add( bits, BITS_DE_8SPOS );
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[pos_outlyer] + ABS_ENG_OFFSET, BITS_ABS_ENG );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[pos_outlyer] + ABS_ENG_OFFSET, BITS_ABS_ENG );
                     bits = add( bits, BITS_ABS_ENG );
                 }
                 ELSE
                 {
                     /* 00 */
-                    push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE_N1, 0, BITS_DE_8SMODE_N1 );
+                    push_indice( hBstr, IND_HQ2_DENG_8SMODE_N1, 0, BITS_DE_8SMODE_N1 );
                     bits = add( bits, BITS_DE_8SMODE_N1 ); /* Q0 */
                 }
 
                 FOR( i = 0; i < pos_outlyer; ++i )
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
                     bitsmode0 = add( bitsmode0, hessize[tdifidx0[i] + 4] ); /* Q0 */
                 }
 
                 FOR( i = ( pos_outlyer + 1 ); i < BANDS; ++i )
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
                     bitsmode0 = add( bitsmode0, hessize[tdifidx0[i] + 4] ); /* Q0 */
                 }
             }
             ELSE IF( EQ_16( cnt_outlyer0, 1 ) )
             {
-                push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE_N0, 1, BITS_DE_8SMODE_N0 );
+                push_indice( hBstr, IND_HQ2_DENG_8SMODE_N0, 1, BITS_DE_8SMODE_N0 );
                 bits = add( bits, BITS_DE_8SMODE_N0 );
                 IF( EQ_16( cnt_outlyer, 1 ) )
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE_N1, 1, BITS_DE_8SMODE_N1 );
+                    push_indice( hBstr, IND_HQ2_DENG_8SMODE_N1, 1, BITS_DE_8SMODE_N1 );
                     bits = add( bits, BITS_DE_8SMODE_N1 ); /* Q0 */
-                    push_indice_fx( hBstr, IND_HQ2_DENG_8SPOS, pos_outlyer, BITS_DE_8SPOS );
+                    push_indice( hBstr, IND_HQ2_DENG_8SPOS, pos_outlyer, BITS_DE_8SPOS );
                     bits = add( bits, BITS_DE_8SPOS );
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[0] + ABS_ENG_OFFSET, BITS_ABS_ENG );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[0] + ABS_ENG_OFFSET, BITS_ABS_ENG );
                     bits = add( bits, BITS_ABS_ENG );
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[pos_outlyer] + ABS_ENG_OFFSET, BITS_ABS_ENG );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[pos_outlyer] + ABS_ENG_OFFSET, BITS_ABS_ENG );
                     bits = add( bits, BITS_ABS_ENG );
                 }
                 ELSE
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE_N1, 0, BITS_DE_8SMODE_N1 );
+                    push_indice( hBstr, IND_HQ2_DENG_8SMODE_N1, 0, BITS_DE_8SMODE_N1 );
                     bits = add( bits, BITS_DE_8SMODE_N1 ); /* Q0 */
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[0] + ABS_ENG_OFFSET, BITS_ABS_ENG );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, qbidx[0] + ABS_ENG_OFFSET, BITS_ABS_ENG );
                     bits = add( bits, BITS_ABS_ENG ); /* Q0 */
                 }
 
                 FOR( i = 1; i < pos_outlyer; ++i )
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
                     bits = add( bits, hessize[tdifidx0[i] + 4] ); /* Q0 */
                 }
 
                 FOR( i = pos_outlyer + 1; i < BANDS; ++i )
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx0[i] + 4], hessize[tdifidx0[i] + 4] );
                     bits = add( bits, hessize[tdifidx0[i] + 4] ); /* Q0 */
                 }
             }
@@ -2741,12 +2601,12 @@ static Word16 large_symbol_enc_fx(                        /* o  : bits
         ELSE
         {
             bits = add( BITS_DE_8SMODE, BITS_MAX_DEPTH ); /* Q0 */
-            push_indice_fx( hBstr, IND_HQ2_DENG_8SMODE, 1, BITS_DE_8SMODE );
-            push_indice_fx( hBstr, IND_HQ2_DENG_8SDEPTH, lsbdepth1, BITS_MAX_DEPTH );
+            push_indice( hBstr, IND_HQ2_DENG_8SMODE, 1, BITS_DE_8SMODE );
+            push_indice( hBstr, IND_HQ2_DENG_8SDEPTH, lsbdepth1, BITS_MAX_DEPTH );
 
             FOR( i = 0; i < BANDS; ++i )
             {
-                push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx1[i] + 4], hessize[tdifidx1[i] + 4] );
+                push_indice( hBstr, IND_HQ2_DIFF_ENERGY, hescode[tdifidx1[i] + 4], hessize[tdifidx1[i] + 4] );
                 bits = add( bits, hessize[tdifidx1[i] + 4] ); /* Q0 */
             }
 
@@ -2754,7 +2614,7 @@ static Word16 large_symbol_enc_fx(                        /* o  : bits
             {
                 FOR( i = 0; i < BANDS; ++i )
                 {
-                    push_indice_fx( hBstr, IND_HQ2_DIFF_ENERGY, LSB1[i], lsbdepth1 );
+                    push_indice( hBstr, IND_HQ2_DIFF_ENERGY, LSB1[i], lsbdepth1 );
                 }
                 /*bits += BANDS * lsbdepth1; */
                 bits = add( bits, extract_h( L_shl( L_mult( BANDS, lsbdepth1 ), 15 ) ) ); /* Q0 */
@@ -3255,7 +3115,7 @@ static Word16 band_energy_quant_fx(
     {
         deng_cmode = 0;
         move16();
-        push_indice_fx( hBstr, IND_HQ2_DENG_MODE, deng_cmode, BITS_DE_CMODE );
+        push_indice( hBstr, IND_HQ2_DENG_MODE, deng_cmode, BITS_DE_CMODE );
         large_symbol_enc_fx( hBstr, bq2_fx, bands_fx, &hLCmode0, 1 );
         deng_bits = add( ebits, BITS_DE_CMODE ); /* Q0 */
     }
@@ -3264,7 +3124,7 @@ static Word16 band_energy_quant_fx(
         /* setting energy difference coding mode and storing it */
         deng_cmode = 1;
         move16();
-        push_indice_fx( hBstr, IND_HQ2_DENG_MODE, deng_cmode, BITS_DE_CMODE );
+        push_indice( hBstr, IND_HQ2_DENG_MODE, deng_cmode, BITS_DE_CMODE );
 
         deng_bits = add( hbits, BITS_DE_CMODE ); /* Q0 */
 
@@ -3604,11 +3464,7 @@ static Word16 p2a_threshold_quant_fx(
                 /* 10/( log(10)/log(2) ) = 3.01029995663981195211  24660(Q13) */
                 L_p2a = Mpy_32_16_1( L_tmp, 24660 ); /* 16+13-15 -> Q14 */
 
-#ifdef BASOP_NOGLOB
                 p2a_fx = round_fx_o( L_shl_o( L_p2a, 13, &Overflow ), &Overflow ); /*  27 -16  -> 11 */
-#else
-                p2a_fx = round_fx( L_shl( L_p2a, 13 ) );                       /*  27 -16  -> 11 */
-#endif
             }
 
             IF( LE_16( p2a_fx, p2a_th_fx ) )
@@ -3623,7 +3479,7 @@ static Word16 p2a_threshold_quant_fx(
             move16();
         }
 
-        push_indice_fx( hBstr, IND_HQ2_P2A_FLAGS, p2a_flags_fx[k], 1 );
+        push_indice( hBstr, IND_HQ2_P2A_FLAGS, p2a_flags_fx[k], 1 );
         j = add( j, 1 );
     }
 
@@ -3727,11 +3583,7 @@ static Word16 p2a_threshold_quant_ivas_fx(
                 /* 10/( log(10)/log(2) ) = 3.01029995663981195211  24660(Q13) */
                 L_p2a = Mpy_32_16_1( L_tmp, 24660 ); /* 16+13-15 -> Q14 */
 
-#ifdef BASOP_NOGLOB
                 p2a_fx = round_fx_o( L_shl_o( L_p2a, 13, &Overflow ), &Overflow ); /*  27 -16  -> 11 */
-#else
-                p2a_fx = round_fx( L_shl( L_p2a, 13 ) );                       /*  27 -16  -> 11 */
-#endif
             }
 
             IF( LE_16( p2a_fx, p2a_th_fx ) )
@@ -3871,13 +3723,9 @@ static void mdct_spectrum_fine_gain_enc_fx(
             exp_normn = norm_l( L_Exy );
             exp_normn = sub( exp_normn, 1 );
             exp_normd = norm_l( L_Eyy );
-#ifdef BASOP_NOGLOB
             gamma_fx = div_l( L_shl_o( L_Exy, exp_normn, &Overflow ), round_fx_o( L_shl_o( L_Eyy, exp_normd, &Overflow ), &Overflow ) ); /* Qgamma */
-#else
-            gamma_fx = div_l( L_shl( L_Exy, exp_normn ), round_fx( L_shl( L_Eyy, exp_normd ) ) );
-#endif
-            Qgamma = add( sub( exp_normn, exp_normd ), 15 ); /* exp_normn - (exp_normd-16) - 1; */
-            gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) );   /* Qgamma -> Q14 */
+            Qgamma = add( sub( exp_normn, exp_normd ), 15 );                                                                             /* exp_normn - (exp_normd-16) - 1; */
+            gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) );                                                                               /* Qgamma -> Q14 */
 
             dmin_fx = 32767;
             move16();
@@ -3920,7 +3768,7 @@ static void mdct_spectrum_fine_gain_enc_fx(
             move16();
         }
 
-        push_indice_fx( st_fx->hBstr, IND_HQ2_SUBBAND_GAIN, imin_fx, gqbits );
+        push_indice( st_fx->hBstr, IND_HQ2_SUBBAND_GAIN, imin_fx, gqbits );
     }
 
     return;
@@ -4037,13 +3885,9 @@ static void mdct_spectrum_fine_gain_enc_ivas_fx(
             exp_normn = norm_l( L_Exy );
             exp_normn = sub( exp_normn, 1 );
             exp_normd = norm_l( L_Eyy );
-#ifdef BASOP_NOGLOB
             gamma_fx = div_l( L_shl_o( L_Exy, exp_normn, &Overflow ), round_fx_o( L_shl_o( L_Eyy, exp_normd, &Overflow ), &Overflow ) ); /* Qgamma */
-#else
-            gamma_fx = div_l( L_shl( L_Exy, exp_normn ), round_fx( L_shl( L_Eyy, exp_normd ) ) );
-#endif
-            Qgamma = add( sub( exp_normn, exp_normd ), 15 ); /* exp_normn - (exp_normd-16) - 1; */
-            gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) );   /* Qgamma -> Q14 */
+            Qgamma = add( sub( exp_normn, exp_normd ), 15 );                                                                             /* exp_normn - (exp_normd-16) - 1; */
+            gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) );                                                                               /* Qgamma -> Q14 */
 
             dmin_fx = 32767;
             move16();
diff --git a/lib_enc/hvq_enc.c b/lib_enc/hvq_enc.c
deleted file mode 100644
index b693d838b6259978caa3f7b2a83451fef372455d..0000000000000000000000000000000000000000
--- a/lib_enc/hvq_enc.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/hvq_enc_fx.c b/lib_enc/hvq_enc_fx.c
index aae437c01c68bfdc0b68272e2d7a9c66da6077cb..a0acd0bfd63e5b6c69141b353503c9ee3a8f162f 100644
--- a/lib_enc/hvq_enc_fx.c
+++ b/lib_enc/hvq_enc_fx.c
@@ -8,12 +8,11 @@
 //#include "prot_fx.h"
 #include "rom_com.h"
 #include "prot_fx.h"     /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 #define HVQ_ENC_NOISE_DELTA ( (Word16) 3277 ) /* 0.1 in Q15 */
 
-static Word16 quant_lc( const Word16, Word16 * );
+static Word16 quant_lc_fx( const Word16, Word16 * );
 
 
 /*--------------------------------------------------------------------------*
@@ -119,11 +118,7 @@ Word16 hvq_enc_ivas_fx(                          /*o  : Consumed bits
                 nf_cnt = add( nf_cnt, 1 );      /* Q0 */
             }
 
-#ifdef BASOP_NOGLOB
             pe_mean = L_add_o( pe_mean, pe, &Overflow ); /* in Q12 and always positive */
-#else
-            pe_mean = L_add( pe_mean, pe );                                          /* in Q12 and always positive */
-#endif
         }
 
         IF( pe_mean > 0 )
@@ -150,14 +145,10 @@ Word16 hvq_enc_ivas_fx(                          /*o  : Consumed bits
             acc = L_mult( tmp16, HVQ_NFPE_FACTOR_CUBE_FX ); /* in Q(12+6+1) = Q19 */
             expNfpe3 = extract_l( L_mult0( expNfpe, 3 ) );  /* Cube operation */
             /* Number of bits required to adjust to Q15 */
-            adjust = add( 19 - ( 15 + 16 ), expNfpe3 ); /* +16 is due to the following extract_h(). */
-#ifdef BASOP_NOGLOB
+            adjust = add( 19 - ( 15 + 16 ), expNfpe3 );                      /* +16 is due to the following extract_h(). */
             noise_level[i] = extract_h( L_shr_o( acc, adjust, &Overflow ) ); /* noise_level[] in Q15 */
             move16();
-#else
-            noise_level[i] = extract_h( L_shr( acc, adjust ) );                      /* noise_level[] in Q15 */
-#endif
-            q_noise_level_idx[i] = quant_lc( noise_level[i], &q_noise_level[i] );
+            q_noise_level_idx[i] = quant_lc_fx( noise_level[i], &q_noise_level[i] );
             move16();
         }
         ELSE
@@ -185,22 +176,14 @@ Word16 hvq_enc_ivas_fx(                          /*o  : Consumed bits
             acc = L_mult( tmp16, HVQ_LB_NFPE_FACTOR_CUBE_FX ); /* in Q(12+9+1) = Q22 */
             expo3 = extract_l( L_mult0( expo, 3 ) );           /* Cube operation. */
             /* Number of bits required to adjust to Q15 */
-            adjust = add( 22 - ( 15 + 16 ), expo3 ); /* +16 is due to the following extract_h(). */
-#ifdef BASOP_NOGLOB
+            adjust = add( 22 - ( 15 + 16 ), expo3 );                  /* +16 is due to the following extract_h(). */
             lb_nfpe = extract_h( L_shr_o( acc, adjust, &Overflow ) ); /* noise_level[] in Q15 */
-#else
-            lb_nfpe = extract_h( L_shr( acc, adjust ) );                             /* noise_level[] in Q15 */
-#endif
-            IF( GT_16( lb_nfpe, 16384 ) ) /* in Q15 */
+            IF( GT_16( lb_nfpe, 16384 ) )                             /* in Q15 */
             {
                 lb_nfpe = 16384;
                 move16();
             }
-#ifdef BASOP_NOGLOB
             Mpy_32_16_ss( nf_gains[i], shl_o( lb_nfpe, 1, &Overflow ), &nf_gains[i], &dontCare ); /* nf_gains[] in Q12 */
-#else
-            Mpy_32_16_ss( nf_gains[i], shl( lb_nfpe, 1 ), &nf_gains[i], &dontCare ); /* nf_gains[] in Q12 */
-#endif
         }
         ELSE
         {
@@ -245,6 +228,7 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
     Word16 tmp16, adjust;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     bits_used = 0;
     move16();
@@ -311,11 +295,7 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
                 nf_cnt = add( nf_cnt, 1 );      /* Q0 */
             }
 
-#ifdef BASOP_NOGLOB
             pe_mean = L_add_o( pe_mean, pe, &Overflow ); /* in Q12 and always positive */
-#else
-            pe_mean = L_add( pe_mean, pe );                                          /* in Q12 and always positive */
-#endif
         }
 
         IF( pe_mean > 0 )
@@ -342,13 +322,11 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
             acc = L_mult( tmp16, HVQ_NFPE_FACTOR_CUBE_FX ); /* in Q(12+6+1) = Q19 */
             expNfpe3 = extract_l( L_mult0( expNfpe, 3 ) );  /* Cube operation */
             /* Number of bits required to adjust to Q15 */
-            adjust = add( 19 - ( 15 + 16 ), expNfpe3 ); /* +16 is due to the following extract_h(). */
-#ifdef BASOP_NOGLOB
+            adjust = add( 19 - ( 15 + 16 ), expNfpe3 );                      /* +16 is due to the following extract_h(). */
             noise_level[i] = extract_h( L_shr_o( acc, adjust, &Overflow ) ); /* noise_level[] in Q15 */
-#else
-            noise_level[i] = extract_h( L_shr( acc, adjust ) );                      /* noise_level[] in Q15 */
-#endif
-            q_noise_level_idx[i] = quant_lc( noise_level[i], &q_noise_level[i] );
+            move16();
+            q_noise_level_idx[i] = quant_lc_fx( noise_level[i], &q_noise_level[i] );
+            move16();
         }
         ELSE
         {
@@ -357,10 +335,11 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
             q_noise_level[i] = 0;
             move16();
         }
-        push_indice_fx( st_fx->hBstr, IND_HVQ_BWE_NL, q_noise_level_idx[i], 2 );
+        push_indice( st_fx->hBstr, IND_HVQ_BWE_NL, q_noise_level_idx[i], 2 );
         bits_used = add( bits_used, 2 );
 
         noise_level[i] = q_noise_level[i]; /* in Q15 */
+        move16();
     }
 
     FOR( i = 0; i < HVQ_NF_GROUPS; i++ )
@@ -374,22 +353,14 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
             acc = L_mult( tmp16, HVQ_LB_NFPE_FACTOR_CUBE_FX ); /* in Q(12+9+1) = Q22 */
             expo3 = extract_l( L_mult0( expo, 3 ) );           /* Cube operation. */
             /* Number of bits required to adjust to Q15 */
-            adjust = add( 22 - ( 15 + 16 ), expo3 ); /* +16 is due to the following extract_h(). */
-#ifdef BASOP_NOGLOB
+            adjust = add( 22 - ( 15 + 16 ), expo3 );                  /* +16 is due to the following extract_h(). */
             lb_nfpe = extract_h( L_shr_o( acc, adjust, &Overflow ) ); /* noise_level[] in Q15 */
-#else
-            lb_nfpe = extract_h( L_shr( acc, adjust ) );                             /* noise_level[] in Q15 */
-#endif
-            IF( lb_nfpe > 16384 ) /* in Q15 */
+            IF( lb_nfpe > 16384 )                                     /* in Q15 */
             {
                 lb_nfpe = 16384;
                 move16();
             }
-#ifdef BASOP_NOGLOB
             Mpy_32_16_ss( nf_gains[i], shl_o( lb_nfpe, 1, &Overflow ), &nf_gains[i], &dontCare ); /* nf_gains[] in Q12 */
-#else
-            Mpy_32_16_ss( nf_gains[i], shl( lb_nfpe, 1 ), &nf_gains[i], &dontCare ); /* nf_gains[] in Q12 */
-#endif
         }
         ELSE
         {
@@ -399,6 +370,7 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
     }
     nBits = peak_vq_enc_fx( st_fx->hBstr, st_fx->bwidth, coefs, coefs_out, core_brate, sub( hvq_bits, bits_used ),
                             Npeaks, ynrm, R, peaks, &nf_gains[0] );
+    move16();
     bits_used = add( bits_used, nBits );
     return bits_used;
 }
@@ -408,7 +380,7 @@ Word16 hvq_enc_fx(                          /*o  : Consumed bits
  *
  * Quantize the noise to one of the levels in {0, 0.1, 0.2, 0.3}
  *----------------------------------------------------------------------------*/
-static Word16 quant_lc( const Word16 x, Word16 *qx )
+static Word16 quant_lc_fx( const Word16 x, Word16 *qx )
 {
     Word16 indx;
 
diff --git a/lib_enc/igf_enc.c b/lib_enc/igf_enc.c
index 9ca1cd5fc529e32ae8dd845d85a26bbd4349c4ff..18995bd1de3d00953b78877e201c290f9b1c0f7b 100644
--- a/lib_enc/igf_enc.c
+++ b/lib_enc/igf_enc.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,24 +38,22 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "stat_enc.h"
 #include "wmc_auto.h"
 #include "prot_fx_enc.h"
-#include "prot_fx.h"
 
 
 #define INV_Log2_10_Q15 9864  /*1/log2(10) in Q15*/
 #define INV_Log2_10_Q12 1233  /*1/log2(10) in Q12*/
 #define INV_Log2_e_Q15  22713 /*1/log2(e) in Q15*/
 /*-------------------------------------------------------------------*
- * IGF_write_bit()
+ * IGF_write_bit_fx()
  *
  * write single bit to stream
  *-------------------------------------------------------------------*/
-static void IGF_write_bit(
+static void IGF_write_bit_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
     Word16 *bitCount,      /* i/o: bit counter              */
     const Word16 value     /* i  : value                    */
@@ -88,11 +86,11 @@ static void IGF_write_bits(
     {
         IF( s_and( value, shl( 1, bits ) ) == 0 )
         {
-            IGF_write_bit( hBstr, bitCount, 0 );
+            IGF_write_bit_fx( hBstr, bitCount, 0 );
         }
         ELSE
         {
-            IGF_write_bit( hBstr, bitCount, 1 );
+            IGF_write_bit_fx( hBstr, bitCount, 1 );
         }
     }
 
@@ -290,27 +288,27 @@ static Word32 IGF_getTNR_fx(
     width = sub( stop, start );
     FOR( i = start; i < stop; i++ )
     {
-        rootSpec_e[sub( i, start )] = e_ps;
+        rootSpec_e[i - start] = e_ps;
         move16();
-        rootSpec[sub( i, start )] = Sqrt32( powerSpectrum[i], &rootSpec_e[sub( i, start )] ); /*rootSpec[i - start] = sqrtf( powerSpectrum[i] );*/
+        rootSpec[i - start] = Sqrt32( powerSpectrum[i], &rootSpec_e[i - start] ); /*rootSpec[i - start] = sqrtf( powerSpectrum[i] );*/
         move32();
-        avg = BASOP_Util_Add_Mant32Exp( avg, avg_e, rootSpec[sub( i, start )], rootSpec_e[sub( i, start )], &avg_e ); /*avg += rootSpec[i - start];resultant exponent is avg_e*/
+        avg = BASOP_Util_Add_Mant32Exp( avg, avg_e, rootSpec[i - start], rootSpec_e[i - start], &avg_e ); /*avg += rootSpec[i - start];resultant exponent is avg_e*/
     }
     avg = BASOP_Util_Divide3216_Scale( avg, width, &tmp_e ); /*avg /= width;*/
     avg_e = add( 16, sub( add( avg_e, tmp_e ), 15 ) );
 
     FOR( i = start; i < stop; i++ )
     {
-        Word16 normSpec_e;                                                                            /*stores resultant exponent for normSpec*/
-        Word16 normSpec = BASOP_Util_Divide3232_Scale( rootSpec[sub( i, start )], avg, &normSpec_e ); /*rootSpec[i - start] / avg;*/
-        normSpec_e = add( normSpec_e, sub( rootSpec_e[sub( i, start )], avg_e ) );
+        Word16 normSpec_e;                                                                      /*stores resultant exponent for normSpec*/
+        Word16 normSpec = BASOP_Util_Divide3232_Scale( rootSpec[i - start], avg, &normSpec_e ); /*rootSpec[i - start] / avg;*/
+        normSpec_e = add( normSpec_e, sub( rootSpec_e[i - start], avg_e ) );
         IF( GT_32( normSpec, L_add( L_shl( 1, sub( 15, normSpec_e ) ), L_shl( adap, sub( e_adap, normSpec_e ) ) ) ) )
         {
-            tonal = BASOP_Util_Add_Mant32Exp( tonal, tonal_e, rootSpec[sub( i, start )], rootSpec_e[sub( i, start )], &tonal_e ); /*tonal += rootSpec[i - start];*/
+            tonal = BASOP_Util_Add_Mant32Exp( tonal, tonal_e, rootSpec[i - start], rootSpec_e[i - start], &tonal_e ); /*tonal += rootSpec[i - start];*/
         }
         ELSE IF( LT_32( normSpec, L_shl( 1, sub( 15, normSpec_e ) ) ) )
         {
-            noise = BASOP_Util_Add_Mant32Exp( noise, noise_e, rootSpec[sub( i, start )], rootSpec_e[sub( i, start )], &noise_e ); /*noise += rootSpec[i - start];*/
+            noise = BASOP_Util_Add_Mant32Exp( noise, noise_e, rootSpec[i - start], rootSpec_e[i - start], &noise_e ); /*noise += rootSpec[i - start];*/
         }
     }
 
@@ -318,7 +316,6 @@ static Word32 IGF_getTNR_fx(
     IF( noise == 0 ) // To handle condition if denom = 0
     {
         tonalToNoise = imult3216( L_shr( L_add( L_shl( 18 /* log10f(1e-018f) */, Q25 ), Mpy_32_16_1( L_add( BASOP_Util_Log2( tonal ), L_shl( tonal_e, Q25 ) ) /*Q25*/, INV_Log2_10_Q15 ) /*25+15-15*/ ), 3 ) /*Q22*/, 20 );
-        move32();
     }
     ELSE
     {
@@ -482,7 +479,7 @@ static void IGF_CalculateEnvelope_ivas_fx(
     Word16 tmp_e;
 
     hPrivateData = &hIGFEnc->igfData;
-    hGrid = &hPrivateData->igfInfo.grid[(int16_t) igfGridIdx];
+    hGrid = &hPrivateData->igfInfo.grid[(Word16) igfGridIdx];
     swb_offset = hGrid->swb_offset;
 
     IF( element_mode > EVS_MONO )
@@ -555,7 +552,6 @@ static void IGF_CalculateEnvelope_ivas_fx(
             move16();
             move16();
             move16();
-            move16();
 
             IF( pPowerSpectrum_fx != NULL )
             {
@@ -577,8 +573,8 @@ static void IGF_CalculateEnvelope_ivas_fx(
                     strt_cpy = add( strt_cpy, 1 );
                 }
 
-                sfbEnergyTileR = L_deposit_l( BASOP_Util_Divide3232_Scale( sfbEnergyTileR, width, &tmp_e ) );
-                sfbEnergyTileR_e = add( sub( sfbEnergyTileR_e, Q15 ), tmp_e );
+                sfbEnergyTileR = L_deposit_h( BASOP_Util_Divide3232_Scale( sfbEnergyTileR, width, &tmp_e ) );
+                sfbEnergyTileR_e = add( sub( sfbEnergyTileR_e, Q31 ), tmp_e );
 
                 IF( sfbEnergyTileR == 0 )
                 {
@@ -613,7 +609,6 @@ static void IGF_CalculateEnvelope_ivas_fx(
                 gain = Mult_32_16( sfbEnergyTileR, temp ); // gain_e
                 gain_e = add( tmp_e, sfbEnergyTileR_e );
 
-                test();
                 IF( element_mode > EVS_MONO )
                 {
                     test();
@@ -664,14 +659,17 @@ static void IGF_CalculateEnvelope_ivas_fx(
                         Word16 tmp0, tmp2, tmp3, tmp4;
                         Word16 tmp0_e, tmp2_e, tmp3_e, tmp4_e;
                         tmp0 = shr( hPrivateData->prevSFM_FIR_SFB_TB_fx[sfb], 2 );
-                        tmp0_e = hPrivateData->prevSFB_FIR_TB_e[sfb] + 2;
+                        tmp0_e = add( hPrivateData->prevSFB_FIR_TB_e[sfb], 2 );
+                        move16();
                         tmp2 = shr( hPrivateData->prevSFM_IIR_SFB_TB_fx[sfb], 2 );
-                        tmp2_e = hPrivateData->prevSFB_IIR_TB_e[sfb] + 2;
+                        tmp2_e = add( hPrivateData->prevSFB_IIR_TB_e[sfb], 2 );
+                        move16();
                         tmp3 = shr( hPrivateData->prevSFM_FIR_SFB_SB_fx[sfb], 2 );
-                        tmp3_e = hPrivateData->prevSFB_FIR_SB_e[sfb] + 2;
+                        tmp3_e = add( hPrivateData->prevSFB_FIR_SB_e[sfb], 2 );
+                        move16();
                         tmp4 = shr( hPrivateData->prevSFM_IIR_SFB_SB_fx[sfb], 2 );
-                        tmp4_e = hPrivateData->prevSFB_IIR_SB_e[sfb] + 2;
-
+                        tmp4_e = add( hPrivateData->prevSFB_IIR_SB_e[sfb], 2 );
+                        move16();
                         Word16 x1, x2;
 
                         Word16 x1_e = BASOP_Util_Add_MantExp( tmp0, tmp0_e, tmp2, tmp2_e - 1, &x1 );
@@ -703,7 +701,7 @@ static void IGF_CalculateEnvelope_ivas_fx(
                         BASOP_Util_Add_MantExp( hPrivateData->SFM_sb_fx[sfb], hPrivateData->sfb_sb_e[sfb], negate( hPrivateData->SFM_tb_fx[sfb] ), hPrivateData->sfb_tb_e[sfb], &diffSFM );
 
                         test();
-                        IF( diffSFM > 0 && LT_32( hPrivateData->SFM_tb_fx[sfb], L_shr( 3277 /*0.1 Q15*/, tmp_tb_e ) ) ) /* check whether target SFB is more tonal than source SFB */
+                        IF( diffSFM > 0 && LT_32( hPrivateData->SFM_tb_fx[sfb], L_shr( 3277 /*0.1 Q15*/, hPrivateData->sfb_tb_e[sfb] ) ) ) /* check whether target SFB is more tonal than source SFB */
                         {
                             Word16 currDampingFactor, dampingFactor;
                             Word16 slope, threshold;
@@ -718,8 +716,8 @@ static void IGF_CalculateEnvelope_ivas_fx(
                             Word32 mean_y_fx_tmp = 0;
                             move32();
                             mean_xy_fx = mean_x2_fx = 0;
-                            mean_x_e = mean_y_e = 15;
-                            mean_xy_e = mean_x2_e = 31;
+                            mean_x_e = 15;
+                            mean_xy_e = mean_y_e = mean_x2_e = 31;
                             move16();
                             move16();
                             move16();
@@ -730,17 +728,16 @@ static void IGF_CalculateEnvelope_ivas_fx(
                             move16();
                             move16();
 
-                            test();
                             FOR( sb = swb_offset[sfb]; sb < swb_offset[sfb + 1]; sb++ )
                             {
                                 mean_x_fx = add( mean_x_fx, x );                   /*Q0*/
                                 mean_x2_fx = L_add( mean_x2_fx, L_mult0( x, x ) ); /*Q0*/
 
-                                test();
-                                /*y = 20 * (int16_t) log10f( max( 1e-018f, pPowerSpectrum[sb] ) );*/
-                                IF( LT_32( pPowerSpectrum_fx[sb], 1 ) )
+                                /*y = 20.f * log10f( max( 1.f, powerSpectrum[i] ) );*/
+                                IF( LE_64( W_deposit32_l( pPowerSpectrum_fx[sb] ), W_shl( 1, ( sub( 31, e_ps[sb] ) ) ) ) )
                                 {
-                                    y = imult1616( 20, ( -18 /* log10f(1e-018f) */ ) );
+                                    y = 0;
+                                    move16();
                                 }
                                 ELSE
                                 {
@@ -864,8 +861,7 @@ static void IGF_CalculateEnvelope_ivas_fx(
                             move16();
                             hPrivateData->prevDampingFactor_IIR_e[sfb] = dampingFactor_e;
                             move16();
-                            test();
-                            IF( hPrivateData->dampingFactorSmoothing[sfb] > 0 )
+                            if ( hPrivateData->dampingFactorSmoothing[sfb] > 0 )
                             {
                                 hPrivateData->dampingFactorSmoothing[sfb] = sub( hPrivateData->dampingFactorSmoothing[sfb], 1 );
                                 move16();
@@ -928,11 +924,12 @@ static void IGF_CalculateEnvelope_ivas_fx(
             ELSE
             {
                 tmp_e = e_mdct;
+                move16();
                 sfbEnergyR = add_sat( EPSILON_FX, BASOP_Util_Divide3216_Scale( sum2_32_fx( pMDCTSpectrum_fx + swb_offset[sfb], width, &tmp_e ) /*exp: tmp_e*/, width, &sfbEnergyR_e ) ); // sfbEnergyR_e
                 sfbEnergyR_e = add( sfbEnergyR_e, add( tmp_e, -15 ) );
-                gain = sfbEnergyR; // gain_e
+                gain = L_shl( sfbEnergyR, 16 ); // gain_e
                 move32();
-                gain_e = add( sfbEnergyR_e, 16 );
+                gain_e = sfbEnergyR_e;
 
                 IF( element_mode > EVS_MONO )
                 {
@@ -1005,12 +1002,12 @@ static void IGF_CalculateStereoEnvelope_fx(
     const Word32 *pPowerSpectrum_fx,       /* i  : MDCT^2 + MDST^2 spectrum, or estimate       */
     Word16 pPowerSpectrum_e,               /* i  : exponent for pPowerSpectrum_fx              */
     const Word32 *pPowerSpectrumMsInv_fx,  /* i  : inverse power spectrum                      */
-    Word16 pPowerSpectrumMsInv_e,          /* i  : exponent for pPowerSpectrumMsInv_fx         */
+    Word16 *q_pPowerSpectrumMsInv,         /* i  : Q for pPowerSpectrumMsInv_fx         */
     const Word16 igfGridIdx,               /* i  : IGF grid index                                     */
     const Word16 coreMsMask[N_MAX],        /* i  : line wise ms Mask                                  */
     const Word16 isTransient,              /* i  : flag indicating if transient is detected           */
-    const Word16 last_core_acelp           /* i  : indicator if last frame was ACELP core             */
-)
+    const Word16 last_core_acelp,          /* i  : indicator if last frame was ACELP core             */
+    const Word16 mct_on )
 {
     IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData;
     H_IGF_GRID hGrid;
@@ -1050,13 +1047,39 @@ static void IGF_CalculateStereoEnvelope_fx(
     Word16 slope_e;              /*stores exponent for slope_fx*/
     Word16 sfbEnergyR_e;         /*stores exponent for sfbEnergyR*/
     Word16 tmp_e;
+    Word32 temp_pPowerSpectrumMsInv[N_MAX], length;
+    Word16 q_temp_pPowerSpectrumMsInv = Q31, i;
+    move16();
+
+    IF( pPowerSpectrumMsInv_fx != NULL )
+    {
+        length = N_MAX;
+        move16();
+        if ( mct_on )
+        {
+            length = L_FRAME48k;
+            move16();
+        }
+        FOR( i = 0; i < length; i++ )
+        {
+            IF( pPowerSpectrumMsInv_fx[i] != 0 )
+            {
+                q_temp_pPowerSpectrumMsInv = s_min( q_temp_pPowerSpectrumMsInv, add( q_pPowerSpectrumMsInv[i], norm_l( pPowerSpectrumMsInv_fx[i] ) ) );
+            }
+        }
+        FOR( i = 0; i < length; i++ )
+        {
+            temp_pPowerSpectrumMsInv[i] = L_shl( pPowerSpectrumMsInv_fx[i], sub( q_temp_pPowerSpectrumMsInv, q_pPowerSpectrumMsInv[i] ) );
+            move32();
+        }
+    }
 
     hPrivateData = &hIGFEnc->igfData;
     hGrid = &hPrivateData->igfInfo.grid[(Word16) igfGridIdx];
     swb_offset = hGrid->swb_offset;
     move16();
 
-    IF( NE_16( igfGridIdx, IGF_GRID_LB_NORM ) )
+    IF( igfGridIdx != IGF_GRID_LB_NORM )
     {
         FOR( sfbCnt = 0; sfbCnt < sub( hGrid->sfbWrap[hGrid->nTiles], hGrid->sfbWrap[0] ); sfbCnt++ )
         {
@@ -1084,7 +1107,7 @@ static void IGF_CalculateStereoEnvelope_fx(
     {
         FOR( sb = hGrid->sbWrap[0]; sb < swb_offset[hGrid->sfbWrap[hGrid->nTiles]]; sb++ )
         {
-            /*hPrivateData->logSpec[sb] = max( 0, (int16_t) ( logf( max( FLT_MIN, pPowerSpectrum[sb] ) ) * INV_LOG_2 ) );*/
+            /*hPrivateData->logSpec[sb] = max( 0, (Word16) ( logf( max( FLT_MIN, pPowerSpectrum[sb] ) ) * INV_LOG_2 ) );*/
             IF( LE_32( 1, pPowerSpectrum_fx[sb] ) )
             {
                 hPrivateData->logSpec[sb] = s_max( 0, (Word16) L_shr( L_add( BASOP_Util_Log2( pPowerSpectrum_fx[sb] ), L_shl( pPowerSpectrum_e, Q25 ) ), 25 ) );
@@ -1133,10 +1156,10 @@ static void IGF_CalculateStereoEnvelope_fx(
                         norm_exp = norm_l( pMDCTSpectrumMsInv_fx[strt_cpy] );
                         final_exp = sub( pMDCTSpectrumMsInv_e, norm_exp );
                         scaled_value = L_shl( pMDCTSpectrumMsInv_fx[strt_cpy], norm_exp );
-                        sfbEnergyTileR_fx = BASOP_Util_Add_Mant32Exp( sfbEnergyTileR_fx, sfbEnergyTileR_e, Mult_32_32( scaled_value, scaled_value ), shl( final_exp, 1 ), &sfbEnergyTileR_e ); /*resultant exponent is stored in sfbEnergyTileR_e*/
-                        sfbEnergyTileC_fx = BASOP_Util_Add_Mant32Exp( sfbEnergyTileC_fx, sfbEnergyTileC_e, pPowerSpectrumMsInv_fx[strt_cpy], pPowerSpectrumMsInv_e, &sfbEnergyTileC_e );       /*resultant exponent is stored in sfbEnergyTileC_e*/
-                        tileSrcSpec_fx[sub( strt_cpy, tmp )] = pPowerSpectrumMsInv_fx[strt_cpy];                                                                                               /*resultant exponent is stored in tileSrcSpec_e*/
-                        tileSrcSpec_e = pPowerSpectrumMsInv_e;
+                        sfbEnergyTileR_fx = BASOP_Util_Add_Mant32Exp( sfbEnergyTileR_fx, sfbEnergyTileR_e, Mult_32_32( scaled_value, scaled_value ), shl( final_exp, 1 ), &sfbEnergyTileR_e );                /*resultant exponent is stored in sfbEnergyTileR_e*/
+                        sfbEnergyTileC_fx = BASOP_Util_Add_Mant32Exp( sfbEnergyTileC_fx, sfbEnergyTileC_e, pPowerSpectrumMsInv_fx[strt_cpy], sub( 31, q_pPowerSpectrumMsInv[strt_cpy] ), &sfbEnergyTileC_e ); /*resultant exponent is stored in sfbEnergyTileC_e*/
+                        tileSrcSpec_fx[sub( strt_cpy, tmp )] = temp_pPowerSpectrumMsInv[strt_cpy];                                                                                                            /*resultant exponent is stored in tileSrcSpec_e*/
+                        tileSrcSpec_e = sub( 31, q_temp_pPowerSpectrumMsInv );
                     }
                     ELSE
                     {
@@ -1150,6 +1173,7 @@ static void IGF_CalculateStereoEnvelope_fx(
                         tileSrcSpec_e = pPowerSpectrum_e;
                     }
                     move32();
+                    move16();
                     strt_cpy = add( strt_cpy, 1 );
                 }
 
@@ -1173,13 +1197,13 @@ static void IGF_CalculateStereoEnvelope_fx(
                     move16();
 
                     // tmp_tb = IGF_getSFM_ivas(pPowerSpectrum, swb_offset[sfb], swb_offset[sfb + 1]) / IGF_getCrest_ivas(pPowerSpectrum, swb_offset[sfb], swb_offset[sfb + 1]);
-                    sfm = IGF_getSFM( &sfm_exp, pPowerSpectrum_fx, &pPowerSpectrum_e, swb_offset[sfb], swb_offset[sfb + 1] );
+                    sfm = IGF_getSFM_ivas_fx( &sfm_exp, pPowerSpectrum_fx, &pPowerSpectrum_e, swb_offset[sfb], swb_offset[sfb + 1] );
                     crest = IGF_getCrest( &crest_exp, pPowerSpectrum_fx, pPowerSpectrum_e, swb_offset[sfb], swb_offset[sfb + 1] );
                     tmp_tb_fx = BASOP_Util_Divide1616_Scale( sfm, crest, &tmp_e );
                     tmp_tb_e = add( tmp_e, sub( sfm_exp, crest_exp ) ); /*stores the resultant exponent for tmp_tb_fx*/
 
                     // tmp_sb = IGF_getSFM_ivas(tileSrcSpec, 0, strt_cpy - tmp) / IGF_getCrest_ivas(tileSrcSpec, 0, strt_cpy - tmp);
-                    sfm = IGF_getSFM( &sfm_exp, tileSrcSpec_fx, &tileSrcSpec_e, 0, sub( strt_cpy, tmp ) );
+                    sfm = IGF_getSFM_ivas_fx( &sfm_exp, tileSrcSpec_fx, &tileSrcSpec_e, 0, sub( strt_cpy, tmp ) );
                     crest = IGF_getCrest( &crest_exp, tileSrcSpec_fx, tileSrcSpec_e, 0, sub( strt_cpy, tmp ) );
                     tmp_sb_fx = BASOP_Util_Divide1616_Scale( sfm, crest, &tmp_e );
                     tmp_sb_e = add( tmp_e, sub( sfm_exp, crest_exp ) ); /*stores the resultant exponent for tmp_sb_fx*/
@@ -1221,10 +1245,10 @@ static void IGF_CalculateStereoEnvelope_fx(
                         {
                             hPrivateData->prevSFM_FIR_SFB_TB_fx[sfb] = shr( hPrivateData->prevSFM_FIR_SFB_TB_fx[sfb], diff_tb_e );
                             hPrivateData->prevSFM_IIR_SFB_TB_fx[sfb] = shr( hPrivateData->prevSFM_IIR_SFB_TB_fx[sfb], diff_tb_e );
-                            hPrivateData->prevSFB_FIR_TB_e[sfb] = tmp_tb_e;
-                            hPrivateData->prevSFB_IIR_TB_e[sfb] = tmp_tb_e;
                             move16();
                             move16();
+                            hPrivateData->prevSFB_FIR_TB_e[sfb] = tmp_tb_e;
+                            hPrivateData->prevSFB_IIR_TB_e[sfb] = tmp_tb_e;
                             move16();
                             move16();
                         }
@@ -1238,35 +1262,33 @@ static void IGF_CalculateStereoEnvelope_fx(
                         {
                             hPrivateData->prevSFM_FIR_SFB_SB_fx[sfb] = shr( hPrivateData->prevSFM_FIR_SFB_SB_fx[sfb], diff_sb_e );
                             hPrivateData->prevSFM_IIR_SFB_SB_fx[sfb] = shr( hPrivateData->prevSFM_IIR_SFB_SB_fx[sfb], diff_sb_e );
-                            hPrivateData->prevSFB_FIR_SB_e[sfb] = tmp_sb_e;
-                            hPrivateData->prevSFB_IIR_SB_e[sfb] = tmp_sb_e;
                             move16();
                             move16();
+                            hPrivateData->prevSFB_FIR_SB_e[sfb] = tmp_sb_e;
+                            hPrivateData->prevSFB_IIR_SB_e[sfb] = tmp_sb_e;
                             move16();
                             move16();
                         }
                     }
-                    tmp_tb_fx = shl_sat( tmp_tb_fx, sub( 2, tmp_tb_e ) ); /* Since we're limiting max value to 2.7f we can saturate to Q13 */
-                    tmp_sb_fx = shl_sat( tmp_sb_fx, sub( 2, tmp_sb_e ) ); /* Since we're limiting max value to 2.7f we can saturate to Q13 */
-
-                    hPrivateData->SFM_tb_fx[sfb] = add_sat( tmp_tb_fx, add_sat( shr( hPrivateData->prevSFM_FIR_SFB_TB_fx[sfb], sub( 2, tmp_tb_e ) ), shr( hPrivateData->prevSFM_IIR_SFB_TB_fx[sfb], sub( 3, tmp_tb_e ) ) ) ); /* Since we're limiting max value to 2.7f we can saturate to Q13 */
-                    hPrivateData->SFM_tb_fx[sfb] = s_min( 22118 /*2.7f Q13*/, hPrivateData->SFM_tb_fx[sfb] );                                                                                                                 /* resultant exponent stored in hPrivateData->sfb_sb_e[sfb]*/
-                    hPrivateData->SFM_sb_fx[sfb] = add_sat( tmp_sb_fx, add_sat( shr( hPrivateData->prevSFM_FIR_SFB_SB_fx[sfb], sub( 2, tmp_sb_e ) ), shr( hPrivateData->prevSFM_IIR_SFB_SB_fx[sfb], sub( 3, tmp_sb_e ) ) ) ); /* Since we're limiting max value to 2.7f we can saturate to Q13 */
-                    hPrivateData->SFM_sb_fx[sfb] = s_min( 22118 /*2.7f Q13*/, hPrivateData->SFM_sb_fx[sfb] );                                                                                                                 /*resultant exponent stores in hPrivateData->sfb_tb_e[sfb]*/
-                    hPrivateData->sfb_sb_e[sfb] = 2;
-                    hPrivateData->sfb_tb_e[sfb] = 2;
-                    move16();
-                    move16();
+                    tmp_tb_fx = shr_sat( tmp_tb_fx, sub( 2, tmp_tb_e ) );                                                                                                                                                                                                           /* Since we're limiting max value to 2.7f we can saturate to Q13 */
+                    tmp_sb_fx = shr_sat( tmp_sb_fx, sub( 2, tmp_sb_e ) );                                                                                                                                                                                                           /* Since we're limiting max value to 2.7f we can saturate to Q13 */
+                    hPrivateData->SFM_tb_fx[sfb] = add_sat( tmp_tb_fx, add_sat( shr( hPrivateData->prevSFM_FIR_SFB_TB_fx[sfb], sub( 2, hPrivateData->prevSFB_FIR_TB_e[sfb] ) ), shr( hPrivateData->prevSFM_IIR_SFB_TB_fx[sfb], sub( 3, hPrivateData->prevSFB_IIR_TB_e[sfb] ) ) ) ); /* Since we're limiting max value to 2.7f we can saturate to Q13 */
+                    hPrivateData->SFM_tb_fx[sfb] = s_min( 22118 /*2.7f Q13*/, hPrivateData->SFM_tb_fx[sfb] );                                                                                                                                                                       /* resultant exponent stored in hPrivateData->sfb_sb_e[sfb]*/
+                    hPrivateData->SFM_sb_fx[sfb] = add_sat( tmp_sb_fx, add_sat( shr( hPrivateData->prevSFM_FIR_SFB_SB_fx[sfb], sub( 2, hPrivateData->prevSFB_FIR_SB_e[sfb] ) ), shr( hPrivateData->prevSFM_IIR_SFB_SB_fx[sfb], sub( 3, hPrivateData->prevSFB_IIR_SB_e[sfb] ) ) ) ); /* Since we're limiting max value to 2.7f we can saturate to Q13 */
+                    hPrivateData->SFM_sb_fx[sfb] = s_min( 22118 /*2.7f Q13*/, hPrivateData->SFM_sb_fx[sfb] );                                                                                                                                                                       /*resultant exponent stores in hPrivateData->sfb_tb_e[sfb]*/
                     move16();
                     move16();
                     move16();
                     move16();
+                    hPrivateData->sfb_sb_e[sfb] = 2;
+                    hPrivateData->sfb_tb_e[sfb] = 2;
                     move16();
                     move16();
 
-                    BASOP_Util_Add_MantExp( hPrivateData->SFM_sb_fx[sfb], tmp_sb_e, negate( hPrivateData->SFM_tb_fx[sfb] ), tmp_tb_e, &diffSFM_fx ); /*stores the resultant exponent for diffSFM_fx*/
+                    diffSFM_fx = sub( hPrivateData->SFM_sb_fx[sfb], hPrivateData->SFM_tb_fx[sfb] ); /*Q13*/
 
-                    IF( diffSFM_fx > 0 && LT_32( hPrivateData->SFM_tb_fx[sfb], L_shr( 3277 /*0.1 Q15*/, tmp_tb_e ) ) ) /* check whether target SFB is more tonal than source SFB */
+                    test();
+                    IF( diffSFM_fx > 0 && LT_16( hPrivateData->SFM_tb_fx[sfb], 819 /*0.1 Q13*/ ) ) /* check whether target SFB is more tonal than source SFB */
                     {
                         Word16 currDampingFactor_fx, dampingFactor_fx, alpha_fx;
                         Word16 threshold_e, threshold_fx, alpha_e, currDampingFactor_e, dampingFactor_e;
@@ -1290,10 +1312,11 @@ static void IGF_CalculateStereoEnvelope_fx(
                             mean_x_fx = add( mean_x_fx, x );                   /*Q0*/
                             mean_x2_fx = L_add( mean_x2_fx, L_mult0( x, x ) ); /*Q0*/
 
-                            /*y = 20 * (int16_t) log10f( max( 1e-018f, pPowerSpectrum[sb] ) );*/
+                            /*y = 20 * (Word16) log10f( max( 1e-018f, pPowerSpectrum[sb] ) );*/
                             IF( LT_32( pPowerSpectrum_fx[sb], 1 ) )
                             {
                                 y = 20 * ( -18 );
+                                move16();
                             }
                             ELSE
                             {
@@ -1320,12 +1343,12 @@ static void IGF_CalculateStereoEnvelope_fx(
                         /* determine whether strong tilt is due to a step in the spectrum (e.g. band limitation, no damping)
                                    or a tonal component close the band border (apply damping) by calculating SFM for a shift of 1/2 SFB width*/
                         threshold_fx = BASOP_Util_Divide1616_Scale( 60, width, &threshold_e ); /*stores resultant exponent for threshold_fx*/
-
+                        test();
                         IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( slope_fx, add( slope_e, 16 ), negate( threshold_fx ), add( threshold_e, 16 ) ), -1 ) )
                         {
                             Word16 shift = shr( width, 1 );
                             // shiftedSFM = IGF_getSFM_ivas( pPowerSpectrum, swb_offset[sfb] - shift, swb_offset[sfb + 1] - shift ) / IGF_getCrest_ivas( pPowerSpectrum, swb_offset[sfb] - shift, swb_offset[sfb + 1] - shift );
-                            sfm = IGF_getSFM( &sfm_exp, pPowerSpectrum_fx, &pPowerSpectrum_e, sub( swb_offset[sfb], shift ), sub( swb_offset[sfb + 1], shift ) );
+                            sfm = IGF_getSFM_ivas_fx( &sfm_exp, pPowerSpectrum_fx, &pPowerSpectrum_e, sub( swb_offset[sfb], shift ), sub( swb_offset[sfb + 1], shift ) );
                             crest = IGF_getCrest( &crest_exp, pPowerSpectrum_fx, pPowerSpectrum_e, sub( swb_offset[sfb], shift ), sub( swb_offset[sfb + 1], shift ) );
                             shiftedSFM_fx = BASOP_Util_Divide1616_Scale( sfm, crest, &shiftedSFM_e );
                         }
@@ -1334,11 +1357,14 @@ static void IGF_CalculateStereoEnvelope_fx(
                             Word16 shift;
                             shift = shr( width, 1 );
                             // shiftedSFM = IGF_getSFM_ivas( pPowerSpectrum, swb_offset[sfb] + shift, swb_offset[sfb + 1] + shift ) / IGF_getCrest_ivas( pPowerSpectrum, swb_offset[sfb] + shift, swb_offset[sfb + 1] + shift );
-                            sfm = IGF_getSFM( &sfm_exp, pPowerSpectrum_fx, &pPowerSpectrum_e, add( swb_offset[sfb], shift ), add( swb_offset[sfb + 1], shift ) );
+                            sfm = IGF_getSFM_ivas_fx( &sfm_exp, pPowerSpectrum_fx, &pPowerSpectrum_e, add( swb_offset[sfb], shift ), add( swb_offset[sfb + 1], shift ) );
                             crest = IGF_getCrest( &crest_exp, pPowerSpectrum_fx, pPowerSpectrum_e, add( swb_offset[sfb], shift ), add( swb_offset[sfb + 1], shift ) );
                             shiftedSFM_fx = BASOP_Util_Divide1616_Scale( sfm, crest, &shiftedSFM_e );
                         }
-                        shiftedSFM_e = add( shiftedSFM_e, sub( sfm_exp, crest_exp ) ); /* stores resultant exponent for shiftedSFM_fx*/
+                        IF( shiftedSFM_fx )
+                        {
+                            shiftedSFM_e = add( shiftedSFM_e, sub( sfm_exp, crest_exp ) ); /* stores resultant exponent for shiftedSFM_fx*/
+                        }
 
                         // alpha = min( 320.f / (float) swb_offset[sfb + 1], 1.25f );
                         temp = BASOP_Util_Divide1616_Scale( 320, swb_offset[sfb + 1], &alpha_e );
@@ -1356,7 +1382,8 @@ static void IGF_CalculateStereoEnvelope_fx(
                             move16();
                             move16();
                         }
-
+                        test();
+                        test();
                         IF( last_core_acelp || hPrivateData->wasTransient || EQ_32( hPrivateData->prevDampingFactor_IIR_fx[sfb], L_shl( -1, sub( 15, hPrivateData->prevDampingFactor_IIR_e[sfb] ) ) ) )
                         {
                             tmp = BASOP_Util_Cmp_Mant32Exp( currDampingFactor_fx, currDampingFactor_e, 3277, 0 );
@@ -1388,7 +1415,7 @@ static void IGF_CalculateStereoEnvelope_fx(
                             {
                                 // currDampingFactor += 0.1f * ( ( 10 + adap ) - tonalToNoise );
                                 Word32 temp2 = BASOP_Util_Add_Mant32Exp( L_add( L_shl( 10, sub( 15, adap_e ) ) /*exp:adap_e*/, adap ), add( adap_e, 16 ), L_negate( tonalToNoise ), tonalToNoise_e, &tmp_e ); /* resultant exp is tmp_e*/
-                                currDampingFactor_e = BASOP_Util_Add_MantExp( currDampingFactor_fx, currDampingFactor_e, extract_l( Mult_32_32( 3277 /*0.1f Q15*/, temp2 ) ), tmp_e, &currDampingFactor_fx ); /*stores resultant exp for currDampingFactor_fx*/
+                                currDampingFactor_e = BASOP_Util_Add_MantExp( currDampingFactor_fx, currDampingFactor_e, extract_l( Mult_32_16( temp2, 3277 /*0.1f Q15*/ ) ), tmp_e, &currDampingFactor_fx ); /*stores resultant exp for currDampingFactor_fx*/
                             }
                         }
 
@@ -1500,11 +1527,15 @@ static void IGF_CalculateStereoEnvelope_fx(
             }
             /*gain=0.5f+log2f(gain)*2+16 becuase 2.885390081777927f=2*1/loge(2) so 2*1/loge(2)*loge(x) can be written as 2*log2(x)*/
             gain_fx = L_add( ONE_IN_Q22, L_add( L_add( L_shr( BASOP_Util_Log2( gain_fx ), 1 ), L_shl( gain_e, Q24 ) ), L_shl( 16, Q23 ) ) ); /*Q23*/
-            IF( !isTransient && ( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_48000_CPE ) || EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_FB_48000_CPE ) ) )
+            test();
+            test();
+            if ( !isTransient && ( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_48000_CPE ) || EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_FB_48000_CPE ) ) )
             {
                 gain_fx = L_add( gain_fx, ONE_IN_Q21 ); /* better preservation of original HF band energy */
             }
-            IF( !isTransient && ( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_64000_CPE ) || EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_FB_64000_CPE ) ) )
+            test();
+            test();
+            if ( !isTransient && ( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_64000_CPE ) || EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_FB_64000_CPE ) ) )
             {
                 gain_fx = L_add( gain_fx, ONE_IN_Q20 );
             }
@@ -1563,33 +1594,33 @@ static Word16 IGF_WriteEnvelope(
 
     IF( *igfAllZero != 0 )
     {
-        IGF_write_bit( hBstr, pBitOffset, 1 );
+        IGF_write_bit_fx( hBstr, pBitOffset, 1 );
 
-        IF( NULL == hBstr )
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderSaveContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
 
         IGFSCFEncoderReset_fx( &hPrivateData->hIGFSCFArithEnc );
 
-        IF( NULL == hBstr )
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderRestoreContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
     }
     ELSE
     {
-        IGF_write_bit( hBstr, pBitOffset, 0 );
+        IGF_write_bit_fx( hBstr, pBitOffset, 0 );
 
-        IF( NULL == hBstr )
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderSaveContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
 
-        *pBitOffset = IGFSCFEncoderEncode( &hPrivateData->hIGFSCFArithEnc, hBstr, *pBitOffset, &hPrivateData->igfScfQuantized[hGrid->startSfb], igfGridIdx, isIndepFlag );
+        *pBitOffset = IGFSCFEncoderEncode_ivas_fx( &hPrivateData->hIGFSCFArithEnc, hBstr, *pBitOffset, &hPrivateData->igfScfQuantized[hGrid->startSfb], igfGridIdx, isIndepFlag );
         move16();
 
-        IF( NULL == hBstr )
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderRestoreContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
@@ -1685,7 +1716,7 @@ static void IGF_Whitening_ivas_fx(
 
                 /* if current tile contains only a single SFB, reuse already computed SFM values */
                 test();
-                IF( GT_16( element_mode, EVS_MONO ) && EQ_16( sub( hGrid->sfbWrap[p + 1], hGrid->sfbWrap[p] ), 1 ) )
+                IF( element_mode > EVS_MONO && EQ_16( sub( hGrid->sfbWrap[p + 1], hGrid->sfbWrap[p] ), 1 ) )
                 {
                     tmp = hPrivateData->SFM_tb_fx[p];
                     tmp_e = hPrivateData->sfb_tb_e[p];
@@ -1818,7 +1849,7 @@ static void IGF_Whitening_ivas_fx(
                 ELSE
                 {
                     test();
-                    IF( GT_16( element_mode, EVS_MONO ) && EQ_16( sub( hGrid->sfbWrap[p + 1], hGrid->sfbWrap[p] ), 1 ) )
+                    IF( element_mode > EVS_MONO && EQ_16( sub( hGrid->sfbWrap[p + 1], hGrid->sfbWrap[p] ), 1 ) )
                     {
                         SFM = shl( tmp, sub( tmp_e, 2 ) ); /*2Q13*/
                     }
@@ -1850,7 +1881,7 @@ static void IGF_Whitening_ivas_fx(
                     }
                 }
 
-                IF( GT_16( element_mode, EVS_MONO ) )
+                IF( element_mode > EVS_MONO )
                 {
                     IF( last_core_acelp ) /* reset */
                     {
@@ -1957,7 +1988,7 @@ static void IGF_Whitening_ivas_fx(
         }
     }
 
-    IF( GT_16( element_mode, EVS_MONO ) )
+    IF( element_mode > EVS_MONO )
     {
         IF( EQ_16( SFM, -ONE_IN_Q13 /*1.0f 2Q13*/ ) ) /* reset */
         {
@@ -2004,7 +2035,10 @@ static void IGF_Whitening_ivas_fx(
                         break;
                     }
                 }
-
+                test();
+                test();
+                test();
+                test();
                 /* if tonality oscillates between two tiles, turn whitening off in both */
                 IF( ( ( pastSfmDiffSum_a > 0 && pastSfmDiffSum_b < 0 ) ||
                       ( pastSfmDiffSum_a < 0 && pastSfmDiffSum_b > 0 ) ) &&
@@ -2053,16 +2087,16 @@ static void IGF_Whitening_ivas_fx(
 
 
 /*-------------------------------------------------------------------*
- * IGF_WriteWhiteningTile()
+ * IGF_WriteWhiteningTile_fx()
  *
  * write whitening levels into bitstream
  *-------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-static Word16 IGF_WriteWhiteningTile(                        /**< out: Q0 | number of bits written     */
-                                      BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle       */
-                                      Word16 *pBitOffset,    /**< in:     | ptr to bitOffset counter   */
-                                      Word16 whiteningLevel  /**< in: Q0  | whitening levels to write  */
+static Word16 IGF_WriteWhiteningTile_fx(                        /**< out: Q0 | number of bits written     */
+                                         BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle       */
+                                         Word16 *pBitOffset,    /**< in:     | ptr to bitOffset counter   */
+                                         Word16 whiteningLevel  /**< in: Q0  | whitening levels to write  */
 )
 {
     Word16 totBitCount;
@@ -2096,17 +2130,17 @@ static Word16 IGF_WriteWhiteningTile(                        /**< out: Q0 | numb
 
 
 /*-------------------------------------------------------------------*
- * IGF_WriteWhiteningLevels()
+ * IGF_WriteWhiteningLevels_fx()
  *
  * writes the whitening levels
  *-------------------------------------------------------------------*/
 
-static Word16 IGF_WriteWhiteningLevels(                                          /**< out: Q0 | total number of bits written                                                 */
-                                        const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF encoder                                               */
-                                        BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
-                                        Word16 *pBitOffset,                      /**< in:     | ptr to bitOffset counter                                                     */
-                                        const Word16 igfGridIdx,                 /**< in: Q0  | igf grid index see declaration of IGF_GRID_IDX for details                   */
-                                        const Word16 isIndepFlag                 /**< in: Q0  | if 1 frame is independent, 0 = frame is coded with data from previous frame  */
+static Word16 IGF_WriteWhiteningLevels_fx(                                          /**< out: Q0 | total number of bits written                                                 */
+                                           const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF encoder                                               */
+                                           BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
+                                           Word16 *pBitOffset,                      /**< in:     | ptr to bitOffset counter                                                     */
+                                           const Word16 igfGridIdx,                 /**< in: Q0  | igf grid index see declaration of IGF_GRID_IDX for details                   */
+                                           const Word16 isIndepFlag                 /**< in: Q0  | if 1 frame is independent, 0 = frame is coded with data from previous frame  */
 )
 {
     IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData;
@@ -2140,7 +2174,7 @@ static Word16 IGF_WriteWhiteningLevels(
         move16();
         tmp32 = 0;
         move32();
-
+        test();
         WHILE( ( LT_16( p, nTiles ) ) && ( tmp32 == 0 ) )
         {
             test();
@@ -2163,11 +2197,12 @@ static Word16 IGF_WriteWhiteningLevels(
         {
             IGF_write_bits( hBstr, pBitOffset, 0, 1 );
         }
-        IGF_WriteWhiteningTile( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[0] );
+        IGF_WriteWhiteningTile_fx( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[0] );
         p = 1;
         move16();
         tmp32 = 0;
         move32();
+        test();
         IF( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_48000_CPE ) || EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_FB_48000_CPE ) )
         {
             isSame = 1;
@@ -2180,7 +2215,7 @@ static Word16 IGF_WriteWhiteningLevels(
                 isSame = 1;
                 move16();
             }
-
+            test();
             WHILE( ( LT_16( p, nTiles ) ) && ( tmp32 == 0 ) )
             {
                 test();
@@ -2199,7 +2234,7 @@ static Word16 IGF_WriteWhiteningLevels(
             IGF_write_bits( hBstr, pBitOffset, 1, 1 );
             FOR( p = 1; p < nTiles; p++ )
             {
-                IGF_WriteWhiteningTile( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[p] );
+                IGF_WriteWhiteningTile_fx( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[p] );
             }
         }
         ELSE IF( NE_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_48000_CPE ) && NE_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_FB_48000_CPE ) )
@@ -2215,16 +2250,16 @@ static Word16 IGF_WriteWhiteningLevels(
 
 
 /*-------------------------------------------------------------------*
- * IGF_WriteFlatteningTrigger()
+ * IGF_WriteFlatteningTrigger_fx()
  *
  * write flattening trigger
  *-------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-static Word16 IGF_WriteFlatteningTrigger(                                          /**< out:    | number of bits written         */
-                                          const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
-                                          BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
-                                          Word16 *pBitOffset                       /**< in:     | ptr to bitOffset counter       */
+static Word16 IGF_WriteFlatteningTrigger_fx(                                          /**< out:    | number of bits written         */
+                                             const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
+                                             BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
+                                             Word16 *pBitOffset                       /**< in:     | ptr to bitOffset counter       */
 )
 {
     Word16 flatteningTrigger;
@@ -2287,15 +2322,15 @@ Word16 IGFEncWriteBitstream_ivas_fx(
                        isIndepFlag,   /* i: if 1 frame is independent, 0 = frame is coded with data from previous frame */
                        &igfAllZero ); /* o: *igfAllZero                                                                 */
 
-    IGF_WriteWhiteningLevels( hIGFEnc,       /* i: instance handle of IGF Encoder                                              */
-                              hBstr,         /* i: encoder state                                                               */
-                              pBitOffset,    /* i: ptr to bitOffset counter                                                    */
-                              igfGridIdx,    /* i: igf grid index see definition of IGF_GRID_IDX for details                   */
-                              isIndepFlag ); /* i: if 1 frame is independent, 0 = frame is coded with data from previous frame */
+    IGF_WriteWhiteningLevels_fx( hIGFEnc,       /* i: instance handle of IGF Encoder                                              */
+                                 hBstr,         /* i: encoder state                                                               */
+                                 pBitOffset,    /* i: ptr to bitOffset counter                                                    */
+                                 igfGridIdx,    /* i: igf grid index see definition of IGF_GRID_IDX for details                   */
+                                 isIndepFlag ); /* i: if 1 frame is independent, 0 = frame is coded with data from previous frame */
 
-    IGF_WriteFlatteningTrigger( hIGFEnc,      /* i: instance handle of IGF Encoder                                              */
-                                hBstr,        /* i: encoder state                                                               */
-                                pBitOffset ); /* i: ptr to bitOffset counter                                                    */
+    IGF_WriteFlatteningTrigger_fx( hIGFEnc,      /* i: instance handle of IGF Encoder                                              */
+                                   hBstr,        /* i: encoder state                                                               */
+                                   pBitOffset ); /* i: ptr to bitOffset counter                                                    */
 
     hIGFEnc->infoTotalBitsPerFrameWritten = sub( *pBitOffset, startBitCount );
     hIGFEnc->infoTotalBitsWritten = add( hIGFEnc->infoTotalBitsWritten, hIGFEnc->infoTotalBitsPerFrameWritten );
@@ -2304,34 +2339,6 @@ Word16 IGFEncWriteBitstream_ivas_fx(
 
     return hIGFEnc->infoTotalBitsPerFrameWritten;
 }
-int16_t IGFEncWriteBitstream(
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder                                              */
-    BSTR_ENC_HANDLE hBstr,                 /* i/o: encoder bitstream handle                                                    */
-    int16_t *pBitOffset,                   /* i  : ptr to bitOffset counter                                                    */
-    const int16_t igfGridIdx,              /* i  : igf grid index see declaration of IGF_GRID_IDX for details                  */
-    const int16_t isIndepFlag              /* i  : if 1 frame is independent, 0 = frame is coded with data from previous frame */
-)
-{
-    int16_t igfAllZero;
-    int16_t startBitCount = *pBitOffset;
-
-    hIGFEnc->infoTotalBitsPerFrameWritten = 0;
-    if ( isIndepFlag )
-    {
-        hIGFEnc->infoTotalBitsWritten = 0;
-    }
-
-    IGF_WriteEnvelope( hIGFEnc, hBstr, pBitOffset, igfGridIdx, isIndepFlag, &igfAllZero );
-
-    IGF_WriteWhiteningLevels( hIGFEnc, hBstr, pBitOffset, igfGridIdx, isIndepFlag );
-
-    IGF_WriteFlatteningTrigger( hIGFEnc, hBstr, pBitOffset );
-
-    hIGFEnc->infoTotalBitsPerFrameWritten = ( *pBitOffset - startBitCount );
-    hIGFEnc->infoTotalBitsWritten += hIGFEnc->infoTotalBitsPerFrameWritten;
-
-    return hIGFEnc->infoTotalBitsPerFrameWritten;
-}
 
 
 /*-------------------------------------------------------------------*
@@ -2448,7 +2455,7 @@ void IGFEncSetMode_ivas_fx(
  *
  * IGF bitstream concatenation for TCX10 modes
  *-------------------------------------------------------------------*/
-
+#ifndef HARM_PUSH_BIT /* Float code */
 void IGFEncConcatenateBitstream(
     const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder                  */
     const Word16 bsBits,                   /* i  : number of IGF bits written to list of indices   */
@@ -2506,15 +2513,15 @@ move16();
 
 return;
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
- * IGFEncResetTCX10BitCounter()
+ * IGFEncResetTCX10BitCounter_ivas_fx()
  *
  * IGF reset bitstream bit counter for TCX10 modes
  *-------------------------------------------------------------------*/
 
-void IGFEncResetTCX10BitCounter(
+void IGFEncResetTCX10BitCounter_ivas_fx(
     const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */
 )
 {
@@ -2523,46 +2530,12 @@ void IGFEncResetTCX10BitCounter(
     hPrivateData = &hIGFEnc->igfData;
     hPrivateData->igfBitstreamBits = 0;
     hIGFEnc->infoTotalBitsWritten = 0;
-
+    move16();
+    move16();
     return;
 }
 
 
-/*-------------------------------------------------------------------*
- * IGFEncWriteConcatenatedBitstream()
- *
- *
- *-------------------------------------------------------------------*/
-
-/*! r: total number of bits written */
-int16_t IGFEncWriteConcatenatedBitstream(
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder */
-    BSTR_ENC_HANDLE hBstr                  /* i/o: encoder bitstream handle       */
-)
-{
-    IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData;
-    int16_t i;
-    int16_t bitsLeft;
-    UWord8 *pBitstream;
-
-    hPrivateData = &hIGFEnc->igfData;
-    pBitstream = hPrivateData->igfBitstream;
-
-    for ( i = 0; i < ( hPrivateData->igfBitstreamBits >> 3 ); i++ )
-    {
-        push_next_indice( hBstr, pBitstream[i], 8 );
-    }
-
-    bitsLeft = hPrivateData->igfBitstreamBits & 0x7;
-    if ( bitsLeft > 0 )
-    {
-        push_next_indice( hBstr, pBitstream[i] >> ( 8 - bitsLeft ), bitsLeft );
-    }
-
-    return hIGFEnc->infoTotalBitsWritten;
-}
-
-
 /*-------------------------------------------------------------------*
  * IGFEncApplyMono()
  *
@@ -2571,6 +2544,7 @@ int16_t IGFEncWriteConcatenatedBitstream(
 
 void IGFEncApplyMono_ivas_fx(
     Encoder_State *st,             /* i  : Encoder state                                          */
+    Word16 powerSpectrum_len,      /* i: length of pPowerSpectrum_fx buffer */
     const Word16 igfGridIdx,       /* i  : IGF grid index                                         */
     Word32 *pMDCTSpectrum_fx,      /* i/o: MDCT spectrum                                          */
     Word16 e_mdct,                 /* i : exponent of pMDCTspectrum							   */
@@ -2586,13 +2560,14 @@ void IGFEncApplyMono_ivas_fx(
     Word16 *pPowerSpectrumParameter_exp;
     Word16 att_fx = MAX16B;
     Word16 last_core_acelp;
-    Word16 highPassEner_exp;
     move16();
 
     Word32 common_pPowerSpectrum_fx[N_MAX + L_MDCT_OVLP_MAX];
+
+    set32_fx( common_pPowerSpectrum_fx, 0, N_MAX + L_MDCT_OVLP_MAX );
+
     Word16 common_pPowerSpectrum_exp = MIN16B;
     move16();
-    test();
     IF( st->last_core == ACELP_CORE )
     {
         last_core_acelp = 1;
@@ -2626,7 +2601,6 @@ void IGFEncApplyMono_ivas_fx(
 
     IGF_CalculateEnvelope_ivas_fx( st->hIGFEnc, pMDCTSpectrum_fx, e_mdct, pPowerSpectrumParameter_fx, pPowerSpectrumParameter_exp, igfGridIdx, st->hTranDet->transientDetector.bIsAttackPresent, last_core_acelp, st->element_mode, att_fx );
 
-    test();
     IF( isTCX20 )
     {
         pPowerSpectrumParameter_fx = pPowerSpectrum_fx;
@@ -2649,18 +2623,19 @@ void IGFEncApplyMono_ivas_fx(
 
     IF( pPowerSpectrumParameter_fx )
     {
-        FOR( Word16 i = 0; i < N_MAX + L_MDCT_OVLP_MAX; i++ )
+        FOR( Word16 i = 0; i < powerSpectrum_len; i++ )
         {
             common_pPowerSpectrum_exp = s_max( common_pPowerSpectrum_exp, pPowerSpectrumParameter_exp[i] );
         }
 
-        FOR( Word16 i = 0; i < N_MAX + L_MDCT_OVLP_MAX; i++ )
+        FOR( Word16 i = 0; i < powerSpectrum_len; i++ )
         {
-            common_pPowerSpectrum_fx[i] = L_shl( common_pPowerSpectrum_fx[i], sub( pPowerSpectrumParameter_exp[i], common_pPowerSpectrum_exp ) );
+            common_pPowerSpectrum_fx[i] = L_shl( pPowerSpectrumParameter_fx[i], sub( pPowerSpectrumParameter_exp[i], common_pPowerSpectrum_exp ) );
             move16();
         }
+        pPowerSpectrumParameter_fx = common_pPowerSpectrum_fx;
     }
-    IGF_ErodeSpectrum( &highPassEner_exp, st->hIGFEnc, pMDCTSpectrum_fx, pPowerSpectrumParameter_fx, common_pPowerSpectrum_exp, igfGridIdx );
+    IGF_ErodeSpectrum_ivas_fx( st->hIGFEnc, pMDCTSpectrum_fx, pPowerSpectrumParameter_fx, common_pPowerSpectrum_exp, igfGridIdx, 0 );
 }
 
 
@@ -2671,22 +2646,25 @@ void IGFEncApplyMono_ivas_fx(
  *-------------------------------------------------------------------*/
 
 void IGFEncApplyStereo_fx(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,              /* i/o: MDCT stereo encoder structure           */
-    Word16 ms_mask[2][MAX_SFB],                           /* i  : bandwise MS mask                        */
-    const IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS],  /* i  : instance handle of IGF Encoder          */
-    const Word16 igfGridIdx,                              /* i  : IGF grid index                          */
-    Encoder_State *sts[CPE_CHANNELS],                     /* i  : Encoder state                           */
-    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],              /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
-    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse power spectrum                  */
-    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],        /* i  : inverse spectrum                        */
-    const Word16 frameno,                                 /* i  : flag indicating index of current subfr. */
-    const Word16 sp_aud_decision0,                        /* i  : sp_aud_decision0                        */
-    const Word32 element_brate                            /* i  : element bitrate                         */
-)
+    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,                /* i/o: MDCT stereo encoder structure           */
+    Word16 ms_mask[2][MAX_SFB],                             /* i  : bandwise MS mask                        */
+    const IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS],    /* i  : instance handle of IGF Encoder          */
+    const Word16 igfGridIdx,                                /* i  : IGF grid index                          */
+    Encoder_State *sts[CPE_CHANNELS],                       /* i  : Encoder state                           */
+    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],                /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
+    Word16 exp_pPowerSpectrum_fx[CPE_CHANNELS],             /* i/o: exp of pPowerSpectrum_fx                */
+    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV],   /* i/o: inverse power spectrum                  */
+    Word16 *q_pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i/o: Q of pPowerSpectrumMsInv_fx           */
+    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],          /* i  : inverse spectrum                        */
+    Word16 exp_inv_spectrum_fx[CPE_CHANNELS],               /* i  : exp of inverse spectrum                 */
+    const Word16 frameno,                                   /* i  : flag indicating index of current subfr. */
+    const Word16 sp_aud_decision0,                          /* i  : sp_aud_decision0                        */
+    const Word32 element_brate,                             /* i  : element bitrate                         */
+    const Word16 mct_on )
 {
-    Word16 highPassEner_exp;
     Word32 *pPowerSpectrumParameter_fx[NB_DIV]; /* If it is NULL it informs a function that specific handling is needed */
     Word32 *pPowerSpectrumParameterMsInv_fx[NB_DIV];
+    Word16 *q_pPowerSpectrumParameterMsInv_fx[NB_DIV];
     Word16 coreMsMask[N_MAX];
     Word16 sfb, ch, last_core_acelp;
     STEREO_MDCT_BAND_PARAMETERS *sfbConf;
@@ -2710,7 +2688,7 @@ void IGFEncApplyStereo_fx(
     {
         sfbConf = &hStereoMdct->stbParamsTCX10;
     }
-    if ( EQ_16( sts[0]->last_core, ACELP_CORE ) )
+    if ( sts[0]->last_core == ACELP_CORE )
     {
         sfbConf = &hStereoMdct->stbParamsTCX20afterACELP;
     }
@@ -2730,6 +2708,8 @@ void IGFEncApplyStereo_fx(
         pPowerSpectrumParameter_fx[1] = &pPowerSpectrum_fx[1][0];
         pPowerSpectrumParameterMsInv_fx[0] = pPowerSpectrumMsInv_fx[0][0];
         pPowerSpectrumParameterMsInv_fx[1] = pPowerSpectrumMsInv_fx[1][0];
+        q_pPowerSpectrumParameterMsInv_fx[0] = q_pPowerSpectrumMsInv_fx[0][0];
+        q_pPowerSpectrumParameterMsInv_fx[1] = q_pPowerSpectrumMsInv_fx[1][0];
     }
     ELSE
     {
@@ -2737,13 +2717,17 @@ void IGFEncApplyStereo_fx(
         pPowerSpectrumParameter_fx[1] = NULL;
         pPowerSpectrumParameterMsInv_fx[0] = NULL;
         pPowerSpectrumParameterMsInv_fx[1] = NULL;
+        q_pPowerSpectrumParameterMsInv_fx[0] = NULL;
+        q_pPowerSpectrumParameterMsInv_fx[1] = NULL;
     }
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         last_core_acelp = extract_l( EQ_16( sts[ch]->last_core, ACELP_CORE ) );
 
         IGF_UpdateInfo( hIGFEnc[ch], igfGridIdx );
-        IGF_CalculateStereoEnvelope_fx( hIGFEnc[ch], sts[ch]->hTcxEnc->spectrum_fx[frameno], sts[ch]->hTcxEnc->spectrum_e[frameno], inv_spectrum_fx[ch][frameno], sts[ch]->hTcxEnc->spectrum_e[frameno], pPowerSpectrumParameter_fx[ch], sts[ch]->hTcxEnc->spectrum_e[frameno], pPowerSpectrumParameterMsInv_fx[ch], sts[ch]->hTcxEnc->spectrum_e[frameno], igfGridIdx, coreMsMask, sts[ch]->hTranDet->transientDetector.bIsAttackPresent, last_core_acelp );
+        IGF_CalculateStereoEnvelope_fx( hIGFEnc[ch], sts[ch]->hTcxEnc->spectrum_fx[frameno], sts[ch]->hTcxEnc->spectrum_e[frameno], inv_spectrum_fx[ch][frameno],
+                                        exp_inv_spectrum_fx[ch], pPowerSpectrumParameter_fx[ch], exp_pPowerSpectrum_fx[ch], pPowerSpectrumParameterMsInv_fx[ch],
+                                        q_pPowerSpectrumParameterMsInv_fx[ch], igfGridIdx, coreMsMask, sts[ch]->hTranDet->transientDetector.bIsAttackPresent, last_core_acelp, mct_on );
 
         IF( EQ_16( sts[ch]->core, TCX_20_CORE ) )
         {
@@ -2754,11 +2738,11 @@ void IGFEncApplyStereo_fx(
             pPowerSpectrumParameter_fx[ch] = NULL;
         }
 
-        set16_fx( exp_pPowerSpectrum, sts[ch]->hTcxEnc->spectrum_e[frameno], L_FRAME48k );
+        set16_fx( exp_pPowerSpectrum, exp_pPowerSpectrum_fx[ch], L_FRAME48k );
 
         IGF_Whitening_ivas_fx( hIGFEnc[ch], pPowerSpectrumParameter_fx[ch], &exp_pPowerSpectrum[0], igfGridIdx, sts[ch]->hTranDet->transientDetector.bIsAttackPresent, last_core_acelp, ( sts[0]->hTcxEnc->fUseTns[frameno] || sts[1]->hTcxEnc->fUseTns[frameno] ), sp_aud_decision0, element_brate, sts[ch]->element_mode );
 
-        IGF_ErodeSpectrum( &highPassEner_exp, hIGFEnc[ch], sts[ch]->hTcxEnc->spectrum_fx[frameno], pPowerSpectrumParameter_fx[ch], sts[ch]->hTcxEnc->spectrum_e[frameno], igfGridIdx );
+        IGF_ErodeSpectrum_ivas_fx( hIGFEnc[ch], sts[ch]->hTcxEnc->spectrum_fx[frameno], pPowerSpectrumParameter_fx[ch], exp_pPowerSpectrum_fx[ch], igfGridIdx, mct_on );
     }
     return;
 }
diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c
index f0d83e41638f29ab714154ca905d259a68a90acf..f78ad202578f0f29537006d5e6b7694c97b9fce4 100644
--- a/lib_enc/igf_enc_fx.c
+++ b/lib_enc/igf_enc_fx.c
@@ -8,8 +8,7 @@
 #include "options.h"
 #include "cnst.h"
 #include "stl.h"
-#include "prot.h"
-#include "prot_fx.h"     /* Function prototypes                    */
+#include "prot_fx.h"
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "stat_enc.h"
 #include "basop_util.h"
@@ -17,7 +16,7 @@
 /**********************************************************************/ /*
 write single bit to stream
 **************************************************************************/
-static void IGF_write_bit(
+static void IGF_write_bit_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle       */
     Word16 *bitCount,      /**< in/out: | bit counter              */
     Word16 bit             /**< in:     | value of bit             */
@@ -44,11 +43,11 @@ static void IGF_write_bits(
         tmp = s_and( value, shl( 1, bits ) );
         IF( tmp == 0 )
         {
-            IGF_write_bit( hBstr, bitCount, 0 );
+            IGF_write_bit_fx( hBstr, bitCount, 0 );
         }
         ELSE
         {
-            IGF_write_bit( hBstr, bitCount, 1 );
+            IGF_write_bit_fx( hBstr, bitCount, 1 );
         }
     }
 
@@ -96,6 +95,7 @@ static void IGF_CalculateEnvelope( const IGF_ENC_INSTANCE_HANDLE hInstance, /**<
     Word16 shift;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     /* initialize variables */
@@ -218,23 +218,8 @@ static void IGF_CalculateEnvelope( const IGF_ENC_INSTANCE_HANDLE hInstance, /**<
                     move16();
                 }
 
-#ifdef BASOP_NOGLOB
                 BASOP_Util_Divide_MantExp( round_fx_o( sfbEnergyTileR[sfb], &Overflow ), sfbEnergyTileR_exp[sfb], width, 15, &gain, &gain_exp );
                 BASOP_Util_Divide_MantExp( round_fx_o( sfbEnergyC[sfb], &Overflow ), sfbEnergyC_exp[sfb], round_fx_o( sfbEnergyTileC[sfb], &Overflow ), sfbEnergyTileC_exp[sfb], &tmp, &tmp_exp );
-#else
-                BASOP_Util_Divide_MantExp( round_fx( sfbEnergyTileR[sfb] ),
-                                           sfbEnergyTileR_exp[sfb],
-                                           width,
-                                           15,
-                                           &gain,
-                                           &gain_exp );
-                BASOP_Util_Divide_MantExp( round_fx( sfbEnergyC[sfb] ),
-                                           sfbEnergyC_exp[sfb],
-                                           round_fx( sfbEnergyTileC[sfb] ),
-                                           sfbEnergyTileC_exp[sfb],
-                                           &tmp,
-                                           &tmp_exp );
-#endif
                 L_tmp = L_mult( gain, tmp );
                 gain_exp = add( gain_exp, tmp_exp );
             }
@@ -249,21 +234,12 @@ static void IGF_CalculateEnvelope( const IGF_ENC_INSTANCE_HANDLE hInstance, /**<
                     zeroNrg = 1;
                     move16();
                 }
-#ifdef BASOP_NOGLOB
                 BASOP_Util_Divide_MantExp( round_fx_sat( sfbEnergyR[sfb] ),
                                            sfbEnergyR_exp[sfb],
                                            width,
                                            15,
                                            &gain,
                                            &gain_exp );
-#else
-                BASOP_Util_Divide_MantExp( round_fx( sfbEnergyR[sfb] ),
-                                           sfbEnergyR_exp[sfb],
-                                           width,
-                                           15,
-                                           &gain,
-                                           &gain_exp );
-#endif
                 L_tmp = L_deposit_h( gain );
             }
 
@@ -271,11 +247,7 @@ static void IGF_CalculateEnvelope( const IGF_ENC_INSTANCE_HANDLE hInstance, /**<
             L_tmp = BASOP_Util_Log2( L_tmp );
             L_tmp = L_add( L_tmp, L_deposit_h( shl( gain_exp, 15 - 6 ) ) );
             shift = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
             gain = round_fx_o( L_shl_o( L_tmp, shift, &Overflow ), &Overflow );
-#else
-            gain = round_fx( L_shl( L_tmp, shift ) );
-#endif
             gain_exp = sub( 7, shift );
             gain_exp = BASOP_Util_Add_MantExp( gain, gain_exp, 32767 /*16 Q11*/, 4, &gain );
             gain_exp = BASOP_Util_Add_MantExp( gain, gain_exp, 0x4000, 0, &gain );
@@ -338,21 +310,21 @@ static void IGF_WriteEnvelope(                                           /**< ou
 
     IF( *igfAllZero != 0 )
     {
-        IGF_write_bit( hBstr, pBitOffset, 1 );
-        IF( NULL == hBstr )
+        IGF_write_bit_fx( hBstr, pBitOffset, 1 );
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderSaveContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
         IGFSCFEncoderReset_fx( &hPrivateData->hIGFSCFArithEnc );
-        IF( NULL == hBstr )
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderRestoreContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
     }
     ELSE
     {
-        IGF_write_bit( hBstr, pBitOffset, 0 );
-        IF( NULL == hBstr )
+        IGF_write_bit_fx( hBstr, pBitOffset, 0 );
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderSaveContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
@@ -360,7 +332,7 @@ static void IGF_WriteEnvelope(                                           /**< ou
         *pBitOffset = IGFSCFEncoderEncode_fx( &hPrivateData->hIGFSCFArithEnc, hBstr, *pBitOffset, &hPrivateData->igfScfQuantized[hGrid->startSfb], igfGridIdx, isIndepFlag );
         move16();
 
-        IF( NULL == hBstr )
+        if ( NULL == hBstr )
         {
             IGFSCFEncoderRestoreContextState_fx( &hPrivateData->hIGFSCFArithEnc, igfGridIdx );
         }
@@ -403,6 +375,8 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     Flag Carry = 0;
+    move32();
+    move32();
 #endif
 
     hPrivateData = &hInstance->igfData;
@@ -440,21 +414,16 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
         FOR( i = 0; i < igfBgn; i++ )
         {
             Carry = 0;
-#ifdef BASOP_NOGLOB
+            move32();
             highPassEner = L_add_co( highPassEner, Mpy_32_16_1( pPowerSpectrum[i], shl( i, 4 ) /*Q4*/ ) /*Q20, pPowerSpectrum_exp*/, &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-            highPassEner = L_add_c( highPassEner, Mpy_32_16_1( pPowerSpectrum[i], shl( i, 4 ) /*Q4*/ ) /*Q20, pPowerSpectrum_exp*/ );
-#endif /* BASOP_NOGLOB */
             Overflow = 0;
-#ifdef BASOP_NOGLOB
+            move32();
             L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-            L_c = L_macNs( L_c, 0, 0 );
-#endif /* BASOP_NOGLOB */
         }
 
         highPassEner = norm_llQ31( L_c, highPassEner, highPassEner_exp ); /*Q20, highPassEner_exp*/
         *highPassEner_exp = add( *highPassEner_exp, pPowerSpectrum_exp );
+        move16();
         test();
         test();
         if ( NE_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_9600 ) &&
@@ -473,15 +442,8 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
         /* May overflow - just for threshold comparison                                                   */
         /* negate because the negated may be 1 larger in abs,                                             */
         /* so whenever compared to the negation of a maximum possible pPowerspectrum, it is still larger  */
-#ifdef BASOP_NOGLOB
         highPassEner_Ovfl = L_shl_o( L_negate( highPassEner ), sub( *highPassEner_exp, pPowerSpectrum_exp ), &Overflow );
         L_tmp = L_add_o( pPowerSpectrum[i - 1], highPassEner_Ovfl, &Overflow );
-#else
-        BASOP_SATURATE_WARNING_OFF_EVS
-        highPassEner_Ovfl = L_shl( L_negate( highPassEner ), sub( *highPassEner_exp, pPowerSpectrum_exp ) );
-        L_tmp = L_add( pPowerSpectrum[i - 1], highPassEner_Ovfl );
-        BASOP_SATURATE_WARNING_ON_EVS
-#endif
 
         if ( L_tmp >= 0 )
         {
@@ -493,11 +455,7 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
         {
             /* May overflow - just for threshold comparison */
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_sat( pPowerSpectrum[i], highPassEner_Ovfl );
-#else
-            L_tmp = L_add( pPowerSpectrum[i], highPassEner_Ovfl );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             IF( L_tmp < 0 )
@@ -522,15 +480,12 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
 
         /* May overflow - just for threshold comparison */
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         L_tmp = L_add_sat( pPowerSpectrum[i], highPassEner_Ovfl );
-#else
-        L_tmp = L_add( pPowerSpectrum[i], highPassEner_Ovfl );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
-        IF( L_tmp < 0 )
+        if ( L_tmp < 0 )
         {
             pSpectrum[i] = L_deposit_l( 0 );
+            move32();
         }
     }
 
@@ -538,7 +493,9 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
     FOR( i = igfEnd; i < hGrid->infoGranuleLen; i++ )
     {
         pSpectrum[i] = L_deposit_l( 0 );
+        move32();
         pPowerSpectrum[i] = L_deposit_l( 0 );
+        move32();
     }
 
     FOR( sfb = startSfb; sfb < stopSfb; sfb++ )
@@ -567,6 +524,179 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                        /**< ou
     }
 }
 
+void IGF_ErodeSpectrum_ivas_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
+                                Word32 *pSpectrum,                       /**< in/out: | MDCT spectrum                  Qx*/
+                                Word32 *pPowerSpectrum,                  /**< in/out: | power spectrum                 */
+                                Word16 pPowerSpectrum_exp,               /**< in:     | exponent of power spectrum     */
+                                const Word16 igfGridIdx,                 /**< in: Q0  | IGF grid index                 */
+                                const Word16 mct_on )
+{
+    IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData;
+    H_IGF_GRID hGrid;
+    Word16 i;
+    Word16 igfBgn;
+    Word16 igfEnd;
+    Word32 highPassEner; /* Q31 */
+    Word32 lastLine;
+    Word32 nextLine;
+    Word16 *swb_offset;
+    Word16 sfb;
+    Word16 startSfb;
+    Word16 stopSfb;
+    Word16 line;
+    Word16 *igfScaleF;
+    Word16 tmp;
+    Word16 factor;
+    Word16 exp1, exp2;
+    Word16 num, den;
+    Word32 temp;
+
+    hPrivateData = &hInstance->igfData;
+    hGrid = &hPrivateData->igfInfo.grid[igfGridIdx];
+    igfBgn = hGrid->startLine;
+    move16();
+    igfEnd = hGrid->stopLine;
+    move16();
+    swb_offset = hGrid->swb_offset;
+    move16();
+    startSfb = hGrid->startSfb;
+    move16();
+    stopSfb = hGrid->stopSfb;
+    move16();
+    igfScaleF = hPrivateData->igfScfQuantized;
+    move16();
+
+    IF( NULL == pPowerSpectrum )
+    {
+        FOR( i = igfBgn; i < hGrid->infoGranuleLen; i++ )
+        {
+            pSpectrum[i] = 0;
+            move32();
+        }
+        return;
+    }
+
+    IF( igfBgn > 0 )
+    {
+        Word64 sum = 0;
+        move64();
+        FOR( i = 0; i < igfBgn; i++ )
+        {
+            sum = W_mac_32_16( sum, pPowerSpectrum[i], i ); // Q: 31-pPowerSpectrum_exp+1
+        }
+        exp1 = W_norm( sum );
+        sum = W_shl( sum, sub( exp1, 1 ) );                // Q: 31-pPowerSpectrum_exp+1+exp1-1
+        num = extract_h( W_extract_h( sum ) );             // Q: 31-pPowerSpectrum_exp+exp1-48 = -pPowerSpectrum_exp+exp1-17
+        exp1 = add( 32, sub( pPowerSpectrum_exp, exp1 ) ); // exp: 32+pPowerSpectrum_exp-exp1
+
+        IF( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_9600 ) ||
+            EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_RF_SWB_13200 ) ||
+            EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_13200 ) ||
+            EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_16400_CPE ) )
+        {
+            factor = ONE_IN_Q14; // Q14
+            move16();
+        }
+        ELSE IF( mct_on && ( EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_48000_CPE ) || EQ_16( hPrivateData->igfInfo.bitRateIndex, IGF_BITRATE_SWB_64000_CPE ) ) )
+        {
+            factor = 11469; // 0.7f in Q14
+            move16();
+        }
+        ELSE
+        {
+            factor = 32767; // 2.f in Q14
+            move16();
+        }
+
+        temp = L_mult( igfBgn, factor ); // exp: 16
+        exp2 = norm_l( temp );
+        den = extract_h( L_shl( temp, exp2 ) ); // exp: 16-exp2
+        exp2 = sub( 16, exp2 );
+
+        highPassEner = L_deposit_h( div_s( num, den ) ); // exp: exp1-exp2
+
+        /* highPassEner is used only for comparison, saturation doesn't effect the outcome */
+        highPassEner = L_shl_sat( highPassEner, sub( sub( exp1, exp2 ), pPowerSpectrum_exp ) ); // exp: pPowerSpectrum_exp
+
+        lastLine = pSpectrum[i - 1]; // Qx
+        move32();
+        nextLine = pSpectrum[i]; // Qx
+        move32();
+
+        if ( LT_32( pPowerSpectrum[i - 1], highPassEner ) )
+        {
+            nextLine = 0;
+            move32();
+        }
+
+        FOR( /*i*/; i < igfEnd - 1; i++ )
+        {
+            /* May overflow - just for threshold comparison */
+            IF( LT_32( pPowerSpectrum[i], highPassEner ) )
+            {
+                lastLine = pSpectrum[i]; // Qx
+                move32();
+                pSpectrum[i] = nextLine; // Qx
+                move32();
+                nextLine = 0;
+                move32();
+            }
+            ELSE
+            {
+                pSpectrum[i - 1] = lastLine; // Qx
+                move32();
+                lastLine = pSpectrum[i]; // Qx
+                move32();
+                nextLine = pSpectrum[i + 1]; // Qx
+                move32();
+            }
+        }
+
+        /* May overflow - just for threshold comparison */
+        if ( LT_32( pPowerSpectrum[i], highPassEner ) )
+        {
+            pSpectrum[i] = 0;
+            move32();
+        }
+    }
+
+    /* delete spectrum above igfEnd: */
+    FOR( i = igfEnd; i < hGrid->infoGranuleLen; i++ )
+    {
+        pSpectrum[i] = 0;
+        pPowerSpectrum[i] = 0;
+        move32();
+        move32();
+    }
+
+    // Below check is present at the beginning of the function and is not required here
+    /* IF( NULL != pPowerSpectrum ) */
+    {
+        FOR( sfb = startSfb; sfb < stopSfb; sfb++ )
+        {
+            tmp = 0;
+            move16();
+            FOR( line = swb_offset[sfb]; line < swb_offset[sfb + 1]; line++ )
+            {
+                if ( pSpectrum[line] != 0 )
+                {
+                    tmp = add( tmp, 1 );
+                }
+            }
+
+            Word16 igfScaleF_cnt = igfScaleF[sfb];
+            move16();
+            test();
+            if ( tmp && igfScaleF[sfb] )
+            {
+                igfScaleF_cnt = sub( igfScaleF[sfb], 1 );
+            }
+            igfScaleF[sfb] = igfScaleF_cnt;
+            move16();
+        }
+    }
+}
+
 /**********************************************************************/ /*
 crest factor calculation
 **************************************************************************/
@@ -630,16 +760,11 @@ Word16 IGF_getCrest(                                                     /**< ou
         tmp32 = L_shl( tmp32, i ); /*Q31, s-i+15*/
         crest = extract_h( tmp32 );
         *crest_exp = add( sub( s, i ), 15 );
-
+        move16();
         /* limit crest factor to a lower bound of 1, may overflow */
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         tmp = shl_sat( -1, sub( 15, *crest_exp ) ); /* build negative threshold */
         tmp = add_sat( crest, tmp );
-#else
-        tmp = shl( -1, sub( 15, *crest_exp ) ); /* build negative threshold */
-        tmp = add( crest, tmp );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         if ( tmp < 0 )
         {
@@ -679,6 +804,8 @@ Word16 IGF_getSFM(                           /**< out: Q15| SFM value
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     Flag Carry = 0;
+    move32();
+    move32();
 #endif
 
     L_c = 0;
@@ -712,18 +839,11 @@ Word16 IGF_getSFM(                           /**< out: Q15| SFM value
         num = L_add( num, L_deposit_l( n ) ); /*Q0*/
 
         Carry = 0;
-#ifdef BASOP_NOGLOB
+        move32();
         denom = L_add_co( energy[i], denom, &Carry, &Overflow );
-#else  /* BASOP_NOGLOB */
-        denom = L_add_c( energy[i], denom );
-#endif /* BASOP_NOGLOB */
         Overflow = 0;
-
-#ifdef BASOP_NOGLOB
+        move32();
         L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else /* BASOP_NOGLOB */
-        L_c = L_macNs( L_c, 0, 0 );
-#endif
     }
 
     denom = norm_llQ31( L_c, denom, &denom_exp ); /*Q31*/
@@ -759,13 +879,106 @@ Word16 IGF_getSFM(                           /**< out: Q15| SFM value
 
         /*Transform to Q15*/
         s = norm_l( SFM32 );
-#ifdef BASOP_NOGLOB
         SFM = round_fx_sat( L_shl_sat( SFM32, s ) );
-#else
-        SFM = round_fx( L_shl( SFM32, s ) );
-#endif
         *SFM_exp = sub( *SFM_exp, s );
+        move16();
+        /**SFM_exp = s_min(*SFM_exp, 0);*/
+        IF( *SFM_exp > 0 )
+        {
+            *SFM_exp = 0;
+            move16();
+            SFM = 32767 /*1.0f Q15*/;
+            move16();
+        }
+    }
+
+    return SFM /*Q15*/;
+}
 
+/*************************************************************************
+calculates spectral flatness measurment
+**************************************************************************/
+Word16 IGF_getSFM_ivas_fx(                           /**< out: Q15| SFM value              */
+                           Word16 *SFM_exp,          /**< out:    | exponent of SFM Factor */
+                           const Word32 *energy,     /**< in:  Q31| energies               */
+                           const Word16 *energy_exp, /**< in:     | exponent of energies   */
+                           const Word16 start,       /**< in:  Q0 | start subband index    */
+                           const Word16 stop         /**< in:  Q0 | stop subband index     */
+)
+{
+    Word16 n, i, s;
+    Word32 num;
+    Word32 denom;
+    Word16 denom_exp;
+    Word16 invDenom_exp, numf_exp;
+    Word16 numf;
+    Word32 SFM32;
+    Word16 invDenom, SFM;
+
+    num = 0;
+    move32();
+    denom = 65536; // 1.f in Q16
+    denom_exp = 15;
+    *SFM_exp = 0;
+    move16();
+    SFM = 32767 /*1.0f Q15*/;
+    move16();
+
+    FOR( i = start; i < stop; i++ )
+    {
+        /*ln(x * 2^-Qx * 2^xExp) = ln(x) - Qx + xExp*/
+
+        /* n       = sub(sub(31,norm_l(tmp32)),1);  */ /*<- ld    */
+        /* n       = sub(n,31);                     */ /*<- -Qx   */
+        /* n       = add(n,*energy_exp);            */ /*<- +xExp */
+
+        n = sub( sub( *energy_exp, norm_l( energy[i] ) ), 1 ); /*<-- short form*/
+
+        if ( energy[i] == 0 ) /*special case: energy is zero*/
+        {
+            n = 0;
+            move16();
+        }
+
+        n = s_max( 0, n );
+        num = L_add( num, L_deposit_l( n ) ); /*Q0*/
+
+        denom = BASOP_Util_Add_Mant32Exp( energy[i], *energy_exp, denom, denom_exp, &denom_exp );
+    }
+
+    /* calculate SFM only if signal is present */
+    IF( denom != 0 )
+    {
+        /*numf   = (float)num / (float)(stop - start);*/
+        numf = BASOP_Util_Divide3216_Scale( num,                /*Q0*/
+                                            sub( stop, start ), /*Q0*/
+                                            &s );               /*Q-1 s*/
+        numf_exp = add( s, 16 );                                /*-> numf Q15 numf_exp*/
+        /*denom /= (float)(stop - start);*/
+        /*return ((float)pow(2.0, numf + 0.5f) / denom);*/
+
+        /*SFM= ((float)pow(2.0, numf + 0.5f) * invDenom);*/
+        invDenom = BASOP_Util_Divide3232_uu_1616_Scale( L_deposit_l( sub( stop, start ) ) /*Q0*/,
+                                                        denom /*Q31, denom_exp*/,
+                                                        &s ); /*Q-16, s-denom_exp*/
+        invDenom_exp = add( sub( s, denom_exp ), 31 );        /*invDenom: Q15, invDenom_exp*/
+
+        /*add .5f to numf*/
+        SFM32 = L_add( L_shl( L_deposit_l( numf ), numf_exp ) /*16Q15*/, 16384l /*.5f Q15*/ ); /*16Q15*/
+        s = norm_l( SFM32 );
+        SFM32 = L_shl( SFM32, s );
+        s = sub( 16, s ); /*SFM32(numf) is Q31 now*/
+
+        /*do the pow2 and the mult*/
+        SFM32 = BASOP_util_Pow2( SFM32, s, &s );
+        SFM32 = Mpy_32_16_1( SFM32, invDenom );
+        *SFM_exp = add( s, invDenom_exp );
+
+        /*Transform to Q15*/
+        s = norm_l( SFM32 );
+        SFM = round_fx_sat( L_shl_sat( SFM32, s ) );
+        *SFM_exp = sub( *SFM_exp, s );
+        move16();
         /**SFM_exp = s_min(*SFM_exp, 0);*/
         IF( *SFM_exp > 0 )
         {
@@ -811,6 +1024,7 @@ static void IGF_Whitening( const IGF_ENC_INSTANCE_HANDLE hInstance,      /**< in
         {
             /* reset filter */
             hPrivateData->prevSFM_FIR[p] = L_deposit_l( 0 );
+            move32();
             hPrivateData->prevSFM_IIR[p] = 0;
             move16();
 
@@ -834,6 +1048,7 @@ static void IGF_Whitening( const IGF_ENC_INSTANCE_HANDLE hInstance,      /**< in
         IF( powerSpectrum )
         {
             Word16 nT = hGrid->nTiles;
+            move16();
             SWITCH( hPrivateData->igfInfo.bitRateIndex )
             {
                 case IGF_BITRATE_WB_9600:
@@ -875,13 +1090,8 @@ static void IGF_Whitening( const IGF_ENC_INSTANCE_HANDLE hInstance,      /**< in
                 BASOP_SATURATE_WARNING_OFF_EVS
                 /*SFM  = min(2.7f, SFM);*/
                 /*Overflow possible in shift, intended*/
-#ifdef BASOP_NOGLOB
                 tmp = add_sat( crest, tmp );
                 SFM = s_min( 22118 /*2.7f Q13*/, extract_h( L_shr_sat( SFM32, 16 - 29 ) /*->Q29*/ ) /*->Q13*/ );
-#else
-                tmp = add( crest, tmp );
-                SFM = s_min( 22118 /*2.7f Q13*/, extract_h( L_shr( SFM32, 16 - 29 ) /*->Q29*/ ) /*->Q13*/ );
-#endif
                 BASOP_SATURATE_WARNING_ON_EVS
 
                 hPrivateData->prevSFM_FIR[p] = tmp32; /*15Q16*/
@@ -934,6 +1144,7 @@ static void IGF_Whitening( const IGF_ENC_INSTANCE_HANDLE hInstance,      /**< in
         FOR( p = 0; p < IGF_MAX_TILES; p++ )
         {
             hPrivateData->prevSFM_FIR[p] = L_deposit_l( 0 );
+            move32();
             hPrivateData->prevSFM_IIR[p] = 0;
             move16();
         }
@@ -945,10 +1156,10 @@ static void IGF_Whitening( const IGF_ENC_INSTANCE_HANDLE hInstance,      /**< in
 /**********************************************************************/ /*
 write whitening levels into bitstream
 **************************************************************************/
-static void IGF_WriteWhiteningTile(                                      /**< out: Q0 | number of bits written     */
-                                    BSTR_ENC_HANDLE hBstr,               /* i/o: encoder bitstream handle       */
-                                    Word16 *pBitOffset,                  /**< in:     | ptr to bitOffset counter   */
-                                    Word16 whiteningLevel                /**< in: Q0  | whitening levels to write  */
+static void IGF_WriteWhiteningTile_fx(                                   /**< out: Q0 | number of bits written     */
+                                       BSTR_ENC_HANDLE hBstr,            /* i/o: encoder bitstream handle       */
+                                       Word16 *pBitOffset,               /**< in:     | ptr to bitOffset counter   */
+                                       Word16 whiteningLevel             /**< in: Q0  | whitening levels to write  */
 )
 {
     IF( EQ_32( whiteningLevel, IGF_WHITENING_MID ) )
@@ -969,15 +1180,15 @@ static void IGF_WriteWhiteningTile(                                      /**< ou
     }
 }
 
-/**********************************************************************/       /*
-      writes the whitening levels
-      **************************************************************************/
-static void IGF_WriteWhiteningLevels(                                          /**< out: Q0 | total number of bits written                                                 */
-                                      const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF encoder                                               */
-                                      BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
-                                      Word16 *pBitOffset,                      /**< in:     | ptr to bitOffset counter                                                     */
-                                      const Word16 igfGridIdx,                 /**< in: Q0  | igf grid index see declaration of IGF_GRID_IDX for details                   */
-                                      const Word16 isIndepFlag                 /**< in: Q0  | if 1 frame is independent, 0 = frame is coded with data from previous frame  */
+/**********************************************************************/          /*
+         writes the whitening levels
+         **************************************************************************/
+static void IGF_WriteWhiteningLevels_fx(                                          /**< out: Q0 | total number of bits written                                                 */
+                                         const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF encoder                                               */
+                                         BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
+                                         Word16 *pBitOffset,                      /**< in:     | ptr to bitOffset counter                                                     */
+                                         const Word16 igfGridIdx,                 /**< in: Q0  | igf grid index see declaration of IGF_GRID_IDX for details                   */
+                                         const Word16 isIndepFlag                 /**< in: Q0  | if 1 frame is independent, 0 = frame is coded with data from previous frame  */
 )
 {
     IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData;
@@ -1006,7 +1217,7 @@ static void IGF_WriteWhiteningLevels(                                          /
         move16();
         tmp32 = 0;
         move32();
-
+        test();
         WHILE( ( LT_16( p, nTiles ) ) && ( tmp32 == 0 ) )
         {
             test();
@@ -1029,7 +1240,7 @@ static void IGF_WriteWhiteningLevels(                                          /
         {
             IGF_write_bits( hBstr, pBitOffset, 0, 1 );
         }
-        IGF_WriteWhiteningTile( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[0] );
+        IGF_WriteWhiteningTile_fx( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[0] );
         p = 1;
         move16();
         tmp32 = 0;
@@ -1039,7 +1250,7 @@ static void IGF_WriteWhiteningLevels(                                          /
             isSame = 1;
             move16();
         }
-
+        test();
         WHILE( ( LT_16( p, nTiles ) ) && ( tmp32 == 0 ) )
         {
             test();
@@ -1057,7 +1268,7 @@ static void IGF_WriteWhiteningLevels(                                          /
             IGF_write_bits( hBstr, pBitOffset, 1, 1 );
             FOR( p = 1; p < nTiles; p++ )
             {
-                IGF_WriteWhiteningTile( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[p] );
+                IGF_WriteWhiteningTile_fx( hBstr, pBitOffset, hPrivateData->igfCurrWhiteningLevel[p] );
             }
         }
         ELSE
@@ -1067,13 +1278,13 @@ static void IGF_WriteWhiteningLevels(                                          /
     }
 }
 
-/**********************************************************************/         /*
-        write flattening trigger
-        **************************************************************************/
-static void IGF_WriteFlatteningTrigger(                                          /**< out:    | number of bits written         */
-                                        const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
-                                        BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
-                                        Word16 *pBitOffset                       /**< in:     | ptr to bitOffset counter       */
+/**********************************************************************/            /*
+           write flattening trigger
+           **************************************************************************/
+static void IGF_WriteFlatteningTrigger_fx(                                          /**< out:    | number of bits written         */
+                                           const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
+                                           BSTR_ENC_HANDLE hBstr,                   /* i/o: encoder bitstream handle       */
+                                           Word16 *pBitOffset                       /**< in:     | ptr to bitOffset counter       */
 )
 {
     Word16 flatteningTrigger;
@@ -1143,19 +1354,20 @@ Word16 IGFEncWriteBitstream_fx(                                          /**< ou
                        isIndepFlag,   /* i: if 1 frame is independent, 0 = frame is coded with data from previous frame */
                        &igfAllZero ); /* o: *igfAllZero                                                                 */
 
-    IGF_WriteWhiteningLevels( hInstance,     /* i: instance handle of IGF Encoder                                              */
-                              hBstr,         /* i: encoder state                                                               */
-                              pBitOffset,    /* i: ptr to bitOffset counter                                                    */
-                              igfGridIdx,    /* i: igf grid index see definition of IGF_GRID_IDX for details                   */
-                              isIndepFlag ); /* i: if 1 frame is independent, 0 = frame is coded with data from previous frame */
+    IGF_WriteWhiteningLevels_fx( hInstance,     /* i: instance handle of IGF Encoder                                              */
+                                 hBstr,         /* i: encoder state                                                               */
+                                 pBitOffset,    /* i: ptr to bitOffset counter                                                    */
+                                 igfGridIdx,    /* i: igf grid index see definition of IGF_GRID_IDX for details                   */
+                                 isIndepFlag ); /* i: if 1 frame is independent, 0 = frame is coded with data from previous frame */
 
-    IGF_WriteFlatteningTrigger( hInstance,    /* i: instance handle of IGF Encoder                                              */
-                                hBstr,        /* i: encoder state                                                               */
-                                pBitOffset ); /* i: ptr to bitOffset counter                                                    */
+    IGF_WriteFlatteningTrigger_fx( hInstance,    /* i: instance handle of IGF Encoder                                              */
+                                   hBstr,        /* i: encoder state                                                               */
+                                   pBitOffset ); /* i: ptr to bitOffset counter                                                    */
 
     hInstance->infoTotalBitsPerFrameWritten = sub( *pBitOffset, startBitCount );
     hInstance->infoTotalBitsWritten = add( hInstance->infoTotalBitsWritten, hInstance->infoTotalBitsPerFrameWritten );
-
+    move16();
+    move16();
     return hInstance->infoTotalBitsPerFrameWritten;
 }
 
@@ -1253,7 +1465,7 @@ static void pack_bit_ivas_fx(
         move16();
     }
 
-    IF( bit != 0 )
+    if ( bit != 0 )
     {
         **pt = (UWord8) s_or( **pt, *omask );
         move16();
@@ -1302,6 +1514,7 @@ void IGFEncConcatenateBitstream_ivas_fx( const IGF_ENC_INSTANCE_HANDLE hIGFEnc,
     move16();
 
     omask = (UWord8) UL_lshr( 0x80, s_and( *pFrame_size, 0x7 ) );
+    move16();
     pFrame += *pFrame_size >> 3;
 
     /* bitstream packing (conversion of individual indices into a serial stream) */
@@ -1333,7 +1546,7 @@ hBstr->nb_bits_tot = sub( hBstr->nb_bits_tot, nb_bits_written );
 
 return;
 }
-
+#ifndef HARM_PUSH_BIT                                                        /* old bitstream */
 /**********************************************************************/     /*
     IGF bitsream concatenation for TCX10 modes
     **************************************************************************/
@@ -1348,7 +1561,7 @@ void IGFEncConcatenateBitstream_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /**
 
     hPrivateData = &hInstance->igfData;
     *next_ind = *next_ind - bsBits;
-
+    move16();
     indices_to_serial_generic(
         &ind_list_fx[*next_ind],
         bsBits,
@@ -1356,10 +1569,10 @@ void IGFEncConcatenateBitstream_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /**
         &hPrivateData->igfBitstreamBits );
 
     *nb_bits = sub( *nb_bits, bsBits );
-
+    move16();
     return;
 }
-
+#endif
 /**********************************************************************/    /*
    IGF reset bitsream bit counter for TCX10 modes
    **************************************************************************/
@@ -1397,13 +1610,13 @@ Word16 IGFEncWriteConcatenatedBitstream_fx(
     tmp = shr( hPrivateData->igfBitstreamBits, 3 );
     FOR( i = 0; i < tmp; i++ )
     {
-        push_next_indice_fx( hBstr, pBitstream[i], 8 );
+        push_next_indice( hBstr, pBitstream[i], 8 );
     }
 
     bitsLeft = s_and( hPrivateData->igfBitstreamBits, 0x7 );
     IF( bitsLeft > 0 )
     {
-        push_next_indice_fx( hBstr, shr( pBitstream[i], sub( 8, bitsLeft ) ), bitsLeft );
+        push_next_indice( hBstr, shr( pBitstream[i], sub( 8, bitsLeft ) ), bitsLeft );
     }
 
     return hInstance->infoTotalBitsWritten;
diff --git a/lib_enc/igf_scf_enc.c b/lib_enc/igf_scf_enc.c
index 04ca67979f1eb2a809bf66b850d15804691b9c61..2921b58866c86fab78dcf3af0061fa68559cd4ec 100644
--- a/lib_enc/igf_scf_enc.c
+++ b/lib_enc/igf_scf_enc.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,12 +36,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "stat_enc.h"
 #include "stat_com.h"
 #include "cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 
 
@@ -98,6 +97,7 @@ static void arith_encode_bits(
                                                                     32767, /* disable the bit count limitation */
                                                                     &hPrivateData->acState,
                                                                     bit );
+        move16();
     }
 }
 
@@ -133,7 +133,7 @@ static void arith_encode_residual(
                                                                    &hPrivateData->acState,
                                                                    x,
                                                                    cumulativeFrequencyTable );
-
+        move16();
         return;
     }
 
@@ -146,6 +146,7 @@ static void arith_encode_residual(
                                                                    &hPrivateData->acState,
                                                                    0,
                                                                    cumulativeFrequencyTable );
+        move16();
     }
     ELSE /* x > IGF_MAX_ENC_SEPARATE */
     {
@@ -156,6 +157,7 @@ static void arith_encode_residual(
                                                                    &hPrivateData->acState,
                                                                    IGF_SYMBOLS_IN_TABLE - 1,
                                                                    cumulativeFrequencyTable );
+        move16();
     }
 
     /* encode one of the tails of the distribution */
@@ -226,17 +228,20 @@ static void encode_sfe_vector(
                                                                            &hPrivateData->acState,
                                                                            shr( x[f], 2 ),
                                                                            (const UWord16 *) hPrivateData->cf_se00 );
+                move16();
                 arith_encode_bits( hPrivateData, ptr, x[f] & 3, 2 ); /* LSBs as 2 bit raw */
             }
             ELSE IF( EQ_16( f, 1 ) )
             {
                 pred = x[f - 1]; /* pred = b */
+                move16();
                 arith_encode_residual( hPrivateData, ptr, x[f] - pred, hPrivateData->cf_se01, hPrivateData->cf_off_se01 );
             }
             ELSE
             {
                 /* f >= 2 */
-                pred = x[f - 1];                              /* pred = b */
+                pred = x[f - 1]; /* pred = b */
+                move16();
                 ctx = quant_ctx( sub( x[f - 1], x[f - 2] ) ); /* Q(b - e) */
                 arith_encode_residual( hPrivateData, ptr, sub( x[f], pred ), &hPrivateData->cf_se02[( IGF_SYMBOLS_IN_TABLE + 1 ) * ( IGF_CTX_OFFSET + ctx )], hPrivateData->cf_off_se02[IGF_CTX_OFFSET + ctx] );
             }
@@ -267,11 +272,11 @@ static void encode_sfe_vector(
 
 
 /*---------------------------------------------------------------------*
- * IGFSCFEncoderEncode()
+ * IGFSCFEncoderEncode_ivas_fx()
  *
  * main IGF encoder function
  *---------------------------------------------------------------------*/
-Word16 IGFSCFEncoderEncode(
+Word16 IGFSCFEncoderEncode_ivas_fx(
     IGFSCFENC_INSTANCE_HANDLE hPublicData, /* i/o: handle to public data or NULL in case there was no instance created                           */
     BSTR_ENC_HANDLE hBstr,                 /* i/o: encoder bitstream handle                                                                      */
     const Word16 bitCount,                 /* i  : offset to the first bit in bitbuffer which should be readed by iisArithDecoderDecode function */
diff --git a/lib_enc/igf_scf_enc_fx.c b/lib_enc/igf_scf_enc_fx.c
index b8125cbd6d408bd4de4d065d72e3fb8e5769580f..ed52349dc034d32523fcd2cc412d5f27b2da50aa 100644
--- a/lib_enc/igf_scf_enc_fx.c
+++ b/lib_enc/igf_scf_enc_fx.c
@@ -45,8 +45,11 @@ void IGFSCFEncoderOpen_fx(
     set16_fx( hPublicData->prevSave, 0, 64 );
 
     hPublicData->scfCountLongBlock[0] = sub( hIgfInfo->grid[0].swb_offset_len, 1 );
+    move16();
     hPublicData->scfCountLongBlock[1] = sub( hIgfInfo->grid[1].swb_offset_len, 1 );
+    move16();
     hPublicData->scfCountLongBlock[2] = sub( hIgfInfo->grid[2].swb_offset_len, 1 );
+    move16();
 
     hPublicData->t = 0;
     move16(); /* protect against the invalid request of starting encoding with a dependent block */
@@ -124,7 +127,7 @@ static void arith_encode_residual(
                                                               &hPrivateData->acState_fx,
                                                               x,
                                                               cumulativeFrequencyTable );
-
+        move16();
         return;
     }
 
@@ -137,6 +140,7 @@ static void arith_encode_residual(
                                                               &hPrivateData->acState_fx,
                                                               0,
                                                               cumulativeFrequencyTable );
+        move16();
     }
     ELSE /* x > IGF_MAX_ENC_SEPARATE */
     {
@@ -147,6 +151,7 @@ static void arith_encode_residual(
                                                               &hPrivateData->acState_fx,
                                                               IGF_SYMBOLS_IN_TABLE - 1,
                                                               cumulativeFrequencyTable );
+        move16();
     }
 
     /* encode one of the tails of the distribution */
@@ -216,6 +221,7 @@ static void encode_sfe_vector(
                                                                       &hPrivateData->acState_fx,
                                                                       shr( x[f], 2 ),
                                                                       (const UWord16 *) hPrivateData->cf_se00 );
+                move16();
                 arith_encode_bits( hPrivateData, ptr, s_and( x[f], 3 ), 2 ); /* LSBs as 2 bit raw */
             }
             ELSE IF( EQ_16( f, 1 ) )
@@ -233,7 +239,6 @@ static void encode_sfe_vector(
                 /* (t == 0) && (f >= 2) */
                 prev_offset = sub( f, 1 );
                 res = sub( x[f], x[prev_offset] );
-                move16();                                                           /* pred = b */
                 ctx = quant_ctx( sub( x[prev_offset], x[sub( prev_offset, 1 )] ) ); /* Q(b - e) */
                 /* index1 is (IGF_SYMBOLS_IN_TABLE + 1) * (CTX_OFFSET + ctx) */
                 index1 = L_mac0( ( IGF_SYMBOLS_IN_TABLE + 1 ) * IGF_CTX_OFFSET, ( IGF_SYMBOLS_IN_TABLE + 1 ), ctx );
@@ -340,19 +345,20 @@ Word16 IGFSCFEncoderEncode_fx(
                                                             hPublicData->ptrBitIndex,
                                                             &hPublicData->acState_fx ); /* finish AC encoding */
     hPublicData->bitCount = add( hPublicData->bitCount, hPublicData->ptrBitIndex );
-
+    move16();
+    move16();
 
     /* advance history */
     Copy( sfe, hPublicData->prev, hPublicData->scfCountLongBlock[igfGridIdx] );
     hPublicData->t = add( hPublicData->t, 1 );
-
+    move16();
 
     /* copy the bits from the temporary bit buffer, if doRealEncoding is enabled */
     IF( hBstr )
     {
         FOR( i = 0; i < hPublicData->ptrBitIndex; ++i )
         {
-            push_next_indice_fx( hBstr, ptr[i], 1 );
+            push_next_indice( hBstr, ptr[i], 1 );
         }
     }
 
diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c
deleted file mode 100644
index 7d046db5ff8c5601d00294cdb54ad60dd53717d3..0000000000000000000000000000000000000000
--- a/lib_enc/init_enc.c
+++ /dev/null
@@ -1,1207 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "prot_fx.h"
-#include "ivas_cnst.h"
-#include "wmc_auto.h"
-#include "ivas_prot_fx.h"
-#include "prot_fx_enc.h"
-ivas_error init_encoder_ivas_fx(
-    Encoder_State *st,              /* i/o: state structure                      */
-    Encoder_Struct *st_ivas,        /* i/o: encoder state structure              */
-    const Word16 idchan,            /* i  : channel ID                           */
-    const Word16 var_SID_rate_flag, /* i  : flag for variable SID update rate    */
-    const Word16 interval_SID,      /* i  : interval for SID update              */
-    const Word16 vad_only_flag,     /* i  : flag to indicate front-VAD structure */
-    const ISM_MODE ism_mode,        /* i  : ISM mode                             */
-    const Word32 element_brate      /* i  : element bitrate                      */
-)
-{
-    Word16 i;
-    ivas_error error;
-    Word32 igf_brate;
-
-    error = IVAS_ERR_OK;
-    move32();
-
-    /*-----------------------------------------------------------------*
-     * General parameters
-     *-----------------------------------------------------------------*/
-
-    IF( st->Opt_AMR_WB )
-    {
-        st->last_core = AMR_WB_CORE;
-    }
-    ELSE
-    {
-        st->last_core = -1;
-    }
-    move16();
-
-    st->L_frame = L_FRAME;
-    move16();
-    st->last_coder_type = GENERIC;
-    move16();
-    st->coder_type = GENERIC;
-    move16();
-    st->last_total_brate = st->total_brate;
-    move32();
-    st->last_bits_frame_nominal = -1;
-    move16();
-    st->last_total_brate_cng = -1;
-    move16();
-    st->last_core_brate = st->total_brate;
-    move32();
-    st->dtx_sce_sba = 0;
-    move16();
-    st->extl = -1;
-    move16();
-    st->last_extl = -1;
-    move16();
-    st->last_L_frame = L_FRAME;
-    move16();
-    st->rate_switching_reset = 0;
-    move16();
-    st->rate_switching_reset_16kHz = 0;
-    move16();
-    st->clas = UNVOICED_CLAS;
-    move16();
-    st->low_rate_mode = 0;
-    move16();
-    st->ini_frame = 0;
-    move16();
-    st->inactive_coder_type_flag = 0;
-    move16();
-    st->sba_br_sw_while_no_data = 0;
-    move16();
-
-    st->coder_type_raw = VOICED;
-    move16();
-    st->last_coder_type_raw = st->coder_type_raw;
-    move16();
-
-    st->flag_ACELP16k = set_ACELP_flag_IVAS( st->element_mode, st->total_brate, st->total_brate, idchan, 0, -1, -1 );
-    move16();
-
-    st->is_ism_format = 0;
-    move16();
-
-    IF( NE_16( ism_mode, ISM_MODE_NONE ) )
-    {
-        st->is_ism_format = 1;
-        move16();
-    }
-
-    /*-----------------------------------------------------------------*
-     * Bitstream
-     *-----------------------------------------------------------------*/
-
-    IF( !vad_only_flag )
-    {
-        IF( ( st->hBstr = (BSTR_ENC_HANDLE) malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Bitstream structure\n" ) );
-        }
-
-        /* set pointer to the buffer of indices */
-        st->hBstr->ind_list = st_ivas->ind_list;
-        st->hBstr->ivas_ind_list_zero = &st_ivas->ind_list;
-        st->hBstr->ivas_max_num_indices = &st_ivas->ivas_max_num_indices;
-        st->hBstr->nb_ind_tot = 0;
-        move16();
-        st->hBstr->nb_bits_tot = 0;
-        move16();
-        st->hBstr->st_ivas = st_ivas;
-    }
-    ELSE
-    {
-        st->hBstr = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Pre-processing and ACELP core parameters
-     *-----------------------------------------------------------------*/
-
-    Copy( GEWB_Ave_fx, st->mem_AR_fx, M );
-    Copy( GEWB_Ave_fx, st->lsfoldbfi0_fx, M );
-    Copy( GEWB_Ave_fx, st->lsfoldbfi1_fx, M );
-    Copy( GEWB_Ave_fx, st->lsf_adaptive_mean_fx, M );
-
-    st->next_force_safety_net = 0;
-    move16();
-
-    st->pstreaklen = 0;
-    move16();
-    st->streaklimit_fx = MAX_WORD16;
-    move16();
-    set16_fx( st->mem_MA_fx, 0, M );
-
-    init_gp_clip_fx( st->clip_var_fx );
-    pitch_ol_init_fx( &st->old_thres_fx, &st->old_pitch, &st->delta_pit, &st->old_corr_fx );
-    set16_fx( st->old_wsp_fx, 0, L_WSP_MEM );
-    st->exp_old_wsp = 0;
-    move16();
-    set16_fx( st->old_wsp2_fx, 0, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM ); // Needs to change depending on usage.
-    st->Q_old_wsp2 = 0;
-    move16();
-
-    st->mem_preemph_fx = 0;
-    move16();
-    st->mem_preemph16k_fx = 0;
-    move16();
-    st->mem_preemph_enc = 0;
-    move16();
-    st->exp_mem_preemph_enc = 0;
-    move16();
-
-#if 1 // TODO: Float Initializations. To be removed later
-    st->active_cnt = 0;
-#endif
-
-    st->pst_mem_deemp_err_fx = 0;
-    move16();
-    st->pst_lp_ener_fx = 0;
-    move16();
-
-    /* AVQ pre-quantizer memory */
-    st->mem_preemp_preQ_fx = 0;
-    move16();
-    st->mem_deemp_preQ_fx = 0;
-    move16();
-    st->last_nq_preQ = 0;
-    move16();
-    st->last_code_preq = 0;
-    move16();
-    st->use_acelp_preq = 0;
-    move16();
-    st->last_harm_flag_acelp = 0;
-    move16();
-
-    /* (Decimated) Weighted Speech Memory */
-    st->mem_wsp_enc = 0;
-    move16();
-    st->mem_wsp_fx = 0;
-    move16();
-    st->mem_wsp_q = 0;
-    move16();
-    set16_fx( st->mem_decim2_fx, 0, 3 );
-    set32_fx( st->Bin_E_fx, 0, L_FFT );
-    st->q_Bin_E = Q31;
-    move16();
-    st->ee_old_fx = 640; /* 10.0f in Q6 */
-    move16();
-    st->Nb_ACELP_frames = 0;
-    move16();
-    st->audio_frame_cnt = AUDIO_COUNTER_INI; /* Initialization of the audio frame counter mildly into the audio mode      */
-    move16();
-
-    /* adaptive lag window memory */
-    st->old_pitch_la = 0;
-    move16();
-
-    st->prev_Q_new = 0;
-    move16();
-
-    IF( EQ_32( st->input_Fs, 8000 ) )
-    {
-        st->min_band = 1;
-        move16();
-        st->max_band = 16;
-        move16();
-    }
-    ELSE
-    {
-        st->min_band = 0;
-        move16();
-        st->max_band = 19;
-        move16();
-    }
-
-    IF( st->Opt_AMR_WB )
-    {
-        Copy( mean_isf_amr_wb_fx, st->lsf_old_fx, M );
-        E_LPC_isf_isp_conversion( st->lsf_old_fx, st->lsp_old1_fx, M );
-    }
-    ELSE
-    {
-        Copy( GEWB_Ave_fx, st->lsf_old_fx, M );
-        lsf2lsp_fx( st->lsf_old_fx, st->lsp_old1_fx, M, INT_FS_12k8 );
-    }
-
-    Copy( st->lsf_old_fx, st->lsf_old1_fx, M );
-    Copy( st->lsp_old1_fx, st->lsp_old_fx, M );
-    Copy( st->lsp_old_fx, st->lsp_old16k_fx, M );
-    Copy( st->lsp_old_fx, st->lspold_enc_fx, M );
-
-    st->stab_fac_fx = 0;
-    move16();
-
-    /* Bass post-filter memories - encoder side of MODE2 */
-    st->bpf_off = 0;
-    move16();
-    st->pst_mem_deemp_err_fx = 0;
-    move16();
-    st->pst_lp_ener_fx = 0;
-    move16();
-
-    /* TC coder type */
-    st->tc_cnt = 0;
-    move16();
-
-    /* find_uv() parameters */
-    st->old_dE1_fx = 0;
-    move16();
-    st->old_ind_deltaMax = 0;
-    move16();
-    set32_fx( st->old_enr_ssf_fx, 0, shl( NB_SSF, 1 ) );
-    st->spike_hyst = -1;
-    move16();
-
-    /* stereo switching memories */
-    st->mem_preemph_DFT_fx = 0;
-    move16();
-    set16_fx( st->inp_12k8_mem_stereo_sw_fx, 0, sub( sub( STEREO_DFT_OVL_12k8, L_MEM_RECALC_12K8 ), L_FILT ) );
-    st->mem_preemph16k_DFT_fx = 0;
-    move16();
-    set16_fx( st->inp_16k_mem_stereo_sw_fx, 0, sub( sub( STEREO_DFT_OVL_16k, L_MEM_RECALC_16K ), L_FILT16k ) );
-
-    st->sharpFlag = 0;
-    move16();
-
-    /* Stationary noise UV modification  */
-    st->ge_sm_fx = L_deposit_l( 640 ); /*Q(GE_SHIFT)*/
-    move16();
-    st->uv_count = 0;
-    move16();
-    st->act_count = 3;
-    move16();
-    Copy( st->lsp_old_fx, st->lspold_s_fx, M );
-    st->noimix_seed = RANDOM_INITSEED;
-    move16();
-    st->min_alpha_fx = 32767;
-    move16();
-    st->exc_pe_fx = 0;
-    move16();
-    st->Q_stat_noise = 15;
-    move16();
-    /* FEC */
-    st->last_clas = UNVOICED_CLAS;
-    move16();
-    st->prev_fmerit = 0;
-    move16();
-    st->fmerit_dt = 0;
-    move16();
-    st->Last_pulse_pos = 0;
-    move16();
-
-    FOR( i = 0; i < shl( NB_SUBFR16k, 1 ); i++ )
-    {
-        st->old_pitch_buf_fx[i] = L_SUBFR_Q6;
-        move16();
-    }
-
-    /* mode1 core switching */
-    st->old_Es_pred_fx = 0;
-    move16();
-    set16_fx( st->old_Aq_12_8_fx + 1, 0, M );
-    st->old_Aq_12_8_fx[0] = ONE_IN_Q12;
-    move16();
-
-    /* stable short pitch detection */
-    st->voicing0_sm_fx = 0;
-    move16();
-    st->voicing_sm_fx = 0;
-    move16();
-    st->LF_EnergyRatio_sm_fx = 1;
-    move16();
-    st->predecision_flag = 0;
-    move16();
-    st->diff_sm_fx = 0;
-    move32();
-    st->energy_sm_fx = 0;
-    move32();
-
-    set16_fx( st->pitch, L_SUBFR, 3 );
-    set16_fx( st->voicing_fx, 0, 3 );
-
-    /*-----------------------------------------------------------------*
-     * General signal buffers
-     *-----------------------------------------------------------------*/
-
-    IF( !vad_only_flag )
-    {
-        IF( ( st->hSignalBuf = (SIGNAL_BUFFERS_ENC_HANDLE) malloc( sizeof( SIGNAL_BUFFERS_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Signal buffers\n" ) );
-        }
-
-        st->Bin_E_old_fx = st->hSignalBuf->Bin_E_old_fx;
-        st->mem_decim_fx = st->hSignalBuf->mem_decim_fx;
-        st->mem_decim16k_fx = st->hSignalBuf->mem_decim16k_fx;
-        st->old_inp_12k8_fx = st->hSignalBuf->old_inp_12k8_fx;
-        st->old_inp_16k_fx = st->hSignalBuf->old_inp_16k_fx;
-        st->buf_speech_enc_pe = st->hSignalBuf->buf_speech_enc_pe;
-        st->buf_synth = st->hSignalBuf->buf_synth;
-        st->buf_speech_enc = st->hSignalBuf->buf_speech_enc;
-        st->buf_wspeech_enc = st->hSignalBuf->buf_wspeech_enc;
-
-        set32_fx( st->Bin_E_old_fx, 0, L_FFT / 2 );
-        st->q_Bin_E_old = Q31;
-        set16_fx( st->hSignalBuf->buf_speech_enc, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
-        st->exp_buf_speech_enc = 0;
-        move16();
-        set16_fx( st->hSignalBuf->buf_wspeech_enc, 0, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 );
-        st->exp_buf_wspeech_enc = 0;
-        move16();
-        /* initializations */
-#ifndef MSAN_FIX
-        set32_fx( st->Bin_E_old_fx, 0, shr( L_FFT, 2 ) );
-#else
-        set32_fx( st->Bin_E_old_fx, 0, L_FFT / 2 );
-#endif
-        st->q_Bin_E_old = Q31;
-        move16();
-        set16_fx( st->mem_decim_fx, 0, shl( L_FILT_MAX, 1 ) );
-        set16_fx( st->mem_decim16k_fx, 0, shl( L_FILT_MAX, 1 ) );
-        set16_fx( st->old_inp_12k8_fx, 0, L_INP_MEM );
-        set16_fx( st->old_inp_16k_fx, 0, L_INP_MEM );
-        st->exp_old_inp_16k = 0;
-        st->exp_old_inp_12k8 = 0;
-        move16();
-        move16();
-
-        st->input_buff_fx = st->hSignalBuf->input_buff;
-        st->input_buff32_fx = st->hSignalBuf->input_buff32;
-        set16_fx( st->input_buff_fx, 0, add( L_FRAME48k, add( L_FRAME48k, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) );
-        st->q_inp = Q15;
-        move16();
-        st->q_old_inp = Q15;
-        move16();
-        set32_fx( st->input_buff32_fx, 0, add( L_FRAME48k, add( L_FRAME48k, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) );
-        st->q_inp32 = Q31;
-        move16();
-        st->old_input_signal_fx = st->input_buff_fx;
-        /* st->input_Fs / FRAMES_PER_SEC */
-        Word16 frame_length = extract_l( Mpy_32_32( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );
-
-        IF( st->element_mode == EVS_MONO )
-        {
-            st->input32_fx = st->input_buff32_fx + st->input_Fs / FRAMES_PER_SEC + NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS );
-            st->input_fx = st->input_buff_fx + add( frame_length, (Word16) NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ) );
-        }
-        ELSE
-        {
-            st->input32_fx = st->input_buff32_fx + Mpy_32_32( st->input_Fs, 42949673 ) /* 1/50 in Q31*/; // st->input_Fs / FRAMES_PER_SEC
-            st->input_fx = st->input_buff_fx + frame_length;
-        }
-#if 1 // TODO: To be removed later
-#endif
-    }
-    ELSE
-    {
-        st->hSignalBuf = NULL;
-        st->Bin_E_old_fx = NULL;
-        st->mem_decim_fx = NULL;
-        st->mem_decim16k_fx = NULL;
-        st->old_inp_12k8_fx = NULL;
-        st->old_inp_16k_fx = NULL;
-        st->buf_speech_enc_pe = NULL;
-        st->buf_synth = NULL;
-        st->buf_speech_enc = NULL;
-        st->buf_wspeech_enc = NULL;
-        st->input_buff_fx = NULL;
-#if 1
-#endif
-    }
-
-    /*-----------------------------------------------------------------*
-     * Noise estimator
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    IF( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hNoiseEst = (NOISE_EST_HANDLE) malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL )
-        {
-            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Noise estimation\n" );
-        }
-
-        noise_est_init_ivas_fx( st->hNoiseEst );
-    }
-    ELSE
-    {
-        st->hNoiseEst = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * VAD
-     *-----------------------------------------------------------------*/
-
-    st->vad_flag = 1;
-    move16();
-    st->localVAD = 0;
-    move16();
-
-    IF( ( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && ( !vad_only_flag ) )
-    {
-        IF( ( st->hVAD = (VAD_HANDLE) malloc( sizeof( VAD_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VAD\n" ) );
-        }
-
-        wb_vad_init_ivas_fx( st->hVAD );
-    }
-    ELSE
-    {
-        st->hVAD = NULL;
-    }
-    st->Pos_relE_cnt = 20;
-    move16();
-
-    /* CLDFB-based VAD */
-    IF( st->element_mode == EVS_MONO )
-    {
-        /* This is done to as in EVS T_CldfbVadState structure is present in Encoder State */
-        /*
-            if ( ( st->hVAD_CLDFB = (VAD_CLDFB_HANDLE) malloc( sizeof( T_CldfbVadState ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB VAD\n" ) );
-            }
-        */
-        st->hVAD_CLDFB = &st->vad_st;
-
-        vad_init_fx( st->hVAD_CLDFB );
-    }
-    ELSE
-    {
-        st->hVAD_CLDFB = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Speech/music classifier
-     *-----------------------------------------------------------------*/
-
-    IF( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hSpMusClas = (SP_MUS_CLAS_HANDLE) malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Speech/music classifier\n" ) );
-        }
-
-        speech_music_clas_init_ivas_fx( st->hSpMusClas );
-        st->sp_aud_decision0 = 0;
-        move16();
-        st->sp_aud_decision1 = 0;
-        move16();
-        st->sp_aud_decision2 = 0;
-        move16();
-    }
-    ELSE
-    {
-        st->hSpMusClas = NULL;
-    }
-
-
-    /*-----------------------------------------------------------------*
-     * WB, SWB and FB bandwidth detector
-     *-----------------------------------------------------------------*/
-
-    st->lt_mean_NB_fx = 0;
-    move16();
-    st->lt_mean_WB_fx = 0;
-    move16();
-    st->lt_mean_SWB_fx = 0;
-    move16();
-    st->count_WB = BWD_COUNT_MAX;
-    move16();
-    st->count_SWB = BWD_COUNT_MAX;
-    move16();
-    st->count_FB = BWD_COUNT_MAX;
-    move16();
-    st->bwidth = st->max_bwidth;
-    move16();
-    st->last_input_bwidth = st->bwidth;
-    move16();
-    st->last_bwidth = st->bwidth;
-    move16();
-    st->last_bwidth_cng = st->bwidth;
-    move16();
-    st->bwidth_sw_cnt = 0;
-    move16();
-
-
-    /*-----------------------------------------------------------------*
-     * DTX
-     *-----------------------------------------------------------------*/
-
-    st->lp_speech_fx = 11520; /*Q8 (45.0)    */ /* Initialize the long-term active speech level in dB   */
-    move16();
-    st->lp_noise_fx = 0;
-    move16();
-    st->flag_noisy_speech_snr = 0;
-    move16();
-    st->fd_cng_reset_flag = 0;
-    move16();
-    st->cng_type = -1;
-    move16();
-    st->bckr_tilt_lt = 0;
-    move16();
-    st->active_cnt = 0;
-    move16();
-
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( idchan == 0 && st->Opt_DTX_ON ) || st->element_mode == EVS_MONO ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
-    {
-        IF( ( st->hDtxEnc = (DTX_ENC_HANDLE) malloc( sizeof( DTX_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX variables\n" ) );
-        }
-        dtx_enc_init_fx( st, var_SID_rate_flag, interval_SID );
-    }
-    ELSE
-    {
-        st->hDtxEnc = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * No other handles needed to be allocated for front-VAD structure
-     *-----------------------------------------------------------------*/
-
-    IF( vad_only_flag )
-    {
-        st->hTdCngEnc = NULL;
-        st->cldfbAnaEnc = NULL;
-        st->hFdCngEnc = NULL;
-        st->hSC_VBR = NULL;
-        st->hAmrwb_IO = NULL;
-        st->hLPDmem = NULL;
-        st->hGSCEnc = NULL;
-        st->hBWE_TD = NULL;
-        st->cldfbSynTd = NULL;
-        st->hBWE_FD = NULL;
-        st->hHQ_core = NULL;
-        st->hRF = NULL;
-        st->hTECEnc = NULL;
-        st->hTcxEnc = NULL;
-        st->hTcxCfg = NULL;
-        st->hIGFEnc = NULL;
-        st->hPlcExt = NULL;
-        st->hTranDet = NULL;
-
-        st->element_mode = IVAS_SCE;
-        move16();
-        st->idchan = 100; /* indicates hCoreCoderVAD */
-        move16();
-        st->core = -1;
-        move16();
-        st->rf_mode = 0;
-        move16();
-
-        return error;
-    }
-
-    /*-----------------------------------------------------------------*
-     * LP-CNG
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( idchan == 0 && st->Opt_DTX_ON && NE_16( st->element_mode, IVAS_CPE_MDCT ) ) || st->element_mode == EVS_MONO ) && !( EQ_16( ism_mode, ISM_MODE_PARAM ) || EQ_16( ism_mode, ISM_MODE_DISC ) ) )
-    {
-        IF( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) );
-        }
-
-        td_cng_enc_init_ivas_fx( st->hTdCngEnc, st->Opt_DTX_ON, st->max_bwidth );
-    }
-    ELSE
-    {
-        st->hTdCngEnc = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * CLDFB & resampling tools parameters
-     *-----------------------------------------------------------------*/
-    test();
-    test();
-    test();
-    IF( ( NE_16( st->element_mode, IVAS_CPE_MDCT ) && idchan == 0 ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
-    {
-        IF( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
-        {
-            return error;
-        }
-    }
-    ELSE
-    {
-        st->cldfbAnaEnc = NULL;
-    }
-
-    st->energyCoreLookahead_Fx = 2; /* 6.1e-5f in Q15 */
-    move32();
-    st->sf_energyCoreLookahead_Fx = 2; /* 6.1e-5f in Q15 */
-    move16();
-
-    /*-----------------------------------------------------------------*
-     * SC-VBR parameters
-     *-----------------------------------------------------------------*/
-
-    test();
-    IF( st->Opt_SC_VBR || st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hSC_VBR = (SC_VBR_ENC_HANDLE) malloc( sizeof( SC_VBR_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SC-VBR\n" ) );
-        }
-
-        sc_vbr_enc_init_fx( st->hSC_VBR );
-    }
-    ELSE
-    {
-        st->hSC_VBR = NULL;
-    }
-
-    st->last_Opt_SC_VBR = 0;
-    move16();
-
-
-    /*-----------------------------------------------------------------*
-     * AMR-WB IO initialization
-     *-----------------------------------------------------------------*/
-
-    test();
-    IF( st->Opt_AMR_WB || st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hAmrwb_IO = (AMRWB_IO_ENC_HANDLE) malloc( sizeof( AMRWB_IO_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AMR-WB IO\n" ) );
-        }
-
-        amr_wb_enc_init_fx( st->hAmrwb_IO );
-    }
-    ELSE
-    {
-        st->hAmrwb_IO = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * ACELP LPDmem
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    IF( ( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
-    {
-        IF( ( st->hLPDmem = (LPD_state_HANDLE) malloc( sizeof( LPD_state ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LPDmem\n" ) );
-        }
-
-        LPDmem_enc_init_ivas_fx( st->hLPDmem );
-    }
-    ELSE
-    {
-        st->hLPDmem = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * parameters for AC coder type (GSC)
-     *-----------------------------------------------------------------*/
-
-    st->GSC_noisy_speech = 0;
-    move16();
-    st->GSC_IVAS_mode = 0;
-    move16();
-
-    test();
-    test();
-    IF( ( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
-    {
-        IF( ( st->hGSCEnc = (GSC_ENC_HANDLE) malloc( sizeof( GSC_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for GSC\n" ) );
-        }
-
-        GSC_enc_init_fx( st->hGSCEnc );
-    }
-    ELSE
-    {
-        st->hGSCEnc = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * TBE parameters
-     *-----------------------------------------------------------------*/
-
-    test();
-    IF( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        IF( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
-        }
-
-        IF( ( error = openCldfb_ivas_enc( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
-        {
-            return error;
-        }
-
-        InitSWBencBuffer_ivas_fx( st );
-        ResetSHBbuffer_Enc_fx( st );
-    }
-    ELSE
-    {
-        st->hBWE_TD = NULL;
-        st->cldfbSynTd = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * SWB BWE parameters
-     *-----------------------------------------------------------------*/
-
-    test();
-    IF( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        IF( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) );
-        }
-
-        fd_bwe_enc_init_fx( st->hBWE_FD );
-#ifdef MSAN_FIX
-        st->Q_old_wtda = 0;
-        move16();
-#endif
-    }
-    ELSE
-    {
-        st->hBWE_FD = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * HQ core parameters
-     *-----------------------------------------------------------------*/
-
-    IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) && idchan == 0 )
-    {
-        IF( ( st->hHQ_core = (HQ_ENC_HANDLE) malloc( sizeof( HQ_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) );
-        }
-
-        HQ_core_enc_init_fx( st->hHQ_core );
-    }
-    ELSE
-    {
-        st->hHQ_core = NULL;
-    }
-
-    /* init memory for detect_transient(), used by HQ core and swb_bwe_enc */
-    st->old_hpfilt_in_fx = 0;
-    move16();
-    st->old_hpfilt_out_fx = 0;
-    move16();
-    st->EnergyLT_fx = 0;
-    move32();
-    st->Energy_Old_fx = 0;
-    move32();
-    st->TransientHangOver = 0;
-    move16();
-    st->EnergyLT_fx_exp = 30;
-    move16();
-    st->last_enerBuffer_exp = 0;
-    move16();
-
-    /*-----------------------------------------------------------------*
-     * Channel-aware mode
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    IF( !st->Opt_RF_ON || ( NE_16( st->bwidth, WB ) && NE_16( st->bwidth, SWB ) ) || NE_32( st->total_brate, ACELP_13k20 ) )
-    {
-        st->rf_mode = 0;
-        move16();
-    }
-    ELSE
-    {
-        st->rf_mode = st->Opt_RF_ON;
-        move16();
-    }
-
-    st->rf_mode_last = st->rf_mode;
-    move16();
-
-    test();
-    IF( st->Opt_RF_ON || st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hRF = (RF_ENC_HANDLE) malloc( sizeof( RF_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for RF\n" ) );
-        }
-
-        /* initialize RF indice buffers */
-        reset_rf_indices_fx( st );
-    }
-    ELSE
-    {
-        st->hRF = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Temporal Envelope Coding
-     *-----------------------------------------------------------------*/
-
-    IF( st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hTECEnc = (TEC_ENC_HANDLE) malloc( sizeof( TEC_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TEC\n" ) );
-        }
-    }
-    ELSE
-    {
-        st->hTECEnc = NULL;
-    }
-    /* note: initialization done later in init_coder_ace_plus() */
-
-    /*-----------------------------------------------------------------*
-     * TCX core
-     *-----------------------------------------------------------------*/
-
-    // ToDo: reduction possible for MCT_CHAN_MODE_LFE channel
-    test();
-    IF( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        IF( ( st->hTcxEnc = (TCX_ENC_HANDLE) malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxEnc\n" ) );
-        }
-        set32_fx( st->hTcxEnc->spectrum_long_fx, 0, N_MAX );
-        st->hTcxEnc->spectrum_long_e = 0;
-
-        /* Share the memories for 2xTCX10/4xTCX5 and for TCX20 */
-        st->hTcxEnc->spectrum_fx[0] = st->hTcxEnc->spectrum_long_fx;
-        st->hTcxEnc->spectrum_fx[1] = st->hTcxEnc->spectrum_long_fx + N_TCX10_MAX;
-        st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;
-        move16();
-        move16();
-#if 1
-        // set_f( st->hTcxEnc->spectrum_long, 0, N_MAX );
-        // st->hTcxEnc->spectrum[0] = st->hTcxEnc->spectrum_long;
-        // st->hTcxEnc->spectrum[1] = st->hTcxEnc->spectrum_long + N_TCX10_MAX;
-        //  set_f( st->hTcxEnc->old_out, 0, L_FRAME32k );
-#endif
-
-        set16_fx( st->hTcxEnc->old_out_fx, 0, L_FRAME32k );
-        st->hTcxEnc->Q_old_out = 0;
-        move16();
-
-        /* MDCT selector */
-        MDCT_selector_reset_fx( st->hTcxEnc );
-
-        /* MDCT classifier */
-        MDCT_classifier_reset_fx( st->hTcxEnc );
-
-        IF( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) );
-        }
-    }
-    ELSE
-    {
-        st->hTcxEnc = NULL;
-        st->hTcxCfg = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * IGF
-     *-----------------------------------------------------------------*/
-
-    igf_brate = st->total_brate;
-    move32();
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( EQ_16( st->element_mode, IVAS_SCE ) && ( EQ_16( st_ivas->hEncoderConfig->ivas_format, ISM_FORMAT ) || EQ_16( st_ivas->hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) ) )
-    {
-        igf_brate = L_sub( st->total_brate, i_mult( ISM_NB_BITS_METADATA_NOMINAL, FRAMES_PER_SEC ) );
-    }
-    ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && ( EQ_16( st_ivas->hEncoderConfig->ivas_format, SBA_FORMAT ) ||
-                                                                                                   EQ_16( st_ivas->hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) ||
-                                                                                                   EQ_16( st_ivas->hEncoderConfig->ivas_format, MC_FORMAT ) ||
-                                                                                                   EQ_16( st_ivas->hEncoderConfig->ivas_format, MASA_FORMAT ) ) ) )
-    {
-        /* use nominal bitrates for DFT Stereo and (O)SBA, same as in stereo_dft_config()/ivas_spar_config() */
-        IF( EQ_32( element_brate, IVAS_13k2 ) )
-        {
-            igf_brate = ACELP_9k60;
-        }
-        ELSE IF( EQ_32( element_brate, IVAS_16k4 ) )
-        {
-            igf_brate = ACELP_13k20;
-        }
-        ELSE IF( EQ_32( element_brate, IVAS_24k4 ) )
-        {
-            igf_brate = ACELP_16k40;
-        }
-        ELSE IF( EQ_32( element_brate, IVAS_32k ) )
-        {
-            igf_brate = ACELP_24k40;
-        }
-    }
-    ELSE IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
-    {
-        igf_brate = element_brate;
-    }
-    move32();
-
-    IF( EQ_16( st->codec_mode, MODE2 ) || GT_16( st->element_mode, EVS_MONO ) )
-    {
-        st->igf = getIgfPresent_fx( st->element_mode, igf_brate, st->max_bwidth, st->rf_mode );
-    }
-    ELSE
-    {
-        st->igf = 0;
-    }
-    move16();
-
-    test();
-    test();
-    test();
-    IF( ( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_MDCT ) ) && ( st->igf || st->element_mode == EVS_MONO ) )
-    {
-        IF( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hIGFEnc\n" ) );
-        }
-    }
-    ELSE
-    {
-        st->hIGFEnc = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Mode 2 initialization
-     *-----------------------------------------------------------------*/
-
-    st->last_sr_core = L_mult0( st->last_L_frame, FRAMES_PER_SEC );
-    move32();
-
-
-    /* PLC encoder */
-    IF( st->element_mode == EVS_MONO )
-    {
-        IF( ( st->hPlcExt = (PLC_ENC_EVS_HANDLE) malloc( sizeof( PLC_ENC_EVS ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hPlcExt\n" ) );
-        }
-    }
-    ELSE
-    {
-        st->hPlcExt = NULL;
-    }
-
-    /* Init Mode 2 core coder */
-    st->last_totalNoise_fx = 0;
-    move16();
-    set16_fx( st->totalNoise_increase_hist_fx, 0, TOTALNOISE_HIST_SIZE );
-    st->totalNoise_increase_len = 0;
-    move16();
-#ifdef IVAS_FLOAT_FIXED_CONVERSIONS
-    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-    IF( hTcxEnc != NULL )
-    {
-        hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
-        move16();
-    }
-    st->currEnergyHF_fx = 0;
-    move32();
-    st->currEnergyHF_e_fx = 0;
-    move16();
-#ifdef MSAN_FIX
-    st->prevEnergyHF_fx = 0;
-    move32();
-#endif
-
-    /* Initialize TCX */
-
-    /* Initialize Signal Buffers */
-    Word16 shift = getScaleFactor16( st->old_inp_16k_fx, L_INP_MEM );
-    Scale_sig( st->old_inp_16k_fx, L_INP_MEM, shift );
-    st->exp_old_inp_16k = sub( st->exp_old_inp_16k, shift );
-    move16();
-    shift = getScaleFactor16( st->old_inp_12k8_fx, L_INP_MEM );
-    Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );
-    st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );
-    move16();
-    /* Initialize ACELP */
-#endif
-    init_coder_ace_plus_ivas_fx( st, st->last_total_brate, 0 );
-
-    IF( st->hLPDmem != NULL )
-    {
-        st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;
-        move16();
-    }
-    /*-----------------------------------------------------------------*
-     * FD-CNG encoder
-     *-----------------------------------------------------------------*/
-
-    test();
-    test();
-    test();
-    test();
-    IF( ( idchan == 0 && st->Opt_DTX_ON ) || st->element_mode == EVS_MONO || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
-    {
-        createFdCngEnc_fx( &st->hFdCngEnc );
-        initFdCngEnc_fx( st->hFdCngEnc, st->input_Fs, st->cldfbAnaEnc->scale );
-        /* initialization for IVAS modes happens in first frame pre-processing */
-        IF( st->element_mode == EVS_MONO )
-        {
-            Word32 total_brate;
-
-            test();
-            IF( st->rf_mode && EQ_32( st->total_brate, ACELP_13k20 ) )
-            {
-                total_brate = ACELP_9k60;
-                move32();
-            }
-            ELSE
-            {
-                total_brate = st->total_brate;
-                move32();
-            }
-
-            configureFdCngEnc_ivas_fx( st->hFdCngEnc, st->bwidth, total_brate );
-        }
-    }
-    ELSE
-    {
-        st->hFdCngEnc = NULL;
-    }
-
-    /*-----------------------------------------------------------------*
-     * Transient detector
-     *-----------------------------------------------------------------*/
-
-    IF( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) );
-    }
-    Word16 temp;
-    Word16 frame_length = BASOP_Util_Divide3232_Scale( st->input_Fs, FRAMES_PER_SEC, &temp );
-    frame_length = shr( frame_length, sub( 15, temp ) );
-
-    IF( GT_16( st->element_mode, EVS_MONO ) )
-    {
-        InitTransientDetection_ivas_fx( frame_length, 0, st->hTranDet, 1 );
-    }
-    ELSE
-    {
-        InitTransientDetection_ivas_fx( frame_length, NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 );
-    }
-
-    /*-----------------------------------------------------------------*
-     * IVAS parameters
-     *-----------------------------------------------------------------*/
-
-    st->tdm_LRTD_flag = 0;
-    move16();
-    st->cng_sba_flag = 0;
-    move16();
-    st->bits_frame_channel = 0;
-    move16();
-    st->side_bits_frame_channel = 0;
-    move16();
-    st->Q_syn2 = 0;
-    move16();
-    st->Q_syn = 0;
-    move16();
-    set16_fx( st->Q_max, Q_MAX, L_Q_MEM );
-    set16_fx( st->Q_max_16k, Q_MAX, L_Q_MEM );
-    st->Q_old = 15;
-    move16();
-    st->old_wsp_max = 0;
-    move16();
-    st->old_wsp_shift = 0;
-    move16();
-    st->sharpFlag = 0;
-    move16();
-
-    return error;
-}
-
-
-/*-----------------------------------------------------------------------*
- * destroy_cldfb_encoder()
- *
- * Free memory which was allocated in init_encoder()
- *-----------------------------------------------------------------------*/
-
-void destroy_cldfb_encoder_fx(
-    Encoder_State *st /* i/o: Encoder static variables structure   */
-)
-{
-    deleteCldfb_ivas_fx( &st->cldfbSynTd );
-    deleteCldfb_ivas_fx( &st->cldfbAnaEnc );
-
-    deleteFdCngEnc_fx( &st->hFdCngEnc );
-
-    return;
-}
diff --git a/lib_enc/init_enc_fx.c b/lib_enc/init_enc_fx.c
index 73cade783bee614191653c6063f6cec8754593e6..543a6fab9b817b7717090d2f70535f035ed6e16b 100644
--- a/lib_enc/init_enc_fx.c
+++ b/lib_enc/init_enc_fx.c
@@ -12,6 +12,7 @@
 #include "ivas_error.h"
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
+#include "ivas_prot_fx.h"
 
 
 /*-----------------------------------------------------------------------*
@@ -29,11 +30,12 @@ ivas_error init_encoder_fx(
 
     Word16 idchan = 0;        /* i  : channel ID                           */
     Word16 vad_only_flag = 0; /* i  : channel ID                           */
+    move16();
+    move16();
     ISM_MODE ism_mode = ISM_MODE_NONE;
     ivas_error error;
-    // PMT("ism_mode, idchan, vad_only_flag to be move to function header")
-    error = IVAS_ERR_OK;
 
+    error = IVAS_ERR_OK;
 
     /*-----------------------------------------------------------------*
      * General signal buffers
@@ -69,7 +71,7 @@ ivas_error init_encoder_fx(
         st_fx->old_input_signal_fx = st_fx->input_buff_fx;
         IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
         {
-            st_fx->input_fx = st_fx->input_buff_fx + st_fx->input_Fs / FRAMES_PER_SEC + NS2SA( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS );
+            st_fx->input_fx = st_fx->input_buff_fx + st_fx->input_Fs / FRAMES_PER_SEC + NS2SA_FX2( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS );
         }
         ELSE
         {
@@ -97,7 +99,7 @@ ivas_error init_encoder_fx(
     st_fx->last_core = -1;
     move16();
 
-    IF( st_fx->Opt_AMR_WB )
+    if ( st_fx->Opt_AMR_WB )
     {
         st_fx->last_core = AMR_WB_CORE;
         move16();
@@ -134,16 +136,6 @@ ivas_error init_encoder_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Bitstream structure\n" ) );
         }
-#ifdef IVAS_CODE_BITSTREAM
-
-        /* set pointer to the buffer of indices */
-        st->hBstr->ind_list = st_ivas->ind_list;
-        st->hBstr->ivas_ind_list_zero = &st_ivas->ind_list;
-        st->hBstr->ivas_max_num_indices = &st_ivas->ivas_max_num_indices;
-        st->hBstr->nb_ind_tot = 0;
-        st->hBstr->nb_bits_tot = 0;
-        st->hBstr->st_ivas = st_ivas;
-#endif
     }
     ELSE
     {
@@ -157,7 +149,7 @@ ivas_error init_encoder_fx(
     Copy( GEWB_Ave_fx, st_fx->lsf_adaptive_mean_fx, M );
     init_lvq_fx( st_fx->offset_scale1_fx, st_fx->offset_scale2_fx, st_fx->offset_scale1_p_fx, st_fx->offset_scale2_p_fx, st_fx->no_scales_fx, st_fx->no_scales_p_fx );
     st_fx->next_force_safety_net = 0;
-
+    move16();
     st_fx->pstreaklen = 0;
     move16();
     st_fx->streaklimit_fx = 32767;
@@ -297,7 +289,7 @@ ivas_error init_encoder_fx(
 
     // st_fx->GSC_noisy_speech = 0;
     st_fx->GSC_IVAS_mode = 0;
-
+    move16();
     test();
     test();
     IF( ( idchan == 0 && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
@@ -350,7 +342,7 @@ ivas_error init_encoder_fx(
     test();
     test();
     test();
-    IF( ( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || EQ_16( st_fx->element_mode, EVS_MONO ) ) && ( !vad_only_flag ) )
+    IF( ( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || st_fx->element_mode == EVS_MONO ) && ( !vad_only_flag ) )
     {
         if ( ( st_fx->hVAD = (VAD_HANDLE) malloc( sizeof( VAD_DATA ) ) ) == NULL )
         {
@@ -385,8 +377,10 @@ ivas_error init_encoder_fx(
         move16();
         st_fx->hVAD->L_snr_sum_vad_fx = 0;
         move32();
+        st_fx->hVAD->q_L_snr_sum_vad = Q31;
+        move16();
     }
-    else
+    ELSE
     {
         st_fx->hVAD = NULL;
     }
@@ -403,8 +397,10 @@ ivas_error init_encoder_fx(
     /*-----------------------------------------------------------------*
      * Noise estimator
      *-----------------------------------------------------------------*/
-    // PMT("deal with idchan ")
-    IF( /*idchan == 0 ||*/ EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || EQ_16( st_fx->element_mode, EVS_MONO ) )
+
+    test();
+    test();
+    IF( /*idchan == 0 ||*/ EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || st_fx->element_mode == EVS_MONO )
     {
         if ( ( st_fx->hNoiseEst = (NOISE_EST_HANDLE) malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL )
         {
@@ -422,7 +418,8 @@ ivas_error init_encoder_fx(
      *-----------------------------------------------------------------*/
     test();
     test();
-    IF( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || EQ_16( st_fx->element_mode, EVS_MONO ) )
+    test();
+    IF( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) || st_fx->element_mode == EVS_MONO )
     {
         IF( ( st_fx->hSpMusClas = (SP_MUS_CLAS_HANDLE) malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL )
         {
@@ -472,7 +469,7 @@ ivas_error init_encoder_fx(
     move16();
     st_fx->coder_type_raw = VOICED;
     st_fx->last_coder_type_raw = st_fx->coder_type_raw;
-
+    move16();
     st_fx->is_ism_format = 0;
     move16();
     if ( NE_16( ism_mode, ISM_MODE_NONE ) )
@@ -531,6 +528,8 @@ ivas_error init_encoder_fx(
      * LP-CNG
      *-----------------------------------------------------------------*/
 
+    test();
+    test();
     test();
     test();
     test();
@@ -622,7 +621,7 @@ ivas_error init_encoder_fx(
      * SC-VBR parameters
      *-----------------------------------------------------------------*/
     test();
-    IF( st_fx->Opt_SC_VBR || EQ_16( st_fx->element_mode, EVS_MONO ) )
+    IF( st_fx->Opt_SC_VBR || st_fx->element_mode == EVS_MONO )
     {
         IF( ( st_fx->hSC_VBR = (SC_VBR_ENC_HANDLE) malloc( sizeof( SC_VBR_ENC_DATA ) ) ) == NULL )
         {
@@ -636,7 +635,7 @@ ivas_error init_encoder_fx(
         st_fx->hSC_VBR = NULL;
     }
     /* PLC encoder */
-    IF( EQ_16( st_fx->element_mode, EVS_MONO ) )
+    IF( st_fx->element_mode == EVS_MONO )
     {
         IF( ( st_fx->hPlcExt = (PLC_ENC_EVS_HANDLE) malloc( sizeof( PLC_ENC_EVS ) ) ) == NULL )
         {
@@ -710,8 +709,8 @@ ivas_error init_encoder_fx(
         // st_fx->cldfbSynTd = NULL;
     }
 
-
-    IF( st_fx->Opt_RF_ON || EQ_16( st_fx->element_mode, EVS_MONO ) )
+    test();
+    IF( st_fx->Opt_RF_ON || st_fx->element_mode == EVS_MONO )
     {
         IF( ( st_fx->hRF = (RF_ENC_HANDLE) malloc( sizeof( RF_ENC_DATA ) ) ) == NULL )
         {
@@ -751,7 +750,7 @@ ivas_error init_encoder_fx(
      * TCX core
      *-----------------------------------------------------------------*/
 
-    // VE: reduction possible for MCT_CHAN_MODE_LFE channel - see I1-172
+    test();
     IF( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
     {
         IF( ( st_fx->hTcxEnc = (TCX_ENC_HANDLE) malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL )
@@ -768,7 +767,7 @@ ivas_error init_encoder_fx(
 
         set16_fx( st_fx->hTcxEnc->old_out_fx, 0, L_FRAME32k );
         st_fx->hTcxEnc->Q_old_out = 0;
-
+        move16();
         /* MDCT selector */
         MDCT_selector_reset_fx( st_fx->hTcxEnc );
         st_fx->hTcxEnc->Q_old_out = 0;
@@ -782,7 +781,7 @@ ivas_error init_encoder_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) );
         }
     }
-    else
+    ELSE
     {
         st_fx->hTcxEnc = NULL;
         // st_fx->hTcxCfg = NULL;
@@ -838,7 +837,7 @@ ivas_error init_encoder_fx(
         move16();
     }
     st_fx->rf_mode_last = st_fx->rf_mode;
-
+    move16();
     /* initialize RF indice buffers */
     reset_rf_indices_fx( st_fx );
 
@@ -847,12 +846,11 @@ ivas_error init_encoder_fx(
      *-----------------------------------------------------------------*/
 
     st_fx->last_sr_core = i_mult2( st_fx->last_L_frame, 50 );
-
+    move16();
     /*-----------------------------------------------------------------*
      * IGF
      *-----------------------------------------------------------------*/
 
-    test();
     test();
     IF( idchan == 0 || EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) )
     {
@@ -901,9 +899,6 @@ ivas_error init_encoder_fx(
                                NS2SA_FX2( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS ),
                                &st_fx->transientDetection );
 
-    // reset_indices_enc_fx( st_fx->hBstr);
-
-
     st_fx->Q_syn2 = 0;
     move16();
     st_fx->Q_syn = 0;
@@ -919,15 +914,23 @@ ivas_error init_encoder_fx(
     st_fx->sharpFlag = 0;
     move16();
 
-    st_fx->tdm_LRTD_flag = 0;                       /* LRTD stereo mode flag */
-    st_fx->cna_dirac_flag = 0;                      /* CNA in DirAC flag */
-    st_fx->cng_sba_flag = 0;                        /* CNG in SBA flag */
-    st_fx->GSC_IVAS_mode = 0;                       /* CNG in SBA flag */
-    st_fx->element_mode = EVS_MONO;                 /* element mode */
+    st_fx->tdm_LRTD_flag = 0; /* LRTD stereo mode flag */
+    move16();
+    st_fx->cna_dirac_flag = 0; /* CNA in DirAC flag */
+    move16();
+    st_fx->cng_sba_flag = 0; /* CNG in SBA flag */
+    move16();
+    st_fx->GSC_IVAS_mode = 0; /* CNG in SBA flag */
+    move16();
+    st_fx->element_mode = EVS_MONO; /* element mode */
+    move16();
     st_fx->last_element_mode = st_fx->element_mode; /* element mode */
-    st_fx->element_brate = -1;                      /* element bitrate */
-                                                    // PMT("element_mode and element_brate should be initialized at a proper place in ivas_dec_init eventually")
-    st_fx->low_rate_mode = 0;                       /* low-rate mode flag */
+    move16();
+    st_fx->element_brate = -1; /* element bitrate */
+    move32();
+    // PMT("element_mode and element_brate should be initialized at a proper place in ivas_dec_init eventually")
+    st_fx->low_rate_mode = 0; /* low-rate mode flag */
+    move16();
     // st_fx->coder_type = GENERIC;           /* low-rate mode flag */
 
     set16_fx( st_fx->pitch, L_SUBFR, 3 );
@@ -936,12 +939,15 @@ ivas_error init_encoder_fx(
 
 #ifdef DEBUGGING
     st_fx->id_element = -1; /* element ID */
+    move16();
 #endif
-    st_fx->extl_orig = -1;      /* extension layer */
+    st_fx->extl_orig = -1; /* extension layer */
+    move16();
     st_fx->extl_brate_orig = 0; /* extension layer bitrate */
-
+    move32();
     return error;
 }
+
 /*-----------------------------------------------------------------------*
  * LPDmem_enc_init_fx()
  *
@@ -994,16 +1000,18 @@ void LPDmem_enc_init_ivas_fx(
     set16_fx( hLPDmem->mem_syn2, 0, M );
     set16_fx( hLPDmem->mem_syn_r, 0, L_SYN_MEM );
     set16_fx( hLPDmem->mem_syn3, 0, M );
+    hLPDmem->q_lpd_old_exc = Q15;
+    move16();
     hLPDmem->q_lpd_syn = Q15;
     move16();
+    hLPDmem->q_mem_syn = Q15;
+    move16();
     hLPDmem->mem_w0 = 0;
     move16();
     hLPDmem->tilt_code = 0;
     move16();
     hLPDmem->gc_threshold = 0;
     move32();
-    hLPDmem->q_mem_syn = Q15;
-    move16();
     hLPDmem->dm_fx.prev_state = 0;
     move16(); /* This corresponds to st_fx->dispMem in FLP */
     hLPDmem->dm_fx.prev_gain_code = 0;
@@ -1015,14 +1023,6 @@ void LPDmem_enc_init_ivas_fx(
         move16();
     }
 
-    hLPDmem->q_lpd_syn = Q15;
-    move16();
-    hLPDmem->q_lpd_old_exc = Q15;
-    move16();
-    hLPDmem->q_mem_syn = Q15;
-    move16();
-
-
     return;
 }
 
@@ -1043,3 +1043,1180 @@ void destroy_encoder_fx(
 
     return;
 }
+
+ivas_error init_encoder_ivas_fx(
+    Encoder_State *st,              /* i/o: state structure                      */
+    Encoder_Struct *st_ivas,        /* i/o: encoder state structure              */
+    const Word16 idchan,            /* i  : channel ID                           */
+    const Word16 var_SID_rate_flag, /* i  : flag for variable SID update rate    */
+    const Word16 interval_SID,      /* i  : interval for SID update              */
+    const Word16 vad_only_flag,     /* i  : flag to indicate front-VAD structure */
+    const ISM_MODE ism_mode,        /* i  : ISM mode                             */
+    const Word32 element_brate      /* i  : element bitrate                      */
+)
+{
+    Word16 i;
+    ivas_error error;
+    Word32 igf_brate;
+
+    error = IVAS_ERR_OK;
+    move32();
+
+    /*-----------------------------------------------------------------*
+     * General parameters
+     *-----------------------------------------------------------------*/
+
+    IF( st->Opt_AMR_WB )
+    {
+        st->last_core = AMR_WB_CORE;
+    }
+    ELSE
+    {
+        st->last_core = -1;
+    }
+    move16();
+
+    st->L_frame = L_FRAME;
+    move16();
+    st->last_coder_type = GENERIC;
+    move16();
+    st->coder_type = GENERIC;
+    move16();
+    st->last_total_brate = st->total_brate;
+    move32();
+    st->last_bits_frame_nominal = -1;
+    move16();
+    st->last_total_brate_cng = -1;
+    move16();
+    st->last_core_brate = st->total_brate;
+    move32();
+    st->dtx_sce_sba = 0;
+    move16();
+    st->extl = -1;
+    move16();
+    st->last_extl = -1;
+    move16();
+    st->last_L_frame = L_FRAME;
+    move16();
+    st->rate_switching_reset = 0;
+    move16();
+    st->rate_switching_reset_16kHz = 0;
+    move16();
+    st->clas = UNVOICED_CLAS;
+    move16();
+    st->low_rate_mode = 0;
+    move16();
+    st->ini_frame = 0;
+    move16();
+    st->inactive_coder_type_flag = 0;
+    move16();
+    st->sba_br_sw_while_no_data = 0;
+    move16();
+
+    st->coder_type_raw = VOICED;
+    move16();
+    st->last_coder_type_raw = st->coder_type_raw;
+    move16();
+
+    st->flag_ACELP16k = set_ACELP_flag_IVAS( st->element_mode, st->total_brate, st->total_brate, idchan, 0, -1, -1 );
+    move16();
+
+    st->is_ism_format = 0;
+    move16();
+
+    IF( NE_16( ism_mode, ISM_MODE_NONE ) )
+    {
+        st->is_ism_format = 1;
+        move16();
+    }
+
+    /*-----------------------------------------------------------------*
+     * Bitstream
+     *-----------------------------------------------------------------*/
+
+    IF( !vad_only_flag )
+    {
+        IF( ( st->hBstr = (BSTR_ENC_HANDLE) malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Bitstream structure\n" ) );
+        }
+
+        /* set pointer to the buffer of indices */
+        st->hBstr->ind_list = st_ivas->ind_list;
+        st->hBstr->ivas_ind_list_zero = &st_ivas->ind_list;
+        st->hBstr->ivas_max_num_indices = &st_ivas->ivas_max_num_indices;
+        st->hBstr->nb_ind_tot = 0;
+        move16();
+        st->hBstr->nb_bits_tot = 0;
+        move16();
+        st->hBstr->st_ivas = st_ivas;
+    }
+    ELSE
+    {
+        st->hBstr = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Pre-processing and ACELP core parameters
+     *-----------------------------------------------------------------*/
+
+    Copy( GEWB_Ave_fx, st->mem_AR_fx, M );
+    Copy( GEWB_Ave_fx, st->lsfoldbfi0_fx, M );
+    Copy( GEWB_Ave_fx, st->lsfoldbfi1_fx, M );
+    Copy( GEWB_Ave_fx, st->lsf_adaptive_mean_fx, M );
+
+    st->next_force_safety_net = 0;
+    move16();
+
+    st->pstreaklen = 0;
+    move16();
+    st->streaklimit_fx = MAX_WORD16;
+    move16();
+    set16_fx( st->mem_MA_fx, 0, M );
+
+    init_gp_clip_fx( st->clip_var_fx );
+    pitch_ol_init_fx( &st->old_thres_fx, &st->old_pitch, &st->delta_pit, &st->old_corr_fx );
+    set16_fx( st->old_wsp_fx, 0, L_WSP_MEM );
+    st->exp_old_wsp = 0;
+    move16();
+    set16_fx( st->old_wsp2_fx, 0, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM ); // Needs to change depending on usage.
+    st->Q_old_wsp2 = 0;
+    move16();
+
+    st->mem_preemph_fx = 0;
+    move16();
+    st->mem_preemph_fx_q_inp = 0;
+    move16();
+    st->mem_preemph16k_fx = 0;
+    move16();
+    st->mem_preemph_enc = 0;
+    move16();
+    st->exp_mem_preemph_enc = 0;
+    move16();
+
+    st->active_cnt = 0;
+    move16();
+
+    st->pst_mem_deemp_err_fx = 0;
+    move16();
+    st->pst_lp_ener_fx = 0;
+    move16();
+
+    /* AVQ pre-quantizer memory */
+    st->mem_preemp_preQ_fx = 0;
+    move16();
+    st->mem_deemp_preQ_fx = 0;
+    move16();
+    st->last_nq_preQ = 0;
+    move16();
+    st->last_code_preq = 0;
+    move16();
+    st->use_acelp_preq = 0;
+    move16();
+    st->last_harm_flag_acelp = 0;
+    move16();
+
+    /* (Decimated) Weighted Speech Memory */
+    st->mem_wsp_enc = 0;
+    move16();
+    st->mem_wsp_fx = 0;
+    move16();
+    st->mem_wsp_q = 0;
+    move16();
+    set16_fx( st->mem_decim2_fx, 0, 3 );
+    set32_fx( st->Bin_E_fx, 0, L_FFT );
+    st->q_Bin_E = Q31;
+    move16();
+    st->ee_old_fx = 640; /* 10.0f in Q6 */
+    move16();
+    st->Nb_ACELP_frames = 0;
+    move16();
+    st->audio_frame_cnt = AUDIO_COUNTER_INI; /* Initialization of the audio frame counter mildly into the audio mode      */
+    move16();
+
+    /* adaptive lag window memory */
+    st->old_pitch_la = 0;
+    move16();
+
+    st->prev_Q_new = 0;
+    move16();
+
+    IF( EQ_32( st->input_Fs, 8000 ) )
+    {
+        st->min_band = 1;
+        move16();
+        st->max_band = 16;
+        move16();
+    }
+    ELSE
+    {
+        st->min_band = 0;
+        move16();
+        st->max_band = 19;
+        move16();
+    }
+
+    IF( st->Opt_AMR_WB )
+    {
+        Copy( mean_isf_amr_wb_fx, st->lsf_old_fx, M );
+        E_LPC_isf_isp_conversion( st->lsf_old_fx, st->lsp_old1_fx, M );
+    }
+    ELSE
+    {
+        Copy( GEWB_Ave_fx, st->lsf_old_fx, M );
+        lsf2lsp_fx( st->lsf_old_fx, st->lsp_old1_fx, M, INT_FS_12k8 );
+    }
+
+    Copy( st->lsf_old_fx, st->lsf_old1_fx, M );
+    Copy( st->lsp_old1_fx, st->lsp_old_fx, M );
+    Copy( st->lsp_old_fx, st->lsp_old16k_fx, M );
+    Copy( st->lsp_old_fx, st->lspold_enc_fx, M );
+
+    st->stab_fac_fx = 0;
+    move16();
+
+    /* Bass post-filter memories - encoder side of MODE2 */
+    st->bpf_off = 0;
+    move16();
+    st->pst_mem_deemp_err_fx = 0;
+    move16();
+    st->pst_lp_ener_fx = 0;
+    move16();
+
+    /* TC coder type */
+    st->tc_cnt = 0;
+    move16();
+
+    /* find_uv() parameters */
+    st->old_dE1_fx = 0;
+    move16();
+    st->old_ind_deltaMax = 0;
+    move16();
+    set32_fx( st->old_enr_ssf_fx, 0, shl( NB_SSF, 1 ) );
+    st->spike_hyst = -1;
+    move16();
+
+    /* stereo switching memories */
+    st->mem_preemph_DFT_fx = 0;
+    move16();
+    st->mem_preemph_DFT_fx_q_inp = 0;
+    move16();
+    set16_fx( st->inp_12k8_mem_stereo_sw_fx, 0, sub( sub( STEREO_DFT_OVL_12k8, L_MEM_RECALC_12K8 ), L_FILT ) );
+    st->mem_preemph16k_DFT_fx = 0;
+    move16();
+    set16_fx( st->inp_16k_mem_stereo_sw_fx, 0, sub( sub( STEREO_DFT_OVL_16k, L_MEM_RECALC_16K ), L_FILT16k ) );
+
+    st->sharpFlag = 0;
+    move16();
+
+    /* Stationary noise UV modification  */
+    st->ge_sm_fx = L_deposit_l( 640 ); /*Q(GE_SHIFT)*/
+    move16();
+    st->uv_count = 0;
+    move16();
+    st->act_count = 3;
+    move16();
+    Copy( st->lsp_old_fx, st->lspold_s_fx, M );
+    st->noimix_seed = RANDOM_INITSEED;
+    move16();
+    st->min_alpha_fx = 32767;
+    move16();
+    st->exc_pe_fx = 0;
+    move16();
+    st->Q_stat_noise = 15;
+    move16();
+    /* FEC */
+    st->last_clas = UNVOICED_CLAS;
+    move16();
+    st->prev_fmerit = 0;
+    move16();
+    st->fmerit_dt = 0;
+    move16();
+    st->Last_pulse_pos = 0;
+    move16();
+
+    FOR( i = 0; i < shl( NB_SUBFR16k, 1 ); i++ )
+    {
+        st->old_pitch_buf_fx[i] = L_SUBFR_Q6;
+        move16();
+    }
+
+    /* mode1 core switching */
+    st->old_Es_pred_fx = 0;
+    move16();
+    set16_fx( st->old_Aq_12_8_fx + 1, 0, M );
+    st->old_Aq_12_8_fx[0] = ONE_IN_Q12;
+    move16();
+
+    /* stable short pitch detection */
+    st->voicing0_sm_fx = 0;
+    move16();
+    st->voicing_sm_fx = 0;
+    move16();
+    st->LF_EnergyRatio_sm_fx = 1;
+    move16();
+    st->predecision_flag = 0;
+    move16();
+    st->diff_sm_fx = 0;
+    move32();
+    st->energy_sm_fx = 0;
+    move32();
+
+    set16_fx( st->pitch, L_SUBFR, 3 );
+    set16_fx( st->voicing_fx, 0, 3 );
+
+    /*-----------------------------------------------------------------*
+     * General signal buffers
+     *-----------------------------------------------------------------*/
+
+    IF( !vad_only_flag )
+    {
+        IF( ( st->hSignalBuf = (SIGNAL_BUFFERS_ENC_HANDLE) malloc( sizeof( SIGNAL_BUFFERS_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Signal buffers\n" ) );
+        }
+
+        st->Bin_E_old_fx = st->hSignalBuf->Bin_E_old_fx;
+        st->mem_decim_fx = st->hSignalBuf->mem_decim_fx;
+        st->mem_decim16k_fx = st->hSignalBuf->mem_decim16k_fx;
+        st->old_inp_12k8_fx = st->hSignalBuf->old_inp_12k8_fx;
+        st->old_inp_16k_fx = st->hSignalBuf->old_inp_16k_fx;
+        st->buf_speech_enc_pe = st->hSignalBuf->buf_speech_enc_pe;
+        st->buf_synth = st->hSignalBuf->buf_synth;
+        st->buf_speech_enc = st->hSignalBuf->buf_speech_enc;
+        st->buf_wspeech_enc = st->hSignalBuf->buf_wspeech_enc;
+
+        set32_fx( st->Bin_E_old_fx, 0, L_FFT / 2 );
+        st->q_Bin_E_old = Q31;
+        move16();
+        set16_fx( st->hSignalBuf->buf_speech_enc, 0, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
+        st->exp_buf_speech_enc = 0;
+        move16();
+        set16_fx( st->hSignalBuf->buf_wspeech_enc, 0, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 );
+        st->exp_buf_wspeech_enc = 0;
+        move16();
+        /* initializations */
+        set32_fx( st->Bin_E_old_fx, 0, L_FFT / 2 );
+        st->q_Bin_E_old = Q31;
+        move16();
+        set16_fx( st->mem_decim_fx, 0, shl( L_FILT_MAX, 1 ) );
+        set16_fx( st->mem_decim_fx_q_inp, 0, shl( L_FILT_MAX, 1 ) );
+        set16_fx( st->mem_decim16k_fx, 0, shl( L_FILT_MAX, 1 ) );
+        set16_fx( st->old_inp_12k8_fx, 0, L_INP_MEM );
+        set16_fx( st->old_inp_16k_fx, 0, L_INP_MEM );
+        st->exp_old_inp_16k = 0;
+        st->exp_old_inp_12k8 = 0;
+        move16();
+        move16();
+
+        st->input_buff_fx = st->hSignalBuf->input_buff;
+        st->input_buff32_fx = st->hSignalBuf->input_buff32;
+        set16_fx( st->input_buff_fx, 0, add( L_FRAME48k, add( L_FRAME48k, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) );
+        st->q_inp = Q15;
+        move16();
+        st->mem_preemph_q = Q15;
+        move16();
+        st->mem_q = Q15;
+        move16();
+        st->q_old_inp = Q15;
+        move16();
+        set32_fx( st->input_buff32_fx, 0, add( L_FRAME48k, add( L_FRAME48k, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) );
+        st->q_inp32 = Q31;
+        move16();
+        st->q_old_inp32 = Q31;
+        move16();
+        st->old_input_signal_fx = st->input_buff_fx;
+        st->old_input_signal32_fx = st->input_buff32_fx;
+        /* st->input_Fs / FRAMES_PER_SEC */
+        Word16 frame_length = extract_l( Mpy_32_32( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );
+
+        IF( st->element_mode == EVS_MONO )
+        {
+            st->input32_fx = st->input_buff32_fx + st->input_Fs / FRAMES_PER_SEC + NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS );
+            st->input_fx = st->input_buff_fx + add( frame_length, (Word16) NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ) );
+        }
+        ELSE
+        {
+            // st->input32_fx = st->input_buff32_fx + Mpy_32_32( st->input_Fs, 42949673 ) /* 1/50 in Q31*/; // st->input_Fs / FRAMES_PER_SEC
+            st->input32_fx = st->input_buff32_fx + frame_length;
+            st->input_fx = st->input_buff_fx + frame_length;
+        }
+    }
+    ELSE
+    {
+        st->hSignalBuf = NULL;
+        st->Bin_E_old_fx = NULL;
+        st->mem_decim_fx = NULL;
+        st->mem_decim16k_fx = NULL;
+        st->old_inp_12k8_fx = NULL;
+        st->old_inp_16k_fx = NULL;
+        st->buf_speech_enc_pe = NULL;
+        st->buf_synth = NULL;
+        st->buf_speech_enc = NULL;
+        st->buf_wspeech_enc = NULL;
+        st->input_buff_fx = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Noise estimator
+     *-----------------------------------------------------------------*/
+
+    test();
+    test();
+    test();
+    IF( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hNoiseEst = (NOISE_EST_HANDLE) malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL )
+        {
+            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Noise estimation\n" );
+        }
+
+        noise_est_init_ivas_fx( st->hNoiseEst );
+    }
+    ELSE
+    {
+        st->hNoiseEst = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * VAD
+     *-----------------------------------------------------------------*/
+
+    st->vad_flag = 1;
+    move16();
+    st->localVAD = 0;
+    move16();
+
+    IF( ( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && ( !vad_only_flag ) )
+    {
+        IF( ( st->hVAD = (VAD_HANDLE) malloc( sizeof( VAD_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VAD\n" ) );
+        }
+
+        wb_vad_init_ivas_fx( st->hVAD );
+    }
+    ELSE
+    {
+        st->hVAD = NULL;
+    }
+    st->Pos_relE_cnt = 20;
+    move16();
+
+    /* CLDFB-based VAD */
+    IF( st->element_mode == EVS_MONO )
+    {
+        /* This is done to as in EVS T_CldfbVadState structure is present in Encoder State */
+        st->hVAD_CLDFB = &st->vad_st;
+        vad_init_fx( st->hVAD_CLDFB );
+    }
+    ELSE
+    {
+        st->hVAD_CLDFB = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Speech/music classifier
+     *-----------------------------------------------------------------*/
+
+    IF( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->element_mode, IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hSpMusClas = (SP_MUS_CLAS_HANDLE) malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Speech/music classifier\n" ) );
+        }
+
+        speech_music_clas_init_ivas_fx( st->hSpMusClas );
+        st->sp_aud_decision0 = 0;
+        move16();
+        st->sp_aud_decision1 = 0;
+        move16();
+        st->sp_aud_decision2 = 0;
+        move16();
+    }
+    ELSE
+    {
+        st->hSpMusClas = NULL;
+    }
+
+
+    /*-----------------------------------------------------------------*
+     * WB, SWB and FB bandwidth detector
+     *-----------------------------------------------------------------*/
+
+    st->lt_mean_NB_fx = 0;
+    move16();
+    st->lt_mean_WB_fx = 0;
+    move16();
+    st->lt_mean_SWB_fx = 0;
+    move16();
+    st->count_WB = BWD_COUNT_MAX;
+    move16();
+    st->count_SWB = BWD_COUNT_MAX;
+    move16();
+    st->count_FB = BWD_COUNT_MAX;
+    move16();
+    st->bwidth = st->max_bwidth;
+    move16();
+    st->last_input_bwidth = st->bwidth;
+    move16();
+    st->last_bwidth = st->bwidth;
+    move16();
+    st->last_bwidth_cng = st->bwidth;
+    move16();
+    st->bwidth_sw_cnt = 0;
+    move16();
+
+
+    /*-----------------------------------------------------------------*
+     * DTX
+     *-----------------------------------------------------------------*/
+
+    st->lp_speech_fx = 11520; /*Q8 (45.0)    */ /* Initialize the long-term active speech level in dB   */
+    move16();
+    st->lp_noise_fx = 0;
+    move16();
+    st->flag_noisy_speech_snr = 0;
+    move16();
+    st->fd_cng_reset_flag = 0;
+    move16();
+    st->cng_type = -1;
+    move16();
+    st->bckr_tilt_lt = 0;
+    move16();
+    st->active_cnt = 0;
+    move16();
+
+    test();
+    test();
+    test();
+    test();
+    IF( ( ( idchan == 0 && st->Opt_DTX_ON ) || st->element_mode == EVS_MONO ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
+    {
+        IF( ( st->hDtxEnc = (DTX_ENC_HANDLE) malloc( sizeof( DTX_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX variables\n" ) );
+        }
+        dtx_enc_init_fx( st, var_SID_rate_flag, interval_SID );
+    }
+    ELSE
+    {
+        st->hDtxEnc = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * No other handles needed to be allocated for front-VAD structure
+     *-----------------------------------------------------------------*/
+
+    IF( vad_only_flag )
+    {
+        st->hTdCngEnc = NULL;
+        st->cldfbAnaEnc = NULL;
+        st->hFdCngEnc = NULL;
+        st->hSC_VBR = NULL;
+        st->hAmrwb_IO = NULL;
+        st->hLPDmem = NULL;
+        st->hGSCEnc = NULL;
+        st->hBWE_TD = NULL;
+        st->cldfbSynTd = NULL;
+        st->hBWE_FD = NULL;
+        st->hHQ_core = NULL;
+        st->hRF = NULL;
+        st->hTECEnc = NULL;
+        st->hTcxEnc = NULL;
+        st->hTcxCfg = NULL;
+        st->hIGFEnc = NULL;
+        st->hPlcExt = NULL;
+        st->hTranDet = NULL;
+
+        st->element_mode = IVAS_SCE;
+        move16();
+        st->idchan = 100; /* indicates hCoreCoderVAD */
+        move16();
+        st->core = -1;
+        move16();
+        st->rf_mode = 0;
+        move16();
+
+        return error;
+    }
+
+    /*-----------------------------------------------------------------*
+     * LP-CNG
+     *-----------------------------------------------------------------*/
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( ( idchan == 0 && st->Opt_DTX_ON && NE_16( st->element_mode, IVAS_CPE_MDCT ) ) || st->element_mode == EVS_MONO ) && !( EQ_16( ism_mode, ISM_MODE_PARAM ) || EQ_16( ism_mode, ISM_MODE_DISC ) ) )
+    {
+        IF( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) );
+        }
+
+        td_cng_enc_init_ivas_fx( st->hTdCngEnc, st->Opt_DTX_ON, st->max_bwidth );
+    }
+    ELSE
+    {
+        st->hTdCngEnc = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * CLDFB & resampling tools parameters
+     *-----------------------------------------------------------------*/
+    test();
+    test();
+    test();
+    IF( ( NE_16( st->element_mode, IVAS_CPE_MDCT ) && idchan == 0 ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
+    {
+        IF( EQ_16( st->element_mode, EVS_MONO ) )
+        {
+            /* open analysis for input SR */
+            st->input_frame_fx = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) );
+
+            if ( ( error = openCldfb( &st->cldfbAnaEnc, CLDFB_ANALYSIS, CLDFB_getNumChannels( st->input_Fs ), st->input_frame_fx ) ) != IVAS_ERR_OK )
+            {
+                return error;
+            }
+        }
+        ELSE
+        {
+
+            IF( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ) != IVAS_ERR_OK )
+            {
+                return error;
+            }
+        }
+    }
+    ELSE
+    {
+        st->cldfbAnaEnc = NULL;
+    }
+
+    st->energyCoreLookahead_Fx = 2; /* 6.1e-5f in Q15 */
+    move32();
+    st->sf_energyCoreLookahead_Fx = 2; /* 6.1e-5f in Q15 */
+    move16();
+
+    /*-----------------------------------------------------------------*
+     * SC-VBR parameters
+     *-----------------------------------------------------------------*/
+
+    test();
+    IF( st->Opt_SC_VBR || st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hSC_VBR = (SC_VBR_ENC_HANDLE) malloc( sizeof( SC_VBR_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SC-VBR\n" ) );
+        }
+
+        sc_vbr_enc_init_fx( st->hSC_VBR );
+    }
+    ELSE
+    {
+        st->hSC_VBR = NULL;
+    }
+
+    st->last_Opt_SC_VBR = 0;
+    move16();
+
+
+    /*-----------------------------------------------------------------*
+     * AMR-WB IO initialization
+     *-----------------------------------------------------------------*/
+
+    test();
+    IF( st->Opt_AMR_WB || st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hAmrwb_IO = (AMRWB_IO_ENC_HANDLE) malloc( sizeof( AMRWB_IO_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AMR-WB IO\n" ) );
+        }
+
+        amr_wb_enc_init_fx( st->hAmrwb_IO );
+    }
+    ELSE
+    {
+        st->hAmrwb_IO = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * ACELP LPDmem
+     *-----------------------------------------------------------------*/
+
+    test();
+    test();
+    IF( ( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
+    {
+        IF( ( st->hLPDmem = (LPD_state_HANDLE) malloc( sizeof( LPD_state ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LPDmem\n" ) );
+        }
+
+        LPDmem_enc_init_ivas_fx( st->hLPDmem );
+    }
+    ELSE
+    {
+        st->hLPDmem = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * parameters for AC coder type (GSC)
+     *-----------------------------------------------------------------*/
+
+    st->GSC_noisy_speech = 0;
+    move16();
+    st->GSC_IVAS_mode = 0;
+    move16();
+
+    test();
+    test();
+    IF( ( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st->element_mode, IVAS_CPE_TD ) )
+    {
+        IF( ( st->hGSCEnc = (GSC_ENC_HANDLE) malloc( sizeof( GSC_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for GSC\n" ) );
+        }
+
+        GSC_enc_init_fx( st->hGSCEnc );
+    }
+    ELSE
+    {
+        st->hGSCEnc = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * TBE parameters
+     *-----------------------------------------------------------------*/
+
+    test();
+    IF( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        IF( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
+        }
+
+        IF( st->element_mode == EVS_MONO )
+        {
+            if ( ( error = openCldfb( &st->cldfbSynTd, CLDFB_SYNTHESIS, CLDFB_getNumChannels( 16000 ), L_FRAME16k ) ) != IVAS_ERR_OK )
+            {
+                return error;
+            }
+        }
+        ELSE
+        {
+            IF( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ) != IVAS_ERR_OK )
+            {
+                return error;
+            }
+        }
+        InitSWBencBuffer_ivas_fx( st );
+        ResetSHBbuffer_Enc_fx( st );
+    }
+    ELSE
+    {
+        st->hBWE_TD = NULL;
+        st->cldfbSynTd = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * SWB BWE parameters
+     *-----------------------------------------------------------------*/
+
+    test();
+    IF( idchan == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        IF( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) );
+        }
+
+        fd_bwe_enc_init_fx( st->hBWE_FD );
+        st->Q_old_wtda = 0;
+        move16();
+    }
+    ELSE
+    {
+        st->hBWE_FD = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * HQ core parameters
+     *-----------------------------------------------------------------*/
+
+    IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) && idchan == 0 )
+    {
+        IF( ( st->hHQ_core = (HQ_ENC_HANDLE) malloc( sizeof( HQ_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) );
+        }
+
+        HQ_core_enc_init_fx( st->hHQ_core );
+    }
+    ELSE
+    {
+        st->hHQ_core = NULL;
+    }
+
+    /* init memory for detect_transient(), used by HQ core and swb_bwe_enc */
+    st->old_hpfilt_in_fx = 0;
+    move16();
+    st->old_hpfilt_out_fx = 0;
+    move16();
+    st->EnergyLT_fx = 0;
+    move32();
+    st->Energy_Old_fx = 0;
+    move32();
+    st->TransientHangOver = 0;
+    move16();
+    st->EnergyLT_fx_exp = 30;
+    move16();
+    st->last_enerBuffer_exp = 0;
+    move16();
+
+    /*-----------------------------------------------------------------*
+     * Channel-aware mode
+     *-----------------------------------------------------------------*/
+
+    test();
+    test();
+    test();
+    IF( !st->Opt_RF_ON || ( NE_16( st->bwidth, WB ) && NE_16( st->bwidth, SWB ) ) || NE_32( st->total_brate, ACELP_13k20 ) )
+    {
+        st->rf_mode = 0;
+        move16();
+    }
+    ELSE
+    {
+        st->rf_mode = st->Opt_RF_ON;
+        move16();
+    }
+
+    st->rf_mode_last = st->rf_mode;
+    move16();
+
+    test();
+    IF( st->Opt_RF_ON || st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hRF = (RF_ENC_HANDLE) malloc( sizeof( RF_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for RF\n" ) );
+        }
+
+        /* initialize RF indice buffers */
+        reset_rf_indices_fx( st );
+    }
+    ELSE
+    {
+        st->hRF = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Temporal Envelope Coding
+     *-----------------------------------------------------------------*/
+
+    IF( st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hTECEnc = (TEC_ENC_HANDLE) malloc( sizeof( TEC_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TEC\n" ) );
+        }
+    }
+    ELSE
+    {
+        st->hTECEnc = NULL;
+    }
+    /* note: initialization done later in init_coder_ace_plus() */
+
+    /*-----------------------------------------------------------------*
+     * TCX core
+     *-----------------------------------------------------------------*/
+
+    // ToDo: reduction possible for MCT_CHAN_MODE_LFE channel
+    test();
+    IF( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        IF( ( st->hTcxEnc = (TCX_ENC_HANDLE) malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxEnc\n" ) );
+        }
+        set32_fx( st->hTcxEnc->spectrum_long_fx, 0, N_MAX );
+        st->hTcxEnc->spectrum_long_e = 0;
+        move16();
+        /* Share the memories for 2xTCX10/4xTCX5 and for TCX20 */
+        st->hTcxEnc->spectrum_fx[0] = st->hTcxEnc->spectrum_long_fx;
+        st->hTcxEnc->spectrum_fx[1] = st->hTcxEnc->spectrum_long_fx + N_TCX10_MAX;
+        move32();
+        move32();
+        st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;
+        move16();
+        move16();
+
+        set16_fx( st->hTcxEnc->old_out_fx, 0, L_FRAME32k );
+        st->hTcxEnc->Q_old_out = 0;
+        move16();
+
+        /* MDCT selector */
+        MDCT_selector_reset_fx( st->hTcxEnc );
+
+        /* MDCT classifier */
+        MDCT_classifier_reset_fx( st->hTcxEnc );
+
+        IF( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) );
+        }
+    }
+    ELSE
+    {
+        st->hTcxEnc = NULL;
+        st->hTcxCfg = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * IGF
+     *-----------------------------------------------------------------*/
+
+    igf_brate = st->total_brate;
+    move32();
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( EQ_16( st->element_mode, IVAS_SCE ) && ( EQ_16( st_ivas->hEncoderConfig->ivas_format, ISM_FORMAT ) || EQ_16( st_ivas->hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) ) )
+    {
+        igf_brate = L_sub( st->total_brate, i_mult( ISM_NB_BITS_METADATA_NOMINAL, FRAMES_PER_SEC ) );
+    }
+    ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st->element_mode, IVAS_SCE ) && ( EQ_16( st_ivas->hEncoderConfig->ivas_format, SBA_FORMAT ) ||
+                                                                                                   EQ_16( st_ivas->hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) ||
+                                                                                                   EQ_16( st_ivas->hEncoderConfig->ivas_format, MC_FORMAT ) ||
+                                                                                                   EQ_16( st_ivas->hEncoderConfig->ivas_format, MASA_FORMAT ) ) ) )
+    {
+        /* use nominal bitrates for DFT Stereo and (O)SBA, same as in stereo_dft_config()/ivas_spar_config() */
+        IF( EQ_32( element_brate, IVAS_13k2 ) )
+        {
+            igf_brate = ACELP_9k60;
+        }
+        ELSE IF( EQ_32( element_brate, IVAS_16k4 ) )
+        {
+            igf_brate = ACELP_13k20;
+        }
+        ELSE IF( EQ_32( element_brate, IVAS_24k4 ) )
+        {
+            igf_brate = ACELP_16k40;
+        }
+        ELSE IF( EQ_32( element_brate, IVAS_32k ) )
+        {
+            igf_brate = ACELP_24k40;
+        }
+    }
+    ELSE IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
+    {
+        igf_brate = element_brate;
+    }
+    move32();
+    test();
+    IF( EQ_16( st->codec_mode, MODE2 ) || GT_16( st->element_mode, EVS_MONO ) )
+    {
+        st->igf = getIgfPresent_fx( st->element_mode, igf_brate, st->max_bwidth, st->rf_mode );
+    }
+    ELSE
+    {
+        st->igf = 0;
+    }
+    move16();
+
+    test();
+    test();
+    test();
+    IF( ( idchan == 0 || EQ_16( st->element_mode, IVAS_CPE_MDCT ) ) && ( st->igf || st->element_mode == EVS_MONO ) )
+    {
+        IF( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hIGFEnc\n" ) );
+        }
+    }
+    ELSE
+    {
+        st->hIGFEnc = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Mode 2 initialization
+     *-----------------------------------------------------------------*/
+
+    st->last_sr_core = L_mult0( st->last_L_frame, FRAMES_PER_SEC );
+    move32();
+
+
+    /* PLC encoder */
+    IF( st->element_mode == EVS_MONO )
+    {
+        IF( ( st->hPlcExt = (PLC_ENC_EVS_HANDLE) malloc( sizeof( PLC_ENC_EVS ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hPlcExt\n" ) );
+        }
+    }
+    ELSE
+    {
+        st->hPlcExt = NULL;
+    }
+
+    /* Init Mode 2 core coder */
+    st->last_totalNoise_fx = 0;
+    move16();
+    set16_fx( st->totalNoise_increase_hist_fx, 0, TOTALNOISE_HIST_SIZE );
+    st->totalNoise_increase_len = 0;
+    move16();
+    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
+    IF( hTcxEnc != NULL )
+    {
+        hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ); /* 0x0290  is 1/FRAMES_PER_SEC in Q15*/
+        move16();
+    }
+    st->currEnergyHF_fx = 0;
+    move32();
+    st->currEnergyHF_e_fx = 0;
+    move16();
+    st->prevEnergyHF_fx = 0;
+    move32();
+
+    /* Initialize TCX */
+
+    /* Initialize Signal Buffers */
+    Word16 shift = getScaleFactor16( st->old_inp_16k_fx, L_INP_MEM );
+    Scale_sig( st->old_inp_16k_fx, L_INP_MEM, shift );
+    st->exp_old_inp_16k = sub( st->exp_old_inp_16k, shift );
+    move16();
+    shift = getScaleFactor16( st->old_inp_12k8_fx, L_INP_MEM );
+    Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );
+    st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );
+    move16();
+    /* Initialize ACELP */
+    init_coder_ace_plus_ivas_fx( st, st->last_total_brate, igf_brate, 0 );
+
+    IF( st->hLPDmem != NULL )
+    {
+        st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;
+        move16();
+    }
+    /*-----------------------------------------------------------------*
+     * FD-CNG encoder
+     *-----------------------------------------------------------------*/
+
+    test();
+    test();
+    test();
+    test();
+    IF( ( idchan == 0 && st->Opt_DTX_ON ) || st->element_mode == EVS_MONO || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
+    {
+        createFdCngEnc_fx( &st->hFdCngEnc );
+        initFdCngEnc_fx( st->hFdCngEnc, st->input_Fs, st->cldfbAnaEnc->scale );
+        /* initialization for IVAS modes happens in first frame pre-processing */
+        IF( st->element_mode == EVS_MONO )
+        {
+            Word32 total_brate;
+
+            test();
+            IF( st->rf_mode && EQ_32( st->total_brate, ACELP_13k20 ) )
+            {
+                total_brate = ACELP_9k60;
+                move32();
+            }
+            ELSE
+            {
+                total_brate = st->total_brate;
+                move32();
+            }
+
+            configureFdCngEnc_ivas_fx( st->hFdCngEnc, st->bwidth, total_brate );
+        }
+    }
+    ELSE
+    {
+        st->hFdCngEnc = NULL;
+    }
+
+    /*-----------------------------------------------------------------*
+     * Transient detector
+     *-----------------------------------------------------------------*/
+
+    IF( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL )
+    {
+        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) );
+    }
+    Word16 temp;
+    Word16 frame_length = BASOP_Util_Divide3232_Scale( st->input_Fs, FRAMES_PER_SEC, &temp );
+    frame_length = shr( frame_length, sub( 15, temp ) );
+
+    IF( GT_16( st->element_mode, EVS_MONO ) )
+    {
+        InitTransientDetection_ivas_fx( frame_length, 0, st->hTranDet, 1 );
+    }
+    ELSE
+    {
+#ifndef HARM_ENC_INIT
+        InitTransientDetection_ivas_fx( frame_length, NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 );
+#else
+        InitTransientDetection_fx( extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ),
+                                   NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ),
+                                   &st->transientDetection );
+#endif
+    }
+
+    /*-----------------------------------------------------------------*
+     * IVAS parameters
+     *-----------------------------------------------------------------*/
+
+    st->tdm_LRTD_flag = 0;
+    move16();
+    st->cng_sba_flag = 0;
+    move16();
+    st->bits_frame_channel = 0;
+    move16();
+    st->side_bits_frame_channel = 0;
+    move16();
+    st->Q_syn2 = 0;
+    move16();
+    st->Q_syn = 0;
+    move16();
+    set16_fx( st->Q_max, Q_MAX, L_Q_MEM );
+    set16_fx( st->Q_max_16k, Q_MAX, L_Q_MEM );
+    st->Q_old = 15;
+    move16();
+    st->old_wsp_max = 0;
+    move16();
+    st->old_wsp_shift = 0;
+    move16();
+    st->sharpFlag = 0;
+    move16();
+
+    return error;
+}
+
+
+/*-----------------------------------------------------------------------*
+ * destroy_cldfb_encoder()
+ *
+ * Free memory which was allocated in init_encoder()
+ *-----------------------------------------------------------------------*/
+
+void destroy_cldfb_encoder_fx(
+    Encoder_State *st /* i/o: Encoder static variables structure   */
+)
+{
+    deleteCldfb_ivas_fx( &st->cldfbSynTd );
+    deleteCldfb_ivas_fx( &st->cldfbAnaEnc );
+
+    deleteFdCngEnc_fx( &st->hFdCngEnc );
+
+    return;
+}
diff --git a/lib_enc/inov_enc.c b/lib_enc/inov_enc.c
deleted file mode 100644
index 754e202e581cd3910afbe959e11d280a96108ccb..0000000000000000000000000000000000000000
--- a/lib_enc/inov_enc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * inov_encode()
- *
- * Encode the algebraic innovation
- *---------------------------------------------------------------------*/
diff --git a/lib_enc/inov_enc_fx.c b/lib_enc/inov_enc_fx.c
index a2567535209f5e6777477e7da66811aa8bc78e3e..d019bf4747d93ff71f71c6e414e1826c8572237b 100644
--- a/lib_enc/inov_enc_fx.c
+++ b/lib_enc/inov_enc_fx.c
@@ -10,7 +10,6 @@
 #include "rom_com.h"      /* Static table prototypes                */
 #include "prot_fx.h"      /* Function prototypes                    */
 #include "ivas_prot_fx.h" /* Function prototypes                    */
-#include "prot.h"         /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                    */
 
 
@@ -90,9 +89,7 @@ Word16 inov_encode_fx(
     Word16 Rw[L_SUBFR];
     Word16 acelpautoc;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) last_L_frame;
-#endif
     stack_pulses = 0;
     move16();
 
@@ -155,6 +152,7 @@ Word16 inov_encode_fx(
     IF( st_fx->acelp_cfg.fcb_mode )
     {
         /* set number of iterations in TD stereo, secondary channel */
+        test();
         if ( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) && EQ_16( st_fx->idchan, 1 ) )
         {
             cmpl_flag = 1;
@@ -245,7 +243,7 @@ Word16 inov_encode_fx(
                 }
             }
 
-            if ( EQ_16( coder_type, INACTIVE ) )
+            if ( coder_type == INACTIVE )
             {
                 cmpl_flag = 4;
                 move16();
@@ -273,83 +271,7 @@ Word16 inov_encode_fx(
     IF( !Opt_AMR_WB )
     {
         IF( st_fx->acelp_cfg.fcb_mode )
-        { // PMTE()
-#ifdef IVAS_CODE
-            if ( st->acelp_cfg.fixed_cdk_index[i_subfr / L_subfr] < ACELP_FIXED_CDK_NB )
-            {
-                int16_t wordcnt, bitcnt;
-                int16_t prm[8];
-
-                if ( st->acelp_cfg.fixed_cdk_index[i_subfr / L_subfr] >= 0 )
-                {
-                    if ( L_subfr == 2 * L_SUBFR )
-                    {
-                        nBits = st->acelp_cfg.fixed_cdk_index[i_subfr / L_subfr];
-
-                        if ( nBits == 8 )
-                        {
-                            acelp_1t64( hBstr, dn, h1, code, y2, L_subfr );
-                        }
-                        else
-                        {
-                            acelp_fast( hBstr, nBits, dn, cn, h1, code, y2, L_subfr );
-                        }
-                    }
-                    else if ( ( st->idchan == 1 && st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] <= 7 ) || ( st->idchan == 0 && st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] <= 3 ) )
-                    {
-                        if ( st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] == 0 )
-                        {
-                            acelp_1t64( hBstr, dn, h1, code, y2, L_subfr );
-                        }
-                        else
-                        {
-                            acelp_fast( hBstr, st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR], dn, cn, h1, code, y2, L_SUBFR );
-                        }
-                    }
-                    else
-                    {
-                        E_ACELP_4t( dn, cn, h1, Rw, acelpautoc, code, st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR], prm, L_frame, last_L_frame, st->total_brate, i_subfr, cmpl_flag );
-
-                        wordcnt = ACELP_FIXED_CDK_BITS( st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] ) >> 4;
-                        bitcnt = ACELP_FIXED_CDK_BITS( st->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR] ) & 15;
-
-                        for ( i = 0; i < wordcnt; i++ )
-                        {
-                            push_indice( hBstr, IND_ALG_CDBK_4T64, prm[i], 16 );
-                        }
-                        if ( bitcnt )
-                        {
-                            push_indice( hBstr, IND_ALG_CDBK_4T64, prm[i], bitcnt );
-                        }
-
-                        /* Generate weighted code */
-                        set_f( y2, 0.0f, L_SUBFR );
-                        for ( i = 0; i < L_SUBFR; i++ )
-                        {
-                            /* Code is sparse, so check which samples are non-zero */
-                            if ( code[i] != 0 )
-                            {
-                                for ( k = 0; k < L_SUBFR - i; k++ )
-                                {
-                                    y2[i + k] += code[i] * h1[k];
-                                }
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    set_f( code, 0.0f, L_SUBFR );
-                    set_f( y2, 0.0f, L_SUBFR );
-                }
-            }
-#ifdef DEBUGGING
-            else
-            {
-                IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "invalid mode for acelp frame!\n" );
-            }
-#endif
-#endif
+        {
         }
         ELSE
         {
@@ -448,7 +370,7 @@ Word16 inov_encode_ivas_fx(
     Word16 shift,
     Word16 Q_new )
 {
-    Word16 dn[2 * L_SUBFR], Qdn;
+    Word16 dn[2 * L_SUBFR], Qdn, Qcn;
     Word16 nBits, cmpl_flag;
     Word16 stack_pulses;
     Word16 g1, g2;
@@ -456,7 +378,7 @@ Word16 inov_encode_ivas_fx(
     Word16 acelpautoc;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
     Word16 i, k;
-    Word16 Qxn, Rw_q, j, max_xn2;
+    Word16 Qxn, max_xn2;
     stack_pulses = 0;
     move16();
 
@@ -494,23 +416,22 @@ Word16 inov_encode_ivas_fx(
 
     test();
     test();
+    Qcn = Q_new;
+    move16();
     IF( GT_32( core_brate, ACELP_13k20 ) && !Opt_AMR_WB && EQ_16( L_subfr, L_SUBFR ) )
     {
         acelpautoc = 1;
         move16();
-
         cb_shape_fx( 1, 1, 0, sharpFlag, 0, g1, g2, p_Aq, h2, tilt_code, shr( add( pt_pitch, 26 ), 6 ), 0, L_SUBFR );
         /* h2: Q11, Rw: (Rw_e)Q */
-        // Word16 Rw_e = E_ACELP_hh_corr( h2, Rw, L_SUBFR, 3 );
-        corr_hh_ivas_fx( h2, Rw, &Rw_q, L_subfr ); // Q(Rw) = Q11-2
+        /* Rw_e = */ E_ACELP_hh_corr( h2, Rw, L_SUBFR, 3 );
 
-        E_ACELP_conv_ivas_fx( xn2, h2, cn ); // Qcn = Qxn2
+        E_ACELP_conv( xn2, h2, cn );
 
         /* dn_e -> Rw_e*Q_xn */
-        // Scale_sig(Rw, L_SUBFR, sub(5, Rw_e)); //Q9
-        j = E_ACELP_toeplitz_mul_fx( Rw, cn, dn, L_SUBFR, 1 );
-        Qdn = add( add( Qxn, Rw_q ), add( j, 1 ) );
-        // Scale_sig(Rw, L_subfr, -3); //Q9->Q6
+        /*dn_e = */ E_ACELP_toeplitz_mul_fx( Rw, cn, dn, L_SUBFR, 1 );
+        Qdn = Qcn;
+        move16();
     }
     ELSE
     {
@@ -519,9 +440,22 @@ Word16 inov_encode_ivas_fx(
         updt_tar_fx( cn, cn, &exc[i_subfr], gain_pit, L_subfr );
         /* scaling of cn[] to limit dynamic at 12 bits */
         Scale_sig( cn, L_subfr, shift );
-
+        Word16 q_h1 = sub( 14, norm_s( h2[0] ) );
+        Scale_sig( h2, L_SUBFR, sub( 11, q_h1 ) ); /* set h2[] in Q11*/
         cb_shape_fx( 1, 1, 0, sharpFlag, 0, g1, g2, p_Aq, h2, tilt_code, shr( add( pt_pitch, 26 ), 6 ), 0, L_subfr );
         corr_xh_ivas_fx( xn2, Qxn, dn, &Qdn, h2, L_subfr ); // Q(dn) = Q_new+1
+        IF( LT_16( Qdn, Qcn ) )
+        {
+            scale_sig( cn, L_subfr, sub( Qdn, Qcn ) );
+            Qcn = Qdn;
+            move16();
+        }
+        ELSE
+        {
+            scale_sig( dn, L_subfr, sub( Qcn, Qdn ) );
+            Qdn = Qcn;
+            move16();
+        }
     }
 
     /*-----------------------------------------------------------------*
@@ -655,9 +589,7 @@ Word16 inov_encode_ivas_fx(
     IF( !Opt_AMR_WB )
     {
         IF( st_fx->acelp_cfg.fcb_mode )
-        { // PMTE()
-#if 1
-          //#ifdef IVAS_CODE
+        {
             Word16 idx = 0, idx2 = 0;
             move16();
             move16();
@@ -689,7 +621,7 @@ Word16 inov_encode_ivas_fx(
                         }
                         ELSE
                         {
-                            acelp_fast_fx( hBstr, nBits, dn, Qdn, cn, h2, code, y2, L_subfr );
+                            acelp_fast_fx( hBstr, nBits, dn, Qdn, cn, Qcn, h2, code, y2, L_subfr );
                         }
                     }
                     ELSE IF( ( EQ_16( st_fx->idchan, 1 ) && LE_16( st_fx->acelp_cfg.fixed_cdk_index[idx2], 7 ) ) || ( st_fx->idchan == 0 && LE_16( st_fx->acelp_cfg.fixed_cdk_index[idx2], 3 ) ) )
@@ -700,7 +632,7 @@ Word16 inov_encode_ivas_fx(
                         }
                         ELSE
                         {
-                            acelp_fast_fx( hBstr, st_fx->acelp_cfg.fixed_cdk_index[idx2], dn, Qdn, cn, h2, code, y2, L_SUBFR );
+                            acelp_fast_fx( hBstr, st_fx->acelp_cfg.fixed_cdk_index[idx2], dn, Qdn, cn, Qcn, h2, code, y2, L_SUBFR );
                         }
                     }
                     ELSE
@@ -708,9 +640,7 @@ Word16 inov_encode_ivas_fx(
                         E_ACELP_4t_ivas_fx( dn, cn, h2, Rw, (Word8) acelpautoc, code, st_fx->acelp_cfg.fixed_cdk_index[idx2], prm, L_frame, last_L_frame, st_fx->total_brate, i_subfr, cmpl_flag, st_fx->element_mode );
 
                         wordcnt = shr( ACELP_FIXED_CDK_BITS( st_fx->acelp_cfg.fixed_cdk_index[idx2] ), 4 );
-                        move16();
                         bitcnt = s_and( ACELP_FIXED_CDK_BITS( st_fx->acelp_cfg.fixed_cdk_index[idx2] ), 15 );
-                        move16();
 
                         FOR( i = 0; i < wordcnt; i++ )
                         {
@@ -749,7 +679,6 @@ Word16 inov_encode_ivas_fx(
             {
                 IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "invalid mode for acelp frame!\n" );
             }
-#endif
 #endif
         }
         ELSE
diff --git a/lib_enc/isf_enc_amr_wb.c b/lib_enc/isf_enc_amr_wb.c
deleted file mode 100644
index 08af81cf8fe7c541e542f456d7b5e0ff6684043c..0000000000000000000000000000000000000000
--- a/lib_enc/isf_enc_amr_wb.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/isf_enc_amr_wb_fx.c b/lib_enc/isf_enc_amr_wb_fx.c
index 505d3f2903eb9f1ea7156dc154357103dd07d8be..d58998565bdb404e232a6b7b8c5e0318eae1c3a4 100644
--- a/lib_enc/isf_enc_amr_wb_fx.c
+++ b/lib_enc/isf_enc_amr_wb_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -122,7 +122,7 @@ void isf_enc_amr_wb_fx(
      * A(z) calculation
      *-------------------------------------------------------------------------------------*/
 
-    if ( st->rate_switching_reset )
+    IF( st->rate_switching_reset )
     {
         Copy( isf_new, st->lsf_old_fx, M );
         Copy( isp_new, st->lsp_old_fx, M );
@@ -171,13 +171,13 @@ static void qisf_ns_28b_fx(
     indice[3] = sub_VQ_fx( &isf[8], dico4_ns_28b_fx, 4, DICO4_NS_28b, &tmp );
     move16();
     indice[4] = add( sub_VQ_fx( &isf[12], dico5_ns_28b_fx + 4, 4, DICO5_NS_28b - 1, &tmp ), 1 ); /* First vector has a problem -> do not allow   */
-
+    move16();
     /* write indices to array */
-    push_indice_fx( hBstr, IND_ISF_0_0, indice[0], 6 );
-    push_indice_fx( hBstr, IND_ISF_0_1, indice[1], 6 );
-    push_indice_fx( hBstr, IND_ISF_0_2, indice[2], 6 );
-    push_indice_fx( hBstr, IND_ISF_0_3, indice[3], 5 );
-    push_indice_fx( hBstr, IND_ISF_0_4, indice[4], 5 );
+    push_indice( hBstr, IND_ISF_0_0, indice[0], 6 );
+    push_indice( hBstr, IND_ISF_0_1, indice[1], 6 );
+    push_indice( hBstr, IND_ISF_0_2, indice[2], 6 );
+    push_indice( hBstr, IND_ISF_0_3, indice[3], 5 );
+    push_indice( hBstr, IND_ISF_0_4, indice[4], 5 );
 
     /* decoding the ISFs */
     disf_ns_28b_fx( indice, isf );
@@ -241,9 +241,11 @@ static void qisf_2s_36b_fx(
         }
 
         tmp_ind[0] = sub_VQ_fx( &isf2[0], dico21_isf_36b_fx, 5, SIZE_BK21_36b, &min_err );
+        move16();
         temp = L_add( min_err, 0 );
 
         tmp_ind[1] = sub_VQ_fx( &isf2[5], dico22_isf_36b_fx, 4, SIZE_BK22_36b, &min_err );
+        move16();
         temp = L_add( temp, min_err );
 
         IF( LT_32( temp, distance ) )
@@ -303,11 +305,11 @@ static void qisf_2s_36b_fx(
     indice[0] = Indirect_dico1[indice[0]];
     move16(); /* Make interoperable with G722.2 */
 
-    push_indice_fx( hBstr, IND_ISF_0_0, indice[0], 8 );
-    push_indice_fx( hBstr, IND_ISF_0_1, indice[1], 8 );
-    push_indice_fx( hBstr, IND_ISF_1_0, indice[2], 7 );
-    push_indice_fx( hBstr, IND_ISF_1_1, indice[3], 7 );
-    push_indice_fx( hBstr, IND_ISF_1_2, indice[4], 6 );
+    push_indice( hBstr, IND_ISF_0_0, indice[0], 8 );
+    push_indice( hBstr, IND_ISF_0_1, indice[1], 8 );
+    push_indice( hBstr, IND_ISF_1_0, indice[2], 7 );
+    push_indice( hBstr, IND_ISF_1_1, indice[3], 7 );
+    push_indice( hBstr, IND_ISF_1_2, indice[4], 6 );
 
     return;
 }
@@ -369,10 +371,13 @@ static void qisf_2s_46b_fx(
         }
 
         tmp_ind[0] = sub_VQ_fx( &isf2[0], dico21_isf_46b_fx, 3, SIZE_BK21, &min_err );
+        move16();
         temp = L_add( min_err, 0 );
         tmp_ind[1] = sub_VQ_fx( &isf2[3], dico22_isf_46b_fx, 3, SIZE_BK22, &min_err );
+        move16();
         temp = L_add( temp, min_err );
         tmp_ind[2] = sub_VQ_fx( &isf2[6], dico23_isf_46b_fx, 3, SIZE_BK23, &min_err );
+        move16();
         temp = L_add( temp, min_err );
         IF( LT_32( temp, distance ) )
         {
@@ -437,13 +442,13 @@ static void qisf_2s_46b_fx(
     indice[0] = Indirect_dico1[indice[0]];
     move16(); /* Make interoperable with G722.2 */
 
-    push_indice_fx( hBstr, IND_ISF_0_0, indice[0], 8 );
-    push_indice_fx( hBstr, IND_ISF_0_1, indice[1], 8 );
-    push_indice_fx( hBstr, IND_ISF_1_0, indice[2], 6 );
-    push_indice_fx( hBstr, IND_ISF_1_1, indice[3], 7 );
-    push_indice_fx( hBstr, IND_ISF_1_2, indice[4], 7 );
-    push_indice_fx( hBstr, IND_ISF_1_3, indice[5], 5 );
-    push_indice_fx( hBstr, IND_ISF_1_4, indice[6], 5 );
+    push_indice( hBstr, IND_ISF_0_0, indice[0], 8 );
+    push_indice( hBstr, IND_ISF_0_1, indice[1], 8 );
+    push_indice( hBstr, IND_ISF_1_0, indice[2], 6 );
+    push_indice( hBstr, IND_ISF_1_1, indice[3], 7 );
+    push_indice( hBstr, IND_ISF_1_2, indice[4], 7 );
+    push_indice( hBstr, IND_ISF_1_3, indice[5], 5 );
+    push_indice( hBstr, IND_ISF_1_4, indice[6], 5 );
 
     return;
 }
diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc_fx.c
similarity index 99%
rename from lib_enc/ivas_agc_enc.c
rename to lib_enc/ivas_agc_enc_fx.c
index dcc55f5ad00003a0d2d1a9dae89a19b9ab97905d..d74e10bdaf25ea124ae9326ad807ac835e6e6e97 100644
--- a/lib_enc/ivas_agc_enc.c
+++ b/lib_enc/ivas_agc_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,11 +35,9 @@
 #include <math.h>
 #include <assert.h>
 #include "options.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "basop_util.h"
 
@@ -624,7 +622,7 @@ void ivas_agc_enc_process_fx(
                     temp_16 = BASOP_Util_Divide3232_Scale( temp1, temp2, &div_e ); /* exp(div_e) */
                     IF( div_e < 0 )
                     {
-                        temp_16 = shr( temp_16, (Word16) abs( div_e ) );
+                        temp_16 = shr( temp_16, abs_s( div_e ) );
                         div_e = 0;
                         move16();
                     }
diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc_fx.c
similarity index 94%
rename from lib_enc/ivas_core_enc.c
rename to lib_enc/ivas_core_enc_fx.c
index a691405329f4a1b880546efa9ec988965d03ddac..6fcb8abd0304b5be804584d53549ffe60ac9ade9 100644
--- a/lib_enc/ivas_core_enc.c
+++ b/lib_enc/ivas_core_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,12 +34,10 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
 #include <math.h>
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx_enc.h"
@@ -120,14 +118,12 @@ ivas_error ivas_core_enc_fx(
     set32_fx( new_swb_speech_buffer_fx, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );
     set16_fx( new_swb_speech_buffer_fx_16, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );
 
-#ifdef MSAN_FIX
     FOR( i = 0; i < CPE_CHANNELS; i++ )
     {
         set_zero_fx( bwe_exc_extended_fx[i], L_FRAME32k + NL_BUFF_OFFSET );
         set16_fx( old_syn_12k8_16k_fx[i], 0, L_FRAME16k );
     }
     set16_fx( shb_speech_fx, 0, L_FRAME16k );
-#endif
 
     push_wmops( "ivas_core_enc" );
 
@@ -217,7 +213,6 @@ ivas_error ivas_core_enc_fx(
         /*---------------------------------------------------------------------*
          * Pre-processing, incl. Decision matrix
          *---------------------------------------------------------------------*/
-#ifdef MSAN_FIX
         IF( st->cldfbAnaEnc )
         {
             Word16 tmp_shift = L_norm_arr( enerBuffer_fx[n], st->cldfbAnaEnc->no_channels );
@@ -229,16 +224,6 @@ ivas_error ivas_core_enc_fx(
                 move16();
             }
         }
-#else
-        Word16 tmp_shift = getScaleFactor32( enerBuffer_fx[n], CLDFB_NO_CHANNELS_MAX );
-        tmp_shift = sub( tmp_shift, 5 );
-        IF( tmp_shift < 0 )
-        {
-            scale_sig32( enerBuffer_fx[n], CLDFB_NO_CHANNELS_MAX, tmp_shift );
-            enerBuffer_fx_exp[n] = sub( enerBuffer_fx_exp[n], tmp_shift );
-            move16();
-        }
-#endif
 
         Scale_sig( fft_buff_fx[n], ( 2 * L_FFT ), -1 ); // To create 1 headroom for addition of magnitude square spectrum
                                                         // fft_buff_fx_exp = add(fft_buff_fx_exp,1);
@@ -311,7 +296,7 @@ ivas_error ivas_core_enc_fx(
             st->hBstr->nb_ind_tot = add( st->hBstr->nb_ind_tot, hStereoTD->tdm_hBstr_tmp.nb_ind_tot );    /* Q0 */
             st->hBstr->nb_bits_tot = add( st->hBstr->nb_bits_tot, hStereoTD->tdm_hBstr_tmp.nb_bits_tot ); /* Q0 */
 
-            reset_indices_enc( &hStereoTD->tdm_hBstr_tmp, MAX_IND_TDM_TMP );
+            reset_indices_enc_fx( &hStereoTD->tdm_hBstr_tmp, MAX_IND_TDM_TMP );
         }
 
         /*---------------------------------------------------------------------*
@@ -328,7 +313,6 @@ ivas_error ivas_core_enc_fx(
         /*---------------------------------------------------------------------*
          * Preprocessing (preparing) for ACELP/HQ core switching
          *---------------------------------------------------------------------*/
-
         core_switching_pre_enc_ivas_fx( st, old_inp_12k8_fx[n], sub( Q_new[n], 1 ), old_inp_16k_fx[n], sub( Q_new[n], 1 ), sts[0]->active_cnt, last_element_mode );
 
         /*---------------------------------------------------------------------*
@@ -435,7 +419,6 @@ ivas_error ivas_core_enc_fx(
         }
     }
 
-
     /*---------------------------------------------------------------------*
      * MDCT stereo: joint TCX Core Encoding
      *---------------------------------------------------------------------*/
@@ -460,13 +443,6 @@ ivas_error ivas_core_enc_fx(
                         st->hTcxEnc->exp_buf_speech_ltp = st->exp_buf_speech_enc;
                         move16();
                     }
-
-                    Scale_sig( st->input_fx, input_frame, negate( st->q_inp ) );                // Q0
-                    Scale_sig( st->old_input_signal_fx, input_frame, negate( st->q_old_inp ) ); // Q0
-                    st->q_old_inp = 0;
-                    move16();
-                    st->q_inp = 0;
-                    move16();
                 }
                 Word16 Q_spec_old[2], L_spec;
                 Q_spec_old[0] = hCPE->hCoreCoder[0]->hTcxEnc->spectrum_long_e;
@@ -499,14 +475,14 @@ ivas_error ivas_core_enc_fx(
                     IF( EQ_16( nSubframes, NB_DIV ) )
                     {
                         Word16 max_e = s_max( orig_spectrum_e[i][0], orig_spectrum_e[i][1] );
-                        Scale_sig32( hMCT->p_orig_spectrum_long_fx[cpe_id][i], N_TCX10_MAX, sub( orig_spectrum_e[i][0], max_e ) );               // exp(max_e)
-                        Scale_sig32( hMCT->p_orig_spectrum_long_fx[cpe_id][i] + N_TCX10_MAX, N_TCX10_MAX, sub( orig_spectrum_e[i][1], max_e ) ); // exp(max_e)
-                        hMCT->q_orig_spectrum_long_fx[cpe_id][i] = max_e;
+                        scale_sig32( hMCT->p_orig_spectrum_long_fx[cpe_id][i], N_TCX10_MAX, sub( orig_spectrum_e[i][0], max_e ) );               // exp(max_e)
+                        scale_sig32( hMCT->p_orig_spectrum_long_fx[cpe_id][i] + N_TCX10_MAX, N_TCX10_MAX, sub( orig_spectrum_e[i][1], max_e ) ); // exp(max_e)
+                        hMCT->q_orig_spectrum_long_fx[cpe_id][i] = sub( Q31, max_e );
                         move16();
                     }
                     ELSE
                     {
-                        hMCT->q_orig_spectrum_long_fx[cpe_id][i] = orig_spectrum_e[i][0];
+                        hMCT->q_orig_spectrum_long_fx[cpe_id][i] = sub( Q31, orig_spectrum_e[i][0] );
                         move16();
                     }
 
@@ -555,6 +531,12 @@ ivas_error ivas_core_enc_fx(
                         st->hTcxEnc->exp_buf_speech_ltp = st->exp_buf_speech_enc;
                         move16();
                     }
+                    Scale_sig( st->input_fx, input_frame, sub( -1, st->q_inp ) );
+                    Scale_sig( st->input_fx - input_frame, input_frame, sub( -1, st->q_old_inp ) );
+                    st->q_inp = -1;
+                    move16();
+                    st->q_old_inp = -1;
+                    move16();
                 }
 
                 Word16 Q_spec_old[2], L_spec;
@@ -635,15 +617,12 @@ ivas_error ivas_core_enc_fx(
      * Postprocessing, BWEs and Updates
      *---------------------------------------------------------------------*/
 
+    Word16 tmp_input_fx[L_FRAME48k], tmp_old_input_fx[L_FRAME48k], q_inp[2];
+
     FOR( n = 0; n < n_CoreChannels; n++ )
     {
         st = sts[n];
 
-        Scale_sig( st->old_input_signal_fx, input_frame, negate( st->q_old_inp ) );                               // Q0
-        Scale_sig( st->input_fx, add( input_frame, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), negate( st->q_inp ) ); // Q0
-        st->q_old_inp = st->q_inp = 0;
-        move16();
-        move16();
         IF( st->hBWE_FD != NULL )
         {
             Scale_sig( st->hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, sub( negate( 1 ), st->Q_old_wtda ) ); // Q(-1)
@@ -654,6 +633,17 @@ ivas_error ivas_core_enc_fx(
             move16();
         }
 
+        Copy( st->input_fx - input_frame, tmp_old_input_fx, input_frame );
+        Copy( st->input_fx, tmp_input_fx, input_frame );
+        q_inp[0] = st->q_old_inp;
+        q_inp[1] = st->q_inp;
+
+        Scale_sig( st->input_fx - input_frame, 2 * input_frame, sub( -1, st->q_inp ) );
+        st->q_inp = -1;
+        move16();
+        st->q_old_inp = -1;
+        move16();
+
         /*---------------------------------------------------------------------*
          * Postprocessing for ACELP/HQ core switching
          *---------------------------------------------------------------------*/
@@ -685,12 +675,6 @@ ivas_error ivas_core_enc_fx(
             wb_bwe_enc_ivas_fx( st, new_inp_resamp16k_fx[n] );
         }
 
-        IF( st->hBWE_FD != NULL )
-        {
-            Scale_sig( st->hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, Q1 ); // Q-1 -> Q0
-            st->Q_old_wtda = add( st->Q_old_wtda, Q1 );
-            move16();
-        }
 
         /*---------------------------------------------------------------------*
          * SWB(FB) TBE encoding
@@ -735,8 +719,6 @@ ivas_error ivas_core_enc_fx(
             Scale_sig( st->hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, shift ); // st->Q_old_wtda
         }
 
-        Word16 q_new_swb_speech_buffer = getScaleFactor16( new_swb_speech_buffer_fx_16, input_frame );
-        Scale_sig( new_swb_speech_buffer_fx_16, input_frame, q_new_swb_speech_buffer ); // Q0->q_new_swb_speech_buffer
 
         /* SWB TBE encoder */
         test();
@@ -754,17 +736,15 @@ ivas_error ivas_core_enc_fx(
                 IF( EQ_16( st->extl, FB_TBE ) )
                 {
                     /* FB TBE encoder */
-                    fb_tbe_enc_ivas_fx( st, st->input_fx, fb_exc_fx, Q_fb_exc );
+                    fb_tbe_enc_ivas_fx( st, st->input_fx, fb_exc_fx, Q_fb_exc, st->q_inp );
                 }
             }
         }
         ELSE IF( EQ_16( st->extl, SWB_BWE ) || EQ_16( st->extl, FB_BWE ) )
         {
-            Copy_Scale_sig_32_16( shb_speech_fx32, shb_speech_fx, L_FRAME16k, -Q16 );          // Q_shb_spch - 16
-            Scale_sig( new_swb_speech_fx_16, input_frame, negate( q_new_swb_speech_buffer ) ); // Q0
+            Copy_Scale_sig_32_16( shb_speech_fx32, shb_speech_fx, L_FRAME16k, -Q16 ); // Q_shb_spch - 16
             /* SWB(FB) BWE encoder */
-            swb_bwe_enc_ivas_fx( st, last_element_mode, old_inp_12k8_fx[n], old_inp_16k_fx[n], old_syn_12k8_16k_fx[n], new_swb_speech_fx_16, shb_speech_fx, sub( Q_shb_spch, Q16 ), sub( Q_new[n], 1 ) );
-            Scale_sig( new_swb_speech_fx_16, input_frame, q_new_swb_speech_buffer ); // q_new_swb_speech_buffer
+            swb_bwe_enc_ivas_fx( st, last_element_mode, old_inp_12k8_fx[n], old_inp_16k_fx[n], old_syn_12k8_16k_fx[n], new_swb_speech_fx_16, st->q_inp, shb_speech_fx, sub( Q_shb_spch, Q16 ), sub( Q_new[n], 1 ) );
         }
 
         Scale_sig( old_syn_12k8_16k_fx[n], L_FRAME16k, sub( Q1, Q_new[n] ) ); // Q0
@@ -786,6 +766,9 @@ ivas_error ivas_core_enc_fx(
          *  Inter-channel BWE encoding
          *-------------------------------------------------------------------*/
 
+        Word16 q_new_swb_speech_buffer = getScaleFactor16( new_swb_speech_buffer_fx_16, L_FRAME48k + STEREO_DFT_OVL_MAX );
+        Scale_sig( new_swb_speech_buffer_fx_16, L_FRAME48k + STEREO_DFT_OVL_MAX, q_new_swb_speech_buffer ); // st->q_inp+q_new_swb_speech_buffer
+        q_new_swb_speech_buffer = add( st->q_inp, q_new_swb_speech_buffer );
         test();
         test();
         IF( n == 0 && GE_32( input_Fs, 32000 ) && hStereoICBWE != NULL )
@@ -794,8 +777,8 @@ ivas_error ivas_core_enc_fx(
             stereo_icBWE_preproc_fx( hCPE, input_frame, new_swb_speech_buffer_fx_16 /*tmp buffer*/, q_new_swb_speech_buffer );
 
             q_new_swb_speech_buffer = add( q_new_swb_speech_buffer, 16 );
-            Copy_Scale_sig_16_32( new_swb_speech_buffer_fx_16, new_swb_speech_buffer_fx, input_frame, Q16 ); // q_new_swb_speech_buffer
-            Copy_Scale_sig_16_32( voice_factors_fx[0], voice_factors_fx32[0], NB_SUBFR16k, Q16 );            // Q31
+            Copy_Scale_sig_16_32_no_sat( new_swb_speech_buffer_fx_16, new_swb_speech_buffer_fx, L_FRAME48k + STEREO_DFT_OVL_MAX, Q16 ); // q_new_swb_speech_buffer+st->q_inp - 16 - > q_new_swb_speech_buffer+st->q_inp
+            Copy_Scale_sig_16_32_no_sat( voice_factors_fx[0], voice_factors_fx32[0], NB_SUBFR16k, Q16 );                                // Q31
 
             stereo_icBWE_enc_ivas_fx( hCPE, shb_speech_fx32, sub( Q31, Q_shb_spch ), new_swb_speech_buffer_fx, sub( Q31, q_new_swb_speech_buffer ), voice_factors_fx32[0] );
 
@@ -815,6 +798,13 @@ ivas_error ivas_core_enc_fx(
             }
         }
 
+        Copy( tmp_old_input_fx, st->input_fx - input_frame, input_frame );
+        Copy( tmp_input_fx, st->input_fx, input_frame );
+        st->q_old_inp = q_inp[0];
+        move16();
+        st->q_inp = q_inp[1];
+        move16();
+
         /*---------------------------------------------------------------------*
          * Channel-aware mode - write signaling information into the bitstream
          *---------------------------------------------------------------------*/
diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front_fx.c
similarity index 74%
rename from lib_enc/ivas_core_pre_proc_front.c
rename to lib_enc/ivas_core_pre_proc_front_fx.c
index 090a880607fc28bc20746d6f9549695873fabe84..f1e6b219389dbee185693731b14b3f870d21e022 100644
--- a/lib_enc/ivas_core_pre_proc_front.c
+++ b/lib_enc/ivas_core_pre_proc_front_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,8 @@
 #include "ivas_cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "wmc_auto.h"
 #include <math.h>
@@ -50,7 +48,6 @@
 
 #include "prot_fx_enc.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 /*---------------------------------------------------------------*
  * Local constants
@@ -59,11 +56,7 @@
 #define SCE_SMC_THR 16000
 
 
-static void calculate_energy_buffer_ivas_fx( CPE_ENC_HANDLE hCPE, Word32 enerBuffer_dft[], const Word16 no_channels, const Word32 input_Fs, Word16 *enerBuffer_dft_e );
-
-#ifdef IVAS_FIXED_ENC
-static void calculate_energy_buffer_fx( CPE_ENC_HANDLE hCPE, Word64 enerBuffer_dft_fx[], Word16 *enerBuffer_dft_q_fx, const Word16 no_channels, const Word32 input_Fs );
-#endif
+static void calculate_energy_buffer_ivas_fx( CPE_ENC_HANDLE hCPE, Word32 enerBuffer_dft[], const Word16 no_channels, const Word32 input_Fs, Word16 enerBuffer_dft_e[] );
 
 /*-------------------------------------------------------------------*
  * pre_proc_front_ivas()
@@ -90,7 +83,7 @@ ivas_error pre_proc_front_ivas_fx(
     const Word16 nb_bits_metadata,         /* i  : number of metadata bits					Q0*/
     const Word16 input_frame,              /* i  : frame length								Q0*/
     const Word16 n,                        /* i  : channel number							Q0*/
-    Word16 old_inp_12k8_fx[],              /* o  : buffer of old input signal				Q_new-1*/
+    Word16 old_inp_12k8_fx[],              /* o  : buffer of old input signal (st->Q_inp until preemph, then Q_new, then Q_new-1 towards the end)*/
     Word16 old_inp_16k_fx[],               /* o  : buffer of old input signal @16kHz		Q_new-1*/
     Word32 *ener_fx,                       /* o  : residual energy from Levinson-Durbin		epsP_fx_q*/
     Word16 *relE_fx,                       /* o  : frame relative energy					Q8*/
@@ -118,7 +111,7 @@ ivas_error pre_proc_front_ivas_fx(
     Word16 *fft_buff_fx_q,                       /* o  : FFT buffer										*/
     const Word16 tdm_A_PCh_fx[M + 1],            /* i  : unq. LP coeff. of primary channel				Q12*/
     const Word16 tdm_lsp_new_PCh_fx[M],          /* i  : unq. LSPs of primary channel					Q15*/
-    const Word16 currFlatness_fx,                /* i  : flatness parameter								Q7*/
+    const Word32 currFlatness_fx,                /* i  : flatness parameter								Q21*/
     const Word16 tdm_ratio_idx,                  /* i  : Current Ratio_L index							Q0*/
     Word32 fr_bands_LR_fx[][2 * NB_BANDS],       /* i  : energy in frequency bands (fr_bands_LR_fx_q)	fr_bands_LR_fx_q*/
     Word16 fr_bands_LR_fx_q[CPE_CHANNELS],
@@ -128,13 +121,14 @@ ivas_error pre_proc_front_ivas_fx(
     const Word16 localVAD_HE_SAD_LR[],        /* i  : HE-SAD flag without hangover, LR channels			Q0*/
     Word32 band_energies_LR_fx[2 * NB_BANDS], /* o  : energy in critical bands without minimum noise floor E_MIN	(band_energies_LR_fx_q)*/
     Word16 band_energies_LR_fx_q,
-    const Word16 flag_16k_smc,       /* i  : flag to indicate if the OL SMC is run at 16 kHz			Q0*/
-    const Word16 front_vad_flag,     /* i  : front-VAD flag to overwrite VAD decision					Q0*/
-    const Word16 force_front_vad,    /* i  : flag to force VAD decision									Q0*/
-    const Word16 front_vad_dtx_flag, /* i  : front-VAD DTX flag to overwrite VAD decision				Q0*/
-    const IVAS_FORMAT ivas_format,   /* i  : IVAS format												*/
-    const Word16 MCT_flag,           /* i  : hMCT handle allocated (1) or not (0)						Q0*/
-    const Word32 ivas_total_brate,   /* i  : IVAS total bitrate - for setting the DTX					Q0*/
+    const Word16 flag_16k_smc,          /* i  : flag to indicate if the OL SMC is run at 16 kHz			Q0*/
+    const Word16 front_vad_flag,        /* i  : front-VAD flag to overwrite VAD decision					Q0*/
+    const Word16 force_front_vad,       /* i  : flag to force VAD decision									Q0*/
+    const Word16 front_vad_dtx_flag,    /* i  : front-VAD DTX flag to overwrite VAD decision				Q0*/
+    const IVAS_FORMAT ivas_format,      /* i  : IVAS format												*/
+    const Word16 MCT_flag,              /* i  : hMCT handle allocated (1) or not (0)						Q0*/
+    const Word32 last_ivas_total_brate, /* i  : last IVAS total bitrate                                    Q0*/
+    const Word32 ivas_total_brate,      /* i  : IVAS total bitrate - for setting the DTX					Q0*/
     Word16 *Q_new
 #ifdef DEBUG_MODE_INFO
     ,
@@ -151,26 +145,6 @@ ivas_error pre_proc_front_ivas_fx(
     {
         st = hCPE->hCoreCoder[n];
     }
-    Word16 old_inp_12k8_e;
-    Word16 shift = getScaleFactor16( st->old_inp_12k8_fx, 240 );
-    Scale_sig( st->old_inp_12k8_fx, 240, shift ); /* exp(st->exp_old_inp_12k8 - shift) */
-    st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );
-    move16();
-    shift = getScaleFactor16( old_inp_12k8_fx, 496 );
-    Scale_sig( old_inp_12k8_fx, 496, shift ); /* exp(16 - shift) */
-    old_inp_12k8_e = sub( Q16, shift );
-    IF( GT_16( old_inp_12k8_e, st->exp_old_inp_12k8 ) )
-    {
-        Scale_sig( st->old_inp_12k8_fx, 240, sub( st->exp_old_inp_12k8, old_inp_12k8_e ) ); /* exp(old_inp_12k8_e) */
-        st->exp_old_inp_12k8 = old_inp_12k8_e;
-        move16();
-    }
-    ELSE
-    {
-        Scale_sig( old_inp_12k8_fx, 496, sub( old_inp_12k8_e, st->exp_old_inp_12k8 ) ); /* exp(st->exp_old_inp_12k8) */
-        old_inp_12k8_e = st->exp_old_inp_12k8;
-        move16();
-    }
 
     Word16 q_tmpN_LR[CPE_CHANNELS];
     Word16 q_tmpE_LR[CPE_CHANNELS];
@@ -212,10 +186,6 @@ ivas_error pre_proc_front_ivas_fx(
     Word16 new_inp_out_size;
     Word16 Q_new_inp;
     Word16 mem_decim_size;
-#ifndef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
-    Word16 Q_new;
-    Word16 corr_shift_fx;
-#endif
 
     Word16 dummy_fx;
     Word16 ncharX_fx;
@@ -231,7 +201,7 @@ ivas_error pre_proc_front_ivas_fx(
     Word16 S_map_fx[L_FFT / 2];
     Word16 cor_map_sum_LR_fx[CPE_CHANNELS];    /* speech/music clasif. parameter               */
     Word16 S_map_LR_fx[L_FFT / 2];             /* short-term correlation map                   */
-    Word16 Etot_fx;                            /* total energy                           Q8    */
+    Word32 Etot_fx;                            /* total energy                           Q8    */
     Word32 tmpN_fx[NB_BANDS];                  /* Temporary noise update                       */
     Word32 tmpE_fx[NB_BANDS];                  /* Temporary averaged energy of 2 sf.           */
     Word32 tmpN_LR_fx[CPE_CHANNELS][NB_BANDS]; /* Temporary noise update                       */
@@ -248,6 +218,8 @@ ivas_error pre_proc_front_ivas_fx(
     Word16 imagBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
     Word16 res_cod_SNR_M_fx_e[STEREO_DFT_BAND_MAX];
     Word16 Qfact_PS, q_lf_E_fx;
+    Word16 enerBuffer_fx_exp_buf[CLDFB_NO_CHANNELS_MAX];
+    Word32 bckr_temp[NB_BANDS];
 #ifdef DEBUG_MODE_INFO
     Word32 *in_buff_temp;
     Word16 in_q_temp;
@@ -257,44 +229,34 @@ ivas_error pre_proc_front_ivas_fx(
     temp1F_icatdmResampBuf_fx = (Word16 *) malloc( 45 * sizeof( Word16 * ) );
     set16_fx( fft_buff_fx, 0, 512 );
 
-    IF( hSCE != NULL )
-    {
-        Copy_Scale_sig_16_32( hSCE->hCoreCoder[n]->input_fx, hSCE->hCoreCoder[n]->input32_fx, input_frame, sub( Q11, hSCE->hCoreCoder[n]->q_inp ) );                                 /* Q11 */
-        Copy_Scale_sig_16_32( hSCE->hCoreCoder[n]->input_fx - input_frame, hSCE->hCoreCoder[n]->input32_fx - input_frame, input_frame, sub( Q11, hSCE->hCoreCoder[n]->q_old_inp ) ); /* Q11 */
-        hSCE->hCoreCoder[n]->q_inp32 = Q11;
-        move16();
-        Scale_sig( hSCE->hCoreCoder[n]->input_fx, input_frame, sub( -1, hSCE->hCoreCoder[n]->q_inp ) ); /* Q(-1) */
-        hSCE->hCoreCoder[n]->q_inp = -1;
-        move16();
-        Scale_sig( hSCE->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( -1, hSCE->hCoreCoder[n]->q_old_inp ) ); /* Q(-1) */
-        hSCE->hCoreCoder[n]->q_old_inp = -1;
-        move16();
+    Word16 Q_min = add( sub( 15, st->exp_old_inp_12k8 ), norm_arr( st->old_inp_12k8_fx, L_INP_MEM ) );
+    Word16 input_frame_full = shl( input_frame, 1 ); //(old frame input length + new frame input length)
+    Q_min = s_min( Q_min, sub( add( getScaleFactor32( st->input32_fx - input_frame, input_frame_full ), st->q_inp32 ), 16 ) );
+    Q_min = s_max( -1, Q_min );
+    Copy_Scale_sig_32_16( st->input32_fx - input_frame, st->input_fx - input_frame, input_frame_full, sub( Q_min, st->q_inp32 ) ); // Q_min
+    st->q_inp = Q_min;
+    move16();
+    st->q_old_inp = Q_min;
+    move16();
 
 #ifdef DEBUG_MODE_INFO
+    IF( hSCE != NULL )
+    {
         in_buff_temp = hSCE->hCoreCoder[n]->input32_fx;
         in_q_temp = hSCE->hCoreCoder[n]->q_inp32;
-#endif
     }
     ELSE
     {
-        Copy_Scale_sig_16_32( hCPE->hCoreCoder[n]->input_fx, hCPE->hCoreCoder[n]->input32_fx, input_frame, sub( Q11, hCPE->hCoreCoder[n]->q_inp ) );                                 /* Q11 */
-        Copy_Scale_sig_16_32( hCPE->hCoreCoder[n]->input_fx - input_frame, hCPE->hCoreCoder[n]->input32_fx - input_frame, input_frame, sub( Q11, hCPE->hCoreCoder[n]->q_old_inp ) ); /* Q11 */
-        hCPE->hCoreCoder[n]->q_inp32 = Q11;
-        move16();
-        Scale_sig( hCPE->hCoreCoder[n]->input_fx, input_frame, sub( -1, hCPE->hCoreCoder[n]->q_inp ) ); /* Q(-1) */
-        hCPE->hCoreCoder[n]->q_inp = -1;
-        move16();
-        Scale_sig( hCPE->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( -1, hCPE->hCoreCoder[n]->q_old_inp ) ); /* Q(-1) */
-        hCPE->hCoreCoder[n]->q_old_inp = -1;
-        move16();
-#ifdef DEBUG_MODE_INFO
         in_buff_temp = hCPE->hCoreCoder[n]->input32_fx;
         in_q_temp = hCPE->hCoreCoder[n]->q_inp32;
-#endif
     }
+#endif
+
 
 #ifdef DEBUG_MODE_INFO
+    if ( !( hCPE != NULL && hCPE->hStereoTD != NULL && ch_idx > 0 ) )
     {
+        /* for TD stereo only write out first channel. The existence of a second channel can vary, this is just easier to handle */
         int16_t tmpF[L_FRAME48k];
         for ( int16_t isample = 0; isample < input_frame; isample++ )
         {
@@ -304,16 +266,14 @@ ivas_error pre_proc_front_ivas_fx(
     }
 #endif
 
-#ifdef MSAN_FIX
     FOR( Word16 k = 0; k < CLDFB_NO_COL_MAX; k++ )
     {
         set32_fx( realBuffer_fx[k], 0, CLDFB_NO_CHANNELS_MAX );
         set32_fx( imagBuffer_fx[k], 0, CLDFB_NO_CHANNELS_MAX );
     }
-#endif
     Word16 sf_energySum[CLDFB_NO_CHANNELS_MAX];
 
-    Word16 Q_to_be_looked_into = -1;
+    Word16 Q_inp_const = -1;
     move16();
     Word16 headroom = 0, preemp_len = 0, inp_max = 0;
     move16();
@@ -353,9 +313,6 @@ ivas_error pre_proc_front_ivas_fx(
     IF( hSCE != NULL )
     {
         st = hSCE->hCoreCoder[n];
-#ifndef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
-        signal_in = hSCE->hCoreCoder[n]->input;
-#endif
         signal_in_fx = hSCE->hCoreCoder[n]->input_fx;     /* hSCE->hCoreCoder[n]->q_inp */
         signal32_in_fx = hSCE->hCoreCoder[n]->input32_fx; /* hSCE->hCoreCoder[n]->q_inp32 */
         element_mode = IVAS_SCE;
@@ -369,9 +326,6 @@ ivas_error pre_proc_front_ivas_fx(
     ELSE /* CPE */
     {
         st = hCPE->hCoreCoder[n];
-#ifndef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
-        signal_in = hCPE->hCoreCoder[n]->input;
-#endif
         signal_in_fx = hCPE->hCoreCoder[n]->input_fx;     /* hSCE->hCoreCoder[n]->q_inp */
         signal32_in_fx = hCPE->hCoreCoder[n]->input32_fx; /* hSCE->hCoreCoder[n]->q_inp32 */
         element_mode = hCPE->element_mode;
@@ -417,7 +371,7 @@ ivas_error pre_proc_front_ivas_fx(
     IF( EQ_16( element_mode, IVAS_CPE_TD ) || EQ_16( element_mode, IVAS_CPE_MDCT ) )
     {
         lMemRecalc = NS2SA_FX2( st->input_Fs, L_MEM_RECALC_NS );
-        lMemRecalc_12k8 = NS2SA_FX2( INT_FS_12k8, L_MEM_RECALC_NS );
+        lMemRecalc_12k8 = NS2SA( INT_FS_12k8, L_MEM_RECALC_NS );
     }
 
     input_Fs = st->input_Fs; /* Q0 */
@@ -468,11 +422,6 @@ ivas_error pre_proc_front_ivas_fx(
     L_look = L_LOOK_12k8; /* lookahead at 12.8kHz */
     move16();
 
-    Scale_sig( old_inp_12k8_fx, L_INP_12k8, sub( Q_to_be_looked_into, sub( Q15, old_inp_12k8_e ) ) ); /* Q_to_be_looked_into*/
-    old_inp_12k8_e = sub( Q15, Q_to_be_looked_into );
-    Scale_sig( st->old_inp_12k8_fx, 240, sub( Q_to_be_looked_into, sub( Q15, st->exp_old_inp_12k8 ) ) ); /* Q_to_be_looked_into */
-    st->exp_old_inp_12k8 = sub( Q15, Q_to_be_looked_into );
-    move16();
     new_inp_12k8_fx = old_inp_12k8_fx + L_INP_MEM; /* pointer to new samples of the input signal in 12.8kHz core   */
     inp_12k8_fx = new_inp_12k8_fx - L_look;        /* pointer to the current frame of input signal in 12.8kHz core */
 
@@ -483,15 +432,15 @@ ivas_error pre_proc_front_ivas_fx(
 
     IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
     {
-        Copy( st->old_inp_12k8_fx, old_inp_12k8_fx, L_INP_MEM - STEREO_DFT_OVL_12k8 ); /* exp(st->exp_old_inp_12k8) */
+        Copy_Scale_sig( st->old_inp_12k8_fx, old_inp_12k8_fx, L_INP_MEM - STEREO_DFT_OVL_12k8, sub( st->q_inp, sub( Q15, st->exp_old_inp_12k8 ) ) ); /* st->q_inp */
     }
     ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) )
     {
-        Copy( st->old_inp_12k8_fx, old_inp_12k8_fx, sub( L_INP_MEM - L_FILT, lMemRecalc_12k8 ) ); /* exp(st->exp_old_inp_12k8) */
+        Copy_Scale_sig( st->old_inp_12k8_fx, old_inp_12k8_fx, sub( L_INP_MEM - L_FILT, lMemRecalc_12k8 ), sub( st->q_inp, sub( Q15, st->exp_old_inp_12k8 ) ) ); /* st->q_inp */
     }
     ELSE
     {
-        Copy( st->old_inp_12k8_fx, old_inp_12k8_fx, L_INP_MEM - L_FILT ); /* exp(st->exp_old_inp_12k8) */
+        Copy_Scale_sig( st->old_inp_12k8_fx, old_inp_12k8_fx, L_INP_MEM - L_FILT, sub( st->q_inp, sub( Q15, st->exp_old_inp_12k8 ) ) ); /* st->q_inp */
     }
 
     Copy( st->old_wsp_fx, old_wsp_fx, L_WSP_MEM ); /* exp(st->exp_old_wsp) */
@@ -516,16 +465,22 @@ ivas_error pre_proc_front_ivas_fx(
     test();
     IF( EQ_16( element_mode, IVAS_SCE ) || ( EQ_16( element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
     {
-        analysisCldfbEncoder_ivas_fx( st, signal32_in_fx, 11, input_frame, realBuffer_fx, imagBuffer_fx, realBuffer16, imagBuffer16, enerBuffer_fx, enerBuffer_fx_exp, &cldfbScale );
+        scale_sig32( signal32_in_fx - input_frame, input_frame_full, sub( 11, st->q_inp32 ) ); // Q11
+        st->q_inp32 = 11;
+        move16();
+        analysisCldfbEncoder_ivas_fx( st, signal32_in_fx, st->q_inp32, input_frame, realBuffer_fx, imagBuffer_fx, realBuffer16, imagBuffer16, enerBuffer_fx, enerBuffer_fx_exp, &cldfbScale );
     }
     ELSE IF( ( EQ_16( element_mode, IVAS_CPE_TD ) && st->idchan == 0 ) || ( EQ_16( st->idchan, 1 ) && st->tdm_LRTD_flag ) )
     {
         /* cldfb analysis only for pri. channel */
-        analysisCldfbEncoder_ivas_fx( st, signal32_in_fx - NS2SA_FX2( input_Fs, L_MEM_RECALC_TBE_NS ), 11, input_frame, realBuffer_fx, imagBuffer_fx, realBuffer16, imagBuffer16, enerBuffer_fx, enerBuffer_fx_exp, &cldfbScale );
+        scale_sig32( signal32_in_fx - input_frame, input_frame_full, sub( 11, st->q_inp32 ) ); // Q11
+        st->q_inp32 = 11;
+        move16();
+        analysisCldfbEncoder_ivas_fx( st, signal32_in_fx - NS2SA_FX2( input_Fs, L_MEM_RECALC_TBE_NS ), st->q_inp32, input_frame, realBuffer_fx, imagBuffer_fx, realBuffer16, imagBuffer16, enerBuffer_fx, enerBuffer_fx_exp, &cldfbScale );
     }
     ELSE IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
     {
-        calculate_energy_buffer_ivas_fx( hCPE, enerBuffer_fx, st->cldfbAnaEnc->no_channels, input_Fs, enerBuffer_fx_exp );
+        calculate_energy_buffer_ivas_fx( hCPE, enerBuffer_fx, st->cldfbAnaEnc->no_channels, input_Fs, enerBuffer_fx_exp_buf );
     }
     ELSE
     {
@@ -541,17 +496,19 @@ ivas_error pre_proc_front_ivas_fx(
      * Change the sampling frequency to 12.8 kHz
      * (if not available from downsampled DMX)
      *----------------------------------------------------------------*/
-
+    Scale_sig( st->mem_decim_fx_q_inp, 2 * L_FILT_MAX, sub( st->q_inp, st->mem_q ) ); /* st->q_inp */
     test();
+
     IF( EQ_16( element_mode, IVAS_SCE ) )
     {
-        new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx, input_frame, input_Fs, new_inp_12k8_fx, INT_FS_12k8, st->mem_decim_fx, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* Q0 */
-        Scale_sig( new_inp_12k8_fx, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                /* scaling back to Q_to_be_looked_into*/
-
-        Copy( st->mem_decim_fx, mem_decim_dummy_fx, 2 * L_FILT_MAX ); /* Q(-1) */
+        new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx, input_frame, input_Fs, new_inp_12k8_fx, INT_FS_12k8, st->mem_decim_fx_q_inp, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+        Scale_sig( new_inp_12k8_fx, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                      /* scaling back to st->q_inp*/
+        st->mem_q = st->q_inp;
+        move16();
+        Copy( st->mem_decim_fx_q_inp, mem_decim_dummy_fx, 2 * L_FILT_MAX ); /* Q(-1) */
         set16_fx( temp1F_icatdmResampBuf_fx, 0, L_FILT_MAX );
-        new_inp_out_size = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_12k8_fx + L_FRAME, INT_FS_12k8, mem_decim_dummy_fx, 0, &Q_new_inp, &mem_decim_size ); /* Q0 */
-        Scale_sig( new_inp_12k8_fx + L_FRAME, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                                            /* scaling back to Q_to_be_looked_into*/
+        new_inp_out_size = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_12k8_fx + L_FRAME, INT_FS_12k8, mem_decim_dummy_fx, 0, &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+        Scale_sig( new_inp_12k8_fx + L_FRAME, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                                            /* scaling back to st->q_inp*/
     }
     ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) || EQ_16( element_mode, IVAS_CPE_MDCT ) )
     {
@@ -560,29 +517,45 @@ ivas_error pre_proc_front_ivas_fx(
         IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) && EQ_16( st->idchan, 1 ) )
         {
             Word16 length_inp = NS2SA_FX2( input_Fs, L_MEM_RECALC_SCH_NS );
-            Word16 length_12k8 = NS2SA_FX2( INT_FS_12k8, L_MEM_RECALC_SCH_NS );
+            Word16 length_12k8 = NS2SA( INT_FS_12k8, L_MEM_RECALC_SCH_NS );
 
-            new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc - length_inp, length_inp, input_Fs, new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, INT_FS_12k8, st->mem_decim_fx, 0, &Q_new_inp, &mem_decim_size ); /* Q0 */
-            Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                  /* scaling back to Q_to_be_looked_into*/
+            new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc - length_inp, length_inp, input_Fs, new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, INT_FS_12k8, st->mem_decim_fx_q_inp, 0, &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+            Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                        /* scaling back to st->q_inp*/
         }
 
-        new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc, input_frame, input_Fs, new_inp_12k8_fx - lMemRecalc_12k8, INT_FS_12k8, st->mem_decim_fx, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* Q0 */
-        Copy( st->mem_decim_fx, mem_decim_dummy_fx, 2 * L_FILT_MAX );                                                                                                                                                      /* Q(-1) */
-        Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                             /* scaling back to Q_to_be_looked_into*/
+        new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc, input_frame, input_Fs, new_inp_12k8_fx - lMemRecalc_12k8, INT_FS_12k8, st->mem_decim_fx_q_inp, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+        st->mem_q = st->q_inp;
+        move16();
+        Copy( st->mem_decim_fx_q_inp, mem_decim_dummy_fx, 2 * L_FILT_MAX );                    /* st->q_inp */
+        Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, new_inp_out_size, negate( Q_new_inp ) ); /* scaling back to st->q_inp*/
 
         IF( lMemRecalc > 0 )
         {
-            new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx + sub( input_frame, lMemRecalc ), lMemRecalc, input_Fs, new_inp_12k8_fx + sub( L_FRAME, lMemRecalc_12k8 ), INT_FS_12k8, mem_decim_dummy_fx, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* Q0 */
-            Scale_sig( new_inp_12k8_fx + L_FRAME - lMemRecalc_12k8, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                                                        /* scaling back to Q_to_be_looked_into*/
+            new_inp_out_size = modify_Fs_ivas_fx( signal_in_fx + sub( input_frame, lMemRecalc ), lMemRecalc, input_Fs, new_inp_12k8_fx + sub( L_FRAME, lMemRecalc_12k8 ), INT_FS_12k8, mem_decim_dummy_fx, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+            Scale_sig( new_inp_12k8_fx + L_FRAME - lMemRecalc_12k8, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                                                        /* scaling back to st->q_inp*/
         }
         set16_fx( temp1F_icatdmResampBuf_fx, 0, L_FILT_MAX );
-        new_inp_out_size = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_12k8_fx + L_FRAME, INT_FS_12k8, mem_decim_dummy_fx, 0, &Q_new_inp, &mem_decim_size ); /* Q0 */
-        Scale_sig( new_inp_12k8_fx + L_FRAME, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                                        /* scaling back to Q_to_be_looked_into*/
+        new_inp_out_size = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_12k8_fx + L_FRAME, INT_FS_12k8, mem_decim_dummy_fx, 0, &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+        Scale_sig( new_inp_12k8_fx + L_FRAME, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                                        /* scaling back to st->q_inp*/
     }
     ELSE /* DFT stereo */
     {
         /* update the FIR resampling filter memory, needed for switching to time-domain (FIR) resampling */
-        Copy( signal_in_fx + sub( input_frame, add( NS2SA_FX2( input_Fs, L_MEM_RECALC_NS ), 2 * NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ) ) ), st->mem_decim_fx, 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ) ); /* hSCE->hCoreCoder[n]->q_inp */
+        Copy( signal_in_fx + sub( input_frame, add( NS2SA_FX2( input_Fs, L_MEM_RECALC_NS ), 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ) ) ), st->mem_decim_fx_q_inp, 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ) ); /* st->q_inp */
+        st->mem_q = st->q_inp;
+        move16();
+        scale_sig( old_inp_12k8_fx, L_INP_MEM - STEREO_DFT_OVL_12k8, sub( Q_inp_const, st->q_inp ) );
+        scale_sig( st->input_fx - input_frame, input_frame_full, sub( Q_inp_const, st->q_inp ) );
+        Copy_Scale_sig( st->mem_decim_fx_q_inp, st->mem_decim_fx, 2 * L_FILT_MAX, sub( Q_inp_const, st->q_inp ) ); /* Q(-1) */
+        // Scale_sig( st->mem_decim_fx, 2 * L_FILT_MAX, sub( Q_inp_const, st->q_inp ) );                              /* Q(-1) */
+        st->q_inp = Q_inp_const;
+        move16();
+        st->q_old_inp = Q_inp_const;
+        move16();
+    }
+    IF( NE_16( Q_inp_const, st->q_inp ) )
+    {
+        Copy_Scale_sig( st->mem_decim_fx_q_inp, st->mem_decim_fx, 2 * L_FILT_MAX, sub( Q_inp_const, st->q_inp ) ); /* Q(-1) */
     }
 
     Scale_sig( st->buf_speech_enc, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( -1, sub( 15, st->exp_buf_speech_enc ) ) ); /* Q(-1) */
@@ -593,15 +566,15 @@ ivas_error pre_proc_front_ivas_fx(
     test();
     IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
     {
-        Copy( new_inp_12k8_fx - STEREO_DFT_OVL_12k8, st->buf_speech_enc + L_FRAME32k - STEREO_DFT_OVL_12k8, L_FRAME + STEREO_DFT_OVL_12k8 ); /* Q_to_be_looked_into */
+        Copy_Scale_sig( new_inp_12k8_fx - STEREO_DFT_OVL_12k8, st->buf_speech_enc + L_FRAME32k - STEREO_DFT_OVL_12k8, L_FRAME + STEREO_DFT_OVL_12k8, sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */
     }
     ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) || EQ_16( element_mode, IVAS_CPE_MDCT ) )
     {
-        Copy( new_inp_12k8_fx - lMemRecalc_12k8, st->buf_speech_enc + L_FRAME32k - lMemRecalc_12k8 - L_FILT, add( L_FRAME + L_FILT, lMemRecalc_12k8 ) ); /* Q_to_be_looked_into */
+        Copy_Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, st->buf_speech_enc + L_FRAME32k - lMemRecalc_12k8 - L_FILT, add( L_FRAME + L_FILT, lMemRecalc_12k8 ), sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */
     }
     ELSE
     {
-        Copy( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME ); /* Q_to_be_looked_into */
+        Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME, sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */
     }
 
     /*------------------------------------------------------------------*
@@ -612,29 +585,26 @@ ivas_error pre_proc_front_ivas_fx(
     move16();
     set32_fx( sig_out, 0, 960 );
 
-    headroom = 1;
+    headroom = 2;
     move16();
 
-    test();
-    test();
-    if ( ( st->bwidth == NB || st->max_bwidth == NB ) && GT_32( st->input_Fs, 8000 ) )
-    {
-        headroom = add( headroom, 1 );
-    }
-
+    st->mem_preemph_fx_q_inp = shl_sat( st->mem_preemph_fx_q_inp, sub( st->q_inp, st->mem_preemph_q ) ); /*st->q_inp*/
+    move16();
+    st->mem_preemph_DFT_fx_q_inp = shl_sat( st->mem_preemph_DFT_fx_q_inp, sub( st->q_inp, st->mem_preemph_q ) ); /*st->q_inp*/
+    move16();
     test();
     IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
     {
-        Copy( new_inp_12k8_fx - STEREO_DFT_OVL_12k8 + L_FRAME, st->inp_12k8_mem_stereo_sw_fx, STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ); /* memory for TD/DFT stereo switching		Q_to_be_looked_into*/
+        Copy_Scale_sig( new_inp_12k8_fx - STEREO_DFT_OVL_12k8 + L_FRAME, st->inp_12k8_mem_stereo_sw_fx, STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT, sub( Q_inp_const, st->q_inp ) ); /* memory for TD/DFT stereo switching		Q_inp_const*/
 
-        st->mem_preemph_fx = st->mem_preemph_DFT_fx; /* Q(-1) */
+        st->mem_preemph_fx_q_inp = st->mem_preemph_DFT_fx_q_inp; /* st->q_inp */
         move16();
-        st->mem_preemph_DFT_fx = old_inp_12k8_fx[L_INP_MEM - STEREO_DFT_OVL_12k8 + L_FRAME - 1]; /* Q_new - 1 */
+        st->mem_preemph_DFT_fx_q_inp = old_inp_12k8_fx[L_INP_MEM - STEREO_DFT_OVL_12k8 + L_FRAME - 1]; /* st->q_inp */
         move16();
 
         // PREEMPH_FX( new_inp_12k8_fx - STEREO_DFT_OVL_12k8, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx );
-        PREEMPH_32FX( new_inp_12k8_fx - STEREO_DFT_OVL_12k8, sig_out, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx );
-        dummy_fx = st->mem_preemph_fx;
+        PREEMPH_32FX( new_inp_12k8_fx - STEREO_DFT_OVL_12k8, sig_out, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx_q_inp );
+        dummy_fx = st->mem_preemph_fx_q_inp;
         move16();
 
         // PREEMPH_FX( new_inp_12k8_fx - STEREO_DFT_OVL_12k8 + L_FRAME, PREEMPH_FAC, STEREO_DFT_OVL_12k8, &dummy_fx );
@@ -650,18 +620,18 @@ ivas_error pre_proc_front_ivas_fx(
         {
             IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) )
             {
-                st->mem_preemph_fx = st->mem_preemph_DFT_fx;
+                st->mem_preemph_fx_q_inp = st->mem_preemph_DFT_fx_q_inp; /* st->q_inp */
                 move16();
-                Copy( st->inp_12k8_mem_stereo_sw_fx, new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ), STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ); /* Q(-1) */
+                Copy_Scale_sig( st->inp_12k8_mem_stereo_sw_fx, new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ), STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT, sub( st->q_inp, Q_inp_const ) ); /* st->q_inp */
                 // PREEMPH_FX( new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ), PREEMPH_FAC, STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT, &st->mem_preemph_fx );
-                PREEMPH_32FX( new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ), sig_out, PREEMPH_FAC, STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT, &st->mem_preemph_fx );
+                PREEMPH_32FX( new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT ), sig_out, PREEMPH_FAC, STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT, &st->mem_preemph_fx_q_inp );
                 preemp_start_idx = new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT );
                 move16();
                 preemp_len = STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT;
                 move16();
             }
 
-            st->mem_preemph_DFT_fx = old_inp_12k8_fx[L_INP_MEM - STEREO_DFT_OVL_12k8 + L_FRAME - 1]; /* == inp_12k8[L_FRAME-1]	Q_new - 1 */
+            st->mem_preemph_DFT_fx_q_inp = old_inp_12k8_fx[L_INP_MEM - STEREO_DFT_OVL_12k8 + L_FRAME - 1]; /* st->q_inp */
             move16();
         }
 
@@ -669,18 +639,18 @@ ivas_error pre_proc_front_ivas_fx(
         test();
         IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) && EQ_16( st->idchan, 1 ) )
         {
-            Word16 length_12k8 = NS2SA_FX2( INT_FS_12k8, L_MEM_RECALC_SCH_NS );
+            Word16 length_12k8 = NS2SA( INT_FS_12k8, L_MEM_RECALC_SCH_NS );
             move16();
             // PREEMPH_FX( new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, PREEMPH_FAC, length_12k8, &st->mem_preemph_fx );
-            PREEMPH_32FX( new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, sig_out, PREEMPH_FAC, length_12k8, &st->mem_preemph_fx );
+            PREEMPH_32FX( new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8, sig_out, PREEMPH_FAC, length_12k8, &st->mem_preemph_fx_q_inp );
             preemp_start_idx = new_inp_12k8_fx - lMemRecalc_12k8 - length_12k8;
             preemp_len = length_12k8;
             move16();
         }
 
         // PREEMPH_FX( new_inp_12k8_fx - lMemRecalc_12k8, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx );
-        PREEMPH_32FX( new_inp_12k8_fx - lMemRecalc_12k8, sig_out + preemp_len, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx );
-        dummy_fx = st->mem_preemph_fx; /* Q(-1) */
+        PREEMPH_32FX( new_inp_12k8_fx - lMemRecalc_12k8, sig_out + preemp_len, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx_q_inp );
+        dummy_fx = st->mem_preemph_fx_q_inp; /* st->q_inp */
         move16();
         // PREEMPH_FX( new_inp_12k8_fx - lMemRecalc_12k8 + L_FRAME, PREEMPH_FAC, lMemRecalc_12k8 + L_FILT, &dummy_fx );
         PREEMPH_32FX( new_inp_12k8_fx - lMemRecalc_12k8 + L_FRAME, sig_out + preemp_len + L_FRAME, PREEMPH_FAC, lMemRecalc_12k8 + L_FILT, &dummy_fx );
@@ -701,8 +671,8 @@ ivas_error pre_proc_front_ivas_fx(
     ELSE /* IVAS_SCE or IVAS_CPE_MDCT */
     {
         // PREEMPH_FX( new_inp_12k8_fx, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx );
-        PREEMPH_32FX( new_inp_12k8_fx, sig_out, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx );
-        dummy_fx = st->mem_preemph_fx;
+        PREEMPH_32FX( new_inp_12k8_fx, sig_out, PREEMPH_FAC, L_FRAME, &st->mem_preemph_fx_q_inp );
+        dummy_fx = st->mem_preemph_fx_q_inp;
         move16();
         // PREEMPH_FX( new_inp_12k8_fx + L_FRAME, PREEMPH_FAC, L_FILT, &dummy_fx );
         PREEMPH_32FX( new_inp_12k8_fx + L_FRAME, sig_out + L_FRAME, PREEMPH_FAC, L_FILT, &dummy_fx );
@@ -710,12 +680,16 @@ ivas_error pre_proc_front_ivas_fx(
         preemp_len = L_FRAME + L_FILT;
         move16();
     }
-
+    st->mem_preemph_fx = shl_sat( st->mem_preemph_fx_q_inp, sub( -1, st->q_inp ) ); /*Q(-1) saturation added as float value goes above 65536 for +10 dB test (ltv48_MC512.wav and ltv48_MC51.wav) */
+    move16();
+    st->mem_preemph_DFT_fx = shl( st->mem_preemph_DFT_fx_q_inp, sub( -1, st->q_inp ) ); /*Q(-1)*/
+    move16();
+    st->mem_preemph_q = st->q_inp;
+    move16();
     maximum_abs_32_fx( sig_out, preemp_len, &max_32 );
     inp_max = s_max( extract_h( max_32 ), 1 );
 
-    shift = sub( norm_s( inp_max ), headroom );
-    Word16 Q_min;
+    Word16 shift = add( sub( norm_s( inp_max ), headroom ), st->q_inp );
     shift = s_max( shift, 0 );
     shift = s_min( shift, Q_MAX );
     minimum_fx( st->Q_max, L_Q_MEM, &Q_min );
@@ -738,12 +712,12 @@ ivas_error pre_proc_front_ivas_fx(
     st->Q_max[i] = shift;
     move16();
 
-    Copy_Scale_sig32_16( sig_out, preemp_start_idx, preemp_len, *Q_new ); /* Q_to_be_looked_into + Q_new */
+    *Q_new = add( *Q_new, Q_inp_const );
+    move16();
 
-    Scale_sig( old_inp_12k8_fx, (Word16) ( preemp_start_idx - old_inp_12k8_fx ), *Q_new ); /* Q(-1) */
+    Copy_Scale_sig32_16( sig_out, preemp_start_idx, preemp_len, sub( *Q_new, st->q_inp ) ); /* Q_new */
 
-    *Q_new = add( *Q_new, Q_to_be_looked_into );
-    move16();
+    Scale_sig( old_inp_12k8_fx, (Word16) ( preemp_start_idx - old_inp_12k8_fx ), sub( *Q_new, st->q_inp ) ); /* Q_new */
 
     cldfbScale.hb_scale = cldfbScale.lb_scale;
     move16();
@@ -768,7 +742,7 @@ ivas_error pre_proc_front_ivas_fx(
 
     IF( hStereoClassif != NULL )
     {
-        IF( GT_32( sub( st->lp_speech_fx, Etot_fx ), 25 << Q8 ) ) /*Q8*/
+        IF( GT_32( sub( st->lp_speech_fx, extract_h( Etot_fx ) ), 25 << Q8 ) ) /*Q8*/
         {
             hStereoClassif->silence_flag = 2;
             move16();
@@ -788,11 +762,11 @@ ivas_error pre_proc_front_ivas_fx(
 
     IF( hCPE != NULL )
     {
-        noise_est_pre_32fx( L_deposit_h( Etot_fx ), st->ini_frame, st->hNoiseEst, st->idchan, element_mode, hCPE->last_element_mode );
+        noise_est_pre_32fx( ( Etot_fx ), st->ini_frame, st->hNoiseEst, st->idchan, element_mode, hCPE->last_element_mode );
     }
     ELSE
     {
-        noise_est_pre_32fx( L_deposit_h( Etot_fx ), st->ini_frame, st->hNoiseEst, st->idchan, element_mode, element_mode );
+        noise_est_pre_32fx( ( Etot_fx ), st->ini_frame, st->hNoiseEst, st->idchan, element_mode, element_mode );
     }
 
     test();
@@ -804,25 +778,19 @@ ivas_error pre_proc_front_ivas_fx(
         move16();
     }
 
-    Word16 scale = add( L_norm_arr( st->hNoiseEst->bckr_fx, NB_BANDS ), st->hNoiseEst->q_bckr );
-    scale = s_min( scale, add( L_norm_arr( st->hNoiseEst->enrO_fx, NB_BANDS ), st->hNoiseEst->q_enrO ) );
-    scale = s_min( scale, fr_bands_fx_q );
-
-    scale_sig32( st->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, st->hNoiseEst->q_bckr ) );
-    st->hNoiseEst->q_bckr = scale;
-    move16();
-
-    scale_sig32( st->hNoiseEst->enrO_fx, NB_BANDS, sub( scale, st->hNoiseEst->q_enrO ) );
-    st->hNoiseEst->q_enrO = scale;
-    move16();
-
-    scale_sig32( fr_bands_fx, 2 * NB_BANDS, sub( scale, fr_bands_fx_q ) );
-    fr_bands_fx_q = scale;
-    move16();
-
     st->vad_flag = wb_vad_ivas_fx( st, fr_bands_fx, fr_bands_fx_q, &i, &i, &i, &snr_sum_he_fx, &localVAD_HE_SAD,
                                    &( st->flag_noisy_speech_snr ), NULL, NULL, -MAX_16, -MAX_16 ); //-100000f == max 16bit float
     move16();
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &st->vad_flag, sizeof( int16_t ), 1, fname( st->force_dir, "force_vad_flag.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, 1, "res/force_vad_flag.enf" );
+    }
+#endif
 
     test();
     IF( EQ_16( force_front_vad, 1 ) || EQ_16( front_vad_flag, 1 ) )
@@ -838,7 +806,7 @@ ivas_error pre_proc_front_ivas_fx(
     test();
     IF( ( hCPE != NULL && !( lr_vad_enabled && st->idchan == 0 ) ) || hSCE != NULL )
     {
-        *vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), 0, vad_hover_flag, NULL, NULL ); /* Q0 */
+        *vad_flag_dtx = ivas_dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), 0, vad_hover_flag, NULL, NULL, NULL ); /* Q0 */
         move16();
     }
     ELSE
@@ -868,22 +836,38 @@ ivas_error pre_proc_front_ivas_fx(
     /*----------------------------------------------------------------*
      * NB/WB/SWB/FB bandwidth detector
      *----------------------------------------------------------------*/
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
+
+    IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
     {
-        sf_energySum[i] = *enerBuffer_fx_exp;
-        move16();
+        FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
+        {
+            sf_energySum[i] = enerBuffer_fx_exp_buf[i];
+            move16();
+        }
+    }
+    ELSE
+    {
+        set16_fx( sf_energySum, *enerBuffer_fx_exp, CLDFB_NO_CHANNELS_MAX );
     }
 
     test();
     IF( st->idchan == 0 && NE_16( element_mode, IVAS_CPE_MDCT ) )
     {
-        Scale_sig( st->input_fx, 480, negate( Q_to_be_looked_into ) ); /*scaling from Q_to_be_looked_into to q0*/
-
-        bw_detect_fx( st, st->input_fx, NULL, enerBuffer_fx, sf_energySum, ivas_format, 0 );
+        Word16 input_fx_tmp[480];
+        Copy_Scale_sig( st->input_fx, input_fx_tmp, shr( input_frame, 1 ), negate( st->q_inp ) ); /*scaling from Q_inp_const to q0*/
 
-        Scale_sig( st->input_fx, 480, Q_to_be_looked_into ); /*scaling back to Q_to_be_looked_into*/
+        bw_detect_fx( st, input_fx_tmp, NULL, enerBuffer_fx, sf_energySum, ivas_format, 0, 0 );
     }
 
+    IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
+    {
+        maximum_fx( sf_energySum, CLDFB_NO_CHANNELS_MAX, enerBuffer_fx_exp );
+        FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
+        {
+            enerBuffer_fx[i] = L_shl( enerBuffer_fx[i], sub( sf_energySum[i], *enerBuffer_fx_exp ) );
+            move32();
+        }
+    }
 
     IF( NE_16( element_mode, IVAS_CPE_MDCT ) ) /* in MDCT stereo, set_bw_stereo() is used instead */
     {
@@ -901,55 +885,37 @@ ivas_error pre_proc_front_ivas_fx(
         move16();
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &st->bwidth, sizeof( int16_t ), 1, fname( st->force_dir, "force_bwidth.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &st->bwidth, sizeof( int16_t ), 1, 1, "res/force_bwidth.enf" );
+    }
+#endif
+
+
     /*----------------------------------------------------------------*
      * Noise energy down-ward update and total noise energy estimation
      * Long-term energies and relative frame energy updates
      * Correlation correction as a function of total noise level
      *----------------------------------------------------------------*/
 
-    noise_est_down_ivas_fx( fr_bands_fx, fr_bands_fx_q, st->hNoiseEst->bckr_fx, tmpN_fx, tmpE_fx, st->min_band, st->max_band,
-                            &st->hNoiseEst->totalNoise_fx, Etot_fx, &st->hNoiseEst->Etot_last_fx, &st->hNoiseEst->Etot_v_h2_fx );
-    q_tmpN = fr_bands_fx_q;
-    q_tmpE = fr_bands_fx_q;
-    move16();
-    move16();
+    noise_est_down_ivas_fx( fr_bands_fx, fr_bands_fx_q, st->hNoiseEst->bckr_fx, &st->hNoiseEst->q_bckr, tmpN_fx, &q_tmpN, tmpE_fx, &q_tmpE, st->min_band, st->max_band,
+                            &st->hNoiseEst->totalNoise_fx, Etot_fx, &st->hNoiseEst->Etot_last_32fx, &st->hNoiseEst->Etot_v_h2_32fx );
 
     test();
     IF( lr_vad_enabled && st->idchan == 0 )
     {
-        scale = add( L_norm_arr( hCPE->hFrontVad[0]->hNoiseEst->bckr_fx, NB_BANDS ), hCPE->hFrontVad[0]->hNoiseEst->q_bckr );
-        scale = s_min( scale, add( L_norm_arr( hCPE->hFrontVad[1]->hNoiseEst->bckr_fx, NB_BANDS ), hCPE->hFrontVad[1]->hNoiseEst->q_bckr ) );
-        scale = s_min( scale, add( L_norm_arr( fr_bands_LR_fx[0], 2 * NB_BANDS ), fr_bands_LR_fx_q[0] ) );
-        scale = s_min( scale, add( L_norm_arr( fr_bands_LR_fx[1], 2 * NB_BANDS ), fr_bands_LR_fx_q[1] ) );
-
-        scale_sig32( fr_bands_LR_fx[0], 2 * NB_BANDS, sub( scale, fr_bands_LR_fx_q[0] ) );
-        fr_bands_LR_fx_q[0] = scale;
-        move16();
-        scale_sig32( fr_bands_LR_fx[1], 2 * NB_BANDS, sub( scale, fr_bands_LR_fx_q[1] ) );
-        fr_bands_LR_fx_q[1] = scale;
-        move16();
-
-        scale_sig32( hCPE->hFrontVad[0]->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, hCPE->hFrontVad[0]->hNoiseEst->q_bckr ) );
-        hCPE->hFrontVad[0]->hNoiseEst->q_bckr = scale;
-        move16();
-        scale_sig32( hCPE->hFrontVad[1]->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, hCPE->hFrontVad[1]->hNoiseEst->q_bckr ) );
-        hCPE->hFrontVad[1]->hNoiseEst->q_bckr = scale;
-        move16();
-
-        noise_est_down_ivas_fx( fr_bands_LR_fx[0], fr_bands_LR_fx_q[0], hCPE->hFrontVad[0]->hNoiseEst->bckr_fx, tmpN_LR_fx[0], tmpE_LR_fx[0], st->min_band, st->max_band, &hCPE->hFrontVad[0]->hNoiseEst->totalNoise_fx, Etot_LR_fx[0], &hCPE->hFrontVad[0]->hNoiseEst->Etot_last_fx, &hCPE->hFrontVad[0]->hNoiseEst->Etot_v_h2_fx );
-        noise_est_down_ivas_fx( fr_bands_LR_fx[1], fr_bands_LR_fx_q[1], hCPE->hFrontVad[1]->hNoiseEst->bckr_fx, tmpN_LR_fx[1], tmpE_LR_fx[1], st->min_band, st->max_band, &hCPE->hFrontVad[1]->hNoiseEst->totalNoise_fx, Etot_LR_fx[1], &hCPE->hFrontVad[1]->hNoiseEst->Etot_last_fx, &hCPE->hFrontVad[1]->hNoiseEst->Etot_v_h2_fx );
-
-        q_tmpN_LR[0] = q_tmpE_LR[0] = scale;
-        move16();
-        move16();
-        q_tmpN_LR[1] = q_tmpE_LR[1] = scale;
-        move16();
-        move16();
+        noise_est_down_ivas_fx( fr_bands_LR_fx[0], fr_bands_LR_fx_q[0], hCPE->hFrontVad[0]->hNoiseEst->bckr_fx, &hCPE->hFrontVad[0]->hNoiseEst->q_bckr, tmpN_LR_fx[0], &q_tmpN_LR[0], tmpE_LR_fx[0], &q_tmpE_LR[0], st->min_band, st->max_band, &hCPE->hFrontVad[0]->hNoiseEst->totalNoise_fx, L_deposit_h( Etot_LR_fx[0] ), &hCPE->hFrontVad[0]->hNoiseEst->Etot_last_32fx, &hCPE->hFrontVad[0]->hNoiseEst->Etot_v_h2_32fx );
+        noise_est_down_ivas_fx( fr_bands_LR_fx[1], fr_bands_LR_fx_q[1], hCPE->hFrontVad[1]->hNoiseEst->bckr_fx, &hCPE->hFrontVad[1]->hNoiseEst->q_bckr, tmpN_LR_fx[1], &q_tmpN_LR[1], tmpE_LR_fx[1], &q_tmpE_LR[1], st->min_band, st->max_band, &hCPE->hFrontVad[1]->hNoiseEst->totalNoise_fx, L_deposit_h( Etot_LR_fx[1] ), &hCPE->hFrontVad[1]->hNoiseEst->Etot_last_32fx, &hCPE->hFrontVad[1]->hNoiseEst->Etot_v_h2_32fx );
 
         corr_shiftL_fx = correlation_shift_fx( hCPE->hFrontVad[0]->hNoiseEst->totalNoise_fx ); // Q15
         corr_shiftR_fx = correlation_shift_fx( hCPE->hFrontVad[1]->hNoiseEst->totalNoise_fx ); // Q15
     }
-    *relE_fx = sub( Etot_fx, st->lp_speech_fx ); // Q8
+    *relE_fx = sub( extract_h( Etot_fx ), st->lp_speech_fx ); // Q8
     move16();
 
     corr_shift_fx = correlation_shift_fx( st->hNoiseEst->totalNoise_fx ); /* Q15 */
@@ -964,78 +930,41 @@ ivas_error pre_proc_front_ivas_fx(
         test();
         IF( st->idchan == 0 || EQ_16( element_mode, IVAS_CPE_MDCT ) )
         {
-            test();
-            test();
-            IF( EQ_16( element_mode, IVAS_CPE_TD ) && lr_vad_enabled && band_energies_LR_fx != NULL )
+            Word16 norm;
+            norm = L_norm_arr( st->hFdCngEnc->msPeriodog_fx, NPART );
+            IF( NE_16( norm, Q31 ) )
             {
-                Word16 normmsPeriodog_fx = Q31, zero_flag = 0;
-                move16();
+                scale_sig32( st->hFdCngEnc->msPeriodog_fx, NPART, norm ); // exp:st->hFdCngEnc->msPeriodog_fx_exp-norm
+                st->hFdCngEnc->msPeriodog_fx_exp = sub( st->hFdCngEnc->msPeriodog_fx_exp, norm );
+                st->hFdCngEnc->msPeriodog_fx_exp_cldfb = sub( st->hFdCngEnc->msPeriodog_fx_exp_cldfb, norm );
+                st->hFdCngEnc->msPeriodog_fx_exp_fft = sub( st->hFdCngEnc->msPeriodog_fx_exp_fft, norm );
                 move16();
-                zero_flag = get_zero_flag( st->hFdCngEnc->msPeriodog_fx, NPART );
-                IF( zero_flag )
-                {
-                    normmsPeriodog_fx = getScaleFactor32( st->hFdCngEnc->msPeriodog_fx, NPART );
-                    move16();
-                }
-                st->hFdCngEnc->msPeriodog_fx_exp_cldfb = sub( 31, normmsPeriodog_fx );
-                st->hFdCngEnc->msPeriodog_fx_exp_fft = sub( 31, normmsPeriodog_fx );
                 move16();
                 move16();
-                Scale_sig32( st->hFdCngEnc->msPeriodog_fx, NPART, normmsPeriodog_fx ); /* exp(st->hFdCngEnc->msPeriodog_fx_exp - normmsPeriodog_fx) */
-                st->hFdCngEnc->msPeriodog_fx_exp = sub( st->hFdCngEnc->msPeriodog_fx_exp, normmsPeriodog_fx );
-                Word16 msNoiseEst_Q = Q31;
-                move16();
-                move16();
-                zero_flag = get_zero_flag( st->hFdCngEnc->msNoiseEst_fx, NPART );
-                IF( zero_flag )
-                {
-                    msNoiseEst_Q = getScaleFactor32( st->hFdCngEnc->msNoiseEst_fx, NPART );
-                }
-                Scale_sig32( st->hFdCngEnc->msNoiseEst_old_fx, NPART, msNoiseEst_Q ); /* exp(st->hFdCngEnc->msNoiseEst_old_fx_exp - msNoiseEst_Q) */
-                st->hFdCngEnc->msNoiseEst_fx_exp = sub( st->hFdCngEnc->msNoiseEst_old_fx_exp, msNoiseEst_Q );
+            }
+            norm = L_norm_arr( st->hFdCngEnc->msNoiseEst_old_fx, NPART );
+            IF( NE_16( norm, Q31 ) )
+            {
+                scale_sig32( st->hFdCngEnc->msNoiseEst_old_fx, NPART, norm ); // exp:st->hFdCngEnc->msNoiseEst_old_fx_exp-norm
+                st->hFdCngEnc->msNoiseEst_old_fx_exp = sub( st->hFdCngEnc->msNoiseEst_old_fx_exp, norm );
                 move16();
+            }
+
+            test();
+            test();
+            IF( EQ_16( element_mode, IVAS_CPE_TD ) && lr_vad_enabled && band_energies_LR_fx != NULL )
+            {
                 perform_noise_estimation_enc_ivas_fx( band_energies_LR_fx, sub( Q31, band_energies_LR_fx_q ), enerBuffer_fx, *enerBuffer_fx_exp, st->hFdCngEnc, input_Fs, hCPE );
             }
             ELSE
             {
-                Word16 normmsPeriodog_fx = Q31, zero_flag = 0;
-                move16();
-                move16();
-                shift = getScaleFactor32( band_energies_fx, 2 * NB_BANDS );
-                scale_sig32( band_energies_fx, 2 * NB_BANDS, shift );
-                q_band_energies = add( q_band_energies, shift );
-
-                zero_flag = get_zero_flag( st->hFdCngEnc->msPeriodog_fx, NPART ); /* Q0 */
-                IF( zero_flag )
+                norm = L_norm_arr( st->hFdCngEnc->hFdCngCom->periodog, PERIODOGLEN );
+                IF( NE_16( norm, Q31 ) )
                 {
-                    normmsPeriodog_fx = getScaleFactor32( st->hFdCngEnc->msPeriodog_fx, NPART );
-                }
-                st->hFdCngEnc->msPeriodog_fx_exp_cldfb = sub( 31, normmsPeriodog_fx );
-                st->hFdCngEnc->msPeriodog_fx_exp_fft = sub( 31, normmsPeriodog_fx );
-                move16();
-                move16();
-                Scale_sig32( st->hFdCngEnc->msPeriodog_fx, NPART, normmsPeriodog_fx ); /* exp(st->hFdCngEnc->msPeriodog_fx_exp - normmsPeriodog_fx)*/
-                st->hFdCngEnc->msPeriodog_fx_exp = sub( st->hFdCngEnc->msPeriodog_fx_exp, normmsPeriodog_fx );
-                move16();
-                Word16 msNoiseEst_Q = Q31;
-                move16();
-                zero_flag = get_zero_flag( st->hFdCngEnc->msNoiseEst_fx, NPART ); /* Q0 */
-                IF( zero_flag )
-                {
-                    msNoiseEst_Q = getScaleFactor32( st->hFdCngEnc->msNoiseEst_fx, NPART );
-                }
-                Scale_sig32( st->hFdCngEnc->msNoiseEst_old_fx, NPART, msNoiseEst_Q ); /* exp(st->hFdCngEnc->msNoiseEst_old_fx_exp - msNoiseEst_Q) */
-                st->hFdCngEnc->msNoiseEst_fx_exp = sub( st->hFdCngEnc->msNoiseEst_old_fx_exp, msNoiseEst_Q );
-                move16();
-                zero_flag = get_zero_flag( st->hFdCngEnc->hFdCngCom->periodog, PERIODOGLEN ); /* Q0 */
-                Word16 normmsperiodog = 31;
-                move16();
-                IF( zero_flag )
-                {
-                    normmsperiodog = getScaleFactor32( st->hFdCngEnc->hFdCngCom->periodog, PERIODOGLEN );
+                    scale_sig32( st->hFdCngEnc->hFdCngCom->periodog, PERIODOGLEN, norm ); // exp:st->hFdCngEnc->hFdCngCom->exp_cldfb_periodog-norm
+                    st->hFdCngEnc->hFdCngCom->exp_cldfb_periodog = sub( st->hFdCngEnc->hFdCngCom->exp_cldfb_periodog, norm );
+                    move16();
                 }
-                st->hFdCngEnc->hFdCngCom->exp_cldfb_periodog = sub( 31, normmsperiodog );
-                move16();
 
                 perform_noise_estimation_enc_ivas_fx( band_energies_fx, sub( Q31, q_band_energies ), enerBuffer_fx, *enerBuffer_fx_exp, st->hFdCngEnc, input_Fs, hCPE );
             }
@@ -1062,7 +991,8 @@ ivas_error pre_proc_front_ivas_fx(
         st->cng_type = LP_CNG;
         move16();
     }
-    dtx_ivas_fx( st, ivas_total_brate, *vad_flag_dtx, inp_12k8_fx, *Q_new );
+
+    dtx_ivas_fx( st, last_ivas_total_brate, ivas_total_brate, *vad_flag_dtx, inp_12k8_fx, *Q_new );
 
     test();
     test();
@@ -1150,10 +1080,8 @@ ivas_error pre_proc_front_ivas_fx(
      * LP analysis
      *----------------------------------------------------------------*/
     Word16 stab_fac_fx;
-    Word16 Q_new_loc;
     Word16 Q_r[2];
     set16_fx( Q_r, 0, 2 );
-    Q_new_loc = *Q_new;
     move16();
 
     alw_pitch_lag_12k8[0] = st->old_pitch_la; /* Q0 */
@@ -1176,8 +1104,7 @@ ivas_error pre_proc_front_ivas_fx(
         move16();
     }
 
-    analy_lp_ivas_fx( inp_12k8_fx, L_FRAME, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing_fx,
-                      INT_FS_12k8, i, Q_new_loc, Q_r );
+    analy_lp_fx( inp_12k8_fx, L_FRAME, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing_fx, INT_FS_12k8, element_mode, i, *Q_new, Q_r );
 
     FOR( Word16 idx = 0; idx < M + 1; idx++ )
     {
@@ -1201,7 +1128,7 @@ ivas_error pre_proc_front_ivas_fx(
          * to reuse the primary channel LP coefficients in the secondary channel
          *----------------------------------------------------------------*/
         Word32 speech_buff[L_FRAME + M];
-        Copy_Scale_sig_16_32( inp_12k8_fx - M, speech_buff, L_FRAME + M, Q12 );                                                                                                                                                                                                            /* Q_new + 12 */
+        Copy_Scale_sig_16_32_DEPREC( inp_12k8_fx - M, speech_buff, L_FRAME + M, Q12 );                                                                                                                                                                                                     /* Q_new + 12 */
         hCPE->hStereoTD->tdm_lp_reuse_flag = tdm_lp_comparison_fx( hCPE->hStereoTD, hCPE->hStereoClassif, st, &speech_buff[0], tdm_A_PCh_fx, A_fx, M, tdm_lsp_new_PCh_fx, lsp_new_fx, L_FRAME, L_sub( element_brate, imult3216( FRAMES_PER_SEC, nb_bits_metadata ) ), add( *Q_new, 12 ) ); /* Q0 */
         move16();
     }
@@ -1232,21 +1159,10 @@ ivas_error pre_proc_front_ivas_fx(
 
     Word16 shift1 = norm_arr( old_wsp_fx, L_WSP_MEM );
     Word16 shift2 = norm_arr( wsp_fx, L_WSP - L_WSP_MEM );
-    maximum_abs_16_fx( old_wsp_fx, L_WSP_MEM, &shift );
-    if ( !shift )
-    {
-        shift1 = Q15;
-        move16();
-    }
-    maximum_abs_16_fx( wsp_fx, L_WSP - L_WSP_MEM, &shift );
-    if ( !shift )
-    {
-        shift2 = Q15;
-        move16();
-    }
     shift = s_min( add( *q_old_wsp, shift1 ), add( Q_wsp, shift2 ) );
     shift = s_min( shift, add( norm_arr( st->mem_decim2_fx, 3 ), st->Q_old_wsp2 ) );
     shift = s_min( shift, add( norm_arr( st->old_wsp2_fx, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM ), st->Q_old_wsp2 ) );
+    shift = s_min( shift, 15 );
     scale_sig( old_wsp_fx, L_WSP_MEM, sub( shift, *q_old_wsp ) );
     scale_sig( wsp_fx, L_WSP - L_WSP_MEM, sub( shift, Q_wsp ) );
 
@@ -1312,16 +1228,8 @@ ivas_error pre_proc_front_ivas_fx(
     /*------------------------------------------------------------------*
      * Update estimated noise energy and voicing cut-off frequency
      *-----------------------------------------------------------------*/
-    {
-        // TODO: this scalings to be checked
-        scale = s_min( Q30, add( st->hNoiseEst->q_bckr, L_norm_arr( st->hNoiseEst->bckr_fx, NB_BANDS ) ) );
-        scale = s_min( scale, sub( add( fr_bands_fx_q, L_norm_arr( fr_bands_fx, 2 * NB_BANDS ) ), 4 ) );
-        scale_sig32( st->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, st->hNoiseEst->q_bckr ) );
-        scale_sig32( fr_bands_fx, 2 * NB_BANDS, sub( scale, fr_bands_fx_q ) );
-        st->hNoiseEst->q_bckr = fr_bands_fx_q = scale;
-    }
 
-    scale = s_min( Q31, s_min( add( q_tmpN, L_norm_arr( tmpN_fx, NB_BANDS ) ), add( st->hNoiseEst->q_bckr, L_norm_arr( st->hNoiseEst->bckr_fx, NB_BANDS ) ) ) );
+    Word16 scale = s_min( Q31, s_min( add( q_tmpN, L_norm_arr( tmpN_fx, NB_BANDS ) ), add( st->hNoiseEst->q_bckr, L_norm_arr( st->hNoiseEst->bckr_fx, NB_BANDS ) ) ) );
     scale = sub( scale, 1 ); // guard bits
     scale_sig32( st->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, st->hNoiseEst->q_bckr ) );
     scale_sig32( tmpN_fx, NB_BANDS, sub( scale, q_tmpN ) );
@@ -1348,9 +1256,9 @@ ivas_error pre_proc_front_ivas_fx(
     move16();
     move16();
 
-    noise_est_ivas_fx( st, old_pitch1, tmpN_fx, epsP_fx, Etot_fx, *relE_fx, corr_shift_fx, tmpE_fx, q_tmpE, fr_bands_fx, fr_bands_fx_q, cor_map_sum_fx,
-                       &ncharX_fx, &sp_div_fx, &q_sp_div, &non_staX_fx, loc_harm, lf_E_fx, q_lf_E_fx, &st->hNoiseEst->harm_cor_cnt, st->hNoiseEst->Etot_l_lp_fx,
-                       st->hNoiseEst->Etot_v_h2_fx, &st->hNoiseEst->bg_cnt, st->lgBin_E_fx, &dummy_fx, S_map_fx,
+    noise_est_ivas_fx( st, old_pitch1, tmpN_fx, epsP_fx, extract_h( Etot_fx ), *relE_fx, corr_shift_fx, tmpE_fx, q_tmpE, fr_bands_fx, fr_bands_fx_q, cor_map_sum_fx,
+                       &ncharX_fx, &sp_div_fx, &q_sp_div, &non_staX_fx, loc_harm, lf_E_fx, q_lf_E_fx, &st->hNoiseEst->harm_cor_cnt, extract_h( st->hNoiseEst->Etot_l_lp_32fx ),
+                       extract_h( st->hNoiseEst->Etot_v_h2_32fx ), &st->hNoiseEst->bg_cnt, st->lgBin_E_fx, &dummy_fx, S_map_fx,
                        hStereoClassif, NULL, st->ini_frame );
 
     test();
@@ -1393,14 +1301,14 @@ ivas_error pre_proc_front_ivas_fx(
         noise_est_ivas_fx( st, old_pitch1, tmpN_LR_fx[0], epsP_fx, Etot_LR_fx[0], sub( Etot_LR_fx[0], hCPE->hFrontVad[0]->lp_speech_fx ), corr_shiftL_fx,
                            tmpE_LR_fx[0], q_tmpE_LR[0], fr_bands_LR_fx[0], fr_bands_LR_fx_q[0], &cor_map_sum_LR_fx[0], &ncharX_LR_fx, &sp_div_LR_fx, &q_sp_div_LR,
                            &non_staX_LR_fx, loc_harmLR_fx, lf_E_LR_fx[0], lf_E_LR_fx_q, &hCPE->hFrontVad[0]->hNoiseEst->harm_cor_cnt,
-                           hCPE->hFrontVad[0]->hNoiseEst->Etot_l_lp_fx, hCPE->hFrontVad[0]->hNoiseEst->Etot_v_h2_fx, &hCPE->hFrontVad[0]->hNoiseEst->bg_cnt,
+                           extract_h( hCPE->hFrontVad[0]->hNoiseEst->Etot_l_lp_32fx ), extract_h( hCPE->hFrontVad[0]->hNoiseEst->Etot_v_h2_32fx ), &hCPE->hFrontVad[0]->hNoiseEst->bg_cnt,
                            st->lgBin_E_fx, &dummy_fx, S_map_LR_fx, NULL, hCPE->hFrontVad[0], hCPE->hFrontVad[0]->ini_frame );
 
         /* Note: the index [0] in the last argument is intended, the ini_frame counter is only maintained in the zero-th channel's VAD handle */
         noise_est_ivas_fx( st, old_pitch1, tmpN_LR_fx[1], epsP_fx, Etot_LR_fx[1], sub( Etot_LR_fx[1], hCPE->hFrontVad[1]->lp_speech_fx ), corr_shiftR_fx,
                            tmpE_LR_fx[1], q_tmpE_LR[1], fr_bands_LR_fx[1], fr_bands_LR_fx_q[1], &cor_map_sum_LR_fx[1], &ncharX_LR_fx, &sp_div_LR_fx, &q_sp_div_LR,
                            &non_staX_LR_fx, loc_harmLR_fx, lf_E_LR_fx[1], lf_E_LR_fx_q, &hCPE->hFrontVad[1]->hNoiseEst->harm_cor_cnt,
-                           hCPE->hFrontVad[1]->hNoiseEst->Etot_l_lp_fx, hCPE->hFrontVad[1]->hNoiseEst->Etot_v_h2_fx, &hCPE->hFrontVad[1]->hNoiseEst->bg_cnt,
+                           extract_h( hCPE->hFrontVad[1]->hNoiseEst->Etot_l_lp_32fx ), extract_h( hCPE->hFrontVad[1]->hNoiseEst->Etot_v_h2_32fx ), &hCPE->hFrontVad[1]->hNoiseEst->bg_cnt,
                            st->lgBin_E_fx, &dummy_fx, S_map_LR_fx, NULL, hCPE->hFrontVad[1], hCPE->hFrontVad[0]->ini_frame );
     }
 
@@ -1418,20 +1326,33 @@ ivas_error pre_proc_front_ivas_fx(
      * Find spectral tilt
      * UC and VC frame selection
      *-----------------------------------------------------------------*/
+
     scale = s_min( Q31, s_min( add( st->hNoiseEst->q_bckr, L_norm_arr( st->hNoiseEst->bckr_fx, NB_BANDS ) ), add( fr_bands_fx_q, L_norm_arr( fr_bands_fx, 2 * NB_BANDS ) ) ) );
     scale_sig32( fr_bands_fx, 2 * NB_BANDS, sub( scale, fr_bands_fx_q ) );
-    scale_sig32( st->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, st->hNoiseEst->q_bckr ) );
-    st->hNoiseEst->q_bckr = fr_bands_fx_q = scale;
-    move16();
+    Copy_Scale_sig32( st->hNoiseEst->bckr_fx, bckr_temp, NB_BANDS, sub( scale, st->hNoiseEst->q_bckr ) );
+    fr_bands_fx_q = scale;
     move16();
 
-    find_tilt_ivas_fx( fr_bands_fx, fr_bands_fx_q, st->hNoiseEst->bckr_fx, st->hNoiseEst->q_bckr, ee_fx, st->pitch, st->voicing_fx, lf_E_fx, q_lf_E_fx,
+    find_tilt_ivas_fx( fr_bands_fx, fr_bands_fx_q, bckr_temp, scale, ee_fx, st->pitch, st->voicing_fx, lf_E_fx, q_lf_E_fx,
                        corr_shift_fx, st->input_bwidth, st->max_band, hp_E_fx, MODE1, &( st->bckr_tilt_lt ), st->Opt_SC_VBR );
 
-    st->coder_type = find_uv_ivas_fx( st, pitch_fr_fx, voicing_fr_fx, inp_12k8_fx, ee_fx, &dE1X_fx, corr_shift_fx, *relE_fx, Etot_fx, hp_E_fx,
+    st->coder_type = find_uv_ivas_fx( st, pitch_fr_fx, voicing_fr_fx, inp_12k8_fx, ee_fx, &dE1X_fx, corr_shift_fx, *relE_fx, extract_h( Etot_fx ), hp_E_fx,
                                       &flag_spitch, last_core_orig, hStereoClassif, *Q_new /*q_inp_12k8*/, fr_bands_fx_q ); // Q0
+    Copy_Scale_sig_16_32_no_sat( st->lgBin_E_fx, st->Bin_E_fx, L_FFT / 2, sub( st->q_Bin_E, Q7 ) );
+
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &st->coder_type, sizeof( int16_t ), 1, fname( st->force_dir, "force_coder_type.enf", -1, -1, -1 ) );
+        dbgread( &st->coder_type_raw, sizeof( int16_t ), 1, fname( st->force_dir, "force_coder_type_raw.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &st->coder_type, sizeof( int16_t ), 1, 1, "res/force_coder_type.enf" );
+        dbgwrite( &st->coder_type_raw, sizeof( int16_t ), 1, 1, "res/force_coder_type_raw.enf" );
+    }
+#endif
 
-    Copy_Scale_sig_16_32( st->lgBin_E_fx, st->Bin_E_fx, L_FFT / 2, sub( st->q_Bin_E, Q7 ) );
 
     /*-----------------------------------------------------------------*
      * channel aware mode configuration                                *
@@ -1447,7 +1368,7 @@ ivas_error pre_proc_front_ivas_fx(
      * TC frame selection
      *-----------------------------------------------------------------*/
 
-    st->clas = signal_clas_fx( st, inp_12k8_fx, ee_fx, *relE_fx, L_look, tdm_SM_last_clas ); /* Q0 */
+    st->clas = signal_clas_ivas_fx( st, inp_12k8_fx, ee_fx, *relE_fx, L_look, tdm_SM_last_clas ); /* Q0 */
     move16();
 
     select_TC_fx( MODE1, st->tc_cnt, &st->coder_type, st->localVAD );
@@ -1477,7 +1398,7 @@ ivas_error pre_proc_front_ivas_fx(
         move16();
         stereo_classifier_features_ivas_fx( hStereoClassif, st->idchan, element_mode, localVAD_HE_SAD, lsf_new_fx, epsP_fx,
                                             st->pitch, st->voicing_fx, *cor_map_sum_fx, non_staX_fx, sp_div_fx,
-                                            st->clas, sub( 31, *epsP_fx_q ), ( 15 - Q8 ) /* exp of cor_map_sum */, ( 15 - Q8 ) /* exp of non_staX_fx */, sub( 15, q_sp_div ) );
+                                            st->clas, sub( 31, *epsP_fx_q ), ( 31 - Q8 ) /* exp of cor_map_sum */, ( 31 - Q8 ) /* exp of non_staX_fx */, sub( 15, q_sp_div ) );
     }
 
     /*----------------------------------------------------------------*
@@ -1489,7 +1410,18 @@ ivas_error pre_proc_front_ivas_fx(
     scale_sig32( PS_fx, 128, shift );
     Qfact_PS = add( Qfact_PS, shift );
 
-    smc_dec = ivas_smc_gmm_fx( st, hStereoClassif, localVAD_HE_SAD, Etot_fx, lsp_new_fx, *cor_map_sum_fx /*Q8*/, epsP_fx, PS_fx, non_staX_fx, *relE_fx, &high_lpn_flag, flag_spitch, Qfact_PS, *epsP_fx_q, hSpMusClas->past_PS_Q ); /* Q0 */
+    smc_dec = ivas_smc_gmm_fx( st, hStereoClassif, localVAD_HE_SAD, extract_h( Etot_fx ), lsp_new_fx, *cor_map_sum_fx /*Q8*/, epsP_fx, PS_fx, non_staX_fx, *relE_fx, &high_lpn_flag, flag_spitch, Qfact_PS, *epsP_fx_q, hSpMusClas->past_PS_Q ); /* Q0 */
+
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &smc_dec, sizeof( int16_t ), 1, fname( st->force_dir, "force_smc_dec_loc1.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc1.enf" );
+    }
+#endif
 
 #ifdef DEBUGGING
     if ( st->idchan == 0 )
@@ -1512,7 +1444,7 @@ ivas_error pre_proc_front_ivas_fx(
      * Update of old per-band energy spectrum
      *----------------------------------------------------------------*/
 
-    ivas_long_enr_fx( st, Etot_fx, localVAD_HE_SAD, high_lpn_flag, NULL, 1, NULL, NULL );
+    ivas_long_enr_fx( st, extract_h( Etot_fx ), localVAD_HE_SAD, high_lpn_flag, NULL, 1, NULL, NULL );
 
     Copy32( fr_bands_fx + NB_BANDS, st->hNoiseEst->enrO_fx, NB_BANDS ); /* fr_bands_fx_q */
     st->hNoiseEst->q_enrO = fr_bands_fx_q;
@@ -1586,12 +1518,6 @@ ivas_error pre_proc_front_ivas_fx(
                 move16();
             }
 
-            IF( flag_16k_smc )
-            {
-                Scale_sig( st->input_fx, input_frame, sub( -1, st->q_inp ) ); /* Q(-1) */
-                st->q_inp = -1;
-                move16();
-            }
             /* these are for ivas_acelp_tcx20_switching_fx */
             Scale_sig32( st->hTcxEnc->spectrum_long_fx, N_MAX, sub( st->hTcxEnc->spectrum_long_e, 16 ) ); /* Q(-1) */
             st->hTcxEnc->spectrum_long_e = 16;
@@ -1620,6 +1546,8 @@ ivas_error pre_proc_front_ivas_fx(
                 st->exp_mem_preemph_enc = sub( Q15, Q_old_inp_16k );
                 move16();
                 Scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, sub( Q_old_inp_16k, sub( Q15, st->exp_buf_wspeech_enc ) ) ); /* Q15 - Q_old_inp_16k */
+                st->mem_wsp_enc = shl( st->mem_wsp_enc, sub( Q_old_inp_16k, sub( Q15, st->exp_buf_wspeech_enc ) ) );                                                   // Q_old_inp_16k
+                move16();
                 st->exp_buf_wspeech_enc = sub( Q15, Q_old_inp_16k );
                 move16();
                 Scale_sig( st->buf_speech_enc_pe, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( Q_old_inp_16k, sub( Q15, st->exp_buf_speech_enc_pe ) ) ); /* Q15 - Q_old_inp_16k */
@@ -1635,7 +1563,7 @@ ivas_error pre_proc_front_ivas_fx(
                 error = ivas_compute_core_buffers_fx( st, NULL, old_inp_16k_fx, NULL, input_frame, IVAS_SCE /*last_element_mode*/, INT_FS_16k /*sr_core_tmp*/, ener_fx,
                                                       A_fx, Aw_fx,
                                                       epsP_fx,
-                                                      lsp_new_fx, lsp_mid_fx, Q_old_inp_16k, Q_r, Q_new, 1 );
+                                                      lsp_new_fx, lsp_mid_fx, Q_old_inp_16k, Q_r, Q_new );
                 IF( NE_32( error, IVAS_ERR_OK ) )
                 {
                     return error;
@@ -1643,16 +1571,19 @@ ivas_error pre_proc_front_ivas_fx(
                 *epsP_fx_q = add( Q_r[0], 1 );
                 move16();
 
-                st->mem_wsp_enc = shr_r( st->mem_wsp_enc, *Q_new ); // Q_new - 1 -> Q-1
+                st->mem_wsp_enc = shl( st->mem_wsp_enc, sub( 0, sub( Q15, st->exp_buf_wspeech_enc ) ) ); // Q0
                 move16();
 
-                *Q_new = add( *Q_new, Q_to_be_looked_into ); // actual Q_new
+                *Q_new = add( *Q_new, Q_inp_const ); // actual Q_new
                 move16();
                 Scale_sig( old_inp_12k8_fx, L_INP_12k8, sub( *Q_new, Q_old_inp_12k8 ) ); /* Q_new */
 
                 Scale_sig( st->buf_speech_enc, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( 0, sub( Q15, st->exp_buf_speech_enc ) ) ); /* Q0 */
                 st->exp_buf_speech_enc = Q15;
                 move16();
+                Scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, sub( 0, sub( Q15, st->exp_buf_wspeech_enc ) ) ); /* Q0 */
+                st->exp_buf_wspeech_enc = Q15;
+                move16();
                 smc_dec = ivas_acelp_tcx20_switching_fx( st, st->speech_enc, 0, st->wspeech_enc, non_staX_fx, pitch_fr_fx, voicing_fr_fx, currFlatness_fx, lsp_mid_fx, stab_fac_fx, res_cod_SNR_M_fx, res_cod_SNR_M_fx_e, flag_16k_smc ); /* Q0 */
             }
             ELSE
@@ -1694,9 +1625,26 @@ ivas_error pre_proc_front_ivas_fx(
         st->q_Bin_E = add( *Q_new, Q_SCALE - 2 );
         move16();
         /* 2nd stage speech/music classification (ACELP/GSC/TCX core selection) */
-        ivas_smc_mode_selection_fx( st, element_brate, smc_dec, *relE_fx, Etot_fx, attack_flag, inp_12k8_fx, *Q_new, S_map_fx, flag_spitch );
+        ivas_smc_mode_selection_fx( st, element_brate, smc_dec, *relE_fx, extract_h( Etot_fx ), attack_flag, inp_12k8_fx, *Q_new, S_map_fx, flag_spitch );
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &smc_dec, sizeof( int16_t ), 1, fname( st->force_dir, "force_smc_dec_loc2.enf", -1, -1, -1 ) );
+        dbgread( &st->sp_aud_decision0, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision0.enf", -1, -1, -1 ) );
+        dbgread( &st->sp_aud_decision1, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision1.enf", -1, -1, -1 ) );
+        dbgread( &st->sp_aud_decision2, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision2.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc2.enf" );
+        dbgwrite( &st->sp_aud_decision0, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision0.enf" );
+        dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision1.enf" );
+        dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision2.enf" );
+    }
+#endif
+
     /*----------------------------------------------------------------*
      * Final VAD correction (when HE-SAD is used instead of the normal VAD,
      * rewrite the VAD flag by VAD flag with DTX hangover for further processing)
@@ -1717,9 +1665,8 @@ ivas_error pre_proc_front_ivas_fx(
     st->exp_old_inp_12k8 = sub( Q15, add( *Q_new, shift ) );
     move16();
 
-    // Scale_sig( old_inp_12k8_fx, L_INP_12k8, negate( add( *Q_new, 1 ) ) );
 
-    *Q_new = sub( *Q_new, Q_to_be_looked_into ); // ivas_core_enc will assume inp signal (12k8 and 16k) in Q_new - 1
+    *Q_new = sub( *Q_new, Q_inp_const ); // ivas_core_enc will assume inp signal (12k8 and 16k) in Q_new - 1
     move16();
 
     free( mem_decim_dummy_fx );
@@ -1728,69 +1675,6 @@ ivas_error pre_proc_front_ivas_fx(
     return error;
 }
 
-#ifdef IVAS_FIXED_ENC
-/*-------------------------------------------------------------------*
- * calculate_energy_buffer_fx()
- *
- * calculate DFT-based energies
- *--------------------------------------------------------------------*/
-
-static void calculate_energy_buffer_fx(
-    CPE_ENC_HANDLE hCPE,        /* i  : CPE encoder structure       */
-    Word64 enerBuffer_dft_fx[], /* o  : energy buffer               */
-    Word16 *enerBuffer_dft_q_fx,
-    const Word16 no_channels, /* i  : no. of used CLDFB channels  */
-    const Word32 input_Fs     /* i  : input sampling rate         */
-)
-{
-    Word16 i, j;
-    Word64 nrg_DMX_fx[CLDFB_NO_CHANNELS_MAX];
-    Word64 *p_nrg_DMX_fx;
-    Word32 *pDFT_DMX_fx;
-    Word16 *pDFT_DMX_q_fx;
-    Word32 chan_width_bins_fx;
-    Word16 band_res_dft_fx, chan_width_f_fx, start, stop;
-
-    Word16 temp_q1 = norm_l( input_Fs ) - 1;
-    Word16 temp_q2 = norm_s( hCPE->hStereoDft->NFFT );
-
-    band_res_dft_fx = div_l( L_shl( input_Fs, temp_q1 ), shl( hCPE->hStereoDft->NFFT, temp_q2 ) );
-    chan_width_f_fx = 24000 / CLDFB_NO_CHANNELS_MAX;
-    chan_width_bins_fx = L_shl( (Word32) div_s( chan_width_f_fx, band_res_dft_fx ), ( sub( add( temp_q1, 1 ), temp_q2 ) ) ); // Q16
-
-    pDFT_DMX_fx = hCPE->hStereoDft->DFT_fx[0];
-    pDFT_DMX_q_fx = hCPE->hStereoDft->DFT_q_fx;
-    start = 1;
-    p_nrg_DMX_fx = nrg_DMX_fx;
-
-    *p_nrg_DMX_fx = Mpy_32_32( pDFT_DMX_fx[0], pDFT_DMX_fx[0] );
-
-    FOR( i = 0; i < no_channels; i++ )
-    {
-        stop = (Word16) ( L_add( Mpy_32_16_1( chan_width_bins_fx, add( i, 1 ) ), 1 ) >> 1 );
-        FOR( j = start; j < stop; j++ )
-        {
-            *p_nrg_DMX_fx = W_add( *p_nrg_DMX_fx, Mpy_32_32( pDFT_DMX_fx[2 * j], pDFT_DMX_fx[2 * j] ) );
-            *p_nrg_DMX_fx = W_add( *p_nrg_DMX_fx, Mpy_32_32( pDFT_DMX_fx[2 * j + 1], pDFT_DMX_fx[2 * j + 1] ) );
-        }
-        enerBuffer_dft_q_fx[i] = 2 * pDFT_DMX_q_fx[i] - 31;
-        start = stop;
-        p_nrg_DMX_fx++;
-    }
-
-    FOR( i = 0; i < no_channels; i++ ) /* Consider only used channels, dependent on Fs */
-    {
-        enerBuffer_dft_fx[i] = nrg_DMX_fx[i] / 3;
-    }
-
-    /* Set remaining entries of enerBuffer to zero */
-    FOR( ; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        enerBuffer_dft_fx[i] = 0;
-    }
-    return;
-}
-#endif
 /*-------------------------------------------------------------------*
  * calculate_energy_buffer()
  *
@@ -1801,21 +1685,16 @@ static void calculate_energy_buffer_ivas_fx(
     Word32 enerBuffer_dft_fx[], /* o  : energy buffer()				exp(enerBuffer_dft_e)*/
     const Word16 no_channels,   /* i  : no. of used CLDFB channels  Q0*/
     const Word32 input_Fs,      /* i  : input sampling rate         Q0*/
-    Word16 *enerBuffer_dft_e )
+    Word16 enerBuffer_dft_e[] )
 {
-    Word16 i, j;
+    Word16 i, j, guard_bits;
     Word64 nrg_DMX_fx[CLDFB_NO_CHANNELS_MAX];
     Word64 *p_nrg_DMX_fx;
     Word32 *pDFT_DMX_fx; /*q_DFT_DMX_fx*/
     Word32 chan_width_bins_fx;
     Word16 band_res_dft_fx, chan_width_f_fx, start, stop;
-    Word16 norm_nrg_DMX_fx;
-    Word64 max_abs_nrg_DMX_fx;
-    Flag overflow = 0;
-    move32();
+    Word16 norm_nrg_DMX_fx[CLDFB_NO_CHANNELS_MAX];
 
-    max_abs_nrg_DMX_fx = 0;
-    move64();
     Word16 temp_q1 = sub( norm_l( input_Fs ), 1 );
     Word16 temp_q2 = norm_s( hCPE->hStereoDft->NFFT );
 
@@ -1829,47 +1708,46 @@ static void calculate_energy_buffer_ivas_fx(
     start = 1;
     move16();
 
-    pDFT_DMX_fx = hCPE->hStereoDft->DFT_fx[0]; /*q_DFT_DMX_fx = 31-hCPE->hStereoDft->DFT_fx_e[0]*/
+    guard_bits = add( find_guarded_bits_fx( extract_h( chan_width_bins_fx ) ), 1 ); /* Q0 */
+
+    pDFT_DMX_fx = hCPE->hStereoDft->DFT_fx[0]; /* q_DFT_DMX_fx = 31 - hCPE->hStereoDft->DFT_fx_e[0] */
     p_nrg_DMX_fx = nrg_DMX_fx;
 
-    *p_nrg_DMX_fx = Mpy_32_32( pDFT_DMX_fx[0], pDFT_DMX_fx[0] ); /*2 * q_DFT_DMX_fx -31 */
+    *p_nrg_DMX_fx = W_shr( W_mult_32_32( pDFT_DMX_fx[0], pDFT_DMX_fx[0] ), guard_bits ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits */
     move64();
 
     FOR( i = 0; i < no_channels; i++ )
     {
-        stop = extract_l( L_shr( L_add( Mpy_32_16_1( chan_width_bins_fx, add( i, 1 ) ), 1 ), 1 ) );
+        stop = extract_l( L_shr( L_add( Mpy_32_16_1( chan_width_bins_fx, add( i, 1 ) ), 1 ), 1 ) ); /* Q0 */
         FOR( j = start; j < stop; j++ )
         {
-            *p_nrg_DMX_fx = W_add( *p_nrg_DMX_fx, Mpy_32_32( pDFT_DMX_fx[2 * j], pDFT_DMX_fx[2 * j] ) ); /*2 * q_DFT_DMX_fx -31 */
+            *p_nrg_DMX_fx = W_add( *p_nrg_DMX_fx, W_shr( W_mult_32_32( pDFT_DMX_fx[2 * j], pDFT_DMX_fx[2 * j] ), guard_bits ) ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits */
             move64();
-            *p_nrg_DMX_fx = W_add( *p_nrg_DMX_fx, Mpy_32_32( pDFT_DMX_fx[2 * j + 1], pDFT_DMX_fx[2 * j + 1] ) );
+            *p_nrg_DMX_fx = W_add( *p_nrg_DMX_fx, W_shr( W_mult_32_32( pDFT_DMX_fx[2 * j + 1], pDFT_DMX_fx[2 * j + 1] ), guard_bits ) ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits */
             move64();
-            // 2 * DFT_fx_e
-        }
-        IF( GT_64( W_abs( *p_nrg_DMX_fx ), max_abs_nrg_DMX_fx ) )
-        {
-            max_abs_nrg_DMX_fx = W_abs( *p_nrg_DMX_fx );
         }
+        norm_nrg_DMX_fx[i] = W_norm( W_abs( *p_nrg_DMX_fx ) );
+        move16();
         start = stop;
         move16();
         p_nrg_DMX_fx++;
     }
 
-    norm_nrg_DMX_fx = W_norm( max_abs_nrg_DMX_fx );
     FOR( i = 0; i < no_channels; i++ ) /* Consider only used channels, dependent on Fs */
     {
-        enerBuffer_dft_fx[i] = W_extract_h( W_shl_o( nrg_DMX_fx[i], norm_nrg_DMX_fx, &overflow ) ) / 3; /*q_enerBuffer_dft_fx=2 * q_DFT_DMX_fx -31+ norm_nrg_DMX_fx -32*/
+        enerBuffer_dft_fx[i] = Mpy_32_16_1( W_extract_h( W_shl( nrg_DMX_fx[i], norm_nrg_DMX_fx[i] ) ), 10923 /* 1/3 in Q15 */ ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits + norm_nrg_DMX_fx[i] - 32 */
         move32();
+        enerBuffer_dft_e[i] = sub( add( shl( hCPE->hStereoDft->DFT_fx_e[0], 1 ), guard_bits ), norm_nrg_DMX_fx[i] );
+        move16();
     }
 
-    *enerBuffer_dft_e = sub( add( 32, shl( hCPE->hStereoDft->DFT_fx_e[0], 1 ) ), norm_nrg_DMX_fx ); /*31-q_enerBuffer_dft_fx*/
-    move16();
-
     /* Set remaining entries of enerBuffer to zero */
     FOR( ; i < CLDFB_NO_CHANNELS_MAX; i++ )
     {
         enerBuffer_dft_fx[i] = 0;
         move32();
+        enerBuffer_dft_e[i] = 0;
+        move16();
     }
     return;
 }
diff --git a/lib_enc/ivas_core_pre_proc.c b/lib_enc/ivas_core_pre_proc_fx.c
similarity index 90%
rename from lib_enc/ivas_core_pre_proc.c
rename to lib_enc/ivas_core_pre_proc_fx.c
index 8c2c31adb023e7ded5165a82b24593b48b56e3dd..938ab9964f486fa5d721c01f325c3b217d1617c2 100644
--- a/lib_enc/ivas_core_pre_proc.c
+++ b/lib_enc/ivas_core_pre_proc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,12 +34,10 @@
 #include "options.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx_enc.h"
 #include "basop_util.h"
@@ -185,7 +183,7 @@ ivas_error pre_proc_ivas_fx(
     }
     IF( st->hFdCngEnc != NULL && NE_16( st->element_mode, IVAS_CPE_MDCT ) && ( ( NE_16( st->hFdCngEnc->hFdCngCom->frameSize, st->L_frame ) ) || ( NE_16( st->hFdCngEnc->hFdCngCom->CngBandwidth, st->input_bwidth ) ) ) )
     {
-        configureFdCngEnc_ivas_fx( st->hFdCngEnc, max( st->input_bwidth, WB ), flag_1 );
+        configureFdCngEnc_ivas_fx( st->hFdCngEnc, s_max( st->input_bwidth, WB ), flag_1 );
     }
 
     if ( st->ini_frame == 0 )
@@ -284,7 +282,7 @@ ivas_error pre_proc_ivas_fx(
     }
     ELSE IF( GT_32( st->total_brate, MAX_GSC_INACTIVE_BRATE ) && ( ( st->vad_flag == 0 && GE_16( st->bwidth, SWB ) && GE_16( st->max_bwidth, SWB ) ) || ( st->localVAD == 0 && ( LE_16( st->bwidth, WB ) || LE_16( st->max_bwidth, WB ) ) ) ) )
     {
-        /* inactive frames will be coded by AVQ technology */
+        /* inactive frames will be coded by AVQ technology (exceptionally it can be later rewritten to GSC technology in ivas_combined_format_brate_sanity()) */
         st->coder_type = INACTIVE;
         move16();
     }
@@ -529,7 +527,7 @@ ivas_error pre_proc_ivas_fx(
         sr_core_tmp = L_max( INT_FS_16k, st->sr_core );
     }
 
-    L_look = NS2SA( sr_core_tmp, ACELP_LOOK_NS ); /* lookahead at other sampling rate (16kHz, 25.6kHz, 32kHz)	Q0*/
+    L_look = NS2SA_FX2( sr_core_tmp, ACELP_LOOK_NS ); /* lookahead at other sampling rate (16kHz, 25.6kHz, 32kHz)	Q0*/
     move16();
 
     inp_16k_fx = old_inp_16k_fx + L_INP_MEM - L_look;
@@ -567,26 +565,44 @@ ivas_error pre_proc_ivas_fx(
     Scale_sig( st->buf_speech_enc_pe, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( Q_old_inp_16k, sub( Q15, st->exp_buf_speech_enc_pe ) ) ); /* Q15 - Q_old_inp_16k */
     st->exp_buf_speech_enc_pe = sub( Q15, Q_old_inp_16k );
     move16();
-    Scale_sig( st->input_fx, input_frame, sub( -1, st->q_inp ) );
-    st->q_inp = -1;
-    move16();
     Scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, sub( Q_old_inp_16k, sub( Q15, st->exp_buf_wspeech_enc ) ) ); /* Q15 - Q_old_inp_16k */
+    st->mem_wsp_enc = shl( st->mem_wsp_enc, sub( Q_old_inp_16k, sub( Q15, st->exp_buf_wspeech_enc ) ) );                                                   // Q_old_inp_16k
+    move16();
     st->exp_buf_wspeech_enc = sub( Q15, Q_old_inp_16k );
     move16();
-    Word16 Q_old_inp_128k = *Q_new;
+    Word16 Q_inp_12k8 = *Q_new;
+    move16();
+    Word16 Q_inp_16k = *Q_new;
     move16();
     IF( !flag_16k_smc )
     {
         error = ivas_compute_core_buffers_fx( st, &inp_16k_fx, old_inp_16k_fx, new_inp_resamp16k_fx, input_frame, last_element_mode, sr_core_tmp, ener_fx,
                                               A_fx, Aw_fx,
                                               epsP_fx,
-                                              lsp_new_fx, lsp_mid_fx, Q_old_inp_16k, Q_r, Q_new, 0 );
+                                              lsp_new_fx, lsp_mid_fx, Q_old_inp_16k, Q_r, &Q_inp_16k );
+        IF( GT_16( Q_inp_16k, Q_inp_12k8 ) )
+        {
+            Scale_sig( old_inp_16k_fx, L_INP, sub( Q_inp_12k8, Q_inp_16k ) );
+            *Q_new = Q_inp_12k8;
+        }
+        ELSE
+        {
+            Scale_sig( old_inp_12k8_fx, L_INP_12k8, sub( Q_inp_16k, Q_inp_12k8 ) );
+            *Q_new = Q_inp_16k;
+        }
+        move16();
+
         IF( error != IVAS_ERR_OK )
         {
             return error;
         }
-        *epsP_fx_q = add( Q_r[0], 1 );
-        move16();
+
+        test();
+        IF( EQ_16( st->L_frame, L_FRAME16k ) && NE_16( element_mode, IVAS_CPE_MDCT ) )
+        {
+            *epsP_fx_q = add( Q_r[0], 1 );
+            move16();
+        }
     }
     test();
     IF( !( EQ_16( st->L_frame, L_FRAME16k ) && NE_16( element_mode, IVAS_CPE_MDCT ) ) )
@@ -617,7 +633,7 @@ ivas_error pre_proc_ivas_fx(
 
     IF( flag_16k_smc )
     {
-        Copy( st->buf_speech_enc + L_FRAME16k, new_inp_resamp16k_fx, L_FRAME16k ); /* Q_new - 1 */
+        Copy( st->buf_speech_enc + L_FRAME16k, new_inp_resamp16k_fx, L_FRAME16k ); /* Q_old_inp_16k */
     }
 
     /*-----------------------------------------------------------------*
@@ -632,14 +648,11 @@ ivas_error pre_proc_ivas_fx(
     /* set the pointer of the current frame for the ACELP core */
     IF( EQ_16( st->L_frame, L_FRAME ) )
     {
-        *inp_fx = inp_12k8_fx; /* Q_old_inp_128k */
-        *Q_new = Q_old_inp_128k;
-        move16();
+        *inp_fx = inp_12k8_fx; /* Q_old_inp_12k8 */
     }
     ELSE
     {
         *inp_fx = inp_16k_fx;
-        Scale_sig( old_inp_12k8_fx, L_INP_12k8, sub( *Q_new, Q_old_inp_128k ) );
     }
 
     /* Update VAD hangover frame counter in active frames */
@@ -692,14 +705,12 @@ ivas_error ivas_compute_core_buffers_fx(
     Word16 lsp_mid_fx[M],                  /* i/o: LSPs in the middle of the frame          Q15*/
     Word16 Q_old_inp_16k,
     Word16 Q_r[2],
-    Word16 *Q_new,
-    Word16 downscale_buf_speech_enc_pe /* Q0 */
-)
+    Word16 *Q_new )
 {
     Word16 *inp_16k_fx, *new_inp_16k_fx;
     Word16 delay, element_mode;
     Word16 temp1F_icatdmResampBuf_fx[L_FILT_MAX]; /* temp buffers for ICA TDM resamplers */
-    Word16 mem_decim16k_dummy_fx[2 * L_FILT_MAX];
+    Word16 mem_decim16k_dummy_fx[2 * L_FILT_MAX], input_buf_fx[L_FRAME48k * 2];
     Word16 *signal_in_fx;
     Word16 lMemRecalc, lMemRecalc_16k, L_frame_tmp, L_look;
     Word32 input_Fs;
@@ -716,12 +727,15 @@ ivas_error ivas_compute_core_buffers_fx(
     Word16 *preemp_start_idx = NULL;
     Word32 sig_out[960], max_32;
     /*Word16 Q_exp, Q_wsp_exp*/;
-#ifdef MSAN_FIX
     set16_fx( new_inp_resamp16k_fx, 0, L_FRAME16k );
-#endif
     set16_fx( epsP_h, 0, M + 1 );
     set16_fx( epsP_l, 0, M + 1 );
-    signal_in_fx = st->input_fx; /* st->q_inp */
+    set16_fx( input_buf_fx, 0, L_FRAME48k * 2 );
+
+    Copy_Scale_sig( st->input_fx - input_frame, input_buf_fx, input_frame, sub( -1, st->q_old_inp ) );
+    Copy_Scale_sig( st->input_fx, input_buf_fx + input_frame, input_frame, sub( -1, st->q_inp ) );
+
+    signal_in_fx = &input_buf_fx[input_frame]; /* st->q_inp */
 
     input_Fs = st->input_Fs; /* Q0 */
     move32();
@@ -736,7 +750,7 @@ ivas_error ivas_compute_core_buffers_fx(
     {
         lMemRecalc_16k = NS2SA( INT_FS_16k, L_MEM_RECALC_NS );
         move16();
-        lMemRecalc = NS2SA( input_Fs, L_MEM_RECALC_NS );
+        lMemRecalc = NS2SA_FX2( input_Fs, L_MEM_RECALC_NS );
         move16();
     }
 
@@ -754,7 +768,7 @@ ivas_error ivas_compute_core_buffers_fx(
         L_frame_tmp = s_max( L_FRAME16k, st->L_frame );
     }
 
-    L_look = NS2SA( sr_core, ACELP_LOOK_NS ); /* lookahead at other sampling rate (16kHz, 25.6kHz, 32kHz) */
+    L_look = NS2SA_FX2( sr_core, ACELP_LOOK_NS ); /* lookahead at other sampling rate (16kHz, 25.6kHz, 32kHz) */
     move16();
 
     new_inp_16k_fx = old_inp_16k_fx + L_INP_MEM; /* pointer to new samples of the input signal in 16kHz core */
@@ -764,7 +778,7 @@ ivas_error ivas_compute_core_buffers_fx(
     test();
     IF( EQ_16( element_mode, IVAS_CPE_TD ) || EQ_16( element_mode, IVAS_SCE ) )
     {
-        new_inp_16k_fx -= NS2SA( sr_core, DELAY_FIR_RESAMPL_NS );
+        new_inp_16k_fx -= NS2SA_FX2( sr_core, DELAY_FIR_RESAMPL_NS );
     }
 
     IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
@@ -803,8 +817,8 @@ ivas_error ivas_compute_core_buffers_fx(
 
             Copy( st->mem_decim16k_fx, mem_decim16k_dummy_fx, 2 * L_FILT_MAX ); /* Q(-1) */
             set16_fx( temp1F_icatdmResampBuf_fx, 0, L_FILT_MAX );
-            size_modified = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_16k_fx + NS2SA( sr_core, FRAME_SIZE_NS ), sr_core, mem_decim16k_dummy_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
-            Scale_sig( new_inp_16k_fx + NS2SA( sr_core, FRAME_SIZE_NS ), size_modified, negate( Q_tmp ) );                                                                                                                                      /* scaling back to Q_old_inp_16k */
+            size_modified = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_16k_fx + NS2SA_FX2( sr_core, FRAME_SIZE_NS ), sr_core, mem_decim16k_dummy_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
+            Scale_sig( new_inp_16k_fx + NS2SA_FX2( sr_core, FRAME_SIZE_NS ), size_modified, negate( Q_tmp ) );                                                                                                                                          /* scaling back to Q_old_inp_16k */
         }
     }
     ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) )
@@ -815,8 +829,8 @@ ivas_error ivas_compute_core_buffers_fx(
             /* no resampling needed, only delay adjustment to account for the FIR resampling delay */
             delay = NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS );
             move16();
-            Copy( st->mem_decim16k_fx + delay, new_inp_16k_fx - sub( lMemRecalc, add( delay, L_FILT16k ) ), delay );             /* Q(-1) */
-            Copy( signal_in_fx - lMemRecalc, new_inp_16k_fx - add( lMemRecalc, L_FILT16k ), add( input_frame, lMemRecalc ) );    /* st->q_inp */
+            Copy( st->mem_decim16k_fx + delay, new_inp_16k_fx - add( lMemRecalc, sub( delay, L_FILT16k ) ), delay );             /* Q(-1) */
+            Copy( signal_in_fx - lMemRecalc, new_inp_16k_fx - sub( lMemRecalc, L_FILT16k ), add( input_frame, lMemRecalc ) );    /* st->q_inp */
             Copy( signal_in_fx + sub( sub( input_frame, lMemRecalc ), shl( delay, 1 ) ), st->mem_decim16k_fx, shl( delay, 1 ) ); /* st->q_inp */
         }
         ELSE IF( EQ_32( input_Fs, 32000 ) || EQ_32( input_Fs, 48000 ) )
@@ -829,7 +843,7 @@ ivas_error ivas_compute_core_buffers_fx(
                 Word16 length_16k = NS2SA_FX2( INT_FS_16k, L_MEM_RECALC_SCH_NS - DELAY_FIR_RESAMPL_NS );
                 move16();
 
-                Copy( signal_in_fx - lMemRecalc - length_inp - 2 * NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ), st->mem_decim16k_fx, 2 * NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ) );                                               /* st->q_inp */
+                Copy( signal_in_fx - lMemRecalc - length_inp - 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ), st->mem_decim16k_fx, 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ) );                                       /* st->q_inp */
                 size_modified = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc - length_inp, length_inp, input_Fs, new_inp_16k_fx - lMemRecalc_16k - length_16k, sr_core, st->mem_decim16k_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
                 Scale_sig( new_inp_16k_fx - lMemRecalc_16k - length_16k, size_modified, negate( Q_tmp ) );                                                                                                                    /* scaling back to Q_old_inp_16k */
             }
@@ -840,19 +854,19 @@ ivas_error ivas_compute_core_buffers_fx(
 
             IF( lMemRecalc > 0 )
             {
-                size_modified = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc + input_frame, lMemRecalc, input_Fs, new_inp_16k_fx + NS2SA( sr_core, FRAME_SIZE_NS ) - ( lMemRecalc * sr_core ) / st->input_Fs, sr_core, mem_decim16k_dummy_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
-                Scale_sig( new_inp_16k_fx + NS2SA( sr_core, FRAME_SIZE_NS ) - ( lMemRecalc * sr_core ) / st->input_Fs, size_modified, negate( Q_tmp ) );                                                                                                                       /* scaling back to Q_old_inp_16k */
+                size_modified = modify_Fs_ivas_fx( signal_in_fx - lMemRecalc + input_frame, lMemRecalc, input_Fs, new_inp_16k_fx + NS2SA_FX2( sr_core, FRAME_SIZE_NS ) - ( lMemRecalc * sr_core ) / st->input_Fs, sr_core, mem_decim16k_dummy_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
+                Scale_sig( new_inp_16k_fx + NS2SA_FX2( sr_core, FRAME_SIZE_NS ) - ( lMemRecalc * sr_core ) / st->input_Fs, size_modified, negate( Q_tmp ) );                                                                                                                       /* scaling back to Q_old_inp_16k */
             }
 
             set16_fx( temp1F_icatdmResampBuf_fx, 0, L_FILT_MAX );
-            size_modified = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_16k_fx + NS2SA( sr_core, FRAME_SIZE_NS ), sr_core, mem_decim16k_dummy_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
-            Scale_sig( new_inp_16k_fx + NS2SA( sr_core, FRAME_SIZE_NS ), size_modified, negate( Q_tmp ) );                                                                                                                                      /* scaling back to Q_old_inp_16k */
+            size_modified = modify_Fs_ivas_fx( temp1F_icatdmResampBuf_fx, NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ), input_Fs, new_inp_16k_fx + NS2SA_FX2( sr_core, FRAME_SIZE_NS ), sr_core, mem_decim16k_dummy_fx, 0, &Q_tmp, &mem_decim16k_size ); /* Q0 */
+            Scale_sig( new_inp_16k_fx + NS2SA_FX2( sr_core, FRAME_SIZE_NS ), size_modified, negate( Q_tmp ) );                                                                                                                                          /* scaling back to Q_old_inp_16k */
         }
     }
     ELSE IF( st->idchan == 0 )
     {
         /* update the FIR resampling filter memory, needed for switching to time-domain (FIR) resampling */
-        Copy( signal_in_fx + input_frame - NS2SA( input_Fs, L_MEM_RECALC_NS ) - 2 * NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ), st->mem_decim16k_fx, 2 * NS2SA( input_Fs, DELAY_FIR_RESAMPL_NS ) ); /* st->q_inp */
+        Copy( signal_in_fx + input_frame - NS2SA_FX2( input_Fs, L_MEM_RECALC_NS ) - 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ), st->mem_decim16k_fx, 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ) ); /* st->q_inp */
     }
 
     /*------------------------------------------------*
@@ -872,8 +886,11 @@ ivas_error ivas_compute_core_buffers_fx(
 
             IF( EQ_16( st->bwidth, WB ) )
             {
-                Copy_Scale_sig( new_inp_16k_fx - delay, st->hBWE_FD->old_input_wb_fx, delay, negate( add( Q_old_inp_16k, 1 ) ) );                                        /* Scaling to Q(-1) */
-                Copy( new_inp_16k_fx - STEREO_DFT_OVL_16k, st->hBWE_FD->L_old_wtda_swb_fx + L_FRAME16k - STEREO_DFT_OVL_16k + delay, sub( STEREO_DFT_OVL_16k, delay ) ); /* Check Q here once. Q should be Q_old_wtda */
+                Copy_Scale_sig( new_inp_16k_fx - delay, st->hBWE_FD->old_input_wb_fx, delay, negate( add( Q_old_inp_16k, 1 ) ) ); /* Scaling to Q(-1) */
+                scale_sig( st->hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, sub( Q_old_inp_16k, st->Q_old_wtda ) );                    // st->Q_old_wtda->Q_old_inp_16k
+                Copy( new_inp_16k_fx - STEREO_DFT_OVL_16k, st->hBWE_FD->L_old_wtda_swb_fx + L_FRAME16k - STEREO_DFT_OVL_16k + delay, sub( STEREO_DFT_OVL_16k, delay ) );
+                st->Q_old_wtda = Q_old_inp_16k;
+                move16();
             }
         }
         ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) )
@@ -884,8 +901,11 @@ ivas_error ivas_compute_core_buffers_fx(
             test();
             IF( EQ_16( st->bwidth, WB ) && st->hBWE_FD != NULL )
             {
-                Copy_Scale_sig( new_inp_16k_fx + L_FILT16k - delay, st->hBWE_FD->old_input_wb_fx, delay, negate( add( Q_old_inp_16k, 1 ) ) );                                              /* Scaling to Q(-1) */
-                Copy( new_inp_16k_fx - L_MEM_RECALC_16K, st->hBWE_FD->L_old_wtda_swb_fx + L_FRAME16k - L_MEM_RECALC_16K - L_FILT16k + delay, sub( L_MEM_RECALC_16K + L_FILT16k, delay ) ); /* Check Q here once. Q should be Q_old_wtda */
+                Copy_Scale_sig( new_inp_16k_fx + L_FILT16k - delay, st->hBWE_FD->old_input_wb_fx, delay, negate( add( Q_old_inp_16k, 1 ) ) ); /* Scaling to Q(-1) */
+                scale_sig( st->hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, sub( Q_old_inp_16k, st->Q_old_wtda ) );                                // st->Q_old_wtda->Q_old_inp_16k
+                Copy( new_inp_16k_fx - L_MEM_RECALC_16K, st->hBWE_FD->L_old_wtda_swb_fx + L_FRAME16k - L_MEM_RECALC_16K - L_FILT16k + delay, sub( L_MEM_RECALC_16K + L_FILT16k, delay ) );
+                st->Q_old_wtda = Q_old_inp_16k;
+                move16();
             }
         }
         ELSE IF( element_mode == IVAS_SCE )
@@ -1092,14 +1112,7 @@ ivas_error ivas_compute_core_buffers_fx(
     {
         /* update signal buffers */
         Word16 shift;
-        IF( downscale_buf_speech_enc_pe )
-        {
-            shift = negate( *Q_new );
-        }
-        ELSE
-        {
-            shift = 0;
-        }
+        shift = negate( *Q_new );
         move16();
         IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
         {
@@ -1127,11 +1140,11 @@ ivas_error ivas_compute_core_buffers_fx(
 
         IF( Q_new )
         {
-            analy_lp_ivas_fx( inp_16k_fx, L_FRAME16k, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lspold_enc_fx, st->pitch, st->voicing_fx, INT_FS_16k, 0, sub( *Q_new, 1 ), Q_r );
+            analy_lp_fx( inp_16k_fx, L_FRAME16k, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lspold_enc_fx, st->pitch, st->voicing_fx, INT_FS_16k, element_mode, 0, sub( *Q_new, 1 ), Q_r );
         }
         ELSE
         {
-            analy_lp_ivas_fx( inp_16k_fx, L_FRAME16k, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lspold_enc_fx, st->pitch, st->voicing_fx, INT_FS_16k, 0, -1, Q_r );
+            analy_lp_fx( inp_16k_fx, L_FRAME16k, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lspold_enc_fx, st->pitch, st->voicing_fx, INT_FS_16k, element_mode, 0, -1, Q_r );
         }
 
         /*--------------------------------------------------------------*
@@ -1158,11 +1171,8 @@ ivas_error ivas_compute_core_buffers_fx(
     ELSE IF( GT_32( input_Fs, 8000 ) && EQ_32( sr_core, INT_FS_16k ) )
     {
         Copy( &old_inp_16k_fx[L_frame_tmp], st->old_inp_16k_fx, L_INP_MEM );
-        IF( Q_new )
-        {
-            st->exp_old_inp_16k = sub( Q16, *Q_new ); //(*Q_new - 1)
-            move16();
-        }
+        st->exp_old_inp_16k = sub( Q16, *Q_new ); //(*Q_new - 1)
+        move16();
     }
     ELSE IF( GT_32( input_Fs, 8000 ) )
     {
diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig_fx.c
similarity index 83%
rename from lib_enc/ivas_corecoder_enc_reconfig.c
rename to lib_enc/ivas_corecoder_enc_reconfig_fx.c
index 887dc12139735af0647c28cebd5c7ea8df8be0cc..a8698bacc4c744fb16ddc5d52178929d38d49b0e 100644
--- a/lib_enc/ivas_corecoder_enc_reconfig.c
+++ b/lib_enc/ivas_corecoder_enc_reconfig_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,10 +33,8 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 #include "math.h"
@@ -86,7 +84,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
     move16();
     IF( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) )
     {
-        len_inp_memory = add( len_inp_memory, NS2SA( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS ) ); /* Q0  */
+        len_inp_memory = add( len_inp_memory, NS2SA_FX2( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS ) ); /* Q0  */
     }
 
     nchan_transport_old_real = nchan_transport_old; /* Q0 */
@@ -215,24 +213,37 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             move16();
         }
 
-        Word16 q_com_sce = Q15;
+        Word16 q_com_sce = Q15, q_com_sce32 = Q31;
+        move16();
+        move16();
+        Word16 q_com_cpe = Q15, q_com_cpe32 = Q31;
         move16();
-        Word16 q_com_cpe = Q15;
         move16();
         IF( nSCE_old > 0 )
         {
             FOR( k = 0; k < nSCE_old; k++ )
             {
-                shift = getScaleFactor16( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal_fx, input_frame );
-                Scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal_fx, input_frame, shift ); /*  st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp + shift */
+                shift = sub( getScaleFactor16( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal_fx, input_frame ), Q1 );
+                scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal_fx, input_frame, shift ); /*  st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp + shift */
                 st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp = add( st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp, shift );
                 move16();
                 q_com_sce = s_min( q_com_sce, st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp );
-                shift = getScaleFactor16( st_ivas->hSCE[k]->hCoreCoder[0]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ) );
-                Scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), shift ); /*  st_ivas->hSCE[k]->hCoreCoder[0]->q_inp + shift */
+                shift = sub( getScaleFactor16( st_ivas->hSCE[k]->hCoreCoder[0]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ) ), Q1 );
+                scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), shift ); /*  st_ivas->hSCE[k]->hCoreCoder[0]->q_inp + shift */
                 st_ivas->hSCE[k]->hCoreCoder[0]->q_inp = add( st_ivas->hSCE[k]->hCoreCoder[0]->q_inp, shift );
                 move16();
                 q_com_sce = s_min( q_com_sce, st_ivas->hSCE[k]->hCoreCoder[0]->q_inp );
+
+                shift = sub( getScaleFactor32( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal32_fx, input_frame ), Q1 );
+                scale_sig32( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal32_fx, input_frame, shift ); /*  st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp + shift */
+                st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp32 = add( st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp32, shift );
+                move16();
+                q_com_sce32 = s_min( q_com_sce32, st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp32 );
+                shift = sub( getScaleFactor32( st_ivas->hSCE[k]->hCoreCoder[0]->input32_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ) ), Q1 );
+                scale_sig32( st_ivas->hSCE[k]->hCoreCoder[0]->input32_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), shift ); /*  st_ivas->hSCE[k]->hCoreCoder[0]->q_inp + shift */
+                st_ivas->hSCE[k]->hCoreCoder[0]->q_inp32 = add( st_ivas->hSCE[k]->hCoreCoder[0]->q_inp32, shift );
+                move16();
+                q_com_sce32 = s_min( q_com_sce32, st_ivas->hSCE[k]->hCoreCoder[0]->q_inp32 );
             }
         }
 
@@ -243,16 +254,27 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             {
                 FOR( n = 0; n < CPE_CHANNELS; n++ )
                 {
-                    shift = getScaleFactor16( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal_fx, input_frame );
-                    Scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal_fx, input_frame, shift ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp + shift */
+                    shift = sub( getScaleFactor16( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal_fx, input_frame ), Q1 );
+                    scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal_fx, input_frame, shift ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp + shift */
                     st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp = add( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp, shift );
                     move16();
                     q_com_cpe = s_min( q_com_cpe, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp );
-                    shift = getScaleFactor16( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ) );
-                    Scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), shift ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp + shift */
+                    shift = sub( getScaleFactor16( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ) ), Q1 );
+                    scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), shift ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp + shift */
                     st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp = add( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp, shift );
                     move16();
                     q_com_cpe = s_min( q_com_cpe, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp );
+
+                    shift = sub( getScaleFactor32( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal32_fx, input_frame ), Q1 );
+                    scale_sig32( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal32_fx, input_frame, shift ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp + shift */
+                    st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp32 = add( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp32, shift );
+                    move16();
+                    q_com_cpe32 = s_min( q_com_cpe32, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp32 );
+                    shift = sub( getScaleFactor32( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input32_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ) ), Q1 );
+                    scale_sig32( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input32_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), shift ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp + shift */
+                    st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32 = add( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32, shift );
+                    move16();
+                    q_com_cpe32 = s_min( q_com_cpe32, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32 );
                 }
             }
         }
@@ -261,14 +283,16 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
         {
             FOR( k = 0; k < nSCE_old; k++ )
             {
-                Scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal_fx, input_frame, sub( q_com, st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp ) ); /* q_com */
+                scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->old_input_signal_fx, input_frame, sub( q_com, st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp ) ); /* q_com */
                 st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp = q_com;
                 move16();
-                Scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), sub( q_com, st_ivas->hSCE[k]->hCoreCoder[0]->q_inp ) ); /* q_com */
+                scale_sig( st_ivas->hSCE[k]->hCoreCoder[0]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), sub( q_com, st_ivas->hSCE[k]->hCoreCoder[0]->q_inp ) ); /* q_com */
                 st_ivas->hSCE[k]->hCoreCoder[0]->q_inp = q_com;
                 move16();
-                Copy_Scale_sig_16_32( st_ivas->hSCE[k]->hCoreCoder[0]->input_buff_fx, st_ivas->hSCE[k]->hCoreCoder[0]->input_buff32_fx, L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS ) + L_FRAME48k, Q6 ); /* Q6 + q_com */
+                Copy_Scale_sig_16_32_DEPREC( st_ivas->hSCE[k]->hCoreCoder[0]->input_buff_fx, st_ivas->hSCE[k]->hCoreCoder[0]->input_buff32_fx, L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS ) + L_FRAME48k, Q6 ); /* Q6 + q_com */
                 st_ivas->hSCE[k]->hCoreCoder[0]->q_inp32 = add( Q6, q_com );
+                st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp32 = add( Q6, q_com );
+                move16();
                 move16();
             }
         }
@@ -279,14 +303,16 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             {
                 FOR( n = 0; n < CPE_CHANNELS; n++ )
                 {
-                    Scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( q_com, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp ) ); /* q_com */
+                    scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( q_com, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp ) ); /* q_com */
                     st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp = q_com;
                     move16();
-                    Scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), sub( q_com, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp ) ); /* q_com */
+                    scale_sig( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_fx, sub( L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_frame ), sub( q_com, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp ) ); /* q_com */
                     st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp = q_com;
                     move16();
-                    Copy_Scale_sig_16_32( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff_fx, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff32_fx, L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS ) + L_FRAME48k, Q6 ); /* Q6 + q_com */
+                    Copy_Scale_sig_16_32_DEPREC( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff_fx, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff32_fx, L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS ) + L_FRAME48k, Q6 ); /* Q6 + q_com */
                     st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32 = add( Q6, q_com );
+                    st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp32 = add( Q6, q_com );
+                    move16();
                     move16();
                 }
             }
@@ -303,7 +329,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             {
                 set32_fx( input_buff_fx[0], 0, len_inp_memory );
                 Copy32( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, input_buff_fx[0], len_inp_memory ); /* st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32 */
-                q_input_buff[0] = st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32;
+                q_input_buff[0] = st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp32;
                 move16();
             }
 
@@ -313,7 +339,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                 IF( nCPE_old > 0 )
                 {
                     Copy32( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, input_buff_fx[n + 1], len_inp_memory ); /* st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32 */
-                    q_input_buff[n + 1] = st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32;
+                    q_input_buff[n + 1] = st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp32;
                     move16();
                 }
             }
@@ -336,10 +362,10 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             IF( GT_16( n_CoreCoder_existing, sce_id ) )
             {
                 Copy32( st_ivas->hSCE[sce_id]->hCoreCoder[0]->input_buff32_fx, input_buff_fx[sce_id], len_inp_memory ); /* st_ivas->hSCE[sce_id]->hCoreCoder[0]->q_inp32  */
-                q_input_buff[sce_id] = st_ivas->hSCE[sce_id]->hCoreCoder[0]->q_inp32;
+                q_input_buff[sce_id] = st_ivas->hSCE[sce_id]->hCoreCoder[0]->q_old_inp32;
                 move16();
             }
-            destroy_sce_enc( st_ivas->hSCE[sce_id], ( EQ_16( st_ivas->hEncoderConfig->element_mode_init, EVS_MONO ) && !st_ivas->hEncoderConfig->stereo_dmx_evs ) );
+            destroy_sce_enc_fx( st_ivas->hSCE[sce_id], ( EQ_16( st_ivas->hEncoderConfig->element_mode_init, EVS_MONO ) && !st_ivas->hEncoderConfig->stereo_dmx_evs ) );
             st_ivas->hSCE[sce_id] = NULL;
         }
 
@@ -351,7 +377,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                 IF( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n )
                 {
                     Copy32( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff32_fx, input_buff_fx[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); /* st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32 */
-                    q_input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n] = st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32;
+                    q_input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n] = st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp32;
                     move16();
                 }
             }
@@ -400,14 +426,14 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                 IF( GT_16( n_CoreCoder_existing, sce_id ) && NE_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) )
                 {
                     Copy32( input_buff_fx[sce_id], st_ivas->hSCE[sce_id]->hCoreCoder[0]->input_buff32_fx, len_inp_memory ); /* q_input_buff[sce_id] */
-                    st_ivas->hSCE[sce_id]->hCoreCoder[0]->q_inp32 = q_input_buff[sce_id];
+                    st_ivas->hSCE[sce_id]->hCoreCoder[0]->q_old_inp32 = q_input_buff[sce_id];
                     move16();
                 }
                 test();
                 /* only reset indices if it is not the first index list, this already contains the IVAS format bits */
                 IF( sce_id > 0 || EQ_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) )
                 {
-                    reset_indices_enc( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->nb_ind_tot );
+                    reset_indices_enc_fx( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->nb_ind_tot );
                 }
             }
 
@@ -451,7 +477,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                         ( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) && st_ivas->nSCE > 0 ) ||
                         ( EQ_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) && st_ivas->nSCE > 0 ) )
                     {
-                        reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_ind_tot );
+                        reset_indices_enc_fx( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_ind_tot );
                     }
                 }
             }
@@ -477,7 +503,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                     IF( GT_16( n_CoreCoder_existing, add( i_mult( cpe_id, CPE_CHANNELS ), n ) ) )
                     {
                         Copy32( input_buff_fx[n], st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff32_fx, len_inp_memory ); /* q_input_buff */
-                        st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_inp32 = q_input_buff[n];
+                        st_ivas->hCPE[cpe_id]->hCoreCoder[n]->q_old_inp32 = q_input_buff[n];
                         move16();
                     }
                 }
@@ -489,7 +515,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                     test();
                     IF( add( i_mult( cpe_id, CPE_CHANNELS ), n ) > 0 || ( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) && st_ivas->nSCE > 0 ) )
                     {
-                        reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_ind_tot );
+                        reset_indices_enc_fx( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_ind_tot );
                     }
 
                     IF( hEncoderConfig->Opt_DTX_ON )
@@ -562,7 +588,9 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             IF( st_ivas->nSCE )
             {
                 Copy32( input_buff_fx[0], st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, len_inp_memory ); /* q_input_buff */
-                st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32 = q_input_buff[0];
+                // st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32 = q_input_buff[0];
+                st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp32 = q_input_buff[0];
+                move16();
                 move16();
             }
 
@@ -571,7 +599,9 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                 FOR( n = 0; n < CPE_CHANNELS; n++ )
                 {
                     Copy32( input_buff_fx[n + 1], st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, len_inp_memory ); /* q_input_buff */
-                    st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32 = q_input_buff[n + 1];
+                    // st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32 = q_input_buff[n + 1];
+                    st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp32 = q_input_buff[n + 1];
+                    move16();
                     move16();
                 }
             }
@@ -581,7 +611,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
         {
             IF( NE_16( input_frame, len_inp_memory ) )
             {
-                Copy_Scale_sig32_16( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, st_ivas->hSCE[0]->hCoreCoder[0]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
+                Copy_Scale_sig32_16( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, st_ivas->hSCE[0]->hCoreCoder[0]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
                 st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp = 0;
                 move16();
                 Copy_Scale_sig32_16( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx + sub( len_inp_memory, input_frame ), st_ivas->hSCE[0]->hCoreCoder[0]->input_buff_fx + sub( len_inp_memory, input_frame ), sub( len_inp_memory, input_frame ), sub( add( Q16, 0 ), st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
@@ -590,7 +620,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             }
             ELSE
             {
-                Copy_Scale_sig32_16( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, st_ivas->hSCE[0]->hCoreCoder[0]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hSCE[0]->hCoreCoder[0]->q_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
+                Copy_Scale_sig32_16( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, st_ivas->hSCE[0]->hCoreCoder[0]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
                 st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp = 0;
                 move16();
             }
@@ -602,7 +632,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
             {
                 IF( NE_16( input_frame, len_inp_memory ) )
                 {
-                    Copy_Scale_sig32_16( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, st_ivas->hCPE[0]->hCoreCoder[n]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
+                    Copy_Scale_sig32_16( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, st_ivas->hCPE[0]->hCoreCoder[n]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
                     st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp = 0;
                     move16();
 
@@ -612,7 +642,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                 }
                 ELSE
                 {
-                    Copy_Scale_sig32_16( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, st_ivas->hCPE[0]->hCoreCoder[n]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
+                    Copy_Scale_sig32_16( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, st_ivas->hCPE[0]->hCoreCoder[n]->input_buff_fx, len_inp_memory, sub( add( Q16, 0 ), st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp32 ) ); // Q(q_data_fx) -> Q(q_input)
                     st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp = 0;
                     move16();
                 }
@@ -669,7 +699,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
                 }
             }
 
-            reset_indices_enc( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData, st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_ind_tot );
+            reset_indices_enc_fx( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData, st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_ind_tot );
 
             FOR( cpe_id = 0; cpe_id < st_ivas->nCPE - 1; cpe_id++ )
             {
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc_fx.c
similarity index 85%
rename from lib_enc/ivas_cpe_enc.c
rename to lib_enc/ivas_cpe_enc_fx.c
index 4157ae1420742d5e885d7dfdfc7a878a56b1d6bc..d0a33ed090b133b57c9f5001fcf78ec619d23ccd 100644
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,8 +36,7 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "ivas_rom_com.h"
 #ifdef DEBUGGING
@@ -45,7 +44,6 @@
 #endif
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_enc.h"
 #include "prot_fx_enc.h"
 
@@ -80,6 +78,7 @@ ivas_error ivas_cpe_enc_fx(
     Word16 Q_new[CPE_CHANNELS] = { 0 };
     Word16 fft_buff_fx[CPE_CHANNELS][2 * L_FFT]; /* FFT buffer                               */
     Word16 fft_buff_fx_q[CPE_CHANNELS];          /* FFT buffer                               */
+    set16_fx( fft_buff_fx_q, 0, CPE_CHANNELS );
     Word16 fft_buff_fx_final_q = MAX_16;
     move16();
     Word32 ener_fx[CPE_CHANNELS];                                /* residual energy from Levinson-Durbin  Q6 */
@@ -102,7 +101,7 @@ ivas_error ivas_cpe_enc_fx(
     Word16 vad_flag_dtx[CPE_CHANNELS];                         /* HE-SAD flag with additional DTX HO       */
     Word32 enerBuffer_fx[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX]; /* energy buffer                            */
     Word16 enerBuffer_fx_exp[CPE_CHANNELS];                    /* energy buffer                            */
-    Word16 currFlatness_fx[CPE_CHANNELS];                      /* flatness parameter                       Q7 */
+    Word32 currFlatness_fx[CPE_CHANNELS];                      /* flatness parameter                       Q21 */
     Word16 tdm_ratio_idx, tdm_ratio_idx_SM;                    /* temp. TD stereo parameters               */
     Word16 tdm_SM_or_LRTD_Pri;                                 /* temp. TD stereo parameters               */
 
@@ -114,7 +113,9 @@ ivas_error ivas_cpe_enc_fx(
     Word32 band_energies_LR_fx[2 * NB_BANDS];       /* energy in critical bands without minimum noise floor E_MIN (Q_buffer + QSCALE - band_ener_guardbits) */
     Word16 Q_buffer[2];
     Word16 orig_input_fx[CPE_CHANNELS][L_FRAME48k];
+    Word32 orig_input_fx32[CPE_CHANNELS][L_FRAME48k];
     Word16 Q_orig_inp[CPE_CHANNELS];
+    Word16 Q_orig_inp32[CPE_CHANNELS];
     Word16 Etot_last_fx[CPE_CHANNELS];
     Word32 tmp, input_Fs;
     Word16 max_bwidth, ivas_format;
@@ -128,6 +129,7 @@ ivas_error ivas_cpe_enc_fx(
     Word16 e_old_wsp[CPE_CHANNELS], q_old_wsp;
     move16(); // Q_new
     move16(); // Q_new
+    Word16 q_com, shift, q_min, gb;
 
     error = IVAS_ERR_OK;
     move32();
@@ -175,15 +177,14 @@ ivas_error ivas_cpe_enc_fx(
     set16_fx( voicing_fr_fx[0], 0, NB_SUBFR );
     set16_fx( voicing_fr_fx[1], 0, NB_SUBFR );
 
-#ifdef MSAN_FIX
     FOR( Word16 i = 0; i < CPE_CHANNELS; i++ )
     {
         set16_zero_fx( fft_buff_fx[i], 2 * L_FFT );
         set16_zero_fx( old_inp_16k_16fx[i], L_INP );
         set_zero_fx( old_inp_16k_fx[i], L_INP );
         set16_zero_fx( old_inp_12k8_16fx[i], L_INP_12k8 );
+        set_zero_fx( old_inp_12k8_fx[i], L_INP_12k8 );
     }
-#endif
     /*------------------------------------------------------------------*
      * CPE initialization - core coder
      *-----------------------------------------------------------------*/
@@ -212,33 +213,40 @@ ivas_error ivas_cpe_enc_fx(
 #ifdef DEBUGGING
         sts[n]->force = hEncoderConfig->force;
         sts[n]->id_element = cpe_id + st_ivas->nSCE;
+#ifdef DEBUG_FORCE_DIR
+        sts[n]->force_dir = hEncoderConfig->force_dir;
+#endif
 #endif
     }
 
-    Copy32( data_fx_ch0, sts[0]->input32_fx, input_frame ); // Q(q_data_fx)
-    sts[0]->q_inp32 = q_data_fx;
+    Word16 norm, Q_min = s_min( q_data_fx, add( sts[0]->q_old_inp32, L_norm_arr( sts[0]->input32_fx - input_frame, input_frame ) ) );
+    norm = L_norm_arr( data_fx_ch0, input_frame );
+    IF( data_fx_ch1 != NULL ) /*this may happen for cases with odd number of channels*/
+    {
+        Q_min = s_min( Q_min, add( sts[1]->q_old_inp32, L_norm_arr( sts[1]->input32_fx - input_frame, input_frame ) ) );
+        norm = s_min( norm, L_norm_arr( data_fx_ch1, input_frame ) );
+    }
+    scale_sig32( sts[0]->input32_fx - input_frame, input_frame, sub( Q_min, sts[0]->q_old_inp32 ) );
+    sts[0]->q_old_inp32 = Q_min;
     move16();
-    Word16 norm = L_norm_arr( sts[0]->input32_fx, input_frame );
-    scale_sig32( sts[0]->input32_fx, input_frame, norm );
-    sts[0]->q_inp32 = add( sts[0]->q_inp32, norm );
+    Copy_Scale_sig32( data_fx_ch0, sts[0]->input32_fx, input_frame, sub( Q_min, q_data_fx ) ); // Q(Q_min)
+    sts[0]->q_inp32 = Q_min;
     move16();
 
-    Copy_Scale_sig32_16( sts[0]->input32_fx, sts[0]->input_fx, input_frame, 0 );
-    sts[0]->q_inp = sub( sts[0]->q_inp32, Q16 );
+    Copy_Scale_sig32_16( sts[0]->input32_fx, sts[0]->input_fx, input_frame, norm );
+    sts[0]->q_inp = add( sub( sts[0]->q_inp32, Q16 ), norm );
     move16();
     IF( data_fx_ch1 != NULL ) /*this may happen for cases with odd number of channels*/
     {
-        Copy32( data_fx_ch1, sts[1]->input32_fx, input_frame ); // Q(q_data_fx)
-        sts[1]->q_inp32 = q_data_fx;
+        scale_sig32( sts[1]->input32_fx - input_frame, input_frame, sub( Q_min, sts[1]->q_old_inp32 ) );
+        sts[1]->q_old_inp32 = Q_min;
         move16();
-
-        norm = L_norm_arr( sts[1]->input32_fx, input_frame );
-        scale_sig32( sts[1]->input32_fx, input_frame, norm );
-        sts[1]->q_inp32 = add( sts[1]->q_inp32, norm );
+        Copy_Scale_sig32( data_fx_ch1, sts[1]->input32_fx, input_frame, sub( Q_min, q_data_fx ) ); // Q(Q_min)
+        sts[1]->q_inp32 = Q_min;
         move16();
 
-        Copy_Scale_sig32_16( sts[1]->input32_fx, sts[1]->input_fx, input_frame, 0 );
-        sts[1]->q_inp = sub( sts[1]->q_inp32, Q16 );
+        Copy_Scale_sig32_16( sts[1]->input32_fx, sts[1]->input_fx, input_frame, norm );
+        sts[1]->q_inp = add( sub( sts[1]->q_inp32, Q16 ), norm );
         move16();
     }
 
@@ -258,8 +266,21 @@ ivas_error ivas_cpe_enc_fx(
     test();
     IF( sts[0]->ini_frame > 0 && st_ivas->hMCT == NULL )
     {
-        hCPE->element_mode = select_stereo_mode( hCPE, ivas_format ); /* Q0 */
+        hCPE->element_mode = select_stereo_mode_fx( hCPE, ivas_format );
+    }
+#ifdef DEBUG_FORCE_DIR
+    else
+    {
+        if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
+        {
+            dbgread( &hCPE->element_mode, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_element_mode.enf", -1, -1, -1 ) );
+        }
+        else
+        {
+            dbgwrite( &hCPE->element_mode, sizeof( int16_t ), 1, 1, "res/force_element_mode.enf" );
+        }
     }
+#endif
 
     stereo_mode_combined_format_enc_fx( st_ivas, hCPE );
 
@@ -270,9 +291,7 @@ ivas_error ivas_cpe_enc_fx(
     move16();
     Word16 front_create_flag = 0;
     move16();
-#ifdef MSAN_FIX
     set32_fx( band_energies_LR_fx, 0, 2 * NB_BANDS );
-#endif
 
     IF( hCPE->hFrontVad[0] != NULL && NE_16( hCPE->element_mode, IVAS_CPE_MDCT ) )
     {
@@ -285,8 +304,8 @@ ivas_error ivas_cpe_enc_fx(
         }
         FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
-            Scale_sig( sts[n]->input_fx, input_frame, sub( scale_inp, sts[n]->q_inp ) );
-            Scale_sig( hCPE->hFrontVad[n]->mem_decim_fx, 2 * L_FILT_MAX, sub( scale_inp, hCPE->hFrontVad[n]->q_mem_decim ) );
+            scale_sig( sts[n]->input_fx, input_frame, sub( scale_inp, sts[n]->q_inp ) );
+            scale_sig( hCPE->hFrontVad[n]->mem_decim_fx, 2 * L_FILT_MAX, sub( scale_inp, hCPE->hFrontVad[n]->q_mem_decim ) );
             sts[n]->q_inp = scale_inp;
             move16();
             hCPE->hFrontVad[n]->q_mem_decim = scale_inp;
@@ -358,27 +377,7 @@ ivas_error ivas_cpe_enc_fx(
      * Set TD stereo parameters
      *----------------------------------------------------------------*/
 
-    Copy_Scale_sig_16_32( sts[1]->input_fx, sts[1]->input32_fx, input_frame, sub( Q11, sts[1]->q_inp ) ); /* Q11 */
-    Copy_Scale_sig_16_32( sts[0]->input_fx, sts[0]->input32_fx, input_frame, sub( Q11, sts[0]->q_inp ) ); /* Q11 */
-
-    Word16 shift = getScaleFactor32( sts[1]->input32_fx, input_frame );
-    scale_sig32( sts[1]->input32_fx, input_frame, shift ); /* Q11 + shift */
-    sts[1]->q_inp32 = add( Q11, shift );
-    move16();
-
-    shift = getScaleFactor32( sts[0]->input32_fx, input_frame );
-    scale_sig32( sts[0]->input32_fx, input_frame, shift ); /* Q11 + shift */
-    sts[0]->q_inp32 = add( Q11, shift );
-    move16();
-
-    Q_inp = s_min( Q_inp, s_min( sts[0]->q_inp32, sts[1]->q_inp32 ) );
-    scale_sig32( sts[0]->input32_fx, input_frame, sub( Q_inp, sts[0]->q_inp32 ) ); /* Q_inp */
-    scale_sig32( sts[1]->input32_fx, input_frame, sub( Q_inp, sts[1]->q_inp32 ) ); /* Q_inp */
-    sts[1]->q_inp32 = sts[0]->q_inp32 = Q_inp;
-    move16();
-    move16();
-
-    IF( ( error = stereo_set_tdm_fx( hCPE, input_frame, Q_inp ) ) != IVAS_ERR_OK )
+    IF( ( error = stereo_set_tdm_fx( hCPE, input_frame, sts[1]->q_inp32 ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -387,58 +386,49 @@ ivas_error ivas_cpe_enc_fx(
     /*----------------------------------------------------------------*
      * Resets/updates in case of stereo switching
      *----------------------------------------------------------------*/
-    shift = getScaleFactor16( sts[1]->old_input_signal_fx, input_frame );
-    Scale_sig( sts[1]->old_input_signal_fx, input_frame, shift ); /* sts[1]->q_old_inp + shift  */
-    sts[1]->q_old_inp = add( sts[1]->q_old_inp, shift );
-    move16();
-    shift = getScaleFactor16( sts[1]->input_fx, input_frame );
-    Scale_sig( sts[1]->input_fx, input_frame, shift ); /* sts[1]->q_inp + shift  */
-    sts[1]->q_inp = add( sts[1]->q_inp, shift );
-    move16();
-
-    shift = getScaleFactor16( sts[0]->old_input_signal_fx, input_frame );
-    Scale_sig( sts[0]->old_input_signal_fx, input_frame, shift ); /* sts[1]->q_old_inp + shift  */
-    sts[0]->q_old_inp = add( sts[0]->q_old_inp, shift );
-    move16();
-    shift = getScaleFactor16( sts[0]->input_fx, input_frame );
-    Scale_sig( sts[0]->input_fx, input_frame, shift ); /* sts[1]->q_inp, shift  */
-    sts[0]->q_inp = add( sts[0]->q_inp, shift );
-    move16();
-
-    Word16 q_inp = s_min( s_min( sts[0]->q_inp, sts[0]->q_old_inp ), s_min( sts[1]->q_inp, sts[1]->q_old_inp ) );
-
-    Scale_sig( sts[1]->input_fx, input_frame, sub( q_inp, sts[1]->q_inp ) );                /* q_inp */
-    Scale_sig( sts[1]->old_input_signal_fx, input_frame, sub( q_inp, sts[1]->q_old_inp ) ); /* q_inp */
-    sts[1]->q_inp = q_inp;
-    sts[1]->q_old_inp = q_inp;
-    move16();
-    move16();
+    test();
+    IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) && EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) )
+    {
+        gb = find_guarded_bits_fx( sts[0]->encoderLookahead_FB );
+        shift = L_norm_arr( sts[1]->old_input_signal32_fx, shl( input_frame, 1 ) );
+        shift = s_min( shift, L_norm_arr( sts[0]->old_input_signal32_fx, shl( input_frame, 1 ) ) );
+
+        IF( LT_16( shift, gb ) )
+        {
+            shift = sub( shift, gb );
+            scale_sig32( sts[1]->input32_fx, input_frame, shift );            /* q_inp32 + shift */
+            scale_sig32( sts[0]->input32_fx, input_frame, shift );            /* q_inp32 + shift */
+            scale_sig32( sts[1]->old_input_signal32_fx, input_frame, shift ); /* q_old_inp32 + shift */
+            scale_sig32( sts[0]->old_input_signal32_fx, input_frame, shift ); /* q_old_inp32 + shift */
+            sts[1]->q_inp32 = add( sts[1]->q_inp32, shift );
+            sts[0]->q_inp32 = add( sts[0]->q_inp32, shift );
+            sts[1]->q_old_inp32 = add( sts[1]->q_old_inp32, shift );
+            sts[0]->q_old_inp32 = add( sts[0]->q_old_inp32, shift );
+            move16();
+            move16();
+            move16();
+            move16();
+        }
+    }
 
-    Scale_sig( sts[0]->input_fx, input_frame, sub( q_inp, sts[0]->q_inp ) );                /* q_inp */
-    Scale_sig( sts[0]->old_input_signal_fx, input_frame, sub( q_inp, sts[0]->q_old_inp ) ); /* q_inp */
-    sts[0]->q_inp = q_inp;
-    move16();
-    sts[0]->q_old_inp = q_inp;
-    move16();
-    Scale_sig( sts[0]->buf_speech_enc, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( q_inp, sub( Q15, sts[0]->exp_buf_speech_enc ) ) ); // q_inp
-    sts[0]->exp_buf_speech_enc = sub( Q15, q_inp );
-    move16();
-    stereo_switching_enc_fx( hCPE, sts[0]->old_input_signal_fx, input_frame, q_inp );
+    stereo_switching_enc_fx( hCPE, sts[0]->old_input_signal32_fx, input_frame, sts[0]->q_old_inp32 );
 
     /*----------------------------------------------------------------*
      * Temporal inter-channel alignment, stereo adjustment
      *----------------------------------------------------------------*/
-
-    Copy_Scale_sig_16_32( sts[0]->input_buff_fx, sts[0]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), Q6 ); /* Q6 + sts[0]->q_inp */
-    sts[0]->q_inp32 = add( Q6, sts[0]->q_inp );
+    shift = s_min( L_norm_arr( sts[0]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), L_norm_arr( sts[1]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) );
+    q_min = add( sts[0]->q_inp32, sub( shift, find_guarded_bits_fx( input_frame ) ) );
+    scale_sig32( sts[1]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), sub( q_min, sts[1]->q_inp32 ) ); /* q_min */
+    scale_sig32( sts[0]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), sub( q_min, sts[0]->q_inp32 ) ); /* q_min */
+    sts[0]->q_inp32 = sts[1]->q_inp32 = sts[0]->q_old_inp32 = sts[1]->q_old_inp32 = q_min;
+    move16();
+    move16();
     move16();
-    Copy_Scale_sig_16_32( sts[1]->input_buff_fx, sts[1]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), Q6 ); /* Q6 + sts[0]->q_inp */
-    sts[1]->q_inp32 = add( Q6, sts[1]->q_inp );
     move16();
 
     stereo_tca_enc_fx( hCPE, input_frame );
 
-    shift = s_min( 0, sub( add( L_norm_arr( sts[0]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), sts[0]->q_inp32 ), 16 ) );
+    shift = sub( add( L_norm_arr( sts[0]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), sts[0]->q_inp32 ), 16 );
     shift = s_min( shift, sub( add( L_norm_arr( sts[1]->input_buff32_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), sts[1]->q_inp32 ), 16 ) );
     Copy_Scale_sig32_16( sts[0]->input_buff32_fx, sts[0]->input_buff_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), sub( add( Q16, shift ), sts[0]->q_inp32 ) ); // shift
     Copy_Scale_sig32_16( sts[1]->input_buff32_fx, sts[1]->input_buff_fx, L_FRAME48k + L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), sub( add( Q16, shift ), sts[1]->q_inp32 ) ); // shift
@@ -454,9 +444,12 @@ ivas_error ivas_cpe_enc_fx(
 
     FOR( n = 0; n < CPE_CHANNELS; n++ )
     {
+        Copy32( sts[n]->input32_fx, orig_input_fx32[n], input_frame );        /* sts->q_inp32 */
         Copy( sts[n]->input_fx, orig_input_fx[n], input_frame );              /* sts->q_inp */
         Scale_sig( orig_input_fx[n], input_frame, sub( -1, sts[n]->q_inp ) ); // Q(-1)
         Q_orig_inp[n] = -1;
+        Q_orig_inp32[n] = sts[n]->q_inp32;
+        move16();
         move16();
 
         IF( hCPE->hStereoICBWE != NULL )
@@ -476,7 +469,7 @@ ivas_error ivas_cpe_enc_fx(
         IF( sts[n]->hTranDet == NULL )
         {
             currFlatness_fx[n] = 0;
-            move16();
+            move32();
             CONTINUE;
         }
 
@@ -486,8 +479,8 @@ ivas_error ivas_cpe_enc_fx(
             RunTransientDetection_ivas_fx( sts[n]->input_fx, input_frame, sts[n]->hTranDet, sts[n]->q_inp ); // Note q of sts[n]->input_fx changes inside function
         }
 
-        currFlatness_fx[n] = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) sts[n]->hTranDet, NSUBBLOCKS, 0 ); // Q7
-        move16();
+        currFlatness_fx[n] = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) sts[n]->hTranDet, NSUBBLOCKS, 0 ); // Q21
+        move32();
     }
 
     /* Synchonize detection for downmix-based stereo */
@@ -638,13 +631,8 @@ ivas_error ivas_cpe_enc_fx(
      * Stereo processing
      * Stereo down-mix
      *----------------------------------------------------------------*/
-    // printf("\n%f %f ", hCPE->hStereoClassif->is_speech, hCPE->hCoreCoder[0]->hSpMusClas->past_dlp[0]);
     IF( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
     {
-#ifndef MSAN_FIX
-        hCPE->hStereoClassif->xtalk_score_fx = floatToFixed( hCPE->hStereoClassif->xtalk_score, 31 );
-#endif // !MSAN_FIX
-        /*flt2fix: dft_synthesize*/
         test();
         if ( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) && hCPE->hStereoDft->res_cod_mode[STEREO_DFT_OFFSET] )
         {
@@ -661,35 +649,31 @@ ivas_error ivas_cpe_enc_fx(
         hCPE->hStereoDft->Spd_R_smooth_fx_e = sub( hCPE->hStereoDft->Spd_R_smooth_fx_e, temp );
         move16();
 
-        shift = getScaleFactor16( sts[1]->old_input_signal_fx, input_frame );
-        Scale_sig( sts[1]->old_input_signal_fx, input_frame, shift ); /* sts[1]->q_old_inp + shift */
-        sts[1]->q_old_inp = add( sts[1]->q_old_inp, shift );
-        move16();
-        shift = getScaleFactor16( sts[1]->input_fx, input_frame );
-        Scale_sig( sts[1]->input_fx, input_frame, shift ); /* sts[1]->q_inp + shift */
-        sts[1]->q_inp = add( sts[1]->q_inp, shift );
-        move16();
-        Scale_sig( sts[1]->input_fx, input_frame, sub( s_min( sts[1]->q_inp, sts[1]->q_old_inp ), sts[1]->q_inp ) );                /* min( sts[1]->q_inp, sts[1]->q_old_inp) */
-        Scale_sig( sts[1]->old_input_signal_fx, input_frame, sub( s_min( sts[1]->q_old_inp, sts[1]->q_inp ), sts[1]->q_old_inp ) ); /* min( sts[1]->q_old_inp, sts[1]->q_inp) */
-        sts[1]->q_inp = s_min( sts[1]->q_inp, sts[1]->q_old_inp );
-        move16();
-        sts[1]->q_old_inp = sts[1]->q_inp;
-        move16();
 
-        shift = getScaleFactor16( sts[0]->old_input_signal_fx, input_frame );
-        Scale_sig( sts[0]->old_input_signal_fx, input_frame, shift ); /* sts[0]->q_old_inp + shift */
-        sts[0]->q_old_inp = add( sts[0]->q_old_inp, shift );
-        move16();
-        shift = getScaleFactor16( sts[0]->input_fx, input_frame );
-        Scale_sig( sts[0]->input_fx, input_frame, shift ); /* sts[0]->q_inp + shift */
-        sts[0]->q_inp = add( sts[0]->q_inp, shift );
-        move16();
-        Scale_sig( sts[0]->input_fx, input_frame, sub( s_min( sts[0]->q_inp, sts[0]->q_old_inp ), sts[0]->q_inp ) );                /* min( sts[1]->q_inp, sts[1]->q_old_inp) */
-        Scale_sig( sts[0]->old_input_signal_fx, input_frame, sub( s_min( sts[0]->q_old_inp, sts[0]->q_inp ), sts[0]->q_old_inp ) ); /* min( sts[1]->q_old_inp, sts[1]->q_inp) */
-        sts[0]->q_inp = s_min( sts[0]->q_inp, sts[0]->q_old_inp );
-        move16();
-        sts[0]->q_old_inp = sts[0]->q_inp;
-        move16();
+        FOR( n = 0; n < CPE_CHANNELS; n++ )
+        {
+            q_com = sub( add( L_norm_arr( sts[n]->input32_fx, input_frame ), sts[n]->q_inp32 ), 16 );
+            q_com = s_min( q_com, sub( add( L_norm_arr( sts[n]->old_input_signal32_fx, input_frame ), sts[n]->q_old_inp32 ), 16 ) );
+            q_com = s_min( q_com, add( norm_arr( hCPE->input_mem_fx[n], hCPE->hStereoDft->dft_ovl ), hCPE->q_input_mem[n] ) );
+
+            if ( EQ_16( q_com, Q15 ) )
+            {
+                q_com = 0;
+                move16();
+            }
+
+            Copy_Scale_sig_32_16( sts[n]->input32_fx, sts[n]->input_fx, input_frame, sub( q_com, sts[n]->q_inp32 ) );
+            sts[n]->q_inp = q_com;
+            move16();
+
+            Copy_Scale_sig_32_16( sts[n]->old_input_signal32_fx, sts[n]->old_input_signal_fx, input_frame, sub( q_com, sts[n]->q_old_inp32 ) );
+            sts[n]->q_old_inp = q_com;
+            move16();
+
+            scale_sig( hCPE->input_mem_fx[n], hCPE->hStereoDft->dft_ovl, sub( q_com, hCPE->q_input_mem[n] ) );
+            hCPE->q_input_mem[n] = q_com;
+            move16();
+        }
 
         stereo_dft_hybrid_ITD_flag_fx( hCPE->hStereoDft->hConfig, input_Fs, hCPE->hStereoDft->hItd->hybrid_itd_max );
 
@@ -734,6 +718,8 @@ ivas_error ivas_cpe_enc_fx(
             move16();
         }
         stereo_tdm_downmix_ivas_fx( hCPE->hStereoTD, sts[0]->input_fx, sts[1]->input_fx, input_frame, tdm_ratio_idx, tdm_SM_flag, tdm_ratio_idx_SM );
+        Copy_Scale_sig_16_32_no_sat( sts[0]->input_fx, sts[0]->input32_fx, input_frame, sub( sts[0]->q_inp32, sts[0]->q_inp ) );
+        Copy_Scale_sig_16_32_no_sat( sts[1]->input_fx, sts[1]->input32_fx, input_frame, sub( sts[1]->q_inp32, sts[1]->q_inp ) );
 
         /* signal the bitrate for BW selection in the SCh */
         sts[0]->bits_frame_channel = 0;
@@ -748,8 +734,8 @@ ivas_error ivas_cpe_enc_fx(
             move16();
         }
 
-        Etot_last_fx[0] = sts[0]->hNoiseEst->Etot_last_fx; /* Q8 */
-        Etot_last_fx[1] = sts[1]->hNoiseEst->Etot_last_fx; /* Q8 */
+        Etot_last_fx[0] = extract_h( sts[0]->hNoiseEst->Etot_last_32fx ); /* Q8 */
+        Etot_last_fx[1] = extract_h( sts[1]->hNoiseEst->Etot_last_32fx ); /* Q8 */
         move16();
         move16();
     }
@@ -764,40 +750,41 @@ ivas_error ivas_cpe_enc_fx(
                 sts[1]->exp_old_inp_12k8 = Q15;
                 move16();
             }
-        }
-        test();
-        IF( hCPE->hStereoMdct != NULL && hCPE->hStereoMdct->hItd != NULL )
-        {
 
-            shift = getScaleFactor16( sts[1]->old_input_signal_fx, input_frame );
-            Scale_sig( sts[1]->old_input_signal_fx, input_frame, shift ); /* sts[1]->q_old_inp + shift */
-            sts[1]->q_old_inp = add( sts[1]->q_old_inp, shift );
-            move16();
-            shift = getScaleFactor16( sts[1]->input_fx, input_frame );
-            Scale_sig( sts[1]->input_fx, input_frame, shift ); /* sts[1]->q_inp + shift */
-            sts[1]->q_inp = add( sts[1]->q_inp, shift );
-            move16();
-            Scale_sig( sts[1]->input_fx, input_frame, sub( s_min( sts[1]->q_inp, sts[1]->q_old_inp ), sts[1]->q_inp ) );                /* min( sts[1]->q_inp, sts[1]->q_old_inp ) */
-            Scale_sig( sts[1]->old_input_signal_fx, input_frame, sub( s_min( sts[1]->q_old_inp, sts[1]->q_inp ), sts[1]->q_old_inp ) ); /* min( sts[1]->q_inp, sts[1]->q_old_inp ) */
-            sts[1]->q_inp = s_min( sts[1]->q_inp, sts[1]->q_old_inp );
+            q_min = sts[1]->q_old_inp;
             move16();
-            sts[1]->q_old_inp = sts[1]->q_inp;
+            q_min = s_min( q_min, sts[1]->q_inp );
+            q_min = s_min( q_min, sts[0]->q_old_inp );
+            q_min = s_min( q_min, sts[0]->q_inp );
+            q_min = s_min( q_min, hCPE->q_input_mem[0] );
+            q_min = s_min( q_min, hCPE->q_input_mem[1] );
+
+            shift = norm_arr( sts[1]->old_input_signal_fx, input_frame );
+            shift = s_min( shift, norm_arr( sts[1]->input_fx, input_frame ) );
+            shift = s_min( shift, norm_arr( sts[0]->old_input_signal_fx, input_frame ) );
+            shift = s_min( shift, norm_arr( sts[0]->input_fx, input_frame ) );
+            shift = s_min( shift, norm_arr( hCPE->input_mem_fx[0], hCPE->hStereoMdct->hDft_ana->dft_ovl ) );
+            shift = s_min( shift, norm_arr( hCPE->input_mem_fx[1], hCPE->hStereoMdct->hDft_ana->dft_ovl ) );
+
+            q_min = add( q_min, shift );
+
+            scale_sig( sts[1]->input_fx, input_frame, sub( q_min, sts[1]->q_inp ) );                                      /* q_min */
+            scale_sig( sts[1]->old_input_signal_fx, input_frame, sub( q_min, sts[1]->q_old_inp ) );                       /* q_min */
+            scale_sig( sts[0]->input_fx, input_frame, sub( q_min, sts[0]->q_inp ) );                                      /* q_min */
+            scale_sig( sts[0]->old_input_signal_fx, input_frame, sub( q_min, sts[0]->q_old_inp ) );                       /* q_min */
+            scale_sig( hCPE->input_mem_fx[0], hCPE->hStereoMdct->hDft_ana->dft_ovl, sub( q_min, hCPE->q_input_mem[0] ) ); /* q_min */
+            scale_sig( hCPE->input_mem_fx[1], hCPE->hStereoMdct->hDft_ana->dft_ovl, sub( q_min, hCPE->q_input_mem[1] ) ); /* q_min */
+            hCPE->q_input_mem[1] = q_min;
+            hCPE->q_input_mem[0] = q_min;
+            sts[1]->q_old_inp = q_min;
+            sts[0]->q_old_inp = q_min;
+            sts[1]->q_inp = q_min;
+            sts[0]->q_inp = q_min;
             move16();
-
-            shift = getScaleFactor16( sts[0]->old_input_signal_fx, input_frame );
-            Scale_sig( sts[0]->old_input_signal_fx, input_frame, shift ); /* sts[0]->q_old_inp + shift*/
-            sts[0]->q_old_inp = add( sts[0]->q_old_inp, shift );
             move16();
-            shift = getScaleFactor16( sts[0]->input_fx, input_frame );
-            Scale_sig( sts[0]->input_fx, input_frame, shift ); /* sts[0]->q_inp + shift */
-            sts[0]->q_inp = add( sts[0]->q_inp, shift );
             move16();
             move16();
-            Scale_sig( sts[0]->input_fx, input_frame, sub( s_min( sts[0]->q_inp, sts[0]->q_old_inp ), sts[0]->q_inp ) );                /* min( sts[0]->q_inp, sts[0]->q_old_inp ) */
-            Scale_sig( sts[0]->old_input_signal_fx, input_frame, sub( s_min( sts[0]->q_old_inp, sts[0]->q_inp ), sts[0]->q_old_inp ) ); /* min( sts[0]->q_inp, sts[0]->q_old_inp ) */
-            sts[0]->q_inp = s_min( sts[0]->q_inp, sts[0]->q_old_inp );
             move16();
-            sts[0]->q_old_inp = sts[0]->q_inp;
             move16();
         }
 
@@ -807,7 +794,6 @@ ivas_error ivas_cpe_enc_fx(
     /*----------------------------------------------------------------*
      * DFT stereo: iDFT and resampling on both channels
      *----------------------------------------------------------------*/
-
     IF( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
     {
         Word32 internal_Fs;
@@ -819,7 +805,7 @@ ivas_error ivas_cpe_enc_fx(
         }
         ELSE
         {
-            internal_Fs = max( INT_FS_16k, sts[0]->sr_core );
+            internal_Fs = L_max( INT_FS_16k, sts[0]->sr_core );
         }
 
         /* iDFT at input sampling rate */
@@ -828,15 +814,38 @@ ivas_error ivas_cpe_enc_fx(
         Word16 out_16k_start_ind = 0, out_16k_end_ind = 0;
         move16();
         move16();
+
         stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, sts[0]->input32_fx, &out_start_ind, &out_end_ind, 0, input_Fs, input_Fs, 0, NULL );
 
+        scale_sig32( sts[0]->input32_fx - input_frame, add( out_start_ind, input_frame ), sub( Q15, sts[0]->q_old_inp32 ) ); // scaling initial part of the input buffer
+        scale_sig32( sts[0]->input32_fx + out_end_ind, sub( input_frame, out_end_ind ), sub( Q15, sts[0]->q_inp32 ) );       // scaling initial part of the input buffer
+        sts[0]->q_inp32 = Q15;
+        sts[0]->q_old_inp32 = Q15;
+        move16();
+        move16();
+
+        // Normalise the input buffer from Q15
+        Word16 input_norm, q_inp; //, common_q, fir_delay_len;
+        input_norm = L_norm_arr( sts[0]->input32_fx - input_frame, shl( input_frame, 1 ) );
+        q_inp = sub( add( Q15, input_norm ), 16 );
+
+        // Rescale the old input, input and FIR delay section of input buffer
+        Copy_Scale_sig32_16( sts[0]->input32_fx - input_frame, sts[0]->input_fx - input_frame, shl( input_frame, 1 ), sub( add( Q16, q_inp ), Q15 ) ); // Q15 -> q_inp
+
+        // Update the Q-factors
+        sts[0]->q_inp = q_inp;
+        move16();
+        sts[0]->q_old_inp = q_inp;
+        move16();
+
         /* iDFT & resampling to 12.8kHz internal sampling rate */
         stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, old_inp_12k8_fx[0] + L_INP_MEM, &out_12k8_start_ind[0], &out_12k8_end_ind[0], 0, input_Fs, INT_FS_12k8, 0, NULL );
+        Copy_Scale_sig_32_16( old_inp_12k8_fx[0], old_inp_12k8_16fx[0], L_INP_12k8, -Q16 ); // Q-1
 
         /* iDFT & resampling to 16kHz internal sampling rate for M channel */
         IF( EQ_32( input_Fs, internal_Fs ) )
         {
-            Copy32( sts[0]->input32_fx - STEREO_DFT_OVL_16k, old_inp_16k_fx[0] + L_INP_MEM - STEREO_DFT_OVL_16k, add( input_frame, STEREO_DFT_OVL_16k ) ); /* Q_inp */
+            Copy32( sts[0]->input32_fx - STEREO_DFT_OVL_16k, old_inp_16k_fx[0] + L_INP_MEM - STEREO_DFT_OVL_16k, add( input_frame, STEREO_DFT_OVL_16k ) ); /* sts[0]->q_inp32 */
             out_16k_start_ind = -STEREO_DFT_OVL_16k;
             out_16k_end_ind = add( out_16k_start_ind, add( input_frame, STEREO_DFT_OVL_16k ) );
             move16();
@@ -846,6 +855,7 @@ ivas_error ivas_cpe_enc_fx(
         {
             stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, old_inp_16k_fx[0] + L_INP_MEM, &out_16k_start_ind, &out_16k_end_ind, 0, input_Fs, internal_Fs, 0, NULL );
         }
+        Copy_Scale_sig32_16( old_inp_16k_fx[0], old_inp_16k_16fx[0], L_INP, 0 ); // Q15->Q-1
 
         /* DFT Stereo: iDFT of residual signal at 8kHz sampling rate */
         test();
@@ -856,24 +866,18 @@ ivas_error ivas_cpe_enc_fx(
 
             /* update old input signal buffer */
             Copy_Scale_sig_32_16( old_inp_12k8_fx[1] + L_FRAME8k, sts[1]->old_inp_12k8_fx, L_INP_MEM, 0 - 15 ); // Q0
-        }
-        Copy_Scale_sig32_16( sts[0]->input32_fx + out_start_ind, sts[0]->input_fx + out_start_ind, sub( out_end_ind, out_start_ind ), sub( add( Q16, sts[0]->q_inp ), Q15 ) ); // Q15
-
-        Copy_Scale_sig32_16( old_inp_16k_fx[0], old_inp_16k_16fx[0], L_INP, 0 ); // Q15->Q-1
-        /*local fix2flt*/
-        /*fix2flt: dft_synthesize*/
-        Copy_Scale_sig_32_16( old_inp_12k8_fx[0] + L_INP_MEM + out_12k8_start_ind[0], old_inp_12k8_16fx[0] + L_INP_MEM + out_12k8_start_ind[0], out_12k8_end_ind[0] - out_12k8_start_ind[0], -Q16 ); // Q-1
-        if ( hCPE->element_mode == IVAS_CPE_DFT && hCPE->hStereoDft->res_cod_mode[STEREO_DFT_OFFSET] )
-        {
             sts[1]->exp_old_inp_12k8 = Q15;
             move16();
-            Copy_Scale_sig_32_16( old_inp_12k8_fx[1] + L_INP_MEM + out_12k8_start_ind[1], old_inp_12k8_16fx[1] + L_INP_MEM + out_12k8_start_ind[1], out_12k8_end_ind[1] - out_12k8_start_ind[1], -Q16 ); // Q-1
+            Copy_Scale_sig_32_16( old_inp_12k8_fx[1], old_inp_12k8_16fx[1], L_INP_12k8, -Q16 ); // Q-1
         }
 
         /* no iDFT at input sampling rate for Side channel -> reset the buffer */
         set16_fx( sts[1]->input_fx, 0, input_frame );
         sts[1]->q_inp = Q15;
         move16();
+        set32_fx( sts[1]->input32_fx, 0, input_frame );
+        sts[1]->q_inp32 = Q31;
+        move16();
     }
 
 #ifdef DEBUG_MODE_INFO
@@ -883,13 +887,8 @@ ivas_error ivas_cpe_enc_fx(
     /*----------------------------------------------------------------*
      * Front Pre-processing
      *----------------------------------------------------------------*/
-
     FOR( n = 0; n < n_CoreChannels; n++ )
     {
-        FOR( Word16 i = 0; i < hCPE->hCoreCoder[n]->nb_subfr; i++ )
-        {
-            Scale_sig( &A_fx[n][i * ( M + 1 )], M + 1, sub( norm_s( A_fx[n][i * ( M + 1 )] ), 2 ) ); // scaling to Q12
-        }
         set16_fx( old_wsp_fx[n], 0, L_WSP );
         q_old_wsp = Q15;
         move16();
@@ -902,11 +901,12 @@ ivas_error ivas_cpe_enc_fx(
         {
             front_vad_flag = 0;
         }
+
         error = pre_proc_front_ivas_fx( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8_16fx[n], old_inp_16k_16fx[n],
                                         &ener_fx[n], &relE_fx[n], A_fx[n], Aw_fx[n], epsP_fx[n], &epsP_fx_q[n], lsp_new_fx[n], lsp_mid_fx[n], &vad_hover_flag[n], &attack_flag[n],
                                         realBuffer_fx[n], imagBuffer_fx[n], &q_re_im_buf[n], old_wsp_fx[n], &q_old_wsp, pitch_fr_fx[n], voicing_fr_fx[n], &loc_harm[n], &cor_map_sum_fx[n], &vad_flag_dtx[n], enerBuffer_fx[n], &enerBuffer_fx_exp[n],
                                         fft_buff_fx[n], &fft_buff_fx_q[n], A_fx[0], lsp_new_fx[0], currFlatness_fx[n], tdm_ratio_idx, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, q_lf_E[n], localVAD_HE_SAD,
-                                        band_energies_LR_fx, q_band_energies_LR, 0, front_vad_flag, 0, 0, ivas_format, st_ivas->hMCT != NULL, ivas_total_brate, &Q_new[n]
+                                        band_energies_LR_fx, q_band_energies_LR, 0, front_vad_flag, 0, 0, ivas_format, st_ivas->hMCT != NULL, st_ivas->hEncoderConfig->last_ivas_total_brate, ivas_total_brate, &Q_new[n]
 #ifdef DEBUG_MODE_INFO
                                         ,
                                         ( st_ivas->nSCE + ( cpe_id * CPE_CHANNELS ) + n )
@@ -1138,7 +1138,7 @@ ivas_error ivas_cpe_enc_fx(
         test();
         IF( !( ( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) ) && ( EQ_32( sts[0]->core_brate, SID_2k40 ) || sts[0]->core_brate == FRAME_NO_DATA ) ) )
         {
-            Word16 max_bits = extract_l( L_sub( Mpy_32_32_r( hCPE->element_brate, ONE_BY_FRAMES_PER_SEC_Q31 ), Mult_32_16( sts[0]->bits_frame_nominal, 26214 /* 0.8f in Q15 */ ) ) );
+            Word16 max_bits = extract_l( W_extract_h( W_sub( W_mult_32_32( hCPE->element_brate, ONE_BY_FRAMES_PER_SEC_Q31 ), W_mult_32_32( L_deposit_l( sts[0]->bits_frame_nominal ), 1717986918 /* 0.8f in Q31 */ ) ) ) );
             test();
             IF( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) )
             {
@@ -1151,7 +1151,7 @@ ivas_error ivas_cpe_enc_fx(
 
             FOR( Word16 i = 0; i < CPE_CHANNELS; i++ )
             {
-                Copy_Scale_sig_16_32( old_inp_12k8_16fx[i], old_inp_12k8_fx[i], L_INP_12k8, Q16 + Q1 );
+                Copy_Scale_sig_16_32_no_sat( old_inp_12k8_16fx[i], old_inp_12k8_fx[i], L_INP_12k8, Q16 ); // Q(-1) -> Q15
             }
             stereo_dft_enc_res_fx( hCPE->hStereoDft, old_inp_12k8_fx[1] + L_INP_MEM - STEREO_DFT_OVL_8k, hCPE->hMetaData, &nb_bits, max_bits );
         }
@@ -1182,7 +1182,6 @@ ivas_error ivas_cpe_enc_fx(
         }
     }
 
-
     /*----------------------------------------------------------------*
      * Core Encoder
      *----------------------------------------------------------------*/
@@ -1218,6 +1217,9 @@ ivas_error ivas_cpe_enc_fx(
         /* update input samples buffer */
         FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
+            Copy32( orig_input_fx32[n], sts[n]->old_input_signal32_fx, input_frame ); /* Q_orig_inp32 */
+            sts[n]->q_old_inp32 = Q_orig_inp32[n];
+            move16();
             Copy( orig_input_fx[n], sts[n]->old_input_signal_fx, input_frame ); /* Q_orig_inp */
             sts[n]->q_old_inp = Q_orig_inp[n];
             move16();
@@ -1228,6 +1230,9 @@ ivas_error ivas_cpe_enc_fx(
         Copy( sts[0]->input_fx, sts[0]->old_input_signal_fx, input_frame ); /* sts[n]->q_inp */
         sts[0]->q_old_inp = sts[0]->q_inp;
         move16();
+        Copy32( sts[0]->input32_fx, sts[0]->old_input_signal32_fx, input_frame ); /* st->q_inp32 */
+        sts[0]->q_old_inp32 = sts[0]->q_inp32;
+        move16();
     }
     ELSE IF( st_ivas->hMCT == NULL ) /* note: in MCT, input buffers are updated later in ivas_mct_enc() */
     {
@@ -1237,6 +1242,9 @@ ivas_error ivas_cpe_enc_fx(
             Copy( sts[n]->input_fx, sts[n]->old_input_signal_fx, input_frame ); /* sts[n]->q_inp */
             sts[n]->q_old_inp = sts[n]->q_inp;
             move16();
+            Copy32( sts[n]->input32_fx, sts[n]->old_input_signal32_fx, input_frame ); /* st->q_inp32 */
+            sts[n]->q_old_inp32 = sts[n]->q_inp32;
+            move16();
         }
     }
 
@@ -1353,21 +1361,19 @@ ivas_error create_cpe_enc_fx(
         test();
         IF( EQ_16( ivas_format, STEREO_FORMAT ) || EQ_16( ivas_format, MASA_FORMAT ) || ( EQ_16( ivas_format, MC_FORMAT ) && EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) )
         {
-            IF( ( hCPE->input_mem_fx[n] = (Word16 *) malloc( sizeof( Word16 ) * NS2SA( input_Fs, STEREO_DFT_OVL_NS ) ) ) == NULL )
+            IF( ( hCPE->input_mem_fx[n] = (Word16 *) malloc( sizeof( Word16 ) * NS2SA_FX2( input_Fs, STEREO_DFT_OVL_NS ) ) ) == NULL )
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) );
             }
 
-            set16_zero_fx( hCPE->input_mem_fx[n], NS2SA( input_Fs, STEREO_DFT_OVL_NS ) );
+            set16_zero_fx( hCPE->input_mem_fx[n], NS2SA_FX2( input_Fs, STEREO_DFT_OVL_NS ) );
         }
         ELSE
         {
             hCPE->input_mem_fx[n] = NULL;
         }
     }
-#ifdef MSAN_FIX
     set16_fx( hCPE->q_input_mem, Q15, CPE_CHANNELS );
-#endif
 
     /*-----------------------------------------------------------------*
      * stereo classifier: allocate and initialize
diff --git a/lib_enc/ivas_decision_matrix_enc.c b/lib_enc/ivas_decision_matrix_enc_fx.c
similarity index 92%
rename from lib_enc/ivas_decision_matrix_enc.c
rename to lib_enc/ivas_decision_matrix_enc_fx.c
index 0ecafc6c3fdb42a50ac19a840dff857d14def364..bd63553bd70f502ee2ad342de594d6ade28caf07 100644
--- a/lib_enc/ivas_decision_matrix_enc.c
+++ b/lib_enc/ivas_decision_matrix_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,11 +35,9 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"      /* Function prototypes                    */
 #include "ivas_prot_fx.h" /* Function prototypes                    */
 #include "ivas_prot_fx.h" /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                    */
@@ -207,6 +205,17 @@ void ivas_decision_matrix_enc_fx(
     test();
     test();
 
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &st->core, sizeof( int16_t ), 1, fname( st->force_dir, "force_core_loc1.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &st->core, sizeof( int16_t ), 1, 1, "res/force_core_loc1.enf" );
+    }
+#endif
+
     /* do not allow TD stereo ACELP core -> DFT stereo TCX core switching as it is on the WC complexity path */
     if ( ( ( st->last_core == ACELP_CORE && EQ_16( last_element_mode, IVAS_CPE_TD ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) || ( EQ_16( st->tdm_LRTD_flag, 1 ) && LE_32( st->total_brate, IVAS_16k4 ) ) ) && EQ_16( st->core, TCX_20_CORE ) && LE_32( st->total_brate, MAX_ACELP_BRATE ) ) /* Override TCX in case of LRTD && primary channel has low bitrate*/
     {
@@ -244,10 +253,17 @@ void ivas_decision_matrix_enc_fx(
         {
             st->core = ACELP_CORE;
         }
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        else if ( st->force == FORCE_TCX20 || st->force == FORCE_TCX10 ) /* Initalizations should always happen with TCX20*/
+        {
+            st->core = TCX_20_CORE;
+        }
+#else
         else if ( st->force == FORCE_TCX )
         {
             st->core = TCX_20_CORE;
         }
+#endif
         else if ( st->force == FORCE_HQ && st->element_mode != IVAS_CPE_MDCT && element_brate >= IVAS_24k4 )
         {
             st->core = HQ_CORE;
@@ -294,6 +310,17 @@ void ivas_decision_matrix_enc_fx(
         move16();
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( st->force_dir[0] != '\0' )
+    {
+        dbgread( &st->core, sizeof( int16_t ), 1, fname( st->force_dir, "force_core_loc2.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &st->core, sizeof( int16_t ), 1, 1, "res/force_core_loc2.enf" );
+    }
+#endif
+
     /*---------------------------------------------------------------------*
      * Select ACELP and GSC extension layer
      *---------------------------------------------------------------------*/
@@ -343,6 +370,19 @@ void ivas_decision_matrix_enc_fx(
                     }
                 }
             }
+
+#ifdef DEBUG_FORCE_DIR
+            if ( st->force_dir[0] != '\0' )
+            {
+                dbgread( &st->extl, sizeof( int16_t ), 1, fname( st->force_dir, "force_extl.enf", -1, -1, -1 ) );
+                dbgread( &st->extl_brate, sizeof( int32_t ), 1, fname( st->force_dir, "force_extl_brate.enf", -1, -1, -1 ) );
+            }
+            else
+            {
+                dbgwrite( &st->extl, sizeof( int16_t ), 1, 1, "res/force_extl.enf" );
+                dbgwrite( &st->extl_brate, sizeof( int32_t ), 1, 1, "res/force_extl_brate.enf" );
+            }
+#endif
         }
 
         /* SWB and FB */
@@ -440,6 +480,19 @@ void ivas_decision_matrix_enc_fx(
                 move32();
             }
 
+#ifdef DEBUG_FORCE_DIR
+            if ( st->force_dir[0] != '\0' )
+            {
+                dbgread( &st->extl, sizeof( int16_t ), 1, fname( st->force_dir, "force_extl.enf", -1, -1, -1 ) );
+                dbgread( &st->extl_brate, sizeof( int32_t ), 1, fname( st->force_dir, "force_extl_brate.enf", -1, -1, -1 ) );
+            }
+            else
+            {
+                dbgwrite( &st->extl, sizeof( int16_t ), 1, 1, "res/force_extl.enf" );
+                dbgwrite( &st->extl_brate, sizeof( int32_t ), 1, 1, "res/force_extl_brate.enf" );
+            }
+#endif
+
             /* set IC-BWE bitrate */
             test();
             test();
diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc_fx.c
similarity index 86%
rename from lib_enc/ivas_dirac_enc.c
rename to lib_enc/ivas_dirac_enc_fx.c
index 58a916858f789a241ff886158dd6951e3e79d27b..615a6f4b630124866a0aa9acc77837511514d3e6 100644
--- a/lib_enc/ivas_dirac_enc.c
+++ b/lib_enc/ivas_dirac_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
@@ -53,13 +51,9 @@ static void computeIntensityVector_enc_fx(
     Word32 Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],
     const Word16 enc_param_start_band, /* i  : first band to process */
     const Word16 num_frequency_bands,
-    Word32 intensity_real[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS]
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-    ,
+    Word32 intensity_real[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS],
     Word16 q_cldfb,
-    Word16 q_intensity_real[DIRAC_MAX_NBANDS]
-#endif
-);
+    Word16 q_intensity_real[DIRAC_MAX_NBANDS] );
 
 /*-------------------------------------------------------------------------
  * ivas_dirac_enc_open()
@@ -327,8 +321,8 @@ ivas_error ivas_dirac_enc_fx(
     const Word16 input_frame,      /* i  : input frame length								Q0*/
     const Word16 dtx_vad,          /* i  : DTX vad flag										Q0*/
     const IVAS_FORMAT ivas_format, /* i  : ivas format										*/
-    const Word16 hodirac_flag      /* i  : hodirac flag										Q0*/
-)
+    const Word16 hodirac_flag,     /* i  : hodirac flag										Q0*/
+    const Word16 shift )
 {
     Word16 orig_dirac_bands;
     Word32 dir_fx[3], avg_dir_fx[3];
@@ -338,18 +332,18 @@ ivas_error ivas_dirac_enc_fx(
 
     Word16 nchan_fb_in;
 
-    if ( hodirac_flag )
+    IF( hodirac_flag )
     {
         nchan_fb_in = HOA2_CHANNELS;
         move16();
     }
-    else
+    ELSE
     {
         nchan_fb_in = FOA_CHANNELS;
         move16();
     }
 
-    ivas_dirac_param_est_enc_fx( hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes, data_f_fx, pp_fr_real_fx, pp_fr_imag_fx, pp_fr_q, input_frame, ivas_format, hodirac_flag, nchan_fb_in, &( hDirAC->mono_frame_count ), &( hQMetaData->dirac_mono_flag ) );
+    ivas_dirac_param_est_enc_fx( hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes, data_f_fx, pp_fr_real_fx, pp_fr_imag_fx, pp_fr_q, input_frame, ivas_format, hodirac_flag, nchan_fb_in, &( hDirAC->mono_frame_count ), &( hQMetaData->dirac_mono_flag ), shift );
 
     IF( hQMetaData->q_direction->cfg.nbands > 0 )
     {
@@ -585,29 +579,33 @@ static Word16 ivas_dirac_get_mono_flag_fx(
         move16();
         move16();
 
+        Word16 gb = find_guarded_bits_fx( sub( brange[1], brange[0] ) );
+
         /* Loop over the W channel bins to calculate the power in the band */
         FOR( j = brange[0]; j < brange[1]; j++ )
         {
-            acc = W_mac_32_32( acc, Cldfb_RealBuffer[0][j], Cldfb_RealBuffer[0][j] ); /* exp(2 * e_Cldfb) */
-            acc = W_mac_32_32( acc, Cldfb_ImagBuffer[0][j], Cldfb_ImagBuffer[0][j] ); /* exp(2 * e_Cldfb) */
-            shift1 = W_norm( acc );
-            W_band_power = W_extract_h( W_shl( acc, shift1 ) ); /* exp(2 * e_Cldfb - shift1) */
-            W_band_power_e = sub( imult1616( (Word16) 2, e_Cldfb ), shift1 );
+            acc = W_mac_32_32( acc, L_shr( Cldfb_RealBuffer[0][j], gb ), L_shr( Cldfb_RealBuffer[0][j], gb ) ); /*Q:(2*(31-e_Cldfb-gb)+1*/
+            acc = W_mac_32_32( acc, L_shr( Cldfb_ImagBuffer[0][j], gb ), L_shr( Cldfb_ImagBuffer[0][j], gb ) ); /*Q:(2*(31-e_Cldfb-gb)+1*/
         }
+        shift1 = W_norm( acc );
+        W_band_power = W_extract_h( W_shl( acc, shift1 ) ); /*Q:(2*(31-e_Cldfb-gb)+1+shift1-32*/
+        W_band_power_e = sub( shl( add( e_Cldfb, gb ), 1 ), shift1 );
 
+        gb = find_guarded_bits_fx( imult1616( sub( brange[1], brange[0] ), sub( nchan_ana, 1 ) ) );
         /* Loop over the other channels and bins to calculate the power in the band */
         FOR( ch_idx = 1; ch_idx < nchan_ana; ch_idx++ )
         {
             /* abs()^2 */
             FOR( j = brange[0]; j < brange[1]; j++ )
             {
-                acc1 = W_mac_32_32( acc1, Cldfb_RealBuffer[ch_idx][j], Cldfb_RealBuffer[ch_idx][j] ); /* exp(2 * e_Cldfb) */
-                acc1 = W_mac_32_32( acc1, Cldfb_ImagBuffer[ch_idx][j], Cldfb_ImagBuffer[ch_idx][j] ); /* exp(2 * e_Cldfb) */
-                shift2 = W_norm( acc1 );
-                other_ch_band_power = W_extract_h( W_shl( acc1, shift2 ) ); /* exp(2 * e_Cldfb - shift2) */
-                other_ch_band_power_e = sub( imult1616( (Word16) 2, e_Cldfb ), shift2 );
+                acc1 = W_mac_32_32( acc1, L_shr( Cldfb_RealBuffer[ch_idx][j], gb ), L_shr( Cldfb_RealBuffer[ch_idx][j], gb ) ); /*Q:(2*(31-e_Cldfb-gb)+1*/
+                acc1 = W_mac_32_32( acc1, L_shr( Cldfb_ImagBuffer[ch_idx][j], gb ), L_shr( Cldfb_ImagBuffer[ch_idx][j], gb ) ); /*Q:(2*(31-e_Cldfb-gb)+1*/
             }
         }
+        shift2 = W_norm( acc1 );
+        other_ch_band_power = W_extract_h( W_shl( acc1, shift2 ) ); /*Q:(2*(31-e_Cldfb-gb)+1+shift2-32*/
+        other_ch_band_power_e = sub( shl( add( e_Cldfb, gb ), 1 ), shift2 );
+
         IF( BASOP_Util_Cmp_Mant32Exp( other_ch_band_power, other_ch_band_power_e, EPSILON_FX_M, EPSILON_FX_E ) < 0 )
         {
             if ( BASOP_Util_Cmp_Mant32Exp( W_band_power, W_band_power_e, DIRAC_MONO_THRESH_SILENCE_FX, 31 ) > 0 )
@@ -759,7 +757,6 @@ void computeReferencePower_enc_fx_dirac(
         *dirac_mono_flag = ivas_dirac_get_mono_flag_fx( band_grouping, Cldfb_RealBuffer, Cldfb_ImagBuffer, e_Cldfb, nchan_ana, mono_frame_count ); /* Q0 */
         move16();
     }
-#ifdef FIX_1127_IMPROVE_SBA_MLD
     Word16 gb = 0;
     move16();
     FOR( i = 0; i < num_freq_bands; i++ )
@@ -772,7 +769,6 @@ void computeReferencePower_enc_fx_dirac(
     }
     e_reference_W = sub( 31, sub( add( shl( sub( 31, e_Cldfb ), 1 ), 1 ), gb ) );
     e_reference_temp = e_reference_W;
-#endif
     move16();
     FOR( i = 0; i < num_freq_bands; i++ )
     {
@@ -789,14 +785,8 @@ void computeReferencePower_enc_fx_dirac(
 
         FOR( j = brange[0]; j < brange[1]; j++ )
         {
-#ifdef FIX_1127_IMPROVE_SBA_MLD
             reference_power_W[i] = W_add( reference_power_W[i], W_shr( W_mult_32_32( Cldfb_RealBuffer[0][j], Cldfb_RealBuffer[0][j] ), gb ) ); /* exp(2 * e_Cldfb) */
             reference_power_W[i] = W_add( reference_power_W[i], W_shr( W_mult_32_32( Cldfb_ImagBuffer[0][j], Cldfb_ImagBuffer[0][j] ), gb ) ); /* exp(2 * e_Cldfb) */
-#else
-            reference_power_W[i] = W_mac_32_32( reference_power_W[i], Cldfb_RealBuffer[0][j], Cldfb_RealBuffer[0][j] );
-            reference_power_W[i] = W_mac_32_32( reference_power_W[i], Cldfb_ImagBuffer[0][j], Cldfb_ImagBuffer[0][j] );
-            e_reference_W = imult1616( (Word16) 2, e_Cldfb );
-#endif
             move64();
             move64();
         }
@@ -808,14 +798,8 @@ void computeReferencePower_enc_fx_dirac(
             /* abs()^2 */
             FOR( j = brange[0]; j < brange[1]; j++ )
             {
-#ifdef FIX_1127_IMPROVE_SBA_MLD
                 reference_power_temp[i] = W_add( reference_power_temp[i], W_shr( W_mult_32_32( Cldfb_RealBuffer[ch_idx][j], Cldfb_RealBuffer[ch_idx][j] ), gb ) ); /* exp(2 * e_Cldfb) */
                 reference_power_temp[i] = W_add( reference_power_temp[i], W_shr( W_mult_32_32( Cldfb_ImagBuffer[ch_idx][j], Cldfb_ImagBuffer[ch_idx][j] ), gb ) ); /* exp(2 * e_Cldfb) */
-#else
-                reference_power_temp[i] = W_mac_32_32( reference_power_temp[i], Cldfb_RealBuffer[ch_idx][j], Cldfb_RealBuffer[ch_idx][j] );
-                reference_power_temp[i] = W_mac_32_32( reference_power_temp[i], Cldfb_ImagBuffer[ch_idx][j], Cldfb_ImagBuffer[ch_idx][j] );
-                e_reference_temp = imult1616( (Word16) 2, e_Cldfb );
-#endif
                 move64();
                 move64();
             }
@@ -841,22 +825,14 @@ void computeReferencePower_enc_fx_dirac(
         }
     }
 
-    min_norm = W_norm( reference_power_temp[0] );
-    FOR( i = 0; i < num_freq_bands; i++ )
-    {
-        min_norm = s_min( min_norm, W_norm( reference_power_temp[i] ) ); // Finding minimum norm for the right shifting of entire buffer
-    }
-
     FOR( i = 0; i < num_freq_bands; i++ )
     {
+        min_norm = W_norm( reference_power_temp[i] );
         reference_power[i] = W_extract_h( W_shl( reference_power_temp[i], min_norm ) ); // Right shift with min_norm and extract high bits
         move32();
+        e_reference[i] = sub( 31, sub( add( sub( 31, e_reference_temp ), min_norm ), 32 ) );
+        move16();
     }
-#ifdef FIX_1127_IMPROVE_SBA_MLD
-    *e_reference = sub( 31, sub( add( sub( 31, e_reference_temp ), min_norm ), 32 ) );
-#else
-    *e_reference = sub( e_reference_temp, min_norm );
-#endif
     move16();
 
     return;
@@ -967,8 +943,8 @@ void ivas_dirac_param_est_enc_fx(
     const Word16 hodirac_flag, /* Q0 */
     const Word16 nchan_fb_in,  /* Q0 */
     Word16 *mono_frame_count,  /* Q0 */
-    Word16 *dirac_mono_flag    /* Q0 */
-)
+    Word16 *dirac_mono_flag,   /* Q0 */
+    const Word16 shift )
 {
     Word16 i, j, k, d, ts, index, l_ts, num_freq_bands;
     Word16 band_m_idx, block_m_idx;
@@ -980,17 +956,13 @@ void ivas_dirac_param_est_enc_fx(
     Word32 *p_Cldfb_ImagBuffer_fx[DIRAC_MAX_ANA_CHANS];
     Word16 cldfb_q;
     Word32 intensity_real_fx[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS];
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
     Word16 intensity_real_q[DIRAC_MAX_NBANDS];
-#else
-    Word16 intensity_real_q;
-#endif
     Word32 direction_vector_fx[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS];
     Word16 direction_vector_q;
     Word32 diffuseness_vector_fx[DIRAC_MAX_NBANDS];
     Word16 diffuseness_vector_q;
     Word32 renormalization_factor_fx[DIRAC_MAX_NBANDS];
-    Word16 renormalization_factor_exp;
+    Word16 renormalization_factor_exp[DIRAC_MAX_NBANDS];
     Word32 renormalization_factor_diff_fx[DIRAC_MAX_NBANDS];
     Word16 renormalization_factor_diff_exp[DIRAC_MAX_NBANDS];
     Word32 norm_tmp_fx;
@@ -998,7 +970,7 @@ void ivas_dirac_param_est_enc_fx(
     Word16 mrange[2];
     Word16 num_blocks;
     Word32 reference_power_fx[CLDFB_NO_COL_MAX][DIRAC_NO_FB_BANDS_MAX];
-    Word16 reference_power_exp;
+    Word16 reference_power_exp[CLDFB_NO_COL_MAX][DIRAC_NO_FB_BANDS_MAX];
     Word32 azi_secs_fx[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS];
     Word32 ele_secs_fx[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS];
     Word32 diff_secs_fx[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS];
@@ -1014,10 +986,6 @@ void ivas_dirac_param_est_enc_fx(
     cldfb_q = 0;
     move16();
 
-#ifndef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-    intensity_real_q = 0;
-    move16();
-#endif
 
     direction_vector_q = 0;
     move16();
@@ -1045,8 +1013,10 @@ void ivas_dirac_param_est_enc_fx(
     set16_zero_fx( hDirAC->diffuseness_m_exp, hDirAC->hConfig->nbands );
     set_zero_fx( renormalization_factor_diff_fx, hDirAC->hConfig->nbands );
     set16_zero_fx( renormalization_factor_diff_exp, hDirAC->hConfig->nbands );
-    reference_power_exp = 0;
-    move16();
+    FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
+    {
+        set16_zero_fx( reference_power_exp[i], DIRAC_NO_FB_BANDS_MAX );
+    }
 
     set_zero_fx( azi_secs_fx, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
     set_zero_fx( ele_secs_fx, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
@@ -1072,11 +1042,20 @@ void ivas_dirac_param_est_enc_fx(
         move16();
 
         set32_fx( renormalization_factor_fx, EPSILON_FX, hDirAC->hConfig->nbands );
-        renormalization_factor_exp = 0;
-        move16();
+        set16_fx( renormalization_factor_exp, 0, hDirAC->hConfig->nbands );
         set_zero_fx( hDirAC->direction_vector_m_fx[0][block_m_idx], hDirAC->hConfig->nbands );
         set_zero_fx( hDirAC->direction_vector_m_fx[1][block_m_idx], hDirAC->hConfig->nbands );
         set_zero_fx( hDirAC->direction_vector_m_fx[2][block_m_idx], hDirAC->hConfig->nbands );
+        Word64 dir[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS];
+        Word16 direction_vector_exp_tmp[DIRAC_NUM_DIMS][MAX_PARAM_SPATIAL_SUBFRAMES][DIRAC_MAX_NBANDS] = { 0 };
+        FOR( i = 0; i < DIRAC_NUM_DIMS; i++ )
+        {
+            set64_fx( dir[i], 0, DIRAC_MAX_NBANDS );
+            FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+            {
+                set16_fx( direction_vector_exp_tmp[i][j], 0, DIRAC_MAX_NBANDS );
+            }
+        }
         hDirAC->direction_vector_m_exp[block_m_idx] = 0;
         move16();
 
@@ -1084,8 +1063,17 @@ void ivas_dirac_param_est_enc_fx(
         {
             IF( hDirAC->hFbMixer )
             {
+                FOR( i = 0; i < nchan_fb_in; i++ )
+                {
+                    scale_sig32( pcm_in_fx[i], input_frame, shift );                                                                      // Q:Qx+shift
+                    scale_sig32( hDirAC->hFbMixer->ppFilterbank_prior_input_fx[i], hDirAC->hFbMixer->fb_cfg->prior_input_length, shift ); // Q:Qx+shift
+                }
                 ivas_fb_mixer_get_windowed_fr_fx( hDirAC->hFbMixer, pcm_in_fx, p_Cldfb_RealBuffer_fx, p_Cldfb_ImagBuffer_fx, l_ts, l_ts, hDirAC->hFbMixer->fb_cfg->num_in_chans, 0 );
-
+                FOR( i = 0; i < nchan_fb_in; i++ )
+                {
+                    scale_sig32( pcm_in_fx[i], input_frame, negate( shift ) );                                                                      // Q:Qx
+                    scale_sig32( hDirAC->hFbMixer->ppFilterbank_prior_input_fx[i], hDirAC->hFbMixer->fb_cfg->prior_input_length, negate( shift ) ); // Q:Qx
+                }
                 ivas_fb_mixer_update_prior_input_fx( hDirAC->hFbMixer, pcm_in_fx, l_ts, hDirAC->hFbMixer->fb_cfg->num_in_chans );
 
                 FOR( i = 0; i < nchan_fb_in; i++ )
@@ -1118,7 +1106,7 @@ void ivas_dirac_param_est_enc_fx(
                 Cldfb_ImagBuffer_fx,
                 sub( 31, cldfb_q ),
                 reference_power_fx[ts],
-                &reference_power_exp,
+                reference_power_exp[ts],
                 hDirAC->hConfig->enc_param_start_band,
                 num_freq_bands,
                 ivas_format,
@@ -1133,16 +1121,9 @@ void ivas_dirac_param_est_enc_fx(
                 Cldfb_ImagBuffer_fx,
                 hDirAC->hConfig->enc_param_start_band,
                 num_freq_bands,
-                intensity_real_fx
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-                ,
+                intensity_real_fx,
                 cldfb_q,
-                intensity_real_q
-#endif
-            );
-#ifndef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-            intensity_real_q = sub( shl( cldfb_q, 1 ), 31 ); // 2 * Q_Cldfb + 1 - 32;
-#endif
+                intensity_real_q );
             IF( !hodirac_flag )
             {
                 computeDirectionVectors_fixed(
@@ -1153,15 +1134,8 @@ void ivas_dirac_param_est_enc_fx(
                     num_freq_bands,
                     direction_vector_fx[0],
                     direction_vector_fx[1],
-                    direction_vector_fx[2]
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-                    ,
-                    31, intensity_real_q
-#else
-                    ,
-                    sub( 31, intensity_real_q )
-#endif
-                );
+                    direction_vector_fx[2],
+                    31, intensity_real_q );
 
                 direction_vector_q = Q30;
                 move16();
@@ -1176,28 +1150,31 @@ void ivas_dirac_param_est_enc_fx(
             {
                 /* only real part needed */
                 Copy32( intensity_real_fx[i], &( hDirAC->buffer_intensity_real_fx[i][index - 1][0] ), num_freq_bands ); /* intensity_real_q */
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
                 Copy( intensity_real_q, &hDirAC->buffer_intensity_real_q[i][index - 1][0], num_freq_bands );
-#else
-                set16_fx( &hDirAC->buffer_intensity_real_q[i][index - 1][0], intensity_real_q, num_freq_bands );
-#endif
             }
             Copy32( reference_power_fx[ts], &( hDirAC->buffer_energy_fx[( index - 1 ) * num_freq_bands] ), num_freq_bands ); /* exp(reference_power_exp) */
-            set16_fx( &hDirAC->buffer_energy_q[( index - 1 ) * num_freq_bands], sub( 31, reference_power_exp ), num_freq_bands );
+            FOR( i = 0; i < num_freq_bands; i++ )
+            {
+                hDirAC->buffer_energy_q[( index - 1 ) * num_freq_bands + i] = sub( 31, reference_power_exp[ts][i] );
+                move16();
+            }
 
-            Word16 buffer_intensity_real_single_q;
+            Word16 buffer_intensity_real_single_q, min_shift = MAX_16;
+            move16();
             buffer_intensity_real_single_q = hDirAC->buffer_intensity_real_q[0][0][0];
             move16();
             FOR( i = 0; i < DIRAC_NUM_DIMS; i++ )
             {
                 FOR( j = 0; j < hDirAC->no_col_avg_diff; j++ )
                 {
+                    min_shift = s_min( min_shift, L_norm_arr( hDirAC->buffer_intensity_real_fx[i][j], num_freq_bands ) );
                     FOR( k = 0; k < num_freq_bands; k++ )
                     {
                         buffer_intensity_real_single_q = s_min( buffer_intensity_real_single_q, hDirAC->buffer_intensity_real_q[i][j][k] );
                     }
                 }
             }
+            buffer_intensity_real_single_q = add( buffer_intensity_real_single_q, min_shift );
             FOR( i = 0; i < DIRAC_NUM_DIMS; i++ )
             {
                 FOR( j = 0; j < hDirAC->no_col_avg_diff; j++ )
@@ -1251,17 +1228,15 @@ void ivas_dirac_param_est_enc_fx(
                     ene_secs_exp );
             }
 
-            const Word16 gbits = 4; // 4 guard bits
-            move16();
             IF( hodirac_flag )
             {
                 FOR( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ )
                 {
                     Word32 tmp_diff = L_shr( diffuseness_vector_fx[band_m_idx], sub( diffuseness_vector_q, 30 ) ); // diffueseness_vector_q -> Q30
                     hDirAC->diffuseness_m_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( hDirAC->diffuseness_m_fx[band_m_idx], hDirAC->diffuseness_m_exp[band_m_idx],
-                                                                                     Mpy_32_32( reference_power_fx[ts][band_m_idx], tmp_diff ), add( reference_power_exp, 1 ), &hDirAC->diffuseness_m_exp[band_m_idx] ); /* exp(hDirAC->diffuseness_m_exp) */
+                                                                                     Mpy_32_32( reference_power_fx[ts][band_m_idx], tmp_diff ), add( reference_power_exp[ts][band_m_idx], 1 ), &hDirAC->diffuseness_m_exp[band_m_idx] ); /* exp(hDirAC->diffuseness_m_exp) */
                     move32();
-                    renormalization_factor_diff_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_diff_fx[band_m_idx], renormalization_factor_diff_exp[band_m_idx], reference_power_fx[ts][band_m_idx], reference_power_exp, &renormalization_factor_diff_exp[band_m_idx] ); /* exp(renormalization_factor_diff_exp) */
+                    renormalization_factor_diff_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_diff_fx[band_m_idx], renormalization_factor_diff_exp[band_m_idx], reference_power_fx[ts][band_m_idx], reference_power_exp[ts][band_m_idx], &renormalization_factor_diff_exp[band_m_idx] ); /* exp(renormalization_factor_diff_exp) */
                     move32();
                 }
             }
@@ -1270,27 +1245,48 @@ void ivas_dirac_param_est_enc_fx(
                 FOR( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ )
                 {
                     Word32 tmp_diff = L_shr( diffuseness_vector_fx[band_m_idx], sub( diffuseness_vector_q, 30 ) ); // diffueseness_vector_q -> Q30
+                    norm_tmp_exp = add( reference_power_exp[ts][band_m_idx], 1 );
                     norm_tmp_fx = Mpy_32_32( reference_power_fx[ts][band_m_idx], L_sub( ONE_IN_Q30, tmp_diff ) );
 
-                    hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx] = L_add( hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx], L_shr( Mpy_32_32( norm_tmp_fx, direction_vector_fx[0][band_m_idx] ), gbits ) ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
+                    dir[0][band_m_idx] = W_mult_32_32( norm_tmp_fx, direction_vector_fx[0][band_m_idx] );
+                    move64();
+                    dir[1][band_m_idx] = W_mult_32_32( norm_tmp_fx, direction_vector_fx[1][band_m_idx] );
+                    move64();
+                    dir[2][band_m_idx] = W_mult_32_32( norm_tmp_fx, direction_vector_fx[2][band_m_idx] );
+                    move64();
+                    Word16 norm = 62;
+                    move16();
+                    IF( dir[0][band_m_idx] != 0 )
+                    {
+                        norm = W_norm( dir[0][band_m_idx] );
+                    }
+                    IF( dir[1][band_m_idx] != 0 )
+                    {
+                        norm = s_min( norm, W_norm( dir[1][band_m_idx] ) );
+                    }
+                    IF( dir[2][band_m_idx] != 0 )
+                    {
+                        norm = s_min( norm, W_norm( dir[2][band_m_idx] ) );
+                    }
+                    Word32 tmp = W_extract_h( W_shl( dir[0][band_m_idx], norm ) );
+                    Word16 tmp_e = sub( Q31, add( sub( direction_vector_q, norm_tmp_exp ), sub( norm, 0 ) ) );
+                    hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx] = BASOP_Util_Add_Mant32Exp( hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx], direction_vector_exp_tmp[0][block_m_idx][band_m_idx], tmp, tmp_e, &direction_vector_exp_tmp[0][block_m_idx][band_m_idx] );
                     move32();
-                    hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx] = L_add( hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx], L_shr( Mpy_32_32( norm_tmp_fx, direction_vector_fx[1][band_m_idx] ), gbits ) ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
+                    tmp = W_extract_h( W_shl( dir[1][band_m_idx], norm ) );
+                    hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx] = BASOP_Util_Add_Mant32Exp( hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx], direction_vector_exp_tmp[1][block_m_idx][band_m_idx], tmp, tmp_e, &direction_vector_exp_tmp[1][block_m_idx][band_m_idx] );
                     move32();
-                    hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] = L_add( hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx], L_shr( Mpy_32_32( norm_tmp_fx, direction_vector_fx[2][band_m_idx] ), gbits ) ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
+                    tmp = W_extract_h( W_shl( dir[2][band_m_idx], norm ) );
+                    hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] = BASOP_Util_Add_Mant32Exp( hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx], direction_vector_exp_tmp[2][block_m_idx][band_m_idx], tmp, tmp_e, &direction_vector_exp_tmp[2][block_m_idx][band_m_idx] );
                     move32();
-                    renormalization_factor_fx[band_m_idx] = L_add( renormalization_factor_fx[band_m_idx], L_shr( norm_tmp_fx, gbits ) ); /* exp(norm_tmp_exp + gbits) */
+                    renormalization_factor_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_fx[band_m_idx], renormalization_factor_exp[band_m_idx], norm_tmp_fx, norm_tmp_exp, &renormalization_factor_exp[band_m_idx] ); /* exp(norm_tmp_exp + gbits) */
                     move32();
                     hDirAC->diffuseness_m_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( hDirAC->diffuseness_m_fx[band_m_idx], hDirAC->diffuseness_m_exp[band_m_idx],
-                                                                                     Mpy_32_32( reference_power_fx[ts][band_m_idx], tmp_diff ), add( reference_power_exp, 1 ), &hDirAC->diffuseness_m_exp[band_m_idx] ); /* exp(hDirAC->diffuseness_m_exp) */
+                                                                                     Mpy_32_32( reference_power_fx[ts][band_m_idx], tmp_diff ), add( reference_power_exp[ts][band_m_idx], 1 ), &hDirAC->diffuseness_m_exp[band_m_idx] ); /* exp(hDirAC->diffuseness_m_exp) */
                     move32();
                     renormalization_factor_diff_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_diff_fx[band_m_idx], renormalization_factor_diff_exp[band_m_idx],
-                                                                                           reference_power_fx[ts][band_m_idx], reference_power_exp, &renormalization_factor_diff_exp[band_m_idx] ); /* exp(renormalization_factor_diff_exp) */
+                                                                                           reference_power_fx[ts][band_m_idx], reference_power_exp[ts][band_m_idx], &renormalization_factor_diff_exp[band_m_idx] ); /* exp(renormalization_factor_diff_exp) */
                     move32();
                 }
-                norm_tmp_exp = add( reference_power_exp, 1 );
-                hDirAC->direction_vector_m_exp[block_m_idx] = add( norm_tmp_exp, add( sub( 31, direction_vector_q ), gbits ) );
-                move32();
-                renormalization_factor_exp = add( norm_tmp_exp, gbits );
             }
         }
 
@@ -1300,40 +1296,50 @@ void ivas_dirac_param_est_enc_fx(
             {
                 renormalization_factor_fx[band_m_idx] = EPSILON_FX;
                 move32();
-                renormalization_factor_fx[band_m_idx] = L_add( renormalization_factor_fx[band_m_idx], Mpy_32_32( hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx], hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx] ) ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
+                renormalization_factor_exp[band_m_idx] = 0;
+                move16();
+                Word16 tmp_e = shl( direction_vector_exp_tmp[0][block_m_idx][band_m_idx], 1 );
+                renormalization_factor_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_fx[band_m_idx], renormalization_factor_exp[band_m_idx], Mpy_32_32( hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx], hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx] ), tmp_e, &renormalization_factor_exp[band_m_idx] ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
                 move32();
-                renormalization_factor_fx[band_m_idx] = L_add( renormalization_factor_fx[band_m_idx], Mpy_32_32( hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx], hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx] ) ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
+                tmp_e = shl( direction_vector_exp_tmp[1][block_m_idx][band_m_idx], 1 );
+                renormalization_factor_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_fx[band_m_idx], renormalization_factor_exp[band_m_idx], Mpy_32_32( hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx], hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx] ), tmp_e, &renormalization_factor_exp[band_m_idx] ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
                 move32();
-                renormalization_factor_fx[band_m_idx] = L_add( renormalization_factor_fx[band_m_idx], Mpy_32_32( hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx], hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] ) ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
+                tmp_e = shl( direction_vector_exp_tmp[2][block_m_idx][band_m_idx], 1 );
+                renormalization_factor_fx[band_m_idx] = BASOP_Util_Add_Mant32Exp( renormalization_factor_fx[band_m_idx], renormalization_factor_exp[band_m_idx], Mpy_32_32( hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx], hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] ), tmp_e, &renormalization_factor_exp[band_m_idx] ); /* norm_tmp_exp + ( 31 - direction_vector_q ) + gbits */
                 move32();
-                renormalization_factor_exp = shl( hDirAC->direction_vector_m_exp[block_m_idx], 1 ); // 2 * direction_vector_m_exp
-                renormalization_factor_fx[band_m_idx] = Sqrt32( renormalization_factor_fx[band_m_idx], &renormalization_factor_exp );
+                IF( renormalization_factor_fx[band_m_idx] == 0 )
+                {
+                    renormalization_factor_fx[band_m_idx] = EPSILON_FX;
+                    move32();
+                    renormalization_factor_exp[band_m_idx] = 0;
+                    move16();
+                }
+                renormalization_factor_fx[band_m_idx] = Sqrt32( renormalization_factor_fx[band_m_idx], &renormalization_factor_exp[band_m_idx] );
                 move32();
 
                 IF( GT_32( renormalization_factor_fx[band_m_idx], EPSILON_FX ) )
                 {
-                    Word16 tmp_e;
                     Word32 tmp32;
 
                     tmp32 = hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx];
                     move32();
                     tmp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( tmp32, renormalization_factor_fx[band_m_idx], &tmp_e ) ); /* exp(tmp_e + ( hDirAC->direction_vector_m_exp[block_m_idx] - renormalization_factor_exp)) */
-                    tmp_e = add( tmp_e, sub( hDirAC->direction_vector_m_exp[block_m_idx], renormalization_factor_exp ) );
-                    hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx] = L_shr( tmp32, sub( 1, tmp_e ) ); // Q30
+                    tmp_e = add( tmp_e, sub( direction_vector_exp_tmp[0][block_m_idx][band_m_idx], renormalization_factor_exp[band_m_idx] ) );
+                    hDirAC->direction_vector_m_fx[0][block_m_idx][band_m_idx] = L_shr_sat( tmp32, sub( 1, tmp_e ) ); // Q30 saturation needs to check
                     move32();
 
                     tmp32 = hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx]; // Q30
                     move32();
                     tmp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( tmp32, renormalization_factor_fx[band_m_idx], &tmp_e ) ); /* exp(tmp_e + ( hDirAC->direction_vector_m_exp[block_m_idx] - renormalization_factor_exp)) */
-                    tmp_e = add( tmp_e, sub( hDirAC->direction_vector_m_exp[block_m_idx], renormalization_factor_exp ) );
-                    hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx] = L_shr( tmp32, sub( 1, tmp_e ) ); // Q30
+                    tmp_e = add( tmp_e, sub( direction_vector_exp_tmp[1][block_m_idx][band_m_idx], renormalization_factor_exp[band_m_idx] ) );
+                    hDirAC->direction_vector_m_fx[1][block_m_idx][band_m_idx] = L_shr_sat( tmp32, sub( 1, tmp_e ) ); // Q30 saturation needs to check
                     move32();
 
                     tmp32 = hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx]; // Q30
                     move32();
                     tmp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( tmp32, renormalization_factor_fx[band_m_idx], &tmp_e ) ); /* exp(tmp_e + ( hDirAC->direction_vector_m_exp[block_m_idx] - renormalization_factor_exp)) */
-                    tmp_e = add( tmp_e, sub( hDirAC->direction_vector_m_exp[block_m_idx], renormalization_factor_exp ) );
-                    hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] = L_shr( tmp32, sub( 1, tmp_e ) ); // Q30
+                    tmp_e = add( tmp_e, sub( direction_vector_exp_tmp[2][block_m_idx][band_m_idx], renormalization_factor_exp[band_m_idx] ) );
+                    hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] = L_shr_sat( tmp32, sub( 1, tmp_e ) ); // Q30 saturation needs to check
                     move32();
                 }
                 ELSE
@@ -1345,8 +1351,6 @@ void ivas_dirac_param_est_enc_fx(
                     hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] = 0;
                     move32();
                 }
-                hDirAC->direction_vector_m_exp[block_m_idx] = 1;
-                move16();
 
                 /* save the elevation and azimuth values to be used later by the ivas_dirac_QuantizeParameters function */
                 FOR( d = 0; d < DIRAC_NUM_DIMS; d++ )
@@ -1358,15 +1362,12 @@ void ivas_dirac_param_est_enc_fx(
                 Scale_sig32( dir_v_fx, 3, -1 );
                 ivas_qmetadata_direction_vector_to_azimuth_elevation_fx(
                     dir_v_fx,
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
                     Q29,
-#else
-
-                    Q30,
-#endif
                     &q_direction->band_data[band_m_idx].azimuth_fx[block_m_idx],
                     &q_direction->band_data[band_m_idx].elevation_fx[block_m_idx] );
             }
+            hDirAC->direction_vector_m_exp[block_m_idx] = 1;
+            move16();
         }
 
         /* Sectors */
@@ -1456,12 +1457,9 @@ static void computeIntensityVector_enc_fx(
     const Word16 enc_param_start_band,                                   /* i  : first band to process	Q0*/
     const Word16 num_frequency_bands,                                    /* Q0 */
     Word32 intensity_real[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS]              /* q_intensity_real */
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
     ,
     Word16 q_cldfb,
-    Word16 q_intensity_real[DIRAC_MAX_NBANDS]
-#endif
-)
+    Word16 q_intensity_real[DIRAC_MAX_NBANDS] )
 {
     /* Reminder
      * X = a + ib; Y = c + id
@@ -1470,20 +1468,16 @@ static void computeIntensityVector_enc_fx(
     Word16 i, j;
     Word32 real, img;
     Word16 brange[2];
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
     Word16 shift_value = sub( shl( q_cldfb, 1 ), 31 );
-#endif
     FOR( i = 0; i < num_frequency_bands; i++ )
     {
         brange[0] = hDirAC->band_grouping[i + enc_param_start_band]; /* Q0 */
         move16();
         brange[1] = hDirAC->band_grouping[i + enc_param_start_band + 1]; /* Q0 */
         move16();
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
         Word16 num_bins = sub( brange[1], brange[0] );
         Word16 gb = find_guarded_bits_fx( num_bins );
         Word16 norm;
-#endif
         intensity_real[0][i] = 0;
         move32();
         intensity_real[1][i] = 0;
@@ -1502,7 +1496,6 @@ static void computeIntensityVector_enc_fx(
             move32();
             img = Cldfb_ImagBuffer[0][j];
             move32();
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
             Word64 t1, t2, t3;
             t1 = W_mac_32_32( W_mult_32_32( Cldfb_RealBuffer[3][j], real ), Cldfb_ImagBuffer[3][j], img ); /* 2 * q_cldfb + 1 */
             t2 = W_mac_32_32( W_mult_32_32( Cldfb_RealBuffer[1][j], real ), Cldfb_ImagBuffer[1][j], img ); /* 2 * q_cldfb + 1 */
@@ -1514,16 +1507,21 @@ static void computeIntensityVector_enc_fx(
             tmp_1 = W_add( tmp_1, t1 ); /* 2 * q_cldfb + 1 */
             tmp_2 = W_add( tmp_2, t2 ); /* 2 * q_cldfb + 1 */
             tmp_3 = W_add( tmp_3, t3 ); /* 2 * q_cldfb + 1 */
-#else
-            /* Intensity is XYZ order, audio is WYZX order. */
-            tmp_1 = W_add( tmp_1, W_add( W_mult_32_32( Cldfb_RealBuffer[3][j], real ), W_mult_32_32( Cldfb_ImagBuffer[3][j], img ) ) );
-            tmp_2 = W_add( tmp_2, W_add( W_mult_32_32( Cldfb_RealBuffer[1][j], real ), W_mult_32_32( Cldfb_ImagBuffer[1][j], img ) ) );
-            tmp_3 = W_add( tmp_3, W_add( W_mult_32_32( Cldfb_RealBuffer[2][j], real ), W_mult_32_32( Cldfb_ImagBuffer[2][j], img ) ) );
-#endif
         }
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-        norm = s_min( W_norm( tmp_1 ), W_norm( tmp_2 ) );
-        norm = s_min( norm, W_norm( tmp_3 ) );
+        norm = 63;
+        move16();
+        IF( tmp_1 != 0 )
+        {
+            norm = s_min( norm, W_norm( tmp_1 ) );
+        }
+        IF( tmp_2 != 0 )
+        {
+            norm = s_min( norm, W_norm( tmp_2 ) );
+        }
+        IF( tmp_3 != 0 )
+        {
+            norm = s_min( norm, W_norm( tmp_3 ) );
+        }
         intensity_real[0][i] = W_extract_h( W_shl( tmp_1, norm ) ); // shift_value - (gb - norm)
         move32();
         intensity_real[1][i] = W_extract_h( W_shl( tmp_2, norm ) ); // shift_value - (gb - norm)
@@ -1531,15 +1529,6 @@ static void computeIntensityVector_enc_fx(
         intensity_real[2][i] = W_extract_h( W_shl( tmp_3, norm ) ); // shift_value - (gb - norm)
         q_intensity_real[i] = sub( shift_value, sub( gb, norm ) );
         move16();
-#else
-
-        intensity_real[0][i] = W_extract_h( tmp_1 ); // output Q= 2* input_q + 1 - 32
-        move32();
-        intensity_real[1][i] = W_extract_h( tmp_2 ); // output Q= 2* input_q + 1 - 32
-        move32();
-        intensity_real[2][i] = W_extract_h( tmp_3 ); // output Q= 2* input_q + 1 - 32
-        move32();
-#endif
     }
 
     return;
diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler_fx.c
similarity index 94%
rename from lib_enc/ivas_enc_cov_handler.c
rename to lib_enc/ivas_enc_cov_handler_fx.c
index 7f08778781cb9a3d5d14867f087b6751b8aaa312..59c38aa5d75c5083b99a50ab60a4122fcdfd61b6 100644
--- a/lib_enc/ivas_enc_cov_handler.c
+++ b/lib_enc/ivas_enc_cov_handler_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,11 +32,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*------------------------------------------------------------------------------------------*
@@ -273,7 +271,7 @@ static Word16 ivas_spar_get_activeW_flag_fx(
     }
     ELSE
     {
-        L_tmp = BASOP_Util_Divide3232_Scale_cadence( hCovEnc->bb_var_lt_fx[0], side_ch_var, &exp_diff );       // (Q31 - exp_diff)
+        L_tmp = BASOP_Util_Divide3232_Scale_newton( hCovEnc->bb_var_lt_fx[0], side_ch_var, &exp_diff );        // (Q31 - exp_diff)
         en_ratio = L_shl_sat( L_tmp, exp_diff );                                                               // Q31
         IF( LT_32( en_ratio, Mpy_32_32( IVAS_SPAR_DYN_ACTIVEW_THRESH_FX, IVAS_SPAR_DYN_ACTIVEW_THRESH_FX ) ) ) // LHS Q31 :: RHS Q31
         {
@@ -513,9 +511,11 @@ static void ivas_band_cov_fx(
     Word32 pV_re[L_FRAME48k];
     Word64 pV_re_64bit[L_FRAME48k];
     Word64 cov_real_64bit[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS];
-    Word16 q_shift;
+    Word16 q_shift, q_shift_tmp;
     Word16 m, start_bin, active_bins;
+    Word16 num_blocks;
 
+    num_blocks = idiv1616( num_bins, stride ); /* Q0 */
     FOR( i = 0; i < num_chans; i++ )
     {
         FOR( j = i; j < num_chans; j++ )
@@ -536,17 +536,19 @@ static void ivas_band_cov_fx(
             move16();
             FOR( k = 0; k < num_bins; k++ )
             {
-                IF( pV_re_64bit[k] != 0 )
+                q_shift_tmp = W_norm( pV_re_64bit[k] );
+                if ( pV_re_64bit[k] != 0 )
                 {
-                    q_shift = s_min( q_shift, W_norm( pV_re_64bit[k] ) );
+                    q_shift = s_min( q_shift, q_shift_tmp );
                 }
             }
+            q_shift_tmp = sub( q_shift, 32 );
             FOR( k = 0; k < num_bins; k++ )
             {
-                pV_re[k] = W_extract_l( W_shl_nosat( pV_re_64bit[k], sub( q_shift, 32 ) ) ); //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32)
+                pV_re[k] = W_extract_l( W_shl_nosat( pV_re_64bit[k], q_shift_tmp ) ); //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32)
                 move32();
                 /* perform rounding towards lower value for negative results */
-                IF( pV_re[k] < 0 )
+                if ( pV_re[k] < 0 )
                 {
                     pV_re[k] = L_add( pV_re[k], 1 );
                 }
@@ -556,31 +558,32 @@ static void ivas_band_cov_fx(
             {
                 Word64 temp;
                 const Word32 *p_bin_to_band = pFb_bin_to_band[k]; // Q22
-                Word32 *cov_ptr = pV_re;
-                Word16 num_blocks;
+                Word32 *cov_ptr;
                 Word16 blk;
 
                 temp = 0;
                 move64();
-                num_blocks = idiv1616( num_bins, stride ); /* Q0 */
-                move16();
                 start_bin = pFb_start_bin_per_band[k]; /* Q0 */
                 move16();
                 active_bins = pFb_active_bins_per_band[k]; /* Q0 */
                 move16();
 
+                cov_ptr = &pV_re[start_bin];
+                move16();
                 FOR( blk = 0; blk < num_blocks; blk++ )
                 {
                     /* optional: add temporal weight here */
-                    FOR( m = start_bin; m < add( start_bin, active_bins ); m++ )
+                    FOR( m = 0; m < active_bins; m++ )
                     {
-                        temp = W_add( temp, W_mult0_32_32( cov_ptr[m], p_bin_to_band[sub( m, start_bin )] ) ); // ((q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32), Q22) -> (q_In_FR[i1] + q_In_FR[j1] + (q_shift - 10)
+                        temp = W_add( temp, W_mult0_32_32( cov_ptr[m], p_bin_to_band[m] ) ); // ((q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32), Q22) -> (q_In_FR[i1] + q_In_FR[j1] + (q_shift - 10)
                     }
                     cov_ptr += stride;
+                    move16();
                 }
                 // What basop to add below????
                 cov_real_64bit[i][j][k] = temp * (Word64) ( num_blocks ); // (q_In_FR[i1] + q_In_FR[j1] + (q_shift - 10) - guard_bits
                 move64();
+                move64(); // conservative estimation of a 64 bit multiplication
             }
             q_cov_real[i][j] = add( add( q_In_FR, q_In_FR ), sub( q_shift, Q10 ) );
             move16();
@@ -595,17 +598,19 @@ static void ivas_band_cov_fx(
             move16();
             FOR( k = start_band; k < end_band; k++ )
             {
-                IF( cov_real_64bit[i][j][k] != 0 )
+                q_shift_tmp = W_norm( cov_real_64bit[i][j][k] );
+                if ( cov_real_64bit[i][j][k] != 0 )
                 {
-                    q_shift = s_min( q_shift, W_norm( cov_real_64bit[i][j][k] ) );
+                    q_shift = s_min( q_shift, q_shift_tmp );
                 }
             }
+            q_shift_tmp = sub( q_shift, 32 );
             FOR( k = start_band; k < end_band; k++ )
             {
-                cov_real[i][j][k] = W_extract_l( W_shl_nosat( cov_real_64bit[i][j][k], sub( q_shift, 32 ) ) ); /* q_cov_real[i][j] + q_shift - 32 */
+                cov_real[i][j][k] = W_extract_l( W_shl_nosat( cov_real_64bit[i][j][k], q_shift_tmp ) ); /* q_cov_real[i][j] + q_shift - 32 */
                 move32();
             }
-            q_cov_real[i][j] = add( q_cov_real[i][j], sub( q_shift, 32 ) );
+            q_cov_real[i][j] = add( q_cov_real[i][j], q_shift_tmp );
             move16();
         }
     }
diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc_fx.c
similarity index 96%
rename from lib_enc/ivas_enc.c
rename to lib_enc/ivas_enc_fx.c
index 95cafd8ff37212c36822565bdd641c9296d56731..ff5f65b32ac739159f0f5d74d2df5026a3d48a34 100644
--- a/lib_enc/ivas_enc.c
+++ b/lib_enc/ivas_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,14 +36,12 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #ifdef DEBUGGING
 #include "debug.h"
 #endif
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------*
@@ -135,7 +133,7 @@ ivas_error ivas_enc_fx(
 
     IF( EQ_32( ivas_format, SBA_FORMAT ) )
     {
-        IF( ( error = ivas_sba_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK )
+        IF( NE_32( ( error = ivas_sba_enc_reconfigure_fx( st_ivas ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -346,13 +344,22 @@ ivas_error ivas_enc_fx(
                 {
                     norm_data_in = s_min( norm_data_in, L_norm_arr( data_fx[i], input_frame ) );
                 }
-                norm_data_in = sub( norm_data_in, 7 ); /*guard bit is 4->to handle overflow in cldfbAnalysis*/
-                FOR( i = 0; i < hEncoderConfig->nchan_ism + st_ivas->nchan_transport; i++ )
+                IF( LT_16( norm_data_in, 31 ) )
+                {
+                    norm_data_in = sub( norm_data_in, 7 );    /*guard bit is 4->to handle overflow in cldfbAnalysis*/
+                    norm_data_in = s_min( norm_data_in, 20 ); // limit Q to 31 (11 + norm)
+                    FOR( i = 0; i < hEncoderConfig->nchan_ism + st_ivas->nchan_transport; i++ )
+                    {
+                        scale_sig32( data_fx[i], input_frame, norm_data_in ); /*  st_ivas->q_data_fx + norm_data_in */
+                    }
+                    st_ivas->q_data_fx = add( st_ivas->q_data_fx, norm_data_in );
+                    move16();
+                }
+                ELSE
                 {
-                    scale_sig32( data_fx[i], input_frame, norm_data_in ); /*  st_ivas->q_data_fx + norm_data_in */
+                    st_ivas->q_data_fx = 31;
+                    move16();
                 }
-                st_ivas->q_data_fx = add( st_ivas->q_data_fx, norm_data_in );
-                move16();
             }
 
             /* Estimate MASA parameters for the objects */
diff --git a/lib_enc/ivas_entropy_coder.c b/lib_enc/ivas_entropy_coder_fx.c
similarity index 98%
rename from lib_enc/ivas_entropy_coder.c
rename to lib_enc/ivas_entropy_coder_fx.c
index da4826776567c8b471c1c3ffaa35ace99882d301..3c8cf92e2f2ef39cf45042599aa58217fad99328 100644
--- a/lib_enc/ivas_entropy_coder.c
+++ b/lib_enc/ivas_entropy_coder_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,8 +34,7 @@
 #include <assert.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "math.h"
 #include "wmc_auto.h"
@@ -174,7 +173,7 @@ static Word16 ivas_arith_encode_array_fx(
             pCum_freq = pArith->cum_freq[0]; /* Q0 */
         }
 
-        ari_start_encoding_14bits( &as );
+        ari_start_encoding_14bits_ivas_fx( &as );
 
         FOR( i = 0; i < in_len; i++ )
         {
diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad_fx.c
similarity index 87%
rename from lib_enc/ivas_front_vad.c
rename to lib_enc/ivas_front_vad_fx.c
index d5be6f0605c17cce4b431384e2978b65e8a4f3de..f2b3adece71326893968901d387f63af6cbe1d61 100644
--- a/lib_enc/ivas_front_vad.c
+++ b/lib_enc/ivas_front_vad_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,14 +36,12 @@
 #include "ivas_cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include <assert.h>
 #include "wmc_auto.h"
 #include <math.h>
 #include "prot_fx_enc.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-----------------------------------------------------------------------------------------*
@@ -92,6 +90,7 @@ ivas_error front_vad_fx(
     ivas_error error;
     Word16 Q_new;
     Word16 Qband, mem_decim_size;
+    Word32 Etot_LR_32fx;
     error = IVAS_ERR_OK;
     push_wmops( "front_vad" );
     move16();
@@ -232,7 +231,7 @@ ivas_error front_vad_fx(
             MVR2R_WORD16( hFrontVad->buffer_12k8_fx + L_FFT, hFrontVad->buffer_12k8_fx, L_FFT / 2 );
 
             /* Resample to 12k8 */
-            modify_Fs_fx( sts[n]->input_fx, input_frame, sts[0]->input_Fs, hFrontVad->buffer_12k8_fx + L_FFT / 2, INT_FS_12k8, hFrontVad->mem_decim_fx, ( sts[0]->max_bwidth == NB ), &Qband, &mem_decim_size );
+            modify_Fs_ivas_fx( sts[n]->input_fx, input_frame, sts[0]->input_Fs, hFrontVad->buffer_12k8_fx + L_FFT / 2, INT_FS_12k8, hFrontVad->mem_decim_fx, ( sts[0]->max_bwidth == NB ), &Qband, &mem_decim_size );
 
             /* Preemphasis */
             hFrontVad->mem_preemph_fx = shl( hFrontVad->mem_preemph_fx, sub( add( Q_inp, Qband ), hFrontVad->q_mem_preemph_fx ) ); /* Q_inp + Qband */
@@ -242,15 +241,15 @@ ivas_error front_vad_fx(
 
             PREEMPH_FX( hFrontVad->buffer_12k8_fx + L_FFT / 2, PREEMPH_FAC, L_FRAME, &hFrontVad->mem_preemph_fx );
 
-            Q_new = add( sub( Q_inp, Qband ), Q_add );
-            Scale_sig( hFrontVad->buffer_12k8_fx, L_FFT / 2, sub( Q_new, Q_buffer[n] ) );                           /* Q_new */
-            Scale_sig( hFrontVad->buffer_12k8_fx + L_FFT / 2, 384 - L_FFT / 2, sub( Q_new, add( Q_inp, Qband ) ) ); /* Q_new */
+            Q_new = s_min( add( add( Q_inp, Qband ), Q_add ), Q_buffer[n] );
+            scale_sig( hFrontVad->buffer_12k8_fx, L_FFT / 2, sub( Q_new, Q_buffer[n] ) );                                       /* Q_new */
+            scale_sig( hFrontVad->buffer_12k8_fx + L_FFT / 2, 3 * L_FRAME / 2 - L_FFT / 2, sub( Q_new, add( Q_inp, Qband ) ) ); /* Q_new */
 
             Q_buffer[n] = Q_new;
             move16();
 
             ivas_analy_sp_fx( IVAS_CPE_TD, hCPE, sts[0]->input_Fs, hFrontVad->buffer_12k8_fx + L_FFT / 2 - 3 * ( L_SUBFR / 2 ), Q_new, fr_bands_fx[n],
-                              &q_fr_bands[n], lf_E_fx[n], &q_lf_E[n], &Etot_LR_fx[n], sts[0]->min_band, sts[0]->max_band, Bin_E_fx, &q_Bin_E, Bin_E_old_fx,
+                              &q_fr_bands[n], lf_E_fx[n], &q_lf_E[n], &Etot_LR_32fx, sts[0]->min_band, sts[0]->max_band, Bin_E_fx, &q_Bin_E, Bin_E_old_fx,
                               &q_Bin_E_old, PS_fx, q_PS_out, lgBin_E_fx, band_energies_fx, &q_band_energies, fft_buffLR_fx, &q_fft_buffLR );
             if ( n == 0 )
             {
@@ -277,27 +276,12 @@ ivas_error front_vad_fx(
 
             /* add up energies for later calculating average of channel energies */
 
-            Word32 Etot_fx = L_deposit_h( Etot_LR_fx[n] ); /* Q24 */
-
-            noise_est_pre_32fx( Etot_fx, hFrontVads[0]->ini_frame, hFrontVad->hNoiseEst, 0, 0, 0 );
-
-            /* wb_vad */
-            Word16 scale = add( hFrontVads[n]->hNoiseEst->q_bckr, L_norm_arr( hFrontVads[n]->hNoiseEst->bckr_fx, NB_BANDS ) );
-            scale = s_min( scale, add( hFrontVads[n]->hNoiseEst->q_enrO, L_norm_arr( hFrontVads[n]->hNoiseEst->enrO_fx, NB_BANDS ) ) );
-            scale = s_min( q_fr_bands[n], scale );
-
-            scale_sig32( hFrontVads[n]->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, hFrontVads[n]->hNoiseEst->q_bckr ) ); // scale
-            hFrontVads[n]->hNoiseEst->q_bckr = scale;
-            move16();
+            noise_est_pre_32fx( Etot_LR_32fx, hFrontVads[0]->ini_frame, hFrontVad->hNoiseEst, 0, 0, 0 );
 
-            scale_sig32( hFrontVads[n]->hNoiseEst->enrO_fx, NB_BANDS, sub( scale, hFrontVads[n]->hNoiseEst->q_enrO ) ); // scale
-            hFrontVads[n]->hNoiseEst->q_enrO = scale;
-            move16();
-
-            scale_sig32( fr_bands_fx[n], 2 * NB_BANDS, sub( scale, q_fr_bands[n] ) ); // scale
-            q_fr_bands[n] = scale;
+            Etot_LR_fx[n] = extract_h( Etot_LR_32fx );
             move16();
 
+            /* wb_vad */
             hFrontVad->hVAD->vad_flag = wb_vad_ivas_fx( sts[n], fr_bands_fx[n], q_fr_bands[n], &dummy, &dummy, &dummy, &snr_sum_he_fx,
                                                         &localVAD_HE_SAD[n], &dummy_short, hFrontVad->hVAD, hFrontVad->hNoiseEst,
                                                         hFrontVad->lp_speech_fx, hFrontVad->lp_noise_fx ); // Q0
@@ -423,7 +407,7 @@ ivas_error front_vad_create_fx(
     move16();
 
     /* allocate delay buffer to compensate for filterbank delay */
-    hFrontVad->delay_samples = NS2SA( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS );
+    hFrontVad->delay_samples = NS2SA_FX2( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS );
     move16();
     hFrontVad->delay_buf_fx = NULL;
     IF( GT_16( hFrontVad->delay_samples, 0 ) )
@@ -440,30 +424,6 @@ ivas_error front_vad_create_fx(
     return IVAS_ERR_OK;
 }
 
-/*-----------------------------------------------------------------------------------------*
- * Function front_vad_destroy()
- *
- * Deallocate Standalone front-VAD module
- *-----------------------------------------------------------------------------------------*/
-
-void front_vad_destroy(
-    FRONT_VAD_ENC_HANDLE *hFrontVad /* i/o: front-VAD handle           */
-)
-{
-    IF( *hFrontVad != NULL )
-    {
-        free( ( *hFrontVad )->hNoiseEst );
-        ( *hFrontVad )->hNoiseEst = NULL;
-
-        free( ( *hFrontVad )->hVAD );
-        ( *hFrontVad )->hVAD = NULL;
-
-        free( *hFrontVad );
-        *hFrontVad = NULL;
-    }
-
-    return;
-}
 void front_vad_destroy_fx(
     FRONT_VAD_ENC_HANDLE *hFrontVad /* i/o: front-VAD handle           */
 )
@@ -589,7 +549,7 @@ ivas_error front_vad_spar_fx(
         st->input_fx = input_fx;
 
         Copy_Scale_sig32_16( omni_in, st->input_fx, input_frame, Q16 - Q11 ); /* Q16 */
-        delay_signal( st->input_fx, input_frame, hFrontVad->delay_buf_fx, hFrontVad->delay_samples );
+        delay_signal_fx( st->input_fx, input_frame, hFrontVad->delay_buf_fx, hFrontVad->delay_samples );
 
         /* Scaling only if the omni_in buffer contains non-zero values */
         maximum_abs_16_fx( st->input_fx, input_frame, &tmp );
@@ -641,18 +601,13 @@ ivas_error front_vad_spar_fx(
         Q_inp_12k8 = hFrontVad->q_buffer_12k8;
         move16();
 
-        scale = s_min( add( q_fr_bands[0], L_norm_arr( fr_bands_fx[0], 2 * NB_BANDS ) ), add( hFrontVad->hNoiseEst->q_bckr, L_norm_arr( hFrontVad->hNoiseEst->bckr_fx, NB_BANDS ) ) );
-        scale_sig32( fr_bands_fx[0], 40, sub( scale, q_fr_bands[0] ) );                                     // scale
-        scale_sig32( hFrontVad->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, hFrontVad->hNoiseEst->q_bckr ) ); // scale
-        hFrontVad->hNoiseEst->q_bckr = q_fr_bands[0] = scale;
-        move16();
-        move16();
-
-        noise_est_down_ivas_fx( fr_bands_fx[0], q_fr_bands[0], hFrontVad->hNoiseEst->bckr_fx, tmpN_fx, tmpE_fx, st->min_band, st->max_band,
-                                &hFrontVad->hNoiseEst->totalNoise_fx, Etot_fx[0], &hFrontVad->hNoiseEst->Etot_last_fx, &hFrontVad->hNoiseEst->Etot_v_h2_fx );
+        Word16 q_tmpN, q_tmpE;
+        noise_est_down_ivas_fx( fr_bands_fx[0], q_fr_bands[0], hFrontVad->hNoiseEst->bckr_fx, &hFrontVad->hNoiseEst->q_bckr, tmpN_fx, &q_tmpN, tmpE_fx, &q_tmpE, st->min_band, st->max_band,
+                                &hFrontVad->hNoiseEst->totalNoise_fx, L_deposit_h( Etot_fx[0] ) /*q8->q24*/, &hFrontVad->hNoiseEst->Etot_last_32fx, &hFrontVad->hNoiseEst->Etot_v_h2_32fx );
 
         corr_shift_fx = correlation_shift_fx( hFrontVad->hNoiseEst->totalNoise_fx ); /* Q15 */
-        dtx_ivas_fx( st, hEncoderConfig->ivas_total_brate, vad_flag_dtx[0], inp_12k8_fx, Q_inp_12k8 );
+
+        dtx_ivas_fx( st, hEncoderConfig->last_ivas_total_brate, hEncoderConfig->ivas_total_brate, vad_flag_dtx[0], inp_12k8_fx, Q_inp_12k8 );
 
         /* linear prediction analysis */
         alw_pitch_lag_12k8[0] = st->old_pitch_la; /* Q0 */
@@ -674,7 +629,8 @@ ivas_error front_vad_spar_fx(
         hFrontVad->q_buffer_12k8 = Q_inp_12k8;
         move16();
 
-        analy_lp_ivas_fx( inp_12k8_fx, L_FRAME, L_LOOK_12k8, &res_energy_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing_fx, INT_FS_12k8, 0 /* <-- sec_chan_low_rate */, Q_inp_12k8, Q_r );
+        analy_lp_fx( inp_12k8_fx, L_FRAME, L_LOOK_12k8, &res_energy_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing_fx, INT_FS_12k8, st->element_mode, 0, Q_inp_12k8, Q_r );
+
         FOR( Word16 i = 0; i <= M; i++ )
         {
             epsP_fx[i] = L_Comp( epsP_h[i], epsP_l[i] ); // Q_r[0]
@@ -697,14 +653,45 @@ ivas_error front_vad_spar_fx(
 
         old_pitch = st->pitch[1];
         move16();
-        Scale_sig( wsp_fx, 368, sub( Q8, Q_inp_12k8 ) ); // Q8
-        pitch_ol_ivas_fx( st->pitch, st->voicing_fx, &st->old_pitch, &st->old_corr_fx, corr_shift_fx, &st->old_thres_fx, &st->delta_pit, st->old_wsp2_fx, wsp_fx, st->mem_decim2_fx, relE_fx, st->clas, st->input_bwidth, st->Opt_SC_VBR, Q8 );
+        Word16 shift, Q_wsp;
+        Word16 shift1 = norm_arr( old_wsp_fx, L_WSP_MEM );
+        Word16 shift2 = norm_arr( wsp_fx, L_WSP - L_WSP_MEM );
+        maximum_abs_16_fx( old_wsp_fx, L_WSP_MEM, &shift );
+        if ( !shift )
+        {
+            shift1 = Q15;
+            move16();
+        }
+        maximum_abs_16_fx( wsp_fx, L_WSP - L_WSP_MEM, &shift );
+        if ( !shift )
+        {
+            shift2 = Q15;
+            move16();
+        }
+
+        shift = s_min( Q15, s_min( add( Q_inp_12k8, shift1 ), add( Q_inp_12k8, shift2 ) ) );
+        shift = s_min( shift, add( norm_arr( st->mem_decim2_fx, 3 ), st->Q_old_wsp2 ) );
+        shift = s_min( shift, add( norm_arr( st->old_wsp2_fx, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM ), st->Q_old_wsp2 ) );
+
+        scale_sig( old_wsp_fx, L_WSP_MEM, sub( shift, Q_inp_12k8 ) );
+        scale_sig( wsp_fx, L_WSP - L_WSP_MEM, sub( shift, Q_inp_12k8 ) );
+
+        Q_wsp = shift;
+        move16();
+
+        scale_sig( st->mem_decim2_fx, 3, sub( Q_wsp, st->Q_old_wsp2 ) );                                    // Q( mem_decim ) = Q( old_wsp2 )
+        scale_sig( st->old_wsp2_fx, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM, sub( Q_wsp, st->Q_old_wsp2 ) ); // Q_wsp
+
+        st->Q_old_wsp2 = Q_wsp;
+        move16();
+
+        pitch_ol_ivas_fx( st->pitch, st->voicing_fx, &st->old_pitch, &st->old_corr_fx, corr_shift_fx, &st->old_thres_fx, &st->delta_pit, st->old_wsp2_fx, wsp_fx, st->mem_decim2_fx, relE_fx, st->clas, st->input_bwidth, st->Opt_SC_VBR, Q_wsp );
 
         /* Updates for adaptive lag window memory */
         st->old_pitch_la = st->pitch[2]; /* Q0 */
         move16();
-        Scale_sig( wsp_fx, 368, Q9 - Q8 ); /* Q9 */
-        StableHighPitchDetect_ivas_fx( &flag_spitch, st->pitch, st->voicing_fx, wsp_fx, st->localVAD, &st->voicing_sm_fx, &st->voicing0_sm_fx, &st->LF_EnergyRatio_sm_fx, &st->predecision_flag, &st->diff_sm_fx, &st->energy_sm_fx, Q12, st->lgBin_E_fx );
+
+        StableHighPitchDetect_ivas_fx( &flag_spitch, st->pitch, st->voicing_fx, wsp_fx, st->localVAD, &st->voicing_sm_fx, &st->voicing0_sm_fx, &st->LF_EnergyRatio_sm_fx, &st->predecision_flag, &st->diff_sm_fx, &st->energy_sm_fx, Q_wsp, st->lgBin_E_fx );
         IF( st->hSpMusClas != NULL )
         {
             Word16 dummy_int;
@@ -727,18 +714,18 @@ ivas_error front_vad_spar_fx(
         Scale_sig32( epsP_fx, M + 1, scale ); // Q_esp
 
         scale = add( hFrontVad->hNoiseEst->ave_enr_q, s_min( L_norm_arr( hFrontVad->hNoiseEst->ave_enr_fx, NB_BANDS ), L_norm_arr( hFrontVad->hNoiseEst->ave_enr2_fx, NB_BANDS ) ) );
-        scale = s_min( scale, add( hFrontVad->hNoiseEst->q_bckr, L_norm_arr( tmpE_fx, NB_BANDS ) ) );
+        scale = s_min( scale, add( q_tmpE, L_norm_arr( tmpE_fx, NB_BANDS ) ) );
         scale = sub( s_min( scale, Q31 ), 1 );
         scale_sig32( hFrontVad->hNoiseEst->ave_enr_fx, NB_BANDS, sub( scale, hFrontVad->hNoiseEst->ave_enr_q ) );
         scale_sig32( hFrontVad->hNoiseEst->ave_enr2_fx, NB_BANDS, sub( scale, hFrontVad->hNoiseEst->ave_enr_q ) );
-        scale_sig32( tmpE_fx, NB_BANDS, sub( scale, hFrontVad->hNoiseEst->q_bckr ) );
+        scale_sig32( tmpE_fx, NB_BANDS, sub( scale, q_tmpE ) );
         hFrontVad->hNoiseEst->ave_enr_q = scale;
         move16();
 
-        scale = add( hFrontVad->hNoiseEst->q_bckr, s_min( L_norm_arr( hFrontVad->hNoiseEst->bckr_fx, NB_BANDS ), L_norm_arr( tmpN_fx, NB_BANDS ) ) );
+        scale = s_min( add( hFrontVad->hNoiseEst->q_bckr, L_norm_arr( hFrontVad->hNoiseEst->bckr_fx, NB_BANDS ) ), add( q_tmpN, L_norm_arr( tmpN_fx, NB_BANDS ) ) );
         scale = sub( s_min( Q31, scale ), 1 ); // guard bits
         scale_sig32( hFrontVad->hNoiseEst->bckr_fx, NB_BANDS, sub( scale, hFrontVad->hNoiseEst->q_bckr ) );
-        scale_sig32( tmpN_fx, NB_BANDS, sub( scale, hFrontVad->hNoiseEst->q_bckr ) );
+        scale_sig32( tmpN_fx, NB_BANDS, sub( scale, q_tmpN ) );
         hFrontVad->hNoiseEst->q_bckr = scale;
         move16();
 
@@ -754,7 +741,7 @@ ivas_error front_vad_spar_fx(
 
         noise_est_ivas_fx( st, old_pitch, tmpN_fx, epsP_fx, Etot_fx[0], sub( Etot_fx[0], hFrontVad->lp_speech_fx ), corr_shift_fx, tmpE_fx,
                            hFrontVad->hNoiseEst->ave_enr_q, fr_bands_fx[0], q_fr_bands[0], &cor_map_sum_fx, NULL, &sp_div_fx, &Q_sp_div, &non_staX_fx, &loc_harm,
-                           lf_E_fx[0], q_lf_E[0], &hFrontVad->hNoiseEst->harm_cor_cnt, hFrontVad->hNoiseEst->Etot_l_lp_fx, hFrontVad->hNoiseEst->Etot_v_h2_fx,
+                           lf_E_fx[0], q_lf_E[0], &hFrontVad->hNoiseEst->harm_cor_cnt, extract_h( hFrontVad->hNoiseEst->Etot_l_lp_32fx ), extract_h( hFrontVad->hNoiseEst->Etot_v_h2_32fx ),
                            &hFrontVad->hNoiseEst->bg_cnt, st->lgBin_E_fx, &sp_floor, S_map_fx, NULL, hFrontVad, hFrontVad->ini_frame );
 
         MVR2R_WORD16( st->pitch, st->pitch, 3 );
diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc_fx.c
similarity index 97%
rename from lib_enc/ivas_init_enc.c
rename to lib_enc/ivas_init_enc_fx.c
index d6a3597bd2d7c7d39407372215c3d01408ab3d2c..04b99f039019bb15a831a85c5ef8fe516d11b782 100644
--- a/lib_enc/ivas_init_enc.c
+++ b/lib_enc/ivas_init_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,14 +34,13 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "ivas_stat_enc.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx_enc.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------*
@@ -270,7 +269,7 @@ Word16 getNumChanAnalysis_fx(
 
     return n;
 }
-
+#ifndef HARM_ENC_INIT
 /*-------------------------------------------------------------------*
  * copy_encoder_config_ivas_fx()
  *
@@ -322,6 +321,7 @@ void copy_encoder_config_ivas_fx(
 
     return;
 }
+#endif
 /*-------------------------------------------------------------------*
  * copy_encoder_config_fx()
  *
@@ -370,6 +370,9 @@ void copy_encoder_config_fx(
 
 #ifdef DEBUGGING
     st_fx->force = st_ivas->hEncoderConfig->force;
+#ifdef DEBUG_FORCE_DIR
+    st_fx->force_dir = st_ivas->hEncoderConfig->force_dir;
+#endif
 #endif
 
     st_fx->element_mode = st_ivas->hEncoderConfig->element_mode_init; /* Q0 */
@@ -461,7 +464,7 @@ void ivas_initialize_handles_enc_fx(
  *
  * Initialize IVAS encoder state structure
  *-------------------------------------------------------------------*/
-
+#ifndef HARM_ENC_INIT
 ivas_error ivas_init_encoder(
     Encoder_Struct *st_ivas /* i/o: IVAS encoder structure      */
 )
@@ -490,7 +493,7 @@ ivas_error ivas_init_encoder(
     if ( NE_32( ivas_format, MONO_FORMAT ) )
     {
         /* In IVAS, ensure that minimum coded bandwidth is WB */
-        hEncoderConfig->max_bwidth = max( hEncoderConfig->max_bwidth, WB ); /* Q0 */
+        hEncoderConfig->max_bwidth = s_max( hEncoderConfig->max_bwidth, WB ); /* Q0 */
         move16();
     }
     st_ivas->ism_mode = ISM_MODE_NONE;
@@ -608,7 +611,7 @@ ivas_error ivas_init_encoder(
         }
         ELSE
         {
-            IF( ( error = create_evs_sce_enc( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )
+            IF( NE_32( ( error = create_evs_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -1071,6 +1074,7 @@ ivas_error ivas_init_encoder(
     }
     return error;
 }
+#endif
 ivas_error ivas_init_encoder_fx(
     Encoder_Struct *st_ivas /* i/o: IVAS encoder structure      */
 )
@@ -1098,10 +1102,10 @@ ivas_error ivas_init_encoder_fx(
     hEncoderConfig->last_ivas_total_brate = ivas_total_brate; /* Q0 */
     move32();
 
-    IF( NE_16( ivas_format, MONO_FORMAT ) )
+    if ( NE_16( ivas_format, MONO_FORMAT ) )
     {
         /* In IVAS, ensure that minimum coded bandwidth is WB */
-        hEncoderConfig->max_bwidth = extract_l( L_max( hEncoderConfig->max_bwidth, WB ) ); /* Q0 */
+        hEncoderConfig->max_bwidth = s_max( hEncoderConfig->max_bwidth, WB ); /* Q0 */
         move16();
     }
     st_ivas->ism_mode = ISM_MODE_NONE;
@@ -1140,7 +1144,10 @@ ivas_error ivas_init_encoder_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point input audio buffer!\n" ) );
         }
+        set32_fx( st_ivas->p_data_fx[n], 0, extract_l( Mpy_32_16_1( input_Fs, INV_FRAME_PER_SEC_Q15 ) ) );
     }
+    st_ivas->q_data_fx = Q11;
+    move16();
     FOR( ; n < MAX_INPUT_CHANNELS + MAX_NUM_OBJECTS; n++ )
     {
         st_ivas->p_data_fx[n] = NULL;
@@ -1194,7 +1201,7 @@ ivas_error ivas_init_encoder_fx(
     /*-----------------------------------------------------------------*
      * Allocate and initialize SCE/CPE and other handles
      *-----------------------------------------------------------------*/
-    test();
+
     IF( EQ_32( ivas_format, MONO_FORMAT ) )
     {
         st_ivas->nSCE = 1; /* in mono, there is always only one SCE */
@@ -1205,23 +1212,19 @@ ivas_error ivas_init_encoder_fx(
         move16();
         sce_id = 0;
         move16();
-
+#ifndef HARM_SCE_INIT
         test();
-        IF( st_ivas->hEncoderConfig->element_mode_init == EVS_MONO )
+        IF( NE_32( ( error = create_evs_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )
         {
-            IF( ( error = create_evs_sce_enc( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )
-            {
-                return error;
-            }
+            return error;
         }
-        ELSE
+#else
+        test();
+        IF( NE_32( ( error = create_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )
         {
-            IF( ( error = create_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )
-            {
-                return error;
-            }
+            return error;
         }
-
+#endif
         /* prepare stereo downmix for EVS */
         IF( EQ_16( hEncoderConfig->stereo_dmx_evs, 1 ) )
         {
@@ -1340,7 +1343,7 @@ ivas_error ivas_init_encoder_fx(
 
             FOR( n = 0; n < CPE_CHANNELS; n++ )
             {
-                IF( hEncoderConfig->Opt_DTX_ON )
+                if ( hEncoderConfig->Opt_DTX_ON )
                 {
                     st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cng_sba_flag = 1;
                     move16();
@@ -1348,7 +1351,7 @@ ivas_error ivas_init_encoder_fx(
             }
         }
 
-        IF( st_ivas->nCPE > 1 )
+        IF( GT_16( st_ivas->nCPE, 1 ) )
         {
             IF( ( error = create_mct_enc_fx( st_ivas ) ) != IVAS_ERR_OK )
             {
@@ -1356,7 +1359,7 @@ ivas_error ivas_init_encoder_fx(
             }
         }
     }
-    ELSE IF( EQ_32( ivas_format, MASA_ISM_FORMAT ) )
+    ELSE IF( EQ_16( ivas_format, MASA_ISM_FORMAT ) )
     {
         Word32 ism_total_brate;
         Word16 k;
@@ -1426,12 +1429,12 @@ ivas_error ivas_init_encoder_fx(
     ELSE IF( EQ_32( ivas_format, SBA_ISM_FORMAT ) )
     {
         st_ivas->ism_mode = ISM_MODE_NONE;
-        move32();
+        move16();
 
         IF( GE_32( ivas_total_brate, IVAS_256k ) )
         {
             st_ivas->ism_mode = ISM_SBA_MODE_DISC;
-            move32();
+            move16();
         }
 
         IF( ( error = ivas_ism_metadata_enc_create_fx( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )
@@ -1521,7 +1524,7 @@ ivas_error ivas_init_encoder_fx(
             return error;
         }
 
-        IF( NE_32( st_ivas->mc_mode, MC_MODE_MCT ) )
+        IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )
         {
             st_ivas->nSCE = 0;
             move16();
@@ -1594,7 +1597,9 @@ ivas_error ivas_init_encoder_fx(
 
             FOR( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
             {
-                IF( ( error = create_cpe_enc_fx( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nCPE + st_ivas->nSCE ) ) ) != IVAS_ERR_OK )
+                Word32 res_dec, res_frac;
+                iDiv_and_mod_32( ivas_total_brate, add( st_ivas->nCPE, st_ivas->nSCE ), &res_dec, &res_frac, 0 );
+                IF( ( error = create_cpe_enc_fx( st_ivas, cpe_id, res_dec ) ) != IVAS_ERR_OK )
                 {
                     return error;
                 }
@@ -1656,7 +1661,9 @@ ivas_error ivas_init_encoder_fx(
      *-----------------------------------------------------------------*/
 
     /* set number of input channels used for analysis/coding */
-    n = getNumChanAnalysis_fx( st_ivas );
+    n = getNumChanAnalysis_fx( st_ivas ); /* Q0 */
+    move16();
+
     IF( n > 0 )
     {
         IF( ( st_ivas->mem_hp20_in_fx = (Word32 **) malloc( n * sizeof( Word32 * ) ) ) == NULL )
@@ -2010,7 +2017,7 @@ void ivas_destroy_enc_fx(
     {
         if ( st_ivas->hSCE[i] != NULL )
         {
-            destroy_sce_enc( st_ivas->hSCE[i], EQ_16( st_ivas->hEncoderConfig->element_mode_init, EVS_MONO ) );
+            destroy_sce_enc_fx( st_ivas->hSCE[i], EQ_16( st_ivas->hEncoderConfig->element_mode_init, EVS_MONO ) );
             st_ivas->hSCE[i] = NULL;
         }
     }
@@ -2149,7 +2156,7 @@ ivas_error ivas_initialize_MD_bstr_enc_fx(
     hMetaData->ivas_max_num_indices = &st_ivas->ivas_max_num_indices_metadata; /* Q0 */
     hMetaData->st_ivas = st_ivas;
 
-    reset_indices_enc( hMetaData, st_ivas->ivas_max_num_indices_metadata );
+    reset_indices_enc_fx( hMetaData, st_ivas->ivas_max_num_indices_metadata );
 
     *hMetaData_out = hMetaData;
 
diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc_fx.c
similarity index 95%
rename from lib_enc/ivas_ism_dtx_enc.c
rename to lib_enc/ivas_ism_dtx_enc_fx.c
index 68325273e092f1c9608c867abaef91c9e31f293c..b06acfbac9d82312451262648f8cc39526dd1b19 100644
--- a/lib_enc/ivas_ism_dtx_enc.c
+++ b/lib_enc/ivas_ism_dtx_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,13 +34,10 @@
 #include <math.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx_enc.h"
-#define IVAS_FLOAT_FIXED_TO_BE_REMOVED
 
 
 /*-----------------------------------------------------------------------*
@@ -177,7 +174,7 @@ Word16 ivas_ism_dtx_enc_fx(
             ( EQ_16( nchan_ism, 2 ) && LE_32( ivas_total_brate, IVAS_48k ) ) ||
             ( EQ_16( nchan_ism, 3 ) && LE_32( ivas_total_brate, IVAS_80k ) ) ||
             ( EQ_16( nchan_ism, 4 ) && LE_32( ivas_total_brate, IVAS_96k ) ) ||
-            LT_16( lp_noise_max_fx, ( 15 << 8 ) ) ) )
+            LT_16( lp_noise_max_fx, ( DTX_THR << 8 ) ) ) )
     {
         dtx_flag = 0;
         move16();
@@ -190,7 +187,7 @@ Word16 ivas_ism_dtx_enc_fx(
     IF( dtx_flag )
     {
         /* reset the bitstream (IVAS format signaling was already written) */
-        reset_indices_enc( hSCE[0]->hCoreCoder[0]->hBstr, hSCE[0]->hCoreCoder[0]->hBstr->nb_ind_tot );
+        reset_indices_enc_fx( hSCE[0]->hCoreCoder[0]->hBstr, hSCE[0]->hCoreCoder[0]->hBstr->nb_ind_tot );
     }
 
     /*------------------------------------------------------------------*
@@ -417,7 +414,7 @@ void ivas_ism_get_sce_id_dtx_fx(
     move16();
     FOR( j = 1; j < nchan_transport; j++ )
     {
-        if ( BASOP_Util_Cmp_Mant32Exp( tmp_energy[j], tmp_energy_e[j], tmp_energy[hISMDTX->sce_id_dtx], tmp_energy_e[hISMDTX->sce_id_dtx] ) )
+        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( tmp_energy[j], tmp_energy_e[j], tmp_energy[hISMDTX->sce_id_dtx], tmp_energy_e[hISMDTX->sce_id_dtx] ), 1 ) )
         {
             hISMDTX->sce_id_dtx = j;
             move16();
@@ -443,9 +440,9 @@ void ivas_ism_coh_estim_dtx_enc_fx(
     Word16 sce_id, i;
     Word32 acorr_ene_fx[MAX_NUM_OBJECTS], xcorr_ene_fx;
     Word16 acorr_ene_e[MAX_NUM_OBJECTS], xcorr_ene_e;
-    Word16 norm_inp;
-    Word16 tot_exp;
-    Word32 scaled_inp;
+    Word16 norm_inp, norm_inp0;
+    Word16 tot_exp, tot_exp2;
+    Word32 scaled_inp, scaled_inp0;
     set16_fx( acorr_ene_e, 0, MAX_NUM_OBJECTS );
 
     IF( EQ_16( nchan_transport, 1 ) )
@@ -475,7 +472,7 @@ void ivas_ism_coh_estim_dtx_enc_fx(
         {
             hISMDTX->coh_fx[sce_id] = 32767; /* 1 in Q15 */
             move16();
-            continue;
+            CONTINUE;
         }
 
         st = hSCE[sce_id]->hCoreCoder[0];
@@ -491,10 +488,13 @@ void ivas_ism_coh_estim_dtx_enc_fx(
         {
             norm_inp = norm_l( st->input32_fx[i] );
             scaled_inp = L_shl( st->input32_fx[i], norm_inp );
-            tot_exp = shl( sub( 20, norm_inp ), 1 );
+            tot_exp = shl( sub( sub( 31, st->q_inp32 ), norm_inp ), 1 );
             acorr_ene_fx[sce_id] = BASOP_Util_Add_Mant32Exp( acorr_ene_fx[sce_id], acorr_ene_e[sce_id], Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &acorr_ene_e[sce_id] ); /* exp(acorr_ene_e) */
             move32();
-            xcorr_ene_fx = BASOP_Util_Add_Mant32Exp( xcorr_ene_fx, xcorr_ene_e, Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &xcorr_ene_e ); /* exp(xcorr_ene_e) */
+            norm_inp0 = norm_l( st_id0->input32_fx[i] );
+            scaled_inp0 = L_shl( st_id0->input32_fx[i], norm_inp0 );
+            tot_exp2 = add( sub( sub( 31, st_id0->q_inp32 ), norm_inp0 ), sub( sub( 31, st->q_inp32 ), norm_inp ) );
+            xcorr_ene_fx = BASOP_Util_Add_Mant32Exp( xcorr_ene_fx, xcorr_ene_e, Mult_32_32( scaled_inp, scaled_inp0 ), tot_exp2, &xcorr_ene_e ); /* exp(xcorr_ene_e) */
         }
         Word16 coh_e;
         Word16 temp_e = acorr_ene_e[hISMDTX->sce_id_dtx] + acorr_ene_e[sce_id];
diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc_fx.c
similarity index 94%
rename from lib_enc/ivas_ism_enc.c
rename to lib_enc/ivas_ism_enc_fx.c
index 6f8fb2b9f8b544950c3e55e3a7fc7d2c62e4a0bc..122ea1d7590348098b464e9ae8d55a0fcc3f4d71 100644
--- a/lib_enc/ivas_ism_enc.c
+++ b/lib_enc/ivas_ism_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,12 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_stat_enc.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 #ifdef DEBUGGING
 #include "debug.h"
@@ -90,7 +88,7 @@ ivas_error ivas_ism_enc_fx(
     Word16 vad_flag_dtx[MAX_NUM_OBJECTS][1];                         /* HE-SAD flag with additional DTX HO       */
     Word32 enerBuffer_fx[MAX_NUM_OBJECTS][1][CLDFB_NO_CHANNELS_MAX]; /* energy buffer                            */
     Word16 enerBuffer_fx_exp[MAX_NUM_OBJECTS][1];                    /* energy buffer                            */
-    Word16 currFlatness_fx[1];                                       /* flatness parameter                       */
+    Word32 currFlatness_fx[1];                                       /* flatness parameter                       */
     Word16 fft_buff_fx[MAX_NUM_OBJECTS][1][2 * L_FFT];               /* FFT buffer                               */
     Word16 fft_buff_fx_q[MAX_NUM_OBJECTS][1];                        /* FFT buffer                               */
     Word32 fr_bands_fx[1][2 * NB_BANDS];                             /* energy in frequency bands                    */
@@ -118,12 +116,10 @@ ivas_error ivas_ism_enc_fx(
     error = IVAS_ERR_OK;
     move32();
 
-#ifdef MSAN_FIX
     FOR( i = 0; i < MAX_NUM_OBJECTS; i++ )
     {
         set16_zero_fx( old_inp_12k8_fx[i][0], L_INP_12k8 );
     }
-#endif
 
     set16_fx( q_re_im_buf, 0, MAX_NUM_OBJECTS );
 
@@ -169,10 +165,16 @@ ivas_error ivas_ism_enc_fx(
         /*------------------------------------------------------------------*
          * Initialization - general
          *-----------------------------------------------------------------*/
-        Copy32( data[sce_id], st->input32_fx, input_frame ); // Q(q_data)
-        q_st_inp_16 = sub( L_norm_arr( st->input32_fx, input_frame ), 16 );
-        Copy_Scale_sig_32_16( st->input32_fx, st->input_fx, input_frame, q_st_inp_16 ); // q_data -> Q(q_inp + q_data)
-        st->q_inp = add( q_st_inp_16, q_data );
+        Word16 Q_min = s_min( q_data, add( st->q_inp32, L_norm_arr( st->input32_fx - input_frame, input_frame ) ) );
+        scale_sig32( st->input32_fx - input_frame, input_frame, sub( Q_min, st->q_inp32 ) );
+        st->q_old_inp32 = Q_min;
+        move16();
+        Copy_Scale_sig32( data[sce_id], st->input32_fx, input_frame, sub( Q_min, q_data ) ); // Q(Q_min)
+        st->q_inp32 = Q_min;
+        move16();
+        q_st_inp_16 = sub( getScaleFactor32( st->input32_fx, input_frame ), 16 );
+        Copy_Scale_sig_32_16( st->input32_fx, st->input_fx, input_frame, q_st_inp_16 ); // Q_min -> Q(q_inp + Q_min)
+        st->q_inp = add( q_st_inp_16, Q_min );
         move16();
 
         st->element_mode = IVAS_SCE;
@@ -197,6 +199,9 @@ ivas_error ivas_ism_enc_fx(
 #ifdef DEBUGGING
         st->force = st_ivas->hEncoderConfig->force;
         st->id_element = sce_id;
+#ifdef DEBUG_FORCE_DIR
+        st->force_dir = st_ivas->hEncoderConfig->force_dir;
+#endif
 #endif
         move16();
         move16();
@@ -212,7 +217,7 @@ ivas_error ivas_ism_enc_fx(
 
         RunTransientDetection_ivas_fx( st->input_fx, input_frame, st->hTranDet, st->q_inp );
 
-        currFlatness_fx[0] = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS, 0 ); // Q7
+        currFlatness_fx[0] = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS, 0 ); // Q21
         move16();
 
         /*----------------------------------------------------------------*
@@ -225,6 +230,11 @@ ivas_error ivas_ism_enc_fx(
 
         st->bits_frame_nominal = sub( extract_l( Mpy_32_32( hSCE->element_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) ), ISM_NB_BITS_METADATA_NOMINAL );
         move16();
+
+#ifdef DEBUG_MODE_INFO
+        dbgwrite( &st->element_mode, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "element_mode", 0, st->id_element, ENC ) );
+#endif
+
         /*----------------------------------------------------------------*
          * Front Pre-processing
          *----------------------------------------------------------------*/
@@ -241,7 +251,7 @@ ivas_error ivas_ism_enc_fx(
         error = pre_proc_front_ivas_fx( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8_fx[sce_id][0], old_inp_16k_fx[sce_id][0],
                                         &ener_fx[sce_id][0], &relE_fx[sce_id][0], A_fx[sce_id][0], Aw_fx[sce_id][0], epsP_fx[sce_id][0], &epsP_fx_q[sce_id][0], lsp_new_fx[sce_id][0], lsp_mid_fx[sce_id][0], &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0],
                                         realBuffer_fx[sce_id][0], imagBuffer_fx[sce_id][0], &q_re_im_buf[sce_id], old_wsp_fx[sce_id][0], &q_old_wsp, pitch_fr_fx[sce_id][0], voicing_fr_fx[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum_fx[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer_fx[sce_id][0], &enerBuffer_fx_exp[sce_id][0],
-                                        fft_buff_fx[sce_id][0], &fft_buff_fx_q[sce_id][0], A_fx[sce_id][0], lsp_new_fx[sce_id][0], currFlatness_fx[0], 0, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[sce_id][0]
+                                        fft_buff_fx[sce_id][0], &fft_buff_fx_q[sce_id][0], A_fx[sce_id][0], lsp_new_fx[sce_id][0], currFlatness_fx[0], 0, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->last_ivas_total_brate, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[sce_id][0]
 #ifdef DEBUG_MODE_INFO
                                         ,
                                         st->id_element
@@ -271,16 +281,6 @@ ivas_error ivas_ism_enc_fx(
      *-----------------------------------------------------------------*/
 
     /* compute the dominant sce_id using long term energy */
-    FOR( Word16 j = 0; j < st_ivas->nchan_transport; j++ )
-    {
-        test();
-        IF( st_ivas->hSCE[j] && st_ivas->hSCE[j]->hCoreCoder[0] )
-        {
-            Copy_Scale_sig_16_32( st_ivas->hSCE[j]->hCoreCoder[0]->input_fx, st_ivas->hSCE[j]->hCoreCoder[0]->input32_fx, input_frame, sub( Q11, st_ivas->hSCE[j]->hCoreCoder[0]->q_inp ) ); /* Q11 */
-            st_ivas->hSCE[j]->hCoreCoder[0]->q_inp32 = Q11;
-            move16();
-        }
-    }
 
     IF( st_ivas->hEncoderConfig->Opt_DTX_ON )
     {
@@ -476,6 +476,9 @@ ivas_error ivas_ism_enc_fx(
         Copy( st->input_fx, st->old_input_signal_fx, input_frame ); /* st->q_inp */
         st->q_old_inp = st->q_inp;
         move16();
+        Copy32( st->input32_fx, st->old_input_signal32_fx, input_frame ); /* st->q_inp32 */
+        st->q_old_inp32 = st->q_inp32;
+        move16();
 
         hSCE->last_element_brate = hSCE->element_brate; /* Q0 */
         move32();
@@ -503,6 +506,20 @@ ivas_error ivas_ism_enc_fx(
         }
     }
 
+#ifdef DEBUG_MODE_INFO
+    for ( sce_id = 0; sce_id < nchan_transport_ism; sce_id++ )
+    {
+        float tmpF;
+        int16_t id;
+
+        st = st_ivas->hSCE[sce_id]->hCoreCoder[0];
+        id = st->id_element;
+
+        tmpF = st->element_brate / 1000.0f;
+        dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "element_brate", 0, id, ENC ) );
+    }
+#endif
+
     pop_wmops();
 
     return error;
diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_ism_metadata_enc.c
rename to lib_enc/ivas_ism_metadata_enc_fx.c
index 9bcc34dd8003099485b07e246bc3a98006ec4ce5..1efbb2123e56790854df9a4a08a641ed61d94dfa 100644
--- a/lib_enc/ivas_ism_metadata_enc.c
+++ b/lib_enc/ivas_ism_metadata_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,17 +35,14 @@
 #include <string.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include <math.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
-#define IVAS_FLOAT_FIXED_TO_BE_REMOVED
-#include "ivas_rom_com_fx.h"
+
 
 /*-----------------------------------------------------------------------*
  * Local constants
@@ -218,7 +215,7 @@ ivas_error ivas_ism_metadata_enc_fx(
     move16();
     Word32 valQ_fx;
     ISM_METADATA_HANDLE hIsmMetaData;
-    int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS];
+    Word32 element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS];
     Word16 ism_metadata_flag_global;
     Word16 non_diegetic_flag_global;
     Word16 ism_imp[MAX_NUM_OBJECTS];
@@ -317,7 +314,8 @@ ivas_error ivas_ism_metadata_enc_fx(
                         }
                         ELSE IF( EQ_16( hIsmMeta[ch]->ism_md_fec_cnt_enc, ISM_MD_FEC_CNT_MAX ) )
                         {
-
+                            hIsmMeta[ch]->ism_md_fec_cnt_enc = 0;
+                            move16();
                             lowrate_metadata_flag[ch] = 1;
                             move16();
                             hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX;
@@ -338,6 +336,17 @@ ivas_error ivas_ism_metadata_enc_fx(
         }
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( hSCE[0]->hCoreCoder[0]->force_dir[0] != '\0' )
+    {
+        dbgread( ism_imp, sizeof( int16_t ), nchan_ism, fname( hSCE[0]->hCoreCoder[0]->force_dir, "force_ism_imp.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( ism_imp, sizeof( int16_t ), nchan_ism, 1, "res/force_ism_imp.enf" );
+    }
+#endif
+
     /*----------------------------------------------------------------*
      * Write ISM common signaling
      *----------------------------------------------------------------*/
@@ -639,6 +648,8 @@ ivas_error ivas_ism_metadata_enc_fx(
                 {
                     hIsmMeta[ch]->ism_md_fec_cnt_enc = add( hIsmMeta[ch]->ism_md_fec_cnt_enc, 1 );
                     move16();
+                    hIsmMeta[ch]->ism_md_fec_cnt_enc = s_min( hIsmMeta[ch]->ism_md_fec_cnt_enc, ISM_MD_FEC_CNT_MAX );
+                    move16();
                 }
                 ELSE
                 {
@@ -806,6 +817,8 @@ ivas_error ivas_ism_metadata_enc_fx(
         {
             hIsmMeta[ch]->ism_md_fec_cnt_enc = add( hIsmMeta[ch]->ism_md_fec_cnt_enc, 1 );
             move16();
+            hIsmMeta[ch]->ism_md_fec_cnt_enc = s_min( hIsmMeta[ch]->ism_md_fec_cnt_enc, ISM_MD_FEC_CNT_MAX );
+            move16();
         }
         ELSE
         {
@@ -854,7 +867,7 @@ ivas_error ivas_ism_metadata_enc_fx(
         /* write metadata only in active frames */
         IF( GT_32( hSCE[0]->hCoreCoder[0]->core_brate, SID_2k40 ) )
         {
-            reset_indices_enc( hSCE[ch]->hMetaData, hSCE[ch]->hMetaData->nb_ind_tot );
+            reset_indices_enc_fx( hSCE[ch]->hMetaData, hSCE[ch]->hMetaData->nb_ind_tot );
         }
     }
 
diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc_fx.c
similarity index 96%
rename from lib_enc/ivas_ism_param_enc.c
rename to lib_enc/ivas_ism_param_enc_fx.c
index 3169962f50970a32ff501b135766ea6da13223fd..cda8cffd674b477b98ea0d5bc665a92cd1198792 100644
--- a/lib_enc/ivas_ism_param_enc.c
+++ b/lib_enc/ivas_ism_param_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,9 +34,7 @@
 #include <math.h>
 #include <assert.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
@@ -307,7 +305,7 @@ void ivas_param_ism_stereo_dmx_fx(
             /* Smoothing */
             cardioid_left[i] = add( mult( 24576 /* 0.75f in Q15 */, cardioid_left[i] ), mult( 8192 /* 0.25f in Q15 */, last_cardioid_left ) ); // Q14
             move16();
-            grad = mult( sub( cardioid_left[i], last_cardioid_left ), shl( one_by_input_frame, 1 ) /* 2.0f / (float) input_frame*/ ); /* Q14 */ /* for the right cardioid, multiply with -1 */
+            Word32 grad_32 = L_mult( sub( cardioid_left[i], last_cardioid_left ), shl( one_by_input_frame, 1 ) /* 2.0f / (float) input_frame*/ ); /* Q14+Q16 = Q30 */ /* for the right cardioid, multiply with -1 */
             /* Cardioids sum up to 1 */
             cardioid_right[i] = sub( ONE_IN_Q14 /* 1.0f in Q14 */, cardioid_left[i] ); /* corresponds to: alpha + ( 1 - alpha ) * cosf( tmp + tmp_1 ); */
             move16();
@@ -316,13 +314,13 @@ void ivas_param_ism_stereo_dmx_fx(
             {
                 tmp = data[i][j];
                 move32();
-                tmp = W_extract_l( W_shr( W_mult_32_16( tmp, add( last_cardioid_left, mult0( j, grad ) ) ), 15 ) ); /* Qx DMX Left */
-                stereo_dmx[0][j] = L_add( stereo_dmx[0][j], tmp );                                                  /* Qx DMX Left */
+                tmp = W_extract_l( W_shr( W_mult_32_32( tmp, L_add( last_cardioid_left, L_shr( Mpy_32_32( L_shl( j, 22 ), grad_32 ), 7 ) ) ), 15 ) ); /* Qx DMX Left */
+                stereo_dmx[0][j] = L_add( stereo_dmx[0][j], tmp );                                                                                    /* Qx DMX Left */
                 move32();
                 tmp = data[i][j];
                 move32();
-                tmp = W_extract_l( W_shr( W_mult_32_16( tmp, add( last_cardioid_right, negate( mult0( j, grad ) ) ) ), 15 ) ); /* Qx DMX Right */
-                stereo_dmx[1][j] = L_add( stereo_dmx[1][j], tmp );                                                             /* Qx DMX Right */
+                tmp = W_extract_l( W_shr( W_mult_32_32( tmp, L_add( last_cardioid_right, L_shr( L_negate( Mpy_32_32( L_shl( j, 22 ), grad_32 ) ), 7 ) ) ), 15 ) ); /* Qx DMX Right */
+                stereo_dmx[1][j] = L_add( stereo_dmx[1][j], tmp );                                                                                                 /* Qx DMX Right */
                 move32();
                 ene_data = W_add( ene_data, W_mult_32_32( data[i][j], data[i][j] ) ); /* 2 * Qx + 1 energy of all objects combined */
             }
@@ -374,8 +372,8 @@ void ivas_param_ism_stereo_dmx_fx(
     tmp_1 = W_norm( ene_data );
     tmp_2 = W_norm( ene_dmx );
     ene_data = W_shl( ene_data, tmp_1 );
-    ene_dmx = W_add( W_shl( ene_dmx, tmp_2 ), 1 );
-    dmx_gain = BASOP_Util_Divide3232_Scale( W_extract_h( ene_data ), W_extract_h( ene_dmx ), &dmx_gain_e );
+    ene_dmx = W_shl( ene_dmx, tmp_2 );
+    dmx_gain = BASOP_Util_Divide3232_Scale( W_extract_h( ene_data ), L_add_sat( W_extract_h( ene_dmx ), 1 ), &dmx_gain_e );
     dmx_gain_e = sub( dmx_gain_e, sub( tmp_1, tmp_2 ) );
     dmx_gain = Sqrt16( dmx_gain, &dmx_gain_e );
 
diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc_fx.c
similarity index 94%
rename from lib_enc/ivas_lfe_enc.c
rename to lib_enc/ivas_lfe_enc_fx.c
index e72270e6cb513fef5a0680588777c2ea79366a22..96959c9dd46fe0d60f391fcbb4c5da5f0e2d3f50 100644
--- a/lib_enc/ivas_lfe_enc.c
+++ b/lib_enc/ivas_lfe_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,12 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "math.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -171,17 +169,17 @@ static void ivas_lfe_enc_quant_fx(
         {
             temp_lfe_dct[4 * i] = pLfe_dct[2 * i];
             move32();
-            lfe_abs_sum = W_add( lfe_abs_sum, abs( temp_lfe_dct[4 * i] ) );
+            lfe_abs_sum = W_add( lfe_abs_sum, L_abs( temp_lfe_dct[4 * i] ) );
             temp_lfe_dct[4 * i + 1] = pLfe_dct[2 * i + 1];
             move32();
-            lfe_abs_sum = W_add( lfe_abs_sum, abs( temp_lfe_dct[4 * i + 1] ) );
+            lfe_abs_sum = W_add( lfe_abs_sum, L_abs( temp_lfe_dct[4 * i + 1] ) );
 
             temp_lfe_dct[4 * i + 2] = pLfe_dct[2 * i + num_dct_pass_bins];
             move32();
-            lfe_abs_sum = W_add( lfe_abs_sum, abs( temp_lfe_dct[4 * i + 2] ) );
+            lfe_abs_sum = W_add( lfe_abs_sum, L_abs( temp_lfe_dct[4 * i + 2] ) );
             temp_lfe_dct[4 * i + 3] = pLfe_dct[2 * i + num_dct_pass_bins + 1];
             move32();
-            lfe_abs_sum = W_add( lfe_abs_sum, abs( temp_lfe_dct[4 * i + 3] ) );
+            lfe_abs_sum = W_add( lfe_abs_sum, L_abs( temp_lfe_dct[4 * i + 3] ) );
         }
 
         IF( LE_64( lfe_abs_sum, W_shr( IVAS_LFE_ABS_SUM_FLT_THR_Q42, sub( 42, q_pLfe_dct ) ) ) )
@@ -199,12 +197,13 @@ static void ivas_lfe_enc_quant_fx(
                 q_lfe_abs_sum = sub( q_lfe_abs_sum, q_tmp );
             }
 
-            tmp = BASOP_Util_Divide3232_Scale( max_value, W_extract_l( lfe_abs_sum ), &q_tmp );
-            tmp = L_shl( tmp, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) ); /* Q0 (max_value / lfe_abs_sum) */
+            tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( max_value, W_extract_l( lfe_abs_sum ), &q_tmp ) );
+            // tmp = L_shl( tmp, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) ); /* Q0 (max_value / lfe_abs_sum) */
+            q_tmp = sub( Q16, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) );
 
             /* log2_f(max_value / lfe_abs_sum) -> Q25 */
             tmp = BASOP_Util_Log2( tmp );
-            tmp = L_add( tmp, 1040187392 ) /* (31<<25) -> 1040187392 */; /* Q25 */
+            tmp = L_add( tmp, L_shl( sub( Q31, q_tmp ), Q25 ) ) /* (31<<25) -> 1040187392 */; /* Q25 */
 
             /* IVAS_LFE_SHIFTS_PER_DOUBLE * log2_f(max_value / lfe_abs_sum) */
             tmp = Mpy_32_16_1( tmp, IVAS_LFE_SHIFTS_PER_DOUBLE ); /* 25-15 -> Q10 */
@@ -250,9 +249,9 @@ static void ivas_lfe_enc_quant_fx(
                         move16();
                     }
 
-                    IF( LT_32( max_of_vals, abs( values[i] ) ) )
+                    IF( LT_32( max_of_vals, abs_s( values[i] ) ) )
                     {
-                        max_of_vals = (Word16) abs( values[i] );
+                        max_of_vals = abs_s( values[i] );
                         move16();
                     }
                 }
@@ -475,8 +474,8 @@ void ivas_lfe_enc_fx(
 
     IF( GT_16( q_out1, q_out2 ) )
     {
-        Scale_sig32( lfe_dct_fx + num_dct_pass_bins, num_dct_pass_bins, min( q_tmp2, sub( q_out1, q_out2 ) ) );
-        q_out2 = add( q_out2, min( q_tmp2, sub( q_out1, q_out2 ) ) );
+        Scale_sig32( lfe_dct_fx + num_dct_pass_bins, num_dct_pass_bins, s_min( q_tmp2, sub( q_out1, q_out2 ) ) );
+        q_out2 = add( q_out2, s_min( q_tmp2, sub( q_out1, q_out2 ) ) );
         IF( GT_16( q_out1, q_out2 ) )
         {
             Scale_sig32( lfe_dct_fx, num_dct_pass_bins, sub( q_out2, q_out1 ) ); // q_out2
@@ -486,8 +485,8 @@ void ivas_lfe_enc_fx(
     }
     ELSE IF( LT_16( q_out1, q_out2 ) )
     {
-        Scale_sig32( lfe_dct_fx, num_dct_pass_bins, min( q_tmp1, sub( q_out2, q_out1 ) ) );
-        q_out1 = add( q_out1, min( q_tmp1, sub( q_out2, q_out1 ) ) );
+        Scale_sig32( lfe_dct_fx, num_dct_pass_bins, s_min( q_tmp1, sub( q_out2, q_out1 ) ) );
+        q_out1 = add( q_out1, s_min( q_tmp1, sub( q_out2, q_out1 ) ) );
         IF( LT_16( q_out1, q_out2 ) )
         {
             Scale_sig32( lfe_dct_fx + num_dct_pass_bins, num_dct_pass_bins, sub( q_out1, q_out2 ) ); // q_out1
@@ -537,12 +536,12 @@ ivas_error ivas_create_lfe_enc_fx(
      * Input memory buffer: allocate and initialize
      *-----------------------------------------------------------------*/
 
-    IF( ( hLFE->old_wtda_audio_fx = (Word32 *) malloc( sizeof( hLFE->old_wtda_audio_fx[0] ) * NS2SA( input_Fs, IVAS_LFE_FADE_NS ) ) ) == NULL )
+    IF( ( hLFE->old_wtda_audio_fx = (Word32 *) malloc( sizeof( hLFE->old_wtda_audio_fx[0] ) * NS2SA_FX2( input_Fs, IVAS_LFE_FADE_NS ) ) ) == NULL )
     {
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE memory\n" ) );
     }
 
-    set32_fx( hLFE->old_wtda_audio_fx, 0, NS2SA( input_Fs, IVAS_LFE_FADE_NS ) );
+    set32_fx( hLFE->old_wtda_audio_fx, 0, NS2SA_FX2( input_Fs, IVAS_LFE_FADE_NS ) );
     hLFE->q_old_wtda_audio = 31;
     move16();
 
diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc_fx.c
similarity index 97%
rename from lib_enc/ivas_masa_enc.c
rename to lib_enc/ivas_masa_enc_fx.c
index 543897b8542fc9365bc5a48b127ea9427ef03c4d..9d0579d1243d17cdf9058de82941b6f0c453d91f 100644
--- a/lib_enc/ivas_masa_enc.c
+++ b/lib_enc/ivas_masa_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,11 +34,9 @@
 #include <math.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_enc.h"
 #include "wmc_auto.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "ivas_prot_fx.h"
@@ -154,7 +152,7 @@ ivas_error ivas_masa_enc_open_fx(
 
     FOR( i = 0; i < hMasa->data.num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_enc( &( hMasa->data.cldfbAnaEnc[i] ), CLDFB_ANALYSIS, hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasa->data.cldfbAnaEnc[i] ), CLDFB_ANALYSIS, hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS, ENC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -262,7 +260,7 @@ void ivas_masa_enc_close_fx(
 
     FOR( i = 0; i < ( *hMasa )->data.num_Cldfb_instances; i++ )
     {
-        deleteCldfb_ivas( &( ( *hMasa )->data.cldfbAnaEnc[i] ) );
+        deleteCldfb_ivas_fx( &( ( *hMasa )->data.cldfbAnaEnc[i] ) );
     }
 
     IF( ( *hMasa )->data.hOmasaData != NULL )
@@ -989,11 +987,7 @@ ivas_error ivas_masa_enc_config_fx(
     /* Setup importance weights for two-direction band selection. */
     IF( EQ_16( hMasa->config.numberOfDirections, 2 ) )
     {
-#ifdef MSAN_FIX
         set32_fx( hMasa->data.importanceWeight_fx, ONE_IN_Q30 /*1.0f Q30*/, MASA_FREQUENCY_BANDS );
-#else
-        set32_fx( hMasa->data.importanceWeight_fx, ONE_IN_Q30 /*1.0f Q30*/, hMasa->config.numCodingBands );
-#endif
 
 
         IF( EQ_16( hMasa->config.numCodingBands, 5 ) )
@@ -1483,7 +1477,7 @@ static void combine_freqbands_and_subframes_fx(
                     move16();
 
                     hMeta->directional_meta[i].energy_ratio_fx[j][k] =
-                        BASOP_Util_Divide3232_Scale_cadence( vecLen, L_add( energySum, EPSILON_FX ), &exp_diff ); /*exp_diff+vecLen_e-energySum_e*/
+                        BASOP_Util_Divide3232_Scale_newton( vecLen, L_add( energySum, EPSILON_FX ), &exp_diff ); /*exp_diff+vecLen_e-energySum_e*/
                     move32();
                     exp_diff = add( exp_diff, sub( vecLen_e, energySum_e ) );
                     hMeta->directional_meta[i].energy_ratio_fx[j][k] =
@@ -1591,7 +1585,7 @@ static void combine_freqbands_and_subframes_fx(
                 {
                     energyRatioSum = BASOP_Util_Add_Mant32Exp( energyRatioSum, energyRatioSum_e, Mpy_32_32( energy[j][k], hMeta->directional_meta[i].energy_ratio_fx[j][k] ), add( energy_e[j][k], 1 ), &energyRatioSum_e ); // 31-energyRatioSum_e
                 }
-                energyRatioTemp = BASOP_Util_Divide3232_Scale_cadence( energyRatioSum, L_add( energySum, EPSILON_FX ), &exp_diff );
+                energyRatioTemp = BASOP_Util_Divide3232_Scale_newton( energyRatioSum, L_add( energySum, EPSILON_FX ), &exp_diff );
                 exp_diff = add( exp_diff, sub( energyRatioSum_e, energySum_e ) );
                 energyRatioTemp = L_shl( energyRatioTemp, sub( exp_diff, 1 ) ); // Q30
 
@@ -2270,13 +2264,13 @@ static void compensate_energy_ratios_fx(
                 FOR( dir = 0; dir < numDirs; dir++ )
                 {
                     hMeta->directional_meta[dir].energy_ratio_fx[sf][band] =
-                        BASOP_Util_Divide3232_Scale_cadence( hMeta->directional_meta[dir].energy_ratio_fx[sf][band], ratioSum, &exp_diff );
+                        BASOP_Util_Divide3232_Scale_newton( hMeta->directional_meta[dir].energy_ratio_fx[sf][band], ratioSum, &exp_diff );
                     move32();
                     hMeta->directional_meta[dir].energy_ratio_fx[sf][band] = L_shl( hMeta->directional_meta[dir].energy_ratio_fx[sf][band], sub( exp_diff, Q1 ) ); // Q30
                     move32();
                 }
                 hMeta->common_meta.diffuse_to_total_ratio_fx[sf][band] =
-                    BASOP_Util_Divide3232_Scale_cadence( hMeta->common_meta.diffuse_to_total_ratio_fx[sf][band], ratioSum, &exp_diff );
+                    BASOP_Util_Divide3232_Scale_newton( hMeta->common_meta.diffuse_to_total_ratio_fx[sf][band], ratioSum, &exp_diff );
                 move32();
                 hMeta->common_meta.diffuse_to_total_ratio_fx[sf][band] = L_shl( hMeta->common_meta.diffuse_to_total_ratio_fx[sf][band], sub( exp_diff, Q1 ) ); // Q30
                 move32();
@@ -2303,10 +2297,12 @@ static void reduce_metadata_further_fx(
     UWord8 computeCoherence;
     Word32 onset_filter;
     Word16 onset_filter_e, exp;
-    Word32 bandEnergy;
+    Word64 bandEnergy;
+    Word32 bandEnergy32;
+    Word16 bandEnergy_exp, shift;
     UWord8 mergeOverFreqBands;
     Word32 meanRatio;
-    Word16 tmp, tmp2;
+    Word16 tmp, tmp2, q_totalEnergySum;
 
     numCodingBands = hMasa->config.numCodingBands;
     test();
@@ -2364,10 +2360,20 @@ static void reduce_metadata_further_fx(
         }
     }
 
-    tmp2 = W_norm( W_tmp );
+    IF( W_tmp != 0 )
+    {
+        tmp2 = sub( W_norm( W_tmp ), 1 ); // Usage of guard bits to avoid the large values of onset_detector in multiplication
+    }
+    ELSE
+    {
+        tmp2 = 0;
+        move16();
+    }
+
     tmp2 = s_min( 32, tmp2 );
     totalEnergySum = W_extract_h( W_shl( W_tmp, tmp2 ) );
     tmp2 = sub( tmp2, 32 );
+    q_totalEnergySum = add( hMasa->data.q_energy, tmp2 );
 
     /* Determine onsets */
     hMasa->data.onset_detector_1_fx = Mpy_32_32( hMasa->data.onset_detector_1_fx, LOWBITRATE_ONSET_ALPHA_Q31 );
@@ -2375,12 +2381,17 @@ static void reduce_metadata_further_fx(
 
     tmp = hMasa->data.q_onset_detector;
     move16();
-    IF( BASOP_Util_Cmp_Mant32Exp( hMasa->data.onset_detector_1_fx, sub( 31, hMasa->data.q_onset_detector ), totalEnergySum, sub( 31, hMasa->data.q_energy ) ) < 0 )
+    IF( BASOP_Util_Cmp_Mant32Exp( hMasa->data.onset_detector_1_fx, sub( 31, hMasa->data.q_onset_detector ), totalEnergySum, sub( 31, q_totalEnergySum ) ) < 0 )
     {
         hMasa->data.onset_detector_1_fx = totalEnergySum; // hMasa->data.q_energy
         hMasa->data.q_onset_detector = add( hMasa->data.q_energy, tmp2 );
         move32();
         move16();
+
+        shift = norm_l( hMasa->data.onset_detector_2_fx );
+        hMasa->data.onset_detector_2_fx = L_shl( hMasa->data.onset_detector_2_fx, shift );
+        move32();
+        tmp = add( tmp, shift );
     }
     IF( LT_16( tmp, hMasa->data.q_onset_detector ) )
     {
@@ -2401,7 +2412,7 @@ static void reduce_metadata_further_fx(
 
     IF( hMasa->data.onset_detector_1_fx != 0 )
     {
-        onset_filter = L_max( BASOP_Util_Divide3232_Scale_cadence( hMasa->data.onset_detector_2_fx, hMasa->data.onset_detector_1_fx, &onset_filter_e ), 0 );
+        onset_filter = L_max( BASOP_Util_Divide3232_Scale_newton( hMasa->data.onset_detector_2_fx, hMasa->data.onset_detector_1_fx, &onset_filter_e ), 0 );
 
         IF( BASOP_Util_Cmp_Mant32Exp( onset_filter, onset_filter_e, ONE_IN_Q31, 0 ) > 0 )
         {
@@ -2428,19 +2439,22 @@ static void reduce_metadata_further_fx(
             Word32 bandRatio;
 
             // threshold = totalEnergySum / ( MAX_PARAM_SPATIAL_SUBFRAMES * LOWBITRATE_NUM_BANDS ) * 0.5f; /* Average energy multiplied with energy ratio of 0.5f */
-            threshold = BASOP_Util_Divide3232_Scale_cadence( totalEnergySum, ( MAX_PARAM_SPATIAL_SUBFRAMES * LOWBITRATE_NUM_BANDS ) * 2, &exp ); /* Average energy multiplied with energy ratio of 0.5f */
+            threshold = BASOP_Util_Divide3232_Scale_newton( totalEnergySum, ( MAX_PARAM_SPATIAL_SUBFRAMES * LOWBITRATE_NUM_BANDS ) * 2, &exp ); /* Average energy multiplied with energy ratio of 0.5f */
             exp = add( exp, sub( sub( 31, add( hMasa->data.q_energy, tmp2 ) ), 31 ) );
             bandRatio = hqmetadata->q_direction[0].band_data[band].energy_ratio_fx[0]; // Q30
             move32();
 
             bandEnergy = 0;
-            move32();
+            move64();
             FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
             {
-                bandEnergy = L_add( bandEnergy, energy[sf][band] );
+                bandEnergy = W_mac_32_32( bandEnergy, energy[sf][band], 1 );
             }
+            shift = W_norm( bandEnergy );
+            bandEnergy32 = W_extract_h( W_shl( bandEnergy, shift ) );
+            bandEnergy_exp = sub( 63, add( add( hMasa->data.q_energy, 1 ), shift ) );
 
-            IF( BASOP_Util_Cmp_Mant32Exp( Mpy_32_32( L_shr( bandEnergy, 2 ), bandRatio ), sub( 31 + 1, hMasa->data.q_energy ), threshold, exp ) > 0 )
+            IF( BASOP_Util_Cmp_Mant32Exp( Mpy_32_32( L_shr( bandEnergy32, 2 ), bandRatio ), add( 1, bandEnergy_exp ), threshold, exp ) > 0 )
             {
                 selectedBand = band;
                 move16();
@@ -2449,19 +2463,23 @@ static void reduce_metadata_further_fx(
         }
 
         /* Determine if to merge over frequency instead of time */
-        meanRatio = 0;
-        move32();
+        W_tmp = 0;
+        move64();
         FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
         {
             FOR( band = 0; band < numCodingBands; band++ )
             {
-                meanRatio = L_add( meanRatio, Mpy_32_32( hqmetadata->q_direction[0].band_data[band].energy_ratio_fx[sf], energy[sf][band] ) ); // hMasa->data.q_energy - 1
+                W_tmp = W_mac_32_16( W_tmp, Mpy_32_32( hqmetadata->q_direction[0].band_data[band].energy_ratio_fx[sf], energy[sf][band] ), 1 ); // hMasa->data.q_energy
             }
         }
+        shift = W_norm( W_tmp );
+        meanRatio = W_extract_h( W_shl( W_tmp, shift ) ); // Q:sub( add( hMasa->data.q_energy, shift ), 32 )
+        shift = sub( 31, sub( add( hMasa->data.q_energy, shift ), 32 ) );
+
         IF( totalEnergySum != 0 )
         {
-            meanRatio = BASOP_Util_Divide3232_Scale_cadence( meanRatio, totalEnergySum, &exp );
-            exp = add( add( exp, 1 ), tmp2 ); // 31 - (hMasa->data.q_energy - 1) - 31 - hMasa->data.q_energy - tmp2 => 1 + tmp2
+            meanRatio = BASOP_Util_Divide3232_Scale_newton( meanRatio, totalEnergySum, &exp );
+            exp = add( exp, sub( shift, sub( 31, add( hMasa->data.q_energy, tmp2 ) ) ) ); // exp + (shift - (31 - hMasa->data.q_energy - tmp2)) => 1 + tmp2
         }
         ELSE
         {
@@ -2500,6 +2518,8 @@ static void reduce_metadata_further_fx(
         Word32 x, y, z;
         Word32 veclen, L_tmp;
 
+        W_tmp = 0;
+        move64();
         FOR( band = 0; band < numCodingBands; band++ )
         {
             xSum = 0;
@@ -2528,9 +2548,14 @@ static void reduce_metadata_further_fx(
                 ySum = L_add( ySum, y );
                 zSum = L_add( zSum, z );
 
-                bandSumEnergy = L_add( bandSumEnergy, energy[sf][band] );
+                W_tmp = W_add( W_tmp, energy[sf][band] );
             }
 
+            tmp2 = W_norm( W_tmp );
+            tmp2 = s_min( 32, tmp2 );
+            bandSumEnergy = W_extract_h( W_shl( W_tmp, tmp2 ) );
+            tmp2 = sub( add( hMasa->data.q_energy, tmp2 ), 32 );
+
             aziRad = BASOP_util_atan2( ySum, xSum, 0 ); // Q13
             W_xSum_sq = W_mult0_32_32( xSum, xSum );    // 2 * hMasa->data.q_energy - Q6
             W_ySum_sq = W_mult0_32_32( ySum, ySum );    // 2 * hMasa->data.q_energy - Q6
@@ -2558,6 +2583,7 @@ static void reduce_metadata_further_fx(
                 }
                 // hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0] = (uint8_t) roundf( spreadCohSum / ( bandSumEnergy + EPSILON ) * 255.0f );
                 tmp = BASOP_Util_Divide3232_Scale( spreadCohSum, bandSumEnergy, &exp );
+                exp = add( exp, sub( tmp2, hMasa->data.q_energy ) );
                 tmp = mult_r( tmp, 32640 /* 255 in Q7 */ );                                                                    // 15 - exp + 7 - 15 => 7 - exp
                 hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0] = (UWord8) shr( tmp, sub( 7, exp ) ); // Q0
                 move16();
@@ -3968,9 +3994,7 @@ static void quantize_ratio_ism_vector_ivas_fx(
 
                 FOR( i = 0; i < no_ism_loc; i++ )
                 {
-                    idx[i] = mult( ratio_ism_loc[i], max_sum_idx ); // exponent : ratio_ism_e + 15
-                    move16();
-                    idx[i] = shl( idx[i], sub( add( ratio_ism_e, 15 ), 15 ) ); // Q0
+                    idx[i] = extract_l( L_shr( L_mult0( ratio_ism_loc[i], max_sum_idx ), sub( 15, ratio_ism_e ) ) ); // Q0
                     move16();
                     part_idx_sum = add( part_idx_sum, idx[i] );
 
@@ -4631,7 +4655,9 @@ static void ivas_encode_masaism_metadata_fx(
     UWord8 numCodingBands;
     UWord8 numSf;
     Word16 brange[2];
-    Word32 eneBand;
+    Word64 eneBand;
+    Word32 eneBand32;
+    Word16 eneBand_exp, shift;
     Word16 bin;
     Word16 obj;
     Word16 bits_ism[MAX_NUM_OBJECTS];
@@ -4680,11 +4706,14 @@ static void ivas_encode_masaism_metadata_fx(
                 eneBand = 0;
                 move16();
                 move16();
-                move32();
+                move64();
                 FOR( bin = brange[0]; bin < brange[1]; bin++ )
                 {
-                    eneBand = L_add( eneBand, hMasa->data.energy_fx[sf][bin] ); // hMasa->data.q_energy
+                    eneBand = W_mac_32_32( eneBand, hMasa->data.energy_fx[sf][bin], 1 ); // hMasa->data.q_energy + 1
                 }
+                shift = W_norm( eneBand );
+                eneBand32 = W_extract_h( W_shl( eneBand, shift ) );
+                eneBand_exp = sub( 63, add( add( hMasa->data.q_energy, 1 ), shift ) );
 
                 energy_ism = 0;
                 energy_ism_e = 0;
@@ -4711,19 +4740,19 @@ static void ivas_encode_masaism_metadata_fx(
 
                 FOR( obj = 0; obj < nchan_ism; obj++ )
                 {
-                    hOmasaData->energy_ratio_ism_fx[sf][0][obj] = BASOP_Util_Divide3232_Scale_cadence( energy_ism_ind[obj], energy_ism, &L_tmp_e );
+                    hOmasaData->energy_ratio_ism_fx[sf][0][obj] = BASOP_Util_Divide3232_Scale_newton( energy_ism_ind[obj], energy_ism, &L_tmp_e );
                     move32();
                     L_tmp_e = add( L_tmp_e, sub( energy_ism_ind_e[obj], energy_ism_e ) );
                     /* Scaling to Q30 */
                     hOmasaData->energy_ratio_ism_fx[sf][0][obj] = L_shl( hOmasaData->energy_ratio_ism_fx[sf][0][obj], sub( L_tmp_e, 1 ) ); // Q30
                     move32();
                 }
-                L_tmp = BASOP_Util_Add_Mant32Exp( eneBand, sub( 31, hMasa->data.q_energy ), energy_ism, energy_ism_e, &L_tmp_e );
+                L_tmp = BASOP_Util_Add_Mant32Exp( eneBand32, eneBand_exp, energy_ism, energy_ism_e, &L_tmp_e );
                 IF( L_tmp != 0 )
                 {
-                    hOmasaData->masa_to_total_energy_ratio_fx[sf][0] = BASOP_Util_Divide3232_Scale_cadence( eneBand, L_tmp, &tmp );
+                    hOmasaData->masa_to_total_energy_ratio_fx[sf][0] = BASOP_Util_Divide3232_Scale_newton( eneBand32, L_tmp, &tmp );
                     move32();
-                    tmp = add( tmp, sub( sub( 31, hMasa->data.q_energy ), L_tmp_e ) );
+                    tmp = add( tmp, sub( eneBand_exp, L_tmp_e ) );
                     /* Scaling to Q30 */
                     hOmasaData->masa_to_total_energy_ratio_fx[sf][0] = L_shl( hOmasaData->masa_to_total_energy_ratio_fx[sf][0], sub( tmp, 1 ) ); // Q30
                     move32();
@@ -4772,7 +4801,7 @@ static void ivas_encode_masaism_metadata_fx(
             {
                 FOR( obj = 0; obj < nchan_ism; obj++ )
                 {
-                    hOmasaData->energy_ratio_ism_fx[0][band][obj] = BASOP_Util_Divide3232_Scale_cadence( energy_ism_ind[obj], energy_ism, &L_tmp_e );
+                    hOmasaData->energy_ratio_ism_fx[0][band][obj] = BASOP_Util_Divide3232_Scale_newton( energy_ism_ind[obj], energy_ism, &L_tmp_e );
                     move32();
                     L_tmp_e = add( L_tmp_e, sub( energy_ism_ind_e[obj], energy_ism_e ) );
                     /* Scaling to Q30 */
@@ -4785,21 +4814,24 @@ static void ivas_encode_masaism_metadata_fx(
                 move16();
 
                 eneBand = 0;
-                move32();
+                move64();
                 FOR( sf = 0; sf < omasa_nblocks; sf++ )
                 {
                     FOR( bin = brange[0]; bin < brange[1]; bin++ )
                     {
-                        eneBand = L_add( eneBand, hMasa->data.energy_fx[sf][bin] ); // hMasa->data.q_energy
+                        eneBand = W_mac_32_32( eneBand, hMasa->data.energy_fx[sf][bin], 1 ); // hMasa->data.q_energy + 1
                     }
                 }
+                shift = W_norm( eneBand );
+                eneBand32 = W_extract_h( W_shl( eneBand, shift ) );
+                eneBand_exp = sub( 63, add( add( hMasa->data.q_energy, 1 ), shift ) );
 
-                L_tmp = BASOP_Util_Add_Mant32Exp( eneBand, sub( 31, hMasa->data.q_energy ), energy_ism, energy_ism_e, &L_tmp_e );
+                L_tmp = BASOP_Util_Add_Mant32Exp( eneBand32, eneBand_exp, energy_ism, energy_ism_e, &L_tmp_e );
                 IF( L_tmp != 0 )
                 {
-                    hOmasaData->masa_to_total_energy_ratio_fx[0][band] = BASOP_Util_Divide3232_Scale_cadence( eneBand, L_tmp, &tmp );
+                    hOmasaData->masa_to_total_energy_ratio_fx[0][band] = BASOP_Util_Divide3232_Scale_newton( eneBand32, L_tmp, &tmp );
                     move32();
-                    tmp = add( tmp, sub( sub( 31, hMasa->data.q_energy ), L_tmp_e ) );
+                    tmp = add( tmp, sub( eneBand_exp, L_tmp_e ) );
                     /* Scaling to Q30 */
                     hOmasaData->masa_to_total_energy_ratio_fx[0][band] = L_shl( hOmasaData->masa_to_total_energy_ratio_fx[0][band], sub( tmp, 1 ) ); // Q30
                     move32();
@@ -4842,18 +4874,21 @@ static void ivas_encode_masaism_metadata_fx(
                     move16();
 
                     eneBand = 0;
-                    move32();
+                    move64();
                     FOR( bin = brange[0]; bin < brange[1]; bin++ )
                     {
-                        eneBand = L_add( eneBand, hMasa->data.energy_fx[sf][bin] ); // hMasa->data.q_energy
+                        eneBand = W_mac_32_32( eneBand, hMasa->data.energy_fx[sf][bin], 1 ); // hMasa->data.q_energy + 1
                     }
+                    shift = W_norm( eneBand );
+                    eneBand32 = W_extract_h( W_shl( eneBand, shift ) );
+                    eneBand_exp = sub( 63, add( add( hMasa->data.q_energy, 1 ), shift ) );
 
-                    L_tmp = BASOP_Util_Add_Mant32Exp( eneBand, sub( 31, hMasa->data.q_energy ), hOmasaData->energy_ism_fx[sf][band], hOmasaData->energy_ism_fx_e[sf][band], &L_tmp_e );
+                    L_tmp = BASOP_Util_Add_Mant32Exp( eneBand32, eneBand_exp, hOmasaData->energy_ism_fx[sf][band], hOmasaData->energy_ism_fx_e[sf][band], &L_tmp_e );
                     IF( L_tmp != 0 )
                     {
-                        hOmasaData->masa_to_total_energy_ratio_fx[sf][band] = BASOP_Util_Divide3232_Scale_cadence( eneBand, L_tmp, &tmp );
+                        hOmasaData->masa_to_total_energy_ratio_fx[sf][band] = BASOP_Util_Divide3232_Scale_newton( eneBand32, L_tmp, &tmp );
                         move32();
-                        tmp = add( tmp, sub( sub( 31, hMasa->data.q_energy ), L_tmp_e ) );
+                        tmp = add( tmp, sub( eneBand_exp, L_tmp_e ) );
                         /* Scaling to Q30 */
                         hOmasaData->masa_to_total_energy_ratio_fx[sf][band] = L_shl( hOmasaData->masa_to_total_energy_ratio_fx[sf][band], sub( tmp, 1 ) ); // Q30
                         move32();
diff --git a/lib_enc/ivas_mc_param_enc.c b/lib_enc/ivas_mc_param_enc_fx.c
similarity index 80%
rename from lib_enc/ivas_mc_param_enc.c
rename to lib_enc/ivas_mc_param_enc_fx.c
index 63b5862ca32240041ab0f9fa191c62ac33633175..7f74f78f922ecc40682f6bbe91214d0c9cd0376e 100644
--- a/lib_enc/ivas_mc_param_enc.c
+++ b/lib_enc/ivas_mc_param_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -30,6 +30,21 @@
 
 *******************************************************************************************************/
 
+// helper macros to convert the 64 bitt accumulators into the 48 bit float format
+#define CONVERT_CY( x_64, y_fx, y_e )              \
+    {                                              \
+        Word16 norm;                               \
+        norm = W_norm( x_64 );                     \
+        y_fx = W_extract_h( W_shl( x_64, norm ) ); \
+        y_e = sub( sub62gb, norm );                \
+    }
+#define CONVERT_DMX( x_64, y_fx, y_e )             \
+    {                                              \
+        Word16 norm;                               \
+        norm = W_norm( x_64 );                     \
+        y_fx = W_extract_h( W_shl( x_64, norm ) ); \
+        y_e = sub( sub35gb, norm );                \
+    }
 #include <math.h>
 #include <assert.h>
 #include "options.h"
@@ -37,16 +52,13 @@
 #include "rom_enc.h"
 #include "ivas_rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 
 #include "prot_fx_enc.h"
-#include "prot_fx.h"
 
 /*-------------------------------------------------------------------------
  * Local function prototypes
@@ -62,7 +74,7 @@ static void ivas_param_mc_range_encoder_fx( const Word16 *seq_in, const Word16 n
 
 
 #define ATTACKTHRESHOLD_E 4
-static void ivas_param_mc_quantize_ilds_fx( PARAM_MC_ENC_HANDLE hParamMC, Word32 Cy_fx[MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], Word16 Cy_e[MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], Word32 Cx[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS], Word16 Cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS], const Word16 freq_idx, const Word16 nchan_input, const Word16 nchan_transport, Word16 *ILD_idx_out, Word16 ILD_q[PARAM_MC_SZ_ILD_MAP] );
+static void ivas_param_mc_quantize_ilds_fx( PARAM_MC_ENC_HANDLE hParamMC, Word32 Cy_fx[MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], Word16 Cy_e[MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], Word32 Cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS], Word16 Cx_e[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS], const Word16 freq_idx, const Word16 nchan_input, const Word16 nchan_transport, Word16 *ILD_idx_out, Word16 ILD_q[PARAM_MC_SZ_ILD_MAP] );
 
 static void ivas_param_mc_parameter_quantizer_fx( const Word32 *x, const Word16 *x_e, const Word16 L, const Word16 sz_quantizer, const Word16 *quantizer_fx, const Word16 Q_quant, Word16 *quant_idx, Word16 *y );
 
@@ -652,14 +664,26 @@ static void ivas_param_mc_param_est_enc_fx(
     Word32 *p_slot_frame_f_real_fx[MAX_CICP_CHANNELS];                     /* Output of the MDFT FB - real part */
     Word32 *p_slot_frame_f_imag_fx[MAX_CICP_CHANNELS];                     /* Output of the MDFT FB - imag part */
 
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+    Word64 dmx_real_64[PARAM_MC_MAX_TRANSPORT_CHANS];
+    Word64 dmx_imag_64[PARAM_MC_MAX_TRANSPORT_CHANS];
+#else
     Word32 dmx_real_fx[PARAM_MC_MAX_TRANSPORT_CHANS]; /* Downmix channel - Real Part */
     Word16 dmx_real_e[PARAM_MC_MAX_TRANSPORT_CHANS];  /* Downmix channel - Real Part */
     Word32 dmx_imag_fx[PARAM_MC_MAX_TRANSPORT_CHANS]; /* Downmix channel - Imag Part */
     Word16 dmx_imag_e[PARAM_MC_MAX_TRANSPORT_CHANS];  /* Downmix channel - Imag Part */
-    Word32 a_fx, b_fx, c_fx, d_fx;                    /* Tmp complex values */
-    Word16 a_e, b_e, c_e, d_e;                        /* Tmp complex values */
+#endif
+    Word32 a_fx, b_fx, c_fx, d_fx; /* Tmp complex values */
+    Word16 a_e, b_e, c_e, d_e;     /* Tmp complex values */
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+    Word64 Cy_sum_real_64[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS];
+    Word64 Cy_sum_imag_64[PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS];
+    Word16 sub62gb;
+    Word16 sub35gb;
+#else
     Word32 Cy_sum_imag_fx[PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS];
     Word16 Cy_sum_imag_e[PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS];
+#endif
     Word32 Cx_sum_imag_fx[PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC][PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS];
     Word16 Cx_sum_imag_e[PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC][PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS];
     Word32 real_part_fx, imag_part_fx;
@@ -688,13 +712,26 @@ static void ivas_param_mc_param_est_enc_fx(
     move16();
     band_step = 1;
     move16();
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+    FOR( cur_param_band = 0; cur_param_band < PARAM_MC_MAX_PARAMETER_BANDS; cur_param_band++ )
+    {
+        FOR( ch_idx1 = 0; ch_idx1 < MAX_CICP_CHANNELS; ch_idx1++ )
+        {
+            set64_fx( Cy_sum_real_64[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
+        }
+    }
+#endif
 
     FOR( cur_param_band = 0; cur_param_band < PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC; cur_param_band++ )
     {
         FOR( ch_idx1 = 0; ch_idx1 < MAX_CICP_CHANNELS; ch_idx1++ )
         {
-            set32_fx( Cy_sum_imag_fx[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
-            set16_fx( Cy_sum_imag_e[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+            set64_fx( Cy_sum_imag_64[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
+#else
+            set32_fx( Cy_sum_fx[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
+            set16_fx( Cy_sum_e[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
+#endif
         }
 
         FOR( ch_idx1 = 0; ch_idx1 < PARAM_MC_MAX_TRANSPORT_CHANS; ch_idx1++ )
@@ -723,9 +760,23 @@ static void ivas_param_mc_param_est_enc_fx(
         }
     }
 
+#if defined( IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE ) || defined( IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE )
+    Word16 gb = find_guarded_bits_fx( l_ts );
+#ifndef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+    Word16 add20gb = add( 20, gb );
+#endif
+
+#endif
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+    sub35gb = sub( 32, sub( 11, find_guarded_bits_fx( l_ts ) ) );           // 31 - (((11 - gb) + 31 + norm) - 32)
+    sub62gb = sub( 63, shl( sub( 11, find_guarded_bits_fx( l_ts ) ), 1 ) ); // 31 - ((2*(11 - gb) + norm) - 32)
+#endif
+
     FOR( ts = start_ts; ts < num_time_slots; ts++ )
     {
+#if !defined( IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE ) && !defined( IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE )
         Word16 gb = find_guarded_bits_fx( l_ts );
+#endif
         ivas_fb_mixer_get_windowed_fr_fx( hParamMC->hFbMixer, pcm_in_fx, p_slot_frame_f_real_fx, p_slot_frame_f_imag_fx, l_ts, l_ts, hParamMC->hFbMixer->fb_cfg->num_in_chans, gb );
         ivas_fb_mixer_update_prior_input_fx( hParamMC->hFbMixer, pcm_in_fx, l_ts, hParamMC->hFbMixer->fb_cfg->num_in_chans );
 
@@ -734,6 +785,7 @@ static void ivas_param_mc_param_est_enc_fx(
         FOR( i = 0; i < nchan_input; i++ )
         {
             pcm_in_fx[i] += l_ts;
+            move32();
         }
         /* Computing the downmix */
         FOR( cur_param_band = 0; cur_param_band < hParamMC->max_param_band_abs_cov; cur_param_band++ )
@@ -751,6 +803,27 @@ static void ivas_param_mc_param_est_enc_fx(
 
                 FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )
                 {
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    Word64 real_64;
+                    Word64 imag_64;
+
+                    real_64 = 0;
+                    imag_64 = 0;
+                    move64();
+                    move64();
+                    FOR( inp_ch = 0; inp_ch < nchan_input; inp_ch++ )
+                    {
+                        real_64 = W_add( real_64, W_mult0_32_32( slot_frame_f_real_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) ) );
+                        imag_64 = W_add( imag_64, W_mult0_32_32( slot_frame_f_imag_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) ) );
+                        p_dmx_fac_fx++;
+                    }
+                    dmx_real_64[ch_idx1] = real_64;
+                    dmx_imag_64[ch_idx1] = imag_64;
+                    move64();
+                    move64();
+
+#else
+#ifndef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE
                     dmx_real_fx[ch_idx1] = 0;
                     move32();
                     dmx_real_e[ch_idx1] = 0;
@@ -769,13 +842,45 @@ static void ivas_param_mc_param_est_enc_fx(
                         move32();
                         p_dmx_fac_fx++;
                     }
+#else
+                    Word32 real_fx = L_add( 0, 0 );
+                    Word16 real_e = add( 0, 0 );
+                    Word32 imag_fx = L_add( 0, 0 );
+                    Word16 imag_e = add( 0, 0 );
+                    FOR( inp_ch = 0; inp_ch < nchan_input; inp_ch++ )
+                    {
+                        L_tmp = Mpy_32_32( slot_frame_f_real_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) );
+                        real_fx = BASOP_Util_Add_Mant32Exp( real_fx, real_e, L_tmp, add20gb, &real_e );
+                        L_tmp = Mpy_32_32( slot_frame_f_imag_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) );
+                        imag_fx = BASOP_Util_Add_Mant32Exp( imag_fx, imag_e, L_tmp, add20gb, &imag_e );
+                        p_dmx_fac_fx++;
+                    }
+                    dmx_real_fx[ch_idx1] = real_fx;
+                    dmx_real_e[ch_idx1] = real_e;
+                    dmx_imag_fx[ch_idx1] = imag_fx;
+                    dmx_imag_e[ch_idx1] = imag_e;
+                    move32();
+                    move16();
+                    move32();
+                    move16();
+#endif
+
+#endif
                 }
 
                 /* Cx for transport channels */
                 FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )
                 {
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    CONVERT_DMX( dmx_real_64[ch_idx1], a_fx, a_e );
+                    CONVERT_DMX( dmx_imag_64[ch_idx1], b_fx, b_e );
+#endif
                     FOR( ch_idx2 = 0; ch_idx2 < nchan_transport; ++ch_idx2 )
                     {
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                        CONVERT_DMX( dmx_real_64[ch_idx2], c_fx, c_e );
+                        CONVERT_DMX( dmx_imag_64[ch_idx2], d_fx, d_e );
+#else
                         a_fx = dmx_real_fx[ch_idx1];
                         move32();
                         a_e = dmx_real_e[ch_idx1];
@@ -792,6 +897,7 @@ static void ivas_param_mc_param_est_enc_fx(
                         move32();
                         d_e = dmx_imag_e[ch_idx2];
                         move16();
+#endif
 
                         /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
                         L_tmp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, c_fx ), add( a_e, c_e ), Mpy_32_32( b_fx, d_fx ), add( b_e, d_e ), &tmp_e );
@@ -804,17 +910,73 @@ static void ivas_param_mc_param_est_enc_fx(
                         move32();
                     }
                 }
-
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                FOR( ch_idx1 = 0; ch_idx1 < nchan_input; ++ch_idx1 )
+                {
+                    a_fx = slot_frame_f_real_fx[ch_idx1][cur_cldfb_band];
+                    b_fx = slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band];
+                    move32();
+                    FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ++ch_idx2 )
+                    {
+                        c_fx = slot_frame_f_real_fx[ch_idx2][cur_cldfb_band];
+                        d_fx = slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band];
+                        move32();
+                        // Conjugated complex multiplication (a-ib)(c+id) = ac+bd + i(ad-bc)
+                        Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2] = W_add( Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2],
+                                                                                  W_add( W_mult0_32_32( a_fx, c_fx ), W_mult0_32_32( b_fx, d_fx ) ) );
+                        move64();
+                        Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2] = W_add( Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2],
+                                                                                  W_sub( W_mult0_32_32( a_fx, d_fx ), W_mult0_32_32( b_fx, c_fx ) ) );
+                        move64();
+                    }
+                }
+#else
                 /* Cy for input channels */
                 FOR( ch_idx1 = 0; ch_idx1 < nchan_input; ++ch_idx1 )
                 {
+#ifdef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE
+                    a_e = norm_l( slot_frame_f_real_fx[ch_idx1][cur_cldfb_band] );
+                    a_fx = L_shl( slot_frame_f_real_fx[ch_idx1][cur_cldfb_band], a_e );
+                    a_e = sub( add20gb, a_e );
+                    if ( a_fx == 0 )
+                    {
+                        a_e = 0;
+                        move16();
+                    }
+                    b_e = norm_l( slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band] );
+                    b_fx = L_shl( slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band], b_e );
+                    b_e = sub( add20gb, b_e );
+                    if ( b_fx == 0 )
+                    {
+                        b_e = 0;
+                        move16();
+                    }
+#endif
                     FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ++ch_idx2 )
                     {
+#ifndef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE
                         a_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_real_fx[ch_idx1][cur_cldfb_band], add( 20, gb ), 0, 0, &a_e );
                         b_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band], add( 20, gb ), 0, 0, &b_e );
                         c_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_real_fx[ch_idx2][cur_cldfb_band], add( 20, gb ), 0, 0, &c_e );
                         d_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band], add( 20, gb ), 0, 0, &d_e );
-
+#else
+                        c_e = norm_l( slot_frame_f_real_fx[ch_idx2][cur_cldfb_band] );
+                        c_fx = L_shl( slot_frame_f_real_fx[ch_idx2][cur_cldfb_band], c_e );
+                        c_e = sub( add20gb, c_e );
+                        if ( c_fx == 0 )
+                        {
+                            c_e = 0;
+                            move16();
+                        }
+                        d_e = norm_l( slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band] );
+                        d_fx = L_shl( slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band], d_e );
+                        d_e = sub( add20gb, d_e );
+                        if ( d_fx == 0 )
+                        {
+                            d_e = 0;
+                            move16();
+                        }
+#endif
                         /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
                         L_tmp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, c_fx ), add( a_e, c_e ), Mpy_32_32( b_fx, d_fx ), add( b_e, d_e ), &tmp_e );
                         Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2],
@@ -826,6 +988,7 @@ static void ivas_param_mc_param_est_enc_fx(
                         move32();
                     }
                 }
+#endif
             }
         }
 
@@ -844,6 +1007,27 @@ static void ivas_param_mc_param_est_enc_fx(
 
                 FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )
                 {
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    Word64 real_64;
+                    Word64 imag_64;
+
+                    real_64 = 0;
+                    imag_64 = 0;
+                    move64();
+                    move64();
+
+                    FOR( inp_ch = 0; inp_ch < nchan_input; inp_ch++ )
+                    {
+                        real_64 = W_add( real_64, W_mult0_32_32( slot_frame_f_real_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) ) );
+                        imag_64 = W_add( imag_64, W_mult0_32_32( slot_frame_f_imag_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) ) );
+                        p_dmx_fac_fx++;
+                    }
+                    dmx_real_64[ch_idx1] = real_64;
+                    dmx_imag_64[ch_idx1] = imag_64;
+                    move64();
+                    move64();
+#else
+#ifndef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE
                     dmx_real_fx[ch_idx1] = 0;
                     move32();
                     dmx_real_e[ch_idx1] = 0;
@@ -863,13 +1047,66 @@ static void ivas_param_mc_param_est_enc_fx(
                         move32();
                         p_dmx_fac_fx++;
                     }
+#else
+                    Word32 real_fx = L_add( 0, 0 );
+                    Word16 real_e = 0;
+                    move16();
+                    Word32 imag_fx = L_add( 0, 0 );
+                    Word16 imag_e = 0;
+                    move16();
+
+                    FOR( inp_ch = 0; inp_ch < nchan_input; inp_ch++ )
+                    {
+                        L_tmp = Mpy_32_32( slot_frame_f_real_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) );
+                        real_fx = BASOP_Util_Add_Mant32Exp( real_fx, real_e, L_tmp, add20gb, &real_e );
+                        L_tmp = Mpy_32_32( slot_frame_f_imag_fx[inp_ch][cur_cldfb_band], ( *p_dmx_fac_fx ) );
+                        imag_fx = BASOP_Util_Add_Mant32Exp( imag_fx, imag_e, L_tmp, add20gb, &imag_e );
+                        p_dmx_fac_fx++;
+                    }
+                    dmx_real_fx[ch_idx1] = real_fx;
+                    move32();
+                    dmx_real_e[ch_idx1] = real_e;
+                    move16();
+                    dmx_imag_fx[ch_idx1] = imag_fx;
+                    move32();
+                    dmx_imag_e[ch_idx1] = imag_e;
+                    move16();
+#endif
+
+#endif
                 }
 
                 /* Cx for transport channels */
                 FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )
                 {
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    CONVERT_DMX( dmx_real_64[ch_idx1], a_fx, a_e );
+                    CONVERT_DMX( dmx_imag_64[ch_idx1], b_fx, b_e );
+#else
+#ifdef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE
+                    a_fx = dmx_real_fx[ch_idx1];
+                    move32();
+                    a_e = dmx_real_e[ch_idx1];
+                    move16();
+                    b_fx = dmx_imag_fx[ch_idx1];
+                    move32();
+                    b_e = dmx_imag_e[ch_idx1];
+                    move16();
+#endif
+
+#endif
                     FOR( ch_idx2 = 0; ch_idx2 < nchan_transport; ++ch_idx2 )
                     {
+#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                        CONVERT_DMX( dmx_real_64[ch_idx2], c_fx, c_e );
+                        CONVERT_DMX( dmx_imag_64[ch_idx2], d_fx, d_e );
+
+                        /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
+                        L_tmp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, c_fx ), add( a_e, c_e ), Mpy_32_32( b_fx, d_fx ), add( b_e, d_e ), &tmp_e );
+                        Cx_sum_fx[cur_param_band][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cx_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cx_sum_e[cur_param_band][ch_idx1][ch_idx2], L_tmp, tmp_e,
+                                                                                                &Cx_sum_e[cur_param_band][ch_idx1][ch_idx2] );
+#else
+#ifndef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE
                         a_fx = dmx_real_fx[ch_idx1];
                         move32();
                         a_e = dmx_real_e[ch_idx1];
@@ -891,6 +1128,13 @@ static void ivas_param_mc_param_est_enc_fx(
                         L_tmp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, c_fx ), add( a_e, c_e ), Mpy_32_32( b_fx, d_fx ), add( b_e, d_e ), &tmp_e );
                         Cx_sum_fx[cur_param_band][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cx_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cx_sum_e[cur_param_band][ch_idx1][ch_idx2], L_tmp, tmp_e,
                                                                                                 &Cx_sum_e[cur_param_band][ch_idx1][ch_idx2] );
+#else
+                        /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
+                        L_tmp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, dmx_real_fx[ch_idx2] ), add( a_e, dmx_real_e[ch_idx2] ), Mpy_32_32( b_fx, dmx_imag_fx[ch_idx2] ), add( b_e, dmx_imag_e[ch_idx2] ), &tmp_e );
+                        Cx_sum_fx[cur_param_band][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cx_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cx_sum_e[cur_param_band][ch_idx1][ch_idx2], L_tmp, tmp_e,
+                                                                                                &Cx_sum_e[cur_param_band][ch_idx1][ch_idx2] );
+#endif
+#endif
                         move32();
                     }
                 }
@@ -898,19 +1142,73 @@ static void ivas_param_mc_param_est_enc_fx(
                 /* Cy for input channels */
                 FOR( ch_idx1 = 0; ch_idx1 < nchan_input; ++ch_idx1 )
                 {
+#ifdef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE
+                    a_e = norm_l( slot_frame_f_real_fx[ch_idx1][cur_cldfb_band] );
+                    a_fx = L_shl( slot_frame_f_real_fx[ch_idx1][cur_cldfb_band], a_e );
+                    a_e = sub( add20gb, a_e );
+                    if ( a_fx == 0 )
+                    {
+                        a_e = 0;
+                        move16();
+                    }
+                    b_e = norm_l( slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band] );
+                    b_fx = L_shl( slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band], b_e );
+                    b_e = sub( add20gb, b_e );
+                    if ( b_fx == 0 )
+                    {
+                        b_e = 0;
+                        move16();
+                    }
+#endif
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    a_fx = slot_frame_f_real_fx[ch_idx1][cur_cldfb_band];
+                    b_fx = slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band];
+                    move32();
+                    move32();
+                    FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ++ch_idx2 )
+                    {
+                        c_fx = slot_frame_f_real_fx[ch_idx2][cur_cldfb_band];
+                        d_fx = slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band];
+                        move32();
+                        move32();
+                        // Conjugated complex multiplication (a-ib)(c+id) = ac+bd + i(ad-bc)
+                        Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2] = W_add( Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2],
+                                                                                  W_add( W_mult0_32_32( a_fx, c_fx ), W_mult0_32_32( b_fx, d_fx ) ) );
+                        move64();
+                    }
+#else
                     FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ++ch_idx2 )
                     {
+#ifndef IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE
                         a_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_real_fx[ch_idx1][cur_cldfb_band], add( 20, gb ), 0, 0, &a_e );
                         b_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band], add( 20, gb ), 0, 0, &b_e );
                         c_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_real_fx[ch_idx2][cur_cldfb_band], add( 20, gb ), 0, 0, &c_e );
                         d_fx = BASOP_Util_Add_Mant32Exp( slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band], add( 20, gb ), 0, 0, &d_e );
-
+#else
+                        c_e = norm_l( slot_frame_f_real_fx[ch_idx2][cur_cldfb_band] );
+                        c_fx = L_shl( slot_frame_f_real_fx[ch_idx2][cur_cldfb_band], c_e );
+                        c_e = sub( add20gb, c_e );
+                        if ( c_fx == 0 )
+                        {
+                            c_e = 0;
+                            move16();
+                        }
+                        d_e = norm_l( slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band] );
+                        d_fx = L_shl( slot_frame_f_imag_fx[ch_idx2][cur_cldfb_band], d_e );
+                        d_e = sub( add20gb, d_e );
+                        if ( d_fx == 0 )
+                        {
+                            d_e = 0;
+                            move16();
+                        }
+#endif
                         /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
                         L_tmp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, c_fx ), add( a_e, c_e ), Mpy_32_32( b_fx, d_fx ), add( b_e, d_e ), &tmp_e );
                         Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2], L_tmp, tmp_e,
                                                                                                 &Cy_sum_e[cur_param_band][ch_idx1][ch_idx2] );
                         move32();
                     }
+#endif
                 }
             }
         }
@@ -924,6 +1222,16 @@ static void ivas_param_mc_param_est_enc_fx(
         {
             FOR( ch_idx1 = 0; ch_idx1 < nchan_input; ++ch_idx1 )
             {
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                Cy_sum_real_64[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
+                move64();
+                Cy_sum_real_64[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;
+                move64();
+                Cy_sum_imag_64[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
+                move64();
+                Cy_sum_imag_64[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;
+                move64();
+#else
                 Cy_sum_fx[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
                 move32();
                 Cy_sum_e[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
@@ -940,6 +1248,7 @@ static void ivas_param_mc_param_est_enc_fx(
                 move32();
                 Cy_sum_imag_e[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;
                 move16();
+#endif
             }
         }
 
@@ -947,6 +1256,12 @@ static void ivas_param_mc_param_est_enc_fx(
         {
             FOR( ch_idx1 = 0; ch_idx1 < nchan_input; ++ch_idx1 )
             {
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                Cy_sum_real_64[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
+                move64();
+                Cy_sum_real_64[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;
+                move64();
+#else
                 Cy_sum_fx[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
                 move32();
                 Cy_sum_e[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;
@@ -955,6 +1270,7 @@ static void ivas_param_mc_param_est_enc_fx(
                 move32();
                 Cy_sum_e[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;
                 move16();
+#endif
             }
         }
     }
@@ -991,10 +1307,16 @@ static void ivas_param_mc_param_est_enc_fx(
                 /* get ICLDs */
                 FOR( k = 0; k < nchan_input; ++k )
                 {
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    CONVERT_CY( Cy_sum_real_64[cur_param_band][k][k], Nrg_fx[k], Nrg_e[k] );
+                    move32();
+                    move16();
+#else
                     Nrg_fx[k] = Cy_sum_fx[cur_param_band][k][k];
                     move32();
                     Nrg_e[k] = Cy_sum_e[cur_param_band][k][k];
                     move16();
+#endif
                 }
                 FOR( k = 0; k < num_ilds_to_code; ++k )
                 {
@@ -1011,15 +1333,9 @@ static void ivas_param_mc_param_est_enc_fx(
                         move16();
                         ref_ener_fx = BASOP_Util_Add_Mant32Exp( ref_ener_fx, ref_ener_e, Cx_sum_fx[cur_param_band][ref_channel_idx][ref_channel_idx], // ref_ener_e
                                                                 Cx_sum_e[cur_param_band][ref_channel_idx][ref_channel_idx], &ref_ener_e );
-                        ref_ener_e = Cx_sum_e[cur_param_band][ref_channel_idx][ref_channel_idx];
-                        move16();
                     }
                     L_tmp = Mpy_32_16_1( ref_ener_fx, hParamMC->hMetadataPMC.ild_factors_fx[k] );
-#ifdef FIX_ISSUE_1154
                     L_tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( Nrg_fx[h_ild_mapping->ild_index[k]], L_add( L_tmp, EPSILLON_FX ), &tmp_e ) );
-#else
-                    L_tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( Nrg_fx[h_ild_mapping->ild_index[k]], L_tmp, &tmp_e ) );
-#endif
 
                     tmp_e = add( sub( Nrg_e[h_ild_mapping->ild_index[k]], ref_ener_e ), tmp_e );
 
@@ -1067,6 +1383,13 @@ static void ivas_param_mc_param_est_enc_fx(
             {
                 FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ++ch_idx2 )
                 {
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                    Cy_sum_real_64[cur_param_band - 1][ch_idx1][ch_idx2] = W_add( Cy_sum_real_64[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2] );
+                    move64();
+                    Cy_sum_imag_64[cur_param_band - 1][ch_idx1][ch_idx2] = W_add( Cy_sum_imag_64[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2] );
+                    move64();
+
+#else
                     Cy_sum_fx[cur_param_band - 1][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cy_sum_fx[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band - 1][ch_idx1][ch_idx2],
                                                                                                 Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2],
                                                                                                 &Cy_sum_e[cur_param_band - 1][ch_idx1][ch_idx2] );
@@ -1075,6 +1398,7 @@ static void ivas_param_mc_param_est_enc_fx(
                                                                                                      Cy_sum_imag_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_imag_e[cur_param_band][ch_idx1][ch_idx2],
                                                                                                      &Cy_sum_imag_e[cur_param_band - 1][ch_idx1][ch_idx2] );
                     move32();
+#endif
                 }
             }
         }
@@ -1098,10 +1422,14 @@ static void ivas_param_mc_param_est_enc_fx(
                 {
                     FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ++ch_idx2 )
                     {
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                        Cy_sum_real_64[cur_param_band - 1][ch_idx1][ch_idx2] = W_add( Cy_sum_real_64[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2] );
+#else
                         Cy_sum_fx[cur_param_band - 1][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cy_sum_fx[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band - 1][ch_idx1][ch_idx2],
                                                                                                     Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2],
                                                                                                     &Cy_sum_e[cur_param_band - 1][ch_idx1][ch_idx2] );
                         move32();
+#endif
                     }
                 }
             }
@@ -1110,7 +1438,23 @@ static void ivas_param_mc_param_est_enc_fx(
         band_step = 2;
         move16();
     }
-
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+    {
+        // convert the 64 bit fixpoint back into the 48 bit float format
+        FOR( cur_param_band = 0; cur_param_band < PARAM_MC_MAX_PARAMETER_BANDS; cur_param_band++ )
+        {
+            FOR( ch_idx1 = 0; ch_idx1 < MAX_CICP_CHANNELS; ch_idx1++ )
+            {
+                FOR( ch_idx2 = 0; ch_idx2 < MAX_CICP_CHANNELS; ch_idx2++ )
+                {
+                    CONVERT_CY( Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2], Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2] );
+                    move32();
+                    move16();
+                }
+            }
+        }
+    }
+#endif
 
     /* map complex covariances to real values */
     FOR( cur_param_band = 0; cur_param_band < hParamMC->max_param_band_abs_cov; cur_param_band += band_step )
@@ -1147,15 +1491,20 @@ static void ivas_param_mc_param_est_enc_fx(
         {
             FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ch_idx2++ )
             {
-                real_part_fx = Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2];
+#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
+                CONVERT_CY( Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2], imag_part_fx, imag_part_e );
                 move32();
-                real_part_e = Cy_sum_e[cur_param_band][ch_idx1][ch_idx2];
                 move16();
+#else
                 imag_part_fx = Cy_sum_imag_fx[cur_param_band][ch_idx1][ch_idx2];
                 move32();
                 imag_part_e = Cy_sum_imag_e[cur_param_band][ch_idx1][ch_idx2];
                 move16();
-
+#endif
+                real_part_fx = Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2];
+                move32();
+                real_part_e = Cy_sum_e[cur_param_band][ch_idx1][ch_idx2];
+                move16();
                 real_part_fx = Mpy_32_32( real_part_fx, real_part_fx );
                 imag_part_fx = Mpy_32_32( imag_part_fx, imag_part_fx );
 
@@ -1285,8 +1634,21 @@ static void ivas_param_mc_quantize_ilds_fx(
         dmx_ener_fx = BASOP_Util_Add_Mant32Exp( dmx_ener_fx, dmx_ener_e, Cx_fx[k][k], Cx_e[k][k], &dmx_ener_e );
     }
     /*ener_fac = 10.0f * log10f( ( tot_ener + EPSILON ) / ( dmx_ener + EPSILON ) )*/
-    tot_ener_fx = BASOP_Util_Add_Mant32Exp( tot_ener_fx, tot_ener_e, EPSILON_FX, 0, &tot_ener_e );
-    dmx_ener_fx = BASOP_Util_Add_Mant32Exp( dmx_ener_fx, dmx_ener_e, EPSILON_FX, 0, &dmx_ener_e );
+    IF( tot_ener_fx == 0 )
+    {
+        tot_ener_fx = 9223; // 1e-15(EPSILON) in Q63
+        tot_ener_e = -32;
+        move32();
+        move16();
+    }
+    IF( dmx_ener_fx == 0 )
+    {
+        dmx_ener_fx = 9223; // 1e-15(EPSILON) in Q63
+        dmx_ener_e = -32;
+        move32();
+        move16();
+    }
+
     L_tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( tot_ener_fx, dmx_ener_fx, &tmp_e ) );
     tmp_e = add( sub( tot_ener_e, dmx_ener_e ), tmp_e );
     ener_fac_fx = BASOP_Util_Log10( L_tmp, tmp_e );     // Q25
@@ -1334,9 +1696,22 @@ static void ivas_param_mc_quantize_ilds_fx(
     {
         dmx_ener_fx = BASOP_Util_Add_Mant32Exp( dmx_ener_fx, dmx_ener_e, Cx_fx[k][k], Cx_e[k][k], &dmx_ener_e );
     }
+    /* ener_fac = 10.0f * log10f( ( tot_ener + EPSILON ) / ( dmx_ener + EPSILON ) ); */
+    IF( tot_ener_fx == 0 )
+    {
+        tot_ener_fx = 9223; // 1e-15(EPSILON) in Q63
+        tot_ener_e = -32;
+        move32();
+        move16();
+    }
+    IF( dmx_ener_fx == 0 )
+    {
+        dmx_ener_fx = 9223; // 1e-15(EPSILON) in Q63
+        dmx_ener_e = -32;
+        move32();
+        move16();
+    }
 
-    tot_ener_fx = BASOP_Util_Add_Mant32Exp( tot_ener_fx, tot_ener_e, EPSILON_FX, 0, &tot_ener_e );
-    dmx_ener_fx = BASOP_Util_Add_Mant32Exp( dmx_ener_fx, dmx_ener_e, EPSILON_FX, 0, &dmx_ener_e );
     L_tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( tot_ener_fx, dmx_ener_fx, &tmp_e ) );
     tmp_e = add( sub( tot_ener_e, dmx_ener_e ), tmp_e );
     ener_fac_fx = BASOP_Util_Log10( L_tmp, tmp_e );     // Q25
@@ -1397,11 +1772,7 @@ static void ivas_param_mc_quantize_ilds_fx(
             ref_ener_fx = BASOP_Util_Add_Mant32Exp( ref_ener_fx, ref_ener_e, Cx_fx[ref_channel_idx][ref_channel_idx], Cx_e[ref_channel_idx][ref_channel_idx], &ref_ener_e );
         }
         ref_ener_fx = Mpy_32_16_1( ref_ener_fx, hParamMC->hMetadataPMC.ild_factors_fx[k] );
-#ifdef FIX_ISSUE_1154
         L_tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( Nrg_fx[h_ild_mapping->ild_index[k]], L_add( ref_ener_fx, EPSILLON_FX ), &tmp_e ) );
-#else
-        L_tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( Nrg_fx[h_ild_mapping->ild_index[k]], ref_ener_fx, &tmp_e ) );
-#endif
         tmp_e = add( sub( Nrg_e[h_ild_mapping->ild_index[k]], ref_ener_e ), tmp_e );
         /*10 in Q21 = 1342177280*/
         ILD_fx[k] = Mpy_32_32( 1342177280, BASOP_Util_Log10( L_tmp, tmp_e ) ); // Q21
@@ -1641,8 +2012,8 @@ static void ivas_param_mc_transient_detection_fx(
     push_wmops( "param_mc_trn_det" );
 
     attackRatioThreshold_fx = hTranDet->transientDetector.attackRatioThreshold;
-    pSubblockNrg_fx = &hTranDet->subblockEnergies.subblockNrg[hParamMC->transient_detector_delay];       // Q0
-    pAccSubblockNrg_fx = &hTranDet->subblockEnergies.accSubblockNrg[hParamMC->transient_detector_delay]; // Q0
+    pSubblockNrg_fx = &hTranDet->subblockEnergies.subblockNrg[hParamMC->transient_detector_delay];       // Q(-1)
+    pAccSubblockNrg_fx = &hTranDet->subblockEnergies.accSubblockNrg[hParamMC->transient_detector_delay]; // Q(-1)
 
     bIsAttackPresent = FALSE;
     move16();
@@ -1653,8 +2024,8 @@ static void ivas_param_mc_transient_detection_fx(
      * if we had an attack very late in the last frame,
      * make the current frame also a transient one... */
     test();
-    IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg_fx[-1], 31, Mpy_32_16_1( pAccSubblockNrg_fx[-1], attackRatioThreshold_fx ), ( 31 + ATTACKTHRESHOLD_E ) ), 1 ) ||
-        EQ_16( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg_fx[-2], 31, Mpy_32_16_1( pAccSubblockNrg_fx[-2], attackRatioThreshold_fx ), ( 31 + ATTACKTHRESHOLD_E ) ), 1 ) )
+    IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg_fx[-1], 32, Mpy_32_16_1( pAccSubblockNrg_fx[-1], attackRatioThreshold_fx ), ( 32 + ATTACKTHRESHOLD_E ) ), 1 ) ||
+        EQ_16( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg_fx[-2], 32, Mpy_32_16_1( pAccSubblockNrg_fx[-2], attackRatioThreshold_fx ), ( 32 + ATTACKTHRESHOLD_E ) ), 1 ) )
     {
         bIsAttackPresent = TRUE;
         move16();
@@ -1663,7 +2034,7 @@ static void ivas_param_mc_transient_detection_fx(
     }
 
     FOR( i = 0; i < NSUBBLOCKS; i++ ){
-        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg_fx[i], 31, Mpy_32_16_1( pAccSubblockNrg_fx[i], attackRatioThreshold_fx ), ( 31 + ATTACKTHRESHOLD_E ) ), 1 ) ){
+        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg_fx[i], 32, Mpy_32_16_1( pAccSubblockNrg_fx[i], attackRatioThreshold_fx ), ( 32 + ATTACKTHRESHOLD_E ) ), 1 ) ){
             bIsAttackPresent = TRUE;
     move16();
     attackIndex = i;
@@ -1947,7 +2318,7 @@ static void ivas_param_mc_dec2bin_fx(
     /* convert value to bitstream, MSB first */
     FOR( idx = 0; idx < N; idx++ )
     {
-        bits[idx] = (UWord16) s_and( shr( val, sub( N, sub( 1, idx ) ) ), 1 );
+        bits[idx] = (UWord16) s_and( shr( val, sub( sub( N, 1 ), idx ) ), 1 );
         move16();
     }
 
@@ -1979,14 +2350,14 @@ static void ivas_param_mc_range_encoder_fx(
     UWord16 *bits;
 
     /* Initialize range encoder */
-    rc_uni_enc_init( &rc_st_enc );
+    rc_uni_enc_init_fx( &rc_st_enc );
 
     /* Main loop over the length of the sequence */
     FOR( i = 0; i < num_symbols; ++i )
     {
-        rc_uni_enc_encode_symbol_fastS( &rc_st_enc, (UWord16) seq_in[i], cum_freq, sym_freq, tot_shift );
+        rc_uni_enc_encode_symbol_fastS_fx( &rc_st_enc, (UWord16) seq_in[i], cum_freq, sym_freq, tot_shift );
 
-        IF( GT_16( rc_uni_enc_virtual_finish( &rc_st_enc ), max_nb_bits ) )
+        IF( GT_16( rc_uni_enc_virtual_finish_fx( &rc_st_enc ), max_nb_bits ) )
         {
             /* we alread have exceeded the maximum number of bits allowed, i.e. the uniform fallback */
             *bit_pos = MAX_BITS_PER_FRAME;
@@ -1995,7 +2366,7 @@ static void ivas_param_mc_range_encoder_fx(
     }
 
     /* Finish range encoder */
-    rc_tot_bits = rc_uni_enc_finish( &rc_st_enc ); /* No. of bits consumed by range coder */
+    rc_tot_bits = rc_uni_enc_finish_fx( &rc_st_enc ); /* No. of bits consumed by range coder */
 
     /* Push range coded bits from byte_buffer to bitstream */
 
diff --git a/lib_enc/ivas_mc_paramupmix_enc.c b/lib_enc/ivas_mc_paramupmix_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_mc_paramupmix_enc.c
rename to lib_enc/ivas_mc_paramupmix_enc_fx.c
index 61f817b2f0d93edadfe1eb1d366f4afe838afcaf..cad29b1461033258b0bc71d37f575a2d8552c7e1 100644
--- a/lib_enc/ivas_mc_paramupmix_enc.c
+++ b/lib_enc/ivas_mc_paramupmix_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,8 @@
 #include "cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
 #include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "basop_util.h"
 #include "ivas_rom_com_fx.h"
 #include "ivas_cnst.h"
@@ -201,8 +199,8 @@ ivas_error ivas_mc_paramupmix_enc_open_fx(
     /* assuming parameters are calculated at end of frame, compensate for MCT delay and half of decoder fb */
     /* still 1.5ms off, since MCT delay is not large enough */
     /* param at end of frame */
-    fb_cfg->prior_input_length = (int16_t) ( NS2SA( input_Fs, 12000000L ) + NS2SA( input_Fs, DELAY_FB_4_NS / 2 ) - input_frame / 2 - NS2SA( input_Fs, DELAY_FB_1_NS / 2 ) );
-    fb_cfg->prior_input_length = (int16_t) max( fb_cfg->prior_input_length, input_frame / MAX_PARAM_SPATIAL_SUBFRAMES );
+    fb_cfg->prior_input_length = (Word16) ( NS2SA_FX2( input_Fs, 12000000L ) + NS2SA_FX2( input_Fs, DELAY_FB_4_NS / 2 ) - input_frame / 2 - NS2SA_FX2( input_Fs, DELAY_FB_1_NS / 2 ) );
+    fb_cfg->prior_input_length = s_max( fb_cfg->prior_input_length, (Word16) input_frame / MAX_PARAM_SPATIAL_SUBFRAMES );
 
     /* Allocate and initialize FB mixer handle */
     IF( NE_32( ( error = ivas_FB_mixer_open_fx( &( hMCParamUpmix->hFbMixer ), input_Fs, fb_cfg, 0 ) ), IVAS_ERR_OK ) )
@@ -497,12 +495,12 @@ static void quantize_pars_fx(
         Word16 exp_var1 = 0;
         move16();
         Word32 var1 = BASOP_Util_Add_Mant32Exp( v_fx[iv], exp_v, L_negate( data_fx[iq0] ), 31 - Q28, &exp_var1 );
-        var1 = abs( var1 );
+        var1 = L_abs( var1 );
 
         Word16 exp_var2 = 0;
         move16();
         Word32 var2 = BASOP_Util_Add_Mant32Exp( v_fx[iv], exp_v, L_negate( data_fx[iq1] ), 31 - Q28, &exp_var2 );
-        var2 = abs( var2 );
+        var2 = L_abs( var2 );
 
         Word16 cmp_2 = BASOP_Util_Cmp_Mant32Exp( var1, exp_var1, var2, exp_var2 );
 
@@ -592,12 +590,12 @@ static void quantize_beta_fx(
         Word16 exp_var1 = 0;
         move16();
         Word32 var1 = BASOP_Util_Add_Mant32Exp( beta_fx[iv], exp_beta, L_negate( quant_table_fx.data[iq0] ), 31 - Q28, &exp_var1 );
-        var1 = abs( var1 );
+        var1 = L_abs( var1 );
 
         Word16 exp_var2 = 0;
         move16();
         Word32 var2 = BASOP_Util_Add_Mant32Exp( beta_fx[iv], exp_beta, L_negate( quant_table_fx.data[iq1] ), 31 - Q28, &exp_var2 );
-        var2 = abs( var2 );
+        var2 = L_abs( var2 );
 
         Word16 cmp_2 = BASOP_Util_Cmp_Mant32Exp( var1, exp_var1, var2, exp_var2 );
 
@@ -1042,12 +1040,6 @@ static ivas_error ivas_mc_paramupmix_param_est_enc_fx(
 
     IF( LT_16( maxbands, IVAS_MAX_NUM_BANDS ) )
     {
-#ifndef FIX_1133_IMPROVE_MC_MLD
-        *exp_alphas = 0;
-        move16();
-        *exp_betas = 0;
-        move16();
-#endif
         FOR( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ )
         {
             FOR( bnd = maxbands; bnd < IVAS_MAX_NUM_BANDS; bnd++ )
diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_mcmasa_enc.c
rename to lib_enc/ivas_mcmasa_enc_fx.c
index 34d43d366023159a03d6568fc82bd376e248623d..7a5718e9958d3eb7989f4168b4c8876fcc84f3c5 100644
--- a/lib_enc/ivas_mcmasa_enc.c
+++ b/lib_enc/ivas_mcmasa_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,10 +35,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
@@ -200,22 +198,22 @@ ivas_error ivas_mcmasa_enc_open_fx(
     }
 
     /* initialize delay compensation */
-    hMcMasa->num_samples_delay_comp = NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS );
+    hMcMasa->num_samples_delay_comp = NS2SA_FX2( input_Fs, DELAY_DIRAC_ENC_CMP_NS );
     move16();
 #ifdef DISABLE_DIRAC_DELAY_COMP
     hMcMasa->num_samples_delay_comp = 0; /* disable delay compensation by setting to 0 */
 #endif
-    tmp_f = idiv1616( hMcMasa->num_samples_delay_comp, ( NS2SA( input_Fs, DIRAC_SLOT_ENC_NS ) ) );
+    tmp_f = idiv1616( hMcMasa->num_samples_delay_comp, ( NS2SA_FX2( input_Fs, DIRAC_SLOT_ENC_NS ) ) );
     hMcMasa->num_slots_delay_comp = tmp_f;
     move16();
 
-    IF( GT_16( hMcMasa->num_samples_delay_comp, ( NS2SA( input_Fs, DIRAC_SLOT_ENC_NS ) ) ) )
+    IF( GT_16( hMcMasa->num_samples_delay_comp, ( NS2SA_FX2( input_Fs, DIRAC_SLOT_ENC_NS ) ) ) )
     {
         hMcMasa->num_slots_delay_comp = add( hMcMasa->num_slots_delay_comp, 1 );
         move16();
         hMcMasa->offset_comp = negate( hMcMasa->num_samples_delay_comp );
         move16();
-        hMcMasa->num_samples_delay_comp = i_mult( hMcMasa->num_slots_delay_comp, NS2SA( input_Fs, DIRAC_SLOT_ENC_NS ) );
+        hMcMasa->num_samples_delay_comp = i_mult( hMcMasa->num_slots_delay_comp, NS2SA_FX2( input_Fs, DIRAC_SLOT_ENC_NS ) );
         move16();
         hMcMasa->offset_comp = add( hMcMasa->offset_comp, hMcMasa->num_samples_delay_comp );
         move16();
@@ -241,17 +239,17 @@ ivas_error ivas_mcmasa_enc_open_fx(
     IF( hMcMasa->separateChannelEnabled )
     {
         /* TD Energy calculation with LP */
-        IF( ( hMcMasa->delay_buffer_lfe[0] = (Word32 *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( Word32 ) ) ) == NULL )
+        IF( ( hMcMasa->delay_buffer_lfe[0] = (Word32 *) malloc( NS2SA_FX2( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( Word32 ) ) ) == NULL )
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
         }
-        set_zero_fx( hMcMasa->delay_buffer_lfe[0], NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) );
+        set_zero_fx( hMcMasa->delay_buffer_lfe[0], NS2SA_FX2( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) );
 
-        IF( ( hMcMasa->delay_buffer_lfe[1] = (Word32 *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( Word32 ) ) ) == NULL )
+        IF( ( hMcMasa->delay_buffer_lfe[1] = (Word32 *) malloc( NS2SA_FX2( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( Word32 ) ) ) == NULL )
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
         }
-        set_zero_fx( hMcMasa->delay_buffer_lfe[1], NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) );
+        set_zero_fx( hMcMasa->delay_buffer_lfe[1], NS2SA_FX2( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) );
         hMcMasa->hFbMixerLfe = NULL;
     }
     ELSE
@@ -437,20 +435,20 @@ ivas_error ivas_mcmasa_enc_open_fx(
     {
         hMcMasa->chnlToFoaMtx_fx[0][i] = ONE_IN_Q31;
         move32();
-        hMcMasa->chnlToFoaMtx_fx[1][i] = L_mult( getSineWord16R2( extract_l( L_shr( Mult_32_16( ls_azimuth[i], 91 /*32767/360*/ ), 7 ) ) ), getCosWord16R2( extract_l( L_shr( Mult_32_16( ls_elevation[i], 91 ), 7 ) ) ) ); // Q31
+        hMcMasa->chnlToFoaMtx_fx[1][i] = L_mult( getSineWord16R2( extract_l( Mpy_32_32( ls_azimuth[i], 46603 /*32767/360*/ ) /*Q22+Q24-31=>Q15*/ ) ), getCosWord16R2( extract_l( Mpy_32_32( ls_elevation[i], 46603 /*2^24/360*/ ) ) ) ); // Q31
         move32();
-        hMcMasa->chnlToFoaMtx_fx[2][i] = L_shl( getSineWord16R2( extract_l( L_shr( Mult_32_16( ls_elevation[i], 91 ), 7 ) ) ), 16 ); // Q31
+        hMcMasa->chnlToFoaMtx_fx[2][i] = L_shl( getSineWord16R2( extract_l( Mpy_32_32( ls_elevation[i], 46603 /*2^24/360*/ ) ) ), 16 ); // Q31
         move32();
-        hMcMasa->chnlToFoaMtx_fx[3][i] = L_mult( getCosWord16R2( extract_l( L_shr( Mult_32_16( ls_azimuth[i], 91 ), 7 ) ) ), getCosWord16R2( extract_l( L_shr( Mult_32_16( ls_elevation[i], 91 ), 7 ) ) ) ); // Q31
+        hMcMasa->chnlToFoaMtx_fx[3][i] = L_mult( getCosWord16R2( extract_l( Mpy_32_32( ls_azimuth[i], 46603 /*2^24/360*/ ) ) ), getCosWord16R2( extract_l( Mpy_32_32( ls_elevation[i], 46603 /*2^24/360*/ ) ) ) ); // Q31
         move32();
 
         hMcMasa->chnlToFoaEvenMtx_fx[0][i] = ONE_IN_Q31;
         move32();
-        hMcMasa->chnlToFoaEvenMtx_fx[1][i] = L_shl( getSineWord16R2( extract_l( L_shr( Mult_32_16( ls_azimuth_even[i], 91 ), 7 ) ) ), 16 ); // Q31
+        hMcMasa->chnlToFoaEvenMtx_fx[1][i] = L_shl( getSineWord16R2( extract_l( Mpy_32_32( ls_azimuth_even[i], 46603 /*2^24/360*/ ) ) ), 16 ); // Q31
         move32();
         hMcMasa->chnlToFoaEvenMtx_fx[2][i] = 0;
         move32();
-        hMcMasa->chnlToFoaEvenMtx_fx[3][i] = L_shl( getCosWord16R2( extract_l( L_shr( Mult_32_16( ls_azimuth_even[i], 91 ), 7 ) ) ), 16 );
+        hMcMasa->chnlToFoaEvenMtx_fx[3][i] = L_shl( getCosWord16R2( extract_l( Mpy_32_32( ls_azimuth_even[i], 46603 /*2^24/360*/ ) ) ), 16 );
         move32();
     }
 
@@ -575,7 +573,7 @@ ivas_error ivas_mcmasa_enc_reconfig_fx(
 
 void ivas_mcmasa_enc_close_fx(
     MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle    */
-    const int32_t input_Fs      /* i  : input sampling rate      */
+    const Word32 input_Fs       /* i  : input sampling rate      */
 )
 {
     Word16 i, j;
@@ -942,13 +940,11 @@ void ivas_mcmasa_param_est_enc_fx(
     Word16 surroundingCoherence_e[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
     Word16 numAnalysisChannels;
 
-#ifdef MSAN_FIX
     FOR( i = 0; i < MCMASA_MAX_ANA_CHANS; i++ )
     {
         set_zero_fx( Chnl_RealBuffer_fx[i], DIRAC_NO_FB_BANDS_MAX );
         set_zero_fx( Chnl_ImagBuffer_fx[i], DIRAC_NO_FB_BANDS_MAX );
     }
-#endif
 
     num_freq_bins = idiv1616( input_frame, MDFT_NO_COL_MAX );
     num_freq_bands = hMcMasa->nbands;
@@ -1182,12 +1178,8 @@ void ivas_mcmasa_param_est_enc_fx(
                 num_freq_bands,
                 direction_vector_fx[0],
                 direction_vector_fx[1],
-                direction_vector_fx[2], c_e
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-                ,
-                NULL
-#endif
-            );
+                direction_vector_fx[2], c_e,
+                NULL );
 
             /* Power and intensity estimation for diffuseness */
             computeIntensityVector_enc_fx(
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc_fx.c
similarity index 92%
rename from lib_enc/ivas_mct_core_enc.c
rename to lib_enc/ivas_mct_core_enc_fx.c
index f5f179778178b46b5b42d2037eecd9d79b3c7b87..71890120bfdece03191de1ec21b2313a6f278756 100644
--- a/lib_enc/ivas_mct_core_enc.c
+++ b/lib_enc/ivas_mct_core_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,14 +34,11 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include <math.h>
 
 
@@ -248,7 +245,7 @@ void ivas_mct_core_enc_fx(
     Word16 total_side_bits;
     Word16 chBitRatios[MCT_MAX_CHANNELS];
     Word16 q_powSpec[MCT_MAX_CHANNELS], q_spec, q_origSpec, tmp_s;
-    Word16 tmp_q_powSpec[L_FRAME48k], tmp_q_powSpecInv[L_FRAME48k], *tmp_q_psi[2];
+    Word16 tmp_q_powSpec[L_FRAME48k], tmp_q_powSpecInv[MCT_MAX_CHANNELS][L_FRAME48k], *tmp_q_psi[MCT_MAX_CHANNELS][2];
     Word64 W_tmp;
     Encoder_State *sts[MCT_MAX_CHANNELS];
     Encoder_State *st;
@@ -273,7 +270,6 @@ void ivas_mct_core_enc_fx(
         nCPE = add( nCPE, 1 );
     }
 
-#ifdef MSAN_FIX
     FOR( ch = 0; ch < MCT_MAX_CHANNELS; ch++ )
     {
         set32_fx( powerSpecMsInv_long_fx[ch], 0, L_FRAME48k );
@@ -281,7 +277,6 @@ void ivas_mct_core_enc_fx(
         move16();
         set16_fx( exp_powerSpec[ch], 0, N_MAX + L_MDCT_OVLP_MAX );
     }
-#endif // MSAN_FIX
     FOR( ch = 0; ch < nChannels; ch++ )
     {
         set32_fx( inv_spectrum_long_fx[ch], 0, L_FRAME48k );
@@ -290,16 +285,17 @@ void ivas_mct_core_enc_fx(
 
         inv_mdst_spectrum_fx[ch][0] = powerSpecMsInv_fx[ch][0] = powerSpecMsInv_long_fx[ch];
         inv_mdst_spectrum_fx[ch][1] = powerSpecMsInv_fx[ch][1] = powerSpecMsInv_long_fx[ch] + N_TCX10_MAX;
+        set16_fx( tmp_q_powSpecInv[ch], 63, L_FRAME48k );
+
+        tmp_q_psi[ch][0] = tmp_q_powSpecInv[ch];
+        tmp_q_psi[ch][1] = &tmp_q_powSpecInv[ch][N_TCX10_MAX];
+
         inv_spectrum_fx[ch][0] = inv_spectrum_long_fx[ch];
         inv_spectrum_fx[ch][1] = inv_spectrum_long_fx[ch] + N_TCX10_MAX;
     }
 
-    set16_fx( tmp_q_powSpecInv, 63, L_FRAME48k );
     set16_fx( tmp_q_powSpec, 63, L_FRAME48k );
 
-    tmp_q_psi[0] = tmp_q_powSpecInv;
-    tmp_q_psi[1] = &tmp_q_powSpecInv[N_TCX10_MAX];
-
     FOR( ( cpe_id = 0, i = 0 ); cpe_id < nCPE; cpe_id++ )
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
@@ -337,8 +333,16 @@ void ivas_mct_core_enc_fx(
 
         IF( switch_bw )
         {
-            initMdctStereoEncData_fx( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,
-                                      sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );
+            IF( sts[ch_core]->hIGFEnc == NULL )
+            {
+                initMdctStereoEncData_fx( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,
+                                          sts[ch_core]->igf, NULL, 0 );
+            }
+            ELSE
+            {
+                initMdctStereoEncData_fx( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,
+                                          sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );
+            }
         }
 
         IF( sts[ch_core]->igf )
@@ -437,7 +441,7 @@ void ivas_mct_core_enc_fx(
                 FOR( i = 0; i < L_subframeTCX; i++ )
                 {
                     W_tmp = W_mac_32_32( W_mult_32_32( mdst_spectrum_fx[ch][n][i], mdst_spectrum_fx[ch][n][i] ), sts[ch]->hTcxEnc->spectrum_fx[n][i], sts[ch]->hTcxEnc->spectrum_fx[n][i] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );
                     tmp_q_powSpec[( i + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -445,10 +449,10 @@ void ivas_mct_core_enc_fx(
                     move16();
 
                     W_tmp = W_mac_32_32( W_mult_32_32( inv_mdst_spectrum_fx[ch][n][i], inv_mdst_spectrum_fx[ch][n][i] ), inv_spectrum_fx[ch][n][i], inv_spectrum_fx[ch][n][i] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_tmp );
-                    tmp_q_psi[n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                    tmp_q_psi[ch][n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
                     move32();
                     move16();
                 }
@@ -459,10 +463,10 @@ void ivas_mct_core_enc_fx(
                 {
                     /* power spectrum: MDCT^2 + MDST^2 */
                     W_tmp = W_mult_32_32( inv_spectrum_fx[ch][n][0], inv_spectrum_fx[ch][n][0] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpecMsInv_fx[ch][n][0] = W_extract_h( W_tmp );
-                    tmp_q_psi[n][0] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                    tmp_q_psi[ch][n][0] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
                     move32();
                     move16();
 
@@ -471,26 +475,26 @@ void ivas_mct_core_enc_fx(
                         mdst_fx = L_sub( inv_spectrum_fx[ch][n][i + 1], inv_spectrum_fx[ch][n][i - 1] ); /* An MDST estimate */
 
                         W_tmp = W_mac_32_32( W_mult_32_32( mdst_fx, mdst_fx ), inv_spectrum_fx[ch][n][i], inv_spectrum_fx[ch][n][i] );
-                        tmp_s = sub( W_norm( W_tmp ), 1 );
+                        tmp_s = W_norm( W_tmp );
                         W_tmp = W_shl( W_tmp, tmp_s );
                         powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_tmp );
-                        tmp_q_psi[n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                        tmp_q_psi[ch][n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
                         move32();
                         move16();
                     }
 
                     W_tmp = W_mult_32_32( inv_spectrum_fx[ch][n][L_subframeTCX - 1], inv_spectrum_fx[ch][n][L_subframeTCX - 1] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpecMsInv_fx[ch][n][L_subframeTCX - 1] = W_extract_h( W_tmp );
-                    tmp_q_psi[n][L_subframeTCX - 1] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                    tmp_q_psi[ch][n][L_subframeTCX - 1] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
                     move32();
                     move16();
                 }
 
                 /* power spectrum: MDCT^2 + MDST^2 */
                 W_tmp = W_mult_32_32( sts[ch]->hTcxEnc->spectrum_fx[n][0], sts[ch]->hTcxEnc->spectrum_fx[n][0] );
-                tmp_s = sub( W_norm( W_tmp ), 1 );
+                tmp_s = W_norm( W_tmp );
                 W_tmp = W_shl( W_tmp, tmp_s );
                 powerSpec_fx[ch][n * L_subframeTCX] = W_extract_h( W_tmp );
                 tmp_q_powSpec[n * L_subframeTCX] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -513,7 +517,7 @@ void ivas_mct_core_enc_fx(
                 }
 
                 W_tmp = W_mult_32_32( sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1], sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1] );
-                tmp_s = sub( W_norm( W_tmp ), 1 );
+                tmp_s = W_norm( W_tmp );
                 W_tmp = W_shl( W_tmp, tmp_s );
                 powerSpec_fx[ch][( ( L_subframeTCX - 1 ) + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );
                 tmp_q_powSpec[( ( L_subframeTCX - 1 ) + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -524,31 +528,23 @@ void ivas_mct_core_enc_fx(
 
         /* Aligning the Q-factors */
         {
+            q_powSpec[ch] = Q31;
+            move16();
             /* NOTE: This logic has been added because using a constant headroom while computing `powSpec` and `powSpecMsInv` leads to significant precision loss, which results in poor quality. */
             FOR( i = 0; i < L_FRAME48k; i++ )
             {
-                if ( powerSpec_fx[ch][i] == 0 )
+                IF( powerSpec_fx[ch][i] != 0 )
                 {
-                    tmp_q_powSpec[i] = 63;
-                    move16();
-                }
-                if ( powerSpecMsInv_fx[ch][0][i] == 0 )
-                {
-                    tmp_q_powSpecInv[i] = 63;
+                    q_powSpec[ch] = s_min( q_powSpec[ch], add( tmp_q_powSpec[i], norm_l( powerSpec_fx[ch][i] ) ) );
                     move16();
                 }
             }
-            minimum_s( tmp_q_powSpec, L_FRAME48k, &q_powSpec[ch] );
-            minimum_s( tmp_q_powSpecInv, L_FRAME48k, &tmp_s );
-            q_powSpec[ch] = s_min( q_powSpec[ch], tmp_s );
-            move16();
 
             FOR( n = 0; n < nSubframes; n++ )
             {
                 FOR( i = 0; i < L_subframeTCX; i++ )
                 {
-                    powerSpecMsInv_fx[ch][n][i] = L_shr( powerSpecMsInv_fx[ch][n][i], sub( tmp_q_psi[n][i], q_powSpec[ch] ) );
-                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i], q_powSpec[ch] ) );
+                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i + ( n * L_subframeTCX )], q_powSpec[ch] ) );
                     move32();
                     move32();
                 }
@@ -606,7 +602,7 @@ void ivas_mct_core_enc_fx(
     {
         IF( hMCT->currBlockDataCnt > 0 )
         {
-            mctStereoIGF_enc_fx( hMCT, sts, orig_spectrum_fx, q_origSpec, powerSpec_fx, powerSpecMsInv_fx, q_powSpec, inv_spectrum_fx, sp_aud_decision0 );
+            mctStereoIGF_enc_fx( hMCT, sts, orig_spectrum_fx, q_origSpec, powerSpec_fx, q_powSpec, powerSpecMsInv_fx, tmp_q_psi, inv_spectrum_fx, sp_aud_decision0 );
         }
         ELSE
         {
@@ -643,7 +639,7 @@ void ivas_mct_core_enc_fx(
                         q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
                         set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
 
-                        ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
+                        ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_origSpec, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
 
                         st->hIGFEnc->spec_be_igf_e = sub( 31, q_origSpec );
                         st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc_fx.c
similarity index 93%
rename from lib_enc/ivas_mct_enc.c
rename to lib_enc/ivas_mct_enc_fx.c
index 4d032cee87854a5cfce40268a34bff9b2700ab87..ee93533790141e5ef7364b3c6a1a28e82af16415 100644
--- a/lib_enc/ivas_mct_enc.c
+++ b/lib_enc/ivas_mct_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,8 @@
 #include <math.h>
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx_enc.h"
 #include "rom_com.h"
@@ -284,9 +282,6 @@ ivas_error ivas_mct_enc_fx(
 
     Word16 q_spec = Q31;
     Word16 q_origSpec = Q31;
-    Word16 q_com = Q31, q_com_spec = Q31;
-    move16();
-    move16();
     move16();
     move16();
     Word16 length, ch, nCPE;
@@ -303,6 +298,7 @@ ivas_error ivas_mct_enc_fx(
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
+            Word16 norm;
             IF( EQ_32( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
             {
                 CONTINUE;
@@ -324,24 +320,14 @@ ivas_error ivas_mct_enc_fx(
             {
                 length = add( length, idiv1616( length, 4 ) );
             }
-
-            FOR( Word16 k = 0; k <= ( ( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV ) - 1; k++ )
-            {
-                IF( hMCT->p_mdst_spectrum_long_fx[cpe_id][ch] )
-                {
-                    q_spec = s_min( q_spec, hMCT->q_mdst_spectrum_long_fx[cpe_id][ch][k] );
-                    q_com_spec = s_min( q_com_spec, L_norm_arr( &hMCT->p_mdst_spectrum_long_fx[cpe_id][ch][k * N_TCX10_MAX], length ) );
-                }
-            }
             IF( hMCT->p_orig_spectrum_long_fx[cpe_id][ch] )
             {
-                q_origSpec = s_min( q_origSpec, hMCT->q_orig_spectrum_long_fx[cpe_id][ch] );
-                q_com = s_min( q_com, L_norm_arr( hMCT->p_orig_spectrum_long_fx[cpe_id][ch], L_FRAME48k ) );
+                norm = L_norm_arr( hMCT->p_orig_spectrum_long_fx[cpe_id][ch], L_FRAME48k );
+                q_origSpec = s_min( q_origSpec, add( norm, hMCT->q_orig_spectrum_long_fx[cpe_id][ch] ) );
             }
         }
     }
-    q_spec = sub( add( q_spec, q_com_spec ), 1 );
-    q_origSpec = sub( add( q_origSpec, q_com ), 1 );
+    q_origSpec = sub( q_origSpec, 1 );
 
     FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
     {
@@ -361,73 +347,39 @@ ivas_error ivas_mct_enc_fx(
     }
     hMCT->q_orig_spectrum_long_com = q_origSpec;
     move16();
+
     FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-            // length = st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->L_frameTCX / ( ( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV );
-
-            IF( EQ_16( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+            IF( EQ_16( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->core, TCX_20 ) )
             {
                 length = st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->L_frameTCX;
                 move16();
             }
             ELSE
             {
-                length = idiv1616( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->L_frameTCX, NB_DIV ); // st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->L_frameTCX / NB_DIV
+                length = idiv1616( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->L_frameTCX, NB_DIV );
             }
-
             IF( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->last_core == ACELP_CORE )
             {
                 length = add( length, idiv1616( length, 4 ) );
             }
+            Word16 norm = L_norm_arr( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_fx, N_MAX );
+            q_spec = s_min( q_spec, add( sub( 31, st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_e ), norm ) );
+            q_spec = s_min( q_spec, add( sub( 31, st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_e ), norm ) );
 
             FOR( Word16 k = 0; k <= ( ( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV ) - 1; k++ )
             {
                 IF( hMCT->p_mdst_spectrum_long_fx[cpe_id][ch] )
                 {
-                    Scale_sig32( &hMCT->p_mdst_spectrum_long_fx[cpe_id][ch][k * N_TCX10_MAX], length, sub( q_spec, hMCT->q_mdst_spectrum_long_fx[cpe_id][ch][k] ) ); // q_spec
-                    hMCT->q_mdst_spectrum_long_fx[cpe_id][ch][k] = q_spec;
-                    move16();
+                    norm = L_norm_arr( &hMCT->p_mdst_spectrum_long_fx[cpe_id][ch][k * N_TCX10_MAX], length );
+                    q_spec = s_min( q_spec, add( norm, hMCT->q_mdst_spectrum_long_fx[cpe_id][ch][k] ) );
                 }
             }
         }
     }
 
-    Encoder_State *sts_tmp[MCT_MAX_CHANNELS];
-    Encoder_State *st;
-    Word16 i;
-    nCPE = shr( hMCT->nchan_out_woLFE, 1 ); // nChannels / CPE_CHANNELS
-
-    /*in case of odd number of channels*/
-    IF( NE_16( ( nCPE * CPE_CHANNELS ), hMCT->nchan_out_woLFE ) )
-    {
-        nCPE = add( nCPE, 1 );
-    }
-    FOR( ( cpe_id = 0, i = 0 ); cpe_id < nCPE; cpe_id++ )
-    {
-        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-        {
-            sts_tmp[i] = st_ivas->hCPE[cpe_id]->hCoreCoder[ch];
-            IF( EQ_32( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
-            {
-                i = add( i, 1 );
-                CONTINUE;
-            }
-            i = add( i, 1 );
-        }
-    }
-
-    FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
-    {
-        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-        {
-            Word16 norm = L_norm_arr( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_fx, N_MAX );
-            q_spec = s_min( q_spec, add( sub( 31, st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_e ), norm ) );
-            q_spec = s_min( q_spec, add( sub( 31, st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_e ), norm ) );
-        }
-    }
-
     FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
@@ -447,11 +399,28 @@ ivas_error ivas_mct_enc_fx(
             move16();
             st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_e[1] = sub( 31, q_spec );
             move16();
+            st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_e = sub( 31, q_spec );
+            move16();
+
+            IF( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->last_core == ACELP_CORE )
+            {
+                length = add( length, idiv1616( length, 4 ) );
+            }
+
+            FOR( Word16 k = 0; k <= ( ( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV ) - 1; k++ )
+            {
+                IF( hMCT->p_mdst_spectrum_long_fx[cpe_id][ch] )
+                {
+                    Scale_sig32( &hMCT->p_mdst_spectrum_long_fx[cpe_id][ch][k * N_TCX10_MAX], length, sub( q_spec, hMCT->q_mdst_spectrum_long_fx[cpe_id][ch][k] ) ); // q_spec
+                    hMCT->q_mdst_spectrum_long_fx[cpe_id][ch][k] = q_spec;
+                    move16();
+                }
+            }
         }
     }
 
     /* joint MCT encoding */
-    ivas_mct_core_enc_fx( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE, ivas_total_brate, switch_bw, ( ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order );
+    ivas_mct_core_enc_fx( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE, ivas_total_brate, switch_bw, ( ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) ? (Word16) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order );
 
     FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
     {
@@ -496,26 +465,6 @@ ivas_error ivas_mct_enc_fx(
 
     q_spec = 31;
     move16();
-    FOR( ch = 0; ch < hMCT->nchan_out_woLFE; ch++ )
-    {
-        // length = sts_tmp[ch]->hTcxEnc->L_frameTCX / ( ( sts_tmp[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV );
-
-        IF( EQ_16( sts_tmp[ch]->hTcxEnc->tcxMode, TCX_20 ) )
-        {
-            length = sts_tmp[ch]->hTcxEnc->L_frameTCX;
-            move16();
-        }
-        ELSE
-        {
-            length = idiv1616( sts_tmp[ch]->hTcxEnc->L_frameTCX, NB_DIV ); // st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->L_frameTCX / NB_DIV
-        }
-
-        IF( sts_tmp[ch]->last_core == ACELP_CORE )
-        {
-            length = add( length, idiv1616( length, 4 ) );
-        }
-    }
-
 
     /* Spectrum quantization and coding */
     FOR( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
@@ -527,31 +476,20 @@ ivas_error ivas_mct_enc_fx(
             hCPE->hCoreCoder[0]->hBstr->ind_list = st_ivas->hCPE[cpe_id - 1]->hCoreCoder[1]->hBstr->ind_list + st_ivas->hCPE[cpe_id - 1]->hCoreCoder[1]->hBstr->nb_ind_tot;
         }
 
-        Encoder_State /**st,*/ **sts;
-        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-        {
-            sts = hCPE->hCoreCoder;
-            st = sts[ch];
-        }
-
         ivas_mdct_quant_coder_fx( hCPE, hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 );
 
-        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-        {
-            sts = hCPE->hCoreCoder;
-            st = sts[ch];
-        }
-
         /* update input samples buffer (as done in ivas_cpe_enc() for other than MCT coding) */
         FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
             Copy( hCPE->hCoreCoder[n]->input_fx, hCPE->hCoreCoder[n]->old_input_signal_fx, input_frame );
             hCPE->hCoreCoder[n]->q_old_inp = hCPE->hCoreCoder[n]->q_inp;
             move16();
+            Copy32( hCPE->hCoreCoder[n]->input32_fx, hCPE->hCoreCoder[n]->old_input_signal32_fx, input_frame );
+            hCPE->hCoreCoder[n]->q_old_inp32 = hCPE->hCoreCoder[n]->q_inp32;
+            move16();
             /* common encoder updates */
 
-            st = hCPE->hCoreCoder[n];
-            updt_enc_common_ivas_fx( st, Q_new_out[cpe_id][n] );
+            updt_enc_common_ivas_fx( hCPE->hCoreCoder[n], Q_new_out[cpe_id][n] );
         }
     }
 
diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct_fx.c
similarity index 94%
rename from lib_enc/ivas_mct_enc_mct.c
rename to lib_enc/ivas_mct_enc_mct_fx.c
index 7729bbff5b2d88eb5517f4f3a1dc2bbc21ea4c3c..8ff17ae01a6cd7bee24f079d5b95a72684b777fb 100644
--- a/lib_enc/ivas_mct_enc_mct.c
+++ b/lib_enc/ivas_mct_enc_mct_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,9 +34,7 @@
 #include "options.h"
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "wmc_auto.h"
@@ -387,7 +385,7 @@ static void getBlockValues_fx(
     p_st[0] = sts[ch1];
     p_st[1] = sts[ch2];
 
-    stereo_coder_tcx_fx( hBlock->hStereoMdct, p_st, hBlock->mask, p_mdst_spectrum, p_inv_spectrum, p_inv_mdst_spectrum, 1, q_spec );
+    stereo_coder_tcx_fx( hBlock->hStereoMdct, p_st, hBlock->mask, p_mdst_spectrum, p_inv_spectrum, p_inv_mdst_spectrum, 1, sub( 31, q_spec ), sub( 31, q_spec ) );
 
     test();
     test();
@@ -601,6 +599,11 @@ static void getGlobalILD_fx(
             {
                 sts[ch]->hTcxEnc->spectrum_e[k] = add( sts[ch]->hTcxEnc->spectrum_e[k], 4 ); // Updating exponent of spectrum as q_ratio is in Q11
             }
+            IF( GT_16( nSubframes, 1 ) )
+            {
+                sts[ch]->hTcxEnc->spectrum_long_e = add( sts[ch]->hTcxEnc->spectrum_long_e, 4 );
+                move16();
+            }
 
             FOR( k = 0; k < nSubframes; k++ )
             {
@@ -877,10 +880,12 @@ void apply_MCT_enc_fx(
                     }
                     sts[ch]->hTcxEnc->spectrum_e[1] = add( sts[ch]->hTcxEnc->spectrum_e[0], exp );
                     sts[ch]->hTcxEnc->spectrum_e[0] = add( sts[ch]->hTcxEnc->spectrum_e[0], exp );
+                    sts[ch]->hTcxEnc->spectrum_long_e = add( sts[ch]->hTcxEnc->spectrum_long_e, exp );
                     hMCT->mc_global_ild[ch] = 0;
                     move16();
                     move16();
                     move16();
+                    move16();
                 }
             }
         }
@@ -974,24 +979,26 @@ void write_mct_bitstream_fx(
  * IGF analysis of channels after MCT processing
  *--------------------------------------------------------------------*/
 void mctStereoIGF_enc_fx(
-    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure               */
-    Encoder_State **sts,                                 /* i/o: encoder state structure             */
-    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF               */
-    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum */
-    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
-    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/
-    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx and powSpecMsInv_fx*/
-    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                    */
-    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision               */
+    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure                      */
+    Encoder_State **sts,                                 /* i/o: encoder state structure                    */
+    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */
+    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */
+    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */
+    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */
+    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/
+    Word16 *q_powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],  /* i  : Q for powSpecMsInv_fx                      */
+    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                           */
+    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision                      */
 )
 {
     Word32 *p_powerSpecMsInv_fx[CPE_CHANNELS][NB_DIV];
+    Word16 *q_p_powerSpecMsInv_fx[CPE_CHANNELS][NB_DIV];
     Word32 *p_inv_spectrum_fx[CPE_CHANNELS][NB_DIV];
     Word32 *p_orig_spectrum_fx[CPE_CHANNELS][NB_DIV];
     Word32 *p_powerSpec_fx[NB_DIV];
 
     Word16 b, nSubframes, L_subframeTCX;
-    Word16 p_ch[2], n, ch, ch1, ch2, s = 31;
+    Word16 p_ch[2], n, ch, ch1, ch2;
     Word16 q_pS_ch[2];
     Encoder_State *p_st[NB_DIV];
     Encoder_State *st;
@@ -1052,6 +1059,8 @@ void mctStereoIGF_enc_fx(
             p_orig_spectrum_fx[1][n] = orig_spectrum_fx[ch2][n];
             p_powerSpecMsInv_fx[0][n] = powerSpecMsInv_fx[ch1][n]; // q_powerSpec
             p_powerSpecMsInv_fx[1][n] = powerSpecMsInv_fx[ch2][n];
+            q_p_powerSpecMsInv_fx[0][n] = q_powerSpecMsInv[ch1][n]; // q_powerSpec
+            q_p_powerSpecMsInv_fx[1][n] = q_powerSpecMsInv[ch2][n];
             p_inv_spectrum_fx[0][n] = inv_spectrum_fx[ch1][n];
             p_inv_spectrum_fx[1][n] = inv_spectrum_fx[ch2][n];
             q_pS_ch[0] = q_powerSpec[ch1];
@@ -1063,32 +1072,18 @@ void mctStereoIGF_enc_fx(
             IF( NE_16( hMCT->hBlockData[b]->hStereoMdct->mdct_stereo_mode[n], hMCT->hBlockData[b]->hStereoMdct->IGFStereoMode[n] ) ||
                 EQ_16( hMCT->hBlockData[b]->hStereoMdct->mdct_stereo_mode[n], SMDCT_BW_MS ) )
             {
+                Word16 exp_powerSpec_fx[CPE_CHANNELS], exp_inv_spectrum_fx[CPE_CHANNELS];
 
                 FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
                 {
-                    s = s_min( s, sub( 31, p_st[ch]->hTcxEnc->spectrum_e[n] ) );
-                    s = s_min( s, q_pS_ch[ch] );
-                }
-                FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-                {
-                    scale_sig32( p_st[ch]->hTcxEnc->spectrum_fx[0], N_MAX, sub( s, sub( 31, p_st[ch]->hTcxEnc->spectrum_e[0] ) ) );
-                    scale_sig32( p_inv_spectrum_fx[ch][0], L_FRAME48k, sub( s, sub( 31, p_st[ch]->hTcxEnc->spectrum_e[0] ) ) );
-                    p_st[ch]->hTcxEnc->spectrum_e[0] = sub( 31, s );
-                    p_st[ch]->hTcxEnc->spectrum_e[1] = sub( 31, s );
-                    move16();
-                    move16();
-
-                    scale_sig32( p_powerSpecMsInv_fx[ch][0], L_FRAME48k, sub( s, q_pS_ch[ch] ) );
-                    scale_sig32( &p_powerSpec_fx[ch][0], sts[ch]->hTcxEnc->L_frameTCX, sub( s, q_pS_ch[ch] ) );
-                    q_powerSpec[ch1] = s;
-                    q_powerSpec[ch2] = s;
+                    exp_powerSpec_fx[ch] = sub( Q31, q_pS_ch[ch] );
+                    exp_inv_spectrum_fx[ch] = p_st[ch]->hTcxEnc->spectrum_e[n];
                     move16();
                     move16();
                 }
 
-                ProcessStereoIGF_fx( hMCT->hBlockData[b]->hStereoMdct, p_st, hMCT->hBlockData[b]->mask,
-                                     p_orig_spectrum_fx, q_origSpec, q_origSpec,
-                                     p_powerSpec_fx, p_powerSpecMsInv_fx, p_inv_spectrum_fx, n, sp_aud_decision0[ch1], p_st[0]->total_brate );
+                ProcessStereoIGF_fx( hMCT->hBlockData[b]->hStereoMdct, p_st, hMCT->hBlockData[b]->mask, p_orig_spectrum_fx, q_origSpec, q_origSpec, p_powerSpec_fx, exp_powerSpec_fx,
+                                     p_powerSpecMsInv_fx, q_p_powerSpecMsInv_fx, p_inv_spectrum_fx, exp_inv_spectrum_fx, n, sp_aud_decision0[ch1], p_st[0]->total_brate, 1 );
             }
             ELSE
             {
@@ -1106,7 +1101,7 @@ void mctStereoIGF_enc_fx(
                     q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
 
                     set16_fx( exp_powerSpec[p_ch[ch]], sub( Q31, q_powerSpec[p_ch[ch]] ), N_MAX + L_MDCT_OVLP_MAX );
-                    ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[p_ch[ch]][n], &q_spectrum, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
+                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[p_ch[ch]][n], q_origSpec, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
 
                     st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
                     move16();
@@ -1147,7 +1142,7 @@ void mctStereoIGF_enc_fx(
                     q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
 
                     set16_fx( exp_powerSpec[ch], sub( Q31, q_powerSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
-                    ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
+                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_origSpec, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
 
                     st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
                     move16();
diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc_fx.c
similarity index 88%
rename from lib_enc/ivas_mdct_core_enc.c
rename to lib_enc/ivas_mdct_core_enc_fx.c
index a64cf60b3c9ecba13952cca09725e100798cb8b5..4d8bc7b9979f5a8e60a9b8cbb79cc9c8e942020f 100644
--- a/lib_enc/ivas_mdct_core_enc.c
+++ b/lib_enc/ivas_mdct_core_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,13 +36,11 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "prot_fx_enc.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -235,7 +233,7 @@ static Word16 kernel_switch_detect_fx(
     L_tmp1 = Sqrt32( L_tmp1, &exp_tmp1 );
     L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, exp_tmp, L_tmp1, exp_tmp1, &exp_tmp );
     L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, exp_tmp, ONE_IN_Q30, 1, &exp_tmp );
-    cov00 = BASOP_Util_Divide3232_Scale_cadence( cov00, L_tmp, &exp_tmp1 );
+    cov00 = BASOP_Util_Divide3232_Scale_newton( cov00, L_tmp, &exp_tmp1 );
     exp_tmp = add( exp_tmp1, sub( sub( Q31, q_com ), exp_tmp ) );
     /* Added saturation to handle overflows when value is very close to 1.f */
     cov00 = L_shl_sat( cov00, exp_tmp ); // Q31
@@ -249,7 +247,7 @@ static Word16 kernel_switch_detect_fx(
     L_tmp1 = Sqrt32( L_tmp1, &exp_tmp1 );
     L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, exp_tmp, L_tmp1, exp_tmp1, &exp_tmp );
     L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, exp_tmp, ONE_IN_Q30, 1, &exp_tmp );
-    cov90 = BASOP_Util_Divide3232_Scale_cadence( cov90, L_tmp, &exp_tmp1 );
+    cov90 = BASOP_Util_Divide3232_Scale_newton( cov90, L_tmp, &exp_tmp1 );
     exp_tmp = add( exp_tmp1, sub( sub( Q31, q_com ), exp_tmp ) );
     /* Added saturation to handle overflows when value is very close to 1.f */
     cov90 = L_shl_sat( cov90, exp_tmp ); // Q31
@@ -372,15 +370,16 @@ static void kernel_switch_trafo_fx(
 
 
 static void kernel_switch_update_transforms_fx(
-    Word32 *sigR,                 /* i/o: MDCT samples of the given channel (*q_sig) */
-    Word32 *sigI,                 /* i/o: MDST samples of the given channel (*q_sig) */
-    Word16 *q_sig,                /* i/o: Common Q of MDCT and MDST samples of the given channel */
-    const Word16 tcxTransType,    /* i  : TCX transform type, cf also above */
-    TCX_CONFIG_HANDLE hTcxCfg,    /* i  : TCX configuration handle, pointer */
-    const Word16 bwidthSwCnt,     /* i  : bandwidth switching counter in st */
-    const UWord16 kernelType,     /* i  : TCX transform kernel type (0 - 3) */
-    Word16 *tcxTimeSignal,        /* i  : hTcxEnc->new_speech_TCX buf in st */
-    const Word16 *speech_TCX,     /* i  : hTcxEnc->speech_TCX buffer in st  */
+    Word32 *sigR,              /* i/o: MDCT samples of the given channel (*q_sig) */
+    Word32 *sigI,              /* i/o: MDST samples of the given channel (*q_sig) */
+    Word16 *q_sig,             /* i/o: Common Q of MDCT and MDST samples of the given channel */
+    const Word16 tcxTransType, /* i  : TCX transform type, cf also above */
+    TCX_CONFIG_HANDLE hTcxCfg, /* i  : TCX configuration handle, pointer */
+    const Word16 bwidthSwCnt,  /* i  : bandwidth switching counter in st */
+    const UWord16 kernelType,  /* i  : TCX transform kernel type (0 - 3) */
+    Word16 *tcxTimeSignal,     /* i  : hTcxEnc->new_speech_TCX buf in st */
+    const Word16 *speech_TCX,  /* i  : hTcxEnc->speech_TCX buffer in st  */
+    const Word16 q_speech,
     Word32 *windowedTimeSignal,   /* i/o: windowed input and scratch buffer (*q_windowedTimeSignal) */
     Word16 *q_windowedTimeSignal, /* i/o: Q of windowed input and scratch buffer */
     const Word16 L_subframe       /* i  : transform length (number of bins) */
@@ -431,29 +430,21 @@ static void kernel_switch_update_transforms_fx(
         Word32 factor;
 
         n = extract_l( Mpy_32_32( s, 603979776 /* N_ZERO_MDCT_NS / FRAME_SIZE_NS in Q31 */ ) );
-#ifdef MSAN_FIX
-        Scale_sig( &tcxTimeSignal[n - s], add( sub( shl( s, 1 ), n ), 1 ), -Q1 ); // Q0 -> Q-1
-#else
-        Scale_sig( &tcxTimeSignal[n - s], shl( s, 1 ), -Q1 ); // Q0 -> Q-1
-#endif
-        wtda_ext_fx( tcxTimeSignal, windowedTimeSignal_16, extract_l( windowedTimeSignal[0] ), extract_l( windowedTimeSignal[1] ), s, kernelType ); // Q-1
-#ifdef MSAN_FIX
-        Scale_sig( &tcxTimeSignal[n - s], add( sub( shl( s, 1 ), n ), 1 ), Q1 ); // Q-1 -> Q0
-#else
-        Scale_sig( &tcxTimeSignal[n - s], shl( s, 1 ), Q1 );  // Q-1 -> Q0
-#endif
-        Copy_Scale_sig_16_32_no_sat( windowedTimeSignal_16, windowedTimeSignal, s, Q16 ); // Q15
-        scale_sig32( windowedTimeSignal, s, -Q8 /* guard bits */ );                       // Q7
+        Scale_sig( &tcxTimeSignal[n - s], add( sub( shl( s, 1 ), n ), 1 ), sub( -Q1, q_speech ) );                                                  // q_speech -> Q-1
+        wtda_ext_fx( tcxTimeSignal, windowedTimeSignal_16, extract_l( windowedTimeSignal[0] ), extract_l( windowedTimeSignal[1] ), s, kernelType ); // Q-2
+        Scale_sig( &tcxTimeSignal[n - s], add( sub( shl( s, 1 ), n ), 1 ), sub( q_speech, -Q1 ) );                                                  // Q-1 -> q_speech
+        Copy_Scale_sig_16_32_no_sat( windowedTimeSignal_16 /* Q(-2) */, windowedTimeSignal, s, Q16 );                                               // Q14
+        scale_sig32( windowedTimeSignal, s, -Q8 /* guard bits */ );                                                                                 // Q6
         edxt_fx( windowedTimeSignal, sigR, s, kernelType, FALSE );
 
         tmp = BASOP_Util_Divide1616_Scale( NORM_MDCT_FACTOR, s, &exp_tmp );
         tmp = Sqrt16( tmp, &exp_tmp );
         factor = L_shl( L_deposit_h( tmp ), sub( exp_tmp, Q1 ) ); // Q30
-        v_multc_fixed( sigR, factor, sigR, s );                   // (Q7, Q30) -> Q6
+        v_multc_fixed( sigR, factor, sigR, s );                   // (Q6, Q30) -> Q5
 
         q_com = L_norm_arr( sigR, s );
-        q_com = s_min( add( q_com, Q6 ), *q_sig );
-        scale_sig32( sigR, s, sub( q_com, Q6 ) );     // q_com
+        q_com = s_min( add( q_com, Q5 ), *q_sig );
+        scale_sig32( sigR, s, sub( q_com, Q5 ) );     // q_com
         scale_sig32( sigI, s, sub( q_com, *q_sig ) ); // q_com
         *q_sig = q_com;
         move16();
@@ -475,21 +466,22 @@ static void kernel_switch_update_transforms_fx(
         {
             Word16 tmp = shr( hTcxCfg->tcx_mdct_window_min_lengthFB, 1 );
             Word32 L_tmp;
+            Word16 shift = sub( *q_windowedTimeSignal, add( Q16, q_speech ) );
             IF( GE_32( kernelType, MDCT_II ) )
             {
                 FOR( i = minWindowLen; i >= tmp; i-- ) /* outer left folding of shortened long ALDO slope */
                 {
-                    L_tmp = L_mult( speech_TCX[-1 - i], hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                 // (Q16, Q15) -> Q16
-                    L_tmp = L_shl( L_tmp, sub( *q_windowedTimeSignal, Q16 ) );                                               // *q_windowedTimeSignal
+                    L_tmp = L_mult( speech_TCX[-1 - i], hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                 // (Q16 + q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = L_shl( L_tmp, shift );                                                                           // *q_windowedTimeSignal
                     windowedTimeSignal[2 + leftOverlap + i] = L_add( windowedTimeSignal[2 + leftOverlap + i], L_tmp );       // *q_windowedTimeSignal
                     move32();
                 }
                 FOR( i = tmp - 1; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
                 {
-                    L_tmp = L_mult( speech_TCX[-1 - i], hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                // (Q16, Q15) -> Q16
-                    L_tmp = L_shl( L_tmp, sub( *q_windowedTimeSignal, Q16 ) );                                               // *q_windowedTimeSignal
+                    L_tmp = L_mult( speech_TCX[-1 - i], hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                // (Q16 + q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = L_shl( L_tmp, shift );                                                                           // *q_windowedTimeSignal
                     windowedTimeSignal[2 + leftOverlap + i] = L_add( windowedTimeSignal[2 + leftOverlap + i], L_tmp );       // *q_windowedTimeSignal
                     move32();
                 }
@@ -498,17 +490,17 @@ static void kernel_switch_update_transforms_fx(
             {
                 FOR( i = minWindowLen; i >= tmp; i-- ) /* outer left folding of shortened long ALDO slope */
                 {
-                    L_tmp = L_mult( negate( speech_TCX[-1 - i] ), hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16, Q15) -> Q16
-                    L_tmp = L_shl( L_tmp, sub( *q_windowedTimeSignal, Q16 ) );                                                         // *q_windowedTimeSignal
+                    L_tmp = L_mult( negate( speech_TCX[-1 - i] ), hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[minWindowLen - i].v.im );                           // (Q16 + q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = L_shl( L_tmp, shift );                                                                                     // *q_windowedTimeSignal
                     windowedTimeSignal[2 + leftOverlap + i] = L_add( windowedTimeSignal[2 + leftOverlap + i], L_tmp );                 // *q_windowedTimeSignal
                     move32();
                 }
                 FOR( i = tmp - 1; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
                 {
-                    L_tmp = L_mult( negate( speech_TCX[-1 - i] ), hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (Q0, Q15) -> Q16
-                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16, Q15) -> Q16
-                    L_tmp = L_shl( L_tmp, sub( *q_windowedTimeSignal, Q16 ) );                                                         // *q_windowedTimeSignal
+                    L_tmp = L_mult( negate( speech_TCX[-1 - i] ), hTcxCfg->tcx_aldo_window_1_FB[leftOverlap / 2 + minWindowLen - i] ); // (q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = Mpy_32_16_1( L_tmp, hTcxCfg->tcx_mdct_window_minimumFB[i].v.re );                                          // (Q16 + q_speech, Q15) -> Q16 + q_speech
+                    L_tmp = L_shl( L_tmp, shift );                                                                                     // *q_windowedTimeSignal
                     windowedTimeSignal[2 + leftOverlap + i] = L_add( windowedTimeSignal[2 + leftOverlap + i], L_tmp );                 // *q_windowedTimeSignal
                     move32();
                 }
@@ -520,7 +512,7 @@ static void kernel_switch_update_transforms_fx(
             Word16 tcx5Win[N_TCX10_MAX / 2 + L_MDCT_OVLP_MAX];    /* temporary buffer for TCX5 windowing */
             Word32 tcx5Win_32[N_TCX10_MAX / 2 + L_MDCT_OVLP_MAX]; /* temporary buffer for TCX5 windowing */
             Word16 windowedTimeSignal_16[2 + L_FRAME48k];
-            Word16 q_shift, q_com;
+            Word16 q_shift, q_com, q_temp;
 
             assert( L_subframe == nSubframes * hTcxCfg->tcx5SizeFB );
 
@@ -547,17 +539,14 @@ static void kernel_switch_update_transforms_fx(
             Copy_Scale_sig_32_16( windowedTimeSignal + 2, windowedTimeSignal_16 + 2, add( s, shr( add( leftOverlap, rightOverlap ), 1 ) ), -Q16 );                       // *q_windowedTimeSignal - Q16
             WindowSignal( hTcxCfg, shr( leftOverlap, 1 ), RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal_16 + 2, &s, tcx5Win, 0, 1 ); // *q_windowedTimeSignal - Q16
             Copy_Scale_sig_16_32_no_sat( tcx5Win, tcx5Win_32, add( s, shr( add( leftOverlap, rightOverlap ), 1 ) ), Q16 );                                               // *q_windowedTimeSignal
-#ifdef FIX_ISSUE_1157
             q_shift = -Q8;
-#else
-            q_shift = -Q7;
-#endif
             move16();
             scale_sig32( tcx5Win_32, add( s /* L_subfr. */, shr( add( leftOverlap, rightOverlap ), 1 ) ), q_shift );                                                // *q_windowedTimeSignal + q_shift
             kernel_switch_trafo_fx( tcx5Win_32, sigR, leftOverlap, sub( s /* L_subfr. */, shr( add( leftOverlap, rightOverlap ), 1 ) ), rightOverlap, kernelType ); // *q_windowedTimeSignal + q_shift
 
             /* Move both sigR and sigI to common Q */
-            q_com = s_min( *q_sig, sub( add( *q_windowedTimeSignal, q_shift ), Q1 ) );
+            q_temp = add( sub( add( *q_windowedTimeSignal, q_shift ), Q1 ), L_norm_arr( sigR, L_subframe ) );
+            q_com = s_min( *q_sig, q_temp );
             scale_sig32( sigR, s, sub( q_com, sub( add( *q_windowedTimeSignal, q_shift ), Q1 ) ) );
             scale_sig32( sigR + s, sub( L_subframe, s ), sub( q_com, *q_sig ) );
             scale_sig32( sigI, L_subframe, sub( q_com, *q_sig ) );
@@ -579,18 +568,15 @@ static void kernel_switch_update_transforms_fx(
         }
         ELSE /* tcxTransType != TCX_5 */
         {
-            Word16 q_shift, q_com;
-#ifdef FIX_ISSUE_1157
+            Word16 q_shift, q_com, q_temp;
             q_shift = -Q8;
-#else
-            q_shift = -Q7;
-#endif
             move16();
             scale_sig32( windowedTimeSignal + 2, add( s /* L_subfr. */, shr( add( leftOverlap, rightOverlap ), 1 ) ), q_shift );                                                // *q_windowedTimeSignal + q_shift
             kernel_switch_trafo_fx( windowedTimeSignal + 2, sigR, leftOverlap, sub( s /* L_subfr. */, shr( add( leftOverlap, rightOverlap ), 1 ) ), rightOverlap, kernelType ); // *q_windowedTimeSignal + q_shift
 
             /* Move both sigR and sigI to common Q */
-            q_com = s_min( *q_sig, sub( add( *q_windowedTimeSignal, q_shift ), Q1 ) );
+            q_temp = add( sub( add( *q_windowedTimeSignal, q_shift ), Q1 ), L_norm_arr( sigR, L_subframe ) );
+            q_com = s_min( *q_sig, q_temp );
             scale_sig32( sigR, s, sub( q_com, sub( add( *q_windowedTimeSignal, q_shift ), Q1 ) ) );
             scale_sig32( sigR + s, sub( L_subframe, s ), sub( q_com, *q_sig ) );
             scale_sig32( sigI, L_subframe, sub( q_com, *q_sig ) );
@@ -704,8 +690,8 @@ static void applyStereoPreProcessingCplx(
             }
             ELSE
             {
-                dmxR2_fx = L_sub( Mpy_32_32( valR1_fx, factIn_fx ), Mpy_32_32( valR2_fx, factDe_fx ) ); // Q = q_com + Q22 - 31
-                dmxI2_fx = L_sub( Mpy_32_32( valI1_fx, factIn_fx ), Mpy_32_32( valI2_fx, factDe_fx ) ); // Q = q_com + Q22 - 31
+                dmxR2_fx = L_sub( Mpy_32_32( valR2_fx, factDe_fx ), Mpy_32_32( valR1_fx, factIn_fx ) ); // Q = q_com + Q22 - 31
+                dmxI2_fx = L_sub( Mpy_32_32( valI2_fx, factDe_fx ), Mpy_32_32( valI1_fx, factIn_fx ) ); // Q = q_com + Q22 - 31
             }
         }
         ELSE
@@ -749,7 +735,7 @@ static void applyStereoPreProcessingCplx(
     d_q = sub( 31, d_q );
 
     deno = L_max( L_shl_sat( 1, d_q ), d_fx );
-    sq_imp = BASOP_Util_Divide3232_Scale_cadence( n_fx, deno, &exp );
+    sq_imp = BASOP_Util_Divide3232_Scale_newton( n_fx, deno, &exp );
     exp = add( exp, sub( d_q, n_q ) );
     d_fx = Sqrt32( sq_imp, &exp );
     *mdctSample1_fx = Mpy_32_32( dmxR1_fx, d_fx );
@@ -778,7 +764,7 @@ static void applyStereoPreProcessingCplx(
     d_q = sub( 31, d_q );
 
     deno = L_max( L_shl_sat( 1, d_q ), d_fx );
-    sq_imp = BASOP_Util_Divide3232_Scale_cadence( n_fx, deno, &exp );
+    sq_imp = BASOP_Util_Divide3232_Scale_newton( n_fx, deno, &exp );
     exp = add( exp, sub( d_q, n_q ) );
     d_fx = Sqrt32( sq_imp, &exp );
     *mdctSample2_fx = Mpy_32_32( dmxR2_fx, d_fx );
@@ -798,7 +784,7 @@ static void applyStereoPreProcessingCplx(
  *
  * encoder-side complex-valued stereo pre-processing (crosstalk)
  *---------------------------------------------------------------*/
-static uint16_t enc_ste_pre_mdct(
+static UWord16 enc_ste_pre_mdct(
     Word32 *sigR0_fx, /* i/o: MDCT samples of the 1st (left) channel  q_com*/
     Word32 *sigR1_fx, /* i/o: MDCT samples of the 2nd (right) channel q_com*/
     Word32 *sigI0_fx, /* i/o: MDST samples of the 1st (left) channel  q_com*/
@@ -829,6 +815,7 @@ static uint16_t enc_ste_pre_mdct(
     Word16 mdst_exp1[2 * 960], mdst_exp2[2 * 960];
     Word16 x1, x2, x3, x4, ans, tmp;
     Word32 maxSqrValue_fx;
+    Word64 sumL_64fx, sumR_64fx;
 
     IF( LT_16( nSamplesMax, 512 ) )
     {
@@ -899,7 +886,9 @@ static uint16_t enc_ste_pre_mdct(
     {
         return 0;
     }
-
+    sumL_64fx = 0, sumR_64fx = 0;
+    move64();
+    move64();
     FOR( s = fadeInOff; s < nSampProc; s++ )
     {
         Word32 absMagnL_fx, absMagnR_fx;
@@ -912,13 +901,8 @@ static uint16_t enc_ste_pre_mdct(
         absMagnR_fx = Sqrt32( L_add( Mpy_32_32( sigR1_fx[s], sigR1_fx[s] ), Mpy_32_32( sigI1_fx[s], sigI1_fx[s] ) ), &absMagnR_e );
 
         corr_fx = L_add( corr_fx, L_add( Mpy_32_32( sigR0_fx[s], sigR1_fx[s] ), Mpy_32_32( sigI0_fx[s], sigI1_fx[s] ) ) ); // q_com*2 - 31
-#ifdef FIX_ISSUE_1092
-        sumL_fx = L_add( sumL_fx, L_add( L_shr( sigR0_fx[s], 1 ), L_shr( sigI0_fx[s], 1 ) ) ); // q_com -1
-        sumR_fx = L_add( sumR_fx, L_add( L_shr( sigR1_fx[s], 1 ), L_shr( sigI1_fx[s], 1 ) ) ); // q_com - 1
-#else
-        sumL_fx = L_add( sumL_fx, L_add( sigR0_fx[s], sigI0_fx[s] ) ); // q_com
-        sumR_fx = L_add( sumR_fx, L_add( sigR1_fx[s], sigI1_fx[s] ) ); // q_com
-#endif
+        sumL_64fx = W_add( sumL_64fx, W_add( sigR0_fx[s], sigI0_fx[s] ) );                                                 // q_com
+        sumR_64fx = W_add( sumR_64fx, W_add( sigR1_fx[s], sigI1_fx[s] ) );                                                 // q_com
         sumMagnL_fx = BASOP_Util_Add_Mant32Exp( sumMagnL_fx, sumMagnL_e, absMagnL_fx, absMagnL_e, &sumMagnL_e );
         sumMagnR_fx = BASOP_Util_Add_Mant32Exp( sumMagnR_fx, sumMagnR_e, absMagnR_fx, absMagnR_e, &sumMagnR_e );
         sumPrdLR_fx = BASOP_Util_Add_Mant32Exp( sumPrdLR_fx, sumPrdLR_e, Mpy_32_32( absMagnL_fx, absMagnR_fx ), add( absMagnL_e, absMagnR_e ), &sumPrdLR_e );
@@ -930,11 +914,14 @@ static uint16_t enc_ste_pre_mdct(
     temp1 = L_shl( preproLen, x1 );
     corr_fx = Mpy_32_32( corr_fx, temp1 );
     x1 = sub( 62, add( shl( *q_com, 1 ), x1 ) );
-#ifdef FIX_ISSUE_1092
-    corr_fx = BASOP_Util_Add_Mant32Exp( corr_fx, x1, Mpy_32_32( sumL_fx, sumR_fx ), sub( 62, shl( sub( *q_com, 1 ), 1 ) ), &x1 );
-#else
-    corr_fx = BASOP_Util_Add_Mant32Exp( corr_fx, x1, Mpy_32_32( sumL_fx, sumR_fx ), sub( 62, shl( *q_com, 1 ) ), &x1 );
-#endif
+
+    x2 = W_norm( sumL_64fx );
+    sumL_fx = W_extract_h( W_shl( sumL_64fx, x2 ) );
+
+    x3 = W_norm( sumR_64fx );
+    sumR_fx = W_extract_h( W_shl( sumR_64fx, x3 ) );
+
+    corr_fx = BASOP_Util_Add_Mant32Exp( corr_fx, x1, Mpy_32_32( sumL_fx, sumR_fx ), sub( 62, add( sub( add( *q_com, x2 ), 32 ), sub( add( *q_com, x3 ), 32 ) ) ), &x1 );
 
     IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( corr_fx, x1, -maxSqrValue_fx, 52 ), -1 ) )
     {
@@ -979,7 +966,7 @@ static uint16_t enc_ste_pre_mdct(
     ELSE
     {
         Word16 exp1;
-        corr_fx = BASOP_Util_Divide3232_Scale_cadence( Mpy_32_32( corr_fx, corr_fx ), Mpy_32_32( sumL_fx, sumR_fx ), &exp1 );
+        corr_fx = BASOP_Util_Divide3232_Scale_newton( Mpy_32_32( corr_fx, corr_fx ), Mpy_32_32( sumL_fx, sumR_fx ), &exp1 );
         corr_e = add( exp1, sub( shl( corr_e, 1 ), add( sumL_e, sumR_e ) ) );
     }
     test();
@@ -1166,6 +1153,7 @@ void ivas_mdct_core_whitening_enc_fx(
     Word32 scf_fx[CPE_CHANNELS][NB_DIV][M];
     Word32 scf_q_fx[CPE_CHANNELS][NB_DIV][M];
     Word64 chE_fx[2], chE_tot_fx;
+    Word16 chE_q[2];
     Word8 sns_low_br_mode;
     Word16 nbits_start_sns;
     Word16 num_sns;
@@ -1180,7 +1168,6 @@ void ivas_mdct_core_whitening_enc_fx(
 
     push_wmops( "mdct_core_whitening" );
 
-#ifdef MSAN_FIX
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         FOR( i = 0; i < NB_DIV; i++ )
@@ -1194,7 +1181,6 @@ void ivas_mdct_core_whitening_enc_fx(
         set16_fx( orig_spectrum_e[ch], 0, NB_DIV );
     }
     set16_fx( q_windowedSignal, Q31, CPE_CHANNELS );
-#endif
     q_com = Q31;
     q_min = 0;
     move16();
@@ -1234,9 +1220,7 @@ void ivas_mdct_core_whitening_enc_fx(
         orig_spectrum[ch][1] = orig_spectrum_long[ch] + N_TCX10_MAX;
         mdst_spectrum_fx[ch][0] = mdst_spectrum_long_fx[ch];
         mdst_spectrum_fx[ch][1] = mdst_spectrum_long_fx[ch] + N_TCX10_MAX;
-#ifdef MSAN_FIX
         set32_fx( temp_buffer, 0, 15 * L_FRAME48k / 8 );
-#endif
     }
 
     windowedSignal_fx[0] = orig_spectrum_long[0]; /* NOTE temporarily available */
@@ -1279,6 +1263,9 @@ void ivas_mdct_core_whitening_enc_fx(
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         st = sts[ch];
+        init_tcx_enc_info_fx( st, &L_subframe, &L_subframeTCX, &tcx_subframe_coded_lines );
+        st->hTcxEnc->spectrum_length = L_subframeTCX;
+
         IF( GE_16( add( imult1616( hCPE->cpe_id, CPE_CHANNELS ), ch ), nChannels ) )
         {
             CONTINUE;
@@ -1308,16 +1295,17 @@ void ivas_mdct_core_whitening_enc_fx(
             FOR( n = 0; n < nSubframes; n++ )
             {
                 Word16 spect_fx[L_FRAME48k];
-                Word16 q_spectrum, l_frame;
+                Word16 q_spectrum, lshift, l_frame;
                 /*l_frame = (int16_t)(st->input_Fs / FRAMES_PER_SEC); 1 / FRAMES_PER_SEC = 0.2f */
                 l_frame = extract_l( Mpy_32_32( st->input_Fs, 42949673 /* 0.2f in Q31 */ ) );
                 if ( EQ_16( st->core, TCX_10_CORE ) )
                 {
                     l_frame = shr( l_frame, 1 );
                 }
-                q_spectrum = L_norm_arr( st->hTcxEnc->spectrum_fx[n], l_frame );
-                Copy_Scale_sig32_16( st->hTcxEnc->spectrum_fx[n], spect_fx, l_frame, q_spectrum );
-                bw_detect_fx( st, NULL, spect_fx, NULL, NULL, MC_FORMAT /*just cannot be ISM_FORMAT*/, mct_on );
+                lshift = L_norm_arr( st->hTcxEnc->spectrum_fx[n], l_frame );
+                Copy_Scale_sig32_16( st->hTcxEnc->spectrum_fx[n], spect_fx, l_frame, lshift );
+                q_spectrum = sub( add( sub( Q31, st->hTcxEnc->spectrum_e[n] ), lshift ), 16 );
+                bw_detect_fx( st, NULL, spect_fx, NULL, NULL, MC_FORMAT /*just cannot be ISM_FORMAT*/, mct_on, q_spectrum );
 
                 test();
                 if ( EQ_16( nSubframes, NB_DIV ) && n == 0 )
@@ -1401,16 +1389,16 @@ void ivas_mdct_core_whitening_enc_fx(
 
                 q_min = sub( Q31, q_min );
 
-                q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ) );
-                q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ) );
-                q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ) );
+                q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ) );
+                q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ) );
+                q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ) );
 
                 q_com = s_min( Q31, add( q_min, q_com ) );
 
-                Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
-                Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
-                Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) );     // q_com
-                Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) );     // q_com
+                Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
+                Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
+                Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) );     // q_com
+                Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) );     // q_com
 
                 const Word16 switchKernel = /* these 4 transform types can be applied: 0 = MDCT-IV, 1 = MDST-II, 2 = MDCT-II, 3 = MDST-IV */
                     kernel_switch_detect_fx( hTcxEnc0->spectrum_fx[n], hTcxEnc1->spectrum_fx[n], mdst_spectrum_fx[0][n], mdst_spectrum_fx[1][n], q_com, nSampCore / nSubframes,
@@ -1498,11 +1486,11 @@ void ivas_mdct_core_whitening_enc_fx(
             q_min = s_max( mdst_spectrum_e[0][n], hTcxEnc0->spectrum_e[n] );
             q_min = sub( Q31, q_min );
 
-            q_com = s_min( L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ), L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ) );
+            q_com = s_min( L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ), L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/ ) );
             q_com = s_min( Q31, add( q_min, q_com ) );
 
-            Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
-            Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) );     // q_com
+            Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
+            Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /*hTcxEnc0->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) );     // q_com
 
             speech = NULL;
             if ( NE_16( n, 1 ) )
@@ -1510,7 +1498,7 @@ void ivas_mdct_core_whitening_enc_fx(
                 speech = hTcxEnc0->speech_TCX;
             }
             kernel_switch_update_transforms_fx( hTcxEnc0->spectrum_fx[n], mdst_spectrum_fx[0][n], &q_com, hTcxEnc0->transform_type[n], sts[0]->hTcxCfg, sts[0]->bwidth_sw_cnt, hTcxEnc0->kernel_type[n],
-                                                hTcxEnc0->new_speech_TCX, speech, windowedSignal_fx[0] + i_mult( n, L_FRAME48k ), &q_windowedSignal[0], shr( L_subframeTCX, shift ) /*L_subframeTCX / nSubframes*/ );
+                                                hTcxEnc0->new_speech_TCX, speech, sts[0]->q_inp, windowedSignal_fx[0] + i_mult( n, L_FRAME48k ), &q_windowedSignal[0], shr( L_subframeTCX, shift ) /*L_subframeTCX / nSubframes*/ );
             mdst_spectrum_e[0][n] = sub( Q31, q_com );
             hTcxEnc0->spectrum_e[n] = sub( Q31, q_com );
             move16();
@@ -1519,11 +1507,11 @@ void ivas_mdct_core_whitening_enc_fx(
             q_min = s_max( mdst_spectrum_e[1][n], hTcxEnc1->spectrum_e[n] );
             q_min = sub( Q31, q_min );
 
-            q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ), L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ) );
+            q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ), L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/ ) );
             q_com = s_min( Q31, add( q_min, q_com ) );
 
-            Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
-            Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) );     // q_com
+            Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
+            Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /*hTcxEnc1->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) );     // q_com
 
             speech = NULL;
             if ( NE_16( n, 1 ) )
@@ -1531,7 +1519,7 @@ void ivas_mdct_core_whitening_enc_fx(
                 speech = hTcxEnc1->speech_TCX;
             }
             kernel_switch_update_transforms_fx( hTcxEnc1->spectrum_fx[n], mdst_spectrum_fx[1][n], &q_com, hTcxEnc1->transform_type[n], sts[1]->hTcxCfg, sts[1]->bwidth_sw_cnt, hTcxEnc1->kernel_type[n],
-                                                hTcxEnc1->new_speech_TCX, speech, windowedSignal_fx[1] + i_mult( n, L_FRAME48k ), &q_windowedSignal[1], shr( L_subframeTCX, shift ) /*L_subframeTCX / nSubframes*/ );
+                                                hTcxEnc1->new_speech_TCX, speech, sts[1]->q_inp, windowedSignal_fx[1] + i_mult( n, L_FRAME48k ), &q_windowedSignal[1], shr( L_subframeTCX, shift ) /*L_subframeTCX / nSubframes*/ );
             mdst_spectrum_e[1][n] = sub( Q31, q_com );
             hTcxEnc1->spectrum_e[n] = sub( Q31, q_com );
             move16();
@@ -1555,27 +1543,30 @@ void ivas_mdct_core_whitening_enc_fx(
                 }
                 IF( EQ_16( hTcxEnc0->transform_type[n], TCX_5 ) )
                 {
-                    Word16 length;
+                    Word16 length, len_sbfr;
                     const Word16 tcx5SizeFB = sts[1]->hTcxCfg->tcx5SizeFB;
                     move16();
                     /* length = max(nSampCore / (2 * NB_DIV), L_subframeTCX / (2 * NB_DIV),  NB_DIV = 2 */
                     length = shr( s_max( nSampCore, L_subframeTCX ), 2 );
+                    len_sbfr = shr( hTcxEnc0->spectrum_length, shift );
+                    assert( hTcxEnc0->L_frameTCX == hTcxEnc1->L_frameTCX );
                     exp_max = s_max( hTcxEnc0->spectrum_e[n], hTcxEnc1->spectrum_e[n] );
                     exp_max = s_max( exp_max, mdst_spectrum_e[0][n] );
                     exp_max = s_max( exp_max, mdst_spectrum_e[1][n] );
 
                     // calculate the headroom available
-                    exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], length ), L_norm_arr( hTcxEnc0->spectrum_fx[n], length ) );
-                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], length ) );
-                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], length ) );
+                    exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], len_sbfr ), L_norm_arr( hTcxEnc0->spectrum_fx[n], len_sbfr ) );
+                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], len_sbfr ) );
+                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], len_sbfr ) );
 
                     q_com = sub( s_min( Q31, add( sub( Q31, exp_max ), exp_com ) ), 6 ); // 6 guarded bits
+                    q_com = s_max( q_com, 9 );                                           // Keep the Q-factor at least 9 to avoid precision loss inside enc_ste_pre_mdct.
                     exp_com = sub( Q31, q_com );
 
-                    Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( hTcxEnc0->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
-                    Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( hTcxEnc1->spectrum_e[n], exp_com ) ); // hTcxEnc1->spectrum_e
-                    Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[0][n], exp_com ) );     // mdst_spectrum_e
-                    Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[1][n], exp_com ) );     // mdst_spectrum_e
+                    scale_sig32( hTcxEnc0->spectrum_fx[n], len_sbfr /* hTcxEnc0->L_frameTCX/nSubframes */, sub( hTcxEnc0->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
+                    scale_sig32( hTcxEnc1->spectrum_fx[n], len_sbfr /* hTcxEnc1->L_frameTCX/nSubframes */, sub( hTcxEnc1->spectrum_e[n], exp_com ) ); // hTcxEnc1->spectrum_e
+                    scale_sig32( mdst_spectrum_fx[0][n], len_sbfr /* hTcxEnc0->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[0][n], exp_com ) );     // mdst_spectrum_e
+                    scale_sig32( mdst_spectrum_fx[1][n], len_sbfr /* hTcxEnc1->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[1][n], exp_com ) );     // mdst_spectrum_e
 
                     Word16 q_com_orig = q_com;
                     move16();
@@ -1599,17 +1590,18 @@ void ivas_mdct_core_whitening_enc_fx(
                     exp_max = sub( Q31, q_com );
                     move16();
 
-                    exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
-                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
-                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ) );
+                    exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], len_sbfr /* hTcxEnc1->L_frameTCX/nSubframes */ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], len_sbfr /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
+                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], len_sbfr /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
+                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], len_sbfr /* hTcxEnc1->L_frameTCX/nSubframes */ ) );
 
                     q_com = sub( s_min( Q31, add( q_com, exp_com ) ), 6 );
+                    q_com = s_max( q_com, 9 ); // Keep the Q-factor at least 9 to avoid precision loss inside enc_ste_pre_mdct.
                     exp_com = sub( Q31, q_com );
 
-                    Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) ); // exp_max
-                    Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) ); // exp_max
-                    Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) );   // exp_max
-                    Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) );   // exp_max
+                    scale_sig32( hTcxEnc0->spectrum_fx[n], len_sbfr /* hTcxEnc0->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) ); // exp_max
+                    scale_sig32( hTcxEnc1->spectrum_fx[n], len_sbfr /* hTcxEnc1->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) ); // exp_max
+                    scale_sig32( mdst_spectrum_fx[0][n], len_sbfr /* hTcxEnc0->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) );   // exp_max
+                    scale_sig32( mdst_spectrum_fx[1][n], len_sbfr /* hTcxEnc1->L_frameTCX/nSubframes */, sub( exp_max, exp_com ) );   // exp_max
 
                     q_com_orig = q_com;
                     move16();
@@ -1626,10 +1618,14 @@ void ivas_mdct_core_whitening_enc_fx(
                         Scale_sig32( mdst_spectrum_fx[0][n], tcx5SizeFB, scale );   // q_com
                         Scale_sig32( mdst_spectrum_fx[1][n], tcx5SizeFB, scale );   // q_com
 
-                        Scale_sig32( hTcxEnc0->spectrum_fx[n] + offset1, offset2, scale ); // q_com
-                        Scale_sig32( hTcxEnc1->spectrum_fx[n] + offset1, offset2, scale ); // q_com
-                        Scale_sig32( mdst_spectrum_fx[0][n] + offset1, offset2, scale );   // q_com
-                        Scale_sig32( mdst_spectrum_fx[1][n] + offset1, offset2, scale );   // q_com
+                        offset2 = sub( idiv1616( hTcxEnc0->L_frameTCX, nSubframes ), offset1 );
+                        IF( offset2 > 0 )
+                        {
+                            Scale_sig32( hTcxEnc0->spectrum_fx[n] + offset1, offset2, scale ); // q_com
+                            Scale_sig32( hTcxEnc1->spectrum_fx[n] + offset1, offset2, scale ); // q_com
+                            Scale_sig32( mdst_spectrum_fx[0][n] + offset1, offset2, scale );   // q_com
+                            Scale_sig32( mdst_spectrum_fx[1][n] + offset1, offset2, scale );   // q_com
+                        }
                     }
                     mdst_spectrum_e[0][n] = sub( Q31, q_com );
                     hTcxEnc0->spectrum_e[n] = sub( Q31, q_com );
@@ -1644,22 +1640,22 @@ void ivas_mdct_core_whitening_enc_fx(
                 {
                     Word16 length;
                     length = shr( s_max( nSampCore, L_subframeTCX ), shift ); // max(/* nSampCore/nSubframes, L_subframeTCX/nSubframes) */
-                    Word16 offset2 = sub( shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, length );
+                    Word16 offset2 = sub( shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, length );
                     exp_max = s_max( hTcxEnc0->spectrum_e[n], hTcxEnc1->spectrum_e[n] );
                     exp_max = s_max( exp_max, mdst_spectrum_e[0][n] );
                     exp_max = s_max( exp_max, mdst_spectrum_e[1][n] );
 
-                    exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
-                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
-                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ) );
+                    exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
+                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
+                    exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ) );
 
                     q_com = sub( s_min( Q31, add( sub( Q31, exp_max ), exp_com ) ), 6 );
                     exp_com = sub( Q31, q_com );
 
-                    Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( hTcxEnc0->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
-                    Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( hTcxEnc1->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
-                    Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[0][n], exp_com ) );     // mdst_spectrum_e
-                    Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[1][n], exp_com ) );     // mdst_spectrum_e
+                    Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( hTcxEnc0->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
+                    Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( hTcxEnc1->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
+                    Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[0][n], exp_com ) );     // mdst_spectrum_e
+                    Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[1][n], exp_com ) );     // mdst_spectrum_e
 
                     Word16 q_com_orig = q_com;
                     move16();
@@ -1744,12 +1740,12 @@ void ivas_mdct_core_whitening_enc_fx(
 
                 q_min = s_max( mdst_spectrum_e[ch][n], hTcxEncCh->spectrum_e[n] );
                 q_min = sub( Q31, q_min );
-                q_com = s_min( L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->L_frameTCX, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/ ), L_norm_arr( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->L_frameTCX, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/ ) );
+                q_com = s_min( L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->spectrum_length, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/ ), L_norm_arr( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->spectrum_length, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/ ) );
 
                 q_com = s_min( Q31, add( q_min, q_com ) );
 
-                Scale_sig32( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->L_frameTCX, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEncCh->spectrum_e[n] ) ) ); // q_com
-                Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->L_frameTCX, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) );     // q_com
+                Scale_sig32( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->spectrum_length, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEncCh->spectrum_e[n] ) ) ); // q_com
+                Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->spectrum_length, shift ) /*hTcxEncCh->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) );     // q_com
 
                 speech = hTcxEncCh->speech_TCX;
                 if ( n != 0 )
@@ -1757,7 +1753,7 @@ void ivas_mdct_core_whitening_enc_fx(
                     speech = NULL;
                 }
                 kernel_switch_update_transforms_fx( hTcxEncCh->spectrum_fx[n], mdst_spectrum_fx[ch][n], &q_com, hTcxEncCh->transform_type[n], sts[ch]->hTcxCfg, sts[ch]->bwidth_sw_cnt, hTcxEncCh->kernel_type[n],
-                                                    hTcxEncCh->new_speech_TCX, speech, windowedSignal_fx[ch] + i_mult( n, L_FRAME48k ), &q_windowedSignal[ch], shr( L_subframeTCX, shift ) /*L_subframeTCX / nSubframes*/ );
+                                                    hTcxEncCh->new_speech_TCX, speech, sts[ch]->q_inp, windowedSignal_fx[ch] + i_mult( n, L_FRAME48k ), &q_windowedSignal[ch], shr( L_subframeTCX, shift ) /*L_subframeTCX / nSubframes*/ );
                 mdst_spectrum_e[ch][n] = sub( Q31, q_com );
                 move16();
                 hTcxEncCh->spectrum_e[n] = sub( Q31, q_com );
@@ -1789,7 +1785,7 @@ void ivas_mdct_core_whitening_enc_fx(
         FOR( n = 0; n < nSubframes; n++ )
         {
             q_min = s_max( q_min, hTcxEnc->spectrum_e[n] );
-            q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
+            q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
         }
     }
     q_min = sub( Q31, q_min );
@@ -1811,7 +1807,7 @@ void ivas_mdct_core_whitening_enc_fx(
         }
         FOR( n = 0; n < nSubframes; n++ )
         {
-            Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
+            Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
             hTcxEnc->spectrum_e[n] = sub( Q31, q_com );
             move16();
         }
@@ -1845,8 +1841,8 @@ void ivas_mdct_core_whitening_enc_fx(
             q_min = s_max( q_min, hTcxEnc->spectrum_e[n] );
             q_min = s_max( q_min, mdst_spectrum_e[ch][n] );
 
-            q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
-            q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
+            q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
+            q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
         }
     }
     q_min = sub( Q31, q_min );
@@ -1869,8 +1865,8 @@ void ivas_mdct_core_whitening_enc_fx(
         }
         FOR( n = 0; n < nSubframes; n++ )
         {
-            Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
-            Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) ); // q_com
+            Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
+            Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) ); // q_com
             hTcxEnc->spectrum_e[n] = sub( Q31, q_com );
             move16();
             mdst_spectrum_e[ch][n] = sub( Q31, q_com );
@@ -1899,6 +1895,7 @@ void ivas_mdct_core_whitening_enc_fx(
         IF( mct_on )
         {
             set64_fx( chE_fx, 0, NB_DIV );
+            set16_fx( chE_q, 0, NB_DIV );
         }
 
         init_tcx_enc_info_fx( st, &L_subframe, &L_subframeTCX, &tcx_subframe_coded_lines );
@@ -1916,7 +1913,6 @@ void ivas_mdct_core_whitening_enc_fx(
         tcx_subframe_coded_lines = shr( tcx_subframe_coded_lines, shift );         /*tcx_subframe_coded_lines / nSubframes*/
         Word16 q_pow = 62, q_pow_tmp = sub( 63, shl( mdst_spectrum_e[0][0], 1 ) ); // add( shl( sub( Q31, mdst_spectrum_e[0][0] ), 1 ), 1 );
         move16();
-
         FOR( n = 0; n < nSubframes; n++ )
         {
             IF( st->hTcxEnc->fUseTns[n] )
@@ -1925,34 +1921,19 @@ void ivas_mdct_core_whitening_enc_fx(
                 {
                     powerSpec_fx64[i] = W_mult_32_32( st->hTcxEnc->spectrum_fx[n][i], st->hTcxEnc->spectrum_fx[n][i] );
                     move64();
-                    IF( powerSpec_fx64[i] == 0 )
-                    {
-                        q_pow = s_min( q_pow, 62 );
-                    }
-                    ELSE
-
-                    {
-                        q_pow = s_min( q_pow, W_norm( powerSpec_fx64[i] ) );
-                    }
                 }
+                q_pow = W_norm_arr( powerSpec_fx64, L_subframeTCX );
             }
             ELSE
             {
                 FOR( i = 0; i < L_subframeTCX; i++ )
                 {
-                    powerSpec_fx64[i] = W_add( W_mult_32_32( mdst_spectrum_fx[ch][n][i], mdst_spectrum_fx[ch][n][i] ), W_mult_32_32( st->hTcxEnc->spectrum_fx[n][i], st->hTcxEnc->spectrum_fx[n][i] ) );
+                    powerSpec_fx64[i] = W_mac_32_32( W_mult_32_32( mdst_spectrum_fx[ch][n][i], mdst_spectrum_fx[ch][n][i] ), st->hTcxEnc->spectrum_fx[n][i], st->hTcxEnc->spectrum_fx[n][i] );
                     move64();
-                    IF( powerSpec_fx64[i] == 0 )
-                    {
-                        q_pow = s_min( q_pow, 62 );
-                    }
-                    ELSE
-
-                    {
-                        q_pow = s_min( q_pow, W_norm( powerSpec_fx64[i] ) );
-                    }
                 }
+                q_pow = W_norm_arr( powerSpec_fx64, L_subframeTCX );
             }
+
             FOR( i = 0; i < L_subframeTCX; i++ )
             {
                 powerSpec_fx64[i] = W_shl( powerSpec_fx64[i], q_pow );
@@ -1967,6 +1948,8 @@ void ivas_mdct_core_whitening_enc_fx(
                     chE_fx[n] = W_add( W_deposit32_l( powerSpec_fx[i] ), chE_fx[n] );
                     move64();
                 }
+                chE_q[n] = sub( add( q_pow_tmp, q_pow ), 32 );
+                move16();
             }
             sns_compute_scf_fx( powerSpec_fx, st->hTcxCfg->psychParamsCurrent, st->L_frame, scf_fx[ch][n], sub( add( q_pow_tmp, q_pow ), 32 ) );
         }
@@ -1974,14 +1957,14 @@ void ivas_mdct_core_whitening_enc_fx(
         /* MCT: detect whether there are silent channels and set mct_chan_mode accordingly */
         IF( mct_on )
         {
-            Word16 q = sub( add( q_pow_tmp, q_pow ), 32 );
+            Word16 q = s_min( chE_q[0], chE_q[1] );
             Word64 silent_thr = SILENT_CHANNEL_THRES_FX;
             move64();
             chE_tot_fx = 0;
             move64();
             FOR( i = 0; i < NB_DIV; i++ )
             {
-                chE_tot_fx = W_add( chE_fx[i], chE_tot_fx );
+                chE_tot_fx = W_add( W_shr( chE_fx[i], sub( chE_q[i], q ) ), chE_tot_fx );
             }
             IF( GT_16( q, Q24 ) )
             {
@@ -2102,8 +2085,13 @@ void ivas_mdct_core_whitening_enc_fx(
             st->hTcxEnc->spectrum_e[n] = sub( st->hTcxEnc->spectrum_e[n], q_com );
             move16();
 
+            Word16 exp_tmp = st->hTcxEnc->spectrum_e[n];
+            move16();
+
             /* Shape spectrum */
             ShapeSpectrum_ivas_fx( st->hTcxCfg, A_q_fx[ch][n], NULL, NULL, L_subframe, tcx_subframe_coded_lines, st->hTcxEnc->spectrum_fx[n], &st->hTcxEnc->spectrum_e[n], st->hTcxEnc->fUseTns[n], st, scf_q_fx[ch][n] );
+
+            Scale_sig32( st->hTcxEnc->spectrum_fx[n] + L_subframe, sub( L_subframeTCX, L_subframe ), sub( exp_tmp, st->hTcxEnc->spectrum_e[n] ) );
         }
     }
     /*--------------------------------------------------------------*
@@ -2165,7 +2153,7 @@ void ivas_mdct_core_whitening_enc_fx(
         {
             q_min = s_max( q_min, hTcxEnc->spectrum_e[n] );
 
-            q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
+            q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/ ) );
         }
     }
     q_min = sub( Q31, q_min );
@@ -2189,7 +2177,7 @@ void ivas_mdct_core_whitening_enc_fx(
 
         FOR( n = 0; n < nSubframes; n++ )
         {
-            Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( 31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
+            Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /*hTcxEnc->L_frameTCX / nSubframes*/, sub( q_com, sub( 31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
             hTcxEnc->spectrum_e[n] = sub( 31, q_com );
             move16();
         }
@@ -2237,8 +2225,13 @@ void ivas_mdct_core_whitening_enc_fx(
                 mdst_spectrum_e[ch][n] = sub( mdst_spectrum_e[ch][n], q_com );
                 move16();
 
+                Word16 exp_tmp = mdst_spectrum_e[ch][n];
+                move16();
+
                 /* Shape spectrum */
                 ShapeSpectrum_ivas_fx( st->hTcxCfg, A_q_fx[ch][n], NULL, NULL, L_subframe, tcx_subframe_coded_lines, mdst_spectrum_fx[ch][n], &mdst_spectrum_e[ch][n], st->hTcxEnc->fUseTns[n], st, scf_q_fx[ch][n] );
+
+                Scale_sig32( mdst_spectrum_fx[ch][n] + L_subframe, sub( L_subframeTCX, L_subframe ), sub( exp_tmp, mdst_spectrum_e[ch][n] ) );
             }
         }
     }
@@ -2541,7 +2534,7 @@ void ivas_mdct_quant_coder_fx(
         {
             ignore_chan[ch] = 1;
             move16();
-            continue;
+            CONTINUE;
         }
 
         IF( EQ_16( st->hTcxEnc->tcxMode, TCX_20 ) )
@@ -2613,7 +2606,7 @@ void ivas_mdct_quant_coder_fx(
 
         IF( EQ_16( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
         {
-            continue;
+            CONTINUE;
         }
 
         FOR( n = 0; n < nSubframes; n++ )
@@ -2644,7 +2637,7 @@ void ivas_mdct_quant_coder_fx(
 
         IF( EQ_16( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
         {
-            continue;
+            CONTINUE;
         }
 
         FOR( n = 0; n < nSubframes; n++ )
@@ -2656,6 +2649,11 @@ void ivas_mdct_quant_coder_fx(
             st->hTcxEnc->spectrum_e[n] = min_shift;
             move16();
         }
+        if ( GT_16( nSubframes, 1 ) )
+        {
+            st->hTcxEnc->spectrum_long_e = min_shift;
+            move16();
+        }
     }
 
     EstimateStereoTCXNoiseLevel_fx( sts, quantized_spectrum_fx, gain_tcx_fx, gain_tcx_e, L_frame, noiseFillingBorder, hm_active, ignore_chan, fac_ns_fx, param_core, MCT_flag );
@@ -2723,9 +2721,9 @@ void ivas_mdct_quant_coder_fx(
          * Generate Bitstream
          *---------------------------------------------------------------*/
 
-        if ( EQ_16( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
+        IF( EQ_16( st->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
         {
-            continue;
+            CONTINUE;
         }
         nbits_start = st->hBstr->nb_bits_tot;
         move16();
diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_omasa_enc.c
rename to lib_enc/ivas_omasa_enc_fx.c
index a9ebf8ec3bc278e472a912fd03cf1d92ba509ab1..b5b592582a9c6b4e129bd4ea6c846ed67c013d69 100644
--- a/lib_enc/ivas_omasa_enc.c
+++ b/lib_enc/ivas_omasa_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include <assert.h>
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_enc.h"
@@ -126,7 +124,7 @@ ivas_error ivas_omasa_enc_open_fx(
     move16();
     FOR( i = 0; i < hOMasa->num_Cldfb_instances; i++ )
     {
-        IF( ( error = openCldfb_ivas_enc( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, st_ivas->hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK )
+        IF( ( error = openCldfb_ivas_fx( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, st_ivas->hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS, ENC ) ) != IVAS_ERR_OK )
         {
             return error;
         }
@@ -229,7 +227,7 @@ void ivas_omasa_enc_close_fx(
 
     FOR( i = 0; i < ( *hOMasa )->num_Cldfb_instances; i++ )
     {
-        deleteCldfb_ivas( &( ( *hOMasa )->cldfbAnaEnc[i] ) );
+        deleteCldfb_ivas_fx( &( ( *hOMasa )->cldfbAnaEnc[i] ) );
     }
 
     FOR( i = 0; i < DIRAC_NUM_DIMS; i++ )
@@ -338,11 +336,11 @@ ivas_error ivas_omasa_enc_config_fx(
         /* re-write IVAS format signalling - actual 'ism_mode' was not known before */
         IF( st_ivas->nSCE > 0 )
         {
-            reset_indices_enc( st_ivas->hSCE[0]->hCoreCoder[0]->hBstr, st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot );
+            reset_indices_enc_fx( st_ivas->hSCE[0]->hCoreCoder[0]->hBstr, st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot );
         }
         ELSE
         {
-            reset_indices_enc( st_ivas->hCPE[0]->hCoreCoder[0]->hBstr, st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->nb_bits_tot );
+            reset_indices_enc_fx( st_ivas->hCPE[0]->hCoreCoder[0]->hBstr, st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->nb_bits_tot );
         }
 
         ivas_write_format_fx( st_ivas );
@@ -1052,10 +1050,8 @@ static void ivas_omasa_param_est_enc_fx(
     move16();
 
     /* Need to initialize renormalization_factors, and variables to be normalized */
-#ifdef MSAN_FIX
     set_zero_fx( &Foa_RealBuffer_fx[0][0], FOA_CHANNELS * CLDFB_NO_CHANNELS_MAX );
     set_zero_fx( &Foa_ImagBuffer_fx[0][0], FOA_CHANNELS * CLDFB_NO_CHANNELS_MAX );
-#endif
 
     set_zero_fx( renormalization_factor_diff_fx, hOMasa->nbands );
     set_zero_fx( diffuseness_m_fx, hOMasa->nbands );
@@ -1116,11 +1112,6 @@ static void ivas_omasa_param_est_enc_fx(
             {
                 q = q_data;
                 move16();
-#if 0
-                scale_sig32( hOMasa->cldfbAnaEnc[i]->cldfb_state_fx, hOMasa->cldfbAnaEnc[i]->cldfb_state_length, sub( q, hOMasa->cldfbAnaEnc[i]->Q_cldfb_state ) );
-                hOMasa->cldfbAnaEnc[i]->Q_cldfb_state = q;
-                move16();
-#endif
                 cldfbAnalysis_ts_fx_var_q( &( data[i][l_ts * ts] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &q ); /*q_data-5*/
                 norm_buff = s_min( norm_buff, L_norm_arr( Chnl_RealBuffer_fx[i], 60 ) );
                 norm_buff = s_min( norm_buff, L_norm_arr( Chnl_ImagBuffer_fx[i], 60 ) );
@@ -1203,12 +1194,8 @@ static void ivas_omasa_param_est_enc_fx(
             computeIntensityVector_enc_fx( hOMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, num_freq_bands, intensity_real_fx, guard_bits );
             intensity_real_e = sub( add( 62, guard_bits ), shl( q, 1 ) );
 
-            computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], intensity_real_e
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-                                           ,
-                                           NULL
-#endif
-            );
+            computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], intensity_real_e,
+                                           NULL );
 
             /* Power estimation for diffuseness */
 
diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc_fx.c
similarity index 94%
rename from lib_enc/ivas_osba_enc.c
rename to lib_enc/ivas_osba_enc_fx.c
index 9d7c92dd092af32dd24a5726fb402d117eb5b317..dbff29d68514b1e32c846e9963c1c03c3386dc38 100644
--- a/lib_enc/ivas_osba_enc.c
+++ b/lib_enc/ivas_osba_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,13 +35,11 @@
 #include <assert.h>
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_enc.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------------
@@ -79,11 +77,7 @@ static void ivas_merge_sba_transports_fx(
     {
         FOR( j = 0; j < input_frame; j++ )
         {
-#ifdef NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS
             data_out_f[i][j] = L_shr( L_add( L_shr( data_in_f1[i][j], 1 ), L_shr( data_in_f2[i][j], sub( Q_f2, sub( Q_f1, 1 ) ) ) ), Q1 );
-#else
-            data_out_f[i][j] = L_add( L_shr( data_in_f1[i][j], 1 ), L_shr( data_in_f2[i][j], sub( Q_f2, sub( Q_f1, 1 ) ) ) );
-#endif
             move32();
         }
     }
@@ -114,7 +108,7 @@ ivas_error ivas_osba_enc_open_fx(
     {
         set_val_Word32( hOSba->prev_object_dm_gains_fx[i], INV_SQRT_2_Q30, MAX_INPUT_CHANNELS );
     }
-    len = NS2SA( st_ivas->hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS );
+    len = NS2SA_FX2( st_ivas->hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS );
     move16();
     FOR( i = 0; i < st_ivas->hEncoderConfig->nchan_ism; i++ )
     {
@@ -301,7 +295,7 @@ ivas_error ivas_osba_enc_reconfig(
             }
         }
 
-        ivas_spar_config_fx( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 );
+        ivas_spar_config_fx( ivas_total_brate, s_min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 );
 
         hSpar = st_ivas->hSpar;
 
@@ -421,7 +415,7 @@ void ivas_osba_enc_fx(
     Word16 Q_out = *q_data;
     move16();
     Word16 n, delay_s;
-    delay_s = NS2SA( input_Fs, IVAS_FB_ENC_DELAY_NS );
+    delay_s = NS2SA_FX2( input_Fs, IVAS_FB_ENC_DELAY_NS );
     IF( ism_mode == ISM_MODE_NONE )
     {
         /*keep the delay buffer up to date*/
@@ -448,7 +442,7 @@ void ivas_osba_enc_fx(
         /* delay ISM input channels to match the SBA encoder delay */
         FOR( n = 0; n < nchan_ism; n++ )
         {
-            delay_signal_fx( data_in_fx[n], input_frame, hOSba->input_data_mem_fx[n], delay_s );
+            delay_signal32_fx( data_in_fx[n], input_frame, hOSba->input_data_mem_fx[n], delay_s );
 
             azimuth_fx = extract_l( L_shr( L_add( hIsmMeta[n]->azimuth_fx, 2097152 /*0.5.Q22*/ ), Q22 ) );     // Q0
             elevation_fx = extract_l( L_shr( L_add( hIsmMeta[n]->elevation_fx, 2097152 /*0.5.Q22*/ ), Q22 ) ); // Q0
@@ -481,9 +475,6 @@ static void ivas_osba_render_ism_to_sba_fx(
     Word16 azimuth_fx, elevation_fx;
     Word32 gains_fx[MAX_INPUT_CHANNELS];
     Word32 g1_fx, g2_fx;
-#ifndef NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS
-    Word32 output_gain_fx;
-#endif
     Word16 nchan_sba;
     nchan_sba = imult1616( add( sba_analysis_order, 1 ), add( sba_analysis_order, 1 ) );
 
@@ -526,21 +517,6 @@ static void ivas_osba_render_ism_to_sba_fx(
     }
     *Q_data = sub( *Q_data, 2 );
 
-#ifndef NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS
-    /* Gain with loudness-matching gains */
-    // output_gain = 0.7499f;
-    output_gain_fx = 1610397988; // 0.7499f in Q31
-    move32();
-    FOR( j = 0; j < nchan_sba; j++ )
-    {
-        FOR( k = 0; k < input_frame; k++ )
-        {
-            //  data_out_f[j][k] *= output_gain;
-            data_out_fx[j][k] = Mpy_32_32( data_out_fx[j][k], output_gain_fx );
-            move32();
-        }
-    }
-#endif
 
     return;
 }
diff --git a/lib_enc/ivas_pca_enc.c b/lib_enc/ivas_pca_enc_fx.c
similarity index 99%
rename from lib_enc/ivas_pca_enc.c
rename to lib_enc/ivas_pca_enc_fx.c
index 4e133567c762b3b113274d78ffc6dfe50e2724e1..2cb347a026794ad3e32d70cad242c81d02731e86 100644
--- a/lib_enc/ivas_pca_enc.c
+++ b/lib_enc/ivas_pca_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,14 +32,12 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include <math.h>
 #include <assert.h>
 #include "wmc_auto.h"
 
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_qmetadata_enc.c
rename to lib_enc/ivas_qmetadata_enc_fx.c
index 00b62f2f6d07e86fe3432dfd0f3df07229fe2c28..744d2c067bf79501c4e4df2da97931e18b79958d 100644
--- a/lib_enc/ivas_qmetadata_enc.c
+++ b/lib_enc/ivas_qmetadata_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,12 @@
 #include "options.h"
 #include <math.h>
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_enc.h"
 #include "wmc_auto.h"
-#include "prot.h"
 
-#include "prot_fx.h"
 #include "basop_util.h"
 #include "ivas_rom_com_fx.h"
 
@@ -162,7 +159,7 @@ static Word16 encode_coherence_indexesDCT1_fx(
     BSTR_ENC_HANDLE hMetaData /* i  : metadata handle      */
 );
 
-static UWord64 create_combined_index_fx( uint16_t *idx_dct, const Word16 len, const Word16 *no_cb_vec );
+static UWord64 create_combined_index_fx( UWord16 *idx_dct, const Word16 len, const Word16 *no_cb_vec );
 
 static Word16 encode_surround_coherence_fx(
     IVAS_QMETADATA *hQMetaData, /* i  : quantized metadata            */
@@ -186,7 +183,7 @@ static void ivas_diffuseness_huff_ec_prepare_fx(
     UWord16 *avr_idx,
     Word16 *diffuseness_bits_huff );
 
-static Word16 coherence_coding_length( const uint16_t *idx_sur_coh_shift, const UWord8 idx_shift_len, const Word16 coding_subbands, const Word16 *no_cv, uint16_t *mr_idx, Word16 *no_cv_shift, Word16 *p_min_idx, Word16 *GR_ord, Word16 *nbits_fr, Word16 *nbits_fr1 );
+static Word16 coherence_coding_length( const UWord16 *idx_sur_coh_shift, const UWord8 idx_shift_len, const Word16 coding_subbands, const Word16 *no_cv, UWord16 *mr_idx, Word16 *no_cv_shift, Word16 *p_min_idx, Word16 *GR_ord, Word16 *nbits_fr, Word16 *nbits_fr1 );
 
 static Word16 write_2dir_info( BSTR_ENC_HANDLE hMetaData, UWord8 *twoDirBands, const Word16 n, const Word16 k );
 
@@ -1072,8 +1069,12 @@ void ivas_qmetadata_enc_sid_encode_fx(
         {
             /*compute the average direction */
             ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[b].azimuth_fx[m], q_direction->band_data[b].elevation_fx[m], direction_vector_fx );
-            scale_sig32( direction_vector_fx, 3, Q22 - Q30 );                                           // Q30 -> Q22
+            scale_sig32( direction_vector_fx, 3, Q22 - Q30 ); // Q30 -> Q22
+#ifdef VEC_ARITH_OPT_v1
+            v_add_fixed_no_hdrm( avg_direction_vector_fx, direction_vector_fx, avg_direction_vector_fx, 3 ); // Q22
+#else                                                                                                        /* VEC_ARITH_OPT_v1 */
             v_add_fixed( avg_direction_vector_fx, direction_vector_fx, avg_direction_vector_fx, 3, 0 ); // Q22
+#endif                                                                                                       /* VEC_ARITH_OPT_v1 */
         }
 
         ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector_fx, Q22, &avg_azimuth_fx[b], &avg_elevation_fx[b] );
@@ -1212,7 +1213,7 @@ void reset_metadata_spatial_fx(
         ELSE
         {
             /*Reset metadata*/
-            reset_indices_enc( hMetaData, hMetaData->nb_ind_tot );
+            reset_indices_enc_fx( hMetaData, hMetaData->nb_ind_tot );
         }
 
         *total_brate = element_brate;
@@ -1335,12 +1336,12 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512_fx(
                     ratioSum = L_add( hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k], hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] );
                     IF( GT_32( ratioSum, ONE_IN_Q30 /*1.0f*/ ) )
                     {
-                        hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_cadence( hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k], ratioSum, &div_e );
+                        hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_newton( hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k], ratioSum, &div_e );
                         hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k] = L_shl( hQMetaData->q_direction[0].band_data[j].energy_ratio_fx[k], sub( div_e, 1 ) );
                         move32();
                         move32();
 
-                        hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_cadence( hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k], ratioSum, &div_e );
+                        hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_newton( hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k], ratioSum, &div_e );
                         hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] = L_shl( hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k], sub( div_e, 1 ) );
                         move32();
                         move32();
@@ -1388,12 +1389,12 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512_fx(
 
                     IF( GT_32( ratioSum, ONE_IN_Q30 /*1.0f*/ ) )
                     {
-                        hQMetaData->q_direction[0].band_data[pos_2dir_band[j]].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_cadence( hQMetaData->q_direction[0].band_data[pos_2dir_band[j]].energy_ratio_fx[k], ratioSum, &div_e );
+                        hQMetaData->q_direction[0].band_data[pos_2dir_band[j]].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_newton( hQMetaData->q_direction[0].band_data[pos_2dir_band[j]].energy_ratio_fx[k], ratioSum, &div_e );
                         hQMetaData->q_direction[0].band_data[pos_2dir_band[j]].energy_ratio_fx[k] = L_shl( hQMetaData->q_direction[0].band_data[pos_2dir_band[j]].energy_ratio_fx[k], sub( div_e, 1 ) );
                         move32();
                         move32();
 
-                        hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_cadence( hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k], ratioSum, &div_e );
+                        hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] = BASOP_Util_Divide3232_Scale_newton( hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k], ratioSum, &div_e );
                         hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k] = L_shl( hQMetaData->q_direction[1].band_data[j].energy_ratio_fx[k], sub( div_e, 1 ) );
                         move32();
                         move32();
@@ -2328,7 +2329,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
     move16();
     UWord16 dist_elevation_indexes_best[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_MAXIMUM_CODING_SUBBANDS];
     Word16 gr_param_azimuth_best, avg_azimuth_index_best;
-    uint16_t dist_azimuth_indexes_best[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_MAXIMUM_CODING_SUBBANDS];
+    UWord16 dist_azimuth_indexes_best[MAX_PARAM_SPATIAL_SUBFRAMES * MASA_MAXIMUM_CODING_SUBBANDS];
 
     UWord16 idx, dist_count;
     Word16 direction_bits_ec;
@@ -2405,7 +2406,11 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
                 /*compute the average direction */
                 ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector );
                 scale_sig32( direction_vector, 3, -8 ); // Q30 -> Q22
+#ifdef VEC_ARITH_OPT_v1
+                v_add_fixed_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
+#else  /* VEC_ARITH_OPT_v1 */
                 v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
             }
         }
     }
@@ -2503,7 +2508,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
             }
             ELSE
             {
-                avg_elevation_index = u_extract_l( UL_addNsD( avg_elevation_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_elevation_offset ) ) );
+                avg_elevation_index = (UWord16) L_add( avg_elevation_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_elevation_offset ) );
             }
             // avg_elevation_index = (uint16_t) ( ( avg_elevation_index + avg_elevation_alphabet ) % avg_elevation_alphabet );
             avg_elevation_index = u_extract_l( UL_addNsD( avg_elevation_index, avg_elevation_alphabet ) % avg_elevation_alphabet );
@@ -2638,8 +2643,8 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
     FOR( avg_azimuth_offset = 0; avg_azimuth_offset < q_direction->cfg.search_effort; avg_azimuth_offset++ )
     {
         set_zero_fx( avg_direction_vector, 3 );
-        avg_azimuth_index = (UWord16) add( avg_azimuth_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_azimuth_offset ) );
-        avg_azimuth_index = (UWord16) ( add( avg_azimuth_index, avg_azimuth_alphabet ) % avg_azimuth_alphabet );
+        avg_azimuth_index = (UWord16) L_add( avg_azimuth_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_azimuth_offset ) );
+        avg_azimuth_index = (UWord16) ( L_add( avg_azimuth_index, avg_azimuth_alphabet ) % avg_azimuth_alphabet );
         all_zero_dist_azimuth_indexes = 1;
         move16();
         azimuth_bits_ec = ivas_qmetadata_encode_quasi_uniform_length_fx( ivas_qmetadata_reorder_generic_fx( sub( avg_azimuth_index, shr( avg_azimuth_alphabet, 1 ) ) ), avg_azimuth_alphabet );
@@ -2668,7 +2673,11 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
 
                             IF( LT_16( idx, 4 ) )
                             {
+#ifdef VEC_ARITH_OPT_v1
+                                v_add_fixed_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
+#else  /* VEC_ARITH_OPT_v1 */
                                 v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                             }
                         }
                         /* project the quantized average azimuth angle to the same grid as the current sample */
@@ -2699,7 +2708,11 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
                         ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector );
                         scale_sig32( direction_vector, 3, -8 ); // Q30 -> Q22
 
+#ifdef VEC_ARITH_OPT_v1
+                        v_add_fixed_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
+#else  /* VEC_ARITH_OPT_v1 */
                         v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                         ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q22, &avg_azimuth, &avg_elevation );
 
                         avg_azimuth_index_upd = quantize_phi_enc_fx( L_add( avg_azimuth, 180 << Q22 ), 0, &avg_azimuth, avg_azimuth_alphabet );
@@ -4082,7 +4095,8 @@ static ivas_error requantize_direction_EC_3_fx(
 
                 IF( LE_16( allowed_bits, add( no_subframes, 1 ) ) )
                 {
-                    FOR( k = 0; k < min( no_subframes, allowed_bits ); k++ )
+                    Word16 len = s_min( no_subframes, allowed_bits );
+                    FOR( k = 0; k < len; k++ )
                     {
                         push_next_indice( hMetaData, q_direction->band_data[j].azimuth_index[k], 1 );
                     }
@@ -5445,7 +5459,7 @@ static Word16 encode_surround_coherence_hr_fx(
                     }
                     ELSE
                     {
-                        no_idx16 = shr_r( nbits_fr, 4 );
+                        no_idx16 = add( shr( nbits_fr, 4 ), 1 );
                     }
 
                     /* write combined index */
@@ -5467,7 +5481,7 @@ static Word16 encode_surround_coherence_hr_fx(
                         }
                         ELSE
                         {
-                            no_idx16 = shr_r( nbits_fr1, 4 );
+                            no_idx16 = add( shr( nbits_fr1, 4 ), 1 );
                         }
 
                         assert( no_idx16 <= 4 );
@@ -6621,7 +6635,7 @@ void ivas_omasa_encode_masa_to_total_fx(
     {
         j = imult1616( k, len_stream );
         /* quantize with fixed common step */
-        L_tmp = BASOP_Util_Divide3232_Scale_cadence( dct_data[j], step, &tmp_e );
+        L_tmp = BASOP_Util_Divide3232_Scale_newton( dct_data[j], step, &tmp_e );
         tmp_e = add( tmp_e, Q6 );
         q_idx[j] = rint_new_fx( L_shr( L_tmp, sub( 15, tmp_e ) ) /* Q16 */ ); // Q0
         move16();
@@ -6644,7 +6658,7 @@ void ivas_omasa_encode_masa_to_total_fx(
         {
             FOR( i = 1; i < len_stream; i++ )
             {
-                L_tmp = BASOP_Util_Divide3232_Scale_cadence( dct_data[j + i], step, &tmp_e );
+                L_tmp = BASOP_Util_Divide3232_Scale_newton( dct_data[j + i], step, &tmp_e );
                 tmp_e = add( tmp_e, Q6 );
                 q_idx[j + i] = rint_new_fx( L_shr( L_tmp, sub( 15, tmp_e ) ) );
                 move16();
diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc_fx.c
similarity index 99%
rename from lib_enc/ivas_qspherical_enc.c
rename to lib_enc/ivas_qspherical_enc_fx.c
index 4bf3650e60d7be1cd50da97914d95849eef64d1d..2e7a289f9d38d51dbe634700f0ff7dd66ee23b17 100644
--- a/lib_enc/ivas_qspherical_enc.c
+++ b/lib_enc/ivas_qspherical_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,11 +35,9 @@
 #include "options.h"
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_enc.h"
 #include "wmc_auto.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
diff --git a/lib_enc/ivas_range_uni_enc.c b/lib_enc/ivas_range_uni_enc_fx.c
similarity index 93%
rename from lib_enc/ivas_range_uni_enc.c
rename to lib_enc/ivas_range_uni_enc_fx.c
index 5bb5118a102040eff4a9a324e90fc71dcfb6b9f4..6c322a3d953bfa19abc3df4d0196203117d76867 100644
--- a/lib_enc/ivas_range_uni_enc.c
+++ b/lib_enc/ivas_range_uni_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,14 +31,14 @@
 *******************************************************************************************************/
 
 #include <assert.h>
-#include "ivas_prot.h"
+#include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_stat_enc.h"
 #include "cnst.h"
 #include "rom_com.h"
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 
 
@@ -55,15 +55,15 @@
  * Local function prototypes
  *-------------------------------------------------------------------*/
 
-static void rc_uni_enc_shift( RangeUniEncState *rc_st_enc );
+static void rc_uni_enc_shift_fx( RangeUniEncState *rc_st_enc );
 
 
 /*-------------------------------------------------------------------*
- * rc_uni_enc_init()
+ * rc_uni_enc_init_fx()
  *
  * Initalize the range encoder
  *-------------------------------------------------------------------*/
-void rc_uni_enc_init(
+void rc_uni_enc_init_fx(
     RangeUniEncState *rc_st_enc /* i/o: RC state handle         */
 )
 {
@@ -91,7 +91,7 @@ void rc_uni_enc_init(
  *
  * Encode given cumulative frequency and frequency when total frequency is a power of 2
  *-------------------------------------------------------------------*/
-void rc_uni_enc_encode_fast(
+void rc_uni_enc_encode_fast_fx(
     RangeUniEncState *rc_st_enc, /* i/o: RC state handle                     */
     const UWord16 cum_freq,      /* i  : Cumulative frequency up to symbol   */
     const UWord16 sym_freq,      /* i  : Symbol frequency                    */
@@ -119,12 +119,12 @@ void rc_uni_enc_encode_fast(
     {
         rc_st_enc->rc_range = UL_lshl( rc_st_enc->rc_range, 8 );
         move32();
-        rc_uni_enc_shift( rc_st_enc );
+        rc_uni_enc_shift_fx( rc_st_enc );
         IF( LT_64( rc_st_enc->rc_range, 0x01000000 ) )
         {
             rc_st_enc->rc_range = UL_lshl( rc_st_enc->rc_range, 8 );
             move32();
-            rc_uni_enc_shift( rc_st_enc );
+            rc_uni_enc_shift_fx( rc_st_enc );
         }
     }
 
@@ -133,11 +133,11 @@ void rc_uni_enc_encode_fast(
 
 
 /*-------------------------------------------------------------------*
- * rc_uni_enc_encode_symbol_fastS()
+ * rc_uni_enc_encode_symbol_fastS_fx()
  *
  * Encode an alphabet symbol when total frequency is a power of 2
  *-------------------------------------------------------------------*/
-void rc_uni_enc_encode_symbol_fastS(
+void rc_uni_enc_encode_symbol_fastS_fx(
     RangeUniEncState *rc_st_enc, /* i/o: Encoder state                       */
     const UWord16 symbol,        /* i  : Symbol to encode                    */
     const UWord16 cum_freq[],    /* i  : Cumulative frequency up to symbol   */
@@ -145,18 +145,18 @@ void rc_uni_enc_encode_symbol_fastS(
     const UWord16 tot_shift      /* i  : Total frequency as a power of 2     */
 )
 {
-    rc_uni_enc_encode_fast( rc_st_enc, cum_freq[symbol], sym_freq[symbol], tot_shift );
+    rc_uni_enc_encode_fast_fx( rc_st_enc, cum_freq[symbol], sym_freq[symbol], tot_shift );
 
     return;
 }
 
 /*-------------------------------------------------------------------*
- * rc_uni_enc_finish()
+ * rc_uni_enc_finish_fx()
  *
  * Finalize the range encoder
  *-------------------------------------------------------------------*/
 /*! r: Total number of bits produced */
-Word16 rc_uni_enc_finish(
+Word16 rc_uni_enc_finish_fx(
     RangeUniEncState *rc_st_enc /* i/o: RC state handle               */
 )
 {
@@ -186,7 +186,7 @@ Word16 rc_uni_enc_finish(
 
     WHILE( bits > 0 )
     {
-        rc_uni_enc_shift( rc_st_enc );
+        rc_uni_enc_shift_fx( rc_st_enc );
         bits = sub( bits, 8 );
     }
 
@@ -245,7 +245,7 @@ Word16 rc_uni_enc_finish(
  * Get the total number of bits that would be produced by finalization
  *-------------------------------------------------------------------*/
 /*! r: Total number of bits produced */
-Word16 rc_uni_enc_virtual_finish(
+Word16 rc_uni_enc_virtual_finish_fx(
     RangeUniEncState *rc_st_enc /* i  : RC state handle               */
 )
 {
@@ -278,11 +278,11 @@ Word16 rc_uni_enc_virtual_finish(
 
 
 /*-------------------------------------------------------------------*
- * rc_uni_enc_shift()
+ * rc_uni_enc_shift_fx()
  *
  * Shift a byte out to bitstream (internal function)
  *-------------------------------------------------------------------*/
-static void rc_uni_enc_shift(
+static void rc_uni_enc_shift_fx(
     RangeUniEncState *rc_st_enc /* i/o: RC state handle     */
 )
 {
@@ -326,11 +326,11 @@ static void rc_uni_enc_shift(
 
 
 /*-------------------------------------------------------------------*
- * rc_uni_enc_encode_bits()
+ * rc_uni_enc_encode_bits_fx()
  *
  * Encode up to 16 bits with uniform probability
  *-------------------------------------------------------------------*/
-void rc_uni_enc_encode_bits(
+void rc_uni_enc_encode_bits_fx(
     RangeUniEncState *rc_st_enc, /* i/o: RC state handle     */
     const UWord16 value,         /* i  : Value to encode     */
     const Word16 bits            /* i  : Number of bits      */
@@ -355,12 +355,12 @@ void rc_uni_enc_encode_bits(
     {
         rc_st_enc->rc_range = UL_lshl( rc_st_enc->rc_range, 8 );
         move32();
-        rc_uni_enc_shift( rc_st_enc );
+        rc_uni_enc_shift_fx( rc_st_enc );
         IF( LT_64( rc_st_enc->rc_range, 0x01000000 ) )
         {
             rc_st_enc->rc_range = UL_lshl( rc_st_enc->rc_range, 8 );
             move32();
-            rc_uni_enc_shift( rc_st_enc );
+            rc_uni_enc_shift_fx( rc_st_enc );
         }
     }
 
diff --git a/lib_enc/ivas_rom_enc.h b/lib_enc/ivas_rom_enc.h
index 501965bfa9d90f3e6f7bb510d1a06704df2407b1..0d0941cc43ce9a1d47dd0bdbe30308779e1d23f8 100644
--- a/lib_enc/ivas_rom_enc.h
+++ b/lib_enc/ivas_rom_enc.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_enc/ivas_rom_enc_fx.c b/lib_enc/ivas_rom_enc_fx.c
index e4361b933b537ecf40fe8aaaccb51f6a6b5c9fba..b26972b8aa56df444edcd9c4cb51e05eaeeba2be 100644
--- a/lib_enc/ivas_rom_enc_fx.c
+++ b/lib_enc/ivas_rom_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc_fx.c
similarity index 96%
rename from lib_enc/ivas_sba_enc.c
rename to lib_enc/ivas_sba_enc_fx.c
index 0fe07179a9fdfc85ad770bc33485c78b98f82c26..e630a70d954f4e5764dba5b446df8b125884a346 100644
--- a/lib_enc/ivas_sba_enc.c
+++ b/lib_enc/ivas_sba_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,12 +37,11 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------*
@@ -86,12 +85,12 @@ void ivas_sba_getTCs_fx(
 }
 
 /*-------------------------------------------------------------------*
- * ivas_sba_enc_reconfigure()
+ * ivas_sba_enc_reconfigure_fx()
  *
  * Reconfigure IVAS SBA encoder
  *-------------------------------------------------------------------*/
-/* To be renamed as ivas_sba_enc_reconfigure_fx later */
-ivas_error ivas_sba_enc_reconfigure(
+
+ivas_error ivas_sba_enc_reconfigure_fx(
     Encoder_Struct *st_ivas /* i/o: IVAS encoder structure      */
 )
 {
@@ -199,7 +198,7 @@ ivas_error ivas_sba_enc_reconfigure(
             }
         }
 
-        ivas_spar_config_fx( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 );
+        ivas_spar_config_fx( ivas_total_brate, s_min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 );
 
         hSpar = st_ivas->hSpar;
 
diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc_fx.c
similarity index 89%
rename from lib_enc/ivas_sce_enc.c
rename to lib_enc/ivas_sce_enc_fx.c
index d43ed74385f381091a49b835836edf37ec8461fd..f0811aea67b6c18f2cf62a213d93fe7c12bd36d5 100644
--- a/lib_enc/ivas_sce_enc.c
+++ b/lib_enc/ivas_sce_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,10 +36,8 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #ifdef DEBUGGING
 #include "debug.h"
@@ -80,7 +78,7 @@ ivas_error ivas_sce_enc_fx(
     Word16 pitch_fr_fx[1][NB_SUBFR];                                  /* fractional pitch values                  */
     Word16 voicing_fr_fx[1][NB_SUBFR];                                /* fractional pitch gains                   */
     Word16 relE_fx[1];                                                /* frame relative energy               Q8   */
-    Word16 currFlatness_fx[1];                                        /* flatness parameter                  Q7   */
+    Word32 currFlatness_fx[1];                                        /* flatness parameter                  Q7   */
     Word16 Etot_LR_fx[1];                                             /* total energy                            Q8   */
     Word32 realBuffer_fx[1][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; /* real buffer                              */
     Word32 imagBuffer_fx[1][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; /* imag buffer                              */
@@ -122,14 +120,18 @@ ivas_error ivas_sce_enc_fx(
      * Initialization - general
      *-----------------------------------------------------------------*/
 
-#ifdef MSAN_FIX
     set16_zero_fx( old_inp_12k8_fx[0], L_INP_12k8 );
-#endif
 
-    Copy32( data_fx, st->input32_fx, input_frame ); // Q(q_data_fx)
-    q_input = sub( add( L_norm_arr( st->input32_fx, input_frame ), q_data_fx ), 16 );
+    Word16 Q_min = s_min( q_data_fx, add( st->q_inp32, L_norm_arr( st->input32_fx - input_frame, input_frame ) ) );
+    scale_sig32( st->input32_fx - input_frame, input_frame, sub( Q_min, st->q_inp32 ) );
+    st->q_old_inp32 = Q_min;
+    move16();
+    Copy_Scale_sig32( data_fx, st->input32_fx, input_frame, sub( Q_min, q_data_fx ) ); // Q(Q_min)
+    st->q_inp32 = Q_min;
+    move16();
+    q_input = sub( add( L_norm_arr( st->input32_fx, input_frame ), Q_min ), 16 );
 
-    Copy_Scale_sig32_16( st->input32_fx, st->input_fx, input_frame, sub( add( Q16, q_input ), q_data_fx ) ); // Q(q_data_fx) -> Q(q_input)
+    Copy_Scale_sig32_16( st->input32_fx, st->input_fx, input_frame, sub( add( Q16, q_input ), Q_min ) ); // Q(Q_min) -> Q(q_input)
     st->q_inp = q_input;
     move16();
 
@@ -161,6 +163,9 @@ ivas_error ivas_sce_enc_fx(
 #ifdef DEBUGGING
     st->force = st_ivas->hEncoderConfig->force;
     st->id_element = sce_id;
+#ifdef DEBUG_FORCE_DIR
+    st->force_dir = st_ivas->hEncoderConfig->force_dir;
+#endif
 #endif
     move16();
     move16();
@@ -177,12 +182,10 @@ ivas_error ivas_sce_enc_fx(
     IF( NE_32( ivas_format, MC_FORMAT ) || NE_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
     {
         RunTransientDetection_ivas_fx( st->input_fx, input_frame, st->hTranDet, q_input );
-        move16();
-        move16();
     }
 
-    currFlatness_fx[0] = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS, 0 ); // Q7
-    move16();
+    currFlatness_fx[0] = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS, 0 ); // Q21
+    move32();
 
     /*----------------------------------------------------------------*
      * Configuration of core encoder
@@ -254,7 +257,7 @@ ivas_error ivas_sce_enc_fx(
                                     &ener_fx[0], &relE_fx[0], A_fx[0], Aw_fx[0], epsP_fx[0], &epsP_fx_q[0], lsp_new_fx[0], lsp_mid_fx[0], &vad_hover_flag[0], &attack_flag[0],
                                     realBuffer_fx[0], imagBuffer_fx[0], &q_re_im_buf, old_wsp_fx[0], &q_old_wsp, pitch_fr_fx[0], voicing_fr_fx[0], &loc_harm[0], &cor_map_sum_fx[0], &vad_flag_dtx[0], enerBuffer_fx[0], &enerBuffer_fx_exp[0],
                                     fft_buff_fx[0], &fft_buff_fx_q[0], A_fx[0], lsp_new_fx[0], currFlatness_fx[0], 0, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, flag_16k_smc,
-                                    st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, ivas_format, 0, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[0]
+                                    st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, ivas_format, 0, st_ivas->hEncoderConfig->last_ivas_total_brate, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[0]
 #ifdef DEBUG_MODE_INFO
                                     ,
                                     st->id_element
@@ -262,7 +265,7 @@ ivas_error ivas_sce_enc_fx(
     );
     e_old_wsp[0] = sub( Q15, q_old_wsp );
     move16();
-    IF( error != IVAS_ERR_OK )
+    IF( NE_32( error, IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -315,7 +318,7 @@ ivas_error ivas_sce_enc_fx(
 
     /* IGF reconfiguration */
     test();
-    IF( hSCE->last_element_brate != hSCE->element_brate || st->last_bwidth != st->bwidth )
+    IF( NE_32( hSCE->last_element_brate, hSCE->element_brate ) || NE_16( st->last_bwidth, st->bwidth ) )
     {
         Word16 igf;
         igf = getIgfPresent_fx( st->element_mode, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), st->max_bwidth, st->rf_mode );
@@ -328,7 +331,7 @@ ivas_error ivas_sce_enc_fx(
     /* set ACELP@12k8 / ACELP@16k flag for flexible ACELP core */
     test();
     test();
-    IF( st->core_brate == SID_2k40 || st->core_brate == FRAME_NO_DATA )
+    IF( EQ_32( st->core_brate, SID_2k40 ) || st->core_brate == FRAME_NO_DATA )
     {
         st->flag_ACELP16k = set_ACELP_flag_IVAS( IVAS_SCE, hSCE->element_brate, st->core_brate, 0, 0, -1, -1 );
     }
@@ -349,10 +352,10 @@ ivas_error ivas_sce_enc_fx(
      * Encoder
      *----------------------------------------------------------------*/
 
-    Scale_sig( old_wsp_fx[0], L_WSP, sub( e_old_wsp[0], Q16 ) );
+    Scale_sig( old_wsp_fx[0], L_WSP, sub( e_old_wsp[0], Q16 ) ); // Q(15-16)
     e_old_wsp[0] = 16;
     move16();
-    IF( ( error = ivas_core_enc_fx( hSCE, NULL, NULL, 1, old_inp_12k8_fx, old_inp_16k_fx, Q_new, ener_fx, A_fx, Aw_fx, epsP_fx, epsP_fx_q, lsp_new_fx, lsp_mid_fx, vad_hover_flag, attack_flag, realBuffer_fx, imagBuffer_fx, &q_re_im_buf, old_wsp_fx, e_old_wsp, loc_harm, cor_map_sum_fx, vad_flag_dtx, enerBuffer_fx, enerBuffer_fx_exp, fft_buff_fx, 0, ivas_format, flag_16k_smc ) ) != IVAS_ERR_OK )
+    IF( NE_32( ( error = ivas_core_enc_fx( hSCE, NULL, NULL, 1, old_inp_12k8_fx, old_inp_16k_fx, Q_new, ener_fx, A_fx, Aw_fx, epsP_fx, epsP_fx_q, lsp_new_fx, lsp_mid_fx, vad_hover_flag, attack_flag, realBuffer_fx, imagBuffer_fx, &q_re_im_buf, old_wsp_fx, e_old_wsp, loc_harm, cor_map_sum_fx, vad_flag_dtx, enerBuffer_fx, enerBuffer_fx_exp, fft_buff_fx, 0, ivas_format, flag_16k_smc ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -365,6 +368,9 @@ ivas_error ivas_sce_enc_fx(
     Copy( st->input_fx, st->old_input_signal_fx, input_frame );
     st->q_old_inp = st->q_inp;
     move16();
+    Copy32( st->input32_fx, st->old_input_signal32_fx, input_frame ); /* st->q_inp32 */
+    st->q_old_inp32 = st->q_inp32;
+    move16();
     hSCE->last_element_brate = hSCE->element_brate;
     move32();
 
@@ -430,7 +436,7 @@ ivas_error create_sce_enc_fx(
     test();
     IF( NE_16( st_ivas->hEncoderConfig->ivas_format, MONO_FORMAT ) && EQ_16( sce_id, sub( st_ivas->nSCE, 1 ) ) )
     {
-        IF( ( error = ivas_initialize_MD_bstr_enc_fx( &( hSCE->hMetaData ), st_ivas ) ) != IVAS_ERR_OK )
+        IF( NE_32( ( error = ivas_initialize_MD_bstr_enc_fx( &( hSCE->hMetaData ), st_ivas ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -464,8 +470,11 @@ ivas_error create_sce_enc_fx(
     st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
     move32();
     move32();
+    st->max_bwidth = st_ivas->hEncoderConfig->max_bwidth;
+    st->input_Fs = st_ivas->hEncoderConfig->input_Fs;
+    st->input_frame_fx = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) );
 
-    IF( ( error = init_encoder_ivas_fx( st, st_ivas, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0, st_ivas->ism_mode, hSCE->element_brate ) ) != IVAS_ERR_OK )
+    IF( NE_32( ( error = init_encoder_ivas_fx( st, st_ivas, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0, st_ivas->ism_mode, hSCE->element_brate ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -477,12 +486,12 @@ ivas_error create_sce_enc_fx(
 }
 
 /*-------------------------------------------------------------------------
- * create_evs_sce_enc()
+ * create_evs_sce_enc_fx()
  *
  * Create, allocate and initialize EVS encoder SCE handle
  *-------------------------------------------------------------------------*/
-
-ivas_error create_evs_sce_enc(
+#ifndef HARM_SCE_INIT
+ivas_error create_evs_sce_enc_fx(
     Encoder_Struct *st_ivas,   /* i/o: IVAS encoder structure      */
     const Word16 sce_id,       /* i  : SCE # identifier            */
     const Word32 element_brate /* i  : element bitrate             */
@@ -603,23 +612,40 @@ ivas_error create_evs_sce_enc(
     {
         return error;
     }
+#ifdef HARM_PUSH_BIT
+    /*-----------------------------------------------------------------*
+     * Bitstream
+     *-----------------------------------------------------------------*/
+
+    /* set pointer to the buffer of indices */
+    st_fx->hBstr->ind_list = st_ivas->ind_list;
+    st_fx->hBstr->ivas_ind_list_zero = &st_ivas->ind_list;
+    st_fx->hBstr->ivas_max_num_indices = &st_ivas->ivas_max_num_indices;
+    st_fx->hBstr->nb_ind_tot = 0;
+    move16();
+    st_fx->hBstr->nb_bits_tot = 0;
+    move16();
+    st_fx->hBstr->st_ivas = st_ivas;
+#else
     st_fx->hBstr->ind_list = ind_list;
     // st_fx->hBstr->ind_list_fx = st->hBstr->ind_list;
-    reset_indices_enc_fx( st_fx->hBstr );
+    reset_indices_enc_fx( st_fx->hBstr, MAX_NUM_INDICES );
+#endif
+
     hSCE->hCoreCoder[0] = st_fx;
 
     st_ivas->hSCE[sce_id] = hSCE;
 
     return error;
 }
-
+#endif
 /*-------------------------------------------------------------------------
- * destroy_sce_enc()
+ * destroy_sce_enc_fx()
  *
  * Destroy and deallocate IVAS encoder SCE handle
  *-------------------------------------------------------------------------*/
 
-void destroy_sce_enc(
+void destroy_sce_enc_fx(
     SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure       */
     Flag is_evs          /* i  : Flag to indicate EVS encoder*/
 )
diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc_fx.c
similarity index 73%
rename from lib_enc/ivas_sns_enc.c
rename to lib_enc/ivas_sns_enc_fx.c
index d36fcaaa5d9c54b4a3a13443ec3b2245d728e5e8..2eaefb48358859a5c23cb148d781654a24b39a7b 100644
--- a/lib_enc/ivas_sns_enc.c
+++ b/lib_enc/ivas_sns_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,10 +35,8 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
 #include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
@@ -61,115 +59,215 @@ static Word16 sns_1st_cod_fx(
     Word32 *snsq_fx /* o  : quantized sns    Q16 */
 )
 {
-    Word16 index;
-    const Word16 split_len = M / 2;
-    move16();
-    const Word16 *means;
-    const Word16 means_fix = 2; // Q15
-    move16();
-    /* remove means */
-    means = NULL;
-    SWITCH( L_frame )
+    IF( exp_sns == Q15 )
     {
-        case L_FRAME16k:
-            means = &sns_1st_means_16k[core - 1][0];
-            break;
-        case L_FRAME25_6k:
-            means = &sns_1st_means_25k6[core - 1][0];
-            break;
-        case L_FRAME32k:
-            means = &sns_1st_means_32k[core - 1][0];
-            break;
-        default:
-            assert( !"illegal frame length in sns_1st_cod" );
-    }
-    Word16 exp_snsq_buffer[M] = { 0 }, exp_snsq = 0;
-    move16();
-    move16();
-    FOR( Word16 i = 0; i < M; ++i )
-    {
-        Word32 tmp = L_mult( means[i], means_fix ); // Q16
-        exp_snsq_buffer[i] = 0;
+        Word16 index;
+        const Word16 split_len = M / 2;
         move16();
-        snsq_fx[i] = BASOP_Util_Add_Mant32Exp( sns_fx[i], exp_sns, L_negate( tmp ), 15, &exp_snsq_buffer[i] );
-        move32();
-    }
-    FOR( int i = 0; i < M; i++ )
-    {
-        exp_snsq = s_max( exp_snsq_buffer[i], exp_snsq );
-    }
-    FOR( int i = 0; i < M; i++ )
-    {
-        snsq_fx[i] = L_shr( snsq_fx[i], exp_snsq - exp_snsq_buffer[i] );
-        move32();
-    }
+        const Word16 *means;
+        const Word16 means_fix = 2; // Q15
+        move16();
+        /* remove means */
+        means = NULL;
+        SWITCH( L_frame )
+        {
+            case L_FRAME16k:
+                means = &sns_1st_means_16k[core - 1][0]; // Q14
+                break;
+            case L_FRAME25_6k:
+                means = &sns_1st_means_25k6[core - 1][0]; // Q14
+                break;
+            case L_FRAME32k:
+                means = &sns_1st_means_32k[core - 1][0]; // Q14
+                break;
+            default:
+                assert( !"illegal frame length in sns_1st_cod" );
+        }
+        FOR( Word16 i = 0; i < M; ++i )
+        {
+            Word32 tmp = L_mult( means[i], means_fix ); // Q14->Q16
+            snsq_fx[i] = L_sub( sns_fx[i], tmp );       // Q16
+            move32();
+        }
 
-    index = 0;
-    move16();
-    FOR( Word16 split = 0; split < 2; ++split )
-    {
-        const Word16 *cdbk_ptr;
-        Word16 j0, j1, index_split;
-        Word32 dist_min_fx;
-        const Word16 cdbk_fix = 8; // 1.f / powf( 2, SNS_CDBKS_BITS_4_FRAC ) in Q15
+        index = 0;
         move16();
-        const Word16 *const cdbk = &sns_1st_cdbk[split][core - 1][0];
+        FOR( Word16 split = 0; split < 2; ++split )
+        {
+            const Word16 *cdbk_ptr;
+            Word16 j0, j1;
+            Word16 index_split;
+            Word32 dist_min_fx;
+            const Word16 cdbk_fix = 8; // 1.f / powf( 2, SNS_CDBKS_BITS_4_FRAC ) in Q15
+            move16();
+            const Word16 *const cdbk = &sns_1st_cdbk[split][core - 1][0]; // Q12
 
-        j0 = imult1616( split, split_len );
-        j1 = add( j0, split_len );
+            j0 = imult1616( split, split_len );
+            j1 = add( j0, split_len );
 
-        cdbk_ptr = cdbk;
-        dist_min_fx = MAXVAL_WORD32;
-        Word16 exp_dist_min = 31;
-        index_split = 0;
-        FOR( Word16 i = 0; i < 32; ++i )
-        {
-            Word32 dist_fx = 0;
+            cdbk_ptr = cdbk;
+            dist_min_fx = MAXVAL_WORD32;
+            index_split = 0;
             move32();
-            Word16 exp_dist = 0;
             move16();
-            FOR( Word16 j = j0; j < j1; ++j )
+            FOR( Word16 i = 0; i < 32; ++i )
             {
-                Word32 tmp_fx;
-                Word16 exp_tmp = 0;
-                move16();
-                Word32 tmp_1 = L_mult( ( *cdbk_ptr++ ), cdbk_fix ); // Q16
-                tmp_fx = BASOP_Util_Add_Mant32Exp( snsq_fx[j], exp_snsq, L_negate( tmp_1 ), 15, &exp_tmp );
-                Word32 tmp_2 = Mpy_32_32( tmp_fx, tmp_fx );                                             // exp_tmp*2
-                dist_fx = BASOP_Util_Add_Mant32Exp( dist_fx, exp_dist, tmp_2, exp_tmp * 2, &exp_dist ); // exp_tmp*2
+                Word32 dist_fx = 0;
+                move32();
+                FOR( Word16 j = j0; j < j1; ++j ) // j1-j0=split_len. split_len=M/2. M=16
+                {
+                    Word32 tmp;
+                    Word32 dist;
+
+                    tmp = L_mult( *cdbk_ptr++, cdbk_fix ); // Q12->Q16
+                    dist = L_sub( snsq_fx[j], tmp );       // Q16
+                    dist = L_shl( dist, 11 );              // cdbk_ptr is a 16 bit LUT with 3.12 values, used as 3.16. assumption: snsq_fx has the same representation. thus, the subtraction results are in 4.16, which leaves 11 bit headroom.
+                    dist = Mpy_32_32( dist, dist );
+                    dist = L_shr( dist, 3 ); // make sure that the sum of 8 values does not overflow
+                    dist_fx = L_add( dist_fx, dist );
+                }
+
+                IF( LT_32( dist_fx, dist_min_fx ) )
+                {
+                    dist_min_fx = dist_fx;
+                    move32();
+                    index_split = i;
+                    move16();
+                }
             }
 
-            IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( dist_fx, exp_dist, dist_min_fx, exp_dist_min ), -1 ) )
+            /* set quantized vector */
+            cdbk_ptr = &cdbk[imult1616( index_split, split_len )];
+            FOR( Word16 j = j0; j < j1; ++j )
             {
-                dist_min_fx = dist_fx;
+                Word32 tmp_3 = L_mult( means[j], means_fix );   // Q16
+                Word32 tmp_4 = L_mult( *cdbk_ptr++, cdbk_fix ); // Q16
+                snsq_fx[j] = L_add( tmp_4, tmp_3 );             // Q16
                 move32();
-                exp_dist_min = exp_dist;
-                move16();
-                index_split = i;
-                move16();
             }
-        }
 
-        /* set quantized vector */
-        cdbk_ptr = &cdbk[imult1616( index_split, split_len )];
-        FOR( Word16 j = j0; j < j1; ++j )
+            /* for second split shift by five bits to store both indices as one 10 bit value */
+            if ( EQ_16( split, 1 ) )
+            {
+                index_split = shl( index_split, 5 );
+            }
+
+            index = add( index, index_split );
+        }
+        return index;
+    }
+    ELSE
+    {
+        Word16 index, i;
+        const Word16 split_len = M / 2;
+        move16();
+        const Word16 *means;
+        const Word16 means_fix = 2; // Q15
+        move16();
+        /* remove means */
+        means = NULL;
+        SWITCH( L_frame )
+        {
+            case L_FRAME16k:
+                means = &sns_1st_means_16k[core - 1][0];
+                break;
+            case L_FRAME25_6k:
+                means = &sns_1st_means_25k6[core - 1][0];
+                break;
+            case L_FRAME32k:
+                means = &sns_1st_means_32k[core - 1][0];
+                break;
+            default:
+                assert( !"illegal frame length in sns_1st_cod" );
+        }
+        Word16 exp_snsq_buffer[M] = { 0 }, exp_snsq = 0;
+        move16();
+        move16();
+        FOR( i = 0; i < M; ++i )
+        {
+            Word32 tmp = L_mult( means[i], means_fix ); // Q16
+            exp_snsq_buffer[i] = 0;
+            move16();
+            snsq_fx[i] = BASOP_Util_Add_Mant32Exp( sns_fx[i], exp_sns, L_negate( tmp ), 15, &exp_snsq_buffer[i] );
+            move32();
+        }
+        FOR( i = 0; i < M; i++ )
+        {
+            exp_snsq = s_max( exp_snsq_buffer[i], exp_snsq );
+        }
+        FOR( i = 0; i < M; i++ )
         {
-            Word32 tmp_3 = L_mult( means[j], means_fix );       // Q16
-            Word32 tmp_4 = L_mult( ( *cdbk_ptr++ ), cdbk_fix ); // Q16
-            snsq_fx[j] = L_add( tmp_4, tmp_3 );                 // Q16
+            snsq_fx[i] = L_shr( snsq_fx[i], exp_snsq - exp_snsq_buffer[i] );
             move32();
         }
 
-        /* for second split shift by five bits to store both indices as one 10 bit value */
-        IF( EQ_16( split, 1 ) )
+        index = 0;
+        move16();
+        FOR( Word16 split = 0; split < 2; ++split )
         {
-            index_split = shl( index_split, 5 );
+            const Word16 *cdbk_ptr;
+            Word16 j0, j1, index_split;
+            Word32 dist_min_fx;
+            const Word16 cdbk_fix = 8; // 1.f / powf( 2, SNS_CDBKS_BITS_4_FRAC ) in Q15
+            move16();
+            const Word16 *const cdbk = &sns_1st_cdbk[split][core - 1][0];
+
+            j0 = imult1616( split, split_len );
+            j1 = add( j0, split_len );
+
+            cdbk_ptr = cdbk;
+            dist_min_fx = MAXVAL_WORD32;
+            Word16 exp_dist_min = 31;
+            index_split = 0;
+            FOR( i = 0; i < 32; ++i )
+            {
+                Word32 dist_fx = 0;
+                move32();
+                Word16 exp_dist = 0;
+                move16();
+                FOR( Word16 j = j0; j < j1; ++j )
+                {
+                    Word32 tmp_fx;
+                    Word16 exp_tmp = 0;
+                    move16();
+                    Word32 tmp_1 = L_mult( ( *cdbk_ptr++ ), cdbk_fix ); // Q16
+                    tmp_fx = BASOP_Util_Add_Mant32Exp( snsq_fx[j], exp_snsq, L_negate( tmp_1 ), 15, &exp_tmp );
+                    Word32 tmp_2 = Mpy_32_32( tmp_fx, tmp_fx );                                             // exp_tmp*2
+                    dist_fx = BASOP_Util_Add_Mant32Exp( dist_fx, exp_dist, tmp_2, exp_tmp * 2, &exp_dist ); // exp_tmp*2
+                }
+
+                IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( dist_fx, exp_dist, dist_min_fx, exp_dist_min ), -1 ) )
+                {
+                    dist_min_fx = dist_fx;
+                    move32();
+                    exp_dist_min = exp_dist;
+                    move16();
+                    index_split = i;
+                    move16();
+                }
+            }
+
+            /* set quantized vector */
+            cdbk_ptr = &cdbk[imult1616( index_split, split_len )];
+            FOR( Word16 j = j0; j < j1; ++j )
+            {
+                Word32 tmp_3 = L_mult( means[j], means_fix );       // Q16
+                Word32 tmp_4 = L_mult( ( *cdbk_ptr++ ), cdbk_fix ); // Q16
+                snsq_fx[j] = L_add( tmp_4, tmp_3 );                 // Q16
+                move32();
+            }
+
+            /* for second split shift by five bits to store both indices as one 10 bit value */
+            IF( EQ_16( split, 1 ) )
+            {
+                index_split = shl( index_split, 5 );
+            }
+
+            index = add( index, index_split );
         }
 
-        index = add( index, index_split );
+        return index;
     }
-
-    return index;
 }
 
 /*-------------------------------------------------------------------
@@ -235,6 +333,7 @@ static Word16 sns_2st_cod_fx(
     FOR( i = 0; i < 2; i++ )
     {
         nq = indx[i];
+        move16();
         nbits = add( nbits, ( add( 2, ( shl( nq, 2 ) ) ) ) ); /* 2 bits to specify Q2,Q3,Q4,ext */
 
         IF( GT_16( nq, 6 ) )
@@ -393,7 +492,7 @@ void sns_avq_cod_stereo_fx(
         side_fx[i] = BASOP_Util_Add_Mant32Exp( snsl_fx[i], exp_snl, L_negate( snsr_fx[i] ), exp_snr, &exp_side_buffer[i] );
         move32();
         Word32 tmp = Mpy_32_32( side_fx[i], side_fx[i] ); // exp_side[i] * 2
-        ener_side_fx = BASOP_Util_Add_Mant32Exp( ener_side_fx, exp_ener_side, tmp, exp_side_buffer[i] * 2, &exp_ener_side );
+        ener_side_fx = BASOP_Util_Add_Mant32Exp( ener_side_fx, exp_ener_side, tmp, shl( exp_side_buffer[i], 1 ), &exp_ener_side );
     }
     FOR( i = 0; i < M; i++ )
     {
@@ -573,7 +672,11 @@ Word16 quantize_sns_fx(
             Word32 ener_side_fx;
             Word16 ener_side_q;
 
+#ifdef VEC_ARITH_OPT_v1
+            v_sub_fixed_no_hdrm( snsQ_out_fx[0][k], snsQ_out_fx[1][k], side_fx, M );
+#else  /* VEC_ARITH_OPT_v1 */
             v_sub_fixed( snsQ_out_fx[0][k], snsQ_out_fx[1][k], side_fx, M, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
 
             Word64 L64_sum;
             L64_sum = 1;
@@ -681,7 +784,7 @@ Word16 quantize_sns_fx(
                 IF( zero_side_flag[k] )
                 {
                     set32_fx( snsQ_fx, 0, M );
-                    continue;
+                    CONTINUE;
                 }
 
                 nStages = SNS_MSVQ_NSTAGES_SIDE;
@@ -697,7 +800,7 @@ Word16 quantize_sns_fx(
             }
             Word16 shift = find_guarded_bits_fx( M );
             sns_e_tmp[ch][k] = sub( 31, sub( 20, shift ) );
-
+            move16();
             idxIndices = add( idxIndices, nStages );
 
             FOR( i = 0; i < nStages; ++i )
@@ -718,15 +821,10 @@ Word16 quantize_sns_fx(
 
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
-#ifdef MSAN_FIX
         FOR( k = 0; k < nSubframes; k++ )
         {
-            scale_sig32( snsQ_out_fx[ch][k], M, sub( sns_e_tmp[ch][k], sns_e ) );
+            scale_sig32( snsQ_out_fx[ch][k], M, sub( sns_e_tmp[ch][k], sns_e ) ); // Q(31-sns_e_tmp[ch][k])
         }
-#else
-        scale_sig32( snsQ_out_fx[ch][0], M, sub( sns_e_tmp[ch][0], *sns_e ) );
-        scale_sig32( snsQ_out_fx[ch][1], M, sub( sns_e_tmp[ch][1], *sns_e ) );
-#endif
     }
     /* get back to L/F representation */
     test();
diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder_fx.c
similarity index 92%
rename from lib_enc/ivas_spar_encoder.c
rename to lib_enc/ivas_spar_encoder_fx.c
index a366d86fba24b7fb7e3ac041f02f6e4f7344d7be..3b380f2ebacda088f27ceaa010823af2bd6199b3 100644
--- a/lib_enc/ivas_spar_encoder.c
+++ b/lib_enc/ivas_spar_encoder_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,12 +33,10 @@
 #include <stdint.h>
 #include <assert.h>
 #include "options.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_com.h"
-#include "prot.h"
 #include "math.h"
 #include "wmc_auto.h"
 #include "prot_fx_enc.h"
@@ -130,14 +128,14 @@ ivas_error ivas_spar_enc_open_fx(
     /* set FB config. */
     active_w_mixing = ivas_spar_br_table_consts[table_idx].active_w;
     move16();
-    IF( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, nchan_inp, nchan_transport, active_w_mixing, input_Fs, nchan_fb_in ) ) != IVAS_ERR_OK )
+    IF( NE_32( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, nchan_inp, nchan_transport, active_w_mixing, input_Fs, nchan_fb_in ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
     fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order];
 
     /* FB mixer handle */
-    IF( ( error = ivas_FB_mixer_open_fx( &( hSpar->hFbMixer ), input_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK )
+    IF( NE_32( ( error = ivas_FB_mixer_open_fx( &( hSpar->hFbMixer ), input_Fs, fb_cfg, spar_reconfig_flag ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -150,7 +148,7 @@ ivas_error ivas_spar_enc_open_fx(
     IF( !spar_reconfig_flag )
     {
         /* Transient Detector handle */
-        IF( ( error = ivas_transient_det_open_fx( &( hSpar->hTranDet ), input_Fs ) ) != IVAS_ERR_OK )
+        IF( NE_32( ( error = ivas_transient_det_open_fx( &( hSpar->hTranDet ), input_Fs ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -165,7 +163,7 @@ ivas_error ivas_spar_enc_open_fx(
     hSpar->hAgcEnc = NULL;
     IF( hSpar->AGC_Enable )
     {
-        IF( ( error = ivas_spar_agc_enc_open_fx( &hSpar->hAgcEnc, input_Fs, nchan_inp ) ) != IVAS_ERR_OK )
+        IF( NE_32( ( error = ivas_spar_agc_enc_open_fx( &hSpar->hAgcEnc, input_Fs, nchan_inp ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -214,7 +212,7 @@ ivas_error ivas_spar_enc_open_fx(
         move16();
         IF( hEncoderConfig->Opt_DTX_ON )
         {
-            IF( ( error = front_vad_create_fx( &( hSpar->hFrontVad ), hEncoderConfig ) ) != IVAS_ERR_OK )
+            IF( NE_32( ( error = front_vad_create_fx( &( hSpar->hFrontVad ), hEncoderConfig ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -230,7 +228,7 @@ ivas_error ivas_spar_enc_open_fx(
             hSpar->hCoreCoderVAD->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
             move32();
             move32();
-            IF( ( error = init_encoder_ivas_fx( hSpar->hCoreCoderVAD, st_ivas, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode, hSpar->hCoreCoderVAD->total_brate ) ) != IVAS_ERR_OK )
+            IF( NE_32( ( error = init_encoder_ivas_fx( hSpar->hCoreCoderVAD, st_ivas, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode, hSpar->hCoreCoderVAD->total_brate ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -343,10 +341,20 @@ ivas_error ivas_spar_enc_fx(
     error = IVAS_ERR_OK;
     move32();
     hEncoderConfig = st_ivas->hEncoderConfig;
-    st0 = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];
 
+    IF( st_ivas->nSCE > 0 )
+    {
+        st0 = st_ivas->hSCE[0]->hCoreCoder[0];
+    }
+    ELSE
+    {
+        st0 = st_ivas->hCPE[0]->hCoreCoder[0];
+    }
+
+    test();
+    test();
     /* Write SBA signaling bits */
-    if ( hEncoderConfig->ivas_format == SBA_FORMAT || ( hEncoderConfig->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) )
+    IF( EQ_32( hEncoderConfig->ivas_format, SBA_FORMAT ) || ( EQ_32( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) ) )
     {
         /* Write SBA planar flag */
         push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_planar, SBA_PLANAR_BITS );
@@ -354,9 +362,9 @@ ivas_error ivas_spar_enc_fx(
         /* Write SBA order */
         push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_order, SBA_ORDER_BITS );
     }
-    else /* ism_mode == ISM_MODE_NONE */
+    ELSE /* ism_mode == ISM_MODE_NONE */
     {
-        if ( hEncoderConfig->ivas_total_brate < IVAS_24k4 )
+        IF( LT_32( hEncoderConfig->ivas_total_brate, IVAS_24k4 ) )
         {
             /* Write SBA planar flag */
             push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_planar, SBA_PLANAR_BITS );
@@ -364,20 +372,20 @@ ivas_error ivas_spar_enc_fx(
             /* hack to indicate OSBA bitstream at VLBR */
             push_indice( st0->hBstr, IND_SMODE, 0, SBA_ORDER_BITS );
         }
-        else
+        ELSE
         {
             /* Write SBA order */
             push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_order, SBA_ORDER_BITS );
         }
     }
 
-    if ( hEncoderConfig->ivas_format == SBA_ISM_FORMAT )
+    IF( EQ_32( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) )
     {
         /* write the number of objects in ISM_SBA format*/
         push_indice( hMetaData, IND_ISM_NUM_OBJECTS, hEncoderConfig->nchan_ism - 1, NO_BITS_MASA_ISM_NO_OBJ );
     }
     /* front VAD */
-    IF( ( error = front_vad_spar_fx( st_ivas->hSpar, data_fx[0], hEncoderConfig, input_frame ) ) != IVAS_ERR_OK )
+    IF( NE_32( ( error = front_vad_spar_fx( st_ivas->hSpar, data_fx[0], hEncoderConfig, input_frame ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -394,11 +402,14 @@ ivas_error ivas_spar_enc_fx(
     }
 
     *nb_bits_metadata = hMetaData->nb_bits_tot;
+    move16();
 
+    test();
     /* Force IVAS front pre-proc decision for higher bitrates */
-    if ( hEncoderConfig->ivas_total_brate > SBA_DTX_BITRATE_THRESHOLD || hEncoderConfig->Opt_DTX_ON == 0 )
+    if ( GT_32( hEncoderConfig->ivas_total_brate, SBA_DTX_BITRATE_THRESHOLD ) || hEncoderConfig->Opt_DTX_ON == 0 )
     {
         st_ivas->hSpar->front_vad_flag = 0;
+        move16();
     }
 
     return error;
@@ -418,8 +429,8 @@ static ivas_error ivas_spar_cov_md_process_fx(
     BSTR_ENC_HANDLE hMetaData,
     const Word16 nchan_inp,
     const Word16 sba_order,
-    Word32 *ppIn_FR_real_fx[IVAS_SPAR_MAX_CH],
-    Word32 *ppIn_FR_imag_fx[IVAS_SPAR_MAX_CH],
+    Word32 *ppIn_FR_real_fx[IVAS_SPAR_MAX_CH], // q_ppIn_FR
+    Word32 *ppIn_FR_imag_fx[IVAS_SPAR_MAX_CH], // q_ppIn_FR
     const Word16 transient_det[2],
     const Word16 dtx_vad,
     const Word16 nchan_transport,
@@ -659,7 +670,7 @@ static ivas_error ivas_spar_enc_process_fx(
     const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i  : configuration structure         */
     BSTR_ENC_HANDLE hMetaData,                  /* i/o: MetaData handle                 */
     const Word16 front_vad_flag,                /* i  : front-VAD decision              */
-    Word32 *data_fx[],                          /* i/o: input/transport audio channels  */
+    Word32 *data_fx[],                          /* i/o: input/transport audio channels Q(q_data) */
     const Word16 q_data )
 {
     Word32 pcm_tmp_fx[DIRAC_MAX_ANA_CHANS][L_FRAME48k * 2];
@@ -762,15 +773,19 @@ static ivas_error ivas_spar_enc_process_fx(
     FOR( i = 0; i < hSpar->hFbMixer->fb_cfg->num_in_chans; i++ )
     {
         /* changing q format to q_data*/
-        scale_sig32( p_pcm_tmp_fx[i], shl( input_frame, 1 ), sub( q_data, q_p_pcm_tmp_fx[i] ) );
+        scale_sig32( p_pcm_tmp_fx[i], shl( input_frame, 1 ), sub( q_data, q_p_pcm_tmp_fx[i] ) ); // q_data
     }
 
     /* prepare Parameter MDFT analysis */
+    Word16 shift = Q31;
+    move16();
     FOR( i = 0; i < nchan_fb_in; i++ )
     {
         ppIn_FR_real_fx[i] = p_pcm_tmp_fx[i];
         ppIn_FR_imag_fx[i] = p_pcm_tmp_fx[i] + input_frame;
         p_pcm_tmp_fx[i] = data_fx[i];
+        shift = s_min( shift, L_norm_arr( hSpar->hFbMixer->ppFilterbank_prior_input_fx[i], hSpar->hFbMixer->fb_cfg->prior_input_length ) );
+        shift = s_min( shift, L_norm_arr( data_fx[i], input_frame ) );
     }
 
     l_ts = idiv1616( input_frame, MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -778,8 +793,17 @@ static ivas_error ivas_spar_enc_process_fx(
     Word16 gb = find_guarded_bits_fx( l_ts );
     FOR( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ )
     {
+        FOR( i = 0; i < nchan_fb_in; i++ )
+        {
+            scale_sig32( data_fx[i], input_frame, shift );                                                                      // Q:q_data+shift
+            scale_sig32( hSpar->hFbMixer->ppFilterbank_prior_input_fx[i], hSpar->hFbMixer->fb_cfg->prior_input_length, shift ); // Q:q_data+shift
+        }
         ivas_fb_mixer_get_windowed_fr_fx( hSpar->hFbMixer, p_pcm_tmp_fx, ppIn_FR_real_fx, ppIn_FR_imag_fx, l_ts, l_ts, nchan_fb_in, gb );
-
+        FOR( i = 0; i < nchan_fb_in; i++ )
+        {
+            scale_sig32( data_fx[i], input_frame, negate( shift ) );                                                                      // Q:q_data
+            scale_sig32( hSpar->hFbMixer->ppFilterbank_prior_input_fx[i], hSpar->hFbMixer->fb_cfg->prior_input_length, negate( shift ) ); // Q:q_data
+        }
         ivas_fb_mixer_update_prior_input_fx( hSpar->hFbMixer, p_pcm_tmp_fx, l_ts, nchan_fb_in );
 
         FOR( i = 0; i < nchan_fb_in; i++ )
@@ -818,7 +842,7 @@ static ivas_error ivas_spar_enc_process_fx(
 
     /*Finding max possible q*/
     Word16 pp_fr_q;
-    pp_fr_q = sub( q_data, gb );
+    pp_fr_q = sub( add( q_data, shift ), gb );
     Word16 re_q = MAX_16, im_q = MAX_16, FR_q;
     move16();
     move16();
@@ -830,12 +854,12 @@ static ivas_error ivas_spar_enc_process_fx(
     FR_q = s_min( re_q, im_q );
     FOR( i = 0; i < nchan_fb_in; i++ )
     {
-        scale_sig32( ppIn_FR_real_fx[i], input_frame, FR_q );
-        scale_sig32( ppIn_FR_imag_fx[i], input_frame, FR_q );
+        scale_sig32( ppIn_FR_real_fx[i], input_frame, FR_q ); // Q(FR_q+pp_fr_q)
+        scale_sig32( ppIn_FR_imag_fx[i], input_frame, FR_q ); // Q(FR_q+pp_fr_q)
     }
     pp_fr_q = add( FR_q, pp_fr_q );
 
-    IF( NE_32( ( error = ivas_dirac_enc_fx( st_ivas->hDirAC, hQMetaData, hMetaData, data_fx, ppIn_FR_real_fx, ppIn_FR_imag_fx, pp_fr_q, input_frame, dtx_vad, hEncoderConfig->ivas_format, hodirac_flag ) ), IVAS_ERR_OK ) )
+    IF( NE_32( ( error = ivas_dirac_enc_fx( st_ivas->hDirAC, hQMetaData, hMetaData, data_fx, ppIn_FR_real_fx, ppIn_FR_imag_fx, pp_fr_q, input_frame, dtx_vad, hEncoderConfig->ivas_format, hodirac_flag, shift ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -892,7 +916,7 @@ static ivas_error ivas_spar_enc_process_fx(
     FOR( Word32 ch = ( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 ); ch < hSpar->hFbMixer->fb_cfg->num_out_chans; ch++ )
     {
         /* changing q format to q_data*/
-        scale_sig32( p_pcm_tmp_fx[ch], input_frame, sub( q_data, q_p_pcm_tmp_fx[ch] ) );
+        scale_sig32( p_pcm_tmp_fx[ch], input_frame, sub( q_data, q_p_pcm_tmp_fx[ch] ) ); // q_data
         q_p_pcm_tmp_fx[ch] = q_data;
         move16();
     }
@@ -982,7 +1006,7 @@ static ivas_error ivas_spar_enc_process_fx(
 
             FOR( i = 0; i < hSpar->hFbMixer->fb_cfg->num_out_chans; i++ )
             {
-                scale_sig32( p_pcm_tmp_fx[i], input_frame, sub( q_data, q_pcm_fx[i] ) );
+                scale_sig32( p_pcm_tmp_fx[i], input_frame, sub( q_data, q_pcm_fx[i] ) ); // q_data
                 q_pcm_fx[i] = q_data;
                 move16();
             }
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_spar_md_enc.c
rename to lib_enc/ivas_spar_md_enc_fx.c
index ca209c66bfb548ad08aef2ebf26a63df125b16b7..9c4fcc937163e672569f913223ec1cce692b2a20 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,22 +33,19 @@
 #include <stdint.h>
 #include <string.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "math.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
 #include <assert.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /*------------------------------------------------------------------------------------------*
  * PreProcessor
  *------------------------------------------------------------------------------------------*/
 /*Q28*/
-static const Word32 pr_boost_range_fx[2] = { 26843546, 107374182 };
+static const Word32 pr_boost_range_fx[2] = { 26843546 /*.1f in Q28*/, 107374182 /*.4f in Q28*/ };
 
 typedef enum ivas_strats_t
 {
@@ -141,8 +138,8 @@ ivas_error ivas_spar_md_enc_open_fx(
         }
     }
     hMdEnc->q_mixer_mat_fx = 0;
-
-    IF( ( error = ivas_spar_md_enc_init_fx( hMdEnc, hEncoderConfig, sba_order ) ) != IVAS_ERR_OK )
+    move16();
+    IF( NE_32( ( error = ivas_spar_md_enc_init_fx( hMdEnc, hEncoderConfig, sba_order ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
@@ -455,17 +452,17 @@ static void write_metadata_buffer_fx(
  *-----------------------------------------------------------------------------------------*/
 
 ivas_error ivas_spar_md_enc_process_fx(
-    ivas_spar_md_enc_state_t *hMdEnc,           /* i/o: SPAR MD encoder handle      */
-    const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i  : configuration structure     */
-    Word32 *cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
+    ivas_spar_md_enc_state_t *hMdEnc,                        /* i/o: SPAR MD encoder handle      */
+    const ENCODER_CONFIG_HANDLE hEncoderConfig,              /* i  : configuration structure     */
+    Word32 *cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], /*Q(cov_real_q)*/
     Word16 *cov_real_q[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
-    Word32 *cov_dtx_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
+    Word32 *cov_dtx_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], /*Q(cov_dtx_real_q)*/
     Word16 *cov_dtx_real_q[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
     BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle             */
     const Word16 dtx_vad,
     const Word16 nchan_inp,
     const Word16 sba_order,                                                      /* i  : Ambisonic (SBA) order       */
-    Word32 *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH], /* i  : prior mixer_matrix                     */
+    Word32 *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH], /* i  : prior mixer_matrix     Q(q_prior_mixer)                */
     Word16 *q_prior_mixer,                                                       /* i/o  : q for prior mixer_matrix                     */
     const Word16 dyn_active_w_flag,                                              /* i  : flag to indicate dynamic active W      */
     const Word16 dirac_mono_flag,                                                /* i  : flag to indicate mono only mode in SBA */
@@ -479,6 +476,7 @@ ivas_error ivas_spar_md_enc_process_fx(
     Word16 k, bwidth, num_bands, num_bands_full, num_bands_bw;
     Word16 active_w, nchan_transport, dmx_switch, strat;
     Word16 nB, bands_bw, packed_ok = 0;
+    move16();
     ivas_strats_t cs[MAX_CODING_STRATS];
     Word16 code_strat;
     Word16 bit_pos_start, next_ind_start;
@@ -711,7 +709,7 @@ ivas_error ivas_spar_md_enc_process_fx(
                             PR_step_e = sub( PR_step_e, Q12 );
 
                             Word16 PR_sign;
-                            PR_sign = sub( (Word16) ( GT_32( PR_uq, 0 ) ), (Word16) ( LT_32( PR_uq, 0 ) ) );
+                            PR_sign = sub( extract_l( GT_32( PR_uq, 0 ) ), extract_l( LT_32( PR_uq, 0 ) ) );
 
                             hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re[i] = PR_sign;
                             move16();
@@ -851,7 +849,7 @@ ivas_error ivas_spar_md_enc_process_fx(
             move16();
             IF( NE_16( strat, NO_STRAT ) )
             {
-                reset_indices_enc( &hMetaData_tmp, md_indices_allocated );
+                reset_indices_enc_fx( &hMetaData_tmp, md_indices_allocated );
 
                 ivas_write_spar_md_bitstream_fx( hMdEnc, num_bands, bands_bw, &hMetaData_tmp, hEncoderConfig->ivas_total_brate, strat, qsi );
 
@@ -989,7 +987,7 @@ ivas_error ivas_spar_md_enc_process_fx(
  *-----------------------------------------------------------------------------------------*/
 
 static void ivas_band_mixer_fx(
-    Word32 *cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
+    Word32 *cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], // Q(cov_real_q)
     Word16 *cov_real_q[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
     const Word16 num_ch,
     Word16 *num_bands,
@@ -1141,7 +1139,7 @@ static void ivas_write_spar_md_bitstream_fx(
                 push_next_indice( hMetaData, 5, SPAR_NUM_CODING_STRAT_BITS );
                 FOR( i = 0; i < nB; i++ )
                 {
-                    do_diff[i] = (Word16) ( NE_16( ( s_and( ( add( i, 1 ) ), 3 ) ), 1 ) );
+                    do_diff[i] = extract_l( NE_16( ( s_and( ( add( i, 1 ) ), 3 ) ), 1 ) );
                     move16();
                 }
                 ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB );
@@ -1150,7 +1148,7 @@ static void ivas_write_spar_md_bitstream_fx(
                 push_next_indice( hMetaData, 6, SPAR_NUM_CODING_STRAT_BITS );
                 FOR( i = 0; i < nB; i++ )
                 {
-                    do_diff[i] = (Word16) ( NE_16( ( s_and( ( add( i, 1 ) ), 3 ) ), 2 ) );
+                    do_diff[i] = extract_l( NE_16( ( s_and( ( add( i, 1 ) ), 3 ) ), 2 ) );
                     move16();
                 }
                 ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB );
@@ -1159,7 +1157,7 @@ static void ivas_write_spar_md_bitstream_fx(
                 push_next_indice( hMetaData, 7, SPAR_NUM_CODING_STRAT_BITS );
                 FOR( i = 0; i < nB; i++ )
                 {
-                    do_diff[i] = (Word16) ( NE_16( ( s_and( ( add( i, 1 ) ), 3 ) ), 3 ) );
+                    do_diff[i] = extract_l( NE_16( ( s_and( ( add( i, 1 ) ), 3 ) ), 3 ) );
                     move16();
                 }
                 ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB );
@@ -1327,6 +1325,7 @@ static Word16 ivas_get_arith_coded_bs_fx(
         {
             pred_cell_dims[i].dim1 = sub( add( ndm, ndec ), 1 );
             move16();
+            test();
             IF( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_md_flag )
             {
                 IF( GE_16( i, SPAR_DIRAC_SPLIT_START_BAND ) )
@@ -1665,7 +1664,7 @@ static void ivas_write_parameter_bitstream_dtx_fx(
     Word16 *num_dec,
     const Word16 num_bands )
 {
-    int16_t i, j;
+    Word16 i, j;
     Word32 val;
     Word16 idx;
     Word32 pr_min_max[2];
@@ -1752,7 +1751,7 @@ static void ivas_write_parameter_bitstream_dtx_fx(
         zero_pad_bits = sub( zero_pad_bits, 1 );
     }
 
-    WHILE( GT_16( zero_pad_bits, 0 ) )
+    WHILE( zero_pad_bits > 0 )
     {
         j = s_min( zero_pad_bits, 16 );
         push_next_indice( hMetaData, 0, j );
@@ -1803,7 +1802,7 @@ static void ivas_quant_c_per_band_fx(
         {
             C_re[k] = pband_coeffs->C_re_fx[i][j];
             move32();
-            k = add( k, 1 );
+            k++;
         }
     }
     ivas_quantise_real_values_enc_fx_varq( C_re, pQs->C.q_levels[0], pQs->C.min_fx, pQs->C.max_fx, pBand_coeffs_idx->drct_index_re, C_re, ndec * ( ndm - 1 ), q_C );
@@ -1815,7 +1814,7 @@ static void ivas_quant_c_per_band_fx(
         {
             pband_coeffs->C_quant_re_fx[i][j] = C_re[k];
             move32();
-            k = add( k, 1 );
+            k++;
         }
     }
 
diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h
index c05ce1ed02dffdf13a0b7b20bc37fa7ae0d5cdaa..f421fd034f4f3e6ab0cfe60915568b6d288abb9a 100644
--- a/lib_enc/ivas_stat_enc.h
+++ b/lib_enc/ivas_stat_enc.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,6 +39,9 @@
 #include "ivas_cnst.h"
 #include "stat_enc.h"
 #include "ivas_stat_com.h"
+#ifdef DEBUG_FORCE_DIR
+#include "debug.h"
+#endif
 
 /*----------------------------------------------------------------------------------*
  * DFT Stereo encoder structures
@@ -63,7 +66,7 @@ typedef struct stereo_itd_data_struct
     Word16 prev_index;
     Word32 prev_avg_max_fx;
     Word16 prev_avg_max_fx_e;
-    Word16 currFlatness_fx;
+    Word32 currFlatness_fx;
 
     /* Xtalk classifier */
     Word32 prev_m1_fx; // Q31
@@ -85,12 +88,8 @@ typedef struct stereo_itd_data_struct
     Word16 prev_sum_nrg_L_lb_fx_e;
     Word32 prev_xcorr_lb_fx[STEREO_DFT_XCORR_LB_MAX];
     Word16 prev_xcorr_lb_fx_e;
-#ifdef FIX_ISSUE_1092
     Word32 E_band_n_fx[STEREO_DFT_ITD_VAD_BAND_NUM]; /*E_band_n_exp*/
     Word16 E_band_n_exp[STEREO_DFT_ITD_VAD_BAND_NUM];
-#else
-    Word32 E_band_n_fx[STEREO_DFT_ITD_VAD_BAND_NUM]; /*Q0*/
-#endif
     Word32 xcorr_smooth_fx[STEREO_DFT_N_32k_ENC];
     Word16 xcorr_smooth_fx_e[STEREO_DFT_N_32k_ENC];
     Word32 lp_phat_peak_fx; /* low-pass GCC PHAT peak value */ // Q31
@@ -576,6 +575,7 @@ typedef struct ivas_stereo_classifier_data_structure
     Word32 non_sta_ch1_fx;
     Word16 non_sta_ch1_e;
     Word16 sp_div_ch1_fx;
+    Word16 sp_div_ch1_e;
     Word32 ps_sta_ch1_fx, ps_sta_ch2_fx;
     Word16 ps_sta_ch1_e, ps_sta_ch2_e;
     Word32 prev_g_IPD_fx;       // Q29
@@ -1179,7 +1179,7 @@ typedef struct stereo_dmx_evs_correlation_filter_structure
 {
     Word16 init_frmCntr;
 
-    Word16 isd_rate_s_fx;                            // Q15
+    Word32 isd_rate_s_fx;                            // Q31
     Word32 iccr_s_fx;                                // Q31
     Word32 ipd_ff_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX]; // Q31
     Word32 Pr_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX];     // Q31
@@ -1220,8 +1220,7 @@ typedef struct stereo_dmx_evs_enc_data_structure
     STEREO_DMX_EVS_POC_HANDLE hPOC;
     STEREO_DMX_EVS_PHA_HANDLE hPHA;
 
-
-    Word32 itd_fx; // Q16
+    Word16 itd_fx; // Q0
 
     Word32 pre_dmx_energy_fx[1];
     Word16 pre_dmx_energy_fx_e[1];
@@ -1292,10 +1291,13 @@ typedef struct encoder_config_structure
     Word16 Opt_PCA_ON;                             /* flag indicating PCA operation in SBA */
 
 #ifdef DEBUGGING
-/* debugging options */
-    Word16 stereo_mode_cmdl;                       /* stereo mode forced from the command-line  */
-    Word16 force;                                  /* parameter to force specific "core" of the Core-Coder*/
-    Word16 mdct_stereo_mode_cmdl;                  /* mdct stereo mode forced from command-line, employed only when DEBUG_FORCE_MDCT_STEREO_MODE is activated */
+    /* debugging options */
+    Word16 stereo_mode_cmdl;                        /* stereo mode forced from the command-line  */
+    Word16 force;                                   /* parameter to force specific "core" of the Core-Coder*/
+    Word16 mdct_stereo_mode_cmdl;                   /* mdct stereo mode forced from command-line, employed only when DEBUG_FORCE_MDCT_STEREO_MODE is activated */
+#ifdef DEBUG_FORCE_DIR
+    char force_dir[FORCE_DIR_MAX_LENGTH];           /* directory containing external binary files for modes/parameters enforcement (empty string indicates no enforcement) */
+#endif
 #endif
 
 
diff --git a/lib_enc/ivas_stereo_adapt_GR_enc.c b/lib_enc/ivas_stereo_adapt_GR_enc_fx.c
similarity index 92%
rename from lib_enc/ivas_stereo_adapt_GR_enc.c
rename to lib_enc/ivas_stereo_adapt_GR_enc_fx.c
index e5cd1da07ca953b8f15c89e553af153176f38e30..8e79b228875469ea0b56b50d505f7e59771346eb 100644
--- a/lib_enc/ivas_stereo_adapt_GR_enc.c
+++ b/lib_enc/ivas_stereo_adapt_GR_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,8 +33,7 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "stat_enc.h"
 #include "wmc_auto.h"
 #include "ivas_rom_com.h"
@@ -44,16 +43,16 @@
  * Local function prototypes
  *---------------------------------------------------------------------*/
 
-static int16_t adapt_GR_sg( const int16_t *in, const int16_t len, const int16_t no_symb, int16_t *nbits, int16_t *in_enc, const int16_t *map0, const int16_t no_GR_ord );
+static Word16 adapt_GR_sg_fx( const Word16 *in, const Word16 len, const Word16 no_symb, Word16 *nbits, Word16 *in_enc, const Word16 *map0, const Word16 no_GR_ord );
 
 
 /*---------------------------------------------------------------------*
- * calculate_diff()
+ * calculate_diff_fx()
  *
  * calculate difference wrt previous frame and maps it to positive integer
  *---------------------------------------------------------------------*/
 
-static void calculate_diff(
+static void calculate_diff_fx(
     const Word16 *in,   /* i  : current frame values  */
     const Word16 *prev, /* i  : previous frmae values */
     Word16 *in_diff,    /* o  : difference values     */
@@ -90,14 +89,14 @@ static void calculate_diff(
 
 
 /*---------------------------------------------------------------------*
- * calculate_bit_diff()
+ * calculate_bit_diff_fx()
  *
  * estimates the GR number of bits for encoding differential values
  * selects between GR order 0 or 1
  *---------------------------------------------------------------------*/
 
 /*! r: number of bits */
-static Word16 calculate_bit_diff(
+static Word16 calculate_bit_diff_fx(
     Word16 *in_diff,  /* i  : values to be encoded */
     Word16 len,       /* i  : number of params     */
     Word16 *flag_diff /* o  : selected GR order    */
@@ -153,7 +152,7 @@ Word16 adapt_GR_ief_fx(
     const Word16 no_GR_ord,         /*  i  : number of GR order to try 2: 0,1; 3:0,1,2        */
     Word16 *nbits_diff,             /*  o  : number bits in diff encoding                     */
     const Word16 side_gain_counter, /*  i  : number of frames since last abs coding           */
-    Word16 *side_gain_bitdiff_lp,   /*  i/o: LP-filtered bit difference between abs/diff      */
+    Word16 *side_gain_bitdiff_lp,   /*  i/o: LP-filtered bit difference between abs/diff    Q(q_side_gain_bitdiff_lp)  */
     Word16 *q_side_gain_bitdiff_lp, /*  i/o: Q of LP-filtered bit difference between abs/diff */
     const Word16 try_diff           /*  i  : diff coding allowed 1/0                          */
 )
@@ -163,12 +162,12 @@ Word16 adapt_GR_ief_fx(
     Word32 L_tmp, L_tmp1;
     Word16 exp_diff;
 
-    flag = adapt_GR_sg( in, len, no_symb, nbits, in_enc, map0, no_GR_ord );
+    flag = adapt_GR_sg_fx( in, len, no_symb, nbits, in_enc, map0, no_GR_ord );
 
     IF( try_diff ) /* inter-frame prediction allowed */
     {
-        calculate_diff( in, prev, in_diff, len );
-        nb_diff = calculate_bit_diff( in_diff, len, &flag_diff );
+        calculate_diff_fx( in, prev, in_diff, len );
+        nb_diff = calculate_bit_diff_fx( in_diff, len, &flag_diff );
         *nbits_diff = nb_diff;
         move16();
 
@@ -202,13 +201,13 @@ Word16 adapt_GR_ief_fx(
 
 
 /*---------------------------------------------------------------------*
- * adapt_GR_rpg1_ief()
+ * adapt_GR_rpg1_ief_fx()
  *
  *  use adaptive GR for RPG's considering also the differential case
  *---------------------------------------------------------------------*/
 
 /*! r: used GR order */
-Word16 adapt_GR_rpg1_ief(
+Word16 adapt_GR_rpg1_ief_fx(
     const Word16 *in,       /*  i  : res pred gains input vector                       */
     Word16 *in_diff,        /*  o  : encoded symbols in case of differential encoding  */
     const Word16 *prev,     /*  i  : previous frame data                               */
@@ -254,13 +253,13 @@ Word16 adapt_GR_rpg1_ief(
     }
     ELSE
     {
-        GR_ord = adapt_GR_sg( in, len, no_symb, nbits, in_enc, maps, no_GR_ord );
+        GR_ord = adapt_GR_sg_fx( in, len, no_symb, nbits, in_enc, maps, no_GR_ord );
     }
 
     IF( try_diff )
     {
-        calculate_diff( in, prev, in_diff, len );
-        nb_diff = calculate_bit_diff( in_diff, len, &flag_diff );
+        calculate_diff_fx( in, prev, in_diff, len );
+        nb_diff = calculate_bit_diff_fx( in_diff, len, &flag_diff );
         *nbits_diff = nb_diff;
         move16();
 
@@ -283,13 +282,13 @@ Word16 adapt_GR_rpg1_ief(
 
 
 /*---------------------------------------------------------------------*
- * adapt_GR_sg()
+ * adapt_GR_sg_fx()
  *
  * adaptive GR coding
  *---------------------------------------------------------------------*/
 
 /*! r: GR order */
-static Word16 adapt_GR_sg(
+static Word16 adapt_GR_sg_fx(
     const Word16 *in,      /* i  : data to be encoded                       */
     const Word16 len,      /* i  : number of params to be encoded           */
     const Word16 no_symb,  /* i  : max number of symbols                    */
@@ -411,13 +410,13 @@ static Word16 adapt_GR_sg(
 
 
 /*---------------------------------------------------------------------*
- * write_GR0()
+ * write_GR0_fx()
  *
  * write data with GR order 0
  *---------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-Word16 write_GR0(
+Word16 write_GR0_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle    */
     const Word16 ind,      /* i  : bitstream index             */
     const Word16 *in,      /* i  : data to be encoded          */
@@ -452,13 +451,13 @@ Word16 write_GR0(
 
 
 /*---------------------------------------------------------------------*
- * write_GR1()
+ * write_GR1_fx()
  *
  * write data with GR order 1
  *---------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-Word16 write_GR1(
+Word16 write_GR1_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle    */
     const Word16 ind,      /* i  : bitstream index             */
     const Word16 *in,      /* i  : data to be encoded          */
@@ -496,13 +495,13 @@ Word16 write_GR1(
 
 
 /*---------------------------------------------------------------------*
- * write_GR2()
+ * write_GR2_fx()
  *
  * write data with GR order 2
  *---------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-static Word16 write_GR2(
+static Word16 write_GR2_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle        */
     const Word16 ind,      /* i  : bitstream index         */
     const Word16 *in,      /* i  : data to be encoded      */
@@ -543,13 +542,13 @@ static Word16 write_GR2(
 
 
 /*---------------------------------------------------------------------*
- * write_bitstream_GR()
+ * write_bitstream_GR_fx()
  *
  * generic GR encoder for GR order 0 or 1
  *---------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-Word16 write_bitstream_GR(
+Word16 write_bitstream_GR_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
     const Word16 ind,      /* i  : bitstream index          */
     const Word16 *in,      /* i  : input vector             */
@@ -566,11 +565,11 @@ Word16 write_bitstream_GR(
 
     IF( GR_ord == 0 )
     {
-        nb = add( nb, write_GR0( hBstr, ind, in, len ) );
+        nb = add( nb, write_GR0_fx( hBstr, ind, in, len ) );
     }
     ELSE
     {
-        nb = add( nb, write_GR1( hBstr, ind, in, len ) );
+        nb = add( nb, write_GR1_fx( hBstr, ind, in, len ) );
     }
 
     return nb;
@@ -578,13 +577,13 @@ Word16 write_bitstream_GR(
 
 
 /*---------------------------------------------------------------------*
- * write_bitstream_adapt_GR()
+ * write_bitstream_adapt_GR_fx()
  *
  * write encoded data using adaptive GR
  *---------------------------------------------------------------------*/
 
 /*! r: number of bits written */
-Word16 write_bitstream_adapt_GR(
+Word16 write_bitstream_adapt_GR_fx(
     BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle                    */
     const Word16 ind,      /* i  : bitstream index                             */
     const Word16 *in,      /* i  : values to be written in bitstream           */
@@ -596,8 +595,9 @@ Word16 write_bitstream_adapt_GR(
     Word16 nb;
 
     nb = 0;
+    move16();
     /* first component first */
-    nb = add( nb, write_GR1( hBstr, ind, in, 1 ) );
+    nb = add( nb, write_GR1_fx( hBstr, ind, in, 1 ) );
 
     /* write the GR order */
     IF( EQ_16( no_GR_ord, 2 ) )
@@ -622,17 +622,17 @@ Word16 write_bitstream_adapt_GR(
 
     IF( GR_ord == 0 )
     {
-        nb = add( nb, write_GR0( hBstr, ind, &in[1], sub( len, 1 ) ) );
+        nb = add( nb, write_GR0_fx( hBstr, ind, &in[1], sub( len, 1 ) ) );
     }
     ELSE
     {
         IF( EQ_16( GR_ord, 1 ) )
         {
-            nb = add( nb, write_GR1( hBstr, ind, &in[1], sub( len, 1 ) ) );
+            nb = add( nb, write_GR1_fx( hBstr, ind, &in[1], sub( len, 1 ) ) );
         }
         ELSE
         {
-            nb = add( nb, write_GR2( hBstr, ind, &in[1], sub( len, 1 ) ) );
+            nb = add( nb, write_GR2_fx( hBstr, ind, &in[1], sub( len, 1 ) ) );
         }
     }
 
diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier_fx.c
similarity index 88%
rename from lib_enc/ivas_stereo_classifier.c
rename to lib_enc/ivas_stereo_classifier_fx.c
index 4ef371572a71cabeb96736ef5fecad35e4188d48..3a040517a84649f0647394974932d5df16f9b9ed 100644
--- a/lib_enc/ivas_stereo_classifier.c
+++ b/lib_enc/ivas_stereo_classifier_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -38,13 +38,11 @@
 #endif
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_enc.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------*
@@ -86,18 +84,18 @@
  * Local function prototypes
  *-------------------------------------------------------------------*/
 static void rc_filter_fx( const Word32 x, Word32 *y, const Word16 order, const Word32 tau );
-static void edge_detect( const Word32 *inp, const Word16 len, const Word32 inp_min, const Word32 inp_max, Word16 *edge_str, Word16 *edge_type );
+static void edge_detect_fx( const Word32 *inp, const Word16 len, const Word32 inp_min, const Word32 inp_max, Word16 *edge_str, Word16 *edge_type );
 
 static Word32 redge_detect_fx( const Word32 *inp, const Word16 len, const Word32 inp_min, const Word32 inp_max, Word16 *edge_min_e );
 
 /*-------------------------------------------------------------------*
- * Function select_stereo_mode()
+ * Function select_stereo_mode_fx()
  *
  * Select stereo technology based on output of stereo classifiers
  *-------------------------------------------------------------------*/
 
 /*! r: element mode */
-Word16 select_stereo_mode(
+Word16 select_stereo_mode_fx(
     CPE_ENC_HANDLE hCPE,          /* i/o: CPE encoder structure       */
     const IVAS_FORMAT ivas_format /* i  : IVAS format                 */
 )
@@ -130,11 +128,12 @@ Word16 select_stereo_mode(
 
     test();
     test();
+    test();
 #ifdef DEBUGGING
     IF( GE_32( hCPE->element_brate, MIN_BRATE_MDCT_STEREO ) || ( ( ( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) ) && LT_32( hCPE->element_brate, MASA_STEREO_MIN_BITRATE ) ) ) || ( hCPE->stereo_mode_cmdl == IVAS_CPE_DFT || hCPE->stereo_mode_cmdl == IVAS_CPE_TD ) )
 #else
-    IF( GE_32( hCPE->element_brate, MIN_BRATE_MDCT_STEREO ) || ( ( ( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) ) &&
-                                                                   LT_32( hCPE->element_brate, MASA_STEREO_MIN_BITRATE ) ) ) )
+    if ( GE_32( hCPE->element_brate, MIN_BRATE_MDCT_STEREO ) || ( ( ( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) ) &&
+                                                                    LT_32( hCPE->element_brate, MASA_STEREO_MIN_BITRATE ) ) ) )
 #endif
     {
         stereo_switching_flag = 0;
@@ -161,6 +160,7 @@ Word16 select_stereo_mode(
         test();
         test();
         test();
+        test();
         IF( EQ_16( stereo_switching_flag, 1 ) && GT_32( hCPE->element_brate, IVAS_13k2 ) && LT_16( hCPE->hCoreCoder[0]->hSpMusClas->past_dlp_fx[0], ONE_IN_Q9 ) && LT_32( hCPE->hCoreCoder[0]->hSpMusClas->wdlp_xtalk_fx, -335544 /* -0.01 in Q25 */ ) && EQ_16( hCPE->hCoreCoder[0]->vad_flag, 1 ) && ( hCPE->hStereoMdct->sw_uncorr || hStereoClassif->xtalk_decision ) )
         {
             hStereoClassif->lrtd_mode = 1;
@@ -183,7 +183,7 @@ Word16 select_stereo_mode(
         {
             test();
             test();
-            IF( ( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) ) && LT_32( hCPE->element_brate, MASA_STEREO_MIN_BITRATE ) )
+            if ( ( EQ_16( ivas_format, MASA_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) ) && LT_32( hCPE->element_brate, MASA_STEREO_MIN_BITRATE ) )
             {
                 element_mode = IVAS_CPE_DFT;
                 move16();
@@ -229,7 +229,7 @@ Word16 select_stereo_mode(
         test();
         IF( hCPE->hStereoTD->prev_fr_LRTD_TD_dec == 0 && GT_16( hCPE->hStereoTD->tdm_FD2LRTD_SW_cnt, 15 ) && GT_16( hCPE->hStereoTD->tdm_last_LRTD_frame_cnt, 3 ) && LT_16( hCPE->hCoreCoder[0]->clas, VOICED_CLAS ) && ( GE_32( hCPE->element_brate, IVAS_16k4 ) || LT_32( hStereoClassif->xtalk_wscore_fx, 21474836 /*0.01f in Q31*/ ) ) )
         {
-            IF( EQ_16( stereo_switching_flag, 1 ) )
+            if ( EQ_16( stereo_switching_flag, 1 ) )
             {
                 element_mode = IVAS_CPE_DFT;
                 move16();
@@ -241,6 +241,17 @@ Word16 select_stereo_mode(
         }
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
+    {
+        dbgread( &element_mode, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_element_mode.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &element_mode, sizeof( int16_t ), 1, 1, "res/force_element_mode.enf" );
+    }
+#endif
+
     IF( NE_16( hCPE->last_element_mode, element_mode ) )
     {
         test();
@@ -450,9 +461,9 @@ void stereo_classifier_features_ivas_fx(
     Word32 epsP_fx[],                     /* i  : LP analysis residual energies for each iteration*/
     Word16 pitch[],                       /* i  : open-loop pitch values for quantiz.         Q0  */
     Word16 voicing_fx[],                  /* i  : OL maximum normalized correlation           Q15 */
-    Word32 cor_map_sum_fx,                /* i  : speech/music clasif. parameter                  */
-    Word32 non_staX_fx,                   /* i  : unbound non-stationarity for sp/mu clas.        */
-    Word16 sp_div_fx,                     /* i  : spectral diversity feature                      */
+    Word32 cor_map_sum_fx,                /* i  : speech/music clasif. parameter      Q(31-cor_map_sum_e)            */
+    Word32 non_staX_fx,                   /* i  : unbound non-stationarity for sp/mu clas.  Q(31-non_staX_e)      */
+    Word16 sp_div_fx,                     /* i  : spectral diversity feature   Q(15-sp_div_e)                   */
     const Word16 clas,                    /* i  : signal class                                    */
     Word16 epsP_e,                        /*exponent for epsP_fx                                  */
     Word16 cor_map_sum_e,                 /*exponent for cor_map_sum_fx                           */
@@ -464,6 +475,8 @@ void stereo_classifier_features_ivas_fx(
     Word16 ener_e;
 
     Word32 lepsP_ch2_fx, ener_l_fx, ener_r_fx;
+    Word32 L_tmp;
+    Word16 exp;
     /* combine VAD flags from both channels */
     IF( idchan == 0 )
     {
@@ -494,12 +507,38 @@ void stereo_classifier_features_ivas_fx(
         move32();
         move16();
         /* update Etot_up and Etot_dn based on aEn */
+        exp = norm_l( hStereoClassif->ave_ener_L_fx );
+        if ( sub( hStereoClassif->ave_ener_L_fx_e, exp ) < 0 )
+        {
+            exp = hStereoClassif->ave_ener_L_fx_e;
+            move16();
+        }
+        hStereoClassif->ave_ener_L_fx = L_shl( hStereoClassif->ave_ener_L_fx, exp );
+        move32();
+        hStereoClassif->ave_ener_L_fx_e = sub( hStereoClassif->ave_ener_L_fx_e, exp );
+        move16();
+        exp = norm_l( hStereoClassif->ave_ener_R_fx );
+        if ( sub( hStereoClassif->ave_ener_R_fx_e, exp ) < 0 )
+        {
+            exp = hStereoClassif->ave_ener_R_fx_e;
+            move16();
+        }
+        hStereoClassif->ave_ener_R_fx = L_shl( hStereoClassif->ave_ener_R_fx, exp );
+        move32();
+        hStereoClassif->ave_ener_R_fx_e = sub( hStereoClassif->ave_ener_R_fx_e, exp );
+        move16();
         ener_l_fx = Mpy_32_16_1( BASOP_Util_Log10( L_add( L_shr( hStereoClassif->ave_ener_L_fx, 1 ), L_shr( ONE_IN_Q30, hStereoClassif->ave_ener_L_fx_e ) ), hStereoClassif->ave_ener_L_fx_e + 1 ), 10 << 11 ); /*q21*/
         ener_r_fx = Mpy_32_16_1( BASOP_Util_Log10( L_add( L_shr( hStereoClassif->ave_ener_R_fx, 1 ), L_shr( ONE_IN_Q30, hStereoClassif->ave_ener_R_fx_e ) ), hStereoClassif->ave_ener_R_fx_e + 1 ), 10 << 11 ); /*q21*/
         ener_e = 10;
         move16();
+
+        /*scaling Etot_buf_fx,Etot_up_fx and Etot_dn_fx to exponent ener_e*/
+        exp = L_norm_arr( hStereoClassif->Etot_buf_fx, 3 );
+        exp = s_min( exp, L_norm_arr( &hStereoClassif->Etot_up_fx, 1 ) );
+        exp = s_min( exp, L_norm_arr( &hStereoClassif->Etot_dn_fx, 1 ) );
+
         Copy32( &hStereoClassif->Etot_buf_fx[0], &hStereoClassif->Etot_buf_fx[1], UNCLR_L_ETOT - 1 );
-        IF( GE_16( hStereoClassif->e_Etot_buf_fx, ener_e ) )
+        IF( GE_16( sub( hStereoClassif->e_Etot_buf_fx, exp ), ener_e ) )
         {
             hStereoClassif->Etot_buf_fx[0] = L_shl( L_max( 0, L_max( ener_l_fx, ener_r_fx ) ), sub( ener_e, hStereoClassif->e_Etot_buf_fx ) ); /*scaling from q25 to 31-e_Etot_buf_fx*/
             move32();
@@ -570,7 +609,7 @@ void stereo_classifier_features_ivas_fx(
         IF( LT_32( L_shr( hStereoClassif->Etot_up_fx, 1 ), L_add( L_shr( hStereoClassif->Etot_dn_fx, 1 ), L_shl( 20, sub( 30, hStereoClassif->e_Etot_buf_fx ) ) ) ) ) /*right shifted by 1 to avoid avoid overflow in addition*/
         {
             hStereoClassif->Etot_dn_fx = L_shr( hStereoClassif->Etot_dn_fx, 1 );
-            scale_sig32( hStereoClassif->Etot_buf_fx, 3, -1 );
+            scale_sig32( hStereoClassif->Etot_buf_fx, 3, -1 ); // Q(31-(e_Etot_buf_fx+1))
             hStereoClassif->e_Etot_buf_fx = add( hStereoClassif->e_Etot_buf_fx, 1 );
             hStereoClassif->Etot_up_fx = L_add( hStereoClassif->Etot_dn_fx, L_shl( 20, sub( 31, hStereoClassif->e_Etot_buf_fx ) ) );
             move32();
@@ -598,6 +637,7 @@ void stereo_classifier_features_ivas_fx(
         move32();
 
         /* estimate VAD flag based on relative energy */
+
         IF( LT_32( hStereoClassif->relE_0_1_LT_fx, 214748365 /* 0.1f in Q31 */ ) )
         {
             hStereoClassif->vad_relE = 0;
@@ -618,7 +658,6 @@ void stereo_classifier_features_ivas_fx(
         Copy( lsf_new_fx, hStereoClassif->lsf_ch1_fx, M );
         hStereoClassif->lepsP_ch1_fx = L_shr( L_sub( BASOP_Util_Loge( L_add( epsP_fx[13], L_shr( 21474 /*1e-5*2^31*/, epsP_e ) ), epsP_e ), BASOP_Util_Loge( L_add( epsP_fx[0], L_shr( 21474 /*1e-5*2^31*/, epsP_e ) ), epsP_e ) ), 10 ); /*q15*/
         move32();
-        move16();
 
         hStereoClassif->xtalk_fv_fx[E_lsf_1] = Mpy_32_16_1( 419430400 /* 1/2.56f in Q30 */, lsf_new_fx[0] );   /*q15*/
         hStereoClassif->xtalk_fv_fx[E_lsf_4] = Mpy_32_16_1( 419430400 /* 1/2.56f in Q30 */, lsf_new_fx[3] );   /*q15*/
@@ -710,11 +749,12 @@ void stereo_classifier_features_ivas_fx(
         hStereoClassif->non_sta_ch1_fx = non_staX_fx;
         hStereoClassif->non_sta_ch1_e = non_staX_e;
         hStereoClassif->sp_div_ch1_fx = sp_div_fx;
+        hStereoClassif->sp_div_ch1_e = sp_div_e;
         hStereoClassif->xtalk_fv_fx[E_cor_map_sum] = L_shr( cor_map_sum_fx, sub( 16, cor_map_sum_e ) );                                                                                                                              /*q15*/
         hStereoClassif->xtalk_fv_fx[E_nchar] = L_shr( BASOP_Util_Loge( L_add( L_shr( hStereoClassif->nchar_ch1_fx, 1 ), L_shl( 1, sub( 30, hStereoClassif->nchar_ch1_e ) ) ), add( hStereoClassif->nchar_ch1_e, 1 ) ) /*q25*/, 10 ); /*q15*/
         hStereoClassif->xtalk_fv_fx[E_non_sta] = L_shr( non_staX_fx, sub( 16, non_staX_e ) );                                                                                                                                        /*q15*/
-        hStereoClassif->xtalk_fv_fx[E_sp_div] = L_shr( BASOP_Util_Loge( L_deposit_h( add( shr( sp_div_fx, 1 ), shl( 1, sub( 15 - 1, sp_div_e ) ) ) ), add( sp_div_e, 1 ) ), 10 );                                                    /*q15*/
-        move32();
+        L_tmp = BASOP_Util_Add_Mant32Exp( L_deposit_h( sp_div_fx ), sp_div_e, ONE_IN_Q31, 0, &exp );
+        hStereoClassif->xtalk_fv_fx[E_sp_div] = L_shr( BASOP_Util_Loge( L_tmp, exp ), 10 ); /*q15*/
         move32();
         move32();
         move32();
@@ -724,13 +764,19 @@ void stereo_classifier_features_ivas_fx(
         move16();
         move16();
         move16();
+        move16();
     }
     ELSE
     {
         hStereoClassif->xtalk_fv_fx[E_d_cor_map_sum] = L_abs( L_sub( L_shr( hStereoClassif->cor_map_sum_ch1_fx, sub( 16, hStereoClassif->cor_map_sum_ch1_e ) ) /*q15*/, L_shr( cor_map_sum_fx, sub( 16, cor_map_sum_e ) ) /*q15*/ ) );                                                                                                                                                                                    /*q15*/
         hStereoClassif->xtalk_fv_fx[E_d_nchar] = L_abs( L_shr( L_sub( BASOP_Util_Loge( L_add( L_shr( hStereoClassif->nchar_ch1_fx, 1 ), L_shl( 1, sub( 30, hStereoClassif->nchar_ch1_e ) ) ), add( hStereoClassif->nchar_ch1_e, 1 ) ), BASOP_Util_Loge( L_add( L_shr( hStereoClassif->nchar_ch2_fx, 1 ), L_shl( 1, sub( 30, hStereoClassif->nchar_ch2_e ) ) ), add( hStereoClassif->nchar_ch2_e, 1 ) ) ) /*q25*/, 10 ) ); /*q15*/
         hStereoClassif->xtalk_fv_fx[E_d_non_sta] = L_abs( L_sub( L_shr( hStereoClassif->non_sta_ch1_fx, sub( 16, hStereoClassif->non_sta_ch1_e ) ) /*q15*/, L_shr( non_staX_fx, sub( 16, non_staX_e ) ) /*q15*/ ) );                                                                                                                                                                                                      /*q15*/
-        hStereoClassif->xtalk_fv_fx[E_d_sp_div] = L_abs( L_shr( L_sub( BASOP_Util_Loge( L_deposit_h( add( shr( hStereoClassif->sp_div_ch1_fx, 1 ), shl( 1, sub( 15 - 1, sp_div_e ) ) ) ), add( sp_div_e, 1 ) ), BASOP_Util_Loge( L_deposit_h( add( shr( sp_div_fx, 1 ), shl( 1, sub( 15 - 1, sp_div_e ) ) ) ), add( sp_div_e, 1 ) ) ) /*q25*/, 10 ) );                                                                    /*q15*/
+        L_tmp = BASOP_Util_Add_Mant32Exp( L_deposit_h( sp_div_fx ), sp_div_e, ONE_IN_Q31, 0, &exp );
+        hStereoClassif->xtalk_fv_fx[E_d_sp_div] = L_shr( BASOP_Util_Loge( L_tmp, exp ), 10 ); /*q15*/
+        L_tmp = BASOP_Util_Add_Mant32Exp( L_deposit_h( hStereoClassif->sp_div_ch1_fx ), hStereoClassif->sp_div_ch1_e, ONE_IN_Q31, 0, &exp );
+        hStereoClassif->xtalk_fv_fx[E_d_sp_div] = L_abs( L_sub( L_shr( BASOP_Util_Loge( L_tmp, exp ), 10 ), hStereoClassif->xtalk_fv_fx[E_d_sp_div] ) ); /*q15*/
+        // hStereoClassif->xtalk_fv_fx[E_d_sp_div] = L_abs( L_shr( L_sub( BASOP_Util_Loge( L_deposit_h( add( shr( hStereoClassif->sp_div_ch1_fx, 1 ), shl( 1, sub( 15 - 1, hStereoClassif->sp_div_ch1_e ) ) ) ), add( hStereoClassif->sp_div_ch1_e, 1 ) ), BASOP_Util_Loge( L_deposit_h( add( shr( sp_div_fx, 1 ), shl( 1, sub( 15 - 1, sp_div_e ) ) ) ), add( sp_div_e, 1 ) ) ) /*q25*/, 10 ) );                                                                    /*q15*/
+        move32();
         move32();
         move32();
         move32();
@@ -844,7 +890,7 @@ void unclr_classifier_td_fx(
         move16();
 
         /* mean & std removal */
-        fvn = BASOP_Util_Divide3232_Scale_cadence( L_sub( hStereoClassif->unclr_fv_fx[ind], unclr_mean_td[i] ), unclr_scale_td[i], &exp );
+        fvn = BASOP_Util_Divide3232_Scale_newton( L_sub( hStereoClassif->unclr_fv_fx[ind], unclr_mean_td[i] ), unclr_scale_td[i], &exp );
         fvn = Mpy_32_32( fvn, unclr_coef_td[i] ); // Q = 31-exp+15-31 = 15-exp
         exp = add( exp, 16 );                     // exp = 31-(15-exp) = 16+exp
 
@@ -873,7 +919,31 @@ void unclr_classifier_td_fx(
     score = Mpy_32_32( score, hStereoClassif->relE_0_1_fx ); // Q31
 
     /* rising edge detection on relE */
-    relE_ST = Mean32( hStereoClassif->relE_buf_fx, UNCLR_L_RELE ); // Q31
+    Word32 L_tmp = 0, tmp32;
+    move32();
+    Word16 L_tmp_e = 0, flag = 0;
+    move16();
+    move16();
+    tmp32 = hStereoClassif->relE_buf_fx[0];
+    FOR( i = 0; i < UNCLR_L_RELE; i++ )
+    {
+        L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_e, hStereoClassif->relE_buf_fx[i], 0, &L_tmp_e );
+        IF( NE_32( tmp32, hStereoClassif->relE_buf_fx[i] ) )
+        {
+            flag = 1;
+            move16();
+        }
+    }
+    IF( EQ_16( flag, 1 ) )
+    {
+        relE_ST = L_shl( Mpy_32_32( L_tmp, ONE_BY_UNCLR_L_RELE_Q31 ), L_tmp_e ); // Q31
+    }
+    ELSE
+    {
+        relE_ST = hStereoClassif->relE_buf_fx[0];
+        move16();
+    }
+
     IF( hStereoClassif->relE_0_1_fx > relE_ST )
     {
         rc_filter_fx( hStereoClassif->relE_0_1_fx, hStereoClassif->unclr_relE_0_1_LT_fx, UNCLR_RC_ORDER, RC_FACT_UP_Q31 );
@@ -903,6 +973,16 @@ void unclr_classifier_td_fx(
         move16();
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
+    {
+        dbgread( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_unclr_decision.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, 1, "res/force_unclr_decision.enf" );
+    }
+#endif
 
     return;
 }
@@ -936,7 +1016,7 @@ void unclr_classifier_dft_fx(
 
         /* mean & std removal */
         // fvn[i] = (hStereoClassif->unclr_fv[ind] - unclr_mean_dft[i]) / unclr_scale_dft[i];
-        fvn[i] = BASOP_Util_Divide3232_Scale_cadence( L_sub( hStereoClassif->unclr_fv_fx[ind], unclr_mean_dft_Q15[i] ), unclr_scale_dft_Q15[i], &fvn_e[i] );
+        fvn[i] = BASOP_Util_Divide3232_Scale_newton( L_sub( hStereoClassif->unclr_fv_fx[ind], unclr_mean_dft_Q15[i] ), unclr_scale_dft_Q15[i], &fvn_e[i] );
         move32();
 
         /* LR */
@@ -975,7 +1055,32 @@ void unclr_classifier_dft_fx(
 
     /* rising edge detector on relE */
     // relE_ST = mean(hStereoClassif->relE_buf, UNCLR_L_RELE);
-    relE_ST = Mean32( hStereoClassif->relE_buf_fx, UNCLR_L_RELE ); // Q31
+    Word32 L_tmp = 0, tmp32;
+    move32();
+    Word16 L_tmp_e = 0, flag = 0;
+    move16();
+    move16();
+    tmp32 = hStereoClassif->relE_buf_fx[0];
+    move32();
+    FOR( i = 0; i < UNCLR_L_RELE; i++ )
+    {
+        L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_e, hStereoClassif->relE_buf_fx[i], 0, &L_tmp_e );
+        IF( NE_32( tmp32, hStereoClassif->relE_buf_fx[i] ) )
+        {
+            flag = 1;
+            move16();
+        }
+    }
+    IF( EQ_16( flag, 1 ) )
+    {
+        relE_ST = L_shl( Mpy_32_32( L_tmp, ONE_BY_UNCLR_L_RELE_Q31 ), L_tmp_e ); // Q31
+    }
+    ELSE
+    {
+        relE_ST = hStereoClassif->relE_buf_fx[0];
+        move16();
+    }
+
     IF( GT_32( hStereoClassif->relE_0_1_fx, relE_ST ) )
     {
         // rc_filter(hStereoClassif->relE_0_1, hStereoClassif->unclr_relE_0_1_LT, UNCLR_RC_ORDER, RC_FACT_UP);
@@ -1010,6 +1115,16 @@ void unclr_classifier_dft_fx(
         move16();
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
+    {
+        dbgread( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_unclr_decision.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, 1, "res/force_unclr_decision.enf" );
+    }
+#endif
 
     return;
 }
@@ -1042,7 +1157,7 @@ void xtalk_classifier_td_fx(
         move16();
 
         /* mean & std removal */
-        fvn = BASOP_Util_Divide3232_Scale_cadence( L_sub( hStereoClassif->xtalk_fv_fx[ind], xtalk_mean_td[i] ), xtalk_scale_td[i], &exp );
+        fvn = BASOP_Util_Divide3232_Scale_newton( L_sub( hStereoClassif->xtalk_fv_fx[ind], xtalk_mean_td[i] ), xtalk_scale_td[i], &exp );
         fvn = Mpy_32_32( fvn, xtalk_coef_td[i] ); // Q = 31-exp+15-31 = 15-exp
         exp = add( exp, 16 );                     // exp = 31-(15-exp) = 16+exp
 
@@ -1116,7 +1231,7 @@ void xtalk_classifier_td_fx(
         /* test rising edge (use 0 as edge_type because of newer->older buffer samples ordering) */
         edge_type = 0;
         move16();
-        edge_detect( hStereoClassif->xtalk_score_buf_fx, XTALK_SCORE_BUF_LEN, -53687091 /*-0.2f Q28*/, ONE_IN_Q28, &edge, &edge_type );
+        edge_detect_fx( hStereoClassif->xtalk_score_buf_fx, XTALK_SCORE_BUF_LEN, -53687091 /*-0.2f Q28*/, ONE_IN_Q28, &edge, &edge_type );
 
         test();
         IF( edge_type == 0 && LT_16( edge, 9830 /*0.3f Q15*/ ) )
@@ -1151,6 +1266,8 @@ void xtalk_classifier_td_fx(
     /* binary decision w. hysteresis (switch the decision only when coder_type is GC, UC or IC) */
     test();
     test();
+    test();
+    test();
     if ( ( hStereoClassif->unclr_decision == 0 && hStereoClassif->xtalk_decision == 0 && GT_32( hStereoClassif->xtalk_wscore_fx, 64424509 /*0.03f Q31*/ ) ) /*|| (hStereoClassif->xtalk_decision == 1 && hStereoClassif->xtalk_wscore < 0.00f)*/ && ( hStereoClassif->unclr_sw_enable_cnt[0] > 0 || hStereoClassif->unclr_sw_enable_cnt[1] > 0 ) )
     {
         /* let's switch the binary decision */
@@ -1158,6 +1275,17 @@ void xtalk_classifier_td_fx(
         move16();
     }
 
+#ifdef DEBUG_FORCE_DIR
+    if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
+    {
+        dbgread( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_xtalk_decision.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, 1, "res/force_xtalk_decision.enf" );
+    }
+#endif
+
     return;
 }
 
@@ -1185,7 +1313,14 @@ void xtalk_classifier_dft_fx(
     Word64 W_tmp;
 
     hStereoClassif = hCPE->hStereoClassif;
-    hItd = ( hCPE->hStereoDft != NULL ) ? hCPE->hStereoDft->hItd : hCPE->hStereoMdct->hItd;
+    IF( hCPE->hStereoDft != NULL )
+    {
+        hItd = hCPE->hStereoDft->hItd;
+    }
+    ELSE
+    {
+        hItd = hCPE->hStereoMdct->hItd;
+    }
 
     m1 = 0;
     move32();
@@ -1211,7 +1346,7 @@ void xtalk_classifier_dft_fx(
         m2 = L_abs( gcc_phat[0] );
         itd2 = -XTALK_PHAT_LEN;
         move16();
-        FOR( i = 1; i < sub( XTALK_PHAT_LEN, thr ); i++ )
+        FOR( i = 1; i < ( XTALK_PHAT_LEN - thr ); i++ )
         {
             IF( GT_32( L_abs( gcc_phat[i] ), m2 ) )
             {
@@ -1225,7 +1360,7 @@ void xtalk_classifier_dft_fx(
         m1 = L_abs( gcc_phat[itd + XTALK_PHAT_LEN] );
         m2 = L_abs( gcc_phat[XTALK_PHAT_LEN + thr + 1] );
         itd2 = add( thr, 1 );
-        FOR( i = add( XTALK_PHAT_LEN + 2, thr ); i < 2 * XTALK_PHAT_LEN + 1; i++ )
+        FOR( i = ( XTALK_PHAT_LEN + 2 + thr ); i < 2 * XTALK_PHAT_LEN + 1; i++ )
         {
             IF( GT_32( L_abs( gcc_phat[i] ), m2 ) )
             {
@@ -1237,7 +1372,7 @@ void xtalk_classifier_dft_fx(
 
     // ratio_m1_m2 = fabsf( m1 * m2 ) / fabsf( m1 + m2 + 1.0f );
     Word16 exp;
-    ratio_m1_m2 = BASOP_Util_Divide3232_Scale_cadence( L_abs( Mpy_32_32( m1, m2 ) ), L_abs( L_add( L_add( L_shr( m1, 2 ), L_shr( m2, 2 ) ), ONE_IN_Q29 ) ), &exp );
+    ratio_m1_m2 = BASOP_Util_Divide3232_Scale_newton( L_abs( Mpy_32_32( m1, m2 ) ), L_abs( L_add( L_add( L_shr( m1, 2 ), L_shr( m2, 2 ) ), ONE_IN_Q29 ) ), &exp );
     exp = sub( exp, 2 );
     // m2_m2 = hItd->prev_m2 * m2;
     m2_m2 = Mpy_32_32( hItd->prev_m2_fx, m2 );
@@ -1271,7 +1406,7 @@ void xtalk_classifier_dft_fx(
 
         /* mean & std removal */
         // fvn[i] = ( hStereoClassif->xtalk_fv[ind] - xtalk_mean_dft[i] ) / xtalk_scale_dft[i];
-        fvn[i] = BASOP_Util_Divide3232_Scale_cadence( L_sub( hStereoClassif->xtalk_fv_fx[ind], xtalk_mean_dft_q15[i] ), xtalk_scale_dft_q15[i], &exp ); // Q15
+        fvn[i] = BASOP_Util_Divide3232_Scale_newton( L_sub( hStereoClassif->xtalk_fv_fx[ind], xtalk_mean_dft_q15[i] ), xtalk_scale_dft_q15[i], &exp ); // Q15
         move32();
         fvn[i] = L_shl_sat( fvn[i], sub( exp, 2 ) ); // Q29
         move32();
@@ -1313,7 +1448,7 @@ void xtalk_classifier_dft_fx(
     /* rising edge detector on raw score -> yields 1 if strong rising edge is detected in the given buffer */
     Copy32( &hStereoClassif->xtalk_score_buf_fx[0], &hStereoClassif->xtalk_score_buf_fx[1], XTALK_SCORE_BUF_LEN - 1 );
     hStereoClassif->xtalk_score_buf_fx[0] = score;
-
+    move32();
     minimum_l( hStereoClassif->xtalk_score_buf_fx, XTALK_SCORE_BUF_LEN, &scr_min );
     maximum_l( hStereoClassif->xtalk_score_buf_fx, XTALK_SCORE_BUF_LEN, &scr_max );
 
@@ -1378,7 +1513,6 @@ void xtalk_classifier_dft_fx(
         move16();
     }
 
-
     /* updates */
     hItd->prev_m1_fx = m1;
     move32();
@@ -1389,6 +1523,17 @@ void xtalk_classifier_dft_fx(
     hItd->prev_itd2 = itd2;
     move16();
 
+#ifdef DEBUG_FORCE_DIR
+    if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
+    {
+        dbgread( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_xtalk_decision.enf", -1, -1, -1 ) );
+    }
+    else
+    {
+        dbgwrite( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, 1, "res/force_xtalk_decision.enf" );
+    }
+#endif
+
     return;
 }
 
@@ -1417,14 +1562,14 @@ static void rc_filter_fx(
 }
 
 /*-------------------------------------------------------------------*
- * Function edge_detect()
+ * Function edge_detect_fx()
  *
  * Rising/falling edge detection algorithm
  * Analyzes the input buffer and outputs strength and type of the detected edge (rising or falling)
  * Set edge_type to 0/1/2 when calling this function to specify the edge type you want to detect. The returned value will be modified
  * according to the edge type detected (-1 indicates that no edge has been detected)
  *-------------------------------------------------------------------*/
-static void edge_detect(
+static void edge_detect_fx(
     const Word32 *inp,    /* i  : input buffer                       Q31*/
     const Word16 len,     /* i  : length of the input buffer         Q0*/
     const Word32 inp_min, /* i  : minimum value for edge detection   Q28*/
@@ -1552,7 +1697,7 @@ static void edge_detect(
         }
     }
 
-    *edge_str = extract_l( L_shr( edge_min, 10 ) ); // Q15
+    *edge_str = extract_h( L_shl_sat( edge_min, 16 - 10 ) ); // Q15
     move16();
     *edge_type = et; // Q0
     move16();
@@ -1569,10 +1714,10 @@ static void edge_detect(
 
 /*! r: rising edge strength normalized to 0-1 */
 static Word32 redge_detect_fx(
-    const Word32 *inp,    /* i  : input buffer (ordered from newest to oldest values)*/
+    const Word32 *inp,    /* i  : input buffer (ordered from newest to oldest values) Q31*/
     const Word16 len,     /* i  : length of the input buffer                         */
-    const Word32 inp_min, /* i  : minimum value for edge detection                   */
-    const Word32 inp_max, /* i  : maximum value for edge detection                   */
+    const Word32 inp_min, /* i  : minimum value for edge detection                  Q31 */
+    const Word32 inp_max, /* i  : maximum value for edge detection                  Q31 */
     Word16 *edge_min_e )
 {
     Word16 i, j;
@@ -1610,7 +1755,7 @@ static Word32 redge_detect_fx(
     {
         // edge_slope = ( inp_max - inp_min ) / i;
         L_temp = BASOP_Util_Add_Mant32Exp( inp_max, 0, L_negate( inp_min ), 0, &L_temp_e );
-        edge_slope = BASOP_Util_Divide3232_Scale_cadence( L_temp, i, &edge_slope_e );
+        edge_slope = BASOP_Util_Divide3232_Scale_newton( L_temp, i, &edge_slope_e );
         edge_slope_e = add( edge_slope_e, sub( L_temp_e, 31 ) );
         edge[i] = err0;
         move32();
@@ -1643,7 +1788,7 @@ static Word32 redge_detect_fx(
         }
 
         // edge[i] /= i + 1;
-        edge[i] = BASOP_Util_Divide3232_Scale_cadence( edge[i], add( i, 1 ), &L_temp_e );
+        edge[i] = BASOP_Util_Divide3232_Scale_newton( edge[i], add( i, 1 ), &L_temp_e );
         move32();
         edge_e[i] = add( L_temp_e, sub( edge_e[i], 31 ) );
         move16();
diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc_fx.c
similarity index 97%
rename from lib_enc/ivas_stereo_cng_enc.c
rename to lib_enc/ivas_stereo_cng_enc_fx.c
index 059eb5b8ece1f40cdb757fd7ed2e23afbea72f35..b73a57f4690c86d566eb94bd7dadab969789f193 100644
--- a/lib_enc/ivas_stereo_cng_enc.c
+++ b/lib_enc/ivas_stereo_cng_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,12 +36,10 @@
 #include "cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 
@@ -103,7 +101,7 @@ void stereo_dft_enc_sid_calc_coh_fx(
                 L_tmp1_e = sub( add( hStereoDft->Spd_L_smooth_fx_e, hStereoDft->Spd_R_smooth_fx_e ), W_tmp_q );
                 L_tmp2 = BASOP_Util_Add_Mant32Exp( Mpy_32_32( hStereoDft->xspec_smooth_fx[2 * k], hStereoDft->xspec_smooth_fx[2 * k] ), shl( hStereoDft->xspec_smooth_fx_e[2 * k], 1 ), Mpy_32_32( hStereoDft->xspec_smooth_fx[2 * k + 1], hStereoDft->xspec_smooth_fx[2 * k + 1] ), shl( hStereoDft->xspec_smooth_fx_e[2 * k + 1], 1 ), &L_tmp2_e );
                 L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, EPSILON_FX_M, EPSILON_FX_E, &L_tmp2_e );
-                L_tmp3 = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &L_tmp3_e );
+                L_tmp3 = BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &L_tmp3_e );
                 L_tmp3_e = add( L_tmp3_e, sub( L_tmp1_e, L_tmp2_e ) );
                 L_tmp3 = Mpy_32_32( prev_cohBand[b], L_tmp3 );
                 xspec_scale = Sqrt32( L_tmp3, &L_tmp3_e );
@@ -139,7 +137,7 @@ void stereo_dft_enc_sid_calc_coh_fx(
                 L_tmp2 = W_extract_h( W_shl( W_tmp, W_tmp_q ) );
                 L_tmp2_e = sub( add( hStereoDft->Spd_L_smooth_fx_e, hStereoDft->Spd_R_smooth_fx_e ), W_tmp_q );
                 L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, EPSILON_FX_M, EPSILON_FX_E, &L_tmp2_e );
-                L_tmp3 = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &L_tmp3_e );
+                L_tmp3 = BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &L_tmp3_e );
                 L_tmp3_e = add( L_tmp3_e, sub( L_tmp1_e, L_tmp2_e ) );
                 L_tmp3 = Mpy_32_32( coh_weight, L_tmp3 );
                 L_tmp3_e = add( coh_weight_e, L_tmp3_e );
@@ -152,7 +150,7 @@ void stereo_dft_enc_sid_calc_coh_fx(
             IF( coh_weight_sum > 0 )
             {
                 // cohBand[b] = cohBand[b] / coh_weight_sum;
-                cohBand[b] = BASOP_Util_Divide3232_Scale_cadence( cohBand[b], coh_weight_sum, &L_tmp1_e );
+                cohBand[b] = BASOP_Util_Divide3232_Scale_newton( cohBand[b], coh_weight_sum, &L_tmp1_e );
                 move32();
                 cohBand_e[b] = add( L_tmp1_e, sub( cohBand_e[b], coh_weight_sum_e ) );
                 move16();
@@ -411,7 +409,7 @@ void stereo_dft_enc_sid_coh_fx(
             /* Write residual index to bitstream */
             IF( LE_16( add( add( res_index, 1 ), *nb_bits ), nr_of_sid_stereo_bits ) ) /* If the bit limit is reached, res_index = 0 is assumed for remaining indices */
             {
-                *nb_bits = add( *nb_bits, write_GR0( hBstr, IND_STEREO_DFT_SID_COH, &res_index, 1 ) );
+                *nb_bits = add( *nb_bits, write_GR0_fx( hBstr, IND_STEREO_DFT_SID_COH, &res_index, 1 ) );
                 move16();
             }
 
@@ -512,7 +510,7 @@ void stereo_dft_cng_side_gain_fx(
                 hStereoCng->prev_sg_average_fx[b] = hStereoCng->sg_average_fx[b];
                 move32();
                 // hStereoCng->sg_average[b] = hStereoCng->sg_average[b] / (float) hStereoCng->sg_average_counter;
-                hStereoCng->sg_average_fx[b] = BASOP_Util_Divide3232_Scale_cadence( hStereoCng->sg_average_fx[b], hStereoCng->sg_average_counter, &tmp_e );
+                hStereoCng->sg_average_fx[b] = BASOP_Util_Divide3232_Scale_newton( hStereoCng->sg_average_fx[b], hStereoCng->sg_average_counter, &tmp_e );
                 move32();
                 tmp_e = sub( tmp_e, 31 - 5 );
                 hStereoCng->sg_average_fx[b] = L_shl_r( hStereoCng->sg_average_fx[b], sub( tmp_e, 5 ) ); // Q31
@@ -537,7 +535,7 @@ void stereo_dft_cng_side_gain_fx(
                 tmp = hStereoCng->sg_average_fx[b];
                 move32();
                 // hStereoCng->sg_average[b] = ( hStereoCng->sg_average[b] + prev_weight * hStereoCng->prev_sg_average[b] ) / ( (float) hStereoCng->sg_average_counter + prev_weight * (float) hStereoCng->prev_sg_average_counter );
-                hStereoCng->sg_average_fx[b] = BASOP_Util_Divide3232_Scale_cadence( L_add( hStereoCng->sg_average_fx[b], Mpy_32_16_1( hStereoCng->prev_sg_average_fx[b], prev_weight ) ), L_add( L_shl( hStereoCng->sg_average_counter, Q15 ), L_mult0( prev_weight, hStereoCng->prev_sg_average_counter ) ), &tmp_e );
+                hStereoCng->sg_average_fx[b] = BASOP_Util_Divide3232_Scale_newton( L_add( hStereoCng->sg_average_fx[b], Mpy_32_16_1( hStereoCng->prev_sg_average_fx[b], prev_weight ) ), L_add( L_shl( hStereoCng->sg_average_counter, Q15 ), L_mult0( prev_weight, hStereoCng->prev_sg_average_counter ) ), &tmp_e );
                 move32();
                 tmp_e = sub( tmp_e, 16 - 5 );
                 hStereoCng->sg_average_fx[b] = L_shl_r( hStereoCng->sg_average_fx[b], sub( tmp_e, 5 ) ); // Q26
@@ -573,7 +571,7 @@ void stereo_dft_cng_side_gain_fx(
                 W_tmp_q = W_norm( W_tmp );
                 hStereoDft->sidSideGain_fx[b] = W_extract_h( W_shl( W_tmp, W_tmp_q ) );
                 move32();
-                hStereoDft->sidSideGain_fx[b] = BASOP_Util_Divide3232_Scale_cadence( hStereoDft->sidSideGain_fx[b], sgSum, &tmp_e );
+                hStereoDft->sidSideGain_fx[b] = BASOP_Util_Divide3232_Scale_newton( hStereoDft->sidSideGain_fx[b], sgSum, &tmp_e );
                 move32();
                 tmp_e = sub( tmp_e, W_tmp_q );
                 hStereoDft->sidSideGain_fx[b] = L_shl_sat( hStereoDft->sidSideGain_fx[b], tmp_e ); // Q31: saturation is fine since stereo_dft_quantize_res_gains_fx limits value to 1.0
diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc_fx.c
similarity index 96%
rename from lib_enc/ivas_stereo_dft_enc.c
rename to lib_enc/ivas_stereo_dft_enc_fx.c
index 119dfc31349edcceace0e2edd33ccefdb55900c9..80c4b5a21c8d67576543e593b880993231f2e9b9 100644
--- a/lib_enc/ivas_stereo_dft_enc.c
+++ b/lib_enc/ivas_stereo_dft_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,10 +37,8 @@
 #include "cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
 #include "prot_fx.h"
+#include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
@@ -595,10 +593,8 @@ void stereo_dft_enc_reset_fx(
     move16();
     hStereoDft->dmx_res_all_prev_fx = 1;
     move32();
-#ifdef MSAN_FIX
     hStereoDft->dmx_res_all_prev_fx_e = 31;
     move16();
-#endif
     hStereoDft->last_res_cod_mode_modify_flag = 0;
     move16();
     hStereoDft->res_cod_sw_flag = 0;
@@ -752,9 +748,7 @@ void stereo_enc_itd_init_fx(
     hItd->prev_xcorr_lb_fx_e = 0;
     move16();
     set32_fx( hItd->E_band_n_fx, ITD_VAD_E_BAND_N_INIT, STEREO_DFT_ITD_VAD_BAND_NUM );
-#ifdef FIX_ISSUE_1092
     set16_fx( hItd->E_band_n_exp, Q31, STEREO_DFT_ITD_VAD_BAND_NUM );
-#endif
     hItd->vad_frm_cnt = 0;
     move16();
     hItd->pre_vad = 0;
@@ -886,7 +880,7 @@ void stereo_dft_enc_update_fx(
     // hStereoDft->res_cod_line_max = (int16_t) ( 0.5f + ( hStereoDft->band_limits[hStereoDft->res_cod_band_max] - 1 ) * 2.f * hStereoDft->N / (float) ( hStereoDft->NFFT ) );
     Word32 tmp = L_shl( L_mult0( sub( hStereoDft->band_limits[hStereoDft->res_cod_band_max], 1 ), hStereoDft->N ), 1 );
     Word16 exp;
-    tmp = BASOP_Util_Divide3232_Scale_cadence( tmp, hStereoDft->N, &exp );
+    tmp = BASOP_Util_Divide3232_Scale_newton( tmp, hStereoDft->NFFT, &exp );
     hStereoDft->res_cod_line_max = extract_l( L_shr( tmp, sub( 31, exp ) ) );
     move16();
     // hStereoDft->res_cod_line_max = 8 * (hStereoDft->res_cod_line_max / 8);
@@ -1036,7 +1030,7 @@ void stereo_dft_enc_analyze_fx(
 
     FOR( n = 0; n < n_channels; n++ )
     {
-        Scale_sig( &mem[n][0], dft_ovl, sts[n]->q_inp - q_input_mem[n] ); // Q(sts[n]->q_inp)
+        Scale_sig( &mem[n][0], dft_ovl, sub( sts[n]->q_inp, q_input_mem[n] ) ); // Q(sts[n]->q_inp)
         q_input_mem[n] = sts[n]->q_inp;
         move16();
     }
@@ -1070,23 +1064,14 @@ void stereo_dft_enc_analyze_fx(
 
     Word16 q_shift, guarded_bits;
     guarded_bits = find_guarded_bits_fx( NFFT );
-    q_shift = sub( getScaleFactor32( pDFT_L, NFFT ), guarded_bits );
-    q_shift = s_min( q_shift, sub( getScaleFactor32( pDFT_R, NFFT ), guarded_bits ) );
-    FOR( Word16 j = 0; j < NFFT; j++ )
-    {
-        pDFT_L[j] = L_shl( pDFT_L[j], q_shift );
-        move32();
-    }
 
+    q_shift = sub( L_norm_arr( pDFT_L, NFFT ), guarded_bits );
+    scale_sig32( pDFT_L, NFFT, q_shift );
     DFT_e[0] = sub( DFT_e[0], q_shift );
     move16();
 
-    FOR( Word16 j = 0; j < NFFT; j++ )
-    {
-        pDFT_R[j] = L_shl( pDFT_R[j], q_shift );
-        move32();
-    }
-
+    q_shift = sub( L_norm_arr( pDFT_R, NFFT ), guarded_bits );
+    scale_sig32( pDFT_R, NFFT, q_shift );
     DFT_e[1] = sub( DFT_e[1], q_shift );
     move16();
 
@@ -1104,11 +1089,7 @@ void stereo_dft_enc_analyze_fx(
     {
         FOR( n = 0; n < n_channels; n++ )
         {
-#ifdef MSAN_FIX
             Scale_sig( hStereoDft->input_mem_itd_fx[n], dft_ovl, sub( sts[n]->q_inp, hStereoDft->q_input_mem_itd[n] ) ); // Q(sts[n]->q_inp)
-#else
-            Scale_sig( hStereoDft->input_mem_itd_fx[n], STEREO_DFT_OVL_MAX, sts[n]->q_inp - hStereoDft->q_input_mem_itd[n] );
-#endif // MSAN_FIX
             hStereoDft->q_input_mem_itd[n] = sts[n]->q_inp;
             move16();
             Copy( hStereoDft->input_mem_itd_fx[n], input_mem[n], dft_ovl );
@@ -1134,8 +1115,7 @@ void stereo_dft_enc_analyze_fx(
 
 Word32 stereo_dft_enc_synthesize_fx(
     STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle       */
-    // float *output,                         /* o  : output synthesis            */
-    Word32 *output_fx, /* o  : output synthesis           Q15 */
+    Word32 *output_fx,                     /* o  : output synthesis           Q15 */
     Word16 *output_start_index,
     Word16 *output_end_index,
     const Word16 chan,                 /* i  : channel number              */
@@ -1145,25 +1125,18 @@ Word32 stereo_dft_enc_synthesize_fx(
     Word16 *nrg_out_fx_e )
 {
     Word16 i, j, sign;
-    // float *pDFT_in;
     Word32 *pDFT_in_fx;
     Word16 DFT_in_fx_e;
     Word16 offset, NFFT, N, ovl, zp;
     Word16 temp_exp;
-    // float fac;
     Word32 fac_fx;
-    // float *mem;
     Word32 *mem_fx;
-    // const float *trigo, *win, *win_ana;
     const Word16 *trigo_fx;
     const Word32 *win_fx;
     const Word16 *win_ana_fx;
-    // float tmp[STEREO_DFT_N_MAX_ENC];
     Word32 tmp_fx[STEREO_DFT_N_MAX_ENC];
-    // float nrg;
     Word32 nrg_fx;
     Word16 nrg_fx_e;
-    // float trigo_enc[STEREO_DFT_N_MAX_ENC / 2 + 1];
     Word16 trigo_enc_fx[STEREO_DFT_N_MAX_ENC / 2 + 1];
     Word16 trigo_step;
     Word16 scal_fac;
@@ -1245,7 +1218,7 @@ Word32 stereo_dft_enc_synthesize_fx(
         zp = STEREO_DFT_ZP_12k8_ENC;
         move16();
         // fac = (float) ( NFFT ) / (float) ( hStereoDft->NFFT );
-        fac_fx = BASOP_Util_Divide3232_Scale_cadence( NFFT, hStereoDft->NFFT, &temp_exp );
+        fac_fx = BASOP_Util_Divide3232_Scale_newton( NFFT, hStereoDft->NFFT, &temp_exp );
         fac_fx = L_shl( fac_fx, temp_exp );
         ovl = STEREO_DFT_OVL_12k8;
         move16();
@@ -1269,7 +1242,7 @@ Word32 stereo_dft_enc_synthesize_fx(
         zp = STEREO_DFT_ZP_16k_ENC;
         move16();
         // fac = (float) ( NFFT ) / (float) ( hStereoDft->NFFT );
-        fac_fx = BASOP_Util_Divide3232_Scale_cadence( NFFT, hStereoDft->NFFT, &temp_exp );
+        fac_fx = BASOP_Util_Divide3232_Scale_newton( NFFT, hStereoDft->NFFT, &temp_exp );
         fac_fx = L_shl( fac_fx, temp_exp );
         ovl = STEREO_DFT_OVL_16k;
         move16();
@@ -1302,7 +1275,7 @@ Word32 stereo_dft_enc_synthesize_fx(
         zp = STEREO_DFT_ZP_32k_ENC;
         move16();
         // fac = (float) ( NFFT ) / (float) ( hStereoDft->NFFT );
-        fac_fx = BASOP_Util_Divide3232_Scale_cadence( NFFT, hStereoDft->NFFT, &temp_exp );
+        fac_fx = BASOP_Util_Divide3232_Scale_newton( NFFT, hStereoDft->NFFT, &temp_exp );
         fac_fx = L_shl( fac_fx, temp_exp );
         ovl = STEREO_DFT_OVL_32k;
         move16();
@@ -1326,7 +1299,7 @@ Word32 stereo_dft_enc_synthesize_fx(
         zp = STEREO_DFT_ZP_8k_ENC;
         move16();
         // fac = (float) ( NFFT ) / (float) ( hStereoDft->NFFT );
-        fac_fx = BASOP_Util_Divide3232_Scale_cadence( NFFT, hStereoDft->NFFT, &temp_exp );
+        fac_fx = BASOP_Util_Divide3232_Scale_newton( NFFT, hStereoDft->NFFT, &temp_exp );
         fac_fx = L_shl( fac_fx, temp_exp );
         ovl = STEREO_DFT_OVL_8k;
         move16();
@@ -1530,7 +1503,7 @@ Word32 stereo_dft_enc_synthesize_fx(
         move32();
         // output[offset + N + i] = ( tmp[zp + N + i] - ifft_deviation ) / win_ana[ovl - 1 - i] + ifft_deviation;
         Word16 L_temp_e;
-        Word32 L_temp = BASOP_Util_Divide3232_Scale_cadence( L_sub_sat( tmp_fx[zp + N + i], ifft_deviation ), L_deposit_h( win_ana_fx[ovl - 1 - i] ), &L_temp_e );
+        Word32 L_temp = BASOP_Util_Divide3232_Scale_newton( L_sub_sat( tmp_fx[zp + N + i], ifft_deviation ), L_deposit_h( win_ana_fx[ovl - 1 - i] ), &L_temp_e );
         L_temp = L_shl_sat( L_temp, L_temp_e );
         output_fx[offset + N + i] = L_add_sat( L_temp, ifft_deviation ); // Q15
         move32();
@@ -1632,7 +1605,7 @@ void stereo_dft_enc_process_fx(
     // hStereoDft->res_cod_line_max = (int16_t) ( 0.5f + ( hStereoDft->band_limits[hStereoDft->res_cod_band_max] - 1 ) * 2.f * input_frame / (float) ( hStereoDft->NFFT ) );
     tmp_32fx = L_shl( L_mult0( sub( hStereoDft->band_limits[hStereoDft->res_cod_band_max], 1 ), input_frame ), 1 );
     tmp_32fx = BASOP_Util_Divide3216_Scale( tmp_32fx, hStereoDft->NFFT, &tmp_e );
-    hStereoDft->res_cod_line_max = extract_l( L_shr_r( tmp_32fx, sub( 31, tmp_e ) ) );
+    hStereoDft->res_cod_line_max = extract_l( L_shr_r( tmp_32fx, sub( -1, tmp_e ) ) ); // 15 - (31 - 15 + tmp_e) = -1 - tmp_e
     move16();
     // hStereoDft->res_cod_line_max = 8 * (hStereoDft->res_cod_line_max / 8);
     hStereoDft->res_cod_line_max = shl( shr( hStereoDft->res_cod_line_max, 3 ), 3 );
@@ -1659,11 +1632,7 @@ void stereo_dft_enc_process_fx(
 
     pDFT_L_fx = hStereoDft->DFT_fx[0];
     pDFT_R_fx = hStereoDft->DFT_fx[1];
-#ifdef MSAN_FIX
     FOR( i = 0; i < hStereoDft->NFFT; i++ )
-#else
-    FOR( i = 0; i < STEREO_DFT_N_MAX_ENC; i++ )
-#endif // MSAN_FIX
     {
         tmp_e = norm_l( hStereoDft->DFT_fx[0][i] );
         pDFT_L_fx[i] = L_shl( hStereoDft->DFT_fx[0][i], tmp_e );
@@ -1706,20 +1675,22 @@ void stereo_dft_enc_process_fx(
 
             IF( alpha_fx >= 0 )
             {
+                c_fx = shr( c_fx, 1 );
+                s_fx = shr( s_fx, 1 );
                 FOR( i = 1; i < hStereoDft->NFFT / 2; i++ )
                 {
                     // tmp = s * c1 + c * s1;
-                    tmp_fx = add_sat( mult_r( s_fx, c1_fx ), mult_r( c_fx, s1_fx ) ); // saturation expected
+                    tmp_fx = add( mult_r( s_fx, c1_fx ), mult_r( c_fx, s1_fx ) );
                     // c = c * c1 - s * s1;
-                    c_fx = sub_sat( mult_r( c_fx, c1_fx ), mult_r( s_fx, s1_fx ) ); // saturation expected
+                    c_fx = sub( mult_r( c_fx, c1_fx ), mult_r( s_fx, s1_fx ) );
                     s_fx = tmp_fx;
                     move16();
 
                     /*time shift of L*/
                     // tmp = pDFT_L[2 * i] * c - pDFT_L[2 * i + 1] * s;
-                    tmp_32fx = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( pDFT_L_fx[2 * i], c_fx ), DFT_L_e_tmp[2 * i], L_negate( Mpy_32_16_1( pDFT_L_fx[2 * i + 1], s_fx ) ), DFT_L_e_tmp[2 * i + 1], &tmp_e );
+                    tmp_32fx = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( pDFT_L_fx[2 * i], c_fx ), add( DFT_L_e_tmp[2 * i], 1 ), L_negate( Mpy_32_16_1( pDFT_L_fx[2 * i + 1], s_fx ) ), add( DFT_L_e_tmp[2 * i + 1], 1 ), &tmp_e );
                     // pDFT_L[2 * i + 1] = pDFT_L[2 * i] * s + pDFT_L[2 * i + 1] * c;
-                    pDFT_L_fx[2 * i + 1] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( pDFT_L_fx[2 * i], s_fx ), DFT_L_e_tmp[2 * i], Mpy_32_16_1( pDFT_L_fx[2 * i + 1], c_fx ), DFT_L_e_tmp[2 * i + 1], &DFT_L_e_tmp[2 * i + 1] );
+                    pDFT_L_fx[2 * i + 1] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( pDFT_L_fx[2 * i], s_fx ), add( DFT_L_e_tmp[2 * i], 1 ), Mpy_32_16_1( pDFT_L_fx[2 * i + 1], c_fx ), add( DFT_L_e_tmp[2 * i + 1], 1 ), &DFT_L_e_tmp[2 * i + 1] );
                     move32();
                     // pDFT_L[2 * i] = tmp;
                     pDFT_L_fx[2 * i] = tmp_32fx;
@@ -1754,7 +1725,7 @@ void stereo_dft_enc_process_fx(
             }
 
             // if ( fabsf( hStereoDft->hItd->deltaItd[k_offset] * 32000.f / input_Fs ) > 80.0f )
-            tmp_32fx = L_abs( BASOP_Util_Divide3232_Scale_cadence( hStereoDft->hItd->deltaItd_fx[k_offset], input_Fs, &tmp_e ) );
+            tmp_32fx = L_abs( BASOP_Util_Divide3232_Scale_newton( hStereoDft->hItd->deltaItd_fx[k_offset], input_Fs, &tmp_e ) );
             tmp_e = add( tmp_e, 15 - 31 );
             IF( BASOP_Util_Cmp_Mant32Exp( tmp_32fx, tmp_e, 5368709 /* 80.0f / 32000.f in Q31 */, 0 ) > 0 )
             {
@@ -1862,8 +1833,28 @@ void stereo_dft_enc_process_fx(
 
             IF( pgIpd[0] != 0 )
             {
-                c_fx = shl_sat( getCosWord16( extract_l( pgIpd[0] ) ), 1 ); // Q15 saturation expected
-                s_fx = getSinWord16( extract_l( pgIpd[0] ) );               // Q15
+                Word32 theta = pgIpd[0];
+                WHILE( GT_32( theta, EVS_2PI_FX ) )
+                {
+                    theta = L_sub( theta, EVS_2PI_FX ); /* Q13 */
+                }
+                WHILE( LT_32( theta, -EVS_2PI_FX ) )
+                {
+                    theta = L_add( theta, EVS_2PI_FX ); /* Q13 */
+                }
+
+                IF( GT_32( theta, MAX_16 ) )
+                {
+                    theta = L_sub( theta, EVS_2PI_FX ); /* Q13 */
+                }
+                ELSE IF( LT_32( theta, MIN_16 ) )
+                {
+                    theta = L_add( theta, EVS_2PI_FX ); /* Q13 */
+                }
+
+                c_fx = shl_sat( getCosWord16( extract_l( theta ) ), 1 );
+                s_fx = getSinWord16( extract_l( theta ) );
+
                 FOR( i = hStereoDft->band_limits_dmx[b]; i < hStereoDft->band_limits_dmx[b + 1]; i++ )
                 {
                     /*rotate L*/
@@ -2027,13 +2018,13 @@ void stereo_dft_enc_process_fx(
                     // wR = sqrtf( 0.5f * ( comb_nrgL + comb_nrgR ) + frac_dot_prod ) / sum_abs;
                     L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp1, sub( L_tmp1_e, 1 ), frac_dot_prod, frac_dot_prod_e, &L_tmp1_e );
                     L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
-                    wR = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_abs, &wR_e );
+                    wR = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_abs, &wR_e );
                     wR_e = add( wR_e, sub( L_tmp1_e, sum_abs_e ) );
 
                     // wL = wR + sqrtf( 2.f ) * ( 1.f - ( sqrtf( Sr + Si ) / sum_abs ) );
                     L_tmp1 = BASOP_Util_Add_Mant32Exp( Sr, Sr_e, Si, Si_e, &L_tmp1_e );
                     L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
-                    L_tmp2 = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_abs, &L_tmp2_e );
+                    L_tmp2 = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_abs, &L_tmp2_e );
                     L_tmp2_e = add( L_tmp2_e, sub( L_tmp1_e, sum_abs_e ) );
                     L_tmp2 = L_shl_sat( L_tmp2, L_tmp2_e );                         // Q31 saturation expected
                     L_tmp1 = L_sub( MAX_32, L_tmp2 );                               // Q31
@@ -2112,13 +2103,13 @@ void stereo_dft_enc_process_fx(
                     // wR = sqrtf( 0.5f * ( comb_nrgL + comb_nrgR ) + frac_dot_prod ) / sum_abs;
                     L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp1, sub( L_tmp1_e, 1 ), frac_dot_prod, frac_dot_prod_e, &L_tmp1_e );
                     L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
-                    wR = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_abs, &wR_e );
+                    wR = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_abs, &wR_e );
                     wR_e = add( wR_e, sub( L_tmp1_e, sum_abs_e ) );
 
                     // wL = wR + sqrtf( 2.f ) * ( 1.f - ( sqrtf( Sr + Si ) / sum_abs ) );
                     L_tmp1 = BASOP_Util_Add_Mant32Exp( Sr, Sr_e, Si, Si_e, &L_tmp1_e );
                     L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
-                    L_tmp2 = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_abs, &L_tmp2_e );
+                    L_tmp2 = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_abs, &L_tmp2_e );
                     L_tmp2_e = add( L_tmp2_e, sub( L_tmp1_e, sum_abs_e ) );
                     L_tmp2 = L_shl_sat( L_tmp2, L_tmp2_e );                         // Q31 saturation expected
                     L_tmp1 = L_sub( MAX_32, L_tmp2 );                               // Q31
@@ -2192,7 +2183,7 @@ void stereo_dft_enc_process_fx(
                     // wR = sqrtf( 0.5f * ( sum_nrg_L2 + sum_nrg_R2 ) + dot_prod_nrg_ratio[b] ) / sum_abs;
                     L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp3, sub( L_tmp3_e, 1 ), dot_prod_nrg_ratio_fx[b], dot_prod_nrg_ratio_fx_e[b], &L_tmp1_e );
                     L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
-                    wR = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_abs, &wR_e );
+                    wR = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_abs, &wR_e );
                     wR_e = add( wR_e, sub( L_tmp1_e, sum_abs_e ) );
 
                     // wL = wR + sqrtf( 2.f ) * ( 1.f - sqrtf( sum_nrg_Mid ) / sum_abs );
@@ -2201,7 +2192,7 @@ void stereo_dft_enc_process_fx(
                     L_tmp1_e = sum_nrg_Mid_e;
                     move16();
                     L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
-                    L_tmp2 = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_abs, &L_tmp2_e );
+                    L_tmp2 = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_abs, &L_tmp2_e );
                     L_tmp2_e = add( L_tmp2_e, sub( L_tmp1_e, sum_abs_e ) );
                     L_tmp2 = L_shl_sat( L_tmp2, L_tmp2_e );                         // Q31 saturation expected
                     L_tmp1 = L_sub( MAX_32, L_tmp2 );                               // Q31
@@ -2479,7 +2470,7 @@ static void stereo_dft_enc_get_res_cod_mode_flag_fx(
         L_tmp1 = L_sub( MAX_32, g ); // Q31
         L_tmp2 = BASOP_Util_Add_Mant32Exp( hStereoDft->res_cod_NRG_S_fx[b], hStereoDft->res_cod_NRG_S_fx_e[b], Mpy_32_32( Mpy_32_32( L_tmp1, L_tmp1 ), hStereoDft->res_cod_NRG_M_fx[b] ), hStereoDft->res_cod_NRG_M_fx_e[b], &L_tmp2_e );
         L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, MAX_32, 0, &L_tmp2_e );
-        L_tmp1 = BASOP_Util_Divide3232_Scale_cadence( hStereoDft->res_cod_NRG_S_fx[b], L_tmp2, &L_tmp1_e );
+        L_tmp1 = BASOP_Util_Divide3232_Scale_newton( hStereoDft->res_cod_NRG_S_fx[b], L_tmp2, &L_tmp1_e );
         L_tmp1_e = add( L_tmp1_e, sub( hStereoDft->res_cod_NRG_S_fx_e[b], L_tmp2_e ) );
         L_tmp1 = L_shl( L_tmp1, L_tmp1_e ); // Q31
         *res_dmx_ratio = L_max( L_tmp1, *res_dmx_ratio );
@@ -2495,7 +2486,7 @@ static void stereo_dft_enc_get_res_cod_mode_flag_fx(
 
     /*Calculate the energy ratio of the inter-frame */
     //*frame_nrg_ratio = dmx_res_all / hStereoDft->dmx_res_all_prev;
-    *frame_nrg_ratio = BASOP_Util_Divide3232_Scale_cadence( dmx_res_all, hStereoDft->dmx_res_all_prev_fx, &L_tmp1_e );
+    *frame_nrg_ratio = BASOP_Util_Divide3232_Scale_newton( dmx_res_all, hStereoDft->dmx_res_all_prev_fx, &L_tmp1_e );
     move32();
     L_tmp1_e = add( L_tmp1_e, sub( dmx_res_all_e, hStereoDft->dmx_res_all_prev_fx_e ) );
     *frame_nrg_ratio = L_shr_r_sat( *frame_nrg_ratio, sub( 3, L_tmp1_e ) ); // Q28
@@ -2678,7 +2669,7 @@ static void stereo_dft_enc_get_res_cod_mode_flag_fx(
 
 void stereo_dft_enc_res_fx(
     STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle       */
-    const Word32 *input_8k,                /* i  : input buffer sampled at 8kHz Q16 */
+    const Word32 *input_8k,                /* i  : input buffer sampled at 8kHz Q15 */
     BSTR_ENC_HANDLE hBstr,                 /* i/o: bitstream handle            */
     Word16 *nb_bits,                       /* o  : number of bits written      */
     const Word16 max_bits )
@@ -2723,7 +2714,7 @@ void stereo_dft_enc_res_fx(
 
         /* MDCT analysis */
         // TCX_MDCT_flt( win, MDCT_RES, STEREO_DFT_OVL_8k, L_FRAME8k - STEREO_DFT_OVL_8k, STEREO_DFT_OVL_8k, IVAS_CPE_DFT );
-        MDCT_RES_e = 16;
+        MDCT_RES_e = 17;
         move16();
         TCX_MDCT( win, MDCT_RES, &MDCT_RES_e, STEREO_DFT_OVL_8k, L_FRAME8k - STEREO_DFT_OVL_8k, STEREO_DFT_OVL_8k, IVAS_CPE_DFT );
 
@@ -2742,14 +2733,14 @@ void stereo_dft_enc_res_fx(
             L_tmp2_e = hStereoDft->res_cod_NRG_M_fx_e[b];
             L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, hStereoDft->res_cod_NRG_S_fx[b], hStereoDft->res_cod_NRG_S_fx_e[b], &L_tmp2_e );
             L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, MAX_32, 0, &L_tmp2_e );
-            in_phase_ratio = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &in_phase_ratio_e );
+            in_phase_ratio = BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &in_phase_ratio_e );
             in_phase_ratio_e = add( in_phase_ratio_e, sub( hStereoDft->res_cod_NRG_M_fx_e[b], L_tmp2_e ) );
             in_phase_ratio = L_shl_sat( in_phase_ratio, in_phase_ratio_e ); // Q31 : bound from 0.0 to 1.0
             in_phase_ratio = L_max( 0, in_phase_ratio );
             // in_phase_ratio = check_bounds(in_phase_ratio, 0, 1);
 
             // res_cod_gain[b] = in_phase_ratio * STEREO_DFT_RES_COD_SNR_MIN + ( 1 - in_phase_ratio ) * STEREO_DFT_RES_COD_SNR_MAX;
-            res_cod_gain[b] = L_add( Mpy_32_32( in_phase_ratio, STEREO_DFT_RES_COD_SNR_MIN_Q25 ), Mpy_32_32( L_sub( MAX_32, in_phase_ratio ), STEREO_DFT_RES_COD_SNR_MAX ) ); // Q25
+            res_cod_gain[b] = L_add( Mpy_32_32( in_phase_ratio, STEREO_DFT_RES_COD_SNR_MIN_Q25 ), Mpy_32_32( L_sub( MAX_32, in_phase_ratio ), STEREO_DFT_RES_COD_SNR_MAX_Q25 ) ); // Q25
             move32();
 
             /*get the maximum through bands*/
@@ -2775,7 +2766,7 @@ void stereo_dft_enc_res_fx(
         push_wmops( "residual_encode" );
         /* residual encoding */
         ECSQ_init_instance_fx( &ecsq_inst, 0 /*dummy index*/, &range_uni_enc_state );
-        rc_uni_enc_init( &range_uni_enc_state );
+        rc_uni_enc_init_fx( &range_uni_enc_state );
 
         ecsq_inst.bit_count_estimate = 0;
         move32();
@@ -2786,7 +2777,7 @@ void stereo_dft_enc_res_fx(
         ECSQ_encode_target_SNR_fx( &ecsq_inst, MDCT_RES, MDCT_RES_e, hStereoDft->res_cod_line_max, max_snr, max_bits - ( *nb_bits ) - STEREO_DFT_RES_GLOBAL_GAIN_BITS - 2 - 8, NULL, &global_gain_index );
         IF( NE_16( global_gain_index, ECSQ_GLOBAL_GAIN_INDEX_ALL_ZERO ) )
         {
-            total_bit_count = rc_uni_enc_finish( &range_uni_enc_state );
+            total_bit_count = rc_uni_enc_finish_fx( &range_uni_enc_state );
 
             IF( LE_16( total_bit_count, sub( sub( max_bits, *nb_bits ), STEREO_DFT_RES_GLOBAL_GAIN_BITS ) ) )
             {
@@ -3038,11 +3029,11 @@ void stereo_dft_enc_write_BS_fx(
 
     IF( hStereoDft->side_gain_flag_1 == 0 )
     {
-        nb = add( nb, write_bitstream_adapt_GR( hBstr, IND_STEREO_DFT_SIDEGAINS, encoded_ind_GR, hStereoDft->nbands, hStereoDft->side_gain_flag_2, no_GR_ord ) );
+        nb = add( nb, write_bitstream_adapt_GR_fx( hBstr, IND_STEREO_DFT_SIDEGAINS, encoded_ind_GR, hStereoDft->nbands, hStereoDft->side_gain_flag_2, no_GR_ord ) );
     }
     ELSE{
         IF( EQ_16( hStereoDft->side_gain_flag_1, 2 ) ){
-            nb = add( nb, write_bitstream_GR( hBstr, IND_STEREO_DFT_SIDEGAINS, hStereoDft->side_gain_index_ECDiff, hStereoDft->nbands, hStereoDft->side_gain_flag_2 - no_GR_ord ) );
+            nb = add( nb, write_bitstream_GR_fx( hBstr, IND_STEREO_DFT_SIDEGAINS, hStereoDft->side_gain_index_ECDiff, hStereoDft->nbands, hStereoDft->side_gain_flag_2 - no_GR_ord ) );
 }
 ELSE
 {
@@ -3211,18 +3202,18 @@ IF( hStereoDft->res_pred_mode[k_offset] )
         {
             IF( EQ_16( encoded_ind_pred_GR[0], dft_maps_rpg[8 * NO_SYMB_GR_PRED_G] ) )
             {
-                nb = add( nb, write_GR1( hBstr, IND_STEREO_DFT_PRED_GAIN_COD, encoded_ind_pred_GR, 1 ) );
+                nb = add( nb, write_GR1_fx( hBstr, IND_STEREO_DFT_PRED_GAIN_COD, encoded_ind_pred_GR, 1 ) );
             }
             ELSE
             {
-                nb = add( nb, write_bitstream_adapt_GR( hBstr, IND_STEREO_DFT_PRED_GAIN_COD, encoded_ind_pred_GR, nbands - hStereoDft->res_pred_band_min, hStereoDft->res_pred_flag_2, 2 ) );
+                nb = add( nb, write_bitstream_adapt_GR_fx( hBstr, IND_STEREO_DFT_PRED_GAIN_COD, encoded_ind_pred_GR, nbands - hStereoDft->res_pred_band_min, hStereoDft->res_pred_flag_2, 2 ) );
             }
         }
         ELSE
         {
             IF( EQ_16( hStereoDft->res_pred_flag_1, 2 ) )
             {
-                nb = add( nb, write_bitstream_GR( hBstr, IND_STEREO_DFT_PRED_GAIN_COD, &hStereoDft->res_pred_index_ECDiff[hStereoDft->res_pred_band_min], nbands - hStereoDft->res_pred_band_min, hStereoDft->res_pred_flag_2 - no_GR_ord ) );
+                nb = add( nb, write_bitstream_GR_fx( hBstr, IND_STEREO_DFT_PRED_GAIN_COD, &hStereoDft->res_pred_index_ECDiff[hStereoDft->res_pred_band_min], nbands - hStereoDft->res_pred_band_min, hStereoDft->res_pred_flag_2 - no_GR_ord ) );
             }
             ELSE
             {
@@ -3281,8 +3272,8 @@ static void stereo_dft_enc_compute_prm_fx(
     Word32 *dot_prod_nrg_ratio_fx, // Q(31-dot_prod_nrg_ratio_fx_e[])
     Word16 *dot_prod_nrg_ratio_fx_e )
 {
-    int16_t b, i;
-    int16_t b2;
+    Word16 b, i;
+    Word16 b2;
     Word32 *pDFT_L, *pDFT_R;
     // Word16 DFT_L_e, DFT_R_e;
     Word32 sum_nrg_L, sum_nrg_R;
@@ -3331,7 +3322,7 @@ static void stereo_dft_enc_compute_prm_fx(
     Word16 sum_past_dot_prod_abs_e, sum_past_dot_prod_abs2_e = 0;
     Word32 sum_past_nrg_dmx;
     Word16 sum_past_nrg_dmx_e;
-    int16_t pos;
+    Word16 pos;
     Word32 pIpd[STEREO_DFT_BAND_MAX];       // Q13
     Word32 ipd_smooth[STEREO_DFT_BAND_MAX]; // Q13
     Word32 ipd_mean_change;                 // Q13
@@ -3513,7 +3504,7 @@ static void stereo_dft_enc_compute_prm_fx(
                 W_shift = W_norm( W_tmp );
                 L_tmp2 = W_extract_h( W_shl( W_tmp, W_shift ) );
                 L_tmp2_e = sub( add( sub_nrg_DMX2_e, 31 ), W_shift );
-                L_tmp = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &L_tmp_e );
+                L_tmp = BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &L_tmp_e );
                 L_tmp_e = add( L_tmp_e, sub( L_tmp1_e, L_tmp2_e ) );
                 L_tmp = L_shl( L_tmp, L_tmp_e );         // Q31hStereoDft->gainIPD_sm_fx = L_add( L_shr( hStereoDft->gainIPD_sm_fx, 1 ), L_
                 gain_IPD = L_add_sat( gain_IPD, L_tmp ); // Q31: saturation expected
@@ -3598,7 +3589,7 @@ static void stereo_dft_enc_compute_prm_fx(
                 // dot_prod_nrg_ratio[b2] = sum_past_dot_prod_abs2 / ( sum_past_nrgL2 + sum_past_nrgR2 + EPSILON );
                 L_tmp2 = BASOP_Util_Add_Mant32Exp( sum_past_nrgL2, sum_past_nrgL2_e, sum_past_nrgR2, sum_past_nrgR2_e, &L_tmp2_e );
                 L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, EPSILON_FX_M, EPSILON_FX_E, &L_tmp2_e );
-                dot_prod_nrg_ratio_fx[b2] = BASOP_Util_Divide3232_Scale_cadence( sum_past_dot_prod_abs2, L_tmp2, &L_tmp_e );
+                dot_prod_nrg_ratio_fx[b2] = BASOP_Util_Divide3232_Scale_newton( sum_past_dot_prod_abs2, L_tmp2, &L_tmp_e );
                 move32();
                 L_tmp_e = add( L_tmp_e, sub( sum_past_dot_prod_abs2_e, L_tmp2_e ) );
                 dot_prod_nrg_ratio_fx[b2] = L_shl( dot_prod_nrg_ratio_fx[b2], L_tmp_e ); // Q31
@@ -3625,7 +3616,7 @@ static void stereo_dft_enc_compute_prm_fx(
                     // dot_prod_nrg_ratio[b2] /= ( sum_nrg_L2 + sum_nrg_R2 + EPSILON );
                     L_tmp2 = BASOP_Util_Add_Mant32Exp( sum_nrg_L2, sum_nrg_L2_e, sum_nrg_R2, sum_nrg_R2_e, &L_tmp2_e );
                     L_tmp2 = BASOP_Util_Add_Mant32Exp( L_tmp2, L_tmp2_e, EPSILON_FX_M, EPSILON_FX_E, &L_tmp2_e );
-                    dot_prod_nrg_ratio_fx[b2] = BASOP_Util_Divide3232_Scale_cadence( dot_prod_nrg_ratio_fx[b2], L_tmp2, &L_tmp_e );
+                    dot_prod_nrg_ratio_fx[b2] = BASOP_Util_Divide3232_Scale_newton( dot_prod_nrg_ratio_fx[b2], L_tmp2, &L_tmp_e );
                     move32();
                     L_tmp_e = add( L_tmp_e, sub( dot_prod_nrg_ratio_fx_e[b2], L_tmp2_e ) );
                     dot_prod_nrg_ratio_fx[b2] = L_shl( dot_prod_nrg_ratio_fx[b2], L_tmp_e ); // Q31
@@ -3692,7 +3683,7 @@ static void stereo_dft_enc_compute_prm_fx(
         }
 
         // c = sqrtf( sum_past_nrgL / sum_past_nrgR );
-        c = BASOP_Util_Divide3232_Scale_cadence( sum_past_nrgL, sum_past_nrgR, &c_e );
+        c = BASOP_Util_Divide3232_Scale_newton( sum_past_nrgL, sum_past_nrgR, &c_e );
         c_e = add( c_e, sub( sum_past_nrgL_e, sum_past_nrgR_e ) );
         c = Sqrt32( c, &c_e );
         // sum_past_nrg_dmx = sum_past_nrgL + sum_past_nrgR + 2 * sum_past_dot_prod_abs;
@@ -3719,7 +3710,7 @@ static void stereo_dft_enc_compute_prm_fx(
         {
             // g = ( sum_past_nrgL - sum_past_nrgR ) / ( sum_past_nrg_dmx );
             L_tmp1 = BASOP_Util_Add_Mant32Exp( sum_past_nrgL, sum_past_nrgL_e, L_negate( sum_past_nrgR ), sum_past_nrgR_e, &L_tmp1_e );
-            L_tmp = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, sum_past_nrg_dmx, &L_tmp_e );
+            L_tmp = BASOP_Util_Divide3232_Scale_newton( L_tmp1, sum_past_nrg_dmx, &L_tmp_e );
             L_tmp_e = add( L_tmp_e, sub( L_tmp1_e, sum_past_nrg_dmx_e ) );
             g = L_shl_sat( L_tmp, L_tmp_e ); // Q31 saturation expected
             pSideGain[b] = g;
@@ -3732,7 +3723,7 @@ static void stereo_dft_enc_compute_prm_fx(
             // pSideGain[b] = ( c - 1 ) / ( c + 1 );
             L_tmp1 = BASOP_Util_Add_Mant32Exp( c, c_e, MIN_32, 0, &L_tmp1_e );
             L_tmp2 = BASOP_Util_Add_Mant32Exp( c, c_e, MAX_32, 0, &L_tmp2_e );
-            L_tmp = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &L_tmp_e );
+            L_tmp = BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &L_tmp_e );
             L_tmp_e = add( L_tmp_e, sub( L_tmp1_e, L_tmp2_e ) );
             pSideGain[b] = L_shl_sat( L_tmp, L_tmp_e ); // Q31 saturation expected
             move32();
@@ -3775,7 +3766,7 @@ static void stereo_dft_enc_compute_prm_fx(
 
             // pPredGain[b] = sqrtf( pPredGain[b] / ( reg + sum_past_nrg_dmx ) );
             L_tmp2 = BASOP_Util_Add_Mant32Exp( reg, reg_e, sum_past_nrg_dmx, sum_past_nrg_dmx_e, &L_tmp2_e );
-            L_tmp1 = BASOP_Util_Divide3232_Scale_cadence( L_tmp, L_tmp2, &L_tmp1_e );
+            L_tmp1 = BASOP_Util_Divide3232_Scale_newton( L_tmp, L_tmp2, &L_tmp1_e );
             L_tmp1_e = add( L_tmp1_e, sub( L_tmp_e, L_tmp2_e ) );
             L_tmp1 = Sqrt32( L_tmp1, &L_tmp1_e );
             pPredGain[b] = L_shl( L_tmp1, L_tmp1_e ); // Q31
@@ -3914,14 +3905,14 @@ static void stereo_dft_enc_compute_prm_fx(
     }
 
     // c = sqrtf( sum_energy_L / sum_energy_R );
-    c = BASOP_Util_Divide3232_Scale_cadence( sum_energy_L, sum_energy_R, &c_e );
+    c = BASOP_Util_Divide3232_Scale_newton( sum_energy_L, sum_energy_R, &c_e );
     c_e = add( c_e, sub( sum_energy_L_e, sum_energy_R_e ) );
     c = Sqrt32( c, &c_e );
 
     // g = fabsf( ( c - 1 ) / ( c + 1 ) );
     L_tmp1 = BASOP_Util_Add_Mant32Exp( c, c_e, MIN_32, 0, &L_tmp1_e );
     L_tmp2 = BASOP_Util_Add_Mant32Exp( c, c_e, MAX_32, 0, &L_tmp2_e );
-    g = L_abs( BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &L_tmp_e ) );
+    g = L_abs( BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &L_tmp_e ) );
     L_tmp_e = add( L_tmp_e, sub( L_tmp1_e, L_tmp2_e ) );
     g = L_shl_sat( g, L_tmp_e ); // Q31 saturation expected
     IF( GT_32( g, 1717986918 /*0.8f in Q31*/ ) )
@@ -4176,7 +4167,7 @@ static void res_pred_gain_mode_decision_fx(
             no_GR_ord = 2;
             move16();
 
-            hStereoDft->res_pred_flag_2 = adapt_GR_rpg1_ief( &hStereoDft->res_pred_index_EC[hStereoDft->res_pred_band_min], &hStereoDft->res_pred_index_ECDiff[hStereoDft->res_pred_band_min], &hStereoDft->res_pred_index_ECprevious[hStereoDft->res_pred_band_min], nbands - hStereoDft->res_pred_band_min, NO_SYMB_GR_PRED_G, &n_bits, encoded_ind_pred_GR, dft_maps_rpg, &nb_diff, no_GR_ord, try_diff );
+            hStereoDft->res_pred_flag_2 = adapt_GR_rpg1_ief_fx( &hStereoDft->res_pred_index_EC[hStereoDft->res_pred_band_min], &hStereoDft->res_pred_index_ECDiff[hStereoDft->res_pred_band_min], &hStereoDft->res_pred_index_ECprevious[hStereoDft->res_pred_band_min], nbands - hStereoDft->res_pred_band_min, NO_SYMB_GR_PRED_G, &n_bits, encoded_ind_pred_GR, dft_maps_rpg, &nb_diff, no_GR_ord, try_diff );
             move16();
 
             FOR( i = 0; i < nbands; i++ )
@@ -4327,7 +4318,7 @@ static Word32 stereo_dft_calc_mean_ipd_change_fx(
         ipd_mean_change = L_add( ipd_mean_change, ipd_change[b] );
     }
     // ipd_mean_change /= gipd_band_max;
-    ipd_mean_change = BASOP_Util_Divide3232_Scale_cadence( ipd_mean_change, gipd_band_max, &ipd_mean_change_e );
+    ipd_mean_change = BASOP_Util_Divide3232_Scale_newton( ipd_mean_change, gipd_band_max, &ipd_mean_change_e );
     ipd_mean_change_e = add( ipd_mean_change_e, 18 - 31 );
     ipd_mean_change = L_shr( ipd_mean_change, sub( 18, ipd_mean_change_e ) ); // Q13
 
@@ -4511,13 +4502,13 @@ static void stereo_dft_enc_get_reverb_flag_fx(
         FOR( b = 0; b <= s_min( hStereoDft->nbands, 6 ); b++ ) /* choose the subbands used for stereo filling */
         {
             // norm_dmx = ((hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]) / sub_nrg_DMX[b]);
-            norm_dmx = BASOP_Util_Divide3232_Scale_cadence( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_DMX[b], &norm_dmx_e );
+            norm_dmx = BASOP_Util_Divide3232_Scale_newton( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_DMX[b], &norm_dmx_e );
             norm_dmx_e = add( norm_dmx_e, sub( 31, sub_nrg_DMX_e[b] ) );
             // norm_l = ((hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]) / sub_nrg_L[b]);
-            norm_l = BASOP_Util_Divide3232_Scale_cadence( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_L[b], &norm_l_e );
+            norm_l = BASOP_Util_Divide3232_Scale_newton( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_L[b], &norm_l_e );
             norm_l_e = add( norm_l_e, sub( 31, sub_nrg_L_e[b] ) );
             // norm_r = ((hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]) / sub_nrg_R[b]);
-            norm_r = BASOP_Util_Divide3232_Scale_cadence( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_R[b], &norm_r_e );
+            norm_r = BASOP_Util_Divide3232_Scale_newton( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_R[b], &norm_r_e );
             norm_r_e = add( norm_r_e, sub( 31, sub_nrg_R_e[b] ) );
 
             FOR( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ ) /* normalization on each subbands */
@@ -4563,13 +4554,13 @@ static void stereo_dft_enc_get_reverb_flag_fx(
             FOR( ; b < s_min( hStereoDft->nbands, 10 ); b++ ) /* choose the subbands used for stereo filling */
             {
                 // norm_dmx = ((hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]) / sub_nrg_DMX[b]);
-                norm_dmx = BASOP_Util_Divide3232_Scale_cadence( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_DMX[b], &norm_dmx_e );
+                norm_dmx = BASOP_Util_Divide3232_Scale_newton( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_DMX[b], &norm_dmx_e );
                 norm_dmx_e = add( norm_dmx_e, sub( 31, sub_nrg_DMX_e[b] ) );
                 // norm_l = ((hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]) / sub_nrg_L[b]);
-                norm_l = BASOP_Util_Divide3232_Scale_cadence( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_L[b], &norm_l_e );
+                norm_l = BASOP_Util_Divide3232_Scale_newton( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_L[b], &norm_l_e );
                 norm_l_e = add( norm_l_e, sub( 31, sub_nrg_L_e[b] ) );
                 // norm_r = ((hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]) / sub_nrg_R[b]);
-                norm_r = BASOP_Util_Divide3232_Scale_cadence( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_R[b], &norm_r_e );
+                norm_r = BASOP_Util_Divide3232_Scale_newton( sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), sub_nrg_R[b], &norm_r_e );
                 norm_r_e = add( norm_r_e, sub( 31, sub_nrg_R_e[b] ) );
 
                 FOR( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ ) /* normalization on each subbands */
@@ -4615,7 +4606,7 @@ static void stereo_dft_enc_get_reverb_flag_fx(
         FOR( b = 0; b < hStereoDft->nbands; b++ ) /* choose the subbands used for stereo filling */
         {
             // sub_nrg_DMX[b] /= (hStereoDft->band_limits[b + 1] - hStereoDft->band_limits[b]);
-            sub_nrg_DMX[b] = BASOP_Util_Divide3232_Scale_cadence( sub_nrg_DMX[b], sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), &L_tmp_e );
+            sub_nrg_DMX[b] = BASOP_Util_Divide3232_Scale_newton( sub_nrg_DMX[b], sub( hStereoDft->band_limits[b + 1], hStereoDft->band_limits[b] ), &L_tmp_e );
             move32();
             sub_nrg_DMX_e[b] = add( L_tmp_e, sub( sub_nrg_DMX_e[b], 31 ) );
             move16();
@@ -4736,12 +4727,12 @@ static void stereo_dft_enc_get_reverb_flag_fx(
         // fac = ((diff_l_l > diff_r_l) ? diff_r_l / diff_l_l : diff_l_l / diff_r_l);
         IF( BASOP_Util_Cmp_Mant32Exp( diff_l_l, diff_l_l_e, diff_r_l, diff_r_l_e ) > 0 )
         {
-            fac = BASOP_Util_Divide3232_Scale_cadence( diff_r_l, diff_l_l, &L_tmp_e );
+            fac = BASOP_Util_Divide3232_Scale_newton( diff_r_l, diff_l_l, &L_tmp_e );
             L_tmp_e = add( L_tmp_e, sub( diff_r_l_e, diff_l_l_e ) );
         }
         ELSE
         {
-            fac = BASOP_Util_Divide3232_Scale_cadence( diff_l_l, diff_r_l, &L_tmp_e );
+            fac = BASOP_Util_Divide3232_Scale_newton( diff_l_l, diff_r_l, &L_tmp_e );
             L_tmp_e = add( L_tmp_e, sub( diff_l_l_e, diff_r_l_e ) );
         }
         fac = L_shl_sat( fac, L_tmp_e ); // Q31
@@ -4793,7 +4784,7 @@ static Word32 stereo_dft_gain_offset_fx(
      * function @ 32kHz from which the values are interpolated:  */
     k0 = shr( tau, 3 );
     // alpha = s_and(tau, 7) / 8.f;
-    alpha = BASOP_Util_Divide3232_Scale_cadence( s_and( tau, 7 ), 8, &alpha_e );
+    alpha = BASOP_Util_Divide3232_Scale_newton( s_and( tau, 7 ), 8, &alpha_e );
     alpha = L_shl( alpha, alpha_e ); // Q31
     // wnt = (1 - alpha) * Wn_table[k0] + alpha * Wn_table[k0 + 1];
     wnt = L_add( Mpy_32_32( L_sub( MAX_32, alpha ), Wn_table_fx[k0] ), Mpy_32_32( alpha, Wn_table_fx[k0 + 1] ) ); // Q31
@@ -4804,12 +4795,12 @@ static Word32 stereo_dft_gain_offset_fx(
     L_tmp1 = BASOP_Util_Add_Mant32Exp( MAX_32, 0, c, c_e, &L_tmp1_e );
     L_tmp1 = Mpy_32_32( L_tmp1, L_tmp1 );
     L_tmp1_e = shl( L_tmp1_e, 1 );
-    L_tmp2 = BASOP_Util_Divide3232_Scale_cadence( L_tmp, L_tmp1, &L_tmp2_e );
+    L_tmp2 = BASOP_Util_Divide3232_Scale_newton( L_tmp, L_tmp1, &L_tmp2_e );
     L_tmp2_e = add( add( L_tmp2_e, sub( L_tmp_e, L_tmp1_e ) ), 3 /*multiply by 8*/ );
     L_tmp2 = Mpy_32_32( L_tmp2, L_sub( MAX_32, wnt ) );
     L_tmp1 = BASOP_Util_Add_Mant32Exp( MAX_32, 0, L_tmp, L_tmp_e, &L_tmp1_e );
     L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp1, L_tmp1_e, Mpy_32_32( c, wnt ), add( c_e, 1 ), &L_tmp1_e );
-    L_tmp = BASOP_Util_Divide3232_Scale_cadence( L_tmp2, L_tmp1, &L_tmp_e );
+    L_tmp = BASOP_Util_Divide3232_Scale_newton( L_tmp2, L_tmp1, &L_tmp_e );
     L_tmp_e = add( L_tmp_e, sub( L_tmp2_e, L_tmp1_e ) );
     L_tmp = Sqrt32( L_tmp, &L_tmp_e );
     go = L_shl( L_tmp, L_tmp_e );
@@ -4839,7 +4830,7 @@ static void stereo_dft_enc_calculate_nrg_for_icbwe_fx(
     Word32 tmp;
 
     // bandResDft = ( (float) input_Fs ) / hStereoDft->NFFT;
-    bandResDft = BASOP_Util_Divide3232_Scale_cadence( input_Fs, hStereoDft->NFFT, &bandResDft_e );
+    bandResDft = BASOP_Util_Divide3232_Scale_newton( input_Fs, hStereoDft->NFFT, &bandResDft_e );
     // shbBins[0] = (int16_t) ( 6400 / bandResDft );
     shbBins[0] = BASOP_Util_Divide3232_Scale( 6400, bandResDft, &tmp_e );
     move16();
diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd_fx.c
similarity index 93%
rename from lib_enc/ivas_stereo_dft_enc_itd.c
rename to lib_enc/ivas_stereo_dft_enc_itd_fx.c
index d2873bdfe7e88bf25eb5895f58d9c713df02adc6..1beacd19a265a59b2acec77ecc942480f86abe82 100644
--- a/lib_enc/ivas_stereo_dft_enc_itd.c
+++ b/lib_enc/ivas_stereo_dft_enc_itd_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,9 +37,7 @@
 #include "cnst.h"
 #include "rom_enc.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
@@ -109,7 +107,7 @@ static void set_band_limits_fx(
     move16();
     *nbands = 0;
     move16();
-    WHILE( LT_16( band_limits[( *nbands )++], shr( NFFT, 1 ) ) )
+    WHILE( band_limits[( *nbands )++] < ( NFFT / 2 ) )
     {
         band_limits[*nbands] = extract_l( Mpy_32_32_r( shl( dft_band_limits_erb4[*nbands], 1 ), 1717986918 /*( (float) ( STEREO_DFT_N_NS_ENC ) / STEREO_DFT_N_NS ) in Q 30*/ ) );
         move16();
@@ -166,7 +164,7 @@ void stereo_dft_hybrid_ITD_flag_fx(
 
 static void stereo_dft_quantize_itd_fx(
     const Word16 in,
-    Word32 *out,
+    Word32 *out, // Q16
     const Word32 input_Fs,
     Word16 *ind )
 {
@@ -205,15 +203,11 @@ static void stereo_dft_quantize_itd_fx(
  *-------------------------------------------------------------------------*/
 
 static Word32 itd_vad_ms_snr_calc_fx(
-#ifdef FIX_ISSUE_1092
     Word32 E_band_n[STEREO_DFT_ITD_VAD_BAND_NUM], // E_band_n_exp
     Word16 E_band_n_exp[STEREO_DFT_ITD_VAD_BAND_NUM],
-#else
-    Word32 E_band_n[STEREO_DFT_ITD_VAD_BAND_NUM], // Q0
-#endif
-    Word32 *Spd,
+    Word32 *Spd, // Q(31-Spd_e)
     Word16 *Spd_e,
-    Word32 *E_band,
+    Word32 *E_band, // Q(31-E_band_e)
     Word16 *E_band_e,
     Word16 *ms_snr_e )
 {
@@ -238,7 +232,7 @@ static Word32 itd_vad_ms_snr_calc_fx(
             move32();
         }
         // E_band[i] = E_band[i] / ( itd_vad_band_tbl[i + 1] - itd_vad_band_tbl[i] );
-        E_band[i] = BASOP_Util_Divide3232_Scale_cadence( E_band[i], L_sub( itd_vad_band_tbl[i + 1], itd_vad_band_tbl[i] ), &exp );
+        E_band[i] = BASOP_Util_Divide3232_Scale_newton( E_band[i], L_sub( itd_vad_band_tbl[i + 1], itd_vad_band_tbl[i] ), &exp );
         move32();
         E_band_e[i] = add( exp, sub( E_band_e[i], 31 ) );
         move16();
@@ -251,13 +245,9 @@ static Word32 itd_vad_ms_snr_calc_fx(
     FOR( i = 0; i < STEREO_DFT_ITD_VAD_BAND_NUM; i++ )
     {
         // snr[i] = E_band[i] / E_band_n[i];
-        snr[i] = BASOP_Util_Divide3232_Scale_cadence( E_band[i], E_band_n[i], &snr_e[i] );
+        snr[i] = BASOP_Util_Divide3232_Scale_newton( E_band[i], E_band_n[i], &snr_e[i] );
         move32();
-#ifdef FIX_ISSUE_1092
         snr_e[i] = add( snr_e[i], sub( E_band_e[i], E_band_n_exp[i] ) );
-#else
-        snr_e[i] = add( snr_e[i], sub( E_band_e[i], 31 ) );
-#endif
         move16();
         // if ( snr[i] < 1 )
         IF( BASOP_Util_Cmp_Mant32Exp( snr[i], snr_e[i], 1, 31 ) < 0 )
@@ -293,16 +283,12 @@ static Word32 itd_vad_ms_snr_calc_fx(
  *
  *-------------------------------------------------------------------------*/
 static void itd_vad_background_update_fx(
-#ifdef FIX_ISSUE_1092
     Word32 E_band_n[STEREO_DFT_ITD_VAD_BAND_NUM], // E_band_n_exp
     Word16 E_band_n_exp[STEREO_DFT_ITD_VAD_BAND_NUM],
-#else
-    Word32 E_band_n[STEREO_DFT_ITD_VAD_BAND_NUM], // Q0
-#endif
     Word16 *vad_frm_cnt,
-    const Word32 ms_snr,
+    const Word32 ms_snr, // Q(31-ms_snr_e)
     const Word16 ms_snr_e,
-    Word32 *E_band,
+    Word32 *E_band, // Q(31-E_band_e)
     Word16 *E_band_e )
 {
     Word16 i;
@@ -340,19 +326,10 @@ static void itd_vad_background_update_fx(
             Word16 q_temp = norm_l( *vad_frm_cnt );
             L_temp = L_shl( *vad_frm_cnt, q_temp );
             L_temp_e = sub( 31, q_temp );
-#ifdef FIX_ISSUE_1092
             L_temp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( E_band_n[i], L_temp ), add( E_band_n_exp[i], L_temp_e ), E_band[i], E_band_e[i], &L_temp_e );
-#else
-            L_temp = BASOP_Util_Add_Mant32Exp( Mpy_32_32( E_band_n[i], L_temp ), add( 31, L_temp_e ), E_band[i], E_band_e[i], &L_temp_e );
-#endif
-            E_band_n[i] = BASOP_Util_Divide3232_Scale_cadence( L_temp, L_add( *vad_frm_cnt, 1 ), &E_band_n_e_tmp );
+            E_band_n[i] = BASOP_Util_Divide3232_Scale_newton( L_temp, L_add( *vad_frm_cnt, 1 ), &E_band_n_e_tmp );
             move32();
-#ifdef FIX_ISSUE_1092
             E_band_n_exp[i] = add( E_band_n_e_tmp, sub( L_temp_e, 31 ) );
-#else
-            E_band_n_e_tmp = add( E_band_n_e_tmp, sub( L_temp_e, 31 ) );
-            E_band_n[i] = L_shr_r( E_band_n[i], sub( 31, E_band_n_e_tmp ) ); // Q31
-#endif
             move16();
         }
     }
@@ -364,7 +341,6 @@ static void itd_vad_background_update_fx(
             FOR( i = 0; i < STEREO_DFT_ITD_VAD_BAND_NUM; i++ )
             {
                 // E_band_n[i] = 0.96f * E_band_n[i] + 0.04f * E_band[i];
-#ifdef FIX_ISSUE_1092
                 E_band_n[i] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( 2061584302 /*0.96 in Q31*/, E_band_n[i] ), E_band_n_exp[i], Mpy_32_32( 85899346 /*0.04 in Q31*/, E_band[i] ), E_band_e[i], &E_band_n_e_tmp );
                 move32();
                 E_band_n_exp[i] = E_band_n_e_tmp;
@@ -377,20 +353,6 @@ static void itd_vad_background_update_fx(
                     E_band_n_exp[i] = 0;
                     move16();
                 }
-#else
-                E_band_n[i] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( 2061584302, E_band_n[i] ), 31, Mpy_32_32( 85899346, E_band[i] ), E_band_e[i], &E_band_n_e_tmp );
-                move32();
-                // if ( E_band_n[i] < 1.0f )
-                IF( BASOP_Util_Cmp_Mant32Exp( E_band_n[i], E_band_n_e_tmp, MAX_32, 0 ) < 0 )
-                {
-                    E_band_n[i] = MAX_32;
-                    move32();
-                    E_band_n_e_tmp = 0;
-                    move16();
-                }
-                E_band_n[i] = L_shr_r( E_band_n[i], sub( 31, E_band_n_e_tmp ) ); // Q31
-                move32();
-#endif
             }
         }
     }
@@ -404,18 +366,14 @@ static void itd_vad_background_update_fx(
  *-------------------------------------------------------------------------*/
 
 static Word16 stereo_dft_enc_itd_vad_fx(
-#ifdef FIX_ISSUE_1092
     Word32 E_band_n[STEREO_DFT_ITD_VAD_BAND_NUM], // E_band_n_exp
     Word16 E_band_n_exp[STEREO_DFT_ITD_VAD_BAND_NUM],
-#else
-    Word32 E_band_n[STEREO_DFT_ITD_VAD_BAND_NUM], // Q0
-#endif
     Word16 *vad_frm_cnt,
-    Word32 *Spd_L,
+    Word32 *Spd_L, // Q(31-Spd_L_e)
     Word16 *Spd_L_e,
-    Word32 *Spd_R,
+    Word32 *Spd_R, // Q(31-Spd_R_e)
     Word16 *Spd_R_e,
-    Word32 *mssnr,
+    Word32 *mssnr, // Q(31-mssnr_e)
     Word16 *mssnr_e )
 {
     Word16 i;
@@ -436,17 +394,10 @@ static Word16 stereo_dft_enc_itd_vad_fx(
         Spd_e[i] = sub( Spd_e[i], 1 );
         move16();
     }
-#ifdef FIX_ISSUE_1092
     *mssnr = itd_vad_ms_snr_calc_fx( E_band_n, E_band_n_exp, Spd, Spd_e, E_band, E_band_e, mssnr_e );
     move32();
 
     itd_vad_background_update_fx( E_band_n, E_band_n_exp, vad_frm_cnt, *mssnr, *mssnr_e, E_band, E_band_e );
-#else
-    *mssnr = itd_vad_ms_snr_calc_fx( E_band_n, Spd, Spd_e, E_band, E_band_e, mssnr_e );
-    move32();
-
-    itd_vad_background_update_fx( E_band_n, vad_frm_cnt, *mssnr, *mssnr_e, E_band, E_band_e );
-#endif
     // if ( *mssnr < ITD_VAD_THRSHOLD )
     IF( BASOP_Util_Cmp_Mant32Exp( *mssnr, *mssnr_e, ITD_VAD_THRSHOLD_Q31, 0 ) < 0 )
     {
@@ -472,12 +423,12 @@ static Word32 calc_mean_E_ratio_fx(
     ITD_DATA_HANDLE hItd,
     Word16 nbands,
     Word16 band_limits[],
-    const Word32 sfm,
-    const Word32 nrg_L[STEREO_DFT_N_32k_ENC / 2],
+    const Word32 sfm,                             // Q31
+    const Word32 nrg_L[STEREO_DFT_N_32k_ENC / 2], // Q(31-nrg_L_e)
     const Word16 nrg_L_e[STEREO_DFT_N_32k_ENC / 2],
-    const Word32 nrg_R[STEREO_DFT_N_32k_ENC / 2],
+    const Word32 nrg_R[STEREO_DFT_N_32k_ENC / 2], // Q(31-nrg_R_e)
     const Word16 nrg_R_e[STEREO_DFT_N_32k_ENC / 2],
-    Word32 *total_mEr,
+    Word32 *total_mEr, // Q(31-total_mEr_e)
     Word16 *total_mEr_e,
     Word16 *sum_Er_e )
 {
@@ -522,7 +473,7 @@ static Word32 calc_mean_E_ratio_fx(
     move16();
 
     /*take bands up to 32kHz bandwidth as ITD is always calculated at 32kHz sampling rate*/
-    nbands -= ( band_limits[nbands] > STEREO_DFT_N_32k_ENC / 2 );
+    nbands = sub( nbands, ( band_limits[nbands] > STEREO_DFT_N_32k_ENC / 2 ) );
 
     sum_Er = 0;
     move32();
@@ -548,7 +499,8 @@ static Word32 calc_mean_E_ratio_fx(
         sum_nrg_R_e = 0;
         move16();
 
-        FOR( i = band_limits[b]; i < min( band_limits[b + 1], STEREO_DFT_N_32k_ENC / 2 ); i++ )
+        Word16 len = s_min( band_limits[b + 1], STEREO_DFT_N_32k_ENC >> 1 );
+        FOR( i = band_limits[b]; i < len; i++ )
         {
             // sum_xcorr[0] += hItd->xcorr_smooth[2 * i];
             sum_xcorr[0] = BASOP_Util_Add_Mant32Exp( sum_xcorr[0], sum_xcorr_e[0], hItd->xcorr_smooth_fx[2 * i], hItd->xcorr_smooth_fx_e[2 * i], &sum_xcorr_e[0] );
@@ -584,7 +536,7 @@ static Word32 calc_mean_E_ratio_fx(
         L_temp1 = BASOP_Util_Add_Mant32Exp( acorr, acorr_e, fi[b], fi_e[b], &L_temp1_e );
         L_temp2 = BASOP_Util_Add_Mant32Exp( acorr, acorr_e, L_negate( fi[b] ), fi_e[b], &L_temp2_e );
         L_temp2 = BASOP_Util_Add_Mant32Exp( L_temp2, L_temp2_e, EPSILON_FX_M, EPSILON_FX_E, &L_temp2_e );
-        Er[b] = BASOP_Util_Divide3232_Scale_cadence( L_temp1, L_temp2, &Er_e[b] );
+        Er[b] = BASOP_Util_Divide3232_Scale_newton( L_temp1, L_temp2, &Er_e[b] );
         move32();
         Er_e[b] = add( Er_e[b], sub( L_temp1_e, L_temp2_e ) );
         move16();
@@ -610,6 +562,8 @@ static Word32 calc_mean_E_ratio_fx(
     }
     hItd->acorr_L_fx_e = max_exp1;
     hItd->acorr_R_fx_e = max_exp2;
+    move16();
+    move16();
     FOR( b = 0; b < nbands; b++ )
     {
         hItd->acorr_L_fx[b] = L_shr_r( hItd->acorr_L_fx[b], sub( hItd->acorr_L_fx_e, acorr_L_fx_tmp_e[b] ) );
@@ -631,7 +585,7 @@ static Word32 calc_mean_E_ratio_fx(
     L_temp1 = BASOP_Util_Add_Mant32Exp( acorr, acorr_e, total_fi, total_fi_e, &L_temp1_e );
     L_temp2 = BASOP_Util_Add_Mant32Exp( acorr, acorr_e, L_negate( total_fi ), total_fi_e, &L_temp2_e );
     L_temp2 = BASOP_Util_Add_Mant32Exp( L_temp2, L_temp2_e, EPSILON_FX_M, EPSILON_FX_E, &L_temp2_e );
-    *total_mEr = BASOP_Util_Divide3232_Scale_cadence( L_temp1, L_temp2, total_mEr_e );
+    *total_mEr = BASOP_Util_Divide3232_Scale_newton( L_temp1, L_temp2, total_mEr_e );
     move32();
     *total_mEr_e = add( *total_mEr_e, sub( L_temp1_e, L_temp2_e ) );
     move16();
@@ -656,7 +610,7 @@ static void resetEstimates_fx(
     set32_fx( hItd->acorr_R_fx, 0, STEREO_DFT_BAND_MAX );
     hItd->acorr_R_fx_e = 0;
     move16();
-    hItd->cohSNR_fx = 983040;
+    hItd->cohSNR_fx = 983040; // 15.0f in Q16
     move32();
 
     return;
@@ -667,8 +621,8 @@ static void resetEstimates_fx(
  * time-domain smoothing filter for smoothing the cross-correlation vector
  *-------------------------------------------------------------------------*/
 static void td_sm_filter_fx(
-    Word32 *x,
-    Word32 *y,
+    Word32 *x, // Q0
+    Word32 *y, // Q0
     const Word16 L )
 {
     Word16 i;
@@ -708,12 +662,12 @@ static Word32 peak_detect_fx(
     const Word16 vad,
     Word32 *second_max,
     Word16 *second_max_lag,
-    const Word16 prev_itd,
+    const Word16 prev_itd, // Q0
     const Word16 flag_noisy_speech_snr,
     const Word16 detected_itd_flag,
     Word32 *prev_max, // Q31
     Word16 *prev_index,
-    Word32 *prev_avg_max,
+    Word32 *prev_avg_max, // Q(31-prev_avg_max)
     Word16 *prev_avg_max_e,
     Word32 *total_max, // xcorr_itd_e
     Word16 *out_e )
@@ -764,7 +718,7 @@ static Word32 peak_detect_fx(
 
     /*if maximum is out of boundaries signal zero itd  OR maximum value is negative*/
     test();
-    *zero_itd_flag = ( L_sub( *max_max, 4294968 ) < max_low || *max_max < max_high );
+    *zero_itd_flag = ( L_sub( *max_max, 4294968 /*.002 Q31*/ ) < max_low || *max_max < max_high );
     move16();
     // adjustment is done for matching processing path with float code (differing due to precision loss)
 
@@ -870,7 +824,7 @@ static Word32 peak_detect_fx(
         test();
         test();
         test();
-        if ( vad && thres_diff > 0 && ( ( BASOP_Util_Cmp_Mant32Exp( thres_diff, thres_diff_e, 107374182, 0 ) < 0 && ( BASOP_Util_Cmp_Mant32Exp( snr, 15, 15, 31 ) <= 0 && BASOP_Util_Cmp_Mant32Exp( snr, 15, 7, 31 ) > 0 ) ) || ( BASOP_Util_Cmp_Mant32Exp( thres_diff, thres_diff_e, 21474836, 0 ) < 0 && ( BASOP_Util_Cmp_Mant32Exp( snr, 15, 15, 31 ) > 0 && BASOP_Util_Cmp_Mant32Exp( snr, 15, 30, 31 ) < 0 ) ) ) )
+        if ( vad && thres_diff > 0 && ( ( BASOP_Util_Cmp_Mant32Exp( thres_diff, thres_diff_e, 107374182 /*.05 in Q31*/, 0 ) < 0 && ( BASOP_Util_Cmp_Mant32Exp( snr, 15, 15, 31 ) <= 0 && BASOP_Util_Cmp_Mant32Exp( snr, 15, 7, 31 ) > 0 ) ) || ( BASOP_Util_Cmp_Mant32Exp( thres_diff, thres_diff_e, 21474836 /* 0.01f in Q31*/, 0 ) < 0 && ( BASOP_Util_Cmp_Mant32Exp( snr, 15, 15, 31 ) > 0 && BASOP_Util_Cmp_Mant32Exp( snr, 15, 30, 31 ) < 0 ) ) ) )
         {
             wfac = ONE_IN_Q30; // 2.0f
             move32();
@@ -887,7 +841,7 @@ static Word32 peak_detect_fx(
                 move32();
             }
             // else if ( detected_itd_flag == 0 && *max_max > 1.5f * avg_max && *prev_max > 1.5f * *prev_avg_max && abs( *index - *prev_index ) <= 2 )
-            ELSE IF( detected_itd_flag == 0 && BASOP_Util_Cmp_Mant32Exp( *max_max, 0, Mpy_32_32( 1610612736, avg_max ), add( sum_max_e, 1 ) ) > 0 && BASOP_Util_Cmp_Mant32Exp( *prev_max, 0, Mpy_32_32( 1610612736, *prev_avg_max ), add( *prev_avg_max_e, 1 ) ) > 0 && LE_16( abs_s( sub( *index, *prev_index ) ), 2 ) )
+            ELSE IF( detected_itd_flag == 0 && BASOP_Util_Cmp_Mant32Exp( *max_max, 0, Mpy_32_32( 1610612736 /*1.5f in Q29*/, avg_max ), add( sum_max_e, 1 ) ) > 0 && BASOP_Util_Cmp_Mant32Exp( *prev_max, 0, Mpy_32_32( 1610612736 /*1.5f in Q29*/, *prev_avg_max ), add( *prev_avg_max_e, 1 ) ) > 0 && LE_16( abs_s( sub( *index, *prev_index ) ), 2 ) )
             {
                 wfac = 805306368; // 1.5f in Q29
                 move32();
@@ -1122,13 +1076,13 @@ void stereo_dft_enc_compute_itd_fx(
     move32();
     prod_R_e = 0;
     move16();
-    sum_nrg_L = Mpy_32_32( pDFT_L[0], pDFT_L[0] ) /*+ FLT_MIN*/;
+    sum_nrg_L = Mpy_32_32( pDFT_L[0], pDFT_L[0] ) /*+ FLT_MIN  Q(31-(2*DFT_L_e))*/;
     sum_nrg_L_e = shl( DFT_L_e[0], 1 );
-    sum_nrg_R = Mpy_32_32( pDFT_R[0], pDFT_R[0] ) /*+ FLT_MIN*/;
+    sum_nrg_R = Mpy_32_32( pDFT_R[0], pDFT_R[0] ) /*+ FLT_MIN    //Q(31-(2*DFT_L_e))*/;
     sum_nrg_R_e = shl( DFT_R_e[0], 1 );
     sum_abs_L = BASOP_Util_Add_Mant32Exp( L_abs( pDFT_L[0] ), DFT_L_e[0], EPSILON_FX_M, EPSILON_FX_E, &sum_abs_L_e ) /*+ EPSILON*/;
     sum_abs_R = BASOP_Util_Add_Mant32Exp( L_abs( pDFT_R[0] ), DFT_R_e[0], EPSILON_FX_M, EPSILON_FX_E, &sum_abs_R_e ) /*+ EPSILON*/;
-    xcorr_lb[0] = Mpy_32_32( pDFT_L[0], pDFT_L[0] );
+    xcorr_lb[0] = Mpy_32_32( pDFT_L[0], pDFT_L[0] ); // Q(31-(2*DFT_L_e))
     move32();
     xcorr_lb_e[0] = shl( DFT_L_e[0], 1 );
     move16();
@@ -1160,6 +1114,7 @@ void stereo_dft_enc_compute_itd_fx(
     set16_fx( Spd_R_e, 0, STEREO_DFT_N_32k_ENC / 2 + 1 );
 
     j = 0; // for loop statement
+    move16();
     FOR( i = 1; i < NFFT_mid; i++ )
     {
         /*if ( i == 121 )
@@ -1319,7 +1274,7 @@ void stereo_dft_enc_compute_itd_fx(
             j = 0;
             move16();
         }
-        j++; // for loop statement
+        j = add( j, 1 ); // for loop statement
     }
 
     /* collect UNCLR classifier parameters */
@@ -1347,14 +1302,14 @@ void stereo_dft_enc_compute_itd_fx(
 
         // g_ILD = sqrtf( sum_nrg_L / ( sum_nrg_R + 1.0f ) );
         L_temp = BASOP_Util_Add_Mant32Exp( sum_nrg_R, sum_nrg_R_e, MAX_32, 0, &L_temp_e );
-        g_ILD = BASOP_Util_Divide3232_Scale_cadence( sum_nrg_L, L_temp, &g_ILD_e );
+        g_ILD = BASOP_Util_Divide3232_Scale_newton( sum_nrg_L, L_temp, &g_ILD_e );
         g_ILD_e = add( g_ILD_e, sub( sum_nrg_L_e, L_temp_e ) );
         g_ILD = Sqrt32( g_ILD, &g_ILD_e );
 
         // g_ILD = fabsf( ( g_ILD - 1 ) / ( g_ILD + 1 ) );
         L_temp = BASOP_Util_Add_Mant32Exp( g_ILD, g_ILD_e, MIN_32, 0, &L_temp_e );
         L_temp2 = BASOP_Util_Add_Mant32Exp( g_ILD, g_ILD_e, MAX_32, 0, &L_temp2_e );
-        g_ILD = L_abs( BASOP_Util_Divide3232_Scale_cadence( L_temp, L_temp2, &g_ILD_e ) );
+        g_ILD = L_abs( BASOP_Util_Divide3232_Scale_newton( L_temp, L_temp2, &g_ILD_e ) );
         g_ILD_e = add( g_ILD_e, sub( L_temp_e, L_temp2_e ) );
         g_ILD = L_shl_sat( g_ILD, g_ILD_e ); // Q31
 
@@ -1384,7 +1339,7 @@ void stereo_dft_enc_compute_itd_fx(
         // g_IPD = ( sum_nrg_L + sum_nrg_R + 2 * grand_dot_prod_real ) / grand_nrg_DMX;
         L_temp = BASOP_Util_Add_Mant32Exp( sum_nrg_L, sum_nrg_L_e, sum_nrg_R, sum_nrg_R_e, &L_temp_e );
         L_temp = BASOP_Util_Add_Mant32Exp( L_temp, L_temp_e, grand_dot_prod_real, add( grand_dot_prod_real_e, 1 ), &L_temp_e );
-        g_IPD = BASOP_Util_Divide3232_Scale_cadence( L_temp, grand_nrg_DMX, &g_IPD_e );
+        g_IPD = BASOP_Util_Divide3232_Scale_newton( L_temp, grand_nrg_DMX, &g_IPD_e );
         g_IPD_e = add( g_IPD_e, sub( L_temp_e, grand_nrg_DMX_e ) );
         // if ( g_IPD >= 1.0f )
         IF( BASOP_Util_Cmp_Mant32Exp( g_IPD, g_IPD_e, ONE_IN_Q29 - ONE_IN_Q14 /*Adjusting threshold for precision loss*/, 2 ) >= 0 )
@@ -1411,7 +1366,7 @@ void stereo_dft_enc_compute_itd_fx(
         // angle_rot = fabsf( atanf( 2.0f * ( grand_dot_prod_real ) / ( sum_nrg_L - sum_nrg_R + 1.0f ) ) );
         L_temp = BASOP_Util_Add_Mant32Exp( sum_nrg_L, sum_nrg_L_e, L_negate( sum_nrg_R ), sum_nrg_R_e, &L_temp_e );
         L_temp = BASOP_Util_Add_Mant32Exp( L_temp, L_temp_e, MAX_32, 0, &L_temp_e );
-        L_temp2 = BASOP_Util_Divide3232_Scale_cadence( grand_dot_prod_real, L_temp, &L_temp2_e );
+        L_temp2 = BASOP_Util_Divide3232_Scale_newton( grand_dot_prod_real, L_temp, &L_temp2_e );
         L_temp2_e = add( L_temp2_e, sub( add( grand_dot_prod_real_e, 1 ), L_temp_e ) );
         angle_rot = L_abs( BASOP_util_atan( L_shr_r_sat( L_temp2, ( sub( 6, L_temp2_e ) ) ) ) ); // Q14
         // angle_rot = L_abs( BASOP_util_atan2( grand_dot_prod_real, L_temp, sub( add( grand_dot_prod_real_e, 1 ), L_temp_e ) ) ); // Q13
@@ -1423,7 +1378,7 @@ void stereo_dft_enc_compute_itd_fx(
 
         // g_side = fabsf( sum_nrg_L - sum_nrg_R ) / ( grand_nrg_DMX );
         L_temp = L_abs( BASOP_Util_Add_Mant32Exp( sum_nrg_L, sum_nrg_L_e, L_negate( sum_nrg_R ), sum_nrg_R_e, &L_temp_e ) );
-        g_side = BASOP_Util_Divide3232_Scale_cadence( L_temp, grand_nrg_DMX, &g_side_e );
+        g_side = BASOP_Util_Divide3232_Scale_newton( L_temp, grand_nrg_DMX, &g_side_e );
         g_side_e = add( g_side_e, sub( L_temp_e, grand_nrg_DMX_e ) );
         g_side = L_shl_sat( g_side, g_side_e ); // Q31
         g_side_e = 0;
@@ -1474,11 +1429,7 @@ void stereo_dft_enc_compute_itd_fx(
     }
     // L_temp = sum2_32_fx( &Spd_L[1], 11, &L_temp_e );
     sum_nrg_L_lb = BASOP_Util_Add_Mant32Exp( sum_nrg_L_lb, sum_nrg_L_lb_e, L_temp, L_temp_e, &sum_nrg_L_lb_e );
-#ifdef FIX_ISSUE_1092
     vad_flag_itd = stereo_dft_enc_itd_vad_fx( hItd->E_band_n_fx, hItd->E_band_n_exp, &( hItd->vad_frm_cnt ), Spd_L, Spd_L_e, Spd_R, Spd_R_e, &mssnr, &mssnr_e );
-#else
-    vad_flag_itd = stereo_dft_enc_itd_vad_fx( hItd->E_band_n_fx, &( hItd->vad_frm_cnt ), Spd_L, Spd_L_e, Spd_R, Spd_R_e, &mssnr, &mssnr_e );
-#endif
     vad_flag_itd = vad_flag_itd && vad_flag_dtx[0];
 
     // if ( sum_nrg_L < EPSILON )
@@ -1492,15 +1443,15 @@ void stereo_dft_enc_compute_itd_fx(
     ELSE
     {
         // sfm_L = expf( log_prod_L / ( NFFT_mid ) ) / ( sum_abs_L / ( NFFT_mid ) );
-        L_temp = BASOP_Util_Divide3232_Scale_cadence( log_prod_L, NFFT_mid, &L_temp_e );
+        L_temp = BASOP_Util_Divide3232_Scale_newton( log_prod_L, NFFT_mid, &L_temp_e );
         L_temp_e = add( L_temp_e, sub( log_prod_L_e, 31 ) );
-        L_temp = BASOP_Util_fPow( 1459366444, 2, L_temp, L_temp_e, &L_temp_e );
+        L_temp = BASOP_Util_fPow( 1459366444 /*2.718 in Q29*/, 2, L_temp, L_temp_e, &L_temp_e );
         q_temp = norm_l( NFFT_mid );
         L_temp2 = L_shl( NFFT_mid, q_temp );
         L_temp2_e = sub( 31, q_temp );
         L_temp = Mpy_32_32( L_temp, L_temp2 );
         L_temp_e = add( L_temp_e, L_temp2_e );
-        sfm_L = BASOP_Util_Divide3232_Scale_cadence( L_temp, sum_abs_L, &sfm_L_e );
+        sfm_L = BASOP_Util_Divide3232_Scale_newton( L_temp, sum_abs_L, &sfm_L_e );
         sfm_L_e = add( sfm_L_e, sub( L_temp_e, sum_abs_L_e ) );
         sfm_L = L_shl_sat( sfm_L, sfm_L_e ); // Q31 - should be rechecked for -10dB tests
     }
@@ -1516,15 +1467,15 @@ void stereo_dft_enc_compute_itd_fx(
     ELSE
     {
         // sfm_R = expf( log_prod_R / ( NFFT_mid ) ) / ( sum_abs_R / ( NFFT_mid ) );
-        L_temp = BASOP_Util_Divide3232_Scale_cadence( log_prod_R, NFFT_mid, &L_temp_e );
+        L_temp = BASOP_Util_Divide3232_Scale_newton( log_prod_R, NFFT_mid, &L_temp_e );
         L_temp_e = add( L_temp_e, sub( log_prod_R_e, 31 ) );
-        L_temp = BASOP_Util_fPow( 1459366444, 2, L_temp, L_temp_e, &L_temp_e );
+        L_temp = BASOP_Util_fPow( 1459366444 /*2.718 in Q29*/, 2, L_temp, L_temp_e, &L_temp_e );
         q_temp = norm_l( NFFT_mid );
         L_temp2 = L_shl( NFFT_mid, q_temp );
         L_temp2_e = sub( 31, q_temp );
         L_temp = Mpy_32_32( L_temp, L_temp2 );
         L_temp_e = add( L_temp_e, L_temp2_e );
-        sfm_R = BASOP_Util_Divide3232_Scale_cadence( L_temp, sum_abs_R, &sfm_L_e );
+        sfm_R = BASOP_Util_Divide3232_Scale_newton( L_temp, sum_abs_R, &sfm_L_e );
         sfm_R_e = add( sfm_L_e, sub( L_temp_e, sum_abs_R_e ) );
         // sfm_R = L_shl_r( sfm_R, sfm_R_e ); // Q31
         sfm_R = L_shl_sat( sfm_R, sfm_R_e ); // Q31
@@ -1712,13 +1663,13 @@ void stereo_dft_enc_compute_itd_fx(
                 }
                 // cng_xcorr_filt = max( min( CORR_FILT, 10.0f * CORR_FILT / ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates ) ), sfm_L );
 
-                cng_xcorr_filt = BASOP_Util_Divide3232_Scale_cadence( 8 /*10.0f * CORR_FILT*/, add( hStereoDft->expectedNumUpdates, hStereoDft->currentNumUpdates ), &cng_xcorr_filt_e );
+                cng_xcorr_filt = BASOP_Util_Divide3232_Scale_newton( 8 /*10.0f * CORR_FILT*/, add( hStereoDft->expectedNumUpdates, hStereoDft->currentNumUpdates ), &cng_xcorr_filt_e );
                 cng_xcorr_filt = L_shl_sat( cng_xcorr_filt, cng_xcorr_filt_e );          // Q31
                 cng_xcorr_filt = L_max( L_min( CORR_FILT_Q31, cng_xcorr_filt ), sfm_L ); // Q31
 
                 hStereoDft->currentNumUpdates = add( hStereoDft->currentNumUpdates, 1 );
                 move16();
-                FOR( i = 1; i < shr( NFFT, 2 ); i++ )
+                FOR( i = 1; i < NFFT / 4; i++ )
                 {
                     /* Low pass filter cross L/R power spectrum */
                     // hStereoDft->xspec_smooth[2 * i] = ( 1.f - cng_xcorr_filt ) * hStereoDft->xspec_smooth[2 * i] + cng_xcorr_filt * xcorr[2 * i];
@@ -1761,6 +1712,10 @@ void stereo_dft_enc_compute_itd_fx(
                 }
             }
         }
+        test();
+        test();
+        test();
+        test();
         IF( ( vad_flag_dtx[0] == 0 ) || ( hCPE->hFrontVad[0] == NULL && ( EQ_32( hCPE->hCoreCoder[0]->last_core_brate, SID_2k40 ) || EQ_32( hCPE->hCoreCoder[0]->last_core_brate, FRAME_NO_DATA ) ) ) || hCPE->hStereoCng->first_SID_after_TD )
         {
             IF( vad_flag_dtx[0] == 0 )
@@ -1769,7 +1724,7 @@ void stereo_dft_enc_compute_itd_fx(
                 // cng_xcorr_filt = max( min( CORR_FILT, 10.0f * CORR_FILT / ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates ) ), sfm_L );
                 IF( add( hStereoDft->expectedNumUpdates, hStereoDft->currentNumUpdates ) != 0 )
                 {
-                    cng_xcorr_filt = BASOP_Util_Divide3232_Scale_cadence( 8 /*10.0f * CORR_FILT*/, add( hStereoDft->expectedNumUpdates, hStereoDft->currentNumUpdates ), &cng_xcorr_filt_e );
+                    cng_xcorr_filt = BASOP_Util_Divide3232_Scale_newton( 8 /*10.0f * CORR_FILT*/, add( hStereoDft->expectedNumUpdates, hStereoDft->currentNumUpdates ), &cng_xcorr_filt_e );
                     cng_xcorr_filt = L_shl_sat( cng_xcorr_filt, cng_xcorr_filt_e );          // Q31
                     cng_xcorr_filt = L_max( L_min( CORR_FILT_Q31, cng_xcorr_filt ), sfm_L ); // Q31
                 }
@@ -1824,7 +1779,9 @@ void stereo_dft_enc_compute_itd_fx(
                 // tmpf1 += EPSILON;
                 tmpf1 = BASOP_Util_Add_Mant32Exp( L_temp, L_temp_e, EPSILON_FX_M, EPSILON_FX_E, &tmpf1_e );
                 tmpf2 = tmpf1;
+                move32();
                 tmpf2_e = tmpf1_e;
+                move16();
                 // tmpf1 = powf( tmpf1, alpha );
                 tmpf1 = BASOP_Util_fPow( tmpf1, tmpf1_e, alpha, 0, &tmpf1_e );
                 // tmpf3 += tmpf2 * tmpf1;
@@ -1871,7 +1828,9 @@ void stereo_dft_enc_compute_itd_fx(
                 // tmpf1 += EPSILON;
                 tmpf1 = BASOP_Util_Add_Mant32Exp( L_temp, L_temp_e, EPSILON_FX_M, EPSILON_FX_E, &tmpf1_e );
                 tmpf2 = tmpf1;
+                move32();
                 tmpf2_e = tmpf1_e;
+                move16();
                 // tmpf1 = powf( tmpf1, alpha );
                 tmpf1 = BASOP_Util_fPow( tmpf1, tmpf1_e, alpha, 0, &tmpf1_e );
                 // tmpf3 += tmpf2 * tmpf1;
@@ -1937,7 +1896,9 @@ void stereo_dft_enc_compute_itd_fx(
             // tmpf1 += EPSILON;
             tmpf1 = BASOP_Util_Add_Mant32Exp( L_temp, L_temp_e, EPSILON_FX_M, EPSILON_FX_E, &tmpf1_e );
             tmpf2 = tmpf1;
+            move32();
             tmpf2_e = tmpf1_e;
+            move16();
             // tmpf1 = powf( tmpf1, alpha );
             tmpf1 = BASOP_Util_fPow( tmpf1, tmpf1_e, alpha, 0, &tmpf1_e );
             // tmpf3 += tmpf2 * tmpf1;
@@ -1956,7 +1917,7 @@ void stereo_dft_enc_compute_itd_fx(
     }
 
     // tmpf1 = (float) ( NFFT / 2 + 1 ) / tmpf3;
-    tmpf1 = BASOP_Util_Divide3232_Scale_cadence( add( shr( NFFT, 1 ), 1 ), tmpf3, &tmpf1_e );
+    tmpf1 = BASOP_Util_Divide3232_Scale_newton( add( shr( NFFT, 1 ), 1 ), tmpf3, &tmpf1_e );
     tmpf1_e = add( tmpf1_e, sub( 31, tmpf3_e ) );
     FOR( i = 0; i < NFFT; i++ )
     {
@@ -2034,7 +1995,7 @@ void stereo_dft_enc_compute_itd_fx(
         L_temp = L_abs( BASOP_Util_Add_Mant32Exp( sum_nrg_L, sum_nrg_L_e, L_negate( sum_nrg_R ), sum_nrg_R_e, &L_temp_e ) );
         L_temp2 = BASOP_Util_Add_Mant32Exp( sum_nrg_L, sum_nrg_L_e, sum_nrg_R, sum_nrg_R_e, &L_temp2_e );
         L_temp2 = BASOP_Util_Add_Mant32Exp( L_temp2, L_temp2_e, 1407374883, -16, &L_temp2_e );
-        es_em = BASOP_Util_Divide3232_Scale_cadence( L_temp, L_temp2, &es_em_e );
+        es_em = BASOP_Util_Divide3232_Scale_newton( L_temp, L_temp2, &es_em_e );
         es_em_e = add( es_em_e, sub( L_temp_e, L_temp2_e ) );
 
         hStereoClassif->unclr_fv_fx[E_es_em] = L_shr_r( es_em, sub( 16, es_em_e ) ); // Q15
@@ -2066,7 +2027,7 @@ void stereo_dft_enc_compute_itd_fx(
             move16();
         }
         L_temp2 = BASOP_Util_Add_Mant32Exp( L_temp2, L_temp2_e, 1407374883, -16, &L_temp2_e );
-        d_prodL_prodR = BASOP_Util_Divide3232_Scale_cadence( L_temp, L_temp2, &d_prodL_prodR_e );
+        d_prodL_prodR = BASOP_Util_Divide3232_Scale_newton( L_temp, L_temp2, &d_prodL_prodR_e );
         d_prodL_prodR_e = add( d_prodL_prodR_e, sub( L_temp_e, L_temp2_e ) );
         d_prodL_prodR = BASOP_Util_Add_Mant32Exp( d_prodL_prodR, d_prodL_prodR_e, MAX_32, 0, &d_prodL_prodR_e );
         d_prodL_prodR = BASOP_Util_Loge( d_prodL_prodR, d_prodL_prodR_e ); // Q25
@@ -2080,12 +2041,12 @@ void stereo_dft_enc_compute_itd_fx(
         move32();
         sum_xcorr_e = 0;
         move16();
-        for ( i = 1; i < NFFT_mid; i++ )
+        FOR( i = 1; i < NFFT_mid; i++ )
         {
             // xcorr_abs[i] = logf( xcorr_abs[i] / ( sum_nrg_L + sum_nrg_R + 1e-5f ) + 1e-5f );
             L_temp = BASOP_Util_Add_Mant32Exp( sum_nrg_L, sum_nrg_L_e, sum_nrg_R, sum_nrg_R_e, &L_temp_e );
             L_temp = BASOP_Util_Add_Mant32Exp( L_temp, L_temp_e, 1407374883, -16, &L_temp_e );
-            L_temp2 = BASOP_Util_Divide3232_Scale_cadence( xcorr_abs[i], L_temp, &L_temp2_e );
+            L_temp2 = BASOP_Util_Divide3232_Scale_newton( xcorr_abs[i], L_temp, &L_temp2_e );
             L_temp2_e = add( L_temp2_e, sub( xcorr_abs_e[i], L_temp_e ) );
             L_temp2 = BASOP_Util_Add_Mant32Exp( L_temp2, L_temp2_e, 1407374883, -16, &L_temp2_e );
             xcorr_abs[i] = BASOP_Util_Loge( L_temp2, L_temp2_e );
@@ -2112,7 +2073,7 @@ void stereo_dft_enc_compute_itd_fx(
 
     /*smooth cohSNR with time */
     // if ( ( hItd->cohSNR - cohSNR ) < 10.0f )
-    IF( LT_32( L_sub( hItd->cohSNR_fx, cohSNR ), 655360 ) )
+    IF( LT_32( L_sub( hItd->cohSNR_fx, cohSNR ), 655360 /*10 in Q16*/ ) )
     {
         // tmpf1 = max( 0.05f, min( 0.25f, sfm_L * 0.5f ) );
         tmpf1 = L_max( 107374182, L_min( ONE_IN_Q29, L_shr( sfm_L, 1 ) ) );
@@ -2123,7 +2084,7 @@ void stereo_dft_enc_compute_itd_fx(
     ELSE
     {
         // hItd->cohSNR = hItd->cohSNR - 0.05f;
-        hItd->cohSNR_fx = L_sub( hItd->cohSNR_fx, 3277 );
+        hItd->cohSNR_fx = L_sub( hItd->cohSNR_fx, 3277 /*.05 in Q16*/ );
         move32();
     }
 
@@ -2151,12 +2112,12 @@ void stereo_dft_enc_compute_itd_fx(
     move16();
 
     // hStereoClassif->ave_ener_L = sum_nrg_L / ( NFFT_mid * NFFT_mid );
-    hStereoClassif->ave_ener_L_fx = BASOP_Util_Divide3232_Scale_cadence( sum_nrg_L, L_mult0( NFFT_mid, NFFT_mid ), &hStereoClassif->ave_ener_L_fx_e );
+    hStereoClassif->ave_ener_L_fx = BASOP_Util_Divide3232_Scale_newton( sum_nrg_L, L_mult0( NFFT_mid, NFFT_mid ), &hStereoClassif->ave_ener_L_fx_e );
     move32();
     hStereoClassif->ave_ener_L_fx_e = add( hStereoClassif->ave_ener_L_fx_e, sub( sum_nrg_L_e, 31 ) );
     move16();
     // hStereoClassif->ave_ener_R = sum_nrg_R / ( NFFT_mid * NFFT_mid );
-    hStereoClassif->ave_ener_R_fx = BASOP_Util_Divide3232_Scale_cadence( sum_nrg_R, L_mult0( NFFT_mid, NFFT_mid ), &hStereoClassif->ave_ener_R_fx_e );
+    hStereoClassif->ave_ener_R_fx = BASOP_Util_Divide3232_Scale_newton( sum_nrg_R, L_mult0( NFFT_mid, NFFT_mid ), &hStereoClassif->ave_ener_R_fx_e );
     move32();
     hStereoClassif->ave_ener_R_fx_e = add( hStereoClassif->ave_ener_R_fx_e, sub( sum_nrg_R_e, 31 ) );
     move16();
@@ -2180,14 +2141,15 @@ void stereo_dft_enc_compute_itd_fx(
     test();
     test();
     test();
-    IF( hCPE->hCoreCoder[0]->sp_aud_decision0 && sub( index, STEREO_DFT_ITD_MAX_ANA ) != hItd->prev_itd && !flag_noisy_speech_snr && hCPE->hCoreCoder[0]->vad_flag && LT_32( tmpf1, 644245094 ) )
+    IF( hCPE->hCoreCoder[0]->sp_aud_decision0 && NE_16( sub( index, STEREO_DFT_ITD_MAX_ANA ), hItd->prev_itd ) && !flag_noisy_speech_snr && hCPE->hCoreCoder[0]->vad_flag && LT_32( tmpf1, 644245094 ) )
     {
         // thres *= 1.0f + 1.f * min( 1.f, max( 0.f, ( -1.0f * sfm_L + 0.5f ) / ( 0.5f - 0.2f ) ) );
         L_temp = BASOP_Util_Add_Mant32Exp( L_negate( sfm_L ), 0, ONE_IN_Q30, 0, &L_temp_e );
-        L_temp2 = BASOP_Util_Divide3232_Scale_cadence( L_temp, 644245094, &L_temp2_e );
+        L_temp2 = BASOP_Util_Divide3232_Scale_newton( L_temp, 644245094, &L_temp2_e );
         L_temp2_e = add( L_temp2_e, L_temp_e - 0 );
         L_temp2 = L_shl_sat( L_temp2, sub( L_temp2_e, 1 ) ); // Q30
         L_temp2_e = 1;
+        move16();
         L_temp2 = L_min( ONE_IN_Q30, L_max( 0, L_temp2 ) );
         L_temp2 = L_add_sat( ONE_IN_Q30, L_temp2 ); // Q30
         thres = Mpy_32_32( thres, L_temp2 );
@@ -2203,7 +2165,7 @@ void stereo_dft_enc_compute_itd_fx(
     test();
     test();
     test();
-    IF( hCPE->hCoreCoder[0]->ini_frame == 0 || hCPE->last_element_mode != IVAS_CPE_DFT || !hCPE->hCoreCoder[0]->sp_aud_decision0 || flag_noisy_speech_snr || BASOP_Util_Cmp_Mant32Exp( cohSNR, 15, 20, 31 ) < 0 )
+    IF( hCPE->hCoreCoder[0]->ini_frame == 0 || NE_16( hCPE->last_element_mode, IVAS_CPE_DFT ) || !hCPE->hCoreCoder[0]->sp_aud_decision0 || flag_noisy_speech_snr || BASOP_Util_Cmp_Mant32Exp( cohSNR, 15, 20, 31 ) < 0 )
     {
         hItd->itd_thres_fx = thres;
         move32();
@@ -2220,7 +2182,7 @@ void stereo_dft_enc_compute_itd_fx(
     test();
     test();
     test();
-    IF( flag_noisy_speech_snr == 0 && hCPE->hCoreCoder[0]->vad_flag == 1 && hItd->detected_itd_flag == 0 && ( LT_16( hItd->currFlatness_fx, 192 ) /* 1.5 in Q7*/ || hCPE->hCoreCoder[0]->sp_aud_decision0 == 1 ) )
+    IF( flag_noisy_speech_snr == 0 && EQ_16( hCPE->hCoreCoder[0]->vad_flag, 1 ) && hItd->detected_itd_flag == 0 && ( LT_32( hItd->currFlatness_fx, 3145728 ) /* 1.5 in Q21*/ || EQ_16( hCPE->hCoreCoder[0]->sp_aud_decision0, 1 ) ) )
     {
         // hItd->itd_thres *= 1.5f;
         hItd->itd_thres_fx = L_shl_sat( Mpy_32_32( hItd->itd_thres_fx, 1610612736 ), 1 ); /* Saturation added to avoid assertions (this needs to be investigated) */
@@ -2241,7 +2203,7 @@ void stereo_dft_enc_compute_itd_fx(
     // if ( hItd->itd_tracking == 1 && ( second_max > hItd->itd_thres || tmpf1 - second_max < min( tmpf1 * 0.5f, 0.2f ) ) )
     test();
     test();
-    if ( EQ_16( hItd->itd_tracking, 1 ) && ( GT_32( second_max, hItd->itd_thres_fx ) || LT_32( L_sub( tmpf1, second_max ), L_min( L_shr( tmpf1, 1 ), 429496730 ) ) ) )
+    if ( EQ_16( hItd->itd_tracking, 1 ) && ( GT_32( second_max, hItd->itd_thres_fx ) || LT_32( L_sub( tmpf1, second_max ), L_min( L_shr( tmpf1, 1 ), 429496730 /*.2f in Q31*/ ) ) ) )
     {
         index = second_max_lag;
         move16();
@@ -2249,7 +2211,7 @@ void stereo_dft_enc_compute_itd_fx(
 
     // if ( hItd->itd_tracking == 1 && abs( hItd->prev_itd - ( index - STEREO_DFT_ITD_MAX_ANA ) ) <= max( 2, (int16_t) round_f( abs( hItd->prev_itd ) / 16.f ) ) )
     test();
-    if ( hItd->itd_tracking == 1 && abs_s( sub( hItd->prev_itd, sub( index, STEREO_DFT_ITD_MAX_ANA ) ) ) <= s_max( 2, shr_r( abs_s( hItd->prev_itd ), 4 ) ) )
+    IF( EQ_16( hItd->itd_tracking, 1 ) && LE_16( abs_s( sub( hItd->prev_itd, sub( index, STEREO_DFT_ITD_MAX_ANA ) ) ), s_max( 2, shr_r( abs_s( hItd->prev_itd ), 4 ) ) ) )
     {
         // hItd->itd_thres *= 0.75f;
         hItd->itd_thres_fx = Mpy_32_32( hItd->itd_thres_fx, 1610612736 );
@@ -2401,7 +2363,7 @@ void stereo_dft_enc_compute_itd_fx(
             L_temp = Mpy_32_32( den_cor_cur, den_cor_prev );
             L_temp_e = add( den_cor_cur_e, den_cor_prev_e );
             L_temp = Sqrt32( L_temp, &L_temp_e );
-            cor_lb[i] = BASOP_Util_Divide3232_Scale_cadence( num_cor, L_temp, &cor_lb_e[i] );
+            cor_lb[i] = BASOP_Util_Divide3232_Scale_newton( num_cor, L_temp, &cor_lb_e[i] );
             move32();
             cor_lb_e[i] = add( cor_lb_e[i], sub( num_cor_e, L_temp_e ) );
             move16();
@@ -2413,7 +2375,7 @@ void stereo_dft_enc_compute_itd_fx(
             // par_L[i] = xcorr_max / ( sum_nrg_L_tmp + FLT_MIN );
             IF( xcorr_max )
             {
-                par_L[i] = BASOP_Util_Divide3232_Scale_cadence( xcorr_max, sum_nrg_L_tmp, &par_L_e[i] );
+                par_L[i] = BASOP_Util_Divide3232_Scale_newton( xcorr_max, sum_nrg_L_tmp, &par_L_e[i] );
                 move32();
                 par_L_e[i] = add( par_L_e[i], sub( xcorr_max_e, sum_nrg_L_tmp_e ) );
                 move16();
@@ -2435,24 +2397,33 @@ void stereo_dft_enc_compute_itd_fx(
 
         /*Breakdown of fine-control conditions */
         // fc_condition_1 = abs( hItd->prev_itd ) > 0.2f * abs( itd );
-        fc_condition_1 = (Word16) GT_16( abs_s( hItd->prev_itd ), mult( 6554 /*0.2f*/, abs_s( itd ) ) );
+        fc_condition_1 = extract_l( GT_16( abs_s( hItd->prev_itd ), mult( 6554 /*0.2f*/, abs_s( itd ) ) ) );
         // fc_condition_2 = cor_lb_avrg > 0.85f;
-        fc_condition_2 = (Word16) GT_32( cor_lb_avrg, 1825361101 /*0.85f*/ );
+        fc_condition_2 = extract_l( GT_32( cor_lb_avrg, 1825361101 /*0.85f*/ ) );
         // fc_condition_3 = ( cor_lb_avrg > 0.7f && ( cor_lb[0] > 0.9f || cor_lb[1] > 0.9f || cor_lb[2] > 0.9f ) && hItd->prev_sum_nrg_L_lb > 0.5f * sum_nrg_L_lb && hItd->prev_sum_nrg_L_lb < 2.0f * sum_nrg_L_lb );
         test();
         test();
         test();
         test();
         test();
-        fc_condition_3 = (Word16) ( GT_32( cor_lb_avrg, 1503238554 /*0.7f*/ ) && ( GT_32( cor_lb[0], 1932735283 /*0.9f*/ ) || GT_32( cor_lb[1], 1932735283 /*0.9f*/ ) || GT_32( cor_lb[2], 1932735283 /*0.9f*/ ) ) &&
+        fc_condition_3 = extract_l( GT_32( cor_lb_avrg, 1503238554 /*0.7f*/ ) && ( GT_32( cor_lb[0], 1932735283 /*0.9f*/ ) || GT_32( cor_lb[1], 1932735283 /*0.9f*/ ) || GT_32( cor_lb[2], 1932735283 /*0.9f*/ ) ) &&
                                     BASOP_Util_Cmp_Mant32Exp( hItd->prev_sum_nrg_L_lb_fx, hItd->prev_sum_nrg_L_lb_fx_e, sum_nrg_L_lb, sub( sum_nrg_L_lb_e, 1 ) ) > 0 && BASOP_Util_Cmp_Mant32Exp( hItd->prev_sum_nrg_L_lb_fx, hItd->prev_sum_nrg_L_lb_fx_e, sum_nrg_L_lb, add( sum_nrg_L_lb_e, 1 ) ) < 0 );
         // fc_condition_4 = par_L_avrg > 0.6f;
-        fc_condition_4 = (Word16) GT_32( par_L_avrg, 1288490189 /*0.6f*/ );
+        fc_condition_4 = extract_l( GT_32( par_L_avrg, 1288490189 /*0.6f*/ ) );
         fc_condition_5 = hItd->prev_itd != 0;
         fc_condition_6_a = L_mult0( itd, hItd->prev_itd ) < 0;  /* ITD sign change */
         fc_condition_6_b = L_mult0( itd, hItd->prev_itd ) == 0; /* ITD jump to zero */
         // fc_condition_6_c = abs( itd - hItd->prev_itd ) > 0.5f * ( ( abs( itd ) > abs( hItd->prev_itd ) ) ? abs( itd ) : abs( hItd->prev_itd ) ); /* Magnitude of the ITD jump */
-        fc_condition_6_c = (Word16) GT_16( abs_s( sub( itd, hItd->prev_itd ) ), shr( ( ( abs_s( itd ) > abs_s( hItd->prev_itd ) ) ? abs_s( itd ) : abs_s( hItd->prev_itd ) ), 1 ) ); /* Magnitude of the ITD jump */
+        fc_condition_6_c = extract_l( GT_16( abs_s( sub( itd, hItd->prev_itd ) ), shr( ( ( abs_s( itd ) > abs_s( hItd->prev_itd ) ) ? abs_s( itd ) : abs_s( hItd->prev_itd ) ), 1 ) ) ); /* Magnitude of the ITD jump */
+
+        IF( GT_16( abs_s( itd ), abs_s( hItd->prev_itd ) ) )
+        {
+            fc_condition_6_c = extract_l( GT_16( abs_s( sub( itd, hItd->prev_itd ) ), shr( ( abs_s( itd ) ), 1 ) ) ); /* Magnitude of the ITD jump */
+        }
+        ELSE
+        {
+            fc_condition_6_c = extract_l( GT_16( abs_s( sub( itd, hItd->prev_itd ) ), shr( ( abs_s( hItd->prev_itd ) ), 1 ) ) ); /* Magnitude of the ITD jump */
+        }
 
         /* Combining conditions 1,2,3,4 */
         test();
@@ -2546,7 +2517,11 @@ void stereo_dft_enc_compute_itd_fx(
     prev_itd_max = hItd->hybrid_itd_max;
     move16();
     /* enable hybrid ITD handling for very large ITDs*/
-    hItd->hybrid_itd_max = ( abs( itd ) > STEREO_DFT_ITD_MAX && abs( itd ) < STEREO_DFT_ITD_MAX_ANA && !hCPE->hCoreCoder[0]->sp_aud_decision0 && hCPE->element_brate < IVAS_32k );
+    // hItd->hybrid_itd_max = ( abs_s( itd ) > STEREO_DFT_ITD_MAX && abs_s( itd ) < STEREO_DFT_ITD_MAX_ANA && !hCPE->hCoreCoder[0]->sp_aud_decision0 && hCPE->element_brate < IVAS_32k );
+    test();
+    test();
+    test();
+    hItd->hybrid_itd_max = ( GT_16( abs_s( itd ), STEREO_DFT_ITD_MAX ) && LT_16( abs_s( itd ), STEREO_DFT_ITD_MAX_ANA ) && !hCPE->hCoreCoder[0]->sp_aud_decision0 && LT_32( hCPE->element_brate, IVAS_32k ) );
     move16();
     /* Update memory */
     hItd->prev_itd = itd;
diff --git a/lib_enc/ivas_stereo_dft_td_itd.c b/lib_enc/ivas_stereo_dft_td_itd_fx.c
similarity index 87%
rename from lib_enc/ivas_stereo_dft_td_itd.c
rename to lib_enc/ivas_stereo_dft_td_itd_fx.c
index b997495be50c065ab637383c80e992e112cdd5c5..309ec3377d8505c7f3cfd058bd0dd3e764637d83 100644
--- a/lib_enc/ivas_stereo_dft_td_itd.c
+++ b/lib_enc/ivas_stereo_dft_td_itd_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,13 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "ivas_stat_enc.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------*
@@ -54,7 +52,7 @@
 #define STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT 320
 #define FLR_FX                                16384 // Q15
 #define ONE_HALF                              24576 // Q14
-const Word16 wac_swb_h_fx[LPC_SHB_ORDER + 1] = {
+const Word16 wac_swb_h_fx[LPC_SHB_ORDER + 1] = {    // Q15
     32767,
     32758,
     32731,
@@ -68,7 +66,7 @@ const Word16 wac_swb_h_fx[LPC_SHB_ORDER + 1] = {
     31870
 };
 
-const Word16 wac_swb_l_fx[LPC_SHB_ORDER + 1] = {
+const Word16 wac_swb_l_fx[LPC_SHB_ORDER + 1] = { // Q15
     32767,
     29696,
     20864,
@@ -90,7 +88,7 @@ const Word16 wac_swb_l_fx[LPC_SHB_ORDER + 1] = {
 static void stereo_td_get_td_itd_fx(
     Word16 *td_itd,    /* o  : td_itd in samples at sampling frequency */
     Word16 *td_itd_32, /* o  : td_itd in samples at 32kHz              */
-    const Word32 itd,  /* i  : itd in samples at sampling frequency    */
+    const Word32 itd,  /* i  : itd in samples at sampling frequency  q_itd  */
     Word16 q_itd,
     const Word32 input_Fs /* i  : sampling frequency                      */
 )
@@ -114,7 +112,14 @@ static void stereo_td_get_td_itd_fx(
         temp_e = add( temp_e, sub( sub( 31, q_itd ), d_e ) ); // e+(e1-e2)//
         temp_add = add_sat( temp_div, shr_sat( FLR_FX, temp_e ) );
 
-        *td_itd_32 = shl( shr( temp_add, sub( 15, temp_e ) ), 1 );
+        IF( itd != 0 )
+        {
+            *td_itd_32 = extract_l( L_shl( L_shr( L_add( temp_add, EPSILON_FX ), sub( 15, temp_e ) ), 1 ) );
+        }
+        ELSE
+        {
+            *td_itd_32 = shl( shr( temp_add, sub( 15, temp_e ) ), 1 );
+        }
         move16();
 
         *td_itd = i_mult( shr( *td_itd_32, 1 ), shr( d, sub( 15, d_e ) ) );
@@ -133,13 +138,13 @@ static void stereo_td_get_td_itd_fx(
 static void stereo_td_channel_extrapolate_fx(
     Encoder_State **sts,
     const Word16 dft_ovl,
-    const Word16 shift_mem[],
+    const Word16 shift_mem[], // q_shift
     Word16 q_shift,
-    Word16 shift_input[],
+    Word16 shift_input[], // q_shift
     const Word16 input_frame,
     const Word16 itd_shift,
     const Word16 lagging_channel,
-    Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory     */
+    Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory  q_input_mem   */
     Word16 *q_input_mem,
     Word16 *q_new_shift )
 {
@@ -165,7 +170,7 @@ static void stereo_td_channel_extrapolate_fx(
     set16_fx( shift_combined, 0, add( L_FRAME48k, L_FRAME48k ) );
     set16_fx( residual, 0, STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT + ( STEREO_DFT_ITD_MAX * input_frame ) / L_FRAME32k );
 
-    leading_channel = add( lagging_channel, 1 ) & 1;
+    leading_channel = s_and( add( lagging_channel, 1 ), 1 );
     IF( EQ_16( sts[0]->element_mode, IVAS_CPE_DFT ) )
     {
         size_ovl = dft_ovl;
@@ -176,6 +181,8 @@ static void stereo_td_channel_extrapolate_fx(
         size_ovl = input_frame;
         pitch0 = sts[lagging_channel]->pitch[0];
     }
+    move16();
+    move16();
 
     pred_ovlp = idiv1616( input_frame, 10 );
 
@@ -192,9 +199,16 @@ static void stereo_td_channel_extrapolate_fx(
     dot_lead_lag_1 = EPSILON_FX;
     dot_lead_lead_1 = EPSILON_FX;
     dot_lag_lag_1 = EPSILON_FX;
+    move64();
+    move64();
+    move64();
+    move32();
+    move32();
+    move32();
     FOR( i = 0; i < size_ovl; i++ )
     {
         shift_combined[i] = shift_mem[i]; // q_shift
+        move16();
         // q_shift_combined = q_shift;
         dot_lead_lag = W_mac0_16_16( dot_lead_lag, input_mem[leading_channel][i], shift_mem[i] );
         dot_lead_lead = W_mac0_16_16( dot_lead_lead, input_mem[leading_channel][i], input_mem[leading_channel][i] );
@@ -202,19 +216,20 @@ static void stereo_td_channel_extrapolate_fx(
     }
     FOR( i = 0; i < input_frame - itd_shift; i++ )
     {
-        shift_combined[add( i, size_ovl )] = shift_input[i]; // q_shift
+        shift_combined[i + size_ovl] = shift_input[i]; // q_shift
+        move16();
         dot_lead_lag = W_mac0_16_16( dot_lead_lag, sts[leading_channel]->input_fx[i], shift_input[i] );
         dot_lead_lead = W_mac0_16_16( dot_lead_lead, sts[leading_channel]->input_fx[i], sts[leading_channel]->input_fx[i] );
         dot_lag_lag = W_mac0_16_16( dot_lag_lag, shift_input[i], shift_input[i] );
     }
     q_dot_lead_lag = q_shift + q_input_mem[leading_channel]; // q_input_mem = q_input
     q_dot_lead_lead = q_input_mem[leading_channel] + q_input_mem[leading_channel];
-    q_dot_lag_lag = q_shift + q_shift;
+    q_dot_lag_lag = add( q_shift, q_shift );
 
 
-    q_dot_lead_lag = q_dot_lead_lag + W_norm( dot_lead_lag ) - 32;
-    q_dot_lead_lead = q_dot_lead_lead + W_norm( dot_lead_lead ) - 32;
-    q_dot_lag_lag = q_dot_lag_lag + W_norm( dot_lag_lag ) - 32;
+    q_dot_lead_lag = sub( add( q_dot_lead_lag, W_norm( dot_lead_lag ) ), 32 );
+    q_dot_lead_lead = sub( add( q_dot_lead_lead, W_norm( dot_lead_lead ) ), 32 );
+    q_dot_lag_lag = sub( add( q_dot_lag_lag, W_norm( dot_lag_lag ) ), 32 );
     dot_lead_lag_1 = W_extract_h( W_shl( dot_lead_lag, W_norm( dot_lead_lag ) ) );
     dot_lead_lead_1 = W_extract_h( W_shl( dot_lead_lead, W_norm( dot_lead_lead ) ) );
     dot_lag_lag_1 = W_extract_h( W_shl( dot_lag_lag, W_norm( dot_lag_lag ) ) );
@@ -222,13 +237,13 @@ static void stereo_td_channel_extrapolate_fx(
 
     Word16 g_e, f, f_e, g_lpc_e, nsr_e;
     g = BASOP_Util_Divide3232_Scale( dot_lead_lag_1, dot_lead_lead_1, &g_e );
-    g_e = g_e + ( q_dot_lead_lead - q_dot_lead_lag );
+    g_e = add( g_e, sub( q_dot_lead_lead, q_dot_lead_lag ) );
 
     f = BASOP_Util_Divide3232_Scale( dot_lead_lag_1, dot_lag_lag_1, &f_e );
-    f_e = f_e + ( q_dot_lag_lag - q_dot_lead_lag );
+    f_e = add( f_e, sub( q_dot_lag_lag, q_dot_lead_lag ) );
 
     nsr = mult( g, f );
-    nsr_e = BASOP_Util_Add_MantExp( ONE_IN_Q14, 1, negate( nsr ), g_e + f_e, &nsr );
+    nsr_e = BASOP_Util_Add_MantExp( ONE_IN_Q14, 1, negate( nsr ), add( g_e, f_e ), &nsr );
     IF( g_e > 0 )
     {
         g = check_bounds_s_fx( g, negate( shl( 1, sub( 15, g_e ) ) ), shl( ONE_HALF, sub( 1, g_e ) ) );
@@ -237,11 +252,12 @@ static void stereo_td_channel_extrapolate_fx(
     {
         nsr = check_bounds_s_fx( nsr, 0, shl( 1, sub( 15, nsr_e ) ) );
     }
-    g = shl( g, g_e - 1 );   // q14
-    nsr = shl( nsr, nsr_e ); // Q15
+    g = shl( g, sub( g_e, 1 ) ); // q14
+    nsr = shl( nsr, nsr_e );     // Q15
     g_lpc_e = 0;
+    move16();
     g_lpc = Sqrt16( nsr, &g_lpc_e );
-    g_lpc = shl( g_lpc, g_lpc_e - 1 ); // Q14
+    g_lpc = shl( g_lpc, sub( g_lpc_e, 1 ) ); // Q14
     /* rectangular window */
     set16_fx( window, 32767, STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT );
     set16_zero_fx( mem_zero, STEREO_DFT_CHANNEL_EXTR_LPC_ORDER );
@@ -250,19 +266,20 @@ static void stereo_td_channel_extrapolate_fx(
     autocorr_ivas_fx( shift_combined + input_frame + size_ovl - itd_shift - STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT, q_shift, STEREO_DFT_CHANNEL_EXTR_LPC_ORDER, r_h, r_l, &Q_r, STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT, window, 0, 0, 0 );
     /* Ensure R[0] isn't zero when entering Levinson-Durbin */
     r_l[0] = s_max( r_l[0], 1 );
+    move16();
     FOR( i = 0; i <= STEREO_DFT_CHANNEL_EXTR_LPC_ORDER; i++ )
     {
         L_tmp = Mpy_32( r_h[i], r_l[i], wac_swb_h_fx[i], wac_swb_l_fx[i] );
         L_Extract( L_tmp, &r_h[i], &r_l[i] );
     }
     r_l[0] = s_max( r_l[0], 1 );
-
-
+    move16();
     flag = E_LPC_lev_dur( r_h, r_l, A, NULL, STEREO_DFT_CHANNEL_EXTR_LPC_ORDER, NULL );
     Copy_Scale_sig( A, A, STEREO_DFT_CHANNEL_EXTR_LPC_ORDER + 1, sub( norm_s( A[0] ), 2 ) );
     IF( EQ_16( flag, 1 ) )
     {
         g_lpc = 0;
+        move16();
     }
     ELSE
     {
@@ -271,15 +288,25 @@ static void stereo_td_channel_extrapolate_fx(
 
         /* extend the residual */
         /* to prevent out of bound reading */
-        res_shift = ( pitch_lag < PIT_MAX ? pitch_lag : itd_shift );
+        IF( LT_16( pitch_lag, PIT_MAX ) )
+        {
+            res_shift = pitch_lag;
+            move16();
+        }
+        ELSE
+        {
+            res_shift = itd_shift;
+            move16();
+        }
 
         FOR( i = STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT; i < STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT + itd_shift; i++ )
         {
             residual[i] = residual[i - res_shift];
+            move16();
         }
 
         /* perform sythesis */
-        E_UTIL_synthesis( 0, A, residual, shift_combined + input_frame + size_ovl - STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT - itd_shift, STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT + itd_shift, mem_zero, 0, STEREO_DFT_CHANNEL_EXTR_LPC_ORDER );
+        E_UTIL_synthesis( 0, A, residual, shift_combined + sub( add( input_frame, size_ovl ), add( STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT, itd_shift ) ), STEREO_DFT_CHANNEL_EXTR_LPC_VEC_LIMIT + itd_shift, mem_zero, 0, STEREO_DFT_CHANNEL_EXTR_LPC_ORDER );
     }
 
     Copy( shift_combined + size_ovl, shift_input, input_frame ); // q_shift
@@ -329,13 +356,13 @@ static void stereo_td_channel_extrapolate_fx(
 
 void stereo_td_itd_fx(
     ITD_DATA *hITD,                                         /* i/o: ITD data structure                    */
-    Word16 input_mem_itd[CPE_CHANNELS][STEREO_DFT_OVL_MAX], /* o  : ITD memory (only used in DFT Stereo)  */
+    Word16 input_mem_itd[CPE_CHANNELS][STEREO_DFT_OVL_MAX], /* o  : ITD memory (only used in DFT Stereo)  q_input_mem_itd*/
     Word16 *q_input_mem_itd,
     const Word16 hybrid_itd_flag,    /* i  : flag for hybrid TD/FD ITD processing  */
     const Word16 dft_ovl,            /* i  : size of DFT overlap                   */
     Encoder_State **sts,             /* i/o: Encoder state structure               */
     const Word16 input_frame,        /* i  : input frame length                    */
-    Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory                   */
+    Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory       q_input_mem            */
     Word16 *q_input_mem )
 {
     Word16 i, ch, n;
@@ -353,26 +380,12 @@ void stereo_td_itd_fx(
     move16();
     set16_fx( shift_input, 0, input_frame );
 
-    FOR( n = 0; n < CPE_CHANNELS; n++ )
-    {
-
-        Scale_sig( &input_mem[n][0], dft_ovl, sts[n]->q_inp - q_input_mem[n] );
-        // Scale_sig(&sts[n]->old_input_signal_fx, 1965, sts[n]->q_inp - sts[n]->q_old_inp);
-        // sts[n]->q_old_inp = sts[n]->q_inp;
-        q_input_mem[n] = sts[n]->q_inp;
-        move16();
-    } // check this block once
     IF( EQ_16( sts[0]->element_mode, IVAS_CPE_MDCT ) )
     {
-        /*FOR(n = 0; n < CPE_CHANNELS; n++)
-        {
-          Scale_sig(sts[n]->old_input_signal_fx, 1965, sts[n]->q_inp - sts[n]->q_old_inp);
-          sts[n]->q_old_inp = sts[n]->q_inp;
-        }*/
-        // check this block onc
         FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
             mdct_mem[n] = sts[n]->old_input_signal_fx;
+            move16();
             // q_mdct_mem[n] = sts[n]->q_old_inp;
         }
     }
@@ -410,8 +423,8 @@ void stereo_td_itd_fx(
         move16();
 
         itd_max = shr( input_frame, 2 );
-        Word16 comp_flag1 = (Word16) LE_16( extract_l( L_shr( hITD->itd_fx[k_offset], Q16 ) ), itd_max );
-        Word16 comp_flag2 = (Word16) LE_16( extract_l( L_shr( hITD->itd_fx[sub( k_offset, 1 )], Q16 ) ), itd_max );
+        Word16 comp_flag1 = extract_l( LE_16( extract_l( L_shr( hITD->itd_fx[k_offset], Q16 ) ), itd_max ) );
+        Word16 comp_flag2 = extract_l( LE_16( extract_l( L_shr( hITD->itd_fx[sub( k_offset, 1 )], Q16 ) ), itd_max ) );
         assert( ( comp_flag1 ) && "ITD value is too high!" );
         assert( ( comp_flag2 ) && "ITD value is too high!" );
 
@@ -451,7 +464,7 @@ void stereo_td_itd_fx(
                 }
 
                 /*shift past part*/
-                Copy( input_mem[ch] + shift[ch], shift_mem, size_ovl - shift[ch] );
+                Copy( input_mem[ch] + shift[ch], shift_mem, sub( size_ovl, shift[ch] ) );
                 Copy( sts[ch]->input_fx, shift_mem + size_ovl - shift[ch], shift[ch] );
                 q_shift_mem = sts[ch]->q_inp;
                 move16();
@@ -465,7 +478,7 @@ void stereo_td_itd_fx(
                 move16();
             }
             /*shift current part*/
-            Copy( sts[ch]->input_fx + shift[ch], shift_input, input_frame - shift[ch] );
+            Copy( sts[ch]->input_fx + shift[ch], shift_input, sub( input_frame, shift[ch] ) );
 
             q_shift = sts[ch]->q_inp;
             move16();
@@ -486,8 +499,8 @@ void stereo_td_itd_fx(
             Copy( shift_input, sts[ch]->input_fx, input_frame );
             sts[ch]->q_inp = q_new_shift;
             move16();
-            /*sts[ch]->q_old_inp = q_new_shift;
-            move16();*/
+            Copy_Scale_sig_16_32_no_sat( sts[ch]->input_fx, sts[ch]->input32_fx, input_frame, sub( sts[ch]->q_inp32, sts[ch]->q_inp ) );
+
             IF( EQ_16( sts[0]->element_mode, IVAS_CPE_DFT ) )
             {
                 // here shift_mem has same as input_mem, no need to update q //
@@ -498,7 +511,8 @@ void stereo_td_itd_fx(
                 Copy( shift_mem, mdct_mem[ch], input_frame );
                 sts[ch]->q_old_inp = q_new_shift;
                 move16();
-                Scale_sig( mdct_mem[ch], input_frame, sub( sts[ch]->q_inp, q_shift_mem ) );
+                Scale_sig( mdct_mem[ch], input_frame, sub( sts[ch]->q_inp, q_shift_mem ) ); // Q(sts[ch]->q_inp)
+                Copy_Scale_sig_16_32_no_sat( shift_mem, sts[ch]->old_input_signal32_fx, input_frame, sub( sts[ch]->q_old_inp32, q_shift_mem ) );
             }
         }
     }
@@ -528,6 +542,7 @@ void stereo_td_itd_mdct_stereo_fx(
     Word16 DFT_tmp_e[CPE_CHANNELS][STEREO_DFT_N_MAX_ENC];
     STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct;
 
+    test();
     IF( hCPE->hStereoMdct != NULL && hCPE->hStereoMdct->hItd != NULL )
     {
         hStereoMdct = hCPE->hStereoMdct;
diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs_fx.c
similarity index 89%
rename from lib_enc/ivas_stereo_dmx_evs.c
rename to lib_enc/ivas_stereo_dmx_evs_fx.c
index 4ef16ce9f9478c3996a549eb09447a7715e51be3..9d0bb92af23e900e4ea0d557e4322861bc69a886 100644
--- a/lib_enc/ivas_stereo_dmx_evs.c
+++ b/lib_enc/ivas_stereo_dmx_evs_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,16 +36,13 @@
 #include "cnst.h"
 #include "ivas_cnst.h"
 #include "rom_com.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
 #include "ivas_rom_enc.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*-----------------------------------------------------------------------*
@@ -55,54 +52,35 @@
 #define STEREO_DMX_EVS_FIND_POC_PEAK_TAU  4
 #define STEREO_DMX_EVS_FIND_POC_PEAK_TAU2 8
 
-#define STEREO_DMX_EVS_POC_GAMMA                 0.75f
-#define STEREO_DMX_EVS_POC_SMOOTH                1.25f
 #define STEREO_DMX_EVS_POC_SMOOTH_Q30            1342177280
-#define STEREO_DMX_EVS_POC_FORGETTING            0.78f
 #define STEREO_DMX_EVS_POC_FORGETTING_Q31        1675037245
-#define STEREO_DMX_EVS_TARGET_POC_FORGETTING     0.79f
 #define STEREO_DMX_EVS_TARGET_POC_FORGETTING_Q31 1696512082
-#define STEREO_DMX_EVS_POC_W_FORGETTING          0.875f
-#define STEREO_DMX_EVS_SHIFT_LIMIT               5.625f /* ms */
-#define STEREO_DMX_EVS_SHIFT_LIMIT_Q12           23040  /* ms */
+#define STEREO_DMX_EVS_SHIFT_LIMIT_Q12           23040 /* ms */
 
 
-#define STEREO_DMX_EVS_DMX_EGY_FORGETTING    0.25f
 #define STEREO_DMX_EVS_DMX_EGY_FORGETTING_FX 536870912 // 0.25f in Q31
 
-#define STEREO_DMX_EVS_CORR_FORGETTING     0.78f
 #define STEREO_DMX_EVS_CORR_FORGETTING_FX  1610612736 /*Q31*/
 #define STEREO_DMX_EVS_POC_W_FORGETTING_FX 1879048192 /*Q31*/
 
-#define Q_BAND    0.25f
 #define Q_BAND_FX 536870912 /*Q31*/
 
-#define STEREO_DMX_EVS_ISD_FORGETTING         0.95f
-#define STEREO_DMX_EVS_ISD_FORGETTING_Q15     31129
-#define STEREO_DMX_EVS_ISD_THRES_H            1.69f
-#define STEREO_DMX_EVS_ISD_THRES_L            0.9f
 #define STEREO_DMX_EVS_ISD_THRES_L_Q31        1932735283
-#define STEREO_DMX_EVS_ISD_DIST_THRES_IPD     0.5f
 #define STEREO_DMX_EVS_ISD_DIST_THRES_IPD_Q15 ONE_IN_Q14
 
-#define STEREO_DMX_EVS_ISD_DIST_HYST_L     0.36f
-#define STEREO_DMX_EVS_ISD_DIST_HYST_L_Q15 11796
-#define STEREO_DMX_EVS_ISD_DIST_HYST_H     0.43f
-#define STEREO_DMX_EVS_ISD_DIST_HYST_H_Q15 14090
+#define STEREO_DMX_EVS_ISD_FORGETTING_Q31   2040109465
+#define STEREO_DMX_EVS_ISD_1MFORGETTING_Q15 1638
+#define STEREO_DMX_EVS_ISD_DIST_HYST_L_Q31  773094113
+#define STEREO_DMX_EVS_ISD_DIST_HYST_H_Q31  923417968
+#define STEREO_DMX_EVS_ISD_INVTHRES_H       1270700383
 
-#define STEREO_DMX_EVS_ICCR_FORGETTING     0.7f
 #define STEREO_DMX_EVS_ICCR_FORGETTING_Q31 1503238554
-#define STEREO_DMX_EVS_ICCR_HYST_L         0.75f
 #define STEREO_DMX_EVS_ICCR_HYST_L_Q31     1610612736
-#define STEREO_DMX_EVS_ICCR_HYST_H         0.85f
 #define STEREO_DMX_EVS_ICCR_HYST_H_Q31     1825361101
 
 #define STEREO_DMX_EVS_SWTCH_HYS_THRES 1
-#define STEREO_DMX_EVS_LR_EGY          15.0f
 #define STEREO_DMX_EVS_LR_EGY_Q27      2013265920
-#define STEREO_DMX_EVS_ILDS_EGY        10000.0f
 #define STEREO_DMX_EVS_ILDS_EGY_Q17    1310720000
-#define STEREO_DMX_EVS_ILD_PRC         0.1f
 #define STEREO_DMX_EVS_ILD_PRC_Q15     3277
 
 #define STEREO_DMX_EVS_SWTCH_PRC_THRES_16 55
@@ -110,15 +88,14 @@
 #define STEREO_DMX_EVS_SWTCH_PRC_THRES_48 29
 
 #define STEREO_DMX_EVS_SWTCH_PRC_HYS_THRES 1
-#define STEREO_DMX_EVS_FADE_LEN_PRC        20.0f
+#define STEREO_DMX_EVS_FADE_LEN_PRC_Q0     20
 
-#define STEREO_DMX_EVS_NB_SBFRM      5
-#define STEREO_DMX_EVS_TRNS_DTC_INST 75.0f
-#define STEREO_DMX_EVS_CRST_FCTR_16  80.0f
-#define STEREO_DMX_EVS_CRST_FCTR_32  40.0f
-#define STEREO_DMX_EVS_CRST_FCTR_48  35.0f
+#define STEREO_DMX_EVS_NB_SBFRM         5
+#define STEREO_DMX_EVS_TRNS_DTC_INST_Q0 75
+#define STEREO_DMX_EVS_CRST_FCTR_16_Q0  80
+#define STEREO_DMX_EVS_CRST_FCTR_32_Q0  40
+#define STEREO_DMX_EVS_CRST_FCTR_48_Q0  35
 
-#define STEREO_DMX_EVS_TRNS_EGY_FORGETTING     0.75f
 #define STEREO_DMX_EVS_TRNS_EGY_FORGETTING_Q15 24576
 
 const Word32 ipd_ff_Q31[STEREO_DMX_EVS_NB_SUBBAND_MAX] = {
@@ -178,7 +155,7 @@ static ivas_error estimate_itd_fx(
     STEREO_DMX_EVS_PHA_HANDLE hPHA, /* i/o: correlation filter structure     */
     const Word32 srcL[],            /* i  : Lch input signal            Q16 */
     const Word32 srcR[],            /* i  : Rch input signal            Q16 */
-    Word32 itd[],                   /* o  : estimated itd               Q16  */
+    Word16 itd[],                   /* o  : estimated itd               Q0  */
     const Word16 input_frame        /* i  : input frame length per channel   */
 );
 static void adapt_gain_fx(
@@ -221,7 +198,7 @@ static void create_M_signal_fx(
 );
 static Word32 find_poc_peak_fx(
     STEREO_DMX_EVS_POC_HANDLE hPOC, /* i/o: phase only correlation structure */
-    Word32 itd_fx[],                /* o  : estimated itd                    */
+    Word16 itd_fx[],                /* o  : estimated itd                    */
     const Word16 input_frame,       /* i  : input frame length per channel   */
     const Word32 ratio_fixed        /* i  : adapting ratio                   */
 );
@@ -270,7 +247,7 @@ void estimate_itd_wnd_fft_fx(
     }
 
     rshift = sub( getScaleFactor32( rfft_buf, input_frame ), find_guarded_bits_fx( input_frame ) );
-    scale_sig32( rfft_buf, input_frame, rshift );
+    scale_sig32( rfft_buf, input_frame, rshift ); // Q(16+rshift)
     *spec_e = sub( 15, rshift );
     move16();
     rfft_fx( rfft_buf, rfft_coef, input_frame, -1 );
@@ -362,22 +339,22 @@ static void calc_poc_fx(
     // igamma = STEREO_DMX_EVS_POC_GAMMA * iN;
     IF( EQ_16( input_frame, L_FRAME16k ) )
     {
-        igamma = 5033165;
+        igamma = 5033165; //(STEREO_DMX_EVS_POC_GAMMA/input_frame) in Q31
         move16();
     }
     ELSE IF( EQ_16( input_frame, L_FRAME32k ) )
     {
-        igamma = 3355444;
+        igamma = 3355444; //(STEREO_DMX_EVS_POC_GAMMA/input_frame) in Q31
         move16();
     }
     ELSE IF( EQ_16( input_frame, L_FRAME48k ) )
     {
-        igamma = 1677722;
+        igamma = 1677722; //(STEREO_DMX_EVS_POC_GAMMA/input_frame) in Q31
         move16();
     }
     ELSE
     {
-        igamma = 1677722;
+        igamma = 1677722; //(STEREO_DMX_EVS_POC_GAMMA/input_frame) in Q31
         move16();
         IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "invalid sample rate\n" );
     }
@@ -518,41 +495,41 @@ static void calc_poc_fx(
 
     FOR( ; i < n0 >> 3; i++ ) /* binary search from 8 angles */
     {
-        tmp1 = Mpy_32_32_r( wnd[i * step + bias], gamma );
+        tmp1 = Mpy_32_32_r( wnd[i * step + bias], gamma ); // Q31
 
         IF( W_mult0_32_32( L_sub( specPOr[i], specPOi[i] ), L_add( specPOr[i], specPOi[i] ) ) > 0 )
         {
-            specPOr[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOr[i] ), /*0.923880f*/ s[120 * mult_angle] ) ); /*  cos(PI/8)*/
+            specPOr[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOr[i] ), /*0.923880f*/ s[120 * mult_angle] ) ); /*  cos(PI/8)  Q31*/
             move32();
-            specPOi[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOi[i] ), /*0.382683f*/ s[40 * mult_angle] ) );
+            specPOi[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOi[i] ), /*0.382683f*/ s[40 * mult_angle] ) ); // Q31
             move32();
         }
         ELSE
         {
-            specPOr[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOr[i] ), /*0.382683f*/ s[40 * mult_angle] ) ); /*  cos(PI*3/8)*/
+            specPOr[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOr[i] ), /*0.382683f*/ s[40 * mult_angle] ) ); /*  cos(PI*3/8)  Q31*/
             move32();
-            specPOi[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOi[i] ), /*0.923880f*/ s[120 * mult_angle] ) );
+            specPOi[i] = Mpy_32_16_1( tmp1, imult1616( sign_fx( specPOi[i] ), /*0.923880f*/ s[120 * mult_angle] ) ); // Q31
             move32();
         }
         gamma = L_sub( gamma, igamma );
     }
     FOR( ; i < end; i++ ) /* binary search from 16 angles */
     {
-        tmp1 = Mpy_32_32_r( wnd[i * step + bias], gamma );
+        tmp1 = Mpy_32_32_r( wnd[i * step + bias], gamma ); // Q31
         IF( W_mult0_32_32( L_sub( specPOr[i], specPOi[i] ), L_add( specPOr[i], specPOi[i] ) ) > 0 )
         {
             IF( W_mult0_32_32( L_sub( Mpy_32_16_1( specPOr[i], 13573 /*0.414213f*/ ), specPOi[i] ), L_add( Mpy_32_16_1( specPOr[i], 13573 /*0.414213f*/ ), specPOi[i] ) ) > 0 ) /*tan(PI/8)*/
             {
-                specPOr[i] = Mpy_32_16_1( tmp1 /*0.980785f */, imult1616( sign_fx( specPOr[i] ), s[140 * mult_angle] ) ); /* cos(PI/16)*/
+                specPOr[i] = Mpy_32_16_1( tmp1 /*0.980785f */, imult1616( sign_fx( specPOr[i] ), s[140 * mult_angle] ) ); /* cos(PI/16)  Q31*/
                 move32();
-                specPOi[i] = Mpy_32_16_1( tmp1 /*0.195090f */, imult1616( sign_fx( specPOi[i] ), s[20 * mult_angle] ) );
+                specPOi[i] = Mpy_32_16_1( tmp1 /*0.195090f */, imult1616( sign_fx( specPOi[i] ), s[20 * mult_angle] ) ); // Q31
                 move32();
             }
             ELSE
             {
-                specPOr[i] = Mpy_32_16_1( tmp1 /* 0.831470f */, imult1616( sign_fx( specPOr[i] ), s[100 * mult_angle] ) ); /*cos(PI*3/16)*/
+                specPOr[i] = Mpy_32_16_1( tmp1 /* 0.831470f */, imult1616( sign_fx( specPOr[i] ), s[100 * mult_angle] ) ); /*cos(PI*3/16)  Q31*/
                 move32();
-                specPOi[i] = Mpy_32_16_1( tmp1 /* 0.555570f*/, imult1616( sign_fx( specPOi[i] ), s[60 * mult_angle] ) );
+                specPOi[i] = Mpy_32_16_1( tmp1 /* 0.555570f*/, imult1616( sign_fx( specPOi[i] ), s[60 * mult_angle] ) ); // Q31
                 move32();
             }
         }
@@ -560,16 +537,16 @@ static void calc_poc_fx(
         {
             IF( W_mult0_32_32( L_sub( specPOr[i], Mpy_32_16_1( specPOi[i], 13573 /*0.414213f*/ ) ), L_add( specPOr[i], Mpy_32_16_1( specPOi[i], 13573 /*0.414213f*/ ) ) ) > 0 ) /*tan(PI/8)*/
             {
-                specPOr[i] = Mpy_32_16_1( tmp1 /** 0.555570f*/, imult1616( sign_fx( specPOr[i] ), s[60 * mult_angle] ) ); /*cos(PI*5/16)*/
+                specPOr[i] = Mpy_32_16_1( tmp1 /** 0.555570f*/, imult1616( sign_fx( specPOr[i] ), s[60 * mult_angle] ) ); /*cos(PI*5/16)  Q31*/
                 move32();
-                specPOi[i] = Mpy_32_16_1( tmp1 /** 0.831470f*/, imult1616( sign_fx( specPOi[i] ), s[100 * mult_angle] ) );
+                specPOi[i] = Mpy_32_16_1( tmp1 /** 0.831470f*/, imult1616( sign_fx( specPOi[i] ), s[100 * mult_angle] ) ); // Q31
                 move32();
             }
             ELSE
             {
-                specPOr[i] = Mpy_32_16_1( tmp1 /** 0.195090f*/, imult1616( sign_fx( specPOr[i] ), s[20 * mult_angle] ) ); /*cos(PI*7/16)*/
+                specPOr[i] = Mpy_32_16_1( tmp1 /** 0.195090f*/, imult1616( sign_fx( specPOr[i] ), s[20 * mult_angle] ) ); /*cos(PI*7/16) Q31*/
                 move32();
-                specPOi[i] = Mpy_32_16_1( tmp1 /** 0.980785f*/, imult1616( sign_fx( specPOi[i] ), s[140 * mult_angle] ) );
+                specPOi[i] = Mpy_32_16_1( tmp1 /** 0.980785f*/, imult1616( sign_fx( specPOi[i] ), s[140 * mult_angle] ) ); // Q31
                 move32();
             }
         }
@@ -587,11 +564,12 @@ static void calc_poc_fx(
         specPOi[i] = 0;
         move32();
     }
-    specPOr[n0] = imult3216( Mpy_32_32_r( wnd[i * step + bias], gamma ), sign_fx( Mpy_32_32_r( specLr[n0], specRr[n0] ) ) );
+    specPOr[n0] = imult3216( Mpy_32_32_r( wnd[i * step + bias], gamma ), sign_fx( Mpy_32_32_r( specLr[n0], specRr[n0] ) ) ); // Q31
     move32();
 
 
     hPHA->init_frmCntr = sub( hPHA->init_frmCntr, 1 );
+    move16();
     if ( hPHA->init_frmCntr < 0 )
     {
         hPHA->init_frmCntr = 0;
@@ -628,12 +606,13 @@ static void calc_poc_fx(
         Ni = L_sub( specLi[i], specRi[i] ); // spec_e
         Dr = L_add( specLr[i], specRr[i] ); // spec_e
         Di = L_add( specLi[i], specRi[i] ); // spec_e
-        // if ( ( Nr * Nr + Ni * Ni ) > STEREO_DMX_EVS_ISD_THRES_H * ( Dr * Dr + Di * Di ) )
-        if ( GT_32( Mpy_32_32_r( L_add( Mpy_32_32_r( Nr, Nr ), Mpy_32_32_r( Ni, Ni ) ), 1270700383 ), L_add( Mpy_32_32_r( Dr, Dr ), Mpy_32_32_r( Di, Di ) ) ) )
+                                            // if ( ( Nr * Nr + Ni * Ni ) > STEREO_DMX_EVS_ISD_THRES_H * ( Dr * Dr + Di * Di ) )
+        IF( GT_32( Mpy_32_32_r( L_add( Mpy_32_32_r( Nr, Nr ), Mpy_32_32_r( Ni, Ni ) ), STEREO_DMX_EVS_ISD_INVTHRES_H ), L_add( Mpy_32_32_r( Dr, Dr ), Mpy_32_32_r( Di, Di ) ) ) )
         {
             isd_cnt_h = add( isd_cnt_h, 1 );
         }
-        if ( LT_32( L_add( Mpy_32_32_r( Nr, Nr ), Mpy_32_32_r( Ni, Ni ) ), Mpy_32_32_r( STEREO_DMX_EVS_ISD_THRES_L_Q31, L_add( Mpy_32_32_r( Dr, Dr ), Mpy_32_32_r( Di, Di ) ) ) ) )
+        W_tmp = W_add( W_mult0_32_32( Mpy_32_32_r( Dr, STEREO_DMX_EVS_ISD_THRES_L_Q31 ), Dr ), W_mult0_32_32( Mpy_32_32_r( Di, STEREO_DMX_EVS_ISD_THRES_L_Q31 ), Di ) ); // Q62
+        IF( LT_64( W_add( W_mult0_32_32( Nr, Nr ), W_mult0_32_32( Ni, Ni ) ), W_tmp ) )                                                                                  // Q62
         {
             isd_cnt_l = add( isd_cnt_l, 1 );
         }
@@ -642,10 +621,10 @@ static void calc_poc_fx(
     isd_rate = BASOP_Util_Divide1616_Scale( isd_cnt_h, freq_8k, &isd_rate_e );
     // Saturation to handle values close to 1.0f
     isd_rate = shl_sat( isd_rate, isd_rate_e ); // Q15
-    hPHA->isd_rate_s_fx = add( mult_r( STEREO_DMX_EVS_ISD_FORGETTING_Q15, hPHA->isd_rate_s_fx ), mult_r( MAX_16 - STEREO_DMX_EVS_ISD_FORGETTING_Q15, isd_rate ) );
-    move16();
+    hPHA->isd_rate_s_fx = L_add( Mpy_32_32_r( STEREO_DMX_EVS_ISD_FORGETTING_Q31, hPHA->isd_rate_s_fx ), L_mult( STEREO_DMX_EVS_ISD_1MFORGETTING_Q15, isd_rate ) );
+    move32();
 
-    IF( GT_16( hPHA->isd_rate_s_fx, STEREO_DMX_EVS_ISD_DIST_HYST_H_Q15 ) )
+    IF( GT_32( hPHA->isd_rate_s_fx, STEREO_DMX_EVS_ISD_DIST_HYST_H_Q31 ) )
     {
         IF( NE_32( hPHA->curr_pha, STEREO_DMX_EVS_PHA_IPD ) )
         {
@@ -670,7 +649,7 @@ static void calc_poc_fx(
         hPHA->prev_pha = STEREO_DMX_EVS_PHA_IPD;
         move32();
     }
-    ELSE IF( LT_16( hPHA->isd_rate_s_fx, STEREO_DMX_EVS_ISD_DIST_HYST_L_Q15 ) )
+    ELSE IF( LT_32( hPHA->isd_rate_s_fx, STEREO_DMX_EVS_ISD_DIST_HYST_L_Q31 ) )
     {
         IF( NE_32( hPHA->curr_pha, STEREO_DMX_EVS_PHA_IPD2 ) )
         {
@@ -735,10 +714,28 @@ static void calc_poc_fx(
 
         FOR( j = 0; j < STEREO_DMX_EVS_SUBBAND_SIZE; ( j++, i++ ) )
         {
+
             /* Energy */
-            tEl[n] = BASOP_Util_Add_Mant32Exp( tEl[n], tEl_e[n], L_add( Mpy_32_32_r( specLr[i], specLr[i] ), Mpy_32_32_r( specLi[i], specLi[i] ) ), shl( spec_e, 1 ), &tEl_e[n] );
+
+
+            // Left
+            W_tmp = W_add( W_mult0_32_32( specLr[i], specLr[i] ), W_mult0_32_32( specLi[i], specLi[i] ) ); // Q(62-(2*specL_e)) -> Q(63 - ((2*specL_e) +1))
+            L_tmp_e = W_norm( W_tmp );
+            IF( L_tmp_e != 0 )
+            {
+                W_tmp = W_shl( W_tmp, L_tmp_e ); // Q(63 - ((2*spec_e) - (L_tmp_e - 1))
+            }
+            tEl[n] = BASOP_Util_Add_Mant32Exp( tEl[n], tEl_e[n], W_round64_L( W_tmp ), sub( shl( spec_e, 1 ), sub( L_tmp_e, 1 ) ), &tEl_e[n] );
             move32();
-            tEr[n] = BASOP_Util_Add_Mant32Exp( tEr[n], tEr_e[n], L_add( Mpy_32_32_r( specRr[i], specRr[i] ), Mpy_32_32_r( specRi[i], specRi[i] ) ), shl( spec_e, 1 ), &tEr_e[n] );
+
+            // Right
+            W_tmp = W_add( W_mult0_32_32( specRr[i], specRr[i] ), W_mult0_32_32( specRi[i], specRi[i] ) ); // Q(62-(2*specR_e)) -> Q(63 - ((2*specR_e) +1))
+            L_tmp_e = W_norm( W_tmp );
+            IF( L_tmp_e != 0 )
+            {
+                W_tmp = W_shl( W_tmp, L_tmp_e ); // Q(63 - ((2*spec_e) - (L_tmp_e - 1))
+            }
+            tEr[n] = BASOP_Util_Add_Mant32Exp( tEr[n], tEr_e[n], W_round64_L( W_tmp ), sub( shl( spec_e, 1 ), sub( L_tmp_e, 1 ) ), &tEr_e[n] );
             move32();
 
             /* IPD */
@@ -770,11 +767,27 @@ static void calc_poc_fx(
             tIPDr = L_sub( Mpy_32_32_r( specRr[i], IPDr ), Mpy_32_32_r( specRi[i], IPDi ) ); // spec_e
             tIPDi = L_add( Mpy_32_32_r( specRr[i], IPDi ), Mpy_32_32_r( specRi[i], IPDr ) ); // spec_e
 
-            Nr = BASOP_Util_Add_Mant32Exp( Nr, Nr_e, L_add( Mpy_32_32_r( specLr[i], tIPDr ), Mpy_32_32_r( specLi[i], tIPDi ) ), shl( spec_e, 1 ), &Nr_e );
-            Ni = BASOP_Util_Add_Mant32Exp( Ni, Ni_e, L_sub( Mpy_32_32_r( specLi[i], tIPDr ), Mpy_32_32_r( specLr[i], tIPDi ) ), shl( spec_e, 1 ), &Ni_e );
 
-            eneL = BASOP_Util_Add_Mant32Exp( eneL, eneL_e, L_add( Mpy_32_32_r( specLr[i], specLr[i] ), Mpy_32_32_r( specLi[i], specLi[i] ) ), shl( spec_e, 1 ), &eneL_e );
-            eneR = BASOP_Util_Add_Mant32Exp( eneR, eneR_e, L_add( Mpy_32_32_r( specRr[i], specRr[i] ), Mpy_32_32_r( specRi[i], specRi[i] ) ), shl( spec_e, 1 ), &eneR_e );
+            Nr = BASOP_Util_Add_Mant32Exp( Nr, Nr_e, L_add( Mpy_32_32_r( specLr[i], tIPDr ), Mpy_32_32_r( specLi[i], tIPDi ) ), 0, &Nr_e );
+            Ni = BASOP_Util_Add_Mant32Exp( Ni, Ni_e, L_sub( Mpy_32_32_r( specLi[i], tIPDr ), Mpy_32_32_r( specLr[i], tIPDi ) ), 0, &Ni_e );
+
+            // eneL = BASOP_Util_Add_Mant32Exp( eneL, eneL_e, L_add( Mpy_32_32_r( specLr[i], specLr[i] ), Mpy_32_32_r( specLi[i], specLi[i] ) ), 0, &eneL_e );
+            W_tmp = W_add( W_mult0_32_32( specLr[i], specLr[i] ), W_mult0_32_32( specLi[i], specLi[i] ) );
+            L_tmp_e = W_norm( W_tmp );
+            IF( L_tmp_e != 0 )
+            {
+                W_tmp = W_shl( W_tmp, L_tmp_e );
+            }
+            eneL = BASOP_Util_Add_Mant32Exp( eneL, eneL_e, W_round64_L( W_tmp ), sub( 1, L_tmp_e ), &eneL_e );
+
+            // eneR = BASOP_Util_Add_Mant32Exp( eneR, eneR_e, L_add( Mpy_32_32_r( specRr[i], specRr[i] ), Mpy_32_32_r( specRi[i], specRi[i] ) ), 0, &eneR_e );
+            W_tmp = W_add( W_mult0_32_32( specRr[i], specRr[i] ), W_mult0_32_32( specRi[i], specRi[i] ) );
+            L_tmp_e = W_norm( W_tmp );
+            IF( L_tmp_e != 0 )
+            {
+                W_tmp = W_shl( W_tmp, L_tmp_e );
+            }
+            eneR = BASOP_Util_Add_Mant32Exp( eneR, eneR_e, W_round64_L( W_tmp ), sub( 1, L_tmp_e ), &eneR_e );
         }
 
         // Pn = (float) inv_sqrt( ( tPr * tPr + tPi * tPi ) + EPSILON );
@@ -792,14 +805,12 @@ static void calc_poc_fx(
             move32();
             Pi[n] = L_add( Mpy_32_32_r( ipd_ff[n], Pi[n] ), Mpy_32_32_r( L_sub( MAX_32, ipd_ff[n] ), tPi ) );
             move32();
+
             // Pn = (float) inv_sqrt( ( Pr[n] * Pr[n] + Pi[n] * Pi[n] ) + EPSILON );
-            L_tmp = L_add( L_shr( Mpy_32_32_r( Pr[n], Pr[n] ), 1 ), L_shr( Mpy_32_32_r( Pi[n], Pi[n] ), 1 ) );
-            L_tmp_e = 1;
-            move16();
-            L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp, L_tmp_e, EPSILON_FX_M, EPSILON_FX_E, &L_tmp_e );
-            Pn_e = L_tmp_e;
-            move16();
-            Pn = ISqrt32( L_tmp, &Pn_e );
+            Pn = L_add( L_shr( Mpy_32_32_r( Pr[n], Pr[n] ), 1 ), L_shr( Mpy_32_32_r( Pi[n], Pi[n] ), 1 ) );
+            Pn = BASOP_Util_Add_Mant32Exp( Pn, 1, EPSILON_FX_M, EPSILON_FX_E, &Pn_e );
+            Pn = Isqrt_lc( Pn, &Pn_e );
+
             Pr[n] = L_shl_sat( Mpy_32_32_r( Pr[n], Pn ), Pn_e ); // Q31
             move32();
             Pi[n] = L_shl_sat( Mpy_32_32_r( Pi[n], Pn ), Pn_e ); // Q31
@@ -819,15 +830,15 @@ static void calc_poc_fx(
     // ICCr = (float) sqrt( ( Nr * Nr + Ni * Ni ) / ( eneL * eneR + EPSILON ) );
     L_tmp1 = BASOP_Util_Add_Mant32Exp( Mpy_32_32_r( Nr, Nr ), shl( Nr_e, 1 ), Mpy_32_32_r( Ni, Ni ), shl( Ni_e, 1 ), &L_tmp1_e );
     L_tmp2 = BASOP_Util_Add_Mant32Exp( Mpy_32_32_r( eneL, eneR ), add( eneL_e, eneR_e ), EPSILON_FX_M, EPSILON_FX_E, &L_tmp2_e );
-    ICCr = BASOP_Util_Divide3232_Scale_cadence( L_tmp1, L_tmp2, &L_tmp_e );
+    ICCr = BASOP_Util_Divide3232_Scale_newton( L_tmp1, L_tmp2, &L_tmp_e );
     L_tmp_e = add( L_tmp_e, sub( L_tmp1_e, L_tmp2_e ) );
     ICCr = Sqrt32( ICCr, &L_tmp_e );
     // Saturation to handle values close to 1.0f
     ICCr = L_shl_sat( ICCr, L_tmp_e ); // Q31
 
     // hPHA->iccr_s = STEREO_DMX_EVS_ICCR_FORGETTING * hPHA->iccr_s + ( 1.0f - STEREO_DMX_EVS_ICCR_FORGETTING ) * ICCr;
-    hPHA->iccr_s_fx = L_add( Mpy_32_32_r( STEREO_DMX_EVS_ICCR_FORGETTING_Q31, hPHA->iccr_s_fx ), Mpy_32_32_r( MAX_32 - STEREO_DMX_EVS_ICCR_FORGETTING_Q31, ICCr ) );
-    move16();
+    hPHA->iccr_s_fx = L_add( Mpy_32_32_r( STEREO_DMX_EVS_ICCR_FORGETTING_Q31, hPHA->iccr_s_fx ), Mpy_32_32_r( MAX_32 - STEREO_DMX_EVS_ICCR_FORGETTING_Q31, ICCr ) ); // Q31
+    move32();
 
     IF( EQ_32( hPHA->curr_pha, STEREO_DMX_EVS_PHA_IPD ) )
     {
@@ -935,7 +946,7 @@ static void calc_poc_fx(
                     rfft_pha_buf[i * 2 + 1] = imult3216( L_shl_r( L_tmp, sub( L_tmp_e, 9 ) ), sign_fx( rfft_pha_buf[i * 2 + 1] ) ); // Q22
                     move32();
                     // rfft_pha_buf[i * 2] = (float) sqrt( ( 1.0f + rfft_pha_buf[i * 2] ) / 2.0f );
-                    L_tmp = L_add( ONE_IN_Q21, L_shr( rfft_pha_buf[i * 2], 1 ) );
+                    L_tmp = L_add( ONE_IN_Q21, L_shr( rfft_pha_buf[i * 2], 1 ) ); // Q22
                     L_tmp_e = 9;
                     move16();
                     L_tmp = Sqrt32( L_tmp, &L_tmp_e );
@@ -1005,11 +1016,7 @@ static void calc_poc_fx(
             FOR( i = 0; i < hPHA->pha_len; i++ )
             {
                 // hPHA->p_curr_taps[n][i] *= hPHA->win[i];
-#ifdef FIX_ISSUE_1153
                 hPHA->p_curr_taps_fx[n][i] = Mpy_32_16_1( hPHA->p_curr_taps_fx[n][i], hPHA->win_fx[i] ); // Q30
-#else
-                hPHA->p_curr_taps_fx[n][i] = L_shl( Mpy_32_16_1( hPHA->p_curr_taps_fx[n][i], hPHA->win_fx[i] ), 1 ); // Q31
-#endif
                 move32();
             }
 
@@ -1017,29 +1024,16 @@ static void calc_poc_fx(
             move32();
             energy_e = 0;
             move16();
-#ifdef FIX_ISSUE_1153
-            Word16 shift = L_norm_arr( hPHA->p_curr_taps_fx[n], hPHA->pha_len );
-            IF( shift )
-            {
-                scale_sig32( hPHA->p_curr_taps_fx[n], hPHA->pha_len, 1 );
-                shift = 1;
-                move16();
-            }
-#endif
             FOR( i = 0; i < hPHA->pha_len; i++ )
             {
-#ifdef FIX_ISSUE_1153
-                energy = BASOP_Util_Add_Mant32Exp( energy, energy_e, Mpy_32_32_r( hPHA->p_curr_taps_fx[n][i], hPHA->p_curr_taps_fx[n][i] ), shl( sub( 1, shift ), 1 ), &energy_e );
-#else
                 energy = BASOP_Util_Add_Mant32Exp( energy, energy_e, Mpy_32_32_r( hPHA->p_curr_taps_fx[n][i], hPHA->p_curr_taps_fx[n][i] ), 0, &energy_e );
-#endif
             }
             // energy = (float) inv_sqrt( energy + EPSILON );
             energy = BASOP_Util_Add_Mant32Exp( energy, energy_e, EPSILON_FX_M, EPSILON_FX_E, &energy_e );
             energy = ISqrt32( energy, &energy_e );
             FOR( i = 0; i < hPHA->pha_len; i++ )
             {
-                hPHA->p_curr_taps_fx[n][i] = L_shl_r( Mpy_32_32_r( hPHA->p_curr_taps_fx[n][i], energy ), energy_e ); // Q31
+                hPHA->p_curr_taps_fx[n][i] = L_shl_r( Mpy_32_32_r( hPHA->p_curr_taps_fx[n][i], energy ), sub( energy_e, 1 ) ); // Q30
                 move32();
             }
         }
@@ -1082,7 +1076,7 @@ static void calc_poc_fx(
         move32();
     }
 
-    tmp1 = L_shl( Mpy_32_32_r( STEREO_DMX_EVS_POC_SMOOTH_Q30, tmpPOC1[n0] ) + Mpy_32_32_r( -ONE_IN_Q28 /*0.5f * ( 1.0f - STEREO_DMX_EVS_POC_SMOOTH )*/, L_add( L_shr( tmpPOC1[n0 - 1], 1 ), L_shr( tmpPOC1[n0 + 1], 1 ) ) ), 1 ); // Q31
+    tmp1 = L_shl( L_add( Mpy_32_32_r( STEREO_DMX_EVS_POC_SMOOTH_Q30, tmpPOC1[n0] ), Mpy_32_32_r( -ONE_IN_Q28 /*0.5f * ( 1.0f - STEREO_DMX_EVS_POC_SMOOTH )*/, L_add( L_shr( tmpPOC1[n0 - 1], 1 ), L_shr( tmpPOC1[n0 + 1], 1 ) ) ) ), 1 ); // Q31
     tmpPOC2[n0] = L_max( tmp1, 0 );
     move32();
 
@@ -1142,9 +1136,9 @@ static void calc_poc_fx(
  *-------------------------------------------------------------------*/
 static Word32 find_poc_peak_fx(
     STEREO_DMX_EVS_POC_HANDLE hPOC, /* i/o: phase only correlation structure */
-    Word32 itd_fx[],                /* o  : estimated itd                    */
+    Word16 itd_fx[],                /* o  : estimated itd              Q0      */
     const Word16 input_frame,       /* i  : input frame length per channel   */
-    const Word32 ratio_fixed        /* i  : adapting ratio                   */
+    const Word32 ratio_fixed        /* i  : adapting ratio               Q31    */
 )
 {
     Word16 itd_cand[CPE_CHANNELS], i, n, cnt[CPE_CHANNELS], Lh, peak_range, *on, *itdLR, prev_off[CPE_CHANNELS], eps_fx;
@@ -1161,16 +1155,13 @@ static Word32 find_poc_peak_fx(
     itd_cand[0] = itd_cand[1] = 0;
     move16();
     move16();
-    move16();
-    move16();
 
     width_fx = 816043776; /*0.38f in Q31*/
     eps_fx = Inv16( input_frame, &eps_e );
     peak_width_fx = hPOC->peak_width_fx;
     peakQ_fx = hPOC->peakQ_fx; // Q16
     move16();
-    move16();
-    move16();
+
     set16_fx( peakQ_e, 31 - Q16, CPE_CHANNELS );
     Q_fx[0] = hPOC->P_fx[Lh]; // Q31
     Q_fx[1] = 0;
@@ -1203,6 +1194,7 @@ static Word32 find_poc_peak_fx(
     }
 
     Word16 tmp1, tmp11, tmp_var1, tmp12 = 0, tmp13;
+    move16();
     Word32 tmp4, tmp5, tmp6, tmp7, tmp8, tmp9, tmp10, tmp14, tmp15, tmp16;
     Word16 tmp8_e, tmp9_e, tmp10_e, tmp11_e, tmp12_e, tmp13_e, tmp15_e;
 
@@ -1228,7 +1220,7 @@ static Word32 find_poc_peak_fx(
 
         /*compute peak_range*/
         tmp1 = idiv1616( hPOC->shift_limit, STEREO_DMX_EVS_FIND_POC_PEAK_TAU );
-        peak_range = idiv1616( add( (Word16) abs( itd_cand[n] ), tmp1 ), STEREO_DMX_EVS_FIND_POC_PEAK_TAU2 ); // Q0
+        peak_range = idiv1616( add( extract_l( abs_s( itd_cand[n] ) ), tmp1 ), STEREO_DMX_EVS_FIND_POC_PEAK_TAU2 ); // Q0
 
         FOR( i = 1; i <= peak_range; i++ )
         {
@@ -1236,7 +1228,7 @@ static Word32 find_poc_peak_fx(
             tmp4 = L_add( P_fx[Lh - itd_cand[n] + i], P_fx[Lh - itd_cand[n] - i] ); // Q31
             cQ_fx[n] = L_add( cQ_fx[n], tmp4 );
             move16();
-            move16();
+            move32();
         }
 
         /*compute eps2_fx*/
@@ -1275,7 +1267,7 @@ static Word32 find_poc_peak_fx(
         IF( on[n] ) /*if channel n was active (likely to be preceding) in the previous frame*/
         {
             tmp13_e = 0, tmp15_e = 0;
-            tmp13 = BASOP_Util_Divide1616_Scale( (Word16) abs( itd_cand[n] ), hPOC->shift_limit, &tmp13_e );
+            tmp13 = BASOP_Util_Divide1616_Scale( abs_s( itd_cand[n] ), hPOC->shift_limit, &tmp13_e );
             tmp14 = L_mult( 6554 /*0.2f Q15*/, tmp13 ); // tmp13_e
             tmp15 = BASOP_Util_Add_Mant32Exp( 644245120 /*0.75f in Q31*/, 0, L_negate( tmp14 ), tmp13_e, &tmp15_e );
             tmp15 = Mpy_32_32( tmp15, peakQ_fx[n] ); // tmp15_e + peakQ_e[n]
@@ -1324,7 +1316,7 @@ static Word32 find_poc_peak_fx(
             tmp13_e = 0, tmp15_e = 0;
             move16();
             move16();
-            tmp13 = BASOP_Util_Divide1616_Scale( (Word16) abs( itd_cand[n] ), hPOC->shift_limit, &tmp13_e );
+            tmp13 = BASOP_Util_Divide1616_Scale( abs_s( itd_cand[n] ), hPOC->shift_limit, &tmp13_e );
             tmp14 = L_mult( 6554 /*0.2f Q15*/, tmp13 ); // tmp13_e
             tmp15 = BASOP_Util_Add_Mant32Exp( 1610612736 /*0.75f in Q31*/, 0, L_negate( tmp14 ), tmp13_e, &tmp15_e );
 
@@ -1374,9 +1366,17 @@ static Word32 find_poc_peak_fx(
     test();
     test();
     test();
+    test();
     IF( ( on[0] && prev_off[0] ) && ( on[1] && prev_off[1] ) ) /*if both channels have newly detected as active (possibility of preceding), select channel by peakness Q[] of POC */
     {
-        *itd_fx = ( GT_32( Q_fx[0], Q_fx[1] ) ) ? itdLR[0] : itdLR[1];
+        IF( GT_32( Q_fx[0], Q_fx[1] ) )
+        {
+            *itd_fx = itdLR[0];
+        }
+        ELSE
+        {
+            *itd_fx = itdLR[1];
+        }
     }
     ELSE IF( ( on[0] && prev_off[0] ) && ( EQ_16( var0_flag, 1 ) ) ) /* if channel 0 becomes active, select channel 0*/
     {
@@ -1400,7 +1400,14 @@ static Word32 find_poc_peak_fx(
     }
     ELSE /*follow the status of the previous frame*/
     {
-        *itd_fx = ( *itd_fx > 0 ) ? itdLR[0] : itdLR[1];
+        IF( *itd_fx > 0 )
+        {
+            *itd_fx = itdLR[0];
+        }
+        ELSE
+        {
+            *itd_fx = itdLR[1];
+        }
     }
 
     move32();
@@ -1420,12 +1427,12 @@ static Word32 find_poc_peak_fx(
     Word32 Q_sub_sqrt = Sqrt32( L_abs( L_sub( Q_fx[0], Q_fx[1] ) ), &Q_sub_sqrt_e );
     cconfidence_fx = Q_sub_sqrt;
     move16();
-    move16();
+    move32();
 
     Word32 cconfidence_var1 = Mpy_32_32( hPOC->confidence_fx, STEREO_DMX_EVS_CORR_FORGETTING_FX );                                                                      // Q31
     Word32 cconfidence_var2 = Mpy_32_32( L_shr( cconfidence_fx, negate( Q_sub_sqrt_e ) ) /*Q31*/, L_sub( ONE_IN_Q30, L_shr( STEREO_DMX_EVS_CORR_FORGETTING_FX, 1 ) ) ); // Q30
     hPOC->confidence_fx = L_add( cconfidence_var1, L_shl( cconfidence_var2, 1 ) );                                                                                      // Q31
-    move16();
+    move32();
 
     return hPOC->confidence_fx;
 }
@@ -1441,7 +1448,7 @@ static ivas_error estimate_itd_fx(
     STEREO_DMX_EVS_PHA_HANDLE hPHA, /* i/o: correlation filter structure     */
     const Word32 srcL[],            /* i  : Lch input signal            Q16  */
     const Word32 srcR[],            /* i  : Rch input signal            Q16  */
-    Word32 itd[],                   /* o  : estimated itd               Q16  */
+    Word16 itd[],                   /* o  : estimated itd               Q0  */
     const Word16 input_frame        /* i  : input frame length per channel   */
 )
 {
@@ -1497,11 +1504,11 @@ static ivas_error estimate_itd_fx(
 
     spec_e = s_max( sub( specL_e, s_min( getScaleFactor32( specLr, input_frame / 2 + 1 ), getScaleFactor32( specLi, input_frame / 2 + 1 ) ) ),
                     sub( specR_e, s_min( getScaleFactor32( specRr, input_frame / 2 + 1 ), getScaleFactor32( specRi, input_frame / 2 + 1 ) ) ) );
-    spec_e = add( spec_e, 2 ); // guard bits
-    scale_sig32( specLr, input_frame / 2 + 1, sub( specL_e, spec_e ) );
-    scale_sig32( specLi, input_frame / 2 + 1, sub( specL_e, spec_e ) );
-    scale_sig32( specRr, input_frame / 2 + 1, sub( specR_e, spec_e ) );
-    scale_sig32( specRi, input_frame / 2 + 1, sub( specR_e, spec_e ) );
+    spec_e = add( spec_e, 2 );                                                      // guard bits
+    scale_sig32( specLr, add( shr( input_frame, 1 ), 1 ), sub( specL_e, spec_e ) ); // Q(31-(specL_e-spec_e))
+    scale_sig32( specLi, add( shr( input_frame, 1 ), 1 ), sub( specL_e, spec_e ) ); // Q(31-(specL_e-spec_e))
+    scale_sig32( specRr, add( shr( input_frame, 1 ), 1 ), sub( specR_e, spec_e ) ); // Q(31-(specR_e-spec_e))
+    scale_sig32( specRi, add( shr( input_frame, 1 ), 1 ), sub( specR_e, spec_e ) ); // Q(31-(specR_e-spec_e))
 
     calc_poc_fx( hPOC, hPHA, hPOC->wnd_fx, rfft_coef, specLr, specLi, specRr, specRi, spec_e, input_frame );
 
@@ -1571,20 +1578,20 @@ static void calc_energy_fx(
     move32();
     wnd_diff_fx = 107374182; // initialising for L_FRAME16k =( 1.0f /20) in Q31;
     move32();
-    switch ( input_frame )
+    SWITCH( input_frame )
     {
         case L_FRAME16k:
             wnd_fx = 53687091;       // wnd = 0.5f / (float) adaptlen; adaptlen= 20;in Q31
             wnd_diff_fx = 107374182; // wnd = 1.0f / (float) adaptlen;adaptlen= 20;in Q31
-            break;
+            BREAK;
         case L_FRAME32k:
             wnd_fx = 26843545;      // wnd = 0.5f / (float) adaptlen; adaptlen= 40;in Q31
             wnd_diff_fx = 53687091; // wnd = 1.0f / (float) adaptlen;adaptlen= 40;in Q31
-            break;
+            BREAK;
         case L_FRAME48k:
             wnd_fx = 17895697;      // wnd = 0.5f / (float) adaptlen; adaptlen= 60;in Q31
             wnd_diff_fx = 35791394; // wnd = 1.0f / (float) adaptlen;adaptlen= 60;in Q31
-            break;
+            BREAK;
     }
     move32();
     move32();
@@ -1622,7 +1629,7 @@ static void calc_energy_fx(
     q_temp32 = add( add( q_E, sub( 15, temp_e ) ), 16 );
     // *energy = *energy * ratio_float + ( E / (float) input_frame ) * ( 1.0f - ratio_float );
     *energy_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( *energy_fx, ratio_float_fx ), *energy_fx_e, Mpy_32_32( temp32, L_sub( MAX_32, ratio_float_fx ) ), sub( 31, q_temp32 ), energy_fx_e );
-
+    move32();
     return;
 }
 
@@ -1633,7 +1640,7 @@ static void calc_energy_fx(
  *-------------------------------------------------------------------*/
 static void adapt_gain_fx(
     const Word32 src_fx[],    /* i  : input signal                  Q16 */
-    Word32 dst_fx[],          /* o  : output signal                  */
+    Word32 dst_fx[],          /* o  : output signal                 Q16 */
     const Word32 gain_fx,     /* i  : adapting gain                  Q31*/
     const Word32 old_gain_fx, /* i  : adapting prev gain             Q31*/
     const Word16 input_frame, /* i  : input frame length per channel */
@@ -1792,6 +1799,7 @@ void stereo_dmx_evs_enc_fx(
     Word64 W_tmp;
     Word16 W_tmp_q;
 
+    push_wmops( "stereo_dmx_evs_enc" );
     if ( is_binaural )
     {
         /* use of is_binaural flag is to be considered */
@@ -1877,14 +1885,14 @@ void stereo_dmx_evs_enc_fx(
                 W_tmp = W_mult_32_32( p_sub_frame[n], p_sub_frame[n] );
                 W_tmp_q = W_norm( W_tmp );
                 W_tmp = W_shl( W_tmp, W_tmp_q );
-                L_tmp1 = W_extract_h( W_tmp );
+                L_tmp1 = W_extract_h( W_tmp ); // Q(31-(30-W_tmp_q))
                 L_tmp1_e = sub( 15 * 2, W_tmp_q );
                 subframe_energy[m] = BASOP_Util_Add_Mant32Exp( subframe_energy[m], subframe_energy_e[m], L_tmp1, L_tmp1_e, &subframe_energy_e[m] );
                 move32();
             }
 
             L_tmp1 = BASOP_Util_Add_Mant32Exp( hStereoDmxEVS->hPHA->trns_aux_energy_fx[k], hStereoDmxEVS->hPHA->trns_aux_energy_fx_e[k], EPSILON_FX_M, EPSILON_FX_E, &L_tmp1_e );
-            L_tmp2 = BASOP_Util_Divide3232_Scale_cadence( subframe_energy[m], L_tmp1, &L_tmp2_e );
+            L_tmp2 = BASOP_Util_Divide3232_Scale_newton( subframe_energy[m], L_tmp1, &L_tmp2_e );
             L_tmp2_e = add( L_tmp2_e, sub( subframe_energy_e[m], L_tmp1_e ) );
             // if ( subframe_energy[m] / ( hStereoDmxEVS->hPHA->trns_aux_energy[k] + EPSILON ) > hStereoDmxEVS->hPHA->crst_fctr )
             if ( BASOP_Util_Cmp_Mant32Exp( L_tmp2, L_tmp2_e, hStereoDmxEVS->hPHA->crst_fctr_fx, 31 ) > 0 )
@@ -1912,10 +1920,10 @@ void stereo_dmx_evs_enc_fx(
         FOR( m = 1; m < STEREO_DMX_EVS_NB_SBFRM; m++ )
         {
             L_tmp1 = BASOP_Util_Add_Mant32Exp( subframe_energy[m - 1], subframe_energy_e[m - 1], EPSILON_FX_M, EPSILON_FX_E, &L_tmp1_e );
-            L_tmp2 = BASOP_Util_Divide3232_Scale_cadence( subframe_energy[m], L_tmp1, &L_tmp2_e );
+            L_tmp2 = BASOP_Util_Divide3232_Scale_newton( subframe_energy[m], L_tmp1, &L_tmp2_e );
             L_tmp2_e = add( L_tmp2_e, sub( subframe_energy_e[m], L_tmp1_e ) );
             // if ( subframe_energy[m] / ( subframe_energy[m - 1] + EPSILON ) > STEREO_DMX_EVS_TRNS_DTC_INST )
-            if ( BASOP_Util_Cmp_Mant32Exp( L_tmp2, L_tmp2_e, (Word16) STEREO_DMX_EVS_TRNS_DTC_INST, 31 ) > 0 )
+            if ( BASOP_Util_Cmp_Mant32Exp( L_tmp2, L_tmp2_e, STEREO_DMX_EVS_TRNS_DTC_INST_Q0, 31 ) > 0 )
             {
                 is_transient = 1;
                 move16();
@@ -1945,13 +1953,13 @@ void stereo_dmx_evs_enc_fx(
         move16();
     }
 
-    create_M_signal_fx( data_fx[0], data_fx[1], dmx_poc_data, dmx_weight, input_frame, hStereoDmxEVS->s_wnd_fx,
+    create_M_signal_fx( data_fx[0], data_fx[1], dmx_poc_data, L_deposit_h( dmx_weight ), input_frame, hStereoDmxEVS->s_wnd_fx,
                         hStereoDmxEVS->dmx_weight_fx, hStereoDmxEVS->pre_dmx_energy_fx, hStereoDmxEVS->pre_dmx_energy_fx_e, hStereoDmxEVS->aux_dmx_energy_fx, hStereoDmxEVS->aux_dmx_energy_fx_e );
 
     // Downscaling signals to avoid accumulation overflows
-    scale_sig32( data_fx[0], input_frame, -5 );   // Q16->Q11
-    scale_sig32( data_fx[1], input_frame, -5 );   // Q16->Q11
-    scale_sig32( dmx_poc_data, input_frame, -5 ); // Q16->Q11
+    scale_sig32( data_fx[0], input_frame, -5 );   // Q31->Q26
+    scale_sig32( data_fx[1], input_frame, -5 );   // Q31->Q26
+    scale_sig32( dmx_poc_data, input_frame, -5 ); // Q31->Q26
 
     /* pha */
 
@@ -1980,9 +1988,9 @@ void stereo_dmx_evs_enc_fx(
                 FOR( ( fx_tmp = 0, m = 0 ); m < pha_len; m++ )
                 {
                     // ftmp += p_data_mem[n - m] * p_prev_taps[m];
-                    // fx_tmp = BASOP_Util_Add_Mant32Exp(fx_tmp, fx_tmp_e, Mpy_32_32(p_data_mem[n - m], p_prev_taps[m]),15,&fx_tmp_e);
-                    fx_tmp = L_add( fx_tmp, Mpy_32_32( p_data_mem[n - m], p_prev_taps[m] ) ); // Q11
+                    fx_tmp = L_add( fx_tmp, Mpy_32_32( p_data_mem[n - m], p_prev_taps[m] ) ); // Q25
                 }
+                fx_tmp = L_shl( fx_tmp, 1 ); // Q26
                 mem_prev[n] = L_add( mem_prev[n], Mpy_32_32( fx_tmp, INV_SQRT_2_Q31 ) );
                 move32();
             }
@@ -1992,7 +2000,7 @@ void stereo_dmx_evs_enc_fx(
             FOR( n = 0; n < fad_len; n++ )
             {
                 // mem_prev[n] += p_data[n] * INV_SQRT_2;
-                mem_prev[n] = L_add( mem_prev[n], Mpy_32_32( p_data[n], INV_SQRT_2_Q31 ) ); // Q11
+                mem_prev[n] = L_add( mem_prev[n], Mpy_32_32( p_data[n], INV_SQRT_2_Q31 ) ); // Q26
                 move32();
             }
         }
@@ -2005,10 +2013,11 @@ void stereo_dmx_evs_enc_fx(
                 FOR( ( fx_tmp = 0, m = 0 ); m < pha_len; m++ )
                 {
                     // ftmp += p_data_mem[n - m] * p_curr_taps[m];
-                    fx_tmp = L_add( fx_tmp, Mpy_32_32( p_data_mem[n - m], p_curr_taps[m] ) ); // Q11
+                    fx_tmp = L_add( fx_tmp, Mpy_32_32( p_data_mem[n - m], p_curr_taps[m] ) ); // Q25
                 }
+                fx_tmp = L_shl( fx_tmp, 1 ); // Q26
                 // dmx_pha_data[n] += ftmp * INV_SQRT_2;
-                dmx_pha_data[n] = L_add( dmx_pha_data[n], Mpy_32_32( fx_tmp, INV_SQRT_2_Q31 ) ); // Q11
+                dmx_pha_data[n] = L_add( dmx_pha_data[n], Mpy_32_32( fx_tmp, INV_SQRT_2_Q31 ) ); // Q26
                 move32();
             }
         }
@@ -2017,7 +2026,7 @@ void stereo_dmx_evs_enc_fx(
             FOR( n = 0; n < n_samples; n++ )
             {
                 // dmx_pha_data[n] += p_data[n] * INV_SQRT_2;
-                dmx_pha_data[n] = L_add( dmx_pha_data[n], Mpy_32_32( p_data[n], INV_SQRT_2_Q31 ) ); // Q11
+                dmx_pha_data[n] = L_add( dmx_pha_data[n], Mpy_32_32( p_data[n], INV_SQRT_2_Q31 ) ); // Q26
                 move32();
             }
         }
@@ -2027,7 +2036,7 @@ void stereo_dmx_evs_enc_fx(
     {
         dmx_pha_data[n] = Mpy_32_32( dmx_pha_data[n], fad_g[n] );
         move32();
-        dmx_pha_data[n] = L_add( dmx_pha_data[n], Mpy_32_32( mem_prev[n], fad_g[m] ) ); // Q11
+        dmx_pha_data[n] = L_add( dmx_pha_data[n], Mpy_32_32( mem_prev[n], fad_g[m] ) ); // Q26
         move32();
     }
 
@@ -2036,7 +2045,7 @@ void stereo_dmx_evs_enc_fx(
     curr_prc = hStereoDmxEVS->hPHA->curr_prc;
     move32();
     // if ( abs( (int16_t) hStereoDmxEVS->itd ) > hStereoDmxEVS->hPHA->prc_thres )
-    IF( GT_16( abs_s( round_fx( hStereoDmxEVS->itd_fx ) ), hStereoDmxEVS->hPHA->prc_thres ) )
+    IF( GT_16( abs_s( hStereoDmxEVS->itd_fx ), hStereoDmxEVS->hPHA->prc_thres ) )
     {
         IF( NE_32( hStereoDmxEVS->hPHA->curr_prc, STEREO_DMX_EVS_PRC_POC ) )
         {
@@ -2101,7 +2110,7 @@ void stereo_dmx_evs_enc_fx(
         move16();
     }
 
-    IF( hStereoDmxEVS->hPHA->curr_prc == STEREO_DMX_EVS_PRC_POC )
+    IF( EQ_32( hStereoDmxEVS->hPHA->curr_prc, STEREO_DMX_EVS_PRC_POC ) )
     {
         p_dmx_data = dmx_poc_data;
 
@@ -2113,9 +2122,9 @@ void stereo_dmx_evs_enc_fx(
 
             FOR( ( n = 0, m = ( fad_len - 1 ) ); n < fad_len; ( n++, m-- ) )
             {
-                p_dmx_data[n] = Mpy_32_32( p_dmx_data[n], fad_g[n] ); // Q11
+                p_dmx_data[n] = Mpy_32_32( p_dmx_data[n], fad_g[n] ); // Q26
                 move32();
-                p_dmx_data[n] = L_add( p_dmx_data[n], Mpy_32_32( fad_g[m], dmx_pha_data[n] ) ); // Q11
+                p_dmx_data[n] = L_add( p_dmx_data[n], Mpy_32_32( fad_g[m], dmx_pha_data[n] ) ); // Q26
                 move32();
             }
         }
@@ -2132,16 +2141,16 @@ void stereo_dmx_evs_enc_fx(
 
             FOR( ( n = 0, m = ( fad_len - 1 ) ); n < fad_len; ( n++, m-- ) )
             {
-                p_dmx_data[n] = Mpy_32_32( p_dmx_data[n], fad_g[n] ); // Q11
+                p_dmx_data[n] = Mpy_32_32( p_dmx_data[n], fad_g[n] ); // Q26
                 move32();
-                p_dmx_data[n] = L_add( p_dmx_data[n], Mpy_32_32( fad_g[m], dmx_poc_data[n] ) ); // Q11
+                p_dmx_data[n] = L_add( p_dmx_data[n], Mpy_32_32( fad_g[m], dmx_poc_data[n] ) ); // Q26
                 move32();
             }
         }
     }
 
-    Copy_Scale_sig32_16( p_dmx_data, data, n_samples, 5 );
-
+    Copy_Scale_sig32_16( p_dmx_data, data, n_samples, 5 ); // Q26->Q15
+    pop_wmops();
 
     return;
 }
@@ -2160,9 +2169,9 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
     STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS;
     Word16 n, input_frame;
 
-    Word16 m, len, pha_len, fad_len, fad_len2, trans_len /*, itrh*/, rfft_ipd_coef_step, n0, input_frame_pha;
-    Word32 *fad_g, fad_r /*, a_min, a_max, a_step*/, *ipd_ff;
-    Word16 *win, tmp_r;
+    Word16 m, len, pha_len, fad_len, fad_len2, rfft_ipd_coef_step, n0, input_frame_pha;
+    Word32 *fad_g, fad_r, *ipd_ff;
+    Word16 *win;
     const Word16 *p_ipd_w;
     Word16 tmp_e;
 
@@ -2293,16 +2302,16 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
     SWITCH( input_frame )
     {
         case 160:
-            hStereoDmxEVS->hPOC->eps_fx = 84331486;
+            hStereoDmxEVS->hPOC->eps_fx = 84331486; // (2.0f * EVS_PI / (160)) in Q31
             BREAK;
         case 320:
-            hStereoDmxEVS->hPOC->eps_fx = 42165743;
+            hStereoDmxEVS->hPOC->eps_fx = 42165743; // (2.0f * EVS_PI / (160)) in Q31
             BREAK;
         case 640:
-            hStereoDmxEVS->hPOC->eps_fx = 21082871;
+            hStereoDmxEVS->hPOC->eps_fx = 21082871; // (2.0f * EVS_PI / (160)) in Q31
             BREAK;
         case 960:
-            hStereoDmxEVS->hPOC->eps_fx = 14055248;
+            hStereoDmxEVS->hPOC->eps_fx = 14055248; // (2.0f * EVS_PI / (160)) in Q31
             BREAK;
     }
     move32();
@@ -2350,7 +2359,7 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
         move16();
         hStereoDmxEVS->hPHA->prc_thres = STEREO_DMX_EVS_SWTCH_PRC_THRES_16;
         move16();
-        hStereoDmxEVS->hPHA->crst_fctr_fx = (Word16) STEREO_DMX_EVS_CRST_FCTR_16;
+        hStereoDmxEVS->hPHA->crst_fctr_fx = STEREO_DMX_EVS_CRST_FCTR_16_Q0;
         move32();
     }
     ELSE IF( EQ_32( input_Fs, 32000 ) )
@@ -2361,7 +2370,7 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
         move16();
         hStereoDmxEVS->hPHA->prc_thres = STEREO_DMX_EVS_SWTCH_PRC_THRES_32;
         move16();
-        hStereoDmxEVS->hPHA->crst_fctr_fx = (Word16) STEREO_DMX_EVS_CRST_FCTR_32;
+        hStereoDmxEVS->hPHA->crst_fctr_fx = STEREO_DMX_EVS_CRST_FCTR_32_Q0;
         move32();
     }
     ELSE IF( EQ_32( input_Fs, 48000 ) )
@@ -2372,7 +2381,7 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
         move16();
         hStereoDmxEVS->hPHA->prc_thres = STEREO_DMX_EVS_SWTCH_PRC_THRES_48;
         move16();
-        hStereoDmxEVS->hPHA->crst_fctr_fx = (Word16) STEREO_DMX_EVS_CRST_FCTR_48;
+        hStereoDmxEVS->hPHA->crst_fctr_fx = STEREO_DMX_EVS_CRST_FCTR_48_Q0;
         move32();
     }
     ELSE
@@ -2394,25 +2403,55 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
     fad_len = hStereoDmxEVS->hPHA->fad_len;
     move16();
 
-    trans_len = idiv1616( pha_len, 20 );
-    set16_fx( hStereoDmxEVS->hPHA->win_fx, 29491 /*1.8f in Q15*/, sub( pha_len, trans_len ) );
+    set16_fx( hStereoDmxEVS->hPHA->win_fx, 29491 /*1.8f in Q14*/, pha_len );
     hStereoDmxEVS->hPHA->win_fx[0] = ONE_IN_Q14;
-    // tmp_r = 1.0f / ( ( trans_len * 2 ) + 1 );
-    tmp_r = div_s( 1, add( shl( trans_len, 1 ), 1 ) );
-    win = &( hStereoDmxEVS->hPHA->win_fx[pha_len - trans_len] );
-    FOR( n = 0; n < trans_len; n++ )
+    move16();
+    IF( EQ_32( input_Fs, 16000 ) )
     {
-        // win[n] = ( 0.5f * ( 1.0f + cosf( ( PI2 * ( n + 1 ) ) * tmp_r ) ) ) * 1.8f;
-        win[n] = mult_r( add( ONE_IN_Q14, getCosWord16R2( imult1616( add( n, 1 ), tmp_r ) ) ), 29491 );
-        move32();
+        hStereoDmxEVS->hPHA->win_fx[pha_len - 1] = 7373; /*0.45f in Q14*/
+        move16();
+    }
+    ELSE IF( EQ_32( input_Fs, 32000 ) || EQ_32( input_Fs, 48000 ) )
+    {
+        hStereoDmxEVS->hPHA->win_fx[sub( pha_len, 2 )] = 19302; /*1.1781f in Q14*/
+        move16();
+        hStereoDmxEVS->hPHA->win_fx[sub( pha_len, 1 )] = 2816; /*0.1718f in Q14*/
+        move16();
     }
 
     fad_g = hStereoDmxEVS->hPHA->fad_g_fx;
     // fad_r = 1.0f / (float) ( fad_len + 1 );
+#ifdef FIX_1481_HARDCODE_DIV
+    SWITCH( fad_len )
+    {
+        case STEREO_DMX_EVS_FAD_LEN_16:
+            fad_r = 853658096;
+            move32();
+            tmp_e = -6;
+            move16();
+            BREAK;
+        case STEREO_DMX_EVS_FAD_LEN_32:
+            fad_r = 856317467;
+            move32();
+            tmp_e = -7;
+            move16();
+            BREAK;
+        case STEREO_DMX_EVS_FAD_LEN_48:
+            fad_r = 571471740;
+            move32();
+            tmp_e = -7;
+            move16();
+            BREAK;
+        default:
+            fad_r = BASOP_Util_Divide3232_Scale_newton( 1, add( fad_len, 1 ), &tmp_e );
+            BREAK;
+    }
+#else
     fad_r = BASOP_Util_Divide3232_Scale_cadence( 1, add( fad_len, 1 ), &tmp_e );
+#endif
     fad_r = L_shl_r( fad_r, tmp_e );
     fad_len2 = shr( fad_len, 1 );
-    FOR( ( n = 0, m = sub( fad_len, 1 ) ); n < fad_len2; ( n++, m-- ) )
+    FOR( ( n = 0, m = ( fad_len - 1 ) ); n < fad_len2; ( n++, m-- ) )
     {
         fad_g[n] = imult3216( fad_r, add( n, 1 ) );
         move32();
@@ -2504,19 +2543,19 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
     SWITCH( input_Fs )
     {
         case 8000:
-            hStereoDmxEVS->hPHA->fad_len_prc = (Word16) STEREO_DMX_EVS_FADE_LEN_PRC * 8;
+            hStereoDmxEVS->hPHA->fad_len_prc = STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 8;
             move16();
             BREAK;
         case 16000:
-            hStereoDmxEVS->hPHA->fad_len_prc = (Word16) STEREO_DMX_EVS_FADE_LEN_PRC * 16;
+            hStereoDmxEVS->hPHA->fad_len_prc = STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 16;
             move16();
             BREAK;
         case 32000:
-            hStereoDmxEVS->hPHA->fad_len_prc = (Word16) STEREO_DMX_EVS_FADE_LEN_PRC * 32;
+            hStereoDmxEVS->hPHA->fad_len_prc = STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 32;
             move16();
             BREAK;
         case 48000:
-            hStereoDmxEVS->hPHA->fad_len_prc = (Word16) STEREO_DMX_EVS_FADE_LEN_PRC * 48;
+            hStereoDmxEVS->hPHA->fad_len_prc = STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 48;
             move16();
             BREAK;
         default:
@@ -2527,10 +2566,37 @@ ivas_error stereo_dmx_evs_init_encoder_fx(
     move16();
     fad_g = hStereoDmxEVS->hPHA->fad_g_prc_fx;
     // fad_r = 1.0f / (float) ( fad_len + 1 );
+#ifdef FIX_1481_HARDCODE_DIV
+    SWITCH( fad_len )
+    {
+        case STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 16:
+            fad_r = 856317467;
+            move32();
+            tmp_e = -7;
+            move16();
+            BREAK;
+        case STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 32:
+            fad_r = 857653375;
+            move32();
+            tmp_e = -8;
+            move16();
+            BREAK;
+        case STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 48:
+            fad_r = 572066403;
+            move32();
+            tmp_e = -8;
+            move16();
+            BREAK;
+        default:
+            fad_r = BASOP_Util_Divide3232_Scale_newton( 1, add( fad_len, 1 ), &tmp_e );
+            BREAK;
+    }
+#else
     fad_r = BASOP_Util_Divide3232_Scale_cadence( 1, add( fad_len, 1 ), &tmp_e );
+#endif
     fad_r = L_shl_r( fad_r, tmp_e );
     fad_len2 = shr( fad_len, 1 );
-    FOR( ( n = 0, m = sub( fad_len, 1 ) ); n < fad_len2; ( n++, m-- ) )
+    FOR( ( n = 0, m = ( fad_len - 1 ) ); n < fad_len2; ( n++, m-- ) )
     {
         fad_g[n] = imult3216( fad_r, add( n, 1 ) );
         move32();
diff --git a/lib_enc/ivas_stereo_eclvq_enc.c b/lib_enc/ivas_stereo_eclvq_enc_fx.c
similarity index 87%
rename from lib_enc/ivas_stereo_eclvq_enc.c
rename to lib_enc/ivas_stereo_eclvq_enc_fx.c
index d108e3add54804aea7d3c317911eadb24f69084d..a09daffe033c27d824800c93d8e8855231389091 100644
--- a/lib_enc/ivas_stereo_eclvq_enc.c
+++ b/lib_enc/ivas_stereo_eclvq_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,13 +33,11 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_enc.h"
 #include <assert.h>
-#include "prot.h"
 #include "prot_fx.h"
 #include "wmc_auto.h"
 /* used only for norm_s in the code_length_from_count function */
@@ -69,7 +67,7 @@ static Word16 get_sign_fx( Word16 n )
  *
  * ---------------------------------------------------------------*/
 void ECSQ_quantize_vector_fx(
-    const Word32 *input,
+    const Word32 *input, // Q(31-input_e)
     const Word16 input_e,
     const Word32 global_gain, // Q15
     const Word16 N,
@@ -80,13 +78,25 @@ void ECSQ_quantize_vector_fx(
     Word16 inv_global_gain_e;
 
     // inv_global_gain = 1.0f / global_gain;
-    inv_global_gain = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q15, global_gain, &inv_global_gain_e );
-    inv_global_gain = L_shl( inv_global_gain, inv_global_gain_e ); // Q31
-    FOR( i = 0; i < N; ++i )
+    IF( EQ_32( global_gain, ONE_IN_Q15 ) )
     {
-        // output[i] = (int16_t) round_f( input[i] * inv_global_gain );
-        output[i] = extract_l( L_shr_r( Mpy_32_32( input[i], inv_global_gain ), sub( 31, input_e ) ) );
-        move16();
+        FOR( i = 0; i < N; ++i )
+        {
+            // output[i] = (int16_t) round_f( input[i] * inv_global_gain );
+            output[i] = extract_l( L_shr_r( input[i], sub( 31, input_e ) ) );
+            move16();
+        }
+    }
+    ELSE
+    {
+        inv_global_gain = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q15, global_gain, &inv_global_gain_e );
+        inv_global_gain = L_shl( inv_global_gain, inv_global_gain_e ); // Q31
+        FOR( i = 0; i < N; ++i )
+        {
+            // output[i] = (int16_t) round_f( input[i] * inv_global_gain );
+            output[i] = extract_l( L_shr_r( Mpy_32_32( input[i], inv_global_gain ), sub( 31, input_e ) ) );
+            move16();
+        }
     }
 
     return;
@@ -99,7 +109,7 @@ void ECSQ_quantize_vector_fx(
  * if all the values in output are zero, it returns 0
  * ---------------------------------------------------------------*/
 Word32 ECSQ_compute_optimal_gain_fx( // Q15
-    const Word32 *input,
+    const Word32 *input,             // Q(31-input_e)
     const Word16 input_e,
     const Word16 N,
     const Word16 *output )
@@ -107,6 +117,7 @@ Word32 ECSQ_compute_optimal_gain_fx( // Q15
     Word16 i;
     Word32 sum_sq_output;
     Word32 sum_input_output;
+    Word16 sum_input_output_e;
     Word32 optimal_global_gain;
     Word16 optimal_global_gain_e;
 
@@ -114,12 +125,14 @@ Word32 ECSQ_compute_optimal_gain_fx( // Q15
     move32();
     sum_input_output = 0;
     move32();
+    sum_input_output_e = 0;
+    move16();
     FOR( i = 0; i < N; ++i )
     {
         // sum_sq_output += (float) output[i] * (float) output[i];
-        sum_sq_output = L_add( sum_sq_output, L_shl( L_mult0( output[i], output[i] ), 15 ) ); // Q15
+        sum_sq_output = L_add( sum_sq_output, L_mult0( output[i], output[i] ) );
         // sum_input_output += input[i] * (float) output[i];
-        sum_input_output = L_add( sum_input_output, L_shr( W_extract_l( W_mult0_32_32( input[i], output[i] ) ), sub( 16, input_e ) ) ); // Q15
+        sum_input_output = BASOP_Util_Add_Mant32Exp( sum_input_output, sum_input_output_e, W_extract_l( W_mult0_32_32( input[i], output[i] ) ), input_e, &sum_input_output_e );
     }
 
     optimal_global_gain = 0;
@@ -127,8 +140,8 @@ Word32 ECSQ_compute_optimal_gain_fx( // Q15
     IF( sum_sq_output != 0 )
     {
         // optimal_global_gain = sum_input_output / sum_sq_output;
-        optimal_global_gain = BASOP_Util_Divide3232_Scale_cadence( sum_input_output, sum_sq_output, &optimal_global_gain_e );
-        optimal_global_gain = L_shr( optimal_global_gain, sub( 16, optimal_global_gain_e ) ); // Q15
+        optimal_global_gain = BASOP_Util_Divide3232_Scale_newton( sum_input_output, sum_sq_output, &optimal_global_gain_e );        // 31 - ( sum_input_output_e - 31 + optimal_global_gain_e ) = 62 - ( sum_input_output_e + optimal_global_gain_e )
+        optimal_global_gain = L_shr( optimal_global_gain, sub( sub( 62, add( sum_input_output_e, optimal_global_gain_e ) ), 15 ) ); // Q15
     }
 
     return optimal_global_gain;
@@ -182,7 +195,7 @@ static void arith_encode_bit_fx(
     IF( ecsq_inst->encoding_active )
     {
         /* call to the actual AC */
-        rc_uni_enc_encode_bits( rc_st_enc, bit, 1 );
+        rc_uni_enc_encode_bits_fx( rc_st_enc, bit, 1 );
     }
 
     return;
@@ -206,7 +219,7 @@ static void arith_encode_bits_fx(
 
     IF( ecsq_inst->encoding_active )
     {
-        rc_uni_enc_encode_bits( rc_st_enc, n, size );
+        rc_uni_enc_encode_bits_fx( rc_st_enc, n, size );
     }
 
     return;
@@ -267,7 +280,7 @@ static void arith_encode_bit_prob_fx(
     IF( ecsq_inst->encoding_active )
     {
         /* call to the actual AC */
-        rc_uni_enc_encode_fast( rc_st_enc, bit * count0, count, 14 );
+        rc_uni_enc_encode_fast_fx( rc_st_enc, u_extract_l( L_mult0( bit, count0 ) ), count, 14 );
     }
 
     return;
@@ -299,7 +312,7 @@ static void arith_encode_prob_fx(
     IF( ecsq_inst->encoding_active )
     {
         /* call to the actual AC */
-        rc_uni_enc_encode_fast( rc_st_enc, ECSQ_PROB_TOTAL - table[symbol], count, 14 );
+        rc_uni_enc_encode_fast_fx( rc_st_enc, u_extract_l( UL_subNsD( ECSQ_PROB_TOTAL, table[symbol] ) ), count, 14 );
     }
 
     return;
@@ -336,7 +349,7 @@ static void arith_encode_elias_mod_fx(
         arith_encode_bit_fx( ecsq_inst, 1 );
 
         /* encode the n_bits data bits at once */
-        arith_encode_bits_fx( ecsq_inst, n - ( 1 << n_bits ), n_bits );
+        arith_encode_bits_fx( ecsq_inst, u_extract_l( L_sub( n, ( shl( 1, n_bits ) ) ) ), n_bits );
     }
 
     return;
@@ -404,8 +417,7 @@ static Word16 get_best_param_fx(
         sum_abs = L_add( sum_abs, L_shl( abs_s( val ), 10 ) ); // Q10
         IF( val == 0 )
         {
-            ++count0;
-            move16();
+            count0 = add( count0, 1 );
         }
     }
 
@@ -415,7 +427,7 @@ static Word16 get_best_param_fx(
     IF( LE_16( sub( count, count0 ), ECSQ_NONZERO_MAX ) && EQ_32( sum_abs, L_shl( sub( count, count0 ), 10 ) ) )
     {
         //*avg_abs_sum = ( sum_abs + 0.25f * count0 ) / count;
-        *avg_abs_sum = BASOP_Util_Divide3232_Scale_cadence( L_add( sum_abs, L_shl( count0, 8 ) ), L_shl( count, 10 ), &L_tmp_e );
+        *avg_abs_sum = BASOP_Util_Divide3232_Scale_newton( L_add( sum_abs, L_shl( count0, 8 ) ), L_shl( count, 10 ), &L_tmp_e );
         move32();
         *avg_abs_sum = L_shr_r( *avg_abs_sum, sub( 21, L_tmp_e ) ); // Q10
         move32();
@@ -426,7 +438,7 @@ static Word16 get_best_param_fx(
     }
 
     //*avg_abs_sum = ( sum_abs + 0.25f * count0 ) / count;
-    *avg_abs_sum = BASOP_Util_Divide3232_Scale_cadence( L_add( sum_abs, L_shl( count0, 8 ) ), L_shl( count, 10 ), &L_tmp_e );
+    *avg_abs_sum = BASOP_Util_Divide3232_Scale_newton( L_add( sum_abs, L_shl( count0, 8 ) ), L_shl( count, 10 ), &L_tmp_e );
     move32();
     *avg_abs_sum = L_shr_r( *avg_abs_sum, sub( 21, L_tmp_e ) ); // Q10
     move32();
@@ -435,8 +447,7 @@ static Word16 get_best_param_fx(
 
     /* the best Laplace integer parameter is floor(log2(avg_abs_sum) + log2(offset)) */
     // param = (int16_t) floor( log_base2( *avg_abs_sum * offset ) );
-    param = sub( 31, norm_l( L_sub( L_shr( Mpy_32_16_1( *avg_abs_sum, offset ), 10 - 1 ), 1 ) ) );
-    // sub( 31, norm_l( L_sub( n, 1 ) ) )
+    param = extract_l( L_shr( L_add( BASOP_Util_Log2( Mpy_32_16_1( *avg_abs_sum, offset ) ), 738197504 /* (31-(10+14-15)) <<25 */ ), 25 ) );
 
     /* limit param value to the available exponent range */
     param = s_max( ECSQ_ALL_ZERO_PARAM + 1, param );
@@ -467,7 +478,7 @@ static Word32 get_est_size_fx( // Q10
     // if ( param < 0 )
     //{
     //     //two_to_param = 1.0f / two_to_param;
-    //     two_to_param = BASOP_Util_Divide3232_Scale_cadence( 1, two_to_param,&two_to_param_e);
+    //     two_to_param = BASOP_Util_Divide3232_Scale_newton( 1, two_to_param,&two_to_param_e);
     // }
 
     IF( NE_16( param, ECSQ_ALL_ZERO_PARAM ) ) /* not all values are zeros */
@@ -497,8 +508,8 @@ static Word32 get_est_size_fx( // Q10
         nonzero = sub( N, N0 );
 
         // required_avg_abs_sum = ( nonzero + 0.25f * N0 ) / N; /* the vector must have nonzero +-1 and N0 zeros */
-        required_avg_abs_sum = BASOP_Util_Divide3232_Scale_cadence( L_add( L_shl( nonzero, 10 ), L_shl( N0, 8 ) ), L_shl( N, 10 ), &required_avg_abs_sum_e ); /* the vector must have nonzero +-1 and N0 zeros */
-        required_avg_abs_sum = L_shr_r( required_avg_abs_sum, sub( 21, required_avg_abs_sum_e ) );                                                            // Q10
+        required_avg_abs_sum = BASOP_Util_Divide3232_Scale_newton( L_add( L_shl( nonzero, 10 ), L_shl( N0, 8 ) ), L_shl( N, 10 ), &required_avg_abs_sum_e ); /* the vector must have nonzero +-1 and N0 zeros */
+        required_avg_abs_sum = L_shr_r( required_avg_abs_sum, sub( 21, required_avg_abs_sum_e ) );                                                           // Q10
 
         test();
         IF( EQ_32( avg_abs_sum, required_avg_abs_sum ) && LE_16( nonzero, ECSQ_NONZERO_MAX ) )
@@ -536,7 +547,7 @@ static Word32 ECSQ_encode_raw_fx(
     Word16 *input,
     const Word16 N )
 {
-    int32_t bit_count_estimate_initial;
+    Word32 bit_count_estimate_initial;
 
     Word32 total_size; // Q10
     Word16 segment_count;
@@ -556,7 +567,7 @@ static Word32 ECSQ_encode_raw_fx(
     const UWord16 *tab_vals, *tab_abs_lsbs;
 
     bit_count_estimate_initial = ecsq_inst->bit_count_estimate;
-
+    move32();
 
     total_size = 0;
     move32();
@@ -595,7 +606,7 @@ static Word32 ECSQ_encode_raw_fx(
         FOR( param = first_param; param <= last_param; ++param )
         {
             param_zb = sub( param, ECSQ_ALL_ZERO_PARAM );
-            count = ECSQ_tab_param[ecsq_inst->config_index][param_zb] - ECSQ_tab_param[ecsq_inst->config_index][param_zb + 1];
+            count = sub( ECSQ_tab_param[ecsq_inst->config_index][param_zb], ECSQ_tab_param[ecsq_inst->config_index][param_zb + 1] );
             // test_size = scale_Q10 * code_length_from_count( count );
             test_size = code_length_from_count_fx( count ); // Q10
 
@@ -611,6 +622,7 @@ static Word32 ECSQ_encode_raw_fx(
         }
 
         best_params[segment] = best_param;
+        move16();
         total_size = L_add( total_size, best_size );
     }
 
@@ -629,6 +641,7 @@ static Word32 ECSQ_encode_raw_fx(
         seg_start = imult1616( segment, ECSQ_SEGMENT_SIZE );
         seg_stop = add( seg_start, ECSQ_SEGMENT_SIZE - 1 );
         seg_length = ECSQ_SEGMENT_SIZE;
+        move16();
         IF( EQ_16( segment, sub( segment_count, 1 ) ) )
         {
             seg_stop = sub( N, 1 );
@@ -744,7 +757,7 @@ static Word32 ECSQ_encode_raw_fx(
 
 Word32 ECSQ_encode_target_SNR_fx(
     ECSQ_instance *ecsq_inst,
-    const Word32 *input,
+    const Word32 *input, // Q(31-input_e)
     const Word16 input_e,
     const Word16 N,
     const Word32 target_SNR, // Q25
@@ -767,6 +780,8 @@ Word32 ECSQ_encode_target_SNR_fx(
     // const Word32 global_gain_step = 1165018877; // powf( 10.0f, ECLVQ_INV_GLOBAL_GAIN_FACTOR ) in Q30
     Word32 L_tmp1;
     Word16 L_tmp1_e;
+    Word64 W_tmp1;
+    Word16 shift;
 
     // max_bits_fixpt = max_bits * 1024; /* max_bits_fixpt is in 22Q10 fixed-point representation */
     max_bits_fixpt = L_shl( max_bits, 10 ); /* max_bits_fixpt is in 22Q10 fixed-point representation */
@@ -775,6 +790,7 @@ Word32 ECSQ_encode_target_SNR_fx(
     {
         /* a target SNR of 0.0 dB is already achieved by quantizing all values in the vector to zero */
         *global_gain_index_output = ECSQ_GLOBAL_GAIN_INDEX_ALL_ZERO;
+        move16();
         IF( output != NULL )
         {
             set32_fx( output, 0, N );
@@ -787,10 +803,24 @@ Word32 ECSQ_encode_target_SNR_fx(
     move32();
     sum_squared_e = 0;
     move16();
+
     FOR( i = 0; i < N; ++i )
     {
         // sum_squared += input[i] * input[i];
-        sum_squared = BASOP_Util_Add_Mant32Exp( sum_squared, sum_squared_e, Mpy_32_32( input[i], input[i] ), shl( input_e, 1 ), &sum_squared_e );
+        W_tmp1 = W_mult0_32_32( input[i], input[i] ); // 2(31-input_e)
+        IF( W_tmp1 == 0 )
+        {
+            shift = 32;
+            move16();
+        }
+        ELSE
+        {
+            shift = W_norm( W_tmp1 );
+        }
+        shift = sub( 32, shift );
+        L_tmp1 = W_extract_l( W_shr( W_tmp1, shift ) );        // 2(31-input_e) - shift = 62 - 2input_e - shift
+        L_tmp1_e = sub( add( shl( input_e, 1 ), shift ), 31 ); // 31 - (62 - 2input_e - shift) = 2input_e + shift - 31
+        sum_squared = BASOP_Util_Add_Mant32Exp( sum_squared, sum_squared_e, L_tmp1, L_tmp1_e, &sum_squared_e );
     }
 
     // if ( sum_squared < 0.25f ) /* all the values in the input vector will always be quantized to zero */
@@ -817,19 +847,20 @@ Word32 ECSQ_encode_target_SNR_fx(
 
     /* target_ratio is the target ratio between the sum squared values of input and sum squared values of quantization error */
     // target_ratio = powf( 10.0f, target_SNR / 10.0f );
-    L_tmp1 = BASOP_Util_Divide3232_Scale_cadence( target_SNR, 10, &L_tmp1_e );
+    L_tmp1 = BASOP_Util_Divide3232_Scale_newton( target_SNR, 10, &L_tmp1_e );
     L_tmp1_e = add( L_tmp1_e, 6 - 31 );
     target_ratio = BASOP_Util_fPow( 10 << 27, 4, L_tmp1, L_tmp1_e, &target_ratio_e );
     // target_sum_squared_error = sum_squared / target_ratio;
-    target_sum_squared_error = BASOP_Util_Divide3232_Scale_cadence( sum_squared, target_ratio, &target_sum_squared_error_e );
+    target_sum_squared_error = BASOP_Util_Divide3232_Scale_newton( sum_squared, target_ratio, &target_sum_squared_error_e );
     target_sum_squared_error_e = add( target_sum_squared_error_e, sub( sum_squared_e, target_ratio_e ) );
 
     /* the mean of squared quantization error for uniform scalar quantization is 1 / 12, approximately 0.0833 */
     /* when including global_gain, the relationship is target_sum_squared_error ~ (0.0833 * N) * global_gain ^ 2 */
     /* the representable range for global_gain is from 1 (global_gain_index 0) to 29145 (global_gain_index 126) inclusive */
     // global_gain = sqrtf( target_sum_squared_error / ( 0.0833f * (float) N ) );
-    global_gain = BASOP_Util_Divide3232_Scale_cadence( target_sum_squared_error, L_mult0( 5459 /*0.0833f in Q16*/, N ), &global_gain_e );
+    global_gain = BASOP_Util_Divide3232_Scale_newton( target_sum_squared_error, L_mult0( 5459 /*0.0833f in Q16*/, N ), &global_gain_e );
     global_gain_e = add( global_gain_e, sub( target_sum_squared_error_e, 15 ) );
+    global_gain = Sqrt32( global_gain, &global_gain_e );
     global_gain = L_shr( global_gain, sub( 16, global_gain_e ) ); // Q15
     /* quantize the estimated global_gain */
     global_gain_index = ECSQ_quantize_gain_fx( global_gain );
@@ -845,18 +876,24 @@ Word32 ECSQ_encode_target_SNR_fx(
 
     test_size = ECSQ_encode_raw_fx( ecsq_inst, quantized_input, N );
 
-    ++iteration;
-    move16();
+    iteration = add( iteration, 1 );
     Word16 tmp_e;
+    test();
     WHILE( GT_32( test_size, max_bits_fixpt ) && LT_16( iteration, ECSQ_MAX_BITS_ITERATIONS ) )
     {
         test();
         adjust_size = L_sub( test_size, max_bits_fixpt );
         /* assume doubling the quantization step size will reduce the entropy with (up to) one bit */
         // adjust_global_gain_index = (int16_t) ceil( adjust_size / ( 1024.0f * N * log_base2( global_gain_step ) ) );
-        adjust_global_gain_index = BASOP_Util_Divide3232_Scale_cadence( adjust_size, N, &tmp_e );
+        adjust_global_gain_index = BASOP_Util_Divide3232_Scale_newton( adjust_size, N, &tmp_e );
         adjust_global_gain_index = Mpy_32_32( adjust_global_gain_index, 17816838 /*/ ( 1024.0f * log_base2( global_gain_step ) )*/ );
-        adjust_global_gain_index = extract_l( L_shr( L_add( adjust_global_gain_index, L_shl( 1, sub( 31, tmp_e ) ) ), sub( 31, tmp_e ) ) );
+        IF( NE_32( adjust_global_gain_index, L_shl( L_shr( adjust_global_gain_index, sub( 31, tmp_e ) ), sub( 31, tmp_e ) ) ) )
+        {
+            adjust_global_gain_index = BASOP_Util_Add_Mant32Exp( adjust_global_gain_index, tmp_e, ONE_IN_Q30, 1, &tmp_e );
+        }
+
+        adjust_global_gain_index = extract_l( L_shr( adjust_global_gain_index, sub( 31, tmp_e ) ) );
+
         global_gain_index = s_min( add( global_gain_index, (Word16) adjust_global_gain_index ), 126 );
 
         global_gain = ECSQ_dequantize_gain_fx( global_gain_index ); // Q15
@@ -866,8 +903,7 @@ Word32 ECSQ_encode_target_SNR_fx(
 
         test_size = ECSQ_encode_raw_fx( ecsq_inst, quantized_input, N );
 
-        ++iteration;
-        move16();
+        iteration = add( iteration, 1 );
     }
 
     IF( GT_32( test_size, max_bits_fixpt ) )
@@ -885,7 +921,7 @@ Word32 ECSQ_encode_target_SNR_fx(
     /* do the quantization with the dequantized final global_gain_index found */
     global_gain = ECSQ_dequantize_gain_fx( global_gain_index ); // Q15
 
-    IF( global_gain_index != global_gain_index_last )
+    IF( NE_16( global_gain_index, global_gain_index_last ) )
     {
         ECSQ_quantize_vector_fx( input, input_e, global_gain, N, quantized_input );
     }
diff --git a/lib_enc/ivas_stereo_ica_enc.c b/lib_enc/ivas_stereo_ica_enc_fx.c
similarity index 96%
rename from lib_enc/ivas_stereo_ica_enc.c
rename to lib_enc/ivas_stereo_ica_enc_fx.c
index f7cf971efb50e946c9f84a0ad41a0993b4f184f9..d0252a1f154a32df2845bea6d5c3dc695368e2a0 100644
--- a/lib_enc/ivas_stereo_ica_enc.c
+++ b/lib_enc/ivas_stereo_ica_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,12 +36,10 @@
 #include <math.h>
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
-#include "prot_fx.h"
 
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
@@ -112,7 +110,7 @@ static void tcaTargetCh_LA_fx(
         target = ptrChanL;
     }
 
-    tempS = NS2SA( L_mult0( input_frame, FRAMES_PER_SEC ), L_SAMPLES_LA_NS );
+    tempS = NS2SA_FX2( L_mult0( input_frame, FRAMES_PER_SEC ), L_SAMPLES_LA_NS );
     tempF1 = 0;
     move32();
     tempF1_exp = 0;
@@ -152,7 +150,7 @@ static void tcaTargetCh_LA_fx(
             deno_exp = 0;
             move16();
         }
-        gAdj = BASOP_Util_Divide3232_Scale_cadence( tempF2, deno, &gAdj_exp ); /* Q31-gAdj_exp */
+        gAdj = BASOP_Util_Divide3232_Scale_newton( tempF2, deno, &gAdj_exp ); /* Q31-gAdj_exp */
         gAdj_exp = add( gAdj_exp, sub( tempF2_exp, deno_exp ) );
     }
 
@@ -410,8 +408,8 @@ static void deEmphResample_fx(
 
     /* De-emphasis, 1/(1-mu z^-1), and resample, stage 1 */
 
-    deemph_fx_32( 0, buf1_fx, PREEMPH_FAC_16k, input_frame, &hStereoTCA->memdecim_fx[0] );
-    deemph_fx_32( 0, buf2_fx, PREEMPH_FAC_16k, input_frame, &hStereoTCA->memdecim_fx[1] );
+    deemph_fx_32( buf1_fx, PREEMPH_FAC_16k, input_frame, &hStereoTCA->memdecim_fx[0] );
+    deemph_fx_32( buf2_fx, PREEMPH_FAC_16k, input_frame, &hStereoTCA->memdecim_fx[1] );
 
     FOR( i = 0; i < ( input_frame / dsFac1 ); i++ )
     {
@@ -422,8 +420,8 @@ static void deEmphResample_fx(
     }
 
     /* De-emphasis, 1/(1-mu z^-1), and resample, stage 2 */
-    deemph_fx_32( 0, tempBuf1_fx, PREEMPH_FAC_16k, idiv1616( input_frame, dsFac1 ), &hStereoTCA->memdecim_fx[2] );
-    deemph_fx_32( 0, tempBuf2_fx, PREEMPH_FAC_16k, idiv1616( input_frame, dsFac1 ), &hStereoTCA->memdecim_fx[3] );
+    deemph_fx_32( tempBuf1_fx, PREEMPH_FAC_16k, idiv1616( input_frame, dsFac1 ), &hStereoTCA->memdecim_fx[2] );
+    deemph_fx_32( tempBuf2_fx, PREEMPH_FAC_16k, idiv1616( input_frame, dsFac1 ), &hStereoTCA->memdecim_fx[3] );
 
     FOR( i = 0; i < ( input_frame / dsFactor ); i++ )
     {
@@ -925,7 +923,7 @@ static void corrStatsEst_fx(
     IF( tempF_fx != 0 )
     {
         temp32 = BASOP_Util_Add_Mant32Exp( XY_hat_fx, XY_hat_exp, L_negate( Mpy_32_32( X_hat_fx, Y_hat_fx ) ), add( X_hat_exp, Y_hat_exp ), &exp ); /* Q31-exp */
-        beta_reg_fx = BASOP_Util_Divide3232_Scale_cadence( temp32, tempF_fx, &beta_reg_exp );                                                       /* Q31-beta_reg_exp */
+        beta_reg_fx = BASOP_Util_Divide3232_Scale_newton( temp32, tempF_fx, &beta_reg_exp );                                                        /* Q31-beta_reg_exp */
         if ( beta_reg_fx )
         {
             beta_reg_exp = add( beta_reg_exp, sub( exp, tempF_exp ) );
@@ -935,6 +933,8 @@ static void corrStatsEst_fx(
     alpha_reg_fx = BASOP_Util_Add_Mant32Exp( Y_hat_fx, Y_hat_exp, L_negate( Mpy_32_32( X_hat_fx, beta_reg_fx ) ), add( X_hat_exp, beta_reg_exp ), &alpha_reg_exp );               /* Q31-alpha_reg_exp */
     reg_prv_corr_fx = BASOP_Util_Add_Mant32Exp( alpha_reg_fx, alpha_reg_exp, Mpy_32_32( beta_reg_fx, L_shl( MAX_DELAYREGLEN, 27 ) ), add( 4, beta_reg_exp ), &reg_prv_corr_exp ); /* Q31-reg_prv_corr_exp */
 
+    reg_prv_corr_fx = L_shr( reg_prv_corr_fx, 1 );
+    reg_prv_corr_exp = add( reg_prv_corr_exp, 1 );
     IF( LE_16( TRUNC_FX( reg_prv_corr_fx, reg_prv_corr_exp ), -L_NCSHIFT_DS ) )
     {
         reg_prv_corr_fx = -L_NCSHIFT_DS + 1;
@@ -1094,9 +1094,9 @@ static void corrStatsEst_fx(
 
         hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1], 429496730 /* 0.2 in Q31*/ ), hStereoTCA->delay_0_mem_exp, L_mult0( 26214 /* 0.8 in Q15*/, corrLagStats[0] ), Q16, &temp ); /* Q31-temp */
         move32();
-        Word32 inpp = L_abs( BASOP_Util_Add_Mant32Exp( reg_prv_corr_fx, reg_prv_corr_exp, -hStereoTCA->delay_0_mem_fx[0], hStereoTCA->delay_0_mem_exp, &exp ) ); /* Q31-exp */
-        inpp = L_shl_sat( inpp, sub( exp, 5 ) );                                                                                                                 /* Q26 */
-        IF( GT_32( inpp, 1677721600 ) )                                                                                                                          // 25 in Q26
+        Word32 inpp = L_abs( BASOP_Util_Add_Mant32Exp( reg_prv_corr_fx, reg_prv_corr_exp, L_negate( hStereoTCA->delay_0_mem_fx[0] ), hStereoTCA->delay_0_mem_exp, &exp ) ); /* Q31-exp */
+        inpp = L_shl_sat( inpp, sub( exp, 5 ) );                                                                                                                            /* Q26 */
+        IF( GT_32( inpp, 1677721600 ) )                                                                                                                                     // 25 in Q26
         {
             set32_fx( &( hStereoTCA->delay_0_mem_fx[0] ), hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1], MAX_DELAYREGLEN - 1 );
             hStereoTCA->delay_0_mem_exp = temp;
@@ -1127,7 +1127,9 @@ static void corrStatsEst_fx(
     test();
     IF( vad_flag1 == 0 || vad_flag2 == 0 )
     {
-        corrLagStats[0] = TRUNC_FX( hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1], hStereoTCA->delay_0_mem_exp ); /* Q0 */
+        Word32 tmp_delay = L_shr( hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1], 1 );
+        Word16 tmp_delay_e = add( hStereoTCA->delay_0_mem_exp, 1 );
+        corrLagStats[0] = TRUNC_FX( tmp_delay, tmp_delay_e ); /* Q0 */
         move32();
     }
 
@@ -1333,17 +1335,10 @@ static void estDownmixGain_fx(
     }
     ELSE IF( GT_16( hStereoTCA->LRTD_G_ATT_cnt, 1 ) ) /* lrtd_mode == 1 but tdm_LRTD_flag still 0 */
     {
-        currentGain = BASOP_Util_Divide1616_Scale( currentGain, hStereoTCA->LRTD_G_ATT_cnt, &currentGain_e ); // Q = 15 + 0 - (15 - exp)
-        /* Division result Q has to be got back to the Q of initial currentGain hence the shift operation below */
-        IF( currentGain_e != 0 )
-        {
-            currentGain = shr( currentGain, sub( Q15, currentGain_e ) ); /* Q15 */
-            currentGain_e = 0;
-            move16();
-        }
+        currentGain = BASOP_Util_Divide1616_Scale( currentGain, hStereoTCA->LRTD_G_ATT_cnt, &exp );
+        currentGain_e = add( exp, sub( currentGain_e, 15 ) );
     }
 
-
     IF( GE_16( norm_s( currentGain ), sub( currentGain_e, 1 ) ) )
     {
         /* convert currentGain into Q14 */
@@ -1511,7 +1506,7 @@ static void icaMemUpdate_fx(
     IF( hCPE->hStereoICBWE != NULL )
     {
         assert( L_MEM_RECALC_TBE_NS <= L_MEM_RECALC_NS );
-        i = NS2SA( sts[0]->input_Fs, L_MEM_RECALC_TBE_NS );
+        i = NS2SA_FX2( sts[0]->input_Fs, L_MEM_RECALC_TBE_NS );
         Copy_Scale_sig_32_16( bufChanL + sub( add( lMemRecalc, lMemRecalc_SCh ), i ), hCPE->hStereoICBWE->icbwe_inp_mem_fx[0], i, -Q16 ); /* q_com-16 */
         Copy_Scale_sig_32_16( bufChanR + sub( add( lMemRecalc, lMemRecalc_SCh ), i ), hCPE->hStereoICBWE->icbwe_inp_mem_fx[1], i, -Q16 ); /* q_com-16 */
         hCPE->hStereoICBWE->q_dataChan_fx = sub( q_com, Q16 );
@@ -1579,9 +1574,9 @@ void stereo_tca_enc_fx(
     q_com = sts[0]->q_inp32;
     move16();
 
-    lMemRecalc = NS2SA( input_Fs, L_MEM_RECALC_NS );
+    lMemRecalc = NS2SA_FX2( input_Fs, L_MEM_RECALC_NS );
     move16();
-    lMemRecalc_SCh = NS2SA( input_Fs, L_MEM_RECALC_SCH_NS );
+    lMemRecalc_SCh = NS2SA_FX2( input_Fs, L_MEM_RECALC_SCH_NS );
     move16();
 
     IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) )
@@ -1737,7 +1732,7 @@ void stereo_tca_enc_fx(
     prev_ICA_flag = 0;
     move16();
     test();
-    if ( hCPE->hStereoTD->prev_fr_LRTD_TD_dec && abs( hStereoTCA->prevCorrLagStats[2] ) != 0 )
+    if ( hCPE->hStereoTD->prev_fr_LRTD_TD_dec && abs_s( hStereoTCA->prevCorrLagStats[2] ) != 0 )
     {
         prev_ICA_flag = 1;
         move16();
@@ -1888,7 +1883,7 @@ void stereo_tca_enc_fx(
         ELSE
         {
             v_multc_fixed( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX );                              /* TO make in common Q bufChan_q -2*/
-            Copy32( ptrChanL_fx + add( prevNCShift, sub( lMemRecalc, lMemRecalc_SCh ) ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) );                   // bufChan_q -2
+            Copy32( ptrChanL_fx + sub( prevNCShift, add( lMemRecalc, lMemRecalc_SCh ) ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) );                   // bufChan_q -2
             v_multc_fixed( ptrChanR_fx - add( lMemRecalc, lMemRecalc_SCh ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
             v_multc_fixed( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX );                              /* TO make in common Q bufChan_q -2*/
         }
@@ -1924,7 +1919,7 @@ void stereo_tca_enc_fx(
             /* Note!! : Always keep the assert (prevNCShift>>1) below according to the equation used here to get tempS */
             tempS = shr( currentNCShift, 1 ); /* Q0 */
 
-            IF( LE_32( abs( sub( currentNCShift, prevNCShift ) ), L_min( N_MAX_SHIFT_CHANGE, Mpy_32_32( imult3216( input_Fs, N_MAX_SHIFT_CHANGE ), 67109 /* 1/32000.0f in Q31*/ ) ) ) )
+            IF( LE_32( abs_s( sub( currentNCShift, prevNCShift ) ), L_min( N_MAX_SHIFT_CHANGE, Mpy_32_32( imult3216( input_Fs, N_MAX_SHIFT_CHANGE ), 67109 /* 1/32000.0f in Q31*/ ) ) ) )
             {
                 adjustTargetSignal_fx( ( target_fx - tempS ), prevNCShift, currentNCShift, L_shift_adapt, 0 );
             }
@@ -1968,17 +1963,10 @@ void stereo_tca_enc_fx(
 
         Word16 temp_exp, tempF_16fx;
         Word16 scalar_value = BASOP_Util_Divide1616_Scale( currentNCShift, dsFactor, &temp_exp ); /* Q15-temp_exp */
-        IF( temp_exp < 0 )
-        {
-            scalar_value = shl( scalar_value, sub( temp_exp, Q3 ) );                                                                   // Q12
-            hStereoTCA->indx_ica_NCShift = usquant_fx( scalar_value, &tempF_16fx, 0, ONE_IN_Q11, ( 1 << STEREO_BITS_TCA_CORRSTATS ) ); /* Q0 */
-            move16();
-        }
-        ELSE
-        {
-            hStereoTCA->indx_ica_NCShift = usquant_fx( scalar_value, &tempF_16fx, 0, shl( 1, sub( 14, temp_exp ) ), ( 1 << STEREO_BITS_TCA_CORRSTATS ) ); /* Q0 */
-            move16();
-        }
+
+        scalar_value = shl_sat( scalar_value, sub( temp_exp, 5 ) );                                                                          /*Q10*/
+        hStereoTCA->indx_ica_NCShift = usquant_fx( scalar_value, &tempF_16fx, 0, 512 /* 0.5 in Q10 */, ( 1 << STEREO_BITS_TCA_CORRSTATS ) ); /* Q0 */
+
         tempF_fx = tempF_16fx;
         move32();
     }
@@ -2073,7 +2061,7 @@ void stereo_tca_enc_fx(
     {
         /* Scale the Right channel with the gain */
         Word16 j;
-        Word16 l_ica_ovl = NS2SA( input_Fs, STEREO_L_TCA_OVLP_NS );
+        Word16 l_ica_ovl = NS2SA_FX2( input_Fs, STEREO_L_TCA_OVLP_NS );
 
         Word16 winSlope = div_s( 1, l_ica_ovl ); // Q15
 
@@ -2100,6 +2088,10 @@ void stereo_tca_enc_fx(
         move16();
         sts[1]->q_inp32 = sub( sts[1]->q_inp32, 2 );
         move16();
+        sts[0]->q_old_inp32 = sub( sts[0]->q_old_inp32, 2 );
+        move16();
+        sts[1]->q_old_inp32 = sub( sts[1]->q_old_inp32, 2 );
+        move16();
     }
 
     /* update L/R DS memories */
@@ -2254,9 +2246,18 @@ static void unclr_calc_corr_features_fx(
         corrR = BASOP_Util_Add_Mant32Exp( corrR, corrR_exp, Mpy_32_32( buf2[i], mono_i ), add( sub( 31, q_com ), exp ), &corrR_exp ); /* Q31-corrR_exp */
         ener = BASOP_Util_Add_Mant32Exp( ener, ener_exp, Mpy_32_32( mono_i, mono_i ), shl( exp, 1 ), &ener_exp );
 
-        side_i = BASOP_Util_Add_Mant32Exp( L_shr( buf1[i], 1 ), sub( 31, q_com ), L_negate( L_shr( buf2[i], 1 ) ), sub( 31, q_com ), &exp );     /* Q31-exp */
-        ener_side = BASOP_Util_Add_Mant32Exp( ener_side, ener_side_exp, Mpy_32_32( side_i, side_i ), shl( exp, 1 ), &ener_side_exp );            /* Q31-ener_side_exp */
-        sum_prod = BASOP_Util_Add_Mant32Exp( sum_prod, sum_prod_exp, Mpy_32_32( buf1[i], buf2[i] ), sub( 62, shl( q_com, 1 ) ), &sum_prod_exp ); /* Q31-sum_prod_exp */
+        side_i = BASOP_Util_Add_Mant32Exp( L_shr( buf1[i], 1 ), sub( 31, q_com ), L_negate( L_shr( buf2[i], 1 ) ), sub( 31, q_com ), &exp ); /* Q31-exp */
+        ener_side = BASOP_Util_Add_Mant32Exp( ener_side, ener_side_exp, Mpy_32_32( side_i, side_i ), shl( exp, 1 ), &ener_side_exp );        /* Q31-ener_side_exp */
+
+        Word16 n1, n2, prod_i_exp;
+        Word32 x, y, prod_i;
+        n1 = norm_l( buf1[i] );
+        n2 = norm_l( buf2[i] );
+        x = L_shl( buf1[i], n1 );   // q: q_com + n1
+        y = L_shl( buf2[i], n2 );   // q: q_com + n2
+        prod_i = Mpy_32_32( x, y ); // q: q_com * 2 + n1 + n2 - 31
+        prod_i_exp = sub( 62, add( shl( q_com, 1 ), add( n1, n2 ) ) );
+        sum_prod = BASOP_Util_Add_Mant32Exp( sum_prod, sum_prod_exp, prod_i, prod_i_exp, &sum_prod_exp ); /* Q31-sum_prod_exp */
     }
 
     /* average energy of L and R channels */
@@ -2322,17 +2323,17 @@ static void unclr_calc_corr_features_fx(
         move32();
     }
 
-    hStereoClassif->unclr_fv_fx[E_corrEst0] = L_shl( corrEst[abs_s( lagSearchRange[0] )], sub( corrEst_exp, 16 ) ); /* Q15 */
+    hStereoClassif->unclr_fv_fx[E_corrEst0] = L_shl_sat( corrEst[abs_s( lagSearchRange[0] )], sub( corrEst_exp, 16 ) ); /* Q15 */
     move32();
-    hStereoClassif->unclr_fv_fx[E_corrEstMax] = L_shl( corrEstMax, sub( corrEst_exp, 16 ) ); /* Q15 */
+    hStereoClassif->unclr_fv_fx[E_corrEstMax] = L_shl_sat( corrEstMax, sub( corrEst_exp, 16 ) ); /* Q15 */
     move32();
-    hStereoClassif->unclr_fv_fx[E_corrLagMax] = L_shl( corrLagMax, 15 ); /* Q15 */
+    hStereoClassif->unclr_fv_fx[E_corrLagMax] = L_shl_sat( corrLagMax, 15 ); /* Q15 */
     move32();
-    hStereoClassif->xtalk_fv_fx[E_corrEst0] = L_shl( corrEst[abs_s( lagSearchRange[0] )], sub( corrEst_exp, 16 ) ); /* Q15 */
+    hStereoClassif->xtalk_fv_fx[E_corrEst0] = L_shl_sat( corrEst[abs_s( lagSearchRange[0] )], sub( corrEst_exp, 16 ) ); /* Q15 */
     move32();
-    hStereoClassif->xtalk_fv_fx[E_corrEstMax] = L_shl( corrEstMax, sub( corrEst_exp, 16 ) ); /* Q15 */
+    hStereoClassif->xtalk_fv_fx[E_corrEstMax] = L_shl_sat( corrEstMax, sub( corrEst_exp, 16 ) ); /* Q15 */
     move32();
-    hStereoClassif->xtalk_fv_fx[E_corrLagMax] = L_shl( corrLagMax, 15 ); /* Q15 */
+    hStereoClassif->xtalk_fv_fx[E_corrLagMax] = L_shl_sat( corrLagMax, 15 ); /* Q15 */
     move32();
 
     /* L/M and R/M correlation */
@@ -2348,14 +2349,14 @@ static void unclr_calc_corr_features_fx(
         move32();
     }
 
-    ic_Lm = BASOP_Util_Divide3232_Scale_cadence( corrL, ener, &exp1 ); /* Q31-exp1 */
+    ic_Lm = BASOP_Util_Divide3232_Scale_newton( corrL, ener, &exp1 ); /* Q31-exp1 */
     exp1 = add( exp1, sub( corrL_exp, ener_exp ) );
-    ic_Rm = BASOP_Util_Divide3232_Scale_cadence( corrR, ener, &exp2 ); /* Q31-exp2 */
+    ic_Rm = BASOP_Util_Divide3232_Scale_newton( corrR, ener, &exp2 ); /* Q31-exp2 */
     exp2 = add( exp2, sub( corrR_exp, ener_exp ) );
 
     m_corrL_corrR = L_sub( L_max( L_abs( L_shl( ic_Lm, sub( exp1, s_max( exp1, exp2 ) ) ) ), L_abs( L_shl( ic_Rm, sub( exp2, s_max( exp1, exp2 ) ) ) ) ), L_min( L_abs( L_shl( ic_Lm, sub( exp1, s_max( exp1, exp2 ) ) ) ), L_abs( L_shl( ic_Rm, sub( exp2, s_max( exp1, exp2 ) ) ) ) ) ); // s_max(exp1, exp2)
 
-    inp1 = BASOP_Util_Add_Mant32Exp( corrL, corrL_exp, corrR, corrR_exp, &exp ); /* Q31-exp */
+    inp1 = BASOP_Util_Add_Mant32Exp( corrL, corrL_exp, L_negate( corrR ), corrR_exp, &exp ); /* Q31-exp */
     IF( inp1 )
     {
         d_corrL_corrR = BASOP_Util_Log10( L_abs( inp1 ), exp ); // Q25
@@ -2408,7 +2409,7 @@ static void unclr_calc_corr_features_fx(
     }
     ELSE
     {
-        *corrEst_ncorr = BASOP_Util_Divide3232_Scale_cadence( num, den, &exp ); /* Q31-corrEst_ncorr_exp */
+        *corrEst_ncorr = BASOP_Util_Divide3232_Scale_newton( num, den, &exp ); /* Q31-corrEst_ncorr_exp */
         *corrEst_ncorr_exp = add( exp, sub( num_exp, den_exp ) );
         move32();
         move16();
diff --git a/lib_enc/ivas_stereo_icbwe_enc.c b/lib_enc/ivas_stereo_icbwe_enc_fx.c
similarity index 84%
rename from lib_enc/ivas_stereo_icbwe_enc.c
rename to lib_enc/ivas_stereo_icbwe_enc_fx.c
index f21cf35313ab055afb5b42b41286e8d1aeab7c74..eba30f7621eb97cad131d197a949d7d98704f5ee 100644
--- a/lib_enc/ivas_stereo_icbwe_enc.c
+++ b/lib_enc/ivas_stereo_icbwe_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,12 +35,10 @@
 #include <math.h>
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "wmc_auto.h"
 #include "rom_com.h"
 #include "ivas_rom_com.h"
-#include "prot_fx.h"
 
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
@@ -104,14 +102,15 @@ static Word16 ic_bwe_enc_specMapping_ivas_fx(
     const Word32 *shb_frame_target_fx, /* i  : target shb                   Q31-shb_frame_target_e*/
     Word16 shb_frame_target_e,
     Word32 *shb_synth_nonref_fx, /* o  : non-ref shb synth                   Q31-shb_synth_nonref_e*/
-    Word16 shb_synth_nonref_e,
+    Word16 *shb_synth_nonref_e,
     Word32 *specMapping_fx,       /* i/o: current frame's mapping             Qx*/
-    Word32 *memShbSpecMapping_fx, /* i/o: current frame's mapping             Qx*/
-    Word32 *memShbSpecXcorr_fx,   /* i/o: ic bwe spec mapping scorr memory    Q31-memShbSpecXcorr_e*/
+    Word32 *memShbSpecMapping_fx, /* i/o: current frame's mapping             Q31-memShbSpecMapping_e*/
+    Word16 *memShbSpecMapping_e,
+    Word32 *memShbSpecXcorr_fx, /* i/o: ic bwe spec mapping scorr memory    Q31-memShbSpecXcorr_e*/
     Word16 *memShbSpecXcorr_e )
 {
     Word16 idx;
-
+    Word16 max_exp;
     Word16 Txx1_fx = 0, Txx2_fx = 0, Txx3_fx = 0, T_desired_fx = 0;
     Word16 Txx1_e = 0, Txx2_e = 0, Txx3_e = 0, T_desired_e = 0;
     Word16 T_nonref_target_fx, temp_fx;
@@ -138,10 +137,10 @@ static Word16 ic_bwe_enc_specMapping_ivas_fx(
     temp11_fx = dotp_fixed_ivas_fx( shb_frame_target_fx, shb_frame_target_e, shb_frame_target_fx + 1, shb_frame_target_e, L_FRAME16k - 1, &temp11_exp ); /* Q31-temp1_exp */
 
     /* Calculate rxx(1)/rxx(0) of the non ref synth */
-    temp0_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, shb_synth_nonref_e, shb_synth_nonref_fx, shb_synth_nonref_e, L_FRAME16k - 3, &temp0_exp );     /* Q31-temp0_exp */
-    temp1_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, shb_synth_nonref_e, shb_synth_nonref_fx + 1, shb_synth_nonref_e, L_FRAME16k - 3, &temp1_exp ); /* Q31-temp1_exp */
-    temp2_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, shb_synth_nonref_e, shb_synth_nonref_fx + 2, shb_synth_nonref_e, L_FRAME16k - 3, &temp2_exp ); /* Q31-temp2_exp */
-    temp3_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, shb_synth_nonref_e, shb_synth_nonref_fx + 3, shb_synth_nonref_e, L_FRAME16k - 3, &temp3_exp ); /* Q31-temp3_exp */
+    temp0_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx, *shb_synth_nonref_e, L_FRAME16k - 3, &temp0_exp );     /* Q31-temp0_exp */
+    temp1_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 1, *shb_synth_nonref_e, L_FRAME16k - 3, &temp1_exp ); /* Q31-temp1_exp */
+    temp2_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 2, *shb_synth_nonref_e, L_FRAME16k - 3, &temp2_exp ); /* Q31-temp2_exp */
+    temp3_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 3, *shb_synth_nonref_e, L_FRAME16k - 3, &temp3_exp ); /* Q31-temp3_exp */
 
     exp = s_max( *memShbSpecXcorr_e, s_max( s_max( s_max( temp00_exp, temp11_exp ), s_max( temp0_exp, temp1_exp ) ), s_max( temp2_exp, temp3_exp ) ) );
 
@@ -219,8 +218,11 @@ static Word16 ic_bwe_enc_specMapping_ivas_fx(
 
     u_fx = extract_l( *specMapping_fx );
 
-    tmp = mult( b_fx, b_fx );  // b_e  + b_e;
-    tmp1 = mult( a_fx, c_fx ); // a_e + c_e + 2
+
+    /* while performing (-32768)*(-32768), overflow occurs because the result comes out as 32768 after mult. This is the only case for mult where overflow happens. In order to avoid this scenario mult_sat is used */
+
+    tmp = mult_sat( b_fx, b_fx );  // b_e  + b_e;
+    tmp1 = mult_sat( a_fx, c_fx ); // a_e + c_e + 2
 
     exp = BASOP_Util_Add_MantExp( tmp, add( b_e, b_e ), tmp1, add( a_e, add( c_e, 2 ) ), &temp_fx ); /* Q15-exp */
     test();
@@ -286,12 +288,23 @@ static Word16 ic_bwe_enc_specMapping_ivas_fx(
 
     /* Quantize spec. mapping **/
     Word16 specMapping16;
-    idx = usquant_fx( shr( u_fx, sub( 0, u_e ) ), &specMapping16, -19660, 6553, ( 1 << STEREO_ICBWE_SPBITS ) ); // -0.6 in in Q15 -> -19660, 0.2 in Q15 -> 6553
+    idx = usquant_fx( shr( u_fx, sub( 0, u_e ) ), &specMapping16, -19660, 6553 >> 1, ( 1 << STEREO_ICBWE_SPBITS ) ); // -0.6 in in Q15 -> -19660, 0.2 in Q15 -> 6553
     *specMapping_fx = L_deposit_h( specMapping16 );
     move32();
 
+    max_exp = s_max( sub( *memShbSpecMapping_e, norm_l( *memShbSpecMapping_fx ) ), *shb_synth_nonref_e );
+
+    *memShbSpecMapping_fx = L_shl( *memShbSpecMapping_fx, sub( *memShbSpecMapping_e, max_exp ) ); // max_exp
+    move32();
+    *memShbSpecMapping_e = max_exp;
+    move16();
+
+    scale_sig32( shb_synth_nonref_fx, L_FRAME16k, sub( *shb_synth_nonref_e, max_exp ) ); // max_exp
+    *shb_synth_nonref_e = max_exp;
+    move16();
+
     /* IC-BWE spec mapping */
-    deemph_fx_32( 0, shb_synth_nonref_fx, extract_h( *specMapping_fx ), L_FRAME16k, memShbSpecMapping_fx );
+    deemph_fx_32( shb_synth_nonref_fx, specMapping16, L_FRAME16k, memShbSpecMapping_fx ); // shb_synth_nonref_e
 
     return idx;
 }
@@ -347,15 +360,13 @@ static Word16 ic_bwe_enc_gsMapping_ivas_fx(
         temp2_fx32 = BASOP_Util_Add_Mant32Exp( temp2_fx32, temp2_exp, L_abs( synthSHB_nonref_fx[i] ), exp2, &temp2_exp );         /* Q31-temp2_exp */
     }
 
-
-    memEner_fx[0] = temp1_fx32;                                                /* Q31-temp1_exp */
-    memEner_fx[1] = L_shr( temp2_fx32, abs_s( sub( temp1_exp, temp2_exp ) ) ); /* Q31-temp1_exp */
+    memEner_fx[0] = L_shr( temp1_fx32, sub( s_max( temp1_exp, temp2_exp ), temp1_exp ) );
+    memEner_fx[1] = L_shr( temp2_fx32, sub( s_max( temp1_exp, temp2_exp ), temp2_exp ) );
     move32();
     move32();
     *memEner_e = s_max( temp1_exp, temp2_exp );
     move16();
 
-
     IF( temp2_fx32 == 0 )
     {
         *gsMapping_fx = *gsMapping_fx;
@@ -364,7 +375,7 @@ static Word16 ic_bwe_enc_gsMapping_ivas_fx(
     ELSE
     {
         L_mult = Mpy_32_32( relG_targ_fx, temp1_fx32 );                  // relG_targ_e + temp1_e
-        temp1 = BASOP_Util_Divide3232_Scale( L_mult, temp1_fx32, &exp ); // exp = exp - ( relG_targ_e + temp1_e + temp2_e )
+        temp1 = BASOP_Util_Divide3232_Scale( L_mult, temp2_fx32, &exp ); // exp = exp - ( relG_targ_e + temp1_e - temp2_e )
         exp = add( exp, sub( add( relG_targ_e, temp1_exp ), temp2_exp ) );
         *gsMapping_fx = L_deposit_h( temp1 ); // exp
         move32();
@@ -374,23 +385,44 @@ static Word16 ic_bwe_enc_gsMapping_ivas_fx(
     /* quantize the IC-BWE GS mapping*/
     IF( EQ_16( element_mode, IVAS_CPE_TD ) )
     {
-        temp2_fx = extract_l( L_shr( temp2_fx32, Q10 ) ); // Q15
+        IF( LT_32( temp2_fx32, -( 2 << 25 ) ) )
+        {
+            temp2_fx = -( 2 << 12 ); // Q12
+            move16();
+        }
+        ELSE IF( GT_32( temp2_fx32, 1 << 25 ) )
+        {
+            temp2_fx = 1 << 12; // Q12
+            move16();
+        }
+
+        temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12
         gsMapping_fx16 = 0;
         move16();
         idx = squant_fx( temp2_fx, &gsMapping_fx16, icbwe_gsMapping_tbl_fx, ( 1 << STEREO_ICBWE_GSBITS ) ); // Q12
-        // idx = squant_fx( temp2, gsMapping, icbwe_gsMapping_tbl_fx, 1 << STEREO_ICBWE_GSBITS );
     }
     ELSE
     {
-        temp2_fx = extract_l( L_shr( temp2_fx32, Q10 ) ); // Q15
+        IF( LT_32( temp2_fx32, -( 5 << 25 ) ) )
+        {
+            temp2_fx = -( 5 << 12 ); // Q12
+            move16();
+        }
+        ELSE IF( GT_32( temp2_fx32, 1 << 25 ) )
+        {
+            temp2_fx = 1 << 12; // Q12
+            move16();
+        }
+
+        temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12
         gsMapping_fx16 = 0;
         move16();
-        idx = squant_fx( temp2_fx, &gsMapping_fx16, icbwe_gsMappingDFT_tbl_fx, ( 1 << STEREO_ICBWE_GSBITS ) ); // Q12
+        idx = squant_fx( temp2_fx, &gsMapping_fx16, icbwe_gsMappingDFT_tbl_fx, ( 1 << STEREO_ICBWE_GSBITS_DFT ) ); // Q12
     }
     *gsMapping_fx = L_deposit_h( gsMapping_fx16 ); // Q28
     move32();
     Word16 e;
-    L_mult = Mult_32_16( *gsMapping_fx, 27213 /*=log2(10)*2^13*/ ); // Q27 + Q13 - Q15 -> Q26
+    L_mult = Mult_32_16( *gsMapping_fx, 27213 /*=log2(10)*2^13*/ ); // Q28 + Q13 - Q15 -> Q26
     *gsMapping_fx = BASOP_util_Pow2( L_mult, 5, &e );               /* Q31-e */
     move32();
 
@@ -409,7 +441,7 @@ static void icbwe_dft_stereo_param_ivas_fx(
     STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i  : */
     Encoder_State *st,                     /* i/o: */
     Word32 *shb_synth_nonref_fx,           /* i/o: Q31-shb_synth_nonref_e*/
-    Word16 shb_synth_nonref_e              /* i/o: */
+    Word16 *shb_synth_nonref_e             /* i/o: */
 )
 {
     Word16 slopeILD_fx;
@@ -419,7 +451,7 @@ static void icbwe_dft_stereo_param_ivas_fx(
     Word32 *nrg_L_fx, *nrg_R_fx, *nrg_DMX_fx;
     Word32 sum_nrg_L_fx, sum_nrg_R_fx, sum_nrg_DMX_fx;
     const Word32 spec_table_fx[4] = { -1288490189, -858993459, -429496730, 0 }; // Q31
-    const Word16 slope_table_fx16[4] = { -17788, -10577, -4822, 0 };            // Q13
+    const Word16 slope_table_fx16[4] = { -278, -165, -75, 0 };                  // Q7
 
     BSTR_ENC_HANDLE hBstr = st->hBstr;
     normFac_fx = 1342177280; /* 1000 * (10/((14400+10400)/2 - (6400+10400)/2)) */ // Q29
@@ -429,25 +461,24 @@ static void icbwe_dft_stereo_param_ivas_fx(
     nrg_R_fx = hStereoDft->nrg_R_fx;
     nrg_DMX_fx = hStereoDft->nrg_DMX_fx;
 
-
-    hStereoICBWE->mem_nrg_L_fx[0] = nrg_L_fx[0];                                                                                        // hStereoICBWE->nrg_L_fx_e[0]
-    hStereoICBWE->mem_nrg_R_fx[0] = nrg_R_fx[0];                                                                                        // hStereoICBWE->nrg_R_fx_e[0]
-    hStereoICBWE->mem_nrg_DMX_fx[0] = nrg_DMX_fx[0];                                                                                    // hStereoICBWE->nrg_DMX_fx_e[0]
-    hStereoICBWE->mem_nrg_L_fx[1] = L_shr( nrg_L_fx[1], abs_s( sub( hStereoDft->nrg_L_fx_e[0], hStereoDft->nrg_L_fx_e[1] ) ) );         // hStereoICBWE->nrg_L_fx_e[1]
-    hStereoICBWE->mem_nrg_R_fx[1] = L_shr( nrg_R_fx[1], abs_s( sub( hStereoDft->nrg_R_fx_e[0], hStereoDft->nrg_R_fx_e[1] ) ) );         // hStereoICBWE-> nrg_R_fx_e[1]
-    hStereoICBWE->mem_nrg_DMX_fx[1] = L_shr( nrg_DMX_fx[1], abs_s( sub( hStereoDft->nrg_DMX_fx_e[0], hStereoDft->nrg_DMX_fx_e[1] ) ) ); // hStereoICBWE->nrg_DMX_fx_e[1]
-    move32();
-    move32();
-    move32();
-    move32();
-    move32();
-    move32();
     hStereoICBWE->mem_nrg_L_fx_e = s_max( hStereoDft->nrg_L_fx_e[0], hStereoDft->nrg_L_fx_e[1] );
     hStereoICBWE->mem_nrg_R_fx_e = s_max( hStereoDft->nrg_R_fx_e[0], hStereoDft->nrg_R_fx_e[1] );
     hStereoICBWE->mem_nrg_DMX_fx_e = s_max( hStereoDft->nrg_DMX_fx_e[0], hStereoDft->nrg_DMX_fx_e[1] );
     move16();
     move16();
     move16();
+    hStereoICBWE->mem_nrg_L_fx[0] = L_shr( nrg_L_fx[0], sub( hStereoICBWE->mem_nrg_L_fx_e, hStereoDft->nrg_L_fx_e[0] ) );
+    hStereoICBWE->mem_nrg_R_fx[0] = L_shr( nrg_R_fx[0], sub( hStereoICBWE->mem_nrg_R_fx_e, hStereoDft->nrg_R_fx_e[0] ) );
+    hStereoICBWE->mem_nrg_DMX_fx[0] = L_shr( nrg_DMX_fx[0], sub( hStereoICBWE->mem_nrg_DMX_fx_e, hStereoDft->nrg_DMX_fx_e[0] ) );
+    hStereoICBWE->mem_nrg_L_fx[1] = L_shr( nrg_L_fx[1], sub( hStereoICBWE->mem_nrg_L_fx_e, hStereoDft->nrg_L_fx_e[1] ) );
+    hStereoICBWE->mem_nrg_R_fx[1] = L_shr( nrg_R_fx[1], sub( hStereoICBWE->mem_nrg_R_fx_e, hStereoDft->nrg_R_fx_e[1] ) );
+    hStereoICBWE->mem_nrg_DMX_fx[1] = L_shr( nrg_DMX_fx[1], sub( hStereoICBWE->mem_nrg_DMX_fx_e, hStereoDft->nrg_DMX_fx_e[1] ) );
+    move32();
+    move32();
+    move32();
+    move32();
+    move32();
+    move32();
 
     Word16 sum_nrg_L_e = hStereoICBWE->mem_nrg_L_fx_e, sum_nrg_R_e = hStereoICBWE->mem_nrg_R_fx_e, sum_nrg_DMX_e = hStereoICBWE->mem_nrg_DMX_fx_e;
     sum_nrg_L_fx = sum_32_fx( hStereoICBWE->mem_nrg_L_fx, 2, &sum_nrg_L_e );       // hStereoICBWE->mem_nrg_L_fx_e
@@ -486,6 +517,7 @@ static void icbwe_dft_stereo_param_ivas_fx(
     IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, WB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && EQ_16( st->flag_ACELP16k, 1 ) )
     {
         /* Spec Mapping Estimate */
+        Word16 max_exp;
         Word16 tmp1, exp1;
         Word32 L_tmp, L_tmp1;
         L_tmp = Mpy_32_32( hStereoICBWE->mem_nrg_L_fx[1], hStereoICBWE->mem_nrg_R_fx[0] );  // hStereoICBWE->mem_nrg_L_fx_e[1] + hStereoICBWE->mem_nrg_R_fx_e[1]
@@ -508,11 +540,25 @@ static void icbwe_dft_stereo_param_ivas_fx(
         }
 
         hStereoICBWE->prevSpecMapping_fx = spec_table_fx[spIndx]; // q31
+
+        max_exp = s_max( *shb_synth_nonref_e, sub( hStereoICBWE->memShbSpecMapping_e, norm_l( hStereoICBWE->memShbSpecMapping_fx ) ) );
+
+        hStereoICBWE->memShbSpecMapping_fx = L_shl( hStereoICBWE->memShbSpecMapping_fx, sub( hStereoICBWE->memShbSpecMapping_e, max_exp ) ); // max_exp
+        move32();
+        hStereoICBWE->memShbSpecMapping_e = max_exp;
+        move16();
+
+        scale_sig32( shb_synth_nonref_fx, L_FRAME16k, sub( *shb_synth_nonref_e, max_exp ) );
+        *shb_synth_nonref_e = max_exp;
+        move16();
+
         /* ic bwe spec mapping application */
-        deemph_fx_32( 0, shb_synth_nonref_fx, extract_l( L_shr( hStereoICBWE->prevSpecMapping_fx, 16 ) ), L_FRAME16k, &hStereoICBWE->memShbSpecMapping_fx ); // shb_synth_nonref_e
+        deemph_fx_32( shb_synth_nonref_fx, extract_h( hStereoICBWE->prevSpecMapping_fx ), L_FRAME16k, &hStereoICBWE->memShbSpecMapping_fx ); // shb_synth_nonref_e
     }
     ELSE
     {
+        hStereoICBWE->memShbSpecMapping_e = 0;
+        move16();
         hStereoICBWE->memShbSpecMapping_fx = 0;
         hStereoICBWE->prevSpecMapping_fx = 0;
         move32();
@@ -549,7 +595,7 @@ static void icbwe_dft_stereo_param_ivas_fx(
     move32();
     move16();
 
-    gsIndx = ic_bwe_enc_gsMapping_ivas_fx( hStereoICBWE->gDes_pastFrame_fx, hStereoICBWE->gDes_pastFrame_e, hStereoICBWE->shbSynthRef_fx, hStereoICBWE->shbSynthRef_e, shb_synth_nonref_fx, &shb_synth_nonref_e, &( hStereoICBWE->prevgsMapping_fx ), &( hStereoICBWE->prevgsMapping_e ), hStereoICBWE->memGsEnerMap_fx, &hStereoICBWE->memGsEnerMap_e, st->element_mode ); /* Q0 */
+    gsIndx = ic_bwe_enc_gsMapping_ivas_fx( hStereoICBWE->gDes_pastFrame_fx, hStereoICBWE->gDes_pastFrame_e, hStereoICBWE->shbSynthRef_fx, hStereoICBWE->shbSynthRef_e, shb_synth_nonref_fx, shb_synth_nonref_e, &( hStereoICBWE->prevgsMapping_fx ), &( hStereoICBWE->prevgsMapping_e ), hStereoICBWE->memGsEnerMap_fx, &hStereoICBWE->memGsEnerMap_e, st->element_mode ); /* Q0 */
 
     hStereoICBWE->gDes_pastFrame_fx = L_deposit_h( gDes_fx ); /* Q31-exp */
     hStereoICBWE->gDes_pastFrame_e = exp;
@@ -664,7 +710,7 @@ void stereo_icBWE_enc_ivas_fx(
         Copy_Scale_sig( hStereoICBWE->mem_shb_speech_ref_fx, hStereoICBWE->mem_shb_speech_ref_fx, L_LOOK_16k, negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ) ); // mem_shb_speech_ref_e
 
         set32_fx( shb_frame_ref_fx, 0, L_LOOK_16k + L_FRAME16k );
-        Copy_Scale_sig_16_32( hStereoICBWE->mem_shb_speech_ref_fx, shb_frame_ref_fx, L_LOOK_16k, 0 );                        // Q = 15 - mem_shb_speech_ref_e
+        Copy_Scale_sig_16_32_DEPREC( hStereoICBWE->mem_shb_speech_ref_fx, shb_frame_ref_fx, L_LOOK_16k, 0 );                 // Q = 15 - mem_shb_speech_ref_e
         scale_sig32( shb_frame_ref_fx, L_LOOK_16k, add( negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ), Q16 ) ); // Q = 31 - mem_shb_speech_ref_e
 
         hStereoICBWE->mem_shb_speech_ref_e = max_e;
@@ -692,6 +738,8 @@ void stereo_icBWE_enc_ivas_fx(
                 v_multc_fixed( voice_factors_fx, 1073741824, nlMixFac_fx, NB_SUBFR16k ); // Q31, 0.5 in Q31 -> 1073741824
             }
 
+            Word16 L_FRAME16k_by_nbSubFr = L_FRAME16k / NB_SUBFR;
+            move16();
             IF( st->flag_ACELP16k == 0 )
             {
                 nbSubFr = NB_SUBFR;
@@ -701,6 +749,8 @@ void stereo_icBWE_enc_ivas_fx(
             {
                 nbSubFr = NB_SUBFR16k;
                 move16();
+                L_FRAME16k_by_nbSubFr = L_FRAME16k / NB_SUBFR16k;
+                move16();
             }
 
             Word16 exp_buf[L_FRAME16k];
@@ -728,11 +778,9 @@ void stereo_icBWE_enc_ivas_fx(
                     temp2_fx = Sqrt32( L_sub( ONE_IN_Q31, nlMixFac_fx[i] ), &temp2_e ); /* Q31-temp2_e */
                 }
 
-                tmp = BASOP_Util_Divide1616_Scale( L_FRAME16k, nbSubFr, &exp ); /* Q15-exp */
-                tmp = shr( tmp, sub( Q15, exp ) );                              /* Q0 */
-                FOR( j = 0; j < tmp; ( j++, k++ ) )
+                FOR( j = 0; j < L_FRAME16k_by_nbSubFr; ( j++, k++ ) )
                 {
-                    excSHB_nonref_fx[k] = extract_l( BASOP_Util_Add_Mant32Exp( Mpy_32_32( temp1_fx, hStereoICBWE->nlExc16k_fx[k] ), add( temp1_e, hStereoICBWE->nlExc16k_e ), Mpy_32_32( temp2_fx, hStereoICBWE->mixExc16k_fx[k] ), add( temp2_e, hStereoICBWE->mixExc16k_e ), &exp_buf[k] ) ); /* Q31-exp_buf */
+                    excSHB_nonref_fx[k] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( temp1_fx, L_deposit_h( hStereoICBWE->nlExc16k_fx[k] ) ), add( temp1_e, hStereoICBWE->nlExc16k_e ), Mpy_32_32( temp2_fx, L_deposit_h( hStereoICBWE->mixExc16k_fx[k] ) ), add( temp2_e, hStereoICBWE->mixExc16k_e ), &exp_buf[k] ); /* Q31-exp_buf */
                     move32();
                 }
             }
@@ -754,19 +802,13 @@ void stereo_icBWE_enc_ivas_fx(
                 move32();
             }
             /* LP synthesis */
-            Word16 tmp_e = s_max( hCPE->hStereoICBWE->lpSHBRef_e, max_e );
 
-            Word32 lpSHBRef_fx32[LPC_SHB_ORDER + 1];
+            Copy_Scale_sig32( hStereoICBWE->mem_lpc_shbsynth_nonref_fx, hStereoICBWE->mem_lpc_shbsynth_nonref_fx, LPC_SHB_ORDER, sub( hStereoICBWE->mem_lpc_shbsynth_nonref_e, s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e ) ) ); /* Q31-tmp_e */
+            Copy_Scale_sig32( excSHB_nonref_fx, excSHB_nonref_fx, L_FRAME16k, sub( max_e, s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e ) ) );                                                                                      /* Q31-tmp_e */
+            max_e = s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e );
+            hStereoICBWE->mem_lpc_shbsynth_nonref_e = s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e );
 
-            Copy_Scale_sig32( hCPE->hStereoICBWE->lpSHBRef_fx, lpSHBRef_fx32, LPC_SHB_ORDER + 1, negate( sub( tmp_e, hCPE->hStereoICBWE->lpSHBRef_e ) ) ); /* Q31-tmp_e */
-            Copy_Scale_sig32( excSHB_nonref_fx, excSHB_nonref_fx, L_FRAME16k, negate( sub( tmp_e, max_e ) ) );                                             /* Q31-tmp_e */
-            // set32_fx( hStereoICBWE->mem_lpc_shbsynth_nonref_fx, 0, LPC_SHB_ORDER );
-            E_UTIL_synthesis_fx( 0, lpSHBRef_fx32, excSHB_nonref_fx, shb_synth_nonref_fx, L_FRAME16k, hStereoICBWE->mem_lpc_shbsynth_nonref_fx, 1, LPC_SHB_ORDER );
-
-            shb_synth_nonref_e = tmp_e;
-            hStereoICBWE->mem_lpc_shbsynth_nonref_e = tmp_e;
-            move16();
-            move16();
+            syn_filt_fx32( hStereoICBWE->lpSHBRef_e, hStereoICBWE->lpSHBRef_fx, LPC_SHB_ORDER, excSHB_nonref_fx, max_e, shb_synth_nonref_fx, &shb_synth_nonref_e, L_FRAME16k, hStereoICBWE->mem_lpc_shbsynth_nonref_fx, &hStereoICBWE->mem_lpc_shbsynth_nonref_e, 1 );
         }
         ELSE
         {
@@ -777,11 +819,11 @@ void stereo_icBWE_enc_ivas_fx(
             shb_synth_nonref_e = shb_frame_ref_e;
             move16();
             set32_fx( hStereoICBWE->mem_lpc_shbsynth_nonref_fx, 0, 10 );
+            hStereoICBWE->mem_lpc_shbsynth_nonref_e = 0;
+            move16();
         }
 
-        icbwe_dft_stereo_param_ivas_fx( hStereoICBWE, hStereoDft, st, shb_synth_nonref_fx, shb_synth_nonref_e );
-        hStereoICBWE->memShbSpecMapping_e = shb_synth_nonref_e;
-        move16();
+        icbwe_dft_stereo_param_ivas_fx( hStereoICBWE, hStereoDft, st, shb_synth_nonref_fx, &shb_synth_nonref_e );
     }
     ELSE
     {
@@ -790,8 +832,7 @@ void stereo_icBWE_enc_ivas_fx(
         Copy_Scale_sig( hStereoICBWE->mem_shb_speech_ref_fx, hStereoICBWE->mem_shb_speech_ref_fx, L_LOOK_16k, negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ) ); // mem_shb_speech_ref_e
 
         set32_fx( shb_frame_ref_fx, 0, L_LOOK_16k + L_FRAME16k );
-        Copy_Scale_sig_16_32( hStereoICBWE->mem_shb_speech_ref_fx, shb_frame_ref_fx, L_LOOK_16k, add( negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ), Q16 ) ); // mem_shb_speech_ref_e
-
+        Copy_Scale_sig_16_32_no_sat( hStereoICBWE->mem_shb_speech_ref_fx, shb_frame_ref_fx, L_LOOK_16k, add( negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ), Q16 ) ); // mem_shb_speech_ref_e
         hStereoICBWE->mem_shb_speech_ref_e = max_e;
         shb_frame_ref_e = max_e;
         move16();
@@ -804,10 +845,8 @@ void stereo_icBWE_enc_ivas_fx(
         set32_fx( shb_frame_nonref_fx, 0, L_LOOK_16k + L_FRAME16k );
 
         max_e = s_max( hStereoICBWE->mem_shb_speech_nonref_e, shb_speech_nonref_e );
-        Copy_Scale_sig( hStereoICBWE->mem_shb_speech_nonref_fx, hStereoICBWE->mem_shb_speech_nonref_fx, L_LOOK_16k, negate( sub( max_e, hStereoICBWE->mem_shb_speech_nonref_e ) ) ); // mem_shb_speech_ref_e
-
-        Copy_Scale_sig_16_32( hStereoICBWE->mem_shb_speech_nonref_fx, shb_frame_nonref_fx, L_LOOK_16k, add( negate( sub( max_e, hStereoICBWE->mem_shb_speech_nonref_e ) ), Q16 ) ); // mem_shb_speech_ref_e
-
+        Copy_Scale_sig( hStereoICBWE->mem_shb_speech_nonref_fx, hStereoICBWE->mem_shb_speech_nonref_fx, L_LOOK_16k, negate( sub( max_e, hStereoICBWE->mem_shb_speech_nonref_e ) ) );       // mem_shb_speech_ref_e
+        Copy_Scale_sig_16_32_no_sat( hStereoICBWE->mem_shb_speech_nonref_fx, shb_frame_nonref_fx, L_LOOK_16k, add( negate( sub( max_e, hStereoICBWE->mem_shb_speech_nonref_e ) ), Q16 ) ); // mem_shb_speech_ref_e
         hStereoICBWE->mem_shb_speech_nonref_e = max_e;
         shb_frame_nonref_e = max_e;
         move16();
@@ -842,6 +881,8 @@ void stereo_icBWE_enc_ivas_fx(
         IF( ( NE_16( hStereoICBWE->prev_refChanIndx_bwe, hStereoICBWE->refChanIndx_bwe ) ) || NE_16( st->last_extl, st->extl ) || NE_16( st->flag_ACELP16k, 1 ) )
         {
             hStereoICBWE->prevSpecMapping_fx = 0;
+            hStereoICBWE->memShbSpecMapping_e = 0;
+            move16();
             hStereoICBWE->memShbSpecMapping_fx = 0;
             move32();
             move32();
@@ -911,6 +952,8 @@ void stereo_icBWE_enc_ivas_fx(
                 v_multc_fixed( voice_factors_fx, 1073741824 /*0.5 in Q31*/, nlMixFac_fx, NB_SUBFR16k ); /* Q31 */
             }
 
+            Word16 L_FRAME16k_by_nbSubFr = L_FRAME16k / NB_SUBFR;
+            move16();
             IF( st->flag_ACELP16k == 0 )
             {
                 nbSubFr = NB_SUBFR;
@@ -920,6 +963,8 @@ void stereo_icBWE_enc_ivas_fx(
             {
                 nbSubFr = NB_SUBFR16k;
                 move16();
+                L_FRAME16k_by_nbSubFr = L_FRAME16k / NB_SUBFR16k;
+                move16();
             }
 
             Word16 exp_buf[L_FRAME16k];
@@ -944,13 +989,13 @@ void stereo_icBWE_enc_ivas_fx(
                     temp1_e = 0, temp2_e = 0;
                     temp1_fx = Sqrt32( nlMixFac_fx[i], &temp1_e );                      /* Q31-temp1_e */
                     temp2_fx = Sqrt32( L_sub( ONE_IN_Q31, nlMixFac_fx[i] ), &temp2_e ); /* Q31 */
-                    move32();
+                    move16();
                     move16();
                 }
 
-                FOR( j = 0; j < ( L_FRAME16k / nbSubFr ); ( j++, k++ ) )
+                FOR( j = 0; j < L_FRAME16k_by_nbSubFr; ( j++, k++ ) )
                 {
-                    excSHB_nonref_fx[k] = extract_l( BASOP_Util_Add_Mant32Exp( Mpy_32_32( temp1_fx, hStereoICBWE->nlExc16k_fx[k] ), temp1_e + hStereoICBWE->nlExc16k_e, Mpy_32_32( temp2_fx, hStereoICBWE->mixExc16k_fx[k] ), temp2_e + hStereoICBWE->mixExc16k_e, &exp_buf[k] ) ); /* Q31-exp_buf */
+                    excSHB_nonref_fx[k] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( temp1_fx, L_deposit_h( hStereoICBWE->nlExc16k_fx[k] ) ), add( temp1_e, hStereoICBWE->nlExc16k_e ), Mpy_32_32( temp2_fx, L_deposit_h( hStereoICBWE->mixExc16k_fx[k] ) ), add( temp2_e, hStereoICBWE->mixExc16k_e ), &exp_buf[k] ); /* Q31-exp_buf */
                     move32();
                 }
             }
@@ -972,18 +1017,12 @@ void stereo_icBWE_enc_ivas_fx(
                 move32();
             }
             /* LP synthesis */
+            Copy_Scale_sig32( hStereoICBWE->mem_lpc_shbsynth_nonref_fx, hStereoICBWE->mem_lpc_shbsynth_nonref_fx, LPC_SHB_ORDER, sub( hStereoICBWE->mem_lpc_shbsynth_nonref_e, s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e ) ) ); /* Q31-tmp_e */
+            Copy_Scale_sig32( excSHB_nonref_fx, excSHB_nonref_fx, L_FRAME16k, sub( max_e, s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e ) ) );                                                                                      /* Q31-tmp_e */
+            max_e = s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e );
+            hStereoICBWE->mem_lpc_shbsynth_nonref_e = s_max( hStereoICBWE->mem_lpc_shbsynth_nonref_e, max_e );
 
-            Word16 tmp_e = s_max( hCPE->hStereoICBWE->lpSHBRef_e, max_e );
-
-            Word32 lpSHBRef_fx32[LPC_SHB_ORDER + 1];
-
-            Copy_Scale_sig32( hCPE->hStereoICBWE->lpSHBRef_fx, lpSHBRef_fx32, LPC_SHB_ORDER + 1, negate( sub( tmp_e, hCPE->hStereoICBWE->lpSHBRef_e ) ) ); /* Q31-tmp_e */
-            Copy_Scale_sig32( excSHB_nonref_fx, excSHB_nonref_fx, L_FRAME16k, negate( sub( tmp_e, max_e ) ) );                                             /* Q31-tmp_e */
-
-            E_UTIL_synthesis_fx( 0, hStereoICBWE->lpSHBRef_fx, excSHB_nonref_fx, shb_synth_nonref_fx, L_FRAME16k, hStereoICBWE->mem_lpc_shbsynth_nonref_fx, 1, LPC_SHB_ORDER );
-            shb_synth_nonref_e = sub( 31, tmp_e );
-            hStereoICBWE->mem_lpc_shbsynth_nonref_e = shb_synth_nonref_e;
-            move16();
+            syn_filt_fx32( hStereoICBWE->lpSHBRef_e, hStereoICBWE->lpSHBRef_fx, LPC_SHB_ORDER, excSHB_nonref_fx, max_e, shb_synth_nonref_fx, &shb_synth_nonref_e, L_FRAME16k, hStereoICBWE->mem_lpc_shbsynth_nonref_fx, &hStereoICBWE->mem_lpc_shbsynth_nonref_e, 1 );
         }
         ELSE
         {
@@ -994,6 +1033,8 @@ void stereo_icBWE_enc_ivas_fx(
             shb_synth_nonref_e = shb_frame_ref_e;
             move16();
             set32_fx( hStereoICBWE->mem_lpc_shbsynth_nonref_fx, 0, 10 );
+            hStereoICBWE->mem_lpc_shbsynth_nonref_e = 0;
+            move16();
         }
 
         test();
@@ -1002,7 +1043,7 @@ void stereo_icBWE_enc_ivas_fx(
         IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, WB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && EQ_16( st->flag_ACELP16k, 1 ) )
         {
             /* IC BWE spectral mapping */
-            spIndx = ic_bwe_enc_specMapping_ivas_fx( shb_frame_nonref_fx, shb_frame_nonref_e, shb_synth_nonref_fx, shb_synth_nonref_e, &( hStereoICBWE->prevSpecMapping_fx ), &( hStereoICBWE->memShbSpecMapping_fx ), hStereoICBWE->memShbSpecXcorr_fx, &( hStereoICBWE->memShbSpecXcorr_e ) ); /* Q0 */
+            spIndx = ic_bwe_enc_specMapping_ivas_fx( shb_frame_nonref_fx, shb_frame_nonref_e, shb_synth_nonref_fx, &shb_synth_nonref_e, &( hStereoICBWE->prevSpecMapping_fx ), &( hStereoICBWE->memShbSpecMapping_fx ), &( hStereoICBWE->memShbSpecMapping_e ), hStereoICBWE->memShbSpecXcorr_fx, &( hStereoICBWE->memShbSpecXcorr_e ) ); /* Q0 */
         }
         ELSE
         {
@@ -1067,6 +1108,8 @@ void stereo_icBWE_init_enc_fx(
 
     /* unscaled & scaled SHB synthesis memory */
     set32_fx( hStereoICBWE->mem_lpc_shbsynth_nonref_fx, 0, LPC_SHB_ORDER );
+    hStereoICBWE->mem_lpc_shbsynth_nonref_e = 0;
+    move16();
 
     /* inter-channel BWE spectral shape adj. */
     hStereoICBWE->prevSpecMapping_fx = 0;
@@ -1198,6 +1241,8 @@ void stereo_icBWE_preproc_fx(
     Word32 gD_fx;
     Word32 input_Fs;
 
+    set16_fx( temp_inp_fx, 0, L_FRAME48k );
+
     /* initialization */
     hStereoTCA = hCPE->hStereoTCA;     /* Stereo TCA encoder handle    */
     hStereoICBWE = hCPE->hStereoICBWE; /* Stereo IC BWE encoder handle */
@@ -1356,7 +1401,7 @@ void stereo_icBWE_preproc_fx(
     Scale_sig( temp_inp_fx, L_FRAME48k, sub( 0, hStereoICBWE->q_dataChan_fx ) ); /* q_dataChan_fx */
 
     /* IVAS-219: Re-wire the shb nonref estimation through a lite CLDFB */
-    modify_Fs_fx( temp_inp_fx, L_FRAME32k, 32000, tempSHB_fx, 16000, hStereoICBWE->mem_decim_shb_ch0_fx, 0, &Q_new_inp, &mem_decim_size );
+    modify_Fs_ivas_fx( temp_inp_fx, L_FRAME32k, 32000, tempSHB_fx, 16000, hStereoICBWE->mem_decim_shb_ch0_fx, 0, &Q_new_inp, &mem_decim_size );
 
     Copy_Scale_sig( tempSHB_fx, shb_speech_nonref_fx, L_FRAME16k, sub( q_shb_speech_nonref_fx, Q_new_inp ) ); /* q_shb_speech_nonref_fx */
 
diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc_fx.c
similarity index 61%
rename from lib_enc/ivas_stereo_mdct_core_enc.c
rename to lib_enc/ivas_stereo_mdct_core_enc_fx.c
index d8dcf5653430c771654e855065d55cd9dc0c799e..2a71fc34dffdcc079e6195b14b4779c77da04ffc 100644
--- a/lib_enc/ivas_stereo_mdct_core_enc.c
+++ b/lib_enc/ivas_stereo_mdct_core_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,7 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
@@ -53,13 +51,13 @@ static void sync_tcx_mode_fx(
     Encoder_State **st /* i/o: Encoder state */
 )
 {
-    const Word32 prevAccNrg0 = st[0]->hTranDet->subblockEnergies.accSubblockNrg[st[0]->hTranDet->subblockEnergies.nDelay]; /* Q0 */
+    const Word32 prevAccNrg0 = st[0]->hTranDet->subblockEnergies.accSubblockNrg[st[0]->hTranDet->subblockEnergies.nDelay]; /* Q(-1) */
     move32();
-    const Word32 prevAccNrg1 = st[1]->hTranDet->subblockEnergies.accSubblockNrg[st[1]->hTranDet->subblockEnergies.nDelay]; /* Q0 */
+    const Word32 prevAccNrg1 = st[1]->hTranDet->subblockEnergies.accSubblockNrg[st[1]->hTranDet->subblockEnergies.nDelay]; /* Q(-1) */
     move32();
-    const Word32 lastAccNrg0 = st[0]->hTranDet->subblockEnergies.accSubblockNrg[( st[0]->hTranDet->subblockEnergies.nDelay + st[0]->hTranDet->transientDetector.nSubblocksToCheck )]; /* Q0 */
+    const Word32 lastAccNrg0 = st[0]->hTranDet->subblockEnergies.accSubblockNrg[( st[0]->hTranDet->subblockEnergies.nDelay + st[0]->hTranDet->transientDetector.nSubblocksToCheck )]; /* Q(-1) */
     move32();
-    const Word32 lastAccNrg1 = st[1]->hTranDet->subblockEnergies.accSubblockNrg[( st[1]->hTranDet->subblockEnergies.nDelay + st[1]->hTranDet->transientDetector.nSubblocksToCheck )]; /* Q0 */
+    const Word32 lastAccNrg1 = st[1]->hTranDet->subblockEnergies.accSubblockNrg[( st[1]->hTranDet->subblockEnergies.nDelay + st[1]->hTranDet->transientDetector.nSubblocksToCheck )]; /* Q(-1) */
     move32();
 
     test();
@@ -137,15 +135,17 @@ void stereo_mdct_core_enc_fx(
 {
     Word32 orig_spectrum_long_fx[CPE_CHANNELS][N_MAX]; /* MDCT output (L/R). */
     Word32 *orig_spectrum_fx[CPE_CHANNELS][NB_DIV];    /* Pointers to MDCT output for a short block (L/R) */
-    Word32 powerSpec_fx[CPE_CHANNELS][N_MAX];
-    Word32 *p_powerSpec_fx[CPE_CHANNELS];
-    Word16 exp_powerSpec[CPE_CHANNELS][N_MAX + L_MDCT_OVLP_MAX];
-    Word32 powerSpecMsInv_long_fx[CPE_CHANNELS][N_MAX]; /* MS inv power spectrum, also inverse MDST spectrum */
+    Word64 powerSpec64[CPE_CHANNELS][N_MAX];
+    Word16 exp_powerSpec64[CPE_CHANNELS][NB_DIV];
+    Word32 powerSpecMsInv_long_fx[CPE_CHANNELS][N_MAX];   /* MS inv power spectrum, also inverse MDST spectrum */
+    Word16 q_powerSpecMsInv_long_fx[CPE_CHANNELS][N_MAX]; /*Q: MS inv power spectrum, also inverse MDST spectrum */
     Word32 *powerSpecMsInv_fx[CPE_CHANNELS][NB_DIV];
+    Word16 *q_powerSpecMsInv_fx[CPE_CHANNELS][NB_DIV];
     Word32 quantized_spectrum_long_fx[CPE_CHANNELS][N_MAX]; /* quantized MDCT spectrum, inv ms mask mdst spectrum, scratch for MS spectra in the MS decision */
     Word32 *quantized_spectrum_fx[CPE_CHANNELS][NB_DIV];
     Word32 *inv_mdst_spectrum_fx[CPE_CHANNELS][NB_DIV];
     Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV];
+    Word16 exp_inv_spectrum[CPE_CHANNELS];
     Word16 i, ch, nSubframes, L_subframeTCX;
     Word16 n, nAvailBits;
     Word16 tnsSize[CPE_CHANNELS][NB_DIV];          /* number of tns parameters put into prm */
@@ -154,8 +154,6 @@ void stereo_mdct_core_enc_fx(
     Word32 *p_mdst_spectrum_long_fx[CPE_CHANNELS];
     Word32 mdst_spectrum_long_fx[CPE_CHANNELS][N_MAX];
     Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV];
-    Word16 q_powSpec[MCT_MAX_CHANNELS], q_spec, tmp_s;
-    Word16 tmp_q_powSpec[N_MAX], tmp_q_powSpecInv[N_MAX], *tmp_q_psi[2];
     Word64 W_tmp;
     Encoder_State *st, **sts;
     STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct;
@@ -179,22 +177,15 @@ void stereo_mdct_core_enc_fx(
 
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
-#ifdef MSAN_FIX
         set32_fx( mdst_spectrum_long_fx[ch], 0, N_MAX );
         set32_fx( orig_spectrum_long_fx[ch], 0, N_MAX );
-#endif
         p_mdst_spectrum_long_fx[ch] = mdst_spectrum_long_fx[ch];
         p_orig_spectrum_long_fx[ch] = orig_spectrum_long_fx[ch];
         orig_spectrum_fx[ch][0] = orig_spectrum_long_fx[ch];
         orig_spectrum_fx[ch][1] = orig_spectrum_long_fx[ch] + N_TCX10_MAX;
+        set16_fx( exp_powerSpec64[ch], 0, NB_DIV );
     }
 
-    set16_fx( tmp_q_powSpecInv, 63, L_FRAME48k );
-    set16_fx( tmp_q_powSpec, 63, L_FRAME48k );
-
-    tmp_q_psi[0] = tmp_q_powSpecInv;
-    tmp_q_psi[1] = &tmp_q_powSpecInv[N_TCX10_MAX];
-
     sts = hCPE->hCoreCoder;
     hStereoMdct = hCPE->hStereoMdct;
     hBstr = sts[0]->hBstr;
@@ -250,32 +241,38 @@ void stereo_mdct_core_enc_fx(
         hCPE->hStereoMdct->stbParamsTCX20.nBandsStereoCore = hCPE->hStereoMdct->stbParamsTCX20.sfbCnt;
         move16();
     }
-
+    Word16 len = extract_l( Mpy_32_32( sts[0]->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );
+    Word16 q_com = s_min( s_min( add( sts[0]->q_inp, getScaleFactor16( sts[0]->input_fx, add( len, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) ), add( sts[0]->q_old_inp, getScaleFactor16( sts[0]->old_input_signal_fx, len ) ) ),
+                          s_min( add( sts[1]->q_inp, getScaleFactor16( sts[1]->input_fx, add( len, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) ), add( sts[1]->q_old_inp, getScaleFactor16( sts[1]->old_input_signal_fx, len ) ) ) );
+    q_com = sub( q_com, Q1 );
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         inv_mdst_spectrum_fx[ch][0] = powerSpecMsInv_fx[ch][0] = powerSpecMsInv_long_fx[ch];
         inv_mdst_spectrum_fx[ch][1] = powerSpecMsInv_fx[ch][1] = powerSpecMsInv_long_fx[ch] + N_TCX10_MAX;
+        q_powerSpecMsInv_fx[ch][0] = q_powerSpecMsInv_long_fx[ch];
+        q_powerSpecMsInv_fx[ch][1] = q_powerSpecMsInv_long_fx[ch] + N_TCX10_MAX;
+        set16_fx( q_powerSpecMsInv_long_fx[ch], 63, N_MAX );
         quantized_spectrum_fx[ch][0] = quantized_spectrum_long_fx[ch];
         quantized_spectrum_fx[ch][1] = quantized_spectrum_long_fx[ch] + N_TCX10_MAX;
         inv_spectrum_fx[ch][0] = quantized_spectrum_fx[ch][0];
         inv_spectrum_fx[ch][1] = quantized_spectrum_fx[ch][1];
         mdst_spectrum_fx[ch][0] = mdst_spectrum_long_fx[ch];
         mdst_spectrum_fx[ch][1] = mdst_spectrum_long_fx[ch] + N_TCX10_MAX;
+        set64_fx( powerSpec64[ch], 0, N_MAX );
         set32_fx( powerSpecMsInv_long_fx[ch], 0, N_MAX );
         set32_fx( quantized_spectrum_long_fx[ch], 0, N_MAX );
         set32_fx( mdst_spectrum_long_fx[ch], 0, N_MAX );
-        set32_fx( powerSpec_fx[ch], 0, N_MAX );
         set32_fx( powerSpecMsInv_long_fx[ch], 0, N_MAX );
         sts[ch]->hTcxEnc->tns_ms_flag[0] = 0;
         move16();
         sts[ch]->hTcxEnc->tns_ms_flag[1] = 0;
         move16();
 
-        Scale_sig( sts[ch]->input_fx, add( extract_l( Mpy_32_32( sts[ch]->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), negate( sts[ch]->q_inp ) ); /* Q0 */
-        Scale_sig( sts[ch]->old_input_signal_fx, extract_l( Mpy_32_32( sts[ch]->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), negate( sts[ch]->q_old_inp ) );                               /* Q0 */
-        sts[ch]->q_old_inp = 0;
+        scale_sig( sts[ch]->input_fx, add( extract_l( Mpy_32_32( sts[ch]->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), sub( q_com, sts[ch]->q_inp ) ); /* q_com */
+        scale_sig( sts[ch]->old_input_signal_fx, extract_l( Mpy_32_32( sts[ch]->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), sub( q_com, sts[ch]->q_old_inp ) );                               /* q_com */
+        sts[ch]->q_old_inp = q_com;
         move16();
-        sts[ch]->q_inp = 0;
+        sts[ch]->q_inp = q_com;
         move16();
     }
 
@@ -344,48 +341,74 @@ void stereo_mdct_core_enc_fx(
     IF( !hStereoMdct->isSBAStereoMode )
     {
         /* Common q for mdst_spectrum and spectrum */
-        Word16 k;
-        q_spec = 0;
+        Word16 exp1, exp2;
         Word16 length;
+
+        /*find headroom to increase precision*/
+        exp1 = MIN_16;
+        exp2 = MIN_16;
+        move16();
+        move16();
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-            FOR( k = 0; k <= ( ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV ) - 1; k++ )
+            length = sts[ch]->hTcxEnc->spectrum_length;
+            move16();
+            if ( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+            {
+                length = shr( length, 1 );
+            }
+
+            exp1 = s_max( exp1, sub( sts[ch]->hTcxEnc->spectrum_e[0], L_norm_arr( sts[ch]->hTcxEnc->spectrum_fx[0], length ) ) );
+            exp2 = s_max( exp2, sub( mdst_spectrum_e[ch][0], L_norm_arr( mdst_spectrum_fx[ch][0], length ) ) );
+
+            IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
             {
-                q_spec = s_max( q_spec, sts[ch]->hTcxEnc->spectrum_e[k] );
-                q_spec = s_max( q_spec, mdst_spectrum_e[ch][k] );
+                exp1 = s_max( exp1, sub( sts[ch]->hTcxEnc->spectrum_e[1], L_norm_arr( sts[ch]->hTcxEnc->spectrum_fx[1], length ) ) );
+                exp2 = s_max( exp2, sub( mdst_spectrum_e[ch][1], L_norm_arr( mdst_spectrum_fx[ch][1], length ) ) );
             }
         }
-        q_spec = sub( Q31, q_spec );
+
+        exp1 = add( exp1, 2 ); /* 2 guard bit to avoid over-flows in stereo_coder_tcx_fx */
+        exp2 = add( exp2, 2 ); /* 2 guard bit to avoid over-flows in stereo_coder_tcx_fx (ms_processing_fx) */
 
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-            Word16 n_sb = NB_DIV;
+            length = sts[ch]->hTcxEnc->spectrum_length;
             move16();
-            if ( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+            if ( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
             {
-                n_sb = 1;
-                move16();
+                length = shr( length, 1 );
             }
-            length = idiv1616( sts[ch]->hTcxEnc->L_frameTCX, n_sb ); /* Q0 */
 
-            FOR( k = 0; k <= ( ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV ) - 1; k++ )
+            scale_sig32( sts[ch]->hTcxEnc->spectrum_fx[0], length, sub( sts[ch]->hTcxEnc->spectrum_e[0], exp1 ) ); /* exp1 */
+            sts[ch]->hTcxEnc->spectrum_e[0] = exp1;
+            scale_sig32( mdst_spectrum_fx[ch][0], length, sub( mdst_spectrum_e[ch][0], exp2 ) ); /* exp2 */
+            mdst_spectrum_e[ch][0] = exp2;
+            IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
             {
-                Scale_sig32( sts[ch]->hTcxEnc->spectrum_fx[k], length, sub( q_spec, sub( Q31, sts[ch]->hTcxEnc->spectrum_e[k] ) ) ); /* q_spec */
-                sts[ch]->hTcxEnc->spectrum_e[k] = sub( Q31, q_spec );
-                Scale_sig32( mdst_spectrum_fx[ch][k], length, sub( q_spec, sub( Q31, mdst_spectrum_e[ch][k] ) ) ); /* q_spec */
-                mdst_spectrum_e[ch][k] = sub( Q31, q_spec );
+                scale_sig32( sts[ch]->hTcxEnc->spectrum_fx[1], length, sub( sts[ch]->hTcxEnc->spectrum_e[1], exp1 ) ); /* exp1 */
+                sts[ch]->hTcxEnc->spectrum_e[1] = exp1;
+                scale_sig32( mdst_spectrum_fx[ch][1], length, sub( mdst_spectrum_e[ch][1], exp2 ) ); /* exp2 */
+                mdst_spectrum_e[ch][1] = exp2;
             }
         }
-        stereo_coder_tcx_fx( hStereoMdct, sts, ms_mask, mdst_spectrum_fx, inv_spectrum_fx, inv_mdst_spectrum_fx, 0, q_spec );
+        stereo_coder_tcx_fx( hStereoMdct, sts, ms_mask, mdst_spectrum_fx, inv_spectrum_fx, inv_mdst_spectrum_fx, 0, sts[0]->hTcxEnc->spectrum_e[0], mdst_spectrum_e[0][0] );
+        exp_inv_spectrum[0] = exp_inv_spectrum[1] = sts[0]->hTcxEnc->spectrum_e[0];
+        move16();
+        move16();
     }
 
     /*--------------------------------------------------------------*
      * Power spectrum calculation
      *---------------------------------------------------------------*/
-    Word16 length;
+    Word16 length, exp, shift1, shift2, norm;
+    Word32 mdct, mdst, imdct, imdst;
 
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
+        L_subframeTCX = shr( sts[ch]->hTcxEnc->L_frameTCX, 1 ); /* Q0 */
+        nSubframes = NB_DIV;
+        move16();
         IF( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
         {
             nSubframes = 1;
@@ -393,12 +416,6 @@ void stereo_mdct_core_enc_fx(
             move16();
             move16();
         }
-        ELSE
-        {
-            nSubframes = NB_DIV;
-            move16();
-            L_subframeTCX = shr( sts[ch]->hTcxEnc->L_frameTCX, 1 ); /* Q0 */
-        }
 
         /* in MCT only relevant for bitrate switching from non-MCT bitrates */
         IF( EQ_16( sts[ch]->last_core, ACELP_CORE ) )
@@ -408,126 +425,89 @@ void stereo_mdct_core_enc_fx(
 
         FOR( n = 0; n < nSubframes; n++ )
         {
-            q_spec = sub( 31, sts[ch]->hTcxEnc->spectrum_e[n] );
-
             IF( sts[ch]->hTcxEnc->tns_ms_flag[n] )
             {
+                exp = add( s_max( mdst_spectrum_e[ch][n], sts[ch]->hTcxEnc->spectrum_e[n] ), 1 );
+                shift1 = sub( mdst_spectrum_e[ch][n], exp );
+                shift2 = sub( sts[ch]->hTcxEnc->spectrum_e[n], exp );
+
                 /* power spectrum: MDCT^2 + MDST^2 */
                 FOR( i = 0; i < L_subframeTCX; i++ )
                 {
-                    W_tmp = W_mac_32_32( W_mult_32_32( mdst_spectrum_fx[ch][n][i], mdst_spectrum_fx[ch][n][i] ), sts[ch]->hTcxEnc->spectrum_fx[n][i], sts[ch]->hTcxEnc->spectrum_fx[n][i] ); /* 2*q_spec+1 */
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
-                    W_tmp = W_shl( W_tmp, tmp_s );                                                                  /* 2*q_spec+1+tmp_s */
-                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );                         /* 2*q_spec+1+tmp_s-32 */
-                    tmp_q_powSpec[( i + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                    mdst = L_shl( mdst_spectrum_fx[ch][n][i], shift1 );          // exp: exp
+                    mdct = L_shl( sts[ch]->hTcxEnc->spectrum_fx[n][i], shift2 ); // exp: exp
+                    imdst = L_shl( inv_mdst_spectrum_fx[ch][n][i], shift1 );     // exp: exp
+                    imdct = L_shl( inv_spectrum_fx[ch][n][i], shift2 );          // exp: exp
+
+                    W_tmp = W_mac_32_32( W_mult_32_32( imdct, imdct ), imdst, imdst ); // exp: 2*exp
+                    norm = W_norm( W_tmp );
+                    powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_shl( W_tmp, norm ) ); // exp: 2*exp-norm
+                    q_powerSpecMsInv_fx[ch][n][i] = sub( 31, sub( shl( exp, 1 ), norm ) );
                     move32();
                     move16();
 
-                    W_tmp = W_mac_32_32( W_mult_32_32( inv_mdst_spectrum_fx[ch][n][i], inv_mdst_spectrum_fx[ch][n][i] ), inv_spectrum_fx[ch][n][i], inv_spectrum_fx[ch][n][i] ); /* 2*q_spec+1 */
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
-                    W_tmp = W_shl( W_tmp, tmp_s );                                     /* 2*q_spec+1+tmp_s */
-                    powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_tmp );                /* 2*q_spec+1+tmp_s-32 */
-                    tmp_q_psi[n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
-                    move32();
-                    move16();
+                    powerSpec64[ch][i + n * L_subframeTCX] = W_mac_32_32( W_mult_32_32( mdct, mdct ), mdst, mdst ); // exp: 2*exp
+                    move64();
                 }
+                exp_powerSpec64[ch][n] = shl( exp, 1 );
+                move16();
             }
             ELSE
             {
                 IF( NE_16( hStereoMdct->mdct_stereo_mode[n], SMDCT_DUAL_MONO ) )
                 {
+                    exp = shl( add( sts[ch]->hTcxEnc->spectrum_e[n], 1 ), 1 ); // 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1)
                     /* power spectrum: MDCT^2 + MDST^2 */
-                    W_tmp = W_mult_32_32( inv_spectrum_fx[ch][n][0], inv_spectrum_fx[ch][n][0] ); /* 2*q_spec+1 */
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
-                    W_tmp = W_shl( W_tmp, tmp_s );                                     /* 2*q_spec+1+tmp_s */
-                    powerSpecMsInv_fx[ch][n][0] = W_extract_h( W_tmp );                /* 2*q_spec+1+tmp_s-32 */
-                    tmp_q_psi[n][0] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                    mdct = L_shr( inv_spectrum_fx[ch][n][0], 1 ); // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                    W_tmp = W_mult_32_32( mdct, mdct );           // exp: 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1) (exp)
+                    norm = W_norm( W_tmp );
+                    powerSpecMsInv_fx[ch][n][0] = W_extract_h( W_shl( W_tmp, norm ) ); // exp: 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1)-norm (exp-norm)
+                    q_powerSpecMsInv_fx[ch][n][0] = sub( 31, sub( exp, norm ) );
                     move32();
                     move16();
 
                     FOR( i = 1; i < L_subframeTCX - 1; i++ )
                     {
-                        Word32 mdst_fx = L_sub( inv_spectrum_fx[ch][n][i + 1], inv_spectrum_fx[ch][n][i - 1] ); /* An MDST estimate q_spec*/
-
-                        W_tmp = W_mac_32_32( W_mult_32_32( mdst_fx, mdst_fx ), inv_spectrum_fx[ch][n][i], inv_spectrum_fx[ch][n][i] ); /* 2*q_spec+1 */
-                        tmp_s = sub( W_norm( W_tmp ), 1 );
-                        W_tmp = W_shl( W_tmp, tmp_s );                                     /* 2*q_spec+1+tmp_s */
-                        powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_tmp );                /* 2*q_spec+1+tmp_s-32 */
-                        tmp_q_psi[n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                        /* float mdst = ( inv_spectrum[ch][n][i + 1] - inv_spectrum[ch][n][i - 1] );
+                           powerSpecMsInv[ch][n][i] = mdst * mdst + inv_spectrum[ch][n][i] * inv_spectrum[ch][n][i]; */
+                        mdst = L_sub( L_shr( inv_spectrum_fx[ch][n][i + 1], 1 ), L_shr( inv_spectrum_fx[ch][n][i - 1], 1 ) ); // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                        mdct = L_shr( inv_spectrum_fx[ch][n][i], 1 );                                                         // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                        W_tmp = W_mac_32_32( W_mult_32_32( mdst, mdst ), mdct, mdct );                                        // exp: 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1) (exp)
+                        norm = W_norm( W_tmp );
+                        powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_shl( W_tmp, norm ) ); // exp: 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1)-norm (exp-norm)
+                        q_powerSpecMsInv_fx[ch][n][i] = sub( 31, sub( exp, norm ) );
                         move32();
                         move16();
                     }
 
-                    W_tmp = W_mult_32_32( inv_spectrum_fx[ch][n][L_subframeTCX - 1], inv_spectrum_fx[ch][n][L_subframeTCX - 1] ); /* 2*q_spec+1 */
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
-                    W_tmp = W_shl( W_tmp, tmp_s );                                                     /* 2*q_spec+1+tmp_s */
-                    powerSpecMsInv_fx[ch][n][L_subframeTCX - 1] = W_extract_h( W_tmp );                /* 2*q_spec+1+tmp_s-32 */
-                    tmp_q_psi[n][L_subframeTCX - 1] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
+                    mdct = L_shr( inv_spectrum_fx[ch][n][L_subframeTCX - 1], 1 ); // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                    W_tmp = W_mult_32_32( mdct, mdct );                           // exp: 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1) (exp)
+                    norm = W_norm( W_tmp );
+                    powerSpecMsInv_fx[ch][n][L_subframeTCX - 1] = W_extract_h( W_shl( W_tmp, norm ) ); // exp: 2*(sts[ch]->hTcxEnc->spectrum_e[n]+1)-norm (exp-norm)
+                    q_powerSpecMsInv_fx[ch][n][L_subframeTCX - 1] = sub( 31, sub( exp, norm ) );
                     move32();
                     move16();
                 }
 
                 /* power spectrum: MDCT^2 + MDST^2 */
-                W_tmp = W_mult_32_32( sts[ch]->hTcxEnc->spectrum_fx[n][0], sts[ch]->hTcxEnc->spectrum_fx[n][0] ); /* 2*q_spec+1 */
-                tmp_s = sub( W_norm( W_tmp ), 1 );
-                W_tmp = W_shl( W_tmp, tmp_s );                                                      /* 2*q_spec+1+tmp_s */
-                powerSpec_fx[ch][n * L_subframeTCX] = W_extract_h( W_tmp );                         /* 2*q_spec+1+tmp_s-32 */
-                tmp_q_powSpec[n * L_subframeTCX] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
-                move32();
-                move16();
+                mdct = L_shr( sts[ch]->hTcxEnc->spectrum_fx[n][0], 1 );          // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                powerSpec64[ch][n * L_subframeTCX] = W_mult_32_32( mdct, mdct ); // exp: 2(sts[ch]->hTcxEnc->spectrum_e[n]+1)
+                move64();
 
                 FOR( i = 1; i < L_subframeTCX - 1; i++ )
                 {
-                    Word32 mdst_fx = L_sub( sts[ch]->hTcxEnc->spectrum_fx[n][i + 1], sts[ch]->hTcxEnc->spectrum_fx[n][i - 1] ); /* An MDST estimate q_spec*/
-
-                    W_tmp = W_mac_32_32( W_mult_32_32( mdst_fx, mdst_fx ), sts[ch]->hTcxEnc->spectrum_fx[n][i], sts[ch]->hTcxEnc->spectrum_fx[n][i] ); /* 2*q_spec+1 */
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
-                    W_tmp = W_shl( W_tmp, tmp_s );                                                                  /* 2*q_spec+1+tmp_s */
-                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );                         /* 2*q_spec+1+tmp_s-32 */
-                    tmp_q_powSpec[( i + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
-                    move32();
-                    move16();
+                    mdct = L_shr( sts[ch]->hTcxEnc->spectrum_fx[n][i], 1 );                                                                   // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                    mdst = L_sub( L_shr( sts[ch]->hTcxEnc->spectrum_fx[n][i + 1], 1 ), L_shr( sts[ch]->hTcxEnc->spectrum_fx[n][i - 1], 1 ) ); // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                    powerSpec64[ch][i + n * L_subframeTCX] = W_mac_32_32( W_mult_32_32( mdct, mdct ), mdst, mdst );                           // exp: 2(sts[ch]->hTcxEnc->spectrum_e[n]+1)
+                    move64();
                 }
 
-                W_tmp = W_mult_32_32( sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1], sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1] ); /* 2*q_spec+1 */
-                tmp_s = sub( W_norm( W_tmp ), 1 );
-                W_tmp = W_shl( W_tmp, tmp_s );                                                                                      /* 2*q_spec+1+tmp_s */
-                powerSpec_fx[ch][( ( L_subframeTCX - 1 ) + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );                         /* 2*q_spec+1+tmp_s-32 */
-                tmp_q_powSpec[( ( L_subframeTCX - 1 ) + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
-                move32();
-                move16();
-            }
-        }
+                mdct = L_shr( sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1], 1 );              // exp: sts[ch]->hTcxEnc->spectrum_e[n]+1
+                powerSpec64[ch][L_subframeTCX - 1 + n * L_subframeTCX] = W_mult_32_32( mdct, mdct ); // exp: 2(sts[ch]->hTcxEnc->spectrum_e[n]+1)
+                move64();
 
-        /* Aligning the Q-factors */
-        {
-            FOR( i = 0; i < N_MAX; i++ )
-            {
-                if ( powerSpec_fx[ch][i] == 0 )
-                {
-                    tmp_q_powSpec[i] = 63;
-                    move16();
-                }
-                if ( powerSpecMsInv_fx[ch][0][i] == 0 )
-                {
-                    tmp_q_powSpecInv[i] = 63;
-                    move16();
-                }
-            }
-            minimum_s( tmp_q_powSpec, N_MAX, &q_powSpec[ch] );
-            minimum_s( tmp_q_powSpecInv, N_MAX, &tmp_s );
-            q_powSpec[ch] = s_min( q_powSpec[ch], tmp_s );
-            move16();
-
-            FOR( n = 0; n < nSubframes; n++ )
-            {
-                FOR( i = 0; i < L_subframeTCX; i++ )
-                {
-                    powerSpecMsInv_fx[ch][n][i] = L_shr( powerSpecMsInv_fx[ch][n][i], sub( tmp_q_psi[n][i], q_powSpec[ch] ) );                                          /* q_powSpec */
-                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i], q_powSpec[ch] ) ); /* q_powSpec */
-                    move32();
-                    move32();
-                }
+                exp_powerSpec64[ch][n] = shl( add( sts[ch]->hTcxEnc->spectrum_e[n], 1 ), 1 );
+                move16();
             }
         }
     }
@@ -561,8 +541,9 @@ void stereo_mdct_core_enc_fx(
              * and quantization (0: tonal, 1: noise-like).               *
              * Detect low pass if present.                               *
              *-----------------------------------------------------------*/
-            ComputeSpectrumNoiseMeasure_fx( powerSpec_fx[ch], L_subframeTCX, i_mult( st->hTcxEnc->nmStartLine, idiv1616( L_subframeTCX, st->hTcxEnc->L_frameTCX ) ),
-                                            NE_32( imult3216( st->last_sr_core, st->L_frame ), imult3216( st->sr_core, st->L_frame_past ) ) || NE_16( st->last_core, TCX_20_CORE ), st->hTcxEnc->memQuantZeros, L_subframeTCX );
+            ComputeSpectrumNoiseMeasure_ivas_fx( powerSpec64[ch], L_subframeTCX, i_mult( st->hTcxEnc->nmStartLine, idiv1616( L_subframeTCX, st->hTcxEnc->L_frameTCX ) ),
+                                                 NE_32( imult3216( st->last_sr_core, st->L_frame ), imult3216( st->sr_core, st->L_frame_past ) ) || NE_16( st->last_core, TCX_20_CORE ),
+                                                 st->hTcxEnc->memQuantZeros, L_subframeTCX );
         }
 
         st->hTcxEnc->measuredBwRatio = ONE_IN_Q14; /* No bandwidth limit for the noise filling Q14*/
@@ -595,45 +576,98 @@ void stereo_mdct_core_enc_fx(
                 IF( ( NE_16( hStereoMdct->mdct_stereo_mode[n], hStereoMdct->IGFStereoMode[n] ) || EQ_16( hStereoMdct->mdct_stereo_mode[n], SMDCT_BW_MS ) ) && !hStereoMdct->isSBAStereoMode )
                 {
                     IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS];
+                    Word32 powerSpec_fx[CPE_CHANNELS][N_MAX], *p_powerSpec_fx[CPE_CHANNELS];
+                    Word16 exp_powSpec[CPE_CHANNELS];
                     p_powerSpec_fx[0] = powerSpec_fx[0];
                     p_powerSpec_fx[1] = powerSpec_fx[1];
-                    hIGFEnc[0] = sts[0]->hIGFEnc;
-                    hIGFEnc[1] = sts[1]->hIGFEnc;
-
-                    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
                     {
-                        q_spec = sub( Q31, sts[ch]->hTcxEnc->spectrum_e[n] );
-                        Word16 n_sb = NB_DIV;
-                        move16();
-                        if ( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+                        /* Copy powerSpec values from 64 bit buffer to 32 bit buffer */
+                        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
                         {
-                            n_sb = 1;
+                            Word16 n1, nsub = 1;
+                            length = sts[ch]->hTcxEnc->L_frameTCX;
                             move16();
-                        }
-                        length = idiv1616( sts[ch]->hTcxEnc->L_frameTCX, n_sb ); /* Q0 */
-                        IF( GT_16( q_spec, q_powSpec[ch] ) )
-                        {
-                            Scale_sig32( sts[ch]->hTcxEnc->spectrum_fx[n], length, sub( q_powSpec[ch], q_spec ) ); /* q_powSpec */
-                            Scale_sig32( inv_spectrum_fx[ch][n], length, sub( q_powSpec[ch], q_spec ) );           /* q_powSpec */
-                            sts[ch]->hTcxEnc->spectrum_e[n] = sub( Q31, q_powSpec[ch] );
                             move16();
-                        }
-                        ELSE
-                        {
-                            Scale_sig32( &p_powerSpec_fx[ch][0], L_subframeTCX, sub( q_spec, q_powSpec[ch] ) );   /* q_spec */
-                            Scale_sig32( powerSpecMsInv_fx[ch][0], L_subframeTCX, sub( q_spec, q_powSpec[ch] ) ); /* q_spec */
+                            IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+                            {
+                                length = shr( sts[ch]->hTcxEnc->L_frameTCX, 1 );
+                                nsub = NB_DIV;
+                                move16();
+                            }
+                            IF( EQ_16( sts[ch]->last_core, ACELP_CORE ) )
+                            {
+                                length = add( length, shr( length, 2 ) );
+                            }
+                            exp = sub( exp_powerSpec64[ch][0], W_norm_arr( powerSpec64[ch], length ) );
+                            IF( EQ_16( nsub, 2 ) )
+                            {
+                                exp = s_max( exp, sub( exp_powerSpec64[ch][1], W_norm_arr( powerSpec64[ch] + length, length ) ) );
+                            }
+                            FOR( n1 = 0; n1 < nsub; n1++ )
+                            {
+                                shift1 = sub( sub( exp_powerSpec64[ch][n1], exp ), 32 );
+                                FOR( i = 0; i < length; i++ )
+                                {
+                                    /* This doesn't result in saturation */
+                                    powerSpec_fx[ch][i + n1 * length] = W_shl_sat_l( powerSpec64[ch][i + n1 * length], shift1 ); // exp: exp
+                                    move32();
+                                }
+                            }
+                            set32_fx( powerSpec_fx[ch] + length, 0, sub( N_MAX, length ) );
+                            exp_powSpec[ch] = exp; // exp: exp
+                            move16();
                         }
                     }
+
+                    hIGFEnc[0] = sts[0]->hIGFEnc;
+                    hIGFEnc[1] = sts[1]->hIGFEnc;
                     hIGFEnc[0]->spec_be_igf_e = p_orig_spectrum_e[0];
-                    move16();
                     hIGFEnc[1]->spec_be_igf_e = p_orig_spectrum_e[1];
                     move16();
-                    ProcessStereoIGF_fx( hStereoMdct, sts, ms_mask,
-                                         orig_spectrum_fx, sub( Q31, p_orig_spectrum_e[0] ), sub( Q31, p_orig_spectrum_e[1] ),
-                                         p_powerSpec_fx, powerSpecMsInv_fx, inv_spectrum_fx, n, hCPE->hCoreCoder[0]->sp_aud_decision0, hCPE->hCoreCoder[0]->element_brate );
+                    move16();
+
+                    ProcessStereoIGF_fx( hStereoMdct, sts, ms_mask, orig_spectrum_fx, sub( Q31, p_orig_spectrum_e[0] ), sub( Q31, p_orig_spectrum_e[1] ),
+                                         p_powerSpec_fx, exp_powSpec, powerSpecMsInv_fx, q_powerSpecMsInv_fx, inv_spectrum_fx, exp_inv_spectrum,
+                                         n, hCPE->hCoreCoder[0]->sp_aud_decision0, hCPE->hCoreCoder[0]->element_brate, 0 );
                 }
                 ELSE
                 {
+                    Word32 powerSpec_fx[CPE_CHANNELS][N_MAX]; // each value has a different exponent
+                    Word16 exp_powerSpec[CPE_CHANNELS][N_MAX + L_MDCT_OVLP_MAX];
+                    {
+                        /* Copy powerSpec values from 64 bit buffer to 32 bit buffer */
+                        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+                        {
+                            Word16 n1, nsub;
+                            nsub = 1;
+                            length = sts[ch]->hTcxEnc->L_frameTCX;
+                            move16();
+                            move16();
+                            IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+                            {
+                                length = shr( sts[ch]->hTcxEnc->L_frameTCX, 1 );
+                                nsub = NB_DIV;
+                                move16();
+                            }
+                            IF( EQ_16( sts[ch]->last_core, ACELP_CORE ) )
+                            {
+                                length = add( length, shr( length, 2 ) );
+                            }
+                            FOR( n1 = 0; n1 < nsub; n1++ )
+                            {
+                                FOR( i = 0; i < length; i++ )
+                                {
+                                    norm = W_norm( powerSpec64[ch][i + n1 * length] );
+                                    powerSpec_fx[ch][i + n1 * length] = W_extract_h( W_shl( powerSpec64[ch][i + n1 * length], norm ) ); // exp = exp_powerSpec64[ch][n1]-norm
+                                    exp_powerSpec[ch][i + n1 * length] = sub( exp_powerSpec64[ch][n1], norm );
+                                    move32();
+                                    move16();
+                                }
+                            }
+                            set32_fx( powerSpec_fx[ch] + length, 0, sub( N_MAX, length ) );
+                            set16_fx( exp_powerSpec[ch] + length, 0, sub( N_MAX + L_MDCT_OVLP_MAX, length ) );
+                        }
+                    }
                     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
                     {
                         st = sts[ch];
@@ -649,18 +683,53 @@ void stereo_mdct_core_enc_fx(
                         {
                             q_spectrum = s_min( q_spectrum, sub( Q31, st->hIGFEnc->spec_be_igf_e ) );
                         }
-                        Scale_sig32( orig_spectrum_fx[ch][n], N_TCX10_MAX, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
 
                         q_spectrum = sub( Q31, st->hTcxEnc->spectrum_e[n] );
-                        set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
 
-                        ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
+                        Scale_sig32( orig_spectrum_fx[ch][n], st->hIGFEnc->infoStopLine, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
+                        ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
                     }
                 }
             }
         }
         ELSE
         {
+            Word32 powerSpec_fx[CPE_CHANNELS][N_MAX]; // each value has a different exponent
+            Word16 exp_powerSpec[CPE_CHANNELS][N_MAX + L_MDCT_OVLP_MAX];
+            {
+                /* Copy powerSpec values from 64 bit buffer to 32 bit buffer */
+                FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+                {
+                    Word16 n1, nsub;
+                    nsub = 1;
+                    length = sts[ch]->hTcxEnc->L_frameTCX;
+                    move16();
+                    move16();
+                    IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
+                    {
+                        length = shr( sts[ch]->hTcxEnc->L_frameTCX, 1 );
+                        nsub = NB_DIV;
+                        move16();
+                    }
+                    IF( EQ_16( sts[ch]->last_core, ACELP_CORE ) )
+                    {
+                        length = add( length, shr( length, 2 ) );
+                    }
+                    FOR( n1 = 0; n1 < nsub; n1++ )
+                    {
+                        FOR( i = 0; i < length; i++ )
+                        {
+                            norm = W_norm( powerSpec64[ch][i + n1 * length] );
+                            powerSpec_fx[ch][i + n1 * length] = W_extract_h( W_shl( powerSpec64[ch][i + n1 * length], norm ) ); // exp = exp_powerSpec64[ch][n1]-norm
+                            exp_powerSpec[ch][i + n1 * length] = sub( exp_powerSpec64[ch][n1], norm );
+                            move32();
+                            move16();
+                        }
+                    }
+                    set32_fx( powerSpec_fx[ch] + length, 0, sub( N_MAX, length ) );
+                    set16_fx( exp_powerSpec[ch] + length, 0, sub( N_MAX + L_MDCT_OVLP_MAX, length ) );
+                }
+            }
             FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
             {
                 st = sts[ch];
@@ -690,12 +759,12 @@ void stereo_mdct_core_enc_fx(
                         {
                             q_spectrum = s_min( q_spectrum, sub( Q31, st->hIGFEnc->spec_be_igf_e ) );
                         }
-                        Scale_sig32( orig_spectrum_fx[ch][n], N_TCX10_MAX, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
 
                         q_spectrum = sub( Q31, st->hTcxEnc->spectrum_e[n] );
-                        set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
 
-                        ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
+                        Scale_sig32( orig_spectrum_fx[ch][n], st->hIGFEnc->infoStopLine, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
+
+                        ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
                     }
                 }
             }
@@ -726,7 +795,6 @@ void stereo_mdct_core_enc_fx(
      * Split available bits between channels
      *---------------------------------------------------------------*/
 
-    Word16 q_com;
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         Word16 n_sb = NB_DIV;
diff --git a/lib_enc/ivas_stereo_mdct_igf_enc.c b/lib_enc/ivas_stereo_mdct_igf_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_stereo_mdct_igf_enc.c
rename to lib_enc/ivas_stereo_mdct_igf_enc_fx.c
index 190255fd9be4f9e4b839cfdf2dc91f3f421be480..6c3588cabc6d7a93997e0937dfd86940f859dee8 100644
--- a/lib_enc/ivas_stereo_mdct_igf_enc.c
+++ b/lib_enc/ivas_stereo_mdct_igf_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,12 +34,10 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
 #include "prot_fx.h"
 #include "cnst.h"
 #include "stat_enc.h"
 #include "ivas_stat_enc.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "wmc_auto.h"
 
@@ -168,12 +166,10 @@ static void IGF_MsStereoDecision_fx(
             Word16 pc_target_e, pc_src_e;
             Word16 tmp1, tmp1_e, tmp2, tmp2_e;
 
-#ifdef MSAN_FIX
             pc_target_e = 0;
             pc_src_e = 0;
             move16();
             move16();
-#endif // MSAN_FIX
 
             Word16 coh_src = calcCoh_fx( &specL_fx[strt_cpy], &specR_fx[strt_cpy], q_spec, width, &cc_src_fx, &cc_src_e, &pc_src_fx, &pc_src_e );
             Word16 coh_target = calcCoh_fx( &specL_fx[hGrid->swb_offset[sfb]], &specR_fx[hGrid->swb_offset[sfb]], q_spec, width, &cc_target_fx, &cc_target_e, &pc_target_fx, &pc_target_e );
diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
similarity index 93%
rename from lib_enc/ivas_stereo_mdct_stereo_enc.c
rename to lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
index 4c73ba2e72f9b30f911376a6b6f285dd242152f5..2f1b7d6c8d6a37248247971dece778020c06e8e5 100644
--- a/lib_enc/ivas_stereo_mdct_stereo_enc.c
+++ b/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,10 +35,8 @@
 #include "options.h"
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "prot_fx.h"
-#include "prot.h"
 #include "prot_fx_enc.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
@@ -192,7 +190,8 @@ void stereo_coder_tcx_fx(
     Word32 *inv_mdst_spectrum_fx[CPE_CHANNELS][NB_DIV],
     /* i/o: inverse MDST spectrum           */ // Q( q_spec ) (same as spectrum buffer in hTcxEnc)
     const Word16 mct_on,                       /* i  : flag mct block (1) or stereo (0)  Q0*/
-    Word16 q_spec )
+    Word16 exp_spec,
+    Word16 exp_mdct_spec )
 {
     STEREO_MDCT_BAND_PARAMETERS *sfbConf = NULL;
     Word32 nrgRatio_fx[CPE_CHANNELS];
@@ -257,8 +256,8 @@ void stereo_coder_tcx_fx(
                 tmp = Inv16( extract_h( nrgRatio_fx[k] ), &e_tmp ); /* Q15-e_tmp */
                 tmp = shl( tmp, e_tmp );                            /* Q15 */
 
-                v_multc_fixed_16( sts[1]->hTcxEnc->spectrum_fx[k], tmp, sts[1]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* Q31-spectrum_e[k] */
-                v_multc_fixed_16( mdst_spectrum_fx[1][k], tmp, mdst_spectrum_fx[1][k], L_frameTCX );                   /* q_spec */
+                v_multc_fixed_16( sts[1]->hTcxEnc->spectrum_fx[k], tmp, sts[1]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* exp: exp_spec */
+                v_multc_fixed_16( mdst_spectrum_fx[1][k], tmp, mdst_spectrum_fx[1][k], L_frameTCX );                   /* exp: exp_mdct_spec */
             }
             ELSE IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( nrgRatio_fx[k], nrgRatio_e[k], ONE_IN_Q27, 4 ), -1 ) && LT_16( k, EQ_16( sts[0]->core, TCX_20_CORE ) ? 1 : NB_DIV ) )
             {
@@ -266,8 +265,8 @@ void stereo_coder_tcx_fx(
                 L_frameTCX = idiv1616( L_frameTCX, ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV );                                          /* Q0 */
 
                 /* This operation is resulting in some high MLDs in fixed point. */
-                v_multc_fixed_16( sts[0]->hTcxEnc->spectrum_fx[k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), sts[0]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* Q31-spectrum_e[k] */
-                v_multc_fixed_16( mdst_spectrum_fx[0][k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), mdst_spectrum_fx[0][k], L_frameTCX );                   /* q_spec */
+                v_multc_fixed_16( sts[0]->hTcxEnc->spectrum_fx[k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), sts[0]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* exp: exp_spec */
+                v_multc_fixed_16( mdst_spectrum_fx[0][k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), mdst_spectrum_fx[0][k], L_frameTCX );                   /* exp: exp_mdct_spec */
             }
         }
     }
@@ -358,7 +357,7 @@ void stereo_coder_tcx_fx(
                     move16();
                     const Word16 sfbWidth = sub( endLine, startLine );
 
-                    nrgRatio_e[0] = nrgRatio_e[1] = sub( Q31, q_spec );
+                    nrgRatio_e[0] = nrgRatio_e[1] = exp_spec;
                     move16();
                     move16();
 
@@ -372,10 +371,12 @@ void stereo_coder_tcx_fx(
                     {
                         Word32 tmp_fx;
                         Word16 tmp_e;
-                        tmp_e = sub( Q31, q_spec );
+                        tmp_e = exp_mdct_spec;
+                        move16();
                         tmp_fx = sum2_32_fx( &mdst_spectrum_fx[0][k][startLine], sfbWidth, &tmp_e );                               /* Q31-tmp_e */
                         nrgRatio_fx[0] = BASOP_Util_Add_Mant32Exp( nrgRatio_fx[0], nrgRatio_e[0], tmp_fx, tmp_e, &nrgRatio_e[0] ); /* Q31-nrgRatio_e[0] */
-                        tmp_e = sub( Q31, q_spec );
+                        tmp_e = exp_mdct_spec;
+                        move16();
                         tmp_fx = sum2_32_fx( &mdst_spectrum_fx[1][k][startLine], sfbWidth, &tmp_e );                               /* Q31-tmp_e */
                         nrgRatio_fx[1] = BASOP_Util_Add_Mant32Exp( nrgRatio_fx[1], nrgRatio_e[1], tmp_fx, tmp_e, &nrgRatio_e[1] ); /* Q31-nrgRatio_e[1] */
                     }
@@ -384,14 +385,14 @@ void stereo_coder_tcx_fx(
                         Word16 fTemp_e, tmp_e;
                         Word32 fTemp_fx = BASOP_Util_Add_Mant32Exp( nrgRatio_fx[0], nrgRatio_e[0], nrgRatio_fx[1], nrgRatio_e[1], &fTemp_e ); /* Q31-fTemp_e */
                         fTemp_e = sub( fTemp_e, 1 );
-                        nrgRatio_fx[0] = BASOP_Util_Divide3232_Scale_cadence( fTemp_fx, nrgRatio_fx[0], &tmp_e ); /* Q31 - tmp_e - fTemp_e + nrgRatio_e[0] */
+                        nrgRatio_fx[0] = BASOP_Util_Divide3232_Scale_newton( fTemp_fx, nrgRatio_fx[0], &tmp_e ); /* Q31 - tmp_e - fTemp_e + nrgRatio_e[0] */
                         move32();
                         nrgRatio_e[0] = add( tmp_e, sub( fTemp_e, nrgRatio_e[0] ) );
                         move16();
                         nrgRatio_fx[0] = Sqrt32( nrgRatio_fx[0], &nrgRatio_e[0] ); /* Q31-nrgRatio_e[0] */
                         move32();
 
-                        nrgRatio_fx[1] = BASOP_Util_Divide3232_Scale_cadence( fTemp_fx, nrgRatio_fx[1], &tmp_e ); /* Q31 - tmp_e - fTemp_e + nrgRatio_e[1] */
+                        nrgRatio_fx[1] = BASOP_Util_Divide3232_Scale_newton( fTemp_fx, nrgRatio_fx[1], &tmp_e ); /* Q31 - tmp_e - fTemp_e + nrgRatio_e[1] */
                         move32();
                         nrgRatio_e[1] = add( tmp_e, sub( fTemp_e, nrgRatio_e[1] ) );
                         move16();
@@ -428,15 +429,15 @@ void stereo_coder_tcx_fx(
                         move32();
 
 
-                        v_multc_fixed( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[0], &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* q_spec+30-31 */
-                        v_multc_fixed( &mdst_spectrum_fx[0][k][startLine], nrgRatio_fx[0], &mdst_spectrum_fx[0][k][startLine], sfbWidth );                   /* q_spec+30-31 */
-                        scale_sig32( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 );                                                            // Scaling back to q_spec
-                        scale_sig32( &mdst_spectrum_fx[0][k][startLine], sfbWidth, Q1 );                                                                     // Scaling back to q_spec
+                        v_multc_fixed( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[0], &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* exp: exp_spec+1 */
+                        v_multc_fixed( &mdst_spectrum_fx[0][k][startLine], nrgRatio_fx[0], &mdst_spectrum_fx[0][k][startLine], sfbWidth );                   /* exp: exp_mdct_spec+1 */
+                        scale_sig32( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 );                                                            // exp: exp_spec
+                        scale_sig32( &mdst_spectrum_fx[0][k][startLine], sfbWidth, Q1 );                                                                     // exp: exp_mdct_spec
 
-                        v_multc_fixed( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[1], &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* q_spec+30-31 */
-                        v_multc_fixed( &mdst_spectrum_fx[1][k][startLine], nrgRatio_fx[1], &mdst_spectrum_fx[1][k][startLine], sfbWidth );                   /* q_spec+30-31 */
-                        scale_sig32( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 );                                                            // Scaling back to q_spec
-                        scale_sig32( &mdst_spectrum_fx[1][k][startLine], sfbWidth, Q1 );                                                                     // Scaling back to q_spec
+                        v_multc_fixed( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[1], &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* exp: exp_spec+1 */
+                        v_multc_fixed( &mdst_spectrum_fx[1][k][startLine], nrgRatio_fx[1], &mdst_spectrum_fx[1][k][startLine], sfbWidth );                   /* exp: exp_mdct_spec+1 */
+                        scale_sig32( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 );                                                            // exp: exp_spec
+                        scale_sig32( &mdst_spectrum_fx[1][k][startLine], sfbWidth, Q1 );                                                                     // exp: exp_mdct_spec
                     }
                 }
             }
@@ -471,11 +472,11 @@ void stereo_coder_tcx_fx(
             nAvailBitsMS[k] = idiv1616( nAvailBitsMS[k], nSubframes ); /* Q0 */
             move16();
 
-            MsStereoDecision_fx( sfbConf, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], inv_spectrum_fx[0][k], inv_spectrum_fx[1][k], q_spec, &hStereoMdct->mdct_stereo_mode[k], &ms_mask[k][0], nAvailBitsMS[k] );
+            MsStereoDecision_fx( sfbConf, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], inv_spectrum_fx[0][k], inv_spectrum_fx[1][k], sub( Q31, exp_spec ), &hStereoMdct->mdct_stereo_mode[k], &ms_mask[k][0], nAvailBitsMS[k] );
 
             IF( sts[0]->igf )
             {
-                IGFEncStereoEncoder_fx( sfbConf, sts[0]->hIGFEnc, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], q_spec, &ms_mask[k][0],
+                IGFEncStereoEncoder_fx( sfbConf, sts[0]->hIGFEnc, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], sub( Q31, exp_spec ), &ms_mask[k][0],
                                         &hStereoMdct->IGFStereoMode[k], hStereoMdct->mdct_stereo_mode[k], (Word16) EQ_16( sts[0]->core, TCX_20_CORE ), (Word16) EQ_16( sts[0]->last_core, ACELP_CORE ) );
             }
             ELSE
@@ -838,52 +839,67 @@ void convertToMS_fx(
 
 /*! r: SQ gain */
 static Word32 SQ_gain_estimate_stereo_fx( // e_res
-    Word32 xL_fx[],                       /* i  : L vector to quantize        Q31-e_xL*/
-    Word16 e_xL,
-    Word32 xR_fx[], /* i  : R vector to quantize        Q31-e_xR*/
-    Word16 e_xR,
+    const Word32 xL_fx[],                 /* i  : L vector to quantize        Q31-e_xL*/
+    const Word16 e_xL,
+    const Word32 xR_fx[], /* i  : R vector to quantize        Q31-e_xR*/
+    const Word16 e_xR,
     const Word16 nbitsSQ, /* i  : number of bits targeted     Q0*/
     const Word16 lg,      /* i  : vector size (2048 max)      Q0*/
     Word16 *e_res )
 {
-    Word16 i, q, iter, e_ener, e_tmp;
+    Word16 i, q, iter, e_ener, e_xL_2, e_xR_2, s;
     Word32 ener_fx, tmp_32, target_fx, fac_fx, offset_fx;
-    Word32 en_fx[N_MAX / 2]; // Q(26)
+    Word32 en_fx[N_MAX / 2]; // Q25
     Word16 lg2, lg_4, lg2_4;
+    Word64 W_tmp, _0_01;
 
     lg_4 = shr( lg, 2 );    /* Q0 */
     lg2_4 = shl( lg_4, 1 ); /* Q0 */
     lg2 = shl( lg2_4, 2 );  /* Q0 */
     i = 0;
     move16();
+    e_xL_2 = shl( e_xL, 1 );
+    e_xR_2 = shl( e_xR, 1 );
+    _0_01 = W_shr( 21474836 /* 0.01 in Q31 */, sub( e_xL_2, 32 ) ); // 0.01 in 2*(Q of specL/R) + 1
 
-    set32_fx( en_fx, 21474836 /* 0.01 in Q31 */, idiv1616( N_MAX, 2 ) );
+    set32_fx( en_fx, 335544 /* 0.01 in Q25 */, ( N_MAX / 2 ) );
 
     /* energy of quadruples with 9dB offset */
     /* ignore that we may take no all lines into account, max. 3 lines at the upper end of the spectrum can be missed (if lg is not a multiple of 4, happens also in SQGain()*/
 
     FOR( q = 0; q < lg_4; q++ )
     {
-        ener_fx = BASOP_Util_Add_Mant32Exp( 21474836 /*0.01 in Q15*/, 0, Mpy_32_32( xL_fx[i], xL_fx[i] ), e_xL * 2, &e_ener ); /* Q31-e_ener */
-        ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, Mpy_32_32( xL_fx[i + 1], xL_fx[i + 1] ), e_xL * 2, &e_ener );     /* Q31-e_ener */
-        ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, Mpy_32_32( xL_fx[i + 2], xL_fx[i + 2] ), e_xL * 2, &e_ener );     /* Q31-e_ener */
-        ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, Mpy_32_32( xL_fx[i + 3], xL_fx[i + 3] ), e_xL * 2, &e_ener );     /* Q31-e_ener */
-        en_fx[q] = BASOP_Util_Log2( ener_fx );                                                                                 /* saves a MAC */
+        W_tmp = W_mac_32_32( _0_01, xL_fx[i], xL_fx[i] );         // 2 * e_xL
+        W_tmp = W_mac_32_32( W_tmp, xL_fx[i + 1], xL_fx[i + 1] ); // 2 * e_xL
+        W_tmp = W_mac_32_32( W_tmp, xL_fx[i + 2], xL_fx[i + 2] ); // 2 * e_xL
+        W_tmp = W_mac_32_32( W_tmp, xL_fx[i + 3], xL_fx[i + 3] ); // 2 * e_xL
+
+        s = W_norm( W_tmp );
+        ener_fx = W_extract_h( W_shl( W_tmp, s ) );
+        e_ener = sub( e_xL_2, s );
+
+        en_fx[q] = BASOP_Util_Log2( ener_fx ); /* saves a MAC */
         move32();
-        en_fx[q] = Mpy_32_16_1( L_add( e_ener * ONE_IN_Q25, en_fx[q] ), 9864 /* log10(2) in Q15 */ ); // Q(25)
+        en_fx[q] = Mpy_32_16_1( L_add( L_shl( e_ener, Q25 ), en_fx[q] ), 9864 /* log10(2) in Q15 */ ); // Q(25)
         move32();
         i = add( i, 4 );
     }
     i = 0;
+    move16();
     FOR( ; q < lg2_4; q++ )
     {
-        ener_fx = BASOP_Util_Add_Mant32Exp( 21474836 /*0.01 Q15*/, 0, Mpy_32_32( xR_fx[i], xR_fx[i] ), e_xR * 2, &e_ener ); /* Q31-e_ener */
-        ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, Mpy_32_32( xR_fx[i + 1], xR_fx[i + 1] ), e_xR * 2, &e_ener );  /* Q31-e_ener */
-        ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, Mpy_32_32( xR_fx[i + 2], xR_fx[i + 2] ), e_xR * 2, &e_ener );  /* Q31-e_ener */
-        ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, Mpy_32_32( xR_fx[i + 3], xR_fx[i + 3] ), e_xR * 2, &e_ener );  /* Q31-e_ener */
-        en_fx[q] = BASOP_Util_Log2( ener_fx );                                                                              /* saves a MAC */
+        W_tmp = W_mac_32_32( _0_01, xR_fx[i], xR_fx[i] );         // 2 * e_xR
+        W_tmp = W_mac_32_32( W_tmp, xR_fx[i + 1], xR_fx[i + 1] ); // 2 * e_xR
+        W_tmp = W_mac_32_32( W_tmp, xR_fx[i + 2], xR_fx[i + 2] ); // 2 * e_xR
+        W_tmp = W_mac_32_32( W_tmp, xR_fx[i + 3], xR_fx[i + 3] ); // 2 * e_xR
+
+        s = W_norm( W_tmp );
+        ener_fx = W_extract_h( W_shl( W_tmp, s ) );
+        e_ener = sub( e_xR_2, s );
+
+        en_fx[q] = BASOP_Util_Log2( ener_fx ); /* saves a MAC */
         move32();
-        en_fx[q] = Mpy_32_16_1( L_add( e_ener * ONE_IN_Q25, en_fx[q] ), 9864 /* log10(2) in Q15 */ ); // Q(25)
+        en_fx[q] = Mpy_32_16_1( L_add( L_shl( e_ener, Q25 ), en_fx[q] ), 9864 /* log10(2) in Q15 */ ); // Q(25)
         move32();
         i = add( i, 4 );
     }
@@ -900,24 +916,20 @@ static Word32 SQ_gain_estimate_stereo_fx( // e_res
     {
         fac_fx = L_shr( fac_fx, 1 );            /* Q25 */
         offset_fx = L_sub( offset_fx, fac_fx ); /* Q25 */
-        ener_fx = 0;
-        move32();
-        e_ener = 0;
-        move16();
+        W_tmp = 0;
+        move64();
 
         FOR( i = 0; i < lg2_4; i++ )
         {
             tmp_32 = L_sub( en_fx[i], offset_fx ); /* Q25 */
-            e_tmp = 6;
-            move16();
 
             /* avoid SV with 1 bin of amp < 0.5f */
             IF( GT_32( tmp_32, 10066329 /*0.3 Q25*/ ) )
             {
-                ener_fx = BASOP_Util_Add_Mant32Exp( ener_fx, e_ener, tmp_32, e_tmp, &e_ener ); /* Q31-e_ener */
+                W_tmp = W_add( W_tmp, W_deposit32_l( tmp_32 ) ); /* Q25 */
 
                 /* if ener is above target -> break and increase offset */
-                IF( L_shl_sat( ener_fx, sub( e_ener, Q13 ) ) > target_fx )
+                IF( GT_64( W_tmp, W_shl( W_deposit32_l( target_fx ), 7 ) ) )
                 {
                     offset_fx = L_add( offset_fx, fac_fx ); /* Q25 */
                     BREAK;
diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc_fx.c
similarity index 90%
rename from lib_enc/ivas_stereo_switching_enc.c
rename to lib_enc/ivas_stereo_switching_enc_fx.c
index a1e5592e530ba3eb58a1308473ff2151c020dbf8..a54e56fb9a42651b8f8a61ea9c092cb971cd0b1d 100644
--- a/lib_enc/ivas_stereo_switching_enc.c
+++ b/lib_enc/ivas_stereo_switching_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,14 +34,12 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 #include "ivas_rom_com.h"
 #include "assert.h"
 #include "wmc_auto.h"
 #include "prot_fx_enc.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------*
@@ -241,16 +239,12 @@ ivas_error stereo_memory_enc_fx(
     test();
     IF( hCPE->hStereoTCA != NULL && EQ_16( hCPE->last_element_mode, IVAS_CPE_DFT ) )
     {
-#ifdef FIX_1132_STACK_CORRUPTION
-        Word16 tmp = extract_h( abs( hCPE->hStereoDft->hItd->itd_fx[1] ) );
+        Word16 tmp = extract_h( L_abs( hCPE->hStereoDft->hItd->itd_fx[1] ) );
         if ( hCPE->hStereoDft->hItd->itd_fx[1] < 0 )
         {
             tmp = negate( tmp );
         }
         set16_fx( hCPE->hStereoTCA->prevCorrLagStats, tmp, 3 );
-#else
-        set16_fx( hCPE->hStereoTCA->prevCorrLagStats, extract_h( hCPE->hStereoDft->hItd->itd_fx[1] ), 3 );
-#endif
         IF( hCPE->hStereoDft->hItd->itd_fx[1] >= 0 )
         {
             hCPE->hStereoTCA->prevRefChanIndx = L_CH_INDX;
@@ -368,8 +362,8 @@ ivas_error stereo_memory_enc_fx(
         IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) && ( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) || EQ_16( hCPE->element_mode, IVAS_CPE_TD ) ) )
         {
             /* Deallocate MDCT CNG structures */
-            deleteCldfb_ivas( &hCPE->hCoreCoder[0]->cldfbAnaEnc );
-            deleteCldfb_ivas( &hCPE->hCoreCoder[1]->cldfbAnaEnc );
+            deleteCldfb_ivas_fx( &hCPE->hCoreCoder[0]->cldfbAnaEnc );
+            deleteCldfb_ivas_fx( &hCPE->hCoreCoder[1]->cldfbAnaEnc );
 
             IF( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
             {
@@ -419,7 +413,7 @@ ivas_error stereo_memory_enc_fx(
             /* allocate CLDFB for primary channel */
             IF( st->cldfbAnaEnc == NULL )
             {
-                IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -435,7 +429,7 @@ ivas_error stereo_memory_enc_fx(
 
                 IF( st->cldfbSynTd == NULL )
                 {
-                    IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                    IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                     {
                         return error;
                     }
@@ -450,10 +444,8 @@ ivas_error stereo_memory_enc_fx(
                 }
 
                 fd_bwe_enc_init_fx( st->hBWE_FD );
-#ifdef MSAN_FIX
                 st->Q_old_wtda = 0;
                 move16();
-#endif
             }
 
             /* allocate stereo CNG structure */
@@ -589,7 +581,7 @@ ivas_error stereo_memory_enc_fx(
                 FOR( i = 0; i < CPE_CHANNELS; i++ )
                 {
                     st = hCPE->hCoreCoder[i];
-                    IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                    IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                     {
                         return error;
                     }
@@ -636,23 +628,6 @@ ivas_error stereo_memory_enc_fx(
     return error;
 }
 
-static void v_multc_fixed_32_16(
-    const Word16 x[], /* i  : Input vector                                     Qx*/
-    const Word32 c,   /* i  : Constant                                         Q31*/
-    Word32 y[],       /* o  : Output vector that contains c*x                  Qx*/
-    const Word16 N    /* i  : Vector length                                    Q0*/
-)
-{
-    Word16 i;
-
-    FOR( i = 0; i < N; i++ )
-    {
-        y[i] = Mpy_32_16_1( c, x[i] ); /* Q16+Qx */
-        move32();
-    }
-
-    return;
-}
 /*-------------------------------------------------------------------*
  * Function stereo_switching_enc()
  *
@@ -661,7 +636,7 @@ static void v_multc_fixed_32_16(
 
 void stereo_switching_enc_fx(
     CPE_ENC_HANDLE hCPE,           /* i  : CPE encoder structure               */
-    Word16 old_input_signal_pri[], /* i  : old input signal of primary channel q_inp*/
+    Word32 old_input_signal_pri[], /* i  : old input signal of primary channel q_inp*/
     const Word16 input_frame,      /* i  : input frame length                  Q0*/
     const Word16 q_inp )
 {
@@ -680,16 +655,18 @@ void stereo_switching_enc_fx(
     {
         FOR( n = 0; n < CPE_CHANNELS; n++ )
         {
-            Copy( sts[n]->input_fx + input_frame - dft_ovl, hCPE->input_mem_fx[n], dft_ovl ); /* sts[n]->q_inp */
+            Copy_Scale_sig32_16( sts[n]->input32_fx + input_frame - dft_ovl, hCPE->input_mem_fx[n], dft_ovl, 0 ); /* sts[n]->q_inp32 - 16*/
+            hCPE->q_input_mem[n] = sub( sts[n]->q_inp32, 16 );
+            move16();
         }
     }
 
     /* save original stereo input (MDCT overlap part) for both channels in unused old input of right channel for possible DFT->MDCT transition */
     IF( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
     {
-        Copy( sts[0]->input_fx + sub( (Word16) Mpy_32_32( sts[0]->input_Fs, 42949673 /* 1/50 in Q31*/ ), sts[0]->encoderLookahead_FB ), sts[1]->input_fx - shl( sts[0]->encoderLookahead_FB, 1 ), sts[0]->encoderLookahead_FB ); /* sts[0]->q_inp */
+        Copy32( sts[0]->input32_fx + sub( extract_l( Mpy_32_32( sts[0]->input_Fs, 42949673 /* 1/50 in Q31*/ ) ), sts[0]->encoderLookahead_FB ), sts[1]->input32_fx - shl( sts[0]->encoderLookahead_FB, 1 ), sts[0]->encoderLookahead_FB ); /* sts[0]->q_inp32 */
 
-        Copy( sts[1]->input_fx + sub( (Word16) Mpy_32_32( sts[1]->input_Fs, 42949673 /* 1/50 in Q31*/ ), sts[1]->encoderLookahead_FB ), sts[1]->input_fx - sts[1]->encoderLookahead_FB, sts[1]->encoderLookahead_FB ); /* sts[1]->q_inp */
+        Copy32( sts[1]->input32_fx + sub( extract_l( Mpy_32_32( sts[1]->input_Fs, 42949673 /* 1/50 in Q31*/ ) ), sts[1]->encoderLookahead_FB ), sts[1]->input32_fx - sts[1]->encoderLookahead_FB, sts[1]->encoderLookahead_FB ); /* sts[1]->q_inp32 */
     }
 
 
@@ -700,7 +677,7 @@ void stereo_switching_enc_fx(
         /* window DFT synthesis overlap memory @input_Fs, primary channel */
         FOR( i = 0; i < dft_ovl; i++ )
         {
-            hCPE->hStereoDft->output_mem_dmx_fx[i] = L_shr( Mpy_32_16_r( hCPE->hStereoDft->win_fx[dft_ovl - 1 - i], old_input_signal_pri[input_frame - dft_ovl + i] ), add( q_inp, 1 ) ); // Q31 + q_inp - Q15 - (q_inp + 1) -> Q15
+            hCPE->hStereoDft->output_mem_dmx_fx[i] = L_shl( Mpy_32_32_r( hCPE->hStereoDft->win_fx[dft_ovl - 1 - i], old_input_signal_pri[input_frame - dft_ovl + i] ), sub( 15, q_inp ) ); // Q15
             move32();
         }
         /* reset 48kHz BWE overlap memory */
@@ -734,7 +711,7 @@ void stereo_switching_enc_fx(
         /* update DFT synthesis overlap memory @12.8kHz */
         FOR( i = 0; i < STEREO_DFT_OVL_12k8; i++ )
         {
-            hCPE->hStereoDft->output_mem_dmx_12k8_fx[i] = L_shr( Mpy_32_16_r( hCPE->hStereoDft->win_12k8_fx[STEREO_DFT_OVL_12k8 - 1 - i], sts[0]->buf_speech_enc[L_FRAME32k + L_FRAME - STEREO_DFT_OVL_12k8 + i] ), q_inp + 1 ); /* Q15 */
+            hCPE->hStereoDft->output_mem_dmx_12k8_fx[i] = L_shr( Mpy_32_16_r( hCPE->hStereoDft->win_12k8_fx[STEREO_DFT_OVL_12k8 - 1 - i], sts[0]->buf_speech_enc[L_FRAME32k + L_FRAME - STEREO_DFT_OVL_12k8 + i] ), sub( 16, sts[0]->exp_buf_speech_enc ) ); /* Q15 */
             move32();
         }
         Word16 q_dmx = Q15;
@@ -822,10 +799,10 @@ void stereo_switching_enc_fx(
             offset = sub( sts[0]->cldfbAnaEnc->p_filter_length, sts[0]->cldfbAnaEnc->no_channels ); /* Q0 */
             FOR( i = 0; i < offset; i++ )
             {
-                sts[0]->cldfbAnaEnc->cldfb_state_fx[i] = L_deposit_h( old_input_signal_pri[input_frame - offset - NS2SA( input_frame * FRAMES_PER_SEC, L_MEM_RECALC_TBE_NS ) + i] ); /* Q16+q_inp */
+                sts[0]->cldfbAnaEnc->cldfb_state_fx[i] = old_input_signal_pri[input_frame - offset - NS2SA_FX2( L_mult0( input_frame, FRAMES_PER_SEC ), L_MEM_RECALC_TBE_NS ) + i]; /* q_inp */
                 move32();
             }
-            sts[0]->cldfbAnaEnc->Q_cldfb_state = add( Q16, q_inp );
+            sts[0]->cldfbAnaEnc->Q_cldfb_state = q_inp;
             move16();
         }
 
@@ -844,18 +821,18 @@ void stereo_switching_enc_fx(
             test();
             IF( hCPE->hStereoTD != NULL && EQ_16( hCPE->hStereoTD->tdm_last_ratio_idx, LRTD_STEREO_LEFT_IS_PRIM ) )
             {
-                v_multc_fixed_32_16( hCPE->hCoreCoder[1]->old_input_signal_fx + sub( input_frame, add( offset, NS2SA( input_frame * FRAMES_PER_SEC, L_MEM_RECALC_TBE_NS ) ) ), -MAX_32, sts[1]->cldfbAnaEnc->cldfb_state_fx, offset ); /* Q16+q_inp */
-                sts[1]->cldfbAnaEnc->Q_cldfb_state = add( Q16, q_inp );
+                v_multc_fixed( hCPE->hCoreCoder[1]->old_input_signal32_fx + sub( input_frame, add( offset, NS2SA_FX2( L_mult0( input_frame, FRAMES_PER_SEC ), L_MEM_RECALC_TBE_NS ) ) ), -MAX_32, sts[1]->cldfbAnaEnc->cldfb_state_fx, offset ); /* Q16+q_inp */
+                sts[1]->cldfbAnaEnc->Q_cldfb_state = q_inp;
                 move16();
             }
             ELSE
             {
                 FOR( i = 0; i < offset; i++ )
                 {
-                    sts[1]->cldfbAnaEnc->cldfb_state_fx[i] = L_shr( L_deposit_h( hCPE->hCoreCoder[1]->old_input_signal_fx[input_frame - offset - NS2SA( input_frame * FRAMES_PER_SEC, L_MEM_RECALC_TBE_NS ) + i] ), 5 ); /* Q11+q_inp */
+                    sts[1]->cldfbAnaEnc->cldfb_state_fx[i] = ( hCPE->hCoreCoder[1]->old_input_signal32_fx[input_frame - offset - NS2SA_FX2( L_mult0( input_frame, FRAMES_PER_SEC ), L_MEM_RECALC_TBE_NS ) + i] ); /* q_inp */
                     move32();
                 }
-                sts[1]->cldfbAnaEnc->Q_cldfb_state = add( Q16 - 5, q_inp );
+                sts[1]->cldfbAnaEnc->Q_cldfb_state = q_inp;
                 move16();
             }
 
@@ -921,6 +898,8 @@ void stereo_switching_enc_fx(
         IF( sts[0]->hLPDmem != NULL )
         {
             Copy( sts[0]->hLPDmem->old_exc, sts[1]->hLPDmem->old_exc, L_EXC_MEM );
+            sts[1]->hLPDmem->q_lpd_old_exc = sts[0]->hLPDmem->q_lpd_old_exc;
+            move16();
         }
         Copy( sts[0]->lsf_old_fx, sts[1]->lsf_old_fx, M );   /* Qlog2(2.56) */
         Copy( sts[0]->lsp_old_fx, sts[1]->lsp_old_fx, M );   /* Q15 */
@@ -935,9 +914,9 @@ void stereo_switching_enc_fx(
             tmp_fx = div_s( 64, shl( sts[0]->encoderLookahead_FB, Q6 ) ); /* Q15 */
             FOR( i = 0; i < sts[0]->encoderLookahead_FB; i++ )
             {
-                sts[1]->input32_fx[-sts[0]->encoderLookahead_FB + i] = L_shr( Mpy_32_16_1( L_add( Mpy_32_16_1( sts[0]->input32_fx[-sts[0]->encoderLookahead_FB + i], sts[0]->encoderLookahead_FB - i ), Mpy_32_16_1( sts[1]->input32_fx[-sts[0]->encoderLookahead_FB + i], i ) ), tmp_fx ), 13 ); /* q_inp32+0-15+15-15-13 */
+                sts[1]->input32_fx[-sts[0]->encoderLookahead_FB + i] = ( Mpy_32_16_1( L_add( imult3216( sts[0]->input32_fx[-sts[0]->encoderLookahead_FB + i], sts[0]->encoderLookahead_FB - i ), imult3216( sts[1]->input32_fx[-sts[0]->encoderLookahead_FB + i], i ) ), tmp_fx ) ); /* sts[0]->q_inp32 */
                 move32();
-                sts[0]->input32_fx[-sts[0]->encoderLookahead_FB + i] = L_shr( Mpy_32_16_1( L_add( Mpy_32_16_1( sts[0]->input32_fx[-sts[0]->encoderLookahead_FB + i], sts[0]->encoderLookahead_FB - i ), Mpy_32_16_1( sts[1]->input32_fx[-2 * sts[0]->encoderLookahead_FB + i], i ) ), tmp_fx ), 13 ); /* q_inp32+0-15+15-15-13 */
+                sts[0]->input32_fx[-sts[0]->encoderLookahead_FB + i] = ( Mpy_32_16_1( L_add( imult3216( sts[0]->input32_fx[-sts[0]->encoderLookahead_FB + i], sts[0]->encoderLookahead_FB - i ), imult3216( sts[1]->input32_fx[-2 * sts[0]->encoderLookahead_FB + i], i ) ), tmp_fx ) ); /* sts[0]->q_inp32 */
                 move32();
             }
             /* restore continuous signal in right channel (part of old_output was used to store original left channel) */
diff --git a/lib_enc/ivas_stereo_td_analysis.c b/lib_enc/ivas_stereo_td_analysis_fx.c
similarity index 97%
rename from lib_enc/ivas_stereo_td_analysis.c
rename to lib_enc/ivas_stereo_td_analysis_fx.c
index 58e72c91e38992ca05fab77506bbfdfa492344d5..909d0c206f5dd2718f1a229b6d52ef6e42aba110 100644
--- a/lib_enc/ivas_stereo_td_analysis.c
+++ b/lib_enc/ivas_stereo_td_analysis_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,14 +35,12 @@
 #include <math.h>
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_cnst.h"
 #include "rom_enc.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 
@@ -73,14 +71,13 @@
 
 #define RATIO_MAX 1.5f /* Maximum correlation ratio */
 
-#define RATIO_MAX_FX_Q30 ( 1610612736 ) /* 1.5f in Q30 */ /* Maximum correlation ratio */
-#define RATIO_MAX_FX_Q24 ( 2516582 ) /* 1.5f in Q24 */    /* Maximum correlation ratio */
-#define RATIO_MAX_FX_Q23 ( 1258291 ) /* 1.5f in Q23 */    /* Maximum correlation ratio */
-
-#define LIMIT_ADAP_FAC_FX_Q16 ( 9830 )    /* 0.15f in Q16 */
-#define MIN_ADAP_FAC_FX_Q16   ( 6554 )    /*0.1f in Q16*/
-#define M_ADAP_FX_Q31         ( 1932735 ) /* 0.0009f in Q31 */
-#define B_ADAP_FX_Q16         ( 10486 )   /* 0.16f in Q16 */
+#define RATIO_MAX_FX_Q30      ( 1610612736 ) /* 1.5f in Q30 */ /* Maximum correlation ratio */
+#define RATIO_MAX_FX_Q24      ( 25165824 ) /* 1.5f in Q24 */   /* Maximum correlation ratio */
+#define RATIO_MAX_FX_Q23      ( 12582912 ) /* 1.5f in Q23 */   /* Maximum correlation ratio */
+#define LIMIT_ADAP_FAC_FX_Q16 ( 9830 )                         /* 0.15f in Q16 */
+#define MIN_ADAP_FAC_FX_Q16   ( 6554 )                         /*0.1f in Q16*/
+#define M_ADAP_FX_Q31         ( 1932735 )                      /* 0.0009f in Q31 */
+#define B_ADAP_FX_Q16         ( 10486 )                        /* 0.16f in Q16 */
 
 #define PC_LIMIT       64
 #define RATIO_PG_HR    0.94f
@@ -258,7 +255,7 @@ Word16 stereo_tdm_ener_analysis_fx(
         rms_thd_fx = L_shr( rms_thd_fx, 2 ); /*Q16*/ /*rms_thd_fx *= 0.25f*/
         test();
         test();
-        IF( LE_32( hStereoTD->tdm_lt_rms_L_fx, 4915200 /* 75 in Q16*/ ) || LE_32( hStereoTD->tdm_lt_rms_R_fx, 75 /* 75 in Q16*/ ) /*|| sts[0]->last_coder_type == TRANSITION */ )
+        IF( LE_32( hStereoTD->tdm_lt_rms_L_fx, 4915200 /* 75 in Q16*/ ) || LE_32( hStereoTD->tdm_lt_rms_R_fx, 4915200 /* 75 in Q16*/ ) /*|| sts[0]->last_coder_type == TRANSITION */ )
         {
             rms_thd_fx = L_shr( rms_thd_fx, 5 ); /* Q16*/ /*rms_thd_fx *= 0.03125f*/
         }
@@ -332,6 +329,8 @@ Word16 stereo_tdm_ener_analysis_fx(
         move16();
     }
 
+    rms_L_fx = L_shl( rms_L_fx, sub( Q16, q_rms_L ) ); /* All the following energy comparison are done in Q16 */
+    rms_R_fx = L_shl( rms_R_fx, sub( Q16, q_rms_R ) );
     test();
     IF( EQ_16( hStereoTD->prev_fr_LRTD_TD_dec, 1 ) && side_can_change == 0 )
     {
@@ -341,8 +340,8 @@ Word16 stereo_tdm_ener_analysis_fx(
         test();
         IF( ( LE_32( hStereoTD->tdm_lt_rms_L_fx, rms_thd_fx ) && LE_32( hStereoTD->tdm_lt_rms_R_fx, L_shl( rms_thd_fx, 1 ) ) ) ||
             ( LE_32( hStereoTD->tdm_lt_rms_R_fx, rms_thd_fx ) && LE_32( hStereoTD->tdm_lt_rms_L_fx, L_shl( rms_thd_fx, 1 ) ) ) ||
-            ( sts[0]->hVAD->hangover_cnt != 0 && LT_16( sts[1]->hNoiseEst->Etot_last_fx, 3072 /*12 in Q8*/ ) ) ||
-            ( sts[1]->hVAD->hangover_cnt != 0 && LT_16( sts[0]->hNoiseEst->Etot_last_fx, 3072 /*12 in Q8*/ ) ) ||
+            ( sts[0]->hVAD->hangover_cnt != 0 && LT_32( sts[1]->hNoiseEst->Etot_last_32fx, 201326592 /*12 in Q24*/ ) ) ||
+            ( sts[1]->hVAD->hangover_cnt != 0 && LT_32( sts[0]->hNoiseEst->Etot_last_32fx, 201326592 /*12 in Q24*/ ) ) ||
             ( NE_16( sts[0]->hSpMusClas->past_dec[0], sts[1]->hSpMusClas->past_dec[0] ) ) )
         {
             test();
@@ -430,7 +429,7 @@ Word16 stereo_tdm_ener_analysis_fx(
         ELSE
         {
             /*ratio_L = ( 1.0f - cosf( EVS_PI * ratio_L / 2.0f ) ) / 2.0f;*/
-            ratio_L_fx = L_deposit_h( sub( ONE_IN_Q14, getCosWord16( extract_l( Mpy_32_32( 1647099 /* EVS_PI/2 in Q20 */, ratio_L_fx ) ) ) ) ); // Q31 (Q14 + Q1(division by 2.0f) + Q16)
+            ratio_L_fx = L_deposit_h( sub_sat( ONE_IN_Q14, getCosWord16( extract_l( Mpy_32_32( 1647099 /* EVS_PI/2 in Q20 */, ratio_L_fx ) ) ) ) ); // Q31 (Q14 + Q1(division by 2.0f) + Q16)
         }
 
         test();
@@ -478,7 +477,7 @@ Word16 stereo_tdm_ener_analysis_fx(
         {
             test();
             test();
-            IF( GE_32( hCPE->element_brate, IVAS_48k ) && sts[0]->hVAD->hangover_cnt != 0 && LT_32( L_max( hStereoTD->tdm_lt_rms_L_fx, hStereoTD->tdm_lt_rms_R_fx ), 33554432 /* 512.0f */ ) )
+            IF( GE_32( hCPE->element_brate, IVAS_48k ) && sts[0]->hVAD->hangover_cnt != 0 && LT_32( L_max( hStereoTD->tdm_lt_rms_L_fx, hStereoTD->tdm_lt_rms_R_fx ), 33554432 /* 512.0f in Q16*/ ) )
             {
                 ratio_L_fx = check_bounds_l( ratio_L_fx, 644245094 /*0.3f in Q31*/, 1503238554 /*0.7f in Q31*/ ); /* Q31 */
             }
@@ -487,7 +486,7 @@ Word16 stereo_tdm_ener_analysis_fx(
             test();
             test();
             test();
-            IF( ( GT_32( hCPE->hStereoTCA->instTargetGain_fx, 644245094 /*1.2f in Q29*/ ) || GT_32( hCPE->hStereoTCA->targetGain_fx, ONE_IN_Q29 ) ) && LT_32( ratio_L_fx, 858993459 /*0.4f*/ ) )
+            IF( ( GT_32( hCPE->hStereoTCA->instTargetGain_fx, 644245094 /*1.2f in Q29*/ ) || GT_32( hCPE->hStereoTCA->targetGain_fx, ONE_IN_Q29 ) ) && LT_32( ratio_L_fx, 858993459 /*0.4f  in Q31*/ ) )
             {
                 ratio_L_fx = 858993459; /*0.4f in Q31*/
                 move32();
@@ -565,7 +564,7 @@ Word16 stereo_tdm_ener_analysis_fx(
         }
     }
 
-    IF( LT_16( sub( sts[1]->lp_speech_fx, sts[1]->lp_noise_fx ), 12800 /*50.0f*/ ) ) /* likely presence of noisy content */
+    IF( LT_16( sub( sts[1]->lp_speech_fx, sts[1]->lp_noise_fx ), 12800 /*50.0f in Q8*/ ) ) /* likely presence of noisy content */
     {
         /* pointing in the right direction, inverse it else do nothing */
         test();
@@ -635,14 +634,15 @@ Word16 stereo_tdm_ener_analysis_fx(
         hStereoTD->tdm_last_LRTD_PriCh_cnt = add( hStereoTD->tdm_last_LRTD_PriCh_cnt, 1 );
         move16();
     }
-    ratio_L_fx = tdm_ratio_tabl_fx[idx]; // Q31
+
+    ratio_L_fx = tdm_ratio_tabl_fx_Q30[idx]; // Q30
     move32();
 
     test();
     IF( EQ_16( hStereoTD->tdm_SM_modi_flag, 1 ) && hStereoTD->tdm_LRTD_flag == 0 )
     {
         idx = shr( add( hStereoTD->tdm_last_ratio_idx, add( LRTD_STEREO_MID_IS_PRIM, 1 ) ), 1 );
-        ratio_L_fx = tdm_ratio_tabl_fx[idx]; // Q31
+        ratio_L_fx = tdm_ratio_tabl_fx_Q30[idx]; // Q30
         move32();
     }
 
@@ -731,8 +731,10 @@ Word16 stereo_tdm_ener_analysis_fx(
         move16();
     }
 
-    hCPE->hStereoClassif->ratio_L_fx = ratio_L_fx; /* Q15 */
+    hCPE->hStereoClassif->ratio_L_fx = ratio_L_fx; /* 31 - ratio_L_e */
     move32();
+    hCPE->hStereoClassif->ratio_L_e = 1;
+    move16();
 
     return idx;
 }
@@ -871,8 +873,8 @@ static Word16 Get_dt_lt_ener_fx(
         move32();
         *tdm_lt_rms_R = L_shl( Mpy_32_32( 1932735282 /* 0.9f in Q31 */, rms_R ), sub( Q16, q_rms_R ) ); // (Q31, q_rms_R) -> q_rms_R -> Q16
         move32();
-        L_tmp = Mpy_32_16_1( 1932735282 /* 0.9f in Q31 */, sts[0]->hNoiseEst->Etot_last_fx ); //(Q31, Q8) -> Q24
-        sts[1]->hNoiseEst->Etot_last_fx = extract_h( L_tmp );                                 // (Q24 >> Q16) -> Q8
+        L_tmp = Mpy_32_32( 1932735282 /* 0.9f in Q31 */, sts[0]->hNoiseEst->Etot_last_32fx ); //(Q31, Q24) -> Q24
+        sts[1]->hNoiseEst->Etot_last_32fx = L_tmp;                                            // (Q24 >> Q16) -> Q8
         sts[1]->hVAD->hangover_cnt = 0;
         move16();
     }
@@ -1046,7 +1048,7 @@ static void NOOP_decision_fx(
     }
     ELSE
     {
-        if ( LT_32( sts[0]->ee_old_fx, 160000 /* 5000.f in Q6 */ ) && LT_32( sts[1]->ee_old_fx, 160000 /* 5000.f in Q6 */ ) )
+        if ( LT_32( sts[0]->ee_old_fx, 320000 /* 5000.f in Q6 */ ) && LT_32( sts[1]->ee_old_fx, 320000 /* 5000.f in Q6 */ ) )
         {
             tdm_NOOP_switch_flag = 1;
             move16();
@@ -1709,7 +1711,6 @@ Word16 tdm_lp_comparison_fx(
     Word32 dist_fx, ftmp_fx;
     Word16 i;
     Word32 res_fx[L_FRAME16k];
-    Word16 gb1 = find_guarded_bits_fx( M );
 
     Word16 Q_A_SCh;
     Word32 *speech_fx = &speech_buff[M];
@@ -1720,8 +1721,8 @@ Word16 tdm_lp_comparison_fx(
     // residu( A_SCh, m, speech, res, L_frame );
 
     Word16 gb = find_guarded_bits_fx( L_frame );
-    scale_sig32( speech_buff, L_FRAME + M, gb1 ); /* Q_speech + gb1 */
-    Word16 exp = sub( 31, Q_speech );
+    scale_sig32( speech_buff, L_FRAME + M, Q4 ); /* Q_speech + 4 */
+    Word16 exp = sub( Q27, Q_speech );
     Word32 sum2_value = sum2_32_exp_fx( speech_fx, L_frame, &exp, gb ); // 2*Q_speech -31-gb
     IF( LT_16( exp, -5 ) )                                              /*maximum q to prevent 0.01 from saturating is 37, since we are adding it headroom of 1 is required*/
     {
@@ -1733,7 +1734,7 @@ Word16 tdm_lp_comparison_fx(
     Word32 temp32_log = L_add( BASOP_Util_Log2( sum2_value ), L_shl( sub( Q31, sub( 31, exp ) ), Q25 ) ); /* Q25 */
     ener_sig_fx = Mpy_32_32( temp32_log, 646456623 );                                                     // Q25
     // ener_sig = log10f( sum2_f( speech, L_frame ) + 0.01f );
-    exp = sub( 31, sub( Q_speech, gb1 ) );
+    exp = sub( Q31, Q_speech );
     sum2_value = sum2_32_exp_fx( res_fx, L_frame, &exp, gb );                                      // 2*Q_speech -31-gb
     sum2_value = BASOP_Util_Add_Mant32Exp( sum2_value, exp, 328, Q16, &exp );                      /* Q31-exp */
     temp32_log = L_add( BASOP_Util_Log2( sum2_value ), L_shl( sub( Q31, sub( 31, exp ) ), Q25 ) ); /* Q25 */
@@ -1744,9 +1745,9 @@ Word16 tdm_lp_comparison_fx(
 
     /* Find prediction gain when resuing the Primary Channel LP filter */
     // residu( A_PCh, m, speech, res, L_frame );
-    scale_sig32( speech_buff, L_FRAME + M, negate( gb1 ) ); /* Q_speech */
+    scale_sig32( speech_buff, L_FRAME + M, -4 ); /* Q_speech */
     residu_ivas_fx( A_PCh_fx, sub( 14, norm_s( A_PCh_fx[0] ) ), m, speech_fx, res_fx, L_frame );
-    exp = sub( 31, sub( Q_speech, gb1 ) );
+    exp = sub( Q31, Q_speech );
     sum2_value = sum2_32_exp_fx( res_fx, L_frame, &exp, gb ); // 2*Q_speech -31-gb
     sum2_value = BASOP_Util_Add_Mant32Exp( sum2_value, exp, 328, Q16, &exp );
     temp32_log = L_add( BASOP_Util_Log2( sum2_value ), L_shl( sub( Q31, sub( 31, exp ) ), Q25 ) ); /* Q25 */
@@ -1758,7 +1759,8 @@ Word16 tdm_lp_comparison_fx(
     /* Find Euclidian distance between the 2 filters */
     dist_fx = 0;
     move16();
-    gb = find_guarded_bits_fx( M );
+    gb = 4;
+    move16();
     FOR( i = 0; i < m; i++ )
     {
         // ftmp = isp_SCh[i] - isp_PCh[i];
@@ -2011,7 +2013,7 @@ static void Get_corr_n_fx(
     }
     ELSE
     {
-        *ic_Lm = BASOP_Util_Divide3232_Scale_cadence( corrL, ener, &exp_diff ); // (Q31 - exp_diff)
+        *ic_Lm = BASOP_Util_Divide3232_Scale_newton( corrL, ener, &exp_diff ); // (Q31 - exp_diff)
         move32();
         IF( *ic_Lm == 0 )
         {
@@ -2023,7 +2025,7 @@ static void Get_corr_n_fx(
             *q_ic_Lm = sub( Q31, exp_diff );
             move16();
         }
-        *ic_Rm = BASOP_Util_Divide3232_Scale_cadence( corrR, ener, &exp_diff ); // (Q31 - exp_diff)
+        *ic_Rm = BASOP_Util_Divide3232_Scale_newton( corrR, ener, &exp_diff ); // (Q31 - exp_diff)
         move16();
         IF( *ic_Rm == 0 )
         {
@@ -2039,7 +2041,7 @@ static void Get_corr_n_fx(
         /* *es_em = 10 * ( log10f( sqrtf( ener_side / len ) ) - log10f( sqrtf( ener / len ) ) );
         is simplified to
         *es_em = 10 * ( log10f( sqrtf( ener_side / ener ) ) ); */
-        L_tmp = BASOP_Util_Divide3232_Scale_cadence( ener_side, ener, &exp_diff );                          // (Q31 - exp_diff)
+        L_tmp = BASOP_Util_Divide3232_Scale_newton( ener_side, ener, &exp_diff );                           // (Q31 - exp_diff)
         L_tmp = Sqrt32( L_tmp, &exp_diff );                                                                 /* (Q31 - exp_diff) */
         L_tmp = BASOP_Util_Log2( L_tmp );                                                                   /* Q25 */
         *es_em = Mpy_32_32( Mpy_32_32( L_add( L_tmp, L_shl( exp_diff, Q25 ) ), LOG10_2_Q31 ), TEN_IN_Q27 ); // (Q25, Q27) -> Q21
diff --git a/lib_enc/ivas_stereo_td_enc.c b/lib_enc/ivas_stereo_td_enc_fx.c
similarity index 98%
rename from lib_enc/ivas_stereo_td_enc.c
rename to lib_enc/ivas_stereo_td_enc_fx.c
index a06c30301f01b177e5479575a7f2a72e33203533..8f1d2d9c9c46d088fd8d6375b55d48e2028fd660 100644
--- a/lib_enc/ivas_stereo_td_enc.c
+++ b/lib_enc/ivas_stereo_td_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,8 +35,7 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #ifdef DEBUGGING
@@ -44,7 +43,6 @@
 #endif
 #include "prot_fx_enc.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 
@@ -197,7 +195,7 @@ void stereo_td_init_enc_fx(
     move32();
     hStereoTD->tdm_hBstr_tmp.ivas_max_num_indices = &hStereoTD->max_ind_tdm_tmp;
     hStereoTD->tdm_hBstr_tmp.st_ivas = NULL;
-    reset_indices_enc( &hStereoTD->tdm_hBstr_tmp, MAX_IND_TDM_TMP );
+    reset_indices_enc_fx( &hStereoTD->tdm_hBstr_tmp, MAX_IND_TDM_TMP );
 
     return;
 }
@@ -265,7 +263,7 @@ ivas_error stereo_set_tdm_fx(
             /* deallocate CLDFB ana for secondary channel */
             IF( st->cldfbAnaEnc != NULL )
             {
-                deleteCldfb_ivas( &st->cldfbAnaEnc );
+                deleteCldfb_ivas_fx( &st->cldfbAnaEnc );
             }
 
             /* deallocate BWEs for secondary channel */
@@ -277,7 +275,7 @@ ivas_error stereo_set_tdm_fx(
                     st->hBWE_TD = NULL;
                 }
 
-                deleteCldfb_ivas( &st->cldfbSynTd );
+                deleteCldfb_ivas_fx( &st->cldfbSynTd );
 
                 IF( st->hBWE_FD != NULL )
                 {
@@ -311,7 +309,7 @@ ivas_error stereo_set_tdm_fx(
             /* allocate CLDFB ana for secondary channel */
             IF( st->cldfbAnaEnc == NULL )
             {
-                IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -324,7 +322,7 @@ ivas_error stereo_set_tdm_fx(
                 {
                     return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
                 }
-                IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -338,10 +336,8 @@ ivas_error stereo_set_tdm_fx(
                 }
 
                 fd_bwe_enc_init_fx( st->hBWE_FD );
-#ifdef MSAN_FIX
                 st->Q_old_wtda = 0;
                 move16();
-#endif
             }
         }
 
@@ -473,7 +469,7 @@ void tdm_configure_enc_fx(
         }
     }
     ELSE IF( ( LT_16( sts[1]->coder_type, AUDIO ) && NE_16( sts[1]->coder_type, UNVOICED ) ) || /* TC and VC are not supported in secondary channel */
-             ( ( EQ_16( sts[1]->coder_type, AUDIO ) && LE_32( hCPE->element_brate, IVAS_24k4 ) ) || ( EQ_16( sts[0]->sp_aud_decision1, 1 ) && GE_32( hCPE->element_brate, IVAS_16k4 ) ) || ( EQ_16( sts[1]->sp_aud_decision0, 1 ) && GE_32( hCPE->element_brate, IVAS_13k2 ) ) ) )
+             ( ( EQ_16( sts[1]->coder_type, AUDIO ) && LE_32( hCPE->element_brate, IVAS_24k4 ) ) || ( EQ_16( sts[0]->sp_aud_decision1, 1 ) && GE_32( hCPE->element_brate, IVAS_16k4 ) ) || ( EQ_16( sts[1]->sp_aud_decision0, 1 ) && GT_32( hCPE->element_brate, IVAS_13k2 ) ) ) )
     {
         sts[1]->coder_type = GENERIC;
         move16();
@@ -485,7 +481,7 @@ void tdm_configure_enc_fx(
     }
 
     test();
-    IF( GE_32( hCPE->element_brate, IVAS_24k4 ) && EQ_16( hCPE->hStereoClassif->lrtd_mode, 1 ) )
+    IF( GT_32( hCPE->element_brate, IVAS_24k4 ) && EQ_16( hCPE->hStereoClassif->lrtd_mode, 1 ) )
     {
         if ( EQ_16( sts[1]->coder_type, UNVOICED ) )
         {
@@ -1007,9 +1003,8 @@ void stereo_tdm_prep_dwnmx_fx(
     const Word16 input_q      /* i  : frame lenght                      */
 )
 {
-#define USER_ENER
     Word32 mener;
-    int16_t i, sw_pos, enr_len;
+    Word16 i, sw_pos, enr_len;
     Encoder_State **sts;
     Word16 mener_e;
     sts = hCPE->hCoreCoder;
diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc_fx.c
similarity index 83%
rename from lib_enc/ivas_tcx_core_enc.c
rename to lib_enc/ivas_tcx_core_enc_fx.c
index e8a81147a844e71cf9b809d1772a2017861d388e..5f2e9a8e094bc63e7bcff04b9133fe9530f4b5ff 100644
--- a/lib_enc/ivas_tcx_core_enc.c
+++ b/lib_enc/ivas_tcx_core_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,13 +35,11 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_com.h"
 #include "basop_proto_func.h"
 #include "wmc_auto.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "rom_com_fx.h"
 #include "ivas_prot_fx.h"
@@ -80,27 +78,27 @@ void stereo_tcx_init_enc_fx(
         move16();
     }
 
-    st->hTcxCfg->coder_type = st->coder_type;
+    st->hTcxCfg->coder_type = st->coder_type; /* Q0 */
     move16();
     test();
     test();
-    IF( !st->tcxonly && !st->localVAD && EQ_16( st->hTcxCfg->coder_type, GENERIC ) )
+    if ( !st->tcxonly && !st->localVAD && EQ_16( st->hTcxCfg->coder_type, GENERIC ) )
     {
         st->hTcxCfg->coder_type = UNVOICED;
         move16();
     }
 
     /*sampling rate*/
-    total_brate = L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC );
+    total_brate = L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ); /* Q0 */
     st->sr_core = getCoreSamplerateMode2( st->element_mode, total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, st->is_ism_format );
     move32();
     st->fscale = sr2fscale_fx( st->sr_core );
     move16();
 
     /*frame size*/
-    st->L_frame = extract_l( Mpy_32_32( st->sr_core, ONE_BY_FRAMES_PER_SEC_Q31 ) );
+    st->L_frame = extract_l( Mpy_32_32( st->sr_core, ONE_BY_FRAMES_PER_SEC_Q31 ) ); /* Q0 */
     move16();
-    st->hTcxEnc->L_frameTCX = extract_l( Mpy_32_32( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );
+    st->hTcxEnc->L_frameTCX = extract_l( Mpy_32_32( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ); /* Q0 */
     move16();
 
     test();
@@ -119,17 +117,17 @@ void stereo_tcx_init_enc_fx(
     }
 
     /*TCX tools*/
-    st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, total_brate, st->rf_mode );
+    st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, total_brate, st->rf_mode ); /* Q0 */
     move16();
-    st->hTcxCfg->resq = getResq( total_brate );
+    st->hTcxCfg->resq = getResq( total_brate ); /* Q0 */
     move16();
-    st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( total_brate, st->rf_mode, st->element_mode );
+    st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( total_brate, st->rf_mode, st->element_mode ); /* Q0 */
     move16();
-    st->igf = getIgfPresent_fx( st->element_mode, total_brate, st->bwidth, st->rf_mode );
+    st->igf = getIgfPresent_fx( st->element_mode, total_brate, st->bwidth, st->rf_mode ); /* Q0 */
     move16();
     prev_IsTNSAllowed = st->hTcxCfg->fIsTNSAllowed;
     move16();
-    IF( NE_16( st->element_mode, EVS_MONO ) )
+    if ( ( st->element_mode != EVS_MONO ) )
     {
         st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode );
         move16();
@@ -156,8 +154,8 @@ void stereo_tcx_init_enc_fx(
 
 void stereo_tcx_core_enc(
     Encoder_State *st,                /* i/o: encoder state structure                    */
-    const Word16 new_samples_12k8[],  /* i  : buffer of input signal @12.8 kHz           */
-    const Word16 new_samples_16k[],   /* i  : buffer of input signal @16 kHz             */
+    const Word16 new_samples_12k8[],  /* i  : buffer of input signal @12.8 kHz           Q_new*/
+    const Word16 new_samples_16k[],   /* i  : buffer of input signal @16 kHz             Q_new*/
     const Word16 Aw_fx[],             /* i  : weighted A(z) unquant. for subframes, Q12  */
     Word16 lsp_new_fx[],              /* i  : LSPs at the end of the frame, Q15          */
     Word16 lsp_mid_fx[],              /* i  : LSPs in the middle of the frame, Q15       */
@@ -207,7 +205,7 @@ void stereo_tcx_core_enc(
     /*HM*/
     Word16 indexBuffer[2 * ( ( N_MAX / 2 ) + 1 )];
 
-    Word16 s, input_frame;
+    Word16 s;
 
     CONTEXT_HM_CONFIG hm_cfg[2];
 
@@ -244,14 +242,14 @@ void stereo_tcx_core_enc(
      *---------------------------------------------------------------*/
 
     /* Subtract the bits of common header */
-    st->bits_frame_core = extract_l( L_sub( Mpy_32_32( st->total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ), hBstr->nb_bits_tot ) );
+    st->bits_frame_core = extract_l( L_sub( Mpy_32_32( st->total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ), hBstr->nb_bits_tot ) ); /* Q0 */
     move16();
 
     /*Get Bits of TCX header*/
     nbits_header = 3; /* Coder types (2) + last_core for bfi (1) */
     move16();
 
-    IF( st->tcxonly )
+    if ( st->tcxonly )
     {
         /* TCX20/10 flag */
         nbits_header = add( nbits_header, 1 );
@@ -283,7 +281,7 @@ void stereo_tcx_core_enc(
         move16();
 
         /* check minimum pitch for quantization */
-        IF( LT_16( T_op[i], PIT_MIN_SHORTER ) )
+        if ( LT_16( T_op[i], PIT_MIN_SHORTER ) )
         {
             T_op[i] = shl( T_op[i], 1 );
             move16();
@@ -304,11 +302,11 @@ void stereo_tcx_core_enc(
 
     IF( EQ_16( st->L_frame, L_FRAME ) )
     {
-        p_new_samples = new_samples_12k8;
+        p_new_samples = new_samples_12k8; /* Q_new */
     }
     ELSE
     {
-        p_new_samples = new_samples_16k;
+        p_new_samples = new_samples_16k; /* Q_new */
     }
 
     /*--------------------------------------------------------------*
@@ -353,7 +351,7 @@ void stereo_tcx_core_enc(
     q_ind_val = 0;
     move16();
     test();
-    IF( NE_16( st->last_core, ACELP_CORE ) || EQ_16( st->core, TCX_10_CORE ) )
+    if ( ( st->last_core != ACELP_CORE ) || EQ_16( st->core, TCX_10_CORE ) )
     {
         q_ind_val = 1;
         move16();
@@ -374,49 +372,40 @@ void stereo_tcx_core_enc(
      *---------------------------------------------------------------*/
 
     /* TODO: integrate this. */
-#ifdef IVAS_FLOAT_FIXED_CONVERSIONS
     st->prev_Q_new = 0;
     st->Q_old = 0;
-#endif
+
     Q_new = 0;
     move16();
-    input_frame = idiv1616U( extract_l( L_shr( st->input_Fs, 1 ) ), FRAMES_PER_SEC / 2 );
-    Scale_sig( st->input_fx, add( input_frame, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ), negate( st->q_inp ) );
-    Scale_sig( st->old_input_signal_fx, input_frame, negate( st->q_old_inp ) );
-    st->q_old_inp = 0;
-    move16();
-    st->q_inp = 0;
-    move16();
 
     core_signal_analysis_high_bitrate_ivas_fx( p_new_samples, T_op, lsp_new_fx, lsp_mid_fx, st, tnsSize, tnsBits, param_core, &ltpBits, NULL, st->L_frame, hTcxEnc->L_frameTCX, last_element_mode, vad_hover_flag, NULL, NULL, &Q_new, NULL );
 
     bitsAvailable = sub( st->bits_frame_core, nbits_header );
-    IF( st->igf )
+    if ( st->igf )
     {
         bitsAvailable = sub( bitsAvailable, st->hIGFEnc->infoTotalBitsWritten );
     }
 
-    const Word16 Q_ener = Q_new + Q_SCALE - 2; // Q_new + Q_SCALE -2
+    const Word16 Q_ener = add( Q_new, sub( Q_SCALE, 2 ) ); // Q_new + Q_SCALE -2
     Q_exc = Q_new;
     st->prev_Q_new = Q_exc;
+    move16();
+    move16();
+    move16();
 
-    Scale_sig( st->synth, st->L_frame, st->Q_syn );
-    IF( st->tcxonly == 0 )
-    {
-        st->wspeech_enc[st->L_frame - 1] = shl( st->wspeech_enc[st->L_frame - 1], st->Q_syn );
-    }
     IF( st->hTdCngEnc )
     {
         FOR( Word16 ii = 0; ii < HO_HIST_SIZE; ii++ )
         {
-            Scale_sig( st->hTdCngEnc->cng_exc2_buf + ii * L_FFT, L_FFT, sub( Q_exc, st->hTdCngEnc->cng_Qexc_buf[ii] ) );
+            Scale_sig( st->hTdCngEnc->cng_exc2_buf + ii * L_FFT, L_FFT, sub( Q_exc, st->hTdCngEnc->cng_Qexc_buf[ii] ) ); /* Q_exc */
             st->hTdCngEnc->cng_Qexc_buf[ii] = Q_exc;
+            move16();
         }
     }
-    Scale_sig( st->hLPDmem->old_exc, L_EXC_MEM, sub( Q_new, st->hLPDmem->q_lpd_old_exc ) );
+    Scale_sig( st->hLPDmem->old_exc, L_EXC_MEM, sub( Q_new, st->hLPDmem->q_lpd_old_exc ) ); /* Q_exc */
     st->hLPDmem->q_lpd_old_exc = Q_new;
     move16();
-    Scale_sig( st->hLPDmem->syn, M + 1, sub( st->Q_syn, st->hLPDmem->q_lpd_syn ) );
+    Scale_sig( st->hLPDmem->syn, M + 1, sub( st->Q_syn, st->hLPDmem->q_lpd_syn ) ); /* st->Q_syn */
     st->hLPDmem->q_lpd_syn = st->Q_syn;
     move16();
 
@@ -439,8 +428,8 @@ void stereo_tcx_core_enc(
 
         IF( st->rate_switching_reset )
         {
-            Copy( lsp_q_fx, st->lsp_old_fx, M );
-            Copy( lsf_q_fx, st->lsf_old_fx, M );
+            Copy( lsp_q_fx, st->lsp_old_fx, M ); /* Q15 */
+            Copy( lsf_q_fx, st->lsf_old_fx, M ); /* Qx2.56 */
         }
     }
 
@@ -466,7 +455,7 @@ void stereo_tcx_core_enc(
             E_LPC_lsp_lsf_conversion( lsp_fx, lsf_fx, M );
 
             /* Quantize */
-            Q_lsf_tcxlpc_fx( lsf_fx, lsf_tcx_q_fx, lspq_ind, param_lpc, M, st->narrowBand, tcx_lpc_cdk, st->mem_MA_fx, st->hTcxCfg->coder_type, st->Bin_E_fx, Q_ener );
+            Q_lsf_tcxlpc_ivas_fx( lsf_fx, lsf_tcx_q_fx, lspq_ind, param_lpc, M, st->narrowBand, tcx_lpc_cdk, st->mem_MA_fx, st->hTcxCfg->coder_type, st->Bin_E_fx, st->q_Bin_E );
 
             /* Account for consumed bits */
             nbits_lpc[0] = TCXLPC_NUMBITS;
@@ -522,12 +511,12 @@ void stereo_tcx_core_enc(
      * Run TCX10/20 Core
      *---------------------------------------------------------------*/
 
-    hTcxEnc->measuredBwRatio = ONE_IN_Q14;
+    hTcxEnc->measuredBwRatio = ONE_IN_Q14; /* Q14 */
     move16();
 
     FOR( n = 0; n < n_subframes; n++ )
     {
-        target_bits[n] = sub( idiv1616( add( bitsAvailable, sub( sub( n_subframes, 1 ), n ) ), n_subframes ), tnsBits[n] );
+        target_bits[n] = sub( idiv1616( add( bitsAvailable, sub( sub( n_subframes, 1 ), n ) ), n_subframes ), tnsBits[n] ); /* Q0 */
         move16();
 
         test();
@@ -548,7 +537,7 @@ void stereo_tcx_core_enc(
         {
             tmp1 = idiv1616( tmp1, n_subframes );
         }
-        tmp2 = imult1616( n, NPRM_DIV );
+        tmp2 = imult1616( n, NPRM_DIV ); /* Q0 */
 
         QuantizeSpectrum_ivas_fx( st, A_q_fx, A_q_ind, gainlpc_fx[n], gainlpc_e[n], st->synth + tmp1, target_bits[n], tnsSize[n], param_core + tmp2, n, &hm_cfg[n], vad_hover_flag );
     }
@@ -557,36 +546,22 @@ void stereo_tcx_core_enc(
     st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode;
     move16();
 
-    s = sub( getScaleFactor16( st->synth, st->L_frame ), 2 );
-    s = s_min( s, getScaleFactor16( st->hLPDmem->syn, M ) );
+    s = sub( norm_arr( st->synth, st->L_frame ), 2 );
+    s = s_min( s, norm_arr( st->hLPDmem->syn, M ) );
     IF( st->tcxonly == 0 )
     {
         s = s_min( s, norm_s( st->wspeech_enc[st->L_frame - 1] ) );
         st->wspeech_enc[st->L_frame - 1] = shl( st->wspeech_enc[st->L_frame - 1], s );
     }
-    Scale_sig( st->synth, st->L_frame, s );
-    Scale_sig( st->hLPDmem->syn, M + 1, s );
+    Scale_sig( st->synth, st->L_frame, s );  /* st->Q_syn + s */
+    Scale_sig( st->hLPDmem->syn, M + 1, s ); /* st->Q_syn + s */
+    st->hLPDmem->q_lpd_syn = add( st->hLPDmem->q_lpd_syn, s );
     Q_new = add( Q_new, s );
     move16();
-    move16();
-
-    /* Scaling old_exc buffer to Q_new */
-    IF( NE_16( Q_new, Q_exc ) )
-    {
-        Scale_sig( st->hLPDmem->old_exc, L_EXC_MEM, sub( Q_new, Q_exc ) );
-    }
 
     coder_tcx_post_ivas_fx( st, st->hLPDmem, st->hTcxCfg, st->synth, A_q_fx, Aw_fx, st->wspeech_enc, Q_new );
 
-    /* Upscaling old_exc buffer */
-    s = getScaleFactor16( st->hLPDmem->old_exc, L_EXC_MEM ) - 1;
-    Scale_sig( st->hLPDmem->old_exc, L_EXC_MEM, s );
-    IF( st->hTdCngEnc != NULL )
-    {
-        Scale_sig( st->hTdCngEnc->cng_exc2_buf, HO_HIST_SIZE * L_FFT, sub( add( shl( Q_new, 1 ), s ), Q_exc ) );
-    }
-    Q_exc = add( shl( Q_new, 1 ), s ); // 2 * Q_new + s
-    st->hLPDmem->q_lpd_old_exc = Q_exc;
+    Q_exc = Q_new; // Q_new
     move16();
 
     IF( st->enableTcxLpc )
@@ -599,8 +574,8 @@ void stereo_tcx_core_enc(
     IF( st->enableTcxLpc && st->core != ACELP_CORE )
     {
         /* Update lsf / lsp memory */
-        Copy( lsf_tcx_q_fx, st->lsf_old_fx, M );
-        Copy( lsp_tcx_q_fx, st->lsp_old_fx, M );
+        Copy( lsf_tcx_q_fx, st->lsf_old_fx, M ); /* Qx2.56 */
+        Copy( lsp_tcx_q_fx, st->lsp_old_fx, M ); /* Q15 */
         st->envWeighted = 1;
         move16();
 
@@ -613,12 +588,12 @@ void stereo_tcx_core_enc(
 
         /* check resonance for pitch clipping algorithm */
         gp_clip_test_lsf_ivas_fx( st->element_mode, st->core_brate, st->lsf_old_fx, st->clip_var_fx, 0 );
-        Copy( st->lsf_old_fx, st->mem_AR_fx, M );
+        Copy( st->lsf_old_fx, st->mem_AR_fx, M ); /* Qx2.56 */
     }
     ELSE
     {
-        Copy( lsf_q_fx, st->lsf_old_fx, M );
-        Copy( lsp_q_fx, st->lsp_old_fx, M );
+        Copy( lsf_q_fx, st->lsf_old_fx, M ); /* Qx2.56 */
+        Copy( lsp_q_fx, st->lsp_old_fx, M ); /* Q15 */
     }
 
     test();
@@ -628,7 +603,7 @@ void stereo_tcx_core_enc(
         /* update CNG parameters in active frames */
         test();
         test();
-        IF( EQ_16( st->bwidth, NB ) && st->enableTcxLpc && NE_16( st->core, ACELP_CORE ) )
+        IF( EQ_16( st->bwidth, NB ) && st->enableTcxLpc && ( st->core != ACELP_CORE ) )
         {
             Word16 buf_fx[L_LP], res_fx[L_FRAME], A_fx[M + 1], tmp_fx, lsptmp_fx[M];
             Word32 A_fx32[M + 1], r_fx[M + 1];
@@ -636,7 +611,7 @@ void stereo_tcx_core_enc(
 
             assert( st->L_frame == L_FRAME );
 
-            Copy( st->synth + L_FRAME - L_LP, buf_fx, L_LP );
+            Copy( st->synth + L_FRAME - L_LP, buf_fx, L_LP ); /* st->Q_syn */
             tmp_fx = st->synth[L_FRAME - L_LP - 1];
             move16();
             preemph_copy_fx( buf_fx, buf_fx, st->preemph_fac, L_LP, &tmp_fx );
@@ -645,7 +620,8 @@ void stereo_tcx_core_enc(
             lev_dur_fx( A_fx32, r_fx, M, NULL, Q12, Q_r );
             FOR( Word16 j = 0; j < M; j++ )
             {
-                A_fx[j] = extract_l( A_fx32[j] );
+                A_fx[j] = extract_l( A_fx32[j] ); /* Q12 */
+                move16();
             }
             E_LPC_a_lsp_conversion( A_fx, lsptmp_fx, lsp_new_fx, M );
             Residu3_fx( A_fx, buf_fx + L_LP - L_FRAME, res_fx, L_FRAME, 0 );
@@ -659,14 +635,14 @@ void stereo_tcx_core_enc(
         ELSE
         {
             cng_params_upd_ivas_fx( lsp_new_fx, st->hLPDmem->old_exc + L_EXC_MEM - st->L_frame, st->L_frame, &st->hTdCngEnc->ho_circ_ptr, st->hTdCngEnc->ho_ener_circ_fx, &st->hTdCngEnc->ho_circ_size,
-                                    st->hTdCngEnc->ho_lsp_circ_fx, Q_exc, ENC, st->hTdCngEnc->ho_env_circ_fx, &st->hTdCngEnc->cng_buf_cnt, st->hTdCngEnc->cng_exc2_buf, st->hTdCngEnc->cng_Qexc_buf, st->hTdCngEnc->cng_brate_buf, st->hDtxEnc->last_active_brate, st->element_mode,
+                                    st->hTdCngEnc->ho_lsp_circ_fx, st->hLPDmem->q_lpd_old_exc, ENC, st->hTdCngEnc->ho_env_circ_fx, &st->hTdCngEnc->cng_buf_cnt, st->hTdCngEnc->cng_exc2_buf, st->hTdCngEnc->cng_Qexc_buf, st->hTdCngEnc->cng_brate_buf, st->hDtxEnc->last_active_brate, st->element_mode,
                                     st->hFdCngEnc->hFdCngCom->CngBandwidth );
         }
 
         IF( EQ_16( st->L_frame, L_FRAME ) )
         {
             /* store LSPs@16k, potentially to be used in CNG@16k */
-            Copy( st->lsp_old16k_fx, &( st->hTdCngEnc->ho_lsp_circ2_fx[( st->hTdCngEnc->ho_circ_ptr ) * M] ), M );
+            Copy( st->lsp_old16k_fx, &( st->hTdCngEnc->ho_lsp_circ2_fx[( st->hTdCngEnc->ho_circ_ptr ) * M] ), M ); /* Q15 */
         }
 
         /* Set 16k LSP flag for CNG buffer */
@@ -695,46 +671,31 @@ void stereo_tcx_core_enc(
 
     total_nbbits = sub( hBstr->nb_bits_tot, nbits_start );
 
-    IF( NE_16( param_core[1 + NOISE_FILL_RANGES], 0 ) )
+    IF( ( param_core[1 + NOISE_FILL_RANGES] != 0 ) )
     {
         Word32 tcxltp_pitch_tmp = L_add( L_deposit_h( hTcxEnc->tcxltp_pitch_int ), L_shl( L_deposit_l( div_s( hTcxEnc->tcxltp_pitch_fr, st->pit_res_max ) ), 1 ) ); /* 15Q16 */
         tcxltp_pitch_tmp = L_shr( tcxltp_pitch_tmp, 10 );                                                                                                           // Q6
-        set16_fx( pitch_buf_fx, extract_l( tcxltp_pitch_tmp ), NB_SUBFR16k );
+        set16_fx( pitch_buf_fx, extract_l( tcxltp_pitch_tmp ), NB_SUBFR16k );                                                                                       /* Q6 */
     }
     ELSE
     {
-        set16_fx( pitch_buf_fx, L_SUBFR * ONE_IN_Q6, NB_SUBFR16k );
+        set16_fx( pitch_buf_fx, L_SUBFR * ONE_IN_Q6, NB_SUBFR16k ); /* Q6 */
     }
-    /* Memory scaling to keep everything in common q */
-    Word16 curr_q_syn = sub( shl( Q_new, 1 ), 1 );
-    Scale_sig( st->hLPDmem->mem_syn_r, L_SYN_MEM, sub( s_min( curr_q_syn, st->hLPDmem->q_mem_syn ), curr_q_syn ) );
-    Scale_sig( st->hLPDmem->mem_syn, M, sub( s_min( curr_q_syn, st->hLPDmem->q_mem_syn ), curr_q_syn ) );
-    Scale_sig( st->hLPDmem->mem_syn2, M, sub( s_min( curr_q_syn, st->hLPDmem->q_mem_syn ), curr_q_syn ) );
-    st->hLPDmem->mem_w0 = shl_sat( st->hLPDmem->mem_w0, sub( s_min( Q_new, st->hLPDmem->q_mem_syn ), Q_new ) );
-    move16();
-    Scale_sig( st->hLPDmem->mem_syn1_fx, M, sub( s_min( curr_q_syn, st->hLPDmem->q_mem_syn ), st->hLPDmem->q_mem_syn ) );
-    Scale_sig( st->hLPDmem->mem_syn3, M, sub( s_min( curr_q_syn, st->hLPDmem->q_mem_syn ), st->hLPDmem->q_mem_syn ) );
-    st->hLPDmem->q_mem_syn = s_min( curr_q_syn, st->hLPDmem->q_mem_syn );
-    move16();
-    st->hLPDmem->q_lpd_syn = Q_new;
-    move16();
+
     IF( st->hTdCngEnc != NULL )
     {
         FOR( Word16 ii = 0; ii < HO_HIST_SIZE; ii++ )
         {
-            Scale_sig( st->hTdCngEnc->cng_exc2_buf + ii * L_FFT, L_FFT, sub( Q_exc, st->hTdCngEnc->cng_Qexc_buf[ii] ) );
+            Scale_sig( st->hTdCngEnc->cng_exc2_buf + ii * L_FFT, L_FFT, sub( Q_exc, st->hTdCngEnc->cng_Qexc_buf[ii] ) ); /* Q_exc */
             st->hTdCngEnc->cng_Qexc_buf[ii] = Q_exc;
             move16();
         }
     }
-    st->q_Bin_E = Q_new + Q_SCALE - 2;
-    move16();
-    st->q_Bin_E_old = Q_new + Q_SCALE - 2;
-    move16();
     Scale_sig( st->synth, st->L_frame, -Q_new );
     IF( st->tcxonly == 0 )
     {
         st->wspeech_enc[st->L_frame - 1] = shl( st->wspeech_enc[st->L_frame - 1], -st->Q_syn );
+        move16();
     }
 
     pop_wmops();
@@ -757,12 +718,12 @@ Word16 ivas_acelp_tcx20_switching_fx(
     Word16 non_staX,     /*Q8     i  : unbound non-stationarity for sp/mu clas*/
     Word16 *pitch_fr,    /*Q6 i  : fraction pitch values                        */
     Word16 *voicing_fr,  /*Q15 i  : fractional voicing values                  */
-    Word16 currFlatness, /*Q7 i  : flatness                                   */
+    Word32 currFlatness, /*Q21 i  : flatness                                   */
     Word16 lsp_mid[M],   /*Q15 i  : LSPs at the middle of the frame           */
-    Word16 stab_fac,     /* i  : LP filter stability                         */
+    Word16 stab_fac,     /* i  : LP filter stability                         Q15*/
     Word32 *res_cod_SNR_M,
     Word16 *res_cod_SNR_M_e,
-    const Word16 flag_16k_smc /* i  : flag to compute parameters with 16kHz core */
+    const Word16 flag_16k_smc /* i  : flag to compute parameters with 16kHz core Q0*/
 )
 {
     TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
@@ -794,6 +755,8 @@ Word16 ivas_acelp_tcx20_switching_fx(
     Word32 tcx_snr;
     Flag Overflow;
     Word32 gain, noise;
+    Word16 noise_e = 0;
+    move16();
     Word32 *pt_ener_sfr, ener_sfr[NB_SUBFR16k];
 
     /* Initialization */
@@ -807,15 +770,20 @@ Word16 ivas_acelp_tcx20_switching_fx(
         L_frame = L_FRAME;
         move16();
     }
-#ifdef MSAN_FIX
     set16_fx( window_fx, 0, L_LOOK_16k );
     set16_fx( xn_buf_fx, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
-#endif
+    FOR( i = 0; i < L_LOOK_16k; i++ )
+    {
+        window_p_fx[i].v.re = 0;
+        move16();
+        window_p_fx[i].v.im = 0;
+        move16();
+    }
 
     L_frame_tmp = L_frame;
     move16();
 
-    x_fx = hTcxEnc->spectrum_long_fx;
+    x_fx = hTcxEnc->spectrum_long_fx; /* Q15 */
     move32();
     e_x = 31 - 15;
     move16();
@@ -824,16 +792,16 @@ Word16 ivas_acelp_tcx20_switching_fx(
     /* Check minimum pitch for quantization */
     FOR( i = 0; i < 4; i++ )
     {
-        pitch_fr_local[i] = pitch_fr[i];
+        pitch_fr_local[i] = pitch_fr[i]; /* Q6 */
         move16();
-        voicing_fr_local[i] = voicing_fr[i];
+        voicing_fr_local[i] = voicing_fr[i]; /* Q15 */
         move16();
     }
 
     E_LPC_f_lsp_a_conversion( lsp_mid, A_q_tcx_fx, M );
     Q_A_q_tcx = sub( 14, norm_s( A_q_tcx_fx[0] ) );
     scale_A = sub( Q12, Q_A_q_tcx );
-    Copy_Scale_sig( A_q_tcx_fx, A_q_tcx_fx, M + 1, scale_A );
+    Copy_Scale_sig( A_q_tcx_fx, A_q_tcx_fx, M + 1, scale_A ); /* Q12 */
 
     /*--------------------------------------------------------------*
      * Estimate TCX SNR
@@ -842,7 +810,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     target = L_add( 0x11A5D28, 0 ); /* 0x11A5D28 -> 850.f * log2(10)/10 (Q16) */
     IF( flag_16k_smc )
     {
-        tcx_offset = st->hTcxCfg->tcx_offset;
+        tcx_offset = st->hTcxCfg->tcx_offset; /* Q0 */
         move16();
 
         IF( st->last_core == ACELP_CORE )
@@ -865,9 +833,9 @@ Word16 ivas_acelp_tcx20_switching_fx(
         overlap = st->hTcxCfg->tcx_mdct_window_delay;
         move16();
 
-        FOR( i = 0; i < L_LOOK_16k / 2; i++ )
+        FOR( i = 0; i < st->hTcxCfg->tcx_mdct_window_length / 2; i++ )
         {
-            window_fx[L_LOOK_16k / 2 - 1 - i] = st->hTcxCfg->tcx_mdct_window[i].v.re; // Q15
+            window_fx[st->hTcxCfg->tcx_mdct_window_length - 1 - i] = st->hTcxCfg->tcx_mdct_window[i].v.re; // Q15
             move16();
             window_fx[i] = st->hTcxCfg->tcx_mdct_window[i].v.im; // Q15
             move16();
@@ -896,9 +864,9 @@ Word16 ivas_acelp_tcx20_switching_fx(
         }
     }
 
-    Copy( inp_fx + sub( tcx_offset, shr( overlap, 1 ) ), xn_buf_fx, add( L_frame, overlap ) );
+    Copy( inp_fx + sub( tcx_offset, shr( overlap, 1 ) ), xn_buf_fx, add( L_frame, overlap ) ); /* q_inp */
 
-    L_frame_4 = shr( L_frame, 2 );
+    L_frame_4 = shr( L_frame, 2 ); /* q0 */
     IF( st->last_core == ACELP_CORE )
     {
         test();
@@ -912,21 +880,21 @@ Word16 ivas_acelp_tcx20_switching_fx(
     {
         FOR( i = 0; i < overlap; i++ )
         {
-            xn_buf_fx[i] = mult( xn_buf_fx[i], window_fx[i] );
+            xn_buf_fx[i] = mult( xn_buf_fx[i], window_fx[i] ); /* q_inp */
             move16();
         }
     }
 
     FOR( i = 0; i < overlap; i++ )
     {
-        xn_buf_fx[L_frame + i] = mult( xn_buf_fx[L_frame + i], window_fx[overlap - 1 - i] );
+        xn_buf_fx[L_frame + i] = mult( xn_buf_fx[L_frame + i], window_fx[overlap - 1 - i] ); /* q_inp */
         move16();
     }
     e_x = sub( 16, q_inp ); /*exponent for xn_buf_fx*/
     move16();
     TCX_MDCT( xn_buf_fx, x_fx, &e_x, overlap, sub( L_frame, overlap ), overlap, st->element_mode );
     scale_A = getScaleFactor32( x_fx, L_frame );
-    Copy_Scale_sig32( x_fx, x_fx, L_frame, scale_A );
+    Copy_Scale_sig32( x_fx, x_fx, L_frame, scale_A ); /* Q31-e_x+scale_A */
     e_x = sub( e_x, scale_A );
 
     tmp16 = mult_r( shl( L_frame, 5 ), 29309 /*16*0.0559017 Q15*/ ); /* L_frame / sqrt(2*NORM_MDCT_FACTOR); Q9 */
@@ -947,7 +915,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     {
         com_gainlpc_e = s_max( com_gainlpc_e, gainlpc_e[i] );
     }
-    Copy_Scale_sig32( x_fx, x_fx, L_frame, -com_gainlpc_e );
+    Copy_Scale_sig32( x_fx, x_fx, L_frame, -com_gainlpc_e ); /* Q31-e_x-com_gainlpc_e */
     e_x = add( e_x, com_gainlpc_e );
     mdct_shaping( x_fx, L_frame, gainlpc_fx, gainlpc_e );
 
@@ -978,17 +946,17 @@ Word16 ivas_acelp_tcx20_switching_fx(
         /* calc quadruple energy */
         ener = L_deposit_l( 1 );
 
-        tmp16 = extract_h( L_shl( x_fx[0], s ) );
-        ener = L_mac( ener, tmp16, tmp16 );
+        tmp16 = extract_h( L_shl( x_fx[0], s ) ); /* Q15-e_x+s */
+        ener = L_mac( ener, tmp16, tmp16 );       /* 2*(Q15-e_x+s)+1 */
 
-        tmp16 = extract_h( L_shl( x_fx[1], s ) );
-        ener = L_mac( ener, tmp16, tmp16 );
+        tmp16 = extract_h( L_shl( x_fx[1], s ) ); /* Q15-e_x+s */
+        ener = L_mac( ener, tmp16, tmp16 );       /* 2*(Q15-e_x+s)+1 */
 
-        tmp16 = extract_h( L_shl( x_fx[2], s ) );
-        ener = L_mac( ener, tmp16, tmp16 );
+        tmp16 = extract_h( L_shl( x_fx[2], s ) ); /* Q15-e_x+s */
+        ener = L_mac( ener, tmp16, tmp16 );       /* 2*(Q15-e_x+s)+1 */
 
-        tmp16 = extract_h( L_shl( x_fx[3], s ) );
-        ener = L_mac( ener, tmp16, tmp16 );
+        tmp16 = extract_h( L_shl( x_fx[3], s ) ); /* Q15-e_x+s */
+        ener = L_mac( ener, tmp16, tmp16 );       /* 2*(Q15-e_x+s)+1 */
 
         s = shl( sub( e_x, s ), 1 );
 
@@ -1004,7 +972,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
 
     FOR( iter = 0; iter < 10; iter++ )
     {
-        fac = L_shr( fac, 1 );
+        fac = L_shr( fac, 1 ); /* q0 */
         offset = L_sub( offset, fac );
         ener = L_deposit_l( 0 );
 
@@ -1012,33 +980,33 @@ Word16 ivas_acelp_tcx20_switching_fx(
         {
             tmp32 = L_sub( en[i], offset );
 
-            IF( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
+            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
             {
                 ener = L_add( ener, tmp32 );
             }
 
             tmp32 = L_sub( en[i + 1], offset );
 
-            IF( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
+            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
             {
                 ener = L_add( ener, tmp32 );
             }
 
             tmp32 = L_sub( en[i + 2], offset );
 
-            IF( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
+            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
             {
                 ener = L_add( ener, tmp32 );
             }
 
             tmp32 = L_sub( en[i + 3], offset );
 
-            IF( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
+            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 3.f * log2(10)/10 */
             {
                 ener = L_add( ener, tmp32 );
             }
 
-            IF( GT_32( ener, target ) )
+            if ( GT_32( ener, target ) )
             {
                 offset = L_add( offset, fac );
                 BREAK;
@@ -1048,7 +1016,8 @@ Word16 ivas_acelp_tcx20_switching_fx(
 
     IF( LE_32( offset, 0xAA153 ) ) /* 0xAA153 -> 32.f * log2(10)/10 */
     {
-        offset = L_add( 0xFFD57AB5, 0 ); /* 0xFFD57AB5 -> -128.f * log2(10)/10; */
+        offset = (Word32) 0xFFD57AB5; /* 0xFFD57AB5 -> -128.f * log2(10)/10; */
+        move32();
     }
     offset_tcx = offset;
     move32();
@@ -1087,7 +1056,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
         Word16 temp_e, e_num, e_den, temp_ene_e;
         temp_ene_e = ener_e;
         move16();
-        tmp32 = Sqrt32( ener, &temp_ene_e );
+        tmp32 = Sqrt32( ener, &temp_ene_e ); /* Q31-temp_ene_e */
         /*Approximate SNR of TCX*/
         set32_fx( x_fx, tmp32, L_frame ); /* ener_e */
         mdct_noiseShaping_ivas_fx( x_fx, &temp_ene_e, L_frame, gainlpc_noinv, gainlpc_noinv_e );
@@ -1114,10 +1083,10 @@ Word16 ivas_acelp_tcx20_switching_fx(
 
             FOR( i = bands[iter]; i < bands[iter + 1]; i++ )
             {
-                nrg_s = BASOP_Util_Add_Mant32Exp( nrg_s, e_num, Mpy_32_32( y_fx[i], y_fx[i] ), shl( e_x, 1 ), &e_num );
-                nrg_n = BASOP_Util_Add_Mant32Exp( nrg_n, e_den, Mpy_32_32( x_fx[i], x_fx[i] ), shl( temp_ene_e, 1 ), &e_den );
+                nrg_s = BASOP_Util_Add_Mant32Exp( nrg_s, e_num, Mpy_32_32( y_fx[i], y_fx[i] ), shl( e_x, 1 ), &e_num );        /* Q31-e_num */
+                nrg_n = BASOP_Util_Add_Mant32Exp( nrg_n, e_den, Mpy_32_32( x_fx[i], x_fx[i] ), shl( temp_ene_e, 1 ), &e_den ); /* Q31-e_den */
             }
-            res_cod_SNR_M[iter] = BASOP_Util_Divide3232_Scale_cadence( nrg_s, nrg_n, &temp_e );
+            res_cod_SNR_M[iter] = BASOP_Util_Divide3232_Scale_newton( nrg_s, nrg_n, &temp_e ); /* Q31-res_cod_SNR_M_e[iter] */
             move32();
             res_cod_SNR_M_e[iter] = add( temp_e, sub( e_num, e_den ) );
             move16();
@@ -1127,7 +1096,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     pt_ener_sfr = ener_sfr;
     tcx_snr = L_deposit_l( 0 );
 
-    L_loop = L_frame;
+    L_loop = L_frame; /* Q0 */
     move16();
     if ( flag_16k_smc )
     {
@@ -1136,37 +1105,37 @@ Word16 ivas_acelp_tcx20_switching_fx(
     }
     Word16 temp32_e = 0;
     move16();
-    Word32 temp_energy = L_add( BASOP_Util_Log2( ener ), L_shl( L_deposit_l( ener_e ), 25 ) );
-    temp_energy = L_add( temp_energy, 201326592 /* 6 in Q25*/ );
-    temp_energy = L_shr( temp_energy, 9 ); /*temp_energy is log(( ener * L_SUBFR ))*/
+    Word32 temp_energy = L_add( BASOP_Util_Log2( ener ), L_shl( L_deposit_l( ener_e ), 25 ) ); /* Q25 */
+    temp_energy = L_add( temp_energy, 201326592 /* 6 in Q25*/ );                               /* Q25 */
+    temp_energy = L_shr( temp_energy, 9 );                                                     /*temp_energy is log(( ener * L_SUBFR ))*/
     FOR( i = 0; i < L_loop; i += L_SUBFR )
     {
         tmp32 = L_deposit_l( 0 );
 
         FOR( j = 0; j < L_SUBFR; j++ )
         {
-            tmp32 = BASOP_Util_Add_Mant32Exp( tmp32, temp32_e, L_mult0( wsp[i + j], wsp[i + j] ), sub( 31, add( q_inp, q_inp ) ), &temp32_e );
+            tmp32 = BASOP_Util_Add_Mant32Exp( tmp32, temp32_e, L_mult0( wsp[i + j], wsp[i + j] ), sub( 31, add( q_inp, q_inp ) ), &temp32_e ); /* Q31-temp32_e */
         }
         IF( tmp32 == 0 )
         {
             *pt_ener_sfr = -668739840; /* 0xFFEC1185 -> log2(1e-6) in 6Q25 */
             move32();
-            tmp32 = 0xFFEC1185; /* 0xFFEC1185 -> log2(1e-6) in 15Q16 */
+            tmp32 = (Word32) 0xFFEC1185; /* 0xFFEC1185 -> log2(1e-6) in 15Q16 */
             move32();
         }
         ELSE
         {
-            tmp32 = L_add( BASOP_Util_Log2( tmp32 ), L_shl( L_deposit_l( temp32_e ), 25 ) );
-            *pt_ener_sfr = tmp32;
+            tmp32 = L_add( BASOP_Util_Log2( tmp32 ), L_shl( L_deposit_l( temp32_e ), 25 ) ); /* Q25 */
+            *pt_ener_sfr = tmp32;                                                            /* Q25 */
             move32();
             tmp32 = L_shr( tmp32, 9 ); /* 15Q16 */
         }
         tcx_snr = L_sub( L_add( tcx_snr, tmp32 ), temp_energy ); /*15Q16*/
         pt_ener_sfr++;
     }
-    tmp16 = BASOP_Util_Divide1616_Scale( L_SUBFR, L_loop, &temp32_e );
-    tmp16 = shl( tmp16, temp32_e );
-    tcx_snr = Mpy_32_16_1( tcx_snr, tmp16 );
+    tmp16 = BASOP_Util_Divide1616_Scale( L_SUBFR, L_loop, &temp32_e );                       /* Q15-temp32_e */
+    tmp16 = shl( tmp16, temp32_e );                                                          /* Q15 */
+    tcx_snr = Mpy_32_16_1( tcx_snr, tmp16 );                                                 /* Q16 */
     tcx_snr = L_shl( Mpy_32_16_1( tcx_snr, 0x6054 /* 0x6054 -> 10/log2(10) (2Q13) */ ), 2 ); /* Q16*/
 
     /*--------------------------------------------------------------*
@@ -1210,15 +1179,18 @@ Word16 ivas_acelp_tcx20_switching_fx(
             T0 = shr( add( pitch_fr_local[i2], ( 1 << 5 ) ), 6 );
         }
 
-        gain = get_gain2( wsp + i, wsp + sub( i, T0 ), L_SUBFR );
+        gain = get_gain2( wsp + i, wsp + sub( i, T0 ), L_SUBFR ); /*Q16*/
 
         noise = L_deposit_l( 1 );
-
+        noise_e = 0;
+        move16();
         FOR( j = 0; j < L_SUBFR; j++ )
         {
-            tmp16 = round_fx_o( L_shl_o( Mpy_32_16_r( gain, wsp[i + j - T0] ), 15, &Overflow ), &Overflow ); // q_in
-            tmp16 = sub_o( wsp[i + j], tmp16, &Overflow );                                                   // q_in
-            noise = L_mac0_o( noise, tmp16, tmp16, &Overflow );                                              // 2*q_in//
+            tmp32 = Mpy_32_16_1( gain, wsp[i + j - T0] );   // Q16 + q_inp - 15
+            tmp32 = L_sub( wsp[i + j], L_shr( tmp32, 1 ) ); // q_inp
+            tmp16 = norm_l( tmp32 );
+            tmp32 = L_shl( tmp32, tmp16 );                                                                                                     // q_inp +tmp16
+            noise = BASOP_Util_Add_Mant32Exp( noise, noise_e, Mpy_32_32( tmp32, tmp32 ), shl( sub( 31, add( q_inp, tmp16 ) ), 1 ), &noise_e ); // noise_e
         }
         test();
         IF( noise == 0 || EQ_32( noise, 1 ) )
@@ -1237,7 +1209,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
         ELSE
         {
             noise = Mpy_32_16_1( noise, scale );
-            tmp32 = L_add( BASOP_Util_Log2( noise ), L_shl( sub( 31, add( q_inp, q_inp ) ), 25 ) ); // Q25
+            tmp32 = L_add( BASOP_Util_Log2( noise ), L_shl( noise_e, 25 ) ); // Q25
         }
         tmp32 = L_sub( *pt_ener_sfr, tmp32 ); // Q25
         temp_energy = BASOP_Util_Add_Mant32Exp( tmp32, 6, temp_energy, ener_e, &ener_e );
@@ -1269,8 +1241,8 @@ Word16 ivas_acelp_tcx20_switching_fx(
     test();
     if ( ( GT_32( snr_acelp, tcx_snr ) ) &&
          ( LT_32( snr_acelp, L_add( tcx_snr, 131072 /*2.0f Q16*/ ) ) ) &&
-         ( LT_16( add_o( st->prevTempFlatness_fx, currFlatness, &Overflow ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff ) ||
-           ( !flag_16k_smc && ( st->sp_aud_decision0 > 0 ) && LT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 2560 /*20.f Q7*/ ) ) ) &&
+         ( LT_32( L_add_o( st->prevTempFlatness_32fx, currFlatness, &Overflow ), 6815744 /*3.25f Q21*/ ) || EQ_16( stab_fac, 0x7fff ) ||
+           ( !flag_16k_smc && ( st->sp_aud_decision0 > 0 ) && LT_32( L_add_sat( st->prevTempFlatness_32fx, currFlatness ), 41943040 /*20.f Q21*/ ) ) ) &&
          ( LE_16( st->Nb_ACELP_frames, 6 ) ) )
     {
         dsnr = -131072 /*-2.0f Q16*/;
@@ -1282,7 +1254,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     test();
     if ( ( LT_32( snr_acelp, tcx_snr ) ) &&
          ( GT_32( snr_acelp, L_sub( tcx_snr, 131072 /*2.0f Q16*/ ) ) ) &&
-         ( GT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) ) &&
+         ( GT_32( L_add_sat( st->prevTempFlatness_32fx, currFlatness ), 6815744 /*3.25f Q21*/ ) ) &&
          ( GE_16( st->Nb_ACELP_frames, 6 ) ) )
     {
         dsnr = 131072 /*2.0f Q16*/;
@@ -1328,7 +1300,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     /* Select ACELP or TCX */
     test();
     test();
-    IF( GT_32( L_add( snr_acelp, dsnr ), tcx_snr ) && ( st->sp_aud_decision0 == 0 || GT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) ) )
+    IF( GT_32( L_add( snr_acelp, dsnr ), tcx_snr ) && ( st->sp_aud_decision0 == 0 || GT_32( L_add_sat( st->prevTempFlatness_32fx, currFlatness ), 6815744 /*3.25f Q21*/ ) ) )
     {
         smc_dec_ol = 0;
         move16();
@@ -1352,7 +1324,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
     }
 #endif
 
-    st->prevTempFlatness_fx = currFlatness;
+    st->prevTempFlatness_32fx = currFlatness;
     move16();
     return smc_dec_ol;
 }
diff --git a/lib_enc/ivas_td_low_rate_enc.c b/lib_enc/ivas_td_low_rate_enc_fx.c
similarity index 81%
rename from lib_enc/ivas_td_low_rate_enc.c
rename to lib_enc/ivas_td_low_rate_enc_fx.c
index 22ce9b6e9d0f2b825bf0ccf7dc42f4d48833c4b2..d10527a241855fcf154159a26d233abe764773e3 100644
--- a/lib_enc/ivas_td_low_rate_enc.c
+++ b/lib_enc/ivas_td_low_rate_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,10 +37,8 @@
 #include "rom_com.h"
 #include "ivas_rom_com.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 #include "wmc_auto.h"
 
@@ -53,17 +51,17 @@
 
 void tdm_low_rate_enc(
     Encoder_State *st, /* i/o: State structure                         */
-    const Word16 Aq[], /* i  : 12k8 Lp coefficient                     */
-    const Word16 *res, /* i  : residual signal                         */
-    Word16 *synth,     /* i/o: core synthesis                          */
-    Word16 *exc_fx,    /* i/o: current non-enhanced excitation         */
+    const Word16 Aq[], /* i  : 12k8 Lp coefficient                     Q12*/
+    const Word16 *res, /* i  : residual signal                         Q_new*/
+    Word16 *synth,     /* i/o: core synthesis                          Q_new*/
+    Word16 *exc_fx,    /* i/o: current non-enhanced excitation         Q_new*/
     Word16 *pitch_buf,
     /* i/o: floating pitch values for each subframe */ // Q6
-    Word16 *voice_factors,                             /* o  : voicing factors                         */
-    Word16 *bwe_exc_fx,                                /* o  : excitation for SWB TBE                  */
-    const Word16 attack_flag,                          /* i  : GSC attack flag                         */
-    const Word16 *lsf_new,                             /* i  : current frame ISF vector                */
-    Word16 *tmp_noise,                                 /* o  : long-term noise energy                  */
+    Word16 *voice_factors,                             /* o  : voicing factors                         Q15*/
+    Word16 *bwe_exc_fx,                                /* o  : excitation for SWB TBE                  Q_new*/
+    const Word16 attack_flag,                          /* i  : GSC attack flag                         Q0*/
+    const Word16 *lsf_new,                             /* i  : current frame ISF vector                Qx2.56*/
+    Word16 *tmp_noise,                                 /* o  : long-term noise energy                  Q11*/
     Word16 Q_new )
 {
     const Word16 *p_Aq;
@@ -90,7 +88,7 @@ void tdm_low_rate_enc(
     hLPDmem->tilt_code = 0;
     move16();
     set16_fx( dct_epit_fx, 0, L_FRAME );
-    set16_fx( pitch_buf, L_SUBFR_Q6, NB_SUBFR );
+    set16_fx( pitch_buf, L_SUBFR_Q6, NB_SUBFR ); /* Q6 */
     last_pit_bin = L_FRAME / 2;
     move16();
 
@@ -105,7 +103,7 @@ void tdm_low_rate_enc(
      *--------------------------------------------------------------------------------------*/
 
     /* Find the current total number of bits used */
-    tmp_nb_bits_tot = st->hBstr->nb_bits_tot;
+    tmp_nb_bits_tot = st->hBstr->nb_bits_tot; /* Q0 */
     move16();
 
     if ( st->extl_brate > 0 )
@@ -154,17 +152,18 @@ void tdm_low_rate_enc(
      * Synthesis
      *--------------------------------------------------------------------------------------*/
 
-    p_Aq = Aq;
+    p_Aq = Aq; /* Q12 */
     FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
     {
-        E_UTIL_synthesis( 0, p_Aq, &exc_wo_nf_fx[i_subfr], &synth[i_subfr], L_SUBFR, hLPDmem->mem_syn, 1, M );
+        E_UTIL_synthesis( 0, p_Aq, &exc_wo_nf_fx[i_subfr], &synth[i_subfr], L_SUBFR, hLPDmem->mem_syn, 1, M ); /* Q_new */
         p_Aq += ( M + 1 );
+        scale_sig( hLPDmem->mem_syn, M, sub( hLPDmem->q_mem_syn, Q_new ) ); // Q_new -> hLPDmem->q_mem_syn
     }
 
     /*--------------------------------------------------------------------------------------*
      * Updates
      *--------------------------------------------------------------------------------------*/
-    Copy( exc_wo_nf_fx, exc_fx, L_FRAME );
+    Copy( exc_wo_nf_fx, exc_fx, L_FRAME ); /* Q_new */
 
     return;
 }
@@ -219,9 +218,14 @@ void encod_gen_2sbfr(
     Word32 norm_gain_code;
     Word16 pitch_limit_flag;
     Word16 error;
+    Word16 q_h1;
 
     LPD_state_HANDLE hLPDmem = st->hLPDmem;
 
+    Word16 gcode16;
+    Word32 Lgcode, Ltmp;
+    set16_fx( cn, 0, 2 * L_SUBFR ); /* Target vector in residual domain  */
+
     /*------------------------------------------------------------------*
      * Initializations
      *------------------------------------------------------------------*/
@@ -243,9 +247,9 @@ void encod_gen_2sbfr(
     coder_type = GENERIC;
     move16();
 
-    p_Aw = Aw;
-    p_Aq = Aq;
-    pt_pitch = pitch_buf;
+    p_Aw = Aw;            /* e(norm_s(Aw[0]+1) */
+    p_Aq = Aq;            /* e(norm_s(Aw[0]+1) */
+    pt_pitch = pitch_buf; /*Q6*/
 
     /*------------------------------------------------------------------*
      * ACELP subframe loop
@@ -261,22 +265,19 @@ void encod_gen_2sbfr(
 
         Copy( &res[i_subfr], &exc[i_subfr], 2 * L_SUBFR ); // Q_new
 
-        // Scaling mem_syn buffer to Q_new - 1 from e_mem_syn
-        // Scale_sig( &hLPDmem->mem_w0, M + 1, sub( add( *Q_new, hLPDmem->e_mem_syn ), Q16 ) ); // M + 1 to sync mem_syn exponent with mem_w0 exponent
-        // hLPDmem->e_mem_syn = sub( Q16, *Q_new );
-
-        find_targets_fx( speech, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq, res, 2 * L_SUBFR, p_Aw, st->preemph_fac, xn, cn, h1 );
+        find_targets_ivas_fx( speech, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq, res, 2 * L_SUBFR, p_Aw, st->preemph_fac, xn, cn, h1 );
 
-        /*Scale_sig(h1, L_SUBFR, shift);  */ /*Q14-shift */
-        Copy_Scale_sig( h1, h2, 2 * L_SUBFR, -2 );
-        Scale_sig( h1, 2 * L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
+        q_h1 = sub( 14, norm_s( h1[0] ) );
+        Copy_Scale_sig( h1, h2, 2 * L_SUBFR, sub( 11, q_h1 ) );
 
         /*------------------------------------------------------------------------*
          * Close-loop pitch search on the 1st and 3rd subfr only and quantization
          * Adaptive exc. construction
          *------------------------------------------------------------------------*/
+        *pt_pitch = pit_encode_ivas_fx( st->hBstr, st->acelp_cfg.pitch_bits, st->core_brate, 0, L_frame, coder_type, &pitch_limit_flag, i_subfr, exc, 2 * L_SUBFR, st->pitch, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf, Q_new );
+        move16();
 
-        *pt_pitch = pit_encode_ivas_fx( st->hBstr, st->acelp_cfg.pitch_bits, st->core_brate, 0, L_frame, coder_type, &pitch_limit_flag, i_subfr, exc, 2 * L_SUBFR, st->pitch, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
+        Scale_sig( h1, 2 * L_SUBFR, sub( 13, q_h1 ) ); // Q13
 
         tbe_celp_exc_ivas( st->element_mode, st->idchan, L_frame, 2 * L_SUBFR, i_subfr, T0, T0_frac, &error, bwe_exc, st->tdm_LRTD_flag );
 
@@ -290,16 +291,15 @@ void encod_gen_2sbfr(
          * Gain clipping test to avoid unstable synthesis on frame erasure
          *-----------------------------------------------------------------*/
 
-        clip_gain = gp_clip_fx( st->element_mode, st->core_brate, st->voicing_fx, i_subfr, coder_type, xn, st->clip_var_fx, Q_new ); // Q0
-
+        clip_gain = gp_clip_fx( st->element_mode, st->core_brate, st->voicing_fx, i_subfr, coder_type, xn, st->clip_var_fx, sub( Q_new, 1 ) ); // Q0
         /*-----------------------------------------------------------------*
          * LP filtering of the adaptive excitation, codebook target computation
          *-----------------------------------------------------------------*/
+        Scale_sig( h1, 2 * L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
 
-        lp_filt_exc_enc_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
-
+        lp_filt_exc_enc_ivas_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
         /* update long-term pitch gain for speech/music classifier */
-        st->hSpMusClas->lowrate_pitchGain = add( mult( 29491, st->hSpMusClas->lowrate_pitchGain ), mult( 3277, gain_pit ) ); // Q14
+        st->hSpMusClas->lowrate_pitchGain = add( mult( 29491, st->hSpMusClas->lowrate_pitchGain ), mult( 3277 /*Q15*/, gain_pit ) ); // Q14
         move16();
 
         /*-----------------------------------------------------------------*
@@ -316,7 +316,7 @@ void encod_gen_2sbfr(
 
         IF( st->Opt_SC_VBR )
         {
-            IF( EQ_16( st->hSC_VBR->last_ppp_mode, 1 ) )
+            if ( EQ_16( st->hSC_VBR->last_ppp_mode, 1 ) )
             {
                 /* SC-VBR - all other st->clip_var values will be updated even in a PPP frame */
                 st->clip_var_fx[1] = gain_pit;
@@ -330,14 +330,22 @@ void encod_gen_2sbfr(
 
         gp_clip_test_gain_pit_fx( st->element_mode, st->core_brate, gain_pit, st->clip_var_fx );
 
-        hLPDmem->tilt_code = est_tilt_ivas_fx( exc + i_subfr, gain_pit, code, gain_code, &voice_fac, Q_new, 2 * L_SUBFR, 0 );
+        Lgcode = L_shl_sat( gain_code, Q_new );                                                                            /* scaled gain_code with Qnew -> Q16*/
+        gcode16 = round_fx_sat( Lgcode );                                                                                  /*Q0*/
+        hLPDmem->tilt_code = est_tilt_ivas_fx( exc + i_subfr, gain_pit, code, Lgcode, &voice_fac, Q_new, 2 * L_SUBFR, 0 ); /* Q15 */
         move16();
 
         /*-----------------------------------------------------------------*
          * Update memory of the weighting filter
          *-----------------------------------------------------------------*/
 
-        hLPDmem->mem_w0 = sub( sub( xn[2 * L_SUBFR - 1], mult_r( gain_pit, y1[2 * L_SUBFR - 1] ) ), mult_r( extract_h( gain_code ), y2[2 * L_SUBFR - 1] ) );
+        Ltmp = L_mult0( gcode16, y2[2 * L_SUBFR - 1] ); /*Q10*/
+        Ltmp = L_shl( Ltmp, add( 5, shift ) );          /*Q15+shift*/
+        Ltmp = L_negate( Ltmp );
+        Ltmp = L_mac( Ltmp, xn[2 * L_SUBFR - 1], 16384 /*Q14*/ );    /* Q_new-1+shift+14+1 */
+        Ltmp = L_msu( Ltmp, y1[2 * L_SUBFR - 1], gain_pit /*Q14*/ ); /* Q_new-1+shift+14+1 */
+        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );                   /* 15 + Q_new */
+        hLPDmem->mem_w0 = round_fx_sat( Ltmp );                      /*Q_new-1        */
         move16();
 
         /*-----------------------------------------------------------------*
@@ -347,9 +355,14 @@ void encod_gen_2sbfr(
 
         FOR( i = 0; i < 2 * L_SUBFR; i++ )
         {
-            exc2[i + i_subfr] = mult( gain_pit, exc[i + i_subfr] );
+            /* code in Q9, gain_pit in Q14 */
+            exc2[i + i_subfr] = shl_sat( mult( gain_pit, exc[i + i_subfr] ), 1 ); /* Q_new-1 */
+            Ltmp = L_mult( gcode16, code[i] );                                    /* Q10 */
+            Ltmp = L_shl_sat( Ltmp, 5 );                                          /* Q15 */
+            Ltmp = L_mac_sat( Ltmp, exc[i + i_subfr], gain_pit );                 /* Q15 */
+            Ltmp = L_shl_sat( Ltmp, 1 );                                          /* saturation can occur here Q16*/
+            exc[i + i_subfr] = round_fx_sat( Ltmp );
             move16();
-            exc[i + i_subfr] = add( exc2[i + i_subfr], mult( extract_h( gain_code ), code[i] ) );
             move16();
         }
 
@@ -357,9 +370,9 @@ void encod_gen_2sbfr(
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
 
-        prep_tbe_exc_ivas_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR], bwe_exc, 0, NULL, Q_new, T0, T0_frac, coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
+        prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR], bwe_exc, 0, NULL, Q_new, T0, T0_frac, coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
 
-        voice_factors[i_subfr / L_SUBFR + 1] = voice_factors[i_subfr / L_SUBFR];
+        voice_factors[i_subfr / L_SUBFR + 1] = voice_factors[i_subfr / L_SUBFR]; /* Q15 */
         move16();
 
         /*-----------------------------------------------------------------*
@@ -367,8 +380,7 @@ void encod_gen_2sbfr(
          * Update A(z) filters
          *-----------------------------------------------------------------*/
 
-        E_UTIL_synthesis( 0, p_Aq, &exc[i_subfr], &syn[i_subfr], 2 * L_SUBFR, hLPDmem->mem_syn, 1, M );
-
+        Syn_filt_s( 1, p_Aq, M, &exc[i_subfr], &syn[i_subfr], 2 * L_SUBFR, hLPDmem->mem_syn, 1 );
         p_Aw += 2 * ( M + 1 );
         p_Aq += 2 * ( M + 1 );
 
@@ -381,8 +393,8 @@ void encod_gen_2sbfr(
     /* SC-VBR */
     IF( st->Opt_SC_VBR )
     {
-        st->hSC_VBR->prev_ppp_gain_pit_fx = gain_pit;
-        st->hSC_VBR->prev_tilt_code_fx = hLPDmem->tilt_code;
+        st->hSC_VBR->prev_ppp_gain_pit_fx = gain_pit;        /* Q14 */
+        st->hSC_VBR->prev_tilt_code_fx = hLPDmem->tilt_code; /* Q15 */
         move16();
         move16();
     }
diff --git a/lib_enc/lead_indexing.c b/lib_enc/lead_indexing.c
deleted file mode 100644
index d20e6a703cc1aa958456de8a872773b68d4ecc89..0000000000000000000000000000000000000000
--- a/lib_enc/lead_indexing.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * Local function prototypes
- *-------------------------------------------------------------------*/
-
-static int16_t fcb_encode_pos( const int16_t pos_vector[], const int16_t pulse_num, const int16_t pos_num );
-
-
-/*-------------------------------------------------------------------*
- * re8_compute_base_index:
- *
- * Compute base index for RE8
- *-------------------------------------------------------------------*/
-
-void re8_compute_base_index(
-    const int16_t *x, /* i  : Elemen of Q2, Q3 or Q4                         */
-    const int16_t ka, /* i  : Identifier of the absolute leader related to x */
-    uint16_t *I       /* o  : index                                          */
-)
-{
-    int16_t i, j, k1, m;
-    int16_t setor_8p[8], setor_8p_temp[8];
-    int16_t sign_8p;
-    int16_t code_index, code_level, code_area;
-    uint16_t offset;
-    const int16_t *a1, *a2;
-
-    a1 = vals_a[ka];
-    a2 = vals_q[ka];
-
-    /* the sign process */
-
-    sign_8p = 0;
-    m = 0;
-    code_index = 0;
-    k1 = a2[0];
-
-    if ( ( a2[1] == 2 ) && ( a1[0] ^ 1 ) && ( ka != 5 ) )
-    {
-        for ( i = 0; i < 8; i++ )
-        {
-            if ( x[i] != 0 )
-            {
-                sign_8p = sign_8p * 2;
-                setor_8p_temp[m] = i;
-                m++;
-            }
-            if ( x[i] < 0 )
-            {
-                sign_8p += 1;
-            }
-        }
-
-        code_index = fcb_encode_pos( setor_8p_temp, 8, m );
-        code_index = ( code_index << k1 ) + sign_8p;
-
-        offset = Is[ka];
-
-
-        *I = offset + code_index;
-    }
-    else
-    {
-        for ( i = 0; i < 8; i++ )
-        {
-            setor_8p[i] = (int16_t) abs( x[i] );
-
-            if ( x[i] < 0 )
-            {
-                sign_8p = sign_8p * 2 + 1;
-                m++;
-            }
-            if ( x[i] > 0 )
-            {
-                sign_8p = sign_8p * 2;
-                m++;
-            }
-        }
-
-        if ( k1 != m )
-        {
-            sign_8p = sign_8p >> 1;
-        }
-
-        /* code level by level */
-
-        code_level = a2[1];
-        code_area = 8;
-
-        if ( a2[2] != 1 )
-        {
-            for ( j = 0; j < code_level - 1; j++ )
-            {
-                m = 0;
-
-                for ( i = 0; i < code_area; i++ )
-                {
-                    if ( setor_8p[i] != a1[j] )
-                    {
-                        setor_8p_temp[m] = i;
-                        setor_8p[m] = setor_8p[i];
-                        m++;
-                    }
-                }
-                code_index *= select_table22[m][code_area];
-
-                code_index += fcb_encode_pos( setor_8p_temp, code_area, m );
-
-                code_area = m;
-            }
-        }
-        else
-        {
-            for ( i = 0; i < code_area; i++ )
-            {
-                if ( setor_8p[i] == a1[1] )
-                {
-                    code_index += i;
-                }
-            }
-        }
-
-        code_index = ( code_index << k1 ) + sign_8p;
-
-        offset = Is[ka];
-
-        *I = offset + code_index;
-    }
-
-    return;
-}
-
-/*-------------------------------------------------------------------*
- * fcb_encode_pos:
- *
- * Base function to compute base index for RE8
- *-------------------------------------------------------------------*/
-
-/*! r: Code index */
-static int16_t fcb_encode_pos(
-    const int16_t pos_vector[], /* i  : Position vectort        */
-    const int16_t pulse_num,    /* i  : Pulse number            */
-    const int16_t pos_num       /* i  : Position number         */
-)
-{
-    int16_t i, j;
-    int16_t code_index;
-    int16_t temp, temp1;
-    const int16_t *select_table23;
-
-    temp = pulse_num - 1;
-
-    select_table23 = select_table22[pos_num];
-
-    code_index = select_table23[pulse_num] - select_table23[pulse_num - pos_vector[0]];
-
-    for ( i = 0, j = 1; i < pos_num - 1; i++, j++ )
-    {
-        temp1 = pos_num - j;
-
-        select_table23 = select_table22[temp1];
-
-        code_index += select_table23[temp - pos_vector[i]] - select_table23[pulse_num - pos_vector[j]];
-    }
-
-    return code_index;
-}
diff --git a/lib_enc/lead_indexing_fx.c b/lib_enc/lead_indexing_fx.c
index ff29330140ca4071d8d975ac14ce545a57050c97..70e0c4796ac2a53ea93ea8b1e7368999f4726e5c 100644
--- a/lib_enc/lead_indexing_fx.c
+++ b/lib_enc/lead_indexing_fx.c
@@ -22,8 +22,8 @@ static Word16 fcb_encode_pos_fx( const Word16 pos_vector[], const Word16 pulse_n
  *-------------------------------------------------------------------*/
 void re8_compute_base_index_fx(
     const Word16 *x, /* i  : Elemen of Q2, Q3 or Q4                          */
-    const Word16 ka, /* i  : Identifier of the absolute leader related to x  */
-    UWord16 *I       /* o  : index                                           */
+    const Word16 ka, /* i  : Identifier of the absolute leader related to x  Q0*/
+    UWord16 *I       /* o  : index                                           Q0*/
 )
 {
     Word16 i, j, k1, m;
@@ -35,9 +35,9 @@ void re8_compute_base_index_fx(
     Word16 code_index;
     UWord16 offset;
 
-    a1 = vals_a[ka];
+    a1 = vals_a[ka]; /* Q0 */
     move16();
-    a2 = vals_q[ka];
+    a2 = vals_q[ka]; /* Q0 */
     move16();
 
     /* the sign process */
@@ -48,7 +48,7 @@ void re8_compute_base_index_fx(
     move16();
     code_index = 0;
     move16();
-    k1 = a2[0];
+    k1 = a2[0]; /* Q0 */
     move16();
 
     test();
@@ -59,15 +59,15 @@ void re8_compute_base_index_fx(
         {
             IF( x[i] != 0 )
             {
-                sign_8p = shl( sign_8p, 1 );
+                sign_8p = shl( sign_8p, 1 ); /* Q0 */
                 setor_8p_temp[m] = i;
                 move16();
-                m = add( m, 1 );
+                m++;
             }
 
-            IF( x[i] < 0 )
+            if ( x[i] < 0 )
             {
-                sign_8p = add( sign_8p, 1 );
+                sign_8p = add( sign_8p, 1 ); /* Q0 */
             }
         }
 
@@ -78,33 +78,35 @@ void re8_compute_base_index_fx(
         move16();
 
         *I = extract_l( L_add( offset, (Word32) code_index ) );
+        move16();
     }
     ELSE
     {
         FOR( i = 0; i < 8; i++ )
         {
-            setor_8p[i] = abs_s( x[i] );
+            setor_8p[i] = abs_s( x[i] ); /* Q0 */
+            move16();
 
             IF( x[i] != 0 )
             {
-                sign_8p = shl( sign_8p, 1 );
-                m = add( m, 1 );
+                sign_8p = shl( sign_8p, 1 ); /* Q0 */
+                m++;
             }
 
-            IF( x[i] < 0 )
+            if ( x[i] < 0 )
             {
-                sign_8p = add( sign_8p, 1 );
+                sign_8p = add( sign_8p, 1 ); /* Q0 */
             }
         }
 
-        IF( NE_16( k1, m ) )
+        if ( NE_16( k1, m ) )
         {
-            sign_8p = shr( sign_8p, 1 );
+            sign_8p = shr( sign_8p, 1 ); /* Q0 */
         }
 
         /* code level by level */
 
-        code_level = sub( a2[1], 1 );
+        code_level = sub( a2[1], 1 ); /* Q0 */
         code_area = 8;
         move16();
 
@@ -119,15 +121,15 @@ void re8_compute_base_index_fx(
                 {
                     IF( NE_16( setor_8p[i], a1[j] ) )
                     {
-                        setor_8p_temp[m] = i;
+                        setor_8p_temp[m] = i; /* Q0 */
                         move16();
-                        setor_8p[m] = setor_8p[i];
+                        setor_8p[m] = setor_8p[i]; /* Q0 */
                         move16();
-                        m = add( m, 1 );
+                        m++;
                     }
                 }
-                code_index = extract_l( L_mult0( code_index, select_table22[m][code_area] ) );
-                code_index = add( code_index, fcb_encode_pos_fx( setor_8p_temp, code_area, m ) );
+                code_index = extract_l( L_mult0( code_index, select_table22[m][code_area] ) );    /* Q0 */
+                code_index = add( code_index, fcb_encode_pos_fx( setor_8p_temp, code_area, m ) ); /* Q0 */
                 code_area = m;
                 move16();
             }
@@ -136,18 +138,19 @@ void re8_compute_base_index_fx(
         {
             FOR( i = 0; i < code_area; i++ )
             {
-                IF( EQ_16( setor_8p[i], a1[1] ) )
+                if ( EQ_16( setor_8p[i], a1[1] ) )
                 {
-                    code_index = add( code_index, i );
+                    code_index = add( code_index, i ); /* Q0 */
                 }
             }
         }
 
         code_index = add( shl( code_index, k1 ), sign_8p );
-        offset = Is[ka];
+        offset = Is[ka]; /* Q0 */
         move16();
 
-        *I = extract_l( L_add( offset, (Word32) code_index ) );
+        *I = extract_l( L_add( offset, (Word32) code_index ) ); /* Q0 */
+        move16();
     }
 }
 
@@ -156,10 +159,10 @@ void re8_compute_base_index_fx(
  *
  * Base function to compute base index for RE8
  *-------------------------------------------------------------------*/
-static Word16 fcb_encode_pos_fx(                            /* o  : Code index              */
-                                 const Word16 pos_vector[], /* i  : Position vectort        */
-                                 const Word16 pulse_num,    /* i  : Pulse number            */
-                                 const Word16 pos_num       /* i  : Position number         */
+static Word16 fcb_encode_pos_fx(                            /* o  : Code index              Q0*/
+                                 const Word16 pos_vector[], /* i  : Position vectort        Q0*/
+                                 const Word16 pulse_num,    /* i  : Pulse number            Q0*/
+                                 const Word16 pos_num       /* i  : Position number         Q0*/
 )
 {
     Word16 i, j;
@@ -171,10 +174,10 @@ static Word16 fcb_encode_pos_fx(                            /* o  : Code index
 
     temp = sub( pulse_num, 1 );
 
-    select_table23 = select_table22[pos_num];
+    select_table23 = select_table22[pos_num]; /* Q0 */
     move16();
 
-    code_index = sub( select_table23[pulse_num], select_table23[sub( pulse_num, pos_vector[0] )] );
+    code_index = sub( select_table23[pulse_num], select_table23[( pulse_num - pos_vector[0] )] ); /* Q0 */
 
     j = 1;
     move16();
@@ -184,12 +187,12 @@ static Word16 fcb_encode_pos_fx(                            /* o  : Code index
     {
         temp1 = sub( pos_num, j );
 
-        select_table23 = select_table22[temp1];
+        select_table23 = select_table22[temp1]; /* Q0 */
         move16();
 
-        code_index = add( code_index, sub( select_table23[sub( temp, pos_vector[i] )], select_table23[sub( pulse_num, pos_vector[j] )] ) );
+        code_index = add( code_index, sub( select_table23[( temp - pos_vector[i] )], select_table23[( pulse_num - pos_vector[j] )] ) ); /* Q0 */
 
-        j = add( j, 1 );
+        j++;
     }
 
     return code_index;
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index 281e131f7390017a89e5b9cdf8fbac510946f70b..f90b2d8ecd0f6209205f9dce8362df829536271c 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -39,9 +39,7 @@
 #include "debug.h"
 #endif
 #include "lib_enc.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "prot_fx_enc.h"
 #include "wmc_auto.h"
@@ -60,8 +58,8 @@ struct IVAS_ENC
     bool cmd_stereo;
 #endif
     bool switchingActive; /* flag for configuration changes during encoding - currently only used with mono */
-    int16_t Opt_RF_ON_loc;
-    int16_t rf_fec_offset_loc;
+    Word16 Opt_RF_ON_loc;
+    Word16 rf_fec_offset_loc;
     bool ismMetadataProvided[MAX_NUM_OBJECTS];
     bool maxBandwidthUser;              /* Was a specific max bandwith selected by the user? */
     IVAS_ENC_BANDWIDTH newBandwidthApi; /* maximum encoded bandwidth, as set on API level */
@@ -72,20 +70,20 @@ struct IVAS_ENC
  * Local functions
  *---------------------------------------------------------------------*/
 
-static ivas_error configureEncoder_fx( IVAS_ENC_HANDLE hIvasEnc, const Word32 inputFs, const Word32 initBitrate, const IVAS_ENC_BANDWIDTH initBandwidth, const IVAS_ENC_DTX_CONFIG dtxConfig, const IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig );
+// static ivas_error configureEncoder_fx( IVAS_ENC_HANDLE hIvasEnc, const Word32 inputFs, const Word32 initBitrate, const IVAS_ENC_BANDWIDTH initBandwidth, const IVAS_ENC_DTX_CONFIG dtxConfig, const IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig );
 static ivas_error setBandwidth_fx( IVAS_ENC_HANDLE hIvasEnc, const IVAS_ENC_BANDWIDTH maxBandwidth );
 static ivas_error setChannelAwareConfig_fx( IVAS_ENC_HANDLE hIvasEnc, const IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig );
 static ivas_error sanitizeBandwidth_fx( const IVAS_ENC_HANDLE hIvasEnc );
 static ivas_error sanitizeBitrateISM_fx( const ENCODER_CONFIG_HANDLE hEncoderConfig, const bool extMetadataApi );
 static Word16 getInputBufferSize_fx( const Encoder_Struct *st_ivas );
-static ivas_error configureEncoder( IVAS_ENC_HANDLE hIvasEnc, const int32_t inputFs, const int32_t initBitrate, const IVAS_ENC_BANDWIDTH initBandwidth, const IVAS_ENC_DTX_CONFIG dtxConfig, const IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig );
-static ivas_error setBitrate( IVAS_ENC_HANDLE hIvasEnc, const int32_t totalBitrate );
+static ivas_error configureEncoder( IVAS_ENC_HANDLE hIvasEnc, const Word32 inputFs, const Word32 initBitrate, const IVAS_ENC_BANDWIDTH initBandwidth, const IVAS_ENC_DTX_CONFIG dtxConfig, const IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig );
+static ivas_error setBitrate( IVAS_ENC_HANDLE hIvasEnc, const Word32 totalBitrate );
 static ivas_error doCommonConfigureChecks( IVAS_ENC_HANDLE hIvasEnc );
 static ivas_error doCommonSetterChecks( IVAS_ENC_HANDLE hIvasEnc );
 static void init_encoder_config( ENCODER_CONFIG_HANDLE hEncoderConfig );
 static void resetIsmMetadataProvidedFlags( IVAS_ENC_HANDLE hIvasEnc );
-static ivas_error bandwidthApiToInternal( const IVAS_ENC_BANDWIDTH maxBandwidth, int16_t *internalMaxBandwidth );
-static ivas_error fecIndicatorApiToInternal( const IVAS_ENC_FEC_INDICATOR fecIndicator, int16_t *fecIndicatorInternal );
+static ivas_error bandwidthApiToInternal( const IVAS_ENC_BANDWIDTH maxBandwidth, Word16 *internalMaxBandwidth );
+static ivas_error fecIndicatorApiToInternal( const IVAS_ENC_FEC_INDICATOR fecIndicator, Word16 *fecIndicatorInternal );
 #ifdef DEBUGGING
 static ivas_error forcedModeApiToInternal( IVAS_ENC_FORCED_MODE forcedMode, int16_t *forcedModeInternal );
 #endif
@@ -159,6 +157,7 @@ ivas_error IVAS_ENC_Open(
     st_ivas->mc_mode = MC_MODE_NONE;
     st_ivas->ism_mode = ISM_MODE_NONE;
     st_ivas->sba_analysis_order = 0;
+    move16();
 
     return IVAS_ERR_OK;
 }
@@ -225,6 +224,7 @@ ivas_error IVAS_ENC_Open_fx(
     st_ivas->mc_mode = MC_MODE_NONE;
     st_ivas->ism_mode = ISM_MODE_NONE;
     st_ivas->sba_analysis_order = 0;
+    move16();
 
     return IVAS_ERR_OK;
 }
@@ -239,18 +239,19 @@ void IVAS_ENC_Close(
 )
 {
     /* Free all memory */
-    if ( phIvasEnc == NULL || *phIvasEnc == NULL )
+    test();
+    IF( phIvasEnc == NULL || *phIvasEnc == NULL )
     {
         return;
     }
 
-    if ( ( *phIvasEnc )->isConfigured )
+    IF( ( *phIvasEnc )->isConfigured )
     {
         ivas_destroy_enc_fx( ( *phIvasEnc )->st_ivas );
     }
-    else
+    ELSE
     {
-        if ( ( *phIvasEnc )->st_ivas->hEncoderConfig )
+        IF( ( *phIvasEnc )->st_ivas->hEncoderConfig )
         {
             free( ( *phIvasEnc )->st_ivas->hEncoderConfig );
             ( *phIvasEnc )->st_ivas->hEncoderConfig = NULL;
@@ -277,8 +278,8 @@ void IVAS_ENC_Close(
 
 ivas_error IVAS_ENC_ConfigureForMono(
     IVAS_ENC_HANDLE hIvasEnc,                     /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                        /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                        /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32 inputFs,                         /* i  : input sampling frequency                                                                            */
+    const Word32 bitrate,                         /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                   /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,        /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,          /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -291,17 +292,20 @@ ivas_error IVAS_ENC_ConfigureForMono(
 
     error = IVAS_ERR_OK;
 
-    if ( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
 
     hIvasEnc->st_ivas->hEncoderConfig->ivas_format = MONO_FORMAT;
-    hIvasEnc->st_ivas->hEncoderConfig->is_binaural = (int16_t) is_binaural;
+    hIvasEnc->st_ivas->hEncoderConfig->is_binaural = (Word16) is_binaural;
+    move16();
+    move16();
 
     if ( downmixFromStereo )
     {
         hIvasEnc->st_ivas->hEncoderConfig->stereo_dmx_evs = 1;
+        move16();
     }
     hIvasEnc->maxBandwidthUser = max_bwidth_user;
 
@@ -319,8 +323,8 @@ ivas_error IVAS_ENC_ConfigureForMono(
 
 ivas_error IVAS_ENC_ConfigureForStereo(
     IVAS_ENC_HANDLE hIvasEnc,              /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                 /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                 /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32 inputFs,                  /* i  : input sampling frequency                                                                            */
+    const Word32 bitrate,                  /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,            /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth, /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,   /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -336,7 +340,7 @@ ivas_error IVAS_ENC_ConfigureForStereo(
 
     ivas_error error;
 
-    if ( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -344,8 +348,11 @@ ivas_error IVAS_ENC_ConfigureForStereo(
     st_ivas = hIvasEnc->st_ivas;
     hEncoderConfig = st_ivas->hEncoderConfig;
     hEncoderConfig->nchan_inp = 2;
+    move16();
     hEncoderConfig->ivas_format = STEREO_FORMAT;
-    hEncoderConfig->is_binaural = (int16_t) is_binaural;
+    move16();
+    hEncoderConfig->is_binaural = (Word16) is_binaural;
+    move16();
 
 #ifdef DEBUGGING
     switch ( stereoMode )
@@ -414,7 +421,7 @@ ivas_error IVAS_ENC_ConfigureForMASAObjects(
         return error;
     }
 
-    IF( GT_16( numObjects, MAX_NUM_OBJECTS ) )
+    IF( GT_32( numObjects, MAX_NUM_OBJECTS ) )
     {
         return IVAS_ERR_TOO_MANY_INPUTS;
     }
@@ -459,34 +466,39 @@ ivas_error IVAS_ENC_ConfigureForMASAObjects(
 
 ivas_error IVAS_ENC_ConfigureForObjects(
     IVAS_ENC_HANDLE hIvasEnc,              /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                 /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                 /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32 inputFs,                  /* i  : input sampling frequency                                                                            */
+    const Word32 bitrate,                  /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,            /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth, /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,   /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
-    const uint16_t numObjects,             /* i  : number of objects to be encoded                                                                     */
+    const UWord16 numObjects,              /* i  : number of objects to be encoded                                                                     */
     const bool ism_extended_metadata       /* i  : Extended metadata used (true/false), where extended metadata includes radius and orientation        */
 )
 {
     Encoder_Struct *st_ivas;
     ivas_error error;
 
-    if ( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
 
-    if ( numObjects > MAX_NUM_OBJECTS )
+    IF( GT_32( numObjects, MAX_NUM_OBJECTS ) )
     {
         return IVAS_ERR_TOO_MANY_INPUTS;
     }
 
     st_ivas = hIvasEnc->st_ivas;
     st_ivas->hEncoderConfig->ivas_format = ISM_FORMAT;
+    move16();
     st_ivas->hEncoderConfig->element_mode_init = IVAS_SCE;
+    move16();
     st_ivas->hEncoderConfig->nchan_inp = numObjects;
+    move16();
     st_ivas->hEncoderConfig->nchan_ism = numObjects;
+    move16();
     st_ivas->hEncoderConfig->ism_extended_metadata_flag = ism_extended_metadata;
+    move16();
     hIvasEnc->extMetadataApi = ( ism_extended_metadata == 1 );
     hIvasEnc->maxBandwidthUser = max_bwidth_user;
 
@@ -504,7 +516,7 @@ ivas_error IVAS_ENC_ConfigureForObjects(
 
 ivas_error IVAS_ENC_FeedObjectMetadata(
     IVAS_ENC_HANDLE hIvasEnc,        /* i/o: IVAS encoder handle                                                                                 */
-    const uint16_t ismIndex,         /* i  : object index                                                                                        */
+    const UWord16 ismIndex,          /* i  : object index                                                                                        */
     const IVAS_ISM_METADATA metadata /* i  : object metadata handle for current frame                                                            */
 )
 {
@@ -512,17 +524,19 @@ ivas_error IVAS_ENC_FeedObjectMetadata(
 
     error = IVAS_ERR_OK;
 
-    if ( !hIvasEnc->isConfigured )
+    IF( !hIvasEnc->isConfigured )
     {
         return IVAS_ERR_NOT_CONFIGURED;
     }
 
-    if ( hIvasEnc->st_ivas->hEncoderConfig->ivas_format != ISM_FORMAT && hIvasEnc->st_ivas->hEncoderConfig->ivas_format != MASA_ISM_FORMAT && hIvasEnc->st_ivas->hEncoderConfig->ivas_format != SBA_ISM_FORMAT )
+    test();
+    test();
+    IF( NE_16( hIvasEnc->st_ivas->hEncoderConfig->ivas_format, ISM_FORMAT ) && NE_16( hIvasEnc->st_ivas->hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) && NE_16( hIvasEnc->st_ivas->hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) )
     {
         return IVAS_ERR_METADATA_NOT_EXPECTED;
     }
 
-    if ( ismIndex > hIvasEnc->st_ivas->hEncoderConfig->nchan_inp )
+    IF( GT_32( ismIndex, hIvasEnc->st_ivas->hEncoderConfig->nchan_inp ) )
     {
         return IVAS_ERR_INVALID_INDEX;
     }
@@ -533,7 +547,7 @@ ivas_error IVAS_ENC_FeedObjectMetadata(
     Word32 pitch_fx = float_to_fix( metadata.pitch, Q22 );         /* Q22 */
     error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], azimuth_fx, elevation_fx, radius_fx, yaw_fx, pitch_fx, metadata.non_diegetic_flag );
 
-    if ( error != IVAS_ERR_OK )
+    IF( error != IVAS_ERR_OK )
     {
         return error;
     }
@@ -552,8 +566,8 @@ ivas_error IVAS_ENC_FeedObjectMetadata(
 
 ivas_error IVAS_ENC_ConfigureForAmbisonics(
     IVAS_ENC_HANDLE hIvasEnc,              /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                 /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                 /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32 inputFs,                  /* i  : input sampling frequency                                                                            */
+    const Word32 bitrate,                  /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,            /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth, /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,   /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -565,7 +579,7 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics(
     ENCODER_CONFIG_HANDLE hEncoderConfig;
     ivas_error error;
 
-    if ( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -576,12 +590,17 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics(
     hEncoderConfig->element_mode_init = IVAS_SCE; /* Just needs to be something not mono, will be set later */
     hEncoderConfig->sba_planar = isPlanar;
     hEncoderConfig->sba_order = order;
+    move16();
+    move16();
+    move16();
 
     /* Input in ACN/SN3D in all cases (3D and planar): get number of channels */
     hEncoderConfig->nchan_inp = ivas_sba_get_nchan_fx( hEncoderConfig->sba_order, 0 ); /*planar input arg. deliberately set to zero since input always in ACN/SN3D*/
+    move16();
 
 
-    hEncoderConfig->Opt_PCA_ON = (int16_t) Opt_PCA_ON;
+    hEncoderConfig->Opt_PCA_ON = (Word16) Opt_PCA_ON;
+    move16();
 
     hIvasEnc->maxBandwidthUser = max_bwidth_user;
 
@@ -590,6 +609,7 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics(
 
     return error;
 }
+#ifndef HARM_ENC_INIT
 ivas_error IVAS_ENC_ConfigureForAmbisonics_fx(
     IVAS_ENC_HANDLE hIvasEnc,              /* i/o: IVAS encoder handle                                                                                 */
     const Word32 inputFs,                  /* i  : input sampling frequency                                                                            */
@@ -616,20 +636,26 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics_fx(
     hEncoderConfig->element_mode_init = IVAS_SCE; /* Just needs to be something not mono, will be set later */
     hEncoderConfig->sba_planar = isPlanar;
     hEncoderConfig->sba_order = order;
+    move16();
+    move16();
+    move16();
 
     /* Input in ACN/SN3D in all cases (3D and planar): get number of channels */
     hEncoderConfig->nchan_inp = ivas_sba_get_nchan_fx( hEncoderConfig->sba_order, 0 ); /*planar input arg. deliberately set to zero since input always in ACN/SN3D*/
+    move16();
 
 
     hEncoderConfig->Opt_PCA_ON = (Word16) Opt_PCA_ON;
+    move16();
 
     hIvasEnc->maxBandwidthUser = max_bwidth_user;
 
-    error = configureEncoder_fx( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() );
+    error = configureEncoder( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() );
 
 
     return error;
 }
+#endif
 /*---------------------------------------------------------------------*
  * IVAS_ENC_ConfigureForSBAObjects()
  *
@@ -781,8 +807,8 @@ ivas_error IVAS_ENC_FeedMasaMetadata(
 
 ivas_error IVAS_ENC_ConfigureForMultichannel(
     IVAS_ENC_HANDLE hIvasEnc,              /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                 /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                 /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32 inputFs,                  /* i  : input sampling frequency                                                                            */
+    const Word32 bitrate,                  /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,            /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth, /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,   /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -792,7 +818,7 @@ ivas_error IVAS_ENC_ConfigureForMultichannel(
     ENCODER_CONFIG_HANDLE hEncoderConfig;
     ivas_error error;
 
-    if ( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonConfigureChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -800,31 +826,34 @@ ivas_error IVAS_ENC_ConfigureForMultichannel(
     hEncoderConfig = hIvasEnc->st_ivas->hEncoderConfig;
 
     hEncoderConfig->ivas_format = MC_FORMAT;
+    move16();
     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; /*just for initialization*/
+    move16();
 
-    switch ( mcLayout )
+    SWITCH( mcLayout )
     {
         case IVAS_ENC_MC_5_1:
             hEncoderConfig->mc_input_setup = MC_LS_SETUP_5_1;
-            break;
+            BREAK;
         case IVAS_ENC_MC_7_1:
             hEncoderConfig->mc_input_setup = MC_LS_SETUP_7_1;
-            break;
+            BREAK;
         case IVAS_ENC_MC_5_1_2:
             hEncoderConfig->mc_input_setup = MC_LS_SETUP_5_1_2;
-            break;
+            BREAK;
         case IVAS_ENC_MC_5_1_4:
             hEncoderConfig->mc_input_setup = MC_LS_SETUP_5_1_4;
-            break;
+            BREAK;
         case IVAS_ENC_MC_7_1_4:
             hEncoderConfig->mc_input_setup = MC_LS_SETUP_7_1_4;
-            break;
+            BREAK;
         default:
             return IVAS_ERR_INVALID_MC_LAYOUT;
-            break;
+            BREAK;
     }
 
     hEncoderConfig->nchan_inp = ivas_mc_ls_setup_get_num_channels_fx( hEncoderConfig->mc_input_setup );
+    move16();
 
     hIvasEnc->maxBandwidthUser = max_bwidth_user;
 
@@ -842,8 +871,8 @@ ivas_error IVAS_ENC_ConfigureForMultichannel(
 
 static ivas_error configureEncoder(
     IVAS_ENC_HANDLE hIvasEnc,
-    const int32_t inputFs,
-    const int32_t initBitrate,
+    const Word32 inputFs,
+    const Word32 initBitrate,
     const IVAS_ENC_BANDWIDTH initBandwidth,
     const IVAS_ENC_DTX_CONFIG dtxConfig,
     const IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig )
@@ -851,7 +880,7 @@ static ivas_error configureEncoder(
     Encoder_Struct *st_ivas;
     ENCODER_CONFIG_HANDLE hEncoderConfig;
     ivas_error error;
-    int32_t cpe_brate;
+    Word32 cpe_brate;
 
     error = IVAS_ERR_OK;
 
@@ -862,7 +891,7 @@ static ivas_error configureEncoder(
      * Bandwidth limitation
      *-----------------------------------------------------------------*/
 
-    if ( ( error = setBandwidth_fx( hIvasEnc, initBandwidth ) ) != IVAS_ERR_OK )
+    IF( ( error = setBandwidth_fx( hIvasEnc, initBandwidth ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -871,32 +900,39 @@ static ivas_error configureEncoder(
      * DTX/CNG
      *-----------------------------------------------------------------*/
 
-    if ( dtxConfig.enabled )
+    IF( dtxConfig.enabled )
     {
         hEncoderConfig->Opt_DTX_ON = 1;
+        move16();
 
-        if ( dtxConfig.variable_SID_rate )
+        IF( dtxConfig.variable_SID_rate )
         {
             hEncoderConfig->var_SID_rate_flag = 1;
             hEncoderConfig->interval_SID = 0;
+            move16();
+            move16();
         }
-        else
+        ELSE
         {
             hEncoderConfig->var_SID_rate_flag = 0;
+            move16();
 
-            if ( dtxConfig.SID_interval >= 3 && dtxConfig.SID_interval <= 100 )
+            test();
+            IF( GE_16( dtxConfig.SID_interval, 3 ) && LE_16( dtxConfig.SID_interval, 100 ) )
             {
                 hEncoderConfig->interval_SID = dtxConfig.SID_interval;
+                move16();
             }
-            else
+            ELSE
             {
                 return IVAS_ERR_INVALID_DTX_UPDATE_RATE;
             }
         }
     }
-    else
+    ELSE
     {
         hEncoderConfig->Opt_DTX_ON = 0;
+        move16();
     }
 
     /*-----------------------------------------------------------------*
@@ -904,36 +940,42 @@ static ivas_error configureEncoder(
      *-----------------------------------------------------------------*/
 
     hEncoderConfig->ivas_total_brate = initBitrate;
+    move32();
 
     /* SC-VBR at 5.90 kbps */
-    if ( hEncoderConfig->ivas_total_brate == ACELP_5k90 )
+    IF( EQ_32( hEncoderConfig->ivas_total_brate, ACELP_5k90 ) )
     {
         hEncoderConfig->ivas_total_brate = ACELP_7k20;
         hEncoderConfig->Opt_SC_VBR = 1;
         hEncoderConfig->last_Opt_SC_VBR = hEncoderConfig->Opt_SC_VBR;
+        move32();
+        move16();
+        move16();
 
-        if ( hEncoderConfig->max_bwidth != NB )
+        if ( ( hEncoderConfig->max_bwidth != NB ) )
         {
             hEncoderConfig->max_bwidth = WB;
+            move16();
         }
     }
 
     /* check if the entered bitrate is supported */
-    if ( hEncoderConfig->ivas_format != UNDEFINED_FORMAT && hEncoderConfig->ivas_format != MONO_FORMAT ) /* IVAS */
+    test();
+    IF( NE_16( hEncoderConfig->ivas_format, UNDEFINED_FORMAT ) && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) ) /* IVAS */
     {
-        if ( !is_IVAS_bitrate_fx( hEncoderConfig->ivas_total_brate ) )
+        IF( !is_IVAS_bitrate_fx( hEncoderConfig->ivas_total_brate ) )
         {
-            if ( hEncoderConfig->Opt_SC_VBR )
+            IF( hEncoderConfig->Opt_SC_VBR )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Incorrect bitrate specification in IVAS [bps]: %d", ACELP_5k90 );
             }
-            else
+            ELSE
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Incorrect bitrate specification in IVAS [bps]: %d", hEncoderConfig->ivas_total_brate );
             }
         }
 
-        if ( hEncoderConfig->ivas_format == STEREO_FORMAT )
+        IF( EQ_16( hEncoderConfig->ivas_format, STEREO_FORMAT ) )
         {
 #ifdef DEBUGGING
             if ( hIvasEnc->cmd_stereo )
@@ -944,57 +986,64 @@ static ivas_error configureEncoder(
                 hEncoderConfig->stereo_mode_cmdl = 1;
 #endif
 
-                if ( hEncoderConfig->ivas_total_brate >= MIN_BRATE_MDCT_STEREO )
+                if ( GE_32( hEncoderConfig->ivas_total_brate, MIN_BRATE_MDCT_STEREO ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+                    move16();
 #ifdef DEBUGGING
                     hEncoderConfig->stereo_mode_cmdl = 0;
 #endif
                 }
             }
 
-            if ( ( hEncoderConfig->element_mode_init == IVAS_CPE_TD || hEncoderConfig->element_mode_init == IVAS_CPE_DFT ) && hEncoderConfig->ivas_total_brate > IVAS_48k )
+            test();
+            test();
+            IF( ( EQ_16( hEncoderConfig->element_mode_init, IVAS_CPE_TD ) || EQ_16( hEncoderConfig->element_mode_init, IVAS_CPE_DFT ) ) && GT_32( hEncoderConfig->ivas_total_brate, IVAS_48k ) )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for TD/DFT Stereo specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
             }
 
-            if ( hEncoderConfig->element_mode_init == IVAS_CPE_MDCT && hEncoderConfig->ivas_total_brate < IVAS_48k )
+            test();
+            IF( EQ_16( hEncoderConfig->element_mode_init, IVAS_CPE_MDCT ) && LT_32( hEncoderConfig->ivas_total_brate, IVAS_48k ) )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for MDCT Stereo specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
             }
 
-            if ( hEncoderConfig->ivas_total_brate > IVAS_256k )
+            IF( GT_32( hEncoderConfig->ivas_total_brate, IVAS_256k ) )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for Stereo specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
             }
         }
-        else if ( hEncoderConfig->ivas_format == ISM_FORMAT )
+        ELSE IF( EQ_16( hEncoderConfig->ivas_format, ISM_FORMAT ) )
         {
-            if ( ( error = sanitizeBitrateISM_fx( hEncoderConfig, hIvasEnc->extMetadataApi ) ) != IVAS_ERR_OK )
+            IF( ( error = sanitizeBitrateISM_fx( hEncoderConfig, hIvasEnc->extMetadataApi ) ) != IVAS_ERR_OK )
             {
                 return error;
             }
         }
-        else if ( hEncoderConfig->ivas_format == SBA_FORMAT )
+        ELSE IF( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) )
         {
             /* nothing */
         }
-        else if ( hEncoderConfig->ivas_format == MASA_FORMAT )
+        ELSE IF( EQ_16( hEncoderConfig->ivas_format, MASA_FORMAT ) )
         {
             /* adapt element_mode according to the bitrate */
-            if ( hEncoderConfig->nchan_inp == 2 && hEncoderConfig->element_mode_init != IVAS_SCE )
+            test();
+            IF( EQ_16( hEncoderConfig->nchan_inp, 2 ) && NE_16( hEncoderConfig->element_mode_init, IVAS_SCE ) )
             {
-                if ( hEncoderConfig->ivas_total_brate >= IVAS_48k )
+                IF( GE_32( hEncoderConfig->ivas_total_brate, IVAS_48k ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+                    move16();
                 }
-                else if ( hEncoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE )
+                ELSE IF( LT_32( hEncoderConfig->ivas_total_brate, MASA_STEREO_MIN_BITRATE ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_DFT;
+                    move16();
                 }
             }
         }
-        else if ( hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
+        ELSE IF( EQ_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) )
         {
             st_ivas->ism_mode = ivas_omasa_ism_mode_select_fx( st_ivas->hEncoderConfig->ivas_total_brate, hEncoderConfig->nchan_ism );
             move32();
@@ -1002,51 +1051,59 @@ static ivas_error configureEncoder(
             cpe_brate = calculate_cpe_brate_MASA_ISM_fx( st_ivas->ism_mode, st_ivas->hEncoderConfig->ivas_total_brate, hEncoderConfig->nchan_ism );
 
             /*adapt element_mode according to the bit-rate*/
-            if ( hEncoderConfig->element_mode_init != IVAS_SCE )
+            IF( NE_16( hEncoderConfig->element_mode_init, IVAS_SCE ) )
             {
-                if ( cpe_brate >= IVAS_48k )
+                if ( GE_32( cpe_brate, IVAS_48k ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+                    move16();
                 }
             }
         }
-        else if ( hEncoderConfig->ivas_format == SBA_ISM_FORMAT )
+        ELSE IF( EQ_16( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) )
         {
             st_ivas->ism_mode = ISM_MODE_NONE;
+            move16();
         }
     }
-    else /* EVS mono */
+    ELSE /* EVS mono */
     {
         hEncoderConfig->ivas_format = MONO_FORMAT;
+        move16();
         hEncoderConfig->element_mode_init = EVS_MONO;
+        move16();
 
-        if ( !is_EVS_bitrate( hEncoderConfig->ivas_total_brate, &hEncoderConfig->Opt_AMR_WB ) )
+        IF( !is_EVS_bitrate( hEncoderConfig->ivas_total_brate, &hEncoderConfig->Opt_AMR_WB ) )
         {
             return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Incorrect bitrate specification in EVS mono: %d", hEncoderConfig->ivas_total_brate );
         }
 
-        if ( hEncoderConfig->stereo_dmx_evs == 1 )
+        IF( EQ_16( hEncoderConfig->stereo_dmx_evs, 1 ) )
         {
             hEncoderConfig->nchan_inp = 2;
+            move16();
         }
     }
 
     /*-----------------------------------------------------------------*
      * Input sampling frequency
      *-----------------------------------------------------------------*/
-
-    if ( inputFs != 8000 && inputFs != 16000 && inputFs != 32000 && inputFs != 48000 )
+    test();
+    test();
+    test();
+    IF( NE_32( inputFs, 8000 ) && NE_32( inputFs, 16000 ) && NE_32( inputFs, 32000 ) && NE_32( inputFs, 48000 ) )
     {
         return IVAS_ERR_INVALID_SAMPLING_RATE;
     }
 
     hEncoderConfig->input_Fs = inputFs;
+    move32();
 
     /*-----------------------------------------------------------------*
      * Channel-aware mode
      *-----------------------------------------------------------------*/
 
-    if ( ( error = setChannelAwareConfig_fx( hIvasEnc, caConfig ) ) != IVAS_ERR_OK )
+    IF( ( error = setChannelAwareConfig_fx( hIvasEnc, caConfig ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -1056,25 +1113,31 @@ static ivas_error configureEncoder(
      *-----------------------------------------------------------------*/
 
     st_ivas->codec_mode = MODE1; /* Note: in IVAS, set MODE1 */
+    move16();
 
-    if ( hEncoderConfig->ivas_format == MONO_FORMAT )
+    IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
-        if ( hEncoderConfig->Opt_AMR_WB )
+        IF( hEncoderConfig->Opt_AMR_WB )
         {
             st_ivas->codec_mode = MODE1;
+            move16();
         }
-        else
+        ELSE
         {
             st_ivas->codec_mode = get_codec_mode( hEncoderConfig->ivas_total_brate );
+            move16();
         }
     }
 
-    if ( hEncoderConfig->ivas_total_brate == IVAS_13k2 && hEncoderConfig->Opt_RF_ON == 1 )
+    test();
+    IF( EQ_32( hEncoderConfig->ivas_total_brate, IVAS_13k2 ) && EQ_16( hEncoderConfig->Opt_RF_ON, 1 ) )
     {
         st_ivas->codec_mode = MODE2;
+        move16();
     }
 
     st_ivas->last_codec_mode = st_ivas->codec_mode;
+    move16();
 
     /*-----------------------------------------------------------------*
      * Sanity checks
@@ -1082,30 +1145,43 @@ static ivas_error configureEncoder(
 
     assert( hEncoderConfig->ivas_format != UNDEFINED_FORMAT && "\n IVAS format undefined" );
 
-    if ( ( hEncoderConfig->ivas_format != MONO_FORMAT || hEncoderConfig->stereo_dmx_evs ) && hEncoderConfig->input_Fs == 8000 )
+    test();
+    test();
+    IF( ( NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) || hEncoderConfig->stereo_dmx_evs ) && EQ_32( hEncoderConfig->input_Fs, 8000 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "8kHz input sampling rate is not supported in IVAS." );
     }
 
-    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT &&
-         ( ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs_fx( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) ||
-           hEncoderConfig->ivas_format == MC_FORMAT || hEncoderConfig->ivas_format == MASA_ISM_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT ) )
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( hEncoderConfig->Opt_DTX_ON && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) &&
+        ( ( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) && GT_16( ivas_get_sba_num_TCs_fx( hEncoderConfig->ivas_total_brate, 1 ), 2 ) ) ||
+          EQ_16( hEncoderConfig->ivas_format, MC_FORMAT ) || EQ_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) || EQ_16( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) ) )
     {
         return IVAS_ERROR( IVAS_ERR_DTX_NOT_SUPPORTED, "DTX is not supported in this IVAS format and element mode." );
     }
 
-
-    if ( hEncoderConfig->Opt_PCA_ON && !( hEncoderConfig->ivas_format == SBA_FORMAT && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )
+    test();
+    test();
+    test();
+    IF( hEncoderConfig->Opt_PCA_ON && !( ( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) || EQ_16( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) ) && EQ_32( hEncoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( hEncoderConfig->sba_order, SBA_FOA_ORDER ) ) )
     {
         return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "PCA supported at SBA FOA 256 kbps only." );
     }
 
-    if ( ( error = sanitizeBandwidth_fx( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = sanitizeBandwidth_fx( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
 
-    if ( hEncoderConfig->is_binaural && !( ( hEncoderConfig->ivas_format == MONO_FORMAT && hEncoderConfig->stereo_dmx_evs ) || hEncoderConfig->ivas_format == STEREO_FORMAT ) )
+    test();
+    test();
+    test();
+    IF( hEncoderConfig->is_binaural && !( ( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) && hEncoderConfig->stereo_dmx_evs ) || EQ_16( hEncoderConfig->ivas_format, STEREO_FORMAT ) ) )
     {
         return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "'-binaural' option is supported only with '-stereo' or '-stereo_dmx_evs'" );
     }
@@ -1114,27 +1190,30 @@ static ivas_error configureEncoder(
      * Finalize initialization
      *-----------------------------------------------------------------*/
 
-    if ( ( error = ivas_init_encoder( st_ivas ) ) != IVAS_ERR_OK )
+    IF( ( error = ivas_init_encoder_fx( st_ivas ) ) != IVAS_ERR_OK )
     {
         return error;
     }
 
-    if ( hEncoderConfig->ivas_format == MONO_FORMAT )
+    IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
         hIvasEnc->hCoreCoder = st_ivas->hSCE[0]->hCoreCoder[0]; /* Note: this is needed for switching in EVS mono */
     }
-    else
+    ELSE
     {
         hIvasEnc->hCoreCoder = NULL;
     }
 
     hIvasEnc->Opt_RF_ON_loc = hEncoderConfig->Opt_RF_ON;
     hIvasEnc->rf_fec_offset_loc = hEncoderConfig->rf_fec_offset;
+    move16();
+    move16();
 
     hIvasEnc->isConfigured = true;
 
     return error;
 }
+#ifndef HARM_ENC_INIT
 static ivas_error configureEncoder_fx(
     IVAS_ENC_HANDLE hIvasEnc,
     const Word32 inputFs,
@@ -1169,19 +1248,24 @@ static ivas_error configureEncoder_fx(
     IF( dtxConfig.enabled )
     {
         hEncoderConfig->Opt_DTX_ON = 1;
+        move16();
 
         IF( dtxConfig.variable_SID_rate )
         {
             hEncoderConfig->var_SID_rate_flag = 1;
             hEncoderConfig->interval_SID = 0;
+            move16();
+            move16();
         }
         ELSE
         {
             hEncoderConfig->var_SID_rate_flag = 0;
-
+            move16();
+            test();
             IF( GE_16( dtxConfig.SID_interval, 3 ) && LE_16( dtxConfig.SID_interval, 100 ) )
             {
                 hEncoderConfig->interval_SID = dtxConfig.SID_interval;
+                move16();
             }
             ELSE
             {
@@ -1192,6 +1276,7 @@ static ivas_error configureEncoder_fx(
     ELSE
     {
         hEncoderConfig->Opt_DTX_ON = 0;
+        move16();
     }
 
     /*-----------------------------------------------------------------*
@@ -1199,21 +1284,27 @@ static ivas_error configureEncoder_fx(
      *-----------------------------------------------------------------*/
 
     hEncoderConfig->ivas_total_brate = initBitrate;
+    move16();
 
     /* SC-VBR at 5.90 kbps */
-    IF( hEncoderConfig->ivas_total_brate == ACELP_5k90 )
+    IF( EQ_32( hEncoderConfig->ivas_total_brate, ACELP_5k90 ) )
     {
         hEncoderConfig->ivas_total_brate = ACELP_7k20;
         hEncoderConfig->Opt_SC_VBR = 1;
         hEncoderConfig->last_Opt_SC_VBR = hEncoderConfig->Opt_SC_VBR;
+        move32();
+        move16();
+        move16();
 
-        IF( NE_16( hEncoderConfig->max_bwidth, NB ) )
+        IF( ( hEncoderConfig->max_bwidth != NB ) )
         {
             hEncoderConfig->max_bwidth = WB;
+            move16();
         }
     }
 
     /* check if the entered bitrate is supported */
+    test();
     IF( NE_16( hEncoderConfig->ivas_format, UNDEFINED_FORMAT ) && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) ) /* IVAS */
     {
         IF( !is_IVAS_bitrate_fx( hEncoderConfig->ivas_total_brate ) )
@@ -1228,26 +1319,32 @@ static ivas_error configureEncoder_fx(
             }
         }
 
-        IF( hEncoderConfig->ivas_format == STEREO_FORMAT )
+        IF( EQ_16( hEncoderConfig->ivas_format, STEREO_FORMAT ) )
         {
             {
                 hEncoderConfig->element_mode_init = IVAS_CPE_DFT;
-                IF( hEncoderConfig->ivas_total_brate >= MIN_BRATE_MDCT_STEREO )
+                move16();
+                IF( GE_32( hEncoderConfig->ivas_total_brate, MIN_BRATE_MDCT_STEREO ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+                    move16();
                 }
             }
 
+            test();
+            test();
             IF( ( EQ_16( hEncoderConfig->element_mode_init, IVAS_CPE_TD ) || EQ_32( hEncoderConfig->element_mode_init, IVAS_CPE_DFT ) ) && GT_32( hEncoderConfig->ivas_total_brate, IVAS_48k ) )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for TD/DFT Stereo specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
             }
 
+            test();
             IF( EQ_16( hEncoderConfig->element_mode_init, IVAS_CPE_MDCT ) && LT_32( hEncoderConfig->ivas_total_brate, IVAS_48k ) )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for MDCT Stereo specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
             }
 
+            test();
             IF( LT_32( hEncoderConfig->ivas_total_brate, IVAS_256k ) )
             {
                 return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for Stereo specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
@@ -1267,15 +1364,18 @@ static ivas_error configureEncoder_fx(
         ELSE IF( EQ_16( hEncoderConfig->ivas_format, MASA_FORMAT ) )
         {
             /* adapt element_mode according to the bitrate */
+            test();
             IF( EQ_16( hEncoderConfig->nchan_inp, 2 ) && NE_16( hEncoderConfig->element_mode_init, IVAS_SCE ) )
             {
                 IF( GE_32( hEncoderConfig->ivas_total_brate, IVAS_48k ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+                    move16();
                 }
                 ELSE IF( LT_32( hEncoderConfig->ivas_total_brate, MASA_STEREO_MIN_BITRATE ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_DFT;
+                    move16();
                 }
             }
         }
@@ -1291,6 +1391,7 @@ static ivas_error configureEncoder_fx(
                 IF( GE_32( cpe_brate, IVAS_48k ) )
                 {
                     hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+                    move16();
                 }
             }
         }
@@ -1303,6 +1404,7 @@ static ivas_error configureEncoder_fx(
     {
         hEncoderConfig->ivas_format = MONO_FORMAT;
         hEncoderConfig->element_mode_init = EVS_MONO;
+        move16();
 
         IF( !is_EVS_bitrate( hEncoderConfig->ivas_total_brate, &hEncoderConfig->Opt_AMR_WB ) )
         {
@@ -1312,19 +1414,23 @@ static ivas_error configureEncoder_fx(
         IF( EQ_16( hEncoderConfig->stereo_dmx_evs, 1 ) )
         {
             hEncoderConfig->nchan_inp = 2;
+            move16();
         }
     }
 
     /*-----------------------------------------------------------------*
      * Input sampling frequency
      *-----------------------------------------------------------------*/
-
+    test();
+    test();
+    test();
     IF( NE_32( inputFs, 8000 ) && NE_32( inputFs, 16000 ) && NE_32( inputFs, 32000 ) && NE_32( inputFs, 48000 ) )
     {
         return IVAS_ERR_INVALID_SAMPLING_RATE;
     }
 
     hEncoderConfig->input_Fs = inputFs;
+    move32();
 
     /*-----------------------------------------------------------------*
      * Channel-aware mode
@@ -1340,25 +1446,31 @@ static ivas_error configureEncoder_fx(
      *-----------------------------------------------------------------*/
 
     st_ivas->codec_mode = MODE1; /* Note: in IVAS, set MODE1 */
+    move16();
 
     IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
         IF( hEncoderConfig->Opt_AMR_WB )
         {
             st_ivas->codec_mode = MODE1;
+            move16();
         }
         ELSE
         {
             st_ivas->codec_mode = get_codec_mode( hEncoderConfig->ivas_total_brate );
+            move16();
         }
     }
 
-    IF( hEncoderConfig->ivas_total_brate == IVAS_13k2 && hEncoderConfig->Opt_RF_ON == 1 )
+    test();
+    IF( EQ_32( hEncoderConfig->ivas_total_brate, IVAS_13k2 ) && EQ_16( hEncoderConfig->Opt_RF_ON, 1 ) )
     {
         st_ivas->codec_mode = MODE2;
+        move16();
     }
 
     st_ivas->last_codec_mode = st_ivas->codec_mode;
+    move16();
 
     /*-----------------------------------------------------------------*
      * Sanity checks
@@ -1366,11 +1478,19 @@ static ivas_error configureEncoder_fx(
 
     assert( hEncoderConfig->ivas_format != UNDEFINED_FORMAT && "\n IVAS format undefined" );
 
+    test();
+    test();
     IF( ( NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) || hEncoderConfig->stereo_dmx_evs ) && EQ_32( hEncoderConfig->input_Fs, 8000 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "8kHz input sampling rate is not supported in IVAS." );
     }
 
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
     IF( hEncoderConfig->Opt_DTX_ON && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) &&
         ( ( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) && GT_32( ivas_get_sba_num_TCs_fx( hEncoderConfig->ivas_total_brate, 1 ), 2 ) ) ||
           EQ_16( hEncoderConfig->ivas_format, MC_FORMAT ) || EQ_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) || EQ_16( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) ) )
@@ -1378,7 +1498,9 @@ static ivas_error configureEncoder_fx(
         return IVAS_ERROR( IVAS_ERR_DTX_NOT_SUPPORTED, "DTX is not supported in this IVAS format and element mode." );
     }
 
-
+    test();
+    test();
+    test();
     IF( hEncoderConfig->Opt_PCA_ON && !( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) && EQ_32( hEncoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( hEncoderConfig->sba_order, SBA_FOA_ORDER ) ) )
     {
         return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "PCA supported at SBA FOA 256 kbps only." );
@@ -1389,6 +1511,9 @@ static ivas_error configureEncoder_fx(
         return error;
     }
 
+    test();
+    test();
+    test();
     IF( hEncoderConfig->is_binaural && !( ( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) && hEncoderConfig->stereo_dmx_evs ) || EQ_16( hEncoderConfig->ivas_format, STEREO_FORMAT ) ) )
     {
         return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "'-binaural' option is supported only with '-stereo' or '-stereo_dmx_evs'" );
@@ -1406,9 +1531,6 @@ static ivas_error configureEncoder_fx(
     IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
         hIvasEnc->hCoreCoder = st_ivas->hSCE[0]->hCoreCoder[0]; /* Note: this is needed for switching in EVS mono */
-                                                                //#ifndef EVS_FLOAT_ENC
-                                                                //    hIvasEnc->hCoreCoder_fx = st_ivas->hSCE[0]->hCoreCoder_fx[0];
-                                                                //#endif
     }
     ELSE
     {
@@ -1417,11 +1539,14 @@ static ivas_error configureEncoder_fx(
 
     hIvasEnc->Opt_RF_ON_loc = hEncoderConfig->Opt_RF_ON;
     hIvasEnc->rf_fec_offset_loc = hEncoderConfig->rf_fec_offset;
+    move16();
+    move16();
 
     hIvasEnc->isConfigured = true;
 
     return error;
 }
+#endif
 /*---------------------------------------------------------------------*
  * IVAS_ENC_GetDelay()
  *
@@ -1430,7 +1555,7 @@ static ivas_error configureEncoder_fx(
 
 ivas_error IVAS_ENC_GetDelay(
     const IVAS_ENC_HANDLE hIvasEnc, /* i  : IVAS encoder handle  */
-    Word16 *delay                   /* o  : encoder delay        */
+    Word16 *delay                   /* o  : encoder delay        Q0*/
 )
 {
     ENCODER_CONFIG_HANDLE hEncoderConfig;
@@ -1447,10 +1572,10 @@ ivas_error IVAS_ENC_GetDelay(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay_fx( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL ) );
+    *delay = NS2SA_FX2( hEncoderConfig->input_Fs, get_delay_fx( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL ) ); /*Q0*/
     move16();
 
-    *delay = imult1616( *delay, hEncoderConfig->nchan_inp );
+    *delay = imult1616( *delay, hEncoderConfig->nchan_inp ); /*Q0*/
     move16();
 
     return IVAS_ERR_OK;
@@ -1476,20 +1601,22 @@ static Word16 getInputBufferSize_fx(
  *---------------------------------------------------------------------*/
 ivas_error IVAS_ENC_GetNumInChannels(
     const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle                                                                                 */
-    int16_t *numInChannels          /* o  : total number of samples expected in the input buffer for current encoder configuration              */
+    Word16 *numInChannels           /* o  : total number of samples expected in the input buffer for current encoder configuration              */
 )
 {
-    if ( hIvasEnc == NULL || numInChannels == NULL )
+    test();
+    IF( hIvasEnc == NULL || numInChannels == NULL )
     {
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    if ( !hIvasEnc->isConfigured )
+    IF( !hIvasEnc->isConfigured )
     {
         return IVAS_ERR_NOT_CONFIGURED;
     }
 
     *numInChannels = hIvasEnc->st_ivas->hEncoderConfig->nchan_inp;
+    move16();
 
     return IVAS_ERR_OK;
 }
@@ -1529,10 +1656,10 @@ ivas_error IVAS_ENC_GetInputBufferSize(
  *---------------------------------------------------------------------*/
 ivas_error IVAS_ENC_EncodeFrameToSerial(
     IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle                                                                                                     */
-    Word16 *inputBuffer,      /* i  : PCM input, Q0                                                                                                           */
-    Word16 inputBufferSize,   /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()                            */
-    UWord16 *outputBitStream, /* o  : pointer to serial output bitstream. The array must already be allocated and be of size at least IVAS_MAX_BITS_PER_FRAME */
-    UWord16 *numOutBits       /* o  : number of bits written to output bitstream. Each bit is stored as a single uint16_t value                               */
+    Word16 *inputBuffer,      /* i  : PCM input, Q0                                                                                                           Q0*/
+    Word16 inputBufferSize,   /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()                            Q0*/
+    UWord16 *outputBitStream, /* o  : pointer to serial output bitstream. The array must already be allocated and be of size at least IVAS_MAX_BITS_PER_FRAME Q0*/
+    UWord16 *numOutBits       /* o  : number of bits written to output bitstream. Each bit is stored as a single uint16_t value                               Q0*/
 )
 {
     Encoder_Struct *st_ivas;
@@ -1690,6 +1817,16 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
         /* set pointers to the new buffers of indices in each element */
         FOR( n = 0; n < st_ivas->nSCE; n++ )
         {
+#ifdef HARM_PUSH_BIT
+            st_ivas->hSCE[n]->hCoreCoder[0]->hBstr->ind_list = st_ivas->ind_list;
+            st_ivas->hSCE[n]->hCoreCoder[0]->hBstr->ivas_ind_list_zero = &st_ivas->ind_list;
+
+            if ( st_ivas->hSCE[n]->hMetaData != NULL )
+            {
+                st_ivas->hSCE[n]->hMetaData->ind_list = st_ivas->ind_list_metadata;
+                st_ivas->hSCE[n]->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata;
+            }
+#else
             test();
             IF( !( hIvasEnc->hCoreCoder == NULL && EQ_32( hEncoderConfig->ivas_format, MONO_FORMAT ) ) )
             {
@@ -1705,6 +1842,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
                 st_ivas->hSCE[n]->hMetaData->ind_list = st_ivas->ind_list_metadata;
                 st_ivas->hSCE[n]->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata;
             }
+#endif
         }
 
         FOR( n = 0; n < st_ivas->nCPE; n++ )
@@ -1749,6 +1887,9 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
         }
         ELSE
         {
+#ifdef DEBUG_MODE_INFO
+            dbgwrite( inputBuffer, sizeof( int16_t ), inputBufferSize, 1, strcat( fname( debug_dir, "ivas_input_dmx", 0, 1, ENC ), ".pcm" ) );
+#endif
             hCoreCoder->input_frame_fx = inputBufferSize;
             move32();
             IF( NE_32( ( error = evs_enc_fx( hCoreCoder, inputBuffer, hCoreCoder->mem_hp20_in_fx, inputBufferSize ) ), IVAS_ERR_OK ) )
@@ -1766,7 +1907,8 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
     }
 
     /* write indices into bitstream buffer */
-    IF( EQ_16( hEncoderConfig->element_mode_init, EVS_MONO ) )
+#ifndef HARM_PUSH_BIT
+    IF( hEncoderConfig->element_mode_init == EVS_MONO )
     {
         test();
         IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) && ( hCoreCoder->element_mode == EVS_MONO ) )
@@ -1779,6 +1921,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
         }
     }
     ELSE
+#endif
     {
         write_indices_ivas_fx( st_ivas, outputBitStream, numOutBits );
     }
@@ -1804,7 +1947,7 @@ ivas_error IVAS_ENC_SetBandwidth(
     ivas_error error;
 
     /* Do additional checks for user-facing function */
-    if ( ( error = doCommonSetterChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonSetterChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -1821,14 +1964,14 @@ ivas_error IVAS_ENC_SetBandwidth(
  *---------------------------------------------------------------------*/
 
 ivas_error IVAS_ENC_SetBitrate(
-    IVAS_ENC_HANDLE hIvasEnc,  /* i/o: IVAS encoder handle                        */
-    const int32_t totalBitrate /* i  : requested bitrate of the output bitstream  */
+    IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle                        */
+    const Word32 totalBitrate /* i  : requested bitrate of the output bitstream  */
 )
 {
     ivas_error error;
 
     /* Do additional checks for user-facing function */
-    if ( ( error = doCommonSetterChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonSetterChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -1853,7 +1996,7 @@ ivas_error IVAS_ENC_SetChannelAwareConfig(
     ivas_error error;
 
     /* Do additional checks for user-facing function */
-    if ( ( error = doCommonSetterChecks( hIvasEnc ) ) != IVAS_ERR_OK )
+    IF( ( error = doCommonSetterChecks( hIvasEnc ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -1872,6 +2015,10 @@ ivas_error IVAS_ENC_SetChannelAwareConfig(
 ivas_error IVAS_ENC_SetForcedMode(
     IVAS_ENC_HANDLE hIvasEnc,             /* i/o: IVAS encoder handle   */
     const IVAS_ENC_FORCED_MODE forcedMode /* i  : forced coding mode    */
+#ifdef DEBUG_FORCE_DIR
+    ,
+    const char *forcedModeDir /* i  : directory containing external binary files for modes/parameters enforcement */
+#endif
 )
 {
     int16_t newForced;
@@ -1883,6 +2030,27 @@ ivas_error IVAS_ENC_SetForcedMode(
         return error;
     }
 
+#ifdef DEBUG_FORCE_DIR
+    hIvasEnc->st_ivas->hEncoderConfig->force_dir[0] = '\0';
+    if ( forcedMode < IVAS_ENC_FORCE_FILE )
+    {
+        if ( ( error = forcedModeApiToInternal( forcedMode, &newForced ) ) != IVAS_ERR_OK )
+        {
+            return error;
+        }
+
+        if ( hIvasEnc->st_ivas->hEncoderConfig->force != newForced )
+        {
+            hIvasEnc->st_ivas->hEncoderConfig->force = newForced;
+            hIvasEnc->switchingActive = true;
+        }
+    }
+    else if ( forcedMode == IVAS_ENC_FORCE_DIR )
+    {
+        strcpy( hIvasEnc->st_ivas->hEncoderConfig->force_dir, forcedModeDir );
+        hIvasEnc->st_ivas->hEncoderConfig->force = IVAS_ENC_FORCE_UNFORCED;
+    }
+#else
     if ( ( error = forcedModeApiToInternal( forcedMode, &newForced ) ) != IVAS_ERR_OK )
     {
         return error;
@@ -1893,6 +2061,7 @@ ivas_error IVAS_ENC_SetForcedMode(
         hIvasEnc->st_ivas->hEncoderConfig->force = newForced;
         hIvasEnc->switchingActive = true;
     }
+#endif
 
     return IVAS_ERR_OK;
 }
@@ -1928,6 +2097,7 @@ IVAS_ENC_DTX_CONFIG IVAS_ENC_GetDefaultDtxConfig( void )
     IVAS_ENC_DTX_CONFIG defaultDtxConfig;
     defaultDtxConfig.enabled = false;
     defaultDtxConfig.SID_interval = 0;
+    move16();
     defaultDtxConfig.variable_SID_rate = false;
 
     return defaultDtxConfig;
@@ -1974,11 +2144,11 @@ const char *IVAS_ENC_GetErrorMessage(
 
 static ivas_error printConfigInfo_enc(
     IVAS_ENC_HANDLE hIvasEnc,
-    const int16_t channelAwareModeEnabled )
+    const Word16 channelAwareModeEnabled )
 {
     Encoder_Struct *st_ivas;
     ENCODER_CONFIG_HANDLE hEncoderConfig;
-    int16_t newBandwidthApi;
+    Word16 newBandwidthApi;
     ivas_error error;
 
     st_ivas = hIvasEnc->st_ivas;
@@ -1994,11 +2164,11 @@ static ivas_error printConfigInfo_enc(
      * Print bitrate
      *-----------------------------------------------------------------*/
 
-    if ( st_ivas->hEncoderConfig->Opt_SC_VBR )
+    IF( st_ivas->hEncoderConfig->Opt_SC_VBR )
     {
         fprintf( stdout, "Average bitrate:        %.2f kbps\n", (float) ACELP_5k90 / 1000 );
     }
-    else
+    ELSE
     {
         fprintf( stdout, "Bitrate:                %.2f kbps\n", (float) hEncoderConfig->ivas_total_brate / 1000 );
     }
@@ -2007,18 +2177,18 @@ static ivas_error printConfigInfo_enc(
      * Print IVAS format
      *-----------------------------------------------------------------*/
 
-    if ( hEncoderConfig->ivas_format == MONO_FORMAT )
+    IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
-        if ( hEncoderConfig->stereo_dmx_evs )
+        IF( hEncoderConfig->stereo_dmx_evs )
         {
             fprintf( stdout, "IVAS format:            stereo downmix to bit-exact EVS mono\n" );
         }
-        else
+        ELSE
         {
             fprintf( stdout, "IVAS format:            bit-exact EVS mono\n" );
         }
     }
-    else if ( hEncoderConfig->ivas_format == STEREO_FORMAT )
+    ELSE IF( hEncoderConfig->ivas_format == STEREO_FORMAT )
     {
 #ifdef DEBUGGING
         if ( hEncoderConfig->stereo_mode_cmdl == 1 )
@@ -2048,64 +2218,65 @@ static ivas_error printConfigInfo_enc(
         }
 #endif
     }
-    else if ( hEncoderConfig->ivas_format == ISM_FORMAT )
+    ELSE IF( EQ_16( hEncoderConfig->ivas_format, ISM_FORMAT ) )
     {
-        if ( hEncoderConfig->ivas_total_brate <= ACELP_32k && hEncoderConfig->nchan_inp > 2 )
+        test();
+        IF( LE_32( hEncoderConfig->ivas_total_brate, ACELP_32k ) && GT_16( hEncoderConfig->nchan_inp, 2 ) )
         {
             fprintf( stdout, "IVAS format:            Param-ISM (%i streams)\n", hEncoderConfig->nchan_inp );
         }
-        else
+        ELSE
         {
             fprintf( stdout, "IVAS format:            ISM (%i streams)\n", hEncoderConfig->nchan_inp );
         }
     }
-    else if ( hEncoderConfig->ivas_format == SBA_FORMAT )
+    ELSE IF( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) )
     {
         fprintf( stdout, "IVAS format:            Scene Based Audio, Ambisonic order %i %s ", hEncoderConfig->sba_order, hEncoderConfig->sba_planar ? "(Planar)" : "" );
-        if ( hEncoderConfig->Opt_PCA_ON )
+        IF( hEncoderConfig->Opt_PCA_ON )
         {
             fprintf( stdout, "- PCA configured with signal adaptive decision " );
         }
 
         fprintf( stdout, "\n" );
     }
-    else if ( hEncoderConfig->ivas_format == MASA_FORMAT )
+    ELSE IF( EQ_16( hEncoderConfig->ivas_format, MASA_FORMAT ) )
     {
         fprintf( stdout, "IVAS format:            MASA format\n" );
     }
-    else if ( hEncoderConfig->ivas_format == MC_FORMAT )
+    ELSE IF( EQ_16( hEncoderConfig->ivas_format, MC_FORMAT ) )
     {
-        if ( hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1 )
+        IF( hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1 )
         {
             fprintf( stdout, "IVAS mode:              Multi-Channel 5.1 \n" );
         }
-        else if ( hEncoderConfig->mc_input_setup == MC_LS_SETUP_7_1 )
+        ELSE IF( hEncoderConfig->mc_input_setup == MC_LS_SETUP_7_1 )
         {
             fprintf( stdout, "IVAS mode:              Multi-Channel 7.1 \n" );
         }
-        else if ( hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1_2 )
+        ELSE IF( hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1_2 )
         {
             fprintf( stdout, "IVAS mode:              Multi-Channel 5.1+2 \n" );
         }
-        else if ( hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1_4 )
+        ELSE IF( hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1_4 )
         {
             fprintf( stdout, "IVAS mode:              Multi-Channel 5.1+4\n" );
         }
-        else if ( hEncoderConfig->mc_input_setup == MC_LS_SETUP_7_1_4 )
+        ELSE IF( hEncoderConfig->mc_input_setup == MC_LS_SETUP_7_1_4 )
         {
             fprintf( stdout, "IVAS mode:              Multi-Channel 7.1+4\n" );
         }
     }
-    else if ( hEncoderConfig->ivas_format == SBA_ISM_FORMAT )
+    ELSE IF( EQ_16( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) )
     {
         fprintf( stdout, "IVAS format:            combined ISM and SBA (%i ISM stream(s))\n", hEncoderConfig->nchan_ism );
     }
-    else if ( hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
+    ELSE IF( EQ_16( hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) )
     {
         fprintf( stdout, "IVAS format:            combined ISM and MASA (%i ISM stream(s))\n", hEncoderConfig->nchan_ism );
     }
 
-    if ( hEncoderConfig->is_binaural )
+    IF( hEncoderConfig->is_binaural )
     {
         fprintf( stdout, "Optional indication:    binaural audio\n" );
     }
@@ -2114,13 +2285,13 @@ static ivas_error printConfigInfo_enc(
      * Print CNG update interval, if DTX is activated
      *-----------------------------------------------------------------*/
 
-    if ( hEncoderConfig->Opt_DTX_ON )
+    IF( hEncoderConfig->Opt_DTX_ON )
     {
-        if ( hEncoderConfig->var_SID_rate_flag )
+        IF( hEncoderConfig->var_SID_rate_flag )
         {
             fprintf( stdout, "DTX:                    ON, variable CNG update interval\n" );
         }
-        else
+        ELSE
         {
             fprintf( stdout, "DTX:                    ON, CNG update interval = %d frames\n", hEncoderConfig->interval_SID );
         }
@@ -2130,54 +2301,57 @@ static ivas_error printConfigInfo_enc(
      * Print potential limitation of audio bandwidth
      *-----------------------------------------------------------------*/
 
-    if ( ( error = bandwidthApiToInternal( hIvasEnc->newBandwidthApi, &newBandwidthApi ) ) != IVAS_ERR_OK )
+    IF( ( error = bandwidthApiToInternal( hIvasEnc->newBandwidthApi, &newBandwidthApi ) ) != IVAS_ERR_OK )
     {
         return error;
     }
 
-    if ( st_ivas->hEncoderConfig->Opt_SC_VBR && !hEncoderConfig->Opt_DTX_ON )
+    test();
+    IF( st_ivas->hEncoderConfig->Opt_SC_VBR && !hEncoderConfig->Opt_DTX_ON )
     {
         return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "\nError: SC-VBR 5900 bps not supported without DTX\n\n" );
     }
 
-    if ( hEncoderConfig->ivas_format == MONO_FORMAT )
+    IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
-        if ( newBandwidthApi != hEncoderConfig->max_bwidth )
+        IF( NE_16( newBandwidthApi, hEncoderConfig->max_bwidth ) )
         {
-            if ( newBandwidthApi == FB )
+            IF( EQ_16( newBandwidthApi, FB ) )
             {
                 fprintf( stdout, "\nFB coding not supported below %.2f kbps. ", ACELP_16k40 / 1000.f );
-                if ( hEncoderConfig->max_bwidth == WB )
+                IF( EQ_16( hEncoderConfig->max_bwidth, WB ) )
                 {
                     fprintf( stdout, "Switching to WB.\n" );
                 }
-                else
+                ELSE
                 {
                     fprintf( stdout, "Switching to SWB.\n" );
                 }
             }
-            else if ( newBandwidthApi == SWB )
+            ELSE IF( EQ_16( newBandwidthApi, SWB ) )
             {
                 fprintf( stdout, "\nSWB coding not supported below %.2f kbps. Switching to WB.\n", ACELP_9k60 / 1000.f );
             }
         }
 
         /* in case of 8kHz input sampling or "-max_band NB", require the total bitrate to be below 24.40 kbps */
-        if ( ( newBandwidthApi == NB || hEncoderConfig->input_Fs == 8000 ) && hEncoderConfig->ivas_total_brate > ACELP_24k40 )
+        test();
+        test();
+        IF( ( ( newBandwidthApi == NB ) || EQ_32( hEncoderConfig->input_Fs, 8000 ) ) && GT_32( hEncoderConfig->ivas_total_brate, ACELP_24k40 ) )
         {
             fprintf( stdout, "\nError: Unsupported mode NB %d bps, NB mode supports rates 5900-24400 bps\n\n", hEncoderConfig->ivas_total_brate );
             return IVAS_ERR_INVALID_BITRATE;
         }
     }
-    else
+    ELSE
     {
-        if ( newBandwidthApi != hEncoderConfig->max_bwidth )
+        IF( NE_16( newBandwidthApi, hEncoderConfig->max_bwidth ) )
         {
-            if ( hEncoderConfig->ivas_format == ISM_FORMAT )
+            IF( EQ_16( hEncoderConfig->ivas_format, ISM_FORMAT ) )
             {
                 fprintf( stdout, "\nFB coding not supported below %.2f kbps for %i objects. Switching to SWB.\n", hEncoderConfig->nchan_ism * MIN_BRATE_FB_ISM / 1000.f, hEncoderConfig->nchan_ism );
             }
-            else
+            ELSE
             {
                 fprintf( stdout, "\nFB coding not supported below %.2f kbps. Switching to SWB.\n", MIN_BRATE_FB_STEREO / 1000.f );
             }
@@ -2188,9 +2362,9 @@ static ivas_error printConfigInfo_enc(
      * Print Channel-aware limitation
      *-----------------------------------------------------------------*/
 
-    if ( channelAwareModeEnabled )
+    IF( channelAwareModeEnabled )
     {
-        if ( hEncoderConfig->Opt_RF_ON == 0 )
+        IF( hEncoderConfig->Opt_RF_ON == 0 )
         {
             fprintf( stdout, "\nChannel-aware mode is supported at 13.2 kbps 32/48 kHz only. Switching to normal mode.\n" );
         }
@@ -2208,7 +2382,7 @@ static ivas_error printConfigInfo_enc(
 
 static ivas_error setBitrate(
     IVAS_ENC_HANDLE hIvasEnc,
-    const int32_t totalBitrate )
+    const Word32 totalBitrate )
 {
     Encoder_Struct *st_ivas;
     ENCODER_CONFIG_HANDLE hEncoderConfig;
@@ -2219,65 +2393,76 @@ static ivas_error setBitrate(
 
     hEncoderConfig->ivas_total_brate = totalBitrate;
     hIvasEnc->switchingActive = true;
+    move32();
 
     /* channel-aware mode is supported only at 13.20 kbps */
-    if ( hEncoderConfig->Opt_RF_ON && hEncoderConfig->ivas_total_brate != ACELP_13k20 )
+    test();
+    IF( hEncoderConfig->Opt_RF_ON && NE_32( hEncoderConfig->ivas_total_brate, ACELP_13k20 ) )
     {
         assert( 0 && "\nChannel-aware mode is supported only at 13.20 kbps\n" );
         hEncoderConfig->Opt_RF_ON = 0;
+        move16();
     }
 
-    if ( hEncoderConfig->ivas_total_brate == ACELP_5k90 )
+    IF( EQ_32( hEncoderConfig->ivas_total_brate, ACELP_5k90 ) )
     {
         st_ivas->hEncoderConfig->Opt_SC_VBR = 1;
         hEncoderConfig->ivas_total_brate = ACELP_7k20;
+        move16();
+        move32();
     }
-    else
+    ELSE
     {
         st_ivas->hEncoderConfig->Opt_SC_VBR = 0;
+        move16();
     }
 
     /* check if the entered bitrate is supported */
-    if ( hEncoderConfig->element_mode_init > EVS_MONO )
+    IF( hEncoderConfig->element_mode_init > EVS_MONO )
     {
-        if ( !is_IVAS_bitrate_fx( hEncoderConfig->ivas_total_brate ) )
+        IF( !is_IVAS_bitrate_fx( hEncoderConfig->ivas_total_brate ) )
         {
             return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Incorrect bitrate specification in IVAS: %d", hEncoderConfig->ivas_total_brate );
         }
     }
-    else
+    ELSE
     {
-        if ( !is_EVS_bitrate( hEncoderConfig->ivas_total_brate, &hEncoderConfig->Opt_AMR_WB ) )
+        IF( !is_EVS_bitrate( hEncoderConfig->ivas_total_brate, &hEncoderConfig->Opt_AMR_WB ) )
         {
             return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Incorrect bitrate specification in EVS mono: %d", hEncoderConfig->ivas_total_brate );
         }
 
         /* in case of 8kHz signal, limit the total bitrate to 24.40 kbps */
-        if ( hEncoderConfig->input_Fs == 8000 && hEncoderConfig->ivas_total_brate > ACELP_24k40 )
+        test();
+        IF( EQ_32( hEncoderConfig->input_Fs, 8000 ) && GT_32( hEncoderConfig->ivas_total_brate, ACELP_24k40 ) )
         {
             hEncoderConfig->ivas_total_brate = ACELP_24k40;
+            move32();
         }
     }
 
-    if ( hEncoderConfig->ivas_format == ISM_FORMAT )
+    IF( EQ_16( hEncoderConfig->ivas_format, ISM_FORMAT ) )
     {
-        if ( ( error = sanitizeBitrateISM_fx( hEncoderConfig, hIvasEnc->extMetadataApi ) ) != IVAS_ERR_OK )
+        IF( ( error = sanitizeBitrateISM_fx( hEncoderConfig, hIvasEnc->extMetadataApi ) ) != IVAS_ERR_OK )
         {
             return error;
         }
     }
 
     st_ivas->codec_mode = MODE1;
+    move16();
 
-    if ( hEncoderConfig->element_mode_init == EVS_MONO )
+    IF( hEncoderConfig->element_mode_init == EVS_MONO )
     {
-        if ( hEncoderConfig->Opt_AMR_WB )
+        IF( hEncoderConfig->Opt_AMR_WB )
         {
             st_ivas->codec_mode = MODE1;
+            move16();
         }
-        else
+        ELSE
         {
             st_ivas->codec_mode = get_codec_mode( hEncoderConfig->ivas_total_brate );
+            move16();
         }
     }
 
@@ -2304,16 +2489,22 @@ static ivas_error setChannelAwareConfig_fx(
     hEncoderConfig = st_ivas->hEncoderConfig;
 
     /* channel-aware mode is supported only at 13.20 kbps and with WB or SWB bandwidth */
+    test();
+    test();
+    test();
     IF( ( caConfig.channelAwareModeEnabled && NE_32( st_ivas->hEncoderConfig->ivas_total_brate, ACELP_13k20 ) ) || ( hEncoderConfig->Opt_RF_ON && EQ_32( hEncoderConfig->input_Fs, 8000 ) ) )
     {
         hEncoderConfig->Opt_RF_ON = 0;
+        move16();
         hEncoderConfig->rf_fec_offset = 0;
+        move16();
         return IVAS_ERR_OK;
     }
 
     IF( caConfig.channelAwareModeEnabled )
     {
         hEncoderConfig->Opt_RF_ON = 1;
+        move16();
 
         /* Convert FEC indicator from API type */
         IF( ( error = fecIndicatorApiToInternal( caConfig.fec_indicator, &newFecIndicator ) ) != IVAS_ERR_OK )
@@ -2322,14 +2513,21 @@ static ivas_error setChannelAwareConfig_fx(
         }
 
         /* Set new values only if they differ from current values */
+        test();
         IF( ( NE_16( newFecIndicator, hEncoderConfig->rf_fec_indicator ) || NE_16( caConfig.fec_offset, hEncoderConfig->rf_fec_offset ) ) )
         {
             hEncoderConfig->rf_fec_indicator = newFecIndicator;
+            move16();
 
             /* Check if new FEC offset has a valid value */
+            test();
+            test();
+            test();
+            test();
             IF( EQ_16( caConfig.fec_offset, 0 ) || EQ_16( caConfig.fec_offset, 2 ) || EQ_16( caConfig.fec_offset, 3 ) || EQ_16( caConfig.fec_offset, 5 ) || EQ_16( caConfig.fec_offset, 7 ) )
             {
                 hEncoderConfig->rf_fec_offset = caConfig.fec_offset;
+                move16();
             }
             ELSE
             {
@@ -2341,10 +2539,12 @@ static ivas_error setChannelAwareConfig_fx(
 
         /* Save a copy of FEC offset value - needed during encoding */
         hIvasEnc->rf_fec_offset_loc = hEncoderConfig->rf_fec_offset;
+        move16();
     }
     ELSE
     {
         hEncoderConfig->Opt_RF_ON = 0;
+        move16();
     }
 
     return IVAS_ERR_OK;
@@ -2382,13 +2582,14 @@ static ivas_error doCommonConfigureChecks(
 static ivas_error doCommonSetterChecks(
     IVAS_ENC_HANDLE hIvasEnc )
 {
-    if ( hIvasEnc == NULL || hIvasEnc->st_ivas == NULL )
+    test();
+    IF( hIvasEnc == NULL || hIvasEnc->st_ivas == NULL )
     {
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
     /* Currently settings can be changed only after configuration step */
-    if ( !hIvasEnc->isConfigured )
+    IF( !hIvasEnc->isConfigured )
     {
         return IVAS_ERR_NOT_CONFIGURED;
     }
@@ -2414,25 +2615,34 @@ static ivas_error sanitizeBandwidth_fx(
     max_bwidth_tmp = hIvasEnc->newBandwidthApi;
 
     /* Prevent st_ivas->max_bwidth from being higher than Fs/2 */
-    IF( EQ_32( hEncoderConfig->input_Fs, 8000 ) && GT_16( max_bwidth_tmp, NB ) )
+    test();
+    test();
+    test();
+    IF( EQ_32( hEncoderConfig->input_Fs, 8000 ) && ( max_bwidth_tmp > NB ) )
     {
         max_bwidth_tmp = NB;
+        move16();
     }
     ELSE IF( EQ_32( hEncoderConfig->input_Fs, 16000 ) && GT_16( max_bwidth_tmp, WB ) )
     {
         max_bwidth_tmp = WB;
+        move16();
     }
     ELSE IF( EQ_32( hEncoderConfig->input_Fs, 32000 ) && GT_16( max_bwidth_tmp, SWB ) )
     {
         max_bwidth_tmp = SWB;
+        move16();
     }
 
     /* NB coding not supported in IVAS. Switching to WB. */
-    IF( EQ_16( max_bwidth_tmp, NB ) && NE_16( hEncoderConfig->ivas_format, UNDEFINED_FORMAT ) && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
+    test();
+    test();
+    IF( ( max_bwidth_tmp == NB ) && NE_16( hEncoderConfig->ivas_format, UNDEFINED_FORMAT ) && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
         IF( GE_32( hEncoderConfig->input_Fs, 16000 ) )
         {
             max_bwidth_tmp = WB;
+            move16();
         }
         ELSE
         {
@@ -2440,41 +2650,7 @@ static ivas_error sanitizeBandwidth_fx(
         }
     }
 
-    IF( EQ_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
-    {
-#if 0 // IVAS_fmToDo: temporary disabled to keep EVS bit-exactness -> to be verified
-    if (max_bwidth_tmp == FB && hEncoderConfig->ivas_total_brate < ACELP_16k40)
-    {
-      if (hEncoderConfig->ivas_total_brate < ACELP_9k60)
-      {
-        max_bwidth_tmp = WB;
-      }
-      else
-      {
-        max_bwidth_tmp = SWB;
-      }
-    }
-
-    if (max_bwidth_tmp == SWB && hEncoderConfig->ivas_total_brate < ACELP_9k60)
-    {
-      max_bwidth_tmp = WB;
-    }
-
-    /* in case of 8kHz input sampling or "-max_band NB", require the total bitrate to be below 24.40 kbps */
-    if ((max_bwidth_tmp == NB || hEncoderConfig->input_Fs == 8000) && hEncoderConfig->ivas_total_brate > ACELP_24k40)
-    {
-      if (hEncoderConfig->input_Fs >= 16000)
-      {
-        max_bwidth_tmp = WB;
-      }
-      else
-      {
-        return IVAS_ERR_INVALID_BITRATE;
-      }
-    }
-#endif
-    }
-    ELSE
+    IF( NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
         Word32 quo = 0, rem;
         move32();
@@ -2482,16 +2658,23 @@ static ivas_error sanitizeBandwidth_fx(
         {
             iDiv_and_mod_32( hEncoderConfig->ivas_total_brate, hEncoderConfig->nchan_ism, &quo, &rem, 0 );
         }
+
+        test();
+        test();
+        test();
+        test();
         IF( EQ_16( max_bwidth_tmp, FB ) && ( ( NE_16( hEncoderConfig->ivas_format, ISM_FORMAT ) && LT_32( hEncoderConfig->ivas_total_brate, MIN_BRATE_FB_STEREO ) ) ||
                                              ( EQ_16( hEncoderConfig->ivas_format, ISM_FORMAT ) && LT_32( quo, MIN_BRATE_FB_ISM ) ) ) )
         {
             max_bwidth_tmp = SWB;
+            move16();
         }
     }
 
     IF( NE_16( hEncoderConfig->max_bwidth, max_bwidth_tmp ) )
     {
         hEncoderConfig->max_bwidth = max_bwidth_tmp;
+        move16();
         hIvasEnc->switchingActive = true;
     }
 
@@ -2507,31 +2690,37 @@ static ivas_error sanitizeBitrateISM_fx(
     const ENCODER_CONFIG_HANDLE hEncoderConfig,
     const bool extMetadataApi )
 {
+    test();
     IF( GT_32( hEncoderConfig->ivas_total_brate, IVAS_128k ) && EQ_16( hEncoderConfig->nchan_inp, 1 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 1 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
     }
 
+    test();
     IF( GT_32( hEncoderConfig->ivas_total_brate, IVAS_256k ) && EQ_16( hEncoderConfig->nchan_inp, 2 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 2 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
     }
 
+    test();
     IF( GT_32( hEncoderConfig->ivas_total_brate, IVAS_384k ) && EQ_16( hEncoderConfig->nchan_inp, 3 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 3 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
     }
 
+    test();
     IF( LT_32( hEncoderConfig->ivas_total_brate, IVAS_16k4 ) && EQ_16( hEncoderConfig->nchan_inp, 2 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 2 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
     }
 
+    test();
     IF( LT_32( hEncoderConfig->ivas_total_brate, IVAS_24k4 ) && EQ_16( hEncoderConfig->nchan_inp, 3 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 3 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
     }
 
+    test();
     IF( LT_32( hEncoderConfig->ivas_total_brate, IVAS_24k4 ) && EQ_16( hEncoderConfig->nchan_inp, 4 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 4 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
@@ -2540,10 +2729,12 @@ static ivas_error sanitizeBitrateISM_fx(
     IF( extMetadataApi )
     {
         hEncoderConfig->ism_extended_metadata_flag = (Word16) GE_32( hEncoderConfig->ivas_total_brate, ISM_EXTENDED_METADATA_BRATE );
+        move16();
     }
     ELSE
     {
         hEncoderConfig->ism_extended_metadata_flag = 0;
+        move16();
     }
 
     return IVAS_ERR_OK;
@@ -2573,15 +2764,19 @@ static ivas_error setBandwidth_fx(
     hIvasEnc->newBandwidthApi = newBandwidth;
 
     /* NB coding not supported in IVAS. Switching to WB. */
-    IF( newBandwidth == NB && hEncoderConfig->ivas_format != UNDEFINED_FORMAT && hEncoderConfig->ivas_format != MONO_FORMAT )
+    test();
+    test();
+    IF( ( newBandwidth == NB ) && NE_16( hEncoderConfig->ivas_format, UNDEFINED_FORMAT ) && NE_16( hEncoderConfig->ivas_format, MONO_FORMAT ) )
     {
         newBandwidth = WB;
+        move16();
     }
 
     IF( hEncoderConfig->max_bwidth != newBandwidth )
     {
         hEncoderConfig->max_bwidth = newBandwidth;
         hIvasEnc->switchingActive = true;
+        move16();
     }
 
     return IVAS_ERR_OK;
@@ -2690,9 +2885,18 @@ static ivas_error forcedModeApiToInternal(
         case IVAS_ENC_FORCE_GSC:
             *forcedModeInternal = FORCE_GSC;
             break;
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        case IVAS_ENC_FORCE_TCX10:
+            *forcedModeInternal = FORCE_TCX10;
+            break;
+        case IVAS_ENC_FORCE_TCX20:
+            *forcedModeInternal = FORCE_TCX20;
+            break;
+#else
         case IVAS_ENC_FORCE_TCX:
             *forcedModeInternal = FORCE_TCX;
             break;
+#endif
         case IVAS_ENC_FORCE_HQ:
             *forcedModeInternal = FORCE_HQ;
             break;
@@ -2715,8 +2919,8 @@ static ivas_error forcedModeApiToInternal(
  *---------------------------------------------------------------------*/
 
 ivas_error IVAS_ENC_PrintConfig(
-    const IVAS_ENC_HANDLE hIvasEnc,       /* i  : IVAS encoder handle             */
-    const int16_t channelAwareModeEnabled /* i  : channel-aware mode enabled flag */
+    const IVAS_ENC_HANDLE hIvasEnc,      /* i  : IVAS encoder handle             */
+    const Word16 channelAwareModeEnabled /* i  : channel-aware mode enabled flag */
 )
 {
     return printConfigInfo_enc( hIvasEnc, channelAwareModeEnabled );
@@ -2748,33 +2952,56 @@ static void init_encoder_config(
 )
 {
     hEncoderConfig->ivas_total_brate = ACELP_12k65;
+    move32();
     hEncoderConfig->max_bwidth = SWB;
+    move16();
     hEncoderConfig->input_Fs = 16000;
+    move32();
     hEncoderConfig->nchan_inp = 1;
+    move16();
     hEncoderConfig->element_mode_init = EVS_MONO;
+    move16();
     hEncoderConfig->ivas_format = UNDEFINED_FORMAT;
+    move16();
     hEncoderConfig->is_binaural = 0;
+    move16();
     hEncoderConfig->Opt_SC_VBR = 0;
+    move16();
     hEncoderConfig->last_Opt_SC_VBR = 0;
+    move16();
     hEncoderConfig->Opt_AMR_WB = 0;
+    move16();
     hEncoderConfig->Opt_DTX_ON = 0;
+    move16();
     hEncoderConfig->Opt_RF_ON = 0;
+    move16();
     hEncoderConfig->rf_fec_offset = 0;
+    move16();
     hEncoderConfig->rf_fec_indicator = 1;
+    move16();
     hEncoderConfig->interval_SID = FIXED_SID_RATE;
+    move16();
     hEncoderConfig->var_SID_rate_flag = 1;
+    move16();
     hEncoderConfig->mc_input_setup = MC_LS_SETUP_INVALID;
+    move16();
     hEncoderConfig->stereo_dmx_evs = 0;
+    move16();
     hEncoderConfig->nchan_ism = 0;
+    move16();
     hEncoderConfig->sba_order = 0;
+    move16();
     hEncoderConfig->sba_planar = 0;
+    move16();
     hEncoderConfig->ism_extended_metadata_flag = 0;
+    move16();
 #ifdef DEBUGGING
     hEncoderConfig->stereo_mode_cmdl = 0;
     hEncoderConfig->force = -1;
     hEncoderConfig->mdct_stereo_mode_cmdl = SMDCT_MS_DECISION;
 #endif
     hEncoderConfig->Opt_PCA_ON = 0;
+    move16();
 
     return;
 }
diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h
index 1fd4e0ad06cc523f1125b52761a5fa8ac4ca3894..8cf6be1cd0e6ca1385d5c7ec3588583ea115ac20 100644
--- a/lib_enc/lib_enc.h
+++ b/lib_enc/lib_enc.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -68,7 +68,7 @@ typedef struct _IVAS_ENC_DTX_CONFIG
 {
     bool enabled;
     bool variable_SID_rate;
-    int16_t SID_interval;
+    Word16 SID_interval;
 } IVAS_ENC_DTX_CONFIG;
 
 typedef enum _IVAS_ENC_SBA_ORDER
@@ -127,8 +127,17 @@ typedef enum _IVAS_ENC_FORCED_MODE
     IVAS_ENC_FORCE_MUSIC,
     IVAS_ENC_FORCE_ACELP,
     IVAS_ENC_FORCE_GSC,
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+    IVAS_ENC_FORCE_TCX10,
+    IVAS_ENC_FORCE_TCX20,
+#else
     IVAS_ENC_FORCE_TCX,
+#endif
     IVAS_ENC_FORCE_HQ,
+#ifdef DEBUG_FORCE_DIR
+    IVAS_ENC_FORCE_FILE,
+    IVAS_ENC_FORCE_DIR,
+#endif
     IVAS_ENC_FORCE_UNFORCED,
     IVAS_ENC_FORCE_UNDEFINED = 0xffff
 } IVAS_ENC_FORCED_MODE;
@@ -160,8 +169,8 @@ ivas_error IVAS_ENC_Open_fx(
 /*! r: error code */
 ivas_error IVAS_ENC_ConfigureForMono(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                     /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -173,8 +182,8 @@ ivas_error IVAS_ENC_ConfigureForMono(
 /*! r: error code */
 ivas_error IVAS_ENC_ConfigureForStereo(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                     /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -188,34 +197,34 @@ ivas_error IVAS_ENC_ConfigureForStereo(
 /*! r: error code */
 ivas_error IVAS_ENC_ConfigureForObjects(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                     /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
-    const uint16_t numObjects,                      /* i  : number of objects to be encoded                                                                     */
+    const UWord16 numObjects,                      /* i  : number of objects to be encoded                                                                     */
     const bool ism_extended_metadata                /* i  : Extended metadata used (true/false), where extended metadata includes radius and orientation        */
 );
 
 /*! r: encoder error code */
 ivas_error IVAS_ENC_ConfigureForMASAObjects(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the ouput bitstream                                                            */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the ouput bitstream                                                            */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
-    const uint16_t numObjects,                      /* i  : number of objects to be encoded                                                                     */
-    const int16_t masaVariant                       /* i  : index specifying the number of MASA transport channels                                              */
+    const UWord16 numObjects,                      /* i  : number of objects to be encoded                                                                     */
+    const Word16 masaVariant                       /* i  : index specifying the number of MASA transport channels                                              */
 );
 
 /*! r: encoder error code */
 ivas_error IVAS_ENC_ConfigureForSBAObjects(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the ouput bitstream                                                            */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the ouput bitstream                                                            */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
-    const uint16_t numObjects,                      /* i  : number of objects to be encoded                                                                     */
+    const UWord16 numObjects,                      /* i  : number of objects to be encoded                                                                     */
     const IVAS_ENC_SBA_ORDER order,                 /* i  : order of the Ambisonics input                                                                       */
     const bool isPlanar,                            /* i  : if true, input is treated as planar Ambisonics                                                      */
     const bool Opt_PCA_ON                           /* i  : PCA option flag                                                                                     */
@@ -224,8 +233,8 @@ ivas_error IVAS_ENC_ConfigureForSBAObjects(
 /*! r: error code */
 ivas_error IVAS_ENC_ConfigureForAmbisonics(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                     /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -236,8 +245,8 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics(
 
 ivas_error IVAS_ENC_ConfigureForAmbisonics_fx(
   IVAS_ENC_HANDLE hIvasEnc,              /* i/o: IVAS encoder handle                                                                                 */
-  const int32_t inputFs,                 /* i  : input sampling frequency                                                                            */
-  const int32_t bitrate,                 /* i  : requested bitrate of the output bitstream                                                           */
+  const Word32  inputFs,                 /* i  : input sampling frequency                                                                            */
+  const Word32  bitrate,                 /* i  : requested bitrate of the output bitstream                                                           */
   const bool max_bwidth_user,            /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
   const IVAS_ENC_BANDWIDTH maxBandwidth, /* i  : bandwidth limitation                                                                                */
   const IVAS_ENC_DTX_CONFIG dtxConfig,   /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -248,8 +257,8 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics_fx(
 /*! r: error code */
 ivas_error IVAS_ENC_ConfigureForMasa(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                     /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -259,8 +268,8 @@ ivas_error IVAS_ENC_ConfigureForMasa(
 /*! r: encoder error code */
 ivas_error IVAS_ENC_ConfigureForMultichannel(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t inputFs,                          /* i  : input sampling frequency                                                                            */
-    const int32_t bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  inputFs,                          /* i  : input sampling frequency                                                                            */
+    const Word32  bitrate,                          /* i  : requested bitrate of the output bitstream                                                           */
     const bool max_bwidth_user,                     /* i  : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false)   */
     const IVAS_ENC_BANDWIDTH maxBandwidth,          /* i  : bandwidth limitation                                                                                */
     const IVAS_ENC_DTX_CONFIG dtxConfig,            /* i  : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig()                 */
@@ -276,7 +285,7 @@ void IVAS_ENC_Close(
 /*! r: error code */
 ivas_error IVAS_ENC_FeedObjectMetadata(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const uint16_t ismIndex,                        /* i  : object index                                                                                        */
+    const UWord16  ismIndex,                        /* i  : object index                                                                                        */
     const IVAS_ISM_METADATA metadata                /* i  : object metadata handle for current frame                                                            */
 );
 
@@ -298,10 +307,10 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
 /*! r: error code */
 ivas_error IVAS_ENC_EncodeFrameToCompact(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    int16_t *inputBuffer,                           /* i  : PCM input                                                                                           */
-    const int16_t inputBufferSize,                  /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()        */
-    uint8_t *outputBitStream,                       /* o  : pointer to compact output bitstream. The array must already be allocated.                           */
-    uint16_t *numOutBits                            /* o  : number of bits written to output bitstream                                                          */
+    Word16  *inputBuffer,                           /* i  : PCM input                                                                                           */
+    const Word16  inputBufferSize,                  /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()        */
+    UWord8 *outputBitStream,                       /* o  : pointer to compact output bitstream. The array must already be allocated.                           */
+    UWord16 *numOutBits                            /* o  : number of bits written to output bitstream                                                          */
 );
 
 /* Setter functions - apply changes to encoder configuration */
@@ -315,7 +324,7 @@ ivas_error IVAS_ENC_SetBandwidth(
 /*! r: error code */
 ivas_error IVAS_ENC_SetBitrate(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
-    const int32_t totalBitrate                      /* i  : requested bitrate of the output bitstream                                                           */
+    const Word32  totalBitrate                      /* i  : requested bitrate of the output bitstream                                                           */
 );
 
 /*! r: error code */
@@ -329,6 +338,9 @@ ivas_error IVAS_ENC_SetChannelAwareConfig(
 ivas_error IVAS_ENC_SetForcedMode(
     IVAS_ENC_HANDLE hIvasEnc,                       /* i/o: IVAS encoder handle                                                                                 */
     const IVAS_ENC_FORCED_MODE forcedMode           /* i  : forced coding mode                                                                                  */
+#ifdef DEBUG_FORCE_DIR
+    ,const char *forcedModeDir                      /* i  : directory containing external binary files for modes/parameters enforcement */
+#endif
 );
 #endif
 
@@ -343,13 +355,13 @@ ivas_error IVAS_ENC_GetDelay(
 /*! r: encoder error code */
 ivas_error IVAS_ENC_GetNumInChannels(
     const IVAS_ENC_HANDLE hIvasEnc,                 /* i/o: IVAS encoder handle                                                                                 */
-    int16_t *numInChannels                          /* o  : total number of samples expected in the input buffer for current encoder configuration              */
+    Word16  *numInChannels                          /* o  : total number of samples expected in the input buffer for current encoder configuration              */
 );
 
 /*! r: encoder error code */
 ivas_error IVAS_ENC_GetInputBufferSize(
     const IVAS_ENC_HANDLE hIvasEnc,                 /* i/o: IVAS encoder handle                                                                                 */
-    int16_t *inputBufferSize                        /* o  : total number of samples expected in the input buffer for current encoder configuration              */
+    Word16  *inputBufferSize                        /* o  : total number of samples expected in the input buffer for current encoder configuration              */
 );
 
 /* Utility functions */
@@ -376,7 +388,7 @@ const char *IVAS_ENC_GetErrorMessage(
 
 ivas_error IVAS_ENC_PrintConfig(
     const IVAS_ENC_HANDLE hIvasEnc,                 /* i  : IVAS encoder handle                                                                                 */
-    const int16_t channelAwareModeEnabled           /* i  : channel-aware mode enabled flag                                                                     */
+    const Word16 channelAwareModeEnabled           /* i  : channel-aware mode enabled flag                                                                     */
 );
 
 void IVAS_ENC_PrintDisclaimer(
diff --git a/lib_enc/long_enr.c b/lib_enc/long_enr.c
deleted file mode 100644
index aba21a1fe9a92c5eaab5064451c9a0d56b24dd33..0000000000000000000000000000000000000000
--- a/lib_enc/long_enr.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * long_enr()
- *
- * Compute relative energy, long-term average total noise energy and total active speech energy
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/long_enr_fx.c b/lib_enc/long_enr_fx.c
index 0916b2b09c9e59e65e5c00d4012d29f0c220f90a..60c40b3fe770908e01a5e17cb49a89bd2c45f234 100644
--- a/lib_enc/long_enr_fx.c
+++ b/lib_enc/long_enr_fx.c
@@ -18,11 +18,11 @@
 void ivas_long_enr_fx(
     Encoder_State *st_fx,              /* i/o: state structure                       	   */
     const Word16 Etot,                 /* i  : total channel E (see lib_enc\analy_sp.c) Q8 */
-    const Word16 localVAD_HE_SAD,      /* i  : HE-SAD flag without hangover                */
-    Word16 high_lpn_flag,              /* i  : sp/mus LPN flag                             */
+    const Word16 localVAD_HE_SAD,      /* i  : HE-SAD flag without hangover                Q0*/
+    Word16 high_lpn_flag,              /* i  : sp/mus LPN flag                             Q0*/
     FRONT_VAD_ENC_HANDLE hFrontVad[],  /* i/o: front-VAD handles                           */
-    const Word16 n_chan,               /* i  : number of channels                          */
-    const Word16 localVAD_HE_SAD_LR[], /* i  : HE-SAD flag without hangover LR channels    */
+    const Word16 n_chan,               /* i  : number of channels                          Q0*/
+    const Word16 localVAD_HE_SAD_LR[], /* i  : HE-SAD flag without hangover LR channels    Q0*/
     const Word16 Etot_LR[]             /* i  : total channel energy LR channels         Q8 */
 
 )
@@ -42,13 +42,13 @@ void ivas_long_enr_fx(
         {
             FOR( n = 0; n < n_chan; n++ )
             {
-                hFrontVad[n]->lp_noise_fx = hFrontVad[n]->hNoiseEst->totalNoise_fx;
+                hFrontVad[n]->lp_noise_fx = hFrontVad[n]->hNoiseEst->totalNoise_fx; /* Q8 */
                 move16();
-                tmp = add( hFrontVad[n]->lp_noise_fx, 2560 );
+                tmp = add( hFrontVad[n]->lp_noise_fx, 2560 ); /* Q8 */
 
-                IF( LT_16( hFrontVad[n]->lp_speech_fx, tmp ) )
+                if ( LT_16( hFrontVad[n]->lp_speech_fx, tmp ) )
                 {
-                    hFrontVad[n]->lp_speech_fx = tmp;
+                    hFrontVad[n]->lp_speech_fx = tmp; /* Q8 */
                     move16();
                 }
             }
@@ -59,34 +59,34 @@ void ivas_long_enr_fx(
 
             IF( LT_16( hFrontVad[0]->ini_frame, 150 ) )
             {
-                smooth_prev = 31130;
-                smooth_curr = 1638;
+                smooth_prev = 31130; /* 0.95f in Q15 */
+                smooth_curr = 1638;  /* 0.05f in Q15 */
                 move16();
                 move16();
             }
             ELSE
             {
-                smooth_prev = 32113;
-                smooth_curr = 655;
+                smooth_prev = 32113; /* 0.98f in Q15 */
+                smooth_curr = 655;   /* 0.02f in Q15 */
                 move16();
                 move16();
             }
 
             FOR( n = 0; n < n_chan; n++ )
             {
-                hFrontVad[n]->lp_noise_fx = add( mult_r( smooth_prev, hFrontVad[n]->lp_noise_fx ), mult_r( smooth_curr, hFrontVad[n]->hNoiseEst->totalNoise_fx ) );
+                hFrontVad[n]->lp_noise_fx = add( mult_r( smooth_prev, hFrontVad[n]->lp_noise_fx ), mult_r( smooth_curr, hFrontVad[n]->hNoiseEst->totalNoise_fx ) ); /* Q8 */
                 move16();
                 test();
                 IF( localVAD_HE_SAD_LR[n] && !high_lpn_flag )
                 {
-                    IF( LT_16( sub( hFrontVad[n]->lp_speech_fx, Etot_LR[n] ), 2560 ) )
+                    IF( LT_16( sub( hFrontVad[n]->lp_speech_fx, Etot_LR[n] ), 2560 /*10.0f in Q8*/ ) )
                     {
-                        hFrontVad[n]->lp_speech_fx = add( mult_r( 32113, hFrontVad[n]->lp_speech_fx ), mult_r( 655, Etot_LR[n] ) );
+                        hFrontVad[n]->lp_speech_fx = add( mult_r( 32113 /*0.98f in Q15*/, hFrontVad[n]->lp_speech_fx ), mult_r( 655 /*0.02f in Q15*/, Etot_LR[n] ) ); /* Q8 */
                         move16();
                     }
                     ELSE
                     {
-                        hFrontVad[n]->lp_speech_fx = sub( hFrontVad[n]->lp_speech_fx, 13 );
+                        hFrontVad[n]->lp_speech_fx = sub( hFrontVad[n]->lp_speech_fx, 13 /*0.05f in Q8*/ ); /* Q8 */
                         move16();
                     }
                 }
@@ -94,7 +94,7 @@ void ivas_long_enr_fx(
         }
         FOR( n = 0; n < n_chan; n++ )
         {
-            hFrontVad[n]->hNoiseEst->Etot_last_fx = Etot_LR[n];
+            hFrontVad[n]->hNoiseEst->Etot_last_32fx = L_deposit_h( Etot_LR[n] ); /* Q24 */
             move16();
         }
     }
@@ -102,7 +102,7 @@ void ivas_long_enr_fx(
     {
         IF( LT_16( st_fx->ini_frame, 4 ) )
         {
-            st_fx->lp_noise_fx = hNoiseEst->totalNoise_fx;
+            st_fx->lp_noise_fx = hNoiseEst->totalNoise_fx; /* Q8 */
             move16();
             tmp = add( st_fx->lp_noise_fx, 2560 ); /*10.0 in Q8*/
             st_fx->lp_speech_fx = s_max( st_fx->lp_speech_fx, tmp );
@@ -115,8 +115,8 @@ void ivas_long_enr_fx(
              }  else {
                  st->lp_noise = 0.98f * st->lp_noise + 0.02f * st->totalNoise;
              } */
-            alpha = 655;
-            move16();                             /* 0.02 Q15 */
+            alpha = 655; /* 0.02 Q15 */
+            move16();
             if ( LT_16( st_fx->ini_frame, 150 ) ) /* should match HE_LT_CNT_INIT_FX */
             {
                 alpha = 1638;
@@ -141,7 +141,7 @@ void ivas_long_enr_fx(
             }
         }
         /* Update */
-        st_fx->hNoiseEst->Etot_last_fx = Etot;
+        st_fx->hNoiseEst->Etot_last_32fx = L_deposit_h( Etot ); /* Q24 */
         move16();
     }
 
@@ -150,18 +150,13 @@ void ivas_long_enr_fx(
      *-----------------------------------------------------------------*/
     return;
 }
+
+
 void long_enr_fx(
     Encoder_State *st_fx,         /* i/o: state structure                       	*/
-    const Word16 Etot,            /* i  : total channel E (see lib_enc\analy_sp.c) */
-    const Word16 localVAD_HE_SAD, /* i  : HE-SAD flag without hangover             */
-    Word16 high_lpn_flag          /* i  : sp/mus LPN flag                          */
-#ifdef IVAS_CODE
-    ,
-    FRONT_VAD_ENC_HANDLE hFrontVad[CPE_CHANNELS],   /* i/o: front-VAD handles                        */
-    const int16_t n_chan,                           /* i  : number of channels                       */
-    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS], /* i  : HE-SAD flag without hangover LR channels */
-    const float Etot_LR[CPE_CHANNELS]               /* i  : total channel energy LR channels         */
-#endif
+    const Word16 Etot,            /* i  : total channel E (see lib_enc\analy_sp.c) Q8*/
+    const Word16 localVAD_HE_SAD, /* i  : HE-SAD flag without hangover             Q0*/
+    Word16 high_lpn_flag          /* i  : sp/mus LPN flag                          Q0*/
 )
 {
     Word16 tmp;
@@ -172,65 +167,15 @@ void long_enr_fx(
      * Compute long term estimate of total noise energy
      * and total active speech energy
      *-----------------------------------------------------------------*/
-#ifdef IVAS_CODE
-    Word16 n;
-    if ( hFrontVad != NULL )
-    {
-        if ( hFrontVad[0]->ini_frame < 4 )
-        {
-            for ( n = 0; n < n_chan; n++ )
-            {
-                hFrontVad[n]->lp_noise = hFrontVad[n]->hNoiseEst->totalNoise;
-                tmp = hFrontVad[n]->lp_noise + 10.0f;
-
-                if ( hFrontVad[n]->lp_speech < tmp )
-                {
-                    hFrontVad[n]->lp_speech = tmp;
-                }
-            }
-        }
-        else
-        {
-            float smooth_prev, smooth_curr;
-
-            if ( hFrontVad[0]->ini_frame < 150 )
-            {
-                smooth_prev = 0.95f;
-                smooth_curr = 0.05f;
-            }
-            else
-            {
-                smooth_prev = 0.98f;
-                smooth_curr = 0.02f;
-            }
-
-            for ( n = 0; n < n_chan; n++ )
-            {
-                hFrontVad[n]->lp_noise = smooth_prev * hFrontVad[n]->lp_noise + smooth_curr * hFrontVad[n]->hNoiseEst->totalNoise;
 
-                if ( localVAD_HE_SAD_LR[n] && !high_lpn_flag )
-                {
-                    if ( ( hFrontVad[n]->lp_speech - Etot_LR[n] ) < 10.0f )
-                    {
-                        hFrontVad[n]->lp_speech = 0.98f * hFrontVad[n]->lp_speech + 0.02f * Etot_LR[n];
-                    }
-                    else
-                    {
-                        hFrontVad[n]->lp_speech = hFrontVad[n]->lp_speech - 0.05f;
-                    }
-                }
-            }
-        }
-    }
-    else
-#endif
     {
         IF( LT_16( st_fx->ini_frame, 4 ) )
         {
-            st_fx->lp_noise_fx = hNoiseEst->totalNoise_fx;
+            st_fx->lp_noise_fx = hNoiseEst->totalNoise_fx; /* Q8 */
+            move16();
+            tmp = add( st_fx->lp_noise_fx, 2560 );                   /*10.0 in Q8*/
+            st_fx->lp_speech_fx = s_max( st_fx->lp_speech_fx, tmp ); /* Q8 */
             move16();
-            tmp = add( st_fx->lp_noise_fx, 2560 ); /*10.0 in Q8*/
-            st_fx->lp_speech_fx = s_max( st_fx->lp_speech_fx, tmp );
         }
         ELSE
         {
@@ -239,14 +184,15 @@ void long_enr_fx(
              }  else {
                  st->lp_noise = 0.98f * st->lp_noise + 0.02f * st->totalNoise;
              } */
-            alpha = 655;
-            move16();                             /* 0.02 Q15 */
+            alpha = 655; /* 0.02 Q15 */
+            move16();
             if ( LT_16( st_fx->ini_frame, 150 ) ) /* should match HE_LT_CNT_INIT_FX */
             {
-                alpha = 1638;
-                move16(); /* 0.05 Q15 */
+                alpha = 1638; /* 0.05 Q15 */
+                move16();
             }
             st_fx->lp_noise_fx = noise_est_AR1_Qx( hNoiseEst->totalNoise_fx, st_fx->lp_noise_fx, alpha ); /* Q8 state, alpha in Q15 */
+            move16();
 
             test();
             IF( ( localVAD_HE_SAD != 0 ) && ( high_lpn_flag == 0 ) )
@@ -255,10 +201,12 @@ void long_enr_fx(
                 {
                     /* st->lp_speech = 0.98f * st->lp_speech + 0.02f * Etot; */
                     st_fx->lp_speech_fx = noise_est_AR1_Qx( Etot, st_fx->lp_speech_fx, 655 ); /* Q8 state, 0.02 in Q15 */
+                    move16();
                 }
                 ELSE
                 {
                     st_fx->lp_speech_fx = sub( st_fx->lp_speech_fx, 13 ); /* st->lp_speech = st->lp_speech - 0.05f; linear decay*/
+                    move16();
                 }
             }
         }
diff --git a/lib_enc/lp_exc_e.c b/lib_enc/lp_exc_e.c
deleted file mode 100644
index 7d23dd6f703552ed5f1af9f2941cf4dee9763f27..0000000000000000000000000000000000000000
--- a/lib_enc/lp_exc_e.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/lp_exc_e_fx.c b/lib_enc/lp_exc_e_fx.c
index 8b9cb113e98d08f0eafbf693ab39722cc3d25917..01005f6419fac1fdfb8a1c1dad6f30bdb96f60e1 100644
--- a/lib_enc/lp_exc_e_fx.c
+++ b/lib_enc/lp_exc_e_fx.c
@@ -53,7 +53,8 @@ Word16 lp_filt_exc_enc_fx(
     Word16 wtmp, wtmp1;
     Word32 Ltmp;
 
-    Word16 use_prev_sf_pit_gain = 0;
+    Word16 use_prev_sf_pit_gain = 0; // Q0
+    move16();
 
     gain1 = 0;
     move16();
@@ -66,7 +67,8 @@ Word16 lp_filt_exc_enc_fx(
     test();
     IF( EQ_16( codec_mode, MODE2 ) && EQ_16( coder_type, 100 ) )
     {
-        use_prev_sf_pit_gain = 1;
+        use_prev_sf_pit_gain = 1; // Q0
+        move16();
     }
     exp_ener = 0;
     move16();
@@ -75,7 +77,7 @@ Word16 lp_filt_exc_enc_fx(
     test();
     IF( EQ_16( *lp_flag, FULL_BAND ) || EQ_16( *lp_flag, NORMAL_OPERATION ) )
     {
-        wtmp = adpt_enr_fx( codec_mode, &exc[i_subfr], h1, y1, L_subfr, &gain1, g_corr, clip_gain, xn, xn2, &exp_ener, use_prev_sf_pit_gain );
+        wtmp = adpt_enr_fx( codec_mode, &exc[i_subfr], h1, y1, L_subfr, &gain1, g_corr, clip_gain, xn, xn2, &exp_ener, use_prev_sf_pit_gain ); // exp_ener
         move16();
     }
 
@@ -89,7 +91,7 @@ Word16 lp_filt_exc_enc_fx(
     wtmp1 = 0;
     move16();
     test();
-    IF( ( EQ_16( *lp_flag, LOW_PASS ) ) || ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) )
+    IF( ( ( *lp_flag == LOW_PASS ) ) || ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) )
     {
         test();
         IF( EQ_16( codec_mode, MODE2 ) && EQ_16( L_frame, L_FRAME16k ) )
@@ -100,6 +102,7 @@ Word16 lp_filt_exc_enc_fx(
                 Ltmp = L_mac( Ltmp, 19005, exc[i + i_subfr] );
                 Ltmp = L_mac( Ltmp, 6881, exc[i + 1 + i_subfr] );
                 exc_tmp[i] = round_fx( Ltmp );
+                move16();
             }
         }
         ELSE
@@ -110,20 +113,21 @@ Word16 lp_filt_exc_enc_fx(
                 Ltmp = L_mac( Ltmp, 20972, exc[i + i_subfr] );
                 Ltmp = L_mac( Ltmp, 5898, exc[i + 1 + i_subfr] );
                 exc_tmp[i] = round_fx( Ltmp );
+                move16();
             }
         }
 
-        wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, &gain2, g_corr2, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain );
+        wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, &gain2, g_corr2, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain ); // exp_ener1
     }
 
     if ( LT_16( exp_ener, exp_ener1 ) )
     {
-        wtmp = shr( wtmp, 1 );
+        wtmp = shr( wtmp, 1 ); // exp_ener + 1
     }
 
     if ( GT_16( exp_ener, exp_ener1 ) )
     {
-        wtmp1 = shr( wtmp1, 1 );
+        wtmp1 = shr( wtmp1, 1 ); // exp_ener1 + 1
     }
 
     /*-----------------------------------------------------------------*
@@ -132,18 +136,18 @@ Word16 lp_filt_exc_enc_fx(
 
     test();
     test();
-    IF( ( ( LT_16( wtmp1, wtmp ) ) && ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) ) || ( EQ_16( *lp_flag, LOW_PASS ) ) )
+    IF( ( ( LT_16( wtmp1, wtmp ) ) && ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) ) || ( ( *lp_flag == LOW_PASS ) ) )
     {
         /* use the LP filter for pitch excitation prediction */
         select = LOW_PASS;
         move16();
-        Copy( exc_tmp, &exc[i_subfr], L_subfr );
-        Copy( y1_tmp, y1, L_subfr );
-        Copy( xn2_tmp, xn2, L_subfr );
+        Copy( exc_tmp, &exc[i_subfr], L_subfr ); // Q_new
+        Copy( y1_tmp, y1, L_subfr );             // Q_new-1+shift
+        Copy( xn2_tmp, xn2, L_subfr );           // Q_new-1+shift
 
         IF( use_prev_sf_pit_gain == 0 )
         {
-            *gain_pit = gain2;
+            *gain_pit = gain2; // Q14
             move16();
             g_corr[0] = g_corr2[0];
             move16();
@@ -162,7 +166,7 @@ Word16 lp_filt_exc_enc_fx(
         move16();
         IF( use_prev_sf_pit_gain == 0 )
         {
-            *gain_pit = gain1;
+            *gain_pit = gain1; // Q14
             move16();
         }
     }
@@ -175,7 +179,7 @@ Word16 lp_filt_exc_enc_ivas_fx(
     const Word16 coder_type, /* i  : coding type                                     Q0 */
     const Word16 i_subfr,    /* i  : subframe index                                  Q0 */
     Word16 *exc,             /* i/o: pointer to excitation signal frame              Q_new */
-    const Word16 *h1,        /* i  : weighted filter input response                  Q(14+shift) */
+    const Word16 *h1,        /* i  : weighted filter input response                  Q(15) */
     const Word16 *xn,        /* i  : target vector                                   Q_new-1+shift */
     Word16 *y1,              /* o  : zero-memory filtered adaptive excitation        Q_new-1+shift */
     Word16 *xn2,             /* o  : target vector for innovation search             Q_new-1+shift */
@@ -193,7 +197,8 @@ Word16 lp_filt_exc_enc_ivas_fx(
     Word16 wtmp, wtmp1;
     Word32 Ltmp;
 
-    Word16 use_prev_sf_pit_gain = 0;
+    Word16 use_prev_sf_pit_gain = 0; // Q0
+    move16();
 
     gain1 = 0;
     move16();
@@ -206,7 +211,8 @@ Word16 lp_filt_exc_enc_ivas_fx(
     test();
     IF( EQ_16( codec_mode, MODE2 ) && EQ_16( coder_type, 100 ) )
     {
-        use_prev_sf_pit_gain = 1;
+        use_prev_sf_pit_gain = 1; // Q0
+        move16();
     }
     exp_ener = 0;
     move16();
@@ -215,13 +221,13 @@ Word16 lp_filt_exc_enc_ivas_fx(
     test();
     IF( EQ_16( *lp_flag, FULL_BAND ) || EQ_16( *lp_flag, NORMAL_OPERATION ) )
     {
-        IF( use_prev_sf_pit_gain == 1 )
+        IF( EQ_16( use_prev_sf_pit_gain, 1 ) )
         {
-            wtmp = adpt_enr_fx( codec_mode, &exc[i_subfr], h1, y1, L_subfr, gain_pit, g_corr, clip_gain, xn, xn2, &exp_ener, use_prev_sf_pit_gain );
+            wtmp = adpt_enr_fx( codec_mode, &exc[i_subfr], h1, y1, L_subfr, gain_pit, g_corr, clip_gain, xn, xn2, &exp_ener, use_prev_sf_pit_gain ); // exp_ener
         }
-        else
+        ELSE
         {
-            wtmp = adpt_enr_fx( codec_mode, &exc[i_subfr], h1, y1, L_subfr, &gain1, g_corr, clip_gain, xn, xn2, &exp_ener, use_prev_sf_pit_gain );
+            wtmp = adpt_enr_fx( codec_mode, &exc[i_subfr], h1, y1, L_subfr, &gain1, g_corr, clip_gain, xn, xn2, &exp_ener, use_prev_sf_pit_gain ); // exp_ener
         }
     }
 
@@ -235,7 +241,7 @@ Word16 lp_filt_exc_enc_ivas_fx(
     wtmp1 = 0;
     move16();
     test();
-    IF( ( EQ_16( *lp_flag, LOW_PASS ) ) || ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) )
+    IF( ( ( *lp_flag == LOW_PASS ) ) || ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) )
     {
         test();
         IF( EQ_16( codec_mode, MODE2 ) && EQ_16( L_frame, L_FRAME16k ) )
@@ -246,6 +252,7 @@ Word16 lp_filt_exc_enc_ivas_fx(
                 Ltmp = L_mac( Ltmp, 19005, exc[i + i_subfr] );
                 Ltmp = L_mac( Ltmp, 6881, exc[i + 1 + i_subfr] );
                 exc_tmp[i] = round_fx( Ltmp );
+                move16();
             }
         }
         ELSE
@@ -256,15 +263,16 @@ Word16 lp_filt_exc_enc_ivas_fx(
                 Ltmp = L_mac( Ltmp, 20972, exc[i + i_subfr] );
                 Ltmp = L_mac( Ltmp, 5898, exc[i + 1 + i_subfr] );
                 exc_tmp[i] = round_fx( Ltmp );
+                move16();
             }
         }
-        IF( use_prev_sf_pit_gain == 1 )
+        IF( EQ_16( use_prev_sf_pit_gain, 1 ) )
         {
-            wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, &gain2, gain_pit, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain );
+            wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, gain_pit, g_corr2, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain ); // exp_ener1
         }
         ELSE
         {
-            wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, &gain2, g_corr2, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain );
+            wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, &gain2, g_corr2, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain ); // exp_ener1
         }
     }
 
@@ -284,18 +292,18 @@ Word16 lp_filt_exc_enc_ivas_fx(
 
     test();
     test();
-    IF( ( ( LT_16( wtmp1, wtmp ) ) && ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) ) || ( EQ_16( *lp_flag, LOW_PASS ) ) )
+    IF( ( ( LT_16( wtmp1, wtmp ) ) && ( EQ_16( *lp_flag, NORMAL_OPERATION ) ) ) || ( ( *lp_flag == LOW_PASS ) ) )
     {
         /* use the LP filter for pitch excitation prediction */
         select = LOW_PASS;
         move16();
-        Copy( exc_tmp, &exc[i_subfr], L_subfr );
-        Copy( y1_tmp, y1, L_subfr );
-        Copy( xn2_tmp, xn2, L_subfr );
+        Copy( exc_tmp, &exc[i_subfr], L_subfr ); // Q_new
+        Copy( y1_tmp, y1, L_subfr );             // Q_new-1+shift
+        Copy( xn2_tmp, xn2, L_subfr );           // Q_new-1+shift
 
         IF( use_prev_sf_pit_gain == 0 )
         {
-            *gain_pit = gain2;
+            *gain_pit = gain2; // Q14
             move16();
             g_corr[0] = g_corr2[0];
             move16();
@@ -314,7 +322,7 @@ Word16 lp_filt_exc_enc_ivas_fx(
         move16();
         IF( use_prev_sf_pit_gain == 0 )
         {
-            *gain_pit = gain1;
+            *gain_pit = gain1; // Q14
             move16();
         }
     }
@@ -354,18 +362,12 @@ static Word16 adpt_enr_fx(                          /* o  : adaptive excitation
 
     Overflow = 0;
     move16();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
     Overflow =
-#endif
         conv_fx( exc, h1, y1, L_subfr );
 
     IF( use_prev_sf_pit_gain == 0 )
     {
-#ifdef BASOP_NOGLOB /* Critical Overflow */
         *gain = corr_xy1_fx( xn, y1, g_corr, L_subfr, codec_mode == MODE2, &Overflow );
-#else
-        *gain = corr_xy1_fx( xn, y1, g_corr, L_subfr, codec_mode == MODE2 );
-#endif
         move16();
 
         test();
@@ -373,19 +375,15 @@ static Word16 adpt_enr_fx(                          /* o  : adaptive excitation
         {
             FOR( i = 0; i < L_subfr; i++ )
             {
-                exc_tmp[i] = mult( exc[i], 8192 );
+                exc_tmp[i] = mult( exc[i], 8192 /*0.25.Q15*/ ); // Q_new
                 move16();
-                xn_tmp[i] = mult( xn[i], 8192 );
+                xn_tmp[i] = mult( xn[i], 8192 /*0.25.Q15*/ ); // Q_new
                 move16();
             }
             Overflow = 0;
 
             conv_fx( exc_tmp, h1, y1, L_subfr );
-#ifdef BASOP_NOGLOB
             *gain = corr_xy1_fx( xn_tmp, y1, g_corr, L_subfr, codec_mode == MODE2, &Overflow );
-#else
-            *gain = corr_xy1_fx( xn_tmp, y1, g_corr, L_subfr, codec_mode == MODE2 );
-#endif
             move16();
         }
 
@@ -393,14 +391,14 @@ static Word16 adpt_enr_fx(                          /* o  : adaptive excitation
         test();
         if ( EQ_16( clip_gain, 1 ) && GT_16( *gain, 15565 ) ) /* constant in Q14 */
         {
-            *gain = 15565;
+            *gain = 15565; // 0.95.Q14
             move16();
         }
 
         test();
-        if ( EQ_16( clip_gain, 2 ) && GT_16( *gain, 10650 ) )
+        IF( EQ_16( clip_gain, 2 ) && GT_16( *gain, 10650 ) ) // 0.65.Q14
         {
-            *gain = 10650;
+            *gain = 10650; // 0.65.Q14
             move16();
         }
     }
@@ -413,14 +411,14 @@ static Word16 adpt_enr_fx(                          /* o  : adaptive excitation
         /* could possibly happen in GSC */
         Ltmp = Calc_Energy_Autoscaled( xn2, 0, L_subfr, exp_ener );
         i = norm_l( Ltmp );
-        ener = extract_h( L_shl( Ltmp, i ) );
+        ener = extract_h( L_shl( Ltmp, i ) ); // exp_ener
         i = sub( 31, i );
         *exp_ener = sub( i, *exp_ener );
         move16();
     }
     ELSE
     {
-        ener = extract_h( Dot_product12( xn2, xn2, L_SUBFR, exp_ener ) );
+        ener = extract_h( Dot_product12( xn2, xn2, L_SUBFR, exp_ener ) ); // Q15
     }
 
     return ener;
@@ -434,15 +432,13 @@ static Word16 adpt_enr_fx(                          /* o  : adaptive excitation
  *-------------------------------------------------------------------*/
 
 Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)         */
-                    const Word16 xn_1[],   /* i  : target signal                         */
-                    const Word16 y1_1[],   /* i  : filtered adaptive codebook excitation */
-                    Word16 g_corr[],       /* o  : correlations <y1,y1>  and -2<xn,y1>   */
+                    const Word16 xn_1[],   /* i  : target signal                         Q_new*/
+                    const Word16 y1_1[],   /* i  : filtered adaptive codebook excitation 12 bits*/
+                    Word16 g_corr[],       /* o  : correlations <y1,y1>  and -2<xn,y1>   mant/exp*/
                     const Word16 L_subfr,  /* i  : vector length                         */
                     const Word16 norm_flag /* i  : flag for constraining pitch contribution */
-#ifdef BASOP_NOGLOB
                     ,
                     Flag *Overflow_out /* o :  propagating the Overflow flag to upper level */
-#endif
 )
 {
     Word16 i;
@@ -458,24 +454,20 @@ Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)
      *----------------------------------------------------------------*/
 
     /* Compute scalar product <y1[],y1[]> */
-    Copy( xn_1, xn, L_subfr );
+    Copy( xn_1, xn, L_subfr ); // Q_new
     Copy( y1_1, y1, L_subfr );
     Overflow = 0;
     move16();
-#ifdef BASOP_NOGLOB /* Critical Overflow */
     Ltmp1 = Dot_product12_o( y1, y1, L_subfr, &exp_yy, &Overflow );
     *Overflow_out |= Overflow;
     move16();
-#else
-    Ltmp1 = Dot_product12( y1, y1, L_subfr, &exp_yy );
-#endif
     IF( Overflow )
     {
         FOR( i = 0; i < L_subfr; i++ )
         {
-            xn[i] = mult_r( xn_1[i], 4096 );
+            xn[i] = mult_r( xn_1[i], 4096 /*0.125.Q15*/ ); // Q-new
             move16();
-            y1[i] = mult_r( y1_1[i], 4096 );
+            y1[i] = mult_r( y1_1[i], 4096 /*0.125.Q15*/ );
             move16();
         }
 
@@ -500,17 +492,13 @@ Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)
     }
     ELSE
     {
-        yy = extract_h( Ltmp1 );
+        yy = extract_h( Ltmp1 ); // exp_yy
         /* Ltmp1 = L_shr(Ltmp1, sub(30, exp_yy));*/
 
         /* Compute scalar product <xn[],y1[]> */
-#ifdef BASOP_NOGLOB
         Ltmp2 = Dot_product12_o( xn, y1, L_subfr, &exp_xy, &Overflow );
         *Overflow_out |= Overflow;
         move16();
-#else
-        Ltmp2 = Dot_product12( xn, y1, L_subfr, &exp_xy );
-#endif
         xy = extract_h( Ltmp2 );
         /* Ltmp2 = L_shr(Ltmp2, sub(30, exp_xy));*/
 
@@ -519,7 +507,7 @@ Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)
         g_corr[1] = exp_yy;
         move16();
         /* -2.0*temp1 + 0.01 is done in Gain_enc_2 function*/
-        g_corr[2] = xy;
+        g_corr[2] = xy; // exp_xy
         move16();
         g_corr[3] = exp_xy;
         move16();
@@ -530,16 +518,12 @@ Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)
     IF( xy >= 0 && NE_16( s_or( yy, xy ), 16384 ) )
     {
         /* compute gain = xy/yy */
-        xy = shr( xy, 1 ); /* be sure that xy < yy */
-        gain = div_s( xy, yy );
+        xy = shr( xy, 1 );      /* be sure that xy < yy */
+        gain = div_s( xy, yy ); // Q15
         i = sub( exp_xy, exp_yy );
-#ifdef BASOP_NOGLOB
         gain = shl_o( gain, i, &Overflow ); /* saturation can occur here */
         *Overflow_out |= Overflow;
         move16();
-#else /* BASOP_NOGLOB */
-        gain = shl( gain, i ); /* saturation can occur here */
-#endif
 
         gain = s_max( gain, 0 );
         gain = s_min( gain, GAIN_PIT_MAX ); /* 1.2 in Q14 */
@@ -553,29 +537,23 @@ Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)
     /* Limit the energy of pitch contribution */
     IF( norm_flag )
     {
-#ifdef BASOP_NOGLOB
         /*that part of code seems never used*/
-#endif
         /* Compute scalar product <xn[],xn[]> */
         xx = round_fx( Dot_product12_offs( xn, xn, L_subfr, &exp_xx, 1 ) );
 
         /* gain_p_snr = sqrt(<xn,xn>/<y1,y1>) */
         tmp = BASOP_Util_Divide1616_Scale( xx, yy, &exp_div );
         exp_xx = add( sub( exp_xx, exp_yy ), exp_div );
-        tmp = Sqrt16( tmp, &exp_xx );
+        tmp = Sqrt16( tmp, &exp_xx ); // exp_xx
 
         /* Note: shl works as shl or shr. */
         exp_xx = sub( exp_xx, 1 );
         BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
         gain_p_snr = round_fx_sat( L_shl_sat( Mpy_32_16_1( 1717986944l /*ACELP_GAINS_CONST Q31*/, tmp ), exp_xx ) );
-#else
-        gain_p_snr = round_fx( L_shl( Mpy_32_16_1( 1717986944l /*ACELP_GAINS_CONST Q31*/, tmp ), exp_xx ) );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
 
-        gain = s_min( gain, gain_p_snr );
+        gain = s_min( gain, gain_p_snr ); // Q14
     }
 
-    return gain;
+    return gain; // Q14
 }
diff --git a/lib_enc/lsf_enc.c b/lib_enc/lsf_enc.c
deleted file mode 100644
index 06e686f8142b9c7463e42f3abbbea3f1e7e4166e..0000000000000000000000000000000000000000
--- a/lib_enc/lsf_enc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-#include "basop_proto_func.h"
-#include "ivas_prot.h"
-#include "ivas_prot_fx.h"
-#include "ivas_rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/lsf_enc_fx.c b/lib_enc/lsf_enc_fx.c
index af1dbd1bd72aa737403b148eb9fba04620c69740..23ed7d0c2489486806792721a6538f2ce3d37f2f 100644
--- a/lib_enc/lsf_enc_fx.c
+++ b/lib_enc/lsf_enc_fx.c
@@ -8,7 +8,6 @@
 #include "rom_com_fx.h" /* Static table prototypes                */
 #include "rom_com.h"    /* Static table prototypes                */
 //#include "prot_fx.h"       /* Function prototypes                    */
-#include "prot.h"         /* Function prototypes                    */
 #include "prot_fx.h"      /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                    */
 #include "ivas_prot_fx.h" /* Function prototypes                    */
@@ -32,9 +31,9 @@ static Word32 vq_lvq_lsf_enc( Word16 pred_flag, Word16 mode, Word16 u[], Word16
 
 static Word32 vq_lvq_lsf_enc_ivas_fx( Word16 pred_flag, Word16 mode, Word16 u[], Word16 *levels, Word16 stages, Word16 w[], Word16 Idx[], const Word16 *lsf, const Word16 *pred, Word16 *resq, Word16 *lsfq );
 
-static void lsf_mid_enc_fx( BSTR_ENC_HANDLE hBstr, int16_t nb_bits, const Word16 int_fs, const Word16 qlsp0[], const Word16 qlsp1[], Word16 lsp[], const Word16 coder_type, const Word16 bwidth, Word32 Bin_Ener_old[], Word32 Bin_Ener[], Word16 Q_ener, Word16 ppp_mode, Word16 nelp_mode );
+static void lsf_mid_enc_fx( BSTR_ENC_HANDLE hBstr, Word16 nb_bits, const Word16 int_fs, const Word16 qlsp0[], const Word16 qlsp1[], Word16 lsp[], const Word16 coder_type, const Word16 bwidth, Word32 Bin_Ener_old[], Word32 Bin_Ener[], Word16 Q_ener, Word16 ppp_mode, Word16 nelp_mode );
 
-static void lsf_mid_enc_ivas_fx( BSTR_ENC_HANDLE hBstr, int16_t nb_bits, const Word32 int_fs, const Word16 qlsp0[], const Word16 qlsp1[], Word16 lsp[], const Word16 coder_type, const Word16 bwidth, Word32 Bin_Ener_old[], Word16 Q_ener, Word16 ppp_mode, Word16 nelp_mode );
+static void lsf_mid_enc_ivas_fx( BSTR_ENC_HANDLE hBstr, Word16 nb_bits, const Word32 int_fs, const Word16 qlsp0[], const Word16 qlsp1[], Word16 lsp[], const Word16 coder_type, const Word16 bwidth, Word32 Bin_Ener_old[], Word16 Q_ener, Word16 ppp_mode, Word16 nelp_mode );
 
 /*===========================================================================*/
 /* FUNCTION : lsf_enc_fx()                                                   */
@@ -72,21 +71,14 @@ void lsf_enc_fx(
     const Word16 Nb_ACELP_frames,
     const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag */
     const Word16 GSC_IVAS_mode,     /* i  : GSC IVAS mode                        */
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    const float tdm_lsfQ_PCh[M], /* i  : Q LSFs for primary channel          */
-#endif
     const Word16 Q_new )
 {
     Word16 nBits = 0;
+    move16();
     Word16 int_fs;
     Word16 force_sf = 0;
+    move16();
     Word16 fec_lsf[M], stab, i;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
-    (void) tdm_low_rate_mode;
-#endif
-#ifdef IVAS_CODE
-    Word16 param_lpc[NPRM_LPC_NEW];
-#endif
     Word32 L_tmp;
     Word16 coder_type, ppp_mode, nelp_mode;
 
@@ -191,36 +183,20 @@ void lsf_enc_fx(
     /*-------------------------------------------------------------------------------------*
      * Frame end LSF quantization
      *-------------------------------------------------------------------------------------*/
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    lsf_end_enc_fx( st_fx, lsf_new, lsf_new, nBits, coder_type, Q_new + QSCALE - 2,
-                    force_sf, NULL, NULL, NULL, st_fx->coder_type_raw_fxtdm_lsfQ_PCh );
-#else
+
     lsf_end_enc_fx( st_fx, lsf_new, lsf_new, nBits, coder_type, Q_new + QSCALE - 2,
                     force_sf, NULL, NULL, NULL, st_fx->coder_type_raw );
-#endif
+
     /* convert quantized LSFs back to LSPs */
     lsf2lsp_fx( lsf_new, lsp_new, M, int_fs );
 
     test();
-    IF( EQ_16( st_fx->last_core, HQ_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) )
+    IF( EQ_16( st_fx->last_core, HQ_CORE ) && ( st_fx->core == ACELP_CORE ) )
     {
         /* don't use old LSF values if this is the first ACELP frame after HQ frames */
         Copy( lsf_new, st_fx->lsf_old_fx, M );
     }
     /* set seed_acelp used in UC mode */
-#ifdef IVAS_CODE
-    test();
-    IF( EQ_16( coder_type, UNVOICED ) && GT_16( st_fx->element_mode, EVS_MONO ) )
-    {
-        st_fx->seed_acelp = 0;
-        move16();
-        FOR( i = no_param_lpc - 1; i >= 0; i-- )
-        {
-            /* rightshift before *seed_acelp+param_lpc[i] to avoid overflows*/
-            st->seed_acelp = (int16_t) ( ( ( ( st->seed_acelp ) >> 1 ) + param_lpc[i] ) * 31821L + 13849L );
-        }
-    }
-#endif
     IF( EQ_32( st_fx->core_brate, SID_2k40 ) )
     {
         /* return if SID frame (conversion to A(z) done in the calling function) */
@@ -242,7 +218,7 @@ void lsf_enc_fx(
     FEC_lsf_estim_enc_fx( st_fx, fec_lsf );
 
     /* in case of FEC in decoder - calculate LSF stability */
-    stab = lsf_stab_fx( lsf_new, fec_lsf, 0, st_fx->L_frame );
+    stab = lsf_stab_fx( lsf_new, fec_lsf, 0, st_fx->L_frame ); // Q15
 
     test();
     test();
@@ -281,8 +257,8 @@ void lsf_enc_fx(
     if ( st_fx->rate_switching_reset )
     {
         /*extrapolation in case of unstable LSF convert*/
-        Copy( lsp_new, st_fx->lsp_old_fx, M );
-        Copy( lsf_new, st_fx->lsf_old_fx, M );
+        Copy( lsp_new, st_fx->lsp_old_fx, M ); // Q15
+        Copy( lsf_new, st_fx->lsf_old_fx, M ); // Q15
     }
     /* Mid-frame LSF encoding */
     lsf_mid_enc_fx( st_fx->hBstr, st_fx->acelp_cfg.mid_lsf_bits, int_fs, st_fx->lsp_old_fx, lsp_new, lsp_mid, coder_type, st_fx->bwidth, st_fx->Bin_E_old_fx, st_fx->Bin_E_fx, Q_new + QSCALE - 2, ppp_mode, nelp_mode );
@@ -291,16 +267,15 @@ void lsf_enc_fx(
     IF( EQ_16( st_fx->last_core, HQ_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) )
     {
         /* don't use old LSP/LSF values if this is the first ACELP frame after HQ frames */
-        Copy( lsp_mid, st_fx->lsp_old_fx, M );
+        Copy( lsp_mid, st_fx->lsp_old_fx, M ); // Q15
         lsp2lsf_fx( lsp_mid, st_fx->lsf_old_fx, M, int_fs );
     }
 
     /* LSP interpolation and conversion of LSPs to A(z) */
-#ifdef ADD_LRTD
     test();
     IF( EQ_16( tdm_low_rate_mode, 1 ) && GT_16( coder_type, UNVOICED ) )
     {
-        IF( EQ_16( st_fx->active_cnt_fx, 1 ) )
+        IF( EQ_16( st_fx->active_cnt, 1 ) )
         {
             Copy( lsp_mid, st_fx->lsp_old_fx, M );
             lsp2lsf_fx( lsp_mid, st_fx->lsf_old_fx, M, int_fs );
@@ -311,26 +286,28 @@ void lsf_enc_fx(
         int_lsp4_fx( st_fx->L_frame, st_fx->lsp_old_fx, lsp_mid, lsp_new, Aq, M, -2 );
     }
     ELSE
-#endif
     {
         int_lsp4_fx( st_fx->L_frame, st_fx->lsp_old_fx, lsp_mid, lsp_new, Aq, M, 0 );
     }
+
     /*------------------------------------------------------------------*
      * Check LSF stability (distance between old LSFs and current LSFs)
      *------------------------------------------------------------------*/
+
     IF( NE_32( st_fx->core_brate, SID_2k40 ) )
     {
         st_fx->stab_fac_fx = lsf_stab_fx( lsf_new, st_fx->lsf_old_fx, 0, st_fx->L_frame );
     }
+
     return;
 }
 
 void lsf_enc_ivas_fx(
     Encoder_State *st,              /* i/o: state structure                   */
-    Word16 *lsf_new,                /* o  : quantized LSF vector              */
-    Word16 *lsp_new,                /* i/o: LSP vector to quantize/quantized  */
-    Word16 *lsp_mid,                /* i/o  : mid-frame LSP vector            */
-    Word16 *Aq,                     /* o  : quantized A(z) for 4 subframes    */
+    Word16 *lsf_new,                /* o  : quantized LSF vector              Q(x2.56)*/
+    Word16 *lsp_new,                /* i/o: LSP vector to quantize/quantized  Q15*/
+    Word16 *lsp_mid,                /* i/o  : mid-frame LSP vector            Q15*/
+    Word16 *Aq,                     /* o  : quantized A(z) for 4 subframes    Q12*/
     const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag */
     const Word16 GSC_IVAS_mode,     /* i  : GSC IVAS mode                        */
     const Word16 tdm_lsfQ_PCh[M],   /* i  : Q LSFs for primary channel          */
@@ -490,15 +467,15 @@ void lsf_enc_ivas_fx(
     IF( NE_16( st->last_L_frame, st->L_frame ) )
     {
         /* FEC - in case of core switching, use old LSFs */
-        Copy( st->lsf_old_fx, st->lsfoldbfi1_fx, M );
-        Copy( st->lsf_old_fx, st->lsfoldbfi0_fx, M );
-        Copy( st->lsf_old_fx, st->lsf_adaptive_mean_fx, M );
+        Copy( st->lsf_old_fx, st->lsfoldbfi1_fx, M );        // Q15
+        Copy( st->lsf_old_fx, st->lsfoldbfi0_fx, M );        // Q15
+        Copy( st->lsf_old_fx, st->lsf_adaptive_mean_fx, M ); // Q15
     }
 
     FEC_lsf_estim_enc_fx( st, fec_lsf );
 
     /* in case of FEC in decoder - calculate LSF stability */
-    stab = lsf_stab_ivas_fx( lsf_new, fec_lsf, 0, st->L_frame );
+    stab = lsf_stab_ivas_fx( lsf_new, fec_lsf, 0, st->L_frame ); // Q15
 
     test();
     test();
@@ -537,8 +514,8 @@ void lsf_enc_ivas_fx(
     IF( st->rate_switching_reset )
     {
         /*extrapolation in case of unstable LSF convert*/
-        Copy( lsp_new, st->lsp_old_fx, M );
-        Copy( lsf_new, st->lsf_old_fx, M );
+        Copy( lsp_new, st->lsp_old_fx, M ); // Q15
+        Copy( lsf_new, st->lsf_old_fx, M ); // Q15
     }
     /* Mid-frame LSF encoding */
     lsf_mid_enc_ivas_fx( st->hBstr, st->acelp_cfg.mid_lsf_bits, st->sr_core, st->lsp_old_fx, lsp_new, lsp_mid, coder_type, st->bwidth, st->Bin_E_old_fx, Q_new + QSCALE - 2, ppp_mode, nelp_mode );
@@ -557,9 +534,9 @@ void lsf_enc_ivas_fx(
     {
         IF( EQ_16( st->active_cnt, 1 ) )
         {
-            Copy( lsp_mid, st->lsp_old_fx, M );
+            Copy( lsp_mid, st->lsp_old_fx, M ); // Q15
             lsp2lsf_fx( lsp_mid, st->lsf_old_fx, M, st->sr_core );
-            Copy( lsp_new, lsp_mid, M );
+            Copy( lsp_new, lsp_mid, M ); // Q15
         }
 
         /* LSP interpolation and conversion of LSPs to A(z) - two-subframe mode  */
@@ -574,7 +551,7 @@ void lsf_enc_ivas_fx(
      *------------------------------------------------------------------*/
     IF( NE_32( st->core_brate, SID_2k40 ) )
     {
-        st->stab_fac_fx = lsf_stab_ivas_fx( lsf_new, st->lsf_old_fx, 0, st->L_frame );
+        st->stab_fac_fx = lsf_stab_ivas_fx( lsf_new, st->lsf_old_fx, 0, st->L_frame ); // Q15
     }
     return;
 }
@@ -673,11 +650,11 @@ static void lsfq_CNG_fx(
     Vr_add( qlsf, &CNG_SN1_fx[idx_cv * M], qlsf, M );
 
     /* write the VQ index to the bitstream */
-    push_indice_fx( hBstr, IND_ISF_0_0, idx_cv, 4 );
+    push_indice( hBstr, IND_ISF_0_0, idx_cv, 4 );
 
     /* write the LVQ index to the bitstream */
-    push_indice_fx( hBstr, IND_ISF_0_1, idx_lvq[0], LEN_INDICE );
-    push_indice_fx( hBstr, IND_ISF_0_1, idx_lvq[1], LSF_BITS_CNG - 4 - LEN_INDICE );
+    push_indice( hBstr, IND_ISF_0_1, idx_lvq[0], LEN_INDICE );
+    push_indice( hBstr, IND_ISF_0_1, idx_lvq[1], LSF_BITS_CNG - 4 - LEN_INDICE );
 
     return;
 }
@@ -759,7 +736,7 @@ static void lsfq_CNG_ivas_fx(
     /* MSVQ_ROM to be updated */
     mslvq_cng_ivas_fx( idx_cv, dd, qlsf, ddq, idx_lead_cng, idx_scale_cng, wghts );
 
-    index_lvq_ivas_fx( ddq, idx_lead_cng, idx_scale_cng, START_CNG + idx_cv, idx_lvq, 0 );
+    index_lvq_ivas_fx( ddq, idx_lead_cng, idx_scale_cng, START_CNG_IVAS + idx_cv, idx_lvq, 0 );
     Vr_add( qlsf, &CNG_SN1_fx[idx_cv * M], qlsf, M );
 
     /* write the VQ index to the bitstream */
@@ -807,11 +784,7 @@ static Word16 qlsf_Mode_Select_fx(
     {
         pred_pow2[i] = shl( pred1[i], cs );
         move16();
-#ifdef BASOP_NOGLOB
         En = L_mac_o( En, mult( pred_pow2[i], shl_o( w[i], 2, &Overflow ) ), pred_pow2[i], &Overflow ); /* 2.56*2.56 at Q-4 */
-#else                                                                                                   /* BASOP_NOGLOB */
-        En = L_mac( En, mult( pred_pow2[i], shl( w[i], 2 ) ), pred_pow2[i] ); /* 2.56*2.56 at Q-4 */
-#endif                                                                                                  /* BASOP_NOGLOB */
     }
 
     cs = shl( cs, 1 );
@@ -879,8 +852,8 @@ static Word16 qlsf_Mode_Select_fx(
 /*========================================================================*/
 void lsf_end_enc_fx(
     Encoder_State *st,           /* i/o: encoder state structure                                */
-    const Word16 *lsf,           /* i  : LSF in the frequency domain (0..6400)                  */
-    Word16 *qlsf,                /* o  : quantized LSF                                          */
+    const Word16 *lsf,           /* i  : LSF in the frequency domain (0..6400)                  x2.56*/
+    Word16 *qlsf,                /* o  : quantized LSF                                          x2.56*/
     const Word16 nBits_in,       /* i  : number of bits to spend on ISF quantization            */
     const Word16 coder_type_org, /* i  : coding type                                       */
     Word16 Q_ener,               /* i  : Q valuen for Bin_Ener                             */
@@ -889,10 +862,6 @@ void lsf_end_enc_fx(
     Word16 *no_indices,
     Word16 *bits_param_lpc,
     Word16 coder_type_raw /* i  : Coder type (LSF coder_type have some special cases)*/
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    ,
-    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel          */
-#endif
 )
 {
     Word16 i;
@@ -926,10 +895,6 @@ void lsf_end_enc_fx(
     Word16 tmp;
     Word16 flag_1bit_gran;
     BSTR_ENC_HANDLE hBstr = st->hBstr;
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    Word16 pred3[M];
-    Word16 dummy, dummy_v[5];
-#endif
 
     flag_1bit_gran = (Word16) GT_16( st->element_mode, EVS_MONO );
 
@@ -939,11 +904,7 @@ void lsf_end_enc_fx(
     test();
     test();
     test();
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    IF( EQ_16( coder_type_org, GENERIC ) && EQ_32( st->sr_core, INT_FS_16k ) && EQ_16( st->codec_mode, MODE1 ) && ( st->idchan == 0 ) ) /* this bit is used only for primary channel or mono */
-#else
     IF( EQ_16( coder_type_org, GENERIC ) && EQ_32( st->sr_core, INT_FS_16k ) && EQ_16( st->codec_mode, MODE1 ) )
-#endif
     {
         IF( EQ_16( coder_type_raw, VOICED ) )
         {
@@ -1018,16 +979,7 @@ void lsf_end_enc_fx(
         pred1[i] = add( ModeMeans_fx[mode_lvq][i], mult_r( MU_MA_FX, st->mem_MA_fx[i] ) );
         move16();
     }
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    /* TD stereo SCh: perform intra-frame prediction with pulling-to-mean */
-    if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL )
-    {
-        /* if secondary channel predmode is set to be > 2 */
-        predmode += 3;
 
-        tdm_SCh_LSF_intra_pred( st->element_brate, tdm_lsfQ_PCh, pred3 );
-    }
-#endif
     IF( predmode == 0 )
     {
         /* Subtract only mean */
@@ -1052,208 +1004,129 @@ void lsf_end_enc_fx(
         move16();
     }
     ELSE
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-        PMT( "LSF_RE_USE_SECONDARY_CHANNEL CODE IS MISSING " )
     {
-        if ( predmode == 2 )
-#endif
-        {
-            /* Adaptive scaling factor (multiplier) is updated in order to reduce the amount of consecutive predictive frames in
+        /* Adaptive scaling factor (multiplier) is updated in order to reduce the amount of consecutive predictive frames in
             case of possible frame erasure. AR-predictive usage for VOICED mode is allowed to be higher than other modes. */
-            test();
-            test();
-            test();
-            IF( ( ( GT_16( st->pstreaklen, ( STREAKLEN + 3 ) ) ) && ( EQ_16( coder_type, VOICED ) ) ) || ( ( GT_16( st->pstreaklen, ( STREAKLEN ) ) ) && ( NE_16( coder_type, VOICED ) ) ) )
+        test();
+        test();
+        test();
+        IF( ( ( GT_16( st->pstreaklen, ( STREAKLEN + 3 ) ) ) && ( EQ_16( coder_type, VOICED ) ) ) || ( ( GT_16( st->pstreaklen, ( STREAKLEN ) ) ) && ( NE_16( coder_type, VOICED ) ) ) )
+        {
+            /* update the adaptive scaling factor to become smaller with increasing number of concecutive predictive frames. */
+            st->streaklimit_fx = mult( st->streaklimit_fx, STREAKMULT_FX ); // Q15
+            move16();
+        }
+
+        IF( st->pstreaklen == 0 )
+        {
+            /* reset the consecutive AR-predictor multiplier */
+            st->streaklimit_fx = 32767; /*1.0 in Q15 */
+            move16();
+        }
+
+        /* VOICED_WB@16kHz */
+        test();
+        IF( EQ_32( st->sr_core, INT_FS_16k ) && EQ_16( coder_type, VOICED ) && flag_1bit_gran == 0 )
+        {
+            /* Subtract mean and AR prediction */
+            Copy( ModeMeans_fx[mode_lvq], pred0, M );
+            /* subtract only mean */
+            Vr_subt( lsf, pred0, Tmp, M );
+
+            FOR( i = 0; i < M; i++ )
             {
-                /* update the adaptive scaling factor to become smaller with increasing number of concecutive predictive frames. */
-                st->streaklimit_fx = mult( st->streaklimit_fx, STREAKMULT_FX );
-                move16();
+                /* subtract mean and AR prediction */
+                pred2[i] = mult( Predictors_fx[mode_lvq_p][i], sub( st->mem_AR_fx[i], pred0[i] ) );
+                Tmp2[i] = sub( Tmp[i], pred2[i] );
+                pred2[i] = add( pred2[i], pred0[i] );
             }
 
-            IF( st->pstreaklen == 0 )
+            /* select safety_net or predictive */
+            safety_net = qlsf_Mode_Select_fx( wghts, Tmp2, st->streaklimit_fx, OP_LOOP_THR_HVO );
+            IF( EQ_16( force_sf, 1 ) )
             {
-                /* reset the consecutive AR-predictor multiplier */
-                st->streaklimit_fx = 32767; /*1.0 in Q15 */
+                safety_net = 1;
                 move16();
             }
 
-            /* VOICED_WB@16kHz */
-            test();
-            IF( EQ_32( st->sr_core, INT_FS_16k ) && EQ_16( coder_type, VOICED ) && flag_1bit_gran == 0 )
+            IF( safety_net )
             {
-                /* Subtract mean and AR prediction */
-                Copy( ModeMeans_fx[mode_lvq], pred0, M );
-                /* subtract only mean */
-                Vr_subt( lsf, pred0, Tmp, M );
-
-                FOR( i = 0; i < M; i++ )
-                {
-                    /* subtract mean and AR prediction */
-                    pred2[i] = mult( Predictors_fx[mode_lvq_p][i], sub( st->mem_AR_fx[i], pred0[i] ) );
-                    Tmp2[i] = sub( Tmp[i], pred2[i] );
-                    pred2[i] = add( pred2[i], pred0[i] );
-                }
-
-                /* select safety_net or predictive */
-                safety_net = qlsf_Mode_Select_fx( wghts, Tmp2, st->streaklimit_fx, OP_LOOP_THR_HVO );
-                IF( EQ_16( force_sf, 1 ) )
-                {
-                    safety_net = 1;
-                    move16();
-                }
-
-                IF( safety_net )
-                {
-                    /* Safety-net - BC-TCQ quantization : SN */
-                    Err[0] = qlsf_ARSN_tcvq_Enc_16k_fx( Tmp, lsfq, TCQIdx0, wghts, sub( nBits, 1 ), safety_net );
-                    st->pstreaklen = 0;
-                    move16();
-                }
-                ELSE
-                {
-                    /* predictive - BC-TCQ quantization : AR */
-                    Err[1] = qlsf_ARSN_tcvq_Enc_16k_fx( Tmp2, lsfq, TCQIdx0, wghts, sub( nBits, 1 ), safety_net );
-                    st->pstreaklen = add( st->pstreaklen, 1 );
-                }
+                /* Safety-net - BC-TCQ quantization : SN */
+                Err[0] = qlsf_ARSN_tcvq_Enc_16k_fx( Tmp, lsfq, TCQIdx0, wghts, sub( nBits, 1 ), safety_net );
+                st->pstreaklen = 0;
+                move16();
             }
-            /* all other frames (not VOICED@16kHz) */
             ELSE
             {
-                /* Subtract mean and AR prediction */
-                Copy( ModeMeans_fx[mode_lvq], pred0, M );
-                /* subtract only mean */
-                Vr_subt( lsf, pred0, Tmp, M );
-
-                FOR( i = 0; i < M; i++ )
-                {
-                    /* subtract mean and AR prediction */
-                    pred2[i] = add( pred0[i], mult( Predictors_fx[mode_lvq_p][i], sub( st->mem_AR_fx[i], pred0[i] ) ) );
-                    Tmp2[i] = sub( lsf[i], pred2[i] );
-                }
-
-                /* safety-net */
-                Err[0] = vq_lvq_lsf_enc( 0, mode_lvq, Tmp, levels0, stages0, wghts, Idx0, lsf, pred0, st->offset_scale1_fx, st->offset_scale2_fx, st->no_scales_fx, resq, lsfq );
-                /* Predictive quantizer is calculated only if it can be selected */
-                test();
-                IF( !force_sf || GT_32( Err[0], abs_threshold ) )
-                {
-                    Err[1] = vq_lvq_lsf_enc( 2, mode_lvq_p, Tmp2, levels1, stages1, wghts, Idx1, lsf, pred2,
-                                             st->offset_scale1_p_fx, st->offset_scale2_p_fx, st->no_scales_p_fx, &resq[M], &lsfq[M] );
-                }
-                test();
-                test();
-                /* Select whether to use safety-net (non-predictive) or predictive LSF quantizer. The decision is based on following:
-                if the non-predictive (safety-net) quantization error (Err[0]) is low enough (spectral distortion is low) it is selected
-                or if the predictively quantized error (Err[1]) is by at least adaptive margin smaller than non-predictive quantizer.
-                or if the in case of frame erasure the resulting concealed predictive LSF would be unstable safety-net is selected */
-                IF( force_sf || LT_32( Mult_32_16( Err[0], ( st->streaklimit_fx ) ), L_add( Err[1], Mult_32_16( Err[1], PREFERSFNET_FX ) ) ) || LT_32( Err[0], abs_threshold ) )
-                {
-                    safety_net = 1;
-                    move16();
-                    st->pstreaklen = 0;
-                    move16(); /* Reset the consecutive predictive frame counter */
-                }
-                ELSE
-                {
-                    safety_net = 0;
-                    move16(); /* Increase the consecutive predictive frame counter by one */
-                    st->pstreaklen = add( st->pstreaklen, 1 );
-                }
+                /* predictive - BC-TCQ quantization : AR */
+                Err[1] = qlsf_ARSN_tcvq_Enc_16k_fx( Tmp2, lsfq, TCQIdx0, wghts, sub( nBits, 1 ), safety_net );
+                st->pstreaklen = add( st->pstreaklen, 1 );
             }
         }
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-        PMT( "LSF_RE_USE_SECONDARY_CHANNEL CODE IS MISSING " )
-        else /* of "if (predmode==2)" */
+        /* all other frames (not VOICED@16kHz) */
+        ELSE
         {
-            mvr2r( ModeMeans[mode_lvq], pred0, M );
-
-            if ( predmode == 4 )
-            {
-                mode_lvq_p = 9; /* force to Generic WB with AR*/
-            }
+            /* Subtract mean and AR prediction */
+            Copy( ModeMeans_fx[mode_lvq], pred0, M );
+            /* subtract only mean */
+            Vr_subt( lsf, pred0, Tmp, M );
 
-            for ( i = 0; i < M; i++ )
+            FOR( i = 0; i < M; i++ )
             {
                 /* subtract mean and AR prediction */
-                pred2[i] = pred0[i] + Predictors[mode_lvq_p][i] * ( st->mem_AR[i] - pred0[i] );
-                Tmp[i] = lsf[i] - pred2[i];
-                Tmp2[i] = lsf[i] - pred3[i];
+                pred2[i] = add( pred0[i], mult( Predictors_fx[mode_lvq_p][i], sub( st->mem_AR_fx[i], pred0[i] ) ) );
+                Tmp2[i] = sub( lsf[i], pred2[i] );
             }
 
-            /* Adaptive scaling factor (multiplier) is updated in order to reduce the amount of consecutive predictive frames in
-               case of possible frame erasure. AR-predictive usage for VOICED mode is allowed to be higher than other modes. */
-            if ( st->pstreaklen > ( STREAKLEN ) )
+            /* safety-net */
+            Err[0] = vq_lvq_lsf_enc( 0, mode_lvq, Tmp, levels0, stages0, wghts, Idx0, lsf, pred0, st->offset_scale1_fx, st->offset_scale2_fx, st->no_scales_fx, resq, lsfq );
+            /* Predictive quantizer is calculated only if it can be selected */
+            test();
+            IF( !force_sf || GT_32( Err[0], abs_threshold ) )
             {
-                /* update the adaptive scaling factor to become smaller with increasing number of concecutive predictive frames. */
-                st->streaklimit *= STREAKMULT;
+                Err[1] = vq_lvq_lsf_enc( 2, mode_lvq_p, Tmp2, levels1, stages1, wghts, Idx1, lsf, pred2,
+                                         st->offset_scale1_p_fx, st->offset_scale2_p_fx, st->no_scales_p_fx, &resq[M], &lsfq[M] );
             }
-
-            if ( st->pstreaklen == 0 )
+            test();
+            test();
+            /* Select whether to use safety-net (non-predictive) or predictive LSF quantizer. The decision is based on following:
+                if the non-predictive (safety-net) quantization error (Err[0]) is low enough (spectral distortion is low) it is selected
+                or if the predictively quantized error (Err[1]) is by at least adaptive margin smaller than non-predictive quantizer.
+                or if the in case of frame erasure the resulting concealed predictive LSF would be unstable safety-net is selected */
+            IF( force_sf || LT_32( Mult_32_16( Err[0], ( st->streaklimit_fx ) ), L_add( Err[1], Mult_32_16( Err[1], PREFERSFNET_FX ) ) ) || LT_32( Err[0], abs_threshold ) )
             {
-                /* reset the adaptive scaling factor */
-                st->streaklimit = 1.0f;
+                safety_net = 1;
+                move16();
+                st->pstreaklen = 0;
+                move16(); /* Reset the consecutive predictive frame counter */
             }
-
-            /* intra pred */
-            /* use G AR pred for the intra mode (as a safety mode, this is why the indexes 0/1 are interchanged)*/
-
-            lsf_allocate( nBits - 1, mode_lvq, 9, &stages1, &stages0, levels1, levels0, bits1, bits0 );
-
-            Err[0] = vq_lvq_lsf_enc( 2, 9, Tmp2, levels0, stages0, wghts, Idx0, lsf, pred3, &resq[M], &lsfq[M] );
-
-            if ( force_sf )
+            ELSE
             {
-                safety_net = 1;     /* intra-frame prediction */
-                st->pstreaklen = 0; /* Reset the consecutive predictive frame counter */
-            }
-            else
-            { /* try also the inter frame prediction */
-
-                /* AR inter-frame prediction */
-                lsf_allocate( nBits - 1, mode_lvq, mode_lvq_p, &dummy, &stages1, dummy_v, levels1, dummy_v, bits1 );
-
-
-                Err[1] = vq_lvq_lsf_enc( 2, mode_lvq_p, Tmp, levels1, stages1, wghts, Idx1, lsf, pred2, resq, lsfq );
-
-                if ( Err[0] * ( st->streaklimit ) < PREFERSFNET * Err[1] )
-                {
-                    safety_net = 1;
-                    st->pstreaklen = 0; /* Reset the consecutive predictive frame counter */
-                }
-                else
-                {
-                    safety_net = 0;
-                    ( st->pstreaklen )++; /* Increase the consecutive predictive frame counter by one */
-                }
+                safety_net = 0;
+                move16(); /* Increase the consecutive predictive frame counter by one */
+                st->pstreaklen = add( st->pstreaklen, 1 );
             }
         }
     }
-#endif /*--------------------------------------------------------------------------* \
-        * Write indices to array                                                     \
-        *--------------------------------------------------------------------------*/
+
+    /*--------------------------------------------------------------------------* \
+     * Write indices to array                                                     \
+     *--------------------------------------------------------------------------*/
 
     IF( EQ_16( st->codec_mode, MODE1 ) && EQ_16( st->core, ACELP_CORE ) )
     {
         /* write coder_type bit for VOICED@16kHz or GENERIC@16kHz */
         test();
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-        IF( EQ_16( coder_type_org, GENERIC ) && EQ_32( st->sr_core, INT_FS_16k ) && ( st->idchan == 0 ) )
-#else
         IF( EQ_16( coder_type_org, GENERIC ) && EQ_32( st->sr_core, INT_FS_16k ) )
-#endif
         {
             /* VOICED =2 and GENERIC=3, so "coder_type-2" means VOICED =0 and GENERIC=1*/
-            push_indice_fx( hBstr, IND_LSF_PREDICTOR_SELECT_BIT, sub( coder_type, 2 ), 1 );
+            push_indice( hBstr, IND_LSF_PREDICTOR_SELECT_BIT, sub( coder_type, 2 ), 1 );
         }
 
         /* write predictor selection bit */
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-        IF( GE( predmode, 2 ) )
-#else
         IF( EQ_16( predmode, 2 ) )
-#endif
         {
-            push_indice_fx( st->hBstr, IND_LSF_PREDICTOR_SELECT_BIT, safety_net, 1 );
+            push_indice( st->hBstr, IND_LSF_PREDICTOR_SELECT_BIT, safety_net, 1 );
         }
 
         test();
@@ -1264,18 +1137,14 @@ void lsf_end_enc_fx(
             Bit_alloc1 = &BC_TCVQ_BIT_ALLOC_40B[1];
             FOR( i = 0; i < ( M / 2 ) + 3; i++ )
             {
-                push_indice_fx( hBstr, IND_LSF, TCQIdx[i], Bit_alloc1[i] );
+                push_indice( hBstr, IND_LSF, TCQIdx[i], Bit_alloc1[i] );
             }
         }
         ELSE
         {
             cumleft = nBits;
             move16();
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-            IF( GE( predmode, 2 ) )
-#else
             IF( EQ_16( predmode, 2 ) )
-#endif
             {
                 /* subtract predictor selection bit */
                 cumleft = sub( nBits, 1 );
@@ -1309,7 +1178,7 @@ void lsf_end_enc_fx(
                 move16();
                 cumleft -= num_bits;
                 move16();
-                push_indice_fx( hBstr, IND_LSF, indice[i], num_bits );
+                push_indice( hBstr, IND_LSF, indice[i], num_bits );
             }
 
             WHILE( cumleft > 0 )
@@ -1329,7 +1198,7 @@ void lsf_end_enc_fx(
                 }
 
                 cumleft = sub( cumleft, num_bits );
-                push_indice_fx( hBstr, IND_LSF, indice[i], num_bits );
+                push_indice( hBstr, IND_LSF, indice[i], num_bits );
                 i = add( i, 1 );
             }
         }
@@ -1347,7 +1216,7 @@ void lsf_end_enc_fx(
             {
                 lpc_param[i] = TCQIdx0[i];
                 move16();
-                bits_param_lpc[i] = BC_TCVQ_BIT_ALLOC_40B[i];
+                bits_param_lpc[i] = BC_TCVQ_BIT_ALLOC_40B[i]; // Q0
                 move16();
             }
         }
@@ -1438,16 +1307,6 @@ void lsf_end_enc_fx(
         }
         ELSE
         {
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-            if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL )
-            {
-                /* intra mode*/
-                vq_dec_lvq( 0, qlsf, &indice[0], stages0, M, 9, /*mode_lvq_p,*/ levels0[stages0 - 1] );
-                v_add( qlsf, pred3, qlsf, M );
-                v_sub( qlsf, pred1, st->mem_MA, M );
-            }
-            else
-#endif
             {
                 vq_dec_lvq_fx( 1, qlsf, &indice[0], stages0, M, mode_lvq, levels0[stages0 - 1],
                                &st->offset_scale1_fx[0][0], &st->offset_scale2_fx[0][0], &st->offset_scale1_p_fx[0][0], &st->offset_scale2_p_fx[0][0],
@@ -1498,8 +1357,8 @@ void lsf_end_enc_fx(
 
 void lsf_end_enc_ivas_fx(
     Encoder_State *st,           /* i/o: encoder state structure                                */
-    const Word16 *lsf,           /* i  : LSF in the frequency domain (0..6400)                  */
-    Word16 *qlsf,                /* o  : quantized LSF                                          */
+    const Word16 *lsf,           /* i  : LSF in the frequency domain (0..6400)                  x2.56*/
+    Word16 *qlsf,                /* o  : quantized LSF                                          x2.56*/
     const Word16 nBits_in,       /* i  : number of bits to spend on ISF quantization            */
     const Word16 coder_type_org, /* i  : coding type                                       */
     Word16 Q_ener,               /* i  : Q valuen for Bin_Ener                             */
@@ -2090,10 +1949,10 @@ void lsf_end_enc_ivas_fx(
 
 static void first_VQstages(
     const Word16 *const *cb,
-    Word16 u[],       /* i  : vector to be encoded (prediction and mean removed)  */
+    Word16 u[],       /* i  : vector to be encoded (prediction and mean removed)  x2.56*/
     Word16 *levels,   /* i  : number of levels in each stage                      */
     Word16 stagesVQ,  /* i  : number of stages                                    */
-    Word16 w[],       /* i  : weights                                             */
+    Word16 w[],       /* i  : weights                                             Q8*/
     Word16 N,         /* i  : vector dimension                                    */
     Word16 max_inner, /* i  : maximum number of swaps in inner loop               */
     Word16 indices_VQstage[] )
@@ -2133,11 +1992,7 @@ static void first_VQstages(
     L_tmp = L_deposit_l( 0 );
     FOR( j = 0; j < N; j++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp1 = L_shl_o( L_mult0( u[j], w[j] ), 7, &Overflow ); /*x2.56 + Q8 + Q7 */
-#else                                                            /* BASOP_NOGLOB */
-        L_tmp1 = L_shl( L_mult0( u[j], w[j] ), 7 ); /*x2.56 + Q8 + Q7 */
-#endif                                                           /* BASOP_NOGLOB */
         L_tmp1 = Mult_32_16( L_tmp1, u[j] );                     /*x2.56 + Q15 + x2.56 -Q15 */
         L_tmp = L_add( L_tmp, L_tmp1 );                          /*Q0 + x2.56 +x2.56 */
     }
@@ -2282,6 +2137,195 @@ static void first_VQstages(
     return;
 }
 
+static void first_VQstages_ivas_fx(
+    const Word16 *const *cb,
+    Word16 u[],       /* i  : vector to be encoded (prediction and mean removed)  */
+    Word16 *levels,   /* i  : number of levels in each stage                      */
+    Word16 stagesVQ,  /* i  : number of stages                                    */
+    Word16 w[],       /* i  : weights                                             */
+    Word16 N,         /* i  : vector dimension                                    */
+    Word16 max_inner, /* i  : maximum number of swaps in inner loop               */
+    Word16 indices_VQstage[] )
+{
+    Word16 resid_buf[2 * LSFMBEST * M], *resid[2];
+    Word32 dist_buf[2 * LSFMBEST], *dist[2], en;
+    Word32 f_tmp, L_tmp, L_tmp1, *pTmp32;
+    Word16 Tmp[M], *pTmp, cs;
+    Word16 *pTmp_short, idx_buf[2 * LSFMBEST * MAX_VQ_STAGES], parents[LSFMBEST], counter = 0, j,
+                                                                                  m, s, c, c2, p_max, *indices[2];
+    Word16 maxC = LSFMBEST;
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+#endif
+
+    /*float dd[16];*/
+    const Word16 *cb_stage, *cbp;
+
+    /* Set pointers to previous (parent) and current node (parent node is indexed [0], current node is indexed [1]) */
+    indices[0] = idx_buf;
+    move16();
+    indices[1] = idx_buf + maxC * stagesVQ;
+    move16();
+    resid[0] = resid_buf;
+    move16();
+    resid[1] = resid_buf + maxC * N;
+    move16();
+    dist[0] = dist_buf;
+    move16();
+    dist[1] = dist_buf + maxC;
+    move16();
+
+    set16_fx( idx_buf, 0, ( const Word16 )( 2 * stagesVQ * maxC ) );
+    set16_fx( parents, 0, maxC );
+
+    /* Set up inital distance vector */
+    L_tmp = L_deposit_l( 0 );
+    FOR( j = 0; j < N; j++ )
+    {
+        L_tmp1 = L_shl_o( L_mult0( u[j], w[j] ), 7, &Overflow ); /*x2.56 + Q8 + Q7 */
+        L_tmp1 = Mult_32_16( L_tmp1, u[j] );                     /*x2.56 + Q15 + x2.56 -Q15 */
+        L_tmp = L_add( L_tmp, L_tmp1 );                          /*Q0 + x2.56 +x2.56 */
+    }
+    set32_fx( dist[1], L_shr( L_tmp, 1 ), maxC ); /*Q-1 + x2.56 +x2.56 */
+
+    /* Set up initial error (residual) vectors */
+    pTmp = resid[1];
+    move16();
+    FOR( c = 0; c < maxC; c++ )
+    {
+        Copy( u, pTmp, N );
+        pTmp += N;
+    }
+
+    /*----------------------------------------------------------------*
+     * LSF quantization
+     *----------------------------------------------------------------*/
+
+    /* Loop over all stages */
+    m = 1;
+    move16();
+    FOR( s = 0; s < stagesVQ; s++ )
+    {
+        /* set codebook pointer to point to first stage */
+        cbp = cb[s];
+        move16();
+
+        /* save pointer to the beginning of the current stage */
+        cb_stage = cbp;
+        move16();
+
+        /* swap pointers to parent and current nodes */
+        pTmp_short = indices[0];
+        indices[0] = indices[1];
+        move16();
+        indices[1] = pTmp_short;
+        move16();
+
+        pTmp = resid[0];
+        resid[0] = resid[1];
+        move16();
+        resid[1] = pTmp;
+        move16();
+
+        pTmp32 = dist[0];
+        dist[0] = dist[1];
+        move32();
+        dist[1] = pTmp32;
+        move32();
+
+        /* p_max points to maximum distortion node (worst of best) */
+        p_max = 0;
+        move16();
+
+        /* set distortions to a large value */
+        set32_fx( dist[1], MAXINT32, maxC );
+
+        FOR( j = 0; j < levels[s]; j++ )
+        {
+            /* compute weighted codebook element and its energy */
+            FOR( c2 = 0; c2 < N; c2++ )
+            {
+                Tmp[c2] = extract_h( L_shl( L_mult0( w[c2], cbp[c2] ), 6 ) ); /* Q8 + x2.56 + q6 -q16 */
+                move16();
+            }
+
+            en = L_mult( cbp[0], Tmp[0] ); /*x2.56 + x2.56 + Q-2 +Q1 */
+
+            FOR( c2 = 1; c2 < N; c2++ )
+            {
+                en = L_mac( en, cbp[c2], Tmp[c2] ); /*x2.56 + x2.56 + Q-2 +Q1 */
+            }
+            cbp += N;
+            move16();
+
+            /* iterate over all parent nodes */
+            FOR( c = 0; c < m; c++ )
+            {
+                pTmp = &resid[0][c * N]; /*x2.56*/
+                move16();
+                L_tmp = L_mult( pTmp[0], Tmp[0] ); /*x2.56 + x2.56 + Q-2 +Q1 */
+                FOR( c2 = 1; c2 < N; c2++ )
+                {
+                    L_tmp = L_mac( L_tmp, pTmp[c2], Tmp[c2] ); /*x2.56 + x2.56 + Q-2 +Q1 */
+                }
+
+                L_tmp = L_add( dist[0][c], L_sub( en, L_shl( L_tmp, 1 ) ) ); /*x2.56 + x2.56 -1*/
+
+                IF( LE_32( L_tmp, dist[1][p_max] ) )
+                {
+                    /* replace worst */
+                    dist[1][p_max] = L_tmp;
+                    move32();
+                    indices[1][p_max * stagesVQ + s] = j;
+                    move16();
+                    parents[p_max] = c;
+                    move16();
+
+                    /* limit number of times inner loop is entered */
+                    IF( LT_16( counter, max_inner ) )
+                    {
+                        counter = add( counter, 1 );
+                        IF( LT_16( counter, max_inner ) )
+                        {
+                            /* find new worst */
+                            p_max = maximum_32_fx( dist[1], maxC, &f_tmp );
+                        }
+                        ELSE
+                        {
+                            /* find minimum distortion */
+                            p_max = minimum_32_fx( dist[1], maxC, &f_tmp );
+                        }
+                    }
+                }
+            }
+        }
+
+        /*------------------------------------------------------------*
+         * Compute error vectors for each node
+         *------------------------------------------------------------*/
+        cs = 0;
+        move16();
+        FOR( c = 0; c < maxC; c++ )
+        {
+            /* subtract codebook entry from the residual vector of the parent node */
+            pTmp = resid[1] + c * N;
+            move16();
+            Copy( resid[0] + parents[c] * N, pTmp, N );
+            Vr_subt( pTmp, cb_stage + ( indices[1][cs + s] ) * N, pTmp, N );
+
+            /* get indices that were used for parent node */
+            Copy( indices[0] + parents[c] * stagesVQ, indices[1] + cs, s );
+            cs = add( cs, stagesVQ );
+        }
+
+        m = maxC;
+        move16();
+    }
+
+    Copy( indices[1], indices_VQstage, maxC * stagesVQ );
+
+    return;
+}
 /*---------------------------------------------------------------------------
  * vq_enc_lsf_lvq()
  *
@@ -2299,10 +2343,10 @@ static void first_VQstages(
 static Word32 vq_lvq_lsf_enc(
     Word16 pred_flag,
     Word16 mode,
-    Word16 u[],
+    Word16 u[], // x2.56
     Word16 *levels,
     Word16 stages,
-    Word16 w[],
+    Word16 w[], // Q8
     Word16 Idx[],
     const Word16 *lsf,
     const Word16 *pred,
@@ -2331,13 +2375,13 @@ static Word32 vq_lvq_lsf_enc(
     {
         cb = &Quantizers_fx[CB_lsf[mode]];
         move16();
-        mode_glb = add( offset_lvq_modes_SN_fx[mode], offset_in_lvq_mode_SN_fx[mode][sub( levels[stagesVQ], min_lat_bits_SN_fx[mode] )] );
+        mode_glb = add( offset_lvq_modes_SN_fx[mode], offset_in_lvq_mode_SN_fx[mode][( levels[stagesVQ] - min_lat_bits_SN_fx[mode] )] ); // Q0
     }
     ELSE /*  predictive */
     {
         cb = &Quantizers_p_fx[CB_p_lsf[mode]];
         move16();
-        mode_glb = add( offset_lvq_modes_pred_fx[mode], offset_in_lvq_mode_pred_fx[mode][sub( levels[stagesVQ], min_lat_bits_pred_fx[mode] )] );
+        mode_glb = add( offset_lvq_modes_pred_fx[mode], offset_in_lvq_mode_pred_fx[mode][( levels[stagesVQ] - min_lat_bits_pred_fx[mode] )] ); // Q0
     }
     IF( stagesVQ > 0 )
     {
@@ -2374,27 +2418,15 @@ static Word32 vq_lvq_lsf_enc(
         Vr_subt( cand[i], lsf, diff, M );
         FOR( j = 0; j < M; j++ )
         {
-#ifdef BASOP_NOGLOB
             diff[j] = shl_o( diff[j], 4, &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff[j] = shl( diff[j], 4 );
-#endif /* BASOP_NOGLOB */
             move16();
         }
-#ifdef BASOP_NOGLOB
         L_tmp = L_mult( mult( diff[0], shl_o( w[0], 1, &Overflow ) ), diff[0] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#else
-        L_tmp = L_mult( mult( diff[0], shl( w[0], 1 ) ), diff[0] );           /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#endif
         FOR( j = 1; j < M; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac( L_tmp, mult( diff[j], shl_o( w[j], 1, &Overflow ) ), diff[j] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#else
-            L_tmp = L_mac( L_tmp, mult( diff[j], shl( w[j], 1 ) ), diff[j] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#endif
         }
-        e[i] = L_tmp;
+        e[i] = L_tmp; /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
         move32();
     }
 
@@ -2420,10 +2452,10 @@ static Word32 vq_lvq_lsf_enc(
 static Word32 vq_lvq_lsf_enc_ivas_fx(
     Word16 pred_flag,
     Word16 mode,
-    Word16 u[],
+    Word16 u[], // x2.56
     Word16 *levels,
     Word16 stages,
-    Word16 w[],
+    Word16 w[], // Q8
     Word16 Idx[],
     const Word16 *lsf,
     const Word16 *pred,
@@ -2451,7 +2483,7 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
         IF( LT_16( mode, 6 ) )
         {
             move16();
-            mode_glb = add( offset_lvq_modes_SN[mode], offset_in_lvq_mode_SN[mode][sub( levels[stagesVQ], min_lat_bits_SN[mode] )] );
+            mode_glb = add( offset_lvq_modes_SN[mode], offset_in_lvq_mode_SN[mode][( levels[stagesVQ] - min_lat_bits_SN[mode] )] );
         }
         ELSE
         {
@@ -2465,7 +2497,7 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
         IF( LT_16( mode, 6 ) || EQ_16( mode, 12 ) )
         {
             move16();
-            mode_glb = add( offset_lvq_modes_pred[mode], offset_in_lvq_mode_pred[mode][sub( levels[stagesVQ], min_lat_bits_pred_fx[mode] )] );
+            mode_glb = add( offset_lvq_modes_pred[mode], offset_in_lvq_mode_pred[mode][( levels[stagesVQ] - min_lat_bits_pred_fx[mode] )] );
         }
         ELSE
         {
@@ -2477,7 +2509,7 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
     IF( stagesVQ > 0 )
     {
         /* first VQ stages */
-        first_VQstages( cb, u, levels, stagesVQ, w, M, MSVQ_MAXCNT, indices_firstVQ );
+        first_VQstages_ivas_fx( cb, u, levels, stagesVQ, w, M, MSVQ_MAXCNT, indices_firstVQ );
     }
 
 
@@ -2509,25 +2541,13 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
         Vr_subt( cand[i], lsf, diff, M );
         FOR( j = 0; j < M; j++ )
         {
-#ifdef BASOP_NOGLOB
             diff[j] = shl_o( diff[j], 4, &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff[j] = shl( diff[j], 4 );
-#endif /* BASOP_NOGLOB */
             move16();
         }
-#ifdef BASOP_NOGLOB
         L_tmp = L_mult( mult( diff[0], shl_o( w[0], 1, &Overflow ) ), diff[0] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#else
-        L_tmp = L_mult( mult( diff[0], shl( w[0], 1 ) ), diff[0] );           /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#endif
         FOR( j = 1; j < M; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac( L_tmp, mult( diff[j], shl_o( w[j], 1, &Overflow ) ), diff[j] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#else
-            L_tmp = L_mac( L_tmp, mult( diff[j], shl( w[j], 1 ) ), diff[j] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#endif
         }
         e[i] = L_tmp;
         move32();
@@ -2557,7 +2577,7 @@ static void BcTcvq_1st_fx(
     Word16 c[][16],
     Word32 cDist_fx[][16], /*2.56*2.56*Q(-5 - 2)*/
     Word16 Q_fx[][16][2],
-    Word16 W_fx[][2] /*Q10*/
+    Word16 W_fx[][2] /*Q8*/
 )
 {
     Word16 state, prev_state;
@@ -2618,7 +2638,7 @@ static void BcTcvq_2nd_fx(
     Word16 c[][16],
     Word32 cDist_fx[][16],      /*2.56*2.56*Q(-5 - 2) */
     Word16 Q_fx[][16][2],       /*x2.56*/
-    Word16 W_fx[][2],           /*Q10*/
+    Word16 W_fx[][2],           /*Q8*/
     const Word16 itc_fx[][2][2] /*Q15*/
 )
 {
@@ -2906,12 +2926,12 @@ static Word32 BcTcvq_FixSearch_fx(
     Q_fx[stage][*prev_state][1] = add( CB_fx[stage4][bestCode][1], pred_fx[1] );
     move16();
 
-    minDist_fx = L_shr( minDist_fx, 2 );
+    minDist_fx = L_shr( minDist_fx, 2 ); /*2.56*2.56*Q(-5 - 2)*/
     return minDist_fx;
 }
 static Word16 optimalPath_fx(
-    Word32 cDist_fx[][16],
-    Word32 blockDist_fx[],
+    Word32 cDist_fx[][16], /*2.56*2.56*Q(-5 - 2)*/
+    Word32 blockDist_fx[], /*2.56*2.56*Q(-5 - 2)*/
     Word16 blockCodeword[][4],
     Word16 bestCodeword[],
     Word16 codeWord[][16],
@@ -2970,10 +2990,11 @@ static Word16 optimalPath_fx(
 static void quantEnc_fx(
     Word16 *y_fx,
     Word16 c[],
-    const Word16 CB_SUB1_fx[][128][2],
-    const Word16 CB_SUB2_fx[][64][2],
-    const Word16 CB_SUB3_fx[][32][2],
-    const Word16 itc_fx[][2][2] )
+    const Word16 CB_SUB1_fx[][128][2], /*x2.56*/
+    const Word16 CB_SUB2_fx[][64][2],  /*x2.56*/
+    const Word16 CB_SUB3_fx[][32][2],  /*x2.56*/
+    const Word16 itc_fx[][2][2]        // Q15
+)
 {
     Word16 i, j;
     Word16 stage;
@@ -3088,9 +3109,9 @@ static void buildCode_fx(
 }
 static void BcTcvq_fx(
     Word16 snFlag,
-    const Word16 *x_fx,
-    Word16 *y_fx,
-    const Word16 *weight_fx,
+    const Word16 *x_fx,      // x2.65
+    Word16 *y_fx,            // x2.65
+    const Word16 *weight_fx, // Q8
     Word16 *ind )
 {
     Word16 X_fx[N_STAGE_VQ][N_DIM], W_fx[N_STAGE_VQ][N_DIM];
@@ -3147,9 +3168,9 @@ static void BcTcvq_fx(
     {
         FOR( j = 0; j < N_DIM; j++ )
         {
-            X_fx[i][j] = x_fx[( N_DIM * i ) + j];
+            X_fx[i][j] = x_fx[( N_DIM * i ) + j]; // x2.65
             move16();
-            W_fx[i][j] = weight_fx[( N_DIM * i ) + j];
+            W_fx[i][j] = weight_fx[( N_DIM * i ) + j]; // x2.56
             move16();
         }
     }
@@ -3244,10 +3265,10 @@ static void BcTcvq_fx(
 }
 
 static Word16 SVQ_2d_fx(
-    Word16 *x_fx,
-    Word16 *y_fx,
-    const Word16 *W_fx,
-    const Word16 CB_fx[][8],
+    Word16 *x_fx,            // x2.65
+    Word16 *y_fx,            // x2.65
+    const Word16 *W_fx,      // Q8
+    const Word16 CB_fx[][8], // x2.65
     Word16 Size )
 {
     Word16 i, j;
@@ -3265,7 +3286,7 @@ static Word16 SVQ_2d_fx(
         {
             temp16_fx = sub( x_fx[j], CB_fx[i][j] );
             distortion_fx = L_add( distortion_fx,
-                                   L_shr( Mult_32_16( L_mult( temp16_fx, temp16_fx ), W_fx[j] ), 1 ) );
+                                   L_shr( Mult_32_16( L_mult( temp16_fx, temp16_fx ), W_fx[j] ), 1 ) ); // (2*x2.65 + Q1 + Q8) - Q15 - Q1
         }
 
         IF( LT_32( distortion_fx, temp_fx ) )
@@ -3375,11 +3396,7 @@ Word32 qlsf_ARSN_tcvq_Enc_16k_fx(
     {
         yy_fx[i] = shl( yy_fx[i], cs );
         move16();
-#ifdef BASOP_NOGLOB
         temp_l = L_mac_o( temp_l, mult( yy_fx[i], shl_o( w_fx[i], 2, &Overflow ) ), yy_fx[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-        temp_l = L_mac( temp_l, mult( yy_fx[i], shl( w_fx[i], 2 ) ), yy_fx[i] );
-#endif /* BASOP_NOGLOB */
     }
     cs = shl( cs, 1 );
     temp_l = L_shr( temp_l, cs );
@@ -3392,9 +3409,9 @@ Word32 qlsf_ARSN_tcvq_Enc_16k_fx(
 }
 
 static void FFT_Mid_Interpol_16k_fx(
-    Word32 Bin_Ener_old[], /* i/o: Old 2nd FFT Bin energy (128)               */
-    Word32 Bin_Ener[],     /* i  : Current 2nd FFT Bin energy (128)           */
-    Word32 Bin_Ener_mid[]  /* o  : LP weighting filter (numerator)            */
+    Word32 Bin_Ener_old[], /* i/o: Old 2nd FFT Bin energy (128)               Q_ener*/
+    Word32 Bin_Ener[],     /* i  : Current 2nd FFT Bin energy (128)           Q_ener*/
+    Word32 Bin_Ener_mid[]  /* o  : LP weighting filter (numerator)            Q_ener*/
 )
 {
     Word16 i;
@@ -3405,11 +3422,7 @@ static void FFT_Mid_Interpol_16k_fx(
     FOR( i = 0; i < L_FFT / 2; i++ )
     {
         /* Interpolation */
-#ifdef BASOP_NOGLOB
         Bin_Ener_mid[i] = L_shr( L_add_o( Bin_Ener_old[i], Bin_Ener[i], &Overflow ), 1 );
-#else  /* BASOP_NOGLOB */
-        Bin_Ener_mid[i] = L_shr( L_add( Bin_Ener_old[i], Bin_Ener[i] ), 1 );
-#endif /* BASOP_NOGLOB */
 
         /* Memory update */
         Bin_Ener_old[i] = Bin_Ener[i];
@@ -3510,14 +3523,6 @@ static void lsf_mid_enc_fx(
                     move16();
                     BREAK;
                 }
-#ifdef IVAS_CODE
-                case 1:
-                {
-                    ratio = tbl_mid_voi_wb_1b_fx;
-                    move16();
-                    BREAK;
-                }
-#endif
             }
         }
         ELSE IF( EQ_16( coder_type, UNVOICED ) )
@@ -3535,14 +3540,6 @@ static void lsf_mid_enc_fx(
                     move16();
                     BREAK;
                 }
-#ifdef IVAS_CODE
-                case 4:
-                {
-                    ratio = tbl_mid_gen_wb_4b_fx;
-                    move16();
-                    BREAK;
-                }
-#endif
                 case 2:
                 {
                     ratio = tbl_mid_gen_wb_2b_fx;
@@ -3603,15 +3600,9 @@ static void lsf_mid_enc_fx(
             tmp = sub( lsf[j], qlsf[j] );
             /*        err +=  wghts[j] * ftemp * ftemp; */
             /* tmp is usually very small, we can have some extra precision with very rare saturation */
-#ifdef BASOP_NOGLOB
             tmp = shl_o( tmp, 4, &Overflow );
             tmp = mult_ro( tmp, tmp, &Overflow );
             err = L_mac_o( err, tmp, shl_o( wghts[j], 2, &Overflow ), &Overflow );
-#else /* BASOP_NOGLOB */
-            tmp = shl( tmp, 4 );
-            tmp = mult_r( tmp, tmp );
-            err = L_mac( err, tmp, shl( wghts[j], 2 ) );
-#endif
         }
         /*    err = L_shl(err,Wscale); */
         err = Mult_32_16( err, LSF_1_OVER_256SQ );
@@ -3648,7 +3639,7 @@ static void lsf_mid_enc_fx(
 
     /* convert LSFs back to LSPs */
     lsf2lsp_fx( qlsf, lsp, M, int_fs );
-    push_indice_fx( hBstr, IND_MID_FRAME_LSF_INDEX, idx, nb_bits );
+    push_indice( hBstr, IND_MID_FRAME_LSF_INDEX, idx, nb_bits );
 
     return;
 }
@@ -3657,12 +3648,12 @@ static void lsf_mid_enc_ivas_fx(
     BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle            */
     Word16 nb_bits,          /* i  : number of bits                      */
     const Word32 int_fs,     /* i  : internal (ACELP) sampling frequency*/
-    const Word16 qlsp0[],    /* i  : quantized LSPs from frame beginning*/
-    const Word16 qlsp1[],    /* i  : quantized LSPs from frame end      */
-    Word16 lsp[],            /* i/o: mid-frame LSP                      */
+    const Word16 qlsp0[],    /* i  : quantized LSPs from frame beginning Q15*/
+    const Word16 qlsp1[],    /* i  : quantized LSPs from frame end      Q15*/
+    Word16 lsp[],            /* i/o: mid-frame LSP                      Q15*/
     const Word16 coder_type, /* i  : coding type                        */
     const Word16 bwidth,     /* i  : input signal bandwidth             */
-    Word32 Bin_Ener[],       /* i  : per bin log energy spectrum        */
+    Word32 Bin_Ener[],       /* i  : per bin log energy spectrum        Q_ener*/
     Word16 Q_ener,           /* i  : Q value of Bin_ener                */
     Word16 ppp_mode,
     Word16 nelp_mode )
@@ -3696,19 +3687,19 @@ static void lsf_mid_enc_ivas_fx(
             {
                 case 5:
                 {
-                    ratio = tbl_mid_voi_wb_5b_fx;
+                    ratio = tbl_mid_voi_wb_5b_fx; // Q13
                     move16();
                     BREAK;
                 }
                 case 4:
                 {
-                    ratio = tbl_mid_voi_wb_4b_fx;
+                    ratio = tbl_mid_voi_wb_4b_fx; // Q13
                     move16();
                     BREAK;
                 }
                 case 1:
                 {
-                    ratio = tbl_mid_voi_wb_1b_fx;
+                    ratio = tbl_mid_voi_wb_1b_fx; // Q13
                     move16();
                     BREAK;
                 }
@@ -3716,7 +3707,7 @@ static void lsf_mid_enc_ivas_fx(
         }
         ELSE IF( EQ_16( coder_type, UNVOICED ) )
         {
-            ratio = tbl_mid_unv_wb_5b_fx;
+            ratio = tbl_mid_unv_wb_5b_fx; // Q13
         }
         ELSE
         {
@@ -3725,19 +3716,19 @@ static void lsf_mid_enc_ivas_fx(
             {
                 case 5:
                 {
-                    ratio = tbl_mid_gen_wb_5b_fx;
+                    ratio = tbl_mid_gen_wb_5b_fx; // Q13
                     move16();
                     BREAK;
                 }
                 case 4:
                 {
-                    ratio = tbl_mid_gen_wb_4b_fx;
+                    ratio = tbl_mid_gen_wb_4b_fx; // Q13
                     move16();
                     BREAK;
                 }
                 case 2:
                 {
-                    ratio = tbl_mid_gen_wb_2b_fx;
+                    ratio = tbl_mid_gen_wb_2b_fx; // Q13
                     move16();
                     BREAK;
                 }
@@ -3749,7 +3740,7 @@ static void lsf_mid_enc_ivas_fx(
     }
     ELSE IF( EQ_16( ppp_mode, 1 ) )
     {
-        ratio = tbl_mid_voi_wb_1b_fx;
+        ratio = tbl_mid_voi_wb_1b_fx; // Q13
         move16();
         nb_bits = 1;
         move16();
@@ -3758,7 +3749,7 @@ static void lsf_mid_enc_ivas_fx(
     }
     ELSE IF( EQ_16( nelp_mode, 1 ) )
     {
-        ratio = tbl_mid_unv_wb_4b_fx;
+        ratio = tbl_mid_unv_wb_4b_fx; // Q13
         move16();
         nb_bits = 4;
         move16();
@@ -3780,7 +3771,7 @@ static void lsf_mid_enc_ivas_fx(
         FOR( j = 0; j < M; j++ )
         {
             /*      qlsf[j] = (1.0f - ratio[k*M+j]) * qlsf0[j] + ratio[k*M+j] * qlsf1[j]; */
-            L_tmp = L_mult( sub( 0x2000, ratio[k1 + j] ), qlsf0[j] );
+            L_tmp = L_mult( sub( 0x2000 /*1.Q13*/, ratio[k1 + j] ), qlsf0[j] );
             L_tmp = L_mac( L_tmp, ratio[k1 + j], qlsf1[j] );
             qlsf[j] = round_fx( L_shl( L_tmp, 2 ) );
 
@@ -3795,15 +3786,9 @@ static void lsf_mid_enc_ivas_fx(
             tmp = sub( lsf[j], qlsf[j] );
             /*        err +=  wghts[j] * ftemp * ftemp; */
             /* tmp is usually very small, we can have some extra precision with very rare saturation */
-#ifdef BASOP_NOGLOB
             tmp = shl_o( tmp, 4, &Overflow );
             tmp = mult_ro( tmp, tmp, &Overflow );
             err = L_mac_o( err, tmp, shl_o( wghts[j], 2, &Overflow ), &Overflow );
-#else /* BASOP_NOGLOB */
-            tmp = shl( tmp, 4 );
-            tmp = mult_r( tmp, tmp );
-            err = L_mac( err, tmp, shl( wghts[j], 2 ) );
-#endif
         }
         /*    err = L_shl(err,Wscale); */
         err = Mult_32_16( err, LSF_1_OVER_256SQ );
@@ -3823,7 +3808,7 @@ static void lsf_mid_enc_ivas_fx(
     FOR( j = 0; j < M; j++ )
     {
         /*     qlsf[j] = (1.0f - ratio[idx*M+j]) * qlsf0[j] + ratio[idx*M+j] * qlsf1[j]; */
-        L_tmp = L_mult( sub( 0x2000, ratio[idx * M + j] ), qlsf0[j] );
+        L_tmp = L_mult( sub( 0x2000 /*1.Q13*/, ratio[idx * M + j] ), qlsf0[j] );
         L_tmp = L_mac( L_tmp, ratio[idx * M + j], qlsf1[j] );
         qlsf[j] = round_fx( L_shl( L_tmp, 2 ) );
 
diff --git a/lib_enc/lsf_msvq_ma_enc.c b/lib_enc/lsf_msvq_ma_enc.c
index 2af64bf141f2009b2ddf9be421f6ba25f0f3011f..60375ddcce113a6c5ac6236fdbd3afd55aec93e9 100644
--- a/lib_enc/lsf_msvq_ma_enc.c
+++ b/lib_enc/lsf_msvq_ma_enc.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,8 +37,6 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "ivas_prot.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "rom_com.h"
 #include "rom_enc.h"
@@ -94,7 +92,7 @@ Word16 msvq_stage1_dct_search_fx(
     Word32 *dist1_ptr_fx,                     /* o  :  resulting stage 1 MSEs in DCT-N domain                 */
     Word16 *dist1_ptr_e )
 {
-    Word32 dct_target_fx[FDCNG_VQ_DCT_MAXTRUNC];
+    Word32 dct_target_fx[FDCNG_VQ_DCT_MAXTRUNC]; // Q20
     Word32 u_mr_fx[FDCNG_VQ_MAX_LEN];
     Word16 dist1_ptr_e_buf[2 * LSFMBEST_MAX];
     Word64 mse_trunc_segm_fx[FDCNG_VQ_DCT_NSEGM];
@@ -128,7 +126,7 @@ Word16 msvq_stage1_dct_search_fx(
     tmp_e = s_max( 12, u_e );
     FOR( i = 0; i < n_ana; i++ )
     {
-        u_mr_fx[i] = L_sub( L_shl( u_fx[i], sub( u_e, tmp_e ) ), L_shl( midQ_truncQ_fx[i], sub( Q31 - Q10, tmp_e ) ) );
+        u_mr_fx[i] = L_sub( L_shl( u_fx[i], sub( u_e, tmp_e ) ), L_shl( midQ_truncQ_fx[i], sub( Q31 - Q10, tmp_e ) ) ); // tmp_e
         move32();
     }
 
@@ -137,9 +135,9 @@ Word16 msvq_stage1_dct_search_fx(
     /* init search state  ptr's  at the top */
     set32_fx( dist1_ptr_fx, MAX_32, maxC_st1 );
     set16_fx( dist1_ptr_e_buf, 32, maxC_st1 );
-    st1_mse_pair_fx = &( dist1_ptr_fx[0] );   /* req. ptr post upd +=2 */
-    st1_mse_pair_e = &( dist1_ptr_e_buf[0] ); /* req. ptr post upd +=2 */
-    st1_idx_pair = &( indices_st1_local[0] ); /* req. ptr post upd +=2 */
+    st1_mse_pair_fx = &( dist1_ptr_fx[0] ); /* req. ptr post upd +=2 */ // st1_mse_pair_e
+    st1_mse_pair_e = &( dist1_ptr_e_buf[0] );                           /* req. ptr post upd +=2 */
+    st1_idx_pair = &( indices_st1_local[0] );                           /* req. ptr post upd +=2 */
     set64_fx( mse_trunc_segm_fx, 0, n_segm );
 
     // set16_fx( mse_trunc_segm_e, u_e, FDCNG_VQ_DCT_NSEGM );
@@ -153,7 +151,7 @@ Word16 msvq_stage1_dct_search_fx(
 
         FOR( i = 0; i < trunc_dct_cols_per_segment[segm]; i++ )
         {
-            mse_trunc_segm_fx[segm] = W_mac_32_32( mse_trunc_segm_fx[segm], dct_target_fx[cols_per_segment[segm] + i], dct_target_fx[cols_per_segment[segm] + i] );
+            mse_trunc_segm_fx[segm] = W_mac_32_32( mse_trunc_segm_fx[segm], dct_target_fx[cols_per_segment[segm] + i], dct_target_fx[cols_per_segment[segm] + i] ); // Q41
             move64();
         }
 
@@ -164,7 +162,7 @@ Word16 msvq_stage1_dct_search_fx(
             /* unweighted segmented search DCT domain loop */
             j_full = add( j, cum_entries_per_segment[segm] ); /* or simply use j_full++ */
 
-            mse_fx = mse_trunc_segm_fx[segm]; /* init mse with with common mse truncation part, in  BASOP a move32() */
+            mse_fx = mse_trunc_segm_fx[segm]; /* init mse with with common mse truncation part, in  BASOP a move32() */ // Q41
             move64();
 
             dct_col_shift_tab = col_syn_shift[segm]; /* ptr init */
@@ -177,10 +175,10 @@ Word16 msvq_stage1_dct_search_fx(
                 SHIFT( 1 );
                 ADD( 1 ); /* in BASOP:    s_and(for W8->W16), shl(), sub()*/
 #undef WMC_TOOL_SKIP
-                mse_fx = W_mac_32_32( mse_fx, tmp_fx, tmp_fx ); /*  L_mac or L_mac0()   square Word16 -> Word32*/
+                mse_fx = W_mac_32_32( mse_fx, tmp_fx, tmp_fx ); /*  L_mac or L_mac0()   square Word16 -> Word32*/ // Q41
             }
             Word16 L_tmp = W_norm( mse_fx );
-            st1_mse_ptr_fx[j_full] = W_extract_h( W_lshl( mse_fx, L_tmp ) ); /* save MSE in shared dynamic RAM,  move32() in BASOP */
+            st1_mse_ptr_fx[j_full] = W_extract_h( W_lshl( mse_fx, L_tmp ) ); /* save MSE in shared dynamic RAM,  move32() in BASOP */ // st1_mse_ptr_e
             move32();
             st1_mse_ptr_e[j_full] = sub( shl( tmp_e, 1 ), L_tmp );
             move16();
@@ -363,11 +361,11 @@ Word16 msvq_stage1_dct_search_fx(
 
 /*! r: (updated p_max) */
 Word16 msvq_stage1_dct_recalc_candidates_fdcng_wb_fx(
-    const Word32 *st1_syn_vec_ptr_fx, /* i  : IDCT24 synthesis vectors               */
+    const Word32 *st1_syn_vec_ptr_fx, /* i  : IDCT24 synthesis vectors               st1_syn_vec_e*/
     const Word16 st1_syn_vec_e,       /* i  : exp for IDCT24 synthesis vectors       */
-    const Word32 *u_fx,               /* i  : target   signal                        */
+    const Word32 *u_fx,               /* i  : target   signal                        u_e*/
     const Word16 u_e,                 /* i  : exp for target   signal                */
-    const int16_t maxC_st1,           /* i  : number of candidates in stage1         */
+    const Word16 maxC_st1,            /* i  : number of candidates in stage1         */
     Word32 *dist_ptr_fx,              /* i/o: updated  MSE vector for stage1         */
     Word16 *dist_ptr_e                /* i/o: exp for updated  MSE vector for stage1 */
 )
@@ -391,7 +389,7 @@ Word16 msvq_stage1_dct_recalc_candidates_fdcng_wb_fx(
         /* for stage#1 use "u" instead of the shortened resid[0], to access the extended/extrapolated  input target */
         FOR( i = 0; i < FDCNG_VQ_MAX_LEN - FDCNG_VQ_MAX_LEN_WB; i++ )
         {
-            high_diff_fx[i] = L_sub( L_shr( p2_fx[i], sub( tmp_e, st1_syn_vec_e ) ), L_shr( u_fx[FDCNG_VQ_MAX_LEN_WB + i], sub( tmp_e, u_e ) ) );
+            high_diff_fx[i] = L_sub( L_shr( p2_fx[i], sub( tmp_e, st1_syn_vec_e ) ), L_shr( u_fx[FDCNG_VQ_MAX_LEN_WB + i], sub( tmp_e, u_e ) ) ); // tmp_e
             move32();
         }
         acc = 0;
@@ -458,7 +456,7 @@ void msvq_enc_ivas_fx(
     Word16 j;
     const Word16 *cbp, *cb_stage;
     Word32 resid_buf_fx[2 * LSFMBEST_MAX * M_MAX], *resid_fx[2];
-    Word32 *pTmp, *p1, *p2;
+    Word32 *pTmp, *p1, *p2; // pTmp_e
     Word16 pTmp_e;
     Word16 *indices[2], m, s, c, c2, p_max, i;
     Word16 idx_buf[2 * LSFMBEST_MAX * MAX_VQ_STAGES_USED], parents[LSFMBEST_MAX];
@@ -737,7 +735,7 @@ void msvq_enc_ivas_fx(
             IF( cb_stage != NULL )
             {
                 // p2 = cb_stage + ( indices[1][c * stages + s] ) * maxn; /* regular ptr init */
-                Copy_Scale_sig_16_32( cb_stage + ( indices[1][c * stages + s] ) * maxn, Tmp, N, 0 );
+                Copy_Scale_sig_16_32_DEPREC( cb_stage + ( indices[1][c * stages + s] ) * maxn, Tmp, N, 0 );
                 scale_sig32( Tmp, N, sub( sub( Q31, Q_cb ), resid_e ) );
                 p2 = Tmp;
             }
diff --git a/lib_enc/lsf_msvq_ma_enc_fx.c b/lib_enc/lsf_msvq_ma_enc_fx.c
index 5e65218e5df99d3d8c6efb483cc49a740151f011..593efa7843675add6bd500da13c2265efb8c1414 100644
--- a/lib_enc/lsf_msvq_ma_enc_fx.c
+++ b/lib_enc/lsf_msvq_ma_enc_fx.c
@@ -36,10 +36,10 @@
     val2 = shr( ( cbp )[2], 4 );                       \
     val3 = add( add( shr( lshl( ( cbp )[2], 12 ), 4 ), lshr( lshl( ( cbp )[1], 12 ), 8 ) ), s_and( ( cbp )[0], 0xF ) );
 /*--------------------------------------------------------------------------*
- * depack_mul_values()
+ * depack_mul_values_fx()
  *
  *--------------------------------------------------------------------------*/
-static Word32 depack_mul_values( Word16 *Tmp, const Word16 *w, const Word16 *cbp, const Word16 N )
+static Word32 depack_mul_values_fx( Word16 *Tmp, const Word16 *w, const Word16 *cbp, const Word16 N )
 {
     Word16 i, val0, val1, val2, val3;
     Word32 en;
@@ -49,7 +49,6 @@ static Word32 depack_mul_values( Word16 *Tmp, const Word16 *w, const Word16 *cbp
     FOR( i = 0; i < N; i += 4 )
     {
         depack_4_values( cbp + i_mult( shr( i, 2 ), 3 ), val0, val1, val2, val3 )
-#ifdef BASOP_NOGLOB
             Tmp[i + 0] = mult_r( shl_sat( w[i + 0], 2 ), val0 );
         move16();
         en = L_mac_sat( en, val0, Tmp[i + 0] );
@@ -62,20 +61,6 @@ static Word32 depack_mul_values( Word16 *Tmp, const Word16 *w, const Word16 *cbp
         Tmp[i + 3] = mult_r( shl_sat( w[i + 3], 2 ), val3 );
         move16();
         en = L_mac_sat( en, val3, Tmp[i + 3] );
-#else
-            Tmp[i + 0] = mult_r( shl( w[i + 0], 2 ), val0 );
-        move16();
-        en = L_mac( en, val0, Tmp[i + 0] );
-        Tmp[i + 1] = mult_r( shl( w[i + 1], 2 ), val1 );
-        move16();
-        en = L_mac( en, val1, Tmp[i + 1] );
-        Tmp[i + 2] = mult_r( shl( w[i + 2], 2 ), val2 );
-        move16();
-        en = L_mac( en, val2, Tmp[i + 2] );
-        Tmp[i + 3] = mult_r( shl( w[i + 3], 2 ), val3 );
-        move16();
-        en = L_mac( en, val3, Tmp[i + 3] );
-#endif
     }
 
     return en;
@@ -84,7 +69,7 @@ static Word32 depack_mul_values( Word16 *Tmp, const Word16 *w, const Word16 *cbp
  * depack_sub_values()
  *
  *--------------------------------------------------------------------------*/
-static void depack_sub_values( Word16 *pTmp, const Word16 *p1, const Word16 *cbp, const Word16 N )
+static void depack_sub_values_fx( Word16 *pTmp, const Word16 *p1, const Word16 *cbp, const Word16 N )
 {
     Word16 j, val0, val1, val2, val3;
 
@@ -108,7 +93,7 @@ static void depack_sub_values( Word16 *pTmp, const Word16 *p1, const Word16 *cbp
  *
  * Unroll of inner search loop for maxC == 8
  *--------------------------------------------------------------------------*/
-static Word16 msvq_enc_find_p_max_8( Word32 dist[] )
+static Word16 msvq_enc_find_p_max_8_fx( Word32 dist[] )
 {
     Word16 p_max;
 
@@ -159,7 +144,7 @@ static Word16 msvq_enc_find_p_max_8( Word32 dist[] )
  *
  * Unroll of inner search loop for maxC == 6
  *--------------------------------------------------------------------------*/
-static Word16 msvq_enc_find_p_max_6( Word32 dist[] )
+static Word16 msvq_enc_find_p_max_6_fx( Word32 dist[] )
 {
     Word16 p_max;
 
@@ -209,7 +194,7 @@ void msvq_enc_fx(
     const Word16 maxC,       /* i  : Tree search size (number of candidates kept from         */
     /*      one stage to the next == M-best)                         */
     const Word16 stages, /* i  : Number of stages                                         */
-    const Word16 w[],    /* i  : Weights                                                  */
+    const Word16 w[],    /* i  : Weights                                                  Q8*/
     const Word16 N,      /* i  : Vector dimension                                         */
     const Word16 maxN,   /* i  : Codebook dimension                                       */
     Word16 Idx[]         /* o  : Indices                                                  */
@@ -246,11 +231,11 @@ void msvq_enc_fx(
     set16_fx( parents, 0, maxC );
 
 
-    func_ptr = msvq_enc_find_p_max_6;
+    func_ptr = msvq_enc_find_p_max_6_fx;
     move16();
     if ( EQ_16( maxC, 8 ) )
     {
-        func_ptr = msvq_enc_find_p_max_8;
+        func_ptr = msvq_enc_find_p_max_8_fx;
         move16();
     }
 
@@ -263,11 +248,7 @@ void msvq_enc_fx(
     move16();
     FOR( j = 1; j < N; j++ )
     {
-#ifdef BASOP_NOGLOB
         ss2 = L_mac_sat( ss2, mult( u[j], shl_sat( w[j], 2 ) ), u[j] );
-#else
-        ss2 = L_mac( ss2, mult( u[j], shl( w[j], 2 ) ), u[j] );
-#endif
     }
 
     /* Set up inital error (residual) vectors */
@@ -345,7 +326,7 @@ void msvq_enc_fx(
         FOR( j = 0; j < levels[s]; j++ )
         {
             /* Compute weighted codebook element and its energy */
-            en = depack_mul_values( Tmp + start, w + start, cbp, n );
+            en = depack_mul_values_fx( Tmp + start, w + start, cbp, n );
 
             cbp += N34; /* pointer is incremented */
 
@@ -363,13 +344,8 @@ void msvq_enc_fx(
 
                 BASOP_SATURATE_WARNING_OFF_EVS
                 /*NOTE: as long as a shorter distance is found, saturation can be accepted.*/
-#ifdef BASOP_NOGLOB
                 tmp = L_add_sat( dist[0][c], L_sub_sat( en, L_shl( t1, 1 ) ) );
                 t1 = L_sub_sat( tmp, dist[1][p_max] );
-#else
-                tmp = L_add( dist[0][c], L_sub( en, L_shl( t1, 1 ) ) );
-                t1 = L_sub( tmp, dist[1][p_max] );
-#endif
                 BASOP_SATURATE_WARNING_ON_EVS
 
                 IF( t1 <= 0 )
@@ -402,7 +378,7 @@ void msvq_enc_fx(
             move16();
 
             Copy( p1, pTmp, start );
-            depack_sub_values( pTmp + start, p1 + start, &cb[s][p2i * N34], n );
+            depack_sub_values_fx( pTmp + start, p1 + start, &cb[s][p2i * N34], n );
             Copy( p1 + start + n, pTmp + start + n, sub( N, add( start, n ) ) );
 
             pTmp += N;
@@ -431,12 +407,12 @@ void msvq_enc_fx(
  *--------------------------------------------------------------------------*/
 
 void midlsf_enc_fx(
-    const Word16 qlsf0[],  /* i: quantized lsf coefficients (3Q12)	*/
-    const Word16 qlsf1[],  /* i: quantized lsf coefficients (3Q12)	*/
-    const Word16 lsf[],    /* i: lsf coefficients           (3Q12)	*/
-    Word16 *idx,           /* o: codebook index					*/
-    const Word16 lpcorder, /* i: order of the lpc					*/
-    const Word32 *Bin_Ener_128_fx,
+    const Word16 qlsf0[],          /* i: quantized lsf coefficients (3Q12)	*/
+    const Word16 qlsf1[],          /* i: quantized lsf coefficients (3Q12)	*/
+    const Word16 lsf[],            /* i: lsf coefficients           (3Q12)	*/
+    Word16 *idx,                   /* o: codebook index					*/
+    const Word16 lpcorder,         /* i: order of the lpc					*/
+    const Word32 *Bin_Ener_128_fx, // Q_ener
     const Word16 Q_ener,
     const Word8 narrowBand,
     const Word32 sr_core,
@@ -497,20 +473,11 @@ void midlsf_enc_fx(
             tmp = sub( lsf[j], qlsf[j] );
             /*        err +=  wghts[j] * ftemp * ftemp; */
             /* tmp is usually very small, we can have some extra precision with very rare saturation */
-#ifdef BASOP_NOGLOB
             tmp = shl_o( tmp, 4, &Overflow );
             tmp = mult_ro( tmp, tmp, &Overflow );
-#else  /* BASOP_NOGLOB */
-            tmp = shl( tmp, 4 );
-            tmp = mult_r( tmp, tmp );
-#endif /* BASOP_NOGLOB */
             err = L_mac( err, tmp, wghts[j] );
         }
-#ifdef BASOP_NOGLOB
         err = L_shl_o( err, 2, &Overflow );
-#else /* BASOP_NOGLOB */
-        err = L_shl( err, 2 );
-#endif
 
         /*	  err = L_shl(err,Wscale); */
         err = Mult_32_16( err, LSF_1_OVER_256SQ );
@@ -535,6 +502,152 @@ void midlsf_enc_fx(
  * Returns: number of indices
  *--------------------------------------------------------------------------*/
 Word16 Q_lsf_tcxlpc_fx(
+    /* const */ Word16 lsf[], /* i  : original lsf      14Q1 * 1.28 */
+    Word16 lsf_q[],           /* o  : quantized lsf     (14Q1*1.28)*/
+    Word16 lsp_q_ind[],       /* o  : quantized lsp (w/o MA prediction) */
+    Word16 indices[],         /* o  : VQ indices        */
+    const Word16 lpcorder,    /* i  : LPC order         */
+    const Word16 narrowband,  /* i  : narrowband flag   */
+    const Word16 cdk,         /* i  : codebook selector */
+    const Word16 mem_MA[],    /* i  : MA memory         */
+    const Word16 coder_type,
+    const Word32 *Bin_Ener, // Q_ener
+    const Word16 Q_ener )
+{
+    Word16 weights[M + 1];
+    Word16 pred[M16k];
+    Word16 i;
+    Word16 NumIndices;
+    Word16 lsf_q_ind[M16k];
+    const Word16 *means;
+    Word16 lsf_rem[M];
+    Word16 lsf_rem_q_ind[M];
+
+    Unified_weighting_fx( Bin_Ener, Q_ener, lsf, weights, narrowband, (Word16) EQ_16( coder_type, UNVOICED ), 12800, M );
+
+    move16();
+    NumIndices = 0;
+
+    /* Put disabled flag */
+    indices[NumIndices] = 0;
+    move16();
+    NumIndices = add( NumIndices, 1 );
+
+    /* Inter-frame prediction */
+
+    means = lsf_means[narrowband]; /* 14Q1 * 1.28 */
+
+    FOR( i = 0; i < lpcorder; ++i )
+    {
+        pred[i] = add( means[i], mult_r( MU_MA_FX, mem_MA[i] ) ); /* 14Q1 * 1.28  + ( 14Q1 * 1.28 * Q15 ) = 14Q1 * 1.28*/
+    }
+
+    /* Subtract prediction */
+
+    FOR( i = 0; i < lpcorder; ++i )
+    {
+        lsf[i] = sub( lsf[i], pred[i] ); /* 14Q1 * 1.28 */
+    }
+
+
+    msvq_enc_fx(
+        lsf_codebook[narrowband][cdk],
+        lsf_dims,
+        lsf_offs,
+        lsf,
+        lsf_numlevels,
+        kMaxC,
+        TCXLPC_NUMSTAGES,
+        weights,
+        lpcorder,
+        lpcorder,
+        indices + NumIndices );
+    msvq_dec(
+        lsf_codebook[narrowband][cdk],
+        lsf_dims,
+        lsf_offs,
+        TCXLPC_NUMSTAGES,
+        lpcorder,
+        lpcorder,
+        indices + NumIndices,
+        lsf_q );
+    NumIndices = add( NumIndices, TCXLPC_NUMSTAGES );
+
+    FOR( i = 0; i < lpcorder; ++i )
+    {
+        lsf_q_ind[i] = lsf_q[i]; /*(14Q1*1.28)*/
+        move16();
+    }
+
+    /* Update flag */
+    indices[0] = lsf_ind_is_active( lsf_q_ind, lsf_means[narrowband], narrowband, cdk );
+    move16();
+
+    /* Get residual vector */
+    FOR( i = 0; i < lpcorder; ++i )
+    {
+        lsf_rem[i] = add( sub( pred[i], lsf_means[narrowband][i] ), sub( lsf[i], lsf_q_ind[i] ) );
+    }
+
+    /* Quantize using extra stage(s) */
+    msvq_enc_fx(
+        lsf_ind_codebook[narrowband][cdk],
+        lsf_ind_dims,
+        lsf_ind_offs,
+        lsf_rem,
+        lsf_ind_numlevels,
+        kMaxC,
+        TCXLPC_IND_NUMSTAGES,
+        weights,
+        lpcorder,
+        lpcorder,
+        indices + NumIndices );
+    /* Only add contribution if flag is enabled */
+    IF( indices[0] )
+    {
+        /* Decode */
+        msvq_dec(
+            lsf_ind_codebook[narrowband][cdk],
+            lsf_ind_dims,
+            lsf_ind_offs,
+            TCXLPC_IND_NUMSTAGES,
+            lpcorder,
+            lpcorder,
+            indices + NumIndices,
+            lsf_rem_q_ind );
+        NumIndices = add( NumIndices, TCXLPC_IND_NUMSTAGES );
+
+        /* Add to MA-removed vector */
+        FOR( i = 0; i < lpcorder; ++i )
+        {
+            lsf_q_ind[i] = add( lsf_q_ind[i], lsf_rem_q_ind[i] );
+        }
+    }
+
+    /* Add inter-frame prediction */
+    FOR( i = 0; i < lpcorder; ++i )
+    {
+        lsf_q[i] = add( lsf_q[i], pred[i] );
+        lsf[i] = add( lsf[i], pred[i] );
+    }
+
+    reorder_lsf_fx( lsf_q, TCXLPC_LSF_GAP, lpcorder, INT_FS_FX );
+
+    FOR( i = 0; i < lpcorder; ++i )
+    {
+        lsf_q_ind[i] = add( lsf_q_ind[i], lsf_means[narrowband][i] );
+    }
+    reorder_lsf_fx( lsf_q_ind, TCXLPC_LSF_GAP, lpcorder, INT_FS_FX );
+
+    IF( lsp_q_ind )
+    {
+        E_LPC_lsf_lsp_conversion /*lsf2lsp*/ ( lsf_q_ind, lsp_q_ind, lpcorder );
+    }
+
+    return NumIndices;
+}
+
+Word16 Q_lsf_tcxlpc_ivas_fx(
     /* const */ Word16 lsf[], /* i  : original lsf      */
     Word16 lsf_q[],           /* o  : quantized lsf     */
     Word16 lsp_q_ind[],       /* o  : quantized lsp (w/o MA prediction) */
@@ -556,7 +669,7 @@ Word16 Q_lsf_tcxlpc_fx(
     Word16 lsf_rem[M];
     Word16 lsf_rem_q_ind[M];
 
-    Unified_weighting_fx( Bin_Ener, Q_ener, lsf, weights, narrowband, (Word16) EQ_16( coder_type, UNVOICED ), 12800, M );
+    Unified_weighting_fx( &Bin_Ener[L_FFT / 2], Q_ener, lsf, weights, narrowband, (Word16) EQ_16( coder_type, UNVOICED ), 12800, M );
 
     move16();
     NumIndices = 0;
@@ -573,6 +686,7 @@ Word16 Q_lsf_tcxlpc_fx(
     FOR( i = 0; i < lpcorder; ++i )
     {
         pred[i] = add( means[i], mult_r( MU_MA_FX, mem_MA[i] ) ); /* 14Q1 * 1.28  + ( 14Q1 * 1.28 * Q15 ) = 14Q1 * 1.28*/
+        move16();
     }
 
     /* Subtract prediction */
@@ -580,6 +694,7 @@ Word16 Q_lsf_tcxlpc_fx(
     FOR( i = 0; i < lpcorder; ++i )
     {
         lsf[i] = sub( lsf[i], pred[i] ); /* 14Q1 * 1.28 */
+        move16();
     }
 
 
@@ -603,9 +718,6 @@ Word16 Q_lsf_tcxlpc_fx(
         lpcorder,
         lpcorder,
         indices + NumIndices,
-#ifdef IVAS_MSVQ
-        0, NULL,
-#endif
         lsf_q );
     NumIndices = add( NumIndices, TCXLPC_NUMSTAGES );
 
@@ -623,6 +735,7 @@ Word16 Q_lsf_tcxlpc_fx(
     FOR( i = 0; i < lpcorder; ++i )
     {
         lsf_rem[i] = add( sub( pred[i], lsf_means[narrowband][i] ), sub( lsf[i], lsf_q_ind[i] ) );
+        move16();
     }
 
     /* Quantize using extra stage(s) */
@@ -650,9 +763,6 @@ Word16 Q_lsf_tcxlpc_fx(
             lpcorder,
             lpcorder,
             indices + NumIndices,
-#ifdef IVAS_MSVQ
-            0, NULL,
-#endif
             lsf_rem_q_ind );
         NumIndices = add( NumIndices, TCXLPC_IND_NUMSTAGES );
 
@@ -660,6 +770,7 @@ Word16 Q_lsf_tcxlpc_fx(
         FOR( i = 0; i < lpcorder; ++i )
         {
             lsf_q_ind[i] = add( lsf_q_ind[i], lsf_rem_q_ind[i] );
+            move16();
         }
     }
 
@@ -668,6 +779,8 @@ Word16 Q_lsf_tcxlpc_fx(
     {
         lsf_q[i] = add( lsf_q[i], pred[i] );
         lsf[i] = add( lsf[i], pred[i] );
+        move16();
+        move16();
     }
 
     reorder_lsf_fx( lsf_q, TCXLPC_LSF_GAP, lpcorder, INT_FS_FX );
@@ -675,6 +788,7 @@ Word16 Q_lsf_tcxlpc_fx(
     FOR( i = 0; i < lpcorder; ++i )
     {
         lsf_q_ind[i] = add( lsf_q_ind[i], lsf_means[narrowband][i] );
+        move16();
     }
     reorder_lsf_fx( lsf_q_ind, TCXLPC_LSF_GAP, lpcorder, INT_FS_FX );
 
@@ -708,7 +822,7 @@ Word16 enc_lsf_tcxlpc_fx(
     move16();
     FOR( i = 0; i < TCXLPC_NUMSTAGES; ++i )
     {
-        push_next_indice_fx( hBstr, **indices, lsf_numbits[i] );
+        push_next_indice( hBstr, **indices, lsf_numbits[i] );
         ++*indices;
     }
 
@@ -717,7 +831,7 @@ Word16 enc_lsf_tcxlpc_fx(
         NumBits = add( NumBits, TCXLPC_IND_NUMBITS );
         FOR( i = 0; i < TCXLPC_IND_NUMSTAGES; ++i )
         {
-            push_next_indice_fx( hBstr, **indices, lsf_ind_numbits[i] );
+            push_next_indice( hBstr, **indices, lsf_ind_numbits[i] );
             ++*indices;
         }
     }
@@ -765,7 +879,7 @@ Word16 enc_lsf_tcxlpc_ivas_fx(
 
 Word16 lsf_msvq_ma_encprm_fx(
     BSTR_ENC_HANDLE hBstr,
-    Word16 *param_lpc,
+    Word16 *param_lpc, // Q0
     Word16 core,
     Word16 acelp_mode,
     Word16 acelp_midLpc,
@@ -783,17 +897,17 @@ Word16 lsf_msvq_ma_encprm_fx(
     FOR( i = 0; i < no_indices; i++ )
     {
 
-        push_next_indice_fx( hBstr, *param_lpc, bits_param_lpc[i] );
+        push_next_indice( hBstr, *param_lpc, bits_param_lpc[i] );
         param_lpc++;
         nbits_lpc = add( nbits_lpc, bits_param_lpc[i] );
     }
     IF( NE_16( acelp_mode, VOICED ) )
     {
         test();
-        IF( EQ_16( core, ACELP_CORE ) && acelp_midLpc )
+        IF( ( core == ACELP_CORE ) && acelp_midLpc )
         {
 
-            push_next_indice_fx( hBstr, *param_lpc, bits_midlpc );
+            push_next_indice( hBstr, *param_lpc, bits_midlpc );
             nbits_lpc = add( nbits_lpc, bits_midlpc );
         }
     }
@@ -802,7 +916,7 @@ Word16 lsf_msvq_ma_encprm_fx(
 }
 Word16 lsf_msvq_ma_encprm_ivas_fx(
     BSTR_ENC_HANDLE hBstr,
-    const Word16 *param_lpc,
+    const Word16 *param_lpc, // Q0
     const Word16 core,
     const Word16 acelp_mode,
     const Word16 acelp_midLpc,
@@ -827,7 +941,7 @@ Word16 lsf_msvq_ma_encprm_ivas_fx(
     IF( NE_16( acelp_mode, VOICED ) )
     {
         test();
-        IF( EQ_16( core, ACELP_CORE ) && acelp_midLpc )
+        IF( ( core == ACELP_CORE ) && acelp_midLpc )
         {
 
             push_next_indice( hBstr, *param_lpc, bits_midlpc );
@@ -845,7 +959,7 @@ Word16 lsf_msvq_ma_encprm_ivas_fx(
  *--------------------------------------------------------------------------*/
 Word16 lsf_bctcvq_encprm_fx(
     BSTR_ENC_HANDLE hBstr,
-    Word16 *param_lpc,
+    Word16 *param_lpc, // Q0
     Word16 *bits_param_lpc,
     Word16 no_indices )
 {
@@ -855,7 +969,7 @@ Word16 lsf_bctcvq_encprm_fx(
 
     FOR( i = 0; i < no_indices; i++ )
     {
-        push_next_indice_fx( hBstr, *param_lpc, bits_param_lpc[i] );
+        push_next_indice( hBstr, *param_lpc, bits_param_lpc[i] );
         param_lpc++;
         nbits_lpc = add( nbits_lpc, bits_param_lpc[i] );
     }
@@ -864,7 +978,7 @@ Word16 lsf_bctcvq_encprm_fx(
 }
 Word16 lsf_bctcvq_encprm_ivas_fx(
     BSTR_ENC_HANDLE hBstr,
-    const Word16 *param_lpc,
+    const Word16 *param_lpc, // Q0
     const Word16 *bits_param_lpc,
     const Word16 no_indices )
 {
diff --git a/lib_enc/ltd_stable.c b/lib_enc/ltd_stable.c
deleted file mode 100644
index 825401325748d89d4db5894372ff8dd2e53d76ec..0000000000000000000000000000000000000000
--- a/lib_enc/ltd_stable.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/ltd_stable_fx.c b/lib_enc/ltd_stable_fx.c
index 63ade58a8ce9eddacd3fb3d852aa0415ca57b67b..036fe2a7e82b382fd7e8a48723a567799aa62e39 100644
--- a/lib_enc/ltd_stable_fx.c
+++ b/lib_enc/ltd_stable_fx.c
@@ -21,7 +21,7 @@
 void ltd_stable_fx(
     VAD_CLDFB_HANDLE hVAD_CLDFB, /* i/o: CLDFB VAD state     */
     Word16 *ltd_stable_rate,     /* o : time-domain stable rate*/
-    const Word32 frame_energy,   /* i : current frame energy*/
+    const Word32 frame_energy,   /* i : current frame energy Q_frames_power*/
     const Word16 frameloop,      /* i : amount of  frames*/
     const Word16 Q_frames_power  /* i : the Scaling of  frames_power*/
 )
@@ -57,7 +57,7 @@ void ltd_stable_fx(
     move16();
     Q_apow = 0;
     move16();
-    frames_power_32 = hVAD_CLDFB->frames_power_32;
+    frames_power_32 = hVAD_CLDFB->frames_power_32; // Q_frames_power_last_32
     Q_frames_power_last_32 = hVAD_CLDFB->Q_frames_power_32;
     move16();
     leadingzero_midamp = 31;
@@ -76,7 +76,7 @@ void ltd_stable_fx(
     IF( GE_16( Q_frames_power32, 40 ) )
     {
         zerop001 = L_shr( CNT0P001, 1 );
-        frame_energy_Sqr32 = L_shr( frame_energy_Sqr32, sub( Q_frames_power32, 39 ) );
+        frame_energy_Sqr32 = L_shr( frame_energy_Sqr32, sub( Q_frames_power32, 39 ) ); // Q_frames_power32
         Q_frames_power32 = 39;
         move16();
     }
@@ -86,14 +86,14 @@ void ltd_stable_fx(
         frame_energy_Sqr32 = L_shr( frame_energy_Sqr32, 1 );
         zerop001 = L_shr( CNT0P001, sub( 40, Q_frames_power32 ) );
     }
-    frames_power_32[0] = L_add( frame_energy_Sqr32, zerop001 );
+    frames_power_32[0] = L_add( frame_energy_Sqr32, zerop001 ); // Q_frames_power32
     move32();
 
     IF( LT_16( frameloop, 3 ) )
     {
         FOR( i = 1; i < 40; i++ )
         {
-            frames_power_32[i] = frames_power_32[0];
+            frames_power_32[i] = frames_power_32[0]; // Q_frames_power32
             move32();
         }
     }
@@ -104,7 +104,7 @@ void ltd_stable_fx(
         move32();
         FOR( i = 1; i < 40; i++ )
         {
-            maxVal = L_max( maxVal, frames_power_32[i] );
+            maxVal = L_max( maxVal, frames_power_32[i] ); // Q_frames_power32
         }
         leadingzero = 31;
         move16();
@@ -119,7 +119,7 @@ void ltd_stable_fx(
             scale1 = sub( scale1, leadingzero );
             FOR( i = 1; i < 40; i++ )
             {
-                frames_power_32[i] = L_shr( frames_power_32[i], scale1 );
+                frames_power_32[i] = L_shr( frames_power_32[i], scale1 ); // Q_frames_power32
                 move32();
             }
         }
@@ -140,7 +140,7 @@ void ltd_stable_fx(
 
     FOR( i = 0; i < 20; i++ )
     {
-        mid_frame_ampadd32[i] = L_add( L_shr( frames_power_32[2 * i], 1 ), L_shr( frames_power_32[2 * i + 1], 1 ) );
+        mid_frame_ampadd32[i] = L_add( L_shr( frames_power_32[2 * i], 1 ), L_shr( frames_power_32[2 * i + 1], 1 ) ); // Q_frames_power32
         move32();
     }
 
@@ -148,16 +148,18 @@ void ltd_stable_fx(
     move32();
     FOR( i = 0; i < 20; i++ )
     {
-        maxVal = L_max( maxVal, mid_frame_ampadd32[i] );
+        maxVal = L_max( maxVal, mid_frame_ampadd32[i] ); // Q_frames_power32
     }
     leadingzero_midamp = 31;
     move16();
     if ( maxVal )
+    {
         leadingzero_midamp = norm_l( maxVal );
+    }
 
     FOR( i = 0; i < 20; i++ )
     {
-        mid_frame_amp32[i] = L_shl( mid_frame_ampadd32[i], leadingzero_midamp );
+        mid_frame_amp32[i] = L_shl( mid_frame_ampadd32[i], leadingzero_midamp ); // Q_frames_power32 + leadingzero_midamp
         move32();
     }
 
@@ -165,19 +167,19 @@ void ltd_stable_fx(
     move32();
     FOR( i = 0; i < 20; i++ )
     {
-        seg_amp32 = L_add( seg_amp32, L_shr( mid_frame_amp32[i], 5 ) );
+        seg_amp32 = L_add( seg_amp32, L_shr( mid_frame_amp32[i], 5 ) ); // Q_frames_power32 + leadingzero_midamp - 5
     }
-    seg_amp32 = MUL_F( seg_amp32, 0x0666 );
+    seg_amp32 = MUL_F( seg_amp32, 0x0666 /*(1/20).Q15*/ );
 
     dif32 = 0;
     move32();
     apow32 = 0;
     move32();
 
-    seg_amp32tmp = L_shl( seg_amp32, 5 );
+    seg_amp32tmp = L_shl( seg_amp32, 5 ); // Q_frames_power32 + leadingzero_midamp
     FOR( i = 0; i < 20; i++ )
     {
-        tmp32[i] = L_sub( mid_frame_amp32[i], seg_amp32tmp );
+        tmp32[i] = L_sub( mid_frame_amp32[i], seg_amp32tmp ); // Q_frames_power32 + leadingzero_midamp
         move32();
     }
 
@@ -185,26 +187,24 @@ void ltd_stable_fx(
     move32();
     FOR( i = 0; i < 20; i++ )
     {
-        maxVal = L_max( maxVal, L_abs( tmp32[i] ) );
+        maxVal = L_max( maxVal, L_abs( tmp32[i] ) ); // Q_frames_power32 + leadingzero_midamp - 5
     }
     leadingzero_tmp32 = 31;
     move16();
     if ( maxVal )
+    {
         leadingzero_tmp32 = norm_l( maxVal );
+    }
 
     FOR( i = 0; i < 20; i++ )
     {
-        tmp16[i] = extract_h( L_shl( tmp32[i], leadingzero_tmp32 ) );
+        tmp16[i] = extract_h( L_shl( tmp32[i], leadingzero_tmp32 ) ); //// Q_frames_power32 + leadingzero_midamp + leadingzero_tmp32 - 16
     }
 
     FOR( i = 0; i < 20; i++ )
     {
-#ifdef BASOP_NOGLOB
-        tmp_mul = L_mult_sat( tmp16[i], tmp16[i] );
-#else
-        tmp_mul = L_mult( tmp16[i], tmp16[i] );
-#endif
-        tmp_mul = L_shr( tmp_mul, 5 );
+        tmp_mul = L_mult_sat( tmp16[i], tmp16[i] ); // 2 * (Q_frames_power32 + leadingzero_midamp + leadingzero_tmp32 - 16) + 1
+        tmp_mul = L_shr( tmp_mul, 5 );              // 2 * (Q_frames_power32 + leadingzero_midamp + leadingzero_tmp32 - 16) - 4
         dif32 = L_add( dif32, tmp_mul );
 
         tmp = extract_h( mid_frame_amp32[i] );
@@ -248,7 +248,9 @@ void ltd_stable_fx(
     leadingzero_midamp = 31;
     move16();
     if ( maxVal )
+    {
         leadingzero_midamp = norm_l( maxVal );
+    }
 
     FOR( i = 0; i < 14; i++ )
     {
@@ -260,15 +262,15 @@ void ltd_stable_fx(
     move32();
     FOR( i = 0; i < 14; i++ )
     {
-        seg_amp32 = L_add( seg_amp32, L_shr( mid_frame_amp32[i], 4 ) );
+        seg_amp32 = L_add( seg_amp32, L_shr( mid_frame_amp32[i], 4 ) ); // Q_frames_power32 - 4
     }
-    seg_amp32 = MUL_F( seg_amp32, 0x0924 );
+    seg_amp32 = MUL_F( seg_amp32, 0x0924 /*(1/14).Q15*/ );
 
     dif32 = 0;
     move32();
     apow32 = 0;
     move32();
-    seg_amp32tmp = L_shl( seg_amp32, 4 );
+    seg_amp32tmp = L_shl( seg_amp32, 4 ); // Q_frames_power32
     FOR( i = 0; i < 14; i++ )
     {
         tmp32[i] = L_sub( mid_frame_amp32[i], seg_amp32tmp );
@@ -284,7 +286,9 @@ void ltd_stable_fx(
     leadingzero_tmp32 = 31;
     move16();
     if ( maxVal )
+    {
         leadingzero_tmp32 = norm_l( maxVal );
+    }
 
     FOR( i = 0; i < 14; i++ )
     {
@@ -295,11 +299,7 @@ void ltd_stable_fx(
     FOR( i = 0; i < 14; i++ )
     {
         tmp = extract_h( tmp32[i] );
-#ifdef BASOP_NOGLOB
         tmp_mul = L_mult_sat( tmp, tmp );
-#else
-        tmp_mul = L_mult( tmp, tmp );
-#endif
         tmp_mul = L_shr( tmp_mul, 4 );
         dif32 = L_add( dif32, tmp_mul );
 
@@ -375,8 +375,10 @@ void ltd_stable_fx(
     }
     leadingzero_midamp = 31;
     move16();
-    if ( maxVal )
+    IF( maxVal )
+    {
         leadingzero_midamp = norm_l( maxVal );
+    }
 
     FOR( i = 0; i < 8; i++ )
     {
@@ -390,7 +392,7 @@ void ltd_stable_fx(
     {
         seg_amp32 = L_add( seg_amp32, L_shr( mid_frame_amp32[i], 3 ) );
     }
-    seg_amp32 = MUL_F( seg_amp32, 0x1000 );
+    seg_amp32 = MUL_F( seg_amp32, 0x1000 /*(1/8).Q15*/ );
 
     dif32 = 0;
     move32();
@@ -411,9 +413,10 @@ void ltd_stable_fx(
     }
     leadingzero_tmp32 = 31;
     move16();
-    if ( maxVal )
+    IF( maxVal )
+    {
         leadingzero_tmp32 = norm_l( maxVal );
-
+    }
     FOR( i = 0; i < 8; i++ )
     {
         tmp32[i] = L_shl( tmp32[i], leadingzero_tmp32 );
@@ -423,20 +426,12 @@ void ltd_stable_fx(
     FOR( i = 0; i < 8; i++ )
     {
         tmp = extract_h( tmp32[i] );
-#ifdef BASOP_NOGLOB
         tmp_mul = L_mult_sat( tmp, tmp );
-#else
-        tmp_mul = L_mult( tmp, tmp );
-#endif
         tmp_mul = L_shr( tmp_mul, 3 );
         dif32 = L_add( dif32, tmp_mul );
 
         tmp = extract_h( mid_frame_amp32[i] );
-#ifdef BASOP_NOGLOB
         mid_frame_amp_mul = L_mult_sat( tmp, tmp );
-#else
-        mid_frame_amp_mul = L_mult( tmp, tmp );
-#endif
         mid_frame_amp_mul = L_shr( mid_frame_amp_mul, 3 );
         apow32 = L_add( apow32, mid_frame_amp_mul );
     }
@@ -498,7 +493,7 @@ void ltd_stable_fx(
 
     ltd_stable_rate[2] = shr( ltd_stable_rate[2], ltd_stable_rate_Qtmp );
     move16();
-    ltd_stable_rate[3] = add( mult( ltd_stable_rate[3], 0x7333 ), mult( ltd_stable_rate[2], 0x0ccc ) );
+    ltd_stable_rate[3] = add( mult( ltd_stable_rate[3], 0x7333 /*0.9.Q15*/ ), mult( ltd_stable_rate[2], 0x0ccc /*0.1.Q15*/ ) );
     move16();
 
     FOR( i = 55; i > 0; i-- )
diff --git a/lib_enc/mdct_classifier.c b/lib_enc/mdct_classifier.c
deleted file mode 100644
index b157e0ff9c551ecdad0373734e433d1d168869fe..0000000000000000000000000000000000000000
--- a/lib_enc/mdct_classifier.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include <assert.h>
-#include "ivas_prot_fx.h"
diff --git a/lib_enc/mdct_classifier_fx.c b/lib_enc/mdct_classifier_fx.c
index 51fe086df0a7fd3d7931e10beb8daa5d01f20c0c..ea06878c12f389f63c66e199003cebe35938f4ad 100644
--- a/lib_enc/mdct_classifier_fx.c
+++ b/lib_enc/mdct_classifier_fx.c
@@ -9,7 +9,6 @@
 #include "rom_com.h"
 #include "prot_fx.h"      /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                    */
-#include "prot_fx.h"      /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                   */
 #include "ivas_prot_fx.h" /* Function prototypes                   */
 
@@ -47,7 +46,7 @@
  * Square magnitude of fft spectrum
  *----------------------------------------------------------------------------*/
 static void dft_mag_square_fx(
-    const Word16 x[], /* i : Input vector: re[0], re[1], ..., re[n/2], im[n/2 - 1], im[n/2 - 2], ..., im[1] */
+    const Word16 x[], /* i : Input vector: re[0], re[1], ..., re[n/2], im[n/2 - 1], im[n/2 - 2], ..., im[1]  Qx*/
     Word32 magSq[],   /* o : Magnitude square spectrum */
     const Word16 n    /* i : Input vector length */
 )
@@ -58,7 +57,7 @@ static void dft_mag_square_fx(
 
     /* Magnitude square at 0. */
     pMagSq = &magSq[0];
-    pRe = &x[0];
+    pRe = &x[0]; // Qx
     *pMagSq++ = L_mult0( *pRe, *pRe );
     pRe++;
     move32();
@@ -71,13 +70,13 @@ static void dft_mag_square_fx(
     {
         acc = L_mult0( *pRe, *pRe );
         pRe++;
-        *pMagSq++ = L_mac0( acc, *pIm, *pIm );
+        *pMagSq++ = L_mac0( acc, *pIm, *pIm ); // 2*Qx
         pIm--;
         move32();
     }
 
     /* The magnitude square at N/2 */
-    *pMagSq = L_mult0( *pRe, *pRe );
+    *pMagSq = L_mult0( *pRe, *pRe ); // 2*Qx
     move32();
     return;
 }
@@ -90,7 +89,7 @@ static void dft_mag_square_fx(
 Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision                         */
                            const Word16 *fft_buff, /* i: re[0], re[1], ..., re[n/2], im[n/2 - 1], im[n/2 - 2], ..., im[1] */
                            Encoder_State *st_fx,   /* i/o: Encoder state variable                  */
-                           Word32 *cldfbBuf_Ener,
+                           Word32 *cldfbBuf_Ener,  // enerBuffer_exp
                            Word16 enerBuffer_exp,
                            const Word32 brate /* i  : current brate, IVAS: nominal bitrate, EVS: st->total_brate */
 )
@@ -118,88 +117,15 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     Word32 gain1_tmp = 0, gain2_tmp = 0;
     Word16 exp, exp1, exp2, exp3;
     Word32 L_tmp, L_tmp1;
-#ifdef IVAS_CODE
-    Word16 gain2_start, gain3_start, gain4_start, H1_start, H2_start, H_length;
-    Word16 gain2_start_rs, gain3_start_rs;
-#endif
     TCX_ENC_HANDLE hTcxEnc = st_fx->hTcxEnc;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
 #endif
     test();
-#ifdef IVAS_CODE
-    IF( EQ_32( st_fx->input_Fs, 32000 ) || EQ_32( st_fx->input_Fs, 48000 ) )
-    {
-        gain2_start = GAIN2_START_SWB;
-        gain2_start_rs = GAIN2_START_SWB_RS;
-        gain3_start = GAIN3_START_SWB;
-        gain3_start_rs = GAIN3_START_SWB_RS;
-        gain4_start = GAIN4_START_SWB;
-        // gain4_start_rs = GAIN4_START_SWB_RS;
-        H1_start = H1_START_SWB;
-        H2_start = H2_START_SWB;
-        H_length = H_LENGTH_SWB;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-    }
-    ELSE IF( EQ_32( st_fx->input_Fs, 16000 ) )
-    {
-        gain2_start = GAIN2_START_WB;
-        gain2_start_rs = GAIN2_START_SWB_RS;
-        gain3_start = GAIN3_START_WB;
-        gain2_start_rs = GAIN2_START_SWB_RS;
-        gain4_start = GAIN4_START_WB;
-        H1_start = H1_START_WB;
-        H2_start = H2_START_WB;
-        H_length = H_LENGTH_WB;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-    }
-    ELSE
-    {
-        assert( !"Unknown sampling frequency in MDCT_classifier" );
-        H1_start = -1;    /* to avoid compilation warning */
-        H2_start = -1;    /* to avoid compilation warning */
-        H_length = -1;    /* to avoid compilation warning */
-        gain2_start = -1; /* to avoid compilation warning */
-        gain3_start = -1; /* to avoid compilation warning */
-        gain4_start = -1; /* to avoid compilation warning */
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-    }
-#endif
-#ifdef IVAS_CODE
-    if ( NE_16( st_fx->element_mode, IVAS_CPE_DFT ) )
-#endif
     {
 
         dft_mag_square_fx( fft_buff, magSq, 256 );
     }
-#ifdef IVAS_CODE
-    ELSE
-    {
-        float norm_val;
-
-        norm_val = ( L_FFT * L_FFT ) / 4.f;
-        for ( k = 0; k < 128; k++ )
-        {
-            X[k + 1] = st->Bin_E_old[k] * norm_val;
-        }
-        X[0] = X[1];
-    }
-#endif
     nf = L_add( magSq[0], 0 );
     pe = L_add( magSq[0], 0 );
     np = 0;
@@ -261,7 +187,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
         {
             IF( max_i > 0 )
             {
-                IF( GT_16( np, 0 ) )
+                IF( ( np > 0 ) )
                 {
                     d_acc = sub( add( d_acc, max_i ), pos_last );
                 }
@@ -278,7 +204,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
         IF( pe != 0 )
         {
             expo = norm_l( pe );
-            man = L_shl( pe, expo );
+            man = L_shl( pe, expo );                // expo
             Mpy_32_32_ss( man, man, &man, &lsb32 ); /* pe square */
             expo = shl( expo, 1 );                  /* Multiply by 2 due to squaring. */
             floating_point_add( &p_energy_man, &p_energy_exp, man, expo );
@@ -296,10 +222,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     gain1 = L_deposit_l( 0 );
     gain2 = L_deposit_l( 0 );
     gain3 = L_deposit_l( 0 );
-#ifdef IVAS_CODE
-    PMT( "MDCT_classifier needs review for different sampling rate" )
-#endif
-    // IVAS_CODE to adapt
+
     FOR( k = 0; k < 8; k++ )
     {
         gain1 = L_add( gain1, L_shr( cldfbBuf_Ener[k], 3 ) );
@@ -310,35 +233,35 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     /* gain11 = 8*(gain1 - cldfbBuf_Ener[0]/8)/7; */
     acc = L_shr( cldfbBuf_Ener[0], 3 );
     acc = L_sub( gain1, acc );
-    acc = Mult_32_16( acc, 4681 );
+    acc = Mult_32_16( acc, 4681 /*(1/7).Q15*/ );
     gain11 = L_shl( acc, 3 );
     gain4 = L_deposit_l( 0 );
     FOR( k = 0; k < 12; k++ )
     {
-        gain4 = L_add( gain4, Mult_32_16( cldfbBuf_Ener[k + 12], 2731 ) );
+        gain4 = L_add( gain4, Mult_32_16( cldfbBuf_Ener[k + 12], 2731 /*(1/12).Q15*/ ) );
     }
 
 
     peak_H1 = L_add( cldfbBuf_Ener[25], 0 );
-    Mpy_32_16_ss( cldfbBuf_Ener[25], 6554, &avrg_H1, &lsb16 );
+    Mpy_32_16_ss( cldfbBuf_Ener[25], 6554 /*0.4.Q15*/, &avrg_H1, &lsb16 );
     FOR( k = 1; k < 5; k++ )
     {
         IF( GT_32( cldfbBuf_Ener[k + 25], peak_H1 ) )
         {
             peak_H1 = L_add( cldfbBuf_Ener[k + 25], 0 );
         }
-        avrg_H1 = L_add( avrg_H1, Mult_32_16( cldfbBuf_Ener[k + 25], 6554 ) );
+        avrg_H1 = L_add( avrg_H1, Mult_32_16( cldfbBuf_Ener[k + 25], 6554 /*0.4.Q15*/ ) );
     }
 
     peak_H2 = L_add( cldfbBuf_Ener[20], 0 );
-    Mpy_32_16_ss( cldfbBuf_Ener[20], 6554, &avrg_H2, &lsb16 );
+    Mpy_32_16_ss( cldfbBuf_Ener[20], 6554 /*0.4.Q15*/, &avrg_H2, &lsb16 );
     FOR( k = 1; k < 5; k++ )
     {
         IF( GT_32( cldfbBuf_Ener[k + 20], peak_H2 ) )
         {
             peak_H2 = L_add( cldfbBuf_Ener[k + 20], 0 );
         }
-        avrg_H2 = L_add( avrg_H2, Mult_32_16( cldfbBuf_Ener[k + 20], 6554 ) );
+        avrg_H2 = L_add( avrg_H2, Mult_32_16( cldfbBuf_Ener[k + 20], 6554 /*0.4.Q15*/ ) );
     }
     // End
     peak_l = L_deposit_l( 0 );
@@ -401,7 +324,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     condition4 = 0;
     move16();
 
-    L_tmp = Mult_32_16( peak_h, 12603 );
+    L_tmp = Mult_32_16( peak_h, 12603 /*1/2.56.Q15*/ );
     IF( GT_32( peak_l, L_tmp ) )
     {
         exp = norm_l( peak_l );
@@ -419,7 +342,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
         exp1 = norm_l( avrg_l );
     }
 
-    L_tmp1 = Mult_32_16( peak_l, 12603 );
+    L_tmp1 = Mult_32_16( peak_l, 12603 /*1/2.56.Q15*/ );
     IF( GT_32( peak_h, L_tmp1 ) )
     {
         exp2 = norm_l( peak_h );
@@ -433,17 +356,13 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     test();
     test();
     test();
-#ifdef BASOP_NOGLOB
     IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl_o( avrg_H1, 1, &Overflow ) ) ) || ( LT_32( Mult_32_32( L_shl_o( peak_l, exp, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( L_tmp, exp, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) || GT_32( Mult_32_32( L_shl_o( L_tmp1, exp2, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( peak_h, exp2, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) ) )
-#else
-    IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl( avrg_H1, 1 ) ) ) || ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( L_tmp, exp ), L_shl( avrg_l, exp1 ) ) ) || GT_32( Mult_32_32( L_shl( L_tmp1, exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) )
-#endif
     {
         condition3 = 1;
         move16();
     }
 
-    L_tmp = Mult_32_16( peak_h, 12800 );
+    L_tmp = Mult_32_16( peak_h, 12800 /*(1/2.56).Q15*/ );
     IF( GT_32( peak_l, L_tmp ) )
     {
         exp = norm_l( peak_l );
@@ -453,7 +372,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
         exp = norm_l( L_tmp );
     }
 
-    L_tmp1 = Mult_32_16( peak_l, 6400 );
+    L_tmp1 = Mult_32_16( peak_l, 6400 /*(1/5.12).Q15*/ );
     IF( GT_32( peak_h, L_tmp1 ) )
     {
         exp2 = norm_l( peak_h );
@@ -481,7 +400,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     test();
     test();
     test();
-    IF( ( GT_32( gain4, Mult_32_16( gain11, 26214 ) ) && GT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 ), exp ), L_shl( avrg_l, exp1 ) ) ) && LT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 6400 ), exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) || ( GT_32( gain4, Mult_32_16( gain11, 9830 ) ) && LT_32( Mult_32_16( peak_h, 21845 ), avrg_h ) && LT_32( Mult_32_16( peak_H2, 21845 ), avrg_H2 ) ) || ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 ), exp ), L_shl( avrg_l, exp1 ) ) ) && GT_32( Mult_32_16( peak_h, 21845 ), avrg_h ) ) || ( GT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 12800 ), exp3 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp3 ), L_shl( avrg_l, exp1 ) ) ) > 0 && LT_32( Mult_32_16( peak_h, 21845 ), avrg_h ) ) )
+    IF( ( GT_32( gain4, Mult_32_16( gain11, 26214 /*0.8.Q15*/ ) ) && GT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 /*(1/2.56).Q15*/ ), exp ), L_shl( avrg_l, exp1 ) ) ) && LT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 6400 /*(1/5.12).Q15*/ ), exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) || ( GT_32( gain4, Mult_32_16( gain11, 9830 /*0.3.Q15*/ ) ) && LT_32( Mult_32_16( peak_h, 21845 /*(1/1.5).Q15*/ ), avrg_h ) && LT_32( Mult_32_16( peak_H2, 21845 /*(1/1.5).Q15*/ ), avrg_H2 ) ) || ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 /*(1/2.56).Q15*/ ), exp ), L_shl( avrg_l, exp1 ) ) ) && GT_32( Mult_32_16( peak_h, 21845 /*(1/1.5).Q15*/ ), avrg_h ) ) || ( GT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 12800 /*(1/2.56).Q15*/ ), exp3 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp3 ), L_shl( avrg_l, exp1 ) ) ) > 0 && LT_32( Mult_32_16( peak_h, 21845 /*(1/1.5).Q15*/ ), avrg_h ) ) )
     {
         condition4 = 1;
         move16();
@@ -503,21 +422,21 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     }
 
     /* Smooth decision from instantaneous decision*/
-    acc = L_mult( hTcxEnc->clas_sec_old_fx, MDCT_CLASSIFER_SMOOTH_FILT_COEFF ); /* st_fx->clas_sec_old_fx in Q13 */
-    clas_sec = mac_r( acc, c, 0x7fff - MDCT_CLASSIFER_SMOOTH_FILT_COEFF );      /* clas_sec and c are in Q13 */
+    acc = L_mult( hTcxEnc->clas_sec_old_fx, MDCT_CLASSIFER_SMOOTH_FILT_COEFF );      /* st_fx->clas_sec_old_fx in Q13 */
+    clas_sec = mac_r( acc, c, 0x7fff /*1.Q15*/ - MDCT_CLASSIFER_SMOOTH_FILT_COEFF ); /* clas_sec and c are in Q13 */
     /* Do thresholding with hysteresis */
     IF( GT_16( st_fx->last_enerBuffer_exp, enerBuffer_exp ) )
     {
-        gain1_tmp = L_shr( gain1, sub( st_fx->last_enerBuffer_exp, enerBuffer_exp ) );
+        gain1_tmp = L_shr( gain1, sub( st_fx->last_enerBuffer_exp, enerBuffer_exp ) ); // st_fx->last_enerBuffer_exp
         move32();
-        gain2_tmp = L_shr( gain2, sub( st_fx->last_enerBuffer_exp, enerBuffer_exp ) );
+        gain2_tmp = L_shr( gain2, sub( st_fx->last_enerBuffer_exp, enerBuffer_exp ) ); // st_fx->last_enerBuffer_exp
         move32();
     }
     ELSE
     {
-        hTcxEnc->last_gain1 = L_shr( hTcxEnc->last_gain1, sub( enerBuffer_exp, st_fx->last_enerBuffer_exp ) );
+        hTcxEnc->last_gain1 = L_shr( hTcxEnc->last_gain1, sub( enerBuffer_exp, st_fx->last_enerBuffer_exp ) ); // enerBuffer_exp
         move32();
-        hTcxEnc->last_gain2 = L_shr( hTcxEnc->last_gain2, sub( enerBuffer_exp, st_fx->last_enerBuffer_exp ) );
+        hTcxEnc->last_gain2 = L_shr( hTcxEnc->last_gain2, sub( enerBuffer_exp, st_fx->last_enerBuffer_exp ) ); // enerBuffer_exp
         move32();
         gain1_tmp = gain1;
         move32();
@@ -531,11 +450,7 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
     test();
     test();
     test();
-#ifdef BASOP_NOGLOB
     IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl_o( gain1_tmp, 1, &Overflow ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl_o( gain2_tmp, 1, &Overflow ) ) ) ) )
-#else
-    IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl( gain1_tmp, 1 ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl( gain2_tmp, 1 ) ) ) ) )
-#endif
     {
         clas_final = hTcxEnc->clas_final_old;
         move16();
@@ -591,10 +506,11 @@ Word16 mdct_classifier_fx(                         /* o: MDCT A/B decision
 
     return clas_final; /* Q0 */
 }
+
 Word16 mdct_classifier_ivas_fx(
     Encoder_State *st,         /* i/o: Encoder state variable                  */
     const Word16 *fft_buff,    /* i  : FFT spectrum from fft_rel               */
-    const Word32 enerBuffer[], /* i  : energy buffer                           */
+    const Word32 enerBuffer[], /* i  : energy buffer                           enerBuffer_exp*/
     Word16 enerBuffer_exp,
     const Word32 brate /* i  : current brate, IVAS: nominal bitrate, EVS: st->total_brate */
 )
@@ -781,7 +697,7 @@ Word16 mdct_classifier_ivas_fx(
         IF( pe != 0 )
         {
             expo = norm_l( pe );
-            man = L_shl( pe, expo );
+            man = L_shl( pe, expo );                // expo
             Mpy_32_32_ss( man, man, &man, &lsb32 ); /* pe square */
             expo = shl( expo, 1 );                  /* Multiply by 2 due to squaring. */
             floating_point_add( &p_energy_man, &p_energy_exp, man, expo );
@@ -804,32 +720,32 @@ Word16 mdct_classifier_ivas_fx(
     {
         IF( EQ_16( gain2_start, GAIN2_START_SWB ) )
         {
-            gain1 = L_add( gain1, L_shr( enerBuffer[i], 3 ) );
-            gain2 = L_add( gain2, L_shr( enerBuffer[gain2_start + i], 3 ) );
-            gain3 = L_add( gain3, L_shr( enerBuffer[gain3_start + i], 3 ) );
+            gain1 = L_add( gain1, L_shr( enerBuffer[i], 3 ) );               // enerBuffer_exp - 3
+            gain2 = L_add( gain2, L_shr( enerBuffer[gain2_start + i], 3 ) ); // enerBuffer_exp - 3
+            gain3 = L_add( gain3, L_shr( enerBuffer[gain3_start + i], 3 ) ); // enerBuffer_exp - 3
         }
         ELSE
         {
-            gain1 = L_add( gain1, Mult_32_16( enerBuffer[i], 5461 ) );
-            gain2 = L_add( gain2, Mult_32_16( enerBuffer[gain2_start + i], 5461 ) );
-            gain3 = L_add( gain3, Mult_32_16( enerBuffer[gain3_start + i], 5461 ) );
+            gain1 = L_add( gain1, Mult_32_16( enerBuffer[i], 5461 ) );                            // enerBuffer_exp
+            gain2 = L_add( gain2, Mult_32_16( enerBuffer[gain2_start + i], 5461 /*0.16.Q15*/ ) ); // enerBuffer_exp
+            gain3 = L_add( gain3, Mult_32_16( enerBuffer[gain3_start + i], 5461 /*0.16.Q15*/ ) ); // enerBuffer_exp
         }
     }
 
 
     IF( EQ_16( gain2_start, GAIN2_START_SWB ) )
     {
-        acc = L_shr( enerBuffer[0], 3 );
-        acc = L_sub( gain1, acc );
-        acc = Mult_32_16( acc, 4681 );
-        gain11 = L_shl( acc, 3 );
+        acc = L_shr( enerBuffer[0], 3 );             // enerBuffer_exp - 3
+        acc = L_sub( gain1, acc );                   // enerBuffer_exp - 3
+        acc = Mult_32_16( acc, 4681 /*(1/7).Q15*/ ); // enerBuffer_exp - 3
+        gain11 = L_shl( acc, 3 );                    // enerBuffer_exp
         gain4 = L_deposit_l( 0 );
     }
     ELSE
     {
-        acc = Mult_32_16( enerBuffer[0], 5461 );
-        acc = L_sub( gain1, acc );
-        acc = Mult_32_16( acc, 6553 );
+        acc = Mult_32_16( enerBuffer[0], 5461 /*0.16.Q15*/ ); // enerBuffer_exp
+        acc = L_sub( gain1, acc );                            // enerBuffer_exp
+        acc = Mult_32_16( acc, 6553 /*0.4.Q15*/ );            // enerBuffer_exp
         gain11 = (Word32) W_mult_32_16( acc, 6 );
         gain4 = L_deposit_l( 0 );
     }
@@ -839,28 +755,28 @@ Word16 mdct_classifier_ivas_fx(
     {
         IF( EQ_16( gain4_start, GAIN4_START_SWB ) )
         {
-            gain4 = L_add( gain4, Mult_32_16( enerBuffer[gain4_start + i], 2731 ) );
+            gain4 = L_add( gain4, Mult_32_16( enerBuffer[gain4_start + i], 2731 /*(1/12).Q15*/ ) );
         }
         ELSE
         {
-            gain4 = L_add( gain4, Mult_32_16( enerBuffer[gain4_start + i], 3641 ) );
+            gain4 = L_add( gain4, Mult_32_16( enerBuffer[gain4_start + i], 3641 /*(1/9).Q1.15*/ ) );
         }
     }
 
-    peak_H1 = enerBuffer[H1_start];
+    peak_H1 = enerBuffer[H1_start]; // enerBuffer_exp
     move32();
 
-    avrg_H1 = enerBuffer[H1_start];
+    avrg_H1 = enerBuffer[H1_start]; // enerBuffer_exp
     move32();
 
     FOR( i = 1; i < H_length; i++ )
     {
         IF( GT_32( enerBuffer[H1_start + i], peak_H1 ) )
         {
-            peak_H1 = enerBuffer[H1_start + i];
+            peak_H1 = enerBuffer[H1_start + i]; // enerBuffer_exp
             move32();
         }
-        avrg_H1 = L_add( avrg_H1, enerBuffer[H1_start + i] );
+        avrg_H1 = L_add( avrg_H1, enerBuffer[H1_start + i] ); // enerBuffer_exp
     }
 
     peak_H2 = enerBuffer[H2_start];
@@ -972,17 +888,13 @@ Word16 mdct_classifier_ivas_fx(
     test();
     test();
     test();
-#ifdef BASOP_NOGLOB
     IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl_o( avrg_H1, 1, &Overflow ) ) ) || ( LT_32( Mult_32_32( L_shl_o( peak_l, exp, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( L_tmp, exp, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) || GT_32( Mult_32_32( L_shl_o( L_tmp1, exp2, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( peak_h, exp2, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) ) )
-#else
-    IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl( avrg_H1, 1 ) ) ) || ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( L_tmp, exp ), L_shl( avrg_l, exp1 ) ) ) || GT_32( Mult_32_32( L_shl( L_tmp1, exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) )
-#endif
     {
         condition3 = 1;
         move16();
     }
 
-    L_tmp = Mult_32_16( peak_h, 12800 );
+    L_tmp = Mult_32_16( peak_h, 12800 /*(1/2.56).Q15*/ );
     IF( GT_32( peak_l, L_tmp ) )
     {
         exp = norm_l( peak_l );
@@ -992,7 +904,7 @@ Word16 mdct_classifier_ivas_fx(
         exp = norm_l( L_tmp );
     }
 
-    L_tmp1 = Mult_32_16( peak_l, 6400 );
+    L_tmp1 = Mult_32_16( peak_l, 6400 /*(1/5.12).Q15*/ );
     IF( GT_32( peak_h, L_tmp1 ) )
     {
         exp2 = norm_l( peak_h );
@@ -1020,8 +932,8 @@ Word16 mdct_classifier_ivas_fx(
     test();
     test();
     test();
-    IF( ( GT_32( gain4, Mult_32_16( gain11, 26214 ) ) && GT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 ), exp ), L_shl( avrg_l, exp1 ) ) ) && LT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 6400 ), exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) || ( GT_32( gain4, Mult_32_16( gain11, 9830 ) ) && LT_32( Mult_32_16( peak_h, 21845 ), avrg_h ) && LT_32( Mult_32_16( peak_H2, 21845 ), avrg_H2 ) ) ||
-        ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 ), exp ), L_shl( avrg_l, exp1 ) ) ) && GT_32( Mult_32_16( peak_h, 21845 ), avrg_h ) ) || ( GT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 12800 ), exp3 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp3 ), L_shl( avrg_l, exp1 ) ) ) > 0 && LT_32( Mult_32_16( peak_h, 21845 ), avrg_h ) ) )
+    IF( ( GT_32( gain4, Mult_32_16( gain11, 26214 /*0.8.Q15*/ ) ) && GT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 /*(1/2.56).Q15*/ ), exp ), L_shl( avrg_l, exp1 ) ) ) && LT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 6400 /*(1/5.12).Q15*/ ), exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) || ( GT_32( gain4, Mult_32_16( gain11, 9830 /*0.3.Q15*/ ) ) && LT_32( Mult_32_16( peak_h, 21845 /*(1/1.5).Q15*/ ), avrg_h ) && LT_32( Mult_32_16( peak_H2, 21845 /*(1/1.5).Q15*/ ), avrg_H2 ) ) ||
+        ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( Mult_32_16( peak_h, 12800 /*(1/2.56).Q15*/ ), exp ), L_shl( avrg_l, exp1 ) ) ) && GT_32( Mult_32_16( peak_h, 21845 /*(1/1.5).Q15*/ ), avrg_h ) ) || ( GT_32( Mult_32_32( L_shl( Mult_32_16( peak_l, 12800 /*(1/2.56).Q15*/ ), exp3 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp3 ), L_shl( avrg_l, exp1 ) ) ) > 0 && LT_32( Mult_32_16( peak_h, 21845 /*(1/1.5).Q15*/ ), avrg_h ) ) )
     {
         condition4 = 1;
         move16();
@@ -1077,11 +989,7 @@ Word16 mdct_classifier_ivas_fx(
     test();
     test();
 
-#ifdef BASOP_NOGLOB
     IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl_o( gain1_tmp, 1, &Overflow ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl_o( gain2_tmp, 1, &Overflow ) ) ) ) )
-#else
-    IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl( gain1_tmp, 1 ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl( gain2_tmp, 1 ) ) ) ) )
-#endif
     {
         clas_final = hTcxEnc->clas_final_old;
         move16();
diff --git a/lib_enc/mdct_selector.c b/lib_enc/mdct_selector.c
deleted file mode 100644
index 9d6f499db09e405ecf613f29cb1442072afc3305..0000000000000000000000000000000000000000
--- a/lib_enc/mdct_selector.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/mdct_selector_fx.c b/lib_enc/mdct_selector_fx.c
index 52c30f7ef6be8666370f19d2f3d0cfeb545a2f25..c4cc7d0db8bcca97c26af11090363cbb12dfc166 100644
--- a/lib_enc/mdct_selector_fx.c
+++ b/lib_enc/mdct_selector_fx.c
@@ -62,14 +62,14 @@ static Word16 get_sparseness(                       /* Returns sparseness measur
 
     FOR( i = 1; i < n - 1; ++i )
     {
-        if ( GT_16( Bin_E[i], s_max( s_max( Bin_E[i - 1], Bin_E[i + 1] ), thr ) ) )
+        IF( GT_16( Bin_E[i], s_max( s_max( Bin_E[i - 1], Bin_E[i + 1] ), thr ) ) )
         {
             num_max = add( num_max, 1 );
         }
     }
 
     n = shr( sub( n, 2 ), 1 );
-    return div_s( sub( n, num_max ), n );
+    return div_s( sub( n, num_max ), n ); // Q15
 }
 /*--------------------------------------------------------------------------*
  * get_mean_ener()
@@ -78,7 +78,7 @@ static Word16 get_sparseness(                       /* Returns sparseness measur
  *--------------------------------------------------------------------------*/
 
 static Word16 get_mean_ener(                            /* Returns mean energy in dB (Q8) */
-                             const Word32 enerBuffer[], /* i  : CLDFB buffers             */
+                             const Word32 enerBuffer[], /* i  : CLDFB buffers             enerBuffer_exp*/
                              Word16 enerBuffer_exp,     /* i  : exponent of enerBuffer  */
                              Word16 n                   /* i  : number of bins          */
 )
@@ -87,8 +87,10 @@ static Word16 get_mean_ener(                            /* Returns mean energy i
     Word16 i, shift, frac_nrg, exp_nrg;
 
     shift = sub( 14, norm_s( n ) );
-    if ( LT_16( shl( 1, shift ), n ) )
+    IF( LT_16( shl( 1, shift ), n ) )
+    {
         shift = add( shift, 1 );
+    }
 
     L_tmp = L_deposit_l( 0 );
     FOR( i = 0; i < n; ++i )
@@ -104,7 +106,7 @@ static Word16 get_mean_ener(                            /* Returns mean energy i
     exp_nrg = sub( add( exp_nrg, shift ), sub( 31, enerBuffer_exp ) );
     L_tmp = Mpy_32_16( exp_nrg, frac_nrg, 9864 ); /* log10(2) in Q15 */
 
-    return round_fx( L_shl( L_tmp, 8 ) );
+    return round_fx( L_shl( L_tmp, 8 ) ); // Q8
 }
 /*--------------------------------------------------------------------------*
  * MDCT_selector_fx()
@@ -117,7 +119,7 @@ void MDCT_selector_fx(
     Word16 sp_floor,            /* i  : Noise floor estimate Q7 */
     const Word16 Etot,          /* i  : Total energy         Q8 */
     const Word16 cor_map_sum,   /* i  : harmonicity factor   Q8 */
-    const Word32 enerBuffer[],  /* i  : CLDFB buffers           */
+    const Word32 enerBuffer[],  /* i  : CLDFB buffers           enerBuffer_exp*/
     const Word16 enerBuffer_exp /* i  : exponent of enerBuffer  */
 )
 {
@@ -135,7 +137,7 @@ void MDCT_selector_fx(
 
         sp_floor = shl( sp_floor, 1 ); /* convert to Q8 */
 
-        IF( EQ_16( st->bwidth, NB ) )
+        IF( ( st->bwidth == NB ) )
         {
             lob_cldfb = 3200 / 400;
             move16();
@@ -188,7 +190,7 @@ void MDCT_selector_fx(
         frame_voicing = add( shr( st->voicing_fx[0], 1 ), shr( st->voicing_fx[1], 1 ) );
 
         /* Spectral sparseness */
-        sparseness = get_sparseness( st->lgBin_E_fx, lob_fft, sub( Etot, MDCT_SW_SIG_PEAK_THR ) );
+        sparseness = get_sparseness( st->lgBin_E_fx, lob_fft, sub( Etot, MDCT_SW_SIG_PEAK_THR ) ); // Q15
 
         /* Hi band energy */
         hi_ener = get_mean_ener( &enerBuffer[lob_cldfb], enerBuffer_exp, sub( hib_cldfb, lob_cldfb ) );
@@ -255,23 +257,23 @@ void MDCT_selector_fx(
 
         IF( EQ_16( st->mdct_sw_enable, MODE1 ) )
         {
-            sig_lo_level_thr = MDCT_SW_1_SIG_LO_LEVEL_THR;
+            sig_lo_level_thr = MDCT_SW_1_SIG_LO_LEVEL_THR; // Q8
             move16();
-            sig_hi_level_thr = MDCT_SW_1_SIG_HI_LEVEL_THR;
+            sig_hi_level_thr = MDCT_SW_1_SIG_HI_LEVEL_THR; // Q8
             move16();
-            cor_thr = MDCT_SW_1_COR_THR;
+            cor_thr = MDCT_SW_1_COR_THR; // Q8
             move16();
-            cor_thr2 = MDCT_SW_1_COR_THR2;
+            cor_thr2 = MDCT_SW_1_COR_THR2; // Q8
             move16();
-            voicing_thr = MDCT_SW_1_VOICING_THR;
+            voicing_thr = MDCT_SW_1_VOICING_THR; // Q15
             move16();
-            voicing_thr2 = MDCT_SW_1_VOICING_THR2;
+            voicing_thr2 = MDCT_SW_1_VOICING_THR2; // Q15
             move16();
-            sparseness_thr = MDCT_SW_1_SPARSENESS_THR;
+            sparseness_thr = MDCT_SW_1_SPARSENESS_THR; // Q15
             move16();
-            sparseness_thr2 = MDCT_SW_1_SPARSENESS_THR2;
+            sparseness_thr2 = MDCT_SW_1_SPARSENESS_THR2; // Q15
             move16();
-            hi_ener_lo_thr = MDCT_SW_1_HI_ENER_LO_THR;
+            hi_ener_lo_thr = MDCT_SW_1_HI_ENER_LO_THR; // Q8
             move16();
         }
         ELSE /* st->mdct_sw_enable == MODE2 */
diff --git a/lib_enc/mslvq_enc.c b/lib_enc/mslvq_enc.c
deleted file mode 100644
index 9f95d696c1a7ff0612049f066bd40360d8713923..0000000000000000000000000000000000000000
--- a/lib_enc/mslvq_enc.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "prot_fx.h"
-#include "rom_com.h"
-#include "cnst.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-
-/*-----------------------------------------------------------------*
- * Local function prototypes
- *-----------------------------------------------------------------*/
-
-Word32 quantize_data_ivas_fx( Word16 *data, const Word16 *w_in, Word16 *qin, Word16 *cv_out, Word16 *idx_lead, Word16 *idx_scale, const Word16 *sigma, const Word16 *inv_sigma, const Word16 *scales, const Word16 *no_lead );
-
-/*-----------------------------------------------------------------*
- * mslvq()
- *
- * Encodes the LSF residual
- *-----------------------------------------------------------------*/
-
-Word32 mslvq_ivas_16(
-    Word16 *pTmp,          /* i  : M-dimensional input vector */
-    Word16 *quant,         /* o  : quantized vector */
-    Word16 *cv_out,        /* o  : corresponding 8-dim lattice codevectors (without the scaling) */
-    Word16 *idx_lead,      /* o  : leader index for each 8-dim subvector  */
-    Word16 *idx_scale,     /* o  : scale index for each subvector */
-    const Word16 *w,       /* i  : weights for LSF quantization */
-    const Word16 mode,     /* i  : number indicating the coding type (V/UV/G...)*/
-    const Word16 mode_glb, /* i  : LVQ coding mode */
-    const Word16 pred_flag /* i  : prediction flag (0: safety net, 1,2 - predictive  )*/
-                           /*Retunr dist in q 22*/
-)
-{
-    Word32 dist, L_tmp;
-    const Word16 *p_scales, *p_sigma, *p_inv_sigma;
-    Word16 i, tmp, tmp1;
-    Word16 p_no_lead[MAX_NO_SCALES * 2];
-    dist = L_deposit_l( 0 );
-    IF( pred_flag == 0 )
-    {
-        p_sigma = sigma_MSLVQ_fx[mode];
-        /* inverse sigma is precomputed to save complexity */
-        p_inv_sigma = inv_sigma_MSLVQ_fx[mode];
-        p_scales = scales_ivas_fx[mode_glb];
-
-        tmp = no_lead_idx[mode_glb][0];
-        move16();
-        tmp1 = no_lead_idx[mode_glb][1];
-        move16();
-        test();
-        if ( LE_16( tmp, LIMIT_LEADER ) && LT_16( tmp, sub( tmp1, 2 ) ) )
-        {
-            tmp = add( tmp, DELTA_LEADER );
-        }
-        FOR( i = 0; i < MAX_NO_SCALES; i++ )
-        {
-            p_no_lead[i] = (Word16) leaders_short[tmp][i];
-            move16();
-            p_no_lead[i + MAX_NO_SCALES] = (Word16) leaders_short[tmp1][i];
-            move16();
-        }
-    }
-    ELSE
-    {
-        IF( GE_16( pred_flag, 5 ) )
-        {
-            /* assert( pred_flag >= 12 && pred_flag <= 15 ); */
-            /* pred_flag is here the number of bits for MSLVQ */
-
-            p_sigma = &modified_sigma_BWE_fx[mode_glb * LATTICE_DIM];
-
-            /* inverse sigma is precomputed to save complexity */
-            p_inv_sigma = &inv_modified_sigma_BWE_fx[mode_glb * LATTICE_DIM];
-            IF( mode_glb == 0 )
-            {
-                p_scales = &scales_BWE_fx_new[i_mult( sub( pred_flag, mslvq_SHB_min_bits[mode_glb] ), 3 )];
-
-                FOR( i = 0; i < MAX_NO_SCALES; i++ )
-                {
-                    p_no_lead[i] = (Word16) no_lead_BWE[i + ( pred_flag - mslvq_SHB_min_bits[mode_glb] ) * 3];
-                    move16();
-                }
-            }
-            ELSE
-            {
-                p_scales = &scales_BWE_3b_fx_new[i_mult( sub( pred_flag, mslvq_SHB_min_bits[mode_glb] ), 3 )];
-                FOR( i = 0; i < MAX_NO_SCALES; i++ )
-                {
-                    p_no_lead[i] = (Word16) no_lead_BWE_3b[i + ( pred_flag - mslvq_SHB_min_bits[mode_glb] ) * 3];
-                    move16();
-                }
-            }
-        }
-        ELSE
-        {
-            p_sigma = sigma_p_fx[mode];
-
-            /* inverse sigma is precomputed to save complexity */
-            p_inv_sigma = inv_sigma_p_fx[mode];
-
-            p_scales = scales_p_ivas_fx[mode_glb];
-
-            tmp = no_lead_p_idx[mode_glb][0];
-            move16();
-            tmp1 = no_lead_p_idx[mode_glb][1];
-            move16();
-
-            test();
-            IF( LE_16( tmp, LIMIT_LEADER ) && LT_16( tmp, sub( tmp1, 2 ) ) )
-            {
-                tmp = add( tmp, DELTA_LEADER );
-            }
-
-            test();
-            IF( EQ_16( tmp, LIMIT_LEADER ) && ( tmp1 == 0 ) )
-            {
-                tmp = add( tmp, DELTA_LEADER );
-                tmp1 = add( tmp1, DELTA_LEADER );
-            }
-
-            FOR( i = 0; i < MAX_NO_SCALES; i++ )
-            {
-                p_no_lead[i] = (Word16) leaders_short[tmp][i];
-                move16();
-                p_no_lead[i + MAX_NO_SCALES] = (Word16) leaders_short[tmp1][i];
-                move16();
-            }
-        }
-    }
-
-    /* first subvector */
-    dist = quantize_data_ivas_fx( pTmp, w, quant, cv_out, idx_lead, idx_scale,
-                                  p_sigma, p_inv_sigma, p_scales, p_no_lead );
-
-    IF( LT_16( pred_flag, 5 ) )
-    {
-        /* second subvector */
-        L_tmp = quantize_data_ivas_fx( pTmp + LATTICE_DIM, w + LATTICE_DIM, quant + LATTICE_DIM, cv_out + LATTICE_DIM, &idx_lead[1], &idx_scale[1], p_sigma + LATTICE_DIM, p_inv_sigma + LATTICE_DIM, p_scales + MAX_NO_SCALES, p_no_lead + MAX_NO_SCALES );
-
-        dist = L_add( dist, L_tmp );
-    }
-
-    return dist;
-}
-
-/*-----------------------------------------------------------------*
- * mslvq_cng()
- *
- * Encodes the LSF residual in SID frames
- *-----------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------*
- * prepare_data()
- *
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * calculate_min_dist()
- *
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * quantize_data()
- *
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * index_lvq()
- *
- * sorts in descending order and computes indices in the sorted vector
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * encode_comb()
- *
- * creates an index for the lattice codevector
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * index_leaders()
- *
- * gives the index in a class of leaders without considering the sign yet
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * find_pos()
- *
- * Finds the positions in vector c for which the vector components are equal to 'arg'.
- * It returns the number of such positions and their values in the array 'p'.
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * encode_sign_pc1()
- *
- * Creates an index for signs of the significant codevector components
- * Gives the index of the signs - binary representation where negative sign stands for 1
- * and positive sign stands for 1.
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * take_out_val()
- *
- * removes the value val from the vector v
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * c2idx()
- *
- *-----------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------*
- * index_lvq_SHB()
- *
- *-----------------------------------------------------------------*/
-
-
-UWord32 index_lvq_SHB_fx(
-    const Word16 idx_lead,
-    const Word16 idx_scale,
-    const Word16 nbits,
-    Word16 *lat_cv,
-    const Word16 mode )
-{
-    UWord16 i;
-    const Word8 *p_no_lead;
-    UWord32 index;
-
-    IF( mode == 0 )
-    {
-        p_no_lead = &no_lead_BWE[( nbits - mslvq_SHB_min_bits[0] ) * 3];
-    }
-    ELSE
-    {
-        p_no_lead = &no_lead_BWE_3b[( nbits - mslvq_SHB_min_bits[1] ) * 3];
-    }
-
-    index = 0;
-    move32();
-    IF( GT_16( idx_lead, -1 ) )
-    {
-        index = 1;
-        move32();
-        FOR( i = 0; i < idx_scale; i++ )
-        {
-            index = index + table_no_cv[p_no_lead[i]];
-            move32();
-        }
-
-        IF( idx_lead > 0 )
-        {
-            index = index + table_no_cv[idx_lead];
-            move32();
-        }
-
-        index = index + encode_comb_fx( lat_cv, idx_lead );
-        move32();
-    }
-
-    return index;
-}
diff --git a/lib_enc/mslvq_enc_fx.c b/lib_enc/mslvq_enc_fx.c
index b6445443bdf549b9e0775e347e3554317373a111..8f8dd4537e60c9085f7237e3bee200ad9c7b7d3b 100644
--- a/lib_enc/mslvq_enc_fx.c
+++ b/lib_enc/mslvq_enc_fx.c
@@ -6,9 +6,8 @@
 #include "rom_com_fx.h"
 #include "rom_com.h"
 #include "stl.h"
-#include "prot.h"        /* Function prototypes                    */
-#include "basop32.h"     /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
+#include "basop32.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 
@@ -59,19 +58,19 @@ Word32 mslvq_fx(
 
     IF( pred_flag == 0 )
     {
-        p_sigma = sigma_MSLVQ_fx[mode];
+        p_sigma = sigma_MSLVQ_fx[mode]; // Qlog2(2.56)
         /* inverse sigma is precomputed to save complexity */
-        p_inv_sigma = inv_sigma_MSLVQ_fx[mode];
-        p_scales = scales_fx[mode_glb];
-        p_no_lead = no_lead_fx[mode_glb];
+        p_inv_sigma = inv_sigma_MSLVQ_fx[mode]; // Q15
+        p_scales = scales_fx[mode_glb];         // Q11
+        p_no_lead = no_lead_fx[mode_glb];       // Q0
     }
     ELSE
     {
-        p_sigma = sigma_p_fx[mode];
+        p_sigma = sigma_p_fx[mode]; // Qlog2(2.56)
         /* inverse sigma is precomputed to save complexity */
-        p_inv_sigma = inv_sigma_p_fx[mode];
-        p_scales = scales_p_fx[mode_glb];
-        p_no_lead = no_lead_p_fx[mode_glb];
+        p_inv_sigma = inv_sigma_p_fx[mode]; // Q15
+        p_scales = scales_p_fx[mode_glb];   // Q11
+        p_no_lead = no_lead_p_fx[mode_glb]; // Q0
     }
 
     /* first subvector */
@@ -185,15 +184,15 @@ Word32 mslvq_cng_fx(
     mode_glb = add( START_CNG, idx_cv );
     move16();
 
-    p_sigma = sigma_MSLVQ_fx[mode];
+    p_sigma = sigma_MSLVQ_fx[mode]; // x2.56
     move16();
-    p_inv_sigma = inv_sigma_MSLVQ_fx[mode];
+    p_inv_sigma = inv_sigma_MSLVQ_fx[mode]; // Q15
     move16();
-    p_scales = scales_fx[mode_glb];
+    p_scales = scales_fx[mode_glb]; // Q11
     move16();
-    p_no_lead = no_lead_fx[mode_glb];
+    p_no_lead = no_lead_fx[mode_glb]; // Q0
     move16();
-    p_no_scales = &no_scales[shl( mode_glb, 1 )];
+    p_no_scales = &no_scales[( mode_glb << 1 )];
     move16();
 
     /* check if LSF component permutation is needed or not */
@@ -245,14 +244,14 @@ Word32 mslvq_cng_ivas_fx(
 
     /* for CNG there is only one bitrate but several lattice quantizer structures,
        depending on the previous VQ stage */
-    mode_glb = add( START_CNG, idx_cv );
+    mode_glb = add( START_CNG_IVAS, idx_cv );
     move16();
 
-    p_sigma = sigma_MSLVQ_fx[mode];
+    p_sigma = sigma_MSLVQ_fx[mode]; // x2.56
     move16();
-    p_inv_sigma = inv_sigma_MSLVQ_fx[mode];
+    p_inv_sigma = inv_sigma_MSLVQ_fx[mode]; // Q15
     move16();
-    p_scales = scales_fx[mode_glb];
+    p_scales = scales_ivas_fx[mode_glb]; // Q11
     move16();
 
     no_scales[0] = 0;
@@ -774,7 +773,7 @@ static void sort_desc_ind_fx(
         move16();
     }
     sorted = 0;
-    FOR( k = sub( len, 1 ); k > 0; k-- )
+    FOR( k = ( len - 1 ); k > 0; k-- )
     {
         IF( sorted )
         {
@@ -838,7 +837,7 @@ void index_lvq_fx(
     /* for first subvector */
     IF( GT_16( idx_scale[0], -1 ) )
     {
-        index1 = L_add( encode_comb_fx( quant, idx_lead[0] ), L_add( table_no_cv_fx[idx_lead[0]], p_offset_scale1[i_mult2( mode, len_offset ) + idx_scale[0]] ) );
+        index1 = L_add( encode_comb_fx( quant, idx_lead[0] ), L_add( table_no_cv_fx[idx_lead[0]], p_offset_scale1[( mode * len_offset ) + idx_scale[0]] ) );
     }
 
     /* for second subvector */
@@ -846,7 +845,7 @@ void index_lvq_fx(
 
     IF( GT_16( idx_scale[1], -1 ) )
     {
-        index2 = L_add( encode_comb_fx( &quant[LATTICE_DIM], idx_lead[1] ), L_add( table_no_cv_fx[idx_lead[1]], p_offset_scale2[i_mult2( mode, len_offset ) + idx_scale[1]] ) );
+        index2 = L_add( encode_comb_fx( &quant[LATTICE_DIM], idx_lead[1] ), L_add( table_no_cv_fx[idx_lead[1]], p_offset_scale2[( mode * len_offset ) + idx_scale[1]] ) );
     }
     idx64 = W_mult0_32_32( index1, p_offset_scale2[mode * len_offset + p_no_scales[mode * 2 + 1]] );
     index2_64 = W_deposit32_l( index2 );
@@ -855,9 +854,9 @@ void index_lvq_fx(
     /* convert to 3 short */
     index[0] = ( ( idx64 ) & ( 0x7fff ) );
     move16();
-    index[1] = ( idx64 >> 15 ) & ( 0x7fff );
+    index[1] = ( W_shr( idx64, 15 ) ) & ( 0x7fff );
     move16();
-    index[2] = ( idx64 >> 30 ) & ( 0x7fff );
+    index[2] = ( W_shr( idx64, 30 ) ) & ( 0x7fff );
     move16();
     return;
 }
@@ -901,9 +900,9 @@ void index_lvq_ivas_fx(
     /* convert to 3 short */
     index[0] = ( ( idx64 ) & ( 0x7fff ) );
     move16();
-    index[1] = ( idx64 >> 15 ) & ( 0x7fff );
+    index[1] = ( W_shr( idx64, 15 ) ) & ( 0x7fff );
     move16();
-    index[2] = ( idx64 >> 30 ) & ( 0x7fff );
+    index[2] = ( W_shr( idx64, 30 ) ) & ( 0x7fff );
     move16();
 
     return;
@@ -1060,7 +1059,7 @@ static Word16 encode_sign_pc1_fx(                /* o  : index of signs
         IF( cv[i] < 0 )
         {
             idx_sign = add( idx_sign, ( shl( 1, cnt ) ) );
-            cnt++;
+            cnt = add( cnt, 1 );
         }
 
         if ( cv[i] > 0 )
@@ -1092,7 +1091,7 @@ static void take_out_val_fx(
 
     FOR( i = 0; i < len; i++ )
     {
-        IF( NE_16( v[i], val ) )
+        if ( NE_16( v[i], val ) )
         {
             v_out[cnt++] = v[i];
             move16();
@@ -1126,7 +1125,7 @@ Word16 c2idx_fx(            /* o: index                    */
         move16();
         FOR( i = 1; i <= p[0]; i++ )
         {
-            skip = add( skip, C_VQ[sub( n, i )][sub( k, 1 )] );
+            skip = add( skip, C_VQ[( n - i )][( k - 1 )] ); // Q0
         }
 
         p0 = p[0];
@@ -1140,3 +1139,180 @@ Word16 c2idx_fx(            /* o: index                    */
         return tmp;
     }
 }
+
+/*-----------------------------------------------------------------*
+ * mslvq()
+ *
+ * Encodes the LSF residual
+ *-----------------------------------------------------------------*/
+
+Word32 mslvq_ivas_16(
+    Word16 *pTmp,          /* i  : M-dimensional input vector */
+    Word16 *quant,         /* o  : quantized vector */
+    Word16 *cv_out,        /* o  : corresponding 8-dim lattice codevectors (without the scaling) */
+    Word16 *idx_lead,      /* o  : leader index for each 8-dim subvector  */
+    Word16 *idx_scale,     /* o  : scale index for each subvector */
+    const Word16 *w,       /* i  : weights for LSF quantization */
+    const Word16 mode,     /* i  : number indicating the coding type (V/UV/G...)*/
+    const Word16 mode_glb, /* i  : LVQ coding mode */
+    const Word16 pred_flag /* i  : prediction flag (0: safety net, 1,2 - predictive  )*/
+                           /*Retunr dist in q 22*/
+)
+{
+    Word32 dist, L_tmp;
+    const Word16 *p_scales, *p_sigma, *p_inv_sigma;
+    Word16 i, tmp, tmp1;
+    Word16 p_no_lead[MAX_NO_SCALES * 2];
+    dist = L_deposit_l( 0 );
+    IF( pred_flag == 0 )
+    {
+        p_sigma = sigma_MSLVQ_fx[mode];
+        /* inverse sigma is precomputed to save complexity */
+        p_inv_sigma = inv_sigma_MSLVQ_fx[mode];
+        p_scales = scales_ivas_fx[mode_glb];
+
+        tmp = no_lead_idx[mode_glb][0];
+        move16();
+        tmp1 = no_lead_idx[mode_glb][1];
+        move16();
+        test();
+        if ( LE_16( tmp, LIMIT_LEADER ) && LT_16( tmp, sub( tmp1, 2 ) ) )
+        {
+            tmp = add( tmp, DELTA_LEADER );
+        }
+        FOR( i = 0; i < MAX_NO_SCALES; i++ )
+        {
+            p_no_lead[i] = (Word16) leaders_short[tmp][i];
+            move16();
+            p_no_lead[i + MAX_NO_SCALES] = (Word16) leaders_short[tmp1][i];
+            move16();
+        }
+    }
+    ELSE
+    {
+        IF( GE_16( pred_flag, 5 ) )
+        {
+            /* assert( pred_flag >= 12 && pred_flag <= 15 ); */
+            /* pred_flag is here the number of bits for MSLVQ */
+
+            p_sigma = &modified_sigma_BWE_fx[mode_glb * LATTICE_DIM];
+
+            /* inverse sigma is precomputed to save complexity */
+            p_inv_sigma = &inv_modified_sigma_BWE_fx[mode_glb * LATTICE_DIM];
+            IF( mode_glb == 0 )
+            {
+                p_scales = &scales_BWE_fx_new[i_mult( sub( pred_flag, mslvq_SHB_min_bits[mode_glb] ), 3 )];
+
+                FOR( i = 0; i < MAX_NO_SCALES; i++ )
+                {
+                    p_no_lead[i] = (Word16) no_lead_BWE[i + ( pred_flag - mslvq_SHB_min_bits[mode_glb] ) * 3];
+                    move16();
+                }
+            }
+            ELSE
+            {
+                p_scales = &scales_BWE_3b_fx_new[i_mult( sub( pred_flag, mslvq_SHB_min_bits[mode_glb] ), 3 )];
+                FOR( i = 0; i < MAX_NO_SCALES; i++ )
+                {
+                    p_no_lead[i] = (Word16) no_lead_BWE_3b[i + ( pred_flag - mslvq_SHB_min_bits[mode_glb] ) * 3];
+                    move16();
+                }
+            }
+        }
+        ELSE
+        {
+            p_sigma = sigma_p_fx[mode];
+
+            /* inverse sigma is precomputed to save complexity */
+            p_inv_sigma = inv_sigma_p_fx[mode];
+
+            p_scales = scales_p_ivas_fx[mode_glb];
+
+            tmp = no_lead_p_idx[mode_glb][0];
+            move16();
+            tmp1 = no_lead_p_idx[mode_glb][1];
+            move16();
+
+            test();
+            IF( LE_16( tmp, LIMIT_LEADER ) && LT_16( tmp, sub( tmp1, 2 ) ) )
+            {
+                tmp = add( tmp, DELTA_LEADER );
+            }
+
+            test();
+            IF( EQ_16( tmp, LIMIT_LEADER ) && ( tmp1 == 0 ) )
+            {
+                tmp = add( tmp, DELTA_LEADER );
+                tmp1 = add( tmp1, DELTA_LEADER );
+            }
+
+            FOR( i = 0; i < MAX_NO_SCALES; i++ )
+            {
+                p_no_lead[i] = (Word16) leaders_short[tmp][i];
+                move16();
+                p_no_lead[i + MAX_NO_SCALES] = (Word16) leaders_short[tmp1][i];
+                move16();
+            }
+        }
+    }
+
+    /* first subvector */
+    dist = quantize_data_ivas_fx( pTmp, w, quant, cv_out, idx_lead, idx_scale,
+                                  p_sigma, p_inv_sigma, p_scales, p_no_lead );
+
+    IF( LT_16( pred_flag, 5 ) )
+    {
+        /* second subvector */
+        L_tmp = quantize_data_ivas_fx( pTmp + LATTICE_DIM, w + LATTICE_DIM, quant + LATTICE_DIM, cv_out + LATTICE_DIM, &idx_lead[1], &idx_scale[1], p_sigma + LATTICE_DIM, p_inv_sigma + LATTICE_DIM, p_scales + MAX_NO_SCALES, p_no_lead + MAX_NO_SCALES );
+
+        dist = L_add( dist, L_tmp );
+    }
+
+    return dist;
+}
+
+
+UWord32 index_lvq_SHB_fx(
+    const Word16 idx_lead,
+    const Word16 idx_scale,
+    const Word16 nbits,
+    Word16 *lat_cv,
+    const Word16 mode )
+{
+    UWord16 i;
+    const Word8 *p_no_lead;
+    UWord32 index;
+
+    IF( mode == 0 )
+    {
+        p_no_lead = &no_lead_BWE[( nbits - mslvq_SHB_min_bits[0] ) * 3];
+    }
+    ELSE
+    {
+        p_no_lead = &no_lead_BWE_3b[( nbits - mslvq_SHB_min_bits[1] ) * 3];
+    }
+
+    index = 0;
+    move32();
+    IF( GT_16( idx_lead, -1 ) )
+    {
+        index = 1;
+        move32();
+        FOR( i = 0; i < idx_scale; i++ )
+        {
+            index = index + table_no_cv[p_no_lead[i]];
+            move32();
+        }
+
+        IF( idx_lead > 0 )
+        {
+            index = index + table_no_cv[idx_lead];
+            move32();
+        }
+
+        index = index + encode_comb_fx( lat_cv, idx_lead );
+        move32();
+    }
+
+    return index;
+}
diff --git a/lib_enc/multi_harm.c b/lib_enc/multi_harm.c
deleted file mode 100644
index 7d23dd6f703552ed5f1af9f2941cf4dee9763f27..0000000000000000000000000000000000000000
--- a/lib_enc/multi_harm.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/multi_harm_fx.c b/lib_enc/multi_harm_fx.c
index 92666570c892508d994b40f50663f7fa1ded24c7..1bae597b6892428a06b6c83e1b0de38121329432 100644
--- a/lib_enc/multi_harm_fx.c
+++ b/lib_enc/multi_harm_fx.c
@@ -53,7 +53,7 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
     /* length of the useful part of the spectrum (up to 6.4kHz) */
     L = L_FFT / 2;
     move16();
-    if ( EQ_16( bwidth, NB ) )
+    if ( ( bwidth == NB ) )
     {
         /* length of the useful part of the spectrum (up to 3.6kHz) */
         L = 76;
@@ -170,14 +170,14 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
     mean_dyn = round_fx( L_acc );                             /*Q7*/
 
     test();
-    IF( LT_16( mean_dyn, 1229 ) /*9.6f*/ && *cor_strong_limit != 0 )
+    IF( LT_16( mean_dyn, 1229 ) /*9.6f.Q7*/ && *cor_strong_limit != 0 )
     {
         *cor_strong_limit = 0;
         move16();
         *st_last_sw_dyn = mean_dyn;
         move16();
     }
-    ELSE IF( GT_16( sub( mean_dyn, *st_last_sw_dyn ), 576 ) /*4.5f*/ )
+    ELSE IF( GT_16( sub( mean_dyn, *st_last_sw_dyn ), 576 ) /*4.5f.Q7*/ )
     {
         *cor_strong_limit = 1;
         move16();
@@ -212,11 +212,7 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
             IF( EQ_16( i, ind_mins[k] ) )
             {
                 /* include the last peak point (new minimum) to the corr. sum */
-#ifdef BASOP_NOGLOB
                 Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-                Lcory2 = L_mac( Lcory2, old_S[i], old_S[i] );
-#endif /* BASOP_NOGLOB */
 
                 /* calculation of the norm. peak correlation */
                 test();
@@ -242,11 +238,7 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
                     corxy = shl( corxy, cor );
                     /* cor = corxy * corxy / (corx2 * cory2) */
                     corxy = div_s( corxy, corx2 );
-#ifdef BASOP_NOGLOB
                     cor = shr_o( corxy, sub( shl( tmp16, 1 ), Expx2 ), &Overflow ); /* Q15 */
-#else                                                                               /* BASOP_NOGLOB */
-                    cor = shr( corxy, sub( shl( tmp16, 1 ), Expx2 ) ); /* Q15 */
-#endif                                                                              /* BASOP_NOGLOB */
                 }
                 ELSE
                 {
@@ -271,15 +263,9 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
 
                 k++;
             }
-#ifdef BASOP_NOGLOB
             Lcorx2 = L_mac_o( Lcorx2, S[i], S[i], &Overflow );
             Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
             Lcorxy = L_mac_o( Lcorxy, S[i], old_S[i], &Overflow );
-#else /* BASOP_NOGLOB */
-            Lcorx2 = L_mac( Lcorx2, S[i], S[i] );
-            Lcory2 = L_mac( Lcory2, old_S[i], old_S[i] );
-            Lcorxy = L_mac( Lcorxy, S[i], old_S[i] );
-#endif
         }
 
         Copy( S, old_S, ind_mins[0] );
@@ -304,7 +290,7 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
 
     cor_strong = 0;
     move16();
-    pt1 = cor_map_LT;
+    pt1 = cor_map_LT; // Q15
     move16();
     pt2 = cor_map;
     move16();
@@ -320,7 +306,7 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
         /* cor_map_LT_sum += *pt1 */
         Lcor_map_LT_sum = L_add( Lcor_map_LT_sum, *pt1 ); /* cor_map_LT_sum in Q15; max value is 128) */
 
-        if ( GT_16( *pt1, 31130 ) /*0.95f*/ )
+        if ( GT_16( *pt1, 31130 ) /*0.95f.Q15*/ )
         {
             cor_strong = 1;
             move16();
@@ -330,7 +316,7 @@ Word16 multi_harm_fx(                           /* o  : frame multi-harmonicity
         pt2++;
     }
 
-    IF( EQ_16( bwidth, NB ) )
+    IF( ( bwidth == NB ) )
     {
         /* cor_map_LT_sum *= 1.53f; */
         /* tmp2 *= 1.53f; */
@@ -393,6 +379,7 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
 {
     Word16 i, j, k, L, stemp, N_mins, ind_mins[L_FFT / 4], *pt_mins, harm;
     Word16 S[L_FFT / 2], flor, step, tmp16, tmp2, Expx2, Expy2;
+    Word32 tmp2_32;
     Word16 corx2, cory2, corxy, cor, cor_map[L_FFT / 2], *pt1, *pt2, cor_strong;
     Word32 L_acc;
     Word32 Lcorx2, Lcory2, Lcorxy, Lcor_map_LT_sum;
@@ -409,7 +396,7 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
     /* length of the useful part of the spectrum (up to 6.4kHz) */
     L = L_FFT / 2;
     move16();
-    if ( EQ_16( bwidth, NB ) )
+    if ( ( bwidth == NB ) )
     {
         /* length of the useful part of the spectrum (up to 3.6kHz) */
         L = 76;
@@ -562,11 +549,7 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
             IF( EQ_16( i, ind_mins[k] ) )
             {
                 /* include the last peak point (new minimum) to the corr. sum */
-#ifdef BASOP_NOGLOB
                 Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-                Lcory2 = L_mac( Lcory2, old_S[i], old_S[i] );
-#endif /* BASOP_NOGLOB */
 
                 /* calculation of the norm. peak correlation */
                 test();
@@ -592,11 +575,7 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
                     corxy = shl( corxy, cor );
                     /* cor = corxy * corxy / (corx2 * cory2) */
                     corxy = div_s( corxy, corx2 );
-#ifdef BASOP_NOGLOB
                     cor = shr_o( corxy, sub( shl( tmp16, 1 ), Expx2 ), &Overflow ); /* Q15 */
-#else                                                                               /* BASOP_NOGLOB */
-                    cor = shr( corxy, sub( shl( tmp16, 1 ), Expx2 ) ); /* Q15 */
-#endif                                                                              /* BASOP_NOGLOB */
                 }
                 ELSE
                 {
@@ -621,15 +600,9 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
 
                 k++;
             }
-#ifdef BASOP_NOGLOB
             Lcorx2 = L_mac_o( Lcorx2, S[i], S[i], &Overflow );
             Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
             Lcorxy = L_mac_o( Lcorxy, S[i], old_S[i], &Overflow );
-#else /* BASOP_NOGLOB */
-            Lcorx2 = L_mac( Lcorx2, S[i], S[i] );
-            Lcory2 = L_mac( Lcory2, old_S[i], old_S[i] );
-            Lcorxy = L_mac( Lcorxy, S[i], old_S[i] );
-#endif
         }
 
         Copy( S, old_S, ind_mins[0] );
@@ -649,7 +622,7 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
      *------------------------------------------------------------------*/
 
     Lcor_map_LT_sum = L_deposit_l( 0 );
-    tmp2 = 0;
+    tmp2_32 = 0;
     move16();
 
     cor_strong = 0;
@@ -661,7 +634,7 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
     FOR( i = 0; i < L; i++ )
     {
         /* tmp2 += S[i]; */
-        tmp2 = add( tmp2, shl( S[i], 1 ) ); /* tmp2 in Q8; max value is 128) */
+        tmp2_32 = L_add( tmp2_32, cor_map[i] ); /* tmp2_32 in Q15; max value is 128) */
 
         /* *pt1 = M_ALPHA_FX * *pt1 + (1-M_ALPHA_FX) * *pt2++ */
         *pt1 = mac_r( L_mult( ONE_MINUS_M_ALPHA, *pt2 ), M_ALPHA_FX, *pt1 );
@@ -679,8 +652,9 @@ Word16 multi_harm_ivas_fx(                           /* o  : frame multi-harmoni
         pt1++;
         pt2++;
     }
+    tmp2 = extract_l( L_shr_sat( tmp2_32, 7 ) ); // q15-> q8
 
-    IF( EQ_16( bwidth, NB ) )
+    IF( ( bwidth == NB ) )
     {
         /* cor_map_LT_sum *= 1.53f; */
         /* tmp2 *= 1.53f; */
diff --git a/lib_enc/nelp_enc.c b/lib_enc/nelp_enc.c
deleted file mode 100644
index d1de09bc73bcde0f9193c0b1d468183cb122cda9..0000000000000000000000000000000000000000
--- a/lib_enc/nelp_enc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/nelp_enc_fx.c b/lib_enc/nelp_enc_fx.c
index 259987bba43611a9f4c89041ea1a1ce51cc65533..39119117598387b0be7081d46dd47b4c72c5a87a 100644
--- a/lib_enc/nelp_enc_fx.c
+++ b/lib_enc/nelp_enc_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,7 +33,6 @@
 #include <stdint.h>
 #include "options.h"     /* Compilation switches */
 #include "cnst.h"        /* Common constants */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "rom_com.h"
@@ -115,6 +114,7 @@ void quantize_uvg_fx( Word16 *G, Word16 *iG1, Word16 *iG2, Word16 *quantG, Word1
             move16();                               /*(+1)=/2 in log */
             L_tmp = Mpy_32_16( exp, frac, 4932 );   /*Q16 ;  0.5*log10(2) in Q15 */
             G1[i] = round_fx( L_shl( L_tmp, 13 ) ); /*Q13 */
+            move16();
         }
         ELSE
         {
@@ -129,13 +129,8 @@ void quantize_uvg_fx( Word16 *G, Word16 *iG1, Word16 *iG2, Word16 *quantG, Word1
     move16();
     FOR( i = 0; i < UVG1_CBSIZE; i++ )
     {
-#ifdef BASOP_NOGLOB
         L16 = shr( sub_sat( G1[0], UVG1CB_fx[i][0] ), 1 );   /* Q12 */
         L16_1 = shr( sub_sat( G1[1], UVG1CB_fx[i][1] ), 1 ); /* Q12 */
-#else
-        L16 = shr( sub( G1[0], UVG1CB_fx[i][0] ), 1 );   /* Q12 */
-        L16_1 = shr( sub( G1[1], UVG1CB_fx[i][1] ), 1 ); /* Q12 */
-#endif
         Lacc = 0;
         Lacc = L_mac0( Lacc, L16, L16 );     /*Q24 */
         Lacc = L_mac0( Lacc, L16_1, L16_1 ); /*Q24       */
@@ -152,9 +147,10 @@ void quantize_uvg_fx( Word16 *G, Word16 *iG1, Word16 *iG2, Word16 *quantG, Word1
     L_tmp = L_shr( L_tmp, 10 );                   /* From Q26 to Q16 */
     frac = L_Extract_lc( L_tmp, &exp );           /* Extract exponent of L_tmp */
     L_tmp = Pow2( 30, frac );
-    exp = exp - 30; /*move16(); */
+    exp = exp - 30;
+    move16();
     Lexp[0] = L_shl( L_tmp, exp + 15 );
-
+    move32();
 
     L_tmp = L_mult0( UVG1CB_fx[*iG1][1], 27213 ); /*Q26 */
     L_tmp = L_shr( L_tmp, 10 );                   /* From Q26 to Q16 */
@@ -162,7 +158,7 @@ void quantize_uvg_fx( Word16 *G, Word16 *iG1, Word16 *iG2, Word16 *quantG, Word1
     L_tmp = Pow2( 30, frac );
     exp = exp - 30; /*move16(); */
     Lexp[1] = L_shl( L_tmp, exp + 15 );
-
+    move32();
 
     FOR( i = 0; i < 2; i++ )
     {
@@ -174,6 +170,7 @@ void quantize_uvg_fx( Word16 *G, Word16 *iG1, Word16 *iG2, Word16 *quantG, Word1
             tmp = div_s( 16384, tmp );                              /*Q(15+exp) */
             L_tmp = L_shr( L_mult0( G[i * 5 + j], tmp ), exp + 3 ); /*Q12 */
             G2[i * 5 + j] = extract_l( L_tmp );                     /*Q12 */
+            move16();
         }
     }
 
@@ -191,25 +188,15 @@ void quantize_uvg_fx( Word16 *G, Word16 *iG1, Word16 *iG2, Word16 *quantG, Word1
                 {
                     /*mse += SQR(G2[i*5+k]-UVG2CB1[j][k]); */
                     ind = add( shr( extract_l( L_mult( i, 5 ) ), 1 ), k );
-#ifdef BASOP_NOGLOB
                     temp = sub_sat( G2[ind], UVG2CB1_fx[j][k] );
                     Lacc = L_mac0_sat( Lacc, temp, temp ); /*Q24 */
-#else
-                    temp = sub( G2[ind], UVG2CB1_fx[j][k] );
-                    Lacc = L_mac0( Lacc, temp, temp ); /*Q24 */
-#endif
                 }
-                ELSE IF( i == 1 )
+                ELSE IF( EQ_16( i, 1 ) )
                 {
                     /*mse += SQR(G2[i*5+k]-UVG2CB2[j][k]); */
                     ind = add( shr( extract_l( L_mult( i, 5 ) ), 1 ), k );
-#ifdef BASOP_NOGLOB
                     temp = sub_sat( G2[ind], UVG2CB2_fx[j][k] );
                     Lacc = L_mac0_sat( Lacc, temp, temp ); /*Q24 */
-#else
-                    temp = sub( G2[ind], UVG2CB2_fx[j][k] );
-                    Lacc = L_mac0( Lacc, temp, temp );               /*Q24 */
-#endif
                 }
             }
 
@@ -256,6 +243,7 @@ static void normalize_arr( Word16 *arr, Word16 *qf, Word16 size, Word16 hdr )
     }
 
     *qf = norm_s( (Word16) max_s );
+    move16();
     test();
     IF( ( *qf == 0 ) && ( ( (Word16) max_s ) == 0 ) )
     {
@@ -264,7 +252,7 @@ static void normalize_arr( Word16 *arr, Word16 *qf, Word16 size, Word16 hdr )
     }
 
     *qf = *qf - hdr;
-
+    move16();
     FOR( i = 0; i < size; i++ )
     {
         arr[i] = shl( arr[i], *qf );
@@ -314,41 +302,72 @@ void nelp_encoder_fx(
 {
     Word16 i, j;
     Word16 *ptr_fx = exc_fx;
-    Word16 lag = 25;                   /* to cover 25*9 + 31 */
-    Word16 sqrt_inv_lag = 6554;        /* sqrt(1/lag) in Q15 */
+    Word16 lag = 25; /* to cover 25*9 + 31 */
+    move16();
+    Word16 sqrt_inv_lag = 6554; /* sqrt(1/lag) in Q15 */
+    move16();
     Word16 sqrt_inv_lframe_lag = 5885; /* sqrt(1/(L_FRAME-lag*9)) */
+    move16();
     Word16 Gains_fx[10], gain_fac_fx;
     Word16 iG1_fx, iG2_fx[2];
     Word16 fid;
     Word16 fdbck_fx;
     Word32 var_dB_fx;
     Word32 E1_fx = 0, EL1_fx = 0, EH1_fx = 0, E2_fx = 0, E3_fx = 0, EL2_fx = 0, EH2_fx = 0;
+    move32(); /*E1_fx*/
+    move32(); /*EL1_fx*/
+    move32(); /*EH1_fx*/
+    move32(); /*E2_fx*/
+    move32(); /*E3_fx*/
+    move32(); /*EL2_fx*/
+    move32(); /*EH2_fx*/
     Word32 RL_fx = 0, RH_fx = 0;
+    move32(); /*RL_fx*/
+    move32(); /*RH_fx*/
     Word16 R_fx = 0;
+    move16();
     Word16 filtRes_fx[L_FRAME];
     Word16 ptr_tmp_fx[L_FRAME];
 
     Word16 qE1 = 0, qE2 = 0, qE3 = 0, qEL1 = 0, qEL2 = 0, qEH1 = 0, qEH2 = 0;
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
     Word16 qIn = 0, qGain = 0, qf = 0, qf1 = 0, qNelpGain = 0;
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
     Word16 exp1, exp2, tmp1, tmp2;
     Word16 f_Noise, etmp, e_Noise;
     Word16 max1 = 0;
+    move16();
     Word32 l_nelp_gain_mem;
     Word32 Ltemp = 0, Ltemp1 = 0, L_tmp = 0, L_const_1;
+    move32();
+    move32();
+    move32();
     Word16 BP1_ORDER;
     Word16 rf_flag;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
     RF_ENC_HANDLE hRF = st_fx->hRF;
 
     rf_flag = st_fx->rf_mode;
-
+    move16();
     if ( EQ_16( hSC_VBR->last_nelp_mode, 1 ) && NE_16( st_fx->bwidth, st_fx->last_bwidth ) )
     {
         hSC_VBR->last_nelp_mode = 0;
+        move16();
     }
 
     qIn = *qIn1;
@@ -403,11 +422,7 @@ void nelp_encoder_fx(
         E1_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             E1_fx = L_mac0_o( E1_fx, in_fx[i], in_fx[i], &Overflow ); /*Q(qE1+qE1) */
-#else
-            E1_fx = L_mac0( E1_fx, in_fx[i], in_fx[i] );             /*Q(qE1+qE1) */
-#endif
         }
 
         qE1 = shl( qE1, 1 );
@@ -423,11 +438,7 @@ void nelp_encoder_fx(
         EL1_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EL1_fx = L_mac0_o( EL1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qIn) */
-#else
-            EL1_fx = L_mac0( EL1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qIn) */
-#endif
         }
         qEL1 = shl( qEL1, 1 );
 
@@ -443,11 +454,7 @@ void nelp_encoder_fx(
         EH1_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EH1_fx = L_mac0_o( EH1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qEH1) */
-#else
-            EH1_fx = L_mac0( EH1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH1) */
-#endif
         }
         qEH1 = 2 * qEH1;
         move16();
@@ -463,11 +470,7 @@ void nelp_encoder_fx(
         Ltemp = L_deposit_l( 0 );
         FOR( j = (Word16) ( i * lag ); j < (Word16) ( ( i + 1 ) * lag ); j++ )
         {
-#ifdef BASOP_NOGLOB
             Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#else
-            Ltemp = L_mac0( Ltemp, in_fx[j], in_fx[j] );             /*Q(2*qGain) */
-#endif
         }
 
         /*Gains[i] = (float) sqrt(Gains[i]/lag); */
@@ -481,28 +484,17 @@ void nelp_encoder_fx(
             L_tmp = L_deposit_h( tmp1 );
             L_tmp = Isqrt_lc( L_tmp, &exp1 );
             L_tmp = Mult_32_16( L_tmp, sqrt_inv_lag );
-#ifdef BASOP_NOGLOB
             Ltemp = L_shl_sat( L_tmp, sub( exp1, 12 ) ); /*Q3 */
-#else
-            Ltemp = L_shl( L_tmp, sub( exp1, 12 ) );                 /*Q3 */
-#endif
         }
-#ifdef BASOP_NOGLOB
         Gains_fx[i] = round_fx_sat( Ltemp );
-#else
-        Gains_fx[i] = round_fx( Ltemp );
-#endif
+        move16();
     }
 
 
     Ltemp = L_deposit_l( 0 );
     FOR( j = (Word16) ( i * lag ); j < L_FRAME; j++ )
     {
-#ifdef BASOP_NOGLOB
         Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#else
-        Ltemp = L_mac0( Ltemp, in_fx[j], in_fx[j] ); /*Q(2*qGain) */
-#endif
     }
 
     /*Gains[i] = (float) sqrt(Gains[i]/(L_FRAME-(lag*i))); */
@@ -516,23 +508,17 @@ void nelp_encoder_fx(
         L_tmp = L_deposit_h( tmp1 );
         L_tmp = Isqrt_lc( L_tmp, &exp1 );
         L_tmp = Mult_32_16( L_tmp, sqrt_inv_lframe_lag );
-#ifdef BASOP_NOGLOB
         Ltemp = L_shl_sat( L_tmp, sub( exp1, 12 ) );
-#else
-        Ltemp = L_shl( L_tmp, sub( exp1, 12 ) );
-#endif
     }
 
-#ifdef BASOP_NOGLOB
     Gains_fx[i] = round_fx_sat( Ltemp );
-#else
-    Gains_fx[i] = round_fx( Ltemp );
-#endif
+    move16();
     IF( EQ_16( reduce_gains, 1 ) )
     {
         FOR( i = 0; i < 10; i++ )
         {
             Gains_fx[i] = mult( Gains_fx[i], 19661 );
+            move16();
         }
     }
 
@@ -563,8 +549,7 @@ void nelp_encoder_fx(
     L_tmp = L_max( L_tmp, 1 );
     exp2 = norm_l( L_tmp );
     L_tmp = L_shl( L_tmp, exp2 ); /*15+qEL1-qEL2-exp1+exp2 */
-    exp2 = 30 - exp2 - qNelpGain;
-    move16();
+    exp2 = sub( 30, add( exp2, qNelpGain ) );
     tmp2 = Log2_norm_lc( L_tmp );
     Ltemp1 = Mpy_32_16( exp2, tmp2, 9864 ); /*log(2) in Q13 format = Q0 format */
     Ltemp1 = L_sub( Ltemp, Ltemp1 );        /*Q16 */
@@ -587,8 +572,7 @@ void nelp_encoder_fx(
         L_tmp = L_max( L_tmp, 1 );
         exp2 = norm_l( L_tmp );
         L_tmp = L_shl( L_tmp, exp2 ); /*15+qEL1-qEL2-exp1+exp2 */
-        exp2 = 30 - exp2 - qGain;
-        move16();
+        exp2 = sub( 30, add( exp2, qGain ) );
         tmp2 = Log2_norm_lc( L_tmp );
         Ltemp1 = Mpy_32_16( exp2, tmp2, 9864 ); /*log(2) in Q13 format = Q0 format */
         Ltemp1 = L_sub( Ltemp, Ltemp1 );        /*Q16 */
@@ -641,13 +625,8 @@ void nelp_encoder_fx(
 
         IF( e_Noise > 0 )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_sat( etmp, e_Noise ); /* Result in Q30 */
             L_tmp = L_add_sat( 1, L_tmp );
-#else
-            L_tmp = L_shl( etmp, e_Noise ); /* Result in Q30 */
-            L_tmp = L_add( 1, L_tmp );
-#endif
 
 
             exp1 = norm_l( L_tmp );
@@ -670,7 +649,7 @@ void nelp_encoder_fx(
         }
     }
 
-    IF( exp1 == 31 )
+    IF( EQ_16( exp1, 31 ) )
     {
         L_const_1 = 0x7fffffff;
         move32();
@@ -694,17 +673,13 @@ void nelp_encoder_fx(
         Ltemp1 = Mult_32_16( l_nelp_gain_mem, fdbck_fx );    /*exp1+qGain-15 */
         L_tmp = L_add( L_tmp, Ltemp1 );
         L_tmp = L_shr_r( L_tmp, ( exp1 - 15 ) );
-#ifdef BASOP_NOGLOB
         Gains_fx[i] = round_fx_sat( L_shl_sat( L_tmp, 16 ) );
-#else
-        Gains_fx[i] = round_fx( L_shl( L_tmp, 16 ) );
-#endif
         move16();
         l_nelp_gain_mem = L_tmp;
     }
 
     hSC_VBR->nelp_gain_mem_fx = round_fx( L_shl( l_nelp_gain_mem, 16 ) );
-
+    move16();
     Scale_sig( &hSC_VBR->nelp_gain_mem_fx, 1, -qGain );
     Scale_sig( Gains_fx, 10, -qGain );
     qGain = 0;
@@ -715,14 +690,17 @@ void nelp_encoder_fx(
     IF( EQ_16( rf_flag, 1 ) )
     {
         hRF->rf_indx_nelp_iG1[0] = iG1_fx;
+        move16();
         hRF->rf_indx_nelp_iG2[0][0] = iG2_fx[0];
+        move16();
         hRF->rf_indx_nelp_iG2[0][1] = iG2_fx[1];
+        move16();
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_IG1, iG1_fx, 5 );
-        push_indice_fx( hBstr, IND_IG2A, iG2_fx[0], 6 );
-        push_indice_fx( hBstr, IND_IG2B, iG2_fx[1], 6 );
+        push_indice( hBstr, IND_IG1, iG1_fx, 5 );
+        push_indice( hBstr, IND_IG2A, iG2_fx[0], 6 );
+        push_indice( hBstr, IND_IG2B, iG2_fx[1], 6 );
     }
 
     test();
@@ -746,6 +724,7 @@ void nelp_encoder_fx(
     IF( EQ_16( st_fx->bwidth, WB ) || EQ_16( st_fx->bwidth, SWB ) )
     {
         BP1_ORDER = 4;
+        move16();
         Scale_sig( hSC_VBR->bp1_filt_mem_wb_fx, BP1_ORDER * 2, qGain - hSC_VBR->qprevGain_fx ); /*qf-qAdj */
         pz_filter_sp_fx( bp1_num_coef_wb_fx, bp1_den_coef_wb_fx, ptr_fx, ptr_tmp_fx, hSC_VBR->bp1_filt_mem_wb_fx, BP1_ORDER, BP1_ORDER, L_FRAME, 2 );
         Copy( ptr_tmp_fx, ptr_fx, L_FRAME );
@@ -760,21 +739,18 @@ void nelp_encoder_fx(
 
         Scale_sig( ptr_fx, L_FRAME, -1 ); /* bring exc to qgain-1         */
         *qIn1 = qGain - 1;                /* use this temp only in the parent */
+        move16();
     }
 
     E3_fx = L_deposit_l( 0 );
     FOR( i = 0; i < L_FRAME; i++ )
     {
-#ifdef BASOP_NOGLOB
         E3_fx = L_mac_sat( E3_fx, ptr_fx[i], ptr_fx[i] ); /*Q1 */
-#else
-        E3_fx = L_mac( E3_fx, ptr_fx[i], ptr_fx[i] ); /*Q1 */
-#endif
     }
     qE3 = 2 * qGain + 1;
     move16();
     test();
-    IF( st_fx->bwidth == WB || EQ_16( st_fx->bwidth, SWB ) )
+    IF( EQ_16( st_fx->bwidth, WB ) || EQ_16( st_fx->bwidth, SWB ) )
     {
         Scale_sig( hSC_VBR->shape1_filt_mem_fx, 10, ( qGain - hSC_VBR->qprevGain_fx ) );
         pz_filter_sp_fx( shape1_num_coef_fx, shape1_den_coef_fx, ptr_fx, ptr_tmp_fx, hSC_VBR->shape1_filt_mem_fx, 10, 10, L_FRAME, 1 ); /*1 = (16-qformat of shape1 cofficient) */
@@ -831,11 +807,8 @@ void nelp_encoder_fx(
         {
             Ltemp = L_mult0( R_fx, ptr_fx[i] );
             Ltemp = L_shr_r( Ltemp, exp1 );
-#ifdef BASOP_NOGLOB
             filtRes_fx[i] = round_fx_sat( L_shl_sat( Ltemp, 16 ) );
-#else
-            filtRes_fx[i] = round_fx( L_shl( Ltemp, 16 ) );
-#endif
+            move16();
         }
 
         qf1 = qGain;
@@ -850,11 +823,7 @@ void nelp_encoder_fx(
         EL2_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EL2_fx = L_mac0_sat( EL2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEL2) */
-#else
-            EL2_fx = L_mac0( EL2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEL2) */
-#endif
         }
         qEL2 = 2 * qEL2;
         move16();
@@ -863,11 +832,8 @@ void nelp_encoder_fx(
         {
             Ltemp = L_mult0( R_fx, ptr_fx[i] );
             Ltemp = L_shr_r( Ltemp, exp1 );
-#ifdef BASOP_NOGLOB
             filtRes_fx[i] = round_fx_sat( L_shl_sat( Ltemp, 16 ) );
-#else
-            filtRes_fx[i] = round_fx( L_shl( Ltemp, 16 ) );
-#endif
+            move16();
         }
 
         qf = qGain;
@@ -882,11 +848,7 @@ void nelp_encoder_fx(
         EH2_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EH2_fx = L_mac0_sat( EH2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH2) */
-#else
-            EH2_fx = L_mac0( EH2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH2) */
-#endif
         }
         qEH2 = 2 * qEH2;
         move16();
@@ -894,15 +856,10 @@ void nelp_encoder_fx(
         {
             exp2 = norm_l( EL1_fx );
             L_tmp = L_shl( EL1_fx, exp2 );
-            exp2 = 30 - exp2 - qEL1;
-            move16();
+            exp2 = sub( 30, add( exp2, qEL1 ) );
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q15 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q15 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RL_fx = L_mult0( tmp1, 10 );
         }
         ELSE
@@ -913,16 +870,11 @@ void nelp_encoder_fx(
             L_tmp = Mult_32_16( EL1_fx, tmp1 );        /*qEL1+30-qEL2-exp1-15=>15+qE1-qEL2-exp1 */
 
             exp2 = norm_l( L_tmp );
-            L_tmp = L_shl( L_tmp, exp2 ); /*15+qEL1-qEL2-exp1+exp2 */
-            exp2 = 30 - ( 30 + qEL1 - qEL2 - exp1 + exp2 );
-            move16();
+            L_tmp = L_shl( L_tmp, exp2 );                       /*15+qEL1-qEL2-exp1+exp2 */
+            exp2 = sub( add( qEL2, exp1 ), add( qEL1, exp2 ) ); /*30 - ( 30 + qEL1 - qEL2 - exp1 + exp2 )*/
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q15 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q15 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RL_fx = L_mult0( tmp1, 10 );
         }
 
@@ -930,15 +882,10 @@ void nelp_encoder_fx(
         {
             exp2 = norm_l( EH2_fx );
             L_tmp = L_shl( EH2_fx, exp2 );
-            exp2 = 30 - exp2 - qEH2;
-            move16();
+            exp2 = sub( 30, add( exp2, qEH2 ) );
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q13 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q13 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RH_fx = L_mult0( tmp1, 10 );
         }
         ELSE
@@ -949,16 +896,11 @@ void nelp_encoder_fx(
             L_tmp = Mult_32_16( EH1_fx, tmp1 );        /*15+qEH1-qEH2-exp1 */
 
             exp2 = norm_l( L_tmp );
-            L_tmp = L_shl( L_tmp, exp2 ); /*15+qEH1-qEH2-exp1+exp2 */
-            exp2 = 30 - ( 30 + qEH1 - qEH2 - exp1 + exp2 );
-            move16();
+            L_tmp = L_shl( L_tmp, exp2 );                       /*15+qEH1-qEH2-exp1+exp2 */
+            exp2 = sub( add( qEH2, exp1 ), add( qEH1, exp2 ) ); /*30 - ( 30 + qEH1 - qEH2 - exp1 + exp2 )*/
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q13 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q13 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RH_fx = L_mult0( tmp1, 10 );
         }
 
@@ -1051,12 +993,11 @@ void nelp_encoder_fx(
                 L_tmp = Mult_32_16( E2_fx, tmp1 );        /*qE2+30-qE3-exp1-15=>15+qE2-qE3-exp1 */
 
                 exp2 = norm_l( L_tmp );
-                L_tmp = L_shl( L_tmp, exp2 ); /*15+qE2-qE3-exp1+exp2 */
-                exp2 = 30 - ( 15 + qE2 - qE3 - exp1 + exp2 );
-                move16();
-                L_tmp = Isqrt_lc( L_tmp, &exp2 ); /*Q(31+exp2) */
+                L_tmp = L_shl( L_tmp, exp2 );                                /*15+qE2-qE3-exp1+exp2 */
+                exp2 = add( 15, sub( add( qE3, exp1 ), add( qE2, exp2 ) ) ); /*30 - ( 15 + qE2 - qE3 - exp1 + exp2 )*/
+                L_tmp = Isqrt_lc( L_tmp, &exp2 );                            /*Q(31+exp2) */
                 R_fx = round_fx( L_tmp );
-                exp1 = 31 - exp2 - 16 - 7;
+                exp1 = sub( 8, exp2 ); /*31 - exp2 - 16 - 7*/
                 move16();
             }
 
@@ -1065,6 +1006,7 @@ void nelp_encoder_fx(
                 L_tmp = L_mult0( R_fx, ptr_fx[i] );
                 L_tmp = L_shr_r( L_tmp, exp1 + 1 );
                 ptr_fx[i] = round_fx( L_shl( L_tmp, 16 ) );
+                move16();
             }
             *qIn1 = qGain - 1;
             move16();
@@ -1077,7 +1019,7 @@ void nelp_encoder_fx(
         }
         ELSE
         {
-            push_indice_fx( hBstr, IND_NELP_FID, fid, 2 );
+            push_indice( hBstr, IND_NELP_FID, fid, 2 );
         }
     }
 
@@ -1202,7 +1144,7 @@ void nelp_encoder_ivas_fx(
     IF( NE_16( hSC_VBR->last_nelp_mode, 1 ) )
     {
         test();
-        IF( st_fx->bwidth == WB || EQ_16( st_fx->bwidth, SWB ) )
+        IF( EQ_16( st_fx->bwidth, WB ) || EQ_16( st_fx->bwidth, SWB ) )
         {
             set16_fx( hSC_VBR->shape1_filt_mem_fx, 0, 10 );
             set16_fx( hSC_VBR->shape2_filt_mem_fx, 0, 10 );
@@ -1227,11 +1169,7 @@ void nelp_encoder_ivas_fx(
         E1_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             E1_fx = L_mac0_o( E1_fx, in_fx[i], in_fx[i], &Overflow ); /*Q(qE1+qE1) */
-#else
-            E1_fx = L_mac0( E1_fx, in_fx[i], in_fx[i] );             /*Q(qE1+qE1) */
-#endif
         }
 
         qE1 = shl( qE1, 1 );
@@ -1246,11 +1184,7 @@ void nelp_encoder_ivas_fx(
         EL1_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EL1_fx = L_mac0_o( EL1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qIn) */
-#else
-            EL1_fx = L_mac0( EL1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qIn) */
-#endif
         }
         qEL1 = shl( qEL1, 1 );
 
@@ -1266,11 +1200,7 @@ void nelp_encoder_ivas_fx(
         EH1_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EH1_fx = L_mac0_o( EH1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qEH1) */
-#else
-            EH1_fx = L_mac0( EH1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH1) */
-#endif
         }
         qEH1 = shl( qEH1, 1 );
         move16();
@@ -1279,18 +1209,13 @@ void nelp_encoder_ivas_fx(
     qGain = qIn;
     move16();
     qGain = shl( qGain, 1 );
-    move16();
 
     FOR( i = 0; i < 9; i++ )
     {
         Ltemp = L_deposit_l( 0 );
         FOR( j = (Word16) ( i * lag ); j < (Word16) ( ( i + 1 ) * lag ); j++ )
         {
-#ifdef BASOP_NOGLOB
             Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#else
-            Ltemp = L_mac0( Ltemp, in_fx[j], in_fx[j] );             /*Q(2*qGain) */
-#endif
         }
 
         /*Gains[i] = (float) sqrt(Gains[i]/lag); */
@@ -1304,17 +1229,9 @@ void nelp_encoder_ivas_fx(
             L_tmp = L_deposit_h( tmp1 );
             L_tmp = Isqrt_lc( L_tmp, &exp1 );
             L_tmp = Mult_32_16( L_tmp, sqrt_inv_lag );
-#ifdef BASOP_NOGLOB
             Ltemp = L_shl_sat( L_tmp, sub( exp1, 12 ) ); /*Q3 */
-#else
-            Ltemp = L_shl( L_tmp, sub( exp1, 12 ) );                 /*Q3 */
-#endif
         }
-#ifdef BASOP_NOGLOB
         Gains_fx[i] = round_fx_sat( Ltemp );
-#else
-        Gains_fx[i] = round_fx( Ltemp );
-#endif
         move16();
     }
 
@@ -1322,11 +1239,7 @@ void nelp_encoder_ivas_fx(
     Ltemp = L_deposit_l( 0 );
     FOR( j = i_mult( i, lag ); j < L_FRAME; j++ )
     {
-#ifdef BASOP_NOGLOB
         Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#else
-        Ltemp = L_mac0( Ltemp, in_fx[j], in_fx[j] ); /*Q(2*qGain) */
-#endif
     }
 
     /*Gains[i] = (float) sqrt(Gains[i]/(L_FRAME-(lag*i))); */
@@ -1340,18 +1253,10 @@ void nelp_encoder_ivas_fx(
         L_tmp = L_deposit_h( tmp1 );
         L_tmp = Isqrt_lc( L_tmp, &exp1 );
         L_tmp = Mult_32_16( L_tmp, sqrt_inv_lframe_lag );
-#ifdef BASOP_NOGLOB
         Ltemp = L_shl_sat( L_tmp, sub( exp1, 12 ) );
-#else
-        Ltemp = L_shl( L_tmp, sub( exp1, 12 ) );
-#endif
     }
 
-#ifdef BASOP_NOGLOB
     Gains_fx[i] = round_fx_sat( Ltemp );
-#else
-    Gains_fx[i] = round_fx( Ltemp );
-#endif
     move16();
 
     IF( EQ_16( reduce_gains, 1 ) )
@@ -1464,13 +1369,8 @@ void nelp_encoder_ivas_fx(
 
         IF( e_Noise > 0 )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_sat( etmp, e_Noise ); /* Result in Q30 */
             L_tmp = L_add_sat( 1, L_tmp );
-#else
-            L_tmp = L_shl( etmp, e_Noise ); /* Result in Q30 */
-            L_tmp = L_add( 1, L_tmp );
-#endif
 
 
             exp1 = norm_l( L_tmp );
@@ -1517,11 +1417,7 @@ void nelp_encoder_ivas_fx(
         Ltemp1 = Mult_32_16( l_nelp_gain_mem, fdbck_fx );    /*exp1+qGain-15 */
         L_tmp = L_add( L_tmp, Ltemp1 );
         L_tmp = L_shr_r( L_tmp, ( exp1 - 15 ) );
-#ifdef BASOP_NOGLOB
         Gains_fx[i] = round_fx_sat( L_shl_sat( L_tmp, 16 ) );
-#else
-        Gains_fx[i] = round_fx( L_shl( L_tmp, 16 ) );
-#endif
         move16();
         l_nelp_gain_mem = L_tmp;
     }
@@ -1593,11 +1489,7 @@ void nelp_encoder_ivas_fx(
     E3_fx = L_deposit_l( 0 );
     FOR( i = 0; i < L_FRAME; i++ )
     {
-#ifdef BASOP_NOGLOB
         E3_fx = L_mac_sat( E3_fx, ptr_fx[i], ptr_fx[i] ); /*Q1 */
-#else
-        E3_fx = L_mac( E3_fx, ptr_fx[i], ptr_fx[i] ); /*Q1 */
-#endif
     }
     qE3 = add( shl( qGain, 1 ), 1 );
 
@@ -1656,11 +1548,7 @@ void nelp_encoder_ivas_fx(
         {
             Ltemp = L_mult0( R_fx, ptr_fx[i] );
             Ltemp = L_shr_r( Ltemp, exp1 );
-#ifdef BASOP_NOGLOB
             filtRes_fx[i] = round_fx_sat( L_shl_sat( Ltemp, 16 ) );
-#else
-            filtRes_fx[i] = round_fx( L_shl( Ltemp, 16 ) );
-#endif
             move16();
         }
 
@@ -1676,11 +1564,7 @@ void nelp_encoder_ivas_fx(
         EL2_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EL2_fx = L_mac0_sat( EL2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEL2) */
-#else
-            EL2_fx = L_mac0( EL2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEL2) */
-#endif
         }
         qEL2 = shl( qEL2, 1 );
 
@@ -1688,11 +1572,7 @@ void nelp_encoder_ivas_fx(
         {
             Ltemp = L_mult0( R_fx, ptr_fx[i] );
             Ltemp = L_shr_r( Ltemp, exp1 );
-#ifdef BASOP_NOGLOB
             filtRes_fx[i] = round_fx_sat( L_shl_sat( Ltemp, 16 ) );
-#else
-            filtRes_fx[i] = round_fx( L_shl( Ltemp, 16 ) );
-#endif
             move16();
         }
 
@@ -1708,11 +1588,7 @@ void nelp_encoder_ivas_fx(
         EH2_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L_FRAME; i++ )
         {
-#ifdef BASOP_NOGLOB
             EH2_fx = L_mac0_sat( EH2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH2) */
-#else
-            EH2_fx = L_mac0( EH2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH2) */
-#endif
         }
         qEH2 = shl( qEH2, 1 );
         IF( EL2_fx == 0 )
@@ -1721,12 +1597,8 @@ void nelp_encoder_ivas_fx(
             L_tmp = L_shl( EL1_fx, exp2 );
             exp2 = sub( sub( 30, exp2 ), qEL1 );
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q15 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q15 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RL_fx = L_mult0( tmp1, 10 );
         }
         ELSE
@@ -1740,12 +1612,8 @@ void nelp_encoder_ivas_fx(
             L_tmp = L_shl( L_tmp, exp2 ); /*15+qEL1-qEL2-exp1+exp2 */
             exp2 = sub( 30, add( sub( sub( add( 30, qEL1 ), qEL2 ), exp1 ), exp2 ) );
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q15 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q15 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RL_fx = L_mult0( tmp1, 10 );
         }
 
@@ -1755,12 +1623,8 @@ void nelp_encoder_ivas_fx(
             L_tmp = L_shl( EH2_fx, exp2 );
             exp2 = sub( sub( 30, exp2 ), qEH2 );
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q13 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q13 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RH_fx = L_mult0( tmp1, 10 );
         }
         ELSE
@@ -1774,12 +1638,8 @@ void nelp_encoder_ivas_fx(
             L_tmp = L_shl( L_tmp, exp2 ); /*15+qEH1-qEH2-exp1+exp2 */
             exp2 = sub( 30, add( 30, add( sub( sub( qEH1, qEH2 ), exp1 ), exp2 ) ) );
             tmp1 = Log2_norm_lc( L_tmp );
-            Ltemp = Mpy_32_16( exp2, tmp1, 9864 ); /*10*log(2) in Q13 format = Q0 format */
-#ifdef BASOP_NOGLOB
+            Ltemp = Mpy_32_16( exp2, tmp1, 9864 );         /*10*log(2) in Q13 format = Q0 format */
             tmp1 = round_fx_sat( L_shl_sat( Ltemp, 12 ) ); /* Q12 */
-#else
-            tmp1 = round_fx( L_shl( Ltemp, 12 ) );                   /* Q12 */
-#endif
             RH_fx = L_mult0( tmp1, 10 );
         }
 
@@ -1884,8 +1744,10 @@ void nelp_encoder_ivas_fx(
                 L_tmp = L_mult0( R_fx, ptr_fx[i] );
                 L_tmp = L_shr_r( L_tmp, exp1 + 1 );
                 ptr_fx[i] = round_fx( L_shl( L_tmp, 16 ) );
+                move16();
             }
             *qIn1 = sub( qGain, 1 );
+            move16();
         }
 
         IF( EQ_16( rf_flag, 1 ) )
diff --git a/lib_enc/nois_est.c b/lib_enc/nois_est.c
deleted file mode 100644
index 370e0aeef76d707062c56fbeca491edfb15a05aa..0000000000000000000000000000000000000000
--- a/lib_enc/nois_est.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-----------------------------------------------------------------*
- * Local constants
- *-----------------------------------------------------------------*/
diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c
index baf825e711e0d58d716e417c672083b5a9705f31..4f178214f47fe7d14821c7cdc9739a2c2de1a37f 100644
--- a/lib_enc/nois_est_fx.c
+++ b/lib_enc/nois_est_fx.c
@@ -90,13 +90,10 @@ static Word16 noise_est_ln_q8_fx(
     Word32 L_tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
-#ifdef BASOP_NOGLOB
     L_tmp = L_add_o( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ), &Overflow ); /*  +1.0f */
-#else                                                                              /* BASOP_NOGLOB */
-    L_tmp = L_add( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ) ); /*  +1.0f */
-#endif                                                                             /* BASOP_NOGLOB */
     if ( flag_add1p0 == 0 )
     {
         L_tmp = L_add( L_enr, 0 ); /* +0 , no offset */
@@ -192,15 +189,14 @@ void noise_est_init_fx(
     hNoiseEst->ave_enr_q = Q7;
     move16();
 
-    move16();
     hNoiseEst->totalNoise_fx = 0;
     move16();
     hNoiseEst->first_noise_updt = 0;
-    // hNoiseEst->first_noise_updt_cnt_fx = 0;  IVAS_CODE ??
     move16();
 
     hNoiseEst->aEn = 6;
-    // hNoiseEst->aEn_inac_cnt = 0;  IVAS_CODE
+    move16();
+    hNoiseEst->aEn_inac_cnt = 0;
     move16();
 
     hNoiseEst->harm_cor_cnt = 0;
@@ -221,7 +217,8 @@ void noise_est_init_fx(
 
     hNoiseEst->Etot_st_est_fx = 5120;    /* 20.0f in Q8 */
     hNoiseEst->Etot_sq_st_est_fx = 1600; /* 400 in Q2 */
-                                         //###
+    move16();
+    move16();
 
     hNoiseEst->epsP_0_2_lp_fx = 4096; /*1.0 Q12*/
     move16();
@@ -248,7 +245,7 @@ void noise_est_init_fx(
     hNoiseEst->noise_char_fx = 0;
     move16();
     hNoiseEst->multi_harm_limit_fx = THR_CORR_INIT_FX;
-
+    move16();
     hNoiseEst->Etot_lp_fx = 0;
     hNoiseEst->Etot_h_fx = 0;
     hNoiseEst->Etot_l_fx = 0;
@@ -272,16 +269,7 @@ void noise_est_init_ivas_fx(
 )
 {
     Word16 i;
-#ifdef IVAS_FLOAT_FIXED_CONVERSIONS
-    hNoiseEst->first_noise_updt = 0;
-    hNoiseEst->first_noise_updt_cnt = 0;
 
-    hNoiseEst->aEn = 6;
-    hNoiseEst->aEn_inac_cnt = 0;
-    hNoiseEst->harm_cor_cnt = 0;
-    hNoiseEst->bg_cnt = 0;
-    hNoiseEst->low_tn_track_cnt = 0;
-#endif
     FOR( i = 0; i < NB_BANDS; i++ )
     {
         hNoiseEst->fr_bands1_fx[i] = 1;
@@ -310,13 +298,14 @@ void noise_est_init_ivas_fx(
     hNoiseEst->totalNoise_fx = 0;
     move16();
     hNoiseEst->first_noise_updt = 0;
-    // hNoiseEst->first_noise_updt_cnt_fx = 0;  IVAS_CODE ??
+    move16();
+    hNoiseEst->first_noise_updt_cnt = 0;
     move16();
 
     hNoiseEst->aEn = 6;
-    // hNoiseEst->aEn_inac_cnt = 0;  IVAS_CODE
     move16();
-
+    hNoiseEst->aEn_inac_cnt = 0;
+    move16();
     hNoiseEst->harm_cor_cnt = 0;
     move16();
     hNoiseEst->bg_cnt = 0;
@@ -335,8 +324,12 @@ void noise_est_init_ivas_fx(
 
     hNoiseEst->Etot_st_est_fx = 5120;    /* 20.0f in Q8 */
     hNoiseEst->Etot_sq_st_est_fx = 1600; /* 400 in Q2 */
-                                         //###
-
+    move16();
+    move16();
+    hNoiseEst->L_Etot_st_est_fx = 167772160;   /* 20.0f in Q23 */
+    hNoiseEst->L_Etot_sq_st_est_fx = 26214400; /* 400 in Q16 */
+    move32();
+    move32();
     hNoiseEst->epsP_0_2_lp_fx = 4096; /*1.0 Q12*/
     move16();
     hNoiseEst->epsP_0_2_ad_lp_fx = 0;
@@ -362,21 +355,21 @@ void noise_est_init_ivas_fx(
     hNoiseEst->noise_char_fx = 0;
     move16();
     hNoiseEst->multi_harm_limit_fx = THR_CORR_INIT_FX;
-
+    move16();
     hNoiseEst->Etot_lp_fx = 0;
     hNoiseEst->Etot_h_fx = 0;
     hNoiseEst->Etot_l_fx = 0;
-    hNoiseEst->Etot_l_lp_fx = 0;
-    hNoiseEst->Etot_last_fx = 0;
-    hNoiseEst->Etot_v_h2_fx = 0;
+    hNoiseEst->Etot_l_lp_32fx = 0;
+    hNoiseEst->Etot_last_32fx = 0;
+    hNoiseEst->Etot_v_h2_32fx = 0;
     hNoiseEst->sign_dyn_lp_fx = 0;
     move16();
     move16();
     move16();
     move16();
-    move16();
-    move16();
-    move16();
+    move32();
+    move32();
+    move32();
 
     return;
 }
@@ -387,12 +380,12 @@ void noise_est_init_ivas_fx(
  *-----------------------------------------------------------------*/
 
 void noise_est_pre_fx(
-    const Word16 Etot,              /* i  : Energy of current frame     */
-    const Word16 ini_frame_fx,      /* i  : Frame number (init)         */
-    NOISE_EST_HANDLE hNoiseEst,     /* i/o: Noise estimation handle     */
-    const int16_t idchan,           /* i  : channel ID                  */
-    const int16_t element_mode,     /* i  : element mode                */
-    const int16_t last_element_mode /* i  : last element mode           */
+    const Word16 Etot,             /* i  : Energy of current frame     */
+    const Word16 ini_frame_fx,     /* i  : Frame number (init)         */
+    NOISE_EST_HANDLE hNoiseEst,    /* i/o: Noise estimation handle     */
+    const Word16 idchan,           /* i  : channel ID                  */
+    const Word16 element_mode,     /* i  : element mode                */
+    const Word16 last_element_mode /* i  : last element mode           */
 )
 {
     Word16 tmp;
@@ -459,7 +452,8 @@ void noise_est_pre_fx(
         }
 
         hNoiseEst->Etot_l_fx = s_min( hNoiseEst->Etot_l_fx, Etot );
-
+        move16();
+        test();
         IF( LT_16( ini_frame_fx, 100 ) && LT_16( hNoiseEst->Etot_l_fx, hNoiseEst->Etot_l_lp_fx ) )
         {
             /**Etot_l_lp = 0.1f * *Etot_l + (1.0f - 0.1) * *Etot_l_lp; */
@@ -482,10 +476,12 @@ void noise_est_pre_fx(
             {
                 /*  *Etot_l_lp = 0.02f * *Etot_l + (1.0f - 0.02f) * *Etot_l_lp; */
                 hNoiseEst->Etot_l_lp_fx = round_fx( L_mac( L_mult( 655, hNoiseEst->Etot_l_fx ), 32113, hNoiseEst->Etot_l_lp_fx ) );
+                move16();
             }
         }
         /**sign_dyn_lp = 0.1f * (*Etot_h - *Etot_l) + (1.0f - 0.1f) * *sign_dyn_lp;*/
         hNoiseEst->sign_dyn_lp_fx = round_fx( L_mac( L_mult( 3277, sub_sat( hNoiseEst->Etot_h_fx, hNoiseEst->Etot_l_fx ) ), 29491, hNoiseEst->sign_dyn_lp_fx ) );
+        move16();
     }
 
     return;
@@ -514,12 +510,12 @@ void noise_est_pre_32fx(
         move32();
         Etot_l_32fx = Etot;
         move32();
-        hNoiseEst->Etot_l_lp_fx = extract_h( Etot ); // Q8
-        move16();
-        hNoiseEst->Etot_last_fx = extract_h( Etot ); // Q8
-        move16();
-        hNoiseEst->Etot_v_h2_fx = 0;
-        move16();
+        hNoiseEst->Etot_l_lp_32fx = Etot; // Q24
+        move32();
+        hNoiseEst->Etot_last_32fx = Etot; // Q24
+        move32();
+        hNoiseEst->Etot_v_h2_32fx = 0;
+        move32();
         Etot_lp_32fx = Etot;
         move32();
         hNoiseEst->sign_dyn_lp_fx = 0;
@@ -542,20 +538,20 @@ void noise_est_pre_32fx(
             )
             {
                 /* *Etot_l += min(2,(*Etot_last-*Etot_l)*0.1f); */
-                tmp = Mpy_32_32( L_sub( L_deposit_h( hNoiseEst->Etot_last_fx ), Etot_l_32fx ), 214748365 ); /* 0.1f factor in Q31 */
-                tmp = L_min( 33554432, tmp );                                                               /* 2.0 in Q24 is 33554432 */
-                Etot_l_32fx = L_add( Etot_l_32fx, tmp );                                                    /* Q24 */
+                tmp = Mpy_32_32( L_sub( ( hNoiseEst->Etot_last_32fx ), Etot_l_32fx ), 214748365 ); /* 0.1f factor in Q31 */
+                tmp = L_min( 33554432, tmp );                                                      /* 2.0 in Q24 is 33554432 */
+                Etot_l_32fx = L_add( Etot_l_32fx, tmp );                                           /* Q24 */
             }
 
             /* Avoids large steps in short active segments */
             test();
-            IF( ( GT_32( L_sub( L_deposit_h( hNoiseEst->Etot_last_fx ), Etot_l_32fx ), 503316480 ) ) /* 30.0f*Q24 */
+            IF( ( GT_32( L_sub( hNoiseEst->Etot_last_32fx, Etot_l_32fx ), 503316480 ) ) /* 30.0f*Q24 */
                 && ( GT_16( hNoiseEst->harm_cor_cnt, HE_LT_CNT_PRE_SHORT_FX ) ) )
             {
                 /* *Etot_l += (*Etot_last-*Etot_l)*0.02f; */
-                Etot_l_32fx = L_add( Etot_l_32fx, Mpy_32_32( L_sub( L_deposit_h( hNoiseEst->Etot_last_fx ), Etot_l_32fx ), 42949673 ) ); /* 0.02 in Q24*/
+                Etot_l_32fx = L_add( Etot_l_32fx, Mpy_32_32( L_sub( hNoiseEst->Etot_last_32fx, Etot_l_32fx ), 42949673 ) ); /* 0.02 in Q24*/
             }
-            ELSE IF( GT_32( L_sub( L_deposit_h( hNoiseEst->Etot_last_fx ), Etot_l_32fx ), 167772160 ) ) /* 10.0 in Q24*/
+            ELSE IF( GT_32( L_sub( hNoiseEst->Etot_last_32fx, Etot_l_32fx ), 167772160 ) ) /* 10.0 in Q24*/
             {
                 Etot_l_32fx = L_add( Etot_l_32fx, 1342177 ); /* 0.08 in Q24*/
             }
@@ -564,10 +560,10 @@ void noise_est_pre_32fx(
         Etot_l_32fx = L_min( Etot_l_32fx, Etot ); // Q24
 
         test();
-        IF( LT_16( ini_frame_fx, 100 ) && LT_32( Etot_l_32fx, L_deposit_h( hNoiseEst->Etot_l_lp_fx ) ) )
+        IF( LT_16( ini_frame_fx, 100 ) && LT_32( Etot_l_32fx, ( hNoiseEst->Etot_l_lp_32fx ) ) )
         {
             /**Etot_l_lp = 0.1f * *Etot_l + (1.0f - 0.1) * *Etot_l_lp; */
-            hNoiseEst->Etot_l_lp_fx = extract_h( L_add( Mpy_32_32( 214748364 /* 0.1f in  Q31*/, Etot_l_32fx ), Mpy_32_32( 1932735283 /* 0.9f in  Q31*/, L_deposit_h( hNoiseEst->Etot_l_lp_fx ) ) ) ); // Q8
+            hNoiseEst->Etot_l_lp_32fx = W_round64_L( W_add( W_mult_32_32( 214748364 /* 0.1f in  Q31*/, Etot_l_32fx ), W_mult_32_32( 1932735283 /* 0.9f in  Q31*/, hNoiseEst->Etot_l_lp_32fx ) ) ); // Q8
             move16();
         }
         ELSE
@@ -576,16 +572,16 @@ void noise_est_pre_32fx(
             test();
             test();
             test();
-            IF( ( ( GT_16( hNoiseEst->harm_cor_cnt, HE_LT_CNT_FX ) ) && ( GT_32( L_sub_sat( L_deposit_h( hNoiseEst->Etot_last_fx ), Etot_l_32fx ), HE_LT_THR2_Q24 ) ) ) || ( ( sub( hNoiseEst->harm_cor_cnt, HE_LT_CNT_FX ) > 0 ) && ( LT_16( ini_frame_fx, HE_LT_CNT_INIT_FX ) ) ) || ( GT_32( L_sub_sat( L_deposit_h( hNoiseEst->Etot_l_lp_fx ), Etot_l_32fx ), HE_LT_THR2_Q24 ) ) )
+            IF( ( ( GT_16( hNoiseEst->harm_cor_cnt, HE_LT_CNT_FX ) ) && ( GT_32( L_sub_sat( hNoiseEst->Etot_last_32fx, Etot_l_32fx ), HE_LT_THR2_Q24 ) ) ) || ( ( sub( hNoiseEst->harm_cor_cnt, HE_LT_CNT_FX ) > 0 ) && ( LT_16( ini_frame_fx, HE_LT_CNT_INIT_FX ) ) ) || ( GT_32( L_sub_sat( hNoiseEst->Etot_l_lp_32fx, Etot_l_32fx ), HE_LT_THR2_Q24 ) ) )
             {
                 /**Etot_l_lp = 0.03f * *Etot_l + (1.0f - 0.03f) * *Etot_l_lp; */
-                hNoiseEst->Etot_l_lp_fx = extract_h( L_add( Mpy_32_32( 64424509 /* 0.03f in  Q31*/, Etot_l_32fx ), Mpy_32_32( 2083059139 /* 0.97f in  Q31*/, L_deposit_h( hNoiseEst->Etot_l_lp_fx ) ) ) ); // Q8
+                hNoiseEst->Etot_l_lp_32fx = W_extract_h( W_add( W_mult_32_32( 64424509 /* 0.03f in  Q31*/, Etot_l_32fx ), W_mult_32_32( 2083059139 /* 0.97f in  Q31*/, hNoiseEst->Etot_l_lp_32fx ) ) ); // Q24
                 move16();
             }
             ELSE
             {
                 /*  *Etot_l_lp = 0.02f * *Etot_l + (1.0f - 0.02f) * *Etot_l_lp; */
-                hNoiseEst->Etot_l_lp_fx = extract_h( L_add( Mpy_32_32( 42949673 /* 0.02f in  Q31*/, Etot_l_32fx ), Mpy_32_32( 2104533975 /* 0.98f in  Q31*/, L_deposit_h( hNoiseEst->Etot_l_lp_fx ) ) ) ); // Q8
+                hNoiseEst->Etot_l_lp_32fx = W_extract_h( W_add( W_mult_32_32( 42949673 /* 0.02f in  Q31*/, Etot_l_32fx ), W_mult_32_32( 2104533975 /* 0.98f in  Q31*/, hNoiseEst->Etot_l_lp_32fx ) ) ); // Q24
                 move16();
             }
         }
@@ -671,11 +667,7 @@ void noise_est_down_fx(
     totalNoise_temp = L_deposit_l( 0 );
     FOR( i = min_band; i <= max_band; i++ )
     {
-#ifdef BASOP_NOGLOB
         totalNoise_temp = L_add_o( totalNoise_temp, bckr[i], &Overflow ); /*Q_new+QSCALE*/
-#else
-        totalNoise_temp = L_add( totalNoise_temp, bckr[i] );          /*Q_new+QSCALE*/
-#endif
     }
     totalNoise_temp = L_max( totalNoise_temp, L_shl( e_min, 4 ) );
 
@@ -689,7 +681,7 @@ void noise_est_down_fx(
     e_Noise = sub( e_Noise, scale );
     Ltmp = Mpy_32_16( e_Noise, f_Noise, LG10 );
     *totalNoise = round_fx( L_shl( Ltmp, 10 ) ); /*Q8*/
-
+    move16();
     /*-----------------------------------------------------------------*
      * Average energy per frame for each frequency band
      *-----------------------------------------------------------------*/
@@ -699,11 +691,7 @@ void noise_est_down_fx(
 
     FOR( i = 0; i < NB_BANDS; i++ )
     {
-#ifdef BASOP_NOGLOB
         Ltmp = L_add_o( L_shr_r( *pt1, 1 ), L_shr_r( *pt2, 1 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        Ltmp = L_add( L_shr_r( *pt1, 1 ), L_shr_r( *pt2, 1 ) );
-#endif /* BASOP_NOGLOB */
         /*Ltmp = L_shr_r(L_add(*pt1,*pt2),1);*/
         enr[i] = Ltmp;
         move32(); /*Q_new+QSCALE*/
@@ -722,7 +710,7 @@ void noise_est_down_fx(
         tmpN[i] = Madd_32_16( L_tmp, bckr[i], ALPHAM1_FX );
         move32();                          /*Q_new+QSCALE*/
         tmpN[i] = L_max( tmpN[i], e_min ); /* handle  div by zero in find_tilt_fx  */
-
+        move32();
         /*  if( tmpN[i] < bckr[i] ) { bckr[i] = tmpN[i];  }*/
         /* Defend to increase noise estimate: keep as it is or decrease  */
         bckr[i] = L_max( L_min( bckr[i], tmpN[i] ), e_min );
@@ -741,10 +729,10 @@ void noise_est_down_fx(
     L_tmp = Mult_32_16( L_Etot_v, 655 ); /*.02 in Q15  , Q24+Q15+1 -16 ==> Q24 ) */
 
     *Etot_v_h2 = round_fx( L_add( L_Etot_v_h2, L_tmp ) ); /*Q24->Q8*/
-
+    move16();
     /* if (*Etot_v_h2 < 0.1f) {  *Etot_v_h2 = 0.1f; } */
     *Etot_v_h2 = s_max( *Etot_v_h2, 26 ); /* 0.1 in Q8*/
-
+    move16();
     return;
 }
 
@@ -752,14 +740,17 @@ void noise_est_down_ivas_fx(
     const Word32 fr_bands[], /* i  : per band input energy (contains 2 vectors) q_fr_bands */
     const Word16 q_fr_bands, /* i  : Q of fr_bands                                         */
     Word32 bckr[],           /* i/o: per band background noise energy estimate  q_fr_bands */
-    Word32 tmpN[],           /* o  : temporary noise update                     q_fr_bands */
-    Word32 enr[],            /* o  : averaged energy over both subframes                   */
-    const Word16 min_band,   /* i  : minimum critical band                                 */
-    const Word16 max_band,   /* i  : maximum critical band                                 */
-    Word16 *totalNoise,      /* o  : noise estimate over all critical bands                */
-    Word16 Etot,             /* i  : Energy of current frame                               */
-    Word16 *Etot_last,       /* i/o: Energy of last frame            Q8                    */
-    Word16 *Etot_v_h2        /* i/o: Energy variations of noise frames  Q8                 */
+    Word16 *q_bckr,
+    Word32 tmpN[], /* o  : temporary noise update                     q_fr_bands */
+    Word16 *q_tmpN,
+    Word32 enr[], /* o  : averaged energy over both subframes                   */
+    Word16 *q_enr,
+    const Word16 min_band, /* i  : minimum critical band                                 */
+    const Word16 max_band, /* i  : maximum critical band                                 */
+    Word16 *totalNoise,    /* o  : noise estimate over all critical bands                */
+    Word32 Etot,           /* i  : Energy of current frame                            Q24*/
+    Word32 *Etot_last,     /* i/o: Energy of last frame            Q24                   */
+    Word32 *Etot_v_h2      /* i/o: Energy variations of noise frames  Q24                */
 )
 
 {
@@ -767,17 +758,22 @@ void noise_est_down_ivas_fx(
     const Word32 *pt1, *pt2;
     Word16 i;
     Word16 e_Noise, f_Noise;
-    Word32 e_min;
     Word32 totalNoise_temp;
     Word32 L_Etot, L_Etot_last, L_Etot_v_h2, L_Etot_v;
     Word64 sum;
     Word16 q_sum;
+    Word32 enr32[NB_BANDS], bckr32[NB_BANDS], tmpN32[NB_BANDS];
+    Word16 enr_q[NB_BANDS], bckr_q[NB_BANDS], tmpN_q[NB_BANDS];
+    Word16 shift, shift1, shift2, shift3;
+    Word64 tmpN64, tmp, enr64;
 
-    e_min = L_shl( E_MIN_FXQ31, sub( q_fr_bands, Q31 ) ); // q_fr_bands
+    Copy32( bckr, bckr32, NB_BANDS );
+    set16_fx( bckr_q, *q_bckr, NB_BANDS );
 
-    L_Etot = L_shl( Etot, 16 ); /*Q24 for later AR1 computations*/
-    L_Etot_last = L_shl( *Etot_last, 16 );
-    L_Etot_v_h2 = L_shl( *Etot_v_h2, 16 );
+    L_Etot = Etot; /*Q24 for later AR1 computations*/
+    move32();
+    L_Etot_last = *Etot_last;
+    L_Etot_v_h2 = *Etot_v_h2;
 
     /*-----------------------------------------------------------------*
      * Estimate total noise energy
@@ -790,7 +786,7 @@ void noise_est_down_ivas_fx(
     {
         sum = W_mac_32_16( sum, bckr[i], 1 ); // q_fr_bands+1
     }
-    q_sum = add( q_fr_bands, 1 );
+    q_sum = add( *q_bckr, 1 );
     IF( sum == 0 )
     {
         sum = W_mult0_32_32( E_MIN_FXQ31, add( sub( max_band, min_band ), 1 ) ); // Q31
@@ -820,8 +816,12 @@ void noise_est_down_ivas_fx(
     FOR( i = 0; i < NB_BANDS; i++ )
     {
         /* enr[i] = 0.5f * ( *pt1++ + *pt2++ ); */
-        enr[i] = W_extract_h( W_mac_32_32( W_mult_32_32( *pt1, ONE_IN_Q30 ), *pt2, ONE_IN_Q30 ) ); // q_fr_bands+30+1-32+1 = q_fr_bands
+        enr64 = W_mac_32_32( W_mult_32_32( *pt1, ONE_IN_Q29 ), *pt2, ONE_IN_Q29 ); // q_fr_bands + 1 + Q29 + 1 (0.5 handle here)
+        shift = W_norm( enr64 );
+        enr32[i] = W_extract_h( W_shl( enr64, shift ) );
         move32();
+        enr_q[i] = sub( add( q_fr_bands, shift ), 1 );
+        move16();
         pt1++;
         pt2++;
     }
@@ -829,20 +829,66 @@ void noise_est_down_ivas_fx(
     /*-----------------------------------------------------------------*
      * Background noise energy update
      *-----------------------------------------------------------------*/
-
     FOR( i = 0; i < NB_BANDS; i++ )
     {
         /* tmpN[i] = (1-ALPHA) * bckr[i] + ALPHA * enr[i]; */
         /* handle  div by zero in find_tilt_fx  */
-        tmpN[i] = L_max( Madd_32_16( Mpy_32_16_1( bckr[i], ALPHAM1_FX ), enr[i], ALPHA_FX ), e_min ); // q_fr_bands
-        move32();
 
-        /*  if( tmpN[i] < bckr[i] ) { bckr[i] = tmpN[i];  }*/
-        /* Defend to increase noise estimate: keep as it is or decrease  */
-        bckr[i] = L_max( L_min( bckr[i], tmpN[i] ), e_min ); // q_fr_bands
+        tmpN64 = W_mult_32_16( bckr32[i], ALPHAM1_FX );
+        tmp = W_mult_32_16( enr32[i], ALPHA_FX );
+
+        shift = s_min( bckr_q[i], enr_q[i] );
+        tmpN64 = W_add( W_shl( tmpN64, sub( shift, bckr_q[i] ) ), W_shl( tmp, sub( shift, enr_q[i] ) ) ); // shift + q16
+        shift1 = W_norm( tmpN64 );
+        tmpN32[i] = W_extract_h( W_shl( tmpN64, shift1 ) ); // shift + q16 + shift1 - 32
         move32();
+        tmpN_q[i] = sub( add( add( Q16, shift ), shift1 ), 32 );
+        move16();
+
+        IF( GT_32( E_MIN_FXQ31, L_shl_sat( tmpN32[i], sub( 31, tmpN_q[i] ) ) ) )
+        {
+            tmpN32[i] = E_MIN_FXQ31;
+            tmpN_q[i] = 31;
+            move32();
+            move16();
+        }
+
+        IF( GT_32( bckr32[i], L_shl_sat( tmpN32[i], sub( bckr_q[i], tmpN_q[i] ) ) ) )
+        {
+            bckr32[i] = tmpN32[i]; /* Defend to increase noise estimate: keep as it is or decrease  */
+            bckr_q[i] = tmpN_q[i];
+            move32();
+            move16();
+        }
     }
 
+    /* Scaling to common Q*/
+    shift1 = bckr_q[0], shift2 = enr_q[0], shift3 = tmpN_q[0];
+    move16();
+    move16();
+    move16();
+
+    FOR( i = 1; i < NB_BANDS; i++ )
+    {
+        shift1 = s_min( shift1, bckr_q[i] );
+        shift2 = s_min( shift2, enr_q[i] );
+        shift3 = s_min( shift3, tmpN_q[i] );
+    }
+    FOR( i = 0; i < NB_BANDS; i++ )
+    {
+        bckr[i] = L_shl( bckr32[i], sub( shift1, bckr_q[i] ) );
+        enr[i] = L_shl( enr32[i], sub( shift2, enr_q[i] ) );
+        tmpN[i] = L_shl( tmpN32[i], sub( shift3, tmpN_q[i] ) );
+        move32();
+        move32();
+        move32();
+    }
+    *q_bckr = shift1;
+    *q_enr = shift2;
+    *q_tmpN = shift3;
+    move16();
+    move16();
+    move16();
     /*------------------------------------------------------------------*
      * Energy variation update
      *------------------------------------------------------------------*/
@@ -855,7 +901,7 @@ void noise_est_down_ivas_fx(
     L_Etot_v_h2 = Madd_32_16( L_tmp, L_Etot_v_h2, 32113 /* 0.98 in Q15 */ ); // Q24
 
     /* if (*Etot_v_h2 < 0.1f) {  *Etot_v_h2 = 0.1f; } */
-    *Etot_v_h2 = s_max( round_fx( L_Etot_v_h2 ), 26 /* 0.1 in Q8*/ ); // Q8
+    *Etot_v_h2 = L_max( L_Etot_v_h2, 1677722 /* 0.1 in Q24*/ ); // Q24
     move16();
 
     return;
@@ -893,11 +939,7 @@ void noise_est_fx(
     const Word32 Le_min_scaled, /*i  : Minimum energy value     in  Q_new + Q_SCALE                         */
     Word16 *sp_floor,           /* o  : noise floor estimate                                 Q7             */
     Word16 S_map[],             /* o  : short-term correlation map                           Q7             */
-#ifdef IVAS_CODE
-    STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                       */
-    FRONT_VAD_ENC_HANDLE hFrontVad,       /* i/o: front-VAD handle                                                  */
-#endif
-    const Word16 ini_frame /* i  : Frame number (init)                                                */
+    const Word16 ini_frame      /* i  : Frame number (init)                                                */
 )
 {
     Word16 alpha, alpha2, alpha2m1, alpham1;
@@ -939,17 +981,9 @@ void noise_est_fx(
     NOISE_EST_HANDLE hNoiseEst;
     SP_MUS_CLAS_HANDLE hSpMusClas;
     hSpMusClas = st_fx->hSpMusClas;
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) ( ncharX );
-#endif
+
     /* Check if LR-VAD */
-#ifdef IVAS_CODE
-    IF( hFrontVad != NULL )
-    {
-        hNoiseEst = hFrontVad->hNoiseEst;
-    }
-    ELSE
-#endif
     {
         hNoiseEst = st_fx->hNoiseEst;
     }
@@ -957,6 +991,7 @@ void noise_est_fx(
     GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     /*-----------------------------------------------------------------*
@@ -966,11 +1001,8 @@ void noise_est_fx(
     move16();
 
     /*st_fx->ener_RAT = 10.0f * (float)log10( mean(lf_E, 8));*/
-#ifdef IVAS_CODE
-    IF( hFrontVad == NULL )
-#endif
     {
-        if ( hSpMusClas != NULL )
+        IF( hSpMusClas != NULL )
         {
             Ltmp = L_shr( lf_E[0], 3 );
             FOR( i = 1; i < 8; i++ )
@@ -980,6 +1012,7 @@ void noise_est_fx(
             IF( LT_32( Ltmp, L_shl( 1, add( Q_new, Q_SCALE - 2 ) ) ) )
             {
                 hSpMusClas->ener_RAT_fx = 0;
+                move16();
                 // PMT("hSpMusClas->ener_RAT_fx = 0, that should be validated")
             }
             ELSE
@@ -1001,9 +1034,10 @@ void noise_est_fx(
                 {
                     hSpMusClas->ener_RAT_fx = 32767;
                     move16(); /*Q15*/
-                    if ( GE_16( wtmp1, wtmp ) )
+                    IF( GE_16( wtmp1, wtmp ) )
                     {
                         hSpMusClas->ener_RAT_fx = div_s( wtmp, wtmp1 ); /*Q15*/ /* wtmp1 gte than wtmp */
+                        move16();
                     }
                 }
             }
@@ -1017,7 +1051,7 @@ void noise_est_fx(
      * order" spectral envelope => the epsP ratio is much less effective.
      *-----------------------------------------------------------------*/
 
-    IF( NE_16( vad_bwidth_fx, NB ) ) /* WB input */
+    IF( vad_bwidth_fx != NB ) /* WB input */
     {
         th_eps = TH_EPS16_FX;
         move16(); /*Q11*/
@@ -1053,13 +1087,8 @@ void noise_est_fx(
 
     Ltmp = L_deposit_h( corr_shift );
     Ltmp = L_mac( Ltmp, st_fx->voicing_fx[0], 10923 );
-#ifdef BASOP_NOGLOB
     Ltmp = L_mac_o( Ltmp, st_fx->voicing_fx[1], 10923, &Overflow );
     wtmp = mac_ro( Ltmp, st_fx->voicing_fx[2], 10923, &Overflow );
-#else  /* BASOP_NOGLOB */
-    Ltmp = L_mac( Ltmp, st_fx->voicing_fx[1], 10923 );
-    wtmp = mac_r( Ltmp, st_fx->voicing_fx[2], 10923 );
-#endif /* BASOP_NOGLOB */
 
     tmp_pc = pc;
     move16();
@@ -1069,14 +1098,12 @@ void noise_est_fx(
         move16(); /* low correlation -> probably inactive signal */
     }
 
-    move16(); /* Update */
+    /* Update */
 
     /*-----------------------------------------------------------------*
      * Multi-harmonic analysis
      *-----------------------------------------------------------------*/
-#ifdef IVAS_CODE
-    IF( hFrontVad == NULL )
-#endif
+
     {
         IF( st_fx->hSpMusClas != NULL )
         {
@@ -1084,6 +1111,7 @@ void noise_est_fx(
             move16();
             *loc_harm = multi_harm_fx( EspecdB, hNoiseEst->old_S_fx, hNoiseEst->cor_map_fx, &hNoiseEst->multi_harm_limit_fx, st_fx->total_brate,
                                        st_fx->bwidth, ( st_fx->hGSCEnc != NULL ) ? &hGSCEnc->cor_strong_limit : &i, &hSpMusClas->mean_avr_dyn_fx, &hSpMusClas->last_sw_dyn_fx, cor_map_sum, sp_floor, S_map );
+            move16();
         }
     }
     /*-----------------------------------------------------------------*
@@ -1113,11 +1141,7 @@ void noise_est_fx(
     FOR( i = 10; i <= st_fx->max_band; i++ )
     {
         Lnum = L_max( *pt1, *pt2 ); /* Don't need if anymore */
-#ifdef BASOP_NOGLOB
         Lsum_den = L_add_o( Lsum_den, Lnum, &Overflow );
-#else  /* BASOP_NOGLOB */
-        Lsum_den = L_add( Lsum_den, Lnum );
-#endif /* BASOP_NOGLOB */
         Ltmpden = L_min( *pt1, *pt2 );
         if ( Ltmpden == 0 )
         {
@@ -1173,17 +1197,8 @@ void noise_est_fx(
     /* calculation of energy in the rest of bands */
     Ltmp2 = sum32_fx( &fr_bands[10], sub( st_fx->max_band, 9 ) );
 
-#ifdef BASOP_NOGLOB
     wtmp = shl_o( 1, sub( add( Q_new, QSCALE ), 1 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    wtmp = shl( 1, sub( add( Q_new, QSCALE ), 1 ) );
-#endif /* BASOP_NOGLOB */
-#ifdef IVAS_CODE
-    IF( ncharX != NULL )
-    {
-        *ncharX = ftemp2 / ( ftemp + 1e-5f );
-    }
-#endif
+
     test();
     IF( L_msu( Ltmp, 100, wtmp ) < 0 || L_msu( Ltmp2, 100, wtmp ) < 0 )
     {
@@ -1199,11 +1214,7 @@ void noise_est_fx(
         ExpDen = norm_l( Ltmp );
         den = extract_h( L_shl( Ltmp, ExpDen ) );
         num = div_s( num, den );
-#ifdef BASOP_NOGLOB
         noise_chartmp = extract_h( L_shr_o( num, add( sub( ExpNum, ExpDen ), 4 - 16 ), &Overflow ) ); /* Q11 */
-#else                                                                                                 /* BASOP_NOGLOB */
-        noise_chartmp = extract_h( L_shr( num, add( sub( ExpNum, ExpDen ), 4 - 16 ) ) ); /* Q11 */
-#endif                                                                                                /* BASOP_NOGLOB */
     }
 
     noise_chartmp = s_min( noise_chartmp, (Word16) 10 << 11 ); /* Q11 */
@@ -1215,7 +1226,7 @@ void noise_est_fx(
 
     nchar_thr = THR_NCHAR_WB_FX;
     move16(); /* 1.0 Q11 */
-    if ( EQ_16( vad_bwidth_fx, NB ) )
+    if ( vad_bwidth_fx == NB )
     {
         nchar_thr = THR_NCHAR_NB_FX;
         move16(); /* 1.0 Q11 */
@@ -1244,13 +1255,9 @@ void noise_est_fx(
     tmp = s_max( relE, 0 ); /* Q8  */
 
     /* alpha =  0.064f * ftemp  +  0.75f; */
-    Ltmp = Mult_32_16( (Word32) 137438953L, tmp ); /* Q31(.064)+Q8+1-16      -->  Q24 */
-    Ltmp = L_mac( Ltmp, 256, 24576 );              /* Q8+Q15(.75)+1  --> Q24    */
-#ifdef BASOP_NOGLOB
+    Ltmp = Mult_32_16( (Word32) 137438953L, tmp );                  /* Q31(.064)+Q8+1-16      -->  Q24 */
+    Ltmp = L_mac( Ltmp, 256, 24576 );                               /* Q8+Q15(.75)+1  --> Q24    */
     alpha = round_fx_o( L_shl_o( Ltmp, 7, &Overflow ), &Overflow ); /*Q24 +7 --> Q31    Q15*/
-#else                                                               /* BASOP_NOGLOB */
-    alpha = round_fx( L_shl( Ltmp, 7 ) );                                                /*Q24 +7 --> Q31    Q15*/
-#endif                                                              /* BASOP_NOGLOB */
 
     /*if( alpha > 0.999f  {     alpha = 0.999f;} */
     alpha = s_min( alpha, 32735 );            /*.999 in Q15*/
@@ -1285,14 +1292,9 @@ void noise_est_fx(
         /*  + 1.0f added to reduce sensitivity to non stationarity in low energies  */
         /* tmp_enr = enr[i] + 1.0f; */
         tmp_Q = add( Q_new, Q_SCALE );
-        Ltmp = L_shl( (Word32) 1L, tmp_Q ); /* 1.0 added in the right dynamic domain */
-#ifdef BASOP_NOGLOB
+        Ltmp = L_shl( (Word32) 1L, tmp_Q );                                   /* 1.0 added in the right dynamic domain */
         L_tmp_enr = L_add_o( enr[i], Ltmp, &Overflow );                       /* enr      scale  dynamic     */
         L_tmp_ave_enr = L_add_o( hNoiseEst->ave_enr_fx[i], Ltmp, &Overflow ); /* ave__enr  scale dynamic  */
-#else                                                                         /* BASOP_NOGLOB */
-        L_tmp_enr = L_add( enr[i], Ltmp );                                               /* enr      scale  dynamic     */
-        L_tmp_ave_enr = L_add( hNoiseEst->ave_enr_fx[i], Ltmp );                         /* ave__enr  scale dynamic  */
-#endif                                                                        /* BASOP_NOGLOB */
 
         IF( LE_32( non_sta, th_sta ) ) /* Just to limit the saturation */
         {
@@ -1311,11 +1313,7 @@ void noise_est_fx(
             den = extract_h( L_shl( Lden, ExpDen ) );
             num = div_s( num, den );
             Ltmp = Mult_32_16( non_sta, num );
-#ifdef BASOP_NOGLOB
             non_sta = L_shr_o( Ltmp, sub( ExpNum, ExpDen ), &Overflow ); /* Q10 */
-#else                                                                    /* BASOP_NOGLOB */
-            non_sta = L_shr( Ltmp, sub( ExpNum, ExpDen ) );                              /* Q10 */
-#endif                                                                   /* BASOP_NOGLOB */
         }
 
         /*    st->ave_enr[i] = alpha * st->ave_enr[i] + (1-alpha) * enr[i];*/ /* update long-term average */
@@ -1335,14 +1333,10 @@ void noise_est_fx(
          } */
 
         /* ave_enr2:: calculation of another non-stationarity measure (following attacks)  */
-        Ltmp = L_shl( (Word32) 1L, tmp_Q );                     /* 1.0 added in the right dynamic domain */
-        /*L_tmp_enr    =  L_add(enr[i]              , Ltmp );*/ /* enr      scale  dynamic    , done above  */
-#ifdef BASOP_NOGLOB
+        Ltmp = L_shl( (Word32) 1L, tmp_Q );                                     /* 1.0 added in the right dynamic domain */
+        /*L_tmp_enr    =  L_add(enr[i]              , Ltmp );*/                 /* enr      scale  dynamic    , done above  */
         L_tmp_ave_enr2 = L_add_o( hNoiseEst->ave_enr2_fx[i], Ltmp, &Overflow ); /* ave__enr  scale dynamic  */
-#else
-        L_tmp_ave_enr2 = L_add( hNoiseEst->ave_enr2_fx[i], Ltmp );                       /* ave__enr  scale dynamic  */
-#endif
-        IF( LE_32( Lnon_sta2, th_sta ) ) /* Just to limit the saturation */
+        IF( LE_32( Lnon_sta2, th_sta ) )                                        /* Just to limit the saturation */
         {
             Lnum = L_max( L_tmp_enr, L_tmp_ave_enr2 );
             Lden = L_min( L_tmp_enr, L_tmp_ave_enr2 );
@@ -1354,11 +1348,7 @@ void noise_est_fx(
             den = extract_h( L_shl( Lden, ExpDen ) );
             num = div_s( num, den );
             Ltmp1 = Mult_32_16( Lnon_sta2, num );
-#ifdef BASOP_NOGLOB
             Lnon_sta2 = L_shr_o( Ltmp1, sub( ExpNum, ExpDen ), &Overflow ); /* Q10 */
-#else                                                                       /* BASOP_NOGLOB */
-            Lnon_sta2 = L_shr( Ltmp1, sub( ExpNum, ExpDen ) );                           /* Q10 */
-#endif                                                                      /* BASOP_NOGLOB */
         }
 
         /* st_ave_enr2[i] = (float)alpha2 * st_ave_enr2[i]
@@ -1369,9 +1359,6 @@ void noise_est_fx(
         move32();
 
         /* calculation of non-stationarity measure for speech/music classification */
-#ifdef IVAS_CODE
-        IF( hFrontVad == NULL )
-#endif
         {
             test();
             test();
@@ -1380,16 +1367,13 @@ void noise_est_fx(
                 /* log_enr = (float)ln_fx(enr[i]); */
                 log_enr16 = noise_est_ln_q8_fx( enr[i], 0, tmp_Q );
                 wtmp = abs_s( sub( log_enr16, hSpMusClas->past_log_enr_fx[i - START_BAND_SPMUS] ) );
-#ifdef BASOP_NOGLOB
                 *non_staX = add_o( *non_staX, wtmp, &Overflow );
-#else                     /* BASOP_NOGLOB */
-                *non_staX = add( *non_staX, wtmp );
-#endif                    /* BASOP_NOGLOB */
                 move16(); /* Q8 */
                 hSpMusClas->past_log_enr_fx[i - START_BAND_SPMUS] = log_enr16;
                 move16();
             }
         }
+        test();
         IF( GE_16( i, 2 ) && LE_16( i, 16 ) )
         {
             IF( GE_16( ini_frame, 100 ) )
@@ -1399,11 +1383,7 @@ void noise_est_fx(
                 tmp_floor = LN_E_MIN_PLUS_ONE_FX;
                 move16(); /* non dynamic init constant in Q8 */
                 tmp_floor = noise_est_ln_q8_fx( hNoiseEst->bckr_fx[i], 1, tmp_Q );
-#ifdef BASOP_NOGLOB
                 non_staB = add_o( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ), &Overflow ); /*  Q8  */
-#else                                                                                        /* BASOP_NOGLOB */
-                non_staB = add( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /*  Q8  */
-#endif                                                                                       /* BASOP_NOGLOB */
             }
             ELSE /*ini_frame < 100*/
             {
@@ -1412,11 +1392,7 @@ void noise_est_fx(
                 tmp_floor = LN_E_MIN_PLUS_ONE_FX;
                 move16(); /* non dynamic init constant in Q8 */
                 tmp_floor = noise_est_ln_q8_fx( E_MIN_FX, 1, tmp_Q );
-#ifdef BASOP_NOGLOB
                 non_staB = add_o( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ), &Overflow ); /*  Q8  */
-#else                                                                                        /* BASOP_NOGLOB */
-                non_staB = add( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /*  Q8  */
-#endif                                                                                       /* BASOP_NOGLOB */
             }
         }
 
@@ -1431,7 +1407,7 @@ void noise_est_fx(
     lim_Etot_fx = s_max( 5120, Etot );                                              /* 20.0f Q8 */
     lim_Etot_sq_fx = extract_h( L_shl_r( L_mult( lim_Etot_fx, lim_Etot_fx ), 1 ) ); /* Q2 */
 
-    if ( st_fx->ini_frame < 150 )
+    IF( LT_16( st_fx->ini_frame, 150 ) )
     {
         /* Allow use of quicker filter during init - if needed */
         /* st->Etot_st_est = 0.25f * lim_Etot + (1.0f-0.25F) * st->Etot_st_est; */
@@ -1441,7 +1417,7 @@ void noise_est_fx(
         hNoiseEst->Etot_sq_st_est_fx = mac_r( L_mult( 8192, lim_Etot_sq_fx ), 24576, hNoiseEst->Etot_sq_st_est_fx );
         move16();
     }
-    else
+    ELSE
     {
         /* st->Etot_st_est = 0.25f * lim_Etot + (1.0f-0.25F) * st->Etot_st_est; */
         hNoiseEst->Etot_st_est_fx = mac_r( L_mult( 8192, lim_Etot_fx ), 24576, hNoiseEst->Etot_st_est_fx );
@@ -1464,20 +1440,24 @@ void noise_est_fx(
     test();
     test();
     *st_harm_cor_cnt = add( *st_harm_cor_cnt, 1 );
+    move16();
     if ( ( Etot > 0 ) && ( ( *loc_harm > 0 ) || ( GT_16( round_fx( Ltmp ), COR_MAX_NNE_FX ) ) ) )
     {
         *st_harm_cor_cnt = 0;
         move16();
     }
-
-    IF( ( GT_16( *st_harm_cor_cnt, 1 ) ) && ( ( LT_16( Etot, 3840 ) ) || /* 15 in Q8 */
-                                              ( GT_16( st_fx->ini_frame, 10 ) &&
-                                                GT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 ) ) ) /* 7 in Q8 */
+    test();
+    test();
+    test();
+    if ( ( GT_16( *st_harm_cor_cnt, 1 ) ) && ( ( LT_16( Etot, 3840 ) ) || /* 15 in Q8 */
+                                               ( GT_16( st_fx->ini_frame, 10 ) &&
+                                                 GT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 ) ) ) /* 7 in Q8 */
     )
     {
         *st_harm_cor_cnt = 1;
     }
-
+    test();
+    test();
     if ( GT_16( *st_harm_cor_cnt, 1 ) &&
          GT_16( Etot, 7680 ) &&       /* 30.0f in Q8 */
          GT_16( st_E_var_est_fx, 32 ) /* 8.0f in Q2 */
@@ -1486,6 +1466,7 @@ void noise_est_fx(
 
         /* st->harm_cor_cnt = max(1, (short) round_f( (float) st->harm_cor_cnt / 4.0f )) ; */
         *st_harm_cor_cnt = s_max( 1, shr( add( *st_harm_cor_cnt, 2 ), 1 ) );
+        move16();
     }
 
 
@@ -1521,13 +1502,9 @@ void noise_est_fx(
 
     /*epsP_0_2 = max(0 , min(8, epsP[0] / epsP[2])); */
     Ltmp = eps_quota_fx( epsP_h[0], epsP_l[0],
-                         epsP_h[2], epsP_l[2], 12 ); /* Word32  Q12 */
-    BASOP_SATURATE_WARNING_OFF_EVS                   /* may saturate*/
-#ifdef BASOP_NOGLOB
+                         epsP_h[2], epsP_l[2], 12 );                        /* Word32  Q12 */
+    BASOP_SATURATE_WARNING_OFF_EVS                                          /* may saturate*/
         epsP_0_2 = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12+16  -16 ->  Q12 , NB saturation in Q12 sets max value to  7,999 */
-#else                                                                       /* BASOP_NOGLOB */
-        epsP_0_2 = round_fx( L_shl( Ltmp, 16 ) );                               /* Q12+16  -16 ->  Q12 , NB saturation in Q12 sets max value to  7,999 */
-#endif                                                                      /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
 
     epsP_0_2 = s_max( 0, epsP_0_2 ); /* min value is 0 , Q12 */
@@ -1537,7 +1514,7 @@ void noise_est_fx(
     alpha = 4915;
     move16(); /*0.15 in Q15 */
     hNoiseEst->epsP_0_2_lp_fx = noise_est_AR1_Qx( epsP_0_2, hNoiseEst->epsP_0_2_lp_fx, alpha );
-
+    move16();
     /* epsP_0_2_ad = (float) fabs(epsP_0_2 - st->epsP_0_2_lp );  */
     epsP_0_2_ad = abs_s( sub( epsP_0_2, hNoiseEst->epsP_0_2_lp_fx ) ); /* Q12 */
 
@@ -1553,7 +1530,7 @@ void noise_est_fx(
         alpha = shr( alpha, 1 ); /* 0.1 Q15 */
     }
     hNoiseEst->epsP_0_2_ad_lp_fx = noise_est_AR1_Qx( epsP_0_2_ad, hNoiseEst->epsP_0_2_ad_lp_fx, alpha );
-
+    move16();
     /* epsP_0_2_ad_lp_max = max(epsP_0_2_ad,st->epsP_0_2_ad_lp);*/
     epsP_0_2_ad_lp_max = s_max( epsP_0_2_ad, hNoiseEst->epsP_0_2_ad_lp_fx ); /* Q12 */
 
@@ -1564,15 +1541,10 @@ void noise_est_fx(
 
     /*  epsP_2_16 = max(0 , min(8, epsP[2] / epsP[16])); */
     Ltmp = eps_quota_fx( epsP_h[2], epsP_l[2],
-                         epsP_h[16], epsP_l[16], 12 ); /* Word32  Q12 */
-    BASOP_SATURATE_WARNING_OFF_EVS                     /* may saturate*/
-#ifdef BASOP_NOGLOB
+                         epsP_h[16], epsP_l[16], 12 );                       /* Word32  Q12 */
+    BASOP_SATURATE_WARNING_OFF_EVS                                           /* may saturate*/
         epsP_2_16 = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12+16  -16 ->  Q12 ,
                                           NB saturation in Q12 sets max value to  7,999 */
-#else                                                                        /* BASOP_NOGLOB */
-        epsP_2_16 = round_fx( L_shl( Ltmp, 16 ) );                              /* Q12+16  -16 ->  Q12 ,
-                                                                       NB saturation in Q12 sets max value to  7,999 */
-#endif                                                                       /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
 
     epsP_2_16 = s_max( 0, epsP_2_16 ); /* min value is 0 , Q12 */
@@ -1594,9 +1566,9 @@ void noise_est_fx(
         move16(); /* 0.2  Q15 */
     }
     hNoiseEst->epsP_2_16_lp_fx = noise_est_AR1_Qx( epsP_2_16, hNoiseEst->epsP_2_16_lp_fx, alpha );
-
+    move16();
     hNoiseEst->epsP_2_16_lp2_fx = noise_est_AR1_Qx( epsP_2_16, hNoiseEst->epsP_2_16_lp2_fx, 655 ); /* 0.02 */
-
+    move16();
     epsP_2_16_dlp = sub( hNoiseEst->epsP_2_16_lp_fx, hNoiseEst->epsP_2_16_lp2_fx );
 
 
@@ -1613,7 +1585,7 @@ void noise_est_fx(
         move16(); /* 0.02  Q15 */
     }
     hNoiseEst->epsP_2_16_dlp_lp2_fx = noise_est_AR1_Qx( epsP_2_16_dlp, hNoiseEst->epsP_2_16_dlp_lp2_fx, alpha );
-
+    move16();
     /* epsP_2_16_dlp_max  = max(epsP_2_16_dlp,st->epsP_2_16_dlp_lp2); */
     epsP_2_16_dlp_max = s_max( epsP_2_16_dlp, hNoiseEst->epsP_2_16_dlp_lp2_fx );
 
@@ -1631,14 +1603,14 @@ void noise_est_fx(
         move16();
     }
     hNoiseEst->lt_tn_track_fx = noise_est_AR1_Qx( tmp2, hNoiseEst->lt_tn_track_fx, 983 ); /*0.03 in Q15 ,Q15 state*/
-
+    move16();
     /* st->lt_tn_dist = 0.03f* (Etot - st->totalNoise) + 0.97f*st->lt_tn_dist; */
     hNoiseEst->lt_tn_dist_fx = noise_est_AR1_Qx( tmp, hNoiseEst->lt_tn_dist_fx, 983 ); /*0.03 in Q15 ,Q8 state*/
-
+    move16();
     /* st->lt_Ellp_dist = 0.03f* (Etot - st->Etot_l_lp) + 0.97f*st->lt_Ellp_dist;*/
     tmp = sub( Etot, hNoiseEst->Etot_l_lp_fx );                                            /* Q8 */
     hNoiseEst->lt_Ellp_dist_fx = noise_est_AR1_Qx( tmp, hNoiseEst->lt_Ellp_dist_fx, 983 ); /*0.03 in Q15 ,Q8 state*/
-
+    move16();
 
     /* if (st->harm_cor_cnt == 0)  {
         st->lt_haco_ev = 0.03f*1.0 + 0.97f*st->lt_haco_ev;
@@ -1653,7 +1625,7 @@ void noise_est_fx(
     {
         hNoiseEst->lt_haco_ev_fx = mult_r( 32440, hNoiseEst->lt_haco_ev_fx ); /*.99 in Q15 , Q15 state */
     }
-
+    move16();
 
     /* if (st->lt_tn_track < 0.05f)  {
         st->low_tn_track_cnt++;
@@ -1694,11 +1666,7 @@ void noise_est_fx(
      *-----------------------------------------------------------------*/
     Ltmp = L_mult( st_fx->voicing_fx[0], 16384 );
     Ltmp = L_mac( Ltmp, st_fx->voicing_fx[1], 16384 );
-#ifdef BASOP_NOGLOB
     cor_tmp = mac_ro( Ltmp, corr_shift, MAX_16, &Overflow );
-#else /* BASOP_NOGLOB */
-    cor_tmp = mac_r( Ltmp, corr_shift, MAX_16 );
-#endif
 
     LepsP = eps_quota_fx( epsP_h[2], epsP_l[2],
                           epsP_h[16], epsP_l[16], 11 ); /* L_epsP in Q11 */
@@ -1763,39 +1731,6 @@ void noise_est_fx(
 
     hNoiseEst->aEn = s_min( hNoiseEst->aEn, 6 );
     hNoiseEst->aEn = s_max( hNoiseEst->aEn, 0 );
-#ifdef IVAS_CODE
-    /*-----------------------------------------------------------------*
-     * Stereo classifier - save raw aEn
-     *-----------------------------------------------------------------*/
-
-    if ( hStereoClassif != NULL )
-    {
-        if ( ( non_sta > th_sta ) ||
-             ( tmp_pc < TH_PC ) ||
-             ( 0.5f * ( st->voicing[0] + st->voicing[1] ) > cor_max ) ||
-             ( epsP[2] / epsP[16] > th_eps ) ||
-             ( ( hNoiseEst->act_pred > 0.8f ) && ( non_sta2 > th_sta ) ) )
-        {
-            /* active signal present - increment counter */
-            hStereoClassif->aEn_raw[st->idchan] = hStereoClassif->aEn_raw[st->idchan] + 2;
-        }
-        else
-        {
-            /* background noise present - decrement counter */
-            hStereoClassif->aEn_raw[st->idchan] = hStereoClassif->aEn_raw[st->idchan] - 1;
-        }
-
-        if ( hStereoClassif->aEn_raw[st->idchan] > 6 )
-        {
-            hStereoClassif->aEn_raw[st->idchan] = 6;
-        }
-        else if ( hStereoClassif->aEn_raw[st->idchan] < 0 )
-        {
-            hStereoClassif->aEn_raw[st->idchan] = 0;
-        }
-    }
-#endif
-
 
     /* Additional NNE detectors */
 
@@ -2031,13 +1966,20 @@ void noise_est_fx(
     test();
     test();
     test();
-    if ( ( ( LT_16( hNoiseEst->act_pred_fx, 19333 ) ) && ( LT_16( hNoiseEst->lt_haco_ev_fx, 7537 ) ) )                                                                                         /* .59 in Q15 .23 in Q15 */
-         || ( LT_16( hNoiseEst->act_pred_fx, 12452 ) )                                                                                                                                         /* .38 in Q15 */
-         || ( ( EQ_16( st_fx->element_mode, EVS_MONO ) && LT_16( hNoiseEst->lt_haco_ev_fx, 4915 ) ) || ( GT_16( st_fx->element_mode, EVS_MONO ) && LT_16( hNoiseEst->lt_haco_ev_fx, 2621 ) ) ) /* .15 in Q15 || 0.08 */
-         || ( LT_16( non_staB, 50 * 256 ) )                                                                                                                                                    /* 50.0 in Q8  */
-         || aE_bgd != 0 || ( ( LT_16( Etot, 10752 ) )                                                                                                                                          /* 42 in Q8 */
-                             && ( GT_16( hNoiseEst->harm_cor_cnt, 10 ) ) && ( LT_16( hNoiseEst->lt_haco_ev_fx, 11469 ) )                                                                       /* 0.35 in Q15 */
-                             && ( LT_16( hNoiseEst->act_pred_fx, 26214 ) )                                                                                                                     /* 0.80 in Q15 */
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    if ( ( ( LT_16( hNoiseEst->act_pred_fx, 19333 ) ) && ( LT_16( hNoiseEst->lt_haco_ev_fx, 7537 ) ) )                                                                          /* .59 in Q15 .23 in Q15 */
+         || ( LT_16( hNoiseEst->act_pred_fx, 12452 ) )                                                                                                                          /* .38 in Q15 */
+         || ( ( st_fx->element_mode == EVS_MONO && LT_16( hNoiseEst->lt_haco_ev_fx, 4915 ) ) || ( st_fx->element_mode > EVS_MONO && LT_16( hNoiseEst->lt_haco_ev_fx, 2621 ) ) ) /* .15 in Q15 || 0.08 */
+         || ( LT_16( non_staB, 50 * 256 ) )                                                                                                                                     /* 50.0 in Q8  */
+         || aE_bgd != 0 || ( ( LT_16( Etot, 10752 ) )                                                                                                                           /* 42 in Q8 */
+                             && ( GT_16( hNoiseEst->harm_cor_cnt, 10 ) ) && ( LT_16( hNoiseEst->lt_haco_ev_fx, 11469 ) )                                                        /* 0.35 in Q15 */
+                             && ( LT_16( hNoiseEst->act_pred_fx, 26214 ) )                                                                                                      /* 0.80 in Q15 */
                              ) )
     {
         tmp = 1;
@@ -2048,6 +1990,7 @@ void noise_est_fx(
     move16();
     test();
     test();
+    test();
     if ( ( LT_16( st_fx->ini_frame, HE_LT_CNT_INIT_FX ) ) && ( GT_16( hNoiseEst->harm_cor_cnt, 5 ) ) /* > 5  Q0 */
          && ( LT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 ) )                                    /* 7 in Q8 */
          && ( NE_16( tmp, 0 ) ) )
@@ -2120,8 +2063,6 @@ void noise_est_fx(
         test();
         test();
         test();
-        test();
-        test();
         IF( ( ( LT_16( hNoiseEst->act_pred_fx, 27853 ) )                                                                    /* 0.85 in Q15 */
               && ( NE_16( aE_bgd, 0 ) ) && ( ( LT_16( hNoiseEst->lt_Ellp_dist_fx, 10 * 256 ) ) || ( NE_16( sd1_bgd, 0 ) ) ) /* 10.0 in Q8*/
               && ( LT_16( hNoiseEst->lt_tn_dist_fx, 40 * 256 ) )                                                            /* 40.0 in Q8*/
@@ -2136,6 +2077,7 @@ void noise_est_fx(
             updt_step = 32767;
             move16();
             hNoiseEst->first_noise_updt = 1;
+            move16();
             FOR( i = 0; i < NB_BANDS; i++ )
             {
                 hNoiseEst->bckr_fx[i] = tmpN[i];
@@ -2205,6 +2147,7 @@ void noise_est_fx(
         ELSE IF( ( aE_bgd != 0 ) || ( GT_16( hNoiseEst->harm_cor_cnt, 100 ) ) )
         {
             hNoiseEst->first_noise_updt = add( hNoiseEst->first_noise_updt, 1 );
+            move16();
         }
     }
     ELSE
@@ -2237,19 +2180,9 @@ void noise_est_fx(
             move16();
         }
         hNoiseEst->lt_aEn_zero_fx = noise_est_AR1_Qx( tmp, hNoiseEst->lt_aEn_zero_fx, 6554 ); /* alpha=0.2 , Q15 */
+        move16();
     }
 
-#ifdef IVAS_CODE
-    IF( GT_16( st_fx->element_mode, EVS_MONO ) )
-    {
-        test();
-        if ( hNoiseEst->first_noise_updt_cnt_fx > 0 && LT_16( hNoiseEst->first_noise_updt_cnt_fx, 100 ) )
-        {
-            hNoiseEst->first_noise_updt_cnt_fx = add( hNoiseEst->first_noise_updt_cnt_fx, 1 );
-        }
-    }
-#endif
-
     return;
 }
 
@@ -2321,10 +2254,11 @@ void noise_est_ivas_fx(
     Word16 tmp_enr, tmp_floor; /* constants in Q8 */
     Word16 vad_bwidth_fx;      /* vad ns  control variabel for input bwidth from teh BWD  */
     /* for DTX operation */
+    Word32 L_tmp;
 
-    Word16 lim_Etot_fx;     /* Q8 */
-    Word16 lim_Etot_sq_fx;  /* Q2 */
-    Word16 st_E_var_est_fx; /* Q2 */
+    Word16 lim_Etot_fx;    /* Q8 */
+    Word32 lim_Etot_sq_fx; /* Q16 */
+    Word32 st_E_var_est_fx;
     NOISE_EST_HANDLE hNoiseEst;
     SP_MUS_CLAS_HANDLE hSpMusClas;
     Word32 Le_min_scaled;
@@ -2453,13 +2387,8 @@ void noise_est_ivas_fx(
 
     Ltmp = L_deposit_h( corr_shift );
     Ltmp = L_mac( Ltmp, st_fx->voicing_fx[0], 10923 );
-#ifdef BASOP_NOGLOB
     Ltmp = L_mac_o( Ltmp, st_fx->voicing_fx[1], 10923, &Overflow );
     wtmp = mac_ro( Ltmp, st_fx->voicing_fx[2], 10923, &Overflow );
-#else  /* BASOP_NOGLOB */
-    Ltmp = L_mac( Ltmp, st_fx->voicing_fx[1], 10923 );
-    wtmp = mac_r( Ltmp, st_fx->voicing_fx[2], 10923 );
-#endif /* BASOP_NOGLOB */
 
     tmp_pc = pc;
     move16();
@@ -2469,7 +2398,7 @@ void noise_est_ivas_fx(
         move16(); /* low correlation -> probably inactive signal */
     }
 
-    move16(); /* Update */
+    /* Update */
 
     /*-----------------------------------------------------------------*
      * Multi-harmonic analysis
@@ -2604,12 +2533,8 @@ void noise_est_ivas_fx(
     ELSE
     {
         /* ftemp2 /= ftemp */
-        num = div_s( extract_h( Ltmp2 ), extract_h( Ltmp ) ); // 15+exp2-exp
-#ifdef BASOP_NOGLOB
+        num = div_s( extract_h( Ltmp2 ), extract_h( Ltmp ) );                // 15+exp2-exp
         noise_chartmp = shl_o( num, sub( sub( exp, exp2 ), 4 ), &Overflow ); // 15+exp2-exp1 -> Q11
-#else
-        noise_chartmp = shl( num, sub( sub( exp, exp2 ), 4 ) ); // 15+exp2-exp1 -> Q11
-#endif
     }
 
     if ( ncharX != NULL )
@@ -2675,11 +2600,7 @@ void noise_est_ivas_fx(
 
     /* alpha =  0.064f * ftemp  +  0.75f; */
     Ltmp = Madd_32_16( 12582912 /* 0.75 in Q24*/, 137438953, tmp ); // Q24
-#ifdef BASOP_NOGLOB
     alpha = round_fx_o( L_shl_o( Ltmp, 7, &Overflow ), &Overflow ); /*Q24 +7 --> Q31    Q15*/
-#else                                                               /* BASOP_NOGLOB */
-    alpha = round_fx( L_shl( Ltmp, 7 ) );                       /*Q24 +7 --> Q31    Q15*/
-#endif                                                              /* BASOP_NOGLOB */
 
     /*if( alpha > 0.999f  {     alpha = 0.999f;} */
     alpha = s_min( alpha, 32735 );            /*.999 in Q15*/
@@ -2741,13 +2662,9 @@ void noise_est_ivas_fx(
             ExpDen = norm_l( Lden );
             den = extract_h( L_shl( Lden, ExpDen ) ); // q_enr+ExpDen-16
 
-            num = div_s( num, den );            // 15+ExpNum-ExpDen
-            Ltmp1 = Mult_32_16( non_sta, num ); // 15+ExpNum-ExpDen+10-15
-#ifdef BASOP_NOGLOB
+            num = div_s( num, den );                                      // 15+ExpNum-ExpDen
+            Ltmp1 = Mult_32_16( non_sta, num );                           // 15+ExpNum-ExpDen+10-15
             non_sta = L_shr_o( Ltmp1, sub( ExpNum, ExpDen ), &Overflow ); /* Q10 */
-#else                                                                     /* BASOP_NOGLOB */
-            non_sta = L_shr( Ltmp1, sub( ExpNum, ExpDen ) );    /* Q10 */
-#endif                                                                    /* BASOP_NOGLOB */
         }
 
         /*    st->ave_enr[i] = alpha * st->ave_enr[i] + (1-alpha) * enr[i];*/ /* update long-term average */
@@ -2784,13 +2701,9 @@ void noise_est_ivas_fx(
             ExpDen = norm_l( Lden );
             den = extract_h( L_shl( Lden, ExpDen ) ); // q_enr+ExpDen-16
 
-            num = div_s( num, den );              // 15+ExpNum-ExpDen
-            Ltmp1 = Mult_32_16( Lnon_sta2, num ); // 15+ExpNum-ExpDen+10-15
-#ifdef BASOP_NOGLOB
+            num = div_s( num, den );                                        // 15+ExpNum-ExpDen
+            Ltmp1 = Mult_32_16( Lnon_sta2, num );                           // 15+ExpNum-ExpDen+10-15
             Lnon_sta2 = L_shr_o( Ltmp1, sub( ExpNum, ExpDen ), &Overflow ); /* Q10 */
-#else                                                                       /* BASOP_NOGLOB */
-            Lnon_sta2 = L_shr( Ltmp1, sub( ExpNum, ExpDen ) );  /* Q10 */
-#endif                                                                      /* BASOP_NOGLOB */
         }
 
         /* st_ave_enr2[i] = (float)alpha2 * st_ave_enr2[i] + (1.0f - alpha2) * (enr[i]) */
@@ -2815,11 +2728,7 @@ void noise_est_ivas_fx(
                 Ltmp1 = Mpy_32_16_1( Ltmp1, 22713 );         // Q15
                 log_enr16 = round_fx( L_shl( Ltmp1, 9 ) );   /* Q8 */
                 wtmp = abs_s( sub( log_enr16, hSpMusClas->past_log_enr_fx[i - START_BAND_SPMUS] ) );
-#ifdef BASOP_NOGLOB
                 *non_staX = add_o( *non_staX, wtmp, &Overflow );
-#else                     /* BASOP_NOGLOB */
-                *non_staX = add( *non_staX, wtmp );
-#endif                    /* BASOP_NOGLOB */
                 move16(); /* Q8 */
                 hSpMusClas->past_log_enr_fx[i - START_BAND_SPMUS] = log_enr16;
                 move16();
@@ -2844,11 +2753,7 @@ void noise_est_ivas_fx(
 
             IF( LT_16( ini_frame, 100 ) )
             {
-#ifdef BASOP_NOGLOB
                 non_staB = add_o( non_staB, abs_s( sub( tmp_enr, LN_E_MIN_PLUS_ONE_FX ) ), &Overflow ); /*  Q8  */
-#else                                                                                                   /* BASOP_NOGLOB */
-                non_staB = add( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /*  Q8  */
-#endif
             }
             ELSE /*ini_frame < 100*/
             {
@@ -2864,11 +2769,7 @@ void noise_est_ivas_fx(
                     Ltmp1 = Mpy_32_16_1( Ltmp1, 22713 );         // Q15
                     tmp_floor = round_fx( L_shl( Ltmp1, 9 ) );   /* Q8 */
                 }
-#ifdef BASOP_NOGLOB
                 non_staB = add_o( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ), &Overflow ); /*  Q8  */
-#else                                                                                        /* BASOP_NOGLOB */
-                non_staB = add( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /*  Q8  */
-#endif
             }
         }
 
@@ -2880,32 +2781,31 @@ void noise_est_ivas_fx(
         Lnon_sta2 = L_deposit_l( 1024 ); /* 1.0 in  Q10 */
     }
 
-    lim_Etot_fx = s_max( 5120, Etot );                                              /* 20.0f Q8 */
-    lim_Etot_sq_fx = extract_h( L_shl_r( L_mult( lim_Etot_fx, lim_Etot_fx ), 1 ) ); /* Q2 */
+    lim_Etot_fx = s_max( 5120, Etot );                    /* 20.0f Q8 */
+    lim_Etot_sq_fx = L_mult0( lim_Etot_fx, lim_Etot_fx ); /* Q16 */
 
-    IF( LT_16( st_fx->ini_frame, 150 ) )
+    IF( LT_16( ini_frame, 150 ) )
     {
         /* Allow use of quicker filter during init - if needed */
         /* st->Etot_st_est = 0.25f * lim_Etot + (1.0f-0.25F) * st->Etot_st_est; */
-        hNoiseEst->Etot_st_est_fx = mac_r( L_mult( 8192, lim_Etot_fx ), 24576, hNoiseEst->Etot_st_est_fx ); // Q8
-        move16();
+        hNoiseEst->L_Etot_st_est_fx = Madd_32_16_r( L_mult0( 8192, lim_Etot_fx ), hNoiseEst->L_Etot_st_est_fx, 24576 ); // Q23
+        move32();
         /* st->Etot_sq_st_est = 0.25f * lim_Etot * lim_Etot + (1.0f-0.25f) * st->Etot_sq_st_est; */
-        hNoiseEst->Etot_sq_st_est_fx = mac_r( L_mult( 8192, lim_Etot_sq_fx ), 24576, hNoiseEst->Etot_sq_st_est_fx ); // Q2
-        move16();
+        hNoiseEst->L_Etot_sq_st_est_fx = Madd_32_16_r( Mult_32_16( lim_Etot_sq_fx, 8192 ), hNoiseEst->L_Etot_sq_st_est_fx, 24576 ); // Q16
+        move32();
     }
     ELSE
     {
         /* st->Etot_st_est = 0.25f * lim_Etot + (1.0f-0.25F) * st->Etot_st_est; */
-        hNoiseEst->Etot_st_est_fx = mac_r( L_mult( 8192, lim_Etot_fx ), 24576, hNoiseEst->Etot_st_est_fx ); // Q8
-        move16();
+        hNoiseEst->L_Etot_st_est_fx = Madd_32_16_r( L_mult0( 8192, lim_Etot_fx ), hNoiseEst->L_Etot_st_est_fx, 24576 ); // Q23
+        move32();
         /* st->Etot_sq_st_est = 0.25f * lim_Etot * lim_Etot + (1.0f-0.25f) * st->Etot_sq_st_est; */
-        hNoiseEst->Etot_sq_st_est_fx = mac_r( L_mult( 8192, lim_Etot_sq_fx ), 24576, hNoiseEst->Etot_sq_st_est_fx ); // Q2
-        move16();
+        hNoiseEst->L_Etot_sq_st_est_fx = Madd_32_16_r( Mult_32_16( lim_Etot_sq_fx, 8192 ), hNoiseEst->L_Etot_sq_st_est_fx, 24576 ); // Q16
+        move32();
     }
 
-    st_E_var_est_fx = sub( hNoiseEst->Etot_sq_st_est_fx, extract_h( L_shl_r( L_mult( hNoiseEst->Etot_st_est_fx, hNoiseEst->Etot_st_est_fx ), 1 ) ) ); // Q2
-
-
+    Word16 exp_tmp;
+    st_E_var_est_fx = BASOP_Util_Add_Mant32Exp( hNoiseEst->L_Etot_sq_st_est_fx, Q15, L_negate( Mpy_32_32( hNoiseEst->L_Etot_st_est_fx, hNoiseEst->L_Etot_st_est_fx ) ), Q16, &exp_tmp ); // exp(exp_tmp)
     /*-----------------------------------------------------------------*
      * Count frames since last correlation or harmonic event
      *-----------------------------------------------------------------*/
@@ -2927,14 +2827,15 @@ void noise_est_ivas_fx(
     test();
     test();
     if ( ( GT_16( *st_harm_cor_cnt, 1 ) ) && ( ( LT_16( Etot, 3840 /* 15 in Q8 */ ) ) ||
-                                               ( GT_16( st_fx->ini_frame, 10 ) &&
+                                               ( GT_16( ini_frame, 10 ) &&
                                                  GT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 /* 7 in Q8 */ ) ) ) )
     {
         *st_harm_cor_cnt = 1;
         move16();
     }
-
-    IF( GT_16( *st_harm_cor_cnt, 1 ) && GT_16( Etot, 7680 /* 30.0f in Q8 */ ) && GT_16( st_E_var_est_fx, 32 /* 8.0f in Q2 */ ) )
+    test();
+    test();
+    IF( GT_16( *st_harm_cor_cnt, 1 ) && GT_16( Etot, 7680 /* 30.0f in Q8 */ ) && EQ_16( BASOP_Util_Cmp_Mant32Exp( st_E_var_est_fx, exp_tmp, 524288 /* 8.0f in Q16 */, Q15 ), 1 ) )
     {
         /* st->harm_cor_cnt = max(1, (short) round_f( (float) st->harm_cor_cnt / 4.0f )) ; */
         *st_harm_cor_cnt = s_max( 1, shr( add( *st_harm_cor_cnt, 2 ), 2 ) );
@@ -3090,7 +2991,7 @@ void noise_est_ivas_fx(
     move16();
 
     /* st->lt_Ellp_dist = 0.03f* (Etot - st->Etot_l_lp) + 0.97f*st->lt_Ellp_dist;*/
-    tmp = sub( Etot, hNoiseEst->Etot_l_lp_fx );                                                                                    /* Q8 */
+    tmp = sub( Etot, extract_h( hNoiseEst->Etot_l_lp_32fx ) );                                                                     /* Q8 */
     hNoiseEst->lt_Ellp_dist_fx = mac_r( L_mult( tmp, 983 /* 0.03 in Q15*/ ), hNoiseEst->lt_Ellp_dist_fx, 31785 /* 0.97 in Q15*/ ); // Q8
     move16();
 
@@ -3102,7 +3003,7 @@ void noise_est_ivas_fx(
     } */
     IF( *st_harm_cor_cnt == 0 )
     {
-        hNoiseEst->lt_haco_ev_fx = mac_r( 64424509 /* 0.03 in Q32*/, hNoiseEst->lt_haco_ev_fx, 31785 /* 0.97 in Q15*/ ); // Q15
+        hNoiseEst->lt_haco_ev_fx = mac_r( 64424509 /* 0.03 in Q31*/, hNoiseEst->lt_haco_ev_fx, 31785 /* 0.97 in Q15*/ ); // Q15
         move16();
     }
     ELSE
@@ -3191,7 +3092,7 @@ void noise_est_ivas_fx(
     test();
     test();
     IF( ( ( LT_16( *st_harm_cor_cnt, ( 3 * HC_CNT_SLOW_FX ) ) ) && ( ( GT_32( non_sta, th_sta ) ) || ( LT_16( tmp_pc, TH_PC_FX ) ) || ( noise_char > 0 ) ) ) ||
-        ( ( GT_16( st_fx->ini_frame, HE_LT_CNT_INIT_FX ) ) && ( GT_16( sub( Etot, Etot_l_lp ), 2560 ) ) ) ||
+        ( ( GT_16( ini_frame, HE_LT_CNT_INIT_FX ) ) && ( GT_16( sub( Etot, Etot_l_lp ), 2560 ) ) ) ||
         ( GT_16( cor_tmp, cor_max ) ) || /* Q15 */
         ( GT_32( LepsP, th_eps ) ) ||    /* Q11 */
         ( GT_16( *loc_harm, 0 ) ) ||
@@ -3281,7 +3182,7 @@ void noise_est_ivas_fx(
     {
         tmp = shl( tmp, 1 ); /*1.5 + 1.5  Q13 */
     }
-    Ltmp = L_deposit_h( hNoiseEst->Etot_l_lp_fx );
+    Ltmp = hNoiseEst->Etot_l_lp_32fx;
     Etot_l_lp_thr = round_fx( L_add( Ltmp, L_shl( L_mult( tmp, Etot_v_h2 ), 2 ) ) ); /* Q13+Q8+1 +2 = Q24 -> Q8*/
 
     /* enr_bgd = Etot < Etot_l_lp_thr; */
@@ -3466,8 +3367,8 @@ void noise_est_ivas_fx(
     move16();
     test();
     test();
-    if ( ( GT_16( hNoiseEst->sign_dyn_lp_fx, 15 * 256 ) )                          /* 15 in Q8  */
-         && ( LT_16( sub( Etot, hNoiseEst->Etot_l_lp_fx ), shl( Etot_v_h2, 1 ) ) ) /*  Q8 , Etot_v_h2 has limited dynmics can be upscaled*/
+    if ( ( GT_16( hNoiseEst->sign_dyn_lp_fx, 15 * 256 ) )                                         /* 15 in Q8  */
+         && ( LT_16( sub( Etot, extract_h( hNoiseEst->Etot_l_lp_32fx ) ), shl( Etot_v_h2, 1 ) ) ) /*  Q8 , Etot_v_h2 has limited dynmics can be upscaled*/
          && ( GT_16( *st_harm_cor_cnt, 20 ) ) )
     {
         sd1_bgd = 1;
@@ -3497,7 +3398,7 @@ void noise_est_ivas_fx(
     test();
     test();
     test();
-    if ( LT_16( st_fx->ini_frame, HE_LT_CNT_INIT_FX ) && GT_16( hNoiseEst->harm_cor_cnt, 5 ) && LT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 /* 7 in Q8 */ ) &&
+    if ( LT_16( ini_frame, HE_LT_CNT_INIT_FX ) && GT_16( hNoiseEst->harm_cor_cnt, 5 ) && LT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 /* 7 in Q8 */ ) &&
          ( ( LT_16( hNoiseEst->act_pred_fx, 19333 /* 0.59 in Q15 */ ) && LT_16( hNoiseEst->lt_haco_ev_fx, 7537 /* 0.23 in Q15 */ ) ) || LT_16( hNoiseEst->act_pred_fx, 12452 /* 0.38 in Q15 */ ) ||
            ( ( ( st_fx->element_mode == EVS_MONO ) && LT_16( hNoiseEst->lt_haco_ev_fx, 4915 /* 0.15 in Q15 */ ) ) || ( ( st_fx->element_mode > EVS_MONO ) && LT_16( hNoiseEst->lt_haco_ev_fx, 2621 /* 0.08 in Q15 */ ) ) ) ||
            LT_16( non_staB, 50 * 256 /* 50 in Q8 */ ) || ( aE_bgd != 0 ) || ( LT_16( Etot, 10752 /* 42.0 in Q8 */ ) && GT_16( hNoiseEst->harm_cor_cnt, 10 ) && LT_16( hNoiseEst->lt_haco_ev_fx, 11469 /* 0.35 in Q8 */ ) && LT_16( hNoiseEst->act_pred_fx, 26214 /* 0.8 in Q8 */ ) ) ) )
@@ -3593,7 +3494,7 @@ void noise_est_ivas_fx(
                 ) */
         ELSE IF( ( LT_16( hNoiseEst->act_pred_fx, 26214 /* 0.8 in Q15*/ ) && ( ( aE_bgd != 0 ) || ( PAU != 0 ) ) && ( LT_16( hNoiseEst->lt_haco_ev_fx, 3277 /* 0.1 in q15*/ ) ) ) ||
                  ( ( LT_16( hNoiseEst->act_pred_fx, 22938 /* 0.70 in Q15 */ ) ) && ( ( aE_bgd != 0 ) || ( LT_16( non_staB, 17 * 256 /* 17.0 in Q8 */ ) ) ) && ( PAU != 0 ) && ( LT_16( hNoiseEst->lt_haco_ev_fx, 4915 /* 0.15 in Q15 */ ) ) ) ||
-                 ( GT_16( hNoiseEst->harm_cor_cnt, 80 ) && GT_16( hNoiseEst->totalNoise_fx, 5 * 256 /* 5.0 in Q8 */ ) && LT_16( Etot, s_max( 1 * 256, add( Etot_l_lp, add( hNoiseEst->Etot_v_h2_fx, shr( hNoiseEst->Etot_v_h2_fx, 1 ) ) /* 1.5= 1.0+.5 */ ) ) ) ) ||
+                 ( GT_16( hNoiseEst->harm_cor_cnt, 80 ) && GT_16( hNoiseEst->totalNoise_fx, 5 * 256 /* 5.0 in Q8 */ ) && LT_16( Etot, s_max( 1 * 256, add( Etot_l_lp, extract_h( L_add( hNoiseEst->Etot_v_h2_32fx, L_shr( hNoiseEst->Etot_v_h2_32fx, 1 ) ) ) /* 1.5= 1.0+.5 */ ) ) ) ) ||
                  ( GT_16( hNoiseEst->harm_cor_cnt, 50 ) && GT_16( hNoiseEst->first_noise_updt, 30 ) && ( aE_bgd != 0 ) && GT_16( hNoiseEst->lt_aEn_zero_fx, 16384 /*.5 in Q15*/ ) ) || ( tn_ini != 0 ) )
         {
             updt_step = 3277;
@@ -3659,20 +3560,20 @@ void noise_est_ivas_fx(
     }
     /*st->lt_aEn_zero = 0.2f * (st->aEn==0) + (1-0.2f)  *st->lt_aEn_zero;*/
     /*  y(n+1)=        alpha*tmp            + (1-alpha)*y(n)           */
-    tmp = 0;
-    move16();
+    L_tmp = 0;
+    move32();
     if ( hNoiseEst->aEn == 0 )
     {
-        tmp = 6554; // 0.2 in Q15
-        move16();
+        L_tmp = 429496730; // 0.2 in Q31
+        move32();
     }
-    hNoiseEst->lt_aEn_zero_fx = mac_r( tmp, hNoiseEst->lt_aEn_zero_fx, 26214 /* 0.8 in Q15*/ ); // Q15
+    hNoiseEst->lt_aEn_zero_fx = mac_r( L_tmp, hNoiseEst->lt_aEn_zero_fx, 26214 /* 0.8 in Q15*/ ); // Q15
     move16();
 
     IF( st_fx->element_mode > EVS_MONO )
     {
         test();
-        if ( hNoiseEst->first_noise_updt > 0 && LT_16( hNoiseEst->first_noise_updt_cnt, 100 ) )
+        IF( hNoiseEst->first_noise_updt > 0 && LT_16( hNoiseEst->first_noise_updt_cnt, 100 ) )
         {
             hNoiseEst->first_noise_updt_cnt = add( hNoiseEst->first_noise_updt_cnt, 1 );
             move16();
diff --git a/lib_enc/noise_adjust.c b/lib_enc/noise_adjust.c
deleted file mode 100644
index d441f6ead49ddcb3a6a1ffab0962633db8157cd0..0000000000000000000000000000000000000000
--- a/lib_enc/noise_adjust.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/normalizecoefs.c b/lib_enc/normalizecoefs.c
deleted file mode 100644
index 8f0950fbae8f9f2c626e0122b0369502d15bcff1..0000000000000000000000000000000000000000
--- a/lib_enc/normalizecoefs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*--------------------------------------------------------------------------
- * normalizecoefs()
- *
- * Normalize MDCT coefficients with quantized norms
- *--------------------------------------------------------------------------*/
diff --git a/lib_enc/normalizecoefs_fx.c b/lib_enc/normalizecoefs_fx.c
index f6f5eedee7a031fce359b4471da4a17cf0aa892c..ea394f54bd29ca2e04f9320d4a5196335a727b69 100644
--- a/lib_enc/normalizecoefs_fx.c
+++ b/lib_enc/normalizecoefs_fx.c
@@ -31,6 +31,7 @@ void normalizecoefs_fx(
     Word16 subvec_start, subvec_end, num_coefs;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     pcoefs = coefs;
     pcoefs16 = coefs_norm;
@@ -54,13 +55,8 @@ void normalizecoefs_fx(
                 *pcoefs = Mpy_32_16_1( *pcoefs, INV2POWHALF );
                 move32();
             }
-#ifdef BASOP_NOGLOB
             *pcoefs16++ = round_fx_o( L_shl_o( *pcoefs++, 16 - k, &Overflow ), &Overflow ); /* Q12 */
-#else
-            BASOP_SATURATE_WARNING_OFF_EVS                            /* May saturate for strong peaks in a high band, in which case saturation is desirable */
-                *pcoefs16++ = round_fx( L_shl( *pcoefs++, 16 - k ) ); /* Q12 */
-            BASOP_SATURATE_WARNING_ON_EVS
-#endif
+            move16();
         }
     }
 
diff --git a/lib_enc/peak_vq_enc.c b/lib_enc/peak_vq_enc.c
deleted file mode 100644
index 867e40cdc445406ceb1dc5e53245e971abe03b05..0000000000000000000000000000000000000000
--- a/lib_enc/peak_vq_enc.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include <assert.h>
diff --git a/lib_enc/peak_vq_enc_fx.c b/lib_enc/peak_vq_enc_fx.c
index 9ea1af949121921157f3952fb153362c7ddb243a..dffab490016b224c5abeea742c81d24cf7d79e0b 100644
--- a/lib_enc/peak_vq_enc_fx.c
+++ b/lib_enc/peak_vq_enc_fx.c
@@ -11,7 +11,6 @@
 #include "rom_com_fx.h"
 #include "rom_com.h"
 #include "prot_fx.h"     /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*--------------------------------------------------------------------------
@@ -560,13 +559,13 @@ Word16 peak_vq_enc_fx(
         move32();
         nf_gains[i] = L_shr( acc, 1 + 2 ); /* nf_gains in Q12. dicn_fx is in Q14. Need extra shift +2. */
         move32();
-        push_indice_fx( hBstr, IND_HVQ_NF_GAIN, indx, 5 );
+        push_indice( hBstr, IND_HVQ_NF_GAIN, indx, 5 );
         bits = add( bits, 5 );
     }
 
     /* Signal number of peaks */
     i = sub( max_peaks, vq_peaks );
-    push_indice_fx( hBstr, IND_NUM_PEAKS, i, 5 );
+    push_indice( hBstr, IND_NUM_PEAKS, i, 5 );
     bits = add( bits, 5 );
 
     /* Identify position of first peak and arrange peak gains by position */
@@ -678,8 +677,8 @@ Word16 peak_vq_enc_fx(
         move16();
     }
 
-    push_indice_fx( hBstr, IND_FLAGN, FlagN, 1 );
-    push_indice_fx( hBstr, IND_PG_IDX, pgain_difidx[0], GAIN0_BITS );
+    push_indice( hBstr, IND_FLAGN, FlagN, 1 );
+    push_indice( hBstr, IND_PG_IDX, pgain_difidx[0], GAIN0_BITS );
 
     IF( FlagN )
     {
@@ -693,7 +692,7 @@ Word16 peak_vq_enc_fx(
             r = pgain_huffsizn[j];
             move16();
 
-            push_indice_fx( hBstr, IND_PG_IDX, m, r );
+            push_indice( hBstr, IND_PG_IDX, m, r );
         }
     }
     ELSE
@@ -701,7 +700,7 @@ Word16 peak_vq_enc_fx(
         pPgainDifIdx = &pgain_difidx[1];
         FOR( i = 0; i < vqPeaksMinus1; i++ )
         {
-            push_indice_fx( hBstr, IND_PG_IDX, ( *pPgainDifIdx++ ), GAINI_BITS );
+            push_indice( hBstr, IND_PG_IDX, ( *pPgainDifIdx++ ), GAINI_BITS );
         }
     }
 
@@ -728,13 +727,13 @@ Word16 peak_vq_enc_fx(
         num_overlap_bins = sub( 5, sub( vq_peak_idx[i + 1], vq_peak_idx[i] ) );
         indx = sub( vq_peak_idx[i], 2 );
         quant_peaks_fx( hBstr, &coefs[indx], &coefs_out[indx], &peak_gains[i], &vq_cb_idx, num_overlap_bins, core_brate, vq_peaks );
-        push_indice_fx( hBstr, IND_HVQ_PEAKS, vq_cb_idx, 8 );
+        push_indice( hBstr, IND_HVQ_PEAKS, vq_cb_idx, 8 );
         bits = add( bits, 9 );
     }
 
     indx = sub( vq_peak_idx[i], 2 );
     quant_peaks_fx( hBstr, &coefs[indx], &coefs_out[indx], &peak_gains[i], &vq_cb_idx, 0, core_brate, vq_peaks );
-    push_indice_fx( hBstr, IND_HVQ_PEAKS, vq_cb_idx, 8 );
+    push_indice( hBstr, IND_HVQ_PEAKS, vq_cb_idx, 8 );
     bits = add( bits, 9 );
 
     /* Quantize peak positions and sign with HVQ */
@@ -827,7 +826,7 @@ Word16 peak_vq_enc_fx(
             move16();
         }
 
-        push_indice_fx( hBstr, IND_HVQ_PVQ_GAIN, pvq_norm[k], HVQ_PVQ_GAIN_BITS );
+        push_indice( hBstr, IND_HVQ_PVQ_GAIN, pvq_norm[k], HVQ_PVQ_GAIN_BITS );
         pvq_bits = add( pvq_bits, HVQ_PVQ_GAIN_BITS );
 
         pvq_norm[k] = add( pvq_norm[k], 8 );
@@ -1149,7 +1148,7 @@ static void quant_peaks_fx(
     {
         *vq_idx = w_vquant_fx( x, Qx, weights, xq, hvq_peak_cb_fx, cbSize, 0 );
         move16();
-        push_indice_fx( hBstr, IND_HVQ_PEAKS, 0, 1 );
+        push_indice( hBstr, IND_HVQ_PEAKS, 0, 1 );
     }
     ELSE IF( EQ_16( cb_class, 1 ) )
     {
@@ -1158,7 +1157,7 @@ static void quant_peaks_fx(
         move16();
         *vq_idx = add( *vq_idx, sub( HVQ_CB_SIZE / 2, search_overlap ) );
         move16();
-        push_indice_fx( hBstr, IND_HVQ_PEAKS, 0, 1 );
+        push_indice( hBstr, IND_HVQ_PEAKS, 0, 1 );
     }
     ELSE IF( EQ_16( cb_class, 2 ) )
     {
@@ -1167,13 +1166,13 @@ static void quant_peaks_fx(
         move16();
         *vq_idx = add( *vq_idx, sub( HVQ_CB_SIZE / 2, search_overlap ) );
         move16();
-        push_indice_fx( hBstr, IND_HVQ_PEAKS, 1, 1 );
+        push_indice( hBstr, IND_HVQ_PEAKS, 1, 1 );
     }
     ELSE
     {
         *vq_idx = w_vquant_fx( x, Qx, weights, xq, hvq_peak_cb_fx, cbSize, 1 );
         move16();
-        push_indice_fx( hBstr, IND_HVQ_PEAKS, 1, 1 );
+        push_indice( hBstr, IND_HVQ_PEAKS, 1, 1 );
     }
 
     FOR( i = 0; i < 4; i++ )
@@ -1459,23 +1458,23 @@ static Word16 hvq_code_pos_fx(
     test();
     IF( GT_16( delta_bits, sparse_bits ) || delta_bits < 0 )
     {
-        push_indice_fx( hBstr, IND_POS_IDX, HVQ_CP_SPARSE, 1 );
+        push_indice( hBstr, IND_POS_IDX, HVQ_CP_SPARSE, 1 );
 
         FOR( i = 0; i < sparse_bits; i++ )
         {
-            push_indice_fx( hBstr, IND_POS_IDX, sparse_result[i], 1 );
+            push_indice( hBstr, IND_POS_IDX, sparse_result[i], 1 );
         }
         bits = add( add( bits, sparse_bits ), 1 );
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_POS_IDX, HVQ_CP_DELTA, 1 );
+        push_indice( hBstr, IND_POS_IDX, HVQ_CP_DELTA, 1 );
 
         FOR( i = 0; i < num_peaks; i++ )
         {
             j = delta[i];
             move16();
-            push_indice_fx( hBstr, IND_POS_IDX, hvq_cp_huff_val[j], hvq_cp_huff_len[j] );
+            push_indice( hBstr, IND_POS_IDX, hvq_cp_huff_val[j], hvq_cp_huff_len[j] );
         }
         bits = add( add( bits, delta_bits ), 1 );
     }
@@ -1490,7 +1489,7 @@ static Word16 hvq_code_pos_fx(
             tmp = 0;
             move16();
         }
-        push_indice_fx( hBstr, IND_POS_IDX, tmp, 1 );
+        push_indice( hBstr, IND_POS_IDX, tmp, 1 );
     }
     bits = add( bits, num_peaks );
 
diff --git a/lib_enc/pit_enc.c b/lib_enc/pit_enc.c
deleted file mode 100644
index 224203cb0ee0bd99d04af22294321c92c62da034..0000000000000000000000000000000000000000
--- a/lib_enc/pit_enc.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/pit_enc_fx.c b/lib_enc/pit_enc_fx.c
index c91f34e96c680ae91e98b812a76ea1a192ff8898..8eea1b3d52b398655e3a8b03fc5a76262f006ed9 100644
--- a/lib_enc/pit_enc_fx.c
+++ b/lib_enc/pit_enc_fx.c
@@ -10,7 +10,6 @@
 #include "rom_com.h"    /* Static table prototypes                */
 //#include "prot_fx.h"       /* Function prototypes                    */
 #include "rom_basop_util.h"
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
@@ -81,9 +80,7 @@ Word16 pit_encode_fx(                                    /* o  : Fractional pitc
     Word16 pit_flag, delta, mult_Top, nBits;
     Word16 L_sufr_sft;
     Word16 T_op[2]; /* values for two half-frames */
-#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) tdm_Pitch_reuse_flag;
-#endif
 
     L_sufr_sft = 6;
     move16();
@@ -268,48 +265,6 @@ Word16 pit_encode_fx(                                    /* o  : Fractional pitc
 
             pit_Q_enc_fx( hBstr, 0, nBits, delta, pit_flag, *limit_flag, *T0, *T0_frac, T0_min, T0_max );
         }
-#ifdef ADD_LRTD
-        else if ( tdm_Pitch_reuse_flag == 1 || nBits == 4 )
-        {
-            /*-------------------------------------------------------*
-             *  Pitch encoding with reusing primary channel information
-             *-------------------------------------------------------*/
-            int16_t loc_T0, loc_frac;
-
-            delta = 4;
-
-            pit_flag = L_SUBFR;
-
-            if ( L_subfr == 2 * L_SUBFR )
-            {
-                loc_T0 = (int16_t) ( 0.5f * tdm_Pri_pitch_buf[i_subfr / L_SUBFR] + 0.5f * tdm_Pri_pitch_buf[( i_subfr + L_SUBFR ) / L_SUBFR] );
-                loc_frac = (int16_t) ( ( ( 0.5f * tdm_Pri_pitch_buf[i_subfr / L_SUBFR] + 0.5f * tdm_Pri_pitch_buf[( i_subfr + L_SUBFR ) / L_SUBFR] ) - loc_T0 ) * 4.0f );
-            }
-            else
-            {
-                loc_T0 = (int16_t) tdm_Pri_pitch_buf[i_subfr / L_SUBFR];
-                loc_frac = (int16_t) ( ( tdm_Pri_pitch_buf[i_subfr / L_SUBFR] - loc_T0 ) * 4.0f );
-            }
-
-            /* pitch lag search limitation */
-            limit_T0( L_FRAME, delta, pit_flag, *limit_flag, loc_T0, loc_frac, T0_min, T0_max );
-            if ( nBits > 0 )
-            {
-                /* search and encode the closed loop pitch period */
-                *T0 = pitch_fr4( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
-                if ( delta == 8 )
-                {
-                    *T0_frac = 0;
-                }
-                pit_Q_enc( hBstr, 0, nBits, delta, pit_flag, *limit_flag, *T0, *T0_frac, T0_min, T0_max );
-            }
-            else
-            {
-                *T0 = loc_T0;
-                *T0_frac = loc_frac;
-            }
-        }
-#endif
         ELSE
         {
             /*-------------------------------------------------------*
@@ -487,26 +442,27 @@ Word16 pit_encode_fx(                                    /* o  : Fractional pitc
     return pitch_cl;
 }
 
-Word16 pit_encode_ivas_fx(                                    /* o  : Fractional pitch for each subframe         */
-                           BSTR_ENC_HANDLE hBstr,             /* i/o:  encoder bitstream handle */
-                           const Word16 pitch_bits[],         /* i  : pitch bits                                  */
-                           const Word32 core_brate,           /* i  : core bitrate                               */
-                           const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode             */
-                           const Word16 L_frame,              /* i  : length of the frame                        */
-                           const Word16 coder_type,           /* i  : coding type                                */
-                           Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits      */
-                           const Word16 i_subfr,              /* i  : subframe index                             */
-                           Word16 *exc,                       /* i/o: pointer to excitation signal frame         */
-                           const Word16 L_subfr,              /* i  : subframe length                            */
-                           const Word16 *pitch,               /* i  : open loop pitch estimates in current frame */
-                           Word16 *T0_min,                    /* i/o: lower limit for close-loop search          */
-                           Word16 *T0_max,                    /* i/o: higher limit for close-loop search         */
-                           Word16 *T0,                        /* i/o: close loop integer pitch                   */
-                           Word16 *T0_frac,                   /* i/o: close loop fractional part of the pitch    */
-                           const Word16 *h1,                  /* i  : weighted filter input response             */
-                           const Word16 *xn,                  /* i  : target vector                              */
-                           const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag            */
-                           const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer                */
+Word16 pit_encode_ivas_fx(                                    /* o  : Fractional pitch for each subframe                  */
+                           BSTR_ENC_HANDLE hBstr,             /* i/o:  encoder bitstream handle                           */
+                           const Word16 pitch_bits[],         /* i  : pitch bits                                          */
+                           const Word32 core_brate,           /* i  : core bitrate                                        */
+                           const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode                      */
+                           const Word16 L_frame,              /* i  : length of the frame                                 */
+                           const Word16 coder_type,           /* i  : coding type                                         */
+                           Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits               */
+                           const Word16 i_subfr,              /* i  : subframe index                                      */
+                           Word16 *exc,                       /* i/o: pointer to excitation signal frame  Q_new           */
+                           const Word16 L_subfr,              /* i  : subframe length                                     */
+                           const Word16 *pitch,               /* i  : open loop pitch estimates in current frame          */
+                           Word16 *T0_min,                    /* i/o: lower limit for close-loop search                   */
+                           Word16 *T0_max,                    /* i/o: higher limit for close-loop search                  */
+                           Word16 *T0,                        /* i/o: close loop integer pitch                            */
+                           Word16 *T0_frac,                   /* i/o: close loop fractional part of the pitch             */
+                           const Word16 *h1,                  /* i  : weighted filter input response Q(14 - norm_s(h1[0]) */
+                           const Word16 *xn,                  /* i  : target vector                  Q_new                */
+                           const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag                    */
+                           const Word16 tdm_Pri_pitch_buf[],  /* i  : primary channel pitch buffer                        */
+                           Word16 Q_new                       /* i                                                        */
 )
 {
     Word16 pitch_cl;
@@ -617,6 +573,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
         {
             nBits = pitch_bits[i_subfr >> L_sufr_sft];
         }
+        test();
         IF( EQ_16( coder_type, AUDIO ) )
         {
             /*-------------------------------------------------------*
@@ -628,7 +585,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             move16();
             test();
             test();
-            if ( EQ_16( L_subfr, L_frame / 2 ) && i_subfr != 0 && EQ_16( L_frame, L_FRAME ) )
+            if ( EQ_16( L_subfr, shr( L_frame, 1 ) ) && i_subfr != 0 && EQ_16( L_frame, L_FRAME ) )
             {
                 pit_flag = L_SUBFR;
                 move16();
@@ -656,7 +613,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             }
 
             /* search and encode the closed loop pitch period */
-            *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MAX, PIT_MAX, L_FRAME, L_subfr );
+            *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MAX, PIT_MAX, L_FRAME, L_subfr, Q_new );
             move16();
             pit_Q_enc_ivas_fx( hBstr, 0, nBits, delta, pit_flag, *limit_flag, *T0, *T0_frac, T0_min, T0_max );
         }
@@ -684,19 +641,17 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             test();
             IF( EQ_16( nBits, 9 ) || EQ_16( nBits, 5 ) )
             {
-                *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_DOUBLEEXTEND_9b, PIT_FR1_DOUBLEEXTEND_9b, L_FRAME, L_SUBFR );
+                *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_DOUBLEEXTEND_9b, PIT_FR1_DOUBLEEXTEND_9b, L_FRAME, L_SUBFR, Q_new );
                 move16();
             }
             ELSE IF( EQ_16( nBits, 10 ) )
             {
-                *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MAX, PIT_MAX, L_FRAME, L_SUBFR );
+                *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MAX, PIT_MAX, L_FRAME, L_SUBFR, Q_new );
                 move16();
             }
 
             pit_Q_enc_ivas_fx( hBstr, 0, nBits, delta, pit_flag, *limit_flag, *T0, *T0_frac, T0_min, T0_max );
         }
-#if 1
-        //#ifdef ADD_LRTD
         ELSE IF( EQ_16( tdm_Pitch_reuse_flag, 1 ) || EQ_16( nBits, 4 ) )
         {
             /*-------------------------------------------------------*
@@ -731,7 +686,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             IF( nBits > 0 )
             {
                 /* search and encode the closed loop pitch period */
-                *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR, Q_new );
                 move16();
                 IF( EQ_16( delta, 8 ) )
                 {
@@ -748,7 +703,6 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
                 move16();
             }
         }
-#endif
         ELSE
         {
             /*-------------------------------------------------------*
@@ -778,12 +732,12 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
                 {
                     IF( *limit_flag == 0 )
                     {
-                        *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                        *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR, Q_new );
                         move16();
                     }
                     ELSE
                     {
-                        *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN_EXTEND, PIT_FR1_EXTEND_8b, L_FRAME, L_SUBFR );
+                        *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN_EXTEND, PIT_FR1_EXTEND_8b, L_FRAME, L_SUBFR, Q_new );
                         move16();
                     }
                 }
@@ -791,18 +745,18 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
                 {
                     IF( *limit_flag == 0 )
                     {
-                        *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+                        *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR, Q_new );
                         move16();
                     }
                     ELSE
                     {
-                        *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_EXTEND_9b, PIT_FR1_EXTEND_9b, L_FRAME, L_SUBFR );
+                        *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_EXTEND_9b, PIT_FR1_EXTEND_9b, L_FRAME, L_SUBFR, Q_new );
                         move16();
                     }
                 }
                 ELSE IF( EQ_16( nBits, 10 ) )
                 {
-                    *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MAX, PIT_MAX, L_FRAME, L_SUBFR );
+                    *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MAX, PIT_MAX, L_FRAME, L_SUBFR, Q_new );
                 }
 
                 pit_Q_enc_ivas_fx( hBstr, 0, nBits, delta, pit_flag, *limit_flag, *T0, *T0_frac, T0_min, T0_max );
@@ -812,12 +766,12 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
                 test();
                 IF( EQ_16( nBits, 9 ) || EQ_16( nBits, 6 ) )
                 {
-                    *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT16k_FR2_EXTEND_9b, PIT16k_FR1_EXTEND_9b, L_FRAME16k, L_SUBFR );
+                    *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT16k_FR2_EXTEND_9b, PIT16k_FR1_EXTEND_9b, L_FRAME16k, L_SUBFR, Q_new );
                     move16();
                 }
                 ELSE IF( EQ_16( nBits, 10 ) )
                 {
-                    *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, L_FRAME16k, L_SUBFR );
+                    *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, L_FRAME16k, L_SUBFR, Q_new );
                     move16();
                 }
 
@@ -858,7 +812,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             }
 
             /* search and encode the closed loop pitch period */
-            *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+            *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR, Q_new );
             move16();
         }
         ELSE IF( EQ_32( core_brate, ACELP_8k85 ) )
@@ -881,7 +835,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             }
 
             /* search and encode the closed loop pitch period */
-            *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+            *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR, Q_new );
             move16();
         }
         ELSE
@@ -908,7 +862,7 @@ Word16 pit_encode_ivas_fx(                                    /* o  : Fractional
             }
 
             /* search and encode the closed loop pitch period */
-            *T0 = pitch_fr4_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+            *T0 = pitch_fr4_ivas_fx( &exc[i_subfr], xn, h1, *T0_min, *T0_max, T0_frac, pit_flag, *limit_flag, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR, Q_new );
             move16();
         }
 
@@ -1156,19 +1110,20 @@ Word16 delta_pit_enc_fx(                        /* o  : pitch index
  *
  * Find the closed loop pitch period with 1/4 subsample resolution.
  *-------------------------------------------------------------------*/
-Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch lag                 */
-                          const Word16 exc[],      /* i  : excitation buffer                          Q_new*/
-                          const Word16 xn[],       /* i  : target signal                              Q_new-1+shift*/
-                          const Word16 h[],        /* i  : weighted synthesis filter impulse response Q(14+shift)*/
-                          const Word16 t0_min,     /* i  : minimum value in the searched range.       Q0*/
-                          const Word16 t0_max,     /* i  : maximum value in the searched range.       Q0*/
-                          Word16 *pit_frac,        /* o  : chosen fraction (0, 1, 2 or 3)             */
-                          const Word16 i_subfr,    /* i  : flag to first subframe                     */
-                          const Word16 limit_flag, /* i  : flag for limits (0=restrained, 1=extended) */
-                          const Word16 t0_fr2,     /* i  : minimum value for resolution 1/2           */
-                          const Word16 t0_fr1,     /* i  : minimum value for resolution 1             */
-                          const Word16 L_frame,    /* i  : length of the frame                        */
-                          const Word16 L_subfr     /* i  : size of subframe                           */
+Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch lag                                       */
+                          const Word16 exc[],      /* i  : excitation buffer                          Q_new               */
+                          const Word16 xn[],       /* i  : target signal                              Q_new-1             */
+                          const Word16 h[],        /* i  : weighted synthesis filter impulse response Q(14 - norm_s[h[0]) */
+                          const Word16 t0_min,     /* i  : minimum value in the searched range.       Q0                  */
+                          const Word16 t0_max,     /* i  : maximum value in the searched range.       Q0                  */
+                          Word16 *pit_frac,        /* o  : chosen fraction (0, 1, 2 or 3)                                 */
+                          const Word16 i_subfr,    /* i  : flag to first subframe                                         */
+                          const Word16 limit_flag, /* i  : flag for limits (0=restrained, 1=extended)                     */
+                          const Word16 t0_fr2,     /* i  : minimum value for resolution 1/2                               */
+                          const Word16 t0_fr1,     /* i  : minimum value for resolution 1                                 */
+                          const Word16 L_frame,    /* i  : length of the frame                                            */
+                          const Word16 L_subfr,    /* i  : size of subframe                                               */
+                          Word16 Q_new             /* i                                                                   */
 )
 {
     Word16 i;
@@ -1225,7 +1180,7 @@ Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch
     move16();
     move16(); /* corr[t_min..t_max] */
 
-    norm_corr_ivas_fx( exc, xn, h, t_min, t_max, corr, L_subfr );
+    norm_corr_ivas_fx( exc, xn, h, t_min, t_max, corr, L_subfr, Q_new );
 
     /*-----------------------------------------------------------------*
      * Find integer pitch
@@ -1238,7 +1193,7 @@ Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch
 
     FOR( i = add( t0_min, 1 ); i <= t0_max; i++ )
     {
-        if ( corr[i] >= max_val )
+        if ( GE_16( corr[i], max_val ) )
         {
             t0 = i;
             move16();
@@ -1346,6 +1301,7 @@ Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch
 
     return ( t0 );
 }
+
 Word16 pitch_fr4_fx(                          /* o  : chosen integer pitch lag                 */
                      const Word16 exc[],      /* i  : excitation buffer                          Q_new*/
                      const Word16 xn[],       /* i  : target signal                              Q_new-1+shift*/
@@ -1545,51 +1501,35 @@ Word16 pitch_fr4_fx(                          /* o  : chosen integer pitch lag
  * excitation)
  *---------------------------------------------------------------------*/
 void norm_corr_ivas_fx(
-    const Word16 exc[],  /* i  : excitation buffer                          Q_new*/
-    const Word16 xn[],   /* i  : target signal                              Q_new-1+shift*/
-    const Word16 h[],    /* i  : weighted synthesis filter impulse response Q(14+shift)*/
-    const Word16 t_min,  /* i  : minimum value of searched range            */
-    const Word16 t_max,  /* i  : maximum value of searched range            */
-    Word16 ncorr[],      /* o  : normalized correlation                     Q15 */
-    const Word16 L_subfr /* i  : subframe size                              */
+    const Word16 exc[],   /* i  : excitation buffer                          Q_new                */
+    const Word16 xn[],    /* i  : target signal                              Q_new-1              */
+    const Word16 h[],     /* i  : weighted synthesis filter impulse response Q(14 - norm_s(h[0])) */
+    const Word16 t_min,   /* i  : minimum value of searched range                                 */
+    const Word16 t_max,   /* i  : maximum value of searched range                                 */
+    Word16 ncorr[],       /* o  : normalized correlation                                          */
+    const Word16 L_subfr, /* i  : subframe size                                                   */
+    Word16 Q_new          /* i                                                                    */
 )
 {
     Word16 i, k, t;
-    Word16 corr, exp_corr, norm, exp_norm, exp, scale;
+    Word16 corr, exp_corr, norm, exp_norm, exp;
     Word16 excf[L_FRAME16k];
+    Word16 ncorr_e[15 + 2 * L_INTERPOL1 + 1];
+    Word16 h_e, e_max;
     Word32 L_tmp;
     Word64 W_tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     k = negate( t_min );
-
+    h_e = add( 1, norm_s( h[0] ) ); // exponent of h
     /*-----------------------------------------------------------------*
      * compute the filtered excitation for the first delay t_min
      *-----------------------------------------------------------------*/
 
-    conv_fx( &exc[k], h, excf, L_subfr );
-
-    /* Compute rounded down 1/sqrt(energy of xn[]) */
-#ifdef BASOP_NOGLOB
-    L_tmp = L_mac_o( 1, xn[0], xn[0], &Overflow );
-#else
-    L_tmp = L_mac( 1, xn[0], xn[0] );
-#endif
-    FOR( i = 1; i < L_subfr; i++ )
-    {
-#ifdef BASOP_NOGLOB
-        L_tmp = L_mac_o( L_tmp, xn[i], xn[i], &Overflow );
-#else /* BASOP_NOGLOB */
-        L_tmp = L_mac( L_tmp, xn[i], xn[i] );
-#endif
-    }
-    exp = norm_l( L_tmp );
-    exp = sub( 30, exp );
-
-    exp = add( exp, 2 );             /* energy of xn[] x 2 + rounded up     */
-    scale = negate( shr( exp, 1 ) ); /* (1<<scale) < 1/sqrt(energy rounded) */
+    conv_fx( &exc[k], h, excf, L_subfr ); // Q_new - h_e
 
     /*----------------------------------------------------------------*
      * loop for every possible period
@@ -1599,43 +1539,39 @@ void norm_corr_ivas_fx(
     {
         /* Compute correlation between xn[] and excf[] */
 
-        L_tmp = L_mac( 1, xn[0], excf[0] );
+        L_tmp = L_mac( 0, xn[0], excf[0] );
         FOR( i = 1; i < L_subfr; i++ )
         {
-#ifdef BASOP_NOGLOB
-            L_tmp = L_mac_o( L_tmp, xn[i], excf[i], &Overflow );
-#else
-            L_tmp = L_mac( L_tmp, xn[i], excf[i] );
-#endif
+            L_tmp = L_mac_o( L_tmp, xn[i], excf[i], &Overflow ); // (Q_new - 1) + (Q_new - h_e) + 1
         }
         exp = norm_l( L_tmp );
         L_tmp = L_shl( L_tmp, exp );
-        exp_corr = sub( 30, exp );
+        exp_corr = sub( 31, add( exp, ( Q_new - 1 ) + ( Q_new - h_e ) + 1 ) );
         corr = extract_h( L_tmp );
 
         /* Compute 1/sqrt(energy of excf[]) */
-        W_tmp = W_mac_16_16( 1, excf[0], excf[0] );
+        Word16 _0_01 = extract_l( L_shr( 21474836 /* 0.01 in Q31 */, sub( 31, add( shl( sub( Q_new, h_e ), 1 ), 1 ) ) ) );
+
+        W_tmp = W_mac_16_16( _0_01, excf[0], excf[0] );
         FOR( i = 1; i < L_subfr; i++ )
         {
-            W_tmp = W_mac_16_16( W_tmp, excf[i], excf[i] );
+            W_tmp = W_mac_16_16( W_tmp, excf[i], excf[i] ); // 2*(Q_new - h_e) + 1
         }
 
-        exp = sub( W_norm( W_tmp ), 32 );
-        L_tmp = W_extract_l( W_shl( W_tmp, exp ) );
-        exp_norm = sub( 30, exp );
+        exp = W_norm( W_tmp );
+        L_tmp = W_extract_h( W_shl( W_tmp, exp ) ); // 2*(Q_new - h_e) + 1 + exp - 32
+        exp_norm = sub( 31 + 32, add( add( shl( sub( Q_new, h_e ), 1 ), 1 ), exp ) );
 
         L_tmp = Isqrt_lc( L_tmp, &exp_norm );
         norm = extract_h( L_tmp );
 
         /* Normalize correlation = correlation * (1/sqrt(energy)) */
         L_tmp = L_mult( corr, norm );
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shl_sat( L_tmp, add( add( exp_corr, exp_norm ), scale ) );
+
         ncorr[t] = round_fx_sat( L_tmp );
-#else
-        L_tmp = L_shl( L_tmp, add( add( exp_corr, exp_norm ), scale ) );
-        ncorr[t] = round_fx( L_tmp );
-#endif
+        ncorr_e[t - t_min] = add( exp_corr, exp_norm );
+        move16();
+        move16();
 
         /* update the filtered excitation excf[] for the next iteration */
         IF( NE_16( t, t_max ) )
@@ -1644,21 +1580,25 @@ void norm_corr_ivas_fx(
             FOR( i = (Word16) ( L_subfr - 1 ); i > 0; i-- )
             {
                 /* saturation can occur in add() */
-                /*excf[i] = add(mult(exc[k], h[i]), excf[i - 1]);     move16();       */
-#ifdef BASOP_NOGLOB
                 excf[i] = round_fx_sat( L_mac_sat( L_mult( excf[i - 1], 32767 ), exc[k], h[i] ) );
-#else
-                excf[i] = round_fx( L_mac( L_mult( excf[i - 1], 32767 ), exc[k], h[i] ) );
-#endif
+                move16();
             }
             excf[0] = mult_r( exc[k], h[0] );
             move16();
         }
     }
+    // Aligning the values of ncorr to a common exponent
+    maximum_fx( ncorr_e, t_max + 1 - t_min, &e_max );
+    FOR( t = t_min; t <= t_max; t++ )
+    {
+        ncorr[t] = shr( ncorr[t], sub( e_max, ncorr_e[t - t_min] ) );
+        move16();
+    }
 
     return;
 }
 
+
 void norm_corr_fx(
     const Word16 exc[],  /* i  : excitation buffer                          Q_new*/
     const Word16 xn[],   /* i  : target signal                              Q_new-1+shift*/
@@ -1687,18 +1627,10 @@ void norm_corr_fx(
     conv_fx( &exc[k], h, excf, L_subfr );
 
     /* Compute rounded down 1/sqrt(energy of xn[]) */
-#ifdef BASOP_NOGLOB
     L_tmp = L_mac_o( 1, xn[0], xn[0], &Overflow );
-#else
-    L_tmp = L_mac( 1, xn[0], xn[0] );
-#endif
     FOR( i = 1; i < L_subfr; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_o( L_tmp, xn[i], xn[i], &Overflow );
-#else /* BASOP_NOGLOB */
-        L_tmp = L_mac( L_tmp, xn[i], xn[i] );
-#endif
     }
     exp = norm_l( L_tmp );
     exp = sub( 30, exp );
@@ -1717,11 +1649,7 @@ void norm_corr_fx(
         L_tmp = L_mac( 1, xn[0], excf[0] );
         FOR( i = 1; i < L_subfr; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac_o( L_tmp, xn[i], excf[i], &Overflow );
-#else
-            L_tmp = L_mac( L_tmp, xn[i], excf[i] );
-#endif
         }
         exp = norm_l( L_tmp );
         L_tmp = L_shl( L_tmp, exp );
@@ -1732,11 +1660,7 @@ void norm_corr_fx(
         L_tmp = L_mac( 1, excf[0], excf[0] );
         FOR( i = 1; i < L_subfr; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac_o( L_tmp, excf[i], excf[i], &Overflow );
-#else
-            L_tmp = L_mac( L_tmp, excf[i], excf[i] );
-#endif
         }
 
         exp = norm_l( L_tmp );
@@ -1748,13 +1672,8 @@ void norm_corr_fx(
 
         /* Normalize correlation = correlation * (1/sqrt(energy)) */
         L_tmp = L_mult( corr, norm );
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_sat( L_tmp, add( add( exp_corr, exp_norm ), scale ) );
         ncorr[t] = round_fx_sat( L_tmp );
-#else
-        L_tmp = L_shl( L_tmp, add( add( exp_corr, exp_norm ), scale ) );
-        ncorr[t] = round_fx( L_tmp );
-#endif
 
         /* update the filtered excitation excf[] for the next iteration */
         IF( NE_16( t, t_max ) )
@@ -1764,11 +1683,7 @@ void norm_corr_fx(
             {
                 /* saturation can occur in add() */
                 /*excf[i] = add(mult(exc[k], h[i]), excf[i - 1]);     move16();       */
-#ifdef BASOP_NOGLOB
                 excf[i] = round_fx_sat( L_mac_sat( L_mult( excf[i - 1], 32767 ), exc[k], h[i] ) );
-#else
-                excf[i] = round_fx( L_mac( L_mult( excf[i - 1], 32767 ), exc[k], h[i] ) );
-#endif
                 move16();
             }
             excf[0] = mult_r( exc[k], h[0] );
@@ -1872,7 +1787,7 @@ void pit_Q_enc_fx(
     }
 
     {
-        push_indice_fx( hBstr, IND_PITCH, pitch_index, nBits );
+        push_indice( hBstr, IND_PITCH, pitch_index, nBits );
     }
 
     return;
@@ -2004,7 +1919,7 @@ void pit16k_Q_enc_fx(
             }
         }
 
-        push_indice_fx( hBstr, IND_PITCH, pitch_index, nBits );
+        push_indice( hBstr, IND_PITCH, pitch_index, nBits );
     }
     ELSE IF( EQ_16( nBits, 9 ) ) /* absolute encoding with 9 bits */
     {
@@ -2034,14 +1949,14 @@ void pit16k_Q_enc_fx(
             }
         }
 
-        push_indice_fx( hBstr, IND_PITCH, pitch_index, 9 );
+        push_indice( hBstr, IND_PITCH, pitch_index, 9 );
     }
     ELSE /* nBits == 6 */ /* relative encoding with 6 bits */
     {
         /*pitch_index = (T0 - *T0_min) * 4 + T0_frac;*/
         pitch_index = add( shl( sub( T0, *T0_min ), 2 ), T0_frac );
 
-        push_indice_fx( hBstr, IND_PITCH, pitch_index, nBits );
+        push_indice( hBstr, IND_PITCH, pitch_index, nBits );
     }
 
     limit_T0_fx( L_FRAME16k, 8, L_SUBFR, limit_flag, T0, T0_frac, T0_min, T0_max );
diff --git a/lib_enc/pitch_ol.c b/lib_enc/pitch_ol.c
deleted file mode 100644
index 65b32d74cc46708b40b2e978ee4d324fd9429a20..0000000000000000000000000000000000000000
--- a/lib_enc/pitch_ol.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * Local constants
- *---------------------------------------------------------------------*/
diff --git a/lib_enc/pitch_ol2.c b/lib_enc/pitch_ol2.c
deleted file mode 100644
index 05b32c716f172c695f7bc36fc4297784f39c48f3..0000000000000000000000000000000000000000
--- a/lib_enc/pitch_ol2.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_enc.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-#include "prot_fx.h"     /* Function prototypes                    */
-#include "prot_fx_enc.h" /* Function prototypes                    */
-
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
-
-#define MAX_DELTA   16 /* half-length of the delta search      */
-#define COR_BUF_LEN ( L_INTERPOL1 * 2 + MAX_DELTA * 2 + 1 )
-/*-------------------------------------------------------------------*
- * pitch_ol2()
- *
- * Open-loop pitch precision improvement with 1/4 resolution
- * The pitch is searched in the interval <pitch_ol-delta, pitch_ol+delta),
- * i.e. the value pitch_ol + delta is not a part of the interval
- *-------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------*
- * StableHighPitchDetect()
- *
- * Very short stable pitch detection
- *-------------------------------------------------------------------*/
-void StableHighPitchDetect_ivas_fx(
-    Word16 *flag_spitch,       /* o  : flag to indicate very short stable pitch */
-    Word16 pitch[],            /* i/o: OL pitch buffer                         */
-    const Word16 voicing[],    /* i  : OL pitch gains                         Q15 */
-    const Word16 wsp[],        /* i  : weighted speech                        Qx */
-    const Word16 localVAD,     /* i  : local VAD flag                          */
-    Word16 *voicing_sm,        /* i/o: smoothed open-loop pitch gains          */
-    Word16 *voicing0_sm,       /* i/o: smoothed high pitch gains               */
-    Word16 *LF_EnergyRatio_sm, /* i/o: smoothed [0, 300Hz] relative peak energy Q7*/
-    Word16 *predecision_flag,  /* i/o: predecision flag                        */
-    Word32 *diff_sm,           /* i/o: smoothed pitch frequency difference     Q7*/
-    Word32 *energy_sm,         /* i/o: smoothed energy around pitch frequency  Q7*/
-    Word16 Q_new,
-    Word16 EspecdB[] /*Q8*/
-)
-{
-    Word16 i, pitch_freq_point;
-    Word16 T, Tp, pit_min;
-    Word16 energy0_16, energy1_16, ratio, voicing_m;
-    Word32 energy0, energy1, cor_max, diff, sum_energy;
-    const Word16 *pt_wsp;
-    Word16 tmp, tmp1, exp, diff16, cor_max16, exp1, exp2, pit_min_up;
-    Word32 L_tmp, L_tmp1;
-    Word16 Top;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
-
-    /*voicing = (voicing[0] + voicing[1] + voicing[2] )/3;*/
-    L_tmp = L_mult( voicing[0], 10923 /*1/3 in Q15*/ );
-    L_tmp = L_mac( L_tmp, voicing[1], 10923 /*1/3 in Q15*/ );
-    L_tmp = L_mac( L_tmp, voicing[2], 10923 /*1/3 in Q15*/ );
-#ifdef BASOP_NOGLOB
-    voicing_m = round_fx_sat( L_tmp );
-#else
-    voicing_m = round_fx( L_tmp );
-#endif
-    /**voicing_sm = 0.75f*(*voicing_sm) + 0.25f*voicing;*/
-    *voicing_sm = round_fx( L_mac( L_mult( *voicing_sm, 24576 /*0.75f Q15*/ ), voicing_m, 8192 /*0.25f Q15*/ ) );
-    move16();
-
-    /* pitch_freq_point = (short)(L_FFT/(mult_fact*T_op[1])+0.5f);*/
-    Top = pitch[1];
-    move16();
-    pitch_freq_point = idiv1616( L_FFT, Top ); /* Q0*/
-    sum_energy = L_deposit_l( 0 );
-    FOR( i = 1; i < 2 * pitch_freq_point; i++ )
-    {
-        sum_energy = L_mac0( sum_energy, EspecdB[i], 1 ); // sum_energy
-    }
-    tmp = sub( shl( pitch_freq_point, 1 ), 1 );
-
-    /*  for ( i = 1; i < 2 * pitch_freq_point; i++ )
-        {
-          diff += ( EspecdB[pitch_freq_point] - EspecdB[i] );
-        }
-        sum energy is the accumulated value of EspecdB over the loop and EspecdB[pitch_freq_point] is constant for the loop
-        diff can be computed as (2 * pitch_freq_point - 1) * EspecdB[pitch_freq_point] - sum_energy     */
-
-    diff = L_mac0( L_negate( sum_energy ), EspecdB[pitch_freq_point], tmp );
-
-    /*sum_energy /= (2*pitch_freq_point-1);*/
-
-    exp = norm_s( tmp );
-    tmp1 = div_s( shl( 1, sub( 14, exp ) ), tmp ); /*Q(29-exp)*/
-    L_tmp = Mult_32_16( sum_energy, tmp1 );
-    sum_energy = L_shl( L_tmp, sub( exp, 14 ) );
-    /**diff_sm = 0.2f * diff  + 0.8f * *diff_sm;*/
-    *diff_sm = L_add( Mult_32_16( diff, 6554 /*.2f Q15*/ ), Mult_32_16( *diff_sm, 26214 /*.8f Q15*/ ) );
-    move32();
-    /**energy_sm = 0.2f * sum_energy + 0.8f * *energy_sm;*/
-    *energy_sm = L_add( Mult_32_16( sum_energy, 6554 /*.2f Q15*/ ), Mult_32_16( *energy_sm, 26214 /*.8f Q15*/ ) );
-    move32();
-    /*diff /= sum_energy;*/
-
-    IF( sum_energy )
-    {
-        exp = norm_l( sum_energy );
-        tmp = extract_h( L_shl( sum_energy, exp ) );
-        exp = sub( sub( 30, exp ), 7 );
-        IF( tmp < 0 )
-        {
-            tmp = abs_s( tmp );
-            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
-            BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
-            diff = L_negate( L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow ) );
-#else  /* BASOP_NOGLOB */
-            diff = L_negate( L_shr( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) );
-#endif /* BASOP_NOGLOB */
-            BASOP_SATURATE_WARNING_ON_EVS
-#ifdef BASOP_NOGLOB
-            diff16 = round_fx_o( diff, &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff16 = round_fx( diff );
-#endif /* BASOP_NOGLOB */
-        }
-        ELSE
-        {
-            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
-            BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
-            diff = L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff = L_shr( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) );
-#endif /* BASOP_NOGLOB */
-            BASOP_SATURATE_WARNING_ON_EVS
-#ifdef BASOP_NOGLOB
-            diff16 = round_fx_o( diff, &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff16 = round_fx( diff );
-#endif /* BASOP_NOGLOB */
-        }
-    }
-    ELSE
-    {
-#ifdef BASOP_NOGLOB
-        diff16 = round_fx_o( L_shl_o( diff, 25, &Overflow ), &Overflow );
-#else
-        diff16 = round_fx( L_shl( diff, 25 ) );
-#endif
-    }
-    test();
-    test();
-    IF( LT_32( *diff_sm, -1280 /*-10.0f Q7*/ ) && LT_32( *energy_sm, 4928 /*38.5f Q7*/ ) && LT_16( diff16, -26214 /*-.8f Q15*/ ) )
-    {
-        *predecision_flag = 1;
-        move16();
-    }
-    test();
-    test();
-    if ( GT_32( *diff_sm, 1280 /*10.0f Q7*/ ) && GT_32( *energy_sm, 10624 /*83.0f Q7*/ ) && GT_16( diff16, 16384 /*.5 Q15*/ ) )
-    {
-        *predecision_flag = 0;
-        move16();
-    }
-
-    /* short pitch possiblity pre-decision */
-    maximum_fx( EspecdB, 7, &energy0_16 );
-    maximum_fx( EspecdB + 8, 7, &energy1_16 );
-    test();
-    IF( energy1_16 < 0 && energy0_16 > 0 )
-    {
-        ratio = 0;
-        move16();
-    }
-    ELSE
-    {
-        ratio = s_max( sub( energy1_16, energy0_16 ), 0 ); /*Q7 */
-    }
-    /*ratio *= max(voicing,0);*/
-    tmp = s_max( voicing_m, 0 );
-    ratio = mult_r( ratio, tmp ); /*Q7*/
-    /**LF_EnergyRatio_sm = (15*(*LF_EnergyRatio_sm) + ratio)/16;*/
-    L_tmp = L_mult( ratio, 2048 );
-    L_tmp = L_mac( L_tmp, *LF_EnergyRatio_sm, 30720 );
-    *LF_EnergyRatio_sm = round_fx( L_tmp );
-    move16();
-    test();
-    if ( GT_16( *LF_EnergyRatio_sm, 4480 /*35.0f Q7*/ ) || GT_16( ratio, 6400 /*50.0f Q7*/ ) )
-    {
-        *predecision_flag = 1;
-        move16();
-    }
-
-    if ( LT_16( *LF_EnergyRatio_sm, 2048 /*16.0f Q7*/ ) )
-    {
-        *predecision_flag = 0;
-        move16();
-    }
-
-    /* short pitch candidate detection */
-    Tp = pitch[1];
-    move16();
-    cor_max = 0;
-    move16();
-    pt_wsp = wsp + 3 * L_SUBFR;
-    pit_min = PIT_MIN_DOUBLEEXTEND;
-    move16();
-    pit_min_up = PIT_MIN;
-    move16();
-    FOR( T = pit_min; T <= pit_min_up; T++ )
-    {
-        energy1 = Dot_product( pt_wsp, pt_wsp - T, L_SUBFR );
-        test();
-        IF( ( GT_32( energy1, cor_max ) ) || ( EQ_16( T, pit_min ) ) )
-        {
-            cor_max = L_add( energy1, 0 );
-            Tp = T;
-            move16();
-        }
-    }
-    energy0 = Dot_product12( pt_wsp, pt_wsp, L_SUBFR, &exp1 );
-    exp1 = sub( exp1, shl( Q_new, 1 ) );
-    energy1 = Dot_product12( pt_wsp - Tp, pt_wsp - Tp, L_SUBFR, &exp2 );
-    exp2 = sub( exp2, shl( Q_new, 1 ) );
-    /* cor_max *= inv_sqrt( energy0*energy1 );*/
-    L_tmp = Mult_32_32( energy0, energy1 );
-    exp = norm_l( L_tmp );
-    L_tmp1 = L_shl( L_tmp, exp );
-
-    exp = sub( sub( 31, exp ), ( sub( sub( 31, exp1 ), exp2 ) ) );
-    move16();
-    L_tmp1 = Isqrt_lc( L_tmp1, &exp ); /*Q(31-exp)*/
-    cor_max = Mult_32_32( cor_max, L_tmp1 );
-    exp = add( sub( sub( 31, add( shl( Q_new, 1 ), 1 ) ), sub( 31, exp ) ), 31 );
-#ifdef BASOP_NOGLOB
-    cor_max16 = round_fx_o( L_shl_o( cor_max, exp, &Overflow ), &Overflow ); /*Q15*/
-#else                                                                        /* BASOP_NOGLOB */
-    cor_max16 = round_fx( L_shl( cor_max, exp ) ); /*Q15*/
-#endif
-    /**voicing0_sm = add(mult_r(24576 ,(*voicing0_sm)) , mult_r(8192 , cor_max16));*/
-    *voicing0_sm = round_fx( L_mac( L_mult( 24576 /*.75f Q15*/, *voicing0_sm ), 8192 /*.25f Q15*/, cor_max16 ) );
-    move16();
-
-    /* final short pitch detection */
-    test();
-    test();
-    test();
-    *flag_spitch = 0;
-    move16();
-    IF( ( EQ_16( localVAD, 1 ) ) && ( EQ_16( *predecision_flag, 1 ) ) &&
-        ( GT_16( *voicing0_sm, 21299 /*.65f in Q15*/ ) ) && ( GT_16( *voicing0_sm, mult_r( *voicing_sm, 22938 /*.7f in Q15*/ ) ) ) )
-    {
-        *flag_spitch = 1;
-        move16();
-        pitch[0] = Tp;
-        move16();
-        pitch[1] = Tp;
-        move16();
-        pitch[2] = Tp;
-        move16();
-    }
-
-    return;
-}
diff --git a/lib_enc/pitch_ol2_fx.c b/lib_enc/pitch_ol2_fx.c
index 83ea36b176275ced8b30b9596aac27069f09f4e7..7ca13171ea309caea5710891b929962bcc6914b9 100644
--- a/lib_enc/pitch_ol2_fx.c
+++ b/lib_enc/pitch_ol2_fx.c
@@ -81,13 +81,8 @@ void pitch_ol2_fx(
     pt_cor_fx = cor_fx;
     FOR( t = t_min; t <= t_max; t++ )
     {
-#ifdef BASOP_NOGLOB
         t0 = L_shl_o( *pt_cor_32++, exp3, &Overflow );
         *pt_cor_fx++ = round_fx_o( t0, &Overflow );
-#else
-        t0 = L_shl( *pt_cor_32++, exp3 );
-        *pt_cor_fx++ = round_fx( t0 );
-#endif
         move16();
     }
 
@@ -171,13 +166,8 @@ void pitch_ol2_fx(
         R2 = L_mult( wsp_fr_fx[0], wsp_fr_fx[0] );
         FOR( j = 1; j < L_SUBFR; j++ )
         {
-#ifdef BASOP_NOGLOB
             R1 = L_mac_sat( R1, pt_wsp_fx[j], pt_wsp_fx[j] );
             R2 = L_mac_sat( R2, wsp_fr_fx[j], wsp_fr_fx[j] );
-#else
-            R1 = L_mac( R1, pt_wsp_fx[j], pt_wsp_fx[j] );
-            R2 = L_mac( R2, wsp_fr_fx[j], wsp_fr_fx[j] );
-#endif
         }
 
         /* *voicing_fr = cor_max * inv_sqrt(enr_wsp * enr_old) */
@@ -191,11 +181,7 @@ void pitch_ol2_fx(
         exp_R2 = norm_l( R2 );
         R2 = L_shl( R2, exp_R2 );
 
-#ifdef BASOP_NOGLOB
         R1 = L_mult_o( round_fx_o( R1, &Overflow ), round_fx_o( R2, &Overflow ), &Overflow );
-#else
-        R1 = L_mult( round_fx( R1 ), round_fx( R2 ) );
-#endif
         i = norm_l( R1 );
         R1 = L_shl( R1, i );
 
@@ -205,19 +191,11 @@ void pitch_ol2_fx(
 
         R1 = Isqrt_lc( R1, &exp_R1 );
 
-#ifdef BASOP_NOGLOB
         R1 = L_mult( R0, round_fx_o( R1, &Overflow ) );
-#else
-        R1 = L_mult( R0, round_fx( R1 ) );
-#endif
         exp_R0 = sub( 31, exp_R0 );
         exp_R0 = sub( add( exp_R0, exp_R1 ), exp3 );
 
-#ifdef BASOP_NOGLOB
         *voicing_fr_fx = round_fx_o( L_shl_o( R1, exp_R0, &Overflow ), &Overflow ); /*Q15*/
-#else                                                                               /* BASOP_NOGLOB */
-        *voicing_fr_fx = round_fx( L_shl( R1, exp_R0 ) ); /*Q15*/
-#endif                                                                              /* BASOP_NOGLOB */
         move16();
     }
     ELSE
@@ -266,11 +244,7 @@ void StableHighPitchDetect_fx(
     L_tmp = L_mult( voicing[0], 10923 /*1/3 in Q15*/ );
     L_tmp = L_mac( L_tmp, voicing[1], 10923 /*1/3 in Q15*/ );
     L_tmp = L_mac( L_tmp, voicing[2], 10923 /*1/3 in Q15*/ );
-#ifdef BASOP_NOGLOB
     voicing_m = round_fx_sat( L_tmp );
-#else
-    voicing_m = round_fx( L_tmp );
-#endif
     /**voicing_sm = 0.75f*(*voicing_sm) + 0.25f*voicing;*/
     *voicing_sm = round_fx( L_mac( L_mult( *voicing_sm, 24576 /*0.75f Q15*/ ), voicing_m, 8192 /*0.25f Q15*/ ) );
     move16();
@@ -312,42 +286,22 @@ void StableHighPitchDetect_fx(
             tmp = abs_s( tmp );
             tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             diff = L_negate( L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow ) );
-#else  /* BASOP_NOGLOB */
-            diff = L_negate( L_shr( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) );
-#endif /* BASOP_NOGLOB */
             BASOP_SATURATE_WARNING_ON_EVS
-#ifdef BASOP_NOGLOB
             diff16 = round_fx_o( diff, &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff16 = round_fx( diff );
-#endif /* BASOP_NOGLOB */
         }
         ELSE
         {
             tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
             BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
             diff = L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff = L_shr( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) );
-#endif /* BASOP_NOGLOB */
             BASOP_SATURATE_WARNING_ON_EVS
-#ifdef BASOP_NOGLOB
             diff16 = round_fx_o( diff, &Overflow );
-#else  /* BASOP_NOGLOB */
-            diff16 = round_fx( diff );
-#endif /* BASOP_NOGLOB */
         }
     }
     ELSE
     {
-#ifdef BASOP_NOGLOB
         diff16 = round_fx_o( L_shl_o( diff, 25, &Overflow ), &Overflow );
-#else
-        diff16 = round_fx( L_shl( diff, 25 ) );
-#endif
     }
     test();
     test();
@@ -424,11 +378,7 @@ void StableHighPitchDetect_fx(
     L_tmp1 = Isqrt_lc( L_tmp1, &exp ); /*Q(31-exp)*/
     cor_max = Mult_32_32( cor_max, L_tmp1 );
     exp = 31 - ( shl( Q_new, 1 ) + 1 ) - ( 31 - exp ) + 31;
-#ifdef BASOP_NOGLOB
     cor_max16 = round_fx_o( L_shl_o( cor_max, exp, &Overflow ), &Overflow ); /*Q15*/
-#else                                                                        /* BASOP_NOGLOB */
-    cor_max16 = round_fx( L_shl( cor_max, exp ) ); /*Q15*/
-#endif
     /**voicing0_sm = add(mult_r(24576 ,(*voicing0_sm)) , mult_r(8192 , cor_max16));*/
     *voicing0_sm = round_fx( L_mac( L_mult( 24576 /*.75f Q15*/, *voicing0_sm ), 8192 /*.25f Q15*/, cor_max16 ) );
     move16();
@@ -454,3 +404,227 @@ void StableHighPitchDetect_fx(
 
     return;
 }
+
+
+/*-------------------------------------------------------------------*
+ * pitch_ol2()
+ *
+ * Open-loop pitch precision improvement with 1/4 resolution
+ * The pitch is searched in the interval <pitch_ol-delta, pitch_ol+delta),
+ * i.e. the value pitch_ol + delta is not a part of the interval
+ *-------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------*
+ * StableHighPitchDetect()
+ *
+ * Very short stable pitch detection
+ *-------------------------------------------------------------------*/
+void StableHighPitchDetect_ivas_fx(
+    Word16 *flag_spitch,       /* o  : flag to indicate very short stable pitch */
+    Word16 pitch[],            /* i/o: OL pitch buffer                         */
+    const Word16 voicing[],    /* i  : OL pitch gains                         Q15 */
+    const Word16 wsp[],        /* i  : weighted speech                        Qx */
+    const Word16 localVAD,     /* i  : local VAD flag                          */
+    Word16 *voicing_sm,        /* i/o: smoothed open-loop pitch gains          */
+    Word16 *voicing0_sm,       /* i/o: smoothed high pitch gains               */
+    Word16 *LF_EnergyRatio_sm, /* i/o: smoothed [0, 300Hz] relative peak energy Q7*/
+    Word16 *predecision_flag,  /* i/o: predecision flag                        */
+    Word32 *diff_sm,           /* i/o: smoothed pitch frequency difference     Q7*/
+    Word32 *energy_sm,         /* i/o: smoothed energy around pitch frequency  Q7*/
+    Word16 Q_new,
+    Word16 EspecdB[] /*Q8*/
+)
+{
+    Word16 i, pitch_freq_point;
+    Word16 T, Tp, pit_min;
+    Word16 energy0_16, energy1_16, ratio, voicing_m;
+    Word32 energy0, energy1, cor_max, diff, sum_energy;
+    const Word16 *pt_wsp;
+    Word16 tmp, tmp1, exp, diff16, cor_max16, exp1, exp2, pit_min_up;
+    Word32 L_tmp, L_tmp1;
+    Word16 Top;
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
+#endif
+
+    /*voicing = (voicing[0] + voicing[1] + voicing[2] )/3;*/
+    L_tmp = L_mult( voicing[0], 10923 /*1/3 in Q15*/ );
+    L_tmp = L_mac( L_tmp, voicing[1], 10923 /*1/3 in Q15*/ );
+    L_tmp = L_mac( L_tmp, voicing[2], 10923 /*1/3 in Q15*/ );
+    voicing_m = round_fx_sat( L_tmp );
+    /**voicing_sm = 0.75f*(*voicing_sm) + 0.25f*voicing;*/
+    *voicing_sm = round_fx( L_mac( L_mult( *voicing_sm, 24576 /*0.75f Q15*/ ), voicing_m, 8192 /*0.25f Q15*/ ) );
+    move16();
+
+    /* pitch_freq_point = (short)(L_FFT/(mult_fact*T_op[1])+0.5f);*/
+    Top = pitch[1];
+    move16();
+    pitch_freq_point = idiv1616( L_FFT, Top ); /* Q0*/
+    sum_energy = L_deposit_l( 0 );
+    FOR( i = 1; i < 2 * pitch_freq_point; i++ )
+    {
+        sum_energy = L_mac0( sum_energy, EspecdB[i], 1 ); // sum_energy
+    }
+    tmp = sub( shl( pitch_freq_point, 1 ), 1 );
+
+    /*  for ( i = 1; i < 2 * pitch_freq_point; i++ )
+        {
+          diff += ( EspecdB[pitch_freq_point] - EspecdB[i] );
+        }
+        sum energy is the accumulated value of EspecdB over the loop and EspecdB[pitch_freq_point] is constant for the loop
+        diff can be computed as (2 * pitch_freq_point - 1) * EspecdB[pitch_freq_point] - sum_energy     */
+
+    diff = L_mac0( L_negate( sum_energy ), EspecdB[pitch_freq_point], tmp );
+
+    /*sum_energy /= (2*pitch_freq_point-1);*/
+
+    exp = norm_s( tmp );
+    tmp1 = div_s( shl( 1, sub( 14, exp ) ), tmp ); /*Q(29-exp)*/
+    L_tmp = Mult_32_16( sum_energy, tmp1 );
+    sum_energy = L_shl( L_tmp, sub( exp, 14 ) );
+    /**diff_sm = 0.2f * diff  + 0.8f * *diff_sm;*/
+    *diff_sm = L_add( Mult_32_16( diff, 6554 /*.2f Q15*/ ), Mult_32_16( *diff_sm, 26214 /*.8f Q15*/ ) );
+    move32();
+    /**energy_sm = 0.2f * sum_energy + 0.8f * *energy_sm;*/
+    *energy_sm = L_add( Mult_32_16( sum_energy, 6554 /*.2f Q15*/ ), Mult_32_16( *energy_sm, 26214 /*.8f Q15*/ ) );
+    move32();
+    /*diff /= sum_energy;*/
+
+    IF( sum_energy )
+    {
+        exp = norm_l( sum_energy );
+        tmp = extract_h( L_shl( sum_energy, exp ) );
+        exp = sub( sub( 30, exp ), 7 );
+        IF( tmp < 0 )
+        {
+            tmp = abs_s( tmp );
+            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
+            BASOP_SATURATE_WARNING_OFF_EVS
+            diff = L_negate( L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow ) );
+            BASOP_SATURATE_WARNING_ON_EVS
+            diff16 = round_fx_o( diff, &Overflow );
+        }
+        ELSE
+        {
+            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
+            BASOP_SATURATE_WARNING_OFF_EVS
+            diff = L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow );
+            BASOP_SATURATE_WARNING_ON_EVS
+            diff16 = round_fx_o( diff, &Overflow );
+        }
+    }
+    ELSE
+    {
+        diff16 = round_fx_o( L_shl_o( diff, 25, &Overflow ), &Overflow );
+    }
+    test();
+    test();
+    IF( LT_32( *diff_sm, -1280 /*-10.0f Q7*/ ) && LT_32( *energy_sm, 4928 /*38.5f Q7*/ ) && LT_16( diff16, -26214 /*-.8f Q15*/ ) )
+    {
+        *predecision_flag = 1;
+        move16();
+    }
+    test();
+    test();
+    if ( GT_32( *diff_sm, 1280 /*10.0f Q7*/ ) && GT_32( *energy_sm, 10624 /*83.0f Q7*/ ) && GT_16( diff16, 16384 /*.5 Q15*/ ) )
+    {
+        *predecision_flag = 0;
+        move16();
+    }
+
+    /* short pitch possiblity pre-decision */
+    maximum_fx( EspecdB, 7, &energy0_16 );
+    maximum_fx( EspecdB + 8, 7, &energy1_16 );
+    test();
+    IF( energy1_16 < 0 && energy0_16 > 0 )
+    {
+        ratio = 0;
+        move16();
+    }
+    ELSE
+    {
+        ratio = s_max( sub( energy1_16, energy0_16 ), 0 ); /*Q7 */
+    }
+    /*ratio *= max(voicing,0);*/
+    tmp = s_max( voicing_m, 0 );
+    ratio = mult_r( ratio, tmp ); /*Q7*/
+    /**LF_EnergyRatio_sm = (15*(*LF_EnergyRatio_sm) + ratio)/16;*/
+    L_tmp = L_mult( ratio, 2048 );
+    L_tmp = L_mac( L_tmp, *LF_EnergyRatio_sm, 30720 );
+    *LF_EnergyRatio_sm = round_fx( L_tmp );
+    move16();
+    test();
+    if ( GT_16( *LF_EnergyRatio_sm, 4480 /*35.0f Q7*/ ) || GT_16( ratio, 6400 /*50.0f Q7*/ ) )
+    {
+        *predecision_flag = 1;
+        move16();
+    }
+
+    if ( LT_16( *LF_EnergyRatio_sm, 2048 /*16.0f Q7*/ ) )
+    {
+        *predecision_flag = 0;
+        move16();
+    }
+
+    /* short pitch candidate detection */
+    Tp = pitch[1];
+    move16();
+    cor_max = 0;
+    move16();
+    pt_wsp = wsp + 3 * L_SUBFR;
+    pit_min = PIT_MIN_DOUBLEEXTEND;
+    move16();
+    pit_min_up = PIT_MIN;
+    move16();
+    FOR( T = pit_min; T <= pit_min_up; T++ )
+    {
+        energy1 = Dot_product( pt_wsp, pt_wsp - T, L_SUBFR );
+        test();
+        IF( ( GT_32( energy1, cor_max ) ) || ( EQ_16( T, pit_min ) ) )
+        {
+            cor_max = L_add( energy1, 0 );
+            Tp = T;
+            move16();
+        }
+    }
+    energy0 = Dot_product12( pt_wsp, pt_wsp, L_SUBFR, &exp1 );
+    exp1 = sub( exp1, shl( Q_new, 1 ) );
+    energy1 = Dot_product12( pt_wsp - Tp, pt_wsp - Tp, L_SUBFR, &exp2 );
+    exp2 = sub( exp2, shl( Q_new, 1 ) );
+    /* cor_max *= inv_sqrt( energy0*energy1 );*/
+    L_tmp = Mult_32_32( energy0, energy1 );
+    exp = norm_l( L_tmp );
+    L_tmp1 = L_shl( L_tmp, exp );
+
+    exp = sub( sub( 31, exp ), ( sub( sub( 31, exp1 ), exp2 ) ) );
+    move16();
+    L_tmp1 = Isqrt_lc( L_tmp1, &exp ); /*Q(31-exp)*/
+    cor_max = Mult_32_32( cor_max, L_tmp1 );
+    exp = add( sub( sub( 31, add( shl( Q_new, 1 ), 1 ) ), sub( 31, exp ) ), 31 );
+    cor_max16 = round_fx_o( L_shl_o( cor_max, exp, &Overflow ), &Overflow ); /*Q15*/
+    /**voicing0_sm = add(mult_r(24576 ,(*voicing0_sm)) , mult_r(8192 , cor_max16));*/
+    *voicing0_sm = round_fx( L_mac( L_mult( 24576 /*.75f Q15*/, *voicing0_sm ), 8192 /*.25f Q15*/, cor_max16 ) );
+    move16();
+
+    /* final short pitch detection */
+    test();
+    test();
+    test();
+    *flag_spitch = 0;
+    move16();
+    IF( ( EQ_16( localVAD, 1 ) ) && ( EQ_16( *predecision_flag, 1 ) ) &&
+        ( GT_16( *voicing0_sm, 21299 /*.65f in Q15*/ ) ) && ( GT_16( *voicing0_sm, mult_r( *voicing_sm, 22938 /*.7f in Q15*/ ) ) ) )
+    {
+        *flag_spitch = 1;
+        move16();
+        pitch[0] = Tp;
+        move16();
+        pitch[1] = Tp;
+        move16();
+        pitch[2] = Tp;
+        move16();
+    }
+
+    return;
+}
diff --git a/lib_enc/pitch_ol_fx.c b/lib_enc/pitch_ol_fx.c
index 52cd3ad5d93007dc1ff0cca8a09a261bace769fc..fdadcd318be997001ac0ec11996edee7c1423496 100644
--- a/lib_enc/pitch_ol_fx.c
+++ b/lib_enc/pitch_ol_fx.c
@@ -737,11 +737,7 @@ void pitch_ol_fx(
 
             enr1_exp = 0;
             move16();
-#ifdef BASOP_NOGLOB
             enr1 = add_o( extract_h( dotp_fx( pt2, pt2, len[j], &enr1_exp ) ), 1, &Overflow );
-#else
-            enr1 = add( extract_h( dotp_fx( pt2, pt2, len[j], &enr1_exp ) ), 1 );
-#endif
 
             enr2 = L_mult( enr0[j], enr1 );
             enr2_exp = norm_l( enr2 );
@@ -755,11 +751,7 @@ void pitch_ol_fx(
 
             Ltmp = L_mult0( cor_buf[ind], enr1 );
             qCorX = add( sub( 15, enr1_exp ), sub( 14, pt_exp1[ind] ) );
-#ifdef BASOP_NOGLOB
             corX[i][j] = extract_h( L_shr_o( Ltmp, sub( qCorX, 31 ), &Overflow ) );
-#else  /* BASOP_NOGLOB */
-            corX[i][j] = extract_h( L_shr( Ltmp, sub( qCorX, 31 ) ) );
-#endif /* BASOP_NOGLOB */
             qCorX = 31;
             move16();
 
@@ -781,11 +773,7 @@ void pitch_ol_fx(
             move16(); /* selected moving vector  */
             enr1_exp = 0;
             move16();
-#ifdef BASOP_NOGLOB
             enr1 = add_o( extract_h( dotp_fx( pt4, pt4, len1[j], &enr1_exp ) ), 1, &Overflow );
-#else
-            enr1 = add( extract_h( dotp_fx( pt4, pt4, len1[j], &enr1_exp ) ), 1 );
-#endif
 
             enr2 = L_mult( enr0_1[j], enr1 );
             enr2_exp = norm_l( enr2 );
@@ -800,11 +788,7 @@ void pitch_ol_fx(
             Ltmp = L_mult0( cor_buf[ind1 + len_x], enr1 );
 
             qCorX = add( sub( 15, enr1_exp ), sub( 14, pt_exp3[ind1] ) );
-#ifdef BASOP_NOGLOB
             corX[i][j + NSECT] = extract_h( L_shr_o( Ltmp, qCorX - 31, &Overflow ) );
-#else  /* BASOP_NOGLOB */
-            corX[i][j + NSECT] = extract_h( L_shr( Ltmp, qCorX - 31 ) );
-#endif /* BASOP_NOGLOB */
             qCorX = 31;
             move16();
 
@@ -884,11 +868,7 @@ void pitch_ol_fx(
         move16();
         pitch_tmp[i] = pitchX[i][ind];
         move16();
-#ifdef BASOP_NOGLOB
         cor_tmp[i] = add_o( corX[i][ind], corr_shift, &Overflow );
-#else  /* BASOP_NOGLOB */
-        cor_tmp[i] = add( corX[i][ind], corr_shift );
-#endif /* BASOP_NOGLOB */
         move16();
 
         /* Higher is the neighbour's correlation, higher is the weighting */
@@ -902,11 +882,7 @@ void pitch_ol_fx(
         move16();
         pitch_tmp[i + NHFR] = pitchX[i][ind1];
         move16();
-#ifdef BASOP_NOGLOB
         cor_tmp[i + NHFR] = add_o( corX[i][ind1], corr_shift, &Overflow );
-#else /* BASOP_NOGLOB */
-        cor_tmp[i + NHFR] = add( corX[i][ind1], corr_shift );
-#endif
         move16();
 
         /* Higher is the neighbour's correlation, higher is the weighting */
@@ -1710,13 +1686,17 @@ void pitch_ol_ivas_fx(
             move16();
 
             /* enr1 = dotp( pt2, pt2, len[j] ) + 0.01f; */
-            temp = 167772 /*0.01f in Q24*/;
+            temp = 0;
             move64();
             FOR( m = 0; m < len[j]; m++ )
             {
                 temp = W_mac0_16_16( temp, pt2[m], pt2[m] ); // 2*qwsp
             }
+
             temp = W_shl( temp, sub( Q24, shl( qwsp, 1 ) ) ); // Q24
+
+            temp = W_add( temp, 167772 ); /*0.01f in Q24*/
+
             enr1_exp = W_norm( temp );
             enr1 = W_extract_h( W_shl( temp, enr1_exp ) ); // enr1_exp+24-32
             enr1_exp = sub( 39, enr1_exp );                // 31-(enr1_exp+24-32)
@@ -1727,11 +1707,7 @@ void pitch_ol_ivas_fx(
             enr1 = ISqrt32( enr1, &enr1_exp ); /* 1/sqrt(energy) */ /*31-enr2_exp*/
 
             Ltmp = Mpy_32_16_1( enr1, cor_buf[ind] );
-#ifdef BASOP_NOGLOB
             corX[i][j] = extract_h( L_shl_o( Ltmp, add( enr1_exp, cor_buf_exp[ind] ), &Overflow ) ); // Q15
-#else                                                                                                /* BASOP_NOGLOB */
-            corX[i][j] = extract_h( L_shl( Ltmp, add( enr1_exp, cor_buf_exp[ind] ) ) );
-#endif                                                                                               /* BASOP_NOGLOB */
             move16();
 
             Ltmp = Mpy_32_16_1( enr1, pt_cor0[ind] );
@@ -1752,13 +1728,18 @@ void pitch_ol_ivas_fx(
             move16();
 
             /* enr1 = dotp(pt4, pt4, len1[j]) + 0.01f; */
-            temp = 167772 /*0.01f in Q24*/;
+            temp = 0;
+            move64();
             move64();
             FOR( m = 0; m < len1[j]; m++ )
             {
                 temp = W_mac0_16_16( temp, pt4[m], pt4[m] ); // 2*qwsp
             }
+
             temp = W_shl( temp, sub( Q24, shl( qwsp, 1 ) ) ); // Q24
+
+            temp = W_add( temp, 167772 ); /*0.01f in Q24*/
+
             enr1_exp = W_norm( temp );
             enr1 = W_extract_h( W_shl( temp, enr1_exp ) ); // enr1_exp+24-32
             enr1_exp = sub( 39, enr1_exp );                // 31-(enr1_exp+24-32)
@@ -1769,11 +1750,7 @@ void pitch_ol_ivas_fx(
             enr1 = ISqrt32( enr1, &enr1_exp ); /* 1/sqrt(energy) */ /*31-enr1_exp*/
 
             Ltmp = Mpy_32_16_1( enr1, cor_buf[ind1 + len_x] );
-#ifdef BASOP_NOGLOB
             corX[i][j + NSECT] = extract_h( L_shl_o( Ltmp, add( enr1_exp, cor_buf_exp[ind1 + len_x] ), &Overflow ) ); // Q15
-#else                                                                                                                 /* BASOP_NOGLOB */
-            corX[i][j + NSECT] = extract_h( L_shl( Ltmp, add( enr1_exp, cor_buf_exp_len_x1[ind1] ) ) );
-#endif                                                                                                                /* BASOP_NOGLOB */
             move16();
 
             Ltmp = Mpy_32_16_1( enr1, pt_cor0[ind1 + ( DELTA_COH - 1 ) + len_x] );
@@ -1850,11 +1827,7 @@ void pitch_ol_ivas_fx(
         move16();
         pitch_tmp[i] = pitchX[i][ind];
         move16();
-#ifdef BASOP_NOGLOB
         cor_tmp[i] = add_o( corX[i][ind], corr_shift, &Overflow );
-#else  /* BASOP_NOGLOB */
-        cor_tmp[i] = add( corX[i][ind], corr_shift );
-#endif /* BASOP_NOGLOB */
         move16();
 
         /* Higher is the neighbour's correlation, higher is the weighting */
@@ -1868,11 +1841,7 @@ void pitch_ol_ivas_fx(
         move16();
         pitch_tmp[i + NHFR] = pitchX[i][ind1];
         move16();
-#ifdef BASOP_NOGLOB
         cor_tmp[i + NHFR] = add_o( corX[i][ind1], corr_shift, &Overflow );
-#else /* BASOP_NOGLOB */
-        cor_tmp[i + NHFR] = add( corX[i][ind1], corr_shift );
-#endif
         move16();
 
         /* Higher is the neighbour's correlation, higher is the weighting */
diff --git a/lib_enc/plc_enc_ext.c b/lib_enc/plc_enc_ext.c
deleted file mode 100644
index 404ee401e163c860087111a920728c667c5c4e14..0000000000000000000000000000000000000000
--- a/lib_enc/plc_enc_ext.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "stat_enc.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/ppp_enc.c b/lib_enc/ppp_enc.c
deleted file mode 100644
index d1de09bc73bcde0f9193c0b1d468183cb122cda9..0000000000000000000000000000000000000000
--- a/lib_enc/ppp_enc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/ppp_enc_fx.c b/lib_enc/ppp_enc_fx.c
index 3e5de17fa033d09164281b096fe1819354c3d15e..d6dc8b6d68adcec9c2466e1069b658ce85791c7e 100644
--- a/lib_enc/ppp_enc_fx.c
+++ b/lib_enc/ppp_enc_fx.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-//#include "prot_fx.h"
 #include "rom_com_fx.h"
 #include "rom_com.h"     /* Common constants                       */
 #include "prot_fx.h"     /* Function prototypes                    */
@@ -153,10 +152,12 @@ ivas_error ppp_quarter_encoder_fx(
 
     /*As the upper cut of freqencies are normalized to 12800, we have to multiply upper cut off freq by
             2.56(1/12800 in Q15) */
-    Ltempn = L_mult( CURRCW_Q_FX->upper_cut_off_freq_fx, 10486 );                  /* Q0+Q27 = Q28 */
-    CURRCW_Q_FX->upper_cut_off_freq_fx = (Word16) L_shr( Ltempn, 13 );             /*Q15 */
+    Ltempn = L_mult( CURRCW_Q_FX->upper_cut_off_freq_fx, 10486 );      /* Q0+Q27 = Q28 */
+    CURRCW_Q_FX->upper_cut_off_freq_fx = (Word16) L_shr( Ltempn, 13 ); /*Q15 */
+    move16();
     Ltempn = L_mult( CURRCW_Q_FX->upper_cut_off_freq_of_interest_fx, 10486 );      /* Q0+Q27 = Q28 */
     CURRCW_Q_FX->upper_cut_off_freq_of_interest_fx = (Word16) L_shr( Ltempn, 13 ); /*Q15 */
+    move16();
 
     *returnFlag = DTFS_quant_cw_fx( CURRCW_Q_FX, prevCW_lag, curr_lpc_fx, &POWER_IDX_FX,
                                     AMP_IDX_fx, lastLgainE_fx, lastHgainE_fx, lasterbE_fx, S_fx, C_fx );
@@ -168,10 +169,11 @@ ivas_error ppp_quarter_encoder_fx(
     move16();
     Ltempn = L_shl( (Word32) CURRCW_Q_FX->upper_cut_off_freq_of_interest_fx, 13 ); /*Q28 */
     CURRCW_Q_FX->upper_cut_off_freq_of_interest_fx = (Word16) find_remd( Ltempn, 20971, &Ltempd );
+    move16();
 
-    push_indice_fx( hBstr, IND_AMP0, AMP_IDX_fx[0], 6 );
-    push_indice_fx( hBstr, IND_AMP1, AMP_IDX_fx[1], 6 );
-    push_indice_fx( hBstr, IND_POWER, POWER_IDX_FX, 6 );
+    push_indice( hBstr, IND_AMP0, AMP_IDX_fx[0], 6 );
+    push_indice( hBstr, IND_AMP1, AMP_IDX_fx[1], 6 );
+    push_indice( hBstr, IND_POWER, POWER_IDX_FX, 6 );
 
     /*Phase copying is done through copy_phase instead of car2pol and pol2car */
     copy_phase_fx( TARGETCW_FX, *CURRCW_Q_FX, TARGETCW_FX );
@@ -184,10 +186,9 @@ ivas_error ppp_quarter_encoder_fx(
     /*DTFS_pol2car(TARGETCW); */
 
     tmp_fx = DTFS_alignment_fine_new_fx( *TARGETCW_FX, *CURRCW_Q_FX, S_fx, C_fx );
-    move16();
 
     test();
-    IF( GT_16( add( tmp_fx, 12 ), 28 ) || LT_16( tmp_fx, -12 ) )
+    IF( GT_16( tmp_fx, 28 - 12 ) || LT_16( tmp_fx, -12 ) )
     {
         tmp_fx = 0;
         move16();
@@ -198,7 +199,7 @@ ivas_error ppp_quarter_encoder_fx(
     /*DTFS_phaseShift( CURRCW_Q,(float)(PI2*tmp/CURRCW_Q->lag) ); */
     Q2phaseShift_fx( CURRCW_Q_FX, tmp_fx, CURRCW_Q_FX->lag_fx, S_fx, C_fx );
 
-    push_indice_fx( hBstr, IND_GLOBAL_ALIGNMENT, shr( add( tmp_fx, 12 ), 2 ), 3 );
+    push_indice( hBstr, IND_GLOBAL_ALIGNMENT, shr( add( tmp_fx, 12 ), 2 ), 3 );
 
     free( PREVDTFS_FX );
     return error;
@@ -227,9 +228,9 @@ void set_ppp_mode_fx(
     test();
     test();
 
-    IF( EQ_16( st_fx->vad_flag, 1 ) &&
-        ( EQ_16( noisy_speech_HO, 1 ) || EQ_16( clean_speech_HO, 1 ) || EQ_16( NB_speech_HO, 1 ) ) &&
-        ( st_fx->localVAD == 0 || localVAD_he == 0 ) )
+    if ( EQ_16( st_fx->vad_flag, 1 ) &&
+         ( EQ_16( noisy_speech_HO, 1 ) || EQ_16( clean_speech_HO, 1 ) || EQ_16( NB_speech_HO, 1 ) ) &&
+         ( st_fx->localVAD == 0 || localVAD_he == 0 ) )
 
     {
         st_fx->coder_type = UNVOICED;
@@ -238,7 +239,7 @@ void set_ppp_mode_fx(
 
     test();
     test();
-    IF( EQ_16( st_fx->coder_type, INACTIVE ) && ( st_fx->vad_flag == 0 ) && EQ_16( hSC_VBR->last_nelp_mode, 1 ) ) /* avoid HO frame go to GSC */
+    if ( EQ_16( st_fx->coder_type, INACTIVE ) && ( st_fx->vad_flag == 0 ) && EQ_16( hSC_VBR->last_nelp_mode, 1 ) ) /* avoid HO frame go to GSC */
     {
         st_fx->coder_type = UNVOICED;
         move16();
@@ -315,7 +316,7 @@ void set_ppp_mode_fx(
         move16();
     }
 
-    IF( st_fx->last_core == HQ_CORE )
+    IF( EQ_16( st_fx->last_core, HQ_CORE ) )
     {
         hSC_VBR->ppp_mode = 0;
         move16();
@@ -329,7 +330,7 @@ void set_ppp_mode_fx(
     test();
     test();
     test();
-    IF( ( hSC_VBR->last_ppp_mode != 0 ) && ( hSC_VBR->ppp_mode == 0 ) && ( st_fx->sp_aud_decision1 != 0 ) && EQ_16( st_fx->bwidth, NB ) && st_fx->Opt_SC_VBR != 0 ) /*if it were about to go from ppp->HQ*/
+    IF( ( hSC_VBR->last_ppp_mode != 0 ) && ( hSC_VBR->ppp_mode == 0 ) && ( st_fx->sp_aud_decision1 != 0 ) && ( st_fx->bwidth == NB ) && ( st_fx->Opt_SC_VBR != 0 ) ) /*if it were about to go from ppp->HQ*/
     {
         hSC_VBR->avoid_HQ_VBR_NB = 1;
         move16();
@@ -340,7 +341,7 @@ void set_ppp_mode_fx(
     test();
     test();
     test();
-    IF( ( hSC_VBR->last_nelp_mode != 0 ) && ( st_fx->sp_aud_decision1 != 0 ) && EQ_16( st_fx->bwidth, NB ) && ( st_fx->Opt_SC_VBR != 0 ) ) /*if it were about to go from nelp->HQ*/
+    IF( ( hSC_VBR->last_nelp_mode != 0 ) && ( st_fx->sp_aud_decision1 != 0 ) && ( st_fx->bwidth == NB ) && ( st_fx->Opt_SC_VBR != 0 ) ) /*if it were about to go from nelp->HQ*/
     {
         hSC_VBR->avoid_HQ_VBR_NB = 1;
         move16();
@@ -412,6 +413,7 @@ static Word16 DTFS_quant_cw_fx(
 
 {
     Word16 num_erb = 0;
+    move16();
     const Word16 *PowerCB_fx = NULL;
     Word16 tmp, w[2], target[2], j, slot[NUM_ERB_WB], flag;
     Word16 n, d1, d2, exp;
@@ -439,7 +441,6 @@ static Word16 DTFS_quant_cw_fx(
         num_erb = NUM_ERB_WB;
         move16();
         PowerCB_fx = PowerCB_WB_fx;
-        move16();
     }
 
     /*  Get weighting and target */
@@ -500,10 +501,10 @@ static Word16 DTFS_quant_cw_fx(
     erb_add_fx( curr_erb_fx, X_fx->lag_fx, lasterbE_fx, pl, AMP_IDX, num_erb );
 
     curr_erb_fx[0] = mult_r( curr_erb_fx[1], 9830 );
-    move16();                                                                        /* 0.3 inQ15 leaves curr_erb in Q13 */
-    curr_erb_fx[sub( num_erb, 2 )] = mult_r( curr_erb_fx[sub( num_erb, 3 )], 9830 ); /* Q13 */
+    move16();                                                            /* 0.3 inQ15 leaves curr_erb in Q13 */
+    curr_erb_fx[num_erb - 2] = mult_r( curr_erb_fx[num_erb - 3], 9830 ); /* Q13 */
 
-    curr_erb_fx[sub( num_erb, 1 )] = 0;
+    curr_erb_fx[num_erb - 1] = 0;
     move16();
     flag = 1;
     move16();
@@ -553,9 +554,11 @@ static Word16 DTFS_quant_cw_fx(
     ELSE IF( n > 0 )
         rshiftHarmBand_fx( X_fx, 0, 2828, sub( Qh, Ql ) );
 
-    tmp = shl( *POWER_IDX, 1 );                                  /*  tmp=2*POWER_IDX */
-    *lastLgainE_fx = add( *lastLgainE_fx, PowerCB_fx[tmp] );     /*  Q11 */
+    tmp = shl( *POWER_IDX, 1 );                              /*  tmp=2*POWER_IDX */
+    *lastLgainE_fx = add( *lastLgainE_fx, PowerCB_fx[tmp] ); /*  Q11 */
+    move16();
     *lastHgainE_fx = add( *lastHgainE_fx, PowerCB_fx[tmp + 1] ); /*  Q11 */
+    move16();
 
     Ltemp = log10_fx( X_fx->lag_fx );        /*  Ltemp=10*log10(lag), Q23 */
     logLag_fx = Mult_32_16( Ltemp, 0x6666 ); /*  logLag=log10(lag), Q26 */
@@ -621,6 +624,7 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
     Word32 maxcorr_fx, wcorr_fx, diff_corr;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     IF( LT_16( X1_fx.lag_fx, X2_fx.lag_fx ) )
     {
@@ -635,7 +639,9 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
     FOR( k = 0; k <= HalfLag; k++ )
     {
         ab1[k] = round_fx( L_mac( L_mult( X1_fx.a_fx[k], X2_fx.a_fx[k] ), X1_fx.b_fx[k], X2_fx.b_fx[k] ) );
+        move16();
         ab2[k] = round_fx( L_msu( L_mult( X1_fx.b_fx[k], X2_fx.a_fx[k] ), X1_fx.a_fx[k], X2_fx.b_fx[k] ) );
+        move16();
     }
 
 
@@ -657,15 +663,9 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
 
         FOR( k = 0; k <= HalfLag; k++ )
         {
-#ifdef BASOP_NOGLOB
             corr_fx = L_mac_o( corr_fx, ab1[k], C_fx[temp % ( 4 * X2_fx.lag_fx )], &Overflow );
             corr_fx = L_mac_o( corr_fx, ab2[k], S_fx[temp % ( 4 * X2_fx.lag_fx )], &Overflow );
             temp = add_o( temp, temp1, &Overflow );
-#else
-            corr_fx = L_mac( corr_fx, ab1[k], C_fx[temp % ( 4 * X2_fx.lag_fx )] );
-            corr_fx = L_mac( corr_fx, ab2[k], S_fx[temp % ( 4 * X2_fx.lag_fx )] );
-            temp = add( temp, temp1 );
-#endif
         }
         temp = sub( 32767, extract_l( L_shr( L_mult( 82, abs_s( n ) ), 1 ) ) ); /*  Q15 */
         Qcorr = norm_l( corr_fx );
@@ -675,40 +675,23 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
             move16();
         }
 
-#ifdef BASOP_NOGLOB
         temp1 = round_fx_o( (Word32) L_shl_o( corr_fx, Qcorr, &Overflow ), &Overflow ); /*  Q(Qcorr-16) */
         wcorr_fx = L_mult_o( temp1, temp, &Overflow );                                  /*  Q(Qcorr-16+15+1)=Q(Qcorr) */
-#else
-        temp1 = round_fx( (Word32) L_shl( corr_fx, Qcorr ) );                           /*  Q(Qcorr-16) */
-        wcorr_fx = L_mult( temp1, temp );                                               /*  Q(Qcorr-16+15+1)=Q(Qcorr) */
-#endif
 
         IF( GE_16( Qmaxcorr, Qcorr ) )
         {
-#ifdef BASOP_NOGLOB
             diff_corr = L_sub_o( wcorr_fx, L_shl_o( maxcorr_fx, sub( Qcorr, Qmaxcorr ), &Overflow ), &Overflow ); /*  Qcorr */
-#else
-            diff_corr = L_sub( wcorr_fx, L_shl( maxcorr_fx, sub( Qcorr, Qmaxcorr ) ) ); /*  Qcorr */
-#endif
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             diff_corr = L_sub_o( L_shl_o( wcorr_fx, sub( Qmaxcorr, Qcorr ), &Overflow ), maxcorr_fx, &Overflow ); /*  Qmaxcorr */
-#else
-            diff_corr = L_sub( L_shl( wcorr_fx, sub( Qmaxcorr, Qcorr ) ), maxcorr_fx ); /*  Qmaxcorr */
-#endif
         }
 
         if ( diff_corr > 0 )
         {
             fshift_fx = n;
             move16();
-#ifdef BASOP_NOGLOB
             maxcorr_fx = (Word32) L_shl_o( corr_fx, Qcorr, &Overflow ); /*  Qcorr */
-#else
-            maxcorr_fx = (Word32) L_shl( corr_fx, Qcorr );                              /*  Qcorr */
-#endif
             Qmaxcorr = Qcorr;
             move16();
         }
@@ -758,6 +741,7 @@ static void LPCPowSpect_fx(
     Word16 tmp, exp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     FOR( k = 0; k < Nf; k++ )
     {
@@ -789,17 +773,11 @@ static void LPCPowSpect_fx(
 
             t1 = add( t1, (Word16) L_shr( Ltemp, 16 ) ); /*  t1 is interpolated cos(w) */
             Ltemp = L_shr( L_mult( LPC[i], t1 ), 1 );    /*  Ltemp in Q27 */
-#ifdef BASOP_NOGLOB
-            Re = L_add_o( Re, Ltemp, &Overflow );     /*  Re=1-sum(LPC[i]*cos(Lw)); */
-            Ltemp = L_add_o( Lw, 0x6000, &Overflow ); /*  add 0.75, which is 3pi/2 to convert sin to cos */
-            Ltemp = L_shl_o( Ltemp, 10, &Overflow );  /*  Q25 */
-#else
-            Re = L_add( Re, Ltemp );                                                    /*  Re=1-sum(LPC[i]*cos(Lw)); */
-            Ltemp = L_add( Lw, 0x6000 );                                                /*  add 0.75, which is 3pi/2 to convert sin to cos */
-            Ltemp = L_shl( Ltemp, 10 );                                                 /*  Q25 */
-#endif
-            w = extract_h( Ltemp );  /*  w is equivalent cos index */
-            dl = extract_l( Ltemp ); /*  dl is 6 bit left-over for interpolation */
+            Re = L_add_o( Re, Ltemp, &Overflow );        /*  Re=1-sum(LPC[i]*cos(Lw)); */
+            Ltemp = L_add_o( Lw, 0x6000, &Overflow );    /*  add 0.75, which is 3pi/2 to convert sin to cos */
+            Ltemp = L_shl_o( Ltemp, 10, &Overflow );     /*  Q25 */
+            w = extract_h( Ltemp );                      /*  w is equivalent cos index */
+            dl = extract_l( Ltemp );                     /*  dl is 6 bit left-over for interpolation */
             w = s_and( w, 511 );
             t1 = cos_table[w];
             /*t2=cos_table[s_and(add(w,1),511)]; */
@@ -819,13 +797,8 @@ static void LPCPowSpect_fx(
 
             t1 = add( t1, (Word16) L_shr( Ltemp, 16 ) ); /*  t1 is interpolated cos(w) */
             Ltemp = L_shr( L_mult( LPC[i], t1 ), 1 );    /*  Ltemp in Q27 */
-#ifdef BASOP_NOGLOB
-            Im = L_sub_o( Im, Ltemp, &Overflow );   /*  Im=sum(LPC[i]*sin(Lw)) */
-            Lw = L_add_o( Lw, freq[k], &Overflow ); /*  Lw=(i+1)*freq[k] */
-#else
-            Im = L_sub( Im, Ltemp );                                                    /*  Im=sum(LPC[i]*sin(Lw)) */
-            Lw = L_add( Lw, freq[k] );                                                  /*  Lw=(i+1)*freq[k] */
-#endif
+            Im = L_sub_o( Im, Ltemp, &Overflow );        /*  Im=sum(LPC[i]*sin(Lw)) */
+            Lw = L_add_o( Lw, freq[k], &Overflow );      /*  Lw=(i+1)*freq[k] */
         }
         /* If necessary, we can block-normalize Re and Im to improve precision */
         dh = extract_h( Re );
@@ -840,11 +813,7 @@ static void LPCPowSpect_fx(
         ELSE
             Lacc = L_mult0( dh, dl );
 
-#ifdef BASOP_NOGLOB
         Lacc = L_add_o( L_shr( Lacc, 15 ), L_shr( L_mult_o( dh, dh, &Overflow ), 1 ), &Overflow ); /*  Lacc=Re*Re */
-#else
-        Lacc = L_add( L_shr( Lacc, 15 ), L_shr( L_mult( dh, dh ), 1 ) );                /*  Lacc=Re*Re */
-#endif
         dh = extract_h( Im );
         dl = extract_l( Im );
 
@@ -861,7 +830,7 @@ static void LPCPowSpect_fx(
         Lacc = L_add( Lacc, L_shr( L_mult( dh, dh ), 1 ) ); /*  Lacc=Re^2+Im^2, Q22        */
 
         exp = norm_l( Lacc );
-        tmp = round_fx( L_shl( Lacc, exp ) );
+        tmp = round_fx_sat( L_shl( Lacc, exp ) );
         exp = sub( sub( 30, exp ), 22 );
 
         /* tmp may potentially become negative, when Lacc is a very large value */
@@ -875,11 +844,8 @@ static void LPCPowSpect_fx(
             move16();
         }
         Ltemp = L_deposit_h( tmp );
-#ifdef BASOP_NOGLOB
         out[k] = round_fx_o( L_shl_o( Ltemp, negate( add( exp, 8 ) ), &Overflow ), &Overflow );
-#else
-        out[k] = round_fx( L_shl( Ltemp, negate( add( exp, 8 ) ) ) );
-#endif
+        move16();
 
         /* out[k] = shl(tmp,-exp-8); in Q7 */
     }
@@ -981,7 +947,7 @@ static void erb_diff_fx(
         tmp = t_prev_erb[num_erb - 1];
         move16();
 
-        FOR( i = sub( num_erb, 1 ); i >= 0; i-- )
+        FOR( i = num_erb - 1; i >= 0; i-- )
         {
             IF( pslot[i] != 0 )
             {
diff --git a/lib_enc/pre_proc.c b/lib_enc/pre_proc.c
deleted file mode 100644
index dc0d098987194e4ae0ac1c7dc0b7b2d50ec319d2..0000000000000000000000000000000000000000
--- a/lib_enc/pre_proc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
diff --git a/lib_enc/pre_proc_fx.c b/lib_enc/pre_proc_fx.c
index 12b09c9ebc1a4425ce6af05c4b2dafafae6786b1..f7ebc8298cbff4ec232d23900b37bf55e03dea18 100644
--- a/lib_enc/pre_proc_fx.c
+++ b/lib_enc/pre_proc_fx.c
@@ -6,7 +6,6 @@
 #include "options.h"
 #include "cnst.h"
 #include "rom_com_fx.h"
-//#include "prot_fx.h"
 #include "rom_com.h"     /* Common constants                       */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
@@ -106,6 +105,8 @@ void pre_proc_fx(
     Word16 fft_buff[2 * L_FFT];
     Word16 sp_floor;
     Word16 freqTable_local[2] = { 20, 40 };
+    move16();
+    move16();
     Word16 last_core_orig;
     Word16 headroom;
     Word16 cldfb_addition = 0;
@@ -127,6 +128,7 @@ void pre_proc_fx(
 
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     /*------------------------------------------------------------------*
@@ -206,12 +208,12 @@ void pre_proc_fx(
 
     analysisCldfbEncoder_fx( st, signal_in, realBuffer, imagBuffer, realBuffer16, imagBuffer16, enerBuffer, &enerBuffer_exp, cldfbScale );
     cldfbScale->hb_scale = cldfbScale->lb_scale;
+    move16();
 
     /*----------------------------------------------------------------*
      * Change the sampling frequency to 12.8 kHz
      *----------------------------------------------------------------*/
-    Word16 Q_new_inp, mem_decim_size; // TO be removed
-    modify_Fs_fx( signal_in, input_frame, st->input_Fs, new_inp_12k8, INT_FS_12k8, st->mem_decim_fx, ( const Word16 )( EQ_16( st->max_bwidth, NB ) ), &Q_new_inp, &mem_decim_size );
+    modify_Fs_fx( signal_in, input_frame, st->input_Fs, new_inp_12k8, INT_FS_12k8, st->mem_decim_fx, ( const Word16 )( EQ_16( st->max_bwidth, NB ) ) );
     Copy( new_inp_12k8, st->buf_speech_enc + L_FRAME32k, L_FRAME );
     Scale_sig( st->buf_speech_enc + L_FRAME32k, L_FRAME, 1 );
     /*------------------------------------------------------------------*
@@ -227,7 +229,7 @@ void pre_proc_fx(
     test();
     /* reserve an extra bit of headroom in case of NB coding and if there is a chance of energy above 4 kHz */
     /* st->bwidth refers to the coded bandwidth of the previous frame */
-    if ( ( ( EQ_16( st->bwidth, NB ) ) || ( EQ_16( st->max_bwidth, NB ) ) ) && ( GT_32( st->input_Fs, 8000 ) ) )
+    if ( ( ( st->bwidth == NB ) || ( st->max_bwidth == NB ) ) && ( GT_32( st->input_Fs, 8000 ) ) )
     {
         headroom = add( headroom, 1 );
     }
@@ -251,11 +253,7 @@ void pre_proc_fx(
      * Spectral analysis
      *--------------------------------------------------------------------------*/
 
-    analy_sp_fx( -1,
-#ifdef IVAS_CODE_CPE
-                 NULL,
-#endif
-                 st->input_Fs, inp_12k8, *Q_new, fr_bands, lf_E, Etot, st->min_band, st->max_band, Le_min_scaled, Scale_fac, st->Bin_E_fx, st->Bin_E_old_fx,
+    analy_sp_fx( -1, inp_12k8, *Q_new, fr_bands, lf_E, Etot, st->min_band, st->max_band, Le_min_scaled, Scale_fac, st->Bin_E_fx, st->Bin_E_old_fx,
                  PS, st->lgBin_E_fx, st->band_energies, fft_buff );
 
     st->band_energies_exp = sub( sub( WORD32_BITS - 1, *Q_new ), QSCALE );
@@ -277,7 +275,7 @@ void pre_proc_fx(
     {
         /* Combine decisions from SADS */
         test();
-        IF( EQ_16( st->vad_flag, 1 ) && vad_flag_cldfb == 0 )
+        if ( EQ_16( st->vad_flag, 1 ) && vad_flag_cldfb == 0 )
         {
             st->localVAD = 0;
             move16();
@@ -300,7 +298,7 @@ void pre_proc_fx(
         move16();
     }
 
-    bw_detect_fx( st, signal_in, NULL, enerBuffer, sf_energySum, MONO_FORMAT, 0 );
+    bw_detect_fx( st, signal_in, NULL, enerBuffer, sf_energySum, MONO_FORMAT, 0, 0 );
 
     /*----------------------------------------------------------------*
      * Noise energy down-ward update and total noise energy estimation
@@ -416,7 +414,7 @@ void pre_proc_fx(
     alw_voicing[1] = st->voicing_fx[2];
     move16();
 
-    analy_lp_fx( inp_12k8, L_FRAME, L_look, ener, A, epsP_h, epsP_l, lsp_new, lsp_mid, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing, INT_FS_12k8, -1 /*IVAS_CODE !! LowRateFlag*/, *Q_new, Q_r );
+    analy_lp_fx( inp_12k8, L_FRAME, L_look, ener, A, epsP_h, epsP_l, lsp_new, lsp_mid, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing, INT_FS_12k8, EVS_MONO, 0, *Q_new, Q_r );
 
     lsp2lsf_fx( lsp_new, lsf_new, M, INT_FS_12k8 );
     stab_fac = lsf_stab_fx( lsf_new, st->lsf_old1_fx, 0, L_FRAME );
@@ -486,7 +484,6 @@ void pre_proc_fx(
         move16();
     }
 
-    move16();
 
     /*------------------------------------------------------------------*
      * Update estimated noise energy and voicing cut-off frequency
@@ -495,9 +492,6 @@ void pre_proc_fx(
     noise_est_fx( st, old_pitch1, tmpN, epsP_h, epsP_l, *Etot, relE, corr_shift, tmpE, fr_bands, &cor_map_sum,
                   NULL, &sp_div, &Q_sp_div, &non_staX, &loc_harm, lf_E, &hNoiseEst->harm_cor_cnt, hNoiseEst->Etot_l_lp_fx,
                   hNoiseEst->Etot_v_h2_fx, &hNoiseEst->bg_cnt, st->lgBin_E_fx, *Q_new, Le_min_scaled, &sp_floor, NULL,
-#ifdef IVAS_CODE
-                  NULL, NULL,
-#endif
                   st->ini_frame );
 
     /*------------------------------------------------------------------*
@@ -514,43 +508,43 @@ void pre_proc_fx(
                   st->max_band, hp_E, st->codec_mode, *Q_new, &( st->bckr_tilt_lt ), st->Opt_SC_VBR );
 
     st->coder_type = find_uv_fx( st, pitch_fr, voicing_fr, inp_12k8, ee,
-#ifdef IVAS_CODE
-                                 NULL,
-#endif
-                                 corr_shift, relE, *Etot, hp_E, *Q_new, &flag_spitch, *shift, last_core_orig
-#ifdef IVAS_CODE
-                                 ,
-                                 NULL
-#endif
-    );
+                                 corr_shift, relE, *Etot, hp_E, *Q_new, &flag_spitch, *shift, last_core_orig );
 
     /*----------------------------------------------------------------*
      * channel aware mode configuration                                *
      *-----------------------------------------------------------------*/
     test();
     test();
-    test();
     IF( !st->Opt_RF_ON )
     {
         st->rf_mode = 0;
+        move16();
         st->rf_target_bits_write = 0;
+        move16();
     }
-    ELSE IF( st->rf_mode && NE_32( st->core_brate, FRAME_NO_DATA ) && NE_32( st->core_brate, SID_2k40 ) )
+    ELSE IF( st->rf_mode && st->core_brate != FRAME_NO_DATA && NE_32( st->core_brate, SID_2k40 ) )
     {
         /* the RF config is for (n- fec_offset)th frame that will be packed along with the n-th frame bitstream */
         st->rf_mode = 1;
+        move16();
         st->codec_mode = MODE2;
+        move16();
 
         st->rf_target_bits_write = hRF->rf_targetbits_buff[st->rf_fec_offset];
+        move16();
     }
     ELSE
     {
         st->rf_mode = 0;
+        move16();
         st->codec_mode = MODE1;
+        move16();
         IF( st->Opt_RF_ON )
         {
             hRF->rf_indx_frametype[0] = RF_NO_DATA;
+            move16();
             hRF->rf_targetbits_buff[0] = 6; /* rf_mode: 1, rf_frame_type: 3, and fec_offset: 2 */
+            move16();
         }
     }
 
@@ -588,12 +582,7 @@ void pre_proc_fx(
     speech_music_classif_fx( st, new_inp_12k8, inp_12k8, localVAD_HE_SAD, lsp_new, cor_map_sum, epsP, PS,
                              *Etot, old_cor, attack_flag, non_staX, relE, Q_esp, *Q_new, &high_lpn_flag, flag_spitch );
 
-    long_enr_fx( st, *Etot, localVAD_HE_SAD, high_lpn_flag
-#ifdef IVAS_CODE
-                 ,
-                 NULL, 1, NULL, NULL
-#endif
-    ); /* has to be after  after sp_music classfier */
+    long_enr_fx( st, *Etot, localVAD_HE_SAD, high_lpn_flag ); /* has to be after  after sp_music classfier */
 
     /*----------------------------------------------------------------*
      * Rewrite the VAD flag by VAD flag  with DTX hangover for further processing)
@@ -625,7 +614,7 @@ void pre_proc_fx(
         test();
         test();
         test();
-        IF( EQ_32( st->core_brate, FRAME_NO_DATA ) )
+        IF( st->core_brate == FRAME_NO_DATA )
         {
             /* prevent "L_frame" changes in CNG segments */
             st->L_frame = st->last_L_frame;
@@ -672,9 +661,11 @@ void pre_proc_fx(
         }
 
         st->sr_core = L_mult0( FRAMES_PER_SEC, st->L_frame );
+        move32();
         st->encoderLookahead_enc = NS2SA_FX2( st->sr_core, ACELP_LOOK_NS );
         move16();
         st->encoderPastSamples_enc = shr( imult1616( st->L_frame, 9 ), 4 );
+        move16();
     }
 
     /*-----------------------------------------------------------------*
@@ -699,7 +690,7 @@ void pre_proc_fx(
         test();
         test();
         test();
-        IF( NE_16( st->last_L_frame, st->L_frame ) && NE_32( st->core_brate, FRAME_NO_DATA ) && NE_32( st->core_brate, SID_2k40 ) && ( NE_16( st->coder_type_raw, VOICED ) ) )
+        IF( NE_16( st->last_L_frame, st->L_frame ) && st->core_brate != FRAME_NO_DATA && NE_32( st->core_brate, SID_2k40 ) && ( NE_16( st->coder_type_raw, VOICED ) ) )
         {
             /* enforce TC frame in case of ACELP@12k8 <-> ACELP@16k core switching */
             st->coder_type = TRANSITION;
@@ -826,12 +817,14 @@ void pre_proc_fx(
             {
                 SetModeIndex_fx( st, st->last_total_brate, EVS_MONO, 0, *shift );
                 st->sr_core = getCoreSamplerateMode2( st->element_mode, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, 0 );
-
+                move32();
                 Mpy_32_16_ss( st->sr_core, 5243, &L_tmp, &lsb ); /* 5243 is 1/50 in Q18. (0+18-15=3) */
                 st->L_frame = extract_l( L_shr( L_tmp, 3 ) );    /* Q0 */
+                move16();
                 st->encoderLookahead_enc = NS2SA_FX2( st->sr_core, ACELP_LOOK_NS );
                 move16();
                 st->encoderPastSamples_enc = shr( imult1616( st->L_frame, 9 ), 4 );
+                move16();
                 assert( st->L_frame == st->sr_core / 50 );
 
                 IF( EQ_32( st->sr_core, INT_FS_12k8 ) )
@@ -882,7 +875,9 @@ void pre_proc_fx(
     IF( EQ_32( st->total_brate, ACELP_32k ) && EQ_16( loc_harm, 1 ) && GT_16( cor_map_sum, 50 << 8 ) && EQ_16( st->clas, VOICED_CLAS ) && EQ_16( st->coder_type, GENERIC ) )
     {
         st->last_harm_flag_acelp = add( st->last_harm_flag_acelp, 1 );
+        move16();
         st->last_harm_flag_acelp = s_min( st->last_harm_flag_acelp, 10 );
+        move16();
     }
     ELSE
     {
@@ -897,14 +892,18 @@ void pre_proc_fx(
     IF( EQ_16( st->coder_type, AUDIO ) )
     {
         st->audio_frame_cnt = add( st->audio_frame_cnt, AUDIO_COUNTER_STEP );
+        move16();
     }
-    ELSE IF( NE_16( st->coder_type, INACTIVE ) )
+    ELSE IF( st->coder_type != INACTIVE )
     {
         st->audio_frame_cnt = sub( st->audio_frame_cnt, 1 );
+        move16();
     }
 
     st->audio_frame_cnt = s_min( st->audio_frame_cnt, AUDIO_COUNTER_MAX );
+    move16();
     st->audio_frame_cnt = s_max( st->audio_frame_cnt, 0 );
+    move16();
 
     /*-----------------------------------------------------------------*
      * Set formant sharpening flag
@@ -959,9 +958,10 @@ void pre_proc_fx(
     /* channel-aware mode - due to lack of signalling bit, sharpFlag is 1 always in RF mode */
     test();
     test();
-    IF( EQ_16( st->rf_mode, 1 ) && ( EQ_16( st->coder_type, VOICED ) || EQ_16( st->coder_type, GENERIC ) ) )
+    if ( EQ_16( st->rf_mode, 1 ) && ( EQ_16( st->coder_type, VOICED ) || EQ_16( st->coder_type, GENERIC ) ) )
     {
         st->sharpFlag = 1;
+        move16();
     }
 
     /*-----------------------------------------------------------------*
@@ -995,8 +995,7 @@ void pre_proc_fx(
         L_frame_tmp = L_FRAME16k;
         move16();
     }
-    L_look = NS2SA_FX2( sr_core_tmp, ACELP_LOOK_NS );
-    move16(); /* lookahead at other sampling rate (16kHz, 25.5kHz, 32kHz) */
+    L_look = NS2SA_FX2( sr_core_tmp, ACELP_LOOK_NS ); /* lookahead at other sampling rate (16kHz, 25.5kHz, 32kHz) */
 
     new_inp_16k = old_inp_16k + L_INP_MEM;              /* pointer to new samples of the input signal in 16kHz core */
     inp_16k = new_inp_16k - L_look;                     /* pointer to the current frame of input signal in 16kHz core */
@@ -1017,7 +1016,7 @@ void pre_proc_fx(
     }
     ELSE IF( EQ_32( st->input_Fs, 32000 ) || EQ_32( st->input_Fs, 48000 ) )
     {
-        modify_Fs_fx( signal_in, input_frame, st->input_Fs, new_inp_16k, sr_core_tmp, st->mem_decim16k_fx, 0, &Q_new_inp, &mem_decim_size );
+        modify_Fs_fx( signal_in, input_frame, st->input_Fs, new_inp_16k, sr_core_tmp, st->mem_decim16k_fx, 0 );
     }
     ELSE /* keep memories up-to-date in case of bitrate switching */
     {
@@ -1047,11 +1046,8 @@ void pre_proc_fx(
     test();
     IF( ( ( st->tcxonly == 0 ) || ( EQ_16( st->codec_mode, MODE1 ) ) ) && GT_32( st->input_Fs, 8000 ) )
     {
-#ifdef BASOP_NOGLOB
         st->mem_preemph_enc = shl_o( new_inp_16k[sub( L_frame_tmp, 1 )], 1, &Overflow );
-#else /* BASOP_NOGLOB */
-        st->mem_preemph_enc = shl( new_inp_16k[sub( L_frame_tmp, 1 )], 1 );
-#endif
+        move16();
     }
 
     test();
@@ -1061,7 +1057,7 @@ void pre_proc_fx(
     }
     ELSE IF( GT_32( st->input_Fs, 8000 ) ) /* keep memory up-to-date in case of bit-rate switching */
     {
-        st->mem_preemph16k_fx = new_inp_16k[sub( L_frame_tmp, 1 )];
+        st->mem_preemph16k_fx = new_inp_16k[L_frame_tmp - 1];
         move16();
     }
 
@@ -1075,7 +1071,7 @@ void pre_proc_fx(
     test();
     test();
     test();
-    IF( ( ( ( st->tcxonly == 0 ) || !( NE_32( st->core_brate, FRAME_NO_DATA ) || NE_32( st->core_brate, SID_2k40 ) ) ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE2 ) ) ||
+    IF( ( ( ( st->tcxonly == 0 ) || !( st->core_brate != FRAME_NO_DATA || NE_32( st->core_brate, SID_2k40 ) ) ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE2 ) ) ||
         ( EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE1 ) ) )
     {
         *Q_new = Q_new_16k;
@@ -1092,7 +1088,6 @@ void pre_proc_fx(
     /* Above computed Q_new is used to scale primary copy exc and memory here by (Q_new, st->prev_Q_new) */
 
     Q_exp = sub( *Q_new, st->prev_Q_new );
-    move16();
     Q_wsp_exp = add( Q_exp, shift_exp );
 
     Scale_mem_enc( Q_exp, old_inp_16k, old_exc, hBWE_TD->old_bwe_exc_fx, &( hLPDmem->mem_w0 ), hLPDmem->mem_syn,
@@ -1109,11 +1104,7 @@ void pre_proc_fx(
     test();
     test();
     test();
-#ifndef CR_2109_to_2112_cd0_ce0
-    IF( ( ( ( st->tcxonly == 0 ) || !( NE_32( st->core_brate, FRAME_NO_DATA ) || NE_32( st->core_brate, SID_2k40 ) ) ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE2 ) ) || ( EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE1 ) ) )
-#else
-    IF( ( ( ( st->tcxonly == 0 ) || !( NE_32( st->core_brate, FRAME_NO_DATA ) && NE_32( st->core_brate, SID_2k40 ) ) ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE2 ) ) || ( EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE1 ) ) )
-#endif
+    IF( ( ( ( st->tcxonly == 0 ) || !( st->core_brate != FRAME_NO_DATA && NE_32( st->core_brate, SID_2k40 ) ) ) && EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE2 ) ) || ( EQ_16( st->L_frame, L_FRAME16k ) && EQ_16( st->codec_mode, MODE1 ) ) )
     {
         /* update signal buffers */
         Copy( new_inp_resamp16k, st->buf_speech_enc + L_FRAME16k, L_FRAME16k );
@@ -1136,7 +1127,7 @@ void pre_proc_fx(
             Copy( st->lsp_old1_fx, st->lspold_enc_fx, M );
         }
 
-        analy_lp_fx( inp_16k, L_FRAME16k, L_look, ener, A, epsP_h, epsP_l, lsp_new, lsp_mid, st->lspold_enc_fx, st->pitch, st->voicing_fx, 16000, -1 /*IVAS_CODE !! LowRateFlag*/, *Q_new, Q_r );
+        analy_lp_fx( inp_16k, L_FRAME16k, L_look, ener, A, epsP_h, epsP_l, lsp_new, lsp_mid, st->lspold_enc_fx, st->pitch, st->voicing_fx, 16000, EVS_MONO, 0, *Q_new, Q_r );
 
         /*--------------------------------------------------------------*
          * Compute Weighted Input
@@ -1221,7 +1212,7 @@ void pre_proc_fx(
     {
         test();
         test();
-        IF( ( NE_32( st->core_brate, FRAME_NO_DATA ) && NE_32( st->core_brate, SID_2k40 ) && st->tcxonly == 0 ) )
+        IF( ( st->core_brate != FRAME_NO_DATA && NE_32( st->core_brate, SID_2k40 ) && st->tcxonly == 0 ) )
         {
             core_acelp_tcx20_switching_fx( st, non_staX, pitch_fr, voicing_fr, currFlatness, lsp_mid, stab_fac, *Q_new, *shift );
         }
@@ -1318,16 +1309,18 @@ void pre_proc_fx(
     }
 
     /* Update vAD hangover frame counter in active frames */
-    if ( ( NE_16( st->core, HQ_CORE ) && st->tcxonly == 0 ) || EQ_16( st->core, ACELP_CORE ) )
+    if ( ( NE_16( st->core, HQ_CORE ) && st->tcxonly == 0 ) || st->core == ACELP_CORE )
     {
 
-        IF( !( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, FRAME_NO_DATA ) ) )
+        IF( !( EQ_32( st->core_brate, SID_2k40 ) || st->core_brate == FRAME_NO_DATA ) )
         {
             test();
             IF( st->Opt_DTX_ON != 0 && *vad_hover_flag != 0 )
             {
                 hTdCngEnc->burst_ho_cnt = add( hTdCngEnc->burst_ho_cnt, 1 );
+                move16();
                 hTdCngEnc->burst_ho_cnt = s_min( hTdCngEnc->burst_ho_cnt, HO_HIST_SIZE );
+                move16();
             }
             ELSE
             {
diff --git a/lib_enc/prot_fx_enc.h b/lib_enc/prot_fx_enc.h
index c96678a7a5dfee59c304f367629094b6e16159ef..d3528370f4a4defe2222204924ed7aac4eba6ba6 100644
--- a/lib_enc/prot_fx_enc.h
+++ b/lib_enc/prot_fx_enc.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -41,9 +41,8 @@
 #include "ivas_error_utils.h"
 #include "complex_basop.h"
 #include "ivas_stat_enc.h"
-/*----------------------------------------------------------------------------------*
- * Prototypes of RAM counting tool macros
- *----------------------------------------------------------------------------------*/
+
+
 ivas_error acelp_core_enc_fx(
     Encoder_State *st_fx,                  /* i/o: encoder state structure             */
     const Word16 inp_fx[],                 /* i  : input signal of the current frame		Q_new*/
@@ -61,60 +60,43 @@ ivas_error acelp_core_enc_fx(
     Word16 old_syn_12k8_16k_fx[],          /* o  : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE q_old_syn*/
     Word16 pitch_buf_fx[NB_SUBFR16k],      /* o  : floating pitch for each subframe			Q6*/
     Word16 *unbits_fx,                     /* o  : number of unused bits               Q0*/
+    STEREO_TD_ENC_DATA_HANDLE hStereoTD,   /* i/o: TD stereo encoder handle            */
     const Word16 Q_new,
     const Word16 shift
-#ifdef ADD_LRTD
-    ,
-    STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle            */
-    const float tdm_lsfQ_PCh[M]          /* i  : Q LSFs for primary channel          */
-#endif
+
 );
-void analy_lp_ivas_fx(
-    const Word16 speech[],          /* i  :(Q_new) pointer to the speech frame                      */
-    const Word16 L_frame,           /* i  :(q0) length of the frame                              */
-    const Word16 L_look,            /* i  :(q0) look-ahead                                       */
-    Word32 *ener,                   /* o  :(Q_r) residual energy from Levinson-Durbin             */
-    Word16 A[],                     /* o  :(q14) A(z) filter coefficients                         */
-    Word16 epsP_h[],                /* o  :(high part of epsP(Q_r)) LP analysis residual energies for each iteration */
-    Word16 epsP_l[],                /* o  :(low part of epsP(Q_r)) LP analysis residual energies for each iteration */
-    Word16 lsp_new[],               /* o  :(q15) current frame LSPs                               */
-    Word16 lsp_mid[],               /* o  :(q15) current mid-frame LSPs                           */
-    Word16 lsp_old[],               /* i/o:(q15) previous frame unquantized LSPs                  */
-    const Word16 Top[2],            /* i  :(q0) open loop pitch lag                              */
-    const Word16 Tnc[2],            /* i  :(q15) open loop pitch gain                             */
-    const Word32 Core_sr,           /* i  :(q0) Internal core sampling rate                      */
-    const Word16 sec_chan_low_rate, /* i  :(q0) flag to signal second channel        */
-    Word16 Q_new,                   /*i: stores Q for speech*/
-    Word16 *Q_r /*stores q for ener*/ );
 
 void analy_lp_fx(
-    const Word16 speech[],          /* i  : pointer to the speech frame                      Q_new*/
-    const Word16 L_frame,           /* i  : length of the frame                              Q0*/
-    const Word16 L_look,            /* i  : look-ahead                                       Q0*/
-    Word32 *ener,                   /* o  : residual energy from Levinson-Durbin             Q_r*/
-    Word16 A[],                     /* o  : A(z) filter coefficients                         Q14*/
-    Word16 epsP_h[],                /* o  : LP analysis residual energies for each iteration Q_r*/
-    Word16 epsP_l[],                /* o  : LP analysis residual energies for each iteration Q_r*/
-    Word16 lsp_new[],               /* o  : current frame LSPs                               Q15*/
-    Word16 lsp_mid[],               /* o  : current mid-frame LSPs                           Q15*/
-    Word16 lsp_old[],               /* i/o: previous frame unquantized LSPs                  Q15*/
-    const Word16 Top[2],            /* i  : open loop pitch lag                              Q0*/
-    const Word16 Tnc[2],            /* i  : open loop pitch gain                             Q15*/
-    const Word32 Core_sr,           /* i  : Internal core sampling rate                      Q0*/
-    const Word16 sec_chan_low_rate, /* i  : flag to signal second channel					 Q0*/
-    Word16 Q_new,
-    Word16 *Q_r );
-
-void AVQ_cod_fx(                       /* o:   comfort noise gain factor        */
-                 const Word16 xri[],   /* i:   vector to quantize               */
-                 Word16 xriq[],        /* o:   quantized normalized vector (assuming the bit budget is enough) */
-                 const Word16 NB_BITS, /* i:   number of allocated bits         */
-                 const Word16 Nsv,     /* i:   number of subvectors (lg=Nsv*8)  */
-                 const Word16 Q_in_ref /* i:   Scaling i      */
+    const Word16 speech[],          /* i  :(Q_new) pointer to the speech frame                                       */
+    const Word16 L_frame,           /* i  :(q0) length of the frame                                                  */
+    const Word16 L_look,            /* i  :(q0) look-ahead                                                           */
+    Word32 *ener,                   /* o  :(Q_r) residual energy from Levinson-Durbin                                */
+    Word16 A[],                     /* o  :(q14) A(z) filter coefficients                                            */
+    Word16 epsP_h[],                /* o  :(high part of epsP(Q_r)) LP analysis residual energies for each iteration */
+    Word16 epsP_l[],                /* o  :(low part of epsP(Q_r)) LP analysis residual energies for each iteration  */
+    Word16 lsp_new[],               /* o  :(q15) current frame LSPs                                                  */
+    Word16 lsp_mid[],               /* o  :(q15) current mid-frame LSPs                                              */
+    Word16 lsp_old[],               /* i/o:(q15) previous frame unquantized LSPs                                     */
+    const Word16 Top[2],            /* i  :(q0) open loop pitch lag                                                  */
+    const Word16 Tnc[2],            /* i  :(q15) open loop pitch gain                                                */
+    const Word32 Core_sr,           /* i  :(q0) Internal core sampling rate                                          */
+    const Word16 element_mode,      /* i  : element mode                                                             */
+    const Word16 sec_chan_low_rate, /* i  :(q0) flag to signal second channel                                        */
+    Word16 Q_new,                   /* i  : stores Q for speech                                                      */
+    Word16 *Q_r                     /*stores q for ener*/
+);
+
+/*1 r: comfort noise gain factor */
+void AVQ_cod_fx(
+    const Word16 xri[],   /* i:   vector to quantize               */
+    Word16 xriq[],        /* o:   quantized normalized vector (assuming the bit budget is enough) */
+    const Word16 NB_BITS, /* i:   number of allocated bits         */
+    const Word16 Nsv,     /* i:   number of subvectors (lg=Nsv*8)  */
+    const Word16 Q_in_ref /* i:   Scaling i                        */
 );
 
 void AVQ_encmux_fx(
-    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle            */
+    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle                                */
     const Word16 extl,     /* i  : extension layer                                 */
     Word16 xriq[],         /* i/o: rounded subvectors [0..8*Nsv-1] followed
                                by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
@@ -126,7 +108,7 @@ void AVQ_encmux_fx(
 );
 
 void AVQ_encmux_ivas_fx(
-    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle            */
+    BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle                                */
     const Word16 extl,     /* i  : extension layer                                 */
     Word16 xriq[],         /* i/o: rounded subvectors [0..8*Nsv-1] followed
                                by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
@@ -139,23 +121,23 @@ void AVQ_encmux_ivas_fx(
 
 void bw_detect_fx(
     Encoder_State *st,               /* i/o: Encoder State           */
-    const Word16 signal_in[],        /* i  : i   signal            */
-    Word16 *spectrum,                /* i  : MDCT spectrum       */
-    const Word32 *enerBuffer,        /* i  : CLDFB Energy   Q31        */
-    const Word16 *cldfbBuf_Ener_Exp, /* i  : CLDFB Energy Exponent     */
-    const IVAS_FORMAT ivas_format,   /* i  : IVAS format         */
-    const int16_t mct_on             /* i  : flag MCT mode       */
-);
-
-void core_switching_post_enc_fx(                         /*done */
-                                 Encoder_State *st_fx,   /* i/o: encoder state structure             */
-                                 const Word16 inp12k8[], /* i  : i   signal @12.8 kHz              Qinp*/
-                                 const Word16 inp16k[],  /* i  : i   signal @16 kHz                Qinp*/
-                                 const Word16 A[],       /* i  : unquant. LP filter coefs. (Q12)     */
-                                 Word16 Qshift,
-                                 Word16 Q_new,
-                                 const Word16 Qsp, /* i/o  : Q from acelp synthsis */
-                                 Word16 *Qmus      /* i/o  : Q from mdct synthsis / Q of output synthesis  */
+    const Word16 signal_in[],        /* i  : input signal           */
+    Word16 *spectrum,                /* i  : MDCT spectrum       Q_spec   */
+    const Word32 *enerBuffer,        /* i  : CLDFB Energy   Q31      */
+    const Word16 *cldfbBuf_Ener_Exp, /* i  : CLDFB Energy Exponent   */
+    const IVAS_FORMAT ivas_format,   /* i  : IVAS format             */
+    const Word16 mct_on,             /* i  : flag MCT mode           */
+    const Word16 Q_spec );
+
+void core_switching_post_enc_fx(
+    Encoder_State *st_fx,   /* i/o: encoder state structure             */
+    const Word16 inp12k8[], /* i  : i   signal @12.8 kHz              Qinp*/
+    const Word16 inp16k[],  /* i  : i   signal @16 kHz                Qinp*/
+    const Word16 A[],       /* i  : unquant. LP filter coefs. (Q12)     */
+    Word16 Qshift,
+    Word16 Q_new,
+    const Word16 Qsp, /* i/o  : Q from acelp synthsis */
+    Word16 *Qmus      /* i/o  : Q from mdct synthsis / Q of output synthesis  */
 );
 
 void core_switching_pre_enc_fx(
@@ -166,8 +148,9 @@ void core_switching_pre_enc_fx(
     const Word16 last_element_mode /* i  : last_element_mode                 Q0*/
 );
 
-Word16 correlation_shift_fx(                            /* o  : noise dependent voicing correction     Q15 */
-                             const Word16 totalNoise_fx /* i/o: noise estimate over all critical bands  Q8 */
+/*! r: noise dependent voicing correction     Q15 */
+Word16 correlation_shift_fx(
+    const Word16 totalNoise_fx /* i/o: noise estimate over all critical bands  Q8 */
 );
 
 void dtx_fx(
@@ -178,11 +161,12 @@ void dtx_fx(
 );
 
 void dtx_ivas_fx(
-    Encoder_State *st_fx,          /* i/o: encoder state structure                  */
-    const Word32 ivas_total_brate, /* i  : IVAS total bitrate                      Q0*/
-    const Word16 vad,              /* i  : vad flag for DTX                         Q0*/
-    const Word16 speech[],         /* i  : Pointer to the speech frame              Q_speech*/
-    Word16 Q_speech                /* i  : Q factor for speech                     */
+    Encoder_State *st_fx,               /* i/o: encoder state structure                  */
+    const Word32 last_ivas_total_brate, /* i  : last IVAS total bitrate                  Q0*/
+    const Word32 ivas_total_brate,      /* i  : IVAS total bitrate                      Q0*/
+    const Word16 vad,                   /* i  : vad flag for DTX                         Q0*/
+    const Word16 speech[],              /* i  : Pointer to the speech frame              Q_speech*/
+    Word16 Q_speech                     /* i  : Q factor for speech                     */
 );
 
 Word16 dtx_hangover_addition_fx(
@@ -211,9 +195,10 @@ void fb_tbe_enc_fx(
 
 void fb_tbe_enc_ivas_fx(
     Encoder_State *st,        /* i/o: encoder state structure				    */
-    const Word16 new_input[], /* i  : i   speech at 48 kHz sample rate	   	  Q0*/
+    const Word16 new_input[], /* i  : i   speech at 48 kHz sample rate	   	  Q_new_input*/
     const Word16 fb_exc[],    /* i  : FB excitation from the SWB part	Q_fb_exc*/
-    Word16 Q_fb_exc );
+    Word16 Q_fb_exc,
+    Word16 Q_new_input );
 
 void fb_tbe_reset_enc_fx(
     Word32 elliptic_bpf_2_48k_mem_fx[][4],
@@ -284,21 +269,14 @@ Word16 find_uv_fx(                           /* o  : coding type
                    const Word16 *voicing_fr, /* i  : refined correlation for each subframes							Q15*/
                    const Word16 *speech,     /* i  : pointer to speech signal for E computation						Q_new*/
                    const Word32 *ee,         /* i  : lf/hf Energy ratio for present frame							Q6*/
-#ifdef IVAS_CODE
-                   Word32 *dE1X, /* o  : sudden energy increase for S/M classifier     */
-#endif
-                   const Word16 corr_shift, /* i  : normalized correlation correction in noise						Q15*/
-                   const Word16 relE,       /* i  : relative frame energy											Q8*/
-                   const Word16 Etot,       /* i  : total energy													Q8*/
-                   const Word32 hp_E[],     /* i  : energy in HF													Q_new + Q_SCALE*/
+                   const Word16 corr_shift,  /* i  : normalized correlation correction in noise						Q15*/
+                   const Word16 relE,        /* i  : relative frame energy											Q8*/
+                   const Word16 Etot,        /* i  : total energy													Q8*/
+                   const Word32 hp_E[],      /* i  : energy in HF													Q_new + Q_SCALE*/
                    const Word16 Q_new,
                    Word16 *flag_spitch, /* i/o: flag to indicate very short stable pitch and high correlation		Q0*/
                    const Word16 shift,
                    const Word16 last_core_orig /* i  : original last core											Q0*/
-#ifdef IVAS_CODE
-                   ,
-                   STEREO_CLASSIF_HANDLE hStereoClassif /* i/o: stereo classifier structure                   */
-#endif
 );
 
 void fine_gain_quant_fx(
@@ -362,14 +340,17 @@ void noise_est_down_ivas_fx(
     const Word32 fr_bands[], /* i  : per band i   energy (contains 2 vectors)   */
     const Word16 q_fr_bands, /* i  : Q of fr_bands                              */
     Word32 bckr[],           /* i/o: per band background noise energy estimate  */
-    Word32 tmpN[],           /* o  : temporary noise update                     */
-    Word32 enr[],            /* o  : averaged energy over both subframes        */
-    const Word16 min_band,   /* i  : minimum critical band                      */
-    const Word16 max_band,   /* i  : maximum critical band                      */
-    Word16 *totalNoise,      /* o  : noise estimate over all critical bands     */
-    Word16 Etot,             /* i  : Energy of current frame                    */
-    Word16 *Etot_last,       /* i/o: Energy of last frame            Q8         */
-    Word16 *Etot_v_h2        /* i/o: Energy variations of noise frames  Q8      */
+    Word16 *q_bckr,
+    Word32 tmpN[], /* o  : temporary noise update                     */
+    Word16 *q_tmpN,
+    Word32 enr[], /* o  : averaged energy over both subframes        */
+    Word16 *q_enr,
+    const Word16 min_band, /* i  : minimum critical band                      */
+    const Word16 max_band, /* i  : maximum critical band                      */
+    Word16 *totalNoise,    /* o  : noise estimate over all critical bands     */
+    Word32 Etot,           /* i  : Energy of current frame                 Q24*/
+    Word32 *Etot_last,     /* i/o: Energy of last frame            Q24        */
+    Word32 *Etot_v_h2      /* i/o: Energy variations of noise frames  Q24     */
 );
 
 void noise_est_fx(
@@ -399,11 +380,7 @@ void noise_est_fx(
     const Word32 Le_min_scaled, /*i  : Minimum energy value     in  Q_new + Q_SCALE                         */
     Word16 *sp_floor,           /* o  : noise floor estimate                                 Q7             */
     Word16 S_map[],             /* o  : short-term correlation map                           Q7             */
-#ifdef IVAS_CODE
-    STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                       */
-    FRONT_VAD_ENC_HANDLE hFrontVad,       /* i/o: front-VAD handle                                                  */
-#endif
-    const Word16 ini_frame /* i  : Frame number (init)                                                */
+    const Word16 ini_frame      /* i  : Frame number (init)                                                */
 );
 void noise_est_ivas_fx(
     Encoder_State *st_fx,                 /* i/o: state structure                                                     */
@@ -572,6 +549,15 @@ Word16 signal_clas_fx(                       /* o  : classification for current
                        Word16 *uc_clas       /* o  : temporary classification used in music/speech class*/
 );
 
+Word16 signal_clas_ivas_fx(                       /* o  : classification for current frames              */
+                            Encoder_State *st,    /* i/o: encoder state structure                           */
+                            const Word16 *speech, /* i  : pointer to speech signal for E computation        */
+                            const Word32 *ee,     /* i  : lf/hf E ration for 2 half-frames                  */
+                            const Word16 relE,    /* i  : frame relative E to the long term average         */
+                            const Word16 L_look,  /* i  : look-ahead                                        */
+                            Word16 *uc_clas       /* o  : temporary classification used in music/speech class*/
+);
+
 void speech_music_classif_fx(
     Encoder_State *st,            /* i/o: state structure                                 */
     const Word16 *new_inp,        /* i  : new input signal                                */
@@ -636,11 +622,12 @@ void swb_bwe_enc_fx(
 
 void swb_bwe_enc_ivas_fx(
     Encoder_State *st_fx,              /* i/o: encoder state structure                  */
-    const int16_t last_element_mode,   /* i  : last element mode                       */
+    const Word16 last_element_mode,    /* i  : last element mode                       */
     Word16 *old_input_12k8_fx,         /* i  : input signal @12.8kHz for SWB BWE       */
     Word16 *old_input_16k_fx,          /* i  : input signal @16kHz for SWB BWE         */
     const Word16 *old_syn_12k8_16k_fx, /* i  : ACELP core synthesis at 12.8kHz or 16kHz */
     const Word16 *new_swb_speech_fx,   /* i  : original input signal at 32kHz           */
+    const Word16 Q_new_swb_speech,     /* i  : Q for new_swb_speech_fx                  */
     Word16 *shb_speech_fx,             /* i  : SHB target signal (6-14kHz) at 16kHz     */
     Word16 Q_shb_speech,
     Word16 Q_slb_speech );
@@ -845,10 +832,8 @@ Word16 corr_xy1_fx(                        /* o  : pitch gain  (0..GAIN_PIT_MAX)
                     Word16 g_corr[],       /* o  : correlations <y1,y1>  and -2<xn,y1>   */
                     const Word16 L_subfr,  /* i  : vector length                          */
                     const Word16 norm_flag /* i  : flag for constraining pitch contribution */
-#ifdef BASOP_NOGLOB
                     ,
                     Flag *Overflow_out /* o :  propagating the Overflow flag to upper level */
-#endif
 );
 
 Word16 E_ACELP_indexing_fx( const Word16 code[] /*Q9*/, const PulseConfig *config, Word16 num_tracks /*Q0*/, Word16 prm[] /*Q(shift_bits)*/ );
@@ -905,10 +890,6 @@ void lsf_end_enc_fx(
     Word16 *no_indices,
     Word16 *bits_param_lpc,
     Word16 coder_type_raw /* i  : Coder type (LSF coder_type have some special cases)*/
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    ,
-    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel          */
-#endif
 );
 
 void lsf_end_enc_ivas_fx(
@@ -922,10 +903,10 @@ void lsf_end_enc_ivas_fx(
     Word16 *lpc_param,
     Word16 *no_indices,
     Word16 *bits_param_lpc,
-    Word16 coder_type_raw /* i  : Coder type (LSF coder_type have some special cases)*/
-    ,
+    Word16 coder_type_raw,       /* i  : Coder type (LSF coder_type have some special cases)*/
     const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel          */
 );
+
 void Mode2_abs_pit_enc_fx(
     Word16 T0,          /* i  : integer pitch lag              */
     Word16 T0_frac,     /* i  : pitch fraction                 */
@@ -953,15 +934,18 @@ void norm_corr_fx(
     Word16 ncorr[],      /* o  : normalized correlation                     Q15 */
     const Word16 L_subfr /* i  : subframe size                              */
 );
+
 void norm_corr_ivas_fx(
-    const Word16 exc[],  /* i  : excitation buffer                          Q_new*/
-    const Word16 xn[],   /* i  : target signal                              Q_new-1+shift*/
-    const Word16 h[],    /* i  : weighted synthesis filter impulse response Q(14+shift)*/
-    const Word16 t_min,  /* i  : minimum value of searched range            */
-    const Word16 t_max,  /* i  : maximum value of searched range            */
-    Word16 ncorr[],      /* o  : normalized correlation                     Q15 */
-    const Word16 L_subfr /* i  : subframe size                              */
+    const Word16 exc[],   /* i  : excitation buffer                          Q_new                */
+    const Word16 xn[],    /* i  : target signal                              Q_new-1              */
+    const Word16 h[],     /* i  : weighted synthesis filter impulse response Q(14 - norm_s(h[0])) */
+    const Word16 t_min,   /* i  : minimum value of searched range                                 */
+    const Word16 t_max,   /* i  : maximum value of searched range                                 */
+    Word16 ncorr[],       /* o  : normalized correlation                                          */
+    const Word16 L_subfr, /* i  : subframe size                                                   */
+    Word16 Q_new          /* i                                                                    */
 );
+
 Word16 peak_avrg_ratio_fx(
     const Word32 total_brate,  /* Q0 */
     const Word32 *input_hi_fx, /* i  : i   signal           Q_coeff*/
@@ -1023,20 +1007,23 @@ Word16 pitch_fr4_fx(                          /* o  : chosen integer pitch lag
                      const Word16 L_frame,    /* i  : length of the frame                        */
                      const Word16 L_subfr     /* i  : size of subframe                           */
 );
-Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch lag                 */
-                          const Word16 exc[],      /* i  : excitation buffer                          Q_new*/
-                          const Word16 xn[],       /* i  : target signal                              Q_new-1+shift*/
-                          const Word16 h[],        /* i  : weighted synthesis filter impulse response Q(14+shift)*/
-                          const Word16 t0_min,     /* i  : minimum value in the searched range.       Q0*/
-                          const Word16 t0_max,     /* i  : maximum value in the searched range.       Q0*/
-                          Word16 *pit_frac,        /* o  : chosen fraction (0, 1, 2 or 3)             */
-                          const Word16 i_subfr,    /* i  : flag to first subframe                     */
-                          const Word16 limit_flag, /* i  : flag for limits (0=restrained, 1=extended) */
-                          const Word16 t0_fr2,     /* i  : minimum value for resolution 1/2           */
-                          const Word16 t0_fr1,     /* i  : minimum value for resolution 1             */
-                          const Word16 L_frame,    /* i  : length of the frame                        */
-                          const Word16 L_subfr     /* i  : size of subframe                           */
+
+Word16 pitch_fr4_ivas_fx(                          /* o  : chosen integer pitch lag                                       */
+                          const Word16 exc[],      /* i  : excitation buffer                          Q_new               */
+                          const Word16 xn[],       /* i  : target signal                              Q_new-1             */
+                          const Word16 h[],        /* i  : weighted synthesis filter impulse response Q(14 - norm_s[h[0]) */
+                          const Word16 t0_min,     /* i  : minimum value in the searched range.       Q0                  */
+                          const Word16 t0_max,     /* i  : maximum value in the searched range.       Q0                  */
+                          Word16 *pit_frac,        /* o  : chosen fraction (0, 1, 2 or 3)                                 */
+                          const Word16 i_subfr,    /* i  : flag to first subframe                                         */
+                          const Word16 limit_flag, /* i  : flag for limits (0=restrained, 1=extended)                     */
+                          const Word16 t0_fr2,     /* i  : minimum value for resolution 1/2                               */
+                          const Word16 t0_fr1,     /* i  : minimum value for resolution 1                                 */
+                          const Word16 L_frame,    /* i  : length of the frame                                            */
+                          const Word16 L_subfr,    /* i  : size of subframe                                               */
+                          Word16 Q_new             /* i                                                                   */
 );
+
 void pit_Q_enc_fx(
     BSTR_ENC_HANDLE hBstr,   /* i/o:  encoder bitstream handle */
     const Word16 Opt_AMR_WB, /* i  : flag indicating AMR-WB IO mode          */
@@ -1087,7 +1074,7 @@ Word16 WB_BWE_encoding_fx(                          /* o  : classification of wb
 
 Word16 WB_BWE_encoding_ivas_fx(                       /* o  : classification of wb signal            */
                                 Encoder_State *st_fx, /* i/o: Encoder structure                      */
-                                const Word16 *yos_fx, /* i  : MDCT coefficients of weighted original */
+                                const Word32 *yos_fx, /* i  : MDCT coefficients of weighted original */
                                 Word16 *WB_fenv_fx,   /* i/o: energy of WB envelope                  */
                                 Word16 Q_synth,
                                 Word16 Q_synth_lf );
@@ -1140,7 +1127,7 @@ void RunTransientDetection_ivas_fx(
  * @return average temporal flatness measure with exponent AVG_FLAT_E
  */
 Word16 GetTCXAvgTemporalFlatnessMeasure_fx( struct TransientDetection const *pTransientDetection, Word16 nCurrentSubblocks, Word16 nPrevSubblocks );
-Word16 GetTCXAvgTemporalFlatnessMeasure_ivas_fx( struct TransientDetection const *pTransientDetection, Word16 nCurrentSubblocks, Word16 nPrevSubblocks );
+Word32 GetTCXAvgTemporalFlatnessMeasure_ivas_fx( struct TransientDetection const *pTransientDetection, Word16 nCurrentSubblocks, Word16 nPrevSubblocks );
 
 /** Get the maximum energy change using subblock energies aligned with the TCX.
  * @param pTransientDetection Structure that contains transient detectors to be run.
@@ -1244,9 +1231,11 @@ void AVQ_cod_lpc_fx(
 
 void ProcessIGF_ivas_fx(
     Encoder_State *st,              /* i  : Encoder state                                           */
+    Word16 powerSpec_len,           /* i  : length of pPowerSpectrum buffer */
     Word32 *pMDCTSpectrum,          /* i  : MDCT spectrum                                           */
-    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                   */
     Word16 *q_spectrum,             /* i/o: Q of spectrum */
+    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                   */
+    const Word16 q_ITFMDCTSpectrum, /* i  : Q of MDCT spectrum fir ITF */
     Word32 *pPowerSpectrum,         /* i  : MDCT^2 + MDST^2 spectrum, or estimate                   */
     Word16 *q_powerSpec,            /* i/o: Q of power spectrum */
     const Word16 isTCX20,           /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5   */
@@ -1288,7 +1277,8 @@ void AnalyzePowerSpectrum_ivas_fx(
     Word32 const mdctSpectrum[], /* i  : MDCT spectrum                                 */
     Word16 mdctSpectrum_e,
     Word16 const signal[], /* i  : windowed signal corresponding to mdctSpectrum */
-    Word32 powerSpec[],    /* o  : Power spectrum. Can point to signal          */
+    const Word16 q_signal,
+    Word32 powerSpec[], /* o  : Power spectrum. Can point to signal          */
     Word16 powerSpec_e[] );
 
 void AdaptLowFreqEmph_fx( Word32 x[],
@@ -1504,6 +1494,14 @@ void ComputeSpectrumNoiseMeasure_fx( const Word32 *powerSpec,
                                      Word8 *noiseFlags,
                                      Word16 lowpassLine );
 
+void ComputeSpectrumNoiseMeasure_ivas_fx( Word64 *powerSpec, /* Qx */
+                                          Word16 L_frame,    /* Q0 */
+                                          Word16 startLine,  /* Q0 */
+                                          Word8 resetMemory, /* Q0 */
+                                          Word8 *noiseFlags, /* Q0 */
+                                          Word16 lowpassLine /* Q0 */
+);
+
 void lpc_quantization_fx(
     Encoder_State *st,
     const Word16 lsp[],        /* Q15 */
@@ -1559,6 +1557,8 @@ void Mode2_pit_encode_fx(
     Word16 pit_res_max );
 void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ );
 
+void E_ACELP_4tsearch_ivas_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ );
+
 void E_ACELP_4t_fx(
     Word16 dn[], /* Qdn */
     Word16 cn[] /* Q_xn */,
@@ -1587,7 +1587,7 @@ void E_ACELP_4t_ivas_fx(
     const Word16 last_L_frame,
     const Word32 total_brate,
     const Word16 i_subfr,
-    const int16_t cmpl_flag,
+    const Word16 cmpl_flag,
     Word16 element_mode );
 
 void E_ACELP_innovative_codebook_fx(
@@ -1618,8 +1618,7 @@ void CalculateTnsFilt_fx(
     STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */
     const Word32 pSpectrum[],     /* i  : MDCT spectrum                     Qx*/
     const Word16 pSpectrum_e,
-    STnsData *pTnsData,    /* o  : TNS data struct                   */
-    Word16 *predictionGain /* o  : TNS prediction gain               Q7*/
+    STnsData *pTnsData /* o  : TNS data struct                   */
 );
 
 /** Detect TNS parameters.
@@ -1840,9 +1839,6 @@ void lsf_enc_fx(
     const Word16 Nb_ACELP_frames,
     const Word16 tdm_low_rate_mode, /* i  : secondary channel low rate mode flag */
     const Word16 GSC_IVAS_mode,     /* i  : GSC IVAS mode                        */
-#ifdef LSF_RE_USE_SECONDARY_CHANNEL
-    const float tdm_lsfQ_PCh[M], /* i  : Q LSFs for primary channel          */
-#endif
     const Word16 Q_new );
 
 void lsf_enc_ivas_fx(
@@ -1855,6 +1851,7 @@ void lsf_enc_ivas_fx(
     const Word16 GSC_IVAS_mode,     /* i  : GSC IVAS mode                        */
     const Word16 tdm_lsfQ_PCh[M],   /* i  : Q LSFs for primary channel          */
     const Word16 Q_new );
+
 void Es_pred_enc_fx(
     Word16 *Es_pred,       /* o  : predicited scaled innovation energy			Q8*/
     Word16 *indice,        /* o  : indice of quantization						Q0*/
@@ -2048,7 +2045,7 @@ void encod_unvoiced_ivas_fx(
     const Word16 Es_pred,           /* i  : predicted scaled innov. energy          Q8*/
     const Word16 uc_two_stage_flag, /* i  : flag indicating two-stage UC            Q0*/
     const Word16 *res_fx,           /* i  : residual signal                         Q_new*/
-    Word16 *syn_fx,                 /* o  : core synthesis                          Q_new*/
+    Word16 *syn_fx,                 /* o  : core synthesis                          Q_new - 1*/
     Word16 *tmp_noise_fx,           /* o  : long-term noise energy                  Q0*/
     Word16 *exc_fx,                 /* i/o: current non-enhanced excitation         Q_new*/
     Word16 *pitch_buf_fx,           /* o  : floating pitch values for each subframe Q6*/
@@ -2191,14 +2188,10 @@ void stat_noise_uv_enc_ivas_fx(
     Word16 *Aq,                     /* i  : A(z) quantized for the 4 subframes  Q=12 */
     Word16 *exc2,                   /* i/o: excitation buffer         Q=Q_stat_noise */
     const Word16 uc_two_stage_flag, /* o  : flag undicating two-stage UC	         */
-    Word16 Q_new );
+    Word16 *Q_new );
 
 void analy_sp_fx(
     const Word16 element_mode, /* i  : element mode                                    */
-#ifdef IVAS_CODE_CPE
-    CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure                           */
-#endif
-    const Word32 input_Fs,     /* i  : i   sampling rate                             */
     Word16 *speech,            /* i  : speech buffer                          Q_new - preemph_bits */
     const Word16 Q_new,        /* i  : current scaling exp                    Q0                 */
     Word32 *fr_bands,          /* o  : energy in critical frequency bands     Q_new + QSCALE    */
@@ -2217,29 +2210,29 @@ void analy_sp_fx(
 );
 
 void ivas_analy_sp_fx(
-    const Word16 element_mode, /* i  : element mode                                    */
-    CPE_ENC_HANDLE hCPE,       /* i/o: CPE encoder structure                           */
-    const Word32 input_Fs,     /* i  : input sampling rate                             */
-    Word16 *speech,            /* i  : speech buffer                          Q_new - preemph_bits */
-    const Word16 Q_new,        /* i  : current scaling exp                    Q0                 */
-    Word32 *fr_bands,          /* o  : energy in critical frequency bands     q_fr_bands    */
-    Word16 *q_fr_bands,        /* o  : Q of energy in critical frequency bands     Q0    */
-    Word32 *lf_E,              /* o  : per bin E for first...                 Q0 */
-    Word16 *q_lf_E,            /* o  : Q of per bin E for first...                 q_lf_E */
-    Word16 *Etot,              /* o  : total input energy                     Q8                 */
-    const Word16 min_band,     /* i  : minimum critical band                  Q0                 */
-    const Word16 max_band,     /* i  : maximum critical band                  Q0                 */
-    Word32 *Bin_E,             /* o  : per-bin energy spectrum                  q_Bin_E                */
-    Word16 *q_Bin_E,           /* o  : Q of per-bin energy spectrum                  Q0                */
-    Word32 *Bin_E_old,         /* o  : per-bin energy spectrum of the previous frame      q_Bin_E_old      */
-    Word16 *q_Bin_E_old,       /* o  : Q of per-bin energy spectrum of the previous frame      Q0      */
-    Word32 *PS,                /* o  : per-bin energy spectrum                   q_PS               */
-    Word16 *q_PS,              /* o  : Q of per-bin energy spectrum                   Q0               */
-    Word16 *EspecdB,           /* o  : per-bin log energy spectrum (with f=0) Q7                */
-    Word32 *band_energies,     /* o  : energy in critical frequency bands without minimum noise floor MODE2_E_MIN (q_band_energies)*/
-    Word16 *q_band_energies,   /* o  : Q of energy in critical frequency bands without minimum noise floor MODE2_E_MIN */
-    Word16 *fft_buff,          /* o  : FFT coefficients                                   (q_fft_buff)      */
-    Word16 *q_fft_buff         /* o  : Q of FFT coefficients                                   Q0      */
+    const Word16 element_mode, /* i  : element mode                                    Q0                 */
+    CPE_ENC_HANDLE hCPE,       /* i/o: CPE encoder structure                                              */
+    const Word32 input_Fs,     /* i  : input sampling rate                             Q0                 */
+    Word16 *speech,            /* i  : speech buffer                                   Q_new              */
+    const Word16 Q_new,        /* i  : current scaling exp                             Q0                 */
+    Word32 *fr_bands,          /* o  : energy in critical frequency bands              q_fr_bands         */
+    Word16 *q_fr_bands,        /* o  : energy in critical frequency bands              Q0                 */
+    Word32 *lf_E,              /* o  : per bin E for first...                          q_lf_E             */
+    Word16 *q_lf_E,            /* o  : per bin E for first...                          Q0                 */
+    Word32 *Etot,              /* o  : total input energy                              Q24                 */
+    const Word16 min_band,     /* i  : minimum critical band                           Q0                 */
+    const Word16 max_band,     /* i  : maximum critical band                           Q0                 */
+    Word32 *Bin_E,             /* o  : per-bin energy spectrum                         q_Bin_E            */
+    Word16 *q_Bin_E,           /* o  : per-bin energy spectrum                         Q0                 */
+    Word32 *Bin_E_old,         /* o  : per-bin energy spectrum of the previous frame   q_Bin_E_old        */
+    Word16 *q_Bin_E_old,       /* o  : per-bin energy spectrum of the previous frame   Q0                 */
+    Word32 *PS,                /* o  : per-bin energy spectrum                         q_PS               */
+    Word16 *q_PS,              /* o  : per-bin energy spectrum                         Q0                 */
+    Word16 *EspecdB,           /* o  : per-bin log energy spectrum (with f=0)          Q7                 */
+    Word32 *band_energies,     /* o  : energy in critical frequency bands without minimum noise floor MODE2_E_MIN (q_band_energies) */
+    Word16 *q_band_energies,   /* o  : Q of energy in critical frequency bands without minimum noise floor MODE2_E_MIN              */
+    Word16 *fft_buff,          /* o  : FFT coefficients                                (q_fft_buff)       */
+    Word16 *q_fft_buff         /* o  : Q of FFT coefficients                           Q0                 */
 );
 void find_wsp_fx(
     const Word16 Az[],
@@ -2320,6 +2313,7 @@ void find_targets_fx(
     Word16 *cn,            /* o  : target vector in residual domain                 Q_new*/
     Word16 *h1             /* o  : impulse response of weighted synthesis filter    Q14*/
 );
+
 void find_targets_ivas_fx(
     const Word16 *speech,  /* i  : pointer to the speech frame                      Q_new-1*/
     const Word16 *mem_syn, /* i  : memory of the synthesis filter                   Q_new-1*/
@@ -2332,7 +2326,7 @@ void find_targets_ivas_fx(
     Word16 tilt_fac,       /* i  : tilt factor										Q15*/
     Word16 *xn,            /* o  : Close-loop Pitch search target vector            Q_new-1*/
     Word16 *cn,            /* o  : target vector in residual domain                 Q_new*/
-    Word16 *h1             /* o  : impulse response of weighted synthesis filter    Q14*/
+    Word16 *h1             /* o  : impulse response of weighted synthesis filter    Q(14 - norm_s(h1[0]))*/
 );
 
 void E_ACELP_adaptive_codebook(
@@ -2427,6 +2421,24 @@ void tcx_arith_encode_envelope_fx(
     const Word16 low_complexity /* i: low-complexity flag           Q0 */
 );
 
+void tcx_arith_encode_envelope_ivas_fx(
+    Word32 spectrum[],          /* i/o: MDCT coefficients           Q31-e */
+    Word16 *spectrum_e,         /* i/o: MDCT exponent               Q0 */
+    Word16 signs[],             /* o: signs (spectrum[.]<0)         Q0 */
+    const Word16 L_frame,       /* i: frame or MDCT length          Q0 */
+    const Word16 L_spec,        /* i: frame or MDCT length          Q0 */
+    Encoder_State *st,          /* i/o: coder state                 */
+    const Word16 A_ind[],       /* i: quantised LPC coefficients    Q12 */
+    Word16 target_bits,         /* i: number of available bits      Q0 */
+    Word16 prm[],               /* o: bitstream parameters          Q0 */
+    const Word8 use_hm,         /* i: use HM in current frame?      */
+    Word16 prm_hm[],            /* o: HM parameter area             Q0 */
+    const Word16 tcxltp_pitch,  /* i: TCX LTP pitch in FD, -1 if n/a  Q0*/
+    Word16 *arith_bits,         /* o: bits used for ari. coding     Q0 */
+    Word16 *signaling_bits,     /* o: bits used for signaling       Q0 */
+    const Word16 low_complexity /* i: low-complexity flag           Q0 */
+);
+
 /** Quantize gain.
  * Quantize gain in range [0..127],
  * @param n Length of the spectrum.
@@ -2647,6 +2659,19 @@ Word16 Q_lsf_tcxlpc_fx(
     const Word32 *Bin_Ener,
     const Word16 Q_ener );
 
+Word16 Q_lsf_tcxlpc_ivas_fx(
+    /* const */ Word16 lsf[], /* i  : original lsf      */
+    Word16 lsf_q[],           /* o  : quantized lsf     */
+    Word16 lsp_q_ind[],       /* o  : quantized lsp (w/o MA prediction) */
+    Word16 indices[],         /* o  : VQ indices        */
+    const Word16 lpcorder,    /* i  : LPC order         */
+    const Word16 narrowband,  /* i  : narrowband flag   */
+    const Word16 cdk,         /* i  : codebook selector */
+    const Word16 mem_MA[],    /* i  : MA memory         */
+    const Word16 coder_type,
+    const Word32 *Bin_Ener,
+    const Word16 Q_ener );
+
 Word16 signalling_mode1_tcx20_enc_fx(
     Encoder_State *st, /* i  : encoder state structure                  */
     Word16 push /*Q0*/ );
@@ -3023,6 +3048,13 @@ Word16 IGF_getSFM(                           /**< out: Q15| SFM value
                    const Word16 start,       /**< in:  Q0 | start subband index    */
                    const Word16 stop         /**< in:  Q0 | stop subband index     */
 );
+Word16 IGF_getSFM_ivas_fx(                           /**< out: Q15| SFM value              */
+                           Word16 *SFM_exp,          /**< out:    | exponent of SFM Factor */
+                           const Word32 *energy,     /**< in:  Q31| energies               */
+                           const Word16 *energy_exp, /**< in:     | exponent of energies   */
+                           const Word16 start,       /**< in:  Q0 | start subband index    */
+                           const Word16 stop         /**< in:  Q0 | stop subband index     */
+);
 /* IGFEnc.c */
 void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                /**< out:    | exponent of highPassEner       */
                         const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
@@ -3031,6 +3063,14 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp,                /**< out:    |
                         Word16 pPowerSpectrum_exp,               /**< in:     | exponent of power spectrum     */
                         const Word16 igfGridIdx                  /**< in: Q0  | IGF grid index                 */
 );
+
+void IGF_ErodeSpectrum_ivas_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
+                                Word32 *pSpectrum,                       /**< in/out: | MDCT spectrum                  */
+                                Word32 *pPowerSpectrum,                  /**< in/out: | power spectrum                 */
+                                Word16 pPowerSpectrum_exp,               /**< in:     | exponent of power spectrum     */
+                                const Word16 igfGridIdx,                 /**< in: Q0  | IGF grid index                 */
+                                const Word16 mct_on );
+
 void IGFEncApplyMono_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder                         */
                          const Word16 igfGridIdx,                 /**< in: Q0  | IGF grid index                                         */
                          Encoder_State *st,                       /**< in:     | Encoder state                                          */
@@ -3043,16 +3083,17 @@ void IGFEncApplyMono_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     |
                          Word16 last_core_acelp                   /**< in: Q0  | indictaor if last frame was acelp coded                */
 );
 
-void IGFEncApplyMono_ivas_fx( Encoder_State *st,              /* i  : Encoder state                                          */
-                              const int16_t igfGridIdx,       /* i  : IGF grid index                                         */
-                              Word32 *pMDCTSpectrum_fx,       /* i/o: MDCT spectrum                                          */
-                              Word16 e_mdct,                  /* i : exponent of pMDCTspectrum							   */
-                              Word32 *pPowerSpectrum_fx,      /* i/o: MDCT^2 + MDST^2 spectrum, or estimate                  */
-                              Word16 *e_ps,                   /* i : exponent of pPowerSpectrum							   */
-                              const int16_t isTCX20,          /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5  */
-                              const int8_t isTNSActive,       /* i  : flag indicating if the TNS is active                   */
-                              const int16_t sp_aud_decision0, /* i  : first stage switching decision                         */
-                              const int16_t vad_hover_flag    /* i  : VAD hangover flag                                      */
+void IGFEncApplyMono_ivas_fx( Encoder_State *st,             /* i  : Encoder state                                          */
+                              Word16 powerSpectrum_len,      /* i: length of pPowerSpectrum_fx*/
+                              const Word16 igfGridIdx,       /* i  : IGF grid index                                         */
+                              Word32 *pMDCTSpectrum_fx,      /* i/o: MDCT spectrum                                          */
+                              Word16 e_mdct,                 /* i : exponent of pMDCTspectrum							   */
+                              Word32 *pPowerSpectrum_fx,     /* i/o: MDCT^2 + MDST^2 spectrum, or estimate                  */
+                              Word16 *e_ps,                  /* i : exponent of pPowerSpectrum							   */
+                              const Word16 isTCX20,          /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5  */
+                              const Word8 isTNSActive,       /* i  : flag indicating if the TNS is active                   */
+                              const Word16 sp_aud_decision0, /* i  : first stage switching decision                         */
+                              const Word16 vad_hover_flag    /* i  : VAD hangover flag                                      */
 );
 
 void IGFEncConcatenateBitstream_ivas_fx( const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder                  */
@@ -3380,26 +3421,27 @@ Word16 pit_encode_fx(                                    /* o  : Fractional pitc
                       const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer                */
 );
 
-Word16 pit_encode_ivas_fx(                                    /* o  : Fractional pitch for each subframe         */
-                           BSTR_ENC_HANDLE hBstr,             /* i/o:  encoder bitstream handle */
-                           const Word16 pitch_bits[],         /* i  : pitch bits                                  */
-                           const Word32 core_brate,           /* i  : core bitrate                               */
-                           const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode             */
-                           const Word16 L_frame,              /* i  : length of the frame                        */
-                           const Word16 coder_type,           /* i  : coding type                                */
-                           Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits      */
-                           const Word16 i_subfr,              /* i  : subframe index                             */
-                           Word16 *exc,                       /* i/o: pointer to excitation signal frame         */
-                           const Word16 L_subfr,              /* i  : subframe length                            */
-                           const Word16 *pitch,               /* i  : open loop pitch estimates in current frame */
-                           Word16 *T0_min,                    /* i/o: lower limit for close-loop search          */
-                           Word16 *T0_max,                    /* i/o: higher limit for close-loop search         */
-                           Word16 *T0,                        /* i/o: close loop integer pitch                   */
-                           Word16 *T0_frac,                   /* i/o: close loop fractional part of the pitch    */
-                           const Word16 *h1,                  /* i  : weighted filter input response             */
-                           const Word16 *xn,                  /* i  : target vector                              */
-                           const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag            */
-                           const Word16 tdm_Pri_pitch_buf[]   /* i  : primary channel pitch buffer                */
+Word16 pit_encode_ivas_fx(                                    /* o  : Fractional pitch for each subframe                  */
+                           BSTR_ENC_HANDLE hBstr,             /* i/o:  encoder bitstream handle                           */
+                           const Word16 pitch_bits[],         /* i  : pitch bits                                          */
+                           const Word32 core_brate,           /* i  : core bitrate                                        */
+                           const Word16 Opt_AMR_WB,           /* i  : flag indicating AMR-WB IO mode                      */
+                           const Word16 L_frame,              /* i  : length of the frame                                 */
+                           const Word16 coder_type,           /* i  : coding type                                         */
+                           Word16 *limit_flag,                /* i/o: restrained(0) or extended(1) Q limits               */
+                           const Word16 i_subfr,              /* i  : subframe index                                      */
+                           Word16 *exc,                       /* i/o: pointer to excitation signal frame  Q_new           */
+                           const Word16 L_subfr,              /* i  : subframe length                                     */
+                           const Word16 *pitch,               /* i  : open loop pitch estimates in current frame          */
+                           Word16 *T0_min,                    /* i/o: lower limit for close-loop search                   */
+                           Word16 *T0_max,                    /* i/o: higher limit for close-loop search                  */
+                           Word16 *T0,                        /* i/o: close loop integer pitch                            */
+                           Word16 *T0_frac,                   /* i/o: close loop fractional part of the pitch             */
+                           const Word16 *h1,                  /* i  : weighted filter input response Q(14 - norm_s(h1[0]) */
+                           const Word16 *xn,                  /* i  : target vector                  Q_new                */
+                           const Word16 tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag                    */
+                           const Word16 tdm_Pri_pitch_buf[],  /* i  : primary channel pitch buffer                        */
+                           Word16 Q_new                       /* i                                                        */
 );
 
 Word16 lp_filt_exc_enc_fx(
@@ -3424,7 +3466,7 @@ Word16 lp_filt_exc_enc_ivas_fx(
     const Word16 coder_type, /* i  : coding type                                     Q0 */
     const Word16 i_subfr,    /* i  : subframe index                                  Q0 */
     Word16 *exc,             /* i/o: pointer to excitation signal frame              Q_new */
-    const Word16 *h1,        /* i  : weighted filter i   response                  Q(14+shift) */
+    const Word16 *h1,        /* i  : weighted filter i   response                    Q(15) */
     const Word16 *xn,        /* i  : target vector                                   Q_new-1+shift */
     Word16 *y1,              /* o  : zero-memory filtered adaptive excitation        Q_new-1+shift */
     Word16 *xn2,             /* o  : target vector for innovation search             Q_new-1+shift */
@@ -3777,11 +3819,7 @@ void updt_tar_HR_fx(
     const Word16 L     /* i  : subframe size                     */
 );
 
-#ifdef BASOP_NOGLOB
 Flag conv_fx(
-#else
-void conv_fx(
-#endif
     const Word16 x[], /* i  : i   vector                              Q_new*/
     const Word16 h[], /* i  : impulse response (or second i   vector) Q(15)*/
     Word16 y[],       /* o  : output vetor (result of convolution)      12 bits*/
diff --git a/lib_enc/pvq_core_enc.c b/lib_enc/pvq_core_enc.c
deleted file mode 100644
index ce12347234733459bf08743ee7fa4381e3c076ce..0000000000000000000000000000000000000000
--- a/lib_enc/pvq_core_enc.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "rom_com.h"
-#include "prot.h"
-#include "prot.h"
-#include "stl.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/pvq_core_enc_fx.c b/lib_enc/pvq_core_enc_fx.c
index 3b20e82c3aad5b0c7abcdae17e93d3a7bc53cf73..e2d5fb264df53fc69c0fed15ffac3d9a28f98984 100644
--- a/lib_enc/pvq_core_enc_fx.c
+++ b/lib_enc/pvq_core_enc_fx.c
@@ -5,9 +5,8 @@
 #include <stdint.h>
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"
-#include "rom_com_fx.h" /* Static table prototypes                */
-#include "rom_com.h"    /* Static table prototypes                */
-//#include "prot_fx.h"        /* Function prototypes                    */
+#include "rom_com_fx.h"  /* Static table prototypes                */
+#include "rom_com.h"     /* Static table prototypes                */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "ivas_prot_fx.h"
@@ -202,12 +201,15 @@ static void pvq_encode_band_fx(
         move16();
     }
 
-    pool_tot = 0;  /* Word16 */
+    pool_tot = 0; /* Word16 */
+    move16();
     pool_part = 0; /* Word16 */
+    move16();
 
     FOR( j = 0; j < Np; j++ )
     {
         g_part[j] = negate( g_part_neg[j] );
+        move16();
     }
     srt_vec_ind16_fx( g_part, sg_part, idx_sort, Np );
     FOR( j = 0; j < Np; j++ )
@@ -215,6 +217,7 @@ static void pvq_encode_band_fx(
         js = idx_sort[Np - 1 - j];
         pool_part = shrtCDivSignedApprox( pool_tot, sub( Np, j ) );
         bits_part[js] = s_max( 0, s_min( add( bits_part[js], pool_part ), 256 ) );
+        move16();
 
         conservativeL1Norm_fx( dim_part[js], bits_part[js], strict_bits, *bits_left, pool_tot, *npulses, /* inputs */
                                &K_val, bits_left, &pool_tot, npulses );                                  /* outputs */
@@ -266,7 +269,7 @@ void pvq_encode_frame_ivas_fx(
     PVQ_ENC_HANDLE hPVQ = &pvq_enc;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
+    move16();
 #endif
 
     rc_enc_init_fx( hPVQ, pvq_bits );
@@ -310,8 +313,8 @@ void pvq_encode_frame_ivas_fx(
         move16();
         IF( R[is] > 0 )
         {
-            bandBitsAdjustment_fx( hPVQ->rc_num_bits, hPVQ->rc_range, bits, bands_to_code, bands_to_code - coded_bands, sfmsize[is], R[is], bit_pool, /* inputs  */
-                                   &band_bits, &bits_left, &bit_pool );                                                                               /* outputs */
+            bandBitsAdjustment_fx( hPVQ->rc_num_bits, hPVQ->rc_range, bits, bands_to_code, sub( bands_to_code, coded_bands ), sfmsize[is], R[is], bit_pool, /* inputs  */
+                                   &band_bits, &bits_left, &bit_pool );                                                                                     /* outputs */
             pvq_encode_band_ivas_fx( hBstr, hPVQ, &coefs_norm[sfm_start[is]], Q_coefs, &pulse_vector[sfm_start[is]],
                                      &npulses[is], &coefs_quant[sfm_start[is]], sfmsize[is], band_bits,
                                      &bits_left, strict_bits );
@@ -328,12 +331,8 @@ void pvq_encode_frame_ivas_fx(
             }
 
             tmp = ratio( xy_corr, yy_corr, &exp );
-#ifdef BASOP_NOGLOB
             gopt[is] = shl_o( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ), &Overflow );
             move16();
-#else /* BASOP_NOGLOB */
-            gopt[is] = shl( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ) );
-#endif
 
             if ( gopt[is] == 0 )
             {
@@ -382,6 +381,7 @@ void pvq_encode_frame_fx(
     Word16 band_bits, bits_left;
 
     Word16 bit_pool = 0;
+    move16();
     Word16 coded_bands, bands_to_code;
     Word16 bits;
     Word16 R_sort[NB_SFM];
@@ -393,6 +393,7 @@ void pvq_encode_frame_fx(
     PVQ_ENC_HANDLE hPVQ = &pvq_enc;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     rc_enc_init_fx( hPVQ, pvq_bits );
@@ -436,15 +437,15 @@ void pvq_encode_frame_fx(
         move16();
         IF( R[is] > 0 )
         {
-            bandBitsAdjustment_fx( hPVQ->rc_num_bits, hPVQ->rc_range, bits, bands_to_code, bands_to_code - coded_bands, sfmsize[is], R[is], bit_pool, /* inputs  */
-                                   &band_bits, &bits_left, &bit_pool );                                                                               /* outputs */
+            bandBitsAdjustment_fx( hPVQ->rc_num_bits, hPVQ->rc_range, bits, bands_to_code, sub( bands_to_code, coded_bands ), sfmsize[is], R[is], bit_pool, /* inputs  */
+                                   &band_bits, &bits_left, &bit_pool );                                                                                     /* outputs */
             pvq_encode_band_fx( hBstr, hPVQ, &coefs_norm[sfm_start[is]], Q_coefs, &pulse_vector[sfm_start[is]],
                                 &npulses[is], &coefs_quant[sfm_start[is]], sfmsize[is], band_bits,
                                 &bits_left, strict_bits );
 
             xy_corr = L_deposit_l( 0 );
             yy_corr = L_deposit_l( 1 );
-            shift = band_len_ener_shift[band_len_idx[shr( sfmsize[is], 3 )]];
+            shift = band_len_ener_shift[band_len_idx[sfmsize[is] >> 3]];
             move16();
             FOR( j = 0; j < sfmsize[i]; j++ )
             {
@@ -454,12 +455,8 @@ void pvq_encode_frame_fx(
             }
 
             tmp = ratio( xy_corr, yy_corr, &exp );
-#ifdef BASOP_NOGLOB
             gopt[is] = shl_o( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ), &Overflow );
-#else /* BASOP_NOGLOB */
-            gopt[is] = shl( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ) );
-#endif
-
+            move16();
             if ( gopt[is] == 0 )
             {
                 gopt[is] = 1;
@@ -556,10 +553,10 @@ Word16 pvq_core_enc_ivas_fx(
     ivas_fine_gain_pred_fx( sfm_start, sfm_end, sfmsize, ord, npulses, maxpulse, R, nb_sfm,
                             coefs_quant, pulse_vector, fg_pred, core );
 
-    fine_gain_quant_ivas_fx( hBstr, ord, nb_sfm, gain_bits_array, fg_pred, gopt );
+    fine_gain_quant_fx( hBstr, ord, nb_sfm, gain_bits_array, fg_pred, gopt );
 
     apply_gain_fx( ord, sfm_start, sfm_end, nb_sfm, fg_pred, coefs_quant );
-    *Q_coefs = 11;
+    *Q_coefs = 12;
     move16();
     return add( pvq_bits, gain_bits_tot );
 }
@@ -664,6 +661,7 @@ static void encode_energies_fx(
     Word16 density;
     Word16 phi;
     Word16 index_phi = -1;
+    move16();
     Word16 oppRQ3, qzero;
     Word16 angle;
     Word32 sqrt_r_enr, sqrt_l_enr;
@@ -739,11 +737,13 @@ static void encode_energies_fx(
     FOR( i = 0; i < l_Np; i++ )
     {
         g_part[i] = mult_r( l_gain, g_part[i] );
+        move16();
     }
 
     FOR( i = l_Np; i < Np; i++ )
     {
         g_part[i] = mult_r( r_gain, g_part[i] );
+        move16();
     }
 
     NearOppSplitAdjustment_fx( qband, qzero, hPVQ->rc_num_bits, hPVQ->rc_range, *bits_left,
@@ -933,7 +933,7 @@ static void densityIndexSymbolEncode_ivas_fx(
     UWord16 lsb;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
+    move16();
 #endif
 
     sym_freq = L_deposit_l( 1 );
@@ -941,11 +941,7 @@ static void densityIndexSymbolEncode_ivas_fx(
     IF( s_and( (Word16) 0xFFFE, density ) != 0 ) /* even */
     {
         angle = atan2_fx( SQRT_DIM_fx[r_dim], SQRT_DIM_fx[l_dim] );
-#ifdef BASOP_NOGLOB
         angle = shl_o( angle, 1, &Overflow );
-#else
-        angle = shl( angle, 1 );
-#endif
         angle = mult_r( angle, 20861 );
         c = mult_r( density, angle );
 
@@ -1014,6 +1010,7 @@ static void densityIndexSymbolEncode_fx(
     UWord16 lsb;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     sym_freq = L_deposit_l( 1 );
@@ -1021,11 +1018,7 @@ static void densityIndexSymbolEncode_fx(
     IF( s_and( (Word16) 0xFFFE, density ) != 0 ) /* even */
     {
         angle = atan2_fx( SQRT_DIM_fx[r_dim], SQRT_DIM_fx[l_dim] );
-#ifdef BASOP_NOGLOB
         angle = shl_o( angle, 1, &Overflow );
-#else
-        angle = shl( angle, 1 );
-#endif
         angle = mult_r( angle, 20861 );
         c = mult_r( density, angle );
 
@@ -1247,6 +1240,7 @@ static Word16 calc_pvq_splits_fx(                         /* o  : Number of segm
                 acc = L_shr( acc, qPoint );
 
                 E[i] = sub( 30, norm_l( L_max( 1L, acc ) ) ); /* L_max needed to handle low subvector levels */
+                move16();
                 eTotal = add( eTotal, E[i] );
             }
 
diff --git a/lib_enc/pvq_encode.c b/lib_enc/pvq_encode.c
deleted file mode 100644
index 23468cbe8bbfdcb2b56d900848a3cac1fc090edf..0000000000000000000000000000000000000000
--- a/lib_enc/pvq_encode.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/pvq_encode_fx.c b/lib_enc/pvq_encode_fx.c
index b09d77802a6d84480e095e00b09d156204420887..749a39ed91243268b64f71275ce5106e00cf9749 100644
--- a/lib_enc/pvq_encode_fx.c
+++ b/lib_enc/pvq_encode_fx.c
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include "options.h" /* Compilation switches                   */
 #include "cnst.h"
-//#include "prot_fx.h"
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "rom_com_fx.h"
@@ -63,6 +62,7 @@ static Word16 one_pulse_search(
     UWord16 u_sgn;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     en_tmp = en_dn_shift; /* dummy assignment to avoid compiler warning for unused parameter  */
@@ -77,21 +77,17 @@ static Word16 one_pulse_search(
 
     IF( high_prec_active == 0 )
     {
-        en_max_den = 0;                                                  /*move16()*/
+        en_max_den = 0; /*move16()*/
+        move16();
         ; /* OPT: move saved by  using high_prec_active as en_max_den */ /*      1 op   */
         cmax_num = -1;
         move16(); /* req. to force a 1st update for n==0   */ /*      1 op   */
 
         FOR( i = 0; i < dim; i++ ) /* FOR 3 ops  */
         {
-#ifdef BASOP_NOGLOB
             L_tmp_corr = L_shl_o( L_mac_o( *L_xy_ptr, 1, x_abs[i], &Overflow ), corr_up_shift, &Overflow ); /*  actual in-loop target    value, 2 ops  */
             corr_tmp = round_fx_o( L_tmp_corr, &Overflow );                                                 /*     1 op   */
-#else
-            L_tmp_corr = L_shl( L_mac( *L_xy_ptr, 1, x_abs[i] ), corr_up_shift ); /*  actual in-loop target    value, 2 ops  */
-            corr_tmp = round_fx( L_tmp_corr );                                    /*     1 op   */
-#endif
-            corr_sq_tmp = mult( corr_tmp, corr_tmp ); /* CorrSq, is a 16bit for low compelxity cross multiplication    1 op   */
+            corr_sq_tmp = mult( corr_tmp, corr_tmp );                                                       /* CorrSq, is a 16bit for low compelxity cross multiplication    1 op   */
 
             L_tmp_en_lc = L_mac( *L_yy_ptr, 1, y[i] ); /*Q1 result ,  energy may span up to ~14+1(Q1)+1(sign)=16 bits,  1 op */
             /* extract_l without shift can always be used for this section as energy is guaranteed to stay in the lower word, 1 op */
@@ -167,6 +163,7 @@ static Word16 one_pulse_search(
     y[imax] = add( y[imax], 1 );
     move16();                                          /* Q0 added pulse              */
     ( *pulse_tot_ptr ) = add( ( *pulse_tot_ptr ), 1 ); /* increment total pulse sum   */
+    move16();
 
     return imax;
 }
@@ -207,7 +204,7 @@ void pvq_encode_ivas_fx(
     PvqEntry entry;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
+    move16();
 #endif
 
     L_proj_fac = 4096;
@@ -262,11 +259,7 @@ void pvq_encode_ivas_fx(
             proj_fac = div_l( L_num, den );    /* L_num always has to be less than den<<16 */
 
             shift_delta = sub( shift_num, shift_den );
-#ifdef BASOP_NOGLOB
             L_proj_fac = L_shl_sat( L_deposit_l( proj_fac ), sub( 9, shift_delta ) ); /* bring  to a fixed  Q12     */
-#else
-            L_proj_fac = L_shl( L_deposit_l( proj_fac ), sub( 9, shift_delta ) ); /* bring  to a fixed  Q12     */
-#endif
         }
 
         pulse_tot = 0;
@@ -366,14 +359,9 @@ void pvq_encode_ivas_fx(
         }
         Mpy_32_16_ss( L_isqrt, tmp, &L_tmp, &u16_tmp );         /* Q31*Q(0+x)  +1         */
         Mpy_32_16_ss( L_tmp, neg_gain_norm, &L_tmp, &u16_tmp ); /* Q31*Q(0+x) *Q15 +1     */
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shr_o( L_tmp, shift_tot, &Overflow ); /* Q31+x                  */
-        xq[i] = round_fx_o( L_tmp, &Overflow );         /* Q15, array move        */
+        L_tmp = L_shr_o( L_tmp, shift_tot, &Overflow );         /* Q31+x                  */
+        xq[i] = round_fx_o( L_tmp, &Overflow );                 /* Q15, array move        */
         move16();
-#else
-        L_tmp = L_shr( L_tmp, shift_tot );                                        /* Q31+x                  */
-        xq[i] = round_fx( L_tmp );                                                /* Q15, array move        */
-#endif
         L_xq[i] = L_tmp; /* Q31 currently  unused  */
         move32();
     }
@@ -424,9 +412,11 @@ void pvq_encode_fx(
     PvqEntry entry;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     L_proj_fac = 4096;
+    move32();
     L_xsum = L_deposit_h( 0 );
     max_xabs = -1;
     move16();
@@ -477,11 +467,7 @@ void pvq_encode_fx(
             proj_fac = div_l( L_num, den );    /* L_num always has to be less than den<<16 */
 
             shift_delta = sub( shift_num, shift_den );
-#ifdef BASOP_NOGLOB
             L_proj_fac = L_shl_sat( L_deposit_l( proj_fac ), sub( 9, shift_delta ) ); /* bring  to a fixed  Q12     */
-#else
-            L_proj_fac = L_shl( L_deposit_l( proj_fac ), sub( 9, shift_delta ) ); /* bring  to a fixed  Q12     */
-#endif
         }
 
         pulse_tot = 0;
@@ -581,14 +567,11 @@ void pvq_encode_fx(
         }
         Mpy_32_16_ss( L_isqrt, tmp, &L_tmp, &u16_tmp );         /* Q31*Q(0+x)  +1         */
         Mpy_32_16_ss( L_tmp, neg_gain_norm, &L_tmp, &u16_tmp ); /* Q31*Q(0+x) *Q15 +1     */
-#ifdef BASOP_NOGLOB
-        L_tmp = L_shr_o( L_tmp, shift_tot, &Overflow ); /* Q31+x                  */
-        xq[i] = round_fx_o( L_tmp, &Overflow );         /* Q15, array move        */
-#else
-        L_tmp = L_shr( L_tmp, shift_tot );                                        /* Q31+x                  */
-        xq[i] = round_fx( L_tmp );                                                /* Q15, array move        */
-#endif
+        L_tmp = L_shr_o( L_tmp, shift_tot, &Overflow );         /* Q31+x                  */
+        xq[i] = round_fx_o( L_tmp, &Overflow );                 /* Q15, array move        */
+        move16();
         L_xq[i] = L_tmp; /* Q31 currently  unused  */
+        move32();
     }
 
     /* index the found PVQ vector into short codewords */
diff --git a/lib_enc/q_gain2p.c b/lib_enc/q_gain2p.c
deleted file mode 100644
index bcdeaa0415b3291cebf3e4463a6e123980ab180f..0000000000000000000000000000000000000000
--- a/lib_enc/q_gain2p.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/q_gain2p_fx.c b/lib_enc/q_gain2p_fx.c
index 14d6d59073c50a91706cdc99b96a4763f66ba5ff..4618483d26b649a5e066f1dc307655f4bec5c505 100644
--- a/lib_enc/q_gain2p_fx.c
+++ b/lib_enc/q_gain2p_fx.c
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include "options.h"
 #include "cnst.h" /* Common constants                     */
-//#include "prot_fx.h"
 #include "basop_util.h"
 #include "rom_com_fx.h"
 #include "rom_com.h"     /* Common constants                       */
@@ -57,6 +56,8 @@ void encode_acelp_gains_fx(
 )
 {
     Word16 index = 0, func_type = 0;
+    move16();
+    move16();
 
     BASOP_SATURATE_ERROR_ON_EVS;
 
@@ -146,6 +147,7 @@ static Word16 gain_enc(                     /* o   : quantization pitch index
     Word32 L_tmp, dist_min, L_tmp1;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
 
@@ -163,11 +165,8 @@ static Word16 gain_enc(                     /* o   : quantization pitch index
     /* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
     L_tmp = calc_gain_inov( code, lcode, &L_tmp1, &exp_L_tmp1 );
     move16();
-#ifdef BASOP_NOGLOB
     *gain_inov = round_fx_o( L_shl_o( L_tmp, 15 - 3, &Overflow ), &Overflow ); /* gain_inov in Q12 */
-#else
-    *gain_inov = round_fx( L_shl( L_tmp, 15 - 3 ) ); /* gain_inov in Q12 */
-#endif
+    move16();
     /*----------------------------------------------------------------*
      * calculate the predicted gain code
      *----------------------------------------------------------------*/
@@ -325,6 +324,8 @@ static Word16 gain_enc(                     /* o   : quantization pitch index
             size_clip = 21;
             size = NB_QUA_GAIN7B;
         }
+        move16();
+        move16();
 
         if ( EQ_16( clip_gain, 1 ) )
         {
@@ -333,7 +334,6 @@ static Word16 gain_enc(                     /* o   : quantization pitch index
         gcode0_gi = gcode0;
         move16();
     }
-    move16();
     p = t_qua_gain;
 
     index = 0;
@@ -377,11 +377,7 @@ static Word16 gain_enc(                     /* o   : quantization pitch index
         /* Here, we use L_mult0 to compensate the factor 0.5 applied to coeff[1..4] before */
         L_tmp = L_add( L_tmp, L_shr( L_mult0( p[2 * i + 0], p[2 * i + 0] ), shr_coeff0 ) );
         L_tmp = L_sub( L_tmp, L_shr( L_mult( p[2 * i + 0], coeff1 ), shr_coeff1 ) );
-#ifdef BASOP_NOGLOB
         L_tmp1 = L_sub_o( L_tmp, dist_min, &Overflow );
-#else /* BASOP_NOGLOB */
-        L_tmp1 = L_sub( L_tmp, dist_min );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS
         if ( L_tmp1 < 0 )
         {
@@ -401,21 +397,14 @@ static Word16 gain_enc(                     /* o   : quantization pitch index
 
     L_tmp = L_mult( g_code, gcode0 ); /* Q11*Q15 -> Q27 */
     exp_gcode0 = add( exp_gcode0, -11 );
-#ifdef BASOP_NOGLOB
     L_tmp = L_shl_o( L_tmp, exp_gcode0, &Overflow ); /*   Q27 -> Q16 */
-#else
-    L_tmp = L_shl( L_tmp, exp_gcode0 ); /*   Q27 -> Q16 */
-#endif
 
     *gain_code = L_tmp;
     move32();
     /* Q16/Q12 => Q5 */
     L_tmp = L_deposit_h( BASOP_Util_Divide3216_Scale( L_tmp, *gain_inov, &i ) );
-#ifdef BASOP_NOGLOB
     *past_gcode = L_shl_o( L_tmp, sub( i, 15 - 12 ), &Overflow );
-#else
-    *past_gcode = L_shl( L_tmp, sub( i, 15 - 12 ) );
-#endif
+    move16();
 
     return index;
 }
@@ -446,12 +435,17 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
     Word16 s, tmp1, s1;
     Word16 index2;
     const Word16 log2_scale = 16;
+    move16();
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     pred_nrg_frame = 0; /* to suppress compilation warnings */
     g_code2 = 0;        /* to suppress compilation warnings */
     exp_gcode2 = 0;     /* to suppress compilation warnings */
+    move32();
+    move16();
+    move16();
 
 
     assert( ( func_type != FUNC_GAIN_ENC_MLESS ) );
@@ -476,6 +470,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
     /* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
     L_tmp = calc_gain_inov( code, lcode, NULL, NULL );
     *gain_inov = round_fx( L_shl( L_tmp, 15 - 3 ) ); /* gain_inov in Q12 */
+    move16();
 
     /*----------------------------------------------------------------*
      * calculate the predicted gain code
@@ -489,7 +484,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
         /* gcode = pred_nrg_frame * (*gain_inov); */
         L_tmp = Mpy_32_16_1( pred_nrg_frame, *gain_inov ); /* 18Q13 */
         i = norm_l( L_tmp );
-        g_code = round_fx( L_shl( L_tmp, i ) );
+        g_code = round_fx_sat( L_shl( L_tmp, i ) );
         exp_gcode = sub( 18, i );
 
         /* norm_code2 = 1.0f / sqrt((dot_product(code2, code2, lcode) + 0.01f) / lcode); */
@@ -499,11 +494,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
         /* g_code2 = pred_nrg_frame * norm_code2; */
         L_tmp = Mpy_32_16_1( pred_nrg_frame, norm_code2 ); /* 18Q13 */
         i = norm_l( L_tmp );
-#ifdef BASOP_NOGLOB
         g_code2 = round_fx_sat( L_shl_sat( L_tmp, i ) );
-#else
-        g_code2 = round_fx( L_shl( L_tmp, i ) );
-#endif
         exp_gcode2 = sub( 18, i );
     }
     ELSE
@@ -563,7 +554,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
     L_tmp = L_and( 0x7FFFFFFF, L_tmp );
 
     L_tmp = Pow2( 30, round_fx( L_tmp ) );
-    L_tmp = L_shl( L_tmp, i - ( 31 - 16 ) ); /* Q16 */
+    L_tmp = L_shl( L_tmp, sub( i, ( 31 - 16 ) ) ); /* Q16 */
 
     IF( gacelp_uv != 0 )
     {
@@ -586,11 +577,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
     }
 
 
-#ifdef BASOP_NOGLOB
     *gain_code = L_shl_sat( Mpy_32_16_1( *past_gcode, *gain_inov ), 3 );
-#else
-    *gain_code = L_shl( Mpy_32_16_1( *past_gcode, *gain_inov ), 3 );
-#endif
     move32();
 
     *gain_pit = 0;
@@ -608,11 +595,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
         }
 
         s1 = norm_l( *gain_code );
-#ifdef BASOP_NOGLOB
         tmp1 = round_fx_o( L_shl_o( *gain_code, s1, &Overflow ), &Overflow );
-#else
-        tmp1 = round_fx( L_shl( *gain_code, s1 ) );
-#endif
         s1 = sub( 15, s1 );
         tmp1 = mult_r( mult_r( tmp1, tmp1 ), g_coeff->y2y2 );
 
@@ -625,11 +608,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
         L_tmp1 = L_add( L_tmp, 0 );
 
         s1 = norm_l( *gain_code );
-#ifdef BASOP_NOGLOB
         tmp1 = round_fx_o( L_shl_o( *gain_code, s1, &Overflow ), &Overflow );
-#else
-        tmp1 = round_fx( L_shl( *gain_code, s1 ) );
-#endif
         s1 = sub( 15, s1 );
 
         c_index2 = 0x7FFF;
@@ -640,11 +619,7 @@ Word16 gain_enc_uv_fx(                           /* o   : quantization pitch ind
         {
             /* c = c_first - L_tmp1 * (L_tmp1 * g_coeff->y1y1 + 2 * (*gain_code) * g_coeff->y1y2); */
             s = norm_l( L_tmp1 );
-#ifdef BASOP_NOGLOB
             tmp = round_fx_sat( L_shl_sat( L_tmp1, s ) );
-#else
-            tmp = round_fx( L_shl( L_tmp1, s ) );
-#endif
             s = sub( 15, s );
 
             c_e = BASOP_Util_Add_MantExp( mult_r( tmp, g_coeff->y1y1 ), add( s, g_coeff->y1y1_e ),
diff --git a/lib_enc/qlpc_avq.c b/lib_enc/qlpc_avq.c
deleted file mode 100644
index 24f06eafe31fb859892ef40e5947576a60ab5108..0000000000000000000000000000000000000000
--- a/lib_enc/qlpc_avq.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/qlpc_avq_fx.c b/lib_enc/qlpc_avq_fx.c
index 13e0a3cf7e196cb86b31882c04a719a52bd8d1f0..288612e43c16582526989a2cc89db455fa19aed6 100644
--- a/lib_enc/qlpc_avq_fx.c
+++ b/lib_enc/qlpc_avq_fx.c
@@ -143,12 +143,12 @@ static Word16 unary_code(
 
     FOR( ; ind > 0; ind-- )
     {
-        push_next_indice_fx( hBstr, 1, 1 );
+        push_next_indice( hBstr, 1, 1 );
         nb_bits = add( nb_bits, 1 ); // Q0
     }
 
     /* Stop bit */
-    push_next_indice_fx( hBstr, 0, 1 );
+    push_next_indice( hBstr, 0, 1 );
 
     return ( nb_bits );
 }
@@ -195,7 +195,7 @@ static Word16 unpack4bits(
 
     IF( nbits == 0 )
     {
-        push_next_indice_fx( hBstr, 0, 0 );
+        push_next_indice( hBstr, 0, 0 );
         i = 1;
         move16();
     }
@@ -206,10 +206,10 @@ static Word16 unpack4bits(
 
         FOR( ; nbits > 4; nbits -= 4 )
         {
-            push_next_indice_fx( hBstr, prm[i], 4 );
+            push_next_indice( hBstr, prm[i], 4 );
             i = add( i, 1 );
         }
-        push_next_indice_fx( hBstr, prm[i], nbits );
+        push_next_indice( hBstr, prm[i], nbits );
         i = add( i, 1 );
     }
 
@@ -330,7 +330,7 @@ Word16 encode_lpc_avq_fx(
             {
                 nb = 1;
                 move16();
-                push_next_indice_fx( hBstr, q_type, nb );
+                push_next_indice( hBstr, q_type, nb );
             }
             nb_bits = add( nb_bits, nb ); // Q0
 
@@ -342,7 +342,7 @@ Word16 encode_lpc_avq_fx(
             IF( ( ( q_type == 0 ) && NE_16( element_mode, IVAS_CPE_MDCT ) ) || ( ( q_type == 0 ) && ( GE_16( st1, 0 ) ) && EQ_16( element_mode, IVAS_CPE_MDCT ) ) )
             {
                 /* Absolute quantizer with 1st stage stochastic codebook */
-                push_next_indice_fx( hBstr, st1, bits_for_abs_quant );
+                push_next_indice( hBstr, st1, bits_for_abs_quant );
                 nb_bits = add( nb_bits, bits_for_abs_quant ); // Q0
             }
 
@@ -350,7 +350,7 @@ Word16 encode_lpc_avq_fx(
             test();
             IF( EQ_16( element_mode, IVAS_CPE_MDCT ) && EQ_16( stereo_mode, 3 ) && st1 < 0 )
             {
-                push_next_indice_fx( hBstr, add( st1, 2 ), 1 );
+                push_next_indice( hBstr, add( st1, 2 ), 1 );
                 nb_bits = add( nb_bits, 1 ); // Q0
             }
 
@@ -368,7 +368,7 @@ Word16 encode_lpc_avq_fx(
                     move16();
                     i = 3;
                 }
-                push_next_indice_fx( hBstr, i, 2 );
+                push_next_indice( hBstr, i, 2 );
 
                 i = sub( qn2, 2 );
 
@@ -377,7 +377,7 @@ Word16 encode_lpc_avq_fx(
                     move16();
                     i = 3;
                 }
-                push_next_indice_fx( hBstr, i, 2 );
+                push_next_indice( hBstr, i, 2 );
 
                 /* Unary code for abs and rel LPC0/LPC2 */
                 /* Q5 = 0, Q6=10, Q0=110, Q7=1110, ... */
diff --git a/lib_enc/qlpc_stoch_fx.c b/lib_enc/qlpc_stoch_fx.c
index 5a98fb328b8735f6f86be5ebb7e1bfa888f874c9..d6f0b504f8f2c5ebc0aea689ff87b5eaac0a7ad0 100644
--- a/lib_enc/qlpc_stoch_fx.c
+++ b/lib_enc/qlpc_stoch_fx.c
@@ -441,11 +441,7 @@ void Unified_weighting_fx(
         L_tmp = L_deposit_l( 0 );
         FOR( i = 95; i < 127; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_o( L_tmp, Bin_Ener_160_fx[i], &Overflow ); /* Q_ener */
-#else
-            L_tmp = L_add( L_tmp, Bin_Ener_160_fx[i] );
-#endif
         }
 
         L_tmp = L_shr( L_tmp, 5 );
@@ -526,11 +522,7 @@ void Unified_weighting_fx(
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_shl_o( L_deposit_l( sub_o( w_fft_fx[i], min_fx, &Overflow ) ), 13, &Overflow ); /* Q21 */
-#else
-            L_tmp = L_shl( L_deposit_l( sub( w_fft_fx[i], min_fx ) ), 13 ); /* Q21 */
-#endif
             exp = norm_l( L_tmp );
             frac = round_fx( L_shl( L_tmp, exp ) );
             exp = sub( add( exp, 21 ), 30 );
diff --git a/lib_enc/range_enc_fx.c b/lib_enc/range_enc_fx.c
index 05916e8013e76d05abec274e198c039c9e23c48e..767b2ecb5a98bc692e6a0bbcecf7e9ba3213e7b9 100644
--- a/lib_enc/range_enc_fx.c
+++ b/lib_enc/range_enc_fx.c
@@ -10,7 +10,6 @@
 #include "rom_com.h"    /* Static table prototypes                */
 //#include "prot_fx.h"       /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 
@@ -424,14 +423,14 @@ void rc_enc_bits_fx(
 
         IF( GT_16( bits, 16 ) )
         {
-            push_indice_fx( hBstr, sub( IND_RC_END, hPVQ->rc_offset ), u_extract_l( UL_lshr( value, 16 ) ), sub( bits, 16 ) );
+            push_indice( hBstr, sub( IND_RC_END, hPVQ->rc_offset ), u_extract_l( UL_lshr( value, 16 ) ), sub( bits, 16 ) );
             hPVQ->rc_offset = add( hPVQ->rc_offset, 1 ); // Q0
-            push_indice_fx( hBstr, sub( IND_RC_END, hPVQ->rc_offset ), u_extract_l( UL_and( value, 0x0000ffff ) ), 16 );
+            push_indice( hBstr, sub( IND_RC_END, hPVQ->rc_offset ), u_extract_l( UL_and( value, 0x0000ffff ) ), 16 );
             hPVQ->rc_offset = add( hPVQ->rc_offset, 1 ); // Q0
         }
         ELSE
         {
-            push_indice_fx( hBstr, sub( IND_RC_END, hPVQ->rc_offset ), u_extract_l( value ), bits );
+            push_indice( hBstr, sub( IND_RC_END, hPVQ->rc_offset ), u_extract_l( value ), bits );
             hPVQ->rc_offset = add( hPVQ->rc_offset, 1 ); // Q0
         }
     }
@@ -517,7 +516,7 @@ static void rc_enc_write_fx(
     Word16 bits            /* i  : Number of bits					Q0*/
 )
 {
-    push_indice_fx( hBstr, IND_RC_START, byte, bits );
+    push_indice( hBstr, IND_RC_START, byte, bits );
 
     return;
 }
diff --git a/lib_enc/rom_enc.c b/lib_enc/rom_enc.c
index e1f2442bc515d332408866e04caec69df6653d19..abdb1249d12cdc3c9eb1ddb4e4640998de8fa641 100644
--- a/lib_enc/rom_enc.c
+++ b/lib_enc/rom_enc.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_enc/rom_enc.h b/lib_enc/rom_enc.h
index bad6e9f8644c7ac770aae1b9ff4ea3c1c63d66b5..7da1da92a8b6ee4f7c4de48692af7927ec4ce9ca 100644
--- a/lib_enc/rom_enc.h
+++ b/lib_enc/rom_enc.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -52,7 +52,6 @@ extern const Word16 W_HIST_S_FX[DTX_HIST_SIZE]; /* CNG & DTX - table for calcula
 
 extern const Word16 bwd_start_bin[];          // Q0
 extern const Word16 bwd_end_bin[];            // Q0
-extern const float h_fir[];                   /* 2nd order fir filter for wsp, decimation by 2 */
 extern const Word16 h_fir_fx[];               /* 2nd order fir filter for wsp, decimation by 2	Q15*/
 extern const Word16 preemphCompensation_fx[]; // Q11
 
diff --git a/lib_enc/scale_enc_fx.c b/lib_enc/scale_enc_fx.c
index a7119b41f797ca4c9e5b386ba407610c1eed41d7..76eae22b7b1f21cc40f7593b1cf4e5fcff81da16 100644
--- a/lib_enc/scale_enc_fx.c
+++ b/lib_enc/scale_enc_fx.c
@@ -97,12 +97,8 @@ void Preemph_scaled(
      *---------------------------------------------------------------*/
 
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     Overflow = 0;
     QVal = shl_o( 1, sub( 15, bits ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    QVal = shl( 1, sub( 15, bits ) );
-#endif /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
     mu = shr( Preemph_factor, bits ); /* Q15 --> Q(15-bits) */
 
@@ -111,11 +107,7 @@ void Preemph_scaled(
         /* get max of new preemphased samples (L_FRAME+L_FILT) */
 
         L_tmp = L_mult( new_speech[0], QVal );
-#ifdef BASOP_NOGLOB
         L_tmp = L_msu_sat( L_tmp, *mem_preemph, mu );
-#else
-        L_tmp = L_msu( L_tmp, *mem_preemph, mu );
-#endif
         L_maxloc = L_abs( L_tmp );
 
         FOR( i = 1; i < Lframe; i++ )
@@ -123,11 +115,7 @@ void Preemph_scaled(
             /* Equivalent to tmp = max((abs(x[i] - mu*x[i-1]),tmp)
              * finds the max of preemphasized signal */
             L_tmp = L_mult( new_speech[i], QVal );
-#ifdef BASOP_NOGLOB
             L_tmp = L_msu_o( L_tmp, new_speech[i - 1], mu, &Overflow );
-#else  /* BASOP_NOGLOB */
-            L_tmp = L_msu( L_tmp, new_speech[i - 1], mu );
-#endif /* BASOP_NOGLOB */
             L_tmp = L_abs( L_tmp );
             L_maxloc = L_max( L_tmp, L_maxloc );
         }
@@ -177,29 +165,15 @@ void Preemph_scaled(
     FOR( i = sub( Lframe, 1 ); i > 0; i-- )
     {
         L_tmp = L_mult( new_speech[i], QVal );
-#ifdef BASOP_NOGLOB
         L_tmp = L_msu_o( L_tmp, new_speech[i - 1], mu, &Overflow );
-#else  /* BASOP_NOGLOB */
-        L_tmp = L_msu( L_tmp, new_speech[i - 1], mu );
-#endif /* BASOP_NOGLOB */
         L_tmp = L_shl( L_tmp, *Q_new );
-#ifdef BASOP_NOGLOB
         new_speech[i] = round_fx_sat( L_tmp ); // Q_new
-#else
-        new_speech[i] = round_fx( L_tmp );
-#endif
     }
 
     L_tmp = L_mult( new_speech[0], QVal );
-#ifdef BASOP_NOGLOB
     L_tmp = L_msu_sat( L_tmp, *mem_preemph, mu );
     L_tmp = L_shl_sat( L_tmp, *Q_new );
     new_speech[0] = round_fx_sat( L_tmp );
-#else
-    L_tmp = L_msu( L_tmp, *mem_preemph, mu );
-    L_tmp = L_shl( L_tmp, *Q_new );
-    new_speech[0] = round_fx( L_tmp );
-#endif
     *mem_preemph = tmp_fixed;
     move16();
 }
@@ -255,21 +229,12 @@ Word32 Scale_mem_pre_proc(                       /* o  : Min energy scaled
             /* Do scaling and valide minimum energy value */
             FOR( i = 0; i < NB_BANDS; i++ )
             {
-#ifdef BASOP_NOGLOB
                 enrO[i] = L_max( L_shl_o( enrO[i], Q_exp, &Overflow ), e_min_scaled );
                 bckr[i] = L_max( L_shl_o( bckr[i], Q_exp, &Overflow ), e_min_scaled );
                 ave_enr[i] = L_max( L_shl_o( ave_enr[i], Q_exp, &Overflow ), e_min_scaled );
                 ave_enr2[i] = L_max( L_shl_o( ave_enr2[i], Q_exp, &Overflow ), e_min_scaled );
                 st_fr_bands1[i] = L_max( L_shl_o( st_fr_bands1[i], Q_exp, &Overflow ), e_min_scaled );
                 st_fr_bands2[i] = L_max( L_shl_o( st_fr_bands2[i], Q_exp, &Overflow ), e_min_scaled );
-#else
-                enrO[i] = L_max( L_shl( enrO[i], Q_exp ), e_min_scaled );
-                bckr[i] = L_max( L_shl( bckr[i], Q_exp ), e_min_scaled );
-                ave_enr[i] = L_max( L_shl( ave_enr[i], Q_exp ), e_min_scaled );
-                ave_enr2[i] = L_max( L_shl( ave_enr2[i], Q_exp ), e_min_scaled );
-                st_fr_bands1[i] = L_max( L_shl( st_fr_bands1[i], Q_exp ), e_min_scaled );
-                st_fr_bands2[i] = L_max( L_shl( st_fr_bands2[i], Q_exp ), e_min_scaled );
-#endif
                 move32();
                 move32();
                 move32();
diff --git a/lib_enc/set_impulse_fx.c b/lib_enc/set_impulse_fx.c
index 90a405d7cf70b49279cdf803f1c28b9df0329d1a..d4dd73abe8ea2be7536ea15ce15c6270737b279f 100644
--- a/lib_enc/set_impulse_fx.c
+++ b/lib_enc/set_impulse_fx.c
@@ -119,21 +119,12 @@ void set_impulse_fx(
             /* nominator & DEnominator row <0> */
             FOR( i = 0; i < L_SUBFR; i++ )
             {
-#ifdef BASOP_NOGLOB
                 Lrr = L_mac_o( Lrr, gh_fx[i], gh_fx[i], &Overflow ); // Q27
                 Ldd = L_mac_o( Ldd, gh_fx[i], xn_fx[i], &Overflow ); // Q27
-#else
-                Lrr = L_mac( Lrr, gh_fx[i], gh_fx[i] );
-                Ldd = L_mac( Ldd, gh_fx[i], xn_fx[i] );
-#endif
             }
             rr_fx[start1] = Lrr;
             move32();
-#ifdef BASOP_NOGLOB
             dd_fx[start1] = round_fx_o( Ldd, &Overflow ); // Q11
-#else
-            dd_fx[start1] = round_fx( Ldd );
-#endif
             rr_fx[start1] = L_max( rr_fx[start1], 1 );
 
             FOR( i = add( start1, 1 ); i < L_IMPULSE2; i++ )
@@ -147,26 +138,15 @@ void set_impulse_fx(
                     gh_fx[j] = mac_r( L_deposit_h( gh_fx[j - 1] ),
                                       Glottal_cdbk_fx[m * L_IMPULSE + L_IMPULSE2 - i], h_orig_fx[j] ); // Q13
                     move16();
-#ifdef BASOP_NOGLOB
                     Lrr = L_mac_o( Lrr, gh_fx[j], gh_fx[j], &Overflow ); // Q27
                     Ldd = L_mac_o( Ldd, gh_fx[j], xn_fx[j], &Overflow ); // Q27
-#else                                                                    /* BASOP_NOGLOB */
-                    Lrr = L_mac( Lrr, gh_fx[j], gh_fx[j] );
-                    Ldd = L_mac( Ldd, gh_fx[j], xn_fx[j] );
-#endif                                                                   /* BASOP_NOGLOB */
                 }
 
                 gh_fx[0] = mult_r( Glottal_cdbk_fx[m * L_IMPULSE + L_IMPULSE2 - i], h_orig_fx[0] ); // Q13
                 move16();
-#ifdef BASOP_NOGLOB
                 Lrr = L_mac_o( Lrr, gh_fx[0], gh_fx[0], &Overflow ); // Q27
                 Ldd = L_mac_o( Ldd, gh_fx[0], xn_fx[0], &Overflow ); // Q27
                 dd_fx[i] = round_fx_sat( Ldd );                      // Q11
-#else                                                                /* BASOP_NOGLOB */
-                Lrr = L_mac( Lrr, gh_fx[0], gh_fx[0] );
-                Ldd = L_mac( Ldd, gh_fx[0], xn_fx[0] );
-                dd_fx[i] = round_fx( Ldd );
-#endif
                 rr_fx[i] = L_max( Lrr, 1 );
                 move32();
                 /* move rr and dd into rr[i] and dd[i] */
@@ -191,11 +171,7 @@ void set_impulse_fx(
             FOR( j = 1; j <= L_IMPULSE2; j++ )
             {
                 /*rr[L_SUBFR-1] += gh[j]*gh[j];*/
-#ifdef BASOP_NOGLOB
                 Lrr = L_mac_sat( Lrr, gh_fx[j], gh_fx[j] ); // Q27
-#else
-                Lrr = L_mac( Lrr, gh_fx[j], gh_fx[j] );
-#endif
             }
             rr_fx[L_SUBFR - 1] = Lrr;
             move32();
@@ -203,13 +179,8 @@ void set_impulse_fx(
             FOR( i = L_SUBFR - 2; i >= start2; i-- )
             {
                 /*rr[i] = rr[i+1] + gh[L_SUBFR+L_IMPULSE2-1-i]*gh[L_SUBFR+L_IMPULSE2-1-i];*/
-#ifdef BASOP_NOGLOB
                 rr_fx[i] = L_mac_o( rr_fx[i + 1], gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i],
                                     gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i], &Overflow ); // Q27
-#else
-                rr_fx[i] = L_mac( rr_fx[i + 1], gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i],
-                                  gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i] );
-#endif
                 move32();
             }
             /* nominator rows <L_IMPULSE2,L_SUBFR-1> */
@@ -230,11 +201,7 @@ void set_impulse_fx(
             den = extract_h( L_shl( rr_fx[i], exp_den ) );
 
             num = div_s( num, den );
-#ifdef BASOP_NOGLOB
             krit_fx = shr_o( num, sub( sub( shl_o( exp_num, 1, &Overflow ), exp_den ), 2 ), &Overflow ); /* Q18 */
-#else
-            krit_fx = shr( num, sub( sub( shl( exp_num, 1 ), exp_den ), 2 ) ); /* Q18 */
-#endif
 
             IF( GT_16( krit_fx, krit_max_fx ) )
             {
@@ -318,10 +285,10 @@ static void convolve_tc_fx(
         L_sum = L_mult( g[0], h[n] ); /* Qx */
         FOR( i = 1; i < len; i++ )
         {
-            L_sum = L_mac( L_sum, g[i], h[n - i] ); /* Qx + 16 */
+            L_sum = L_mac_sat( L_sum, g[i], h[n - i] ); /* Qx + 16 */
         }
 
-        y[n] = round_fx( L_sum ); /* Qx */
+        y[n] = round_fx_sat( L_sum ); /* Qx */
     }
 }
 /*-------------------------------------------------------------------*
@@ -380,16 +347,8 @@ static void correlate_tc_fx(
         s = L_deposit_l( 0 );
         FOR( j = i; j < L_1; j++ )
         {
-#ifdef BASOP_NOGLOB
             s = L_mac_sat( s, x[j], h[j - i] ); /* Qx + 16 */
-#else
-            s = L_mac( s, x[j], h[j - i] );
-#endif
         }
-#ifdef BASOP_NOGLOB
         y[i] = round_fx_sat( s ); /* Qx */
-#else
-        y[i] = round_fx( s );
-#endif
     }
 }
diff --git a/lib_enc/setmodeindex.c b/lib_enc/setmodeindex.c
deleted file mode 100644
index 1cc6168c38f3cdd3925f9c0cb17afa3e21aefa0b..0000000000000000000000000000000000000000
--- a/lib_enc/setmodeindex.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "cnst.h"
-#include "ivas_cnst.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-/*---------------------------------------------------------------------------
-
-   function name: SetModeIndex
-   description:   function for configuring the codec between frames - currently bitrate and bandwidth only
-                  must not be called while a frame is encoded - hence mutexes must be used in MT environments
-
-   format:        BANDWIDTH*16 + BITRATE (mode index)
-
-  ---------------------------------------------------------------------------*/
-
-void SetModeIndex_ivas_fx(
-    Encoder_State *st,              /* i  : Encoder state                          */
-    const Word32 last_total_brate,  /* i  : last total bitrate                     Q0*/
-    const Word16 last_element_mode, /* i  : last IVAS element mode                 Q0*/
-    const Word16 MCT_flag           /* i  : hMCT handle allocated (1) or not (0)   Q0*/
-)
-{
-    Word16 ini_frame_loc = st->ini_frame; // Q0
-    move16();
-
-    test();
-    test();
-    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && NE_16( last_element_mode, IVAS_CPE_MDCT ) && EQ_16( st->idchan, 1 ) )
-    {
-        st->ini_frame = 0;
-        move16();
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    /* Reconfigure the core coder */
-    IF( ( NE_32( last_total_brate, st->total_brate ) ) ||
-        ( NE_16( st->last_bwidth, st->bwidth ) ) ||
-        ( EQ_16( st->last_codec_mode, MODE1 ) && EQ_16( st->element_mode, EVS_MONO ) ) ||
-        ( ( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) && GT_16( st->element_mode, EVS_MONO ) ) ||
-        ( NE_16( st->rf_mode_last, st->rf_mode ) ) ||
-        ( st->element_mode > EVS_MONO && st->ini_frame == 0 ) )
-    {
-        core_coder_mode_switch_ivas_fx( st, last_total_brate, MCT_flag );
-    }
-
-    st->ini_frame = ini_frame_loc; // Q0
-    move16();
-
-    return;
-}
diff --git a/lib_enc/setmodeindex_fx.c b/lib_enc/setmodeindex_fx.c
index fc3025f5132805d4827637794a00375fb9202f2d..012c5757f2b9ea041c5bb4541e580f11fd27e656 100644
--- a/lib_enc/setmodeindex_fx.c
+++ b/lib_enc/setmodeindex_fx.c
@@ -55,3 +55,48 @@ void SetModeIndex_fx(
 
     return;
 }
+
+
+void SetModeIndex_ivas_fx(
+    Encoder_State *st,              /* i  : Encoder state                          */
+    const Word32 last_total_brate,  /* i  : last total bitrate                     Q0*/
+    const Word16 last_element_mode, /* i  : last IVAS element mode                 Q0*/
+    const Word16 MCT_flag           /* i  : hMCT handle allocated (1) or not (0)   Q0*/
+)
+{
+    Word16 ini_frame_loc = st->ini_frame; // Q0
+    move16();
+
+    test();
+    test();
+    IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && NE_16( last_element_mode, IVAS_CPE_MDCT ) && EQ_16( st->idchan, 1 ) )
+    {
+        st->ini_frame = 0;
+        move16();
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    /* Reconfigure the core coder */
+    IF( ( NE_32( last_total_brate, st->total_brate ) ) ||
+        ( NE_16( st->last_bwidth, st->bwidth ) ) ||
+        ( EQ_16( st->last_codec_mode, MODE1 ) && EQ_16( st->element_mode, EVS_MONO ) ) ||
+        ( ( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) ) && GT_16( st->element_mode, EVS_MONO ) ) ||
+        ( NE_16( st->rf_mode_last, st->rf_mode ) ) ||
+        ( st->element_mode > EVS_MONO && st->ini_frame == 0 ) )
+    {
+        core_coder_mode_switch_ivas_fx( st, last_total_brate, MCT_flag );
+    }
+
+    st->ini_frame = ini_frame_loc; // Q0
+    move16();
+
+    return;
+}
diff --git a/lib_enc/sig_clas_fx.c b/lib_enc/sig_clas_fx.c
index 501f907b60aa73eb2126df1d8cdedee46325b026..beb97514a0d139e512f3936143a461e75d89de6e 100644
--- a/lib_enc/sig_clas_fx.c
+++ b/lib_enc/sig_clas_fx.c
@@ -44,9 +44,9 @@
 
 Word16 signal_clas_fx(                       /* o  : classification for current frames              */
                        Encoder_State *st,    /* i/o: encoder state structure                           */
-                       const Word16 *speech, /* i  : pointer to speech signal for E computation        */
-                       const Word32 *ee,     /* i  : lf/hf E ration for 2 half-frames                  */
-                       const Word16 relE,    /* i  : frame relative E to the long term average         */
+                       const Word16 *speech, /* i  : pointer to speech signal for E computation in Qx */
+                       const Word32 *ee,     /* i  : lf/hf E ration for 2 half-frames in Q6            */
+                       const Word16 relE,    /* i  : frame relative E to the long term average in Q8   */
                        const Word16 L_look,  /* i  : look-ahead                                        */
                        Word16 *clas_mod      /* o  : class flag for NOOP detection                     */
 )
@@ -58,6 +58,7 @@ Word16 signal_clas_fx(                       /* o  : classification for current
     const Word16 *pt1;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     /*----------------------------------------------------------------*
@@ -68,7 +69,7 @@ Word16 signal_clas_fx(                       /* o  : classification for current
      *----------------------------------------------------------------*/
 
     /* average voicing on second half-frame and look-ahead */
-    Ltmp = L_mult( st->voicing_fx[1], 16384 );
+    Ltmp = L_mult( st->voicing_fx[1], 16384 ); /* Q15*Q14->Q30 */
     mean_voi2 = mac_r( Ltmp, st->voicing_fx[2], 16384 );
 
     /* average spectral tilt in dB */
@@ -99,9 +100,8 @@ Word16 signal_clas_fx(                       /* o  : classification for current
         een = round_fx( L_shl( Ltmp, 16 - 5 ) );   /* Q14 -> Q9 */
         een = mac_r( C_EE_FX, een, K_EE_FX );
     }
-
     /* compute zero crossing rate */
-    pt1 = speech + L_look - 1;
+    pt1 = speech + sub( L_look, 1 );
     tmpS = shr( *pt1, 15 ); /* sets 'tmpS to -1 if *pt1 < 0 */
     Ltmp = L_deposit_l( 0 );
     FOR( i = 0; i < L_FRAME; i++ )
@@ -116,7 +116,7 @@ Word16 signal_clas_fx(                       /* o  : classification for current
     /* compute pitch stability */
     pc = add( abs_s( sub( st->pitch[1], st->pitch[0] ) ), abs_s( sub( st->pitch[2], st->pitch[1] ) ) );
     st->tdm_pc = pc;
-
+    move16();
     /*-----------------------------------------------------------------*
      * Transform parameters to the range <0:1>
      * Compute the merit function
@@ -135,7 +135,7 @@ Word16 signal_clas_fx(                       /* o  : classification for current
     zcn = s_max( zcn, 0 );
     zcn = s_min( zcn, 512 );
 
-    Ltmp = L_mult( C_RELE_FX, 256 );                                /*Q15 ->Q24*/
+    Ltmp = L_mult( C_RELE_FX, 256 );                                /*Q15*Q8 ->Q24*/
     relEn = round_fx( L_shl( L_mac( Ltmp, relE, K_RELE_FX ), 1 ) ); /*relE in Q8 but relEn in Q9*/
     /* Limit [0.5, 1] */
     relEn = s_max( relEn, 256 );
@@ -153,17 +153,246 @@ Word16 signal_clas_fx(                       /* o  : classification for current
     Ltmp = L_mac( Ltmp, relEn, 10923 );
     Ltmp = L_mac( Ltmp, pcn, 10923 );
 
-#ifdef BASOP_NOGLOB
     fmerit1 = round_fx_o( L_shl_o( Ltmp, 16 - 10 - 1, &Overflow ), &Overflow ); /* fmerit1 ->Q15 */
-#else
-    fmerit1 = round_fx( L_shl( Ltmp, 16 - 10 - 1 ) ); /* fmerit1 ->Q15 */
+
+    /*-----------------------------------------------------------------*
+     * FEC classification
+     *-----------------------------------------------------------------*/
+
+    st->fmerit_dt = sub( st->prev_fmerit, fmerit1 ); /*Q15*/
+    move16();
+    st->prev_fmerit = fmerit1;
+    move16();
+
+    /* FEC classification */
+    test();
+    test();
+    IF( st->localVAD == 0 || EQ_16( st->coder_type, UNVOICED ) || LT_16( relE, -1536 ) )
+    {
+        clas = UNVOICED_CLAS;
+        *clas_mod = clas;
+        move16();
+        move16();
+    }
+    ELSE
+    {
+        SWITCH( st->last_clas )
+        {
+            case VOICED_CLAS:
+            case ONSET:
+            case VOICED_TRANSITION:
+
+                IF( LT_16( fmerit1, 16056 ) ) /*0.49f*/
+                {
+                    clas = UNVOICED_CLAS;
+                    move16();
+                }
+                ELSE IF( LT_16( fmerit1, 21626 ) ) /*0.66*/
+                {
+                    clas = VOICED_TRANSITION;
+                    move16();
+                }
+                ELSE
+                {
+                    clas = VOICED_CLAS;
+                    move16();
+                }
+                IF( LT_16( fmerit1, 14745 /* 0.45f*/ ) )
+                {
+                    *clas_mod = UNVOICED_CLAS;
+                    move16();
+                }
+                ELSE IF( LT_16( fmerit1, 21626 /* 0.66f*/ ) )
+                {
+                    *clas_mod = VOICED_TRANSITION;
+                    move16();
+                }
+                ELSE
+                {
+                    *clas_mod = VOICED_CLAS;
+                    move16();
+                }
+                BREAK;
+
+            case UNVOICED_CLAS:
+            case UNVOICED_TRANSITION:
+                IF( GT_16( fmerit1, 20643 ) ) /*0.63*/
+                {
+                    clas = ONSET;
+                    move16();
+                }
+                ELSE IF( GT_16( fmerit1, 19169 ) ) /*0.585*/
+                {
+                    clas = UNVOICED_TRANSITION;
+                    move16();
+                }
+                ELSE
+                {
+                    clas = UNVOICED_CLAS;
+                    move16();
+                }
+                *clas_mod = clas;
+                move16();
+
+                BREAK;
+
+            default:
+                clas = UNVOICED_CLAS;
+                *clas_mod = clas;
+                move16();
+                move16();
+                BREAK;
+        }
+    }
+    /* Onset classification */
+
+    /* tc_cnt == -1: frame after TC frame in continuous block of GC/VC frames */
+    /* tc_cnt ==  0: UC frame */
+    /* tc_cnt ==  1: onset/transition frame, coded by GC coder type */
+    /* tc_cnt ==  2: frame after onset/transition frame, coded by TC coder type */
+
+    if ( clas == 0 )
+    {
+        st->tc_cnt = 0;
+        move16();
+    }
+
+    test();
+    IF( GE_16( clas, VOICED_TRANSITION ) && st->tc_cnt >= 0 )
+    {
+        st->tc_cnt = add( st->tc_cnt, 1 );
+        move16();
+    }
+
+    if ( GT_16( st->tc_cnt, 2 ) )
+    {
+        st->tc_cnt = -1;
+        move16();
+    }
+    return clas;
+}
+
+Word16 signal_clas_ivas_fx(                       /* o  : classification for current frames              */
+                            Encoder_State *st,    /* i/o: encoder state structure                           */
+                            const Word16 *speech, /* i  : pointer to speech signal for E computation in Qx */
+                            const Word32 *ee,     /* i  : lf/hf E ration for 2 half-frames in Q6            */
+                            const Word16 relE,    /* i  : frame relative E to the long term average in Q8   */
+                            const Word16 L_look,  /* i  : look-ahead                                        */
+                            Word16 *clas_mod      /* o  : class flag for NOOP detection                     */
+)
+{
+    Word32 Ltmp;
+    Word16 mean_voi2, een, corn, zcn, relEn, pcn, fmerit1;
+    Word16 i, clas, pc, zc, exp_ee;
+    Word16 tmp16, tmpS;
+    const Word16 *pt1;
+    Word64 tmp64;
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
 #endif
 
+    /*----------------------------------------------------------------*
+     * Calculate average voicing
+     * Calculate average spectral tilt
+     * Calculate zero-crossing rate
+     * Calculate pitch stability
+     *----------------------------------------------------------------*/
+
+    /* average voicing on second half-frame and look-ahead */
+    Ltmp = L_mult( st->voicing_fx[1], 16384 ); /* Q15*Q14->Q30 */
+    mean_voi2 = mac_r( Ltmp, st->voicing_fx[2], 16384 );
+
+    /* average spectral tilt in dB */
+    tmp64 = W_mult0_32_32( ee[0], ee[1] );
+    exp_ee = W_norm( tmp64 );
+    Ltmp = W_extract_h( W_shl( tmp64, exp_ee ) ); // Q = Q6+Q6 + exp_ee - 32
+    exp_ee = sub( 31, sub( add( Q12, exp_ee ), 32 ) );
+    IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( Ltmp, exp_ee, ONE_IN_Q31, 0 ), -1 ) )
+    {
+        een = 0;
+        move16();
+    }
+    ELSE
+    {
+        /* mean_ee2 = 0.5f * 20.0f * (float)log10( tmp ); */
+        /* een = K_EE_ENC * mean_ee2 + C_EE_ENC; */
+        Ltmp = BASOP_Util_Log10( Ltmp, exp_ee );                            // Q25
+        Ltmp = Mpy_32_32( Ltmp, 671088640 /*20.f in Q25*/ );                // Q25 + Q25 -Q31 = Q19 * 0.5 = Q20
+        een = extract_l( L_shl( Mpy_32_16_1( Ltmp, K_EE_FX ), Q9 - Q20 ) ); // Q9
+
+        IF( GT_16( een, 512 ) )
+        {
+            een = 512;
+            move16();
+        }
+        ELSE IF( een < 0 )
+        {
+            een = 0;
+            move16();
+        }
+    }
+    /* compute zero crossing rate */
+    pt1 = speech + sub( L_look, 1 );
+    tmpS = shr( *pt1, 15 ); /* sets 'tmpS to -1 if *pt1 < 0 */
+    Ltmp = L_deposit_l( 0 );
+    FOR( i = 0; i < L_FRAME; i++ )
+    {
+        tmp16 = add( 1, tmpS );
+        pt1++;
+        tmpS = shr( *pt1, 15 ); /* pt1 >=0 ---> 0 OTHERWISE -1   */
+        Ltmp = L_msu0( Ltmp, tmpS, tmp16 );
+    }
+    zc = extract_l( Ltmp );
+
+    /* compute pitch stability */
+    pc = add( abs_s( sub( st->pitch[1], st->pitch[0] ) ), abs_s( sub( st->pitch[2], st->pitch[1] ) ) );
+    st->tdm_pc = pc;
+    move16();
+    /*-----------------------------------------------------------------*
+     * Transform parameters to the range <0:1>
+     * Compute the merit function
+     *-----------------------------------------------------------------*/
+
+    /* corn = K_COR * mean_voi2 + C_COR */
+    Ltmp = L_mult( C_COR_FX, 32767 );
+    corn = round_fx( L_shl( L_mac( Ltmp, mean_voi2, K_COR_FX ), -4 ) ); /*Q13+Q13*Q15 =>Q13->Q9*/
+    /* Limit [0, 1] */
+    corn = s_max( corn, 0 );
+    corn = s_min( corn, 512 );
+
+    Ltmp = L_mult( C_ZC_FX, 4 );                                   /*Q13*Q2 -> Q16*/
+    zcn = round_fx( L_shl( L_mac( Ltmp, zc, K_ZC_FX ), 16 - 7 ) ); /*Q0*Q15 + Q16*/
+    /* Limit [0, 1] */
+    zcn = s_max( zcn, 0 );
+    zcn = s_min( zcn, 512 );
+
+    Ltmp = L_mult( C_RELE_FX, 256 );                                /*Q15*Q8 ->Q24*/
+    relEn = round_fx( L_shl( L_mac( Ltmp, relE, K_RELE_FX ), 1 ) ); /*relE in Q8 but relEn in Q9*/
+    /* Limit [0.5, 1] */
+    relEn = s_max( relEn, 256 );
+    relEn = s_min( relEn, 512 );
+
+    Ltmp = L_mult( C_PC_FX, 2 );                                   /*Q14*Q1 -> Q16*/
+    pcn = round_fx( L_shl( L_mac( Ltmp, pc, K_PC_FX ), 16 - 7 ) ); /*Q16 + Q0*Q15*/
+    /* Limit [0, 1] */
+    pcn = s_max( pcn, 0 );
+    pcn = s_min( pcn, 512 );
+
+    Ltmp = L_mult( een, 10923 );
+    Ltmp = L_mac( Ltmp, corn, 21845 );
+    Ltmp = L_mac( Ltmp, zcn, 10923 );
+    Ltmp = L_mac( Ltmp, relEn, 10923 );
+    Ltmp = L_mac( Ltmp, pcn, 10923 );
+
+    fmerit1 = round_fx_o( L_shl_o( Ltmp, 16 - 10 - 1, &Overflow ), &Overflow ); /* fmerit1 ->Q15 */
+
     /*-----------------------------------------------------------------*
      * FEC classification
      *-----------------------------------------------------------------*/
 
-    st->fmerit_dt = sub( st->prev_fmerit, fmerit1 );
+    st->fmerit_dt = sub( st->prev_fmerit, fmerit1 ); /*Q15*/
+    move16();
     st->prev_fmerit = fmerit1;
     move16();
 
@@ -254,14 +483,14 @@ Word16 signal_clas_fx(                       /* o  : classification for current
     /* tc_cnt ==  1: onset/transition frame, coded by GC coder type */
     /* tc_cnt ==  2: frame after onset/transition frame, coded by TC coder type */
 
-    if ( EQ_16( clas, UNVOICED_CLAS ) )
+    if ( clas == 0 )
     {
         st->tc_cnt = 0;
         move16();
     }
 
     test();
-    if ( GE_16( clas, VOICED_TRANSITION ) && st->tc_cnt >= 0 )
+    IF( GE_16( clas, VOICED_TRANSITION ) && st->tc_cnt >= 0 )
     {
         st->tc_cnt = add( st->tc_cnt, 1 );
         move16();
@@ -274,6 +503,7 @@ Word16 signal_clas_fx(                       /* o  : classification for current
     }
     return clas;
 }
+
 /*-------------------------------------------------------------------*
  * select_TC_fx()
  *
@@ -323,7 +553,7 @@ void select_TC_fx(
 
 void coder_type_modif_fx(
     Encoder_State *st, /* i/o: encoder state structure                     */
-    const Word16 relE  /* i  : frame relative E to the long term average   */
+    const Word16 relE  /* i  : frame relative E to the long term average Q8*/
 )
 {
     Word16 unmod_coder_type, vbr_generic_ho;
@@ -354,8 +584,12 @@ void coder_type_modif_fx(
 
         /* At higher rates, use GC coding instead of UC coding to improve quality */
         test();
-        if ( ( EQ_16( st->element_mode, EVS_MONO ) && GT_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->coder_type, UNVOICED ) ) ||
-             ( GT_16( st->element_mode, EVS_MONO ) && GT_32( st->total_brate, MAX_UNVOICED_BRATE ) && EQ_16( st->coder_type, UNVOICED ) ) )
+        test();
+        test();
+        test();
+        test();
+        if ( ( st->element_mode == 0 && GT_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->coder_type, UNVOICED ) ) ||
+             ( st->element_mode > 0 && GT_32( st->total_brate, MAX_UNVOICED_BRATE ) && EQ_16( st->coder_type, UNVOICED ) ) )
         {
             st->coder_type = GENERIC;
             move16();
@@ -395,13 +629,13 @@ void coder_type_modif_fx(
         test();
         IF( EQ_16( st->Opt_SC_VBR, 1 ) )
         {
+            test();
             if ( EQ_16( st->coder_type, GENERIC ) && EQ_16( unmod_coder_type, UNVOICED ) )
             {
                 hSC_VBR->vbr_generic_ho = 1;
                 move16();
             }
 
-            test();
             if ( GT_16( st->coder_type, UNVOICED ) )
             {
                 hSC_VBR->vbr_generic_ho = 0;
@@ -419,12 +653,12 @@ void coder_type_modif_fx(
         }
         //}  closing bracket here in IVAS float, but not in EVS float. currently affects BE for switching bitrate on Linux 20220929 _DIFF_FLOAT_FIX_ !!
 
-        IF( EQ_16( st->element_mode, EVS_MONO ) )
+        IF( st->element_mode == 0 )
         {
             /* At higher rates and with 16kHz core, allow only GC and TC coder type */
             test();
             test();
-            test();
+            // test();
             if ( GT_32( st->total_brate, ACELP_16k40 ) && NE_16( st->coder_type, GENERIC ) && NE_16( st->coder_type, TRANSITION ) )
             {
                 /* onset/transition frame is always coded using GC mode */
@@ -435,6 +669,9 @@ void coder_type_modif_fx(
         ELSE /*IVAS*/
         {
             /* At higher bitrates, disable UC and VC coder type; note that IC coder type is classified later */
+            test();
+            test();
+            test();
             if ( ( GT_32( st->total_brate, MAX_VOICED_BRATE ) && EQ_16( st->coder_type, VOICED ) ) ||
                  ( GT_32( st->total_brate, MAX_UNVOICED_BRATE ) && EQ_16( st->coder_type, UNVOICED ) ) )
             {
@@ -447,7 +684,7 @@ void coder_type_modif_fx(
         test();
         test();
         test();
-        if ( EQ_16( st->coder_type, VOICED ) && EQ_16( st->input_bwidth, NB ) && LT_16( relE, -2560 ) && LE_32( st->total_brate, ACELP_8k00 ) )
+        if ( EQ_16( st->coder_type, VOICED ) && st->input_bwidth == 0 && LT_16( relE, -2560 ) && LE_32( st->total_brate, ACELP_8k00 ) )
         {
             st->coder_type = GENERIC;
             move16();
@@ -493,8 +730,8 @@ void coder_type_modif_ivas_fx(
         test();
         test();
         test();
-        if ( ( EQ_16( st->element_mode, EVS_MONO ) && GT_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->coder_type, UNVOICED ) ) ||
-             ( GT_16( st->element_mode, EVS_MONO ) && GT_32( st->total_brate, MAX_UNVOICED_BRATE ) && EQ_16( st->coder_type, UNVOICED ) ) )
+        if ( ( st->element_mode == 0 && GT_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->coder_type, UNVOICED ) ) ||
+             ( st->element_mode > 0 && GT_32( st->total_brate, MAX_UNVOICED_BRATE ) && EQ_16( st->coder_type, UNVOICED ) ) )
         {
             st->coder_type = GENERIC;
             move16();
@@ -530,7 +767,7 @@ void coder_type_modif_ivas_fx(
             move16();
         }
 
-        IF( EQ_16( st->Opt_SC_VBR, 1 ) )
+        if ( EQ_16( st->Opt_SC_VBR, 1 ) )
         {
             test();
             if ( EQ_16( st->coder_type, GENERIC ) && EQ_16( unmod_coder_type, UNVOICED ) )
@@ -555,7 +792,7 @@ void coder_type_modif_ivas_fx(
             }
         }
 
-        IF( EQ_16( st->element_mode, EVS_MONO ) )
+        IF( st->element_mode == 0 )
         {
             /* At higher rates and with 16kHz core, allow only GC and TC coder type */
             test();
diff --git a/lib_enc/spec_center.c b/lib_enc/spec_center.c
deleted file mode 100644
index 5cd8e2875deb519346d7148c847ad9a672078b2a..0000000000000000000000000000000000000000
--- a/lib_enc/spec_center.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "cnst.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/spec_center_fx.c b/lib_enc/spec_center_fx.c
index 920da568d721927e05f5e795583fbd17c7efefc4..1e908d0c388682b49e1d71d6807d6deb2e3be89e 100644
--- a/lib_enc/spec_center_fx.c
+++ b/lib_enc/spec_center_fx.c
@@ -18,9 +18,9 @@
  *-------------------------------------------------------------------*/
 
 void spec_center_fx(
-    Word32 *sb_power,      /* i  : energy of sub-band divided uniformly*/
-    Word16 *sp_center,     /* o  : spectral center*/
-    const Word32 bw_index, /* i  : band width*/
+    Word32 *sb_power,      /* i  : energy of sub-band divided uniformly		Q31 */
+    Word16 *sp_center,     /* o  : spectral center	Q10 */
+    const Word32 bw_index, /* i  : band width	Q0 */
     const Word16 Q_sb_p    /* i  : the Scaling of sb_power*/
 )
 {
@@ -48,15 +48,15 @@ void spec_center_fx(
 
     FOR( i = 0; i < 10; i++ )
     {
-        sb_power_shr[i] = L_shr( sb_power[i], 5 );
+        sb_power_shr[i] = L_shr( sb_power[i], 5 ); /* Q26 */
         move32();
     }
 
     FOR( i = 0; i < 10; i++ )
     {
-        sb_power_mlt = Mpy_32_16_1( sb_power[i], i_t_1[i] );
-        t_sp_center = L_add( L_shr( sb_power_mlt, 6 ), t_sp_center );
-        frame_power = L_add( sb_power_shr[i], frame_power ); /*0-9 */
+        sb_power_mlt = Mpy_32_16_1( sb_power[i], i_t_1[i] );          /* Q16 + QB */
+        t_sp_center = L_add( L_shr( sb_power_mlt, 6 ), t_sp_center ); /* Q11 + QB */
+        frame_power = L_add( sb_power_shr[i], frame_power ); /*0-9 */ /* Q26 */
     }
 
     t_sp_center_nb = t_sp_center;
@@ -68,16 +68,17 @@ void spec_center_fx(
     Q_t_sc = sub( Q_sb_p, 10 );
     IF( GE_16( Q_t_sc, 34 ) )
     {
-        t_sp_center = L_shr( t_sp_center, sub( Q_t_sc, 33 ) );
-        zerop1 = L_shr( CNT0P1, 1 );
+        t_sp_center = L_shr( t_sp_center, sub( Q_t_sc, 33 ) ); /* Q44 + QB - Q_t_sc)*/
+        zerop1 = CNT0P1 >> 1;                                  /* Q33 */
+        move32();
         Q_t_sc = 33;
         move16();
     }
     ELSE
     {
-        Q_t_sc = sub( Q_t_sc, 1 );
-        t_sp_center = L_shr( t_sp_center, 1 );
-        zerop1 = L_shr( CNT0P1, sub( 34, Q_t_sc ) );
+        Q_t_sc = sub( Q_t_sc, 1 );                   /* Q_t_sc - 1 */
+        t_sp_center = L_shr( t_sp_center, 1 );       /* Q10 + QB */
+        zerop1 = L_shr( CNT0P1, sub( 34, Q_t_sc ) ); /* Q_t_sc */
     }
     t_sp_center_num = L_add( t_sp_center, zerop1 );
 
@@ -85,7 +86,8 @@ void spec_center_fx(
     IF( GE_16( Q_f_p, 34 ) )
     {
         frame_power = L_shr( frame_power, sub( Q_f_p, 33 ) );
-        zerop1 = L_shr( CNT0P1, 1 );
+        zerop1 = ( CNT0P1 >> 1 );
+        move32();
         Q_f_p = 33;
         move16();
     }
@@ -120,9 +122,9 @@ void spec_center_fx(
 
     d_t_sp_center = shr( d_t_sp_center, d_t_sp_center_Qtmp );
     sp_center[0] = add( mult( sp_center[0], 0x5999 ), mult( d_t_sp_center, 0x2666 ) );
-    move16();
     sp_center[2] = d_t_sp_center;
     move16();
+    move16();
 
     t_sp_center = 0;
     move32();
@@ -148,7 +150,8 @@ void spec_center_fx(
         IF( GE_16( Q_t_sc, 34 ) )
         {
             t_sp_center = L_shr( t_sp_center, sub( Q_t_sc, 33 ) );
-            zerop1 = L_shr( CNT0P1, 1 );
+            zerop1 = ( CNT0P1 >> 1 );
+            move32();
             Q_t_sc = 33;
             move16();
         }
@@ -221,7 +224,8 @@ void spec_center_fx(
         IF( GE_16( Q_t_sc, 34 ) )
         {
             t_sp_center = L_shr( t_sp_center, limitScale32( sub( Q_t_sc, 33 ) ) );
-            zerop1 = L_shr( CNT0P1, 1 );
+            zerop1 = ( CNT0P1 >> 1 );
+            move32();
             Q_t_sc = 33;
             move16();
         }
@@ -237,7 +241,8 @@ void spec_center_fx(
         IF( GE_16( Q_f_p, 34 ) )
         {
             frame_power = L_shr( frame_power, sub( Q_f_p, 33 ) );
-            zerop1 = L_shr( CNT0P1, 1 );
+            zerop1 = ( CNT0P1 >> 1 );
+            move32();
             Q_f_p = 33;
             move16();
         }
diff --git a/lib_enc/spec_flatness.c b/lib_enc/spec_flatness.c
deleted file mode 100644
index 68731d8f1702d45c4fc58916c47fef083afa1903..0000000000000000000000000000000000000000
--- a/lib_enc/spec_flatness.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/spec_flatness_fx.c b/lib_enc/spec_flatness_fx.c
index 2ee10bf068b1469a7a2e455367b9d106b52b8123..d7bd9a6e9f2da301d4b1ffbb3c19e4c3b1248e9a 100644
--- a/lib_enc/spec_flatness_fx.c
+++ b/lib_enc/spec_flatness_fx.c
@@ -104,7 +104,8 @@ void spec_flatness_fx(
     IF( GE_16( prods_Q, 34 ) )
     {
         prods = L_shr( prods, sub( prods_Q, 33 ) );
-        zerop1 = L_shr( CNT0P1, 1 );
+        zerop1 = CNT0P1 >> 1;
+        move32();
         prods_Q = 33;
         move16();
     }
@@ -116,7 +117,8 @@ void spec_flatness_fx(
     }
     prods = L_add( prods, zerop1 );
 
-    zerop1 = L_shr( CNT0P1, 20 );
+    zerop1 = CNT0P1 >> 20;
+    move32();
     sums = L_add( sums, zerop1 );
 
     /*div*/
@@ -188,7 +190,8 @@ void spec_flatness_fx(
     IF( GE_16( prods_Q, 34 ) )
     {
         prods = L_shr( prods, sub( prods_Q, 33 ) );
-        zerop1 = L_shr( CNT0P1, 1 );
+        zerop1 = CNT0P1 >> 1;
+        move32();
         prods_Q = 33;
         move16();
     }
@@ -200,7 +203,8 @@ void spec_flatness_fx(
     }
     prods = L_add( prods, zerop1 );
 
-    zerop1 = L_shr( CNT0P1, 20 );
+    zerop1 = CNT0P1 >> 20;
+    move32();
     sums = L_add( sums, zerop1 );
 
     /*div*/
@@ -217,7 +221,8 @@ void spec_flatness_fx(
     SFM_Qtmp = sub( SFM_Qtmp, SPEC_AMP_Q );
     SFM_Qtmp = sub( SFM_Qtmp, SFM_Q );
 
-    sSFM[1] = add( mult( sSFM[1], 0x6ccc ), shr( mult( SFM, 0x1333 ), SFM_Qtmp ) );
+    sSFM[1] = add_sat( mult( sSFM[1], 0x6ccc ), shr( mult( SFM, 0x1333 ), SFM_Qtmp ) );
+
     move16();
     /*sSFM3*/
     sums = 0;
@@ -271,7 +276,8 @@ void spec_flatness_fx(
     IF( GE_16( prods_Q, 34 ) )
     {
         prods = L_shr( prods, sub( prods_Q, 33 ) );
-        zerop1 = L_shr( CNT0P1, 1 );
+        zerop1 = CNT0P1 >> 1;
+        move32();
         prods_Q = 33;
         move16();
     }
@@ -283,7 +289,8 @@ void spec_flatness_fx(
     }
     prods = L_add( prods, zerop1 );
 
-    zerop1 = L_shr( CNT0P1, 20 );
+    zerop1 = CNT0P1 >> 20;
+    move32();
     sums = L_add( sums, zerop1 );
 
     /*div*/
@@ -300,10 +307,6 @@ void spec_flatness_fx(
     SFM_Qtmp = sub( SFM_Qtmp, SPEC_AMP_Q );
     SFM_Qtmp = sub( SFM_Qtmp, SFM_Q );
 
-#ifdef BASOP_NOGLOB
     sSFM[2] = add_sat( mult( sSFM[2], 0x6ccc ), shr_sat( mult( SFM, 0x1333 ), SFM_Qtmp ) );
-#else
-    sSFM[2] = add( mult( sSFM[2], 0x6ccc ), shr( mult( SFM, 0x1333 ), SFM_Qtmp ) );
-#endif
     move16();
 }
diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c
deleted file mode 100644
index 514f654cb83eceb9d6adabce02e9bf97f1ccc6fc..0000000000000000000000000000000000000000
--- a/lib_enc/speech_music_classif.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "rom_enc.h"
-#include "rom_com.h" /* Common static table prototypes         */
-#include "wmc_auto.h"
diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c
index b088e6efd0570dff4fca9ad48b2d51c7d9592d9a..65000a7b3f444acf3256676c1840db27129c5681 100644
--- a/lib_enc/speech_music_classif_fx.c
+++ b/lib_enc/speech_music_classif_fx.c
@@ -17,9 +17,7 @@
 #include "debug.h"
 #endif
 #include <math.h>
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
 
 
 /*---------------------------------------------------------------------*
@@ -55,16 +53,7 @@ static void tonal_context_improv_fx( Encoder_State *st_fx, const Word32 PS[], co
 
 static void var_cor_calc_fx( const Word16 old_corr, Word16 *mold_corr, Word16 var_cor_t[], Word16 *high_stable_cor );
 
-static Word16 attack_det_fx( const Word16 *inp, const Word16 Qx, const Word16 last_clas, const Word16 localVAD, const Word16 coder_type, const Word32 total_brate
-#ifdef IVAS_CODE
-                             ,
-                             const Word16 element_mode,
-                             const Word16 clas,
-                             Word32 finc_prev[],
-                             Word32 *lt_finc,
-                             Word16 *last_strong_attack
-#endif
-);
+static Word16 attack_det_fx( const Word16 *inp, const Word16 Qx, const Word16 last_clas, const Word16 localVAD, const Word16 coder_type, const Word32 total_brate );
 
 static void order_spectrum_fx( Word16 *vec, Word16 len );
 
@@ -89,7 +78,7 @@ void speech_music_clas_init_fx(
     SP_MUS_CLAS_HANDLE hSpMusClas /* i/o: speech/music classifier handle   */
 )
 {
-    int16_t i;
+    Word16 i;
 
 
     hSpMusClas->inact_cnt = 0;
@@ -203,11 +192,14 @@ void speech_music_clas_init_fx(
     hSpMusClas->lt_dec_thres_fx = 5120;
     move16(); /*10 in Q9 */
     hSpMusClas->ener_RAT_fx = 0;
+    move16();
 
     /* speech/music classification */
     set16_fx( hSpMusClas->lt_old_mode, 1, 3 );
     hSpMusClas->lt_voicing = 16384 /*0.5f Q15*/;
+    move16();
     hSpMusClas->lt_corr = 16384 /*0.5f Q15*/;
+    move16();
     hSpMusClas->lt_tonality = 0;
     move32();
     set16_fx( hSpMusClas->lt_corr_pitch, 0, 3 );
@@ -268,8 +260,8 @@ void speech_music_clas_init_ivas_fx(
 
     hSpMusClas->sp_mus_state = -8;
     move16();
-    hSpMusClas->wdrop_fx = 0;
-    move16();
+    hSpMusClas->wdrop_32fx = 0;
+    move32();
     hSpMusClas->wrise_fx = 0;
     move16();
     hSpMusClas->wdlp_0_95_sp_fx = 0;
@@ -389,6 +381,8 @@ void speech_music_clas_init_ivas_fx(
     move16();
 
     set32_fx( hSpMusClas->finc_prev_fx, 0, ATT_NSEG );
+    hSpMusClas->q_finc_prev = Q31;
+    move16();
     hSpMusClas->lt_finc_fx = 0;
     move32();
     hSpMusClas->Q_lt_finc = Q31;
@@ -510,13 +504,13 @@ void speech_music_classif_fx(
         }
 
         st->sp_aud_decision0 = st->sp_aud_decision1;
-
+        move16();
 
         /* 2nd stage speech/music classifier (rewrite music to speech in onsets) */
         st->sp_aud_decision2 = st->sp_aud_decision1;
         move16();
 
-        IF( GT_16( st->bwidth, NB ) )
+        IF( st->bwidth > NB )
         {
             sp_mus_classif_2nd_fx( st, Etot, attack_flag, inp, Q_inp - 1 );
 
@@ -582,8 +576,6 @@ void speech_music_classif_fx(
         /* Select AUDIO frames */
         test();
         test();
-        test();
-        test();
 #ifdef DEBUGGING
         if ( st->codec_mode == MODE1 && ( st->force == 1 || ( st->force == -1 && ( st->sp_aud_decision2 || st->GSC_noisy_speech ) ) ) )
 #else
@@ -599,6 +591,7 @@ void speech_music_classif_fx(
     ELSE
     {
         st->sp_aud_decision0 = st->sp_aud_decision1;
+        move16();
     }
 
 
@@ -649,14 +642,29 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
     Word32 dPS[128], PS_norm[128];
     Word32 lepsP1;
     Word32 max_s = 0, max_m = 0, py_s, py_m;
+    move32();
+    move32();
     Word32 max_n, py_n; /* pyn */
     Word16 ishift[12] = { 8, 0, 2, 2, 2, 2, 2, 1, 0, 2, 2, 1 };
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
     Word16 tmp;
     Word16 tmp1, tmp2, exp2, scale, exp3;
     SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
     HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     /*------------------------------------------------------------------*
@@ -685,6 +693,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
     ELSE
     {
         *pFV++ = round_fx( L_tmp );
+        move16();
     }
 
     /* [1] voicing Q15 */
@@ -700,11 +709,8 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
         L_tmp = L_mult( st_fx->voicing_fx[0], 10923 );
         L_tmp = L_mac( L_tmp, st_fx->voicing_fx[1], 10923 );
         L_tmp = L_mac( L_tmp, st_fx->voicing_fx[2], 10923 );
-#ifdef BASOP_NOGLOB
         *pFV++ = round_fx_sat( L_tmp );
-#else
-        *pFV++ = round_fx( L_tmp );
-#endif
+        move16();
     }
 
     /* [2,3,4,5,6] LSFs Q15*/
@@ -727,11 +733,13 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
 
     /* [7] cor_map_sum Q8 */
     *pFV++ = round_fx( L_mac( L_mult( cor_map_sum, 16384 ), hSpMusClas->last_cor_map_sum_fx, 16384 ) ); /* Q8 ->Q7*/
+    move16();
     hSpMusClas->last_cor_map_sum_fx = cor_map_sum;
     move16();
 
     /* [8] non_sta Q8*/
     *pFV++ = round_fx( L_mac( L_mult( non_sta, 16384 ), hSpMusClas->last_non_sta_fx, 16384 ) ); /* Q8 -> Q7 */
+    move16();
     hSpMusClas->last_non_sta_fx = non_sta;
     move16();
 
@@ -786,18 +794,10 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
     sum_PS = L_deposit_l( 0 );
     FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
     {
-#ifdef BASOP_NOGLOB
         sum_PS = L_add_o( sum_PS, PS[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-        sum_PS = L_add( sum_PS, PS[i] );
-#endif /* BASOP_NOGLOB */
     }
     exp1 = norm_l( sum_PS );
-#ifdef BASOP_NOGLOB
     tmp1 = round_fx_o( L_shl( sum_PS, exp1 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    tmp1 = round_fx( L_shl( sum_PS, exp1 ) );
-#endif /* BASOP_NOGLOB */
     exp1 = sub( 30, exp1 );
 
     FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
@@ -805,11 +805,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
         /*PS_norm[i] = PS[i] / sum_PS;*/
         /*dPS[i] = (float)fabs(PS_norm[i] - st->past_PS[i]);*/
         exp2 = norm_l( PS[i] );
-#ifdef BASOP_NOGLOB
         tmp2 = round_fx_o( L_shl( PS[i], exp2 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        tmp2 = round_fx( L_shl( PS[i], exp2 ) );
-#endif /* BASOP_NOGLOB */
         exp2 = sub( 30, exp2 );
 
         scale = shr( sub( tmp1, tmp2 ), 15 );
@@ -860,16 +856,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
     FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
     {
         /*mx = PS_norm[i] > st->past_PS[i] ? PS_norm[i] : st->past_PS[i];*/
-        IF( GT_32( PS_norm[i], hSpMusClas->past_PS_fx[i - LOWEST_FBIN] ) )
-        {
-            mx = PS_norm[i];
-            move16(); /*Q25 */
-        }
-        ELSE
-        {
-            mx = hSpMusClas->past_PS_fx[i - LOWEST_FBIN];
-            move16(); /*Q25 */
-        }
+        mx = L_max( PS_norm[i], hSpMusClas->past_PS_fx[i - LOWEST_FBIN] ); /*Q25 */
 
         /*ps_sta += mx / (dPS[i] + 1e-5f);*/
         IF( !dPS[i] )
@@ -879,11 +866,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
         ELSE
         {
             exp1 = norm_l( L_add( dPS[i], 336 ) );
-#ifdef BASOP_NOGLOB
             tmp1 = round_fx_o( L_shl_o( L_add( dPS[i], 336 ), exp1, &Overflow ), &Overflow );
-#else
-            tmp1 = round_fx( L_shl( L_add( dPS[i], 336 ), exp1 ) );
-#endif
             exp1 = sub( 30, exp1 );
 
             exp2 = norm_l( mx );
@@ -895,37 +878,21 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
             exp2 = sub( exp2, scale );
 
             exp3 = sub( exp1, exp2 );
-            move16();
 
             tmp = div_s( tmp2, tmp1 );            /*Q(15+exp3) */
             L_tmp = L_shl( tmp, sub( 1, exp3 ) ); /*Q16 */
-#ifdef FIX_ISSUE_1151
-#ifdef BASOP_NOGLOB
-            ps_sta = L_add_sat( ps_sta, L_tmp ); /*Q16 */
-#else
-            ps_sta = L_add( ps_sta, L_tmp ); /*Q16 */
-#endif
-#else
-            ps_sta = L_add( ps_sta, L_tmp ); /*Q16 */
-#endif
+            ps_sta = L_add_sat( ps_sta, L_tmp );  /*Q16 */
         }
     }
 
     /**pFV++ = (float)log(ps_sta + 1e-5f);*/
-#ifdef FIX_ISSUE_1151
-#ifdef BASOP_NOGLOB
     ps_sta = L_add_sat( ps_sta, 336 );
-#else
-    ps_sta = L_add( ps_sta, 336 );
-#endif
-#else
-    ps_sta = L_add( ps_sta, 336 );
-#endif
     e_tmp = norm_l( ps_sta );
     f_tmp = Log2_norm_lc( L_shl( ps_sta, e_tmp ) );
     e_tmp = sub( 30 - 16, e_tmp );
     L_tmp = Mpy_32_16( e_tmp, f_tmp, 22713 ); /* Q16 */ /* 22713 = ln(2) in Q15 */
     *pFV++ = round_fx( L_shl( L_tmp, 11 ) );            /*Q11 */
+    move16();
 
     /* update PS vector */
     Copy32( &PS_norm[LOWEST_FBIN], hSpMusClas->past_PS_fx, HIGHEST_FBIN - LOWEST_FBIN );
@@ -942,7 +909,6 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
 
 
     pFV = FV;
-    move16();
     IF( EQ_16( st_fx->bwidth, NB ) )
     {
         pSF_m = SF_8k_mult_fx;
@@ -957,11 +923,8 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
     FOR( i = 0; i < N_FEATURES; i++ )
     {
         /**pFV = pSF[0] * *pFV + pSF[1];*/
-#ifdef BASOP_NOGLOB
         *pFV = round_fx_o( L_shl_o( L_mac( pSF_a[i], *pFV, pSF_m[i] ), ishift[i], &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        *pFV = round_fx( L_shl( L_mac( pSF_a[i], *pFV, pSF_m[i] ), ishift[i] ) );
-#endif /* BASOP_NOGLOB */
+        move16();
         pFV++;
     }
 
@@ -991,11 +954,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
         FOR( p = 0; p < N_FEATURES; p++ )
         {
             /* xm[p] = FV[p] - m_speech[k*N_FEATURES+p];*/
-#ifdef BASOP_NOGLOB
             xm[p] = sub_o( FV[p], m_speech_fx[k * N_FEATURES + p], &Overflow );
-#else                 /* BASOP_NOGLOB */
-            xm[p] = sub( FV[p], m_speech_fx[k * N_FEATURES + p] );
-#endif                /* BASOP_NOGLOB */
             move16(); /*Q15 */
         }
 
@@ -1011,11 +970,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
         FOR( p = 0; p < N_FEATURES; p++ )
         {
             /*xm[p] = FV[p] - m_noise[k*N_FEATURES+p];*/
-#ifdef BASOP_NOGLOB
             xm[p] = sub_o( FV[p], m_noise_fx[k * N_FEATURES + p], &Overflow );
-#else                 /* BASOP_NOGLOB */
-            xm[p] = sub( FV[p], m_noise_fx[k * N_FEATURES + p] );
-#endif                /* BASOP_NOGLOB */
             move16(); /*Q15 */
         }
 
@@ -1030,11 +985,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
         FOR( p = 0; p < N_FEATURES; p++ )
         {
             /*xm[p] = FV[p] - m_music[k*N_FEATURES+p];*/
-#ifdef BASOP_NOGLOB
             xm[p] = sub_o( FV[p], m_music_fx[k * N_FEATURES + p], &Overflow );
-#else                 /* BASOP_NOGLOB */
-            xm[p] = sub( FV[p], m_music_fx[k * N_FEATURES + p] );
-#endif                /* BASOP_NOGLOB */
             move16(); /*Q15 */
         }
 
@@ -1048,11 +999,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
 
     /* calculate log-probability */
     /*log(0.0001)-0.5f * N_FEATURES * LOG_PI2 in Q9 */
-#ifdef BASOP_NOGLOB
     lps = extract_h( L_shl_o( L_sub( max_s, LOG_PROB_CONST ), 16 - 1, &Overflow ) ); /*Q9 */
-#else                                                                                /* BASOP_NOGLOB */
-    lps = extract_h( L_shl( L_sub( max_s, LOG_PROB_CONST ), 16 - 1 ) );                  /*Q9 */
-#endif                                                                               /* BASOP_NOGLOB */
     lps = s_max( lps, -10832 );
 
     lpm = extract_h( L_shl( L_sub( max_m, LOG_PROB_CONST ), 16 - 1 ) ); /*Q9 */
@@ -1060,11 +1007,7 @@ static Word16 sp_mus_classif_gmm_fx(                               /* o  : decis
     /*
      lpn = (float)log(pyn) - 0.5f * N_FEATURES * (float)log(2*PI);
     */
-#ifdef BASOP_NOGLOB
     lpn = extract_h( L_shl_o( L_sub( max_n, LOG_PROB_CONST ), 16 - 1, &Overflow ) ); /*Q9 */
-#else                                                                                /* BASOP_NOGLOB */
-    lpn = extract_h( L_shl( L_sub( max_n, LOG_PROB_CONST ), 16 - 1 ) );                  /*Q9 */
-#endif                                                                               /* BASOP_NOGLOB */
     lpn = s_max( lpn, -10832 );
 
     *high_lpn_flag_ptr = 0;
@@ -1365,12 +1308,7 @@ static void sp_mus_classif_2nd_fx(
     var_cor_calc_fx( st->old_corr_fx, &hSpMusClas->mold_corr_fx, hSpMusClas->var_cor_t_fx, &hSpMusClas->high_stable_cor );
 
     /* attack detection */
-    attack = attack_det_fx( inp, Qx, st->clas, st->localVAD, st->coder_type, st->total_brate
-#ifdef IVAS_CODE
-                            ,
-                            EVS_MONO, st->clas, hSpMusClas->finc_prev, &hSpMusClas->lt_finc, &hSpMusClas->last_strong_attack
-#endif
-    );
+    attack = attack_det_fx( inp, Qx, st->clas, st->localVAD, st->coder_type, st->total_brate );
 
     test();
     test();
@@ -1396,7 +1334,7 @@ static void sp_mus_classif_2nd_fx(
             move16();
 
             test();
-            IF( EQ_16( st->codec_mode, MODE1 ) && EQ_16( st->coder_type, TRANSITION ) )
+            if ( EQ_16( st->codec_mode, MODE1 ) && EQ_16( st->coder_type, TRANSITION ) )
             {
                 st->coder_type = GENERIC;
                 move16();
@@ -1410,7 +1348,7 @@ static void sp_mus_classif_2nd_fx(
                 st->sp_aud_decision2 = 0;
                 move16();
 
-                IF( EQ_16( st->codec_mode, MODE1 ) )
+                if ( EQ_16( st->codec_mode, MODE1 ) )
                 {
                     st->coder_type = TRANSITION;
                     move16();
@@ -1425,19 +1363,19 @@ static void sp_mus_classif_2nd_fx(
                     move16();
                     *attack_flag = add( attack, 1 );
                     move16();
-                    IF( EQ_16( st->codec_mode, MODE1 ) )
+                    if ( EQ_16( st->codec_mode, MODE1 ) )
                     {
                         st->coder_type = TRANSITION;
                         move16();
                     }
                 }
-                ELSE IF( GE_16( attack, ATT_SEG_LEN / 2 ) )
+                ELSE IF( GE_16( attack, ATT_SEG_LEN >> 1 ) )
                 {
                     /* do GSC coding if attack is located after the first quarter of the first subframe */
                     /* (pre-echo will be treated at the decoder side) */
                     st->sp_aud_decision2 = 1;
-                    *attack_flag = 31;
                     move16();
+                    *attack_flag = 31;
                     move16();
                 }
             }
@@ -1450,7 +1388,7 @@ static void sp_mus_classif_2nd_fx(
         /* do TC coding if attack is located in the last subframe */
         *attack_flag = add( attack, 1 );
         move16();
-        IF( EQ_16( st->codec_mode, MODE1 ) )
+        if ( EQ_16( st->codec_mode, MODE1 ) )
         {
             st->coder_type = TRANSITION;
             move16();
@@ -1490,7 +1428,7 @@ static void var_cor_calc_fx(
     *high_stable_cor = 0;
     move16();
     test();
-    IF( GT_16( *mold_corr, 26214 ) && LT_16( var_cor, 2 ) )
+    if ( GT_16( *mold_corr, 26214 ) && LT_16( var_cor, 2 ) )
     {
         *high_stable_cor = 1;
         move16();
@@ -1516,24 +1454,14 @@ static Word16 attack_det_fx(                    /* o  : attack flag
                              const Word16 localVAD,   /* i  : local VAD flag                         */
                              const Word16 coder_type, /* i  : coder type                             */
                              const Word32 total_brate /* i  : total bitrate                          */
-#ifdef IVAS_CODE
-                             ,
-                             const Word16 element_mode, /* i  : IVAS element mode                      */
-                             const Word16 clas,         /* i  : signal class                           */
-                             Word32 finc_prev[],        /* i/o: previous finc                          */
-                             Word32 *lt_finc,           /* i/o: long-term mean finc                    */
-                             Word16 *last_strong_attack /* i/o: last strong attack flag                */
-#endif
 )
 {
     Word16 i, j, tmp, tmp1, attack, exp1;
     Word32 L_tmp, etmp, etmp2, finc[ATT_NSEG];
     Word16 att_3lsub_pos;
-#ifdef IVAS_CODE
-    Word16 attack1;
-#endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     att_3lsub_pos = ATT_3LSUB_POS;
@@ -1551,11 +1479,7 @@ static Word16 attack_det_fx(                    /* o  : attack flag
 
         FOR( j = 1; j < ATT_SEG_LEN; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j], &Overflow ); /*2*Qx */
-#else                                                                                                 /* BASOP_NOGLOB */
-            L_tmp = L_mac0( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j] ); /*2*Qx */
-#endif                                                                                                /* BASOP_NOGLOB */
         }
 
         finc[i] = L_tmp;
@@ -1563,9 +1487,6 @@ static Word16 attack_det_fx(                    /* o  : attack flag
     }
 
     attack = maximum_32_fx( finc, ATT_NSEG, &etmp );
-#ifdef IVAS_CODE
-    attack1 = attack;
-#endif
     move16();
     test();
     IF( EQ_16( localVAD, 1 ) && EQ_16( coder_type, GENERIC ) )
@@ -1579,19 +1500,11 @@ static Word16 attack_det_fx(                    /* o  : attack flag
         exp1 = norm_s( att_3lsub_pos );
         tmp = div_s( shl( 1, sub( 14, exp1 ) ), att_3lsub_pos ); /*Q(29-exp1) */
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shr_o( finc[0], Qx, &Overflow ); /*Qx */
-#else                                              /* BASOP_NOGLOB */
-        L_tmp = L_shr( finc[0], Qx );                                                    /*Qx */
-#endif                                             /* BASOP_NOGLOB */
 
         FOR( i = 1; i < att_3lsub_pos; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_o( L_tmp, L_shr_o( finc[i], Qx, &Overflow ), &Overflow ); /*Qx */
-#else                                                                               /* BASOP_NOGLOB */
-            L_tmp = L_add( L_tmp, L_shr( finc[i], Qx ) );                                /*Qx */
-#endif                                                                              /* BASOP_NOGLOB */
         }
         L_tmp = Mult_32_16( L_tmp, tmp );       /*Q(14-exp1+Qx) */
         etmp = L_shl( L_tmp, sub( exp1, 14 ) ); /*Qx */
@@ -1600,18 +1513,10 @@ static Word16 attack_det_fx(                    /* o  : attack flag
         exp1 = norm_s( tmp1 );
         tmp = div_s( shl( 1, sub( 14, exp1 ) ), tmp1 ); /*Q(29-exp1) */
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shr_o( finc[attack], Qx, &Overflow ); /*Qx */
-#else                                                   /* BASOP_NOGLOB */
-        L_tmp = L_shr( finc[attack], Qx );                                               /*Qx */
-#endif                                                  /* BASOP_NOGLOB */
         FOR( i = 1; i < tmp1; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_o( L_tmp, L_shr_o( finc[i + attack], Qx, &Overflow ), &Overflow ); /*Qx */
-#else                                                                                        /* BASOP_NOGLOB */
-            L_tmp = L_add( L_tmp, L_shr( finc[i + attack], Qx ) );                       /*Qx */
-#endif                                                                                       /* BASOP_NOGLOB */
         }
         L_tmp = Mult_32_16( L_tmp, tmp );        /*Q(14-exp1+Qx) */
         etmp2 = L_shl( L_tmp, sub( exp1, 14 ) ); /*Qx */
@@ -1647,37 +1552,6 @@ static Word16 attack_det_fx(                    /* o  : attack flag
                 }
             }
         }
-#ifdef IVAS_CODE
-        test();
-        test();
-        test();
-        IF( attack == 0 && GT_16( element_mode, EVS_MONO ) && ( LT_16( clas, VOICED_TRANSITION ) || EQ_16( clas, ONSET ) ) )
-        {
-            Copy32( finc, finc_prev, attack1 );
-
-            /* compute mean energy before the attack */
-            etmp = L_shr( sum32_fx( finc_prev, ATT_NSEG ), 5 ); /*ATT_NSEG == 32*/
-
-            etmp2 = finc[attack1];
-            move32();
-            test();
-            test();
-            if ( ( LT_32( L_shl( etmp, 4 ), etmp2 ) ) || ( LT_32( L_mult0( etmp, 12 ), etmp2 ) && EQ_16( last_clas, UNVOICED_CLAS ) ) )
-            {
-                attack = attack1;
-                move16();
-            }
-            PMT( "Size of lf_finc not verified yet" )
-            test();
-            if ( GT_32( L_mult0( 20, *lt_finc ), etmp2 ) || *last_strong_attack ) /*lt_finc assumes same Q as etmp2, TBV!!!! */
-            {
-                attack = 0;
-                move16();
-            }
-        }
-        *last_strong_attack = attack;
-        move16();
-#endif
     }
     ELSE IF( attack > 0 )
     {
@@ -1694,10 +1568,6 @@ static Word16 attack_det_fx(                    /* o  : attack flag
                 BREAK;
             }
         }
-#ifdef IVAS_CODE
-        *last_strong_attack = 0;
-#endif
-        move16();
     }
 
     return attack;
@@ -1730,11 +1600,9 @@ Word16 ivas_smc_gmm_fx(
     Word16 flag_odv;
     Word32 lps_fx, lpm_fx, lpn_fx;
     Word32 ps_fx[N_SMC_MIXTURES], pm_fx[N_SMC_MIXTURES], pn_fx[N_SMC_MIXTURES];
-    Word32 lprob_fx;
-    Word16 lprob_exp = 0;
+    Word64 wprob_fx;
     Word32 fvm_fx[N_PCA_COEF];
-    Word16 fvm_exp = 0;
-    Word32 sum_PS_fx, ps_diff_fx, ps_sta_fx;
+    Word32 sum_PS_fx, ps_diff_fx;
     Word32 dlp_fx, wrelE_fx, wdrop_fx, wght_fx;
     Word32 wrise_fx;
     Word16 dlp_mean2var_fx;
@@ -1756,6 +1624,7 @@ Word16 ivas_smc_gmm_fx(
     Word32 temp32_log1, temp32_log2;
     Word16 temp16;
     Word16 dotp_exp = 0;
+    move16();
     /*------------------------------------------------------------------*
      * Initialization
      *------------------------------------------------------------------*/
@@ -1814,14 +1683,15 @@ Word16 ivas_smc_gmm_fx(
             hSpMusClas->sp_mus_state = add( hSpMusClas->sp_mus_state, 1 );
         }
 
+        test();
         IF( hSpMusClas->sp_mus_state < 0 && hSpMusClas->inact_cnt > 0 )
         {
             hSpMusClas->inact_cnt = sub( hSpMusClas->inact_cnt, 1 );
+            move16();
         }
     }
     ELSE
     {
-        test();
         test();
         IF( hSpMusClas->sp_mus_state > 0 && LT_16( hSpMusClas->sp_mus_state, HANG_LEN ) )
         {
@@ -1833,6 +1703,7 @@ Word16 ivas_smc_gmm_fx(
             hSpMusClas->inact_cnt = sub( hSpMusClas->inact_cnt, 1 );
         }
 
+        test();
         IF( hSpMusClas->sp_mus_state > 0 && LT_16( hSpMusClas->sp_mus_state, HANG_LEN ) )
         {
             hSpMusClas->sp_mus_state = -HANG_LEN;
@@ -1903,8 +1774,8 @@ Word16 ivas_smc_gmm_fx(
     ELSE
     {
         hSpMusClas->relE_attack_cnt = 0;
-        relE_attack_flag = 0;
         move16();
+        relE_attack_flag = 0;
         move16();
     }
 
@@ -1948,42 +1819,53 @@ Word16 ivas_smc_gmm_fx(
     move16();
     temp16 = lsp_new_fx[2];
     move16();
+
     temp32 = L_sub( ONE_IN_Q30, L_mult0( temp16, temp16 ) ); // Q30
     temp_sqrt = Sqrt32( temp32, &temp_exp );
     temp_acos = BASOP_util_atan2( temp_sqrt, L_deposit_h( temp16 ), temp_exp );
     *pFV_fx++ = L_shl( temp_acos, Q7 ); // Q20
+    move32();
     temp_exp = 1;
     move16();
     temp16 = lsp_new_fx[3];
     move16();
+
     temp32 = L_sub( ONE_IN_Q30, L_mult0( temp16, temp16 ) ); // Q30
     temp_sqrt = Sqrt32( temp32, &temp_exp );
     temp_acos = BASOP_util_atan2( temp_sqrt, L_deposit_h( temp16 ), temp_exp );
     *pFV_fx++ = L_shl( temp_acos, Q7 ); // Q20
+    move32();
     temp_exp = 1;
     move16();
     temp16 = lsp_new_fx[4];
     move16();
+
     temp32 = L_sub( ONE_IN_Q30, L_mult0( temp16, temp16 ) ); // Q30
     temp_sqrt = Sqrt32( temp32, &temp_exp );
     temp_acos = BASOP_util_atan2( temp_sqrt, L_deposit_h( temp16 ), temp_exp );
     *pFV_fx++ = L_shl( temp_acos, Q7 ); // Q20
+    move32();
     temp_exp = 1;
     move16();
     temp16 = lsp_new_fx[5];
     move16();
+
     temp32 = L_sub( ONE_IN_Q30, L_mult0( temp16, temp16 ) ); // Q30
     temp_sqrt = Sqrt32( temp32, &temp_exp );
     temp_acos = BASOP_util_atan2( temp_sqrt, L_deposit_h( temp16 ), temp_exp );
     *pFV_fx++ = L_shl( temp_acos, Q7 ); // Q20
+    move32();
     temp_exp = 1;
     move16();
     temp16 = lsp_new_fx[6];
     move16();
+
+
     temp32 = L_sub( ONE_IN_Q30, L_mult0( temp16, temp16 ) ); // Q30
     temp_sqrt = Sqrt32( temp32, &temp_exp );
     temp_acos = BASOP_util_atan2( temp_sqrt, L_deposit_h( temp16 ), temp_exp );
     *pFV_fx++ = L_shl( temp_acos, Q7 ); // Q20
+    move32();
     // temf = acosf( lsp_new[2] );
     /* [2,3,4,5,6] LSFs */
     /* *pFV++ = acosf( lsp_new[2] );
@@ -2002,12 +1884,10 @@ Word16 ivas_smc_gmm_fx(
 
     /* [9] epsP */
     temp32 = L_add( epsP_fx[14], L_shr( 21475, sub( 31, Q_esp ) ) );
-    move32();
     temp32_log = L_add( BASOP_Util_Log2( temp32 ), L_shl( sub( Q31, Q_esp ), Q25 ) );
     temp32_log1 = Mpy_32_32( temp32_log, 1488522239 ); /*logf(x) = log2(x)*logf(2)*/
 
     temp32 = L_add( epsP_fx[0], L_shr( 21475, sub( 31, Q_esp ) ) );
-    move32();
     temp32_log = L_add( BASOP_Util_Log2( temp32 ), L_shl( sub( Q31, Q_esp ), Q25 ) );
     temp32_log2 = Mpy_32_32( temp32_log, 1488522239 ); /*logf(x) = log2(x)*logf(2)*/
 
@@ -2019,7 +1899,6 @@ Word16 ivas_smc_gmm_fx(
     set_zero_fx( melS_fx, NB_MEL_BANDS );
 
     pt_mel_fb_fx = mel_fb_fx;
-    move32();
 
     FOR( i = 0; i < NB_MEL_BANDS; i++ )
     {
@@ -2043,18 +1922,23 @@ Word16 ivas_smc_gmm_fx(
     }
 
     Word16 guard_bits = find_guarded_bits_fx( NB_MEL_BANDS );
+    move16();
     v_mult_mat_fixed( mfcc_fx, melS_fx, dct_mtx_fx, NB_MEL_BANDS, NB_MEL_COEF, guard_bits ); // Q19
     *pFV_fx++ = L_shl( mfcc_fx[2], 1 );                                                      // Q20
+    move32();
     *pFV_fx++ = L_shl( mfcc_fx[6], 1 );
+    move32();
     *pFV_fx++ = L_shl( mfcc_fx[12], 1 );
+    move32();
     /* *pFV++ = mfcc[2];
      *pFV++ = mfcc[6];
      *pFV++ = mfcc[12];*/
 
     /* calculation of differential normalized power spectrum */
     sum_PS_fx = 0;
-    Word16 sum_PS_e = 0;
     move32();
+    Word16 q_temp32;
+    Word16 sum_PS_e = 0;
     move16();
     Word64 sum = W_shl( 21475 /* 1e-5 in Q31 */, sub( Qfact_PS, 30 ) ); // Qfact_PS+1
     move64();
@@ -2078,8 +1962,22 @@ Word16 ivas_smc_gmm_fx(
 
     FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
     {
-        temp32 = BASOP_Util_Divide3232_Scale_cadence( PS_fx[i], sum_PS_fx, &temp_exp );                                          // 31-temp_exp
-        PS_norm_fx[i] = L_shl( temp32, sub( Qfact_PS_past, add( sub( 31, temp_exp ), sub( Qfact_PS, sub( 31, sum_PS_e ) ) ) ) ); // Qfact_PS_past
+        temp32 = BASOP_Util_Divide3232_Scale_newton( PS_fx[i], sum_PS_fx, &temp_exp ); // 31-temp_exp
+        q_temp32 = add( sub( 31, temp_exp ), sub( Qfact_PS, sub( 31, sum_PS_e ) ) );
+        test();
+        if ( temp32 == 0 )
+        {
+            q_temp32 = 31;
+            move16();
+        }
+        IF( LT_16( q_temp32, 31 ) && EQ_32( temp32, L_shl( 1, q_temp32 ) ) )
+        {
+            temp32 = ONE_IN_Q31;
+            move32();
+            q_temp32 = Q31;
+            move16();
+        }
+        PS_norm_fx[i] = L_shl( temp32, sub( Qfact_PS_past, q_temp32 ) ); // Qfact_PS_past
         move32();
         dPS_fx[i] = L_abs( L_sub( PS_norm_fx[i], hSpMusClas->past_PS_fx[i - LOWEST_FBIN] ) );
         move32();
@@ -2097,26 +1995,21 @@ Word16 ivas_smc_gmm_fx(
     move32();
 
     /* [14] ps_sta (spectral stationarity) */
-    ps_sta_fx = 0;
+    Word32 ps_sta_fx = 0;
     move32();
     Word16 ps_sta_exp = 0;
     move16();
+    Word32 avoid_divide_by_zero;
+    avoid_divide_by_zero = L_shr( 21475, sub( 31, Qfact_PS_past ) ); // 21475 = 1e-5 in Q31
+
     FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
     {
-        IF( GT_32( PS_norm_fx[i], hSpMusClas->past_PS_fx[i - LOWEST_FBIN] ) )
-        {
-            temp32 = BASOP_Util_Divide3232_Scale_cadence( PS_norm_fx[i], ( L_add( dPS_fx[i], L_shr( 21475, sub( 31, Qfact_PS_past ) ) ) ), &temp_exp ); // 31-temp_exp
-            ps_sta_fx = BASOP_Util_Add_Mant32Exp( temp32, temp_exp, ps_sta_fx, ps_sta_exp, &ps_sta_exp );
-        }
-        ELSE
-        {
-            // ps_sta += hSpMusClas->past_PS[i - LOWEST_FBIN] / ( dPS[i] + 1e-5f );
-            temp32 = BASOP_Util_Divide3232_Scale_cadence( hSpMusClas->past_PS_fx[i - LOWEST_FBIN], ( L_add( dPS_fx[i], L_shr( 21475, sub( 31, Qfact_PS_past ) ) ) ), &temp_exp ); // 31-temp_exp
-            move32();
-            ps_sta_fx = BASOP_Util_Add_Mant32Exp( temp32, temp_exp, ps_sta_fx, ps_sta_exp, &ps_sta_exp );
-        }
+        Word32 tmp_max;
+        tmp_max = L_max( PS_norm_fx[i], hSpMusClas->past_PS_fx[i - LOWEST_FBIN] );
+        /* Saturation doesn't have a significant impact here, as a value of 1e-5 in Q31 format is added to prevent division by zero */
+        temp32 = BASOP_Util_Divide3232_Scale_newton( tmp_max, L_add_sat( dPS_fx[i], avoid_divide_by_zero ), &temp_exp ); // 31-temp_exp
+        ps_sta_fx = BASOP_Util_Add_Mant32Exp( temp32, temp_exp, ps_sta_fx, ps_sta_exp, &ps_sta_exp );
     }
-    // temp32_log = L_add( BASOP_Util_Log2( L_add( ps_sta_fx, L_shr( 21475, ps_sta_exp ) ) ), L_shl( ps_sta_exp, Q25 ) );
     temp32_log = L_add( BASOP_Util_Log2( L_add_sat( ps_sta_fx, L_shr( 21475, ps_sta_exp ) ) ), L_shl( ps_sta_exp, Q25 ) );
     temp32_log = Mpy_32_32( temp32_log, 1488522239 ); /*logf(x) = log2(x)*logf(2)*/
     *pFV_fx++ = L_shr( temp32_log, Q5 );              // logf( ps_sta + 1e-5f );
@@ -2141,8 +2034,8 @@ Word16 ivas_smc_gmm_fx(
             hStereoClassif->ps_sta_ch2_e = 6;           // logf( ps_sta + 1e-5f );Q25
         }
         move32();
-        move32();
         move16();
+        move32();
         move16();
     }
 
@@ -2160,6 +2053,7 @@ Word16 ivas_smc_gmm_fx(
         move16();
         FOR( i = 0; i < N_SMC_FEATURES; i++ )
         {
+            test();
             IF( LT_32( *pFV_fx, pODV_fx[0] ) || GT_32( *pFV_fx, pODV_fx[1] ) )
             {
                 *p_out++ = i;
@@ -2197,6 +2091,8 @@ Word16 ivas_smc_gmm_fx(
     {
         //*pFV_st = smc_st_mean_fact * ( *pFV_st ) + ( 1 - smc_st_mean_fact ) * ( *pFV );
         *pFV_st_fx = L_add( L_shr( *pFV_st_fx, smc_st_mean_fact_fx ), L_shr( *pFV_fx, 1 ) );
+        move32();
+
         test();
         test();
         test();
@@ -2218,6 +2114,7 @@ Word16 ivas_smc_gmm_fx(
         ELSE
         {
             *pFV_fx++ = *pFV_st_fx++;
+            move32();
         }
     }
 
@@ -2232,15 +2129,17 @@ Word16 ivas_smc_gmm_fx(
         IF( bcox_lmbd_fx[i] != 0 )
         {
             *pFV_fx = L_sub( *pFV_fx, L_shr( bcox_add_cnst_fx[i], sub( 31, Qfact_FV ) ) );
+            move32();
             IF( LT_32( *pFV_fx, L_shl( 1, Qfact_FV ) ) )
             {
                 *pFV_fx = L_shl( 1, Qfact_FV );
+                move32();
             }
             Word16 pow_e = 0;
             move32();
             temp32_log = L_add( BASOP_Util_Log2( *pFV_fx ), L_shl( sub( 31, Qfact_FV ), Q25 ) ); // Q25
             temp32 = Mpy_32_32( temp32_log, bcox_lmbd_fx[i] );                                   // Q25
-            Word32 pow_temp = BASOP_util_Pow2( temp32, sub( 31, Q25 ), &pow_e );
+            Word32 pow_temp = BASOP_util_Pow2( temp32, 31 - Q25, &pow_e );
             IF( pow_e <= 0 )
             {
                 pow_temp = L_shr( pow_temp, sub( 1, pow_e ) );
@@ -2251,6 +2150,7 @@ Word16 ivas_smc_gmm_fx(
             move32();
             temp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( temp32, bcox_lmbd_fx[i], &temp_exp ) );
             *pFV_fx = L_shl( temp32, sub( Qfact_FV, sub( 31, add( temp_exp, pow_e ) ) ) );
+            move32();
             // float temp = powf( *pFV, bcox_lmbd[i] );
             // *pFV = ( powf( *pFV, bcox_lmbd[i] ) - 1 ) / bcox_lmbd[i];
         }
@@ -2270,15 +2170,22 @@ Word16 ivas_smc_gmm_fx(
         // *pFV = ( *pFV - sm_means[i] ) / sm_scale[i];
         temp32 = L_sub( *pFV_fx, sm_means_fx[i] );
         temp_exp = 0;
+        move16();
         temp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( temp32, sm_scale_fx[i], &temp_exp ) );
-        *pFV_fx = L_shl( temp32, Qfact_FV - ( 31 - temp_exp ) );
+        // *pFV_fx = L_shl( temp32, Qfact_FV - ( 31 - temp_exp ) );
+        *pFV_fx = L_shl( temp32, sub( Qfact_FV, sub( 31, temp_exp ) ) );
+        move32();
         pFV_fx++;
         /* MinMax sclaer - mean and variance normalization */
         /**pFV = *pFV * sm_scale[i] + sm_min[i];*/
     }
 
     /* PCA */
+#ifdef VEC_ARITH_OPT_v1
+    v_sub_fixed_no_hdrm( FV_fx, pca_mean_fx, FV_fx, N_SMC_FEATURES );
+#else  /* VEC_ARITH_OPT_v1 */
     v_sub_fixed( FV_fx, pca_mean_fx, FV_fx, N_SMC_FEATURES, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
     v_mult_mat_fixed( FV_fx, FV_fx, pca_components_fx, N_SMC_FEATURES, N_PCA_COEF, 0 );
     /*------------------------------------------------------------------*
      * Calculation of posterior probability
@@ -2294,29 +2201,22 @@ Word16 ivas_smc_gmm_fx(
     FOR( m = 0; m < N_SMC_MIXTURES; m++ )
     {
         v_sub32_fx( FV_fx, &means_speech_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );
-        fvm_exp = sub( 31, Qfact_FV );
-        lprob_exp = 0;
-        move16();
-        lprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_speech_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF, fvm_exp, 31 - 28, &lprob_exp );
-        ps_fx[m] = L_sub( L_sub( L_add( log_weights_speech_compute[m], log_det_chol_speech_fx[m] ), L_shl( lprob_fx, sub( Q18 - 1, sub( Q31, lprob_exp ) ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
+        wprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_speech_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );                                // Q10
+        ps_fx[m] = L_sub( L_sub( L_add( log_weights_speech_compute[m], log_det_chol_speech_fx[m] ), W_extract_l( W_shr( wprob_fx, Q10 ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
         move32();
         v_sub32_fx( FV_fx, &means_music_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );
-        lprob_exp = 0;
-        move16();
-        lprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_music_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF, fvm_exp, 31 - 28, &lprob_exp );
-        pm_fx[m] = L_sub( L_sub( L_add( log_weights_music_compute[m], log_det_chol_music_fx[m] ), L_shl( lprob_fx, sub( Q18 - 1, sub( Q31, lprob_exp ) ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
+        wprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_music_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );                               // Q10
+        pm_fx[m] = L_sub( L_sub( L_add( log_weights_music_compute[m], log_det_chol_music_fx[m] ), W_extract_l( W_shr( wprob_fx, Q10 ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
         move32();
         v_sub32_fx( FV_fx, &means_noise_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );
-        lprob_exp = 0;
-        move16();
-        lprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_noise_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF, fvm_exp, 31 - 28, &lprob_exp );
-        pn_fx[m] = L_sub( L_sub( L_add( log_weights_noise_compute[m], log_det_chol_noise_fx[m] ), L_shl( lprob_fx, sub( Q18 - 1, sub( Q31, lprob_exp ) ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
+        wprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_noise_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );                               // Q10
+        pn_fx[m] = L_sub( L_sub( L_add( log_weights_noise_compute[m], log_det_chol_noise_fx[m] ), W_extract_l( W_shr( wprob_fx, Q10 ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
         move32();
     }
 
-    lps_fx = logsumexp_fx( ps_fx, sub( 31, Q18 ), N_SMC_MIXTURES );
-    lpm_fx = logsumexp_fx( pm_fx, sub( 31, Q18 ), N_SMC_MIXTURES );
-    lpn_fx = logsumexp_fx( pn_fx, sub( 31, Q18 ), N_SMC_MIXTURES );
+    lps_fx = logsumexp_fx( ps_fx, 31 - Q18, N_SMC_MIXTURES );
+    lpm_fx = logsumexp_fx( pm_fx, 31 - Q18, N_SMC_MIXTURES );
+    lpn_fx = logsumexp_fx( pn_fx, 31 - Q18, N_SMC_MIXTURES );
     *high_lpn_flag = 0;
     move16();
     if ( GT_32( lpn_fx, lps_fx ) && GT_32( lpn_fx, lpm_fx ) )
@@ -2324,14 +2224,12 @@ Word16 ivas_smc_gmm_fx(
         *high_lpn_flag = 1;
         move32();
     }
-
-    hSpMusClas->lpm_fx = extract_l( L_shr( lpm_fx, 11 ) ); // Q7
-    hSpMusClas->lps_fx = extract_l( L_shr( lps_fx, 11 ) ); // Q7
-    hSpMusClas->lpn_fx = extract_l( L_shr( lpn_fx, 11 ) ); // Q7
+    hSpMusClas->lpm_fx = extract_h( L_shl_sat( lpm_fx, 16 - 11 ) ); // Q7
     move16();
+    hSpMusClas->lps_fx = extract_h( L_shl_sat( lps_fx, 16 - 11 ) ); // Q7
     move16();
+    hSpMusClas->lpn_fx = extract_h( L_shl_sat( lpn_fx, 16 - 11 ) ); // Q7
     move16();
-
     /* determine HQ Generic speech class */
     IF( st->hHQ_core != NULL )
     {
@@ -2378,6 +2276,7 @@ Word16 ivas_smc_gmm_fx(
     }
 
     dec = (Word16) GT_32( dlp_fx, 0 );
+    move16();
     /* calculate weight based on relE (higher relE -> lower weight, lower relE -> higher weight) */
 
     wrelE_fx = lin_interp32_fx( L_deposit_h( relE_fx ), 15 << 24, 1932735283 /*0.9 in Q31*/, -( 15 << 24 ), 2126008812 /*0.99 in Q31*/, 1 ); // Q31
@@ -2390,23 +2289,27 @@ Word16 ivas_smc_gmm_fx(
     {
         IF( hSpMusClas->dlp_mean_ST_fx > 0 )
         {
-            hSpMusClas->wdrop_fx = -extract_l( L_shr( dlp_fx, 10 ) ); // Q9
+            hSpMusClas->wdrop_32fx = L_negate( dlp_fx ); // Q19
+            move32();
         }
-        ELSE IF( hSpMusClas->wdrop_fx > 0 )
+        ELSE IF( hSpMusClas->wdrop_32fx > 0 )
         {
-            hSpMusClas->wdrop_fx = extract_l( L_shr( L_sub( hSpMusClas->dlp_mean_ST_fx, dlp_fx ), 10 ) );
+            hSpMusClas->wdrop_32fx = L_add( hSpMusClas->wdrop_32fx, L_sub( hSpMusClas->dlp_mean_ST_fx, dlp_fx ) );
+            move32();
         }
+        move16();
     }
     ELSE
     {
-        hSpMusClas->wdrop_fx = 0;
-        move16();
+        hSpMusClas->wdrop_32fx = 0;
+        move32();
     }
-    wdrop_fx = lin_interp32_fx( L_deposit_h( hSpMusClas->wdrop_fx ), 503316480, 1503238554 /* 0.7 in Q31 */, 0, ONE_IN_Q31 /* 1.0f in Q31 */, 1 ); /* Q31 */
+    wdrop_fx = lin_interp32_fx( hSpMusClas->wdrop_32fx, 7864320, 1503238554 /* 0.7 in Q31 */, 0, ONE_IN_Q31 /* 1.0f in Q31 */, 1 ); /* Q31 */
+
     test();
     test();
     /* calculate weight based on rises of dlp (close to 1 during sudden rise of dlp, close to 0 otherwise) */
-    IF( EQ_16( hSpMusClas->sp_mus_state, HANG_LEN ) && hSpMusClas->dlp_mean_ST_fx > 0 && hSpMusClas->dlp_mean_ST_fx > hSpMusClas->past_dlp_mean_ST_fx[0] )
+    IF( EQ_16( hSpMusClas->sp_mus_state, HANG_LEN ) && hSpMusClas->dlp_mean_ST_fx > 0 && GT_32( hSpMusClas->dlp_mean_ST_fx, hSpMusClas->past_dlp_mean_ST_fx[0] ) )
     {
         IF( hSpMusClas->past_dlp_mean_ST_fx[0] < 0 )
         {
@@ -2416,6 +2319,7 @@ Word16 ivas_smc_gmm_fx(
         {
             hSpMusClas->wrise_fx = add( hSpMusClas->wrise_fx, extract_l( L_shr( L_sub( hSpMusClas->dlp_mean_ST_fx, hSpMusClas->past_dlp_mean_ST_fx[0] ), 10 ) ) );
         }
+        move16();
     }
     ELSE
     {
@@ -2434,8 +2338,8 @@ Word16 ivas_smc_gmm_fx(
     {
 
         hSpMusClas->dlp_mean_LT_fx = dlp_fx;
-        hSpMusClas->dlp_var_LT_fx = 0;
         move32();
+        hSpMusClas->dlp_var_LT_fx = 0;
         move32();
     }
 
@@ -2446,11 +2350,11 @@ Word16 ivas_smc_gmm_fx(
     hSpMusClas->dlp_var_LT_fx = L_add( Mpy_32_32( 1932735283, hSpMusClas->dlp_var_LT_fx ), Mpy_32_32( 214748365, temp32 ) );
 
     test();
-    IF( hSpMusClas->sp_mus_state > 0 && hSpMusClas->sp_mus_state < HANG_LEN )
+    IF( hSpMusClas->sp_mus_state > 0 && LT_16( hSpMusClas->sp_mus_state, HANG_LEN ) )
     {
         dlp_mean2var_fx = 0;
-        dlp_mean2var_q = 0;
         move16();
+        dlp_mean2var_q = 0;
         move16();
     }
     ELSE
@@ -2522,6 +2426,7 @@ Word16 ivas_smc_gmm_fx(
     ELSE IF( hSpMusClas->flag_spitch_cnt > 0 )
     {
         hSpMusClas->flag_spitch_cnt = sub( hSpMusClas->flag_spitch_cnt, 1 );
+        move16();
     }
     test();
     IF( Etot_fx < 2560 )
@@ -2534,7 +2439,6 @@ Word16 ivas_smc_gmm_fx(
     {
         temp32 = L_mult( w_spmus_fx[hSpMusClas->sp_mus_state - 1][0], (Word16) L_shr( dlp_fx, 10 ) ); /*Q25 */
         temp32 = L_add( temp32, Dot_product( &w_spmus_fx[hSpMusClas->sp_mus_state - 1][1], hSpMusClas->past_dlp_fx, sub( HANG_LEN, 1 ) ) );
-        move16();
         /* entry state -> final decision is calculated based on weighted average of past non-binary decisions */
         IF( GT_32( temp32, 2 << 25 ) )
         {
@@ -2672,7 +2576,7 @@ static void var_cor_calc_ivas_fx(
     *high_stable_cor = 0;
     move16();
     test();
-    IF( GT_16( *mold_corr, 26214 ) && LT_16( var_cor, 1 ) )
+    if ( GT_16( *mold_corr, 26214 ) && LT_16( var_cor, 1 ) )
     {
         *high_stable_cor = 1;
         move16();
@@ -2701,8 +2605,10 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
                                   const Word32 total_brate,  /* i  : total bitrate                          */
                                   const Word16 element_mode, /* i  : IVAS element mode                      */
                                   const Word16 clas,         /* i  : signal class                           */
-                                  Word32 finc_prev[],        /* i/o: previous finc, (2 * Qx)                */
-                                  Word32 *lt_finc,           /* i/o: long-term mean finc, (2 * Qx)          */
+                                  Word32 finc_prev[],        /* i/o: previous finc, (q_finc_prev)           */
+                                  Word16 *q_finc_prev,       /* i/o: Q of previous finc                     */
+                                  Word32 *lt_finc,           /* i/o: long-term mean finc, (q_lt_finc)       */
+                                  Word16 *q_lt_finc,         /* i/o: Q of lt_finc                           */
                                   Word16 *last_strong_attack /* i/o: last strong attack flag                */
 )
 {
@@ -2710,8 +2616,8 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
     Word32 L_tmp, etmp, etmp2, finc[ATT_NSEG], mean_finc;
     Word16 att_3lsub_pos;
     Word16 attack1;
-    Word64 W_tmp = 0;
-    move64();
+    Word64 W_tmp;
+    Word16 q_diff;
 
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
@@ -2733,11 +2639,7 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
 
         FOR( j = 1; j < ATT_SEG_LEN; j++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_mac0_o( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j], &Overflow ); /*2*Qx */
-#else                                                                                                 /* BASOP_NOGLOB */
-            L_tmp = L_mac0( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j] ); /*2*Qx */
-#endif                                                                                                /* BASOP_NOGLOB */
         }
 
         finc[i] = L_tmp;
@@ -2748,6 +2650,9 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
     attack1 = attack;
     move16();
 
+    *q_finc_prev = shl( Qx, 1 ); // Q of finc
+    move16();
+    q_diff = sub( *q_finc_prev, *q_lt_finc );
     test();
     IF( EQ_16( localVAD, 1 ) && EQ_16( coder_type, GENERIC ) )
     {
@@ -2760,19 +2665,11 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
         exp1 = norm_s( att_3lsub_pos );
         tmp = div_s( shl( 1, sub( 14, exp1 ) ), att_3lsub_pos ); /*Q(29-exp1) */
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shr_o( finc[0], Qx, &Overflow ); /*Qx */
-#else                                              /* BASOP_NOGLOB */
-        L_tmp = L_shr( finc[0], Qx );                                                    /*Qx */
-#endif                                             /* BASOP_NOGLOB */
 
         FOR( i = 1; i < att_3lsub_pos; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_o( L_tmp, L_shr_o( finc[i], Qx, &Overflow ), &Overflow ); /*Qx */
-#else                                                                               /* BASOP_NOGLOB */
-            L_tmp = L_add( L_tmp, L_shr( finc[i], Qx ) );                                /*Qx */
-#endif                                                                              /* BASOP_NOGLOB */
         }
         L_tmp = Mult_32_16( L_tmp, tmp );       /*Q(14-exp1+Qx) */
         etmp = L_shl( L_tmp, sub( exp1, 14 ) ); /*Qx */
@@ -2781,18 +2678,10 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
         exp1 = norm_s( tmp1 );
         tmp = div_s( shl( 1, sub( 14, exp1 ) ), tmp1 ); /*Q(29-exp1) */
 
-#ifdef BASOP_NOGLOB
         L_tmp = L_shr_o( finc[attack], Qx, &Overflow ); /*Qx */
-#else                                                   /* BASOP_NOGLOB */
-        L_tmp = L_shr( finc[attack], Qx );                                               /*Qx */
-#endif                                                  /* BASOP_NOGLOB */
         FOR( i = 1; i < tmp1; i++ )
         {
-#ifdef BASOP_NOGLOB
             L_tmp = L_add_o( L_tmp, L_shr_o( finc[i + attack], Qx, &Overflow ), &Overflow ); /*Qx */
-#else                                                                                        /* BASOP_NOGLOB */
-            L_tmp = L_add( L_tmp, L_shr( finc[i + attack], Qx ) );                       /*Qx */
-#endif                                                                                       /* BASOP_NOGLOB */
         }
         L_tmp = Mult_32_16( L_tmp, tmp );        /*Q(14-exp1+Qx) */
         etmp2 = L_shl( L_tmp, sub( exp1, 14 ) ); /*Qx */
@@ -2854,7 +2743,7 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
                 move16();
             }
             test();
-            if ( GT_32( *lt_finc, Mpy_32_32( etmp2, 107374182 /* 1.f/20 in Q31 */ ) ) || *last_strong_attack )
+            if ( GT_32( L_shl_sat( *lt_finc, q_diff ), Mpy_32_32( etmp2, 107374182 /* 1.f/20 in Q31 */ ) ) || *last_strong_attack )
             {
                 attack = 0;
                 move16();
@@ -2886,15 +2775,29 @@ static Word16 attack_det_ivas_fx(                    /* o  : attack flag
     Copy32( finc, finc_prev, ATT_NSEG );
 
     /* Calculating mean of finc */
-    FOR( i = 0; i < ATT_NSEG; i++ )
+    W_tmp = W_mult_32_16( finc[0], 1 ); // q_finc_prev+1
+    FOR( i = 1; i < ATT_NSEG; i++ )
     {
-        W_tmp = W_add( W_tmp, (Word64) finc[i] );
+        W_tmp = W_mac_32_16( W_tmp, finc[i], 1 ); // q_finc_prev+1
     }
-    mean_finc = W_extract_l( W_shr( W_tmp, 5 ) );
+    /* mean = W_tmp / 32 and change the Q from q_finc_prev+1 to q_finc_prev
+       Mean value doesn't saturate, W_shl_sat_l is used only considering complexity */
+    mean_finc = W_shl_sat_l( W_tmp, -Q6 ); // q_finc_prev+1 -> q_finc_prev
 
     //*lt_finc = 0.95f * *lt_finc + 0.05f * mean( finc, ATT_NSEG );
-    *lt_finc = L_add( Mpy_32_32( *lt_finc, 2040109466 /* 0.95 in Q31 */ ), Mpy_32_32( mean_finc, 107374182 /* 0.05f in Q31 */ ) );
-    move32();
+    IF( q_diff > 0 ) /* q_finc_prev > q_lt_finc */
+    {
+        mean_finc = L_shr( mean_finc, q_diff );                                                                                // q_lt_finc
+        *lt_finc = Madd_32_32( Mpy_32_32( *lt_finc, 2040109466 /* 0.95 in Q31 */ ), mean_finc, 107374182 /* 0.05f in Q31 */ ); // q_lt_finc
+        move32();
+    }
+    ELSE
+    {
+        *lt_finc = Madd_32_32( Mpy_32_32( L_shl( *lt_finc, q_diff ), 2040109466 /* 0.95 in Q31 */ ), mean_finc, 107374182 /* 0.05f in Q31 */ ); // q_finc_prev
+        move32();
+        *q_lt_finc = *q_finc_prev;
+        move16();
+    }
 
     return attack;
 }
@@ -2951,43 +2854,41 @@ static Word32 tonal_det_fx(
     IF( GT_32( S_mass, *tod_S_mass_prev ) )
     {
         alpha = 1503238554; /* 0.7f in Q31 */
-        move16();
     }
     ELSE
     {
         alpha = 644245094; /* 0.3f in Q31 */
-        move16();
     }
+    move16();
+
     *tod_S_mass_prev = S_mass;
+    move32();
     *tod_S_mass_lt = L_add( Mpy_32_32( alpha, *tod_S_mass_lt ), Mpy_32_32( L_sub( ONE_IN_Q31, alpha ), S_mass ) ); // Q22
+    move32();
     S_mass = *tod_S_mass_lt;
-    move16();
-    move16();
-    move16();
+    move32();
 
     /* updating adaptive decision threshold */
     IF( GT_32( S_mass, *tod_thr_lt ) )
     {
         *tod_thr_lt = L_sub( *tod_thr_lt, THR_MASS_STEP_DN_FX );
-        move16();
     }
     ELSE
     {
         *tod_thr_lt = L_add( *tod_thr_lt, THR_MASS_STEP_UP_FX );
-        move16();
     }
+    move16();
 
     if ( GT_32( *tod_thr_lt, THR_MASS_MAX_FX ) )
     {
         *tod_thr_lt = THR_MASS_MAX_FX;
-        move16();
     }
 
     if ( LT_32( *tod_thr_lt, THR_MASS_MIN_FX ) )
     {
         *tod_thr_lt = THR_MASS_MIN_FX;
-        move16();
     }
+    move16();
 
     return S_mass; /* Q22 */
 }
@@ -3020,15 +2921,15 @@ void ivas_smc_mode_selection_fx(
     Word32 ton;
     Word16 i;
     Word32 S_p2a, S_max, S_ave = 0;
-    Word32 thr_sp2a;
     move32();
+    Word32 thr_sp2a;
 
     SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas;
 
     /* initialization */
     *attack_flag = 0;
-    st->sp_aud_decision2 = 0;
     move16();
+    st->sp_aud_decision2 = 0;
     move16();
 
     /* signal stability estimation */
@@ -3038,24 +2939,24 @@ void ivas_smc_mode_selection_fx(
     var_cor_calc_ivas_fx( st->old_corr_fx, &hSpMusClas->mold_corr_fx, hSpMusClas->var_cor_t_fx, &hSpMusClas->high_stable_cor );
 
     /* attack detection */
-    IF( NE_16( shl( Q_new, 1 ), hSpMusClas->Q_lt_finc ) )
+    IF( NE_16( shl( Q_new, 1 ), hSpMusClas->q_finc_prev ) )
     {
-        Scale_sig32( &hSpMusClas->lt_finc_fx, 1, sub( shl( Q_new, 1 ), hSpMusClas->Q_lt_finc ) );
-        Scale_sig32( hSpMusClas->finc_prev_fx, ATT_NSEG, sub( shl( Q_new, 1 ), hSpMusClas->Q_lt_finc ) );
-        hSpMusClas->Q_lt_finc = shl( Q_new, 1 );
+        Scale_sig32( hSpMusClas->finc_prev_fx, ATT_NSEG, sub( shl( Q_new, 1 ), hSpMusClas->q_finc_prev ) );
+        hSpMusClas->q_finc_prev = shl( Q_new, 1 );
         move16();
     }
-    attack = attack_det_ivas_fx( inp, Q_new, st->clas, st->localVAD, st->coder_type, 0, st->element_mode, st->clas, hSpMusClas->finc_prev_fx, &hSpMusClas->lt_finc_fx, &hSpMusClas->last_strong_attack );
+    attack = attack_det_ivas_fx( inp, Q_new, st->clas, st->localVAD, st->coder_type, 0, st->element_mode, st->clas, hSpMusClas->finc_prev_fx,
+                                 &hSpMusClas->q_finc_prev, &hSpMusClas->lt_finc_fx, &hSpMusClas->Q_lt_finc, &hSpMusClas->last_strong_attack );
 
     /* tonal detector */
     ton = tonal_det_fx( S_map, st->vad_flag, hSpMusClas->tod_S_map_lt_fx, &hSpMusClas->tod_thr_lt_fx, &hSpMusClas->tod_weight_fx, &hSpMusClas->tod_S_mass_prev_fx, &hSpMusClas->tod_S_mass_lt_fx ); // Q22
 
     /* calculate spectral peak-to-average ratio */
-    Word16 shift = sub( add( Q_new, Q_SCALE - 2 ), st->hSpMusClas->Q_tod_lt_Bin_E );
+    Word16 shift = sub( st->q_Bin_E, st->hSpMusClas->Q_tod_lt_Bin_E );
     FOR( i = 0; i < TOD_NSPEC; i++ )
     {
         // st->hSpMusClas->tod_lt_Bin_E[i] = P2A_FACT * st->hSpMusClas->tod_lt_Bin_E[i] + ( 1 - P2A_FACT ) * st->Bin_E[i];
-        st->hSpMusClas->tod_lt_Bin_E_fx[i] = Madd_32_16( L_shl( Mpy_32_16_1( st->hSpMusClas->tod_lt_Bin_E_fx[i], P2A_FACT_FX_Q15 ), shift ), st->Bin_E_fx[i], ( 32767 - P2A_FACT_FX_Q15 ) ); // Q = Q_new + Q_SCALE - 2
+        st->hSpMusClas->tod_lt_Bin_E_fx[i] = Madd_32_16( L_shl( Mpy_32_16_1( st->hSpMusClas->tod_lt_Bin_E_fx[i], P2A_FACT_FX_Q15 ), shift ), st->Bin_E_fx[i], ( 32767 - P2A_FACT_FX_Q15 ) ); // Q = st->q_Bin_E + Q_SCALE - 2
         move32();
     }
     st->hSpMusClas->Q_tod_lt_Bin_E = add( st->hSpMusClas->Q_tod_lt_Bin_E, shift );
@@ -3072,11 +2973,11 @@ void ivas_smc_mode_selection_fx(
 
     IF( LE_32( element_brate, IVAS_16k4 ) )
     {
-        thr_sp2a = L_shl( THR_P2A_HIGH_FX, add( Q_new, Q_SCALE - 2 ) ); // Q = Q_new + Q_SCALE - 2
+        thr_sp2a = L_shl( THR_P2A_HIGH_FX, st->q_Bin_E ); // Q = st->q_Bin_E
     }
     ELSE
     {
-        thr_sp2a = L_shl( THR_P2A_FX, add( Q_new, Q_SCALE - 2 ) ); // Q = Q_new + Q_SCALE - 2
+        thr_sp2a = L_shl( THR_P2A_FX, st->q_Bin_E ); // Q = st->q_Bin_E
     }
 
     /* initial 3-way selection of coding modes (ACELP/GSC/TCX) */
@@ -3087,33 +2988,27 @@ void ivas_smc_mode_selection_fx(
         /* select TCX to encode extremely peaky signals or strongly tonal signals */
         st->sp_aud_decision1 = 1;
         st->sp_aud_decision2 = 1;
-        move16();
-        move16();
     }
     ELSE IF( smc_dec == SPEECH )
     {
         /* select ACELP to encode speech */
         st->sp_aud_decision1 = 0;
         st->sp_aud_decision2 = 0;
-        move16();
-        move16();
     }
     ELSE IF( EQ_16( smc_dec, SPEECH_OR_MUSIC ) )
     {
         /* select GSC to encode "unclear" segments (classifier's score on the borderline) */
         st->sp_aud_decision1 = 1;
         st->sp_aud_decision2 = 0;
-        move16();
-        move16();
     }
     ELSE
     {
         /* select TCX to encode music */
         st->sp_aud_decision1 = 1;
         st->sp_aud_decision2 = 1;
-        move16();
-        move16();
     }
+    move16();
+    move16();
 
     /* change decision from GSC to ACELP/TCX in some special cases */
     test();
@@ -3164,8 +3059,8 @@ void ivas_smc_mode_selection_fx(
             {
                 /* do ACELP TC coding instead of GC/VC if onset has been already declared before */
                 st->sp_aud_decision1 = 0;
-                st->coder_type = TRANSITION;
                 move16();
+                st->coder_type = TRANSITION;
                 move16();
             }
             ELSE
@@ -3174,10 +3069,10 @@ void ivas_smc_mode_selection_fx(
                 {
                     /* do ACELP TC coding also if attack is located in the last subframe */
                     st->sp_aud_decision1 = 0;
-                    *attack_flag = add( attack, 1 );
-                    st->coder_type = TRANSITION;
                     move16();
+                    *attack_flag = add( attack, 1 );
                     move16();
+                    st->coder_type = TRANSITION;
                     move16();
                 }
                 ELSE IF( GE_16( attack, ATT_SEG_LEN / 2 ) )
@@ -3185,8 +3080,8 @@ void ivas_smc_mode_selection_fx(
                     /* do GSC coding if attack is located after the first quarter of the first subframe */
                     /* (pre-echo will be treated at the decoder side) */
                     *attack_flag = 31;
-                    *attack_flag = add( attack, 1 );
                     move16();
+                    *attack_flag = add( attack, 1 );
                     move16();
                 }
             }
@@ -3201,13 +3096,13 @@ void ivas_smc_mode_selection_fx(
     {
         /* change ACELP coder_type to TC if attack has been detected */
         st->sp_aud_decision1 = 0;
+        move16();
         st->sp_aud_decision2 = 0;
+        move16();
 
         st->coder_type = TRANSITION;
-        *attack_flag = add( attack, 1 );
-        move16();
-        move16();
         move16();
+        *attack_flag = add( attack, 1 );
         move16();
     }
 
@@ -3270,26 +3165,24 @@ void ivas_smc_mode_selection_fx(
         {
             /* music-like content */
             st->GSC_IVAS_mode = 3;
-            move16();
         }
         ELSE IF( st->tc_cnt > 0 )
         {
             /* likely presence of an onset, GSC bit allocation will be more focused on LF */
             st->GSC_IVAS_mode = 2;
-            move16();
         }
+        move16();
 
         test();
         IF( EQ_16( st->coder_type_raw, UNVOICED ) && st->sp_aud_decision0 == 0 /*&& st->GSC_IVAS_mode < 3*/ )
         {
             st->GSC_noisy_speech = 1;
-            move16();
         }
         ELSE
         {
             st->GSC_noisy_speech = 0;
-            move16();
         }
+        move16();
     }
 
     /* set coder_type to AUDIO when GSC is selected (st->core will be set later in the decision matrix) */
@@ -3425,6 +3318,7 @@ static Word16 mode_decision_fx(
             }
 
             inv_len = 3277; /*Q15 */
+            move16();
 
             L_tmp = L_deposit_l( 0 );
             FOR( i = 0; i < 10; i++ )
@@ -3700,11 +3594,7 @@ static void flux_fx(
     {
         IF( p2v_map[i] != 0 )
         {
-#ifdef BASOP_NOGLOB
             L_flux = L_add_sat( L_flux, abs_s( sub_sat( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */
-#else
-            L_flux = L_add( L_flux, abs_s( sub( Bin_E[i], old_Bin_E[i] ) ) );            /*Q7 */
-#endif
         }
         if ( p2v_map[i] != 0 )
         {
@@ -3778,6 +3668,7 @@ static void spec_analysis_fx(
     Word16 p2v[65];
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     /* find spectral peaks */
@@ -3861,11 +3752,8 @@ static void spec_analysis_fx(
         test();
         IF( GT_16( peak_idx[k], valey_idx[i] ) && LT_16( peak_idx[k], valey_idx[i + 1] ) )
         {
-#ifdef BASOP_NOGLOB
             p2v[k] = sub_o( shl_o( peak[k], 1, &Overflow ), add_o( valley[i], valley[i + 1], &Overflow ), &Overflow );
-#else  /* BASOP_NOGLOB */
-            p2v[k] = sub( shl( peak[k], 1 ), add( valley[i], valley[i + 1] ) );
-#endif /* BASOP_NOGLOB */
+            move16();
             k = add( k, 1 );
         }
     }
@@ -3897,6 +3785,7 @@ static void music_mixed_classif_improv_fx(
     Word16 exp, frac, expn, fracn, expd, fracd, scale;
     Word16 tmp;
     Word32 L_tmp, ftmp, ftmp1, epsP_max = MIN_32;
+    move32();
     SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas;
 
     /* find sample with maximum absolute amplitude */
@@ -3988,7 +3877,7 @@ static void music_mixed_classif_improv_fx(
                 test();
                 test();
                 test();
-                IF( LT_16( old_cor, 24576 ) && LT_16( st->voicing_fx[0], 24576 ) && LT_16( st->voicing_fx[1], 24576 ) && GT_16( hSpMusClas->old_lt_diff_fx[0], 1280 ) )
+                if ( LT_16( old_cor, 24576 ) && LT_16( st->voicing_fx[0], 24576 ) && LT_16( st->voicing_fx[1], 24576 ) && GT_16( hSpMusClas->old_lt_diff_fx[0], 1280 ) )
                 {
                     percus_flag = 1;
                     move16();
@@ -4001,7 +3890,7 @@ static void music_mixed_classif_improv_fx(
     test();
     test();
     test();
-    IF( GT_16( sub( hSpMusClas->buf_etot_fx[3], hSpMusClas->buf_etot_fx[2] ), 1536 ) && GT_16( hSpMusClas->dec_mov_fx, 29491 ) && GT_16( sub( etot, st->lp_speech_fx ), 1280 ) && GT_16( hSpMusClas->old_lt_diff_fx[0], 640 ) )
+    if ( GT_16( sub( hSpMusClas->buf_etot_fx[3], hSpMusClas->buf_etot_fx[2] ), 1536 ) && GT_16( hSpMusClas->dec_mov_fx, 29491 ) && GT_16( sub( etot, st->lp_speech_fx ), 1280 ) && GT_16( hSpMusClas->old_lt_diff_fx[0], 640 ) )
     {
         hSpMusClas->attack_hangover = 3;
         move16();
@@ -4031,7 +3920,9 @@ static void music_mixed_classif_improv_fx(
     flux_fx( st->lgBin_E_fx, p2v_map, hSpMusClas->old_Bin_E_fx, hSpMusClas->buf_flux_fx, hSpMusClas->attack_hangover, hSpMusClas->dec_mov_fx );
 
     hSpMusClas->attack_hangover = sub( hSpMusClas->attack_hangover, 1 );
+    move16();
     hSpMusClas->attack_hangover = s_max( hSpMusClas->attack_hangover, 0 );
+    move16();
 
     /* identify flux buffer buffering status */
     len = 0;
@@ -4137,11 +4028,7 @@ static void music_mixed_classif_improv_fx(
     expn = sub( sub( 30, expn ), Q_epsP - 4 );
 
     expd = norm_l( ftmp );
-#ifdef BASOP_NOGLOB
     fracd = round_fx_sat( L_shl( ftmp, expd ) );
-#else
-    fracd = round_fx( L_shl( ftmp, expd ) );
-#endif
     expd = sub( sub( 30, expd ), sub( Q_epsP, 4 ) );
 
     scale = shr( sub( fracd, fracn ), 15 );
@@ -4200,6 +4087,8 @@ static void music_mixed_classif_improv_fx(
             hSpMusClas->dec_mov_fx = add( mult_r( 31785, hSpMusClas->dec_mov_fx ), 983 );   /*Q15 */
             hSpMusClas->dec_mov1_fx = add( mult_r( 31785, hSpMusClas->dec_mov1_fx ), 983 ); /*Q15 */
         }
+        move16();
+        move16();
     }
 
     /* update long term unvoiced counter */
@@ -4215,24 +4104,27 @@ static void music_mixed_classif_improv_fx(
     {
         hSpMusClas->UV_cnt1 = add( hSpMusClas->UV_cnt1, 1 );
     }
+    move16();
 
     hSpMusClas->UV_cnt1 = s_min( hSpMusClas->UV_cnt1, 300 );
+    move16();
     hSpMusClas->UV_cnt1 = s_max( hSpMusClas->UV_cnt1, 0 );
+    move16();
 
     /**LT_UV_cnt1 = add(mult_r(29491,*LT_UV_cnt1),mult_r(3277,shl(*UV_cnt1,6)));*/                                                    /* Q6  */
     hSpMusClas->LT_UV_cnt1_fx = round_fx( L_mac( L_mult( 29491, hSpMusClas->LT_UV_cnt1_fx ), 3277, shl( hSpMusClas->UV_cnt1, 6 ) ) ); /*Q6  */
-
+    move16();
     /* revert classification decision due to long-term unvoiced counter */
     test();
     test();
-    IF( EQ_16( dec, 1 ) && LT_16( hSpMusClas->dec_mov1_fx, 6554 ) && LT_16( hSpMusClas->LT_UV_cnt1_fx, 12800 ) )
+    if ( EQ_16( dec, 1 ) && LT_16( hSpMusClas->dec_mov1_fx, 6554 ) && LT_16( hSpMusClas->LT_UV_cnt1_fx, 12800 ) )
     {
         dec = 0;
         move16();
     }
 
     /* overwrite 1st stage speech/music decision to music */
-    IF( EQ_16( dec, 1 ) )
+    if ( EQ_16( dec, 1 ) )
     {
         st->sp_aud_decision1 = 1;
         move16();
@@ -4264,6 +4156,7 @@ static void tonal_context_improv_fx(
     SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     IF( EQ_16( st_fx->last_codec_mode, MODE2 ) )
@@ -4307,11 +4200,7 @@ static void tonal_context_improv_fx(
         tmp = div_s( fraca, fracb );
         exp1 = sub( expa, expb );
 
-#ifdef BASOP_NOGLOB
         tonality1 = L_shl_o( tmp, exp1, &Overflow );
-#else /* BASOP_NOGLOB */
-        tonality1 = L_shl( tmp, exp1 );
-#endif
     }
     ELSE
     {
@@ -4342,11 +4231,7 @@ static void tonal_context_improv_fx(
         tmp = div_s( fraca, fracb );
         exp2 = sub( expa, expb );
 
-#ifdef BASOP_NOGLOB
         tonality2 = L_shl_o( tmp, exp2, &Overflow );
-#else
-        tonality2 = L_shl( tmp, exp2 );
-#endif
     }
     ELSE
     {
@@ -4376,11 +4261,7 @@ static void tonal_context_improv_fx(
         tmp = div_s( fraca, fracb );
         exp3 = sub( expa, expb );
 
-#ifdef BASOP_NOGLOB
         tonality3 = L_shl_o( tmp, exp3, &Overflow );
-#else
-        tonality3 = L_shl( tmp, exp3 );
-#endif
     }
     ELSE
     {
@@ -4392,11 +4273,7 @@ static void tonal_context_improv_fx(
     /* voi_mean = 0.33f * (st->voicing_fx[0] + voicing[1] + voicing[2]); */
     L_tmp = L_mult( st_fx->voicing_fx[0], 10923 );
     L_tmp = L_mac( L_tmp, st_fx->voicing_fx[1], 10923 );
-#ifdef BASOP_NOGLOB                                             // -dtx 12650 amrwb\Dtx3.INP
     voi_mean = mac_r_sat( L_tmp, st_fx->voicing_fx[2], 10923 ); /* Q15 */
-#else
-    voi_mean = mac_r( L_tmp, st_fx->voicing_fx[2], 10923 ); /* Q15 */
-#endif
     test();
     IF( EQ_16( hVAD->hangover_cnt, 10 ) && EQ_16( st_fx->vad_flag, 1 ) )
     {
@@ -4420,6 +4297,9 @@ static void tonal_context_improv_fx(
         /* long-term tonality measure */
         hSpMusClas->lt_tonality = L_add( Mult_32_16( hSpMusClas->lt_tonality, 16384 ), Mult_32_16( tonality, 16384 ) );
     }
+    move16();
+    move16();
+    move16();
 
     /* Pitch difference w.r.t to past 3 frames */
     lt_pitch_diff = abs_s( sub( hSpMusClas->lt_corr_pitch[0], st_fx->pitch[0] ) );
@@ -4497,6 +4377,7 @@ static void tonal_context_improv_fx(
     exp = sub( 30, add( exp, 16 ) );
     L_tmp = Mpy_32_16( exp, tmp, 15783 );                                             /*19 //3945, 0.2*log10(2), Q18 */
     hSpMusClas->tonality2_buf_fx[HANG_LEN_INIT - 1] = round_fx( L_shl( L_tmp, 11 ) ); /*14 */
+    move16();
     /* t2 = std( st->tonality2_buf, HANG_LEN_INIT ); */
     t2_fx = std_fx( hSpMusClas->tonality2_buf_fx, HANG_LEN_INIT ); /*14 */
 
@@ -4508,6 +4389,7 @@ static void tonal_context_improv_fx(
     L_tmp = Mpy_32_16( exp, tmp, 15783 );                                             /*19 //3945, 0.2*log10(2), Q18 */
     hSpMusClas->tonality3_buf_fx[HANG_LEN_INIT - 1] = round_fx( L_shl( L_tmp, 11 ) ); /*14 */
     t3_fx = std_fx( hSpMusClas->tonality3_buf_fx, HANG_LEN_INIT );                    /*14 */
+    move16();
 
     /* tL  = 0.2f*(float)log10(st->lt_tonality); */
     exp = norm_l( hSpMusClas->lt_tonality );
@@ -4519,6 +4401,7 @@ static void tonal_context_improv_fx(
     /* calculate standard deviation of residual LP energy */
     Copy( hSpMusClas->LPCErr_buf_fx + 1, hSpMusClas->LPCErr_buf_fx, HANG_LEN_INIT - 1 );
     hSpMusClas->LPCErr_buf_fx[HANG_LEN_INIT - 1] = LPCErr;
+    move16();
     /* err = std( st->LPCErr_buf, HANG_LEN_INIT ); */
     err_fx = std_fx( hSpMusClas->LPCErr_buf_fx, HANG_LEN_INIT );
 
@@ -4559,6 +4442,7 @@ static void tonal_context_improv_fx(
     IF( hSpMusClas->lt_music_hangover > 0 )
     {
         hSpMusClas->lt_music_hangover = sub( hSpMusClas->lt_music_hangover, 1 );
+        move16();
     }
 
     /* state machine for strong speech */
@@ -4596,6 +4480,7 @@ static void tonal_context_improv_fx(
     IF( hSpMusClas->lt_speech_hangover > 0 )
     {
         hSpMusClas->lt_speech_hangover = sub( hSpMusClas->lt_speech_hangover, 1 );
+        move16();
     }
 
     /* final decision */
@@ -4642,10 +4527,14 @@ static void detect_sparseness_fx(
     Word16 S1[128];
     Word16 i, j;
     Word16 hb_sp_high_flag = 0;
+    move16();
     Word16 lb_sp_high_flag = 0;
+    move16();
     Word16 sparse;
     Word16 tmp_buf[4];
     Word16 Mlpe = 0, Mv = 0, Msp;
+    move16();
+    move16();
     SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
 
     Copy( st_fx->lgBin_E_fx, S1, 128 );
@@ -4777,12 +4666,12 @@ static void detect_sparseness_fx(
         IF( tmp == 0 )
         {
             hSpMusClas->hf_spar_buf_fx[HANG_LEN_INIT - 1] = 0;
-            move16();
         }
         ELSE
         {
             hSpMusClas->hf_spar_buf_fx[HANG_LEN_INIT - 1] = div_s( tmp, sumh );
         }
+        move16();
 
         tmp = 0;
         move16();
@@ -4877,6 +4766,7 @@ static void detect_sparseness_fx(
         if ( EQ_16( st_fx->bwidth, WB ) )
         {
             tmp = 90;
+            move16();
         }
 
         IF( GT_16( sparse, tmp ) )
@@ -4939,7 +4829,7 @@ static void detect_sparseness_fx(
                 hSpMusClas->gsc_hangover = 1;
                 move16();
             }
-            ELSE IF( EQ_16( hSpMusClas->gsc_hangover, 1 ) && !( st_fx->sp_aud_decision1 == 0 && st_fx->sp_aud_decision2 == 1 ) )
+            ELSE IF( EQ_16( hSpMusClas->gsc_hangover, 1 ) && !( st_fx->sp_aud_decision1 == 0 && EQ_16( st_fx->sp_aud_decision2, 1 ) ) )
             {
                 IF( LT_16( abs_s( sub( sparse, mean_fx( &hSpMusClas->sparse_buf_fx[HANG_LEN_INIT - 1 - hSpMusClas->gsc_cnt], hSpMusClas->gsc_cnt ) ) ), 7 ) )
                 {
diff --git a/lib_enc/stat_enc.h b/lib_enc/stat_enc.h
index 24c8b9fceda634925b49f6a6c159314a6d06e7b4..caca3173e0db49e4630ddf633ef91b4c20b817bb 100644
--- a/lib_enc/stat_enc.h
+++ b/lib_enc/stat_enc.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -43,7 +43,7 @@
 #include "stat_com.h"
 #include "cnst.h"
 #include "ivas_cnst.h"
-#include "stat_dec.h" /* Compilation switches                   */
+
 
 /*------------------------------------------------------------------------------------------*
  * Indice
@@ -51,9 +51,9 @@
 
 typedef struct
 {
-    int16_t id;      /* id of the indice */
-    uint16_t value;  /* value of the quantized indice */
-    int16_t nb_bits; /* number of bits used for the quantization of the indice */
+    Word16 id;      /* id of the indice */
+    UWord16 value;  /* value of the quantized indice */
+    Word16 nb_bits; /* number of bits used for the quantization of the indice */
 } Indice, *INDICE_HANDLE;
 
 typedef struct
@@ -84,17 +84,18 @@ typedef struct
 
 typedef struct bitstream_enc_data_structure
 {
-    int16_t nb_ind_tot;            /* total number of indices already written */
-    int16_t nb_bits_tot;           /* total number of bits already written */
-    Indice *ind_list;              /* list of indices */
-    int16_t *ivas_max_num_indices; /* maximum total number of indices in the list */
-    Indice **ivas_ind_list_zero;   /* beginning of the buffer of indices */
-    void *st_ivas;                 /* IVAS encoder structure */
+    Word16 nb_ind_tot;            /* total number of indices already written */
+    Word16 nb_bits_tot;           /* total number of bits already written */
+    Indice *ind_list;             /* list of indices */
+    Word16 *ivas_max_num_indices; /* maximum total number of indices in the list */
+    Indice **ivas_ind_list_zero;  /* beginning of the buffer of indices */
+    void *st_ivas;                /* IVAS encoder structure */
     // Word16 nb_bits_tot_fx; /* total number of bits already written */
     // Indice *ind_list_fx; /* list of indices */
+#ifndef HARM_PUSH_BIT
     Word16 next_ind_fx; /* pointer to the next empty slot in the list of indices */
     Word16 last_ind_fx; /* last written indice */
-
+#endif
 } BSTR_ENC_DATA, *BSTR_ENC_HANDLE;
 
 /*----------------------------------------------------------------------------------*
@@ -113,9 +114,9 @@ typedef struct signal_buffers_enc_data_structure
     Word16 old_inp_12k8_fx[L_INP_MEM];      /* memory of input signal at 12.8kHz */
     Word16 old_inp_16k_fx[L_INP_MEM];       /* ACELP@16kHz - memory of input signal @16 kHz */
 
-    Word16 buf_speech_enc_pe[L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k];
+    Word16 buf_speech_enc_pe[L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k]; // exp_buf_speech_enc_pe
     Word16 buf_synth[OLD_SYNTH_SIZE_ENC + L_FRAME32k];
-    Word16 buf_speech_enc[L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k];
+    Word16 buf_speech_enc[L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k];              // exp_buf_speech_enc
     Word16 buf_wspeech_enc[L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320]; /*normally there is a lookahead for 12k8 and 16k but L_FRAME_MAX=L_FRAME_16K+L_NEXT_16k*/
                                                                                       /* increased by 320 to avoid memory overlap in ivas_find_wsp() and also to accomodate for the wspeech_enc */
 } SIGNAL_BUFFERS_ENC_DATA, *SIGNAL_BUFFERS_ENC_HANDLE;
@@ -128,21 +129,23 @@ typedef struct signal_buffers_enc_data_structure
 /* Delay buffer: Used to buffer input samples and to define the subblock size of a transient detector. */
 typedef struct
 {
-    int16_t nSubblockSize; /* Subblock size of a transient detector that uses this delay buffer. */
+    Word16 nSubblockSize; /* Subblock size of a transient detector that uses this delay buffer. */
     Word16 buffer[L_FRAME48k / NSUBBLOCKS];
-    int16_t nDelay; /* Size of the delay buffer in use. Maximum delay from all users of this buffer. */
+    Word16 nDelay; /* Size of the delay buffer in use. Maximum delay from all users of this buffer. */
 
 } DelayBuffer;
 
 /* Subblock energies: Holds subblock energies and recursively accumulated energies. Also buffers the energies. */
 typedef struct
 {
-    DelayBuffer *pDelayBuffer;                                                                     /* Delay buffer. */
-    Word32 subblockNrg[NSUBBLOCKS + MAX_TD_DELAY];                                                 // IVAS Q0
-    Word32 accSubblockNrg[NSUBBLOCKS + MAX_TD_DELAY + 1];                                          // IVAS Q0
-    Word16 subblockNrgChange[NSUBBLOCKS + MAX_TD_DELAY]; /* EVS: Q7(15 - SUBBLOCK_NRG_CHANGE_E) */ /* IVAS: Q3 */
-    int16_t nDelay;                                                                                /* Size of the delay buffer in use, as number of subblocks. Maximum delay from all users of this buffer. */
-    int16_t nPartialDelay;                                                                         /* Delay of the input (modulo pDelayBuffer->nSubblockSize), nPartialDelay <= pDelayBuffer->nDelay. */
+    DelayBuffer *pDelayBuffer;                                /* Delay buffer. */
+    Word32 subblockNrg[NSUBBLOCKS + MAX_TD_DELAY];            // IVAS Q(-1)
+    Word32 accSubblockNrg[NSUBBLOCKS + MAX_TD_DELAY + 1];     // IVAS Q(-1)
+    Word16 subblockNrgChange[NSUBBLOCKS + MAX_TD_DELAY];      /* EVS: Q7(15 - SUBBLOCK_NRG_CHANGE_E) */
+    Word32 subblockNrgChange_32fx[NSUBBLOCKS + MAX_TD_DELAY]; /* IVAS: subblockNrgChange_exp */
+    Word16 subblockNrgChange_exp[NSUBBLOCKS + MAX_TD_DELAY];
+    Word16 nDelay;        /* Size of the delay buffer in use, as number of subblocks. Maximum delay from all users of this buffer. */
+    Word16 nPartialDelay; /* Delay of the input (modulo pDelayBuffer->nSubblockSize), nPartialDelay <= pDelayBuffer->nDelay. */
 
     /* Decay factor for the recursive accumulation */
     Word16 facAccSubblockNrg;
@@ -152,27 +155,25 @@ typedef struct
     Word16 firState2;
     Word16 q_firState;
 
-    uint16_t ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */
+    UWord16 ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */
 
 } SubblockEnergies;
 
 
 /* Attack detection function. */
-typedef void ( *TCheckSubblocksForAttack )( const float *pSubblockNrg, const float *pAccSubblockNrg, int16_t nSubblocks, int16_t nPastSubblocks, float attackRatioThreshold, int16_t *pbIsAttackPresent, int16_t *pAttackIndex );
 typedef void ( *TCheckSubblocksForAttack_fx )( Word32 const *pSubblockNrg, Word32 const *pAccSubblockNrg, Word16 nSubblocks, Word16 nPastSubblocks, Word16 attackRatioThreshold, Word16 *pbIsAttackPresent, Word16 *pAttackIndex );
 
 /* Transient detector. */
 typedef struct TransientDetector
 {
     SubblockEnergies *pSubblockEnergies;                    /* Subblock energies used in this transient detector. */
-    int16_t nDelay;                                         /* Delay of the transient detector in number of subblocks, nDelay <= pSubblockEnergies->nDelay. */
-    int16_t nSubblocksToCheck;                              /* Number of subblocks to check for transients. */
-    TCheckSubblocksForAttack CheckSubblocksForAttack;       /* Function for checking a presence of an attack. */
+    Word16 nDelay;                                          /* Delay of the transient detector in number of subblocks, nDelay <= pSubblockEnergies->nDelay. */
+    Word16 nSubblocksToCheck;                               /* Number of subblocks to check for transients. */
     TCheckSubblocksForAttack_fx CheckSubblocksForAttack_fx; /* Function for checking a presence of an attack. */
     Word16 attackRatioThreshold;                            /* Attack ratio threshold Q11 */
-    int16_t bIsAttackPresent;                               /* True when an attack was detected. */
-    int16_t prev_bIsAttackPresent;                          /* True if an attack was detected in the previous frame. */
-    int16_t attackIndex;                                    /* The index of an attack. */
+    Word16 bIsAttackPresent;                                /* True when an attack was detected. */
+    Word16 prev_bIsAttackPresent;                           /* True if an attack was detected in the previous frame. */
+    Word16 attackIndex;                                     /* The index of an attack. */
 } TransientDetector;
 
 /* Transient detection: Holds all transient detectors and buffers used by them. */
@@ -191,25 +192,25 @@ typedef struct TransientDetection_structure
 
 typedef struct vad_structure
 {
-    int16_t nb_active_frames;
-    int16_t hangover_cnt;
-    int16_t nb_active_frames_he;
-    int16_t hangover_cnt_he;
-    int32_t vad_flag_reg_H;
-    int32_t vad_flag_reg_L;
-    int32_t vad_prim_reg;
-
-    int16_t vad_flag_cnt_50;
-    int16_t vad_prim_cnt_16;
-
-    int16_t hangover_cnt_dtx;
-    int16_t hangover_cnt_music;
+    Word16 nb_active_frames;
+    Word16 hangover_cnt;
+    Word16 nb_active_frames_he;
+    Word16 hangover_cnt_he;
+    Word32 vad_flag_reg_H;
+    Word32 vad_flag_reg_L;
+    Word32 vad_prim_reg;
+
+    Word16 vad_flag_cnt_50;
+    Word16 vad_prim_cnt_16;
+
+    Word16 hangover_cnt_dtx;
+    Word16 hangover_cnt_music;
     Word16 bcg_flux_fx; // Q4
-    int16_t soft_hangover;
-    int16_t voiced_burst;
-    int16_t bcg_flux_init;
-    int16_t nb_active_frames_he1;
-    int16_t hangover_cnt_he1;
+    Word16 soft_hangover;
+    Word16 voiced_burst;
+    Word16 bcg_flux_init;
+    Word16 nb_active_frames_he1;
+    Word16 hangover_cnt_he1;
     Word16 prim_act_quick_fx; /*Q15 */    /* Noise estimator - primary activity quick */
     Word16 prim_act_slow_fx; /*Q15 */     /* Noise estimator - primary activity slow  */
     Word16 prim_act_fx; /*Q15 */          /* Noise estimator - primary activity slow rise quick fall */
@@ -217,22 +218,23 @@ typedef struct vad_structure
     Word16 prim_act_slow_he_fx; /*Q15 */  /* Noise estimator - primary activity slow  */
     Word16 prim_act_he_fx; /*Q15 */       /* Q15 Noise estimator - primary activity slow rise quick fall */
 
-    int16_t spectral_tilt_reset;
-    int16_t consec_inactive;
+    Word16 spectral_tilt_reset;
+    Word16 consec_inactive;
     Word16 ra_deltasum_fx;
-    int16_t trigger_SID;
+    Word16 trigger_SID;
     Word16 snr_sum_vad_fx;   /*Q15 */
     Word16 running_avg_fx;   /*Q15 */
-    Word32 L_snr_sum_vad_fx; /*Q4*/
+    Word32 L_snr_sum_vad_fx; // EVS:Q4, IVAS:q_L_snr_sum_vad
+    Word16 q_L_snr_sum_vad;
 
-    int16_t hangover_terminate_flag; /* CNG and DTX - flag indicating whether to early terminate DTX hangover */
-    int16_t vad_flag;                /* VAD flag */
+    Word16 hangover_terminate_flag; /* CNG and DTX - flag indicating whether to early terminate DTX hangover */
+    Word16 vad_flag;                /* VAD flag */
 
 } VAD_DATA, *VAD_HANDLE;
 
 typedef struct cldfb_vad_structure
 {
-    int16_t bw_index; /* index of band width */
+    Word16 bw_index; /* index of band width */
 
     /* feature */
     Word16 sp_center[SP_CENTER_NUM];           /* spectral center*/
@@ -248,8 +250,8 @@ typedef struct cldfb_vad_structure
     Word32 t_bg_energy;                        /* time background energy of several frames*/
     Word16 scale_t_bg_energy;                  /* the Scaling of t_bg_energy*/
     T_VAD_EXP t_bg_energy_sum;                 /* number of time background energy*/
-    int16_t tbg_energy_count;                  /* sum of time background energy of several frames*/
-    int16_t bg_update_count;                   /* time of background update*/
+    Word16 tbg_energy_count;                   /* sum of time background energy of several frames*/
+    Word16 bg_update_count;                    /* time of background update*/
     Word32 frame_energy_smooth;                /* smoothed energy of several frames*/
     Word16 frame_energy_smooth_scale;          /* the Scaling of frame_energy_smooth*/
 
@@ -268,14 +270,14 @@ typedef struct cldfb_vad_structure
     Word16 fg_energy_scale;                 /* the Scaling of fg_energy*/
     Word32 bg_energy;                       /* background energy sum  */
     Word16 bg_energy_scale;                 /* the Scaling of bg_energy*/
-    int16_t fg_energy_count;                /* number of the foreground energy frame */
-    int16_t bg_energy_count;                /* number of the background energy frame */
+    Word16 fg_energy_count;                 /* number of the foreground energy frame */
+    Word16 bg_energy_count;                 /* number of the background energy frame */
     Word32 fg_energy_est_start;             /* flag by that indicate whether if estimate energy*/
-    int16_t speech_flag;                    /* residual number of hangover 1 */
-    int16_t continuous_noise_num;           /* time of continuous noise frames*/
-    int16_t continuous_speech_num;          /* time of continuous speech frames*/
-    int16_t continuous_speech_num2;         /* time 2 of continuous speech frames*/
-    int16_t frameloop;                      /* number of frame*/
+    Word16 speech_flag;                     /* residual number of hangover 1 */
+    Word16 continuous_noise_num;            /* time of continuous noise frames*/
+    Word16 continuous_speech_num;           /* time of continuous speech frames*/
+    Word16 continuous_speech_num2;          /* time 2 of continuous speech frames*/
+    Word16 frameloop;                       /* number of frame*/
     Word16 tonality_rate3;                  /* tonality rate*/
     Word16 music_background_rate;           /* music background rate*/
     Word32 lt_noise_sp_center_diff_sum;     /* different sum of long time noise sp_center*/
@@ -283,10 +285,10 @@ typedef struct cldfb_vad_structure
     Word16 lt_noise_sp_center0;             /* long time noise sp_center0*/
     Word16 lt_noise_sp_center3;             /* long time noise sp_center3*/
     Word32 lt_bg_highf_eng;                 /* average  of long time high frequency energy*/
-    int16_t update_num_with_snr;            /* the number of the background update with SNR*/
-    int16_t update_count;
-    int16_t warm_hang_num; /* the number of hangover for warm up*/
-    int16_t vad_flag_for_bk_update;
+    Word16 update_num_with_snr;             /* the number of the background update with SNR*/
+    Word16 update_count;
+    Word16 warm_hang_num; /* the number of hangover for warm up*/
+    Word16 vad_flag_for_bk_update;
 
 } T_CldfbVadState, *VAD_CLDFB_HANDLE;
 
@@ -326,7 +328,7 @@ typedef struct td_cng_enc_structure
     Word16 cng_buf_cnt;                                /* CNG and DTX - Counter of buffered CNG parameters */
     Word16 cng_exc2_buf[HO_HIST_SIZE * L_FFT];         /* CNG and DTX - exc2 buffer for storing */
     Word16 cng_Qexc_buf[HO_HIST_SIZE];                 /* CNG and DTX - Q_exc buffer for storing */
-    int32_t cng_brate_buf[HO_HIST_SIZE];               /* CNG and DTX - buffer for storing last_active_brate */
+    Word32 cng_brate_buf[HO_HIST_SIZE];                /* CNG and DTX - buffer for storing last_active_brate */
     Word16 CNG_att_fx;                                 /* CNG and DTX - attenuation factor for CNG, in dB Q7 */
     Word16 ho_16k_lsp[HO_HIST_SIZE];                   /* CNG and DTX - 16k LSPs flags */
     Word16 act_cnt2;                                   /* CNG and DTX - counter of active frames for CNG_mode switching */
@@ -432,23 +434,23 @@ typedef struct dtx_enc_structure
 
 typedef struct igfscfenc_public_data_struct
 {
-    int16_t ptrBitIndex;
-    int16_t bitCount;
-    int16_t prev[64]; /* no more than 64 SCFs for the IGF energy envelope of one block */
-    int16_t prevSave[64];
-    int16_t scfCountLongBlock[IGF_NOF_GRIDS];
-    int16_t t;
-    int16_t Tsave;
-    int16_t contex_saved;
-    const uint16_t *cf_se00;
-    const uint16_t *cf_se01;
-    int16_t cf_off_se01;
-    const uint16_t *cf_se02;
-    const int16_t *cf_off_se02;
-    const uint16_t *cf_se10;
-    int16_t cf_off_se10;
-    const uint16_t *cf_se11;
-    const int16_t *cf_off_se11;
+    Word16 ptrBitIndex;
+    Word16 bitCount;
+    Word16 prev[64]; /* no more than 64 SCFs for the IGF energy envelope of one block */
+    Word16 prevSave[64];
+    Word16 scfCountLongBlock[IGF_NOF_GRIDS];
+    Word16 t;
+    Word16 Tsave;
+    Word16 contex_saved;
+    const UWord16 *cf_se00;
+    const UWord16 *cf_se01;
+    Word16 cf_off_se01;
+    const UWord16 *cf_se02;
+    const Word16 *cf_off_se02;
+    const UWord16 *cf_se10;
+    Word16 cf_off_se10;
+    const UWord16 *cf_se11;
+    const Word16 *cf_off_se11;
     Tastat acState;
     TastatEnc acState_fx;
 
@@ -544,8 +546,10 @@ typedef struct noise_estimation_structure
     Word16 bg_cnt;               /* Noise estimator - pause length counter */
     Word16 Etot_l_fx;            /* Q8 Noise estimator - Track energy from below  */
     Word16 Etot_h_fx;            /* Q8 Noise estimator - Track energy from above  */
-    Word16 Etot_l_lp_fx;         /* Q8 Noise estimator - Smoothed low energy      */
-    Word16 Etot_last_fx;         /*Q8*/
+    Word16 Etot_l_lp_fx;         /* EVS- Q8 Noise estimator - Smoothed low energy      */
+    Word32 Etot_l_lp_32fx;       /* IVAS-Q24 Noise estimator - Smoothed low energy      */
+    Word16 Etot_last_fx;         /*EVS- Q8*/
+    Word32 Etot_last_32fx;       /* IVAS - Q24*/
     Word16 Etot_lp_fx;           /* Q8 Noise estimator - Filtered input energy   */
 
     Word16 lt_tn_track_fx;  /* Q15 */
@@ -561,11 +565,15 @@ typedef struct noise_estimation_structure
     Word16 lt_aEn_zero_fx;       /* Q15 */
 
     Word16 Etot_v_h2_fx;
+    Word32 Etot_v_h2_32fx; /* Q24 */
     Word16 sign_dyn_lp_fx; /*Q8*/
 
     Word16 Etot_st_est_fx;    /* Q8 Noise estimation - short term estimate of E{ Etot } */
     Word16 Etot_sq_st_est_fx; /* Q2 Noise estimation - short term estimate of E{ Etot^2 } */
 
+    Word32 L_Etot_st_est_fx;    /* Q23 Noise estimation - short term estimate of E{ Etot } */
+    Word32 L_Etot_sq_st_est_fx; /* Q16 Noise estimation - short term estimate of E{ Etot^2 } */
+
     Word16 aEn_inac_cnt;
 } NOISE_EST_DATA, *NOISE_EST_HANDLE;
 
@@ -585,6 +593,7 @@ typedef struct sp_mus_clas_structure
     Word16 past_epsP2_fx; /* Q10 */
     Word16 inact_cnt;
     Word16 wdrop_fx;          /* Q9 */
+    Word32 wdrop_32fx;        /* Q19 */
     Word16 wrise_fx;          /* Q9 */
     Word16 wdlp_0_95_sp_fx;   /* EVS - Q8 */
     Word32 wdlp_0_95_sp_32fx; /* IVAS - Q24 */
@@ -640,8 +649,9 @@ typedef struct sp_mus_clas_structure
     Word16 UV_cnt1;
     Word16 LT_UV_cnt1_fx; /* Q6 */
 
-    Word32 finc_prev_fx[ATT_NSEG]; /* strong attack detection - previous finc, (Q_new * 2) */
-    Word32 lt_finc_fx;             /* strong attack detection - long-term finc energy, Q_lt_finc (Q_new * 2) */
+    Word32 finc_prev_fx[ATT_NSEG]; /* strong attack detection - previous finc, (q_finc_prev) */
+    Word16 q_finc_prev;
+    Word32 lt_finc_fx; /* strong attack detection - long-term finc energy, Q_lt_finc */
     Word16 Q_lt_finc;
     Word16 last_strong_attack;         /* strong attack detection - last strong attack flag */
     Word32 tod_lt_Bin_E_fx[TOD_NSPEC]; /* tonal detector - long-term energy spectrum, Q_tod_lt_Bin_E */
@@ -696,9 +706,6 @@ typedef struct sp_mus_clas_structure
 typedef struct lpd_state_structure
 {
 
-#ifndef MSAN_FIX
-    Word16 nbits; /* number of bits used by ACELP or TCX     */
-#endif
 
     /* signal memory */
     Word16 syn[1 + M]; /* Synthesis memory (non-pe)                              */
@@ -744,21 +751,21 @@ typedef struct acelp_cbkcorr_structure
 
 typedef struct gsc_enc_structure
 {
-    int16_t seed_tcx;          /* AC mode (GSC) - seed for noise fill                          */
-    int16_t cor_strong_limit;  /* AC mode (GSC) - Indicator about high spectral correlation per band */
-    int16_t mem_last_pit_band; /* AC mode (GSC) - memory of the last band where pitch contribution was significant */
+    Word16 seed_tcx;          /* AC mode (GSC) - seed for noise fill                          */
+    Word16 cor_strong_limit;  /* AC mode (GSC) - Indicator about high spectral correlation per band */
+    Word16 mem_last_pit_band; /* AC mode (GSC) - memory of the last band where pitch contribution was significant */
     Word16 mem_w0_tmp_fx;
     Word16 mem_syn_tmp_fx[M];
     Word16 mid_dyn_fx;                     /* AC mode (GSC) - signal dynamic                         Q7 */
-    int16_t noise_lev;                     /* AC mode (GSC) - noise level                                  */
-    int16_t past_dyn_dec;                  /* AC mode (GSC) - Past noise level decision                    */
+    Word16 noise_lev;                      /* AC mode (GSC) - noise level                                  */
+    Word16 past_dyn_dec;                   /* AC mode (GSC) - Past noise level decision                    */
     Word32 Last_frame_ener_fx;             /* AC mode (GSC) - Last frame energy  */
-    int16_t pit_exc_hangover;              /* AC mode (GSC) - Hangover for the time contribution switching */
+    Word16 pit_exc_hangover;               /* AC mode (GSC) - Hangover for the time contribution switching */
     Word16 last_exc_dct_in_fx[L_FRAME16k]; /* AC mode (GSC) - previous exciation                        */
     Word16 Q_last_exc_dct_in;
-    Word16 last_ener_fx;                /* AC mode (GSC) - previous energy                          Q0 */
-    int16_t last_bitallocation_band[6]; /* AC mode (GSC) - previous bit allocation of each band         */
-    Word16 lt_gpitch_fx;                /* Q15 */
+    Word16 last_ener_fx;               /* AC mode (GSC) - previous energy                          Q0 */
+    Word16 last_bitallocation_band[6]; /* AC mode (GSC) - previous bit allocation of each band         */
+    Word16 lt_gpitch_fx;               /* Q15 */
 
 } GSC_ENC_DATA, *GSC_ENC_HANDLE;
 
@@ -799,14 +806,14 @@ typedef struct hq_enc_structure
 /* PVQ range coder state */
 typedef struct pvq_enc_structure
 {
-    uint32_t rc_low;
-    uint32_t rc_range;
-    int16_t rc_cache;
-    int16_t rc_carry;
-    int16_t rc_carry_count;
-    int16_t rc_num_bits;
-    int16_t rc_tot_bits;
-    int16_t rc_offset;
+    UWord32 rc_low;
+    UWord32 rc_range;
+    Word16 rc_cache;
+    Word16 rc_carry;
+    Word16 rc_carry_count;
+    Word16 rc_num_bits;
+    Word16 rc_tot_bits;
+    Word16 rc_offset;
 
 } PVQ_ENC_DATA, *PVQ_ENC_HANDLE;
 
@@ -833,33 +840,33 @@ typedef struct sc_vbr_enc_structure
     Word16 nelp_lp_fit_mem[NELP_LP_ORDER * 2]; /* Q(prev_Q_new) */
     Word32 bp1_filt_mem_nb_fx[14];             /* Q(qprevGain_fx) */
 
-    int16_t nelp_enc_seed;
+    Word16 nelp_enc_seed;
     Word16 nelp_gain_mem_fx; /* Q0 */
-    int16_t last_nelp_mode;
-    int16_t nelp_mode;
+    Word16 last_nelp_mode;
+    Word16 nelp_mode;
 
     Word16 qprevIn_fx;
     Word16 qprevGain_fx;
 
     /* PPP variables */
-    int16_t pppcountE;
-    int16_t bump_up;
-    int16_t last_ppp_mode;
-    int16_t last_last_ppp_mode;
-    int16_t ppp_mode;
+    Word16 pppcountE;
+    Word16 bump_up;
+    Word16 last_ppp_mode;
+    Word16 last_last_ppp_mode;
+    Word16 ppp_mode;
     Word16 prev_ppp_gain_pit_fx; /* Q14 */
     Word16 prev_tilt_code_fx;    /* Q15 */
 
     /* voiced encoder variables */
-    int16_t firstTime_voicedenc;
+    Word16 firstTime_voicedenc;
 
     /* DTFS variables */
     Word16 dtfs_enc_a_fx[MAXLAG_WI]; /* Q(dtfs_enc_Q) */
     Word16 dtfs_enc_b_fx[MAXLAG_WI]; /* Q(dtfs_enc_Q) */
 
-    int16_t dtfs_enc_lag;
-    int16_t dtfs_enc_nH;
-    int16_t dtfs_enc_nH_4kHz;
+    Word16 dtfs_enc_lag;
+    Word16 dtfs_enc_nH;
+    Word16 dtfs_enc_nH_4kHz;
     Word16 dtfs_enc_upper_cut_off_freq_of_interest_fx; /* Q0 */
     Word16 dtfs_enc_upper_cut_off_freq_fx;             /* Q0 */
     Word16 dtfs_enc_Q;
@@ -871,23 +878,23 @@ typedef struct sc_vbr_enc_structure
     Word16 lasterbE_fx[NUM_ERB_WB]; /* Previous Amplitude spectrum (ERB) Q13 */
     Word16 Q_prev_cw_en_fx;
 
-    int16_t mode_QQF;
-    int16_t rate_control;
+    Word16 mode_QQF;
+    Word16 rate_control;
     Word16 SNR_THLD_fx; /* Q8 */
-    int16_t Q_to_F;
-    int16_t pattern_m;
-    int16_t patterncount;
-    int16_t Last_Resort;
-    int16_t numactive;         /* keep the count of the frames inside current 600 frame block */
+    Word16 Q_to_F;
+    Word16 pattern_m;
+    Word16 patterncount;
+    Word16 Last_Resort;
+    Word16 numactive;          /* keep the count of the frames inside current 600 frame block */
     Word32 sum_of_rates_fx;    /*Q=13 sum of the rates of past 600 active frames*/
     Word32 global_avr_rate_fx; /*Q=13 global rate upto current time. recorded a (rate in kbps) *6000*/
-    int16_t global_frame_cnt;  /* 600 active frame block count. Used to update the global rate */
-    int16_t set_ppp_generic;
-    int16_t avoid_HQ_VBR_NB;
+    Word16 global_frame_cnt;   /* 600 active frame block count. Used to update the global rate */
+    Word16 set_ppp_generic;
+    Word16 avoid_HQ_VBR_NB;
 
-    int16_t vbr_generic_ho;
-    int16_t Local_VAD;
-    int16_t last_7k2_coder_type;
+    Word16 vbr_generic_ho;
+    Word16 Local_VAD;
+    Word16 last_7k2_coder_type;
 
 } SC_VBR_ENC_DATA, *SC_VBR_ENC_HANDLE;
 
@@ -905,7 +912,7 @@ typedef struct amrwb_io_enc_structure
     Word16 mem_hp400_enc_fx[6];
     Word16 mem_hf_enc_fx[L_FIR - 1];
     Word16 mem_syn_hf_enc_fx[M];
-    int16_t seed2_enc;
+    Word16 seed2_enc;
 
 } AMRWB_IO_ENC_DATA, *AMRWB_IO_ENC_HANDLE;
 
@@ -939,7 +946,7 @@ typedef struct td_bwe_enc_structure
     Word16 state_syn_shbexc_fx[L_SHB_LAHEAD]; /* Q(prev_Q_bwe_exc - 16) */
     Word16 state_lpc_syn_fx[LPC_SHB_ORDER];   /* Q(prev_Q_bwe_exc - 16) */
     Word16 old_bwe_exc_fx[PIT16k_MAX * 2];    /*Q_exc*/
-    int16_t bwe_seed[2];
+    Word16 bwe_seed[2];
     Word32 bwe_non_lin_prev_scale_fx;                                         /* Q30 */
     Word16 old_bwe_exc_extended_fx[NL_BUFF_OFFSET];                           /* Q(prev_Q_bwe_exc - 16) */
     Word16 syn_overlap_fx[L_SHB_LAHEAD];                                      /* overlap buffer used to Adjust SHB Frame Gain */
@@ -959,7 +966,7 @@ typedef struct td_bwe_enc_structure
     Word16 shb_inv_filt_mem_fx[LPC_SHB_ORDER];     /* Q(Q_shb_spch) */
     Word16 lsp_shb_spacing_fx[3];                  /* Q15 */
     Word16 prev_swb_GainShape_fx;                  /* Q15 */
-    int16_t prev_frGainAtten;
+    Word16 prev_frGainAtten;
 
     Word16 prev_wb_GainShape;                     /* Q15 */
     Word16 swb_lsp_prev_interp_fx[LPC_SHB_ORDER]; /* Q15 */
@@ -968,25 +975,25 @@ typedef struct td_bwe_enc_structure
     Word16 fb_tbe_demph_fx;
     Word16 tilt_mem_fx; /* Q12 */
 
-    int16_t prev_coder_type;
+    Word16 prev_coder_type;
     Word16 prev_lsf_diff_fx[LPC_SHB_ORDER - 2]; /* Q15 */
     Word16 prev_tilt_para_fx;                   /* Q10 */
     Word16 cur_sub_Aq_fx[M + 1];                /* Q12 */
 
     /* quantized data */
-    int16_t lsf_idx[NUM_Q_LSF];
-    int16_t m_idx;
-    int16_t grid_idx;
-    int16_t idxSubGains;
-    int16_t idxFrameGain;
-    int16_t idx_shb_fr_gain;
-    int16_t idx_res_gs[NB_SUBFR16k];
-    int16_t idx_mixFac;
-
-    int16_t lsf_WB;
-    int16_t gFrame_WB;
-
-    int16_t idxGain;
+    Word16 lsf_idx[NUM_Q_LSF];
+    Word16 m_idx;
+    Word16 grid_idx;
+    Word16 idxSubGains;
+    Word16 idxFrameGain;
+    Word16 idx_shb_fr_gain;
+    Word16 idx_res_gs[NB_SUBFR16k];
+    Word16 idx_mixFac;
+
+    Word16 lsf_WB;
+    Word16 gFrame_WB;
+
+    Word16 idxGain;
     Word16 dec_2_over_3_mem_fx[L_FILT_2OVER3];
     Word16 dec_2_over_3_mem_lp_fx[6];
 
@@ -1006,11 +1013,12 @@ typedef struct td_bwe_enc_structure
 
 typedef struct fd_bwe_enc_structure
 {
-    Word16 new_input_hp_fx[NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS )]; // q0
-    Word16 old_input_fx[NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS )];                                     // q0
-    Word16 old_input_wb_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS )];                                                         /* Q(-1) */
-    Word16 old_input_lp_fx[NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS )];                                         // st->hBWE_FD->prev_Q_input_lp
-    Word16 old_syn_12k8_16k_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS )];                                                     // st->Q_syn
+    Word16 new_input_hp_fx[NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS )]; // Q_new_input_hp
+    Word16 Q_new_input_hp;
+    Word16 old_input_fx[NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS )]; // st->q_inp
+    Word16 old_input_wb_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS )];                     /* Q(-1) */
+    Word16 old_input_lp_fx[NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS )];     // st->hBWE_FD->prev_Q_input_lp
+    Word16 old_syn_12k8_16k_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS )];                 // st->Q_syn
     Word16 old_fdbwe_speech_fx[L_FRAME48k];
     Word16 mem_deemph_old_syn_fx;
     Word16 q_mem_deemph_old_syn;
@@ -1021,6 +1029,7 @@ typedef struct fd_bwe_enc_structure
     Word32 prev_global_gain_fx; /* Q(2 * prev_Q_shb) */
     Word16 modeCount;
     Word32 EnergyLF_fx;
+    Word16 EnergyLF_exp;
     Word16 mem_old_wtda_swb_fx; /* Q(-1) */
 
 } FD_BWE_ENC_DATA, *FD_BWE_ENC_HANDLE;
@@ -1032,9 +1041,9 @@ typedef struct fd_bwe_enc_structure
 
 typedef struct rf_enc_structure
 {
-    int16_t rf_frame_type;
-    int16_t rf_targetbits_buff[MAX_RF_FEC_OFFSET];
-    int16_t rf_indx_frametype[MAX_RF_FEC_OFFSET];
+    Word16 rf_frame_type;
+    Word16 rf_targetbits_buff[MAX_RF_FEC_OFFSET];
+    Word16 rf_indx_frametype[MAX_RF_FEC_OFFSET];
 
     ACELP_config acelp_cfg_rf; /* configuration for RF frame */
 
@@ -1045,31 +1054,31 @@ typedef struct rf_enc_structure
     struct dispMem_fx rf_dm_fx;
     Word32 rf_gc_threshold;
 
-    int16_t rf_target_bits;
+    Word16 rf_target_bits;
     Word16 rf_tilt_buf[NB_SUBFR16k];
 
-    int16_t rf_indx_lsf[MAX_RF_FEC_OFFSET][3];
-    int16_t rf_indx_pitch[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
-    int16_t rf_indx_fcb[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
-    int16_t rf_indx_gain[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
-    int16_t rf_indx_EsPred[MAX_RF_FEC_OFFSET];
-    int16_t rf_indx_ltfMode[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
+    Word16 rf_indx_lsf[MAX_RF_FEC_OFFSET][3];
+    Word16 rf_indx_pitch[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
+    Word16 rf_indx_fcb[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
+    Word16 rf_indx_gain[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
+    Word16 rf_indx_EsPred[MAX_RF_FEC_OFFSET];
+    Word16 rf_indx_ltfMode[MAX_RF_FEC_OFFSET][NB_SUBFR16k];
 
-    int16_t rf_indx_nelp_fid[MAX_RF_FEC_OFFSET];
-    int16_t rf_indx_nelp_iG1[MAX_RF_FEC_OFFSET];
-    int16_t rf_indx_nelp_iG2[MAX_RF_FEC_OFFSET][2];
+    Word16 rf_indx_nelp_fid[MAX_RF_FEC_OFFSET];
+    Word16 rf_indx_nelp_iG1[MAX_RF_FEC_OFFSET];
+    Word16 rf_indx_nelp_iG2[MAX_RF_FEC_OFFSET][2];
 
-    int16_t rf_indx_tbeGainFr[MAX_RF_FEC_OFFSET];
+    Word16 rf_indx_tbeGainFr[MAX_RF_FEC_OFFSET];
 
-    int16_t rf_tcxltp_pitch_int_past;
-    int16_t rf_last_tns_active;
-    int16_t rf_second_last_tns_active;
-    int16_t rf_second_last_core;
-    int16_t rf_clas[MAX_RF_FEC_OFFSET];
-    int16_t rf_gain_tcx[MAX_RF_FEC_OFFSET];
-    int16_t rf_tcxltp_param[MAX_RF_FEC_OFFSET];
+    Word16 rf_tcxltp_pitch_int_past;
+    Word16 rf_last_tns_active;
+    Word16 rf_second_last_tns_active;
+    Word16 rf_second_last_core;
+    Word16 rf_clas[MAX_RF_FEC_OFFSET];
+    Word16 rf_gain_tcx[MAX_RF_FEC_OFFSET];
+    Word16 rf_tcxltp_param[MAX_RF_FEC_OFFSET];
 
-    int16_t RF_bwe_gainFr_ind;
+    Word16 RF_bwe_gainFr_ind;
 
 } RF_ENC_DATA, *RF_ENC_HANDLE;
 
@@ -1079,17 +1088,17 @@ typedef struct rf_enc_structure
 
 typedef struct plc_enc_evs_structure
 {
-    int16_t nBits; /* number of bits */
+    Word16 nBits; /* number of bits */
 
     Word16 Q_new;
     Word16 Q_exp;
 
-    int16_t enableGplc;
-    int16_t T0_4th;
-    int16_t T0;
-    int16_t calcOnlylsf;
-    int16_t pit_min;
-    int16_t pit_max;
+    Word16 enableGplc;
+    Word16 T0_4th;
+    Word16 T0;
+    Word16 calcOnlylsf;
+    Word16 pit_min;
+    Word16 pit_max;
 
     Word16 mem_MA_14Q1[M];
     Word16 mem_AR[M];
@@ -1122,8 +1131,8 @@ typedef struct tec_enc_structure
     Word16 loTempEnv[CLDFB_NO_COL_MAX];                                                   /* Q7 */
     Word16 loTempEnv_ns[CLDFB_NO_COL_MAX];                                                /* Q7 */
     Word16 hiTempEnv[CLDFB_NO_COL_MAX + DELAY_TEMP_ENV_BUFF_TEC + EXT_DELAY_HI_TEMP_ENV]; /* Q7 */
-    int16_t tranFlag;
-    int16_t corrFlag;
+    Word16 tranFlag;
+    Word16 corrFlag;
 
 } TEC_ENC_DATA, *TEC_ENC_HANDLE;
 
@@ -1134,63 +1143,63 @@ typedef struct tec_enc_structure
 
 typedef struct tcx_enc_structure
 {
-    int16_t L_frameTCX;
+    Word16 L_frameTCX;
 
-    int16_t tcxMode;           /* Chosen TCX mode for this frame */
-    int16_t transform_type[2]; /* TCX20/10/5 mode in each subframe */
+    Word16 tcxMode;           /* Chosen TCX mode for this frame */
+    Word16 transform_type[2]; /* TCX20/10/5 mode in each subframe */
 
     /* Core Signal Analysis Outputs */
 
     Word16 noiseTiltFactor;                   /* compensation for LPC tilt in noise filling Q15 */
-    int16_t noiseLevelMemory_cnt;             /* counter of consecutive low TCX noise levels */
+    Word16 noiseLevelMemory_cnt;              /* counter of consecutive low TCX noise levels */
     Word16 ltpGainMemory_fx[N_LTP_GAIN_MEMS]; /* for smoothing noiseTransWidth Q15 */
     STnsData tnsData[2];
-    // int16_t fUseTns[2];
+    // Word16 fUseTns[2];
     Word8 fUseTns[2];
-    int16_t bTnsOnWhithenedSpectra[2];
+    Word16 bTnsOnWhithenedSpectra[2];
 
-    // int16_t memQuantZeros[L_FRAME_PLUS]; /* Quantization deadzone flags */
+    // Word16 memQuantZeros[L_FRAME_PLUS]; /* Quantization deadzone flags */
     Word8 memQuantZeros[L_FRAME_PLUS]; /* Quantization deadzone flags */
     Word16 *speech_TCX;
     Word16 *new_speech_TCX;
     // Word16 q_speech_TCX;
 
-    int16_t tcxltp;
-    int16_t tcxltp_pitch_int;
-    int16_t tcxltp_pitch_fr;
+    Word16 tcxltp;
+    Word16 tcxltp_pitch_int;
+    Word16 tcxltp_pitch_fr;
     Word16 tcxltp_gain; /* Q15 */
-    int16_t tcxltp_pitch_int_past;
-    int16_t tcxltp_pitch_fr_past;
+    Word16 tcxltp_pitch_int_past;
+    Word16 tcxltp_pitch_fr_past;
     Word16 tcxltp_gain_past;        /* Q15 */
     Word16 tcxltp_norm_corr_past;   /* Q15 */
     Word16 tcxltp_norm_corr_mem;    /* Q15 */
     Word16 kernel_switch_corr_past; /* Q15 */
-    uint16_t kernel_type[2];        /* transform kernel type in each subframe (MDCT or MDST) */
-    uint16_t kernel_symmetry_past;  /* last TDA symmetry (0 for MDCT, 1 for MDST type) */
-    uint16_t enc_ste_pre_corr_past;
+    UWord16 kernel_type[2];         /* transform kernel type in each subframe (MDCT or MDST) */
+    UWord16 kernel_symmetry_past;   /* last TDA symmetry (0 for MDCT, 1 for MDST type) */
+    UWord16 enc_ste_pre_corr_past;
     Word32 tfm_mem_fx; /* state of IIR filtered temporal flatness measure Q31 */
     Word16 buf_speech_ltp[L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k];
     Word16 exp_buf_speech_ltp;
     Word16 *speech_ltp;
     Word16 *new_speech_ltp;
-    int16_t tcxltp_filt_idx;
-    int16_t tcxltp_bits;
-    int16_t tcxltp_param[LTPSIZE];
-    int16_t tcxltp_on_mem;
+    Word16 tcxltp_filt_idx;
+    Word16 tcxltp_bits;
+    Word16 tcxltp_param[LTPSIZE];
+    Word16 tcxltp_on_mem;
 
     Word16 measuredBwRatio; /* measured bw; used for TCX noise-filling. 1Q14 */
-    int16_t nmStartLine;    /* Starting line for the noise measurement */
+    Word16 nmStartLine;     /* Starting line for the noise measurement */
 
-    int16_t tcx_lpc_shaped_ari;
+    Word16 tcx_lpc_shaped_ari;
 
     Word16 old_out_fx[L_FRAME32k]; /* buffer for OLA; at the encoder, the maximum length is L_FRAME32k (corresponds to maximum internal L_frame length) */
     Word16 Q_old_out;
 
     /* MDCT switching */
     Word16 prev_hi_ener; /* Q8 */
-    int16_t prev_hi_sparse;
+    Word16 prev_hi_sparse;
     Word16 clas_sec_old_fx; /* Q13 */
-    int16_t clas_final_old;
+    Word16 clas_final_old;
     Word32 last_gain1; /* Q(31 - st->last_enerBuffer_exp) */
     Word32 last_gain2; /* Q(31 - st->last_enerBuffer_exp) */
 
@@ -1200,12 +1209,13 @@ typedef struct tcx_enc_structure
     Word16 q_Txnq;
     Word16 tcx_target_bits_fac; /* Q14 */
 
-    int16_t tns_ms_flag[2];
+    Word16 tns_ms_flag[2];
     Word32 *spectrum_fx[2]; /* MDCT output for a short block */
     Word16 spectrum_e[2];
     Word32 spectrum_long_fx[N_MAX]; /* MDCT output for a long block. Points to spectrum */
     Word16 spectrum_long_e;         /* MDCT output for a long block. Points to spectrum */
     Word16 q_spectrum_long_fx;
+    Word16 spectrum_length; /* corresponds to L_frameTCX, used for scaling of MDCT/MDST buffers */
 } TCX_ENC_DATA, *TCX_ENC_HANDLE;
 
 typedef struct TransientDetection
@@ -1232,9 +1242,9 @@ typedef struct enc_core_structure
 
     Word16 idchan;              /* channel ID (audio channel number) */
     Word16 id_element;          /* element ID */
-    int16_t element_mode;       /* element mode */
+    Word16 element_mode;        /* element mode */
     Word16 last_element_mode;   /* element mode */
-    int32_t element_brate;      /* element bitrate */
+    Word32 element_brate;       /* element bitrate */
     Word16 extl_orig;           /* extension layer */
     Word32 extl_brate_orig;     /* extension layer bitrate */
     Word16 codec_mode;          /* Mode1 or Mode2 */
@@ -1248,40 +1258,43 @@ typedef struct enc_core_structure
     BSTR_ENC_HANDLE hBstr; /* encoder bitstream handle */
     Word16 last_enerBuffer_exp;
 
-    int16_t bitstreamformat; /* Bitstream format flag (G.192/MIME) */
-    Word16 next_bit_pos_fx;  /* position of the next bit to be written in the bitstream */
-
-    int32_t input_Fs;                 /* input signal sampling frequency in Hz */
-    int32_t total_brate;              /* total bitrate in kbps of the codec */
-    int32_t last_total_brate;         /* last frame's total bitrate in kbps of the codec */
-    int32_t last_total_brate_cng;     /* last inactive frame's total bitrate in kbps of the codec */
-    int16_t core;                     /* core (ACELP_CORE, TCX_20_CORE, TCX_10_CORE, HQ_CORE, AMR_WB_CORE) */
-    int16_t last_core;                /* previous frame core */
-    int16_t coder_type;               /* core coder type */
-    int16_t flag_ACELP16k;            /* flag indicating use of ACELP core at 16kHz internal sampling rate */
-    int32_t core_brate;               /* core bitrate */
-    int32_t last_core_brate;          /* previous frame core bitrate */
-    int16_t extl;                     /* extension layer */
-    int16_t last_extl;                /* previous extension layer */
-    int32_t extl_brate;               /* extension layer bitrate */
-    int16_t input_bwidth;             /* input signal bandwidth */
-    int16_t bwidth;                   /* encoded bandwidth NB, WB, SWB or FB */
-    int16_t max_bwidth;               /* maximum encoded bandwidth */
-    int16_t last_input_bwidth;        /* input signal bandwidth in the previous frame */
-    int16_t last_bwidth;              /* coded bandwidth in the previous frame */
-    int16_t last_bwidth_cng;          /* coded bandwidth in the previous inactive frame */
-    int16_t bwidth_sw_cnt;            /* bandwidth switching counter */
-    int16_t L_frame;                  /* ACELP core internal frame length */
-    int16_t Opt_AMR_WB;               /* flag indicating AMR-WB IO mode */
-    int16_t Opt_DTX_ON;               /* flag indicating DTX operation */
-    int16_t cng_type;                 /* flag indicating LP or CLDFB based SID/CNG */
-    int16_t cng_sba_flag;             /* flag indicating CNG/SID for SBA 2TC */
-    int16_t Opt_SC_VBR;               /* flag indicating SC-VBR mode */
-    int16_t last_Opt_SC_VBR;          /* flag indicating prev frame's SC-VBR mode */
-    int16_t low_rate_mode;            /* low-rate mode flag */
-    int16_t inactive_coder_type_flag; /* inactive coder type flag (0 = AVQ / 1 = GSC) */
+    Word16 bitstreamformat; /* Bitstream format flag (G.192/MIME) */
+    Word16 next_bit_pos_fx; /* position of the next bit to be written in the bitstream */
+
+    Word32 input_Fs;                 /* input signal sampling frequency in Hz */
+    Word32 total_brate;              /* total bitrate in kbps of the codec */
+    Word32 last_total_brate;         /* last frame's total bitrate in kbps of the codec */
+    Word32 last_total_brate_cng;     /* last inactive frame's total bitrate in kbps of the codec */
+    Word16 core;                     /* core (ACELP_CORE, TCX_20_CORE, TCX_10_CORE, HQ_CORE, AMR_WB_CORE) */
+    Word16 last_core;                /* previous frame core */
+    Word16 coder_type;               /* core coder type */
+    Word16 flag_ACELP16k;            /* flag indicating use of ACELP core at 16kHz internal sampling rate */
+    Word32 core_brate;               /* core bitrate */
+    Word32 last_core_brate;          /* previous frame core bitrate */
+    Word16 extl;                     /* extension layer */
+    Word16 last_extl;                /* previous extension layer */
+    Word32 extl_brate;               /* extension layer bitrate */
+    Word16 input_bwidth;             /* input signal bandwidth */
+    Word16 bwidth;                   /* encoded bandwidth NB, WB, SWB or FB */
+    Word16 max_bwidth;               /* maximum encoded bandwidth */
+    Word16 last_input_bwidth;        /* input signal bandwidth in the previous frame */
+    Word16 last_bwidth;              /* coded bandwidth in the previous frame */
+    Word16 last_bwidth_cng;          /* coded bandwidth in the previous inactive frame */
+    Word16 bwidth_sw_cnt;            /* bandwidth switching counter */
+    Word16 L_frame;                  /* ACELP core internal frame length */
+    Word16 Opt_AMR_WB;               /* flag indicating AMR-WB IO mode */
+    Word16 Opt_DTX_ON;               /* flag indicating DTX operation */
+    Word16 cng_type;                 /* flag indicating LP or CLDFB based SID/CNG */
+    Word16 cng_sba_flag;             /* flag indicating CNG/SID for SBA 2TC */
+    Word16 Opt_SC_VBR;               /* flag indicating SC-VBR mode */
+    Word16 last_Opt_SC_VBR;          /* flag indicating prev frame's SC-VBR mode */
+    Word16 low_rate_mode;            /* low-rate mode flag */
+    Word16 inactive_coder_type_flag; /* inactive coder type flag (0 = AVQ / 1 = GSC) */
 #ifdef DEBUGGING
-    int16_t force; /* flag indicating specific signal type (0 = speech, 1 = music, -1 = N/A) */
+    Word16 force; /* flag indicating specific signal type (0 = speech, 1 = music, -1 = N/A) */
+#ifdef DEBUG_FORCE_DIR
+    char *force_dir; /* directory containing external binary files for modes/parameters enforcement (empty string indicates no enforcement) */
+#endif
 #endif
     Word16 nTimeSlots; /* for CLDFB */
 
@@ -1316,13 +1329,13 @@ typedef struct enc_core_structure
      * ACELP core parameters
      *----------------------------------------------------------------------------------*/
 
-    int16_t clas;       /* current frame clas */
-    int16_t last_clas;  /* previous frame signal classification */
+    Word16 clas;        /* current frame clas */
+    Word16 last_clas;   /* previous frame signal classification */
     Word16 prev_fmerit; /* previous signal classification score Q15 */
     Word16 fmerit_dt;   /* signal classification score difference Q15 */
-    int16_t Nb_ACELP_frames;
+    Word16 Nb_ACELP_frames;
 
-    int16_t pitch[3]; /* open-loop pitch values @12.8 kHz for three half-frames         */
+    Word16 pitch[3]; /* open-loop pitch values @12.8 kHz for three half-frames         */
     // Word16 pitch_fx[3];
     Word16 voicing_fx[3]; /* open-loop normalized correlation values for three half-frames Q15 */
 
@@ -1336,7 +1349,7 @@ typedef struct enc_core_structure
     Word16 lsf_old_fx[M];    /* old LSF vector at the end of the frame Qlog2(2.56) */
     Word16 lsp_old16k_fx[M]; /* old LSP vector at the end of the frame @16kHz Q15 */
     Word16 lspold_enc_fx[M]; /* old LSP vector at the end of the frame @16kHz Q15 */
-    int16_t pstreaklen;      /* LSF quantizer */
+    Word16 pstreaklen;       /* LSF quantizer */
     Word16 streaklimit_fx;   /* LSF quantizer Q15 */
     Word16 stab_fac_fx;      /* LSF stability factor Q15 */
     Word16 clip_var_fx[6];   /* pitch gain clipping memory [2.56x,Q14,Q8,Q0,Q14,Q14] */
@@ -1350,7 +1363,10 @@ typedef struct enc_core_structure
     Word16 no_scales_fx[MAX_NO_MODES][2];                             /* LSF LVQ structure Q0*/
     Word16 no_scales_p_fx[MAX_NO_MODES_p][2];                         /* LSF LVQ structure Q0*/
 
-    Word16 mem_preemph_fx; /* preemphasis filter memory Q(-1) */
+    Word16 mem_preemph_fx;       /* preemphasis filter memory Q(-1) */
+    Word16 mem_q;                /* preemphasis filter memory Q(-1) */
+    Word16 mem_preemph_q;        /* preemphasis filter memory Q(-1) */
+    Word16 mem_preemph_fx_q_inp; /* preemphasis filter memory Q(-1) */
 
     Word16 old_wsp_fx[L_WSP_MEM]; /* old weighted signal vector */
     Word16 exp_old_wsp;
@@ -1363,42 +1379,42 @@ typedef struct enc_core_structure
     Word16 mem_deemph_fx;     /* deemphasis filter memory */
     Word32 mem_hp20_in_fx[5]; /* HP filter memory for AMR-WB IO */
     Word16 mCb1_fx;           /* LSF quantizer - counter of stationary frames after a transition frame */
-    int16_t GSC_noisy_speech; /* AC mode (GSC) - flag to indicate GSC on SWB noisy speech */
-    int16_t GSC_IVAS_mode;
+    Word16 GSC_noisy_speech;  /* AC mode (GSC) - flag to indicate GSC on SWB noisy speech */
+    Word16 GSC_IVAS_mode;
     GSC_ENC_HANDLE hGSCEnc;
 
-    int16_t Last_pulse_pos;         /* FEC - last position of the first glottal pulse in the frame */
+    Word16 Last_pulse_pos;          /* FEC - last position of the first glottal pulse in the frame */
     Word16 lsfoldbfi0_fx[M];        /* FEC - LSF vector of the previous frame Qlog2(2.56) */
     Word16 lsfoldbfi1_fx[M];        /* FEC - LSF vector of the past previous frame Qlog2(2.56) */
     Word16 lsf_adaptive_mean_fx[M]; /* FEC - adaptive mean LSF vector for FEC Qlog2(2.56) */
-    int16_t next_force_safety_net;  /* FEC - flag to force safety net in next frame */
+    Word16 next_force_safety_net;   /* FEC - flag to force safety net in next frame */
     // Word16 next_force_safety_net_fx; /* FEC - flag to force safety net in next frame */
 
-    int16_t uv_count;      /* Stationary noise UV modification - unvoiced counter */
-    int16_t act_count;     /* Stationary noise UV modification - activation counter */
+    Word16 uv_count;       /* Stationary noise UV modification - unvoiced counter */
+    Word16 act_count;      /* Stationary noise UV modification - activation counter */
     Word32 ge_sm_fx;       /* Stationary noise UV modification - smoothed excitation gain Q(GE_SHIFT) */
     Word16 lspold_s_fx[M]; /* Stationary noise UV modification - old LSP vector Q15 */
-    int16_t noimix_seed;   /* Stationary noise UV modification - mixture seed */
+    Word16 noimix_seed;    /* Stationary noise UV modification - mixture seed */
     Word16 min_alpha_fx;   /* Stationary noise UV modification - minimum alpha Q15 */
     Word16 exc_pe_fx;      /* Stationary noise UV modification - memory of the preemphasis filter */
 
-    int16_t coder_type_raw;            /* raw coder_type (before UNVOICED is lost) */
-    int16_t last_coder_type_raw;       /* raw last_coder_type (coming from the sigal classification) */
-    int16_t last_coder_type;           /* previous coding type */
+    Word16 coder_type_raw;             /* raw coder_type (before UNVOICED is lost) */
+    Word16 last_coder_type_raw;        /* raw last_coder_type (coming from the sigal classification) */
+    Word16 last_coder_type;            /* previous coding type */
     Word16 old_thres_fx;               /* normalized correlation weighting in open-loop pitch Q14 */
     Word16 old_corr_fx;                /* normalized correlation in previous frame (mean value) Q15 */
-    int16_t old_pitch;                 /* previous pitch for open-loop pitch search */
-    int16_t delta_pit;                 /* open-loop pitch extrapolation correction */
+    Word16 old_pitch;                  /* previous pitch for open-loop pitch search */
+    Word16 delta_pit;                  /* open-loop pitch extrapolation correction */
     Word32 ee_old_fx;                  /* previous frame low/high frequency energy ratio Q6 */
-    int16_t min_band;                  /* minimum critical band of useful bandwidth */
-    int16_t max_band;                  /* maximum critical band of useful bandwidth */
-    int16_t tc_cnt;                    /* TC frame counter */
-    int16_t audio_frame_cnt;           /* Counter of relative presence of audio frames      */
+    Word16 min_band;                   /* minimum critical band of useful bandwidth */
+    Word16 max_band;                   /* maximum critical band of useful bandwidth */
+    Word16 tc_cnt;                     /* TC frame counter */
+    Word16 audio_frame_cnt;            /* Counter of relative presence of audio frames      */
     Word32 old_dE1_fx;                 /* Maximum energy increase in previous frame Q13 */
-    int16_t old_ind_deltaMax;          /* Index of the sub-subframe of maximum energy in previous frame */
+    Word16 old_ind_deltaMax;           /* Index of the sub-subframe of maximum energy in previous frame */
     Word32 old_enr_ssf_fx[2 * NB_SSF]; /* Maxima of energies per sub-subframes of previous frame */
-    int16_t spike_hyst;                /* Hysteresis to prevent UC after sharp energy spike */
-    int16_t last_harm_flag_acelp;      /* harmonicity flag for ACELP @32kbps rate */
+    Word16 spike_hyst;                 /* Hysteresis to prevent UC after sharp energy spike */
+    Word16 last_harm_flag_acelp;       /* harmonicity flag for ACELP @32kbps rate */
     Word16 old_Aq_12_8_fx[M + 1];      /* Q12 old Aq[] for core switching */
     Word16 old_Es_pred_fx;             /* old Es_pred for core switching Q8 */
     Word16 music_hysteresis_fx;        /* Counter of frames after AUDIO coding mode to prevent UC */
@@ -1421,7 +1437,7 @@ typedef struct enc_core_structure
     Word16 voicing0_sm_fx;
     Word16 voicing_sm_fx;
     Word16 LF_EnergyRatio_sm_fx;
-    int16_t predecision_flag;
+    Word16 predecision_flag;
     Word32 diff_sm_fx;   /* Q7 */
     Word32 energy_sm_fx; /* Q7 */
 
@@ -1443,21 +1459,24 @@ typedef struct enc_core_structure
     Word16 q_inp32;
     Word16 q_inp;
     Word16 *old_input_signal_fx;
+    Word32 *old_input_signal32_fx;
     Word16 q_old_inp;
+    Word16 q_old_inp32;
     Word16 Q_old_wtda;
 
     SIGNAL_BUFFERS_ENC_HANDLE hSignalBuf;
     Word32 *Bin_E_old_fx; /* per bin energy of old 2nd frames */
     Word16 q_Bin_E_old;
-    Word16 *mem_decim_fx;    /* decimation filter memory Q(-1) */
-    Word16 *mem_decim16k_fx; /* ACELP@16kHz - decimation filter memory @16kHz Q(-1) */
-    Word16 *old_inp_12k8_fx; /* memory of input signal at 12.8kHz */
-    Word16 *old_inp_16k_fx;  /* ACELP@16kHz - memory of input signal @16 kHz */
+    Word16 *mem_decim_fx;                      /* decimation filter memory Q(-1) */
+    Word16 mem_decim_fx_q_inp[2 * L_FILT_MAX]; /* decimation filter memory Q(-1) */
+    Word16 *mem_decim16k_fx;                   /* ACELP@16kHz - decimation filter memory @16kHz Q(-1) */
+    Word16 *old_inp_12k8_fx;                   /* memory of input signal at 12.8kHz */
+    Word16 *old_inp_16k_fx;                    /* ACELP@16kHz - memory of input signal @16 kHz */
 
-    Word16 *buf_speech_enc_pe;
-    Word16 *buf_synth; /*can be reduced to PIT_MAX_MAX+L_FRAME_MAX if no rate switching*/
-    Word16 *buf_speech_enc;
-    Word16 *buf_wspeech_enc;
+    Word16 *buf_speech_enc_pe; // exp_buf_speech_enc_pe
+    Word16 *buf_synth;         /*can be reduced to PIT_MAX_MAX+L_FRAME_MAX if no rate switching*/
+    Word16 *buf_speech_enc;    // exp_buf_speech_enc
+    Word16 *buf_wspeech_enc;   // exp_buf_wspeech_enc
 
     Word16 exp_buf_speech_enc_pe;
     Word16 exp_buf_speech_enc;
@@ -1480,9 +1499,9 @@ typedef struct enc_core_structure
 
     Word16 lgBin_E_fx[L_FFT / 2]; /* Q8 per bin energy of two frames */
 
-    int16_t sp_aud_decision0; /* 1st stage speech/music decision flag          */
-    int16_t sp_aud_decision1; /* 1st stage speech/music classification flag    */
-    int16_t sp_aud_decision2; /* 2nd stage speech/music classification flag    */
+    Word16 sp_aud_decision0; /* 1st stage speech/music decision flag          */
+    Word16 sp_aud_decision1; /* 1st stage speech/music classification flag    */
+    Word16 sp_aud_decision2; /* 2nd stage speech/music classification flag    */
 
     /*----------------------------------------------------------------------------------*
      * VAD/DTX/CNG
@@ -1493,9 +1512,9 @@ typedef struct enc_core_structure
     VAD_CLDFB_HANDLE hVAD_CLDFB;
     T_CldfbVadState vad_st;
 
-    int16_t vad_flag; /* i  : VAD flag         */
-    int16_t sharpFlag;
-    int16_t localVAD; /* i  : local VAD flag   */
+    Word16 vad_flag; /* i  : VAD flag         */
+    Word16 sharpFlag;
+    Word16 localVAD; /* i  : local VAD flag   */
 
     Word32 bckr_tilt_lt; /* Q16 */
     Word16 lp_speech_fx; /* Q8 */
@@ -1505,7 +1524,7 @@ typedef struct enc_core_structure
     Word16 voicing_old_fx;
     Word16 var_SID_rate_flag_fx; /* CNG and DTX - flag for variable SID rate */
     Word16 interval_SID_fx;
-    int16_t active_cnt; /* counter of active frames */
+    Word16 active_cnt; /* counter of active frames */
 
     TD_CNG_ENC_HANDLE hTdCngEnc;
 
@@ -1532,10 +1551,10 @@ typedef struct enc_core_structure
      *----------------------------------------------------------------------------------*/
 
     HANDLE_FD_CNG_ENC hFdCngEnc;
-    int16_t fd_cng_reset_flag;
+    Word16 fd_cng_reset_flag;
     Word16 last_totalNoise_fx;                                /* Q8 */
     Word16 totalNoise_increase_hist_fx[TOTALNOISE_HIST_SIZE]; /* Q8 */
-    int16_t totalNoise_increase_len;
+    Word16 totalNoise_increase_len;
 
     /*----------------------------------------------------------------------------------*
      * SC-VBR parameters
@@ -1552,7 +1571,7 @@ typedef struct enc_core_structure
     Word16 old_hpfilt_out_fx;
     Word32 EnergyLT_fx; /* Q(EnergyLT_fx_exp) */
     Word32 Energy_Old_fx;
-    int16_t TransientHangOver;
+    Word16 TransientHangOver;
 
     HQ_ENC_HANDLE hHQ_core; /* HQ core encoder handle */
 
@@ -1576,21 +1595,21 @@ typedef struct enc_core_structure
     Word16 lt_mean_NB_fx;  /* Q11 */
     Word16 lt_mean_WB_fx;  /* Q11 */
     Word16 lt_mean_SWB_fx; /* Q11 */
-    int16_t count_WB;
-    int16_t count_SWB;
-    int16_t count_FB;
+    Word16 count_WB;
+    Word16 count_SWB;
+    Word16 count_FB;
 
     /*----------------------------------------------------------------------------------*
      * Channel-aware mode
      *----------------------------------------------------------------------------------*/
 
-    int16_t rf_mode; /* flag to signal the RF mode */
-    int16_t rf_mode_last;
-    int16_t last_rf_mode_cng;
-    int16_t Opt_RF_ON;
-    int16_t rf_fec_offset;
-    int16_t rf_target_bits_write;
-    int16_t rf_fec_indicator;
+    Word16 rf_mode; /* flag to signal the RF mode */
+    Word16 rf_mode_last;
+    Word16 last_rf_mode_cng;
+    Word16 Opt_RF_ON;
+    Word16 rf_fec_offset;
+    Word16 rf_target_bits_write;
+    Word16 rf_fec_indicator;
 
     RF_ENC_HANDLE hRF; /* RF encoder handle */
 
@@ -1631,24 +1650,24 @@ typedef struct enc_core_structure
     Word16 exp_mem_preemph_enc; /* speech preemph filter memory (at encoder-sampling-rate) */
 
     /* Signal Buffers and Pointers at encoder-sampling-rate */
-    Word16 *speech_enc;
-    Word16 *speech_enc_pe;
-    Word16 *new_speech_enc;
-    Word16 *new_speech_enc_pe;
-    Word16 *wspeech_enc;
+    Word16 *speech_enc;        // exp_buf_speech_enc
+    Word16 *speech_enc_pe;     // exp_buf_speech_enc_pe
+    Word16 *new_speech_enc;    // exp_buf_speech_enc
+    Word16 *new_speech_enc_pe; // exp_buf_speech_enc_pe
+    Word16 *wspeech_enc;       // exp_buf_wspeech_enc
     Word16 *synth;
 
-    int16_t enableTcxLpc; /* global toggle for the TCX LPC quantizer */
-    int16_t envWeighted;  /* are is{p,f}_old_q[] weighted or not? */
+    Word16 enableTcxLpc; /* global toggle for the TCX LPC quantizer */
+    Word16 envWeighted;  /* are is{p,f}_old_q[] weighted or not? */
 
-    int16_t acelpEnabled; /* Flag indicating if ACELP can be used */
-    int16_t tcx10Enabled; /* Flag indicating if TCX 10 can be used */
-    int16_t tcx20Enabled; /* Flag indicating if TCX 20 can be used */
+    Word16 acelpEnabled; /* Flag indicating if ACELP can be used */
+    Word16 tcx10Enabled; /* Flag indicating if TCX 10 can be used */
+    Word16 tcx20Enabled; /* Flag indicating if TCX 20 can be used */
 
     Word16 mem_wsp_enc; /* wsp vector memory */
 
-    int16_t nb_bits_header_ace; /* number of bits for the header */
-    int16_t nb_bits_header_tcx; /* number of bits for the header */
+    Word16 nb_bits_header_ace; /* number of bits for the header */
+    Word16 nb_bits_header_tcx; /* number of bits for the header */
 
     Word16 preemph_fac; /*Preemphasis factor Q15*/
     Word16 gamma;       /* Q15 */
@@ -1657,8 +1676,9 @@ typedef struct enc_core_structure
     TRAN_DET_HANDLE hTranDet;
     TransientDetection transientDetection;
     Word16 transient_info[3];
-    int16_t acelpFramesCount;
+    Word16 acelpFramesCount;
     Word16 prevTempFlatness_fx; /* exponent is AVG_FLAT_E Q7 in EVS */ /* Q4 in IVAS */
+    Word32 prevTempFlatness_32fx;                                      /* Q21 in IVAS */
 
     // float currEnergyLookAhead;
     Word32 currEnergyLookAhead_fx; // Q31
@@ -1672,34 +1692,34 @@ typedef struct enc_core_structure
     Word16 parcorr[2];
     Word16 parcorr_mid[2];
 
-    int16_t lpcQuantization;
+    Word16 lpcQuantization;
     Word16 numlpc;
-    int16_t encoderLookahead_enc;
-    int16_t encoderPastSamples_enc;
-    int16_t encoderLookahead_FB;
+    Word16 encoderLookahead_enc;
+    Word16 encoderPastSamples_enc;
+    Word16 encoderLookahead_FB;
 
     /* pitch_ol for adaptive lag window */
 
-    int16_t old_pitch_la;  /* past open loop pitch lag from look-ahead before very short stable pitch detection */
+    Word16 old_pitch_la;   /* past open loop pitch lag from look-ahead before very short stable pitch detection */
     Word16 old_voicing_la; /* past open loop pitch gain from look-ahead */
 
     Word32 band_energies[2 * NB_BANDS]; /* energy in critical bands without minimum noise floor MODE2_E_MIN */
     Word16 band_energies_exp;           /* exponent for energy in critical bands without minimum noise floor MODE2_E_MIN */
 
-    int16_t acelp_autocorr; /* Optimize acelp in 0 covariance or 1 correlation domain */
+    Word16 acelp_autocorr; /* Optimize acelp in 0 covariance or 1 correlation domain */
 
-    int16_t pit_min;
-    int16_t pit_fr1;
-    int16_t pit_fr1b;
-    int16_t pit_fr2;
-    int16_t pit_max;
-    int16_t pit_res_max;
+    Word16 pit_min;
+    Word16 pit_fr1;
+    Word16 pit_fr1b;
+    Word16 pit_fr2;
+    Word16 pit_max;
+    Word16 pit_res_max;
 
     /* for FAC */
-    int16_t L_frame_past;
+    Word16 L_frame_past;
 
     /*Adaptive BPF*/
-    int16_t bpf_gain_param;
+    Word16 bpf_gain_param;
     Word32 mem_bpf_fx1[2 * L_FILT16k];
     Word32 mem_error_bpf_fx[2 * L_FILT16k];
     Word16 bpf_T[NB_SUBFR16k];
@@ -1714,24 +1734,24 @@ typedef struct enc_core_structure
         Word16 noise_shift_old;
     } mem_bpf_fx;
 
-    int16_t glr;
-    int16_t glr_idx[2];
+    Word16 glr;
+    Word16 glr_idx[2];
     Word32 mean_gc[2];     /* Q15 */
     Word16 prev_lsf4_mean; /* Qlog2(2.56) */
-    int16_t glr_reset;
-    int32_t last_sr_core;
+    Word16 glr_reset;
+    Word32 last_sr_core;
     Word16 last_stab_fac; /* Q15 */
 
     Word32 gain_code[NB_SUBFR16k];
 
     /*for rate switching*/
-    int16_t rate_switching_reset; /*Rate switching flag requiring a reset of memories at least partially */
-    int16_t rate_switching_reset_16kHz;
+    Word16 rate_switching_reset; /*Rate switching flag requiring a reset of memories at least partially */
+    Word16 rate_switching_reset_16kHz;
 
-    int16_t enablePlcWaveadjust;
-    int16_t Tonal_SideInfo;
+    Word16 enablePlcWaveadjust;
+    Word16 Tonal_SideInfo;
 
-    int16_t seed_acelp;
+    Word16 seed_acelp;
 
     PLC_ENC_EVS_HANDLE hPlcExt;
 
@@ -1740,27 +1760,28 @@ typedef struct enc_core_structure
      *----------------------------------------------------------------------------------*/
 
     IGF_ENC_INSTANCE_HANDLE hIGFEnc; /* IGF encoder handle */
-    int16_t igf;
+    Word16 igf;
 
     /*----------------------------------------------------------------------------------*
      * TEC
      *----------------------------------------------------------------------------------*/
 
-    int16_t tec_tfa;
+    Word16 tec_tfa;
     TEC_ENC_HANDLE hTECEnc; /* TEC encoder handle */
-    int16_t tec_flag;
-    int16_t tfa_flag;
+    Word16 tec_flag;
+    Word16 tfa_flag;
     Word32 tfa_enr[N_TEC_TFA_SUBFR];
 
     /*---------------------------------------------------------------*
      * IVAS parameters
      *---------------------------------------------------------------*/
 
-    int16_t tdm_LRTD_flag; /* LRTD stereo mode flag */
+    Word16 tdm_LRTD_flag;  /* LRTD stereo mode flag */
     Word16 cna_dirac_flag; /* CNA in DirAC flag */
 
     /* stereo switching memories */
     Word16 mem_preemph_DFT_fx;                                                          /* Q(-1) */
+    Word16 mem_preemph_DFT_fx_q_inp;                                                    /* Q(-1) */
     Word16 inp_12k8_mem_stereo_sw_fx[STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT]; /* Q(-1) */
     Word16 mem_preemph16k_DFT_fx;                                                       /* Q(-1) */
     Word16 inp_16k_mem_stereo_sw_fx[STEREO_DFT_OVL_16k - L_MEM_RECALC_16K - L_FILT16k]; /* Q(-1) */
@@ -1771,9 +1792,10 @@ typedef struct enc_core_structure
     Word16 is_ism_format; /* Indication whether the codec operates in ISM format */
 
     Word16 dtx_sce_sba; /* enable use of FD CNG with transform domain cores in SCE SBA */
-                        /*----------------------------------------------------------------------------------*
-                         * Fixed point only variables
-                         *----------------------------------------------------------------------------------*/
+
+    /*----------------------------------------------------------------------------------*
+     * Fixed point only variables
+     *----------------------------------------------------------------------------------*/
 
     Word16 last_ener_fx; /* AC mode (GSC) - previous energy                           */
 
@@ -1800,553 +1822,24 @@ typedef struct enc_core_structure
     Word16 prev_lpc_wb_fx[LPC_SHB_ORDER_WB];
     Word16 prev_lsp_wb_temp_fx[LPC_SHB_ORDER_WB];
 
-    int16_t sba_br_sw_while_no_data; /* Indicator for SBA bitrate switch while in FRAME_NO_DATA mode */
+    Word16 sba_br_sw_while_no_data; /* Indicator for SBA bitrate switch while in FRAME_NO_DATA mode */
 
 } Encoder_State, *ENC_CORE_HANDLE;
 
-// typedef struct Encoder_State_fx
-//{
-//
-//   /*----------------------------------------------------------------------------------*
-//    * Common parameters
-
-//    *----------------------------------------------------------------------------------*/
-//    /*----------------------------------------------------------------------------------*
-//     * Stereo/IVAS parameters
-//     *----------------------------------------------------------------------------------*/
-//   Word16  flag_ACELP16k;                      /* flag indicating use of ACELP core at 16kHz internal sampling rate */
-//
-//   Word16  tdm_LRTD_flag;                      /* LRTD stereo mode flag */
-//   Word16  cna_dirac_flag;                     /* CNA in DirAC flag */
-//   Word16  cng_sba_flag;                       /* CNG in SBA flag */
-//   Word16  idchan;                             /* channel ID (audio channel number) */
-//   Word16  element_mode;                       /* element mode */
-//   Word16  last_element_mode;                  /* element mode */
-//   Word16  low_rate_mode;                      /* low-rate mode flag */
-//   MCT_CHAN_MODE mct_chan_mode;
-//   Word16 GSC_IVAS_mode;
-//   Word16 is_ism_format; /* Indication whether the codec operates in ISM format */
-//   Word16 dtx_sce_sba; /* enable use of FD CNG with transform domain cores in SCE SBA */
-//
-//
-//   //#ifdef IVAS_CODE
-//
-// #ifdef DEBUGGING
-//   Word16  id_element; /* element ID */
-// #endif
-//   Word32 element_brate;                       /* element bitrate */
-//   Word16 extl_orig;                           /* extension layer */
-//   Word32 extl_brate_orig;                     /* extension layer bitrate */
-//   /*----------------------- End of IVAS specific--------------------------------------*/
-//
-//
-//   Word16 codec_mode;                          /* MODE1 or MODE2 */
-//   Word16 last_codec_mode;                     /* Previous Codec Mode*/
-//   Word16 last_codec_mode_cng;                 /* Codec Mode of the last inactive frame*/
-//   Word16 mdct_sw_enable;                      /* MDCT switching enable flag */
-//   Word16 mdct_sw;                             /* MDCT switching indicator */
-//   Word16 last_enerBuffer_exp;
-//   Word16 next_bit_pos_fx;                     /* position of the next bit to be written in the bitstream */
-//   Word16 bitstreamformat;                     /* Bitstream format flag (G.192/MIME) */
-//
-//   BSTR_ENC_HANDLE hBstr;                      /* encoder bitstream handle */
-//
-//
-//   LPD_state_HANDLE hLPDmem; /* ACELP LPDmem memories */
-//
-//
-//   Word32 input_Fs_fx;                         /* input signal sampling frequency in Hz */
-//   Word32 total_brate_fx;                      /* total bitrate in kbps of the codec */
-//   Word32 last_total_brate_fx;                 /* total bitrate in kbps of the codec */
-//   Word32 last_total_brate_cng_fx;             /* total bitrate in kbps of the last inactive frame */
-//   Word16 core_fx;                             /* core (ACELP_CORE, TCX_20_CORE, TCX_10_CORE, HQ_CORE, AMR_WB_CORE) */
-//   Word32 core_brate_fx;                        /* core bitrate */
-//   Word32 last_core_brate_fx;                    /* previous frame core bitrate */
-//   Word16 input_frame_fx;                      /* Frame lenght (function of input_Fs) */
-//   Word16 extl_fx;                             /* extension layer */
-//   Word16 last_extl_fx;                        /* previous extension layer */
-//   Word32 extl_brate_fx;                       /* extension layer bitrate */
-//   Word16 input_bwidth_fx;                     /* input signal bandwidth */
-//   Word16 last_input_bwidth_fx;                /* input signal bandwidth in the previous frame */
-//   Word16 bwidth_fx;                           /* encoded bandwidth NB, WB, SWB or FB */
-//   Word16 max_bwidth_fx;                       /* maximum encoded bandwidth */
-//   Word16 last_bwidth_fx;                      /* input signal bandwidth in the previous frame */
-//   Word16 last_bwidth_cng_fx;                  /* input signal bandwidth in the previous inactive frame */
-//   Word16 L_frame_fx;                          /* ACELP core internal frame length */
-//   Word16 Opt_AMR_WB_fx;                       /* flag indicating AMR-WB IO mode */
-//   Word16 Opt_DTX_ON_fx;                       /* flag indicating DTX operation */
-//   Word16 cng_type_fx;                         /* flag indicating LP or CLDFB based SID/CNG */
-//   Word16 active_fr_cnt_fx;                    /* counter of active frames */
-//   Word16 Opt_SC_VBR_fx;                       /* flag indicating SC-VBR mode */
-//   Word16 last_Opt_SC_VBR_fx;                  /* flag indicating SC-VBR mode in the last frame */
-//   /*----------------------------------------------------------------------------------*
-//    * ACELP core parameters
-//    *----------------------------------------------------------------------------------*/
-//
-//   Word16 clas_fx;                                 /* current frame clas */
-//   Word16 last_clas_fx;                            /* previous frame signal classification */
-//   Word32 Bin_E_fx[L_FFT];                         /* Q_new + Q_SCALE -2 per bin energy of two frames */
-//
-//   /*----------------------------------------------------------------------------------*
-//    * General signal buffers
-//    *----------------------------------------------------------------------------------*/
-//   Word16* input_buff;
-//   /*Word16* input;
-//   Word16* old_input_signal;*/
-//
-//   SIGNAL_BUFFERS_ENC_HANDLE hSignalBuf;
-//
-//   Word32* Bin_E_old_fx;    /* per bin energy of old 2nd frames */
-//   Word16* mem_decim_fx;    /* decimation filter memory */
-//   Word16* mem_decim16k_fx; /* ACELP@16kHz - decimation filter memory @16kHz */
-//   Word16* old_inp_12k8_fx; /* memory of input signal at 12.8kHz */
-//   Word16* old_inp_16k_fx;  /* ACELP@16kHz - memory of input signal @16 kHz */
-//
-//   Word16* buf_speech_enc_pe;
-//   Word16* buf_synth; /*can be reduced to PIT_MAX_MAX+L_FRAME_MAX if no rate switching*/
-//   Word16* buf_speech_enc;
-//   Word16* buf_wspeech_enc;
-//
-//
-//   Word16 lsp_old1_fx[M];                          /* old unquantized LSP vector at the end of the frame */
-//   Word16 lsf_old1_fx[M];                          /* old LSF vector at the end of the frame */
-//   Word16 lsp_old_fx[M];                           /* old LSP vector at the end of the frame */
-//   Word16 lsf_old_fx[M];                           /* old LSF vector at the end of the frame */
-//   Word16 lsp_old16k_fx[M];                        /* old LSP vector at the end of the frame @16kHz */
-//   Word16 lspold_enc_fx[M];                        /* old LSP vector at the end of the frame @16kHz */
-//   Word16 pstreaklen_fx;                           /* LSF quantizer */
-//   Word16 streaklimit_fx;                          /* LSF quantizer */
-//   Word32 offset_scale1_fx[MAX_NO_MODES + 1][MAX_NO_SCALES + 1]; /* offsets for LSF LVQ structure 1st 8-dim subvector*/
-//   Word32 offset_scale2_fx[MAX_NO_MODES + 1][MAX_NO_SCALES + 1]; /* offsets for LSF LVQ structure 2nd 8-dim subvector*/
-//   Word32 offset_scale1_p_fx[MAX_NO_MODES_p + 1][MAX_NO_SCALES + 1]; /* offsets for LSF LVQ structure, pred. case, 1st 8-dim subvector*/
-//   Word32 offset_scale2_p_fx[MAX_NO_MODES_p + 1][MAX_NO_SCALES + 1]; /* offsets for LSF LVQ structure, pred. case, 2nd 8-dim subvector*/
-//   Word16 no_scales_fx[MAX_NO_MODES][2];                         /* LSF LVQ structure Q0*/
-//   Word16 no_scales_p_fx[MAX_NO_MODES_p][2];                     /* LSF LVQ structure Q0*/
-//   Word16 stab_fac_fx;                                        /* LSF stability factor */
-//   Word16 mem_deemph_fx;                                   /* deemphasis filter memory */
-//   Word16 mem_preemph_fx;                                  /* preemphasis filter memory */
-//   Word32 mem_hp20_in_fx[5];                               /* HP filter memory for AMR-WB IO */
-//   Word16 old_wsp_fx[L_WSP_MEM];                           /* old weighted signal vector */
-//   /*Word16 old_exc_fx[L_EXC_MEM];*/                           /* old excitation vector */
-//   Word16 old_wsp2_fx[(L_WSP_MEM - L_INTERPOL) / OPL_DECIM]; /* old decimated weighted signal vector qwsp */
-//
-//   /*----------------------------------------------------------------------------------*
-//    * Noise estimation
-//    *----------------------------------------------------------------------------------*/
-//
-//   NOISE_EST_HANDLE hNoiseEst;
-//
-//   Word16 mem_wsp_fx;                                        /* weighted signal vector memory */
-//   Word16 mem_decim2_fx[3];                                /* weighted signal decimation filter memory qwsp */
-//   Word16 clip_var_fx[6];
-//   Word16 mem_AR_fx[M];                                    /* AR memory of LSF quantizer (past quantized LSFs without mean) */
-//   Word16 mem_MA_fx[M];                                    /* MA memory of LSF quantizer (past quantized residual) (used also in AMR-WB IO mode) */
-//   Word16 mCb1_fx;                                         /* LSF quantizer - counter of stationary frames after a transition frame */
-//   Word16 coder_type_raw_fx;
-//   Word16 last_coder_type_raw_fx;                          /* raw last_coder_type (coming from the sigal classification) */
-//   Word16 last_coder_type;                              /*Q0 previous coding type */
-//   Word16 ini_frame_fx;                                    /* initialization frames counter */
-//   Word16 old_thres_fx;                                    /* normalized correlation weighting in open-loop pitch Q15 */
-//   Word16 old_corr_fx;                                     /* normalized correlation in previous frame (mean value) Q15 */
-//   Word16 old_pitch;                                       /* previous pitch for open-loop pitch search Q0 */
-//   Word16 delta_pit_fx;                                    /* open-loop pitch extrapolation correction Q0 */
-//   Word32 ee_old_fx;
-//   Word16 min_band_fx;                                     /* Q0 minimum critical band of useful bandwidth */
-//   Word16 max_band_fx;                                     /* Q0 maximum critical band of useful bandwidth */
-//   Word16 tc_cnt_fx;                                       /* TC frame counter */
-//   Word16 audio_frame_cnt_fx;                              /* Counter of relative presence of audio frames      */
-//   Word32 old_dE1_fx;                                      /* Maximum energy increase in previous frame */
-//   Word16 old_ind_deltaMax_fx;                             /* Index of the sub-subframe of maximum energy in previous frame */
-//   Word32 old_enr_ssf_fx[2 * NB_SSF];                        /* Maxima of energies per sub-subframes of previous frame */
-//   Word16 spike_hyst_fx;                                   /* Hysteresis to prevent UC after sharp energy spike */
-//   Word16 music_hysteresis_fx;                             /* Counter of frames after AUDIO coding mode to prevent UC */
-//   Word16 last_harm_flag_acelp_fx;                         /* harmonicity flag for ACELP @32kbps rate */
-//   Word16 old_Aq_12_8_fx[M + 1];                             /* Q12 old Aq[] for core switching */
-//   Word16 old_Es_pred_fx;                                  /* Q8 old Es_pred for core switching */
-//
-//   GSC_ENC_HANDLE hGSCEnc;
-//
-//
-//   Word16 GSC_noisy_speech;                             /* AC mode (GSC) - flag to indicate GSC on SWB noisy speech */
-//
-//   SP_MUS_CLAS_HANDLE hSpMusClas;
-//
-//   Word16 lgBin_E_fx[L_FFT / 2];                             /* Q8 per bin energy of two frames */
-//
-//   /* speech/music classifier improvement parameters */
-//   Word16 last_vad_spa_fx;
-//
-//
-//   Word16 Last_pulse_pos_fx;                               /* FEC - last position of the first glotal pulse in the frame */
-//   Word16 lsfoldbfi0_fx[M];                                /* FEC - LSF vector of the previous frame */
-//   Word16 lsfoldbfi1_fx[M];                                /* FEC - LSF vector of the past previous frame */
-//   Word16 lsf_adaptive_mean_fx[M];                         /* FEC - adaptive mean LSF vector for FEC */
-//   Word16 next_force_safety_net_fx;                        /* FEC - flag to force safety net in next frame */
-//
-//
-//   /*----------------------------------------------------------------------------------*
-//    * VAD/DTX/CNG
-//    *----------------------------------------------------------------------------------*/
-//
-//   VAD_HANDLE hVAD;
-//
-//   VAD_CLDFB_HANDLE hVAD_CLDFB;
-//   Word16 lp_speech_fx;
-//   Word16 Opt_HE_SAD_ON_fx;
-//   Word16 nb_active_frames_HE_SAD_fx;
-//
-//
-//
-//
-//   Word16 voicing_old_fx;
-//
-//
-//   Word32 bckr_tilt_lt;
-//
-//
-//   TD_CNG_ENC_HANDLE hTdCngEnc;
-//
-//   DTX_ENC_HANDLE hDtxEnc;
-//   Word16 var_SID_rate_flag_fx;                        /* CNG and DTX - flag for variable SID rate */
-//   Word16 interval_SID_fx;                             /* CNG and DTX - interval of SID update, default 8 */
-//
-//   Word16 lp_noise_fx;                                 /* CNG and DTX - LP filtered total noise estimation */
-//
-//   Word16  uv_count;                        /*Q0*/  /* Stationary noise UV modification - unvoiced counter */
-//   Word16 act_count;                        /*Q0*/  /* Stationary noise UV modification - activation counter */
-//   Word32 ge_sm_fx;                                    /* Stationary noise UV modification - smoothed excitation gain */
-//   Word16 lspold_s_fx[M];                      /*Q15*/ /* Stationary noise UV modification - old LSP vector */
-//   Word16 noimix_seed;                      /*Q0*/  /* Stationary noise UV modification - mixture seed */
-//   Word16 min_alpha_fx;                        /*Q15*/ /* Stationary noise UV modification - minimum alpha */
-//   Word16 exc_pe_fx;                                   /* Stationary noise UV modification - memory of the preemphasis filter */
-//
-//   Word16 last_L_frame_fx;                             /* ACELP@16kHz - last L_frame value */
-//   Word16 mem_preemph16k_fx;                           /* ACELP@16kHz - preemphasis filter memory @16kHz */
-//   Word16 mem_deemp_preQ_fx;                           /* ACELP@16kHz - prequantizer deemhasis memory */
-//   Word16 mem_preemp_preQ_fx;                          /* ACELP@16kHz - prequantizer preemhasis memory */
-//   Word16 last_nq_preQ;                             /* ACELP@16kHz - AVQ subquantizer number of the last sub-band of the last subframe  */
-//   Word16 use_acelp_preq;                              /* ACELP@16kHz - flag of prequantizer usage */
-//
-//   Word16 bpf_off_fx;
-//   Word16 old_pitch_buf_fx[2 * NB_SUBFR16k];             /*Q6 Bass post-filter - buffer of old subframe pitch values */
-//
-//
-//   /* stable short pitch detection */
-//   Word16 voicing0_sm_fx;
-//   Word16 voicing_sm_fx;
-//   Word16 LF_EnergyRatio_sm_fx;
-//   Word16 predecision_flag_fx;
-//   Word32 diff_sm_fx;
-//   Word32 energy_sm_fx;
-//
-//   Word16 last_ener_fx;                                    /* AC mode (GSC) - previous energy                           */
-//
-//   /*----------------------------------------------------------------------------------*
-//    * AMR-WB IO handle
-//    *----------------------------------------------------------------------------------*/
-//   HANDLE_CLDFB_FILTER_BANK cldfbAna_Fx;
-//
-//   AMRWB_IO_ENC_HANDLE hAmrwb_IO; /* AMR-WB IO encoder handle */
-//
-//   /*----------------------------------------------------------------------------------*
-//    * CLDFB analysis
-//    *----------------------------------------------------------------------------------*/
-//   HANDLE_CLDFB_FILTER_BANK cldfbAna_Fx;
-//
-//   HANDLE_CLDFB_FILTER_BANK cldfbSyn_Fx;
-//
-//   /*----------------------------------------------------------------------------------*
-//   * FD CNG handle
-//   *----------------------------------------------------------------------------------*/
-//   HANDLE_FD_CNG_ENC_FX hFdCngEnc_fx;
-//   Word16 fd_cng_reset_flag;
-//   Word16 last_totalNoise_fx;
-//   Word16 totalNoise_increase_hist_fx[TOTALNOISE_HIST_SIZE];
-//   Word16 totalNoise_increase_len_fx;
-//   /*----------------------------------------------------------------------------------*
-//    * SC-VBR parameters
-//    *----------------------------------------------------------------------------------*/
-//
-//    /*----------------------------------------------------------------------------------*
-//     * SC-VBR parameters
-//     *----------------------------------------------------------------------------------*/
-//
-//   SC_VBR_ENC_HANDLE hSC_VBR;
-//
-//   /*----------------------------------------------------------------------------------*
-//    * HQ core parameters
-//    *----------------------------------------------------------------------------------*/
-//   Word16 * input;
-//   Word16 * old_input_signal_fx;
-//   Word16 Q_old_wtda;
-//   Word16 old_hpfilt_in_fx;
-//   Word16 old_hpfilt_out_fx;
-//   Word32 EnergyLT_fx;
-//   Word32 Energy_Old_fx;
-//   Word16 TransientHangOver_fx;
-//   Word16 last_core_fx;
-//
-//   HQ_ENC_HANDLE hHQ_core; /* HQ core encoder handle */
-//
-//   Word16 Nb_ACELP_frames_fx;
-//
-//   PVQ_ENC_HANDLE hPVQ;
-//
-//   /*----------------------------------------------------------------------------------*
-//    * TD BWE parameters
-//    *----------------------------------------------------------------------------------*/
-//
-//   TD_BWE_ENC_HANDLE hBWE_TD;
-//
-//   /*----------------------------------------------------------------------------------*
-//    * FD BWE parameters
-//    *----------------------------------------------------------------------------------*/
-//
-//   FD_BWE_ENC_HANDLE hBWE_FD;
-//
-//   /*----------------------------------------------------------------------------------*
-//    * WB, SWB and FB bandwidth detector
-//    *----------------------------------------------------------------------------------*/
-//
-//   Word16 lt_mean_NB_fx;
-//   Word16 lt_mean_WB_fx;
-//   Word16 lt_mean_SWB_fx;
-//   Word16 count_WB_fx;
-//   Word16 count_SWB_fx;
-//   Word16 count_FB_fx;
-//
-//   RF_ENC_HANDLE hRF; /* RF encoder handle */
-//
-//   Word16 rf_mode;
-//   Word16 rf_target_bits_write;
-//   Word16 rf_mode_last;
-//   Word16 last_rf_mode_cng;
-//   Word16 Opt_RF_ON;
-//   Word16 rf_fec_offset;
-//   Word16 rf_fec_indicator;
-//
-//   /*----------------------------------------------------------------------------------*
-//    * Fixed point only variables
-//    *----------------------------------------------------------------------------------*/
-//
-//   Word16 prev_Q_bwe_exc;
-//   Word16 prev_Q_bwe_syn;
-//   Word16 Q_stat_noise_ge;
-//   Word16 Q_stat_noise;
-//   Word16 Q_syn2;
-//   Word16 Q_syn;
-//   Word16 Q_max[L_Q_MEM];
-//   Word16 Q_max_16k[L_Q_MEM];
-//   Word16 Q_old;
-//   Word16 prev_Q_old;
-//   Word16 old_wsp_max;                   /* Last weigthed speech maximal value     */
-//   Word16 old_wsp_shift;                 /* Last wsp scaling                       */
-//   Word16 prev_Q_new;
-//   Word16 prev_Q_shb;
-//
-//   /*----------------------------------------------------------------------------------*
-//    *
-//    *----------------------------------------------------------------------------------*/
-//
-//   Word16 EnergyLT_fx_exp;
-//   Word16 prev_lsp_wb_fx[LPC_SHB_ORDER_WB];
-//   Word16 prev_lpc_wb_fx[LPC_SHB_ORDER_WB];
-//   Word16 prev_lsp_wb_temp_fx[LPC_SHB_ORDER_WB];
-//
-//   Word16 frame_size_index;      /* 0-FRAME_SIZE_NB-1: index determining the frame size */
-//   Word16 bits_frame_nominal;    /* avg bits per frame on active frame */
-//   Word16 bits_frame;            /* total bits per frame */
-//   Word16 bits_frame_core;       /* bits per frame for the core */
-//   Word8 narrowBand;
-//
-//   /*ACELP config*/
-//   ACELP_config acelp_cfg;       /* configuration set for each frame */
-//
-//   ACELP_config acelp_cfg_rf; /* configuration for RF frame */
-//
-//   Word16 mode_index;            /* Mode Index for LPD core */
-//
-//   /*TCX config*/
-//   TCX_CONFIG_HANDLE hTcxCfg;
-//   /*----------------------------------------------------------------------------------*
-//    * TCX core encoder handle
-//    *----------------------------------------------------------------------------------*/
-//
-//   TCX_ENC_HANDLE hTcxEnc;
-//
-//   /* cod_main.c */
-//   Word16 mem_preemph_enc;              /* speech preemph filter memory (at encoder-sampling-rate) */
-//
-//
-//   Word16 *speech_enc;
-//   Word16 *speech_enc_pe;
-//   Word16 *new_speech_enc;
-//   Word16 *new_speech_enc_pe;
-//   Word16 *wspeech_enc;
-//   Word16 *synth;
-//   /* Core Signal Analysis Outputs */
-//
-//   Word8 enableTcxLpc; /* global toggle for the TCX LPC quantizer */
-//   Word16 envWeighted;  /* are is{p,f}_old_q[] weighted or not? */
-//
-//   Word8 acelpEnabled; /* Flag indicating if ACELP can be used */
-//   Word8 tcx10Enabled; /* Flag indicating if TCX 10 can be used */
-//   Word8 tcx20Enabled; /* Flag indicating if TCX 20 can be used */
-//
-//
-//   Word16 mem_wsp_enc;                   /* wsp vector memory */
-//
-//   Word16  nb_bits_header_ace;          /* number of bits for the header */
-//   Word16  nb_bits_header_tcx;          /* number of bits for the header */
-//
-//   /*Added by fcs : restrict the possible in EVS: 0 base 10 = d.c.b.a base 2*/
-//   /* a = 0/1 : ACELP on/off*/
-//   /* b = 0/1 : TCX20 on/off*/
-//   /* c = 0/1 : TCX40 on/off*/
-//   /* d = 0/1 : TCX80 on/off*/
-//   Word16 restrictedMode;
-//
-//   /* Framing */
-//   Word16 nb_subfr;
-//
-//   Word16 preemph_fac;   /*Preemphasis factor*/
-//
-//   Word16 gamma;
-//   Word16 inv_gamma;
-//
-//   TransientDetection transientDetection;
-//   Word16 transient_info[3];
-//
-//   Word16 acelpFramesCount; /* Acelp frame counter. Counts upto 50 only !!! */
-//
-//   Word16 prevTempFlatness_fx; /*  exponent is AVG_FLAT_E */
-//
-//   Word32 prevEnergyHF_fx;
-//   Word32 currEnergyHF_fx;
-//   Word16 currEnergyHF_e_fx; /* exponent of currEnergyHF and prevEnergyHF */
-//   Word32 energyCoreLookahead_Fx;
-//   Word16 sf_energyCoreLookahead_Fx;
-//
-//   /* lsf quantizer*/
-//   Word16 parcorr[2];
-//   Word16 parcorr_mid[2];
-//
-//   Word16  lpcQuantization;
-//   Word16  numlpc;
-//   Word16 encoderLookahead_enc;
-//   Word16 encoderPastSamples_enc;
-//   Word16 encoderLookahead_FB;
-//
-//   /* pitch_ol for adaptive lag window */
-//   Word16 old_pitch_la;               /* past open loop pitch lag from look-ahead  */
-//   Word16 old_voicing_la;             /* past open loop pitch gain from look-ahead */
-//
-//   Word32 band_energies[2 * NB_BANDS];     /* energy in critical bands without minimum noise floor MODE2_E_MIN */
-//   Word16 band_energies_exp;             /* exponent for energy in critical bands without minimum noise floor MODE2_E_MIN */
-//
-//   Word8 tcxonly;
-//
-//   Word16 Q_max_enc[2];
-//
-//   Word16 finalVAD;
-//   Word8 flag_noisy_speech_snr;              /*encoder detector for noisy speech*/
-//   Word16 Pos_relE_cnt;                      /* Number of frames between positive relE */
-//
-//   Word16 fscale;
-//   Word32 sr_core;
-//   Word32 last_sr_core;
-//   Word8  acelp_autocorr;                   /* Optimize acelp in 0 covariance or 1 correlation domain */
-//
-//   Word16 pit_min;
-//   Word16 pit_fr1;
-//   Word16 pit_fr1b;
-//   Word16 pit_fr2;
-//   Word16 pit_max;
-//   Word16 pit_res_max; /* goes from 1 upto 6 (see core_enc_init.c: init_acelp()) */
-//
-//   /* for FAC */
-//   Word16 L_frame_past;
-//
-//   /*Adaptive BPF*/
-//   Word16 bpf_gain_param;
-//   Word16 bpf_T[NB_SUBFR16k];
-//   Word16 bpf_gainT[NB_SUBFR16k];
-//
-//   struct MEM_BPF
-//   {
-//     Word16 noise_buf[2 * L_FILT16k];
-//     Word16 error_buf[L_FILT16k];
-//     Word32 lp_error;
-//     Word32 lp_error_ener;
-//     Word16 noise_shift_old;
-//   } mem_bpf;
-//
-//
-//
-//   Word8 glr;
-//   Word16 glr_idx[2];
-//   Word32 gain_code[NB_SUBFR16k];
-//   Word32 mean_gc[2];
-//   Word16 prev_lsf4_mean;
-//   Word16 last_stab_fac;
-//   Word8 glr_reset;
-//
-//   /*for rate switching*/
-//   Word16 rate_switching_reset; /*Rate switching flag requiring a reset of memories at least partially */
-//   Word16 rate_switching_reset_16kHz;
-//
-//   Word16 enablePlcWaveadjust;
-//   Word16 Tonal_SideInfo;
-//
-//   IGF_ENC_INSTANCE_HANDLE hIGFEnc; /* IGF encoder handle */
-//   Word16 igf;
-//
-//   Word16 seed_acelp;
-//
-//   PLC_ENC_EVS_HANDLE hPlcExt;
-//
-//   Word16 tec_tfa;
-//   TEC_ENC_HANDLE hTECEnc; /* TEC encoder handle */
-//   Word16 tec_flag;
-//   Word16 tfa_flag;
-//   Word32 tfa_enr[N_TEC_TFA_SUBFR];
-//
-//   Word16 nTimeSlots;                     /* for CLDFB */
-//
-//   T_CldfbVadState_fx vad_st;
-//
-//
-//   Word16 pitch_fx[3];
-//   Word16 voicing_fx[3];
-//   Word16 sp_aud_decision0;                          /* 1st stage speech/music classification    */
-//   Word16 sp_aud_decision1;                          /* 1st stage speech/music classification    */
-//   Word16 sp_aud_decision2;                          /* 2nd stage speech/music classification    */
-//   Word16 coder_type;                                /* coder type                               */
-//   Word16 vad_flag;
-//   Word16 sharpFlag;                                 /* formant sharpening flag                  */
-//   Word16 localVAD;
-//
-//   Word16 tdm_pc;
-//   Word16 prev_fmerit;
-//   Word16 fmerit_dt;
-//
-//
-// } Encoder_State, * ENC_CORE_HANDLE_FX;
 
 typedef struct GainItemStr
 {
-    int16_t gainIndex;
+    Word16 gainIndex;
 } GainItem;
 
 typedef struct context_rc_mem_struct
 {
-    int16_t nbits_old;
-    int16_t ctx;
-    Word32 bit_estimate_fx;
-    Word16 bit_estimate_e;
-    int16_t rateFlag;
-    int16_t lastnz;
-    int16_t nt_half;
+    Word16 nbits_old;
+    Word16 ctx;
+    Word64 bit_estimate_fx; /* Q23 */
+    Word16 rateFlag;
+    Word16 lastnz;
+    Word16 nt_half;
 
 } RC_CONTEXT_MEM, *HANDLE_RC_CONTEXT_MEM;
 
diff --git a/lib_enc/stat_noise_uv_enc.c b/lib_enc/stat_noise_uv_enc.c
deleted file mode 100644
index fc894ba6cc3b0f6891e5522d7bdaa893786ada84..0000000000000000000000000000000000000000
--- a/lib_enc/stat_noise_uv_enc.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/stat_noise_uv_enc_fx.c b/lib_enc/stat_noise_uv_enc_fx.c
index 1045d8efd8c45b22973cc66673b87d16928ad0cb..24932542ce178bea11bb597e42f06d43d7575017 100644
--- a/lib_enc/stat_noise_uv_enc_fx.c
+++ b/lib_enc/stat_noise_uv_enc_fx.c
@@ -11,7 +11,6 @@
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
-#include "prot.h"
 
 /*======================================================================*/
 /* FUNCTION : stat_noise_uv_enc_fx                                      */
@@ -49,10 +48,13 @@ void stat_noise_uv_enc_fx(
     Word16 Q_new )
 {
     Word16 noisiness = 0;
+    move16();
     Word16 num, den, expn, expd;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
+    test();
     test();
     test();
     IF( ( EQ_16( st_fx->coder_type, UNVOICED ) && uc_two_stage_flag == 0 ) || ( EQ_16( st_fx->coder_type, INACTIVE ) && LE_32( st_fx->core_brate, ACELP_9k60 ) ) )
@@ -63,24 +65,12 @@ void stat_noise_uv_enc_fx(
          *-----------------------------------------------------------------*/
         /* epsP[2] is located in LepsP[0] and epsP[16] in LepsP[1] */
         expn = sub( norm_l( LepsP[0] ), 1 );
-#ifdef BASOP_NOGLOB
         num = extract_h( L_shl_o( LepsP[0], expn, &Overflow ) ); /*expn-16*/
-#else
-        num = extract_h( L_shl( LepsP[0], expn ) );    /*expn-16*/
-#endif
         expd = norm_l( LepsP[1] );
-#ifdef BASOP_NOGLOB
-        den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) ); /*expd-16*/
-#else
-        den = extract_h( L_shl( LepsP[1], expd ) );    /*expd-16*/
-#endif
-        num = div_s( num, den ); /*expn-expd+15*/
-#ifdef BASOP_NOGLOB
+        den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) );    /*expd-16*/
+        num = div_s( num, den );                                    /*expn-expd+15*/
         num = shr_o( num, add( sub( expn, expd ), 5 ), &Overflow ); /*Q10*/
-#else
-        num = shr( num, add( sub( expn, expd ), 5 ) ); /*Q10*/
-#endif
-        num = sub( num, 1024 ); /*num - 1*/
+        num = sub( num, 1024 );                                     /*num - 1*/
 
         test();
         IF( NE_16( st_fx->bwidth, NB ) )
@@ -104,7 +94,7 @@ void stat_noise_uv_enc_fx(
         noisiness = s_max( noisiness, 0 );
         noisiness = s_min( noisiness, 31 );
 
-        push_indice_fx( st_fx->hBstr, IND_NOISINESS, noisiness, 5 );
+        push_indice( st_fx->hBstr, IND_NOISINESS, noisiness, 5 );
     }
 
     /*-----------------------------------------------------------------*
@@ -128,7 +118,7 @@ void stat_noise_uv_enc_ivas_fx(
     Word16 *Aq,                     /* i  : A(z) quantized for the 4 subframes  Q=12 */
     Word16 *exc2,                   /* i/o: excitation buffer         Q=Q_stat_noise */
     const Word16 uc_two_stage_flag, /* o  : flag undicating two-stage UC	         */
-    Word16 Q_new )
+    Word16 *Q_new )
 {
     Word16 noisiness = 0;
     move16();
@@ -148,24 +138,12 @@ void stat_noise_uv_enc_ivas_fx(
          *-----------------------------------------------------------------*/
         /* epsP[2] is located in LepsP[0] and epsP[16] in LepsP[1] */
         expn = sub( norm_l( LepsP[0] ), 1 );
-#ifdef BASOP_NOGLOB
         num = extract_h( L_shl_o( LepsP[0], expn, &Overflow ) ); /*expn-16*/
-#else
-        num = extract_h( L_shl( LepsP[0], expn ) );    /*expn-16*/
-#endif
         expd = norm_l( LepsP[1] );
-#ifdef BASOP_NOGLOB
-        den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) ); /*expd-16*/
-#else
-        den = extract_h( L_shl( LepsP[1], expd ) );    /*expd-16*/
-#endif
-        num = div_s( num, den ); /*expn-expd+15*/
-#ifdef BASOP_NOGLOB
+        den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) );    /*expd-16*/
+        num = div_s( num, den );                                    /*expn-expd+15*/
         num = shr_o( num, add( sub( expn, expd ), 5 ), &Overflow ); /*Q10*/
-#else
-        num = shr( num, add( sub( expn, expd ), 5 ) ); /*Q10*/
-#endif
-        num = sub( num, 1024 ); /*num - 1*/
+        num = sub( num, 1024 );                                     /*num - 1*/
 
         test();
         IF( NE_16( st_fx->bwidth, NB ) )
diff --git a/lib_enc/subband_fft.c b/lib_enc/subband_fft.c
deleted file mode 100644
index 8d4adb219f2e97f01fc9e529ffbc94de34a8fde5..0000000000000000000000000000000000000000
--- a/lib_enc/subband_fft.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/subband_fft_fx.c b/lib_enc/subband_fft_fx.c
index 83a1b41dd1dc30fe79f5b36f00f8f584d2ead612..10de09fe95e85e1dbbbc7ef6f6686115770cbbc6 100644
--- a/lib_enc/subband_fft_fx.c
+++ b/lib_enc/subband_fft_fx.c
@@ -107,7 +107,7 @@ static void passf4_1_16(
     UWord16 i;
 
 
-    for ( i = 0; i < 4; i++ )
+    FOR( i = 0; i < 4; i++ )
     {
         cmplx_s c2, c3, c4, t1, t2, t3, t4;
 
@@ -142,7 +142,7 @@ static void passf4_2_16(
     Word16 k;
 
 
-    for ( k = 0; k < 4; k++ )
+    FOR( k = 0; k < 4; k++ )
     {
         cmplx_s t1, t2, t3, t4;
 
diff --git a/lib_enc/swb_bwe_enc.c b/lib_enc/swb_bwe_enc.c
deleted file mode 100644
index f633228119386e13dda4efacbed7ef242c8cb4c2..0000000000000000000000000000000000000000
--- a/lib_enc/swb_bwe_enc.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "basop_util.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
-
-
-/*-------------------------------------------------------------------*
- * fd_bwe_enc_init()
- *
- * Initialize FD BWE state structure at the encoder
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/swb_bwe_enc_fx.c b/lib_enc/swb_bwe_enc_fx.c
index 355246ec8960b09b083d0a655077e1d90bfefdc8..6b309c3345bb12892421926486682ef51660e8a9 100644
--- a/lib_enc/swb_bwe_enc_fx.c
+++ b/lib_enc/swb_bwe_enc_fx.c
@@ -4,12 +4,11 @@
 
 #include <stdlib.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "cnst.h"
 #include "rom_com_fx.h"
 #include "rom_com.h"
 #include "stl.h"
-#include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
 /*---------------------------------------------------------------------*
@@ -130,6 +129,7 @@ void wb_bwe_enc_fx(
 )
 {
     Word16 mode = 0;
+    move16();
     Word16 Sample_Delay_WB_BWE;
     Word16 old_input_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME16k];
     Word32 yorig_32[L_FRAME16k];
@@ -183,13 +183,14 @@ void wb_bwe_enc_fx(
             scl = s_min( Q_synth, scl );
         }
         Copy_Scale_sig32_16( yorig_32, yorig_fx, L_FRAME16k, scl );
-        Q_synth = add( sub( new_input_fx_exp, 16 ), scl ) - 1;
+        Q_synth = sub( add( sub( new_input_fx_exp, 16 ), scl ), 1 );
 
         mode = WB_BWE_encoding_fx( coder_type, yorig_fx, WB_fenv_fx, st_fx, Q_synth, Q_synth );
-        push_indice_fx( st_fx->hBstr, IND_WB_CLASS, mode - 2, 1 );
+        push_indice( st_fx->hBstr, IND_WB_CLASS, sub( mode, 2 ), 1 );
     }
 
     hBWE_FD->prev_mode = mode;
+    move16();
 
     return;
 }
@@ -206,25 +207,23 @@ void wb_bwe_enc_ivas_fx(
 )
 {
     Word16 mode = 0;
+    move16();
     Word16 Sample_Delay_WB_BWE;
     Word16 old_input_fx[NS2SA( 16000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME16k];
     Word32 yorig_32[L_FRAME16k];
-    Word16 yorig_fx[L_FRAME16k];
     Word32 L_wtda_synth_fx[2 * L_FRAME16k];
     Word16 *new_input_fx; /* pointer to original input signal         */
-    Word16 scl, new_input_fx_exp;
-    Word16 Q_synth;
+    Word16 new_input_fx_exp;
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
     Word16 WB_fenv_fx[SWB_FENV];
-    move16();
 
-    IF( GT_32( st_fx->extl_brate, 0 ) )
+    IF( st_fx->extl_brate > 0 )
     {
         /*---------------------------------------------------------------------*
          * Delay the original input signal to be synchronized with ACELP core synthesis
          *---------------------------------------------------------------------*/
-        set16_fx( old_input_fx, 0, NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME16k );
-        Sample_Delay_WB_BWE = NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_12k8_NS );
+        set16_fx( old_input_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME16k );
+        Sample_Delay_WB_BWE = NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS );
         move16();
 
         new_input_fx = old_input_fx + Sample_Delay_WB_BWE;
@@ -238,7 +237,7 @@ void wb_bwe_enc_ivas_fx(
 
         /* MDCT of the core synthesis signal */
         /*---------------------------------------------------------------------*/
-        new_input_fx_exp = 0;
+        new_input_fx_exp = -1;
         move16();
 
         wtda_fx( old_input_fx, &new_input_fx_exp, L_wtda_synth_fx, hBWE_FD->L_old_wtda_swb_fx,
@@ -248,23 +247,9 @@ void wb_bwe_enc_ivas_fx(
         /* DCT of the ACELP core synthesis */
         direct_transform_fx( L_wtda_synth_fx, yorig_32, 0, L_FRAME16k, &new_input_fx_exp, st_fx->element_mode );
 
-        /* Convert to 16 Bits (Calc Shift Required to Stay within MAX_Q_NEW_INPUT) */
-        scl = sub( 16 + 8 /*MAX_Q_NEW_INPUT*/, new_input_fx_exp );
-        /* Possible to Upscale? */
-        IF( scl > 0 )
-        {
-            /* Yes */
-            /* Calc Room to Upscale */
-            Q_synth = Find_Max_Norm32( yorig_32, L_FRAME16k );
-
-            /* Stay within MAX_Q_NEW_INPUT */
-            scl = s_min( Q_synth, scl );
-        }
-        Copy_Scale_sig32_16( yorig_32, yorig_fx, L_FRAME16k, scl );
-        Q_synth = add( sub( new_input_fx_exp, 16 ), scl ) - 1;
-
-        mode = WB_BWE_encoding_ivas_fx( st_fx, yorig_fx, WB_fenv_fx, Q_synth, Q_synth );
-        push_indice( st_fx->hBstr, IND_WB_CLASS, mode - 2, 1 );
+        mode = WB_BWE_encoding_ivas_fx( st_fx, yorig_32, WB_fenv_fx, new_input_fx_exp, new_input_fx_exp );
+        move16();
+        push_indice( st_fx->hBstr, IND_WB_CLASS, sub( mode, 2 ), 1 );
     }
 
     hBWE_FD->prev_mode = mode;
@@ -280,11 +265,12 @@ void wb_bwe_enc_ivas_fx(
  *-------------------------------------------------------------------*/
 void swb_bwe_enc_ivas_fx(
     Encoder_State *st_fx,              /* i/o: encoder state structure                  */
-    const int16_t last_element_mode,   /* i  : last element mode                       */
+    const Word16 last_element_mode,    /* i  : last element mode                       */
     Word16 *old_input_12k8_fx,         /* i  : input signal @12.8kHz for SWB BWE       */
     Word16 *old_input_16k_fx,          /* i  : input signal @16kHz for SWB BWE         */
     const Word16 *old_syn_12k8_16k_fx, /* i  : ACELP core synthesis at 12.8kHz or 16kHz */
     const Word16 *new_swb_speech_fx,   /* i  : original input signal at 32kHz           */
+    const Word16 Q_new_swb_speech,     /* i  : Q for new_swb_speech_fx                  */
     Word16 *shb_speech_fx,             /* i  : SHB target signal (6-14kHz) at 16kHz     */
     Word16 Q_shb_speech,
     Word16 Q_slb_speech )
@@ -302,7 +288,7 @@ void swb_bwe_enc_ivas_fx(
     Word16 old_input_lp_fx[L_FRAME16k];
     Word16 new_input_hp_fx[L_FRAME16k];
     Word16 yorig_fx[L_FRAME48k];
-    Word16 scl, new_input_fx_exp;
+    Word16 scl, new_input_fx_q;
     Word16 max;
     Word16 Sample_Delay_SWB_BWE;
     Word16 Sample_Delay_HP;
@@ -322,6 +308,7 @@ void swb_bwe_enc_ivas_fx(
     move32();
 #endif
     Word16 fb_band_begin;
+    Word16 q_new_input_hp;
 
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
@@ -335,21 +322,21 @@ void swb_bwe_enc_ivas_fx(
         inner_frame = L_FRAME48k;
         move16();
         inner_Fs = 48000;
-        move16();
+        move32();
     }
     ELSE
     {
         inner_frame = L_FRAME32k;
         move16();
         inner_Fs = 32000;
-        move16();
+        move32();
     }
 
-    set16_fx( old_input_fx, 0, add( NS2SA( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ), inner_frame ) );
+    set16_fx( old_input_fx, 0, add( NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ), inner_frame ) );
 
     IF( EQ_16( st_fx->L_frame, L_FRAME ) )
     {
-        Sample_Delay_SWB_BWE = NS2SA( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
+        Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
         Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
         IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
         {
@@ -359,7 +346,7 @@ void swb_bwe_enc_ivas_fx(
 
         IF( st_fx->element_mode > EVS_MONO )
         {
-            Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA( inner_Fs, DELAY_FIR_RESAMPL_NS ) );
+            Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA_FX2( inner_Fs, DELAY_FIR_RESAMPL_NS ) );
             Sample_Delay_HP = sub( Sample_Delay_HP, NS2SA( 16000, DELAY_FIR_RESAMPL_NS ) );
 
             IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) )
@@ -374,7 +361,7 @@ void swb_bwe_enc_ivas_fx(
     }
     ELSE
     {
-        Sample_Delay_SWB_BWE = NS2SA( inner_Fs, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
+        Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
         Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
         IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
         {
@@ -383,7 +370,7 @@ void swb_bwe_enc_ivas_fx(
         Sample_Delay_LP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS );
         IF( st_fx->element_mode > EVS_MONO )
         {
-            Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA( inner_Fs, DELAY_FIR_RESAMPL_NS ) );
+            Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA_FX2( inner_Fs, DELAY_FIR_RESAMPL_NS ) );
             Sample_Delay_HP = sub( Sample_Delay_HP, NS2SA( 16000, DELAY_FIR_RESAMPL_NS ) );
 
             IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) )
@@ -397,8 +384,20 @@ void swb_bwe_enc_ivas_fx(
         Copy( old_input_16k_fx + L_INP_MEM + L_FRAME16k - Sample_Delay_LP, hBWE_FD->old_input_lp_fx, Sample_Delay_LP );
     }
 
-    Copy( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP );
-    Copy( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP );
+    q_new_input_hp = s_min( Q_shb_speech, hBWE_FD->Q_new_input_hp );
+    IF( LT_16( Q_shb_speech, hBWE_FD->Q_new_input_hp ) )
+    {
+        Copy_Scale_sig( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP, sub( Q_shb_speech, hBWE_FD->Q_new_input_hp ) ); // Q_shb_speech
+        Copy( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP );                                     // Q_shb_speech
+    }
+    ELSE
+    {
+        Copy( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP );                                                                             // hBWE_FD->Q_new_input_hp
+        Copy_Scale_sig( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP, sub( hBWE_FD->Q_new_input_hp, Q_shb_speech ) ); // hBWE_FD->Q_new_input_hp
+    }
+
+    hBWE_FD->Q_new_input_hp = Q_shb_speech;
+    move16();
     Copy( shb_speech_fx + L_FRAME16k - Sample_Delay_HP, hBWE_FD->new_input_hp_fx, Sample_Delay_HP );
     new_input_fx = old_input_fx + Sample_Delay_SWB_BWE;
     Copy( hBWE_FD->old_input_fx, old_input_fx, Sample_Delay_SWB_BWE );
@@ -409,16 +408,12 @@ void swb_bwe_enc_ivas_fx(
      *----------------------------------------------------------------------*/
 
     /* tilt returned in Q24 goto to Q11 */
-#ifdef BASOP_NOGLOB
     tilt_nb_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3, &Overflow ), &Overflow );
-#else
-    tilt_nb_fx = round_fx( L_shl( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3 ) );
-#endif
     /*---------------------------------------------------------------------*
      * SWB BWE encoding
      * FB BWE encoding
      *---------------------------------------------------------------------*/
-    new_input_fx_exp = 0;
+    new_input_fx_q = Q_new_swb_speech;
     move16();
     test();
     IF( ( EQ_16( st_fx->idchan, 1 ) ) && ( EQ_16( last_element_mode, IVAS_CPE_DFT ) ) )
@@ -430,12 +425,12 @@ void swb_bwe_enc_ivas_fx(
         }
     }
     /* MDCT of the core synthesis signal */
-    wtda_fx( old_input_fx, &new_input_fx_exp, L_old_input_fx, hBWE_FD->L_old_wtda_swb_fx,
+    wtda_fx( old_input_fx, &new_input_fx_q, L_old_input_fx, hBWE_FD->L_old_wtda_swb_fx,
              &st_fx->Q_old_wtda, ALDO_WINDOW, ALDO_WINDOW, /* window overlap of current frame (0: full, 2: none, or 3: half) */
              inner_frame );
 
     /* DCT of the ACELP core synthesis */
-    direct_transform_fx( L_old_input_fx, yorig_32, 0, inner_frame, &new_input_fx_exp, st_fx->element_mode );
+    direct_transform_fx( L_old_input_fx, yorig_32, 0, inner_frame, &new_input_fx_q, st_fx->element_mode );
 
     /* high-band gain control in case of BWS */
     IF( st_fx->bwidth_sw_cnt > 0 )
@@ -444,7 +439,7 @@ void swb_bwe_enc_ivas_fx(
     }
 
     /* Convert to 16 Bits (Calc Shift Required to Stay within MAX_Q_NEW_INPUT) */
-    scl = sub( 16 + 8, new_input_fx_exp );
+    scl = sub( 16 + 8, new_input_fx_q );
     /* Possible to Upscale? */
     IF( scl > 0 )
     {
@@ -455,7 +450,7 @@ void swb_bwe_enc_ivas_fx(
         scl = s_min( Q_synth, scl );
     }
     Copy_Scale_sig32_16( yorig_32, yorig_fx, inner_frame, scl );
-    Q_synth = add( sub( new_input_fx_exp, 16 ), scl );
+    Q_synth = add( sub( new_input_fx_q, 16 ), scl );
     max = 0;
     move16();
     Q_synth_hf = 0;
@@ -486,6 +481,7 @@ void swb_bwe_enc_ivas_fx(
     }
     Copy_Scale_sig( &yorig_fx[scl], &yorig_fx[scl], sub( inner_frame, scl ), exp );
     Q_synth_hf = add( exp, Q_synth );
+
     test();
     IF( EQ_16( st_fx->last_extl, SWB_BWE ) || EQ_16( st_fx->last_extl, FB_BWE ) )
     {
@@ -499,7 +495,7 @@ void swb_bwe_enc_ivas_fx(
         ELSE
         {
             Q_shb = shr( add( st_fx->EnergyLT_fx_exp, exp ), 1 );
-            IF( EQ_16( s_and( exp, 0x0001 ), 1 ) )
+            if ( EQ_16( s_and( exp, 0x0001 ), 1 ) )
             {
                 exp = sub( exp, 1 );
             }
@@ -511,14 +507,14 @@ void swb_bwe_enc_ivas_fx(
     {
         Q_shb = sub( Q_synth_hf, 4 );
     }
-    Copy_Scale_sig( new_input_hp_fx, new_input_hp_fx, L_FRAME16k, sub( Q_shb, Q_shb_speech ) );
+    Copy_Scale_sig( new_input_hp_fx, new_input_hp_fx, L_FRAME16k, sub( Q_shb, q_new_input_hp ) );
 
     /* FB BWE encoding */
     IF( EQ_16( st_fx->extl, FB_BWE ) )
     {
         fb_band_begin = FB_BAND_BEGIN;
         move16();
-        IF( EQ_16( st_fx->L_frame, L_FRAME ) )
+        if ( EQ_16( st_fx->L_frame, L_FRAME ) )
         {
             fb_band_begin = FB_BAND_BEGIN_12k8;
             move16();
@@ -546,12 +542,8 @@ void swb_bwe_enc_ivas_fx(
             exp1 = norm_l( L_tmp );
             L_tmp = L_shl( L_tmp, exp1 );
             exp = sub( sub( 31, exp1 ), sub( 30, exp ) );
-            L_tmp = Isqrt_lc( L_tmp, &exp ); /*31-exp */
-#ifdef BASOP_NOGLOB
+            L_tmp = Isqrt_lc( L_tmp, &exp );                                               /*31-exp */
             fb_ener_adjust_fx = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#else
-            fb_ener_adjust_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q15 */
-#endif
         }
         ELSE
         {
@@ -567,12 +559,12 @@ void swb_bwe_enc_ivas_fx(
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
         SWB_BWE_encoding_ivas_fx( st_fx, old_input_fx, old_input_lp_fx, new_input_hp_fx, old_syn_12k8_16k_fx, yorig_32,
-                                  SWB_fenv_fx, tilt_nb_fx, 80, Q_slb_speech, Q_shb, new_input_fx_exp, Q_synth );
+                                  SWB_fenv_fx, tilt_nb_fx, 80, Q_slb_speech, Q_shb, new_input_fx_q, new_input_fx_q );
     }
     ELSE
     {
         SWB_BWE_encoding_ivas_fx( st_fx, old_input_fx, old_input_lp_fx, new_input_hp_fx, old_syn_12k8_16k_fx, yorig_32,
-                                  SWB_fenv_fx, tilt_nb_fx, 6, Q_slb_speech, Q_shb, new_input_fx_exp, Q_synth );
+                                  SWB_fenv_fx, tilt_nb_fx, 6, Q_slb_speech, Q_shb, new_input_fx_q, new_input_fx_q );
     }
 
 
@@ -620,16 +612,20 @@ void swb_bwe_enc_fx(
     Word16 Sample_Delay_HP;
     Word16 Sample_Delay_LP;
     Word16 idxGain = 0;
+    move16();
 
     Word16 Q_synth_hf, Q_synth, Q_shb;
     Word16 tilt_nb_fx;
     Word16 SWB_fenv_fx[SWB_FENV];
     Word32 ener_low_fx;
     Word32 energy_fbe_fb_fx = 0;
+    move32();
     Word16 fb_ener_adjust_fx;
     Word16 ener_adjust_quan_fx = 0;
+    move16();
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
@@ -641,19 +637,23 @@ void swb_bwe_enc_fx(
     IF( EQ_16( st_fx->extl, FB_BWE ) )
     {
         inner_frame = L_FRAME48k;
+        move16();
         inner_Fs = 48000;
+        move32();
     }
     ELSE
     {
         inner_frame = L_FRAME32k;
+        move16();
         inner_Fs = 32000;
+        move32();
     }
 
-    set16_fx( old_input_fx, 0, add( NS2SA( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ), inner_frame ) );
+    set16_fx( old_input_fx, 0, add( NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ), inner_frame ) );
 
     IF( EQ_16( st_fx->L_frame, L_FRAME ) )
     {
-        Sample_Delay_SWB_BWE = NS2SA( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
+        Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
         Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
         Sample_Delay_LP = NS2SA( 12800, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS );
 
@@ -661,12 +661,15 @@ void swb_bwe_enc_fx(
     }
     ELSE
     {
-        Sample_Delay_SWB_BWE = NS2SA( inner_Fs, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
+        Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
         Sample_Delay_HP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS );
         Sample_Delay_LP = NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS );
 
         delay_input_signal_fx( hBWE_FD->old_input_lp_fx, old_input_lp_fx, &old_input_16k_fx[L_INP_MEM], Sample_Delay_LP, L_FRAME16k, &hBWE_FD->prev_Q_input_lp, &Q_slb_speech );
     }
+    move16();
+    move16();
+    move16();
 
     Copy( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP );
     Copy( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP );
@@ -680,16 +683,13 @@ void swb_bwe_enc_fx(
      *----------------------------------------------------------------------*/
 
     /* tilt returned in Q24 goto to Q11 */
-#ifdef BASOP_NOGLOB
     tilt_nb_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3, &Overflow ), &Overflow );
-#else
-    tilt_nb_fx = round_fx( L_shl( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3 ) );
-#endif
     /*---------------------------------------------------------------------*
      * SWB BWE encoding
      * FB BWE encoding
      *---------------------------------------------------------------------*/
     new_input_fx_exp = 0;
+    move16();
     /* MDCT of the core synthesis signal */
     wtda_fx( old_input_fx, &new_input_fx_exp, L_old_input_fx, hBWE_FD->L_old_wtda_swb_fx,
              &st_fx->Q_old_wtda, ALDO_WINDOW, ALDO_WINDOW, /* window overlap of current frame (0: full, 2: none, or 3: half) */
@@ -719,13 +719,12 @@ void swb_bwe_enc_fx(
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
         scl = 300;
-        move16();
     }
     ELSE
     {
         scl = 240;
-        move16();
     }
+    move16();
     FOR( i = scl; i < inner_frame; i++ )
     {
         max = s_max( max, abs_s( yorig_fx[i] ) );
@@ -754,11 +753,12 @@ void swb_bwe_enc_fx(
         ELSE
         {
             Q_shb = shr( add( st_fx->EnergyLT_fx_exp, exp ), 1 );
-            IF( s_and( exp, 0x0001 ) == 1 )
+            if ( EQ_16( s_and( exp, 0x0001 ), 1 ) )
             {
                 exp = sub( exp, 1 );
             }
             st_fx->EnergyLT_fx = L_shl( st_fx->EnergyLT_fx, exp );
+            move32();
         }
     }
     ELSE
@@ -803,13 +803,10 @@ void swb_bwe_enc_fx(
             L_tmp = Mult_32_16( ener_low_fx, tmp ); /*45-(exp+2*(Q_synth_hf-4)) + 2*(Q_synth_hf-4) - 15 = 30-exp */
             exp1 = norm_l( L_tmp );
             L_tmp = L_shl( L_tmp, exp1 );
-            exp = 31 - exp1 - ( 30 - exp );
-            L_tmp = Isqrt_lc( L_tmp, &exp ); /*31-exp */
-#ifdef BASOP_NOGLOB
+            // exp = 31 - exp1 - ( 30 - exp );
+            exp = add( 31 - 30, sub( exp, exp1 ) );
+            L_tmp = Isqrt_lc( L_tmp, &exp );                                               /*31-exp */
             fb_ener_adjust_fx = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#else
-            fb_ener_adjust_fx = round_fx( L_shl( L_tmp, exp ) ); /*Q15 */
-#endif
         }
         ELSE
         {
@@ -824,7 +821,7 @@ void swb_bwe_enc_fx(
     /* write FB BWE frame gain to the bitstream */
     IF( EQ_16( st_fx->extl, FB_BWE ) )
     {
-        push_indice_fx( st_fx->hBstr, IND_FB_SLOPE, idxGain, NUM_BITS_FB_FRAMEGAIN );
+        push_indice( st_fx->hBstr, IND_FB_SLOPE, idxGain, NUM_BITS_FB_FRAMEGAIN );
     }
 
     return;
@@ -857,6 +854,7 @@ static Word16 WB_BWE_fenv_q_fx(                         /* o:   quantized gain i
 )
 {
     Word16 i, j, indx = 0;
+    move16();
     Word32 dist, min_dist;
     const Word16 *pit = cb; /*Q10 */
     Word16 tmp;
@@ -869,15 +867,9 @@ static Word16 WB_BWE_fenv_q_fx(                         /* o:   quantized gain i
         dist = L_deposit_l( 0 );
         FOR( j = 0; j < cb_dim; j++ )
         {
-#ifdef BASOP_NOGLOB
             tmp = sub_sat( x[j], *pit ); /*Q10 */
             L_tmp = L_mult0( tmp, tmp ); /*Q(10+10)->Q20 */
             dist = L_add_sat( dist, L_tmp );
-#else
-            tmp = sub( x[j], *pit );                             /*Q10 */
-            L_tmp = L_mult0( tmp, tmp );                         /*Q(10+10)->Q20 */
-            dist = L_add( dist, L_tmp );
-#endif
             pit++;
         }
 
@@ -919,6 +911,7 @@ static void get_normalize_spec_fx(
 
     set16_fx( SWB_signal, 0, add( HQ_GENERIC_HIGH0, offset ) );
     calc_normal_length_fx( core, org_fx, mode, extl, &L_swb_norm, prev_L_swb_norm, Q_new_lf );
+
     test();
     IF( EQ_16( extl, SWB_BWE ) || EQ_16( extl, FB_BWE ) )
     {
@@ -1001,12 +994,14 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
 )
 {
     Word16 i, j, k, noise, sharpMod = 0;
+    move16();
     Word16 peak, mag;
     Word32 mean[20];
     Word16 sharpPeak;
     const Word16 *input_hi = 0;
     Word16 sharp;
     Word16 gain_tmp = 0;
+    move16();
     Word16 mode;
     Word32 L_meanH, L_mean_d, L_tmp;
     Word16 sharplimit;
@@ -1014,9 +1009,8 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
     Word16 numharmonic, tmp, expn, expd, scale;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
-#endif
     move16();
+#endif
 
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
 
@@ -1042,7 +1036,6 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
     IF( EQ_16( st_fx->extl, SWB_BWE ) || EQ_16( st_fx->extl, FB_BWE ) )
     {
         input_hi = &fSpectrum[256];
-        move16();
         numsharp = NUM_SHARP;
         move16();
 
@@ -1053,52 +1046,32 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         {
             IF( hBWE_FD->prev_global_gain_fx == 0 )
             {
-#ifdef BASOP_NOGLOB
                 gain_tmp = round_fx_o( L_shl_o( fGain, 30, &Overflow ), &Overflow ); /*Q14 */
-#else
-                gain_tmp = round_fx( L_shl( fGain, 30 ) ); /*Q14 */
-#endif
             }
             ELSE
             {
                 expn = norm_l( fGain );
-#ifdef BASOP_NOGLOB
                 num = extract_h( L_shl_o( fGain, expn, &Overflow ) );
-#else
-                num = extract_h( L_shl( fGain, expn ) );
-#endif
                 expn = sub( sub( 30, expn ), shl( Q_shb, 1 ) );
 
                 expd = norm_l( hBWE_FD->prev_global_gain_fx );
-#ifdef BASOP_NOGLOB
                 den = extract_h( L_shl_o( hBWE_FD->prev_global_gain_fx, expd, &Overflow ) );
-#else
-                den = extract_h( L_shl( hBWE_FD->prev_global_gain_fx, expd ) );
-#endif
                 expd = sub( sub( 30, expd ), shl( st_fx->prev_Q_shb, 1 ) );
 
                 scale = shr( sub( den, num ), 15 );
-#ifdef BASOP_NOGLOB
                 num = shl_o( num, scale, &Overflow );
-#else
-                num = shl( num, scale );
-#endif
                 expn = sub( expn, scale );
 
                 tmp = div_s( num, den );
                 expn = sub( expn, expd );
-#ifdef BASOP_NOGLOB
                 gain_tmp = shl_o( tmp, sub( expn, 1 ), &Overflow ); /*Q14 */
-#else
-                gain_tmp = shl( tmp, sub( expn, 1 ) );          /*Q14 */
-#endif
             }
             test();
             IF( EQ_16( hBWE_FD->prev_mode, TRANSIENT ) )
             {
                 numharmonic = shl( numharmonic, 1 );
             }
-            ELSE IF( EQ_16( hBWE_FD->prev_mode, NORMAL ) || EQ_16( hBWE_FD->prev_mode, NOISE ) )
+            ELSE IF( EQ_16( hBWE_FD->prev_mode, NORMAL ) || hBWE_FD->prev_mode == NOISE )
             {
                 numharmonic = add( shr( numharmonic, 1 ), numharmonic );
             }
@@ -1122,7 +1095,6 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
     ELSE IF( EQ_16( st_fx->extl, WB_BWE ) )
     {
         input_hi = &fSpectrum[224];
-        move16();
         numsharp = 3;
         move16();
 
@@ -1158,7 +1130,7 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         FOR( j = 0; j < SHARP_WIDTH; j++ )
         {
             mag = abs_s( *input_hi );
-            IF( GT_16( mag, peak ) )
+            if ( GT_16( mag, peak ) )
             {
                 peak = mag;
                 move16(); /*Q_syn */
@@ -1175,19 +1147,15 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
             L_tmp = L_sub( mean[i], peak );       /*Q_syn */
             L_tmp = Mpy_32_16_1( L_tmp, 16913 );  /* 1/31->Q19 -> Q_syn+19-15 */
             den = extract_l( L_shr( L_tmp, 4 ) ); /*Q_syn */
-            IF( den == 0 )
+            if ( den == 0 )
             {
                 den = 1;
                 move16();
             }
             expd = norm_s( den );
-            tmp = div_s( shl( 1, sub( 14, expd ) ), den ); /*Q(29-expd-Q_syn) */
-            L_tmp = L_mult( tmp, peak );                   /*Q(30-expd) */
-#ifdef BASOP_NOGLOB
+            tmp = div_s( shl( 1, sub( 14, expd ) ), den );                                /*Q(29-expd-Q_syn) */
+            L_tmp = L_mult( tmp, peak );                                                  /*Q(30-expd) */
             sharp = round_fx_o( L_shl_o( L_tmp, sub( expd, 4 ), &Overflow ), &Overflow ); /*Q10 */
-#else
-            sharp = round_fx( L_shl( L_tmp, sub( expd, 4 ) ) ); /*Q10 */
-#endif
         }
         ELSE
         {
@@ -1196,11 +1164,7 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         }
 
         test();
-#ifdef BASOP_NOGLOB
         IF( GT_16( sharp, 4608 ) && GT_16( peak, shl_o( 1, add( Q_syn, 3 ), &Overflow ) ) )
-#else
-        IF( GT_16( sharp, 4608 ) && GT_16( peak, shl( 1, add( Q_syn, 3 ) ) ) )
-#endif
         {
             k = add( k, 1 );
             move16();
@@ -1211,12 +1175,13 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
             move16();
         }
 
-        IF( GT_16( sharp, sharpPeak ) )
+        if ( GT_16( sharp, sharpPeak ) )
         {
             sharpPeak = sharp;
             move16();
         }
     }
+
     test();
     IF( EQ_16( st_fx->extl, SWB_BWE ) || EQ_16( st_fx->extl, FB_BWE ) )
     {
@@ -1226,13 +1191,12 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         IF( GE_16( k, numharmonic ) && GT_16( gain_tmp, 8192 ) && LT_16( gain_tmp, 29491 ) && GT_16( sharpPeak, shl( sharplimit, 10 ) ) )
         {
             sharpMod = 1;
-            move16();
         }
         ELSE
         {
             sharpMod = 0;
-            move16();
         }
+        move16();
 
         L_meanH = Mpy_32_16_1( L_meanH, 29127 ); /*Q_syn+8 */
         L_mean_d = 0;
@@ -1249,13 +1213,12 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         IF( GE_16( k, numharmonic ) && GT_16( sharpPeak, shl( sharplimit, 10 ) ) )
         {
             sharpMod = 1;
-            move16();
         }
         ELSE
         {
             sharpMod = 0;
-            move16();
         }
+        move16();
     }
 
     test();
@@ -1271,7 +1234,7 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         move16();
     }
 
-    IF( GE_16( hBWE_FD->modeCount, 2 ) )
+    if ( GE_16( hBWE_FD->modeCount, 2 ) )
     {
         sharpMod = 1;
         move16();
@@ -1290,7 +1253,7 @@ static Word16 FD_BWE_class_fx(                          /* o  : FD BWE class
         test();
         test();
         test();
-        IF( GT_16( noise, 4 ) && ( LT_32( L_tmp, L_meanH ) || L_meanH == 0 ) && LT_16( tilt_nb, 10240 ) )
+        if ( GT_16( noise, 4 ) && ( LT_32( L_tmp, L_meanH ) || L_meanH == 0 ) && LT_16( tilt_nb, 10240 ) )
         {
             mode = NOISE;
             move16();
@@ -1343,11 +1306,7 @@ static void freq_weights_fx(
     {
         exp = norm_s( tmp );
         tmp = div_s( shl( 1, sub( 14, exp ) ), tmp ); /*(21-exp) */
-#ifdef BASOP_NOGLOB
-        tmp = shl_sat( tmp, sub( exp, 6 ) ); /*Q15 */
-#else
-        tmp = shl( tmp, sub( exp, 6 ) );         /*Q15 */
-#endif
+        tmp = shl_sat( tmp, sub( exp, 6 ) );          /*Q15 */
     }
     ELSE
     {
@@ -1411,22 +1370,14 @@ static void vqWithCand_w_fx(
 
         FOR( i = 0; i < E_ROM_dico_size; i++ )
         {
-#ifdef BASOP_NOGLOB
             dist = sub_o( x[0], *p_E_ROM_dico++, &Overflow ); /*Q8 */
-#else
-            dist = sub( x[0], *p_E_ROM_dico++ ); /*Q8 */
-#endif
-            L_dist = L_mult( dist, w[0] );       /*Q22 */
-            L_dist = Mult_32_16( L_dist, dist ); /*Q15 */
-            L_dist = L_shr( L_dist, 10 );        /*Q5 */
+            L_dist = L_mult( dist, w[0] );                    /*Q22 */
+            L_dist = Mult_32_16( L_dist, dist );              /*Q15 */
+            L_dist = L_shr( L_dist, 10 );                     /*Q5 */
 
             FOR( j = 1; j < dim; j++ )
             {
-#ifdef BASOP_NOGLOB
                 temp1 = sub_o( x[j], *p_E_ROM_dico++, &Overflow );
-#else
-                temp1 = sub( x[j], *p_E_ROM_dico++ );
-#endif
                 L_tmp = L_mult( temp1, w[j] );                /*Q22 */
                 L_tmp = Mult_32_16( L_tmp, temp1 );           /*Q15 */
                 L_dist = L_add( L_dist, L_shr( L_tmp, 10 ) ); /*Q5 */
@@ -1467,13 +1418,9 @@ static void vqWithCand_w_fx(
 
         FOR( i = 0; i < E_ROM_dico_size; i++ )
         {
-#ifdef BASOP_NOGLOB
             dist = sub_sat( x[0], *p_E_ROM_dico++ ); /*Q8 */
-#else
-            dist = sub( x[0], *p_E_ROM_dico++ ); /*Q8 */
-#endif
-            L_dist = L_mult( dist, dist ); /*Q17 */
-            L_dist = L_shr( L_dist, 12 );  /*Q5 */
+            L_dist = L_mult_sat( dist, dist );       /*Q17 */
+            L_dist = L_shr( L_dist, 12 );            /*Q5 */
 
             FOR( j = 1; j < dim; j++ )
             {
@@ -1588,7 +1535,7 @@ static Word16 vqSimple_w_fx(
 
 
     /* Reading the selected vector */
-    Copy( &cb[i_mult( index, dim )], y, dim );
+    Copy( &cb[index * dim], y, dim );
 
     return ( index );
 }
@@ -1741,26 +1688,20 @@ static void msvq_interpol_fx(
         }
 
         ind_tmp[0] = vqSimple_w_fx( quant_tmp2, quant_tmp2, EnvCdbk1st_fx, w_env11, DIM1ST, N_CB1ST, 1 );
+        move16();
         ind_tmp[1] = vqSimple_w_fx( quant_tmp2 + DIM1ST, quant_tmp2 + DIM1ST, EnvCdbk2nd_fx, w_env11 + DIM1ST, DIM2ND, N_CB2ND, 1 );
+        move16();
 
         /* Extract vector for odd position */
         FOR( n_band = 0; n_band < DIM11; n_band++ )
         {
-#ifdef BASOP_NOGLOB
             quant_tmp[n_band] = add_o( quant_tmp1[n_band], quant_tmp2[n_band], &Overflow );
-#else
-            quant_tmp[n_band] = add( quant_tmp1[n_band], quant_tmp2[n_band] );
-#endif
             move16();
         }
 
         FOR( n_band = 0; n_band < DIM12 - 1; n_band++ )
         {
-#ifdef BASOP_NOGLOB
             tmp = add_o( quant_tmp[n_band], quant_tmp[n_band + 1], &Overflow ); /*Q8 */
-#else
-            tmp = add( quant_tmp[n_band], quant_tmp[n_band + 1] ); /*Q8 */
-#endif
             tmp = shr( tmp, 1 );
             quant_tmp2[n_band] = sub( env_temp12[n_band], tmp );
             move16(); /*Q8 */
@@ -1783,16 +1724,12 @@ static void msvq_interpol_fx(
 
         FOR( n_band = 0; n_band < DIM12 - 1; n_band++ )
         {
-#ifdef BASOP_NOGLOB
             tmp = add_o( quant_tmp[n_band], quant_tmp[n_band + 1], &Overflow );
-#else
-            tmp = add( quant_tmp[n_band], quant_tmp[n_band + 1] );
-#endif
             tmp = shr( tmp, 1 );
-            quant_select[add( shl( n_band, 1 ), 1 )] = add( tmp, quant_tmp2[n_band] );
+            quant_select[( n_band << 1 ) + 1] = add( tmp, quant_tmp2[n_band] );
             move16(); /*Q8 */
         }
-        quant_select[add( shl( n_band, 1 ), 1 )] = add( quant_tmp[n_band], quant_tmp2[n_band] );
+        quant_select[( n_band << 1 ) + 1] = add( quant_tmp[n_band], quant_tmp2[n_band] );
         move16(); /*Q8 */
 
         L_dist = L_deposit_l( 0 );
@@ -1907,15 +1844,9 @@ static void msvq_interpol_2_fx(
         move16();
         FOR( n_band = 1; n_band < DIM12 - 1; n_band++ )
         {
-#ifdef BASOP_NOGLOB
             tmp_q = add_o( quant_tmp[n_band - 1], quant_tmp[n_band], &Overflow );
             tmp_q = shr( tmp_q, 1 );
             quant_tmp2[n_band] = sub_o( env_temp12[n_band], tmp_q, &Overflow );
-#else
-            tmp_q = add( quant_tmp[n_band - 1], quant_tmp[n_band] );
-            tmp_q = shr( tmp_q, 1 );
-            quant_tmp2[n_band] = sub( env_temp12[n_band], tmp_q );
-#endif
             move16();
         }
 
@@ -1936,15 +1867,9 @@ static void msvq_interpol_2_fx(
         move16(); /*Q8 */
         FOR( n_band = 1; n_band < DIM12 - 1; n_band++ )
         {
-#ifdef BASOP_NOGLOB
             tmp_q = add_o( quant_tmp[n_band - 1], quant_tmp[n_band], &Overflow );
             tmp_q = shr( tmp_q, 1 );
-            quant_select[sub( shl( n_band, 1 ), 1 )] = add_o( quant_tmp2[n_band], tmp_q, &Overflow );
-#else
-            tmp_q = add( quant_tmp[n_band - 1], quant_tmp[n_band] );
-            tmp_q = shr( tmp_q, 1 );
-            quant_select[sub( shl( n_band, 1 ), 1 )] = add( quant_tmp2[n_band], tmp_q );
-#endif
+            quant_select[( n_band << 1 ) - 1] = add_o( quant_tmp2[n_band], tmp_q, &Overflow );
         }
 
         L_dist = L_deposit_l( 0 );
@@ -1957,7 +1882,7 @@ static void msvq_interpol_2_fx(
         }
 
         /* Check optimal candidate */
-        IF( L_dist < L_minDist )
+        IF( LT_32( L_dist, L_minDist ) )
         {
             L_minDist = L_add( L_dist, 0 );
             Copy( quant_select, synth_energy, SWB_FENV - 2 );
@@ -2053,11 +1978,7 @@ static void calculate_Tonality_fx(
     l_shift = norm_s( max );
     FOR( n_coeff = 0; n_coeff < length; n_coeff++ )
     {
-#ifdef BASOP_NOGLOB
         gen_spec[n_coeff] = shl_sat( gen_spec[n_coeff], l_shift );
-#else
-        gen_spec[n_coeff] = shl( gen_spec[n_coeff], l_shift );
-#endif
         move16();
         IF( gen_spec[n_coeff] == 0 )
         {
@@ -2118,11 +2039,7 @@ static void calculate_Tonality_fx(
     L_tmp2 = Mpy_32_16_1( L_log_gm_org, inv_len ); /* Q14 */
 
     L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef BASOP_NOGLOB
     *SFM_org = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#else
-    *SFM_org = round_fx( L_shl( L_tmp, 14 ) ); /*Q12 */
-#endif
     move16();
     *SFM_org = s_max( 0, s_min( *SFM_org, 24547 ) );
     move16(); /*0.0001 and 5.993 in Q12 */
@@ -2143,11 +2060,7 @@ static void calculate_Tonality_fx(
     L_tmp2 = Mpy_32_16_1( L_log_gm_gen, inv_len ); /* Q14 */
 
     L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef BASOP_NOGLOB
     *SFM_gen = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#else
-    *SFM_gen = round_fx( L_shl( L_tmp, 14 ) ); /*Q12 */
-#endif
     move16();
     *SFM_gen = s_max( 0, s_min( *SFM_gen, 24547 ) );
     move16(); /*0.0001 and 5.993 in Q12 */
@@ -2223,11 +2136,7 @@ static void calculate_Tonality_ivas_fx(
     l_shift = norm_s( max );
     FOR( n_coeff = 0; n_coeff < length; n_coeff++ )
     {
-#ifdef BASOP_NOGLOB
         gen_spec[n_coeff] = shl_sat( gen_spec[n_coeff], l_shift );
-#else
-        gen_spec[n_coeff] = shl( gen_spec[n_coeff], l_shift );
-#endif
         move16();
         IF( gen_spec[n_coeff] == 0 )
         {
@@ -2288,11 +2197,7 @@ static void calculate_Tonality_ivas_fx(
     L_tmp2 = Mpy_32_16_1( L_log_gm_org, inv_len ); /* Q14 */
 
     L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef BASOP_NOGLOB
     *SFM_org = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#else
-    *SFM_org = round_fx( L_shl( L_tmp, 14 ) ); /*Q12 */
-#endif
     move16();
     *SFM_org = s_max( 0, s_min( *SFM_org, 24547 ) );
     move16(); /*0.0001 and 5.993 in Q12 */
@@ -2313,11 +2218,7 @@ static void calculate_Tonality_ivas_fx(
     L_tmp2 = Mpy_32_16_1( L_log_gm_gen, inv_len ); /* Q14 */
 
     L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef BASOP_NOGLOB
     *SFM_gen = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#else
-    *SFM_gen = round_fx( L_shl( L_tmp, 14 ) ); /*Q12 */
-#endif
     move16();
     *SFM_gen = s_max( 0, s_min( *SFM_gen, 24547 ) );
     move16(); /*0.0001 and 5.993 in Q12 */
@@ -2353,29 +2254,26 @@ static void energy_control_fx(
         IF( NE_16( coder_type, AUDIO ) && LT_32( st_fx->total_brate, ACELP_8k85 ) )
         {
             core_type = 0;
-            move16();
         }
         ELSE
         {
             core_type = 1;
-            move16();
         }
+        move16();
         get_normalize_spec_fx( core, st_fx->extl, mode, core_type, org_fx, SWB_signal_fx, &( hBWE_FD->prev_L_swb_norm1 ), offset, Q_new_lf );
 
         IF( EQ_16( st_fx->extl, WB_BWE ) )
         {
             max_band = 4;
-            move16();
             band_step = 2;
-            move16();
         }
         ELSE
         {
             max_band = SWB_FENV;
-            move16();
             band_step = 1;
-            move16();
         }
+        move16();
+        move16();
     }
     ELSE /* HQ core */
     {
@@ -2388,13 +2286,12 @@ static void energy_control_fx(
         IF( EQ_16( offset, HQ_GENERIC_FOFFSET_32K ) )
         {
             max_band = 12;
-            move16();
         }
         ELSE
         {
             max_band = SWB_FENV;
-            move16();
         }
+        move16();
     }
 
     FOR( n_band = 0; n_band < max_band; )
@@ -2405,7 +2302,7 @@ static void energy_control_fx(
         IF( LT_16( SFM_gen_fx[n_band], mult_r( 24576, SFM_org_fx[n_band] ) ) )
         {
             energy_factor_fx[n_band] = div_s( SFM_gen_fx[n_band], SFM_org_fx[n_band] ); /*Q15 */
-            IF( LT_16( energy_factor_fx[n_band], gamma_fx ) )
+            if ( LT_16( energy_factor_fx[n_band], gamma_fx ) )
             {
                 energy_factor_fx[n_band] = gamma_fx;
                 move16();
@@ -2449,29 +2346,26 @@ static void energy_control_ivas_fx(
         IF( NE_16( coder_type, AUDIO ) && LE_32( st_fx->total_brate, ACELP_8k00 ) )
         {
             core_type = 0;
-            move16();
         }
         ELSE
         {
             core_type = 1;
-            move16();
         }
+        move16();
         get_normalize_spec_fx( core, st_fx->extl, mode, core_type, org_fx, SWB_signal_fx, &( hBWE_FD->prev_L_swb_norm1 ), offset, Q_new_lf );
 
         IF( EQ_16( st_fx->extl, WB_BWE ) )
         {
             max_band = 4;
-            move16();
             band_step = 2;
-            move16();
         }
         ELSE
         {
             max_band = SWB_FENV;
-            move16();
             band_step = 1;
-            move16();
         }
+        move16();
+        move16();
     }
     ELSE /* HQ core */
     {
@@ -2484,13 +2378,12 @@ static void energy_control_ivas_fx(
         IF( EQ_16( offset, HQ_GENERIC_FOFFSET_32K ) )
         {
             max_band = 12;
-            move16();
         }
         ELSE
         {
             max_band = SWB_FENV;
-            move16();
         }
+        move16();
     }
 
     FOR( n_band = 0; n_band < max_band; )
@@ -2502,7 +2395,7 @@ static void energy_control_ivas_fx(
         {
             energy_factor_fx[n_band] = div_s( SFM_gen_fx[n_band], SFM_org_fx[n_band] ); /*Q15 */
             move16();
-            IF( LT_16( energy_factor_fx[n_band], gamma_fx ) )
+            if ( LT_16( energy_factor_fx[n_band], gamma_fx ) )
             {
                 energy_factor_fx[n_band] = gamma_fx;
                 move16();
@@ -2573,6 +2466,7 @@ Word16 WB_BWE_encoding_fx(                          /* o  : classification of wb
             exp = sub( sub( 30, exp ), ( sub( shl( Q_synth, 1 ), 2 ) ) );
             L_tmp = Mpy_32_16( exp, tmp, 32767 );           /* Q16 */
             WB_fenv_fx[i] = round_fx( L_shl( L_tmp, 10 ) ); /*Q10 */
+            move16();
         }
         ELSE
         {
@@ -2583,7 +2477,7 @@ Word16 WB_BWE_encoding_fx(                          /* o  : classification of wb
 
     index = WB_BWE_fenv_q_fx( WB_fenv_fx, F_2_5_fx, 32, 2 );
 
-    push_indice_fx( st_fx->hBstr, IND_WB_FENV, index, 5 );
+    push_indice( st_fx->hBstr, IND_WB_FENV, index, 5 );
 
     return ( mode );
 }
@@ -2596,7 +2490,7 @@ Word16 WB_BWE_encoding_fx(                          /* o  : classification of wb
 
 Word16 WB_BWE_encoding_ivas_fx(                       /* o  : classification of wb signal            */
                                 Encoder_State *st_fx, /* i/o: Encoder structure                      */
-                                const Word16 *yos_fx, /* i  : MDCT coefficients of weighted original */
+                                const Word32 *yos_fx, /* i  : MDCT coefficients of weighted original */
                                 Word16 *WB_fenv_fx,   /* i/o: energy of WB envelope                  */
                                 Word16 Q_synth,
                                 Word16 Q_synth_lf )
@@ -2610,35 +2504,48 @@ Word16 WB_BWE_encoding_ivas_fx(                       /* o  : classification of
     Word16 ener_40, exp;
     Word32 L_tmp;
     Word16 tmp;
-
+    Word64 energy_fx_64;
+    Word16 q_shift, scale;
+    Word16 q_WB_fenv[2];
+    Word16 yos_fx_16[L_FRAME16k];
     n_band = 0;
     move16();
     FOR( i = 0; i < 2; i++ )
     {
-        energy_fx = L_deposit_l( 0 );
+        energy_fx_64 = 0;
+        move64();
         FOR( n_coeff = swb_bwe_subband[n_band]; n_coeff < swb_bwe_subband[n_band + 2]; n_coeff++ )
         {
-            energy_fx = L_add( energy_fx, L_shr( L_mult0( yos_fx[n_coeff], yos_fx[n_coeff] ), 6 ) ); /*2*Q_synth-6 */
+            energy_fx_64 = W_add( energy_fx_64, W_mult0_32_32( yos_fx[n_coeff], yos_fx[n_coeff] ) ); /*2*Q_synth*/
         }
+        q_shift = W_norm( energy_fx_64 );
+        energy_fx = W_extract_h( W_shl( energy_fx_64, q_shift ) ); /*2*Q_synth + q_shift - 32*/
+        q_shift = sub( q_shift, 32 );
 
         L_WB_fenv_fx[i] = energy_fx;
-        move32(); /*2*Q_synth-6 */
+        move32();
+        q_WB_fenv[i] = add( shl( Q_synth, 1 ), q_shift );
+        move16();
         n_band = add( n_band, 2 );
     }
-    mode = FD_BWE_class_fx( yos_fx, 0, 0, Q_synth, 0, st_fx );
 
-    energy_control_ivas_fx( st_fx, ACELP_CORE, mode, st_fx->coder_type, yos_fx, 0, energy_factor_fx, Q_synth_lf );
+    scale = s_min( L_norm_arr( yos_fx, L_FRAME16k ), sub( Q27, Q_synth ) /* To accomodate 10 in Q_synth*/ );
+    Copy_Scale_sig32_16( yos_fx, yos_fx_16, L_FRAME16k, scale );
+
+    mode = FD_BWE_class_fx( yos_fx_16, 0, 0, sub( add( Q_synth, scale ), Q16 ), 0, st_fx );
+
+    energy_control_ivas_fx( st_fx, ACELP_CORE, mode, st_fx->coder_type, yos_fx_16, 0, energy_factor_fx, sub( add( Q_synth_lf, scale ), Q16 ) );
 
     FOR( i = 0; i < 2; i++ )
     {
         ener_40 = mult_r( shr( energy_factor_fx[shl( i, 1 )], 1 ), 26214 ); /*Q19 */
-        L_tmp = Mpy_32_16_1( L_WB_fenv_fx[i], ener_40 );                    /*2*Q_synth-2 */
+        L_tmp = Mpy_32_16_1( L_WB_fenv_fx[i], ener_40 );                    /*q_WB_fenv[i]+4 */
         IF( L_tmp )
         {
             exp = norm_l( L_tmp );
             tmp = Log2_norm_lc( L_shl( L_tmp, exp ) );
-            /*exp = 30-exp-(2*Q_synth-2); */
-            exp = sub( sub( 30, exp ), ( sub( shl( Q_synth, 1 ), 2 ) ) );
+            /*exp = 30-exp-(q_WB_fenv[i]+4); */
+            exp = sub( sub( 30, exp ), ( add( q_WB_fenv[i], 4 ) ) );
             L_tmp = Mpy_32_16( exp, tmp, 32767 );           /* Q16 */
             WB_fenv_fx[i] = round_fx( L_shl( L_tmp, 10 ) ); /*Q10 */
             move16();
@@ -2701,6 +2608,7 @@ static Word16 SWB_BWE_encoding_fx(
     Word16 energy_factor_fx[SWB_FENV], w_env_fx[SWB_FENV];
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
@@ -2709,13 +2617,12 @@ static Word16 SWB_BWE_encoding_fx(
     IF( EQ_16( st_fx->L_frame, L_FRAME ) )
     {
         L = L_SUBFR;
-        move16();
     }
     ELSE
     {
         L = L_SUBFR16k;
-        move16();
     }
+    move16();
 
     /* HF transient detect */
     IsTransient = detect_transient_fx( insig_hp_fx, L_FRAME16k, Q_shb, st_fx );
@@ -2733,7 +2640,7 @@ static Word16 SWB_BWE_encoding_fx(
             energy_fx = L_add( energy_fx, L_shr( L_mult0( insig_lp_fx[i + tmp], insig_lp_fx[i + tmp] ), 7 ) ); /*2*Q_slb_speech - 7 */
         }
 
-        IF( GT_32( Mult_32_16( energy_fx, 5958 ), hBWE_FD->EnergyLF_fx ) )
+        if ( GT_32( Mult_32_16( energy_fx, 5958 ), hBWE_FD->EnergyLF_fx ) )
         {
             IsTransient_LF = 1;
             move16();
@@ -2744,11 +2651,7 @@ static Word16 SWB_BWE_encoding_fx(
     }
 
     /* tilt returned in Q24 go to Q11 */
-#ifdef BASOP_NOGLOB
     tilt_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3, &Overflow ), &Overflow );
-#else
-    tilt_fx = round_fx( L_shl( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3 ) );
-#endif
     test();
     test();
     IF( EQ_16( IsTransient, 1 ) && ( GT_16( tilt_fx, 16384 ) || GT_16( st_fx->clas, 1 ) ) )
@@ -2763,7 +2666,7 @@ static Word16 SWB_BWE_encoding_fx(
     {
         mode = IsTransient;
         move16();
-        push_indice_fx( hBstr, IND_SWB_CLASS, mode, 2 );
+        push_indice( hBstr, IND_SWB_CLASS, mode, 2 );
 
         /* Energy for the different bands and global energies */
         global_gain_fx = L_deposit_l( 0 );
@@ -2788,7 +2691,6 @@ static Word16 SWB_BWE_encoding_fx(
             L_tmp = Mult_32_16( L_SWB_fenv_fx[n_band], tmp );                              /*2*Q_synth-7+29-expd - 15                */
             exp = norm_l( L_tmp );
             tmp = Log2_norm_lc( L_shl( L_tmp, exp ) );
-            move16();
             exp = sub( sub( 30, exp ), sub( add( shl( Q_synth, 1 ), 7 ), expd ) );
             L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */ /*10log10(2) in Q13 */
             tmp = round_fx( L_shl( L_tmp, 10 ) );           /* Q8 */
@@ -2805,11 +2707,7 @@ static Word16 SWB_BWE_encoding_fx(
             L_SWB_tenv = L_deposit_l( 0 );
             FOR( i = 0; i < L_SUBFR16k; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_SWB_tenv = L_add_sat( L_SWB_tenv, L_mult0( insig_hp_fx[i + tmp], insig_hp_fx[i + tmp] ) ); /*2*Q_shb */
-#else
-                L_SWB_tenv = L_add( L_SWB_tenv, L_mult0( insig_hp_fx[i + tmp], insig_hp_fx[i + tmp] ) );                                 /*2*Q_shb */
-#endif
             }
 
             tmp = i_mult2( n_band, L );
@@ -2832,11 +2730,8 @@ static Word16 SWB_BWE_encoding_fx(
                 L_tmp = L_deposit_h( tmp );
                 L_tmp = Isqrt_lc( L_tmp, &exp ); /*Q(31-exp) */
 
-#ifdef BASOP_NOGLOB
-                SWB_tenv_fx[n_band] = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /*Q3           */
-#else
-                SWB_tenv_fx[n_band] = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) );                                                        /*Q3           */
-#endif
+                SWB_tenv_fx[n_band] = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /*Q3*/
+                move16();
             }
         }
 
@@ -2860,11 +2755,7 @@ static Word16 SWB_BWE_encoding_fx(
             L_tmp = L_deposit_h( tmp );
             L_tmp = Isqrt_lc( L_tmp, &expn ); /*31-expn */
 
-#ifdef BASOP_NOGLOB
             Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, sub( expn, 1 ), &Overflow ), &Overflow ); /*Q14 */
-#else
-            Rat_tenv_fx = round_fx( L_shl( L_tmp, sub( expn, 1 ) ) );                                                                    /*Q14 */
-#endif
         }
         ELSE
         {
@@ -2875,11 +2766,8 @@ static Word16 SWB_BWE_encoding_fx(
         IF( LT_16( Rat_tenv_fx, 8192 ) )
         {
             L_tmp = L_mult( Rat_tenv_fx, 19661 ); /*Q29 */
-#ifdef BASOP_NOGLOB
+
             Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, 2, &Overflow ), &Overflow ); /*Q15 */
-#else
-            Rat_tenv_fx = round_fx( L_shl( L_tmp, 2 ) );                                                                                 /*Q15 */
-#endif
         }
         ELSE IF( GT_16( Rat_tenv_fx, 16384 ) )
         {
@@ -2945,11 +2833,8 @@ static Word16 SWB_BWE_encoding_fx(
             }
 
             /*SWB_tenv_fx[pos] = add(SWB_tenv_fx[pos], mult_r(SWB_tenv_fx[pos], 164));    move16();//Q3 */
-#ifdef BASOP_NOGLOB
             SWB_tenv_fx[pos] = round_fx_sat( L_mac_sat( L_mult_sat( SWB_tenv_fx[pos], 32767 ), SWB_tenv_fx[pos], 164 ) ); /*Q3 */
-#else
-            SWB_tenv_fx[pos] = round_fx( L_mac( L_mult( SWB_tenv_fx[pos], 32767 ), SWB_tenv_fx[pos], 164 ) );                            /*Q3 */
-#endif
+            move16();
 
             IF( LT_32( energy_fx, SWB_tenv_fx[pos] ) )
             {
@@ -2967,21 +2852,14 @@ static Word16 SWB_BWE_encoding_fx(
                 IF( GT_16( SWB_tenv_fx[n_band - 1], SWB_tenv_fx[n_band] ) )
                 {
                     /*SWB_tenv_fx[n_band-1] = add(mult_r(SWB_tenv_fx[n_band-1], 16384), mult_r(SWB_tenv_fx[n_band], 16384)); move16();//Q3 */
-#ifdef BASOP_NOGLOB
                     SWB_tenv_fx[n_band - 1] = round_fx_sat( L_mac_sat( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) ); /*Q3 */
-#else
-                    SWB_tenv_fx[n_band - 1] = round_fx( L_mac( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) ); /*Q3 */
-#endif
                 }
                 ELSE
                 {
                     /*SWB_tenv_fx[n_band] = add(mult_r(SWB_tenv_fx[n_band-1], 16384), mult_r(SWB_tenv_fx[n_band], 16384)); move16();//Q3 */
-#ifdef BASOP_NOGLOB
                     SWB_tenv_fx[n_band] = round_fx_sat( L_mac_sat( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) ); /*Q3 */
-#else
-                    SWB_tenv_fx[n_band] = round_fx( L_mac( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) );     /*Q3 */
-#endif
                 }
+                move16();
             }
 
             FOR( n_band = 0; n_band < SWB_TENV; n_band++ )
@@ -3029,6 +2907,7 @@ static Word16 SWB_BWE_encoding_fx(
                 expn = sub( sub( 30, expn ), 19 );
                 L_tmp = Mpy_32_16( expn, tmp, 32767 ); /* Q16 */          /*1 in Q15 */
                 SWB_tenv_tmp_fx[n_band] = round_fx( L_shl( L_tmp, 11 ) ); /* Q11 */
+                move16();
             }
 
             IF( GT_16( SWB_tenv_tmp_fx[n_band], 30720 ) )
@@ -3046,13 +2925,13 @@ static Word16 SWB_BWE_encoding_fx(
                 index = shr( add( SWB_tenv_tmp_fx[n_band], 1024 ), 11 );
             }
 
-            push_indice_fx( hBstr, IND_SWB_TENV, index, 4 );
+            push_indice( hBstr, IND_SWB_TENV, index, 4 );
         }
 
         MSVQ_Interpol_Tran_fx( SWB_fenv_fx, indice );
 
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[0], 7 );
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[1], 6 );
+        push_indice( hBstr, IND_SWB_FENV, indice[0], 7 );
+        push_indice( hBstr, IND_SWB_FENV, indice[1], 6 );
     }
     ELSE
     {
@@ -3077,7 +2956,7 @@ static Word16 SWB_BWE_encoding_fx(
 
         global_gain_fx = L_shr( global_gain_fx, 1 ); /*2*Q_shb */
         mode = FD_BWE_class_fx( yos_fx, global_gain_fx, tilt_nb_fx, Q_synth, Q_shb, st_fx );
-        push_indice_fx( hBstr, IND_SWB_CLASS, mode, 2 );
+        push_indice( hBstr, IND_SWB_CLASS, mode, 2 );
 
         energy_control_fx( st_fx, ACELP_CORE, mode, -1, yos_fx, st_offset, energy_factor_fx, Q_synth_lf );
 
@@ -3093,6 +2972,7 @@ static Word16 SWB_BWE_encoding_fx(
                 expn = sub( 30, add( expn, sub( shl( Q_synth, 1 ), 5 ) ) );
                 L_tmp = Mpy_32_16( expn, tmp, 24660 ); /* Q14 */      /*10log10(2) in Q13 */
                 SWB_fenv_fx[n_band] = round_fx( L_shl( L_tmp, 10 ) ); /* Q8 */
+                move16();
             }
             ELSE
             {
@@ -3111,11 +2991,11 @@ static Word16 SWB_BWE_encoding_fx(
         /* Energy VQ */
         msvq_interpol_fx( SWB_fenv_fx, w_env_fx, indice );
 
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[0], 5 );
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[1], 7 );
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[2], 6 );
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[3], 5 );
-        push_indice_fx( hBstr, IND_SWB_FENV, indice[4], 6 );
+        push_indice( hBstr, IND_SWB_FENV, indice[0], 5 );
+        push_indice( hBstr, IND_SWB_FENV, indice[1], 7 );
+        push_indice( hBstr, IND_SWB_FENV, indice[2], 6 );
+        push_indice( hBstr, IND_SWB_FENV, indice[3], 5 );
+        push_indice( hBstr, IND_SWB_FENV, indice[4], 6 );
     }
     hBWE_FD->prev_mode = mode;
     move16();
@@ -3218,25 +3098,23 @@ static Word16 SWB_BWE_encoding_ivas_fx(
         energy_fx = L_deposit_l( 0 );
         FOR( i = 0; i < L; i++ )
         {
-            energy_fx = L_add( energy_fx, L_shr( L_mult0( insig_lp_fx[i + tmp], insig_lp_fx[i + tmp] ), 7 ) ); /*2*Q_slb_speech - 7 */
+            energy_fx = L_add( energy_fx, L_shr( L_mult0( insig_lp_fx[i + tmp], insig_lp_fx[i + tmp] ), 7 ) ); /*Q = 2 * Q_insig_lp - 7 */
         }
 
-        IF( GT_32( Mult_32_16( energy_fx, 5958 ), hBWE_FD->EnergyLF_fx ) )
+        if ( BASOP_Util_Cmp_Mant32Exp( Mpy_32_16_1( energy_fx, 5958 /* 1/5.5f in Q15 */ ), sub( 31 + 7, shl( Q_insig_lp, 1 ) ), hBWE_FD->EnergyLF_fx, hBWE_FD->EnergyLF_exp ) > 0 )
         {
             IsTransient_LF = 1;
             move16();
         }
 
         hBWE_FD->EnergyLF_fx = energy_fx;
+        hBWE_FD->EnergyLF_exp = sub( 31 + 7, shl( Q_insig_lp, 1 ) );
         move32();
+        move16();
     }
 
     /* tilt returned in Q24 go to Q11 */
-#ifdef BASOP_NOGLOB
     tilt_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3, &Overflow ), &Overflow );
-#else
-    tilt_fx = round_fx( L_shl( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3 ) );
-#endif
     test();
     test();
     IF( EQ_16( IsTransient, 1 ) && ( GT_16( tilt_fx, 16384 ) || GT_16( st_fx->clas, 1 ) ) )
@@ -3306,17 +3184,13 @@ static Word16 SWB_BWE_encoding_ivas_fx(
             L_SWB_tenv = L_deposit_l( 0 );
             FOR( i = 0; i < L_SUBFR16k; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_SWB_tenv = L_add_sat( L_SWB_tenv, L_mult0( insig_hp_fx[i + tmp], insig_hp_fx[i + tmp] ) ); /*2*Q_shb */
-#else
-                L_SWB_tenv = L_add( L_SWB_tenv, L_mult0( insig_hp_fx[i + tmp], insig_hp_fx[i + tmp] ) ); /*2*Q_shb */
-#endif
             }
 
             tmp = i_mult2( n_band, L );
             FOR( i = 0; i < L; i++ )
             {
-                WB_tenv_syn_fx = L_add( WB_tenv_syn_fx, L_shr( L_mult0( synth_fx[i + tmp], synth_fx[i + tmp] ), 7 ) );         /*2*st_fx->Q_syn2 - 7 */
+                WB_tenv_syn_fx = L_add( WB_tenv_syn_fx, L_shr( L_mult0( synth_fx[i + tmp], synth_fx[i + tmp] ), 7 ) );         /*2*Q_insig_lp-7 */
                 WB_tenv_orig_fx = L_add( WB_tenv_orig_fx, L_shr( L_mult0( insig_lp_fx[i + tmp], insig_lp_fx[i + tmp] ), 7 ) ); /*2*Q_insig_lp - 7 */
             }
 
@@ -3333,11 +3207,7 @@ static Word16 SWB_BWE_encoding_ivas_fx(
                 L_tmp = L_deposit_h( tmp );
                 L_tmp = Isqrt_lc( L_tmp, &exp ); /*Q(31-exp) */
 
-#ifdef BASOP_NOGLOB
                 SWB_tenv_fx[n_band] = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /*Q3           */
-#else
-                SWB_tenv_fx[n_band] = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) );                        /*Q3           */
-#endif
                 move16();
             }
         }
@@ -3349,16 +3219,8 @@ static Word16 SWB_BWE_encoding_ivas_fx(
             expn = sub( sub( 30, expn ), sub( shl( Q_insig_lp, 1 ), 7 ) );
 
             expd = norm_l( WB_tenv_syn_fx );
-#ifdef FIX_ISSUE_1156
-#ifdef BASOP_NOGLOB
             den = round_fx_o( L_shl( WB_tenv_syn_fx, expd ), &Overflow );
-#else
-            den = round_fx( L_shl( WB_tenv_syn_fx, expd ) );
-#endif
-#else
-            den = round_fx( L_shl( WB_tenv_syn_fx, expd ) );
-#endif
-            expd = sub( sub( 30, expd ), sub( shl( st_fx->Q_syn2, 1 ), 7 ) );
+            expd = sub( sub( 30, expd ), sub( shl( Q_insig_lp, 1 ), 7 ) );
 
             scale = shr( sub( den, num ), 15 );
             num = shl( num, scale );
@@ -3370,11 +3232,7 @@ static Word16 SWB_BWE_encoding_ivas_fx(
             L_tmp = L_deposit_h( tmp );
             L_tmp = Isqrt_lc( L_tmp, &expn ); /*31-expn */
 
-#ifdef BASOP_NOGLOB
             Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, sub( expn, 1 ), &Overflow ), &Overflow ); /*Q14 */
-#else
-            Rat_tenv_fx = round_fx( L_shl( L_tmp, sub( expn, 1 ) ) );                                                                    /*Q14 */
-#endif
         }
         ELSE
         {
@@ -3384,12 +3242,8 @@ static Word16 SWB_BWE_encoding_ivas_fx(
 
         IF( LT_16( Rat_tenv_fx, 8192 ) )
         {
-            L_tmp = L_mult( Rat_tenv_fx, 19661 ); /*Q29 */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_mult( Rat_tenv_fx, 19661 );                                  /*Q29 */
             Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, 2, &Overflow ), &Overflow ); /*Q15 */
-#else
-            Rat_tenv_fx = round_fx( L_shl( L_tmp, 2 ) );                                                                                 /*Q15 */
-#endif
         }
         ELSE IF( GT_16( Rat_tenv_fx, 16384 ) )
         {
@@ -3455,11 +3309,7 @@ static Word16 SWB_BWE_encoding_ivas_fx(
             }
 
             /*SWB_tenv_fx[pos] = add(SWB_tenv_fx[pos], mult_r(SWB_tenv_fx[pos], 164));    move16();//Q3 */
-#ifdef BASOP_NOGLOB
             SWB_tenv_fx[pos] = round_fx_sat( L_mac_sat( L_mult_sat( SWB_tenv_fx[pos], 32767 ), SWB_tenv_fx[pos], 164 ) ); /*Q3 */
-#else
-            SWB_tenv_fx[pos] = round_fx( L_mac( L_mult( SWB_tenv_fx[pos], 32767 ), SWB_tenv_fx[pos], 164 ) );                            /*Q3 */
-#endif
             move16();
 
             IF( LT_32( energy_fx, SWB_tenv_fx[pos] ) )
@@ -3478,21 +3328,13 @@ static Word16 SWB_BWE_encoding_ivas_fx(
                 IF( GT_16( SWB_tenv_fx[n_band - 1], SWB_tenv_fx[n_band] ) )
                 {
                     /*SWB_tenv_fx[n_band-1] = add(mult_r(SWB_tenv_fx[n_band-1], 16384), mult_r(SWB_tenv_fx[n_band], 16384)); move16();//Q3 */
-#ifdef BASOP_NOGLOB
                     SWB_tenv_fx[n_band - 1] = round_fx_sat( L_mac_sat( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) ); /*Q3 */
-#else
-                    SWB_tenv_fx[n_band - 1] = round_fx( L_mac( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) ); /*Q3 */
-#endif
                     move16();
                 }
                 ELSE
                 {
                     /*SWB_tenv_fx[n_band] = add(mult_r(SWB_tenv_fx[n_band-1], 16384), mult_r(SWB_tenv_fx[n_band], 16384)); move16();//Q3 */
-#ifdef BASOP_NOGLOB
                     SWB_tenv_fx[n_band] = round_fx_sat( L_mac_sat( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) ); /*Q3 */
-#else
-                    SWB_tenv_fx[n_band] = round_fx( L_mac( L_mult( SWB_tenv_fx[n_band - 1], 16384 ), SWB_tenv_fx[n_band], 16384 ) );     /*Q3 */
-#endif
                     move16();
                 }
             }
@@ -3596,11 +3438,12 @@ static Word16 SWB_BWE_encoding_ivas_fx(
 
         global_gain_fx = L_shr( global_gain_fx, 1 ); /*2*Q_shb */
 
-        Copy_Scale_sig32_16( yos_fx, yos_fx_16, inner_frame, 0 );
-        mode = FD_BWE_class_fx( yos_fx_16, global_gain_fx, tilt_nb_fx, sub( Q_synth, Q16 ), Q_shb, st_fx );
+        scale = s_min( L_norm_arr( yos_fx, inner_frame ), sub( Q27, Q_synth ) /* To accomodate 10 in Q_synth*/ );
+        Copy_Scale_sig32_16( yos_fx, yos_fx_16, inner_frame, scale );
+        mode = FD_BWE_class_fx( yos_fx_16, global_gain_fx, tilt_nb_fx, sub( add( Q_synth, scale ), Q16 ), Q_shb, st_fx );
         push_indice( hBstr, IND_SWB_CLASS, mode, 2 );
 
-        energy_control_ivas_fx( st_fx, ACELP_CORE, mode, -1, yos_fx_16, st_offset, energy_factor_fx, sub( Q_synth_lf, Q16 ) );
+        energy_control_ivas_fx( st_fx, ACELP_CORE, mode, -1, yos_fx_16, st_offset, energy_factor_fx, sub( add( Q_synth_lf, scale ), Q16 ) );
 
         FOR( n_band = 0; n_band < SWB_FENV; n_band++ )
         {
@@ -3801,13 +3644,8 @@ static void calculate_tonality_fx_32(
 
     FOR( n_coeff = 0; n_coeff < length; n_coeff++ )
     {
-#ifdef BASOP_NOGLOB
         am_org_fx = L_add_sat( am_org_fx, org_spec_fx[n_coeff] );
         am_gen_fx = L_add_sat( am_gen_fx, gen_spec_fx[n_coeff] );
-#else
-        am_org_fx = L_add( am_org_fx, org_spec_fx[n_coeff] );
-        am_gen_fx = L_add( am_gen_fx, gen_spec_fx[n_coeff] );
-#endif
         IF( org_spec_fx[n_coeff] != 0 )
         {
             exp = norm_l( org_spec_fx[n_coeff] );
@@ -4017,26 +3855,18 @@ static Word16 decision_hq_generic_class_fx_32(
     {
         a_fx = L_deposit_l( 0 );
         p_fx = L_deposit_l( 0 );
-        tmp2 = add( swb_bwe_subband[add( k, 1 )], hq_generic_offset );
+        tmp2 = add( swb_bwe_subband[k + 1], hq_generic_offset );
         FOR( i = add( swb_bwe_subband[k], hq_generic_offset ); i < tmp2; i++ )
         {
             exp = norm_l( coefs_fx[i] );
-            tmp = extract_h( L_shl( coefs_fx[i], exp ) ); /*12 + exp - 16 */
-            L_tmp = L_mult0( tmp, tmp );                  /*2 * exp - 8 */
-#ifdef BASOP_NOGLOB
+            tmp = extract_h( L_shl( coefs_fx[i], exp ) );         /*12 + exp - 16 */
+            L_tmp = L_mult0( tmp, tmp );                          /*2 * exp - 8 */
             L_tmp = L_shl_sat( L_tmp, sub( 14, shl( exp, 1 ) ) ); /*6 */
-#else
-            L_tmp = L_shl( L_tmp, sub( 14, shl( exp, 1 ) ) );   /*6 */
-#endif
             IF( GT_32( L_tmp, p_fx ) )
             {
                 p_fx = L_add( L_tmp, 0 ); /*6 */
             }
-#ifdef BASOP_NOGLOB
             a_fx = L_add_sat( a_fx, L_tmp ); /*6 */
-#else
-            a_fx = L_add( a_fx, L_tmp );                        /*6 */
-#endif
         }
 
         IF( a_fx > 0 )
@@ -4084,7 +3914,7 @@ void hq_generic_encoding_fx(
     Word16 indice[HQ_GENERIC_NVQIDX];
     Word16 nenv;
 
-    Word16 energy_factor_fx[SWB_FENV] = { 0 };
+    Word16 energy_factor_fx[SWB_FENV];
     Word16 cs, exp, tmp, tmp2;
     Word32 energy_fx;
     Word32 L_tmp, max_coefs_fx;
@@ -4092,6 +3922,7 @@ void hq_generic_encoding_fx(
     HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
 
+    set16_fx( energy_factor_fx, 0, SWB_FENV );
 
     IF( LE_16( hq_generic_offset, HQ_GENERIC_FOFFSET_24K4 ) )
     {
@@ -4109,15 +3940,16 @@ void hq_generic_encoding_fx(
 
     IF( EQ_16( hHQ_core->hq_generic_speech_class, 1 ) )
     {
-        push_indice_fx( hBstr, IND_HQ_SWB_EXC_SP_CLAS, 1, 1 );
+        push_indice( hBstr, IND_HQ_SWB_EXC_SP_CLAS, 1, 1 );
         *hq_generic_exc_clas = HQ_GENERIC_SP_EXC;
         move16();
     }
     ELSE
     {
         *hq_generic_exc_clas = decision_hq_generic_class_fx_32( coefs_fx, hq_generic_offset );
-        push_indice_fx( hBstr, IND_HQ_SWB_EXC_SP_CLAS, 0, 1 );
-        push_indice_fx( hBstr, IND_HQ_SWB_EXC_CLAS, *hq_generic_exc_clas, 1 );
+        move16();
+        push_indice( hBstr, IND_HQ_SWB_EXC_SP_CLAS, 0, 1 );
+        push_indice( hBstr, IND_HQ_SWB_EXC_CLAS, *hq_generic_exc_clas, 1 );
     }
 
     FOR( n_band = 0; n_band < nenv; n_band++ )
@@ -4125,7 +3957,7 @@ void hq_generic_encoding_fx(
         energy_fx = L_deposit_l( 0 );
         max_coefs_fx = L_deposit_l( 0 );
         tmp2 = add( swb_bwe_subband[n_band + 1], hq_generic_offset );
-        FOR( n_coeff = add( swb_bwe_subband[n_band], hq_generic_offset ); n_coeff < tmp2; n_coeff++ )
+        FOR( n_coeff = swb_bwe_subband[n_band] + hq_generic_offset; n_coeff < tmp2; n_coeff++ )
         {
             IF( LT_32( max_coefs_fx, L_abs( coefs_fx[n_coeff] ) ) )
             {
@@ -4134,7 +3966,7 @@ void hq_generic_encoding_fx(
         }
         cs = norm_l( max_coefs_fx );
         tmp2 = add( swb_bwe_subband[n_band + 1], hq_generic_offset );
-        FOR( n_coeff = add( swb_bwe_subband[n_band], hq_generic_offset ); n_coeff < tmp2; n_coeff++ )
+        FOR( n_coeff = swb_bwe_subband[n_band] + hq_generic_offset; n_coeff < tmp2; n_coeff++ )
         {
             tmp = extract_h( L_shl( coefs_fx[n_coeff], cs ) ); /*12 + cs - 16 */
             L_tmp = L_mult0( tmp, tmp );                       /*2*cs - 8 */
@@ -4152,6 +3984,7 @@ void hq_generic_encoding_fx(
 
             L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */              /*10log10(2) in Q13 */
             hq_generic_fenv_fx[n_band] = round_fx( L_shl( L_tmp, 10 ) ); /*Q8 */
+            move16();
         }
         ELSE
         {
@@ -4175,7 +4008,7 @@ void hq_generic_encoding_fx(
                 }
             }
             cs = norm_l( max_coefs_fx );
-            tmp2 = fb_bwe_subband[add( n_band, 1 )];
+            tmp2 = fb_bwe_subband[n_band + 1];
             FOR( n_coeff = fb_bwe_subband[n_band]; n_coeff < tmp2; n_coeff++ )
             {
                 tmp = extract_h( L_shl( coefs_fx[n_coeff], cs ) ); /*12 + cs - 16 */
@@ -4191,12 +4024,13 @@ void hq_generic_encoding_fx(
                 tmp = Log2_norm_lc( L_shl( L_tmp, exp ) );
                 exp = sub( 30, add( exp, 2 * cs - 13 ) );
 
-                L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */                           /*10log10(2) in Q13 */
-                hq_generic_fenv_fx[add( n_band, nenv )] = round_fx( L_shl( L_tmp, 10 ) ); /*Q8 */
+                L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */                     /*10log10(2) in Q13 */
+                hq_generic_fenv_fx[n_band + nenv] = round_fx( L_shl( L_tmp, 10 ) ); /*Q8 */
+                move16();
             }
             ELSE
             {
-                hq_generic_fenv_fx[add( n_band, nenv )] = -24576;
+                hq_generic_fenv_fx[n_band + nenv] = -24576;
                 move16();
             }
         }
@@ -4207,13 +4041,15 @@ void hq_generic_encoding_fx(
     FOR( n_band = 0; n_band < nenv; n_band++ )
     {
         hq_generic_fenv_fx[n_band] = sub( hq_generic_fenv_fx[n_band], Mean_env_fx[n_band] );
+        move16();
     }
 
     IF( st_fx->bwidth == FB )
     {
         FOR( n_band = 0; n_band < DIM_FB; n_band++ )
         {
-            hq_generic_fenv_fx[add( n_band, nenv )] = sub( shr( hq_generic_fenv_fx[add( n_band, nenv )], 1 ), Mean_env_fb_fx[n_band] );
+            hq_generic_fenv_fx[n_band + nenv] = sub( shr( hq_generic_fenv_fx[n_band + nenv], 1 ), Mean_env_fb_fx[n_band] );
+            move16();
         }
     }
 
@@ -4231,25 +4067,26 @@ void hq_generic_encoding_fx(
     IF( EQ_16( st_fx->bwidth, FB ) )
     {
         indice[5] = vqSimple_w_fx( hq_generic_fenv_fx + nenv, hq_generic_fenv_fx + nenv, EnvCdbkFB_fx, NULL, DIM_FB, N_CB_FB, 0 );
+        move16();
     }
 
-    push_indice_fx( hBstr, IND_SWB_FENV_HQ, indice[0], 5 );
-    push_indice_fx( hBstr, IND_SWB_FENV_HQ, indice[1], 7 );
-    push_indice_fx( hBstr, IND_SWB_FENV_HQ, indice[2], 6 );
-    push_indice_fx( hBstr, IND_SWB_FENV_HQ, indice[3], 5 );
+    push_indice( hBstr, IND_SWB_FENV_HQ, indice[0], 5 );
+    push_indice( hBstr, IND_SWB_FENV_HQ, indice[1], 7 );
+    push_indice( hBstr, IND_SWB_FENV_HQ, indice[2], 6 );
+    push_indice( hBstr, IND_SWB_FENV_HQ, indice[3], 5 );
 
     IF( LE_16( hq_generic_offset, HQ_GENERIC_FOFFSET_24K4 ) )
     {
-        push_indice_fx( hBstr, IND_SWB_FENV_HQ, indice[4], 6 );
+        push_indice( hBstr, IND_SWB_FENV_HQ, indice[4], 6 );
     }
     ELSE
     {
-        push_indice_fx( hBstr, IND_SWB_FENV_HQ, indice[4], 5 );
+        push_indice( hBstr, IND_SWB_FENV_HQ, indice[4], 5 );
     }
 
     IF( EQ_16( st_fx->bwidth, FB ) )
     {
-        push_indice_fx( hBstr, IND_FB_FENV_HQ, indice[5], 5 );
+        push_indice( hBstr, IND_FB_FENV_HQ, indice[5], 5 );
     }
 
     FOR( n_band = 0; n_band < nenv; n_band++ )
@@ -4260,11 +4097,8 @@ void hq_generic_encoding_fx(
         L_Extract( L_tmp, &exp, &tmp );                               /* */
         tmp = extract_l( Pow2( 13, tmp ) );
         exp = sub( exp, 13 );
-#ifdef BASOP_NOGLOB
         hq_generic_fenv_fx[n_band] = shl_sat( tmp, add( exp, 1 ) ); /*1 */
-#else
-        hq_generic_fenv_fx[n_band] = shl( tmp, add( exp, 1 ) ); /*1 */
-#endif
+        move16();
     }
 
 
@@ -4272,13 +4106,14 @@ void hq_generic_encoding_fx(
     {
         FOR( n_band = 0; n_band < DIM_FB; n_band++ )
         {
-            tmp = add( hq_generic_fenv_fx[add( n_band, nenv )], Mean_env_fb_fx[n_band] ); /*7 */
-            L_tmp = L_mult( tmp, 21771 );                                                 /*25 */
-            L_tmp = L_shr( L_tmp, 9 );                                                    /*16 */
+            tmp = add( hq_generic_fenv_fx[n_band + nenv], Mean_env_fb_fx[n_band] ); /*7 */
+            L_tmp = L_mult( tmp, 21771 );                                           /*25 */
+            L_tmp = L_shr( L_tmp, 9 );                                              /*16 */
             L_Extract( L_tmp, &exp, &tmp );
             tmp = extract_l( Pow2( 13, tmp ) );
             exp = sub( exp, 13 );
-            hq_generic_fenv_fx[add( n_band, nenv )] = shl( tmp, add( exp, 1 ) ); /*2 */
+            hq_generic_fenv_fx[n_band + nenv] = shl( tmp, add( exp, 1 ) ); /*2 */
+            move16();
         }
     }
 
@@ -4296,13 +4131,11 @@ void fd_bwe_enc_init_fx(
 )
 {
     set16_fx( hBWE_FD->new_input_hp_fx, 0, NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS - DELAY_CLDFB_NS ) );
+    hBWE_FD->Q_new_input_hp = 0;
+    move16();
     set16_fx( hBWE_FD->old_input_fx, 0, NS2SA( 48000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) );
     set16_fx( hBWE_FD->old_input_wb_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS ) );
-#ifndef MSAN_FIX
-    set16_fx( hBWE_FD->old_input_lp_fx, 0, NS2SA( 16000, ACELP_LOOK_NS + DELAY_SWB_TBE_16k_NS ) );
-#else
     set16_fx( hBWE_FD->old_input_lp_fx, 0, NS2SA( 16000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_NS ) );
-#endif
     set16_fx( hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) );
     hBWE_FD->prev_mode = NORMAL;
     move16();
@@ -4314,8 +4147,10 @@ void fd_bwe_enc_init_fx(
     hBWE_FD->modeCount = 0;
     move16();
     hBWE_FD->EnergyLF_fx = 0;
+    hBWE_FD->EnergyLF_exp = 0;
     hBWE_FD->mem_old_wtda_swb_fx = 0;
     move32();
+    move16();
     move32();
 
     hBWE_FD->prev_Q_input_lp = 0;
@@ -4418,6 +4253,7 @@ void hq_generic_hf_encoding_fx(
 
             L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */              /*10log10(2) in Q13 */
             hq_generic_fenv_fx[n_band] = round_fx( L_shl( L_tmp, 10 ) ); /*Q8 */
+            move16();
         }
         ELSE
         {
@@ -4457,13 +4293,13 @@ void hq_generic_hf_encoding_fx(
                 tmp = Log2_norm_lc( L_shl( L_tmp, exp ) );
                 exp = sub( 30, add( exp, sub( shl( cs, 1 ), 13 ) ) );
 
-                L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */                           /*10log10(2) in Q13 */
-                hq_generic_fenv_fx[add( n_band, nenv )] = round_fx( L_shl( L_tmp, 10 ) ); /*Q8 */
+                L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */                     /*10log10(2) in Q13 */
+                hq_generic_fenv_fx[n_band + nenv] = round_fx( L_shl( L_tmp, 10 ) ); /*Q8 */
                 move16();
             }
             ELSE
             {
-                hq_generic_fenv_fx[add( n_band, nenv )] = -24576;
+                hq_generic_fenv_fx[n_band + nenv] = -24576;
                 move16();
             }
         }
@@ -4481,7 +4317,7 @@ void hq_generic_hf_encoding_fx(
     {
         FOR( n_band = 0; n_band < DIM_FB; n_band++ )
         {
-            hq_generic_fenv_fx[add( n_band, nenv )] = sub( shr( hq_generic_fenv_fx[add( n_band, nenv )], 1 ), Mean_env_fb_fx[n_band] );
+            hq_generic_fenv_fx[n_band + nenv] = sub( shr( hq_generic_fenv_fx[n_band + nenv], 1 ), Mean_env_fb_fx[n_band] );
             move16();
         }
     }
@@ -4499,15 +4335,15 @@ void hq_generic_hf_encoding_fx(
 
     IF( EQ_16( length, L_SPEC48k ) )
     {
-        Word16 sf = getScaleFactor16( hq_generic_fenv_fx, DIM_FB + nenv );
-        Scale_sig( hq_generic_fenv_fx, DIM_FB + nenv, negate( sf ) );
+        Word16 sf = getScaleFactor16( hq_generic_fenv_fx, add( DIM_FB, nenv ) );
+        Scale_sig( hq_generic_fenv_fx, add( DIM_FB, nenv ), negate( sf ) );
         Copy_Scale_sig( EnvCdbkFB_fx, EnvCdbkFB_fx_loc, N_CB_FB * DIM_FB, negate( sf ) );
         // Scaling done to handel overflow inside vqSimple_w_fx
 
         indice[5] = vqSimple_w_fx( hq_generic_fenv_fx + nenv, hq_generic_fenv_fx + nenv, EnvCdbkFB_fx_loc, NULL, DIM_FB, N_CB_FB, 0 );
         move16();
 
-        Scale_sig( hq_generic_fenv_fx, DIM_FB + nenv, sf );
+        Scale_sig( hq_generic_fenv_fx, add( DIM_FB, nenv ), sf );
     }
 
     push_indice( hBstr, IND_SWB_FENV_HQ, indice[0], 5 );
@@ -4537,11 +4373,7 @@ void hq_generic_hf_encoding_fx(
         L_Extract( L_tmp, &exp, &tmp );                               /* */
         tmp = extract_l( Pow2( 13, tmp ) );
         exp = sub( exp, 13 );
-#ifdef BASOP_NOGLOB
         hq_generic_fenv_fx[n_band] = shl_sat( tmp, add( exp, 1 ) ); /*1 */
-#else
-        hq_generic_fenv_fx[n_band] = shl( tmp, add( exp, 1 ) ); /*1 */
-#endif
         move16();
     }
 
@@ -4550,13 +4382,13 @@ void hq_generic_hf_encoding_fx(
     {
         FOR( n_band = 0; n_band < DIM_FB; n_band++ )
         {
-            tmp = add( hq_generic_fenv_fx[add( n_band, nenv )], Mean_env_fb_fx[n_band] ); /*7 */
-            L_tmp = L_mult( tmp, 21771 );                                                 /*25 */
-            L_tmp = L_shr( L_tmp, 9 );                                                    /*16 */
+            tmp = add( hq_generic_fenv_fx[n_band + nenv], Mean_env_fb_fx[n_band] ); /*7 */
+            L_tmp = L_mult( tmp, 21771 );                                           /*25 */
+            L_tmp = L_shr( L_tmp, 9 );                                              /*16 */
             L_Extract( L_tmp, &exp, &tmp );
             tmp = extract_l( Pow2( 13, tmp ) );
             exp = sub( exp, 13 );
-            hq_generic_fenv_fx[add( n_band, nenv )] = shl( tmp, add( exp, 1 ) ); /*1 */
+            hq_generic_fenv_fx[n_band + nenv] = shl( tmp, add( exp, 1 ) ); /*1 */
             move16();
         }
     }
diff --git a/lib_enc/swb_bwe_enc_hr.c b/lib_enc/swb_bwe_enc_hr.c
deleted file mode 100644
index 8e752f0ac516550ba25f4c9dcce588dfd9e16b42..0000000000000000000000000000000000000000
--- a/lib_enc/swb_bwe_enc_hr.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/swb_bwe_enc_hr_fx.c b/lib_enc/swb_bwe_enc_hr_fx.c
index 094ad37fa96e5d3e5371e3b7e55ff76d6cd87dc2..8b5a173533d53746f84d83b62e6844e0a290ae22 100644
--- a/lib_enc/swb_bwe_enc_hr_fx.c
+++ b/lib_enc/swb_bwe_enc_hr_fx.c
@@ -4,10 +4,9 @@
 #include <stdint.h>
 #include <assert.h>
 #include "options.h"
-#include "cnst.h"       /* Common constants                       */
-#include "rom_enc.h"    /* Encoder static table prototypes        */
-#include "rom_com_fx.h" /* Static table prototypes                */
-//#include "prot_fx.h"            /* Function prototypes                    */
+#include "cnst.h"        /* Common constants                       */
+#include "rom_enc.h"     /* Encoder static table prototypes        */
+#include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Common constants                       */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
@@ -120,6 +119,7 @@ void swb_bwe_enc_hr_fx(
 #endif
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
@@ -132,9 +132,7 @@ void swb_bwe_enc_hr_fx(
 
     /* Use 32 Bits Buffer to Store Two 16 Bits Vectors in Order to Save Stack Space */
     t_audio_fx = (Word16 *) &t_audio32[0];
-    move16();
     t_audio_tmp_fx = (Word16 *) &t_audio32[L_FRAME48k / 2];
-    move16();
 
     ind2 = 0;
     move16(); /* only to suppress warnings */
@@ -185,12 +183,13 @@ void swb_bwe_enc_hr_fx(
     Copy_Scale_sig( new_input_fx, t_audio_fx, input_frame, temp );
     /* Bring Energy in 2*Q'exp1' */
     st_fx->EnergyLT_fx = L_shl( st_fx->EnergyLT_fx, shl( sub( exp1, st_fx->EnergyLT_fx_exp ), 1 ) );
+    move32();
 
     is_transient = detect_transient_fx( t_audio_fx, input_frame, exp1, st_fx );
     st_fx->EnergyLT_fx_exp = exp1;
     move16();
 
-    push_indice_fx( hBstr, IND_HR_IS_TRANSIENT, is_transient, 1 );
+    push_indice( hBstr, IND_HR_IS_TRANSIENT, is_transient, 1 );
 
     /*---------------------------------------------------------------------*
      * OLA and MDCT
@@ -201,6 +200,7 @@ void swb_bwe_enc_hr_fx(
     st_fx->Q_old_wtda = new_input_fx_exp;
     move16();
     new_input_fx_exp = 0;
+    move16();
     wtda_fx( new_input_fx, &new_input_fx_exp, L_t_audio_tmp_fx, hBWE_FD->L_old_wtda_swb_fx,
              &st_fx->Q_old_wtda, ALDO_WINDOW, ALDO_WINDOW, input_frame );
 
@@ -246,7 +246,6 @@ void swb_bwe_enc_hr_fx(
         scl = 99;
         move16();
         ptr16 = &t_audio_fx[NUM_TRANS_START_FREQ_COEF];
-        move16();
         FOR( k = 0; k < input_frame; k += temp )
         {
             /* from t_audio_fx[k..NUM_TRANS_START_FREQ_COEF+k-1] will be zeroed out */
@@ -310,12 +309,11 @@ void swb_bwe_enc_hr_fx(
 
             ind1 = gain_quant_fx( &L_gain_fx, &gain1_fx, LG10_MIN_GLOB_GAIN_BWE_HR_Q14, LG10_MAX_GLOB_GAIN_BWE_HR_Q13, NBITS_GLOB_GAIN_BWE_HR, &exp1 );
 
-            push_indice_fx( hBstr, IND_HR_GAIN, ind1, NBITS_GLOB_GAIN_BWE_HR );
+            push_indice( hBstr, IND_HR_GAIN, ind1, NBITS_GLOB_GAIN_BWE_HR );
             nBits = sub( nBits, NBITS_GLOB_GAIN_BWE_HR );
 
             /* normalization with global gain */
-            ptr16 = &t_audio_fx[add( NUM_TRANS_START_FREQ_COEF, temp )];
-            move16();
+            ptr16 = &t_audio_fx[NUM_TRANS_START_FREQ_COEF + temp];
             temp2 = negate( exp1 );
             gain2_fx = Invert16( gain1_fx, &temp2 );
 
@@ -326,6 +324,7 @@ void swb_bwe_enc_hr_fx(
                 L_temp = L_mult( *ptr16, gain2_fx );
                 L_temp = L_shr( L_temp, temp2 );
                 *ptr16++ = round_fx( L_temp );
+                move16();
             }
             FOR( ; i < L_FRAME32k / NUM_TIME_SWITCHING_BLOCKS - NUM_TRANS_START_FREQ_COEF; i++ )
             {
@@ -339,18 +338,14 @@ void swb_bwe_enc_hr_fx(
              *---------------------------------------------------------------------*/
 
             /* compute energy per band */
-            ptr16 = &t_audio_fx[add( temp, NUM_TRANS_START_FREQ_COEF )];
-            move16();
+            ptr16 = &t_audio_fx[temp + NUM_TRANS_START_FREQ_COEF];
             FOR( i = 0; i < N_BANDS_TRANS_BWE_HR; i++ )
             {
                 L_temp = Calc_Energy_Autoscaled( ptr16, t_audio_fx_exp, WIDTH_TRANS_FREQ_COEF, &temp2 );
                 ptr16 += WIDTH_TRANS_FREQ_COEF;
                 L_temp = Sqrt_Ratio32( L_temp, temp2, WIDTH_TRANS_FREQ_COEF, /*WIDTH_TRANS_FREQ_COEF is in Q0*/ 0, &temp2 );
-#ifdef BASOP_NOGLOB
                 en_band_fx[i] = round_fx_sat( L_shr_sat( L_temp, sub( 15 - 9, temp2 ) ) );
-#else
-                en_band_fx[i] = round_fx( L_shr( L_temp, sub( 15 - 9, temp2 ) ) );
-#endif
+                move16();
             }
 
             /* Q energy per band */
@@ -358,7 +353,7 @@ void swb_bwe_enc_hr_fx(
             {
                 ind1 = en_band_quant_fx( en_band_fx, swb_hr_env_code3_fx, NUM_ENVLOPE_CODE_HR_TR );
 
-                push_indice_fx( hBstr, IND_HR_ENVELOPE, ind1, NBITS_ENVELOPE_BWE_HR_TR );
+                push_indice( hBstr, IND_HR_ENVELOPE, ind1, NBITS_ENVELOPE_BWE_HR_TR );
                 nBits = sub( nBits, NBITS_ENVELOPE_BWE_HR_TR );
                 ind2 = ind1;
                 move16();
@@ -368,21 +363,18 @@ void swb_bwe_enc_hr_fx(
                 IF( LT_16( ind2, NUM_ENVLOPE_CODE_HR_TR2 ) )
                 {
                     ind1 = en_band_quant_fx( en_band_fx, swb_hr_env_code3_fx, NUM_ENVLOPE_CODE_HR_TR2 );
-                    move16();
                 }
                 ELSE
                 {
                     ind1 = en_band_quant_fx( en_band_fx, swb_hr_env_code3_fx + ( NUM_ENVLOPE_CODE_HR_TR2 * 2 ), NUM_ENVLOPE_CODE_HR_TR2 );
-                    move16();
                 }
 
-                push_indice_fx( hBstr, IND_HR_ENVELOPE, ind1, NBITS_ENVELOPE_BWE_HR_TR - 1 );
+                push_indice( hBstr, IND_HR_ENVELOPE, ind1, NBITS_ENVELOPE_BWE_HR_TR - 1 );
                 nBits = sub( nBits, NBITS_ENVELOPE_BWE_HR_TR - 1 );
             }
 
             /* normalize spectrum per bands */
-            ptr16 = &t_audio_fx[add( temp, NUM_TRANS_START_FREQ_COEF )];
-            move16();
+            ptr16 = &t_audio_fx[temp + NUM_TRANS_START_FREQ_COEF];
             FOR( i = 0; i < N_BANDS_TRANS_BWE_HR; i++ )
             {
                 temp2 = 9;
@@ -394,6 +386,7 @@ void swb_bwe_enc_hr_fx(
                     L_temp = L_mult( *ptr16, gain2_fx );
                     L_temp = L_shr( L_temp, temp2 );
                     *ptr16++ = round_fx( L_temp );
+                    move16();
                 }
             }
 
@@ -446,7 +439,7 @@ void swb_bwe_enc_hr_fx(
                     L_en_noncoded_fx = L_deposit_h( en_band_fx[N_BANDS_TRANS_BWE_HR - 1] ); /* to Put in Q16+9 */
                 }
 
-                push_indice_fx( hBstr, IND_HR_HF_GAIN, ind1, NBITS_HF_GAIN_BWE_HR );
+                push_indice( hBstr, IND_HR_HF_GAIN, ind1, NBITS_HF_GAIN_BWE_HR );
                 nBits = sub( nBits, NBITS_HF_GAIN_BWE_HR );
             }
             ELSE
@@ -514,12 +507,11 @@ void swb_bwe_enc_hr_fx(
         L_gain_fx = L_shr( L_tmp, sub( 31 - 16, exp2 ) ); /* 31: 'L_tmp' is already in Q31 */
         ind1 = gain_quant_fx( &L_gain_fx, &gain1_fx, LG10_MIN_GLOB_GAIN_BWE_HR_Q14, LG10_MAX_GLOB_GAIN_BWE_HR_Q13, NBITS_GLOB_GAIN_BWE_HR, &exp1 );
 
-        push_indice_fx( hBstr, IND_HR_GAIN, ind1, NBITS_GLOB_GAIN_BWE_HR );
+        push_indice( hBstr, IND_HR_GAIN, ind1, NBITS_GLOB_GAIN_BWE_HR );
         nBits = sub( nBits, NBITS_GLOB_GAIN_BWE_HR );
 
         /* normalization with global gain */
         ptr16 = &t_audio_fx[NUM_NONTRANS_START_FREQ_COEF];
-        move16();
         /* Find Max Scaling on Remaining Frequencies */
         temp2 = Find_Max_Norm16( ptr16, NUM_NONTRANS_END_FREQ_COEF - NUM_NONTRANS_START_FREQ_COEF );
         temp2 = s_max( 0, sub( temp2, NON_TRANSIENT_RESCALE_Q_GUARD ) );
@@ -533,6 +525,7 @@ void swb_bwe_enc_hr_fx(
             L_temp = L_mult( *ptr16, temp );
             L_temp = L_shr( L_temp, temp2 );
             *ptr16++ = round_fx( L_temp );
+            move16();
         }
 
         /*---------------------------------------------------------------------*
@@ -541,32 +534,27 @@ void swb_bwe_enc_hr_fx(
 
         /* compute energy per band */
         ptr16 = &t_audio_fx[NUM_NONTRANS_START_FREQ_COEF];
-        move16();
         FOR( i = 0; i < N_BANDS_BWE_HR; i++ )
         {
             L_temp = Calc_Energy_Autoscaled( ptr16, t_audio_fx_exp, WIDTH_NONTRANS_FREQ_COEF, &temp2 );
             ptr16 += WIDTH_NONTRANS_FREQ_COEF;
             L_temp = Sqrt_Ratio32( L_temp, temp2, WIDTH_NONTRANS_FREQ_COEF, /*WIDTH_TRANS_FREQ_COEF is in Q0*/ 0, &temp2 );
-#ifdef BASOP_NOGLOB
             en_band_fx[i] = round_fx_sat( L_shr_sat( L_temp, sub( 15 - 9, temp2 ) ) ); /* Put in Q9 */
-#else
-            en_band_fx[i] = round_fx( L_shr( L_temp, sub( 15 - 9, temp2 ) ) ); /* Put in Q9 */
-#endif
+            move16();
         }
 
         /* Q energy per band */
         ind1 = en_band_quant_fx( en_band_fx, swb_hr_env_code1_fx, NUM_ENVLOPE_CODE_HR1 );
         ind2 = en_band_quant_fx( en_band_fx + 2, swb_hr_env_code2_fx, NUM_ENVLOPE_CODE_HR2 );
 
-        push_indice_fx( hBstr, IND_HR_ENVELOPE, ind1, NBITS_ENVELOPE_BWE_HR1 );
-        push_indice_fx( hBstr, IND_HR_ENVELOPE, ind2, NBITS_ENVELOPE_BWE_HR2 );
+        push_indice( hBstr, IND_HR_ENVELOPE, ind1, NBITS_ENVELOPE_BWE_HR1 );
+        push_indice( hBstr, IND_HR_ENVELOPE, ind2, NBITS_ENVELOPE_BWE_HR2 );
 
         nBits = sub( nBits, NBITS_ENVELOPE_BWE_HR1 + NBITS_ENVELOPE_BWE_HR2 );
 
         /* normalize spectrum per bands */
         ptr32 = &L_t_audio_tmp_fx[0];
         ptr16 = &t_audio_fx[NUM_NONTRANS_START_FREQ_COEF];
-        move16();
         FOR( i = 0; i < N_BANDS_BWE_HR; i++ )
         {
             temp2 = 9;
@@ -685,7 +673,7 @@ void swb_bwe_enc_hr_fx(
                 L_en_noncoded_fx = L_mult0( min_env_fx, 16384 );
             }
 
-            push_indice_fx( hBstr, IND_HR_HF_GAIN, ind1, NBITS_HF_GAIN_BWE_HR );
+            push_indice( hBstr, IND_HR_HF_GAIN, ind1, NBITS_HF_GAIN_BWE_HR );
             nBits = sub( nBits, NBITS_HF_GAIN_BWE_HR );
         }
         ELSE
@@ -712,7 +700,6 @@ void swb_bwe_enc_hr_fx(
         {
             /* select spectrum of the second stage coding */
             ptr16 = &t_audio_fx[0];
-            move16();
             FOR( i = 0; i < Nsv; i++ )
             {
                 IF( nq[i] == 0 )
@@ -734,6 +721,7 @@ void swb_bwe_enc_hr_fx(
                         L_temp = L_deposit_l( t_audio_tmp_fx[i * WIDTH_BAND + j] );
                         L_temp = L_msu0( L_temp, temp2, x_norm_fx[i * WIDTH_BAND + j] );
                         *ptr16++ = extract_l( L_temp );
+                        move16();
                     }
                 }
             }
@@ -755,10 +743,10 @@ void swb_bwe_enc_hr_fx(
                 /*   Nsv2 * 12 <= nBits (Nsv2 is not too high) AND                      */
                 /*   nBits -  Nsv2 * 12 < 12 (Nsv2 is the highest divisor)              */
                 L_temp = L_msu0( L_deposit_l( nBits ), 12, Nsv2 );
-                if ( GE_32( L_temp, 12L ) )
-                    Nsv2 = add( Nsv2, 1 );
-                if ( L_temp < 0 )
-                    Nsv2 = sub( Nsv2, 1 );
+                IF( GE_32( L_temp, 12L ) )
+                Nsv2 = add( Nsv2, 1 );
+                IF( L_temp < 0 )
+                Nsv2 = sub( Nsv2, 1 );
             }
 
             /* second stage global gain estimation and coding */
@@ -770,7 +758,7 @@ void swb_bwe_enc_hr_fx(
             /* Put in Q16 */
             L_gain_fx = L_shr( L_temp, sub( 31 - 16, temp2 ) ); /* 31: 'L_temp' is already in Q31 */
             ind1 = gain_quant_fx( &L_gain_fx, &gain2_fx, LG10_MIN_GLOB_GAIN_BWE_HR_Q14, LG10_MAX_GLOB_GAIN_BWE_HR_Q13, NBITS_GLOB_GAIN_BWE_HR, &exp2 );
-            push_indice_fx( hBstr, IND_HR_GAIN, ind1, NBITS_GLOB_GAIN_BWE_HR );
+            push_indice( hBstr, IND_HR_GAIN, ind1, NBITS_GLOB_GAIN_BWE_HR );
             nBits = sub( nBits, NBITS_GLOB_GAIN_BWE_HR );
 
             /* normalize with global gain */
@@ -779,13 +767,9 @@ void swb_bwe_enc_hr_fx(
             FOR( i = 0; i < Nsv2 * WIDTH_BAND; i++ )
             {
                 L_tmp = L_mult( temp, t_audio_fx[i] );
-#ifdef BASOP_NOGLOB
                 L_tmp = L_shr_o( L_tmp, temp2, &Overflow );
                 t_audio_fx[i] = round_fx_o( L_tmp, &Overflow );
-#else
-                L_tmp = L_shr( L_tmp, temp2 );
-                t_audio_fx[i] = round_fx( L_tmp );
-#endif
+                move16();
             }
 
             set16_fx( nq2, 0, Nsv );
@@ -800,7 +784,7 @@ void swb_bwe_enc_hr_fx(
     WHILE( nBits > 0 )
     {
         i = s_min( nBits, 16 );
-        push_indice_fx( hBstr, IND_UNUSED, 0, i );
+        push_indice( hBstr, IND_UNUSED, 0, i );
         nBits = sub( nBits, i );
     }
     return;
diff --git a/lib_enc/swb_bwe_enc_lr.c b/lib_enc/swb_bwe_enc_lr.c
deleted file mode 100644
index 5bd24db09d3a0629cf156dd436c5f5a401b21bd5..0000000000000000000000000000000000000000
--- a/lib_enc/swb_bwe_enc_lr.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "stat_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/swb_bwe_enc_lr_fx.c b/lib_enc/swb_bwe_enc_lr_fx.c
index 23137a24a48d79090f986e4b546f3852ffe6feed..938cdd971357f75642f58b731ebc3513729939cd 100644
--- a/lib_enc/swb_bwe_enc_lr_fx.c
+++ b/lib_enc/swb_bwe_enc_lr_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -36,7 +36,6 @@
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "rom_com.h"
 #include "stl.h"
-#include "prot.h"
 
 /*--------------------------------------------------------------------------*
  * GetSubbandCorrIndex2_har()
@@ -92,9 +91,11 @@ static Word16 GetSubbandCorrIndex2_har_fx(                               /* o  :
 
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     exp_safe_e = 4;
+    move16();
 
     L_tmp = L_deposit_l( 0 );
     FOR( i = 0; i < fLen; i++ )
@@ -107,6 +108,7 @@ static Word16 GetSubbandCorrIndex2_har_fx(                               /* o  :
     FOR( i = 0; i < fLen; i++ )
     {
         ibuf_fx[i] = extract_h( L_shl( L_inBuf[i], exp_shift ) ); /* Qi+exp_shift-16 */
+        move16();
     }
 
     FOR( i = 0; i < predBufLen; i++ )
@@ -148,11 +150,7 @@ static Word16 GetSubbandCorrIndex2_har_fx(                               /* o  :
         FOR( j = 0; j < fLen; j++ )
         {
             /*energy += *predBuf * *predBuf; */
-#ifdef BASOP_NOGLOB                                                          /* Critical Overflow , as well as those below*/
             L_energy = L_mac_o( L_energy, *ptr_pbuf, *ptr_pbuf, &Overflow ); /* Q*2-1; */
-#else
-            L_energy = L_mac( L_energy, *ptr_pbuf, *ptr_pbuf );                                                    /* Q*2-1; */
-#endif
             ptr_pbuf++;
         }
 
@@ -165,11 +163,7 @@ static Word16 GetSubbandCorrIndex2_har_fx(                               /* o  :
             FOR( j = 0; j < nZero_fx; j++ )
             {
                 /*corr += inBuf[G_item[j].gainIndex]* predBuf[G_item[j].gainIndex]; */
-#ifdef BASOP_NOGLOB                                                                                                             /* Critical Overflow */
                 L_corr = L_mac_o( L_corr, ibuf_fx[G_item_fx[j].gainIndex_fx], ptr_pbuf[G_item_fx[j].gainIndex_fx], &Overflow ); /* Q*2-1 */
-#else
-                L_corr = L_mac( L_corr, ibuf_fx[G_item_fx[j].gainIndex_fx], ptr_pbuf[G_item_fx[j].gainIndex_fx] ); /* Q*2-1 */
-#endif
             }
 
             /*corr_sq = corr*corr; */
@@ -178,13 +172,8 @@ static Word16 GetSubbandCorrIndex2_har_fx(                               /* o  :
             L_corr_sq = L_shl( L_corr, exp_norm );
             corr_sq_hi_fx = extract_h( L_corr_sq );
 
-#ifdef BASOP_NOGLOB                                                                       /* Critical Overflow */
             L_corr_sq = L_mult_o( corr_sq_hi_fx, corr_sq_hi_fx, &Overflow );              /* (((Qhi:Qsh+exp_norm_hi-16)+Qss+1)+exp_norm-16)*2+1 */
             L_corr_sq = L_shr_o( L_corr_sq, s_min( shl( exp_norm, 1 ), 31 ), &Overflow ); /* (QCorr-16)*2+1 */
-#else
-            L_corr_sq = L_mult( corr_sq_hi_fx, corr_sq_hi_fx );                                                    /* (((Qhi:Qsh+exp_norm_hi-16)+Qss+1)+exp_norm-16)*2+1 */
-            L_corr_sq = L_shr( L_corr_sq, s_min( shl( exp_norm, 1 ), 31 ) );                                       /* (QCorr-16)*2+1 */
-#endif
             IF( Overflow != 0 )
             {
                 L_corr_sq = 0x0L;
@@ -279,6 +268,7 @@ static void getswbindices_har_fx(
     {
         /*nlags[sb] = (short)pow(2, bits_lagIndices_mode0_Har[sb]); */
         nlags_fx[sb] = shl( 1, bits_lagIndices_mode0_Har[sb] );
+        move16();
     }
 
     j = 0;
@@ -290,6 +280,7 @@ static void getswbindices_har_fx(
                                      sbWidth_fx[sb], &n_nbiggestsearch_fx[sb], N_NBIGGEST_PULSEARCH );
 
         search_offset_fx[sb] = subband_search_offset_fx[sb];
+        move16();
         j = add( j, N_NBIGGEST_PULSEARCH );
     }
 
@@ -316,7 +307,8 @@ static void getswbindices_har_fx(
             FOR( j = add( search_offset_fx[sb], shr( nlags_fx[sb], 1 ) ); j > tmp; j-- )
             {
                 low_freqsgnl_fx[k] = y2_fx[j];
-                k = add( k, 1 );
+                move16();
+                k++;
             }
         }
         /* correlation b/w HF spectrum Group1 of length sbLen and decoded LF spectrum */
@@ -326,6 +318,7 @@ static void getswbindices_har_fx(
                                                                   add( sbWidth_fx[sb], nlags_fx[sb] ),
                                                                   nlags_fx[sb], Nbiggest_fx + ( sb * N_NBIGGEST_PULSEARCH ),
                                                                   n_nbiggestsearch_fx[sb], &prev_frame_bstindx_fx[sb] );
+        move16();
     }
 
     return;
@@ -429,8 +422,10 @@ static Word16 GetSubbandCorrIndex2_pulsestep_fx(
     }
 
     /* Get the initial energy for zero lag */
+    test();
     WHILE( *ptr_predBuf == 0 && LT_16( absPos_fx, ssearch_buflim ) )
     {
+        test();
         ptr_predBuf++;
         absPos_fx = add( absPos_fx, 1 );
     }
@@ -523,9 +518,10 @@ static Word16 GetSubbandCorrIndex2_pulsestep_fx(
         ptr_predBuf++;
         ptr_ssBuf_ni_fx++;
         absPos_fx++;
-
+        test();
         WHILE( *ptr_predBuf == 0 && LT_16( absPos_fx, ssearch_buflim ) )
         {
+            test();
             ptr_predBuf++;
             ptr_ssBuf_ni_fx++;
             absPos_fx = add( absPos_fx, 1 );
@@ -543,7 +539,7 @@ static Word16 GetSubbandCorrIndex2_pulsestep_fx(
         }
     }
 
-    IF( EQ_16( ib_flag_fx, 1 ) )
+    if ( EQ_16( ib_flag_fx, 1 ) )
     {
         bestIdx_fx = 0;
         move16();
@@ -611,6 +607,7 @@ static void GetSWBIndices_fx(
     }
 
     sspectra_ma_fx[0] = add( shr( predBuf_ni_fx[0], 1 ), shr( predBuf_ni_fx[1], 1 ) );
+    move16();
     tmp = sub( predBufLen, 1 );
     FOR( sb = 1; sb < tmp; sb++ )
     {
@@ -619,8 +616,10 @@ static void GetSWBIndices_fx(
         L_temp = L_add( L_temp, L_mult( predBuf_ni_fx[sb - 1], 10922 ) );
         L_temp = L_add( L_temp, L_mult( predBuf_ni_fx[sb + 1], 10922 ) ); /* Qss+15+1 */
         sspectra_ma_fx[sb] = round_fx( L_temp );
+        move16();
     }
     sspectra_ma_fx[sb] = add( shr( predBuf_ni_fx[sb - 1], 1 ), shr( predBuf_ni_fx[sb], 1 ) );
+    move16();
 
     /* Partial search for rest of subbands except the last which is fixed */
     FOR( sb = 0; sb < nBands_search; sb++ )
@@ -634,6 +633,7 @@ static void GetSWBIndices_fx(
             sbLen, nlags_fx[sb], gi_fx + ( sb * N_NBIGGEST_PULSEARCH ),
             n_nbiggestsearch_fx[sb],
             ssearch_buflim_fx, predBuf_ni_fx + search_offset_fx[sb] );
+        move16();
     }
 }
 /*--------------------------------------------------------------------------*
@@ -699,6 +699,7 @@ static void gethar_noisegn_fx(
     Word16 Qg;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     /*Generate HF noise*/
     genhf_noise_fx( noise_flr_fx, Qss, L_xSynth_har, QsL, sspectra_fx, bands, har_bands, har_freq_est2, pos_max_hfe2, pul_res_fx, pk_sf_fx, fLenLow,
@@ -713,6 +714,7 @@ static void gethar_noisegn_fx(
     }
 
     L_temp = 0x0;
+    move32();
     FOR( i = 0; i < fLenHigh; i++ )
     {
         L_temp = L_or( L_temp, L_abs( L_hfspec[i] ) );
@@ -721,9 +723,11 @@ static void gethar_noisegn_fx(
     FOR( i = 0; i < fLenHigh; i++ )
     {
         L_hfspec_sft[i] = L_shl( L_hfspec[i], exp_norm_g1 );
+        move32();
     }
 
     L_temp = 0x0;
+    move32();
     FOR( i = 0; i < fLenHigh; i++ )
     {
         L_temp = L_or( L_temp, L_abs( L_xSynth_har[i] ) );
@@ -732,6 +736,7 @@ static void gethar_noisegn_fx(
     FOR( i = 0; i < fLenHigh; i++ )
     {
         L_xSynth_har_sft[i] = L_shl( L_xSynth_har[i], exp_norm_g2 );
+        move32();
     }
 
     exp_safe = 4;
@@ -776,14 +781,9 @@ static void gethar_noisegn_fx(
             exp = sub( exp, Qsqrt );
             L_temp = L_Comp( exp, frac );
 
-            L_temp = Mpy_32_16_1( L_temp, 19728 ); /* log(2)/log(10)=.30102999566398119521 = 19728.3(Q16)    Q(0+16+1)=Q17 */
-#ifdef BASOP_NOGLOB
+            L_temp = Mpy_32_16_1( L_temp, 19728 );     /* log(2)/log(10)=.30102999566398119521 = 19728.3(Q16)    Q(0+16+1)=Q17 */
             L_temp = L_shl_o( L_temp, 13, &Overflow ); /* Q17+13=30    30-16=14 */
             g_fx = round_fx_o( L_temp, &Overflow );
-#else
-            L_temp = L_shl( L_temp, 13 );                                                                          /* Q17+13=30    30-16=14 */
-            g_fx = round_fx( L_temp );
-#endif
         }
 
         gqlevs_fx = 4;
@@ -806,7 +806,7 @@ static void gethar_noisegn_fx(
         }
     }
 
-    push_indice_fx( hBstr, IND_NOISEG, imin_fx, 2 );
+    push_indice( hBstr, IND_NOISEG, imin_fx, 2 );
 
     /*g=(float) pow (10.0f,gain_table[imin]);*/
     L_temp = L_mult( gain_table_SWB_BWE_fx[imin_fx], 27213 ); /* Q14+Q13+1=Q28  log(10)/log(2)=3.3219 27213.23(Q13) */
@@ -909,13 +909,13 @@ static void EncodeSWBSubbands_fx(
         /* Write the indices into the bitstream */
         FOR( k = 0; k < nBands_search_fx; k++ )
         {
-            push_indice_fx( st_fx->hBstr, IND_LAGINDICES, lagIndices_fx[k], bits_lagIndices_mode0_Har[k] );
+            push_indice( st_fx->hBstr, IND_LAGINDICES, lagIndices_fx[k], bits_lagIndices_mode0_Har[k] );
         }
 
         IF( flag_dis == 0 )
         {
             test();
-            if ( NE_16( har_freq_est2, SWB_HAR_RAN1 ) || NE_16( har_freq_est2, *prev_frm_hfe2 ) )
+            IF( NE_16( har_freq_est2, SWB_HAR_RAN1 ) || NE_16( har_freq_est2, *prev_frm_hfe2 ) )
             {
                 har_freq_est2 = add( har_freq_est2, lagIndices_fx[0] );
                 move16();
@@ -974,7 +974,7 @@ static void EncodeSWBSubbands_fx(
             }
             ELSE
             {
-                push_indice_fx( st_fx->hBstr, IND_LAGINDICES, lagIndices_fx[k], bits_lagIndices_modeNormal[k] );
+                push_indice( st_fx->hBstr, IND_LAGINDICES, lagIndices_fx[k], bits_lagIndices_modeNormal[k] );
             }
         }
 
@@ -984,14 +984,17 @@ static void EncodeSWBSubbands_fx(
         FOR( k = 0; k < NB_SWB_SUBBANDS; k++ )
         {
             lagGains_fx[k] = mult_r( lagGains_fx[k], 29491 ); /* lagGains[k]*0.9f; */
+            move16();
         }
 
         FOR( k = 0; k < NB_SWB_SUBBANDS; k++ )
         {
             L_th_g[k] = L_deposit_l( 0 );
+            move32();
             IF( p2a_flags_fx[BANDS_fx - NB_SWB_SUBBANDS + k] == 0 )
             {
                 L_th_g[k] = L_shl( L_mult( lagGains_fx[k], ss_min_fx ), sub( QsL, add( add( QlagGains[k], Qss ), 1 ) ) ); /* QlagGain+Qss -> QsL */
+                move32();
             }
         }
 
@@ -1110,7 +1113,7 @@ static void EncodeSWBSubbands_ivas_fx(
         IF( flag_dis == 0 )
         {
             test();
-            if ( NE_16( har_freq_est2, SWB_HAR_RAN1 ) || NE_16( har_freq_est2, *prev_frm_hfe2 ) )
+            IF( NE_16( har_freq_est2, SWB_HAR_RAN1 ) || NE_16( har_freq_est2, *prev_frm_hfe2 ) )
             {
                 har_freq_est2 = add( har_freq_est2, lagIndices_fx[0] );
                 move16();
@@ -1179,14 +1182,17 @@ static void EncodeSWBSubbands_ivas_fx(
         FOR( k = 0; k < NB_SWB_SUBBANDS; k++ )
         {
             lagGains_fx[k] = mult_r( lagGains_fx[k], 29491 ); /* lagGains[k]*0.9f; */
+            move16();
         }
 
         FOR( k = 0; k < NB_SWB_SUBBANDS; k++ )
         {
             L_th_g[k] = L_deposit_l( 0 );
+            move32();
             IF( p2a_flags_fx[BANDS_fx - NB_SWB_SUBBANDS + k] == 0 )
             {
                 L_th_g[k] = L_shl( L_mult( lagGains_fx[k], ss_min_fx ), sub( QsL, add( add( QlagGains[k], Qss ), 1 ) ) ); /* QlagGain+Qss -> QsL */
+                move32();
             }
         }
 
@@ -1302,6 +1308,7 @@ void swb_bwe_enc_lr_fx(
     FOR( k = 0; k < swb_lowband_fx; k++ )
     {
         L_m[k] = L_deposit_l( 0 );
+        move32();
     }
 
     return;
@@ -1385,6 +1392,7 @@ void swb_bwe_enc_lr_ivas_fx(
     FOR( k = 0; k < swb_lowband_fx; k++ )
     {
         L_m[k] = L_deposit_l( 0 );
+        move32();
     }
 
     return;
diff --git a/lib_enc/swb_pre_proc.c b/lib_enc/swb_pre_proc.c
deleted file mode 100644
index 2f76fa5f4393f88f25c9ead25d77c40789c9b26c..0000000000000000000000000000000000000000
--- a/lib_enc/swb_pre_proc.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-#include "ivas_rom_enc.h"
-#include "ivas_prot_fx.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-
-
-/*-------------------------------------------------------------------*
- * swb_pre_proc()
- *
- * - Calculate the 6 to 14 kHz (or 7.5 - 15.5 kHz) SHB target signal
- *   for SWB TBE or SWB BWE coding
- * - Common SWB TBE and SWB BWE pre-processing
- *-------------------------------------------------------------------*/
-
-/*full implementation pending*/
-void swb_pre_proc_ivas_fx(
-    Encoder_State *st,         /* i/o: encoder state structure                  */
-    Word16 *new_swb_speech,    /* o  : original input signal at 32kHz - Q0      */
-    Word32 *new_swb_speech_fx, /* o  : original input signal at 32kHz - Q - q_reImBuffer */
-    Word16 *shb_speech,        /* o  : SHB target signal (6-14kHz) at 16kHz- Q(Q_shb_spch) */
-    Word16 *Q_shb_spch,
-    Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i  : real buffer Q - q_reImbuffer             */
-    Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i  : imag buffer Q - q_reImbuffer             */
-    Word16 q_reImBuffer,                                        /* i : scale data of real and imag CLDFB buffers */
-    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder structure                    */
-)
-{
-    Word16 Sample_Delay_SWB_BWE, inner_frame, delay;
-    TD_BWE_ENC_HANDLE hBWE_TD;
-    FD_BWE_ENC_HANDLE hBWE_FD;
-    Word32 inner_Fs, input_Fs;
-    Word16 old_input_fx[NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k];    // fixed counterpart
-    Word32 old_input_fx_32[NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k]; // fixed counterpart
-    Word16 spchTmp[L_FRAME32k], spchTmp2[L_FRAME32k];
-    Word16 i, j, L_resamp;
-    Word16 startB, endB;
-    Word32 *realBufferFlipped[CLDFB_NO_COL_MAX];
-    Word32 *imagBufferFlipped[CLDFB_NO_COL_MAX];
-    Word32 realBufferTmp[CLDFB_NO_COL_MAX][20];
-    Word32 imagBufferTmp[CLDFB_NO_COL_MAX][20];
-    Word32 shb_speech_fx_32[L_FRAME16k];
-    Word16 ts, nB, uB;
-    Word32 v, t, regression;
-    Word16 t_16;
-    const Word32 *thr, *regV;
-    Word32 lbEner;
-    Word16 exp_lbEner = 0;
-    Word16 Sample_Delay_SWB_BWE32k, lMemRecalc32k, dft_ovl32k;
-    Word32 one_by_50_Q31 = 42949673;
-
-    lMemRecalc32k = NS2SA_FX2( 32000, L_MEM_RECALC_NS );
-    move16(); // exp_lbEner
-    move16(); // lMemRecalc32k
-    move32(); // one_by_50_Q31
-
-    /* initialization */
-    hBWE_TD = st->hBWE_TD;
-    hBWE_FD = st->hBWE_FD;
-    input_Fs = st->input_Fs;
-
-    FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
-    {
-        set32_fx( realBufferTmp[j], 0, 20 );
-        set32_fx( imagBufferTmp[j], 0, 20 );
-        realBufferFlipped[j] = realBufferTmp[j];
-        imagBufferFlipped[j] = imagBufferTmp[j];
-    }
-
-    set16_fx( old_input_fx, 0, NS2SA_FX2( 48000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k );
-
-    IF( EQ_32( st->input_Fs, 32000 ) )
-    {
-        IF( st->element_mode > EVS_MONO )
-        {
-            Sample_Delay_SWB_BWE = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_12k8_NS );
-            move16();
-            IF( EQ_16( st->L_frame, L_FRAME16k ) )
-            {
-                Sample_Delay_SWB_BWE = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_16k_NS );
-                move16();
-            }
-
-            Copy( st->input_fx - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
-            Copy( st->input_fx - L_FRAME32k, hBWE_FD->old_fdbwe_speech_fx, L_FRAME32k );
-
-            test();
-            test();
-            IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && GE_16( st->bwidth, SWB ) )
-            {
-                Copy( st->input_fx - hCPE->hStereoTCA->lMemRecalc, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ), sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ) );
-            }
-            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && GE_16( st->bwidth, SWB ) )
-            {
-                Copy( st->input_fx - hCPE->hStereoDft->dft_ovl, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - sub( hCPE->hStereoDft->dft_ovl, Sample_Delay_SWB_BWE ), sub( hCPE->hStereoDft->dft_ovl, Sample_Delay_SWB_BWE ) );
-            }
-        }
-
-        Copy( st->input_fx, new_swb_speech, L_FRAME32k );
-
-        test();
-        test();
-        IF( NE_16( st->last_extl, SWB_BWE ) && NE_16( st->last_extl, FB_BWE ) && NE_16( st->extl, SWB_BWE_HIGHRATE ) )
-        {
-            Sample_Delay_SWB_BWE = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
-            move16();
-            test();
-            IF( st->element_mode > EVS_MONO && EQ_16( st->L_frame, L_FRAME16k ) )
-            {
-                Sample_Delay_SWB_BWE = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
-                move16();
-            }
-            IF( st->element_mode > EVS_MONO )
-            {
-                Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA_FX2( 32000, DELAY_FIR_RESAMPL_NS ) );
-            }
-
-            Copy( hBWE_FD->old_fdbwe_speech_fx, &old_input_fx[Sample_Delay_SWB_BWE], L_FRAME32k );
-
-            set16_fx( old_input_fx, 0, Sample_Delay_SWB_BWE );
-            Copy( hBWE_FD->old_fdbwe_speech_fx + L_FRAME32k - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
-            IF( NE_16( st->extl, WB_BWE ) )
-            {
-                Copy( old_input_fx, hBWE_FD->L_old_wtda_swb_fx, L_FRAME32k );
-            }
-        }
-
-        test();
-        IF( NE_16( st->extl, SWB_BWE ) && NE_16( st->extl, FB_BWE ) )
-        {
-            Copy( st->input_fx, hBWE_FD->old_fdbwe_speech_fx, L_FRAME32k );
-        }
-    }
-    ELSE /* 48 kHz */
-    {
-
-        Sample_Delay_SWB_BWE32k = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_12k8_NS );
-        move16();
-        Sample_Delay_SWB_BWE = NS2SA_FX2( 48000, DELAY_FD_BWE_ENC_12k8_NS );
-        move16();
-        IF( EQ_16( st->L_frame, L_FRAME16k ) )
-        {
-            Sample_Delay_SWB_BWE32k = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_16k_NS );
-            move16();
-            Sample_Delay_SWB_BWE = NS2SA_FX2( 48000, DELAY_FD_BWE_ENC_16k_NS );
-            move16();
-        }
-
-        dft_ovl32k = 0;
-        move16();
-        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-        {
-            dft_ovl32k = (Word16) ( STEREO_DFT_OVL_MAX * 32000 / 48000 );
-            move16();
-        }
-
-        IF( EQ_16( st->codec_mode, MODE1 ) )
-        {
-            IF( st->element_mode > EVS_MONO )
-            {
-
-                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
-                {
-                }
-                ELSE IF( EQ_16( st->bwidth, FB ) )
-                {
-                    Copy( st->input_fx - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
-                }
-
-                Copy( st->input_fx - L_FRAME48k, hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k );
-
-                test();
-                test();
-                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && GE_16( st->bwidth, SWB ) )
-                {
-                    IF( EQ_16( st->bwidth, SWB ) )
-                    {
-                        /* buffers hBWE_FD->old_input[] and hBWE_FD->old_wtda_swb[] need to be at 32 kHz (inner) sampling rate */
-
-                        decimate_2_over_3_allpass_fx( st->input_fx - hCPE->hStereoTCA->lMemRecalc, hCPE->hStereoTCA->lMemRecalc, spchTmp, hBWE_TD->dec_2_over_3_mem_fx,
-                                                      allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
-
-                        Copy( spchTmp, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - sub( lMemRecalc32k, Sample_Delay_SWB_BWE32k ), sub( lMemRecalc32k, Sample_Delay_SWB_BWE32k ) );
-                        Copy( spchTmp + lMemRecalc32k - Sample_Delay_SWB_BWE32k, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE32k );
-                    }
-                    ELSE /* FB_BWE */
-                    {
-                        Copy( st->input_fx - hCPE->hStereoTCA->lMemRecalc, hBWE_FD->L_old_wtda_swb_fx + L_FRAME48k - sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ), sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ) );
-                        Copy( st->input_fx - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
-                    }
-                }
-                ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && GE_16( st->bwidth, SWB ) )
-                {
-                    IF( EQ_16( st->bwidth, SWB ) )
-                    {
-                        lerp( st->input_fx - hCPE->hStereoDft->dft_ovl, spchTmp, dft_ovl32k - Sample_Delay_SWB_BWE32k, hCPE->hStereoDft->dft_ovl - Sample_Delay_SWB_BWE );
-
-                        Copy( spchTmp, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - ( dft_ovl32k - Sample_Delay_SWB_BWE32k ), dft_ovl32k - Sample_Delay_SWB_BWE32k );
-                    }
-                    ELSE
-                    {
-                        Copy( st->input_fx - hCPE->hStereoDft->dft_ovl, hBWE_FD->L_old_wtda_swb_fx + L_FRAME48k - ( hCPE->hStereoDft->dft_ovl - Sample_Delay_SWB_BWE ), hCPE->hStereoDft->dft_ovl - Sample_Delay_SWB_BWE );
-                    }
-                }
-            }
-
-            test();
-            test();
-            test();
-            test();
-            IF( ( NE_16( st->extl, SWB_BWE ) && NE_16( st->extl, FB_BWE ) && ( st->core == ACELP_CORE ) ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && ( st->core != ACELP_CORE ) ) /*resampling not needed for MDCT cores*/ )
-            {
-                /* move the resampling out of the TDBWE path as new_swb_speech is not needed for TDBWE. */
-                Copy( st->input_fx, hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k );
-            }
-            ELSE
-            {
-                test();
-                IF( NE_16( st->last_extl, SWB_BWE ) && NE_16( st->last_extl, FB_BWE ) )
-                {
-                    /* resample 48 kHz to 32kHz */
-                    IF( EQ_16( st->last_bwidth, FB ) )
-                    {
-                        inner_frame = L_FRAME48k;
-                        move16();
-                        inner_Fs = 48000;
-                        move32();
-                        Copy( hBWE_FD->old_fdbwe_speech_fx, new_swb_speech, L_FRAME48k );
-                    }
-                    ELSE
-                    {
-                        inner_frame = L_FRAME32k;
-                        move16();
-                        inner_Fs = 32000;
-                        move32();
-
-                        IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
-                        {
-                            decimate_2_over_3_allpass_fx( hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
-                        }
-                        ELSE
-                        {
-                            lerp( hBWE_FD->old_fdbwe_speech_fx, new_swb_speech, inner_frame, L_FRAME48k );
-                        }
-
-                        test();
-                        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && st->idchan == 0 )
-                        {
-                            FOR( i = 0; i < STEREO_DFT_OVL_32k; i++ )
-                            {
-                                hCPE->hStereoDft->output_mem_dmx_32k_fx[i] = L_shr( Mpy_32_16_1( hCPE->hStereoDft->win_32k_fx[STEREO_DFT_OVL_32k - 1 - i], new_swb_speech[( ( inner_frame + i ) - STEREO_DFT_OVL_32k )] ), 1 ); // Q15
-                                move32();
-                            }
-                        }
-                    }
-
-                    Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
-                    move16();
-                    test();
-                    IF( st->element_mode > EVS_MONO && EQ_16( st->L_frame, L_FRAME16k ) )
-                    {
-                        Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
-                        move16();
-                    }
-                    IF( st->element_mode > EVS_MONO )
-                    {
-                        Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA_FX2( inner_Fs, DELAY_FIR_RESAMPL_NS ) );
-                    }
-
-                    Copy( new_swb_speech, &old_input_fx[Sample_Delay_SWB_BWE], inner_frame );
-                    set16_fx( old_input_fx, 0, Sample_Delay_SWB_BWE );
-                    Copy( new_swb_speech + inner_frame - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
-                    Copy( old_input_fx, hBWE_FD->L_old_wtda_swb_fx, inner_frame );
-                }
-
-                /* resample 48 kHz to 32kHz */
-                IF( EQ_16( st->bwidth, FB ) )
-                {
-                    Copy( st->input_fx, new_swb_speech, L_FRAME48k );
-                }
-                ELSE
-                {
-                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
-                    {
-                        Word16 dec_2_over_3_mem_tmp[L_FILT_2OVER3], dec_2_over_3_mem_lp_tmp[L_FILT_2OVER3_LP];
-
-                        decimate_2_over_3_allpass_fx( st->input_fx, L_FRAME48k - hCPE->hStereoTCA->lMemRecalc, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
-
-                        Copy( hBWE_TD->dec_2_over_3_mem_fx, dec_2_over_3_mem_tmp, L_FILT_2OVER3 );
-                        Copy( hBWE_TD->dec_2_over_3_mem_lp_fx, dec_2_over_3_mem_lp_tmp, L_FILT_2OVER3_LP );
-
-                        decimate_2_over_3_allpass_fx( st->input_fx + L_FRAME48k - hCPE->hStereoTCA->lMemRecalc, hCPE->hStereoTCA->lMemRecalc, new_swb_speech + L_FRAME32k - lMemRecalc32k, dec_2_over_3_mem_tmp, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, dec_2_over_3_mem_lp_tmp );
-                    }
-                    ELSE IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
-                    {
-                        decimate_2_over_3_allpass_fx( st->input_fx, L_FRAME48k, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
-                    }
-                    ELSE /* IVAS_CPE_DFT */
-                    {
-                        Word16 out_start_ind, out_end_ind;
-                        stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, new_swb_speech_fx, &out_start_ind, &out_end_ind, st->idchan, input_Fs, 32000, 0, NULL );
-                        Copy_Scale_sig32_16( new_swb_speech_fx - STEREO_DFT_OVL_MAX, new_swb_speech - STEREO_DFT_OVL_MAX, L_FRAME48k + STEREO_DFT_OVL_MAX, add( q_reImBuffer, 1 ) ); // Q0
-                        Copy( new_swb_speech - Sample_Delay_SWB_BWE32k, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE32k );                                                            // Q0
-                    }
-                }
-            }
-        }
-        ELSE
-        {
-            /* resample 48 kHz to 32kHz */
-            IF( EQ_16( st->bwidth, FB ) )
-            {
-                Copy( st->input_fx, new_swb_speech, L_FRAME48k );
-            }
-            ELSE
-            {
-                decimate_2_over_3_allpass_fx( st->input_fx, L_FRAME48k, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
-            }
-        }
-    }
-
-    test();
-    test();
-    test();
-    test();
-    test();
-    test();
-    IF( ( ( st->core == ACELP_CORE ) && NE_16( st->extl, SWB_BWE_HIGHRATE ) && NE_16( st->extl, FB_BWE_HIGHRATE ) ) ||
-        ( ( EQ_32( st->total_brate, ACELP_9k60 ) || st->rf_mode ) && EQ_16( st->bwidth, SWB ) && ( st->element_mode == EVS_MONO ) ) )
-    {
-        Word32 CldfbHB_fx = 0;   // fixed counterpart
-        Word16 CldfbHB_fx_e = 0; // fixed counterpart
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-        Flag Overflow = 0;
-#endif
-        Word16 realQ_neg1, imagQ_neg1, exp = 0, Cldfbtemp1;
-        move32();
-        move16();
-        move16();
-
-        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-        {
-            Word16 out_start_ind, out_end_ind;
-            Word16 exp_icbweRefEner_fx;
-            Copy_Scale_sig_16_32( (const Word16 *) &old_input_fx[0], &old_input_fx_32[0], NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k, Q15 ); // Q15
-            CldfbHB_fx = stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, old_input_fx_32 + STEREO_DFT_OVL_16k, &out_start_ind, &out_end_ind, st->idchan, input_Fs, 16000, st->L_frame, &CldfbHB_fx_e );
-            Copy_Scale_sig_32_16( (const Word32 *) &old_input_fx_32[0], &old_input_fx[0], NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k, -Q15 ); // Q0
-
-            /* delay corresponding to CLDFB delay */
-            Copy( old_input_fx + STEREO_DFT_OVL_16k - 20, shb_speech, L_FRAME16k );
-            Copy( old_input_fx, hBWE_TD->old_speech_shb_fx + L_LOOK_16k + L_SUBFR16k - ( STEREO_DFT_OVL_16k - 20 ), STEREO_DFT_OVL_16k - 20 );
-            Copy( old_input_fx, hCPE->hStereoICBWE->mem_shb_speech_ref_fx, STEREO_DFT_OVL_16k - 20 ); // Q0
-            hCPE->hStereoICBWE->mem_shb_speech_ref_e = 15;
-            move16();
-
-            IF( LE_32( CldfbHB_fx, 0 ) )
-            {
-                CldfbHB_fx = EPSILON_FX;
-                move32();
-            }
-            CldfbHB_fx = L_shl( CldfbHB_fx, exp );   /* CldfbHB_ener = CldfbHB_fl*2^(exp) */
-            Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
-            Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );
-            CldfbHB_fx = L_mult( Cldfbtemp1, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
-            CldfbHB_fx = Mpy_32_16_1( L_sub( CldfbHB_fx, 1 << Q25 ), 11611 /* 0.1 * 0.221462 in Q19 */ );
-            /* Resulting Q = Q25 + Q19 - Q15 = Q29 */
-            hBWE_TD->cldfbHBLT = mac_r( CldfbHB_fx, 29491 /*0.9 Q15*/, hBWE_TD->cldfbHBLT ); /* cldfbHBLT is in Q13 */
-            move16();
-
-            exp_lbEner = hCPE->hStereoDft->lbEner_fx_e;
-            move32();
-            lbEner = Mpy_32_16_1( Sqrt32( hCPE->hStereoDft->lbEner_fx, &exp_lbEner ), 1638 /* 0.05 in Q15 */ );
-            exp_icbweRefEner_fx = hCPE->hStereoDft->icbweRefEner_fx_e;
-            move16();
-            hCPE->hStereoICBWE->icbweRefEner_fx = Mpy_32_16_1( Sqrt32( hCPE->hStereoDft->icbweRefEner_fx, &exp_icbweRefEner_fx ), 1638 /* 0.05 in Q15 */ );
-            move32();
-            hCPE->hStereoICBWE->icbweRefEner_fx_e = exp_icbweRefEner_fx;
-            move16();
-            // lbEner = 0.05f * (float) sqrt( hCPE->hStereoDft->lbEner );
-            thr = icbwe_thr_DFT_fx;
-            regV = icbwe_regressionValuesDFT_fx;
-        }
-        ELSE
-        {
-            IF( EQ_16( st->L_frame, L_FRAME ) )
-            {
-                startB = 34;
-                move16();
-                endB = 14;
-                move16();
-                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
-                {
-                    uB = 0;
-                    move16();
-                    FOR( nB = startB; nB > endB; nB-- )
-                    {
-                        realBufferFlipped[ts][uB] = realBuffer[ts][nB];
-                        move32();
-                        if ( s_and( ts, 1 ) != 0 )
-                        {
-                            realBufferFlipped[ts][uB] = L_negate( realBufferFlipped[ts][uB] );
-                            move32();
-                        }
-                        imagBufferFlipped[ts][uB] = imagBuffer[ts][nB];
-                        move32();
-                        if ( s_and( ts, 1 ) == 0 )
-                        {
-                            imagBufferFlipped[ts][uB] = L_negate( imagBufferFlipped[ts][uB] );
-                            move32();
-                        }
-                        uB = add( uB, 1 ); /* uB ++ */
-                    }
-                }
-            }
-            ELSE
-            {
-                startB = 39;
-                move16();
-                endB = 19;
-                move16();
-                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
-                {
-                    uB = 0;
-                    move16();
-                    FOR( nB = startB; nB > endB; nB-- )
-                    {
-                        realBufferFlipped[ts][uB] = L_negate( realBuffer[ts][nB] );
-                        move32();
-                        imagBufferFlipped[ts][uB] = imagBuffer[ts][nB];
-                        move32();
-                        uB = add( uB, 1 ); /* uB ++ */
-                    }
-                }
-            }
-
-            FOR( nB = 0; nB < 10; nB++ )
-            {
-                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
-                {
-                    realQ_neg1 = extract_l( L_shr( realBufferFlipped[ts][nB], 16 ) );
-                    imagQ_neg1 = extract_l( L_shr( imagBufferFlipped[ts][nB], 16 ) ); /* Q(-1), headroom needed */
-
-#ifdef BASOP_NOGLOB
-                    CldfbHB_fx = L_mac0_o( CldfbHB_fx, realQ_neg1, realQ_neg1, &Overflow );
-                    CldfbHB_fx = L_mac0_o( CldfbHB_fx, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
-#else
-                    CldfbHB_fx = L_mac0( CldfbHB_fx, realQ_neg1, realQ_neg1 );
-                    CldfbHB_fx = L_mac0( CldfbHB_fx, imagQ_neg1, imagQ_neg1 ); /* Q(-2) */
-#endif
-                }
-            }
-            CldfbHB_fx_e = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
-            exp = norm_l( CldfbHB_fx );
-            CldfbHB_fx = L_shl( CldfbHB_fx, exp );   /* CldfbHB_ener = CldfbHB_fl*2^(exp) */
-            Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
-            Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );
-            CldfbHB_fx = L_mult( Cldfbtemp1, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
-            CldfbHB_fx = Mpy_32_16_1( L_sub( CldfbHB_fx, 1 << Q25 ), 11611 /* 0.1 * 0.221462 in Q19 */ );
-            /* Resulting Q = Q25 + Q19 - Q15 = Q29 */
-            hBWE_TD->cldfbHBLT = mac_r( CldfbHB_fx, 29491 /*0.9 Q15*/, hBWE_TD->cldfbHBLT ); /* cldfbHBLT is in Q13 */
-            move32();
-
-            IF( CldfbHB_fx == 0 )
-            {
-                CldfbHB_fx = EPSILLON_FX;
-                move32();
-            }
-
-            test();
-            IF( GE_16( st->element_mode, IVAS_CPE_DFT ) && hCPE->hStereoICBWE != NULL )
-            {
-                Word32 icbweRefEner_fx = EPSILON_FX;
-                Word16 exp_icbweRefEner_fx = 0;
-
-                move32();
-                move16();
-                FOR( nB = 20; nB < 40; nB++ )
-                {
-                    FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
-                    {
-                        realQ_neg1 = extract_l( L_shr( realBuffer[ts][nB], 16 ) );
-                        imagQ_neg1 = extract_l( L_shr( imagBuffer[ts][nB], 16 ) ); /* Q(-1), headroom needed */
-                        icbweRefEner_fx = L_mac0_o( icbweRefEner_fx, realQ_neg1, realQ_neg1, &Overflow );
-                        icbweRefEner_fx = L_mac0_o( icbweRefEner_fx, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
-                    }
-                }
-                exp_icbweRefEner_fx = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
-                hCPE->hStereoICBWE->icbweRefEner_fx = Mpy_32_16_1( Sqrt32( icbweRefEner_fx, &exp_icbweRefEner_fx ), 1638 /* 0.05 in Q15 */ );
-                move32();
-                hCPE->hStereoICBWE->icbweRefEner_fx_e = exp_icbweRefEner_fx;
-                move16();
-            }
-
-            lbEner = EPSILON_FX;
-            move32();
-            FOR( nB = 0; nB < 20; nB++ )
-            {
-                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
-                {
-                    realQ_neg1 = extract_l( L_shr( realBuffer[ts][nB], 16 ) );
-                    imagQ_neg1 = extract_l( L_shr( imagBuffer[ts][nB], 16 ) ); /* Q(-1), headroom needed */
-
-                    lbEner = L_mac0_o( lbEner, realQ_neg1, realQ_neg1, &Overflow );
-                    lbEner = L_mac0_o( lbEner, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
-                }
-            }
-            exp_lbEner = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
-            lbEner = Mpy_32_16_1( Sqrt32( lbEner, &exp_lbEner ), 1638 /* 0.05 in Q15 */ );
-            thr = icbwe_thr_TDM_fx;
-            regV = icbwe_regressionValuesTDM_fx;
-
-            cldfbSynthesis_ivas_fx( realBufferFlipped, imagBufferFlipped, shb_speech_fx_32, -1, st->cldfbSynTd );
-            Copy_Scale_sig_32_16( shb_speech_fx_32, shb_speech, L_FRAME16k, negate( sub( q_reImBuffer, 1 ) ) );
-            *Q_shb_spch = 0;
-            move16();
-        }
-
-        IF( GE_16( st->element_mode, IVAS_CPE_DFT ) && hCPE->hStereoICBWE != NULL )
-        {
-            Word16 exp_t;
-            hCPE->hStereoICBWE->MSFlag = 0; /* Init the multi-source flag */
-            move16();
-            v = Mpy_32_16_1( sum16_fx( st->voicing_fx, 3 ), 10923 /* 0.33333 in Q15 */ );
-
-            // t = log10f( ( hCPE->hStereoICBWE->icbweRefEner + 1e-6f ) / ( lbEner + 1e-6f ) );
-            t = L_deposit_h( BASOP_Util_Divide3232_Scale( L_add( hCPE->hStereoICBWE->icbweRefEner_fx, EPSILON_FX ), L_add( lbEner, EPSILON_FX ), &exp_t ) );
-            exp_t = add( exp_t, sub( hCPE->hStereoICBWE->icbweRefEner_fx_e, exp_lbEner ) );
-            exp = norm_l( t );
-            t = L_shl( t, exp );
-            t_16 = Log2_norm_lc( t ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
-            t_16 = sub( shr( t_16, 6 ), shl( add( sub( Q31 - Q30, exp_t ), exp ), 9 ) );
-            t = L_mult( t_16, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
-            /* Three Level Decision Tree to calculate a regression value first */
-            IF( LT_32( t, thr[0] ) ) /* level 1 */
-            {
-                IF( LT_32( t, thr[1] ) ) /* level 2 */
-                {
-                    IF( LT_32( v, thr[3] ) )
-                    {
-                        regression = regV[0]; /* level 3 */
-                        move32();
-                    }
-                    ELSE
-                    {
-                        regression = regV[1];
-                        move32();
-                    }
-                }
-                ELSE
-                {
-                    IF( LT_32( v, thr[4] ) )
-                    {
-                        regression = regV[2]; /* level 3 */
-                        move32();
-                    }
-                    ELSE
-                    {
-                        regression = regV[3];
-                        move32();
-                    }
-                }
-            }
-            ELSE
-            {
-                IF( LT_32( t, thr[2] ) ) /* level 2 */
-                {
-                    IF( LT_32( v, thr[5] ) )
-                    {
-                        regression = regV[4]; /* level 3 */
-                        move32();
-                    }
-                    ELSE
-                    {
-                        regression = regV[5];
-                        move32();
-                    }
-                }
-                ELSE
-                {
-                    IF( LT_32( v, thr[6] ) )
-                    {
-                        regression = regV[6]; /* level 3 */
-                        move32();
-                    }
-                    ELSE
-                    {
-                        regression = regV[7];
-                        move32();
-                    }
-                }
-            }
-
-            test();
-            test();
-            /* Convert the regression to a hard decision (classification) */
-            IF( GT_32( regression, 1696512081 /* 0.79f in Q31*/ ) && !( LT_16( st->bwidth, SWB ) || hCPE->hCoreCoder[0]->vad_flag == 0 ) )
-            {
-                hCPE->hStereoICBWE->MSFlag = 1;
-                move16();
-            }
-        }
-
-        test();
-        test();
-        IF( NE_16( st->extl, WB_TBE ) && NE_16( st->extl, SWB_TBE ) && NE_16( st->extl, FB_TBE ) )
-        {
-            /* Update the previous superwideband speech buffer in case of a SWB_BWE frame - this code is in swb_tbe_enc */
-            delay = L_LOOK_16k + L_SUBFR16k;
-            move16();
-            Copy( shb_speech + sub( L_FRAME16k, delay ), hBWE_TD->old_speech_shb_fx, delay );
-        }
-    }
-    ELSE
-    {
-        test();
-        test();
-        IF( ( EQ_16( st->bwidth, FB ) || st->core == ACELP_CORE ) && ( st->element_mode == EVS_MONO ) )
-        {
-            InitSWBencBufferStates_fx( st->hBWE_TD, shb_speech );
-        }
-        ELSE
-        {
-            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-            {
-                IF( EQ_16( st->L_frame, L_FRAME ) )
-                {
-                    L_resamp = 560; /* 6.4 kHz core -> 6 - 14 kHz SHB target. 20 ms is 560 samples in 28 kHz sample rate */
-                    move16();
-                }
-                ELSE
-                {
-                    L_resamp = 620; /* 8 kHz core -> 7.5 - 15.5 kHz SHB target. 20 ms is 620 samples in 31 kHz sample rate */
-                    move16();
-                }
-
-                /* Dirty downsampling to match Nyquist to upper frequency limit of target */
-                lerp( st->input_fx, new_swb_speech, L_resamp, (int16_t) Mpy_32_32( input_Fs, one_by_50_Q31 ) );
-
-                /* flip the spectrum */
-                Copy( new_swb_speech, spchTmp, L_resamp );
-                FOR( i = 0; i < L_resamp; i = i + 2 )
-                {
-                    spchTmp[i] = negate( spchTmp[i] );
-                    move16();
-                }
-
-                /* Dirty upsampling to match Nyquist/2 to lower frequency limit of target (reversed spectrum)*/
-                lerp( spchTmp, spchTmp2, L_FRAME32k, L_resamp );
-                Copy( spchTmp2, spchTmp, L_FRAME32k );
-            }
-            ELSE
-            {
-                /* flip the spectrum */
-                Copy( new_swb_speech, spchTmp, L_FRAME32k );
-
-                FOR( i = 0; i < L_FRAME32k; i = i + 2 )
-                {
-                    spchTmp[i] = negate( spchTmp[i] );
-                    move16();
-                }
-            }
-
-            Decimate_allpass_steep_fx( spchTmp, hBWE_TD->state_ana_filt_shb_fx, L_FRAME32k, shb_speech );
-
-            Copy( shb_speech + L_FRAME16k - ( L_LOOK_16k + L_SUBFR16k ), hBWE_TD->old_speech_shb_fx, L_LOOK_16k + L_SUBFR16k );
-
-            /*Compute the past overlap for potential next iDFTs SHB*/
-            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
-            {
-                FOR( i = 0; i < STEREO_DFT_OVL_16k; i++ )
-                {
-                    hCPE->hStereoDft->output_mem_dmx_16k_shb_fx[i] = L_mult0( shb_speech[20 + i], mult_r( hCPE->hStereoDft->win_ana_16k_fx[STEREO_DFT_OVL_16k - 1 - i], hCPE->hStereoDft->win_ana_16k_fx[STEREO_DFT_OVL_16k - 1 - i] ) ); // Q15
-                    move32();
-                }
-            }
-        }
-
-        IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
-        {
-            /* Reset CLDFB synthesis buffer */
-            set32_fx( st->cldfbSynTd->cldfb_state_fx, 0, st->cldfbSynTd->p_filter_length );
-        }
-        ELSE
-        {
-            hCPE->hStereoDft->flip_sign = negate( hCPE->hStereoDft->flip_sign ); /* Make sure sign is updated even if DFT SHB target is not generated */
-            move16();
-        }
-    }
-
-    /* Memory reset to compensate for 0.9375 ms offset when transitioning from IO to SWB */
-    /* When switching from n >1 to n = 1, we keep the enc/dec delay as 8.75/3.25 and below code not needed;
-       only when n = 1 start, it will be 9.6875/2.3125 in that case this reset is needed for IO->BWE.*/
-    test();
-    IF( EQ_16( st->last_extl, -1 ) && ( st->element_mode == EVS_MONO ) )
-    {
-        delay = NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS );
-        move16();
-        FOR( i = 0; i < delay; i++ )
-        {
-            shb_speech[i] = mult_r( mult_r( i, 983 /*0.03f Q15*/ ), shb_speech[2 * delay - 1 - i] );
-            move16();
-        }
-    }
-
-    return;
-}
diff --git a/lib_enc/swb_pre_proc_fx.c b/lib_enc/swb_pre_proc_fx.c
index 79ca9555d5d7c4e1f33c1be489595cdc5041da37..0e89e16c17a0d96f74bd352d092809a4086d4a7d 100644
--- a/lib_enc/swb_pre_proc_fx.c
+++ b/lib_enc/swb_pre_proc_fx.c
@@ -9,9 +9,11 @@
 #include "rom_com_fx.h"
 #include "rom_com.h"
 #include "stl.h"
-#include "prot_fx.h"     /* Function prototypes                    */
-#include "prot_fx_enc.h" /* Function prototypes                    */
+#include "prot_fx.h"      /* Function prototypes                    */
+#include "ivas_prot_fx.h" /* Function prototypes                    */
+#include "prot_fx_enc.h"  /* Function prototypes                    */
 #include "basop_util.h"
+#include "ivas_rom_enc.h"
 
 #include <assert.h>
 
@@ -52,8 +54,11 @@ void wb_pre_proc_fx(
     Word16 temp_buf[320];
     Word16 Q_wb_sp, i, max_wb;
     Word16 fSwitchFromIO = 0;
+    move16();
     Word32 temp1 = 0;
+    move32();
     Word32 temp2 = 0;
+    move32();
     SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
     FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
@@ -75,7 +80,7 @@ void wb_pre_proc_fx(
         move16();
     }
 
-    set16_fx( old_input, 0, NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME16k );
+    set16_fx( old_input, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME16k );
 
     max_wb = 1;
     move16();
@@ -93,7 +98,7 @@ void wb_pre_proc_fx(
         temp2 = L_mac0( temp2, temp_buf[i - 1], temp_buf[i] );
     }
 
-    if ( temp2 < Mult_32_16( temp1, 31129 /*0.95f*/ ) )
+    IF( temp2 < Mult_32_16( temp1, 31129 /*0.95f*/ ) )
     {
         Q_wb_sp = sub( Q_wb_sp, 3 ); /* leave 3 bit headroom */
     }
@@ -107,15 +112,17 @@ void wb_pre_proc_fx(
     IF( EQ_16( st_fx->extl, WB_BWE ) || EQ_16( st_fx->extl, WB_TBE ) || st_fx->igf != 0 )
     {
         ramp_flag = 0;
+        move16();
 
         test();
         test();
         test();
         test();
-        IF( ( NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, WB_BWE ) && st_fx->igf == 0 ) ||
-            ( st_fx->igf != 0 && fSwitchFromIO != 0 ) )
+        if ( ( NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, WB_BWE ) && st_fx->igf == 0 ) ||
+             ( st_fx->igf != 0 && fSwitchFromIO != 0 ) )
         {
             ramp_flag = 1;
+            move16();
         }
 
         IF( !hSC_VBR->ppp_mode )
@@ -153,7 +160,7 @@ void wb_pre_proc_fx(
     test();
     IF( ( NE_16( st_fx->extl, WB_BWE ) || ( EQ_16( st_fx->extl, WB_BWE ) && LE_32( st_fx->total_brate, ACELP_8k00 ) ) ) && !hSC_VBR->ppp_mode )
     {
-        Sample_Delay_WB_BWE = NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_12k8_NS );
+        Sample_Delay_WB_BWE = NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS );
 
         Copy( new_inp_resamp16k, &old_input[Sample_Delay_WB_BWE], L_FRAME16k );
         Copy( hBWE_FD->old_input_wb_fx, old_input, Sample_Delay_WB_BWE );
@@ -235,21 +242,21 @@ void wb_pre_proc_ivas_fx(
     test();
     test();
     test();
-    IF( ( EQ_32( st_fx->last_total_brate, ACELP_6k60 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_8k85 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_12k65 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_14k25 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_15k85 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_18k25 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_19k85 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_23k05 ) ) ||
-        ( EQ_32( st_fx->last_total_brate, ACELP_23k85 ) ) )
+    if ( ( EQ_32( st_fx->last_total_brate, ACELP_6k60 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_8k85 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_12k65 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_14k25 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_15k85 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_18k25 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_19k85 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_23k05 ) ) ||
+         ( EQ_32( st_fx->last_total_brate, ACELP_23k85 ) ) )
     {
         fSwitchFromIO = 1;
         move16();
     }
 
-    set16_fx( old_input, 0, NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + STEREO_DFT_OVL_16k + L_FRAME16k );
+    set16_fx( old_input, 0, NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + STEREO_DFT_OVL_16k + L_FRAME16k );
 
     max_wb = 1;
     move16();
@@ -304,7 +311,6 @@ void wb_pre_proc_ivas_fx(
             IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) )
             {
                 Sample_Delay_WB_BWE = NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS );
-                move16();
 
                 IF( EQ_16( last_element_mode, IVAS_CPE_TD ) )
                 {
@@ -337,7 +343,9 @@ void wb_pre_proc_ivas_fx(
             ELSE IF( EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
             {
                 Word16 l_recalc_16k = L_MEM_RECALC_16K + L_FILT16k + 1; /* Note: "+1" is used because L_FILT16k is not divisible by 4 */
+                move16();
                 Word16 l_recalc_4k = ( L_MEM_RECALC_16K + L_FILT16k + 1 ) / 4;
+                move16();
                 Sample_Delay_WB_BWE = NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS );
 
                 IF( EQ_16( last_element_mode, IVAS_CPE_DFT ) )
@@ -375,7 +383,7 @@ void wb_pre_proc_ivas_fx(
             {
                 IF( EQ_32( st_fx->input_Fs, 16000 ) )
                 {
-                    flip_spectrum_and_decimby4_fx( new_inp_resamp16k, hb_speech, L_FRAME16k, hBWE_TD->decim_state1_fx, hBWE_TD->decim_state2_fx, ramp_flag );
+                    flip_spectrum_and_decimby4_fx( temp_buf, hb_speech, L_FRAME16k, hBWE_TD->decim_state1_fx, hBWE_TD->decim_state2_fx, ramp_flag );
                 }
                 ELSE
                 {
@@ -445,7 +453,7 @@ void wb_pre_proc_ivas_fx(
     test();
     IF( ( NE_16( st_fx->extl, WB_BWE ) || ( EQ_16( st_fx->extl, WB_BWE ) && EQ_32( st_fx->total_brate, 0 ) ) ) && !ppp_mode )
     {
-        Sample_Delay_WB_BWE = NS2SA_FX2( 16000, DELAY_FD_BWE_ENC_12k8_NS );
+        Sample_Delay_WB_BWE = NS2SA( 16000, DELAY_FD_BWE_ENC_12k8_NS );
 
         Copy( new_inp_resamp16k, &old_input[Sample_Delay_WB_BWE], L_FRAME16k );
         Copy( hBWE_FD->old_input_wb_fx, old_input, Sample_Delay_WB_BWE );
@@ -517,6 +525,7 @@ void swb_pre_proc_fx(
     Word32 CldfbHB_ener;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     Word16 realQ_neg1, imagQ_neg1, exp, Cldfbtemp1;
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
@@ -530,7 +539,7 @@ void swb_pre_proc_fx(
         imagBufferFlipped[j] = imagBufferTmp[j];
     }
 
-    set16_fx( old_input_fx, 0, NS2SA_FX2( 48000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k );
+    set16_fx( old_input_fx, 0, NS2SA( 48000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k );
 
     IF( EQ_32( st_fx->input_Fs, 32000 ) )
     {
@@ -539,7 +548,7 @@ void swb_pre_proc_fx(
         test();
         IF( NE_16( st_fx->last_extl, SWB_BWE ) && NE_16( st_fx->last_extl, FB_BWE ) && NE_16( st_fx->extl, SWB_BWE_HIGHRATE ) )
         {
-            Sample_Delay_SWB_BWE = NS2SA_FX2( 32000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
+            Sample_Delay_SWB_BWE = NS2SA( 32000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
             Copy( hBWE_FD->old_fdbwe_speech_fx, &old_input_fx[Sample_Delay_SWB_BWE], L_FRAME32k );
             set16_fx( old_input_fx, 0, Sample_Delay_SWB_BWE );
             Copy( hBWE_FD->old_fdbwe_speech_fx + L_FRAME32k - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
@@ -587,6 +596,8 @@ void swb_pre_proc_fx(
                         decimate_2_over_3_allpass_fx( hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k, new_swb_speech_fx, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2,
                                                       decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
                     }
+                    move16();
+                    move16();
 
                     Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
                     Copy( new_swb_speech_fx, &old_input_fx[Sample_Delay_SWB_BWE], inner_frame );
@@ -628,27 +639,33 @@ void swb_pre_proc_fx(
     test();
     test();
     test();
-    IF( ( EQ_16( st_fx->core, ACELP_CORE ) && NE_16( st_fx->extl, SWB_BWE_HIGHRATE ) && NE_16( st_fx->extl, FB_BWE_HIGHRATE ) ) || ( ( EQ_32( st_fx->total_brate, 9600 ) || st_fx->rf_mode != 0 ) && EQ_16( st_fx->bwidth, SWB ) ) )
+    IF( ( st_fx->core == ACELP_CORE && NE_16( st_fx->extl, SWB_BWE_HIGHRATE ) && NE_16( st_fx->extl, FB_BWE_HIGHRATE ) ) || ( ( EQ_32( st_fx->total_brate, 9600 ) || st_fx->rf_mode != 0 ) && EQ_16( st_fx->bwidth, SWB ) ) )
     {
         IF( EQ_16( st_fx->L_frame, L_FRAME ) )
         {
             startB = 34;
+            move16();
             endB = 14;
+            move16();
             FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
             {
                 uB = 0;
+                move16();
                 FOR( nB = startB; nB > endB; nB-- )
                 {
-                    move16();
                     realBufferFlipped[ts][uB] = realBuffer[ts][nB];
+                    move32();
                     if ( s_and( ts, 1 ) != 0 )
                     {
                         realBufferFlipped[ts][uB] = L_negate( realBufferFlipped[ts][uB] );
+                        move32();
                     }
                     imagBufferFlipped[ts][uB] = imagBuffer[ts][nB];
+                    move32();
                     if ( s_and( ts, 1 ) == 0 )
                     {
                         imagBufferFlipped[ts][uB] = L_negate( imagBufferFlipped[ts][uB] );
+                        move32();
                     }
                     uB = add( uB, 1 ); /* uB ++ */
                 }
@@ -657,14 +674,19 @@ void swb_pre_proc_fx(
         ELSE
         {
             startB = 39;
+            move16();
             endB = 19;
+            move16();
             FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
             {
                 uB = 0;
+                move16();
                 FOR( nB = startB; nB > endB; nB-- )
                 {
                     realBufferFlipped[ts][uB] = L_negate( realBuffer[ts][nB] );
+                    move32();
                     imagBufferFlipped[ts][uB] = imagBuffer[ts][nB];
+                    move32();
                     uB = add( uB, 1 ); /* uB ++ */
                 }
             }
@@ -673,6 +695,7 @@ void swb_pre_proc_fx(
         /* Highband energy computation for gain shape control in case of bandwidth switching fix*/
         {
             CldfbHB_ener = 0;
+            move32();
             FOR( nB = 0; nB < 10; nB++ )
             {
                 FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
@@ -680,13 +703,8 @@ void swb_pre_proc_fx(
                     realQ_neg1 = extract_l( L_shr( realBufferFlipped[ts][nB], 31 - ( 15 + cldfbScale->hb_scale ) + 1 ) );
                     imagQ_neg1 = extract_l( L_shr( imagBufferFlipped[ts][nB], 31 - ( 15 + cldfbScale->hb_scale ) + 1 ) ); /* Q(-1), headroom needed */
 
-#ifdef BASOP_NOGLOB
                     CldfbHB_ener = L_mac0_o( CldfbHB_ener, realQ_neg1, realQ_neg1, &Overflow );
                     CldfbHB_ener = L_mac0_o( CldfbHB_ener, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
-#else
-                    CldfbHB_ener = L_mac0( CldfbHB_ener, realQ_neg1, realQ_neg1 );
-                    CldfbHB_ener = L_mac0( CldfbHB_ener, imagQ_neg1, imagQ_neg1 ); /* Q(-2) */
-#endif
                 }
             }
 
@@ -697,9 +715,9 @@ void swb_pre_proc_fx(
             CldfbHB_ener = L_mult( sub( Cldfbtemp1, 1741 /*3.401 Q9*/ ), 3495 );               /* 3495 = Q19 log10(2)*0.1/log10(32768), Q = 19+9+1 = 29 */
             hBWE_TD->cldfbHBLT = mac_r( CldfbHB_ener, 29491 /*0.9 Q15*/, hBWE_TD->cldfbHBLT ); /* cldfbHBLT is in Q13 */
         }
-        cldfbSynthesisFiltering( st_fx->cldfbSynTd, realBufferFlipped, imagBufferFlipped,
-                                 cldfbScale, shb_speech_fx, 0, CLDFB_NO_COL_MAX, cldfbWorkBuffer );
+        cldfbSynthesis_fx( st_fx->cldfbSynTd, realBufferFlipped, imagBufferFlipped, cldfbScale, shb_speech_fx, 0, CLDFB_NO_COL_MAX, cldfbWorkBuffer );
         *Q_shb_spch = 0; /*shb_speech_fx : Q0*/
+        move16();
 
         test();
         test();
@@ -712,6 +730,7 @@ void swb_pre_proc_fx(
     }
     ELSE
     {
+        test();
         IF( EQ_16( st_fx->bwidth, FB ) || EQ_16( st_fx->core, ACELP_CORE ) )
         {
             set16_fx( hBWE_TD->old_speech_shb_fx, 0, L_LOOK_16k + L_SUBFR16k );
@@ -725,6 +744,7 @@ void swb_pre_proc_fx(
             FOR( i = 0; i < L_FRAME32k; i = i + 2 )
             {
                 spchTmp_fx[i] = negate( spchTmp_fx[i] );
+                move16();
             }
 
             Decimate_allpass_steep_fx( spchTmp_fx, hBWE_TD->state_ana_filt_shb_fx, L_FRAME32k, shb_speech_fx );
@@ -734,12 +754,721 @@ void swb_pre_proc_fx(
         /* Reset CLDFB synthesis buffer */
         set16_fx( st_fx->cldfbSynTd->FilterStates, 0, st_fx->cldfbSynTd->p_filter_length + st_fx->cldfbSynTd->no_channels * st_fx->cldfbSynTd->no_col );
     }
-    IF( st_fx->last_extl == -1 )
+    IF( EQ_16( st_fx->last_extl, -1 ) )
     {
-        delay = NS2SA( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS );
+        delay = NS2SA_FX2( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS );
         FOR( i = 0; i < delay; i++ )
         {
             shb_speech_fx[i] = mult_r( mult_r( i, 983 /*0.03f Q15*/ ), shb_speech_fx[2 * delay - 1 - i] );
+            move16();
+        }
+    }
+
+    return;
+}
+
+/*-------------------------------------------------------------------*
+ * swb_pre_proc()
+ *
+ * - Calculate the 6 to 14 kHz (or 7.5 - 15.5 kHz) SHB target signal
+ *   for SWB TBE or SWB BWE coding
+ * - Common SWB TBE and SWB BWE pre-processing
+ *-------------------------------------------------------------------*/
+
+/*full implementation pending*/
+void swb_pre_proc_ivas_fx(
+    Encoder_State *st,         /* i/o: encoder state structure                  */
+    Word16 *new_swb_speech,    /* o  : original input signal at 32kHz - st->q_inp      */
+    Word32 *new_swb_speech_fx, /* o  : original input signal at 32kHz - Q - q_reImBuffer */
+    Word16 *shb_speech,        /* o  : SHB target signal (6-14kHz) at 16kHz- Q(Q_shb_spch) */
+    Word16 *Q_shb_spch,
+    Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i  : real buffer Q - q_reImbuffer             */
+    Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i  : imag buffer Q - q_reImbuffer             */
+    Word16 q_reImBuffer,                                        /* i : scale data of real and imag CLDFB buffers */
+    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder structure                    */
+)
+{
+    Word16 Sample_Delay_SWB_BWE, inner_frame, delay;
+    TD_BWE_ENC_HANDLE hBWE_TD;
+    FD_BWE_ENC_HANDLE hBWE_FD;
+    Word32 inner_Fs, input_Fs;
+    Word16 old_input_fx[NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k];    // fixed counterpart
+    Word32 old_input_fx_32[NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k]; // fixed counterpart
+    Word16 spchTmp[L_FRAME32k], spchTmp2[L_FRAME32k];
+    Word16 i, j, L_resamp;
+    Word16 startB, endB;
+    Word32 *realBufferFlipped[CLDFB_NO_COL_MAX];
+    Word32 *imagBufferFlipped[CLDFB_NO_COL_MAX];
+    Word32 realBufferTmp[CLDFB_NO_COL_MAX][20];
+    Word32 imagBufferTmp[CLDFB_NO_COL_MAX][20];
+    Word32 shb_speech_fx_32[L_FRAME16k];
+    Word16 ts, nB, uB;
+    Word32 v, t, regression;
+    Word16 t_16;
+    const Word32 *thr, *regV;
+    Word32 lbEner;
+    Word16 exp_lbEner = 0;
+    Word16 Sample_Delay_SWB_BWE32k, lMemRecalc32k, dft_ovl32k;
+    Word32 one_by_50_Q31 = 42949673;
+
+    lMemRecalc32k = NS2SA( 32000, L_MEM_RECALC_NS );
+    move16(); // exp_lbEner
+    move16(); // lMemRecalc32k
+    move32(); // one_by_50_Q31
+
+    /* initialization */
+    hBWE_TD = st->hBWE_TD;
+    hBWE_FD = st->hBWE_FD;
+    input_Fs = st->input_Fs;
+
+    FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
+    {
+        set32_fx( realBufferTmp[j], 0, 20 );
+        set32_fx( imagBufferTmp[j], 0, 20 );
+        realBufferFlipped[j] = realBufferTmp[j];
+        imagBufferFlipped[j] = imagBufferTmp[j];
+    }
+
+    set16_fx( old_input_fx, 0, NS2SA( 48000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k );
+
+    IF( EQ_32( st->input_Fs, 32000 ) )
+    {
+        IF( st->element_mode > EVS_MONO )
+        {
+            Sample_Delay_SWB_BWE = NS2SA( 32000, DELAY_FD_BWE_ENC_12k8_NS );
+            IF( EQ_16( st->L_frame, L_FRAME16k ) )
+            {
+                Sample_Delay_SWB_BWE = NS2SA( 32000, DELAY_FD_BWE_ENC_16k_NS );
+            }
+
+            Copy( st->input_fx - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
+            Copy( st->input_fx - L_FRAME32k, hBWE_FD->old_fdbwe_speech_fx, L_FRAME32k );
+
+            test();
+            test();
+            scale_sig( hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, sub( st->q_inp, st->Q_old_wtda ) ); // st->Q_old_wtda -> st->q_inp
+            st->Q_old_wtda = st->q_inp;
+            move16();
+            IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && GE_16( st->bwidth, SWB ) )
+            {
+                Copy( st->input_fx - hCPE->hStereoTCA->lMemRecalc, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ), sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ) );
+            }
+            ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && GE_16( st->bwidth, SWB ) )
+            {
+                Copy( st->input_fx - hCPE->hStereoDft->dft_ovl, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - sub( hCPE->hStereoDft->dft_ovl, Sample_Delay_SWB_BWE ), sub( hCPE->hStereoDft->dft_ovl, Sample_Delay_SWB_BWE ) );
+            }
+        }
+
+        Copy( st->input_fx, new_swb_speech, L_FRAME32k );
+
+        test();
+        test();
+        IF( NE_16( st->last_extl, SWB_BWE ) && NE_16( st->last_extl, FB_BWE ) && NE_16( st->extl, SWB_BWE_HIGHRATE ) )
+        {
+            Sample_Delay_SWB_BWE = NS2SA( 32000, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
+            test();
+            IF( st->element_mode > EVS_MONO && EQ_16( st->L_frame, L_FRAME16k ) )
+            {
+                Sample_Delay_SWB_BWE = NS2SA( 32000, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
+            }
+            IF( st->element_mode > EVS_MONO )
+            {
+                Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA( 32000, DELAY_FIR_RESAMPL_NS ) );
+            }
+
+            Copy( hBWE_FD->old_fdbwe_speech_fx, &old_input_fx[Sample_Delay_SWB_BWE], L_FRAME32k );
+
+            set16_fx( old_input_fx, 0, Sample_Delay_SWB_BWE );
+            Copy( hBWE_FD->old_fdbwe_speech_fx + L_FRAME32k - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
+            IF( NE_16( st->extl, WB_BWE ) )
+            {
+                Copy( old_input_fx, hBWE_FD->L_old_wtda_swb_fx, L_FRAME32k );
+                st->Q_old_wtda = st->q_inp;
+                move16();
+            }
+        }
+
+        test();
+        IF( NE_16( st->extl, SWB_BWE ) && NE_16( st->extl, FB_BWE ) )
+        {
+            Copy( st->input_fx, hBWE_FD->old_fdbwe_speech_fx, L_FRAME32k );
+        }
+    }
+    ELSE /* 48 kHz */
+    {
+
+        Sample_Delay_SWB_BWE32k = NS2SA( 32000, DELAY_FD_BWE_ENC_12k8_NS );
+        move16();
+        Sample_Delay_SWB_BWE = NS2SA( 48000, DELAY_FD_BWE_ENC_12k8_NS );
+        move16();
+        IF( EQ_16( st->L_frame, L_FRAME16k ) )
+        {
+            Sample_Delay_SWB_BWE32k = NS2SA( 32000, DELAY_FD_BWE_ENC_16k_NS );
+            move16();
+            Sample_Delay_SWB_BWE = NS2SA( 48000, DELAY_FD_BWE_ENC_16k_NS );
+            move16();
+        }
+
+        dft_ovl32k = 0;
+        move16();
+        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
+        {
+            dft_ovl32k = (Word16) ( STEREO_DFT_OVL_MAX * 32000 / 48000 );
+            move16();
+        }
+
+        IF( EQ_16( st->codec_mode, MODE1 ) )
+        {
+            IF( st->element_mode > EVS_MONO )
+            {
+
+                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
+                {
+                }
+                ELSE IF( EQ_16( st->bwidth, FB ) )
+                {
+                    Copy( st->input_fx - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
+                }
+
+                Copy( st->input_fx - L_FRAME48k, hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k );
+
+                test();
+                test();
+                scale_sig( hBWE_FD->L_old_wtda_swb_fx, L_FRAME48k, sub( st->q_inp, st->Q_old_wtda ) ); // st->Q_old_wtda -> st->q_inp
+                st->Q_old_wtda = st->q_inp;
+                move16();
+
+                IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && GE_16( st->bwidth, SWB ) )
+                {
+                    IF( EQ_16( st->bwidth, SWB ) )
+                    {
+                        /* buffers hBWE_FD->old_input[] and hBWE_FD->old_wtda_swb[] need to be at 32 kHz (inner) sampling rate */
+
+                        decimate_2_over_3_allpass_fx( st->input_fx - hCPE->hStereoTCA->lMemRecalc, hCPE->hStereoTCA->lMemRecalc, spchTmp, hBWE_TD->dec_2_over_3_mem_fx,
+                                                      allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
+
+                        Copy( spchTmp, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - sub( lMemRecalc32k, Sample_Delay_SWB_BWE32k ), sub( lMemRecalc32k, Sample_Delay_SWB_BWE32k ) );
+                        Copy( spchTmp + lMemRecalc32k - Sample_Delay_SWB_BWE32k, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE32k );
+                    }
+                    ELSE /* FB_BWE */
+                    {
+                        Copy( st->input_fx - hCPE->hStereoTCA->lMemRecalc, hBWE_FD->L_old_wtda_swb_fx + L_FRAME48k - sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ), sub( hCPE->hStereoTCA->lMemRecalc, Sample_Delay_SWB_BWE ) );
+                        Copy( st->input_fx - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
+                    }
+                }
+                ELSE IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && GE_16( st->bwidth, SWB ) )
+                {
+                    IF( EQ_16( st->bwidth, SWB ) )
+                    {
+                        lerp( st->input_fx - hCPE->hStereoDft->dft_ovl, spchTmp, dft_ovl32k - Sample_Delay_SWB_BWE32k, hCPE->hStereoDft->dft_ovl - Sample_Delay_SWB_BWE );
+
+                        Copy( spchTmp, hBWE_FD->L_old_wtda_swb_fx + L_FRAME32k - ( dft_ovl32k - Sample_Delay_SWB_BWE32k ), dft_ovl32k - Sample_Delay_SWB_BWE32k );
+                    }
+                    ELSE
+                    {
+                        Copy( st->input_fx - hCPE->hStereoDft->dft_ovl, hBWE_FD->L_old_wtda_swb_fx + L_FRAME48k - ( hCPE->hStereoDft->dft_ovl - Sample_Delay_SWB_BWE ), hCPE->hStereoDft->dft_ovl - Sample_Delay_SWB_BWE );
+                    }
+                }
+            }
+
+            test();
+            test();
+            test();
+            test();
+            IF( ( NE_16( st->extl, SWB_BWE ) && NE_16( st->extl, FB_BWE ) && ( st->core == ACELP_CORE ) ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && ( st->core != ACELP_CORE ) ) /*resampling not needed for MDCT cores*/ )
+            {
+                /* move the resampling out of the TDBWE path as new_swb_speech is not needed for TDBWE. */
+                Copy( st->input_fx, hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k );
+            }
+            ELSE
+            {
+                test();
+                IF( NE_16( st->last_extl, SWB_BWE ) && NE_16( st->last_extl, FB_BWE ) )
+                {
+                    /* resample 48 kHz to 32kHz */
+                    IF( EQ_16( st->last_bwidth, FB ) )
+                    {
+                        inner_frame = L_FRAME48k;
+                        move16();
+                        inner_Fs = 48000;
+                        move32();
+                        Copy( hBWE_FD->old_fdbwe_speech_fx, new_swb_speech, L_FRAME48k );
+                    }
+                    ELSE
+                    {
+                        inner_frame = L_FRAME32k;
+                        move16();
+                        inner_Fs = 32000;
+                        move32();
+
+                        IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
+                        {
+                            decimate_2_over_3_allpass_fx( hBWE_FD->old_fdbwe_speech_fx, L_FRAME48k, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
+                        }
+                        ELSE
+                        {
+                            lerp( hBWE_FD->old_fdbwe_speech_fx, new_swb_speech, inner_frame, L_FRAME48k );
+                        }
+
+                        test();
+                        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) && st->idchan == 0 )
+                        {
+                            FOR( i = 0; i < STEREO_DFT_OVL_32k; i++ )
+                            {
+                                hCPE->hStereoDft->output_mem_dmx_32k_fx[i] = L_shr( Mpy_32_16_1( hCPE->hStereoDft->win_32k_fx[STEREO_DFT_OVL_32k - 1 - i], new_swb_speech[( ( inner_frame + i ) - STEREO_DFT_OVL_32k )] ), 1 ); // Q15
+                                move32();
+                            }
+                        }
+                    }
+
+                    Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS );
+                    move16();
+                    test();
+                    IF( st->element_mode > EVS_MONO && EQ_16( st->L_frame, L_FRAME16k ) )
+                    {
+                        Sample_Delay_SWB_BWE = NS2SA_FX2( inner_Fs, DELAY_FD_BWE_ENC_16k_NS + DELAY_FIR_RESAMPL_NS );
+                        move16();
+                    }
+                    IF( st->element_mode > EVS_MONO )
+                    {
+                        Sample_Delay_SWB_BWE = sub( Sample_Delay_SWB_BWE, NS2SA_FX2( inner_Fs, DELAY_FIR_RESAMPL_NS ) );
+                    }
+
+                    Copy( new_swb_speech, &old_input_fx[Sample_Delay_SWB_BWE], inner_frame );
+                    set16_fx( old_input_fx, 0, Sample_Delay_SWB_BWE );
+                    Copy( new_swb_speech + inner_frame - Sample_Delay_SWB_BWE, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE );
+                    Copy( old_input_fx, hBWE_FD->L_old_wtda_swb_fx, inner_frame );
+                    st->Q_old_wtda = st->q_inp;
+                    move16();
+                }
+
+                /* resample 48 kHz to 32kHz */
+                IF( EQ_16( st->bwidth, FB ) )
+                {
+                    Copy( st->input_fx, new_swb_speech, L_FRAME48k );
+                }
+                ELSE
+                {
+                    IF( EQ_16( st->element_mode, IVAS_CPE_TD ) )
+                    {
+                        Word16 dec_2_over_3_mem_tmp[L_FILT_2OVER3], dec_2_over_3_mem_lp_tmp[L_FILT_2OVER3_LP];
+
+                        decimate_2_over_3_allpass_fx( st->input_fx, L_FRAME48k - hCPE->hStereoTCA->lMemRecalc, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
+
+                        Copy( hBWE_TD->dec_2_over_3_mem_fx, dec_2_over_3_mem_tmp, L_FILT_2OVER3 );
+                        Copy( hBWE_TD->dec_2_over_3_mem_lp_fx, dec_2_over_3_mem_lp_tmp, L_FILT_2OVER3_LP );
+
+                        decimate_2_over_3_allpass_fx( st->input_fx + L_FRAME48k - hCPE->hStereoTCA->lMemRecalc, hCPE->hStereoTCA->lMemRecalc, new_swb_speech + L_FRAME32k - lMemRecalc32k, dec_2_over_3_mem_tmp, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, dec_2_over_3_mem_lp_tmp );
+                    }
+                    ELSE IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
+                    {
+                        decimate_2_over_3_allpass_fx( st->input_fx, L_FRAME48k, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
+                    }
+                    ELSE /* IVAS_CPE_DFT */
+                    {
+                        Word16 out_start_ind, out_end_ind;
+                        stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, new_swb_speech_fx, &out_start_ind, &out_end_ind, st->idchan, input_Fs, 32000, 0, NULL );
+                        Copy_Scale_sig32_16( new_swb_speech_fx - STEREO_DFT_OVL_MAX, new_swb_speech - STEREO_DFT_OVL_MAX, L_FRAME48k + STEREO_DFT_OVL_MAX, add( st->q_inp, add( q_reImBuffer, 1 ) ) ); // st->q_inp
+
+                        Copy( new_swb_speech - Sample_Delay_SWB_BWE32k, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE32k ); // st->q_inp
+                    }
+                }
+            }
+        }
+        ELSE
+        {
+            /* resample 48 kHz to 32kHz */
+            IF( EQ_16( st->bwidth, FB ) )
+            {
+                Copy( st->input_fx, new_swb_speech, L_FRAME48k );
+            }
+            ELSE
+            {
+                decimate_2_over_3_allpass_fx( st->input_fx, L_FRAME48k, new_swb_speech, hBWE_TD->dec_2_over_3_mem_fx, allpass_poles_3_ov_2, decimate_3_ov_2_lowpass_num_fx, decimate_3_ov_2_lowpass_den_fx, hBWE_TD->dec_2_over_3_mem_lp_fx );
+            }
+        }
+    }
+
+    test();
+    test();
+    test();
+    test();
+    test();
+    test();
+    IF( ( ( st->core == ACELP_CORE ) && NE_16( st->extl, SWB_BWE_HIGHRATE ) && NE_16( st->extl, FB_BWE_HIGHRATE ) ) ||
+        ( ( EQ_32( st->total_brate, ACELP_9k60 ) || st->rf_mode ) && EQ_16( st->bwidth, SWB ) && ( st->element_mode == EVS_MONO ) ) )
+    {
+        Word32 CldfbHB_fx = 0;   // fixed counterpart
+        Word16 CldfbHB_fx_e = 0; // fixed counterpart
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+        Flag Overflow = 0;
+        move16();
+#endif
+        Word16 realQ_neg1, imagQ_neg1, exp = 0, Cldfbtemp1;
+        move32();
+        move16();
+        move16();
+
+        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
+        {
+            Word16 out_start_ind, out_end_ind;
+            Word16 exp_icbweRefEner_fx;
+            Copy_Scale_sig_16_32_DEPREC( (const Word16 *) &old_input_fx[0], &old_input_fx_32[0], NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k, Q15 ); // Q15
+            CldfbHB_fx = stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, old_input_fx_32 + STEREO_DFT_OVL_16k, &out_start_ind, &out_end_ind, st->idchan, input_Fs, 16000, st->L_frame, &CldfbHB_fx_e );
+            Copy_Scale_sig_32_16( (const Word32 *) &old_input_fx_32[0], &old_input_fx[0], NS2SA( 48000, DELAY_FD_BWE_ENC_NS + DELAY_FIR_RESAMPL_NS ) + L_FRAME48k, -Q15 ); // Q0
+
+            /* delay corresponding to CLDFB delay */
+            Copy( old_input_fx + STEREO_DFT_OVL_16k - 20, shb_speech, L_FRAME16k );
+            Copy( old_input_fx, hBWE_TD->old_speech_shb_fx + L_LOOK_16k + L_SUBFR16k - ( STEREO_DFT_OVL_16k - 20 ), STEREO_DFT_OVL_16k - 20 );
+            Copy( old_input_fx, hCPE->hStereoICBWE->mem_shb_speech_ref_fx, STEREO_DFT_OVL_16k - 20 ); // Q0
+            hCPE->hStereoICBWE->mem_shb_speech_ref_e = 15;
+            move16();
+
+            IF( LE_32( CldfbHB_fx, 0 ) )
+            {
+                CldfbHB_fx = EPSILON_FX;
+                move32();
+            }
+            CldfbHB_fx = L_shl( CldfbHB_fx, exp );   /* CldfbHB_ener = CldfbHB_fl*2^(exp) */
+            Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
+            Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );
+            CldfbHB_fx = L_mult( Cldfbtemp1, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
+            CldfbHB_fx = Mpy_32_16_1( L_sub( CldfbHB_fx, 1 << Q25 ), 11611 /* 0.1 * 0.221462 in Q19 */ );
+            /* Resulting Q = Q25 + Q19 - Q15 = Q29 */
+            hBWE_TD->cldfbHBLT = mac_r( CldfbHB_fx, 29491 /*0.9 Q15*/, hBWE_TD->cldfbHBLT ); /* cldfbHBLT is in Q13 */
+            move16();
+
+            exp_lbEner = hCPE->hStereoDft->lbEner_fx_e;
+            move32();
+            lbEner = Mpy_32_16_1( Sqrt32( hCPE->hStereoDft->lbEner_fx, &exp_lbEner ), 1638 /* 0.05 in Q15 */ );
+            exp_icbweRefEner_fx = hCPE->hStereoDft->icbweRefEner_fx_e;
+            move16();
+            hCPE->hStereoICBWE->icbweRefEner_fx = Mpy_32_16_1( Sqrt32( hCPE->hStereoDft->icbweRefEner_fx, &exp_icbweRefEner_fx ), 1638 /* 0.05 in Q15 */ );
+            move32();
+            hCPE->hStereoICBWE->icbweRefEner_fx_e = exp_icbweRefEner_fx;
+            move16();
+            // lbEner = 0.05f * (float) sqrt( hCPE->hStereoDft->lbEner );
+            thr = icbwe_thr_DFT_fx;
+            regV = icbwe_regressionValuesDFT_fx;
+        }
+        ELSE
+        {
+            IF( EQ_16( st->L_frame, L_FRAME ) )
+            {
+                startB = 34;
+                move16();
+                endB = 14;
+                move16();
+                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
+                {
+                    uB = 0;
+                    move16();
+                    FOR( nB = startB; nB > endB; nB-- )
+                    {
+                        realBufferFlipped[ts][uB] = realBuffer[ts][nB];
+                        move32();
+                        if ( s_and( ts, 1 ) != 0 )
+                        {
+                            realBufferFlipped[ts][uB] = L_negate( realBufferFlipped[ts][uB] );
+                            move32();
+                        }
+                        imagBufferFlipped[ts][uB] = imagBuffer[ts][nB];
+                        move32();
+                        if ( s_and( ts, 1 ) == 0 )
+                        {
+                            imagBufferFlipped[ts][uB] = L_negate( imagBufferFlipped[ts][uB] );
+                            move32();
+                        }
+                        uB = add( uB, 1 ); /* uB ++ */
+                    }
+                }
+            }
+            ELSE
+            {
+                startB = 39;
+                move16();
+                endB = 19;
+                move16();
+                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
+                {
+                    uB = 0;
+                    move16();
+                    FOR( nB = startB; nB > endB; nB-- )
+                    {
+                        realBufferFlipped[ts][uB] = L_negate( realBuffer[ts][nB] );
+                        move32();
+                        imagBufferFlipped[ts][uB] = imagBuffer[ts][nB];
+                        move32();
+                        uB = add( uB, 1 ); /* uB ++ */
+                    }
+                }
+            }
+
+            FOR( nB = 0; nB < 10; nB++ )
+            {
+                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
+                {
+                    realQ_neg1 = extract_l( L_shr( realBufferFlipped[ts][nB], 16 ) );
+                    imagQ_neg1 = extract_l( L_shr( imagBufferFlipped[ts][nB], 16 ) ); /* Q(-1), headroom needed */
+
+                    CldfbHB_fx = L_mac0_o( CldfbHB_fx, realQ_neg1, realQ_neg1, &Overflow );
+                    CldfbHB_fx = L_mac0_o( CldfbHB_fx, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
+                }
+            }
+            CldfbHB_fx_e = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
+            exp = norm_l( CldfbHB_fx );
+            CldfbHB_fx = L_shl( CldfbHB_fx, exp );   /* CldfbHB_ener = CldfbHB_fl*2^(exp) */
+            Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
+            Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );
+            CldfbHB_fx = L_mult( Cldfbtemp1, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
+            CldfbHB_fx = Mpy_32_16_1( L_sub( CldfbHB_fx, 1 << Q25 ), 11611 /* 0.1 * 0.221462 in Q19 */ );
+            /* Resulting Q = Q25 + Q19 - Q15 = Q29 */
+            hBWE_TD->cldfbHBLT = mac_r( CldfbHB_fx, 29491 /*0.9 Q15*/, hBWE_TD->cldfbHBLT ); /* cldfbHBLT is in Q13 */
+            move32();
+
+            IF( CldfbHB_fx == 0 )
+            {
+                CldfbHB_fx = EPSILLON_FX;
+                move32();
+            }
+
+            test();
+            IF( GE_16( st->element_mode, IVAS_CPE_DFT ) && hCPE->hStereoICBWE != NULL )
+            {
+                Word32 icbweRefEner_fx = EPSILON_FX;
+                Word16 exp_icbweRefEner_fx = 0;
+
+                move32();
+                move16();
+                FOR( nB = 20; nB < 40; nB++ )
+                {
+                    FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
+                    {
+                        realQ_neg1 = extract_l( L_shr( realBuffer[ts][nB], 16 ) );
+                        imagQ_neg1 = extract_l( L_shr( imagBuffer[ts][nB], 16 ) ); /* Q(-1), headroom needed */
+                        icbweRefEner_fx = L_mac0_o( icbweRefEner_fx, realQ_neg1, realQ_neg1, &Overflow );
+                        icbweRefEner_fx = L_mac0_o( icbweRefEner_fx, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
+                    }
+                }
+                exp_icbweRefEner_fx = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
+                hCPE->hStereoICBWE->icbweRefEner_fx = Mpy_32_16_1( Sqrt32( icbweRefEner_fx, &exp_icbweRefEner_fx ), 1638 /* 0.05 in Q15 */ );
+                move32();
+                hCPE->hStereoICBWE->icbweRefEner_fx_e = exp_icbweRefEner_fx;
+                move16();
+            }
+
+            lbEner = EPSILON_FX;
+            move32();
+            FOR( nB = 0; nB < 20; nB++ )
+            {
+                FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
+                {
+                    realQ_neg1 = extract_l( L_shr( realBuffer[ts][nB], 16 ) );
+                    imagQ_neg1 = extract_l( L_shr( imagBuffer[ts][nB], 16 ) ); /* Q(-1), headroom needed */
+
+                    lbEner = L_mac0_o( lbEner, realQ_neg1, realQ_neg1, &Overflow );
+                    lbEner = L_mac0_o( lbEner, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
+                }
+            }
+            exp_lbEner = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
+            lbEner = Mpy_32_16_1( Sqrt32( lbEner, &exp_lbEner ), 1638 /* 0.05 in Q15 */ );
+            thr = icbwe_thr_TDM_fx;
+            regV = icbwe_regressionValuesTDM_fx;
+
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            cldfbSynthesis_ivas_fx( realBufferFlipped, imagBufferFlipped, shb_speech_fx_32, -1, 0, 0, st->cldfbSynTd );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+            cldfbSynthesis_ivas_fx( realBufferFlipped, imagBufferFlipped, shb_speech_fx_32, -1, 0, st->cldfbSynTd );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
+            Copy_Scale_sig_32_16( shb_speech_fx_32, shb_speech, L_FRAME16k, negate( sub( q_reImBuffer, 1 ) ) );
+            *Q_shb_spch = 0;
+            move16();
+        }
+
+        IF( GE_16( st->element_mode, IVAS_CPE_DFT ) && hCPE->hStereoICBWE != NULL )
+        {
+            Word16 exp_t;
+            hCPE->hStereoICBWE->MSFlag = 0; /* Init the multi-source flag */
+            move16();
+            v = Mpy_32_16_1( L_add( L_deposit_l( st->voicing_fx[0] ), L_add( L_deposit_l( st->voicing_fx[1] ), L_deposit_l( st->voicing_fx[2] ) ) ), 10923 /* 0.33333 in Q15 */ );
+
+            // t = log10f( ( hCPE->hStereoICBWE->icbweRefEner + 1e-6f ) / ( lbEner + 1e-6f ) );
+            t = L_deposit_h( BASOP_Util_Divide3232_Scale( L_add( hCPE->hStereoICBWE->icbweRefEner_fx, EPSILON_FX ), L_add( lbEner, EPSILON_FX ), &exp_t ) );
+            exp_t = add( exp_t, sub( hCPE->hStereoICBWE->icbweRefEner_fx_e, exp_lbEner ) );
+            exp = norm_l( t );
+            t = L_shl( t, exp );
+            t_16 = Log2_norm_lc( t ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
+            t_16 = sub( shr( t_16, 6 ), shl( add( sub( Q31 - Q30, exp_t ), exp ), 9 ) );
+            t = L_mult( t_16, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
+            /* Three Level Decision Tree to calculate a regression value first */
+            IF( LT_32( t, thr[0] ) ) /* level 1 */
+            {
+                IF( LT_32( t, thr[1] ) ) /* level 2 */
+                {
+                    IF( LT_32( v, thr[3] ) )
+                    {
+                        regression = regV[0]; /* level 3 */
+                        move32();
+                    }
+                    ELSE
+                    {
+                        regression = regV[1];
+                        move32();
+                    }
+                }
+                ELSE
+                {
+                    IF( LT_32( v, thr[4] ) )
+                    {
+                        regression = regV[2]; /* level 3 */
+                        move32();
+                    }
+                    ELSE
+                    {
+                        regression = regV[3];
+                        move32();
+                    }
+                }
+            }
+            ELSE
+            {
+                IF( LT_32( t, thr[2] ) ) /* level 2 */
+                {
+                    IF( LT_32( v, thr[5] ) )
+                    {
+                        regression = regV[4]; /* level 3 */
+                        move32();
+                    }
+                    ELSE
+                    {
+                        regression = regV[5];
+                        move32();
+                    }
+                }
+                ELSE
+                {
+                    IF( LT_32( v, thr[6] ) )
+                    {
+                        regression = regV[6]; /* level 3 */
+                        move32();
+                    }
+                    ELSE
+                    {
+                        regression = regV[7];
+                        move32();
+                    }
+                }
+            }
+
+            test();
+            test();
+            /* Convert the regression to a hard decision (classification) */
+            IF( GT_32( regression, 1696512081 /* 0.79f in Q31*/ ) && !( LT_16( st->bwidth, SWB ) || hCPE->hCoreCoder[0]->vad_flag == 0 ) )
+            {
+                hCPE->hStereoICBWE->MSFlag = 1;
+                move16();
+            }
+        }
+
+        test();
+        test();
+        IF( NE_16( st->extl, WB_TBE ) && NE_16( st->extl, SWB_TBE ) && NE_16( st->extl, FB_TBE ) )
+        {
+            /* Update the previous superwideband speech buffer in case of a SWB_BWE frame - this code is in swb_tbe_enc */
+            delay = L_LOOK_16k + L_SUBFR16k;
+            move16();
+            Copy( shb_speech + sub( L_FRAME16k, delay ), hBWE_TD->old_speech_shb_fx, delay );
+        }
+    }
+    ELSE
+    {
+        test();
+        test();
+        IF( ( EQ_16( st->bwidth, FB ) || st->core == ACELP_CORE ) && ( st->element_mode == EVS_MONO ) )
+        {
+            InitSWBencBufferStates_fx( st->hBWE_TD, shb_speech );
+        }
+        ELSE
+        {
+            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
+            {
+                IF( EQ_16( st->L_frame, L_FRAME ) )
+                {
+                    L_resamp = 560; /* 6.4 kHz core -> 6 - 14 kHz SHB target. 20 ms is 560 samples in 28 kHz sample rate */
+                    move16();
+                }
+                ELSE
+                {
+                    L_resamp = 620; /* 8 kHz core -> 7.5 - 15.5 kHz SHB target. 20 ms is 620 samples in 31 kHz sample rate */
+                    move16();
+                }
+
+                /* Dirty downsampling to match Nyquist to upper frequency limit of target */
+                lerp( st->input_fx, new_swb_speech, L_resamp, extract_l( Mpy_32_32( input_Fs, one_by_50_Q31 ) ) );
+
+                /* flip the spectrum */
+                Copy( new_swb_speech, spchTmp, L_resamp );
+                FOR( i = 0; i < L_resamp; i = i + 2 )
+                {
+                    spchTmp[i] = negate( spchTmp[i] );
+                    move16();
+                }
+
+                /* Dirty upsampling to match Nyquist/2 to lower frequency limit of target (reversed spectrum)*/
+                lerp( spchTmp, spchTmp2, L_FRAME32k, L_resamp );
+                Copy( spchTmp2, spchTmp, L_FRAME32k );
+            }
+            ELSE
+            {
+                /* flip the spectrum */
+                Copy( new_swb_speech, spchTmp, L_FRAME32k );
+
+                FOR( i = 0; i < L_FRAME32k; i = i + 2 )
+                {
+                    spchTmp[i] = negate( spchTmp[i] );
+                    move16();
+                }
+            }
+
+            Decimate_allpass_steep_fx( spchTmp, hBWE_TD->state_ana_filt_shb_fx, L_FRAME32k, shb_speech );
+
+            Copy( shb_speech + L_FRAME16k - ( L_LOOK_16k + L_SUBFR16k ), hBWE_TD->old_speech_shb_fx, L_LOOK_16k + L_SUBFR16k );
+
+            /*Compute the past overlap for potential next iDFTs SHB*/
+            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
+            {
+                FOR( i = 0; i < STEREO_DFT_OVL_16k; i++ )
+                {
+                    hCPE->hStereoDft->output_mem_dmx_16k_shb_fx[i] = L_mult0( shb_speech[20 + i], mult_r( hCPE->hStereoDft->win_ana_16k_fx[STEREO_DFT_OVL_16k - 1 - i], hCPE->hStereoDft->win_ana_16k_fx[STEREO_DFT_OVL_16k - 1 - i] ) ); // Q15
+                    move32();
+                }
+            }
+        }
+
+        IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )
+        {
+            /* Reset CLDFB synthesis buffer */
+            set32_fx( st->cldfbSynTd->cldfb_state_fx, 0, st->cldfbSynTd->p_filter_length );
+        }
+        ELSE
+        {
+            hCPE->hStereoDft->flip_sign = negate( hCPE->hStereoDft->flip_sign ); /* Make sure sign is updated even if DFT SHB target is not generated */
+            move16();
+        }
+    }
+
+    /* Memory reset to compensate for 0.9375 ms offset when transitioning from IO to SWB */
+    /* When switching from n >1 to n = 1, we keep the enc/dec delay as 8.75/3.25 and below code not needed;
+       only when n = 1 start, it will be 9.6875/2.3125 in that case this reset is needed for IO->BWE.*/
+    test();
+    IF( EQ_16( st->last_extl, -1 ) && ( st->element_mode == EVS_MONO ) )
+    {
+        delay = NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS );
+        move16();
+        FOR( i = 0; i < delay; i++ )
+        {
+            shb_speech[i] = mult_r( mult_r( i, 983 /*0.03f Q15*/ ), shb_speech[2 * delay - 1 - i] );
+            move16();
         }
     }
 
diff --git a/lib_enc/swb_tbe_enc.c b/lib_enc/swb_tbe_enc.c
deleted file mode 100644
index 018ac1f0e8199d87bc99f56c9a6f04c514463a29..0000000000000000000000000000000000000000
--- a/lib_enc/swb_tbe_enc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "rom_com.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c
index 3dfb552e6024ad70002462a4a96c5f4f2bc9726d..903f3a46c7f62292b1922a6ff7c7a51398098549 100644
--- a/lib_enc/swb_tbe_enc_fx.c
+++ b/lib_enc/swb_tbe_enc_fx.c
@@ -6,13 +6,10 @@
 #include <stdlib.h>
 #include "options.h"
 #include "cnst.h"
-//#include "prot_fx.h"
 #include "rom_com_fx.h"
 #include "rom_com.h"
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
-#include "ivas_prot.h"   /* Function prototypes                    */
 #include "stl.h"
 #include "ivas_prot_fx.h"
 
@@ -24,7 +21,6 @@
 #define ENVSHBRES_ACORR_MIN 40 /* minimum lag for calculating autocorrelation function on SHB residual TD envelope */
 #define ENVSHBRES_ACORR_MAX 80 /* maximum lag for calculating autocorrelation function on SHB residual TD envelope */
 
-
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -63,6 +59,16 @@ static void EstimateSHBFrameGain_fx( const Word16 length,
                                      const Word16 *subwin_shb,
                                      const Word16 n_subfr_saturation );
 
+static void EstimateSHBFrameGain_ivas_fx( const Word16 length,
+                                          const Word16 *oriSHB,
+                                          const Word16 Q_oriSHB,
+                                          const Word16 *synSHB,
+                                          const Word16 Q_synSHB,
+                                          Word16 *subgain,
+                                          Word32 *GainFrame,
+                                          const Word16 *win_shb,
+                                          const Word16 *subwin_shb,
+                                          const Word16 n_subfr_saturation );
 
 static void EstimateSHBGainShape_fx( const Word16 length,
                                      const Word16 *oriSHB,
@@ -132,8 +138,11 @@ void find_max_mem_enc(
     Word16 i;
     Word16 n_mem_32;
     Word16 max = 0;
+    move16();
     Word32 Lmax = 0;
+    move32();
     Word16 tempQ15, max2 = 0;
+    move16();
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
 
     /* old BWE exc max */
@@ -175,9 +184,13 @@ void find_max_mem_enc(
 
     /* for total_brate > 16.4kbps, use n_mem2; else account for the max2 for n_mem calculation */
     *n_mem2 = norm_s( max2 );
+    move16();
     if ( max2 == 0 )
+    {
         *n_mem2 = 15;
-    if ( LT_32( st_fx->total_brate, ACELP_24k40 ) )
+        move16();
+    }
+    IF( LT_32( st_fx->total_brate, ACELP_24k40 ) )
     {
         max = s_max( max, max2 );
     }
@@ -202,9 +215,11 @@ void find_max_mem_enc(
     }
     /* estimate the norm for 16-bit memories  */
     *n_mem = norm_s( max );
+    move16();
     if ( max == 0 )
     {
         *n_mem = 15;
+        move16();
     }
 
     /* estimate the norm for 32-bit memories */
@@ -214,10 +229,12 @@ void find_max_mem_enc(
     if ( Lmax == 0 )
     {
         n_mem_32 = 31;
+        move16();
     }
 
     tempQ15 = sub( s_min( *n_mem, n_mem_32 ), 1 );
     *n_mem = s_max( tempQ15, 0 );
+    move16();
 }
 
 
@@ -533,7 +550,7 @@ void InitSWBencBuffer_ivas_fx(
 
     FOR( i = 0; i < LPC_SHB_ORDER; i++ )
     {
-        hBWE_TD->prev_lsp_shb_fx[i] = lsp_shb_prev_tbl_fx[i];
+        hBWE_TD->prev_lsp_shb_fx[i] = lsp_shb_prev_tbl_swb_tbe_enc_fx[i];
         move16();
     }
 
@@ -587,9 +604,9 @@ void InitSWBencBuffer_ivas_fx(
 
 
     // TV2TV IVAS_CODE -> To be verify if it has to be moved to hBWE_TD
-    st_fx->prev_Q_bwe_exc = 31;
+    st_fx->prev_Q_bwe_exc = 15;
     move16();
-    st_fx->prev_Q_bwe_syn = 31;
+    st_fx->prev_Q_bwe_syn = 15;
     move16();
     set16_fx( st_fx->prev_lsp_wb_fx, 0, 6 );
     set16_fx( st_fx->prev_lsp_wb_temp_fx, 0, 6 );
@@ -696,6 +713,8 @@ void wb_tbe_enc_fx(
     Word16 lpc_wb[LPC_SHB_ORDER_WB + 1];
     Word32 lpc_wb_32_fx[LPC_SHB_ORDER_WB + 1];
     Word16 lsp_wb[LPC_SHB_ORDER_WB], weights_lsp[LPC_SHB_ORDER_WB] = { 32767, 32767 };
+    move16();
+    move16();
     Word16 *hb_new_speech, *hb_frame /*, hb_speech[ L_FRAME16k ]*/;
     Word16 R_h[LPC_SHB_ORDER_WB + 2], R_l[LPC_SHB_ORDER_WB + 2];
     Word16 Q_R;
@@ -710,6 +729,7 @@ void wb_tbe_enc_fx(
     Word32 L_tmp, Lmax;
     Word16 tmp, exp, Q_out, sc;
     Word16 Q_ns = -1;
+    move16();
 
     Word16 pitBufAvg_fx, voicingBufAvg_fx;
     Word16 vf_modified_fx[NB_SUBFR16k];
@@ -720,11 +740,13 @@ void wb_tbe_enc_fx(
     Word16 frac, exp1;
     Word16 uv_flag;
     Word16 dummy = 0;
+    move16();
     Word16 avg_voice_fac;
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
     RF_ENC_HANDLE hRF = st_fx->hRF;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     /*Word16 att = 32767;*/
@@ -742,7 +764,7 @@ void wb_tbe_enc_fx(
     test();
     test();
     test();
-    IF( ( NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, WB_BWE ) ) && ( EQ_16( st_fx->clas, UNVOICED_CLAS ) || ( LT_16( voicing_fx[0], 16384 ) && LT_16( voicing_fx[1], 16384 ) && LT_16( voicing_fx[2], 16384 ) ) ) && st_fx->igf == 0 )
+    IF( ( NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, WB_BWE ) ) && ( st_fx->clas == UNVOICED_CLAS || ( LT_16( voicing_fx[0], 16384 ) && LT_16( voicing_fx[1], 16384 ) && LT_16( voicing_fx[2], 16384 ) ) ) && st_fx->igf == 0 )
     {
         /* In case of unvoiced signals after switching cores, back-propagate the target signal */
         Copy( hb_speech, hb_old_speech, WBTBE_LOOK_LSUFBR_5_OVER_16 );
@@ -844,7 +866,7 @@ void wb_tbe_enc_fx(
         }
         ELSE
         {
-            push_indice_fx( st_fx->hBstr, IND_SHB_LSF, i, NUM_BITS_LBR_WB_LSF );
+            push_indice( st_fx->hBstr, IND_SHB_LSF, i, NUM_BITS_LBR_WB_LSF );
         }
 
         Copy( lbr_wb_bwe_lsfvq_cbook_2bit_fx + i * LPC_SHB_ORDER_LBR_WB, lsp_wb, LPC_SHB_ORDER_LBR_WB );
@@ -906,7 +928,7 @@ void wb_tbe_enc_fx(
         }
         ELSE
         {
-            push_indice_fx( st_fx->hBstr, IND_SHB_LSF, i, NUM_BITS_WB_LSF );
+            push_indice( st_fx->hBstr, IND_SHB_LSF, i, NUM_BITS_WB_LSF );
         }
         Copy( wb_bwe_lsfvq_cbook_8bit_fx + i * LPC_SHB_ORDER_WB, lsp_wb, LPC_SHB_ORDER_WB );
 
@@ -958,6 +980,7 @@ void wb_tbe_enc_fx(
     }
 
     Q_bwe_exc = 31;
+    move16();
     if ( Lmax != 0 )
     {
         Q_bwe_exc = norm_l( Lmax );
@@ -967,7 +990,7 @@ void wb_tbe_enc_fx(
 
     find_max_mem_wb_enc( st_fx, &n_mem );
 
-    if ( GT_16( sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ), n_mem ) )
+    IF( GT_16( sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ), n_mem ) )
     {
         Q_bwe_exc = add( st_fx->prev_Q_bwe_exc, n_mem );
     }
@@ -986,11 +1009,7 @@ void wb_tbe_enc_fx(
     IF( st_fx->element_mode > EVS_MONO )
     {
         tmp = sub( shl( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
         prev_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#else
-        prev_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );     /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#endif
     }
     FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
     {
@@ -1004,6 +1023,7 @@ void wb_tbe_enc_fx(
     FOR( i = 0; i < L_FRAME32k; i++ )
     {
         bwe_exc_extended_16[i + NL_BUFF_OFFSET] = round_fx( L_shl( bwe_exc_extended[i], sc ) );
+        move16();
     }
     Copy( bwe_exc_extended_16 + L_FRAME32k, hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET );
 
@@ -1022,11 +1042,7 @@ void wb_tbe_enc_fx(
     IF( st_fx->element_mode > EVS_MONO )
     {
         tmp = sub( shl( Q_bwe_exc_ext, 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
         curr_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(Q_bwe_exc_ext))*/
-#else
-        curr_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );     /* 2*(Q_bwe_exc_ext) */
-#endif
     }
     FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
     {
@@ -1043,18 +1059,15 @@ void wb_tbe_enc_fx(
 
     FOR( i = 0; i < L_SHB_LAHEAD / 4 - 1; i++ )
     {
-        L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[i] ); /* Q(16-exp+Q_bwe_exc_ext) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[i] );             /* Q(16-exp+Q_bwe_exc_ext) */
         shaped_wb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-#else
-        shaped_wb_excitation[i] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-#endif
+        move16();
     }
 
     Lscale = root_a_fx( Lscale, 31 - exp, &exp );
     L_tmp = Mult_32_16( Lscale, shaped_wb_excitation[L_SHB_LAHEAD / 4 - 1] );     /* Q(16-exp+Q_bwe_exc_ext) */
     shaped_wb_excitation[L_SHB_LAHEAD / 4 - 1] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-
+    move16();
     /* Update WB excitation */
     Copy( shaped_wb_excitation + L_FRAME16k / 4, hBWE_TD->state_syn_shbexc_fx, L_SHB_LAHEAD / 4 );
 
@@ -1149,7 +1162,7 @@ void wb_tbe_enc_fx(
     }
     ELSE
     {
-        push_indice_fx( st_fx->hBstr, IND_UV_FLAG, uv_flag, 1 );
+        push_indice( st_fx->hBstr, IND_UV_FLAG, uv_flag, 1 );
 
         /* Quantization of the subframe gain parameter */
         QuantizeSHBsubgains_fx( st_fx, GainShape, st_fx->extl );
@@ -1193,18 +1206,14 @@ void wb_tbe_enc_fx(
         exp = norm_s( voicingBufAvg_fx );
         tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
         L_tmp = L_mult( pitBufAvg_fx, tmp );                       /* (21-exp) */
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( L_tmp, add( exp, 10 ), &Overflow );
         tmp = round_fx_o( L_tmp, &Overflow ); /* Q15 */
-#else                                         /* BASOP_NOGLOB */
-        L_tmp = L_shl( L_tmp, add( exp, 10 ) );
-        tmp = round_fx( L_tmp );                                   /* Q15 */
-#endif
     }
 
     tmp = s_max( s_min( tmp, 32767 ), 22938 ); /* Q15 */
     GainFrame = Mult_32_16( GainFrame, tmp );  /* Q18 */
 
+    test();
     IF( LT_16( lsp_spacing_fx, 328 ) && lsp_spacing_fx )
     {
         GainFrame = Mult_32_16( GainFrame, 21299 ); /* Q18 */
@@ -1243,6 +1252,7 @@ void wb_tbe_enc_fx(
 
     /* Adjust the subframe and frame gain of the synthesized SHB signal */
     /* Scale the shaped excitation*/
+
     ScaleShapedSHB_fx( SHB_OVERLAP_LEN / 2, shaped_wb_excitation, hBWE_TD->syn_overlap_fx, GainShape, GainFrame, window_wb_fx, subwin_wb_fx,
                        &Q_bwe_exc_ext, &dummy, dummy, dummy );
 
@@ -1298,19 +1308,19 @@ void wb_tbe_enc_ivas_fx(
     Word16 lpc_wb[LPC_SHB_ORDER_WB + 1];
     Word32 lpc_wb_32_fx[LPC_SHB_ORDER_WB + 1];
     Word16 lsp_wb[LPC_SHB_ORDER_WB], weights_lsp[LPC_SHB_ORDER_WB] = { 32767, 32767 };
+    move16();
+    move16();
     Word16 *hb_new_speech, *hb_frame /*, hb_speech[ L_FRAME16k ]*/;
     Word16 R_h[LPC_SHB_ORDER_WB + 2], R_l[LPC_SHB_ORDER_WB + 2];
     Word16 Q_R;
     Word32 LepsP[LPC_SHB_ORDER_WB + 1];
-    move16();
-    move16();
 
     Word32 prev_pow, curr_pow, Lscale;
     /* Word16 scale; */
     /*Word16 ramp_flag;*/
     Word32 p2m_in, p2m_out;
     /*Word16 cnt, max =0;*/
-    Word16 n_mem, Q_bwe_exc, Q_bwe_exc_ext, exp_out, Q_pow; /* Q_hb_frame; */
+    Word16 n_mem, Q_bwe_exc, Q_bwe_exc_ext, exp_out, Q_cur_pow, Q_prev_pow; /* Q_hb_frame; */
     Word32 L_tmp, Lmax;
     Word16 tmp, exp, Q_out, sc;
     Word16 Q_ns = -1;
@@ -1329,12 +1339,12 @@ void wb_tbe_enc_ivas_fx(
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
+    move16();
 #endif
     move16();
 
     /*Word16 att = 32767;*/
-
+    set16_fx( bwe_exc_extended_16, 0, L_FRAME32k + NL_BUFF_OFFSET );
     hb_new_speech = hb_old_speech + WBTBE_LOOK_LSUFBR_5_OVER_16;
     hb_frame = hb_old_speech + WBTBE_LSUBFR_5_OVER_16 + WBTBE_ANA_ALIGNDELAY;
 
@@ -1348,7 +1358,7 @@ void wb_tbe_enc_ivas_fx(
     test();
     test();
     test();
-    IF( ( NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, WB_BWE ) ) && ( EQ_16( st_fx->clas, UNVOICED_CLAS ) || ( LT_16( st_fx->voicing_fx[0], 16384 ) && LT_16( st_fx->voicing_fx[1], 16384 ) && LT_16( st_fx->voicing_fx[2], 16384 ) ) ) && !st_fx->igf )
+    IF( ( NE_16( st_fx->last_extl, WB_TBE ) && NE_16( st_fx->last_extl, WB_BWE ) ) && ( st_fx->clas == UNVOICED_CLAS || ( LT_16( st_fx->voicing_fx[0], 16384 ) && LT_16( st_fx->voicing_fx[1], 16384 ) && LT_16( st_fx->voicing_fx[2], 16384 ) ) ) && !st_fx->igf )
     {
         /* In case of unvoiced signals after switching cores, back-propagate the target signal */
         Copy( hb_speech, hb_old_speech, WBTBE_LOOK_LSUFBR_5_OVER_16 );
@@ -1363,25 +1373,25 @@ void wb_tbe_enc_ivas_fx(
             L_tmp = L_mult( hb_old_speech[i], ola_win_shb_switch_fold_fx[j] );
             hb_old_speech[i] = mac_ro( L_tmp, hb_speech[k], ola_win_shb_switch_fold_fx[L_SUBFR16k - 4 - j], &Overflow );
             move16();
-            i = sub( i, 1 );
-            k = add( k, 1 );
+            i--;
+            k++;
         }
     }
 
-    autocorr_fx( hb_old_speech, LPC_SHB_ORDER_WB + 1, R_h, R_l, &Q_R, ( ( NS2SA( INT_FS_12k8, 5000000L ) + L_SUBFR + L_FRAME ) * 5 / 16 ), win_lpc_hb_wb_fx, 0, 1 );
+    autocorr_fx( hb_old_speech, LPC_SHB_ORDER_WB + 1, R_h, R_l, &Q_R, ( ( NS2SA( INT_FS_12k8, 5000000L ) + L_SUBFR + L_FRAME ) * 5 / 16 ), win_lpc_hb_wb_ivas_fx, 0, 1 );
 
-    E_LPC_lev_dur( R_h, R_l, lpc_wb_temp_fx, LepsP, LPC_SHB_ORDER_WB, NULL );
+    E_LPC_lev_dur( R_h, R_l, lpc_wb_temp_fx, LepsP, LPC_SHB_ORDER_WB, NULL ); // Since 0th index will be 1 in floating point buffer, in fixed point one has to take norm of 0th index to identify the Q-factor
 
-    Copy_Scale_sig( lpc_wb_temp_fx, lpc_wb_temp_fx, LPC_SHB_ORDER_WB + 1, sub( norm_s( lpc_wb_temp_fx[0] ), 2 ) );
+    Copy_Scale_sig( lpc_wb_temp_fx, lpc_wb_temp_fx, LPC_SHB_ORDER_WB + 1, sub( norm_s( lpc_wb_temp_fx[0] ), 2 ) ); // Q12
 
     /* convert into lsps and calculate weights */
     FOR( i = 0; i <= LPC_SHB_ORDER_WB; i++ )
     {
-        lpc_wb_32_fx[i] = L_negate( L_shr( L_deposit_h( lpc_wb_temp_fx[i] ), 1 ) );
+        lpc_wb_32_fx[i] = L_negate( L_deposit_h( shr( lpc_wb_temp_fx[i], 1 ) ) ); // Q27
         move32();
     }
 
-    lpc2lsp_fx( &lpc_wb_32_fx[1], lsp_wb_temp_fx, st_fx->prev_lsp_wb_temp_fx, LPC_SHB_ORDER_WB );
+    lpc2lsp_ivas_fx( &lpc_wb_32_fx[1], lsp_wb_temp_fx, st_fx->prev_lsp_wb_temp_fx, LPC_SHB_ORDER_WB );
 
     FOR( i = 0; i < LPC_SHB_ORDER_WB; i++ )
     {
@@ -1570,7 +1580,7 @@ void wb_tbe_enc_ivas_fx(
 
     find_max_mem_wb_enc( st_fx, &n_mem );
 
-    if ( GT_16( sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ), n_mem ) )
+    IF( GT_16( sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ), n_mem ) )
     {
         Q_bwe_exc = add( st_fx->prev_Q_bwe_exc, n_mem );
     }
@@ -1586,77 +1596,92 @@ void wb_tbe_enc_ivas_fx(
 
     prev_pow = 0;
     move32();
+    Q_prev_pow = norm_arr( hBWE_TD->state_syn_shbexc_fx, L_SHB_LAHEAD / 4 );
+    /* Compare with the guard bits needed in the subsequent operations.
+     * Guard bits for L_SHB_LAHEAD / 4 (expression evaluates to 5) is 3.
+     */
+    IF( LT_16( Q_prev_pow, 3 ) )
+    {
+        FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
+        {
+            shaped_wb_exc_scale[i] = shr( hBWE_TD->state_syn_shbexc_fx[i], 3 );
+            move16();
+        }
+        Q_prev_pow = shl_r( sub( sub( st_fx->prev_Q_bwe_exc, 16 ), 3 ), 1 );
+        move16();
+    }
+    ELSE
+    {
+        FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
+        {
+            shaped_wb_exc_scale[i] = hBWE_TD->state_syn_shbexc_fx[i];
+            move16();
+        }
+        Q_prev_pow = shl_r( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 );
+        move16();
+    }
+
     IF( st_fx->element_mode > EVS_MONO )
     {
-        tmp = sub( shl( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), 31 + 16 );
-#ifdef BASOP_NOGLOB
-        prev_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#else
-        prev_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );     /*Q(2*(st_fx->prev_Q_bwe_exc-16))*/
-#endif
+        tmp = sub( Q_prev_pow, 31 + 16 );
+        prev_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q_prev_pow*/
     }
     FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
     {
-        prev_pow = L_mac0( prev_pow, hBWE_TD->state_syn_shbexc_fx[i], hBWE_TD->state_syn_shbexc_fx[i] ); /* Q(2*st_fx->prev_Q_bwe_exc) */
+        prev_pow = L_mac0( prev_pow, shaped_wb_exc_scale[i], shaped_wb_exc_scale[i] ); /* Q_prev_pow */
     }
 
     rescale_genWB_mem_enc( st_fx, sub( Q_bwe_exc, st_fx->prev_Q_bwe_exc ) );
 
-    Copy( hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_16, NL_BUFF_OFFSET );
     sc = sub( Q_bwe_exc, add( Q_new, Q_new ) );
     FOR( i = 0; i < L_FRAME32k; i++ )
     {
         bwe_exc_extended_16[i + NL_BUFF_OFFSET] = round_fx( L_shl( bwe_exc_extended[i], sc ) );
         move16();
     }
-    Copy( bwe_exc_extended_16 + L_FRAME32k, hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET );
 
     Copy( hBWE_TD->state_syn_shbexc_fx, shaped_wb_excitation, L_SHB_LAHEAD / 4 );
     Q_bwe_exc_ext = sub( Q_bwe_exc, 16 );
 
-    GenShapedWBExcitation_fx( shaped_wb_excitation + L_SHB_LAHEAD / 4, lpc_wb, exc4kWhtnd, hBWE_TD->mem_csfilt_fx,
-                              hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx,
-                              hBWE_TD->state_lpc_syn_fx, st_fx->coder_type, bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed,
-                              vf_modified_fx, uv_flag, st_fx->igf );
+    GenShapedWBExcitation_ivas_fx( shaped_wb_excitation + L_SHB_LAHEAD / 4, lpc_wb, exc4kWhtnd, hBWE_TD->mem_csfilt_fx,
+                                   hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx,
+                                   hBWE_TD->state_lpc_syn_fx, st_fx->coder_type, bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed,
+                                   vf_modified_fx, uv_flag, st_fx->igf );
 
     curr_pow = 0;
     move32();
-    Q_pow = norm_arr( &shaped_wb_excitation[L_SHB_LAHEAD / 4], L_SHB_LAHEAD / 4 );
+    Q_cur_pow = norm_arr( &shaped_wb_excitation[L_SHB_LAHEAD / 4], L_SHB_LAHEAD / 4 );
     /* Compare with the guard bits needed in the subsequent operations.
      * Guard bits for L_SHB_LAHEAD / 4 (expression evaluates to 5) is 3.
      */
-    IF( LT_16( Q_pow, 3 ) )
+    IF( LT_16( Q_cur_pow, 3 ) )
     {
         FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
         {
-            shaped_wb_exc_scale[i] = shr( shaped_wb_excitation[i], 3 );
+            shaped_wb_exc_scale[i] = shr( shaped_wb_excitation[i + L_SHB_LAHEAD / 4], 3 );
             move16();
         }
-        Q_pow = shl_r( sub( Q_bwe_exc_ext, 3 ), 1 );
+        Q_cur_pow = shl_r( sub( Q_bwe_exc_ext, 3 ), 1 );
         move16();
     }
     ELSE
     {
         FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
         {
-            shaped_wb_exc_scale[i] = shaped_wb_excitation[i];
+            shaped_wb_exc_scale[i] = shaped_wb_excitation[i + L_SHB_LAHEAD / 4];
             move16();
         }
-        Q_pow = shl_r( Q_bwe_exc_ext, 1 );
+        Q_cur_pow = shl_r( Q_bwe_exc_ext, 1 );
         move16();
     }
     IF( st_fx->element_mode > EVS_MONO )
     {
-        tmp = sub( Q_pow, 31 + 16 );
-#ifdef BASOP_NOGLOB
-        curr_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(Q_pow)*/
-#else
-        curr_pow = L_shl( 1407374848l /*0.00001f Q47*/, tmp );     /* 2*(Q_bwe_exc_ext) */
-#endif
+        tmp = sub( Q_cur_pow, 31 + 16 );
+        curr_pow = L_shl_sat( 1407374848l /*0.00001f Q47*/, tmp ); /*Q(Q_cur_pow)*/
     }
     FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ )
     {
-        curr_pow = L_mac0( curr_pow, shaped_wb_exc_scale[i], shaped_wb_exc_scale[i] ); /* Q(Q_pow) */
+        curr_pow = L_mac0( curr_pow, shaped_wb_exc_scale[i], shaped_wb_exc_scale[i] ); /* Q(Q_cur_pow) */
     }
 
     IF( GT_16( voice_factors[0], 24576 ) )
@@ -1664,22 +1689,18 @@ void wb_tbe_enc_ivas_fx(
         curr_pow = L_shr( curr_pow, 2 ); /* Q(Q_pow) */
     }
 
-    Lscale = root_a_over_b_fx( curr_pow, Q_pow, prev_pow, shl_r( sub( st_fx->prev_Q_bwe_exc, 16 ), 1 ), &exp );
+    Lscale = root_a_over_b_fx( curr_pow, Q_cur_pow, prev_pow, Q_prev_pow, &exp );
 
     FOR( i = 0; i < L_SHB_LAHEAD / 4 - 1; i++ )
     {
-        L_tmp = Mpy_32_16_1( Lscale, shaped_wb_excitation[i] ); /* Q(16-exp+Q_bwe_exc_ext) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mpy_32_16_1( Lscale, shaped_wb_excitation[i] );            /* Q(16-exp+Q_bwe_exc_ext) */
         shaped_wb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-#else
-        shaped_wb_excitation[i] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc_ext */
-#endif
         move16();
     }
 
     Lscale = root_a_fx( Lscale, sub( 31, exp ), &exp );
-    L_tmp = Mpy_32_16_1( Lscale, shaped_wb_excitation[L_SHB_LAHEAD / 4 - 1] );    /* Q(16-exp+Q_bwe_exc_ext) */
-    shaped_wb_excitation[L_SHB_LAHEAD / 4 - 1] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc_ext */
+    L_tmp = Mpy_32_16_1( Lscale, shaped_wb_excitation[L_SHB_LAHEAD / 4 - 1] );            /* Q(16-exp+Q_bwe_exc_ext) */
+    shaped_wb_excitation[L_SHB_LAHEAD / 4 - 1] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc_ext */
     move16();
 
     /* Update WB excitation */
@@ -1760,7 +1781,7 @@ void wb_tbe_enc_ivas_fx(
         move16();
     }
 
-    hBWE_TD->prev_wb_GainShape = GainShape[sub( shr( NUM_SHB_SUBFR, 2 ), 1 )];
+    hBWE_TD->prev_wb_GainShape = GainShape[( NUM_SHB_SUBFR >> 2 ) - 1];
     move16();
 
     /* Compute the power of gains away from the peak gain prior to quantization */
@@ -1800,8 +1821,8 @@ void wb_tbe_enc_ivas_fx(
     }
 
     /* Estimate the gain parameter */
-    EstimateSHBFrameGain_fx( SHB_OVERLAP_LEN / 2, hb_frame, Q_ns, shaped_wb_excitation, Q_bwe_exc_ext, GainShape,
-                             &GainFrame, window_wb_fx, subwin_wb_fx, 0 );
+    EstimateSHBFrameGain_ivas_fx( SHB_OVERLAP_LEN / 2, hb_frame, Q_ns, shaped_wb_excitation, Q_bwe_exc_ext, GainShape,
+                                  &GainFrame, window_wb_fx, subwin_wb_fx, 0 );
 
 
     /* If there's a big difference in the power of gains away from the peak gain */
@@ -1834,13 +1855,8 @@ void wb_tbe_enc_ivas_fx(
         exp = norm_s( voicingBufAvg_fx );
         tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
         L_tmp = L_mult( pitBufAvg_fx, tmp );                       /* (21-exp) */
-#ifdef BASOP_NOGLOB
         L_tmp = L_shl_o( L_tmp, add( exp, 10 ), &Overflow );
         tmp = round_fx_o( L_tmp, &Overflow ); /* Q15 */
-#else                                         /* BASOP_NOGLOB */
-        L_tmp = L_shl( L_tmp, add( exp, 10 ) );
-        tmp = round_fx( L_tmp ); /* Q15 */
-#endif
     }
 
     tmp = s_max( s_min( tmp, 32767 ), 22938 ); /* Q15 */
@@ -1884,9 +1900,14 @@ void wb_tbe_enc_ivas_fx(
 
     /* Adjust the subframe and frame gain of the synthesized SHB signal */
     /* Scale the shaped excitation*/
+
+    scale_sig( shaped_wb_excitation, ( L_FRAME16k + L_SHB_LAHEAD ) / 4, -1 );
+    scale_sig( hBWE_TD->syn_overlap_fx, L_SHB_LAHEAD, -1 );
+    Q_bwe_exc_ext = sub( Q_bwe_exc_ext, 1 );
     ScaleShapedSHB_fx( SHB_OVERLAP_LEN / 2, shaped_wb_excitation, hBWE_TD->syn_overlap_fx, GainShape, GainFrame, window_wb_fx, subwin_wb_fx,
                        &Q_bwe_exc_ext, &dummy, dummy, dummy );
 
+    Scale_sig( hBWE_TD->syn_overlap_fx, L_SHB_LAHEAD, 1 );
     st_fx->prev_Q_bwe_exc = Q_bwe_exc;
     move16();
 
@@ -1971,6 +1992,8 @@ void swb_tbe_enc_fx(
     Word32 LepsP[LPC_SHB_ORDER + 1];
 
     Word16 ana_align_delay[2] = { -L_SHB_LAHEAD - ( NL_BUFF_OFFSET / 2 ), -L_SHB_LAHEAD - ( NL_BUFF_OFFSET / 2 ) };
+    move16();
+    move16();
     Word32 prev_pow_fx, curr_pow_fx, Lscale;
     Word32 p2m_in_fx, p2m_out_fx;
 
@@ -2016,6 +2039,7 @@ void swb_tbe_enc_fx(
     Word16 n_subfr_saturation;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
     RF_ENC_HANDLE hRF = st_fx->hRF;
@@ -2091,6 +2115,7 @@ void swb_tbe_enc_fx(
         FOR( i = 1; i <= LPC_SHB_ORDER; i++ )
         {
             lpc_shb_fx[i] = mult_r( lpc_shb_fx[i], lpc_weights_fx[i] );
+            move16();
         }
     }
 
@@ -2117,7 +2142,9 @@ void swb_tbe_enc_fx(
         /* to compensate for the 1.1* weighting done inside the function lsp_weights */
         /*weights_lsp[3]*=0.909091f; weights_lsp[4]*=0.909091f; */
         weights_lsp[3] = mult_r( weights_lsp[3], 29789 /*0.909091f Q15*/ );
+        move16();
         weights_lsp[4] = mult_r( weights_lsp[4], 29789 /*0.909091f Q15*/ );
+        move16();
 
         /* 8-bit VQ, 10 dimension */
         i = closest_centroid_fx( lsf_shb_fx, weights_lsp, swb_tbe_lsfvq_cbook_8b, 256, LPC_SHB_ORDER );
@@ -2125,6 +2152,7 @@ void swb_tbe_enc_fx(
 
         set16_fx( hBWE_TD->lsf_idx, 0, NUM_Q_LSF );
         hBWE_TD->lsf_idx[0] = i;
+        move16();
     }
     ELSE
     {
@@ -2187,10 +2215,12 @@ void swb_tbe_enc_fx(
         Copy( lsp_shb_2_fx, lsp_shb_1_fx, LPC_SHB_ORDER );
     }
 
-    lsf_diff[0] = lsf_diff[sub( LPC_SHB_ORDER, 1 )] = 16384; /*Q15*/
+    lsf_diff[0] = lsf_diff[LPC_SHB_ORDER - 1] = 16384; /*Q15*/
+    move16();
     FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
     {
-        lsf_diff[i] = sub( lsf_shb_fx[i], lsf_shb_fx[sub( i, 1 )] );
+        lsf_diff[i] = sub( lsf_shb_fx[i], lsf_shb_fx[i - 1] );
+        move16();
     }
     a2rc_fx( hBWE_TD->cur_sub_Aq_fx + 1, refl, M );
 
@@ -2209,6 +2239,7 @@ void swb_tbe_enc_fx(
         FOR( i = 1; i < LPC_SHB_ORDER - 1; i++ )
         {
             hBWE_TD->prev_lsf_diff_fx[i - 1] = mult( lsf_diff[i], 16384 ); /*Q15*/
+            move16();
         }
     }
 
@@ -2230,6 +2261,7 @@ void swb_tbe_enc_fx(
                     tmp = div_s( tmp, hBWE_TD->prev_lsf_diff_fx[i - 1] );
                     tmp = s_max( tmp, 16384 );
                     w[i] = s_min( tmp, 32767 );
+                    move16();
                 }
                 ELSE
                 {
@@ -2237,16 +2269,20 @@ void swb_tbe_enc_fx(
                     tmp = div_s( tmp, lsf_diff[i] );
                     tmp = s_max( tmp, 16384 );
                     w[i] = s_min( tmp, 32767 );
+                    move16();
                 }
             }
             w[0] = w[1];
-            w[sub( LPC_SHB_ORDER, 1 )] = w[sub( LPC_SHB_ORDER, 2 )];
+            move16();
+            w[LPC_SHB_ORDER - 1] = w[LPC_SHB_ORDER - 2];
+            move16();
 
             FOR( i = 0; i < LPC_SHB_ORDER; i++ )
             {
                 tmp1 = mult( lsp_shb_1_fx[i], sub( 32767, w[i] ) );
                 tmp2 = mult( lsp_shb_2_fx[i], w[i] );
                 lsp_temp_fx[i] = add( tmp1, tmp2 );
+                move16();
             }
         }
         ELSE
@@ -2257,6 +2293,7 @@ void swb_tbe_enc_fx(
 
     Copy( lsf_diff + 1, hBWE_TD->prev_lsf_diff_fx, LPC_SHB_ORDER - 2 );
     hBWE_TD->prev_tilt_para_fx = tilt_para;
+    move16();
 
     shb_ener_sf_Q31 = 0;
     move16();
@@ -2289,11 +2326,7 @@ void swb_tbe_enc_fx(
         FOR( i = L_SHB_LAHEAD; i < L_FRAME16k + L_SHB_LAHEAD; i++ )
         {
             /* shbEner = shbEner + in[i] * in[i] */
-#ifdef BASOP_NOGLOB
             shb_ener_sf_Q31 = L_mac0_sat( shb_ener_sf_Q31, shb_frame_fx[i], shb_frame_fx[i] );
-#else
-            shb_ener_sf_Q31 = L_mac0( shb_ener_sf_Q31, shb_frame_fx[i], shb_frame_fx[i] );
-#endif
             /* o: shb_ener_sf_Q31 in (2*Q_shb)      */
         }
         shb_ener_sf_Q31 = Mult_32_16( shb_ener_sf_Q31, 102 /*0.003125f Q15*/ );
@@ -2313,6 +2346,7 @@ void swb_tbe_enc_fx(
         FOR( i = 0; i < NB_SUBFR16k; i++ )
         {
             shb_res_gshape_fx_32[i] = sum2_fx( shb_res_fx + i * 64, 64 );
+            move32();
         }
         /* o: shb_res_gshape_fx_32  in (2*Q_shb+1) */
 
@@ -2330,14 +2364,17 @@ void swb_tbe_enc_fx(
             exp = norm_l( L_tmp );
             tmp = extract_h( L_shl( L_tmp, exp ) );
             recip = div_s( 16384, tmp );
-            Q_recip = 31 - ( exp - 14 ); /* = 31-(exp+2*Q_shb+1-14), but adjusted by (2*Q_shb+1) for use at Mult_32_16 below */
+            // Q_recip = 31 - ( exp - 14 ); /* = 31-(exp+2*Q_shb+1-14), but adjusted by (2*Q_shb+1) for use at Mult_32_16 below */
+            Q_recip = sub( 31 + 14, exp ); /* = 31-(exp+2*Q_shb+1-14), but adjusted by (2*Q_shb+1) for use at Mult_32_16 below */
+            move16();
         }
 
         FOR( i = 0; i < NB_SUBFR16k; i++ )
         {
             L_tmp1 = Mult_32_16( shb_res_gshape_fx_32[i], recip ); /*Q = Q_recip+1-16*/
-            L_tmp = root_a_fx( L_tmp1, Q_recip + 1 - 16, &exp );
-            shb_res_gshape_fx[i] = round_fx( L_shl( L_tmp, exp - 1 ) ); /* Q14 */
+            L_tmp = root_a_fx( L_tmp1, add( Q_recip, 1 - 16 ), &exp );
+            shb_res_gshape_fx[i] = round_fx( L_shl( L_tmp, sub( exp, 1 ) ) ); /* Q14 */
+            move16();
         }
 
         Quant_shb_res_gshape_fx( st_fx, shb_res_gshape_fx );
@@ -2361,6 +2398,7 @@ void swb_tbe_enc_fx(
     if ( Lmax == 0 )
     {
         Q_bwe_exc = 31;
+        move16();
     }
     Q_bwe_exc = add( Q_bwe_exc, add( Q_new, Q_new ) );
 
@@ -2371,6 +2409,7 @@ void swb_tbe_enc_fx(
     if ( GT_16( Q_bwe_exc, tmp2 ) )
     {
         Q_bwe_exc = tmp2;
+        move16();
     }
 
     /* rescale the memories if Q_bwe_exc is different from previous frame */
@@ -2386,11 +2425,8 @@ void swb_tbe_enc_fx(
 
     FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
     {
-#ifdef BASOP_NOGLOB
         bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx_sat( L_shl_sat( bwe_exc_extended[cnt], sc ) );
-#else
-        bwe_exc_extended_16[cnt + NL_BUFF_OFFSET] = round_fx( L_shl( bwe_exc_extended[cnt], sc ) );
-#endif
+        move16();
     }
     Copy( bwe_exc_extended_16 + L_FRAME32k, hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET );
 
@@ -2422,9 +2458,11 @@ void swb_tbe_enc_fx(
                                &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, st_fx->prev_Q_bwe_syn, st_fx->total_brate, 0 );
 
     *Q_white_exc = Q_bwe_exc_fb;
+    move16();
     IF( EQ_16( st_fx->extl, FB_TBE ) )
     {
         hBWE_TD->prev_Q_bwe_exc_fb = Q_bwe_exc_fb;
+        move16();
     }
     ELSE
     {
@@ -2444,13 +2482,14 @@ void swb_tbe_enc_fx(
         }
         ELSE
         {
-            push_indice_fx( st_fx->hBstr, IND_SHB_VF, vf_ind_fx, NUM_BITS_SHB_VF );
+            push_indice( st_fx->hBstr, IND_SHB_VF, vf_ind_fx, NUM_BITS_SHB_VF );
         }
     }
 
     FOR( i = 0; i < LPC_SHB_ORDER; i++ )
     {
         hBWE_TD->mem_stp_swb_fx[i] = shl( hBWE_TD->mem_stp_swb_fx[i], sub( Q_bwe_exc, st_fx->prev_Q_bwe_syn ) );
+        move16();
     }
 
     FOR( i = 0; i < L_FRAME16k; i += L_SUBFR16k )
@@ -2468,13 +2507,8 @@ void swb_tbe_enc_fx(
     curr_pow_fx = L_shl( 21475l /*0.00001f Q31*/, tmp ); /* 2*(Q_bwe_exc) */
     FOR( i = 0; i < L_SHB_LAHEAD + 10; i++ )
     {
-#ifdef BASOP_NOGLOB
         prev_pow_fx = L_mac0_o( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i], &Overflow );                                         /* 2*Q_bwe_exc */
         curr_pow_fx = L_mac0_o( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], &Overflow ); /* 2*Q_bwe_exc */
-#else
-        prev_pow_fx = L_mac0( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] );                                         /* 2*Q_bwe_exc */
-        curr_pow_fx = L_mac0( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
-#endif
     }
 
     if ( GT_16( voice_factors_fx[0], 24576 /*0.75f Q15*/ ) )
@@ -2490,35 +2524,25 @@ void swb_tbe_enc_fx(
                                &exp );
     FOR( i = 0; i < L_SHB_LAHEAD; i++ )
     {
-        L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q(16-exp+Q_bwe_exc) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );             /* Q(16-exp+Q_bwe_exc) */
         shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
-        shaped_shb_excitation_fx[i] = round_fx( L_shl( L_tmp, exp ) );                                                                         /* Q_bwe_exc */
-#endif
+        move16();
     }
     IF( exp < 0 )
     {
         Lscale = L_shl( Lscale, exp );
         exp = 0;
+        move16();
     }
     FOR( ; i < L_SHB_LAHEAD + 10; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = i_mult_o( sub( i, 19 ), 3277 /*0.1f Q15*/, &Overflow );        /* Q15 */
         L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */
-#else
-        tmp = i_mult( sub( i, 19 ), 3277 /*0.1f Q15*/ );                                                                                       /* Q15 */
-        L_tmp1 = Mult_32_16( L_shl( 1, sub( 31, exp ) ), tmp );                                                                                /* Q31-exp */
-#endif
         tmp = sub( 32767 /*1.0f Q15*/, tmp );
         Lscale = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
-        L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );                               /* Q_bwe_exc + (31-exp) - 15 */
         shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#else
-        shaped_shb_excitation_fx[i] = round_fx( L_shl( L_tmp, exp ) );                                                                         /* Q_bwe_exc */
-#endif
+        move16();
     }
 
     /* Update SHB excitation */
@@ -2539,6 +2563,7 @@ void swb_tbe_enc_fx(
             /* 0.35f +/- delta variation; delta = 0.1*(GS-0.35)*/
             /* GainShape[i] = 0.315f + 0.1f * GainShape[i]; */
             GainShape_fx[i] = mac_r( 676457349l /*0.315 Q31*/, 3277 /*0.1 Q15*/, GainShape_fx[i] );
+            move16();
         }
     }
 
@@ -2627,10 +2652,12 @@ void swb_tbe_enc_fx(
 
     {
         temp_swb_fac = hBWE_TD->prev_swb_GainShape_fx;
+        move16();
         FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
         {
             /*GainShape_fx[i] = (1 - feedback) * GainShape[i] + feedback * temp_swb_fac; */
             GainShape_fx[i] = round_fx( L_mac( L_mult( sub( 32767, feedback ), GainShape_fx[i] ), feedback, temp_swb_fac ) );
+            move16();
             temp_swb_fac = GainShape_fx[i];
             move16();
         }
@@ -2670,6 +2697,7 @@ void swb_tbe_enc_fx(
         GainFrame_fx = L_add( L_shr( hBWE_TD->prev_gainFr_SHB_fx, 1 ), L_shr( GainFrame_fx, 1 ) ); /* Q18 */
     }
 
+    test();
     test();
     IF( EQ_16( frGainAttenuate, 1 ) && LE_16( MA_lsp_shb_spacing, 79 /*0.0024f Q15*/ ) )
     {
@@ -2680,7 +2708,7 @@ void swb_tbe_enc_fx(
         frac = L_Extract_lc( L_tmp, &exp );
         GainFrame_fx = Pow2( 30, frac );
         exp = sub( exp, 30 );
-        GainFrame_fx = L_shl( GainFrame_fx, exp + 18 ); /* Q18 */
+        GainFrame_fx = L_shl( GainFrame_fx, add( exp, 18 ) ); /* Q18 */
     }
     ELSE IF( EQ_16( hBWE_TD->prev_frGainAtten, 1 ) && GT_32( Mult_32_16( GainFrame_fx, 10923 ), hBWE_TD->prev_gainFr_SHB_fx ) )
     {
@@ -2720,9 +2748,11 @@ void swb_tbe_enc_fx(
 
     /* voicingBufAvg = (sum_f(voice_factors, 4)=sum2 > 0.6f) ? 0.333f : 0.1667f; */
     tmp2 = 5462 /*0.1667f Q15*/;
+    move16();
     if ( GT_16( sum2, 4915 /*0.6f Q13*/ ) )
     {
         tmp2 = 10912 /*0.333f Q15*/; /* Q15 */
+        move16();
     }
     voicingBufAvg_fx = shl( mult( tmp2, sum1 ), 2 ); /* Q15 */
 
@@ -2739,13 +2769,9 @@ void swb_tbe_enc_fx(
         tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
 
         /* sd_uq_q*pitBufAvg */
-        L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx ); /* Q13 * Q10 + 1 -16 => Q8 */
-        L_tmp = Mult_32_16( L_tmp, tmp );          /* Q8 + (14 - exp) - 15 => Q7 - exp */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx );                                    /* Q13 * Q10 + 1 -16 => Q8 */
+        L_tmp = Mult_32_16( L_tmp, tmp );                                             /* Q8 + (14 - exp) - 15 => Q7 - exp */
         tmp = round_fx_o( L_shl_o( L_tmp, 31 - ( 7 - exp ), &Overflow ), &Overflow ); /* Q15 */
-#else
-        tmp = round_fx( L_shl( L_tmp, 31 - ( 7 - exp ) ) );                                                                                    /* Q15 */
-#endif
     }
 
     tmp = s_min( tmp, 32767 /*1.0f Q15*/ );
@@ -2770,16 +2796,19 @@ void swb_tbe_enc_fx(
         if ( GainFrame_fx == 0 )
         {
             tmp = 31;
+            move16();
         }
         L_tmp = L_shl( GainFrame_fx, tmp ); /* 18 + tmp */
 
         tmp1 = 0;
+        move16();
         FOR( i = 0; i < L_FRAME16k; i++ )
         {
             L_tmp1 = Mult_32_16( L_tmp, GainShape_fx[NUM_SHB_SUBFR * i / L_FRAME16k] ); /* Q : 18 + tmp +15 -15*/
             /*White_exc16k_fx[i] = round_fx( L_shl(Mult_32_16( L_tmp1, White_exc16k_fx[i]),(23 - tmp -*Q_white_exc)) );*/
             /*18 + tmp +*Q_white_exc -15 + 23 - tmp -*Q_white_exc -16  = 10*/
             White_exc16k_fx[i] = round_fx( Mult_32_16( L_tmp1, White_exc16k_fx[i] ) ); /* 18 + tmp +*Q_white_exc -15 -16 */
+            move16();
             /*Lmax = L_max(Lmax,White_exc16k_fx[i]);*/
             tmp1 = s_max( tmp1, abs_s( White_exc16k_fx[i] ) );
             /*White_exc16k_fx[i] =32767;*/
@@ -2790,6 +2819,7 @@ void swb_tbe_enc_fx(
         if ( tmp1 == 0 )
         {
             tmp = 15;
+            move16();
         }
 
         FOR( i = 0; i < L_FRAME16k; i++ )
@@ -2903,7 +2933,7 @@ void swb_tbe_enc_ivas_fx(
     Word16 formant_fac_fx;
     // int16_t stab_check = 1;
     Word16 MSFlag;
-    Word16 *nlExc16k_fx, *mixExc16k_fx;
+    Word16 *nlExc16k_fx, *nlExc16k_e, *mixExc16k_fx, *mixExc16k_e;
 
     Word16 shaped_shb_excitationTemp_fx[L_FRAME16k];
 
@@ -2911,6 +2941,9 @@ void swb_tbe_enc_ivas_fx(
 
     Word16 acorr_EnvSHBres[ENVSHBRES_ACORR_MAX - ENVSHBRES_ACORR_MIN], *p_acorr, shb_env_tilt_fx;
     Word16 buf_EnvSHBres_fx[2 * L_FRAME4k], *p_buf, EnvSHBres_fx[L_FRAME16k], EnvSHBres_4k_fx[L_FRAME4k], EnvSHBres_4k_norm_fx[L_FRAME4k], env_mean_normf_fx[L_FRAME4k];
+    Word32 tmp_buf[L_FRAME4k];
+    Word16 Q_EnvSHBres_4k_norm = Q31;
+    move16();
     Word16 GainShape_Interp_fx[NUM_SHB_SUBGAINS], GainShape_tilt_fx; /* Q15 */
     Word16 seg_mean[4], den_seg_mean[4], *p_env, step;
     Word16 temp, scale_fx, scale_e, pow_e, tmp_e, tmp1_e;
@@ -2928,7 +2961,7 @@ void swb_tbe_enc_ivas_fx(
     Word16 n_subfr_saturation;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
+    move16();
 #endif
 
     Env_error_fx = 0;
@@ -2953,17 +2986,22 @@ void swb_tbe_enc_ivas_fx(
     exp1 = 0; /* to avoid compilation warnings */
     move16();
 
+    test();
     IF( st_fx->element_mode >= IVAS_CPE_DFT && hStereoICBWE != NULL )
     {
         nlExc16k_fx = hStereoICBWE->nlExc16k_fx;
+        nlExc16k_e = &hStereoICBWE->nlExc16k_e;
         mixExc16k_fx = hStereoICBWE->mixExc16k_fx;
+        mixExc16k_e = &hStereoICBWE->mixExc16k_e;
         MSFlag = hStereoICBWE->MSFlag;
         move16();
     }
     ELSE
     {
         nlExc16k_fx = NULL;
+        nlExc16k_e = NULL;
         mixExc16k_fx = NULL;
+        mixExc16k_e = NULL;
         MSFlag = 0;
         move16();
     }
@@ -3066,14 +3104,7 @@ void swb_tbe_enc_ivas_fx(
         }
     }
 
-    /* stab_check = a2lsp( lsf_shb, lpc_shb, LPC_SHB_ORDER ); - stab_check missing */
-    /* LPC to LSP conversion */
-    /* LPC: Q12, LSP: Q15 */
-    E_LPC_a_lsp_conversion( lpc_shb_fx, lsp_shb_fx, hBWE_TD->prev_lsp_shb_fx, LPC_SHB_ORDER );
-
-    /* LSP to LSF conversion */
-    /* LSP: Q15, LSF: Q15 */
-    E_LPC_lsp_lsf_conversion( lsp_shb_fx, lsf_shb_fx, LPC_SHB_ORDER );
+    /* stab_check = a2lsp( lsf_shb, lpc_shb, LPC_SHB_ORDER ); */
 
     test();
     test();
@@ -3081,8 +3112,8 @@ void swb_tbe_enc_ivas_fx(
     {
         FOR( i = 0; i < LPC_SHB_ORDER; i++ )
         {
-            // hBWE_TD->prev_lsp_shb_fx[i] = i / 20.0f;
-            hBWE_TD->prev_lsp_shb_fx[i] = lsp_shb_prev_tbl_fx[i];
+            // hBWE_TD->prev_lsp_shb_fx[i] = i / 20.0f; // This value in float enc is lsf.
+            hBWE_TD->prev_lsp_shb_fx[i] = lsp_shb_prev_tbl_swb_tbe_enc_fx[i]; // lsf converted to lsp as fixed enc stores lsp.
             move16();
         }
     }
@@ -3092,6 +3123,14 @@ void swb_tbe_enc_ivas_fx(
     //     mvr2r( hBWE_TD->prev_lsp_shb, lsf_shb, LPC_SHB_ORDER );
     // }
 
+    /* LPC to LSP conversion */
+    /* LPC: Q12, LSP: Q15 */
+    E_LPC_a_lsp_conversion( lpc_shb_fx, lsp_shb_fx, hBWE_TD->prev_lsp_shb_fx, LPC_SHB_ORDER );
+
+    /* LSP to LSF conversion */
+    /* LSP: Q15, LSF: Q15 */
+    E_LPC_lsp_lsf_conversion( lsp_shb_fx, lsf_shb_fx, LPC_SHB_ORDER );
+
     Copy( lsp_shb_fx, hBWE_TD->prev_lsp_shb_fx, LPC_SHB_ORDER );
     Copy( lsf_shb_fx, lsf_shb_orig_fx, LPC_SHB_ORDER );
 
@@ -3103,7 +3142,7 @@ void swb_tbe_enc_ivas_fx(
     test();
     IF( st_fx->rf_mode || EQ_32( st_fx->extl_brate, SWB_TBE_0k95 ) || EQ_32( st_fx->extl_brate, SWB_TBE_1k10 ) )
     {
-        lsp_weights_fx( lsf_shb_fx, weights_lsp, LPC_SHB_ORDER, &Q_out );
+        lsp_weights_ivas_fx( lsf_shb_fx, weights_lsp, LPC_SHB_ORDER, &Q_out );
 
         /* to compensate for the 1.1* weighting done inside the function lsp_weights */
         /*weights_lsp[3]*=0.909091f; weights_lsp[4]*=0.909091f; */
@@ -3248,7 +3287,7 @@ void swb_tbe_enc_ivas_fx(
             }
             w_fx[0] = w_fx[1];
             move16();
-            w_fx[sub( LPC_SHB_ORDER, 1 )] = w_fx[sub( LPC_SHB_ORDER, 2 )];
+            w_fx[LPC_SHB_ORDER - 1] = w_fx[LPC_SHB_ORDER - 2];
             move16();
 
             FOR( i = 0; i < LPC_SHB_ORDER; i++ )
@@ -3300,11 +3339,7 @@ void swb_tbe_enc_ivas_fx(
         FOR( i = L_SHB_LAHEAD; i < L_FRAME16k + L_SHB_LAHEAD; i++ )
         {
             /* shbEner = shbEner + in[i] * in[i] */
-#ifdef BASOP_NOGLOB
             shb_ener_sf_Q31 = L_mac0_sat( shb_ener_sf_Q31, shb_frame_fx[i], shb_frame_fx[i] );
-#else
-            shb_ener_sf_Q31 = L_mac0( shb_ener_sf_Q31, shb_frame_fx[i], shb_frame_fx[i] );
-#endif
             /* o: shb_ener_sf_Q31 in (2*Q_shb)      */
         }
         shb_ener_sf_Q31 = Mult_32_16( shb_ener_sf_Q31, 102 /*0.003125f Q15*/ );
@@ -3344,7 +3379,8 @@ void swb_tbe_enc_ivas_fx(
             exp = norm_l( L_tmp );
             tmp = extract_h( L_shl( L_tmp, exp ) );
             recip = div_s( 16384, tmp );
-            Q_recip = sub( 31, sub( exp, 14 ) ); /* = 31-(exp+2*Q_shb+1-14), but adjusted by (2*Q_shb+1) for use at Mult_32_16 below */
+            // Q_recip = sub( 31, sub( exp, 14 ) ); /* = 31-(exp+2*Q_shb+1-14), but adjusted by (2*Q_shb+1) for use at Mult_32_16 below */
+            Q_recip = sub( 31 + 14, exp ); /* = 31-(exp+2*Q_shb+1-14), but adjusted by (2*Q_shb+1) for use at Mult_32_16 below */
         }
 
         FOR( i = 0; i < NB_SUBFR16k; i++ )
@@ -3403,6 +3439,7 @@ void swb_tbe_enc_ivas_fx(
         FOR( k = 0; k < L_FRAME4k; k++ )
         {
             EnvSHBres_4k_fx[k] = EnvSHBres_fx[4 * k]; /* Q_shb */
+            move16();
         }
 
         /* calculate long-term mean envelope over four consecutive segments using linear interpolation */
@@ -3449,7 +3486,7 @@ void swb_tbe_enc_ivas_fx(
         FOR( k = 1; k < 4; k++ )
         {
             // step = ( den_seg_mean[k] - den_seg_mean[k - 1] ) * den_seg_len;
-            step = mult( den_seg_mean[k] - den_seg_mean[k - 1], den_seg_len );
+            step = mult( sub( den_seg_mean[k], den_seg_mean[k - 1] ), den_seg_len );
             FOR( i = 0; i < seg_len; i++ )
             {
                 *p_env = add_sat( *( p_env - 1 ), step );
@@ -3467,7 +3504,13 @@ void swb_tbe_enc_ivas_fx(
         /* normalize residual SHB envelope with its long-term mean envelope */
         FOR( k = 0; k < L_FRAME4k; k++ )
         {
-            EnvSHBres_4k_norm_fx[k] = mult( EnvSHBres_4k_fx[k], env_mean_normf_fx[k] );
+            tmp_buf[k] = L_mult( EnvSHBres_4k_fx[k], env_mean_normf_fx[k] ); // Q_shb + Q15 + Q1 => Q_shb + Q16
+            move32();
+        }
+        Q_EnvSHBres_4k_norm = sub( getScaleFactor32( tmp_buf, L_FRAME4k ), 1 /* Guard bit */ );
+        FOR( k = 0; k < L_FRAME4k; k++ )
+        {
+            EnvSHBres_4k_norm_fx[k] = extract_h( L_shl( tmp_buf[k], Q_EnvSHBres_4k_norm ) ); // Q_shb + Q16 + Q_EnvSHBres_4k_norm - Q16 => Q_EnvSHBres_4k_norm + Q_shb
             move16();
         }
 
@@ -3479,15 +3522,16 @@ void swb_tbe_enc_ivas_fx(
 
         /* subtract mean value from the normalized SHB residual envelope */
         p_buf = &buf_EnvSHBres_fx[L_FRAME4k];
-        temp = mean_no_sat_fx( EnvSHBres_4k_norm_fx, L_FRAME4k );
+        temp = mean_no_sat_fx( EnvSHBres_4k_norm_fx, L_FRAME4k ); // Q_EnvSHBres_4k_norm + Q_shb
         FOR( k = 0; k < L_FRAME4k; k++ )
         {
-            *p_buf++ = sub( EnvSHBres_4k_norm_fx[k], temp );
+            *p_buf++ = shr( sub( EnvSHBres_4k_norm_fx[k], temp ), Q_EnvSHBres_4k_norm ); // Q_shb
             move16();
         }
+        Q_EnvSHBres_4k_norm = add( Q_EnvSHBres_4k_norm, Q_shb );
 
         /* update memory */
-        Copy( &buf_EnvSHBres_fx[L_FRAME4k], hBWE_TD->old_EnvSHBres_fx, L_FRAME4k );
+        Copy( &buf_EnvSHBres_fx[L_FRAME4k], hBWE_TD->old_EnvSHBres_fx, L_FRAME4k ); // Q_shb
 
         /* calculate energy normalization factor for the auto-correlation function */
         // pow0 = sum2_f( &buf_EnvSHBres[L_FRAME4k], L_FRAME4k ) + 1.0f;
@@ -3637,13 +3681,9 @@ void swb_tbe_enc_ivas_fx(
 
     sc = sub( Q_bwe_exc, add( Q_new, Q_new ) );
     /* rescale the bwe_exc_extended and bring it to 16-bit single precision with dynamic norm  */
-    FOR( cnt = 0; cnt < L_FRAME32k; cnt++ )
+    FOR( cnt = 0; cnt < L_FRAME32k + NL_BUFF_OFFSET; cnt++ )
     {
-#ifdef BASOP_NOGLOB
         bwe_exc_extended_16[cnt] = round_fx_sat( L_shl_sat( bwe_exc_extended[cnt], sc ) );
-#else
-        bwe_exc_extended_16[cnt] = round_fx( L_shl( bwe_exc_extended[cnt], sc ) );
-#endif
         move16();
     }
 
@@ -3660,14 +3700,13 @@ void swb_tbe_enc_ivas_fx(
     Q_bwe_exc_fb = hBWE_TD->prev_Q_bwe_exc_fb;
     move16();
 
-    // Replace with IVAS equivalent
-    GenShapedSHBExcitation_ivas_enc_fx( shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx,
-                                        hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,
-                                        st_fx->coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed, vf_modified_fx, st_fx->extl,
-                                        &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf_fx, shb_ener_sf_Q31,
-                                        shb_res_gshape_fx, shb_res_fx, &vf_ind_fx, formant_fac_fx, hBWE_TD->fb_state_lpc_syn_fx,
-                                        &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, st_fx->prev_Q_bwe_syn, st_fx->total_brate, 0, st_fx->element_mode, st_fx->flag_ACELP16k, nlExc16k_fx, mixExc16k_fx, st_fx->extl_brate, MSFlag,
-                                        EnvSHBres_4k_norm_fx, &( hBWE_TD->prev_pow_exc16kWhtnd_fx32 ), &( hBWE_TD->prev_mix_factor_fx ), &Env_error_fx, Env_error_part_fx );
+    GenShapedSHBExcitation_ivas_enc_fx( shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx, hBWE_TD->mem_csfilt_fx,
+                                        hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx, st_fx->coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed,
+                                        vf_modified_fx, st_fx->extl, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf_fx, shb_ener_sf_Q31,
+                                        shb_res_gshape_fx, shb_res_fx, &vf_ind_fx, formant_fac_fx, hBWE_TD->fb_state_lpc_syn_fx, &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc,
+                                        &Q_bwe_exc_fb, Q_shb, n_mem2, st_fx->prev_Q_bwe_syn, st_fx->total_brate, 0, st_fx->element_mode, st_fx->flag_ACELP16k, nlExc16k_fx,
+                                        nlExc16k_e, mixExc16k_fx, mixExc16k_e, st_fx->extl_brate, MSFlag, EnvSHBres_4k_norm_fx, Q_EnvSHBres_4k_norm,
+                                        &( hBWE_TD->prev_pow_exc16kWhtnd_fx32 ), &( hBWE_TD->prev_mix_factor_fx ), &Env_error_fx, Env_error_part_fx );
 
     *Q_white_exc = Q_bwe_exc_fb;
     move16();
@@ -3697,6 +3736,7 @@ void swb_tbe_enc_ivas_fx(
     {
         Copy( shaped_shb_excitation_fx + L_SHB_LAHEAD, hStereoICBWE->shbSynthRef_fx, L_FRAME16k );
         hStereoICBWE->shbSynthRef_e = sub( 15, Q_bwe_exc );
+        move16();
     }
 
     test();
@@ -3760,7 +3800,7 @@ void swb_tbe_enc_ivas_fx(
                 curr_pow_64fx = W_mac0_16_16( curr_pow_64fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
             }
 
-            if ( GT_16( voice_factors_fx[0], 24576 /*0.75f Q15*/ ) )
+            IF( GT_16( voice_factors_fx[0], 24576 /*0.75f Q15*/ ) )
             {
                 /*curr_pow_fx = Mult_32_16( curr_pow_fx, 8192);*/ /* Q(2*Q_bwe_exc) */
                 curr_pow_64fx = W_shr( curr_pow_64fx, 2 );        /* scale by 0.25 */
@@ -3780,12 +3820,8 @@ void swb_tbe_enc_ivas_fx(
 
         FOR( i = 0; i < L_SHB_LAHEAD; i++ )
         {
-            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q(16-exp+Q_bwe_exc) */
-#ifdef BASOP_NOGLOB
+            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );                               /* Q(16-exp+Q_bwe_exc) */
             shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#else
-            shaped_shb_excitation_fx[i] = round_fx( L_shl( L_tmp, exp ) );  /* Q_bwe_exc */
-#endif
             move16();
         }
         IF( exp < 0 )
@@ -3796,21 +3832,12 @@ void swb_tbe_enc_ivas_fx(
         }
         FOR( ; i < L_SHB_LAHEAD + 10; i++ )
         {
-#ifdef BASOP_NOGLOB
             tmp = i_mult_o( sub( i, 19 ), 3277 /*0.1f Q15*/, &Overflow );        /* Q15 */
             L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */
-#else
-            tmp = i_mult( sub( i, 19 ), 3277 /*0.1f Q15*/ );                /* Q15 */
-            L_tmp1 = Mult_32_16( L_shl( 1, sub( 31, exp ) ), tmp );         /* Q31-exp */
-#endif
             tmp = sub( 32767 /*1.0f Q15*/, tmp );
-            Lscale = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
-            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef BASOP_NOGLOB
+            L_tmp = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
+            L_tmp = Mult_32_16( L_tmp, shaped_shb_excitation_fx[i] );                                /* Q_bwe_exc + (31-exp) - 15 */
             shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#else
-            shaped_shb_excitation_fx[i] = round_fx( L_shl( L_tmp, exp ) );  /* Q_bwe_exc */
-#endif
             move16();
         }
     }
@@ -3885,47 +3912,48 @@ void swb_tbe_enc_ivas_fx(
 
     /* Gain frame adjustment factor */
     /* log( (GainShape[0]) / (st->prev_wb_GainShape) )*/
-    test();
-    IF( GainShape_fx[0] && hBWE_TD->prev_swb_GainShape_fx )
+    IF( hBWE_TD->prev_swb_GainShape_fx == 0 )
     {
-        exp = norm_s( hBWE_TD->prev_swb_GainShape_fx );
-        tmp = div_s( shl( 1, sub( 14, exp ) ), hBWE_TD->prev_swb_GainShape_fx );
-        L_tmp = L_mult( GainShape_fx[0], tmp ); /*Q(30 - exp) */
-
-        exp1 = norm_l( L_tmp );
-        frac = Log2_norm_lc( L_shl( L_tmp, exp1 ) ); /*move16(); */
-        exp1 = sub( exp, exp1 );                     /*move16(); */
-        L_tmp = Mpy_32_16( exp1, frac, 22713 );
-        temp_swb_fac = round_fx( L_shl( L_tmp, 10 ) );
+        exp = 13 /* norm_s(3) */;
+        tmp = 21845 /* div_s( shl(1, sub(14, exp)), 3 /\* 0.0001 in Q15 *\/ ) */;
     }
     ELSE
     {
-        temp_swb_fac = 0;
-        move16();
+        exp = norm_s( hBWE_TD->prev_swb_GainShape_fx );
+        tmp = div_s( shl( 1, sub( 14, exp ) ), hBWE_TD->prev_swb_GainShape_fx );
     }
-    L_feedback = L_mult0( temp_swb_fac, temp_swb_fac );
+
+    L_tmp = L_mult( GainShape_fx[0], tmp ); /*Q(30 - exp) */
+
+    exp1 = norm_l( L_tmp );
+    frac = Log2_norm_lc( L_shl( L_tmp, exp1 ) ); /*move16(); */
+    exp1 = sub( exp, exp1 );                     /*move16(); */
+    L_tmp = Mpy_32_16( exp1, frac, 22713 );
+    temp_swb_fac = round_fx( L_shl( L_tmp, 10 ) );
+
+    L_feedback = L_mult( temp_swb_fac, temp_swb_fac );
 
 
     FOR( i = 1; i < NUM_SHB_SUBGAINS; i++ )
     {
         test();
-        IF( GainShape_fx[i] && GainShape_fx[i - 1] )
+        IF( GainShape_fx[i - 1] == 0 )
         {
-            exp = norm_s( GainShape_fx[i - 1] );
-            tmp = div_s( shl( 1, sub( 14, exp ) ), GainShape_fx[i - 1] );
-            L_tmp = L_mult( GainShape_fx[i], tmp ); /* Q(30 - exp) */
-
-            exp1 = norm_l( L_tmp );
-            frac = Log2_norm_lc( L_shl( L_tmp, exp1 ) );
-            exp1 = sub( exp, exp1 );
-            L_tmp = Mpy_32_16( exp1, frac, 22713 );
-            temp_swb_fac = round_fx( L_shl( L_tmp, 10 ) );
+            exp = 13 /* norm_s(3) */;
+            tmp = 21845 /* div_s( shl(1, sub(14, exp)), 3 /\* 0.0001 in Q15 *\/ ) */;
         }
         ELSE
         {
-            temp_swb_fac = 0;
-            move16();
+            exp = norm_s( GainShape_fx[i - 1] );
+            tmp = div_s( shl( 1, sub( 14, exp ) ), GainShape_fx[i - 1] );
         }
+        L_tmp = L_mult( GainShape_fx[i], tmp ); /* Q(30 - exp) */
+
+        exp1 = norm_l( L_tmp );
+        frac = Log2_norm_lc( L_shl( L_tmp, exp1 ) );
+        exp1 = sub( exp, exp1 );
+        L_tmp = Mpy_32_16( exp1, frac, 22713 );
+        temp_swb_fac = round_fx( L_shl( L_tmp, 10 ) );
 
         L_feedback = L_mac( L_feedback, temp_swb_fac, temp_swb_fac );
     }
@@ -3951,6 +3979,7 @@ void swb_tbe_enc_ivas_fx(
     Copy( GainShape_fx, GainShape_Interp_fx, NUM_SHB_SUBGAINS );
     lls_interp_n_fx( GainShape_Interp_fx, NUM_SHB_SUBGAINS, &GainShape_tilt_fx, &temp, 1 );
 
+    test();
     IF( EQ_32( st_fx->extl_brate, SWB_TBE_1k10 ) || EQ_32( st_fx->extl_brate, SWB_TBE_1k75 ) )
     {
         // if (acorr_v2a < 0.4f && vf_ind >= 5 && fabs(GainShape_tilt) < 0.2f && shb_env_tilt < 500.0f && hBWE_TD->prev_shb_env_tilt < 500.0f)
@@ -4002,6 +4031,7 @@ void swb_tbe_enc_ivas_fx(
             {
                 /*GainShape_fx[i] = (1 - feedback) * GainShape[i] + feedback * temp_swb_fac; */
                 GainShape_fx[i] = round_fx( L_mac( L_mult( sub( 32767, feedback ), GainShape_fx[i] ), feedback, temp_swb_fac ) );
+                move16();
                 temp_swb_fac = GainShape_fx[i];
                 move16();
             }
@@ -4013,7 +4043,9 @@ void swb_tbe_enc_ivas_fx(
     {
         /* Re-normalize gain shape before quantization */
         // sum_gain = sum2_f(GainShape, NUM_SHB_SUBGAINS);
-        sum_gain_fx = sum16_32_fx( GainShape_fx, NUM_SHB_SUBGAINS );
+        tmp = 0;
+        move16();
+        sum_gain_fx = sum2_16_exp_fx( GainShape_fx, NUM_SHB_SUBGAINS, &tmp, 2 );
         IF( sum_gain_fx == 0 )
         {
             normFact_fx = 0;
@@ -4022,8 +4054,6 @@ void swb_tbe_enc_ivas_fx(
         ELSE
         {
             // normFact = (float) sqrt( 1.0f / sum_gain );
-            tmp = Q16;
-            move16();
             normFact_fx = ISqrt32( sum_gain_fx, &tmp );
         }
 
@@ -4097,8 +4127,8 @@ void swb_tbe_enc_ivas_fx(
     }
 
     /* Estimate the gain parameter */
-    EstimateSHBFrameGain_fx( SHB_OVERLAP_LEN, shb_frame_fx, Q_shb, shaped_shb_excitation_fx, Q_bwe_exc,
-                             GainShape_fx, &GainFrame_fx, window_shb_fx, subwin_shb_fx, n_subfr_saturation );
+    EstimateSHBFrameGain_ivas_fx( SHB_OVERLAP_LEN, shb_frame_fx, Q_shb, shaped_shb_excitation_fx, Q_bwe_exc,
+                                  GainShape_fx, &GainFrame_fx, window_shb_fx, subwin_shb_fx, n_subfr_saturation );
 
     IF( EQ_16( st_fx->tec_tfa, 1 ) )
     {
@@ -4190,7 +4220,7 @@ void swb_tbe_enc_ivas_fx(
         frac = L_Extract_lc( L_tmp, &exp );
         GainFrame_fx = Pow2( 30, frac );
         exp = sub( exp, 30 );
-        GainFrame_fx = L_shl( GainFrame_fx, exp + 18 ); /* Q18 */
+        GainFrame_fx = L_shl( GainFrame_fx, add( exp, 18 ) ); /* Q18 */
     }
     ELSE IF( EQ_16( hBWE_TD->prev_frGainAtten, 1 ) && GT_32( Mult_32_16( GainFrame_fx, 10923 ), hBWE_TD->prev_gainFr_SHB_fx ) )
     {
@@ -4313,13 +4343,9 @@ void swb_tbe_enc_ivas_fx(
             tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
 
             /* sd_uq_q*pitBufAvg */
-            L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx ); /* Q13 * Q10 + 1 -16 => Q8 */
-            L_tmp = Mult_32_16( L_tmp, tmp );          /* Q8 + (14 - exp) - 15 => Q7 - exp */
-#ifdef BASOP_NOGLOB
+            L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx );                                    /* Q13 * Q10 + 1 -16 => Q8 */
+            L_tmp = Mult_32_16( L_tmp, tmp );                                             /* Q8 + (14 - exp) - 15 => Q7 - exp */
             tmp = round_fx_o( L_shl_o( L_tmp, 31 - ( 7 - exp ), &Overflow ), &Overflow ); /* Q15 */
-#else
-            tmp = round_fx( L_shl( L_tmp, 31 - ( 7 - exp ) ) );             /* Q15 */
-#endif
         }
         tmp = s_min( tmp, 32767 /*1.0f Q15*/ );
         tmp = s_max( tmp, 19661 /*0.6f Q15*/ );
@@ -4366,7 +4392,7 @@ void swb_tbe_enc_ivas_fx(
     IF( GE_16( st_fx->element_mode, IVAS_CPE_DFT ) && hStereoICBWE != NULL )
     {
         // Check Qs
-        Copy_Scale_sig_16_32( lpc_shb_fx, hStereoICBWE->lpSHBRef_fx, LPC_SHB_ORDER + 1, 0 );
+        Copy_Scale_sig_16_32_DEPREC( lpc_shb_fx, hStereoICBWE->lpSHBRef_fx, LPC_SHB_ORDER + 1, 0 );
         hStereoICBWE->lpSHBRef_e = 31 - Q12;
         move16();
     }
@@ -4450,7 +4476,6 @@ void swb_tbe_enc_ivas_fx(
 /* RETURN ARGUMENTS : */
 /* _ None */
 /*--------------------------------------------------------------------------*/
-
 static void EstimateSHBFrameGain_fx(
     const Word16 length,            /* i : SHB overlap length                                                  */
     const Word16 *oriSHB,           /* i : target original SHB frame                               Q(Q_oriSHB) */
@@ -4477,7 +4502,7 @@ static void EstimateSHBFrameGain_fx(
     Word16 scaling = 0;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
-    move32();
+    move16();
 #endif
     move16();
 
@@ -4548,7 +4573,7 @@ static void EstimateSHBFrameGain_fx(
             sum_gain = mult_r( subwin_shb_local[k + 1], subgain[0] ); /* Q15 */
             mod_syn[j] = L_mult( synSHB[j], sum_gain );
             move32(); /* Q(16+Q_synSHB) */
-            j = add( j, 1 );
+            j++;
         }
         FOR( i = 0; i < NUM_SHB_SUBGAINS - 1; i++ )
         {
@@ -4556,7 +4581,7 @@ static void EstimateSHBFrameGain_fx(
             {
                 mod_syn[j] = L_mult( synSHB[j], subgain[i * num_join] );
                 move32(); /* Q(16+Q_synSHB) */
-                j = add( j, 1 );
+                j++;
             }
 
             FOR( k = 0; k < length; k++ )
@@ -4565,21 +4590,21 @@ static void EstimateSHBFrameGain_fx(
                 tmp = round_fx( L_mac0( L_tmp, subwin_shb_local[k + 1], subgain[( i + 1 ) * num_join] ) ); /* Q14 */
                 mod_syn[j] = L_shl( L_mult( tmp, synSHB[j] ), 1 );
                 move32(); /* Q(16+Q_synSHB) */
-                j = add( j, 1 );
+                j++;
             }
         }
         FOR( k = 0; k < join_length - length; k++ )
         {
             mod_syn[j] = L_mult( synSHB[j], subgain[( NUM_SHB_SUBGAINS - 1 ) * num_join] );
             move32(); /* Q(16+Q_synSHB)*/
-            j = add( j, 1 );
+            j++;
         }
         FOR( k = 0; k < length; k++ )
         {
             tmp = mult_r( subwin_shb_local[length - k - 1], subgain[( NUM_SHB_SUBGAINS - 1 ) * num_join] ); /* Q15 */
             mod_syn[j] = L_mult( tmp, synSHB[j] );
             move32(); /* Q(16+Q_synSHB ) */
-            j = add( j, 1 );
+            j++;
         }
     }
     /* adjust frame energy */
@@ -4588,48 +4613,27 @@ static void EstimateSHBFrameGain_fx(
 
     FOR( i = 0; i < l_shb_lahead; i++ )
     {
-#ifdef BASOP_NOGLOB
         sig = mult_ro( oriSHB[i], win_shb[i], &Overflow );                   /* Q_oriSHB */
         oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow );                    /* 2*Q_orisHB*/
         sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[i] ), &Overflow ); /*Q_synSHB */
         synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );                    /* 2*Q_synSHB */
-#else
-        sig = mult_r( oriSHB[i], win_shb[i] );                              /* Q_oriSHB */
-        oriNrg = L_mac0( oriNrg, sig, sig );                                /* 2*Q_orisHB*/
-        sig = round_fx( Mult_32_16( mod_syn[i], win_shb[i] ) );             /*Q_synSHB */
-        synNrg = L_mac0( synNrg, sig, sig );                                /* 2*Q_synSHB */
-#endif
     }
 
     FOR( ; i < l_frame; i++ )
     {
-#ifdef BASOP_NOGLOB
         oriNrg = L_mac0_o( oriNrg, oriSHB[i], oriSHB[i], &Overflow ); /* 2*Q_oriSHB */
         sig = round_fx_o( mod_syn[i], &Overflow );                    /* Q_oriSHB */
         synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );             /* 2*Q_oriSHB */
-#else
-        oriNrg = L_mac0( oriNrg, oriSHB[i], oriSHB[i] );                    /* 2*Q_oriSHB */
-        sig = round_fx( mod_syn[i] );                                       /* Q_oriSHB */
-        synNrg = L_mac0( synNrg, sig, sig );                                /* 2*Q_oriSHB */
-#endif
     }
 
     tmp = add( l_frame, l_shb_lahead );
     FOR( ; i < tmp; i++ )
     {
-#ifdef BASOP_NOGLOB
         sig = mult_ro( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i], &Overflow ); /* Q_oriSHB */
         oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow );                               /* 2*Q_oriSHB */
 
         sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ), &Overflow ); /* Q_oriSHB */
         synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );                                                 /* 2*Q_oriSHB */
-#else
-        sig = mult_r( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i] ); /* Q_oriSHB */
-        oriNrg = L_mac0( oriNrg, sig, sig );                                /* 2*Q_oriSHB */
-
-        sig = round_fx( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ) ); /* Q_oriSHB */
-        synNrg = L_mac0( synNrg, sig, sig );                                                 /* 2*Q_oriSHB */
-#endif
     }
     IF( EQ_32( oriNrg, MAX_32 ) )
     {
@@ -4638,50 +4642,220 @@ static void EstimateSHBFrameGain_fx(
         move32();
         FOR( i = 0; i < l_shb_lahead; i++ )
         {
-#ifdef BASOP_NOGLOB
             sig = mult_r( shl_o( oriSHB[i], scaling, &Overflow ), win_shb[i] );
             oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#else
-            sig = mult_r( shl( oriSHB[i], scaling ), win_shb[i] );
-            oriNrg = L_mac0( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#endif
         }
         FOR( ; i < l_frame; i++ )
         {
-#ifdef BASOP_NOGLOB
             sig = shl_o( oriSHB[i], scaling, &Overflow );
             oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#else
-            sig = shl( oriSHB[i], scaling );
-            oriNrg = L_mac0( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#endif
         }
         FOR( ; i < tmp; i++ )
         {
-#ifdef BASOP_NOGLOB
             sig = mult_r( shl_o( oriSHB[i], scaling, &Overflow ), win_shb[l_frame + l_shb_lahead - 1 - i] );
             oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#else
-            sig = mult_r( shl( oriSHB[i], scaling ), win_shb[l_frame + l_shb_lahead - 1 - i] );
-            oriNrg = L_mac0( oriNrg, sig, sig );                      /* 2*Q_oriSHB + 2*scaling */
-#endif
         }
     }
     L_tmp = root_a_over_b_fx( oriNrg, 2 * Q_oriSHB, synNrg, 2 * Q_synSHB, &exp_out );
     exp_out = sub( exp_out, scaling );
-#ifdef BASOP_NOGLOB
     frame_gain = L_shl_sat( L_tmp, sub( exp_out, 13 ) ); /* Q18 */
-#else
-    frame_gain = L_shl( L_tmp, sub( exp_out, 13 ) );                  /* Q18 */
-#endif
     *GainFrame = frame_gain;
     move32();
 
     return;
 }
 
-
-static Word32 pow_off_pk_fx( Word16 a[], Word16 len, Word16 step )
+static void EstimateSHBFrameGain_ivas_fx(
+    const Word16 length,            /* i : SHB overlap length                                                  */
+    const Word16 *oriSHB,           /* i : target original SHB frame                               Q(Q_oriSHB) */
+    const Word16 Q_oriSHB,          /* i : Q of arget original SHB frame                                       */
+    const Word16 *synSHB,           /* i : shaped SHB excitation                                   Q(Q_synSHB) */
+    const Word16 Q_synSHB,          /* i : Q of shaped SHB excitation                                          */
+    Word16 *subgain,                /* i : estimate of gain shape                                          Q15 */
+    Word32 *GainFrame,              /* o : estimat of gain frame                                           Q18 */
+    const Word16 *win_shb,          /* i : SHB window                                                      Q15 */
+    const Word16 *subwin_shb_local, /* i : SHB subframe window                                             Q15 */
+    const Word16 n_subfr_saturation /* i : Number of subframes which saturated in GainShape oriNrg calculation */
+)
+{
+    const Word16 *skip;
+    Word16 i, j, k, l_shb_lahead, l_frame;
+    Word16 join_length, num_join, sig;
+    Word32 mod_syn[L_FRAME16k + L_SHB_LAHEAD];
+    Word32 oriNrg, synNrg;
+    Word16 sum_gain;
+    Word32 frame_gain;
+    Word32 L_tmp;
+    Word16 exp_out;
+    Word16 tmp;
+    Word16 scaling = 0;
+#ifdef BASOP_NOGLOB_DECLARE_LOCAL
+    Flag Overflow = 0;
+    move32();
+#endif
+    move16();
+
+    /* initilaization */
+    l_frame = L_FRAME16k;
+    move16();
+    l_shb_lahead = L_SHB_LAHEAD;
+    move16();
+    skip = skip_bands_SWB_TBE;
+
+    IF( EQ_16( length, SHB_OVERLAP_LEN / 2 ) )
+    {
+        skip = skip_bands_WB_TBE;
+        l_frame = L_FRAME16k / 4;
+        move16();
+        l_shb_lahead = L_SHB_LAHEAD / 4;
+        move16();
+    }
+
+    /* apply gain for each subframe, and store noise output signal using overlap-add*/
+    set32_fx( mod_syn, 0, l_frame + l_shb_lahead );
+
+    IF( EQ_16( length, SHB_OVERLAP_LEN / 2 ) )
+    {
+        sum_gain = 0;
+        move16();
+        j = skip[0];
+        move16();
+        FOR( k = 0; k < length / 2; k++ )
+        {
+            sum_gain = mult_r( subwin_shb_local[2 * k + 2], subgain[0] ); /* Q15 */
+            mod_syn[j + k] = L_mult0( synSHB[j + k], sum_gain );
+            move32(); /* Q(16+Q_synSHB) */
+            mod_syn[j + k + length / 2] = L_mult0( synSHB[j + k + length / 2], subgain[0] );
+            move32(); /* Q(16+Q_synSHB) */
+        }
+
+        FOR( i = 1; i < NUM_SHB_SUBFR / 2; i++ )
+        {
+            j = skip[i];
+            move16();
+            FOR( k = 0; k < length; k++ )
+            {
+                L_tmp = L_mult0( subwin_shb_local[k + 1], subgain[i] );                                   /* Q30 */
+                sum_gain = round_fx( L_mac0( L_tmp, subwin_shb_local[length - k - 1], subgain[i - 1] ) ); /* Q14 */
+                mod_syn[j + k] = L_mult( sum_gain, synSHB[j + k] );
+                move32(); /* Q(16+Q_synSHB) */
+            }
+        }
+        FOR( k = 0; k < length / 2; k++ )
+        {
+            j = skip[i];
+            move16();
+            sum_gain = mult_r( subwin_shb_fx[length - 2 * k - 2], subgain[i - 1] ); /* Q15 */
+            mod_syn[j + k] = L_mult0( synSHB[j + k], sum_gain );
+            move32(); /* Q(16+Q_synSHB) */
+        }
+    }
+    ELSE
+    {
+        num_join = NUM_SHB_SUBFR / NUM_SHB_SUBGAINS;
+        move16();
+        join_length = i_mult2( num_join, length );
+        j = 0;
+        move16();
+        FOR( k = 0; k < length; k++ )
+        {
+            sum_gain = mult_r( subwin_shb_local[k + 1], subgain[0] ); /* Q15 */
+            mod_syn[j] = L_mult0( synSHB[j], sum_gain );
+            move32(); /* Q(16+Q_synSHB) */
+            j++;
+        }
+        FOR( i = 0; i < NUM_SHB_SUBGAINS - 1; i++ )
+        {
+            FOR( k = 0; k < join_length - length; k++ )
+            {
+                mod_syn[j] = L_mult0( synSHB[j], subgain[i * num_join] );
+                move32(); /* Q(16+Q_synSHB) */
+                j++;
+            }
+
+            FOR( k = 0; k < length; k++ )
+            {
+                L_tmp = L_mult0( subwin_shb_local[length - k - 1], subgain[i * num_join] );
+                tmp = round_fx( L_mac0( L_tmp, subwin_shb_local[k + 1], subgain[( i + 1 ) * num_join] ) ); /* Q14 */
+                mod_syn[j] = L_mult( tmp, synSHB[j] );
+                move32(); /* Q(16+Q_synSHB) */
+                j++;
+            }
+        }
+        FOR( k = 0; k < join_length - length; k++ )
+        {
+            mod_syn[j] = L_mult0( synSHB[j], subgain[( NUM_SHB_SUBGAINS - 1 ) * num_join] );
+            move32(); /* Q(16+Q_synSHB)*/
+            j++;
+        }
+        FOR( k = 0; k < length; k++ )
+        {
+            tmp = mult_r( subwin_shb_local[length - k - 1], subgain[( NUM_SHB_SUBGAINS - 1 ) * num_join] ); /* Q15 */
+            mod_syn[j] = L_mult0( tmp, synSHB[j] );
+            move32(); /* Q(16+Q_synSHB ) */
+            j++;
+        }
+    }
+    /* adjust frame energy */
+    oriNrg = L_deposit_l( 0 );
+    synNrg = L_deposit_l( 0 );
+
+    FOR( i = 0; i < l_shb_lahead; i++ )
+    {
+        sig = mult_ro( oriSHB[i], win_shb[i], &Overflow );                   /* Q_oriSHB */
+        oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow );                    /* 2*Q_orisHB*/
+        sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[i] ), &Overflow ); /*Q_synSHB */
+        synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );                    /* 2*Q_synSHB - 2*/
+    }
+
+    FOR( ; i < l_frame; i++ )
+    {
+        oriNrg = L_mac0_o( oriNrg, oriSHB[i], oriSHB[i], &Overflow ); /* 2*Q_oriSHB */
+        sig = round_fx_o( mod_syn[i], &Overflow );                    /* Q_oriSHB */
+        synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );             /* 2*Q_oriSHB - 2*/
+    }
+
+    tmp = add( l_frame, l_shb_lahead );
+    FOR( ; i < tmp; i++ )
+    {
+        sig = mult_ro( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i], &Overflow ); /* Q_oriSHB */
+        oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow );                               /* 2*Q_oriSHB */
+
+        sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ), &Overflow ); /* Q_oriSHB */
+        synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );                                                 /* 2*Q_oriSHB - 2*/
+    }
+    IF( EQ_32( oriNrg, MAX_32 ) )
+    {
+        scaling = negate( add( shr( n_subfr_saturation, 1 ), 1 ) );
+        oriNrg = 0;
+        move32();
+        FOR( i = 0; i < l_shb_lahead; i++ )
+        {
+            sig = mult_r( shl_o( oriSHB[i], scaling, &Overflow ), win_shb[i] );
+            oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
+        }
+        FOR( ; i < l_frame; i++ )
+        {
+            sig = shl_o( oriSHB[i], scaling, &Overflow );
+            oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
+        }
+        FOR( ; i < tmp; i++ )
+        {
+            sig = mult_r( shl_o( oriSHB[i], scaling, &Overflow ), win_shb[l_frame + l_shb_lahead - 1 - i] );
+            oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
+        }
+    }
+    L_tmp = root_a_over_b_fx( oriNrg, shl( Q_oriSHB, 1 ), synNrg, sub( shl( Q_synSHB, 1 ), 2 ), &exp_out );
+    exp_out = sub( exp_out, scaling );
+    frame_gain = L_shl_sat( L_tmp, sub( exp_out, 13 ) ); /* Q18 */
+    *GainFrame = frame_gain;
+    move32();
+
+    return;
+}
+
+
+static Word32 pow_off_pk_fx( Word16 a[], Word16 len, Word16 step )
 {
     Word16 i, j;
     Word32 sum, L_tmp;
@@ -4812,7 +4986,7 @@ static void EstimateSHBGainShape_fx(
         FOR( i = 0; i < NUM_SHB_SUBFR / 2; i++ )
         {
             logic16();
-            IF( ( i & 0x1 ) == 0 )
+            IF( s_and( i, 0x1 ) == 0 )
             {
                 oriNrg = 0;
                 move32();
@@ -4826,31 +5000,18 @@ static void EstimateSHBGainShape_fx(
                 FOR( k = 0; k < length / 2; k++ )
                 {
                     sig = mult_r( oriSHB[j + k], subwin[2 * k + 2] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
                     oriNrg = L_mac0_sat( oriNrg, sig, sig );          /* 2* Q_oriSHB */
                     sig = mult_r( synSHB[j + k], subwin[2 * k + 2] ); /* Q_synSHB */
                     synNrg = L_mac0_sat( synNrg, sig, sig );          /* 2* Q_synSHB */
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );              /* 2* Q_oriSHB */
-                    sig = mult_r( synSHB[j + k], subwin[2 * k + 2] ); /* Q_synSHB */
-                    synNrg = L_mac0( synNrg, sig, sig );              /* 2* Q_synSHB */
-#endif
                 }
                 FOR( k = length / 2; k < length; k++ )
                 {
                     sig = oriSHB[j + k];
                     move16();
-#ifdef BASOP_NOGLOB
                     oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
                     sig = synSHB[j + k];
                     move16();
                     synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_synSHB */
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );              /* 2* Q_oriSHB */
-                    sig = synSHB[j + k];
-                    move16();
-                    synNrg = L_mac0( synNrg, sig, sig );                                          /* 2* Q_synSHB */
-#endif
                 }
             }
             ELSE
@@ -4858,17 +5019,9 @@ static void EstimateSHBGainShape_fx(
                 FOR( k = 0; k < length; k++ )
                 {
                     sig = mult_r( oriSHB[j + k], subwin[k + 1] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
-                    oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );                                          /* 2* Q_oriSHB */
-#endif
+                    oriNrg = L_mac0_sat( oriNrg, sig, sig );      /* 2* Q_oriSHB */
                     sig = mult_r( synSHB[j + k], subwin[k + 1] ); /* Q_synSHB */
-#ifdef BASOP_NOGLOB
-                    synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_synSHB */
-#else
-                    synNrg = L_mac0( synNrg, sig, sig );                                          /* 2* Q_synSHB */
-#endif
+                    synNrg = L_mac0_sat( synNrg, sig, sig );      /* 2* Q_synSHB */
                 }
             }
             IF( EQ_16( i, NUM_SHB_SUBFR / 2 - 1 ) )
@@ -4877,18 +5030,10 @@ static void EstimateSHBGainShape_fx(
                 FOR( ; k < length_tmp; k++ )
                 {
                     sig = mult_r( oriSHB[j + k], subwin[3 * length - 2 * k - 2] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
-                    oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );                                          /* 2* Q_oriSHB */
-#endif
+                    oriNrg = L_mac0_sat( oriNrg, sig, sig );                       /* 2* Q_oriSHB */
 
                     sig = mult_r( synSHB[j + k], subwin[3 * length - 2 * k - 2] ); /* Q_synSHB */
-#ifdef BASOP_NOGLOB
-                    synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_synSHB */
-#else
-                    synNrg = L_mac0( synNrg, sig, sig );                                          /* 2* Q_synSHB */
-#endif
+                    synNrg = L_mac0_sat( synNrg, sig, sig );                       /* 2* Q_synSHB */
                 }
             }
             ELSE
@@ -4896,28 +5041,20 @@ static void EstimateSHBGainShape_fx(
                 FOR( ; k < length2; k++ )
                 {
                     sig = mult_r( oriSHB[j + k], subwin[2 * length - k - 1] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
-                    oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );                                          /* 2* Q_oriSHB */
-#endif
+                    oriNrg = L_mac0_sat( oriNrg, sig, sig );                   /* 2* Q_oriSHB */
                     sig = mult_r( synSHB[j + k], subwin[2 * length - k - 1] ); /* Q_synSHB */
-#ifdef BASOP_NOGLOB
-                    synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_synSHB */
-#else
-                    synNrg = L_mac0( synNrg, sig, sig );                                          /* 2* Q_synSHB */
-#endif
+                    synNrg = L_mac0_sat( synNrg, sig, sig );                   /* 2* Q_synSHB */
                 }
             }
 
             logic16();
-            IF( EQ_16( ( i & 0x1 ), 1 ) )
+            IF( EQ_16( s_and( i, 0x1 ), 1 ) )
             {
                 L_subgain[i / 2] = root_a_over_b_fx( oriNrg, shl( Q_oriSHB, 1 ), synNrg, shl( Q_synSHB, 1 ), &n );
                 move16(); /* Q(31-n) */
                 norm[i / 2] = n;
                 move16();
-                IF( GT_16( norm[i / 2], n_max ) )
+                if ( GT_16( norm[i / 2], n_max ) )
                 {
                     n_max = norm[i / 2];
                     move16();
@@ -4938,50 +5075,26 @@ static void EstimateSHBGainShape_fx(
             j = i_mult2( join_length, i );
             FOR( k = 0; k < length; k++ )
             {
-                sig = mult_r( oriSHB[j + k], subwin[k + 1] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
+                sig = mult_r( oriSHB[j + k], subwin[k + 1] );     /* Q_oriSHB */
                 oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#else
-                oriNrg = L_mac0( oriNrg, sig, sig );                                              /* 2* Q_oriSHB */
-#endif
-                sig = mult_r( synSHB[j + k], subwin[k + 1] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
+                sig = mult_r( synSHB[j + k], subwin[k + 1] );     /* Q_oriSHB */
                 synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#else
-                synNrg = L_mac0( synNrg, sig, sig );                                              /* 2* Q_oriSHB */
-#endif
             }
 
             FOR( k = 0; k < ( join_length - length ); k++ )
             {
-                sig = mult_r( oriSHB[length + j + k], 32767 ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
+                sig = mult_r( oriSHB[length + j + k], 32767 );    /* Q_oriSHB */
                 oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#else
-                oriNrg = L_mac0( oriNrg, sig, sig );                                              /* 2* Q_oriSHB */
-#endif
-                sig = mult_r( synSHB[length + j + k], 32767 ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
+                sig = mult_r( synSHB[length + j + k], 32767 );    /* Q_oriSHB */
                 synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#else
-                synNrg = L_mac0( synNrg, sig, sig );                                              /* 2* Q_oriSHB */
-#endif
             }
 
             FOR( k = 0; k < length; k++ )
             {
                 sig = mult_r( oriSHB[j + join_length + k], subwin[length - k - 1] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
-                oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#else
-                oriNrg = L_mac0( oriNrg, sig, sig );                                              /* 2* Q_oriSHB */
-#endif
+                oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow );                    /* 2* Q_oriSHB */
                 sig = mult_r( synSHB[j + join_length + k], subwin[length - k - 1] ); /* Q_oriSHB */
-#ifdef BASOP_NOGLOB
-                synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#else
-                synNrg = L_mac0( synNrg, sig, sig );                                              /* 2* Q_oriSHB */
-#endif
+                synNrg = L_mac0_o( synNrg, sig, sig, &Overflow );                    /* 2* Q_oriSHB */
             }
             /* Only implemented in SWB because the length of samples in SWB frame is longer, more likely to saturate */
             scaling = 0;
@@ -5000,29 +5113,17 @@ static void EstimateSHBGainShape_fx(
                 FOR( k = 0; k < length; k++ )
                 {
                     sig = mult_r( oriSHB[j + k], subwin[k + 1] );
-#ifdef BASOP_NOGLOB
                     oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB - 2*/
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );                                          /* 2*Q_oriSHB - 2*/
-#endif
                 }
                 FOR( k = 0; k < ( join_length - length ); k++ )
                 {
                     sig = shr( oriSHB[length + j + k], 1 );
-#ifdef BASOP_NOGLOB
                     oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB - 2*/
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );                                          /* 2*Q_oriSHB - 2*/
-#endif
                 }
                 FOR( k = 0; k < length; k++ )
                 {
                     sig = mult_r( shr( oriSHB[j + join_length + k], 1 ), subwin[length - k - 1] ); /* Q_oriSHB - 1(scaling) */
-#ifdef BASOP_NOGLOB
-                    oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB - 2 */
-#else
-                    oriNrg = L_mac0( oriNrg, sig, sig );                                          /* 2*Q_oriSHB - 2 */
-#endif
+                    oriNrg = L_mac0_sat( oriNrg, sig, sig );                                       /* 2*Q_oriSHB - 2 */
                 }
             }
             L_subgain[i] = root_a_over_b_fx( oriNrg, shl( Q_oriSHB, 1 ), synNrg, shl( Q_synSHB, 1 ), &n );
@@ -5030,7 +5131,7 @@ static void EstimateSHBGainShape_fx(
             n = sub( n, scaling );
             norm[i] = n;
             move16();
-            IF( GT_16( norm[i], n_max ) )
+            if ( GT_16( norm[i], n_max ) )
             {
                 n_max = norm[i];
                 move16();
@@ -5040,13 +5141,8 @@ static void EstimateSHBGainShape_fx(
 
     FOR( i = 0; i < num_gains; i++ )
     {
-#ifdef BASOP_NOGLOB
         subgain[i] = round_fx_o( L_shl_o( L_subgain[i], sub( norm[i], n_max + 1 ), &Overflow ), &Overflow ); /* Q(14-n_max) */
         L_sum_gain = L_mac0_o( L_sum_gain, subgain[i], subgain[i], &Overflow );                              /* Q(28-2*n_max) */
-#else
-        subgain[i] = round_fx( L_shl( L_subgain[i], sub( norm[i], n_max + 1 ) ) );                /* Q(14-n_max) */
-        L_sum_gain = L_mac0( L_sum_gain, subgain[i], subgain[i] );                                /* Q(28-2*n_max) */
-#endif
         move16();
     }
 
@@ -5058,12 +5154,8 @@ static void EstimateSHBGainShape_fx(
 
     FOR( i = 0; i < num_gains; i++ )
     {
-        L_tmp = Mpy_32_16_1( normFact, subgain[i] ); /*Q(31-n) * Q(31-norm[i])      */ /* Q(30-n-n_max) */
-#ifdef BASOP_NOGLOB
+        L_tmp = Mpy_32_16_1( normFact, subgain[i] ); /*Q(31-n) * Q(31-norm[i])      */                                      /* Q(30-n-n_max) */
         subgain[i] = s_max( round_fx_o( L_shl_o( L_tmp, add( n, n_max + 1 ), &Overflow ), &Overflow ), 3277 /*0.1f Q15*/ ); /* Q15 */
-#else
-        subgain[i] = s_max( round_fx( L_shl( L_tmp, add( n, n_max + 1 ) ) ), 3277 /*0.1f Q15*/ ); /* Q15 */
-#endif
         move16();
     }
 
@@ -5232,12 +5324,13 @@ static void QuantizeSHBsubgains_fx(
                 exp = sub( -1, exp );
                 L_tmp = Mpy_32_16( exp, frac, 24660 );                            /* Q13 ; 20.0 * log10(2) in Q12*/
                 subgains[i + NUM_SHB_SUBFR / 4] = round_fx( L_shl( L_tmp, 11 ) ); /* Q8 */
+                move16();
             }
         }
         idxSubGain = closest_centroid_lc_fx( subgains + NUM_SHB_SUBFR / 4, HBCB_SubGain5bit_fx, 1 << NUM_BITS_SHB_SUBGAINS );
         Copy( HBCB_SubGain5bit_fx + idxSubGain * NUM_SHB_SUBFR / 4, subgains, NUM_SHB_SUBFR / 4 );
 
-        push_indice_fx( hBstr, IND_SHB_SUBGAIN, idxSubGain, NUM_BITS_SHB_SUBGAINS );
+        push_indice( hBstr, IND_SHB_SUBGAIN, idxSubGain, NUM_BITS_SHB_SUBGAINS );
 
         FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
         {
@@ -5245,10 +5338,11 @@ static void QuantizeSHBsubgains_fx(
             L_tmp = L_shr( L_tmp, 10 );           /* From Q26 to Q16 */
             frac = L_Extract_lc( L_tmp, &exp );
             subgains[i] = extract_l( Pow2( 14, frac ) );
+            move16();
             /* Put 14 as exponent so that */
             /* output of Pow2() will be: */
             /* 16384 < Pow2() <= 32767 */
-            subgains[i] = shl( subgains[i], exp + 1 );
+            subgains[i] = shl( subgains[i], add( exp, 1 ) );
             move16(); /*Q15 */
         }
 
@@ -5277,6 +5371,7 @@ static void QuantizeSHBsubgains_fx(
 
                 L_tmp = Mpy_32_16( exp, frac, 9864 );         /*move32(); // Q16 ; log10(2) in Q15 */
                 subgains[i] = round_fx( L_shl( L_tmp, 12 ) ); /*Q12 */
+                move16();
             }
         }
 
@@ -5288,10 +5383,11 @@ static void QuantizeSHBsubgains_fx(
             L_tmp = L_shr( L_tmp, 10 );           /* From Q26 to Q16 */
             frac = L_Extract_lc( L_tmp, &exp );
             subgains[i] = extract_l( Pow2( 14, frac ) );
+            move16();
             /* Put 14 as exponent so that */
             /* output of Pow2() will be: */
             /* 16384 < Pow2() <= 32767 */
-            subgains[i] = shl( subgains[i], exp + 1 );
+            subgains[i] = shl( subgains[i], add( exp, 1 ) );
             move16(); /*Q15 */
         }
 
@@ -5305,7 +5401,7 @@ static void QuantizeSHBsubgains_fx(
         move16();
         IF( NE_16( st_fx->codec_mode, MODE2 ) )
         {
-            push_indice_fx( hBstr, IND_SHB_SUBGAIN, idxSubGain, NUM_BITS_SHB_SUBGAINS );
+            push_indice( hBstr, IND_SHB_SUBGAIN, idxSubGain, NUM_BITS_SHB_SUBGAINS );
         }
     }
 
@@ -5381,7 +5477,7 @@ static void QuantizeSHBsubgains_ivas_fx(
             /* Put 14 as exponent so that */
             /* output of Pow2() will be: */
             /* 16384 < Pow2() <= 32767 */
-            subgains[i] = shl( subgains[i], exp + 1 );
+            subgains[i] = shl( subgains[i], add( exp, 1 ) );
             move16(); /*Q15 */
         }
 
@@ -5426,7 +5522,7 @@ static void QuantizeSHBsubgains_ivas_fx(
             /* Put 14 as exponent so that */
             /* output of Pow2() will be: */
             /* 16384 < Pow2() <= 32767 */
-            subgains[i] = shl( subgains[i], exp + 1 );
+            subgains[i] = shl( subgains[i], add( exp, 1 ) );
             move16(); /*Q15 */
         }
 
@@ -5472,6 +5568,7 @@ static void Quant_shb_ener_sf_fx(
 
     /* shb_ener_sf_fx[0] = log10(0.003125*shb_ener_sf[0:319]); */
     sum = *shb_ener_sf_Q31; /* L_tmp in Q_ener = (2*Q_shb+1) */
+    move32();
 
     exp = norm_l( sum );
     frac = Log2_norm_lc( L_shl( sum, exp ) );
@@ -5491,13 +5588,15 @@ static void Quant_shb_ener_sf_fx(
     L_tmp = L_shl( L_tmp, -10 );                  /* bring L_tmp from Q26 to Q16 */
     frac = L_Extract_lc( L_tmp, &exp );           /* Extract exponent */
     L_tmp = Pow2( 14, frac );
-    *shb_ener_sf_Q31 = L_shl( L_tmp, exp - 14 + Q_ener ); /* In Q_ener */
+    // *shb_ener_sf_Q31 = L_shl( L_tmp, exp - 14 + Q_ener );       /* In Q_ener */
+    *shb_ener_sf_Q31 = L_shl( L_tmp, add( sub( exp, 14 ), Q_ener ) ); /* In Q_ener */
+    move32();
 
     hBWE_TD->idx_shb_fr_gain = idxSubEner_fx;
     move16();
     IF( NE_16( st_fx->codec_mode, MODE2 ) )
     {
-        push_indice_fx( st_fx->hBstr, IND_SHB_ENER_SF, idxSubEner_fx, NUM_BITS_SHB_ENER_SF );
+        push_indice( st_fx->hBstr, IND_SHB_ENER_SF, idxSubEner_fx, NUM_BITS_SHB_ENER_SF );
     }
     return;
 }
@@ -5535,7 +5634,7 @@ static void Quant_shb_ener_sf_ivas_fx(
 
     temp_shb_ener_sf_fx = 0;
     move16();
-    idxSubEner_fx = usquant_fx( tmp, &temp_shb_ener_sf_fx, 0, 43, shl( 1, NUM_BITS_SHB_ENER_SF ) ); /* 43 = 0.042f in Q10 = Qin-1 */
+    idxSubEner_fx = usquant_fx( tmp, &temp_shb_ener_sf_fx, 0, 43, 1 << NUM_BITS_SHB_ENER_SF ); /* 43 = 0.042f in Q10 = Qin-1 */
     /* o: temp_shb_ener_sf_fx in Q11 */
 
     /* shb_ener_sf_fx[0] = pow(10.0, temp_shb_ener_sf_fx );     */
@@ -5578,11 +5677,17 @@ static void Quant_shb_res_gshape_fx(
                                        2048 /*0.125f Q14*/, /*2048 = 0.125 in Q14 */
                                        1024 /*0.125f Q13*/, /*1024 = 0.125 in Q13 */
                                        shl( 1, NUM_BITS_SHB_RES_GS ) );
+        move16();
 
         hBWE_TD->idx_res_gs[i] = idxSubGain_fx[i];
+        move16();
         IF( NE_16( st_fx->codec_mode, MODE2 ) )
         {
-            push_indice_fx( st_fx->hBstr, IND_SHB_RES_GS1 + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
+#ifdef FIX_1486_IND_SHB_RES
+            push_indice( st_fx->hBstr, IND_SHB_RES_GS + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
+#else
+            push_indice( st_fx->hBstr, IND_SHB_RES_GS1 + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
+#endif
         }
     }
 }
@@ -5611,14 +5716,18 @@ static void Quant_shb_res_gshape_ivas_fx(
                                        shl( 1, NUM_BITS_SHB_RES_GS ) );
         move16();
 
-        IF( st->codec_mode == MODE2 )
+        IF( EQ_16( st->codec_mode, MODE2 ) )
         {
             hBWE_TD->idx_res_gs[i] = idxSubGain_fx[i];
             move16();
         }
         ELSE
         {
+#ifdef FIX_1486_IND_SHB_RES
+            push_indice( st->hBstr, IND_SHB_RES_GS + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
+#else
             push_indice( st->hBstr, IND_SHB_RES_GS1 + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
+#endif
         }
     }
 }
@@ -5655,6 +5764,7 @@ static void QuantizeSHBframegain_fx(
     Word16 idxFrameGain;
     Word32 Q_GainFrame;
     Word16 Unit_weights1 = 1;
+    move16();
     Word16 exp, frac, tmp;
     Word32 L_tmp;
     Word32 GainFrameLog;
@@ -5685,7 +5795,7 @@ static void QuantizeSHBframegain_fx(
                                       1 << NUM_BITS_SHB_FrameGain, &idxFrameGain, &Q_GainFrame,
                                       SHBCB_FrameGain64_fx );
 
-            push_indice_fx( st_fx->hBstr, IND_SHB_FRAMEGAIN, idxFrameGain, NUM_BITS_SHB_FrameGain );
+            push_indice( st_fx->hBstr, IND_SHB_FRAMEGAIN, idxFrameGain, NUM_BITS_SHB_FrameGain );
             *rf_gainFrame_ind = idxFrameGain;
             move16(); /* Q18 */
         }
@@ -5701,7 +5811,8 @@ static void QuantizeSHBframegain_fx(
         {
             exp = norm_l( *GainFrame );
             frac = Log2_norm_lc( L_shl( *GainFrame, exp ) );
-            exp = ( 30 - exp - 18 );
+            // exp = ( 30 - exp - 18 );
+            exp = sub( 30 - 18, exp );
             GainFrameLog = Mpy_32_16( exp, frac, 9864 );
             /*GainFrameLog= round_fx(L_shl(L_tmp,12)); //Q12 */
         }
@@ -5712,7 +5823,8 @@ static void QuantizeSHBframegain_fx(
         idxFrameGain = extract_l( L_shr( L_add( L_tmp, shl( 1, sub( 14, exp ) ) ), sub( 15, exp ) ) ); /*Q0*/
         IF( GT_16( idxFrameGain, ( 1 << NUM_BITS_SHB_FRAMEGAIN ) - 1 ) )
         {
-            idxFrameGain = sub( ( 1 << NUM_BITS_SHB_FRAMEGAIN ), 1 );
+            idxFrameGain = ( 1 << NUM_BITS_SHB_FRAMEGAIN ) - 1;
+            move16();
         }
         ELSE
         {
@@ -5726,9 +5838,11 @@ static void QuantizeSHBframegain_fx(
         L_tmp = SHB_GAIN_QLOW_FX_16;
         Q_GainFrame = L_mac( L_tmp, idxFrameGain, SHB_GAIN_QDELTA_FX_15 );
 
+        test();
         WHILE( GT_32( Q_GainFrame, L_add( GainFrameLog, 4866 ) ) &&
                idxFrameGain != 0 )
         {
+            test();
             idxFrameGain = sub( idxFrameGain, 1 );
             Q_GainFrame = L_mac0( SHB_GAIN_QLOW_FX_16, idxFrameGain, SHB_GAIN_QDELTA_FX_16 );
         }
@@ -5740,21 +5854,23 @@ static void QuantizeSHBframegain_fx(
         frac = L_Extract_lc( L_tmp, &exp );
         Q_GainFrame = Pow2( 30, frac );
         exp = sub( exp, 30 );
-        Q_GainFrame = L_shl( Q_GainFrame, exp + 18 ); /* Q18 */
+        Q_GainFrame = L_shl( Q_GainFrame, add( exp, 18 ) ); /* Q18 */
 
         hBWE_TD->idxFrameGain = idxFrameGain;
         move16();
         IF( NE_16( st_fx->codec_mode, MODE2 ) )
         {
-            push_indice_fx( st_fx->hBstr, IND_SHB_FRAMEGAIN, idxFrameGain, NUM_BITS_SHB_FRAMEGAIN );
+            push_indice( st_fx->hBstr, IND_SHB_FRAMEGAIN, idxFrameGain, NUM_BITS_SHB_FRAMEGAIN );
         }
         *rf_gainFrame_ind = idxFrameGain;
+        move16();
     }
 
     IF( EQ_16( st_fx->rf_mode, 1 ) ){
         /*Currently intended for SWB only. Modify for WB is needed later!*/
         IF( EQ_16( hRF->rf_frame_type, RF_NELP ) ){
                 *rf_gainFrame_ind = idxFrameGain; /* NELP Frame uses full 5 bits */
+    move16();
 }
 ELSE /*RF_ALLPRED, RF_GENPRED, RF_NOPRED modes*/
 {
@@ -5774,6 +5890,7 @@ ELSE /*RF_ALLPRED, RF_GENPRED, RF_NOPRED modes*/
     {
         *rf_gainFrame_ind = 3;
     }
+    move16();
 }
 }
 
@@ -5834,7 +5951,7 @@ static void QuantizeSHBframegain_ivas_fx(
                                       1 << NUM_BITS_SHB_FrameGain_LBR_WB, &idxFrameGain,
                                       &Q_GainFrame, SHBCB_FrameGain16_fx );
             test();
-            IF( GT_32( Q_GainFrame, L_shl( Mult_32_16( *GainFrame, 17367 ), 1 ) ) && idxFrameGain > 0 ) /* 1.06 = +0.5 dB */
+            IF( GT_64( W_deposit32_l( Q_GainFrame ), W_shl( W_mult_32_16( *GainFrame, 17367 ), 15 ) ) && idxFrameGain > 0 ) /* 1.06 = +0.5 dB */
             {
                 idxFrameGain--;
                 Q_GainFrame = L_add( SHBCB_FrameGain16_fx[idxFrameGain], 0 ); /* Q18 */
@@ -5882,7 +5999,7 @@ static void QuantizeSHBframegain_ivas_fx(
         {
             exp = norm_l( *GainFrame );
             frac = Log2_norm_lc( L_shl( *GainFrame, exp ) );
-            exp = ( 30 - exp - 18 );
+            exp = sub( 30 - 18, exp );
             GainFrameLog = Mpy_32_16( exp, frac, 9864 );
             /*GainFrameLog= round_fx(L_shl(L_tmp,12)); //Q12 */
         }
@@ -5936,10 +6053,11 @@ static void QuantizeSHBframegain_ivas_fx(
             Q_GainFrame = L_mac( L_tmp, idxFrameGain, SHB_GAIN_QDELTA_FX_15 );
         }
 
-
+        test();
         WHILE( GT_32( Q_GainFrame, L_add( GainFrameLog, 4866 ) ) &&
                idxFrameGain != 0 )
         {
+            test();
             idxFrameGain = sub( idxFrameGain, 1 );
             Q_GainFrame = L_mac0( SHB_GAIN_QLOW_FX_16, idxFrameGain, SHB_GAIN_QDELTA_FX_16 );
         }
@@ -5960,7 +6078,7 @@ static void QuantizeSHBframegain_ivas_fx(
         frac = L_Extract_lc( L_tmp, &exp );
         Q_GainFrame = Pow2( 30, frac );
         exp = sub( exp, 30 );
-        Q_GainFrame = L_shl( Q_GainFrame, exp + 18 ); /* Q18 */
+        Q_GainFrame = L_shl( Q_GainFrame, add( exp, 18 ) ); /* Q18 */
 
         IF( EQ_16( st_fx->codec_mode, MODE2 ) )
         {
@@ -6052,6 +6170,7 @@ static void determine_gain_weights_fx(
     Word32 L_tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
 
     FOR( j = 0; j < dims; j++ )
@@ -6062,22 +6181,18 @@ static void determine_gain_weights_fx(
             exp1 = norm_l( gain[j] );
             frac = Log2_norm_lc( L_shl( gain[j], exp1 ) );
             move16();
-            exp = 30 - exp1 - 18;
+            exp = sub( 30 - 18, exp1 );
             move16();
             L_tmp = Mpy_32_16( exp, frac, -29491 ); /* Q16 */
             frac = L_Extract_lc( L_tmp, &exp );
             tmp = extract_l( Pow2( 14, frac ) ); /* Q14 */
 
             exp2 = sub( exp, 8 );
-            if ( LE_16( exp1, 21 ) )
+            IF( LE_16( exp1, 21 ) )
             {
                 exp2 = sub( exp, 2 );
             }
-#ifdef BASOP_NOGLOB
             weights[j] = shl_o( tmp, exp2, &Overflow );
-#else
-            weights[j] = shl( tmp, exp2 );
-#endif
             move16(); /* Q12 */
         }
         ELSE
@@ -6353,7 +6468,7 @@ static Word16 Find_LSF_grid_fx(
         exp = norm_s( m );
         tmp = div_s( shl( 1, sub( 14, exp ) ), m );
         L_tmp = L_mult( sub( MAX_LSF_FX, m ), tmp );
-        scale = round_fx( L_shl( L_tmp, exp + 1 ) );
+        scale = round_fx( L_shl( L_tmp, add( exp, 1 ) ) );
 
         FOR( i = 0; i < NUM_MAP_LSF; i++ )
         {
@@ -6498,6 +6613,7 @@ static void gainFrSmooth_En_fx( Encoder_State *st_fx,
     tempQ31 = L_mac( tempQ31, hBWE_TD->lsp_shb_spacing_fx[1], 6553 ); /* 0.2f */
     tempQ31 = L_mac( tempQ31, hBWE_TD->lsp_shb_spacing_fx[2], 9830 ); /* 0.3f */
     *MA_lsp_shb_spacing = mac_r( tempQ31, lsp_spacing, 13107 );       /* 0.4f */
+    move16();
 
     hBWE_TD->lsp_shb_spacing_fx[0] = hBWE_TD->lsp_shb_spacing_fx[1];
     move16();
@@ -6525,7 +6641,7 @@ static void gainFrSmooth_En_fx( Encoder_State *st_fx,
         }
 
         test();
-        IF( LT_32( lsp_slow_evol_rate, 2147484l /*0.001f Q31*/ ) && LT_32( lsp_fast_evol_rate, 2147484l /*0.001f Q31*/ ) )
+        if ( LT_32( lsp_slow_evol_rate, 2147484l /*0.001f Q31*/ ) && LT_32( lsp_fast_evol_rate, 2147484l /*0.001f Q31*/ ) )
         {
             *frGainSmoothEn = 1;
             move16();
@@ -6624,6 +6740,7 @@ static void gainFrSmooth_En_ivas_fx( Encoder_State *st_fx,
     tempQ31 = L_mac( tempQ31, hBWE_TD->lsp_shb_spacing_fx[1], 6553 ); /* 0.2f in Q15 */
     tempQ31 = L_mac( tempQ31, hBWE_TD->lsp_shb_spacing_fx[2], 9830 ); /* 0.3f in Q15 */
     *MA_lsp_shb_spacing = mac_r( tempQ31, lsp_spacing, 13107 );       /* 0.4f in Q15 */
+    move16();
 
     hBWE_TD->lsp_shb_spacing_fx[0] = hBWE_TD->lsp_shb_spacing_fx[1];
     move16();
@@ -6651,7 +6768,7 @@ static void gainFrSmooth_En_ivas_fx( Encoder_State *st_fx,
         }
 
         test();
-        IF( ( BASOP_Util_Cmp_Mant32Exp( lsp_slow_evol_rate, lsp_slow_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) && ( BASOP_Util_Cmp_Mant32Exp( lsp_fast_evol_rate, lsp_fast_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) )
+        if ( ( BASOP_Util_Cmp_Mant32Exp( lsp_slow_evol_rate, lsp_slow_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) && ( BASOP_Util_Cmp_Mant32Exp( lsp_fast_evol_rate, lsp_fast_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) )
         {
             *frGainSmoothEn = 1;
             move16();
@@ -6708,11 +6825,7 @@ static void first_VQstages_fx(
     L_tmp = L_deposit_l( 0 );
     FOR( j = 0; j < N; j++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp1 = L_shl_o( L_mult0( u[j], w[j] ), 7, &Overflow ); /*x2.56 + Q8 + Q7 */
-#else                                                            /* BASOP_NOGLOB */
-        L_tmp1 = L_shl( L_mult0( u[j], w[j] ), 7 );                                                                                        /*x2.56 + Q8 + Q7 */
-#endif                                                           /* BASOP_NOGLOB */
         L_tmp1 = Mult_32_16( L_tmp1, u[j] );                     /*x2.56 + Q15 + x2.56 -Q15 */
         L_tmp = L_add( L_tmp, L_tmp1 );                          /*Q0 + x2.56 +x2.56 */
     }
@@ -6720,7 +6833,6 @@ static void first_VQstages_fx(
 
     /* Set up initial error (residual) vectors */
     pTmp = resid[1];
-    move16();
     FOR( c = 0; c < maxC; c++ )
     {
         Copy( u, pTmp, N );
@@ -6745,21 +6857,15 @@ static void first_VQstages_fx(
         /* swap pointers to parent and current nodes */
         pTmp_short = indices[0];
         indices[0] = indices[1];
-        move16();
         indices[1] = pTmp_short;
-        move16();
 
         pTmp = resid[0];
         resid[0] = resid[1];
-        move16();
         resid[1] = pTmp;
-        move16();
 
         pTmp32 = dist[0];
         dist[0] = dist[1];
-        move32();
         dist[1] = pTmp32;
-        move32();
 
         /* p_max points to maximum distortion node (worst of best) */
         p_max = 0;
@@ -6790,7 +6896,6 @@ static void first_VQstages_fx(
             FOR( c = 0; c < m; c++ )
             {
                 pTmp = &resid[0][c * N];
-                move16();
                 L_tmp = L_mult( pTmp[0], Tmp[0] );
                 FOR( c2 = 1; c2 < N; c2++ )
                 {
@@ -6837,7 +6942,7 @@ static void first_VQstages_fx(
         {
             /* subtract codebook entry from the residual vector of the parent node */
             pTmp = resid[1] + c * N;
-            move16();
+
             Copy( resid[0] + parents[c] * N, pTmp, N );
             Vr_subt( pTmp, cb_stage + ( indices[1][cs + s] ) * N, pTmp, N );
 
@@ -6910,15 +7015,11 @@ static void LVQQuant_BWE_LSF_fx(
     empty_bits = 0; /* This is the difference to 21 bits, if we want lower number of bits */
     move16();
     nbits = sub( nbits, empty_bits ); /* THIS IS TO SIMULATE DIFFERENT NUMBER OF input BITS - should be removed */
-    move16();
     c2 = sub( NUM_BITS_SHB_MSLVQ, nbits );
-    move16();
     numbits_VQ = config_LSF_BWE[c2 * 3];
-    move16();
     levels[0] = config_LSF_BWE[c2 * 3 + 1];
     move16();
     predictor_bits = config_LSF_BWE[c2 * 3 + 2];
-    move16();
     IF( LT_16( nbits, 19 ) )
     {
         cb_stage_fx = cb_LSF_BWE_fx[1];
@@ -7083,7 +7184,7 @@ static void Quant_BWE_LSF_fx(
         move16();
         IF( NE_16( st_fx->codec_mode, MODE2 ) )
         {
-            push_indice_fx( hBstr, IND_SHB_LSF, lsf_idx[i], lsf_q_num_bits[i] );
+            push_indice( hBstr, IND_SHB_LSF, lsf_idx[i], lsf_q_num_bits[i] );
         }
     }
 
@@ -7093,7 +7194,7 @@ static void Quant_BWE_LSF_fx(
     move16();
     IF( NE_16( st_fx->codec_mode, MODE2 ) )
     {
-        push_indice_fx( hBstr, IND_SHB_MIRROR, m_idx, MIRROR_POINT_BITS );
+        push_indice( hBstr, IND_SHB_MIRROR, m_idx, MIRROR_POINT_BITS );
     }
 
     grid_idx = Find_LSF_grid_fx( lsf, lsf_q, m );
@@ -7101,7 +7202,7 @@ static void Quant_BWE_LSF_fx(
     hBWE_TD->grid_idx = grid_idx;
     IF( NE_16( st_fx->codec_mode, MODE2 ) )
     {
-        push_indice_fx( hBstr, IND_SHB_GRID, grid_idx, NUM_LSF_GRID_BITS );
+        push_indice( hBstr, IND_SHB_GRID, grid_idx, NUM_LSF_GRID_BITS );
     }
 
     FOR( i = 0; i < LPC_SHB_ORDER; i++ )
@@ -7206,7 +7307,12 @@ void fb_tbe_enc_fx(
     Word16 ratio;
     Word16 tmp_vec[L_FRAME48k];
     Word16 idxGain;
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    Word16 input_fhb_buffer[L_FRAME48k + 4];
+    Word16 *input_fhb = &input_fhb_buffer[0] + 4;
+#else
     Word16 input_fhb[L_FRAME48k];
+#endif
     Word16 Sample_Delay_HP;
     Word32 fb_exc_energy, temp2;
     Word32 L_tmp;
@@ -7215,6 +7321,7 @@ void fb_tbe_enc_fx(
     TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move16();
 #endif
     s_max_value = 0;
     FOR( i = 0; i < L_FRAME48k; i++ )
@@ -7225,12 +7332,22 @@ void fb_tbe_enc_fx(
     if ( s_max_value == 0 )
     {
         exp_temp = 15;
+        move16();
     }
     exp_temp = sub( exp_temp, 1 );
 
     Copy_Scale_sig( new_input, input_fhb, L_FRAME48k, exp_temp );
 
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+        st->element_mode,
+#endif     /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+        0, // IsUpsampled3
+        input_fhb, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
+#else
     elliptic_bpf_48k_generic_fx( input_fhb, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
+#endif
     Sample_Delay_HP = NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) - L_FRAME48k / 2;
 
     IF( NE_16( st->last_extl, FB_TBE ) )
@@ -7245,13 +7362,9 @@ void fb_tbe_enc_fx(
     Copy( hBWE_TD->old_input_fhb_fx, input_fhb, Sample_Delay_HP );
     Copy( tmp_vec, input_fhb + Sample_Delay_HP, L_FRAME48k - Sample_Delay_HP );
     Copy( tmp_vec + L_FRAME48k - Sample_Delay_HP, hBWE_TD->old_input_fhb_fx, Sample_Delay_HP );
-    temp2 = sum2_fx_mod( input_fhb, L_FRAME48k / 2 ); /* Q11 */
-#ifdef BASOP_NOGLOB
+    temp2 = sum2_fx_mod( input_fhb, L_FRAME48k / 2 );                                                                                                                /* Q11 */
     temp2 = L_add_o( temp2, L_shl_o( hBWE_TD->prev_fb_energy_fx, sub( sub( add( exp_temp, exp_temp ), 6 ), hBWE_TD->prev_fb_energy_fx_Q ), &Overflow ), &Overflow ); /* Q11 */
-#else
-    temp2 = L_add( temp2, L_shl( hBWE_TD->prev_fb_energy_fx, sub( sub( add( exp_temp, exp_temp ), 6 ), hBWE_TD->prev_fb_energy_fx_Q ) ) ); /* Q11 */
-#endif
-    hBWE_TD->prev_fb_energy_fx = sum2_fx_mod( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 ); /*Q11*/
+    hBWE_TD->prev_fb_energy_fx = sum2_fx_mod( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 );                                                                          /*Q11*/
     hBWE_TD->prev_fb_energy_fx_Q = sub( add( exp_temp, exp_temp ), 6 );
     fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k ); /* Q(2*Q_fb_exc+1 -7) */
 
@@ -7276,12 +7389,8 @@ void fb_tbe_enc_fx(
     {
         tmp = div_s( tmp2, tmp );
         L_tmp = L_deposit_h( tmp );
-        L_tmp = Isqrt_lc( L_tmp, &exp ); /*Q(31-exp)*/
-#ifdef BASOP_NOGLOB
+        L_tmp = Isqrt_lc( L_tmp, &exp );                                   /*Q(31-exp)*/
         L_tmp = L_max( L_shr_o( L_tmp, sub( 31, exp ), &Overflow ), 0x1 ); /* Q0 */
-#else
-        L_tmp = L_max( L_shr( L_tmp, sub( 31, exp ) ), 0x1 );                                                                              /* Q0 */
-#endif
     }
     ELSE
     {
@@ -7291,9 +7400,11 @@ void fb_tbe_enc_fx(
     /* idxGain = (short)( log2_f ((float)ratio) + 0.5f );
        idxGain = max( 0, min(15,idxGain) ); */
     ratio = 0;
+    move16();
     IF( GE_32( L_tmp, 32768 ) )
     {
         idxGain = 15;
+        move16();
     }
     ELSE
     {
@@ -7302,6 +7413,9 @@ void fb_tbe_enc_fx(
         idxGain = sub( 14, exp_norm );
         idxGain = s_max( 0, idxGain );
     }
+
+    test();
+    test();
     IF( GT_16( idxGain, 2 ) && LT_16( idxGain, 15 ) && GT_16( ratio, add( shl( 2, sub( idxGain, 1 ) ), shl( 2, sub( idxGain, 2 ) ) ) ) )
     {
         idxGain = add( idxGain, 1 );
@@ -7311,10 +7425,11 @@ void fb_tbe_enc_fx(
     IF( st->codec_mode == MODE2 )
     {
         hBWE_TD->idxGain = idxGain;
+        move16();
     }
     ELSE
     {
-        push_indice_fx( st->hBstr, IND_FB_SLOPE, idxGain, 4 );
+        push_indice( st->hBstr, IND_FB_SLOPE, idxGain, 4 );
     }
 
     return;
@@ -7322,25 +7437,29 @@ void fb_tbe_enc_fx(
 
 void fb_tbe_enc_ivas_fx(
     Encoder_State *st,        /* i/o: encoder state structure                 */
-    const Word16 new_input[], /* i  : input speech at 48 kHz sample rate     Q0 */
+    const Word16 new_input[], /* i  : input speech at 48 kHz sample rate     Q_new_input */
     const Word16 fb_exc[],    /* i  : FB excitation from the SWB part        Q_fb_exc */
-    Word16 Q_fb_exc )
+    Word16 Q_fb_exc,
+    Word16 Q_new_input )
 {
     Word16 ratio;
     Word16 tmp_vec[L_FRAME48k];
     Word16 idxGain;
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+    Word16 input_fhb_new_buffer[L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) + 4];
+    Word16 *input_fhb_new = &input_fhb_new_buffer[0] + 4;
+#else
     Word16 input_fhb_new[L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS )];
+#endif
     Word16 input_fhb[L_FRAME48k];
     Word16 Sample_Delay_HP;
-    Word32 fb_exc_energy, temp2;
-    Word32 L_tmp;
-    Word16 tmp, tmp1, tmp2, exp, exp2, exp_norm;
+    Word64 fb_exc_energy;
+    Word16 tmp, tmp2, exp, exp2;
     Word16 s_max_value, exp_temp, i;
     TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-    Flag Overflow = 0;
-    move32();
-#endif
+    Word16 q_diff, q_input_fhb;
+    Word64 temp1, temp2;
+
     s_max_value = 0;
     move16();
     FOR( i = 0; i < L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ); i++ )
@@ -7355,14 +7474,32 @@ void fb_tbe_enc_ivas_fx(
     }
 
     Copy_Scale_sig( new_input - NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), input_fhb_new, L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), exp_temp );
-
+    exp_temp = add( exp_temp, Q_new_input );
     IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
     {
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+        elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+            st->element_mode,
+#endif         /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+            0, // IsUpsampled3
+            input_fhb_new, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
+#else
         elliptic_bpf_48k_generic_fx( input_fhb_new, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
+#endif
     }
     ELSE
     {
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
+        elliptic_bpf_48k_generic_fx(
+#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
+            st->element_mode,
+#endif         /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/
+            0, // IsUpsampled3
+            input_fhb_new + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
+#else
         elliptic_bpf_48k_generic_fx( input_fhb_new + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
+#endif
     }
 
     test();
@@ -7372,18 +7509,15 @@ void fb_tbe_enc_ivas_fx(
         IF( EQ_16( st->L_frame, L_FRAME ) )
         {
             Sample_Delay_HP = NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS ) - L_FRAME48k / 2;
-            move16();
         }
         ELSE
         {
             Sample_Delay_HP = NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_16k_NS ) - L_FRAME48k / 2;
-            move16();
         }
     }
     ELSE
     {
         Sample_Delay_HP = NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) - L_FRAME48k / 2;
-        move16();
     }
 
     IF( NE_16( st->last_extl, FB_TBE ) )
@@ -7393,79 +7527,72 @@ void fb_tbe_enc_ivas_fx(
         move16();
         set16_fx( tmp_vec, 0, L_FRAME16k );
     }
-    Copy_Scale_sig( hBWE_TD->old_input_fhb_fx, hBWE_TD->old_input_fhb_fx, Sample_Delay_HP, sub( exp_temp, hBWE_TD->old_input_fhb_fx_Q ) );
+
+    q_diff = sub( exp_temp, hBWE_TD->old_input_fhb_fx_Q );
+    Copy( hBWE_TD->old_input_fhb_fx, input_fhb, Sample_Delay_HP );                    // hBWE_TD->old_input_fhb_fx_Q
+    Copy( tmp_vec, input_fhb + Sample_Delay_HP, sub( L_FRAME48k, Sample_Delay_HP ) ); // exp_temp
+    IF( q_diff > 0 )
+    {
+        scale_sig( input_fhb + Sample_Delay_HP, sub( L_FRAME48k, Sample_Delay_HP ), negate( q_diff ) ); // hBWE_TD->old_input_fhb_fx_Q
+        q_input_fhb = hBWE_TD->old_input_fhb_fx_Q;
+        move16();
+    }
+    ELSE
+    {
+        scale_sig( input_fhb, Sample_Delay_HP, q_diff ); // exp_temp
+        q_input_fhb = exp_temp;
+        move16();
+    }
+    Copy( tmp_vec + L_FRAME48k - Sample_Delay_HP, hBWE_TD->old_input_fhb_fx, Sample_Delay_HP );
     hBWE_TD->old_input_fhb_fx_Q = exp_temp;
     move16();
-    Copy( hBWE_TD->old_input_fhb_fx, input_fhb, Sample_Delay_HP );
-    Copy( tmp_vec, input_fhb + Sample_Delay_HP, sub( L_FRAME48k, Sample_Delay_HP ) );
-    Copy( tmp_vec + L_FRAME48k - Sample_Delay_HP, hBWE_TD->old_input_fhb_fx, Sample_Delay_HP );
-    temp2 = sum2_fx_mod( input_fhb, L_FRAME48k / 2 ); /* Q(2*Q_input_fhb-8) */
-#ifdef BASOP_NOGLOB
-    temp2 = L_add_o( temp2, L_shl_o( hBWE_TD->prev_fb_energy_fx, sub( sub( add( exp_temp, exp_temp ), 8 ), hBWE_TD->prev_fb_energy_fx_Q ), &Overflow ), &Overflow ); /* Q(2*(exp_temp)-8) */
-#else
-    temp2 = L_add( temp2, L_shl( hBWE_TD->prev_fb_energy_fx, sub( sub( add( exp_temp, exp_temp ), 8 ), hBWE_TD->prev_fb_energy_fx_Q ) ) ); /* Q(2*(exp_temp)-8) */
-#endif
-    hBWE_TD->prev_fb_energy_fx = sum2_fx_mod( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 ); /*Q(2*(Q_input_fhb)-8) */
+
+    temp2 = sum2_fx_no_sat( input_fhb, L_FRAME48k / 2 );                                                           // 2*q_input_fhb                                                                                                               /* Q(2*Q_input_fhb-8) */
+    temp2 = W_add( temp2, W_shl( hBWE_TD->prev_fb_energy_fx, sub( q_input_fhb, hBWE_TD->prev_fb_energy_fx_Q ) ) ); // 2*q_input_fhb
+
+    temp1 = sum2_fx_no_sat( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 ); // 2*q_input_fhb
+    exp = W_norm( temp1 );
+    temp1 = W_shl( temp1, exp );                       // 2*q_input_fhb+exp
+    hBWE_TD->prev_fb_energy_fx = W_extract_h( temp1 ); // 2*q_input_fhb+exp-32
     move32();
-    hBWE_TD->prev_fb_energy_fx_Q = sub( add( exp_temp, exp_temp ), 8 );
+    hBWE_TD->prev_fb_energy_fx_Q = sub( add( shl( q_input_fhb, 1 ), exp ), 32 );
     move16();
-    fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k ); /* Q(2*Q_fb_exc-8) */
 
-    /*ratio = (float) sqrt( temp2 / fb_exc_energy );*/
-    L_tmp = L_max( 1, temp2 ); /*Q(2*(exp_temp)-8)*/
-    exp = norm_l( L_tmp );
-    tmp = extract_h( L_shl( L_tmp, exp ) );
-    exp = sub( sub( 31, sub( add( exp_temp, exp_temp ), 8 ) ), exp ); /* (L_tmp in Q(2*(exp_temp)-8))*/
+    fb_exc_energy = sum2_fx_no_sat( fb_exc, L_FRAME16k ); // 2*Q_fb_exc
 
-    exp2 = norm_l( fb_exc_energy );
-    tmp2 = extract_h( L_shl( fb_exc_energy, exp2 ) );
-    tmp1 = sub( add( Q_fb_exc, Q_fb_exc ), 8 ); /*1 - 9*/
-    exp2 = sub( sub( 31, tmp1 ), exp2 );        /* (L_tmp in Q(2*(exp_temp)-8))*/
+    /*ratio = (float) sqrt( temp2 / fb_exc_energy );*/
+    exp = sub( W_norm( temp2 ), 1 );
+    tmp = extract_h( W_extract_h( W_shl( temp2, exp ) ) ); // 2*q_input_fhb+exp-48
+    exp = sub( 63, add( shl( q_input_fhb, 1 ), exp ) );    // 15-(2*q_input_fhb+exp-48)
 
-    exp = sub( exp2, exp ); /* Denormalize and substract */
-    IF( GT_16( tmp2, tmp ) )
-    {
-        tmp2 = shr( tmp2, 1 );
-        exp = add( exp, 1 );
-    }
-    IF( 0 != tmp )
-    {
-        tmp = div_s( tmp2, tmp );
-        L_tmp = L_deposit_h( tmp );
-        L_tmp = Isqrt_lc( L_tmp, &exp ); /*Q(31-exp)*/
-#ifdef BASOP_NOGLOB
-        L_tmp = L_max( L_shr_o( L_tmp, sub( 31, exp ), &Overflow ), 0x1 ); /* Q0 */
-#else
-        L_tmp = L_max( L_shr( L_tmp, sub( 31, exp ) ), 0x1 );                                                                              /* Q0 */
-#endif
-    }
-    ELSE
-    {
-        L_tmp = 0;
-        move32();
-    }
+    exp2 = W_norm( fb_exc_energy );
+    tmp2 = extract_h( W_extract_h( W_shl( fb_exc_energy, exp2 ) ) ); // 2*Q_fb_exc+exp2-48
+    exp2 = sub( 63, add( shl( Q_fb_exc, 1 ), exp2 ) );               // 15-(2*Q_fb_exc+exp2-48)
 
-    /* idxGain = (short)( log2_f ((float)ratio) + 0.5f );
-       idxGain = max( 0, min(15,idxGain) ); */
     ratio = 0;
+    idxGain = 0;
+    move16();
     move16();
-    IF( GE_32( L_tmp, 32768 ) )
-    {
-        idxGain = 15;
-        move16();
-    }
-    ELSE
-    {
-        ratio = extract_l( L_tmp );
-        exp_norm = norm_s( ratio );
-        idxGain = sub( 14, exp_norm );
-        idxGain = s_max( 0, idxGain );
-    }
-    test();
     test();
-    IF( GT_16( idxGain, 2 ) && LT_16( idxGain, 15 ) && GT_16( ratio, add( shl( 2, sub( idxGain, 1 ) ), shl( 2, sub( idxGain, 2 ) ) ) ) )
-    {
-        idxGain = add( idxGain, 1 );
+    IF( tmp != 0 && tmp2 != 0 )
+    {
+        ratio = div_s( tmp, tmp2 ); // exp: exp-exp2
+        exp = sub( exp, exp2 );
+        /*     ratio = (float) sqrt( temp2 / fb_exc_energy );
+               idxGain = (short)( log2_f ((float)ratio) + 0.5f );
+
+              => idxGain = (short)( log2_f (sqrt( temp2 / fb_exc_energy )) + 0.5f )
+                         = (short)(log2f(sqrt(temp2 / fb_exc_energy)) + log2f(sqrt(2)))
+                         = (short)log2f(sqrt(2 * (temp2 / fb_exc_energy)))
+                increase the exp of division result by one, two accommodate the multiplication with 2 in sqrt
+        */
+        exp = add( exp, 1 );
+        ratio = Sqrt16( ratio, &exp );
+        /* Since ratio always lie betwwen 16384 and 32767, subtract the Q of sqrt result from 14 to get the integral part of log value */
+        idxGain = sub( exp, 1 ); // 14 - (15-exp)
+
+        /* idxGain = max( 0, min( 15, idxGain ) ); */
+        idxGain = s_max( 0, s_min( 15, idxGain ) );
     }
 
     /* ratio = (float)(1 << idxGain);*/
@@ -7498,10 +7625,10 @@ void tbe_write_bitstream_fx(
     IF( ( st_fx->rf_mode || EQ_32( st_fx->total_brate, ACELP_9k60 ) ) && ( EQ_16( st_fx->bwidth, WB ) ) )
     {
         /* WB LSF */
-        push_next_indice_fx( hBstr, hBWE_TD->lsf_WB, NUM_BITS_LBR_WB_LSF );
+        push_next_indice( hBstr, hBWE_TD->lsf_WB, NUM_BITS_LBR_WB_LSF );
 
         /* WB frame */
-        push_next_indice_fx( hBstr, hBWE_TD->gFrame_WB, NUM_BITS_SHB_FrameGain_LBR_WB );
+        push_next_indice( hBstr, hBWE_TD->gFrame_WB, NUM_BITS_SHB_FrameGain_LBR_WB );
     }
     ELSE IF( ( GE_32( st_fx->total_brate, ACELP_9k60 ) ) && ( LE_32( st_fx->total_brate, ACELP_32k ) ) &&
              ( ( EQ_16( st_fx->bwidth, SWB ) ) || ( EQ_16( st_fx->bwidth, FB ) ) ) )
@@ -7511,53 +7638,53 @@ void tbe_write_bitstream_fx(
         test();
         IF( ( EQ_16( st_fx->rf_mode, 1 ) ) || EQ_32( st_fx->total_brate, ACELP_9k60 ) )
         {
-            push_next_indice_fx( hBstr, hBWE_TD->lsf_idx[0], 8 );
+            push_next_indice( hBstr, hBWE_TD->lsf_idx[0], 8 );
         }
         ELSE
         {
             FOR( i = 0; i < NUM_Q_LSF; i++ )
             {
-                push_next_indice_fx( hBstr, hBWE_TD->lsf_idx[i], lsf_q_num_bits[i] );
+                push_next_indice( hBstr, hBWE_TD->lsf_idx[i], lsf_q_num_bits[i] );
             }
 
             /* LSF mirror points */
-            push_next_indice_fx( hBstr, hBWE_TD->m_idx, MIRROR_POINT_BITS );
+            push_next_indice( hBstr, hBWE_TD->m_idx, MIRROR_POINT_BITS );
 
             /* LSF grid points */
-            push_next_indice_fx( hBstr, hBWE_TD->grid_idx, NUM_LSF_GRID_BITS );
+            push_next_indice( hBstr, hBWE_TD->grid_idx, NUM_LSF_GRID_BITS );
         }
 
         /* Gain shape */
-        push_next_indice_fx( hBstr, hBWE_TD->idxSubGains, NUM_BITS_SHB_SUBGAINS );
+        push_next_indice( hBstr, hBWE_TD->idxSubGains, NUM_BITS_SHB_SUBGAINS );
 
         /* frame gain */
-        push_next_indice_fx( hBstr, hBWE_TD->idxFrameGain, NUM_BITS_SHB_FRAMEGAIN );
+        push_next_indice( hBstr, hBWE_TD->idxFrameGain, NUM_BITS_SHB_FRAMEGAIN );
 
         IF( GE_32( st_fx->total_brate, ACELP_24k40 ) )
         {
             /* sub frame energy*/
-            push_next_indice_fx( hBstr, hBWE_TD->idx_shb_fr_gain, NUM_BITS_SHB_ENER_SF );
+            push_next_indice( hBstr, hBWE_TD->idx_shb_fr_gain, NUM_BITS_SHB_ENER_SF );
 
             /* gain shapes residual */
             FOR( i = 0; i < NB_SUBFR16k; i++ )
             {
-                push_next_indice_fx( hBstr, hBWE_TD->idx_res_gs[i], NUM_BITS_SHB_RES_GS );
+                push_next_indice( hBstr, hBWE_TD->idx_res_gs[i], NUM_BITS_SHB_RES_GS );
             }
 
             /* voicing factor */
-            push_next_indice_fx( hBstr, hBWE_TD->idx_mixFac, NUM_BITS_SHB_VF );
+            push_next_indice( hBstr, hBWE_TD->idx_mixFac, NUM_BITS_SHB_VF );
         }
 
         IF( EQ_16( st_fx->tec_tfa, 1 ) )
         {
-            push_next_indice_fx( hBstr, st_fx->tec_flag, BITS_TEC );
-            push_next_indice_fx( hBstr, st_fx->tfa_flag, BITS_TFA );
+            push_next_indice( hBstr, st_fx->tec_flag, BITS_TEC );
+            push_next_indice( hBstr, st_fx->tfa_flag, BITS_TFA );
         }
     }
 
     IF( EQ_16( st_fx->bwidth, FB ) )
     {
-        push_next_indice_fx( hBstr, hBWE_TD->idxGain, 4 );
+        push_next_indice( hBstr, hBWE_TD->idxGain, 4 );
     }
 }
 
@@ -7573,6 +7700,7 @@ void TBEreset_enc_fx(
     {
         set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
         hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
+        move32();
         st_fx->prev_Q_bwe_exc = 31;
         move16();
     }
diff --git a/lib_enc/tcq_core_enc.c b/lib_enc/tcq_core_enc.c
deleted file mode 100644
index d54084f0bc6c24a06147b1d7ab2b249bc7ca568d..0000000000000000000000000000000000000000
--- a/lib_enc/tcq_core_enc.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "cnst.h"
-#include "basop_util.h"
-#include "basop_proto_func.h"
-#include "wmc_auto.h"
-
-/*---------------------------------------------------------------------*
- * tcq_core_LR_enc()
- *
- * Main Generic Audio Encoder Routine for LR-MDCT
- *---------------------------------------------------------------------*/
diff --git a/lib_enc/tcq_core_enc_fx.c b/lib_enc/tcq_core_enc_fx.c
index 7ff5a9637a1fa02501ee46d79b99fab7d3b9f4db..d5841094fffca30c897bf4c791ad55ad703ffd56 100644
--- a/lib_enc/tcq_core_enc_fx.c
+++ b/lib_enc/tcq_core_enc_fx.c
@@ -10,7 +10,6 @@
 #include "ivas_error.h"
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
-#include "prot.h"
 #define IVAS_FLOAT
 
 ivas_error tcq_core_LR_enc_fx(
@@ -57,6 +56,13 @@ ivas_error tcq_core_LR_enc_fx(
     Word32 Rk_sort_fx[NB_SFM];
     Word32 step_scale_fx[NB_SFM];
     Word16 pulses_fx, nzp_fx;
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
+    move32();
 
     Word32 gain_fx, crosscorr_fx, selfcorr_fx;
     Word16 hi, lo, exp;
@@ -66,6 +72,9 @@ ivas_error tcq_core_LR_enc_fx(
     Word32 sepbits = 0;
     Word32 divider = 0;
     ivas_error error;
+    move32();
+    move32();
+    move32();
 
     error = IVAS_ERR_OK;
     move16();
@@ -82,7 +91,7 @@ ivas_error tcq_core_LR_enc_fx(
 
     test();
     test();
-    IF( input_frame <= L_FRAME16k && adjustFlag == 0 && is_transient == 0 )
+    IF( LE_16( input_frame, L_FRAME16k ) && adjustFlag == 0 && is_transient == 0 )
     {
         flag_wbnb = 1;
         move16();
@@ -100,6 +109,8 @@ ivas_error tcq_core_LR_enc_fx(
     move16();
     pbs_fx->numbits = L_deposit_l( 0 );
     pbs_fx->numByte = L_deposit_l( 0 );
+    move32();
+    move32();
     FOR( i = 0; i < MAX_SIZEBUF_PBITSTREAM; i++ )
     {
         pbs_fx->buf[i] = 0;
@@ -134,7 +145,7 @@ ivas_error tcq_core_LR_enc_fx(
     {
         IF( R_fx[j] > 0 )
         {
-            nzb++;
+            nzb = add( nzb, 1 );
         }
     }
 
@@ -148,11 +159,13 @@ ivas_error tcq_core_LR_enc_fx(
         IF( R_fx[j] > 0 )
         {
             R_fx[j] = L_sub( R_fx[j], ar_div( bsub_fx, nzb ) );
+            move32();
 
             IF( R_fx[j] < 0 )
             {
                 bsub_fx = L_sub( bsub_fx, L_add( ar_div( bsub_fx, nzb ), R_fx[j] ) );
                 R_fx[j] = L_deposit_l( 0 );
+                move32();
             }
             ELSE
             {
@@ -186,10 +199,11 @@ ivas_error tcq_core_LR_enc_fx(
         move16();
         FOR( j = 0; j < BANDS; j++ )
         {
+            test();
             IF( NE_16( j, k_num[0] ) && NE_16( j, k_num[1] ) )
             {
                 leftbits = L_add( leftbits, R_fx[k_sort[j]] );
-                if ( R_fx[k_sort[j]] > 0 )
+                IF( R_fx[k_sort[j]] > 0 )
                 {
                     nzbands = add( nzbands, 1 );
                 }
@@ -226,7 +240,7 @@ ivas_error tcq_core_LR_enc_fx(
                     encode_position_ari_fx( parenc_fx, &coefs_norm_dec_fx[sfm_start[k_sort[k]]], size, &est_frame_bits_fx );
                     encode_magnitude_tcq_fx( parenc_fx, &coefs_norm_dec_fx[sfm_start[k_sort[k]]], size, npulses[k_sort[k]], nzp_fx, savedstates, &est_frame_bits_fx );
                     encode_signs_fx( parenc_fx, &coefs_norm_dec_fx[sfm_start[k_sort[k]]], size, nzp_fx, &est_frame_bits_fx );
-                    nzbands--;
+                    nzbands = sub( nzbands, 1 );
                 }
                 /* Have USQ coded band */
                 ELSE IF( R_fx[k_sort[k]] > 0 && EQ_16( USQ_TCQ[k_sort[k]], 1 ) )
@@ -245,7 +259,7 @@ ivas_error tcq_core_LR_enc_fx(
                     encode_position_ari_fx( parenc_fx, &coefs_norm_dec_fx[sfm_start[k_sort[k]]], size, &est_frame_bits_fx );
                     encode_magnitude_usq_fx( parenc_fx, &coefs_norm_dec_fx[sfm_start[k_sort[k]]], size, npulses[k_sort[k]], nzp_fx, &est_frame_bits_fx );
                     encode_signs_fx( parenc_fx, &coefs_norm_dec_fx[sfm_start[k_sort[k]]], size, nzp_fx, &est_frame_bits_fx );
-                    nzbands--;
+                    nzbands = sub( nzbands, 1 );
                 }
                 ELSE /* Then have  zero block  */
                 {
@@ -260,13 +274,15 @@ ivas_error tcq_core_LR_enc_fx(
                 IF( R_fx[k_sort[k]] > 0 && surplus_fx < 0 )
                 {
                     /* delta_fx   = L_deposit_h( div_l( surplus_fx, nzbands ) ); */
-                    IF( nzbands <= 1 )
+                    IF( LE_16( nzbands, 1 ) )
                     {
                         divider = 0;
+                        move32();
                     }
                     ELSE
                     {
                         divider = 2;
+                        move32();
                     }
 
                     IF( L_add( L_add( surplus_fx, sepbits ), ar_div( leftbits, divider ) ) < 0 )
@@ -274,7 +290,7 @@ ivas_error tcq_core_LR_enc_fx(
                         /* Overflow possible => start to distribute negative surplus */
                         delta_fx = ar_div( surplus_fx + sepbits, nzbands );
                     }
-                    else
+                    ELSE
                     {
                         delta_fx = 0;
                     }
@@ -290,12 +306,15 @@ ivas_error tcq_core_LR_enc_fx(
         {
             bit_surplus_fx[0] = Mult_32_16( surplus_fx, 24576 ); /* Q16 */
             bit_surplus_fx[1] = Mult_32_16( surplus_fx, 8192 );  /* Q16 */
+            move32();
+            move32();
         }
         ELSE
         {
             bit_surplus_fx[0] = surplus_fx;
             move32();
             bit_surplus_fx[1] = L_deposit_l( 0 );
+            move32();
         }
 
         FOR( k = 0; k < BANDS; k++ )
@@ -305,6 +324,7 @@ ivas_error tcq_core_LR_enc_fx(
                 IF( EQ_16( k, k_num[j] ) )
                 {
                     R_fx[k_sort[k]] = L_add( R_fx[k_sort[k]], bit_surplus_fx[j] );
+                    move32();
 
                     test();
                     test();
@@ -409,7 +429,9 @@ ivas_error tcq_core_LR_enc_fx(
     FOR( i = 0; i < L_FRAME32k; i++ )
     {
         coefs_norm_dec_fx[i] = extract_l( L_mult0( coefs_norm_dec_fx[i], 5 ) );
+        move16();
     }
+
     IF( !flag_wbnb )
     {
         FOR( k = 0; k < BANDS; k++ )
@@ -427,11 +449,11 @@ ivas_error tcq_core_LR_enc_fx(
     j = sub( bit_budget, shl( nb_bytes, 3 ) );
     FOR( i = 0; i < nb_bytes; i++ )
     {
-        push_indice_fx( hBstr, IND_HQ2_SUBBAND_TCQ, pbs_fx->buf[i], 8 );
+        push_indice( hBstr, IND_HQ2_SUBBAND_TCQ, pbs_fx->buf[i], 8 );
     }
     IF( j > 0 )
     {
-        push_indice_fx( hBstr, IND_HQ2_SUBBAND_TCQ, shr( pbs_fx->buf[nb_bytes], ( 8 - j ) ), j );
+        push_indice( hBstr, IND_HQ2_SUBBAND_TCQ, shr( pbs_fx->buf[nb_bytes], ( 8 - j ) ), j );
     }
     /* Clear decoding buffer */
     set32_fx( coefs_quant_fx, 0, sfm_end[BANDS - 1] + 1 );
@@ -454,11 +476,7 @@ ivas_error tcq_core_LR_enc_fx(
 
             exp = sub( norm_l( crosscorr_fx ), 1 );
             gain_fx = ar_div( L_shl( crosscorr_fx, exp ), selfcorr_fx ); /* 1 + exp */
-#ifdef BASOP_NOGLOB
-            gain_fx = L_shl_sat( gain_fx, sub( 16, 1 + exp ) + 2 ); /* 0.2 * Q16 */
-#else
-            gain_fx = L_shl( gain_fx, sub( 16, 1 + exp ) + 2 ); /* 0.2 * Q16 */
-#endif
+            gain_fx = L_shl_sat( gain_fx, sub( 16, 1 + exp ) + 2 );      /* 0.2 * Q16 */
             lo = L_Extract_lc( gain_fx, &hi );
             /* Use optimal gain */
             FOR( j = 0; j < sfmsize[k_sort[i]]; j++ )
@@ -467,6 +485,7 @@ ivas_error tcq_core_LR_enc_fx(
                 move16();
                 coefs_quant_fx[sfm_start[k_sort[i]] + j] = L_add( L_shl( L_mult0( hi, coefs_norm_dec_fx[sfm_start[k_sort[i]] + j] ), 12 ),
                                                                   L_shr( L_mult0( lo, coefs_norm_dec_fx[sfm_start[k_sort[i]] + j] ), 3 ) ); /* Q12 */
+                move32();
             }
         }
     }
@@ -518,7 +537,7 @@ ivas_error tcq_core_LR_enc_ivas_fx(
     move16();
     move16();
     move16();
-    move16();
+    move32();
     Word32 abuffer_fx[MAX_PULSES];
     Word16 mbuffer_fx[MAX_PULSES];
     Word32 sbuffer_fx[MAX_PULSES];
@@ -534,9 +553,9 @@ ivas_error tcq_core_LR_enc_ivas_fx(
     Word32 leftbits = 0;
     Word32 sepbits = 0;
     Word32 divider = 0;
-    move16();
-    move16();
-    move16();
+    move32();
+    move32();
+    move32();
     ivas_error error;
 
     error = IVAS_ERR_OK;
@@ -622,11 +641,13 @@ ivas_error tcq_core_LR_enc_ivas_fx(
         IF( R_fx[j] > 0 )
         {
             R_fx[j] = L_sub( R_fx[j], ar_div( bsub_fx, nzb ) );
+            move32();
 
             IF( R_fx[j] < 0 )
             {
                 bsub_fx = L_sub( bsub_fx, L_add( ar_div( bsub_fx, nzb ), R_fx[j] ) );
                 R_fx[j] = L_deposit_l( 0 );
+                move32();
             }
             ELSE
             {
@@ -660,10 +681,11 @@ ivas_error tcq_core_LR_enc_ivas_fx(
         move16();
         FOR( j = 0; j < BANDS; j++ )
         {
+            test();
             IF( NE_16( j, k_num[0] ) && NE_16( j, k_num[1] ) )
             {
                 leftbits = L_add( leftbits, R_fx[k_sort[j]] );
-                if ( R_fx[k_sort[j]] > 0 )
+                IF( R_fx[k_sort[j]] > 0 )
                 {
                     nzbands = add( nzbands, 1 );
                 }
@@ -734,13 +756,15 @@ ivas_error tcq_core_LR_enc_ivas_fx(
                 IF( R_fx[k_sort[k]] > 0 && surplus_fx < 0 )
                 {
                     /* delta_fx   = L_deposit_h( div_l( surplus_fx, nzbands ) ); */
-                    IF( nzbands <= 1 )
+                    IF( LE_16( nzbands, 1 ) )
                     {
                         divider = 0;
+                        move32();
                     }
                     ELSE
                     {
                         divider = 2;
+                        move32();
                     }
 
                     IF( L_add( L_add( surplus_fx, sepbits ), ar_div( leftbits, divider ) ) < 0 )
@@ -888,7 +912,9 @@ ivas_error tcq_core_LR_enc_ivas_fx(
     FOR( i = 0; i < L_FRAME32k; i++ )
     {
         coefs_norm_dec_fx[i] = extract_l( L_mult0( coefs_norm_dec_fx[i], 5 ) );
+        move16();
     }
+
     IF( !flag_wbnb )
     {
         FOR( k = 0; k < BANDS; k++ )
@@ -903,6 +929,7 @@ ivas_error tcq_core_LR_enc_ivas_fx(
     }
 
     nb_bytes = shr( bit_budget, 3 );
+
     j = sub( bit_budget, shl( nb_bytes, 3 ) );
     FOR( i = 0; i < nb_bytes; i++ )
     {
@@ -933,11 +960,7 @@ ivas_error tcq_core_LR_enc_ivas_fx(
 
             exp = sub( norm_l( crosscorr_fx ), 1 );
             gain_fx = ar_div( L_shl( crosscorr_fx, exp ), selfcorr_fx ); /* 1 + exp */
-#ifdef BASOP_NOGLOB
-            gain_fx = L_shl_sat( gain_fx, sub( 16, 1 + exp ) + 2 ); /* 0.2 * Q16 */
-#else
-            gain_fx = L_shl( gain_fx, sub( 16, 1 + exp ) + 2 ); /* 0.2 * Q16 */
-#endif
+            gain_fx = L_shl_sat( gain_fx, sub( 16, 1 + exp ) + 2 );      /* 0.2 * Q16 */
             lo = L_Extract_lc( gain_fx, &hi );
             /* Use optimal gain */
             FOR( j = 0; j < sfmsize[k_sort[i]]; j++ )
diff --git a/lib_enc/tcx_ltp_enc.c b/lib_enc/tcx_ltp_enc.c
deleted file mode 100644
index 8c3c60e18ff0099bcd3230c9c2514dc481606cc6..0000000000000000000000000000000000000000
--- a/lib_enc/tcx_ltp_enc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "rom_enc.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/tcx_ltp_enc_fx.c b/lib_enc/tcx_ltp_enc_fx.c
index a37e8ec7783932a06b1f147e0b666fd83c10abdf..84f83a3119ec01dd953676844b2cf9c70dc19ef7 100644
--- a/lib_enc/tcx_ltp_enc_fx.c
+++ b/lib_enc/tcx_ltp_enc_fx.c
@@ -88,6 +88,7 @@ static void tcx_ltp_pitch_search(
     Word16 wsp2[L_FRAME_PLUS + PIT_MAX_MAX + L_INTERPOL1];
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
@@ -129,12 +130,15 @@ static void tcx_ltp_pitch_search(
         move16();
     }
     wsp = wsp2 + t_max;
+    move16();
 
     pt_cor = cor;
+    move32();
 
     FOR( t = t_min; t <= t_max; t++ )
     {
         *pt_cor = dot( wsp, wsp - t, len );
+        move32();
         pt_cor++;
     }
 
@@ -142,13 +146,16 @@ static void tcx_ltp_pitch_search(
     cor_max = L_add( *pt_cor++, 0 );
     t1 = t0_min;
     move16();
+    move32();
 
-    FOR( t = add( t0_min, 1 ); t <= t0_max; t++ )
+    FOR( t = t0_min + 1; t <= t0_max; t++ )
     {
-        IF( *pt_cor > cor_max )
+        IF( GT_32( *pt_cor, cor_max ) )
         {
             cor_max = *pt_cor;
+            move32();
             t1 = t;
+            move16();
         }
         pt_cor++;
     }
@@ -174,13 +181,7 @@ static void tcx_ltp_pitch_search(
     temp_m = divide1616( extract_h( L_shl( cor_max, s ) ), temp_m );
     temp_e = sub( negate( s ), temp_e );
 
-#ifdef BASOP_NOGLOB
     *norm_corr = shl_o( temp_m, temp_e, &Overflow );
-#else
-    BASOP_SATURATE_WARNING_OFF_EVS
-    *norm_corr = shl( temp_m, temp_e );
-    BASOP_SATURATE_WARNING_ON_EVS
-#endif
 
     IF( GE_16( t1, pitfr1 ) )
     {
@@ -227,7 +228,7 @@ static void tcx_ltp_pitch_search(
         t0 = sub( t0, 1 );
         cor_max = interpolate_corr( &pt_cor[t0], fraction, pitres );
 
-        FOR( i = add( fraction, step ); i < pitres; i += step )
+        FOR( i = fraction + step; i < pitres; i += step )
         {
             temp = interpolate_corr( &pt_cor[t0], i, pitres );
 
@@ -241,6 +242,7 @@ static void tcx_ltp_pitch_search(
     }
 
     i = 0;
+    move16();
     FOR( i = 0; i < pitres; i += step ) /* Process positive fractions */
     {
         temp = interpolate_corr( &pt_cor[t1], i, pitres );
@@ -341,6 +343,7 @@ static void tcx_ltp_pitch_search_ivas_fx(
     FOR( t = t_min; t <= t_max; t++ )
     {
         *pt_cor = dot( wsp, wsp - t, len ); // 2*(x + s_wsp)
+        move32();
         pt_cor++;
     }
 
@@ -349,7 +352,7 @@ static void tcx_ltp_pitch_search_ivas_fx(
     t1 = t0_min;
     move16();
 
-    FOR( t = add( t0_min, 1 ); t <= t0_max; t++ )
+    FOR( t = t0_min + 1; t <= t0_max; t++ )
     {
         IF( GT_32( *pt_cor, cor_max ) )
         {
@@ -382,13 +385,7 @@ static void tcx_ltp_pitch_search_ivas_fx(
     temp_m = divide1616( extract_h( L_shl( cor_max, s ) ), temp_m );
     temp_e = sub( negate( s ), temp_e );
 
-#ifdef BASOP_NOGLOB
     *norm_corr = shl_o( temp_m, temp_e, &Overflow );
-#else
-    BASOP_SATURATE_WARNING_OFF_EVS
-    *norm_corr = shl( temp_m, temp_e );
-    BASOP_SATURATE_WARNING_ON_EVS
-#endif
 
     test();
     IF( check_border_case && EQ_16( t1, t0_min ) )
@@ -415,6 +412,7 @@ static void tcx_ltp_pitch_search_ivas_fx(
 
         *index = add( sub( t1, pitfr1 ), extract_l( L_mac0( L_mult0( sub( pitfr2, pitmin ), pitres ),
                                                             sub( pitfr1, pitfr2 ), shr( pitres, 1 ) ) ) );
+        move16();
 
         return;
     }
@@ -450,7 +448,7 @@ static void tcx_ltp_pitch_search_ivas_fx(
         t0 = sub( t0, 1 );
         cor_max = interpolate_corr( &pt_cor[t0], fraction, pitres );
 
-        FOR( i = add( fraction, step ); i < pitres; i += step )
+        FOR( i = fraction + step; i < pitres; i += step )
         {
             temp = interpolate_corr( &pt_cor[t0], i, pitres );
 
@@ -487,10 +485,12 @@ static void tcx_ltp_pitch_search_ivas_fx(
         *index = add( extract_l( L_mac0( L_mult0( sub( t0, pitfr2 ), shr( pitres, 1 ) ),
                                          sub( pitfr2, pitmin ), pitres ) ),
                       shr( fraction, 1 ) );
+        move16();
     }
     ELSE
     {
         *index = add( imult1616( sub( t0, pitmin ), pitres ), fraction );
+        move16();
     }
 }
 
@@ -501,6 +501,7 @@ static void tcx_ltp_find_gain( Word16 *speech, Word16 *pred_speech, Word16 L_fra
     Word16 i, g, s1, s2, tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
@@ -513,15 +514,9 @@ static void tcx_ltp_find_gain( Word16 *speech, Word16 *pred_speech, Word16 L_fra
 
     FOR( i = 0; i < L_frame; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = shl_sat( pred_speech[i], s2 );
         corr = L_mac0_sat( corr, shl( speech[i], s1 ), tmp );
         ener = L_mac0_sat( ener, tmp, tmp );
-#else
-        tmp = shl( pred_speech[i], s2 );
-        corr = L_mac0( corr, shl( speech[i], s1 ), tmp );
-        ener = L_mac0( ener, tmp, tmp );
-#endif
     }
 
     s1 = sub( 1, add( s1, s2 ) );
@@ -535,29 +530,13 @@ static void tcx_ltp_find_gain( Word16 *speech, Word16 *pred_speech, Word16 L_fra
     ener = L_shl( ener, tmp );
     s2 = sub( s2, tmp );
 
-#ifdef BASOP_NOGLOB
     g = divide1616( round_fx_o( corr, &Overflow ), round_fx_o( ener, &Overflow ) );
-#else
-    g = divide1616( round_fx( corr ), round_fx( ener ) );
-#endif
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     g = shl_o( g, sub( s1, s2 ), &Overflow );
-#else  /* BASOP_NOGLOB */
-    g = shl( g, sub( s1, s2 ) );
-#endif /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
 
     /* Quantize gain */
-#ifdef FIX_ISSUE_1150
-#ifdef BASOP_NOGLOB
     g = shr( sub_o( g, 0x1000, &Overflow ), 13 );
-#else
-    g = shr( sub( g, 0x1000 ), 13 );
-#endif
-#else
-    g = shr( sub( g, 0x1000 ), 13 );
-#endif
     g = s_max( g, -1 );
 
     *gain_index = g;
@@ -586,15 +565,9 @@ static void tcx_ltp_find_gain_ivas_fx( Word16 *speech /*Qx*/, Word16 *pred_speec
 
     FOR( i = 0; i < L_frame; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = shl_sat( pred_speech[i], s2 );                  // Qx + s2
         corr = L_mac0_sat( corr, shl( speech[i], s1 ), tmp ); // 2*Qx + s1 + s2
         ener = L_mac0_sat( ener, tmp, tmp );                  // 2*(Qx+s2)
-#else
-        tmp = shl( pred_speech[i], s2 );
-        corr = L_mac0( corr, shl( speech[i], s1 ), tmp );
-        ener = L_mac0( ener, tmp, tmp );
-#endif
     }
 
     s1 = sub( 1, add( s1, s2 ) );
@@ -608,17 +581,9 @@ static void tcx_ltp_find_gain_ivas_fx( Word16 *speech /*Qx*/, Word16 *pred_speec
     ener = L_shl( ener, tmp );
     s2 = sub( s2, tmp );
 
-#ifdef BASOP_NOGLOB
     g = divide1616( round_fx_o( corr, &Overflow ), round_fx_o( ener, &Overflow ) );
-#else
-    g = divide1616( round_fx( corr ), round_fx( ener ) );
-#endif
     BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef BASOP_NOGLOB
     g = shl_o( g, sub( s1, s2 ), &Overflow ); /*Q15*/
-#else                                         /* BASOP_NOGLOB */
-    g = shl( g, sub( s1, s2 ) );
-#endif                                        /* BASOP_NOGLOB */
     BASOP_SATURATE_WARNING_ON_EVS
 
     /* Quantize gain */
@@ -672,6 +637,7 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
     Word16 alpha, step;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
@@ -801,14 +767,14 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
         *ltp_bits = 0;
         move16();
         test();
-        if ( tcxltp_on != 0 || SideInfoOnly != 0 )
+        IF( tcxltp_on != 0 || SideInfoOnly != 0 )
         {
             *ltp_bits = 1;
             move16();
         }
     }
 
-    if ( SideInfoOnly != 0 )
+    IF( SideInfoOnly != 0 )
     {
         *gain = 0;
         move16();
@@ -826,25 +792,17 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
 
         /* step = 1.f/(float)(L_subfr); */
         step = shl( 2, norm_s( L_subfr ) );
-        if ( s_and( L_subfr, sub( L_subfr, 1 ) ) != 0 )
+        IF( s_and( L_subfr, sub( L_subfr, 1 ) ) != 0 )
         {
             step = mult_r( step, 26214 /*64.f/80.f Q15*/ );
         }
 
         FOR( n = 0; n < L_subfr; n++ )
         {
-#ifdef BASOP_NOGLOB
             speech_ltp[n] = sub_o( speech[n], mult_ro( *gain, mult_ro( alpha, pred_speech[n], &Overflow ), &Overflow ), &Overflow );
-#else
-            speech_ltp[n] = sub( speech[n], mult_r( *gain, mult_r( alpha, pred_speech[n] ) ) );
-#endif
             move16();
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             alpha = add_o( alpha, step, &Overflow );
-#else /* BASOP_NOGLOB */
-            alpha = add( alpha, step );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
         }
     }
@@ -867,11 +825,7 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
 
         FOR( n = 0; n < lpcorder; n++ )
         {
-#ifdef BASOP_NOGLOB
             buf_zir[n] = add_sat( sub_sat( speech_ltp[n - lpcorder], speech[n - lpcorder] ), mult_r( *gain, buf_zir[n] ) );
-#else
-            buf_zir[n] = add( sub( speech_ltp[n - lpcorder], speech[n - lpcorder] ), mult_r( *gain, buf_zir[n] ) );
-#endif
             move16();
         }
 
@@ -882,14 +836,15 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
         E_UTIL_synthesis( 0, A, zir, zir, L_subfr, buf_zir, 0, lpcorder );
 
         alpha = 0x7FFF;
+        move16();
         /* step = 1.f/(float)(L_subfr/2); */
         step = shl( 4, norm_s( L_subfr ) );
-        if ( s_and( L_subfr, sub( L_subfr, 1 ) ) != 0 )
+        IF( s_and( L_subfr, sub( L_subfr, 1 ) ) != 0 )
         {
             step = mult_r( step, 26214 /*64.f/80.f Q15*/ );
         }
 
-        FOR( n = shr( L_subfr, 1 ); n < L_subfr; n++ )
+        FOR( n = ( L_subfr >> 1 ); n < L_subfr; n++ )
         {
             zir[n] = mult_r( zir[n], alpha );
             move16();
@@ -898,11 +853,7 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
 
         FOR( n = 0; n < L_subfr; n++ )
         {
-#ifdef BASOP_NOGLOB
             speech_ltp[n] = add_o( sub_o( speech[n], mult_ro( *gain, pred_speech[n], &Overflow ), &Overflow ), zir[n], &Overflow );
-#else
-            speech_ltp[n] = add( sub( speech[n], mult_r( *gain, pred_speech[n] ) ), zir[n] );
-#endif
             move16();
         }
     }
@@ -920,11 +871,7 @@ void tcx_ltp_encode_fx( Word16 tcxltp_on,
     {
         FOR( n = L_subfr; n < L_frame; n++ )
         {
-#ifdef BASOP_NOGLOB
             speech_ltp[n] = sub_o( speech[n], mult( *gain, pred_speech[n] ), &Overflow );
-#else
-            speech_ltp[n] = sub( speech[n], mult( *gain, pred_speech[n] ) );
-#endif
             move16();
         }
     }
@@ -984,9 +931,9 @@ void tcx_ltp_encode_ivas_fx(
     {
         hTcxEnc->tcxltp_pitch_int_past = L_frame;
         move16();
-        hTcxEnc->tcxltp_pitch_int_past = 0;
+        hTcxEnc->tcxltp_pitch_fr_past = 0;
         move16();
-        hTcxEnc->tcxltp_pitch_int_past = 0;
+        hTcxEnc->tcxltp_gain_past = 0;
         move16();
     }
 
@@ -1040,13 +987,12 @@ void tcx_ltp_encode_ivas_fx(
                 IF( GT_16( norm_corr_2_fx[1], norm_corr_2_fx[0] ) )
                 {
                     i = 1;
-                    move16();
                 }
                 ELSE
                 {
                     i = 0;
-                    move16();
                 }
+                move16();
 
                 hTcxEnc->tcxltp_pitch_int = pitch_int_2[i];
                 move16();
@@ -1055,6 +1001,7 @@ void tcx_ltp_encode_ivas_fx(
                 ltp_param[1] = pit_param_2[i];
                 move16();
                 norm_corr_fx = norm_corr_2_fx[i];
+                move16();
             }
         }
         ELSE
@@ -1084,13 +1031,13 @@ void tcx_ltp_encode_ivas_fx(
 
         IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
         {
-            tempFlatness_fx = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS - NSUBBLOCKS_SHIFT, add( nPrevSubblocks, NSUBBLOCKS_SHIFT ) ); // Q7
+            tempFlatness_fx = extract_l( L_shr( GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS - NSUBBLOCKS_SHIFT, add( nPrevSubblocks, NSUBBLOCKS_SHIFT ) ), 14 ) ); // Q7
             maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( st->hTranDet, (const Word8) isTCX10,
                                                                 NSUBBLOCKS - NSUBBLOCKS_SHIFT, add( nPrevSubblocks, NSUBBLOCKS_SHIFT ) ); // Q3
         }
         ELSE
         {
-            tempFlatness_fx = GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS, nPrevSubblocks ); // Q7
+            tempFlatness_fx = extract_l( L_shr( ( GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) st->hTranDet, NSUBBLOCKS, nPrevSubblocks ) ), 14 ) ); // Q7
             maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( st->hTranDet, (const Word8) isTCX10,
                                                                 NSUBBLOCKS, nPrevSubblocks ); // Q3
         }
@@ -1304,7 +1251,7 @@ void tcx_ltp_encode_ivas_fx(
                 step_fx = mult_r( step_fx, 26214 /*64.f/80.f Q15*/ );
             }
 
-            FOR( n = shr( L_subfr, 1 ); n < L_subfr; n++ )
+            FOR( n = L_subfr >> 1; n < L_subfr; n++ )
             {
                 zir_fx[n] = mult_r( zir_fx[n], alpha_fx );
                 move16();
diff --git a/lib_enc/tcx_utils_enc.c b/lib_enc/tcx_utils_enc.c
deleted file mode 100644
index cf330dfa2b09c5952b84e5bdd8a907070bc65201..0000000000000000000000000000000000000000
--- a/lib_enc/tcx_utils_enc.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-#include "rom_com.h"
-#include "cnst.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-
-#define ONE_POINT_ONE_FIVE_Q7  147
-#define ONE_POINT_ONE_FIVE_Q23 9646899
-
-
-/*---------------------------------------------------------------------*
- * AdaptLowFreqEmph()
- *
- *
- *---------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------------*
- * ProcessIGF_ivas_fx()
- *
- *
- *---------------------------------------------------------------------*/
-void ProcessIGF_ivas_fx(
-    Encoder_State *st,              /* i  : Encoder state                                           */
-    Word32 *pMDCTSpectrum,          /* i  : MDCT spectrum (*q_spectrum)                                          */
-    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                */
-    Word16 *q_spectrum,             /* i/o: Q of spectrum */
-    Word32 *pPowerSpectrum,         /* i  : MDCT^2 + MDST^2 spectrum, or estimate (*q_powerSpec)                  */
-    Word16 *exp_powerSpec,          /* i/o: Q of power spectrum */
-    const Word16 isTCX20,           /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5   */
-    const Word16 frameno,           /* i  : flag indicating index of current subframe               */
-    const Word16 sp_aud_decision0,  /* i  : first stage switching decision                         */
-    const Word16 vad_hover_flag     /* i  : VAD hangover flag                                      */
-)
-{
-    Word16 igfGridIdx, isIndepFlag, bsBits, pBsStart, curr_order;
-    Word16 predictionGain;
-    Word16 A[ITF_MAX_FILTER_ORDER + 1];
-    Word16 q_A;
-
-    IGF_ENC_INSTANCE_HANDLE hIGFEnc = st->hIGFEnc;
-    BSTR_ENC_HANDLE hBstr = st->hBstr;
-
-    isIndepFlag = 1;
-    move16();
-    test();
-    IF( st->last_core == ACELP_CORE && isTCX20 )
-    {
-        igfGridIdx = IGF_GRID_LB_TRAN;
-        move16();
-    }
-    ELSE IF( isTCX20 )
-    {
-        igfGridIdx = IGF_GRID_LB_NORM;
-        move16();
-    }
-    ELSE
-    {
-        /* It is short block */
-        igfGridIdx = IGF_GRID_LB_SHORT;
-        move16();
-        if ( EQ_16( frameno, 1 ) )
-        {
-            isIndepFlag = 0;
-            move16();
-        }
-    }
-
-    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc, igfGridIdx, pITFMDCTSpectrum, sub( Q31, *q_spectrum ) );
-
-    IGFEncApplyMono_ivas_fx( st, igfGridIdx, pMDCTSpectrum, sub( Q31, *q_spectrum ), pPowerSpectrum, exp_powerSpec, isTCX20, st->hTcxEnc->fUseTns[frameno], sp_aud_decision0, vad_hover_flag );
-
-    curr_order = 0;
-    move16();
-    predictionGain = 0;
-    move16();
-    q_A = 0;
-    move16();
-
-    ITF_Detect_fx( hIGFEnc->spec_be_igf, hIGFEnc->infoStartLine, hIGFEnc->infoStopLine, 8 /*maxOrder*/, A, &q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc->spec_be_igf_e ) );
-
-    test();
-    IF( LT_32( L_deposit_l( hIGFEnc->tns_predictionGain ), 9646899 /* 1.15 in Q23 */ ) && LT_32( L_deposit_l( predictionGain ), 9646899 /* 1.15 in Q23 */ ) )
-    {
-        hIGFEnc->flatteningTrigger = 1;
-        move16();
-    }
-    ELSE
-    {
-        hIGFEnc->flatteningTrigger = 0;
-        move16();
-    }
-
-    hIGFEnc->infoTotalBitsPerFrameWritten = 0;
-    move16();
-
-    IF( isTCX20 )
-    {
-        IGFEncWriteBitstream_ivas_fx( hIGFEnc, NULL, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
-    }
-    ELSE
-    {
-        pBsStart = hBstr->nb_ind_tot;
-        move16();
-
-        IGFEncWriteBitstream_ivas_fx( hIGFEnc, hBstr, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
-
-        bsBits = sub( hBstr->nb_ind_tot, pBsStart );
-        IGFEncConcatenateBitstream( hIGFEnc, bsBits, hBstr );
-    }
-
-    return;
-}
-
-/*---------------------------------------------------------------------*
- * ProcessStereoIGF()
- *
- *
- *---------------------------------------------------------------------*/
-
-void ProcessStereoIGF_fx(
-    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,
-    Encoder_State *sts[CPE_CHANNELS],                  /* i  : Encoder state                           */
-    Word16 ms_mask[2][MAX_SFB],                        /* i  : bandwise MS mask                        */
-    Word32 *pITFMDCTSpectrum_fx[CPE_CHANNELS][NB_DIV], /* i  : MDCT spectrum fir ITF                   */
-    Word16 q_pITFMDCTSpectrum_1,
-    Word16 q_pITFMDCTSpectrum_2,
-    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],              /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
-    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i  : inverse power spectrum                  */
-    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],        /* i  : inverse spectrum                        */
-    const Word16 frameno,                                 /* i  : flag indicating index of current subfr. */
-    const Word16 sp_aud_decision0,                        /* i  : sp_aud_decision0                        */
-    const Word32 element_brate                            /* i  : element bitrate                         */
-)
-{
-    Word16 ch, igfGridIdx, isIndepFlag, bsBits, pBsStart, curr_order;
-    Word16 predictionGain;
-    Word16 A[ITF_MAX_FILTER_ORDER + 1];
-    Word16 Q_A;
-    IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS];
-    BSTR_ENC_HANDLE hBstr;
-    hIGFEnc[0] = sts[0]->hIGFEnc;
-    hIGFEnc[1] = sts[1]->hIGFEnc;
-
-    isIndepFlag = 1;
-    move16();
-
-    test();
-    IF( sts[0]->last_core == ACELP_CORE && EQ_16( sts[0]->core, TCX_20_CORE ) )
-    {
-        igfGridIdx = IGF_GRID_LB_TRAN;
-    }
-    ELSE IF( EQ_16( sts[0]->core, TCX_20_CORE ) )
-    {
-        igfGridIdx = IGF_GRID_LB_NORM;
-    }
-    ELSE
-    {
-        /* It is short block */
-        igfGridIdx = IGF_GRID_LB_SHORT;
-        if ( EQ_16( frameno, 1 ) )
-        {
-            isIndepFlag = 0;
-            move16();
-        }
-    }
-    move16();
-
-    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc[0], igfGridIdx, pITFMDCTSpectrum_fx[0][frameno], sub( Q31, q_pITFMDCTSpectrum_1 ) );
-
-    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc[1], igfGridIdx, pITFMDCTSpectrum_fx[1][frameno], sub( Q31, q_pITFMDCTSpectrum_2 ) );
-
-
-    IGFEncApplyStereo_fx( hStereoMdct, ms_mask, hIGFEnc, igfGridIdx, sts, pPowerSpectrum_fx, pPowerSpectrumMsInv_fx, inv_spectrum_fx, frameno, sp_aud_decision0, element_brate );
-
-    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
-    {
-        curr_order = 0;
-        move16();
-
-        Q_A = 0;
-        move16();
-
-        predictionGain = 0;
-        move16();
-
-        ITF_Detect_fx( hIGFEnc[ch]->spec_be_igf, hIGFEnc[ch]->infoStartLine, hIGFEnc[ch]->infoStopLine, 8 /*maxOrder*/, A, &Q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc[ch]->spec_be_igf_e ) );
-
-        test();
-        hIGFEnc[ch]->flatteningTrigger = LT_32( hIGFEnc[ch]->tns_predictionGain, ONE_POINT_ONE_FIVE_Q23 ) && LT_32( predictionGain, ONE_POINT_ONE_FIVE_Q7 );
-        move16();
-
-        hIGFEnc[ch]->infoTotalBitsPerFrameWritten = 0;
-        move16();
-
-        IF( EQ_16( sts[ch]->core, TCX_20_CORE ) )
-        {
-            IGFEncWriteBitstream_ivas_fx( hIGFEnc[ch], NULL, &hIGFEnc[ch]->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
-        }
-        ELSE
-        {
-            hBstr = sts[ch]->hBstr;
-            pBsStart = hBstr->nb_ind_tot;
-            move16();
-
-            if ( ch > 0 )
-            {
-                hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot;
-            }
-            IGFEncWriteBitstream_ivas_fx( hIGFEnc[ch], hBstr, &hIGFEnc[ch]->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
-
-            bsBits = sub( hBstr->nb_ind_tot, pBsStart );
-            IGFEncConcatenateBitstream( hIGFEnc[ch], bsBits, hBstr );
-        }
-    }
-    return;
-}
diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c
index 7098e4502c1311f8ef380b390cae106204e5c93b..680a69fa512fef1409147e308c1dd3280c5c839a 100644
--- a/lib_enc/tcx_utils_enc_fx.c
+++ b/lib_enc/tcx_utils_enc_fx.c
@@ -15,10 +15,14 @@
 #include "rom_com.h"
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
+#include "ivas_prot_fx.h"
 
 #define inv_int InvIntTable
 extern const Word16 int_sqr[17];
 
+#define ONE_POINT_ONE_FIVE_Q7  147
+#define ONE_POINT_ONE_FIVE_Q23 9646899
+
 static Word16 quantize( Word32 x, Word16 invGain, Word16 shift, Word32 offset )
 {
     Word16 tmp16;
@@ -28,8 +32,10 @@ static Word16 quantize( Word32 x, Word16 invGain, Word16 shift, Word32 offset )
     tmp32 = L_shl( tmp32, shift );              /* convert to 15Q16 */
     tmp32 = L_add( tmp32, offset );             /* add offset */
     tmp16 = extract_h( tmp32 );                 /* truncate */
-    if ( x < 0 )
+    IF( x < 0 )
+    {
         tmp16 = negate( tmp16 ); /* restore sign */
+    }
 
     return tmp16;
 }
@@ -42,12 +48,11 @@ void ComputeSpectrumNoiseMeasure_fx( const Word32 *powerSpec,
                                      Word8 *noiseFlags,
                                      Word16 lowpassLine )
 {
-    Word16 i, lastTone;
+    Word16 i, lastTone, j;
     Word32 s, c;
     Word16 tmp16;
     Word32 tmp1, tmp2 = 0; /* initialization only to avoid compiler warning, not counted */
-
-    int j;
+    move32();
 
     IF( resetMemory != 0 )
     {
@@ -74,12 +79,12 @@ void ComputeSpectrumNoiseMeasure_fx( const Word32 *powerSpec,
         i = sub( startLine, 1 );
         s = 0;
         move32();
-        for ( j = -7; j < 8; j++ )
+        FOR( j = -7; j < 8; j++ )
         {
             s = L_add( s, L_shr( powerSpec[i + j], 4 ) );
         }
         tmp16 = sub( lowpassLine, 7 );
-        FOR( i = add( i, 1 ); i < tmp16; i++ )
+        FOR( i = i + 1; i < tmp16; i++ )
         {
             c = L_shr( powerSpec[i - 1], 4 );
             c = L_add( c, L_shr( powerSpec[i], 4 ) );
@@ -89,12 +94,18 @@ void ComputeSpectrumNoiseMeasure_fx( const Word32 *powerSpec,
             s = L_add( s, L_shr( powerSpec[i + 7], 4 ) );
 
             tmp1 = L_shr( c, 2 );
-            if ( noiseFlags[i] == 0 )
+            IF( noiseFlags[i] == 0 )
+            {
                 c = L_shl( c, 1 );
-            if ( noiseFlags[i] == 0 )
+            }
+            IF( noiseFlags[i] == 0 )
+            {
                 tmp2 = L_sub( c, tmp1 ); /* 1.75 * c */
-            if ( noiseFlags[i] != 0 )
+            }
+            IF( noiseFlags[i] != 0 )
+            {
                 tmp2 = L_add( c, tmp1 ); /* 1.25 * c */
+            }
 
             tmp2 = L_sub( s, tmp2 );
             if ( tmp2 >= 0 )
@@ -123,12 +134,18 @@ void ComputeSpectrumNoiseMeasure_fx( const Word32 *powerSpec,
             c = L_add( c, L_shr( powerSpec[i + 1], 4 ) );
 
             tmp1 = L_shr( c, 2 );
-            if ( noiseFlags[i] == 0 )
+            IF( noiseFlags[i] == 0 )
+            {
                 c = L_shl( c, 1 );
-            if ( noiseFlags[i] == 0 )
+            }
+            IF( noiseFlags[i] == 0 )
+            {
                 tmp2 = L_sub( c, tmp1 ); /* 1.75 * c */
-            if ( noiseFlags[i] != 0 )
+            }
+            IF( noiseFlags[i] != 0 )
+            {
                 tmp2 = L_add( c, tmp1 ); /* 1.25 * c */
+            }
 
             /* running sum can't be updated any more, just use the latest one */
             tmp2 = L_sub( s, tmp2 );
@@ -155,36 +172,141 @@ void ComputeSpectrumNoiseMeasure_fx( const Word32 *powerSpec,
     }
 }
 
+void ComputeSpectrumNoiseMeasure_ivas_fx( Word64 *powerSpec, /* Qx */
+                                          Word16 L_frame,    /* Q0 */
+                                          Word16 startLine,  /* Q0 */
+                                          Word8 resetMemory, /* Q0 */
+                                          Word8 *noiseFlags, /* Q0 */
+                                          Word16 lowpassLine /* Q0 */
+)
+{
+    Word16 i, lastTone, j, exp;
+    Word32 c;
+    Word64 s, temp;
+
+    IF( resetMemory != 0 )
+    {
+        FOR( i = 0; i < lowpassLine; i++ )
+        {
+            noiseFlags[i] = 0;
+            move16();
+        }
+    }
+
+    FOR( i = lowpassLine; i < L_frame; i++ )
+    {
+        noiseFlags[i] = 1;
+        move16();
+    }
+
+    test();
+    IF( powerSpec != NULL && LT_16( add( startLine, 6 ), L_frame ) )
+    {
+        lastTone = 0;
+        move16();
+
+        /* noise-measure flags for spectrum filling and quantization (0: tonal, 1: noise-like) */
+        i = sub( startLine, 1 );
+        /*  s = powerSpec[i - 7] + powerSpec[i - 6] + powerSpec[i - 5] +
+            powerSpec[i - 4] + powerSpec[i - 3] + powerSpec[i - 2] +
+            powerSpec[i - 1] + powerSpec[i] + powerSpec[i + 1] +
+            powerSpec[i + 2] + powerSpec[i + 3] + powerSpec[i + 4] +
+            powerSpec[i + 5] + powerSpec[i + 6] + powerSpec[i + 7]; */
+
+        s = powerSpec[i - 7]; // Qx
+        move64();
+        FOR( j = -6; j < 8; j++ )
+        {
+            s = W_add( s, powerSpec[i + j] ); // Qx
+        }
+
+        FOR( i = i + 1; i < lowpassLine - 7; i++ )
+        {
+            /* c = powerSpec[i - 1] + powerSpec[i] + powerSpec[i + 1]; */
+            temp = W_add( W_add( powerSpec[i - 1], powerSpec[i] ), powerSpec[i + 1] );
+            exp = W_norm( temp );
+            c = W_extract_h( W_shl( temp, exp ) ); // Qx+exp-32
+
+            /* s += powerSpec[i + 7] - powerSpec[i - 8]; */
+            s = W_sub( s, powerSpec[i - 8] ); // Qx
+            s = W_add( s, powerSpec[i + 7] ); // Qx
+
+            /* ( 1.75f - 0.5f * noiseFlags[i] ) * c */
+            temp = W_mult_32_32( c, L_msu0( 28672 /* 1.75 in Q14*/, 8192 /* 0.5 in Q14 */, noiseFlags[i] ) ); // Qx+exp-32+14+1 = Qx+exp-17
+
+            IF( GE_64( W_shl( s, sub( exp, Q17 ) ), temp ) /* s >= ( 1.75f - 0.5f * noiseFlags[i] ) * c */ ) // Qx+exp-17
+            {
+                noiseFlags[i] = 1;
+                move16();
+            }
+            ELSE
+            {
+                noiseFlags[i] = 0;
+                lastTone = i;
+                move16();
+                move16();
+            }
+        }
+
+        /* lower L_frame*startRatio lines are tonal (0), upper 7 lines are processed separately */
+        FOR( ; i < lowpassLine - 1; i++ )
+        {
+            /* c = powerSpec[i - 1] + powerSpec[i] + powerSpec[i + 1]; */
+            temp = W_add( W_add( powerSpec[i - 1], powerSpec[i] ), powerSpec[i + 1] );
+            exp = W_norm( temp );
+            c = W_extract_h( W_shl( temp, exp ) ); // Qx+exp-32
+
+            /* ( 1.75f - 0.5f * noiseFlags[i] ) * c */
+            temp = W_mult_32_32( c, L_msu0( 28672 /* 1.75 in Q14*/, 8192 /* 0.5 in Q14 */, noiseFlags[i] ) ); // Qx+exp-32+14+1 = Qx+exp-17
+
+            IF( GE_64( W_shl( s, sub( exp, Q17 ) ), temp ) /* s >= ( 1.75f - 0.5f * noiseFlags[i] ) * c */ ) // Qx+exp-17
+            {
+                noiseFlags[i] = 1;
+                move16();
+            }
+            ELSE
+            {
+                noiseFlags[i] = 0;
+                lastTone = i;
+                move16();
+                move16();
+            }
+        }
+        noiseFlags[i] = 1; /* uppermost line is defined as noise-like (1) */
+        move16();
+
+        if ( lastTone > 0 ) /* spread uppermost tonal line one line upward */
+        {
+            noiseFlags[lastTone + 1] = 0;
+            move16();
+        }
+    }
+}
+
 static void detectLowpassFac( const Word32 *powerSpec, Word16 powerSpec_e, Word16 L_frame, Word8 rectWin, Word16 *pLpFac, Word16 lowpassLine )
 {
     Word16 i, tmp;
     Word32 threshold;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
     threshold = 256l /*0.1f * 2*NORM_MDCT_FACTOR Q3*/; /* Q3 */
-    BASOP_SATURATE_WARNING_OFF_EVS                     /* Allow saturation, because threshold is being compared to powerSpec[i] below. */
-#ifdef BASOP_NOGLOB
+    move32();
+    BASOP_SATURATE_WARNING_OFF_EVS /* Allow saturation, because threshold is being compared to powerSpec[i] below. */
         threshold = L_shl_o( threshold, sub( 28, powerSpec_e ), &Overflow );
-#else  /* BASOP_NOGLOB */
-        threshold = L_shl( threshold, sub( 28, powerSpec_e ) );
-#endif /* BASOP_NOGLOB */
 
-    if ( rectWin != 0 )
+    IF( rectWin != 0 )
     {
         /* compensate for bad side-lobe attenuation with asymmetric windows */
-#ifdef BASOP_NOGLOB
         threshold = L_shl_o( threshold, 1, &Overflow );
-#else
-        threshold = L_shl( threshold, 1 );
-#endif
     }
     BASOP_SATURATE_WARNING_ON_EVS
 
     tmp = shr( lowpassLine, 1 );
-    FOR( i = sub( lowpassLine, 1 ); i >= tmp; i-- )
+    FOR( i = lowpassLine - 1; i >= tmp; i-- )
     {
         IF( GT_32( powerSpec[i], threshold ) )
         {
@@ -245,7 +367,7 @@ void AnalyzePowerSpectrum_fx(
     s2 = 0;
     move16();
     tmp = sub( mdctSpectrum_e, *powerSpec_e );
-    if ( tmp > 0 )
+    IF( tmp > 0 )
     {
         s2 = negate( tmp );
     }
@@ -264,18 +386,10 @@ void AnalyzePowerSpectrum_fx(
     /* power spectrum: MDCT^2 + MDST^2 */
     FOR( i = iStart; i < iEnd; i++ )
     {
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( mdctSpectrum[i], s1 ) );
-#else
-        tmp = round_fx( L_shl( mdctSpectrum[i], s1 ) );
-#endif
         tmp32 = L_mult0( tmp, tmp );
 
-#ifdef BASOP_NOGLOB
         tmp = round_fx_sat( L_shl_sat( powerSpec[i], s2 ) );
-#else
-        tmp = round_fx( L_shl( powerSpec[i], s2 ) );
-#endif
         tmp32 = L_mac0( tmp32, tmp, tmp );
 
         powerSpec[i] = tmp32;
@@ -305,7 +419,6 @@ void AnalyzePowerSpectrum_fx(
     {
         lowpassLine = shl( mult( st->hTcxCfg->bandwidth, L_frame ), 1 );
 
-        test();
         detectLowpassFac( powerSpec, *powerSpec_e,
                           L_frame,
                           sub( st->last_core, ACELP_CORE ) == 0,
@@ -328,7 +441,8 @@ void AnalyzePowerSpectrum_ivas_fx(
     Word32 const mdctSpectrum[], /* input: MDCT spectrum                                 */
     Word16 mdctSpectrum_e,
     Word16 const signal[], /* input: windowed signal corresponding to mdctSpectrum */
-    Word32 powerSpec[],    /* output: Power spectrum. Can point to signal          */
+    const Word16 q_signal,
+    Word32 powerSpec[], /* output: Power spectrum. Can point to signal          */
     Word16 powerSpec_e[] )
 {
     Word16 i, iStart, iEnd, lowpassLine;
@@ -340,8 +454,7 @@ void AnalyzePowerSpectrum_ivas_fx(
     lowpassLine = L_frameTCX;
     move16();
 
-    Word16 temp_powerSpec_e = 16;
-    move16();
+    Word16 temp_powerSpec_e = sub( 16, q_signal );
     TCX_MDST( signal, powerSpec, &temp_powerSpec_e, left_overlap, sub( L_frameTCX, shr( add( left_overlap, right_overlap ), 1 ) ), right_overlap, st->element_mode );
 
     shift = L_norm_arr( powerSpec, N_MAX + L_MDCT_OVLP_MAX );
@@ -405,7 +518,6 @@ void AnalyzePowerSpectrum_ivas_fx(
     {
         lowpassLine = shl( mult( st->hTcxCfg->bandwidth, L_frame ), 1 );
 
-        test();
         detectLowpassFac( common_powerSpec, temp_powerSpec_e,
                           L_frame,
                           sub( st->last_core, ACELP_CORE ) == 0,
@@ -453,6 +565,7 @@ void AdaptLowFreqEmph_fx( Word32 x[],
 
                 /* Debug initialization to catch illegal cases of xq[i] */
                 tmp16 = 0;
+                move16();
 
                 if ( xq[i] > 0 )
                 {
@@ -506,6 +619,7 @@ void AdaptLowFreqEmph_fx( Word32 x[],
 
                     /* Debug initialization to catch illegal cases of xq[i] */
                     tmp16 = 0;
+                    move16();
 
                     if ( xq[i] > 0 )
                     {
@@ -559,6 +673,7 @@ void AdaptLowFreqEmph_fx( Word32 x[],
 
             /* Debug initialization to catch illegal cases of xq[i] */
             tmp16 = 0;
+            move16();
 
             if ( xq[i] > 0 )
             {
@@ -591,6 +706,7 @@ void AdaptLowFreqEmph_fx( Word32 x[],
 
             /* Debug initialization to catch illegal cases of xq[i] */
             tmp16 = 0;
+            move16();
 
             if ( xq[i] > 0 )
             {
@@ -709,20 +825,27 @@ Word16 SQ_gain_fx(                  /* output: SQ gain                   */
         move16();
 
         tmp16 = norm_l( x[0] );
-        if ( x[0] != 0 )
+        IF( x[0] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[1] );
-        if ( x[1] != 0 )
+        IF( x[1] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[2] );
-        if ( x[2] != 0 )
+        IF( x[2] != 0 )
+        {
             s = s_min( s, tmp16 );
-
+        }
         tmp16 = norm_l( x[3] );
-        if ( x[3] != 0 )
+        IF( x[3] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         s = sub( s, 2 ); /* 2 bits headroom */
 
@@ -767,7 +890,7 @@ Word16 SQ_gain_fx(                  /* output: SQ gain                   */
             tmp32 = L_sub( en[i], offset );
 
             /* avoid SV with 1 bin of amp < 0.5f */
-            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 0.3*log2(10); */
+            IF( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 0.3*log2(10); */
             {
                 ener = L_add( ener, tmp32 );
             }
@@ -816,20 +939,28 @@ Word16 SQ_gain_ivas_fx(                  /* output: SQ gain                   */
         move16();
 
         tmp16 = norm_l( x[0] );
-        if ( x[0] != 0 )
+        IF( x[0] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[1] );
-        if ( x[1] != 0 )
+        IF( x[1] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[2] );
-        if ( x[2] != 0 )
+        IF( x[2] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[3] );
-        if ( x[3] != 0 )
+        IF( x[3] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         s = sub( s, 2 ); /* 2 bits headroom */
 
@@ -882,7 +1013,7 @@ Word16 SQ_gain_ivas_fx(                  /* output: SQ gain                   */
             tmp32 = L_sub( en[i], offset );
 
             /* avoid SV with 1 bin of amp < 0.5f */
-            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 0.3*log2(10); */
+            IF( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 0.3*log2(10); */
             {
                 ener = L_add( ener, tmp32 );
             }
@@ -943,6 +1074,7 @@ Word16 SQ_gain_estimate_fx(                  /* output: SQ gain
             tmp = 204644;
             tmpp = 0;
             move32();
+            move32();
             BREAK;
         case 200:
             tmp = 215192;
@@ -1042,20 +1174,28 @@ Word16 SQ_gain_estimate_fx(                  /* output: SQ gain
         move16();
 
         tmp16 = norm_l( x[0] );
-        if ( x[0] != 0 )
+        IF( x[0] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[1] );
-        if ( x[1] != 0 )
+        IF( x[1] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[2] );
-        if ( x[2] != 0 )
+        IF( x[2] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         tmp16 = norm_l( x[3] );
-        if ( x[3] != 0 )
+        IF( x[3] != 0 )
+        {
             s = s_min( s, tmp16 );
+        }
 
         s = sub( s, 2 ); /* 2 bits headroom */
 
@@ -1148,6 +1288,8 @@ void tcx_scalar_quantization_fx(
     tmp16 = negate( s_max( tmp16, 0 ) );
 
     i = sub( L_frame, 1 );
+
+    test();
     WHILE( ( memQuantZeros_fx[i] != 0 ) && ( LT_32( L_abs( L_shl( x[i], tmp16 ) ), tmp32 ) ) )
     {
         test();
@@ -1167,6 +1309,8 @@ void tcx_scalar_quantization_fx(
         /* Limit the inverse gain to maximal possible value=sqrtL_spec/NORM_MDCT_FACTOR)*/
         gain = 22435; /*sqrt(1200/NORM_MDCT_FACTOR) in 2Q13*/
         gain_e = 2;
+        move16();
+        move16();
 
         s = sub( add( x_e, gain_e ), 15 );
     }
@@ -1179,15 +1323,12 @@ void tcx_scalar_quantization_fx(
     FOR( ; i >= 0; i-- )
     {
         offs32 = Mpy_32_16_1( L_abs( x[i] ), gain ); /* multiply */
-#ifdef BASOP_NOGLOB
-        offs32 = L_shl_sat( offs32, s );        /* convert to 15Q16 */
-        tmp16 = mac_r_sat( offs32, offset, 1 ); /* add offset and truncate */
-#else
-        offs32 = L_shl( offs32, s );        /* convert to 15Q16 */
-        tmp16 = mac_r( offs32, offset, 1 ); /* add offset and truncate */
-#endif
-        if ( x[i] < 0 )
+        offs32 = L_shl_sat( offs32, s );             /* convert to 15Q16 */
+        tmp16 = mac_r_sat( offs32, offset, 1 );      /* add offset and truncate */
+        IF( x[i] < 0 )
+        {
             tmp16 = negate( tmp16 ); /* restore sign */
+        }
 
         xq[i] = tmp16;
         move16();
@@ -1244,7 +1385,9 @@ void tcx_scalar_quantization_ivas_fx(
     {
         /* Limit the inverse gain to maximal possible value=sqrtL_spec/NORM_MDCT_FACTOR)*/
         gain = 22435; /*sqrt(1200/NORM_MDCT_FACTOR) in 2Q13*/
+        move16();
         gain_e = 2;
+        move16();
 
         s = sub( add( x_e, gain_e ), 15 );
     }
@@ -1257,15 +1400,12 @@ void tcx_scalar_quantization_ivas_fx(
     FOR( ; i >= 0; i-- )
     {
         offs32 = Mpy_32_16_1( L_abs( x[i] ), gain ); /* multiply */
-#ifdef BASOP_NOGLOB
-        offs32 = L_shl_sat( offs32, s );        /* convert to 15Q16 */
-        tmp16 = mac_r_sat( offs32, offset, 1 ); /* add offset and truncate */
-#else
-        offs32 = L_shl( offs32, s );        /* convert to 15Q16 */
-        tmp16 = mac_r( offs32, offset, 1 ); /* add offset and truncate */
-#endif
-        if ( x[i] < 0 )
+        offs32 = L_shl_sat( offs32, s );             /* convert to 15Q16 */
+        tmp16 = mac_r_sat( offs32, offset, 1 );      /* add offset and truncate */
+        IF( x[i] < 0 )
+        {
             tmp16 = negate( tmp16 ); /* restore sign */
+        }
 
         xq[i] = tmp16;
         move16();
@@ -1319,6 +1459,10 @@ Word16 tcx_scalar_quantization_rateloop_fx(
     Word16 tmp, fac1, fac2;
     Word32 tmp32;
     Word16 lastnz;
+    move16();
+    move16();
+    move16();
+    move16();
 
 
     /* Init */
@@ -1393,11 +1537,7 @@ Word16 tcx_scalar_quantization_rateloop_fx(
 
                     /* convert to normalized 16 bit */
                     tmp = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
                     sqGain = round_fx_sat( L_shl( tmp32, tmp ) );
-#else
-                    sqGain = round_fx( L_shl( tmp32, tmp ) );
-#endif
                     sqGain_e = sub( sqGain_e, tmp );
 
                     /* divide */
@@ -1433,11 +1573,7 @@ Word16 tcx_scalar_quantization_rateloop_fx(
 
                     /* convert to normalized 16 bit */
                     tmp = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
                     sqGain = round_fx_sat( L_shl_sat( tmp32, tmp ) );
-#else
-                    sqGain = round_fx( L_shl( tmp32, tmp ) );
-#endif
                     sqGain_e = sub( sqGain_e, tmp );
 
                     /* divide */
@@ -1761,11 +1897,7 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx(
 
                     /* convert to normalized 16 bit */
                     tmp = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
                     sqGain = round_fx_sat( L_shl( tmp32, tmp ) );
-#else
-                    sqGain = round_fx( L_shl( tmp32, tmp ) );
-#endif
                     sqGain_e = sub( sqGain_e, tmp );
 
                     /* divide */
@@ -1801,11 +1933,7 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx(
 
                     /* convert to normalized 16 bit */
                     tmp = norm_l( tmp32 );
-#ifdef BASOP_NOGLOB
                     sqGain = round_fx_sat( L_shl_sat( tmp32, tmp ) );
-#else
-                    sqGain = round_fx( L_shl( tmp32, tmp ) );
-#endif
                     sqGain_e = sub( sqGain_e, tmp );
 
                     /* divide */
@@ -1820,6 +1948,7 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx(
                 }
 
                 Word16 shift_tmp = s_max( sqGain_e, 1 );
+                move16();
                 test();
                 IF( LT_16( shl( sqGain, sub( sqGain_e, shift_tmp ) ), shl( minSqGain, sub( 1, shift_tmp ) ) ) && EQ_16( tcxRateLoopOpt, 3 ) )
                 {
@@ -1983,11 +2112,7 @@ void QuantizeGain( Word16 n, Word16 *pGain, Word16 *pGain_e, Word16 *pQuantizedG
     move32();
 #endif
 
-#ifdef BASOP_NOGLOB
     ener = mult_r( shl_o( n, 5, &Overflow ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#else
-    ener = mult_r( shl( n, 5 ), 26214 /*128.f/NORM_MDCT_FACTOR Q15*/ );
-#endif
     ener_e = 15 - 5 - 7;
     move16();
     IF( GE_16( n, 1024 ) )
@@ -2059,6 +2184,7 @@ void tcx_noise_factor_fx(
     Word32 xMax;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
@@ -2143,19 +2269,19 @@ void tcx_noise_factor_fx(
         k = 0;
         move16();
 
-        if ( accu1 == 0 )
+        IF( accu1 == 0 )
+        {
             accu1 = L_deposit_l( 1 );
-        if ( accu2 == 0 )
+        }
+        IF( accu2 == 0 )
+        {
             accu2 = L_deposit_l( 1 );
+        }
 
         att = BASOP_Util_Divide3232_Scale( L_shl( L_min( accu1, accu2 ), 1 ), L_add( accu1, accu2 ), &s );
         att = Sqrt16( att, &s );
         BASOP_SATURATE_WARNING_OFF_EVS; /* att is always <= 1.0 */
-#ifdef BASOP_NOGLOB
         att = shl_o( att, s, &Overflow );
-#else
-        att = shl( att, s );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
     ELSE
@@ -2180,22 +2306,34 @@ void tcx_noise_factor_fx(
                 IF( LE_16( nTransWidth, 3 ) )
                 {
                     tmp2 = sub( k, c1 );
-                    if ( tmp2 > 0 )
+                    IF( tmp2 > 0 )
+                    {
                         n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
+                    }
+                    IF( tmp2 > 0 )
+                    {
                         n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
-                    if ( tmp2 <= 0 )
+                    }
+                    IF( tmp2 <= 0 )
+                    {
                         n = L_mac( n, int_sqr[k], c2 );
+                    }
                 }
                 ELSE
                 {
                     tmp2 = sub( k, 12 );
-                    if ( tmp2 > 0 )
+                    IF( tmp2 > 0 )
+                    {
                         n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
+                    }
+                    IF( tmp2 > 0 )
+                    {
                         n = L_sub( n, 0x70000 );
-                    if ( tmp2 <= 0 )
+                    }
+                    IF( tmp2 <= 0 )
+                    {
                         n = L_mac( n, int_sqr[k], 1152 /*0.03515625f Q15*/ );
+                    }
                 }
                 sqErrorNrg = L_add( sqErrorNrg, accu1 );
                 accu1 = L_deposit_l( 0 ); /* segment ended here, so reset segment sum */
@@ -2214,19 +2352,19 @@ void tcx_noise_factor_fx(
         }
         ELSE /* current line is zero, so update pointers & segment sum */
         {
-            if ( LT_16( k, nTransWidth ) )
+            IF( LT_16( k, nTransWidth ) )
             {
                 k = add( k, 1 );
             }
 
             tmp2 = sub( maxK, nTransWidth );
-            if ( tmp2 < 0 )
+            IF( tmp2 < 0 )
             {
                 maxK = sub( maxK, 1 );
             }
 
             test();
-            if ( ( tmp2 >= 0 ) && ( sqQ[i + sub( nTransWidth, 1 )] != 0 ) )
+            IF( ( tmp2 >= 0 ) && ( sqQ[i + sub( nTransWidth, 1 )] != 0 ) )
             {
                 maxK = sub( nTransWidth, 1 );
             }
@@ -2251,22 +2389,34 @@ void tcx_noise_factor_fx(
                 IF( LE_16( nTransWidth, 3 ) )
                 {
                     tmp2 = sub( k, c1 );
-                    if ( tmp2 > 0 )
+                    IF( tmp2 > 0 )
+                    {
                         n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
+                    }
+                    IF( tmp2 > 0 )
+                    {
                         n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
-                    if ( tmp2 <= 0 )
+                    }
+                    IF( tmp2 <= 0 )
+                    {
                         n = L_mac( n, int_sqr[k], c2 );
+                    }
                 }
                 ELSE
                 {
                     tmp2 = sub( k, 12 );
-                    if ( tmp2 > 0 )
+                    IF( tmp2 > 0 )
+                    {
                         n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
+                    }
+                    IF( tmp2 > 0 )
+                    {
                         n = L_sub( n, 0x70000 );
-                    if ( tmp2 <= 0 )
+                    }
+                    IF( tmp2 <= 0 )
+                    {
                         n = L_mac( n, int_sqr[k], 1152 /*0.03515625f Q15*/ );
+                    }
                 }
                 sqErrorNrg = L_add( sqErrorNrg, accu1 );
             }
@@ -2274,11 +2424,11 @@ void tcx_noise_factor_fx(
         }
         ELSE /* current line is zero, so update pointers & energy sum */
         {
-            if ( LT_16( k, nTransWidth ) )
+            IF( LT_16( k, nTransWidth ) )
             {
                 k = add( k, 1 );
             }
-            if ( LT_16( maxK, nTransWidth ) )
+            IF( LT_16( maxK, nTransWidth ) )
             {
                 maxK = sub( maxK, 1 );
             }
@@ -2296,22 +2446,34 @@ void tcx_noise_factor_fx(
         IF( LE_16( nTransWidth, 3 ) )
         {
             tmp2 = sub( k, c1 );
-            if ( tmp2 > 0 )
+            IF( tmp2 > 0 )
+            {
                 n = L_msu( n, k, (Word16) 0x8000 );
-            if ( tmp2 > 0 )
+            }
+            IF( tmp2 > 0 )
+            {
                 n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
-            if ( tmp2 <= 0 )
+            }
+            IF( tmp2 <= 0 )
+            {
                 n = L_mac( n, int_sqr[k], c2 );
+            }
         }
         ELSE
         {
             tmp2 = sub( k, 12 );
-            if ( tmp2 > 0 )
+            IF( tmp2 > 0 )
+            {
                 n = L_msu( n, k, (Word16) 0x8000 );
-            if ( tmp2 > 0 )
+            }
+            IF( tmp2 > 0 )
+            {
                 n = L_sub( n, 0x70000 );
-            if ( tmp2 <= 0 )
+            }
+            IF( tmp2 <= 0 )
+            {
                 n = L_mac( n, int_sqr[k], 1152 /*0.03515625f Q15*/ );
+            }
         }
         sqErrorNrg = L_add( sqErrorNrg, accu1 );
     }
@@ -2322,11 +2484,7 @@ void tcx_noise_factor_fx(
         tmp1 = BASOP_Util_Divide3232_Scale( Mpy_32_16_1( sqErrorNrg, att ), n, &s );
         s = add( add( add( s, x_orig_e ), inv_gain2_e ), 7 - 15 );
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
         tmp1 = shl_o( tmp1, s, &Overflow );
-#else /* BASOP_NOGLOB */
-        tmp1 = shl( tmp1, s );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
     ELSE
@@ -2350,6 +2508,7 @@ void tcx_noise_factor_fx(
     *fac_ns = extract_l( L_mult0( *quantized_fac_ns, shr( 24576 /*0.75f Q15*/, NBITS_NOISE_FILL_LEVEL ) ) );
 }
 
+
 void tcx_noise_factor_ivas_fx(
     Word32 *x_orig,           /* i: unquantized mdct coefficients                    */
     Word16 x_orig_e,          /* i: exponent                                         */
@@ -2366,29 +2525,32 @@ void tcx_noise_factor_ivas_fx(
     Word16 element_mode       /* i: element mode                                     */
 )
 {
-    Word16 i, k = 0, maxK, segmentOffset;
-    Word32 sqErrorNrg, n;
-    Word16 inv_gain2, inv_gain2_e, tilt_factor, nTransWidth_1;
+    Word16 i, k, win, segmentOffset, j;
+    Word32 sqErrorNrg = 0, n;
+    move32();
+    Word16 inv_gain2, inv_gain2_e, tilt_factor, nTransWidth_1, exp_sqErrorNrg = 0;
+    move16();
     Word32 accu1, accu2, tmp32;
     Word16 tmp1, tmp2, s;
     Word16 c1, c2;
     Word16 att; /* noise level attenuation factor for transient windows */
     Word32 xMax;
+    Word16 exp_spQ[N_MAX];
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move32();
 #endif
-    move16();
 
     assert( nTransWidth <= 16 );
 
+    set16_fx( exp_spQ, x_orig_e, N_MAX );
     c1 = sub( shl( nTransWidth, 1 ), 4 );
     c2 = mult( 9216 /*0.28125f Q15*/, inv_int[nTransWidth] );
     nTransWidth_1 = sub( nTransWidth, 1 );
 
     /*Adjust noise filling level*/
-    sqErrorNrg = L_deposit_l( 0 );
-    n = L_deposit_l( 0 );
+    n = 0;
+    move32();
 
     /* get inverse frame length */
     tmp1 = getInvFrameLen( L_frame );
@@ -2400,10 +2562,8 @@ void tcx_noise_factor_ivas_fx(
 
     /* inv_gain2 = 1.0f / ((float)(nTransWidth * nTransWidth) * gain_tcx); */
     tmp32 = L_mult( imult1616( nTransWidth, nTransWidth ), gain_tcx ); /* 15Q16 */
-    tmp1 = norm_l( tmp32 );
-    inv_gain2 = round_fx( L_shl( tmp32, tmp1 ) );
-    inv_gain2_e = add( sub( 15, tmp1 ), gain_tcx_e );
-    inv_gain2 = Inv16( inv_gain2, &inv_gain2_e );
+    inv_gain2 = BASOP_Util_Divide3232_Scale( MAX_32, tmp32, &inv_gain2_e );
+    inv_gain2_e = add( inv_gain2_e, sub( 0, add( 15, gain_tcx_e ) ) );
     inv_gain2 = shr( inv_gain2, 2 ); /* 2 bits headroom */
     inv_gain2_e = add( inv_gain2_e, 2 );
 
@@ -2414,15 +2574,13 @@ void tcx_noise_factor_ivas_fx(
     IF( EQ_16( element_mode, IVAS_CPE_MDCT ) ) /* ... but only in mono or parametric stereo since it may cause binaural unmasking in discrete stereo */
     {
         segmentOffset = i;
-        maxK = 1;
-        move16();
         move16();
     }
     ELSE
     {
         /* find last nonzero line below iFirstLine, use it as start offset */
         tmp1 = shr( iFirstLine, 1 );
-        FOR( i = iFirstLine; i > tmp1; i-- )
+        FOR( ; i > tmp1; i-- )
         {
             IF( sqQ[i] != 0 )
             {
@@ -2435,16 +2593,6 @@ void tcx_noise_factor_ivas_fx(
             inv_gain2 = shl( mult( inv_gain2, tilt_factor ), 1 );
         }
 
-        /* initialize left (k) and right (maxK) non-zero neighbor pointers */
-        k = 0;
-        move16();
-        FOR( maxK = 1; maxK < nTransWidth; maxK++ )
-        {
-            IF( sqQ[i + maxK] != 0 )
-            {
-                BREAK;
-            }
-        }
         i = add( i, 1 );
         segmentOffset = i;
         move16();
@@ -2452,17 +2600,20 @@ void tcx_noise_factor_ivas_fx(
 
     IF( LE_16( nTransWidth, 3 ) )
     {
-        accu1 = L_deposit_l( 0 );
-        accu2 = L_deposit_l( 0 );
-        xMax = L_deposit_l( 0 );
+        accu1 = 0;
+        move32();
+        accu2 = 0;
+        move32();
+        xMax = 0;
+        move32();
 
-        FOR( k = s_and( i, (Word16) 0xFFFE ); k < lowpassLine; k++ )
+        FOR( k = i & 0xFFFE; k < lowpassLine; k++ )
         {
             xMax = L_max( xMax, L_abs( x_orig[k] ) );
         }
         s = sub( norm_l( xMax ), 4 );
 
-        FOR( k = s_and( i, (Word16) 0xFFFE ); k < lowpassLine; k += 2 )
+        FOR( k = i & 0xFFFE; k < lowpassLine; k += 2 )
         {
             /* even-index bins, left sub-win */
             tmp1 = round_fx( L_shl( x_orig[k], s ) );
@@ -2476,18 +2627,20 @@ void tcx_noise_factor_ivas_fx(
         move16();
 
         if ( accu1 == 0 )
-            accu1 = L_deposit_l( 1 );
+        {
+            accu1 = 1;
+            move32();
+        }
         if ( accu2 == 0 )
-            accu2 = L_deposit_l( 1 );
+        {
+            accu2 = 1;
+            move32();
+        }
 
         att = BASOP_Util_Divide3232_Scale( L_shl( L_min( accu1, accu2 ), 1 ), L_add( accu1, accu2 ), &s );
         att = Sqrt16( att, &s );
         BASOP_SATURATE_WARNING_OFF_EVS; /* att is always <= 1.0 */
-#ifdef BASOP_NOGLOB
         att = shl_o( att, s, &Overflow );
-#else
-        att = shl( att, s );
-#endif
         BASOP_SATURATE_WARNING_ON_EVS;
     }
     ELSE
@@ -2496,181 +2649,161 @@ void tcx_noise_factor_ivas_fx(
         move16();
     }
 
-    accu1 = L_deposit_l( 0 );
+    win = 0;
+    move16();
 
-    tmp1 = sub( lowpassLine, nTransWidth );
-    FOR( ; i <= tmp1; i++ )
+    FOR( ; i < lowpassLine; i++ )
     {
         inv_gain2 = shl( mult( inv_gain2, tilt_factor ), 1 );
 
-        IF( EQ_16( maxK, 1 ) ) /* current line is not zero, so reset pointers */
+        IF( sqQ[i] != 0 ) /* current line is not zero, so reset pointers */
         {
-            k = sub( i, segmentOffset );
-
-            IF( k > 0 ) /* add segment sum to sum of segment magnitudes */
+            IF( win > 0 )
             {
+                k = sub( i, segmentOffset );
+
                 IF( LE_16( nTransWidth, 3 ) )
                 {
                     tmp2 = sub( k, c1 );
-                    if ( tmp2 > 0 )
+                    IF( tmp2 > 0 )
+                    {
                         n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
+                    }
+                    IF( tmp2 > 0 )
+                    {
                         n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
-                    if ( tmp2 <= 0 )
+                    }
+                    IF( tmp2 <= 0 )
+                    {
                         n = L_mac( n, int_sqr[k], c2 );
+                    }
                 }
                 ELSE
                 {
                     tmp2 = sub( k, 12 );
-                    if ( tmp2 > 0 )
+                    IF( tmp2 > 0 )
+                    {
                         n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
+                    }
+                    IF( tmp2 > 0 )
+                    {
                         n = L_sub( n, 0x70000 );
-                    if ( tmp2 <= 0 )
+                    }
+                    IF( tmp2 <= 0 )
+                    {
                         n = L_mac( n, int_sqr[k], 1152 /*0.03515625f Q15*/ );
+                    }
                 }
-                sqErrorNrg = L_add( sqErrorNrg, accu1 );
-                accu1 = L_deposit_l( 0 ); /* segment ended here, so reset segment sum */
-                k = 0;
-                move16();
-            }
-
-            FOR( ; maxK < nTransWidth; maxK++ )
-            {
-                IF( sqQ[i + maxK] != 0 )
+                FOR( k = segmentOffset; k < i - win; k++ )
                 {
-                    BREAK;
+                    tmp1 = norm_l( sqQ[k] );
+                    sqErrorNrg = BASOP_Util_Add_Mant32Exp( sqErrorNrg, exp_sqErrorNrg, Mpy_32_16_1( L_shl( sqQ[k], tmp1 ), nTransWidth ), add( 15, sub( exp_spQ[k], tmp1 ) ), &exp_sqErrorNrg );
+                    sqQ[k] = 0;
+                    move32();
+                    exp_spQ[k] = 0;
+                    move16();
+                }
+                FOR( ; win > 0; win-- )
+                {
+                    tmp1 = norm_l( sqQ[k] );
+                    sqErrorNrg = BASOP_Util_Add_Mant32Exp( sqErrorNrg, exp_sqErrorNrg, Mpy_32_16_1( L_shl( sqQ[k], tmp1 ), win ), add( 15, sub( exp_spQ[k], tmp1 ) ), &exp_sqErrorNrg );
+                    exp_spQ[k] = 0;
+                    move16();
+                    sqQ[k++] = 0;
+                    move32();
                 }
             }
             segmentOffset = add( i, 1 ); /* new segment might start at next line */
         }
         ELSE /* current line is zero, so update pointers & segment sum */
         {
-            if ( LT_16( k, nTransWidth ) )
+            IF( LT_16( win, nTransWidth ) )
             {
-                k = add( k, 1 );
+                win = add( win, 1 );
             }
-
-            tmp2 = sub( maxK, nTransWidth );
-            test();
-            if ( tmp2 < 0 && NE_16( element_mode, IVAS_CPE_MDCT ) )
-            {
-                maxK = sub( maxK, 1 );
-            }
-
-            test();
-            if ( ( tmp2 >= 0 ) && ( sqQ[i + sub( nTransWidth, 1 )] != 0 ) )
-            {
-                maxK = sub( nTransWidth, 1 );
-            }
-
             /* update segment sum: magnitudes scaled by smoothing function */
-            /*accu1 += (float)fabs(x_orig[i]) * inv_gain2 * (float)(k * maxK);*/
-            tmp2 = mult( inv_gain2, shl( imult1616( k, maxK ), 8 ) );
-            accu1 = L_add( accu1, L_abs( Mpy_32_16_1( x_orig[i], tmp2 ) ) );
+            sqQ[i] = Mpy_32_16_1( imult3216( L_abs( x_orig[i] ), win ), inv_gain2 );
+            move32();
+            exp_spQ[i] = add( x_orig_e, inv_gain2_e );
+            move16();
         }
     }
-
-    FOR( ; i < lowpassLine; i++ )
+    IF( win > 0 ) /* add last segment sum to sum of segment magnitudes */
     {
-        inv_gain2 = shl( mult( inv_gain2, tilt_factor ), 1 );
-
-        IF( EQ_16( maxK, 1 ) ) /* current line is not zero, so reset pointers */
+        k = sub( i, segmentOffset );
+        IF( LE_16( nTransWidth, 3 ) )
         {
-            k = sub( i, segmentOffset );
-
-            IF( k > 0 ) /* add segment sum to sum of segment magnitudes */
+            tmp2 = sub( k, c1 );
+            IF( tmp2 > 0 )
             {
-                IF( LE_16( nTransWidth, 3 ) )
-                {
-                    tmp2 = sub( k, c1 );
-                    if ( tmp2 > 0 )
-                        n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
-                        n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
-                    if ( tmp2 <= 0 )
-                        n = L_mac( n, int_sqr[k], c2 );
-                }
-                ELSE
-                {
-                    tmp2 = sub( k, 12 );
-                    if ( tmp2 > 0 )
-                        n = L_msu( n, k, (Word16) 0x8000 );
-                    if ( tmp2 > 0 )
-                        n = L_sub( n, 0x70000 );
-                    if ( tmp2 <= 0 )
-                        n = L_mac( n, int_sqr[k], 1152 /*0.03515625f Q15*/ );
-                }
-                sqErrorNrg = L_add( sqErrorNrg, accu1 );
+                n = L_msu( n, k, (Word16) 0x8000 );
             }
-            segmentOffset = add( i, 1 ); /* no new segments since maxK remains 1 */
-        }
-        ELSE /* current line is zero, so update pointers & energy sum */
-        {
-            if ( LT_16( k, nTransWidth ) )
+            IF( tmp2 > 0 )
             {
-                k = add( k, 1 );
+                n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
             }
-            if ( LT_16( maxK, nTransWidth ) )
+            IF( tmp2 <= 0 )
             {
-                maxK = sub( maxK, 1 );
-            }
-
-            /* update segment sum: magnitudes scaled by smoothing function */
-            /*accu1 += (float)fabs(x_orig[i]) * inv_gain2 * (float)(k * maxK);*/
-            tmp2 = mult( inv_gain2, shl( imult1616( k, maxK ), 8 ) );
-            accu1 = L_add( accu1, L_abs( Mpy_32_16_1( x_orig[i], tmp2 ) ) );
-        }
-    }
-
-    k = sub( i, segmentOffset );
-    IF( k > 0 ) /* add last segment sum to sum of segment magnitudes */
-    {
-        IF( LE_16( nTransWidth, 3 ) )
-        {
-            tmp2 = sub( k, c1 );
-            if ( tmp2 > 0 )
-                n = L_msu( n, k, (Word16) 0x8000 );
-            if ( tmp2 > 0 )
-                n = L_mac( n, nTransWidth_1, (Word16) 0x8000 );
-            if ( tmp2 <= 0 )
                 n = L_mac( n, int_sqr[k], c2 );
+            }
         }
         ELSE
         {
             tmp2 = sub( k, 12 );
-            if ( tmp2 > 0 )
+            IF( tmp2 > 0 )
+            {
                 n = L_msu( n, k, (Word16) 0x8000 );
-            if ( tmp2 > 0 )
+            }
+            IF( tmp2 > 0 )
+            {
                 n = L_sub( n, 0x70000 );
-            if ( tmp2 <= 0 )
+            }
+            IF( tmp2 <= 0 )
+            {
                 n = L_mac( n, int_sqr[k], 1152 /*0.03515625f Q15*/ );
+            }
+        }
+        FOR( k = segmentOffset; k < i - win; k++ )
+        {
+            tmp1 = norm_l( sqQ[k] );
+            sqErrorNrg = BASOP_Util_Add_Mant32Exp( sqErrorNrg, exp_sqErrorNrg, Mpy_32_16_1( L_shl( sqQ[k], tmp1 ), nTransWidth ), add( 15, sub( exp_spQ[k], tmp1 ) ), &exp_sqErrorNrg );
+            exp_spQ[k] = 0;
+            move16();
+            sqQ[k] = 0;
+            move32();
+        }
+        FOR( ; win > 0; win-- )
+        {
+            tmp1 = norm_l( sqQ[k] );
+            sqErrorNrg = BASOP_Util_Add_Mant32Exp( sqErrorNrg, exp_sqErrorNrg, Mpy_32_16_1( L_shl( sqQ[k], tmp1 ), win ), add( 15, sub( exp_spQ[k], tmp1 ) ), &exp_sqErrorNrg );
+            exp_spQ[k] = 0;
+            move16();
+            sqQ[k++] = 0;
+            move32();
         }
-        sqErrorNrg = L_add( sqErrorNrg, accu1 );
     }
-
+    Word32 tmp4;
     /* noise level factor: average of segment magnitudes of noise bins */
     IF( n > 0 )
     {
-        tmp1 = BASOP_Util_Divide3232_Scale( Mpy_32_16_1( sqErrorNrg, att ), n, &s );
-        s = add( add( add( s, x_orig_e ), inv_gain2_e ), 7 - 15 );
+        tmp4 = BASOP_Util_Divide3232_Scale_newton( Mpy_32_16_1( sqErrorNrg, att ), n, &s );
+        s = add( add( exp_sqErrorNrg, -15 ), s );
         BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
-        tmp1 = shl_o( tmp1, s, &Overflow );
-#else /* BASOP_NOGLOB */
-        tmp1 = shl( tmp1, s );
-#endif
+        tmp4 = L_shl_o( tmp4, s, &Overflow );
         BASOP_SATURATE_WARNING_ON_EVS;
     }
     ELSE
     {
-        tmp1 = 0;
+        tmp4 = 0;
         move16();
     }
-
+    FOR( j = 0; j < N_MAX; j++ )
+    {
+        sqQ[j] = L_shl( sqQ[j], sub( x_orig_e, exp_spQ[j] ) );
+        move32();
+    }
     /* quantize, dequantize noise level factor (range 0.09375 - 0.65625) */
-    tmp2 = round_fx( L_shr( L_mult( tmp1, 22016 /*1.34375f Q14*/ ), 14 - NBITS_NOISE_FILL_LEVEL ) );
-
+    tmp2 = round_fx( L_shr( Mpy_32_16_1( tmp4, 22016 /*1.34375f Q14*/ ), 14 - NBITS_NOISE_FILL_LEVEL ) );
     if ( GT_16( tmp2, ( 1 << NBITS_NOISE_FILL_LEVEL ) - 1 ) )
     {
         tmp2 = ( 1 << NBITS_NOISE_FILL_LEVEL ) - 1;
@@ -2681,8 +2814,10 @@ void tcx_noise_factor_ivas_fx(
     move16();
 
     *fac_ns = extract_l( L_mult0( *quantized_fac_ns, shr( 24576 /*0.75f Q15*/, NBITS_NOISE_FILL_LEVEL ) ) );
+    move16();
 }
 
+
 void tcx_encoder_memory_update_fx(
     Word16 *wsig,        /* i : target weighted signal */
     Word16 *xn_buf,      /* i/o: mdct output buffer/time domain weigthed synthesis        */
@@ -2718,11 +2853,8 @@ void tcx_encoder_memory_update_fx(
         Residu3_fx( Ai + ( st->nb_subfr - 1 ) * ( M + 1 ), synth + sub( L_frame_glob, 1 ), &tmp, 1, Q_new + shift - 1 );
         LPDmem->mem_w0 = sub( wsig[sub( L_frame_glob, 1 )], tmp );
         move16();
-#ifdef BASOP_NOGLOB
         LPDmem->mem_w0 = shr_sat( LPDmem->mem_w0, shift ); /*Qnew-1*/
-#else
-        LPDmem->mem_w0 = shr( LPDmem->mem_w0, shift ); /*Qnew-1*/
-#endif
+        move16();
     }
 
 
@@ -2778,12 +2910,14 @@ void tcx_encoder_memory_update_ivas_fx(
 
     Copy( xn_buf, synth, L_frame_glob );
     Copy( synth + sub( L_frame_glob, M + 1 ), LPDmem->syn, M + 1 );
+    LPDmem->q_lpd_syn = Q_new;
+    move16();
 
     IF( st->tcxonly == 0 )
     {
         /* Update weighted synthesis */
         Residu3_fx( Ai + imult1616( sub( st->nb_subfr, 1 ), ( M + 1 ) ), synth + sub( L_frame_glob, 1 ), &tmp, 1, 0 );
-        LPDmem->mem_w0 = sub_sat( wsig[sub( L_frame_glob, 1 )], tmp );
+        LPDmem->mem_w0 = sub_sat( wsig[L_frame_glob - 1], tmp );
         move16();
     }
 
@@ -2791,12 +2925,18 @@ void tcx_encoder_memory_update_ivas_fx(
     /* Emphasis of synth -> synth_pe */
     tmp = synth[-( M + 1 )];
     move16();
-    E_UTIL_f_preemph2( Q_new - 1, synth - M, preemph, add( M, L_frame_glob ), &tmp );
+    E_UTIL_f_preemph2( 0, synth - M, preemph, add( M, L_frame_glob ), &tmp ); // Q_new
 
     Copy( synth + sub( L_frame_glob, M ), LPDmem->mem_syn, M );
     Copy( synth + sub( L_frame_glob, M ), LPDmem->mem_syn2, M );
     Copy( synth + sub( L_frame_glob, L_SYN_MEM ), LPDmem->mem_syn_r, L_SYN_MEM );
-    LPDmem->q_mem_syn = sub( shl( Q_new, 1 ), 1 ); // resultant q of synth after E_UTIL_f_preemph2
+
+    /* Aligning the Q-factor of the remaining synthesis memory buffers */
+    Scale_sig( LPDmem->mem_syn1_fx, M, sub( Q_new, LPDmem->q_mem_syn ) );
+    Scale_sig( LPDmem->mem_syn3, M, sub( Q_new, LPDmem->q_mem_syn ) );
+
+    LPDmem->q_mem_syn = Q_new; // resultant q of synth after E_UTIL_f_preemph2
+    move16();
 
     test();
     IF( st->tcxonly == 0 || LE_16( L_frame_glob, L_FRAME16k ) )
@@ -2804,13 +2944,27 @@ void tcx_encoder_memory_update_ivas_fx(
         /* Update excitation */
         IF( LT_16( L_frame_glob, L_EXC_MEM ) )
         {
-            Copy( LPDmem->old_exc + L_frame_glob, LPDmem->old_exc, sub( L_EXC_MEM, L_frame_glob ) );
-            Scale_sig( LPDmem->old_exc, sub( L_EXC_MEM, L_frame_glob ), Q_new );                       // Q_new->2*Q_new
-            Residu3_fx( A, synth, LPDmem->old_exc + sub( L_EXC_MEM, L_frame_glob ), L_frame_glob, 1 ); // 2*Q_new
+            Word16 shift = norm_arr( LPDmem->old_exc + L_frame_glob, sub( L_EXC_MEM, L_frame_glob ) );
+            IF( LT_16( shift, sub( Q_new, LPDmem->q_lpd_old_exc ) ) )
+            {
+                Copy_Scale_sig( LPDmem->old_exc + L_frame_glob, LPDmem->old_exc, sub( L_EXC_MEM, L_frame_glob ), shift );
+                LPDmem->q_lpd_old_exc = add( LPDmem->q_lpd_old_exc, shift );
+                move16();
+                Residu3_fx( A, synth, LPDmem->old_exc + sub( L_EXC_MEM, L_frame_glob ), L_frame_glob, sub( LPDmem->q_lpd_old_exc, Q_new ) ); // LPDmem->q_lpd_old_exc
+            }
+            ELSE
+            {
+                Copy_Scale_sig( LPDmem->old_exc + L_frame_glob, LPDmem->old_exc, sub( L_EXC_MEM, L_frame_glob ), sub( Q_new, LPDmem->q_lpd_old_exc ) );
+                Residu3_fx( A, synth, LPDmem->old_exc + sub( L_EXC_MEM, L_frame_glob ), L_frame_glob, 0 ); // Q_new
+                LPDmem->q_lpd_old_exc = Q_new;
+                move16();
+            }
         }
         ELSE
         {
-            Residu3_fx( A, synth + sub( L_frame_glob, L_EXC_MEM ), LPDmem->old_exc, L_EXC_MEM, 1 ); // 2*Q_new
+            Residu3_fx( A, synth + sub( L_frame_glob, L_EXC_MEM ), LPDmem->old_exc, L_EXC_MEM, 0 ); // Q_new
+            LPDmem->q_lpd_old_exc = Q_new;
+            move16();
         }
     }
 }
@@ -2867,8 +3021,10 @@ Word16 tcx_ari_res_Q_spec_fx(
         {
             sign = x_fac[i];
             move16();
-            if ( signs[i] != 0 )
+            IF( signs[i] != 0 )
+            {
                 sign = negate( sign );
+            }
 
             /* x_Q_m = x_Q[i] - sign*fac_m;
                x_Q_p = x_Q[i] + sign*fac_p; */
@@ -2936,8 +3092,10 @@ Word16 tcx_ari_res_Q_spec_fx(
             bits = add( bits, 1 );
 
             L_tmp = L_shr( thres, s2 );
-            if ( signs[i] )
+            IF( signs[i] )
+            {
                 L_tmp = L_negate( L_tmp );
+            }
             x_Q[i] = L_tmp;
             move32();
         }
@@ -3067,8 +3225,10 @@ Word16 tcx_ari_res_Q_spec_ivas_fx(
                 bits = add( bits, 1 );
 
                 L_tmp = L_shr( thres, s2 );
-                if ( signs[i] )
+                IF( signs[i] )
+                {
                     L_tmp = L_negate( L_tmp );
+                }
                 x_Q[i] = L_tmp;
                 move32();
             }
@@ -3095,8 +3255,10 @@ Word16 tcx_ari_res_Q_spec_ivas_fx(
         {
             sign = x_fac[i];
             move16();
-            if ( signs[i] != 0 )
+            IF( signs[i] != 0 )
+            {
                 sign = negate( sign );
+            }
 
             /* x_Q_m = x_Q[i] - sign*fac_m;
                x_Q_p = x_Q[i] + sign*fac_p; */
@@ -3164,8 +3326,10 @@ Word16 tcx_ari_res_Q_spec_ivas_fx(
             bits = add( bits, 1 );
 
             L_tmp = L_shr( thres, s2 );
-            if ( signs[i] )
+            IF( signs[i] )
+            {
                 L_tmp = L_negate( L_tmp );
+            }
             x_Q[i] = L_tmp;
             move32();
         }
@@ -3210,11 +3374,7 @@ Word16 tcx_res_Q_gain_fx(
     }
 
     /* bring sqGain to same exponent */
-#ifdef BASOP_NOGLOB
     sqGain = shr_sat( sqGain, sub( gain_reQ_e, sqGain_e ) );
-#else
-    sqGain = shr( sqGain, sub( gain_reQ_e, sqGain_e ) );
-#endif
     FOR( bits = 0; bits < TCX_RES_Q_BITS_GAIN; bits++ )
     {
         IF( LT_16( sqGain, gain_reQ ) )
@@ -3301,10 +3461,14 @@ Word16 tcx_res_Q_spec_fx(
         {
             tmp1 = L_add( x_orig[i], 0 );
             tmp2 = Mpy_32_16_1( x_Q[i], sqGain );
-            if ( s > 0 )
+            IF( s > 0 )
+            {
                 tmp2 = L_shr( tmp2, s );
-            if ( s < 0 )
+            }
+            IF( s < 0 )
+            {
                 tmp1 = L_shl( tmp1, s );
+            }
 
             if ( lf_deemph_factors != NULL )
             {
@@ -3318,10 +3482,14 @@ Word16 tcx_res_Q_spec_fx(
                 move16();
                 bits = add( bits, 1 );
 
-                if ( x_Q[i] > 0 )
+                IF( x_Q[i] > 0 )
+                {
                     tmp1 = L_mult( fac_m, lf_deemph_factor );
-                if ( x_Q[i] < 0 )
+                }
+                IF( x_Q[i] < 0 )
+                {
                     tmp1 = L_mult( fac_p, lf_deemph_factor );
+                }
                 x_Q[i] = L_sub( x_Q[i], L_shr( tmp1, s2 ) );
                 move32();
             }
@@ -3331,10 +3499,14 @@ Word16 tcx_res_Q_spec_fx(
                 move16();
                 bits = add( bits, 1 );
 
-                if ( x_Q[i] > 0 )
+                IF( x_Q[i] > 0 )
+                {
                     tmp1 = L_mult( fac_p, lf_deemph_factor );
-                if ( x_Q[i] < 0 )
+                }
+                IF( x_Q[i] < 0 )
+                {
                     tmp1 = L_mult( fac_m, lf_deemph_factor );
+                }
                 x_Q[i] = L_add( x_Q[i], L_shr( tmp1, s2 ) );
                 move32();
             }
@@ -3468,10 +3640,14 @@ Word16 tcx_res_Q_spec_ivas_fx(
         {
             tmp1 = L_add( x_orig[i], 0 );
             tmp2 = Mpy_32_16_1( x_Q[i], sqGain );
-            if ( s > 0 )
+            IF( s > 0 )
+            {
                 tmp2 = L_shr( tmp2, s );
-            if ( s < 0 )
+            }
+            IF( s < 0 )
+            {
                 tmp1 = L_shl( tmp1, s );
+            }
 
             if ( lf_deemph_factors != NULL )
             {
@@ -3485,10 +3661,14 @@ Word16 tcx_res_Q_spec_ivas_fx(
                 move16();
                 bits = add( bits, 1 );
 
-                if ( x_Q[i] > 0 )
+                IF( x_Q[i] > 0 )
+                {
                     tmp1 = L_mult( fac_m, lf_deemph_factor );
-                if ( x_Q[i] < 0 )
+                }
+                IF( x_Q[i] < 0 )
+                {
                     tmp1 = L_mult( fac_p, lf_deemph_factor );
+                }
                 x_Q[i] = L_sub( x_Q[i], L_shr( tmp1, s2 ) );
                 move32();
             }
@@ -3498,10 +3678,14 @@ Word16 tcx_res_Q_spec_ivas_fx(
                 move16();
                 bits = add( bits, 1 );
 
-                if ( x_Q[i] > 0 )
+                IF( x_Q[i] > 0 )
+                {
                     tmp1 = L_mult( fac_p, lf_deemph_factor );
-                if ( x_Q[i] < 0 )
+                }
+                IF( x_Q[i] < 0 )
+                {
                     tmp1 = L_mult( fac_m, lf_deemph_factor );
+                }
                 x_Q[i] = L_add( x_Q[i], L_shr( tmp1, s2 ) );
                 move32();
             }
@@ -3594,8 +3778,13 @@ void ProcessIGF_fx(
     Word16 igfGridIdx;
     Word16 isIndepFlag;
     Word16 bsBits;
-    Word16 bsStart;
+#ifndef HARM_PUSH_BIT
+    Word16 bsStart, pBsStart;
+#else
+    Word16 pBsStart;
+#endif
     BSTR_ENC_HANDLE hBstr = st->hBstr;
+    IGF_ENC_INSTANCE_HANDLE hIGFEnc = st->hIGFEnc;
 
 
     isIndepFlag = 1;
@@ -3649,19 +3838,30 @@ void ProcessIGF_fx(
         Word16 predictionGain = 0;
         Word16 *flatteningTrigger = &( st->hIGFEnc->flatteningTrigger );
 
+
+        move32();
+        move16();
+        move16();
+        move16();
+        move32();
+        move16();
+        move16();
+
         ITF_Detect_fx( spec_before, startLine, endLine, maxOrder, A, &Q_A, &predictionGain, &curr_order, shl( st->hIGFEnc->spec_be_igf_e, 1 ) );
         *flatteningTrigger = 0;
+        move16();
         test();
         IF( LT_32( tns_predictionGain, 9646899l /*1.15 Q23*/ ) &&
             LT_16( predictionGain, 147 /*1.15 Q7*/ ) )
         {
             *flatteningTrigger = 1;
+            move16();
         }
     }
 
-    // IVAS_CODE_BITSTREAM
+#ifndef HARM_PUSH_BIT
     bsStart = hBstr->next_ind_fx;
-
+#endif
     move16();
     hInstance->infoTotalBitsPerFrameWritten = 0;
     move16();
@@ -3669,25 +3869,28 @@ void ProcessIGF_fx(
     {
         IGFEncWriteBitstream_fx( hInstance, NULL, &hInstance->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
     }
+#ifndef HARM_PUSH_BIT
     ELSE
     {
         IGFEncWriteBitstream_fx( hInstance, st->hBstr, &hInstance->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
     }
 
-#ifndef IVAS_CODE_BITSTREAM
     bsBits = sub( hBstr->next_ind_fx, bsStart );
     IF( !isTCX20 )
     {
         IGFEncConcatenateBitstream_fx( hInstance, bsBits, &hBstr->next_ind_fx, &hBstr->nb_bits_tot, hBstr->ind_list );
     }
 #else
-    PMT( "New bit stream implementation to be checked" )
-    bsBits = sub( hBstr->next_ind_fx, bsStart );
-    IF( !isTCX20 )
+    ELSE
     {
-        IGFEncConcatenateBitstream_fx( hInstance, bsBits, &hBstr->next_ind_fx, &hBstr->nb_bits_tot_fx, hBstr->ind_list_fx );
-    }
+        pBsStart = hBstr->nb_ind_tot;
+        move16();
 
+        IGFEncWriteBitstream_ivas_fx( hIGFEnc, hBstr, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
+
+        bsBits = sub( hBstr->nb_ind_tot, pBsStart );
+        IGFEncConcatenateBitstream_ivas_fx( hIGFEnc, bsBits, hBstr );
+    }
 #endif
 }
 
@@ -3713,3 +3916,210 @@ void attenuateNbSpectrum_fx( Word16 L_frame, Word32 *spectrum )
         att = mult_r( att, att );
     }
 }
+
+/*---------------------------------------------------------------------*
+ * ProcessIGF_ivas_fx()
+ *
+ *
+ *---------------------------------------------------------------------*/
+void ProcessIGF_ivas_fx(
+    Encoder_State *st,              /* i  : Encoder state                                           */
+    Word16 powerSpec_len,           /* i  : length of pPowerSpectrum buffer */
+    Word32 *pMDCTSpectrum,          /* i  : MDCT spectrum (*q_spectrum)                                          */
+    Word16 *q_spectrum,             /* i/o: Q of spectrum */
+    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                */
+    const Word16 q_ITFMDCTSpectrum, /* i  : Q of MDCT spectrum fir ITF */
+    Word32 *pPowerSpectrum,         /* i  : MDCT^2 + MDST^2 spectrum, or estimate (*q_powerSpec)                  */
+    Word16 *exp_powerSpec,          /* i/o: Q of power spectrum */
+    const Word16 isTCX20,           /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5   */
+    const Word16 frameno,           /* i  : flag indicating index of current subframe               */
+    const Word16 sp_aud_decision0,  /* i  : first stage switching decision                         */
+    const Word16 vad_hover_flag     /* i  : VAD hangover flag                                      */
+)
+{
+    Word16 igfGridIdx, isIndepFlag, bsBits, pBsStart, curr_order;
+    Word16 predictionGain;
+    Word16 A[ITF_MAX_FILTER_ORDER + 1];
+    Word16 q_A;
+
+    IGF_ENC_INSTANCE_HANDLE hIGFEnc = st->hIGFEnc;
+    BSTR_ENC_HANDLE hBstr = st->hBstr;
+
+    isIndepFlag = 1;
+    move16();
+    test();
+    IF( st->last_core == ACELP_CORE && isTCX20 )
+    {
+        igfGridIdx = IGF_GRID_LB_TRAN;
+        move16();
+    }
+    ELSE IF( isTCX20 )
+    {
+        igfGridIdx = IGF_GRID_LB_NORM;
+        move16();
+    }
+    ELSE
+    {
+        /* It is short block */
+        igfGridIdx = IGF_GRID_LB_SHORT;
+        move16();
+        if ( EQ_16( frameno, 1 ) )
+        {
+            isIndepFlag = 0;
+            move16();
+        }
+    }
+
+    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc, igfGridIdx, pITFMDCTSpectrum, sub( Q31, q_ITFMDCTSpectrum ) );
+
+    IGFEncApplyMono_ivas_fx( st, powerSpec_len, igfGridIdx, pMDCTSpectrum, sub( Q31, *q_spectrum ), pPowerSpectrum, exp_powerSpec, isTCX20, st->hTcxEnc->fUseTns[frameno], sp_aud_decision0, vad_hover_flag );
+
+    curr_order = 0;
+    move16();
+    predictionGain = 0;
+    move16();
+    q_A = 0;
+    move16();
+
+    ITF_Detect_ivas_fx( hIGFEnc->spec_be_igf, hIGFEnc->infoStartLine, hIGFEnc->infoStopLine, 8 /*maxOrder*/, A, &q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc->spec_be_igf_e ) );
+
+    test();
+    IF( LT_16( hIGFEnc->tns_predictionGain, ONE_POINT_ONE_FIVE_Q7 ) && LT_16( predictionGain, ONE_POINT_ONE_FIVE_Q7 ) )
+    {
+        hIGFEnc->flatteningTrigger = 1;
+        move16();
+    }
+    ELSE
+    {
+        hIGFEnc->flatteningTrigger = 0;
+        move16();
+    }
+
+    hIGFEnc->infoTotalBitsPerFrameWritten = 0;
+    move16();
+
+    IF( isTCX20 )
+    {
+        IGFEncWriteBitstream_ivas_fx( hIGFEnc, NULL, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
+    }
+    ELSE
+    {
+        pBsStart = hBstr->nb_ind_tot;
+        move16();
+
+        IGFEncWriteBitstream_ivas_fx( hIGFEnc, hBstr, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
+
+        bsBits = sub( hBstr->nb_ind_tot, pBsStart );
+        IGFEncConcatenateBitstream_ivas_fx( hIGFEnc, bsBits, hBstr );
+    }
+
+    return;
+}
+
+/*---------------------------------------------------------------------*
+ * ProcessStereoIGF()
+ *
+ *
+ *---------------------------------------------------------------------*/
+
+void ProcessStereoIGF_fx(
+    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,
+    Encoder_State *sts[CPE_CHANNELS],                  /* i  : Encoder state                           */
+    Word16 ms_mask[2][MAX_SFB],                        /* i  : bandwise MS mask                        */
+    Word32 *pITFMDCTSpectrum_fx[CPE_CHANNELS][NB_DIV], /* i  : MDCT spectrum fir ITF                   */
+    Word16 q_pITFMDCTSpectrum_1,
+    Word16 q_pITFMDCTSpectrum_2,
+    Word32 *pPowerSpectrum_fx[CPE_CHANNELS],                /* i/o: MDCT^2 + MDST^2 spectrum, or estimate   */
+    Word16 exp_pPowerSpectrum_fx[CPE_CHANNELS],             /* i/o: exp of pPowerSpectrum_fx                */
+    Word32 *pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV],   /* i  : inverse power spectrum                  */
+    Word16 *q_pPowerSpectrumMsInv_fx[CPE_CHANNELS][NB_DIV], /* i/o: Q of pPowerSpectrumMsInv_fx           */
+    Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV],          /* i  : inverse spectrum                        */
+    Word16 exp_inv_spectrum_fx[CPE_CHANNELS],               /* i/o: exp of inv_spectrum_fx                  */
+    const Word16 frameno,                                   /* i  : flag indicating index of current subfr. */
+    const Word16 sp_aud_decision0,                          /* i  : sp_aud_decision0                        */
+    const Word32 element_brate,                             /* i  : element bitrate                         */
+    const Word16 mct_on )
+{
+    Word16 ch, igfGridIdx, isIndepFlag, bsBits, pBsStart, curr_order;
+    Word16 predictionGain;
+    Word16 A[ITF_MAX_FILTER_ORDER + 1];
+    Word16 Q_A;
+    IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS];
+    BSTR_ENC_HANDLE hBstr;
+    hIGFEnc[0] = sts[0]->hIGFEnc;
+    hIGFEnc[1] = sts[1]->hIGFEnc;
+
+    isIndepFlag = 1;
+    move16();
+
+    test();
+    IF( sts[0]->last_core == ACELP_CORE && EQ_16( sts[0]->core, TCX_20_CORE ) )
+    {
+        igfGridIdx = IGF_GRID_LB_TRAN;
+    }
+    ELSE IF( EQ_16( sts[0]->core, TCX_20_CORE ) )
+    {
+        igfGridIdx = IGF_GRID_LB_NORM;
+    }
+    ELSE
+    {
+        /* It is short block */
+        igfGridIdx = IGF_GRID_LB_SHORT;
+        if ( EQ_16( frameno, 1 ) )
+        {
+            isIndepFlag = 0;
+            move16();
+        }
+    }
+    move16();
+
+    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc[0], igfGridIdx, pITFMDCTSpectrum_fx[0][frameno], sub( Q31, q_pITFMDCTSpectrum_1 ) );
+
+    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc[1], igfGridIdx, pITFMDCTSpectrum_fx[1][frameno], sub( Q31, q_pITFMDCTSpectrum_2 ) );
+
+
+    IGFEncApplyStereo_fx( hStereoMdct, ms_mask, hIGFEnc, igfGridIdx, sts, pPowerSpectrum_fx, exp_pPowerSpectrum_fx, pPowerSpectrumMsInv_fx, q_pPowerSpectrumMsInv_fx,
+                          inv_spectrum_fx, exp_inv_spectrum_fx, frameno, sp_aud_decision0, element_brate, mct_on );
+
+    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+    {
+        curr_order = 0;
+        move16();
+
+        Q_A = 0;
+        move16();
+
+        predictionGain = 0;
+        move16();
+
+        ITF_Detect_ivas_fx( hIGFEnc[ch]->spec_be_igf, hIGFEnc[ch]->infoStartLine, hIGFEnc[ch]->infoStopLine, 8 /*maxOrder*/, A, &Q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc[ch]->spec_be_igf_e ) );
+
+        test();
+        hIGFEnc[ch]->flatteningTrigger = LT_16( hIGFEnc[ch]->tns_predictionGain, ONE_POINT_ONE_FIVE_Q7 ) && LT_16( predictionGain, ONE_POINT_ONE_FIVE_Q7 );
+        move16();
+
+        hIGFEnc[ch]->infoTotalBitsPerFrameWritten = 0;
+        move16();
+
+        IF( EQ_16( sts[ch]->core, TCX_20_CORE ) )
+        {
+            IGFEncWriteBitstream_ivas_fx( hIGFEnc[ch], NULL, &hIGFEnc[ch]->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
+        }
+        ELSE
+        {
+            hBstr = sts[ch]->hBstr;
+            pBsStart = hBstr->nb_ind_tot;
+            move16();
+
+            if ( ch > 0 )
+            {
+                hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot;
+            }
+            IGFEncWriteBitstream_ivas_fx( hIGFEnc[ch], hBstr, &hIGFEnc[ch]->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );
+
+            bsBits = sub( hBstr->nb_ind_tot, pBsStart );
+            IGFEncConcatenateBitstream_ivas_fx( hIGFEnc[ch], bsBits, hBstr );
+        }
+    }
+    return;
+}
diff --git a/lib_enc/tfa_enc.c b/lib_enc/tfa_enc.c
deleted file mode 100644
index 825401325748d89d4db5894372ff8dd2e53d76ec..0000000000000000000000000000000000000000
--- a/lib_enc/tfa_enc.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/tfa_enc_fx.c b/lib_enc/tfa_enc_fx.c
index cfb48aaeca8a479efd03489958158bead7ccedbb..a6a1eaa8501e54e4fca18402b1ee6c759fbd53da 100644
--- a/lib_enc/tfa_enc_fx.c
+++ b/lib_enc/tfa_enc_fx.c
@@ -27,13 +27,11 @@ void tfaCalcEnv_fx(
     FOR( i = 0; i < N_TEC_TFA_SUBFR; i++ )
     {
         enr[i] = L_deposit_l( 0 );
+        move32();
         FOR( j = 0; j < L_TEC_TFA_SUBFR16k; j++ )
         {
-#ifdef BASOP_NOGLOB
             enr[i] = L_mac0_sat( enr[i], shb_speech[k], shb_speech[k] );
-#else
-            enr[i] = L_mac0( enr[i], shb_speech[k], shb_speech[k] );
-#endif
+            move32();
             k = add( k, 1 );
         }
     }
@@ -104,8 +102,8 @@ Word16 tfaEnc_TBE_fx(
         test();
         test();
         test();
-        IF( ( GT_32( m_g, L_tmp ) && GT_16( pitch_buf_sum, 7040 /*110 Q6*/ ) && GT_16( voicing_sum, 22938 /*0.70 Q15*/ ) ) ||
-            ( EQ_16( last_core, TCX_20_CORE ) && GT_32( m_g, L_tmp1 ) && LT_16( voicing_sum, 22938 /*0.70 Q15*/ ) ) )
+        if ( ( GT_32( m_g, L_tmp ) && GT_16( pitch_buf_sum, 7040 /*110 Q6*/ ) && GT_16( voicing_sum, 22938 /*0.70 Q15*/ ) ) ||
+             ( EQ_16( last_core, TCX_20_CORE ) && GT_32( m_g, L_tmp1 ) && LT_16( voicing_sum, 22938 /*0.70 Q15*/ ) ) )
         {
             tfa_flag = 1;
             move16();
diff --git a/lib_enc/tns_base_enc.c b/lib_enc/tns_base_enc.c
deleted file mode 100644
index b3f3a90b7702920cfd9566005e7f7d543a794b94..0000000000000000000000000000000000000000
--- a/lib_enc/tns_base_enc.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "wmc_auto.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "stat_com.h"
-
-/*----------------------------------------------------------------------------
- * Local constants
- *---------------------------------------------------------------------------*/
-
-#define HLM_MIN_NRG ( PCM16_TO_FLT_FAC * 2 * NORM_MDCT_FACTOR / ( 640 * 640 ) )
-
-#define MAX_SUBDIVISIONS 3
-
-
-/*---------------------------------------------------------------------*
- * EncodeTnsData()
- *
- *
- *---------------------------------------------------------------------*/
-
-void EncodeTnsData(
-    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */
-    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
-    int16_t *stream,              /* o  : internal data stream              */
-    int16_t *pnSize,              /* o  : number of written parameters      */
-    int16_t *pnBits               /* o  : number of written bits            */
-)
-{
-    *pnSize = 0;
-    *pnBits = 0;
-
-    if ( pTnsConfig->nMaxFilters > 1 )
-    {
-        if ( pTnsConfig->allowTnsOnWhite )
-        {
-            if ( pTnsConfig->iFilterBorders[0] < 512 )
-            {
-                GetParameters( &tnsEnabledOnWhiteSWBTCX10BitMap, 1, pTnsData, &stream, pnSize, pnBits );
-            }
-            else
-            {
-                GetParameters( &tnsEnabledOnWhiteSWBTCX20BitMap, 1, pTnsData, &stream, pnSize, pnBits );
-            }
-        }
-        else
-        {
-            if ( pTnsConfig->iFilterBorders[0] < 512 )
-            {
-                GetParameters( &tnsEnabledSWBTCX10BitMap, 1, pTnsData, &stream, pnSize, pnBits );
-            }
-            else
-            {
-                GetParameters( &tnsEnabledSWBTCX20BitMap, 1, pTnsData, &stream, pnSize, pnBits );
-            }
-        }
-    }
-    else
-    {
-        GetParameters( &tnsEnabledWBTCX20BitMap, 1, pTnsData, &stream, pnSize, pnBits );
-    }
-
-    return;
-}
diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c
index 2f1762e435858dfbee8bee8b2791c5a8ff47312d..05b35813a5bb1efb1a2507cc5e2f7daa65a565cf 100644
--- a/lib_enc/tns_base_enc_fx.c
+++ b/lib_enc/tns_base_enc_fx.c
@@ -12,7 +12,6 @@
 #include <assert.h>
 #include "rom_com_fx.h"
 #include "rom_com.h"
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -26,6 +25,8 @@
  */
 static void GetFilterParameters( Word32 rxx[], Word16 maxOrder, STnsFilter *pTnsFilter );
 
+static void GetFilterParameters_ivas( Word32 rxx[], Word16 maxOrder, STnsFilter *pTnsFilter );
+
 /** Quantization for reflection coefficients.
  *
  * @param parCoeff input reflection coefficients.
@@ -59,6 +60,7 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
     Word16 facs_e[TNS_MAX_NUM_OF_FILTERS][MAX_SUBDIVISIONS]; /* exponents of facs[][] */
     Word16 shifts[TNS_MAX_NUM_OF_FILTERS][MAX_SUBDIVISIONS];
     Word16 iFilter = 0;
+    move16();
 
     ResetTnsData( pTnsData );
 
@@ -76,6 +78,7 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
         Word16 iSubdivisions;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
         Flag Overflow = 0;
+        move32();
 #endif
 
         move16();
@@ -102,12 +105,16 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
             iStartLine = imult1616( tmp, iSubdivisions );
             iEndLine = add( iStartLine, tmp );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iStartLine = mult( iStartLine, 0x2AAB );
+            }
             iStartLine = add( iStartLine, idx0 );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iEndLine = mult( iEndLine, 0x2AAB );
+            }
             iEndLine = add( iEndLine, idx0 );
 
             /*norms[iFilter][iSubdivisions] = norm2FLOAT(pSpectrum+iStartLine, iEndLine-iStartLine);*/
@@ -118,11 +125,7 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
 
             /* Check threshold HLM_MIN_NRG */
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             tmp32 = L_sub( L_shl_o( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ), &Overflow ), 3277l /*HLM_MIN_NRG Q7*/ );
-#else /* BASOP_NOGLOB */
-            tmp32 = L_sub( L_shl( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ) ), 3277l /*HLM_MIN_NRG Q7*/ );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             /* get pre-shift for autocorrelation */
@@ -149,20 +152,12 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
                 move16();
                 facs_e[iFilter][iSubdivisions] = shl( sub( tmp, shifts[iFilter][iSubdivisions] ), 1 );
 
-                tmp = sub( 1, shl( tmp, 1 ) ); /* exponent of autocorrelation */
-#ifdef BASOP_NOGLOB
+                tmp = sub( 1, shl( tmp, 1 ) );                 /* exponent of autocorrelation */
                 L_tmp = L_shl_sat( L_tmp, sub( shift, tmp ) ); /* shift L_tmp to that exponent */
 
                 /* calc factor (with 2 bits headroom for sum of 3 subdivisions) */
                 move16();
                 facs[iFilter][iSubdivisions] = div_s( 0x2000, round_fx_sat( L_tmp ) ); /* L_tmp is >= 0x2000000 */
-#else
-                L_tmp = L_shl( L_tmp, sub( shift, tmp ) ); /* shift L_tmp to that exponent */
-
-                /* calc factor (with 2 bits headroom for sum of 3 subdivisions) */
-                move16();
-                facs[iFilter][iSubdivisions] = div_s( 0x2000, round_fx( L_tmp ) ); /* L_tmp is >= 0x2000000 */
-#endif
             }
         }
     }
@@ -211,12 +206,16 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
             iStartLine = imult1616( spectrumLength, iSubdivisions );
             iEndLine = add( iStartLine, spectrumLength );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iStartLine = mult( iStartLine, 0x2AAB );
+            }
             iStartLine = add( iStartLine, idx0 );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iEndLine = mult( iEndLine, 0x2AAB );
+            }
             iEndLine = add( iEndLine, idx0 );
 
 
@@ -230,11 +229,8 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
             assert( n < (Word16) ( sizeof( tmpbuf ) / sizeof( Word16 ) ) );
             FOR( i = 0; i < n; i++ )
             {
-#ifdef FIX_ISSUE_1147
                 tmpbuf[i] = round_fx_sat( L_shl( pSpectrum[iStartLine + i], shift ) );
-#else
-                tmpbuf[i] = round_fx( L_shl( pSpectrum[iStartLine + i], shift ) );
-#endif
+                move16();
             }
 
             FOR( lag = 0; lag <= pTnsConfig->maxOrder; lag++ )
@@ -244,15 +240,11 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
                 L_tmp = L_deposit_l( 0 );
                 FOR( i = 0; i < n; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp = L_mac0_sat( L_tmp, tmpbuf[i], tmpbuf[i + lag] );
-#else
-                    L_tmp = L_mac0( L_tmp, tmpbuf[i], tmpbuf[i + lag] );
-#endif
                 }
 
-                if ( lag != 0 )
-                    L_tmp = Mpy_32_16_1( L_tmp, *pWindow++ );
+                IF( lag != 0 )
+                L_tmp = Mpy_32_16_1( L_tmp, *pWindow++ );
 
                 L_tmp = Mpy_32_16_1( L_tmp, facs[iFilter][iSubdivisions] );
                 L_tmp = L_shl( L_tmp, facs_e[iFilter][iSubdivisions] );
@@ -311,7 +303,6 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
     }
 
 
-    test();
     return ( pTnsData->nFilters > 0 );
 }
 
@@ -319,8 +310,7 @@ void CalculateTnsFilt_fx(
     STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */
     const Word32 pSpectrum[],     /* i  : MDCT spectrum                     */
     const Word16 pSpectrum_e,
-    STnsData *pTnsData,    /* o  : TNS data struct                   */
-    Word16 *predictionGain /* o  : TNS prediction gain               */
+    STnsData *pTnsData /* o  : TNS data struct                   */
 )
 {
     Word32 norms[TNS_MAX_NUM_OF_FILTERS][MAX_SUBDIVISIONS];
@@ -416,17 +406,10 @@ void CalculateTnsFilt_fx(
             pFilter->spectrumLength = spectrumLength;
             move16();
             /* Limit the maximum order to spectrum length/4 */
-            GetFilterParameters( rxx, s_min( pTnsConfig->maxOrder, shr( pFilter->spectrumLength, 2 ) ), pFilter );
+            GetFilterParameters_ivas( rxx, s_min( pTnsConfig->maxOrder, shr( pFilter->spectrumLength, 2 ) ), pFilter );
         }
     }
 
-    IF( predictionGain )
-    {
-        assert( pTnsConfig->nMaxFilters == 1 );
-        *predictionGain = pTnsData->filter->predictionGain;
-        move16();
-    }
-
     return;
 }
 
@@ -460,6 +443,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
         Word16 iSubdivisions;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
         Flag Overflow = 0;
+        move32();
 #endif
 
         move16();
@@ -486,12 +470,16 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
             iStartLine = imult1616( tmp, iSubdivisions );
             iEndLine = add( iStartLine, tmp );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iStartLine = mult( iStartLine, 0x2AAB );
+            }
             iStartLine = add( iStartLine, idx0 );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iEndLine = mult( iEndLine, 0x2AAB );
+            }
             iEndLine = add( iEndLine, idx0 );
 
             /*norms[iFilter][iSubdivisions] = norm2FLOAT(pSpectrum+iStartLine, iEndLine-iStartLine);*/
@@ -502,11 +490,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
 
             /* Check threshold HLM_MIN_NRG */
             BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef BASOP_NOGLOB
             tmp32 = L_sub( L_shl_o( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ), &Overflow ), 3277l /*HLM_MIN_NRG Q7*/ );
-#else /* BASOP_NOGLOB */
-            tmp32 = L_sub( L_shl( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ) ), 3277l /*HLM_MIN_NRG Q7*/ );
-#endif
             BASOP_SATURATE_WARNING_ON_EVS;
 
             /* get pre-shift for autocorrelation */
@@ -533,20 +517,12 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
                 move16();
                 facs_e[iFilter][iSubdivisions] = shl( sub( tmp, shifts[iFilter][iSubdivisions] ), 1 );
 
-                tmp = sub( 1, shl( tmp, 1 ) ); /* exponent of autocorrelation */
-#ifdef BASOP_NOGLOB
+                tmp = sub( 1, shl( tmp, 1 ) );                 /* exponent of autocorrelation */
                 L_tmp = L_shl_sat( L_tmp, sub( shift, tmp ) ); /* shift L_tmp to that exponent */
 
                 /* calc factor (with 2 bits headroom for sum of 3 subdivisions) */
                 move16();
                 facs[iFilter][iSubdivisions] = div_s( 0x2000, round_fx_sat( L_tmp ) ); /* L_tmp is >= 0x2000000 */
-#else
-                L_tmp = L_shl( L_tmp, sub( shift, tmp ) ); /* shift L_tmp to that exponent */
-
-                /* calc factor (with 2 bits headroom for sum of 3 subdivisions) */
-                move16();
-                facs[iFilter][iSubdivisions] = div_s( 0x2000, round_fx( L_tmp ) ); /* L_tmp is >= 0x2000000 */
-#endif
             }
         }
     }
@@ -595,12 +571,16 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
             iStartLine = imult1616( spectrumLength, iSubdivisions );
             iEndLine = add( iStartLine, spectrumLength );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iStartLine = mult( iStartLine, 0x2AAB );
+            }
             iStartLine = add( iStartLine, idx0 );
 
-            if ( EQ_16( nSubdivisions, 3 ) )
+            IF( EQ_16( nSubdivisions, 3 ) )
+            {
                 iEndLine = mult( iEndLine, 0x2AAB );
+            }
             iEndLine = add( iEndLine, idx0 );
 
 
@@ -625,15 +605,13 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
                 L_tmp = L_deposit_l( 0 );
                 FOR( i = 0; i < n; i++ )
                 {
-#ifdef BASOP_NOGLOB
                     L_tmp = L_mac0_sat( L_tmp, tmpbuf[i], tmpbuf[i + lag] );
-#else
-                    L_tmp = L_mac0( L_tmp, tmpbuf[i], tmpbuf[i + lag] );
-#endif
                 }
 
-                if ( lag != 0 )
+                IF( lag != 0 )
+                {
                     L_tmp = Mpy_32_16_1( L_tmp, *pWindow++ );
+                }
 
                 L_tmp = Mpy_32_16_1( L_tmp, facs[iFilter][iSubdivisions] );
                 L_tmp = L_shl( L_tmp, facs_e[iFilter][iSubdivisions] );
@@ -652,7 +630,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
         }
     }
 
-    if ( predictionGain )
+    IF( predictionGain )
     {
         assert( pTnsConfig->nMaxFilters == 1 );
         move16();
@@ -660,7 +638,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
     }
 
     /* We check the filter's decisions in the opposite direction */
-    FOR( iFilter = sub( pTnsConfig->nMaxFilters, 1 ); iFilter >= 0; iFilter-- )
+    FOR( iFilter = ( pTnsConfig->nMaxFilters - 1 ); iFilter >= 0; iFilter-- )
     {
         STnsFilter *pFilter;
         struct TnsParameters const *pTnsParameters;
@@ -673,7 +651,6 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
         IF( s_or( (Word16) GT_16( pFilter->predictionGain, pTnsParameters->minPredictionGain ),
                   sub( pFilter->avgSqrCoef, pTnsParameters->minAvgSqrCoef ) > 0 ) )
         {
-            move16();
             // pTnsData->nFilters > 0 || isTCX10 || ltp_gain < 0.6f || hTranDet == NULL
             // .6f = 19660, Q=15
             test();
@@ -687,7 +664,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
             ELSE
             {
                 maxEnergyChange = GetTCXMaxenergyChange_ivas_fx( hTranDet, isTCX10, NSUBBLOCKS, 3 );
-                IF( sub( maxEnergyChange, pTnsParameters->minEnergyChange ) >= 0 )
+                IF( sub( maxEnergyChange, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )
                 {
 
                     pTnsData->nFilters = add( pTnsData->nFilters, 1 );
@@ -857,7 +834,69 @@ Word16 WriteTnsData_ivas_fx( STnsConfig const *pTnsConfig, Word16 const *stream,
 /********************************/
 /*      Private functions       */
 /********************************/
+static void GetFilterParameters_ivas( Word32 rxx[], Word16 maxOrder, STnsFilter *pTnsFilter )
+{
+    Word16 i;
+    Word16 parCoeff[TNS_MAX_FILTER_ORDER + 1];
+    Word32 rxx_0;
+    Word32 L_tmp;
+#if TNS_COEF_RES == 5
+    Word16 const *values = tnsCoeff5;
+#elif TNS_COEF_RES == 4
+    Word16 const *values = tnsCoeff4;
+#elif TNS_COEF_RES == 3
+    Word16 const *values = tnsCoeff3;
+#endif
+    Word16 *indexes = pTnsFilter->coefIndex;
+
+    rxx_0 = rxx[0];
+    move32();
+    /* compute TNS filter in lattice (ParCor) form with LeRoux-Gueguen algorithm */
+    L_tmp = E_LPC_schur_ivas( rxx, parCoeff, maxOrder );
+    BASOP_SATURATE_WARNING_OFF_EVS /* Allow saturation, this value is compared against a threshold. */
+        Word16 temp_e = 0;
+    move16();
+    Word16 temp = BASOP_Util_Divide3232_Scale( rxx_0, L_tmp, &temp_e );
+    pTnsFilter->predictionGain32 = L_deposit_h( temp );
+    move32();
+    pTnsFilter->predictionGain_e = temp_e;
+    move16();
+    pTnsFilter->predictionGain = shl_sat( temp, sub( temp_e, PRED_GAIN_E ) ); // Q7
+    move16();
+    BASOP_SATURATE_WARNING_ON_EVS
+    /* non-linear quantization of TNS lattice coefficients with given resolution */
+    Parcor2Index( parCoeff, indexes, maxOrder );
+
+    /* reduce filter order by truncating trailing zeros */
+    i = sub( maxOrder, 1 );
+
+    test();
+    WHILE( ( i >= 0 ) && ( indexes[i] == 0 ) )
+    {
+        i = sub( i, 1 );
+    }
+
+
+    pTnsFilter->order = add( i, 1 );
+    move16();
+
+    /* compute avg(coef*coef) */
+    L_tmp = L_deposit_l( 0 );
+
+    FOR( i = pTnsFilter->order - 1; i >= 0; i-- )
+    {
+        Word16 value;
+
+        value = shr( values[indexes[i] + INDEX_SHIFT], 1 );
+
+        L_tmp = L_mac0( L_tmp, value, value );
+    }
 
+    pTnsFilter->avgSqrCoef = round_fx( L_tmp );
+    move16();
+    /* assert(maxOrder == 8);
+     pTnsFilter->avgSqrCoef = shr(pTnsFilter->avgSqrCoef, 3); */
+}
 static void GetFilterParameters( Word32 rxx[], Word16 maxOrder, STnsFilter *pTnsFilter )
 {
     Word16 i;
@@ -884,8 +923,10 @@ static void GetFilterParameters( Word32 rxx[], Word16 maxOrder, STnsFilter *pTns
     /* reduce filter order by truncating trailing zeros */
     i = sub( maxOrder, 1 );
 
+    test();
     WHILE( ( i >= 0 ) && ( indexes[i] == 0 ) )
     {
+        test();
         i = sub( i, 1 );
     }
 
@@ -899,10 +940,8 @@ static void GetFilterParameters( Word32 rxx[], Word16 maxOrder, STnsFilter *pTns
     {
         Word16 value;
 
-        move16();
         value = shr( values[indexes[i] + INDEX_SHIFT], 1 );
 
-        move16();
         L_tmp = L_mac0( L_tmp, value, value );
     }
     move16();
@@ -921,7 +960,6 @@ static void Parcor2Index( const Word16 parCoeff[] /*Q15*/, Word16 index[], Word1
     Word16 x;
 
 
-    move16();
     move16();
     nValues = 1 << TNS_COEF_RES;
 #if TNS_COEF_RES == 5
@@ -942,10 +980,13 @@ static void Parcor2Index( const Word16 parCoeff[] /*Q15*/, Word16 index[], Word1
         /* parCoeff is in the range of -1.0 ... 1.0 by definition */
         /* assert((x >= FL2WORD16(-1.0f)) && (x <= FL2WORD16(1.0f))); */
 
+        test();
         WHILE( ( iIndex < nValues ) && ( x > add( shr( values[iIndex - 1], 1 ), shr( values[iIndex], 1 ) ) ) )
         {
+            test();
             iIndex = add( iIndex, 1 );
         }
         index[i] = sub( iIndex, 1 + INDEX_SHIFT );
+        move16();
     }
 }
diff --git a/lib_enc/transient_detection.c b/lib_enc/transient_detection.c
deleted file mode 100644
index 8e87e5685392d3f3d073201ea23f756e0c7592f3..0000000000000000000000000000000000000000
--- a/lib_enc/transient_detection.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "stat_enc.h"
-#include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include <assert.h>
-#include "wmc_auto.h"
-
-#include "prot_fx.h"
-#include "ivas_prot_fx.h"
-/*---------------------------------------------------------------*
- * Local constants
- *---------------------------------------------------------------*/
-
-#define MIN_BLOCK_ENERGY 107.37f
-
-#define THR_HIGH      8.5f
-#define THR_NORM_HIGH 8.0f
-#define THR_NORM_LOW  4.5f
-#define THR_LOW       4.25f
-#define THR_LOW_STEP  1.0f
-
-/*---------------------------------------------------------------*
- * Local function prototypes
- *---------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * InitTransientDetection()
- *
- *
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * GetTCXAvgTemporalFlatnessMeasure()
- *
- *
- *-------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------*
- * GetTCXMaxenergyChange()
- *
- *
- *-------------------------------------------------------------------*/
-
-
-/*---------------------------------------------------------------*
- * Local functions
- *---------------------------------------------------------------*/
-
-/** TCX decision.
- * Check if there is an attack in a subblock. Version for TCX Long/Short decision.
- * See TCheckSubblocksForAttack for definition of parameters.
- * It is assumed that the delay of MDCT overlap was not taken into account, so that the last subblock corresponds to the newest input subblock.
- */
-
-
-/** Init transient detector.
- * Fills TransientDetector structure with sensible content and enable it.
- * @param pSubblockEnergies Subblock energies used in this transient detector.
- * @param nDelay Delay for this transient detector.
- * @param nSubblocksToCheck Number of subblocks to check in this transient detector.
- * @param pCheckSubblockForAttack Attack detection function for this transient detector.
- * @param pSetAttackPosition Function for finalizing this transient detector.
- * @param attackRatioThreshold Attack ratio threshold.
- * @param pTransientDetector Structure to be initialized.
- */
-
-
-/*-------------------------------------------------------------------*
- * set_transient_stereo()
- *
- *
- *-------------------------------------------------------------------*/
-void set_transient_stereo_fx(
-    CPE_ENC_HANDLE hCPE,  /* i  : CPE structure               */
-    Word16 currFlatness[] /* i/o: current flatness            */
-)
-{
-    Word16 n, attackIsPresent;
-    Word16 currFlatnessMax;
-    Encoder_State **sts;
-
-    sts = hCPE->hCoreCoder;
-
-    /* for DFT/TD based stereo ,map avg. flatness to individual stereo channels (M/S or X/Y) */
-    maximum_fx( currFlatness, CPE_CHANNELS, &currFlatnessMax );
-    attackIsPresent = 0;
-    move16();
-
-    FOR( n = 0; n < CPE_CHANNELS; n++ )
-    {
-        attackIsPresent = s_max( attackIsPresent, sts[n]->hTranDet->transientDetector.bIsAttackPresent );
-    }
-
-    set16_fx( currFlatness, currFlatnessMax, CPE_CHANNELS );
-
-    FOR( n = 0; n < CPE_CHANNELS; n++ )
-    {
-        sts[n]->hTranDet->transientDetector.bIsAttackPresent = attackIsPresent;
-        move16();
-    }
-
-    IF( hCPE->hStereoDft != NULL )
-    {
-        IF( hCPE->hStereoDft->attackPresent )
-        {
-            hCPE->hStereoDft->wasTransient = 1;
-            move16();
-        }
-        ELSE IF( hCPE->hStereoDft->wasTransient )
-        {
-            hCPE->hStereoDft->wasTransient = 0;
-            move16();
-        }
-
-        hCPE->hStereoDft->attackPresent = attackIsPresent;
-        move16();
-
-        hCPE->hStereoDft->hItd->currFlatness_fx = 0;
-        move16();
-        FOR( n = 0; n < CPE_CHANNELS; n++ )
-        {
-            hCPE->hStereoDft->hItd->currFlatness_fx = s_max( hCPE->hStereoDft->hItd->currFlatness_fx, currFlatness[n] );
-        }
-    }
-
-    IF( hCPE->hStereoMdct != NULL )
-    {
-        hCPE->hStereoMdct->hItd->currFlatness_fx = 0;
-        move16();
-        FOR( n = 0; n < CPE_CHANNELS; n++ )
-        {
-            hCPE->hStereoMdct->hItd->currFlatness_fx = s_max( hCPE->hStereoMdct->hItd->currFlatness_fx, currFlatness[n] );
-        }
-    }
-
-    return;
-}
-/*-------------------------------------------------------------------*
- * transient_analysis()
- *
- *
- *-------------------------------------------------------------------*/
diff --git a/lib_enc/transient_detection_fx.c b/lib_enc/transient_detection_fx.c
index bb977b432ecc2b0a6bc72f5775a7f9227452a986..1ad69a3302b2c79e2879d313f98413b1a7eba2fc 100644
--- a/lib_enc/transient_detection_fx.c
+++ b/lib_enc/transient_detection_fx.c
@@ -16,6 +16,7 @@
 #include "ivas_prot_fx.h" /* Function prototypes                    */
 #include "prot_fx_enc.h"  /* Function prototypes                    */
 
+
 /* Exponent of attack threshold. Picked according to current threshold values. */
 #define ATTACKTHRESHOLD_E 4
 /* Exponent of subblock energies and accumulated subblock energies.
@@ -141,6 +142,107 @@ static void GetAttackForTCXDecision( Word32 const *pSubblockNrg, Word32 const *p
     *pbIsAttackPresent = bIsAttackPresent;
 }
 
+static void GetAttackForTCXDecision_ivas_fx( Word32 const *pSubblockNrg, Word32 const *pAccSubblockNrg, Word16 nSubblocks, Word16 nPastSubblocks, Word16 attackRatioThreshold, Word16 *pbIsAttackPresent, Word16 *pAttackIndex )
+{
+    Word16 i;
+    Word16 bIsAttackPresent, attackIndex;
+    Word16 attackRatioThreshold_1_5;
+    Word64 W_tmp1, W_tmp2, W_tmp3;
+
+    (void) nPastSubblocks;
+    (void) nSubblocks;
+    assert( nSubblocks >= NSUBBLOCKS );
+    assert( nPastSubblocks >= 2 );
+
+    /* attackRatioThreshold_1_5 = attackRatioThreshold * 1.5, exponent is ATTACKTHRESHOLD_E+1 */
+    attackRatioThreshold_1_5 = add( shr( attackRatioThreshold, 2 ), shr( attackRatioThreshold, 1 ) );
+
+    move16();
+    move16();
+    bIsAttackPresent = FALSE;
+    attackIndex = -1;
+    /* Search for the last attack in the subblocks */
+    IF( s_or( (Word16) GT_32( L_shr( pSubblockNrg[-1], ATTACKTHRESHOLD_E ), Mpy_32_16_1( pAccSubblockNrg[-1], attackRatioThreshold ) ),
+              L_sub( L_shr( pSubblockNrg[-2], ATTACKTHRESHOLD_E ), Mpy_32_16_1( pAccSubblockNrg[-2], attackRatioThreshold ) ) > 0 ) )
+    {
+        move16();
+        bIsAttackPresent = TRUE;
+        attackIndex = 0;
+        move16();
+    }
+
+    FOR( i = 0; i < NSUBBLOCKS; i++ )
+    {
+        W_tmp2 = W_shr( W_mult_32_16( pAccSubblockNrg[i], attackRatioThreshold ), 1 );
+        W_tmp1 = W_shl( pSubblockNrg[i], ( 15 - ATTACKTHRESHOLD_E ) );
+
+        IF( GT_64( W_tmp1, W_tmp2 ) )
+        {
+            if ( i < 6 )
+            {
+                move16();
+                bIsAttackPresent = TRUE;
+            }
+
+            IF( s_and( (Word16) NE_16( attackIndex, 2 ), (Word16) NE_16( attackIndex, 6 ) ) )
+            {
+                move16();
+                attackIndex = i;
+                W_tmp2 = W_shr( W_mult_32_16( pAccSubblockNrg[i], attackRatioThreshold ), 1 );
+                W_tmp2 = W_add( W_tmp2, W_shr( W_tmp2, 3 ) ); // pAccSubblockNrg[i] * 1.125f
+                W_tmp1 = W_shl( pSubblockNrg[i], ( 15 - ATTACKTHRESHOLD_E ) );
+                if ( s_and( (Word16) LT_64( W_tmp1, W_tmp2 ), s_or( (Word16) EQ_16( i, 2 ), (Word16) EQ_16( i, 6 ) ) ) )
+                {
+                    attackIndex = add( attackIndex, 1 ); /* avoid minimum overlap to prevent clicks */
+                }
+            }
+        }
+        ELSE /* no attack, but set index anyway in case of strong energy increase */
+        {
+            W_tmp2 = W_shr( W_mult_32_16( pSubblockNrg[i - 1], attackRatioThreshold_1_5 ), 1 );
+            W_tmp1 = W_shl( pSubblockNrg[i], ( 15 - ( ATTACKTHRESHOLD_E + 1 ) ) );
+            W_tmp3 = W_shr( W_mult_32_16( pSubblockNrg[i - 2], attackRatioThreshold_1_5 ), 1 );
+
+            IF( s_and( ( (Word16) GT_64( W_tmp1, W_tmp2 ) ),
+                       ( W_sub( W_tmp1, W_tmp3 ) > 0 ) ) )
+            {
+
+                IF( s_and( (Word16) NE_16( attackIndex, 2 ), (Word16) NE_16( attackIndex, 6 ) ) )
+                {
+                    move16();
+                    attackIndex = i;
+
+                    W_tmp2 = W_mult_32_16( pSubblockNrg[i - 1], attackRatioThreshold );
+                    W_tmp3 = W_mult_32_16( pSubblockNrg[i - 2], attackRatioThreshold );
+                    W_tmp1 = W_shl( pSubblockNrg[i], ( 15 - ATTACKTHRESHOLD_E ) );
+
+                    if ( s_and( (Word16) s_or( (Word16) LT_64( W_tmp1, W_tmp2 ), (Word16)
+                                                                                     LT_64( W_tmp1, W_tmp3 ) ),
+                                s_or( (Word16) EQ_16( i, 2 ), (Word16) EQ_16( i, 6 ) ) ) )
+                    {
+                        attackIndex = add( attackIndex, 1 ); /* avoid minimum overlap to prevent clicks */
+                    }
+                }
+            }
+        }
+    }
+    /* avoid post-echos on click sounds (very short transients) due to TNS aliasing */
+    if ( EQ_16( attackIndex, 4 ) )
+    {
+        move16();
+        attackIndex = 7;
+    }
+    if ( EQ_16( attackIndex, 5 ) )
+    {
+        move16();
+        attackIndex = 6;
+    }
+
+    move16();
+    move16();
+    *pAttackIndex = attackIndex;
+    *pbIsAttackPresent = bIsAttackPresent;
+}
 
 void GetAttackForTCXDecision_fx( Word32 const *pSubblockNrg, Word32 const *pAccSubblockNrg, Word16 nSubblocks, Word16 nPastSubblocks, Word16 attackRatioThreshold, Word16 *pbIsAttackPresent, Word16 *pAttackIndex )
 {
@@ -256,7 +358,7 @@ void InitTransientDetection_ivas_fx( Word16 nFrameLength,
     /* Init a subblock energies buffer used for the TCX Short/Long decision. */
     InitSubblockEnergies_ivas_fx( nFrameLength, nTCXDelay, &pTransientDetection->delayBuffer, &pTransientDetection->subblockEnergies );
     /* Init the TCX Short/Long transient detector. */
-    InitTransientDetector_ivas_fx( &pTransientDetection->subblockEnergies, nTCXDelay, NSUBBLOCKS, GetAttackForTCXDecision, 17408 /*8.5f/(1<<ATTACKTHRESHOLD_E) Q15*/, &pTransientDetection->transientDetector );
+    InitTransientDetector_ivas_fx( &pTransientDetection->subblockEnergies, nTCXDelay, NSUBBLOCKS, GetAttackForTCXDecision_ivas_fx, 17408 /*8.5f/(1<<ATTACKTHRESHOLD_E) Q15*/, &pTransientDetection->transientDetector );
     /* We need two past subblocks for the TCX TD and NSUBBLOCKS+1 for the temporal flatness measure FOR the TCX LTP. */
     IF( ext_mem_flag )
     {
@@ -317,16 +419,17 @@ Word16 GetTCXAvgTemporalFlatnessMeasure_fx( struct TransientDetection const *pTr
     return i;
 }
 
-Word16 GetTCXAvgTemporalFlatnessMeasure_ivas_fx( struct TransientDetection const *pTransientDetection, Word16 nCurrentSubblocks, Word16 nPrevSubblocks )
+Word32 GetTCXAvgTemporalFlatnessMeasure_ivas_fx( struct TransientDetection const *pTransientDetection, Word16 nCurrentSubblocks, Word16 nPrevSubblocks )
 {
-    Word16 i;
+    Word32 i;
     TransientDetector const *pTransientDetector;
     SubblockEnergies const *pSubblockEnergies;
     Word16 nDelay;
     Word16 nRelativeDelay;
-    Word16 const *pSubblockNrgChange;
+    Word32 const *pSubblockNrgChange;
+    Word16 const *pSubblockNrgChange_exp;
     Word32 sumTempFlatness;
-    Word16 nTotBlocks;
+    Word16 nTotBlocks, sumTempFlatness_exp, exp;
 
     /* Initialization */
     pTransientDetector = &pTransientDetection->transientDetector;
@@ -343,15 +446,21 @@ Word16 GetTCXAvgTemporalFlatnessMeasure_ivas_fx( struct TransientDetection const
 
     assert( ( nPrevSubblocks <= nRelativeDelay ) && ( nCurrentSubblocks <= NSUBBLOCKS + nDelay ) );
 
-    pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange[sub( nRelativeDelay, nPrevSubblocks )]; // subblockNrgChange Q3
+    pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange_32fx[( nRelativeDelay - nPrevSubblocks )];
+    pSubblockNrgChange_exp = &pSubblockEnergies->subblockNrgChange_exp[( nRelativeDelay - nPrevSubblocks )];
+    sumTempFlatness = 0;
+    move32();
+    sumTempFlatness_exp = 0;
+    move16();
     FOR( i = 0; i < nTotBlocks; i++ )
     {
-        sumTempFlatness = L_add( sumTempFlatness, L_deposit_l( pSubblockNrgChange[i] ) );
+        sumTempFlatness = BASOP_Util_Add_Mant32Exp( sumTempFlatness, sumTempFlatness_exp, pSubblockNrgChange[i], pSubblockNrgChange_exp[i], &sumTempFlatness_exp );
     }
 
     /* exponent = AVG_FLAT_E */
-    i = div_l( L_shl( sumTempFlatness, 5 ), nTotBlocks ); // Q7
-
+    i = BASOP_Util_Divide3232_Scale_newton( sumTempFlatness, nTotBlocks, &exp );
+    exp = add( exp, sub( sumTempFlatness_exp, 31 ) );
+    i = L_shl_sat( i, sub( exp, 10 ) ); // Can be saturated, since it is used for comparision againt 3.25/20.0f, Q21
     return i;
 }
 
@@ -377,9 +486,11 @@ Word16 GetTCXMaxenergyChange_fx( struct TransientDetection const *pTransientDete
     nRelativeDelay = sub( pSubblockEnergies->nDelay, nDelay );
     pSubblockNrgChange = NULL;
     nTotBlocks = nCurrentSubblocks + nPrevSubblocks;
+    move16();
 
     assert( nTotBlocks > 0 );
     maxEnergyChange = 0 /*0.0f Q7*/;
+    move16();
 
     assert( ( nPrevSubblocks <= nRelativeDelay ) && ( nCurrentSubblocks <= NSUBBLOCKS + nDelay ) );
     pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange[nRelativeDelay - nPrevSubblocks];
@@ -442,7 +553,8 @@ Word16 GetTCXMaxenergyChange_ivas_fx( TRAN_DET_HANDLE hTranDet,
     SubblockEnergies const *pSubblockEnergies;
     Word16 nDelay;
     Word16 nRelativeDelay;
-    Word16 const *pSubblockNrgChange;
+    Word32 const *pSubblockNrgChange;
+    Word16 const *pSubblockNrgChange_exp;
     Word16 maxEnergyChange;
     Word16 nTotBlocks;
 
@@ -459,7 +571,8 @@ Word16 GetTCXMaxenergyChange_ivas_fx( TRAN_DET_HANDLE hTranDet,
     maxEnergyChange = 0 /*0.0f Q3*/;
     move16();
     assert( ( nPrevSubblocks <= nRelativeDelay ) && ( nCurrentSubblocks <= NSUBBLOCKS + nDelay ) );
-    pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange[nRelativeDelay - nPrevSubblocks];
+    pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange_32fx[nRelativeDelay - nPrevSubblocks];
+    pSubblockNrgChange_exp = &pSubblockEnergies->subblockNrgChange_exp[nRelativeDelay - nPrevSubblocks];
 
     IF( s_or( pTransientDetector->bIsAttackPresent, isTCX10 ) ) /* frame is TCX-10 */
     {
@@ -498,7 +611,7 @@ Word16 GetTCXMaxenergyChange_ivas_fx( TRAN_DET_HANDLE hTranDet,
 
     FOR( i = 0; i < nTotBlocks; i++ )
     {
-        maxEnergyChange = s_max( maxEnergyChange, pSubblockNrgChange[i] );
+        maxEnergyChange = s_max( maxEnergyChange, extract_l( L_shl_sat( pSubblockNrgChange[i], sub( pSubblockNrgChange_exp[i], 28 ) ) ) ); // Q3
     }
 
     move16();
@@ -525,16 +638,6 @@ void RunTransientDetection_fx( Word16 const *input, Word16 nSamplesAvailable, Tr
 
     /* Update the delay buffer. */
     UpdateDelayBuffer( filteredInput, nSamplesAvailable, &pTransientDetection->delayBuffer );
-#ifdef IVAS_CODE
-    /* compute ramp up flag */
-    pSubblockEnergies->ramp_up_flag = ( ( pSubblockEnergies->ramp_up_flag << 1 ) & 0x0003 );
-    e0 = dotp( filteredInput + length / 2, filteredInput + length / 2, pSubblockEnergies->pDelayBuffer->nSubblockSize / 2 ) + 0.5f * MIN_BLOCK_ENERGY;
-    e1 = pSubblockEnergies->subblockNrg[pSubblockEnergies->nDelay + 4] - e0;
-    if ( e1 > e0 )
-    {
-        pSubblockEnergies->ramp_up_flag |= 0x0001;
-    }
-#endif
 }
 
 
@@ -565,13 +668,13 @@ void RunTransientDetection_ivas_fx(
     IF( GT_16( sub( q_input, pSubblockEnergies->q_firState ), shift ) )
     {
         Scale_sig( input_fx, length, add( sub( pSubblockEnergies->q_firState, q_input ), shift ) ); // q_firState + shift
+        q_input = add( pSubblockEnergies->q_firState, shift );                                      // q_firState + shift
         pSubblockEnergies->firState1 = shl( pSubblockEnergies->firState1, shift );                  // q_firState + shift
         move16();
         pSubblockEnergies->firState2 = shl( pSubblockEnergies->firState2, shift ); // q_firState + shift
         move16();
         pSubblockEnergies->q_firState = add( pSubblockEnergies->q_firState, shift ); // q_firState + shift
         move16();
-        q_input = add( pSubblockEnergies->q_firState, shift ); // q_firState + shift
     }
     ELSE
     {
@@ -597,11 +700,7 @@ void RunTransientDetection_ivas_fx(
     }
 
     /* Update subblock energies. */
-#ifdef MSAN_FIX
     Scale_sig( filteredInput_fx, length, sub( 0, q_input ) ); // q0
-#else
-    Scale_sig( filteredInput_fx, L_FRAME_MAX, 8 );
-#endif
     UpdateSubblockEnergies_ivas_fx( filteredInput_fx, length, pSubblockEnergies );
 
     /* Run transient detectors. */
@@ -617,7 +716,7 @@ void RunTransientDetection_ivas_fx(
     e0_fx = dotp_fx( filteredInput_fx + /* length / 2 */ shr( length, 1 ), filteredInput_fx + /* length / 2 */ shr( length, 1 ), shr( pSubblockEnergies->pDelayBuffer->nSubblockSize, 1 ) /* pSubblockEnergies->pDelayBuffer->nSubblockSize / 2 */, &exp );
     exp = sub( exp, 2 * 0 - 1 ); // Q = 2*0 + (30-exp), E = 31 - (2*0 + 30 - exp) = 1 + exp - 2*0 = exp - (2*0-1)
     e0_fx = BASOP_Util_Add_Mant32Exp( MIN_BLOCK_ENERGY_IVAS_FX_Q7 / 2, 31 - Q7, e0_fx, exp, &exp );
-    e1_fx = BASOP_Util_Add_Mant32Exp( pSubblockEnergies->subblockNrg[pSubblockEnergies->nDelay + 4], 31 - 0, L_negate( e0_fx ), exp, &exp1 );
+    e1_fx = BASOP_Util_Add_Mant32Exp( pSubblockEnergies->subblockNrg[pSubblockEnergies->nDelay + 4], 32, L_negate( e0_fx ), exp, &exp1 );
     IF( BASOP_Util_Cmp_Mant32Exp( e1_fx, exp1, e0_fx, exp ) > 0 )
     {
         pSubblockEnergies->ramp_up_flag = (UWord16) L_or( pSubblockEnergies->ramp_up_flag, 0x0001 );
@@ -715,6 +814,20 @@ void SetTCXModeInfo_ivas_fx(
                 move16();
             }
         }
+
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+#ifdef DEBUGGING
+        if ( st->force == FORCE_TCX10 )
+        {
+            hTcxEnc->tcxMode = TCX_10;
+        }
+        else if ( st->force == FORCE_TCX20 )
+        {
+            hTcxEnc->tcxMode = TCX_20;
+        }
+#endif
+#endif
+
         /* set the left window overlap */
         test();
         test();
@@ -752,13 +865,13 @@ void SetTCXModeInfo_ivas_fx(
                     move16();
                 }
             }
-            tmp = BASOP_Util_Divide3216_Scale( ONE_IN_Q23, GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) hTranDet, NSUBBLOCKS, 0 ), &exp_diff );
+            tmp = BASOP_Util_Divide3232_Scale( ONE_IN_Q21, GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) hTranDet, NSUBBLOCKS, 0 ), &exp_diff );
             tmp = shl_sat( tmp, exp_diff ); // Q15
             test();
             IF( isLongTermTransient_fx( L_deposit_h( tmp ), &hTcxEnc->tfm_mem_fx ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
             {
                 test();
-                if ( NE_16( *tcxModeOverlap, MIN_OVERLAP ) && LT_16( hTcxEnc->tcxltp_norm_corr_past, 18432 /* 0.5625f in Q15 */ ) )
+                IF( NE_16( *tcxModeOverlap, MIN_OVERLAP ) && LT_16( hTcxEnc->tcxltp_norm_corr_past, 18432 /* 0.5625f in Q15 */ ) )
                 {
                     *tcxModeOverlap = HALF_OVERLAP;
                     move16();
@@ -782,7 +895,7 @@ void SetTCXModeInfo_ivas_fx(
                 *tcxModeOverlap = ALDO_WINDOW;
                 move16();
             }
-            tmp = BASOP_Util_Divide3216_Scale( ONE_IN_Q23, GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) hTranDet, NSUBBLOCKS, 0 ), &exp_diff );
+            tmp = BASOP_Util_Divide3232_Scale( ONE_IN_Q21, GetTCXAvgTemporalFlatnessMeasure_ivas_fx( (const TransientDetection *) hTranDet, NSUBBLOCKS, 0 ), &exp_diff );
             tmp = shl_sat( tmp, exp_diff ); // Q15
             test();
             IF( isLongTermTransient_fx( L_deposit_h( tmp ), &hTcxEnc->tfm_mem_fx ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
@@ -809,7 +922,7 @@ void SetTCXModeInfo_ivas_fx(
 
         /* for the ACELP -> TCX transition frames use full right window overlap */
         test();
-        if ( ( EQ_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) ) && ( EQ_16( *tcxModeOverlap, ALDO_WINDOW ) ) )
+        IF( ( EQ_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) ) && ( EQ_16( *tcxModeOverlap, ALDO_WINDOW ) ) )
         {
             *tcxModeOverlap = FULL_OVERLAP;
             move16();
@@ -967,6 +1080,7 @@ static void InitDelayBuffer( Word16 nFrameLength, Word16 nDelay, DelayBuffer *pD
 static void InitSubblockEnergies( Word16 nFrameLength, Word16 nDelay, DelayBuffer *pDelayBuffer, SubblockEnergies *pSubblockEnergies )
 {
     Word16 const nMaxBuffSize = sizeof( pSubblockEnergies->subblockNrg ) / sizeof( pSubblockEnergies->subblockNrg[0] );
+    move16();
     (void) nFrameLength;
 
 
@@ -975,12 +1089,17 @@ static void InitSubblockEnergies( Word16 nFrameLength, Word16 nDelay, DelayBuffe
     set32_fx( pSubblockEnergies->subblockNrg, MIN_BLOCK_ENERGY, nMaxBuffSize );
     set32_fx( pSubblockEnergies->accSubblockNrg, MIN_BLOCK_ENERGY, nMaxBuffSize + 1 );
     set16_fx( pSubblockEnergies->subblockNrgChange, 0x7fff, nMaxBuffSize );
-    pSubblockEnergies->nDelay = nDelay / pDelayBuffer->nSubblockSize;
+    pSubblockEnergies->nDelay = idiv1616_1( nDelay, pDelayBuffer->nSubblockSize );
     assert( pSubblockEnergies->nDelay < nMaxBuffSize );
     pSubblockEnergies->nPartialDelay = nDelay % pDelayBuffer->nSubblockSize;
     pSubblockEnergies->facAccSubblockNrg = 26624 /*0.8125f Q15*/; /* Energy accumulation factor */
     pSubblockEnergies->firState1 = 0;
     pSubblockEnergies->firState2 = 0;
+    move16();
+    move16();
+    move16();
+    move16();
+    move16();
 
     pSubblockEnergies->pDelayBuffer = pDelayBuffer;
     pDelayBuffer->nDelay = s_max( pDelayBuffer->nDelay, pSubblockEnergies->nPartialDelay );
@@ -993,9 +1112,10 @@ static void InitSubblockEnergies_ivas_fx( Word16 nFrameLength, Word16 nDelay, De
 
     assert( ( pDelayBuffer != NULL ) && ( pSubblockEnergies != NULL ) && ( pDelayBuffer->nSubblockSize * NSUBBLOCKS == nFrameLength ) && ( pDelayBuffer->nSubblockSize > 0 ) );
 
-    set32_fx( pSubblockEnergies->subblockNrg, 107 /* 107.37 in Q0 */, nMaxBuffSize );
-    set32_fx( pSubblockEnergies->accSubblockNrg, 107 /* 107.37 in Q0 */, nMaxBuffSize + 1 );
-    set16_fx( pSubblockEnergies->subblockNrgChange, ONE_IN_Q3, nMaxBuffSize );
+    set32_fx( pSubblockEnergies->subblockNrg, 54 /* 107.37 in Q(-1) */, nMaxBuffSize );
+    set32_fx( pSubblockEnergies->accSubblockNrg, 54 /* 107.37 in Q(-1) */, nMaxBuffSize + 1 );
+    set32_fx( pSubblockEnergies->subblockNrgChange_32fx, ONE_IN_Q15, nMaxBuffSize );
+    set16_fx( pSubblockEnergies->subblockNrgChange_exp, 16, nMaxBuffSize );
     IF( nDelay != 0 )
     {
         pSubblockEnergies->nDelay = idiv1616( nDelay, pDelayBuffer->nSubblockSize );
@@ -1043,16 +1163,22 @@ static void InitTransientDetector_fx( SubblockEnergies *pSubblockEnergies, Word1
     assert( ( pSubblockEnergies != NULL ) && ( pSubblockEnergies->pDelayBuffer != NULL ) && ( pTransientDetector != NULL ) && ( pSubblockEnergies->pDelayBuffer->nSubblockSize != 0 ) );
     pTransientDetector->pSubblockEnergies = pSubblockEnergies;
     pTransientDetector->nDelay = ( nDelay - pSubblockEnergies->nPartialDelay ) / pSubblockEnergies->pDelayBuffer->nSubblockSize;
+    move16();
     assert( nDelay == pTransientDetector->nDelay * pSubblockEnergies->pDelayBuffer->nSubblockSize + pSubblockEnergies->nPartialDelay );
     assert( pTransientDetector->nDelay < nMaxBuffSize );
     pSubblockEnergies->nDelay = s_max( pSubblockEnergies->nDelay, pTransientDetector->nDelay );
     assert( nSubblocksToCheck <= NSUBBLOCKS + pTransientDetector->nDelay );
     pTransientDetector->nSubblocksToCheck = nSubblocksToCheck;
+    move16();
     pTransientDetector->CheckSubblocksForAttack_fx = pCheckSubblocksForAttack;
     pTransientDetector->attackRatioThreshold = attackRatioThreshold;
+    move16();
     pTransientDetector->prev_bIsAttackPresent = FALSE;
+    move16();
     pTransientDetector->bIsAttackPresent = FALSE;
+    move16();
     pTransientDetector->attackIndex = -1;
+    move16();
 }
 
 static void InitTransientDetector_ivas_fx( SubblockEnergies *pSubblockEnergies, Word16 nDelay, Word16 nSubblocksToCheck, TCheckSubblocksForAttack_fx pCheckSubblocksForAttack, Word16 attackRatioThreshold, TransientDetector *pTransientDetector )
@@ -1153,10 +1279,10 @@ static void UpdateDelayBuffer( Word16 const *input, Word16 nSamplesAvailable, De
     move16();
     nDelay = pDelayBuffer->nDelay;
 
-    assert( ( nDelay >= 0 ) && ( nDelay <= (int) sizeof( pDelayBuffer->buffer ) / (int) sizeof( pDelayBuffer->buffer[0] ) ) );
+    assert( ( nDelay >= 0 ) && ( nDelay <= (Word32) sizeof( pDelayBuffer->buffer ) / (Word32) sizeof( pDelayBuffer->buffer[0] ) ) );
     assert( nSamplesAvailable <= NSUBBLOCKS * pDelayBuffer->nSubblockSize );
     /* If this is not the last frame */
-    IF( nSamplesAvailable == NSUBBLOCKS * pDelayBuffer->nSubblockSize )
+    IF( EQ_16( nSamplesAvailable, imult1616( NSUBBLOCKS, pDelayBuffer->nSubblockSize ) ) )
     {
         /* Store the newest samples into the delay buffer */
         FOR( i = 0; i < nDelay; i++ )
@@ -1172,7 +1298,7 @@ static void UpdateSubblockEnergies( Word16 const *input, Word16 nSamplesAvailabl
     Word16 i;
 
 
-    assert( ( pSubblockEnergies->nDelay >= 0 ) && ( pSubblockEnergies->nDelay + NSUBBLOCKS <= (int) sizeof( pSubblockEnergies->subblockNrg ) / (int) sizeof( pSubblockEnergies->subblockNrg[0] ) ) );
+    assert( ( pSubblockEnergies->nDelay >= 0 ) && ( pSubblockEnergies->nDelay + NSUBBLOCKS <= (Word32) sizeof( pSubblockEnergies->subblockNrg ) / (Word32) sizeof( pSubblockEnergies->subblockNrg[0] ) ) );
     assert( pSubblockEnergies->nPartialDelay <= pSubblockEnergies->pDelayBuffer->nDelay );
     /* At least one block delay is required when subblock energy change is required */
     assert( pSubblockEnergies->nDelay >= 1 );
@@ -1197,7 +1323,7 @@ static void UpdateSubblockEnergies_ivas_fx( Word16 const *input, Word16 nSamples
     Word16 i;
 
 
-    assert( ( pSubblockEnergies->nDelay >= 0 ) && ( pSubblockEnergies->nDelay + NSUBBLOCKS <= (int) sizeof( pSubblockEnergies->subblockNrg ) / (int) sizeof( pSubblockEnergies->subblockNrg[0] ) ) );
+    assert( ( pSubblockEnergies->nDelay >= 0 ) && ( pSubblockEnergies->nDelay + NSUBBLOCKS <= (Word32) sizeof( pSubblockEnergies->subblockNrg ) / (Word32) sizeof( pSubblockEnergies->subblockNrg[0] ) ) );
     assert( pSubblockEnergies->nPartialDelay <= pSubblockEnergies->pDelayBuffer->nDelay );
     /* At least one block delay is required when subblock energy change is required */
     assert( pSubblockEnergies->nDelay >= 1 );
@@ -1205,12 +1331,14 @@ static void UpdateSubblockEnergies_ivas_fx( Word16 const *input, Word16 nSamples
     /* Shift old subblock energies */
     FOR( i = 0; i < pSubblockEnergies->nDelay; i++ )
     {
+        move32();
         move32();
         move32();
         move16();
         pSubblockEnergies->subblockNrg[i] = pSubblockEnergies->subblockNrg[i + NSUBBLOCKS];
         pSubblockEnergies->accSubblockNrg[i] = pSubblockEnergies->accSubblockNrg[i + NSUBBLOCKS];
-        pSubblockEnergies->subblockNrgChange[i] = pSubblockEnergies->subblockNrgChange[i + NSUBBLOCKS];
+        pSubblockEnergies->subblockNrgChange_32fx[i] = pSubblockEnergies->subblockNrgChange_32fx[i + NSUBBLOCKS];
+        pSubblockEnergies->subblockNrgChange_exp[i] = pSubblockEnergies->subblockNrgChange_exp[i + NSUBBLOCKS];
     }
 
     /* Compute filtered subblock energies for the new samples */
@@ -1292,11 +1420,7 @@ static void CalculateSubblockEnergies( Word16 const *input, Word16 nSamplesAvail
         FOR( k = 0; k < w; k++ )
         {
             tmp = shr( input[k], SUBBLOCK_NRG_E / 2 );
-#ifdef BASOP_NOGLOB
             accu = L_mac0_sat( accu, tmp, tmp );
-#else
-            accu = L_mac0( accu, tmp, tmp );
-#endif
         }
 
         move32();
@@ -1313,11 +1437,7 @@ static void CalculateSubblockEnergies( Word16 const *input, Word16 nSamplesAvail
             FOR( ; k < k2; k++ )
             {
                 tmp = shr( input[k], SUBBLOCK_NRG_E / 2 );
-#ifdef BASOP_NOGLOB
                 accu = L_mac0_sat( accu, tmp, tmp );
-#else
-                accu = L_mac0( accu, tmp, tmp );
-#endif
             }
             move32();
             pSubblockNrg[w] = accu;
@@ -1365,12 +1485,13 @@ static void CalculateSubblockEnergies_ivas_fx( Word16 const *input, Word16 nSamp
     Word16 facAccSubblockNrg;
     Word32 *pSubblockNrg;
     Word32 *pAccSubblockNrg;
-    Word16 *pSubblockNrgChange;
+    Word32 *pSubblockNrgChange;
+    Word16 *pSubblockNrgChange_exp;
     Word32 *pAccSubblockTmp;
     Word16 nWindows;
-    Word16 w, k, k2, tmp;
+    Word16 w, k, k2;
     Word32 w0, w1;
-    Word32 accu;
+    Word64 accu;
 
     move16();
     pDelayBuffer = pSubblockEnergies->pDelayBuffer;
@@ -1386,7 +1507,8 @@ static void CalculateSubblockEnergies_ivas_fx( Word16 const *input, Word16 nSamp
     delayBuffer = &pDelayBuffer->buffer[sub( pDelayBuffer->nDelay, nPartialDelay )];
     pSubblockNrg = &pSubblockEnergies->subblockNrg[nDelay];
     pAccSubblockNrg = &pSubblockEnergies->accSubblockNrg[nDelay];
-    pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange[nDelay];
+    pSubblockNrgChange = &pSubblockEnergies->subblockNrgChange_32fx[nDelay];
+    pSubblockNrgChange_exp = &pSubblockEnergies->subblockNrgChange_exp[nDelay];
 
     /* nWindows = (nSamplesAvailable + nPartialDelay) / nSubblockSize */
     nWindows = shr( div_s( add( nSamplesAvailable, nPartialDelay ), shl( nSubblockSize, 7 ) ), 8 );
@@ -1395,53 +1517,35 @@ static void CalculateSubblockEnergies_ivas_fx( Word16 const *input, Word16 nSamp
     IF( nWindows > 0 )
     {
         /* Process left over samples from the previous frame. */
-        accu = 107; // 107.37f in Q0
-        move32();
-        assert( ( SUBBLOCK_NRG_E & 1 ) == 0 );
+        accu = 215; // 107.37f in Q1
+        move64();
         FOR( k = 0; k < nPartialDelay; k++ )
         {
-            tmp = delayBuffer[k]; // Q0
-            move16();
-            accu = L_mac0( accu, tmp, tmp ); // Q0
+            accu = W_mac_16_16( accu, delayBuffer[k], delayBuffer[k] ); // Q1
         }
 
         /* Process new samples in the 0. subblock. */
-        w = sub( nSubblockSize, nPartialDelay );
-        assert( ( SUBBLOCK_NRG_E & 1 ) == 0 );
-        FOR( k = 0; k < w; k++ )
+        FOR( k = 0; k < ( nSubblockSize - nPartialDelay ); k++ )
         {
-            tmp = input[k]; // Q0
-            move16();
-#ifdef BASOP_NOGLOB
-            accu = L_mac0_sat( accu, tmp, tmp ); // Q0
-#else
-            accu = L_mac0( accu, tmp, tmp );
-#endif
+            accu = W_mac_16_16( accu, input[k], input[k] ); // Q1
         }
 
-        pSubblockNrg[0] = accu; // Q0
+        pSubblockNrg[0] = W_shl_sat_l( accu, -2 ); // Q(-1)
         move32();
         /* Set accumulated subblock energy at this point. */
         UpdatedAndStoreAccWindowNrg( pSubblockNrg[0], pAccSubblockTmp, facAccSubblockNrg, &pAccSubblockNrg[0] );
 
         FOR( w = 1; w < nWindows; w++ )
         {
-            accu = 107; // 107.37f in Q0
-            move32();
+            accu = 215; // 107.37f in Q1
+            move64();
             /* Process new samples in the w. subblock. */
             k2 = add( k, nSubblockSize );
-            assert( ( SUBBLOCK_NRG_E & 1 ) == 0 );
             FOR( ; k < k2; k++ )
             {
-                tmp = input[k]; // Q0
-                move16();
-#ifdef BASOP_NOGLOB
-                accu = L_mac0_sat( accu, tmp, tmp ); // Q0
-#else
-                accu = L_mac0( accu, tmp, tmp );
-#endif
+                accu = W_mac_16_16( accu, input[k], input[k] ); // Q1
             }
-            pSubblockNrg[w] = accu; // Q0
+            pSubblockNrg[w] = W_shl_sat_l( accu, -2 ); // Q(-1)
             move32();
             /* Set accumulated subblock energy at this point. */
             UpdatedAndStoreAccWindowNrg( pSubblockNrg[w], pAccSubblockTmp, facAccSubblockNrg, &pAccSubblockNrg[w] );
@@ -1455,88 +1559,20 @@ static void CalculateSubblockEnergies_ivas_fx( Word16 const *input, Word16 nSamp
 
             IF( GT_32( w0, w1 ) )
             {
-                k2 = BASOP_Util_Divide3232_uu_1616_Scale( w0, w1, &k );
+                pSubblockNrgChange[w] = BASOP_Util_Divide3232_Scale_newton( w0, w1, &k );
+                pSubblockNrgChange_exp[w] = k;
             }
             ELSE
             {
-                k2 = BASOP_Util_Divide3232_uu_1616_Scale( w1, w0, &k );
+                pSubblockNrgChange[w] = BASOP_Util_Divide3232_Scale_newton( w1, w0, &k );
+                pSubblockNrgChange_exp[w] = k;
             }
+            move32();
             move16();
-            pSubblockNrgChange[w] = MAX_16;
-            IF( LT_16( k, 12 ) )
-            {
-                move16();
-                pSubblockNrgChange[w] = shr_r( k2, sub( 12, k ) );
-            }
         }
     }
 }
-#ifdef IVAS_CODE
-/*-------------------------------------------------------------------*
- * set_transient_stereo()
- *
- *
- *-------------------------------------------------------------------*/
-
-void set_transient_stereo(
-    CPE_ENC_HANDLE hCPE, /* i  : CPE structure               */
-    float currFlatness[] /* i/o: current flatness            */
-)
-{
-    int16_t n, attackIsPresent;
-    float currFlatnessMax;
-    Encoder_State **sts;
-
-    sts = hCPE->hCoreCoder;
-
-    /* for DFT/TD based stereo ,map avg. flatness to individual stereo channels (M/S or X/Y) */
-    maximum( currFlatness, CPE_CHANNELS, &currFlatnessMax );
-    attackIsPresent = 0;
-
-    for ( n = 0; n < CPE_CHANNELS; n++ )
-    {
-        attackIsPresent = max( attackIsPresent, sts[n]->hTranDet->transientDetector.bIsAttackPresent );
-    }
-
-    set_f( currFlatness, currFlatnessMax, CPE_CHANNELS );
-
-    for ( n = 0; n < CPE_CHANNELS; n++ )
-    {
-        sts[n]->hTranDet->transientDetector.bIsAttackPresent = attackIsPresent;
-    }
-
-    if ( hCPE->hStereoDft != NULL )
-    {
-        if ( hCPE->hStereoDft->attackPresent )
-        {
-            hCPE->hStereoDft->wasTransient = 1;
-        }
-        else if ( hCPE->hStereoDft->wasTransient )
-        {
-            hCPE->hStereoDft->wasTransient = 0;
-        }
-
-        hCPE->hStereoDft->attackPresent = attackIsPresent;
 
-        hCPE->hStereoDft->hItd->currFlatness = 0;
-        for ( n = 0; n < CPE_CHANNELS; n++ )
-        {
-            hCPE->hStereoDft->hItd->currFlatness = max( hCPE->hStereoDft->hItd->currFlatness, currFlatness[n] );
-        }
-    }
-
-    if ( hCPE->hStereoMdct != NULL )
-    {
-        hCPE->hStereoMdct->hItd->currFlatness = 0;
-        for ( n = 0; n < CPE_CHANNELS; n++ )
-        {
-            hCPE->hStereoMdct->hItd->currFlatness = max( hCPE->hStereoMdct->hItd->currFlatness, currFlatness[n] );
-        }
-    }
-
-    return;
-}
-#endif
 /*-------------------------------------------------------------------*
  * transient_analysis()
  *
@@ -1561,7 +1597,7 @@ Word16 transient_analysis_ivas_fx(
     const Word16 nRelativeDelay = sub( hTranDet->subblockEnergies.nDelay, hTranDet->transientDetector.nDelay );
     Word16 prel_force_td;
     Word32 cor_map_LT_sum = 0;
-    move16();
+    move32();
 
     /* Set pointer to the reverse accumulator buffer */
     pTmp_fx = &accSubblockNrgRev_fx[NSUBBLOCKS - 1];
@@ -1624,7 +1660,7 @@ Word16 transient_analysis_ivas_fx(
     /*  Forward attack analysis */
     FOR( i = -2; i < 7; i++ )
     {
-        IF( BASOP_Util_Cmp_Mant32Exp( hTranDet->subblockEnergies.subblockNrg[nRelativeDelay + i], 31, Mpy_32_16_1( hTranDet->subblockEnergies.accSubblockNrg[nRelativeDelay + i], thr_fwd_fx ), ( 31 + 4 ) ) > 0 )
+        IF( BASOP_Util_Cmp_Mant32Exp( hTranDet->subblockEnergies.subblockNrg[nRelativeDelay + i], 32, Mpy_32_16_1( hTranDet->subblockEnergies.accSubblockNrg[nRelativeDelay + i], thr_fwd_fx ), ( 32 + 4 ) ) > 0 )
         {
             prel_force_td = s_or( prel_force_td, 0x0001 );
         }
@@ -1661,7 +1697,7 @@ Word16 transient_analysis_ivas_fx(
 
         /* -3 check */
         test();
-        IF( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg[1 + offset], 31, Mpy_32_16_1( accSubblockNrgRev_fx[1], thr_rev_fx ), ( 31 + 4 ) ) > 0 )
+        IF( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg[1 + offset], 32, Mpy_32_16_1( accSubblockNrgRev_fx[1], thr_rev_fx ), ( 32 + 4 ) ) > 0 )
         {
             prel_force_td = s_or( prel_force_td, 0x0002 );
             move16();
@@ -1669,10 +1705,10 @@ Word16 transient_analysis_ivas_fx(
 
         /* -4 check */
         test();
-        IF( prel_force_td == 0 && BASOP_Util_Cmp_Mant32Exp( pSubblockNrg[offset], 31, Mpy_32_16_1( accSubblockNrgRev_fx[0], thr_rev_fx ), ( 31 + 4 ) ) > 0 )
+        IF( prel_force_td == 0 && BASOP_Util_Cmp_Mant32Exp( pSubblockNrg[offset], 32, Mpy_32_16_1( accSubblockNrgRev_fx[0], thr_rev_fx ), ( 32 + 4 ) ) > 0 )
         {
 
-            IF( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg[offset], 31, Mpy_32_16_1( accSubblockNrgRev_fx[0], add( thr_rev_fx, THR_LOW_STEP_FX ) ), ( 31 + 4 ) ) > 0 )
+            IF( BASOP_Util_Cmp_Mant32Exp( pSubblockNrg[offset], 32, Mpy_32_16_1( accSubblockNrgRev_fx[0], add( thr_rev_fx, THR_LOW_STEP_FX ) ), ( 32 + 4 ) ) > 0 )
             {
                 prel_force_td = s_or( prel_force_td, 0x0004 );
             }
@@ -1686,3 +1722,76 @@ Word16 transient_analysis_ivas_fx(
 
     return prel_force_td != 0;
 }
+
+/*-------------------------------------------------------------------*
+ * set_transient_stereo()
+ *
+ *
+ *-------------------------------------------------------------------*/
+void set_transient_stereo_fx(
+    CPE_ENC_HANDLE hCPE,  /* i  : CPE structure               */
+    Word32 currFlatness[] /* i/o: current flatness            */
+)
+{
+    Word16 n, attackIsPresent;
+    Word32 currFlatnessMax;
+    Encoder_State **sts;
+
+    sts = hCPE->hCoreCoder;
+
+    /* for DFT/TD based stereo ,map avg. flatness to individual stereo channels (M/S or X/Y) */
+    maximum_32_fx( currFlatness, CPE_CHANNELS, &currFlatnessMax );
+    attackIsPresent = 0;
+    move16();
+
+    FOR( n = 0; n < CPE_CHANNELS; n++ )
+    {
+        attackIsPresent = s_max( attackIsPresent, sts[n]->hTranDet->transientDetector.bIsAttackPresent );
+    }
+
+    set32_fx( currFlatness, currFlatnessMax, CPE_CHANNELS );
+
+    FOR( n = 0; n < CPE_CHANNELS; n++ )
+    {
+        sts[n]->hTranDet->transientDetector.bIsAttackPresent = attackIsPresent;
+        move16();
+    }
+
+    IF( hCPE->hStereoDft != NULL )
+    {
+        IF( hCPE->hStereoDft->attackPresent )
+        {
+            hCPE->hStereoDft->wasTransient = 1;
+            move16();
+        }
+        ELSE IF( hCPE->hStereoDft->wasTransient )
+        {
+            hCPE->hStereoDft->wasTransient = 0;
+            move16();
+        }
+
+        hCPE->hStereoDft->attackPresent = attackIsPresent;
+        move16();
+
+        hCPE->hStereoDft->hItd->currFlatness_fx = 0;
+        move16();
+        FOR( n = 0; n < CPE_CHANNELS; n++ )
+        {
+            hCPE->hStereoDft->hItd->currFlatness_fx = L_max( hCPE->hStereoDft->hItd->currFlatness_fx, currFlatness[n] );
+            move32();
+        }
+    }
+
+    IF( hCPE->hStereoMdct != NULL )
+    {
+        hCPE->hStereoMdct->hItd->currFlatness_fx = 0;
+        move16();
+        FOR( n = 0; n < CPE_CHANNELS; n++ )
+        {
+            hCPE->hStereoMdct->hItd->currFlatness_fx = L_max( hCPE->hStereoMdct->hItd->currFlatness_fx, currFlatness[n] );
+            move32();
+        }
+    }
+
+    return;
+}
diff --git a/lib_enc/transition_enc.c b/lib_enc/transition_enc.c
deleted file mode 100644
index 5f6981ef6a10eb4df6842d5c37d90c5468adf943..0000000000000000000000000000000000000000
--- a/lib_enc/transition_enc.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
diff --git a/lib_enc/transition_enc_fx.c b/lib_enc/transition_enc_fx.c
index b4f9b2681bf0ce1e263ec4f8af2d9d33081f80af..d0d62769791a9dfe181c3452d45ef076c2b5167c 100644
--- a/lib_enc/transition_enc_fx.c
+++ b/lib_enc/transition_enc_fx.c
@@ -7,7 +7,6 @@
 #include "cnst.h"        /* Common constants                       */
 #include "rom_com_fx.h"  /* Static table prototypes                */
 #include "rom_com.h"     /* Static table prototypes                */
-#include "prot.h"        /* Function prototypes                    */
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 
@@ -114,6 +113,8 @@ void transition_enc_fx(
         T_op[1] = (int16_t)(pitch[1] * 1.25f + 0.5f);*/
         T_op[0] = add( st_fx->pitch[0], mult_r( st_fx->pitch[0], 8192 /*0.25f Q15*/ ) );
         T_op[1] = add( st_fx->pitch[1], mult_r( st_fx->pitch[1], 8192 /*0.25f Q15*/ ) );
+        move16();
+        move16();
     }
     shift_wsp = add( Q_new, shift );
 
@@ -132,6 +133,7 @@ void transition_enc_fx(
     IF( i_subfr == 0 )
     {
         mult_Top = 1;
+        move16();
         IF( limit_flag == 0 )
         {
             test();
@@ -166,6 +168,7 @@ void transition_enc_fx(
         g_corr_fx[2] = -16384;
         move16();
         g_corr_fx[3] = shl( sub( shift_wsp, 1 ), 1 );
+        move16();
 
         set16_fx( &exc_fx[i_subfr], 0, L_SUBFR ); /* set excitation for current subrame to 0 */
 
@@ -209,12 +212,13 @@ void transition_enc_fx(
         IF( EQ_16( *tc_subfr, TC_0_0 ) )
         {
             /* this is called only to compute unused bits */
-            config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
-                           L_FRAME, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, TC_0_0, 3, NULL, unbits_ACELP,
-                           st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/
-            );
+            config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
+                              L_FRAME, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, TC_0_0, 3, NULL, unbits_ACELP,
+                              st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ );
         }
+
         *clip_gain = gp_clip_fx( st_fx->element_mode, st_fx->core_brate, st_fx->voicing_fx, i_subfr, TRANSITION, xn_fx, gp_cl_fx, sub( shift_wsp, 1 ) );
+        move16();
         updt_tar_fx( xn_fx, xn2_fx, y1_fx, *gain_pit_fx, L_SUBFR );
 
         **pt_pitch_fx = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
@@ -282,6 +286,7 @@ void transition_enc_fx(
                 /* Find the closed loop pitch period */
 
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, pit_start, pit_limit, L_FRAME, L_SUBFR );
+                move16();
 
                 offset = tbe_celp_exc_offset( *T0, *T0_frac, st_fx->L_frame );
 
@@ -289,6 +294,7 @@ void transition_enc_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
 
 
@@ -318,10 +324,11 @@ void transition_enc_fx(
 
             IF( LE_16( sub( i_subfr, *tc_subfr ), L_SUBFR ) )
             {
-                config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
-                               st_fx->L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, *tc_subfr, 2, NULL,
-                               unbits_ACELP, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ );
+                config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
+                                  st_fx->L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, *tc_subfr, 2, NULL,
+                                  unbits_ACELP, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ );
             }
+
             /*-----------------------------------------------------------------*
              * get number of bits for pitch encoding
              *-----------------------------------------------------------------*/
@@ -383,7 +390,7 @@ void transition_enc_fx(
                 /* 7bit ENCODER */
                 /*  index = (*T0-pit_start)*2 + *T0_frac/2;*/
                 index = add( shl( sub( *T0, pit_start ), 1 ), shr( *T0_frac, 1 ) );
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
 
                 /* Find the adaptive codebook vector - ACELP long-term prediction */
                 pred_lt4( &exc_fx[i_subfr], &exc_fx[i_subfr], *T0, *T0_frac, L_SUBFR + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
@@ -394,6 +401,7 @@ void transition_enc_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
             ELSE IF( ( EQ_16( i_subfr, 2 * L_SUBFR ) ) && ( EQ_16( *tc_subfr, TC_0_128 ) ) )
@@ -408,6 +416,7 @@ void transition_enc_fx(
                 move16();
 
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, pit_start, 3 * L_SUBFR, L_FRAME, L_SUBFR );
+                move16();
 
                 IF( LT_16( add( ( *T0 ), ( *position ) ), 2 * L_SUBFR ) )
                 {
@@ -430,7 +439,7 @@ void transition_enc_fx(
                 limit_T0_fx( L_FRAME, 8, pit_flag, limit_flag, *T0, 0, T0_min, T0_max ); /* find T0_min and T0_max for delta search */
 
                 index = add( shl( sub( *T0, pit_start ), 1 ), shr( *T0_frac, 1 ) );
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
 
                 /* Find the adaptive codebook vector - ACELP long-term prediction */
                 pred_lt4( &exc_fx[i_subfr], &exc_fx[i_subfr], *T0, *T0_frac, L_SUBFR + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
@@ -441,6 +450,7 @@ void transition_enc_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
             ELSE IF( ( EQ_16( i_subfr, 2 * L_SUBFR ) ) && ( EQ_16( *tc_subfr, TC_0_192 ) ) )
@@ -469,6 +479,7 @@ void transition_enc_fx(
                 move16();
 
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                move16();
 
                 IF( LT_16( add( *T0, *position ), 3 * L_SUBFR ) )
                 {
@@ -492,7 +503,7 @@ void transition_enc_fx(
                     *T0_frac = 0;
                     move16();
                 }
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
 
                 /* Find the adaptive codebook vector - ACELP long-term prediction */
                 pred_lt4( &exc_fx[i_subfr], &exc_fx[i_subfr], *T0, *T0_frac, L_SUBFR + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
@@ -514,8 +525,9 @@ void transition_enc_fx(
                 pit_flag = L_SUBFR;
                 move16();
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                move16();
                 index = delta_pit_enc_fx( 2, *T0, *T0_frac, *T0_min );
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
 
                 /* Find the adaptive codebook vector - ACELP long-term prediction */
                 pred_lt4( &exc_fx[i_subfr], &exc_fx[i_subfr], *T0, *T0_frac, L_SUBFR + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
@@ -526,6 +538,7 @@ void transition_enc_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
 
@@ -538,15 +551,18 @@ void transition_enc_fx(
                 test();
                 IF( EQ_16( nBits, 8 ) || EQ_16( nBits, 5 ) )
                 {
+                    test();
                     test();
                     IF( !( ( *tc_subfr == 0 ) && ( EQ_16( i_subfr, L_SUBFR ) ) ) )
                     {
                         *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                        move16();
                     }
                 }
                 ELSE
                 {
                     *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+                    move16();
                 }
                 pit_Q_enc_fx( hBstr, 0, nBits, 8, pit_flag, limit_flag, *T0, *T0_frac, T0_min, T0_max );
 
@@ -558,6 +574,7 @@ void transition_enc_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
 
@@ -584,13 +601,14 @@ void transition_enc_fx(
             ELSE
             {
                 *clip_gain = gp_clip_fx( st_fx->element_mode, st_fx->core_brate, st_fx->voicing_fx, i_subfr, TRANSITION, xn_fx, gp_cl_fx, ( Q_new + shift - 1 ) );
+                move16();
 
                 lp_select = lp_filt_exc_enc_fx( MODE1, TRANSITION, i_subfr, exc_fx, h1_fx,
                                                 xn_fx, y1_fx, xn2_fx, L_SUBFR, st_fx->L_frame, g_corr_fx, *clip_gain, gain_pit_fx, &lp_flag );
 
                 IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
                 {
-                    push_indice_fx( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
+                    push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
                 }
             }
 
@@ -604,7 +622,7 @@ void transition_enc_fx(
             test();
             test();
             test();
-            IF( ( *tc_subfr >= 2 * L_SUBFR ) && ( i_subfr == 3 * L_SUBFR ) )
+            IF( ( GE_16( *tc_subfr, 2 * L_SUBFR ) ) && ( EQ_16( i_subfr, 3 * L_SUBFR ) ) )
             {
                 tmp = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
                 ( *pt_pitch_fx ) -= 3;
@@ -620,8 +638,9 @@ void transition_enc_fx(
                 **pt_pitch_fx = tmp;
                 move16();
                 ( *pt_pitch_fx )++;
+                move16();
             }
-            ELSE IF( ( *tc_subfr == L_SUBFR ) && ( i_subfr == 2 * L_SUBFR ) )
+            ELSE IF( ( EQ_16( *tc_subfr, L_SUBFR ) ) && ( EQ_16( i_subfr, 2 * L_SUBFR ) ) )
             {
                 tmp = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
                 ( *pt_pitch_fx ) -= 2;
@@ -635,7 +654,7 @@ void transition_enc_fx(
                 ( *pt_pitch_fx )++;
                 move16();
             }
-            ELSE IF( ( *tc_subfr == TC_0_64 ) && ( i_subfr == L_SUBFR ) )
+            ELSE IF( ( EQ_16( *tc_subfr, TC_0_64 ) ) && ( EQ_16( i_subfr, L_SUBFR ) ) )
             {
                 tmp = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
                 ( *pt_pitch_fx ) -= 1;
@@ -645,7 +664,7 @@ void transition_enc_fx(
                 ( *pt_pitch_fx )++;
                 move16();
             }
-            ELSE IF( ( *tc_subfr == TC_0_128 ) && ( i_subfr == 2 * L_SUBFR ) )
+            ELSE IF( ( EQ_16( *tc_subfr, TC_0_128 ) ) && ( EQ_16( i_subfr, 2 * L_SUBFR ) ) )
             {
                 tmp = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
                 ( *pt_pitch_fx ) -= 2;
@@ -659,7 +678,7 @@ void transition_enc_fx(
                 ( *pt_pitch_fx )++;
                 move16();
             }
-            ELSE IF( ( *tc_subfr == TC_0_192 ) && ( i_subfr == 3 * L_SUBFR ) )
+            ELSE IF( ( EQ_16( *tc_subfr, TC_0_192 ) ) && ( EQ_16( i_subfr, 3 * L_SUBFR ) ) )
             {
                 tmp = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
                 ( *pt_pitch_fx ) -= 3;
@@ -719,6 +738,7 @@ void transition_enc_fx(
             IF( EQ_16( nBits, 10 ) )
             {
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, limit_flag, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, st_fx->L_frame, L_SUBFR );
+                move16();
                 pit16k_Q_enc_fx( hBstr, nBits, limit_flag, *T0, *T0_frac, T0_min, T0_max );
             }
             ELSE IF( EQ_16( nBits, 8 ) ) /* tc_subfr==0 && i_subfr==L_SUBFR */
@@ -729,6 +749,7 @@ void transition_enc_fx(
                  *   PIT16k_FR2_TC0_2SUBFR to 2*L_SUBFR     resolution 1/2 (frac = 0 or 2)
                  *-----------------------------------------------------------------------------*/
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, limit_flag, PIT16k_FR2_TC0_2SUBFR, 2 * L_SUBFR, st_fx->L_frame, L_SUBFR );
+                move16();
 
                 IF( GT_16( *T0_max, 2 * L_SUBFR ) )
                 {
@@ -748,15 +769,16 @@ void transition_enc_fx(
                     /*index = (*T0)*2 + ((*T0_frac)>>1) - (PIT16k_FR2_TC0_2SUBFR*2) + ((PIT16k_FR2_TC0_2SUBFR-PIT16k_MIN)*4);*/
                     index = add( sub( add( shl( *T0, 1 ), shr( *T0_frac, 1 ) ), ( PIT16k_FR2_TC0_2SUBFR * 2 ) ), ( PIT16k_FR2_TC0_2SUBFR - PIT16k_MIN ) * 4 );
                 }
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
             }
             ELSE IF( EQ_16( nBits, 6 ) )
             {
                 /* delta search */
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, L_SUBFR, limit_flag, PIT16k_FR2_EXTEND_9b, PIT16k_FR1_EXTEND_9b, st_fx->L_frame, L_SUBFR );
+                move16();
 
                 index = delta_pit_enc_fx( 4, *T0, *T0_frac, *T0_min );
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
             }
             IF( EQ_16( nBits, 6 ) )
             {
@@ -782,8 +804,8 @@ void transition_enc_fx(
                 *Jopt_flag = 0;
                 move16();
 
-                set16_fx( &exc_fx[i_subfr], 0, L_SUBFR + 1 );      /* set excitation for current subrame to 0 */
-                push_indice_fx( hBstr, IND_LP_FILT_SELECT, 0, 1 ); /* this bit is actually not needed */
+                set16_fx( &exc_fx[i_subfr], 0, L_SUBFR + 1 );   /* set excitation for current subrame to 0 */
+                push_indice( hBstr, IND_LP_FILT_SELECT, 0, 1 ); /* this bit is actually not needed */
 
                 Copy( xn_fx, xn2_fx, L_SUBFR ); /* target vector for codebook search */
                 set16_fx( y1_fx, 0, L_SUBFR );  /* set filtered adaptive excitation to 0 */
@@ -807,16 +829,18 @@ void transition_enc_fx(
                 {
                     /* bwe_exc_fx[i + i_subfr * 2] = bwe_exc_fx[i + i_subfr * 2 - *T0 * 2  - (int) ((float) *T0_frac * 0.5f + 4 + 0.5f) + 4];move16();*/
                     bwe_exc_fx[i + i_subfr * 2] = bwe_exc_fx[i + i_subfr * 2 - offset + 4];
+                    move16();
                 }
 
                 *clip_gain = gp_clip_fx( st_fx->element_mode, st_fx->core_brate, st_fx->voicing_fx, i_subfr, TRANSITION, xn_fx, gp_cl_fx, Q_new );
+                move16();
 
                 lp_select = lp_filt_exc_enc_fx( MODE1, TRANSITION, i_subfr, exc_fx, h1_fx,
                                                 xn_fx, y1_fx, xn2_fx, L_SUBFR, st_fx->L_frame, g_corr_fx, *clip_gain, gain_pit_fx, &lp_flag );
 
                 IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
                 {
-                    push_indice_fx( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
+                    push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
                 }
 
                 *Jopt_flag = 1;
@@ -845,6 +869,7 @@ void transition_enc_fx(
                     **pt_pitch_fx = tmp;
                     move16();
                     ( *pt_pitch_fx )++;
+                    move16();
                 }
             }
         }
@@ -891,7 +916,6 @@ void transition_enc_ivas_fx(
     /* set limit_flag to 0 for restrained limits, and 1 for extended limits */
     limit_flag = 0;
     move16();
-
     pit_start = PIT_MIN;
     move16();
 
@@ -908,7 +932,9 @@ void transition_enc_ivas_fx(
         /*T_op[0] = (int16_t)(pitch[0] * 1.25f + 0.5f);
         T_op[1] = (int16_t)(pitch[1] * 1.25f + 0.5f);*/
         T_op[0] = add( st_fx->pitch[0], mult_r( st_fx->pitch[0], 8192 /*0.25f Q15*/ ) );
+        move16();
         T_op[1] = add( st_fx->pitch[1], mult_r( st_fx->pitch[1], 8192 /*0.25f Q15*/ ) );
+        move16();
     }
     shift_wsp = add( Q_new, shift );
 
@@ -927,6 +953,7 @@ void transition_enc_ivas_fx(
     IF( i_subfr == 0 )
     {
         mult_Top = 1;
+        move16();
         IF( limit_flag == 0 )
         {
             test();
@@ -956,7 +983,6 @@ void transition_enc_ivas_fx(
         move16();
         g_corr_fx[0] = MAX16B /* 1.0f in Q15 */;
         move16();
-        move16();
         g_corr_fx[1] = 0;
         move16();
         g_corr_fx[2] = MAX16B /* 1.0f in Q15 */;
@@ -1006,12 +1032,14 @@ void transition_enc_ivas_fx(
         IF( EQ_16( *tc_subfr, TC_0_0 ) )
         {
             /* this is called only to compute unused bits */
-            config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
-                           L_FRAME, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, TC_0_0, 3, NULL, unbits_ACELP,
-                           st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/
+            config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
+                              L_FRAME, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, TC_0_0, 3, NULL, unbits_ACELP,
+                              st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/
             );
         }
+
         *clip_gain = gp_clip_fx( st_fx->element_mode, st_fx->core_brate, st_fx->voicing_fx, i_subfr, TRANSITION, xn_fx, gp_cl_fx, sub( shift_wsp, 1 ) );
+        move16();
         updt_tar_fx( xn_fx, xn2_fx, y1_fx, *gain_pit_fx, L_SUBFR );
 
         **pt_pitch_fx = shl( add( shl( *T0, 2 ), *T0_frac ), 4 );
@@ -1079,6 +1107,7 @@ void transition_enc_ivas_fx(
                 /* Find the closed loop pitch period */
 
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, pit_start, pit_limit, L_FRAME, L_SUBFR );
+                move16();
 
                 offset = tbe_celp_exc_offset( *T0, *T0_frac, st_fx->L_frame );
 
@@ -1086,6 +1115,7 @@ void transition_enc_ivas_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
 
 
@@ -1115,10 +1145,11 @@ void transition_enc_ivas_fx(
 
             IF( LE_16( sub( i_subfr, *tc_subfr ), L_SUBFR ) )
             {
-                config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
-                               st_fx->L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, *tc_subfr, 2, NULL,
-                               unbits_ACELP, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ );
+                config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate,
+                                  st_fx->L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, *tc_subfr, 2, NULL,
+                                  unbits_ACELP, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, st_fx->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ );
             }
+
             /*-----------------------------------------------------------------*
              * get number of bits for pitch encoding
              *-----------------------------------------------------------------*/
@@ -1191,6 +1222,7 @@ void transition_enc_ivas_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
             ELSE IF( ( EQ_16( i_subfr, 2 * L_SUBFR ) ) && ( EQ_16( *tc_subfr, TC_0_128 ) ) )
@@ -1205,6 +1237,7 @@ void transition_enc_ivas_fx(
                 move16();
 
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, pit_start, 3 * L_SUBFR, L_FRAME, L_SUBFR );
+                move16();
 
                 IF( LT_16( add( ( *T0 ), ( *position ) ), 2 * L_SUBFR ) )
                 {
@@ -1238,6 +1271,7 @@ void transition_enc_ivas_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
             ELSE IF( ( EQ_16( i_subfr, 2 * L_SUBFR ) ) && ( EQ_16( *tc_subfr, TC_0_192 ) ) )
@@ -1266,6 +1300,7 @@ void transition_enc_ivas_fx(
                 move16();
 
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                move16();
 
                 IF( LT_16( add( *T0, *position ), 3 * L_SUBFR ) )
                 {
@@ -1310,7 +1345,9 @@ void transition_enc_ivas_fx(
                  *--------------------------------------------------------*/
                 pit_flag = L_SUBFR;
                 move16();
+
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                move16();
                 index = delta_pit_enc_fx( 2, *T0, *T0_frac, *T0_min );
                 push_indice( hBstr, IND_PITCH, index, nBits );
 
@@ -1323,6 +1360,7 @@ void transition_enc_ivas_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
 
@@ -1339,11 +1377,13 @@ void transition_enc_ivas_fx(
                     IF( !( ( *tc_subfr == 0 ) && ( EQ_16( i_subfr, L_SUBFR ) ) ) )
                     {
                         *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_MIN, PIT_FR1_8b, L_FRAME, L_SUBFR );
+                        move16();
                     }
                 }
                 ELSE
                 {
                     *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, pit_flag, limit_flag, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+                    move16();
                 }
                 pit_Q_enc_ivas_fx( hBstr, 0, nBits, 8, pit_flag, limit_flag, *T0, *T0_frac, T0_min, T0_max );
 
@@ -1355,6 +1395,7 @@ void transition_enc_ivas_fx(
                 FOR( i = 0; i < L_SUBFR * HIBND_ACB_L_FAC; i++ )
                 {
                     bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC] = bwe_exc_fx[i + i_subfr * HIBND_ACB_L_FAC - offset];
+                    move16();
                 }
             }
 
@@ -1381,6 +1422,7 @@ void transition_enc_ivas_fx(
             ELSE
             {
                 *clip_gain = gp_clip_fx( st_fx->element_mode, st_fx->core_brate, st_fx->voicing_fx, i_subfr, TRANSITION, xn_fx, gp_cl_fx, ( Q_new + shift - 1 ) );
+                move16();
 
                 lp_select = lp_filt_exc_enc_ivas_fx( MODE1, TRANSITION, i_subfr, exc_fx, h1_fx,
                                                      xn_fx, y1_fx, xn2_fx, L_SUBFR, st_fx->L_frame, g_corr_fx, *clip_gain, gain_pit_fx, &lp_flag );
@@ -1417,6 +1459,7 @@ void transition_enc_ivas_fx(
                 **pt_pitch_fx = tmp;
                 move16();
                 ( *pt_pitch_fx )++;
+                move16();
             }
             ELSE IF( ( *tc_subfr == L_SUBFR ) && ( i_subfr == 2 * L_SUBFR ) )
             {
@@ -1516,6 +1559,7 @@ void transition_enc_ivas_fx(
             IF( EQ_16( nBits, 10 ) )
             {
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, limit_flag, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, st_fx->L_frame, L_SUBFR );
+                move16();
                 pit16k_Q_enc_ivas_fx( hBstr, nBits, limit_flag, *T0, *T0_frac, T0_min, T0_max );
             }
             ELSE IF( EQ_16( nBits, 8 ) ) /* tc_subfr==0 && i_subfr==L_SUBFR */
@@ -1526,6 +1570,7 @@ void transition_enc_ivas_fx(
                  *   PIT16k_FR2_TC0_2SUBFR to 2*L_SUBFR     resolution 1/2 (frac = 0 or 2)
                  *-----------------------------------------------------------------------------*/
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, limit_flag, PIT16k_FR2_TC0_2SUBFR, 2 * L_SUBFR, st_fx->L_frame, L_SUBFR );
+                move16();
 
                 IF( GT_16( *T0_max, 2 * L_SUBFR ) )
                 {
@@ -1551,6 +1596,7 @@ void transition_enc_ivas_fx(
             {
                 /* delta search */
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, L_SUBFR, limit_flag, PIT16k_FR2_EXTEND_9b, PIT16k_FR1_EXTEND_9b, st_fx->L_frame, L_SUBFR );
+                move16();
 
                 index = delta_pit_enc_fx( 4, *T0, *T0_frac, *T0_min );
                 push_indice( hBstr, IND_PITCH, index, nBits );
@@ -1608,13 +1654,14 @@ void transition_enc_ivas_fx(
                 {
                     /* bwe_exc_fx[i + i_subfr * 2] = bwe_exc_fx[i + i_subfr * 2 - *T0 * 2  - (int) ((float) *T0_frac * 0.5f + 4 + 0.5f) + 4];move16();*/
                     bwe_exc_fx[i + i_subfr * 2] = bwe_exc_fx[i + i_subfr * 2 - offset + 4];
+                    move16();
                 }
 
                 *clip_gain = gp_clip_fx( st_fx->element_mode, st_fx->core_brate, st_fx->voicing_fx, i_subfr, TRANSITION, xn_fx, gp_cl_fx, Q_new );
+                move16();
 
                 lp_select = lp_filt_exc_enc_ivas_fx( MODE1, TRANSITION, i_subfr, exc_fx, h1_fx,
                                                      xn_fx, y1_fx, xn2_fx, L_SUBFR, st_fx->L_frame, g_corr_fx, *clip_gain, gain_pit_fx, &lp_flag );
-
                 IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
                 {
                     push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
@@ -1646,6 +1693,7 @@ void transition_enc_ivas_fx(
                     **pt_pitch_fx = tmp;
                     move16();
                     ( *pt_pitch_fx )++;
+                    move16();
                 }
             }
         }
@@ -1695,6 +1743,7 @@ static void tc_enc_fx(
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     imp_pos = sub( *position, i_subfr );
     FOR( i = 0; i < L_SUBFR; i++ )
@@ -1707,6 +1756,7 @@ static void tc_enc_fx(
      *-----------------------------------------------------------------*/
 
     nBits = st_fx->acelp_cfg.pitch_bits[shr( i_subfr, 6 )];
+    move16();
 
     /*--------------------------------------------------------------*
      * Closed loop pitch search
@@ -1723,14 +1773,17 @@ static void tc_enc_fx(
             IF( EQ_16( nBits, 9 ) )
             {
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+                move16();
             }
             ELSE IF( EQ_16( nBits, 6 ) )
             {
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT_MIN, L_SUBFR, L_FRAME, L_SUBFR );
+                move16();
             }
             ELSE
             {
                 *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT_MAX, PIT_MIN, L_FRAME, L_SUBFR );
+                move16();
             }
         }
         ELSE
@@ -1750,11 +1803,13 @@ static void tc_enc_fx(
         IF( EQ_16( nBits, 10 ) )
         {
             *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 1, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, L_FRAME16k, L_SUBFR );
+            move16();
         }
         ELSE IF( EQ_16( nBits, 6 ) )
         {
             /* T0_frac with 1/2 sample resolution */
             *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT16k_MIN, L_SUBFR, L_FRAME16k, L_SUBFR );
+            move16();
             IF( *T0 > L_SUBFR )
             {
                 *T0 = L_SUBFR;
@@ -1815,11 +1870,8 @@ static void tc_enc_fx(
     conv_fx( &exc_fx[i_subfr], h1_fx, yy1_fx, L_SUBFR );
 
     /* gain_pit computation */
-#ifdef BASOP_NOGLOB
     *gain_pit_fx = corr_xy1_fx( xn_fx, yy1_fx, g_corr_fx, L_SUBFR, 0, &Overflow );
-#else
-    *gain_pit_fx = corr_xy1_fx( xn_fx, yy1_fx, g_corr_fx, L_SUBFR, 0 );
-#endif
+    move16();
     /*--------------------------------------------------------------*
      * Encode parameters and write indices
      *--------------------------------------------------------------*/
@@ -1833,7 +1885,7 @@ static void tc_enc_fx(
             /* write pitch index */
             IF( ( GE_16( *T0, L_SUBFR ) ) && ( NE_16( *tc_subfr, 3 * L_SUBFR ) ) )
             {
-                push_indice_fx( hBstr, IND_PITCH, 0, nBits );
+                push_indice( hBstr, IND_PITCH, 0, nBits );
             }
             ELSE IF( EQ_16( *tc_subfr, 3 * L_SUBFR ) )
             {
@@ -1845,7 +1897,7 @@ static void tc_enc_fx(
                 {
                     index = abs_pit_enc_fx( 2, 0, *T0, *T0_frac );
                 }
-                push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                push_indice( hBstr, IND_PITCH, index, nBits );
 
                 limit_T0_fx( L_FRAME, 8, 0, 0, *T0, 0, T0_min, T0_max );
             }
@@ -1854,12 +1906,12 @@ static void tc_enc_fx(
                 IF( EQ_16( nBits, 6 ) )
                 {
                     index = delta_pit_enc_fx( 2, *T0, *T0_frac, PIT_MIN - 1 );
-                    push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                    push_indice( hBstr, IND_PITCH, index, nBits );
                 }
                 ELSE
                 {
                     index = delta_pit_enc_fx( 0, *T0, *T0_frac, PIT_MIN - 1 );
-                    push_indice_fx( hBstr, IND_PITCH, index, nBits );
+                    push_indice( hBstr, IND_PITCH, index, nBits );
                 }
             }
         }
@@ -1873,13 +1925,13 @@ static void tc_enc_fx(
         ELSE IF( EQ_16( nBits, 6 ) )
         {
             index = add( shl( sub( *T0, PIT16k_MIN ), 1 ), shr( *T0_frac, 1 ) );
-            push_indice_fx( hBstr, IND_PITCH, index, nBits );
+            push_indice( hBstr, IND_PITCH, index, nBits );
         }
     }
-    push_indice_fx( hBstr, IND_TC_IMP_SHAPE, imp_shape, 3 );
-    push_indice_fx( hBstr, IND_TC_IMP_POS, imp_pos, 6 );
-    push_indice_fx( hBstr, IND_TC_IMP_SIGN, pitch_sign_fx, 1 );
-    push_indice_fx( hBstr, IND_TC_IMP_GAIN, pitch_index, 3 );
+    push_indice( hBstr, IND_TC_IMP_SHAPE, imp_shape, 3 );
+    push_indice( hBstr, IND_TC_IMP_POS, imp_pos, 6 );
+    push_indice( hBstr, IND_TC_IMP_SIGN, pitch_sign_fx, 1 );
+    push_indice( hBstr, IND_TC_IMP_GAIN, pitch_index, 3 );
 
     *position = add( imp_pos, i_subfr );
     move16();
@@ -1891,7 +1943,7 @@ static void tc_enc_ivas_fx(
     const Word16 i_subfr, /* i  : subrame index                           */
     Word16 *tc_subfr,     /* i/o: TC subframe index                       */
     Word16 *position,     /* i/o: index of the residual signal maximum    */
-    const Word16 *h1_fx,  /* i  : weighted filter input response          Q(14+shift)*/
+    const Word16 *h1,     /* i  : weighted filter input response          Q(14+shift)*/
     const Word16 *xn_fx,  /* i  : target signal                           Q_new-1+shift*/
     Word16 *exc_fx,       /* o  : glottal codebook contribution           Q_new*/
     Word16 *yy1_fx,       /* o  : filtered glottal codebook contribution  */
@@ -1905,24 +1957,23 @@ static void tc_enc_ivas_fx(
     Word16 Q_new          /* i  : input scaling  */
 )
 {
-    Word16 i, imp_shape, imp_pos, index, nBits, h1_tmp_fx[L_SUBFR];
+
+    Word16 h1_fx[L_SUBFR + ( M + 1 )];
+    Word16 imp_shape, imp_pos, index, nBits;
     Word16 pitch_index, pitch_sign_fx;
     Word32 gain_trans32;
     BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     imp_pos = sub( *position, i_subfr );
-    FOR( i = 0; i < L_SUBFR; i++ )
-    {
-        h1_tmp_fx[i] = h1_fx[i];
-        move16();
-    }
     /*-----------------------------------------------------------------*
      * get number of bits for pitch encoding
      *-----------------------------------------------------------------*/
 
     nBits = st_fx->acelp_cfg.pitch_bits[shr( i_subfr, 6 )];
+    move16();
 
     /*--------------------------------------------------------------*
      * Closed loop pitch search
@@ -1938,15 +1989,18 @@ static void tc_enc_ivas_fx(
         {
             IF( EQ_16( nBits, 9 ) )
             {
-                *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+                *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1, *T0_min, *T0_max, T0_frac, 0, 0, PIT_FR2_9b, PIT_FR1_9b, L_FRAME, L_SUBFR );
+                move16();
             }
             ELSE IF( EQ_16( nBits, 6 ) )
             {
-                *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT_MIN, L_SUBFR, L_FRAME, L_SUBFR );
+                *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1, *T0_min, *T0_max, T0_frac, 0, 0, PIT_MIN, L_SUBFR, L_FRAME, L_SUBFR );
+                move16();
             }
             ELSE
             {
-                *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT_MAX, PIT_MIN, L_FRAME, L_SUBFR );
+                *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1, *T0_min, *T0_max, T0_frac, 0, 0, PIT_MAX, PIT_MIN, L_FRAME, L_SUBFR );
+                move16();
             }
         }
         ELSE
@@ -1965,12 +2019,13 @@ static void tc_enc_ivas_fx(
     {
         IF( EQ_16( nBits, 10 ) )
         {
-            *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 1, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, L_FRAME16k, L_SUBFR );
+            *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1, *T0_min, *T0_max, T0_frac, 0, 1, PIT16k_FR2_EXTEND_10b, PIT16k_MAX, L_FRAME16k, L_SUBFR );
+            move16();
         }
         ELSE IF( EQ_16( nBits, 6 ) )
         {
             /* T0_frac with 1/2 sample resolution */
-            *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1_fx, *T0_min, *T0_max, T0_frac, 0, 0, PIT16k_MIN, L_SUBFR, L_FRAME16k, L_SUBFR );
+            *T0 = pitch_fr4_fx( &exc_fx[i_subfr], xn_fx, h1, *T0_min, *T0_max, T0_frac, 0, 0, PIT16k_MIN, L_SUBFR, L_FRAME16k, L_SUBFR );
             IF( *T0 > L_SUBFR )
             {
                 *T0 = L_SUBFR;
@@ -1996,7 +2051,7 @@ static void tc_enc_ivas_fx(
      * Builds glottal codebook contribution
      *--------------------------------------------------------------*/
 
-    set_impulse_fx( xn_fx, h1_tmp_fx, &exc_fx[i_subfr], yy1_fx, &imp_shape, &imp_pos, &gain_trans32, Q_new ); /*chk h1_tmp_fx*/
+    set_impulse_fx( xn_fx, h1, &exc_fx[i_subfr], yy1_fx, &imp_shape, &imp_pos, &gain_trans32, Q_new );
 
     /*--------------------------------------------------------------*
      * quantize gain_trans and scale glottal codebook contribution
@@ -2026,16 +2081,17 @@ static void tc_enc_ivas_fx(
     /*--------------------------------------------------------------*
      * compute glottal-shape codebook excitation
      *--------------------------------------------------------------*/
-
+#ifdef TEST_HR
+    Copy( h1, h1_fx, L_SUBFR + ( M + 1 ) );
+#else
+    Copy_Scale_sig( h1, h1_fx, L_SUBFR + ( M + 1 ), 1 );
+#endif
     /* create filtered glottal codebook contribution */
     conv_fx( &exc_fx[i_subfr], h1_fx, yy1_fx, L_SUBFR );
 
     /* gain_pit computation */
-#ifdef BASOP_NOGLOB
     *gain_pit_fx = corr_xy1_fx( xn_fx, yy1_fx, g_corr_fx, L_SUBFR, 0, &Overflow );
-#else
-    *gain_pit_fx = corr_xy1_fx( xn_fx, yy1_fx, g_corr_fx, L_SUBFR, 0 );
-#endif
+    move16();
     /*--------------------------------------------------------------*
      * Encode parameters and write indices
      *--------------------------------------------------------------*/
@@ -2121,6 +2177,7 @@ static void gain_trans_enc_fx(
     Word16 i, imax, istart, tmp16, gain_trans, gscale;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     istart = 0;
@@ -2129,19 +2186,11 @@ static void gain_trans_enc_fx(
     move16();
     gscale = 7;
     move16();
-#ifdef BASOP_NOGLOB
     gain_trans = extract_h( L_shl_o( gain_trans32, 16, &Overflow ) ); /* Q7 */
-#else                                                                 /* BASOP_NOGLOB */
-    gain_trans = extract_h( L_shl( gain_trans32, 16 ) );         /* Q7 */
-#endif                                                                /* BASOP_NOGLOB */
 
     IF( GT_32( L_abs( gain_trans32 ), 29862L ) )
     {
-#ifdef BASOP_NOGLOB
         gain_trans = extract_h( L_shl_o( gain_trans32, 16 - 3, &Overflow ) ); /* Q4 */
-#else                                                                         /* BASOP_NOGLOB */
-        gain_trans = extract_h( L_shl( gain_trans32, 16 - 3 ) ); /* Q4 */
-#endif                                                                        /* BASOP_NOGLOB */
         istart = 4;
         move16();
         imax = N_GAIN_TC - 1;
@@ -2174,11 +2223,8 @@ static void gain_trans_enc_fx(
     FOR( i = 0; i < L_SUBFR; i++ )
     {
         /*exc[i] *= (*gain_trans);*/
-#ifdef BASOP_NOGLOB
         exc[i] = round_fx_o( L_shl_o( L_mult( exc[i], gain_trans ), tmp16, &Overflow ), &Overflow );
-#else
-        exc[i] = round_fx( L_shl( L_mult( exc[i], gain_trans ), tmp16 ) );
-#endif
+        move16();
     }
 }
 
@@ -2202,6 +2248,7 @@ void tc_classif_enc_fx(
     Word16 T_op, i;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     T_op = pitch;
@@ -2258,6 +2305,7 @@ void tc_classif_enc_fx(
     ELSE
     {
         *position = emaximum_fx( Q_new, res, add( T_op, 2 ), &temp );
+        move16();
 
         /* correction in case of possibly wrong T_op (double-pitch values) */
         test();
@@ -2266,24 +2314,20 @@ void tc_classif_enc_fx(
         IF( ( EQ_16( L_frame, L_FRAME ) && GT_16( T_op, 2 * PIT_MIN ) ) || ( EQ_16( L_frame, L_FRAME16k ) && GT_16( T_op, 2 * PIT16k_MIN ) ) )
         {
             Word16 position_tmp, len, exp_aver = 0, exp = 0, exp2 = 0;
+            move16();
+            move16();
+            move16();
             Word32 aver, temp2, L_sum, L_temp1, L_temp2;
 
             len = add( shr( T_op, 1 ), 2 );
             position_tmp = emaximum_fx( Q_new, res, len, &temp2 );
-#ifdef BASOP_NOGLOB
             L_sum = L_mac_sat( 1L, res[0], res[0] );
-#else
-            L_sum = L_mac( 1L, res[0], res[0] );
-#endif
             FOR( i = 1; i < len; i++ )
             {
-#ifdef BASOP_NOGLOB
                 L_sum = L_mac0_o( L_sum, res[i], res[i], &Overflow );
-#else  /* BASOP_NOGLOB */
-                L_sum = L_mac0( L_sum, res[i], res[i] );
-#endif /* BASOP_NOGLOB */
             }
-            aver = L_sum;                                                                /*Q = 2*Q_new */
+            aver = L_sum; /*Q = 2*Q_new */
+            move32();
             aver = root_a_over_b_fx( aver, 2 * Q_new, L_shl( len, 15 ), 15, &exp_aver ); /*Q = 31-exp_aver*/
 
             temp = root_a_fx( temp, 0, &exp );    /* Q=31-exp */
@@ -2293,15 +2337,11 @@ void tc_classif_enc_fx(
             L_temp1 = Mult_32_16( temp, 8192 );  /* Q=31-exp */
 
             test();
-#ifdef BASOP_NOGLOB
             IF( GT_32( temp2, L_shl_o( L_temp2, ( 31 - exp2 ) - ( 31 - exp ), &Overflow ) ) &&
                 LT_32( aver, L_shl_o( L_temp1, ( 31 - exp_aver ) - ( 31 - exp ), &Overflow ) ) )
-#else /* BASOP_NOGLOB */
-            IF( GT_32( temp2, L_shl( L_temp2, ( 31 - exp2 ) - ( 31 - exp ) ) ) &&
-                LT_32( aver, L_shl( L_temp1, ( 31 - exp_aver ) - ( 31 - exp ) ) ) )
-#endif
             {
                 *position = position_tmp;
+                move16();
             }
         }
         *tc_subfr = s_and( *position, 0x7FC0 );
diff --git a/lib_enc/update_decision.c b/lib_enc/update_decision.c
deleted file mode 100644
index 825401325748d89d4db5894372ff8dd2e53d76ec..0000000000000000000000000000000000000000
--- a/lib_enc/update_decision.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/update_decision_fx.c b/lib_enc/update_decision_fx.c
index 7fda8e5d2047fbc60d3bccab140d6b336b54c85c..315adcf819d9061691879a2b3c4c3f4752bdba94 100644
--- a/lib_enc/update_decision_fx.c
+++ b/lib_enc/update_decision_fx.c
@@ -253,7 +253,7 @@ Word16 update_decision_fx(
 
     hVAD_CLDFB->tonality_rate3 = mult( hVAD_CLDFB->tonality_rate3, 32211 );
     move16();
-    if ( tonality_flag )
+    IF( tonality_flag )
     {
         hVAD_CLDFB->tonality_rate3 = add( mult( hVAD_CLDFB->tonality_rate3, 32211 ), 557 );
         move16();
@@ -274,8 +274,7 @@ Word16 update_decision_fx(
 
     test();
     test();
-    IF( ( GT_16( f_tonality_rate[1], 7536 /* 0.46 Q14 */ ) ) && ( ( GT_16( sSFM[1], 30473 /* 0.93 Q15 */ ) ) || ( GT_16( ltd_stable_rate[0], 2949 /* 0.09 Q15 */ ) ) ) )
-
+    if ( ( GT_16( f_tonality_rate[1], 7536 /* 0.46 Q14 */ ) ) && ( ( GT_16( sSFM[1], 30473 /* 0.93 Q15 */ ) ) || ( GT_16( ltd_stable_rate[0], 2949 /* 0.09 Q15 */ ) ) ) )
     {
         update_flag = 0;
         move16();
@@ -284,7 +283,7 @@ Word16 update_decision_fx(
     test();
     test();
     test();
-    IF( ( LT_16( sSFM[1], 30473 /* 0.93 Q15 */ ) && LT_16( sSFM[0], 30146 /* 0.92 Q15 */ ) && LT_16( sSFM[2], 31784 /* 0.97 Q15 */ ) ) && ( GT_16( f_tonality_rate[1], 8192 /* 0.5 Q14 */ ) ) )
+    if ( ( LT_16( sSFM[1], 30473 /* 0.93 Q15 */ ) && LT_16( sSFM[0], 30146 /* 0.92 Q15 */ ) && LT_16( sSFM[2], 31784 /* 0.97 Q15 */ ) ) && ( GT_16( f_tonality_rate[1], 8192 /* 0.5 Q14 */ ) ) )
     {
         update_flag = 0;
         move16();
@@ -292,7 +291,7 @@ Word16 update_decision_fx(
 
     test();
     test();
-    IF( ( f_tonality_rate[1] > 7045 /* 0.43 Q14 */ ) && ( sSFM[0] < 31129 /* 0.95 Q15 */ ) && ( sp_center[1] > 1985 /* 1.94 Q10 */ ) )
+    if ( ( f_tonality_rate[1] > 7045 /* 0.43 Q14 */ ) && ( sSFM[0] < 31129 /* 0.95 Q15 */ ) && ( sp_center[1] > 1985 /* 1.94 Q10 */ ) )
     {
         update_flag = 0;
         move16();
@@ -300,9 +299,10 @@ Word16 update_decision_fx(
 
     IF( EQ_16( update_flag, 1 ) )
     {
-        if ( LT_16( hVAD_CLDFB->update_count, 1000 ) )
+        IF( LT_16( hVAD_CLDFB->update_count, 1000 ) )
         {
             hVAD_CLDFB->update_count = add( hVAD_CLDFB->update_count, 1 );
+            move16();
         }
     }
 
@@ -342,23 +342,26 @@ Word16 update_decision_fx(
     test();
     test();
     test();
-    IF( vad_flag && GT_32( snr, 33554431 /* 1.0 Q25 */ ) && EQ_16( bw, CLDFBVAD_SWB_ID ) && tmpout > 0 )
+    if ( vad_flag && GT_32( snr, 33554431 /* 1.0 Q25 */ ) && EQ_16( bw, CLDFBVAD_SWB_ID ) && tmpout > 0 )
     {
         update_flag = 0;
+        move16();
     }
 
     test();
     test();
     test();
-    IF( vad_flag && GT_32( snr, 50331647 /* 1.5 Q25 */ ) && NE_16( bw, CLDFBVAD_SWB_ID ) && tmpout > 0 )
+    if ( vad_flag && GT_32( snr, 50331647 /* 1.5 Q25 */ ) && NE_16( bw, CLDFBVAD_SWB_ID ) && tmpout > 0 )
     {
         update_flag = 0;
+        move16();
     }
 
 
     IF( update_flag == 0 )
     {
         hVAD_CLDFB->update_num_with_snr = 0;
+        move16();
     }
     ELSE
     {
@@ -369,6 +372,7 @@ Word16 update_decision_fx(
             update_flag = 0;
             move16();
             hVAD_CLDFB->update_num_with_snr = add( hVAD_CLDFB->update_num_with_snr, 1 );
+            move16();
         }
     }
 
@@ -397,8 +401,6 @@ Word16 update_decision_fx(
             move32();
         }
 
-        move16();
-        move16();
         IF( GT_16( (Word16) abs_s( sub( hVAD_CLDFB->sp_center[0], hVAD_CLDFB->lt_noise_sp_center0 ) ), 2455 /* 2.4 Q10 */ ) )
         {
             hVAD_CLDFB->lt_noise_sp_center0 = add( mult( hVAD_CLDFB->lt_noise_sp_center0, 32637 ), mult( hVAD_CLDFB->sp_center[0], 131 ) );
diff --git a/lib_enc/updt_enc.c b/lib_enc/updt_enc.c
deleted file mode 100644
index cb36dd4b04c94cce04cb194654b8bf337ab9c5cd..0000000000000000000000000000000000000000
--- a/lib_enc/updt_enc.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "prot.h"
-#include "prot_fx.h"
-#include "prot_fx_enc.h"
-#include "ivas_prot_fx.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * updt_enc()
- *
- * Common updates (all frame types)
- *-------------------------------------------------------------------*/
-
-
-void updt_enc_common_ivas_fx(
-    Encoder_State *st, /* i/o: encoder state structure     */
-    const Word16 Q_new /* i  : CUrrent frame scaling       */
-)
-{
-    /*---------------------------------------------------------------------*
-     * Updates - main main codec parameters
-     *---------------------------------------------------------------------*/
-    st->last_sr_core = st->sr_core;
-    move32();
-    st->last_codec_mode = st->codec_mode;
-    move16();
-    st->last_L_frame = st->L_frame;
-    move16();
-    st->last_core = st->core;
-    move16();
-
-    st->last_total_brate = st->total_brate;
-    move32();
-    st->last_bits_frame_nominal = st->bits_frame_nominal;
-    move16();
-    st->last_core_brate = st->core_brate;
-    move32();
-    st->last_extl = st->extl;
-    move16();
-    st->last_input_bwidth = st->input_bwidth;
-    move16();
-    st->last_bwidth = st->bwidth;
-    move16();
-    st->last_coder_type_raw = st->coder_type_raw;
-    move16();
-    st->prev_Q_new = Q_new;
-    move16();
-
-    test();
-    IF( GT_32( st->core_brate, SID_2k40 ) && st->hDtxEnc != NULL )
-    {
-        st->hDtxEnc->last_active_brate = st->total_brate;
-        move32();
-    }
-
-    IF( st->hBWE_TD != NULL )
-    {
-        IF( EQ_16( st->core, HQ_CORE ) )
-        {
-            /* in the HQ core, coder_type is not used so it could have been set to anything */
-            st->hBWE_TD->prev_coder_type = GENERIC;
-            move16();
-        }
-        ELSE
-        {
-            st->hBWE_TD->prev_coder_type = st->coder_type;
-            move16();
-        }
-    }
-
-    test();
-    IF( st->Opt_DTX_ON && st->hTdCngEnc != NULL )
-    {
-        IF( GT_32( st->core_brate, SID_2k40 ) )
-        {
-            IF( EQ_16( st->hDtxEnc->first_CNG, 1 ) )
-            {
-                IF( GE_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) )
-                {
-                    st->hTdCngEnc->act_cnt = 0;
-                    move16();
-                }
-                st->hTdCngEnc->act_cnt = add( st->hTdCngEnc->act_cnt, 1 );
-                move16();
-
-                test();
-                IF( EQ_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) && st->hTdCngEnc->ho_hist_size > 0 )
-                {
-                    st->hTdCngEnc->ho_hist_size = sub( st->hTdCngEnc->ho_hist_size, 1 );
-                    move16();
-                }
-            }
-
-            test();
-            test();
-            test();
-            IF( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->hDtxEnc->first_CNG, 1 ) )
-            {
-                IF( GE_16( ++( st->hTdCngEnc->act_cnt2 ), MIN_ACT_CNG_UPD ) )
-                {
-                    st->hTdCngEnc->act_cnt2 = MIN_ACT_CNG_UPD;
-                    move16();
-                }
-
-                test();
-                test();
-                test();
-                test();
-                IF( ( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && GE_16( st->hTdCngEnc->act_cnt2, MIN_ACT_CNG_UPD ) )
-                {
-                    Word32 cng_att_fx32 = 0;
-
-                    apply_scale( &cng_att_fx32, st->hFdCngEnc->hFdCngCom->CngBandwidth, st->hFdCngEnc->hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
-
-                    st->hTdCngEnc->CNG_att_fx = extract_l( L_shr( cng_att_fx32, Q16 ) ); // Q23
-                }
-            }
-        }
-
-        test();
-        test();
-        test();
-        IF( ( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, FRAME_NO_DATA ) ) && st->hDtxEnc->first_CNG == 0 && EQ_16( st->cng_type, LP_CNG ) )
-        {
-            st->hDtxEnc->first_CNG = 1;
-            move16();
-        }
-    }
-
-    /*-----------------------------------------------------------------*
-     * Increase the counter of initialization frames
-     * Limit the max number of init. frames
-     *-----------------------------------------------------------------*/
-
-    IF( LT_16( st->ini_frame, MAX_FRAME_COUNTER ) )
-    {
-        st->ini_frame = add( st->ini_frame, 1 );
-    }
-
-    /* synchronisation of CNG seeds */
-    test();
-    test();
-    IF( st->hTdCngEnc != NULL && NE_32( st->core_brate, FRAME_NO_DATA ) && NE_32( st->core_brate, SID_2k40 ) && NE_16( st->core, AMR_WB_CORE ) )
-    {
-        Random( &( st->hTdCngEnc->cng_seed ) );
-        Random( &( st->hTdCngEnc->cng_ener_seed ) );
-    }
-
-    /*---------------------------------------------------------------------*
-     * Updates - MODE2
-     *---------------------------------------------------------------------*/
-
-    test();
-    IF( EQ_16( st->element_mode, EVS_MONO ) && EQ_16( st->mdct_sw, MODE2 ) )
-    {
-        st->codec_mode = MODE2;
-        move16();
-
-        st->sr_core = getCoreSamplerateMode2( EVS_MONO, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, 0 );
-        move16();
-
-        Word16 exp;
-        st->L_frame = BASOP_Util_Divide3232_Scale( st->sr_core, FRAMES_PER_SEC, &exp );
-        st->L_frame = shr( st->L_frame, sub( 15, exp ) );
-        move16();
-
-        IF( EQ_32( st->sr_core, INT_FS_12k8 ) )
-        {
-            st->preemph_fac = PREEMPH_FAC;
-            st->gamma = GAMMA1;
-        }
-        ELSE
-        {
-
-            st->preemph_fac = PREEMPH_FAC_16k;
-            st->gamma = GAMMA16k;
-        }
-
-        st->igf = getIgfPresent_fx( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode );
-    }
-
-    /* update FER clas */
-    IF( NE_16( st->core, AMR_WB_CORE ) )
-    {
-        st->last_clas = st->clas;
-        move16();
-    }
-
-    /* Update Core */
-    core_encode_update_ivas_fx( st );
-
-    /*---------------------------------------------------------------------*
-     * RF mode updates
-     *---------------------------------------------------------------------*/
-
-    IF( st->rf_mode )
-    {
-        IF( st->hSC_VBR != NULL )
-        {
-            IF( st->hRF->rf_frame_type == RF_NELP )
-            {
-                st->hSC_VBR->last_nelp_mode = 1;
-                move16();
-            }
-            ELSE
-            {
-                st->hSC_VBR->last_nelp_mode = 0;
-                move16();
-            }
-        }
-    }
-
-    st->rf_mode_last = st->rf_mode;
-    move16();
-
-    IF( st->Opt_RF_ON )
-    {
-        st->L_frame = L_FRAME;
-        st->rf_mode = 1;
-        move16();
-        move16();
-    }
-
-    /*---------------------------------------------------------------------*
-     * Other updates
-     *---------------------------------------------------------------------*/
-
-    test();
-    IF( st->element_mode > EVS_MONO && st->hTcxEnc != NULL )
-    {
-        st->hTcxEnc->tcxltp_norm_corr_mem = st->hTcxEnc->tcxltp_norm_corr_past;
-    }
-
-    return;
-}
diff --git a/lib_enc/updt_enc_fx.c b/lib_enc/updt_enc_fx.c
index 6a3202a1595650cd87d2d6cc049bafe6db557b4e..aed3bf81271924fb7dbf5f7228293c5434829f37 100644
--- a/lib_enc/updt_enc_fx.c
+++ b/lib_enc/updt_enc_fx.c
@@ -10,6 +10,7 @@
 #include "prot_fx.h"     /* Function prototypes                    */
 #include "prot_fx_enc.h" /* Function prototypes                    */
 #include "basop_util.h"  /* Function prototypes                    */
+#include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------*
  * updt_enc()
@@ -37,6 +38,7 @@ void updt_enc_fx(
     /* update old excitation buffer */
     Copy( &old_exc[st->L_frame], hLPDmem->old_exc, L_EXC_MEM );
     test();
+    test();
     IF( !st->Opt_AMR_WB && st->hBWE_TD != NULL )
     {
         Copy( &old_bwe_exc[L_FRAME32k], hBWE_TD->old_bwe_exc_fx, PIT16k_MAX * 2 );
@@ -89,6 +91,7 @@ void updt_enc_fx(
         move16(); /* tends to speech */
         /*st->mid_dyn_fx = 40.0f * 0.5f + st->mid_dyn * 0.5f;*/
         hGSCEnc->mid_dyn_fx = add( 20 * 128, mult_r( hGSCEnc->mid_dyn_fx, 16384 ) ); /*Q7*/
+        move16();
     }
 
     /* convert old LSP vector from 12kHz domain to 16kHz domain (needed in case of ACELP@12k8 <-> ACELP@16kHz switching) */
@@ -96,6 +99,7 @@ void updt_enc_fx(
     {
         Copy( st->lsp_old_fx, st->lsp_old16k_fx, M );
         st->rate_switching_reset_16kHz = lsp_convert_poly_fx( st->lsp_old16k_fx, L_FRAME16k, st->Opt_AMR_WB );
+        move16();
     }
 
     /* update buffer of old subframe pitch values */
@@ -139,6 +143,7 @@ void updt_enc_fx(
     /* core switching updates */
     Copy( &Aq[( st->L_frame / L_SUBFR - 1 ) * ( M + 1 )], st->old_Aq_12_8_fx, M + 1 );
     st->old_Es_pred_fx = Es_pred;
+    move16();
 
     return;
 }
@@ -167,6 +172,7 @@ void updt_IO_switch_enc_fx(
     {
         /* reset onset detection counter */
         st->tc_cnt = -1;
+        move16();
 
         /* force safety-net LSFQ in the first frames after the switching */
         st->Nb_ACELP_frames = 0;
@@ -186,6 +192,7 @@ void updt_IO_switch_enc_fx(
         {
             /* old index is initialized to -1,  and may only be updated after it has been calculated properly at least once once */
             hTdCngEnc->old_enr_index = s_min( mult( shl( hTdCngEnc->old_enr_index, 1 ), 32459 ), 127 ); /*32459 = 2/(STEP_SID/STEP_AMR_WB_SID)*/
+            move16();
         }
         /* Perform preemphasis of the old input signal @16kHz */
         st->mem_preemph16k_fx = 0;
@@ -197,20 +204,6 @@ void updt_IO_switch_enc_fx(
         set16_fx( hBWE_TD->old_speech_wb_fx, 0, ( L_LOOK_12k8 + L_SUBFR ) * 5 / 16 );
         set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 );
         set16_fx( hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET );
-#ifdef IVAS_CODE
-        set16_fx( st->hBWE_TD->mem_shb_res, 0, MAX_LEN_MA_FILTER );
-        set16_fx( st->hBWE_TD->old_EnvSHBres, 0, L_FRAME4k );
-        st->hBWE_TD->old_mean_EnvSHBres = 0;
-        st->hBWE_TD->prev_enr_EnvSHBres = 32767;
-        st->hBWE_TD->prev_pow_exc16kWhtnd = 32767;
-        st->hBWE_TD->prev_mix_factor = 32767;
-        st->hBWE_TD->prev_Env_error = 0;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-#endif
         hBWE_TD->bwe_non_lin_prev_scale_fx = 0;
         move16();
         set16_fx( hBWE_TD->decim_state1_fx, 0, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) );
@@ -244,23 +237,6 @@ void updt_IO_switch_enc_fx(
 
         st->use_acelp_preq = 0;
         move16();
-#ifdef IVAS_CODE
-        set16_fx( st->hSpMusClas->finc_prev, 0, ATT_NSEG );
-        set16_fx( st->hSpMusClas->tod_lt_Bin_E, 0, TOD_NSPEC );
-        set16_fx( st->hSpMusClas->tod_S_map_lt, 0, TOD_NSPEC );
-        st->hSpMusClas->lt_finc = 0;
-        st->hSpMusClas->last_strong_attack = 0;
-        st->hSpMusClas->tod_thr_lt = TOD_THR_MASS;
-        st->hSpMusClas->tod_weight = 0;
-        st->hSpMusClas->tod_S_mass_prev = TOD_THR_MASS;
-        st->hSpMusClas->tod_S_mass_lt = TOD_THR_MASS;
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-        move16();
-#endif
     }
     ELSE /* switching to AMR-WB IO mode */
     {
@@ -325,7 +301,7 @@ void updt_IO_switch_enc_fx(
  *
  * Common updates for MODE1 and MODE2
  *-------------------------------------------------------------------*/
-#if 1
+
 void updt_enc_common_fx(
     Encoder_State *st, /* i/o: encoder state structure     */
     const Word16 Etot, /* i  : total energy                */
@@ -336,29 +312,33 @@ void updt_enc_common_fx(
      * Updates - main main codec parameters
      *---------------------------------------------------------------------*/
 
-    st->last_sr_core = st->sr_core; //##
+    st->last_sr_core = st->sr_core;
     move32();
     st->last_codec_mode = st->codec_mode;
     move16();
-    st->last_L_frame = st->L_frame; //
+    st->last_L_frame = st->L_frame;
     move16();
     st->last_core = st->core;
     move16();
 
     st->last_core_brate = st->core_brate;
     move32();
-#ifdef IVAS_CODE
-    st->last_bits_frame_nominal_fx = st->bits_frame_nominal;
-#endif
     st->last_total_brate = st->total_brate;
     move32();
-    st->last_extl = st->extl; //
+    st->last_extl = st->extl;
     move16();
-    st->last_input_bwidth = st->input_bwidth; //##
+    st->last_input_bwidth = st->input_bwidth;
     move16();
-    st->last_bwidth = st->bwidth; //##
+    st->last_bwidth = st->bwidth;
     move16();
-    st->hNoiseEst->Etot_last_fx = Etot;
+    IF( GT_16( st->element_mode, EVS_MONO ) )
+    {
+        st->hNoiseEst->Etot_last_32fx = L_deposit_h( Etot );
+    }
+    ELSE
+    {
+        st->hNoiseEst->Etot_last_fx = Etot;
+    }
     move16();
     st->last_coder_type_raw = st->coder_type_raw;
     move16();
@@ -367,7 +347,7 @@ void updt_enc_common_fx(
     move16();
 
     test();
-    if ( GT_32( st->core_brate, SID_2k40 ) && st->hDtxEnc != NULL )
+    IF( GT_32( st->core_brate, SID_2k40 ) && st->hDtxEnc != NULL )
     {
         st->hDtxEnc->last_active_brate = st->total_brate;
         move32();
@@ -377,7 +357,7 @@ void updt_enc_common_fx(
     {
         st->hBWE_TD->prev_coder_type = st->coder_type;
         move16();
-        if ( EQ_16( st->core, HQ_CORE ) )
+        IF( EQ_16( st->core, HQ_CORE ) )
         {
             /* in the HQ core, coder_type is not used so it could have been set to anything */
             st->hBWE_TD->prev_coder_type = GENERIC;
@@ -392,17 +372,19 @@ void updt_enc_common_fx(
         {
             IF( EQ_16( st->hDtxEnc->first_CNG, 1 ) )
             {
-                if ( GE_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) )
+                IF( GE_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) )
                 {
                     st->hTdCngEnc->act_cnt = 0;
                     move16();
                 }
                 st->hTdCngEnc->act_cnt = add( st->hTdCngEnc->act_cnt, 1 );
+                move16();
 
                 test();
-                if ( EQ_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) && st->hTdCngEnc->ho_hist_size > 0 )
+                IF( EQ_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) && st->hTdCngEnc->ho_hist_size > 0 )
                 {
                     st->hTdCngEnc->ho_hist_size = sub( st->hTdCngEnc->ho_hist_size, 1 );
+                    move16();
                 }
             }
 
@@ -413,26 +395,22 @@ void updt_enc_common_fx(
             {
                 st->hTdCngEnc->act_cnt2 = add( st->hTdCngEnc->act_cnt2, 1 );
                 st->hTdCngEnc->act_cnt2 = s_min( st->hTdCngEnc->act_cnt2, MIN_ACT_CNG_UPD );
+                move16();
+                move16();
 
-#ifdef IVAS_CODE
                 test();
                 test();
                 test();
                 IF( ( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && GE_16( st->hTdCngEnc->act_cnt2, MIN_ACT_CNG_UPD ) )
                 {
-                    st->hTdCngEnc->CNG_att_fx = 0;
-                    move16();
-
-                    apply_scale( &st->hTdCngEnc->CNG_att, st->hFdCngEnc->hFdCngCom->CngBandwidth, st->hFdCngEnc->hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
                 }
-#endif
             }
         }
 
         test();
         test();
         test();
-        if ( ( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, FRAME_NO_DATA ) ) && st->hDtxEnc->first_CNG == 0 && EQ_16( st->cng_type, LP_CNG ) )
+        IF( ( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, FRAME_NO_DATA ) ) && st->hDtxEnc->first_CNG == 0 && EQ_16( st->cng_type, LP_CNG ) )
         {
             st->hDtxEnc->first_CNG = 1;
             move16();
@@ -447,6 +425,7 @@ void updt_enc_common_fx(
     if ( LT_16( st->ini_frame, MAX_FRAME_COUNTER ) )
     {
         st->ini_frame = add( st->ini_frame, 1 );
+        move16();
     }
 
     /* synchronisation of CNG seeds */
@@ -469,6 +448,7 @@ void updt_enc_common_fx(
         move16();
 
         st->sr_core = getCoreSamplerateMode2( EVS_MONO, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, 0 );
+        move32();
 
         // st->L_frame = extract_l(Mult_32_16(st->sr_core, 0x0290)); /*(int16_t)(st->sr_core / FRAMES_PER_SEC);*/
 
@@ -492,10 +472,11 @@ void updt_enc_common_fx(
         }
 
         st->igf = getIgfPresent_fx( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode );
+        move16();
     }
 
     /* update FER clas */
-    if ( NE_16( st->core, AMR_WB_CORE ) )
+    IF( NE_16( st->core, AMR_WB_CORE ) )
     {
         st->last_clas = st->clas;
         move16();
@@ -514,7 +495,7 @@ void updt_enc_common_fx(
         {
             st->hSC_VBR->last_nelp_mode = 0;
             move16();
-            if ( EQ_16( st->hRF->rf_frame_type, RF_NELP ) )
+            IF( EQ_16( st->hRF->rf_frame_type, RF_NELP ) )
             {
                 st->hSC_VBR->last_nelp_mode = 1;
                 move16();
@@ -536,14 +517,240 @@ void updt_enc_common_fx(
     /*---------------------------------------------------------------------*
      * Other updates
      *---------------------------------------------------------------------*/
-#ifdef IVAS_CODE
+
     test();
-    if ( GT_16( st->element_mode, EVS_MONO ) && st->hTcxEnc != NULL )
+    IF( GT_16( st->element_mode, EVS_MONO ) && st->hTcxEnc != NULL )
+    {
+    }
+    return;
+}
+
+
+void updt_enc_common_ivas_fx(
+    Encoder_State *st, /* i/o: encoder state structure     */
+    const Word16 Q_new /* i  : CUrrent frame scaling       */
+)
+{
+    /*---------------------------------------------------------------------*
+     * Updates - main main codec parameters
+     *---------------------------------------------------------------------*/
+    st->last_sr_core = st->sr_core;
+    move32();
+    st->last_codec_mode = st->codec_mode;
+    move16();
+    st->last_L_frame = st->L_frame;
+    move16();
+    st->last_core = st->core;
+    move16();
+
+    st->last_total_brate = st->total_brate;
+    move32();
+    st->last_bits_frame_nominal = st->bits_frame_nominal;
+    move16();
+    st->last_core_brate = st->core_brate;
+    move32();
+    st->last_extl = st->extl;
+    move16();
+    st->last_input_bwidth = st->input_bwidth;
+    move16();
+    st->last_bwidth = st->bwidth;
+    move16();
+    st->last_coder_type_raw = st->coder_type_raw;
+    move16();
+    st->prev_Q_new = Q_new;
+    move16();
+
+    test();
+    if ( GT_32( st->core_brate, SID_2k40 ) && st->hDtxEnc != NULL )
+    {
+        st->hDtxEnc->last_active_brate = st->total_brate;
+        move32();
+    }
+
+    IF( st->hBWE_TD != NULL )
+    {
+        IF( EQ_16( st->core, HQ_CORE ) )
+        {
+            /* in the HQ core, coder_type is not used so it could have been set to anything */
+            st->hBWE_TD->prev_coder_type = GENERIC;
+            move16();
+        }
+        ELSE
+        {
+            st->hBWE_TD->prev_coder_type = st->coder_type;
+            move16();
+        }
+    }
+
+    test();
+    IF( st->Opt_DTX_ON && st->hTdCngEnc != NULL )
+    {
+        IF( GT_32( st->core_brate, SID_2k40 ) )
+        {
+            IF( EQ_16( st->hDtxEnc->first_CNG, 1 ) )
+            {
+                if ( GE_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) )
+                {
+                    st->hTdCngEnc->act_cnt = 0;
+                    move16();
+                }
+                st->hTdCngEnc->act_cnt = add( st->hTdCngEnc->act_cnt, 1 );
+                move16();
+
+                test();
+                IF( EQ_16( st->hTdCngEnc->act_cnt, BUF_DEC_RATE ) && st->hTdCngEnc->ho_hist_size > 0 )
+                {
+                    st->hTdCngEnc->ho_hist_size = sub( st->hTdCngEnc->ho_hist_size, 1 );
+                    move16();
+                }
+            }
+
+            test();
+            test();
+            test();
+            IF( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) || EQ_16( st->hDtxEnc->first_CNG, 1 ) )
+            {
+                if ( GE_16( ++( st->hTdCngEnc->act_cnt2 ), MIN_ACT_CNG_UPD ) )
+                {
+                    st->hTdCngEnc->act_cnt2 = MIN_ACT_CNG_UPD;
+                    move16();
+                }
+
+                test();
+                test();
+                test();
+                IF( ( EQ_16( st->element_mode, IVAS_SCE ) || EQ_16( st->element_mode, IVAS_CPE_DFT ) || EQ_16( st->element_mode, IVAS_CPE_TD ) ) && GE_16( st->hTdCngEnc->act_cnt2, MIN_ACT_CNG_UPD ) )
+                {
+                    Word32 cng_att_fx32 = 0;
+                    move32();
+
+                    apply_scale( &cng_att_fx32, st->hFdCngEnc->hFdCngCom->CngBandwidth, st->hFdCngEnc->hFdCngCom->CngBitrate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
+
+                    st->hTdCngEnc->CNG_att_fx = extract_l( L_shr( cng_att_fx32, Q16 ) ); // Q23
+                    move16();
+                }
+            }
+        }
+
+        test();
+        test();
+        test();
+        if ( ( EQ_32( st->core_brate, SID_2k40 ) || EQ_32( st->core_brate, FRAME_NO_DATA ) ) && st->hDtxEnc->first_CNG == 0 && EQ_16( st->cng_type, LP_CNG ) )
+        {
+            st->hDtxEnc->first_CNG = 1;
+            move16();
+        }
+    }
+
+    /*-----------------------------------------------------------------*
+     * Increase the counter of initialization frames
+     * Limit the max number of init. frames
+     *-----------------------------------------------------------------*/
+
+    IF( LT_16( st->ini_frame, MAX_FRAME_COUNTER ) )
+    {
+        st->ini_frame = add( st->ini_frame, 1 );
+    }
+
+    /* synchronisation of CNG seeds */
+    test();
+    test();
+    test();
+    IF( st->hTdCngEnc != NULL && ( st->core_brate != FRAME_NO_DATA ) && NE_32( st->core_brate, SID_2k40 ) && NE_16( st->core, AMR_WB_CORE ) )
+    {
+        Random( &( st->hTdCngEnc->cng_seed ) );
+        Random( &( st->hTdCngEnc->cng_ener_seed ) );
+    }
+
+    /*---------------------------------------------------------------------*
+     * Updates - MODE2
+     *---------------------------------------------------------------------*/
+
+    test();
+    IF( ( st->element_mode == EVS_MONO ) && EQ_16( st->mdct_sw, MODE2 ) )
+    {
+        st->codec_mode = MODE2;
+        move16();
+
+        st->sr_core = getCoreSamplerateMode2( EVS_MONO, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, 0 );
+        move16();
+
+        Word16 exp;
+        st->L_frame = BASOP_Util_Divide3232_Scale( st->sr_core, FRAMES_PER_SEC, &exp );
+        move16();
+        st->L_frame = shr( st->L_frame, sub( 15, exp ) );
+        move16();
+
+        IF( EQ_32( st->sr_core, INT_FS_12k8 ) )
+        {
+            st->preemph_fac = PREEMPH_FAC;
+            st->gamma = GAMMA1;
+        }
+        ELSE
+        {
+
+            st->preemph_fac = PREEMPH_FAC_16k;
+            st->gamma = GAMMA16k;
+        }
+        move16();
+        move16();
+
+        st->igf = getIgfPresent_fx( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode );
+        move16();
+    }
+
+    /* update FER clas */
+    if ( NE_16( st->core, AMR_WB_CORE ) )
+    {
+        st->last_clas = st->clas;
+        move16();
+    }
+
+    /* Update Core */
+    core_encode_update_ivas_fx( st );
+
+    /*---------------------------------------------------------------------*
+     * RF mode updates
+     *---------------------------------------------------------------------*/
+
+    IF( st->rf_mode )
+    {
+        IF( st->hSC_VBR != NULL )
+        {
+            IF( EQ_16( st->hRF->rf_frame_type, RF_NELP ) )
+            {
+                st->hSC_VBR->last_nelp_mode = 1;
+                move16();
+            }
+            ELSE
+            {
+                st->hSC_VBR->last_nelp_mode = 0;
+                move16();
+            }
+        }
+    }
+
+    st->rf_mode_last = st->rf_mode;
+    move16();
+
+    IF( st->Opt_RF_ON )
+    {
+        st->L_frame = L_FRAME;
+        st->rf_mode = 1;
+        move16();
+        move16();
+    }
+
+    /*---------------------------------------------------------------------*
+     * Other updates
+     *---------------------------------------------------------------------*/
+
+    test();
+    if ( st->element_mode > EVS_MONO && st->hTcxEnc != NULL )
     {
         st->hTcxEnc->tcxltp_norm_corr_mem = st->hTcxEnc->tcxltp_norm_corr_past;
         move16();
     }
-#endif
+
     return;
 }
-#endif
diff --git a/lib_enc/updt_tar.c b/lib_enc/updt_tar.c
deleted file mode 100644
index e748899a9667996f0776eb65127752b66796a660..0000000000000000000000000000000000000000
--- a/lib_enc/updt_tar.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/updt_tar_fx.c b/lib_enc/updt_tar_fx.c
index d62daff20038c9207323d924910626d50d587404..9d6b5d2d6751c852216a6801f7aa9d4af97801d2 100644
--- a/lib_enc/updt_tar_fx.c
+++ b/lib_enc/updt_tar_fx.c
@@ -14,10 +14,10 @@
  * Update the target vector for codebook search.
  *----------------------------------------------------------------------------------*/
 void updt_tar_fx(
-    const Word16 *x,   /* i  : old target (for pitch search)     */
-    Word16 *x2,        /* o  : new target (for codebook search)  */
-    const Word16 *y,   /* i  : filtered adaptive codebook vector */
-    const Word16 gain, /* i  : adaptive codebook gain            */
+    const Word16 *x,   /* i  : old target (for pitch search)    Qz  */
+    Word16 *x2,        /* o  : new target (for codebook search)  Qz */
+    const Word16 *y,   /* i  : filtered adaptive codebook vector Qz */
+    const Word16 gain, /* i  : adaptive codebook gain        Q14 */
     const Word16 L     /* i  : subframe size                     */
 )
 {
@@ -25,20 +25,17 @@ void updt_tar_fx(
     Word32 L_tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
     FOR( i = 0; i < L; i++ )
     {
         /*x2[i] = x[i] - gain*y[i];*/
-        L_tmp = L_mult( x[i], 16384 );
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mult( x[i], 16384 ); /* (Qz*Q14) -> (Qz+15) */
         L_tmp = L_msu_sat( L_tmp, y[i], gain );
         x2[i] = extract_h( L_shl_o( L_tmp, 1, &Overflow ) );
-#else /* BASOP_NOGLOB */
-        L_tmp = L_msu( L_tmp, y[i], gain );
-        x2[i] = extract_h( L_shl( L_tmp, 1 ) );
-#endif
+        move16();
     }
     return;
 }
@@ -48,9 +45,9 @@ void updt_tar_fx(
  * Update the target vector for codebook search.
  *----------------------------------------------------------------------------------*/
 void updt_tar_HR_fx(
-    const Word16 *x,   /* i  : old target (for pitch search)           */
-    Word16 *x2,        /* o  : new target (for codebook search)        */
-    const Word16 *y,   /* i  : filtered adaptive codebook vector       */
+    const Word16 *x,   /* i  : old target (for pitch search)    Qz */
+    Word16 *x2,        /* o  : new target (for codebook search) Qz */
+    const Word16 *y,   /* i  : filtered adaptive codebook vector Qz      */
     const Word16 gain, /* i  : adaptive codebook gain  Q2              */
     const Word16 Qx,   /* i  : Scaling factor to adapt output to input */
     const Word16 L     /* i  : subframe size                           */
@@ -60,20 +57,17 @@ void updt_tar_HR_fx(
     Word32 L_tmp, L_tmp1;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     FOR( i = 0; i < L; i++ )
     {
         /*x2[i] = x[i] - gain*y[i];*/
-        L_tmp = L_mult( x[i], 32767 );
-#ifdef BASOP_NOGLOB
-        L_tmp1 = L_shl_o( L_mult_o( y[i], gain, &Overflow ), Qx, &Overflow );
+        L_tmp = L_mult( x[i], 32767 );                                        /* (Qz*Q15) = (Qz+16) */
+        L_tmp1 = L_shl_o( L_mult_o( y[i], gain, &Overflow ), Qx, &Overflow ); /* ((Qz+2+1)<<Qx) = Qz+Qx+3*/
         L_tmp = L_sub_o( L_tmp, L_tmp1, &Overflow );
-#else
-        L_tmp1 = L_shl( L_mult( y[i], gain ), Qx );
-        L_tmp = L_sub( L_tmp, L_tmp1 );
-#endif
-        x2[i] = extract_h( L_tmp );
+        x2[i] = extract_h( L_tmp ); /*(Qz + 16)-16 = Qz*/
+        move16();
     }
     return;
 }
diff --git a/lib_enc/vad.c b/lib_enc/vad.c
deleted file mode 100644
index 7ea816a4fab0b01586d8636314169899615756e1..0000000000000000000000000000000000000000
--- a/lib_enc/vad.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
-#include "ivas_prot.h"
-
-/*-----------------------------------------------------------------*
- * Local constants
- *-----------------------------------------------------------------*/
-
-#define HANGOVER_LONG       10 /* Hangover for CNG */
-#define HANGOVER_LONG_HE    20 /* Hangover of CNG */
-#define HANGOVER_LONG_MUSIC 20 /* Hangover of CNG */
-#define HANGOVER_LONG_NB    8  /* Hangover for CNG */
-#define ACTIVE_FRAMES       3  /* Number of consecutive active SPEECH frames necessary to trigger HO */
-
-#define TH16_2       35.0f /* long-term SNR that separates the curves for clean speech and noisy speech */
-#define TH8_1        20.0f /* long-term SNR that separates the curves for clean speech and noisy speech     */
-#define TH16_2_NFLAG 35.0f
-#define TH8_1_NFLAG  35.0f
-
-
-#define SNR_OUTLIER_WGHT_1  1.00f
-#define SNR_OUTLIER_WGHT_2  1.01f
-#define SNR_OUTLIER_WGHT_3  1.02f
-#define OUTLIER_THR_1       10.0f
-#define OUTLIER_THR_2       6.0f
-#define MAX_SNR_OUTLIER_IND 17
-#define MAX_SNR_OUTLIER_1   10.0f
-#define MAX_SNR_OUTLIER_2   25.0f
-#define MAX_SNR_OUTLIER_3   50.0f
-
-/*---------------------------------------------------------------------*
- * wb_vad_init()
- *
- * VAD initializations
- *---------------------------------------------------------------------*/
-/*-----------------------------------------------------------------*
- * sing_thr_snr_acc()
- *
- * accumulate snr_sum with significance thresholds
- *-----------------------------------------------------------------*/
-/*-----------------------------------------------------------------*
- * dtx_hangover_addition()
- *
- * accumulate snr_sum with significance thresholds
- *-----------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------*
- * wb_vad()
- *
- * Voice Activity Detector
- *-----------------------------------------------------------------*/
diff --git a/lib_enc/vad_basop_fx.c b/lib_enc/vad_basop_fx.c
index f8f528c0e512c75cb9568d47512aae54374ed686..d6d0783105621e70b314ab8a971be27bd4d60434 100644
--- a/lib_enc/vad_basop_fx.c
+++ b/lib_enc/vad_basop_fx.c
@@ -114,11 +114,7 @@ Word16 FixSqrt( Word32 i_s32Val, Word16 *io_s16Q )
     Word16 result, exp;
 
     exp = sub( 31, *io_s16Q );
-#ifdef BASOP_NOGLOB
     result = round_fx_sat( Sqrt32( i_s32Val, &exp ) );
-#else
-    result = round_fx( Sqrt32( i_s32Val, &exp ) );
-#endif
     move16();
     *io_s16Q = sub( 15, exp );
 
diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c
index 6ab97954bb4ab3c809fef58d82acad554c713548..721a6e34875876d1a91f54b1a940fb20ea2de7d3 100644
--- a/lib_enc/vad_fx.c
+++ b/lib_enc/vad_fx.c
@@ -102,8 +102,11 @@ void wb_vad_init_fx(
     /* is set to max (-> start with hangover)          */
 
     hVAD->vad_flag_reg_H = L_deposit_l( 0 );
+    move32();
     hVAD->vad_flag_reg_L = L_deposit_l( 0 );
+    move32();
     hVAD->vad_prim_reg = L_deposit_l( 0 );
+    move32();
     hVAD->vad_flag_cnt_50 = 0;
     move16();
     hVAD->vad_prim_cnt_16 = 0;
@@ -139,6 +142,8 @@ void wb_vad_init_ivas_fx(
 {
     hVAD->L_snr_sum_vad_fx = 0;
     move32();
+    hVAD->q_L_snr_sum_vad = Q31;
+    move16();
     hVAD->hangover_cnt = 0;
     move16(); /* Hangover counter initialized to 0                    */
     hVAD->nb_active_frames = ACTIVE_FRAMES_FX;
@@ -210,6 +215,29 @@ void wb_vad_init_ivas_fx(
  *
  * accumulate snr_sum with significance thresholds
  *-----------------------------------------------------------------*/
+static void sign_thr_snr_acc_ivas_fx(
+    Word32 *L_snr_sum, /* o: q_snr_sum */
+    Word16 *q_snr_sum,
+    Word32 L_snr, /* i: q_snr */
+    Word16 q_snr,
+    Word32 sign_thr, /* i: q_snr */
+    Word32 min_snr   /* i: q_snr */
+)
+{
+    /*if( snr >= sign_thr ) */
+    Word32 L_tmp;
+    Word16 exp_snr_sum = sub( 31, *q_snr_sum );
+    L_tmp = min_snr;
+    move32();
+    IF( GE_32( L_snr, sign_thr ) )
+    {
+        L_tmp = L_add( L_snr, 0 ); /* q_snr */
+    }
+    *L_snr_sum = BASOP_Util_Add_Mant32Exp( *L_snr_sum, exp_snr_sum, L_tmp, sub( 31, q_snr ), &exp_snr_sum ); /* q_snr */
+    *q_snr_sum = sub( 31, exp_snr_sum );
+    move32();
+    move32();
+}
 static void sign_thr_snr_acc_fx(
     Word32 *L_snr_sum, /* o: Q4 */
     Word32 L_snr,      /* i: Q4 */
@@ -221,19 +249,17 @@ static void sign_thr_snr_acc_fx(
     Word32 L_tmp;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     L_tmp = L_deposit_l( min_snr );
-    if ( GE_32( L_snr, L_deposit_l( sign_thr ) ) )
+    IF( GE_32( L_snr, L_deposit_l( sign_thr ) ) )
     {
-        L_tmp = L_add( L_snr, 0 );
+        L_tmp = L_add( L_snr, 0 ); /* Q4 */
     }
-    BASOP_SATURATE_WARNING_OFF_EVS /* may saturate in BASOP */
-#ifdef BASOP_NOGLOB
+    BASOP_SATURATE_WARNING_OFF_EVS                            /* may saturate in BASOP */
         *L_snr_sum = L_add_o( *L_snr_sum, L_tmp, &Overflow ); /* Q4 */
-#else                                                         /* BASOP_NOGLOB */
-        *L_snr_sum = L_add( *L_snr_sum, L_tmp );                                        /* Q4 */
-#endif                                                        /* BASOP_NOGLOB */
+    move32();
     BASOP_SATURATE_WARNING_ON_EVS
 }
 
@@ -252,9 +278,9 @@ Word16 dtx_hangover_addition_fx(
     NOISE_EST_HANDLE hNoiseEst /* i  : Noise estimation handle        */
 )
 {
-    Word16 hangover_short_dtx;
-    Word16 flag_dtx;
-    Word16 tmp;
+    Word16 hangover_short_dtx; /* Q0 */
+    Word16 flag_dtx;           /* Q0 */
+    Word16 tmp;                /* Q0 */
     if ( hNoiseEst == NULL )
     {
         hNoiseEst = st_fx->hNoiseEst;
@@ -277,19 +303,19 @@ Word16 dtx_hangover_addition_fx(
 
     test();
     test();
-    if ( ( ( LT_16( lp_snr, ( 16 * 256 ) ) ) && ( NE_16( st_fx->input_bwidth, NB ) ) ) || ( GT_16( hVAD->prim_act_he_fx, 31130 ) ) ) /*.95*Q15*/
+    if ( ( ( LT_16( lp_snr, ( 16 * 256 ) ) ) && ( st_fx->input_bwidth != NB ) ) || ( GT_16( hVAD->prim_act_he_fx, 31130 ) ) ) /*.95*Q15*/
     {
         hangover_short_dtx = 3;
         move16();
     }
 
     /* Adjust hangover according to activity history */
-    if ( GT_16( hVAD->vad_prim_cnt_16, 12 ) ) /* 12 requires roughly > 80% primary activity */
+    IF( GT_16( hVAD->vad_prim_cnt_16, 12 ) ) /* 12 requires roughly > 80% primary activity */
     {
         hangover_short_dtx = add( hangover_short_dtx, 2 );
     }
 
-    if ( GT_16( hVAD->vad_flag_cnt_50, 40 ) ) /* 40 requires roughtly > 80% flag activity */
+    IF( GT_16( hVAD->vad_flag_cnt_50, 40 ) ) /* 40 requires roughtly > 80% flag activity */
     {
         hangover_short_dtx = add( hangover_short_dtx, 5 );
     }
@@ -339,7 +365,7 @@ Word16 dtx_hangover_addition_fx(
     /* hangover adjustment from  combined  FFT+CLDFBVAD */
     IF( NE_16( st_fx->core, AMR_WB_CORE ) )
     {
-        hangover_short_dtx = sub( hangover_short_dtx, cldfb_subtraction );
+        hangover_short_dtx = sub( hangover_short_dtx, cldfb_subtraction ); /* Q0 */
         hangover_short_dtx = s_max( hangover_short_dtx, 0 );
     }
 
@@ -358,9 +384,10 @@ Word16 dtx_hangover_addition_fx(
 
         /* inside HO period */
         test();
-        if ( ( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) && ( hVAD->hangover_cnt_dtx != 0 ) )
+        IF( ( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) && ( hVAD->hangover_cnt_dtx != 0 ) )
         {
-            hVAD->hangover_cnt_dtx = add( hVAD->hangover_cnt_dtx, 1 );
+            hVAD->hangover_cnt_dtx = add( hVAD->hangover_cnt_dtx, 1 ); /* Q0 */
+            move16();
         }
         hVAD->hangover_terminate_flag = 0;
         move16(); /* float fix FIX_HO_TERMINATE  */
@@ -377,21 +404,24 @@ Word16 dtx_hangover_addition_fx(
 
         /* inside Music HO period */
         test();
-        if ( ( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) && ( hVAD->hangover_cnt_music != 0 ) )
+        IF( ( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) && ( hVAD->hangover_cnt_music != 0 ) )
         {
             hVAD->hangover_cnt_music = add( hVAD->hangover_cnt_music, 1 );
+            move16();
         }
     }
     ELSE
     {
         /* Reset the counter of speech frames necessary to start hangover algorithm */
-        if ( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) /* inside HO period */
+        IF( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) /* inside HO period */
         {
             hVAD->hangover_cnt_dtx = add( hVAD->hangover_cnt_dtx, 1 );
+            move16();
         }
-        if ( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) /* inside HO period */
+        IF( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) /* inside HO period */
         {
             hVAD->hangover_cnt_music = add( hVAD->hangover_cnt_music, 1 );
+            move16();
         }
 
         /* fast terminate DTX hangover if st->hangover_terminate_flag is set */
@@ -444,9 +474,9 @@ Word16 ivas_dtx_hangover_addition_fx(
     NOISE_EST_HANDLE hNoiseEst, /* i  : Noise estimation handle        */
     Word16 *rem_dtx_ho )
 {
-    Word16 hangover_short_dtx;
-    Word16 flag_dtx;
-    Word16 tmp;
+    Word16 hangover_short_dtx; /* Q0 */
+    Word16 flag_dtx;           /* Q0 */
+    Word16 tmp;                /* Q0 */
     if ( hNoiseEst == NULL )
     {
         hNoiseEst = st_fx->hNoiseEst;
@@ -476,12 +506,12 @@ Word16 ivas_dtx_hangover_addition_fx(
     }
 
     /* Adjust hangover according to activity history */
-    if ( GT_16( hVAD->vad_prim_cnt_16, 12 ) ) /* 12 requires roughly > 80% primary activity */
+    IF( GT_16( hVAD->vad_prim_cnt_16, 12 ) ) /* 12 requires roughly > 80% primary activity */
     {
         hangover_short_dtx = add( hangover_short_dtx, 2 );
     }
 
-    if ( GT_16( hVAD->vad_flag_cnt_50, 40 ) ) /* 40 requires roughtly > 80% flag activity */
+    IF( GT_16( hVAD->vad_flag_cnt_50, 40 ) ) /* 40 requires roughtly > 80% flag activity */
     {
         hangover_short_dtx = add( hangover_short_dtx, 5 );
     }
@@ -506,7 +536,7 @@ Word16 ivas_dtx_hangover_addition_fx(
     /* need to be a bit stricter with the DTXHO in very clean WB, SWB cond for EVS12k8VAD section */
     test();
     test();
-    if ( ( NE_16( st_fx->input_bwidth, NB ) ) /* WB or SWB or FB */
+    if ( ( st_fx->input_bwidth != NB ) /* WB or SWB or FB */
          && ( NE_16( st_fx->core, AMR_WB_CORE ) ) && ( GT_16( lp_snr, 25 * 256 ) ) )
     {
         tmp = 2;
@@ -531,7 +561,7 @@ Word16 ivas_dtx_hangover_addition_fx(
     /* hangover adjustment from  combined  FFT+CLDFBVAD */
     IF( NE_16( st_fx->core, AMR_WB_CORE ) )
     {
-        hangover_short_dtx = sub( hangover_short_dtx, cldfb_subtraction );
+        hangover_short_dtx = sub( hangover_short_dtx, cldfb_subtraction ); /*Q0*/
         hangover_short_dtx = s_max( hangover_short_dtx, 0 );
     }
     IF( vad_flag != 0 ) /* Speech present */
@@ -549,9 +579,10 @@ Word16 ivas_dtx_hangover_addition_fx(
 
         /* inside HO period */
         test();
-        if ( ( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) && ( hVAD->hangover_cnt_dtx != 0 ) )
+        IF( ( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) && ( hVAD->hangover_cnt_dtx != 0 ) )
         {
-            hVAD->hangover_cnt_dtx = add( hVAD->hangover_cnt_dtx, 1 );
+            hVAD->hangover_cnt_dtx = add( hVAD->hangover_cnt_dtx, 1 ); /*Q0*/
+            move16();
         }
         hVAD->hangover_terminate_flag = 0;
         move16(); /* float fix FIX_HO_TERMINATE  */
@@ -560,7 +591,7 @@ Word16 ivas_dtx_hangover_addition_fx(
         test();
         test();
         test();
-        if ( ( GT_16( hVAD->prim_act_he_fx, 31129 ) ) && ( GT_16( hNoiseEst->Etot_lp_fx, 40 * 256 ) ) && ( GT_16( hVAD->vad_prim_cnt_16, 14 ) ) && ( GT_16( hVAD->vad_flag_cnt_50, 48 ) ) ) /* 45 requires roughly > 95% flag activity */
+        if ( ( GT_16( hVAD->prim_act_he_fx, 32113 ) ) && ( GT_16( hNoiseEst->Etot_lp_fx, 40 * 256 ) ) && ( GT_16( hVAD->vad_prim_cnt_16, 14 ) ) && ( GT_16( hVAD->vad_flag_cnt_50, 48 ) ) ) /* 45 requires roughly > 95% flag activity */
         {
             hVAD->hangover_cnt_music = 0;
             move16();
@@ -568,7 +599,7 @@ Word16 ivas_dtx_hangover_addition_fx(
 
         /* inside Music HO period */
         test();
-        if ( ( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) && ( hVAD->hangover_cnt_music != 0 ) )
+        IF( ( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) && ( hVAD->hangover_cnt_music != 0 ) )
         {
             hVAD->hangover_cnt_music = add( hVAD->hangover_cnt_music, 1 );
             move16();
@@ -577,12 +608,12 @@ Word16 ivas_dtx_hangover_addition_fx(
     ELSE
     {
         /* Reset the counter of speech frames necessary to start hangover algorithm */
-        if ( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) /* inside HO period */
+        IF( LT_16( hVAD->hangover_cnt_dtx, HANGOVER_LONG_FX ) ) /* inside HO period */
         {
             hVAD->hangover_cnt_dtx = add( hVAD->hangover_cnt_dtx, 1 );
             move16();
         }
-        if ( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) /* inside HO period */
+        IF( LT_16( hVAD->hangover_cnt_music, HANGOVER_LONG_MUSIC_FX ) ) /* inside HO period */
         {
             hVAD->hangover_cnt_music = add( hVAD->hangover_cnt_music, 1 );
             move16();
@@ -652,8 +683,8 @@ Word16 wb_vad_fx(
     const Word16 Q_new,            /* i  : scaling factor											Q0	*/
     VAD_HANDLE hVAD,               /* i/o: VAD data handle         */
     NOISE_EST_HANDLE hNoiseEst,    /* i  : Noise estimation handle        */
-    Word16 lp_speech_fx,           /* i  : long term active speech energy average        */
-    Word16 lp_noise_fx             /* i  : long term noise energy                        */
+    Word16 lp_speech_fx,           /* i  : long term active speech energy average     Q8 */
+    Word16 lp_noise_fx             /* i  : long term noise energy                     Q8 */
 )
 {
     Word16 i, flag = 0, hangover_short;
@@ -705,6 +736,7 @@ Word16 wb_vad_fx(
     Word16 last_7k2_coder_type;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
     if ( hNoiseEst == NULL )
@@ -738,14 +770,12 @@ Word16 wb_vad_fx(
     move16();
     L_accum_ener_L = L_deposit_l( 0 );
     L_accum_ener_H = L_deposit_l( 0 );
-
     L_snr18 = L_deposit_l( 0 );     /*   Q4*/
     L_snr19 = L_deposit_l( 0 );     /*  Q4 */
     L_msnr18 = L_deposit_l( 8192 ); /* 1.0 Q13*/
     L_msnr19 = L_deposit_l( 8192 ); /* 1.0 Q13 */
 
-
-    IF( EQ_16( vad_bwidth_fx, NB ) )
+    IF( vad_bwidth_fx == NB )
     {
         st_fx->min_band = 1;
         move16();
@@ -978,19 +1008,13 @@ Word16 wb_vad_fx(
             {
                 e_num = norm_l( L_tmp1 );
                 m_num = extract_h( L_shl( L_tmp1, e_num ) );
-
                 e_noise = norm_l( ftmp2 );
                 m_noise_local = extract_h( L_shl( ftmp2, e_noise ) );
 
                 m_num = shr( m_num, 1 );
                 shift_snr = add( sub( e_num, e_noise ), 15 - 4 );
-
                 snr_tmp = div_s( m_num, m_noise_local );
-#ifdef BASOP_NOGLOB
                 L_snr = L_shr_o( snr_tmp, shift_snr, &Overflow ); /* L_snr in Q4 */
-#else                                                             /* BASOP_NOGLOB */
-                L_snr = L_shr( snr_tmp, shift_snr );                                    /* L_snr in Q4 */
-#endif                                                            /* BASOP_NOGLOB */
             }
             ELSE
             {
@@ -1023,11 +1047,7 @@ Word16 wb_vad_fx(
                 shift_snr = add( sub( e_num, e_noise ), 15 - 4 );
 
                 snr_tmp = div_s( m_num, m_noise_local );
-#ifdef BASOP_NOGLOB
                 L_snr = L_shr_o( snr_tmp, shift_snr, &Overflow ); /* L_snr in Q4 */
-#else                                                             /* BASOP_NOGLOB */
-                L_snr = L_shr( snr_tmp, shift_snr );                                    /* L_snr in Q4 */
-#endif                                                            /* BASOP_NOGLOB */
             }
             ELSE
             {
@@ -1059,54 +1079,30 @@ Word16 wb_vad_fx(
         snr_sumt = add( snr_sumt, shr( snr, 4 ) ); /*Q4 */
 
 
-#ifdef BASOP_NOGLOB
         tmp = shl_o( snr, 5, &Overflow ); /* Q8 -> Q13 */
-#else                                     /* BASOP_NOGLOB */
-        tmp = shl( snr, 5 );                                                            /* Q8 -> Q13 */
-#endif                                    /* BASOP_NOGLOB */
         IF( LT_16( i, 2 ) )
         {
-#ifdef BASOP_NOGLOB
             tmp = add_o( tmp, delta1, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta1 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
         }
         ELSE IF( LT_16( i, 7 ) )
         {
-#ifdef BASOP_NOGLOB
             tmp = add_o( tmp, delta2, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta2 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
         }
         ELSE IF( LT_16( i, 18 ) )
         {
-#ifdef BASOP_NOGLOB
             tmp = add_o( tmp, delta3, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta3 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             tmp = add_o( tmp, delta4, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta4 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
         }
 
         tmp1 = tmp;
         move16(); /* ftmp1 = ftmp; */
         sub( 0, 0 );
-        if ( i < 7 )
+        if ( LT_16( i, 7 ) )
         {
-#ifdef BASOP_NOGLOB
             tmp1 = add_o( tmp, 3277, &Overflow ); /*.4 in Q13  ftmp1 = ftmp + 0.4f; */
-#else                                             /* BASOP_NOGLOB */
-            tmp1 = add( tmp, 3277 );                                                    /*.4 in Q13  ftmp1 = ftmp + 0.4f; */
-#endif                                            /* BASOP_NOGLOB */
         }
 
         tmp = s_min( tmp, 16384 );   /* Q13, ftmp = min(ftmp, 2.0f); */
@@ -1152,11 +1148,7 @@ Word16 wb_vad_fx(
             shift_snr = add( sub( e_num, e_noise ), 15 - 4 );
 
             snr_tmp = div_s( m_num, m_noise_local );
-#ifdef BASOP_NOGLOB
             L_snr = L_shr_o( snr_tmp, shift_snr, &Overflow ); /* L_snr in Q4 */
-#else                                                         /* BASOP_NOGLOB */
-            L_snr = L_shr( snr_tmp, shift_snr );                                        /* L_snr in Q4 */
-#endif                                                        /* BASOP_NOGLOB */
         }
         ELSE
         {
@@ -1194,19 +1186,11 @@ Word16 wb_vad_fx(
         /* accumulate background noise energy in bands [0-2]  and in bands [3-19]*/
         IF( LT_16( i, 3 ) )
         {
-#ifdef BASOP_NOGLOB
             L_accum_ener_L = L_add_o( L_accum_ener_L, hNoiseEst->bckr_fx[i], &Overflow ); /*Q_new+QSCALE */
-#else
-            L_accum_ener_L = L_add( L_accum_ener_L, hNoiseEst->bckr_fx[i] );            /*Q_new+QSCALE */
-#endif
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             L_accum_ener_H = L_add_o( L_accum_ener_H, hNoiseEst->bckr_fx[i], &Overflow ); /*Q_new+QSCALE */
-#else
-            L_accum_ener_H = L_add( L_accum_ener_H, hNoiseEst->bckr_fx[i] );            /*Q_new+QSCALE */
-#endif
         }
 
         /* Identify the outlier band */
@@ -1230,7 +1214,7 @@ Word16 wb_vad_fx(
         L_tmp = L_add( L_tmp1, L_tmp );
         if ( GT_32( L_tmp, L_mssnr ) )
         {
-            L_mssnr = L_tmp;
+            L_mssnr = L_tmp; /*Q13*/
         }
     }
     ELSE IF( ( snr_idx != 0 ) && GT_16( nb_sig_snr, 13 ) )
@@ -1300,11 +1284,8 @@ Word16 wb_vad_fx(
         }
     }
     /*st_fx->snr_sum_vad_fx = 0.5f * st->snr_sum_vad + 0.5f * snr_sum_ol;*/
-#ifdef BASOP_NOGLOB
     hVAD->L_snr_sum_vad_fx = L_shr( L_add_o( hVAD->L_snr_sum_vad_fx, L_snr_sum_ol, &Overflow ), 1 ); /*Q4*/
-#else                                                                                                /* BASOP_NOGLOB */
-    hVAD->L_snr_sum_vad_fx = L_shr( L_add( hVAD->L_snr_sum_vad_fx, L_snr_sum_ol ), 1 ); /*Q4*/
-#endif                                                                                               /* BASOP_NOGLOB */
+    move32();
 
     /*   snr_sum_ol = 10.0f * (float)log10( snr_sum_ol );   */
     snr_sum_ol = vad_snr_log_fx( L_snr_sum_ol, LG10 );
@@ -1340,19 +1321,9 @@ Word16 wb_vad_fx(
     L_tmp = L_shl( L_mult( sub( hNoiseEst->Etot_v_h2_fx, nv_ofs ), nv ), 7 ); /*   Q8+Q8+1 +7 --> Q24  */
     L_tmp = L_mac( L_tmp, nc, (Word16) 32767 );                               /*  Q8+Q15+1      =  Q24              */
     thr1 = mac_r( L_tmp, lp_snr, nk );                                        /*  Q8+Q15+1             - 16 --> Q8  */
-#ifdef IVAS_CODE
-    if ( st->element_mode > EVS_MONO && hNoiseEst->first_noise_updt_cnt < 100 )
-    {
-        /* lower threshold during warmup time */
-        thr1 -= 10.0f;
-        vad_thr = 0.f;
-    }
-#endif
+
     IF( GT_16( lp_snr, (Word16) 20 * ( 1 << 8 ) ) ) /* if (lp_snr > 20.0f )*/
     {
-#ifdef IVAS_CODE
-        if ( st->element_mode == EVS_MONO || hNoiseEst->first_noise_updt_cnt >= 100 )
-#endif
         {
             /* thr1 = thr1 + 0.3f * (lp_snr - 20.0f); */
             thr1 = add( thr1, mult( 9830, sub( lp_snr, (Word16) 20 * ( 1 << 8 ) ) ) ); /* Q15*Q8+1 -16 --> Q8 */
@@ -1363,6 +1334,7 @@ Word16 wb_vad_fx(
             if ( EQ_16( st_fx->max_band, 16 ) && GT_16( lp_snr, 40 * 256 ) && GT_16( thr1, 6600 ) && LT_16( lp_speech_fx, 11520 ) )
             {
                 thr1 = 6600;
+                move16();
             }
         }
     }
@@ -1401,7 +1373,7 @@ Word16 wb_vad_fx(
             test();
             test(); /*_DIFF_FLOAT_FIX_  -> the conditions around Opt_SC_VBR_fx are invertered compared to float
                                            ### st_fx->Opt_SC_VBR!=0 vs !st_fx->Opt_SC_VBR #####*/
-            test();
+            // test();
             IF( LE_16( snr_outlier_index, 4 ) && ( ( GT_16( st_fx->last_coder_type, UNVOICED ) && ( st_fx->Opt_SC_VBR != 0 ) ) ||
                                                    ( GT_16( last_7k2_coder_type, UNVOICED ) && ( st_fx->Opt_SC_VBR == 0 ) ) ) )
 
@@ -1426,12 +1398,8 @@ Word16 wb_vad_fx(
                 thr1_ol = thr1;
                 move16();
                 L_tmp2 = Msub_32_16( (Word32) 614, L_snr_outlier, 20972 ); /* .6*1024= */ /* 0.6 Q26(Q10 in high word) -  Q4*Q21+1  */
-#ifdef BASOP_NOGLOB
-                tmp2 = round_fx( L_shl_o( L_tmp2, 14, &Overflow ) ); /* Q10(high word)+ 14 -16 --> Q8*/
-#else                                                                /* BASOP_NOGLOB */
-                tmp2 = round_fx( L_shl( L_tmp2, 14 ) );                                 /* Q10(high word)+ 14 -16 --> Q8*/
-#endif
-                if ( L_tmp2 > 0 )
+                tmp2 = round_fx( L_shl_o( L_tmp2, 14, &Overflow ) );                      /* Q10(high word)+ 14 -16 --> Q8*/
+                IF( L_tmp2 > 0 )
                 {
                     thr1_ol = add( thr1_ol, tmp2 ); /* Q24 >>16 + Q8 */
                 }
@@ -1453,7 +1421,7 @@ Word16 wb_vad_fx(
             flag_he1 = 1;
             move16();                                                          /* he1 primary decision */
             hVAD->nb_active_frames_he1 = add( hVAD->nb_active_frames_he1, 1 ); /* Counter of consecutive active speech frames */
-
+            move16();
             IF( GE_16( hVAD->nb_active_frames_he1, ACTIVE_FRAMES_FX ) )
             {
                 hVAD->nb_active_frames_he1 = ACTIVE_FRAMES_FX;
@@ -1464,14 +1432,16 @@ Word16 wb_vad_fx(
 
             /* inside HO period */
             test();
-            if ( sub( hVAD->hangover_cnt_he1, HANGOVER_LONG_HE_FX ) < 0 && hVAD->hangover_cnt_he1 != 0 )
+            IF( sub( hVAD->hangover_cnt_he1, HANGOVER_LONG_HE_FX ) < 0 && hVAD->hangover_cnt_he1 != 0 )
             {
                 hVAD->hangover_cnt_he1 = add( hVAD->hangover_cnt_he1, 1 );
+                move16();
             }
 
-            if ( hVAD->soft_hangover > 0 )
+            IF( hVAD->soft_hangover > 0 )
             {
                 hVAD->soft_hangover = sub( hVAD->soft_hangover, 1 );
+                move16();
             }
         }
         ELSE
@@ -1503,7 +1473,7 @@ Word16 wb_vad_fx(
         IF( LT_16( hVAD->bcg_flux_fx, 640 ) )
         {
             hangover_hd = add( shr( hangover_hd, 1 ), 1 );
-            move16();
+            // move16();
         }
 
         /* VAD hangover for he1 */
@@ -1515,6 +1485,7 @@ Word16 wb_vad_fx(
                 flag_he1 = 1;
                 move16();
                 hVAD->soft_hangover = sub( hVAD->soft_hangover, 1 );
+                move16();
             }
             ELSE
             {
@@ -1536,6 +1507,7 @@ Word16 wb_vad_fx(
             flag_he1 = 1;
             move16();
             hVAD->hangover_cnt_he1 = add( hVAD->hangover_cnt_he1, 1 );
+            move16();
         }
 
 
@@ -1551,11 +1523,13 @@ Word16 wb_vad_fx(
                     {
                         /*st->bcg_flux = 0.9f * st->bcg_flux + (1-0.9f)*(st->bcg_flux+50);*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 29491 ), add( hVAD->bcg_flux_fx, 800 ), 3277 ); /*Q4 */
+                        move16();
                     }
                     ELSE
                     {
                         /*st->bcg_flux = 0.9f * st->bcg_flux + (1-0.9f)*snr_sumt*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 29491 ), snr_sumt, 3277 ); /*Q4 */
+                        move16();
                     }
                 }
                 ELSE
@@ -1564,11 +1538,13 @@ Word16 wb_vad_fx(
                     {
                         /*st->bcg_flux = 0.99f * st->bcg_flux + (1-0.99f)*(st->bcg_flux+10);*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 32440 ), add( hVAD->bcg_flux_fx, 160 ), 328 ); /*Q4 */
+                        move16();
                     }
                     ELSE
                     {
                         /*st->bcg_flux = 0.99f * st->bcg_flux + (1-0.99f)*snr_sumt;*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 32440 ), snr_sumt, 328 ); /*Q4 */
+                        move16();
                     }
                 }
             }
@@ -1580,11 +1556,13 @@ Word16 wb_vad_fx(
                     {
                         /*st->bcg_flux = 0.95f * st->bcg_flux + (1-0.95f)*(st->bcg_flux-30);*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 31130 ), sub( hVAD->bcg_flux_fx, 480 ), 1638 ); /*Q4 */
+                        move16();
                     }
                     ELSE
                     {
                         /*st->bcg_flux = 0.95f * st->bcg_flux + (1-0.95f)*snr_sumt;*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 31130 ), snr_sumt, 1638 ); /*Q4 */
+                        move16();
                     }
                 }
                 ELSE
@@ -1593,16 +1571,19 @@ Word16 wb_vad_fx(
                     {
                         /*st->bcg_flux = 0.9992f * st->bcg_flux + (1-0.9992f)*(st->bcg_flux-10);*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 32742 ), sub( hVAD->bcg_flux_fx, 160 ), 26 ); /*Q4 */
+                        move16();
                     }
                     ELSE
                     {
                         /*st->bcg_flux = 0.9992f * st->bcg_flux + (1-0.9992f)*snr_sumt;*/
                         hVAD->bcg_flux_fx = mac_r( L_mult( hVAD->bcg_flux_fx, 32742 ), snr_sumt, 26 ); /*Q4 */
+                        move16();
                     }
                 }
             }
 
-            hVAD->bcg_flux_init = s_max( hVAD->bcg_flux_init, 0 );
+            hVAD->bcg_flux_init = s_max( hVAD->bcg_flux_init, 0 ); /*Q0*/
+            move16();
         }
 
         flag = 0;
@@ -1620,6 +1601,7 @@ Word16 wb_vad_fx(
             move16();
 
             hVAD->nb_active_frames = add( hVAD->nb_active_frames, 1 ); /* Counter of consecutive active speech frames */
+            move16();
 
             IF( GE_16( hVAD->nb_active_frames, ACTIVE_FRAMES_FX ) )
             {
@@ -1631,9 +1613,10 @@ Word16 wb_vad_fx(
 
             /* inside HO period */
             test();
-            if ( LT_16( hVAD->hangover_cnt, HANGOVER_LONG_FX ) && hVAD->hangover_cnt != 0 )
+            IF( LT_16( hVAD->hangover_cnt, HANGOVER_LONG_FX ) && hVAD->hangover_cnt != 0 )
             {
                 hVAD->hangover_cnt = add( hVAD->hangover_cnt, 1 );
+                move16();
             }
         }
         ELSE
@@ -1642,9 +1625,10 @@ Word16 wb_vad_fx(
             hVAD->nb_active_frames = 0;
             move16();
 
-            if ( LT_16( hVAD->hangover_cnt, HANGOVER_LONG_FX ) ) /* inside HO period */
+            IF( LT_16( hVAD->hangover_cnt, HANGOVER_LONG_FX ) ) /* inside HO period */
             {
                 hVAD->hangover_cnt = add( hVAD->hangover_cnt, 1 );
+                move16();
             }
 
 
@@ -1652,14 +1636,16 @@ Word16 wb_vad_fx(
             {
                 test();
                 test();
-                if ( EQ_16( st_fx->element_mode, EVS_MONO ) && ( LT_16( lp_snr, th_clean ) ) && ( st_fx->Opt_SC_VBR != 0 ) && ( GE_16( hVAD->hangover_cnt, 2 ) ) )
+                test();
+                if ( st_fx->element_mode == EVS_MONO && ( LT_16( lp_snr, th_clean ) ) && ( st_fx->Opt_SC_VBR != 0 ) && ( GE_16( hVAD->hangover_cnt, 2 ) ) )
                 {
                     *noisy_speech_HO = 1;
                     move16();
                 }
                 test();
                 test();
-                if ( EQ_16( st_fx->element_mode, EVS_MONO ) && ( GE_16( lp_snr, th_clean ) ) && ( st_fx->Opt_SC_VBR != 0 ) && ( GE_16( hVAD->hangover_cnt, 2 ) ) )
+                test();
+                if ( st_fx->element_mode == EVS_MONO && ( GE_16( lp_snr, th_clean ) ) && ( st_fx->Opt_SC_VBR != 0 ) && ( GE_16( hVAD->hangover_cnt, 2 ) ) )
                 {
                     *clean_speech_HO = 1;
                     move16();
@@ -1706,6 +1692,7 @@ Word16 wb_vad_fx(
         IF( GT_16( snr_sum, thr1 ) ) /* Speech present,  possibly in hangover */
         {
             hVAD->nb_active_frames = add( hVAD->nb_active_frames, 1 ); /* Counter of consecutive active speech frames */
+            move16();
             IF( GE_16( hVAD->nb_active_frames, ACTIVE_FRAMES_FX ) )
             {
                 hVAD->nb_active_frames = ACTIVE_FRAMES_FX;
@@ -1729,7 +1716,7 @@ Word16 wb_vad_fx(
         IF( LT_16( hVAD->hangover_cnt, HANGOVER_LONG_NB_FX ) )
         {
             hVAD->hangover_cnt = add( hVAD->hangover_cnt, 1 );
-
+            move16();
             IF( LT_16( lp_snr, 4864 ) )
             /*19.0f Q8*/ /* very low SNR */
             {
@@ -1752,7 +1739,7 @@ Word16 wb_vad_fx(
             tmp = 282;
             move16(); /*  1.10f; */
         }
-        if ( LT_16( lp_snr, th_clean ) )
+        IF( LT_16( lp_snr, th_clean ) )
         {
             thr2 = sub( thr1_nb_mod, tmp ); /*thr2 = thr1 - [ 1.10 || 1.3 ];*/
         }
@@ -1760,7 +1747,7 @@ Word16 wb_vad_fx(
 
         flag = 0;
         move16();
-        IF( GT_16( snr_sum, thr1_nb_mod ) ) /* Speech assumed present, even though lowered thr1   */
+        if ( GT_16( snr_sum, thr1_nb_mod ) ) /* Speech assumed present, even though lowered thr1   */
         {
             flag = 1;
             move16();
@@ -1778,8 +1765,8 @@ Word16 wb_vad_fx(
             if ( EQ_16( st_fx->element_mode, EVS_MONO ) )
             {
                 *NB_speech_HO = 1;
+                move16();
             }
-            move16();
         }
         thr1 = thr1_nb_mod;
         move16(); /* needed for  st_fx->vadnoise_fx update below */
@@ -1806,7 +1793,7 @@ Word16 wb_vad_fx(
         }
     }
 
-    if ( st_fx->hSC_VBR != NULL )
+    IF( st_fx->hSC_VBR != NULL )
     {
         /* SC-VBR */
         st_fx->hSC_VBR->vadsnr_fx = snr_sum;
@@ -1817,20 +1804,23 @@ Word16 wb_vad_fx(
 
     /* Updates */
     hVAD->prim_act_quick_fx = mult_r( 26214, hVAD->prim_act_quick_fx ); /*Q15 */
-
-    if ( st_fx->localVAD != 0 )
+    move16();
+    IF( st_fx->localVAD != 0 )
     {
         hVAD->prim_act_quick_fx = add( 6554, hVAD->prim_act_quick_fx ); /*Q15 */
+        move16();
     }
 
     hVAD->prim_act_slow_fx = mult_r( 32440, hVAD->prim_act_slow_fx ); /*Q15 */
+    move16();
 
-    if ( st_fx->localVAD != 0 )
+    IF( st_fx->localVAD != 0 )
     {
         hVAD->prim_act_slow_fx = add( 328, hVAD->prim_act_slow_fx ); /*Q15 */
+        move16();
     }
 
-    tmp = hVAD->prim_act_slow_fx;
+    tmp = hVAD->prim_act_slow_fx; /*Q15*/
     move16();
     if ( LE_16( hVAD->prim_act_quick_fx, hVAD->prim_act_slow_fx ) )
     {
@@ -1838,19 +1828,23 @@ Word16 wb_vad_fx(
         move16();
     }
     /*st->prim_act = 0.1f * tmp + (1.0f-0.1f)* st->prim_act;*/
-    hVAD->prim_act_fx = mac_r( L_mult( 3277, tmp ), 29491, hVAD->prim_act_fx );
-
+    hVAD->prim_act_fx = mac_r( L_mult( 3277, tmp ), 29491, hVAD->prim_act_fx ); /*Q15 */
+    move16();
 
     hVAD->prim_act_quick_he_fx = mult_r( 26214, hVAD->prim_act_quick_he_fx ); /*Q15 */
-    if ( *localVAD_HE_SAD != 0 )
+    move16();
+    IF( *localVAD_HE_SAD != 0 )
     {
         hVAD->prim_act_quick_he_fx = add( 6554, hVAD->prim_act_quick_he_fx ); /*Q15 */
+        move16();
     }
 
     hVAD->prim_act_slow_he_fx = mult_r( 32440, hVAD->prim_act_slow_he_fx ); /*Q15 */
-    if ( *localVAD_HE_SAD != 0 )
+    move16();
+    IF( *localVAD_HE_SAD != 0 )
     {
         hVAD->prim_act_slow_he_fx = add( 328, hVAD->prim_act_slow_he_fx ); /*Q15 */
+        move16();
     }
 
     tmp = hVAD->prim_act_slow_he_fx;
@@ -1861,42 +1855,49 @@ Word16 wb_vad_fx(
         move16();
     }
     hVAD->prim_act_he_fx = mac_r( L_mult( 3277, tmp ), 29491, hVAD->prim_act_he_fx );
+    move16();
 
-
-    if ( L_and( hVAD->vad_flag_reg_H, (Word32) 0x40000L ) != 0 ) /* 0x4000L = 0x01L << 18 */
+    IF( L_and( hVAD->vad_flag_reg_H, (Word32) 0x40000L ) != 0 ) /* 0x4000L = 0x01L << 18 */
     {
         hVAD->vad_flag_cnt_50 = sub( hVAD->vad_flag_cnt_50, 1 );
+        move16();
     }
 
     hVAD->vad_flag_reg_H = L_shl( L_and( hVAD->vad_flag_reg_H, (Word32) 0x3fffffffL ), 1 );
+    move32();
 
-
-    if ( L_and( hVAD->vad_flag_reg_L, (Word32) 0x40000000L ) != 0 )
+    IF( L_and( hVAD->vad_flag_reg_L, (Word32) 0x40000000L ) != 0 )
     {
         hVAD->vad_flag_reg_H = L_or( hVAD->vad_flag_reg_H, 0x01L );
+        move32();
     }
 
     hVAD->vad_flag_reg_L = L_shl( L_and( hVAD->vad_flag_reg_L, (Word32) 0x3fffffffL ), 1 );
-
+    move32();
 
     IF( flag != 0 ) /* should not include the extra DTX hangover */
     {
         hVAD->vad_flag_reg_L = L_or( hVAD->vad_flag_reg_L, 0x01L );
+        move32();
         hVAD->vad_flag_cnt_50 = add( hVAD->vad_flag_cnt_50, 1 );
+        move16();
     }
 
 
-    if ( L_and( hVAD->vad_prim_reg, (Word32) 0x8000L ) != 0 ) /* 0x8000L = 1L << 15 */
+    IF( L_and( hVAD->vad_prim_reg, (Word32) 0x8000L ) != 0 ) /* 0x8000L = 1L << 15 */
     {
         hVAD->vad_prim_cnt_16 = sub( hVAD->vad_prim_cnt_16, 1 );
+        move16();
     }
 
     hVAD->vad_prim_reg = L_shl( L_and( hVAD->vad_prim_reg, (Word32) 0x3fffffffL ), 1 );
-
+    move32();
     IF( st_fx->localVAD != 0 )
     {
         hVAD->vad_prim_reg = L_or( hVAD->vad_prim_reg, 0x01L );
+        move32();
         hVAD->vad_prim_cnt_16 = add( hVAD->vad_prim_cnt_16, 1 );
+        move16();
     }
 
     return flag;
@@ -1904,7 +1905,7 @@ Word16 wb_vad_fx(
 
 Word16 wb_vad_ivas_fx(
     Encoder_State *st_fx,    /* i/o: encoder state structure										*/
-    const Word32 fr_bands[], /* i  : per band i   energy (contains 2 vectors)		q_fr_bands*/
+    const Word32 fr_bands[], /* i  : per band i   energy (contains 2 vectors)		Qx + QSCALE     */
     const Word16 q_fr_bands, /* i  : Q of fr_bands  */
     Word16 *noisy_speech_HO, /* o  : SC-VBR noisy speech HO flag                */
     Word16 *clean_speech_HO, /* o  : SC-VBR clean speech HO flag                */
@@ -1914,13 +1915,13 @@ Word16 wb_vad_ivas_fx(
     Word16 *flag_noisy_speech_snr, /* o  :   */
     VAD_HANDLE hVAD,               /* i/o: VAD data handle         */
     NOISE_EST_HANDLE hNoiseEst,    /* i  : Noise estimation handle        */
-    Word16 lp_speech_fx,           /* i  : long term active speech energy average        */
-    Word16 lp_noise_fx             /* i  : long term noise energy                        */
+    Word16 lp_speech_fx,           /* i  : long term active speech energy average     Q8   */
+    Word16 lp_noise_fx             /* i  : long term noise energy                     Q8   */
 )
 {
     Word16 i, flag = 0, hangover_short;
-
-    Word16 snr_sum, thr1 = 0, thr1_nb_mod, thr2 = 0, nk = 0, nc = 0, th_clean = 0;
+    Word16 snr_sum, thr1 = 0, thr1_nb_mod, thr2 = 0, nk = 0, th_clean = 0;
+    Word32 nc;
     Word16 lp_snr; /* Q8 */
     const Word32 *pt1;
     const Word32 *pt2;
@@ -1929,19 +1930,19 @@ Word16 wb_vad_ivas_fx(
     Word16 min_snr, sign_thr;
 
     Word32 L_snr, L_snr_sum;
-    Word32 ftmp, ftmp1, ftmp2;
-    Word16 m_noise_local, e_noise, e_num, m_num, snr, snr_tmp, shift_snr;
-
+    Word32 ener, fr_enr, ftmp, ftmp1;
+    Word16 m_noise_local, e_noise, e_num, m_num, q_snr_tmp, q_snr;
+    Word32 L_snr_tmp;
     Word16 snr_sumt;
     Word32 L_vad_thr;
     Word16 hangover_hd;
     Word16 snr_idx;
-    Word16 delta1, delta2, delta3, delta4;
+    Word32 delta1, delta2, delta3, delta4;
 
     Word16 flag_he1;
     Word16 stmp;
     Word32 L_msnr, L_mssnr = 0, L_mssnr_hov;
-    Word16 j, tmp, tmp1, tmp2;
+    Word16 j, tmp, tmp2;
     Word32 L_tmp, L_tmp1, L_tmp2;
 
     Word32 L_snr18, L_snr19;   /* Q4 */
@@ -1949,24 +1950,27 @@ Word16 wb_vad_ivas_fx(
     Word16 nb_sig_snr;         /* Q0 */
 
     Word16 nv;
-    Word16 nv_ofs;           /* Q8 */
+    Word32 nv_ofs;           /* Q24 */
     Word32 L_snr_sum_HE_SAD; /* Q4 */
     Word16 snr_sum_HE_SAD;   /*Q8 log */
     Word16 sign_thr_HE_SAD, min_snr_HE_SAD;
-
+    Word32 L_snr_sumt;
 
     Word16 thr1_ol;
     Word32 L_snr_sum_ol;
     Word16 snr_sum_ol; /* Q8 log */
 
-    Word32 L_snr_outlier;
+    Word32 L_snr_outlier, L_snr_outlier_Q4;
     Word16 snr_outlier_index;
     Word32 L_accum_ener_L;
     Word32 L_accum_ener_H;
     Word16 vad_bwidth_fx;
     Word16 last_7k2_coder_type;
+    Word16 q_shift, q_ener, q_diff1, q_diff2;
+    Word16 q_L_snr_sum_ol, e_snr, f_snr;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     Word16 L_msnr_e = 0, L_mssnr_e = 0, L_mssnr_hov_e = 0, L_msnr18_e = 0, L_msnr19_e = 0;
     move16(); /*L_msnr_e*/
@@ -1974,12 +1978,11 @@ Word16 wb_vad_ivas_fx(
     move16(); /*L_mssnr_hov_e*/
     move16(); /*L_msnr18_e*/
     move16(); /*L_msnr19_e*/
-    move16(); /*Overflow*/
     move32(); /*L_mssnr*/
     move16(); /*thr1*/
     move16(); /*thr2*/
     move16(); /*nk*/
-    move16(); /*nc*/
+    move32(); /*nc*/
     move16(); /*th_clean*/
     move16(); /*flag*/
 
@@ -1994,13 +1997,13 @@ Word16 wb_vad_ivas_fx(
     }
     if ( LT_16( lp_speech_fx, -100 * 256 ) )
     {
-        lp_speech_fx = st_fx->lp_speech_fx;
+        lp_speech_fx = st_fx->lp_speech_fx; /*Q8*/
         move16();
     }
 
     if ( LT_16( lp_noise_fx, -100 * 256 ) )
     {
-        lp_noise_fx = st_fx->lp_noise_fx;
+        lp_noise_fx = st_fx->lp_noise_fx; /*Q8*/
         move16();
     }
 
@@ -2052,12 +2055,12 @@ Word16 wb_vad_ivas_fx(
     {
         nk = 3277;
         move16(); /*0.1 Q15 */
-        nc = 4122;
-        move16(); /*16.1  Q8 */
-        nv = 525;
-        move16(); /* 2.05 Q8*/
-        nv_ofs = 422;
-        move16(); /* 1.65 Q8*/
+        nc = 270113178;
+        move32(); /*16.1  Q24 */
+        nv = 8397;
+        move16(); /* 2.05 Q12*/
+        nv_ofs = 27682406;
+        move32(); /* 1.65 Q24*/
         th_clean = TH16_2_FX;
         move16(); /* 35 Q8 */
         sign_thr = 21;
@@ -2083,15 +2086,15 @@ Word16 wb_vad_ivas_fx(
     }
     ELSE /* NB input */
     {
-        move16();
+        // move16();
         nk = 3277;
         move16(); /*  0.1 Q15 */
-        nc = 4096;
-        move16(); /*  16.0  Q8 */
-        nv = 1024;
-        move16(); /*  4.0  Q8 */
-        nv_ofs = 294;
-        move16(); /*1.15 Q8*/
+        nc = 268435456;
+        move32(); /*  16.0  Q24 */
+        nv = 16384;
+        move16(); /*  4.0  Q12 */
+        nv_ofs = 19293798;
+        move32(); /*1.15 Q24*/
         th_clean = TH8_1_FX;
         move16(); /*20 Q8 */
         sign_thr = 28;
@@ -2140,15 +2143,15 @@ Word16 wb_vad_ivas_fx(
     IF( snr_idx == 0 )
     {
         stmp = 6;
-        move16();
+        move32();
         delta1 = 0;
-        move16(); /*0.0f in Q13 */
+        move32(); /*0.0f in Q16 */
         delta2 = 0;
-        move16(); /*0.0f in Q13 */
+        move32(); /*0.0f in Q16 */
         delta3 = 0;
-        move16(); /*0.0f in Q13 */
+        move32(); /*0.0f in Q16 */
         delta4 = 0;
-        move16();
+        move32(); /*0.0f in Q16 */
 
 
         /*vad_thr = 2.4f*lp_snr - 42.2f;
@@ -2162,15 +2165,15 @@ Word16 wb_vad_ivas_fx(
     ELSE IF( EQ_16( snr_idx, 1 ) )
     {
         stmp = 6;
-        move16();
-        delta1 = 819;
-        move16(); /*0.1f in Q13 */
-        delta2 = 1638;
-        move16(); /*0.2f in Q13 */
-        delta3 = 1638;
-        move16(); /*0.2f in Q13 */
-        delta4 = 1638;
-        move16(); /*0.2f in Q13 */
+        move32();
+        delta1 = 6554;
+        move32(); /*0.1f in Q16 */
+        delta2 = 13107;
+        move32(); /*0.2f in Q16 */
+        delta3 = 13107;
+        move32(); /*0.2f in Q16 */
+        delta4 = 13107;
+        move32(); /*0.2f in Q16 */
 
         /*   vad_thr = 2.4f*lp_snr - 40.2f;
              vad_thr = min(vad_thr, 80);
@@ -2183,15 +2186,15 @@ Word16 wb_vad_ivas_fx(
     ELSE
     {
         stmp = 9;
-        move16();
-        delta1 = 1638;
-        move16(); /*0.2f in Q13 */
-        delta2 = 3277;
-        move16(); /*0.4f in Q13 */
-        delta3 = 2458;
-        move16(); /*0.3f in Q13 */
-        delta4 = 3277;
-        move16(); /*0.4f in Q13 */
+        move32();
+        delta1 = 13107;
+        move32(); /*0.2f in Q16 */
+        delta2 = 26214;
+        move32(); /*0.4f in Q16 */
+        delta3 = 19661;
+        move32(); /*0.3f in Q16 */
+        delta4 = 26214;
+        move32(); /*0.4f in Q16 */
         /* vad_thr = 2.5f*lp_snr - 10.0f;
            vad_thr = max(vad_thr, 1);
         */
@@ -2204,12 +2207,12 @@ Word16 wb_vad_ivas_fx(
     nb_sig_snr = 20;
     move16();
 
-    pt1 = fr_bands;
-    pt2 = fr_bands + NB_BANDS;
-    pt3 = hNoiseEst->bckr_fx;
-
     L_snr_sum = L_deposit_l( 0 );
     L_snr_sum_HE_SAD = L_deposit_l( 0 );
+    Word16 q_snr_sum = 0;
+    Word16 q_snr_sum_HE_SAD = 0;
+    move16();
+    move16();
     snr_sumt = 0;
     move16();
     L_mssnr_hov = L_deposit_l( 0 );
@@ -2218,148 +2221,131 @@ Word16 wb_vad_ivas_fx(
     snr_sum_HE_SAD = 0;
     move16();
 
+    L_snr_sumt = 0;
+    move32();
+    q_snr = 0;
+    move16();
+    move16();
+
+    pt1 = fr_bands;
+    pt2 = fr_bands + NB_BANDS;
+    pt3 = hNoiseEst->bckr_fx;
+
+    q_ener = s_min( q_fr_bands, hNoiseEst->q_enrO );
+    q_diff1 = sub( q_ener, hNoiseEst->q_enrO );
+    q_diff2 = sub( q_ener, q_fr_bands );
+    q_shift = add( Q31 + Q1, sub( q_ener, hNoiseEst->q_bckr ) );
 
     FOR( i = st_fx->min_band; i <= st_fx->max_band; i++ )
     {
-        ftmp = L_add( *pt1++, 0 );
-        ftmp1 = L_add( *pt2++, 0 );
-        ftmp2 = L_add( *pt3++, 0 );
+        ener = L_shl( hNoiseEst->enrO_fx[i], q_diff1 ); // q_ener
+        ftmp = L_shl( *pt1++, q_diff2 );                // q_ener
+        ftmp1 = L_shl( *pt2++, q_diff2 );               // q_ener
 
         /*fr_enr = ( 0.2f * st->enrO[i] + 0.4f * ftmp + 0.4f * ftmp1 );*/
-        L_tmp = Mult_32_16( hNoiseEst->enrO_fx[i], 13107 ); /* L_tmp(high word)  =   Qenr0fx*Q16+1  -16  -> Qener0+1 */
-        L_tmp1 = Madd_32_16( L_tmp, ftmp, 26214 );          /* 26214 = .4 in Q16 */
-        L_tmp1 = Madd_32_16( L_tmp1, ftmp1, 26214 );        /* L_tmp1 re_used a bit later for  final snr[i]*/
-
-        L_tmp2 = Madd_32_16( L_tmp, ftmp, 19661 );    /* 19661 =   0.3 in Q16 */
-        L_tmp2 = Msub_32_16( L_tmp2, ftmp1, -32768 ); /* -32768=  -0.5 in Q16 */
+        L_tmp = Mpy_32_16_1( ener, 13107 /* 0.2 in Q16 */ );                                                     // q_ener+1
+        fr_enr = Madd_32_16( Madd_32_16( L_tmp, ftmp, 26214 /* 0.4 in Q16 */ ), ftmp1, 26214 /* 0.4 in Q16 */ ); // q_ener+1
 
         IF( GT_32( ftmp, ftmp1 ) )
         {
-            /*snr[i] = ( 0.2f * st->enrO[i] + 0.4f * ftmp + 0.4f * ftmp1 ) / ftmp2 ;*/
-            /*snr[i] = L_tmp1/(ftmp2) */
-            IF( ftmp2 != 0 )
+            /* snr[i] = ( 0.2f * hNoiseEst->enrO[i] + 0.4f * ftmp + 0.4f * ftmp1 ) / *pt3++; */
+            IF( *pt3 != 0 )
             {
-                e_num = norm_l( L_tmp1 );
-                m_num = extract_h( L_shl( L_tmp1, e_num ) );
+                /* Since fr_enr = 0.2f * hNoiseEst->enrO[i] + 0.4f * ftmp + 0.4f * ftmp1 */
+                e_num = sub( norm_l( fr_enr ), 1 );
+                m_num = extract_h( L_shl( fr_enr, e_num ) ); // q_ener+1+e_num-16
 
-                e_noise = norm_l( ftmp2 );
-                m_noise_local = extract_h( L_shl( ftmp2, e_noise ) );
-
-                m_num = shr( m_num, 1 );
-                shift_snr = add( sub( e_num, e_noise ), 15 - 4 );
+                e_noise = norm_l( *pt3 );
+                m_noise_local = extract_h( L_shl( *pt3++, e_noise ) ); // hNoiseEst->q_bckr+e_noise-16
 
-                snr_tmp = div_s( m_num, m_noise_local );
-#ifdef BASOP_NOGLOB
-                L_snr = L_shr_o( snr_tmp, shift_snr, &Overflow ); /* L_snr in Q4 */
-#else                                                             /* BASOP_NOGLOB */
-                L_snr = L_shr( snr_tmp, shift_snr );                                    /* L_snr in Q4 */
-#endif                                                            /* BASOP_NOGLOB */
+                L_snr = L_deposit_h( div_s( m_num, m_noise_local ) ); // 31+(q_ener+1+e_num-16)-(hNoiseEst->q_bckr+e_noise-16)
+                q_snr_tmp = add( q_shift, sub( e_num, e_noise ) );
             }
             ELSE
             {
-                L_snr = L_shr_o( L_tmp1, sub( Q3, q_fr_bands ), &Overflow ); // q_fr_bands+1 -> Q4
+                L_snr = Mpy_32_16_1( fr_enr, 18286 /* (1/E_MIN) in Q6 */ ); // q_ener+1+6-15
+                q_snr_tmp = sub( q_ener, 8 );
             }
         }
         ELSE
         {
-            /*snr[i] = ( 0.2f * st->enrO[i] + 0.3f * ftmp + 0.5f * ftmp1 ) /  ftmp2 ;*/
-            /*snr[i] =L_tmp2/( ftmp2 ) */
-            IF( ftmp2 != 0 )
-            {
-                e_num = norm_l( L_tmp2 );
-                m_num = extract_h( L_shl( L_tmp2, e_num ) );
+            /* snr[i] = ( 0.2f * hNoiseEst->enrO[i] + 0.3f * ftmp + 0.5f * ftmp1 ) / *pt3++; */
+            /* Since, L_tmp = 0.2f * hNoiseEst->enrO[i] */
+            L_tmp = Msub_32_16( Madd_32_16( L_tmp, ftmp, 19661 /* 0.3 in Q16 */ ), ftmp1, -32768 /* -0.5 in Q16 */ ); // q_ener+1
 
-                e_noise = norm_l( ftmp2 );
-                m_noise_local = extract_h( L_shl( ftmp2, e_noise ) );
+            IF( *pt3 != 0 )
+            {
+                e_num = sub( norm_l( L_tmp ), 1 );
+                m_num = extract_h( L_shl( L_tmp, e_num ) ); // q_ener+1+e_num-16
 
-                m_num = shr( m_num, 1 );
-                shift_snr = add( sub( e_num, e_noise ), 15 - 4 );
+                e_noise = norm_l( *pt3 );
+                m_noise_local = extract_h( L_shl( *pt3++, e_noise ) ); // hNoiseEst->q_bckr+e_noise-16
 
-                snr_tmp = div_s( m_num, m_noise_local );
-#ifdef BASOP_NOGLOB
-                L_snr = L_shr_o( snr_tmp, shift_snr, &Overflow ); /* L_snr in Q4 */
-#else                                                             /* BASOP_NOGLOB */
-                L_snr = L_shr( snr_tmp, shift_snr );                                    /* L_snr in Q4 */
-#endif                                                            /* BASOP_NOGLOB */
+                L_snr = L_deposit_h( div_s( m_num, m_noise_local ) ); // 31+(q_ener+1+e_num-16)-(hNoiseEst->q_bckr+e_noise-16)
+                q_snr_tmp = add( q_shift, sub( e_num, e_noise ) );
             }
             ELSE
             {
-                L_snr = L_shr_o( L_tmp2, sub( Q3, q_fr_bands ), &Overflow ); // q_fr_bands+1 -> Q4
+                L_snr = Mpy_32_16_1( L_tmp, 18286 /* (1/E_MIN) in Q6 */ ); // q_ener+1+6-15
+                q_snr_tmp = sub( q_ener, 8 );
             }
         }
 
-        IF( LT_32( L_snr, 2 * ( 1 << 4 ) ) )
+        if ( LT_32( L_snr, L_shl_sat( 2, q_snr_tmp ) ) )
         {
             nb_sig_snr = sub( nb_sig_snr, 1 ); /* nb_sig_snr--; */
         }
-        L_snr = L_max( L_snr, 1 * ( 1 << 4 ) ); /* if ( snr[i] < 1 ){snr[i] = 1;}*/
-
+        IF( LT_32( L_snr, L_shl_sat( 1, q_snr_tmp ) ) )
+        {
+            L_snr = ONE_IN_Q30;
+            q_snr_tmp = Q30;
+            move32();
+            move16();
+        }
 
         /* snr[i] = (float)log10(snr[i]);  */
-        snr = vad_snr_log_fx( L_snr, ONE_LG10 );
+        Word16 exp = norm_l( L_snr );
+        Word16 val = Log2_norm_lc( L_shl( L_snr, exp ) );
+        exp = sub( sub( 30, exp ), q_snr_tmp );
+        L_snr = L_mac( val, exp, ONE_IN_Q14 );                 // Q15
+        L_snr = Mpy_32_16_1( L_snr, 19728 /* log2 in Q16 */ ); // Q16
 
         /* snr_sumt += snr[i];*/
-        snr_sumt = add( snr_sumt, shr( snr, 4 ) ); /*Q4 */
-
+        L_snr_sumt = L_add( L_snr_sumt, L_snr ); // Q16
 
-#ifdef BASOP_NOGLOB
-        tmp = shl_o( snr, 5, &Overflow ); /* Q8 -> Q13 */
-#else                                     /* BASOP_NOGLOB */
-        tmp = shl( snr, 5 );                                                            /* Q8 -> Q13 */
-#endif                                    /* BASOP_NOGLOB */
         IF( LT_16( i, 2 ) )
         {
-#ifdef BASOP_NOGLOB
-            tmp = add_o( tmp, delta1, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta1 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
+            ftmp = L_add( L_snr, delta1 ); // Q16
         }
         ELSE IF( LT_16( i, 7 ) )
         {
-#ifdef BASOP_NOGLOB
-            tmp = add_o( tmp, delta2, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta2 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
+            ftmp = L_add( L_snr, delta2 ); // Q16
         }
         ELSE IF( LT_16( i, 18 ) )
         {
-#ifdef BASOP_NOGLOB
-            tmp = add_o( tmp, delta3, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta3 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
+            ftmp = L_add( L_snr, delta3 ); // Q16
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
-            tmp = add_o( tmp, delta4, &Overflow ); /*Q13 */
-#else                                              /* BASOP_NOGLOB */
-            tmp = add( tmp, delta4 );                                                   /*Q13 */
-#endif                                             /* BASOP_NOGLOB */
+            ftmp = L_add( L_snr, delta4 ); // Q16
         }
 
-        tmp1 = tmp;
-        move16(); /* ftmp1 = ftmp; */
-        sub( 0, 0 );
-        IF( i < 7 )
+        ftmp1 = ftmp; // Q16
+        move32();
+
+        if ( LT_16( i, 7 ) )
         {
-#ifdef BASOP_NOGLOB
-            tmp1 = add_o( tmp, 3277, &Overflow ); /*.4 in Q13  ftmp1 = ftmp + 0.4f; */
-#else                                             /* BASOP_NOGLOB */
-            tmp1 = add( tmp, 3277 );                                                    /*.4 in Q13  ftmp1 = ftmp + 0.4f; */
-#endif                                            /* BASOP_NOGLOB */
+            ftmp1 = L_add( ftmp, 26214 /*0.4 in Q16*/ ); // Q16
         }
 
-        tmp = s_min( tmp, 16384 );   /* Q13, ftmp = min(ftmp, 2.0f); */
-        tmp1 = s_min( tmp1, 16384 ); /* Q13, ftmp1 = min(ftmp1, 2.0f); */
+        ftmp = L_min( ftmp, 2 << 16 );   // Q16
+        ftmp1 = L_min( ftmp1, 2 << 16 ); // Q16
 
-        Word16 norm_tmp = norm_l( tmp );
-        Word32 scaled_tmp = L_shl( tmp, norm_tmp ); /*13+norm_tmp*/
+        Word16 norm_tmp = norm_l( ftmp );
+        Word32 scaled_tmp = L_shl( ftmp, norm_tmp ); /*16+norm_tmp*/
         L_msnr = scaled_tmp;
         move32();
-        L_msnr_e = sub( 18, norm_tmp );
+        L_msnr_e = sub( 15, norm_tmp );
         FOR( j = 1; j < stmp; j++ )
         {
             /* Q13*Q13 +1   -16   +2 = Q13 */
@@ -2382,8 +2368,8 @@ Word16 wb_vad_ivas_fx(
             move16();
         }
 
-        norm_tmp = norm_l( tmp1 );
-        scaled_tmp = L_shl( tmp1, norm_tmp ); /*13+norm_tmp*/
+        norm_tmp = norm_l( ftmp1 );
+        scaled_tmp = L_shl( ftmp1, norm_tmp ); /*13+norm_tmp*/
         L_msnr = scaled_tmp;
         move32();
         L_msnr_e = sub( 18, norm_tmp );
@@ -2395,74 +2381,82 @@ Word16 wb_vad_ivas_fx(
         L_mssnr_hov = BASOP_Util_Add_Mant32Exp( L_mssnr_hov, L_mssnr_hov_e, L_msnr, L_msnr_e, &L_mssnr_hov_e ); /*L_mssnr_hov_e mssnr_hov += msnr; */
 
         /* recompute after he1 modifications */
-        /* snr[i] = fr_enr / st->bckr[i]  =  L_tmp1/st->bckr[i];*/
+        /* snr[i] = fr_enr / st->bckr[i] ;*/
         IF( hNoiseEst->bckr_fx[i] != 0 )
         {
-            e_num = norm_l( L_tmp1 );
-            m_num = extract_h( L_shl( L_tmp1, e_num ) );
+            e_num = sub( norm_l( fr_enr ), 1 );
+            m_num = extract_h( L_shl( fr_enr, e_num ) ); // q_ener+1+e_num-16
 
             e_noise = norm_l( hNoiseEst->bckr_fx[i] );
-            m_noise_local = extract_h( L_shl( hNoiseEst->bckr_fx[i], e_noise ) );
-
-            m_num = shr( m_num, 1 );
-            shift_snr = add( sub( e_num, e_noise ), 15 - 4 );
+            m_noise_local = extract_h( L_shl( hNoiseEst->bckr_fx[i], e_noise ) ); // hNoiseEst->q_bckr+e_noise-16
 
-            snr_tmp = div_s( m_num, m_noise_local );
-#ifdef BASOP_NOGLOB
-            L_snr = L_shr_o( snr_tmp, shift_snr, &Overflow ); /* L_snr in Q4 */
-#else                                                         /* BASOP_NOGLOB */
-            L_snr = L_shr( snr_tmp, shift_snr );                                        /* L_snr in Q4 */
-#endif                                                        /* BASOP_NOGLOB */
+            L_snr_tmp = L_deposit_h( div_s( m_num, m_noise_local ) ); // 31+q_ener+1+e_num-hNoiseEst->q_bckr-e_noise
+            q_snr_tmp = add( 32, sub( add( q_ener, e_num ), add( hNoiseEst->q_bckr, e_noise ) ) );
         }
         ELSE
         {
-            L_snr = L_shr_o( L_tmp1, sub( Q3, q_fr_bands ), &Overflow ); // q_fr_bands+1 -> Q4
+            L_snr_tmp = Mpy_32_16_1( fr_enr, 18286 /* 1/E_MIN in Q6 */ ); // q_ener+1+6-15
+            q_snr_tmp = sub( q_ener, 8 );
         }
 
-
         /* conditional snrsum, snr_sum = snr_sum + snr[i];*/
-        sign_thr_snr_acc_fx( &L_snr_sum_HE_SAD, L_snr, sign_thr_HE_SAD, min_snr_HE_SAD );
-        sign_thr_snr_acc_fx( &L_snr_sum, L_snr, sign_thr, min_snr );
+        IF( GT_16( q_snr_tmp, 28 ) ) // added to avoid overflow while scaling sign_thr_HE_SAD,min_snr_HE_SAD,sign_thr and min_snr while scaling to q_snr_tmp
+        {
+            L_snr_tmp = L_shl( L_snr_tmp, sub( 28, q_snr_tmp ) );
+            q_snr_tmp = 28;
+            move16();
+        }
+        exp = sub( Q4, q_snr_tmp );
+        L_snr = L_shl_sat( L_snr_tmp, exp ); // Q4
+        sign_thr_snr_acc_ivas_fx( &L_snr_sum_HE_SAD, &q_snr_sum_HE_SAD, L_snr_tmp, q_snr_tmp, L_shl( sign_thr_HE_SAD, sub( q_snr_tmp, 4 ) ), L_shl( min_snr_HE_SAD, sub( q_snr_tmp, 4 ) ) );
+        sign_thr_snr_acc_ivas_fx( &L_snr_sum, &q_snr_sum, L_snr_tmp, q_snr_tmp, L_shl( sign_thr, sub( q_snr_tmp, 4 ) ), L_shl( min_snr, sub( q_snr_tmp, 4 ) ) );
 
-        L_snr = L_max( L_snr, 16 ); /*Q4,  if( snr[i] < 1.0f ) { snr[i] = 1.0f;} */
+        /* if( snr[i] < 1.0f ) { snr[i] = 1.0f;} */
+        IF( LT_32( L_snr, 16 /* 1.0 in Q4 */ ) )
+        {
+            L_snr_tmp = 16;
+            q_snr_tmp = Q4;
+            move32();
+            move16();
+            exp = 0;
+            move16();
+        }
 
         /* float saves all snrs in an snr[] vector ,
            in fix we only save two bands          */
-        IF( EQ_16( i, 18 ) )
+        if ( EQ_16( i, 18 ) )
         {
-            L_snr18 = L_add( L_snr, 0 ); /*Q4   */
+            L_snr18 = L_shl_sat( L_snr_tmp, exp ); /*Q4   */
         }
-        IF( EQ_16( i, 19 ) )
+        if ( EQ_16( i, 19 ) )
         {
-            L_snr19 = L_add( L_snr, 0 ); /* Q4  */
+            L_snr19 = L_shl_sat( L_snr_tmp, exp ); /* Q4  */
         }
 
         /* accumulate background noise energy in bands [0-2]  and in bands [3-19]*/
         IF( LT_16( i, 3 ) )
         {
-#ifdef BASOP_NOGLOB
             L_accum_ener_L = L_add_o( L_accum_ener_L, hNoiseEst->bckr_fx[i], &Overflow ); /* hNoiseEst->q_bckr */
-#else
-            L_accum_ener_L = L_add( L_accum_ener_L, hNoiseEst->bckr_fx[i] );            /*hNoiseEst->q_bckr */
-#endif
         }
         ELSE
         {
-#ifdef BASOP_NOGLOB
             L_accum_ener_H = L_add_o( L_accum_ener_H, hNoiseEst->bckr_fx[i], &Overflow ); /*hNoiseEst->q_bckr */
-#else
-            L_accum_ener_H = L_add( L_accum_ener_H, hNoiseEst->bckr_fx[i] );            /*hNoiseEst->q_bckr */
-#endif
         }
 
         /* Identify the outlier band */
-        IF( GT_32( L_snr, L_snr_outlier ) )
+        IF( GT_32( L_snr_tmp, L_shl_sat( L_snr_outlier, sub( q_snr_tmp, q_snr ) ) ) )
         {
-            L_snr_outlier = L_add( L_snr, 0 ); /*Q4*/
+            L_snr_outlier = L_snr_tmp;
+            q_snr = q_snr_tmp;
             snr_outlier_index = i;
+            move32();
+            move16();
             move16();
         }
-    } /* end of band loop */
+    }                                                                                      /* end of band loop */
+    L_snr_sum_HE_SAD = L_shl_o( L_snr_sum_HE_SAD, sub( 4, q_snr_sum_HE_SAD ), &Overflow ); // q_snr_sum_HE_SAD->q4
+
+    snr_sumt = extract_h( L_shl( L_snr_sumt, Q4 ) ); // Q16 -> Q4
 
     test();
     test();
@@ -2494,54 +2488,66 @@ Word16 wb_vad_ivas_fx(
         }
     }
 
+    L_snr_outlier_Q4 = L_shl_sat( L_snr_outlier, sub( Q4, q_snr ) ); // Q4
 
     /* Separated  SNR_SUM outlier modification  */
-    L_snr_sum_ol = L_snr_sum; /* snr_sum_ol = snr_sum;  */
+    /* snr_sum_ol = snr_sum;  */
+    L_snr_sum_ol = L_snr_sum; // q_snr_sum
+    q_L_snr_sum_ol = q_snr_sum;
     move32();
+    move16();
 
     test();
     test();
     test();
-    IF( ( EQ_16( st_fx->max_band, 19 ) ) && LT_32( L_snr_outlier, MAX_SNR_OUTLIER_3_FX ) && GT_16( snr_outlier_index, 3 ) && LT_16( snr_outlier_index, MAX_SNR_OUTLIER_IND_FX ) )
+    IF( ( EQ_16( st_fx->max_band, 19 ) ) && LT_32( L_snr_outlier_Q4, MAX_SNR_OUTLIER_3_FX ) && GT_16( snr_outlier_index, 3 ) && LT_16( snr_outlier_index, MAX_SNR_OUTLIER_IND_FX ) )
     {
+        q_L_snr_sum_ol = s_min( add( norm_l( L_snr_sum_ol ), q_snr_sum ), add( norm_l( L_snr_outlier ), q_snr ) );
+        L_tmp1 = L_shl( L_snr_sum_ol, sub( q_L_snr_sum_ol, q_snr_sum ) ); // q_L_snr_sum_ol
+        L_tmp2 = L_shl( L_snr_outlier, sub( q_L_snr_sum_ol, q_snr ) );    // q_L_snr_sum_ol
 
         test();
         test();
         IF( LT_32( L_accum_ener_H, Mult_32_16( L_accum_ener_L, INV_OUTLIER_THR_1_FX ) ) /* float::  (accum_ener_L*INV_OUTLIER_THR_1 > accum_ener_H  )  !!!  */
-            || LT_32( L_snr_outlier, MAX_SNR_OUTLIER_1_FX ) )
+            || LT_32( L_snr_outlier_Q4, MAX_SNR_OUTLIER_1_FX ) )
 
         {
-            /* as weight1 is 1.0  we do not need to multiply here ,  i.e. no need to loose any precisison */
-            L_snr_sum_ol = L_sub( L_snr_sum_ol, L_snr_outlier ); /*Q4 */
+            /* snr_sum_ol = SNR_OUTLIER_WGHT_1 * ( snr_sum_ol - snr_outlier );
+              As SNR_OUTLIER_WGHT_1 is 1.0f  we do not need to multiply here ,  i.e. no need to loose any precisison */
+            L_snr_sum_ol = L_sub( L_tmp1, L_tmp2 ); // q_L_snr_sum_ol
         }
         ELSE IF( LT_32( L_accum_ener_H, Mult_32_16( L_accum_ener_L, INV_OUTLIER_THR_2_FX ) ) /* float:: (accum_ener_L *INV_OUTLIER_THR_2 >  accum_ener_H ) !!! */
-                 || LT_32( L_snr_outlier, MAX_SNR_OUTLIER_2_FX ) )
+                 || LT_32( L_snr_outlier_Q4, MAX_SNR_OUTLIER_2_FX ) )
         {
-            /* L_snr_sum = SNR_OUTLIER_WGHT_2 * (snr_sum - snr_outlier); */
-
-            /*            1.01*x    ->   (1*x + 0.01*x)    to not drop down to Q3 */
-            L_tmp = L_sub( L_snr_sum_ol, L_snr_outlier );
-            L_tmp2 = Mult_32_16( L_tmp, 20972 );               /* 0.01(in Q21)= 20972   Q4*Q21+1-16  ->  Q10 */
-            L_snr_sum_ol = L_add( L_tmp, L_shr( L_tmp2, 6 ) ); /* Q4 */
+            /* snr_sum_ol = SNR_OUTLIER_WGHT_2 * (snr_sum_ol - snr_outlier); */
+            L_snr_sum_ol = Mpy_32_32( 1084479242 /* 1.01f in Q30 */, L_sub( L_tmp1, L_tmp2 ) ); // q_L_snr_sum_ol+30-31
+            q_L_snr_sum_ol = sub( q_L_snr_sum_ol, 1 );
         }
         ELSE
         {
-            /* L_snr_sum = SNR_OUTLIER_WGHT_3 * (snr_sum - snr_outlier);*/
-            /* 1.02*x    ->   (1*x + 0.02*x)   to not drop down to Q3 */
-            L_tmp = L_sub( L_snr_sum_ol, L_snr_outlier );
-            L_tmp2 = Mult_32_16( L_tmp, 20972 );               /* 0.02(in Q20)= 20972   Q4*Q20+1-16  ->  Q9 */
-            L_snr_sum_ol = L_add( L_tmp, L_shr( L_tmp2, 5 ) ); /* Q4 */
+            /* snr_sum_ol = SNR_OUTLIER_WGHT_2 * (snr_sum_ol - snr_outlier); */
+            L_snr_sum_ol = Mpy_32_32( 1095216660 /* 1.02f in Q30 */, L_sub( L_tmp1, L_tmp2 ) ); // q_L_snr_sum_ol+30-31
+            q_L_snr_sum_ol = sub( q_L_snr_sum_ol, 1 );
         }
     }
     /*st_fx->snr_sum_vad_fx = 0.5f * st->snr_sum_vad + 0.5f * snr_sum_ol;*/
-#ifdef BASOP_NOGLOB
-    hVAD->L_snr_sum_vad_fx = L_shr( L_add_o( hVAD->L_snr_sum_vad_fx, L_snr_sum_ol, &Overflow ), 1 ); /*Q4*/
-#else                                                                                                /* BASOP_NOGLOB */
-    hVAD->L_snr_sum_vad_fx = L_shr( L_add( hVAD->L_snr_sum_vad_fx, L_snr_sum_ol ), 1 ); /*Q4*/
-#endif                                                                                               /* BASOP_NOGLOB */
+    q_snr_tmp = s_min( add( hVAD->q_L_snr_sum_vad, norm_l( hVAD->L_snr_sum_vad_fx ) ), add( norm_l( L_snr_sum_ol ), q_L_snr_sum_ol ) );
+    /* 0.5f * st->snr_sum_vad */
+    L_tmp1 = L_shl( hVAD->L_snr_sum_vad_fx, sub( sub( q_snr_tmp, 1 ), hVAD->q_L_snr_sum_vad ) ); // q_snr_tmp
+    /* 0.5f * snr_sum_ol */
+    L_tmp2 = L_shl( L_snr_sum_ol, sub( sub( q_snr_tmp, 1 ), q_L_snr_sum_ol ) ); // q_snr_tmp
+    hVAD->L_snr_sum_vad_fx = L_add( L_tmp1, L_tmp2 );                           // q_snr_tmp
+    hVAD->q_L_snr_sum_vad = q_snr_tmp;
+    move32();
+    move16();
 
     /*   snr_sum_ol = 10.0f * (float)log10( snr_sum_ol );   */
-    snr_sum_ol = vad_snr_log_fx( L_snr_sum_ol, LG10 );
+    e_snr = norm_l( L_snr_sum_ol );
+    f_snr = Log2_norm_lc( L_shl( L_snr_sum_ol, e_snr ) ); // Q15
+    e_snr = sub( sub( 30, e_snr ), q_L_snr_sum_ol );
+    L_tmp = L_mac( f_snr, e_snr, ONE_IN_Q14 );                         // Q15
+    L_snr_sum_ol = Mpy_32_16_1( L_tmp, 24660 /* 10*log(2) in Q13 */ ); // Q13
+    snr_sum_ol = extract_h( L_shl( L_snr_sum_ol, Q24 - Q13 ) );        // Q8
     snr_sum = snr_sum_ol;
     move16(); /* note for NB no  outlier modification */
 
@@ -2570,12 +2576,12 @@ Word16 wb_vad_ivas_fx(
 
     /*thr1 = nk * lp_snr + nc*1.0 +  nv * ( st->Etot_v_h2 - nv_ofs); */ /* Linear function for noisy speech */
 
-    L_tmp = L_shl( L_mult( sub( hNoiseEst->Etot_v_h2_fx, nv_ofs ), nv ), 7 ); /*   Q8+Q8+1 +7 --> Q24  */
-    L_tmp = L_mac( L_tmp, nc, (Word16) 32767 );                               /*  Q8+Q15+1      =  Q24              */
-    thr1 = mac_r( L_tmp, lp_snr, nk );                                        /*  Q8+Q15+1             - 16 --> Q8  */
+    L_tmp = L_shl( Mpy_32_16_1( L_sub( hNoiseEst->Etot_v_h2_32fx, nv_ofs ), nv ), 3 ); // Q24 (24+12-15+3)
+    L_tmp = L_add( L_tmp, nc );                                                        // Q24
+    thr1 = mac_r( L_tmp, lp_snr, nk );                                                 // Q24
 
     test();
-    IF( st_fx->element_mode > EVS_MONO && hNoiseEst->first_noise_updt_cnt < 100 )
+    IF( st_fx->element_mode > EVS_MONO && LT_16( hNoiseEst->first_noise_updt_cnt, 100 ) )
     {
         /* lower threshold during warmup time */
         thr1 = sub( thr1, 2560 );
@@ -2609,7 +2615,7 @@ Word16 wb_vad_ivas_fx(
      * Hangover control & final VAD decision
      *---------------------------------------------------------------------*/
 
-    IF( NE_16( vad_bwidth_fx, NB ) )
+    IF( vad_bwidth_fx != NB )
     {
 
         /* Outlier Detection first calculates thr1_ol and snr_sum_ol instead of
@@ -2639,37 +2645,38 @@ Word16 wb_vad_ivas_fx(
             test();
             IF( ( LE_16( snr_outlier_index, 4 ) && ( st_fx->last_coder_type > UNVOICED ) && !st_fx->Opt_SC_VBR ) ||
                 ( LE_16( snr_outlier_index, 4 ) && ( last_7k2_coder_type > UNVOICED ) && st_fx->Opt_SC_VBR ) )
-
-
             {
-                thr1_ol = sub( thr1_ol, (Word16) ( 1 << 8 ) ); /*thr1_ol = thr1 - 1.0f ; */
+                /*thr1_ol = thr1 - 1.0f ; */
+                thr1_ol = sub( thr1, ONE_IN_Q8 ); // Q8
+
                 /*snr_sum_ol = 10.0f * (float)log10( hVAD->L_snr_sum_vad_fx );*/
-                snr_sum_ol = vad_snr_log_fx( hVAD->L_snr_sum_vad_fx, LG10 ); /* snr in Q8 */
+                e_snr = norm_l( hVAD->L_snr_sum_vad_fx );
+                f_snr = Log2_norm_lc( L_shl( hVAD->L_snr_sum_vad_fx, e_snr ) ); // Q15
+                e_snr = sub( sub( 30, e_snr ), hVAD->q_L_snr_sum_vad );
+                L_tmp = L_mac( f_snr, e_snr, ONE_IN_Q14 );                         // Q15
+                L_snr_sum_ol = Mpy_32_16_1( L_tmp, 24660 /* 10*log(2) in Q13 */ ); // Q13
+                snr_sum_ol = round_fx( L_shl( L_snr_sum_ol, Q24 - Q13 ) );         // Q8
             }
-            ELSE IF( ( ( LE_16( st_fx->last_coder_type, UNVOICED ) ) && ( LT_32( L_snr_outlier, MAX_SNR_OUTLIER_2_FX ) ) && ( st_fx->Opt_SC_VBR == 0 ) ) ||
-                     ( ( LE_16( last_7k2_coder_type, UNVOICED ) ) && ( LT_32( L_snr_outlier, MAX_SNR_OUTLIER_2_FX ) ) && ( st_fx->Opt_SC_VBR != 0 ) ) )
-
+            ELSE IF( ( ( LE_16( st_fx->last_coder_type, UNVOICED ) ) && ( LT_32( L_snr_outlier_Q4, MAX_SNR_OUTLIER_2_FX ) ) && ( st_fx->Opt_SC_VBR == 0 ) ) ||
+                     ( ( LE_16( last_7k2_coder_type, UNVOICED ) ) && ( LT_32( L_snr_outlier_Q4, MAX_SNR_OUTLIER_2_FX ) ) && ( st_fx->Opt_SC_VBR != 0 ) ) )
             {
                 /*  thr1_ol = thr1 + (float)(1.0f - 0.04f * snr_outlier); */
-                L_tmp2 = Msub_32_16( (Word32) ( 1 << ( 24 - 16 ) ), L_snr_outlier, 20972 ); /* (1.0)Q24(Q8 in high 32bit word)  -  Q4*Q19+1 */
-                tmp2 = round_fx( L_shl( L_tmp2, 16 ) );                                     /* high word is in Q8 */
-                thr1_ol = add( thr1_ol, tmp2 );                                             /* (Q8 , Q8) */
+                L_tmp = Mpy_32_16_1( L_snr_outlier, 20972 /*0.04f in Q19*/ ); // q_snr+19-15
+                L_tmp = L_shl( L_tmp, sub( Q24 - 4, q_snr ) );                // Q24 (24-(q_nsr+4))
+                tmp2 = round_fx( L_sub( ONE_IN_Q24, L_tmp ) );                // Q8
+                thr1_ol = add( thr1, tmp2 );                                  // Q8
             }
             ELSE
             {
-                /*thr1_ol = thr1 + max(0, (float)(0.6f - 0.01f * L_snr_outlier));  */
-                thr1_ol = thr1;
-                move16();
-                L_tmp2 = Msub_32_16( (Word32) 614, L_snr_outlier, 20972 ); /* .6*1024= */ /* 0.6 Q26(Q10 in high word) -  Q4*Q21+1  */
-#ifdef BASOP_NOGLOB
-                tmp2 = round_fx( L_shl_o( L_tmp2, 14, &Overflow ) ); /* Q10(high word)+ 14 -16 --> Q8*/
-#else                                                                /* BASOP_NOGLOB */
-                tmp2 = round_fx( L_shl( L_tmp2, 14 ) );                                 /* Q10(high word)+ 14 -16 --> Q8*/
-#endif
-                IF( L_tmp2 > 0 )
-                {
-                    thr1_ol = add( thr1_ol, tmp2 ); /* Q24 >>16 + Q8 */
-                }
+                /*thr1_ol = thr1 + max(0, (float)(0.6f - 0.01f * snr_outlier));  */
+                /* Saturation is added in the below step for 0.04f * snr_outlier in Q24.
+                   In case of saturation, 0.04f * snr_outlier will be much greater than 0.6f and (0.6f - 0.01f * snr_outlier) becomes negative.
+                   max(0, (float)(0.6f - 0.01f * snr_outlier)) gives zero. Hence addition of saturation has no impact */
+                L_tmp = Mpy_32_16_1( L_snr_outlier, 20972 /*0.04f in Q21*/ ); // q_snr+21-15
+                L_tmp = L_shl_sat( L_tmp, sub( Q24 - 6, q_snr ) );            // Q24 (24-(q_nsr+6))
+                tmp2 = round_fx( L_sub( 10066330 /* 0.6 in Q24*/, L_tmp ) );  // Q8
+                tmp2 = s_max( 0, tmp2 );                                      // Q8
+                thr1_ol = add( thr1, tmp2 );                                  // Q8
             }
         }
 
@@ -2682,11 +2689,15 @@ Word16 wb_vad_ivas_fx(
         /* DTX HANGOVER  is in pre_proc_fx()  */
         flag_he1 = 0;
         move16();
-
+        st_fx->localVAD = 0;
+        move16();
         IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_mssnr, L_mssnr_e, L_vad_thr, 18 ), 1 ) )
         {
             flag_he1 = 1;
-            move16();                                                          /* he1 primary decision */
+            move16();
+            st_fx->localVAD = 1;
+            move16();
+            /* he1 primary decision */
             hVAD->nb_active_frames_he1 = add( hVAD->nb_active_frames_he1, 1 ); /* Counter of consecutive active speech frames */
             move16();
 
@@ -3074,7 +3085,7 @@ Word16 wb_vad_ivas_fx(
     hVAD->prim_act_quick_fx = mult_r( 26214, hVAD->prim_act_quick_fx ); /*Q15 */
     move16();
 
-    if ( st_fx->localVAD != 0 )
+    IF( st_fx->localVAD != 0 )
     {
         hVAD->prim_act_quick_fx = add( 6554, hVAD->prim_act_quick_fx ); /*Q15 */
         move16();
@@ -3083,13 +3094,13 @@ Word16 wb_vad_ivas_fx(
     hVAD->prim_act_slow_fx = mult_r( 32440, hVAD->prim_act_slow_fx ); /*Q15 */
     move16();
 
-    if ( st_fx->localVAD != 0 )
+    IF( st_fx->localVAD != 0 )
     {
         hVAD->prim_act_slow_fx = add( 328, hVAD->prim_act_slow_fx ); /*Q15 */
         move16();
     }
 
-    tmp = hVAD->prim_act_slow_fx;
+    tmp = hVAD->prim_act_slow_fx; /*Q15*/
     move16();
     if ( LE_16( hVAD->prim_act_quick_fx, hVAD->prim_act_slow_fx ) )
     {
@@ -3102,7 +3113,7 @@ Word16 wb_vad_ivas_fx(
 
     hVAD->prim_act_quick_he_fx = mult_r( 26214, hVAD->prim_act_quick_he_fx ); /*Q15 */
     move16();
-    if ( *localVAD_HE_SAD != 0 )
+    IF( *localVAD_HE_SAD != 0 )
     {
         hVAD->prim_act_quick_he_fx = add( 6554, hVAD->prim_act_quick_he_fx ); /*Q15 */
         move16();
@@ -3110,7 +3121,7 @@ Word16 wb_vad_ivas_fx(
 
     hVAD->prim_act_slow_he_fx = mult_r( 32440, hVAD->prim_act_slow_he_fx ); /*Q15 */
     move16();
-    if ( *localVAD_HE_SAD != 0 )
+    IF( *localVAD_HE_SAD != 0 )
     {
         hVAD->prim_act_slow_he_fx = add( 328, hVAD->prim_act_slow_he_fx ); /*Q15 */
         move16();
@@ -3126,7 +3137,7 @@ Word16 wb_vad_ivas_fx(
     hVAD->prim_act_he_fx = mac_r( L_mult( 3277, tmp ), 29491, hVAD->prim_act_he_fx );
     move16();
 
-    if ( L_and( hVAD->vad_flag_reg_H, (Word32) 0x40000L ) != 0 ) /* 0x4000L = 0x01L << 18 */
+    IF( L_and( hVAD->vad_flag_reg_H, (Word32) 0x40000L ) != 0 ) /* 0x4000L = 0x01L << 18 */
     {
         hVAD->vad_flag_cnt_50 = sub( hVAD->vad_flag_cnt_50, 1 );
         move16();
@@ -3135,7 +3146,7 @@ Word16 wb_vad_ivas_fx(
     hVAD->vad_flag_reg_H = L_shl( L_and( hVAD->vad_flag_reg_H, (Word32) 0x3fffffffL ), 1 );
     move32();
 
-    if ( L_and( hVAD->vad_flag_reg_L, (Word32) 0x40000000L ) != 0 )
+    IF( L_and( hVAD->vad_flag_reg_L, (Word32) 0x40000000L ) != 0 )
     {
         hVAD->vad_flag_reg_H = L_or( hVAD->vad_flag_reg_H, 0x01L );
         move32();
@@ -3153,9 +3164,9 @@ Word16 wb_vad_ivas_fx(
     }
 
 
-    if ( L_and( hVAD->vad_prim_reg, (Word32) 0x8000L ) != 0 ) /* 0x8000L = 1L << 15 */
+    IF( L_and( hVAD->vad_prim_reg, (Word32) 0x8000L ) != 0 ) /* 0x8000L = 1L << 15 */
     {
-        hVAD->vad_prim_cnt_16 = sub( hVAD->vad_prim_cnt_16, 1 );
+        hVAD->vad_prim_cnt_16 = sub( hVAD->vad_prim_cnt_16, 1 ); /*Q0*/
         move16();
     }
 
@@ -3164,9 +3175,9 @@ Word16 wb_vad_ivas_fx(
 
     IF( st_fx->localVAD != 0 )
     {
-        hVAD->vad_prim_reg = L_or( hVAD->vad_prim_reg, 0x01L );
+        hVAD->vad_prim_reg = L_or( hVAD->vad_prim_reg, 0x01L ); /*Q0*/
         move32();
-        hVAD->vad_prim_cnt_16 = add( hVAD->vad_prim_cnt_16, 1 );
+        hVAD->vad_prim_cnt_16 = add( hVAD->vad_prim_cnt_16, 1 ); /*Q0*/
         move16();
     }
 
diff --git a/lib_enc/vad_param_updt.c b/lib_enc/vad_param_updt.c
deleted file mode 100644
index e82b4595f4c7202482ab5eee40ff59257442ab77..0000000000000000000000000000000000000000
--- a/lib_enc/vad_param_updt.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
-
-/*-------------------------------------------------------------------*
- * vad_param_updt()
- *
- * Update parameters used by the VAD or DTX
- *--------------------------------------------------------------------*/
diff --git a/lib_enc/vad_param_updt_fx.c b/lib_enc/vad_param_updt_fx.c
index e0b607c5a68015d07f0af5774686659f67f828c4..464903a03a6b45a7e9e241b4c900901bd290b801 100644
--- a/lib_enc/vad_param_updt_fx.c
+++ b/lib_enc/vad_param_updt_fx.c
@@ -17,10 +17,10 @@
  *--------------------------------------------------------------------*/
 
 void vad_param_updt_fx(
-    Encoder_State *st_fx,             /* i/o: state structure                         */
-    const Word16 old_pitch1,          /* i  : OL pitch value from last frame          */
-    const Word16 corr_shift,          /* i  : correlation shift                    Q15*/
-    const Word16 corr_shiftR,         /* i  : correlation shift                     */
+    Encoder_State *st_fx,             /* i/o: state structure                        */
+    const Word16 old_pitch1,          /* i  : OL pitch value from last frame      Q0 */
+    const Word16 corr_shift,          /* i  : correlation shift                   Q15*/
+    const Word16 corr_shiftR,         /* i  : correlation shift                   Q15 */
     const Word16 Az[],                /* i:  a coeffs                             Q12 */
     FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles                     */
     const Word16 n_channels           /* i  : number of channels                    */
@@ -36,31 +36,29 @@ void vad_param_updt_fx(
     DTX_ENC_HANDLE hDtxEnc = st_fx->hDtxEnc;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
-    corr_shift_temp[0] = corr_shift;
-    corr_shift_temp[1] = corr_shiftR;
+    corr_shift_temp[0] = corr_shift;  /*Q15*/
+    corr_shift_temp[1] = corr_shiftR; /*Q15*/
     move16();
     move16();
 
     hVAD = st_fx->hVAD;
     ini_frame = st_fx->ini_frame;
     move16();
-    move16();
 
     IF( hFrontVad != NULL )
     {
         hVAD = hFrontVad[0]->hVAD;
         ini_frame = hFrontVad[0]->ini_frame;
         move16();
-        move16();
     }
     FOR( i = 0; i < n_channels; i++ )
     {
         if ( EQ_16( i, 1 ) )
         {
             hVAD = hFrontVad[1]->hVAD;
-            move16();
         }
         IF( !st_fx->Opt_AMR_WB )
         {
@@ -85,7 +83,8 @@ void vad_param_updt_fx(
             {
                 /* update the counter of consecutive inactive frames in DTX */
                 hVAD->consec_inactive = add( hVAD->consec_inactive, 1 );
-                IF( GT_16( hVAD->consec_inactive, 5 ) )
+                move16();
+                if ( GT_16( hVAD->consec_inactive, 5 ) )
                 {
                     hVAD->consec_inactive = 5;
                     move16();
@@ -115,7 +114,7 @@ void vad_param_updt_fx(
                     hVAD->ra_deltasum_fx = add( hVAD->ra_deltasum_fx, sub( tmp2, tmp1 ) );
                     move16();
 
-                    tmp1 = mult( 26214, hVAD->running_avg_fx );
+                    tmp1 = mult( 26214, hVAD->running_avg_fx ); /* (0.8 in Q15 * Q15) = Q(30 - 15)*/
                     hVAD->running_avg_fx = add( tmp1, tmp2 );
                     move16();
 
@@ -148,7 +147,7 @@ void vad_param_updt_fx(
                     hDtxEnc->cnt_SID = 1;
                     move16();
                     st_fx->core_brate = SID_2k40;
-                    move16();
+                    move32();
                     hVAD->trigger_SID = 0;
                     move16();
                 }
@@ -165,14 +164,9 @@ void vad_param_updt_fx(
         /* (voicing[0] + voicing[1] + voicing[2]) / 3  + corr_shift */
         L_tmp = L_mult( st_fx->voicing_fx[0], 10923 );
         L_tmp = L_mac( L_tmp, st_fx->voicing_fx[1], 10923 );
-        L_tmp = L_mac( L_tmp, st_fx->voicing_fx[2], 10923 ); /*Q15 */
-#ifdef BASOP_NOGLOB
+        L_tmp = L_mac( L_tmp, st_fx->voicing_fx[2], 10923 );            /*Q15 */
         L_tmp = L_mac_o( L_tmp, corr_shift_temp[i], 32767, &Overflow ); /*Q15 */
         voice_tmp = round_fx_o( L_tmp, &Overflow );                     /*Q15 */
-#else                                                                   /* BASOP_NOGLOB */
-        L_tmp = L_mac( L_tmp, corr_shift_temp[i], 32767 ); /*Q15 */
-        voice_tmp = round_fx( L_tmp );                     /*Q15 */
-#endif
 
         /* abs(pitch[0] - *pitO) + abs(pitch[1] - pitch[0]) + abs(pitch[2] - pitch[1]) */
         pitch_tmp = abs_s( sub( st_fx->pitch[0], old_pitch1 ) );                        /*Q0 */
diff --git a/lib_enc/vad_proc.c b/lib_enc/vad_proc.c
deleted file mode 100644
index 661cc4b7b44a35c09c0ee29a47f1b5d01df6c3fe..0000000000000000000000000000000000000000
--- a/lib_enc/vad_proc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <assert.h>
-#include <stdint.h>
-#include "options.h"
-#include "prot.h"
-#include "rom_enc.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/vad_proc_fx.c b/lib_enc/vad_proc_fx.c
index 2c12ec9963d302a67c8be4af01c4e3d35b1563cd..2c9273ff54824969fec1d5297c9bf322fd20cee4 100644
--- a/lib_enc/vad_proc_fx.c
+++ b/lib_enc/vad_proc_fx.c
@@ -25,8 +25,8 @@ Word16 vad_init_fx(
 )
 {
     Word16 i = 0;
-
-    IF( hVAD_CLDFB == NULL )
+    move16();
+    if ( hVAD_CLDFB == NULL )
     {
         return -1;
     }
@@ -177,7 +177,7 @@ Word16 vad_init_fx(
     return 0;
 }
 
-static void UpdateState(
+static void UpdateState_fx(
     VAD_CLDFB_HANDLE hVAD_CLDFB, /* i/o: CLDFB VAD state     */
     Word16 vad_flag,             /* i  : VAD flag                               */
     Word32 frame_energy,         /* i  : current frame energy                   */
@@ -205,7 +205,7 @@ static void UpdateState(
         hVAD_CLDFB->lt_bg_highf_eng = L_add( MUL_F( hVAD_CLDFB->lt_bg_highf_eng, 31130 ), L_shr( MUL_F( HB_Power, 1638 ), sub( HB_Power_Q, lt_bg_highf_eng_Q ) ) );
     }
 
-    if ( LT_16( hVAD_CLDFB->frameloop, 1000 ) )
+    IF( LT_16( hVAD_CLDFB->frameloop, 1000 ) )
     {
         hVAD_CLDFB->frameloop = add( hVAD_CLDFB->frameloop, 1 );
         move16();
@@ -242,7 +242,9 @@ static void UpdateState(
         move16();
 
         hVAD_CLDFB->continuous_speech_num2 = add( hVAD_CLDFB->continuous_speech_num2, 1 );
+        move16();
         hVAD_CLDFB->continuous_speech_num = add( hVAD_CLDFB->continuous_speech_num, 1 );
+        move16();
         if ( GT_16( hVAD_CLDFB->continuous_speech_num, 2048 ) )
         {
             hVAD_CLDFB->continuous_speech_num = 2048;
@@ -357,7 +359,7 @@ Word16 vad_proc_fx(
                                       HB_Power_Q, snr, tsnr, hVAD_CLDFB->vad_flag_for_bk_update, music_backgound_f );
 
 
-    UpdateState( hVAD_CLDFB, hVAD_CLDFB->vad_flag_for_bk_update, frame_energy2, frame_energy2_Q, update_flag, music_backgound_f, HB_Power, HB_Power_Q, snr );
+    UpdateState_fx( hVAD_CLDFB, hVAD_CLDFB->vad_flag_for_bk_update, frame_energy2, frame_energy2_Q, update_flag, music_backgound_f, HB_Power, HB_Power_Q, snr );
 
 
     return vad_flag;
diff --git a/lib_enc/vbr_average_rate.c b/lib_enc/vbr_average_rate.c
deleted file mode 100644
index ee4d0477acb81ddd3b7e06486a85b5a601a73d2a..0000000000000000000000000000000000000000
--- a/lib_enc/vbr_average_rate.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-
-/*------------------------------------------------------------------*
- * Local constants
- *------------------------------------------------------------------*/
-
-#define RATEWIN 600 /* length of the rate control window. This is 600 active speech frames. This equals roughly 12s of active speech */
-
-/*------------------------------------------------------------------*
- * update_average_rate()
- *
- * SC-VBR update average data rate
- *------------------------------------------------------------------*/
diff --git a/lib_enc/vbr_average_rate_fx.c b/lib_enc/vbr_average_rate_fx.c
index 931333ebe264c01ecdf50d5a276127413b5ad34f..28371b2d716d2cd26f8cba81e5bdc40929ed02cb 100644
--- a/lib_enc/vbr_average_rate_fx.c
+++ b/lib_enc/vbr_average_rate_fx.c
@@ -41,7 +41,7 @@
 /*=================================================================================*/
 void update_average_rate_fx(
     SC_VBR_ENC_HANDLE hSC_VBR, /* i/o: SC-VBR state structure  */
-    const Word32 core_brate_fx /* i  : core bitrate            */
+    const Word32 core_brate_fx /* i  : core bitrate         Q0 */
 )
 {
     Word32 avratetarg_fx; /* target rate for next RATEWIN active frames */
@@ -69,7 +69,7 @@ void update_average_rate_fx(
 
             /*st->global_avr_rate = (st->global_avr_rate * (st->global_frame_cnt-1) + st->sum_of_rates) / st->global_frame_cnt; */
             exp = norm_s( hSC_VBR->global_frame_cnt );
-            tmp = shl( hSC_VBR->global_frame_cnt, exp );
+            tmp = shl( hSC_VBR->global_frame_cnt, exp ); /*Q0 + exp = exp*/
             recip = div_s( 16384, tmp );
             Qrecip = sub( 15, sub( exp, 14 ) );
 
@@ -218,11 +218,11 @@ void update_average_rate_fx(
                st->pattern_m=100 . Later this value is used in voiced.enc to bump up 10% of PPP frames to F frames. */
             /*  st->pattern_m = (short)(1000 * (avratetarg - 6.15f * RATEWIN * 10)/(10 * RATEWIN * 0.1f) ); */
 
-            L_tmp = L_mult0( RATEWIN, VBR_ADR_MAX_TARGET_x10_Q1 );
-            L_tmp = L_shl( L_tmp, 12 );
+            L_tmp = RATEWIN * VBR_ADR_MAX_TARGET_x10_Q1; /* Q0 * Q1 = Q1 */
+            L_tmp = L_shl( L_tmp, 12 );                  /* Q1<<12 = Q13*/
             L_tmp = L_sub( avratetarg_fx, L_tmp );
             /*27307=(1000/(RATEWIN))Q14  */
-            tmp = extract_h( L_shl( Mult_32_16( L_tmp, 27307 ), 4 ) );
+            tmp = extract_h( L_shl( Mult_32_16( L_tmp, 27307 ), 4 ) ); /*(((Q13*Q0)<<4)>>16) = Q18>>16 = Q2*/
             hSC_VBR->pattern_m = tmp;
             move16();
 
@@ -257,12 +257,8 @@ void update_average_rate_fx(
     move16();
     /* sum the total number of bits (in kbytes) * 10 here */
     /*st->sum_of_rates += (hSC_VBR->core_brate / 1000.0f) * 10; */
-    L_tmp = L_shl( Mult_32_16( core_brate_fx, 20972 ), 7 );
-#ifdef BASOP_NOGLOB
+    L_tmp = L_shl( Mult_32_16( core_brate_fx, 20972 ), 7 ); /*Q13*/
     hSC_VBR->sum_of_rates_fx = L_add_o( hSC_VBR->sum_of_rates_fx, L_tmp, &Overflow );
-#else
-    hSC_VBR->sum_of_rates_fx = L_add( hSC_VBR->sum_of_rates_fx, L_tmp );
-#endif
     move32();
     return;
 }
diff --git a/lib_enc/vlpc_1st_cod.c b/lib_enc/vlpc_1st_cod.c
deleted file mode 100644
index 0fe8682daace6673130ca2ca05de2a188e8e2ae0..0000000000000000000000000000000000000000
--- a/lib_enc/vlpc_1st_cod.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/vlpc_1st_cod_fx.c b/lib_enc/vlpc_1st_cod_fx.c
index deddb5023f050e318989567a1101cc9c99a90c54..9bfe0d8ae90c59aa69f96b024678e1fbd341760a 100644
--- a/lib_enc/vlpc_1st_cod_fx.c
+++ b/lib_enc/vlpc_1st_cod_fx.c
@@ -14,12 +14,12 @@
 #define ISF_ONE 3 /*1.0f*1.28f Q1*/ /*=1.0f in 14Q1*1.28*/
 
 /*------------------------------------------------------------------*
- * lsf_weight()
+ * lsf_weight_fx()
  *
  * outputs only the weightings, doesn't do anything with the lsfq
  *------------------------------------------------------------------*/
 /*outputs only the weightings, doesn't do anything with the lsfq*/
-static void lsf_weight(
+static void lsf_weight_fx(
     const Word16 *lsfq, /* i  : quantized lsf coefficients (14Q1*1.28)*/
     Word16 *w           /* o  : lsf weighting vector (0Q15)          */
 )
@@ -31,7 +31,7 @@ static void lsf_weight(
     /* weighting function */
     /*use the second element as the base to avoid the following division by 0*/
     /*this happens when the ac function is nearly flat*/
-    i = lsfq[0];
+    i = lsfq[0]; /* (14Q1*1.28)*/
     move16();
     if ( lsfq[0] == 0 )
     {
@@ -40,7 +40,7 @@ static void lsf_weight(
     }
     inv_di0 = 0x7fff;
     move16();
-    if ( GT_16( i, ISF_ONE ) )
+    IF( GT_16( i, ISF_ONE ) )
     {
         inv_di0 = div_s( ISF_ONE, i ); /*0Q15*/ /*inv_di0 = 1.0f / lsfq[0];*/
     }
@@ -52,33 +52,17 @@ static void lsf_weight(
     FOR( i = 1; i < ( M - 2 ); i += 2 ) /*for (i=1; i<(M-2); i+=2)*/
     {
         inv_di1 = div_s( ISF_ONE, s_max( ISF_ONE, sub( lsfq[i], lsfq[i - 1] ) ) ); /*0Q15*/ /*inv_di1 = 1.0f / (lsfq[i] - lsfq[i-1]);*/
-#ifdef BASOP_NOGLOB
         w[i - 1] = add_sat( inv_di0, inv_di1 );
-#else
-        w[i - 1] = add( inv_di0, inv_di1 );
-#endif
         move16(); /*0Q15*/                                                                  /*w[i-1] = inv_di0 + inv_di1;*/
         inv_di0 = div_s( ISF_ONE, s_max( ISF_ONE, sub( lsfq[i + 1], lsfq[i] ) ) ); /*0Q15*/ /*inv_di0 = 1.0f / (lsfq[i+1] - lsfq[i]);*/
-#ifdef BASOP_NOGLOB
         w[i] = add_sat( inv_di1, inv_di0 );
-#else
-        w[i] = add( inv_di1, inv_di0 );
-#endif
         move16(); /*0Q15*/ /*w[i] = inv_di1 + inv_di0;*/
     }
     inv_di1 = div_s( ISF_ONE, s_max( ISF_ONE, sub( lsfq[i], lsfq[i - 1] ) ) ); /*inv_di1 = 1.0f / (lsfq[i] - lsfq[i-1]);*/
-#ifdef BASOP_NOGLOB
     w[i - 1] = add_sat( inv_di0, inv_di1 );
-#else
-    w[i - 1] = add( inv_di0, inv_di1 );
-#endif
     move16();                                                               /*w[i-1] = inv_di0 + inv_di1;*/
     inv_di0 = div_s( ISF_ONE, s_max( ISF_ONE, sub( FREQ_MAX, lsfq[i] ) ) ); /*inv_di0 = 1.0f / (FREQ_MAX - lsfq[i]);*/
-#ifdef BASOP_NOGLOB
     w[i] = add_sat( inv_di1, inv_di0 );
-#else
-    w[i] = add( inv_di1, inv_di0 );
-#endif
     move16(); /*w[i] = inv_di1 + inv_di0;*/
 
     BASOP_SATURATE_WARNING_ON_EVS
@@ -104,7 +88,7 @@ Word16 vlpc_1st_cod_fx(                    /* o  : codebook index
 
 
     /* weighting */
-    lsf_weight( lsf, w ); /*lsf:14Q1*1.28=>w:0Q15*/
+    lsf_weight_fx( lsf, w ); /*lsf:14Q1*1.28=>w:0Q15*/
     IF( EQ_16( rf_mode, 1 ) )
     {
         Word16 s;
diff --git a/lib_enc/vlpc_2st_cod.c b/lib_enc/vlpc_2st_cod.c
deleted file mode 100644
index e7a8ca967132cf8896fc4a231dbaf74eed596840..0000000000000000000000000000000000000000
--- a/lib_enc/vlpc_2st_cod.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include "cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/vlpc_2st_cod_fx.c b/lib_enc/vlpc_2st_cod_fx.c
index 6334684d25f9fb78871a516aaa4d94fb537afb8d..2ea4df5a991b85e437dfbd9b55c4367637077a2d 100644
--- a/lib_enc/vlpc_2st_cod_fx.c
+++ b/lib_enc/vlpc_2st_cod_fx.c
@@ -18,9 +18,9 @@
  *------------------------------------------------------------------*/
 
 Word16 vlpc_2st_cod_fx(                      /* output: number of allocated bits				    */
-                        const Word16 *lsf,   /* i  : normalized vector to quantize   */
-                        Word16 *lsfq,        /* i/o: i:1st stage   o:1st+2nd stage   */
-                        Word16 *indx,        /* o  : index[] (4 bits per words)      */
+                        const Word16 *lsf,   /* i  : normalized vector to quantize  (14Q1*1.28) */
+                        Word16 *lsfq,        /* i/o: i:1st stage   o:1st+2nd stage  (14Q1*1.28) */
+                        Word16 *indx,        /* o  : index[] (4 bits per words)   Q0 */
                         const Word16 mode,   /* i  : 0=abs, >0=rel                   */
                         const Word32 sr_core /* i  : internal sampling rate          */
 )
@@ -32,6 +32,7 @@ Word16 vlpc_2st_cod_fx(                      /* output: number of allocated bits
     Word16 gap;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
 
 
@@ -56,11 +57,7 @@ Word16 vlpc_2st_cod_fx(                      /* output: number of allocated bits
     BASOP_SATURATE_WARNING_OFF_EVS /* Allow saturate because we only need to know if the result is smaller than 8.0f */
     FOR( i = 1; i < M; i++ )
     {
-#ifdef BASOP_NOGLOB
         L_tmp = L_mac_o( L_tmp, x[i], x[i], &Overflow ); /*10Q21*/
-#else                                                    /* BASOP_NOGLOB */
-        L_tmp = L_mac( L_tmp, x[i], x[i] ); /*10Q21*/
-#endif
     }
     BASOP_SATURATE_WARNING_ON_EVS
 
@@ -158,6 +155,7 @@ Word16 vlpc_2st_cod_fx(                      /* output: number of allocated bits
     {
         gap = 34;
     }
+    move16();
     reorder_lsf_fx( lsfq, gap, M, INT_FS_FX );
 
 
diff --git a/lib_enc/voiced_enc.c b/lib_enc/voiced_enc.c
deleted file mode 100644
index 5bfe6bfc099df4c4d4931c3c31b6c94162a7f88d..0000000000000000000000000000000000000000
--- a/lib_enc/voiced_enc.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "cnst.h"
-#include "rom_com.h"
-#include "wmc_auto.h"
-#include "prot_fx.h"
diff --git a/lib_enc/voiced_enc_fx.c b/lib_enc/voiced_enc_fx.c
index cf08ebe5af47d25336b81e8abc4dc077fc654f87..8081b29097d39ced20004f5a95a6403c7e39e297 100644
--- a/lib_enc/voiced_enc_fx.c
+++ b/lib_enc/voiced_enc_fx.c
@@ -74,15 +74,21 @@ ivas_error ppp_voiced_encoder_fx(
 {
     Word16 i;
     Word16 spike_near_edge = 0;
+    move16();
     Word16 flag;
     Word16 delta_lag_E = 0, PPP_MODE_E, Q_delta_lag = 0;
+    move16(); /*delta_lag_E*/
+    move16(); /*Q_delta_lag*/
     Word16 out_of_bound = 0;
+    move16();
     Word16 tmp, tmptmp, tmptmp1;
     Word16 pl, l;
     Word16 interp_delay[3], temp_pl, temp_l;
     Word16 upper_cut_off_freq_of_interest_fx = 0;
+    move16(); /*upper_cut_off_freq_of_interest_fx*/
     Word16 upper_cut_off_freq_of_interest_norm_fx = 0, upper_cut_off_freq_norm_fx = 0;
-
+    move16(); /*upper_cut_off_freq_of_interest_norm_fx*/
+    move16(); /*upper_cut_off_freq_norm_fx*/
     Word16 S_fx[PIT_MAX * 4 + 1], C_fx[PIT_MAX * 4 + 1];
     Word16 Qtmpres;
     Word32 Ltemp, logLag, Ltemp_q;
@@ -101,18 +107,24 @@ ivas_error ppp_voiced_encoder_fx(
     Word16 exp_ee, frac_ee;
     Word16 Qtmp;
     Word32 res_enratio_fx = 0;
+    move32();
     Word16 mem_fx[10];
     Word32 energy_impz_fx = 0, tmpres_fx;
+    move32(); /*energy_impz_fx*/
     Word32 pos_nq0_fx, neg_nq0_fx, Ltmp;
     Word32 Ltmp_32, Ltmp1_32, Ltemp1, Ltemp2, Ltemp_fx;
     Word16 Qadj;
 
     Word32 tmp_fx = 0, sp_hb_enratio_fx = 0, sp_enratio_fx = 0;
+    move32(); /*tmp_fx*/
+    move32(); /*sp_hb_enratio_fx*/
+    move32(); /*sp_enratio_fx*/
     Word32 low_band_en_fx;
     Word32 curr_Engy, prev_Engy;
     Word16 temp_Fs;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     DTFS_STRUCTURE *CURRP_NQ_FX;
     DTFS_STRUCTURE *TMPDTFS_FX;
@@ -171,7 +183,7 @@ ivas_error ppp_voiced_encoder_fx(
         upper_cut_off_freq_norm_fx = 16384;
         move16(); /*value normalized by 12800 */
     }
-    ELSE IF( EQ_16( bwidth_fx, NB ) )
+    ELSE IF( bwidth_fx == NB )
     {
         upper_cut_off_freq_of_interest_fx = 3300;
         move16();
@@ -219,19 +231,20 @@ ivas_error ppp_voiced_encoder_fx(
     if ( hSC_VBR->last_ppp_mode == 1 )
     {
         hSC_VBR->rate_control = 0;
+        move16();
     }
 
     PPP_MODE_E = 'Q';
     move16();
 
     pl = s_min( MAX_LAG_PIT, rint_new_fx( L_shl( old_pitch_buf[( 2 * NB_SUBFR ) - 1], 10 ) ) );
-    move16();
     l = s_min( MAX_LAG_PIT, rint_new_fx( L_deposit_h( delay_fx ) ) );
-    move16();
     /* old_pitch_buf in Q6*/
 
     /* Bump up if the lag is out_fx of range */
     test();
+    test();
+    test();
     IF( GT_16( sub( l, pl ), 13 ) || LT_16( sub( l, pl ), -11 ) || LT_16( l, 19 ) || LT_16( pl, 19 ) )
     {
         hSC_VBR->bump_up = 1;
@@ -259,7 +272,7 @@ ivas_error ppp_voiced_encoder_fx(
     }
 
     /* Use the out_fx array as a temp storage for currp */
-    spike_near_edge = ppp_extract_pitch_period_fx( in_fx, out_fx, l, &out_of_bound, Qres );
+    spike_near_edge = ppp_extract_pitch_period_fx( in_fx, out_fx, l, &out_of_bound, Qres ); /*Q0*/
     move16();
     /* out_fx in Qres */
 
@@ -310,7 +323,7 @@ ivas_error ppp_voiced_encoder_fx(
         move16(); /* pitch_fx in Q6 */
     }
     curr_Engy = DTFS_getEngy_P2A_fx( CURRP_NQ_FX ); /*2Q where Q=CURRP_NQ_FX->Q */
-
+    move32();
     /* Restoring PPP memories when the last frame is non-PPP */
     IF( NE_16( hSC_VBR->last_ppp_mode, 1 ) )
     {
@@ -325,7 +338,7 @@ ivas_error ppp_voiced_encoder_fx(
         prev_Engy = L_add( Lacc, 0 );
 
         hSC_VBR->Q_prev_cw_en_fx = norm_l( Lacc ); /* = K = headroom */
-
+        move16();
         /*hSC_VBR->Q_prev_cw_en_fx = (Lacc==0)?31: hSC_VBR->Q_prev_cw_en_fx; */
         if ( Lacc == 0 )
         {
@@ -334,7 +347,9 @@ ivas_error ppp_voiced_encoder_fx(
         }
 
         hSC_VBR->prev_cw_en_fx = (Word32) L_shl( Lacc, hSC_VBR->Q_prev_cw_en_fx ); /*2Q+K */
+        move32();
         hSC_VBR->Q_prev_cw_en_fx = add( hSC_VBR->Q_prev_cw_en_fx, shl( dtfs_temp_fx->Q, 1 ) );
+        move16();
         /* hSC_VBR->Q_prev_cw_en_fx = 2*(dtfs_temp_fx->Q) + K */
 
         DTFS_copy_fx( TMPDTFS_FX, *dtfs_temp_fx ); /* output = TMPDTFS_FX */
@@ -346,19 +361,21 @@ ivas_error ppp_voiced_encoder_fx(
 
         /* Process low band */
         Ltemp = DTFS_setEngyHarm_fx( 236, 2828, 0, 2828, 1, 0, &Ql, TMPDTFS_FX ); /* Q of Ltemp = 2*(TMPDTFS_FX->Q) = Ql ?  */
+        move32();
         /* Compensate for Q factor of energy to get log10(lag*eng)  */
         Ltemp = log10_fx( Ltemp );                        /* Ltemp=10log10(eng), Q23 */
         Ltemp = L_add( L_sub( Ltemp, Ltemp_q ), logLag ); /* Ltemp=10*log10(lag*eng), Q23 */
         /*hSC_VBR->lastLgainE_fx=round_fx(L_shl((Word32)Mpy_32_16(extract_h(Ltemp),extract_l(Ltemp),0x6666),1)); // Q11, 0x6666 = 0.1 in Q18 */
         hSC_VBR->lastLgainE_fx = round_fx( L_shl( Mult_32_16( Ltemp, 0x6666 ), 1 ) ); /* Q11, 0x6666 = 0.1 in Q18 */
-
+        move16();
 
         /* Process high band */
         Ltemp = DTFS_setEngyHarm_fx( 2828, upper_cut_off_freq_of_interest_norm_fx, 2828, upper_cut_off_freq_norm_fx, 1, 0, &Qh, TMPDTFS_FX );
+        move32();
         Ltemp = log10_fx( Ltemp );
         Ltemp = L_add( L_sub( Ltemp, Ltemp_q ), logLag );                             /* Ltemp=10*log10(lag*eng), Q23 */
         hSC_VBR->lastHgainE_fx = round_fx( L_shl( Mult_32_16( Ltemp, 0x6666 ), 1 ) ); /* Q11 */
-
+        move16();
         /* Need to unify the Q factors of both bands */
         TMPDTFS_FX->Q = s_min( Ql, Qh );
         move16();          /* set Q factor to be the smaller one of Ql and Qh */
@@ -380,11 +397,11 @@ ivas_error ppp_voiced_encoder_fx(
     {
         /* Copy DTFS related parameters from 'st_fx' to 'dtfs_temp' structure */
         dtfs_temp_fx->lag_fx = hSC_VBR->dtfs_enc_lag;
-        move16();
+        move16(); /*Q0*/
         dtfs_temp_fx->nH_fx = hSC_VBR->dtfs_enc_nH;
-        move16();
+        move16(); /*Q0*/
         dtfs_temp_fx->nH_4kHz_fx = hSC_VBR->dtfs_enc_nH_4kHz;
-        move16();
+        move16(); /*Q0*/
         dtfs_temp_fx->upper_cut_off_freq_of_interest_fx = hSC_VBR->dtfs_enc_upper_cut_off_freq_of_interest_fx;
         move16();
         dtfs_temp_fx->upper_cut_off_freq_fx = hSC_VBR->dtfs_enc_upper_cut_off_freq_fx;
@@ -396,6 +413,7 @@ ivas_error ppp_voiced_encoder_fx(
         dtfs_temp_fx->Q = hSC_VBR->dtfs_enc_Q;
         move16();
         Lacc1 = DTFS_getEngy_P2A_fx( dtfs_temp_fx );
+        move32();
         prev_Engy = L_add( Lacc1, 0 );
     }
 
@@ -457,14 +475,14 @@ ivas_error ppp_voiced_encoder_fx(
     DTFS_copy_fx( TMPDTFS2_FX, *dtfs_temp_fx ); /* output = TMPDTFS2_FX with Q = dtfs_temp_fx->Q */
 
     tmptmp = DTFS_alignment_full_fx( *TMPDTFS2_FX, *TMPDTFS_FX, hSC_VBR->ph_offset_E_fx, S_fx, C_fx, 0 );
-
+    move16();
     tmptmp1 = sub( shl( TMPDTFS_FX->lag_fx, 1 ), tmptmp ); /* (C_l-tmptmp) , Q1     */
 
     Q2phaseShift_fx( TMPDTFS_FX, negate( shl( tmptmp1, 1 ) ), TMPDTFS_FX->lag_fx, S_fx, C_fx ); /* fixed bug , phase shift by tmp computed in_fx TMP.lag domain (above) */
 
     /*tmpres = (float)(DTFS_freq_corr(*TMPDTFS, *TMPDTFS2, 100.0f, 3700.0f));*/
     tmpres_fx = DTFS_freq_corr_fx( *TMPDTFS_FX, *TMPDTFS2_FX, 100, 3700, &Qtmpres ); /* tmpres_fx has Q factor tmpres */
-
+    move32();
 
     poleFilter_setup_fx( lpc2_fx, M + 1, *TMPDTFS_FX, S_fx, C_fx, pf_temp1, pf_temp2, pf_temp, pf_n2 );
     DTFS_poleFilter_fx_9( TMPDTFS_FX, pf_temp1, pf_temp2, pf_temp, pf_n2 );
@@ -475,6 +493,7 @@ ivas_error ppp_voiced_encoder_fx(
     DTFS_poleFilter_fx( TMPDTFS2_FX, lpc1_fx, M + 1, S_fx, C_fx ); /* lpc1_fx in Q12 */
 
     tmp_fx = DTFS_freq_corr_fx( *TMPDTFS_FX, *TMPDTFS2_FX, 100, 3700, &Qtmp );
+    move32();
     /* tmp_fx Q = Qtmp */
 
 
@@ -489,11 +508,14 @@ ivas_error ppp_voiced_encoder_fx(
     }
     *******************************************************************************/
     Ltmp_32 = ( DTFS_getEngy_fx( TMPDTFS2_FX ) ); /* Output Q=2*(TMPDTFS2_FX->Q) */
+    move32();
     IF( Ltmp_32 > 0 )
     {
         /*sp_enratio = DTFS_getEngy(*TMPDTFS)/DTFS_getEngy(*TMPDTFS2); in Q15 */
         Lacc = DTFS_getEngy_P2A_fx( TMPDTFS_FX );
+        move32();
         Lacc1 = Ltmp_32;
+        move32();
         /* IF (L_sub(sp_enratio_fx,0x7FFF)!=0) */
         {
             expb = norm_l( Lacc );
@@ -512,11 +534,7 @@ ivas_error ppp_voiced_encoder_fx(
 
             tmp = div_s( fracb, fraca );
             exp = sub( expb, expa );
-#ifdef BASOP_NOGLOB
             sp_enratio_fx = L_shl_sat( tmp, exp ); /* Q15 */
-#else
-            sp_enratio_fx = L_shl( tmp, exp );                            /* Q15 */
-#endif
         }
     }
     ELSE
@@ -540,20 +558,12 @@ ivas_error ppp_voiced_encoder_fx(
         }
 
         /* Bump up if big change between the previous and the current CWs */
-#ifdef BASOP_NOGLOB
         IF( LT_16( shl_o( hSC_VBR->vadsnr_fx, 1, &Overflow ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#else
-        IF( LT_16( shl( hSC_VBR->vadsnr_fx, 1 ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#endif
         {
             /*if ( res_enratio > 5.0 && tmp < 0.65 ) */
             /* 5 in Q11, 0.65 in Q15 // L_shl(tmp_fx,sub(31,Qtmp)) makes tmp_fx FIXED Q31 */
             test();
-#ifdef BASOP_NOGLOB
-            IF( ( GT_32( res_enratio_fx, 10240 ) ) && ( LT_16( extract_h( L_shl_o( tmp_fx, sub( 31, Qtmp ), &Overflow ) ), 21299 ) ) )
-#else
-            IF( ( GT_32( res_enratio_fx, 10240 ) ) && ( LT_16( extract_h( L_shl( tmp_fx, sub( 31, Qtmp ) ) ), 21299 ) ) )
-#endif
+            if ( ( GT_32( res_enratio_fx, 10240 ) ) && ( LT_16( extract_h( L_shl_o( tmp_fx, sub( 31, Qtmp ), &Overflow ) ), 21299 ) ) )
             {
                 PPP_MODE_E = 'B';
                 move16();
@@ -564,11 +574,7 @@ ivas_error ppp_voiced_encoder_fx(
             /* if ( res_enratio > 3.0 && tmp < 1.2 )  */
             /*3 in Q11, 1.2 in Q14  // L_shl(tmp_fx,sub(31,Qtmp)) makes tmp_fx FIXED Q14 */
             test();
-#ifdef BASOP_NOGLOB
-            IF( ( GT_32( res_enratio_fx, 6144 ) ) && ( LT_16( extract_h( L_shl_o( tmp_fx, sub( 30, Qtmp ), &Overflow ) ), 19661 ) ) )
-#else
-            IF( ( GT_32( res_enratio_fx, 6144 ) ) && ( LT_16( extract_h( L_shl( tmp_fx, sub( 30, Qtmp ) ) ), 19661 ) ) )
-#endif
+            if ( ( GT_32( res_enratio_fx, 6144 ) ) && ( LT_16( extract_h( L_shl_o( tmp_fx, sub( 30, Qtmp ), &Overflow ) ), 19661 ) ) )
             {
                 PPP_MODE_E = 'B';
                 move16();
@@ -579,18 +585,10 @@ ivas_error ppp_voiced_encoder_fx(
     /* Rapid rampdown frame where time resolution is important */
     /* Not a suitable PPP frame -> Bump to CELP */
 
-#ifdef BASOP_NOGLOB
     IF( LT_16( shl_o( hSC_VBR->vadsnr_fx, 1, &Overflow ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#else
-    IF( LT_16( shl( hSC_VBR->vadsnr_fx, 1 ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#endif
     {
         /* if (res_enratio < 0.025) */
-#ifdef BASOP_NOGLOB
         IF( LT_32( L_shl_o( res_enratio_fx, 4, &Overflow ), 819 ) ) /*0x0333 = 0.025 in Q15, res_enratio_fx in Q15 after shl 4 */
-#else
-        IF( LT_32( L_shl( res_enratio_fx, 4 ), 819 ) )                /*0x0333 = 0.025 in Q15, res_enratio_fx in Q15 after shl 4 */
-#endif
         {
             hSC_VBR->bump_up = 1;
             move16();
@@ -606,11 +604,7 @@ ivas_error ppp_voiced_encoder_fx(
     ELSE
     {
         /* if ( res_enratio < 0.092f) */
-#ifdef BASOP_NOGLOB
         if ( LT_32( L_shl_o( res_enratio_fx, 4, &Overflow ), 3015 ) ) /*3015 = 0.092 in Q15, res_enratio_fx in Q15 after shl 4 */
-#else
-        if ( LT_32( L_shl( res_enratio_fx, 4 ), 3015 ) )              /*3015 = 0.092 in Q15, res_enratio_fx in Q15 after shl 4 */
-#endif
         {
             hSC_VBR->bump_up = 1;
             move16();
@@ -619,11 +613,7 @@ ivas_error ppp_voiced_encoder_fx(
 
     /*  if (min(res_enratio, sp_enratio) < 0.075 && tmp < -0.5f)) : 2458 = 0.075 in Q15 */
     test();
-#ifdef BASOP_NOGLOB
     if ( LT_32( L_min( L_shl_o( res_enratio_fx, 4, &Overflow ), sp_enratio_fx ), 2458 ) && LT_32( tmp_fx, shl_o( -1, sub( Qtmp, 1 ), &Overflow ) ) )
-#else
-    if ( LT_32( L_min( L_shl( res_enratio_fx, 4 ), sp_enratio_fx ), 2458 ) && LT_32( tmp_fx, shl( -1, sub( Qtmp, 1 ) ) ) )
-#endif
     {
         hSC_VBR->bump_up = 1;
         move16();
@@ -631,11 +621,7 @@ ivas_error ppp_voiced_encoder_fx(
 
     /* Rapid rampup frame where time resolution is important */
     /* Not a suitable PPP frame -> Bump to CELP */
-#ifdef BASOP_NOGLOB
     IF( LT_16( shl_o( hSC_VBR->vadsnr_fx, 1, &Overflow ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#else
-    IF( LT_16( shl( hSC_VBR->vadsnr_fx, 1 ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#endif
     {
         IF( GT_32( res_enratio_fx, 29696 ) ) /*14.5 in Q11 */
         {
@@ -659,7 +645,7 @@ ivas_error ppp_voiced_encoder_fx(
         }
     }
 
-    IF( hSC_VBR->bump_up == 1 )
+    IF( EQ_16( hSC_VBR->bump_up, 1 ) )
     {
         free( CURRP_NQ_FX );
         free( TMPDTFS_FX );
@@ -692,7 +678,7 @@ ivas_error ppp_voiced_encoder_fx(
         move16();
         IF( EQ_16( PPP_MODE_E, 'Q' ) )
         {
-            if ( ( error = ppp_quarter_encoder_fx( &flag, CURRP_Q_E_FX, TMPDTFS_FX, dtfs_temp_fx->lag_fx, *CURRP_NQ_FX, lpc2_fx, &hSC_VBR->lastLgainE_fx, &hSC_VBR->lastHgainE_fx, hSC_VBR->lasterbE_fx, *dtfs_temp_fx, S_fx, C_fx, hBstr ) ) != IVAS_ERR_OK )
+            IF( ( error = ppp_quarter_encoder_fx( &flag, CURRP_Q_E_FX, TMPDTFS_FX, dtfs_temp_fx->lag_fx, *CURRP_NQ_FX, lpc2_fx, &hSC_VBR->lastLgainE_fx, &hSC_VBR->lastHgainE_fx, hSC_VBR->lasterbE_fx, *dtfs_temp_fx, S_fx, C_fx, hBstr ) ) != IVAS_ERR_OK )
             {
                 free( CURRP_NQ_FX );
                 free( TMPDTFS_FX );
@@ -728,11 +714,13 @@ ivas_error ppp_voiced_encoder_fx(
             IF( GT_16( CURRP_Q_E_FX->upper_cut_off_freq_fx, 4000 ) )
             {
                 Ltemp2 = DTFS_getEngy_band_wb_fx( *CURRP_Q_E_FX, 0, 2000 );
+                move32();
                 /* Use this bump-up only for WB signals */
                 IF( Ltemp2 > 0 )
                 {
                     /* sp_hb_enratio = DTFS_getEngy_band_wb(*CURRP_Q_E, 2000.0, 6400.0)/DTFS_getEngy_band_wb(*CURRP_Q_E, 0.0, 2000.0); */
                     Ltemp1 = DTFS_getEngy_band_wb_fx( *CURRP_Q_E_FX, 2000, 6400 ); /*Q13 */
+                    move32();
                     /*sp_hb_enratio_fx = divide_dp(Ltemp1,Ltemp2,0, 1);//Q29 */
                     Qadj = 0;
                     move16();
@@ -744,11 +732,7 @@ ivas_error ppp_voiced_encoder_fx(
                         Ltemp1 = L_negate( Ltemp1 );
                     }
                     expa = norm_l( Ltemp2 );
-#ifdef BASOP_NOGLOB
                     fraca = extract_h( L_shl_o( Ltemp2, expa, &Overflow ) );
-#else
-                    fraca = extract_h( L_shl( Ltemp2, expa ) );
-#endif
                     expa = sub( 30, expa );
 
                     expb = norm_l( Ltemp1 );
@@ -756,20 +740,12 @@ ivas_error ppp_voiced_encoder_fx(
                     expb = sub( 30, add( expb, Qadj ) );
 
                     scale = shr( sub( fraca, fracb ), 15 );
-#ifdef BASOP_NOGLOB
                     fracb = shl_o( fracb, scale, &Overflow );
-#else
-                    fracb = shl( fracb, scale );
-#endif
                     expb = sub( expb, scale );
 
                     tmp = div_s( fracb, fraca );
                     exp = sub( expb, expa );
-#ifdef BASOP_NOGLOB
                     Ltemp_fx = L_shl_o( tmp, add( exp, 14 ), &Overflow );
-#else
-                    Ltemp_fx = L_shl( tmp, add( exp, 14 ) );
-#endif
                     /*-------------------------------------------*/
                     sp_hb_enratio_fx = L_add( Ltemp_fx, 0 ); /* Q29 */
                 }
@@ -778,11 +754,11 @@ ivas_error ppp_voiced_encoder_fx(
                     sp_hb_enratio_fx = L_deposit_l( 0 );
                 }
                 low_band_en_fx = Ltemp2; /*Q13 */
-
+                move32();
                 /* if ( low_band_en < 25.0f && sp_hb_enratio < 1.6f ) */
                 /* 25.0 in Q13 = 204800, 1.6 in Q29 = 858993459 */
                 test();
-                IF( LT_32( low_band_en_fx, 204800 ) && LT_32( sp_hb_enratio_fx, 858993459 ) )
+                if ( LT_32( low_band_en_fx, 204800 ) && LT_32( sp_hb_enratio_fx, 858993459 ) )
                 {
                     PPP_MODE_E = 'B';
                     move16();
@@ -790,21 +766,14 @@ ivas_error ppp_voiced_encoder_fx(
             }
 
             Ltmp_32 = DTFS_getEngy_fx( CURRP_NQ_FX ); /*Q = 2*(CURRP_NQ_FX->Q) */
+            move32();
             Qadj = sub( hSC_VBR->Q_prev_cw_en_fx, shl( CURRP_NQ_FX->Q, 1 ) );
 
-#ifdef BASOP_NOGLOB
             Ltmp_32 = L_shl_o( Ltmp_32, Qadj, &Overflow ); /* shift left required to adjust Q of CURRP_NQ_FX = Q_prev_cw_en_fx */
-#else
-            Ltmp_32 = L_shl( Ltmp_32, Qadj );                                 /* shift left required to adjust Q of CURRP_NQ_FX = Q_prev_cw_en_fx */
-#endif
             /* Ltmp1_32 = 0.8f * st->prev_cw_en */
             Ltmp1_32 = Mult_32_16( hSC_VBR->prev_cw_en_fx, 26214 ); /* Q = (Q_prev_cw_en_fx + Q15+1)-Q16 = Q_prev_cw_en_fx */
 
-#ifdef BASOP_NOGLOB
             IF( LT_16( shl_o( hSC_VBR->vadsnr_fx, 1, &Overflow ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#else
-            IF( LT_16( shl( hSC_VBR->vadsnr_fx, 1 ), hSC_VBR->SNR_THLD_fx ) ) /*Q8  */
-#endif
             {
                 /* if ( DTFS_getEngy(*CURRP_NQ) > 0.8f * st->prev_cw_en && max(pos_nq, neg_nq) > 3.0f && st->rate_control ) */
                 /* pos_nq_fx and neg_nq_fx in Q28 ???? */
@@ -814,7 +783,7 @@ ivas_error ppp_voiced_encoder_fx(
                 {
                     /*if ( pos_nq > neg_nq && pos_nq > 2.0f * pos_q )  */
                     test();
-                    IF( GT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( pos_nq_fx, 16384 ), pos_q_fx ) )
+                    if ( GT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( pos_nq_fx, 16384 ), pos_q_fx ) )
                     {
                         PPP_MODE_E = 'B';
                         move16();
@@ -822,7 +791,7 @@ ivas_error ppp_voiced_encoder_fx(
 
                     test();
                     /*if ( pos_nq < neg_nq && neg_nq > 2.0f * neg_q ) */
-                    IF( LT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( neg_nq_fx, 16384 ), neg_q_fx ) )
+                    if ( LT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( neg_nq_fx, 16384 ), neg_q_fx ) )
                     {
                         PPP_MODE_E = 'B';
                         move16();
@@ -849,8 +818,8 @@ ivas_error ppp_voiced_encoder_fx(
                     test();
                     test();
                     test();
-                    IF( ( GT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( pos_nq_fx, 13107 ), pos_q_fx ) && ( hSC_VBR->rate_control ) ) ||
-                        ( GT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( pos_nq_fx, 16384 ), pos_q_fx ) && ( !hSC_VBR->rate_control ) ) )
+                    if ( ( GT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( pos_nq_fx, 13107 ), pos_q_fx ) && ( hSC_VBR->rate_control ) ) ||
+                         ( GT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( pos_nq_fx, 16384 ), pos_q_fx ) && ( !hSC_VBR->rate_control ) ) )
                     {
                         PPP_MODE_E = 'B';
                         move16();
@@ -863,8 +832,8 @@ ivas_error ppp_voiced_encoder_fx(
                     test();
                     test();
                     test();
-                    IF( ( LT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( neg_nq_fx, 13107 ), neg_q_fx ) && ( hSC_VBR->rate_control ) ) ||
-                        ( LT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( neg_nq_fx, 16384 ), neg_q_fx ) && ( !hSC_VBR->rate_control ) ) )
+                    if ( ( LT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( neg_nq_fx, 13107 ), neg_q_fx ) && ( hSC_VBR->rate_control ) ) ||
+                         ( LT_32( pos_nq_fx, neg_nq_fx ) && GT_32( Mult_32_16( neg_nq_fx, 16384 ), neg_q_fx ) && ( !hSC_VBR->rate_control ) ) )
                     {
                         PPP_MODE_E = 'B';
                         move16();
@@ -905,11 +874,7 @@ ivas_error ppp_voiced_encoder_fx(
                     /* compute energy of impz */
                     FOR( x_fx = 0; x_fx < 160; x_fx++ )
                     {
-#ifdef BASOP_NOGLOB
                         energy_impz_fx = L_add_o( energy_impz_fx, L_mult0( impzo_fx[x_fx], impzo_fx[x_fx] ), &Overflow );
-#else
-                        energy_impz_fx = L_add( energy_impz_fx, L_mult0( impzo_fx[x_fx], impzo_fx[x_fx] ) );
-#endif
                     }
 
                     /*energy_impz = (float)(10*log10((float)energy_impz)); */
@@ -921,27 +886,20 @@ ivas_error ppp_voiced_encoder_fx(
                     /* energy_impz_fx is Q11 */
 
                     Ltmp_32 = DTFS_getEngy_fx( CURRP_Q_E_FX ); /*Q = 2*(CURRP_Q_E_FX->Q) */
+                    move32();
                     Qadj = sub( hSC_VBR->Q_prev_cw_en_fx, shl( CURRP_Q_E_FX->Q, 1 ) );
-#ifdef BASOP_NOGLOB
                     Ltmp_32 = L_shl_o( Ltmp_32, Qadj, &Overflow ); /* shift left required to adjust Q of CURRP_Q_E_FX = Q_prev_cw_en_fx */
-#else
-                    Ltmp_32 = L_shl( Ltmp_32, Qadj ); /* shift left required to adjust Q of CURRP_Q_E_FX = Q_prev_cw_en_fx */
-#endif
                     /* if ((DTFS_getEngy(*CURRP_Q_E) > st->prev_cw_en)&&(max(pos_q,neg_q)>3.5) && energy_impz>15.0 && tmpres>0.7) */
                     test();
                     test();
                     test();
-#ifdef BASOP_NOGLOB
                     IF( ( GT_32( Ltmp_32, hSC_VBR->prev_cw_en_fx ) ) && ( GT_32( L_max( pos_q_fx, neg_q_fx ), 939524096 ) ) && ( GT_32( energy_impz_fx, 30720 ) ) && ( GT_32( Mult_32_16( tmpres_fx, 23265 ), shl_o( 1, sub( Qtmpres, 1 ), &Overflow ) ) ) )
-#else
-                    IF( ( GT_32( Ltmp_32, hSC_VBR->prev_cw_en_fx ) ) && ( GT_32( L_max( pos_q_fx, neg_q_fx ), 939524096 ) ) && ( GT_32( energy_impz_fx, 30720 ) ) && ( GT_32( Mult_32_16( tmpres_fx, 23265 ), shl( 1, sub( Qtmpres, 1 ) ) ) ) )
-#endif
                     {
                         /* if ((pos_q > neg_q) && ((pos_q>3.0*pos_nq0) || ((pos_q > 1.5*pos_nq0) && (neg_q < 1.5*neg_nq0)))) */
                         test();
                         test();
                         test();
-                        IF( ( GT_32( pos_q_fx, neg_q_fx ) ) && ( ( GT_32( Mult_32_16( pos_q_fx, 10923 ), L_shr( pos_nq0_fx, sub( Qposnq, 28 ) ) ) ) || ( ( GT_32( Mult_32_16( pos_q_fx, 21845 ), L_shr( pos_nq0_fx, sub( Qposnq, 28 ) ) ) ) && ( LT_32( Mult_32_16( neg_q_fx, 21846 ), L_shr( neg_nq0_fx, sub( Qnegnq, 28 ) ) ) ) ) ) )
+                        if ( ( GT_32( pos_q_fx, neg_q_fx ) ) && ( ( GT_32( Mult_32_16( pos_q_fx, 10923 ), L_shr( pos_nq0_fx, sub( Qposnq, 28 ) ) ) ) || ( ( GT_32( Mult_32_16( pos_q_fx, 21845 ), L_shr( pos_nq0_fx, sub( Qposnq, 28 ) ) ) ) && ( LT_32( Mult_32_16( neg_q_fx, 21846 ), L_shr( neg_nq0_fx, sub( Qnegnq, 28 ) ) ) ) ) ) )
                         /* 10923 = (1/3) oin Q15, pos_q_fx is Q28, so result of Mult_32_16(pos_q_fx,10923) = Q28 */
                         /* L_shr(pos_nq0_fx,sub(Qposnq,28)) brings pos_nq0_fx with variable Q to fixed Q28 */
                         {
@@ -952,7 +910,7 @@ ivas_error ppp_voiced_encoder_fx(
                         test();
                         test();
                         /* if ((pos_q <= neg_q) && ((neg_q>3.0*neg_nq0)|| ((neg_q > 1.5*neg_nq0) && (pos_q < 1.5*pos_nq0)))) */
-                        IF( ( LE_32( pos_q_fx, neg_q_fx ) ) && ( ( GT_32( Mult_32_16( neg_q_fx, 10923 ), L_shr( neg_nq0_fx, sub( Qnegnq, 28 ) ) ) ) || ( ( GT_32( Mult_32_16( neg_q_fx, 21846 ), L_shr( neg_nq0_fx, sub( Qnegnq, 28 ) ) ) ) && ( LT_32( Mult_32_16( pos_q_fx, 21846 ), L_shr( pos_nq0_fx, sub( Qposnq, 28 ) ) ) ) ) ) )
+                        if ( ( LE_32( pos_q_fx, neg_q_fx ) ) && ( ( GT_32( Mult_32_16( neg_q_fx, 10923 ), L_shr( neg_nq0_fx, sub( Qnegnq, 28 ) ) ) ) || ( ( GT_32( Mult_32_16( neg_q_fx, 21846 ), L_shr( neg_nq0_fx, sub( Qnegnq, 28 ) ) ) ) && ( LT_32( Mult_32_16( pos_q_fx, 21846 ), L_shr( pos_nq0_fx, sub( Qposnq, 28 ) ) ) ) ) ) )
                         {
                             PPP_MODE_E = 'B';
                             move16();
@@ -971,11 +929,13 @@ ivas_error ppp_voiced_encoder_fx(
             /* operate in ADR mode only the rate control is active. This adds some bumpups to improve the speech quality */
             /* if ((DTFS_getEngy_band(*TMPDTFS, 1500.0, upper_cut_off_freq_of_interest)/DTFS_getEngy(*TMPDTFS) > 0.05)&&(!st->rate_control)) */
             Ltemp1 = DTFS_getEngy_band_fx( *TMPDTFS_FX, 1500, upper_cut_off_freq_of_interest_fx ); /* Q = 2*TMPDTFS_FX->Q*/
-            Ltemp2 = DTFS_getEngy_fx( TMPDTFS_FX );                                                /* Q = 2*TMPDTFS_FX->Q */
-
+            move32();
+            Ltemp2 = DTFS_getEngy_fx( TMPDTFS_FX ); /* Q = 2*TMPDTFS_FX->Q */
+            move32();
             IF( Ltemp2 == 0 )
             {
                 Ltemp_fx = 0;
+                move32();
             }
             ELSE
             {
@@ -990,13 +950,9 @@ ivas_error ppp_voiced_encoder_fx(
                 fracb = shl( fracb, scale );
                 expb = sub( expb, scale );
 
-                tmp = div_s( fracb, fraca ); /* tmp in Q15 */
-                exp = sub( expb, expa );     /* ans = tmp*2^(exp) */
-#ifdef BASOP_NOGLOB
+                tmp = div_s( fracb, fraca );                          /* tmp in Q15 */
+                exp = sub( expb, expa );                              /* ans = tmp*2^(exp) */
                 Ltemp_fx = L_shl_o( tmp, add( exp, 12 ), &Overflow ); /* make tmp Q27 */
-#else
-                Ltemp_fx = L_shl( tmp, add( exp, 12 ) );                      /* make tmp Q27 */
-#endif
             }
             test();
             IF( GT_32( Ltemp_fx, 6710886 ) && ( !hSC_VBR->rate_control ) ) /* 0.05 in Q27 = 6710886 */
@@ -1005,14 +961,16 @@ ivas_error ppp_voiced_encoder_fx(
                 /*DTFS_getEngy_band(*TMPDTFS3,1500.0,upper_cut_off_freq_of_interest)) < 0.1) */
 
                 Ltemp1 = DTFS_getEngy_band_fx( *TMPDTFS_FX, 1500, upper_cut_off_freq_of_interest_fx );
+                move32();
                 Ltemp2 = DTFS_getEngy_band_fx( *TMPDTFS3_FX, 1500, upper_cut_off_freq_of_interest_fx );
-
+                move32();
                 /*--------------------------------------------------------------*/
                 /* Ltemp_fx = (Word32)divide_dp(Ltemp1, Ltemp2, Qadj,1);//Q29+1 */
                 /*--------------------------------------------------------------*/
                 IF( Ltemp2 == 0 )
                 {
                     Ltemp_fx = 0;
+                    move32();
                 }
                 ELSE
                 {
@@ -1030,11 +988,7 @@ ivas_error ppp_voiced_encoder_fx(
 
                     tmp = div_s( fracb, fraca );
                     exp = sub( expb, expa );
-#ifdef BASOP_NOGLOB
                     Ltemp_fx = L_shl_o( tmp, add( exp, 14 ), &Overflow ); /* answer in Q29 */
-#else
-                    Ltemp_fx = L_shl( tmp, add( exp, 14 ) );                  /* answer in Q29 */
-#endif
                 }
                 /*-------------------------------------------*/
 
@@ -1057,9 +1011,10 @@ ivas_error ppp_voiced_encoder_fx(
 
             /* To increase bump up, raise first threshold, lower second  */
             /*tmp = (float)(10.0*log10(DTFS_getEngy(*TMPDTFS)/DTFS_getEngy(*TMPDTFS3)));*/
-            Lacc = DTFS_getEngy_P2A_fx( TMPDTFS_FX );   /* Q = 2*(TMPDTFS_FX->Q) */
+            Lacc = DTFS_getEngy_P2A_fx( TMPDTFS_FX ); /* Q = 2*(TMPDTFS_FX->Q) */
+            move32();
             Lacc1 = DTFS_getEngy_P2A_fx( TMPDTFS3_FX ); /* Q = 2*(TMPDTFS3_FX->Q) */
-
+            move32();
 
             sft = shl( sub( TMPDTFS_FX->Q, TMPDTFS3_FX->Q ), 1 ); /* to check if Lacc<=2*Lacc1 */
             flag1 = 0;
@@ -1100,12 +1055,8 @@ ivas_error ppp_voiced_encoder_fx(
                 L_tmp = L_shl( L_tmp, expa );
                 exp = sub( 30, add( expa, sub( 31, exp ) ) );
                 frac = Log2_norm_lc( L_tmp );
-                L_tmp = Mpy_32_16( exp, frac, 12330 ); /* L_tmp is always Q13 */
-#ifdef BASOP_NOGLOB
+                L_tmp = Mpy_32_16( exp, frac, 12330 );   /* L_tmp is always Q13 */
                 Ltemp = L_shl_o( L_tmp, 10, &Overflow ); /* Ltemp is always Q23 */
-#else
-                Ltemp = L_shl( L_tmp, 10 );                                   /* Ltemp is always Q23 */
-#endif
             }
             ELSE
             {
@@ -1119,11 +1070,7 @@ ivas_error ppp_voiced_encoder_fx(
                 move16();
             }
 
-#ifdef BASOP_NOGLOB
             IF( LT_16( shl_o( hSC_VBR->vadsnr_fx, 1, &Overflow ), hSC_VBR->SNR_THLD_fx ) ) /* Q8 */
-#else
-            IF( LT_16( shl( hSC_VBR->vadsnr_fx, 1 ), hSC_VBR->SNR_THLD_fx ) ) /* Q8 */
-#endif
             {
                 /* if ((( tmp < 3.05 && max(res_enratio,sp_enratio) > 0.8  ) && (st->rate_control))||
                        (( tmp < 2.8 && max(res_enratio,sp_enratio)  > 0.65 ) && (!st->rate_control))) */
@@ -1168,7 +1115,7 @@ ivas_error ppp_voiced_encoder_fx(
     ELSE
     {
     }
-    if ( PPP_MODE_E == 'B' )
+    IF( PPP_MODE_E == 'B' )
     {
         hSC_VBR->bump_up = 1;
         move16();
@@ -1184,10 +1131,12 @@ ivas_error ppp_voiced_encoder_fx(
     IF( hSC_VBR->Q_to_F )
     {
         hSC_VBR->patterncount = add( hSC_VBR->patterncount, hSC_VBR->pattern_m );
+        move16();
 
         IF( GE_16( hSC_VBR->patterncount, 1000 ) )
         {
             hSC_VBR->patterncount = sub( hSC_VBR->patterncount, 1000 );
+            move16();
             PPP_MODE_E = 'B';
             move16();
             hSC_VBR->bump_up = 1;
@@ -1207,7 +1156,7 @@ ivas_error ppp_voiced_encoder_fx(
     {
         Q_delta_lag = add( delta_lag_E, 11 ); /* to make it positive always */
 
-        push_indice_fx( hBstr, IND_DELTALAG, Q_delta_lag, 5 );
+        push_indice( hBstr, IND_DELTALAG, Q_delta_lag, 5 );
     }
 
     WIsyn_fx( *dtfs_temp_fx, CURRP_Q_E_FX, lpc2_fx, &( hSC_VBR->ph_offset_E_fx ), out_fx, L_FRAME, 0, S_fx, C_fx,
@@ -1216,8 +1165,9 @@ ivas_error ppp_voiced_encoder_fx(
 
     DTFS_copy_fx( dtfs_temp_fx, *CURRP_Q_E_FX );
     Lacc = DTFS_getEngy_P2A_fx( CURRP_NQ_FX );
+    move32();
     hSC_VBR->Q_prev_cw_en_fx = norm_l( Lacc );
-
+    move16();
     /* hSC_VBR->Q_prev_cw_en_fx = (Lacc==0)?31: hSC_VBR->Q_prev_cw_en_fx;move16(); */
     if ( Lacc == 0 )
     {
@@ -1226,7 +1176,9 @@ ivas_error ppp_voiced_encoder_fx(
     }
 
     hSC_VBR->prev_cw_en_fx = (Word32) L_shl( Lacc, hSC_VBR->Q_prev_cw_en_fx ); /*2Q+Q_prev_cw_en_fx */
+    move32();
     hSC_VBR->Q_prev_cw_en_fx = add( hSC_VBR->Q_prev_cw_en_fx, shl( CURRP_NQ_FX->Q, 1 ) );
+    move16();
     /* Copy DTFS related parameters from 'dtfs_temp' to 'st_fx' structure */
     hSC_VBR->dtfs_enc_lag = dtfs_temp_fx->lag_fx;
     move16();
@@ -1289,6 +1241,7 @@ static void synthesis_filter_fx( Word16 b[], Word16 x[], Word16 y[], Word16 buf[
     Word16 i, j;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     FOR( i = 0; i < N; i++ )
     {
@@ -1298,28 +1251,18 @@ static void synthesis_filter_fx( Word16 b[], Word16 x[], Word16 y[], Word16 buf[
         FOR( j = P - 1; j > 0; j-- )
         {
             /* acc = L_sub(acc, L_mult(memory[j], coef[j])); */
-#ifdef BASOP_NOGLOB
             acc = L_msu_o( acc, buf[j], b[j], &Overflow ); /*Q13 */
-#else
-            acc = L_msu( acc, buf[j], b[j] );                                 /*Q13 */
-#endif
             buf[j] = buf[j - 1];
             move16();
         }
         /* acc = L_sub(acc, L_mult(memory[0], coef[0])); */
-#ifdef BASOP_NOGLOB
         acc = L_msu_o( acc, buf[0], b[0], &Overflow );
         acc = L_shl_o( acc, 3, &Overflow );
 
         *y++ = round_fx_o( acc, &Overflow );
+        move16();
         buf[0] = round_fx_o( acc, &Overflow );
-#else
-        acc = L_msu( acc, buf[0], b[0] );
-        acc = L_shl( acc, 3 );
-
-        *y++ = round_fx( acc );
-        buf[0] = round_fx( acc );
-#endif
+        move16();
     }
 }
 /*==============================================================================*/
@@ -1364,6 +1307,7 @@ static Word32 DTFS_freq_corr_fx(
     Word16 Q_num, Q_den;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     IF( LT_16( X1_DTFS_fx.lag_fx, X2_DTFS_fx.lag_fx ) )
     {
@@ -1372,15 +1316,15 @@ static Word32 DTFS_freq_corr_fx(
 
     corr_fx = L_deposit_l( 0 );
 
-    L_lband = L_mult( lband, X2_DTFS_fx.lag_fx );
-    L_hband = L_mult( hband, X2_DTFS_fx.lag_fx );
+    L_lband = L_mult( lband, X2_DTFS_fx.lag_fx ); /* Q0 * Q0 -> Q1 */
+    L_hband = L_mult( hband, X2_DTFS_fx.lag_fx ); /* Q0 * Q0 -> Q1 */
     HalfLag = s_min( shr( X2_DTFS_fx.lag_fx, 1 ), X2_DTFS_fx.nH_4kHz_fx );
 
     /* get lband and hband */
     FOR( k = 0; k <= HalfLag; k++ )
     {
         freq_fx = L_mult( k, 12800 );
-        IF( GE_32( freq_fx, L_lband ) )
+        if ( GE_32( freq_fx, L_lband ) )
         {
             BREAK;
         }
@@ -1389,7 +1333,7 @@ static Word32 DTFS_freq_corr_fx(
     FOR( k = 0; k <= HalfLag; k++ )
     {
         freq_fx = L_mult( k, 12800 );
-        IF( GE_32( freq_fx, L_hband ) )
+        if ( GE_32( freq_fx, L_hband ) )
         {
             BREAK;
         }
@@ -1399,13 +1343,8 @@ static Word32 DTFS_freq_corr_fx(
 
     FOR( k = lk; k < hk; k++ )
     {
-#ifdef BASOP_NOGLOB
         corr_fx = L_mac0_o( corr_fx, X1_DTFS_fx.a_fx[k], X2_DTFS_fx.a_fx[k], &Overflow ); /*  Q(1) */
         corr_fx = L_mac0_o( corr_fx, X1_DTFS_fx.b_fx[k], X2_DTFS_fx.b_fx[k], &Overflow ); /*  Q(1) */
-#else
-        corr_fx = L_mac0( corr_fx, X1_DTFS_fx.a_fx[k], X2_DTFS_fx.a_fx[k] ); /*  Q(1) */
-        corr_fx = L_mac0( corr_fx, X1_DTFS_fx.b_fx[k], X2_DTFS_fx.b_fx[k] ); /*  Q(1) */
-#endif
     }
 
     Qr = norm_l( corr_fx );
@@ -1415,16 +1354,13 @@ static Word32 DTFS_freq_corr_fx(
         move16();
     }
 
-#ifdef BASOP_NOGLOB
     E1_fx = round_fx_o( L_shl_o( corr_fx, Qr, &Overflow ), &Overflow ); /*  Q(Qr-16) */
-#else
-    E1_fx = round_fx( L_shl( corr_fx, Qr ) );                                /*  Q(Qr-16) */
-#endif
-    Num = L_mult0( E1_fx, E1_fx ); /*  Q(2+2*Qr-32+1) */
+    Num = L_mult0( E1_fx, E1_fx );                                      /*  Q(2+2*Qr-32+1) */
     Q_num = sub( shl( add( add( X1_DTFS_fx.Q, X2_DTFS_fx.Q ), Qr ), 1 ), 32 );
 
     /*  PORTING: Handling the functions with variable no. of arguments */
     E_fx = DTFS_getEngy_band_fx( X1_DTFS_fx, lband, hband ); /*  Q(1) */
+    move32();
     q1 = norm_l( E_fx );
     if ( E_fx == 0 )
     {
@@ -1432,11 +1368,7 @@ static Word32 DTFS_freq_corr_fx(
         move16();
     }
 
-#ifdef BASOP_NOGLOB
     E1_fx = round_fx_o( L_shl_o( E_fx, q1, &Overflow ), &Overflow ); /*  Q(1+q1-16) */
-#else
-    E1_fx = round_fx( L_shl( E_fx, q1 ) );                                   /*  Q(1+q1-16) */
-#endif
     /*  PORTING: Handling the functions with variable no. of arguments */
     E_fx = DTFS_getEngy_band_fx( X2_DTFS_fx, lband, hband ); /*  Q(1) */
     q2 = norm_l( E_fx );
@@ -1446,12 +1378,8 @@ static Word32 DTFS_freq_corr_fx(
         move16();
     }
 
-#ifdef BASOP_NOGLOB
     E2_fx = round_fx_o( L_shl_o( E_fx, q2, &Overflow ), &Overflow ); /*  Q(1+q2-16) */
-#else
-    E2_fx = round_fx( L_shl( E_fx, q2 ) );                                   /*  Q(1+q2-16) */
-#endif
-    Den = L_mult0( E1_fx, E2_fx ); /*  Q(2+q1+q2-32+1) */
+    Den = L_mult0( E1_fx, E2_fx );                                   /*  Q(2+q1+q2-32+1) */
     Q_den = sub( add( shl( add( X2_DTFS_fx.Q, X1_DTFS_fx.Q ), 1 ), add( q1, q2 ) ), 32 );
 
     Num = L_max( Num, 1 );
@@ -1459,35 +1387,25 @@ static Word32 DTFS_freq_corr_fx(
     IF( Num == 0 )
     {
         Result = 0;
+        move32();
         *Qout = 31;
+        move16();
     }
     ELSE
     {
 
         expa = norm_l( Num );
-#ifdef BASOP_NOGLOB
         fraca = extract_h( L_shl_o( Num, expa, &Overflow ) );
-#else
-        fraca = extract_h( L_shl( Num, expa ) );
-#endif
         expa = sub( 30, add( expa, Q_num ) );
 
 
         expb = norm_l( Den );
-#ifdef BASOP_NOGLOB
         fracb = round_fx_o( L_shl_o( Den, expb, &Overflow ), &Overflow );
-#else
-        fracb = round_fx( L_shl( Den, expb ) );
-#endif
         expb = sub( 30, add( expb, Q_den ) );
 
 
         scale = shr( sub( fraca, fracb ), 15 );
-#ifdef BASOP_NOGLOB
         fracb = shl_o( fracb, scale, &Overflow );
-#else
-        fracb = shl( fracb, scale );
-#endif
         expb = sub( expb, scale );
 
         tmp = div_s( fracb, fraca );
@@ -1503,6 +1421,7 @@ static Word32 DTFS_freq_corr_fx(
             Result = L_negate( L_tmp );
         }
         *Qout = sub( 30, exp );
+        move16();
     }
     return Result;
 }
@@ -1532,6 +1451,7 @@ static Word16 DTFS_alignment_extract_td_fx( Word16 *x1, Word16 *x2, Word16 lag )
     Word32 maxcorr, corr;
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
     maxcorr = L_add( MIN_32, 0 );
     Adiff_fx = (Word16) ( s_max( 4, shr( lag, 3 ) ) );
@@ -1543,13 +1463,9 @@ static Word16 DTFS_alignment_extract_td_fx( Word16 *x1, Word16 *x2, Word16 lag )
         corr = L_deposit_l( 0 );
         FOR( k = 0; k < lag; k++ )
         {
-#ifdef BASOP_NOGLOB
             corr = L_mac_o( corr, x1[k], x2[( k - j + lag ) % lag], &Overflow );
-#else
-            corr = L_mac( corr, x1[k], x2[( k - j + lag ) % lag] );
-#endif
         }
-        if ( GT_32( corr, maxcorr ) )
+        IF( GT_32( corr, maxcorr ) )
         {
             idx = j;
             move16();
@@ -1589,17 +1505,19 @@ static Word32 DTFS_getEngy_band_fx(
     Word16 k, lk, hk, HalfLag;
     Word32 freq_fx, L_lband, L_hband;
     Word32 en_fx = 0;
+    move32();
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
+    move32();
 #endif
-    L_lband = L_mult( lband, X_fx.lag_fx );
-    L_hband = L_mult( hband, X_fx.lag_fx );
+    L_lband = L_mult( lband, X_fx.lag_fx ); /* Q0 * Q0 -> Q1 */
+    L_hband = L_mult( hband, X_fx.lag_fx ); /* Q0 * Q0 -> Q1 */
     HalfLag = s_min( shr( sub( X_fx.lag_fx, 1 ), 1 ), X_fx.nH_4kHz_fx );
     /* get lband and hband */
     FOR( k = 1; k <= HalfLag; k++ )
     {
         freq_fx = L_mult( k, 12800 );
-        IF( GE_32( freq_fx, L_lband ) )
+        if ( GE_32( freq_fx, L_lband ) )
         {
             BREAK;
         }
@@ -1609,7 +1527,7 @@ static Word32 DTFS_getEngy_band_fx(
     FOR( k = 1; k <= HalfLag; k++ )
     {
         freq_fx = L_mult( k, 12800 );
-        IF( GE_32( freq_fx, L_hband ) )
+        if ( GE_32( freq_fx, L_hband ) )
         {
             BREAK;
         }
@@ -1619,13 +1537,8 @@ static Word32 DTFS_getEngy_band_fx(
 
     FOR( k = lk; k < hk; k++ )
     {
-#ifdef BASOP_NOGLOB
         en_fx = L_mac0_o( en_fx, X_fx.a_fx[k], X_fx.a_fx[k], &Overflow ); /*  2*X1.Q+1 */
         en_fx = L_mac0_o( en_fx, X_fx.b_fx[k], X_fx.b_fx[k], &Overflow );
-#else
-        en_fx = L_mac0( en_fx, X_fx.a_fx[k], X_fx.a_fx[k] ); /*  2*X1.Q+1 */
-        en_fx = L_mac0( en_fx, X_fx.b_fx[k], X_fx.b_fx[k] );
-#endif
     }
 
     if ( lband == 0 )
@@ -1637,13 +1550,8 @@ static Word32 DTFS_getEngy_band_fx(
     test();
     IF( ( s_and( X_fx.lag_fx, 1 ) == 0 ) && ( hband == X_fx.upper_cut_off_freq_fx ) )
     {
-#ifdef BASOP_NOGLOB
         en_fx = L_mac0_o( en_fx, X_fx.a_fx[k], X_fx.a_fx[k], &Overflow );
         en_fx = L_mac0_o( en_fx, X_fx.b_fx[k], X_fx.b_fx[k], &Overflow );
-#else
-        en_fx = L_mac0( en_fx, X_fx.a_fx[k], X_fx.a_fx[k] );
-        en_fx = L_mac0( en_fx, X_fx.b_fx[k], X_fx.b_fx[k] );
-#endif
     }
 
     return en_fx; /*  2*X1.Q */
@@ -1688,10 +1596,13 @@ void sc_vbr_enc_init_fx(
     hSC_VBR->Q_to_F = 0;
     move16();
 
-    hSC_VBR->numactive = 0;          /* keep the count of the frames inside current 600 frame bloack.*/
-    hSC_VBR->sum_of_rates_fx = 0;    /* sum of the rates of past 600 active frames*/
+    hSC_VBR->numactive = 0; /* keep the count of the frames inside current 600 frame bloack.*/
+    move16();
+    hSC_VBR->sum_of_rates_fx = 0; /* sum of the rates of past 600 active frames*/
+    move32();
     hSC_VBR->global_avr_rate_fx = 0; /* global rate upto current time. recorded a (rate in kbps) *6000*/
-    hSC_VBR->global_frame_cnt = 0;   /* 600 active frame block count. Used to update the global rate*/
+    move32();
+    hSC_VBR->global_frame_cnt = 0; /* 600 active frame block count. Used to update the global rate*/
     move16();
     hSC_VBR->rate_control = 0;
     move16();
@@ -1703,10 +1614,11 @@ void sc_vbr_enc_init_fx(
     hSC_VBR->vbr_generic_ho = 0;
     move16();
     hSC_VBR->Local_VAD = 0;
-
+    move16();
     hSC_VBR->Last_Resort = 0;
+    move16();
     hSC_VBR->set_ppp_generic = 0;
-
+    move16();
     hSC_VBR->last_7k2_coder_type = GENERIC;
     move16();
 
diff --git a/lib_enc/waveadjust_fec_cod.c b/lib_enc/waveadjust_fec_cod.c
deleted file mode 100644
index 825401325748d89d4db5894372ff8dd2e53d76ec..0000000000000000000000000000000000000000
--- a/lib_enc/waveadjust_fec_cod.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************************************
-
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-
-*******************************************************************************************************/
-
-/*====================================================================================
-    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
-  ====================================================================================*/
-
-#include <stdint.h>
-#include "options.h"
-#include <math.h>
-#include "prot.h"
-#include "wmc_auto.h"
diff --git a/lib_enc/waveadjust_fec_cod_fx.c b/lib_enc/waveadjust_fec_cod_fx.c
index 378898522fefbf0ed6ee27e78f76e00a9e7db40a..f10a1bd0b2d1fff339dc2c8f93ef7ffdbbee9067 100644
--- a/lib_enc/waveadjust_fec_cod_fx.c
+++ b/lib_enc/waveadjust_fec_cod_fx.c
@@ -18,7 +18,10 @@
  *
  *--------------------------------------------------------------------*/
 
-Word32 SFM_Cal_fx( Word32 magn[], Word16 n )
+Word32 SFM_Cal_fx(
+    Word32 magn[], /*Q = Qx*/
+    Word16 n       /*Q = Q0*/
+)
 {
     /* Counted Dymamic RAM: 16 words */
     Word32 logCurFlatness;
@@ -38,11 +41,7 @@ Word32 SFM_Cal_fx( Word32 magn[], Word16 n )
         /* sum(log2(magn(i))) */
         sumLogMagn = L_add( sumLogMagn, logMagn ); /* Q8 */
 
-#ifdef BASOP_NOGLOB
-        sumMagn = L_add_sat( sumMagn, magn_abs );
-#else
-        sumMagn = L_add( sumMagn, magn_abs );
-#endif
+        sumMagn = L_add_sat( sumMagn, magn_abs ); /*Qx*/
     }
 
     IF( EQ_32( sumMagn, MAX_32 ) )
@@ -50,7 +49,7 @@ Word32 SFM_Cal_fx( Word32 magn[], Word16 n )
         sumMagn = L_deposit_l( 0 );
         FOR( i = 0; i < n; i++ )
         {
-            magn_abs = L_shr( L_abs( magn[i] ), 8 );
+            magn_abs = L_shr( L_abs( magn[i] ), 8 ); /* Qx-8 */
             sumMagn = L_add( sumMagn, magn_abs );
         }
         /* log2(sumMagn) */
@@ -78,7 +77,6 @@ Word32 SFM_Cal_fx( Word32 magn[], Word16 n )
     logCurFlatness = L_deposit_l( div_l( L_shl( logMagn, 1 ), n ) );
     frac = L_and( logCurFlatness, 0xFF );
     norm_value = (Word16) L_shr( logCurFlatness, 8 );
-    move16();
 
     logCurFlatness = L_sub( kExp2TableFrac_x[frac], 33 );
     logCurFlatness = L_shl( logCurFlatness, sub( 16, norm_value ) ); /* Q31 */
diff --git a/lib_rend/ivas_allrad_dec.c b/lib_rend/ivas_allrad_dec_fx.c
similarity index 98%
rename from lib_rend/ivas_allrad_dec.c
rename to lib_rend/ivas_allrad_dec_fx.c
index 193648a4e23bbda8f5ef9f3a994d7ea1f1f829c0..5023bee34db1aafdbf965096cbbc3722f62ec191 100644
--- a/lib_rend/ivas_allrad_dec.c
+++ b/lib_rend/ivas_allrad_dec_fx.c
@@ -1,7 +1,7 @@
 
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,9 +35,8 @@
 #include "options.h"
 #include <math.h>
 #include <assert.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_rend.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend_fx.c
similarity index 99%
rename from lib_rend/ivas_crend.c
rename to lib_rend/ivas_crend_fx.c
index d8cfec1d133dbcce6d623e7edda4b0229afb9811..36d18f85924d04ad55ab1adc432bb5ac32156991 100644
--- a/lib_rend/ivas_crend.c
+++ b/lib_rend/ivas_crend_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,15 +33,13 @@
 #include <stdint.h>
 #include <math.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_rend.h"
 #include "ivas_rom_binaural_crend_head.h"
 #include "ivas_stat_rend.h"
 #include "lib_rend.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "wmc_auto.h"
 #ifdef DEBUGGING
@@ -1854,8 +1852,8 @@ static ivas_error ivas_rend_crendConvolver(
 
                     FOR( k = 0; k < pCrend->hHrtfCrend->pIndex_frequency_max[i][j][m]; k++ )
                     {
-                        tmp_out_re[k] = L_add( L_shl( Msub_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_re[k] ), pFreq_buf_im[k], pFreq_filt_im[k] ), 2 ), tmp_out_re[k] ); // Qx
-                        tmp_out_im[k] = L_add( L_shl( Madd_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_im[k] ), pFreq_buf_im[k], pFreq_filt_re[k] ), 2 ), tmp_out_im[k] ); // Qx
+                        tmp_out_re[k] = L_add( Msub_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_re[k] ), pFreq_buf_im[k], pFreq_filt_im[k] ), tmp_out_re[k] ); // Qx - 2
+                        tmp_out_im[k] = L_add( Madd_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_im[k] ), pFreq_buf_im[k], pFreq_filt_re[k] ), tmp_out_im[k] ); // Qx - 2
                         move32();
                         move32();
                     }
@@ -1879,8 +1877,8 @@ static ivas_error ivas_rend_crendConvolver(
             pFreq_filt_im = &pCrend->hHrtfCrend->pOut_to_bin_diffuse_im_fx[j][offset]; // Q31
             FOR( k = 0; k < pCrend->hHrtfCrend->pIndex_frequency_max_diffuse[j][m]; k++ )
             {
-                tmp_out_re[k] = L_add( Msub_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_re[k] ), pFreq_buf_im[k], pFreq_filt_im[k] ), tmp_out_re[k] ); // Qx
-                tmp_out_im[k] = L_add( Madd_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_im[k] ), pFreq_buf_im[k], pFreq_filt_re[k] ), tmp_out_im[k] ); // Qx
+                tmp_out_re[k] = L_add( L_shr( Msub_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_re[k] ), pFreq_buf_im[k], pFreq_filt_im[k] ), 2 ), tmp_out_re[k] ); // Qx - 2
+                tmp_out_im[k] = L_add( L_shr( Madd_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_im[k] ), pFreq_buf_im[k], pFreq_filt_re[k] ), 2 ), tmp_out_im[k] ); // Qx - 2
                 move32();
                 move32();
             }
@@ -1888,7 +1886,7 @@ static ivas_error ivas_rend_crendConvolver(
         }
 
         ivas_imdft_fx( tmp_out_re, tmp_out_im, pOut, subframe_length );
-
+        scale_sig32( pOut, shl( subframe_length, 1 ), 2 );
 #ifdef DEBUGGING
         dbgwrite_txt( (const float *) pOut, subframe_length << 1, "Fixed_imdft_out.txt", NULL );
 #endif
diff --git a/lib_rend/ivas_dirac_ana.c b/lib_rend/ivas_dirac_ana_fx.c
similarity index 98%
rename from lib_rend/ivas_dirac_ana.c
rename to lib_rend/ivas_dirac_ana_fx.c
index f2bc10e6adb03b388bf941bf349c2f33964b92b6..c2430d008f8f644170650776b450055cffa1c46b 100644
--- a/lib_rend/ivas_dirac_ana.c
+++ b/lib_rend/ivas_dirac_ana_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,13 +33,11 @@
 #include "options.h"
 #include <stdlib.h>
 #include "ivas_cnst.h"
-#include "ivas_prot_rend.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "ivas_prot_rend_fx.h"
+#include "prot_fx.h"
 #include "ivas_stat_rend.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------------
@@ -109,7 +107,7 @@ ivas_error ivas_dirac_ana_open_fx(
     move16();
     FOR( i = 0; i < hDirAC->num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( hDirAC->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hDirAC->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -580,7 +578,11 @@ static void ivas_dirac_dmx_fx(
         v_add_fx( data_in_fx[0], data_in_fx[1], data_out_fx[0], input_frame );
         v_multc_fixed( data_out_fx[0], ONE_IN_Q30, data_out_fx[0], input_frame ); // ONE_IN_Q30 = 0.5* ONE_IN_Q31
 
+#ifdef VEC_ARITH_OPT_v1
+        v_sub_fixed_no_hdrm( data_in_fx[0], data_in_fx[1], data_out_fx[1], input_frame );
+#else  /* VEC_ARITH_OPT_v1 */
         v_sub_fixed( data_in_fx[0], data_in_fx[1], data_out_fx[1], input_frame, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
         v_multc_fixed( data_out_fx[1], ONE_IN_Q30, data_out_fx[1], input_frame );
 
         FOR( i = 0; i < nchan_transport; i++ )
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
similarity index 92%
rename from lib_rend/ivas_dirac_dec_binaural_functions.c
rename to lib_rend/ivas_dirac_dec_binaural_functions_fx.c
index 204ba19967d227778b32b82e54fda3d659f163be..9ea964bcb233b6a05971e211527806f58a79a9f0 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-    (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+    (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
     Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
     Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
     Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,13 +31,11 @@
 *******************************************************************************************************/
 
 #include <stdint.h>
+#include "options.h"
 #include <assert.h>
 #include <math.h>
-#include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_binauralRenderer.h"
 #include "ivas_rom_binaural_crend_head.h"
@@ -72,16 +70,18 @@ Word16 slot_fx[4] = { 32767, 16384, 10922, 8192 };
 #define LOG_10_BASE_2_Q29          1783446528 // Q29
 #define TAN_30_FX                  17157      // Q15
 #define INV_TAN30_FX               28377      // Q14
-#define EPSILON_MANT               1180591621 /* 1e-12 in Q70 */
+#define EPSILON_MANT               1180591621 /* 1e-12 = 0.5497558*(2^-39) in Q70 */
 #define EPSILON_EXP                ( -39 )
+#define ONE_DIV_EPSILON_MANT       1953125000 /* 1e+12 = 0.9094947*(2^40) */
+#define ONE_DIV_EPSILON_EXP        ( 40 )
 #define ADAPT_HTPROTO_ROT_LIM_1    0.8f
 
 #define MAX_GAIN_CACHE_SIZE ( ( MASA_MAXIMUM_DIRECTIONS * 3 ) + MAX_NUM_OBJECTS ) /* == different calls to get gains */
 
 typedef struct hrtfGainCache
 {
-    int16_t azi;
-    int16_t ele;
+    Word16 azi;
+    Word16 ele;
 
     Word32 shVec_fx[HRTF_SH_CHANNELS];
 
@@ -89,13 +89,13 @@ typedef struct hrtfGainCache
 
 typedef struct parambin_rend_config_data
 {
-    int16_t separateCenterChannelRendering;
+    Word16 separateCenterChannelRendering;
     IVAS_FORMAT ivas_format;
     MC_MODE mc_mode;
-    int32_t ivas_total_brate;
-    int16_t nchan_transport;
+    Word32 ivas_total_brate;
+    Word16 nchan_transport;
     Word32 qualityBasedSmFactor_fx; /* Q31 */
-    int16_t processReverb;
+    Word16 processReverb;
     ISM_MODE ism_mode;
 } PARAMBIN_REND_CONFIG, *PARAMBIN_REND_CONFIG_HANDLE;
 
@@ -110,7 +110,7 @@ static void ivas_dirac_dec_decorrelate_slot_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBi
 
 static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, PARAMBIN_REND_CONFIG_HANDLE hConfig, Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q*/, Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q*/, Word32 Rmat_fx[3][3] /*Q30*/, const Word16 subframe, const Word16 isHeadtracked, const MASA_ISM_DATA_HANDLE hMasaIsmData, Word16 q );
 
-static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, PARAMBIN_REND_CONFIG_HANDLE hConfig, const int16_t max_band_decorr, Word32 Rmat[3][3] /*Q30*/, const Word16 subframe, const Word16 isHeadtracked, const Word16 nchanSeparateChannels, const MASA_ISM_DATA_HANDLE hMasaIsmData );
+static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, PARAMBIN_REND_CONFIG_HANDLE hConfig, const Word16 max_band_decorr, Word32 Rmat[3][3] /*Q30*/, const Word16 subframe, const Word16 isHeadtracked, const Word16 nchanSeparateChannels, const MASA_ISM_DATA_HANDLE hMasaIsmData );
 
 static void ivas_dirac_dec_binaural_process_output_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, HANDLE_CLDFB_FILTER_BANK cldfbSynDec[MAX_OUTPUT_CHANNELS], Word32 *output_fx[] /*q_out*/, Word16 *q_out, Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q_inp*/, Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q_inp*/, const Word16 q_inp, const Word16 max_band_decorr, const Word16 numInChannels, const Word16 processReverb, const Word16 subframe, const Word16 q_mat );
 
@@ -126,7 +126,18 @@ static void formulate2x2MixingMatrix_fx( Word32 Ein1_fx /*q_Ein*/, Word32 Ein2_f
 
 static void matrixMul_fx( Word32 Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word32 Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word16 *q_A, Word32 Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word32 Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word16 *q_B, Word32 outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word16 *q_out );
 
-static void matrixTransp2Mul_fx( Word32 Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word32 Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word16 *q_A, Word32 Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word32 Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word16 *q_B, Word32 outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word16 *q_out );
+static void matrixTransp2Mul_fx(
+    Word32 Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/,
+    Word32 Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/,
+    Word16 *q_A,
+    Word32 Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/,
+    Word32 Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/,
+    Word16 *q_B,
+    Word32 Ascale,
+    Word32 Bscale,
+    Word32 outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/,
+    Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/,
+    Word16 *q_out );
 
 /*-------------------------------------------------------------------------
  * ivas_dirac_dec_init_binaural_data()
@@ -747,6 +758,9 @@ static void ivas_dirac_dec_binaural_internal_fx(
                                                           ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 ) && ( st_ivas->hSCE[0]->hCoreCoder[0]->cng_type == FD_CNG ) && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag,
                                                           0, &q_cldfb[1][slot] );
 
+                    scale_sig32( Cldfb_RealBuffer_in_fx[1][slot], CLDFB_NO_CHANNELS_MAX, negate( add( sub( q_cldfb[1][slot], q_input ), 5 ) ) );
+                    scale_sig32( Cldfb_ImagBuffer_in_fx[1][slot], CLDFB_NO_CHANNELS_MAX, negate( add( sub( q_cldfb[1][slot], q_input ), 5 ) ) );
+
                     /* LB: Copy first channel + LB-CNG to first and second channels with same scaling (dual-mono)*/
                     FOR( b = 0; b < numCoreBands; b++ )
                     {
@@ -798,15 +812,27 @@ static void ivas_dirac_dec_binaural_internal_fx(
 
         IF( hDiracDecBin->useTdDecorr )
         {
+            Word32 tmp_arr[60];
             FOR( ch = BINAURAL_CHANNELS; ch < ( 2 * BINAURAL_CHANNELS ); ch++ )
             {
-                q_cldfb[ch][slot] = q_input;
+                q_cldfb[ch][slot] = sub( q_input, 1 );
+                move16();
+
+                Copy_Scale_sig32( &( st_ivas->hTcBuffer->tc_fx[ch][nBins * slot + offsetSamples] ), tmp_arr, 60, -1 );
+                scale_sig32( st_ivas->cldfbAnaDec[ch]->cldfb_state_fx, sub( st_ivas->cldfbAnaDec[ch]->p_filter_length, st_ivas->cldfbAnaDec[ch]->no_channels ), sub( sub( q_input, 1 ), st_ivas->cldfbAnaDec[ch]->Q_cldfb_state ) );
+                st_ivas->cldfbAnaDec[ch]->Q_cldfb_state = sub( q_input, 1 );
                 move16();
+
                 cldfbAnalysis_ts_fx_fixed_q(
-                    &( st_ivas->hTcBuffer->tc_fx[ch][nBins * slot + offsetSamples] ),
+                    tmp_arr,
                     Cldfb_RealBuffer_in_fx[ch][slot],
                     Cldfb_ImagBuffer_in_fx[ch][slot],
                     nBins, st_ivas->cldfbAnaDec[ch], &q_cldfb[ch][slot] );
+
+                scale_sig32( st_ivas->cldfbAnaDec[ch]->cldfb_state_fx, sub( st_ivas->cldfbAnaDec[ch]->p_filter_length, st_ivas->cldfbAnaDec[ch]->no_channels ), sub( q_input, st_ivas->cldfbAnaDec[ch]->Q_cldfb_state ) );
+                st_ivas->cldfbAnaDec[ch]->Q_cldfb_state = q_input;
+                move16();
+
                 test();
                 test();
                 IF( EQ_16( config_data.nchan_transport, 1 ) &&
@@ -847,6 +873,8 @@ static void ivas_dirac_dec_binaural_internal_fx(
         {
             scale_sig32( Cldfb_RealBuffer_in_fx[cha][slot], 60, sub( q_inp, q_cldfb[cha][slot] ) ); // Q6
             scale_sig32( Cldfb_ImagBuffer_in_fx[cha][slot], 60, sub( q_inp, q_cldfb[cha][slot] ) ); // Q6
+            q_cldfb[cha][slot] = 6;
+            move16();
         }
     }
 
@@ -878,8 +906,7 @@ static void ivas_dirac_dec_binaural_internal_fx(
     }
 
     test();
-    ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices_fx( hDiracDecBin, hSpatParamRendCom, &config_data, Cldfb_RealBuffer_in_fx, Cldfb_ImagBuffer_in_fx, Rmat_fx, subframe,
-                                                                               hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[hCombinedOrientationData->subframe_idx] > 0, st_ivas->hMasaIsmData, q_inp );
+    ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices_fx( hDiracDecBin, hSpatParamRendCom, &config_data, Cldfb_RealBuffer_in_fx, Cldfb_ImagBuffer_in_fx, Rmat_fx, subframe, hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[hCombinedOrientationData->subframe_idx] > 0, st_ivas->hMasaIsmData, q_inp );
 
     IF( EQ_32( config_data.ivas_format, ISM_FORMAT ) )
     {
@@ -917,8 +944,7 @@ static void ivas_dirac_dec_binaural_internal_fx(
         move16();
     }
 
-    ivas_dirac_dec_binaural_determine_processing_matrices_fx( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_fx, subframe,
-                                                              hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[hCombinedOrientationData->subframe_idx] > 0, nchanSeparateChannels, st_ivas->hMasaIsmData );
+    ivas_dirac_dec_binaural_determine_processing_matrices_fx( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_fx, subframe, hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[hCombinedOrientationData->subframe_idx] > 0, nchanSeparateChannels, st_ivas->hMasaIsmData );
 
     q_inp = Q6;
     move16();
@@ -1239,12 +1265,14 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric
                 temp64 = W_add( W_mult0_32_32( tempRe, tempRe ), W_mult0_32_32( tempIm, tempIm ) ); // 2q
                 exp1 = W_norm( temp64 );
                 temp64 = W_shl( temp64, exp1 ); // 2q + exp1
-                subFrameSumEne_fx[bin] = BASOP_Util_Add_Mant32Exp( subFrameSumEne_fx[bin], subFrameTotalEne_e[bin], W_extract_h( temp64 ), sub( exp /* 63 - 2q */, exp1 ) /*31 - (2q + exp1 - 32)*/, &subFrameTotalEne_e[bin] );
+                subFrameSumEne_fx[bin] = BASOP_Util_Add_Mant32Exp( subFrameSumEne_fx[bin], subFrameSumEne_e[bin], W_extract_h( temp64 ), sub( exp /* 63 - 2q */, exp1 ) /*31 - (2q + exp1 - 32)*/, &subFrameSumEne_e[bin] );
                 move32();
             }
         }
         FOR( bin = 0; bin < nBins; bin++ )
         {
+            subFrameTotalEne_e[bin] = sub( subFrameTotalEne_e[bin], 1 );
+            move16();
             temp = L_shl_sat( subFrameTotalEne_fx[bin], sub( subFrameTotalEne_e[bin], subFrameSumEne_e[bin] ) ); // subFrameSumEne_e[bin]
             IF( GT_32( subFrameSumEne_fx[bin], temp ) )
             {
@@ -1632,7 +1660,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric
         move32();
 
         /* Formulate average diffuseness over frame */
-        frameMeanDiffuseness = BASOP_Util_Divide3232_Scale_cadence( frameMeanDiffuseness, L_max( EPSILLON_FX, frameMeanDiffusenessEneWeight_fx[bin] ), &exp ); // exp = exp + 31 - q_meanEnePerCh - exp1
+        frameMeanDiffuseness = BASOP_Util_Divide3232_Scale_newton( frameMeanDiffuseness, L_max( EPSILLON_FX, frameMeanDiffusenessEneWeight_fx[bin] ), &exp ); // exp = exp + 31 - q_meanEnePerCh - exp1
         exp = sub( exp, sub( sub( 31, q_meanEnePerCh ), exp1 ) );
         hDiracDecBin->frameMeanDiffuseness_fx[bin] = L_shl( frameMeanDiffuseness, sub( exp, 2 ) ); // Q29
         move32();
@@ -1664,7 +1692,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric
         move16();
         den = BASOP_Util_Add_Mant32Exp( hDiracDecBin->ChEnePrev_fx[0][bin], hDiracDecBin->ChEnePrev_e[0][bin], hDiracDecBin->ChEnePrev_fx[1][bin], hDiracDecBin->ChEnePrev_e[1][bin], &den_e );
         den = L_max( 1, den );
-        IIReneLimiter_fx = BASOP_Util_Divide3232_Scale_cadence( num, den, &exp );
+        IIReneLimiter_fx = BASOP_Util_Divide3232_Scale_newton( num, den, &exp );
         exp = add( sub( num_e, den_e ), add( 5, exp ) );
         IF( L_shr_sat( IIReneLimiter_fx, sub( 31, exp ) ) > 0 )
         {
@@ -1940,7 +1968,11 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx(
 
         /* Make matrix multiplication M*Cx*M' to determine resulting covariance matrix of processing input with M */
         matrixMul_fx( Mre_fx, Mim_fx, &q_M, CxRe_fx, CxIm_fx, &q_Cx, tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp );
-        matrixTransp2Mul_fx( tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp, Mre_fx, Mim_fx, &q_M, resultMtxRe_fx, resultMtxIm_fx, &q_res );
+        matrixTransp2Mul_fx(
+            tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp, Mre_fx, Mim_fx, &q_M,
+            1 /*int Ascale*/,
+            0 /*int Bscale*/,
+            resultMtxRe_fx, resultMtxIm_fx, &q_res );
 
         /* When below the frequency limit where decorrelation is applied, we inject the decorrelated
          * residual (or missing) signal component. The procedure is active when there are not enough independent
@@ -2066,6 +2098,21 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx(
         exp = sub( get_min_scalefactor( resultMtxRe_fx[0][0], resultMtxRe_fx[1][1] ), 2 );
         tmp2 = L_add( L_shl( resultMtxRe_fx[0][0], exp ), L_shl( resultMtxRe_fx[1][1], exp ) );
         q_tmp2 = add( q_res, exp );
+
+        /*Limiting value to Q63*/
+        IF( GT_16( q_tmp2, 63 ) )
+        {
+            tmp2 = L_shl( tmp2, sub( 63, q_tmp2 ) );
+            q_tmp2 = 63;
+            move16();
+            IF( EQ_32( tmp2, -1 ) )
+            {
+                tmp2 = 0;
+                move32();
+                q_tmp2 = 31;
+                move16();
+            }
+        }
         IF( LT_16( q_CrEne, q_tmp2 ) )
         {
             realizedOutputEne_fx = L_add( tmp1, L_shr( tmp2, sub( q_tmp2, q_CrEne ) ) );
@@ -2105,13 +2152,12 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx(
         tmp1 = BASOP_Util_Add_Mant32Exp( tmp2, sub( 31, q_tmp2 ), missingOutputEne_fx, sub( 31, q_missingOutputEne ), &exp1 );
 
         {
-            Word16 exp_temp;
-            tmp2 = BASOP_Util_Add_Mant32Exp( tmp2, sub( 31, q_tmp2 ), EPSILON_MANT, EPSILON_EXP, &exp_temp );
-            tmp2 = BASOP_Util_Divide3232_Scale_cadence( tmp1, tmp2, &exp );
-            exp2 = add( exp, sub( exp1, exp_temp ) );
+            tmp2 = BASOP_Util_Add_Mant32Exp( tmp2, sub( 31, q_tmp2 ), EPSILON_MANT, EPSILON_EXP, &exp2 );
+            tmp2 = ISqrt32( tmp2, &exp2 );
+            gain_fx = Mpy_32_32( tmp2, Sqrt32( tmp1, &exp1 ) );
+            q_gain = sub( 31, add( exp2, exp1 ) );
         }
-        gain_fx = Sqrt32( tmp2, &exp2 );
-        q_gain = sub( 31, exp2 );
+
 
         // 1073741824 = 4 in Q28
         IF( LT_16( q_gain, Q28 ) )
@@ -2553,7 +2599,11 @@ static void ivas_dirac_dec_binaural_process_output_fx(
             outSlotRePr_fx = &( outSlotRe_fx[0] );
             outSlotImPr_fx = &( outSlotIm_fx[0] );
 
-            cldfbSynthesis_ivas_fx( &outSlotRePr_fx, &outSlotImPr_fx, &( output_fx[chA][nBins * slot + offsetSamples] ), nBins, cldfbSynDec[chA] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+            cldfbSynthesis_ivas_fx( &outSlotRePr_fx, &outSlotImPr_fx, &( output_fx[chA][nBins * slot + offsetSamples] ), nBins, 0, 0, cldfbSynDec[chA] );
+#else  /* OPT_AVOID_STATE_BUF_RESCALE */
+            cldfbSynthesis_ivas_fx( &outSlotRePr_fx, &outSlotImPr_fx, &( output_fx[chA][nBins * slot + offsetSamples] ), nBins, 0, cldfbSynDec[chA] );
+#endif /* OPT_AVOID_STATE_BUF_RESCALE */
             cldfbSynDec[chA]->Q_cldfb_state = sub( q_result, 1 );
             move16();
         }
@@ -3198,7 +3248,8 @@ static void eig2x2_fx(
 
     /* Numeric case, when input is practically zeros */
     // IF( D_fx[0] < EPSILON_FX )
-    IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( D_fx[0], *q_D, EPSILON_MANT, EPSILON_EXP ), -1 ) )
+
+    IF( LT_32( L_shl_sat( D_fx[0], sub( sub( 31, *q_D ), EPSILON_EXP ) ), EPSILON_MANT ) )
     {
         Ure_fx[0][0] = ONE_IN_Q31;
         move32();
@@ -3278,7 +3329,7 @@ static void eig2x2_fx(
 
             tmp3 = BASOP_Util_Add_Mant32Exp( tmp2, sub( 31, q_tmp2 ), epsilon_mant, epsilon_exp, &exp_tmp3 );
 
-            tmp2 = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, tmp3, &exp );
+            tmp2 = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, tmp3, &exp );
             exp = sub( exp, sub( Q30, sub( 31, exp_tmp3 ) ) );
             normVal_fx = Sqrt32( tmp2, &exp ); // q_tmp2
             q_tmp2 = sub( 31, exp );
@@ -3347,7 +3398,7 @@ static void eig2x2_fx(
 
             tmp3 = BASOP_Util_Add_Mant32Exp( tmp2, sub( 31, q_tmp2 ), epsilon_mant, epsilon_exp, &exp_tmp3 );
 
-            tmp2 = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, tmp3, &exp );
+            tmp2 = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, tmp3, &exp );
             exp = sub( exp, sub( Q30, sub( 31, exp_tmp3 ) ) );
             normVal_fx = Sqrt32( tmp2, &exp ); // q_tmp2
             q_tmp2 = sub( 31, exp );
@@ -3403,12 +3454,17 @@ static void eig2x2_fx(
             move16();
         }
     }
+    if ( q_U_1 != 0 )
+    {
+        *q_U = q_U_1;
+        move16();
+    }
 
-    IF( q_U_1 != 0 )
-    *q_U = q_U_1;
-    ELSE
+    if ( q_U_1 == 0 )
+    {
         *q_U = q_U_2;
-    move16();
+        move16();
+    }
 
     return;
 }
@@ -3463,9 +3519,6 @@ static void matrixMul_fx(
     Word16 chA, chB;
     Word16 min_q_shift1, min_q_shift2;
     Word16 size = i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS );
-#ifndef IVAS_ENH64_CADENCE_CHANGES
-    Word32 tmp1, tmp2;
-#endif
 
     min_q_shift1 = sub( s_min( L_norm_arr( Are_fx[0], size ), L_norm_arr( Aim_fx[0], size ) ), 1 );
     min_q_shift2 = sub( s_min( L_norm_arr( Bre_fx[0], size ), L_norm_arr( Bim_fx[0], size ) ), 1 );
@@ -3494,103 +3547,15 @@ static void matrixMul_fx(
             outIm_fx[chA][chB] = L_add( outIm_fx[chA][chB], W_extract_h( W_mac_32_32( W_mult_32_32( Are_fx[chA][0], Bim_fx[0][chB] ), Are_fx[chA][1], Bim_fx[1][chB] ) ) );
             move32();
 #else
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][0] >= 0 && Bre_fx[0][chB] >= 0 ) || ( Are_fx[chA][0] < 0 && Bre_fx[0][chB] < 0 ) )
-            {
-                tmp1 = Mpy_32_32( Are_fx[chA][0], Bre_fx[0][chB] );
-            }
-            ELSE
-            {
-                tmp1 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][0] ), L_abs( Bre_fx[0][chB] ) ) );
-            }
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][1] >= 0 && Bre_fx[1][chB] >= 0 ) || ( Are_fx[chA][1] < 0 && Bre_fx[1][chB] < 0 ) )
-            {
-                tmp2 = Mpy_32_32( Are_fx[chA][1], Bre_fx[1][chB] );
-            }
-            ELSE
-            {
-                tmp2 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][1] ), L_abs( Bre_fx[1][chB] ) ) );
-            }
-            outRe_fx[chA][chB] = L_add( tmp1, tmp2 );
-            move32();
-
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][0] >= 0 && Bim_fx[0][chB] >= 0 ) || ( Aim_fx[chA][0] < 0 && Bim_fx[0][chB] < 0 ) )
-            {
-                tmp1 = Mpy_32_32( Aim_fx[chA][0], Bim_fx[0][chB] );
-            }
-            ELSE
-            {
-                tmp1 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][0] ), L_abs( Bim_fx[0][chB] ) ) );
-            }
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][1] >= 0 && Bim_fx[1][chB] >= 0 ) || ( Aim_fx[chA][1] < 0 && Bim_fx[1][chB] < 0 ) )
-            {
-                tmp2 = Mpy_32_32( Aim_fx[chA][1], Bim_fx[1][chB] );
-            }
-            ELSE
-            {
-                tmp2 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][1] ), L_abs( Bim_fx[1][chB] ) ) );
-            }
-            outRe_fx[chA][chB] = L_sub( outRe_fx[chA][chB], L_add( tmp1, tmp2 ) );
-            move32();
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][0] >= 0 && Bre_fx[0][chB] >= 0 ) || ( Aim_fx[chA][0] < 0 && Bre_fx[0][chB] < 0 ) )
-            {
-                tmp1 = Mpy_32_32( Aim_fx[chA][0], Bre_fx[0][chB] );
-            }
-            ELSE
-            {
-                tmp1 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][0] ), L_abs( Bre_fx[0][chB] ) ) );
-            }
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][1] >= 0 && Bre_fx[1][chB] >= 0 ) || ( Aim_fx[chA][1] < 0 && Bre_fx[1][chB] < 0 ) )
-            {
-                tmp2 = Mpy_32_32( Aim_fx[chA][1], Bre_fx[1][chB] );
-            }
-            ELSE
-            {
-                tmp2 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][1] ), L_abs( Bre_fx[1][chB] ) ) );
-            }
-            outIm_fx[chA][chB] = L_add( tmp1, tmp2 );
+            outRe_fx[chA][chB] = Msub_32_32( Msub_32_32( Madd_32_32( Mpy_32_32( Are_fx[chA][0], Bre_fx[0][chB] ),
+                                                                     Are_fx[chA][1], Bre_fx[1][chB] ),
+                                                         Aim_fx[chA][0], Bim_fx[0][chB] ),
+                                             Aim_fx[chA][1], Bim_fx[1][chB] );
             move32();
-
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][0] >= 0 && Bim_fx[0][chB] >= 0 ) || ( Are_fx[chA][0] < 0 && Bim_fx[0][chB] < 0 ) )
-            {
-                tmp1 = Mpy_32_32( Are_fx[chA][0], Bim_fx[0][chB] );
-            }
-            ELSE
-            {
-                tmp1 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][0] ), L_abs( Bim_fx[0][chB] ) ) );
-            }
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][1] >= 0 && Bim_fx[1][chB] >= 0 ) || ( Are_fx[chA][1] < 0 && Bim_fx[1][chB] < 0 ) )
-            {
-                tmp2 = Mpy_32_32( Are_fx[chA][1], Bim_fx[1][chB] );
-            }
-            ELSE
-            {
-                tmp2 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][1] ), L_abs( Bim_fx[1][chB] ) ) );
-            }
-            outIm_fx[chA][chB] = L_add( outIm_fx[chA][chB], L_add( tmp1, tmp2 ) );
+            outIm_fx[chA][chB] = Madd_32_32( Madd_32_32( Madd_32_32( Mpy_32_32( Aim_fx[chA][0], Bre_fx[0][chB] ),
+                                                                     Aim_fx[chA][1], Bre_fx[1][chB] ),
+                                                         Are_fx[chA][0], Bim_fx[0][chB] ),
+                                             Are_fx[chA][1], Bim_fx[1][chB] );
             move32();
 #endif /* #ifdef IVAS_ENH64_CADENCE_CHANGES */
         }
@@ -3620,82 +3585,54 @@ static void matrixTransp1Mul_fx(
 {
     Word16 chA, chB;
     Word16 size = i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS );
-    Word32 tmp1, tmp2;
+
+    Word64 tmp_outRe_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS];
+    Word64 tmp_outIm_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS];
+    Word16 q_tmp_outRe_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS];
+    Word16 q_tmp_outIm_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS];
+    Word64 tmp64_1, tmp64_2;
+    Word16 tmp16, q_common = 63;
+    move16();
 
     FOR( chA = 0; chA < BINAURAL_CHANNELS; chA++ )
     {
         FOR( chB = 0; chB < BINAURAL_CHANNELS; chB++ )
         {
-            test();
-            test();
-            test();
-            IF( ( ( ( Are_fx[0][chA] >= 0 ) && ( Bre_fx[0][chB] >= 0 ) ) || ( ( Are_fx[0][chA] < 0 ) && ( Bre_fx[0][chB] < 0 ) ) ) )
-            tmp1 = Mpy_32_32( Are_fx[0][chA], Bre_fx[0][chB] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( Are_fx[0][chA] ), L_abs( Bre_fx[0][chB] ) ) );
-            test();
-            test();
-            test();
-            IF( ( ( ( Are_fx[1][chA] >= 0 ) && ( Bre_fx[1][chB] >= 0 ) ) || ( ( Are_fx[1][chA] < 0 ) && ( Bre_fx[1][chB] < 0 ) ) ) )
-            tmp2 = Mpy_32_32( Are_fx[1][chA], Bre_fx[1][chB] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Are_fx[1][chA] ), L_abs( Bre_fx[1][chB] ) ) );
-            outRe_fx[chA][chB] = L_add( tmp1, tmp2 );
-            move32();
-            test();
-            test();
-            test();
-            IF( ( ( ( L_negate( Aim_fx[0][chA] ) >= 0 ) && ( Bim_fx[0][chB] >= 0 ) ) || ( ( L_negate( Aim_fx[0][chA] ) < 0 ) && ( Bim_fx[0][chB] < 0 ) ) ) )
-            tmp1 = Mpy_32_32( -Aim_fx[0][chA], Bim_fx[0][chB] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( -Aim_fx[0][chA] ), L_abs( Bim_fx[0][chB] ) ) );
-            test();
-            test();
-            test();
-            IF( ( ( ( Aim_fx[1][chA] >= 0 ) && ( Bim_fx[1][chB] >= 0 ) ) || ( ( Aim_fx[1][chA] < 0 ) && ( Bim_fx[1][chB] < 0 ) ) ) )
-            tmp2 = Mpy_32_32( Aim_fx[1][chA], Bim_fx[1][chB] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Aim_fx[1][chA] ), L_abs( Bim_fx[1][chB] ) ) );
-            outRe_fx[chA][chB] = L_sub( outRe_fx[chA][chB], L_sub( tmp1, tmp2 ) );
-            move32();
+            tmp64_1 = W_mac_32_32( W_mult_32_32( Are_fx[0][chA], Bre_fx[0][chB] ), Are_fx[1][chA], Bre_fx[1][chB] ); // Q: add( add( q_A, q_B ), 1 )
+            tmp64_2 = W_mac_32_32( W_mult_32_32( Aim_fx[0][chA], Bim_fx[0][chB] ), Aim_fx[1][chA], Bim_fx[1][chB] ); // Q: add( add( q_A, q_B ), 1 )
+            tmp_outRe_fx[chA][chB] = W_add( tmp64_1, tmp64_2 );                                                      // Q: add( add( q_A, q_B ), 1 )
+            move64();
+            tmp16 = W_norm( tmp_outRe_fx[chA][chB] );
+            tmp_outRe_fx[chA][chB] = W_shl( tmp_outRe_fx[chA][chB], tmp16 ); // Q:add( tmp16, add( add( q_A, q_B ), 1 ) )
+            move64();
+            q_tmp_outRe_fx[chA][chB] = add( tmp16, add( add( q_A, q_B ), 1 ) );
+            move16();
+            q_common = s_min( q_tmp_outRe_fx[chA][chB], q_common );
 
-            test();
-            test();
-            test();
-            IF( ( ( ( L_negate( Aim_fx[0][chA] ) >= 0 ) && ( Bre_fx[0][chB] >= 0 ) ) || ( ( L_negate( Aim_fx[0][chA] ) < 0 ) && ( Bre_fx[0][chB] < 0 ) ) ) )
-            tmp1 = Mpy_32_32( -Aim_fx[0][chA], Bre_fx[0][chB] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( -Aim_fx[0][chA] ), L_abs( Bre_fx[0][chB] ) ) );
-            test();
-            test();
-            test();
-            IF( ( ( ( Aim_fx[1][chA] >= 0 ) && ( Bre_fx[1][chB] >= 0 ) ) || ( ( Aim_fx[1][chA] < 0 ) && ( Bre_fx[1][chB] < 0 ) ) ) )
-            tmp2 = Mpy_32_32( Aim_fx[1][chA], Bre_fx[1][chB] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Aim_fx[1][chA] ), L_abs( Bre_fx[1][chB] ) ) );
-            outIm_fx[chA][chB] = L_sub( tmp1, tmp2 );
-            move32();
 
-            test();
-            test();
-            test();
-            IF( ( ( ( Are_fx[0][chA] >= 0 ) && ( Bim_fx[0][chB] >= 0 ) ) || ( ( Are_fx[0][chA] < 0 ) && ( Bim_fx[0][chB] < 0 ) ) ) )
-            tmp1 = Mpy_32_32( Are_fx[0][chA], Bim_fx[0][chB] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( Are_fx[0][chA] ), L_abs( Bim_fx[0][chB] ) ) );
-            test();
-            test();
-            test();
-            IF( ( ( ( Are_fx[1][chA] >= 0 ) && ( Bim_fx[1][chB] >= 0 ) ) || ( ( Are_fx[1][chA] < 0 ) && ( Bim_fx[1][chB] < 0 ) ) ) )
-            tmp2 = Mpy_32_32( Are_fx[1][chA], Bim_fx[1][chB] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Are_fx[1][chA] ), L_abs( Bim_fx[1][chB] ) ) );
-            outIm_fx[chA][chB] = L_add( outIm_fx[chA][chB], L_add( tmp1, tmp2 ) );
+            tmp64_1 = W_mac_32_32( W_mult_32_32( Are_fx[0][chA], Bim_fx[0][chB] ), Are_fx[1][chA], Bim_fx[1][chB] ); // Q: add( add( q_A, q_B ), 1 )
+            tmp64_2 = W_mac_32_32( W_mult_32_32( Aim_fx[0][chA], Bre_fx[0][chB] ), Aim_fx[1][chA], Bre_fx[1][chB] ); // Q: add( add( q_A, q_B ), 1 )
+            tmp_outIm_fx[chA][chB] = W_sub( tmp64_1, tmp64_2 );                                                      // Q: add( add( q_A, q_B ), 1 )
+            move64();
+            tmp16 = W_norm( tmp_outIm_fx[chA][chB] );
+            tmp_outIm_fx[chA][chB] = W_shl( tmp_outIm_fx[chA][chB], tmp16 ); // Q:add( tmp16, add( add( q_A, q_B ), 1 ) )
+            move64();
+            q_tmp_outIm_fx[chA][chB] = add( tmp16, add( add( q_A, q_B ), 1 ) );
+            move16();
+            q_common = s_min( q_tmp_outIm_fx[chA][chB], q_common );
+        }
+    }
+    FOR( chA = 0; chA < BINAURAL_CHANNELS; chA++ )
+    {
+        FOR( chB = 0; chB < BINAURAL_CHANNELS; chB++ )
+        {
+            outRe_fx[chA][chB] = W_extract_h( W_shl( tmp_outRe_fx[chA][chB], sub( q_common, q_tmp_outRe_fx[chA][chB] ) ) );
+            move32();
+            outIm_fx[chA][chB] = W_extract_h( W_shl( tmp_outIm_fx[chA][chB], sub( q_common, q_tmp_outIm_fx[chA][chB] ) ) );
             move32();
         }
     }
-    *q_out = sub( add( q_A, q_B ), 31 );
-
+    *q_out = sub( q_common, 32 );
     move16();
     if ( L_and( is_zero_arr( outRe_fx[0], size ), is_zero_arr( outIm_fx[0], size ) ) )
     {
@@ -3713,6 +3650,8 @@ static void matrixTransp2Mul_fx(
     Word32 Bre_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_B*/
     Word32 Bim_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_B*/
     Word16 *q_B,
+    Word32 Ascale,
+    Word32 Bscale,
     Word32 outRe_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_out*/
     Word32 outIm_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_out*/
     Word16 *q_out )
@@ -3720,20 +3659,24 @@ static void matrixTransp2Mul_fx(
     Word16 chA, chB;
     Word16 min_q_shift;
     Word16 size = i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS );
-#ifndef IVAS_ENH64_CADENCE_CHANGES
-    Word32 tmp1, tmp2;
-#endif
 
-    min_q_shift = sub( s_min( L_norm_arr( Are_fx[0], size ), L_norm_arr( Aim_fx[0], size ) ), 1 );
-    scale_sig32( Are_fx[0], size, min_q_shift );
-    scale_sig32( Aim_fx[0], size, min_q_shift );
-    *q_A = add( *q_A, min_q_shift );
-    move16();
-    min_q_shift = sub( s_min( L_norm_arr( Bre_fx[0], size ), L_norm_arr( Bim_fx[0], size ) ), 1 );
-    scale_sig32( Bre_fx[0], size, min_q_shift );
-    scale_sig32( Bim_fx[0], size, min_q_shift );
-    *q_B = add( *q_B, min_q_shift );
-    move16();
+    IF( Ascale == 1 )
+    {
+        min_q_shift = sub( s_min( L_norm_arr( Are_fx[0], size ), L_norm_arr( Aim_fx[0], size ) ), 1 );
+        scale_sig32( Are_fx[0], size, min_q_shift );
+        scale_sig32( Aim_fx[0], size, min_q_shift );
+        *q_A = add( *q_A, min_q_shift );
+        move16();
+    }
+
+    IF( Bscale == 1 )
+    {
+        min_q_shift = sub( s_min( L_norm_arr( Bre_fx[0], size ), L_norm_arr( Bim_fx[0], size ) ), 1 );
+        scale_sig32( Bre_fx[0], size, min_q_shift );
+        scale_sig32( Bim_fx[0], size, min_q_shift );
+        *q_B = add( *q_B, min_q_shift );
+        move16();
+    }
 
     FOR( chA = 0; chA < BINAURAL_CHANNELS; chA++ )
     {
@@ -3749,72 +3692,15 @@ static void matrixTransp2Mul_fx(
             outIm_fx[chA][chB] = L_add( outIm_fx[chA][chB], W_extract_h( W_mac_32_32( W_mult_32_32( Are_fx[chA][0], L_negate( Bim_fx[chB][0] ) ), Are_fx[chA][1], L_negate( Bim_fx[chB][1] ) ) ) );
             move32();
 #else
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][0] >= 0 && Bre_fx[chB][0] >= 0 ) || ( Are_fx[chA][0] < 0 && Bre_fx[chB][0] < 0 ) )
-            tmp1 = Mpy_32_32( Are_fx[chA][0], Bre_fx[chB][0] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][0] ), L_abs( Bre_fx[chB][0] ) ) );
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][1] >= 0 && Bre_fx[chB][1] >= 0 ) || ( Are_fx[chA][1] < 0 && Bre_fx[chB][1] < 0 ) )
-            tmp2 = Mpy_32_32( Are_fx[chA][1], Bre_fx[chB][1] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][1] ), L_abs( Bre_fx[chB][1] ) ) );
-            outRe_fx[chA][chB] = L_add( tmp1, tmp2 );
-            move32();
-
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][0] >= 0 && L_negate( Bim_fx[chB][0] ) >= 0 ) || ( Aim_fx[chA][0] < 0 && L_negate( Bim_fx[chB][0] ) < 0 ) )
-            tmp1 = Mpy_32_32( Aim_fx[chA][0], -Bim_fx[chB][0] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][0] ), L_abs( -Bim_fx[chB][0] ) ) );
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][1] >= 0 && L_negate( Bim_fx[chB][1] ) >= 0 ) || ( Aim_fx[chA][1] < 0 && L_negate( Bim_fx[chB][1] ) < 0 ) )
-            tmp2 = Mpy_32_32( Aim_fx[chA][1], -Bim_fx[chB][1] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][1] ), L_abs( -Bim_fx[chB][1] ) ) );
-            outRe_fx[chA][chB] = L_sub( outRe_fx[chA][chB], L_add( tmp1, tmp2 ) );
-            move32();
-
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][0] >= 0 && Bre_fx[chB][0] >= 0 ) || ( Aim_fx[chA][0] < 0 && Bre_fx[chB][0] < 0 ) )
-            tmp1 = Mpy_32_32( Aim_fx[chA][0], Bre_fx[chB][0] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][0] ), L_abs( Bre_fx[chB][0] ) ) );
-            test();
-            test();
-            test();
-            IF( ( Aim_fx[chA][1] >= 0 && Bre_fx[chB][1] >= 0 ) || ( Aim_fx[chA][1] < 0 && Bre_fx[chB][1] < 0 ) )
-            tmp2 = Mpy_32_32( Aim_fx[chA][1], Bre_fx[chB][1] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Aim_fx[chA][1] ), L_abs( Bre_fx[chB][1] ) ) );
-            outIm_fx[chA][chB] = L_add( tmp1, tmp2 );
+            outRe_fx[chA][chB] = Madd_32_32( Madd_32_32( Madd_32_32( Mpy_32_32( Are_fx[chA][0], Bre_fx[chB][0] ),
+                                                                     Are_fx[chA][1], Bre_fx[chB][1] ),
+                                                         Aim_fx[chA][0], Bim_fx[chB][0] ),
+                                             Aim_fx[chA][1], Bim_fx[chB][1] );
             move32();
-
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][0] >= 0 && L_negate( Bim_fx[chB][0] ) >= 0 ) || ( Are_fx[chA][0] < 0 && L_negate( Bim_fx[chB][0] ) < 0 ) )
-            tmp1 = Mpy_32_32( Are_fx[chA][0], -Bim_fx[chB][0] );
-            ELSE
-                tmp1 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][0] ), L_abs( -Bim_fx[chB][0] ) ) );
-            test();
-            test();
-            test();
-            IF( ( Are_fx[chA][1] >= 0 && L_negate( Bim_fx[chB][1] ) >= 0 ) || ( Are_fx[chA][1] < 0 && L_negate( Bim_fx[chB][1] ) < 0 ) )
-            tmp2 = Mpy_32_32( Are_fx[chA][1], -Bim_fx[chB][1] );
-            ELSE
-                tmp2 = L_negate( Mpy_32_32( L_abs( Are_fx[chA][1] ), L_abs( -Bim_fx[chB][1] ) ) );
-            outIm_fx[chA][chB] = L_add( outIm_fx[chA][chB], L_add( tmp1, tmp2 ) );
+            outIm_fx[chA][chB] = Msub_32_32( Msub_32_32( Madd_32_32( Mpy_32_32( Aim_fx[chA][0], Bre_fx[chB][0] ),
+                                                                     Aim_fx[chA][1], Bre_fx[chB][1] ),
+                                                         Are_fx[chA][0], Bim_fx[chB][0] ),
+                                             Are_fx[chA][1], Bim_fx[chB][1] );
             move32();
 #endif /* #ifdef IVAS_ENH64_CADENCE_CHANGES */
         }
@@ -3880,23 +3766,41 @@ static void chol2x2_fx(
         // 4611686 = 1e-12 in Q62
         IF( outRe[0][0] == 0 )
         {
-            outRe[1][0] = BASOP_Util_Divide3232_Scale_cadence( c_re, 4611686, &exp );
+            outRe[1][0] = BASOP_Util_Divide3232_Scale_newton( c_re, 4611686, &exp );
             move32();
             q_re2 = add( sub( 31, exp ), sub( q_c, 62 ) );
 
-            outIm[1][0] = BASOP_Util_Divide3232_Scale_cadence( c_im, 4611686, &exp );
+            outIm[1][0] = BASOP_Util_Divide3232_Scale_newton( c_im, 4611686, &exp );
             move32();
             q_im = add( sub( 31, exp ), sub( q_c, 62 ) );
         }
         ELSE
         {
-            outRe[1][0] = BASOP_Util_Divide3232_Scale_cadence( c_re, outRe[0][0], &exp );
+            Word32 denom;
+            Word16 den_exp;
+            Word32 my_outRe, my_outIm;
+
+            /* Compute denom = 1.0 / outRe[0][0] */
+            denom = ISqrt32( outRe[0][0], &exp );
+            denom = Mpy_32_32( denom, denom );
+            den_exp = shl( exp, 1 );
+
+            /* Normalise c_re, c_im */
+            exp = norm_l( c_re );
+            my_outRe = L_shl( c_re, exp );
+            q_re2 = add( q_c, exp );
+            exp = norm_l( c_im );
+            my_outIm = L_shl( c_im, exp );
+            q_im = add( q_c, exp );
+
+            /* Multiply and store c_re*denom and c_im*denom */
+            outRe[1][0] = Mpy_32_32( denom, my_outRe );
             move32();
-            q_re2 = add( sub( 31, exp ), sub( q_c, q_re1 ) );
+            q_re2 = sub( q_re2, den_exp );
 
-            outIm[1][0] = BASOP_Util_Divide3232_Scale_cadence( c_im, outRe[0][0], &exp );
+            outIm[1][0] = Mpy_32_32( denom, my_outIm );
             move32();
-            q_im = add( sub( 31, exp ), sub( q_c, q_re1 ) );
+            q_im = sub( q_im, den_exp );
         }
         if ( outRe[1][0] == 0 )
         {
@@ -3915,12 +3819,15 @@ static void chol2x2_fx(
         // 4611686 = Q62
         IF( e1 == 0 )
         {
-            temp = BASOP_Util_Divide3232_Scale_cadence( temp, 4611686, &exp );
-            q_tmp = add( sub( 31, exp ), sub( q_tmp, 62 ) );
+            Word16 norm = norm_l( temp );
+            temp = L_shl( temp, norm );
+            q_tmp = add( q_tmp, norm );
+            temp = Mpy_32_32( temp, ONE_DIV_EPSILON_MANT );
+            q_tmp = sub( q_tmp, ONE_DIV_EPSILON_EXP );
         }
         ELSE
         {
-            temp = BASOP_Util_Divide3232_Scale_cadence( temp, e1, &exp );
+            temp = BASOP_Util_Divide3232_Scale_newton( temp, e1, &exp );
             q_tmp = add( sub( 31, exp ), sub( q_tmp, q_e ) );
         }
         if ( temp == 0 )
@@ -3965,23 +3872,33 @@ static void chol2x2_fx(
         // 4611686 = Q62
         IF( outRe[1][1] == 0 )
         {
-            outRe[0][1] = BASOP_Util_Divide3232_Scale_cadence( c_re, 4611686, &exp );
+            // outRe[0][1] = BASOP_Util_Divide3232_Scale_newton( c_re, 4611686, &exp );
+            Word32 tmp1 = 1953125005; /* 1/4611686 Q62 */
+            exp = 9;
+
+            outRe[0][1] = Mpy_32_32( tmp1, c_re );
             move32();
             q_re2 = add( sub( 31, exp ), sub( q_c, 62 ) );
 
-            outIm[0][1] = BASOP_Util_Divide3232_Scale_cadence( -c_im, 4611686, &exp );
+            // outIm[0][1] = BASOP_Util_Divide3232_Scale_newton( -c_im, 4611686, &exp );
+            outIm[0][1] = Mpy_32_32( tmp1, -c_im );
             move32();
             q_im = add( sub( 31, exp ), sub( q_c, 62 ) );
         }
         ELSE
         {
-            outRe[0][1] = BASOP_Util_Divide3232_Scale_cadence( c_re, outRe[1][1], &exp );
-            move32();
-            q_re2 = add( sub( 31, exp ), sub( q_c, q_re1 ) );
+            {
+                // outRe[0][1] = BASOP_Util_Divide3232_Scale_newton( c_re, outRe[1][1], &exp );
+                Word32 tmp1 = BASOP_Util_Divide3232_Scale_newton( 0x7FFFFFFF, outRe[1][1], &exp );
+                outRe[0][1] = Mpy_32_32( tmp1, c_re );
+                move32();
+                q_re2 = add( sub( 31, exp ), sub( q_c, q_re1 ) );
 
-            outIm[0][1] = BASOP_Util_Divide3232_Scale_cadence( -c_im, outRe[1][1], &exp );
-            move32();
-            q_im = add( sub( 31, exp ), sub( q_c, q_re1 ) );
+                // outIm[0][1] = BASOP_Util_Divide3232_Scale_newton( -c_im, outRe[1][1], &exp );
+                outIm[0][1] = Mpy_32_32( tmp1, -c_im );
+                move32();
+                q_im = add( sub( 31, exp ), sub( q_c, q_re1 ) );
+            }
         }
         if ( outRe[0][1] == 0 )
         {
@@ -4000,12 +3917,12 @@ static void chol2x2_fx(
         // 4611686 = 1e-12 in Q62
         IF( e2 == 0 )
         {
-            temp = BASOP_Util_Divide3232_Scale_cadence( temp, 4611686, &exp );
+            temp = BASOP_Util_Divide3232_Scale_newton( temp, 4611686, &exp );
             q_tmp = add( sub( 31, exp ), sub( q_tmp, 62 ) );
         }
         ELSE
         {
-            temp = BASOP_Util_Divide3232_Scale_cadence( temp, e2, &exp );
+            temp = BASOP_Util_Divide3232_Scale_newton( temp, e2, &exp );
             q_tmp = add( sub( 31, exp ), sub( q_tmp, q_e ) );
         }
         if ( temp == 0 )
@@ -4146,12 +4063,14 @@ static void formulate2x2MixingMatrix_fx(
     // 4611686 = Q62
     IF( maxEne_fx == 0 )
     {
-        maxEneDiv_fx = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, 4611686, &exp ); // 4611686 = 1e-12f in Q62
-        q_maxEneDiv = add( sub( 31, exp ), sub( Q30, 62 ) );
+        maxEneDiv_fx = ONE_DIV_EPSILON_MANT;
+        move32();
+        q_maxEneDiv = 31 - ONE_DIV_EPSILON_EXP;
+        move16();
     }
     ELSE
     {
-        maxEneDiv_fx = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, maxEne_fx, &exp );
+        maxEneDiv_fx = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, maxEne_fx, &exp );
         q_maxEneDiv = add( sub( 31, exp ), sub( Q30, q_maxEne ) );
     }
     exp = norm_l( maxEneDiv_fx );
@@ -4207,34 +4126,55 @@ static void formulate2x2MixingMatrix_fx(
 
     IF( temp == 0 )
     {
-        BASOP_Util_Divide3232_Scale_cadence( E_out1, 4611686, &exp ); // 4611686 = Q62
-        exp = sub( exp, sub( q_eout, 62 ) );
+        IF( E_out1 == 0 )
+        {
+            Ghat_fx[0] = 0;
+            exp = -19;
+            move32();
+            move16();
+        }
+        ELSE
+        {
+            temp = BASOP_Util_Divide3232_Scale_newton( E_out1, 4611686, &exp ); // 4611686 = Q62
+            exp = sub( exp, sub( q_eout, 62 ) );
+            Ghat_fx[0] = Sqrt32( temp, &exp ); // Q = 31 - exp
+        }
     }
     ELSE
     {
         temp = BASOP_Util_Add_Mant32Exp( temp, sub( 31, q_ein ), EPSILON_MANT, EPSILON_EXP, &exp_temp );
 
-        temp = BASOP_Util_Divide3232_Scale_cadence( E_out1, temp, &exp );
+        temp = BASOP_Util_Divide3232_Scale_newton( E_out1, temp, &exp );
         exp = sub( exp, sub( q_eout, sub( 31, exp_temp ) ) );
+        Ghat_fx[0] = Sqrt32( temp, &exp ); // Q = 31 - exp
     }
-    Ghat_fx[0] = Sqrt32( temp, &exp ); // Q = 31 - exp
     move32();
 
     temp = Mpy_32_32( E_in1, 2147484 ); // 2147484 = 0.001f in Q31
     temp = L_max( temp, E_in2 );        // q_ein
     IF( temp == 0 )
     {
-        BASOP_Util_Divide3232_Scale_cadence( E_out2, 4611686, &exp1 ); // 4611686 = Q62
-        exp1 = sub( exp1, sub( q_eout, 62 ) );
+        IF( E_out2 == 0 )
+        { /* We can set hard-coded results */
+            Ghat_fx[1] = 0;
+            exp1 = -19;
+            move16();
+        }
+        ELSE
+        {
+            temp = BASOP_Util_Divide3232_Scale_newton( E_out2, 4611686, &exp1 ); // 4611686 = Q62
+            exp1 = sub( exp1, sub( q_eout, 62 ) );
+            Ghat_fx[1] = Sqrt32( temp, &exp1 ); // Q = 31 - exp1
+        }
     }
     ELSE
     {
         temp = BASOP_Util_Add_Mant32Exp( temp, sub( 31, q_ein ), EPSILON_MANT, EPSILON_EXP, &exp_temp );
 
-        temp = BASOP_Util_Divide3232_Scale_cadence( E_out2, temp, &exp1 );
+        temp = BASOP_Util_Divide3232_Scale_newton( E_out2, temp, &exp1 );
         exp1 = sub( exp1, sub( q_eout, sub( 31, exp_temp ) ) );
+        Ghat_fx[1] = Sqrt32( temp, &exp1 ); // Q = 31 - exp1
     }
-    Ghat_fx[1] = Sqrt32( temp, &exp1 ); // Q = 31 - exp1
     move32();
 
     q_Ghat = sub( 31, s_max( exp, exp1 ) );
@@ -4283,30 +4223,29 @@ static void formulate2x2MixingMatrix_fx(
 
     IF( D_fx[0] == 0 )
     {
-        temp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, 4611686, &exp ); // 4611686 = 1e-12 in Q62
-        exp = sub( exp, sub( Q30, 62 ) );
+        temp = ONE_DIV_EPSILON_MANT; /* Result of 1.0/eps with full precision */
+        move32();
+        exp = ONE_DIV_EPSILON_EXP;
+        move16();
     }
     ELSE
     {
-        temp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, D_fx[0], &exp );
+        temp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, D_fx[0], &exp );
         exp = sub( exp, sub( Q30, q_D ) );
     }
     div_fx[0] = Sqrt32( temp, &exp ); // Q = 31 - exp
     move32();
 
-    IF( D_fx[1] == 0 )
-    {
-        temp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, 4611686, &exp1 ); // 4611686 = 1e-12 in Q62
-        exp1 = sub( exp1, sub( Q30, 62 ) );
-    }
-    ELSE
+    // Sqrt(1)
+    div_fx[1] = L_add( 0, 2047986068 ); // Q = 31 - exp1
+    exp1 = add( 0, 20 );
+
+    IF( D_fx[1] != 0 ) // This is the new code: replace div sqrt by isqrt
     {
-        temp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, D_fx[1], &exp1 );
-        exp1 = sub( exp1, sub( Q30, q_D ) );
+        exp1 = sub( 31, q_D );
+        div_fx[1] = ISqrt32( D_fx[1], &exp1 );
+        move32();
     }
-    div_fx[1] = Sqrt32( temp, &exp1 ); // Q = 31 - exp1
-    move32();
-
     q_div = sub( 31, s_max( exp, exp1 ) );
 
     div_fx[0] = L_shr( div_fx[0], sub( sub( 31, exp ), q_div ) ); // q_div
@@ -4397,28 +4336,51 @@ static void formulate2x2MixingMatrix_fx(
         }
     }
 
-    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Ure_fx, Uim_fx, &q_U, Pre_fx, Pim_fx, &q_P ); /* Nearest orthonormal matrix P to matrix A formulated */
+    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Ure_fx, Uim_fx, &q_U,
+                         1 /*int Ascale*/,
+                         0 /*int Bscale*/,
+                         Pre_fx, Pim_fx, &q_P ); /* Nearest orthonormal matrix P to matrix A formulated */
 
     /* These are the final formulas of the JAES publication M = Ky P Kx^(-1) */
+#if ( BINAURAL_CHANNELS != 2 )
     FOR( chA = 0; chA < BINAURAL_CHANNELS; chA++ )
     {
         FOR( chB = 0; chB < BINAURAL_CHANNELS; chB++ )
         {
             IF( Sx_fx[chB] == 0 )
             {
-                Pre_fx[chA][chB] = BASOP_Util_Divide3232_Scale_cadence( Pre_fx[chA][chB], 4611686, &exp ); // 4611686 = 1e-12 in Q62
-                q_Pre[chA][chB] = add( sub( q_P, 62 ), sub( 31, exp ) );
-                Pim_fx[chA][chB] = BASOP_Util_Divide3232_Scale_cadence( Pim_fx[chA][chB], 4611686, &exp ); // 4611686 = 1e-12 in Q62
-                q_Pim[chA][chB] = add( sub( q_P, 62 ), sub( 31, exp ) );
+                Pre_fx[chA][chB] = Mpy_32_32( Pre_fx[chA][chB], ONE_DIV_EPSILON_MANT );
+                // q_Pre[chA][chB]  = add(sub(31, q_P), 31 - ONE_DIV_EPSILON_EXP);
+                q_Pre[chA][chB] = sub( 62 - ONE_DIV_EPSILON_EXP, q_P );
+
+
+                Pim_fx[chA][chB] = Mpy_32_32( Pim_fx[chA][chB], ONE_DIV_EPSILON_MANT );
+                // q_Pim[chA][chB]  = add(sub(31, q_P), 31 - ONE_DIV_EPSILON_EXP);
+                q_Pim[chA][chB] = sub( 62 - ONE_DIV_EPSILON_EXP, q_P );
             }
             ELSE
             {
+                Word16 Pre_shift, Pim_shift;
                 temp = BASOP_Util_Add_Mant32Exp( Sx_fx[chB], sub( 31, q_Sx ), EPSILON_MANT, EPSILON_EXP, &exp_temp );
 
-                Pre_fx[chA][chB] = BASOP_Util_Divide3232_Scale_cadence( Pre_fx[chA][chB], temp, &exp );
-                q_Pre[chA][chB] = add( sub( q_P, sub( 31, exp_temp ) ), sub( 31, exp ) );
-                Pim_fx[chA][chB] = BASOP_Util_Divide3232_Scale_cadence( Pim_fx[chA][chB], temp, &exp );
-                q_Pim[chA][chB] = add( sub( q_P, sub( 31, exp_temp ) ), sub( 31, exp ) );
+                temp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, temp, &exp );
+                Pre_shift = norm_l( Pre_fx[chA][chB] );
+                Pim_shift = norm_l( Pim_fx[chA][chB] );
+                Pre_fx[chA][chB] = Mpy_32_32( L_shl( Pre_fx[chA][chB], Pre_shift ), temp );
+                Pim_fx[chA][chB] = Mpy_32_32( L_shl( Pim_fx[chA][chB], Pim_shift ), temp );
+                q_temp = add( sub( sub( q_P, exp ), sub( 31, Q30 ) ), exp_temp );
+                q_Pre[chA][chB] = add( q_temp, Pre_shift );
+                q_Pim[chA][chB] = add( q_temp, Pim_shift );
+            }
+            if ( Pre_fx[chA][chB] == 0 )
+            {
+                q_Pre[chA][chB] = 31;
+                move16();
+            }
+            if ( Pim_fx[chA][chB] == 0 )
+            {
+                q_Pim[chA][chB] = 31;
+                move16();
             }
             move32();
             move32();
@@ -4426,6 +4388,72 @@ static void formulate2x2MixingMatrix_fx(
             move16();
         }
     }
+#else
+    /* BINAURAL_CHANNEL == 2 */
+    FOR( chB = 0; chB < BINAURAL_CHANNELS; chB++ )
+    {
+        IF( Sx_fx[chB] == 0 )
+        {
+            Pre_fx[0][chB] = Mpy_32_32( Pre_fx[0][chB], ONE_DIV_EPSILON_MANT );
+            q_Pre[0][chB] = sub( 62 - ONE_DIV_EPSILON_EXP, q_P );
+            Pim_fx[0][chB] = Mpy_32_32( Pim_fx[0][chB], ONE_DIV_EPSILON_MANT );
+            q_Pim[0][chB] = sub( 62 - ONE_DIV_EPSILON_EXP, q_P );
+            Pre_fx[1][chB] = Mpy_32_32( Pre_fx[1][chB], ONE_DIV_EPSILON_MANT );
+            q_Pre[1][chB] = sub( 62 - ONE_DIV_EPSILON_EXP, q_P );
+            Pim_fx[1][chB] = Mpy_32_32( Pim_fx[1][chB], ONE_DIV_EPSILON_MANT );
+            q_Pim[1][chB] = sub( 62 - ONE_DIV_EPSILON_EXP, q_P );
+        }
+        ELSE
+        {
+            Word16 Pre_shift, Pim_shift;
+            temp = BASOP_Util_Add_Mant32Exp( Sx_fx[chB], sub( 31, q_Sx ), EPSILON_MANT, EPSILON_EXP, &exp_temp );
+            temp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, temp, &exp );
+            q_temp = add( sub( sub( q_P, exp ), sub( 31, Q30 ) ), exp_temp );
+
+            Pre_shift = norm_l( Pre_fx[0][chB] );
+            Pim_shift = norm_l( Pim_fx[0][chB] );
+            Pre_fx[0][chB] = Mpy_32_32( L_shl( Pre_fx[0][chB], Pre_shift ), temp );
+            Pim_fx[0][chB] = Mpy_32_32( L_shl( Pim_fx[0][chB], Pim_shift ), temp );
+            q_Pre[0][chB] = add( q_temp, Pre_shift );
+            q_Pim[0][chB] = add( q_temp, Pim_shift );
+
+            Pre_shift = norm_l( Pre_fx[1][chB] );
+            Pim_shift = norm_l( Pim_fx[1][chB] );
+            Pre_fx[1][chB] = Mpy_32_32( L_shl( Pre_fx[1][chB], Pre_shift ), temp );
+            Pim_fx[1][chB] = Mpy_32_32( L_shl( Pim_fx[1][chB], Pim_shift ), temp );
+            q_Pre[1][chB] = add( q_temp, Pre_shift );
+            q_Pim[1][chB] = add( q_temp, Pim_shift );
+        }
+        if ( Pre_fx[0][chB] == 0 )
+        {
+            q_Pre[0][chB] = 31;
+            move16();
+        }
+        if ( Pim_fx[0][chB] == 0 )
+        {
+            q_Pim[0][chB] = 31;
+            move16();
+        }
+        if ( Pre_fx[1][chB] == 0 )
+        {
+            q_Pre[1][chB] = 31;
+            move16();
+        }
+        if ( Pim_fx[1][chB] == 0 )
+        {
+            q_Pim[1][chB] = 31;
+            move16();
+        }
+        move32();
+        move32();
+        move16();
+        move16();
+        move32();
+        move32();
+        move16();
+        move16();
+    }
+#endif
     minimum_s( q_Pre[0], i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS ), &exp );
     q_P = s_min( q_P, exp );
     minimum_s( q_Pim[0], i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS ), &exp );
@@ -4444,8 +4472,10 @@ static void formulate2x2MixingMatrix_fx(
 
     matrixMul_fx( KyRe_fx, KyIm_fx, &q_ky, Pre_fx, Pim_fx, &q_P, tmpRe_fx, tmpIm_fx, &q_temp );
 
-    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Uxre_fx, Uxim_fx, &q_Ux, Mre_fx, Mim_fx, q_M );
-
+    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Uxre_fx, Uxim_fx, &q_Ux,
+                         1 /*int Ascale*/,
+                         0 /*int Bscale*/,
+                         Mre_fx, Mim_fx, q_M );
     return;
 }
 
diff --git a/lib_rend/ivas_dirac_decorr_dec.c b/lib_rend/ivas_dirac_decorr_dec_fx.c
similarity index 78%
rename from lib_rend/ivas_dirac_decorr_dec.c
rename to lib_rend/ivas_dirac_decorr_dec_fx.c
index c50d690c5b80f4812770e4aab2d6bbb26aabc62f..9b2bf02d74943af89a58d3608a206131598894ed 100644
--- a/lib_rend/ivas_dirac_decorr_dec.c
+++ b/lib_rend/ivas_dirac_decorr_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,13 +35,11 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_rend.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-------------------------------------------------------------------------
@@ -57,18 +55,16 @@
 #define DIRAC_DUCK_ALPHA_FX    1717986944 /* Q31 */
 #define ONE_M_DIRAC_DUCK_ALPHA 429496736  /* Q31 */
 
-#ifdef FIX_1110_OPTIM_DIRAC_DECORR_PROC
 /* Maximal useful q-format, represents range of 2^-126 (float min) */
 #define MAX_Q_FX 157
 
 
-#endif
 /*-------------------------------------------------------------------------
  * Local function prototypes
  *------------------------------------------------------------------------*/
 
-static void get_lattice_coeffs_fx( const Word16 band_index, const Word16 channel_index, Word16 *lattice_coeffs );
-static void lattice2allpass_fx( const int16_t filter_length, const Word16 *lattice_coeffs_fx, Word16 *filter_coeffs_num_real_fx, Word16 *filter_coeffs_den_real_fx );
+static void get_lattice_coeffs_fx( const Word16 band_index, const Word16 channel_index, Word32 *lattice_coeffs );
+static void lattice2allpass_fx( const Word16 filter_length, const Word32 *lattice_coeffs_fx, Word32 *filter_coeffs_num_real_fx, Word32 *filter_coeffs_den_real_fx );
 
 /*-------------------------------------------------------------------------
  * ivas_dirac_dec_decorr_open()
@@ -94,7 +90,8 @@ ivas_error ivas_dirac_dec_decorr_open_fx(
     Word16 split_frequencies_bands[DIRAC_DECORR_NUM_SPLIT_BANDS + 1] = { 0, 0, 0, 23768 };
     move16();
     Word16 *split_freq_ptr;
-    Word16 cur_lattice_delta_phi_fx, lattice_coeffs_fx[2 * DIRAC_MAX_DECORR_FILTER_LEN];
+    Word16 cur_lattice_delta_phi_fx;
+    Word32 lattice_coeffs_fx[2 * DIRAC_MAX_DECORR_FILTER_LEN];
 
     ivas_error error;
 
@@ -281,12 +278,12 @@ ivas_error ivas_dirac_dec_decorr_open_fx(
         freq_domain_decorr_ap_state->q_decorr_buffer = Q31;
         move16();
 
-        IF( ( freq_domain_decorr_ap_params->filter_coeff_num_real_fx = (Word16 *) malloc( sizeof( Word16 ) * imult1616( add( ap_filter_length[split_band_index_start], 1 ), imult1616( freq_domain_decorr_ap_params->max_band_decorr, num_outputs_diff ) ) ) ) == NULL )
+        IF( ( freq_domain_decorr_ap_params->filter_coeff_num_real_fx = (Word32 *) malloc( sizeof( Word32 ) * imult1616( add( ap_filter_length[split_band_index_start], 1 ), imult1616( freq_domain_decorr_ap_params->max_band_decorr, num_outputs_diff ) ) ) ) == NULL )
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
         }
 
-        IF( ( freq_domain_decorr_ap_params->filter_coeff_den_real_fx = (Word16 *) malloc( sizeof( Word16 ) * imult1616( add( ap_filter_length[split_band_index_start], 1 ), imult1616( freq_domain_decorr_ap_params->max_band_decorr, num_outputs_diff ) ) ) ) == NULL )
+        IF( ( freq_domain_decorr_ap_params->filter_coeff_den_real_fx = (Word32 *) malloc( sizeof( Word32 ) * imult1616( add( ap_filter_length[split_band_index_start], 1 ), imult1616( freq_domain_decorr_ap_params->max_band_decorr, num_outputs_diff ) ) ) ) == NULL )
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
         }
@@ -409,7 +406,7 @@ void ivas_dirac_dec_decorr_process_fx(
     HANDLE_DIRAC_DECORR_STATE h_freq_domain_decorr_ap_state )
 {
 
-    Word16 ch_idx, k, l, idx_in_out, max_band_decorr;
+    Word16 ch_idx, k, l, max_band_decorr;
     Word16 split_bands_idx, band_idx, decorr_buffer_len, time_idx;
     Word16 offset, idx_filter, incr_aux;
     Word16 k_1, k_2, num_bands, filter_length, pre_delay, decorr_buffer_step;
@@ -418,7 +415,7 @@ void ivas_dirac_dec_decorr_process_fx(
     Word32 frame_ma_fx[2 * ( DIRAC_MAX_DECORR_FILTER_LEN + 1 )];
     Word32 *p_frame_dec_fx, *decorr_buffer_fx;
     Word16 *phase_coeff_real_fx, *phase_coeff_imag_fx;
-    Word16 *filter_coeff_num_real_fx, *filter_coeff_den_real_fx;
+    Word32 *filter_coeff_num_real_fx, *filter_coeff_den_real_fx;
     Word32 *decorr_buffer_start_ptr_fx, *decorr_buffer_ptr_fx;
     Word32 input_real_fx, input_imag_fx, filter_frame_imag_fx, filter_frame_real_fx;
     Word16 q_aux_buffer, q_onset_dec, q_frame_f;
@@ -506,22 +503,24 @@ void ivas_dirac_dec_decorr_process_fx(
     set32_fx( onset_filter_fx, ONE_IN_Q31, imult1616( num_protos_diff, num_freq_bands ) );
 
     Word16 q_temp = s_min( q_onset_dec, q_aux_buffer );
+    Word16 shift_q = sub( q_onset_dec, q_temp );
 
-    IF( NE_16( q_temp, q_onset_dec ) )
+    IF( shift_q != 0 )
     {
-        FOR( Word16 i = 0; i < imult1616( num_protos_diff, max_band_decorr_temp ); i++ )
+        FOR( Word16 i = 0; i < num_protos_diff * max_band_decorr_temp; i++ )
         {
-            h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i], sub( q_onset_dec, q_temp ) ); // q_temp
-            h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i], sub( q_onset_dec, q_temp ) ); // q_temp
+            h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i], shift_q ); // q_temp
+            h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i], shift_q ); // q_temp
             move32();
             move32();
         }
     }
-    IF( NE_16( q_temp, q_aux_buffer ) )
+    shift_q = sub( q_aux_buffer, q_temp );
+    IF( shift_q != 0 )
     {
-        FOR( Word16 i = 0; i < shl( imult1616( num_protos_diff, max_band_decorr_temp ), 1 ); i++ )
+        FOR( Word16 i = 0; i < 2 * num_protos_diff * max_band_decorr_temp; i++ )
         {
-            aux_buffer_fx[i] = L_shr( aux_buffer_fx[i], sub( q_aux_buffer, q_temp ) ); // q_temp
+            aux_buffer_fx[i] = L_shr( aux_buffer_fx[i], shift_q ); // q_temp
             move32();
         }
     }
@@ -566,9 +565,9 @@ void ivas_dirac_dec_decorr_process_fx(
             /* final phase rotation */
             FOR( k = 0; k < max_band_decorr; k++ )
             {
-                *p_frame_dec_fx = L_sub( Mpy_32_16_1( ( *decorr_buffer_fx ), ( *phase_coeff_real_fx ) ), Mpy_32_16_1( ( *( decorr_buffer_fx + 1 ) ), ( *phase_coeff_imag_fx ) ) ); // sub( q_decorr_buf, 1 )
+                *p_frame_dec_fx = Msub_32_16( Mpy_32_16_1( *decorr_buffer_fx, ( *phase_coeff_real_fx ) ), *( decorr_buffer_fx + 1 ), ( *phase_coeff_imag_fx ) ); // sub( q_decorr_buf, 1 )
                 p_frame_dec_fx++;
-                *p_frame_dec_fx = L_add( Mpy_32_16_1( ( *decorr_buffer_fx ), ( *phase_coeff_imag_fx ) ), Mpy_32_16_1( ( *( decorr_buffer_fx + 1 ) ), ( *phase_coeff_real_fx ) ) ); // sub( q_decorr_buf, 1 )
+                *p_frame_dec_fx = Madd_32_16( Mpy_32_16_1( *decorr_buffer_fx, ( *phase_coeff_imag_fx ) ), ( *( decorr_buffer_fx + 1 ) ), ( *phase_coeff_real_fx ) ); // sub( q_decorr_buf, 1 )
                 p_frame_dec_fx++;
                 phase_coeff_imag_fx++;
                 phase_coeff_real_fx++;
@@ -590,18 +589,6 @@ void ivas_dirac_dec_decorr_process_fx(
         Word16 decorr_buff_tot_len = imult1616( imult1616( shl( decorr_buffer_len, 1 ), max_band_decorr ), num_channels );
         guarded_bits = 0;
 
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-        FOR( Word16 i = 0; i < decorr_buff_tot_len; i++ )
-        {
-            IF( h_freq_domain_decorr_ap_state->decorr_buffer_fx[i] != 0 )
-            {
-                guarded_bits = s_max( find_guarded_bits_fx( 2 ), 3 );
-            }
-        }
-        q_shift = sub( getScaleFactor32( h_freq_domain_decorr_ap_state->decorr_buffer_fx, decorr_buff_tot_len ), guarded_bits );
-        Scale_sig32( h_freq_domain_decorr_ap_state->decorr_buffer_fx, decorr_buff_tot_len, q_shift );
-        q_decorr_buf = add( q_decorr_buf, q_shift );
-#else
         Flag is_zero = is_zero_arr( h_freq_domain_decorr_ap_state->decorr_buffer_fx, decorr_buff_tot_len );
         if ( is_zero == 0 )
         {
@@ -617,11 +604,10 @@ void ivas_dirac_dec_decorr_process_fx(
                 q_decorr_buf = add( q_decorr_buf, q_shift );
             }
         }
-#endif
 
         q_shift = getScaleFactor32( aux_buffer_fx, imult1616( imult1616( 2, num_protos_dir ), max_band_decorr_temp ) );
-
-        FOR( Word16 j = 0; j < shl( imult1616( num_protos_dir, max_band_decorr_temp ), 1 ); j++ )
+        Word16 buf_len = shl( imult1616( num_protos_dir, max_band_decorr_temp ), 1 );
+        FOR( Word16 j = 0; j < buf_len; j++ )
         {
             aux_buffer_fx[j] = L_shl( aux_buffer_fx[j], q_shift ); // add( q_aux_buffer, q_shift )
             move32();
@@ -674,21 +660,15 @@ void ivas_dirac_dec_decorr_process_fx(
                     filter_coeff_num_real_fx = &h_freq_domain_decorr_ap_params->filter_coeff_num_real_fx[idx_filter]; // Q12
                     filter_coeff_den_real_fx = &h_freq_domain_decorr_ap_params->filter_coeff_den_real_fx[idx_filter]; // Q12
                     decorr_buffer_start_ptr_fx = &h_freq_domain_decorr_ap_state->decorr_buffer_fx[2 * ( ch_idx * max_band_decorr + band_idx )];
-                    input_real_fx = aux_buffer_fx[shl( add( imult1616( proto_index_dir[ch_idx], max_band_decorr ), band_idx ), 1 )];           // q_aux
-                    input_imag_fx = aux_buffer_fx[add( shl( add( imult1616( proto_index_dir[ch_idx], max_band_decorr ), band_idx ), 1 ), 1 )]; // q_aux
+                    Word16 idx = shl( add( imult1616( proto_index_dir[ch_idx], max_band_decorr ), band_idx ), 1 );
+                    input_real_fx = aux_buffer_fx[idx];     // q_aux
+                    input_imag_fx = aux_buffer_fx[idx + 1]; // q_aux
 
                     /* MA part of filter impulse response */
                     FOR( l = 0; l < filter_length; l++ )
                     {
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-                        frame_ma_fx[2 * l] = Mpy_32_16_1( input_real_fx, filter_coeff_num_real_fx[l] ); // Q_qux -3 = q_deorr
-                        // frame_ma_fx[2 * l] = L_shr(frame_ma_fx[2 * l],3); // scaling to q_decorr_buf
-                        frame_ma_fx[add( shl( l, 1 ), 1 )] = Mpy_32_16_1( input_imag_fx, filter_coeff_num_real_fx[l] ); // Q_qux - 3 = q_deorr
-                                                                                                                        // frame_ma_fx[2 * l + 1] = L_shr(frame_ma_fx[2 * l + 1], 3); // scaling to q_decorr_buf
-#else
-                        frame_ma_fx[2 * l] = Mpy_32_16_1( input_real_fx, filter_coeff_num_real_fx[l] );     // Q_qux -3 = q_deorr
-                        frame_ma_fx[2 * l + 1] = Mpy_32_16_1( input_imag_fx, filter_coeff_num_real_fx[l] ); // Q_qux - 3 = q_deorr
-#endif
+                        frame_ma_fx[2 * l] = Mpy_32_32( input_real_fx, filter_coeff_num_real_fx[l] );     // Q_qux -3 = q_deorr
+                        frame_ma_fx[2 * l + 1] = Mpy_32_32( input_imag_fx, filter_coeff_num_real_fx[l] ); // Q_qux - 3 = q_deorr
                         move32();
                         move32();
                     }
@@ -704,45 +684,26 @@ void ivas_dirac_dec_decorr_process_fx(
                     filter_frame_real_fx = decorr_buffer_ptr_fx[0]; // q_decorr
                     filter_frame_imag_fx = decorr_buffer_ptr_fx[1]; // q_decorr
 
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-                    decorr_buffer_ptr_fx += shl( decorr_buffer_step, 1 );
-#else
                     Word16 decorr_buffer_step2x = shl( decorr_buffer_step, 1 );
 
                     decorr_buffer_ptr_fx += decorr_buffer_step2x;
                     move16();
-#endif
 
                     FOR( l = 1; l < filter_length; l++ )
                     {
                         // q adjustment needed//
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-                        decorr_buffer_ptr_fx[0] = L_add( decorr_buffer_ptr_fx[0], frame_ma_fx[2 * l] );                 // q_decorr
-                        Word32 temp_1 = Mpy_32_16_1( filter_frame_real_fx, filter_coeff_den_real_fx[l] );               // q_decorr - 3
-                        temp_1 = L_shl( temp_1, 3 );                                                                    // q_decorr
-                        decorr_buffer_ptr_fx[0] = L_sub( decorr_buffer_ptr_fx[0], temp_1 );                             // q_deocor
-                        decorr_buffer_ptr_fx[1] = L_add( decorr_buffer_ptr_fx[1], frame_ma_fx[add( shl( l, 1 ), 1 )] ); // q_decorr
-                        Word32 temp_2 = Mpy_32_16_1( filter_frame_imag_fx, filter_coeff_den_real_fx[l] );               // q_decorr - 3
-                        temp_2 = L_shl( temp_2, 3 );                                                                    // q_decorr
-                        decorr_buffer_ptr_fx[1] = L_sub( decorr_buffer_ptr_fx[1], temp_2 );                             // q_decorr
-                        decorr_buffer_ptr_fx += imult1616( 2, decorr_buffer_step );
-                        move32();
-                        move32();
-                        move32();
-#else
-                        Word32 temp_1 = Mpy_32_16_1( filter_frame_real_fx, filter_coeff_den_real_fx[l] );                // q_decorr - 3
+                        Word32 temp_1 = Mpy_32_32( filter_frame_real_fx, filter_coeff_den_real_fx[l] );                  // q_decorr - 3
                         temp_1 = L_shl( temp_1, 3 );                                                                     // q_decorr
                         decorr_buffer_ptr_fx[0] = L_sub( L_add( decorr_buffer_ptr_fx[0], frame_ma_fx[2 * l] ), temp_1 ); // q_deocor
                         move32();
 
-                        Word32 temp_2 = Mpy_32_16_1( filter_frame_imag_fx, filter_coeff_den_real_fx[l] );                    // q_decorr - 3
+                        Word32 temp_2 = Mpy_32_32( filter_frame_imag_fx, filter_coeff_den_real_fx[l] );                      // q_decorr - 3
                         temp_2 = L_shl( temp_2, 3 );                                                                         // q_decorr
                         decorr_buffer_ptr_fx[1] = L_sub( L_add( decorr_buffer_ptr_fx[1], frame_ma_fx[2 * l + 1] ), temp_2 ); // q_decorr
                         move32();
 
                         decorr_buffer_ptr_fx += decorr_buffer_step2x;
                         move16();
-#endif
                     }
                 }
             }
@@ -763,34 +724,31 @@ void ivas_dirac_dec_decorr_process_fx(
         e_direct_energy_smooth = sub( 31, h_freq_domain_decorr_ap_state->q_direct_energy_smooth );
 
         // scaling to get max precision for aux_buffer values//
-#ifdef MSAN_FIX
         q_shift = Q31;
         move16();
+        offset = shl( max_band_decorr, 1 );
         FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
         {
             q_shift = s_min( q_shift,
-                             L_norm_arr( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ) ) );
+                             L_norm_arr( &frame_dec_fx[2 * ch_idx * num_freq_bands], offset ) );
         }
         FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
         {
-            Scale_sig32( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ), q_shift );
+            scale_sig32( &frame_dec_fx[2 * ch_idx * num_freq_bands], offset, q_shift );
         }
-#else
-        q_shift = L_norm_arr( frame_dec_fx, ( 2 * max_band_decorr + incr_aux ) * num_channels );
-        Scale_sig32( frame_dec_fx, ( 2 * max_band_decorr + incr_aux ) * num_channels, q_shift );
-#endif
         q_frame_f = add( q_frame_f, q_shift );
 
 
         IF( h_freq_domain_decorr_ap_params->use_ducker )
         {
+            Word16 len1 = shl( imult1616( max_band_decorr, num_protos_dir ), 1 );
             /* compute direct power w/o onsets for the energy ratio, signal is still in the aux buffer */
-            v_mult_fixed( aux_buffer_fx, aux_buffer_fx, aux_buffer_fx, shl( imult1616( max_band_decorr, num_protos_dir ), 1 ) ); // 2 *q_aux -31
+            v_mult_fixed( aux_buffer_fx, aux_buffer_fx, aux_buffer_fx, len1 ); // 2 *q_aux -31
 
-            q_aux_buffer = sub( imult1616( 2, q_aux_buffer ), 31 );
+            q_aux_buffer = sub( shl( q_aux_buffer, 1 ), 31 );
 
             // if this scaling is eliminated overflow is happening fot v_add_inc_fix
-            q_shift = sub( L_norm_arr( aux_buffer_fx, shl( imult1616( num_protos_dir, max_band_decorr ), 1 ) ), find_guarded_bits_fx( 2 ) );
+            q_shift = sub( L_norm_arr( aux_buffer_fx, len1 ), 1 /*find_guarded_bits_fx( 2 )*/ );
             Scale_sig32( aux_buffer_fx, shl( imult1616( num_protos_dir, max_band_decorr_temp ), 1 ), q_shift );
             q_aux_buffer = add( q_aux_buffer, q_shift );
 
@@ -799,24 +757,8 @@ void ivas_dirac_dec_decorr_process_fx(
             q_direct_energy = q_aux_buffer;
             move16();
 
-#ifdef FIX_1110_OPTIM_DIRAC_DECORR_PROC
             /* Attention: this loop reports norm=0, whenever any data is 0. */
             /* Therefore, useful left-shifts are skipped, accuracy is lost. */
-#endif
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-            /* calculate the power of the decorrelated signal */
-            FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
-            {
-                offset1 = shl( imult1616( ch_idx, num_freq_bands ), 1 );
-                offset2 = shl( imult1616( ch_idx, max_band_decorr ), 1 );
-                FOR( Word16 i = 0; i < 2 * max_band_decorr; i++ )
-                {
-                    aux_64[add( offset2, i )] = W_mult0_32_32( frame_dec_fx[add( offset1, i )], frame_dec_fx[add( offset1, i )] );
-                    move64();
-                    norm = s_min( norm, W_norm( aux_64[add( offset2, i )] ) );
-                }
-            }
-#else
             /* calculate the power of the decorrelated signal */
             Word64 *m64_aux = aux_64;
             move32();
@@ -846,51 +788,22 @@ void ivas_dirac_dec_decorr_process_fx(
                 move32();
             }
             norm = W_norm( min64 );
-#endif
-
-            FOR( Word16 i = 0; i < shl( imult1616( num_channels, max_band_decorr ), 1 ); i++ )
+            norm = sub( norm, 1 /*find_guarded_bits_fx( 2 )*/ );
+            FOR( Word16 i = 0; i < 2 * num_channels * max_band_decorr; i++ )
             {
-                aux_buffer_fx[i] = W_extract_h( W_shl( aux_64[i], sub( norm, find_guarded_bits_fx( 2 ) ) ) );
+                aux_buffer_fx[i] = W_extract_h( W_shl( aux_64[i], norm ) );
                 move32();
             }
-            q_aux_buffer = add( imult1616( 2, q_frame_f ), sub( sub( norm, 1 ), 32 ) );
+            q_aux_buffer = add( shl( q_frame_f, 1 ), sub( norm, 32 ) );
 
 
             FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
             {
-                v_add_inc_fx( &aux_buffer_fx[shl( imult1616( ch_idx, max_band_decorr ), 1 )], 2, &aux_buffer_fx[add( shl( imult1616( ch_idx, max_band_decorr ), 1 ), 1 )], 2, &aux_buffer_fx[imult1616( ch_idx, max_band_decorr )], 1, max_band_decorr );
+                v_add_inc_fx( &aux_buffer_fx[2 * ch_idx * max_band_decorr], 2, &aux_buffer_fx[2 * ch_idx * max_band_decorr + 1], 2, &aux_buffer_fx[ch_idx * max_band_decorr], 1, max_band_decorr );
             }
 
             /* smooth energies */
 
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-            v_multc_fixed( aux_buffer_fx, ONE_M_DIRAC_DUCK_ALPHA, aux_buffer_fx, imult1616( num_channels, max_band_decorr ) ); // q_aux_buffer
-
-            v_multc_fixed( h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx, DIRAC_DUCK_ALPHA_FX, h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx, imult1616( num_channels, max_band_decorr ) ); // same-q
-
-            v_add_fixed_me( aux_buffer_fx, sub( 31, q_aux_buffer ), h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx, e_reverb_energy_smooth, h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx, &e_reverb_energy_smooth, imult1616( num_channels, max_band_decorr ), 0 );
-            h_freq_domain_decorr_ap_state->q_reverb_energy_smooth = sub( 31, e_reverb_energy_smooth );
-
-            v_multc_fixed( direct_energy_fx, ONE_M_DIRAC_DUCK_ALPHA, direct_energy_fx, imult1616( num_protos_dir, max_band_decorr ) ); // same q
-
-            v_multc_fixed( h_freq_domain_decorr_ap_state->direct_energy_smooth_fx, DIRAC_DUCK_ALPHA_FX, h_freq_domain_decorr_ap_state->direct_energy_smooth_fx, imult1616( num_protos_dir, max_band_decorr ) ); // same q
-
-            v_add_fixed_me( direct_energy_fx, sub( 31, q_direct_energy ), h_freq_domain_decorr_ap_state->direct_energy_smooth_fx, e_direct_energy_smooth, h_freq_domain_decorr_ap_state->direct_energy_smooth_fx, &e_direct_energy_smooth, imult1616( num_protos_dir, max_band_decorr ), 0 );
-            h_freq_domain_decorr_ap_state->q_direct_energy_smooth = sub( 31, e_direct_energy_smooth );
-            move16();
-
-            // scaling energy buffers for better precision for higher values//
-            q_shift = L_norm_arr( h_freq_domain_decorr_ap_state->direct_energy_smooth_fx, imult1616( num_protos_dir, max_band_decorr ) );
-            Scale_sig32( h_freq_domain_decorr_ap_state->direct_energy_smooth_fx, imult1616( num_protos_dir, max_band_decorr ), q_shift );
-            h_freq_domain_decorr_ap_state->q_direct_energy_smooth = add( h_freq_domain_decorr_ap_state->q_direct_energy_smooth, q_shift );
-            move16();
-
-
-            q_shift = L_norm_arr( h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx, imult1616( num_channels, max_band_decorr ) );
-            Scale_sig32( h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx, imult1616( num_channels, max_band_decorr ), q_shift );
-            h_freq_domain_decorr_ap_state->q_reverb_energy_smooth = add( h_freq_domain_decorr_ap_state->q_reverb_energy_smooth, q_shift );
-            move16();
-#else
             Word16 len = imult1616( num_channels, max_band_decorr );
             Word16 aux_e = sub( 31, q_aux_buffer );
             Word16 max_e = s_max( aux_e, e_reverb_energy_smooth );
@@ -945,36 +858,30 @@ void ivas_dirac_dec_decorr_process_fx(
                 h_freq_domain_decorr_ap_state->q_reverb_energy_smooth = add( h_freq_domain_decorr_ap_state->q_reverb_energy_smooth, q_shift );
                 move16();
             }
-            h_freq_domain_decorr_ap_state->q_reverb_energy_smooth = min( MAX_Q_FX, h_freq_domain_decorr_ap_state->q_reverb_energy_smooth );
-            h_freq_domain_decorr_ap_state->q_direct_energy_smooth = min( MAX_Q_FX, h_freq_domain_decorr_ap_state->q_direct_energy_smooth );
-#endif
+            h_freq_domain_decorr_ap_state->q_reverb_energy_smooth = s_min( MAX_Q_FX, h_freq_domain_decorr_ap_state->q_reverb_energy_smooth );
+            h_freq_domain_decorr_ap_state->q_direct_energy_smooth = s_min( MAX_Q_FX, h_freq_domain_decorr_ap_state->q_direct_energy_smooth );
 
             e_reverb_energy_smooth = sub( 31, h_freq_domain_decorr_ap_state->q_reverb_energy_smooth );
             e_direct_energy_smooth = sub( 31, h_freq_domain_decorr_ap_state->q_direct_energy_smooth );
 
             // this step is b/c we are left shifting frame_dec_fx at the end of below for loop/
-#ifdef MSAN_FIX
             q_shift = Q31;
             move16();
             FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
             {
                 q_shift = s_min( q_shift,
-                                 sub( L_norm_arr( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ) ),
+                                 sub( L_norm_arr( &frame_dec_fx[2 * ch_idx * num_freq_bands], shl( max_band_decorr, 1 ) ),
                                       Q2 ) );
             }
             FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
             {
                 Scale_sig32( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ), q_shift );
             }
-#else
-            q_shift = sub( L_norm_arr( frame_dec_fx, ( 2 * max_band_decorr + incr_aux ) * num_channels ), 2 );
-            Scale_sig32( frame_dec_fx, ( 2 * max_band_decorr + incr_aux ) * num_channels, q_shift );
-#endif
             q_frame_f = add( q_frame_f, q_shift );
 
             FOR( ch_idx = 0; ch_idx < num_channels; ch_idx++ )
             {
-                Word32 *frame_dec_fx_ptr = &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )];
+                Word32 *frame_dec_fx_ptr = &frame_dec_fx[2 * ch_idx * num_freq_bands];
                 Word16 cur_proto_index = imult1616( proto_index_dir[ch_idx], max_band_decorr );
                 Word16 cur_reverb_index = imult1616( ch_idx, max_band_decorr );
                 Word32 *reverb_energy_smooth_ptr = &h_freq_domain_decorr_ap_state->reverb_energy_smooth_fx[cur_reverb_index]; // q_aux
@@ -1003,13 +910,8 @@ void ivas_dirac_dec_decorr_process_fx(
 
                         duck_gain = shl( duck_gain, sub( e_duck_gain, 1 ) ); // Q14
 
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-                        frame_dec_fx_ptr[2 * band_idx] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx], duck_gain ), 1 );                                 // q_frame_f
-                        frame_dec_fx_ptr[add( shl( band_idx, 1 ), 1 )] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[add( shl( band_idx, 1 ), 1 )], duck_gain ), 1 ); // q_frame_f
-#else
                         frame_dec_fx_ptr[2 * band_idx] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx], duck_gain ), 1 );         // q_frame_f
                         frame_dec_fx_ptr[2 * band_idx + 1] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx + 1], duck_gain ), 1 ); // q_frame_f
-#endif
                         move32();
                         move32();
                     }
@@ -1020,23 +922,14 @@ void ivas_dirac_dec_decorr_process_fx(
                         e_duck_gain = add( e_duck_gain, sub( e_direct_energy_smooth, add( e_reverb_energy_smooth, 1 ) ) );
 
                         duck_gain = Sqrt16( duck_gain, &e_duck_gain );
-                        Word16 comp_flag = BASOP_Util_Cmp_Mant32Exp( duck_gain, e_duck_gain, 16384, 2 );
-                        IF( EQ_16( comp_flag, 1 ) )
+                        /* if ( duck_gain > 2.0f )
                         {
-                            duck_gain = 16384; // 2inQ13
-                            move16();
-                        }
-                        ELSE
-                        {
-                            duck_gain = shl( duck_gain, sub( e_duck_gain, 2 ) ); // Q13
-                        }
-#ifndef FIX_1110_OPTIM_DIRAC_DECORR_PROC
-                        frame_dec_fx_ptr[2 * band_idx] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx], duck_gain ), 2 );                                 // q_frame_dec
-                        frame_dec_fx_ptr[add( shl( band_idx, 1 ), 1 )] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[add( shl( band_idx, 1 ), 1 )], duck_gain ), 2 ); // q_frame_dec
-#else
-                        frame_dec_fx_ptr[2 * band_idx] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx], duck_gain ), 2 );         // q_frame_dec
-                        frame_dec_fx_ptr[2 * band_idx + 1] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx + 1], duck_gain ), 2 ); // q_frame_dec
-#endif
+                            duck_gain = 2.0f;
+                        } */
+                        duck_gain = shl_sat( duck_gain, sub( e_duck_gain, 1 ) ); // Q14
+
+                        frame_dec_fx_ptr[2 * band_idx] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx], duck_gain ), 1 );         // q_frame_dec
+                        frame_dec_fx_ptr[2 * band_idx + 1] = L_shl( Mpy_32_16_1( frame_dec_fx_ptr[2 * band_idx + 1], duck_gain ), 1 ); // q_frame_dec
                         move32();
                         move32();
                     }
@@ -1055,34 +948,26 @@ void ivas_dirac_dec_decorr_process_fx(
             Word16 sf = MAX_16;
             FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
             {
-                sf = s_min( sf, getScaleFactor32( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ) ) );
+                sf = s_min( sf, getScaleFactor32( &frame_dec_fx[2 * ch_idx * num_freq_bands], shl( max_band_decorr, 1 ) ) );
             }
             sf = s_min( sub( sf, 1 ), q_shift );
             q_if_local = sub( q_shift, sf );
             q_shift = sf;
             move16();
             // scaling it to sf
-#ifdef MSAN_FIX
             FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
             {
-                scale_sig32( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ), q_shift );
+                scale_sig32( &frame_dec_fx[2 * ch_idx * num_freq_bands], shl( max_band_decorr, 1 ), q_shift );
             }
-#else
-            Scale_sig32( frame_dec_fx, ( 2 * max_band_decorr + incr_aux ) * num_channels, q_shift );                                   // scaling it to input q
-#endif
             q_frame_f = add( q_frame_f, sf );
         }
         ELSE IF( q_shift < 0 )
         {
             // scaling it to input q
-#ifdef MSAN_FIX
             FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
             {
-                scale_sig32( &frame_dec_fx[shl( imult1616( ch_idx, num_freq_bands ), 1 )], shl( max_band_decorr, 1 ), q_shift );
+                scale_sig32( &frame_dec_fx[2 * ch_idx * num_freq_bands], shl( max_band_decorr, 1 ), q_shift );
             }
-#else
-            Scale_sig32( frame_dec_fx, ( 2 * max_band_decorr + incr_aux ) * num_channels, q_shift );                                   // scaling it to input q
-#endif
             q_frame_f = q_input_frame;
             q_if_local = 0;
             move16();
@@ -1098,24 +983,22 @@ void ivas_dirac_dec_decorr_process_fx(
 
                 FOR( k = 0; k < max_band_decorr; ++k )
                 {
-                    aux_buffer_fx[2 * k] = Mpy_32_32( L_shr_r( input_frame_fx[add( shl( offset, 1 ), shl( k, 1 ) )], q_if_local ), L_sub( ONE_IN_Q31, onset_filter_fx[add( offset, k )] ) );
-                    aux_buffer_fx[add( shl( k, 1 ), 1 )] = Mpy_32_32( L_shr_r( input_frame_fx[add( add( shl( offset, 1 ), shl( k, 1 ) ), 1 )], q_if_local ), L_sub( ONE_IN_Q31, onset_filter_fx[add( offset, k )] ) ); // q_frame_f
+                    aux_buffer_fx[2 * k] = Mpy_32_32( L_shr_r( input_frame_fx[2 * ( offset + k )], q_if_local ), L_sub( ONE_IN_Q31, onset_filter_fx[offset + k] ) );
+                    aux_buffer_fx[add( shl( k, 1 ), 1 )] = Mpy_32_32( L_shr_r( input_frame_fx[2 * ( offset + k ) + 1], q_if_local ), L_sub( ONE_IN_Q31, onset_filter_fx[offset + k] ) ); // q_frame_f
                     move32();
                     move32();
                 }
 
-                v_add_fx( &frame_dec_fx[imult1616( ch_idx, shl( num_freq_bands, 1 ) )], aux_buffer_fx, &frame_dec_fx[imult1616( ch_idx, shl( num_freq_bands, 1 ) )], shl( max_band_decorr, 1 ) );
+                v_add_fx( &frame_dec_fx[2 * ch_idx * num_freq_bands], aux_buffer_fx, &frame_dec_fx[2 * ch_idx * num_freq_bands], shl( max_band_decorr, 1 ) );
             }
         }
 
         /* avoid decorrelation above maximum frequency -> set to zero the remaining frequencies*/
+        Word16 val = shl( sub( num_freq_bands, h_freq_domain_decorr_ap_params->max_band_decorr ), 1 );
         FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
         {
-            /* calc output indices */
-            idx_in_out = shl( ( add( imult1616( ch_idx, num_freq_bands ), h_freq_domain_decorr_ap_params->max_band_decorr ) ), 1 );
-
             /* copy to output signal */
-            set32_fx( &frame_dec_fx[idx_in_out], 0, shl( sub( num_freq_bands, h_freq_domain_decorr_ap_params->max_band_decorr ), 1 ) );
+            set32_fx( &frame_dec_fx[2 * ( ch_idx * num_freq_bands + h_freq_domain_decorr_ap_params->max_band_decorr )], 0, val );
         }
         *q_frame_dec = q_frame_f;
         move16();
@@ -1264,16 +1147,16 @@ void ivas_dirac_dec_decorr_close_fx(
 static void get_lattice_coeffs_fx(
     const Word16 band_index,    // Q0
     const Word16 channel_index, // Q0
-    Word16 *lattice_coeffs )    // Q12
+    Word32 *lattice_coeffs )    // Q31
 {
     Word16 k;
 
     FOR( k = 0; k < ap_filter_length[band_index]; k++ )
     {
-        Word16 cur_lattice_coeff = ap_lattice_coeffs_fx[band_index][add( imult1616( channel_index, ap_filter_length[band_index] ), k )]; // Q12
-        lattice_coeffs[k] = cur_lattice_coeff;                                                                                           // Q12
-        move16();
-        move16();
+        Word32 cur_lattice_coeff = ap_lattice_coeffs_fx[band_index][add( imult1616( channel_index, ap_filter_length[band_index] ), k )]; // Q31
+        lattice_coeffs[k] = cur_lattice_coeff;                                                                                           // Q31
+        move32();
+        move32();
     }
 
     return;
@@ -1282,41 +1165,41 @@ static void get_lattice_coeffs_fx(
 
 /* convert lattice filter coeffs to all pass transfer function coeffs */
 static void lattice2allpass_fx(
-    const int16_t filter_length,        // Q0
-    const Word16 *lattice_coeffs_fx,    // Q15
-    Word16 *filter_coeffs_num_real_fx,  // Q12
-    Word16 *filter_coeffs_den_real_fx ) // Q12
+    const Word16 filter_length,         // Q0
+    const Word32 *lattice_coeffs_fx,    // Q31
+    Word32 *filter_coeffs_num_real_fx,  // Q28
+    Word32 *filter_coeffs_den_real_fx ) // Q28
 {
     Word16 i, p;
 
-    Word16 alpha_real_fx[2][DIRAC_MAX_DECORR_FILTER_LEN + 1];
-    Word16 *alpha_real_p_old_fx = &alpha_real_fx[0][0];
-    Word16 *alpha_real_p_fx = &alpha_real_fx[1][0];
-    Word16 *tmp_fx;
+    Word32 alpha_real_fx[2][DIRAC_MAX_DECORR_FILTER_LEN + 1];
+    Word32 *alpha_real_p_old_fx = &alpha_real_fx[0][0];
+    Word32 *alpha_real_p_fx = &alpha_real_fx[1][0];
+    Word32 *tmp_fx;
 
     FOR( i = 0; i < 2; i++ )
     {
-        set16_fx( alpha_real_fx[i], 0, DIRAC_MAX_DECORR_FILTER_LEN + 1 );
+        set32_fx( alpha_real_fx[i], 0, DIRAC_MAX_DECORR_FILTER_LEN + 1 );
     }
 
-    alpha_real_p_fx[0] = ONE_IN_Q12;
-    move16();
-    alpha_real_p_old_fx[0] = ONE_IN_Q12;
-    move16();
+    alpha_real_p_fx[0] = ONE_IN_Q28;
+    move32();
+    alpha_real_p_old_fx[0] = ONE_IN_Q28;
+    move32();
 
     /* recursion */
-    Word16 lattice_alpha = 0;
-    move16();
+    Word32 lattice_alpha = 0;
+    move32();
     FOR( p = 1; p < filter_length; p++ )
     {
-        alpha_real_p_fx[p] = shr( lattice_coeffs_fx[( p - 1 )], 3 ); /* Q12 */
+        alpha_real_p_fx[p] = L_shr( lattice_coeffs_fx[( p - 1 )], 3 ); /* Q28 */
         move16();
 
         FOR( i = 1; i < p; i++ )
         {
-            lattice_alpha = mult( lattice_coeffs_fx[( p - 1 )], alpha_real_p_old_fx[sub( p, i )] ); /* Q12 */
-            alpha_real_p_fx[i] = add( alpha_real_p_old_fx[i], lattice_alpha );                      /* Q12 */
-            move16();
+            lattice_alpha = Mpy_32_32( lattice_coeffs_fx[( p - 1 )], alpha_real_p_old_fx[sub( p, i )] ); /* Q28 */
+            alpha_real_p_fx[i] = L_add( alpha_real_p_old_fx[i], lattice_alpha );                         /* Q28 */
+            move32();
         }
         /* switch pointers */
         tmp_fx = alpha_real_p_old_fx;
@@ -1326,10 +1209,10 @@ static void lattice2allpass_fx(
 
     FOR( i = 0; i < filter_length; i++ )
     {
-        filter_coeffs_den_real_fx[i] = alpha_real_p_old_fx[i]; /* Q12 */
-        move16();
-        filter_coeffs_num_real_fx[i] = alpha_real_p_old_fx[sub( sub( filter_length, i ), 1 )]; /* Q12 */
-        move16();
+        filter_coeffs_den_real_fx[i] = alpha_real_p_old_fx[i]; /* Q28 */
+        move32();
+        filter_coeffs_num_real_fx[i] = alpha_real_p_old_fx[sub( sub( filter_length, i ), 1 )]; /* Q28 */
+        move32();
     }
 
     return;
diff --git a/lib_rend/ivas_dirac_onsets_dec.c b/lib_rend/ivas_dirac_onsets_dec_fx.c
similarity index 70%
rename from lib_rend/ivas_dirac_onsets_dec.c
rename to lib_rend/ivas_dirac_onsets_dec_fx.c
index 9e82fa02269f2456dac58a477d3916a05d34f13c..80adebfdd18661e0160e31f6c753bfd60cd6930a 100644
--- a/lib_rend/ivas_dirac_onsets_dec.c
+++ b/lib_rend/ivas_dirac_onsets_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,118 +34,12 @@
 #include <stdint.h>
 #include "options.h"
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
-
-static Word16 BASOP_Util_Cmp_Mant32Exp_sat( Word32 a_m, Word16 a_e, Word32 b_m, Word16 b_e );
-Word16 BASOP_Util_Cmp_Mant32Exp_sat /*!< o: flag: result of comparison */
-    /*      0, if a == b               */
-    /*      1, if a > b                */
-    /*     -1, if a < b                */
-    ( Word32 a_m,  /*!< i: Mantissa of 1st operand a  */
-      Word16 a_e,  /*!< i: Exponent of 1st operand a  */
-      Word32 b_m,  /*!< i: Mantissa of 2nd operand b  */
-      Word16 b_e ) /*!< i: Exponent of 2nd operand b  */
-
-{
-    Word32 diff_m;
-    Word16 diff_e, shift, result;
-
-
-    /*
-       This function compares two input parameters, both represented by a 32-bit mantissa and a 16-bit exponent.
-       If both values are identical, 0 is returned.
-       If a is greater b, 1 is returned.
-       If a is less than b, -1 is returned.
-    */
-
-    /* Check, if both mantissa and exponents are identical, when normalized: return 0 */
-    shift = norm_l( a_m );
-    IF( shift )
-    {
-        a_m = L_shl( a_m, shift );
-    }
-    IF( shift )
-    {
-        a_e = sub( a_e, shift );
-    }
-
-    shift = norm_l( b_m );
-    IF( shift )
-    {
-        b_m = L_shl( b_m, shift );
-    }
-    IF( shift )
-    {
-        b_e = sub( b_e, shift );
-    }
-
-    /* align exponent, if any mantissa is zero */
-    if ( !a_m )
-    {
-        a_e = b_e;
-        move16();
-    }
-    if ( !b_m )
-    {
-        b_e = a_e;
-        move16();
-    }
-
-    BASOP_SATURATE_WARNING_OFF_EVS
-    diff_m = L_sub_sat( a_m, b_m );
-    BASOP_SATURATE_WARNING_ON_EVS
-    diff_e = sub( a_e, b_e );
-
-    test();
-    IF( diff_m == 0 && diff_e == 0 )
-    {
-        return 0;
-    }
-
-    /* Check sign, exponent and mantissa to identify, whether a is greater b or not */
-    result = -1;
-    move16();
-
-    IF( a_m >= 0 )
-    {
-        /* a is positive */
-        if ( b_m < 0 )
-        {
-            result = 1;
-            move16();
-        }
-
-        test();
-        test();
-        test();
-        if ( ( b_m >= 0 ) && ( ( diff_e > 0 ) || ( diff_e == 0 && diff_m > 0 ) ) )
-        {
-            result = 1;
-            move16();
-        }
-    }
-    ELSE
-    {
-        /* a is negative */
-        test();
-        test();
-        test();
-        if ( ( b_m < 0 ) && ( ( diff_e < 0 ) || ( diff_e == 0 && diff_m > 0 ) ) )
-        {
-            result = 1;
-            move16();
-        }
-    }
-    return result;
-}
-
 
 /*-------------------------------------------------------------------------
  * ivas_dirac_dec_onset_detection_open()
@@ -247,31 +141,22 @@ void ivas_dirac_dec_onset_detection_process_fx(
                 move32();
             }
 
-            IF( *p_onset_detector_1_fx == 0 )
+            if ( *p_onset_detector_1_fx == 0 )
             {
 
-                *p_onset_detector_1_fx = L_add( *p_onset_detector_1_fx, EPSILON_FX ); /* Q(q_onset_detector) */
+                *p_onset_detector_1_fx = EPSILON_FX; /* Q(q_onset_detector) */
                 move32();
             }
             /*onset filter limited between 0 and 1*/
             tmp_fx = BASOP_Util_Divide3232_Scale( *p_onset_detector_2_fx, *p_onset_detector_1_fx, &e_scale );
-            tmp32_fx = L_mult0( tmp_fx, DIRAC_ONSET_GAIN_FX );
+            tmp32_fx = L_mult0( tmp_fx, DIRAC_ONSET_GAIN_FX ); // Q= Q12 + (15-e_scale)
             if ( tmp32_fx < 0 )
             {
                 tmp32_fx = 0;
                 move32();
             }
-            Word16 comp_flag = BASOP_Util_Cmp_Mant32Exp_sat( tmp32_fx, add( e_scale, 4 ), ONE_IN_Q30, 1 );
-            test();
-            IF( EQ_16( comp_flag, 1 ) || comp_flag == 0 )
-            {
-                tmp32_fx = ONE_IN_Q31;
-                move32();
-            }
-            ELSE
-            {
-                tmp32_fx = L_shl( tmp32_fx, add( e_scale, 4 ) );
-            }
+            tmp32_fx = L_shl_sat( tmp32_fx, add( e_scale, 4 ) );
+
             onset_filter[b] = tmp32_fx;
             move32();
 
diff --git a/lib_rend/ivas_dirac_output_synthesis_dec.c b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
similarity index 76%
rename from lib_rend/ivas_dirac_output_synthesis_dec.c
rename to lib_rend/ivas_dirac_output_synthesis_dec_fx.c
index b4274eabebfcd5f1062ba235b35dfe2d4d05fd8d..622ebf89a5870bba79198fdd5f6c3aebf723be70 100644
--- a/lib_rend/ivas_dirac_output_synthesis_dec.c
+++ b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,15 +35,13 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_dec.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_dec.h"
 #include "wmc_auto.h"
-#include "prot_fx.h" /* Function prototypes                    */
 #include "ivas_prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
@@ -200,12 +198,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
     {
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
     }
-#ifdef FIX_867
-    IF( ( dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev = (Word16 *) malloc( size * sizeof( Word16 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-    }
-#endif
     dirac_output_synthesis_state->cy_cross_dir_smooth_prev_len = size;
     move16();
     IF( EQ_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
@@ -215,12 +207,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
-#ifdef FIX_867
-        IF( ( dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev = (Word16 *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirACRend->num_outputs_dir * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-        }
-#endif
         dirac_output_synthesis_state->cy_auto_dir_smooth_prev_len = imult1616( dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff );
         move16();
     }
@@ -230,12 +216,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
-#ifdef FIX_867
-        IF( ( dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev = (Word16 *) malloc( hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_dir * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-        }
-#endif
         dirac_output_synthesis_state->cy_auto_dir_smooth_prev_len = imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir );
         move16();
 
@@ -245,12 +225,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
             }
-#ifdef FIX_867
-            IF( ( dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev = (Word16 *) malloc( hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_dir * sizeof( Word16 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-            }
-#endif
             dirac_output_synthesis_state->cy_auto_diff_smooth_prev_len = imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir );
             move16();
         }
@@ -260,12 +234,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
             }
-#ifdef FIX_867
-            IF( ( dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev = (Word16 *) malloc( hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_diff * sizeof( Word16 ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-            }
-#endif
             dirac_output_synthesis_state->cy_auto_diff_smooth_prev_len = imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff );
             move16();
         }
@@ -276,12 +244,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
     {
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
     }
-#ifdef FIX_867
-    IF( ( dirac_output_synthesis_state->gains_dir_prev_q = (Word16 *) malloc( size * sizeof( Word16 ) ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-    }
-#endif
     dirac_output_synthesis_state->gains_dir_prev_len = size;
     move16();
     test();
@@ -291,12 +253,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
-#ifdef FIX_867
-        IF( ( dirac_output_synthesis_state->gains_diff_prev_q = (Word16 *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirACRend->num_outputs_diff * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-        }
-#endif
         dirac_output_synthesis_state->gains_diff_prev_len = imult1616( dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff );
         move16();
     }
@@ -306,12 +262,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
-#ifdef FIX_867
-        IF( ( dirac_output_synthesis_state->gains_diff_prev_q = (Word16 *) malloc( hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_diff * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-        }
-#endif
         dirac_output_synthesis_state->gains_diff_prev_len = imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff );
         move16();
     }
@@ -321,12 +271,6 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
-#ifdef FIX_867
-        IF( ( dirac_output_synthesis_state->gains_diff_prev_q = (Word16 *) malloc( hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_diff * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-        }
-#endif
         dirac_output_synthesis_state->gains_diff_prev_len = imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir );
         move16();
     }
@@ -360,19 +304,16 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
-#ifdef FIX_867
-        IF( ( dirac_output_synthesis_state->reference_power_smooth_prev_q = (Word16 *) malloc( hSpatParamRendCom->num_freq_bands * sizeof( Word16 ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
-        }
-#endif
         set32_fx( dirac_output_synthesis_state->reference_power_smooth_prev_fx, 0, hSpatParamRendCom->num_freq_bands );
-#ifdef FIX_867
-        set16_fx( dirac_output_synthesis_state->reference_power_smooth_prev_q, Q31, hSpatParamRendCom->num_freq_bands );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        dirac_output_synthesis_state->reference_power_smooth_prev_q[0] = Q31;
+        dirac_output_synthesis_state->reference_power_smooth_prev_q[1] = Q31;
+        move16();
+        move16();
 #else
         dirac_output_synthesis_state->reference_power_smooth_prev_q = Q31;
-#endif
         move16();
+#endif
 
         IF( ( dirac_output_synthesis_state->direction_smoothness_prev_fx = (Word32 *) malloc( hSpatParamRendCom->num_freq_bands * sizeof( Word32 ) ) ) == NULL )
         {
@@ -519,13 +460,8 @@ void ivas_dirac_dec_output_synthesis_init_fx(
     IF( h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx != NULL )
     {
         set32_fx( h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ) );
-#ifdef FIX_867
-        set16_fx( h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ) );
-#endif
     }
-#ifndef FIX_867
     h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev = 0;
-#endif
     move16();
 
     IF( hodirac_flag )
@@ -537,77 +473,51 @@ void ivas_dirac_dec_output_synthesis_init_fx(
         size = imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir );
     }
     set32_fx( h_dirac_output_synthesis_state->cy_cross_dir_smooth_prev_fx, 0, size );
-#ifdef FIX_867
-    set16_zero_fx( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev, size );
-#else
     h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev = 0;
-#endif
     move16();
 
     IF( EQ_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
         set32_fx( h_dirac_output_synthesis_state->cy_auto_diff_smooth_prev_fx, 0, imult1616( h_dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff ) );
-#ifdef FIX_867
-        set16_fx( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev, 0, imult1616( h_dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff ) );
-#endif
     }
     ELSE IF( NE_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_PSD_SHD ) )
     {
         set32_fx( h_dirac_output_synthesis_state->cy_auto_diff_smooth_prev_fx, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff ) );
-#ifdef FIX_867
-        set16_fx( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff ) );
-#endif
     }
     ELSE
     {
         set32_fx( h_dirac_output_synthesis_state->cy_auto_diff_smooth_prev_fx, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ) );
-#ifdef FIX_867
-        set16_fx( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ) );
-#endif
     }
-#ifndef FIX_867
     h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev = 0;
-#endif
     move16();
 
     IF( h_dirac_output_synthesis_state->proto_power_smooth_prev_fx != NULL )
     {
         set32_fx( h_dirac_output_synthesis_state->proto_power_smooth_prev_fx, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_protos_dir ) );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] = Q31;
+        h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] = Q31;
+        move16();
+        move16();
+#else
         h_dirac_output_synthesis_state->proto_power_smooth_prev_q = Q31;
         move16();
+#endif
     }
     set32_fx( h_dirac_output_synthesis_state->gains_dir_prev_fx, 0, size );
-#ifdef FIX_867
-    set16_zero_fx( h_dirac_output_synthesis_state->gains_dir_prev_q, h_dirac_output_synthesis_state->gains_dir_prev_len );
-#else
     h_dirac_output_synthesis_state->gains_dir_prev_q = 0;
     move16();
-#endif
 
     IF( EQ_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
         set32_fx( h_dirac_output_synthesis_state->gains_diff_prev_fx, 0, imult1616( h_dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff ) );
-#ifdef FIX_867
-        if ( h_dirac_output_synthesis_state->gains_diff_prev_q )
-        {
-            set16_zero_fx( h_dirac_output_synthesis_state->gains_diff_prev_q, h_dirac_output_synthesis_params->max_band_decorr * hDirACRend->num_outputs_diff );
-        }
-#endif
     }
     ELSE
     {
         set32_fx( h_dirac_output_synthesis_state->gains_diff_prev_fx, 0, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ) );
-#ifdef FIX_867
-        if ( h_dirac_output_synthesis_state->gains_diff_prev_q )
-        {
-            set16_zero_fx( h_dirac_output_synthesis_state->gains_diff_prev_q, h_dirac_output_synthesis_params->max_band_decorr * hDirACRend->num_outputs_diff );
-        }
-#endif
     }
-#ifndef FIX_867
     h_dirac_output_synthesis_state->gains_diff_prev_q = 0;
     move16();
-#endif
 
     IF( h_dirac_output_synthesis_state->proto_power_diff_smooth_prev_fx != NULL )
     {
@@ -728,7 +638,7 @@ void ivas_dirac_dec_output_synthesis_close_fx(
 
 void ivas_dirac_dec_output_synthesis_process_slot_fx(
     const Word32 *reference_power, /* i  : Estimated power             Q(q_reference_power)*/
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
     const Word16 *q_reference_power, /* i  : Estimated power Q            */
 #else
     const Word16 q_reference_power, /* i  : Estimated power Q            */
@@ -909,15 +819,14 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
 
             /*Direct gain*/
 
-#ifndef FIX_867
             Word16 *Q_temp_cy_cross_dir_smooth_fx = (Word16 *) malloc( num_freq_bands * num_channels_dir * sizeof( Word16 ) );
+
             tmp16 = imult1616( num_freq_bands, num_channels_dir );
             FOR( Word16 kk = 0; kk < tmp16; kk++ )
             {
                 Q_temp_cy_cross_dir_smooth_fx[kk] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
                 move16();
             }
-#endif
 
             FOR( ch_idx = 0; ch_idx < s_min( 4, nchan_transport ); ch_idx++ )
             {
@@ -930,6 +839,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                     Word32 sqr_inp, sqr;
 
                     /*Directonal sound gain nrg compensation*/
+                    c = L_add( ONE_IN_Q29 /*1 Q29*/, Mpy_32_16_1( L_sub( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr_fx, ONE_IN_Q29 /*1 Q29*/ ), 5461 /*1.0 / 6.0 Q15*/ ) ); /*Diffuseness modellling nrg compensation*/ /*Q29*/
                     FOR( k = 0; k < num_freq_bands_diff; k++ )
                     {
                         a = h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + k]; // Q = h_dirac_output_synthesis_state->q_direct_responses
@@ -945,19 +855,16 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         {
                             IF( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] == 0 )
                             {
-                                b = BASOP_Util_Divide3232_Scale( reference_power[k + num_freq_bands], 232831 /* EPSILON in exp 63 */, &b_exp );
-#ifdef FIX_867
-                                b_exp = add( b_exp, sub( sub( 31, q_reference_power[k + num_freq_bands] ), 63 ) );
-#else
-                                b_exp = add( b_exp, sub( sub( 31, q_reference_power ), 63 ) );
-#endif
+                                b = MAX_16;
+                                move16();
+                                b_exp = 0;
+                                move16();
                             }
                             ELSE
                             {
                                 b = BASOP_Util_Divide3232_Scale( reference_power[k + num_freq_bands], reference_power[k + ( ch_idx + 1 ) * num_freq_bands], &b_exp ); /*Q(15-b_exp)*/
                             }
                         }
-                        c = L_add( ONE_IN_Q29 /*1 Q29*/, Mpy_32_16_1( L_sub( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr_fx, ONE_IN_Q29 /*1 Q29*/ ), 5461 /*1.0 / 6.0 Q15*/ ) ); /*Diffuseness modellling nrg compensation*/ /*Q29*/
 
                         mpy_a_a_b = Mpy_32_32( a, Mpy_32_16_1( a, b ) );                                           // Q = (h_dirac_output_synthesis_state->q_direct_responses + (15 - b_exp) - 15) + (h_dirac_output_synthesis_state->q_direct_responses) - 31
                         mpy_diff_aab = Mpy_32_32( L_sub( L_shl( 1, q_diffuseness ), diffuseness[k] ), mpy_a_a_b ); // Q(q_diff_aab) = 2*(h_dirac_output_synthesis_state->q_direct_responses) - b_exp - 31 + q_diffuseness -31
@@ -990,51 +897,99 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/
                         IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )
                         {
-#ifdef FIX_867
-                            IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) )
+                            IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
                             {
-                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
-                                    L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k],
-                                           sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k], sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth-> (31-sqr_exp) */
+                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth-> (31-sqr_exp) */
                                 move32();
-                                h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
+                                Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
                                 move16();
                             }
                             ELSE
                             {
-                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) ); /*( 31- sqr_exp )-> h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
+                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /*( 31- sqr_exp )-> h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
+                                Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
                                 move16();
                             }
-#else
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx*/
+                            move32();
+                        }
+                        ELSE
+                        {
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*31-sqr_exp*/
+                            move32();
+                            Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
+                            move16();
+                        }
+                    }
+                    c = Madd_32_16( ONE_IN_Q27 /*1 Q27*/, L_sub( h_dirac_output_synthesis_params->diffuse_compensation_factor_fx, ONE_IN_Q27 /*1 Q27*/ ), 5461 ); /*Diffuseness modellling nrg compensation*/ /* 1.0 / 6.0  = 5461 in Q15*/ /*Q27*/
+#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot
+                    FOR( ; k < num_freq_bands; k++ )
+                    {
+                        a = h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + k]; // Q = h_dirac_output_synthesis_state->q_direct_responses
+                        move32();
+                        IF( reference_power[k + num_freq_bands] == 0 )
+                        {
+                            sqr_inp = Mpy_32_32( diffuseness[k], c );
+                            sqr_exp = sub( 31 + 4, q_diffuseness );
+                        }
+                        ELSE
+                        {
+                            Word16 diff_c_exp;
+                            Word16 diff_aab_exp;
+                            IF( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] == 0 )
+                            {
+                                mpy_a_a_b = Mpy_32_32( a, a );                                                             // Q = (h_dirac_output_synthesis_state->q_direct_responses + (15 - b_exp) - 15) + (h_dirac_output_synthesis_state->q_direct_responses) - 31
+                                mpy_diff_aab = Mpy_32_32( L_sub( L_shl( 1, q_diffuseness ), diffuseness[k] ), mpy_a_a_b ); // Q = 2*(h_dirac_output_synthesis_state->q_direct_responses) - b_exp - 31 + q_diffuseness -31
+                                mpy_diff_c = Mpy_32_32( diffuseness[k], c );                                               // Q = q_diffuseness - 4
+                                diff_aab_exp = sub( 31 + 62, add( h_dirac_output_synthesis_state->direct_responses_q, add( h_dirac_output_synthesis_state->direct_responses_q, q_diffuseness ) ) );
+                                diff_c_exp = sub( 31 + 4, q_diffuseness );
+
+                                sqr_inp = BASOP_Util_Add_Mant32Exp( mpy_diff_c, diff_c_exp, mpy_diff_aab, diff_aab_exp, &sqr_exp ); /*q(31-sqr_exp)*/
+                            }
+                            ELSE
+                            {
+                                b = BASOP_Util_Divide3232_Scale( reference_power[k + num_freq_bands], reference_power[k + ( ch_idx + 1 ) * num_freq_bands], &b_exp ); /*q(15-b_exp)*/
+
+                                mpy_a_a_b = Mpy_32_32( a, Mpy_32_16_1( a, b ) );                                           // Q = (h_dirac_output_synthesis_state->q_direct_responses + (15 - b_exp) - 15) + (h_dirac_output_synthesis_state->q_direct_responses) - 31
+                                mpy_diff_aab = Mpy_32_32( L_sub( L_shl( 1, q_diffuseness ), diffuseness[k] ), mpy_a_a_b ); // Q = 2*(h_dirac_output_synthesis_state->q_direct_responses) - b_exp - 31 + q_diffuseness -31
+                                mpy_diff_c = Mpy_32_32( diffuseness[k], c );                                               // Q = q_diffuseness - 4
+                                diff_aab_exp = sub( sub( add( sub( 31 + 62, h_dirac_output_synthesis_state->direct_responses_q ), b_exp ), h_dirac_output_synthesis_state->direct_responses_q ), q_diffuseness );
+                                diff_c_exp = sub( 31 + 4, q_diffuseness );
+
+                                sqr_inp = BASOP_Util_Add_Mant32Exp( mpy_diff_c, diff_c_exp, mpy_diff_aab, diff_aab_exp, &sqr_exp ); /*q(31-sqr_exp)*/
+                            }
+                        }
+                        sqr = Sqrt32( sqr_inp, &sqr_exp ); /*Q(31-sqr_exp)*/
+                        sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/
+
+
+                        IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )
+                        {
                             IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
                             {
-                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth-> (31-sqr_exp) */
+                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q( 31- sqr_exp )*/
                                 move32();
                                 Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
                                 move16();
                             }
                             ELSE
                             {
-                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /*( 31- sqr_exp )-> h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
+                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /*Q(31- sqr_exp)->h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
                                 Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
                                 move16();
                             }
-#endif
-                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx*/
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k]*/
                             move32();
                         }
                         ELSE
                         {
-                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*31-sqr_exp*/
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q(31- sqr_exp)*/
                             move32();
-#ifdef FIX_867
-                            h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-#else
                             Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
                             move16();
-#endif
                         }
                     }
+#else
                     FOR( ; k < num_freq_bands; k++ )
                     {
                         a = h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + k]; // Q = h_dirac_output_synthesis_state->q_direct_responses
@@ -1050,25 +1005,22 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         {
                             IF( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] == 0 )
                             {
-                                b = BASOP_Util_Divide3232_Scale( reference_power[k + num_freq_bands], 232831 /* EPSILON in exp 63 */, &b_exp );
-#ifdef FIX_867
-                                b_exp = add( b_exp, sub( sub( 31, q_reference_power[k + num_freq_bands] ), 63 ) );
-#else
-                                b_exp = add( b_exp, sub( sub( 31, q_reference_power ), 63 ) );
-#endif
+                                b = MAX_16;
+                                move16();
+                                b_exp = 0;
+                                move16();
                             }
                             ELSE
                             {
                                 b = BASOP_Util_Divide3232_Scale( reference_power[k + num_freq_bands], reference_power[k + ( ch_idx + 1 ) * num_freq_bands], &b_exp ); /*q(15-b_exp)*/
                             }
                         }
-                        c = Madd_32_16( ONE_IN_Q27 /*1 Q27*/, L_sub( h_dirac_output_synthesis_params->diffuse_compensation_factor_fx, ONE_IN_Q27 /*1 Q27*/ ), 5461 ); /*Diffuseness modellling nrg compensation*/ /* 1.0 / 6.0  = 5461 in Q15*/ /*Q27*/
 
                         mpy_a_a_b = Mpy_32_32( a, Mpy_32_16_1( a, b ) );                                           // Q = (h_dirac_output_synthesis_state->q_direct_responses + (15 - b_exp) - 15) + (h_dirac_output_synthesis_state->q_direct_responses) - 31
                         mpy_diff_aab = Mpy_32_32( L_sub( L_shl( 1, q_diffuseness ), diffuseness[k] ), mpy_a_a_b ); // Q = 2*(h_dirac_output_synthesis_state->q_direct_responses) - b_exp - 31 + q_diffuseness -31
                         mpy_diff_c = Mpy_32_32( diffuseness[k], c );                                               // Q = q_diffuseness - 4
 
-                        q_diff_aab = add( h_dirac_output_synthesis_state->direct_responses_q + sub( sub( 15, b_exp ), 15 ), add( sub( h_dirac_output_synthesis_state->direct_responses_q, 31 ), sub( q_diffuseness, 31 ) ) );
+                        q_diff_aab = add( add( h_dirac_output_synthesis_state->direct_responses_q, sub( sub( 15, b_exp ), 15 ) ), add( sub( h_dirac_output_synthesis_state->direct_responses_q, 31 ), sub( q_diffuseness, 31 ) ) );
                         q_diff_c = sub( q_diffuseness, 4 );
 
                         test();
@@ -1095,23 +1047,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/
                         IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )
                         {
-#ifdef FIX_867
-                            IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) )
-                            {
-                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
-                                    L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k], sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q( 31- sqr_exp )*/
-                                move32();
-                                h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-                                move16();
-                            }
-                            ELSE
-                            {
-                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) ); /*Q(31- sqr_exp)->h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
-                                move16();
-                            }
-                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k]*/
-                            move32();
-#else
                             IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
                             {
                                 h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q( 31- sqr_exp )*/
@@ -1127,21 +1062,16 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                             }
                             h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k]*/
                             move32();
-#endif
                         }
                         ELSE
                         {
                             h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q(31- sqr_exp)*/
                             move32();
-#ifdef FIX_867
-                            h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-                            move16();
-#else
                             Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
                             move16();
-#endif
                         }
                     }
+#endif
                 }
                 ELSE
                 {
@@ -1158,23 +1088,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/
                         IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )
                         {
-#ifdef FIX_867
-                            IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) )
-                            {
-                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
-                                    L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k], sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q(31- sqr_exp)*/
-                                move32();
-                                h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-                                move16();
-                            }
-                            ELSE
-                            {
-                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) ); /*Q(31-sqr_exp)->h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
-                            }
-                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
-                                L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k]*/
-                            move32();
-#else
                             IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
                             {
                                 h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q(31- sqr_exp)*/
@@ -1190,20 +1103,13 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                             }
                             h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k]*/
                             move32();
-#endif
                         }
                         ELSE
                         {
-#ifdef FIX_867
-                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sqr; /*Q(31-sqr_exp)*/
-                            move32();
-                            h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-#else
                             h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q(31-sqr_exp)*/
                             move32();
                             Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
                             move16();
-#endif
                         }
                     }
                     FOR( ; k < num_freq_bands; k++ )
@@ -1215,20 +1121,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/
                         IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )
                         {
-#ifdef FIX_867
-                            IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) )
-                            {
-                                h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
-                                    L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k], sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, Q( 31- sqr_exp )*/
-                                move32();
-                                h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-                                move16();
-                            }
-                            ELSE
-                            {
-                                sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) ); /*Q( 31- sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth*/
-                            }
-#else
                             IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
                             {
                                 h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, Q( 31- sqr_exp )*/
@@ -1242,7 +1134,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                                 Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
                                 move16();
                             }
-#endif
                             h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k]*/
                             move32();
                         }
@@ -1250,22 +1141,15 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                         {
                             h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /*Q(31-sqr_exp)*/
                             move32();
-#ifdef FIX_867
-                            h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-#else
                             Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
-#endif
                             move16();
                         }
                     }
                 }
             }
-
-            tmp16 = imult1616( num_freq_bands, num_channels_dir );
-
-#ifndef FIX_867
             Word16 temp = MAX_16; /*q0*/
             move16();
+            tmp16 = imult1616( num_freq_bands, num_channels_dir );
             FOR( Word16 kk = 0; kk < tmp16; kk++ )
             {
                 temp = s_min( Q_temp_cy_cross_dir_smooth_fx[kk], temp );
@@ -1278,83 +1162,59 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                 move32();
             }
             free( Q_temp_cy_cross_dir_smooth_fx );
-#endif
             /*Directional gain (panning)*/
             Word16 temp_q = sub( add( h_dirac_output_synthesis_state->direct_power_factor_q, h_dirac_output_synthesis_state->direct_responses_q ), 31 );
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < tmp16; kk++ )
-            {
-                IF( LT_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk] ) )
-                {
-
-                    h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] =
-                        L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk],
-                               sub( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk] ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ->temp_q*/
-                    move32();
-
-                    h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk] = temp_q;
-                    move16();
-                }
-            }
-#else
             IF( LT_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
             {
+                Word16 temp_q1 = sub( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
                 FOR( Word16 kk = 0; kk < tmp16; kk++ )
                 {
-                    h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], sub( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ->temp_q*/
+                    h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], temp_q1 ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ->temp_q*/
                     move32();
                 }
                 h_dirac_output_synthesis_state->q_cy_cross_dir_smooth = temp_q;
                 move16();
             }
-#endif
+            Word16 temp_q1 = sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, temp_q );
             FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )
             {
-                v_mult_fixed( h_dirac_output_synthesis_state->direct_power_factor_fx,
-                              &h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands],
-                              aux_buf,
-                              num_freq_bands ); /*temp_q*/
-
-#ifdef FIX_867
-                FOR( Word16 k = 0; k < num_freq_bands; k++ )
+                IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
                 {
-                    IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] ) )
+                    Word16 i;
+                    Word32 aux;
+                    IF( temp_q1 < 0 )
                     {
-                        aux_buf[k] =
-                            L_shl( aux_buf[k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k], temp_q ) );
-                        /*temp_q->(h_dirac_output_synthesis_state->q_cy_cross_dir_smooth)*/
+                        Word32 temp_q1_equiv = L_lshl( (Word32) 0x80000000, temp_q1 );
+                        FOR( i = 0; i < num_freq_bands; i++ )
+                        {
+                            aux = Mpy_32_32( h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = Madd_32_32( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], aux, temp_q1_equiv );
+                            move32();
+                        }
+                    }
+                    ELSE
+                    {
+                        FOR( i = 0; i < num_freq_bands; i++ )
+                        {
+                            aux = Mpy_32_32( h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
+                            aux = L_shl( aux, temp_q1 );
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], aux );
+                            move32();
+                        }
                     }
                 }
-#else
-                IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
-                {
-                    Scale_sig32( aux_buf, num_freq_bands, sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, temp_q ) ); /*temp_q->(h_dirac_output_synthesis_state->q_cy_cross_dir_smooth)*/
-                }
-#endif
-
-                v_add_fixed( aux_buf,
-                             &h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
-                             &h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
-                             num_freq_bands, 0 ); /*Q(h_dirac_output_synthesis_state->q_cy_cross_dir_smooth)*/
-
-#ifdef FIX_867_DBG
-                Word16 cur_idx = imult1616( ch_idx, num_freq_bands );
-                FOR( Word16 l = 0; l < num_freq_bands; l++ )
+                ELSE
                 {
-                    static FILE *f = 0;
-                    if ( f == 0 )
-                        f = fopen( "cy_cross_dir_smooth1", "w" );
-
-                    Word32 m = h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[cur_idx + l];
-                    Word16 e = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[cur_idx + l];
-                    float f1_m = (float) m;
-                    float f1_e = powf( 2, e );
-                    float f1 = f1_m / f1_e;
-                    fprintf( f, "%d %d %d %d %f\n", ch_idx, l, m, e, f1 );
+                    Word16 i;
+                    FOR( i = 0; i < num_freq_bands; i++ )
+                    {
+                        h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = Madd_32_32( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
+                        move32();
+                    }
                 }
-#endif
             }
 
+
             /*Diffuse gain*/
             FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_diff; ch_idx++ )
             {
@@ -1363,40 +1223,21 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                                   aux_buf,
                                   num_freq_bands_diff ); /* h_dirac_output_synthesis_state->diffuse_power_factor_q+15-15*/
                 temp_q = h_dirac_output_synthesis_state->diffuse_power_factor_q;
-#ifdef FIX_867
-                FOR( Word16 k = 0; k < num_freq_bands_diff; k++ )
-                {
-                    IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[ch_idx * num_freq_bands + k] ) )
-                    {
-                        Scale_sig32( &aux_buf[ch_idx * num_freq_bands + k], 1, sub( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[ch_idx * num_freq_bands + k], temp_q ) ); /*temp_q->(h_dirac_output_synthesis_state->q_cy_auto_diff_smooth)*/
-                    }
-                }
-#else
                 IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) )
                 {
                     Scale_sig32( aux_buf, num_freq_bands, sub( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, temp_q ) ); /*temp_q->(h_dirac_output_synthesis_state->q_cy_auto_diff_smooth)*/
                 }
-#endif
+#ifdef VEC_ARITH_OPT_v1
+                v_add_fixed_no_hdrm( aux_buf,
+                                     &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
+                                     &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
+                                     num_freq_bands_diff ); /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth*/
+#else                                                       /* VEC_ARITH_OPT_v1 */
                 v_add_fixed( aux_buf,
                              &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
                              &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
                              num_freq_bands_diff, 0 ); /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth*/
-
-#ifdef FIX_867_DBG
-                FOR( Word16 l = 0; l < num_freq_bands; l++ )
-                {
-                    static FILE *f = 0;
-                    if ( f == 0 )
-                        f = fopen( "cy_auto_diff_smooth1", "w" );
-
-                    Word32 m = h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff + l];
-                    Word16 e = h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[ch_idx * num_freq_bands_diff + l];
-                    float f1_m = (float) m;
-                    float f1_e = powf( 2, e );
-                    float f1 = f1_m / f1_e;
-                    fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-                }
-#endif
+#endif                                                      /* VEC_ARITH_OPT_v1 */
             }
 
             return;
@@ -1428,7 +1269,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                                                   hDirACRend->proto_index_diff,
                                                   h_dirac_output_synthesis_state->diffuse_power_factor_fx,
                                                   reference_power,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                   q_reference_power,
 #else
                                                   &q_reference_power,
@@ -1436,11 +1277,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                                                   h_dirac_output_synthesis_state->diffuse_responses_square_fx,
                                                   onset,
                                                   h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx,
-#ifdef FIX_867
-                                                  h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
-#else
                                                   &h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
-#endif
 
         diff_start_band = h_dirac_output_synthesis_params->max_band_decorr;
         move16();
@@ -1449,9 +1286,10 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
     /* process other PSDs only slot wise for 4 transport channels */
     IF( EQ_16( dec_param_estim, TRUE ) )
     {
-#ifdef FIX_867
-        computeTargetPSDs_direct_fx( num_channels_dir, num_freq_bands, h_dirac_output_synthesis_state->direct_power_factor_fx, reference_power, q_reference_power, h_dirac_output_synthesis_state->direct_responses_fx, h_dirac_output_synthesis_state->direct_responses_square_fx, h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
-        computeTargetPSDs_diffuse_fx( num_channels_dir, num_freq_bands, diff_start_band, h_dirac_output_synthesis_state->diffuse_power_factor_fx, reference_power, q_reference_power, h_dirac_output_synthesis_state->diffuse_responses_square_fx, h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        computeTargetPSDs_direct_fx( num_channels_dir, num_freq_bands, h_dirac_output_synthesis_state->direct_power_factor_fx, reference_power, q_reference_power, h_dirac_output_synthesis_state->direct_responses_fx, h_dirac_output_synthesis_state->direct_responses_square_fx, h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, &h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx, &h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
+
+        computeTargetPSDs_diffuse_fx( num_channels_dir, num_freq_bands, diff_start_band, h_dirac_output_synthesis_state->diffuse_power_factor_fx, reference_power, q_reference_power, h_dirac_output_synthesis_state->diffuse_responses_square_fx, h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, &h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
 #else
         computeTargetPSDs_direct_fx( num_channels_dir, num_freq_bands, h_dirac_output_synthesis_state->direct_power_factor_fx, reference_power, &q_reference_power, h_dirac_output_synthesis_state->direct_responses_fx, h_dirac_output_synthesis_state->direct_responses_square_fx, h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, &h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx, &h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
 
@@ -1486,7 +1324,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     Word16 buf_idx, ch_idx, i, l;
     Word16 num_freq_bands, num_freq_bands_diff;
     Word16 num_channels_dir, num_channels_diff;
-    Word32 g, g1, g2;
+    Word32 g, g1[MAX_FREQUENCY_BANDS], g2;
     Word32 *p_gains_dir, *p_gains_diff;
     Word32 *p_gains_dir_prev, *p_gains_diff_prev;
     Word32 *p_cy_cross_dir_smooth;
@@ -1500,12 +1338,14 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     DIRAC_OUTPUT_SYNTHESIS_STATE h_dirac_output_synthesis_state;
     Word16 nchan_transport_foa;
     Word16 ch_idx_diff;
+    Word32 cmp1, cmp2;
     Word32 aux_buf[CLDFB_NO_CHANNELS_MAX];
     Word32 ratio_float[DIRAC_HO_NUMSECTORS * CLDFB_NO_CHANNELS_MAX];
     Word16 q_com = 0;
     move16();
     Word16 exp = 0;
     move16();
+    Word16 q_shift;
 
     /* collect some often used parameters */
     h_dirac_output_synthesis_params = hDirACRend->h_output_synthesis_psd_params;
@@ -1525,6 +1365,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     nchan_transport_foa = s_min( 4, nchan_transport );
     move16();
 
+    Word16 prod = imult1616( num_freq_bands, num_channels_dir );
     /*-----------------------------------------------------------------*
      * comput target Gains
      *-----------------------------------------------------------------*/
@@ -1550,17 +1391,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                     Sqrt32( L_add( ONE_IN_Q26 /*1 in Q26*/, h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l] ),
                             &exp ); // (Q31 - exp)
                 move32();
-#ifdef FIX_867
-                // Scale to bring in common Q-factor
-                q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], sub( Q31, exp ) );
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l] = L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l], sub( q_com, sub( Q31, exp ) ) ); /*Q( Q31- exp)->q_com*/
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l] = L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l], sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-#endif
             }
 
-#ifndef FIX_867
             // Scale to bring in common Q-factor
             q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, sub( Q31, exp ) );
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
@@ -1569,25 +1401,24 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands],
                          num_freq_bands,
                          sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-#endif
         }
 
-        /*Directional gain*/
-        FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ )
+        FOR( l = 0; l < num_freq_bands; l++ )
         {
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                aux_buf[l] = L_sub( ONE_IN_Q30, diffuseness[l] ); // Q30
-                move32();
-                ratio_float[l] = L_sub( ONE_IN_Q31, h_dirac_output_synthesis_state.direct_power_factor_fx[num_freq_bands + l] ); // Q31
-                move32();
-                ratio_float[l + num_freq_bands] = L_sub( ONE_IN_Q31, ratio_float[l] ); // Q31
-                move32();
-            }
+            aux_buf[l] = L_sub( ONE_IN_Q30, diffuseness[l] ); // Q30
+            move32();
+            ratio_float[l] = L_sub( ONE_IN_Q31, h_dirac_output_synthesis_state.direct_power_factor_fx[num_freq_bands + l] ); // Q31
+            move32();
+            ratio_float[l + num_freq_bands] = L_sub( ONE_IN_Q31, ratio_float[l] ); // Q31
+            move32();
+        }
 
-            v_mult_fixed( aux_buf, ratio_float, ratio_float, num_freq_bands );                                   //(Q30, Q31) -> Q30
-            v_mult_fixed( aux_buf, &ratio_float[num_freq_bands], &ratio_float[num_freq_bands], num_freq_bands ); //(Q30, Q31) -> Q30
+        v_mult_fixed( aux_buf, ratio_float, ratio_float, num_freq_bands );                                   //(Q30, Q31) -> Q30
+        v_mult_fixed( aux_buf, &ratio_float[num_freq_bands], &ratio_float[num_freq_bands], num_freq_bands ); //(Q30, Q31) -> Q30
 
+        /*Directional gain*/
+        FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ )
+        {
             v_mult_fixed( ratio_float,                                                                     // Q30
                           &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands],    // Q31
                           &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], //(Q30, Q31) -> Q30
@@ -1597,36 +1428,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                           &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], //(Q30, Q31) -> Q30
                           num_freq_bands );
 
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[l], Q30 );
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l], sub( q_com, Q30 ) ); /*Q30->q_com*/
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l], sub( q_com, Q30 ) );
-                /*Q30->q_com*/
-
-                h_dirac_output_synthesis_state.q_cy_cross_dir_smooth[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l] = q_com;
-                move16();
-
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l], sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) );
-                /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-                h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] = q_com;
-                move16();
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l],
-                           sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l] ) );
-
-                /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-                h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir + l] = q_com;
-                move16();
-            }
-#else
             // Scale to bring in common Q-factor
             q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, Q30 );
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
@@ -1641,15 +1442,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir],
                          num_freq_bands,
                          sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-#endif
         }
 
-#ifndef FIX_867
         h_dirac_output_synthesis_state.q_cy_cross_dir_smooth = q_com;
         move16();
         h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev = q_com;
         move16();
-#endif
 
         /*Diffuse gain*/
         FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ )
@@ -1660,24 +1458,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                               num_freq_bands_diff );
 
             // Scale to bring in common Q-factor
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands_diff; l++ )
-            {
-                q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l], Q31 );
-
-                h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff + l], sub( q_com, Q31 ) ); /*q31->q_com*/
-
-                h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx[ch_idx * num_freq_bands_diff + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx[ch_idx * num_freq_bands_diff + l], sub( q_com, h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l] ) );
-                /* h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev->q_com*/
-
-                h_dirac_output_synthesis_state.q_cy_auto_diff_smooth[ch_idx * num_freq_bands_diff + l] = q_com;
-                move16();
-                h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l] = q_com;
-                move16();
-            }
-#else
             q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev, Q31 );
             Scale_sig32( &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
                          num_freq_bands_diff,
@@ -1685,15 +1465,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
             Scale_sig32( &h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx[ch_idx * num_freq_bands_diff],
                          num_freq_bands_diff,
                          sub( q_com, h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev ) ); /* h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev->q_com*/
-#endif
         }
 
-#ifndef FIX_867
         h_dirac_output_synthesis_state.q_cy_auto_diff_smooth = q_com;
         move16();
         h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev = q_com;
         move16();
-#endif
     }
     ELSE IF( EQ_16( dec_param_estim, FALSE ) )
     {
@@ -1720,17 +1497,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                     Sqrt32( L_add( ONE_IN_Q26, h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l] ),
                             &exp ); // (Q31 - exp)
                 move32();
-#ifdef FIX_867
-                // Scale to bring in common Q-factor
-                q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], sub( Q31, exp ) );
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l] = L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l],
-                                                                                                            sub( q_com, sub( Q31, exp ) ) ); /*( Q31- exp )->q_com*/
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l] = L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l],
-                                                                                                                 sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-#endif
             }
 
-#ifndef FIX_867
             // Scale to bring in common Q-factor
             q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, sub( Q31, exp ) );
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
@@ -1739,7 +1507,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands],
                          num_freq_bands,
                          sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-#endif
         }
 
         /*Directional gain*/
@@ -1750,26 +1517,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                           &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
                           num_freq_bands );
 
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                // Scale to bring in common Q-factor
-                q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], Q31 );
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + l],
-                           sub( q_com, Q31 ) ); /*q31->q_com*/
-
-                h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands + l],
-                           sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-
-                h_dirac_output_synthesis_state.q_cy_cross_dir_smooth[ch_idx * num_freq_bands + l] = q_com;
-                move16();
-                h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] = q_com;
-                move16();
-            }
-#else
             // Scale to bring in common Q-factor
             q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, Q31 );
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
@@ -1778,17 +1525,15 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
             Scale_sig32( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx[ch_idx * num_freq_bands],
                          num_freq_bands,
                          sub( q_com, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev->q_com*/
-#endif
         }
 
-#ifndef FIX_867
         h_dirac_output_synthesis_state.q_cy_cross_dir_smooth = q_com;
         move16();
         h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev = q_com;
         move16();
-#endif
 
         /*Diffuse gain*/
+        q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev, Q31 );
         FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ )
         {
             v_multc_fixed_16( h_dirac_output_synthesis_state.diffuse_power_factor_fx,                               // Q31
@@ -1797,41 +1542,18 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                               num_freq_bands_diff );
 
             // Scale to bring in common Q-factor
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands_diff; l++ )
-            {
-                q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l], Q31 );
-
-                h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff + l] = L_shl( h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff + l],
-                                                                                                                 sub( q_com, Q31 ) ); /*q31->q_com*/
-
-                h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx[ch_idx * num_freq_bands_diff + l] =
-                    L_shl( h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx[ch_idx * num_freq_bands_diff + l],
-                           sub( q_com, h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l] ) ); /*h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev->q_com*/
-
-                h_dirac_output_synthesis_state.q_cy_auto_diff_smooth[ch_idx * num_freq_bands_diff + l] = q_com;
-                move16();
-
-                h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l] = q_com;
-                move16();
-            }
-#else
-            q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev, Q31 );
             Scale_sig32( &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
                          num_freq_bands_diff,
                          sub( q_com, Q31 ) ); /*q31->q_com*/
             Scale_sig32( &h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx[ch_idx * num_freq_bands_diff],
                          num_freq_bands_diff,
                          sub( q_com, h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev ) ); /*h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev->q_com*/
-#endif
         }
 
-#ifndef FIX_867
         h_dirac_output_synthesis_state.q_cy_auto_diff_smooth = q_com;
         move16();
         h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev = q_com;
         move16();
-#endif
     }
 
     /*-----------------------------------------------------------------*
@@ -1841,120 +1563,71 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     p_cy_cross_dir_smooth = h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx;
     p_gains_dir = h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx;
 
+    FOR( l = 0; l < num_freq_bands; l++ )
+    {
+        g1[l] = Madd_32_32( POINT_3679_Q31, onset_filter[l], POINT_1175_Q31 - POINT_3679_Q31 ); // Q31, (Q31, Q31) -> Q31
+        move32();
+    }
+
+    q_shift = sub( 26, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev );
+    move16();
+
     /* Direct gains */
     IF( hodirac_flag )
     {
+        cmp1 = L_shr( 66437775 /* 0.99f in Q26 */, q_shift );
+        cmp2 = L_shr( ONE_IN_Q27 /* 2.0f in Q26 */, q_shift );
         FOR( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ )
         {
             FOR( l = 0; l < num_freq_bands; l++ )
             {
-                g1 = Madd_32_32( POINT_3679_Q31, onset_filter[l], POINT_1175_Q31 - POINT_3679_Q31 );                                                                                       // Q31, (Q31, Q31) -> Q31
-                g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1 ), *( p_gains_dir ) );                                                                                                               // (Q31, p_gains_dir_q) -> p_gains_dir_q
-                g2 = L_add_sat( g2, Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ) );                                                                                                   // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-#ifdef FIX_867                                                                                                                                                                             // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-                g2 = L_max( g2, Mpy_32_32( 2126008812 /* 0.99f in Q31 */, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) ) );          // p_gains_dir_q
-                g2 = L_min( g2, Mpy_32_32( ONE_IN_Q31 /* 2.0f in Q30 */, L_shl( 1, add( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], 1 ) ) ) ); // p_gains_dir_q
-#else
-                g2 = L_max( g2, Mpy_32_32( 2126008812 /* 0.99f in Q31 */, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ) );          // p_gains_dir_q
-                g2 = L_min( g2, Mpy_32_32( ONE_IN_Q31 /* 2.0f in Q30 */, L_shl( 1, add( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 1 ) ) ) ); // p_gains_dir_q
-#endif
-                *( p_gains_dir++ ) = g2; // p_gains_dir_q
+                g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1[l] ), *( p_gains_dir ) );             // (Q31, p_gains_dir_q) -> p_gains_dir_q
+                g2 = L_add_sat( g2, Mpy_32_32( g1[l], ( *( p_cy_cross_dir_smooth++ ) ) ) ); // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
+                g2 = L_max( g2, cmp1 );                                                     // p_gains_dir_q
+                g2 = L_min( g2, cmp2 );                                                     // p_gains_dir_q
+                *( p_gains_dir++ ) = g2;                                                    // p_gains_dir_q
                 move32();
             }
         }
     }
     ELSE
     {
+        cmp1 = L_shr( 57042534 /* 0.85f in Q26 */, q_shift );
+        cmp2 = L_shr( 77175193 /* 1.15f in Q26 */, q_shift );
         FOR( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ )
         {
             FOR( l = 0; l < num_freq_bands; l++ )
             {
-                g1 = Madd_32_32( POINT_3679_Q31, onset_filter[l], POINT_1175_Q31 - POINT_3679_Q31 ); // Q31, (Q31, Q31) -> Q31
-                g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1 ), *( p_gains_dir ) );                         // (Q31, p_gains_dir_q) -> p_gains_dir_q
-#ifdef FIX_867                                                                                       // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-                                                                                                     // g2 = L_add_sat(g2, Mpy_32_32(g1, (*(p_cy_cross_dir_smooth++))));  // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-
-                Word32 tmp1 = L_shr( g2, 1 );
-                Word16 tmp1_q = sub( h_dirac_output_synthesis_state.gains_dir_prev_q[ch_idx * num_freq_bands + l], 1 );
-
-                Word32 tmp2 = L_shr( Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ), 1 );
-                Word16 tmp2_q = sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth[ch_idx * num_freq_bands + l], 1 );
-
-                IF( LT_16( tmp1_q, tmp2_q ) )
-                {
-                    tmp2 = L_shr( tmp2, sub( tmp2_q, tmp1_q ) );
-                    tmp2_q = tmp1_q;
-                }
-                ELSE
-                {
-                    tmp1 = L_shr( tmp1, sub( tmp1_q, tmp2_q ) );
-                    tmp1_q = tmp2_q;
-                }
-
-                g2 = L_add( tmp1, tmp2 );
-
-                g2 = L_max( g2, L_shr( 1825361101 /* 0.85f in Q31 */, sub( Q31, tmp1_q ) ) ); // tmp_q1
-                g2 = L_min( g2, L_shr( 1234803098 /* 1.15f in Q30 */, sub( Q30, tmp1_q ) ) ); // tmp_q1
-
-                g2 = L_shl( g2, sub( h_dirac_output_synthesis_state.gains_dir_prev_q[ch_idx * num_freq_bands + l], tmp1_q ) );
-
-#else
-                g2 = L_add_sat( g2, Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ) );                                                                                    // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-                g2 = L_max( g2, Mpy_32_32( 1825361101 /* 0.85f in Q31 */, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ) );                        // p_gains_dir_q
-                g2 = L_min( g2, Mpy_32_32( 1234803098 /* 1.15f in Q30 */, L_shl( 1, add( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 1 ) ) ) );              // p_gains_dir_q
-#endif
-                *( p_gains_dir++ ) = g2; // p_gains_dir_q
+                g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1[l] ), *( p_gains_dir ) );             // (Q31, p_gains_dir_q) -> p_gains_dir_q
+                g2 = L_add_sat( g2, Mpy_32_32( g1[l], ( *( p_cy_cross_dir_smooth++ ) ) ) ); // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
+                g2 = L_max( g2, cmp1 );                                                     // p_gains_dir_q
+                g2 = L_min( g2, cmp2 );                                                     // p_gains_dir_q
+                *( p_gains_dir++ ) = g2;                                                    // p_gains_dir_q
                 move32();
             }
         }
     }
 
     /*Directional gains*/
+    cmp1 = L_shr( -DIRAC_GAIN_LIMIT_Q26, q_shift );
+    cmp2 = L_negate( cmp1 );
     FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ )
     {
         FOR( l = 0; l < num_freq_bands; l++ )
         {
-            g1 = Madd_32_32( POINT_3679_Q31, onset_filter[l], POINT_1175_Q31 - POINT_3679_Q31 ); // Q31, (Q31, Q31) -> Q31
-            g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1 ), *( p_gains_dir ) );                         // (Q31, p_gains_dir_q) -> p_gains_dir_q
-#ifdef FIX_867
-            Word32 tmp1 = L_shr( g2, 1 );
-            Word16 tmp1_q = sub( h_dirac_output_synthesis_state.gains_dir_prev_q[ch_idx * num_freq_bands + l], 1 );
-
-            Word32 tmp2 = L_shr( Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ), 1 );
-            Word16 tmp2_q = sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth[ch_idx * num_freq_bands + l], 1 );
-
-            IF( LT_16( tmp1_q, tmp2_q ) )
-            {
-                tmp2 = L_shr( tmp2, sub( tmp2_q, tmp1_q ) );
-                tmp2_q = tmp1_q;
-            }
-            ELSE
-            {
-                tmp1 = L_shr( tmp1, sub( tmp1_q, tmp2_q ) );
-                tmp1_q = tmp2_q;
-            }
-
-            g2 = L_add( tmp1, tmp2 ); // tmp1_q
-
-            Word32 limit1 = L_shl( DIRAC_GAIN_LIMIT_Q26, sub( tmp1_q, Q26 ) ); // tmp1_q
-            g2 = L_max( g2, L_negate( limit1 ) );
-            g2 = L_min( g2, limit1 );
-
-            g2 = L_shl( g2, sub( h_dirac_output_synthesis_state.gains_dir_prev_q[ch_idx * num_freq_bands + l], tmp1_q ) ); // p_gains_dir_q
-#else
-            g2 = L_add_sat( g2, Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ) );                                                                                        // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-            g2 = L_max( g2, W_extract_h( W_shl( W_mult_32_32( -DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ), Q5 ) ) );     // p_gains_dir_q
-            g2 = L_min( g2, W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ), Q5 ) ) );      // p_gains_dir_q
-#endif
-            *( p_gains_dir++ ) = g2; // p_gains_dir_q
+            g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1[l] ), *( p_gains_dir ) );             // (Q31, p_gains_dir_q) -> p_gains_dir_q
+            g2 = L_add_sat( g2, Mpy_32_32( g1[l], ( *( p_cy_cross_dir_smooth++ ) ) ) ); // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
+            g2 = L_max( g2, cmp1 );                                                     // p_gains_dir_q
+            g2 = L_min( g2, cmp2 );                                                     // p_gains_dir_q
+            *( p_gains_dir++ ) = g2;                                                    // p_gains_dir_q
             move32();
         }
     }
 
     IF( hodirac_flag )
     {
-        p_cy_cross_dir_smooth = h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx + imult1616( num_freq_bands, num_channels_dir );
-        p_gains_dir = h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx + imult1616( num_freq_bands, num_channels_dir );
+        p_cy_cross_dir_smooth = h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx + prod;
+        p_gains_dir = h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx + prod;
 
         /*Direct gains*/
         FOR( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ )
@@ -1971,17 +1644,11 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
         {
             FOR( l = 0; l < num_freq_bands; l++ )
             {
-                g1 = Madd_32_32( POINT_3679_Q31, onset_filter[l], POINT_1175_Q31 - POINT_3679_Q31 );                                                                                                     // Q31, (Q31, Q31) -> Q31
-                g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1 ), *( p_gains_dir ) );                                                                                                                             // (Q31, p_gains_dir_q) -> p_gains_dir_q
-                g2 = L_add_sat( g2, Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ) );                                                                                                                 // (p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-#ifdef FIX_867                                                                                                                                                                                           // (p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-                g2 = L_max( g2, W_extract_h( W_shl( W_mult_32_32( -DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) ), Q5 ) ) ); // p_gains_dir_q
-                g2 = L_min( g2, W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l] ) ), Q5 ) ) );  // p_gains_dir_q
-#else
-                g2 = L_max( g2, W_extract_h( W_shl( W_mult_32_32( -DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ), Q5 ) ) ); // p_gains_dir_q
-                g2 = L_min( g2, W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev ) ), Q5 ) ) );  // p_gains_dir_q
-#endif
-                *( p_gains_dir++ ) = g2; // p_gains_dir_q
+                g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1[l] ), *( p_gains_dir ) );             // (Q31, p_gains_dir_q) -> p_gains_dir_q
+                g2 = L_add_sat( g2, Mpy_32_32( g1[l], ( *( p_cy_cross_dir_smooth++ ) ) ) ); // (p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
+                g2 = L_max( g2, cmp1 );                                                     // p_gains_dir_q
+                g2 = L_min( g2, cmp2 );                                                     // p_gains_dir_q
+                *( p_gains_dir++ ) = g2;                                                    // p_gains_dir_q
                 move32();
             }
         }
@@ -1990,45 +1657,18 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     /*Diffuse gains*/
     p_cy_auto_diff_smooth = h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx + imult1616( nchan_transport_foa, num_freq_bands_diff );
     p_gains_diff = h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx + imult1616( nchan_transport_foa, num_freq_bands_diff );
+    g1[0] = POINT_1175_Q31; // Q31
+    move32();
     FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ )
     {
         FOR( l = 0; l < num_freq_bands_diff; l++ )
         {
-            g1 = POINT_1175_Q31; // Q31
             move32();
-            g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1 ), *( p_gains_diff ) ); // (Q31, p_gains_dir_q) -> p_gains_dir_q
-                                                                          // p_gains_diff_q
-#ifdef FIX_867
-            Word32 tmp1 = L_shr( g2, 1 );
-            Word16 tmp1_q = sub( h_dirac_output_synthesis_state.gains_diff_prev_q[ch_idx * num_freq_bands + l], 1 );
-
-            Word32 tmp2 = L_shr( Mpy_32_32( g1, ( *( p_cy_auto_diff_smooth++ ) ) ), 1 );
-            Word16 tmp2_q = sub( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth[ch_idx * num_freq_bands + l], 1 );
-
-            IF( LT_16( tmp1_q, tmp2_q ) )
-            {
-                tmp2 = L_shr( tmp2, sub( tmp2_q, tmp1_q ) );
-                tmp2_q = tmp1_q;
-            }
-            ELSE
-            {
-                tmp1 = L_shr( tmp1, sub( tmp1_q, tmp2_q ) );
-                tmp1_q = tmp2_q;
-            }
-
-            g2 = L_add( tmp1, tmp2 ); // tmp1_q
-
-            Word32 limit1 = L_shl( DIRAC_GAIN_LIMIT_Q26, sub( tmp1_q, Q26 ) ); // tmp1_q
-            g2 = L_max( g2, 0 );
-            g2 = L_min( g2, limit1 );
-
-            g2 = L_shl( g2, sub( h_dirac_output_synthesis_state.gains_diff_prev_q[ch_idx * num_freq_bands + l], tmp1_q ) ); // p_gains_dir_q
-#else
-            g2 = L_add_sat( g2, Mpy_32_32( g1, ( *( p_cy_auto_diff_smooth++ ) ) ) );                                                                                        // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
-            g2 = L_max( g2, 0 );
-            g2 = L_min( g2, W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev ) ), Q5 ) ) ); // p_gains_diff_q
-#endif
-            *( p_gains_diff++ ) = g2; // p_gains_diff_q
+            g2 = Mpy_32_32( L_sub( ONE_IN_Q31, g1[0] ), *( p_gains_diff ) );            // (Q31, p_gains_dir_q) -> p_gains_dir_q
+            g2 = L_add_sat( g2, Mpy_32_32( g1[0], ( *( p_cy_auto_diff_smooth++ ) ) ) ); // p_gains_diff_q, (Q31, p_gains_diff_q) -> p_gains_diff_q
+            g2 = L_max( g2, 0 );                                                        // p_gains_diff_q
+            g2 = L_min( g2, cmp2 );                                                     // p_gains_diff_q
+            *( p_gains_diff++ ) = g2;                                                   // p_gains_diff_q
             move32();
         }
     }
@@ -2039,36 +1679,21 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
 
     FOR( buf_idx = 0; buf_idx < nbslots; ++buf_idx )
     {
-        g1 = L_deposit_h( h_dirac_output_synthesis_params.interpolator_fx[buf_idx] ); // Q31
-        g2 = L_sub( ONE_IN_Q31, g1 );                                                 // Q31
+        g1[0] = L_deposit_h( h_dirac_output_synthesis_params.interpolator_fx[buf_idx] ); // Q31
+        move32();
+        g2 = L_sub( ONE_IN_Q31, g1[0] ); // Q31
 
         /*Direct input->output*/
         p_gains_dir = h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx; // (p_gains_dir_q)
         p_gains_dir_prev = h_dirac_output_synthesis_state.gains_dir_prev_fx;
         FOR( ch_idx = 0; ch_idx < num_channels_dir; ch_idx++ )
         {
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                h_dirac_output_synthesis_state.gains_dir_prev_fx[ch_idx * num_freq_bands + l] =
-                    L_shl( h_dirac_output_synthesis_state.gains_dir_prev_fx[ch_idx * num_freq_bands + l],
-                           sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l],
-                                h_dirac_output_synthesis_state.gains_dir_prev_q[ch_idx * num_freq_bands + 1] ) );
-                /*h_dirac_output_synthesis_state.gains_dir_prev_q->h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev*/
-
-                h_dirac_output_synthesis_state.gains_dir_prev_q[ch_idx * num_freq_bands + l] =
-                    h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l];
-            }
-#else
             Scale_sig32( &h_dirac_output_synthesis_state.gains_dir_prev_fx[ch_idx * num_freq_bands],
                          num_freq_bands,
                          sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, h_dirac_output_synthesis_state.gains_dir_prev_q ) ); /*h_dirac_output_synthesis_state.gains_dir_prev_q->h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev*/
-#endif
         }
-#ifndef FIX_867
         h_dirac_output_synthesis_state.gains_dir_prev_q = h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev;
         move16();
-#endif
 
         FOR( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ )
         {
@@ -2077,7 +1702,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                            shl( ch_idx * num_freq_bands, Q1 );
             FOR( l = 0; l < num_freq_bands; l++ )
             {
-                g = Madd_32_32( Mpy_32_32( g1, ( *( p_gains_dir++ ) ) ), g2, ( *( p_gains_dir_prev++ ) ) ); // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
+                g = Madd_32_32( Mpy_32_32( g1[0], ( *( p_gains_dir++ ) ) ), g2, ( *( p_gains_dir_prev++ ) ) ); // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
 
                 output_real[l * num_channels_dir + ch_idx] = Mpy_32_32( g, ( *( p_proto_diff++ ) ) ); // (p_gains_dir_q, p_proto_diff_q) -> (p_gains_dir_q + p_proto_diff_q - 31)
                 move32();
@@ -2087,6 +1712,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
         }
 
         /*Directional stream*/
+        Word16 offset = shl( i_mult( buf_idx, i_mult( num_freq_bands, num_protos_dir ) ), Q1 );
         FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ )
         {
             IF( hodirac_flag )
@@ -2103,25 +1729,31 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                                shl( i_mult( proto_direct_index[1], num_freq_bands ), Q1 );
                     FOR( l = 0; l < num_freq_bands; l++ )
                     {
-                        gs1 = Madd_32_32( Mpy_32_32( g1, ( *( p_gains_dir ) ) ), g2, ( *( p_gains_dir_prev ) ) );                                                                                                 // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
-                        gs2 = Madd_32_32( Mpy_32_32( g1, ( *( p_gains_dir + imult1616( num_freq_bands, num_channels_dir ) ) ) ), g2, ( *( p_gains_dir_prev + imult1616( num_freq_bands, num_channels_dir ) ) ) ); // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
+
+                        Word32 temp1, temp2;
+                        gs1 = Madd_32_32( Mpy_32_32( g1[0], ( *( p_gains_dir ) ) ), g2, ( *( p_gains_dir_prev ) ) );               // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
+                        gs2 = Madd_32_32( Mpy_32_32( g1[0], ( *( p_gains_dir + prod ) ) ), g2, ( *( p_gains_dir_prev + prod ) ) ); // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
                         p_gains_dir++;
                         p_gains_dir_prev++;
 
+                        temp1 = Mpy_32_32( 1903158016 /* 1.772454e+00f / 2 in Q31 */, ( *p_proto ) );
+                        temp2 = Mpy_32_32( 1098788992 /* 1.023327e+00f / 2 in Q31 */, ( *p_proto2 ) );
                         // ((p_gains_dir_q, p_proto_dir_q) >> 1) -> (p_gains_dir_q + p_proto_dir_q - 31)
                         output_real[l * num_channels_dir + ch_idx] =
                             Madd_32_32(
-                                Mpy_32_32( gs1, ( L_add( Mpy_32_32( 1903158016 /* 1.772454e+00f / 2 in Q31 */, ( *p_proto ) ), Mpy_32_32( 1098788992 /* 1.023327e+00f / 2 in Q31 */, ( *p_proto2 ) ) ) ) ), /* s1 */
-                                gs2, L_sub( Mpy_32_32( 1903158016 /* 1.772454e+00f / 2 in Q31 */, ( *p_proto ) ), Mpy_32_32( 1098788992 /* 1.023327e+00f / 2 in Q31 */, ( *p_proto2 ) ) ) );                /* s2 */
+                                Mpy_32_32( gs1, ( L_add( temp1, temp2 ) ) ), /* s1 */
+                                gs2, L_sub( temp1, temp2 ) );                /* s2 */
                         move32();
                         p_proto++;
                         p_proto2++;
 
+                        temp1 = Mpy_32_32( 1903158016 /* 1.772454e+00f / 2 in Q31 */, ( *p_proto ) );
+                        temp2 = Mpy_32_32( 1098788992 /* 1.023327e+00f / 2 in Q31 */, ( *p_proto2 ) );
                         // ((p_gains_dir_q, p_proto_dir_q) >> 1) -> (p_gains_dir_q + p_proto_dir_q - 31)
                         output_imag[l * num_channels_dir + ch_idx] =
                             Madd_32_32(
-                                Mpy_32_32( gs1, ( L_add( Mpy_32_32( 1903158016 /* 1.772454e+00f / 2 in Q31 */, ( *p_proto ) ), Mpy_32_32( 1098788992 /* 1.023327e+00f / 2 in Q31 */, ( *p_proto2 ) ) ) ) ),
-                                gs2, L_sub( Mpy_32_32( 1903158016 /* 1.772454e+00f / 2 in Q31 */, ( *p_proto ) ), Mpy_32_32( 1098788992 /* 1.023327e+00f / 2 in Q31 */, ( *p_proto2 ) ) ) );
+                                Mpy_32_32( gs1, ( L_add( temp1, temp2 ) ) ),
+                                gs2, L_sub( temp1, temp2 ) );
                         move32();
                         p_proto++;
                         p_proto2++;
@@ -2132,36 +1764,29 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                     p_proto = h_dirac_output_synthesis_state.proto_direct_buffer_f_fx +
                               shl( i_mult( buf_idx, i_mult( num_freq_bands, num_protos_dir ) ), Q1 ) +
                               shl( i_mult( proto_direct_index[ch_idx], num_freq_bands ), Q1 );
+                    Word16 diff = sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 31 );
                     FOR( l = 0; l < num_freq_bands; l++ )
                     {
                         p_gains_dir++;
                         p_gains_dir_prev++;
 
-#ifdef FIX_867
-                        output_real[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
-                        move32();
-                        output_imag[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
-                        move32();
-#else
-
-                        output_real[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
+                        output_real[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), diff ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
                         move32();
-                        output_imag[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
+                        output_imag[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), diff ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
                         move32();
-#endif
                     }
                 }
             }
             ELSE
             {
                 p_proto = h_dirac_output_synthesis_state.proto_direct_buffer_f_fx +
-                          shl( i_mult( buf_idx, i_mult( num_freq_bands, num_protos_dir ) ), Q1 ) +
+                          offset +
                           shl( i_mult( proto_direct_index[ch_idx], num_freq_bands ), Q1 );
                 IF( EQ_16( proto_direct_index[ch_idx], 0 ) )
                 {
                     FOR( l = 0; l < num_freq_bands; l++ )
                     {
-                        g = Madd_32_32( Mpy_32_32( g1, ( *( p_gains_dir++ ) ) ), g2, ( *( p_gains_dir_prev++ ) ) ); // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
+                        g = Madd_32_32( Mpy_32_32( g1[0], ( *( p_gains_dir++ ) ) ), g2, ( *( p_gains_dir_prev++ ) ) ); // (Q31, p_gains_dir_q) -> (p_gains_dir_q)
 
                         output_real[l * num_channels_dir + ch_idx] = Mpy_32_32( g, ( *( p_proto++ ) ) ); // (p_gains_dir_q, p_proto_dir_q) -> (p_gains_dir_q + p_proto_dir_q - 31)
                         move32();
@@ -2171,22 +1796,16 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                 }
                 ELSE
                 {
+                    Word16 shift_q = sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 31 );
                     FOR( l = 0; l < num_freq_bands; l++ )
                     {
                         p_gains_dir++;
                         p_gains_dir_prev++;
 
-#ifdef FIX_867
-                        output_real[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
-                        move32();
-                        output_imag[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[ch_idx * num_freq_bands + l], 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
-                        move32();
-#else
-                        output_real[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
+                        output_real[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), shift_q ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
                         move32();
-                        output_imag[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), sub( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, 31 ) ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
+                        output_imag[l * num_channels_dir + ch_idx] = L_shl( *( p_proto++ ), shift_q ); // p_proto_dir_q -> (p_gains_dir_q + p_proto_dir_q - 31)
                         move32();
-#endif
                     }
                 }
             }
@@ -2197,28 +1816,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
         p_gains_diff_prev = h_dirac_output_synthesis_state.gains_diff_prev_fx + i_mult( nchan_transport_foa, num_freq_bands_diff );
         FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ )
         {
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                h_dirac_output_synthesis_state.gains_diff_prev_fx[ch_idx * num_freq_bands_diff + l] =
-                    L_shl( h_dirac_output_synthesis_state.gains_diff_prev_fx[ch_idx * num_freq_bands_diff + l],
-                           sub( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l],
-                                h_dirac_output_synthesis_state.gains_diff_prev_q[ch_idx * num_freq_bands_diff + l] ) );
-                /*h_dirac_output_synthesis_state.gains_diff_prev_q->h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev*/
-
-                h_dirac_output_synthesis_state.gains_diff_prev_q[ch_idx * num_freq_bands_diff + l] =
-                    h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[ch_idx * num_freq_bands_diff + l];
-            }
-#else
             Scale_sig32( &h_dirac_output_synthesis_state.gains_diff_prev_fx[ch_idx * num_freq_bands_diff],
                          num_freq_bands_diff,
                          sub( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev, h_dirac_output_synthesis_state.gains_diff_prev_q ) ); /*h_dirac_output_synthesis_state.gains_diff_prev_q->h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev*/
-#endif
         }
-#ifndef FIX_867
         h_dirac_output_synthesis_state.gains_diff_prev_q = h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev;
         move16();
-#endif
 
         ch_idx_diff = nchan_transport_foa;
         move16();
@@ -2232,7 +1835,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
                 ch_idx_diff = add( ch_idx_diff, 1 );
                 FOR( l = 0; l < num_freq_bands_diff; l++ )
                 {
-                    g = Madd_32_32( Mpy_32_32( g1, ( *( p_gains_diff++ ) ) ), g2, ( *( p_gains_diff_prev++ ) ) ); // (Q31, p_gains_diff_q) -> p_gains_diff_q
+                    g = Madd_32_32( Mpy_32_32( g1[0], ( *( p_gains_diff++ ) ) ), g2, ( *( p_gains_diff_prev++ ) ) ); // (Q31, p_gains_diff_q) -> p_gains_diff_q
 
                     // ((p_gains_diff_q, p_proto_diff_q) >> Q1) -> (p_gains_diff_q + p_proto_diff_q - 31)
                     output_real[l * num_channels_dir + hDirACRend->sba_map_tc[ch_idx]] =
@@ -2249,11 +1852,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
             }
             ELSE
             {
-                FOR( l = 0; l < num_freq_bands_diff; l++ )
-                {
-                    p_gains_diff++;
-                    p_gains_diff_prev++;
-                }
+                p_gains_diff += num_freq_bands_diff;
+                p_gains_diff_prev += num_freq_bands_diff;
             }
         }
 
@@ -2316,49 +1916,27 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     /* store estimates for next synthesis block */
     IF( hodirac_flag )
     {
-        Copy32( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx, h_dirac_output_synthesis_state.gains_dir_prev_fx, imult1616( num_freq_bands, num_channels_dir ) * DIRAC_HO_NUMSECTORS ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev*/
-#ifdef FIX_867
-        FOR( l = 0; l < imult1616( num_freq_bands, num_channels_dir ) * DIRAC_HO_NUMSECTORS; l++ )
-        {
-            q_cy_cross_dir_smooth_prev[l] = h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[l];
-        }
-#endif
+        Copy32( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx, h_dirac_output_synthesis_state.gains_dir_prev_fx, prod * DIRAC_HO_NUMSECTORS ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev*/
     }
     ELSE
     {
-        Copy32( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx, h_dirac_output_synthesis_state.gains_dir_prev_fx, imult1616( num_freq_bands, num_channels_dir ) ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev*/
-#ifdef FIX_867
-        FOR( l = 0; l < imult1616( num_freq_bands, num_channels_dir ); l++ )
-        {
-            q_cy_cross_dir_smooth_prev[l] = h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev[l];
-        }
-#endif
+        Copy32( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev_fx, h_dirac_output_synthesis_state.gains_dir_prev_fx, prod ); /*h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev*/
     }
-#ifndef FIX_867
     *q_cy_cross_dir_smooth_prev = h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev;
-#endif
     move16();
 
     Copy32( h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev_fx, h_dirac_output_synthesis_state.gains_diff_prev_fx, imult1616( num_freq_bands_diff, num_channels_diff ) ); /* h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev*/
-#ifdef FIX_867
-    FOR( l = 0; l < imult1616( num_freq_bands_diff, num_channels_diff ); l++ )
-    {
-        q_cy_auto_diff_smooth_prev[l] = h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev[l];
-        move16();
-    }
-#else
     *q_cy_auto_diff_smooth_prev = h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev;
     move16();
-#endif
 
     /* reset values */
     IF( hodirac_flag )
     {
-        set_zero_fx( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx, imult1616( num_freq_bands, num_channels_dir ) * DIRAC_HO_NUMSECTORS );
+        set_zero_fx( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx, prod * DIRAC_HO_NUMSECTORS );
     }
     ELSE
     {
-        set_zero_fx( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx, imult1616( num_freq_bands, num_channels_dir ) );
+        set_zero_fx( h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx, prod );
     }
 
     set_zero_fx( h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx, imult1616( num_freq_bands_diff, num_channels_diff ) );
@@ -2395,12 +1973,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     Word32 *p_gains_dir, *p_gains_diff;
     Word32 g, g1, g2;
     Word32 *p_cy_auto_dir_smooth, *p_cy_auto_dir_smooth_prev;
-#ifdef FIX_867
-    Word16 q_cy_auto_dir_smooth_local[CLDFB_NO_CHANNELS_MAX * MAX_OUTPUT_CHANNELS];
-    Word16 q_cy_auto_dir_smooth_prev_local[CLDFB_NO_CHANNELS_MAX * MAX_OUTPUT_CHANNELS];
-#else
     Word16 q_cy_auto_dir_smooth_local[MAX_OUTPUT_CHANNELS], q_cy_auto_dir_smooth_prev_local[MAX_OUTPUT_CHANNELS];
-#endif
     Word32 *p_cy_cross_dir_smooth, *p_cy_cross_dir_smooth_prev;
     Word32 *p_cy_auto_diff_smooth, *p_cy_auto_diff_smooth_prev;
     Word32 gains_dir[CLDFB_NO_CHANNELS_MAX * MAX_OUTPUT_CHANNELS];
@@ -2444,24 +2017,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     move16();
     num_freq_bands = hSpatParamRendCom->num_freq_bands;
     move16();
-#ifdef FIX_867
-    IF( EQ_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_MONO ) )
-    {
-        nchan_target_psds = 2;
-        move16();
-    }
-    ELSE
-    {
-        nchan_target_psds = nchan_out_woLFE;
-        move16();
-    }
-    FOR( l = 0; l < nchan_target_psds * num_freq_bands; l++ )
-    {
-        q_cy_auto_dir_smooth_local[l] = h_dirac_output_synthesis_state->q_cy_auto_dir_smooth[l];
-    }
-#else
     set16_fx( q_cy_auto_dir_smooth_local, h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, nchan_out_woLFE );
-#endif
 
     /*-----------------------------------------------------------------*
      * compute target PSDs
@@ -2499,42 +2055,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                                               h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx,
                                               q_cy_auto_dir_smooth_local,
                                               h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx,
-#ifdef FIX_867
-                                              h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
-#else
                                               &h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
-#endif
 
+#ifndef FIX_867_CLDFB_NRG_SCALE
         // Scale cy_auto_diff_smooth_fx if required
         IF( diff_start_band != 0 )
         {
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                q_com = s_min( q_reference_power_smooth[l], h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[l] );
-
-                reference_power_smooth[l] = L_shl( reference_power_smooth[l], sub( q_com, q_reference_power_smooth[l] ) ); /**q_reference_power_smooth->q_com*/
-                h_dirac_output_synthesis_state->reference_power_smooth_prev_fx[l] =
-                    L_shl( h_dirac_output_synthesis_state->reference_power_smooth_prev_fx[l], sub( q_com, q_reference_power_smooth[l] ) );
-                /**q_reference_power_smooth->q_com*/
-
-                FOR( Word16 i_ch = 0; i_ch < nchan_target_psds; i_ch++ )
-                {
-                    h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[num_freq_bands * i_ch + l] =
-                        L_shl( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[num_freq_bands * i_ch + l],
-                               sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[num_freq_bands * i_ch + l] ) );
-                    /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth -> q_com*/
-
-                    h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[num_freq_bands * i_ch + l] = q_com;
-                    move16();
-                }
-
-                q_reference_power_smooth[l] = q_com;
-                move16();
-                h_dirac_output_synthesis_state->reference_power_smooth_prev_q[l] = q_com;
-                move16();
-            }
-#else
             q_com = s_min( *q_reference_power_smooth, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
             scale_sig32( reference_power_smooth, num_freq_bands, sub( q_com, *q_reference_power_smooth ) );                                         /**q_reference_power_smooth->q_com*/
             scale_sig32( h_dirac_output_synthesis_state->reference_power_smooth_prev_fx, num_freq_bands, sub( q_com, *q_reference_power_smooth ) ); /**q_reference_power_smooth->q_com*/
@@ -2548,8 +2074,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
 
             h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = q_com;
             move16();
-#endif
         }
+#endif
 
         computeTargetPSDs_diffuse_subframe_fx( nchan_target_psds, num_freq_bands, diff_start_band,
                                                h_dirac_output_synthesis_state->diffuse_power_factor_fx,
@@ -2557,11 +2083,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                                                q_reference_power_smooth,
                                                h_dirac_output_synthesis_state->diffuse_responses_square_fx,
                                                h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx,
-#ifdef FIX_867
-                                               h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
-#else
                                                &h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
-#endif
     }
 
     /*-----------------------------------------------------------------*
@@ -2574,11 +2096,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
 
         p_cy_auto_dir_smooth = h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx;   // q_cy_auto_dir_smooth
         p_cy_auto_diff_smooth = h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx; // q_cy_auto_diff_smooth
-#ifdef FIX_867
-        q_com = s_min( q_cy_auto_dir_smooth_local[num_freq_bands], h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[num_freq_bands] );
-#else
         q_com = s_min( q_cy_auto_dir_smooth_local[1], h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );
-#endif
 
         IF( EQ_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_MONO ) )
         {
@@ -2586,15 +2104,9 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
             move16();
             exp1 = 0;
             move16();
-#ifdef FIX_867
-            tmp32 = BASOP_Util_Divide3232_Scale_cadence( L_shl( p_cy_auto_dir_smooth[num_freq_bands], sub( q_com, q_cy_auto_dir_smooth_local[num_freq_bands] ) ),
-                                                         ( L_add( Sqrt32( h_dirac_output_synthesis_state->direct_power_factor_fx[0], &exp ), EPSILON_FX ) ), // (Q31 - exp)
-                                                         &exp1 );
-#else
-            tmp32 = BASOP_Util_Divide3232_Scale_cadence( L_shl( p_cy_auto_dir_smooth[num_freq_bands], sub( q_com, q_cy_auto_dir_smooth_local[1] ) ),
-                                                         ( L_add( Sqrt32( h_dirac_output_synthesis_state->direct_power_factor_fx[0], &exp ), EPSILON_FX ) ), // (Q31 - exp)
-                                                         &exp1 );
-#endif
+            tmp32 = BASOP_Util_Divide3232_Scale_newton( L_shl( p_cy_auto_dir_smooth[num_freq_bands], sub( q_com, q_cy_auto_dir_smooth_local[1] ) ),
+                                                        ( L_add( Sqrt32( h_dirac_output_synthesis_state->direct_power_factor_fx[0], &exp ), EPSILON_FX ) ), // (Q31 - exp)
+                                                        &exp1 );
             target_power_y = L_shr( tmp32, 1 ); // Q31 + (q_com - (31 - exp))
             q_target_power_y = add( sub( Q31, exp1 ), sub( q_com, sub( Q31, exp ) ) );
             q_target_power_y = sub( q_target_power_y, 1 );
@@ -2603,15 +2115,9 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
             move16();
             exp1 = 0;
             move16();
-#ifdef FIX_867
-            tmp32 = BASOP_Util_Divide3232_Scale_cadence( L_shl( p_cy_auto_diff_smooth[num_freq_bands], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[num_freq_bands] ) ),
-                                                         ( L_add( Sqrt32( h_dirac_output_synthesis_state->diffuse_power_factor_fx[0], &exp ), EPSILON_FX ) ), // (Q31 - exp)
-                                                         &exp1 );
-#else
-            tmp32 = BASOP_Util_Divide3232_Scale_cadence( L_shl( p_cy_auto_diff_smooth[num_freq_bands], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) ),
-                                                         ( L_add( Sqrt32( h_dirac_output_synthesis_state->diffuse_power_factor_fx[0], &exp ), EPSILON_FX ) ), // (Q31 - exp)
-                                                         &exp1 );
-#endif
+            tmp32 = BASOP_Util_Divide3232_Scale_newton( L_shl( p_cy_auto_diff_smooth[num_freq_bands], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) ),
+                                                        ( L_add( Sqrt32( h_dirac_output_synthesis_state->diffuse_power_factor_fx[0], &exp ), EPSILON_FX ) ), // (Q31 - exp)
+                                                        &exp1 );
             target_power_y1 = L_shr( tmp32, 1 ); // Q31 + (q_com - (31 - exp))
             q_target_power_y1 = add( sub( Q31, exp1 ), sub( q_com, sub( Q31, exp ) ) );
             q_target_power_y1 = sub( q_target_power_y1, 1 );
@@ -2621,22 +2127,13 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
         }
         ELSE
         {
-#ifdef FIX_867
-            target_power_y = L_add(
-                L_shl( p_cy_auto_dir_smooth[num_freq_bands], sub( q_com, q_cy_auto_dir_smooth_local[num_freq_bands] ) ),
-                L_shl( p_cy_auto_diff_smooth[num_freq_bands], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[num_freq_bands] ) ) ); // q_com
-#else
             target_power_y = L_add(
                 L_shl( p_cy_auto_dir_smooth[num_freq_bands], sub( q_com, q_cy_auto_dir_smooth_local[1] ) ),
                 L_shl( p_cy_auto_diff_smooth[num_freq_bands], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) ) ); // q_com
-#endif
             exp = q_com;
             move16();
         }
 
-        subtract_power_y = masa_stereo_type_detect->subtract_power_y_fx; // q_subtract_power_y
-        move32();
-
         a = 858993; /* ( 0.0004f in Q31 ); Temporal smoothing coefficient */
         move32();
         b = L_sub( ONE_IN_Q31, a ); /* Temporal smoothing coefficient */
@@ -2652,24 +2149,52 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
         move32();
         masa_stereo_type_detect->q_target_power_y_smooth = q_com;
         move16();
-        masa_stereo_type_detect->subtract_power_y_smooth_fx =
-            L_add( Mpy_32_32( a, subtract_power_y ),
-                   Mpy_32_32( b, masa_stereo_type_detect->subtract_power_y_smooth_fx ) ); //(Q31, q_subtract_power_y) -> q_subtract_power_y
+
+        IF( NE_16( masa_stereo_type_detect->q_subtract_power_y, masa_stereo_type_detect->q_subtract_power_y_smooth ) )
+        {
+            exp = s_min( add( masa_stereo_type_detect->q_subtract_power_y, norm_l( masa_stereo_type_detect->subtract_power_y_fx ) ), add( masa_stereo_type_detect->q_subtract_power_y_smooth, norm_l( masa_stereo_type_detect->subtract_power_y_smooth_fx ) ) );
+            masa_stereo_type_detect->subtract_power_y_fx = L_shl( masa_stereo_type_detect->subtract_power_y_fx, sub( exp, masa_stereo_type_detect->q_subtract_power_y ) );
+            move32();
+            masa_stereo_type_detect->subtract_power_y_smooth_fx = L_shl( masa_stereo_type_detect->subtract_power_y_smooth_fx, sub( exp, masa_stereo_type_detect->q_subtract_power_y_smooth ) );
+            move32();
+            masa_stereo_type_detect->q_subtract_power_y = exp;
+            move16();
+            masa_stereo_type_detect->q_subtract_power_y_smooth = exp;
+            move16();
+        }
+        subtract_power_y = masa_stereo_type_detect->subtract_power_y_fx; // q_subtract_power_y
         move32();
 
+        W_temp = W_add( W_mult0_32_32( a, subtract_power_y ), W_mult0_32_32( b, masa_stereo_type_detect->subtract_power_y_smooth_fx ) ); // Q31 + masa_stereo_type_detect->q_subtract_power_y_smooth
+        IF( W_temp )
+        {
+            exp = W_norm( W_temp );
+            masa_stereo_type_detect->subtract_power_y_smooth_fx = W_extract_h( W_shl( W_temp, exp ) ); // Q31 + masa_stereo_type_detect->q_subtract_power_y_smooth + exp - 32
+            move32();
+            masa_stereo_type_detect->q_subtract_power_y_smooth = sub( add( masa_stereo_type_detect->q_subtract_power_y_smooth, exp ), 1 );
+            move16();
+        }
+        ELSE
+        {
+            masa_stereo_type_detect->subtract_power_y_smooth_fx = 0; // Q31
+            move32();
+            masa_stereo_type_detect->q_subtract_power_y_smooth = Q31;
+            move16();
+        }
         exp = 0;
         move16();
-        IF( masa_stereo_type_detect->target_power_y_smooth_fx != 0 )
+        test();
+        IF( masa_stereo_type_detect->target_power_y_smooth_fx && masa_stereo_type_detect->subtract_power_y_smooth_fx )
         {
             subtract_target_ratio = L_sub( BASOP_Util_Log2( masa_stereo_type_detect->subtract_power_y_smooth_fx ),
                                            BASOP_Util_Log2( masa_stereo_type_detect->target_power_y_smooth_fx ) ); // Q25
-            exp = sub( masa_stereo_type_detect->q_subtract_power_y, q_com );
+            exp = sub( masa_stereo_type_detect->q_subtract_power_y_smooth, q_com );
             L_tmp = Mpy_32_32( L_sub( subtract_target_ratio, L_shl( exp, 25 ) ), LOG10_2_Q31 ); // Q25
         }
         ELSE
         {
             subtract_target_ratio = BASOP_Util_Log2( masa_stereo_type_detect->subtract_power_y_smooth_fx ); // Q25
-            exp = sub( 31, masa_stereo_type_detect->q_subtract_power_y );
+            exp = sub( 31, masa_stereo_type_detect->q_subtract_power_y_smooth );
             L_tmp = L_sub( Mpy_32_32( L_add( subtract_target_ratio, L_shl( exp, 25 ) ), LOG10_2_Q31 ), -503316480 /* L_shl( -15, 25 ) */ /*log(EPSILON)*/ ); // Q25
         }
         subtract_target_ratio_db = Mpy_32_32( 1342177280 /* 10.0f * in Q27*/, L_tmp ); // (Q27, (Q25, Q31)) -> (Q27, Q25) -> Q21
@@ -2678,6 +2203,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
         move32();
         masa_stereo_type_detect->subtract_power_y_fx = 0;
         move32();
+        masa_stereo_type_detect->q_subtract_power_y = Q31;
+        move16();
     }
 
     /*-----------------------------------------------------------------*
@@ -2710,6 +2237,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
         prevWeight = Mpy_32_32( L_sub( ONE_IN_Q31, DIRECTION_SMOOTHNESS_ALPHA_Q31 ),
                                 h_dirac_output_synthesis_state->reference_power_smooth_prev_fx[l] ); //(Q31, q_reference_power_smooth) -> q_reference_power_smooth
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        assert( q_reference_power_smooth[0] == h_dirac_output_synthesis_state->reference_power_smooth_prev_q[0] );
+        assert( q_reference_power_smooth[1] == h_dirac_output_synthesis_state->reference_power_smooth_prev_q[1] );
+#else
+        assert( *q_reference_power_smooth == h_dirac_output_synthesis_state->reference_power_smooth_prev_q );
+#endif
         weightedDirectionSmoothness =
             L_add( Mpy_32_32( currWeight, instDirectionSmoothness ),
                    Mpy_32_32( prevWeight, h_dirac_output_synthesis_state->direction_smoothness_prev_fx[l] ) ); //(q_reference_power_smooth, Q31) -> q_reference_power_smooth
@@ -2717,6 +2250,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
 
         exp = 0;
         move16();
+
         tmp = BASOP_Util_Divide3232_Scale( weightedDirectionSmoothness, L_add( sumWeight, EPSILON_FX ), &exp ); /*Q(15-exp)*/
         smoothedDirectionSmoothness = L_shl_sat( L_deposit_l( tmp ), add( sub( Q31, Q15 ), exp ) );             // Q31
 
@@ -2754,19 +2288,21 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
             g1 = alpha[l]; // Q31
             move32();
             g2 = L_sub( ONE_IN_Q31, g1 );                                                          // Q31
-#ifdef FIX_867
-            *p_power_smooth_prev = L_add( 3*EPSILON_FX, Mpy_32_32( g2, ( *p_power_smooth_prev ) ) ); //(Q31, q_proto_power_smooth) -> q_proto_power_smooth
-#else
             *p_power_smooth_prev = L_add( EPSILON_FX, Mpy_32_32( g2, ( *p_power_smooth_prev ) ) ); //(Q31, q_proto_power_smooth) -> q_proto_power_smooth
-#endif
             move32();
             *( p_power_smooth_prev ) = L_add( *( p_power_smooth_prev ), Mpy_32_32( g1, ( *p_power_smooth ) ) ); //(Q31, q_proto_power_smooth) -> q_proto_power_smooth
             move32();
-#ifndef FIX_867
+
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            assert( h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] == h_dirac_output_synthesis_state->proto_power_smooth_q[0] );
+            assert( h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] == h_dirac_output_synthesis_state->proto_power_smooth_q[1] );
+#else
+            assert( h_dirac_output_synthesis_state->proto_power_smooth_prev_q == h_dirac_output_synthesis_state->proto_power_smooth_q );
+#endif
             IF( EQ_32( *( p_power_smooth_prev ), EPSILON_FX ) )
             {
                 p_power_smooth_prev++;
-                L_tmp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q31, EPSILON_FX, &exp ); /*Q=31-(exp-(31-q_proto_power_smooth))*/
+                L_tmp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q31, EPSILON_FX, &exp ); /*Q=31-(exp-(31-q_proto_power_smooth))*/
                 exp_arr[k * num_freq_bands + l] = exp;
                 move16();
 
@@ -2774,9 +2310,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 move32();
             }
             ELSE
-#endif
             {
-                L_tmp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q31, *( p_power_smooth_prev++ ), &exp ); /*Q=31-(exp-(31-q_proto_power_smooth))*/
+                L_tmp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q31, *( p_power_smooth_prev++ ), &exp ); /*Q=31-(exp-(31-q_proto_power_smooth))*/
                 exp_arr[k * num_freq_bands + l] = exp;
                 move16();
 
@@ -2787,6 +2322,61 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     }
 
     // Move proto_power_smooth_fx to common Q-factor
+
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 min_exp2 = -64;
+    min_exp = MIN_16;
+    move16();
+    move16();
+    Word16 q_tmp2 = Q31;
+    q_tmp = Q31;
+    move16();
+    move16();
+
+    FOR( k = 0; k < num_protos_dir; k++ )
+    {
+        FOR( l = 0; l < s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ); l++ )
+        {
+            min_exp = s_max( min_exp, exp_arr[k * num_freq_bands + l] );
+        }
+        FOR( l = CLDFB_NO_CHANNELS_HALF; l < num_freq_bands; l++ )
+        {
+            min_exp2 = s_max( min_exp2, exp_arr[k * num_freq_bands + l] );
+        }
+    }
+
+    p_power_smooth = h_dirac_output_synthesis_state->proto_power_smooth_fx;
+
+    FOR( k = 0; k < num_protos_dir; k++ )
+    {
+        FOR( l = 0; l < s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ); l++ )
+        {
+            *p_power_smooth = L_shr( *p_power_smooth, sub( min_exp, exp_arr[k * num_freq_bands + l] ) ); /*(31-(exp-(31-q_proto_power_smooth)))->(31-(min_exp-(31-q_proto_power_smooth)))*/
+            move32();
+            p_power_smooth++;
+        }
+        FOR( l = CLDFB_NO_CHANNELS_HALF; l < num_freq_bands; l++ )
+        {
+            *p_power_smooth = L_shr( *p_power_smooth, sub( min_exp2, exp_arr[k * num_freq_bands + l] ) ); /*(31-(exp-(31-q_proto_power_smooth)))->(31-(min_exp-(31-q_proto_power_smooth)))*/
+            move32();
+            p_power_smooth++;
+        }
+    }
+
+    // Update the Q-factor
+    h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] = s_min( h_dirac_output_synthesis_state->proto_power_smooth_q[0], h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] );
+    h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] = s_min( h_dirac_output_synthesis_state->proto_power_smooth_q[1], h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] );
+    move16();
+    move16();
+
+    q_tmp = add( sub( Q31, min_exp ), sub( Q31, h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] ) );
+    q_tmp2 = add( sub( Q31, min_exp2 ), sub( Q31, h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] ) );
+
+    h_dirac_output_synthesis_state->proto_power_smooth_q[0] = q_tmp;
+    h_dirac_output_synthesis_state->proto_power_smooth_q[1] = q_tmp2;
+    move16();
+    move16();
+#else
     min_exp = MIN_16;
     move16();
     q_tmp = Q31;
@@ -2823,38 +2413,17 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     move16();
     h_dirac_output_synthesis_state->proto_power_smooth_q = q_tmp;
     move16();
+#endif
 
     /*Direct gains and diffuse gains on number of output channels*/
     p_power_diff_smooth_prev = h_dirac_output_synthesis_state->proto_power_diff_smooth_prev_fx;
     p_power_smooth_diff = h_dirac_output_synthesis_state->proto_power_diff_smooth_fx;
 
-    p_gains_diff = gains_diff;
-    p_gains_dir = gains_dir;
-
-    p_cy_auto_dir_smooth = h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx;
-    p_cy_auto_dir_smooth_prev = h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx;
-#ifdef FIX_867
-    FOR( k = 0; k < nchan_target_psds; k++ )
-    {
-        FOR( l = 0; l < num_freq_bands; l++ )
-        {
-            q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] = norm_l( p_cy_auto_dir_smooth_prev[k * num_freq_bands + l] );
-            move16();
-
-            p_cy_auto_dir_smooth_prev[k * num_freq_bands + l] = L_shl( p_cy_auto_dir_smooth_prev[k * num_freq_bands + l], q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] ); /*q_cy_auto_dir_smooth_prev_local[k]+h_dirac_output_synthesis_state -> q_cy_auto_dir_smooth_prev*/
-            q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] = add( q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l], h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev[k * num_freq_bands + l] );
-            move16();
-
-            q_com = s_min( q_cy_auto_dir_smooth_local[k * num_freq_bands + l], q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] );
-            p_cy_auto_dir_smooth[k * num_freq_bands + l] = L_shl( p_cy_auto_dir_smooth[k * num_freq_bands + l], sub( q_com, q_cy_auto_dir_smooth_local[k * num_freq_bands + l] ) );                /*q_cy_auto_dir_smooth_local -> q_com*/
-            p_cy_auto_dir_smooth_prev[k * num_freq_bands + l] = L_shl( p_cy_auto_dir_smooth_prev[k * num_freq_bands + l], sub( q_com, q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] ) ); /*q_cy_auto_dir_smooth_prev_local -> q_com*/
-
-            q_cy_auto_dir_smooth_local[k * num_freq_bands + l] = q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] = q_com;
-            move16();
-            move16();
-        }
-    }
-#else
+    p_gains_diff = gains_diff;
+    p_gains_dir = gains_dir;
+
+    p_cy_auto_dir_smooth = h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx;
+    p_cy_auto_dir_smooth_prev = h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx;
     FOR( k = 0; k < nchan_out_woLFE; k++ )
     {
         q_cy_auto_dir_smooth_prev_local[k] = getScaleFactor32( p_cy_auto_dir_smooth_prev + imult1616( k, num_freq_bands ), num_freq_bands );
@@ -2869,59 +2438,32 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
         move16();
         move16();
     }
-#endif
 
 
     p_cy_cross_dir_smooth = h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx;
     p_cy_cross_dir_smooth_prev = h_dirac_output_synthesis_state->cy_cross_dir_smooth_prev_fx;
-#ifdef FIX_867
-    for ( Word16 kk = 0; kk < imult1616( nchan_target_psds, num_freq_bands ); kk++ )
-    {
-        q_com = s_min( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk], h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev[kk] );
-
-        p_cy_cross_dir_smooth[kk] = L_shl( p_cy_cross_dir_smooth[kk], sub( q_com, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk] ) );                /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth -> q_com*/
-        p_cy_cross_dir_smooth_prev[kk] = L_shl( p_cy_cross_dir_smooth_prev[kk], sub( q_com, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev[kk] ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev -> q_com*/
-
-        h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[kk] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev[kk] = q_com;
-        move16();
-        move16();
-    }
-#else
     q_com = s_min( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev );
     scale_sig32( p_cy_cross_dir_smooth, imult1616( nchan_out_woLFE, num_freq_bands ), sub( q_com, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) );           /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth -> q_com*/
     scale_sig32( p_cy_cross_dir_smooth_prev, imult1616( nchan_out_woLFE, num_freq_bands ), sub( q_com, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev -> q_com*/
     h_dirac_output_synthesis_state->q_cy_cross_dir_smooth = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev = q_com;
     move16();
     move16();
-#endif
 
     p_cy_auto_diff_smooth = h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx;
     p_cy_auto_diff_smooth_prev = h_dirac_output_synthesis_state->cy_auto_diff_smooth_prev_fx;
-#ifdef FIX_867
-    for ( Word16 kk = 0; kk < imult1616( nchan_out_woLFE, num_freq_bands ); kk++ )
-    {
-        q_com = s_min( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk], h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev[kk] );
-
-        p_cy_auto_diff_smooth[kk] = L_shl( p_cy_auto_diff_smooth[kk], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] ) );                /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth -> q_com*/
-        p_cy_auto_diff_smooth_prev[kk] = L_shl( p_cy_auto_diff_smooth_prev[kk], sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev[kk] ) ); /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev -> q_com*/
-
-        h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] = h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev[kk] = q_com;
-
-        move16();
-        move16();
-    }
-#else
     q_com = s_min( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev );
     scale_sig32( p_cy_auto_diff_smooth, imult1616( nchan_out_woLFE, num_freq_bands ), sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) );           /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth -> q_com*/
     scale_sig32( p_cy_auto_diff_smooth_prev, imult1616( nchan_out_woLFE, num_freq_bands ), sub( q_com, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev ) ); /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev -> q_com*/
     h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev = q_com;
     move16();
     move16();
-#endif
 
     FOR( k = 0; k < nchan_out_woLFE; k++ )
     {
         Word32 power_smooth_temp;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        Word16 qidx;
+#endif
         p_power_smooth = h_dirac_output_synthesis_state->proto_power_smooth_fx + i_mult( proto_direct_index[k], num_freq_bands ); // q_proto_power_smooth
         FOR( l = 0; l < h_dirac_output_synthesis_params->max_band_decorr; l++ )
         {
@@ -2929,19 +2471,23 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
             g1 = alpha[l]; // Q31
             move32();
             g2 = L_sub( ONE_IN_Q31, g1 ); // Q31
+            assert( q_cy_auto_dir_smooth_local[k] == q_cy_auto_dir_smooth_prev_local[k] );
             *( p_cy_auto_dir_smooth_prev ) = L_add( Mpy_32_32( g1, ( *( p_cy_auto_dir_smooth++ ) ) ),
                                                     Mpy_32_32( g2, ( *( p_cy_auto_dir_smooth_prev ) ) ) ); // (Q31, q_cy_auto_dir_smooth_prev_local) -> q_cy_auto_dir_smooth_prev_local
             move32();
+            assert( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth == h_dirac_output_synthesis_state->q_cy_cross_dir_smooth_prev );
             *( p_cy_cross_dir_smooth_prev ) = L_add( Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth++ ) ) ),
                                                      Mpy_32_32( g2, ( *( p_cy_cross_dir_smooth_prev ) ) ) ); // (Q31, q_cy_cross_dir_smooth_prev) -> q_cy_cross_dir_smooth_prev
             move32();
 
             power_smooth_temp = L_shl( *p_power_smooth, norm_l( *p_power_smooth ) );      // proto_power_smooth_q + norm_l( *p_power_smooth )
             L_tmp = Mpy_32_32( power_smooth_temp, ( *( p_cy_auto_dir_smooth_prev++ ) ) ); // proto_power_smooth_q + norm_l( *p_power_smooth ) ) + q_cy_auto_dir_smooth_prev_local - 31
-#ifdef FIX_867
-            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q, norm_l( *p_power_smooth ) ),
-                                      q_cy_auto_dir_smooth_prev_local[num_freq_bands * k + l] ),
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q[qidx], norm_l( *p_power_smooth ) ),
+                                      q_cy_auto_dir_smooth_prev_local[k] ),
                                  Q31 ) );
+
 #else
             exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q, norm_l( *p_power_smooth ) ),
                                       q_cy_auto_dir_smooth_prev_local[k] ),
@@ -2951,11 +2497,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
 
             *( p_gains_dir ) = Sqrt32( L_tmp, &exp ); // (Q31 - exp)
             move32();
-#ifdef FIX_867
-            *( p_gains_dir ) = L_shl_sat( *( p_gains_dir ), sub( h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l], sub( Q31, exp ) ) ); // gains_dir_prev_q
-#else
             *( p_gains_dir ) = L_shl_sat( *( p_gains_dir ), sub( h_dirac_output_synthesis_state->gains_dir_prev_q, sub( Q31, exp ) ) ); // gains_dir_prev_q
-#endif
             move32();
 
             IF( *( p_gains_dir ) < 0 )
@@ -2963,20 +2505,11 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 *( p_gains_dir ) = 0;
                 move32();
             }
-#ifdef FIX_867
-            ELSE IF( GT_32( *( p_gains_dir ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l] ) ), Q5 ) ) ) )
-            {
-                *( p_gains_dir ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l] ) ), Q5 ) ); /*26 + h_dirac_output_synthesis_state->gains_dir_prev_q + 1 + 5 - 32 -> h_dirac_output_synthesis_state->gains_dir_prev_q*/
-                move32();
-            }
-#else
-
             ELSE IF( GT_32( *( p_gains_dir ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q ) ), Q5 ) ) ) )
             {
                 *( p_gains_dir ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q ) ), Q5 ) ); /*26 + h_dirac_output_synthesis_state->gains_dir_prev_q + 1 + 5 - 32 -> h_dirac_output_synthesis_state->gains_dir_prev_q*/
                 move32();
             }
-#endif
 
             IF( *( p_cy_cross_dir_smooth_prev++ ) < 0 )
             {
@@ -2996,20 +2529,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
 
             exp = 0;
             move16();
-            L_tmp = BASOP_Util_Divide3232_Scale_cadence( *( p_cy_auto_diff_smooth_prev++ ), ( *( p_power_diff_smooth_prev++ ) ), &exp ); // (Q31 - exp) + (q_a - q_b)
-#ifdef FIX_867
-            exp = sub( Q31, add( sub( Q31, exp ), sub( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev[k * num_freq_bands + l], h_dirac_output_synthesis_state->proto_power_diff_smooth_q ) ) );
-#else
+            L_tmp = BASOP_Util_Divide3232_Scale_newton( *( p_cy_auto_diff_smooth_prev++ ), ( *( p_power_diff_smooth_prev++ ) ), &exp ); // (Q31 - exp) + (q_a - q_b)
             exp = sub( Q31, add( sub( Q31, exp ), sub( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev, h_dirac_output_synthesis_state->proto_power_diff_smooth_q ) ) );
-#endif
 
             *( p_gains_diff ) = Sqrt32( L_tmp, &exp ); // (31 - exp)
             move32();
-#ifdef FIX_867
-            *( p_gains_diff ) = L_shl_sat( *( p_gains_diff ), sub( h_dirac_output_synthesis_state->gains_diff_prev_q[k * num_freq_bands + l], sub( Q31, exp ) ) ); // gains_diff_prev_q
-#else
             *( p_gains_diff ) = L_shl_sat( *( p_gains_diff ), sub( h_dirac_output_synthesis_state->gains_diff_prev_q, sub( Q31, exp ) ) ); // gains_diff_prev_q
-#endif
             move32();
 
             IF( *( p_gains_diff ) < 0 )
@@ -3017,62 +2542,23 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 *( p_gains_diff ) = 0;
                 move32();
             }
-#ifdef FIX_867
-            ELSE IF( GT_32( *( p_gains_diff ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q[k * num_freq_bands + l] ) ), Q5 ) ) ) ) /*h_dirac_output_synthesis_state->gains_diff_prev_q*/
-            {
-                *( p_gains_diff ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q[k * num_freq_bands + l] ) ), Q5 ) ); /*h_dirac_output_synthesis_state->gains_diff_prev_q*/
-                move32();
-            }
-
-#else
             ELSE IF( GT_32( *( p_gains_diff ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q ) ), Q5 ) ) ) ) /*h_dirac_output_synthesis_state->gains_diff_prev_q*/
             {
                 *( p_gains_diff ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q ) ), Q5 ) ); /*h_dirac_output_synthesis_state->gains_diff_prev_q*/
                 move32();
             }
-#endif
             p_gains_diff++;
         }
 
         /*Only direct prototype*/
         FOR( ; l < num_freq_bands; l++ )
         {
-#ifdef FIX_867_DBG
-            {
-                static FILE *f = 0;
-                if ( f == 0 )
-                    f = fopen( "p_power_smooth", "w" );
-
-                Word32 m = *p_power_smooth;
-                Word16 e = h_dirac_output_synthesis_state->proto_power_smooth_q;
-                float f1_m = (float) m;
-                float f1_e = powf( 2, e );
-                float f1 = f1_m / f1_e;
-                fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-            }
-#endif
-
             /*Direct*/
             g1 = alpha[l]; // Q31
             move32();
             g2 = L_sub( ONE_IN_Q31, g1 ); // Q31
             W_temp = W_add( W_mult_32_32( g1, ( *( p_cy_auto_dir_smooth++ ) ) ),
                             W_mult_32_32( g2, ( *( p_cy_auto_dir_smooth_prev ) ) ) ); /*32+q_cy_auto_dir_smooth_prev_local*/
-#ifdef FIX_867_DBG
-            {
-                static FILE *f = 0;
-                if ( f == 0 )
-                    f = fopen( "p_cy_auto_dir_smooth_prev", "w" );
-
-                Word32 m = *p_cy_auto_dir_smooth_prev;
-                Word16 e = q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l];
-                float f1_m = (float) m;
-                float f1_e = powf( 2, e );
-                float f1 = f1_m / f1_e;
-                fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-            }
-#endif
-
             q_tmp = W_norm( W_temp );
             L_tmp = W_extract_h( W_shl( W_temp, q_tmp ) );              // q_cy_auto_dir_smooth_prev_local + q_tmp
             *( p_cy_auto_dir_smooth_prev++ ) = L_shr_r( L_tmp, q_tmp ); // q_cy_auto_dir_smooth_prev_local
@@ -3087,39 +2573,23 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 *( p_cy_cross_dir_smooth_prev ) = 1;
                 move32();
             }
-
             ( p_cy_cross_dir_smooth++ );
             power_smooth_temp = L_shl( *p_power_smooth, norm_l( *p_power_smooth ) );
-#ifdef FIX_867_DBG
-            {
-                static FILE *f = 0;
-                if ( f == 0 )
-                    f = fopen( "p_power_smooth1", "w" );
-
-                Word32 m = *p_power_smooth;
-                Word16 e = h_dirac_output_synthesis_state->proto_power_smooth_q;
-                float f1_m = (float) m;
-                float f1_e = powf( 2, e );
-                float f1 = f1_m / f1_e;
-                fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-            }
-#endif
             L_tmp = Mpy_32_32( power_smooth_temp, L_tmp ); // proto_power_smooth_q + norm_l( *p_power_smooth ) ) + q_cy_auto_dir_smooth_prev_local - 31
-            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q, norm_l( *p_power_smooth ) ),
-#ifdef FIX_867
-                                      add( q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l], q_tmp ) ),
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q[qidx], norm_l( *p_power_smooth ) ),
+                                      add( q_cy_auto_dir_smooth_prev_local[k], q_tmp ) ),
+                                 Q31 ) );
 #else
+            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q, norm_l( *p_power_smooth ) ),
                                       add( q_cy_auto_dir_smooth_prev_local[k], q_tmp ) ),
-#endif
                                  Q31 ) );
+#endif
 
             *( p_gains_dir ) = Sqrt32( L_tmp, &exp ); // (Q31 - exp)
             move32();
-#ifdef FIX_867
-            *( p_gains_dir ) = L_shl_sat( *( p_gains_dir ), sub( h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l], sub( Q31, exp ) ) ); // gains_dir_prev_q
-#else
             *( p_gains_dir ) = L_shl_sat( *( p_gains_dir ), sub( h_dirac_output_synthesis_state->gains_dir_prev_q, sub( Q31, exp ) ) ); // gains_dir_prev_q
-#endif
             move32();
 
             IF( *( p_gains_dir ) < 0 )
@@ -3127,45 +2597,19 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 *( p_gains_dir ) = 0;
                 move32();
             }
-#ifdef FIX_867
-            ELSE IF( GT_32( *( p_gains_dir ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l] ) ), Q5 ) ) ) ) /*gains_dir_prev_q*/
-            {
-                *( p_gains_dir ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l] ) ), Q5 ) ); /*gains_dir_prev_q*/
-                move32();
-            }
-
-#else
             ELSE IF( GT_32( *( p_gains_dir ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q ) ), Q5 ) ) ) ) /*gains_dir_prev_q*/
             {
                 *( p_gains_dir ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_dir_prev_q ) ), Q5 ) ); /*gains_dir_prev_q*/
                 move32();
             }
-#endif
 
             IF( *( p_cy_cross_dir_smooth_prev++ ) < 0 )
             {
                 *( p_gains_dir ) = L_negate( *( p_gains_dir ) ); /*gains_dir_prev_q*/
                 move32();
             }
-
-
-#ifdef FIX_867_DBG
-            {
-                static FILE *f = 0;
-                if ( f == 0 )
-                    f = fopen( "gains", "w" );
-
-                Word32 m = *p_gains_dir;
-                Word16 e = h_dirac_output_synthesis_state->gains_dir_prev_q[k * num_freq_bands + l];
-                float f1_m = (float) m;
-                float f1_e = powf( 2, e );
-                float f1 = f1_m / f1_e;
-                fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-            }
-#endif
             p_gains_dir++;
 
-
             /*diffuse*/
             *( p_cy_auto_diff_smooth_prev ) = L_add( Mpy_32_32( g1, ( *( p_cy_auto_diff_smooth ) ) ),
                                                      Mpy_32_32( g2, ( *( p_cy_auto_diff_smooth_prev ) ) ) ); // (Q31, q_cy_auto_diff_smooth_prev) -> q_cy_auto_diff_smooth_prev
@@ -3190,12 +2634,10 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 move32();
             }
             ( p_cy_auto_diff_smooth_prev++ );
-#ifdef FIX_867
-            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q, norm_l( *p_power_smooth ) ),
-                                      h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev[k * num_freq_bands + l] ),
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q[qidx], norm_l( *p_power_smooth ) ),
+                                      h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev ),
                                  Q31 ) );
-
-
 #else
             exp = sub( Q31, sub( add( add( h_dirac_output_synthesis_state->proto_power_smooth_q, norm_l( *p_power_smooth ) ),
                                       h_dirac_output_synthesis_state->q_cy_auto_diff_smooth_prev ),
@@ -3205,11 +2647,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
 
             *( p_gains_diff ) = Sqrt32( L_tmp, &exp ); /*31-exp*/
             move32();
-#ifdef FIX_867
-            *( p_gains_diff ) = L_shl_sat( *( p_gains_diff ), sub( h_dirac_output_synthesis_state->gains_diff_prev_q[k * num_freq_bands + l], sub( Q31, exp ) ) ); // gains_diff_prev_q
-#else
             *( p_gains_diff ) = L_shl_sat( *( p_gains_diff ), sub( h_dirac_output_synthesis_state->gains_diff_prev_q, sub( Q31, exp ) ) ); // gains_diff_prev_q
-#endif
             move32();
 
             IF( *( p_gains_diff ) < 0 )
@@ -3217,20 +2655,11 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
                 *( p_gains_diff ) = 0;
                 move32();
             }
-#ifdef FIX_867
-            ELSE IF( GT_32( *( p_gains_diff ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q[k * num_freq_bands + l] ) ), Q5 ) ) ) ) // gains_diff_prev_q
-            {
-                *( p_gains_diff ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q[k * num_freq_bands + l] ) ), Q5 ) ); // gains_diff_prev_q
-                move32();
-            }
-
-#else
             ELSE IF( GT_32( *( p_gains_diff ), W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q ) ), Q5 ) ) ) ) // gains_diff_prev_q
             {
                 *( p_gains_diff ) = W_extract_h( W_shl( W_mult_32_32( DIRAC_GAIN_LIMIT_Q26, L_shl( 1, h_dirac_output_synthesis_state->gains_diff_prev_q ) ), Q5 ) ); // gains_diff_prev_q
                 move32();
             }
-#endif
             p_gains_diff++;
         }
     }
@@ -3330,24 +2759,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
         }
     }
     q_align = W_norm( W_temp );
-#ifdef FIX_867
-    Word16 tmp_min;
-    minimum_s( h_dirac_output_synthesis_state->gains_dir_prev_q, nchan_out_woLFE * num_freq_bands, &tmp_min );
-    FOR( buf_idx = 0; buf_idx < nbslots; ++buf_idx )
-    {
-        FOR( k = 0; k < nchan_out_woLFE; k++ )
-        {
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                RealBuffer[k][buf_idx][l] = W_extract_h( W_shl( Cldfb_RealBuffer64_fx[k][buf_idx][l], q_align - h_dirac_output_synthesis_state->gains_dir_prev_q[l] + tmp_min ) ); /*( ( ( h_dirac_output_synthesis_state->proto_direct_buffer_f_q+h_dirac_output_synthesis_state->gains_dir_prev_q )+ q_align )- 32 )*/
-                move32();
-                ImagBuffer[k][buf_idx][l] = W_extract_h( W_shl( Cldfb_ImagBuffer64_fx[k][buf_idx][l], q_align - h_dirac_output_synthesis_state->gains_dir_prev_q[l] + tmp_min ) ); /*( ( ( h_dirac_output_synthesis_state->proto_direct_buffer_f_q+h_dirac_output_synthesis_state->gains_dir_prev_q )+ q_align )- 32 )*/
-                move32();
-            }
-        }
-    }
-    *q_Cldfb = sub( add( add( h_dirac_output_synthesis_state->proto_direct_buffer_f_q, tmp_min ), q_align ), 32 );
-#else
     FOR( buf_idx = 0; buf_idx < nbslots; ++buf_idx )
     {
         FOR( k = 0; k < nchan_out_woLFE; k++ )
@@ -3363,7 +2774,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     }
 
     *q_Cldfb = sub( add( add( h_dirac_output_synthesis_state->proto_direct_buffer_f_q, h_dirac_output_synthesis_state->gains_dir_prev_q ), q_align ), 32 );
-#endif
     move16();
 
     /*-----------------------------------------------------------------*
@@ -3380,41 +2790,13 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     {
         set_zero_fx( h_dirac_output_synthesis_state->proto_power_diff_smooth_fx, h_dirac_output_synthesis_params->max_band_decorr * nchan_out_woLFE );
     }
-#ifdef FIX_867
-    FOR( k = 0; k < nchan_out_woLFE; k++ )
-    {
-        Word16 min_tmp;
-        minimum_fx( &q_cy_auto_dir_smooth_prev_local[k * num_freq_bands], num_freq_bands, &min_tmp );
-
-        FOR( l = 0; l < num_freq_bands; l++ )
-        {
-            h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx[k * num_freq_bands + l] =
-                L_shl( h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx[k * num_freq_bands + l], sub( min_tmp, q_cy_auto_dir_smooth_prev_local[k * num_freq_bands + l] ) );
-
-            h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev[l] = min_tmp;
-        }
-    }
 
-#else
     minimum_fx( q_cy_auto_dir_smooth_prev_local, nchan_out_woLFE, &h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev );
     FOR( k = 0; k < nchan_out_woLFE; k++ )
     {
         scale_sig32( h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx + ( k * num_freq_bands ), num_freq_bands, sub( h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev, q_cy_auto_dir_smooth_prev_local[k] ) ); /*q_cy_auto_dir_smooth_prev_local[k] -> h_dirac_output_synthesis_state->q_cy_auto_dir_smooth_prev*/
     }
-#endif
 
-#ifdef FIX_867
-    set_zero_fx( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, imult1616( num_freq_bands, nchan_out_woLFE ) );
-    set16_zero_fx( h_dirac_output_synthesis_state->q_cy_auto_dir_smooth, imult1616( num_freq_bands, nchan_out_woLFE ) );
-    move16();
-    set_zero_fx( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx, imult1616( num_freq_bands, nchan_out_woLFE ) );
-    set16_zero_fx( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, imult1616( num_freq_bands, nchan_out_woLFE ) );
-    move16();
-    set_zero_fx( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, imult1616( num_freq_bands, nchan_out_woLFE ) );
-    set16_zero_fx( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, imult1616( num_freq_bands, nchan_out_woLFE ) );
-    move16();
-
-#else
     set_zero_fx( h_dirac_output_synthesis_state->cy_auto_dir_smooth_fx, imult1616( num_freq_bands, nchan_out_woLFE ) );
     h_dirac_output_synthesis_state->q_cy_auto_dir_smooth = 0;
     move16();
@@ -3424,7 +2806,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     set_zero_fx( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, imult1616( num_freq_bands, nchan_out_woLFE ) );
     h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = 0;
     move16();
-#endif
 
     pop_wmops();
 
@@ -3858,11 +3239,19 @@ void ivas_dirac_dec_compute_directional_responses_fx(
                 }
                 ELSE
                 {
+#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
+                    ivas_dirac_dec_get_response_fx_29( azimuth[k], elevation[k], direct_response_hoa_fx, hDirACRend->hOutSetup.ambisonics_order );
+#else
                     ivas_dirac_dec_get_response_fx( azimuth[k], elevation[k], direct_response_hoa_fx, hDirACRend->hOutSetup.ambisonics_order, Q_direct_response_hoa );
+#endif
 
                     IF( hodirac_flag )
                     {
+#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
+                        ivas_dirac_dec_get_response_fx_29( azimuth2[k], elevation2[k], direct_response_dir2_fx, hDirACRend->hOutSetup.ambisonics_order );
+#else
                         ivas_dirac_dec_get_response_fx( azimuth2[k], elevation2[k], direct_response_dir2_fx, hDirACRend->hOutSetup.ambisonics_order, Q_direct_response_dir2 );
+#endif
                     }
                 }
 
@@ -4462,21 +3851,6 @@ void ivas_dirac_dec_compute_gain_factors_fx(
         move32();
     }
 
-#ifdef FIX_867_DBG
-    FOR( Word16 l = 0; l < num_freq_bands; l++ )
-    {
-        static FILE *f = 0;
-        if ( f == 0 )
-            f = fopen( "direct_gain_factor1", "w" );
-
-        Word32 m = direct_gain_factor[i];
-        Word16 e = *max_exp_direct_fx;
-        float f1_m = (float) m;
-        float f1_e = powf( 2, e );
-        float f1 = f1_m / f1_e;
-        fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-    }
-#endif
 
     return;
 }
@@ -4551,7 +3925,7 @@ void ivas_lfe_synth_with_filters_fx(
     /* Delay the separated channel to sync the LFE synthesis with the DirAC rendering */
     delay = hMasaLfeSynth->delayBuffer_syncDirAC_size;
     move16();
-    delay_signal_fx( data_fx[separateChannelIndex], output_frame, hMasaLfeSynth->delayBuffer_syncDirAC_fx, delay ); /*q11*/
+    delay_signal32_fx( data_fx[separateChannelIndex], output_frame, hMasaLfeSynth->delayBuffer_syncDirAC_fx, delay ); /*q11*/
 
     /* Filterbank for dividing the separated channel to LFE frequencies and higher frequencies */
     lowpassCoef_fx_exp = 15;
@@ -4642,10 +4016,11 @@ void ivas_lfe_synth_with_filters_fx(
         }
         ELSE
         {
-            lfeGain_fx = extract_h( BASOP_Util_Divide3232_Scale_cadence( hMasaLfeSynth->targetEneLfeSmooth_fx, L_add( EPSILON_FX, hMasaLfeSynth->transportEneSmooth_fx ), &lfeGain_fx_exp ) ); /*Q(31-(lfeGain_fx_exp+hMasaLfeSynth->transportEneSmooth_q-hMasaLfeSynth->targetEneLfeSmooth_q))-16*/
+            Flag overFlow;
+            lfeGain_fx = extract_h( BASOP_Util_Divide3232_Scale_newton( hMasaLfeSynth->targetEneLfeSmooth_fx, L_add( EPSILON_FX, hMasaLfeSynth->transportEneSmooth_fx ), &lfeGain_fx_exp ) ); /*Q(31-(lfeGain_fx_exp+hMasaLfeSynth->transportEneSmooth_q-hMasaLfeSynth->targetEneLfeSmooth_q))-16*/
             lfeGain_fx_exp = add( sub( hMasaLfeSynth->transportEneSmooth_q, hMasaLfeSynth->targetEneLfeSmooth_q ), lfeGain_fx_exp );
-            lfeGain_fx = Sqrt16( lfeGain_fx, &lfeGain_fx_exp ); // Q15-lfeGain_fx_exp
-            lfeGain_fx = shl_r( lfeGain_fx, lfeGain_fx_exp );   // Q15
+            lfeGain_fx = Sqrt16( lfeGain_fx, &lfeGain_fx_exp );           // Q15-lfeGain_fx_exp
+            lfeGain_fx = shl_ro( lfeGain_fx, lfeGain_fx_exp, &overFlow ); // Q15
         }
         IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( hMasaLfeSynth->targetEneTransSmooth_fx, sub( Q31, hMasaLfeSynth->targetEneTransSmooth_q ), /*EPSILON + */ hMasaLfeSynth->transportEneSmooth_fx, sub( Q31, hMasaLfeSynth->transportEneSmooth_q ) ), 1 ) )
         {
@@ -4710,7 +4085,7 @@ void ivas_lfe_synth_with_filters_fx(
     /* Delay the separated channel to match the delay of the lowpass filter */
     delay = hMasaLfeSynth->delayBuffer_syncLp_size;
     move16();
-    delay_signal_fx( data_fx[separateChannelIndex], output_frame, hMasaLfeSynth->delayBuffer_syncLp_fx, delay ); /*q11*/
+    delay_signal32_fx( data_fx[separateChannelIndex], output_frame, hMasaLfeSynth->delayBuffer_syncLp_fx, delay ); /*q11*/
 
     return;
 }
@@ -4735,17 +4110,16 @@ static void computeTargetPSDs_direct_fx(
     Word16 ch_idx, cur_idx;
 
     /* segment auxiliary buffer */
-    Word32 direct_power[CLDFB_NO_CHANNELS_MAX];  /* size: num_freq_bands. */
-#ifdef FIX_867
-    Word32 aux_buffer_res; /* size: num_freq_bands. */
-#else
+    Word32 direct_power[CLDFB_NO_CHANNELS_MAX];   /* size: num_freq_bands. */
     Word32 aux_buffer_res[CLDFB_NO_CHANNELS_MAX]; /* size: num_freq_bands. */
-#endif
 
     /* estimate direct and diffuse power */
     v_mult_fixed( direct_power_factor, reference_power, direct_power, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
 
-#ifndef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 common1_q = s_min( *q_cy_auto_dir_smooth, s_min( q_reference_power[0], q_reference_power[1] ) );
+    Word16 common2_q = s_min( *q_cy_cross_dir_smooth, s_min( q_reference_power[0], q_reference_power[1] ) );
+#else
     Word16 common1_q = s_min( *q_cy_auto_dir_smooth, *q_reference_power );
     Word16 common2_q = s_min( *q_cy_cross_dir_smooth, *q_reference_power );
 #endif
@@ -4754,56 +4128,33 @@ static void computeTargetPSDs_direct_fx(
     FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
     {
         cur_idx = imult1616( ch_idx, num_freq_bands );
-#ifdef FIX_867
-        FOR( Word16 l = 0; l < num_freq_bands; l++ )
-        {
-            Word16 common1_q = s_min( q_cy_auto_dir_smooth[cur_idx + l], q_reference_power[l] );
-            Word16 common2_q = s_min( q_cy_cross_dir_smooth[cur_idx + l], q_reference_power[l] );
-
-            aux_buffer_res = Mpy_32_32( direct_power[l], direct_responses_square[cur_idx + l] ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
-
-            aux_buffer_res = L_shl( aux_buffer_res, sub( common1_q, q_reference_power[l] ) );                                                /* Q(common1_q) */
-            cy_auto_dir_smooth[cur_idx + l] = L_shl( cy_auto_dir_smooth[cur_idx + l], sub( common1_q, q_cy_auto_dir_smooth[cur_idx + l] ) ); /* Q(common1_q) */
-
-            cy_auto_dir_smooth[cur_idx + l] = L_add( L_shr( cy_auto_dir_smooth[cur_idx + l], 1 ), L_shr( aux_buffer_res, 1 ) ); /* Q(common1_q) - Q1 */
-
-            aux_buffer_res = Mpy_32_32( direct_power[l], direct_responses[cur_idx + l] );                                                       /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
-            aux_buffer_res = L_shl( aux_buffer_res, sub( common2_q, q_reference_power[l] ) );                                                   /* Q(common2_q) */
-            cy_cross_dir_smooth[cur_idx + l] = L_shl( cy_cross_dir_smooth[cur_idx + l], sub( common2_q, q_cy_cross_dir_smooth[cur_idx + l] ) ); /* Q(common2_q) */
-
-            cy_cross_dir_smooth[cur_idx + l] = L_add( L_shr( cy_cross_dir_smooth[cur_idx + l], 1 ), L_shr( aux_buffer_res, 1 ) ); /* Q(common2_q) - Q1 */
-
-            Word16 q_tmp = norm_l( cy_auto_dir_smooth[cur_idx + l] );
-            cy_auto_dir_smooth[cur_idx + l] = L_shl( cy_auto_dir_smooth[cur_idx + l], q_tmp );
-            q_cy_auto_dir_smooth[cur_idx + l] = add( sub( common1_q, Q1 ), q_tmp );
-            move16();
-
-            q_tmp = norm_l( cy_cross_dir_smooth[cur_idx + l] );
-            cy_cross_dir_smooth[cur_idx + l] = L_shl( cy_cross_dir_smooth[cur_idx + l], q_tmp );
-            q_cy_cross_dir_smooth[cur_idx + l] = add( sub( common2_q, Q1 ), q_tmp );
-            move16();
-        }
 
+        v_mult_fixed( direct_power, &direct_responses_square[cur_idx], aux_buffer_res, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        scale_sig32( aux_buffer_res, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( common1_q, q_reference_power[0] ) );                                    /* Q(common1_q) */
+        scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( common1_q, q_reference_power[1] ) ); /* Q(common1_q) */
 #else
-        v_mult_fixed( direct_power, &direct_responses_square[cur_idx], aux_buffer_res, num_freq_bands );               /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
-        scale_sig32( aux_buffer_res, num_freq_bands, sub( common1_q, *q_reference_power ) );                           /* Q(common1_q) */
+        scale_sig32( aux_buffer_res, num_freq_bands, sub( common1_q, *q_reference_power ) ); /* Q(common1_q) */
+#endif
         scale_sig32( &cy_auto_dir_smooth[cur_idx], num_freq_bands, sub( common1_q, *q_cy_auto_dir_smooth ) );          /* Q(common1_q) */
         v_add_fixed( &cy_auto_dir_smooth[cur_idx], aux_buffer_res, &cy_auto_dir_smooth[cur_idx], num_freq_bands, Q1 ); /* Q(common1_q) - Q1 */
 
-        v_mult_fixed( direct_power, &direct_responses[cur_idx], aux_buffer_res, num_freq_bands );                        /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
-        scale_sig32( aux_buffer_res, num_freq_bands, sub( common2_q, *q_reference_power ) );                             /* Q(common2_q) */
+        v_mult_fixed( direct_power, &direct_responses[cur_idx], aux_buffer_res, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        scale_sig32( aux_buffer_res, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( common2_q, q_reference_power[0] ) );                                    /* Q(common2_q) */
+        scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( common2_q, q_reference_power[1] ) ); /* Q(common2_q) */
+#else
+        scale_sig32( aux_buffer_res, num_freq_bands, sub( common2_q, *q_reference_power ) ); /* Q(common2_q) */
+#endif
         scale_sig32( &cy_cross_dir_smooth[cur_idx], num_freq_bands, sub( common2_q, *q_cy_cross_dir_smooth ) );          /* Q(common2_q) */
         v_add_fixed( &cy_cross_dir_smooth[cur_idx], aux_buffer_res, &cy_cross_dir_smooth[cur_idx], num_freq_bands, Q1 ); /* Q(common2_q) - Q1 */
-#endif
     }
 
-#ifndef FIX_867
     /* Q adjustment */
     *q_cy_auto_dir_smooth = sub( common1_q, Q1 );
     move16();
     *q_cy_cross_dir_smooth = sub( common2_q, Q1 );
     move16();
-#endif
 
     return;
 }
@@ -4822,33 +4173,21 @@ static void computeTargetPSDs_direct_subframe_fx(
     Word32 *cy_cross_dir_smooth, /*q_cy_cross_dir_smooth*/
     Word16 *q_cy_cross_dir_smooth )
 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 ch_idx, cur_idx, q_tmp;
+    Word32 L_tmp[CLDFB_NO_CHANNELS_MAX];
+    Word16 q_cy_auto_dir_smooth_local[2];
+#else
     Word16 ch_idx, cur_idx, i, q_tmp;
-    Word64 W_tmp[CLDFB_NO_CHANNELS_MAX];
-#ifndef FIX_867
-    Word64 W_max;
-#endif
+    Word64 W_tmp[CLDFB_NO_CHANNELS_MAX], W_max;
     set64_fx( W_tmp, 0, CLDFB_NO_CHANNELS_MAX );
+#endif
 
     /* segment auxiliary buffer */
     Word32 direct_power[CLDFB_NO_CHANNELS_MAX]; /* size: num_freq_bands. */
 
-#ifdef FIX_867_DBG
-    FOR( i = 0; i < num_freq_bands; i++ )
-    {
-        static FILE *f = 0;
-        if ( f == 0 )
-            f = fopen( "reference_power_smooth_fx", "w" );
-
-        Word32 m = reference_power[i];
-        Word16 e = q_reference_power[i];
-        float f1_m = (float) m;
-        float f1_e = powf( 2, e );
-        float f1 = f1_m / f1_e;
-        fprintf( f, "%d %d %d %f\n", i, m, e, f1 );
-    }
-#endif
-
     /* estimate direct and diffuse power */
+#ifndef FIX_867_CLDFB_NRG_SCALE
     FOR( i = 0; i < num_freq_bands; i++ )
     {
         direct_power[i] = Mpy_32_32( direct_power_factor[i], reference_power[i] );
@@ -4860,23 +4199,15 @@ static void computeTargetPSDs_direct_subframe_fx(
             move32();
         }
     }
+#else
+    v_mult_fixed( direct_power_factor, reference_power, direct_power, num_freq_bands );
+#endif
     /* compute target auto and cross PSDs of current frame (smoothed) */
     FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
     {
         cur_idx = imult1616( ch_idx, num_freq_bands );
-#ifdef FIX_867
-        FOR( i = 0; i < num_freq_bands; i++ )
-        {
-            W_tmp[i] = W_mult_32_32( direct_power[i], direct_responses_square[cur_idx + i] ); // q_reference_power + Q31 + 1
-            q_tmp = W_norm( W_tmp[i] );
-            cy_auto_dir_smooth[cur_idx + i] = W_extract_h( W_shl( W_tmp[i], q_tmp ) );
-            q_cy_auto_dir_smooth[cur_idx + i] = add( q_reference_power[i], q_tmp );
-            move16();
 
-            cy_cross_dir_smooth[cur_idx + i] = Mpy_32_32( direct_power[i], direct_responses[cur_idx + i] );
-            q_cy_cross_dir_smooth[cur_idx + i] = q_reference_power[i];
-        }
-#else
+#ifndef FIX_867_CLDFB_NRG_SCALE
         W_max = 0;
         move64();
         FOR( i = 0; i < num_freq_bands; i++ )
@@ -4889,6 +4220,21 @@ static void computeTargetPSDs_direct_subframe_fx(
             }
         }
         q_tmp = W_norm( W_max );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        FOR( i = 0; i < s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ); i++ )
+        {
+            cy_auto_dir_smooth[cur_idx + i] = W_extract_h( W_shl( W_tmp[i], q_tmp ) ); /*q_reference_power[0]+q_tmp*/
+            move32();
+        }
+        Word16 q_tmp2 = sub( q_tmp, sub( q_reference_power[1], q_reference_power[0] ) );
+        FOR( i = CLDFB_NO_CHANNELS_HALF; i < num_freq_bands; i++ )
+        {
+            cy_auto_dir_smooth[cur_idx + i] = W_extract_h( W_shl( W_tmp[i], q_tmp2 ) ); /*q_reference_power[1]+q_tmp*/
+            move32();
+        }
+        q_cy_auto_dir_smooth[ch_idx] = add( q_reference_power[0], q_tmp );
+        move16();
+#else
         FOR( i = 0; i < num_freq_bands; i++ )
         {
             cy_auto_dir_smooth[cur_idx + i] = W_extract_h( W_shl( W_tmp[i], q_tmp ) ); /*q_reference_power+q_tmp*/
@@ -4896,52 +4242,33 @@ static void computeTargetPSDs_direct_subframe_fx(
         }
         q_cy_auto_dir_smooth[ch_idx] = add( *q_reference_power, q_tmp );
         move16();
-        v_mult_fixed( direct_power, &direct_responses[cur_idx], &cy_cross_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, Q31) -> q_reference_power
 #endif
-    }
+#else
+        q_tmp = L_norm_arr( &direct_responses_square[cur_idx], num_freq_bands );
+        Copy_Scale_sig32( &direct_responses_square[cur_idx], L_tmp, num_freq_bands, q_tmp );
+        v_mult_fixed( direct_power, L_tmp, &cy_auto_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, q_tmp) -> q_reference_power + q_tmp
 
-#ifndef FIX_867
-    *q_cy_cross_dir_smooth = *q_reference_power;
-    move16();
-#endif
+        q_cy_auto_dir_smooth_local[0] = add( add( q_reference_power[0], q_tmp ), L_norm_arr( cy_auto_dir_smooth + cur_idx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        q_cy_auto_dir_smooth_local[1] = add( add( q_reference_power[1], q_tmp ), L_norm_arr( cy_auto_dir_smooth + cur_idx + CLDFB_NO_CHANNELS_HALF, s_max( sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 0 ) ) );
+        q_cy_auto_dir_smooth[ch_idx] = s_min( q_cy_auto_dir_smooth_local[0], q_cy_auto_dir_smooth_local[1] );
+        move16();
 
+        Scale_sig32( cy_auto_dir_smooth + cur_idx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_cy_auto_dir_smooth[ch_idx], add( q_reference_power[0], q_tmp ) ) );
+        Scale_sig32( cy_auto_dir_smooth + cur_idx + CLDFB_NO_CHANNELS_HALF, s_max( sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 0 ), sub( q_cy_auto_dir_smooth[ch_idx], add( q_reference_power[1], q_tmp ) ) );
 
-#ifdef FIX_867_DBG
-    FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
-    {
-        cur_idx = imult1616( ch_idx, num_freq_bands );
-        FOR( i = 0; i < num_freq_bands; i++ )
-        {
-            static FILE *f = 0;
-            if ( f == 0 )
-                f = fopen( "cy_auto_dir_smooth1", "w" );
-
-            Word32 m = cy_auto_dir_smooth[cur_idx + i];
-            Word16 e = q_cy_auto_dir_smooth[cur_idx + i];
-            float f1_m = (float) m;
-            float f1_e = powf( 2, e );
-            float f1 = f1_m / f1_e;
-            fprintf( f, "%d %d %d %d %f\n", ch_idx, i, m, e, f1 );
-        }
+#endif
+        v_mult_fixed( direct_power, &direct_responses[cur_idx], &cy_cross_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, Q31) -> q_reference_power
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        Scale_sig32( &cy_cross_dir_smooth[cur_idx] + CLDFB_NO_CHANNELS_HALF, s_max( sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 0 ), sub( q_reference_power[0], q_reference_power[1] ) );
+#endif
     }
 
-    FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
-    {
-        cur_idx = imult1616( ch_idx, num_freq_bands );
-        FOR( i = 0; i < num_freq_bands; i++ )
-        {
-            static FILE *f = 0;
-            if ( f == 0 )
-                f = fopen( "cy_cross_dir_smooth1", "w" );
-
-            Word32 m = cy_cross_dir_smooth[cur_idx + i];
-            Word16 e = q_cy_cross_dir_smooth[cur_idx + i];
-            float f1_m = (float) m;
-            float f1_e = powf( 2, e );
-            float f1 = f1_m / f1_e;
-            fprintf( f, "%d %d %d %d %f\n", ch_idx, i, m, e, f1 );
-        }
-    }
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    *q_cy_cross_dir_smooth = q_reference_power[0];
+    move16();
+#else
+    *q_cy_cross_dir_smooth = *q_reference_power;
+    move16();
 #endif
 
     return;
@@ -4968,7 +4295,9 @@ static void computeTargetPSDs_diffuse_fx(
     /* estimate direct and diffuse power */
     v_mult_fixed( diffuse_power_factor, reference_power, diffuse_power, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
 
-#ifndef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 common_q = s_min( *q_cy_auto_diff_smooth, s_min( q_reference_power[0], q_reference_power[1] ) );
+#else
     Word16 common_q = s_min( *q_cy_auto_diff_smooth, *q_reference_power );
 #endif
 
@@ -4976,34 +4305,21 @@ static void computeTargetPSDs_diffuse_fx(
     FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
     {
         cur_idx = imult1616( ch_idx, num_freq_bands );
-#ifdef FIX_867
+
         v_multc_fixed( &diffuse_power[start_band], diffuse_responses_square[ch_idx], aux_buffer_res, sub( num_freq_bands, start_band ) ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
-        FOR( Word16 l = 0; l < sub( num_freq_bands, start_band ); ++l )
-        {
-            Word16 common_q = s_min( q_cy_auto_diff_smooth[add( cur_idx, start_band ) + l], q_reference_power[start_band + l] );
-            aux_buffer_res[l] = L_shl( aux_buffer_res[l], sub( common_q, q_reference_power[start_band + l] ) ); /* Q(common_q) */
-            cy_auto_diff_smooth[add( cur_idx, start_band ) + l] = L_shl( cy_auto_diff_smooth[add( cur_idx, start_band ) + l],
-                                                                         sub( common_q, q_cy_auto_diff_smooth[add( cur_idx, start_band ) + l] ) ); /* Q(common_q) */
-            /* Q adjustment */
-            q_cy_auto_diff_smooth[add( cur_idx, start_band ) + l] = sub( common_q, Q1 );
-        }
-        v_add_fixed( &cy_auto_diff_smooth[add( cur_idx, start_band )],
-                     aux_buffer_res,
-                     &cy_auto_diff_smooth[add( cur_idx, start_band )], sub( num_freq_bands, start_band ), Q1 ); /* Q(common_q) - Q1 */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        scale_sig32( aux_buffer_res, s_min( sub( num_freq_bands, start_band ), CLDFB_NO_CHANNELS_HALF ), sub( common_q, q_reference_power[0] ) );                                    /* Q(common_q) */
+        scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( sub( num_freq_bands, start_band ), CLDFB_NO_CHANNELS_HALF ) ), sub( common_q, q_reference_power[1] ) ); /* Q(common_q) */
 #else
-
-        v_multc_fixed( &diffuse_power[start_band], diffuse_responses_square[ch_idx], aux_buffer_res, sub( num_freq_bands, start_band ) );                             /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
-        scale_sig32( aux_buffer_res, sub( num_freq_bands, start_band ), sub( common_q, *q_reference_power ) );                                                        /* Q(common_q) */
+        scale_sig32( aux_buffer_res, sub( num_freq_bands, start_band ), sub( common_q, *q_reference_power ) ); /* Q(common_q) */
+#endif
         scale_sig32( &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ), sub( common_q, *q_cy_auto_diff_smooth ) );                        /* Q(common_q) */
         v_add_fixed( &cy_auto_diff_smooth[cur_idx + start_band], aux_buffer_res, &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ), Q1 ); /* Q(common_q) - Q1 */
-#endif
     }
 
-#ifndef FIX_867
     /* Q adjustment */
     *q_cy_auto_diff_smooth = sub( common_q, Q1 );
     move16();
-#endif
 
     return;
 }
@@ -5022,29 +4338,46 @@ static void computeTargetPSDs_diffuse_subframe_fx(
 {
     Word16 ch_idx, cur_idx;
     Word32 diffuse_power[CLDFB_NO_CHANNELS_MAX]; /* segment auxiliary buffer; size: num_freq_bands. */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 q_cy_auto_diff_smooth_new, q_diffuse_power;
+#endif
 
     /* estimate direct and diffuse power */
     v_mult_fixed( diffuse_power_factor, reference_power, diffuse_power, num_freq_bands ); // (Q31, q_reference_power) -> q_reference_power
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    q_diffuse_power = s_min( q_reference_power[0], q_reference_power[1] );
+    Scale_sig32( diffuse_power, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_diffuse_power, q_reference_power[0] ) );
+    Scale_sig32( diffuse_power + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_diffuse_power, q_reference_power[1] ) );
+    q_cy_auto_diff_smooth_new = q_diffuse_power;
+    IF( LT_16( *q_cy_auto_diff_smooth, q_diffuse_power ) )
+    {
+        Scale_sig32( diffuse_power, num_freq_bands, sub( *q_cy_auto_diff_smooth, q_cy_auto_diff_smooth_new ) );
+        q_cy_auto_diff_smooth_new = *q_cy_auto_diff_smooth;
+        move16();
+    }
+#endif
     /* compute target auto and cross PSDs of current frame (smoothed) */
     FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
     {
         cur_idx = imult1616( ch_idx, num_freq_bands );
 
-        v_multc_fixed( &diffuse_power[start_band], diffuse_responses_square[ch_idx], &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ) ); // (q_reference_power, Q31) -> q_reference_power
-#ifdef FIX_867
-        FOR( Word16 i = 0; i < sub( num_freq_bands, start_band ); i++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        IF( GT_16( *q_cy_auto_diff_smooth, q_diffuse_power ) )
         {
-            q_cy_auto_diff_smooth[cur_idx + start_band + i] = q_reference_power[i];
-            move16();
+            Scale_sig32( &cy_auto_diff_smooth[cur_idx], start_band, sub( q_diffuse_power, *q_cy_auto_diff_smooth ) );
         }
 #endif
+        v_multc_fixed( &diffuse_power[start_band], diffuse_responses_square[ch_idx], &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ) ); // (q_reference_power, Q31) -> q_reference_power
     }
 
-#ifndef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    *q_cy_auto_diff_smooth = q_cy_auto_diff_smooth_new;
+    move16();
+#else
     *q_cy_auto_diff_smooth = *q_reference_power;
-#endif
     move16();
+#endif
 
     return;
 }
@@ -5064,21 +4397,27 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
     Word16 *q_cy_auto_diff_smooth )
 {
     Word16 ch_idx, cur_idx, diff_idx;
-#ifdef FIX_867
-    Word16 l;
-#endif
     Word32 diffuse_response_p4, aux_buffer_res1[CLDFB_NO_CHANNELS_MAX];
     /* segment auxiliary buffer */
     Word32 diffuse_power[CLDFB_NO_CHANNELS_MAX];  /* size: num_freq_bands. */
     Word32 aux_buffer_res[CLDFB_NO_CHANNELS_MAX]; /* size: num_freq_bands. */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 q_common, q_reference_power_min_one[2];
 
+    q_reference_power_min_one[0] = sub( q_reference_power[0], Q1 );
+    q_reference_power_min_one[1] = sub( q_reference_power[1], Q1 );
+#else
     Word16 q_common, q_reference_power_min_one;
 
     q_reference_power_min_one = sub( *q_reference_power, Q1 );
+#endif
 
     /* estimate direct and diffuse power */
     v_mult_fixed( diffuse_power_factor, reference_power, diffuse_power, num_decorr_freq_bands ); // (Q31, q_reference_power) -> q_reference_power
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    q_common = s_min( *q_cy_auto_diff_smooth, s_min( q_reference_power_min_one[0], q_reference_power_min_one[1] ) );
+#else
     IF( GT_16( *q_cy_auto_diff_smooth, q_reference_power_min_one ) )
     {
         q_common = q_reference_power_min_one;
@@ -5089,6 +4428,7 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
         q_common = *q_cy_auto_diff_smooth;
         move16();
     }
+#endif
 
     /* compute target auto and cross PSDs of current frame (smoothed) */
     FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
@@ -5105,54 +4445,21 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
         v_add_fixed( aux_buffer_res1, aux_buffer_res, aux_buffer_res, num_decorr_freq_bands, Q1 );                          // Q30
         v_mult_fixed( aux_buffer_res, diffuse_power, aux_buffer_res, num_decorr_freq_bands );                               // (Q30, q_reference_power) -> q_reference_power - Q1
 
-#ifdef FIX_867
-        FOR( l = 0; l < num_decorr_freq_bands; l++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        IF( NE_16( q_common, q_reference_power_min_one[0] ) )
         {
-            q_reference_power_min_one = sub( q_reference_power[l], Q1 );
-
-            IF( GT_16( q_cy_auto_diff_smooth[cur_idx + l], q_reference_power_min_one ) )
-            {
-                q_common = q_reference_power_min_one;
-                move16();
-            }
-            ELSE
-            {
-                q_common = q_cy_auto_diff_smooth[cur_idx + l];
-                move16();
-            }
-
-            IF( NE_16( q_common, q_reference_power_min_one ) )
-            {
-                scale_sig32( &aux_buffer_res[l], 1, sub( q_common, q_reference_power_min_one ) ); // q_common
-            }
-            IF( NE_16( q_common, q_cy_auto_diff_smooth[cur_idx + l] ) )
-            {
-                scale_sig32( &cy_auto_diff_smooth[cur_idx + l], 1, sub( q_common, q_cy_auto_diff_smooth[cur_idx + l] ) ); // q_common
-            }
-            /* Q adjustment */
-            q_cy_auto_diff_smooth[cur_idx + l] = sub( q_common, Q1 );
+            scale_sig32( aux_buffer_res, s_min( num_decorr_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_common, q_reference_power_min_one[0] ) ); // q_common
         }
-
-        v_add_fixed( &cy_auto_diff_smooth[cur_idx], aux_buffer_res, &cy_auto_diff_smooth[cur_idx], num_decorr_freq_bands, Q1 ); // (q_common - Q1)
-
-        FOR( ; l < num_freq_bands; l++ )
+        IF( NE_16( q_common, q_reference_power_min_one[1] ) )
         {
-            q_reference_power_min_one = sub( q_reference_power[l], Q1 );
-
-            IF( GT_16( q_cy_auto_diff_smooth[cur_idx + l], q_reference_power_min_one ) )
-            {
-                q_common = q_reference_power_min_one;
-                move16();
-            }
-            ELSE
-            {
-                q_common = q_cy_auto_diff_smooth[cur_idx + l];
-                move16();
-            }
-            scale_sig32( &cy_auto_diff_smooth[cur_idx + l], 1, sub( sub( q_common, Q1 ), q_cy_auto_diff_smooth[cur_idx + l] ) ); // (q_common - Q1)
-            q_cy_auto_diff_smooth[cur_idx + l] = sub( q_common, Q1 );
+            scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_decorr_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_common, q_reference_power_min_one[1] ) ); // q_common
         }
-
+        IF( NE_16( q_common, *q_cy_auto_diff_smooth ) )
+        {
+            scale_sig32( &cy_auto_diff_smooth[cur_idx], num_decorr_freq_bands, sub( q_common, *q_cy_auto_diff_smooth ) ); // q_common
+        }
+        v_add_fixed( &cy_auto_diff_smooth[cur_idx], aux_buffer_res, &cy_auto_diff_smooth[cur_idx], num_decorr_freq_bands, Q1 );                                                 // (q_common - Q1)
+        scale_sig32( &cy_auto_diff_smooth[cur_idx + num_decorr_freq_bands], sub( num_freq_bands, num_decorr_freq_bands ), sub( sub( q_common, Q1 ), *q_cy_auto_diff_smooth ) ); // (q_common - Q1)
 #else
         IF( NE_16( q_common, q_reference_power_min_one ) )
         {
@@ -5167,11 +4474,9 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
 #endif
     }
 
-#ifndef FIX_867
     /* Q adjustment */
     *q_cy_auto_diff_smooth = sub( q_common, Q1 );
     move16();
-#endif
 
     return;
 }
diff --git a/lib_rend/ivas_dirac_rend.c b/lib_rend/ivas_dirac_rend_fx.c
similarity index 77%
rename from lib_rend/ivas_dirac_rend.c
rename to lib_rend/ivas_dirac_rend_fx.c
index 62c59ae447618fc0112cc3b11fd7fb422cfeb446..063c70f66a42525b55dc9b44fb319df3d4886d6f 100644
--- a/lib_rend/ivas_dirac_rend.c
+++ b/lib_rend/ivas_dirac_rend_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,13 +35,11 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_rend.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "ivas_rom_binaural_crend_head.h"
 
@@ -734,14 +732,10 @@ ivas_error ivas_dirac_alloc_mem_fx(
 
     /* PSD related buffers */
     hDirAC_mem->cy_auto_dir_smooth_fx = NULL;
-#ifdef FIX_867
-    hDirAC_mem->q_cy_auto_dir_smooth = NULL;
-#endif
     hDirAC_mem->proto_power_smooth_fx = NULL;
     hDirAC_mem->proto_power_diff_smooth_fx = NULL;
     hDirAC_mem->direct_responses_square_fx = NULL;
     hDirAC_mem->frame_dec_f_fx = NULL;
-
     IF( NE_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
         IF( ( hDirAC_mem->cy_auto_dir_smooth_fx = (Word32 *) malloc( sizeof( Word32 ) * size ) ) == NULL )
@@ -749,14 +743,6 @@ ivas_error ivas_dirac_alloc_mem_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
         }
         set_zero_fx( hDirAC_mem->cy_auto_dir_smooth_fx, size );
-#ifdef FIX_867
-        IF( ( hDirAC_mem->q_cy_auto_dir_smooth = (Word16 *) malloc( sizeof( Word16 ) * size ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-        }
-        set16_zero_fx( hDirAC_mem->q_cy_auto_dir_smooth, size );
-#endif
-
         hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_len = size;
         move16();
 
@@ -792,17 +778,26 @@ ivas_error ivas_dirac_alloc_mem_fx(
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
             }
-#ifdef MSAN_FIX
             set_zero_fx( hDirAC_mem->frame_dec_f_fx, 2 * num_outputs_diff * num_freq_bands );
-#endif
             hDirAC_mem->frame_dec_f_len = imult1616( imult1616( 2, num_outputs_diff ), num_freq_bands );
         }
     }
     hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx = hDirAC_mem->proto_power_smooth_fx;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] = Q31;
+    hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] = Q31;
+    move16();
+    move16();
+    hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] = Q31;
+    hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] = Q31;
+    move16();
+    move16();
+#else
     hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q = Q31;
     move16();
     hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q = Q31;
     move16();
+#endif
     hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx = hDirAC_mem->proto_power_diff_smooth_fx;
     hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q = hDirAC_mem->proto_power_diff_smooth_q;
     move16();
@@ -813,15 +808,7 @@ ivas_error ivas_dirac_alloc_mem_fx(
     hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_q = Q31;
     move16();
     hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_fx = hDirAC_mem->cy_auto_dir_smooth_fx;
-#ifdef FIX_867
-    hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth = hDirAC_mem->q_cy_auto_dir_smooth;
-    if ( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth )
-    {
-        set16_zero_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth, hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_len );
-    }
-#else
     hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth = 0;
-#endif
     move16();
     hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx = hDirAC_mem->direct_responses_square_fx;
     hDirACRend->h_output_synthesis_psd_state.direct_responses_square_q = Q31;
@@ -833,20 +820,9 @@ ivas_error ivas_dirac_alloc_mem_fx(
     {
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
     }
-#ifdef FIX_867
-    IF( ( hDirAC_mem->q_cy_cross_dir_smooth = (Word16 *) malloc( sizeof( Word16 ) * size_ho ) ) == NULL )
-    {
-        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-    }
-#endif
     hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len = size_ho;
     move16();
-#ifdef MSAN_FIX
     set_zero_fx( hDirAC_mem->cy_cross_dir_smooth_fx, size_ho );
-#else
-    set_zero_fx( hDirAC_mem->cy_cross_dir_smooth_fx, size );
-    hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len = size_ho;
-#endif
 
     IF( NE_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
     {
@@ -855,12 +831,6 @@ ivas_error ivas_dirac_alloc_mem_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
         }
         set_zero_fx( hDirAC_mem->cy_auto_diff_smooth_fx, size );
-#ifdef FIX_867
-        IF( ( hDirAC_mem->q_cy_auto_diff_smooth = (Word16 *) malloc( sizeof( Word16 ) * size ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-        }
-#endif
         hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len = size;
         move16();
     }
@@ -871,30 +841,14 @@ ivas_error ivas_dirac_alloc_mem_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
         }
         set_zero_fx( hDirAC_mem->cy_auto_diff_smooth_fx, imult1616( num_outputs_diff, num_freq_bands_diff ) );
-#ifdef FIX_867
-        IF( ( hDirAC_mem->q_cy_auto_diff_smooth = (Word16 *) malloc( sizeof( Word16 ) * num_outputs_diff * num_freq_bands_diff ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-        }
-#endif
         hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len = imult1616( num_outputs_diff, num_freq_bands_diff );
     }
-#ifdef FIX_867
-    hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx = hDirAC_mem->cy_cross_dir_smooth_fx;
-    hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth = hDirAC_mem->q_cy_cross_dir_smooth;
-    set16_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth, Q31, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len );
-
-    hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx = hDirAC_mem->cy_auto_diff_smooth_fx;
-    hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth = hDirAC_mem->q_cy_auto_diff_smooth;
-    set16_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth, 0, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len );
-#else
     hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx = hDirAC_mem->cy_cross_dir_smooth_fx;
     hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth = 31;
     move16();
     hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx = hDirAC_mem->cy_auto_diff_smooth_fx;
     hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth = 0;
     move16();
-#endif
 
     /*Responses (gains/factors)*/
     IF( ( hDirAC_mem->direct_responses_fx = (Word32 *) malloc( sizeof( Word32 ) * size_ho ) ) == NULL )
@@ -920,6 +874,9 @@ ivas_error ivas_dirac_alloc_mem_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
         }
         hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len = imult1616( imult1616( 2 * MAX_PARAM_SPATIAL_SUBFRAMES, num_protos_dir ), num_freq_bands );
+        set_zero_fx( hDirAC_mem->proto_direct_buffer_f_fx, hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len );
+        move16();
+        hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q = Q31;
         move16();
 
         IF( hDirACRend->proto_signal_decorr_on )
@@ -941,9 +898,7 @@ ivas_error ivas_dirac_alloc_mem_fx(
                 }
                 hDirAC_mem->proto_diffuse_buffer_f_len = imult1616( imult1616( 2 * MAX_PARAM_SPATIAL_SUBFRAMES, num_outputs_diff ), num_freq_bands );
             }
-#ifdef MSAN_FIX
             set_zero_fx( hDirAC_mem->proto_diffuse_buffer_f_fx, hDirAC_mem->proto_diffuse_buffer_f_len );
-#endif
         }
     }
     hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx = hDirAC_mem->proto_direct_buffer_f_fx;
@@ -996,18 +951,15 @@ ivas_error ivas_dirac_alloc_mem_fx(
 
             hDirAC_mem->reference_power_len = imult1616( 2, num_freq_bands );
             move16();
-#ifdef FIX_867
-            IF( ( hDirAC_mem->reference_power_q = (Word16 *) malloc( sizeof( Word32 ) * 2 * num_freq_bands ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-            }
-
-            IF( ( hDirAC_mem->reference_power_smooth_q = (Word16 *) malloc( sizeof( Word32 ) * 2 * num_freq_bands ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-            }
-            set16_fx( hDirAC_mem->reference_power_q, Q31, hDirAC_mem->reference_power_len );
-            set16_fx( hDirAC_mem->reference_power_smooth_q, Q31, hDirAC_mem->reference_power_len );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            hDirAC_mem->reference_power_q[0] = Q31;
+            hDirAC_mem->reference_power_q[1] = Q31;
+            move16();
+            move16();
+            hDirAC_mem->reference_power_smooth_q[0] = Q31;
+            hDirAC_mem->reference_power_smooth_q[1] = Q31;
+            move16();
+            move16();
 #else
             hDirAC_mem->reference_power_q = Q31;
             move16();
@@ -1020,9 +972,7 @@ ivas_error ivas_dirac_alloc_mem_fx(
                 {
                     return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
                 }
-#ifdef MSAN_FIX
                 set_zero_fx( hDirAC_mem->onset_filter_fx, imult1616( num_outputs_diff, num_freq_bands ) );
-#endif
             }
         }
     }
@@ -1036,13 +986,7 @@ ivas_error ivas_dirac_alloc_mem_fx(
             }
 
             hDirAC_mem->reference_power_len = imult1616( 5, num_freq_bands );
-#ifdef FIX_867
-            IF( ( hDirAC_mem->reference_power_q = (Word16 *) malloc( sizeof( Word16 ) * 5 * num_freq_bands ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
-            }
-            set16_fx( hDirAC_mem->reference_power_q, Q31, hDirAC_mem->reference_power_len );
-#endif
+            set16_fx( hDirAC_mem->reference_power_q, Q31, 2 );
         }
 
         IF( hDirACRend->proto_signal_decorr_on )
@@ -1051,9 +995,7 @@ ivas_error ivas_dirac_alloc_mem_fx(
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
             }
-#ifdef MSAN_FIX
             set_zero_fx( hDirAC_mem->onset_filter_fx, imult1616( 2, num_freq_bands ) );
-#endif
         }
     }
 
@@ -1513,15 +1455,15 @@ void protoSignalComputation_shd_fx(
                 reference_power_fx[l] = L_shr( reference_power_fx[l + num_freq_bands], 1 ); /*2*Q(q_cldfb+min_q_shift)-31-1*/
                 move32();
 
+                re1 = L_shl( RealBuffer_fx[1][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
+                re2 = L_shl( RealBuffer_fx[2][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
+                re3 = L_shl( RealBuffer_fx[3][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
+                im1 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
+                im2 = L_shl( ImagBuffer_fx[2][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
+                im3 = L_shl( ImagBuffer_fx[3][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
+
                 FOR( k = 1; k < 4; k++ )
                 {
-                    re1 = L_shl( RealBuffer_fx[1][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
-                    re2 = L_shl( RealBuffer_fx[2][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
-                    re3 = L_shl( RealBuffer_fx[3][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
-                    im1 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
-                    im2 = L_shl( ImagBuffer_fx[2][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
-                    im3 = L_shl( ImagBuffer_fx[3][0][l], min_q_shift ); /*Q(q_cldfb+min_q_shift)*/
-
                     idx = i_mult( 3, Rmat_k[k] );
                     idx1 = add( l, i_mult( add( k, 1 ), num_freq_bands ) );
 
@@ -1546,18 +1488,22 @@ void protoSignalComputation_shd_fx(
                 }
 
                 *proto_direct_buffer_f_q = add( q_cldfb, min_q_shift );
-#ifdef FIX_867
-                reference_power_q[l] = add( sub( add( *proto_direct_buffer_f_q, *proto_direct_buffer_f_q ), 31 ), norm_l( reference_power_fx[l] ) );
-                reference_power_fx[l] = L_shl( reference_power_fx[l], norm_l( reference_power_fx[l] ) );
+                move16();
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                Word16 qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+                reference_power_q[qidx] = sub( add( *proto_direct_buffer_f_q, *proto_direct_buffer_f_q ), 31 );
+                move16();
 #else
                 *reference_power_q = sub( add( *proto_direct_buffer_f_q, *proto_direct_buffer_f_q ), 31 );
+                move16();
 #endif
 
+                Word16 shift = sub( *proto_direct_buffer_f_q, q_cldfb );
                 FOR( k = 1; k < 4; k++ )
                 {
-                    RealBuffer_fx[k][0][l] = L_shr( p_proto_direct_buffer_fx[2 * ( k * num_freq_bands + l )], sub( *proto_direct_buffer_f_q, q_cldfb ) ); // proto_direct_buffer_f_q -> q_cldfb
+                    RealBuffer_fx[k][0][l] = L_shr( p_proto_direct_buffer_fx[2 * ( k * num_freq_bands + l )], shift ); // proto_direct_buffer_f_q -> q_cldfb
                     move32();
-                    ImagBuffer_fx[k][0][l] = L_shr( p_proto_direct_buffer_fx[2 * ( k * num_freq_bands + l ) + 1], sub( *proto_direct_buffer_f_q, q_cldfb ) ); // proto_direct_buffer_f_q -> q_cldfb
+                    ImagBuffer_fx[k][0][l] = L_shr( p_proto_direct_buffer_fx[2 * ( k * num_freq_bands + l ) + 1], shift ); // proto_direct_buffer_f_q -> q_cldfb
                     move32();
                 }
             }
@@ -1585,12 +1531,11 @@ void protoSignalComputation_shd_fx(
             }
             *proto_direct_buffer_f_q = q_cldfb;
             move16();
-#ifdef FIX_867
-            FOR( l = 0; l < num_freq_bands; l++ )
-            {
-                reference_power_q[l] = add( sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 ), norm_l( reference_power_fx[l] ) );
-                reference_power_fx[l] = L_shl( reference_power_fx[l], norm_l( reference_power_fx[l] ) );
-            }
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            reference_power_q[0] = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
+            reference_power_q[1] = reference_power_q[0];
+            move16();
+            move16();
 #else
             *reference_power_q = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
             move16();
@@ -1628,22 +1573,6 @@ void protoSignalComputation_shd_fx(
         }
     }
 
-#ifdef FIX_867_DBG
-    FOR( l = 0; l < num_freq_bands; l++ )
-    {
-        static FILE *f = 0;
-        if ( f == 0 )
-            f = fopen( "reference_power_fx", "w" );
-
-        Word32 m = reference_power_fx[l];
-        Word16 e = reference_power_q[l];
-        float f1_m = (float) m;
-        float f1_e = powf( 2, e );
-        float f1 = f1_m / f1_e;
-        fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
-    }
-#endif
-
     return;
 }
 
@@ -1672,7 +1601,11 @@ void protoSignalComputation1_fx(
 {
     Word16 l, k, idx;
     Word32 *p_proto_buffer_fx;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 proto_power_smooth_fx_q[2], min_q_shift, q_shift;
+#else
     Word16 proto_power_smooth_fx_q, min_q_shift, q_shift;
+#endif
     Word32 re, im;
 
     min_q_shift = Q31;
@@ -1695,22 +1628,49 @@ void protoSignalComputation1_fx(
     q_shift = sub( q_shift, find_guarded_bits_fx( 2 ) );
 
     Scale_sig32( proto_power_smooth_fx, num_freq_bands, q_shift ); /*proto_power_smooth_q+q_shift*/
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    proto_power_smooth_q[0] = add( proto_power_smooth_q[0], q_shift );
+    proto_power_smooth_q[1] = add( proto_power_smooth_q[1], q_shift );
+    proto_power_smooth_fx_q[0] = proto_power_smooth_q[0];
+    proto_power_smooth_fx_q[1] = proto_power_smooth_q[1];
+    move16();
+    move16();
+#else
     *proto_power_smooth_q = add( *proto_power_smooth_q, q_shift );
     proto_power_smooth_fx_q = *proto_power_smooth_q;
     move16();
+#endif
 
     FOR( l = 0; l < num_freq_bands; l++ )
     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        Word16 qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+#endif
         re = L_shl( RealBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+min_q_shift
         im = L_shl( ImagBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+min_q_shift
 
         reference_power_fx[l] = Madd_32_32( Mpy_32_32( re, re ), im, im ); // 2*(q_cldfb+min_q_shift)-31
         move32();
-#ifdef FIX_867
-        reference_power_q[l] = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        reference_power_q[qidx] = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
+        move16();
+
+        IF( LT_16( reference_power_q[qidx], proto_power_smooth_q[qidx] ) )
+        {
+            proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( proto_power_smooth_q[qidx], reference_power_q[qidx] ) ), reference_power_fx[l] ); // reference_power_q
+            move32();
+            proto_power_smooth_fx_q[qidx] = reference_power_q[qidx];
+            move16();
+        }
+        ELSE
+        {
+            proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( reference_power_fx[l], sub( reference_power_q[qidx], proto_power_smooth_q[qidx] ) ) ); // proto_power_smooth_q
+            move32();
+            proto_power_smooth_fx_q[qidx] = proto_power_smooth_q[qidx];
+            move16();
+        }
 #else
         *reference_power_q = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
-#endif
         move16();
 
         IF( LT_16( *reference_power_q, *proto_power_smooth_q ) )
@@ -1727,6 +1687,7 @@ void protoSignalComputation1_fx(
             proto_power_smooth_fx_q = *proto_power_smooth_q;
             move16();
         }
+#endif
 
         idx = 2 * l;
         p_proto_buffer_fx[idx] = RealBuffer_fx[0][0][l]; // q_cldfb
@@ -1748,8 +1709,15 @@ void protoSignalComputation1_fx(
     move16();
     *proto_direct_buffer_f_q = q_cldfb;
     move16();
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    proto_power_smooth_q[0] = proto_power_smooth_fx_q[0];
+    proto_power_smooth_q[1] = proto_power_smooth_fx_q[1];
+    move16();
+    move16();
+#else
     *proto_power_smooth_q = proto_power_smooth_fx_q;
     move16();
+#endif
 
     return;
 }
@@ -1786,23 +1754,38 @@ void protoSignalComputation2_fx(
     Word32 RealSubtract_fx, ImagSubtract_fx;
     Word32 left_bb_power_fx, right_bb_power_fx, total_bb_power_fx, lr_bb_power_fx;
     Word32 left_hi_power_fx, right_hi_power_fx, total_hi_power_fx, lr_hi_power_fx;
-    Word32 sum_power_fx, Left_power_fx, Right_power_fx;
+    Word32 sum_power_fx, Left_power_fx, Right_power_fx, Total_power_fx;
     Word16 q_lr_bb_power, q_lr_hi_power;
     Word32 lr_total_bb_ratio_fx, lr_total_hi_ratio_fx;
     Word32 min_sum_total_ratio_fx, min_sum_total_ratio_db_fx;
     Word32 sum_total_ratio_fx[MASA_SUM_FREQ_RANGE_BINS];
     Word16 q_sum_total_ratio;
-    Word32 a_fx, b_fx;
+    Word32 a_fx, b_fx, a2_fx, b2_fx;
     Word16 interpolatorSpaced_fx, interpolatorDmx_fx;
     Word32 tempSpaced_fx, tempDmx_fx;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 q_shift, min_q_shift[2], exp, q_temp[2], temp_q_shift, q_temp2;
+#else
     Word16 q_shift, min_q_shift, exp, q_temp, temp_q_shift, q_temp2;
+#endif
     Word32 temp;
     Word64 W_tmp1, W_tmp2;
     Word64 reference_power_64fx[CLDFB_NO_CHANNELS_MAX];
     Word16 q_reference_power_64fx;
+    Word16 head_room, q_Left_Right_power;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 num_proto = 3;
+#endif
     /* Calculate maximum possible shift for the buffers RealBuffer_fx and ImagBuffer_fx */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    min_q_shift[0] = Q31;
+    min_q_shift[1] = Q31;
+    move16();
+    move16();
+#else
     min_q_shift = Q31;
     move16();
+#endif
     temp_q_shift = Q31;
     move16();
     q_sum_total_ratio = Q31;
@@ -1817,21 +1800,71 @@ void protoSignalComputation2_fx(
     /* Calculate the max shift possible for the buffers RealBuffer_fx and ImagBuffer_fx */
     FOR( l = 0; l < 2; l++ )
     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        q_shift = s_min( L_norm_arr( RealBuffer_fx[l][0], s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ) ), L_norm_arr( ImagBuffer_fx[l][0], s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ) ) );
+        min_q_shift[0] = s_min( min_q_shift[0], q_shift );
+        q_shift = s_min( L_norm_arr( RealBuffer_fx[l][0] + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ), L_norm_arr( ImagBuffer_fx[l][0] + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+        min_q_shift[1] = s_min( min_q_shift[1], q_shift );
+#if ( MASA_SUM_FREQ_RANGE_BINS > CLDFB_NO_CHANNELS_HALF )
+#error MASA_SUM_FREQ_RANGE_BINS if greater than CLDFB_NO_CHANNELS_HALF, this does not work
+#endif
+#else
         q_shift = s_min( L_norm_arr( RealBuffer_fx[l][0], num_freq_bands ), L_norm_arr( ImagBuffer_fx[l][0], num_freq_bands ) );
         min_q_shift = s_min( min_q_shift, q_shift );
-
-#ifdef MSAN_FIX
+#endif
         q_shift = s_min( L_norm_arr( RealBuffer_fx[l][0], s_min( num_freq_bands, MASA_SUM_FREQ_RANGE_BINS ) ), L_norm_arr( ImagBuffer_fx[l][0], s_min( num_freq_bands, MASA_SUM_FREQ_RANGE_BINS ) ) );
-#else
-        q_shift = s_min( L_norm_arr( RealBuffer_fx[l][0], MASA_SUM_FREQ_RANGE_BINS ), L_norm_arr( ImagBuffer_fx[l][0], MASA_SUM_FREQ_RANGE_BINS ) );
-#endif // MSAN_FIX
         temp_q_shift = s_min( temp_q_shift, q_shift );
     }
 
-    min_q_shift = sub( min_q_shift, 2 );   // guard bits
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    min_q_shift[0] = sub( min_q_shift[0], 2 ); // guard bits
+    min_q_shift[1] = sub( min_q_shift[1], 2 ); // guard bits
+#else
+    min_q_shift = sub( min_q_shift, 2 ); // guard bits
+#endif
     temp_q_shift = sub( temp_q_shift, 2 ); // guard bits
 
     /* Upscaling of the buffer proto_power_smooth_fx */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    IF( isloudspeaker )
+    {
+        num_proto = 3;
+        q_shift = L_norm_arr( proto_power_smooth_fx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) );
+        q_shift = s_min( q_shift, L_norm_arr( proto_power_smooth_fx + num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        q_shift = s_min( q_shift, L_norm_arr( proto_power_smooth_fx + num_freq_bands + num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        scale_sig32( proto_power_smooth_fx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_shift, 1 ) );                                   // q_proto_power_smooth+q_shift-1
+        scale_sig32( proto_power_smooth_fx + num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_shift, 1 ) );                  // q_proto_power_smooth+q_shift-1
+        scale_sig32( proto_power_smooth_fx + num_freq_bands + num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_shift, 1 ) ); // q_proto_power_smooth+q_shift-1
+    }
+    ELSE
+    {
+        num_proto = 2;
+        q_shift = L_norm_arr( proto_power_smooth_fx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) );
+        q_shift = s_min( q_shift, L_norm_arr( proto_power_smooth_fx + num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        scale_sig32( proto_power_smooth_fx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_shift, 1 ) );                  // q_proto_power_smooth+q_shift-1
+        scale_sig32( proto_power_smooth_fx + num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_shift, 1 ) ); // q_proto_power_smooth+q_shift-1
+    }
+    q_proto_power_smooth[0] = add( q_proto_power_smooth[0], sub( q_shift, 1 ) );
+    move16();
+    IF( isloudspeaker )
+    {
+        q_shift = L_norm_arr( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        q_shift = s_min( q_shift, L_norm_arr( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + num_freq_bands, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+        q_shift = s_min( q_shift, L_norm_arr( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + num_freq_bands + num_freq_bands, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+        scale_sig32( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_shift, 1 ) );                                   // q_proto_power_smooth+q_shift-1
+        scale_sig32( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + num_freq_bands, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_shift, 1 ) );                  // q_proto_power_smooth+q_shift-1
+        scale_sig32( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + num_freq_bands + num_freq_bands, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_shift, 1 ) ); // q_proto_power_smooth+q_shift-1
+    }
+    ELSE
+    {
+        q_shift = L_norm_arr( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        q_shift = s_min( q_shift, L_norm_arr( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + num_freq_bands, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+        scale_sig32( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_shift, 1 ) );                  // q_proto_power_smooth+q_shift-1
+        scale_sig32( proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + num_freq_bands, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_shift, 1 ) ); // q_proto_power_smooth+q_shift-1
+    }
+    q_proto_power_smooth[1] = add( q_proto_power_smooth[1], sub( q_shift, 1 ) );
+    move16();
+#else
     IF( isloudspeaker )
     {
         q_shift = getScaleFactor32( proto_power_smooth_fx, i_mult( 3, num_freq_bands ) );
@@ -1844,20 +1877,35 @@ void protoSignalComputation2_fx(
     }
     *q_proto_power_smooth = add( *q_proto_power_smooth, sub( q_shift, 1 ) );
     move16();
+#endif
 
     IF( isloudspeaker )
     {
         p_proto_buffer_fx = proto_direct_buffer_f_fx + i_mult( i_mult( i_mult( slot_index, 2 ), num_freq_bands ), 3 ); // q_proto_direct_buffer_f
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        q_temp[0] = sub( add( add( q_cldfb, min_q_shift[0] ), add( q_cldfb, min_q_shift[0] ) ), 31 );
+        q_temp[1] = sub( add( add( q_cldfb, min_q_shift[1] ), add( q_cldfb, min_q_shift[1] ) ), 31 );
+#else
         q_temp = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
         move16();
+#endif
 
         FOR( l = 0; l < num_freq_bands; l++ )
         {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            Word16 qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+
+            re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+#else
             re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+min_q_shift
             im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+min_q_shift
             re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift ); // q_cldfb+min_q_shift
             im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift ); // q_cldfb+min_q_shift
+#endif
 
             Real_aux_fx = L_add( re1, re2 ); // q_cldfb+min_q_shift
             Imag_aux_fx = L_add( im1, im2 ); // q_cldfb+min_q_shift
@@ -1874,14 +1922,26 @@ void protoSignalComputation2_fx(
 
             temp = Madd_32_32( Mpy_32_32( Real_aux_fx, Real_aux_fx ), Imag_aux_fx, Imag_aux_fx ); // 2*(q_cldfb+min_q_shift)-31
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
             IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                 proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                 move32();
             }
             ELSE
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                 proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                 move32();
             }
 
@@ -1892,14 +1952,26 @@ void protoSignalComputation2_fx(
 
             temp = Madd_32_32( Mpy_32_32( re1, re1 ), im1, im1 ); // 2*(q_cldfb+min_q_shift)-31
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
             IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                 proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                 move32();
             }
             ELSE
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                 proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                 move32();
             }
 
@@ -1909,14 +1981,26 @@ void protoSignalComputation2_fx(
             move32();
 
             temp = Madd_32_32( Mpy_32_32( re2, re2 ), im2, im2 ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
             IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l + ( 2 * num_freq_bands )] = L_add( L_shr( proto_power_smooth_fx[l + ( 2 * num_freq_bands )], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                 proto_power_smooth_fx[l + ( 2 * num_freq_bands )] = L_add( L_shr( proto_power_smooth_fx[l + ( 2 * num_freq_bands )], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                 move32();
             }
             ELSE
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l + ( 2 * num_freq_bands )] = L_add( proto_power_smooth_fx[l + ( 2 * num_freq_bands )], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                 proto_power_smooth_fx[l + ( 2 * num_freq_bands )] = L_add( proto_power_smooth_fx[l + ( 2 * num_freq_bands )], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                 move32();
             }
 
@@ -1966,8 +2050,10 @@ void protoSignalComputation2_fx(
         a_fx = 21474836; /*0.01 in Q31*/ /* Temporal smoothing coefficient */
         move32();
         b_fx = L_sub( ONE_IN_Q31, a_fx ); /* Temporal smoothing coefficient q31*/
-        // a2_fx = 214748365; /*0.1 in Q31*/ /* Temporal smoothing coefficient */
-        // b2_fx = L_sub( ONE_IN_Q31, a2_fx ); /* Temporal smoothing coefficient */
+        move32();
+        a2_fx = 214748365; /*0.1 in Q31*/ /* Temporal smoothing coefficient */
+        move32();
+        b2_fx = L_sub( ONE_IN_Q31, a2_fx ); /* Temporal smoothing coefficient */
 
         IF( stereo_type_detect->interpolator > 0 )
         {
@@ -1985,17 +2071,73 @@ void protoSignalComputation2_fx(
             }
         }
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        Word16 total_shift[2], q_temp_total;
+        /* total_shift shift required to get common Q of sum power values */
+        total_shift[0] = shl( s_max( 0, sub( min_q_shift[0], min_q_shift[1] ) ), 1 );
+        total_shift[1] = shl( s_max( 0, sub( min_q_shift[1], min_q_shift[0] ) ), 1 );
+        min_q_shift[0] = sub( min_q_shift[0], idiv1616( find_guarded_bits_fx( num_freq_bands ), 2 ) );
+        min_q_shift[1] = sub( min_q_shift[1], idiv1616( find_guarded_bits_fx( num_freq_bands ), 2 ) );
+        q_temp[0] = sub( add( add( q_cldfb, min_q_shift[0] ), add( q_cldfb, min_q_shift[0] ) ), 31 );
+        q_temp[1] = sub( add( add( q_cldfb, min_q_shift[1] ), add( q_cldfb, min_q_shift[1] ) ), 31 );
+        q_temp_total = s_min( q_temp[0], q_temp[1] );
+#else
         min_q_shift = sub( min_q_shift, idiv1616( find_guarded_bits_fx( num_freq_bands ), 2 ) );
 
         q_temp = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
+#endif
         q_temp2 = sub( add( add( q_cldfb, temp_q_shift ), add( q_cldfb, temp_q_shift ) ), 31 );
 
+        head_room = 63;
+        move16();
         FOR( l = 0; l < num_freq_bands; l++ )
         {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            Word16 qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+            re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+#else
             re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+min_q_shift
             im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+min_q_shift
             re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift ); // q_cldfb+min_q_shift
             im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift ); // q_cldfb+min_q_shift
+#endif
+
+            W_tmp1 = W_add( W_mult0_32_32( re1, re1 ), W_mult0_32_32( im1, im1 ) );
+            W_tmp2 = W_add( W_mult0_32_32( re2, re2 ), W_mult0_32_32( im2, im2 ) );
+
+            head_room = s_min( head_room, W_norm( W_add( W_tmp1, W_tmp2 ) ) );
+        }
+        head_room = sub( head_room, find_guarded_bits_fx( num_freq_bands ) );
+
+#ifdef FIX_867_CLDFB_NRG_SCALE
+#if ( MASA_SUM_FREQ_RANGE_BINS > CLDFB_NO_CHANNELS_HALF )
+#error MASA_SUM_FREQ_RANGE_BINS must be less than CLDFB_NO_CHANNELS_HALF
+#endif
+        q_Left_Right_power = add( shl( add( q_cldfb, min_q_shift[0] ), 1 ), sub( head_room, 32 ) );
+#else
+        q_Left_Right_power = add( shl( add( q_cldfb, min_q_shift ), 1 ), sub( head_room, 32 ) );
+#endif
+        Word16 exp_left_hi_power = 0, exp_right_hi_power = 0, exp_total_hi_power = 0, exp_temppp;
+        move16();
+        move16();
+        move16();
+        FOR( l = 0; l < num_freq_bands; l++ )
+        {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            Word16 qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+            re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+            im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+min_q_shift
+#else
+            re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift );             // q_cldfb+min_q_shift
+            im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift );             // q_cldfb+min_q_shift
+            re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift );             // q_cldfb+min_q_shift
+            im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift );             // q_cldfb+min_q_shift
+#endif
 
             /* Compute sum signal */
             Real_aux_fx = L_add( re1, re2 ); // q_cldfb+min_q_shift
@@ -2004,32 +2146,62 @@ void protoSignalComputation2_fx(
             /* Compute reference power */
             // Left_power_fx = Madd_32_32( Mpy_32_32( re1, re1 ), im1, im1 );
             W_tmp1 = W_add( W_mult0_32_32( re1, re1 ), W_mult0_32_32( im1, im1 ) ); // 2*(q_cldfb+min_q_shift)
-            Left_power_fx = W_extract_l( W_shr( W_tmp1, 31 ) );
+            Left_power_fx = W_extract_h( W_shl( W_tmp1, head_room ) );              // q_Left_Right_power
+
             // Right_power_fx = Madd_32_32( Mpy_32_32( re2, re2 ), im2, im2 );
             W_tmp2 = W_add( W_mult0_32_32( re2, re2 ), W_mult0_32_32( im2, im2 ) ); // 2*(q_cldfb+min_q_shift)
-            Right_power_fx = W_extract_l( W_shr( W_tmp2, 31 ) );
+            Right_power_fx = W_extract_h( W_shl( W_tmp2, head_room ) );             // q_Left_Right_power
 
             // reference_power_fx[l] = L_add( Left_power_fx, Right_power_fx );
             reference_power_64fx[l] = W_add( W_tmp1, W_tmp2 ); // 2*(q_cldfb+min_q_shift)
             move64();
 
-            left_bb_power_fx = L_add( left_bb_power_fx, Left_power_fx );    // 2*(q_cldfb+min_q_shift) -31
-            right_bb_power_fx = L_add( right_bb_power_fx, Right_power_fx ); // 2*(q_cldfb+min_q_shift) -31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            Left_power_fx = L_shr( Left_power_fx, total_shift[qidx] );
+            Right_power_fx = L_shr( Right_power_fx, total_shift[qidx] );
+            left_bb_power_fx = L_add( left_bb_power_fx, Left_power_fx );    // q_Left_Right_power
+            right_bb_power_fx = L_add( right_bb_power_fx, Right_power_fx ); // q_Left_Right_power
             // total_bb_power_fx = L_add( total_bb_power_fx, reference_power_fx[l] );
-            total_bb_power_fx = L_add( total_bb_power_fx, W_extract_l( W_shr( reference_power_64fx[l], 31 ) ) ); // 2*(q_cldfb+min_q_shift) -31
-
+            total_bb_power_fx = L_add( total_bb_power_fx, W_extract_h( W_shl( reference_power_64fx[l], sub( head_room, total_shift[qidx] ) ) ) ); // q_Left_Right_power
+#else
+            left_bb_power_fx = L_add( left_bb_power_fx, Left_power_fx );    // q_Left_Right_power
+            right_bb_power_fx = L_add( right_bb_power_fx, Right_power_fx ); // q_Left_Right_power
+            // total_bb_power_fx = L_add( total_bb_power_fx, reference_power_fx[l] );
+            total_bb_power_fx = L_add( total_bb_power_fx, W_extract_h( W_shl( reference_power_64fx[l], head_room ) ) ); // q_Left_Right_power
+#endif
             IF( GT_16( l, MASA_HI_FREQ_START_BIN ) )
             {
-                left_hi_power_fx = L_add( left_hi_power_fx, Left_power_fx );    // 2*(q_cldfb+min_q_shift) -31
-                right_hi_power_fx = L_add( right_hi_power_fx, Right_power_fx ); // 2*(q_cldfb+min_q_shift) -31
-                // total_hi_power_fx = L_add( total_hi_power_fx, reference_power_fx[l] );
-                total_hi_power_fx = L_add( total_hi_power_fx, W_extract_l( W_shr( reference_power_64fx[l], 31 ) ) ); // 2*(q_cldfb+min_q_shift) -31
+                W_tmp1 = W_add( W_mult0_32_32( RealBuffer_fx[0][0][l], RealBuffer_fx[0][0][l] ), W_mult0_32_32( ImagBuffer_fx[0][0][l], ImagBuffer_fx[0][0][l] ) );
+                q_shift = W_norm( W_tmp1 );
+                Left_power_fx = W_extract_h( W_shl( W_tmp1, q_shift ) );
+                exp_temppp = sub( 31, sub( add( shl( q_cldfb, 1 ), q_shift ), 32 ) );
+
+                left_hi_power_fx = BASOP_Util_Add_Mant32Exp( left_hi_power_fx, exp_left_hi_power, Left_power_fx, exp_temppp, &exp_left_hi_power ); // exp:exp_left_hi_power
+
+                W_tmp2 = W_add( W_mult0_32_32( RealBuffer_fx[1][0][l], RealBuffer_fx[1][0][l] ), W_mult0_32_32( ImagBuffer_fx[1][0][l], ImagBuffer_fx[1][0][l] ) );
+                q_shift = W_norm( W_tmp2 );
+                Right_power_fx = W_extract_h( W_shl( W_tmp2, q_shift ) );
+                exp_temppp = sub( 31, sub( add( shl( q_cldfb, 1 ), q_shift ), 32 ) );
+
+                right_hi_power_fx = BASOP_Util_Add_Mant32Exp( right_hi_power_fx, exp_right_hi_power, Right_power_fx, exp_temppp, &exp_right_hi_power ); // exp:exp_right_hi_power
+
+                W_tmp2 = W_add( W_tmp1, W_tmp2 );
+                q_shift = W_norm( W_tmp2 );
+                Total_power_fx = W_extract_h( W_shl( W_tmp2, q_shift ) );
+                exp_temppp = sub( 31, sub( add( shl( q_cldfb, 1 ), q_shift ), 32 ) );
+
+                total_hi_power_fx = BASOP_Util_Add_Mant32Exp( total_hi_power_fx, exp_total_hi_power, Total_power_fx, exp_temppp, &exp_total_hi_power ); // exp:exp_total_hi_power
             }
 
             IF( LT_16( l, s_min( num_freq_bands, MASA_SUM_FREQ_RANGE_BINS ) ) )
             {
-                re_aux = L_shl( Real_aux_fx, sub( temp_q_shift, min_q_shift ) ); // q_cldfb+temp_q_shift
-                im_aux = L_shl( Imag_aux_fx, sub( temp_q_shift, min_q_shift ) ); // q_cldfb+temp_q_shift
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                re_aux = L_shl( Real_aux_fx, sub( temp_q_shift, min_q_shift[0] ) ); // q_cldfb+temp_q_shift
+                im_aux = L_shl( Imag_aux_fx, sub( temp_q_shift, min_q_shift[0] ) ); // q_cldfb+temp_q_shift
+#else
+                re_aux = L_shl( Real_aux_fx, sub( temp_q_shift, min_q_shift ) );                                        // q_cldfb+temp_q_shift
+                im_aux = L_shl( Imag_aux_fx, sub( temp_q_shift, min_q_shift ) );                                        // q_cldfb+temp_q_shift
+#endif
 
                 sum_power_fx = Madd_32_32( Mpy_32_32( re_aux, re_aux ), im_aux, im_aux ); // 2*(q_cldfb+temp_q_shift)-31
                 temp = Mpy_32_32( a_fx, sum_power_fx );                                   // 2*(q_cldfb+temp_q_shift)-31
@@ -2045,7 +2217,20 @@ void protoSignalComputation2_fx(
                     move32();
                 }
 
-                temp = Mpy_32_32( a_fx, W_extract_l( W_shr( reference_power_64fx[l], 31 ) ) ); // 2*(q_cldfb+min_q_shift) -31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                temp = Mpy_32_32( a_fx, W_extract_l( W_shr( reference_power_64fx[l], add( 31, total_shift[qidx] ) ) ) ); // 2*(q_cldfb+min_q_shift) -31
+                IF( LT_16( q_temp_total, stereo_type_detect->q_total_power ) )
+                {
+                    stereo_type_detect->total_power_fx[l] = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->total_power_fx[l] ), sub( stereo_type_detect->q_total_power, q_temp_total ) ) ); // q_temp
+                    move32();
+                }
+                ELSE
+                {
+                    stereo_type_detect->total_power_fx[l] = L_add( L_shr( temp, sub( q_temp_total, stereo_type_detect->q_total_power ) ), Mpy_32_32( b_fx, stereo_type_detect->total_power_fx[l] ) ); // stereo_type_detect->q_total_power
+                    move32();
+                }
+#else
+                temp = Mpy_32_32( a_fx, W_extract_l( W_shr( reference_power_64fx[l], 31 ) ) );                          // 2*(q_cldfb+min_q_shift) -31
                 IF( LT_16( q_temp, stereo_type_detect->q_total_power ) )
                 {
                     stereo_type_detect->total_power_fx[l] = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->total_power_fx[l] ), sub( stereo_type_detect->q_total_power, q_temp ) ) ); // q_temp
@@ -2056,18 +2241,28 @@ void protoSignalComputation2_fx(
                     stereo_type_detect->total_power_fx[l] = L_add( L_shr( temp, sub( q_temp, stereo_type_detect->q_total_power ) ), Mpy_32_32( b_fx, stereo_type_detect->total_power_fx[l] ) ); // stereo_type_detect->q_total_power
                     move32();
                 }
+#endif
 
                 test();
                 IF( ( stereo_type_detect->sum_power_fx[l] == 0 ) && ( stereo_type_detect->total_power_fx[l] == 0 ) )
                 {
-                    sum_total_ratio_fx[l] = MAX_16; // q15
+                    sum_total_ratio_fx[l] = MAX_32; // q15
+                    move32();
+                }
+                ELSE IF( stereo_type_detect->total_power_fx[l] == 0 )
+                {
+                    sum_total_ratio_fx[l] = MAX_32; // q15
                     move32();
                 }
                 ELSE
                 {
-                    sum_total_ratio_fx[l] = BASOP_Util_Divide3232_Scale( stereo_type_detect->sum_power_fx[l], L_add( stereo_type_detect->total_power_fx[l], EPSILON_FX ), &exp ); // 15-(exp+s_min( stereo_type_detect->q_total_power, q_temp )-s_min( stereo_type_detect->q_sum_power, q_temp2 ))
+                    sum_total_ratio_fx[l] = BASOP_Util_Divide3232_Scale( stereo_type_detect->sum_power_fx[l], stereo_type_detect->total_power_fx[l], &exp ); // 15-(exp+s_min( stereo_type_detect->q_total_power, q_temp )-s_min( stereo_type_detect->q_sum_power, q_temp2 ))
                     move32();
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    q_sum_total_ratio = add( sub( 15, exp ), sub( s_min( stereo_type_detect->q_sum_power, q_temp2 ), s_min( stereo_type_detect->q_total_power, q_temp_total ) ) );
+#else
                     q_sum_total_ratio = add( sub( 15, exp ), sub( s_min( stereo_type_detect->q_sum_power, q_temp2 ), s_min( stereo_type_detect->q_total_power, q_temp ) ) );
+#endif
                     sum_total_ratio_fx[l] = L_shl( sum_total_ratio_fx[l], sub( Q15, q_sum_total_ratio ) ); // q15
                     move32();
                 }
@@ -2079,6 +2274,22 @@ void protoSignalComputation2_fx(
                 ImagSubtract_fx = L_sub( im1, im2 ); // q_cldfb+min_q_shift
 
                 temp = Madd_32_32( Mpy_32_32( RealSubtract_fx, RealSubtract_fx ), ImagSubtract_fx, ImagSubtract_fx ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                assert( qidx == 0 );
+                IF( LT_16( q_temp[qidx], stereo_type_detect->q_subtract_power_y ) )
+                {
+                    stereo_type_detect->subtract_power_y_fx = L_add( L_shr( stereo_type_detect->subtract_power_y_fx, sub( stereo_type_detect->q_subtract_power_y, q_temp[qidx] ) ), temp ); // q_temp
+                    move32();
+                    stereo_type_detect->q_subtract_power_y = q_temp[qidx];
+                    move16();
+                }
+                ELSE
+                {
+                    stereo_type_detect->subtract_power_y_fx = L_add( stereo_type_detect->subtract_power_y_fx, L_shr( temp, sub( q_temp[qidx], stereo_type_detect->q_subtract_power_y ) ) ); // stereo_type_detect->q_subtract_power_y
+                    move32();
+                }
+
+#else
                 IF( LT_16( q_temp, stereo_type_detect->q_subtract_power_y ) )
                 {
                     stereo_type_detect->subtract_power_y_fx = L_add( L_shr( stereo_type_detect->subtract_power_y_fx, sub( stereo_type_detect->q_subtract_power_y, q_temp ) ), temp ); // q_temp
@@ -2091,6 +2302,7 @@ void protoSignalComputation2_fx(
                     stereo_type_detect->subtract_power_y_fx = L_add( stereo_type_detect->subtract_power_y_fx, L_shr( temp, sub( q_temp, stereo_type_detect->q_subtract_power_y ) ) ); // stereo_type_detect->q_subtract_power_y
                     move32();
                 }
+#endif
             }
 
             /* Compute protos (and their power) for direct sound rendering */
@@ -2104,14 +2316,26 @@ void protoSignalComputation2_fx(
                     Imag_aux_fx = Madd_32_16( Mpy_32_16_1( Imag_aux_fx, shr( interpolatorSpaced_fx, 1 ) ), Imag_aux_fx, interpolatorDmx_fx ); // q_cldfb+min_q_shift
 
                     temp = Madd_32_32( Mpy_32_32( Real_aux_fx, Real_aux_fx ), Imag_aux_fx, Imag_aux_fx ); // 2*(q_cldfb+min_q_shift) -31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                     IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                         proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                         move32();
                     }
                     ELSE
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                         proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                         move32();
                     }
 
@@ -2126,14 +2350,26 @@ void protoSignalComputation2_fx(
                     tempDmx_fx = Madd_32_32( Mpy_32_32( Real_aux_fx, Real_aux_fx ), Imag_aux_fx, Imag_aux_fx ); // 2*(q_cldfb+min_q_shift)-31
 
                     temp = Madd_32_16( Mpy_32_16_1( tempSpaced_fx, interpolatorSpaced_fx ), tempDmx_fx, interpolatorDmx_fx ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                     IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                         proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                         move32();
                     }
                     ELSE
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                         proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                         move32();
                     }
 
@@ -2150,14 +2386,26 @@ void protoSignalComputation2_fx(
                     Real_aux_fx = L_shr( Real_aux_fx, 1 );                                                // q_cldfb+min_q_shift
                     Imag_aux_fx = L_shr( Imag_aux_fx, 1 );                                                // q_cldfb+min_q_shift
                     temp = Madd_32_32( Mpy_32_32( Real_aux_fx, Real_aux_fx ), Imag_aux_fx, Imag_aux_fx ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                     IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                         proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                         move32();
                     }
                     ELSE
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                         proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                         move32();
                     }
 
@@ -2169,14 +2417,26 @@ void protoSignalComputation2_fx(
                 ELSE
                 {
                     temp = Madd_32_32( Mpy_32_32( re1, re1 ), im1, im1 ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                     IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                         proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                         move32();
                     }
                     ELSE
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                         proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                         move32();
                     }
 
@@ -2189,14 +2449,26 @@ void protoSignalComputation2_fx(
             ELSE
             {
                 temp = Madd_32_32( Mpy_32_32( Real_aux_fx, Real_aux_fx ), Imag_aux_fx, Imag_aux_fx ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                 IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                     proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                     move32();
                 }
                 ELSE
                 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                     proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                     move32();
                 }
 
@@ -2232,14 +2504,26 @@ void protoSignalComputation2_fx(
                 }
 
                 temp = Madd_32_32( Mpy_32_32( p_proto_buffer_fx[2 * ( num_freq_bands + l )], p_proto_buffer_fx[2 * ( num_freq_bands + l )] ), p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1], p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1] ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                 IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                     proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                     move32();
                 }
                 ELSE
                 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                     proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                     move32();
                 }
             }
@@ -2262,14 +2546,26 @@ void protoSignalComputation2_fx(
                     move32();
 
                     temp = Madd_32_32( Mpy_32_32( p_proto_buffer_fx[2 * ( num_freq_bands + l )], p_proto_buffer_fx[2 * ( num_freq_bands + l )] ), p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1], p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1] ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                     IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                         proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                         move32();
                     }
                     ELSE
                     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                        proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                         proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                         move32();
                     }
                 }
@@ -2291,14 +2587,26 @@ void protoSignalComputation2_fx(
                 move32();
 
                 temp = Madd_32_32( Mpy_32_32( p_proto_buffer_fx[2 * ( num_freq_bands + l )], p_proto_buffer_fx[2 * ( num_freq_bands + l )] ), p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1], p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1] ); // 2*(q_cldfb+min_q_shift)-31
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
                 IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
                 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                     proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                     move32();
                 }
                 ELSE
                 {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                     proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                     move32();
                 }
             }
@@ -2320,8 +2628,13 @@ void protoSignalComputation2_fx(
 
         stereo_type_detect->q_sum_power = s_min( stereo_type_detect->q_sum_power, q_temp2 );
         move16();
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        stereo_type_detect->q_total_power = s_min( stereo_type_detect->q_total_power, q_temp_total );
+        move16();
+#else
         stereo_type_detect->q_total_power = s_min( stereo_type_detect->q_total_power, q_temp );
         move16();
+#endif
         q_sum_total_ratio = Q15;
         move16();
 
@@ -2337,45 +2650,45 @@ void protoSignalComputation2_fx(
             }
         }
 
-        temp = Mpy_32_32( a_fx, left_bb_power_fx ); // 2*(q_cldfb+min_q_shift) -31
-        IF( LT_16( q_temp, stereo_type_detect->q_left_bb_power ) )
+        temp = Mpy_32_32( a_fx, left_bb_power_fx ); // q_Left_Right_power
+        IF( LT_16( q_Left_Right_power, stereo_type_detect->q_left_bb_power ) )
         {
-            stereo_type_detect->left_bb_power_fx = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->left_bb_power_fx ), sub( stereo_type_detect->q_left_bb_power, q_temp ) ) ); // q_temp
+            stereo_type_detect->left_bb_power_fx = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->left_bb_power_fx ), sub( stereo_type_detect->q_left_bb_power, q_Left_Right_power ) ) ); // q_Left_Right_power
             move32();
-            stereo_type_detect->q_left_bb_power = q_temp;
+            stereo_type_detect->q_left_bb_power = q_Left_Right_power;
             move16();
         }
         ELSE
         {
-            stereo_type_detect->left_bb_power_fx = L_add( L_shr( temp, sub( q_temp, stereo_type_detect->q_left_bb_power ) ), Mpy_32_32( b_fx, stereo_type_detect->left_bb_power_fx ) ); // stereo_type_detect->q_left_bb_power
+            stereo_type_detect->left_bb_power_fx = Madd_32_32( L_shr( temp, sub( q_Left_Right_power, stereo_type_detect->q_left_bb_power ) ), b_fx, stereo_type_detect->left_bb_power_fx ); // stereo_type_detect->q_left_bb_power
             move32();
         }
 
-        temp = Mpy_32_32( a_fx, right_bb_power_fx ); // 2*(q_cldfb+min_q_shift) -31
-        IF( LT_16( q_temp, stereo_type_detect->q_right_bb_power ) )
+        temp = Mpy_32_32( a_fx, right_bb_power_fx ); // q_Left_Right_power
+        IF( LT_16( q_Left_Right_power, stereo_type_detect->q_right_bb_power ) )
         {
-            stereo_type_detect->right_bb_power_fx = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->right_bb_power_fx ), sub( stereo_type_detect->q_right_bb_power, q_temp ) ) ); // q_temp
+            stereo_type_detect->right_bb_power_fx = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->right_bb_power_fx ), sub( stereo_type_detect->q_right_bb_power, q_Left_Right_power ) ) ); // q_Left_Right_power
             move32();
-            stereo_type_detect->q_right_bb_power = q_temp;
+            stereo_type_detect->q_right_bb_power = q_Left_Right_power;
             move16();
         }
         ELSE
         {
-            stereo_type_detect->right_bb_power_fx = L_add( L_shr( temp, sub( q_temp, stereo_type_detect->q_right_bb_power ) ), Mpy_32_32( b_fx, stereo_type_detect->right_bb_power_fx ) ); // stereo_type_detect->q_right_bb_power
+            stereo_type_detect->right_bb_power_fx = Madd_32_32( L_shr( temp, sub( q_Left_Right_power, stereo_type_detect->q_right_bb_power ) ), b_fx, stereo_type_detect->right_bb_power_fx ); // stereo_type_detect->q_right_bb_power
             move32();
         }
 
-        temp = Mpy_32_32( a_fx, total_bb_power_fx ); // 2*(q_cldfb+min_q_shift) -31
-        IF( LT_16( q_temp, stereo_type_detect->q_total_bb_power ) )
+        temp = Mpy_32_32( a_fx, total_bb_power_fx ); // q_Left_Right_power
+        IF( LT_16( q_Left_Right_power, stereo_type_detect->q_total_bb_power ) )
         {
-            stereo_type_detect->total_bb_power_fx = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->total_bb_power_fx ), sub( stereo_type_detect->q_total_bb_power, q_temp ) ) ); // q_temp
+            stereo_type_detect->total_bb_power_fx = L_add( temp, L_shr( Mpy_32_32( b_fx, stereo_type_detect->total_bb_power_fx ), sub( stereo_type_detect->q_total_bb_power, q_Left_Right_power ) ) ); // q_Left_Right_power
             move32();
-            stereo_type_detect->q_total_bb_power = q_temp;
+            stereo_type_detect->q_total_bb_power = q_Left_Right_power;
             move16();
         }
         ELSE
         {
-            stereo_type_detect->total_bb_power_fx = L_add( L_shr( temp, sub( q_temp, stereo_type_detect->q_total_bb_power ) ), Mpy_32_32( b_fx, stereo_type_detect->total_bb_power_fx ) ); // stereo_type_detect->q_total_bb_power
+            stereo_type_detect->total_bb_power_fx = Madd_32_32( L_shr( temp, sub( q_Left_Right_power, stereo_type_detect->q_total_bb_power ) ), b_fx, stereo_type_detect->total_bb_power_fx ); // stereo_type_detect->q_total_bb_power
             move32();
         }
 
@@ -2393,9 +2706,8 @@ void protoSignalComputation2_fx(
             q_lr_bb_power = stereo_type_detect->q_right_bb_power;
             move16();
         }
-        q_lr_bb_power = sub( q_lr_bb_power, 1 ); /* = (lr_bb_power_fx * 2) */
-
-        temp = BASOP_Util_Divide3232_Scale_cadence( lr_bb_power_fx, L_add( stereo_type_detect->total_bb_power_fx, EPSILON_FX ), &exp ); // Q(31-(exp+stereo_type_detect->q_total_bb_power-q_lr_bb_power))
+        q_lr_bb_power = sub( q_lr_bb_power, 1 );                                                                                       /* = (lr_bb_power_fx * 2) */
+        temp = BASOP_Util_Divide3232_Scale_newton( lr_bb_power_fx, L_add( stereo_type_detect->total_bb_power_fx, EPSILON_FX ), &exp ); // Q(31-(exp+stereo_type_detect->q_total_bb_power-q_lr_bb_power))
         exp = sub( 31, add( sub( 31, exp ), sub( q_lr_bb_power, stereo_type_detect->q_total_bb_power ) ) );
         temp = BASOP_Util_Log2( temp ); // q25
         IF( NE_32( temp, MIN_32 ) )
@@ -2405,16 +2717,30 @@ void protoSignalComputation2_fx(
         // 20480 = 10 in Q11
         lr_total_bb_ratio_fx = Mpy_32_16_1( temp, 20480 ); // Q21
 
-        stereo_type_detect->left_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, left_hi_power_fx ), sub( 31, q_temp ), Mpy_32_32( b_fx, stereo_type_detect->left_hi_power_fx ), sub( 31, stereo_type_detect->q_left_hi_power ), &stereo_type_detect->q_left_hi_power );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        stereo_type_detect->left_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a2_fx, left_hi_power_fx ), exp_left_hi_power, Mpy_32_32( b2_fx, stereo_type_detect->left_hi_power_fx ), sub( 31, stereo_type_detect->q_left_hi_power ), &stereo_type_detect->q_left_hi_power );
         move32();
         stereo_type_detect->q_left_hi_power = sub( 31, stereo_type_detect->q_left_hi_power );
         move16();
-        stereo_type_detect->right_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, right_hi_power_fx ), sub( 31, q_temp ), Mpy_32_32( b_fx, stereo_type_detect->right_hi_power_fx ), sub( 31, stereo_type_detect->q_right_hi_power ), &stereo_type_detect->q_right_hi_power );
+
+        stereo_type_detect->right_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a2_fx, right_hi_power_fx ), exp_right_hi_power, Mpy_32_32( b2_fx, stereo_type_detect->right_hi_power_fx ), sub( 31, stereo_type_detect->q_right_hi_power ), &stereo_type_detect->q_right_hi_power );
         move32();
         stereo_type_detect->q_right_hi_power = sub( 31, stereo_type_detect->q_right_hi_power );
         move16();
-        stereo_type_detect->total_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a_fx, total_hi_power_fx ), sub( 31, q_temp ), Mpy_32_32( b_fx, stereo_type_detect->total_hi_power_fx ), sub( 31, stereo_type_detect->q_total_hi_power ), &stereo_type_detect->q_total_hi_power );
+        stereo_type_detect->total_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a2_fx, total_hi_power_fx ), exp_total_hi_power, Mpy_32_32( b2_fx, stereo_type_detect->total_hi_power_fx ), sub( 31, stereo_type_detect->q_total_hi_power ), &stereo_type_detect->q_total_hi_power );
+        move32();
+#else
+        stereo_type_detect->left_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a2_fx, left_hi_power_fx ), sub( 31, q_temp ), Mpy_32_32( b2_fx, stereo_type_detect->left_hi_power_fx ), sub( 31, stereo_type_detect->q_left_hi_power ), &stereo_type_detect->q_left_hi_power );
         move32();
+        stereo_type_detect->q_left_hi_power = sub( 31, stereo_type_detect->q_left_hi_power );
+        move16();
+        stereo_type_detect->right_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a2_fx, right_hi_power_fx ), sub( 31, q_temp ), Mpy_32_32( b2_fx, stereo_type_detect->right_hi_power_fx ), sub( 31, stereo_type_detect->q_right_hi_power ), &stereo_type_detect->q_right_hi_power );
+        move32();
+        stereo_type_detect->q_right_hi_power = sub( 31, stereo_type_detect->q_right_hi_power );
+        move16();
+        stereo_type_detect->total_hi_power_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_32( a2_fx, total_hi_power_fx ), sub( 31, q_temp ), Mpy_32_32( b2_fx, stereo_type_detect->total_hi_power_fx ), sub( 31, stereo_type_detect->q_total_hi_power ), &stereo_type_detect->q_total_hi_power );
+        move32();
+#endif
         stereo_type_detect->q_total_hi_power = sub( 31, stereo_type_detect->q_total_hi_power );
         move16();
 
@@ -2430,9 +2756,8 @@ void protoSignalComputation2_fx(
             move32();
             q_lr_hi_power = stereo_type_detect->q_right_hi_power;
         }
-        q_lr_hi_power = sub( q_lr_hi_power, 1 ); /* = (q_lr_hi_power * 2) */
-
-        temp = BASOP_Util_Divide3232_Scale_cadence( lr_hi_power_fx, L_add( stereo_type_detect->total_hi_power_fx, EPSILON_FX ), &exp ); // Q=31-(exp+ stereo_type_detect->q_total_hi_power-q_lr_hi_power)
+        q_lr_hi_power = sub( q_lr_hi_power, 1 );                                                                                       /* = (q_lr_hi_power * 2) */
+        temp = BASOP_Util_Divide3232_Scale_newton( lr_hi_power_fx, L_add( stereo_type_detect->total_hi_power_fx, EPSILON_FX ), &exp ); // Q=31-(exp+ stereo_type_detect->q_total_hi_power-q_lr_hi_power)
         exp = sub( 31, add( sub( 31, exp ), sub( q_lr_hi_power, stereo_type_detect->q_total_hi_power ) ) );
         temp = BASOP_Util_Log2( temp ); // q25
         IF( NE_32( temp, MIN_32 ) )
@@ -2465,14 +2790,27 @@ void protoSignalComputation2_fx(
     {
         p_proto_buffer_fx = proto_direct_buffer_f_fx + ( slot_index * num_freq_bands * 4 ); // q_proto_direct_buffer_f
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        q_temp[0] = sub( add( add( q_cldfb, min_q_shift[0] ), add( q_cldfb, min_q_shift[0] ) ), 31 );
+        q_temp[1] = sub( add( add( q_cldfb, min_q_shift[1] ), add( q_cldfb, min_q_shift[1] ) ), 31 );
+#else
         q_temp = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
+#endif
 
         FOR( l = 0; l < num_freq_bands; l++ )
         {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            Word16 qidx = s_min( 1, s_max( 0, sub( l, CLDFB_NO_CHANNELS_HALF - 1 ) ) );
+            re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+ min_q_shift
+            re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+ min_q_shift
+            im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift[qidx] ); // q_cldfb+ min_q_shift
+            im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift[qidx] ); // q_cldfb+ min_q_shift
+#else
             re1 = L_shl( RealBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+ min_q_shift
             re2 = L_shl( RealBuffer_fx[1][0][l], min_q_shift ); // q_cldfb+ min_q_shift
             im1 = L_shl( ImagBuffer_fx[0][0][l], min_q_shift ); // q_cldfb+ min_q_shift
             im2 = L_shl( ImagBuffer_fx[1][0][l], min_q_shift ); // q_cldfb+ min_q_shift
+#endif
 
             Real_aux_fx = L_add( re1, re2 ); // q_cldfb+ min_q_shift
             Imag_aux_fx = L_add( im1, im2 ); // q_cldfb+ min_q_shift
@@ -2481,14 +2819,26 @@ void protoSignalComputation2_fx(
             reference_power_64fx[l] = W_add( W_mult0_32_32( Real_aux_fx, Real_aux_fx ), W_mult0_32_32( Imag_aux_fx, Imag_aux_fx ) ); // q_temp
             move64();
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
             IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), W_extract_l( W_shr( reference_power_64fx[l], 31 ) ) ); // q_temp
+#else
                 proto_power_smooth_fx[l] = L_add( L_shr( proto_power_smooth_fx[l], sub( *q_proto_power_smooth, q_temp ) ), W_extract_l( W_shr( reference_power_64fx[l], 31 ) ) ); // q_temp
+#endif
                 move32();
             }
             ELSE
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( W_extract_l( W_shr( reference_power_64fx[l], 31 ) ), sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                 proto_power_smooth_fx[l] = L_add( proto_power_smooth_fx[l], L_shr( W_extract_l( W_shr( reference_power_64fx[l], 31 ) ), sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                 move32();
             }
 
@@ -2503,14 +2853,26 @@ void protoSignalComputation2_fx(
             move32();
 
             temp = Madd_32_32( Mpy_32_32( p_proto_buffer_fx[2 * ( num_freq_bands + l )], p_proto_buffer_fx[2 * ( num_freq_bands + l )] ), p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1], p_proto_buffer_fx[2 * ( num_freq_bands + l ) + 1] ); // q_temp
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            IF( LT_16( q_temp[qidx], q_proto_power_smooth[qidx] ) )
+#else
             IF( LT_16( q_temp, *q_proto_power_smooth ) )
+#endif
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( q_proto_power_smooth[qidx], q_temp[qidx] ) ), temp ); // q_temp
+#else
                 proto_power_smooth_fx[l + num_freq_bands] = L_add( L_shr( proto_power_smooth_fx[l + num_freq_bands], sub( *q_proto_power_smooth, q_temp ) ), temp ); // q_temp
+#endif
                 move32();
             }
             ELSE
             {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp[qidx], q_proto_power_smooth[qidx] ) ) ); // q_proto_power_smooth
+#else
                 proto_power_smooth_fx[l + num_freq_bands] = L_add( proto_power_smooth_fx[l + num_freq_bands], L_shr( temp, sub( q_temp, *q_proto_power_smooth ) ) ); // q_proto_power_smooth
+#endif
                 move32();
             }
 
@@ -2529,19 +2891,47 @@ void protoSignalComputation2_fx(
             move32();
         }
     }
-    q_reference_power_64fx = shl( add( q_cldfb, min_q_shift ), 1 );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    q_reference_power_64fx = shl( add( q_cldfb, min_q_shift[0] ), 1 );
+
     Word16 norm_shift = 63;
     move16();
-#ifdef FIX_867
-
-    FOR( l = 0; l < num_freq_bands; l++ )
+    FOR( l = 0; l < s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ); l++ )
+    {
+        IF( reference_power_64fx[l] )
+        {
+            norm_shift = s_min( norm_shift, W_norm( reference_power_64fx[l] ) );
+        }
+    }
+    FOR( l = 0; l < s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ); l++ )
     {
-        norm_shift = W_norm( reference_power_64fx[l] );
         reference_power_fx[l] = W_extract_h( W_shl( reference_power_64fx[l], norm_shift ) ); // q_reference_power_64fx+norm_shift-32
-        q_reference_power[l] = sub( add( q_reference_power_64fx, norm_shift ), 32 );
+        move32();
     }
+    q_reference_power[0] = sub( add( q_reference_power_64fx, norm_shift ), 32 );
+    move16();
 
+    q_reference_power_64fx = shl( add( q_cldfb, min_q_shift[1] ), 1 );
+    norm_shift = 63;
+    move16();
+    FOR( l = CLDFB_NO_CHANNELS_HALF; l < num_freq_bands; l++ )
+    {
+        IF( reference_power_64fx[l] )
+        {
+            norm_shift = s_min( norm_shift, W_norm( reference_power_64fx[l] ) );
+        }
+    }
+    FOR( l = CLDFB_NO_CHANNELS_HALF; l < num_freq_bands; l++ )
+    {
+        reference_power_fx[l] = W_extract_h( W_shl( reference_power_64fx[l], norm_shift ) ); // q_reference_power_64fx+norm_shift-32
+        move32();
+    }
+    q_reference_power[1] = sub( add( q_reference_power_64fx, norm_shift ), 32 );
+    move16();
 #else
+    q_reference_power_64fx = shl( add( q_cldfb, min_q_shift ), 1 );
+    Word16 norm_shift = 63;
+    move16();
     FOR( l = 0; l < num_freq_bands; l++ )
     {
         IF( reference_power_64fx[l] )
@@ -2558,29 +2948,58 @@ void protoSignalComputation2_fx(
     move16();
 #endif
 
-#ifdef FIX_867_DBG
-    FOR( l = 0; l < num_freq_bands; l++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    IF( GT_16( min_q_shift[0], min_q_shift[1] ) )
     {
-        static FILE *f = 0;
-        if ( f == 0 )
-            f = fopen( "reference_power_fx", "w" );
-
-        Word32 m = reference_power_fx[l];
-        Word16 e = q_reference_power[l];
-        float f1_m = (float) m;
-        float f1_e = powf( 2, e );
-        float f1 = f1_m / f1_e;
-        fprintf( f, "%d %d %d %f\n", l, m, e, f1 );
+        FOR( l = 0; l < i_mult( num_proto, num_freq_bands ); l += num_freq_bands )
+        {
+            Scale_sig32( proto_frame_f_fx + shl( l, 1 ), shl( s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ), 1 ), sub( min_q_shift[1], min_q_shift[0] ) );
+        }
+        *q_proto_frame_f = add( q_cldfb, min_q_shift[1] );
+        move16();
     }
-#endif
-
-
+    ELSE
+    {
+        FOR( l = 0; l < i_mult( num_proto, num_freq_bands ); l += num_freq_bands )
+        {
+            Scale_sig32( proto_frame_f_fx + shl( add( l, CLDFB_NO_CHANNELS_HALF ), 1 ), shl( s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 ), sub( min_q_shift[0], min_q_shift[1] ) );
+        }
+        *q_proto_frame_f = add( q_cldfb, min_q_shift[0] );
+        move16();
+    }
+    IF( GT_16( min_q_shift[0], min_q_shift[1] ) )
+    {
+        FOR( l = 0; l < i_mult( num_proto, num_freq_bands ); l += num_freq_bands )
+        {
+            Scale_sig32( p_proto_buffer_fx + shl( l, 1 ), shl( s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ), 1 ), sub( min_q_shift[1], min_q_shift[0] ) );
+        }
+        *q_proto_direct_buffer_f = add( q_cldfb, min_q_shift[1] );
+        move16();
+    }
+    ELSE
+    {
+        FOR( l = 0; l < i_mult( num_proto, num_freq_bands ); l += num_freq_bands )
+        {
+            Scale_sig32( p_proto_buffer_fx + shl( add( l, CLDFB_NO_CHANNELS_HALF ), 1 ), shl( s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 ), sub( min_q_shift[0], min_q_shift[1] ) );
+        }
+        *q_proto_direct_buffer_f = add( q_cldfb, min_q_shift[0] );
+        move16();
+    }
+#else
     *q_proto_frame_f = add( q_cldfb, min_q_shift );
     move16();
     *q_proto_direct_buffer_f = add( q_cldfb, min_q_shift );
     move16();
+#endif
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    q_proto_power_smooth[0] = s_min( q_proto_power_smooth[0], q_temp[0] );
+    q_proto_power_smooth[1] = s_min( q_proto_power_smooth[1], q_temp[1] );
+    move16();
+    move16();
+#else
     *q_proto_power_smooth = s_min( *q_proto_power_smooth, q_temp );
     move16();
+#endif
 
     return;
 }
@@ -2616,6 +3035,9 @@ void protoSignalComputation4_fx(
     Word32 sq_tmp_fx;
     Word32 *p_proto_buffer_fx;
     Word16 min_q_shift, q_shift;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 min_q_shift2, q_shift2;
+#endif
     Word32 re, im;
     Word16 proto_power_smooth_fx_q, sq_tmp_q;
 
@@ -2623,6 +3045,12 @@ void protoSignalComputation4_fx(
     move16();
     q_shift = Q31;
     move16();
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    min_q_shift2 = Q31;
+    move16();
+    q_shift2 = Q31;
+    move16();
+#endif
     sq_tmp_q = 0;
     move16();
 
@@ -2631,16 +3059,53 @@ void protoSignalComputation4_fx(
     /* calculate the shift possible for both RealBuffer_fx and ImagBuffer_fx buffers*/
     FOR( k = 0; k < s_max( 4, nchan_transport ); k++ )
     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        q_shift = L_norm_arr( RealBuffer_fx[k][0], s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ) );
+        min_q_shift = s_min( q_shift, min_q_shift );
+        q_shift = L_norm_arr( ImagBuffer_fx[k][0], s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ) );
+        min_q_shift = s_min( q_shift, min_q_shift );
+        q_shift2 = L_norm_arr( RealBuffer_fx[k][0] + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        min_q_shift2 = s_min( q_shift2, min_q_shift2 );
+        q_shift2 = L_norm_arr( ImagBuffer_fx[k][0] + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+        min_q_shift2 = s_min( q_shift2, min_q_shift2 );
+#else
         q_shift = L_norm_arr( RealBuffer_fx[k][0], num_freq_bands );
         min_q_shift = s_min( q_shift, min_q_shift );
         q_shift = L_norm_arr( ImagBuffer_fx[k][0], num_freq_bands );
         min_q_shift = s_min( q_shift, min_q_shift );
+#endif
     }
     q_shift = min_q_shift;
     min_q_shift = sub( min_q_shift, find_guarded_bits_fx( i_mult( 2, 4 ) ) );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    q_shift2 = min_q_shift2;
+    min_q_shift2 = sub( min_q_shift2, find_guarded_bits_fx( i_mult( 2, 4 ) ) );
+#endif
 
     FOR( k = 0; k < 4; k++ )
     {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        FOR( l = 0; l < s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ); l++ )
+        {
+            re = L_shl( RealBuffer_fx[k][0][l], min_q_shift ); // q_cldfb+min_q_shift
+            im = L_shl( ImagBuffer_fx[k][0][l], min_q_shift ); // q_cldfb+min_q_shift
+
+            sq_tmp_fx = Madd_32_32( Mpy_32_32( re, re ), im, im ); // 2*(q_cldfb+min_q_shift)-31
+
+            reference_power_fx[l] = Madd_32_16( reference_power_fx[l], sq_tmp_fx, 16384 /*0.5 in Q15*/ ); // 2*(q_cldfb+min_q_shift)-31
+            move32();
+        }
+        FOR( l = CLDFB_NO_CHANNELS_HALF; l < num_freq_bands; l++ )
+        {
+            re = L_shl( RealBuffer_fx[k][0][l], min_q_shift2 ); // q_cldfb+min_q_shift
+            im = L_shl( ImagBuffer_fx[k][0][l], min_q_shift2 ); // q_cldfb+min_q_shift
+
+            sq_tmp_fx = Madd_32_32( Mpy_32_32( re, re ), im, im ); // 2*(q_cldfb+min_q_shift)-31
+
+            reference_power_fx[l] = Madd_32_16( reference_power_fx[l], sq_tmp_fx, 16384 /*0.5 in Q15*/ ); // 2*(q_cldfb+min_q_shift)-31
+            move32();
+        }
+#else
         FOR( l = 0; l < num_freq_bands; l++ )
         {
             re = L_shl( RealBuffer_fx[k][0][l], min_q_shift ); // q_cldfb+min_q_shift
@@ -2650,20 +3115,25 @@ void protoSignalComputation4_fx(
 
             reference_power_fx[l] = Madd_32_16( reference_power_fx[l], sq_tmp_fx, 16384 /*0.5 in Q15*/ ); // 2*(q_cldfb+min_q_shift)-31
             move32();
-#ifdef FIX_867
-            sq_tmp_q = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
-            reference_power_q[l] = sub( add( sq_tmp_q, Q15 ), 15 );
-            move16();
-#endif
         }
+#endif
     }
-#ifndef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    sq_tmp_q = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
+    reference_power_q[0] = sq_tmp_q;
+    move16();
+    sq_tmp_q = sub( add( add( q_cldfb, min_q_shift2 ), add( q_cldfb, min_q_shift2 ) ), 31 );
+    reference_power_q[1] = sq_tmp_q;
+    move16();
+
+    min_q_shift = sub( s_min( q_shift, q_shift2 ), find_guarded_bits_fx( 2 ) );
+#else
     sq_tmp_q = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
     *reference_power_q = sub( add( sq_tmp_q, Q15 ), 15 );
     move16();
-#endif
 
     min_q_shift = sub( q_shift, find_guarded_bits_fx( 2 ) );
+#endif
 
     /*For decorrelated diffuseness*/
     FOR( l = 0; l < num_outputs_diff; l++ )
@@ -2746,8 +3216,15 @@ void protoSignalComputation4_fx(
 
     *proto_direct_buffer_f_q = *proto_frame_f_q;
     move16();
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    proto_power_smooth_q[0] = proto_power_smooth_fx_q;
+    proto_power_smooth_q[1] = proto_power_smooth_fx_q;
+    move16();
+    move16();
+#else
     *proto_power_smooth_q = proto_power_smooth_fx_q;
     move16();
+#endif
 
     return;
 }
@@ -2883,13 +3360,8 @@ void ivas_dirac_dec_compute_diffuse_proto_fx(
 
     Word16 new_diff_e = s_max( diff_e, old_diff_e );
     Scale_sig32( h_dirac_output_synthesis_state->proto_diffuse_buffer_f_fx, diffuse_start, sub( old_diff_e, new_diff_e ) ); // 31-new_diff_e
-#ifdef MSAN_FIX
     Scale_sig32( h_dirac_output_synthesis_state->proto_diffuse_buffer_f_fx + diffuse_start,
                  i_mult( shl( num_freq_bands_diff, 1 ), hDirACRend->hOutSetup.nchan_out_woLFE ), sub( diff_e, new_diff_e ) ); // 31-new_diff_e
-#else
-    Scale_sig32( h_dirac_output_synthesis_state->proto_diffuse_buffer_f_fx + diffuse_start,
-                 sub( h_dirac_output_synthesis_state->proto_diffuse_buffer_f_len, diffuse_start ), sub( diff_e, new_diff_e ) );
-#endif
     h_dirac_output_synthesis_state->proto_diffuse_buffer_f_q = sub( 31, new_diff_e );
     move16();
 
@@ -2963,7 +3435,7 @@ void computeDirectionAngles_fx(
         }
         ELSE
         {
-            temp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, intensityNorm, &exp ); // Q=31-(exp-(30-q_intensityNorm))
+            temp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, intensityNorm, &exp ); // Q=31-(exp-(30-q_intensityNorm))
             exp = sub( exp, sub( Q30, q_intensityNorm ) );
             temp = Sqrt32( temp, &exp ); // Q=31-exp
             q_temp = sub( 31, exp );
@@ -3080,10 +3552,8 @@ void ivas_masa_init_stereotype_detection_fx(
     move16();
     stereo_type_detect->target_power_y_smooth_fx = 0;
     move32();
-#ifdef MSAN_FIX
     stereo_type_detect->q_target_power_y_smooth = 31;
     move16();
-#endif
 
     stereo_type_detect->lr_total_bb_ratio_db_fx = 0;
     move32();
@@ -3711,7 +4181,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                 hDirACRend->h_output_synthesis_psd_state.direct_power_factor_fx[i] = L_add( hDirACRend->h_output_synthesis_psd_state.direct_power_factor_fx[i], surCohEner_fx ); // q29
                 move32();
 
-                surCohRatio_fx[i] = L_deposit_h( BASOP_Util_Divide3232_Scale( surCohEner_fx, L_add( L_add( 1, dirEne_fx ), surCohEner_fx ), &surCohRatio_exp[i] ) ); // 31-surCohRatio_exp
+                surCohRatio_fx[i] = BASOP_Util_Divide3232_Scale_newton( surCohEner_fx, L_add( L_add( 1, dirEne_fx ), surCohEner_fx ), &surCohRatio_exp[i] ); // 31-surCohRatio_exp
                 move32();
                 temp_exp = s_max( temp_exp, surCohRatio_exp[i] );
             }
@@ -3815,7 +4285,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                            &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
                                            hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx,
                                            &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                            reference_power_fix, DirAC_mem.reference_power_q, slot_idx, nchan_transport,
 #else
                                            reference_power_fix, &DirAC_mem.reference_power_q, slot_idx, nchan_transport,
@@ -3832,32 +4302,47 @@ static void ivas_masa_ext_dirac_render_sf_fx(
             protoSignalComputation2_fx( Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hDirACRend->proto_frame_f_fx, &hDirACRend->proto_frame_f_q,
                                         hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                         &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                         reference_power_fix, DirAC_mem.reference_power_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+                                        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
 #else
                                         reference_power_fix, &DirAC_mem.reference_power_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
-#endif
                                         &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                         0, slot_idx, hSpatParamRendCom->num_freq_bands, hDirACRend->masa_stereo_type_detect, q_cldfb );
 
             proto_direct_buffer_f_temp_q[slot_idx] = hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q;
             move16();
-#ifdef FIX_867
-            FOR( i = 0; i < hSpatParamRendCom->num_freq_bands; i++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            IF( LT_16( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) )
             {
-                IF( LT_16( DirAC_mem.reference_power_q[i], DirAC_mem.reference_power_smooth_q[i] ) )
+                FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
                 {
-                    reference_power_fix[hSpatParamRendCom->num_freq_bands + i] =
-                        L_shl( reference_power_fix[hSpatParamRendCom->num_freq_bands + i], sub( DirAC_mem.reference_power_q[i], DirAC_mem.reference_power_smooth_q[i] ) );
-                    DirAC_mem.reference_power_smooth_q[i] = DirAC_mem.reference_power_q[i];
-                    move16();
+                    Scale_sig32( reference_power_fix + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) ); // DirAC_mem.reference_power_q
                 }
-                ELSE
+                DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[0];
+                move16();
+            }
+            ELSE
+            {
+                Scale_sig32( reference_power_fix, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_smooth_q[0], DirAC_mem.reference_power_q[0] ) ); // DirAC_mem.reference_power_smooth_q
+                DirAC_mem.reference_power_q[0] = DirAC_mem.reference_power_smooth_q[0];
+                move16();
+            }
+            IF( LT_16( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) )
+            {
+                FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
                 {
-                    reference_power_fix[i] = L_shl( reference_power_fix[i], sub( DirAC_mem.reference_power_smooth_q[i], DirAC_mem.reference_power_q[i] ) );
-                    DirAC_mem.reference_power_q[i] = DirAC_mem.reference_power_smooth_q[i];
-                    move16();
+                    Scale_sig32( reference_power_fix + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) ); // DirAC_mem.reference_power_q
                 }
+                DirAC_mem.reference_power_smooth_q[1] = DirAC_mem.reference_power_q[1];
+                move16();
+            }
+            ELSE
+            {
+                Scale_sig32( reference_power_fix + CLDFB_NO_CHANNELS_HALF, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_smooth_q[1], DirAC_mem.reference_power_q[1] ) ); // DirAC_mem.reference_power_smooth_q
+                DirAC_mem.reference_power_q[1] = DirAC_mem.reference_power_smooth_q[1];
+                move16();
             }
 #else
             IF( LT_16( DirAC_mem.reference_power_q, DirAC_mem.reference_power_smooth_q ) )
@@ -3888,13 +4373,15 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                                 &hDirACRend->proto_frame_f_q,
                                                 hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                 reference_power_fix, DirAC_mem.reference_power_q,
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
 #else
                                                 reference_power_fix, &DirAC_mem.reference_power_q,
-#endif
                                                 hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                                 hDirACRend->hOutSetup.is_loudspeaker_setup,
                                                 slot_idx,
                                                 hSpatParamRendCom->num_freq_bands,
@@ -3902,23 +4389,38 @@ static void ivas_masa_ext_dirac_render_sf_fx(
 
                     proto_direct_buffer_f_temp_q[slot_idx] = hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q;
                     move16();
-#ifdef FIX_867
-                    FOR( i = 0; i < hSpatParamRendCom->num_freq_bands; i++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) )
                     {
-                        IF( LT_16( DirAC_mem.reference_power_q[i], DirAC_mem.reference_power_smooth_q[i] ) )
+                        FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
                         {
-                            reference_power_fix[hSpatParamRendCom->num_freq_bands + i] =
-                                L_shl( reference_power_fix[hSpatParamRendCom->num_freq_bands + i], sub( DirAC_mem.reference_power_q[i], DirAC_mem.reference_power_smooth_q[i] ) );
-                            DirAC_mem.reference_power_smooth_q[i] = DirAC_mem.reference_power_q[i];
-                            move16();
+                            Scale_sig32( reference_power_fix + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) ); // DirAC_mem.reference_power_q
                         }
-                        ELSE
+                        DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[0];
+                        move16();
+                    }
+                    ELSE
+                    {
+                        Scale_sig32( reference_power_fix, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_smooth_q[0], DirAC_mem.reference_power_q[0] ) ); // DirAC_mem.reference_power_smooth_q
+                        DirAC_mem.reference_power_q[0] = DirAC_mem.reference_power_smooth_q[0];
+                        move16();
+                    }
+                    IF( LT_16( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) )
+                    {
+                        FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
                         {
-                            reference_power_fix[i] = L_shl( reference_power_fix[i], sub( DirAC_mem.reference_power_smooth_q[i], DirAC_mem.reference_power_q[i] ) );
-                            DirAC_mem.reference_power_q[i] = DirAC_mem.reference_power_smooth_q[i];
-                            move16();
+                            Scale_sig32( reference_power_fix + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) ); // DirAC_mem.reference_power_q
                         }
+                        DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[1];
+                        move16();
+                    }
+                    ELSE
+                    {
+                        Scale_sig32( reference_power_fix, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_smooth_q[1], DirAC_mem.reference_power_q[1] ) ); // DirAC_mem.reference_power_smooth_q
+                        DirAC_mem.reference_power_q[1] = DirAC_mem.reference_power_smooth_q[1];
+                        move16();
                     }
+
 #else
                     IF( LT_16( DirAC_mem.reference_power_q, DirAC_mem.reference_power_smooth_q ) )
                     {
@@ -3945,13 +4447,15 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                                 &hDirACRend->proto_frame_f_q,
                                                 hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                 reference_power_fix, DirAC_mem.reference_power_q,
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
+                                                hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
 #else
                                                 reference_power_fix, &DirAC_mem.reference_power_q,
-#endif
                                                 hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx,
                                                 &hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q,
+#endif
                                                 slot_idx,
                                                 hDirACRend->num_protos_diff,
                                                 hSpatParamRendCom->num_freq_bands, q_cldfb );
@@ -3959,22 +4463,36 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                     proto_direct_buffer_f_temp_q[slot_idx] = hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q;
                     move16();
 
-#ifdef FIX_867
-                    FOR( i = 0; i < hSpatParamRendCom->num_freq_bands; i++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+                    IF( LT_16( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) )
                     {
-                        IF( LT_16( DirAC_mem.reference_power_q[i], DirAC_mem.reference_power_smooth_q[i] ) )
+                        FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
                         {
-                            reference_power_fix[hSpatParamRendCom->num_freq_bands + i] =
-                                L_shl( reference_power_fix[hSpatParamRendCom->num_freq_bands + i], sub( DirAC_mem.reference_power_q[i], DirAC_mem.reference_power_smooth_q[i] ) ); // DirAC_mem.reference_power_q
-                            DirAC_mem.reference_power_smooth_q[i] = DirAC_mem.reference_power_q[i];
-                            move16();
+                            Scale_sig32( reference_power_fix + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) ); // DirAC_mem.reference_power_q
                         }
-                        ELSE
+                        DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[0];
+                        move16();
+                    }
+                    ELSE
+                    {
+                        Scale_sig32( reference_power_fix, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_smooth_q[0], DirAC_mem.reference_power_q[0] ) ); // DirAC_mem.reference_power_smooth_q
+                        DirAC_mem.reference_power_q[0] = DirAC_mem.reference_power_smooth_q[0];
+                        move16();
+                    }
+                    IF( LT_16( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) )
+                    {
+                        FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
                         {
-                            reference_power_fix[i] = L_shl( reference_power_fix[i], sub( DirAC_mem.reference_power_smooth_q[i], DirAC_mem.reference_power_q[i] ) ); // DirAC_mem.reference_power_smooth_q
-                            DirAC_mem.reference_power_q[i] = DirAC_mem.reference_power_smooth_q[i];
-                            move16();
+                            Scale_sig32( reference_power_fix + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) ); // DirAC_mem.reference_power_q
                         }
+                        DirAC_mem.reference_power_smooth_q[1] = DirAC_mem.reference_power_q[1];
+                        move16();
+                    }
+                    ELSE
+                    {
+                        Scale_sig32( reference_power_fix, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_smooth_q[1], DirAC_mem.reference_power_q[1] ) ); // DirAC_mem.reference_power_smooth_q
+                        DirAC_mem.reference_power_q[1] = DirAC_mem.reference_power_smooth_q[1];
+                        move16();
                     }
 #else
                     IF( LT_16( DirAC_mem.reference_power_q, DirAC_mem.reference_power_smooth_q ) )
@@ -4019,15 +4537,19 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                                   hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q,
                                                   hDirACRend->num_protos_diff,
                                                   hDirACRend->proto_index_diff,
-                                                  hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx + slot_idx * 2 * hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_diff + 2 * hSpatParamRendCom->num_freq_bands * min( 4, nchan_transport ),
+                                                  hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx + slot_idx * 2 * hSpatParamRendCom->num_freq_bands * hDirACRend->num_outputs_diff + 2 * hSpatParamRendCom->num_freq_bands * s_min( 4, nchan_transport ),
                                                   &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q,
                                                   onset_filter_fx,
                                                   hDirACRend->h_freq_domain_decorr_ap_params,
                                                   hDirACRend->h_freq_domain_decorr_ap_state );
 
-                v_multc_fixed( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands );       /* Q31 */
+                v_multc_fixed( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
+#ifdef VEC_ARITH_OPT_v1
+                v_add_fixed_no_hdrm( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
+#else                                                                                                                                          /* VEC_ARITH_OPT_v1 */
                 v_add_fixed( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands, 0 ); /* Q31 */
-                p_onset_filter_fx = onset_filter_subframe_fx;                                                                             /*q31*/
+#endif                                                                                                                                         /* VEC_ARITH_OPT_v1 */
+                p_onset_filter_fx = onset_filter_subframe_fx;                                                                                  /*q31*/
             }
             ELSE
             {
@@ -4108,24 +4630,27 @@ static void ivas_masa_ext_dirac_render_sf_fx(
 
         IF( NE_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
         {
-#ifdef FIX_867
-            for ( i = 0; i < DirAC_mem.reference_power_len; i++ )
-            {
-                // check this: 1 is subtracted from Q but headroom is 0
-                DirAC_mem.reference_power_fx[i] = L_shl( DirAC_mem.reference_power_fx[i], -1 );
-                DirAC_mem.reference_power_q[i] = sub( DirAC_mem.reference_power_q[i], 1 );
-                move16();
-                DirAC_mem.reference_power_smooth_q[i] = DirAC_mem.reference_power_q[i];
-                move16();
-            }
-#else
             Scale_sig32( DirAC_mem.reference_power_fx, DirAC_mem.reference_power_len, -1 ); // DirAC_mem.reference_power_q-1
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            DirAC_mem.reference_power_q[0] = sub( DirAC_mem.reference_power_q[0], 1 );
+            DirAC_mem.reference_power_q[1] = sub( DirAC_mem.reference_power_q[1], 1 );
+            move16();
+            move16();
+            DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[0];
+            DirAC_mem.reference_power_smooth_q[1] = DirAC_mem.reference_power_q[1];
+            move16();
+            move16();
+#else
             DirAC_mem.reference_power_q = sub( DirAC_mem.reference_power_q, 1 );
             move16();
             DirAC_mem.reference_power_smooth_q = DirAC_mem.reference_power_q;
             move16();
 #endif
+#ifdef VEC_ARITH_OPT_v1
+            v_add_fixed_no_hdrm( reference_power_fix, reference_power_smooth_fx, reference_power_smooth_fx, hSpatParamRendCom->num_freq_bands ); // DirAC_mem.reference_power_smooth_q
+#else                                                                                                                                            /* VEC_ARITH_OPT_v1 */
             v_add_fixed( reference_power_fix, reference_power_smooth_fx, reference_power_smooth_fx, hSpatParamRendCom->num_freq_bands, 0 ); // DirAC_mem.reference_power_smooth_q
+#endif                                                                                                                                           /* VEC_ARITH_OPT_v1 */
         }
     }
     /*Rescaling proto_direct_buffer_f*/
@@ -4182,36 +4707,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
         }
         q_cldfb = 6;
         move16();
-#ifdef FIX_867
-        FOR( i = 0; i < hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len; i++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx[i] =
-                L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx[i], sub( 26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth[i] ) );
-        }
-        set16_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth, Q26, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len );
-
-        FOR( i = 0; i < hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len; i++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[i] =
-                L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[i], sub( 26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[i] ) );
-        }
-        set16_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth, Q26, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len );
-
-        FOR( i = 0; i < hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_len; i++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[i] =
-                L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[i], sub( 26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[i] ) );
-        }
-        set16_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev, Q26, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_len );
-
-        FOR( i = 0; i < hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_len; i++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[i] =
-                L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[i], sub( 26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[i] ) );
-        }
-        set16_fx( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev, Q26, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_len );
 
-#else
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_fx, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len, sub( 26, hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth ) ); // q26
         hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth = Q26;
         move16();
@@ -4227,7 +4723,6 @@ static void ivas_masa_ext_dirac_render_sf_fx(
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_len, sub( 26, hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev ) ); // q26
         hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev = Q26;
         move16();
-#endif
 
         ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx( Cldfb_RealBuffer_fx,
                                                                       Cldfb_ImagBuffer_fx,
@@ -4239,31 +4734,14 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                                                       diffuseness_vector_fx,
                                                                       0,
                                                                       0,
-#ifdef FIX_867
-                                                                      hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev,
-                                                                      hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev );
-#else
                                                                       &hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev,
                                                                       &hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev );
-#endif
         q_cldfb = -1;
         move16();
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < hDirACRend->num_outputs_dir * hSpatParamRendCom->num_freq_bands; kk++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk] = hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk];
-        }
-
-        FOR( Word16 kk = 0; kk < hDirACRend->num_outputs_diff * hSpatParamRendCom->num_freq_bands; kk++ )
-        {
-            hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk] = hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk];
-        }
-#else
         hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q = hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev;
         move16();
         hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q = hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev;
         move16();
-#endif
     }
     ELSE
     {
@@ -4280,51 +4758,26 @@ static void ivas_masa_ext_dirac_render_sf_fx(
             move16();
         }
 
-        /*Buffer Scaling*/
-        FOR( ch = 0; ch < hDirACRend->hOutSetup.nchan_out_woLFE; ch++ )
-        {
-            FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )
-            {
-                scale_sig32( Cldfb_RealBuffer_fx[ch][slot_idx],
-                             hSpatParamRendCom->num_freq_bands, sub( 11, q_cldfb ) ); // q11
-                scale_sig32( Cldfb_ImagBuffer_fx[ch][slot_idx],
-                             hSpatParamRendCom->num_freq_bands, sub( 11, q_cldfb ) ); // q11
-            }
-        }
-        q_cldfb = 11;
-        move16();
-
-#ifdef FIX_867
-        FOR( i = 0; i < DirAC_mem.reference_power_len; i++ )
-        {
-            Word16 reference_power_temp_q = getScaleFactor32( &DirAC_mem.reference_power_fx[i], 1 );
-            L_shl( DirAC_mem.reference_power_fx[i], reference_power_temp_q );
-            DirAC_mem.reference_power_q[i] = add( DirAC_mem.reference_power_q[i], reference_power_temp_q );
-            move16();
-            DirAC_mem.reference_power_smooth_q[i] = add( DirAC_mem.reference_power_q[i], reference_power_temp_q );
-            move16();
-        }
-
-        FOR( Word16 kk = 0; kk < h_dirac_output_synthesis_state->cy_auto_diff_smooth_len; kk++ )
-        {
-            Word16 q_cy_auto_diff_smooth = getScaleFactor32( &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk], 1 );
-            Scale_sig32( &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk], 1, q_cy_auto_diff_smooth );
-            h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk], q_cy_auto_diff_smooth );
-            move16();
-        }
-#else
         Word16 reference_power_temp_q = getScaleFactor32( DirAC_mem.reference_power_fx, DirAC_mem.reference_power_len );
         scale_sig32( DirAC_mem.reference_power_fx, DirAC_mem.reference_power_len, reference_power_temp_q ); /*DirAC_mem.reference_power_q + reference_power_temp_q*/
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        DirAC_mem.reference_power_q[0] = add( DirAC_mem.reference_power_q[0], reference_power_temp_q );
+        DirAC_mem.reference_power_q[1] = add( DirAC_mem.reference_power_q[1], reference_power_temp_q );
+        move16();
+        DirAC_mem.reference_power_smooth_q[0] = add( DirAC_mem.reference_power_q[0], reference_power_temp_q );
+        DirAC_mem.reference_power_smooth_q[1] = add( DirAC_mem.reference_power_q[1], reference_power_temp_q );
+        move16();
+#else
         DirAC_mem.reference_power_q = add( DirAC_mem.reference_power_q, reference_power_temp_q );
         move16();
         DirAC_mem.reference_power_smooth_q = add( DirAC_mem.reference_power_q, reference_power_temp_q );
         move16();
+#endif
 
         Word16 q_cy_auto_diff_smooth = getScaleFactor32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, h_dirac_output_synthesis_state->cy_auto_diff_smooth_len );
         Scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, h_dirac_output_synthesis_state->cy_auto_diff_smooth_len, q_cy_auto_diff_smooth ); // h_dirac_output_synthesis_state->q_cy_auto_diff_smooth+ q_cy_auto_diff_smooth
         h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, q_cy_auto_diff_smooth );
         move16();
-#endif
 
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx, hDirACRend->num_outputs_dir * hSpatParamRendCom->num_freq_bands, sub( 31, hDirACRend->h_output_synthesis_psd_state.direct_responses_square_q ) ); // q31
         hDirACRend->h_output_synthesis_psd_state.direct_responses_square_q = Q31;
@@ -4350,12 +4803,40 @@ static void ivas_masa_ext_dirac_render_sf_fx(
             move16();
         }
 
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        FOR( i = 0; hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] ), hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q )
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] = s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] );
+        move16();
+        FOR( i = 0; hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] ), hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q )
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] = s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] );
+        move16();
+
+        FOR( i = 0; hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] ), hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q )
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] = s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] );
+        move16();
+        FOR( i = 0; hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+        {
+            Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] ), hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q )
+        }
+        hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] = s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] );
+        move16();
+#else
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len, sub( s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q ), hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q )
         hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q = s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q );
         move16();
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_len, sub( s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q ), hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q )
         hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q = s_min( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q );
         move16();
+#endif
 
         Word16 proto_power_diff_smooth_prev_temp_q = getScaleFactor32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_len );
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_len, proto_power_diff_smooth_prev_temp_q ); // hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_q + proto_power_diff_smooth_prev_temp_q
@@ -4378,28 +4859,26 @@ static void ivas_masa_ext_dirac_render_sf_fx(
 
         /*Buffer rescaling*/
 
-#ifdef FIX_867
-        FOR( Word16 l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        Scale_sig32( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0], DirAC_mem.reference_power_q[0] ), hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0] ) );                                    // s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q )
+        Scale_sig32( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1], DirAC_mem.reference_power_q[1] ), hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1] ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q )
+        FOR( i = 0; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
         {
-            hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx[l] =
-                L_shl( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx[l],
-                       sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l], DirAC_mem.reference_power_q[l] ), hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l] ) );
-        }
-
-        FOR( Word16 l = 0; l < DirAC_mem.reference_power_len; l++ )
-        {
-            DirAC_mem.reference_power_fx[l] = L_shl( DirAC_mem.reference_power_fx[l],
-                                                     sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l], DirAC_mem.reference_power_q[l] ),
-                                                          DirAC_mem.reference_power_q[l] ) );
-
-
-            hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l], DirAC_mem.reference_power_q[l] );
-            move16();
-            DirAC_mem.reference_power_q[l] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l], DirAC_mem.reference_power_q[l] );
-            move16();
-            DirAC_mem.reference_power_smooth_q[l] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l], DirAC_mem.reference_power_q[l] );
-            move16();
+            Scale_sig32( DirAC_mem.reference_power_fx + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0], DirAC_mem.reference_power_q[0] ), DirAC_mem.reference_power_q[0] ) );                                    // s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q )
+            Scale_sig32( DirAC_mem.reference_power_fx + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1], DirAC_mem.reference_power_q[1] ), DirAC_mem.reference_power_q[1] ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q )
         }
+        hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0], DirAC_mem.reference_power_q[0] );
+        move16();
+        hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1], DirAC_mem.reference_power_q[1] );
+        move16();
+        DirAC_mem.reference_power_q[0] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0], DirAC_mem.reference_power_q[0] );
+        move16();
+        DirAC_mem.reference_power_q[1] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1], DirAC_mem.reference_power_q[1] );
+        move16();
+        DirAC_mem.reference_power_smooth_q[0] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0], DirAC_mem.reference_power_q[0] );
+        move16();
+        DirAC_mem.reference_power_smooth_q[1] = s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1], DirAC_mem.reference_power_q[1] );
+        move16();
 #else
         Scale_sig32( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_fx, hSpatParamRendCom->num_freq_bands, sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q ), hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q ) ); // s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q )
         Scale_sig32( DirAC_mem.reference_power_fx, DirAC_mem.reference_power_len, sub( s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q ), DirAC_mem.reference_power_q ) );                                                                                           // s_min( hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q, DirAC_mem.reference_power_q )
@@ -4419,7 +4898,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                                                     hSpatParamRendCom->subframe_nbslots[subframe_idx],
                                                                     diffuseness_vector_fx,
                                                                     reference_power_smooth_fx,
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
                                                                     DirAC_mem.reference_power_smooth_q,
 #else
                                                                     &DirAC_mem.reference_power_smooth_q,
@@ -4429,33 +4908,43 @@ static void ivas_masa_ext_dirac_render_sf_fx(
 
         hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_q = hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q;
         move16();
-        hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q = DirAC_mem.reference_power_smooth_q;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[0] = DirAC_mem.reference_power_smooth_q[0];
+        hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[1] = DirAC_mem.reference_power_smooth_q[1];
         move16();
-#ifdef FIX_867
-        FOR( Word16 l = 0; l < DirAC_mem.reference_power_len; l++ )
+        IF( LT_16( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) )
         {
-            hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q[l] = DirAC_mem.reference_power_smooth_q[l];
+            FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
+            {
+                Scale_sig32( reference_power_fix + i, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_q[0], DirAC_mem.reference_power_smooth_q[0] ) ); // DirAC_mem.reference_power_q
+            }
+            DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[0];
             move16();
         }
-
-        FOR( Word16 l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
+        ELSE
         {
-            IF( LT_16( DirAC_mem.reference_power_q[l], DirAC_mem.reference_power_smooth_q[l] ) )
-            {
-                reference_power_fix[hSpatParamRendCom->num_freq_bands + l] =
-                    L_shl( reference_power_fix[hSpatParamRendCom->num_freq_bands + l], sub( DirAC_mem.reference_power_q[l], DirAC_mem.reference_power_smooth_q[l] ) );
-                DirAC_mem.reference_power_smooth_q[l] = DirAC_mem.reference_power_q[l];
-                move16();
-            }
-            ELSE
+            Scale_sig32( reference_power_fix, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( DirAC_mem.reference_power_smooth_q[0], DirAC_mem.reference_power_q[0] ) ); // DirAC_mem.reference_power_smooth_q
+            DirAC_mem.reference_power_q[0] = DirAC_mem.reference_power_smooth_q[0];
+            move16();
+        }
+        IF( LT_16( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) )
+        {
+            FOR( i = hSpatParamRendCom->num_freq_bands; DirAC_mem.reference_power_len > i; i = add( i, hSpatParamRendCom->num_freq_bands ) )
             {
-                reference_power_fix[l] =
-                    L_shl( reference_power_fix[l], sub( DirAC_mem.reference_power_smooth_q[l], DirAC_mem.reference_power_q[l] ) );
-                DirAC_mem.reference_power_q[l] = DirAC_mem.reference_power_smooth_q[l];
-                move16();
+                Scale_sig32( reference_power_fix + CLDFB_NO_CHANNELS_HALF + i, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_q[1], DirAC_mem.reference_power_smooth_q[1] ) ); // DirAC_mem.reference_power_q
             }
+            DirAC_mem.reference_power_smooth_q[1] = DirAC_mem.reference_power_q[1];
+            move16();
+        }
+        ELSE
+        {
+            Scale_sig32( reference_power_fix + CLDFB_NO_CHANNELS_HALF, s_min( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( DirAC_mem.reference_power_smooth_q[1], DirAC_mem.reference_power_q[1] ) ); // DirAC_mem.reference_power_smooth_q
+            DirAC_mem.reference_power_q[1] = DirAC_mem.reference_power_smooth_q[1];
+            move16();
         }
 #else
+        hDirACRend->h_output_synthesis_psd_state.reference_power_smooth_prev_q = DirAC_mem.reference_power_smooth_q;
+        move16();
         IF( LT_16( DirAC_mem.reference_power_q, DirAC_mem.reference_power_smooth_q ) )
         {
             Scale_sig32( reference_power_fix + hSpatParamRendCom->num_freq_bands, sub( DirAC_mem.reference_power_len, hSpatParamRendCom->num_freq_bands ), sub( DirAC_mem.reference_power_q, DirAC_mem.reference_power_smooth_q ) ); // DirAC_mem.reference_power_q
@@ -4495,7 +4984,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
                                                                       hSpatParamRendCom->num_freq_bands ) );
             }
         }
-        scale_factor = sub( scale_factor, 3 ); // guard bits
+        scale_factor = sub( scale_factor, find_guarded_bits_fx( hSpatParamRendCom->num_freq_bands ) ); // guard bits
 
         FOR( ch = 0; ch < hDirACRend->num_outputs_dir; ch++ )
         {
@@ -4533,17 +5022,31 @@ static void ivas_masa_ext_dirac_render_sf_fx(
             ELSE
             {
                 /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */
+                /* cldfb_state_fx should be in 1 less q-factor compared to cld buffers for cldfbSynthesis_ivas_fx function */
                 Word16 q_out = sub( q_cldfb, 1 );
-                scale_sig32( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ); // q_out
-                hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state = q_out;
-                move16();
+                Word16 max_shift = L_norm_arr( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length );
+                IF( GT_16( max_shift, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ) )
+                {
+                    scale_sig32( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ); // q_out
+                    hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state = q_out;
+                    move16();
+                }
+                ELSE
+                {
+                    scale_sig32( Cldfb_RealBuffer_fx[idx_in][i], hSpatParamRendCom->num_freq_bands, sub( hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state, q_out ) );
+                    scale_sig32( Cldfb_ImagBuffer_fx[idx_in][i], hSpatParamRendCom->num_freq_bands, sub( hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state, q_out ) );
+                }
                 FOR( i = 0; i < hSpatParamRendCom->subframe_nbslots[subframe_idx]; i++ )
                 {
                     RealBuffer_fx[i] = Cldfb_RealBuffer_fx[idx_in][i]; // q_cldfb
                     ImagBuffer_fx[i] = Cldfb_ImagBuffer_fx[idx_in][i]; // q_cldfb
                 }
                 Word16 out_size = imult1616( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] );
-                cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, hMasaExtRend->cldfbSynRend[idx_in] );
+#ifdef OPT_AVOID_STATE_BUF_RESCALE
+                cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, 0, 0, hMasaExtRend->cldfbSynRend[idx_in] );
+#else                                                                                                                            /* OPT_AVOID_STATE_BUF_RESCALE */
+                cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, 0, hMasaExtRend->cldfbSynRend[idx_in] );
+#endif                                                                                                                           /* OPT_AVOID_STATE_BUF_RESCALE */
                 scale_sig32( &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, sub( 11, q_out ) ); // q11
                 idx_in++;
             }
diff --git a/lib_rend/ivas_efap.c b/lib_rend/ivas_efap_fx.c
similarity index 96%
rename from lib_rend/ivas_efap.c
rename to lib_rend/ivas_efap_fx.c
index 7d47f31747a32108ebaa0c11967eff4d34a88c9d..4fb88643bb143d6c704e885a0fcd4e0c3f0b4702 100644
--- a/lib_rend/ivas_efap.c
+++ b/lib_rend/ivas_efap_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,10 +35,8 @@
 #include <assert.h>
 #include <stdio.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_dec.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
@@ -1527,7 +1525,11 @@ static void get_poly_gains_fx(
         A[1] = elePoly[i - 1]; // q22
         move32();
 
+#ifdef VEC_ARITH_OPT_v1
+        v_sub_fixed_no_hdrm( P, A, P_minus_A, 2 ); /* Precalculate value of (P-A) q22*/
+#else                                              /* VEC_ARITH_OPT_v1 */
         v_sub_fixed( P, A, P_minus_A, 2, 0 ); /* Precalculate value of (P-A) q22*/
+#endif                                             /* VEC_ARITH_OPT_v1 */
 
         FOR( j = i; j < numChan - 2 + i; ++j )
         {
@@ -1580,7 +1582,11 @@ static Word32 get_tri_gain_fx(
     tmpN[1] = L_sub( C[0], B[0] ); // q22
     move32();
 
-    v_sub_fixed( B, A, tmpSub1, 2, 0 ); // tmpSub1 q22
+#ifdef VEC_ARITH_OPT_v1
+    v_sub_fixed_no_hdrm( B, A, tmpSub1, 2 ); // tmpSub1 q22
+#else                                        /* VEC_ARITH_OPT_v1 */
+    v_sub_fixed( B, A, tmpSub1, 2, 0 );       // tmpSub1 q22
+#endif                                       /* VEC_ARITH_OPT_v1 */
 
     tmpDot1 = dotp_fixed( tmpN, tmpSub1, 2 ); // Q13
 
@@ -2239,7 +2245,11 @@ static void sort_channels_vertex_fx(
         move32();
     }
 
+#ifdef VEC_ARITH_OPT_v1
+    v_sub_fixed_no_hdrm( tmpV1, tmpV2, tmpV3, 3 ); // tmpV3 Q30
+#else                                              /* VEC_ARITH_OPT_v1 */
     v_sub_fixed( tmpV1, tmpV2, tmpV3, 3, 0 ); // tmpV3 Q30
+#endif                                             /* VEC_ARITH_OPT_v1 */
     Word16 exp2 = 2;
     move16();
     normV = ISqrt32( dotp_fixed( tmpV3, tmpV3, 3 ) /*q29*/, &exp2 ); // q=31-exp2
@@ -2421,7 +2431,11 @@ static Word16 in_poly_fx(                         /* Angles are in Q22 */
     A[1] = poly.polyEle[0]; // q22
     move32();
 
-    v_sub_fixed( P, A, P_minus_A, 2, 0 ); /* Precalculate value of (P-A) q22*/
+#ifdef VEC_ARITH_OPT_v1
+    v_sub_fixed_no_hdrm( P, A, P_minus_A, 2 ); /* Precalculate value of (P-A) q22*/
+#else                                          /* VEC_ARITH_OPT_v1 */
+    v_sub_fixed( P, A, P_minus_A, 2, 0 );     /* Precalculate value of (P-A) q22*/
+#endif                                         /* VEC_ARITH_OPT_v1 */
 
     FOR( n = 1; n < sub( numVertices, 1 ); ++n )
     {
@@ -2479,7 +2493,7 @@ static Word16 in_tri_fx(
     Word16 tmp16, tmp_e;
     Word64 S[2];
     /* Threshold adjusted */
-    Word64 thresh_int = 4295; // 1e-6f in Q32
+    Word64 thresh_int = 35184640; // 1e-6f in Q45
     move64();
 
     /*
@@ -2489,8 +2503,13 @@ static Word16 in_tri_fx(
     I'll just compute the determinant and if it's equal to 0, that means the two vectors are colinear
     */
 
-    v_sub_fixed( B, A, tmpDot1, 2, 0 ); // tmpDot1 q22
-    v_sub_fixed( C, A, tmpDot2, 2, 0 ); // tmpDot 2q22
+#ifdef VEC_ARITH_OPT_v1
+    v_sub_fixed_no_hdrm( B, A, tmpDot1, 2 ); // tmpDot1 q22
+    v_sub_fixed_no_hdrm( C, A, tmpDot2, 2 ); // tmpDot2 q22
+#else                                        /* VEC_ARITH_OPT_v1 */
+    v_sub_fixed( B, A, tmpDot1, 2, 0 );       // tmpDot1 q22
+    v_sub_fixed( C, A, tmpDot2, 2, 0 );       // tmpDot2 q22
+#endif                                       /* VEC_ARITH_OPT_v1 */
 
     /* Verification of the non-colinearity : Q22 * Q22 = Q13 */
     invFactor = L_sub( Mpy_32_32( tmpDot1[0], tmpDot2[1] ), Mpy_32_32( tmpDot1[1], tmpDot2[0] ) ); /*q22+q22-q31->q13*/
@@ -2516,68 +2535,18 @@ static Word16 in_tri_fx(
     move32();
     matInv[1][1] = Mpy_32_32( tmpDot1[0], invFactor ); // q=22+invFactor_exp
     move32();
-
-    /* Computing S (Q13 + matInv_exp_final[i] + P_minus_A_exp_final + invFactor_exp - 1 ) =
-    matInv (Q22 + matInv_exp_final[i] + invFactor_exp) *(P-A) (Q22 + P_minus_A_exp_final) */
-    Word16 matInv_exp[2][2], P_minus_A_exp[2];
-    Word16 matInv_exp_final[2], P_minus_A_exp_final;
-    FOR( Word32 i = 0; i < 2; i++ )
-    {
-        FOR( Word32 j = 0; j < 2; j++ )
-        {
-            matInv_exp[i][j] = 31;
-            move16();
-            IF( matInv[i][j] != 0 )
-            {
-                matInv_exp[i][j] = norm_l( matInv[i][j] );
-                move16();
-            }
-        }
-        matInv_exp_final[i] = s_min( matInv_exp[i][0], matInv_exp[i][1] );
-        move16();
-        P_minus_A_exp[i] = 31;
-        move16();
-        IF( P_minus_A[i] != 0 )
-        {
-            P_minus_A_exp[i] = norm_l( P_minus_A[i] );
-            move16();
-        }
-    }
-    P_minus_A_exp_final = s_min( P_minus_A_exp[0], P_minus_A_exp[1] );
-
-    S[0] = L_add( L_shr( Mpy_32_32( L_shl( matInv[0][0], matInv_exp_final[0] ), L_shl( P_minus_A[0], P_minus_A_exp_final ) ), Q1 ),
-                  L_shr( Mpy_32_32( L_shl( matInv[0][1], matInv_exp_final[0] ), L_shl( P_minus_A[1], P_minus_A_exp_final ) ), Q1 ) ); //(22+invFactor_exp+matInv_exp_final[0]+22+P_minus_A_exp_final-1)-31=>12+invFactor_exp+matInv_exp_final[0]+P_minus_A_exp_final
+    S[0] = W_mac_32_32( W_mult_32_32( matInv[0][0], P_minus_A[0] ), matInv[0][1], P_minus_A[1] ); // Q22+invFactor_exp +Q22 + 1
     move64();
-    S[1] = L_add( L_shr( Mpy_32_32( L_shl( matInv[1][0], matInv_exp_final[1] ), L_shl( P_minus_A[0], P_minus_A_exp_final ) ), Q1 ),
-                  L_shr( Mpy_32_32( L_shl( matInv[1][1], matInv_exp_final[1] ), L_shl( P_minus_A[1], P_minus_A_exp_final ) ), Q1 ) ); //(22+invFactor_exp+matInv_exp_final[1]+22+P_minus_A_exp_final-1)-31=>12+invFactor_exp+matInv_exp_final[0]+P_minus_A_exp_final
+    S[0] = W_shr( S[0], invFactor_exp ); // q45
+    move64();
+    S[1] = W_mac_32_32( W_mult_32_32( matInv[1][0], P_minus_A[0] ), matInv[1][1], P_minus_A[1] ); // Q22+invFactor_exp +Q22 + 1
+    move64();
+    S[1] = W_shr( S[1], invFactor_exp ); // q45
     move64();
-
-    /* Checking if we are in the triangle; For the theory, check Christian Borss article, section 3.2 */
-    // Q32 S
-    IF( sub( sub( sub( Q20, matInv_exp_final[0] ), P_minus_A_exp_final ), invFactor_exp ) < 0 )
-    {
-        S[0] = W_shr( S[0], sub( add( add( matInv_exp_final[0], P_minus_A_exp_final ), invFactor_exp ), Q20 ) ); // q32
-        move64();
-    }
-    ELSE
-    {
-        S[0] = W_shl( S[0], sub( sub( sub( Q20, matInv_exp_final[0] ), P_minus_A_exp_final ), invFactor_exp ) ); // q32
-        move64();
-    }
-    IF( sub( sub( sub( Q20, matInv_exp_final[1] ), P_minus_A_exp_final ), invFactor_exp ) < 0 )
-    {
-        S[1] = W_shr( S[1], sub( add( add( matInv_exp_final[1], P_minus_A_exp_final ), invFactor_exp ), Q20 ) ); // q32
-        move64();
-    }
-    ELSE
-    {
-        S[1] = W_shl( S[1], sub( sub( sub( Q20, matInv_exp_final[1] ), P_minus_A_exp_final ), invFactor_exp ) ); // q32
-        move64();
-    }
 
     test();
     test();
-    IF( LT_64( S[0], -thresh_int ) || LT_64( S[1], -thresh_int ) || GT_64( W_add( S[0], S[1] ), W_add( W_shl( 1, 32 ), thresh_int ) ) )
+    IF( LT_64( S[0], -thresh_int ) || LT_64( S[1], -thresh_int ) || GT_64( W_add( S[0], S[1] ), W_add( ONE_IN_Q45, thresh_int ) ) )
     {
         return 0;
     }
diff --git a/lib_rend/ivas_hrtf.c b/lib_rend/ivas_hrtf_fx.c
similarity index 98%
rename from lib_rend/ivas_hrtf.c
rename to lib_rend/ivas_hrtf_fx.c
index ab69784c78998530a767b3d404a15f1778443367..93f9fbd83ad15a678ebf73f29f0f0e2d4f617709 100644
--- a/lib_rend/ivas_hrtf.c
+++ b/lib_rend/ivas_hrtf_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,11 +32,10 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_error.h"
 #include "wmc_auto.h"
-#include "ivas_prot.h"
 #include "ivas_prot_fx.h"
 
 /*-----------------------------------------------------------------------*
diff --git a/lib_rend/ivas_limiter.c b/lib_rend/ivas_limiter_fx.c
similarity index 99%
rename from lib_rend/ivas_limiter.c
rename to lib_rend/ivas_limiter_fx.c
index 17211d1c6da8b2ef59e0a8a3c3f6f23073cc1920..b212e5445c0c16f89af6f59bb5d7cfa64ec1b648 100644
--- a/lib_rend/ivas_limiter.c
+++ b/lib_rend/ivas_limiter_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,8 +33,8 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_rend.h"
 #include "wmc_auto.h"
 #include <assert.h>
diff --git a/lib_rend/ivas_masa_merge.c b/lib_rend/ivas_masa_merge_fx.c
similarity index 99%
rename from lib_rend/ivas_masa_merge.c
rename to lib_rend/ivas_masa_merge_fx.c
index 9e6807b00bb0b09570d05424a212fefd1bdecc8b..fd20a9fabb262fe00e70c28aa6319e405ec7707b 100644
--- a/lib_rend/ivas_masa_merge.c
+++ b/lib_rend/ivas_masa_merge_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,12 +33,10 @@
 #include <math.h>
 #include "options.h"
 #include "lib_rend.h"
-#include "ivas_prot_rend.h"
-#include "ivas_prot.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 
@@ -501,7 +499,7 @@ ivas_error masaPrerendOpen_fx(
     move16();
     FOR( i = 0; i < hMasaPrerend->num_Cldfb_instances; i++ )
     {
-        IF( ( error = openCldfb_ivas_fx( &( hMasaPrerend->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK )
+        IF( ( error = openCldfb_ivas_fx( &( hMasaPrerend->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )
         {
             return error;
         }
diff --git a/lib_rend/ivas_mcmasa_ana.c b/lib_rend/ivas_mcmasa_ana_fx.c
similarity index 99%
rename from lib_rend/ivas_mcmasa_ana.c
rename to lib_rend/ivas_mcmasa_ana_fx.c
index 106ca56f427cce1c623d588e78a54c7a549742f3..cfdd431167d350a0d184b6b098b8122fa4836a23 100644
--- a/lib_rend/ivas_mcmasa_ana.c
+++ b/lib_rend/ivas_mcmasa_ana_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,14 +35,12 @@
 #include <stdio.h>
 #include "ivas_cnst.h"
 #include "options.h"
-#include "ivas_prot_rend.h"
-#include "ivas_prot.h"
-#include "prot.h"
+#include "ivas_prot_rend_fx.h"
+#include "prot_fx.h"
 #include "ivas_stat_rend.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "ivas_rom_com_fx.h"
 
 /*-------------------------------------------------------------------------
@@ -226,7 +224,7 @@ ivas_error ivas_mcmasa_ana_open(
     move16();
     FOR( i = 0; i < hMcMasa->num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMcMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMcMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -755,12 +753,8 @@ void ivas_mcmasa_param_est_ana_fx(
             /* Direction estimation */
             computeIntensityVector_ana_fx( hMcMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, num_freq_bands, intensity_real_fx ); /* Q intensity_real_fx = 2*inp_q-31, e = 31 - 2*inp_q + 31 = 62 - 2*inp_q = 2*(31-inp_q)=2*c_e */
 
-            computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], shl( c_e, 1 )
-#ifdef NONBE_IMPROVE_DIRAC_INTENSITY_PREC
-                                                                                                                                                                                                            ,
-                                           NULL
-#endif
-            ); /* Q direction_vector_fx = Q30*/
+            computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], shl( c_e, 1 ),
+                                           NULL ); /* Q direction_vector_fx = Q30*/
 
             /* Power and intensity estimation for diffuseness */
             computeIntensityVector_ana_fx( hMcMasa->band_grouping, FoaEven_RealBuffer_fx, FoaEven_ImagBuffer_fx, num_freq_bands, intensity_even_real_fx ); /*2*inp_q-31*/
diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer_fx.c
similarity index 99%
rename from lib_rend/ivas_objectRenderer.c
rename to lib_rend/ivas_objectRenderer_fx.c
index f323b615dac3ca21d1b55958452e9ab8cbd9a544..1b5bc0d1b5e5644d47cd293d00556fb30dbe3cc0 100644
--- a/lib_rend/ivas_objectRenderer.c
+++ b/lib_rend/ivas_objectRenderer_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,14 +33,12 @@
 #include "ivas_stat_rend.h"
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include <math.h>
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 #include "debug.h"
 #include "ivas_rom_com_fx.h"
 #define float_to_fixed( n, factor ) ( round( n * ( 1 << factor ) ) )
diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
similarity index 99%
rename from lib_rend/ivas_objectRenderer_hrFilt.c
rename to lib_rend/ivas_objectRenderer_hrFilt_fx.c
index 4d5ad355a15083cc5185df1c319656fad59ca582..a098aaa25e23a3567661fc4be6bca4f218a72e59 100644
--- a/lib_rend/ivas_objectRenderer_hrFilt.c
+++ b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,13 +33,12 @@
 #include <stdint.h>
 #include <assert.h>
 #include "options.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include <math.h>
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_rend.h"
 #include "ivas_cnst.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /*---------------------------------------------------------------------*
  * Local function prototypes
@@ -98,7 +97,7 @@ ivas_error TDREND_REND_RenderSourceHRFilt_fx(
     TDREND_firfilt_fx( RightOutputFrame_fx, Src_p->hrf_right_prev_fx, right_filter_e, hrf_right_delta_fx, intp_count, Src_p->mem_hrf_right_fx, subframe_length, Src_p->filterlength, Src_p->Gain_fx, Src_p->prevGain_fx );
 
     Src_p->prevGain_fx = Src_p->Gain_fx;
-    move16();
+    move32();
 
     /* Copy to accumulative output frame */
     v_add_32( LeftOutputFrame_fx, output_buf_fx[0], output_buf_fx[0], subframe_length );  // Same Q as Src_p->InputFrame_p_fx Q11
@@ -394,9 +393,7 @@ static void GenerateITD_fx(
     Word16 num_az_idx, num_ev_idx;
     Word16 BM_idx[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ];
     Word16 itdMod_e;
-#ifdef MSAN_FIX
     set16_fx( AzIdx, 0, HRTF_MODEL_BSPLINE_NUM_COEFFS );
-#endif // MSAN_FIX
 
     /* Wrap the requested azimuth to the range of the BSplines */
     azim_fx = L_add( azim_fx, model->azimKSeq_fx[0] );
diff --git a/lib_rend/ivas_objectRenderer_mix.c b/lib_rend/ivas_objectRenderer_mix_fx.c
similarity index 99%
rename from lib_rend/ivas_objectRenderer_mix.c
rename to lib_rend/ivas_objectRenderer_mix_fx.c
index 5616da037e477eb2fb272bbe1df6aea2f955de23..0e61282d474afcbfe1fafe00f76aced101e92bb7 100644
--- a/lib_rend/ivas_objectRenderer_mix.c
+++ b/lib_rend/ivas_objectRenderer_mix_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,14 +32,13 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_TdBinauralRenderer.h"
 #include "ivas_error.h"
 #include "wmc_auto.h"
 #include "ivas_rom_rend.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 /*-------------------------------------------------------------------*
  * Local constants
diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx_fx.c
similarity index 94%
rename from lib_rend/ivas_objectRenderer_sfx.c
rename to lib_rend/ivas_objectRenderer_sfx_fx.c
index 8c6fd8663440cda59f05535665f4546202a7b0b8..a570273cfcc46e92c17c4184d7d7904307a02e53 100644
--- a/lib_rend/ivas_objectRenderer_sfx.c
+++ b/lib_rend/ivas_objectRenderer_sfx_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_rend.h"
-#include "prot.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 
 
 /*---------------------------------------------------------------------*
@@ -279,8 +278,8 @@ void TDREND_firfilt_fx(
     Word32 *mem_fx,                /* i/o: filter memory                    Qx */
     const Word16 subframe_length,  /* i  : Length of signal                 Q0 */
     const Word16 filterlength,     /* i  : Filter length                    Q0 */
-    const Word16 Gain_fx,          /* i  : Gain                            Q14 */
-    const Word16 prevGain_fx       /* i  : Previous gain                   Q14 */
+    const Word32 Gain_fx,          /* i  : Gain                            Q30 */
+    const Word32 prevGain_fx       /* i  : Previous gain                   Q30 */
 )
 {
     /* NOTE: this function is implemented with the assumption that the exponent/Q-factor of input signal will not change. */
@@ -290,15 +289,15 @@ void TDREND_firfilt_fx(
     Word32 *p_filter_fx;                                                      // exp(filter_e)
     Word16 i, j;
     Word32 tmp_fx;
-    Word16 step_fx /* Q15 */, gain_tmp_fx /* Q15 */, gain_delta_fx /* Q14 */;
+    Word32 step_fx /* Q31 */, gain_tmp_fx /* Q31 */, gain_delta_fx /* Q30 */;
     Word16 tmp_e;
     Word64 tmp64_fx;
 
-    gain_delta_fx = sub( Gain_fx, prevGain_fx );                                     // Q14
-    step_fx = BASOP_Util_Divide1616_Scale( gain_delta_fx, subframe_length, &tmp_e ); // exp(tmp_e)
-    tmp_e = sub( tmp_e, Q14 );
-    step_fx = shl_sat( step_fx, tmp_e );     // Q15
-    gain_tmp_fx = shl_sat( prevGain_fx, 1 ); // Q15
+    gain_delta_fx = L_sub( Gain_fx, prevGain_fx );                                                  // Q30
+    step_fx = L_deposit_h( BASOP_Util_Divide3232_Scale( gain_delta_fx, subframe_length, &tmp_e ) ); // exp(tmp_e)
+    tmp_e = sub( tmp_e, Q30 );
+    step_fx = L_shl_sat( step_fx, tmp_e );     // Q31
+    gain_tmp_fx = L_shl_sat( prevGain_fx, 1 ); // Q31
 
     /* Handle memory */
     p_signal_fx = buffer_fx + sub( filterlength, 1 );                                                                                        // Qx
@@ -329,8 +328,8 @@ void TDREND_firfilt_fx(
         tmp_fx = W_extract_h( tmp64_fx );       // Qx
 
         /* Apply linear gain interpolation in case of abrupt gain changes */
-        gain_tmp_fx = add( gain_tmp_fx, step_fx );         // Q15
-        signal_fx[i] = Mpy_32_16_1( tmp_fx, gain_tmp_fx ); // Qx
+        gain_tmp_fx = L_add_sat( gain_tmp_fx, step_fx ); /* Saturating values which just exceeds 1, Q31*/
+        signal_fx[i] = Mpy_32_32( tmp_fx, gain_tmp_fx ); // Qx
         move32();
         IF( LT_16( i, intp_count ) )
         {
diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources_fx.c
similarity index 98%
rename from lib_rend/ivas_objectRenderer_sources.c
rename to lib_rend/ivas_objectRenderer_sources_fx.c
index f01f667970f30f6c6a7e9a94a7e267f9c071d12a..cdb2d98472c9f750d7d0e189b1a1a1febf2cf4a8 100644
--- a/lib_rend/ivas_objectRenderer_sources.c
+++ b/lib_rend/ivas_objectRenderer_sources_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
-#include "prot_fx.h"
 
 
 /*---------------------------------------------------------------------*
@@ -276,8 +275,8 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
     /* o  : Length of filters                         */ // Q0
     Word16 *itd,
     /* o  : ITD value                                 */ // Q0
-    Word16 *Gain,
-    /* o  : Gain value                                */ // Q14
+    Word32 *Gain,
+    /* o  : Gain value                                */ // Q30
     TDREND_SRC_t *Src_p,                                 /* i/o: Source pointer                            */
     const Word16 subframe_update_flag )
 {
@@ -369,8 +368,8 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
 
 
         /* Update total gains */
-        *Gain = extract_h( L_shl( Mpy_32_32( L_shl( L_mult( *SrcRend_p->SrcGain_p_fx, *SrcRend_p->DirGain_p_fx ), 1 ), L_shl( L_mult( *SrcRend_p->DistGain_p_fx, hBinRendererTd->Gain_fx ), 1 ) ), 1 ) ); // Q14
-        move16();
+        *Gain = L_shl( Mpy_32_32( L_shl( L_mult( *SrcRend_p->SrcGain_p_fx, *SrcRend_p->DirGain_p_fx ), 1 ), L_shl( L_mult( *SrcRend_p->DistGain_p_fx, hBinRendererTd->Gain_fx ), 1 ) ), 1 ); // Q30
+        move32();
         /* Delta for interpolation, in case the angular step exceeds MAX_ANGULAR_STEP */
         Word32 ele_tmp = Src_p->elev_prev_fx; // Q22
         move32();
@@ -418,8 +417,8 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
     {
         *itd = 0; // Q0
         move16();
-        *Gain = ONE_IN_Q14; // Q14
-        move16();
+        *Gain = ONE_IN_Q30; // Q30
+        move32();
         set32_fx( hrf_left, 0, *filterlength );
         set32_fx( hrf_right, 0, *filterlength );
         hrf_left[0] = L_shr( L_add( SrcSpatial_p->Pos_p_fx[1], ONE_IN_Q25 ), 1 ); // Q25
@@ -574,10 +573,8 @@ static void TDREND_SRC_SPATIAL_Init_fx(
         TDREND_SPATIAL_VecInit_fx( SrcSpatial_p->Front_p_fx + nC * 3, 0, 0, ONE_IN_Q30 ); /*Assuming Q30*/
     }
 
-#ifdef MSAN_FIX
     SrcSpatial_p->q_Pos_p = Q31;
     move16();
-#endif
 
     /* Source directional attenuation */
     SrcSpatial_p->DirAttenEnabled = FALSE; // Q0
@@ -889,9 +886,9 @@ void TDREND_SRC_Init_fx(
     move32();
     Src_p->elev_prev_fx = 0; // Q22
     move32();
-    Src_p->Gain_fx = ONE_IN_Q14; // Q14
-    move16();
-    Src_p->prevGain_fx = ONE_IN_Q14; // Q14
-    move16();
+    Src_p->Gain_fx = ONE_IN_Q30; // Q30
+    move32();
+    Src_p->prevGain_fx = ONE_IN_Q30; // Q30
+    move32();
     return;
 }
diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec_fx.c
similarity index 86%
rename from lib_rend/ivas_objectRenderer_vec.c
rename to lib_rend/ivas_objectRenderer_vec_fx.c
index 5e4d9d6ac462f4df22af2133616cfbfdcbd8cbc8..0d8c11aabc2d1f7bbbca125f01563c194a940636 100644
--- a/lib_rend/ivas_objectRenderer_vec.c
+++ b/lib_rend/ivas_objectRenderer_vec_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,10 +33,9 @@
 #include <stdint.h>
 #include "options.h"
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot_rend.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
+#include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 
 
@@ -88,28 +87,6 @@ Word32 TDREND_SPATIAL_VecNorm_fx(
     return tmp;
 }
 
-
-/*-------------------------------------------------------------------*
- * TDREND_SPATIAL_VecNormalize()
- *
- * Normalize vector to unit norm
- *-------------------------------------------------------------------*/
-
-void TDREND_SPATIAL_VecNormalize(
-    const float *Vec_p, /* i  : Input vector                    */
-    float *VecNorm_p    /* o  : Output vector                   */
-)
-{
-    float scaler;
-
-    scaler = inv_sqrt( Vec_p[0] * Vec_p[0] + Vec_p[1] * Vec_p[1] + Vec_p[2] * Vec_p[2] );
-    VecNorm_p[0] = scaler * Vec_p[0];
-    VecNorm_p[1] = scaler * Vec_p[1];
-    VecNorm_p[2] = scaler * Vec_p[2];
-
-    return;
-}
-
 void TDREND_SPATIAL_VecNormalize_fx(
     const Word32 *Vec_p_fx, /* i  : Input vector               q    */
     Word16 q,               /* i  : Input vector Q-factor           */
@@ -173,25 +150,6 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem_fx(
     return;
 }
 
-void TDREND_SPATIAL_VecMapToNewCoordSystem(
-    const float *Vec_p,       /* i  : Input vector            */
-    const float *TranslVec_p, /* i  : Translation vector      */
-    const float *DirVec_p,    /* i  : Direction vector        */
-    const float *UpVec_p,     /* i  : Up vector               */
-    const float *RightVec_p,  /* i  : Right vector            */
-    float *MappedVec_p,       /* o  : Transformed vector      */
-    float *LisRelPosAbs       /* o  : Transformed vector ignoring orientation */
-)
-{
-    v_sub( Vec_p, TranslVec_p, LisRelPosAbs, 3 );
-    /* Evalute the relative Vec in the coordinates of the Orientation vectors, */
-    /* which form an orthonormal basis */
-    MappedVec_p[0] = dotp( LisRelPosAbs, DirVec_p, 3 );
-    MappedVec_p[1] = dotp( LisRelPosAbs, RightVec_p, 3 );
-    MappedVec_p[2] = dotp( LisRelPosAbs, UpVec_p, 3 );
-    return;
-}
-
 /*-------------------------------------------------------------------*
  * TDREND_SPATIAL_EvalOrthonormOrient()
  *
diff --git a/lib_rend/ivas_omasa_ana.c b/lib_rend/ivas_omasa_ana_fx.c
similarity index 98%
rename from lib_rend/ivas_omasa_ana.c
rename to lib_rend/ivas_omasa_ana_fx.c
index 26f0cefcf77b49fe9c24644c32bb35894ec7e836..7b7f64c842dd0f57b94045da2fcdc29a554dd933 100644
--- a/lib_rend/ivas_omasa_ana.c
+++ b/lib_rend/ivas_omasa_ana_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,14 +34,12 @@
 #include <stdlib.h>
 #include <math.h>
 #include "ivas_cnst.h"
-#include "ivas_prot_rend.h"
-#include "ivas_prot.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_prot_fx.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "ivas_stat_rend.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 
 /*-------------------------------------------------------------------------
@@ -135,7 +133,7 @@ ivas_error ivas_omasa_ana_open(
     hOMasa->num_Cldfb_instances = numAnalysisChannels;
     FOR( i = 0; i < hOMasa->num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -540,8 +538,13 @@ static void ivas_omasa_param_est_ana_fx(
 
             FOR( i = 1; i < nchan_ism; i++ )
             {
+#ifdef VEC_ARITH_OPT_v1
+                v_add_fixed_no_hdrm( Chnl_RealBuffer_fx[i], Foa_RealBuffer_fx[0], Foa_RealBuffer_fx[0], num_freq_bins ); // Q:  Chnl_RealBuffer_q
+                v_add_fixed_no_hdrm( Chnl_ImagBuffer_fx[i], Foa_ImagBuffer_fx[0], Foa_ImagBuffer_fx[0], num_freq_bins ); // Q:  Chnl_ImagBuffer_q
+#else                                                                                                                    /* VEC_ARITH_OPT_v1 */
                 v_add_fixed( Chnl_RealBuffer_fx[i], Foa_RealBuffer_fx[0], Foa_RealBuffer_fx[0], num_freq_bins, 0 ); // Q:  Chnl_RealBuffer_q
                 v_add_fixed( Chnl_ImagBuffer_fx[i], Foa_ImagBuffer_fx[0], Foa_ImagBuffer_fx[0], num_freq_bins, 0 ); // Q:  Chnl_ImagBuffer_q
+#endif                                                                                                                   /* VEC_ARITH_OPT_v1 */
             }
 
             /* Y */
diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk_fx.c
similarity index 97%
rename from lib_rend/ivas_orient_trk.c
rename to lib_rend/ivas_orient_trk_fx.c
index a3e833455b0bada1c1faef3247af1699d42ce741..6ed7cf3b11c3b0ae26888d6102e3363d02e3106e 100644
--- a/lib_rend/ivas_orient_trk.c
+++ b/lib_rend/ivas_orient_trk_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,8 +33,7 @@
 #include "common_api_types.h"
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include <math.h>
 #include <assert.h>
@@ -141,22 +140,22 @@ static void QuaternionDivision_fx(
 {
     Word16 scale_e, result_e = 0, w_q, x_q, y_q, z_q, result_q;
 
-    r->w_fx = BASOP_Util_Divide3232_Scale_cadence( ( q.w_fx ), d, &scale_e );
+    r->w_fx = BASOP_Util_Divide3232_Scale_newton( ( q.w_fx ), d, &scale_e );
     move32();
     result_e = add( scale_e, sub( sub( Q31, q.q_fact ), den_e ) ); // e+e1-e2//
     w_q = sub( Q31, result_e );
 
-    r->x_fx = BASOP_Util_Divide3232_Scale_cadence( ( q.x_fx ), d, &scale_e );
+    r->x_fx = BASOP_Util_Divide3232_Scale_newton( ( q.x_fx ), d, &scale_e );
     move32();
     result_e = add( scale_e, sub( sub( Q31, q.q_fact ), den_e ) );
     x_q = sub( Q31, result_e );
 
-    r->y_fx = BASOP_Util_Divide3232_Scale_cadence( ( q.y_fx ), d, &scale_e );
+    r->y_fx = BASOP_Util_Divide3232_Scale_newton( ( q.y_fx ), d, &scale_e );
     move32();
     result_e = add( scale_e, sub( sub( Q31, q.q_fact ), den_e ) );
     y_q = sub( Q31, result_e );
 
-    r->z_fx = BASOP_Util_Divide3232_Scale_cadence( ( q.z_fx ), d, &scale_e );
+    r->z_fx = BASOP_Util_Divide3232_Scale_newton( ( q.z_fx ), d, &scale_e );
     move32();
     result_e = add( scale_e, sub( sub( Q31, q.q_fact ), den_e ) );
     z_q = sub( Q31, result_e );
@@ -506,15 +505,15 @@ static IVAS_VECTOR3 VectorNormalize_fx(
     move16();
     length_fx = VectorLength_fx( p, &q_len );
 
-    result_fx.x_fx = BASOP_Util_Divide3232_Scale_cadence( p.x_fx, length_fx, &scale );
+    result_fx.x_fx = BASOP_Util_Divide3232_Scale_newton( p.x_fx, length_fx, &scale );
     move32();
     x_qfact = sub( Q31, add( scale, sub( q_len, p.q_fact ) ) ); // e+(e1-e2)//
 
-    result_fx.y_fx = BASOP_Util_Divide3232_Scale_cadence( p.y_fx, length_fx, &scale );
+    result_fx.y_fx = BASOP_Util_Divide3232_Scale_newton( p.y_fx, length_fx, &scale );
     move32();
     y_qfact = sub( Q31, add( scale, sub( q_len, p.q_fact ) ) );
 
-    result_fx.z_fx = BASOP_Util_Divide3232_Scale_cadence( p.z_fx, length_fx, &scale );
+    result_fx.z_fx = BASOP_Util_Divide3232_Scale_newton( p.z_fx, length_fx, &scale );
     move32();
     z_qfact = sub( Q31, add( scale, sub( q_len, p.q_fact ) ) );
 
diff --git a/lib_rend/ivas_output_init.c b/lib_rend/ivas_output_init.c
index 359bea7e670249df2dcb1e3259a77b4e9a97495a..9945d630ed96dc9b354bb1b962713581a70ed7c9 100644
--- a/lib_rend/ivas_output_init.c
+++ b/lib_rend/ivas_output_init.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "ivas_cnst.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_com.h"
 #include "ivas_rom_com_fx.h"
-#include "ivas_prot.h"
 #include "wmc_auto.h"
 #include "ivas_prot_fx.h"
 /*-------------------------------------------------------------------------*
diff --git a/lib_rend/ivas_output_init_fx.c b/lib_rend/ivas_output_init_fx.c
index 77cfa9c553f73a8c028e1abf54c8e5279ad7f7b0..3b01f62ca0af91b601d6b42e79f8426dfdd906c1 100644
--- a/lib_rend/ivas_output_init_fx.c
+++ b/lib_rend/ivas_output_init_fx.c
@@ -1,7 +1,8 @@
 
 #include "ivas_prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
+#include <string.h>
+
 Word16 ivas_get_nchan_buffers_dec_ivas_fx(
     Decoder_Struct *st_ivas,         /* i/o: IVAS decoder structure                */
     const Word16 sba_analysis_order, /* i  : SBA order evaluated in SBA decoder    */
@@ -157,3 +158,114 @@ Word16 ivas_get_nchan_buffers_dec_ivas_fx(
 
     return nchan_out_buff;
 }
+
+/*---------------------------------------------------------------------*
+ * get_channel_config()
+ *
+ * Gets a str related to audio configuration
+ *---------------------------------------------------------------------*/
+
+ivas_error get_channel_config(
+    const AUDIO_CONFIG config, /* i  : audio configuration                  */
+    Word8 *str                 /* o  : string with the configuration name   */
+)
+{
+    IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_MONO ) )
+    {
+        strcpy( (char *) str, "Mono" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_STEREO ) )
+    {
+        strcpy( (char *) str, "Stereo" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_ISM1 ) )
+    {
+        strcpy( (char *) str, "Object-based audio (1 object)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_ISM2 ) )
+    {
+        strcpy( (char *) str, "Object-based audio (2 objects)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_ISM3 ) )
+    {
+        strcpy( (char *) str, "Object-based audio (3 objects)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_ISM4 ) )
+    {
+        strcpy( (char *) str, "Object-based audio (4 objects)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_5_1 ) )
+    {
+        strcpy( (char *) str, "Multichannel 5.1 (CICP6)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_7_1 ) )
+    {
+        strcpy( (char *) str, "Multichannel 7.1 (CICP12)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_5_1_2 ) )
+    {
+        strcpy( (char *) str, "Multichannel 5.1+2 (CICP14)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_5_1_4 ) )
+    {
+        strcpy( (char *) str, "Multichannel 5.1+4 (CICP16)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_7_1_4 ) )
+    {
+        strcpy( (char *) str, "Multichannel 7.1+4 (CICP19)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )
+    {
+        strcpy( (char *) str, "Multichannel (custom loudspeaker layout)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_MASA1 ) )
+    {
+        strcpy( (char *) str, "Metadata-Assisted Spatial Audio mono (MASA1)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_MASA2 ) )
+    {
+        strcpy( (char *) str, "Metadata-Assisted Spatial Audio stereo (MASA2)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_FOA ) )
+    {
+        strcpy( (char *) str, "Ambisonics: First Order (FOA)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_HOA2 ) )
+    {
+        strcpy( (char *) str, "Ambisonics: Second Order (HOA2)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_HOA3 ) )
+    {
+        strcpy( (char *) str, "Ambisonics: Third Order (HOA3)" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL ) )
+    {
+        strcpy( (char *) str, "Binaural: no room" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
+    {
+        strcpy( (char *) str, "Binaural: room with impulse responses" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
+    {
+        strcpy( (char *) str, "Binaural: room with reverb" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )
+    {
+        strcpy( (char *) str, "BINAURAL_SPLIT_CODED" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+    {
+        strcpy( (char *) str, "Binaural_Split_PCM" );
+    }
+    ELSE IF( EQ_16( (Word16) config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+    {
+        strcpy( (char *) str, "External renderer" );
+    }
+    ELSE
+    {
+        return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Error: Incorrect Input/Output Configuration" );
+    }
+
+    return IVAS_ERR_OK;
+}
diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend_fx.h
similarity index 69%
rename from lib_rend/ivas_prot_rend.h
rename to lib_rend/ivas_prot_rend_fx.h
index 2426bd149e93e95b11db7537e9a8a60dfbfa0d7d..7cd547cb8104da4eec429cf05d127dcbaedb5420 100644
--- a/lib_rend/ivas_prot_rend.h
+++ b/lib_rend/ivas_prot_rend_fx.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -81,29 +81,16 @@ Word16  ivas_get_nchan_buffers_dec_ivas_fx(
   const Word32 ivas_total_brate                              /* i  : total IVAS bitrate                              */
 );
 
+ivas_error get_channel_config(
+    const AUDIO_CONFIG config,                                  /* i  : audio configuration                             */
+    Word8 *str                                                  /* o  : string with the configuration name              */
+);
+
+
 /*----------------------------------------------------------------------------------*
  * Limiter prototypes
  *----------------------------------------------------------------------------------*/
 
-
-ivas_error ivas_limiter_open(
-    IVAS_LIMITER_HANDLE *hLimiter_out,                          /* o  : limiter struct handle                   */
-    const int16_t num_channels,                                 /* i  : number of I/O channels                  */
-    const int32_t sampling_rate                                 /* i  : sampling rate for processing            */
-);
-
-void ivas_limiter_close(
-    IVAS_LIMITER_HANDLE* phLimiter                              /* i/o: pointer to limiter handle, can be NULL  */
-);
-
-void ivas_limiter_dec
-(
-    IVAS_LIMITER_HANDLE hLimiter,                               /* i/o: limiter struct handle                                           */
-    float *output[MAX_OUTPUT_CHANNELS],                         /* i/o: input/output buffer                                             */
-    const int16_t num_channels,                                 /* i  : number of channels to be processed                              */
-    const int16_t output_frame,                                 /* i  : number of samples per channel in the buffer                     */
-    const int16_t BER_detect                                    /* i  : BER detect flag                                                 */
-);
 void ivas_limiter_dec_fx(
     IVAS_LIMITER_HANDLE hLimiter,                               /* i/o: limiter struct handle                                           */
     Word32 *output[MAX_OUTPUT_CHANNELS],                        /* i/o: input/output buffer                                             */
@@ -112,13 +99,7 @@ void ivas_limiter_dec_fx(
     const Word16 BER_detect,                                    /* i  : BER detect flag                                                 */
     Word16 q_factor                                             /* i  : Q factor of the output samples                                  */
 );
-void limiter_process(
-    IVAS_LIMITER_HANDLE hLimiter,                               /* i/o: limiter struct handle                                           */
-    const int16_t output_frame,                                 /* i  : number of samples to be processed per channel in the I/O buffer */
-    const float threshold,                                      /* i  : signal amplitude above which limiting starts to be applied      */
-    const int16_t BER_detect,                                   /* i  : BER detect flag                                                 */
-    int16_t *strong_saturation_cnt                              /* i/o: counter of strong saturations (can be NULL)                     */
-);
+
 void limiter_process_fx(
     IVAS_LIMITER_HANDLE hLimiter,                               /* i/o: limiter struct handle                                              */
     const Word16 output_frame,                                  /* i  : number of samples to be processed per channel in the I/O buffer    */
@@ -132,9 +113,9 @@ void limiter_process_fx(
  *----------------------------------------------------------------------------------*/
 ivas_error ivas_td_decorr_dec_open_fx(
     ivas_td_decorr_state_t **hTdDecorr,                         /* i/o: TD decorrelator handle                                  */
-    const int32_t output_Fs,                                    /* i  : output sampling rate                                    */
-    const int16_t nchan_internal,                               /* i  : number of internal channels                             */
-    const int16_t ducking_flag                                  /* i  : ducking flag                                            */
+    const Word32 output_Fs,                                    /* i  : output sampling rate                                    */
+    const Word16 nchan_internal,                               /* i  : number of internal channels                             */
+    const Word16 ducking_flag                                  /* i  : ducking flag                                            */
 );
 void ivas_td_decorr_dec_close(
     ivas_td_decorr_state_t **hTdDecorr                          /* i/o: TD decorrelator handle                                  */
@@ -171,9 +152,6 @@ ivas_error efap_init_data_fx(
     const Word16 num_speaker_nodes,                             /* i  : number of speaker nodes in the set                      */
     const Word16 efap_mode                                      /* i  : indicates whether EFAP or EFIP is used                  */
 );
-void efap_free_data(
-    EFAP_HANDLE *hEFAPdata                                      /* i/o: EFAP handle to be freed                                  */
-);
 
 void efap_determine_gains_fx(
     EFAP_HANDLE hEFAPdata,                                      /* i  : EFAP structure                                               */
@@ -216,14 +194,7 @@ void ivas_sba_prototype_renderer_fx(
     Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i  : Input audio in CLDFB domain, real    */
     Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i  : Input audio in CLDFB domain, imag    */
   Word16 q_cldfb[6][CLDFB_SLOTS_PER_SUBFRAME],
-    const int16_t subframe                                         /* i  : Subframe to render                   */
-);
-
-void ivas_sba_prototype_renderer(
-  Decoder_Struct *st_ivas,                                       /* i/o: IVAS decoder struct                  */
-  float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i  : Input audio in CLDFB domain, real    */
-  float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i  : Input audio in CLDFB domain, imag    */
-  const int16_t subframe                                         /* i  : Subframe to render                   */
+    const Word16 subframe                                         /* i  : Subframe to render                   */
 );
 
 ivas_error ivas_sba_get_hoa_dec_matrix_fx(
@@ -236,11 +207,7 @@ void ivas_dirac_dec_binaural_sba_gain_fx(
     const Word16 nchan_remapped, /* i  : num channels after remapping of TCs                                         */
     const Word16 output_frame    /* i  : output frame length                                                         */
 );
-void ivas_dirac_dec_binaural_sba_gain(
-    float *output[],                                            /* i/o: synthesized core-coder transport channels/DirAC output  */
-    const int16_t nchan_remapped,                               /* i  : num channels after remapping of TCs                     */
-    const int16_t output_frame                                  /* i  : output frame length                                     */
-);
+
 void ivas_dirac_dec_binaural_render_fx(
     Decoder_Struct *st_ivas,                                   /* i/o: IVAS decoder handle                     */
     const UWord16 nSamplesAsked,                               /* i  : number of CLDFB slots requested         */
@@ -266,11 +233,6 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs_fx(
     HRTFS_PARAMBIN_HANDLE *hHrtfParambin /* i/o: HRTF structure for rendering */
 );
 
-ivas_error ivas_dirac_dec_binaural_copy_hrtfs(
-    HRTFS_PARAMBIN_HANDLE *hHrtfParambin                        /* i/o: HRTF structure for rendering            */
-);
-
-
 ivas_error ivas_dirac_alloc_mem_fx(
     DIRAC_REND_HANDLE hDirACRend,
     const RENDERER_TYPE renderer_type,
@@ -278,20 +240,6 @@ ivas_error ivas_dirac_alloc_mem_fx(
     DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem,
     const Word16 hodirac_flag);
 
-void ivas_dirac_free_mem(
-    DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem
-);
-
-void initDiffuseResponses(
-    float *diffuse_response_function,
-    const int16_t num_channels,
-    const AUDIO_CONFIG output_config,
-    const IVAS_OUTPUT_SETUP hOutSetup,
-    const int16_t ambisonics_order,
-    const IVAS_FORMAT ivas_format,
-    int16_t *num_ele_spk_no_diffuse_rendering,
-    const AUDIO_CONFIG transport_config
-);
 void ivas_dirac_free_mem_fx(
     DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem
 );
@@ -333,18 +281,6 @@ void protoSignalComputation_shd_fx(
     Word32 *p_Rmat_fx, /* Q30 */
     Word16 q_cldfb
 );
-void protoSignalComputation_shd(
-    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],
-    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],
-    float *proto_direct_buffer_f,
-    float *proto_diffuse_buffer_f,
-    float *reference_power,
-    const int16_t slot_index,
-    const int16_t num_inputs,
-    const int16_t num_outputs_diff,
-    const int16_t num_freq_bands,
-    float *p_Rmat
-);
 
 void protoSignalComputation1_fx(
     Word32 RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /*q_cldfb*/
@@ -362,17 +298,6 @@ void protoSignalComputation1_fx(
     const Word16 num_freq_bands,
     Word16 q_cldfb
 );
-void protoSignalComputation1(
-    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],
-    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],
-    float *proto_frame_f,
-    float *proto_direct_buffer_f,
-    float *reference_power,
-    float *proto_power_smooth,
-    const int16_t slot_index,
-    const int16_t num_outputs_diff,
-    const int16_t num_freq_bands
-);
 
 void protoSignalComputation2_fx(
     Word32 RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /*q_cldfb*/
@@ -391,18 +316,6 @@ void protoSignalComputation2_fx(
     MASA_STEREO_TYPE_DETECT *stereo_type_detect,
     Word16 q_cldfb
 );
-void protoSignalComputation2(
-    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],
-    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],
-    float *proto_frame_f,
-    float *proto_direct_buffer_f,
-    float *reference_power,
-    float *proto_power_smooth,
-    const int16_t isloudspeaker,
-    const int16_t slot_index,
-    const int16_t num_freq_bands,
-    MASA_STEREO_TYPE_DETECT *stereo_type_detect
-);
 
 void protoSignalComputation4_fx(
     Word32 RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /*q_cldfb*/
@@ -424,11 +337,6 @@ void protoSignalComputation4_fx(
     Word16 q_cldfb
 );
 
-void ivas_dirac_dec_compute_diffuse_proto(
-    DIRAC_REND_HANDLE hDirACRend,
-    const int16_t num_freq_bands,
-    const int16_t slot_idx
-);
 void ivas_dirac_dec_compute_diffuse_proto_fx(
     DIRAC_REND_HANDLE hDirACRend,
     const Word16 num_freq_bands,
@@ -445,10 +353,6 @@ void computeDirectionAngles_fx(
     Word16 *elevation
 );
 
-void ivas_masa_init_stereotype_detection(
-    MASA_STEREO_TYPE_DETECT *stereo_type_detect
-);
-
 void ivas_masa_init_stereotype_detection_fx(
     MASA_STEREO_TYPE_DETECT *stereo_type_detect
 );
@@ -456,9 +360,6 @@ void ivas_masa_init_stereotype_detection_fx(
 void ivas_masa_stereotype_detection_fx(
     MASA_STEREO_TYPE_DETECT *stereo_type_detect
 );
-void ivas_masa_stereotype_detection(
-    MASA_STEREO_TYPE_DETECT *stereo_type_detect
-);
 
 void ivas_lfe_synth_with_cldfb_fx(
     MCMASA_LFE_SYNTH_DATA_HANDLE hMasaLfeSynth,
@@ -479,21 +380,6 @@ void rotateAziEle_DirAC_fx(
     const Word16 band2,     /* i  : bands to work on (upper bound)        */
     const Word32 *p_Rmat_fx /* i  : pointer to real-space rotation matrix q30*/
 );
-void rotateAziEle_DirAC(
-    int16_t *azi,
-    int16_t *ele,
-    const int16_t band1,
-    const int16_t band2,
-    const float *p_Rmat
-);
-
-ivas_error ivas_dirac_dec_onset_detection_open(
-    const int16_t num_channels,
-    const int16_t num_freq_bands,
-    const int16_t max_band_decorr,
-    DIRAC_ONSET_DETECTION_PARAMS *ph_dirac_onset_detection_params,
-    DIRAC_ONSET_DETECTION_STATE *ph_dirac_onset_detection_state
-);
 
 ivas_error ivas_dirac_dec_onset_detection_open_fx(
     const Word16 num_protos_diff, //Q0
@@ -514,14 +400,6 @@ ivas_error ivas_dirac_dec_decorr_open_fx(
     const Word32 output_Fs                                     /* i  : output sampling rate                        */
 );
 
-void ivas_dirac_dec_onset_detection_process(
-    const float *input_power_f,
-    float *onset_filter,
-    const int16_t num_protos_diff,
-    DIRAC_ONSET_DETECTION_PARAMS h_dirac_onset_detection_params,
-    DIRAC_ONSET_DETECTION_STATE h_dirac_onset_detection_state
-);
-
 void ivas_dirac_dec_onset_detection_process_fx(
   const Word32 *input_power_f, /* Q(0) */
   Word32 *onset_filter, /* Q(0) */
@@ -530,33 +408,6 @@ void ivas_dirac_dec_onset_detection_process_fx(
   DIRAC_ONSET_DETECTION_STATE h_dirac_onset_detection_state
 );
 
-ivas_error ivas_dirac_dec_decorr_open(
-    DIRAC_DECORR_PARAMS **ph_freq_domain_decorr_ap_params,
-    DIRAC_DECORR_STATE **ph_freq_domain_decorr_ap_state,
-    const int16_t num_freq_bands,
-    int16_t num_outputs_diff,
-    const int16_t num_protos_diff,
-    const DIRAC_SYNTHESIS_CONFIG synthesisConf,
-    float *frequency_axis,
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const int32_t output_Fs                                     /* i  : output sampling rate                        */
-);
-
-void ivas_dirac_dec_decorr_process(
-    const int16_t num_freq_bands,
-    int16_t num_channels,
-    const int16_t num_protos_diff,
-    const DIRAC_SYNTHESIS_CONFIG synthesisConf,
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const float *input_frame_f,
-    const int16_t num_protos_dir,
-    const int16_t *proto_index_dir,
-    float *frame_dec_f,
-    float *onset_filter,
-    HANDLE_DIRAC_DECORR_PARAMS h_freq_domain_decorr_ap_params,
-    HANDLE_DIRAC_DECORR_STATE h_freq_domain_decorr_ap_state
-);
-
 void ivas_dirac_dec_decorr_process_fx(
   const Word16 num_freq_bands,
   Word16 num_channels,
@@ -574,32 +425,11 @@ void ivas_dirac_dec_decorr_process_fx(
   HANDLE_DIRAC_DECORR_STATE h_freq_domain_decorr_ap_state
 );
 
-void ivas_dirac_dec_decorr_close(
-    HANDLE_DIRAC_DECORR_PARAMS *ph_dirac_decorr_params,
-    HANDLE_DIRAC_DECORR_STATE *ph_dirac_decorr_state
-);
 void ivas_dirac_dec_decorr_close_fx(
 	HANDLE_DIRAC_DECORR_PARAMS *ph_dirac_decorr_params,
 	HANDLE_DIRAC_DECORR_STATE *ph_dirac_decorr_state
 );
 
-
-ivas_error  ivas_dirac_dec_output_synthesis_open(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle         */
-    DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                       */
-    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                               */
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const int32_t output_Fs,                                    /* i  : output sampling rate                        */
-    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode              */
-);
-
-void ivas_dirac_dec_output_synthesis_init(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle         */
-    DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                       */
-    const int16_t nchan_out_woLFE,                              /* i  : number of output audio channels without LFE */
-    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode              */
-);
-
 ivas_error  ivas_dirac_dec_output_synthesis_open_fx(
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle         */
     DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                       */
@@ -619,12 +449,10 @@ void ivas_dirac_dec_output_synthesis_init_fx(
 void ivas_dirac_dec_output_synthesis_close_fx(
     DIRAC_REND_HANDLE hDirACRend                                /* i/o: DirAC handle                                */
 );
-void ivas_dirac_dec_output_synthesis_close(
-    DIRAC_REND_HANDLE hDirACRend                                /* i/o: DirAC handle                                */
-);
+
 void ivas_dirac_dec_output_synthesis_process_slot_fx(
   const Word32 *reference_power, /* i  : Estimated power             */
-#ifdef FIX_867
+#ifdef FIX_867_CLDFB_NRG_SCALE
   const Word16 *q_reference_power, /* i  : Estimated power             */
 #else
   const Word16 q_reference_power, /* i  : Estimated power             */
@@ -644,23 +472,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
   const Word16 md_idx,
   const Word16 hodirac_flag, /* i  : flag to indicate HO-DirAC mode   */
   const Word16 dec_param_estim);
-void ivas_dirac_dec_output_synthesis_process_slot(
-    const float *reference_power,                               /* i  : Estimated power                             */
-    const float *onset,                                         /* i  : onset filter                                */
-    const int16_t *azimuth,
-    const int16_t *elevation,
-    const float *diffuseness,
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle         */
-    DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                       */
-    const int16_t sh_rot_max_order,
-    const float *p_Rmat,                                        /* i  : rotation matrix                             */
-    const VBAP_HANDLE hVBAPdata,                                /* i  : VBAP structure                              */
-    const IVAS_OUTPUT_SETUP hOutSetup,                          /* i  : output setup structure                      */
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const int16_t ind_slot,                                     /* i  : index of the slot to be added to the input covariance */
-    const int16_t hodirac_flag,                                 /* i  : flag to indicate HO-DirAC mode              */
-    const int16_t dec_param_estim                               /* i  : flag to indicate parameter estimation mode  */
-);
 
 void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
@@ -677,19 +488,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
     Word16 *q_cy_auto_diff_smooth_prev
 );
 
-void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd(
-    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
-    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle         */
-    DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                       */
-    const int16_t nchan_transport,                              /* i  : number of transport channels                */
-    const int16_t nbslots,                                      /* i  : number of slots to process                  */
-    const float *onset_filter,
-    float *diffuseness,
-    const int16_t hodirac_flag,                                 /* i  : flag to indicate HO-DirAC mode              */
-    const int16_t dec_param_estim                               /* i  : flag to indicate parameter estimation mode  */
-);
-
 void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
     Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
@@ -704,25 +502,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
     Word16 *q_Cldfb
 );
 
-void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls(
-    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
-    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i  : LS signals                       */
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle         */
-    DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                       */
-    const int16_t nbslots,                                      /* i  : number of slots to process                  */
-    float *diffuseness_vector,                                  /* i  : diffuseness (needed for direction smoothing)*/
-    float *reference_power_smooth,
-    float qualityBasedSmFactor,
-    const int16_t enc_param_start_band
-);
-
-void compute_hoa_encoder_mtx(
-    const float *azimuth,
-    const float *elevation,
-    float *response,
-    const int16_t num_responses,
-    const int16_t ambisonics_order );
-
 void compute_hoa_encoder_mtx_fx(
     const Word32 *azimuth,   /*q22*/
     const Word32 *elevation, /*q22*/
@@ -747,21 +526,6 @@ void ivas_dirac_dec_compute_power_factors_fx(
     Word32 *diffuse_power_factor
 );
 
-void ivas_dirac_dec_compute_directional_responses(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle                            */
-    DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                                          */
-    const VBAP_HANDLE hVBAPdata,                                /* i  : VBAP structure                                                 */
-    const int16_t *masa_band_mapping,                           /* i  : Band mapping for MASA, NULL assumes not using MASA in any form */
-    MASA_ISM_DATA_HANDLE hMasaIsm,                              /* i  : MASA_ISM data structure                                        */
-    const int16_t *azimuth,
-    const int16_t *elevation,
-    const int16_t md_idx,
-    const float *surCohRatio,
-    const int16_t shd_rot_max_order,                            /* i  : split-order rotation method                                    */
-    const float *p_Rmat,                                        /* i  : rotation matrix                                                */
-    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode                                 */
-);
-
 void ivas_dirac_dec_compute_directional_responses_fx(
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common spatial renderer data handle                            */
     DIRAC_REND_HANDLE hDirACRend,                               /* i/o: DirAC renderer handle                                          */
@@ -778,36 +542,6 @@ void ivas_dirac_dec_compute_directional_responses_fx(
     const Word16 hodirac_flag                                   /* i  : flag to indicate HO-DirAC mode                                 */
 );
 
-void ivas_dirac_dec_get_frequency_axis(
-    float *frequency_axis,                                      /* o  : array of center frequencies of a real filter bank */
-    const int32_t output_Fs,                                    /* i  : sampling frequency                                */
-    const int16_t num_freq_bands                                /* i  : number of frequency bands                         */
-);
-
-ivas_error ivas_spat_hSpatParamRendCom_config(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out,
-    const DIRAC_CONFIG_FLAG flag_config_inp,                    /* i/ : Flag determining if we open or reconfigure the DirAC decoder */
-    const int16_t dec_param_estim_flag,
-    const IVAS_FORMAT ivas_format,
-    const MC_MODE mc_mode,
-    const int32_t output_Fs,
-    const int16_t hodirac_flag,
-    const int16_t masa_ext_rend_flag
-);
-
-void ivas_spat_hSpatParamRendCom_close(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out
-);
-
-void ivas_dirac_rend_close(
-    DIRAC_REND_HANDLE *hDirACRend_out
-);
-
-ivas_error ivas_dirac_allocate_parameters(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common data for spatial parametric rendering         */
-    const int16_t params_flag                                   /* i  : set of parameters flag                               */
-);
-
 void ivas_dirac_rend_close_fx(
     DIRAC_REND_HANDLE *hDirACRend_out
 );
@@ -829,18 +563,14 @@ ivas_error ivas_spat_hSpatParamRendCom_config_fx(
 
 ivas_error ivas_dirac_allocate_parameters_fx(
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common data for spatial parametric rendering         */
-    const int16_t params_flag                                   /* i  : set of parameters flag                               */
+    const Word16 params_flag                                   /* i  : set of parameters flag                               */
 );
 
 void ivas_dirac_deallocate_parameters_fx(
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common data for spatial parametric rendering        */
-    const int16_t params_flag                                   /* i  : set of parameters flag                              */
+    const Word16 params_flag                                   /* i  : set of parameters flag                              */
 );
 
-void ivas_dirac_deallocate_parameters(
-    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i/o: common data for spatial parametric rendering        */
-    const int16_t params_flag                                   /* i  : set of parameters flag                              */
-);
 void ivas_masa_ext_dirac_render_fx(
     MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA renderer structure             */
     Word32 *output_f[],                /* i/o: input/output signals in time domain q11*/
@@ -858,11 +588,6 @@ void ivas_HRTF_binary_close_fx(
     TDREND_HRFILT_FiltSet_t **hHrtfTD                           /* i/o: TD renderer HRTF handle                 */
 );
 
-ivas_error ivas_HRTF_fastconv_binary_open(
-    HRTFS_FASTCONV **hHrtfFastConv                              /* i/o: FASTCONV HRTF structure */
-);
-
-
 ivas_error ivas_HRTF_fastconv_binary_open_fx(
     HRTFS_FASTCONV **hHrtfFastConv                              /* i/o: FASTCONV HRTF structure */
 );
@@ -906,33 +631,6 @@ ivas_error ivas_td_binaural_renderer_unwrap_fx(
     const Word16 num_subframes           /* i  : number of subframes to render */
 );
 
-ivas_error ivas_td_binaural_renderer_unwrap(
-    const REVERB_HANDLE hReverb,                                /* i  : Reverberator handle                     */
-    const AUDIO_CONFIG transport_config,                        /* i  : Transport configuration                 */
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD binaural object renderer handle      */
-    const int16_t num_src,                                      /* i  : number of sources to render             */
-    const int16_t lfe_idx,                                      /* i  : LFE channel index                       */
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */
-    ISM_METADATA_HANDLE *hIsmMetaData,                          /* i  : ISM metadata handle                     */
-    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,       /* i/o: combined orientaton data handle         */
-    const int16_t ism_md_subframe_update,
-    float *output[],                                            /* i/o: SCE channels / Binaural synthesis       */
-    const int16_t output_frame,                                 /* i  : output frame length                     */
-    const int16_t num_subframes                                 /* i  : number of subframes to render           */
-);
-
-ivas_error ivas_td_binaural_renderer_ext(
-    const TDREND_WRAPPER *pTDRend,                              /* i  : TD Renderer wrapper structure           */
-    const AUDIO_CONFIG inConfig,                                /* i  : Input audio configuration               */
-    const LSSETUP_CUSTOM_STRUCT *customLsInput,                 /* i  : Input custom loudspeaker layout         */
-    const COMBINED_ORIENTATION_HANDLE *hCombinedOrientationData,/* i  : Combined head and external orientations */
-    const IVAS_ISM_METADATA *currentPos,                        /* i  : Object position                         */
-    const REVERB_HANDLE hReverb,                                /* i  : Reverberator handle                     */
-    const int16_t ism_md_subframe_update_ext,                   /* i  : Metadata Delay in subframes to sync with audio delay */
-    const int32_t output_Fs,                                    /* i  : output sampling rate                    */
-    const int16_t output_frame,                                 /* i  : output frame length                     */
-    float output[][L_FRAME48k]                                  /* i/o: SCE channels / Binaural synthesis       */
-);
 ivas_error ivas_td_binaural_renderer_ext_fx(
     const TDREND_WRAPPER *pTDRend,                              /* i  : TD Renderer wrapper structure           */
     const AUDIO_CONFIG inConfig,                                /* i  : Input audio configuration               */
@@ -960,24 +658,12 @@ ivas_error ivas_td_binaural_open_unwrap_fx(
     Word16 *SrcInd
 );
 
-ivas_error ivas_td_binaural_open_unwrap(
-    TDREND_HRFILT_FiltSet_t **hHrtfTD,                          /* i/o: HR filter model (from file or NULL)     */
-    const int32_t output_Fs,                                    /* i  : Output sampling rate                    */
-    const int16_t nchan_transport,                              /* i  : Number of channels                      */
-    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format (ISM/MC)                    */
-    const AUDIO_CONFIG transport_config,                        /* i  : Transport configuration                 */
-    const float *directivity,                                   /* i  : Directivity pattern (used for ISM)      */
-    const IVAS_OUTPUT_SETUP hTransSetup,                        /* i  : Loudspeaker layout                      */
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd,         /* o  : TD renderer handle                      */
-    int32_t *binaural_latency_ns                                /* i  : Binauralization delay                   */
-);
-
 ivas_error ivas_td_binaural_open_ext_fx(
     TDREND_WRAPPER *pTDRend,
     const AUDIO_CONFIG inConfig,
     RENDER_CONFIG_DATA *hRendCfg,                               /* i  : Renderer configuration                  */
     LSSETUP_CUSTOM_STRUCT *customLsInput,
-    const int32_t output_Fs,
+    const Word32 output_Fs,
     Word16 *SrcInd,
     Word16 *num_src
 );
@@ -986,17 +672,6 @@ void ivas_td_binaural_close_fx(
     BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd          /* i/o: TD binaural object renderer handle      */
 );
 
-void ivas_td_binaural_close(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd          /* i/o: TD binaural object renderer handle      */
-);
-
-ivas_error TDREND_GetMix(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                        */
-    float *output[],                                            /* i/o: ISM object synth/rendered output in 0,1 */
-    const int16_t subframe_length,                              /* i/o: subframe length                           */
-    const int16_t subframe_idx,                                 /* i  : Subframe index to 5 ms subframe           */
-    const int16_t ism_md_subframe_update                        /* i  : Number of subframes to delay metadata to sync with audio */
-);
 ivas_error TDREND_GetMix_fx(
     BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle                        */
     Word32 *output[],                                   /* i/o: ISM object synth / rendered output in 0,1 */
@@ -1005,13 +680,6 @@ ivas_error TDREND_GetMix_fx(
     const Word16 ism_md_subframe_update               /* i  : Number of subframes to delay ism metadata to sync with audio */
 );
 
-
-ivas_error TDREND_Update_object_positions(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD Renderer handle                      */
-    const int16_t num_src,                                      /* i  : number of sources to render             */
-    const IVAS_FORMAT in_format,                                /* i  : Format of input sources                 */
-    const ISM_METADATA_HANDLE *hIsmMetaData                     /* i  : Input metadata for ISM objects          */
-);
 void BSplineModelEvalDealloc_fx(
     ModelParams_t *model,                                       /* i  : Model parameters                        */
     ModelEval_t *modelEval                                      /* i  : Model evaluation structure              */
@@ -1053,16 +721,7 @@ ivas_error TDREND_MIX_SRC_SetPos_fx(
     const Word16 SrcInd,                              /* i  : Source index        */
     const Word32 *Vec_p                                 /* i  : Position vector     */
 );
-ivas_error TDREND_MIX_SRC_SetPos(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */
-    const int16_t SrcInd,                                       /* i  : Source index                            */
-    const float *Vec_p                                          /* i  : Position vector                         */
-);
-ivas_error TDREND_MIX_SRC_SetDir(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */
-    const int16_t SrcInd,                                       /* i  : Source index                            */
-    const float *Vec_p                                          /* i  : Direction vector                        */
-);
+
 ivas_error TDREND_MIX_SRC_SetDir_fx(
     BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle  */
     const Word16 SrcInd,                               /* i  : Source index        */
@@ -1096,7 +755,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
     Word16 *intp_count,                                /* o  : Interpolation count                       */
     Word16 *filterlength,                              /* o  : Length of filters                         */
     Word16 *itd,                                       /* o  : ITD value                                 */
-    Word16 *Gain,                                      /* o  : Gain value                                */
+    Word32 *Gain,                                      /* o  : Gain value                           Q30   */
     TDREND_SRC_t *Src_p,                               /* i/o: Source pointer                            */
     const Word16 subframe_update_flag);
 
@@ -1112,19 +771,8 @@ void TDREND_SRC_Init_fx(
     TDREND_SRC_t *Src_p,                                        /* i/o: Source to initialize                    */
     const TDREND_PosType_t PosType                              /* i  : Position type specifier                 */
 );
-void TDREND_SRC_Init(
-    TDREND_SRC_t *Src_p,                                        /* i/o: Source to initialize                    */ 
-    const TDREND_PosType_t PosType                              /* i  : Position type specifier                 */
-);
 
 /* ----- Object renderer - vec ----- */
-
-void TDREND_SPATIAL_VecInit(
-    float *Pos_p,                                               /* o  : Output vector                           */
-    const float PosX,                                           /* i  : X value                                 */
-    const float PosY,                                           /* i  : Y value                                 */
-    const float PosZ                                            /* i  : Z value                                 */
-);
 void TDREND_SPATIAL_VecInit_fx(
     Word32 *Pos_p,     /* o  : Output vector                        */
     const Word32 PosX, /* i  : X value                              */
@@ -1140,21 +788,6 @@ void TDREND_SPATIAL_VecNormalize_fx(
     Word32 *VecNorm_p_fx    /* o  : Normalised output vector   Q30  */
 );
 
-void TDREND_SPATIAL_VecNormalize(
-    const float *Vec_p,                                         /* i  : Input vector                            */
-    float *VecNorm_p                                            /* o  : Output vector                           */
-);
-
-void TDREND_SPATIAL_VecMapToNewCoordSystem(
-    const float *Vec_p,                                         /* i  : Input vector                            */
-    const float *TranslVec_p,                                   /* i  : Translation vector                      */
-    const float *DirVec_p,                                      /* i  : Direction vector                        */
-    const float *UpVec_p,                                       /* i  : Up vector                               */
-    const float *RightVec_p,                                    /* i  : Right vector                            */
-    float *MappedVec_p,                                         /* o  : Transformed vector                      */
-    float *LisRelPosAbs                                         /* o  : Transformed vector ignoring orientation */
-);
-
 Word16 TDREND_SPATIAL_EvalOrthonormOrient_fx(
     Word32 *FrontVecON_p_fx,     /* i/o: Normalized front vector  Q30         */
     Word32 *UpVecON_p_fx,        /* i/o: Normalized up vector     Q30         */
@@ -1163,14 +796,6 @@ Word16 TDREND_SPATIAL_EvalOrthonormOrient_fx(
     const Word32 *UpVec_p_fx,    /* i  : Input up vector          orient_q    */
     const Word16 orient_q        /* i  : Input up Q-factor                    */
 );
-/*! r: Flag if the orientation has been updated */
-int16_t TDREND_SPATIAL_EvalOrthonormOrient(
-    float *FrontVecON_p,                                        /* o  : Normalized front vector                 */
-    float *UpVecON_p,                                           /* o  : Normalized up vector                    */
-    float *RightVecON_p,                                        /* o  : Normalized right vector                 */
-    const float *FrontVec_p,                                    /* i  : Input front vector                      */
-    const float *UpVec_p                                        /* i  : Input up vector                         */
-);
 
 /* ----- Object renderer - mix ----- */
 
@@ -1179,11 +804,6 @@ ivas_error TDREND_MIX_AddSrc_fx(
     Word16 *SrcInd,                                            /* o  : Source index                            */
     const TDREND_PosType_t PosType                              /* i  : Position type (absolute/relative)       */
 );
-ivas_error TDREND_MIX_AddSrc(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */
-    int16_t *SrcInd,                                            /* o  : Source index                            */
-    const TDREND_PosType_t PosType                              /* i  : Position type (absolute/relative)       */
-);
 
 ivas_error TDREND_MIX_SetDistAttenModel(
     BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */
@@ -1194,35 +814,15 @@ void TDREND_MIX_Dealloc_fx(
     BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd           /* i/o: TD renderer handle                      */
 );
 
-void TDREND_MIX_Dealloc(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd           /* i/o: TD renderer handle                      */
-);
-
 ivas_error TDREND_MIX_Init_fx(
     BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */
     TDREND_HRFILT_FiltSet_t **hHrtfTD,                          /* i/o: HRTF data (initialized in case of NULL) */
     const TDREND_MixSpatSpec_t *MixSpatSpec_p,                  /* i  : Mixer spatial specification             */
     const Word32 output_Fs                                     /* i  : Output sampling rate                    */
 );
-ivas_error TDREND_MIX_Init(
-    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */
-    TDREND_HRFILT_FiltSet_t **hHrtfTD,                          /* i/o: HRTF data (initialized in case of NULL) */
-    const TDREND_MixSpatSpec_t *MixSpatSpec_p,                  /* i  : Mixer spatial specification             */
-    const int32_t output_Fs                                     /* i  : Output sampling rate                    */
-);
 
  /* ----- Object renderer - sfx ----- */
 
-void TDREND_Apply_ITD(
-    float *input,                                               /* i  : Input SCE subframe to be time adjusted  */
-    float *out_left,                                            /* o  : Output left channels with ITD applied   */
-    float *out_right,                                           /* o  : Output right channels with ITD applied  */
-    int16_t *previtd,                                           /* i/o: Previous ITD value                      */
-    const int16_t itd,                                          /* i  : Current subframe ITD value              */
-    float *mem_itd,                                             /* i/o: ITD buffer memory                       */
-    const int16_t length                                        /* i  : Subframe length                         */
-);
-
 void TDREND_Apply_ITD_fx(
     Word32 *input_fx,        /* i  : Input subframe to be time adjusted    Qx */
     Word32 *out_left_fx,     /* o  : Output left channel with ITD applied  Qx */
@@ -1242,8 +842,8 @@ void TDREND_firfilt_fx(
     Word32 *mem_fx,                 /* i/o: filter memory                    Qx */
     const Word16 subframe_length,   /* i  : Length of signal                    */
     const Word16 filterlength,      /* i  : Filter length                       */
-    const Word16 Gain_fx,           /* i  : Gain                            Q14 */
-    const Word16 prevGain_fx        /* i  : Previous gain                   Q14 */
+    const Word32 Gain_fx,           /* i  : Gain                            Q30 */
+    const Word32 prevGain_fx        /* i  : Previous gain                   Q30 */
 );
 
 
@@ -1315,10 +915,10 @@ ivas_error ivas_binaural_reverb_open_fastconv_fx(
 
 ivas_error ivas_binaural_reverb_open_parambin(
     REVERB_STRUCT_HANDLE *hReverbPr,                            /* i/o: binaural reverb handle                  */
-    const int16_t numBins,                                      /* i  : number of CLDFB bins Q0                    */
-    const int16_t numCldfbSlotsPerFrame,                        /* i  : number of CLDFB slots per frame Q0         */
+    const Word16 numBins,                                      /* i  : number of CLDFB bins Q0                    */
+    const Word16 numCldfbSlotsPerFrame,                        /* i  : number of CLDFB slots per frame Q0         */
     IVAS_ROOM_ACOUSTICS_CONFIG_DATA *roomAcoustics,             /* i/o: room acoustics parameters               */
-    const int32_t sampling_rate,                                /* i  : sampling rate Q0                           */
+    const Word32 sampling_rate,                                /* i  : sampling rate Q0                           */
     const HRTFS_PARAMBIN_HANDLE hHrtfParambin                   /* i  : Parametric binauralizer HRTF handle     */
 );
 
@@ -1329,16 +929,6 @@ void ivas_binaural_reverb_close(
     REVERB_STRUCT_HANDLE *hReverb                               /* i/o: binaural reverb handle                  */
 );
 
-void ivas_binaural_reverb_processSubframe(
-    REVERB_STRUCT_HANDLE hReverb,                                     /* i/o: binaural reverb handle            */
-    const int16_t numInChannels,                                      /* i  : num input channels to be processed*/
-    const int16_t numSlots,                                           /* i  : number of slots to be processed   */
-    float inReal[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],  /* i  : input CLDFB data real             */
-    float inImag[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],  /* i  : input CLDFB data imag             */
-    float outReal[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o  : output CLDFB data real            */
-    float outImag[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]  /* o  : output CLDFB data imag            */
-);
-
 void ivas_binaural_reverb_processSubframe_fx(
     REVERB_STRUCT_HANDLE hReverb,                                     /* i/o: binaural reverb handle      */
     const Word16 numInChannels,                                      /* i  : num inputs to be processed  */
@@ -1369,14 +959,7 @@ ivas_error ivas_reverb_process_fx(
     Word32 *pcm_out[],                      /* o  : the PCM audio with reverb applied  */
     const Word16 i_ts                     /* i  : (Q0) subframe index                     */
 );
-ivas_error ivas_reverb_process(
-    const REVERB_HANDLE hReverb,                                /* i  : Reverberator handle                     */
-    const AUDIO_CONFIG input_audio_config,                      /* i  : reverb. input audio configuration       */
-    const int16_t mix_signals,                                  /* i  : add reverb to output signal             */
-    float *pcm_in[],                                            /* i  : the PCM audio to apply reverb on        */
-    float *pcm_out[],                                           /* o  : the PCM audio with reverb applied       */
-    const int16_t i_ts                                          /* i  : subframe index                          */
-);
+
 void ivas_rev_delay_line_init( 
     ivas_rev_delay_line_t *pDelay, /* o  : the delay line to initialize                     */
     Word32 *memory_buffer,         /* i  : the memory buffer to use for the delay line  Q11 */
@@ -1406,7 +989,7 @@ void ivas_rev_delay_line_feed_sample_blk_fx(
 );
 void ivas_reverb_iir_filt_init( 
     ivas_rev_iir_filter_t *iirFilter,                           /* o  : IIR filter                              */
-    const uint16_t maxTaps                                      /* i  : maximum number of filter taps           */
+    const UWord16 maxTaps                                      /* i  : maximum number of filter taps           */
 );
 
 
@@ -1465,17 +1048,6 @@ void ivas_reverb_fft_filter_CrossMix_fx(
     const Word16 fft_size 
 );
 
-void ivas_reverb_fft_filter_CrossMix( 
-    float *buffer0, 
-    float *buffer1, 
-    const int16_t fft_size 
-);
-
-void ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( 
-    rv_fftwf_type_complex *spectrum, 
-    float *fft_real, 
-    const int16_t fft_size 
-);
 void ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR_fx(
     rv_fftwf_type_complex_fx *spectrum, // i: Qx
     Word32 *fft_real,                   // o: Qx
@@ -1616,47 +1188,21 @@ void ivas_headTrack_close_fx(
     HEAD_TRACK_DATA_HANDLE *hHeadTrackData                      /* i/o: head track handle                                       */
 );
 
-void Euler2Quat(
-    const float yaw,                                            /* i  : yaw   (x)                           */
-    const float pitch,                                          /* i  : pitch (y)                           */
-    const float roll,                                           /* i  : roll  (z)                           */
-    IVAS_QUATERNION *quat                                       /* o  : quaternion describing the rotation  */
-);
 void Euler2Quat_fx(
   const Word32 yaw,     /* i  : yaw   (x) Q22                      */
   const Word32 pitch,   /* i  : pitch (y) Q22                      */
   const Word32 roll,    /* i  : roll  (z) Q22                      */
   IVAS_QUATERNION *quat /* o  : quaternion describing the rotation  */
 );
-float deg2rad( 
-    float degrees 
-);
 
 Word32 deg2rad_fx( 
     Word32 degrees 
 );
 
-float rad2deg( 
-    float radians 
-);
 Word32 rad2deg_fx( 
     Word32 radians 
 );
 
-void QuatToRotMat(
-    const IVAS_QUATERNION quat,                                 /* i  : quaternion describing the rotation              */
-    float Rmat[3][3]                                            /* o  : real-space rotation matrix for this rotation    */
-);
-
-
-void rotateAziEle(
-    float azi_in,                                               /* i  : output elevation                                */
-    float ele_in,                                               /* i  : input elevation                                 */
-    int16_t *azi,                                               /* o  : rotated azimuth                                 */
-    int16_t *ele,                                               /* o  : rotated elevation                               */
-    float Rmat[3][3],                                           /* i  : real-space rotation matrix                      */
-    const int16_t isPlanar                                      /* i  : is roation planar and elevation meaningless?    */
-);
 void rotateAziEle_fx(
     Word16 azi_in,                                               /* i  : output elevation                                */
     Word16 ele_in,                                               /* i  : input elevation                                 */
@@ -1730,21 +1276,21 @@ void rotateFrame_sd_cldfb_fixed(
     Word32 Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part   */
     const IVAS_OUTPUT_SETUP_HANDLE hOutputSetup,                                  /* i  : output format setup number of channels                   */
     const EFAP_HANDLE hEFAPdata,                                                  /* i  : EFAP structure                                           */
-    const int16_t numTimeSlots,                                                   /* i  : number of time slots to process */
-    const int16_t nb_band                                                         /* i  : number of CLDFB bands to process                         */
+    const Word16 numTimeSlots,                                                   /* i  : number of time slots to process */
+    const Word16 nb_band                                                         /* i  : number of CLDFB bands to process                         */
 );
 
 ivas_error ivas_external_orientation_open(
     EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData,                             /* o  : external orientation handle                              */
-    const int16_t num_subframes                                                   /* i  : number of subframes                                      */
+    const Word16 num_subframes                                                   /* i  : number of subframes                                      */
 );
 void ivas_external_orientation_close_fx(
     EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData                              /* i/o: external orientation handle                              */
 );
 ivas_error ivas_combined_orientation_open(
     COMBINED_ORIENTATION_HANDLE *hCombinedOrientationData,      /* o  : combined orientation handle                     */
-    const int32_t fs,                                           /* i  : sampling rate                                   */
-    const int16_t num_subframes                                 /* i  : number of subframes                             */
+    const Word32 fs,                                           /* i  : sampling rate                                   */
+    const Word16 num_subframes                                 /* i  : number of subframes                             */
 );
 void ivas_combined_orientation_close_fx(
     COMBINED_ORIENTATION_HANDLE *hCombinedOrientationData                         /* i/o: combined orientation handle                              */
@@ -1804,34 +1350,6 @@ void QuaternionSlerp_fx(
  * Orientation tracking
  *----------------------------------------------------------------------------------*/
 
-ivas_error ivas_orient_trk_Init(
-    ivas_orient_trk_state_t *pOTR                               /* i/o: orientation tracker handle              */
-);
-
-ivas_error ivas_orient_trk_SetTrackingType(
-    ivas_orient_trk_state_t *pOTR,                              /* i/o: orientation tracker handle              */
-    const IVAS_HEAD_ORIENT_TRK_T orientation_tracking           /* i  : orientation tracking type               */
-);
-
-ivas_error ivas_orient_trk_SetReferenceRotation(
-    ivas_orient_trk_state_t *pOTR,                              /* i/o: orientatoin trakcer handle              */
-    const IVAS_QUATERNION refRot                                /* i  : reference rotation                      */
-);
-
-
-ivas_error ivas_orient_trk_GetTrackedRotation(
-    ivas_orient_trk_state_t *pOTR,                              /* i/o: orientation tracker handle              */
-    IVAS_QUATERNION *pRotation                                  /* i/o: processed rotation                      */
-);
-
-ivas_error ivas_orient_trk_Process(
-    ivas_orient_trk_state_t *pOTR,                              /* i/o: orientation tracker handle              */
-    IVAS_QUATERNION absRot,                                     /* i  : absolute head rotation                  */
-    float updateRate,                                           /* i  : rotation update rate [Hz]               */
-    IVAS_QUATERNION *pTrkRot                                    /* o  : tracked rotation                        */
-);
-
-
 ivas_error ivas_orient_trk_Init_fx(
   ivas_orient_trk_state_t *pOTR                               /* i/o: orientation tracker handle              */
 );
@@ -1876,7 +1394,7 @@ ivas_error ivas_orient_trk_Process_fx(
 ivas_error ivas_mcmasa_ana_open(
     MCMASA_ANA_HANDLE *hMcMasaPtr,                              /* i/o: McMASA data handle pointer              */
     const AUDIO_CONFIG inConfig,                                /* i  : Input config                            */
-    int32_t input_Fs                                            /* i  : Sampling frequency                      */
+    Word32 input_Fs                                            /* i  : Sampling frequency                      */
 );
 void ivas_mcmasa_ana_fx(
     MCMASA_ANA_HANDLE hMcMasa,     /* i/o: McMASA encoder handle           */
@@ -1897,14 +1415,6 @@ ivas_error ivas_omasa_ana_open(
     UWord16 total_num_objects                                  /* i  : Number of objects                       */
 );
 
-void ivas_omasa_ana(
-    OMASA_ANA_HANDLE hOMasa,                                    /* i/o: OMASA analysis handle                   */
-    float data_in_f[][L_FRAME48k],                              /* i/o: Input / transport audio signals         */
-    const int16_t input_frame,                                  /* i  : Input frame size                        */
-    const int16_t nchan_transport,                              /* i  : Number of transport channels            */
-    const int16_t nchan_ism                                     /* i  : Number of objects for parameter analysis*/
-);
-
 void ivas_omasa_ana_fx(
     OMASA_ANA_HANDLE hOMasa,                                    /* i/o: OMASA analysis handle                   */
     Word32 data_in_f_fx[][L_FRAME48k],                              /* i/o: Input / transport audio signals         */
@@ -1924,13 +1434,7 @@ void computeIntensityVector_ana_fx(
     const Word16 num_frequency_bands,                           /* i  : Number of frequency bands                   */
     Word32 intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]   /* o  : Intensity vector             2 * Qx -31   */
 );
-void computeIntensityVector_ana(
-    const int16_t *band_grouping,                                /* i  : Band grouping for estimation    */
-    float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
-    float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */
-    const int16_t num_frequency_bands,                           /* i  : Number of frequency bands       */
-    float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]   /* o  : Intensity vector                */
-);
+
 void computeReferencePower_ana_fx(
     const Word16 *band_grouping,                                /* i  : Band grouping for estimation                 */
     Word32 Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal         input_q  */
@@ -1938,13 +1442,6 @@ void computeReferencePower_ana_fx(
     Word32 *reference_power,                                      /* o  : Estimated power                            */
     const Word16 num_freq_bands                                 /* i  : Number of frequency bands   2 * input_q - 31 */
 );
-void computeReferencePower_ana(
-    const int16_t *band_grouping,                                /* i  : Band grouping for estimation    */
-    float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
-    float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */
-    float *reference_power,                                      /* o  : Estimated power                 */
-    const int16_t num_freq_bands                                 /* i  : Number of frequency bands       */
-);
 
 void ivas_create_masa_out_meta_fx(
     MASA_DECODER_EXT_OUT_META_HANDLE extOutMeta,                                    /* i/o: MASA metadata handle               */
@@ -1960,17 +1457,6 @@ void ivas_create_masa_out_meta_fx(
     Word16 surroundingCoherence_q
     );
 
-void ivas_create_masa_out_meta(
-    MASA_DECODER_EXT_OUT_META_HANDLE extOutMeta,                                   /* i/o: MASA metadata handle            */
-    SPHERICAL_GRID_DATA *Sph_Grid16,                                               /* i  : Spherical grid                  */
-    const int16_t nchan_transport,                                                 /* i  : Number of transport channels    */
-    float elevation_m_values[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],   /* i  : Estimated elevation             */
-    float azimuth_m_values[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],     /* i  : Estimated azimuth               */
-    float energyRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],          /* i  : Estimated direct-to-total ratio */
-    float spreadCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],      /* i  : Estimated spread coherence      */
-    float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]  /* i  : Estimated surround coherence    */
-);
-
 ivas_error ivas_dirac_ana_open_fx(
     DIRAC_ANA_HANDLE *hDirACPtr,                                /* i/o: DIRAC data handle pointer               */
     Word32 input_Fs
@@ -1999,11 +1485,6 @@ void ivas_prerend_merge_masa_metadata_fx(
     Word16 *inEne2_e                                                     /* i  : TF-energy of input 2 Exponent                                               */
 );
 
-void copy_masa_descriptive_meta(
-    MASA_DECRIPTIVE_META *outMeta,                              /* o  : metadata to be written                  */
-    MASA_DECRIPTIVE_META *inMeta                                /* i  : input metadata                          */
-);
-
 ivas_error masaPrerendOpen_fx(
     MASA_PREREND_HANDLE *hMasaPrerendPtr,                       /* o  : handle to the opened prerenderer        */
     Word16 numTransports,                                      /* i  : number of transport channels            */
diff --git a/lib_rend/ivas_reflections.c b/lib_rend/ivas_reflections_fx.c
similarity index 99%
rename from lib_rend/ivas_reflections.c
rename to lib_rend/ivas_reflections_fx.c
index c5d118858c5cda03a2b3bb9601652565c0694209..310bc77e4cf3c62a6227926dcec3eb5ef55b5ef3 100644
--- a/lib_rend/ivas_reflections.c
+++ b/lib_rend/ivas_reflections_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,16 +33,14 @@
 #include "options.h"
 #include <stdint.h>
 #include <math.h>
-#include "prot.h"
+#include "prot_fx.h"
 #include "rom_dec.h"
 #include "lib_rend.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_rend.h"
 #include "ivas_cnst.h"
-#include "ivas_prot.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "debug.h"
 #include "ivas_rom_com_fx.h"
 
diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config_fx.c
similarity index 98%
rename from lib_rend/ivas_render_config.c
rename to lib_rend/ivas_render_config_fx.c
index d35a6c005af7ac003a58391e44e2e46769a1c5be..056ae1651d98ac3db2c5d519a5a01de150d2cba0 100644
--- a/lib_rend/ivas_render_config.c
+++ b/lib_rend/ivas_render_config_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,12 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_rend.h"
 #include "ivas_rom_TdBinauralRenderer.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 
 /*-----------------------------------------------------------------------*
  * Local constants
diff --git a/lib_rend/ivas_reverb_delay_line.c b/lib_rend/ivas_reverb_delay_line_fx.c
similarity index 98%
rename from lib_rend/ivas_reverb_delay_line.c
rename to lib_rend/ivas_reverb_delay_line_fx.c
index c8db27955f0547d8d7e5b3fa5f96f72c4484889f..d2a6a0c44e2c825c0e31dfb09dca6aeb337d502c 100644
--- a/lib_rend/ivas_reverb_delay_line.c
+++ b/lib_rend/ivas_reverb_delay_line_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,11 +32,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
-#include "prot.h"
-#include "wmc_auto.h"
+#include "ivas_prot_rend_fx.h"
 #include "prot_fx.h"
+#include "wmc_auto.h"
 #include "debug.h"
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_rev_delay_line_init()
diff --git a/lib_rend/ivas_reverb_fft_filter.c b/lib_rend/ivas_reverb_fft_filter_fx.c
similarity index 99%
rename from lib_rend/ivas_reverb_fft_filter.c
rename to lib_rend/ivas_reverb_fft_filter_fx.c
index 79cb544b214774e0972b61f0d282518497d456b4..bbe077f8bacdb8d40e1e1cba411dc34bf727a88f 100644
--- a/lib_rend/ivas_reverb_fft_filter.c
+++ b/lib_rend/ivas_reverb_fft_filter_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,11 +32,10 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include <math.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "debug.h"
 #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) )
 #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) )
diff --git a/lib_rend/ivas_reverb_filter_design.c b/lib_rend/ivas_reverb_filter_design_fx.c
similarity index 95%
rename from lib_rend/ivas_reverb_filter_design.c
rename to lib_rend/ivas_reverb_filter_design_fx.c
index b1499839c1fee33c5b1fa03c237c4a5301a0a34d..c70e8d6675810ace15423786df165f98e72313d4 100644
--- a/lib_rend/ivas_reverb_filter_design.c
+++ b/lib_rend/ivas_reverb_filter_design_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,9 +32,8 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include <assert.h>
 #include <math.h>
 #include <stdint.h>
@@ -412,7 +411,7 @@ static void response_step_limit_fx(
 
         IF( X[i] )
         {
-            desiredChange = BASOP_Util_Divide3232_Scale_cadence( X[i], X[i - 1], &div_e );
+            desiredChange = BASOP_Util_Divide3232_Scale_newton( X[i], X[i - 1], &div_e );
             desiredChange_q = sub( 31, ( div_e ) );
         }
 
@@ -460,7 +459,7 @@ static void response_step_limit_fx(
 
         IF( X[i] )
         {
-            desiredChange = BASOP_Util_Divide3232_Scale_cadence( X[i], X[i + 1], &div_e );
+            desiredChange = BASOP_Util_Divide3232_Scale_newton( X[i], X[i + 1], &div_e );
             desiredChange_q = sub( 31, ( div_e ) );
         }
         IF( GT_16( desiredChange_q, 30 ) )
@@ -741,11 +740,11 @@ void ivas_reverb_calc_color_levels_fx(
             Word16 temp = 0, result_e = 0;
             move16();
             move16();
-            cos_w = getCosWord16R2( (Word16) abs( L_shl( Mpy_32_32( pFc[freq_idx], fs_inverted ), 3 ) ) );                                                                                                                   // q = 15
+            cos_w = getCosWord16R2( (Word16) L_abs( L_shl( Mpy_32_32( pFc[freq_idx], fs_inverted ), 3 ) ) );                                                                                                                 // q = 15
             H_filter = L_add( L_shr( L_add( L_shr( Mpy_32_32( coefB[0], coefB[0] ), 1 ), L_shr( Mpy_32_32( coefB[1], coefB[1] ), 1 ) ), 2 ), L_shr( Mpy_32_32( coefB[0], Mpy_32_32( coefB[1], L_shl( cos_w, 15 ) ) ), 1 ) ); // q = 28
-            H_filter = BASOP_Util_Divide3232_Scale_cadence( H_filter, L_add( ONE_IN_Q28, L_shr( L_add( L_shr( Mpy_32_32( coefA[1], coefA[1] ), 2 ), Mpy_32_32( coefA[1], L_shl( cos_w, 15 ) ) ), 1 ) ), &temp );
+            H_filter = BASOP_Util_Divide3232_Scale_newton( H_filter, L_add( ONE_IN_Q28, L_shr( L_add( L_shr( Mpy_32_32( coefA[1], coefA[1] ), 2 ), Mpy_32_32( coefA[1], L_shl( cos_w, 15 ) ) ), 1 ) ), &temp );
             H_filter = Sqrt32( H_filter, &temp );
-            T60_est = BASOP_Util_Divide3232_Scale_cadence( L_shl( i_mult( -3, pLoop_delays[loop_idx] ), 2 ), Mpy_32_32( Mpy_32_32( L_add( BASOP_Util_Log2( H_filter ), L_shl( temp, 25 ) ), LOG10_2_Q31 ), L_shl( output_Fs, 8 ) ), &temp ); // conversion of log2 to log10.
+            T60_est = BASOP_Util_Divide3232_Scale_newton( L_shl( i_mult( -3, pLoop_delays[loop_idx] ), 2 ), Mpy_32_32( Mpy_32_32( L_add( BASOP_Util_Log2( H_filter ), L_shl( temp, 25 ) ), LOG10_2_Q31 ), L_shl( output_Fs, 8 ) ), &temp ); // conversion of log2 to log10.
             t60[freq_idx] = BASOP_Util_Add_Mant32Exp( T60_est, temp, t60[freq_idx], t60_e[freq_idx], &result_e );
             move16();
             t60_e[freq_idx] = result_e;
@@ -776,14 +775,14 @@ void ivas_reverb_calc_color_levels_fx(
     {
         Word16 temp, temp1, temp2, temp3 = 0, temp4, temp5;
         move16();
-        Word32 var1 = BASOP_Util_Divide3232_Scale_cadence( (Word32) i_mult( -6, minDelay ), L_shr( Mpy_32_32( t60[freq_idx], L_shl( output_Fs, 11 ) ), sub( 11, t60_e[freq_idx] ) ), &temp );
+        Word32 var1 = BASOP_Util_Divide3232_Scale_newton( (Word32) i_mult( -6, minDelay ), L_shr( Mpy_32_32( t60[freq_idx], L_shl( output_Fs, 11 ) ), sub( 11, t60_e[freq_idx] ) ), &temp );
         var1 = Mpy_32_32( var1, LOG2_10_Q29 ); // e = temp + (31 - 29)
         Word32 A0_square_est = BASOP_util_Pow2( var1, add( temp, 31 - 29 ), &temp );
         Word16 alpha_e;
-        Word32 alpha = BASOP_Util_Divide3232_Scale_cadence( -log__0_001, t60[freq_idx], &alpha_e ); // alpha_e  = 1 + alpha_e + (3 - t60_e[257])
+        Word32 alpha = BASOP_Util_Divide3232_Scale_newton( -log__0_001, t60[freq_idx], &alpha_e ); // alpha_e  = 1 + alpha_e + (3 - t60_e[257])
 
-        Word32 div11 = BASOP_Util_Divide3232_Scale_cadence( A0_square_est, alpha, &temp1 );                                                                                    // e = temp1 + (temp - alpha_e)
-        Word32 div2 = BASOP_Util_Divide3232_Scale_cadence( L_shl( output_Fs, 11 ), L_shr( L_add( Mpy_32_16_1( 1884631649, shl( minDelayDiff, 3 ) ), 14037339 ), 8 ), &temp2 ); // e = temp2, 26.7741 in Q19, 0.8776 in Q31
+        Word32 div11 = BASOP_Util_Divide3232_Scale_newton( A0_square_est, alpha, &temp1 );                                                                                    // e = temp1 + (temp - alpha_e)
+        Word32 div2 = BASOP_Util_Divide3232_Scale_newton( L_shl( output_Fs, 11 ), L_shr( L_add( Mpy_32_16_1( 1884631649, shl( minDelayDiff, 3 ) ), 14037339 ), 8 ), &temp2 ); // e = temp2, 26.7741 in Q19, 0.8776 in Q31
 
         const Word32 revPredNormEnergy = Mpy_32_32( div2, div11 ); // q = (15 - temp2) + (15 - temp1) - 15 + 1
         // L_max
@@ -795,7 +794,7 @@ void ivas_reverb_calc_color_levels_fx(
         L_tmp = W_extract_h( W_shl( W_tmp1, W_shift ) );
         temp4 = sub( 3, W_shift );
         div2 = Sqrt32( L_tmp, &temp4 );
-        pTarget_color_L[freq_idx] = BASOP_Util_Divide3232_Scale_cadence( div2, div1, &temp5 );
+        pTarget_color_L[freq_idx] = BASOP_Util_Divide3232_Scale_newton( div2, div1, &temp5 );
         move32();
         temp5 = add( temp5, sub( temp4, temp3 ) );
         pTarget_color_L_e[freq_idx] = temp5;
@@ -808,7 +807,7 @@ void ivas_reverb_calc_color_levels_fx(
         L_tmp = W_extract_h( W_shl( W_tmp2, W_shift ) );
         temp4 = sub( 3, W_shift );
         div2 = Sqrt32( L_tmp, &temp4 );
-        pTarget_color_R[freq_idx] = BASOP_Util_Divide3232_Scale_cadence( div2, div1, &temp5 );
+        pTarget_color_R[freq_idx] = BASOP_Util_Divide3232_Scale_newton( div2, div1, &temp5 );
         move32();
         temp5 = add( temp5, sub( temp4, temp3 ) );
         pTarget_color_R_e[freq_idx] = temp5;
@@ -826,7 +825,7 @@ void ivas_reverb_calc_color_levels_fx(
     Word32 div1;
     Word16 temp = 0;
     move16();
-    div1 = BASOP_Util_Divide3232_Scale_cadence( L_mult0( 1000, sub( freq_count, 1 ) ), L_shr( output_Fs, 1 ), &temp );
+    div1 = BASOP_Util_Divide3232_Scale_newton( L_mult0( 1000, sub( freq_count, 1 ) ), L_shr( output_Fs, 1 ), &temp );
     div1 = BASOP_Util_Add_Mant32Exp( div1, temp, ONE_IN_Q30, 1, &temp );
     idx_pivot = extract_l( L_shr( div1, sub( 31, temp ) ) );
     /* Perform step limiting */
@@ -1156,9 +1155,9 @@ void ivas_reverb_get_hrtf_set_properties_fx(
             IA_coherence[freq_idx] = L_shl( IA_coherence[freq_idx], sub( 27, sub( 15, temp ) ) ); // q = 27
             move32();
             /* Limiting to (0...1) range in case of small numerical errors or negative values */
-            IA_coherence[freq_idx] = min( IA_coherence[freq_idx], ONE_IN_Q27 ); // Q27
+            IA_coherence[freq_idx] = L_min( IA_coherence[freq_idx], ONE_IN_Q27 ); // Q27
             move32();
-            IA_coherence[freq_idx] = max( IA_coherence[freq_idx], 0 ); // Q27
+            IA_coherence[freq_idx] = L_max( IA_coherence[freq_idx], 0 ); // Q27
             move32();
         }
 
diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb_fx.c
similarity index 97%
rename from lib_rend/ivas_reverb.c
rename to lib_rend/ivas_reverb_fx.c
index c70e325e38649e722522811052c18df7fbb6a9ff..12b94b1a2e306c2b1966dcb7a0d1190c4d5d7909 100644
--- a/lib_rend/ivas_reverb.c
+++ b/lib_rend/ivas_reverb_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,14 +32,13 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "math.h"
 #include "ivas_rom_rend.h"
 #include <assert.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "debug.h"
 #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) )
 #define float_to_fixQ31( n )      ( round( n * 0x7fffffff ) )
@@ -166,13 +165,13 @@ static ivas_error calc_jot_t60_coeffs_fx( Word16 *pH_dB_fx, Word16 pH_dB_exp, co
  *
  *------------------------------------------------------------------------*/
 
-static uint16_t binRend_rand(
+static UWord16 binRend_rand(
     REVERB_STRUCT_HANDLE hReverb /* i/o: binaural reverb handle          */
 )
 {
     hReverb->binRend_RandNext = hReverb->binRend_RandNext * 1103515245 + 12345;
 
-    return (uint16_t) ( hReverb->binRend_RandNext / 65536 ) % 32768;
+    return (UWord16) ( hReverb->binRend_RandNext / 65536 ) % 32768;
 }
 
 
@@ -887,9 +886,9 @@ static ivas_error calc_jot_t60_coeffs_fx(
     Word32 L_tmp;
     Word16 f0_fx, tmp_fx, lf_target_gain_dB_fx, hf_target_gain_dB_fx, mid_crossing_gain_dB_fx;
     Word16 lin_gain_lf_fx, lin_gain_hf_fx, shift, expl, exph;
-    int16_t f_idx, e = pH_dB_exp;
+    Word16 f_idx, e = pH_dB_exp;
     move16();
-    uint16_t n_points_lf, n_points_hf;
+    UWord16 n_points_lf, n_points_hf;
 
     lf_target_gain_dB_fx = 0;
     move16();
@@ -1472,7 +1471,7 @@ ivas_error ivas_reverb_open_fx(
 {
     ivas_error error;
     REVERB_HANDLE pState = NULL;
-    Word16 bin_idx, subframe_len, output_frame, predelay_bf_len, loop_idx;
+    Word16 bin_idx, subframe_len, output_frame, predelay_bf_len, loop_idx, i;
     ivas_reverb_params_t params;
     Word32 pColor_target_l_fx[RV_LENGTH_NR_FC];
     Word32 pColor_target_r_fx[RV_LENGTH_NR_FC];
@@ -1530,9 +1529,7 @@ ivas_error ivas_reverb_open_fx(
     params.pDsr_fx = params.pRt60_fx + nr_fc_fft_filter;
     params.pFc_fx = &pState->fft_filter_color_0.fft_spectrum_fx[0];
     params.pHrtf_inter_aural_coherence_fx = &pState->fft_filter_color_1.fft_spectrum_fx[0];
-#ifdef MSAN_FIX
     set32_fx( pState->fft_filter_color_1.fft_spectrum_fx, 0, RV_FILTER_MAX_FFT_SIZE );
-#endif
     /* Note: these temp buffers can only be used before the final step of the FFT filter design :     */
     /* before calls to ivas_reverb_calc_correl_filters(...) or to ivas_reverb_calc_color_filters(...) */
 
@@ -1560,7 +1557,7 @@ ivas_error ivas_reverb_open_fx(
 
     set_reverb_acoustic_data_fx( &params, input_audio_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );
     Scale_sig32( params.pFc_fx, nr_fc_fft_filter, -2 );
-    FOR( Word16 i = 0; i < nr_fc_fft_filter; i++ )
+    FOR( i = 0; i < nr_fc_fft_filter; i++ )
     {
         params.pRt60_fx[i] = L_abs( params.pRt60_fx[i] );
         move32();
@@ -1602,7 +1599,7 @@ ivas_error ivas_reverb_open_fx(
     Word32 *pT60_filter_coeff = (Word32 *) malloc( ( lenT60_filter_coeff ) * sizeof( Word32 * ) );
 
 
-    FOR( Word16 i = 0; i < nr_fc_fft_filter; i++ )
+    FOR( i = 0; i < nr_fc_fft_filter; i++ )
     {
         params.pDsr_fx[i] = L_shl( params.pDsr_fx[i], params.pDsr_e[i] );
         move32();
@@ -1611,7 +1608,7 @@ ivas_error ivas_reverb_open_fx(
         pHrtf_avg_pwr_response_r_const[i] = L_shl( params.pHrtf_avg_pwr_response_r_const_fx[i], 5 ); /*Q23+5*/
         move32();
     }
-    FOR( Word16 i = 0; i < lenT60_filter_coeff; i++ )
+    FOR( i = 0; i < lenT60_filter_coeff; i++ )
     {
         pT60_filter_coeff[i] = L_shl_sat( params.pT60_filter_coeff_fx[i], 17 );
         move32();
@@ -1648,21 +1645,14 @@ ivas_error ivas_reverb_open_fx(
     IF( pState->do_corr_filter )
     {
         /* Computing correlation filters on the basis of target IA coherence */
-#ifdef MSAN_FIX
-        FOR( int i = 0; i < shl( sub( nr_fc_fft_filter, 1 ), 1 ); i++ )
+        FOR( i = 0; i < shl( sub( nr_fc_fft_filter, 1 ), 1 ); i++ )
         {
             pTime_window_fx[i] = L_shr( pTime_window_fx[i], 1 ); /*Scaling signal down to 30*/
             move32();
         }
-#else
-        FOR( int i = 0; i < RV_FILTER_MAX_FFT_SIZE; i++ )
-        {
-            pTime_window_fx[i] = L_shr( pTime_window_fx[i], 1 ); /*Scaling signal down to 30*/
-        }
-#endif // MSAN_FIX
 
         Word32 *pHrtf_inter_aural_coherence_const = (Word32 *) malloc( nr_fc_fft_filter * sizeof( Word32 ) );
-        FOR( Word16 i = 0; i < nr_fc_fft_filter; i++ )
+        FOR( i = 0; i < nr_fc_fft_filter; i++ )
         {
             pHrtf_inter_aural_coherence_const[i] = L_shl( params.pHrtf_inter_aural_coherence_const_fx[i], 3 ); /*Scaling up to Q30*/
             move32();
@@ -1671,14 +1661,14 @@ ivas_error ivas_reverb_open_fx(
 
         free( pHrtf_inter_aural_coherence_const );
 
-        FOR( Word16 i = 0; i < nr_fc_fft_filter; i++ )
+        FOR( i = 0; i < nr_fc_fft_filter; i++ )
         {
             pFft_wf_filter_ch0_fx[i][0] = L_shl( pFft_wf_filter_ch0_fx[i][0], sub( 31, q_pFft_wf_filter_ch0_fx ) );
             move32();
             pFft_wf_filter_ch0_fx[i][1] = L_shl( pFft_wf_filter_ch0_fx[i][1], sub( 31, q_pFft_wf_filter_ch0_fx ) );
             move32();
         }
-        FOR( Word16 i = 0; i < nr_fc_fft_filter; i++ )
+        FOR( i = 0; i < nr_fc_fft_filter; i++ )
         {
             pFft_wf_filter_ch1_fx[i][0] = L_shl( pFft_wf_filter_ch1_fx[i][0], sub( 31, q_pFft_wf_filter_ch1_fx ) );
             move32();
@@ -1700,14 +1690,14 @@ ivas_error ivas_reverb_open_fx(
     /* Computing coloration filters on the basis of target responses */
 
     ivas_reverb_calc_color_filters_fx( pColor_target_l_fx, pColor_target_r_fx, pTime_window_fx, pState->fft_size, pFft_wf_filter_ch0_fx, pFft_wf_filter_ch1_fx, &q_pFft_wf_filter_ch0_fx, &q_pFft_wf_filter_ch1_fx );
-    FOR( int i = 0; i < nr_fc_fft_filter; i++ )
+    FOR( i = 0; i < nr_fc_fft_filter; i++ )
     {
         pFft_wf_filter_ch0_fx[i][0] = L_shl( pFft_wf_filter_ch0_fx[i][0], sub( 31, q_pFft_wf_filter_ch0_fx ) );
         move32();
         pFft_wf_filter_ch0_fx[i][1] = L_shl( pFft_wf_filter_ch0_fx[i][1], sub( 31, q_pFft_wf_filter_ch0_fx ) );
         move32();
     }
-    FOR( Word16 i = 0; i < nr_fc_fft_filter; i++ )
+    FOR( i = 0; i < nr_fc_fft_filter; i++ )
     {
         pFft_wf_filter_ch1_fx[i][0] = L_shl( pFft_wf_filter_ch1_fx[i][0], sub( 31, q_pFft_wf_filter_ch1_fx ) );
         move32();
@@ -2187,13 +2177,23 @@ void ivas_binaural_reverb_processSubframe_fx(
         {
             IF( s_and( ch, 1 ) )
             {
+#ifdef VEC_ARITH_OPT_v1
+                v_add_fixed_no_hdrm( hReverb->preDelayBufferReal_fx[idx], inReal[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins );
+                v_add_fixed_no_hdrm( hReverb->preDelayBufferImag_fx[idx], inImag[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins );
+#else  /* VEC_ARITH_OPT_v1 */
                 v_add_fixed( hReverb->preDelayBufferReal_fx[idx], inReal[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins, 0 );
                 v_add_fixed( hReverb->preDelayBufferImag_fx[idx], inImag[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
             }
             ELSE
             {
+#ifdef VEC_ARITH_OPT_v1
+                v_sub_fixed_no_hdrm( hReverb->preDelayBufferReal_fx[idx], inImag[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins );
+                v_add_fixed_no_hdrm( hReverb->preDelayBufferImag_fx[idx], inReal[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins );
+#else  /* VEC_ARITH_OPT_v1 */
                 v_sub_fixed( hReverb->preDelayBufferReal_fx[idx], inImag[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins, 0 );
                 v_add_fixed( hReverb->preDelayBufferImag_fx[idx], inReal[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
             }
         }
         idx = add( idx, 1 ) % hReverb->preDelayBufferLength;
@@ -2223,20 +2223,40 @@ void ivas_binaural_reverb_processSubframe_fx(
                 SWITCH( phaseShiftTypePr[tapIdx] )
                 {
                     case 0: /* 0 degrees phase */
+#ifdef VEC_ARITH_OPT_v1
+                        v_add_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+                        v_add_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+#else  /* VEC_ARITH_OPT_v1 */
                         v_add_fixed( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots, 0 );
                         v_add_fixed( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                         BREAK;
                     case 1: /* 90 degrees phase */
+#ifdef VEC_ARITH_OPT_v1
+                        v_sub_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+                        v_add_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+#else  /* VEC_ARITH_OPT_v1 */
                         v_sub_fixed( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots, 0 );
                         v_add_fixed( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                         BREAK;
                     case 2: /* 180 degrees phase */
+#ifdef VEC_ARITH_OPT_v1
+                        v_sub_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+                        v_sub_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+#else  /* VEC_ARITH_OPT_v1 */
                         v_sub_fixed( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots, 0 );
                         v_sub_fixed( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                         BREAK;
                     default: /* 270 degrees phase */
+#ifdef VEC_ARITH_OPT_v1
+                        v_add_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+                        v_sub_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+#else  /* VEC_ARITH_OPT_v1 */
                         v_add_fixed( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots, 0 );
                         v_sub_fixed( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
                         BREAK;
                 }
             }
@@ -2493,7 +2513,7 @@ ivas_error ivas_binaural_reverb_open_parambin(
     const Word16 numBins,                           /* i  : number of CLDFB bins Q0                 */
     const Word16 numCldfbSlotsPerFrame,             /* i  : number of CLDFB slots per frame Q0      */
     IVAS_ROOM_ACOUSTICS_CONFIG_DATA *roomAcoustics, /* i/o: room acoustics parameters            */
-    const int32_t sampling_rate,                    /* i  : sampling rate Q0                         */
+    const Word32 sampling_rate,                     /* i  : sampling rate Q0                         */
     const HRTFS_PARAMBIN_HANDLE hHrtfParambin       /* i  : Parametric binauralizer HRTF handle  */
 )
 {
diff --git a/lib_rend/ivas_reverb_iir_filter.c b/lib_rend/ivas_reverb_iir_filter_fx.c
similarity index 98%
rename from lib_rend/ivas_reverb_iir_filter.c
rename to lib_rend/ivas_reverb_iir_filter_fx.c
index 7049fa580e75628c925b92bd93a4e284c5e3f643..e09ec70055ccf358879a06134430ec4765136b78 100644
--- a/lib_rend/ivas_reverb_iir_filter.c
+++ b/lib_rend/ivas_reverb_iir_filter_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,10 +32,9 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
-#include "wmc_auto.h"
 #include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
+#include "wmc_auto.h"
 #include "debug.h"
 #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) )
 #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) )
diff --git a/lib_rend/ivas_reverb_utils.c b/lib_rend/ivas_reverb_utils_fx.c
similarity index 99%
rename from lib_rend/ivas_reverb_utils.c
rename to lib_rend/ivas_reverb_utils_fx.c
index ddb95aaf024dce45714aac4023eb93d4d7e6f4e4..b3e1e72fa1f947d9930e486943970c422f2097a3 100644
--- a/lib_rend/ivas_reverb_utils.c
+++ b/lib_rend/ivas_reverb_utils_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,12 +32,11 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_rom_rend.h"
 #include <math.h>
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "options_warnings.h"
 
 /*-----------------------------------------------------------------------------------------*
diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.h b/lib_rend/ivas_rom_TdBinauralRenderer.h
index 7cdd84d6d9e566a898c044b5dede466af33d2b74..89d86f112bf712e86e7cf0f64b309464d8c148bc 100644
--- a/lib_rend/ivas_rom_TdBinauralRenderer.h
+++ b/lib_rend/ivas_rom_TdBinauralRenderer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.c b/lib_rend/ivas_rom_TdBinauralRenderer_fx.c
similarity index 99%
rename from lib_rend/ivas_rom_TdBinauralRenderer.c
rename to lib_rend/ivas_rom_TdBinauralRenderer_fx.c
index f6921bc92637232dee3771ef03b49e72be69f668..cee2a9753ba9544860c85e301953e7bf59fcd8db 100644
--- a/lib_rend/ivas_rom_TdBinauralRenderer.c
+++ b/lib_rend/ivas_rom_TdBinauralRenderer_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_rend/ivas_rom_binauralRenderer.h b/lib_rend/ivas_rom_binauralRenderer.h
index 8e7bd4a55458f43ecd99c9f2ba26c3190bbf85c3..4b1428ac8b572025872d6acbb27a371c452f1aec 100644
--- a/lib_rend/ivas_rom_binauralRenderer.h
+++ b/lib_rend/ivas_rom_binauralRenderer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_rend/ivas_rom_binauralRenderer.c b/lib_rend/ivas_rom_binauralRenderer_fx.c
similarity index 99%
rename from lib_rend/ivas_rom_binauralRenderer.c
rename to lib_rend/ivas_rom_binauralRenderer_fx.c
index fa4cbd7aad05b3a786bcd138dbd9881988afad35..e7dbbae70cec37257840afd3173d8aa4a751508f 100644
--- a/lib_rend/ivas_rom_binauralRenderer.c
+++ b/lib_rend/ivas_rom_binauralRenderer_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_rend/ivas_rom_binaural_crend_head.h b/lib_rend/ivas_rom_binaural_crend_head.h
index 0004a05d7b531419b508a426ba3632f28a1aa16e..2b4c3e919fcb39f74d9d8ae84b4a89ea1bf52ecf 100644
--- a/lib_rend/ivas_rom_binaural_crend_head.h
+++ b/lib_rend/ivas_rom_binaural_crend_head.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -56,13 +56,13 @@ extern Word32 CRendBin_Combined_HRIR_latency_s_fx;
 
 /* Sample Rate = 48000 */
 
-extern int16_t CRendBin_Combined_HRIR_max_num_iterations_48kHz;
-extern uint16_t CRendBin_Combined_HRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz;
+extern Word16 CRendBin_Combined_HRIR_max_num_iterations_48kHz;
+extern UWord16 CRendBin_Combined_HRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz;
 extern Word16 CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz_fx[15];
-extern uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_Combined_HRIR_coeff_re_48kHz_fx[15][BINAURAL_CHANNELS][240];
 extern Word32 CRendBin_Combined_HRIR_coeff_im_48kHz_fx[15][BINAURAL_CHANNELS][240];
 extern Word32 *CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS];
@@ -70,13 +70,13 @@ extern Word32 *CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNEL
 
 /* Sample Rate = 32000 */
 
-extern int16_t CRendBin_Combined_HRIR_max_num_iterations_32kHz;
-extern uint16_t CRendBin_Combined_HRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz;
+extern Word16 CRendBin_Combined_HRIR_max_num_iterations_32kHz;
+extern UWord16 CRendBin_Combined_HRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz;
 extern Word16 CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz_fx[15];
-extern uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_Combined_HRIR_coeff_re_32kHz_fx[15][BINAURAL_CHANNELS][160];
 extern Word32 CRendBin_Combined_HRIR_coeff_im_32kHz_fx[15][BINAURAL_CHANNELS][160];
 extern Word32 *CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS];
@@ -84,13 +84,13 @@ extern Word32 *CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNEL
 
 /* Sample Rate = 16000 */
 
-extern int16_t CRendBin_Combined_HRIR_max_num_iterations_16kHz;
-extern uint16_t CRendBin_Combined_HRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz;
+extern Word16 CRendBin_Combined_HRIR_max_num_iterations_16kHz;
+extern UWord16 CRendBin_Combined_HRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz;
 extern Word16 CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz_fx[15];
-extern uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_Combined_HRIR_coeff_re_16kHz_fx[15][BINAURAL_CHANNELS][80];
 extern Word32 CRendBin_Combined_HRIR_coeff_im_16kHz_fx[15][BINAURAL_CHANNELS][80];
 extern Word32 *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS];
@@ -105,13 +105,13 @@ extern Word32 CRendBin_FOA_HRIR_latency_s_fx;
 
 /* Sample Rate = 48000 */
 
-extern int16_t CRendBin_FOA_HRIR_max_num_iterations_48kHz;
-extern uint16_t CRendBin_FOA_HRIR_num_iterations_48kHz[4][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[4][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz;
+extern Word16 CRendBin_FOA_HRIR_max_num_iterations_48kHz;
+extern UWord16 CRendBin_FOA_HRIR_num_iterations_48kHz[4][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[4][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz;
 extern Word16 CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz_fx[4];
-extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_FOA_HRIR_coeff_re_48kHz_fx[4][BINAURAL_CHANNELS][240];
 extern Word32 CRendBin_FOA_HRIR_coeff_im_48kHz_fx[4][BINAURAL_CHANNELS][240];
 extern Word32 *CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS];
@@ -119,13 +119,13 @@ extern Word32 *CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS];
 
 /* Sample Rate = 32000 */
 
-extern int16_t CRendBin_FOA_HRIR_max_num_iterations_32kHz;
-extern uint16_t CRendBin_FOA_HRIR_num_iterations_32kHz[4][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[4][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz;
+extern Word16 CRendBin_FOA_HRIR_max_num_iterations_32kHz;
+extern UWord16 CRendBin_FOA_HRIR_num_iterations_32kHz[4][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[4][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz;
 extern Word16 CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz_fx[4];
-extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_FOA_HRIR_coeff_re_32kHz_fx[4][BINAURAL_CHANNELS][160];
 extern Word32 CRendBin_FOA_HRIR_coeff_im_32kHz_fx[4][BINAURAL_CHANNELS][160];
 extern Word32 *CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS];
@@ -133,13 +133,13 @@ extern Word32 *CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS];
 
 /* Sample Rate = 16000 */
 
-extern int16_t CRendBin_FOA_HRIR_max_num_iterations_16kHz;
-extern uint16_t CRendBin_FOA_HRIR_num_iterations_16kHz[4][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[4][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz;
+extern Word16 CRendBin_FOA_HRIR_max_num_iterations_16kHz;
+extern UWord16 CRendBin_FOA_HRIR_num_iterations_16kHz[4][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[4][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz;
 extern Word16 CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz_fx[4];
-extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_FOA_HRIR_coeff_re_16kHz_fx[4][BINAURAL_CHANNELS][80];
 extern Word32 CRendBin_FOA_HRIR_coeff_im_16kHz_fx[4][BINAURAL_CHANNELS][80];
 extern Word32 *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS];
@@ -153,13 +153,13 @@ extern Word32 CRendBin_HOA2_HRIR_latency_s_fx;
 
 /* Sample Rate = 48000 */
 
-extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_48kHz;
-extern uint16_t CRendBin_HOA2_HRIR_num_iterations_48kHz[9][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[9][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz;
+extern Word16 CRendBin_HOA2_HRIR_max_num_iterations_48kHz;
+extern UWord16 CRendBin_HOA2_HRIR_num_iterations_48kHz[9][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[9][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz;
 extern Word16 CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz_fx[9];
-extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_HOA2_HRIR_coeff_re_48kHz_fx[9][BINAURAL_CHANNELS][240];
 extern Word32 CRendBin_HOA2_HRIR_coeff_im_48kHz_fx[9][BINAURAL_CHANNELS][240];
 extern Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS];
@@ -167,13 +167,13 @@ extern Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS];
 
 /* Sample Rate = 32000 */
 
-extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_32kHz;
-extern uint16_t CRendBin_HOA2_HRIR_num_iterations_32kHz[9][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[9][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz;
+extern Word16 CRendBin_HOA2_HRIR_max_num_iterations_32kHz;
+extern UWord16 CRendBin_HOA2_HRIR_num_iterations_32kHz[9][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[9][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz;
 extern Word16 CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz_fx[9];
-extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_HOA2_HRIR_coeff_re_32kHz_fx[9][BINAURAL_CHANNELS][160];
 extern Word32 CRendBin_HOA2_HRIR_coeff_im_32kHz_fx[9][BINAURAL_CHANNELS][160];
 extern Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS];
@@ -181,13 +181,13 @@ extern Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS];
 
 /* Sample Rate = 16000 */
 
-extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_16kHz;
-extern uint16_t CRendBin_HOA2_HRIR_num_iterations_16kHz[9][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[9][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz;
+extern Word16 CRendBin_HOA2_HRIR_max_num_iterations_16kHz;
+extern UWord16 CRendBin_HOA2_HRIR_num_iterations_16kHz[9][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[9][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz;
 extern Word16 CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz_fx[9];
-extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_HOA2_HRIR_coeff_re_16kHz_fx[9][BINAURAL_CHANNELS][80];
 extern Word32 CRendBin_HOA2_HRIR_coeff_im_16kHz_fx[9][BINAURAL_CHANNELS][80];
 extern Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS];
@@ -200,13 +200,13 @@ extern Word32 CRendBin_HOA3_HRIR_latency_s_fx;
 
 /* Sample Rate = 48000 */
 
-extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_48kHz;
-extern uint16_t CRendBin_HOA3_HRIR_num_iterations_48kHz[16][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[16][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz;
+extern Word16 CRendBin_HOA3_HRIR_max_num_iterations_48kHz;
+extern UWord16 CRendBin_HOA3_HRIR_num_iterations_48kHz[16][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[16][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz;
 extern Word16 CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz_fx[16];
-extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_HOA3_HRIR_coeff_re_48kHz_fx[16][BINAURAL_CHANNELS][240];
 extern Word32 CRendBin_HOA3_HRIR_coeff_im_48kHz_fx[16][BINAURAL_CHANNELS][240];
 extern Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS];
@@ -214,13 +214,13 @@ extern Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS];
 
 /* Sample Rate = 32000 */
 
-extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_32kHz;
-extern uint16_t CRendBin_HOA3_HRIR_num_iterations_32kHz[16][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[16][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz;
+extern Word16 CRendBin_HOA3_HRIR_max_num_iterations_32kHz;
+extern UWord16 CRendBin_HOA3_HRIR_num_iterations_32kHz[16][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[16][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz;
 extern Word16 CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz_fx[16];
-extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_HOA3_HRIR_coeff_re_32kHz_fx[16][BINAURAL_CHANNELS][160];
 extern Word32 CRendBin_HOA3_HRIR_coeff_im_32kHz_fx[16][BINAURAL_CHANNELS][160];
 extern Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS];
@@ -228,13 +228,13 @@ extern Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS];
 
 /* Sample Rate = 16000 */
 
-extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_16kHz;
-extern uint16_t CRendBin_HOA3_HRIR_num_iterations_16kHz[16][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[16][BINAURAL_CHANNELS][1];
-extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz;
+extern Word16 CRendBin_HOA3_HRIR_max_num_iterations_16kHz;
+extern UWord16 CRendBin_HOA3_HRIR_num_iterations_16kHz[16][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[16][BINAURAL_CHANNELS][1];
+extern UWord16 CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz;
 extern Word16 CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz_fx[16];
-extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];
 extern Word32 CRendBin_HOA3_HRIR_coeff_re_16kHz_fx[16][BINAURAL_CHANNELS][80];
 extern Word32 CRendBin_HOA3_HRIR_coeff_im_16kHz_fx[16][BINAURAL_CHANNELS][80];
 extern Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS];
@@ -248,13 +248,13 @@ extern Word32 CRendBin_Combined_BRIR_latency_s_fx;
 
 /* Sample Rate = 48000 */
 
-extern int16_t CRendBin_Combined_BRIR_max_num_iterations_48kHz;
-extern uint16_t CRendBin_Combined_BRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][22];
-extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz;
+extern Word16 CRendBin_Combined_BRIR_max_num_iterations_48kHz;
+extern UWord16 CRendBin_Combined_BRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][22];
+extern UWord16 CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz;
 extern Word16 CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz_fx[15];
-extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS][40];
+extern UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS][40];
 extern Word32 CRendBin_Combined_BRIR_coeff_re_48kHz_fx[15][BINAURAL_CHANNELS][2955];
 extern Word32 CRendBin_Combined_BRIR_coeff_im_48kHz_fx[15][BINAURAL_CHANNELS][2955];
 extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS][2885];
@@ -262,13 +262,13 @@ extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS
 
 /* Sample Rate = 32000 */
 
-extern int16_t CRendBin_Combined_BRIR_max_num_iterations_32kHz;
-extern uint16_t CRendBin_Combined_BRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][22];
-extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz;
+extern Word16 CRendBin_Combined_BRIR_max_num_iterations_32kHz;
+extern UWord16 CRendBin_Combined_BRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][22];
+extern UWord16 CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz;
 extern Word16 CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz_fx[15];
-extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40];
+extern UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40];
 extern Word32 CRendBin_Combined_BRIR_coeff_re_32kHz_fx[15][BINAURAL_CHANNELS][2819];
 extern Word32 CRendBin_Combined_BRIR_coeff_im_32kHz_fx[15][BINAURAL_CHANNELS][2819];
 extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS][2870];
@@ -276,13 +276,13 @@ extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS
 
 /* Sample Rate = 16000 */
 
-extern int16_t CRendBin_Combined_BRIR_max_num_iterations_16kHz;
-extern uint16_t CRendBin_Combined_BRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
-extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][23];
-extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;
+extern Word16 CRendBin_Combined_BRIR_max_num_iterations_16kHz;
+extern UWord16 CRendBin_Combined_BRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];
+extern UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][23];
+extern UWord16 CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;
 extern Word16 CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz_fx[15];
-extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40];
+extern UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40];
 extern Word32 CRendBin_Combined_BRIR_coeff_re_16kHz_fx[15][BINAURAL_CHANNELS][1774];
 extern Word32 CRendBin_Combined_BRIR_coeff_im_16kHz_fx[15][BINAURAL_CHANNELS][1774];
 extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS][2522];
diff --git a/lib_rend/ivas_rom_binaural_crend_head.c b/lib_rend/ivas_rom_binaural_crend_head_fx.c
similarity index 99%
rename from lib_rend/ivas_rom_binaural_crend_head.c
rename to lib_rend/ivas_rom_binaural_crend_head_fx.c
index 60925a31fa9b898a5595cd853669cd0307ccbae5..be015058b11ea110a13953c52676ad6ac5cdc9b3 100644
--- a/lib_rend/ivas_rom_binaural_crend_head.c
+++ b/lib_rend/ivas_rom_binaural_crend_head_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -56,35 +56,35 @@
 const Word32 CRendBin_Combined_HRIR_latency_s_fx = 44741;/*Q-31*/
 /* Sample Rate = 48000 */
 
-const int16_t CRendBin_Combined_HRIR_max_num_iterations_48kHz = 1;
-const uint16_t CRendBin_Combined_HRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
-const uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz = 0;
+const Word16 CRendBin_Combined_HRIR_max_num_iterations_48kHz = 1;
+const UWord16 CRendBin_Combined_HRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
+const UWord16 CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz = 0;
 const Word16 CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz_fx[15]={0, 0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,};
-const uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 32000 */
 
-const int16_t CRendBin_Combined_HRIR_max_num_iterations_32kHz = 1;
-const uint16_t CRendBin_Combined_HRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
-const uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz = 0;
+const Word16 CRendBin_Combined_HRIR_max_num_iterations_32kHz = 1;
+const UWord16 CRendBin_Combined_HRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
+const UWord16 CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz = 0;
 const Word16 CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz_fx[15]={0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,};
-const uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 16000 */
 
-const int16_t CRendBin_Combined_HRIR_max_num_iterations_16kHz = 1;
-const uint16_t CRendBin_Combined_HRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
-const uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz = 0;
+const Word16 CRendBin_Combined_HRIR_max_num_iterations_16kHz = 1;
+const UWord16 CRendBin_Combined_HRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
+const UWord16 CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz = 0;
 const Word16 CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz_fx[15]={0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,};
-const uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 
@@ -96,35 +96,35 @@ const Word32 CRendBin_FOA_HRIR_latency_s_fx = 44741;  // Q31
 
 /* Sample Rate = 48000 */
 
-const int16_t CRendBin_FOA_HRIR_max_num_iterations_48kHz = 1;
-const uint16_t CRendBin_FOA_HRIR_num_iterations_48kHz[4][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[4][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
-const uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz = 0;
+const Word16 CRendBin_FOA_HRIR_max_num_iterations_48kHz = 1;
+const UWord16 CRendBin_FOA_HRIR_num_iterations_48kHz[4][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[4][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
+const UWord16 CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz = 0;
 const Word16 CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz_fx[4]={0, 0, 0,	0};
-const uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 32000 */
 
-const int16_t CRendBin_FOA_HRIR_max_num_iterations_32kHz = 1;
-const uint16_t CRendBin_FOA_HRIR_num_iterations_32kHz[4][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[4][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
-const uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz = 0;
+const Word16 CRendBin_FOA_HRIR_max_num_iterations_32kHz = 1;
+const UWord16 CRendBin_FOA_HRIR_num_iterations_32kHz[4][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[4][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
+const UWord16 CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz = 0;
 const Word16 CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz_fx[4]={0, 0, 0,	0};
-const uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 16000 */
 
-const int16_t CRendBin_FOA_HRIR_max_num_iterations_16kHz = 1;
-const uint16_t CRendBin_FOA_HRIR_num_iterations_16kHz[4][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[4][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
-const uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz = 0;
+const Word16 CRendBin_FOA_HRIR_max_num_iterations_16kHz = 1;
+const UWord16 CRendBin_FOA_HRIR_num_iterations_16kHz[4][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[4][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
+const UWord16 CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz = 0;
 const Word16 CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz_fx[4]={0, 0, 0,	0};
-const uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 
@@ -135,35 +135,35 @@ const Word32 CRendBin_HOA2_HRIR_latency_s_fx = 44741; // Q31
 
 /* Sample Rate = 48000 */
 
-const int16_t CRendBin_HOA2_HRIR_max_num_iterations_48kHz = 1;
-const uint16_t CRendBin_HOA2_HRIR_num_iterations_48kHz[9][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[9][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
-const uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz = 0;
+const Word16 CRendBin_HOA2_HRIR_max_num_iterations_48kHz = 1;
+const UWord16 CRendBin_HOA2_HRIR_num_iterations_48kHz[9][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[9][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
+const UWord16 CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz = 0;
 const Word16 CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz_fx[9]={0, 0,	0,	0,	0,	0,	0,	0, 0};
-const uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 32000 */
 
-const int16_t CRendBin_HOA2_HRIR_max_num_iterations_32kHz = 1;
-const uint16_t CRendBin_HOA2_HRIR_num_iterations_32kHz[9][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[9][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
-const uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz = 0;
+const Word16 CRendBin_HOA2_HRIR_max_num_iterations_32kHz = 1;
+const UWord16 CRendBin_HOA2_HRIR_num_iterations_32kHz[9][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[9][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
+const UWord16 CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz = 0;
 const Word16 CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz_fx[9]={0, 0,	0,	0,	0,	0,	0,	0, 0};
-const uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 16000 */
 
-const int16_t CRendBin_HOA2_HRIR_max_num_iterations_16kHz = 1;
-const uint16_t CRendBin_HOA2_HRIR_num_iterations_16kHz[9][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[9][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
-const uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz = 0;
+const Word16 CRendBin_HOA2_HRIR_max_num_iterations_16kHz = 1;
+const UWord16 CRendBin_HOA2_HRIR_num_iterations_16kHz[9][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[9][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
+const UWord16 CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz = 0;
 const Word16 CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz_fx[9]={0, 0,	0,	0,	0,	0,	0,	0, 0};
-const uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 
@@ -173,36 +173,36 @@ const Word32 *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS]={N
 const Word32 CRendBin_HOA3_HRIR_latency_s_fx = 44741;/*Q-31*/
 /* Sample Rate = 48000 */
 
-const int16_t CRendBin_HOA3_HRIR_max_num_iterations_48kHz = 1;
-const uint16_t CRendBin_HOA3_HRIR_num_iterations_48kHz[16][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[16][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
-const uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz = 0;
+const Word16 CRendBin_HOA3_HRIR_max_num_iterations_48kHz = 1;
+const UWord16 CRendBin_HOA3_HRIR_num_iterations_48kHz[16][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[16][BINAURAL_CHANNELS][1]={{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}},{{240},{240}}};
+const UWord16 CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz = 0;
 const Word16 CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz_fx[16]={0, 0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0, 0};
-const uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 32000 */
 
-const int16_t CRendBin_HOA3_HRIR_max_num_iterations_32kHz = 1;
-const uint16_t CRendBin_HOA3_HRIR_num_iterations_32kHz[16][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[16][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
-const uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz = 0;
+const Word16 CRendBin_HOA3_HRIR_max_num_iterations_32kHz = 1;
+const UWord16 CRendBin_HOA3_HRIR_num_iterations_32kHz[16][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[16][BINAURAL_CHANNELS][1]={{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}},{{160},{160}}};
+const UWord16 CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz = 0;
 const Word16 CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz_fx[16]={0, 0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0, 0};
-const uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 /* Sample Rate = 16000 */
 
-const int16_t CRendBin_HOA3_HRIR_max_num_iterations_16kHz = 1;
-const uint16_t CRendBin_HOA3_HRIR_num_iterations_16kHz[16][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
-const uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
-const uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[16][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
-const uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz = 0;
+const Word16 CRendBin_HOA3_HRIR_max_num_iterations_16kHz = 1;
+const UWord16 CRendBin_HOA3_HRIR_num_iterations_16kHz[16][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} };
+const UWord16 CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0};
+const UWord16 CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[16][BINAURAL_CHANNELS][1]={{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}},{{80},{80}}};
+const UWord16 CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz = 0;
 const float CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[16]={0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f};
 const Word16 CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz_fx[16]={0, 0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0, 0};
-const uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
+const UWord16 *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS]={NULL,NULL};
 
@@ -212,34 +212,34 @@ const Word32 *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS]={N
 const Word32 CRendBin_Combined_BRIR_latency_s_fx = 313176;/*Q-31*/
 /* Sample Rate = 48000 */
 
-const int16_t CRendBin_Combined_BRIR_max_num_iterations_48kHz = 22;
-const uint16_t CRendBin_Combined_BRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]={{22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22} };
-const uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {40, 40};
-const uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][22]={{{116, 118, 117, 121, 112, 119, 121, 131, 134, 131, 137, 127, 134, 135, 134, 135, 129, 139, 135, 130, 128, 240},{116, 118, 117, 121, 112, 119, 121, 131, 134, 131, 137, 127, 134, 135, 134, 135, 129, 139, 135, 130, 128, 240}},{{122, 106, 121, 114, 121, 123, 119, 126, 123, 126, 127, 130, 128, 136, 132, 131, 129, 141, 137, 131, 129, 240},{122, 106, 121, 114, 121, 123, 119, 126, 123, 126, 127, 130, 128, 136, 132, 131, 129, 141, 137, 131, 129, 240}},{{118, 104, 116, 104, 123, 123, 122, 125, 130, 128, 132, 135, 131, 132, 131, 132, 135, 137, 144, 129, 129, 240},{118, 104, 116, 104, 123, 123, 122, 125, 130, 128, 132, 135, 131, 132, 131, 132, 135, 137, 144, 129, 129, 240}},{{102, 117, 116, 121, 117, 114, 115, 125, 126, 124, 125, 142, 133, 124, 129, 132, 134, 137, 143, 125, 125, 240},{102, 117, 116, 121, 117, 114, 115, 125, 126, 124, 125, 142, 133, 124, 129, 132, 134, 137, 143, 125, 125, 240}},{{116, 115, 117, 120, 121, 119, 125, 129, 123, 129, 124, 127, 128, 143, 133, 131, 136, 141, 158, 127, 131, 240},{116, 115, 117, 120, 121, 119, 125, 129, 123, 129, 124, 127, 128, 143, 133, 131, 136, 141, 158, 127, 131, 240}},{{112, 106, 118, 123, 115, 120, 129, 123, 130, 127, 130, 130, 131, 131, 131, 135, 134, 153, 138, 132, 127, 240},{112, 106, 118, 123, 115, 120, 129, 123, 130, 127, 130, 130, 131, 131, 131, 135, 134, 153, 138, 132, 127, 240}},{{107, 112, 111, 120, 115, 125, 122, 123, 132, 123, 133, 138, 125, 134, 130, 131, 135, 137, 136, 127, 121, 240},{107, 112, 111, 120, 115, 125, 122, 123, 132, 123, 133, 138, 125, 134, 130, 131, 135, 137, 136, 127, 121, 240}},{{111, 113, 132, 115, 121, 123, 121, 127, 135, 128, 129, 128, 133, 130, 133, 138, 134, 137, 152, 138, 124, 240},{111, 113, 132, 115, 121, 123, 121, 127, 135, 128, 129, 128, 133, 130, 133, 138, 134, 137, 152, 138, 124, 240}},{{114, 104, 114, 117, 125, 127, 123, 129, 123, 127, 144, 131, 138, 132, 129, 129, 132, 134, 136, 127, 121, 240},{114, 104, 114, 117, 125, 127, 123, 129, 123, 127, 144, 131, 138, 132, 129, 129, 132, 134, 136, 127, 121, 240}},{{100, 102, 112, 118, 115, 116, 118, 116, 121, 124, 125, 121, 125, 130, 127, 132, 133, 134, 134, 129, 132, 240},{100, 102, 112, 118, 115, 116, 118, 116, 121, 124, 125, 121, 125, 130, 127, 132, 133, 134, 134, 129, 132, 240}},{{106, 93, 103, 108, 124, 111, 114, 115, 120, 121, 119, 123, 131, 130, 132, 132, 132, 131, 140, 129, 131, 240},{106, 93, 103, 108, 124, 111, 114, 115, 120, 121, 119, 123, 131, 130, 132, 132, 132, 131, 140, 129, 131, 240}},{{108, 101, 115, 115, 115, 110, 121, 124, 124, 120, 122, 129, 124, 128, 125, 132, 135, 133, 138, 160, 119, 240},{108, 101, 115, 115, 115, 110, 121, 124, 124, 120, 122, 129, 124, 128, 125, 132, 135, 133, 138, 160, 119, 240}},{{112, 106, 114, 110, 128, 117, 120, 126, 124, 128, 126, 132, 129, 127, 133, 134, 136, 133, 154, 197, 129, 240},{112, 106, 114, 110, 128, 117, 120, 126, 124, 128, 126, 132, 129, 127, 133, 134, 136, 133, 154, 197, 129, 240}},{{102, 107, 111, 116, 116, 120, 118, 115, 120, 119, 128, 131, 131, 130, 128, 126, 126, 132, 145, 136, 133, 240},{102, 107, 111, 116, 116, 120, 118, 115, 120, 119, 128, 131, 131, 130, 128, 126, 126, 132, 145, 136, 133, 240}},{{111, 117, 106, 120, 123, 121, 125, 125, 130, 125, 123, 123, 127, 131, 125, 131, 135, 134, 148, 134, 132, 240},{111, 117, 106, 120, 123, 121, 125, 125, 130, 125, 123, 123, 127, 131, 125, 131, 135, 134, 148, 134, 132, 240}}};
-const uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz = 98;
+const Word16 CRendBin_Combined_BRIR_max_num_iterations_48kHz = 22;
+const UWord16 CRendBin_Combined_BRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]={{22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22} };
+const UWord16 CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {40, 40};
+const UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[15][BINAURAL_CHANNELS][22]={{{116, 118, 117, 121, 112, 119, 121, 131, 134, 131, 137, 127, 134, 135, 134, 135, 129, 139, 135, 130, 128, 240},{116, 118, 117, 121, 112, 119, 121, 131, 134, 131, 137, 127, 134, 135, 134, 135, 129, 139, 135, 130, 128, 240}},{{122, 106, 121, 114, 121, 123, 119, 126, 123, 126, 127, 130, 128, 136, 132, 131, 129, 141, 137, 131, 129, 240},{122, 106, 121, 114, 121, 123, 119, 126, 123, 126, 127, 130, 128, 136, 132, 131, 129, 141, 137, 131, 129, 240}},{{118, 104, 116, 104, 123, 123, 122, 125, 130, 128, 132, 135, 131, 132, 131, 132, 135, 137, 144, 129, 129, 240},{118, 104, 116, 104, 123, 123, 122, 125, 130, 128, 132, 135, 131, 132, 131, 132, 135, 137, 144, 129, 129, 240}},{{102, 117, 116, 121, 117, 114, 115, 125, 126, 124, 125, 142, 133, 124, 129, 132, 134, 137, 143, 125, 125, 240},{102, 117, 116, 121, 117, 114, 115, 125, 126, 124, 125, 142, 133, 124, 129, 132, 134, 137, 143, 125, 125, 240}},{{116, 115, 117, 120, 121, 119, 125, 129, 123, 129, 124, 127, 128, 143, 133, 131, 136, 141, 158, 127, 131, 240},{116, 115, 117, 120, 121, 119, 125, 129, 123, 129, 124, 127, 128, 143, 133, 131, 136, 141, 158, 127, 131, 240}},{{112, 106, 118, 123, 115, 120, 129, 123, 130, 127, 130, 130, 131, 131, 131, 135, 134, 153, 138, 132, 127, 240},{112, 106, 118, 123, 115, 120, 129, 123, 130, 127, 130, 130, 131, 131, 131, 135, 134, 153, 138, 132, 127, 240}},{{107, 112, 111, 120, 115, 125, 122, 123, 132, 123, 133, 138, 125, 134, 130, 131, 135, 137, 136, 127, 121, 240},{107, 112, 111, 120, 115, 125, 122, 123, 132, 123, 133, 138, 125, 134, 130, 131, 135, 137, 136, 127, 121, 240}},{{111, 113, 132, 115, 121, 123, 121, 127, 135, 128, 129, 128, 133, 130, 133, 138, 134, 137, 152, 138, 124, 240},{111, 113, 132, 115, 121, 123, 121, 127, 135, 128, 129, 128, 133, 130, 133, 138, 134, 137, 152, 138, 124, 240}},{{114, 104, 114, 117, 125, 127, 123, 129, 123, 127, 144, 131, 138, 132, 129, 129, 132, 134, 136, 127, 121, 240},{114, 104, 114, 117, 125, 127, 123, 129, 123, 127, 144, 131, 138, 132, 129, 129, 132, 134, 136, 127, 121, 240}},{{100, 102, 112, 118, 115, 116, 118, 116, 121, 124, 125, 121, 125, 130, 127, 132, 133, 134, 134, 129, 132, 240},{100, 102, 112, 118, 115, 116, 118, 116, 121, 124, 125, 121, 125, 130, 127, 132, 133, 134, 134, 129, 132, 240}},{{106, 93, 103, 108, 124, 111, 114, 115, 120, 121, 119, 123, 131, 130, 132, 132, 132, 131, 140, 129, 131, 240},{106, 93, 103, 108, 124, 111, 114, 115, 120, 121, 119, 123, 131, 130, 132, 132, 132, 131, 140, 129, 131, 240}},{{108, 101, 115, 115, 115, 110, 121, 124, 124, 120, 122, 129, 124, 128, 125, 132, 135, 133, 138, 160, 119, 240},{108, 101, 115, 115, 115, 110, 121, 124, 124, 120, 122, 129, 124, 128, 125, 132, 135, 133, 138, 160, 119, 240}},{{112, 106, 114, 110, 128, 117, 120, 126, 124, 128, 126, 132, 129, 127, 133, 134, 136, 133, 154, 197, 129, 240},{112, 106, 114, 110, 128, 117, 120, 126, 124, 128, 126, 132, 129, 127, 133, 134, 136, 133, 154, 197, 129, 240}},{{102, 107, 111, 116, 116, 120, 118, 115, 120, 119, 128, 131, 131, 130, 128, 126, 126, 132, 145, 136, 133, 240},{102, 107, 111, 116, 116, 120, 118, 115, 120, 119, 128, 131, 131, 130, 128, 126, 126, 132, 145, 136, 133, 240}},{{111, 117, 106, 120, 123, 121, 125, 125, 130, 125, 123, 123, 127, 131, 125, 131, 135, 134, 148, 134, 132, 240},{111, 117, 106, 120, 123, 121, 125, 125, 130, 125, 123, 123, 127, 131, 125, 131, 135, 134, 148, 134, 132, 240}}};
+const UWord16 CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz = 98;
 const float CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[15]={0.224183f, 0.227455f, 0.241830f, 0.207155f, 0.218087f, 0.222942f, 0.232158f, 0.248203f, 0.249262f, 0.261591f, 0.246276f, 0.279163f, 0.285701f, 0.262541f, 0.271844f};
 const Word16 CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz_fx[15]={7346,	7453,	7924,	6788,	7146,	7305,	7607,	8133,	8167,	8571,	8069,	9147,	9361,	8602,	8907,};
-const uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS][40]={{47, 47, 47, 47, 47, 47, 51, 51, 58, 58, 58, 65, 65, 65, 65, 65, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 91, 91, 93, 93, 93, 98},{47, 47, 47, 47, 47, 47, 51, 51, 58, 58, 58, 65, 65, 65, 65, 65, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 91, 91, 93, 93, 93, 98}};
+const UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS][40]={{47, 47, 47, 47, 47, 47, 51, 51, 58, 58, 58, 65, 65, 65, 65, 65, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 91, 91, 93, 93, 93, 98},{47, 47, 47, 47, 47, 47, 51, 51, 58, 58, 58, 65, 65, 65, 65, 65, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 91, 91, 93, 93, 93, 98}};
 /* Sample Rate = 32000 */
 
-const int16_t CRendBin_Combined_BRIR_max_num_iterations_32kHz = 22;
-const uint16_t CRendBin_Combined_BRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]={{22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22} };
-const uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {40, 40};
-const uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][22]={{{115, 117, 117, 120, 112, 118, 121, 130, 126, 130, 136, 127, 133, 135, 132, 133, 129, 137, 134, 129, 128, 160},{115, 117, 117, 120, 112, 118, 121, 130, 126, 130, 136, 127, 133, 135, 132, 133, 129, 137, 134, 129, 128, 160}},{{121, 106, 119, 113, 120, 123, 114, 126, 123, 125, 127, 128, 127, 134, 132, 130, 129, 139, 133, 131, 128, 160},{121, 106, 119, 113, 120, 123, 114, 126, 123, 125, 127, 128, 127, 134, 132, 130, 129, 139, 133, 131, 128, 160}},{{113, 103, 116, 104, 123, 123, 122, 124, 130, 128, 132, 131, 131, 132, 130, 132, 130, 135, 137, 128, 128, 160},{113, 103, 116, 104, 123, 123, 122, 124, 130, 128, 132, 131, 131, 132, 130, 132, 130, 135, 137, 128, 128, 160}},{{102, 116, 116, 121, 116, 114, 115, 121, 125, 123, 124, 130, 132, 122, 127, 131, 131, 135, 133, 124, 125, 160},{102, 116, 116, 121, 116, 114, 115, 121, 125, 123, 124, 130, 132, 122, 127, 131, 131, 135, 133, 124, 125, 160}},{{115, 115, 115, 119, 121, 119, 125, 127, 123, 129, 122, 126, 128, 134, 130, 130, 131, 140, 146, 127, 131, 160},{115, 115, 115, 119, 121, 119, 125, 127, 123, 129, 122, 126, 128, 134, 130, 130, 131, 140, 146, 127, 131, 160}},{{112, 106, 118, 121, 115, 117, 129, 123, 128, 126, 130, 130, 131, 131, 130, 134, 133, 149, 130, 132, 126, 160},{112, 106, 118, 121, 115, 117, 129, 123, 128, 126, 130, 130, 131, 131, 130, 134, 133, 149, 130, 132, 126, 160}},{{107, 112, 110, 119, 114, 124, 121, 121, 132, 122, 131, 134, 124, 133, 130, 129, 134, 134, 135, 127, 120, 160},{107, 112, 110, 119, 114, 124, 121, 121, 132, 122, 131, 134, 124, 133, 130, 129, 134, 134, 135, 127, 120, 160}},{{110, 113, 123, 113, 121, 120, 120, 126, 131, 123, 128, 128, 132, 130, 132, 136, 133, 136, 135, 128, 124, 160},{110, 113, 123, 113, 121, 120, 120, 126, 131, 123, 128, 128, 132, 130, 132, 136, 133, 136, 135, 128, 124, 160}},{{114, 101, 113, 113, 124, 126, 123, 128, 122, 127, 132, 127, 136, 128, 128, 127, 132, 132, 129, 125, 120, 160},{114, 101, 113, 113, 124, 126, 123, 128, 122, 127, 132, 127, 136, 128, 128, 127, 132, 132, 129, 125, 120, 160}},{{99, 100, 111, 117, 114, 114, 118, 116, 121, 124, 124, 121, 125, 130, 127, 132, 132, 130, 133, 128, 131, 160},{99, 100, 111, 117, 114, 114, 118, 116, 121, 124, 124, 121, 125, 130, 127, 132, 132, 130, 133, 128, 131, 160}},{{105, 93, 103, 108, 119, 110, 111, 114, 120, 121, 119, 122, 130, 128, 130, 131, 132, 131, 136, 128, 128, 160},{105, 93, 103, 108, 119, 110, 111, 114, 120, 121, 119, 122, 130, 128, 130, 131, 132, 131, 136, 128, 128, 160}},{{105, 100, 112, 114, 115, 108, 117, 120, 123, 117, 122, 129, 124, 128, 124, 132, 135, 131, 139, 153, 116, 160},{105, 100, 112, 114, 115, 108, 117, 120, 123, 117, 122, 129, 124, 128, 124, 132, 135, 131, 139, 153, 116, 160}},{{110, 106, 113, 110, 122, 116, 119, 125, 123, 128, 125, 127, 128, 127, 133, 130, 132, 132, 143, 155, 127, 160},{110, 106, 113, 110, 122, 116, 119, 125, 123, 128, 125, 127, 128, 127, 133, 130, 132, 132, 143, 155, 127, 160}},{{102, 107, 110, 112, 115, 117, 117, 115, 120, 118, 127, 130, 130, 129, 126, 126, 125, 130, 141, 135, 127, 160},{102, 107, 110, 112, 115, 117, 117, 115, 120, 118, 127, 130, 130, 129, 126, 126, 125, 130, 141, 135, 127, 160}},{{110, 117, 106, 118, 118, 116, 121, 124, 128, 125, 122, 122, 126, 131, 124, 130, 133, 131, 139, 134, 131, 160},{110, 117, 106, 118, 118, 116, 121, 124, 128, 125, 122, 122, 126, 131, 124, 130, 133, 131, 139, 134, 131, 160}}};
-const uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz = 97;
+const Word16 CRendBin_Combined_BRIR_max_num_iterations_32kHz = 22;
+const UWord16 CRendBin_Combined_BRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]={{22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22} };
+const UWord16 CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {40, 40};
+const UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[15][BINAURAL_CHANNELS][22]={{{115, 117, 117, 120, 112, 118, 121, 130, 126, 130, 136, 127, 133, 135, 132, 133, 129, 137, 134, 129, 128, 160},{115, 117, 117, 120, 112, 118, 121, 130, 126, 130, 136, 127, 133, 135, 132, 133, 129, 137, 134, 129, 128, 160}},{{121, 106, 119, 113, 120, 123, 114, 126, 123, 125, 127, 128, 127, 134, 132, 130, 129, 139, 133, 131, 128, 160},{121, 106, 119, 113, 120, 123, 114, 126, 123, 125, 127, 128, 127, 134, 132, 130, 129, 139, 133, 131, 128, 160}},{{113, 103, 116, 104, 123, 123, 122, 124, 130, 128, 132, 131, 131, 132, 130, 132, 130, 135, 137, 128, 128, 160},{113, 103, 116, 104, 123, 123, 122, 124, 130, 128, 132, 131, 131, 132, 130, 132, 130, 135, 137, 128, 128, 160}},{{102, 116, 116, 121, 116, 114, 115, 121, 125, 123, 124, 130, 132, 122, 127, 131, 131, 135, 133, 124, 125, 160},{102, 116, 116, 121, 116, 114, 115, 121, 125, 123, 124, 130, 132, 122, 127, 131, 131, 135, 133, 124, 125, 160}},{{115, 115, 115, 119, 121, 119, 125, 127, 123, 129, 122, 126, 128, 134, 130, 130, 131, 140, 146, 127, 131, 160},{115, 115, 115, 119, 121, 119, 125, 127, 123, 129, 122, 126, 128, 134, 130, 130, 131, 140, 146, 127, 131, 160}},{{112, 106, 118, 121, 115, 117, 129, 123, 128, 126, 130, 130, 131, 131, 130, 134, 133, 149, 130, 132, 126, 160},{112, 106, 118, 121, 115, 117, 129, 123, 128, 126, 130, 130, 131, 131, 130, 134, 133, 149, 130, 132, 126, 160}},{{107, 112, 110, 119, 114, 124, 121, 121, 132, 122, 131, 134, 124, 133, 130, 129, 134, 134, 135, 127, 120, 160},{107, 112, 110, 119, 114, 124, 121, 121, 132, 122, 131, 134, 124, 133, 130, 129, 134, 134, 135, 127, 120, 160}},{{110, 113, 123, 113, 121, 120, 120, 126, 131, 123, 128, 128, 132, 130, 132, 136, 133, 136, 135, 128, 124, 160},{110, 113, 123, 113, 121, 120, 120, 126, 131, 123, 128, 128, 132, 130, 132, 136, 133, 136, 135, 128, 124, 160}},{{114, 101, 113, 113, 124, 126, 123, 128, 122, 127, 132, 127, 136, 128, 128, 127, 132, 132, 129, 125, 120, 160},{114, 101, 113, 113, 124, 126, 123, 128, 122, 127, 132, 127, 136, 128, 128, 127, 132, 132, 129, 125, 120, 160}},{{99, 100, 111, 117, 114, 114, 118, 116, 121, 124, 124, 121, 125, 130, 127, 132, 132, 130, 133, 128, 131, 160},{99, 100, 111, 117, 114, 114, 118, 116, 121, 124, 124, 121, 125, 130, 127, 132, 132, 130, 133, 128, 131, 160}},{{105, 93, 103, 108, 119, 110, 111, 114, 120, 121, 119, 122, 130, 128, 130, 131, 132, 131, 136, 128, 128, 160},{105, 93, 103, 108, 119, 110, 111, 114, 120, 121, 119, 122, 130, 128, 130, 131, 132, 131, 136, 128, 128, 160}},{{105, 100, 112, 114, 115, 108, 117, 120, 123, 117, 122, 129, 124, 128, 124, 132, 135, 131, 139, 153, 116, 160},{105, 100, 112, 114, 115, 108, 117, 120, 123, 117, 122, 129, 124, 128, 124, 132, 135, 131, 139, 153, 116, 160}},{{110, 106, 113, 110, 122, 116, 119, 125, 123, 128, 125, 127, 128, 127, 133, 130, 132, 132, 143, 155, 127, 160},{110, 106, 113, 110, 122, 116, 119, 125, 123, 128, 125, 127, 128, 127, 133, 130, 132, 132, 143, 155, 127, 160}},{{102, 107, 110, 112, 115, 117, 117, 115, 120, 118, 127, 130, 130, 129, 126, 126, 125, 130, 141, 135, 127, 160},{102, 107, 110, 112, 115, 117, 117, 115, 120, 118, 127, 130, 130, 129, 126, 126, 125, 130, 141, 135, 127, 160}},{{110, 117, 106, 118, 118, 116, 121, 124, 128, 125, 122, 122, 126, 131, 124, 130, 133, 131, 139, 134, 131, 160},{110, 117, 106, 118, 118, 116, 121, 124, 128, 125, 122, 122, 126, 131, 124, 130, 133, 131, 139, 134, 131, 160}}};
+const UWord16 CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz = 97;
 const float CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[15]={0.224190f, 0.227445f, 0.241827f, 0.207131f, 0.218113f, 0.222941f, 0.232139f, 0.248192f, 0.249239f, 0.261572f, 0.246309f, 0.279145f, 0.285786f, 0.262528f, 0.271847f};
 const Word16 CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz_fx[15]={7346,	7452,	7924,	6787,	7147,	7305,	7606,	8132,	8167,	8571,	8071,	9147,	9364,	8602,	8907,};
-const uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40]={{47, 47, 47, 47, 47, 47, 50, 50, 56, 56, 56, 63, 63, 63, 63, 63, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 93, 93, 93, 93, 93, 97},{47, 47, 47, 47, 47, 47, 50, 50, 56, 56, 56, 63, 63, 63, 63, 63, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 93, 93, 93, 93, 93, 97}};
+const UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40]={{47, 47, 47, 47, 47, 47, 50, 50, 56, 56, 56, 63, 63, 63, 63, 63, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 93, 93, 93, 93, 93, 97},{47, 47, 47, 47, 47, 47, 50, 50, 56, 56, 56, 63, 63, 63, 63, 63, 72, 72, 72, 74, 74, 77, 77, 79, 81, 81, 81, 81, 87, 87, 87, 87, 87, 87, 93, 93, 93, 93, 93, 97}};
 /* Sample Rate = 16000 */
 
-const int16_t CRendBin_Combined_BRIR_max_num_iterations_16kHz = 23;
-const uint16_t CRendBin_Combined_BRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]={{23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23} };
-const uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {40, 40};
-const uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][23]={{{77, 76, 77, 77, 77, 76, 77, 76, 77, 76, 77, 77, 77, 78, 76, 76, 77, 77, 77, 77, 77, 76, 80},{77, 76, 77, 77, 77, 76, 77, 76, 77, 76, 77, 77, 77, 78, 76, 76, 77, 77, 77, 77, 77, 76, 80}},{{76, 77, 77, 75, 77, 78, 77, 76, 77, 77, 76, 77, 77, 77, 77, 77, 76, 77, 76, 76, 77, 78, 80},{76, 77, 77, 75, 77, 78, 77, 76, 77, 77, 76, 77, 77, 77, 77, 77, 76, 77, 76, 76, 77, 78, 80}},{{77, 76, 76, 78, 75, 76, 74, 78, 77, 76, 77, 77, 77, 76, 76, 77, 78, 78, 77, 77, 77, 77, 80},{77, 76, 76, 78, 75, 76, 74, 78, 77, 76, 77, 77, 77, 76, 76, 77, 78, 78, 77, 77, 77, 77, 80}},{{76, 76, 76, 76, 77, 77, 76, 78, 77, 77, 77, 77, 78, 78, 77, 77, 77, 77, 77, 78, 77, 78, 80},{76, 76, 76, 76, 77, 77, 76, 78, 77, 77, 77, 77, 78, 78, 77, 77, 77, 77, 77, 78, 77, 78, 80}},{{76, 77, 77, 76, 77, 77, 75, 77, 77, 77, 76, 77, 77, 77, 77, 78, 77, 77, 77, 77, 76, 76, 80},{76, 77, 77, 76, 77, 77, 75, 77, 77, 77, 76, 77, 77, 77, 77, 78, 77, 77, 77, 77, 76, 76, 80}},{{77, 76, 77, 77, 77, 77, 77, 77, 76, 78, 76, 78, 75, 76, 77, 77, 76, 76, 77, 78, 78, 77, 80},{77, 76, 77, 77, 77, 77, 77, 77, 76, 78, 76, 78, 75, 76, 77, 77, 76, 76, 77, 78, 78, 77, 80}},{{77, 77, 75, 76, 76, 77, 77, 77, 77, 77, 77, 75, 77, 76, 76, 76, 77, 77, 76, 77, 76, 77, 80},{77, 77, 75, 76, 76, 77, 77, 77, 77, 77, 77, 75, 77, 76, 76, 76, 77, 77, 76, 77, 76, 77, 80}},{{75, 76, 77, 77, 75, 77, 75, 76, 76, 77, 77, 77, 78, 78, 77, 77, 76, 77, 78, 78, 78, 76, 80},{75, 76, 77, 77, 75, 77, 75, 76, 76, 77, 77, 77, 78, 78, 77, 77, 76, 77, 78, 78, 78, 76, 80}},{{77, 77, 77, 76, 77, 77, 76, 76, 76, 77, 77, 75, 76, 78, 78, 77, 77, 78, 78, 77, 76, 76, 80},{77, 77, 77, 76, 77, 77, 76, 76, 76, 77, 77, 75, 76, 78, 78, 77, 77, 78, 78, 77, 76, 76, 80}},{{76, 75, 76, 76, 77, 77, 77, 77, 77, 77, 74, 78, 77, 78, 78, 77, 76, 77, 77, 77, 77, 76, 80},{76, 75, 76, 76, 77, 77, 77, 77, 77, 77, 74, 78, 77, 78, 78, 77, 76, 77, 77, 77, 77, 76, 80}},{{76, 76, 77, 76, 77, 77, 76, 76, 76, 76, 77, 77, 76, 76, 77, 75, 77, 76, 76, 76, 77, 77, 80},{76, 76, 77, 76, 77, 77, 76, 76, 76, 76, 77, 77, 76, 76, 77, 75, 77, 76, 76, 76, 77, 77, 80}},{{76, 76, 77, 75, 78, 77, 77, 77, 77, 77, 77, 77, 77, 76, 78, 77, 76, 78, 76, 77, 76, 77, 80},{76, 76, 77, 75, 78, 77, 77, 77, 77, 77, 77, 77, 77, 76, 78, 77, 76, 78, 76, 77, 76, 77, 80}},{{76, 77, 77, 76, 76, 77, 77, 75, 77, 77, 77, 77, 77, 77, 78, 78, 78, 78, 77, 76, 76, 78, 80},{76, 77, 77, 76, 76, 77, 77, 75, 77, 77, 77, 77, 77, 77, 78, 78, 78, 78, 77, 76, 76, 78, 80}},{{74, 76, 74, 76, 75, 76, 76, 76, 76, 77, 77, 78, 77, 78, 75, 76, 77, 76, 78, 76, 78, 77, 80},{74, 76, 74, 76, 75, 76, 76, 76, 76, 77, 77, 78, 77, 78, 75, 76, 77, 76, 78, 76, 78, 77, 80}},{{76, 77, 77, 77, 76, 78, 77, 76, 75, 77, 77, 77, 76, 78, 77, 78, 78, 78, 77, 76, 77, 75, 80},{76, 77, 77, 77, 76, 78, 77, 76, 75, 77, 77, 77, 76, 78, 77, 78, 78, 78, 77, 76, 77, 75, 80}}};
-const uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz = 77;
+const Word16 CRendBin_Combined_BRIR_max_num_iterations_16kHz = 23;
+const UWord16 CRendBin_Combined_BRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]={{23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23} };
+const UWord16 CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {40, 40};
+const UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[15][BINAURAL_CHANNELS][23]={{{77, 76, 77, 77, 77, 76, 77, 76, 77, 76, 77, 77, 77, 78, 76, 76, 77, 77, 77, 77, 77, 76, 80},{77, 76, 77, 77, 77, 76, 77, 76, 77, 76, 77, 77, 77, 78, 76, 76, 77, 77, 77, 77, 77, 76, 80}},{{76, 77, 77, 75, 77, 78, 77, 76, 77, 77, 76, 77, 77, 77, 77, 77, 76, 77, 76, 76, 77, 78, 80},{76, 77, 77, 75, 77, 78, 77, 76, 77, 77, 76, 77, 77, 77, 77, 77, 76, 77, 76, 76, 77, 78, 80}},{{77, 76, 76, 78, 75, 76, 74, 78, 77, 76, 77, 77, 77, 76, 76, 77, 78, 78, 77, 77, 77, 77, 80},{77, 76, 76, 78, 75, 76, 74, 78, 77, 76, 77, 77, 77, 76, 76, 77, 78, 78, 77, 77, 77, 77, 80}},{{76, 76, 76, 76, 77, 77, 76, 78, 77, 77, 77, 77, 78, 78, 77, 77, 77, 77, 77, 78, 77, 78, 80},{76, 76, 76, 76, 77, 77, 76, 78, 77, 77, 77, 77, 78, 78, 77, 77, 77, 77, 77, 78, 77, 78, 80}},{{76, 77, 77, 76, 77, 77, 75, 77, 77, 77, 76, 77, 77, 77, 77, 78, 77, 77, 77, 77, 76, 76, 80},{76, 77, 77, 76, 77, 77, 75, 77, 77, 77, 76, 77, 77, 77, 77, 78, 77, 77, 77, 77, 76, 76, 80}},{{77, 76, 77, 77, 77, 77, 77, 77, 76, 78, 76, 78, 75, 76, 77, 77, 76, 76, 77, 78, 78, 77, 80},{77, 76, 77, 77, 77, 77, 77, 77, 76, 78, 76, 78, 75, 76, 77, 77, 76, 76, 77, 78, 78, 77, 80}},{{77, 77, 75, 76, 76, 77, 77, 77, 77, 77, 77, 75, 77, 76, 76, 76, 77, 77, 76, 77, 76, 77, 80},{77, 77, 75, 76, 76, 77, 77, 77, 77, 77, 77, 75, 77, 76, 76, 76, 77, 77, 76, 77, 76, 77, 80}},{{75, 76, 77, 77, 75, 77, 75, 76, 76, 77, 77, 77, 78, 78, 77, 77, 76, 77, 78, 78, 78, 76, 80},{75, 76, 77, 77, 75, 77, 75, 76, 76, 77, 77, 77, 78, 78, 77, 77, 76, 77, 78, 78, 78, 76, 80}},{{77, 77, 77, 76, 77, 77, 76, 76, 76, 77, 77, 75, 76, 78, 78, 77, 77, 78, 78, 77, 76, 76, 80},{77, 77, 77, 76, 77, 77, 76, 76, 76, 77, 77, 75, 76, 78, 78, 77, 77, 78, 78, 77, 76, 76, 80}},{{76, 75, 76, 76, 77, 77, 77, 77, 77, 77, 74, 78, 77, 78, 78, 77, 76, 77, 77, 77, 77, 76, 80},{76, 75, 76, 76, 77, 77, 77, 77, 77, 77, 74, 78, 77, 78, 78, 77, 76, 77, 77, 77, 77, 76, 80}},{{76, 76, 77, 76, 77, 77, 76, 76, 76, 76, 77, 77, 76, 76, 77, 75, 77, 76, 76, 76, 77, 77, 80},{76, 76, 77, 76, 77, 77, 76, 76, 76, 76, 77, 77, 76, 76, 77, 75, 77, 76, 76, 76, 77, 77, 80}},{{76, 76, 77, 75, 78, 77, 77, 77, 77, 77, 77, 77, 77, 76, 78, 77, 76, 78, 76, 77, 76, 77, 80},{76, 76, 77, 75, 78, 77, 77, 77, 77, 77, 77, 77, 77, 76, 78, 77, 76, 78, 76, 77, 76, 77, 80}},{{76, 77, 77, 76, 76, 77, 77, 75, 77, 77, 77, 77, 77, 77, 78, 78, 78, 78, 77, 76, 76, 78, 80},{76, 77, 77, 76, 76, 77, 77, 75, 77, 77, 77, 77, 77, 77, 78, 78, 78, 78, 77, 76, 76, 78, 80}},{{74, 76, 74, 76, 75, 76, 76, 76, 76, 77, 77, 78, 77, 78, 75, 76, 77, 76, 78, 76, 78, 77, 80},{74, 76, 74, 76, 75, 76, 76, 76, 76, 77, 77, 78, 77, 78, 75, 76, 77, 76, 78, 76, 78, 77, 80}},{{76, 77, 77, 77, 76, 78, 77, 76, 75, 77, 77, 77, 76, 78, 77, 78, 78, 78, 77, 76, 77, 75, 80},{76, 77, 77, 77, 76, 78, 77, 76, 75, 77, 77, 77, 76, 78, 77, 78, 78, 78, 77, 76, 77, 75, 80}}};
+const UWord16 CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz = 77;
 const float CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[15]={0.223532f, 0.226827f, 0.248830f, 0.208782f, 0.220391f, 0.219790f, 0.231187f, 0.248730f, 0.251408f, 0.263698f, 0.243858f, 0.281483f, 0.283080f, 0.261660f, 0.273527f};
 const Word16 CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz_fx[15]={7346,	7452,	7924,	6787,	7147,	7305,	7606,	8132,	8167,	8571,	8071,	9147,	9364,	8602,	8907};
-const uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40]={{46, 46, 46, 46, 46, 46, 46, 49, 49, 53, 53, 53, 55, 55, 61, 61, 61, 65, 67, 67, 67, 67, 67, 67, 69, 72, 72, 72, 73, 73, 75, 75, 75, 75, 75, 75, 75, 75, 75, 77},{46, 46, 46, 46, 46, 46, 46, 49, 49, 53, 53, 53, 55, 55, 61, 61, 61, 65, 67, 67, 67, 67, 67, 67, 69, 72, 72, 72, 73, 73, 75, 75, 75, 75, 75, 75, 75, 75, 75, 77}};
+const UWord16 CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40]={{46, 46, 46, 46, 46, 46, 46, 49, 49, 53, 53, 53, 55, 55, 61, 61, 61, 65, 67, 67, 67, 67, 67, 67, 69, 72, 72, 72, 73, 73, 75, 75, 75, 75, 75, 75, 75, 75, 75, 77},{46, 46, 46, 46, 46, 46, 46, 49, 49, 53, 53, 53, 55, 55, 61, 61, 61, 65, 67, 67, 67, 67, 67, 67, 69, 72, 72, 72, 73, 73, 75, 75, 75, 75, 75, 75, 75, 75, 75, 77}};
 //BRIR and HRIR coeff tables in Q29
 const Word32 CRendBin_Combined_BRIR_coeff_re_48kHz_fx[15][BINAURAL_CHANNELS][2955] ={
 {
diff --git a/lib_rend/ivas_rom_rend.h b/lib_rend/ivas_rom_rend.h
index c80fab8ce40466e4ffaad9811daceea1186b2380..7f9cfb57adb40b59f5d130ccb44ac26c50c04c42 100644
--- a/lib_rend/ivas_rom_rend.h
+++ b/lib_rend/ivas_rom_rend.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -51,10 +51,10 @@ extern const Word16 diffuse_response_CICP16_fx[9]; /*Q-15*/
 extern const Word16 ap_pre_delay[DIRAC_DECORR_NUM_SPLIT_BANDS];
 extern const Word16 ap_filter_length[DIRAC_DECORR_NUM_SPLIT_BANDS];
 extern const Word16 ap_lattice_delta_phi_fx[DIRAC_MAX_NUM_DECORR_FILTERS * DIRAC_MAX_DECORR_FILTER_LEN]; /*Q-14*/
-extern const Word16 ap_lattice_coeffs_1_fx[DIRAC_DECORR_FILTER_LEN_1 * DIRAC_MAX_NUM_DECORR_FILTERS];    /*Q-15*/
-extern const Word16 ap_lattice_coeffs_2_fx[DIRAC_DECORR_FILTER_LEN_2 * DIRAC_MAX_NUM_DECORR_FILTERS];    /*Q-15*/
-extern const Word16 ap_lattice_coeffs_3_fx[DIRAC_DECORR_FILTER_LEN_3 * DIRAC_MAX_NUM_DECORR_FILTERS];    /*Q-15*/
-extern const Word16 *const ap_lattice_coeffs_fx[DIRAC_DECORR_NUM_SPLIT_BANDS];
+extern const Word32 ap_lattice_coeffs_1_fx[DIRAC_DECORR_FILTER_LEN_1 * DIRAC_MAX_NUM_DECORR_FILTERS];    /*Q-15*/
+extern const Word32 ap_lattice_coeffs_2_fx[DIRAC_DECORR_FILTER_LEN_2 * DIRAC_MAX_NUM_DECORR_FILTERS];    /*Q-15*/
+extern const Word32 ap_lattice_coeffs_3_fx[DIRAC_DECORR_FILTER_LEN_3 * DIRAC_MAX_NUM_DECORR_FILTERS];    /*Q-15*/
+extern const Word32 *const ap_lattice_coeffs_fx[DIRAC_DECORR_NUM_SPLIT_BANDS];
 extern const Word16 ap_split_frequencies_fx[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]; /*Q-14*/
 
 extern const Word16 sba_map_tc[11];     /*Q-0*/
@@ -121,10 +121,6 @@ extern const Word32 ivas_reverb_default_fc_fx[];   /*Q-16*/
 extern const Word32 ivas_reverb_default_RT60_fx[]; /*Q-26*/
 extern const Word32 ivas_reverb_default_DSR_fx[];  /*Q-30*/
 
-extern const float ivas_reverb_default_fc[];
-extern const float ivas_reverb_default_RT60[];
-extern const float ivas_reverb_default_DSR[];
-
 extern const Word32 release_cnst_table[4][201]; // Q31
 
 /*----------------------------------------------------------------------------------*
diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend_fx.c
similarity index 89%
rename from lib_rend/ivas_rom_rend.c
rename to lib_rend/ivas_rom_rend_fx.c
index d99a4ad767eb35559af5023fc47d78e116ac07a5..d14be4afe9ba42309e1161e95b0740e249a70a62 100644
--- a/lib_rend/ivas_rom_rend.c
+++ b/lib_rend/ivas_rom_rend_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -49,9 +49,9 @@ const Word16 diffuse_response_CICP6_fx[5] = { 13824, 13824, 12137, 16495, 16495
 const Word16 diffuse_response_CICP14_fx[7] = { 12507, 12507, 9237, 17691, 17691, 4977, 4977 };//Q15
 
 const Word16 diffuse_response_CICP16_fx[9] = { 11324, 11324, 9945, 13513, 13513, 8853, 8853, 9905, 9905 };//Q15
-const int16_t ap_pre_delay[DIRAC_DECORR_NUM_SPLIT_BANDS] = { 7, 2, 1 };
+const Word16 ap_pre_delay[DIRAC_DECORR_NUM_SPLIT_BANDS] = { 7, 2, 1 };
 
-const int16_t ap_filter_length[DIRAC_DECORR_NUM_SPLIT_BANDS] = { 15, 6, 3 };
+const Word16 ap_filter_length[DIRAC_DECORR_NUM_SPLIT_BANDS] = { 15, 6, 3 };
 
 const Word16 ap_lattice_delta_phi_fx[DIRAC_MAX_NUM_DECORR_FILTERS*DIRAC_MAX_DECORR_FILTER_LEN] /*Q14*/ =
 {
@@ -76,11 +76,10 @@ const Word16 ap_lattice_delta_phi_fx[DIRAC_MAX_NUM_DECORR_FILTERS*DIRAC_MAX_DECO
     29799 , 15800 , 24520 , 10977 , 25165 , 30177 , 16042 , 10060 , 30789 , 8397 , 19121 , 1339 , 29056 , 25160 , 12415 , 3611 , 25203 , 20991 , 4951 , 14580 , 13083 , 24188 ,
     27295 , 14997 , 22841 , 12403 , 5735 , 19656 , 21619 , 18488 , 10360 , 12954 , 7563 , 27744 , 25189 , 5677 , 7107 , 28747 , 9026 , 11251 , 12524 , 29372 , 24412
 };
-const Word16 ap_lattice_coeffs_1_fx[330] /* Q15 */ = { 26061, 16472, 6699, 13650, 15061, 8862, -6617, 917, 2222, -1724, -1270, -1880, 671, 12048, -19454, 17487, 6635, -63, 6392, -6044, -7663, 7474, -10790, -11098, -2611, 1716, -310, 5859, 6253, -15691, 1442, 25837, 4375, -5690, 17871, 22329, 10907, 9656, 10658, 1560, 5157, 3810, 7175, -6201, -10400, -24696, 25309, -16625, 9076, -22700, 7612, -11624, -511, -7309, 10174, -1147, 2810, -16383, 7053, 6599, -16238, -9884, 6439, 10687, -19476, 10319, 21911, 2511, 1497, -4089, -6660, -9738, 4122, -5881, -6611, 5279, 12977, 8745, 11684, 15995, -1843, 4563, -9712, -3697, 1225, -12039, -7087, -9088, 12760, 3772, -7879, -8880, 13982, -362, 4974, 8306, 7397, 16341, -4468, 14516, -9994, -1025, -352, 5581, 16268, -4583, -7929, -3435, 9645, -2219, -16128, -15978, 1192, 3584, 12981, -11562, -6747, -2719, -15172, -10135, 848, -3029, -4100, -5115, -160, 5847, 2935, 1468, 7805, -10227, -12802, -5850, 14890, 12681, -12742, -6481, 1164, 14922, -1782, 12452, 9534, 1599, 2576, 7265, -7128, 3974, -12998, -7159, -4170, -8831, -11279, -15238, -13808, -852, 7259, 11861, -11411, 9666, 11998, 2315, -2819, 8261, 5113, -2057, 13401, 7944, -9888, -2167, 12735, -15146, -5206, 7562, -3053, 1542, 2405, -10977, 751, 11619, 2372, 638, 11039, -15746, 5579, 8508, -12896, -11422, -3570, 9137, 12631, 11870, -10444, 11872, 9467, 9542, -9110, -14722, -9453, -13565, -13280, -9671, -8031, 82, 9433, 11410, -5844, -6767, 11504, -15800, 699, -16128, 1593, 14853, 3576, 7621, -15524, 4603, 11551, -3231, 4822, -1828, 3530, -7570, 11708, 11404, 7615, -10642, 5324, 1888, -1990, -319, -7346, -9252, -2144, 2119, 9187, -9335, -15417, 638, -14493, 12360, 14659, -9519, 11322, 12130, -10260, 3918, 9830, 13336, -9106, 14648, 6383, 5167, -7320, -4822, 12421, -7089, 4520, -13014, 2421, -8949, -14517, -5515, 11346, 1230, 2142, 5370, -4014, 11975, -10365, 3842, -9872, 5558, -11025, 8844, -13767, -10855, 16335, -12878, -15144, -10587, 15432, -11778, 8661, 7104, 16167, 4963, -10539, 15217, -11654, 13775, 6039, -9900, 4474, -8285, 6353, 9790, 7825, -12658, -5963, -2533, 4090, -8630, 12766, 147, 11134, 13605, 12378, 13114, 11548, -124, -6046, 14199, -7784, 4839, 13343, 2215, -8169, -11600, 10516, 13959, 10144, -6215, -6863, 5209, -2684, 12675, 5851, -13341, 7280, -4885, };
-const Word16 ap_lattice_coeffs_2_fx[132] /* Q15 */ = { 20764, 22321, -1619, 9395, 4784, 4436, -13439, -6775, -21527, -3334, 14296, 11135, -4305, -25354, -9883, 10733, 10886, 6745, 23514, -18100, -4919, 1787, 7848, -21249, -23653, 6205, 2234, 203, 2523, 1267, 13874, -3560, 14157, -13586, 9104, 13712, 2549, -9275, -11698, 151, -14504, -12200, 13216, 7963, 10301, 14565, 11387, 16254, 3552, 15380, -5579, 10692, 5641, 14428, 1914, 11130, -6388, 16096, -9217, -1412, -15810, -10977, -11015, 6437, -5394, 14499, -4429, -11612, 14815, -10198, -11391, 16329, -9469, 12334, -5830, 6407, 10940, -5003, 1744, 15000, 14499, 7708, -11310, -9374, 5093, 13283, 7113, -3537, 350, 12090, -16330, -16246, -7060, -3075, 10494, -453, 16036, 15427, -2157, 11366, 893, 4918, 15860, -16298, 5531, -16182, -5686, 10966, 8658, -13914, -10319, 8293, 13021, -16107, -14867, -15183, -626, 11, 10336, 15477, 3117, 9285, -7375, -3924, -15626, 1229, 11041, 16204, -2051, 5821, 15200, 16032, };
-const Word16 ap_lattice_coeffs_3_fx[66] /* Q15 */ = { 621, -6953, 13851, -13128, -3502, -805, 4587, 9161, 1060, 20726, 18957, -24071, 563, 433, -908, -11578, -15799, -16097, 14975, 5410, 15391, -6412, 14421, -15642, 11802, -16074, 15880, -5694, 247, 9115, 14234, 1977, -6347, -1104, 16260, 96, -15756, -3589, -760, 10639, -9570, -11670, -12012, 12481, -9887, 3614, 12575, 9960, -16373, -11455, 10969, -662, -14092, -5069, -12161, 10947, 11367, -5465, -7506, 3865, 11183, 16071, 16176, -12049, 13976, -1499, };
-
-const Word16 * const ap_lattice_coeffs_fx[DIRAC_DECORR_NUM_SPLIT_BANDS] =
+const Word32 ap_lattice_coeffs_1_fx[330] /* Q31 */ = { 1707955968,  1079539968,  439065920,  894568704,  987086592,  580795520,  -433671424,  60123100,  145623008,  -113015624,  -83277272,  -123237648,  43980464,  789623296,  -1274971776,  1146041216,  434865440,  -4194035,  418933248,  -396120544,  -502225568,  489841024,  -707151360,  -727382784,  -171154448,  112504520,  -20332376,  383985120,  409832224,  -1028380544,  94536528,  1693286528,  286751360,  -372925568,  1171218304,  1463361920,  714828608,  632831232,  698492672,  102256728,  338016064,  249692224,  470255968,  -406406976,  -681613440,  -1618517632,  1658684160,  -1089598848,  594810048,  -1487723008,  498864736,  -761839168,  -33543694,  -479015552,  666806528,  -75234944,  184217584,  -1073737536,  462267328,  432535424,  -1064187648,  -647809920,  422002016,  700395328,  -1276386944,  676287680,  1435960064,  164589584,  98163624,  -267984480,  -436523296,  -638210688,  270166336,  -385436800,  -433269856,  346019744,  850510912,  573156928,  765762624,  1048283392,  -120804544,  299101536,  -636524864,  -242330640,  80326624,  -789039168,  -464483520,  -595626048,  836273088,  247207584,  -516360288,  -582000256,  916374208,  -23749022,  326015936,  544365632,  484824512,  1070984448,  -292867392,  951343872,  -655019008,  -67237712,  -23117662,  365821696,  1066178368,  -300379264,  -519686752,  -225163664,  632096768,  -145444768,  -1056995776,  -1047134528,  78157664,  234919680,  850736384,  -757728896,  -442194816,  -178238992,  -994355776,  -664208128,  55589760,  -198547744,  -268733952,  -335258720,  -10494753,  383196992,  192384464,  96265248,  511571392,  -670272576,  -838996096,  -383418176,  975855232,  831101952,  -835100544,  -424765824,  76321568,  977938304,  -116844584,  816118976,  624840448,  104805792,  168871664,  476183040,  -467180768,  260466144,  -851865984,  -469186528,  -273299520,  -578761856,  -739202496,  -998661504,  -904981824,  -55901148,  475768544,  777374080,  -747846144,  633471168,  786354816,  151747632,  -184790960,  541442880,  335149184,  -134861968,  878260672,  520681024,  -648033280,  -142077520,  834621696,  -992624896,  -341192192,  495630624,  -200100384,  101094944,  157629600,  -719445696,  49263276,  761521344,  155458496,  41817948,  723487232,  -1031938880,  365645600,  557622016,  -845198016,  -748587008,  -233994112,  598808640,  827833472,  777923776,  -684486784,  778044032,  620485312,  625355840,  -597041280,  -964868672,  -619576960,  -889000256,  -870330048,  -633834112,  -526369728,  5433133,  618239040,  747816064,  -383012288,  -443491872,  753940736,  -1035527360,  45870252,  -1057006464,  104457896,  973415680,  234419312,  499502560,  -1017436928,  301725760,  757045952,  -211754768,  316049472,  -119823144,  231367744,  -496124544,  767317376,  747390912,  499083776,  -697476928,  348923136,  123795992,  -130425272,  -20920786,  -481433632,  -606352768,  -140537776,  138935744,  602089984,  -611830976,  -1010393216,  41841572,  -949849216,  810060928,  960749824,  -623839680,  742015744,  795013504,  -672420096,  256821872,  644275136,  874015104,  -596832960,  960008960,  418381344,  338664608,  -479752128,  -316038720,  814053056,  -464590912,  296281888,  -852937536,  158709776,  -586499264,  -951414720,  -361479488,  743596288,  80622976,  140417520,  351974720,  -263116144,  784855872,  -679294144,  251841856,  -646998144,  364266912,  -722555264,  579635904,  -902286720,  -711452736,  1070569984,  -843980416,  -992532608,  -693845504,  1011415424,  -771940928,  567612160,  465568000,  1059568448,  325320160,  -690744576,  997319296,  -763801920,  902804288,  395774784,  -648814912,  293208832,  -542989120,  416409952,  641614400,  512836288,  -829568640,  -390839872,  -166056320,  268091856,  -565634304,  836672512,  9667971,  729723520,  891643776,  811214080,  859468032,  756829056,  -8177617,  -396275168,  930607744,  -510143328,  317148960,  874476800,  145204256,  -535395584,  -760230656,  689206976,  914828032,  664809408,  -407354016,  -449784000,  341379040,  -175941184,  830706816,  383501920,  -874332928,  477147232,  -320183360};
+const Word32 ap_lattice_coeffs_2_fx[132] /* Q31 */ = { 1360843264,  1462880896,  -106124344,  615715776,  313579872,  290773568,  -880779712,  -444026592,  -1410828032,  -218497872,  936944960,  729753600,  -282142848,  -1661606912,  -647739072,  703431872,  713452032,  442076704,  1541038592,  -1186205568,  -322414592,  117158120,  514363136,  -1392593792,  -1550156800,  406684000,  146426176,  13348758,  165409920,  83060376,  909276800,  -233341280,  927820288,  -890434752,  596656832,  898691840,  167097856,  -607873152,  -766668864,  9951439,  -950562176,  -799540352,  866157440,  521887904,  675097984,  954584384,  746287104,  1065244224,  232804400,  1007990144,  -365686400,  700745408,  369704352,  945610048,  125449552,  729442240,  -418684160,  1054884800,  -604078592,  -92599496,  -1036132928,  -719417728,  -721895936,  421913952,  -353525216,  950242176,  -290318304,  -761035968,  970948224,  -668342016,  -746551232,  1070181312,  -620620608,  808379392,  -382088896,  419923232,  716984640,  -327914304,  114310552,  983047168,  950209984,  505204128,  -741223296,  -614390784,  333800576,  870574848,  466160704,  -231842336,  22973780,  792393536,  -1070215680,  -1064756736,  -462737632,  -201582144,  687787456,  -29725468,  1050991360,  1011065344,  -141377440,  744899776,  58581208,  322307232,  1039409984,  -1068139008,  362486656,  -1060515456,  -372648544,  718711232,  567440320,  -911931072,  -676298432,  543498048,  853369216,  -1055627776,  -974371328,  -995053760,  -41077068,  738734,  677385088,  1014353152,  204309440,  608543168,  -483372800,  -257186944,  -1024072704,  80584320,  723596736,  1061954304,  -134438912,  381504768,  996200512,  1050733696};
+const Word32 ap_lattice_coeffs_3_fx[66] /* Q31 */ = { 1360843264,  1462880896,  -106124344,  615715776,  313579872,  290773568,  -880779712,  -444026592,  -1410828032,  -218497872,  936944960,  729753600,  -282142848,  -1661606912,  -647739072,  703431872,  713452032,  442076704,  1541038592,  -1186205568,  -322414592,  117158120,  514363136,  -1392593792,  -1550156800,  406684000,  146426176,  13348758,  165409920,  83060376,  909276800,  -233341280,  927820288,  -890434752,  596656832,  898691840,  167097856,  -607873152,  -766668864,  9951439,  -950562176,  -799540352,  866157440,  521887904,  675097984,  954584384,  746287104,  1065244224,  232804400,  1007990144,  -365686400,  700745408,  369704352,  945610048,  125449552,  729442240,  -418684160,  1054884800,  -604078592,  -92599496,  -1036132928,  -719417728,  -721895936,  421913952,  -353525216,  950242176};
+const Word32 * const ap_lattice_coeffs_fx[DIRAC_DECORR_NUM_SPLIT_BANDS] =
 {
     &ap_lattice_coeffs_1_fx[0],
     &ap_lattice_coeffs_2_fx[0],
@@ -91,11 +90,11 @@ const Word16 ap_split_frequencies_fx[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]/*Q14*/ =
     0 , 2048, 6144, 16384
 };
 
-const int16_t sba_map_tc[11] =
+const Word16 sba_map_tc[11] =
 {
     0, 1, 2, 3, 4, 8, 9, 15, 5, 6, 7
 };
-const int16_t sba_map_tc_512[11] =
+const Word16 sba_map_tc_512[11] =
 {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15
 };
@@ -121,11 +120,11 @@ const int16_t sba_map_tc_512[11] =
 * 13 = 135, 35
 * 14 = -135, 35
 */
-const int16_t channelIndex_CICP6[5] = { 0, 1, 2, 5, 6 };
-const int16_t channelIndex_CICP12[7] = { 0, 1, 2, 5, 6, 3, 4 };
-const int16_t channelIndex_CICP14[7] = { 0, 1, 2, 5, 6, 9, 10 };
-const int16_t channelIndex_CICP16[9] = { 0, 1, 2, 5, 6, 9, 10, 11, 12 };
-const int16_t channelIndex_CICP19[11] = { 0, 1, 2, 3, 4, 7, 8, 9, 10, 13, 14 };
+const Word16 channelIndex_CICP6[5] = { 0, 1, 2, 5, 6 };
+const Word16 channelIndex_CICP12[7] = { 0, 1, 2, 5, 6, 3, 4 };
+const Word16 channelIndex_CICP14[7] = { 0, 1, 2, 5, 6, 9, 10 };
+const Word16 channelIndex_CICP16[9] = { 0, 1, 2, 5, 6, 9, 10, 11, 12 };
+const Word16 channelIndex_CICP19[11] = { 0, 1, 2, 3, 4, 7, 8, 9, 10, 13, 14 };
 
 const Word16 surCohEne_fx[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] /* Q13 */ = 
 { 
@@ -160,7 +159,7 @@ const Word32 diffuseFieldCoherenceDifferenceZ_fx[BINAURAL_COHERENCE_DIFFERENCE_B
  * TD ISM binaural renderer ROM tables
  *----------------------------------------------------------------------------------*/
 
-const int16_t HRTF_MODEL_N_CPTS_VAR[HRTF_MODEL_N_SECTIONS] =
+const Word16 HRTF_MODEL_N_CPTS_VAR[HRTF_MODEL_N_SECTIONS] =
 {
     13, 12, 11
 };
@@ -562,42 +561,6 @@ const Word32 ivas_reverb_default_DSR_fx[IVAS_REVERB_DEFAULT_N_BANDS] /*Q30*/ =
     66, 30, 28
 };
 
-const float ivas_reverb_default_fc[IVAS_REVERB_DEFAULT_N_BANDS] = 
-{
-    20.0f, 25.0f, 31.5f, 40.0f,
-    50.0f, 63.0f, 80.0f, 100.0f,
-    125.0f, 160.0f, 200.0f, 250.0f,
-    315.0f, 400.0f, 500.0f, 630.0f,
-    800.0f, 1000.0f, 1250.0f, 1600.0f,
-    2000.0f, 2500.0f, 3150.0f, 4000.0f,
-    5000.0f, 6300.0f, 8000.0f, 10000.0f,
-    12500.0f, 16000.0f, 20000.0f
-};
-
-const float ivas_reverb_default_RT60[IVAS_REVERB_DEFAULT_N_BANDS] = 
-{
-    1.3622f, 1.4486f, 1.3168f, 1.5787f,
-    1.4766f, 1.3954f, 1.2889f, 1.3462f,
-    1.0759f, 1.0401f, 1.097f, 1.085f,
-    1.091f, 1.0404f, 1.0499f, 1.0699f,
-    1.1028f, 1.1714f, 1.1027f, 1.0666f,
-    1.055f, 1.0553f, 1.0521f, 1.0569f,
-    1.0421f, 0.97822f, 0.80487f, 0.75944f,
-    0.71945f, 0.61682f, 0.60031f
-};
-
-const float ivas_reverb_default_DSR[IVAS_REVERB_DEFAULT_N_BANDS] = 
-{
-    1.8811e-08f, 2.1428e-08f, 1.3972e-08f, 1.51e-08f,
-    1.287e-08f, 1.8747e-08f, 2.413e-08f, 3.9927e-08f,
-    8.9719e-08f, 1.902e-07f, 3.702e-07f, 6.1341e-07f,
-    7.1432e-07f, 6.5331e-07f, 4.6094e-07f, 5.4683e-07f,
-    7.0134e-07f, 6.856e-07f, 7.114e-07f, 6.9604e-07f,
-    5.2939e-07f, 5.699e-07f, 6.1773e-07f, 5.7488e-07f,
-    4.7748e-07f, 2.7213e-07f, 1.3681e-07f, 1.0941e-07f,
-    6.2001e-08f, 2.8483e-08f, 2.6267e-08f
-};
-
 const Word32 release_cnst_table[4][201] = // Q31
     {
         {
diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation_fx.c
similarity index 99%
rename from lib_rend/ivas_rotation.c
rename to lib_rend/ivas_rotation_fx.c
index 758d787b196e56b0322c732312da721657e5d3b5..1633f42d01cdc8314bf5e7ca4cc4be2a5929eb8c 100644
--- a/lib_rend/ivas_rotation.c
+++ b/lib_rend/ivas_rotation_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,11 +37,10 @@
 #include "options.h"
 #include <math.h>
 #include "cnst.h"
-#include "prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "wmc_auto.h"
 #include <stdio.h>
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 #include "debug.h"
 #include "ivas_rom_binaural_crend_head.h"
@@ -400,7 +399,7 @@ void rotateAziEle_fx(
         angle = extract_l( L_shr( Mpy_32_16_1( _180_OVER_PI_Q25, radian ), 24 ) ); // Q0
     }
 
-    *azi = s_max( -180, min( 180, angle ) );
+    *azi = s_max( -180, s_min( 180, angle ) );
     move16();
 
     IF( isPlanar == 0 )
@@ -1975,7 +1974,7 @@ static void external_target_interpolation_fx(
             move16();
             Word32 tmp;
             /* Calculate the interpolation increment and coefficient */
-            tmp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q30, L_shl( L_deposit_l( hExtOrientationData->numFramesToTargetOrientation[i] ), 2 ), &tmp_e );
+            tmp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q30, L_shl( L_deposit_l( hExtOrientationData->numFramesToTargetOrientation[i] ), 2 ), &tmp_e );
             hCombinedOrientationData->interpolationIncrement_fx = L_shl( tmp, sub( tmp_e, 31 ) ); /* Q30 */
             move32();
             hCombinedOrientationData->interpolationCoefficient_fx = hCombinedOrientationData->interpolationIncrement_fx;
@@ -2272,12 +2271,10 @@ void SHrotmatgen_fx(
 
     Word16 R_lm1[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM];
 
-#ifdef MSAN_FIX
     FOR( i = 0; i < HEADROT_SHMAT_DIM; i++ )
     {
         set16_fx( R_lm1[i], 0, HEADROT_SHMAT_DIM );
     }
-#endif
     Word16 R_l[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM];
     Word32 result;
     SHrotmat[0][0] = ONE_IN_Q14;
diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering_fx.c
similarity index 99%
rename from lib_rend/ivas_sba_rendering.c
rename to lib_rend/ivas_sba_rendering_fx.c
index 0309cf61ff3f6721aabaff91e7cfea3e59402562..5e097ab2bedc0622f73dbcc03bdb1431c21aeeab 100644
--- a/lib_rend/ivas_sba_rendering.c
+++ b/lib_rend/ivas_sba_rendering_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,10 +32,8 @@
 
 #include <stdint.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_dec.h"
 #include "ivas_cnst.h"
 #include <math.h>
diff --git a/lib_rend/ivas_shoebox.c b/lib_rend/ivas_shoebox_fx.c
similarity index 98%
rename from lib_rend/ivas_shoebox.c
rename to lib_rend/ivas_shoebox_fx.c
index 6e27da202e25473c707c9ef4f26d951037a3505f..0156e70b59727210b58433ce2e2f6b7dc99edbc0 100644
--- a/lib_rend/ivas_shoebox.c
+++ b/lib_rend/ivas_shoebox_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,10 +33,9 @@
 #include "options.h"
 #include <stdint.h>
 #include <math.h>
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_rend.h"
 #include "ivas_cnst.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "wmc_auto.h"
 #include "ivas_rom_com.h"
@@ -388,7 +387,7 @@ static Word32 shoebox_get_euclidian_distance_internal_fx(
     {
         q = Q22;
         move16();
-        t = (Word32) BASOP_Util_Divide3232_Scale_cadence( *scale, absxk, &q );
+        t = (Word32) BASOP_Util_Divide3232_Scale_newton( *scale, absxk, &q );
 
         out_tmp = W_extract_h( W_shl( W_mult_32_32( out_tmp, t ), q ) ); // Q22 + Q31 + Q1 - 32 = Q22
         out_tmp = W_extract_h( W_shl( W_mult_32_32( out_tmp, t ), q ) ); // Q22 + Q31 + Q1 - 32 = Q22
@@ -398,7 +397,7 @@ static Word32 shoebox_get_euclidian_distance_internal_fx(
     }
     ELSE
     {
-        t = (Word32) BASOP_Util_Divide3232_Scale_cadence( absxk, *scale, &q );
+        t = (Word32) BASOP_Util_Divide3232_Scale_newton( absxk, *scale, &q );
         t = W_extract_h( W_shl( W_mult_32_32( t, t ), sub( shl( q, 1 ), 9 ) ) ); // Q31 + Q31 + Q1 - 9 - 32 = Q22
         out_tmp = L_add( out_tmp, t );                                           // Q22
         move32();
@@ -408,7 +407,7 @@ static Word32 shoebox_get_euclidian_distance_internal_fx(
 
     IF( GE_32( absxk, *scale ) )
     {
-        t = (Word32) BASOP_Util_Divide3232_Scale_cadence( *scale, absxk, &q );
+        t = (Word32) BASOP_Util_Divide3232_Scale_newton( *scale, absxk, &q );
 
         out_tmp = W_extract_h( W_shl( W_mult_32_32( out_tmp, t ), q ) ); // Q22 + Q31 + Q1 - 32 = Q22
         out_tmp = W_extract_h( W_shl( W_mult_32_32( out_tmp, t ), q ) ); // Q22 + Q31 + Q1 - 32 = Q22
@@ -418,7 +417,7 @@ static Word32 shoebox_get_euclidian_distance_internal_fx(
     }
     ELSE
     {
-        t = (Word32) BASOP_Util_Divide3232_Scale_cadence( absxk, *scale, &q );
+        t = (Word32) BASOP_Util_Divide3232_Scale_newton( absxk, *scale, &q );
         t = W_extract_h( W_shl( W_mult_32_32( t, t ), sub( shl( q, 1 ), 9 ) ) ); // Q31 + Q31 + Q1 - 9 - 32 = Q22
         out_tmp = L_add( out_tmp, t );                                           // Q22
     }
diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h
index 46283da5c568a6d8840622d63f3291bfbf979bd0..90e4f5d69e1807117eaf263bdf404a348de261a4 100644
--- a/lib_rend/ivas_stat_rend.h
+++ b/lib_rend/ivas_stat_rend.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -120,8 +120,8 @@ typedef struct dirac_decorr_params_structure
 
     Word16 *pre_delay;
     Word16 *filter_length;
-    Word16 *filter_coeff_num_real_fx; /* Q12 */
-    Word16 *filter_coeff_den_real_fx; /* Q12 */
+    Word32 *filter_coeff_num_real_fx; /* Q28 */
+    Word32 *filter_coeff_den_real_fx; /* Q28 */
     Word16 *phase_coeff_real_fx;      /* Q14 */
     Word16 *phase_coeff_imag_fx;      /* Q14 */
     Word16 *split_frequency_bands;
@@ -226,16 +226,11 @@ typedef struct dirac_dec_stack_mem
     Word32 *cy_auto_dir_smooth_fx;
     Word32 *cy_cross_dir_smooth_fx;
     Word32 *cy_auto_diff_smooth_fx;
-#ifdef FIX_867
-    Word16 *q_cy_auto_dir_smooth;
-    Word16 *q_cy_cross_dir_smooth;
-    Word16 *q_cy_auto_diff_smooth;
-#endif
 
     Word32 *reference_power_fx;
-#ifdef FIX_867
-    Word16 *reference_power_q;
-    Word16 *reference_power_smooth_q;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 reference_power_q[2];
+    Word16 reference_power_smooth_q[2];
 #else
     Word16 reference_power_q;
     Word16 reference_power_smooth_q;
@@ -287,8 +282,8 @@ typedef struct dirac_output_synthesis_state_structure
 
     /* Temporal smoothing memories */
     Word32 *reference_power_smooth_prev_fx; /* Q(reference_power_smooth_prev_q) */
-#ifdef FIX_867
-    Word16 *reference_power_smooth_prev_q;
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 reference_power_smooth_prev_q[2];
 #else
     Word16 reference_power_smooth_prev_q;
 #endif
@@ -309,10 +304,18 @@ typedef struct dirac_output_synthesis_state_structure
     Word16 diff_dir_power_factor_len;
 
     Word32 *proto_power_smooth_fx; /* Smoothed power of the prototype signals. Size: num_freq_bands*num_channels. */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 proto_power_smooth_q[2];
+#else
     Word16 proto_power_smooth_q;
+#endif
     Word16 proto_power_smooth_len;
     Word32 *proto_power_smooth_prev_fx; /* Smoothed power of the prototype signals of the previous synthesis block. Size: num_freq_bands*num_channels. */
+#ifdef FIX_867_CLDFB_NRG_SCALE
+    Word16 proto_power_smooth_prev_q[2];
+#else
     Word16 proto_power_smooth_prev_q;
+#endif
     Word16 proto_power_smooth_prev_len;
 
     Word32 *proto_power_diff_smooth_fx;
@@ -334,13 +337,8 @@ typedef struct dirac_output_synthesis_state_structure
     Word32 *gains_dir_prev_fx;  /* Direct sound gains of current synthesis block. Size: num_freq_bands*num_channel. */
     Word32 *gains_diff_prev_fx; /* Diffuse sound gains of previous synthesis block. Size: num_freq_bands*num_channel. */
 
-#ifdef FIX_867
-    Word16 *gains_dir_prev_q;
-    Word16 *gains_diff_prev_q;
-#else
     Word16 gains_dir_prev_q;
     Word16 gains_diff_prev_q;
-#endif
 
     Word16 gains_dir_prev_len;
     Word16 gains_diff_prev_len;
@@ -350,15 +348,9 @@ typedef struct dirac_output_synthesis_state_structure
     Word32 *cy_cross_dir_smooth_fx; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
     Word32 *cy_auto_diff_smooth_fx; /* Target auto PSD of diffuse sound. Size: num_freq_bands*num_channels. */
 
-#ifdef FIX_867
-    Word16 *q_cy_auto_dir_smooth;  /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
-    Word16 *q_cy_cross_dir_smooth; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
-    Word16 *q_cy_auto_diff_smooth; /* Target auto PSD of diffuse sound. Size: num_freq_bands*num_channels. */
-#else
-    Word16 q_cy_auto_dir_smooth;       /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
-    Word16 q_cy_cross_dir_smooth;      /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
-    Word16 q_cy_auto_diff_smooth;      /* Target auto PSD of diffuse sound. Size: num_freq_bands*num_channels. */
-#endif
+    Word16 q_cy_auto_dir_smooth;  /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
+    Word16 q_cy_cross_dir_smooth; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
+    Word16 q_cy_auto_diff_smooth; /* Target auto PSD of diffuse sound. Size: num_freq_bands*num_channels. */
 
     Word16 cy_auto_dir_smooth_len;  /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
     Word16 cy_cross_dir_smooth_len; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
@@ -369,15 +361,9 @@ typedef struct dirac_output_synthesis_state_structure
     Word32 *cy_cross_dir_smooth_prev_fx; /* Target cross PSD of direct sound of previous synthesis block. Size: num_freq_bands*num_channels. */
     Word32 *cy_auto_diff_smooth_prev_fx; /* Target auto PSD of diffuse sound of previous synthesis block. Size: num_freq_bands*num_channels. */
 
-#ifdef FIX_867
-    Word16 *q_cy_auto_dir_smooth_prev;  /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
-    Word16 *q_cy_cross_dir_smooth_prev; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
-    Word16 *q_cy_auto_diff_smooth_prev; /* Target auto PSD of diffuse sound. Size: num_freq_bands*num_channels. */
-#else
     Word16 q_cy_auto_dir_smooth_prev;  /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
     Word16 q_cy_cross_dir_smooth_prev; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
     Word16 q_cy_auto_diff_smooth_prev; /* Target auto PSD of diffuse sound. Size: num_freq_bands*num_channels. */
-#endif
 
     Word16 cy_auto_dir_smooth_prev_len;  /* Target auto PSD of direct sound. Size: num_freq_bands*num_channels. */
     Word16 cy_cross_dir_smooth_prev_len; /* Target cross PSD of direct sound. Size: num_freq_bands*num_channels. */
@@ -477,12 +463,7 @@ typedef struct ivas_dirac_rend_data_structure
     Word32 *buffer_intensity_real_fx[DIRAC_NUM_DIMS][DIRAC_NO_COL_AVG_DIFF]; /* Q(q_buffer_intensity_real[]) */
     Word16 q_buffer_intensity_real[DIRAC_NO_COL_AVG_DIFF];
     Word32 *buffer_energy_fx; /* Q(q_buffer_energy[]) */
-#ifdef FIX_867
-    Word16 q_buffer_energy[CLDFB_NO_CHANNELS_MAX * DIRAC_NO_COL_AVG_DIFF];
-#else
     Word16 q_buffer_energy[DIRAC_NO_COL_AVG_DIFF];
-#endif
-
 
     Word16 *frequency_axis_fx;            /* Q0 */
     Word16 *diffuse_response_function_fx; /* Q15 */
@@ -702,7 +683,7 @@ typedef struct ivas_binaural_rendering_conv_module_struct_fx
 
     Word32 ***filterStatesLeftReal_fx;
     Word32 ***filterStatesLeftImag_fx;
-    Word16 ***Q_filterStatesLeft;
+    Word16 Q_filterStatesLeft;
 
     Word16 numTapsArray[BINAURAL_CONVBANDS];
     Word16 numTaps;
@@ -1278,8 +1259,8 @@ typedef struct
     Word16 hrf_right_prev_e;
     Word32 azim_prev_fx;
     Word32 elev_prev_fx;
-    Word16 Gain_fx;     // Q14
-    Word16 prevGain_fx; // Q14
+    Word32 Gain_fx;     // Q30
+    Word32 prevGain_fx; // Q30
 
 } TDREND_SRC_t;
 
diff --git a/lib_rend/ivas_td_decorr.c b/lib_rend/ivas_td_decorr_fx.c
similarity index 98%
rename from lib_rend/ivas_td_decorr.c
rename to lib_rend/ivas_td_decorr_fx.c
index c4507aae1d60243c3be4cfd0b6fa14bdc02fd47d..14795da41b11854851fec67f7a8b67321ef0c517 100644
--- a/lib_rend/ivas_td_decorr.c
+++ b/lib_rend/ivas_td_decorr_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,11 +33,9 @@
 #include <stdint.h>
 #include <assert.h>
 #include "options.h"
-#include "prot.h"
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "math.h"
 #include "wmc_auto.h"
 #ifdef DEBUGGING
@@ -487,7 +485,7 @@ void ivas_td_decorr_process_fx(
 
     /* Look-ahead delay */
     Copy32( pcm_in[0], ppOut_pcm[0], output_frame );
-    delay_signal_fx( ppOut_pcm[0], output_frame, hTdDecorr->look_ahead_buf, hTdDecorr->offset );
+    delay_signal32_fx( ppOut_pcm[0], output_frame, hTdDecorr->look_ahead_buf, hTdDecorr->offset );
 
     /* In ducking gains */
     IF( hTdDecorr->ducking_flag )
diff --git a/lib_rend/ivas_vbap.c b/lib_rend/ivas_vbap_fx.c
similarity index 99%
rename from lib_rend/ivas_vbap.c
rename to lib_rend/ivas_vbap_fx.c
index 24465c3e70edf0ab1e9de7507d4c8832cec124a1..7495953e3e462f5eca9be008502a81e7be8a6656 100644
--- a/lib_rend/ivas_vbap.c
+++ b/lib_rend/ivas_vbap_fx.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,12 +34,10 @@
 #include "options.h"
 #include <assert.h>
 #include <math.h>
-#include "prot.h"
-#include "ivas_prot.h"
-#include "ivas_prot_rend.h"
+#include "prot_fx.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_stat_dec.h"
 #include "wmc_auto.h"
-#include "prot_fx.h"
 #include "ivas_prot_fx.h"
 
 /*-----------------------------------------------------------------------*
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index b7290990fc6e101aa0216ffe632629a486c30538..e39b9a61e5e69fad68e535a1ef6ce72e23023fe8 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,25 +32,22 @@
 #include "basop_util.h"
 #include "options.h"
 #include "lib_rend.h"
-#include "prot.h"
-#include "ivas_prot.h"
+#include "prot_fx.h"
 #include "ivas_prot_fx.h"
-#include "ivas_prot_rend.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
+#include "ivas_rom_com_fx.h"
 #include "ivas_rom_rend.h"
 #include <assert.h>
 #include <math.h>
 #include <stdbool.h>
 #include "wmc_auto.h"
-
-#include "ivas_rom_com_fx.h"
-#include "ivas_prot_fx.h"
-#include "prot_fx.h"
+#ifdef DEBUGGING
 #include "debug.h"
-#define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) )
-#define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) )
-#define IVAS_FLOAT_FIXED_TO_BE_REMOVED
+#endif
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -1179,8 +1176,8 @@ static Word8 checkObjectPositionChanged_fx(
     IVAS_ISM_METADATA *previousPos )
 {
     test();
-    return !( LT_32( abs( L_sub( currentPos->azimuth_fx, previousPos->azimuth_fx ) ), EPSILLON_FX ) &&
-              LT_32( abs( L_sub( currentPos->elevation_fx, previousPos->elevation_fx ) ), EPSILLON_FX ) );
+    return !( LT_32( L_abs( L_sub( currentPos->azimuth_fx, previousPos->azimuth_fx ) ), EPSILLON_FX ) &&
+              LT_32( L_abs( L_sub( currentPos->elevation_fx, previousPos->elevation_fx ) ), EPSILLON_FX ) );
 }
 
 static rendering_context getRendCtx(
@@ -2020,7 +2017,7 @@ static ivas_error updateMcPanGainsForAmbiOut(
                 Word32 temp = inputMc->panGains_fx[ch_out][i];
                 move32();
 
-                IF( GE_32( abs( temp ), ONE_IN_Q29 ) )
+                IF( GE_32( L_abs( temp ), ONE_IN_Q29 ) )
                 {
                     IF( temp > 0 )
                     {
@@ -2068,7 +2065,7 @@ static ivas_error updateMcPanGainsForAmbiOut(
             {
                 Word32 temp = inputMc->panGains_fx[ch_out][i];
                 move32();
-                IF( GE_32( abs( temp ), ONE_IN_Q29 ) )
+                IF( GE_32( L_abs( temp ), ONE_IN_Q29 ) )
                 {
                     IF( temp > 0 )
                     {
@@ -4539,7 +4536,7 @@ static void renderBufferChannelLerp_fx(
         /* Process current output channel only if applying non-zero gains */
         test();
         test();
-        IF( GT_32( abs( currentGain ), EPSILON_FX ) || ( gainsPrev != NULL && GT_32( abs( previousGain ), EPSILON_FX ) ) )
+        IF( GT_32( L_abs( currentGain ), EPSILON_FX ) || ( gainsPrev != NULL && GT_32( L_abs( previousGain ), EPSILON_FX ) ) )
         {
             /* Reset input pointer to the beginning of input channel */
             inSmpl = getSmplPtr_fx( inAudio, inChannelIdx, 0 );
@@ -4548,7 +4545,7 @@ static void renderBufferChannelLerp_fx(
             outSmpl = getSmplPtr_fx( outAudio, outChnlIdx, 0 );
 
             test();
-            IF( gainsPrev == NULL || LE_32( abs( L_sub( L_shr( previousGain, 1 ), L_shr( currentGain, 1 ) ) ), EPSILON_FX ) )
+            IF( gainsPrev == NULL || LE_32( L_abs( L_sub( L_shr( previousGain, 1 ), L_shr( currentGain, 1 ) ) ), EPSILON_FX ) )
             {
                 /* If no interpolation from previous frame, apply current gain */
                 DO
@@ -4564,40 +4561,58 @@ static void renderBufferChannelLerp_fx(
             {
                 i = 0;
                 Word32 tmp = Q31_BY_SUB_FRAME_240;
+                Word32 tmp1 = 239; /* L_SUBFRAME_48k - 1 */
+                move32();
                 move32();
                 move32();
                 SWITCH( outAudio.config.numSamplesPerChannel )
                 {
                     case NUM_SAMPLES_960:
                         tmp = Q31_BY_NUM_SAMPLES_960;
+                        tmp1 = 959; /* NUM_SAMPLES_960 - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case NUM_SAMPLES_720:
                         tmp = Q31_BY_NUM_SAMPLES_720;
+                        tmp1 = 719; /* NUM_SAMPLES_720 - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case NUM_SAMPLES_320:
                         tmp = Q31_BY_NUM_SAMPLES_320;
+                        tmp1 = 319; /* NUM_SAMPLES_320 - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case NUM_SAMPLES_160:
                         tmp = Q31_BY_NUM_SAMPLES_160;
+                        tmp1 = 159; /* NUM_SAMPLES_160 - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case L_SUBFRAME_48k:
                         tmp = Q31_BY_SUB_FRAME_240;
+                        tmp1 = 239; /* L_SUBFRAME_48k - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case L_SUBFRAME_32k:
                         tmp = Q31_BY_SUB_FRAME_180;
+                        tmp1 = 179; /* L_SUBFRAME_32k - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case L_SUBFRAME_16k:
                         tmp = Q31_BY_SUB_FRAME_80;
+                        tmp1 = 79; /* L_SUBFRAME_16k - 1 */
+                        move32();
                         move32();
                         BREAK;
                     case L_SUBFRAME_8k:
                         tmp = Q31_BY_SUB_FRAME_40;
+                        tmp1 = 39; /* L_SUBFRAME_8k - 1 */
+                        move32();
                         move32();
                         BREAK;
                     default:
@@ -4606,7 +4621,15 @@ static void renderBufferChannelLerp_fx(
                 /* Otherwise use weighted average between previous and current gain */
                 DO
                 {
-                    fadeIn = UL_Mpy_32_32( i, tmp );
+                    IF( EQ_32( i, tmp1 ) )
+                    {
+                        fadeIn = ONE_IN_Q31;
+                        move32();
+                    }
+                    ELSE
+                    {
+                        fadeIn = UL_Mpy_32_32( i, tmp );
+                    }
                     fadeOut = L_sub( ONE_IN_Q31, fadeIn );
 
                     *outSmpl = L_add( Mpy_32_32( L_add( Mpy_32_32( fadeIn, currentGain ), Mpy_32_32( fadeOut, previousGain ) ), ( *inSmpl ) ), *outSmpl );
@@ -5749,7 +5772,11 @@ static ivas_error renderLfeToBinaural_fx(
     {
         writePtr = getSmplPtr_fx( outAudio, ear_idx, 0 );
         move32();
+#ifdef VEC_ARITH_OPT_v1
+        v_add_fixed_no_hdrm( writePtr, tmpLfeBuffer, writePtr, frame_size ); /* Q(out_q) */
+#else                                                                        /* VEC_ARITH_OPT_v1 */
         v_add_fixed( writePtr, tmpLfeBuffer, writePtr, frame_size, 0 ); /* Q(out_q) */
+#endif                                                                       /* VEC_ARITH_OPT_v1 */
     }
 
     pop_wmops();
@@ -6770,7 +6797,11 @@ static void renderMasaToMasa(
     ELSE IF( EQ_16( masaInput->base.inputBuffer.config.numChannels, 2 ) && EQ_16( outAudio.config.numChannels, 1 ) )
     {
         //  v_add( tmpBuffer[0], tmpBuffer[1], tmpBuffer[0], masaInput->base.inputBuffer.config.numSamplesPerChannel );
+#ifdef VEC_ARITH_OPT_v1
+        v_add_fixed_no_hdrm( tmpBuffer_fx[0], tmpBuffer_fx[1], tmpBuffer_fx[0], masaInput->base.inputBuffer.config.numSamplesPerChannel );
+#else  /* VEC_ARITH_OPT_v1 */
         v_add_fixed( tmpBuffer_fx[0], tmpBuffer_fx[1], tmpBuffer_fx[0], masaInput->base.inputBuffer.config.numSamplesPerChannel, 0 );
+#endif /* VEC_ARITH_OPT_v1 */
     }
 
     /* Copy metadata */
@@ -6813,7 +6844,7 @@ static void renderMasaToMasa(
                 move32();
                 FOR( dir = 0; dir < numDirs; dir++ )
                 {
-                    tmp = BASOP_Util_Divide3232_Scale_cadence( inMeta->directional_meta[dir].energy_ratio_fx[sf][band], ratioSum_fx, &tmp_e );
+                    tmp = BASOP_Util_Divide3232_Scale_newton( inMeta->directional_meta[dir].energy_ratio_fx[sf][band], ratioSum_fx, &tmp_e );
                     inMeta->directional_meta[dir].energy_ratio_fx[sf][band] = L_shl( tmp, sub( tmp_e, 1 ) ); /* Q30 */
                     move32();
                 }
@@ -6821,7 +6852,7 @@ static void renderMasaToMasa(
                 move16();
                 tmp = 0;
                 move32();
-                tmp = BASOP_Util_Divide3232_Scale_cadence( inMeta->common_meta.diffuse_to_total_ratio_fx[sf][band], ratioSum_fx, &tmp_e );
+                tmp = BASOP_Util_Divide3232_Scale_newton( inMeta->common_meta.diffuse_to_total_ratio_fx[sf][band], ratioSum_fx, &tmp_e );
                 inMeta->common_meta.diffuse_to_total_ratio_fx[sf][band] = L_shl( tmp, sub( tmp_e, 1 ) ); /* Q30 */
                 move32();
             }
@@ -8164,7 +8195,7 @@ static ivas_error initMasaExtRenderer(
     {
         FOR( i = 0; i < hMasaExtRend->nchan_input; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbAnaRend[i] ), CLDFB_ANALYSIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbAnaRend[i] ), CLDFB_ANALYSIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -8172,7 +8203,7 @@ static ivas_error initMasaExtRenderer(
 
         FOR( i = 0; i < hMasaExtRend->nchan_output; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbSynRend[i] ), CLDFB_SYNTHESIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbSynRend[i] ), CLDFB_SYNTHESIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -8283,85 +8314,44 @@ static void intermidiate_ext_dirac_render(
 
     IF( to_fix )
     {
-#ifdef FIX_867
-        set16_fx( DirAC_mem.reference_power_smooth_q, Q31, DirAC_mem.reference_power_len );
-        set16_fx( DirAC_mem.reference_power_q, Q31, DirAC_mem.reference_power_len );
+#ifdef FIX_867_CLDFB_NRG_SCALE
+        DirAC_mem.reference_power_smooth_q[0] = DirAC_mem.reference_power_q[0] = Q31;
+        DirAC_mem.reference_power_smooth_q[1] = DirAC_mem.reference_power_q[1] = Q31;
+        move16();
+        move16();
 #else
         DirAC_mem.reference_power_smooth_q = DirAC_mem.reference_power_q = Q31;
         move16();
-        move16();
 #endif
+        move16();
         FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )
         {
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len; kk++ )
-            {
-                Word16 shift = norm_l( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk] );
-                hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk] =
-                    L_shl( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk], shift );
-
-                hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[kk] =
-                    add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[kk], shift );
-                move16();
-            }
-#else
             Scale_sig32( hDirACRend->h_output_synthesis_psd_state.direct_responses_fx, i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ), sub( Q30, hDirACRend->h_output_synthesis_psd_state.direct_responses_q ) ); /* Q30 */
             hDirACRend->h_output_synthesis_psd_state.direct_responses_q = Q30;
             move16();
-#endif
         }
 
         IF( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx )
         {
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len; kk++ )
-            {
-                Word16 shift = L_norm_arr( &hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk], 1 );
-                scale_sig32( &hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx[kk], 1, shift );
-                hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth[kk], shift );
-                move16();
-            }
-#else
             Word16 shift = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_fx, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_len, shift ); /* Q(hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth + shift) */
             hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth = add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth, shift );
             move16();
-#endif
         }
         IF( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx )
         {
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_len; kk++ )
-            {
-                Word16 shift = L_norm_arr( &hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[kk], 1 );
-                scale_sig32( &hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx[kk], 1, shift );
-                hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev[kk], shift );
-                move16();
-            }
-#else
             Word16 shift = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_len );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.cy_cross_dir_smooth_prev_len, shift ); /* Q(hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev + shift) */
             hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev = add( hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev, shift );
             move16();
-#endif
         }
 
         IF( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_fx )
         {
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < hDirACRend->num_outputs_dir * hSpatParamRendCom->num_freq_bands; kk++ )
-            {
-                Word16 shift = L_norm_arr( &hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_fx[kk], 1 );
-                scale_sig32( &hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_fx[kk], 1, shift );
-                hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth[kk], shift );
-                move16();
-            }
-#else
             Word16 shift = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_fx, imult1616( hDirACRend->num_outputs_dir, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_fx, hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_len, shift ); /* Q(hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth + shift) */
             hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth, shift );
             move16();
-#endif
         }
 
         Word16 num_channels_dir = hDirACRend->num_outputs_dir;
@@ -8375,83 +8365,32 @@ static void intermidiate_ext_dirac_render(
 
         IF( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx )
         {
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < num_channels_dir * hSpatParamRendCom->num_freq_bands; kk++ )
-            {
-                tmp = L_norm_arr( &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk], 1 );
-                scale_sig32( &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[kk], 1, tmp );
-                h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk] = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth[kk], tmp );
-                move16();
-            }
-#else
             tmp = L_norm_arr( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, imult1616( num_channels_dir, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_len, tmp ); /* Q(h_dirac_output_synthesis_state->q_cy_auto_diff_smooth + tmp) */
             h_dirac_output_synthesis_state->q_cy_auto_diff_smooth = add( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, tmp );
             move16();
-#endif
         }
 
         IF( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx )
         {
-#ifdef FIX_867
-            FOR( Word16 kk = 0; kk < hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_len; kk++ )
-            {
-                tmp = L_norm_arr( &hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk], 1 );
-                scale_sig32( &hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx[kk], 1, tmp );
-                hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev[kk], tmp );
-                move16();
-            }
-#else
             tmp = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_len );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.cy_auto_diff_smooth_prev_len, tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev + tmp) */
             hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_diff_smooth_prev, tmp );
             move16();
-#endif
-        }
-
-#ifdef FIX_867
-        FOR( Word16 kk = 0; kk < hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_len; kk++ )
-        {
-            scale_sig32( &hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx[kk],
-                         1,
-                         Q26 - hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q[kk] );
         }
-        set16_fx( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q, Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_len );
 
-        FOR( Word16 kk = 0; kk < hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_len; kk++ )
-        {
-            scale_sig32( &hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx[kk],
-                         1,
-                         Q26 - hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q[kk] );
-        }
-        set16_fx( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q, Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_len );
-#else
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_fx, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_len, sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q ) ); /* Q26 */
         hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q = Q26;
         move16();
         scale_sig32( hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_fx, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_len, sub( Q26, hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q ) ); /* Q26 */
         hDirACRend->h_output_synthesis_psd_state.gains_diff_prev_q = Q26;
         move16();
-#endif
         IF( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx )
         {
-#ifdef FIX_867
-            FOR( Word16 l = 0; l < hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_len; l++ )
-            {
-                Word16 shift = norm_l( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx[l] );
-                hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx[l] =
-                    L_shl( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx[l], shift );
-                /* Q(hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev + shift) */
-
-                hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev[l] = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev[l], shift );
-                move16();
-            }
-#else
             Word16 shift = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx, imult1616( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_dir ) );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.cy_auto_dir_smooth_prev_len, shift ); /* Q(hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev + shift) */
             hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev = add( hDirACRend->h_output_synthesis_psd_state.q_cy_auto_dir_smooth_prev, shift );
             move16();
-#endif
         }
 
         IF( EQ_16( hDirACRend->proto_signal_decorr_on, 1 ) )
@@ -8512,22 +8451,76 @@ static void intermidiate_ext_dirac_render(
 
         IF( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx )
         {
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            tmp = 0;
+            move16();
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                tmp = s_min( tmp, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + slot_idx, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
+            }
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + slot_idx, s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q + tmp) */
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0] = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[0], tmp );
+            move16();
+            tmp = 0;
+            move16();
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                tmp = s_min( tmp, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + slot_idx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+            }
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx + slot_idx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q + tmp) */
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1] = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q[1], tmp );
+            move16();
+#else
             tmp = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx, imult1616( hDirACRend->num_protos_dir, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len, tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q + tmp) */
             hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q = add( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_q, tmp );
             move16();
+#endif
+#ifdef FIX_867_CLDFB_NRG_SCALE
+            tmp = 0;
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                tmp = s_min( tmp, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, s_min( CLDFB_NO_CHANNELS_HALF, hSpatParamRendCom->num_freq_bands ) ) );
+            }
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, s_min( CLDFB_NO_CHANNELS_HALF, hSpatParamRendCom->num_freq_bands ), tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q + tmp) */
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] = add( tmp, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[0] );
+            move16();
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                tmp = s_min( tmp, L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ) );
+            }
+            FOR( slot_idx = 0; slot_idx < hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_len; slot_idx = add( slot_idx, hSpatParamRendCom->num_freq_bands ) )
+            {
+                scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q + tmp) */
+            }
+            hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] = add( tmp, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q[1] );
+            move16();
+#else
             tmp = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, imult1616( hDirACRend->num_protos_dir, hSpatParamRendCom->num_freq_bands ) );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_len, tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q + tmp) */
             hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q = add( tmp, hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_prev_q );
             move16();
+#endif
         }
+        IF( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx != NULL )
+        {
 
-        tmp = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_len );
-        scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_len, tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q + tmp) */
-        hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q = add( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q, tmp );
-        move16();
+            tmp = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_len );
+            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_len, tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q + tmp) */
+            hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q = add( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_q, tmp );
+            move16();
+        }
 
-        IF( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx != 0 )
+        IF( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx != NULL )
         {
             tmp = L_norm_arr( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_len );
             scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_fx, hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_len, tmp ); /* Q(hDirACRend->h_output_synthesis_psd_state.proto_power_diff_smooth_prev_q + tmp) */
@@ -8556,3 +8549,96 @@ static void intermidiate_ext_dirac_render(
         }
     }
 }
+
+static ivas_error printConfigInfo_rend(
+    IVAS_REND_HANDLE hIvasRend /* i  : IVAS renderer handle     */
+)
+{
+    ivas_error error;
+    Word8 config_str[50];
+
+    /*-----------------------------------------------------------------*
+     * Print output audio configuration
+     *-----------------------------------------------------------------*/
+
+    IF( NE_32( ( error = get_channel_config( hIvasRend->outputConfig, &config_str[0] ) ), IVAS_ERR_OK ) )
+    {
+        return error;
+    }
+
+    fprintf( stdout, "Output configuration:   %s\n", config_str );
+
+    /*-----------------------------------------------------------------*
+     * Print renderer configurations
+     *-----------------------------------------------------------------*/
+
+    fprintf( stdout, "Output sampling rate:   %d Hz\n", hIvasRend->sampleRateOut );
+
+    if ( hIvasRend->headRotData.headRotEnabled )
+    {
+        fprintf( stdout, "Head-tracking:          ON\n" );
+    }
+
+    IF( EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL ) ||
+        EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) ||
+        EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ||
+        EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ||
+        EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+    {
+        fprintf( stdout, "Render framesize:       %dms\n", mult( hIvasRend->num_subframes, 5 ) );
+    }
+
+    return IVAS_ERR_OK;
+}
+
+
+/*---------------------------------------------------------------------*
+ * IVAS_REND_PrintInputConfig()
+ *
+ *
+ *---------------------------------------------------------------------*/
+
+void IVAS_REND_PrintInputConfig(
+    const IVAS_AUDIO_CONFIG inputConfig /* i  : input audio configuration    */
+)
+{
+    Word8 config_str[50];
+
+    get_channel_config( inputConfig, &config_str[0] );
+    fprintf( stdout, "Input configuration:    %s\n", config_str );
+
+    return;
+}
+
+
+/*---------------------------------------------------------------------*
+ * IVAS_REND_PrintConfig()
+ *
+ *
+ *---------------------------------------------------------------------*/
+
+ivas_error IVAS_REND_PrintConfig(
+    IVAS_REND_HANDLE hIvasRend /* i  : IVAS renderer handle    */
+)
+{
+    if ( hIvasRend == NULL )
+    {
+        return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+    }
+
+    return printConfigInfo_rend( hIvasRend );
+}
+
+
+/*---------------------------------------------------------------------*
+ * IVAS_REND_PrintDisclaimer()
+ *
+ * Print IVAS disclaimer to console
+ *---------------------------------------------------------------------*/
+
+void IVAS_REND_PrintDisclaimer( void )
+{
+    print_disclaimer( stderr );
+
+    return;
+}
diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h
index f3726a05b216041c6de9274204c369ff6051a92b..e837daa4f54faebea954292a031669f385b3ca3d 100644
--- a/lib_rend/lib_rend.h
+++ b/lib_rend/lib_rend.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -88,7 +88,7 @@ typedef enum
     IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN,
 } IVAS_REND_AudioConfigType;
 
-typedef uint16_t IVAS_REND_InputId;
+typedef UWord16 IVAS_REND_InputId;
 
 typedef enum _IVAS_REND_COMPLEXITY_LEVEL
 {
@@ -324,6 +324,20 @@ void IVAS_REND_Close(
 );
 
 
+/* Disclaimer and info printing */
+
+void IVAS_REND_PrintInputConfig(
+    const IVAS_AUDIO_CONFIG inputConfig             /* i  : input audio configuration                           */
+);
+
+ivas_error IVAS_REND_PrintConfig(
+    IVAS_REND_HANDLE hIvasRend                      /* i  : IVAS renderer handle                                */
+);
+
+void IVAS_REND_PrintDisclaimer( 
+    void 
+);
+
 /* clang-format on */
 
 #endif
diff --git a/lib_util/audio_file_reader.c b/lib_util/audio_file_reader.c
index ff9a9b33bea53240938fac15d58be6ed1766cd4e..ca5e6e4963b676da58526fbb30a3cf07d9f34f77 100644
--- a/lib_util/audio_file_reader.c
+++ b/lib_util/audio_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/audio_file_reader.h b/lib_util/audio_file_reader.h
index 185d8c077475812f10c821a1c1ec4740b9fbd7f8..571c1e765637e1cb30ac9afa9cb49b45127886b7 100644
--- a/lib_util/audio_file_reader.h
+++ b/lib_util/audio_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/audio_file_writer.c b/lib_util/audio_file_writer.c
index 0f2f5335d785438e2e743e86a32aa5643921d3e6..fb7a64c425b6f648667a969290b6086c11158887 100644
--- a/lib_util/audio_file_writer.c
+++ b/lib_util/audio_file_writer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/audio_file_writer.h b/lib_util/audio_file_writer.h
index 0b1c3315f23279a176e481743e88d2d31466f599..2622992cecbbb4875a6aa5d7440492bc0d9ccb86 100644
--- a/lib_util/audio_file_writer.h
+++ b/lib_util/audio_file_writer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/bitstream_reader.c b/lib_util/bitstream_reader.c
index 841d6e1de73b83a97f661b8c7f1b50ffe97b6ccb..2bd6f46aa6014e8e37f1c77bd051d49eabb47da4 100644
--- a/lib_util/bitstream_reader.c
+++ b/lib_util/bitstream_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/bitstream_reader.h b/lib_util/bitstream_reader.h
index e33de489777e6493615f382bba69b05e1de96802..fb6f9f9b9dac7304cd1bf029cdf2c2822991f62c 100644
--- a/lib_util/bitstream_reader.h
+++ b/lib_util/bitstream_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/bitstream_writer.c b/lib_util/bitstream_writer.c
index d19a05898d620e82c40288b1f40ba6717793d327..8c4b64cd4816649cb6833ccd6bda13270eb0e179 100644
--- a/lib_util/bitstream_writer.c
+++ b/lib_util/bitstream_writer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/bitstream_writer.h b/lib_util/bitstream_writer.h
index b0fab9e44902ef2b903fbbeb6e6bbed5fbc31c08..f3efd4ddf2ec85beea05af186ffa68cbed225b2f 100644
--- a/lib_util/bitstream_writer.h
+++ b/lib_util/bitstream_writer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/cmdl_tools.c b/lib_util/cmdl_tools.c
index 337583ab9fd5f978cc32c2b22348e2bf6a8490bb..bec772ce42f96eb8373d44aebc6cba944cdb288e 100644
--- a/lib_util/cmdl_tools.c
+++ b/lib_util/cmdl_tools.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/cmdl_tools.h b/lib_util/cmdl_tools.h
index 7c3c05ba16b5265d220c9fa16bab84870e375791..327acb93d0b1d528874de8ef018a36686379b778 100644
--- a/lib_util/cmdl_tools.h
+++ b/lib_util/cmdl_tools.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/cmdln_parser.c b/lib_util/cmdln_parser.c
index fe2c1b1dbec8a543298089bb433e31a056bf77f9..b2c8f85bc4dc7119e7268271f44fcce2af9c703c 100644
--- a/lib_util/cmdln_parser.c
+++ b/lib_util/cmdln_parser.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/cmdln_parser.h b/lib_util/cmdln_parser.h
index 4721d968f4e35d28a19eae79d71a60f7fa095bd0..2627d556624dc0de59ca01a5f342d684d066d277 100644
--- a/lib_util/cmdln_parser.h
+++ b/lib_util/cmdln_parser.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/evs_rtp_payload.c b/lib_util/evs_rtp_payload.c
index c122716f3110a7ca183af914c9b173ba6ac85a6b..a0c514bad3ac1495178debf42f7b6736ec770bd3 100644
--- a/lib_util/evs_rtp_payload.c
+++ b/lib_util/evs_rtp_payload.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/evs_rtp_payload.h b/lib_util/evs_rtp_payload.h
index 004ecf79b695ebfff70c8f0ea69e81c44a8aaf65..357d985578ba9616980b33e62b75c62ee6ad5604 100644
--- a/lib_util/evs_rtp_payload.h
+++ b/lib_util/evs_rtp_payload.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/g192.c b/lib_util/g192.c
index bec637464fd400721ef093f42ef819aa9ab2338e..d6c6ec4755dc8f3b4f07ba3990389888547a31ee 100644
--- a/lib_util/g192.c
+++ b/lib_util/g192.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/g192.h b/lib_util/g192.h
index 6d6104d45327ffea1aaa885b2af085783bd9f287..8014f523687f9c50404d39dbe3e1242b00f813c7 100644
--- a/lib_util/g192.h
+++ b/lib_util/g192.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c
index 3410ada712d8dd5d1c061ba496c4e50af661308c..c2e3d8a2ae53745336dfedd66904388a85fd7355 100644
--- a/lib_util/hrtf_file_reader.c
+++ b/lib_util/hrtf_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,10 +32,8 @@
 
 #include "hrtf_file_reader.h"
 #include <string.h>
-#include "prot.h"
-#include "ivas_prot_rend.h"
 #include "prot_fx.h"
-#include "ivas_prot.h"
+#include "ivas_prot_rend_fx.h"
 #include "ivas_prot_fx.h"
 
 /*---------------------------------------------------------------------*
@@ -1203,11 +1201,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
             {
                 memcpy( f_tmp_ntaps_sba, hrtf_data_rptr, BINAURAL_NTAPS_SBA * sizeof( float ) );
                 hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( float );
-#ifdef MSAN_FIX
                 floatToFixed_arrL( f_tmp_ntaps_sba, ( *hHRTF )->rightHRIRImag_HOA3_fx[i][j], Q29, BINAURAL_NTAPS_SBA );
-#else
-                floatToFixed_arrL( f_tmp_ntaps_sba, ( *hHRTF )->rightHRIRReal_HOA3_fx[i][j], Q29, BINAURAL_NTAPS_SBA );
-#endif
             }
         }
     }
diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h
index e222fd4d1730794e806b41cd195bd4281a6bc214..104cc5c7a8a93f778a0e3e78438a4660576e77c4 100644
--- a/lib_util/hrtf_file_reader.h
+++ b/lib_util/hrtf_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c
index f6f0206392b93aaddc2ee8a3dfea8b175a1c276b..f3d782aeb7484e7c38b80c103fba546c8f57e216 100644
--- a/lib_util/ism_file_reader.c
+++ b/lib_util/ism_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/ism_file_reader.h b/lib_util/ism_file_reader.h
index 886ebb34be8b57a4e5b869e2cd75ceb7573918ca..c785cc294bde7cbd4c37e9bfb76856f9b172f5c8 100644
--- a/lib_util/ism_file_reader.h
+++ b/lib_util/ism_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/ism_file_writer.c b/lib_util/ism_file_writer.c
index 093414293250ef712320a3698fe79f3e88ad9d95..94bab6dd279ae62eed74ef6a52dd6df614dcb667 100644
--- a/lib_util/ism_file_writer.c
+++ b/lib_util/ism_file_writer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/ism_file_writer.h b/lib_util/ism_file_writer.h
index 34cc4e711c0da47e670b9eb38c93af823e0ca08c..6bf1a3e3171dc2f63a598554a88415a3335d425b 100644
--- a/lib_util/ism_file_writer.h
+++ b/lib_util/ism_file_writer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/jbm_file_reader.c b/lib_util/jbm_file_reader.c
index 01ca956f75a8527b62b560b9e183f1f07b1ff51f..b657ab78929f906eb29dd6c3435af8a7f91c73ca 100644
--- a/lib_util/jbm_file_reader.c
+++ b/lib_util/jbm_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/jbm_file_reader.h b/lib_util/jbm_file_reader.h
index 379506ee6a63b86a440b55d861a3cb981a5ff899..e824e1eee9f00bbb821664a0515a69f1ce987d38 100644
--- a/lib_util/jbm_file_reader.h
+++ b/lib_util/jbm_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/jbm_file_writer.c b/lib_util/jbm_file_writer.c
index 6e26fe7035d2bfb21de508f8906040049a5556b6..76a5a67d2566db5d87ecefb0bb7d21bbeb9afcaf 100644
--- a/lib_util/jbm_file_writer.c
+++ b/lib_util/jbm_file_writer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/jbm_file_writer.h b/lib_util/jbm_file_writer.h
index fad5ec81e8bd2d0cb0d4cf5ffae8052760d3ebf9..aca768a1a0e75c88dd01910bf00854cabc0dc2f2 100644
--- a/lib_util/jbm_file_writer.h
+++ b/lib_util/jbm_file_writer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/ls_custom_file_reader.c b/lib_util/ls_custom_file_reader.c
index 90b734d07a083d6026b7385377111c27dddba664..f4f43e496e358d9dae0ca00a8478fe342a3fc121 100644
--- a/lib_util/ls_custom_file_reader.c
+++ b/lib_util/ls_custom_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -33,8 +33,8 @@
 #include "ls_custom_file_reader.h"
 #include <stdlib.h>
 #include <string.h>
-#include "ivas_prot.h"
-#include "prot.h"
+#include "ivas_prot_fx.h"
+#include "prot_fx.h"
 
 
 struct LsCustomFileReader
diff --git a/lib_util/ls_custom_file_reader.h b/lib_util/ls_custom_file_reader.h
index b5def337621e2465952aa70d087c236cc0835b82..46b20a4ff013827acf56198b2b6f917952f21201 100644
--- a/lib_util/ls_custom_file_reader.h
+++ b/lib_util/ls_custom_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c
index 5b8d759c24748eb6a86669c76d7ffcd68cffe235..efab80b79547db87abeb0a4f44e1e72dbc1a3637 100644
--- a/lib_util/masa_file_reader.c
+++ b/lib_util/masa_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -31,7 +31,6 @@
 *******************************************************************************************************/
 
 #include "masa_file_reader.h"
-#include "ivas_prot.h"
 #include "ivas_stat_com.h"
 #include <stdlib.h>
 #include <math.h>
diff --git a/lib_util/masa_file_reader.h b/lib_util/masa_file_reader.h
index de55035c7b072740dbd3678921e5eaaf5899d0c7..7510598c3bf16a9690be159e7da3fd1187fc6d1d 100644
--- a/lib_util/masa_file_reader.h
+++ b/lib_util/masa_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/masa_file_writer.c b/lib_util/masa_file_writer.c
index 8bf55ba86ac8fc3f45786d1d0c441faf5f03d9ab..0939d0829ce7a4a2bc7a8b1718eea70694c37bf5 100644
--- a/lib_util/masa_file_writer.c
+++ b/lib_util/masa_file_writer.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/masa_file_writer.h b/lib_util/masa_file_writer.h
index d7f53d4b6c7b3aa307142d25f635e24e009e4ad5..2d476e28f037e45af8a957b77015c1582bff2ef0 100644
--- a/lib_util/masa_file_writer.h
+++ b/lib_util/masa_file_writer.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/mime_io.c b/lib_util/mime_io.c
index 8a6262953780bd20d6ca31f0de50c99af7e0f210..2976e1895feea86a4a9d03cdca6571ee8ebd3d5a 100644
--- a/lib_util/mime_io.c
+++ b/lib_util/mime_io.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -32,7 +32,7 @@
 
 #include "mime_io.h"
 #include "mime.h"
-#include "prot.h"
+#include "prot_fx.h"
 #include "string.h"
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/lib_util/mime_io.h b/lib_util/mime_io.h
index 6ce5070c44bf5817a76a78d3ee542acad801aed7..dbd21c9c79d2fd67d834b4e3364b0f714546bc36 100644
--- a/lib_util/mime_io.h
+++ b/lib_util/mime_io.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index 692f8c58d06492d4efb6f8a0bc3b2c35fc74c154..e099842be2f9c47fb3bbab69ec160c15e590a2a9 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "cmdl_tools.h"
-#include "prot.h"
+#include "prot_fx.h"
 
 
 /*------------------------------------------------------------------------------------------*
diff --git a/lib_util/render_config_reader.h b/lib_util/render_config_reader.h
index 445ced79abdb905cc094a5b8d51311d4f3f8f4ba..5edf73ded33d2cc91653c86276a86a92bc496432 100644
--- a/lib_util/render_config_reader.h
+++ b/lib_util/render_config_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c
index 987d40c85be0d83ee0cec3535529f808812d2ef7..2299f326531a24915800468935bb021c8f7888af 100644
--- a/lib_util/rotation_file_reader.c
+++ b/lib_util/rotation_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include "prot.h"
 #include "prot_fx.h"
 
 
diff --git a/lib_util/rotation_file_reader.h b/lib_util/rotation_file_reader.h
index 3f98ea5b0c8473bb691e2dcda2143d2ac7f393c3..8d6206bd6331744bb16e22a24ba0205c0a4ac4ca 100644
--- a/lib_util/rotation_file_reader.h
+++ b/lib_util/rotation_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/rtpdump.c b/lib_util/rtpdump.c
index 9f8784947314990b7d0a41aae0a357510c1b7bec..e3eb4c1f4acb3329e0183bd97f820b318cb81400 100644
--- a/lib_util/rtpdump.c
+++ b/lib_util/rtpdump.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/rtpdump.h b/lib_util/rtpdump.h
index b97ec97d839a231fa1aa98ee82016a719f1a94fa..5b8b31e8de3b7a6eda80cd7e6d8e808c6e9446b5 100644
--- a/lib_util/rtpdump.h
+++ b/lib_util/rtpdump.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/test_fft.c b/lib_util/test_fft.c
index 5c0e2b33f618e4ae557dd3caa9a648146d59690c..1b52fe3512080b239eba547175ecc7bd3e758bfc 100644
--- a/lib_util/test_fft.c
+++ b/lib_util/test_fft.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/test_fft.h b/lib_util/test_fft.h
index 7a3567f895e39442e711a9d463d932932be92689..6c962909072a7f02a71735bc6c860c44c8975abf 100644
--- a/lib_util/test_fft.h
+++ b/lib_util/test_fft.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/test_mdct.c b/lib_util/test_mdct.c
index 91095df388e134832d9d2c985626eb88f088b635..69d83588da32356d4ea43d4512beea7be73244e2 100644
--- a/lib_util/test_mdct.c
+++ b/lib_util/test_mdct.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/tinywavein_c.h b/lib_util/tinywavein_c.h
index 0fd1b7a65b47e0ee1276fd937cbd9abce4d55b25..b86d97c9640f1e91427a4b6cf8731df62a1596bb 100644
--- a/lib_util/tinywavein_c.h
+++ b/lib_util/tinywavein_c.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/tinywaveout_c.h b/lib_util/tinywaveout_c.h
index 9b11e325a72f5bf33ad5a84763244b00c2b841df..693beccf9557dfaf7d6a507cb614064f76049f03 100644
--- a/lib_util/tinywaveout_c.h
+++ b/lib_util/tinywaveout_c.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c
index 380e69e278188f84d66a2456f594038f855767af..5745e95955616a19c7e95adf68d2dda74a908ff9 100644
--- a/lib_util/vector3_pair_file_reader.c
+++ b/lib_util/vector3_pair_file_reader.c
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include "prot.h"
 #include "options.h" /* only included to get access to the feature-defines */
 #include "prot_fx.h"
 #include "ivas_prot_fx.h"
diff --git a/lib_util/vector3_pair_file_reader.h b/lib_util/vector3_pair_file_reader.h
index 3255fb315442f4f5544e88d1cf62595be837e4af..6515d32d58f68c5088204f7fa1aae667ad3140cb 100644
--- a/lib_util/vector3_pair_file_reader.h
+++ b/lib_util/vector3_pair_file_reader.h
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/readme.txt b/readme.txt
index 25275a79516b91aa8a0d3fa8131155cd441f5e68..9b1ab852d136d9976a04d7d1bdb1b54cbd30d6ff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 /******************************************************************************************************
 
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
    Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
    Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
    Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other